From 4341a1bd0412ff6c99d6a2a0ef8a61b595c2205e Mon Sep 17 00:00:00 2001
From: Marc Koderer <m.koderer@telekom.de>
Date: Wed, 7 Aug 2013 11:39:29 +0200
Subject: [PATCH 0001/2267] Add fastcgi as vhost configuration option

Adds to the existing vhost modules the fastcgi module.

Signed-off-by: Marc Koderer <m.koderer@telekom.de>
---
 manifests/mod/fastcgi.pp         |  4 ++++
 manifests/vhost.pp               | 12 +++++++++++-
 spec/classes/mod/fastcgi_spec.rb | 17 +++++++++++++++++
 templates/vhost.conf.erb         |  1 +
 templates/vhost/_fastcgi.erb     | 19 +++++++++++++++++++
 5 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 manifests/mod/fastcgi.pp
 create mode 100644 spec/classes/mod/fastcgi_spec.rb
 create mode 100644 templates/vhost/_fastcgi.erb

diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
new file mode 100644
index 0000000000..f3bfbc3a43
--- /dev/null
+++ b/manifests/mod/fastcgi.pp
@@ -0,0 +1,4 @@
+class apache::mod::fastcgi {
+  apache::mod { 'fastcgi': 
+    package => 'libapache2-mod-fastcgi'}
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index aa77ff94f2..f3e368b98c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -109,7 +109,10 @@
     $setenvif           = [],
     $block              = [],
     $ensure             = 'present',
-    $custom_fragment    = undef
+    $custom_fragment    = undef,
+    $fastcgi_server     = undef,
+    $fastcgi_socket     = undef,
+    $fastcgi_dir        = undef
   ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -269,6 +272,13 @@
     }
   }
 
+  # Load mod_fastci if needed and not yet loaded
+  if $fastcgi_server and $fastcgi_socket {
+    if ! defined(Class['apache::mod::fastcgi']) {
+      include apache::mod::fastcgi
+    }
+  }
+
   # Configure the defaultness of a vhost
   if $priority {
     $priority_real = $priority
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
new file mode 100644
index 0000000000..462201247e
--- /dev/null
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -0,0 +1,17 @@
+describe 'apache::mod::fastcgi', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('fastcgi') }
+    it { should contain_package("libapache2-mod-fastcgi") }
+  end
+end
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 8a5a705d35..8e3a1bb3ba 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -40,4 +40,5 @@
 <%= scope.function_template(['apache/vhost/_ssl.erb']) -%>
 <%= scope.function_template(['apache/vhost/_requestheader.erb']) -%>
 <%= scope.function_template(['apache/vhost/_custom_fragment.erb']) -%>
+<%= scope.function_template(['apache/vhost/_fastcgi.erb']) -%>
 </VirtualHost>
diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
new file mode 100644
index 0000000000..388b3462dd
--- /dev/null
+++ b/templates/vhost/_fastcgi.erb
@@ -0,0 +1,19 @@
+<% if @fastcgi_server -%>
+
+  FastCgiExternalServer <%= @fastcgi_server -%> -socket <%= @fastcgi_socket -%>
+<% end -%>
+
+<% if @fastcgi_dir -%>
+
+  <Directory <%= @fastcgi_dir -%>> 
+    Options +ExecCGI
+    AllowOverride All
+    SetHandler fastcgi-script
+    Order allow,deny
+    Allow from all
+    AuthBasicAuthoritative Off
+  </Directory>
+
+  AllowEncodedSlashes On
+  ServerSignature Off
+<% end -%>

From 48fb00e52a48ebb54363546dcab14dd9c32d707d Mon Sep 17 00:00:00 2001
From: Thomas Pierson <thomas@mezcalito.fr>
Date: Fri, 16 Aug 2013 18:06:07 +0200
Subject: [PATCH 0002/2267] Add support for the 'mod_fastcgi' apache module.

---
 manifests/mod/fastcgi.pp         | 24 ++++++++++++++++++++++++
 manifests/params.pp              |  2 ++
 spec/classes/mod/fastcgi_spec.rb | 29 +++++++++++++++++++++++++++++
 templates/mod/fastcgi.conf.erb   |  6 ++++++
 4 files changed, 61 insertions(+)
 create mode 100644 manifests/mod/fastcgi.pp
 create mode 100644 spec/classes/mod/fastcgi_spec.rb
 create mode 100644 templates/mod/fastcgi.conf.erb

diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
new file mode 100644
index 0000000000..52d249235c
--- /dev/null
+++ b/manifests/mod/fastcgi.pp
@@ -0,0 +1,24 @@
+class apache::mod::fastcgi {
+  Class['apache::mod::worker'] -> Class['apache::mod::fastcgi']
+
+  # Debian specifies it's fastcgi lib path, but RedHat uses the default value
+  # with no config file
+  $fastcgi_lib_path = $::osfamily ? {
+    'debian' => '/var/lib/apache2/fastcgi',
+    default  => undef,
+  }
+
+  apache::mod { 'fastcgi': }
+
+  if $fastcgi_lib_path {
+    file { 'fastcgi.conf':
+      ensure  => file,
+      path    => "${apache::mod_dir}/fastcgi.conf",
+      content => template('apache/mod/fastcgi.conf.erb'),
+      require => Exec["mkdir ${apache::mod_dir}"],
+      before  => File[$apache::mod_dir],
+      notify  => Service['httpd'],
+    }
+  }
+
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 110eeebd43..c4b33d805f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -53,6 +53,7 @@
     $passenger_ruby       = '/usr/bin/ruby'
     $mod_packages         = {
       'auth_kerb'  => 'mod_auth_kerb',
+      'fastcgi'    => 'mod_fastcgi',
       'fcgid'      => 'mod_fcgid',
       'passenger'  => 'mod_passenger',
       'perl'       => 'mod_perl',
@@ -97,6 +98,7 @@
     $passenger_ruby   = '/usr/bin/ruby'
     $mod_packages     = {
       'auth_kerb'  => 'libapache2-mod-auth-kerb',
+      'fastcgi'    => 'libapache2-mod-fastcgi',
       'fcgid'      => 'libapache2-mod-fcgid',
       'passenger'  => 'libapache2-mod-passenger',
       'perl'       => 'libapache2-mod-perl2',
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
new file mode 100644
index 0000000000..4f4408aca6
--- /dev/null
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -0,0 +1,29 @@
+describe 'apache::mod::fastcgi', :type => :class do
+  let :pre_condition do
+    'class { "apache": mpm_module => worker, }'
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('fastcgi') }
+    it { should contain_package("libapache2-mod-fastcgi") }
+  end
+  context "on a RedHat OS" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('fastcgi') }
+    it { should contain_package("mod_fastcgi") }
+  end
+end
diff --git a/templates/mod/fastcgi.conf.erb b/templates/mod/fastcgi.conf.erb
new file mode 100644
index 0000000000..d02b12f77f
--- /dev/null
+++ b/templates/mod/fastcgi.conf.erb
@@ -0,0 +1,6 @@
+# The Fastcgi Apache module configuration file is being
+# managed by Puppet and changes will be overwritten.
+<IfModule mod_fastcgi.c>
+  AddHandler fastcgi-script .fcgi
+  FastCgiIpcDir <%= @fastcgi_lib_path %>
+</IfModule>

From 04e5e5bde2868a79a39ebe652768adbee76006bc Mon Sep 17 00:00:00 2001
From: Thomas Pierson <thomas@mezcalito.fr>
Date: Mon, 19 Aug 2013 16:01:59 +0200
Subject: [PATCH 0003/2267] mod_fastcgi has no hard depend on
 apache::mod::worker

---
 manifests/mod/fastcgi.pp         | 1 -
 spec/classes/mod/fastcgi_spec.rb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index 52d249235c..6025fbfffc 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -1,5 +1,4 @@
 class apache::mod::fastcgi {
-  Class['apache::mod::worker'] -> Class['apache::mod::fastcgi']
 
   # Debian specifies it's fastcgi lib path, but RedHat uses the default value
   # with no config file
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 4f4408aca6..707f737b6a 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -1,6 +1,6 @@
 describe 'apache::mod::fastcgi', :type => :class do
   let :pre_condition do
-    'class { "apache": mpm_module => worker, }'
+    'class { "apache": }'
   end
   context "on a Debian OS" do
     let :facts do

From ccb353ccdbba4b02ca5eca6bc0f710c141c9ad61 Mon Sep 17 00:00:00 2001
From: John Bartko <jbartko@txstate.edu>
Date: Sun, 8 Sep 2013 18:02:14 -0500
Subject: [PATCH 0004/2267] initial mod_authnz_ldap

---
 manifests/mod/authnz_ldap.pp       | 12 +++++++
 manifests/params.pp                | 50 ++++++++++++++++--------------
 templates/mod/authnz_ldap.conf.erb |  1 +
 3 files changed, 39 insertions(+), 24 deletions(-)
 create mode 100644 manifests/mod/authnz_ldap.pp
 create mode 100644 templates/mod/authnz_ldap.conf.erb

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
new file mode 100644
index 0000000000..039f96ec08
--- /dev/null
+++ b/manifests/mod/authnz_ldap.pp
@@ -0,0 +1,12 @@
+class apache::mod::authnz_ldap(
+  $ldap_conf = 'apache/mod/authnz_ldap.conf.erb'
+) {
+  apache::mod { 'authnz_ldap': }
+  file { 'authnz_ldap.conf':
+    ensure  => file,
+    path    => "${apache::mod_dir}/authnz_ldap.conf",
+    content => template($ldap_conf),
+    before  => File[$apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 7bf4a5fa33..913687eb79 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -59,22 +59,23 @@
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
     $mod_packages         = {
-      'auth_kerb'  => 'mod_auth_kerb',
-      'fcgid'      => 'mod_fcgid',
-      'passenger'  => 'mod_passenger',
-      'perl'       => 'mod_perl',
-      'php5'       => $distrelease ? {
+      'auth_kerb'   => 'mod_auth_kerb',
+      'authnz_ldap' => 'mod_authz_ldap',
+      'fcgid'       => 'mod_fcgid',
+      'passenger'   => 'mod_passenger',
+      'perl'        => 'mod_perl',
+      'php5'        => $distrelease ? {
         '5'     => 'php53',
         default => 'php',
       },
-      'proxy_html' => 'mod_proxy_html',
-      'python'     => 'mod_python',
-      'shibboleth' => 'shibboleth',
-      'ssl'        => 'mod_ssl',
-      'wsgi'       => 'mod_wsgi',
-      'dav_svn'    => 'mod_dav_svn',
-      'suphp'      => 'mod_suphp',
-      'xsendfile'  => 'mod_xsendfile',
+      'proxy_html'  => 'mod_proxy_html',
+      'python'      => 'mod_python',
+      'shibboleth'  => 'shibboleth',
+      'ssl'         => 'mod_ssl',
+      'wsgi'        => 'mod_wsgi',
+      'dav_svn'     => 'mod_dav_svn',
+      'suphp'       => 'mod_suphp',
+      'xsendfile'   => 'mod_xsendfile',
     }
     $mod_libs             = {
       'php5' => 'libphp5.so',
@@ -108,17 +109,18 @@
     $suphp_engine      = 'off'
     $suphp_configpath  = '/etc/php5/apache2'
     $mod_packages     = {
-      'auth_kerb'  => 'libapache2-mod-auth-kerb',
-      'fcgid'      => 'libapache2-mod-fcgid',
-      'passenger'  => 'libapache2-mod-passenger',
-      'perl'       => 'libapache2-mod-perl2',
-      'php5'       => 'libapache2-mod-php5',
-      'proxy_html' => 'libapache2-mod-proxy-html',
-      'python'     => 'libapache2-mod-python',
-      'wsgi'       => 'libapache2-mod-wsgi',
-      'dav_svn'    => 'libapache2-svn',
-      'suphp'      => 'libapache2-mod-suphp',
-      'xsendfile'  => 'libapache2-mod-xsendfile',
+      'auth_kerb'   => 'libapache2-mod-auth-kerb',
+      'authnz_ldap' => 'libapache2-mod-authz-ldap',
+      'fcgid'       => 'libapache2-mod-fcgid',
+      'passenger'   => 'libapache2-mod-passenger',
+      'perl'        => 'libapache2-mod-perl2',
+      'php5'        => 'libapache2-mod-php5',
+      'proxy_html'  => 'libapache2-mod-proxy-html',
+      'python'      => 'libapache2-mod-python',
+      'wsgi'        => 'libapache2-mod-wsgi',
+      'dav_svn'     => 'libapache2-svn',
+      'suphp'       => 'libapache2-mod-suphp',
+      'xsendfile'   => 'libapache2-mod-xsendfile',
     }
     $mod_libs         = {
       'php5' => 'libphp5.so',
diff --git a/templates/mod/authnz_ldap.conf.erb b/templates/mod/authnz_ldap.conf.erb
new file mode 100644
index 0000000000..b95f62b7a3
--- /dev/null
+++ b/templates/mod/authnz_ldap.conf.erb
@@ -0,0 +1 @@
+LDAPVerifyServerCert off

From 4027cdd1c246ea519631cfa3a0e4138f351e1f0c Mon Sep 17 00:00:00 2001
From: John Bartko <jbartko@txstate.edu>
Date: Sun, 8 Sep 2013 18:15:52 -0500
Subject: [PATCH 0005/2267] include ldap prereq

---
 manifests/mod/authnz_ldap.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 039f96ec08..239283deae 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,6 +1,7 @@
 class apache::mod::authnz_ldap(
   $ldap_conf = 'apache/mod/authnz_ldap.conf.erb'
 ) {
+  include apache::mod::ldap
   apache::mod { 'authnz_ldap': }
   file { 'authnz_ldap.conf':
     ensure  => file,

From c2a7d5f2d6a18a5e3f444bf859983efeb9d1a195 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Wed, 2 Oct 2013 08:57:13 -0600
Subject: [PATCH 0006/2267] default to validate certs, add rpsec tests

---
 manifests/mod/authnz_ldap.pp         | 23 +++++++---
 spec/classes/mod/authnz_ldap_spec.rb | 65 ++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 spec/classes/mod/authnz_ldap_spec.rb

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 239283deae..9533b45a0f 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,13 +1,22 @@
 class apache::mod::authnz_ldap(
-  $ldap_conf = 'apache/mod/authnz_ldap.conf.erb'
+  $verifyServerCert = true,
 ) {
   include apache::mod::ldap
   apache::mod { 'authnz_ldap': }
-  file { 'authnz_ldap.conf':
-    ensure  => file,
-    path    => "${apache::mod_dir}/authnz_ldap.conf",
-    content => template($ldap_conf),
-    before  => File[$apache::mod_dir],
-    notify  => Service['httpd'],
+
+  if $verifyServerCert == true {
+    file { 'authnz_ldap.conf':
+      ensure  => absent,
+      path    => "${apache::mod_dir}/authnz_ldap.conf",
+      notify  => Service['httpd'],
+    }
+  } else {
+    file { 'authnz_ldap.conf':
+      ensure  => file,
+      path    => "${apache::mod_dir}/authnz_ldap.conf",
+      content => 'LDAPVerifyServerCert off',
+      before  => File[$apache::mod_dir],
+      notify  => Service['httpd'],
+    }
   }
 }
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
new file mode 100644
index 0000000000..9c52e28586
--- /dev/null
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -0,0 +1,65 @@
+describe 'apache::mod::authnz_ldap', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should include_class("apache::mod::ldap") }
+    it { should contain_apache__mod('authnz_ldap') }
+
+    context 'default verifyServerCert' do
+      it { should contain_file('authnz_ldap.conf').with_ensure('absent') }
+    end
+
+    context 'verifyServerCert = false' do
+      let(:params) { { :verifyServerCert => false } }
+      it { should contain_file('authnz_ldap.conf').with_content('LDAPVerifyServerCert off') }
+    end
+
+    context 'verifyServerCert = wrong' do
+      let(:params) { { :verifyServerCert => 'wrong' } }
+      it 'should raise an error' do
+        expect { should raise_error Puppet::Error }
+      end
+    end
+  end #Debian
+
+  context "on a RedHat OS" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should include_class("apache::mod::ldap") }
+    it { should contain_apache__mod('authnz_ldap') }
+
+    context 'default verifyServerCert' do
+      it { should contain_file('authnz_ldap.conf').with_ensure('absent') }
+    end
+
+    context 'verifyServerCert = false' do
+      let(:params) { { :verifyServerCert => false } }
+      it { should contain_file('authnz_ldap.conf').with_content('LDAPVerifyServerCert off') }
+    end
+
+    context 'verifyServerCert = wrong' do
+      let(:params) { { :verifyServerCert => 'wrong' } }
+      it 'should raise an error' do
+        expect { should raise_error Puppet::Error }
+      end
+    end
+  end # Redhat
+
+end
+

From 568d4ee9a996435ed79e125c6a515a5f00ac69bd Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Wed, 2 Oct 2013 08:59:02 -0600
Subject: [PATCH 0007/2267] remove unuzed authnz template

---
 templates/mod/authnz_ldap.conf.erb | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 templates/mod/authnz_ldap.conf.erb

diff --git a/templates/mod/authnz_ldap.conf.erb b/templates/mod/authnz_ldap.conf.erb
deleted file mode 100644
index b95f62b7a3..0000000000
--- a/templates/mod/authnz_ldap.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-LDAPVerifyServerCert off

From e34ea78fd6ebd3cfe8e52e7b2432216bc164307e Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Wed, 2 Oct 2013 10:40:30 -0600
Subject: [PATCH 0008/2267] update readme

---
 README.md | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 14705fa351..58311b0ecd 100644
--- a/README.md
+++ b/README.md
@@ -301,11 +301,11 @@ Allows the configuration of a trailing footer line under server-generated docume
 
 #####`manage_user`
 
-Setting this to false will avoid the user resource to be created by this module. This is useful when you already have a user created in another puppet module and that you want to used it to run apache. Without this, it would result in a duplicate resource error. 
+Setting this to false will avoid the user resource to be created by this module. This is useful when you already have a user created in another puppet module and that you want to used it to run apache. Without this, it would result in a duplicate resource error.
 
 #####`manage_group`
 
-Setting this to false will avoid the group resource to be created by this module. This is useful when you already have a group created in another puppet module and that you want to used it for apache. Without this, it would result in a duplicate resource error. 
+Setting this to false will avoid the group resource to be created by this module. This is useful when you already have a group created in another puppet module and that you want to used it for apache. Without this, it would result in a duplicate resource error.
 
 #####`package_ensure`
 
@@ -345,6 +345,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `dir`*
 * `disk_cache`
 * `fcgid`
+* `fastcgi`
 * `info`
 * `ldap`
 * `mime`
@@ -686,6 +687,18 @@ Sends all error log messages to syslog. Defaults to 'undef'.
 
 Specifies if the vhost file is present or absent.
 
+#####`fastcgi_server`
+
+Specifies the filename as an external FastCGI application. Defaults to 'undef'.
+
+#####`fastcgi_socket`
+
+Filename used to communicate with the web server.  Defaults to 'undef'.
+
+#####`fastcgi_dir`
+
+Directory to enable for FastCGI.  Defaults to 'undef'.
+
 #####`ip`
 
 The IP address the vhost listens on. Defaults to 'undef'.

From be3e87e88e0697370a6f08466b8b35f62509659d Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Wed, 2 Oct 2013 15:06:44 -0600
Subject: [PATCH 0009/2267] added "template uses" documentation

---
 manifests/mod/fastcgi.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index fd38c6daa2..28673d7bbe 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -7,6 +7,10 @@
   apache::mod { 'fastcgi': }
 
   if $fastcgi_lib_path {
+    # Template uses:
+    # - $fastcgi_server
+    # - $fastcgi_socket
+    # - $fastcgi_dir
     file { 'fastcgi.conf':
       ensure  => file,
       path    => "${apache::mod_dir}/fastcgi.conf",

From 05080f317d0d450d8787b4330c74e0fbd2e03cc5 Mon Sep 17 00:00:00 2001
From: Juan Treminio <jtreminio@gmail.com>
Date: Mon, 21 Oct 2013 11:23:09 -0500
Subject: [PATCH 0010/2267] Calling apache::mod::rewrite instead of Apache::Mod
 class directly. Fixes redmine 22922 and github #411

---
 manifests/vhost.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e07bdb4fe8..75873a81f2 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -273,8 +273,8 @@
 
   # Load mod_rewrite if needed and not yet loaded
   if $rewrite_rule {
-    if ! defined(Apache::Mod['rewrite']) {
-      apache::mod { 'rewrite': }
+    if ! defined(Class['apache::mod::rewrite']) {
+      include apache::mod::rewrite
     }
   }
 

From f799a3127c0b663be8dcc891477521042de0a628 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 21 Oct 2013 14:21:32 -0600
Subject: [PATCH 0011/2267] document/whitespace cleanup

---
 manifests/vhost.pp           | 4 ++++
 templates/vhost/_fastcgi.erb | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 83e9cd822b..6f1422e650 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -364,6 +364,10 @@
   # directories fragment:
   #   - $passenger_enabled
   #   - $directories (a list of key-value hashes is expected)
+  # fastcgi fragment:
+  #   - $fastcgi_server
+  #   - $fastcgi_socket
+  #   - $fastcgi_dir
   # proxy fragment:
   #   - $proxy_dest
   #   - $no_proxy_uris
diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
index 388b3462dd..cd9baac31f 100644
--- a/templates/vhost/_fastcgi.erb
+++ b/templates/vhost/_fastcgi.erb
@@ -2,10 +2,9 @@
 
   FastCgiExternalServer <%= @fastcgi_server -%> -socket <%= @fastcgi_socket -%>
 <% end -%>
-
 <% if @fastcgi_dir -%>
 
-  <Directory <%= @fastcgi_dir -%>> 
+  <Directory <%= @fastcgi_dir -%>>
     Options +ExecCGI
     AllowOverride All
     SetHandler fastcgi-script

From b1c92dbd64288bb685ea0abe7c5d13836c417989 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 21 Oct 2013 14:26:12 -0600
Subject: [PATCH 0012/2267] prevent newline stripping

---
 templates/vhost/_fastcgi.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
index cd9baac31f..3bde06658f 100644
--- a/templates/vhost/_fastcgi.erb
+++ b/templates/vhost/_fastcgi.erb
@@ -1,6 +1,6 @@
 <% if @fastcgi_server -%>
 
-  FastCgiExternalServer <%= @fastcgi_server -%> -socket <%= @fastcgi_socket -%>
+  FastCgiExternalServer <%= @fastcgi_server -%> -socket <%= @fastcgi_socket %>
 <% end -%>
 <% if @fastcgi_dir -%>
 

From 3faa5d5196c12a77b35ee6042df9d7261b646a19 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 21 Oct 2013 15:23:30 -0600
Subject: [PATCH 0013/2267] remove newline strip

---
 templates/vhost/_fastcgi.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
index 3bde06658f..f0ff72c6b2 100644
--- a/templates/vhost/_fastcgi.erb
+++ b/templates/vhost/_fastcgi.erb
@@ -1,10 +1,10 @@
 <% if @fastcgi_server -%>
 
-  FastCgiExternalServer <%= @fastcgi_server -%> -socket <%= @fastcgi_socket %>
+  FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket %>
 <% end -%>
 <% if @fastcgi_dir -%>
 
-  <Directory <%= @fastcgi_dir -%>>
+  <Directory <%= @fastcgi_dir %>>
     Options +ExecCGI
     AllowOverride All
     SetHandler fastcgi-script

From 4d84eb52d98b5342255f667d0c906d66b77000e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 22 Oct 2013 21:40:38 +0200
Subject: [PATCH 0014/2267] document `provider` parameter for `directories`

In directories we can set provider to either directory (default), files,
or location to create different kinds of blocks. At the time this
feature was added, we neglected to document it. This commit fixes #372
---
 README.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fcf48d2406..7ecacaf9d9 100644
--- a/README.md
+++ b/README.md
@@ -466,7 +466,7 @@ Sets a given `apache::vhost` as the default to serve requests that do not match
 
 #####`directories`
 
-Passes a list of hashes to the vhost to create `<Directory /path/to/directory>...</Directory>` directive blocks as per the [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#directory).  The `path` key is required in these hashes.  Usage will typically look like:
+Passes a list of hashes to the vhost to create `<Directory /path/to/directory>...</Directory>` directive blocks as per the [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#directory).  The `path` key is required in these hashes. An optional `provider` defaults to `directory`.  Usage will typically look like:
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -482,7 +482,18 @@ Passes a list of hashes to the vhost to create `<Directory /path/to/directory>..
 
 *Note:* If not defined a single default `<Directory>` block will be created that matches the `docroot` parameter.
 
-The directives will be embedded within the `Directory` directive block, missing directives should be undefined and not be added, resulting in their default vaules in Apache. Currently this is the list of supported directives:
+`provider` can be set to any of `directory`, `files`, or `location`. If the [pathspec starts with a `~`](https://httpd.apache.org/docs/2.2/mod/core.html#files), httpd will interpret this as the equivalent of `DirectoryMatch`, `FilesMatch`, or `LocationMatch`, respectively.
+
+```puppet
+    apache::vhost { 'files.example.net':
+      docroot     => '/var/www/files',
+      directories => [
+        { path => '~ (\.swp|\.bak|~)$', 'provider' => 'files', 'deny' => 'from all' },
+      ],
+    }
+```
+
+The directives will be embedded within the `Directory` (`Files`, or `Location`) directive block, missing directives should be undefined and not be added, resulting in their default vaules in Apache. Currently this is the list of supported directives:
 
 ######`addhandlers`
 

From 3d9085604c40876c6180dc8893c5ec4e3e0e6610 Mon Sep 17 00:00:00 2001
From: Justin Clayton <justin@claytons.net>
Date: Wed, 23 Oct 2013 16:29:45 -0700
Subject: [PATCH 0015/2267] default_mods now pulls in mod_rewrite correctly

---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index fc0006a09d..02d3bd156a 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -24,6 +24,7 @@
         include apache::mod::mime
         include apache::mod::mime_magic
         include apache::mod::vhost_alias
+        include apache::mod::rewrite
         apache::mod { 'actions': }
         apache::mod { 'auth_digest': }
         apache::mod { 'authn_alias': }
@@ -36,7 +37,6 @@
         apache::mod { 'ext_filter': }
         apache::mod { 'include': }
         apache::mod { 'logio': }
-        apache::mod { 'rewrite': }
         apache::mod { 'speling': }
         apache::mod { 'substitute': }
         apache::mod { 'suexec': }

From a7de8ad56f2e7236acc2399e5736bdb650a247b0 Mon Sep 17 00:00:00 2001
From: Daniel Beckham <dbeckham@dealnews.com>
Date: Thu, 17 Oct 2013 16:15:48 -0500
Subject: [PATCH 0016/2267] Correct broken mime_magic config for Debian

The location "conf/magic" in the mime_magic.conf template is RedHat specific
and is broken under Debian/Ubuntu. Added a class parameter with an os agnostic
default and matching template usage.

Added full testing and updated `README.md` to indicated this module has
settings and template parameters.
---
 README.md                           |  2 +-
 manifests/mod/mime_magic.pp         |  6 +-
 spec/classes/mod/mime_magic_spec.rb | 93 +++++++++++++++++++++++++++++
 templates/mod/mime_magic.conf.erb   |  2 +-
 4 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 spec/classes/mod/mime_magic_spec.rb

diff --git a/README.md b/README.md
index d78ecc9b39..32c46224a5 100644
--- a/README.md
+++ b/README.md
@@ -353,7 +353,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `info`
 * `ldap`
 * `mime`
-* `mime_magic`
+* `mime_magic`*
 * `mpm_event`
 * `negotiation`
 * `passenger`*
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index c0ff0a7f67..5539d20e65 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -1,6 +1,8 @@
-class apache::mod::mime_magic {
+class apache::mod::mime_magic (
+  $magic_file = "${apache::params::conf_dir}/magic"
+) {
   apache::mod { 'mime_magic': }
-  # Template uses no variables
+  # Template uses $magic_file
   file { 'mime_magic.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/mime_magic.conf",
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
new file mode 100644
index 0000000000..30e91ef097
--- /dev/null
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -0,0 +1,93 @@
+# This function is called inside the OS specific contexts
+def general_mime_magic_specs
+  it { should contain_apache__mod("mime_magic") }
+end
+
+describe 'apache::mod::mime_magic', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+
+  context "On a Debian OS with default params" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    general_mime_magic_specs()
+
+    it do
+      should contain_file("mime_magic.conf").with_content(
+        "MIMEMagicFile /etc/apache2/magic\n"
+      )
+    end
+
+    it { should contain_file("mime_magic.conf").with({
+      :ensure => 'file',
+      :path   => '/etc/apache2/mods-available/mime_magic.conf',
+    } ) }
+    it { should contain_file("mime_magic.conf symlink").with({
+      :ensure => 'link',
+      :path   => '/etc/apache2/mods-enabled/mime_magic.conf',
+    } ) }
+
+    context "with magic_file => /tmp/Debian_magic" do
+      let :params do
+        { :magic_file => "/tmp/Debian_magic" }
+      end
+
+      it do
+        should contain_file("mime_magic.conf").with_content(
+          "MIMEMagicFile /tmp/Debian_magic\n"
+        )
+      end
+    end
+
+  end
+
+  context "on a RedHat OS with default params" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    general_mime_magic_specs()
+
+    it do
+      should contain_file("mime_magic.conf").with_content(
+        "MIMEMagicFile /etc/httpd/conf/magic\n"
+      )
+    end
+
+    it { should contain_file("mime_magic.conf").with_path("/etc/httpd/conf.d/mime_magic.conf") }
+
+  end
+
+  context "with magic_file => /tmp/magic" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    let :params do
+      { :magic_file => "/tmp/magic" }
+    end
+
+    it do
+      should contain_file("mime_magic.conf").with_content(
+        "MIMEMagicFile /tmp/magic\n"
+      )
+    end
+  end
+
+
+end
diff --git a/templates/mod/mime_magic.conf.erb b/templates/mod/mime_magic.conf.erb
index ee69bca4ae..4826a765c9 100644
--- a/templates/mod/mime_magic.conf.erb
+++ b/templates/mod/mime_magic.conf.erb
@@ -1 +1 @@
-MIMEMagicFile conf/magic
+MIMEMagicFile <%= @magic_file %>

From 3138a1bf88f0422b74b9b758f598471cded872c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Sat, 26 Oct 2013 16:47:09 +0200
Subject: [PATCH 0017/2267] satisfy mod_php inter-module dependencies

we try to make sure that mod_php's inter-module dependencies (mod_dir
and mod_mime) are satisfied before we try to implement any changes in
the config that would trigger those.
This fixes #408.
---
 manifests/mod/php.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 690cb01b91..f4e01fe3b4 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -7,6 +7,11 @@
   apache::mod { 'php5':
     package_ensure => $package_ensure,
   }
+
+  include apache::mod::mime
+  include apache::mod::dir
+  Class['apache::mod::mime'] -> Class['apache::mod::dir'] -> Class['apache::mod::php']
+
   file { 'php5.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/php5.conf",

From 3330e177192cdfc7a024b22ddc2b674eddf34839 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Wed, 2 Oct 2013 14:52:22 -0600
Subject: [PATCH 0018/2267] add scriptaliases parameter for multiple script
 aliases

closes #368
---
 README.md                        | 26 ++++++++++++++++++++++++++
 manifests/vhost.pp               |  4 +++-
 spec/defines/vhost_spec.rb       | 28 ++++++++++++++++++++++++++--
 templates/vhost/_scriptalias.erb | 28 ++++++++++++++++++++++++----
 4 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 32c46224a5..889374797d 100644
--- a/README.md
+++ b/README.md
@@ -870,6 +870,32 @@ Creates URL rewrite rules. Defaults to 'undef'. This parameter allows you to spe
 
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin'
 
+#####`scriptaliases`
+
+Takes an array hashes with the keys containing the alias and path.  For example:
+
+Usage will typically look like:
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      scriptaliases => [
+        {
+          alias => '/myscript/',
+          path  => '/usr/share/myscript',
+        },
+        {
+          alias => '/oldscript/',
+          path  => '/usr/share/myscript',
+        },
+        {
+          alias => '/neatscript/',
+          path  => '/usr/share/neatscript',
+        },
+      ]
+    }
+```
+
 #####`serveradmin`
 
 Specifies the email address Apache will display when it renders one of its error pages.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f249b5ada3..f50e88852e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -103,6 +103,7 @@
     $error_log_syslog            = undef,
     $fallbackresource            = undef,
     $scriptalias                 = undef,
+    $scriptaliases               = [],
     $proxy_dest                  = undef,
     $proxy_pass                  = undef,
     $sslproxyengine              = false,
@@ -282,7 +283,7 @@
   }
 
   # Load mod_alias if needed and not yet loaded
-  if $scriptalias or ($redirect_source and $redirect_dest) {
+  if ($scriptalias or $scriptaliases != []) or ($redirect_source and $redirect_dest) {
     if ! defined(Class['apache::mod::alias']) {
       include apache::mod::alias
     }
@@ -387,6 +388,7 @@
   #   - $rewrite_cond
   # scriptalias fragment:
   #   - $scriptalias
+  #   - $scriptaliases
   #   - $ssl
   # serveralias fragment:
   #   - $serveraliases
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 27de85c5ba..cc56f93342 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -198,10 +198,34 @@
           :notmatch => /ErrorLog.+$/,
         },
         {
-          :title => 'should accept scriptaliases',
+          :title => 'should accept a scriptalias',
           :attr  => 'scriptalias',
           :value => '/usr/scripts',
-          :match => '  ScriptAlias /cgi-bin/ "/usr/scripts/"',
+          :match => [
+            '  ScriptAlias /cgi-bin/ "/usr/scripts/"',
+            '  <Directory "/usr/scripts/">',
+          ],
+        },
+        {
+          :title    => 'should accept a single scriptaliases',
+          :attr     => 'scriptaliases',
+          :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
+          :match    => [
+            '  ScriptAlias /blah/ "/usr/scripts/"',
+            '  <Directory "/usr/scripts/">',
+          ],
+          :nomatch  => /ScriptAlias \/cgi\-bin\//
+        },
+        {
+          :title    => 'should accept multiple scriptaliases',
+          :attr     => 'scriptaliases',
+          :value    => [ { 'alias' => '/blah/', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts' } ],
+          :match    => [
+            '  ScriptAlias /blah/ "/usr/scripts/"',
+            '  ScriptAlias /blah2/ "/usr/scripts/"',
+            '  <Directory "/usr/scripts/">',
+          ],
+          :nomatch  => /ScriptAlias \/cgi\-bin\//
         },
         {
           :title    => 'should accept proxy destinations',
diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index 0262055f37..098d495dd2 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -1,8 +1,26 @@
-<% if @scriptalias -%>
-
+<% if @scriptaliases.is_a?(Array) -%>
+<%  aliases = @scriptaliases -%>
+<% elsif @scriptaliases.is_a?(Hash) -%>
+<%  aliases = [@scriptaliases] -%>
+<% else -%>
+<%  # Nothing to do with any other data type -%>
+<%  aliases = [] -%>
+<% end -%>
+<% if @scriptalias or !aliases.empty? -%>
+<%# Combine scriptalais and scriptaliases into a single data structure -%>
+<%# for backward compatibility and ease of implementation -%>
+<% aliases << { 'alias' => '/cgi-bin/', 'path' => @scriptalias } if @scriptalias -%>
+<% aliases.flatten.compact! %>
+<%# Multiple paths could be provided for the same directory, make sure we only -%>
+<%# add a single <Directory> entry per path -%>
+<% dirs = aliases.map { |h| h['path'] }.uniq.compact -%>
+<% aliases.each do |salias| -%>
   ## Script alias directives
-  ScriptAlias /cgi-bin/ "<%= @scriptalias %>/"
-  <Directory "<%= @scriptalias %>">
+  ScriptAlias <%= salias['alias'] %> "<%= salias['path'] %>/"
+<% end -%>
+
+<% dirs.sort.each do |dir| -%>
+  <Directory "<%= dir %>">
     AllowOverride None
     Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
     Order allow,deny
@@ -12,3 +30,5 @@
 <% end -%>
   </Directory>
 <% end -%>
+
+<% end -%>

From 5048acd2f182d5763dd07686d395f05a11be6927 Mon Sep 17 00:00:00 2001
From: Juan Treminio <jtreminio@gmail.com>
Date: Mon, 28 Oct 2013 16:32:52 -0500
Subject: [PATCH 0019/2267] Checked that Package declaration has not been
 defined yet. Fixes #424

---
 manifests/mod.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index f8f564dc9c..25ac9fa6f6 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -31,7 +31,7 @@
   } elsif "${mod_package}" {
     $package_REAL = $mod_package
   }
-  if $package_REAL {
+  if $package_REAL and ! defined(Package[$package_REAL]) {
     # $package_REAL may be an array
     package { $package_REAL:
       ensure  => $package_ensure,

From 40a2241cebfdc34e8f079202c107d7eae969e939 Mon Sep 17 00:00:00 2001
From: Terri Haber <terrimonster@gmail.com>
Date: Wed, 30 Oct 2013 16:38:15 -0700
Subject: [PATCH 0020/2267] fixing php test

---
 tests/php.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/php.pp b/tests/php.pp
index 618e0ebd2d..1d926bfb46 100644
--- a/tests/php.pp
+++ b/tests/php.pp
@@ -1 +1,4 @@
-include apache::php
+class { 'apache':
+  mpm_module => 'prefork',
+}
+include apache::mod::php

From f327c63bfa5175dd19579f4b9e74886934c03511 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 4 Nov 2013 14:29:12 -0700
Subject: [PATCH 0021/2267] allow allow_from to be set for mod_status

---
 manifests/mod/status.pp         |  4 +++-
 spec/classes/mod/status_spec.rb | 40 +++++++++++++++++++++++++++++++++
 templates/mod/status.conf.erb   |  2 +-
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 spec/classes/mod/status_spec.rb

diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 084d84eeac..f9f63f56fc 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -1,4 +1,6 @@
-class apache::mod::status {
+class apache::mod::status (
+  $allow_from = ['127.0.0.1','::1'],
+){
   apache::mod { 'status': }
   # Template uses no variables
   file { 'status.conf':
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
new file mode 100644
index 0000000000..1a475d3530
--- /dev/null
+++ b/spec/classes/mod/status_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe 'apache::mod::status', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+
+  let :facts do
+    {
+      :osfamily               => 'RedHat',
+      :operatingsystemrelease => '6',
+      :concat_basedir         => '/dne',
+    }
+  end
+
+  it { should contain_apache__mod('status') }
+
+  context 'default' do
+    it { should contain_file('status.conf').with_content(/Allow from 127\.0\.0\.1 ::1/) }
+  end
+
+  context 'custom allow_from (string)' do
+    let :params do
+      {
+        :allow_from => '1.2.3.4'
+      }
+    end
+    it { should contain_file('status.conf').with_content(/Allow from 1\.2\.3\.4/) }
+  end
+
+  context 'custom allow_from (array)' do
+    let :params do
+      {
+        :allow_from => [ '1.2.3.4', '2.3.4.5' ]
+      }
+    end
+    it { should contain_file('status.conf').with_content(/Allow from 1\.2\.3\.4 2\.3\.4\.5/) }
+  end
+
+end
diff --git a/templates/mod/status.conf.erb b/templates/mod/status.conf.erb
index b29324ee99..ad88279330 100644
--- a/templates/mod/status.conf.erb
+++ b/templates/mod/status.conf.erb
@@ -2,7 +2,7 @@
     SetHandler server-status
     Order deny,allow
     Deny from all
-    Allow from 127.0.0.1 ::1
+    Allow from <%= Array(@allow_from).join(" ") %>
 </Location>
 ExtendedStatus On
 

From 8493febdc4a65737456ca9bc21f543bb51ec1a5e Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 4 Nov 2013 14:51:41 -0700
Subject: [PATCH 0022/2267] ensure default vhost config files are removed when
 false

---
 manifests/init.pp           | 47 ++++++++++++++++++++++---------------
 spec/classes/apache_spec.rb | 27 +++++++++++++++++++++
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3d7f368bab..560c0d9606 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -59,6 +59,7 @@
   }
 
   validate_bool($default_vhost)
+  validate_bool($default_ssl_vhost)
   # true/false is sufficient for both ensure and enable
   validate_bool($service_enable)
   if $mpm_module {
@@ -247,26 +248,34 @@
     if $mpm_module {
       class { "apache::mod::${mpm_module}": }
     }
-    if $default_vhost {
-      apache::vhost { 'default':
-        port            => 80,
-        docroot         => $docroot,
-        scriptalias     => $scriptalias,
-        serveradmin     => $serveradmin,
-        access_log_file => $access_log_file,
-        priority        => '15',
-      }
+
+    $default_vhost_ensure = $default_vhost ? {
+      true  => 'present',
+      false => 'absent'
     }
-    if $default_ssl_vhost {
-      apache::vhost { 'default-ssl':
-        port            => 443,
-        ssl             => true,
-        docroot         => $docroot,
-        scriptalias     => $scriptalias,
-        serveradmin     => $serveradmin,
-        access_log_file => "ssl_${access_log_file}",
-        priority        => '15',
-      }
+    $default_ssl_vhost_ensure = $default_ssl_vhost ? {
+      true  => 'present',
+      false => 'absent'
+    }
+
+    apache::vhost { 'default':
+      ensure          => $default_vhost_ensure,
+      port            => 80,
+      docroot         => $docroot,
+      scriptalias     => $scriptalias,
+      serveradmin     => $serveradmin,
+      access_log_file => $access_log_file,
+      priority        => '15',
+    }
+    apache::vhost { 'default-ssl':
+      ensure          => $default_ssl_vhost_ensure,
+      port            => 443,
+      ssl             => true,
+      docroot         => $docroot,
+      scriptalias     => $scriptalias,
+      serveradmin     => $serveradmin,
+      access_log_file => "ssl_${access_log_file}",
+      priority        => '15',
     }
   }
 }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 51218cfd1b..1dd0ba1808 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -356,4 +356,31 @@
       end
     end
   end
+  context 'on all OSes' do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    context 'default vhost defaults' do
+      it { should contain_apache__vhost('default').with_ensure('present') }
+      it { should contain_apache__vhost('default-ssl').with_ensure('absent') }
+    end
+    context 'without default non-ssl vhost' do
+      let :params do {
+        :default_vhost  => false
+      }
+      end
+      it { should contain_apache__vhost('default').with_ensure('absent') }
+    end
+    context 'with default ssl vhost' do
+      let :params do {
+          :default_ssl_vhost  => true
+        }
+      end
+      it { should contain_apache__vhost('default').with_ensure('present') }
+    end
+  end
 end

From b87ce2d598e729729a5ef4f7b5c88230f9ba7b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Mon, 4 Nov 2013 22:58:28 +0100
Subject: [PATCH 0023/2267] add $root_group parameter

---
 manifests/init.pp        | 2 +-
 manifests/mod.pp         | 6 +++---
 manifests/mod/itk.pp     | 2 +-
 manifests/mod/prefork.pp | 2 +-
 manifests/mod/worker.pp  | 2 +-
 manifests/params.pp      | 2 ++
 manifests/vhost.pp       | 6 +++---
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3d7f368bab..74f3ceec1a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -177,7 +177,7 @@
 
   concat { $ports_file:
     owner   => 'root',
-    group   => 'root',
+    group   => $apache::params::root_group,
     mode    => '0644',
     notify  => Class['Apache::Service'],
     require => Package['httpd'],
diff --git a/manifests/mod.pp b/manifests/mod.pp
index f8f564dc9c..7494d90c01 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -44,7 +44,7 @@
     ensure  => file,
     path    => "${mod_dir}/${mod}.load",
     owner   => 'root',
-    group   => 'root',
+    group   => $apache::params::root_group,
     mode    => '0644',
     content => "LoadModule ${mod}_module ${lib_path}/${lib_REAL}\n",
     require => [
@@ -62,7 +62,7 @@
       path    => "${enable_dir}/${mod}.load",
       target  => "${mod_dir}/${mod}.load",
       owner   => 'root',
-      group   => 'root',
+      group   => $apache::params::root_group,
       mode    => '0644',
       require => [
         File["${mod}.load"],
@@ -80,7 +80,7 @@
         path    => "${enable_dir}/${mod}.conf",
         target  => "${mod_dir}/${mod}.conf",
         owner   => 'root',
-        group   => 'root',
+        group   => $apache::params::root_group,
         mode    => '0644',
         require => [
           File["${mod}.conf"],
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index ba61bd9001..a2f4b5c707 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -14,7 +14,7 @@
   }
   File {
     owner => 'root',
-    group => 'root',
+    group => $apache::params::root_group,
     mode  => '0644',
   }
 
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 5c6a7def97..d9cc2b6b3c 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -14,7 +14,7 @@
   }
   File {
     owner => 'root',
-    group => 'root',
+    group => $apache::params::root_group,
     mode  => '0644',
   }
 
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 3966ed23d5..77c244264f 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -15,7 +15,7 @@
   }
   File {
     owner => 'root',
-    group => 'root',
+    group => $apache::params::root_group,
     mode  => '0644',
   }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 2827e5baf1..07380e5355 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -35,6 +35,7 @@
   if $::osfamily == 'RedHat' or $::operatingsystem == 'amazon' {
     $user                 = 'apache'
     $group                = 'apache'
+    $root_group           = 'root'
     $apache_name          = 'httpd'
     $httpd_dir            = '/etc/httpd'
     $conf_dir             = "${httpd_dir}/conf"
@@ -85,6 +86,7 @@
   } elsif $::osfamily == 'Debian' {
     $user             = 'www-data'
     $group            = 'www-data'
+    $root_group       = 'root'
     $apache_name      = 'apache2'
     $httpd_dir        = '/etc/apache2'
     $conf_dir         = $httpd_dir
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f50e88852e..7ed0744ffe 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -65,7 +65,7 @@
     $ip_based                    = false,
     $add_listen                  = true,
     $docroot_owner               = 'root',
-    $docroot_group               = 'root',
+    $docroot_group               = $apache::params::root_group,
     $serveradmin                 = false,
     $ssl                         = false,
     $ssl_cert                    = $apache::default_ssl_cert,
@@ -420,7 +420,7 @@
     path    => "${apache::vhost_dir}/${priority_real}-${filename}.conf",
     content => template('apache/vhost.conf.erb'),
     owner   => 'root',
-    group   => 'root',
+    group   => $apache::params::root_group,
     mode    => '0644',
     require => [
       Package['httpd'],
@@ -440,7 +440,7 @@
       path    => "${vhost_enable_dir}/${priority_real}-${filename}.conf",
       target  => "${apache::vhost_dir}/${priority_real}-${filename}.conf",
       owner   => 'root',
-      group   => 'root',
+      group   => $apache::params::root_group,
       mode    => '0644',
       require => File["${priority_real}-${filename}.conf"],
       notify  => Service['httpd'],

From d9b67b1a800cffc9225f454fbe252143b8e991a9 Mon Sep 17 00:00:00 2001
From: Ken Geis <kgeis@berkeley.edu>
Date: Mon, 4 Nov 2013 14:59:31 -0800
Subject: [PATCH 0024/2267] According to Apache docs
 http://httpd.apache.org/docs/current/mod/core.html#allowoverride
 "AllowOverride is valid only in <Directory> sections specified without
 regular expressions, not in <Location>, <DirectoryMatch> or <Files>
 sections."

---
 templates/vhost/_directories.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 9f98c9c977..ab6c09fce4 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -15,10 +15,12 @@
     <%- if directory['options'] -%>
     Options <%= Array(directory['options']).join(' ') %>
     <%- end -%>
-    <%- if directory['allow_override'] -%>
+    <%- if directory['provider'] == 'directory' %>
+      <%- if directory['allow_override'] -%>
     AllowOverride <%= Array(directory['allow_override']).join(' ') %>
-    <%- else -%>
+      <%- else -%>
     AllowOverride None
+      <%- end -%>
     <%- end -%>
     <%- if directory['order'] and directory['order'] != '' -%>
     Order <%= Array(directory['order']).join(',') %>

From 4df57e598302297f74feade60964ca1336a2f5ff Mon Sep 17 00:00:00 2001
From: Ken Geis <kgeis@berkeley.edu>
Date: Mon, 4 Nov 2013 15:10:33 -0800
Subject: [PATCH 0025/2267] provider is capitalized

---
 templates/vhost/_directories.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index ab6c09fce4..8d6ef68615 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -15,7 +15,7 @@
     <%- if directory['options'] -%>
     Options <%= Array(directory['options']).join(' ') %>
     <%- end -%>
-    <%- if directory['provider'] == 'directory' %>
+    <%- if directory['provider'] == 'Directory' %>
       <%- if directory['allow_override'] -%>
     AllowOverride <%= Array(directory['allow_override']).join(' ') %>
       <%- else -%>

From 1444797c274882c079a91e8e46ee155522d9511c Mon Sep 17 00:00:00 2001
From: Stan Borbat <stan@borbat.com>
Date: Wed, 6 Nov 2013 22:03:58 -0500
Subject: [PATCH 0026/2267] Fixed a typo. The directory provider should be
 lower case to match the manifests.

---
 templates/vhost/_directories.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 8d6ef68615..ab6c09fce4 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -15,7 +15,7 @@
     <%- if directory['options'] -%>
     Options <%= Array(directory['options']).join(' ') %>
     <%- end -%>
-    <%- if directory['provider'] == 'Directory' %>
+    <%- if directory['provider'] == 'directory' %>
       <%- if directory['allow_override'] -%>
     AllowOverride <%= Array(directory['allow_override']).join(' ') %>
       <%- else -%>

From 7899e8f52e73b0716ccd0f38edba0e47836f31af Mon Sep 17 00:00:00 2001
From: Maarten van Schaik <maarten@byte.nl>
Date: Fri, 25 Oct 2013 16:20:06 +0200
Subject: [PATCH 0027/2267] Remove AllowOverride header for non-directories

When adding a dir with a different provider than directory (e.g. files,
or location), the AllowOverride header still added. This causes a
warning in apache.
---
 templates/vhost/_directories.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 8d6ef68615..6625c0f068 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -18,7 +18,7 @@
     <%- if directory['provider'] == 'Directory' %>
       <%- if directory['allow_override'] -%>
     AllowOverride <%= Array(directory['allow_override']).join(' ') %>
-      <%- else -%>
+      <%- elsif provider == 'Directory' -%>
     AllowOverride None
       <%- end -%>
     <%- end -%>

From bf316539a94a8c3a34a492bdf34bd07cdcfc3be6 Mon Sep 17 00:00:00 2001
From: Maarten <maarten@informaarten.nl>
Date: Sun, 27 Oct 2013 11:57:39 +0000
Subject: [PATCH 0028/2267] Add unit tests

---
 spec/defines/vhost_spec.rb | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index cc56f93342..988b7f1f07 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -447,6 +447,36 @@
             '  <Directory /rspec/docroot>',
           ],
         },
+        {
+          :title => 'should accept location for provider',
+          :attr  => 'directories',
+          :value => {
+            'path'     => '/',
+            'provider' => 'location',
+          },
+          :notmatch => '    AllowOverride None',
+          :match => [
+            '  <Location />',
+            '    Order allow,deny',
+            '    Allow from all',
+            '  </Location>',
+          ],
+        },
+        {
+          :title => 'should accept files for provider',
+          :attr  => 'directories',
+          :value => {
+            'path'     => 'index.html',
+            'provider' => 'files',
+          },
+          :notmatch => '    AllowOverride None',
+          :match => [
+            '  <Files index.html>',
+            '    Order allow,deny',
+            '    Allow from all',
+            '  </Files>',
+          ],
+        },
         {
           :title => 'should contain virtual_docroot',
           :attr  => 'virtual_docroot',

From 88d35a8777af2cfdbec71c9b8f73bc91d8b960bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Mon, 4 Nov 2013 23:15:02 +0100
Subject: [PATCH 0029/2267] added $service_name parameter

---
 README.md                    |  4 ++++
 manifests/init.pp            |  2 ++
 manifests/params.pp          |  2 ++
 manifests/service.pp         |  7 ++++++-
 spec/classes/service_spec.rb | 15 +++++++++++++++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 889374797d..a184af71e6 100644
--- a/README.md
+++ b/README.md
@@ -227,6 +227,10 @@ The default certificate revocation list path, which is automatically set to 'und
 
 The default certificate revocation list to use, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
+#####`service_name`
+
+Name of apache service to run. Defaults to: `'httpd'` on RedHat and `'apache2'` on Debian.
+
 #####`service_enable`
 
 Determines whether the 'httpd' service is enabled when the machine is booted. Defaults to 'true'.
diff --git a/manifests/init.pp b/manifests/init.pp
index edadadf9ad..87deb3e5a8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,6 +13,7 @@
 # Sample Usage:
 #
 class apache (
+  $service_name         = $apache::params::service_name,
   $default_mods         = true,
   $default_vhost        = true,
   $default_ssl_vhost    = false,
@@ -86,6 +87,7 @@
   }
 
   class { 'apache::service':
+    service_name   => $service_name,
     service_enable => $service_enable,
     service_ensure => $service_ensure,
   }
diff --git a/manifests/params.pp b/manifests/params.pp
index 07380e5355..bef2acc5ce 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -37,6 +37,7 @@
     $group                = 'apache'
     $root_group           = 'root'
     $apache_name          = 'httpd'
+    $service_name         = 'httpd'
     $httpd_dir            = '/etc/httpd'
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
@@ -88,6 +89,7 @@
     $group            = 'www-data'
     $root_group       = 'root'
     $apache_name      = 'apache2'
+    $service_name     = 'apache2'
     $httpd_dir        = '/etc/apache2'
     $conf_dir         = $httpd_dir
     $confd_dir        = "${httpd_dir}/conf.d"
diff --git a/manifests/service.pp b/manifests/service.pp
index c95d3ca484..82a0b8ca61 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -17,14 +17,19 @@
 #
 #
 class apache::service (
+  $service_name   = $apache::params::service_name,
   $service_enable = true,
   $service_ensure = 'running',
 ) {
+  # The base class must be included first because parameter defaults depend on it
+  if ! defined(Class['apache::params']) {
+    fail('You must include the apache::params class before using any apache defined resources')
+  }
   validate_bool($service_enable)
 
   service { 'httpd':
     ensure => $service_ensure,
-    name   => $apache::apache_name,
+    name   => $service_name,
     enable => $service_enable,
   }
 }
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 037790eab1..836ac27b79 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe 'apache::service', :type => :class do
+  let :pre_condition do
+    'include apache::params'
+  end
   context "on a Debian OS" do
     let :facts do
       {
@@ -10,14 +13,24 @@
       }
     end
     it { should contain_service("httpd").with(
+      'name'      => 'apache2',
       'ensure'    => 'running',
       'enable'    => 'true'
       )
     }
 
+    context "with $service_name => 'foo'" do
+      let (:params) {{ :service_name => 'foo' }}
+      it { should contain_service("httpd").with(
+        'name'      => 'foo'
+        )
+      }
+    end
+
     context "with $service_enable => true" do
       let (:params) {{ :service_enable => true }}
       it { should contain_service("httpd").with(
+        'name'      => 'apache2',
         'ensure'    => 'running',
         'enable'    => 'true'
         )
@@ -27,6 +40,7 @@
     context "with $service_enable => false" do
       let (:params) {{ :service_enable => false }}
       it { should contain_service("httpd").with(
+        'name'      => 'apache2',
         'ensure'    => 'running',
         'enable'    => 'false'
         )
@@ -70,6 +84,7 @@
       }
     end
     it { should contain_service("httpd").with(
+      'name'      => 'httpd',
       'ensure'    => 'running',
       'enable'    => 'true'
       )

From f61deb70ace4f1c6f11fd657a0ef85278750d102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Mon, 4 Nov 2013 23:52:41 +0100
Subject: [PATCH 0030/2267] added peruser and event mpms

---
 manifests/mod/event.pp           | 54 +++++++++++++++++++++++
 manifests/mod/itk.pp             |  6 +++
 manifests/mod/peruser.pp         | 73 ++++++++++++++++++++++++++++++++
 manifests/mod/prefork.pp         | 10 ++++-
 manifests/mod/worker.pp          | 11 +++++
 spec/classes/apache_spec.rb      |  6 +++
 spec/classes/mod/event_spec.rb   |  6 +++
 spec/classes/mod/peruser_spec.rb |  6 +++
 templates/mod/event.conf.erb     |  9 ++++
 templates/mod/peruser.conf.erb   | 12 ++++++
 10 files changed, 191 insertions(+), 2 deletions(-)
 create mode 100644 manifests/mod/event.pp
 create mode 100644 manifests/mod/peruser.pp
 create mode 100644 spec/classes/mod/event_spec.rb
 create mode 100644 spec/classes/mod/peruser_spec.rb
 create mode 100644 templates/mod/event.conf.erb
 create mode 100644 templates/mod/peruser.conf.erb

diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
new file mode 100644
index 0000000000..473f7c24cd
--- /dev/null
+++ b/manifests/mod/event.pp
@@ -0,0 +1,54 @@
+class apache::mod::event (
+  $startservers        = '2',
+  $maxclients          = '150',
+  $minsparethreads     = '25',
+  $maxsparethreads     = '75',
+  $threadsperchild     = '25',
+  $maxrequestsperchild = '0',
+  $serverlimit         = '25',
+) {
+  if defined(Class['apache::mod::itk']) {
+    fail('May not include both apache::mod::event and apache::mod::itk on the same node')
+  }
+  if defined(Class['apache::mod::peruser']) {
+    fail('May not include both apache::mod::event and apache::mod::peruser on the same node')
+  }
+  if defined(Class['apache::mod::prefork']) {
+    fail('May not include both apache::mod::event and apache::mod::prefork on the same node')
+  }
+  if defined(Class['apache::mod::worker']) {
+    fail('May not include both apache::mod::event and apache::mod::worker on the same node')
+  }
+  File {
+    owner => 'root',
+    group => $apache::params::root_group,
+    mode  => '0644',
+  }
+
+  # Template uses:
+  # - $startservers
+  # - $maxclients
+  # - $minsparethreads
+  # - $maxsparethreads
+  # - $threadsperchild
+  # - $maxrequestsperchild
+  # - $serverlimit
+  file { "${apache::mod_dir}/event.conf":
+    ensure  => file,
+    content => template('apache/mod/event.conf.erb'),
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+
+  case $::osfamily {
+    'freebsd' : {
+      class { 'apache::package':
+        mpm_module => 'event'
+      }
+    }
+    default: {
+      fail("Unsupported osfamily ${::osfamily}")
+    }
+  }
+}
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index a2f4b5c707..8abbb1c18a 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -6,6 +6,12 @@
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
 ) {
+  if defined(Class['apache::mod::event']) {
+    fail('May not include both apache::mod::itk and apache::mod::event on the same node')
+  }
+  if defined(Class['apache::mod::peruser']) {
+    fail('May not include both apache::mod::itk and apache::mod::peruser on the same node')
+  }
   if defined(Class['apache::mod::prefork']) {
     fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
   }
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
new file mode 100644
index 0000000000..fafeff23a9
--- /dev/null
+++ b/manifests/mod/peruser.pp
@@ -0,0 +1,73 @@
+class apache::mod::peruser (
+  $minspareprocessors = '2',
+  $minprocessors = '2',
+  $maxprocessors = '10',
+  $maxclients = '150',
+  $maxrequestsperchild = '1000',
+  $idletimeout = '120',
+  $expiretimeout = '120',
+  $keepalive = 'Off',
+) {
+  if defined(Class['apache::mod::event']) {
+    fail('May not include both apache::mod::peruser and apache::mod::event on the same node')
+  }
+  if defined(Class['apache::mod::itk']) {
+    fail('May not include both apache::mod::peruser and apache::mod::itk on the same node')
+  }
+  if defined(Class['apache::mod::prefork']) {
+    fail('May not include both apache::mod::peruser and apache::mod::prefork on the same node')
+  }
+  if defined(Class['apache::mod::worker']) {
+    fail('May not include both apache::mod::peruser and apache::mod::worker on the same node')
+  }
+  File {
+    owner => 'root',
+    group => $apache::params::root_group,
+    mode  => '0644',
+  }
+
+  $mod_dir = $apache::mod_dir
+
+  # Template uses:
+  # - $minspareprocessors
+  # - $minprocessors
+  # - $maxprocessors
+  # - $maxclients
+  # - $maxrequestsperchild
+  # - $idletimeout
+  # - $expiretimeout
+  # - $keepalive
+  # - $mod_dir
+  file { "${apache::mod_dir}/peruser.conf":
+    ensure  => file,
+    content => template('apache/mod/peruser.conf.erb'),
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+  file { "${apache::mod_dir}/peruser":
+    ensure  => directory,
+    require => File[$apache::mod_dir],
+  }
+  file { "${apache::mod_dir}/peruser/multiplexers":
+    ensure  => directory,
+    require => File["${apache::mod_dir}/peruser"],
+  }
+  file { "${apache::mod_dir}/peruser/processors":
+    ensure  => directory,
+    require => File["${apache::mod_dir}/peruser"],
+  }
+
+  apache::peruser::multiplexer { '01-default': }
+
+  case $::osfamily {
+    'freebsd' : {
+      class { 'apache::package':
+        mpm_module => 'peruser'
+      }
+    }
+    default: {
+      fail("Unsupported osfamily ${::osfamily}")
+    }
+  }
+}
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index d9cc2b6b3c..91f0f1c30b 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -6,11 +6,17 @@
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
 ) {
+  if defined(Class['apache::mod::event']) {
+    fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
+  }
   if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
+    fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
+  }
+  if defined(Class['apache::mod::peruser']) {
+    fail('May not include both apache::mod::prefork and apache::mod::peruser on the same node')
   }
   if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::worker and apache::mod::prefork on the same node')
+    fail('May not include both apache::mod::prefork and apache::mod::worker on the same node')
   }
   File {
     owner => 'root',
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 77c244264f..272891176c 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -7,9 +7,15 @@
   $maxrequestsperchild = '0',
   $serverlimit         = '25',
 ) {
+  if defined(Class['apache::mod::event']) {
+    fail('May not include both apache::mod::worker and apache::mod::event on the same node')
+  }
   if defined(Class['apache::mod::itk']) {
     fail('May not include both apache::mod::worker and apache::mod::itk on the same node')
   }
+  if defined(Class['apache::mod::peruser']) {
+    fail('May not include both apache::mod::worker and apache::mod::peruser on the same node')
+  }
   if defined(Class['apache::mod::prefork']) {
     fail('May not include both apache::mod::worker and apache::mod::prefork on the same node')
   }
@@ -57,6 +63,11 @@
         ensure => present,
       }
     }
+    'freebsd' : {
+      class { 'apache::package':
+        mpm_module => 'worker'
+      }
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 1dd0ba1808..919b4ec0c5 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -239,7 +239,9 @@
           { :mpm_module => false }
         end
         it 'should not declare mpm modules' do
+          should_not contain_class('apache::mod::event')
           should_not contain_class('apache::mod::itk')
+          should_not contain_class('apache::mod::peruser')
           should_not contain_class('apache::mod::prefork')
           should_not contain_class('apache::mod::worker')
         end
@@ -249,7 +251,9 @@
           { :mpm_module => 'prefork' }
         end
         it { should contain_class('apache::mod::prefork') }
+        it { should_not contain_class('apache::mod::event') }
         it { should_not contain_class('apache::mod::itk') }
+        it { should_not contain_class('apache::mod::peruser') }
         it { should_not contain_class('apache::mod::worker') }
       end
       context "when declaring mpm_module => worker" do
@@ -257,7 +261,9 @@
           { :mpm_module => 'worker' }
         end
         it { should contain_class('apache::mod::worker') }
+        it { should_not contain_class('apache::mod::event') }
         it { should_not contain_class('apache::mod::itk') }
+        it { should_not contain_class('apache::mod::peruser') }
         it { should_not contain_class('apache::mod::prefork') }
       end
       context "when declaring mpm_module => breakme" do
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
new file mode 100644
index 0000000000..75c0e70b4c
--- /dev/null
+++ b/spec/classes/mod/event_spec.rb
@@ -0,0 +1,6 @@
+describe 'apache::mod::event', :type => :class do
+  let :pre_condition do
+    'class { "apache": mpm_module => false, }'
+  end
+  # TBD
+end
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
new file mode 100644
index 0000000000..370d0fd2ba
--- /dev/null
+++ b/spec/classes/mod/peruser_spec.rb
@@ -0,0 +1,6 @@
+describe 'apache::mod::peruser', :type => :class do
+  let :pre_condition do
+    'class { "apache": mpm_module => false, }'
+  end
+  # TBD
+end
diff --git a/templates/mod/event.conf.erb b/templates/mod/event.conf.erb
new file mode 100644
index 0000000000..40099543d5
--- /dev/null
+++ b/templates/mod/event.conf.erb
@@ -0,0 +1,9 @@
+<IfModule mpm_event_module>
+  ServerLimit         <%= @serverlimit %>
+  StartServers        <%= @startservers %>
+  MaxClients          <%= @maxclients %>
+  MinSpareThreads     <%= @minsparethreads %>
+  MaxSpareThreads     <%= @maxsparethreads %>
+  ThreadsPerChild     <%= @threadsperchild %>
+  MaxRequestsPerChild <%= @maxrequestsperchild %>
+</IfModule>
diff --git a/templates/mod/peruser.conf.erb b/templates/mod/peruser.conf.erb
new file mode 100644
index 0000000000..8f44c72b0b
--- /dev/null
+++ b/templates/mod/peruser.conf.erb
@@ -0,0 +1,12 @@
+<IfModule mpm_peruser_module>
+  MinSpareProcessors  <%= @minspareprocessors %>
+  MinProcessors       <%= @minprocessors %>
+  MaxProcessors       <%= @maxprocessors %>
+  MaxClients          <%= @maxclients %>
+  MaxRequestsPerChild <%= @maxrequestsperchild %>
+  IdleTimeout         <%= @idletimeout %>
+  ExpireTimeout       <%= @expiretimeout %>
+  KeepAlive           <%= @keepalive %>
+  Include             <%= @mod_dir %>/peruser/multiplexers/*.conf
+  Include             <%= @mod_dir %>/peruser/processors/*.conf
+</IfModule>

From 7aaa9000cde67356e60a996792eddbb098c7bc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Thu, 7 Nov 2013 11:05:32 +0100
Subject: [PATCH 0031/2267] Workaround for apxs-loaded modules

On some OSes (FreeBSD) apxs tool is used to put LoadModule directives
into httpd.conf during apache package (and apache modules)
insallation/reinstallation. The apxs expects some LoadModule directives
to be already present in httpd.conf (they may be commented-out) in order
to decide where to put its own directives.

This PR puts fake LoadModule directive (commented out) to httpd.conf.
The $apxs_workaround boolean parameter in apache class decides, whether
to use this workaround or not. This is used on FreeBSD, where apxs is
used by ports package provider (and perhaps all other). Without this,
the apache installation/reinstallation/deinstallation as well as
installation of additional modules would fail.

This PR was created in order to split #342 into smaller parts to make
review process easier, see
https://github.com/puppetlabs/puppetlabs-apache/pull/342#issuecomment-25423813
---
 manifests/init.pp        | 7 +++++++
 templates/httpd.conf.erb | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index edadadf9ad..9da86c22fe 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -210,6 +210,12 @@
         fail("Unsupported osfamily ${::osfamily}")
       }
     }
+
+    $apxs_workaround = $::osfamily ? {
+      'freebsd' => true,
+      default   => false
+    }
+
     # Template uses:
     # - $httpd_dir
     # - $pidfile
@@ -224,6 +230,7 @@
     # - $vhost_dir
     # - $error_documents
     # - $error_documents_path
+    # - $apxs_workaround
     # - $keepalive
     # - $keepalive_timeout
     file { "${apache::params::conf_dir}/${apache::params::conf_file}":
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 0345f1cf4c..5f04b8a592 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -33,6 +33,14 @@ LogLevel warn
 EnableSendfile <%= @sendfile %>
 
 #Listen 80
+
+<% if @apxs_workaround -%>
+# Workaround: without this hack apxs would be confused about where to put
+# LoadModule directives and fail entire procedure of apache package
+# installation/reinstallation. This problem was observed on FreeBSD (apache22).
+#LoadModule fake_module libexec/apache22/mod_fake.so
+<% end -%>
+
 Include <%= @mod_load_dir %>/*.load
 <% if @mod_load_dir != @confd_dir and @mod_load_dir != @vhost_load_dir -%>
 Include <%= @mod_load_dir %>/*.conf

From 6811d92c86cd9c66278dab463e67e6cf0b6a61f7 Mon Sep 17 00:00:00 2001
From: Martin Hellmich <mhellmic@gmail.com>
Date: Tue, 27 Aug 2013 12:04:15 +0200
Subject: [PATCH 0032/2267] allow to choose the mpm_event mod from the init.pp

added a mod/event.pp manifest and edited the spec test
of the prefork/worker/event modules.
---
 manifests/init.pp                  |  2 +-
 manifests/mod/mpm_event.pp         | 11 -----------
 spec/system/prefork_worker_spec.rb | 25 +++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 12 deletions(-)
 delete mode 100644 manifests/mod/mpm_event.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index 43b7e15d90..af8f87c325 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -64,7 +64,7 @@
   # true/false is sufficient for both ensure and enable
   validate_bool($service_enable)
   if $mpm_module {
-    validate_re($mpm_module, '(prefork|worker|itk)')
+    validate_re($mpm_module, '(prefork|worker|itk|event)')
   }
   validate_re($sendfile, [ '^[oO]n$' , '^[oO]ff$' ])
 
diff --git a/manifests/mod/mpm_event.pp b/manifests/mod/mpm_event.pp
deleted file mode 100644
index 92e558e17f..0000000000
--- a/manifests/mod/mpm_event.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class apache::mod::mpm_event {
-  # Template uses no variables
-  file { 'mpm_event.conf':
-    ensure  => file,
-    path    => "${apache::mod_dir}/mpm_event.conf",
-    content => template('apache/mod/mpm_event.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/spec/system/prefork_worker_spec.rb b/spec/system/prefork_worker_spec.rb
index 69e87532d9..d7715737d3 100644
--- a/spec/system/prefork_worker_spec.rb
+++ b/spec/system/prefork_worker_spec.rb
@@ -9,6 +9,31 @@
   raise "Unconfigured OS for apache service on #{node.facts['osfamily']}"
 end
 
+describe 'apache::mod::event class' do
+  describe 'running puppet code' do
+    # Using puppet_apply as a helper
+    it 'should work with no errors' do
+      pp = <<-EOS
+        class { 'apache':
+          mpm_module => 'event',
+        }
+      EOS
+
+      # Run it twice and test for idempotency
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+        r.refresh
+        r.exit_code.should be_zero
+      end
+    end
+  end
+
+  describe service(servicename) do
+    it { should be_running }
+    it { should be_enabled }
+  end
+end
+
 describe 'apache::mod::worker class' do
   describe 'running puppet code' do
     # Using puppet_apply as a helper

From 447c36106f5d2bc35c188147304af54729b6d4c6 Mon Sep 17 00:00:00 2001
From: Jonathan Underwood <jonathan.underwood@gmail.com>
Date: Tue, 29 Oct 2013 18:45:33 +0000
Subject: [PATCH 0033/2267] Add initial support for nss module (no directives
 in vhost template yet)

---
 README.md                  |   1 +
 manifests/mod/nss.pp       |  25 ++++
 manifests/params.pp        |   3 +
 templates/mod/nss.conf.erb | 228 +++++++++++++++++++++++++++++++++++++
 4 files changed, 257 insertions(+)
 create mode 100644 manifests/mod/nss.pp
 create mode 100644 templates/mod/nss.conf.erb

diff --git a/README.md b/README.md
index a184af71e6..fa4dfbd21d 100644
--- a/README.md
+++ b/README.md
@@ -360,6 +360,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `mime_magic`*
 * `mpm_event`
 * `negotiation`
+* `nss`*
 * `passenger`*
 * `perl`
 * `php` (requires [`mpm_module`](#mpm_module) set to `prefork`)
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
new file mode 100644
index 0000000000..d96c11e9bd
--- /dev/null
+++ b/manifests/mod/nss.pp
@@ -0,0 +1,25 @@
+class apache::mod::nss (
+  $transfer_log = "${::apache::params::logroot}/access.log",
+  $error_log = "${::apache::params::logroot}/error.log",
+  $passwd_file = undef
+  ) {
+  include apache::mod::mime
+  
+  apache::mod { 'nss': }
+
+  $httpd_dir = $apache::httpd_dir
+  
+  # Template uses:
+  # $transfer_log
+  # $error_log
+  # $http_dir
+  # passwd_file
+  file { 'nss.conf':
+    ensure  => file,
+    path    => "${apache::mod_dir}/nss.conf",
+    content => template('apache/mod/nss.conf.erb'),
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index bef2acc5ce..22728aa7cd 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -76,9 +76,11 @@
       'dav_svn'     => 'mod_dav_svn',
       'suphp'       => 'mod_suphp',
       'xsendfile'   => 'mod_xsendfile',
+      'nss'         => 'mod_nss',
     }
     $mod_libs             = {
       'php5' => 'libphp5.so',
+      'nss'  => 'libmodnss.so',
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $keepalive            = 'Off'
@@ -125,6 +127,7 @@
       'dav_svn'     => 'libapache2-svn',
       'suphp'       => 'libapache2-mod-suphp',
       'xsendfile'   => 'libapache2-mod-xsendfile',
+      'nss'         => 'libapache2-mod-nss',
     }
     $mod_libs         = {
       'php5' => 'libphp5.so',
diff --git a/templates/mod/nss.conf.erb b/templates/mod/nss.conf.erb
new file mode 100644
index 0000000000..8fd538b761
--- /dev/null
+++ b/templates/mod/nss.conf.erb
@@ -0,0 +1,228 @@
+#
+# This is the Apache server configuration file providing SSL support using.
+# the mod_nss plugin.  It contains the configuration directives to instruct
+# the server how to serve pages over an https connection.
+# 
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+
+#LoadModule nss_module modules/libmodnss.so
+
+#
+# When we also provide SSL we have to listen to the 
+# standard HTTP port (see above) and to the HTTPS port
+#
+# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
+#       Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:443"
+#
+Listen 8443
+
+##
+##  SSL Global Context
+##
+##  All SSL configuration in this context applies both to
+##  the main server and all SSL-enabled virtual hosts.
+##
+
+#
+#   Some MIME-types for downloading Certificates and CRLs
+#
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl    .crl
+
+#   Pass Phrase Dialog:
+#   Configure the pass phrase gathering process.
+#   The filtering dialog program (`builtin' is a internal
+#   terminal dialog) has to provide the pass phrase on stdout.
+<% if @passwd_file -%>
+NSSPassPhraseDialog  file:<%= @passwd_file %>
+<% else -%>
+NSSPassPhraseDialog  builtin
+<% end -%>
+
+#   Pass Phrase Helper:
+#   This helper program stores the token password pins between
+#   restarts of Apache.
+NSSPassPhraseHelper /usr/sbin/nss_pcache
+
+#   Configure the SSL Session Cache. 
+#   NSSSessionCacheSize is the number of entries in the cache.
+#   NSSSessionCacheTimeout is the SSL2 session timeout (in seconds).
+#   NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds).
+NSSSessionCacheSize 10000
+NSSSessionCacheTimeout 100
+NSSSession3CacheTimeout 86400
+
+#
+# Pseudo Random Number Generator (PRNG):
+# Configure one or more sources to seed the PRNG of the SSL library.
+# The seed data should be of good random quality.
+# WARNING! On some platforms /dev/random blocks if not enough entropy
+# is available. Those platforms usually also provide a non-blocking
+# device, /dev/urandom, which may be used instead.
+#
+# This does not support seeding the RNG with each connection.
+
+NSSRandomSeed startup builtin
+#NSSRandomSeed startup file:/dev/random  512
+#NSSRandomSeed startup file:/dev/urandom 512
+
+#
+# TLS Negotiation configuration under RFC 5746
+#
+# Only renegotiate if the peer's hello bears the TLS renegotiation_info
+# extension. Default off.
+NSSRenegotiation off
+
+# Peer must send Signaling Cipher Suite Value (SCSV) or
+# Renegotiation Info (RI) extension in ALL handshakes.  Default: off
+NSSRequireSafeNegotiation off
+
+##
+## SSL Virtual Host Context
+##
+
+<VirtualHost _default_:8443>
+
+#   General setup for the virtual host
+#DocumentRoot "/etc/httpd/htdocs"
+#ServerName www.example.com:8443
+#ServerAdmin you@example.com
+
+# mod_nss can log to separate log files, you can choose to do that if you'd like
+# LogLevel is not inherited from httpd.conf.
+ErrorLog <%= @error_log %>
+TransferLog <%= @transfer_log %>
+LogLevel warn
+
+#   SSL Engine Switch:
+#   Enable/Disable SSL for this virtual host.
+NSSEngine on
+
+#   SSL Cipher Suite:
+#   List the ciphers that the client is permitted to negotiate.
+#   See the mod_nss documentation for a complete list.
+
+# SSL 3 ciphers. SSL 2 is disabled by default.
+NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha
+
+# SSL 3 ciphers + ECC ciphers. SSL 2 is disabled by default.
+#
+# Comment out the NSSCipherSuite line above and use the one below if you have
+# ECC enabled NSS and mod_nss and want to use Elliptical Curve Cryptography
+#NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha,-ecdh_ecdsa_null_sha,+ecdh_ecdsa_rc4_128_sha,+ecdh_ecdsa_3des_sha,+ecdh_ecdsa_aes_128_sha,+ecdh_ecdsa_aes_256_sha,-ecdhe_ecdsa_null_sha,+ecdhe_ecdsa_rc4_128_sha,+ecdhe_ecdsa_3des_sha,+ecdhe_ecdsa_aes_128_sha,+ecdhe_ecdsa_aes_256_sha,-ecdh_rsa_null_sha,+ecdh_rsa_128_sha,+ecdh_rsa_3des_sha,+ecdh_rsa_aes_128_sha,+ecdh_rsa_aes_256_sha,-echde_rsa_null,+ecdhe_rsa_rc4_128_sha,+ecdhe_rsa_3des_sha,+ecdhe_rsa_aes_128_sha,+ecdhe_rsa_aes_256_sha
+
+#   SSL Protocol:
+#   Cryptographic protocols that provide communication security.
+#   NSS handles the specified protocols as "ranges", and automatically
+#   negotiates the use of the strongest protocol for a connection starting
+#   with the maximum specified protocol and downgrading as necessary to the
+#   minimum specified protocol that can be used between two processes.
+#   Since all protocol ranges are completely inclusive, and no protocol in the
+#   middle of a range may be excluded, the entry "NSSProtocol SSLv3,TLSv1.1"
+#   is identical to the entry "NSSProtocol SSLv3,TLSv1.0,TLSv1.1".
+NSSProtocol SSLv3,TLSv1.0,TLSv1.1
+
+#   SSL Certificate Nickname:
+#   The nickname of the RSA server certificate you are going to use.
+NSSNickname Server-Cert
+
+#   SSL Certificate Nickname:
+#   The nickname of the ECC server certificate you are going to use, if you
+#   have an ECC-enabled version of NSS and mod_nss
+#NSSECCNickname Server-Cert-ecc
+
+#   Server Certificate Database:
+#   The NSS security database directory that holds the certificates and
+#   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
+#   Provide the directory that these files exist.
+NSSCertificateDatabase <%= @httpd_dir -%>/alias
+
+#   Database Prefix:
+#   In order to be able to store multiple NSS databases in one directory
+#   they need unique names. This option sets the database prefix used for
+#   cert8.db and key3.db.
+#NSSDBPrefix my-prefix-
+
+#   Client Authentication (Type):
+#   Client certificate verification type.  Types are none, optional and
+#   require.
+#NSSVerifyClient none
+
+#
+#   Online Certificate Status Protocol (OCSP).
+#   Verify that certificates have not been revoked before accepting them.
+#NSSOCSP off
+
+#
+#   Use a default OCSP responder. If enabled this will be used regardless
+#   of whether one is included in a client certificate. Note that the
+#   server certificate is verified during startup.
+#
+#   NSSOCSPDefaultURL defines the service URL of the OCSP responder
+#   NSSOCSPDefaultName is the nickname of the certificate to trust to
+#       sign the OCSP responses.
+#NSSOCSPDefaultResponder on
+#NSSOCSPDefaultURL http://example.com/ocsp/status
+#NSSOCSPDefaultName ocsp-nickname
+
+#   Access Control:
+#   With SSLRequire you can do per-directory access control based
+#   on arbitrary complex boolean expressions containing server
+#   variable checks and other lookup directives.  The syntax is a
+#   mixture between C and Perl.  See the mod_nss documentation
+#   for more details.
+#<Location />
+#NSSRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+#            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+#            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+#            and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+#            and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20       ) \
+#           or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#</Location>
+
+#   SSL Engine Options:
+#   Set various options for the SSL engine.
+#   o FakeBasicAuth:
+#     Translate the client X.509 into a Basic Authorisation.  This means that
+#     the standard Auth/DBMAuth methods can be used for access control.  The
+#     user name is the `one line' version of the client's X.509 certificate.
+#     Note that no password is obtained from the user. Every entry in the user
+#     file needs this password: `xxj31ZMTZzkVA'.
+#   o ExportCertData:
+#     This exports two additional environment variables: SSL_CLIENT_CERT and
+#     SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+#     server (always existing) and the client (only existing when client
+#     authentication is used). This can be used to import the certificates
+#     into CGI scripts.
+#   o StdEnvVars:
+#     This exports the standard SSL/TLS related `SSL_*' environment variables.
+#     Per default this exportation is switched off for performance reasons,
+#     because the extraction step is an expensive operation and is usually
+#     useless for serving static content. So one usually enables the
+#     exportation for CGI and SSI requests only.
+#   o StrictRequire:
+#     This denies access when "NSSRequireSSL" or "NSSRequire" applied even
+#     under a "Satisfy any" situation, i.e. when it applies access is denied
+#     and no other module can change it.
+#   o OptRenegotiate:
+#     This enables optimized SSL connection renegotiation handling when SSL
+#     directives are used in per-directory context. 
+#NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
+<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+    NSSOptions +StdEnvVars
+</Files>
+<Directory "/var/www/cgi-bin">
+    NSSOptions +StdEnvVars
+</Directory>
+
+#   Per-Server Logging:
+#   The home of a custom SSL log file. Use this when you want a
+#   compact non-error SSL logfile on a virtual host basis.
+#CustomLog /home/rcrit/redhat/apache/logs/ssl_request_log \
+#          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+</VirtualHost>                                  
+

From 57ab09eebbd584c0483455365566012093e0051b Mon Sep 17 00:00:00 2001
From: Trevor Bramble <inbox@trevorbramble.com>
Date: Mon, 21 Oct 2013 11:09:12 -0700
Subject: [PATCH 0034/2267] only apply Directory defaults when provider is a
 directory

---
 templates/vhost/_directories.erb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 646c589d5e..2de6a752ae 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -1,11 +1,13 @@
 <% if @_directories and ! @_directories.empty? -%>
   <%- [@_directories].flatten.compact.each do |directory| -%>
-    <%- if directory['path'] and directory['path'] != ''-%>
+    <%- if directory['path'] and directory['path'] != '' -%>
 
-  <%- provider = 'Directory' -%>
   <%- if directory['provider'] and [ 'directory', 'location', 'files' ].include?(directory['provider']) -%>
     <%- provider = directory['provider'].capitalize -%>
+  <%- else -%>
+    <%- provider = 'Directory' -%>
   <%- end -%>
+
   <<%= provider + ' ' + directory['path'] %>>
     <%- if directory['headers'] -%>
       <%- Array(directory['headers']).each do |header| -%>
@@ -24,7 +26,7 @@
     <%- end -%>
     <%- if directory['order'] and directory['order'] != '' -%>
     Order <%= Array(directory['order']).join(',') %>
-    <%- else -%>
+    <%- elsif provider == 'Directory' -%>
     Order allow,deny
     <%- end -%>
     <%- if directory['deny'] and directory['deny'] != '' -%>
@@ -32,7 +34,7 @@
     <%- end -%>
     <%- if directory['allow'] and directory['allow'] != '' -%>
     Allow <%= directory['allow'] %>
-    <%- else -%>
+    <%- elsif provider == 'Directory' -%>
     Allow from all
     <%- end -%>
     <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>
@@ -92,6 +94,7 @@
     <%= directory['custom_fragment'] %>
     <%- end -%>
   </<%= provider %>>
+
     <%- end -%>
   <%- end -%>
 <% end -%>

From c88f0b208409ce207065f10a8a0427b4dec54311 Mon Sep 17 00:00:00 2001
From: Trevor Bramble <inbox@trevorbramble.com>
Date: Mon, 21 Oct 2013 11:12:32 -0700
Subject: [PATCH 0035/2267] Expand vhost/_directories.pp directive support

Added ForceType (from core), and the mod_expires directives.
---
 templates/vhost/_directories.erb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 2de6a752ae..2dbfe8e03e 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -89,6 +89,19 @@
     <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>
+    <%- if directory['expires_active'] -%>
+    ExpiresActive <%= directory['expires_active'] %>
+    <%- end -%>
+    <%- if directory['expires_default'] -%>
+    ExpiresDefault <%= directory['expires_default'] %>
+    <%- end -%>
+    <%- if directory['expires_by_type'] -%>
+    <%- Array(directory['expires_by_type']).each do |rule| -%>
+    ExpiresByType <%= rule %>
+    <%- end -%>
+    <%- end -%>
+    <%- if directory['force_type'] -%>
+    ForceType <%= directory['force_type'] %>
     <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>

From 0b3af3aa897850950c88be13f7ed19b9fb356328 Mon Sep 17 00:00:00 2001
From: Trevor Bramble <inbox@trevorbramble.com>
Date: Wed, 23 Oct 2013 14:13:53 -0700
Subject: [PATCH 0036/2267] nested conditinals are usually indented with good
 reason

---
 templates/vhost/_directories.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 2dbfe8e03e..96c5c3d2b7 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -89,6 +89,7 @@
     <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>
+    <%- end -%>
     <%- if directory['expires_active'] -%>
     ExpiresActive <%= directory['expires_active'] %>
     <%- end -%>

From c734e8073e89b5006ab933ec0c37da0febd47baa Mon Sep 17 00:00:00 2001
From: Trevor Bramble <inbox@trevorbramble.com>
Date: Tue, 5 Nov 2013 10:01:07 -0800
Subject: [PATCH 0037/2267] pull back some of the conditional defaults

---
 templates/vhost/_directories.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 96c5c3d2b7..a17327332b 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -26,7 +26,7 @@
     <%- end -%>
     <%- if directory['order'] and directory['order'] != '' -%>
     Order <%= Array(directory['order']).join(',') %>
-    <%- elsif provider == 'Directory' -%>
+    <%- else -%>
     Order allow,deny
     <%- end -%>
     <%- if directory['deny'] and directory['deny'] != '' -%>
@@ -34,7 +34,7 @@
     <%- end -%>
     <%- if directory['allow'] and directory['allow'] != '' -%>
     Allow <%= directory['allow'] %>
-    <%- elsif provider == 'Directory' -%>
+    <%- else -%>
     Allow from all
     <%- end -%>
     <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>

From 7a1263414c8dcd45af8a45c1c1d0755db5caecdd Mon Sep 17 00:00:00 2001
From: Daniel Beckham <dbeckham@dealnews.com>
Date: Thu, 17 Oct 2013 17:29:13 -0500
Subject: [PATCH 0038/2267] Add Allow and ExtendedStatus support to mod_status

I've extended the apache::mod::status class to accept an `$allow_from`
parameter similar to the existing apache::mod::info class, as well as
added an `$extended_status` parameter to control the ExtendedStatus
directive.

Added module docs and full testing support as well as updated the
README.md to indicate that the status class accepts additional
parameters.
---
 README.md                       |   2 +-
 manifests/mod/status.pp         |  32 ++++++-
 spec/classes/mod/status_spec.rb | 156 +++++++++++++++++++++++++++++---
 templates/mod/status.conf.erb   |   2 +-
 4 files changed, 173 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index fa4dfbd21d..21cf32497b 100644
--- a/README.md
+++ b/README.md
@@ -373,7 +373,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `reqtimeout`
 * `setenvif`
 * `ssl`* (see [apache::mod::ssl](#class-apachemodssl) below)
-* `status`
+* `status`*
 * `suphp`
 * `userdir`*
 * `worker`*
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index f9f63f56fc..ed73b99fdb 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -1,8 +1,36 @@
+# Class: apache::mod::status
+#
+# This class enables and configures Apache mod_status
+# See: http://httpd.apache.org/docs/current/mod/mod_status.html
+#
+# Parameters:
+# - $allow_from is an array of hosts, ip addresses, partial network numbers
+#   or networks in CIDR notation specifying what hosts can view the special
+#   /server-status URL.  Defaults to ['127.0.0.1', '::1'].
+# - $extended_status track and display extended status information. Valid
+#   values are 'On' or 'Off'.  Defaults to 'On'.
+#
+# Actions:
+# - Enable and configure Apache mod_status
+#
+# Requires:
+# - The apache class
+#
+# Sample Usage:
+#
+#  # Simple usage allowing access from localhost and a private subnet
+#  class { 'apache::mod::status':
+#    $allow_from => ['127.0.0.1', '10.10.10.10/24'],
+#  }
+#
 class apache::mod::status (
-  $allow_from = ['127.0.0.1','::1'],
+  $allow_from      = ['127.0.0.1','::1'],
+  $extended_status = 'On',
 ){
+  validate_array($allow_from)
+  validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
   apache::mod { 'status': }
-  # Template uses no variables
+  # Template uses $allow_from, $extended_status
   file { 'status.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/status.conf",
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 1a475d3530..0a06588792 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -1,40 +1,166 @@
 require 'spec_helper'
 
+# Helper function for testing the contents of `status.conf`
+def status_conf_spec(allow_from, extended_status)
+  it do
+    should contain_file("status.conf").with_content(
+      "<Location /server-status>\n"\
+      "    SetHandler server-status\n"\
+      "    Order deny,allow\n"\
+      "    Deny from all\n"\
+      "    Allow from #{Array(allow_from).join(' ')}\n"\
+      "</Location>\n"\
+      "ExtendedStatus #{extended_status}\n"\
+      "\n"\
+      "<IfModule mod_proxy.c>\n"\
+      "    # Show Proxy LoadBalancer status in mod_status\n"\
+      "    ProxyStatus On\n"\
+      "</IfModule>\n"
+    )
+  end
+end
+
 describe 'apache::mod::status', :type => :class do
   let :pre_condition do
     'include apache'
   end
 
-  let :facts do
-    {
-      :osfamily               => 'RedHat',
-      :operatingsystemrelease => '6',
-      :concat_basedir         => '/dne',
-    }
+  context "on a Debian OS with default params" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    it { should contain_apache__mod("status") }
+
+    status_conf_spec(["127.0.0.1", "::1"], "On")
+
+    it { should contain_file("status.conf").with({
+      :ensure => 'file',
+      :path   => '/etc/apache2/mods-available/status.conf',
+    } ) }
+
+    it { should contain_file("status.conf symlink").with({
+      :ensure => 'link',
+      :path   => '/etc/apache2/mods-enabled/status.conf',
+    } ) }
+
   end
 
-  it { should contain_apache__mod('status') }
+  context "on a RedHat OS with default params" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    it { should contain_apache__mod("status") }
+
+    status_conf_spec(["127.0.0.1", "::1"], "On")
+
+    it { should contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
 
-  context 'default' do
-    it { should contain_file('status.conf').with_content(/Allow from 127\.0\.0\.1 ::1/) }
   end
 
-  context 'custom allow_from (string)' do
+  context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off'" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
     let :params do
       {
-        :allow_from => '1.2.3.4'
+        :allow_from => ['10.10.10.10','11.11.11.11'],
+        :extended_status => 'Off',
       }
     end
-    it { should contain_file('status.conf').with_content(/Allow from 1\.2\.3\.4/) }
+
+    status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off")
+
   end
 
-  context 'custom allow_from (array)' do
+  context "with valid parameter type $allow_from => ['10.10.10.10']" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
     let :params do
+      { :allow_from => ['10.10.10.10'] }
+    end
+    it 'should expect to succeed array validation' do
+      expect {
+        should contain_file("status.conf")
+      }.not_to raise_error()
+    end
+  end
+
+  context "with invalid parameter type $allow_from => '10.10.10.10'" do
+    let :facts do
       {
-        :allow_from => [ '1.2.3.4', '2.3.4.5' ]
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
       }
     end
-    it { should contain_file('status.conf').with_content(/Allow from 1\.2\.3\.4 2\.3\.4\.5/) }
+    let :params do
+      { :allow_from => '10.10.10.10' }
+    end
+    it 'should expect to fail array validation' do
+      expect {
+        should contain_file("status.conf")
+      }.to raise_error(Puppet::Error)
+    end
+  end
+
+  # Only On or Off are valid options
+  ['On', 'Off'].each do |valid_param|
+    context "with valid value $extended_status => '#{valid_param}'" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+        }
+      end
+      let :params do
+        { :extended_status => valid_param }
+      end
+      it 'should expect to succeed regular expression validation' do
+        expect {
+          should contain_file("status.conf")
+        }.not_to raise_error()
+      end
+    end
+  end
+
+  ['Yes', 'No'].each do |invalid_param|
+    context "with invalid value $extended_status => '#{invalid_param}'" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+        }
+      end
+      let :params do
+        { :extended_status => invalid_param }
+      end
+      it 'should expect to fail regular expression validation' do
+        expect {
+          should contain_file("status.conf")
+        }.to raise_error(Puppet::Error)
+      end
+    end
   end
 
 end
diff --git a/templates/mod/status.conf.erb b/templates/mod/status.conf.erb
index ad88279330..c00c16a78d 100644
--- a/templates/mod/status.conf.erb
+++ b/templates/mod/status.conf.erb
@@ -4,7 +4,7 @@
     Deny from all
     Allow from <%= Array(@allow_from).join(" ") %>
 </Location>
-ExtendedStatus On
+ExtendedStatus <%= @extended_status %>
 
 <IfModule mod_proxy.c>
     # Show Proxy LoadBalancer status in mod_status

From 45779d2df8a0d4336196a952b07e684206c2c971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Thu, 7 Nov 2013 10:34:44 +0100
Subject: [PATCH 0039/2267] added $server_root parameter

Previously, the $httpd_dir was used as ServerRoot in httpd.conf
template. On some installations httpd_dir is not same as ServerRoot,
for example on FreeBSD apache22 (installed via ports) has ServerRoot set
to /usr/local by default.

This PR adds $server_root parameter to apache::params. Its purpose is to
be substituted in httpd.conf as ServerRoot. This parameter is used
in #342. The purpose of the whole thing is to plit #342 into smaller
parts to make review process easier, see
https://github.com/puppetlabs/puppetlabs-apache/pull/342#issuecomment-25423813
---
 README.md                |   4 ++++
 manifests/.params.pp.swp | Bin 0 -> 16384 bytes
 manifests/init.pp        |   2 ++
 manifests/params.pp      |   2 ++
 templates/httpd.conf.erb |   2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 manifests/.params.pp.swp

diff --git a/README.md b/README.md
index fa4dfbd21d..1765c41ffe 100644
--- a/README.md
+++ b/README.md
@@ -255,6 +255,10 @@ Sets the servername. Defaults to fqdn provided by facter.
 
 Makes Apache use the Linux kernel 'sendfile' to serve static files. Defaults to 'On'.
 
+#####`server_root`
+
+A value to be set as `ServerRoot` in main configuration file (`httpd.conf`). Defaults to `/etc/httpd` on RedHat and `/etc/apache2` on Debian.
+
 #####`error_documents`
 
 Enables custom error documents. Defaults to 'false'.
diff --git a/manifests/.params.pp.swp b/manifests/.params.pp.swp
new file mode 100644
index 0000000000000000000000000000000000000000..8dee9947fc03a0cda259981cd033541963871ecd
GIT binary patch
literal 16384
zcmeHOU5F${9WUcY{5mfh{6HmEc1Pwe?#$fo<`NuS<7o^hoOs@Og5F0{GhH*&w>{l`
zT{W|}x7h?Vf*?Ub@}dwliZ4Ehd64*^5rV!1KM?Uj5D~>Y1Tly{oCNguudeEz=^ke<
zFQU*5zn!V7-~XfjRb5^6pWfcFPk!X1{Qma64A&iuJ@MB4Gyiz(o$MR0U@Xz`coGKN
z)U@o<QY>rE+a7TWJ4qT}mVK={$s|dnZjEDq5=vJLMNhRvBKjlQ8H*?wNJUhUim_@Z
zNv^N{Qb(YUz)Ok1A-1`(evBkmSMKI_zUkac5w5v)1nLOX5vU_jN1%>C9f3Lmbp+}N
z{GUfaC%3Uj(TCe?KL+;mWu?!T+wwj3b69G(#rmU;KplZP0(AuH2-Fd%BTz@6jzArO
zIs$bB>Il>k_#cdb@ELn0{Q5o}`0@L{JOAG}%-ElRXMrC8-vJ&6E(3P~hk)nbz}T07
z2Z0w4G4@a3ufSh`-vhq`eh&N;_#W_a;BCOo*E9A9U=P><roaF=1)Km@fp-CS0l$46
zW6uCz1`^;Da0K|*YZ?1B@GU?C9|Z0IuD^z{r-9D_9`Ih^Fz}04GxkN`67Uw_&$l!7
zBj8EkVc-&QA8-h`{wl_v1HKAe1x^F^0&fT22;4xxo&%l)9tJ)IYyyXY>v(VC$H23|
z*MZLhec&Q+6u2F@fn>^0fTw^*feXME@DAW65;4C7z72dH_%zS}UcmU!7(L?>GaOfA
zI*OI{{2-+gU0Zymu{Y8>@u_ydqXI4QF2z&?c&Q?kD~w1Dyl&yih$^gXSquc#${7BP
z%#5L`DI-(1)Q_WqafR&CRklQgwzENn+1`NN$UDPGyrE<|m8qA;v8FO9Y<8sXce3|I
zHkyno3n?nmwU|cQg1+=3F_w-tuP7@O1X485AXmI$8c!0V!I+{t>&a}3GqJO?)AEHD
zmNJ1GRyO;9jakY*m!S#<ywUB(Y9PizxXZV|c~JHO5jFW9BeBLnDBT|hUKsSeMCg&x
zwZ$iqF9#W8TgpU)!Bl!W7|VEKLb%1(kC&Q_r2PXs9~%s;r)Ge(94DdBS-`-`BhoQr
z)iy&a(_SXCZ*+6sjFf7E{C?hqgP1HRw^iI+bM46}Io@>bR47`_goTu{K4l+Uw&NuW
zmP3YUo|D<!##JRFe-MNco)}ZaC@OQFn!o|#(B(8`l{v>3Q%_A1{#lNz%vn2X7&t|_
zCR3SHlnQf3PNB+zF$#LUIFxz>BDtfAiky_}>QQXn$<^4(f|SNrcfFAwlS$Vxyp825
z9dX}%;T*F^OhRqg6qTZ-iScrsrvcl{+nQ9&I|VxpKTtZAp%hB;2kgLMQY11hI-mPP
zmCj5v5elO=lqu=UDS2hi8({AH&ZgsKl?5leMGCiR{Ox^HSQHaIimrK~FE9t3CaSb`
zxjL%zwrQ%*xK>nVJTrOmGTXKo%3=b$$=fiq%A<QG7%skRGX_EsMEN~OH(i|HmKj6%
z{zycAXcrSOXcStip9YCrjq+f6>7=)7Mh`*75;{?7rx!#Ws<t=#3^!kGbFLbRR2ueB
zj#bC}$pu=Q?PKlr`>h^KWv?$&t!9^YvPsK!vK@4Es5*vV1?-ITNN`(PFUtZ+8ceYW
zb;7tWLV66gL0zDL6q|mQ6&Q;%;{DVG$(K_spp^k@n&qv9RvB7D<7Dh%3gO*F8%p|s
zp(K@qINi3axdqt~!OA3+W5sw>xTo3-t1}fT+#F`Bt0gBf#gkSt$25lV@ORJ9{f^<7
z)!075O;bsRye*b(tG%+VAR|kk+;kt!?G6r<AZIEvOKrHGk?Q<fBw@Q-*(#8bn+2xN
zw!7wg+5JVt%67qOoK;rYFf8CywhWfDY};TdnR@GZW#dpGE!Z`jk^V`cn><d<h5{?F
z&_Og*y9y6>v#$_iagClNdyH|OJzed-%j}b|DeHFWj-wJWXnP{vE+mV3K^$E1Bani@
z5lB(t=&arWHl{~bJ``d(KX3O{-EQ`#Z}Vc8pNsHa(MFYDpxw{Bv-Ww?<&C}n)V9BJ
z)EMV?&p(1_%QW{)LZ@PtdLm85?)hUEsW~rW(x@a1H1%My3v12u7djW(7n@{lm49Ls
zD83VfA@50koFaW6k0YK%evJw#-x*1HZI`OEZQL4P-=O*{6A@_<Qp364B+`>LzDb1>
zW>D5R7R@&6Q^0sO7hJp$)>XF3&kF3$BtNI{xapdjGxEwLNTte3C;B>wBU@;}RmmIX
z&cYupBds`m*Qm|Q@xYW%m>06C8c(VTO&WMbs|k!+J$CM6g>*{HJeXHt*3UQ@!xqQN
zn2I#ObJ4E1g)UnBZRHYWXV0FhisG@iOw?)BBcVC=KGVRLK0kf(G>l`rLmQQ#H=*to
z-q@a*?%4RucFn28<Coh-g2s%(NRxDmAuV)eCjw*L#x$Ko7)@1B%#FR6ahhI(ms+NF
z2+dr}<^$f9H+u}L)!asgX{Ld>$-1RU!|43~8Jve7!Wo&)|M%D&#q&7de-lu^N#M=E
z-*L`=3g`nXz)hUxe*-)Xd;ti72Y`12f5X}Rhrr{&CEz{4i#WIc4EPFg8F(LXC-6s{
z+rJAu20Q}zz(c?XfWyEG@a<Q?*MKL0Q@}}peEu*{Uv&iP2-Fd%BTz@6jzArO|9%AM
zkdz&i4m{8xS3?JL>^NO6*PdT&W;Z*r%%7>MnO!=an!G^JbD8gs%VWV8oL;KA-erki
z=v$WMMRT?TUY_F3vVN2?!^WNp%Tl;51D3@tPY{#yxU7=Q>IVITXlr>U7Zzv9x02K?
ziI^-}kp*<A+(qtC-Z#$zR#Lnrz4O`LN}9IBJ}_fj=2P;vWiq<CN7*<S#}`J@v={7h
z4z_Fo?HfgR^DLiBdY0+8keV%t9F(Ok(`^<v??EMDTM{t2+m^}a&dJQ>ZWqY3Ol~(5
zsitw=1YVHBb;%<Nw7WlT&Ze5p1$kL27tL2OzW7P61$9<SJ_s(4OBQb>hiiGxnR05D
znkg-d)A#a}>@3lxVj<L`tZGX|Vq3;RxGW_*s~}6oR>c!JwvJX(vRnK-EixiWaZ(T0
zDJ$DtGwTkj@}gT2Y(CboD7S<4v68xlLp#XX;&+CO0PV%kXe2@&Q;5;v#<X)l3YSD&
u`quj52C$sKHHl1<h%rCh9-O>|ZmZJdc&*+nbvyIpZaG1k{UV(Iw)<~>tdr9K

literal 0
HcmV?d00001

diff --git a/manifests/init.pp b/manifests/init.pp
index af8f87c325..484e927c35 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -32,6 +32,7 @@
   $error_documents      = false,
   $timeout              = '120',
   $httpd_dir            = $apache::params::httpd_dir,
+  $server_root          = $apache::params::server_root,
   $confd_dir            = $apache::params::confd_dir,
   $vhost_dir            = $apache::params::vhost_dir,
   $vhost_enable_dir     = $apache::params::vhost_enable_dir,
@@ -235,6 +236,7 @@
     # - $apxs_workaround
     # - $keepalive
     # - $keepalive_timeout
+    # - $server_root
     file { "${apache::params::conf_dir}/${apache::params::conf_file}":
       ensure  => file,
       content => template($conf_template),
diff --git a/manifests/params.pp b/manifests/params.pp
index 22728aa7cd..3a041e5b39 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -39,6 +39,7 @@
     $apache_name          = 'httpd'
     $service_name         = 'httpd'
     $httpd_dir            = '/etc/httpd'
+    $server_root          = '/etc/httpd'
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
     $mod_dir              = "${httpd_dir}/conf.d"
@@ -93,6 +94,7 @@
     $apache_name      = 'apache2'
     $service_name     = 'apache2'
     $httpd_dir        = '/etc/apache2'
+    $server_root      = '/etc/apache2'
     $conf_dir         = $httpd_dir
     $confd_dir        = "${httpd_dir}/conf.d"
     $mod_dir          = "${httpd_dir}/mods-available"
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 5f04b8a592..98c214b059 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -4,7 +4,7 @@ ServerSignature <%= @server_signature %>
 TraceEnable Off
 
 ServerName "<%= @servername %>"
-ServerRoot "<%= @httpd_dir %>"
+ServerRoot "<%= @server_root %>"
 PidFile <%= @pidfile %>
 Timeout <%= @timeout %>
 KeepAlive <%= @keepalive %>

From 9d19e7ab27195d136fb518f3f77cf95b40f7a82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Fri, 8 Nov 2013 03:48:04 +0100
Subject: [PATCH 0040/2267] Allow apache::mod to specify module id and path

Add $id, $path and $lib_path parameters to apache::mod. These parameters
are used in #342. The purpose of the whole thing is to plit #342 into
smaller parts to make review process easier, see
https://github.com/puppetlabs/puppetlabs-apache/pull/342#issuecomment-25423813

This PR covers all changes introduced by #271 to manifests/mod.pp. I
just don't have test/mod_load_params.pp as in #271.
---
 manifests/mod.pp | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 8ae5edaf8e..7cb62e5977 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -1,7 +1,10 @@
 define apache::mod (
   $package = undef,
   $package_ensure = 'present',
-  $lib = undef
+  $lib = undef,
+  $lib_path = $apache::params::lib_path,
+  $id = undef,
+  $path = undef,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
@@ -9,31 +12,43 @@
 
   $mod = $name
   #include apache #This creates duplicate resources in rspec-puppet
-  $lib_path = $apache::params::lib_path
   $mod_dir = $apache::mod_dir
 
   # Determine if we have special lib
   $mod_libs = $apache::params::mod_libs
   $mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
   if $lib {
-    $lib_REAL = $lib
+    $_lib = $lib
   } elsif "${mod_lib}" {
-    $lib_REAL = $mod_lib
+    $_lib = $mod_lib
   } else {
-    $lib_REAL = "mod_${mod}.so"
+    $_lib = "mod_${mod}.so"
+  }
+
+  # Determine if declaration specified a path to the module
+  if $path {
+    $_path = $path
+  } else {
+    $_path = "${lib_path}/${_lib}"
+  }
+
+  if $id {
+    $_id = $id
+  } else {
+    $_id = "${mod}_module"
   }
 
   # Determine if we have a package
   $mod_packages = $apache::params::mod_packages
   $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
   if $package {
-    $package_REAL = $package
+    $_package = $package
   } elsif "${mod_package}" {
-    $package_REAL = $mod_package
+    $_package = $mod_package
   }
-  if $package_REAL and ! defined(Package[$package_REAL]) {
-    # $package_REAL may be an array
-    package { $package_REAL:
+  if $_package and ! defined(Package[$_package]) {
+    # $_package may be an array
+    package { $_package:
       ensure  => $package_ensure,
       require => Package['httpd'],
       before  => File["${mod_dir}/${mod}.load"],
@@ -46,7 +61,7 @@
     owner   => 'root',
     group   => $apache::params::root_group,
     mode    => '0644',
-    content => "LoadModule ${mod}_module ${lib_path}/${lib_REAL}\n",
+    content => "LoadModule ${_id} ${_path}\n",
     require => [
       Package['httpd'],
       Exec["mkdir ${mod_dir}"],

From 803a04d0d97d14d2bfd0b8216e744bdc87c80b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Fri, 8 Nov 2013 10:57:02 +0100
Subject: [PATCH 0041/2267] Add new params to apache::mod::mime class

This changeset adds $mime_support_package and $mime_types_config
parameters to class `apache::mod::mime`. Their purpose is following:

- $mime_support_package - install this package, as it provides mime.conf
  file (definition of mime types used by mod_mime),
- $mime_types_config - used to substitute TypesConfig in
  mod/mime.conf.erb template.

This PR was created in order to plit #342 into smaller
parts to make review process easier, see
https://github.com/puppetlabs/puppetlabs-apache/pull/342#issuecomment-25423813
---
 manifests/mod/mime.pp       | 13 +++++++++++--
 manifests/params.pp         |  4 ++++
 templates/mod/mime.conf.erb |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index ba62ebc638..5c9f4b7ada 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -1,6 +1,9 @@
-class apache::mod::mime {
+class apache::mod::mime (
+  $mime_support_package = $apache::params::mime_support_package,
+  $mime_types_config    = $apache::params::mime_types_config,
+) {
   apache::mod { 'mime': }
-  # Template uses no variables
+  # Template uses $mime_types_config
   file { 'mime.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/mime.conf",
@@ -9,4 +12,10 @@
     before  => File[$apache::mod_dir],
     notify  => Service['httpd'],
   }
+  if $mime_support_package {
+    package { $mime_support_package:
+      ensure => 'installed',
+      before => File["${apache::mod_dir}/mime.conf"],
+    }
+  }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 3a041e5b39..8a00856214 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -87,6 +87,8 @@
     $keepalive            = 'Off'
     $keepalive_timeout    = 15
     $fastcgi_lib_path     = undef
+    $mime_support_package = 'mailcap'
+    $mime_types_config    = '/etc/mime.types'
   } elsif $::osfamily == 'Debian' {
     $user             = 'www-data'
     $group            = 'www-data'
@@ -138,6 +140,8 @@
     $keepalive         = 'Off'
     $keepalive_timeout = 15
     $fastcgi_lib_path  = '/var/lib/apache2/fastcgi'
+    $mime_support_package = 'mime-support'
+    $mime_types_config = '/etc/mime.types'
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
diff --git a/templates/mod/mime.conf.erb b/templates/mod/mime.conf.erb
index 34f4add924..a69a424a6a 100644
--- a/templates/mod/mime.conf.erb
+++ b/templates/mod/mime.conf.erb
@@ -1,4 +1,4 @@
-TypesConfig /etc/mime.types
+TypesConfig <%= @mime_types_config %>
 
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz

From 3f4ea723d1970d7376a3c7d03a9969cc57d3f72f Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 8 Nov 2013 13:58:45 -0500
Subject: [PATCH 0042/2267] Include mime if ssl is in use.

Without the default_mods we still try to setup an SSL vhost that fails
because AddType is used in the template.  Rather than trying to make
AddType conditional on the inclusion of the class we just require mime
as a standard mod no matter what you say.
---
 manifests/vhost.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7ed0744ffe..7f0d91c881 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -174,6 +174,8 @@
 
   if $ssl {
     include apache::mod::ssl
+    # Required for the AddType lines.
+    include apache::mod::mime
   }
 
   if $virtual_docroot {

From 6db8322758f9813da558e70969739d407ba589f4 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 8 Nov 2013 13:59:46 -0500
Subject: [PATCH 0043/2267] Wrap the event test in a check for FreeBSD.

It seems this only works on FreeBSD currently.  In the future
we'll rework testing to test for 2.2 vs 2.4 or something.
---
 spec/system/prefork_worker_spec.rb | 39 ++++++++++++++++--------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/spec/system/prefork_worker_spec.rb b/spec/system/prefork_worker_spec.rb
index d7715737d3..b455d748fa 100644
--- a/spec/system/prefork_worker_spec.rb
+++ b/spec/system/prefork_worker_spec.rb
@@ -9,28 +9,31 @@
   raise "Unconfigured OS for apache service on #{node.facts['osfamily']}"
 end
 
-describe 'apache::mod::event class' do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          mpm_module => 'event',
-        }
-      EOS
+case node.facts['osfamily']
+when 'FreeBSD'
+  describe 'apache::mod::event class' do
+    describe 'running puppet code' do
+      # Using puppet_apply as a helper
+      it 'should work with no errors' do
+        pp = <<-EOS
+          class { 'apache':
+            mpm_module => 'event',
+          }
+        EOS
 
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
+        # Run it twice and test for idempotency
+        puppet_apply(pp) do |r|
+          r.exit_code.should_not == 1
+          r.refresh
+          r.exit_code.should be_zero
+        end
       end
     end
-  end
 
-  describe service(servicename) do
-    it { should be_running }
-    it { should be_enabled }
+    describe service(servicename) do
+      it { should be_running }
+      it { should be_enabled }
+    end
   end
 end
 

From 112437730f70e18daf3aed9cedffd0c46348204d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Thu, 5 Sep 2013 14:44:09 +0200
Subject: [PATCH 0044/2267] Support for FreeBSD and few other features

Summary of the changes:

Overview:

* added support for FreeBSD
* added MPMs: event, peruser, itk (PR #304 + FreeBSD support)
* added `apache::package` to choose and install apache package,
* allow apache::mod to specify mod identifier and module path (#271)
* revisited specs for apache::dev and apache::mod::dev

Details:

* "${apache::params::conf_dir}/Includes" as $apache::confd_dir for FreeBSD,
* "${apache::params::conf_dir}/Modules" as $apache::mod_dir FreeBSD,
* "${apache::params::conf_dir}/Vhosts" as $apache::vhost_dir FreeBSD,
* added to apache::params:
        $root_group,
        $apache_package,
        $service_name,
        $server_root,
        $mime_support_package,
        $mime_types_config
* httpd.erb now uses $server_root (instead of $httpd_dir) as ServerRoot
* added $mime_support_package parameter to apache::mod::mime class,
* apache::mod::mime installs $mime_support_package package if needed,
* added $magic_file parameter to apache::mod::mime_magic class,
* added 'default_confd_files.pp', and confd template infrastructure to
  allow putting some files under conf.d/ (Includes/ under FreeBSD) by
  default (FreeBSD's apache22 installs Includes/no-accf.conf for
  example but puppet normally would purge it afterward),
* adjusted documentation (README.md),
* apache::dev requires apache::package on FreeBSD
* other (minor or forgotten) changes and additions,
---
 README.md                           | 34 +++++++++++---
 manifests/confd/no_accf.pp          | 10 ++++
 manifests/default_confd_files.pp    | 12 +++++
 manifests/default_mods.pp           | 36 ++++++++++++++-
 manifests/dev.pp                    |  3 ++
 manifests/init.pp                   | 49 ++++++++++++++++----
 manifests/mod.pp                    | 13 +++++-
 manifests/mod/alias.pp              |  5 +-
 manifests/mod/cgid.pp               |  5 +-
 manifests/mod/dav_fs.pp             |  5 +-
 manifests/mod/dav_svn.pp            |  1 +
 manifests/mod/disk_cache.pp         | 11 +++--
 manifests/mod/itk.pp                |  5 ++
 manifests/mod/passenger.pp          |  8 +++-
 manifests/mod/prefork.pp            |  5 ++
 manifests/mod/proxy_html.pp         |  3 ++
 manifests/mod/ssl.pp                | 10 ++--
 manifests/package.pp                | 48 +++++++++++++++++++
 manifests/params.pp                 | 55 ++++++++++++++++++++++
 manifests/peruser/multiplexer.pp    | 17 +++++++
 manifests/peruser/processor.pp      | 17 +++++++
 manifests/vhost.pp                  |  5 +-
 spec/classes/apache_spec.rb         | 72 +++++++++++++++++++++++++++++
 spec/classes/dev_spec.rb            | 12 +++++
 spec/classes/mod/auth_kerb_spec.rb  | 12 +++++
 spec/classes/mod/dav_svn_spec.rb    | 12 +++++
 spec/classes/mod/dev_spec.rb        | 42 ++++++++---------
 spec/classes/mod/dir_spec.rb        | 29 +++++++++++-
 spec/classes/mod/event_spec.rb      | 13 +++++-
 spec/classes/mod/fcgid_spec.rb      | 12 +++++
 spec/classes/mod/info_spec.rb       | 18 ++++++++
 spec/classes/mod/itk_spec.rb        | 12 +++++
 spec/classes/mod/passenger_spec.rb  | 12 +++++
 spec/classes/mod/perl_spec.rb       | 12 +++++
 spec/classes/mod/peruser_spec.rb    | 13 +++++-
 spec/classes/mod/php_spec.rb        | 27 +++++++++++
 spec/classes/mod/prefork_spec.rb    | 12 +++++
 spec/classes/mod/proxy_html_spec.rb | 12 +++++
 spec/classes/mod/python_spec.rb     | 12 +++++
 spec/classes/mod/ssl_spec.rb        | 12 +++++
 spec/classes/mod/worker_spec.rb     | 12 +++++
 spec/classes/mod/wsgi_spec.rb       | 12 +++++
 spec/classes/service_spec.rb        | 16 +++++++
 spec/defines/mod_spec.rb            | 26 +++++++++++
 spec/defines/vhost_spec.rb          | 17 +++++++
 spec/system/class_spec.rb           |  3 ++
 spec/system/default_mods_spec.rb    |  2 +
 spec/system/itk_spec.rb             |  2 +
 spec/system/mod_php_spec.rb         |  7 ++-
 spec/system/prefork_worker_spec.rb  |  2 +
 spec/system/vhost_spec.rb           |  4 ++
 templates/confd/no-accf.conf.erb    |  4 ++
 tests/mod_load_params.pp            | 11 +++++
 53 files changed, 757 insertions(+), 64 deletions(-)
 create mode 100644 manifests/confd/no_accf.pp
 create mode 100644 manifests/default_confd_files.pp
 create mode 100644 manifests/package.pp
 create mode 100644 manifests/peruser/multiplexer.pp
 create mode 100644 manifests/peruser/processor.pp
 create mode 100644 templates/confd/no-accf.conf.erb
 create mode 100644 tests/mod_load_params.pp

diff --git a/README.md b/README.md
index 1765c41ffe..a13b7c8f0f 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ Apache is a widely-used web server, and this module provides a simplified way of
 * Apache modules
 * virtual hosts
 * listened-to ports
+* `/etc/make.conf` on FreeBSD
 
 ###Beginning with Apache
 
@@ -53,7 +54,8 @@ The defaults are determined by your operating system (e.g. Debian systems have o
 
 ```puppet
     class { 'apache':
-      default_mods => false,
+      default_mods        => false,
+      default_confd_files => false,
     }
 ```
 
@@ -186,6 +188,10 @@ Sets up Apache with default settings based on your OS. Defaults to 'true', set t
 
 Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
 
+#####`default_confd_files`
+
+Generates default set of include-able apache configuration files under  `${apache::confd_dir}` directory. These configuration files correspond to what is usually installed with apache package on given platform.
+
 #####`default_ssl_vhost`
 
 Sets up a default SSL virtual host. Defaults to 'false'.
@@ -205,11 +211,11 @@ SSL vhosts only respond to HTTPS queries.
 
 #####`default_ssl_cert`
 
-The default SSL certification, which is automatically set based on your operating system  (`/etc/pki/tls/certs/localhost.crt` for RedHat, `/etc/ssl/certs/ssl-cert-snakeoil.pem` for Debian). This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL certification, which is automatically set based on your operating system  (`/etc/pki/tls/certs/localhost.crt` for RedHat, `/etc/ssl/certs/ssl-cert-snakeoil.pem` for Debian, `/usr/local/etc/apache22/server.crt` for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_key`
 
-The default SSL key, which is automatically set based on your operating system (`/etc/pki/tls/private/localhost.key` for RedHat, `/etc/ssl/private/ssl-cert-snakeoil.key` for Debian). This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL key, which is automatically set based on your operating system (`/etc/pki/tls/private/localhost.key` for RedHat, `/etc/ssl/private/ssl-cert-snakeoil.key` for Debian, `/usr/local/etc/apache22/server.key` for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_chain`
 
@@ -229,7 +235,7 @@ The default certificate revocation list to use, which is automatically set to 'u
 
 #####`service_name`
 
-Name of apache service to run. Defaults to: `'httpd'` on RedHat and `'apache2'` on Debian.
+Name of apache service to run. Defaults to: `'httpd'` on RedHat, `'apache2'` on Debian, and `'apache22'` on FreeBSD.
 
 #####`service_enable`
 
@@ -251,6 +257,10 @@ Sets the server administrator. Defaults to 'root@localhost'.
 
 Sets the servername. Defaults to fqdn provided by facter.
 
+#####`server_root`
+
+A value to be set as `ServerRoot` in main configuration file (`httpd.conf`). Defaults to `/etc/httpd` on RedHat, `/etc/apache2` on Debian and `/usr/local` on FreeBSD.
+
 #####`sendfile`
 
 Makes Apache use the Linux kernel 'sendfile' to serve static files. Defaults to 'On'.
@@ -281,7 +291,7 @@ Changes the location of the configuration directory your Apache modules configur
 
 #####`mpm_module`
 
-Configures which mpm module is loaded and configured for the httpd process by the `apache::mod::prefork`, `apache::mod::worker` and `apache::mod::itk` classes. Must be set to `false` to explicitly declare `apache::mod::worker`, `apache::mod::worker` or `apache::mod::itk` classes with parameters. Valid values are `worker`, `prefork`, `itk` (Debian), or the boolean `false`. Defaults to `prefork` on RedHat and `worker` on Debian.
+Configures which mpm module is loaded and configured for the httpd process by the `apache::mod::event`, `apache::mod::itk`, `apache::mod::peruser`, `apache::mod::prefork` and `apache::mod::worker` classes. Must be set to `false` to explicitly declare `apache::mod::event`, `apache::mod::itk`, `apache::mod::peruser`,  `apache::mod::prefork` or `apache::mod::worker` classes with parameters. All possible values are `event`, `itk`, `peruser`, `prefork`, `worker` (valid values depend on agent's OS), or the boolean `false`. Defaults to `prefork` on RedHat and FreeBSD and `worker` on Debian. Note: on FreeBSD switching between different mpm modules is quite difficult (but possible). Before changing `$mpm_module` one has to deinstall all packages that depend on currently installed `apache`.
 
 #####`conf_template`
 
@@ -353,12 +363,17 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `cgid`
 * `dav`
 * `dav_fs`
+* `dav_svn`
 * `deflate`
+* `dev`
 * `dir`*
 * `disk_cache`
-* `fcgid`
+* `event`
 * `fastcgi`
+* `fcgid`
+* `headers`
 * `info`
+* `itk`
 * `ldap`
 * `mime`
 * `mime_magic`*
@@ -367,6 +382,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `nss`*
 * `passenger`*
 * `perl`
+* `peruser`
 * `php` (requires [`mpm_module`](#mpm_module) set to `prefork`)
 * `prefork`*
 * `proxy`*
@@ -375,11 +391,13 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `proxy_http`
 * `python`
 * `reqtimeout`
+* `rewrite`
 * `setenvif`
 * `ssl`* (see [apache::mod::ssl](#class-apachemodssl) below)
 * `status`
 * `suphp`
 * `userdir`*
+* `vhost_alias`
 * `worker`*
 * `wsgi` (see [apache::mod::wsgi](#class-apachemodwsgi) below)
 * `xsendfile`
@@ -1228,6 +1246,8 @@ Installs Apache development libraries
     class { 'apache::dev': }
 ```
 
+On FreeBSD you're required to define `apache::package` or `apache` class before `apache::dev`.
+
 ####Defined Type: `apache::listen`
 
 Controls which ports Apache binds to for listening based on the title:
@@ -1285,7 +1305,7 @@ The Apache module relies heavily on templates to enable the `vhost` and `apache:
 
 ##Limitations
 
-This has been tested on Ubuntu Precise, Debian Wheezy, and CentOS 5.8.
+This has been tested on Ubuntu Precise, Debian Wheezy, CentOS 5.8, and FreeBSD 9.1.
 
 ##Development
 
diff --git a/manifests/confd/no_accf.pp b/manifests/confd/no_accf.pp
new file mode 100644
index 0000000000..5f86eab107
--- /dev/null
+++ b/manifests/confd/no_accf.pp
@@ -0,0 +1,10 @@
+class apache::confd::no_accf {
+  # Template uses no variables
+  file { 'no-accf.conf':
+    ensure  => 'file',
+    path    => "${apache::confd_dir}/no-accf.conf",
+    content => template('apache/confd/no-accf.conf.erb'),
+    require => Exec["mkdir ${apache::confd_dir}"],
+    before  => File[$apache::confd_dir],
+  }
+}
diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
new file mode 100644
index 0000000000..b45de86653
--- /dev/null
+++ b/manifests/default_confd_files.pp
@@ -0,0 +1,12 @@
+class apache::default_confd_files (
+  $all = true,
+) {
+  # The rest of the conf.d/* files only get loaded if we want them
+  if $all {
+    case $::osfamily {
+      'freebsd': {
+        include apache::confd::no_accf
+      }
+    }
+  }
+}
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 02d3bd156a..536cd7e334 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -6,7 +6,7 @@
   # They are not configurable at this time, so we just include
   # them to make sure it works.
   case $::osfamily {
-    'redhat': {
+    'redhat', 'freebsd': {
       apache::mod { 'log_config': }
     }
     default: {}
@@ -43,6 +43,40 @@
         apache::mod { 'usertrack': }
         apache::mod { 'version': }
       }
+      'freebsd': {
+        include apache::mod::cache
+        include apache::mod::disk_cache
+        include apache::mod::headers
+        include apache::mod::info
+        include apache::mod::mime_magic
+        include apache::mod::reqtimeout
+        include apache::mod::rewrite
+        include apache::mod::userdir
+        include apache::mod::vhost_alias
+
+        apache::mod { 'actions': }
+        apache::mod { 'asis': }
+        apache::mod { 'auth_digest': }
+        apache::mod { 'authn_alias': }
+        apache::mod { 'authn_anon': }
+        apache::mod { 'authn_dbm': }
+        apache::mod { 'authn_default': }
+        apache::mod { 'authz_dbm': }
+        apache::mod { 'authz_owner': }
+        apache::mod { 'cern_meta': }
+        apache::mod { 'charset_lite': }
+        apache::mod { 'dumpio': }
+        apache::mod { 'expires': }
+        apache::mod { 'file_cache': }
+        apache::mod { 'filter':}
+        apache::mod { 'imagemap':}
+        apache::mod { 'include': }
+        apache::mod { 'logio': }
+        apache::mod { 'speling': }
+        apache::mod { 'unique_id': }
+        apache::mod { 'usertrack': }
+        apache::mod { 'version': }
+      }
       default: {}
     }
     case $apache::mpm_module {
diff --git a/manifests/dev.pp b/manifests/dev.pp
index ea86adae44..057475b159 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -1,4 +1,7 @@
 class apache::dev {
+  if $::osfamily == 'FreeBSD' and !defined(Class['apache::package']) {
+    fail('apache::dev requires apache::package; please include apache or apache::package class first')
+  }
   include apache::params
   $packages = $apache::params::dev_packages
   package { $packages:
diff --git a/manifests/init.pp b/manifests/init.pp
index 484e927c35..57ea183841 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,6 +16,7 @@
   $service_name         = $apache::params::service_name,
   $default_mods         = true,
   $default_vhost        = true,
+  $default_confd_files  = true,
   $default_ssl_vhost    = false,
   $default_ssl_cert     = $apache::params::default_ssl_cert,
   $default_ssl_key      = $apache::params::default_ssl_key,
@@ -54,18 +55,32 @@
   $package_ensure       = 'installed',
 ) inherits apache::params {
 
-  package { 'httpd':
-    ensure => $package_ensure,
-    name   => $apache::params::apache_name,
-    notify => Class['Apache::Service'],
-  }
-
   validate_bool($default_vhost)
-  validate_bool($default_ssl_vhost)
+  validate_bool($default_confd_files)
   # true/false is sufficient for both ensure and enable
   validate_bool($service_enable)
+
+  $valid_mpms_re = $::osfamily ? {
+    'FreeBSD' => '(event|itk|peruser|prefork|worker)',
+    default   => '(itk|prefork|worker)'
+  }
+
   if $mpm_module {
-    validate_re($mpm_module, '(prefork|worker|itk|event)')
+    validate_re($mpm_module, $valid_mpms_re)
+  }
+
+  # NOTE: on FreeBSD it's mpm module's responsibility to install httpd package.
+  # NOTE: the same strategy may be introduced for other OSes. For this, you
+  # should delete the 'if' block below and modify all MPM modules' manifests
+  # such that they include apache::package class (currently event.pp, itk.pp,
+  # peruser.pp, prefork.pp, worker.pp).
+  if $::osfamily != 'FreeBSD' {
+    package { 'httpd':
+      ensure => $package_ensure,
+      name   => $apache::params::apache_name,
+      notify => Class['Apache::Service'],
+    }
+  validate_bool($default_ssl_vhost)
   }
   validate_re($sendfile, [ '^[oO]n$' , '^[oO]ff$' ])
 
@@ -209,6 +224,14 @@
         $scriptalias          = '/var/www/cgi-bin'
         $access_log_file      = 'access_log'
       }
+      'freebsd': {
+        $docroot              = '/usr/local/www/apache22/data'
+        $pidfile              = '/var/run/httpd.pid'
+        $error_log            = 'httpd-error.log'
+        $error_documents_path = '/usr/local/www/apache22/error'
+        $scriptalias          = '/usr/local/www/apache22/cgi-bin'
+        $access_log_file      = 'httpd-access.log'
+      }
       default: {
         fail("Unsupported osfamily ${::osfamily}")
       }
@@ -220,7 +243,6 @@
     }
 
     # Template uses:
-    # - $httpd_dir
     # - $pidfile
     # - $user
     # - $group
@@ -256,6 +278,9 @@
         all => $default_mods,
       }
     }
+    class { 'apache::default_confd_files':
+      all => $default_confd_files
+    }
     if $mpm_module {
       class { "apache::mod::${mpm_module}": }
     }
@@ -278,6 +303,10 @@
       access_log_file => $access_log_file,
       priority        => '15',
     }
+    $ssl_access_log_file = $::osfamily ? {
+      'freebsd' => $access_log_file,
+      default   => "ssl_${access_log_file}",
+    }
     apache::vhost { 'default-ssl':
       ensure          => $default_ssl_vhost_ensure,
       port            => 443,
@@ -285,7 +314,7 @@
       docroot         => $docroot,
       scriptalias     => $scriptalias,
       serveradmin     => $serveradmin,
-      access_log_file => "ssl_${access_log_file}",
+      access_log_file => $ssl_access_log_file,
       priority        => '15',
     }
   }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 7cb62e5977..f11efc53b8 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -47,11 +47,22 @@
     $_package = $mod_package
   }
   if $_package and ! defined(Package[$_package]) {
+    # note: FreeBSD/ports uses apxs tool to activate modules; apxs clutters
+    # httpd.conf with 'LoadModule' directives; here, by proper resource
+    # ordering, we ensure that our version of httpd.conf is reverted after
+    # the module gets installed.
+    $package_before = $::osfamily ? {
+      'freebsd' => [
+        File["${mod_dir}/${mod}.load"],
+        File["${apache::params::conf_dir}/${apache::params::conf_file}"]
+      ],
+      default => File["${mod_dir}/${mod}.load"],
+    }
     # $_package may be an array
     package { $_package:
       ensure  => $package_ensure,
       require => Package['httpd'],
-      before  => File["${mod_dir}/${mod}.load"],
+      before  => $package_before,
     }
   }
 
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 2af73725b0..2880697236 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,7 +1,8 @@
 class apache::mod::alias {
   $icons_path = $::osfamily ? {
-    'debian' => '/usr/share/apache2/icons',
-    'redhat' => '/var/www/icons',
+    'debian'  => '/usr/share/apache2/icons',
+    'redhat'  => '/var/www/icons',
+    'freebsd' => '/usr/local/www/apache22/icons',
   }
   apache::mod { 'alias': }
   # Template uses $icons_path
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 1a0a082494..c932ae2bec 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -4,8 +4,9 @@
   # Debian specifies it's cgid sock path, but RedHat uses the default value
   # with no config file
   $cgisock_path = $::osfamily ? {
-    'debian' => '${APACHE_RUN_DIR}/cgisock',
-    default  => undef,
+    'debian'  => '${APACHE_RUN_DIR}/cgisock',
+    'freebsd' => 'cgisock',
+    default   => undef,
   }
   apache::mod { 'cgid': }
   if $cgisock_path {
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index ab78408f70..53219be793 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -1,7 +1,8 @@
 class apache::mod::dav_fs {
   $dav_lock = $::osfamily ? {
-    'debian' => '${APACHE_LOCK_DIR}/DAVLock',
-    default  => '/var/lib/dav/lockdb',
+    'debian'  => '${APACHE_LOCK_DIR}/DAVLock',
+    'freebsd' => '/usr/local/var/DavLock',
+    default   => '/var/lib/dav/lockdb',
   }
 
   Class['apache::mod::dav'] -> Class['apache::mod::dav_fs']
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 76e0d885ea..4f34bd6954 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -1,4 +1,5 @@
 class apache::mod::dav_svn {
+  Class['apache::mod::dav'] -> Class['apache::mod::dav_svn']
   include apache::mod::dav
   apache::mod { 'dav_svn': }
 }
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index dd3e0f0938..d28196768f 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -1,9 +1,14 @@
 class apache::mod::disk_cache {
   $cache_root = $::osfamily ? {
-    'debian' => '/var/cache/apache2/mod_disk_cache',
-    'redhat' => '/var/cache/mod_proxy',
+    'debian'  => '/var/cache/apache2/mod_disk_cache',
+    'redhat'  => '/var/cache/mod_proxy',
+    'freebsd' => '/var/cache/mod_disk_cache',
+  }
+  if $::osfamily != 'FreeBSD' {
+    # FIXME: investigate why disk_cache was dependent on proxy
+    # NOTE: on FreeBSD disk_cache is compiled by default but proxy is not
+    Class['apache::mod::proxy'] -> Class['apache::mod::disk_cache']
   }
-  Class['apache::mod::proxy'] -> Class['apache::mod::disk_cache']
   Class['apache::mod::cache'] -> Class['apache::mod::disk_cache']
 
   apache::mod { 'disk_cache': }
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 8abbb1c18a..68ece8681a 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -52,6 +52,11 @@
         ensure => present,
       }
     }
+    'freebsd' : {
+      class { 'apache::package':
+        mpm_module => 'itk'
+      }
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 004f128fd7..d4aba84907 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -10,7 +10,13 @@
   $passenger_max_pool_size        = undef,
   $passenger_use_global_queue     = undef,
 ) {
-  apache::mod { 'passenger': }
+  if $::osfamily == 'FreeBSD' {
+    apache::mod { 'passenger':
+      lib_path => "${passenger_root}/buildout/apache2"
+    }
+  } else {
+    apache::mod { 'passenger': }
+  }
   # Template uses:
   # - $passenger_root
   # - $passenger_ruby
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 91f0f1c30b..ecbf809a20 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -62,6 +62,11 @@
         ensure => present,
       }
     }
+    'freebsd' : {
+      class { 'apache::package':
+        mpm_module => 'prefork'
+      }
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index ab2575731a..050b65d4fc 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -12,6 +12,9 @@
         default => "/usr/lib/${::hardwaremodel}-linux-gnu/libxml2.so.2",
       }
     }
+    'FreeBSD': {
+      apache::mod { 'xml2enc': }
+    }
   }
   # Template uses $icons_path
   file { 'proxy_html.conf':
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index ba183e1dd8..ea1e119750 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -2,12 +2,14 @@
   $ssl_compression = false,
 ) {
   $session_cache = $::osfamily ? {
-    'debian' => '${APACHE_RUN_DIR}/ssl_scache(512000)',
-    'redhat' => '/var/cache/mod_ssl/scache(512000)',
+    'debian'  => '${APACHE_RUN_DIR}/ssl_scache(512000)',
+    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
+    'freebsd' => '/var/run/ssl_scache(512000)',
   }
   $ssl_mutex = $::osfamily ? {
-    'debian' => 'file:${APACHE_RUN_DIR}/ssl_mutex',
-    'redhat' => 'default',
+    'debian'  => 'file:${APACHE_RUN_DIR}/ssl_mutex',
+    'redhat'  => 'default',
+    'freebsd' => 'default',
   }
   apache::mod { 'ssl': }
 
diff --git a/manifests/package.pp b/manifests/package.pp
new file mode 100644
index 0000000000..31bd311982
--- /dev/null
+++ b/manifests/package.pp
@@ -0,0 +1,48 @@
+class apache::package (
+  $ensure     = 'present',
+  $mpm_module = $apache::params::mpm_module,
+) {
+  case $::osfamily {
+    'freebsd' : {
+      $all_mpms = [
+        'www/apache22',
+        'www/apache22-worker-mpm',
+        'www/apache22-event-mpm',
+        'www/apache22-itk-mpm',
+        'www/apache22-peruser-mpm',
+      ]
+      if $mpm_module {
+        $apache_package = $mpm_module ? {
+          'prefork' => 'www/apache22',
+          default   => "www/apache22-${mpm_module}-mpm"
+        }
+      } else {
+        $apache_package = 'www/apache22'
+      }
+      $other_mpms = delete($all_mpms, $apache_package)
+      # Configure ports to have apache module packages dependent on correct
+      # version of apache package (apache22, apache22-worker-mpm, ...)
+      file_line { 'APACHE_PORT in /etc/make.conf':
+        ensure => $ensure,
+        path   => '/etc/make.conf',
+        line   => "APACHE_PORT=${apache_package}",
+        match  => "^\\s*#?\\s*APACHE_PORT\\s*=\\s*",
+        before => Package['httpd'],
+      }
+      # remove other packages
+      ensure_resource('package', $other_mpms, {
+        ensure  => absent,
+        before  => Package['httpd'],
+        require => File_line['APACHE_PORT in /etc/make.conf'],
+      })
+    }
+    default: {
+      $apache_package = $apache::params::apache_name
+    }
+  }
+  package { 'httpd':
+    ensure => $ensure,
+    name   => $apache_package,
+    notify => Class['Apache::Service'],
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 8a00856214..dc26d6d225 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -142,6 +142,61 @@
     $fastcgi_lib_path  = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config = '/etc/mime.types'
+  } elsif $::osfamily == 'FreeBSD' {
+    $user             = 'www'
+    $group            = 'www'
+    $root_group       = 'wheel'
+    $apache_name      = 'apache22'
+    $service_name     = 'apache22'
+    $httpd_dir        = '/usr/local/etc/apache22'
+    $server_root      = '/usr/local'
+    $conf_dir         = $httpd_dir
+    $confd_dir        = "${httpd_dir}/Includes"
+    $mod_dir          = "${httpd_dir}/Modules"
+    $mod_enable_dir   = undef
+    $vhost_dir        = "${httpd_dir}/Vhosts"
+    $vhost_enable_dir = undef
+    $conf_file        = 'httpd.conf'
+    $ports_file       = "${conf_dir}/ports.conf"
+    $logroot          = '/var/log/apache22'
+    $lib_path         = '/usr/local/libexec/apache22'
+    $mpm_module       = 'prefork'
+    $dev_packages     = undef
+    $default_ssl_cert = '/usr/local/etc/apache22/server.crt'
+    $default_ssl_key  = '/usr/local/etc/apache22/server.key'
+    $ssl_certs_dir    = '/usr/local/etc/apache22'
+    $passenger_root   = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
+    $passenger_ruby   = '/usr/bin/ruby'
+    $suphp_addhandler = 'php5-script'
+    $suphp_engine     = 'off'
+    $suphp_configpath = undef
+    $mod_packages     = {
+      # NOTE: I list here only modules that are not included in www/apache22
+      # NOTE: 'passenger' needs to enable APACHE_SUPPORT in make config
+      # NOTE: 'php' needs to enable APACHE option in make config
+      # NOTE: 'dav_svn' needs to enable MOD_DAV_SVN make config
+      # NOTE: not sure where the shibboleth should come from
+      # NOTE: don't know where the shibboleth module should come from
+      'auth_kerb'  => 'www/mod_auth_kerb2',
+      'fcgid'      => 'www/mod_fcgid',
+      'passenger'  => 'www/rubygem-passenger',
+      'perl'       => 'www/mod_perl2',
+      'php5'       => 'lang/php5',
+      'proxy_html' => 'www/mod_proxy_html',
+      'python'     => 'www/mod_python3',
+      'wsgi'       => 'www/mod_wsgi',
+      'dav_svn'    => 'devel/subversion',
+      'xsendfile'  => 'www/mod_xsendfile',
+    }
+    $mod_libs         = {
+      'php5' => 'libphp5.so',
+    }
+    $conf_template        = 'apache/httpd.conf.erb'
+    $keepalive            = 'Off'
+    $keepalive_timeout    = 15
+    $fastcgi_lib_path     = undef # TODO: revisit
+    $mime_support_package = 'misc/mime-support'
+    $mime_types_config    = '/usr/local/etc/mime.types'
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
new file mode 100644
index 0000000000..260f1b5a3d
--- /dev/null
+++ b/manifests/peruser/multiplexer.pp
@@ -0,0 +1,17 @@
+define apache::peruser::multiplexer (
+  $user = $apache::user,
+  $group = $apache::group,
+  $file = undef,
+) {
+  if ! $file {
+    $filename = "${name}.conf"
+  } else {
+    $filename = $file
+  }
+  file { "${apache::mod_dir}/peruser/multiplexers/${filename}":
+    ensure  => file,
+    content => "Multiplexer ${user} ${group}\n",
+    require => File["${apache::mod_dir}/peruser/multiplexers"],
+    notify  => Service['httpd'],
+  }
+}
diff --git a/manifests/peruser/processor.pp b/manifests/peruser/processor.pp
new file mode 100644
index 0000000000..c677cd6ca1
--- /dev/null
+++ b/manifests/peruser/processor.pp
@@ -0,0 +1,17 @@
+define apache::peruser::processor (
+  $user,
+  $group,
+  $file = undef,
+) {
+  if ! $file {
+    $filename = "${name}.conf"
+  } else {
+    $filename = $file
+  }
+  file { "${apache::mod_dir}/peruser/processors/${filename}":
+    ensure  => file,
+    content => "Processor ${user} ${group}\n",
+    require => File["${apache::mod_dir}/peruser/processors"],
+    notify  => Service['httpd'],
+  }
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7f0d91c881..a7717f38f6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -211,7 +211,7 @@
   } elsif $access_log_pipe {
     $access_log_destination = "\"${access_log_pipe}\""
   } elsif $access_log_syslog {
-    $access_log_destination = "${access_log_syslog}"
+    $access_log_destination = $access_log_syslog
   } else {
     if $ssl {
       $access_log_destination = "${logroot}/${servername}_access_ssl.log"
@@ -225,7 +225,7 @@
   } elsif $error_log_pipe {
     $error_log_destination = "\"${error_log_pipe}\""
   } elsif $error_log_syslog {
-    $error_log_destination = "${error_log_syslog}"
+    $error_log_destination = $error_log_syslog
   } else {
     if $ssl {
       $error_log_destination = "${logroot}/${servername}_error_ssl.log"
@@ -449,4 +449,3 @@
     }
   }
 }
-
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 919b4ec0c5..a174c108d2 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -362,6 +362,78 @@
       end
     end
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_class("apache::package").with({'ensure' => 'present'}) }
+    it { should contain_user("www") }
+    it { should contain_group("www") }
+    it { should contain_class("apache::service") }
+    it { should contain_file("/usr/local/etc/apache22/Vhosts").with(
+      'ensure'  => 'directory',
+      'recurse' => 'true',
+      'purge'   => 'true',
+      'notify'  => 'Class[Apache::Service]',
+      'require' => 'Package[httpd]'
+    ) }
+    it { should contain_file("/usr/local/etc/apache22/Modules").with(
+      'ensure'  => 'directory',
+      'recurse' => 'true',
+      'purge'   => 'true',
+      'notify'  => 'Class[Apache::Service]',
+      'require' => 'Package[httpd]'
+    ) }
+    it { should contain_concat("/usr/local/etc/apache22/ports.conf").with(
+      'owner'   => 'root',
+      'group'   => 'wheel',
+      'mode'    => '0644',
+      'notify'  => 'Class[Apache::Service]'
+    ) }
+    # Assert that load files are placed for these mods, but no conf file.
+    [
+      'auth_basic',
+      'authn_file',
+      'authz_default',
+      'authz_groupfile',
+      'authz_host',
+      'authz_user',
+      'dav',
+      'env'
+    ].each do |modname|
+      it { should contain_file("#{modname}.load").with(
+        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
+        'ensure' => 'file'
+      ) }
+      it { should_not contain_file("#{modname}.conf") }
+    end
+
+    # Assert that both load files and conf files are placed for these mods
+    [
+      'alias',
+      'autoindex',
+      'dav_fs',
+      'deflate',
+      'dir',
+      'mime',
+      'negotiation',
+      'setenvif',
+    ].each do |modname|
+      it { should contain_file("#{modname}.load").with(
+        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
+        'ensure' => 'file'
+      ) }
+      it { should contain_file("#{modname}.conf").with(
+        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.conf",
+        'ensure' => 'file'
+      ) }
+    end
+  end
   context 'on all OSes' do
     let :facts do
       {
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 8bdf1200b8..3a094df480 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -23,4 +23,16 @@
     it { should include_class("apache::params") }
     it { should contain_package("httpd-devel") }
   end
+  context "on a FreeBSD OS" do
+    let :pre_condition do
+      'include apache::package'
+    end
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+      }
+    end
+    it { should include_class("apache::params") }
+  end
 end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index c4aa8a67f6..955be8da47 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -26,4 +26,16 @@
     it { should contain_apache__mod("auth_kerb") }
     it { should contain_package("mod_auth_kerb") }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod("auth_kerb") }
+    it { should contain_package("www/mod_auth_kerb2") }
+  end
 end
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 4d293b37d7..c0e25312ea 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -26,4 +26,16 @@
     it { should contain_apache__mod('dav_svn') }
     it { should contain_package("mod_dav_svn") }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('dav_svn') }
+    it { should contain_package("devel/subversion") }
+  end
 end
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 4d88768531..eee0bb1fa6 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -1,27 +1,23 @@
-describe 'apache::dev', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-      }
+require 'spec_helper'
+describe 'apache::mod::dev', :type => :class do
+  [
+    ['RedHat',  '6'],
+    ['Debian',  '6'],
+    ['FreeBSD', '9'],
+  ].each do |osfamily, operatingsystemrelease|
+    if osfamily == 'FreeBSD'
+      let :pre_condition do
+        'include apache::package'
+      end
     end
-    it { should contain_package("libaprutil1-dev") }
-    it { should contain_package("libapr1-dev") }
-    it { should contain_package("apache2-prefork-dev") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-      }
+    context "on a #{osfamily} OS" do
+      let :facts do
+        {
+          :osfamily               => osfamily,
+          :operatingsystemrelease => operatingsystemrelease,
+        }
+      end
+      it { should include_class('apache::dev') }
     end
-    it { should contain_package("httpd-devel") }
   end
 end
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index ec94b2899f..28aaf5c71a 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -58,4 +58,31 @@
       it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
     end
   end
-end
\ No newline at end of file
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    context "passing no parameters" do
+      it { should include_class("apache::params") }
+      it { should contain_apache__mod('dir') }
+      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+      it { should contain_file('dir.conf').with_content(/ index\.html /) }
+      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
+      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
+      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
+      it { should contain_file('dir.conf').with_content(/ index\.php /) }
+      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+    end
+    context "passing indexes => ['example.txt','fearsome.aspx']" do
+      let :params do
+        {:indexes => ['example.txt','fearsome.aspx']}
+      end
+      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
+      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+    end
+  end
+end
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 75c0e70b4c..f695d1d526 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -2,5 +2,16 @@
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
   end
-  # TBD
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should_not contain_apache__mod('event') }
+    it { should contain_file("/usr/local/etc/apache22/Modules/event.conf").with_ensure('file') }
+  end
 end
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index be444c8496..d356a839d5 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -26,4 +26,16 @@
     it { should contain_apache__mod('fcgid') }
     it { should contain_package("mod_fcgid") }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('fcgid') }
+    it { should contain_package("www/mod_fcgid") }
+  end
 end
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index a057bf1dd8..21d253e98a 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -56,6 +56,24 @@ def general_info_specs
     it { should contain_file("info.conf").with_path("/etc/httpd/conf.d/info.conf") }
   end
 
+  context "On a FreeBSD OS with default params" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    # Load the more generic tests for this context
+    general_info_specs()
+
+    it { should contain_file("info.conf").with({
+      :ensure => 'file',
+      :path   => '/usr/local/etc/apache22/Modules/info.conf',
+    } ) }
+  end
+
   context "with $allow_from => ['10.10.10.10','11.11.11.11']" do
     let :facts do
       {
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 7a0f7615ca..b531e942d8 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -16,4 +16,16 @@
     it { should contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') }
     it { should contain_package("apache2-mpm-itk") }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should_not contain_apache__mod('itk') }
+    it { should contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') }
+  end
 end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 3995dc9ddc..1d148b60c9 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -97,4 +97,16 @@
     it { should contain_file('passenger.conf').with_content(/^  PassengerRoot \/usr\/share\/rubygems\/gems\/passenger-3.0.17$/) }
     it { should contain_file('passenger.conf').with_content(/^  PassengerRuby \/usr\/bin\/ruby$/) }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('passenger') }
+    it { should contain_package("www/rubygem-passenger") }
+  end
 end
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 0f76abbd90..27690e2a0f 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -26,4 +26,16 @@
     it { should contain_apache__mod('perl') }
     it { should contain_package("mod_perl") }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('perl') }
+    it { should contain_package("www/mod_perl2") }
+  end
 end
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index 370d0fd2ba..3d4a608461 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -2,5 +2,16 @@
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
   end
-  # TBD
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should_not contain_apache__mod('peruser') }
+    it { should contain_file("/usr/local/etc/apache22/Modules/peruser.conf").with_ensure('file') }
+  end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 69617fb03c..31a85a7bfc 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -69,4 +69,31 @@
       ) }
     end
   end
+  describe "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    context "with mpm_module => prefork" do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      it { should include_class('apache::params') }
+      it { should contain_apache__mod('php5') }
+      it { should contain_package("lang/php5") }
+      it { should contain_file('php5.load') }
+    end
+    # FIXME: not sure about the following context
+    context 'with mpm_module => worker' do
+      let :pre_condition do
+        'class { "apache": mpm_module => worker, }'
+      end
+      it 'should raise an error' do
+        expect { subject.should contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
+      end
+    end
+  end
 end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index fa34a20c84..7148f787a7 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -32,4 +32,16 @@
     })
     }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should_not contain_apache__mod('prefork') }
+    it { should contain_file("/usr/local/etc/apache22/Modules/prefork.conf").with_ensure('file') }
+  end
 end
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index c257fe7461..10547d8330 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -30,4 +30,16 @@
     it { should contain_apache__mod('proxy_html') }
     it { should contain_package("mod_proxy_html") }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('proxy_html') }
+    it { should contain_package("www/mod_proxy_html") }
+  end
 end
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 09e8cc2f94..b29e4b5f89 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -26,4 +26,16 @@
     it { should contain_apache__mod("python") }
     it { should contain_package("mod_python") }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod("python") }
+    it { should contain_package("www/mod_python3") }
+  end
 end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index f58dde265c..b4e9255f05 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -38,4 +38,16 @@
     it { should contain_apache__mod('ssl') }
     it { should_not contain_package('libapache2-mod-ssl') }
   end
+
+  context 'on a FreeBSD OS' do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class('apache::params') }
+    it { should contain_apache__mod('ssl') }
+  end
 end
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 7d55432753..4c504c01fb 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -29,4 +29,16 @@
     it { should contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') }
     it { should contain_file_line("/etc/sysconfig/httpd worker enable") }
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should_not contain_apache__mod('worker') }
+    it { should contain_file("/usr/local/etc/apache22/Modules/worker.conf").with_ensure('file') }
+  end
 end
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 30ef523e41..9549b1df7b 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -39,4 +39,16 @@
       it {should contain_file('wsgi.conf').with_content(/^  WSGIPythonHome \/path\/to\/virtenv$/)}
     end
   end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('wsgi') }
+    it { should contain_package("www/mod_wsgi") }
+  end
 end
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 836ac27b79..accc549462 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -90,4 +90,20 @@
       )
     }
   end
+
+  context "on a FreeBSD 5 OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should contain_service("httpd").with(
+      'name'      => 'apache22',
+      'ensure'    => 'running',
+      'enable'    => 'true'
+      )
+    }
+  end
 end
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index 77c8dfd918..0bb5bf6b75 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -76,4 +76,30 @@
       end
     end
   end
+
+  context "on a FreeBSD osfamily" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    describe "for non-special modules" do
+      let :title do
+        'spec_m'
+      end
+      it { should include_class("apache::params") }
+      it "should manage the module load file" do
+        should contain_file('spec_m.load').with({
+          :path    => '/usr/local/etc/apache22/Modules/spec_m.load',
+          :content => "LoadModule spec_m_module /usr/local/libexec/apache22/mod_spec_m.so\n",
+          :owner   => 'root',
+          :group   => 'wheel',
+          :mode    => '0644',
+        } )
+      end
+    end
+  end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 988b7f1f07..2e43a47540 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -49,6 +49,23 @@
         :target => '/etc/apache2/sites-available/25-rspec.example.com.conf'
       ) }
     end
+    context "on FreeBSD systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'FreeBSD',
+          :operatingsystemrelease => '9',
+          :concat_basedir         => '/dne',
+        }
+      end
+      let :params do default_params end
+      let :facts do default_facts end
+      it { should include_class("apache") }
+      it { should include_class("apache::params") }
+      it { should contain_file("25-rspec.example.com.conf").with(
+        :ensure => 'present',
+        :path   => '/usr/local/etc/apache22/Vhosts/25-rspec.example.com.conf'
+      ) }
+    end
   end
   describe 'os-independent items' do
     let :facts do
diff --git a/spec/system/class_spec.rb b/spec/system/class_spec.rb
index 441331658c..0e9afe543c 100644
--- a/spec/system/class_spec.rb
+++ b/spec/system/class_spec.rb
@@ -8,6 +8,9 @@
   when 'Debian'
     package_name = 'apache2'
     service_name = 'apache2'
+  when 'FreeBSD'
+    package_name = 'apache22'
+    service_name = 'apache22'
   end
 
   context 'default parameters' do
diff --git a/spec/system/default_mods_spec.rb b/spec/system/default_mods_spec.rb
index 95e57e844a..9134fbb92f 100644
--- a/spec/system/default_mods_spec.rb
+++ b/spec/system/default_mods_spec.rb
@@ -5,6 +5,8 @@
   servicename = 'httpd'
 when 'Debian'
   servicename = 'apache2'
+when 'FreeBSD'
+  servicename = 'apache22'
 else
   raise "Unconfigured OS for apache service on #{node.facts['osfamily']}"
 end
diff --git a/spec/system/itk_spec.rb b/spec/system/itk_spec.rb
index fdbabb9fe6..2d8765cf0a 100644
--- a/spec/system/itk_spec.rb
+++ b/spec/system/itk_spec.rb
@@ -3,6 +3,8 @@
 case node.facts['osfamily']
 when 'Debian'
   service_name = 'apache2'
+when 'FreeBSD'
+  service_name = 'apache22'
 else
   # Not implemented yet
   service_name = :skip
diff --git a/spec/system/mod_php_spec.rb b/spec/system/mod_php_spec.rb
index 71a806b6b9..9fad7c1487 100644
--- a/spec/system/mod_php_spec.rb
+++ b/spec/system/mod_php_spec.rb
@@ -3,11 +3,14 @@
 describe 'apache::mod::php class' do
   case node.facts['osfamily']
   when 'Debian'
-    mod_dir = '/etc/apache2/mods-available'
+    mod_dir      = '/etc/apache2/mods-available'
     service_name = 'apache2'
   when 'RedHat'
-    mod_dir = '/etc/httpd/conf.d'
+    mod_dir      = '/etc/httpd/conf.d'
     service_name = 'httpd'
+  when 'FreeBSD'
+    mod_dir      = '/usr/local/etc/apache22/Modules'
+    service_name = 'apache22'
   end
 
   context "default php config" do
diff --git a/spec/system/prefork_worker_spec.rb b/spec/system/prefork_worker_spec.rb
index b455d748fa..033e716197 100644
--- a/spec/system/prefork_worker_spec.rb
+++ b/spec/system/prefork_worker_spec.rb
@@ -5,6 +5,8 @@
   servicename = 'httpd'
 when 'Debian'
   servicename = 'apache2'
+when 'FreeBSD'
+  servicename = 'apache22'
 else
   raise "Unconfigured OS for apache service on #{node.facts['osfamily']}"
 end
diff --git a/spec/system/vhost_spec.rb b/spec/system/vhost_spec.rb
index 72427a0176..f5fdd2fe34 100644
--- a/spec/system/vhost_spec.rb
+++ b/spec/system/vhost_spec.rb
@@ -6,6 +6,10 @@
     vhost_dir = '/etc/httpd/conf.d'
     package_name = 'httpd'
     service_name = 'httpd'
+  when 'FreeBSD'
+    vhost_dir = '/usr/local/etc/apache22/Vhosts'
+    package_name = 'apache22'
+    service_name = 'apache22'
   when 'Debian'
     vhost_dir = '/etc/apache2/sites-enabled'
     package_name = 'apache2'
diff --git a/templates/confd/no-accf.conf.erb b/templates/confd/no-accf.conf.erb
new file mode 100644
index 0000000000..10e51644ce
--- /dev/null
+++ b/templates/confd/no-accf.conf.erb
@@ -0,0 +1,4 @@
+<IfDefine NOHTTPACCEPT>
+   AcceptFilter http none
+   AcceptFilter https none
+</IfDefine>
diff --git a/tests/mod_load_params.pp b/tests/mod_load_params.pp
new file mode 100644
index 0000000000..0e84c5efbf
--- /dev/null
+++ b/tests/mod_load_params.pp
@@ -0,0 +1,11 @@
+# Tests the path and identifier parameters for the apache::mod class
+
+# Base class for clarity:
+class { 'apache': }
+
+
+# Exaple parameter usage:
+apache::mod { 'testmod':
+  path => '/usr/some/path/mod_testmod.so',
+  id   => 'testmod_custom_name',
+}

From ba6b57b159a4cd6ecf9786fe45d2535f1ffb64cd Mon Sep 17 00:00:00 2001
From: Daniel Beckham <dbeckham@dealnews.com>
Date: Tue, 12 Nov 2013 14:44:11 -0600
Subject: [PATCH 0045/2267] Revert unnecessary `$default_ssl_vhost` validation
 change.

The `validate_bool()` call was moved in
112437730f70e18daf3aed9cedffd0c46348204d making it FreeBSD centric, but
it should be validated outside of any other condition.
---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 57ea183841..60a1406702 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -56,6 +56,7 @@
 ) inherits apache::params {
 
   validate_bool($default_vhost)
+  validate_bool($default_ssl_vhost)
   validate_bool($default_confd_files)
   # true/false is sufficient for both ensure and enable
   validate_bool($service_enable)
@@ -80,7 +81,6 @@
       name   => $apache::params::apache_name,
       notify => Class['Apache::Service'],
     }
-  validate_bool($default_ssl_vhost)
   }
   validate_re($sendfile, [ '^[oO]n$' , '^[oO]ff$' ])
 

From 7de115bf8be601b814b024e00cd3b47a46ea32d8 Mon Sep 17 00:00:00 2001
From: Daniel Beckham <dbeckham@dealnews.com>
Date: Tue, 12 Nov 2013 14:57:25 -0600
Subject: [PATCH 0046/2267] Fix spec test for `default_ssl_vhost  => true`

The spec test for `default_ssl_vhost  => true` was retesting the test
for `default_vhost  => true` instead.
---
 spec/classes/apache_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index a174c108d2..690cdaab0a 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -458,7 +458,7 @@
           :default_ssl_vhost  => true
         }
       end
-      it { should contain_apache__vhost('default').with_ensure('present') }
+      it { should contain_apache__vhost('default-ssl').with_ensure('present') }
     end
   end
 end

From ca4f49bf5325451a77e56c87f63374d134c3783e Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Wed, 13 Nov 2013 13:23:51 +1300
Subject: [PATCH 0047/2267] need to use the provider variable not the provider
 key value from the directory hash for matches

---
 templates/vhost/_directories.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index a17327332b..335808e581 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -17,7 +17,7 @@
     <%- if directory['options'] -%>
     Options <%= Array(directory['options']).join(' ') %>
     <%- end -%>
-    <%- if directory['provider'] == 'directory' %>
+    <%- if provider == 'Directory' %>
       <%- if directory['allow_override'] -%>
     AllowOverride <%= Array(directory['allow_override']).join(' ') %>
       <%- elsif provider == 'Directory' -%>

From b4f89da0a5ef62caf6c6d7f52fcad29659b64557 Mon Sep 17 00:00:00 2001
From: Al Newkirk <anewkirk@ana.io>
Date: Wed, 13 Nov 2013 07:12:55 -0500
Subject: [PATCH 0048/2267] Add ability to include additional external
 configurations in vhost

---
 README.md                  |  6 ++++++
 manifests/vhost.pp         |  2 ++
 spec/defines/vhost_spec.rb | 14 ++++++++++++++
 templates/vhost.conf.erb   |  5 +++++
 tests/vhost.pp             |  9 ++++++++-
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 603120f986..0e2ed873c0 100644
--- a/README.md
+++ b/README.md
@@ -742,6 +742,12 @@ Filename used to communicate with the web server.  Defaults to 'undef'.
 
 Directory to enable for FastCGI.  Defaults to 'undef'.
 
+#####`additional_includes`
+
+Specifies paths to additional static vhost-specific Apache configuration files.
+This option is useful when you need to implement a unique and/or custom
+configuration not supported by this module.
+
 #####`ip`
 
 The IP address the vhost listens on. Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a7717f38f6..94a5ac5207 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -131,6 +131,7 @@
     $fastcgi_server              = undef,
     $fastcgi_socket              = undef,
     $fastcgi_dir                 = undef,
+    $additional_includes         = [],
   ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -365,6 +366,7 @@
   # - $error_log_destination
   # - $fallbackresource
   # - $custom_fragment
+  # - $additional_includes
   # block fragment:
   #   - $block
   # directories fragment:
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 2e43a47540..fea2c19a5c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -348,6 +348,20 @@
             '  Alias /css /opt/someapp/css'
           ],
         },
+        {
+          :title => 'should accept multiple additional includes',
+          :attr  => 'additional_includes',
+          :value => [
+            '/tmp/proxy_group_a',
+            '/tmp/proxy_group_b',
+            '/tmp/proxy_group_c',
+          ],
+          :match => [
+            '  Include /tmp/proxy_group_a',
+            '  Include /tmp/proxy_group_b',
+            '  Include /tmp/proxy_group_c'
+          ],
+        },
         {
           :title => 'should accept a suPHP_Engine',
           :attr  => 'suphp_engine',
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index e20be411ce..d7b58a57a8 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -26,6 +26,11 @@
   ## Directories, there should at least be a declaration for <%= @docroot %>
 <%= scope.function_template(['apache/vhost/_directories.erb']) -%>
 
+  ## Load additional static includes
+<% Array(@additional_includes).each do |include| %>
+  Include <%= include %>
+<% end %>
+
   ## Logging
 <% if @error_log -%>
   ErrorLog <%= @error_log_destination %>
diff --git a/tests/vhost.pp b/tests/vhost.pp
index 173316e034..153a213dd2 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -168,12 +168,20 @@
   docroot => '/var/www/eighteenth',
   setenv  => ['SPECIAL_PATH /foo/bin','KILROY was_here'],
 }
+
 apache::vhost { 'nineteenth.example.com':
   port     => '80',
   docroot  => '/var/www/nineteenth',
   setenvif => 'Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1',
 }
 
+# Vhost with additional include files
+apache::vhost { 'twentyieth.example.com':
+  port                => '80',
+  docroot             => '/var/www/twelfth',
+  additional_includes => ['/tmp/proxy_group_a','/tmp/proxy_group_b'],
+}
+
 # Vhost with alias for subdomain mapped to same named directory
 # http://example.com.loc => /var/www/example.com
 apache::vhost { 'subdomain.loc':
@@ -199,4 +207,3 @@
         ssl_honorcipherorder  => 'On',
         add_listen            => 'false',
 }
-

From 02283f62a3ef5175dea57e5f0b53b8effa2a656d Mon Sep 17 00:00:00 2001
From: "anyone.can.test" <anyone.can.test@gmail.com>
Date: Wed, 6 Nov 2013 10:41:20 +0900
Subject: [PATCH 0049/2267] Add directives: IndexOptions, IndexOrderDefault

---
 README.md                        | 21 +++++++++++++++++++++
 manifests/vhost.pp               |  2 ++
 templates/vhost/_directories.erb |  6 ++++++
 3 files changed, 29 insertions(+)

diff --git a/README.md b/README.md
index 603120f986..e2593d0f8b 100644
--- a/README.md
+++ b/README.md
@@ -595,6 +595,27 @@ Lists the options for the given `<Directory>` block
     }
 ```
 
+######`index_options`
+
+Styles the list
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ { path => '/path/to/directory', options => ['Indexes','FollowSymLinks','MultiViews'], index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'] }],
+    }
+```
+
+######`index_order_default`
+Sets the order of the list 
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ { path => '/path/to/directory', order => 'Allow,Deny', index_order_default => ['Descending', 'Date']}, ],
+    }
+```
+
 ######`order`
 Sets the order of processing `Allow` and `Deny` statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). An example:
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a7717f38f6..0b667a07cb 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -86,6 +86,8 @@
     $servername                  = $name,
     $serveraliases               = [],
     $options                     = ['Indexes','FollowSymLinks','MultiViews'],
+    $index_options               = [],
+    $index_order_default         = [],
     $override                    = ['None'],
     $directoryindex              = '',
     $vhost_name                  = '*',
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 335808e581..989680c50a 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -18,6 +18,12 @@
     Options <%= Array(directory['options']).join(' ') %>
     <%- end -%>
     <%- if provider == 'Directory' %>
+      <%- if directory['index_options'] -%>
+    IndexOptions <%= Array(directory['index_options']).join(' ') %>
+      <%- end -%>
+      <%- if directory['index_order_default'] -%>
+    IndexOrderDefault <%= Array(directory['index_order_default']).join(' ') %>
+      <%- end -%>
       <%- if directory['allow_override'] -%>
     AllowOverride <%= Array(directory['allow_override']).join(' ') %>
       <%- elsif provider == 'Directory' -%>

From 8d966e86ec59bb0d64543f3163c1637f7abc7c23 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Thu, 14 Nov 2013 11:12:53 +1300
Subject: [PATCH 0050/2267] Update spec tests for index_options and
 index_order_default parameters

---
 spec/defines/vhost_spec.rb | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 2e43a47540..6428fd4942 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -391,14 +391,16 @@
           :title    => 'should accept directory directives hash',
           :attr     => 'directories',
           :value    => {
-            'path'              => '/opt/app',
-            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            'allow'             => 'from rspec.org',
-            'allow_override'    => 'Lol',
-            'deny'              => 'from google.com',
-            'options'           => '-MultiViews',
-            'order'             => 'deny,yned',
-            'passenger_enabled' => 'onf',
+            'path'                => '/opt/app',
+            'headers'             => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+            'allow'               => 'from rspec.org',
+            'allow_override'      => 'Lol',
+            'deny'                => 'from google.com',
+            'options'             => '-MultiViews',
+            'order'               => 'deny,yned',
+            'passenger_enabled'   => 'onf',
+            'index_options'       => 'Index',
+            'index_order_default' => 'none',
           },
           :match    => [
             '  <Directory /opt/app>',
@@ -409,6 +411,8 @@
             '    Options -MultiViews',
             '    Order deny,yned',
             '    PassengerEnabled onf',
+            '    IndexOptions Index',
+            '    IndexOrderDefault none',
             '  </Directory>',
           ],
         },
@@ -417,13 +421,15 @@
           :attr     => 'directories',
           :value    => [
             {
-              'path'              => '/opt/app1',
-              'allow'             => 'from rspec.org',
-              'allow_override'    => ['AuthConfig','Indexes'],
-              'deny'              => 'from google.com',
-              'options'           => ['-MultiViews','+MultiViews'],
-              'order'             => ['deny','yned'],
-              'passenger_enabled' => 'onf',
+              'path'                => '/opt/app1',
+              'allow'               => 'from rspec.org',
+              'allow_override'      => ['AuthConfig','Indexes'],
+              'deny'                => 'from google.com',
+              'options'             => ['-MultiViews','+MultiViews'],
+              'order'               => ['deny','yned'],
+              'passenger_enabled'   => 'onf',
+              'index_options'       => ['up','down'],
+              'index_order_default' => ['left','right'],
             },
             {
               'path'        => '/opt/app2',
@@ -441,6 +447,8 @@
             '    Options -MultiViews +MultiViews',
             '    Order deny,yned',
             '    PassengerEnabled onf',
+            '    IndexOptions up down',
+            '    IndexOrderDefault left right',
             '  </Directory>',
             '  <Directory /opt/app2>',
             '    AllowOverride None',

From ddd13af9d713c4b701e217f1804841b4c0efa7fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 14 Nov 2013 16:00:45 +0100
Subject: [PATCH 0051/2267] update contributing to reflect modules workflow

CONTRIBUTING has been dropped in from puppetlabs/puppet, with
good intention I assume, however it does in no way reflect how
we work on modules.

* change all references from Redmine to refer to GitHub
* Fix CLA links
* remove the entire section for committers, we assume they know what
they are doing...

Further, we remove all contractions. Why? Because it reads easier.

Finally we will need a section on how to write tests (and run them
locally) because I'm getting sick of repeating myself.
---
 CONTRIBUTING.md | 213 ++++++++++--------------------------------------
 1 file changed, 45 insertions(+), 168 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5f0dbf14a5..4a3c1f21be 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,9 +17,8 @@ Checklist (and a short version for the impatient)
       description (50 characters is the soft limit, excluding ticket
       number(s)), and should skip the full stop.
 
-    - Associated the Redmine ticket in the message. The first line
-      should include the ticket number in the form "(#XXXX) Rest of
-      message".
+    - Associate the issue in the message. The first line should include
+			the issue number in the form "(#XXXX) Rest of message".
 
     - The body should provide a meaningful commit message, which:
 
@@ -32,15 +31,19 @@ Checklist (and a short version for the impatient)
     - Make sure that you have tests for the bug you are fixing, or
       feature you are adding.
 
-    - Make sure the test suite passes after your commit (rake spec unit).
+    - Make sure the test suites passe after your commit:
+      `rake spec unit spec:system` More information on [testing](#Writing Tests) below
+
+    - When introducing a new feature, make sure it is properly
+      documented in the README.md
 
   * Submission:
 
     * Pre-requisites:
 
-      - Make sure you have a [Redmine account](http://projects.puppetlabs.com)
+      - Sign the [Contributor License Agreement](https://cla.puppetlabs.com/)
 
-      - Sign the [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
+      - Make sure you have a [GitHub account](https://github.com/join)
 
       - [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for.
 
@@ -58,23 +61,6 @@ Checklist (and a short version for the impatient)
 The long version
 ================
 
-  0.  Decide what to base your work on.
-
-      In general, you should always base your work on the oldest
-      branch that your change is relevant to.
-
-      - A bug fix should be based on the current stable series. If the
-        bug is not present in the current stable release, then base it on
-        `master`.
-
-      - A new feature should be based on `master`.
-
-      - Security fixes should be based on the current maintenance series
-        (that is, the previous stable series).  If the security issue
-        was not present in the maintenance series, then it should be
-        based on the current stable series if it was introduced there,
-        or on `master` if it is not yet present in a stable release.
-
   1.  Make separate commits for logically separate changes.
 
       Please break your commits down into logically consistent units
@@ -84,15 +70,15 @@ The long version
       your diff is to read, the more likely someone will be happy to
       review it and get it into the code base.
 
-      If you're going to refactor a piece of code, please do so as a
+      If you are going to refactor a piece of code, please do so as a
       separate commit from your feature or bug fix changes.
 
       We also really appreciate changes that include tests to make
-      sure the bug isn't re-introduced, and that the feature isn't
+      sure the bug is not re-introduced, and that the feature is not
       accidentally broken.
 
       Describe the technical detail of the change(s).  If your
-      description starts to get too long, that's a good sign that you
+      description starts to get too long, that is a good sign that you
       probably need to split up your commit into more finely grained
       pieces.
 
@@ -113,139 +99,42 @@ The long version
       Before we can accept your changes, we do need a signed Puppet
       Labs Contributor License Agreement (CLA).
 
-      You can access the CLA via the
-      [Contributor License Agreement link](https://projects.puppetlabs.com/contributor_licenses/sign)
-      in the top menu bar of our Redmine instance.  Once you've signed
-      the CLA, a badge will show up next to your name on the
-      [Puppet Project Overview Page](http://projects.puppetlabs.com/projects/modules?jump=welcome),
-      and your name will be listed under "Contributor License Signers"
-      section.
+      You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/)
 
       If you have any questions about the CLA, please feel free to
       contact Puppet Labs via email at cla-submissions@puppetlabs.com.
 
   3.  Sending your patches
 
-      We accept multiple ways of submitting your changes for
-      inclusion.  They are listed below in order of preference.
-
-      Please keep in mind that any method that involves sending email
-      to the mailing list directly requires you to be subscribed to
-      the mailing list, and that your first post to the list will be
-      held in a moderation queue.
-
-      * GitHub Pull Requests
-
-        To submit your changes via a GitHub pull request, we _highly_
-        recommend that you have them on a topic branch, instead of
-        directly on "master" or one of the release, or RC branches.
-        It makes things much easier to keep track of, especially if
-        you decide to work on another thing before your first change
-        is merged in.
-
-        GitHub has some pretty good
-        [general documentation](http://help.github.com/) on using
-        their site.  They also have documentation on
-        [creating pull requests](http://help.github.com/send-pull-requests/).
-
-        In general, after pushing your topic branch up to your
-        repository on GitHub, you'll switch to the branch in the
-        GitHub UI and click "Pull Request" towards the top of the page
-        in order to open a pull request.
-
-        You'll want to make sure that you have the appropriate
-        destination branch in the repository under the puppetlabs
-        organization.  This should be the same branch that you based
-        your changes off of.
+      To submit your changes via a GitHub pull request, we _highly_
+      recommend that you have them on a topic branch, instead of
+      directly on "master" or one of the release.
+      It makes things much easier to keep track of, especially if
+      you decide to work on another thing before your first change
+      is merged in.
 
-      * Other pull requests
+      GitHub has some pretty good
+      [general documentation](http://help.github.com/) on using
+      their site.  They also have documentation on
+      [creating pull requests](http://help.github.com/send-pull-requests/).
 
-        If you already have a publicly accessible version of the
-        repository hosted elsewhere, and don't wish to or cannot use
-        GitHub, you can submit your change by requesting that we pull
-        the changes from your repository by sending an email to the
-        puppet-dev Google Groups mailing list.
+      In general, after pushing your topic branch up to your
+      repository on GitHub, you can switch to the branch in the
+      GitHub UI and click "Pull Request" towards the top of the page
+      in order to open a pull request.
 
-        `git-request-pull(1)` provides a handy way to generate the text
-        for the email requesting that we pull your changes (and does
-        some helpful sanity checks in the process).
 
-      * Mailing patches to the mailing list
+  4.  Update the related GitHub issue.
 
-        If neither of the previous methods works for you, then you can
-        also mail the patches inline to the puppet-dev Google Group
-        using either `rake mail_patches`, or by using
-        `git-format-patch(1)`, and `git-send-email(1)` directly.
-
-        `rake mail_patches` handles setting the appropriate flags to
-        `git-format-patch(1)` and `git-send-email(1)` for you, but
-        doesn't allow adding any commentary between the '---', and the
-        diffstat in the resulting email.  It also requires that you
-        have created your topic branch in the form
-        `<type>/<parent>/<name>`.
-
-        If you decide to use `git-format-patch(1)` and
-        `git-send-email(1)` directly, please be sure to use the
-        following flags for `git-format-patch(1)`: -C -M -s -n
-        --subject-prefix='PATCH/puppet'
-
-      * Attaching patches to Redmine
-
-        As a method of last resort you can also directly attach the
-        output of `git-format-patch(1)`, or `git-diff(1)` to a Redmine
-        ticket.
-
-        If you are generating the diff outside of Git, please be sure
-        to generate a unified diff.
-
-  4.  Update the related Redmine ticket.
-
-      If there's a Redmine ticket associated with the change you
+      If there is a GitHub issue associated with the change you
       submitted, then you should update the ticket to include the
-      location of your branch, and change the status to "In Topic
-      Branch Pending Merge", along with any other commentary you may
-      wish to make.
-
-How to track the status of your change after it's been submitted
-================================================================
-
-Shortly after opening a pull request on GitHub, there should be an
-automatic message sent to the puppet-dev Google Groups mailing list
-notifying people of this.  This notification is used to let the Puppet
-development community know about your requested change to give them a
-chance to review, test, and comment on the change(s).
-
-If you submitted your change via manually sending a pull request or
-mailing the patches, then we keep track of these using
-[patchwork](https://patchwork.puppetlabs.com).  When code is merged
-into the project it is automatically removed from patchwork, and the
-Redmine ticket is manually updated with the commit SHA1.  In addition,
-the ticket status must be updated by the person who merges the topic
-branch to a status of "Merged - Pending Release"
-
-We do our best to comment on or merge submitted changes within a week.
-However, if there hasn't been any commentary on the pull request or
-mailed patches, and it hasn't been merged in after a week, then feel
-free to ask for an update by replying on the mailing list to the
-automatic notification or mailed patches. It probably wasn't
-intentional, and probably just slipped through the cracks.
+      location of your branch, along with any other commentary you
+			may wish to make.
 
-Additional Resources
-====================
+Writing Tests
+=============
 
-* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
-
-* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
-
-* [Bug tracker (Redmine)](http://projects.puppetlabs.com/projects/modules)
-
-* [Patchwork](https://patchwork.puppetlabs.com)
-
-* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
-
-* [General GitHub documentation](http://help.github.com/)
-
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+# XXX The stuff we always say about how to get started with tests
 
 If you have commit access to the repository
 ===========================================
@@ -260,33 +149,21 @@ Having someone other than the author of the topic branch recorded as
 performing the merge is the record that they performed the code
 review.
 
-  * Merging topic branches
 
-    When merging code from a topic branch into the integration branch
-    (Ex: master, 2.7.x, 1.6.x, etc.), there should always be a merge
-    commit.  You can accomplish this by always providing the `--no-ff`
-    flag to `git merge`.
+Additional Resources
+====================
 
-        git merge --no-ff --log ticket/1234-fix-something-broken
+* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
 
-    The reason for always forcing this merge commit is that it
-    provides a consistent way to look up what changes & commits were
-    in a topic branch, whether that topic branch had one, or 500
-    commits.  For example, if the merge commit had an abbreviated
-    SHA-1 of `coffeebad`, then you could use the following `git log`
-    invocation to show you which commits it brought in:
+* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
 
-        git log coffeebad^1..coffeebad^2
+* [Bug tracker (Redmine)](http://projects.puppetlabs.com/projects/modules)
 
-    The following would show you which changes were made on the topic
-    branch:
+* [Patchwork](https://patchwork.puppetlabs.com)
 
-        git diff coffeebad^1...coffeebad^2
+* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
+
+* [General GitHub documentation](http://help.github.com/)
+
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
 
-    Because we _always_ merge the topic branch into the integration
-    branch the first parent (`^1`) of a merge commit will be the most
-    recent commit on the integration branch from just before we merged
-    in the topic, and the second parent (`^2`) will always be the most
-    recent commit that was made in the topic branch.  This also serves
-    as the record of who performed the code review, as mentioned
-    above.

From c11bc56d8bd47e49cb8c0dc02664f336598e904e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 14 Nov 2013 17:15:05 +0100
Subject: [PATCH 0052/2267] Ignore vim swap files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e41102bd82..5f67118b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ vendor
 spec/fixtures
 .rspec_system
 .bundle
+.sw*

From eb7600a07016ad7edb4da4b33663dafd25556e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 14 Nov 2013 21:06:06 +0100
Subject: [PATCH 0053/2267] *really* ignore vim swap files.

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5f67118b2a..e8f52b4451 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ vendor
 spec/fixtures
 .rspec_system
 .bundle
-.sw*
+.*sw*

From c638b73485b42b3f1077acbe87cc5bb3bf7be406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 14 Nov 2013 21:07:36 +0100
Subject: [PATCH 0054/2267] tiny style fixes to CONTRIBUTING

* we have no release branches, remove reference
* remove contractions
---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4a3c1f21be..eba6267e20 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -108,7 +108,7 @@ The long version
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
-      directly on "master" or one of the release.
+      directly on "master".
       It makes things much easier to keep track of, especially if
       you decide to work on another thing before your first change
       is merged in.
@@ -139,10 +139,10 @@ Writing Tests
 If you have commit access to the repository
 ===========================================
 
-Even if you have commit access to the repository, you'll still need to
+Even if you have commit access to the repository, you will still need to
 go through the process above, and have someone else review and merge
 in your changes.  The rule is that all changes must be reviewed by a
-developer on the project (that didn't write the code) to ensure that
+developer on the project (that did not write the code) to ensure that
 all changes go through a code review process.
 
 Having someone other than the author of the topic branch recorded as

From 4ed69ce472f741edbd0af853b5cefa21efac4d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 14 Nov 2013 22:56:53 +0100
Subject: [PATCH 0055/2267] getting started for writing tests

some prerequisites and lots of links on how to get started *testing*
puppet modules. Still outstanding: how to start writing tests.
---
 CONTRIBUTING.md | 66 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eba6267e20..ecf012ce90 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ Checklist (and a short version for the impatient)
       feature you are adding.
 
     - Make sure the test suites passe after your commit:
-      `rake spec unit spec:system` More information on [testing](#Writing Tests) below
+      `rake spec spec:system` More information on [testing](#Testing) below
 
     - When introducing a new feature, make sure it is properly
       documented in the README.md
@@ -131,10 +131,70 @@ The long version
       location of your branch, along with any other commentary you
 			may wish to make.
 
+Testing
+=======
+
+Getting Started
+---------------
+
+Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
+package manager such as [bundler](http://bundler.io/) what Ruby packages,
+or Gems, are required to build, develop, and test this software.
+
+Please make sure you have [bundler installed](http://bundler.io/#getting-started)
+on your system, then use it to install all dependencies needed for this project,
+by running
+
+```shell
+% bundle install
+Fetching gem metadata from https://rubygems.org/........
+Fetching gem metadata from https://rubygems.org/..
+Using rake (10.1.0)
+Using builder (3.2.2)
+-- 8><-- many more --><8 --
+Using rspec-system-puppet (2.2.0)
+Using serverspec (0.6.3)
+Using rspec-system-serverspec (1.0.0)
+Using bundler (1.3.5)
+Your bundle is complete!
+Use `bundle show [gemname]` to see where a bundled gem is installed.
+```
+
+NOTE some systems may require you to run this command with sudo.
+
+With all dependencies installed we can now run the tests:
+
+```shell
+% rake spec
+```
+
+This will execute all the [rspec tests](http://rspec-puppet.com/) tests
+under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
+and so on. rspec tests may have the same kind of dependencies as the
+module they are testing. While the module defines in its [Modulefile](./Modulefile),
+rspec tests define them in [.fixtures.yml](./fixtures.yml).
+
+Some puppet modules also come with [rspec-system](https://github.com/puppetlabs/rspec-system)
+tests. These tests spin up a virtual machine under
+[VirtualBox](https://www.virtualbox.org/)) with, controlling it with
+[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
+scenarios. In order to run these, you will need both of those tools
+installed on your system.
+
+You can run them by issuing the following command
+
+```shell
+% rake spec:system
+```
+
+This will now download a pre-fabricated image configured in [.nodeset.yml](./.nodeset.yml),
+install puppet, copy this module and install its dependencies per [spec/spec_helper_system.rb](./spec/spec_helper_system.rb)
+and then run all the tests under [spec/system](./spec/system).
+
 Writing Tests
-=============
+-------------
 
-# XXX The stuff we always say about how to get started with tests
+XXX getting started writing tests.
 
 If you have commit access to the repository
 ===========================================

From 8c57377cd3c2610302166624f7c4c93227adbd3c Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Fri, 15 Nov 2013 06:16:50 +0100
Subject: [PATCH 0056/2267] Don't listen on port or set NameVirtualHost for
 non-existent vhost

Apache should not listen on ports or define NameVirtualHost directives
for which there is no virtual host defined. Discussed in isse #465.
---
 manifests/vhost.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 912903c4ce..4d33de9309 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -175,7 +175,7 @@
     validate_re($fallbackresource, '^/|disabled', 'Please make sure fallbackresource starts with a / (or is "disabled")')
   }
 
-  if $ssl {
+  if $ssl and $ensure == 'present' {
     include apache::mod::ssl
     # Required for the AddType lines.
     include apache::mod::mime
@@ -270,12 +270,12 @@
     if $ip and defined(Apache::Listen[$port]) {
       fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
     }
-    if ! defined(Apache::Listen[$listen_addr_port]) and $listen_addr_port {
+    if ! defined(Apache::Listen[$listen_addr_port]) and $listen_addr_port and $ensure == 'present' {
       apache::listen { $listen_addr_port: }
     }
   }
   if ! $ip_based {
-    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) {
+    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' {
       apache::namevirtualhost { $nvh_addr_port: }
     }
   }

From ea61f6ea3a326a476e2b919efbf7c173869c5528 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <andreas.ntaflos@rise-world.com>
Date: Thu, 14 Nov 2013 18:39:39 +0100
Subject: [PATCH 0057/2267] Add mod_rpaf support

From apt-cache show libapache2-mod-rpaf:

Rpaf is short for reverse proxy add forward. It changes the remote
address of the client visible to other Apache modules when two
conditions are satisfied. First condition is that the remote client is
actually a proxy that is defined in httpd.conf. Secondly if there is an
incoming X-Forwarded-For header and the proxy is in its list of known
proxies it takes the last IP from the incoming X-Forwarded-For header
and changes the remote address of the client in the request structure.
---
 README.md                     |  1 +
 manifests/mod/rpaf.pp         | 20 +++++++++++++++++
 manifests/params.pp           |  7 +++---
 spec/classes/mod/rpaf_spec.rb | 42 +++++++++++++++++++++++++++++++++++
 templates/mod/rpaf.conf.erb   | 15 +++++++++++++
 5 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 manifests/mod/rpaf.pp
 create mode 100644 spec/classes/mod/rpaf_spec.rb
 create mode 100644 templates/mod/rpaf.conf.erb

diff --git a/README.md b/README.md
index 717a8553e8..2f991ddc28 100644
--- a/README.md
+++ b/README.md
@@ -392,6 +392,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `python`
 * `reqtimeout`
 * `rewrite`
+* `rpaf`*
 * `setenvif`
 * `ssl`* (see [apache::mod::ssl](#class-apachemodssl) below)
 * `status`*
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
new file mode 100644
index 0000000000..94dc31ccac
--- /dev/null
+++ b/manifests/mod/rpaf.pp
@@ -0,0 +1,20 @@
+class apache::mod::rpaf (
+  $sethostname = true,
+  $proxy_ips   = [ '127.0.0.1' ],
+  $header      = 'X-Forwarded-For'
+) {
+  apache::mod { 'rpaf': }
+
+  # Template uses:
+  # - $sethostname
+  # - $proxy_ips
+  # - $header
+  file { 'rpaf.conf':
+    ensure  => file,
+    path    => "${apache::mod_dir}/rpaf.conf",
+    content => template('apache/mod/rpaf.conf.erb'),
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index dc26d6d225..f968d3e5eb 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -120,18 +120,19 @@
     $mod_packages     = {
       'auth_kerb'   => 'libapache2-mod-auth-kerb',
       'authnz_ldap' => 'libapache2-mod-authz-ldap',
+      'dav_svn'     => 'libapache2-svn',
       'fastcgi'     => 'libapache2-mod-fastcgi',
       'fcgid'       => 'libapache2-mod-fcgid',
+      'nss'         => 'libapache2-mod-nss',
       'passenger'   => 'libapache2-mod-passenger',
       'perl'        => 'libapache2-mod-perl2',
       'php5'        => 'libapache2-mod-php5',
       'proxy_html'  => 'libapache2-mod-proxy-html',
       'python'      => 'libapache2-mod-python',
-      'wsgi'        => 'libapache2-mod-wsgi',
-      'dav_svn'     => 'libapache2-svn',
+      'rpaf'        => 'libapache2-mod-rpaf',
       'suphp'       => 'libapache2-mod-suphp',
+      'wsgi'        => 'libapache2-mod-wsgi',
       'xsendfile'   => 'libapache2-mod-xsendfile',
-      'nss'         => 'libapache2-mod-nss',
     }
     $mod_libs         = {
       'php5' => 'libphp5.so',
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
new file mode 100644
index 0000000000..57c8da36b8
--- /dev/null
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -0,0 +1,42 @@
+describe 'apache::mod::rpaf', :type => :class do
+  let :pre_condition do
+    [
+      'include apache',
+    ]
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('rpaf') }
+    it { should contain_package("libapache2-mod-rpaf") }
+    it { should contain_file('rpaf.conf').with({
+      'path' => '/etc/apache2/mods-available/rpaf.conf',
+    }) }
+    it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+
+    describe "with sethostname => true" do
+      let :params do
+        { :sethostname => 'true' }
+      end
+      it { should contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+    end
+    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
+      let :params do
+        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
+      end
+      it { should contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+    end
+    describe "with header => X-Real-IP" do
+      let :params do
+        { :header => 'X-Real-IP' }
+      end
+      it { should contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+    end
+  end
+end
diff --git a/templates/mod/rpaf.conf.erb b/templates/mod/rpaf.conf.erb
new file mode 100644
index 0000000000..56e2398b55
--- /dev/null
+++ b/templates/mod/rpaf.conf.erb
@@ -0,0 +1,15 @@
+# Enable reverse proxy add forward
+RPAFenable On
+# RPAFsethostname will, when enabled, take the incoming X-Host header and
+# update the virtual host settings accordingly. This allows to have the same
+# hostnames as in the "real" configuration for the forwarding proxy.
+<% if @sethostname -%>
+RPAFsethostname On
+<% else -%>
+RPAFsethostname Off
+<% end -%>
+# Which IPs are forwarding requests to us
+RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %>
+# Setting RPAFheader allows you to change the header name to parse from the
+# default X-Forwarded-For to something of your choice.
+RPAFheader <%= @header %>

From b2846594cf0eaf8dc448272de526aa15553545d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Fri, 15 Nov 2013 23:06:07 +0100
Subject: [PATCH 0058/2267] added FreeBSD support to mod_rpaf

---
 manifests/.params.pp.swp      | Bin 16384 -> 0 bytes
 manifests/params.pp           |   1 +
 spec/classes/mod/rpaf_spec.rb |  35 ++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 delete mode 100644 manifests/.params.pp.swp

diff --git a/manifests/.params.pp.swp b/manifests/.params.pp.swp
deleted file mode 100644
index 8dee9947fc03a0cda259981cd033541963871ecd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
zcmeHOU5F${9WUcY{5mfh{6HmEc1Pwe?#$fo<`NuS<7o^hoOs@Og5F0{GhH*&w>{l`
zT{W|}x7h?Vf*?Ub@}dwliZ4Ehd64*^5rV!1KM?Uj5D~>Y1Tly{oCNguudeEz=^ke<
zFQU*5zn!V7-~XfjRb5^6pWfcFPk!X1{Qma64A&iuJ@MB4Gyiz(o$MR0U@Xz`coGKN
z)U@o<QY>rE+a7TWJ4qT}mVK={$s|dnZjEDq5=vJLMNhRvBKjlQ8H*?wNJUhUim_@Z
zNv^N{Qb(YUz)Ok1A-1`(evBkmSMKI_zUkac5w5v)1nLOX5vU_jN1%>C9f3Lmbp+}N
z{GUfaC%3Uj(TCe?KL+;mWu?!T+wwj3b69G(#rmU;KplZP0(AuH2-Fd%BTz@6jzArO
zIs$bB>Il>k_#cdb@ELn0{Q5o}`0@L{JOAG}%-ElRXMrC8-vJ&6E(3P~hk)nbz}T07
z2Z0w4G4@a3ufSh`-vhq`eh&N;_#W_a;BCOo*E9A9U=P><roaF=1)Km@fp-CS0l$46
zW6uCz1`^;Da0K|*YZ?1B@GU?C9|Z0IuD^z{r-9D_9`Ih^Fz}04GxkN`67Uw_&$l!7
zBj8EkVc-&QA8-h`{wl_v1HKAe1x^F^0&fT22;4xxo&%l)9tJ)IYyyXY>v(VC$H23|
z*MZLhec&Q+6u2F@fn>^0fTw^*feXME@DAW65;4C7z72dH_%zS}UcmU!7(L?>GaOfA
zI*OI{{2-+gU0Zymu{Y8>@u_ydqXI4QF2z&?c&Q?kD~w1Dyl&yih$^gXSquc#${7BP
z%#5L`DI-(1)Q_WqafR&CRklQgwzENn+1`NN$UDPGyrE<|m8qA;v8FO9Y<8sXce3|I
zHkyno3n?nmwU|cQg1+=3F_w-tuP7@O1X485AXmI$8c!0V!I+{t>&a}3GqJO?)AEHD
zmNJ1GRyO;9jakY*m!S#<ywUB(Y9PizxXZV|c~JHO5jFW9BeBLnDBT|hUKsSeMCg&x
zwZ$iqF9#W8TgpU)!Bl!W7|VEKLb%1(kC&Q_r2PXs9~%s;r)Ge(94DdBS-`-`BhoQr
z)iy&a(_SXCZ*+6sjFf7E{C?hqgP1HRw^iI+bM46}Io@>bR47`_goTu{K4l+Uw&NuW
zmP3YUo|D<!##JRFe-MNco)}ZaC@OQFn!o|#(B(8`l{v>3Q%_A1{#lNz%vn2X7&t|_
zCR3SHlnQf3PNB+zF$#LUIFxz>BDtfAiky_}>QQXn$<^4(f|SNrcfFAwlS$Vxyp825
z9dX}%;T*F^OhRqg6qTZ-iScrsrvcl{+nQ9&I|VxpKTtZAp%hB;2kgLMQY11hI-mPP
zmCj5v5elO=lqu=UDS2hi8({AH&ZgsKl?5leMGCiR{Ox^HSQHaIimrK~FE9t3CaSb`
zxjL%zwrQ%*xK>nVJTrOmGTXKo%3=b$$=fiq%A<QG7%skRGX_EsMEN~OH(i|HmKj6%
z{zycAXcrSOXcStip9YCrjq+f6>7=)7Mh`*75;{?7rx!#Ws<t=#3^!kGbFLbRR2ueB
zj#bC}$pu=Q?PKlr`>h^KWv?$&t!9^YvPsK!vK@4Es5*vV1?-ITNN`(PFUtZ+8ceYW
zb;7tWLV66gL0zDL6q|mQ6&Q;%;{DVG$(K_spp^k@n&qv9RvB7D<7Dh%3gO*F8%p|s
zp(K@qINi3axdqt~!OA3+W5sw>xTo3-t1}fT+#F`Bt0gBf#gkSt$25lV@ORJ9{f^<7
z)!075O;bsRye*b(tG%+VAR|kk+;kt!?G6r<AZIEvOKrHGk?Q<fBw@Q-*(#8bn+2xN
zw!7wg+5JVt%67qOoK;rYFf8CywhWfDY};TdnR@GZW#dpGE!Z`jk^V`cn><d<h5{?F
z&_Og*y9y6>v#$_iagClNdyH|OJzed-%j}b|DeHFWj-wJWXnP{vE+mV3K^$E1Bani@
z5lB(t=&arWHl{~bJ``d(KX3O{-EQ`#Z}Vc8pNsHa(MFYDpxw{Bv-Ww?<&C}n)V9BJ
z)EMV?&p(1_%QW{)LZ@PtdLm85?)hUEsW~rW(x@a1H1%My3v12u7djW(7n@{lm49Ls
zD83VfA@50koFaW6k0YK%evJw#-x*1HZI`OEZQL4P-=O*{6A@_<Qp364B+`>LzDb1>
zW>D5R7R@&6Q^0sO7hJp$)>XF3&kF3$BtNI{xapdjGxEwLNTte3C;B>wBU@;}RmmIX
z&cYupBds`m*Qm|Q@xYW%m>06C8c(VTO&WMbs|k!+J$CM6g>*{HJeXHt*3UQ@!xqQN
zn2I#ObJ4E1g)UnBZRHYWXV0FhisG@iOw?)BBcVC=KGVRLK0kf(G>l`rLmQQ#H=*to
z-q@a*?%4RucFn28<Coh-g2s%(NRxDmAuV)eCjw*L#x$Ko7)@1B%#FR6ahhI(ms+NF
z2+dr}<^$f9H+u}L)!asgX{Ld>$-1RU!|43~8Jve7!Wo&)|M%D&#q&7de-lu^N#M=E
z-*L`=3g`nXz)hUxe*-)Xd;ti72Y`12f5X}Rhrr{&CEz{4i#WIc4EPFg8F(LXC-6s{
z+rJAu20Q}zz(c?XfWyEG@a<Q?*MKL0Q@}}peEu*{Uv&iP2-Fd%BTz@6jzArO|9%AM
zkdz&i4m{8xS3?JL>^NO6*PdT&W;Z*r%%7>MnO!=an!G^JbD8gs%VWV8oL;KA-erki
z=v$WMMRT?TUY_F3vVN2?!^WNp%Tl;51D3@tPY{#yxU7=Q>IVITXlr>U7Zzv9x02K?
ziI^-}kp*<A+(qtC-Z#$zR#Lnrz4O`LN}9IBJ}_fj=2P;vWiq<CN7*<S#}`J@v={7h
z4z_Fo?HfgR^DLiBdY0+8keV%t9F(Ok(`^<v??EMDTM{t2+m^}a&dJQ>ZWqY3Ol~(5
zsitw=1YVHBb;%<Nw7WlT&Ze5p1$kL27tL2OzW7P61$9<SJ_s(4OBQb>hiiGxnR05D
znkg-d)A#a}>@3lxVj<L`tZGX|Vq3;RxGW_*s~}6oR>c!JwvJX(vRnK-EixiWaZ(T0
zDJ$DtGwTkj@}gT2Y(CboD7S<4v68xlLp#XX;&+CO0PV%kXe2@&Q;5;v#<X)l3YSD&
u`quj52C$sKHHl1<h%rCh9-O>|ZmZJdc&*+nbvyIpZaG1k{UV(Iw)<~>tdr9K

diff --git a/manifests/params.pp b/manifests/params.pp
index f968d3e5eb..29fb43e581 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -188,6 +188,7 @@
       'wsgi'       => 'www/mod_wsgi',
       'dav_svn'    => 'devel/subversion',
       'xsendfile'  => 'www/mod_xsendfile',
+      'rpaf'       => 'www/mod_rpaf2'
     }
     $mod_libs         = {
       'php5' => 'libphp5.so',
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 57c8da36b8..4f08fd81e5 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -20,6 +20,41 @@
     }) }
     it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
 
+    describe "with sethostname => true" do
+      let :params do
+        { :sethostname => 'true' }
+      end
+      it { should contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+    end
+    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
+      let :params do
+        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
+      end
+      it { should contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+    end
+    describe "with header => X-Real-IP" do
+      let :params do
+        { :header => 'X-Real-IP' }
+      end
+      it { should contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+    end
+  end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod('rpaf') }
+    it { should contain_package("www/mod_rpaf2") }
+    it { should contain_file('rpaf.conf').with({
+      'path' => '/usr/local/etc/apache22/Modules/rpaf.conf',
+    }) }
+    it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }

From 9ad3e70c06584b070c03e9e8d0e46a5e98752251 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Thu, 14 Nov 2013 11:57:50 +1300
Subject: [PATCH 0059/2267] Reworking broken match and notmatch code make all
 matches and notmatches arrays of regex and exact match strings

...because consistency and explicitness
---
 spec/defines/vhost_spec.rb | 293 ++++++++++++++++++-------------------
 1 file changed, 145 insertions(+), 148 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8b2317d7f8..0257b2e0e8 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -83,55 +83,62 @@
       it { should contain_apache__namevirtualhost("*:#{params[:port]}") }
     end
 
+    # All match and notmatch should be a list of regexs and exact match strings
     context ".conf content" do
       [
         {
           :title => 'should contain docroot',
           :attr  => 'docroot',
           :value => '/not/default',
-          :match => ['  DocumentRoot /not/default','  <Directory /not/default>'],
+          :match => [/^  DocumentRoot \/not\/default$/,/  <Directory \/not\/default>/],
         },
         {
           :title => 'should set a port',
           :attr  => 'port',
           :value => '8080',
-          :match => '<VirtualHost *:8080>',
+          :match => [/^<VirtualHost \*:8080>$/],
         },
         {
           :title => 'should set an ip',
           :attr  => 'ip',
           :value => '10.0.0.1',
-          :match => '<VirtualHost 10.0.0.1:84>',
+          :match => [/^<VirtualHost 10\.0\.0\.1:84>$/],
         },
         {
           :title => 'should set a serveradmin',
           :attr  => 'serveradmin',
           :value => 'test@test.com',
-          :match => '  ServerAdmin test@test.com'
+          :match => [/^  ServerAdmin test@test.com$/],
         },
         {
           :title => 'should enable ssl',
           :attr  => 'ssl',
           :value => true,
-          :match => '  SSLEngine on',
+          :match => [/^  SSLEngine on$/],
         },
         {
           :title => 'should set a servername',
           :attr  => 'servername',
           :value => 'param.test',
-          :match => '  ServerName param.test',
+          :match => [/^  ServerName param.test$/],
         },
         {
           :title => 'should accept server aliases',
           :attr  => 'serveraliases',
           :value => ['one.com','two.com'],
-          :match => ['  ServerAlias one.com','  ServerAlias two.com'],
+          :match => [
+            /^  ServerAlias one\.com$/,
+            /^  ServerAlias two\.com$/
+          ],
         },
         {
           :title => 'should accept setenv',
           :attr  => 'setenv',
           :value => ['TEST1 one','TEST2 two'],
-          :match => ['  SetEnv TEST1 one','  SetEnv TEST2 two'],
+          :match => [
+            /^  SetEnv TEST1 one$/,
+            /^  SetEnv TEST2 two$/
+          ],
         },
         {
           :title => 'should accept setenvif',
@@ -146,13 +153,13 @@
           :title => 'should accept options',
           :attr  => 'options',
           :value => ['Fake','Options'],
-          :match => '    Options Fake Options',
+          :match => [/^    Options Fake Options$/],
         },
         {
           :title => 'should accept overrides',
           :attr  => 'override',
           :value => ['Fake', 'Override'],
-          :match => '    AllowOverride Fake Override',
+          :match => [/^    AllowOverride Fake Override$/],
         },
         {
           :title => 'should accept logroot',
@@ -164,62 +171,62 @@
           :title => 'should accept pipe destination for access log',
           :attr  => 'access_log_pipe',
           :value => '| /bin/fake/logging',
-          :match => /CustomLog "| \/bin\/fake\/logging" combined$/,
+          :match => [/CustomLog "| \/bin\/fake\/logging" combined$/],
         },
         {
           :title => 'should accept pipe destination for error log',
           :attr  => 'error_log_pipe',
           :value => '| /bin/fake/logging',
-          :match => /ErrorLog "| \/bin\/fake\/logging" combined$/,
+          :match => [/ErrorLog "| \/bin\/fake\/logging" combined$/],
         },
         {
           :title => 'should accept syslog destination for access log',
           :attr  => 'access_log_syslog',
           :value => 'syslog:local1',
-          :match => /CustomLog syslog:local1 combined$/,
+          :match => [/CustomLog syslog:local1 combined$/],
         },
         {
           :title => 'should accept syslog destination for error log',
           :attr  => 'error_log_syslog',
           :value => 'syslog',
-          :match => /ErrorLog syslog$/,
+          :match => [/ErrorLog syslog$/],
         },
         {
           :title => 'should accept custom format for access logs',
           :attr  => 'access_log_format',
           :value => '%h %{X-Forwarded-For}i %l %u %t \"%r\" %s %b  \"%{Referer}i\" \"%{User-agent}i\" \"Host: %{Host}i\" %T %D',
-          :match => /CustomLog \/var\/log\/.+_access\.log "%h %\{X-Forwarded-For\}i %l %u %t \\"%r\\" %s %b  \\"%\{Referer\}i\\" \\"%\{User-agent\}i\\" \\"Host: %\{Host\}i\\" %T %D"$/,
+          :match => [/CustomLog \/var\/log\/.+_access\.log "%h %\{X-Forwarded-For\}i %l %u %t \\"%r\\" %s %b  \\"%\{Referer\}i\\" \\"%\{User-agent\}i\\" \\"Host: %\{Host\}i\\" %T %D"$/],
         },
         {
           :title => 'should contain access logs',
           :attr  => 'access_log',
           :value => true,
-          :match => /CustomLog \/var\/log\/.+_access\.log combined$/,
+          :match => [/CustomLog \/var\/log\/.+_access\.log combined$/],
         },
         {
           :title    => 'should not contain access logs',
           :attr     => 'access_log',
           :value    => false,
-          :notmatch => /CustomLog \/var\/log\/.+_access\.log combined$/,
+          :notmatch => [/CustomLog \/var\/log\/.+_access\.log combined$/],
         },
         {
           :title => 'should contain error logs',
           :attr  => 'error_log',
           :value => true,
-          :match => /ErrorLog.+$/,
+          :match => [/ErrorLog.+$/],
         },
         {
           :title    => 'should not contain error logs',
           :attr     => 'error_log',
           :value    => false,
-          :notmatch => /ErrorLog.+$/,
+          :notmatch => [/ErrorLog.+$/],
         },
         {
           :title => 'should accept a scriptalias',
           :attr  => 'scriptalias',
           :value => '/usr/scripts',
           :match => [
-            '  ScriptAlias /cgi-bin/ "/usr/scripts/"',
+            /^  ScriptAlias \/cgi-bin\/ "\/usr\/scripts\/"$/,
             '  <Directory "/usr/scripts/">',
           ],
         },
@@ -228,43 +235,43 @@
           :attr     => 'scriptaliases',
           :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
           :match    => [
-            '  ScriptAlias /blah/ "/usr/scripts/"',
+            /^  ScriptAlias \/blah\/ "\/usr\/scripts\/"$/,
             '  <Directory "/usr/scripts/">',
           ],
-          :nomatch  => /ScriptAlias \/cgi\-bin\//
+          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
         {
           :title    => 'should accept multiple scriptaliases',
           :attr     => 'scriptaliases',
           :value    => [ { 'alias' => '/blah/', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts' } ],
           :match    => [
-            '  ScriptAlias /blah/ "/usr/scripts/"',
-            '  ScriptAlias /blah2/ "/usr/scripts/"',
+            /^  ScriptAlias \/blah\/ "\/usr\/scripts\/"$/,
+            /^  ScriptAlias \/blah2\/ "\/usr\/scripts\/"$/,
             '  <Directory "/usr/scripts/">',
           ],
-          :nomatch  => /ScriptAlias \/cgi\-bin\//
+          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
         {
           :title    => 'should accept proxy destinations',
           :attr     => 'proxy_dest',
           :value    => 'http://fake.com',
           :match    => [
-            '  ProxyPass          / http://fake.com/',
-            '  <Location          />',
-            '    ProxyPassReverse /',
-            '  </Location>',
+            /^  ProxyPass          \/ http:\/\/fake.com\/$/,
+            /^  <Location          \/>$/,
+            /^    ProxyPassReverse \/$/,
+            /^  <\/Location>$/,
           ],
-          :notmatch => /ProxyPass .+!$/,
+          :notmatch => [/ProxyPass .+!$/],
         },
         {
           :title    => 'should accept proxy_pass hash',
           :attr     => 'proxy_pass',
           :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a/' },
           :match    => [
-            '  ProxyPass        /path-a http://fake.com/a/',
-            '  ProxyPassReverse /path-a http://fake.com/a/',
+            /^  ProxyPass \/path-a http:\/\/fake.com\/a\/$/,
+            /^  ProxyPassReverse \/path-a http:\/\/fake.com\/a\/$/,
           ],
-          :notmatch => /ProxyPass .+!$/,
+          :notmatch => [/ProxyPass .+!$/],
         },
         {
           :title    => 'should accept proxy_pass array of hash',
@@ -274,65 +281,68 @@
             { 'path' => '/path-b', 'url' => 'http://fake.com/b/' },
           ],
           :match    => [
-            '  ProxyPass          /path-a http://fake.com/a/',
-            '  <Location          /path-a/>',
-            '    ProxyPassReverse /',
-            '  </Location>',
-            '  ProxyPass          /path-b http://fake.com/b/',
-            '  <Location          /path-b/>',
-            '    ProxyPassReverse /',
-            '  </Location>',
+            /^  ProxyPass \/path-a http:\/\/fake.com\/a\/$/,
+            /^  <Location          \/path-a\/>$/,
+            /^    ProxyPassReverse \/$/,
+            /^  <\/Location>$/,
+            /^  ProxyPass          \/path-b http:\/\/fake.com\/b\/$/,
+            /^  <Location          \/path-b\/>$/,
+            /^    ProxyPassReverse \/$/,
+            /^  <\/Location>$/,
           ],
-          :notmatch => /ProxyPass .+!$/,
+          :notmatch => [/ProxyPass .+!$/],
         },
         {
           :title => 'should enable rack',
           :attr  => 'rack_base_uris',
           :value => ['/rack1','/rack2'],
-          :match => ['  RackBaseURI /rack1','  RackBaseURI /rack2'],
+          :match => [
+            /^  RackBaseURI \/rack1$/,
+            /^  RackBaseURI \/rack2$/,
+          ],
         },
         {
           :title => 'should accept request headers',
           :attr  => 'request_headers',
           :value => ['append something', 'unset something_else'],
           :match => [
-            '  RequestHeader append something',
-            '  RequestHeader unset something_else',
+            /^  RequestHeader append something$/,
+            /^  RequestHeader unset something_else$/,
           ],
         },
         {
           :title => 'should accept rewrite rules',
           :attr  => 'rewrite_rule',
           :value => 'not a real rule',
-          :match => '  RewriteRule not a real rule',
+          :match => [/^  RewriteRule not a real rule$/],
         },
         {
           :title => 'should block scm',
           :attr  => 'block',
           :value => 'scm',
-          :match => '  <DirectoryMatch .*\.(svn|git|bzr)/.*>',
+          :match => ['  <DirectoryMatch .*\\\\.(svn|git|bzr)/.*>'],
         },
         {
           :title => 'should accept a custom fragment',
           :attr  => 'custom_fragment',
           :value => "  Some custom fragment line\n  That spans multiple lines",
           :match => [
-            '  Some custom fragment line',
-            '  That spans multiple lines',
-            '</VirtualHost>',
+            /^  Some custom fragment line$/,
+            /^  That spans multiple lines$/,
+            /^<\/VirtualHost>$/,
           ],
         },
         {
           :title => 'should accept an array of alias hashes',
           :attr  => 'aliases',
           :value => [ { 'alias' => '/', 'path' => '/var/www'} ],
-          :match => '  Alias / /var/www',
+          :match => [/^  Alias \/ \/var\/www$/],
         },
         {
           :title => 'should accept an alias hash',
           :attr  => 'aliases',
           :value => { 'alias' => '/', 'path' => '/var/www'},
-          :match => '  Alias / /var/www',
+          :match => [/^  Alias \/ \/var\/www$/],
         },
         {
           :title => 'should accept multiple aliases',
@@ -343,36 +353,22 @@
             { 'alias' => '/css', 'path' => '/opt/someapp/css'},
           ],
           :match => [
-            '  Alias / /var/www',
-            '  Alias /cgi-bin /var/www/cgi-bin',
-            '  Alias /css /opt/someapp/css'
-          ],
-        },
-        {
-          :title => 'should accept multiple additional includes',
-          :attr  => 'additional_includes',
-          :value => [
-            '/tmp/proxy_group_a',
-            '/tmp/proxy_group_b',
-            '/tmp/proxy_group_c',
-          ],
-          :match => [
-            '  Include /tmp/proxy_group_a',
-            '  Include /tmp/proxy_group_b',
-            '  Include /tmp/proxy_group_c'
+            /^  Alias \/ \/var\/www$/,
+            /^  Alias \/cgi-bin \/var\/www\/cgi-bin$/,
+            /^  Alias \/css \/opt\/someapp\/css$/,
           ],
         },
         {
           :title => 'should accept a suPHP_Engine',
           :attr  => 'suphp_engine',
           :value => 'on',
-          :match => '  suPHP_Engine on',
+          :match => [/^  suPHP_Engine on$/],
         },
         {
           :title => 'should accept a wsgi script alias',
           :attr  => 'wsgi_script_aliases',
           :value => { '/' => '/var/www/myapp.wsgi'},
-          :match => '  WSGIScriptAlias / /var/www/myapp.wsgi',
+          :match => [/^  WSGIScriptAlias \/ \/var\/www\/myapp.wsgi$/],
         },
         {
           :title => 'should accept multiple wsgi aliases',
@@ -383,9 +379,9 @@
             '/'     => '/usr/local/wsgi/scripts/myapp.wsgi',
           },
           :match => [
-            '  WSGIScriptAlias /wiki /usr/local/wsgi/scripts/mywiki.wsgi',
-            '  WSGIScriptAlias /blog /usr/local/wsgi/scripts/myblog.wsgi',
-            '  WSGIScriptAlias / /usr/local/wsgi/scripts/myapp.wsgi'
+            /^  WSGIScriptAlias \/wiki \/usr\/local\/wsgi\/scripts\/mywiki.wsgi$/,
+            /^  WSGIScriptAlias \/blog \/usr\/local\/wsgi\/scripts\/myblog.wsgi$/,
+            /^  WSGIScriptAlias \/ \/usr\/local\/wsgi\/scripts\/myapp.wsgi$/,
           ],
         },
         {
@@ -394,40 +390,36 @@
           :value    => { 'path' => '/opt/app' },
           :notmatch => '  <Directory /rspec/docroot>',
           :match    => [
-            '  <Directory /opt/app>',
-            '    AllowOverride None',
-            '    Order allow,deny',
-            '    Allow from all',
-            '  </Directory>',
+            /^  <Directory \/opt\/app>$/,
+            /^    AllowOverride None$/,
+            /^    Order allow,deny$/,
+            /^    Allow from all$/,
+            /^  <\/Directory>$/,
           ],
         },
         {
           :title    => 'should accept directory directives hash',
           :attr     => 'directories',
           :value    => {
-            'path'                => '/opt/app',
-            'headers'             => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            'allow'               => 'from rspec.org',
-            'allow_override'      => 'Lol',
-            'deny'                => 'from google.com',
-            'options'             => '-MultiViews',
-            'order'               => 'deny,yned',
-            'passenger_enabled'   => 'onf',
-            'index_options'       => 'Index',
-            'index_order_default' => 'none',
+            'path'              => '/opt/app',
+            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+            'allow'             => 'from rspec.org',
+            'allow_override'    => 'Lol',
+            'deny'              => 'from google.com',
+            'options'           => '-MultiViews',
+            'order'             => 'deny,yned',
+            'passenger_enabled' => 'onf',
           },
           :match    => [
-            '  <Directory /opt/app>',
-            '    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            '    Allow from rspec.org',
-            '    AllowOverride Lol',
-            '    Deny from google.com',
-            '    Options -MultiViews',
-            '    Order deny,yned',
-            '    PassengerEnabled onf',
-            '    IndexOptions Index',
-            '    IndexOrderDefault none',
-            '  </Directory>',
+            /^  <Directory \/opt\/app>$/,
+            /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
+            /^    Allow from rspec.org$/,
+            /^    AllowOverride Lol$/,
+            /^    Deny from google.com$/,
+            /^    Options -MultiViews$/,
+            /^    Order deny,yned$/,
+            /^    PassengerEnabled onf$/,
+            /^  <\/Directory>$/,
           ],
         },
         {
@@ -435,15 +427,13 @@
           :attr     => 'directories',
           :value    => [
             {
-              'path'                => '/opt/app1',
-              'allow'               => 'from rspec.org',
-              'allow_override'      => ['AuthConfig','Indexes'],
-              'deny'                => 'from google.com',
-              'options'             => ['-MultiViews','+MultiViews'],
-              'order'               => ['deny','yned'],
-              'passenger_enabled'   => 'onf',
-              'index_options'       => ['up','down'],
-              'index_order_default' => ['left','right'],
+              'path'              => '/opt/app1',
+              'allow'             => 'from rspec.org',
+              'allow_override'    => ['AuthConfig','Indexes'],
+              'deny'              => 'from google.com',
+              'options'           => ['-MultiViews','+MultiViews'],
+              'order'             => ['deny','yned'],
+              'passenger_enabled' => 'onf',
             },
             {
               'path'        => '/opt/app2',
@@ -454,22 +444,20 @@
             },
           ],
           :match    => [
-            '  <Directory /opt/app1>',
-            '    Allow from rspec.org',
-            '    AllowOverride AuthConfig Indexes',
-            '    Deny from google.com',
-            '    Options -MultiViews +MultiViews',
-            '    Order deny,yned',
-            '    PassengerEnabled onf',
-            '    IndexOptions up down',
-            '    IndexOrderDefault left right',
-            '  </Directory>',
-            '  <Directory /opt/app2>',
-            '    AllowOverride None',
-            '    Order allow,deny',
-            '    Allow from all',
-            '    AddHandler cgi-script .cgi',
-            '  </Directory>',
+            /^  <Directory \/opt\/app1>$/,
+            /^    Allow from rspec.org$/,
+            /^    AllowOverride AuthConfig Indexes$/,
+            /^    Deny from google.com$/,
+            /^    Options -MultiViews +MultiViews$/,
+            /^    Order deny,yned$/,
+            /^    PassengerEnabled onf$/,
+            /^  <\/Directory>$/,
+            /^  <Directory \/opt\/app2>$/,
+            /^    AllowOverride None$/,
+            /^    Order allow,deny$/,
+            /^    Allow from all$/,
+            /^    AddHandler cgi-script .cgi$/,
+            /^  <\/Directory>$/,
           ],
         },
         {
@@ -481,9 +469,9 @@
             { 'path' => '/rspec/docroot'}
           ],
           :match    => [
-            '  <Directory /opt/app>',
-            '  <Directory /var/www>',
-            '  <Directory /rspec/docroot>',
+            /^  <Directory \/opt\/app>$/,
+            /^  <Directory \/var\/www>$/,
+            /^  <Directory \/rspec\/docroot>$/,
           ],
         },
         {
@@ -495,10 +483,10 @@
           },
           :notmatch => '    AllowOverride None',
           :match => [
-            '  <Location />',
-            '    Order allow,deny',
-            '    Allow from all',
-            '  </Location>',
+            /^  <Location \/>$/,
+            /^    Order allow,deny$/,
+            /^    Allow from all$/,
+            /^  <\/Location>$/,
           ],
         },
         {
@@ -510,10 +498,10 @@
           },
           :notmatch => '    AllowOverride None',
           :match => [
-            '  <Files index.html>',
-            '    Order allow,deny',
-            '    Allow from all',
-            '  </Files>',
+            /^  <Files index.html>$/,
+            /^    Order allow,deny$/,
+            /^    Allow from all$/,
+            /^  <\/Files>$/,
           ],
         },
         {
@@ -521,50 +509,50 @@
           :attr  => 'virtual_docroot',
           :value => '/not/default',
           :match => [
-            '  VirtualDocumentRoot /not/default',
+            /^  VirtualDocumentRoot \/not\/default$/,
           ],
         },
         {
             :title => 'should accept setting SSLProtocol',
             :attr  => 'ssl_protocol',
             :value => 'all -SSLv2',
-            :match => '  SSLProtocol           all -SSLv2',
+            :match => [/^  SSLProtocol           all -SSLv2$/],
         },
         {
             :title => 'should accept setting SSLCipherSuite',
             :attr  => 'ssl_cipher',
             :value => 'RC4-SHA:HIGH:!ADH:!SSLv2',
-            :match => '  SSLCipherSuite        RC4-SHA:HIGH:!ADH:!SSLv2',
+            :match => [/^  SSLCipherSuite        RC4-SHA:HIGH:!ADH:!SSLv2$/],
         },
         {
             :title => 'should accept setting SSLHonorCipherOrder',
             :attr  => 'ssl_honorcipherorder',
             :value => 'On',
-            :match => '  SSLHonorCipherOrder     On'
+            :match => [/^  SSLHonorCipherOrder     On$/],
         },
         {
             :title => 'should accept setting SSLVerifyClient',
             :attr  => 'ssl_verify_client',
             :value => 'optional',
-            :match => /SSLVerifyClient\w+optional/
+            :match => [/SSLVerifyClient\w+optional/],
         },
         {
             :title => 'should accept setting SSLVerifyDepth',
             :attr  => 'ssl_verify_depth',
             :value => '1',
-            :match => /SSLVerifyDepth\w+1/
+            :match => [/SSLVerifyDepth\w+1/],
         },
         {
             :title => 'should accept setting SSLOptions with a string',
             :attr  => 'ssl_options',
             :value => '+ExportCertData',
-            :match => /SSLOptions\w+\+ExportCertData/
+            :match => [/SSLOptions\w+\+ExportCertData/],
         },
         {
             :title => 'should accept setting SSLOptions with an array',
             :attr  => 'ssl_options',
             :value => ['+StdEnvVars','+ExportCertData'],
-            :match => /SSLOptions\w+\+StdEnvVars\w+\+ExportCertData/
+            :match => [/SSLOptions\w+\+StdEnvVars\w+\+ExportCertData/],
         },
 
       ].each do |param|
@@ -572,10 +560,19 @@
           let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
 
           it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          it param[:title] do
-            lines = subject.resource('file', "25-#{title}.conf").send(:parameters)[:content].split("\n")
-            (Array(param[:match]).collect { |x| (lines.grep x).first }.length).should == Array(param[:match]).length
-            (Array(param[:notmatch]).collect { |x| lines.grep x }.flatten).should be_empty
+          if param[:match]
+            it "#{param[:title]}: matches" do
+              param[:match].each do |match|
+                should contain_file("25-#{title}.conf").with_content( match )
+              end
+            end
+          end
+          if param[:notmatch]
+            it "#{param[:title]}: notmatches" do
+              param[:notmatch].each do |notmatch|
+                should_not contain_file("25-#{title}.conf").with_content( notmatch )
+              end
+            end
           end
         end
       end

From 8d8896c7c33c12ac43583742e13602b9c48409d9 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Fri, 15 Nov 2013 16:25:55 +1300
Subject: [PATCH 0060/2267] remove unecessary " from around paths in Directory
 and ScriptAlias declarations

---
 spec/defines/vhost_spec.rb       | 12 ++++++------
 templates/vhost/_scriptalias.erb |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 0257b2e0e8..47d9a8d7b2 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -227,7 +227,7 @@
           :value => '/usr/scripts',
           :match => [
             /^  ScriptAlias \/cgi-bin\/ "\/usr\/scripts\/"$/,
-            '  <Directory "/usr/scripts/">',
+            '  <Directory /usr/scripts/>',
           ],
         },
         {
@@ -235,8 +235,8 @@
           :attr     => 'scriptaliases',
           :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
           :match    => [
-            /^  ScriptAlias \/blah\/ "\/usr\/scripts\/"$/,
-            '  <Directory "/usr/scripts/">',
+            /^  ScriptAlias \/blah\/ \/usr\/scripts\/$/,
+            '  <Directory /usr/scripts/>',
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
@@ -245,9 +245,9 @@
           :attr     => 'scriptaliases',
           :value    => [ { 'alias' => '/blah/', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts' } ],
           :match    => [
-            /^  ScriptAlias \/blah\/ "\/usr\/scripts\/"$/,
-            /^  ScriptAlias \/blah2\/ "\/usr\/scripts\/"$/,
-            '  <Directory "/usr/scripts/">',
+            /^  ScriptAlias \/blah\/ \/usr\/scripts\/$/,
+            /^  ScriptAlias \/blah2\/ \/usr\/scripts\/$/,
+            '  <Directory /usr/scripts/>',
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index 098d495dd2..77756d7f2b 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -16,11 +16,11 @@
 <% dirs = aliases.map { |h| h['path'] }.uniq.compact -%>
 <% aliases.each do |salias| -%>
   ## Script alias directives
-  ScriptAlias <%= salias['alias'] %> "<%= salias['path'] %>/"
+  ScriptAlias <%= salias['alias'] %> <%= salias['path'] %>/
 <% end -%>
 
 <% dirs.sort.each do |dir| -%>
-  <Directory "<%= dir %>">
+  <Directory <%= dir %>>
     AllowOverride None
     Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
     Order allow,deny

From 816b6299ff24aab3c9341ac6d378099e71e32179 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Fri, 15 Nov 2013 16:34:08 +1300
Subject: [PATCH 0061/2267] Fixing incorrect match strings and regexes

---
 spec/defines/vhost_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 47d9a8d7b2..fd6cd8b519 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -269,7 +269,7 @@
           :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a/' },
           :match    => [
             /^  ProxyPass \/path-a http:\/\/fake.com\/a\/$/,
-            /^  ProxyPassReverse \/path-a http:\/\/fake.com\/a\/$/,
+            /^  ProxyPassReverse \/$/,
           ],
           :notmatch => [/ProxyPass .+!$/],
         },
@@ -282,7 +282,7 @@
           ],
           :match    => [
             /^  ProxyPass \/path-a http:\/\/fake.com\/a\/$/,
-            /^  <Location          \/path-a\/>$/,
+            /^  <Location \/path-a\/>$/,
             /^    ProxyPassReverse \/$/,
             /^  <\/Location>$/,
             /^  ProxyPass          \/path-b http:\/\/fake.com\/b\/$/,
@@ -320,7 +320,7 @@
           :title => 'should block scm',
           :attr  => 'block',
           :value => 'scm',
-          :match => ['  <DirectoryMatch .*\\\\.(svn|git|bzr)/.*>'],
+          :match => ['  <DirectoryMatch .*\\.(svn|git|bzr)/.*>'],
         },
         {
           :title => 'should accept a custom fragment',

From 4316ac0e5781a3948045f59f2d00d6edff5f9978 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Mon, 18 Nov 2013 11:07:42 +1300
Subject: [PATCH 0062/2267] the ssl parameter needs to be true to test the SSL
 parameters.

---
 spec/defines/vhost_spec.rb | 49 ++++++++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index fd6cd8b519..3638afd48a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -512,17 +512,43 @@
             /^  VirtualDocumentRoot \/not\/default$/,
           ],
         },
+
+      ].each do |param|
+        describe "when #{param[:attr]} is #{param[:value]}" do
+          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
+
+          it { should contain_file("25-#{title}.conf").with_mode('0644') }
+          if param[:match]
+            it "#{param[:title]}: matches" do
+              param[:match].each do |match|
+                should contain_file("25-#{title}.conf").with_content( match )
+              end
+            end
+          end
+          if param[:notmatch]
+            it "#{param[:title]}: notmatches" do
+              param[:notmatch].each do |notmatch|
+                should_not contain_file("25-#{title}.conf").with_content( notmatch )
+              end
+            end
+          end
+        end
+      end
+    end
+
+    context ".conf content with SSL" do
+      [
         {
             :title => 'should accept setting SSLProtocol',
             :attr  => 'ssl_protocol',
             :value => 'all -SSLv2',
-            :match => [/^  SSLProtocol           all -SSLv2$/],
+            :match => [/^  SSLProtocol             all -SSLv2$/],
         },
         {
             :title => 'should accept setting SSLCipherSuite',
             :attr  => 'ssl_cipher',
             :value => 'RC4-SHA:HIGH:!ADH:!SSLv2',
-            :match => [/^  SSLCipherSuite        RC4-SHA:HIGH:!ADH:!SSLv2$/],
+            :match => [/^  SSLCipherSuite          RC4-SHA:HIGH:!ADH:!SSLv2$/],
         },
         {
             :title => 'should accept setting SSLHonorCipherOrder',
@@ -534,31 +560,34 @@
             :title => 'should accept setting SSLVerifyClient',
             :attr  => 'ssl_verify_client',
             :value => 'optional',
-            :match => [/SSLVerifyClient\w+optional/],
+            :match => [/^  SSLVerifyClient         optional$/],
         },
         {
             :title => 'should accept setting SSLVerifyDepth',
             :attr  => 'ssl_verify_depth',
             :value => '1',
-            :match => [/SSLVerifyDepth\w+1/],
+            :match => [/^  SSLVerifyDepth          1$/],
         },
         {
             :title => 'should accept setting SSLOptions with a string',
             :attr  => 'ssl_options',
             :value => '+ExportCertData',
-            :match => [/SSLOptions\w+\+ExportCertData/],
+            :match => [/^  SSLOptions +ExportCertData$/],
         },
         {
             :title => 'should accept setting SSLOptions with an array',
             :attr  => 'ssl_options',
             :value => ['+StdEnvVars','+ExportCertData'],
-            :match => [/SSLOptions\w+\+StdEnvVars\w+\+ExportCertData/],
+            :match => [/^  SSLOptions +StdEnvVars +ExportCertData/],
         },
-
       ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
+        describe "when #{param[:attr]} is #{param[:value]} with SSL" do
+          let :params do
+            default_params.merge( {
+              param[:attr].to_sym => param[:value],
+              :ssl                => true,
+            } )
+          end
           it { should contain_file("25-#{title}.conf").with_mode('0644') }
           if param[:match]
             it "#{param[:title]}: matches" do

From b6ccfb701eced91cbf06a9bb32e3269c71a0c346 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Mon, 18 Nov 2013 15:14:37 +1300
Subject: [PATCH 0063/2267] Add missing SSL directive tests.

Altered changed ssl_proxyengine to match form of other SSL parameters.

Fixed unescaped + in regex
---
 README.md                  |  2 +-
 spec/defines/vhost_spec.rb | 52 ++++++++++++++++++++++++++++++++++++--
 templates/vhost/_ssl.erb   |  2 +-
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2f991ddc28..276c67fb9c 100644
--- a/README.md
+++ b/README.md
@@ -1059,7 +1059,7 @@ An array of strings example:
     }
 ```
 
-#####`sslproxyengine`
+#####`ssl_proxyengine`
 
 Specifies whether to use `SSLProxyEngine` or not. Defaults to `false`.
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3638afd48a..6b1d75a5c5 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -538,6 +538,54 @@
 
     context ".conf content with SSL" do
       [
+        {
+            :title => 'should accept setting SSLCertificateFile',
+            :attr  => 'ssl_cert',
+            :value => '/path/to/cert.pem',
+            :match => [/^  SSLCertificateFile      \/path\/to\/cert\.pem$/],
+        },
+        {
+            :title => 'should accept setting SSLCertificateKeyFile',
+            :attr  => 'ssl_key',
+            :value => '/path/to/cert.pem',
+            :match => [/^  SSLCertificateKeyFile   \/path\/to\/cert\.pem$/],
+        },
+        {
+            :title => 'should accept setting SSLCertificateChainFile',
+            :attr  => 'ssl_chain',
+            :value => '/path/to/cert.pem',
+            :match => [/^  SSLCertificateChainFile \/path\/to\/cert\.pem$/],
+        },
+        {
+            :title => 'should accept setting SSLCertificatePath',
+            :attr  => 'ssl_certs_dir',
+            :value => '/path/to/certs',
+            :match => [/^  SSLCACertificatePath    \/path\/to\/certs$/],
+        },
+        {
+            :title => 'should accept setting SSLCertificateFile',
+            :attr  => 'ssl_ca',
+            :value => '/path/to/ca.pem',
+            :match => [/^  SSLCACertificateFile    \/path\/to\/ca\.pem$/],
+        },
+        {
+            :title => 'should accept setting SSLRevocationPath',
+            :attr  => 'ssl_crl_path',
+            :value => '/path/to/crl',
+            :match => [/^  SSLCARevocationPath     \/path\/to\/crl$/],
+        },
+        {
+            :title => 'should accept setting SSLRevocationFile',
+            :attr  => 'ssl_crl',
+            :value => '/path/to/crl.pem',
+            :match => [/^  SSLCARevocationFile     \/path\/to\/crl\.pem$/],
+        },
+        {
+            :title => 'should accept setting SSLProxyEngine',
+            :attr  => 'ssl_proxyengine',
+            :value => true,
+            :match => [/^  SSLProxyEngine On$/],
+        },
         {
             :title => 'should accept setting SSLProtocol',
             :attr  => 'ssl_protocol',
@@ -572,13 +620,13 @@
             :title => 'should accept setting SSLOptions with a string',
             :attr  => 'ssl_options',
             :value => '+ExportCertData',
-            :match => [/^  SSLOptions +ExportCertData$/],
+            :match => [/^  SSLOptions \+ExportCertData$/],
         },
         {
             :title => 'should accept setting SSLOptions with an array',
             :attr  => 'ssl_options',
             :value => ['+StdEnvVars','+ExportCertData'],
-            :match => [/^  SSLOptions +StdEnvVars +ExportCertData/],
+            :match => [/^  SSLOptions \+StdEnvVars \+ExportCertData/],
         },
       ].each do |param|
         describe "when #{param[:attr]} is #{param[:value]} with SSL" do
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index c4c3b49cca..83c90b8a80 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -17,7 +17,7 @@
 <% if @ssl_crl -%>
   SSLCARevocationFile     <%= @ssl_crl %>
 <% end -%>
-<% if @sslproxyengine -%>
+<% if @ssl_proxyengine -%>
   SSLProxyEngine On
 <% end -%>
 <% if @ssl_protocol -%>

From 823e952fcff01234f2709d7ab4325c674b7c3bf7 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Mon, 18 Nov 2013 16:15:35 +1300
Subject: [PATCH 0064/2267] Fixing broken test matches...

---
 manifests/vhost.pp         |  4 ++--
 spec/defines/vhost_spec.rb | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4d33de9309..6593b2bb28 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -81,6 +81,7 @@
     $ssl_verify_client           = undef,
     $ssl_verify_depth            = undef,
     $ssl_options                 = undef,
+    $ssl_proxyengine             = false,
     $priority                    = undef,
     $default_vhost               = false,
     $servername                  = $name,
@@ -108,7 +109,6 @@
     $scriptaliases               = [],
     $proxy_dest                  = undef,
     $proxy_pass                  = undef,
-    $sslproxyengine              = false,
     $suphp_addhandler            = $apache::params::suphp_addhandler,
     $suphp_engine                = $apache::params::suphp_engine,
     $suphp_configpath            = $apache::params::suphp_configpath,
@@ -152,7 +152,7 @@
   validate_bool($error_log)
   validate_bool($ssl)
   validate_bool($default_vhost)
-  validate_bool($sslproxyengine)
+  validate_bool($ssl_proxyengine)
   if $wsgi_script_aliases {
     validate_hash($wsgi_script_aliases)
   }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 6b1d75a5c5..322f9a007a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -147,7 +147,7 @@
           #:value => ['Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1'],
           #:match => ['  SetEnvIf Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1'],
           :value => ['Host "^test\.com$" VHOST_ACCESS=test'],
-          :match => ['  SetEnvIf Host "^test\.com$" VHOST_ACCESS=test'],
+          :match => [/^  SetEnvIf Host "\^test\\.com\$" VHOST_ACCESS=test$/],
         },
         {
           :title => 'should accept options',
@@ -226,8 +226,8 @@
           :attr  => 'scriptalias',
           :value => '/usr/scripts',
           :match => [
-            /^  ScriptAlias \/cgi-bin\/ "\/usr\/scripts\/"$/,
-            '  <Directory /usr/scripts/>',
+            /^  ScriptAlias \/cgi-bin\/ \/usr\/scripts\/$/,
+            /^  <Directory \/usr\/scripts>$/,
           ],
         },
         {
@@ -236,7 +236,7 @@
           :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
           :match    => [
             /^  ScriptAlias \/blah\/ \/usr\/scripts\/$/,
-            '  <Directory /usr/scripts/>',
+            /^  <Directory \/usr\/scripts>$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
@@ -247,7 +247,7 @@
           :match    => [
             /^  ScriptAlias \/blah\/ \/usr\/scripts\/$/,
             /^  ScriptAlias \/blah2\/ \/usr\/scripts\/$/,
-            '  <Directory /usr/scripts/>',
+            /^  <Directory \/usr\/scripts>$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
@@ -269,7 +269,7 @@
           :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a/' },
           :match    => [
             /^  ProxyPass \/path-a http:\/\/fake.com\/a\/$/,
-            /^  ProxyPassReverse \/$/,
+            /    ProxyPassReverse \//,
           ],
           :notmatch => [/ProxyPass .+!$/],
         },
@@ -285,8 +285,8 @@
             /^  <Location \/path-a\/>$/,
             /^    ProxyPassReverse \/$/,
             /^  <\/Location>$/,
-            /^  ProxyPass          \/path-b http:\/\/fake.com\/b\/$/,
-            /^  <Location          \/path-b\/>$/,
+            /^  ProxyPass \/path-b http:\/\/fake.com\/b\/$/,
+            /^  <Location \/path-b\/>$/,
             /^    ProxyPassReverse \/$/,
             /^  <\/Location>$/,
           ],
@@ -320,7 +320,7 @@
           :title => 'should block scm',
           :attr  => 'block',
           :value => 'scm',
-          :match => ['  <DirectoryMatch .*\\.(svn|git|bzr)/.*>'],
+          :match => [/^  <DirectoryMatch \.\*\\\.\(svn\|git\|bzr\)\/\.\*>$/],
         },
         {
           :title => 'should accept a custom fragment',
@@ -388,7 +388,7 @@
           :title    => 'should accept a directory',
           :attr     => 'directories',
           :value    => { 'path' => '/opt/app' },
-          :notmatch => '  <Directory /rspec/docroot>',
+          :notmatch => ['  <Directory /rspec/docroot>'],
           :match    => [
             /^  <Directory \/opt\/app>$/,
             /^    AllowOverride None$/,
@@ -448,7 +448,7 @@
             /^    Allow from rspec.org$/,
             /^    AllowOverride AuthConfig Indexes$/,
             /^    Deny from google.com$/,
-            /^    Options -MultiViews +MultiViews$/,
+            /^    Options -MultiViews \+MultiViews$/,
             /^    Order deny,yned$/,
             /^    PassengerEnabled onf$/,
             /^  <\/Directory>$/,
@@ -481,7 +481,7 @@
             'path'     => '/',
             'provider' => 'location',
           },
-          :notmatch => '    AllowOverride None',
+          :notmatch => ['    AllowOverride None'],
           :match => [
             /^  <Location \/>$/,
             /^    Order allow,deny$/,
@@ -496,7 +496,7 @@
             'path'     => 'index.html',
             'provider' => 'files',
           },
-          :notmatch => '    AllowOverride None',
+          :notmatch => ['    AllowOverride None'],
           :match => [
             /^  <Files index.html>$/,
             /^    Order allow,deny$/,

From a0d20008bcfe2d24f8be20f696211f03be7d74c1 Mon Sep 17 00:00:00 2001
From: Kyle Sexton <ks@mocker.org>
Date: Wed, 13 Nov 2013 08:27:35 -0600
Subject: [PATCH 0065/2267] Add WSGIPythonPath as an optional parameter to
 mod_wsgi.  This parameter is used to specify additional directories to search
 for Python modules as described here:
 https://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPythonPath

---
 README.md                   | 1 +
 manifests/mod/wsgi.pp       | 2 ++
 templates/mod/wsgi.conf.erb | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 603120f986..1381e11d1b 100644
--- a/README.md
+++ b/README.md
@@ -422,6 +422,7 @@ To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` par
     class { 'apache::mod::wsgi':
       wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
       wsgi_python_home   => '/path/to/virtenv',
+      wsgi_python_path   => '/path/to/virtenv/site-packages',
     }
 ```
 ####Defined Type: `apache::vhost`
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index ff12fbf24c..0d42714091 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -1,11 +1,13 @@
 class apache::mod::wsgi (
   $wsgi_socket_prefix = undef,
+  $wsgi_python_path   = undef,
   $wsgi_python_home   = undef,
 ){
   apache::mod { 'wsgi': }
 
   # Template uses:
   # - $wsgi_socket_prefix
+  # - $wsgi_python_path
   # - $wsgi_python_home
   file {'wsgi.conf':
     ensure  => file,
diff --git a/templates/mod/wsgi.conf.erb b/templates/mod/wsgi.conf.erb
index f0611fc656..ea2a49d1ae 100644
--- a/templates/mod/wsgi.conf.erb
+++ b/templates/mod/wsgi.conf.erb
@@ -7,4 +7,7 @@
   <%- if @wsgi_python_home -%>
   WSGIPythonHome <%= @wsgi_python_home %>
   <%- end -%>
+  <%- if @wsgi_python_path -%>
+  WSGIPythonPath <%= @wsgi_python_path %>
+  <%- end -%>  
 </IfModule>

From 78e5aeb9f2e7c9827c8b1c5ab55d16aa95f0d6d1 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Tue, 19 Nov 2013 01:55:35 +0100
Subject: [PATCH 0066/2267] Remove extra empty lines in _directories template

When managing directories (or locations, files) through the
`directories` parameter the resulting vhost configuration file contains
a few empty lines too many. This cleans up these unnecessary empty
lines, leaving just one between Directory blocks. This is a purely
cosmetic change.
---
 templates/vhost/_directories.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 989680c50a..2ff9cd414b 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -1,7 +1,6 @@
 <% if @_directories and ! @_directories.empty? -%>
   <%- [@_directories].flatten.compact.each do |directory| -%>
     <%- if directory['path'] and directory['path'] != '' -%>
-
   <%- if directory['provider'] and [ 'directory', 'location', 'files' ].include?(directory['provider']) -%>
     <%- provider = directory['provider'].capitalize -%>
   <%- else -%>
@@ -17,7 +16,7 @@
     <%- if directory['options'] -%>
     Options <%= Array(directory['options']).join(' ') %>
     <%- end -%>
-    <%- if provider == 'Directory' %>
+    <%- if provider == 'Directory' -%>
       <%- if directory['index_options'] -%>
     IndexOptions <%= Array(directory['index_options']).join(' ') %>
       <%- end -%>
@@ -114,7 +113,6 @@
     <%= directory['custom_fragment'] %>
     <%- end -%>
   </<%= provider %>>
-
     <%- end -%>
   <%- end -%>
 <% end -%>

From b4add2b8855d1ad4bd519534fc70c8d374572486 Mon Sep 17 00:00:00 2001
From: Rene Diepstraten <rene@renediepstraten.nl>
Date: Thu, 24 Oct 2013 11:32:38 +0200
Subject: [PATCH 0067/2267] Disable default "allow from all" in
 vhost-directories

---
 templates/vhost/_directories.erb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 2ff9cd414b..f642d0ef8c 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -37,8 +37,11 @@
     <%- if directory['deny'] and directory['deny'] != '' -%>
     Deny <%= directory['deny'] %>
     <%- end -%>
-    <%- if directory['allow'] and directory['allow'] != '' -%>
+    <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
     Allow <%= directory['allow'] %>
+    <%- elsif [ 'from all', 'from All' ].include?(directory['deny']) -%>
+    <%- elsif ! directory['deny'] and [ false, 'false', '' ].include?(directory['allow']) -%>
+    Deny from all
     <%- else -%>
     Allow from all
     <%- end -%>

From b5b75d666ae75f09673e87385785d4f85ecada09 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Wed, 20 Nov 2013 02:08:25 +0100
Subject: [PATCH 0068/2267] Add support for AliasMatch directives

(#479) Extend the _aliases.erb template so that the list of hashes in
`apache::vhost`'s `aliases` parameter can contain the usual `alias`
hashes but also `aliasmatch` hashes, which get translated to
`AliasMatch` directives.

Includes basic spec tests and updated documentation in README.md. Note
that these spec tests are currently only skeletons because rspec-puppet
drops constructs like '$1'. See the entries marked XXX.
---
 README.md                    | 11 +++++++----
 spec/defines/vhost_spec.rb   | 26 ++++++++++++++++++++++++++
 templates/vhost/_aliases.erb |  6 +++++-
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 05d62f4dcd..cc941b83ae 100644
--- a/README.md
+++ b/README.md
@@ -472,13 +472,16 @@ Setting `add_listen` to 'false' stops the vhost from creating a listen statement
 
 #####`aliases`
 
-Passes a list of hashes to the vhost to create `Alias` statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). Each hash is expected to be of the form:
+Passes a list of hashes to the vhost to create `Alias` or `AliasMatch` statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). Each hash is expected to be of the form:
 
-```puppet
-aliases => [ { alias => '/alias', path => '/path/to/directory' } ],
+```
+aliases => [
+  { aliasmatch => '^/image/(.*)\.jpg$', path => '/files/jpg.images/$1.jpg' }
+  { alias      => '/image',             path => '/ftp/pub/image' },
+],
 ```
 
-For `Alias` to work, each will need a corresponding `<Directory /path/to/directory>` or `<Location /path/to/directory>` block.
+For `Alias` and `AliasMatch` to work, each will need a corresponding `<Directory /path/to/directory>` or `<Location /path/to/directory>` block. The `Alias` and `AliasMatch` directives are created in the order specified in the `aliases` paramter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html) more specific `Alias` or `AliasMatch` directives should come before the more general ones to avoid shadowing.
 
 **Note:** If `apache::mod::passenger` is loaded and `PassengerHighPerformance true` is set, then `Alias` may have issues honouring the `PassengerEnabled off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 322f9a007a..8504ceb122 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -358,6 +358,32 @@
             /^  Alias \/css \/opt\/someapp\/css$/,
           ],
         },
+        {
+          :title => 'should accept an aliasmatch hash',
+          :attr  => 'aliases',
+          ## XXX As mentioned above, rspec-puppet drops the $1. Thus, these
+          # tests don't work.
+          #:value => { 'aliasmatch' => '^/image/(.*).gif', 'path' => '/files/gifs/$1.gif' },
+          #:match => [/^  AliasMatch \^\/image\/\(\.\*\)\.gif \/files\/gifs\/\$1\.gif$/],
+        },
+        {
+          :title => 'should accept a array of alias and aliasmatch hashes mixed',
+          :attr  => 'aliases',
+          ## XXX As mentioned above, rspec-puppet drops the $1. Thus, these
+          # tests don't work.
+          #:value => [
+          #  { 'alias' => '/css', 'path' => '/files/css' },
+          #  { 'aliasmatch' => '^/image/(.*).gif', 'path' => '/files/gifs/$1.gif' },
+          #  { 'aliasmatch' => '^/image/(.*).jpg', 'path' => '/files/jpgs/$1.jpg' },
+          #  { 'alias' => '/image', 'path' => '/files/images' },
+          #],
+          #:match => [
+          #  /^  Alias \/css \/files\/css$/,
+          #  /^  AliasMatch \^\/image\/\(.\*\)\.gif \/files\/gifs\/\$1\.gif$/,
+          #  /^  AliasMatch \^\/image\/\(.\*\)\.jpg \/files\/jpgs\/\$1\.jpg$/,
+          #  /^  Alias \/image \/files\/images$/
+          #],
+        },
         {
           :title => 'should accept a suPHP_Engine',
           :attr  => 'suphp_engine',
diff --git a/templates/vhost/_aliases.erb b/templates/vhost/_aliases.erb
index 90c7d168b3..484379bba3 100644
--- a/templates/vhost/_aliases.erb
+++ b/templates/vhost/_aliases.erb
@@ -1,8 +1,12 @@
 <% if @aliases and ! @aliases.empty? -%>
   ## Alias declarations for resources outside the DocumentRoot
   <%- [@aliases].flatten.compact.each do |alias_statement| -%>
-    <%- if alias_statement["alias"] != '' and alias_statement["path"] != ''-%>
+    <%- if alias_statement["path"] != '' -%>
+      <%- if alias_statement["alias"] and alias_statement["alias"] != '' -%>
   Alias <%= alias_statement["alias"] %> <%= alias_statement["path"] %>
+      <%- elsif alias_statement["aliasmatch"] and alias_statement["aliasmatch"] != '' -%>
+  AliasMatch <%= alias_statement["aliasmatch"] %> <%= alias_statement["path"] %>
+      <%- end -%>
     <%- end -%>
   <%- end -%>
 <% end -%>

From d6b13fd5e653cf1da84dc3dc653d5e37208ae9c2 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Thu, 21 Nov 2013 19:12:37 +0100
Subject: [PATCH 0069/2267] No trailing slash for ScriptAlias path

Don't implicitly add a trailing slash to the path components of
ScriptAlias directives. Includes updated spec tests. Fixes issue #489.
---
 spec/defines/vhost_spec.rb       | 21 ++++++++++++++++-----
 templates/vhost/_scriptalias.erb |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8504ceb122..c0294d23fc 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -226,7 +226,7 @@
           :attr  => 'scriptalias',
           :value => '/usr/scripts',
           :match => [
-            /^  ScriptAlias \/cgi-bin\/ \/usr\/scripts\/$/,
+            /^  ScriptAlias \/cgi-bin\/ \/usr\/scripts$/,
             /^  <Directory \/usr\/scripts>$/,
           ],
         },
@@ -235,7 +235,7 @@
           :attr     => 'scriptaliases',
           :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
           :match    => [
-            /^  ScriptAlias \/blah\/ \/usr\/scripts\/$/,
+            /^  ScriptAlias \/blah\/ \/usr\/scripts$/,
             /^  <Directory \/usr\/scripts>$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
@@ -243,10 +243,21 @@
         {
           :title    => 'should accept multiple scriptaliases',
           :attr     => 'scriptaliases',
-          :value    => [ { 'alias' => '/blah/', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts' } ],
+          :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2', 'path' => '/usr/scripts' } ],
           :match    => [
-            /^  ScriptAlias \/blah\/ \/usr\/scripts\/$/,
-            /^  ScriptAlias \/blah2\/ \/usr\/scripts\/$/,
+            /^  ScriptAlias \/blah \/usr\/scripts$/,
+            /^  ScriptAlias \/blah2 \/usr\/scripts$/,
+            /^  <Directory \/usr\/scripts>$/,
+          ],
+          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
+        },
+        {
+          :title    => 'should accept multiple scriptaliases with and without trailing slashes',
+          :attr     => 'scriptaliases',
+          :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts2/' } ],
+          :match    => [
+            /^  ScriptAlias \/blah \/usr\/scripts$/,
+            /^  ScriptAlias \/blah2\/ \/usr\/scripts2\/$/,
             /^  <Directory \/usr\/scripts>$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index 77756d7f2b..bfae7fe2b0 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -16,7 +16,7 @@
 <% dirs = aliases.map { |h| h['path'] }.uniq.compact -%>
 <% aliases.each do |salias| -%>
   ## Script alias directives
-  ScriptAlias <%= salias['alias'] %> <%= salias['path'] %>/
+  ScriptAlias <%= salias['alias'] %> <%= salias['path'] %>
 <% end -%>
 
 <% dirs.sort.each do |dir| -%>

From 48c84fb34c442306195d76e1510f5eac9b3f2731 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Fri, 22 Nov 2013 11:27:26 +1300
Subject: [PATCH 0070/2267] Restore test for multiple includes

---
 spec/defines/vhost_spec.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index c0294d23fc..a4e59a7825 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -395,6 +395,20 @@
           #  /^  Alias \/image \/files\/images$/
           #],
         },
+        {
+          :title => 'should accept multiple additional includes',
+          :attr  => 'additional_includes',
+          :value => [
+            '/tmp/proxy_group_a',
+            '/tmp/proxy_group_b',
+            '/tmp/proxy_group_c',
+          ],
+          :match => [
+            /^  Include \/tmp\/proxy_group_a$/,
+            /^  Include \/tmp\/proxy_group_b$/,
+            /^  Include \/tmp\/proxy_group_c$/,
+          ],
+        },
         {
           :title => 'should accept a suPHP_Engine',
           :attr  => 'suphp_engine',

From f11921423bd85e43598add6c065a804a6b5761f1 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Fri, 22 Nov 2013 04:33:20 +0100
Subject: [PATCH 0071/2267] Working mod_authnz_ldap support on Debian/Ubuntu

Remove the `authnz_ldap` key from $mod_packages in `apache::params` so
an installation of the non-existent package `libapache2-mod-authz-ldap`
is not attempted.

Properly manage the `authnz_ldap.conf` file template and set the
`LDAPVerifyServerCert` directive according to $verifyServerCert
in `apache::mod::authnz_ldap`.

Also update spec tests accordingly.

This fixes only the superficial problems in issue #494. Better support
for mod_ldap and mod_authnz_ldap is required, as discussed there.
---
 manifests/mod/authnz_ldap.pp         | 29 +++++++++++++---------------
 manifests/params.pp                  |  1 -
 spec/classes/mod/authnz_ldap_spec.rb |  8 ++++----
 templates/mod/authnz_ldap.conf.erb   |  5 +++++
 4 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 templates/mod/authnz_ldap.conf.erb

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 9533b45a0f..2ca2fc45fd 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,22 +1,19 @@
-class apache::mod::authnz_ldap(
+class apache::mod::authnz_ldap (
   $verifyServerCert = true,
 ) {
-  include apache::mod::ldap
+  include 'apache::mod::ldap'
   apache::mod { 'authnz_ldap': }
 
-  if $verifyServerCert == true {
-    file { 'authnz_ldap.conf':
-      ensure  => absent,
-      path    => "${apache::mod_dir}/authnz_ldap.conf",
-      notify  => Service['httpd'],
-    }
-  } else {
-    file { 'authnz_ldap.conf':
-      ensure  => file,
-      path    => "${apache::mod_dir}/authnz_ldap.conf",
-      content => 'LDAPVerifyServerCert off',
-      before  => File[$apache::mod_dir],
-      notify  => Service['httpd'],
-    }
+  validate_bool($verifyServerCert)
+
+  # Template uses:
+  # - $verifyServerCert
+  file { 'authnz_ldap.conf':
+    ensure  => file,
+    path    => "${apache::mod_dir}/authnz_ldap.conf",
+    content => template('apache/mod/authnz_ldap.conf.erb'),
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
+    notify  => Service['httpd'],
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 29fb43e581..2c41006835 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -119,7 +119,6 @@
     $suphp_configpath  = '/etc/php5/apache2'
     $mod_packages     = {
       'auth_kerb'   => 'libapache2-mod-auth-kerb',
-      'authnz_ldap' => 'libapache2-mod-authz-ldap',
       'dav_svn'     => 'libapache2-svn',
       'fastcgi'     => 'libapache2-mod-fastcgi',
       'fcgid'       => 'libapache2-mod-fcgid',
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index 9c52e28586..ac0373e866 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -16,12 +16,12 @@
     it { should contain_apache__mod('authnz_ldap') }
 
     context 'default verifyServerCert' do
-      it { should contain_file('authnz_ldap.conf').with_ensure('absent') }
+      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
     end
 
     context 'verifyServerCert = false' do
       let(:params) { { :verifyServerCert => false } }
-      it { should contain_file('authnz_ldap.conf').with_content('LDAPVerifyServerCert off') }
+      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
     end
 
     context 'verifyServerCert = wrong' do
@@ -45,12 +45,12 @@
     it { should contain_apache__mod('authnz_ldap') }
 
     context 'default verifyServerCert' do
-      it { should contain_file('authnz_ldap.conf').with_ensure('absent') }
+      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
     end
 
     context 'verifyServerCert = false' do
       let(:params) { { :verifyServerCert => false } }
-      it { should contain_file('authnz_ldap.conf').with_content('LDAPVerifyServerCert off') }
+      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
     end
 
     context 'verifyServerCert = wrong' do
diff --git a/templates/mod/authnz_ldap.conf.erb b/templates/mod/authnz_ldap.conf.erb
new file mode 100644
index 0000000000..565fcf0df9
--- /dev/null
+++ b/templates/mod/authnz_ldap.conf.erb
@@ -0,0 +1,5 @@
+<% if @verifyServerCert == true -%>
+LDAPVerifyServerCert On
+<% else -%>
+LDAPVerifyServerCert Off
+<% end -%>

From c42c41d7e0324a827fa317b9493ad09a8d7cd430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Fri, 22 Nov 2013 16:44:16 +0100
Subject: [PATCH 0072/2267] Add support for overriding ErrorDocument

add support for overriding ErrorDocument settings in both, vhost and
directory context.
With documentation and tests included this fixes #474
---
 README.md                           | 26 ++++++++++++++++++++
 manifests/vhost.pp                  |  2 ++
 spec/defines/vhost_spec.rb          | 37 +++++++++++++++++++++++++++++
 templates/vhost.conf.erb            |  1 +
 templates/vhost/_directories.erb    |  8 +++++++
 templates/vhost/_error_document.erb |  7 ++++++
 6 files changed, 81 insertions(+)
 create mode 100644 templates/vhost/_error_document.erb

diff --git a/README.md b/README.md
index cc941b83ae..bba31b74c3 100644
--- a/README.md
+++ b/README.md
@@ -574,6 +574,19 @@ Sets an `Deny` directive as per the [Apache Core documentation](http://httpd.apa
       directories => [ { path => '/path/to/directory', deny => 'from example.org' } ],
     }
 ```
+######`error_documents`
+
+A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/2.2/mod/core.html#errordocument) settings for this directory. Example:
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      directories => [ { path => '/srv/www'
+        error_documents => [
+          { 'error_code' => '503', 'document' => '/service-unavail' },
+        ],
+      }]
+    }
+```
 
 ######`headers`
 
@@ -752,6 +765,19 @@ Specifies a pipe to send error log messages to. Defaults to 'undef'.
 
 Sends all error log messages to syslog. Defaults to 'undef'.
 
+#####`error_documents`
+
+A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/2.2/mod/core.html#errordocument) settings for this vhost. Defaults to `[]`. Example:
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      error_documents => [
+        { 'error_code' => '503', 'document' => '/service-unavail' },
+        { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
+      ],
+    }
+```
+
 #####`ensure`
 
 Specifies if the vhost file is present or absent.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 6593b2bb28..9c3d7375a2 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -104,6 +104,7 @@
     $error_log_file              = undef,
     $error_log_pipe              = undef,
     $error_log_syslog            = undef,
+    $error_documents             = [],
     $fallbackresource            = undef,
     $scriptalias                 = undef,
     $scriptaliases               = [],
@@ -366,6 +367,7 @@
   # - $_access_log_format
   # - $error_log
   # - $error_log_destination
+  # - $error_documents
   # - $fallbackresource
   # - $custom_fragment
   # - $additional_includes
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index a4e59a7825..90e30523b0 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -221,6 +221,43 @@
           :value    => false,
           :notmatch => [/ErrorLog.+$/],
         },
+        {
+          :title    => 'should set ErrorDocument 503',
+          :attr     => 'error_documents',
+          :value    => [ { 'error_code' => '503', 'document' => '"Go away, the backend is broken."'}],
+          :match => [/^  ErrorDocument 503 "Go away, the backend is broken."$/],
+        },
+        {
+          :title    => 'should set ErrorDocuments 503 407',
+          :attr     => 'error_documents',
+          :value    => [
+            { 'error_code' => '503', 'document' => '/service-unavail'},
+            { 'error_code' => '407', 'document' => 'https://example.com/proxy/login'},
+          ],
+          :match => [
+            /^  ErrorDocument 503 \/service-unavail$/,
+            /^  ErrorDocument 407 https:\/\/example\.com\/proxy\/login$/,
+          ],
+        },
+        {
+          :title    => 'should set ErrorDocument 503 in directory',
+          :attr     => 'directories',
+          :value    => { 'path' => '/srv/www', 'error_documents' => [{ 'error_code' => '503', 'document' => '"Go away, the backend is broken."'}] },
+          :match => [/^    ErrorDocument 503 "Go away, the backend is broken."$/],
+        },
+        {
+          :title    => 'should set ErrorDocuments 503 407 in directory',
+          :attr     => 'directories',
+          :value    => { 'path' => '/srv/www', 'error_documents' =>
+          [
+            { 'error_code' => '503', 'document' => '/service-unavail'},
+            { 'error_code' => '407', 'document' => 'https://example.com/proxy/login'},
+          ]},
+          :match => [
+            /^    ErrorDocument 503 \/service-unavail$/,
+            /^    ErrorDocument 407 https:\/\/example\.com\/proxy\/login$/,
+          ],
+        },
         {
           :title => 'should accept a scriptalias',
           :attr  => 'scriptalias',
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index d7b58a57a8..bb144ed35b 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -41,6 +41,7 @@
   CustomLog <%= @access_log_destination %> <%= @_access_log_format %>
 <% end -%>
 <%= scope.function_template(['apache/vhost/_block.erb']) -%>
+<%= scope.function_template(['apache/vhost/_error_document.erb']) -%>
 <%= scope.function_template(['apache/vhost/_proxy.erb']) -%>
 <%= scope.function_template(['apache/vhost/_rack.erb']) -%>
 <%= scope.function_template(['apache/vhost/_redirect.erb']) -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index f642d0ef8c..a07452efca 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -56,6 +56,11 @@
     <%- if directory['directoryindex'] and directory['directoryindex'] != '' -%>
     DirectoryIndex <%= directory['directoryindex'] %>
     <%- end -%>
+    <%- if directory['error_documents'] and ! directory['error_documents'].empty? -%>
+      <%- [directory['error_documents']].flatten.compact.each do |error_document| -%>
+    ErrorDocument <%= error_document['error_code'] %> <%= error_document['document'] %>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['auth_type'] -%>
     AuthType <%= directory['auth_type'] %>
     <%- end -%>
@@ -112,6 +117,9 @@
     <%- if directory['force_type'] -%>
     ForceType <%= directory['force_type'] %>
     <%- end -%>
+    <%- if directory['error_documents'] -%>
+    ForceType <%= directory['force_type'] %>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>
diff --git a/templates/vhost/_error_document.erb b/templates/vhost/_error_document.erb
new file mode 100644
index 0000000000..654e72c676
--- /dev/null
+++ b/templates/vhost/_error_document.erb
@@ -0,0 +1,7 @@
+<% if @error_documents and ! @error_documents.empty? -%>
+  <%- [@error_documents].flatten.compact.each do |error_document| -%>
+    <%- if error_document["error_code"] != '' and error_document["document"] != '' -%>
+  ErrorDocument <%= error_document["error_code"] %> <%= error_document["document"] %>
+    <%- end -%>
+  <%- end -%>
+<% end -%>

From 3e18ccaf0818938fe6747b8fefa61429c21fb476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Fri, 22 Nov 2013 21:47:02 +0100
Subject: [PATCH 0073/2267] Remove eronous duplication of ForceType

c42c41d introduced a sloppy copy/paste error in the _directories.erb
template. This removes it, thus fixing #500
---
 templates/vhost/_directories.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index a07452efca..c5bc99985e 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -117,9 +117,6 @@
     <%- if directory['force_type'] -%>
     ForceType <%= directory['force_type'] %>
     <%- end -%>
-    <%- if directory['error_documents'] -%>
-    ForceType <%= directory['force_type'] %>
-    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>

From 609298d582add7496bf9e978e920eebf14cbb023 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Thu, 21 Nov 2013 17:29:29 +0100
Subject: [PATCH 0074/2267] No implicit <Directory> entry for ScriptAlias path

Support for ScriptAlias currently implicitly and automatically creates
<Directory> configuration directives for the path component in a given
ScriptAlias directive. These are not useful or needed, according to the
mod_alias documentation. Fixes issue #486.

This change also indirectly relates to #487 because the implicitly
created <Directory> entry for each ScriptAlias path also had
`SSLOptions +StdEnvVars` set for that directory.
---
 spec/defines/vhost_spec.rb       |  4 ----
 templates/vhost/_scriptalias.erb | 16 ----------------
 2 files changed, 20 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 90e30523b0..8974db2c25 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -264,7 +264,6 @@
           :value => '/usr/scripts',
           :match => [
             /^  ScriptAlias \/cgi-bin\/ \/usr\/scripts$/,
-            /^  <Directory \/usr\/scripts>$/,
           ],
         },
         {
@@ -273,7 +272,6 @@
           :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
           :match    => [
             /^  ScriptAlias \/blah\/ \/usr\/scripts$/,
-            /^  <Directory \/usr\/scripts>$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
@@ -284,7 +282,6 @@
           :match    => [
             /^  ScriptAlias \/blah \/usr\/scripts$/,
             /^  ScriptAlias \/blah2 \/usr\/scripts$/,
-            /^  <Directory \/usr\/scripts>$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
@@ -295,7 +292,6 @@
           :match    => [
             /^  ScriptAlias \/blah \/usr\/scripts$/,
             /^  ScriptAlias \/blah2\/ \/usr\/scripts2\/$/,
-            /^  <Directory \/usr\/scripts>$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index bfae7fe2b0..ad66422bcd 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -11,24 +11,8 @@
 <%# for backward compatibility and ease of implementation -%>
 <% aliases << { 'alias' => '/cgi-bin/', 'path' => @scriptalias } if @scriptalias -%>
 <% aliases.flatten.compact! %>
-<%# Multiple paths could be provided for the same directory, make sure we only -%>
-<%# add a single <Directory> entry per path -%>
-<% dirs = aliases.map { |h| h['path'] }.uniq.compact -%>
 <% aliases.each do |salias| -%>
   ## Script alias directives
   ScriptAlias <%= salias['alias'] %> <%= salias['path'] %>
 <% end -%>
-
-<% dirs.sort.each do |dir| -%>
-  <Directory <%= dir %>>
-    AllowOverride None
-    Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-    Order allow,deny
-    Allow from all
-<% if @ssl -%>
-    SSLOptions +StdEnvVars
-<% end -%>
-  </Directory>
-<% end -%>
-
 <% end -%>

From f749375184e0bb7bbc3f5a63a7e6b4d8183a1f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 21 Nov 2013 19:11:17 +0100
Subject: [PATCH 0075/2267] Set SSLOptions StdEnvVars in server context

We set `SSLOptions` now in server context and we set it to `StdEnvVars`.
Thus, we no longer need the <FilesMatch > in server context to set it
for php, CGI and SSI applications.
We allow it to be overridden by the `apache::mod::ssl` class parameter
`ssl_options`. Further, we allow it to be overridden in directory
context.
Documentation for all of these has been extended and tests have been
adapted to make sense in this new context. This commit fixes #487
---
 README.md                        | 27 ++++++++++++++++++++++-----
 manifests/mod/ssl.pp             |  3 ++-
 spec/defines/vhost_spec.rb       | 16 ++++++++++++++--
 templates/mod/ssl.conf.erb       |  3 +++
 templates/vhost/_directories.erb |  3 +++
 templates/vhost/_ssl.erb         |  3 ---
 6 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index bba31b74c3..7e175f0709 100644
--- a/README.md
+++ b/README.md
@@ -409,10 +409,13 @@ The modules mentioned above, and other Apache modules that have templates, will
 
 ####Class: `apache::mod::ssl`
 
-Installs Apache SSL capabilities and utilizes `ssl.conf.erb` template
+Installs Apache SSL capabilities and utilizes `ssl.conf.erb` template. These are the defaults:
 
 ```puppet
-	class { 'apache::mod::ssl': }
+    class { 'apache::mod::ssl':
+      ssl_compression => false,
+      ssl_options     => [ 'StdEnvVars' ],
+  }
 ```
 
 To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` parameter in `apache` to 'true' or set the `ssl` parameter in `apache::vhost` to 'true'.
@@ -728,6 +731,20 @@ Sets the value for the `PassengerEnabled` directory to `on` or `off` as per the
 
 **Note:** Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the `PassengerEnabled` directive with the `PassengerHighPerformance` directive.
 
+######`ssl_options`
+
+String or list of [`SSLOptions`](https://httpd.apache.org/docs/2.2/mod/mod_ssl.html#ssloptions) for the given `<Directory>` block. This overrides, or refines the [`SSLOptions`](https://httpd.apache.org/docs/2.2/mod/mod_ssl.html#ssloptions) of the parent block (either vhost, or server).
+
+```puppet
+    apache::vhost { 'secure.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path => '/path/to/directory', ssl_options => '+ExportCertData' }
+        { path => '/path/to/different/dir', ssl_options => [ '-StdEnvVars', '+ExportCertData'] },
+      ],
+    }
+```
+
 ######`custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the
@@ -1071,12 +1088,12 @@ An example:
 
 #####`ssl_options`
 
-Sets `SSLVerifyOptions` directives as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/mod_ssl.html#ssloptions). This is the global setting for the vhost and can be a string or an array. Defaults to undef. A single string example:
+Sets `SSLOptions` directives as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/mod_ssl.html#ssloptions). This is the global setting for the vhost and can be a string or an array. Defaults to undef. A single string example:
 
 ```puppet
     apache::vhost { 'sample.example.net':
       …
-      ssl_options => '+StdEnvVars',
+      ssl_options => '+ExportCertData',
     }
 ```
 
@@ -1085,7 +1102,7 @@ An array of strings example:
 ```puppet
     apache::vhost { 'sample.example.net':
       …
-      ssl_options => [ '+StdEnvVars', '+ExportCertData' ],
+      ssl_options => [ '+StrictRequire', '+ExportCertData' ],
     }
 ```
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index ea1e119750..3002d14be0 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,5 +1,6 @@
 class apache::mod::ssl (
   $ssl_compression = false,
+  $ssl_options     = [ 'StdEnvVars' ],
 ) {
   $session_cache = $::osfamily ? {
     'debian'  => '${APACHE_RUN_DIR}/ssl_scache(512000)',
@@ -13,7 +14,7 @@
   }
   apache::mod { 'ssl': }
 
-  # Template uses $ssl_compression, $session_cache, $ssl_mutex
+  # Template uses $ssl_compression, $ssl_options, $session_cache, $ssl_mutex
   file { 'ssl.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/ssl.conf",
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8974db2c25..87475c7af4 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -709,8 +709,20 @@
         {
             :title => 'should accept setting SSLOptions with an array',
             :attr  => 'ssl_options',
-            :value => ['+StdEnvVars','+ExportCertData'],
-            :match => [/^  SSLOptions \+StdEnvVars \+ExportCertData/],
+            :value => ['+StrictRequire','+ExportCertData'],
+            :match => [/^  SSLOptions \+StrictRequire \+ExportCertData/],
+        },
+        {
+            :title => 'should accept setting SSLOptions with a string in directories',
+            :attr  => 'directories',
+            :value => { 'path' => '/srv/www', 'ssl_options' => '+ExportCertData'},
+            :match => [/^    SSLOptions \+ExportCertData$/],
+        },
+        {
+            :title => 'should accept setting SSLOptions with an array in directories',
+            :attr  => 'directories',
+            :value => { 'path' => '/srv/www', 'ssl_options' => ['-StdEnvVars','+ExportCertData']},
+            :match => [/^    SSLOptions -StdEnvVars \+ExportCertData/],
         },
       ].each do |param|
         describe "when #{param[:attr]} is #{param[:value]} with SSL" do
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 854a0d0a64..d42b0ad61a 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -18,4 +18,7 @@
   SSLHonorCipherOrder On
   SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
   SSLProtocol all -SSLv2
+<% if @ssl_options -%>
+  SSLOptions <%= @ssl_options.compact.join(' ') %>
+<% end -%>
 </IfModule>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index c5bc99985e..00cbf01e4b 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -117,6 +117,9 @@
     <%- if directory['force_type'] -%>
     ForceType <%= directory['force_type'] %>
     <%- end -%>
+    <%- if directory['ssl_options'] -%>
+    SSLOptions <%= Array(directory['ssl_options']).join(' ') %>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 83c90b8a80..96027dce78 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -38,7 +38,4 @@
 <% if @ssl_options -%>
   SSLOptions <%= Array(@ssl_options).join(' ') %>
 <% end -%>
-  <FilesMatch "\.(cgi|shtml|phtml|php)$">
-    SSLOptions +StdEnvVars
-  </FilesMatch>
 <% end -%>

From f5277d293f5d12acb75c3292da4be509144bf3be Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Mon, 25 Nov 2013 01:50:13 +0100
Subject: [PATCH 0076/2267] Add support for ScriptAliasMatch directives

Much like in PR #483 extend the _scriptalias.rb template so that the
`scriptalias` parameter in `apache::vhost` can contain `aliasmatch`
hashes which get translated to `ScriptAliasMatch` directives. Fixes
issue #480.

Includes basic spec tests and updated documentation in README.md.

Note again that puppet-rspec silently drops `$1` when specifying test
values so we match `FOO` instead of `$1`. From a simple spec test
perspective there shouldn't be a difference and this is better than
having no tests at all.
---
 README.md                        | 41 +++++++++++++++--------------
 spec/defines/vhost_spec.rb       | 45 ++++++++++++++++++++++++++++++++
 templates/vhost/_scriptalias.erb | 36 ++++++++++++++-----------
 3 files changed, 87 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index bba31b74c3..068e3b8ca9 100644
--- a/README.md
+++ b/README.md
@@ -957,30 +957,31 @@ Defines a directory of CGI scripts to be aliased to the path '/cgi-bin'
 
 #####`scriptaliases`
 
-Takes an array hashes with the keys containing the alias and path.  For example:
-
-Usage will typically look like:
+Passes a list of hashes to the vhost to create `ScriptAlias` or `ScriptAliasMatch` statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). Each hash is expected to be of the form:
 
 ```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      scriptaliases => [
-        {
-          alias => '/myscript/',
-          path  => '/usr/share/myscript',
-        },
-        {
-          alias => '/oldscript/',
-          path  => '/usr/share/myscript',
-        },
-        {
-          alias => '/neatscript/',
-          path  => '/usr/share/neatscript',
-        },
-      ]
-    }
+    scriptaliases => [
+      {
+        alias => '/myscript',
+        path  => '/usr/share/myscript',
+      },
+      {
+        aliasmatch => '^/foo(.*)',
+        path       => '/usr/share/fooscripts$1',
+      },
+      {
+        aliasmatch => '^/bar/(.*)',
+        path       => '/usr/share/bar/wrapper.sh/$1',
+      },
+      {
+        alias => '/neatscript',
+        path  => '/usr/share/neatscript',
+      },
+    ]
 ```
 
+These directives are created in the order specified. As with `Alias` and `AliasMatch` directives the more specific aliases should come before the more general ones to avoid shadowing.
+
 #####`serveradmin`
 
 Specifies the email address Apache will display when it renders one of its error pages.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8974db2c25..0d6108ec36 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -295,6 +295,51 @@
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
+        {
+          :title    => 'should accept a ScriptAliasMatch directive',
+          :attr     => 'scriptaliases',
+          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
+          ## Thus, these tests don't work as they should. As a workaround we
+          ## use FOO instead of $1 here.
+          :value    => [ { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' } ],
+          :match    => [
+            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) \/usr\/local\/apache\/cgi-binFOO$/
+          ],
+        },
+        {
+          :title    => 'should accept multiple ScriptAliasMatch directives',
+          :attr     => 'scriptaliases',
+          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
+          ## Thus, these tests don't work as they should. As a workaround we
+          ## use FOO instead of $1 here.
+          :value    => [
+            { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' },
+            { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
+          ],
+          :match    => [
+            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) \/usr\/local\/apache\/cgi-binFOO$/,
+            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" \/var\/www\/bin\/gitolite-suexec-wrapper\/FOO$/,
+          ],
+        },
+        {
+          :title    => 'should accept mixed ScriptAlias and ScriptAliasMatch directives',
+          :attr     => 'scriptaliases',
+          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
+          ## Thus, these tests don't work as they should. As a workaround we
+          ## use FOO instead of $1 here.
+          :value    => [
+            { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
+            { 'alias' => '/git', 'path' => '/var/www/gitweb/index.cgi' },
+            { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' },
+            { 'alias' => '/trac', 'path' => '/etc/apache2/trac.fcgi' },
+          ],
+          :match    => [
+            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" \/var\/www\/bin\/gitolite-suexec-wrapper\/FOO$/,
+            /^  ScriptAlias \/git \/var\/www\/gitweb\/index\.cgi$/,
+            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) \/usr\/local\/apache\/cgi-binFOO$/,
+            /^  ScriptAlias \/trac \/etc\/apache2\/trac.fcgi$/,
+          ],
+        },
         {
           :title    => 'should accept proxy destinations',
           :attr     => 'proxy_dest',
diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index ad66422bcd..cdf3b87e49 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -1,18 +1,24 @@
-<% if @scriptaliases.is_a?(Array) -%>
-<%  aliases = @scriptaliases -%>
-<% elsif @scriptaliases.is_a?(Hash) -%>
-<%  aliases = [@scriptaliases] -%>
-<% else -%>
-<%  # Nothing to do with any other data type -%>
-<%  aliases = [] -%>
-<% end -%>
-<% if @scriptalias or !aliases.empty? -%>
+<%- if @scriptaliases.is_a?(Array) -%>
+<%-  aliases = @scriptaliases -%>
+<%- elsif @scriptaliases.is_a?(Hash) -%>
+<%-  aliases = [@scriptaliases] -%>
+<%- else -%>
+<%-  # Nothing to do with any other data type -%>
+<%-  aliases = [] -%>
+<%- end -%>
+<%- if @scriptalias or !aliases.empty? -%>
+  ## Script alias directives
 <%# Combine scriptalais and scriptaliases into a single data structure -%>
 <%# for backward compatibility and ease of implementation -%>
-<% aliases << { 'alias' => '/cgi-bin/', 'path' => @scriptalias } if @scriptalias -%>
-<% aliases.flatten.compact! %>
-<% aliases.each do |salias| -%>
-  ## Script alias directives
+<%- aliases << { 'alias' => '/cgi-bin/', 'path' => @scriptalias } if @scriptalias -%>
+<%- aliases.flatten.compact! -%>
+<%- aliases.each do |salias| -%>
+  <%- if salias["path"] != '' -%>
+    <%- if salias["alias"] and salias["alias"] != '' -%>
   ScriptAlias <%= salias['alias'] %> <%= salias['path'] %>
-<% end -%>
-<% end -%>
+    <%- elsif salias["aliasmatch"] and salias["aliasmatch"] != '' -%>
+  ScriptAliasMatch <%= salias['aliasmatch'] %> <%= salias['path'] %>
+    <%- end -%>
+  <%- end -%>
+<%- end -%>
+<%- end -%>

From 82f0581e9be82c535d8ab5811242abb485b4d91e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Fri, 22 Nov 2013 09:35:46 +0100
Subject: [PATCH 0077/2267] Add suPHP_UserGroup directive to directory context

suPHP_UserGroup is only supported in per-direcctory context. We add this
directive analogous to the per-vhost suphp_ directives, by making sure
that suphp_engine is actually enabled.

  suphp => { 'user' => 'myappuser', 'group' => 'myappgroup' }

With documentation and tests in place, this should fix #451
---
 README.md                        | 17 +++++++++++++++++
 spec/defines/vhost_spec.rb       | 14 ++++++++++++++
 templates/vhost/_directories.erb |  3 +++
 3 files changed, 34 insertions(+)

diff --git a/README.md b/README.md
index 6f1c095343..17d3bf5e85 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,9 @@ To set up a virtual host with suPHP
       suphp_addhandler    => 'x-httpd-php',
       suphp_engine        => 'on',
       suphp_configpath    => '/etc/php5/apache2',
+      directories         => { path => '/home/appuser/myphpapp',
+        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
+      }
     }
 ```
 
@@ -745,6 +748,20 @@ String or list of [`SSLOptions`](https://httpd.apache.org/docs/2.2/mod/mod_ssl.h
     }
 ```
 
+######`suphp`
+
+An array containing two values: User and group for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting.
+This directive must be used with `suphp_engine => on` in the vhost declaration. This directive only works in `<Directory>` or `<Location>`.
+
+```puppet
+    apache::vhost { 'secure.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path => '/path/to/directory', suphp => { user =>  'myappuser', group => 'myappgroup' }
+      ],
+    }
+```
+
 ######`custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f966994d67..e9ef147fe2 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -877,6 +877,20 @@
         end
       end
 
+      describe 'when suphp_engine is on and suphp { user & group } is specified' do
+        let :params do default_params.merge({
+          :suphp_engine     => 'on',
+          :directories      => { 'path' => '/srv/www',
+            'suphp' => { 'user' => 'myappuser', 'group' => 'myappgroup' },
+          }
+        }) end
+        it 'should set suphp_UserGroup' do
+          should contain_file("25-#{title}.conf").with_content(
+            /^    suPHP_UserGroup myappuser myappgroup/
+          )
+        end
+      end
+
       describe 'priority/default settings' do
         describe 'when neither priority/default is specified' do
           let :params do default_params end
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 00cbf01e4b..023fa29c89 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -120,6 +120,9 @@
     <%- if directory['ssl_options'] -%>
     SSLOptions <%= Array(directory['ssl_options']).join(' ') %>
     <%- end -%>
+    <%- if directory['suphp'] and @suphp_engine == 'on' -%>
+    suPHP_UserGroup <%= directory['suphp']['user'] %> <%= directory['suphp']['group'] %>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>

From 499d4ad0c647417a6b9600d58525389fa78b2a1f Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Thu, 28 Nov 2013 23:08:41 +0100
Subject: [PATCH 0078/2267] add parameter for TraceEnable

---
 README.md                | 4 ++++
 manifests/init.pp        | 4 ++++
 templates/httpd.conf.erb | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17d3bf5e85..103e66133e 100644
--- a/README.md
+++ b/README.md
@@ -324,6 +324,10 @@ Controls how much information Apache sends to the browser about itself and the o
 
 Allows the configuration of a trailing footer line under server-generated documents. See Apache documentation for 'ServerSignature'. Defaults to 'On'.
 
+#####`trace_enable`
+
+Controls, how TRACE requests per RFC 2616 are handled. See Apache documentation for 'TraceEnable'. Defaults to 'On'.
+
 #####`manage_user`
 
 Setting this to false will avoid the user resource to be created by this module. This is useful when you already have a user created in another puppet module and that you want to used it to run apache. Without this, it would result in a duplicate resource error.
diff --git a/manifests/init.pp b/manifests/init.pp
index 60a1406702..fecfcc19d8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -52,6 +52,7 @@
   $ports_file           = $apache::params::ports_file,
   $server_tokens        = 'OS',
   $server_signature     = 'On',
+  $trace_enable         = 'On',
   $package_ensure       = 'installed',
 ) inherits apache::params {
 
@@ -259,6 +260,9 @@
     # - $keepalive
     # - $keepalive_timeout
     # - $server_root
+    # - $server_tokens
+    # - $server_signature
+    # - $trace_enable
     file { "${apache::params::conf_dir}/${apache::params::conf_file}":
       ensure  => file,
       content => template($conf_template),
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 98c214b059..4ed753a8c3 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -1,7 +1,7 @@
 # Security
 ServerTokens <%= @server_tokens %>
 ServerSignature <%= @server_signature %>
-TraceEnable Off
+TraceEnable <%= @trace_enable %>
 
 ServerName "<%= @servername %>"
 ServerRoot "<%= @server_root %>"

From acd5a03765d008e7cf1697ce2c3d1866675c9f83 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@gentoo.org>
Date: Fri, 29 Nov 2013 20:13:15 +0100
Subject: [PATCH 0079/2267] Add ability to pass ip (instead of wildcard) in
 default vhost files

---
 manifests/init.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index fecfcc19d8..cf4596bf6d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,6 +24,7 @@
   $default_ssl_ca       = undef,
   $default_ssl_crl_path = undef,
   $default_ssl_crl      = undef,
+  $ip                   = undef,
   $service_enable       = true,
   $service_ensure       = 'running',
   $purge_configs        = true,
@@ -306,6 +307,7 @@
       serveradmin     => $serveradmin,
       access_log_file => $access_log_file,
       priority        => '15',
+      ip              => $ip,
     }
     $ssl_access_log_file = $::osfamily ? {
       'freebsd' => $access_log_file,
@@ -320,6 +322,7 @@
       serveradmin     => $serveradmin,
       access_log_file => $ssl_access_log_file,
       priority        => '15',
+      ip              => $ip,
     }
   }
 }

From 8a9534b9be45d19283ea8f776795679e4df58dfa Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@gentoo.org>
Date: Sat, 30 Nov 2013 02:11:45 +0100
Subject: [PATCH 0080/2267] Add documentation about $ip

---
 README.md          | 10 ++++++++++
 manifests/vhost.pp |  1 +
 2 files changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 103e66133e..81e3463117 100644
--- a/README.md
+++ b/README.md
@@ -111,6 +111,16 @@ To set up a virtual host with SSL and specific SSL certificates
     }
 ```
 
+To set up a virtual host with IP address different than '*'
+
+```puppet
+    apache::vhost { 'subdomain.example.com':
+      ip      => '127.0.0.1',
+      port    => '80',
+      docrout => '/var/www/subdomain',
+    }
+```
+
 To set up a virtual host with wildcard alias for subdomain mapped to same named directory
 `http://examle.com.loc => /var/www/example.com`
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9c3d7375a2..f110892ecf 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -12,6 +12,7 @@
 # - The $priority of the site
 # - The $servername is the primary name of the virtual host
 # - The $serveraliases of the site
+# - The $ip to configure the host on, defaulting to *
 # - The $options for the given vhost
 # - The $override for the given vhost (list of AllowOverride arguments)
 # - The $vhost_name for name based virtualhosting, defaulting to *

From 8bdb0781c505afd85ba07198ef436d1789a9118a Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Tue, 3 Dec 2013 23:22:16 +0100
Subject: [PATCH 0081/2267] No trailing slash for ProxyPass/ProxyPassReverse

Remove implicitly added slashes in ProxyPassReverse location paths.
Trailing slashes should either be present on both path and url, or
absent on both. Mixing one with the other is bad. Should fix issue #511.
---
 spec/defines/vhost_spec.rb | 19 +++++++++++--------
 templates/vhost/_proxy.erb |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index e9ef147fe2..8405e51cdc 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -355,10 +355,13 @@
         {
           :title    => 'should accept proxy_pass hash',
           :attr     => 'proxy_pass',
-          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a/' },
+          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a' },
           :match    => [
-            /^  ProxyPass \/path-a http:\/\/fake.com\/a\/$/,
-            /    ProxyPassReverse \//,
+            /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
+            /^  <Location \/path-a>$/,
+            /^    ProxyPassReverse \/$/,
+            /^  <\/Location>$/,
+
           ],
           :notmatch => [/ProxyPass .+!$/],
         },
@@ -366,16 +369,16 @@
           :title    => 'should accept proxy_pass array of hash',
           :attr     => 'proxy_pass',
           :value    => [
-            { 'path' => '/path-a', 'url' => 'http://fake.com/a/' },
-            { 'path' => '/path-b', 'url' => 'http://fake.com/b/' },
+            { 'path' => '/path-a/', 'url' => 'http://fake.com/a/' },
+            { 'path' => '/path-b', 'url' => 'http://fake.com/b' },
           ],
           :match    => [
-            /^  ProxyPass \/path-a http:\/\/fake.com\/a\/$/,
+            /^  ProxyPass \/path-a\/ http:\/\/fake.com\/a\/$/,
             /^  <Location \/path-a\/>$/,
             /^    ProxyPassReverse \/$/,
             /^  <\/Location>$/,
-            /^  ProxyPass \/path-b http:\/\/fake.com\/b\/$/,
-            /^  <Location \/path-b\/>$/,
+            /^  ProxyPass \/path-b http:\/\/fake.com\/b$/,
+            /^  <Location \/path-b>$/,
             /^    ProxyPassReverse \/$/,
             /^  <\/Location>$/,
           ],
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index aed8503a99..a126dbc970 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -5,7 +5,7 @@
 <%- end -%>
 <% [@proxy_pass].flatten.compact.each do |proxy| %>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
-  <Location <%= proxy['path']%>/>
+  <Location <%= proxy['path']%>>
     ProxyPassReverse /
   </Location>
 <% end %>

From 3ea862d543b1c4795cf69d6cba7940847bfb6972 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Wed, 4 Dec 2013 00:01:34 +0100
Subject: [PATCH 0082/2267] Make LogLevel configurable for vhost

Add a `log_level` parameter, which defaults to `undef`, in
`apache::vhost` to allow overriding the global server configuration's
log level (warn) on a per-vhost basis. Includes updated documentation
and basic spec tests. Fixes issue #510.
---
 README.md                  |  4 ++++
 manifests/vhost.pp         | 10 ++++++++++
 spec/defines/vhost_spec.rb |  6 ++++++
 templates/vhost.conf.erb   |  4 +++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 103e66133e..02d2783704 100644
--- a/README.md
+++ b/README.md
@@ -850,6 +850,10 @@ Enables an IP-based vhost. This parameter inhibits the creation of a NameVirtual
 
 Specifies the location of the virtual host's logfiles. Defaults to `/var/log/<apache log location>/`.
 
+#####`log_level`
+
+Specifies the verbosity level of the error log. Defaults to `warn` for the global server configuration and can be overridden on a per-vhost basis using this parameter. Valid value for `log_level` is one of `emerg`, `alert`, `crit`, `error`, `warn`, `notice`, `info` or `debug`.
+
 #####`no_proxy_uris`
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with `proxy_dest`.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9c3d7375a2..77947b6319 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -17,6 +17,9 @@
 # - The $vhost_name for name based virtualhosting, defaulting to *
 # - The $logroot specifies the location of the virtual hosts logfiles, default
 #   to /var/log/<apache log location>/
+# - The $log_level specifies the verbosity of the error log for this vhost. Not
+#   set by default for the vhost, instead the global server configuration default
+#   of 'warn' is used.
 # - The $access_log specifies if *_access.log directives should be configured.
 # - The $ensure specifies if vhost file is present or absent.
 # - The $request_headers is a list of RequestHeader statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
@@ -93,6 +96,7 @@
     $directoryindex              = '',
     $vhost_name                  = '*',
     $logroot                     = $apache::logroot,
+    $log_level                   = undef,
     $access_log                  = true,
     $access_log_file             = undef,
     $access_log_pipe             = undef,
@@ -164,6 +168,11 @@
     validate_hash($itk)
   }
 
+  if $log_level {
+    validate_re($log_level, '^(emerg|alert|crit|error|warn|notice|info|debug)$',
+    "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
+  }
+
   if $access_log_file and $access_log_pipe {
     fail("Apache::Vhost[${name}]: 'access_log_file' and 'access_log_pipe' cannot be defined at the same time")
   }
@@ -362,6 +371,7 @@
   # - $name
   # - $aliases
   # - $_directories
+  # - $log_level
   # - $access_log
   # - $access_log_destination
   # - $_access_log_format
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8405e51cdc..3ce75c8d8d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -167,6 +167,12 @@
           :value => '/fake/log',
           :match => [/CustomLog \/fake\/log\//,/ErrorLog \/fake\/log\//],
         },
+        {
+          :title => 'should accept log_level',
+          :attr  => 'log_level',
+          :value => 'info',
+          :match => [/LogLevel info/],
+        },
         {
           :title => 'should accept pipe destination for access log',
           :attr  => 'access_log_pipe',
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index bb144ed35b..05f79d3051 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -35,7 +35,9 @@
 <% if @error_log -%>
   ErrorLog <%= @error_log_destination %>
 <% end -%>
-  LogLevel warn
+<% if @log_level -%>
+  LogLevel <%= @log_level %>
+<% end -%>
   ServerSignature Off
 <% if @access_log -%>
   CustomLog <%= @access_log_destination %> <%= @_access_log_format %>

From 8f40d3c1aa07e411ca665c5b0fb9fe02e7d121df Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 3 Dec 2013 17:37:53 -0800
Subject: [PATCH 0083/2267] Test that proxy_pass works

Given a `proxy_pass` statement for a vhost, it should be able to proxy
requests to another destination. This requires the proxy_http mod.
---
 manifests/vhost.pp        |  3 +++
 spec/system/vhost_spec.rb | 41 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9c3d7375a2..d9be71f291 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -300,6 +300,9 @@
     if ! defined(Class['apache::mod::proxy']) {
       include apache::mod::proxy
     }
+    if ! defined(Class['apache::mod::proxy_http']) {
+      include apache::mod::proxy_http
+    }
   }
 
   # Load mod_passenger if needed and not yet loaded
diff --git a/spec/system/vhost_spec.rb b/spec/system/vhost_spec.rb
index f5fdd2fe34..379600e887 100644
--- a/spec/system/vhost_spec.rb
+++ b/spec/system/vhost_spec.rb
@@ -245,4 +245,45 @@ class { 'apache': }
       end
     end
   end
+
+  context 'proxy_pass for alternative vhost' do
+    it 'should configure a local vhost and a proxy vhost' do
+      puppet_apply(%{
+        class { 'apache': default_vhost => false, }
+        apache::vhost { 'localhost':
+          docroot => '/var/www/local',
+          ip      => '127.0.0.1',
+          port    => '8888',
+        }
+        apache::listen { '*:80': }
+        apache::vhost { 'proxy.example.com':
+          docroot    => '/var/www',
+          port       => '80',
+          add_listen => false,
+          proxy_pass => {
+            'path' => '/',
+            'url'  => 'http://localhost.localdomain:8888/subdir/',
+          },
+        }
+        host { 'proxy.example.com': ip => '127.0.0.1', }
+        file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
+        file { '/var/www/local/subdir/index.html':
+          ensure  => file,
+          content => "Hello from localhost\\n",
+        }
+      }) { |r| [0,2].should include r.exit_code}
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    it 'should get a response from the back end' do
+      shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
+        r.stdout.should == "Hello from localhost\n"
+        r.exit_code.should == 0
+      end
+    end
+  end
 end

From e910f44eb7cc2ac18c9e7255ec678facba905861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 5 Dec 2013 12:29:08 +0100
Subject: [PATCH 0084/2267] localhost.localdomain is not known everwhere

not all systems come with a .localdomain, just use localhost instead
---
 spec/system/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/vhost_spec.rb b/spec/system/vhost_spec.rb
index 379600e887..3bab1cdbf2 100644
--- a/spec/system/vhost_spec.rb
+++ b/spec/system/vhost_spec.rb
@@ -262,7 +262,7 @@ class { 'apache': default_vhost => false, }
           add_listen => false,
           proxy_pass => {
             'path' => '/',
-            'url'  => 'http://localhost.localdomain:8888/subdir/',
+            'url'  => 'http://localhost:8888/subdir/',
           },
         }
         host { 'proxy.example.com': ip => '127.0.0.1', }

From 857bc545b133445d7fa24700ed9df1cf6ce01999 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <andreas.ntaflos@rise-world.com>
Date: Thu, 5 Dec 2013 18:14:49 +0100
Subject: [PATCH 0085/2267] Make LogLevel configurable for server

Add a class parameter `log_level` to `apache`, which defaults to `warn`.
This sets `LogLevel warn` server-wide in httpd.conf, which can then be
overridden on a per-vhost basis. Includes updated documentation.
---
 README.md                | 4 ++++
 manifests/init.pp        | 6 ++++++
 manifests/params.pp      | 3 +++
 templates/httpd.conf.erb | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 449b18627e..e08fe039d3 100644
--- a/README.md
+++ b/README.md
@@ -322,6 +322,10 @@ Amount of time the server will wait for subsequent requests on a persistent conn
 
 Changes the location of the directory Apache log files are placed in. Defaut is based on your OS.
 
+#####`log_level`
+
+Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are `emerg`, `alert`, `crit`, `error`, `warn`, `notice`, `info` or `debug`.
+
 #####`ports_file`
 
 Changes the name of the file containing Apache ports configuration. Default is `${conf_dir}/ports.conf`.
diff --git a/manifests/init.pp b/manifests/init.pp
index cf4596bf6d..cecb7c4502 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -50,6 +50,7 @@
   $keepalive            = $apache::params::keepalive,
   $keepalive_timeout    = $apache::params::keepalive_timeout,
   $logroot              = $apache::params::logroot,
+  $log_level            = $apache::params::log_level,
   $ports_file           = $apache::params::ports_file,
   $server_tokens        = 'OS',
   $server_signature     = 'On',
@@ -104,6 +105,11 @@
     }
   }
 
+  $valid_log_level_re = '(emerg|alert|crit|error|warn|notice|info|debug)'
+
+  validate_re($log_level, $valid_log_level_re,
+  "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
+
   class { 'apache::service':
     service_name   => $service_name,
     service_enable => $service_enable,
diff --git a/manifests/params.pp b/manifests/params.pp
index 2c41006835..f846013c12 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -32,6 +32,9 @@
     $servername = $::hostname
   }
 
+  # The default error log level
+  $log_level = 'warn'
+
   if $::osfamily == 'RedHat' or $::operatingsystem == 'amazon' {
     $user                 = 'apache'
     $group                = 'apache'
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 4ed753a8c3..469836ec34 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -29,7 +29,7 @@ AccessFileName .htaccess
 DefaultType none
 HostnameLookups Off
 ErrorLog <%= @logroot %>/<%= @error_log %>
-LogLevel warn
+LogLevel <%= @log_level %>
 EnableSendfile <%= @sendfile %>
 
 #Listen 80

From c02259fab454c9b497e872f7377cbcf87fe9f133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 14 Nov 2013 17:14:07 +0100
Subject: [PATCH 0086/2267] Support php_admin_(flag|value)s

Add support for php_admin_flags and php_admin_values to both
<VirtualHost> and directory context. Basic documentation & tests
for both cases included.

This Fixes #463
---
 README.md                        |  4 ++++
 manifests/vhost.pp               |  4 ++++
 spec/defines/vhost_spec.rb       | 36 ++++++++++++++++++++++++++++++++
 templates/vhost.conf.erb         |  1 +
 templates/vhost/_directories.erb | 11 ++++++++++
 templates/vhost/_php_admin.erb   | 12 +++++++++++
 6 files changed, 68 insertions(+)
 create mode 100644 templates/vhost/_php_admin.erb

diff --git a/README.md b/README.md
index e08fe039d3..3998fc90e6 100644
--- a/README.md
+++ b/README.md
@@ -780,6 +780,10 @@ This directive must be used with `suphp_engine => on` in the vhost declaration.
     }
 ```
 
+######`php_admin_value` and `php_admin_flag`
+
+Allows per-vhost (and per-directory) setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user, or an application.
+
 ######`custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5934a1d9a3..b6c77dc564 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -118,6 +118,8 @@
     $suphp_addhandler            = $apache::params::suphp_addhandler,
     $suphp_engine                = $apache::params::suphp_engine,
     $suphp_configpath            = $apache::params::suphp_configpath,
+    $php_admin_flags             = [],
+    $php_admin_values            = [],
     $no_proxy_uris               = [],
     $redirect_source             = '/',
     $redirect_dest               = undef,
@@ -389,6 +391,8 @@
   #   - $block
   # directories fragment:
   #   - $passenger_enabled
+  #   - $php_admin_flags
+  #   - $php_admin_values
   #   - $directories (a list of key-value hashes is expected)
   # fastcgi fragment:
   #   - $fastcgi_server
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3ce75c8d8d..370667dc81 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -502,6 +502,42 @@
           :value => 'on',
           :match => [/^  suPHP_Engine on$/],
         },
+        {
+          :title => 'should accept a php_admin_flags',
+          :attr  => 'php_admin_flags',
+          :value => { 'php_engine' => 'on' },
+          :match => [/^  php_admin_flag php_engine on$/],
+        },
+        {
+          :title => 'should accept php_admin_values',
+          :attr  => 'php_admin_values',
+          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
+          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
+        },
+        {
+          :title => 'should accept php_admin_flags in directories',
+          :attr  => 'directories',
+          :value => {
+						'path'            => '/srv/www',
+						'php_admin_flags' => { 'php_engine' => 'on' }
+					},
+          :match => [/^    php_admin_flag php_engine on$/],
+        },
+        {
+          :title => 'should accept php_admin_values',
+          :attr  => 'php_admin_values',
+          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
+          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
+        },
+        {
+          :title => 'should accept php_admin_values in directories',
+          :attr  => 'directories',
+          :value => {
+            'path'             => '/srv/www',
+            'php_admin_values' => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' }
+          },
+          :match => [/^    php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
+        },
         {
           :title => 'should accept a wsgi script alias',
           :attr  => 'wsgi_script_aliases',
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 05f79d3051..e8876fc4db 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -53,6 +53,7 @@
 <%= scope.function_template(['apache/vhost/_setenv.erb']) -%>
 <%= scope.function_template(['apache/vhost/_ssl.erb']) -%>
 <%= scope.function_template(['apache/vhost/_suphp.erb']) -%>
+<%= scope.function_template(['apache/vhost/_php_admin.erb']) -%>
 <%= scope.function_template(['apache/vhost/_requestheader.erb']) -%>
 <%= scope.function_template(['apache/vhost/_wsgi.erb']) -%>
 <%= scope.function_template(['apache/vhost/_custom_fragment.erb']) -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 023fa29c89..66a97dec83 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -53,6 +53,17 @@
     <%- if directory['passenger_enabled'] and directory['passenger_enabled'] != '' -%>
     PassengerEnabled <%= directory['passenger_enabled'] %>
     <%- end -%>
+    <%- if directory['php_admin_flags'] and ! directory['php_admin_flags'].empty? -%>
+      <%- directory['php_admin_flags'].each do |flag,value| -%>
+      <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
+    php_admin_flag <%= "#{flag} #{value}" %>
+      <%- end -%>
+    <%- end -%>
+    <%- if directory['php_admin_values'] and ! directory['php_admin_values'].empty? -%>
+      <%- directory['php_admin_values'].each do |key,value| -%>
+    php_admin_value <%= "#{key} #{value}" %>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['directoryindex'] and directory['directoryindex'] != '' -%>
     DirectoryIndex <%= directory['directoryindex'] %>
     <%- end -%>
diff --git a/templates/vhost/_php_admin.erb b/templates/vhost/_php_admin.erb
new file mode 100644
index 0000000000..59536cbc99
--- /dev/null
+++ b/templates/vhost/_php_admin.erb
@@ -0,0 +1,12 @@
+<% if @php_admin_values and not @php_admin_values.empty? -%>
+<% @php_admin_values.each do |key,value| -%>
+  php_admin_value <%= key %> <%= value %>
+<% end -%>
+<% end -%>
+<% if @php_admin_flags and not @php_admin_flags.empty? -%>
+<% @php_admin_flags.each do |key,flag| -%>
+<%# normalize flag -%>
+<% if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
+  php_admin_flag <%= key %> <%= flag %>
+<% end -%>
+<% end -%>

From ee13d0edca80565c9c35622e693f4e735b66cdb9 Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Mon, 2 Dec 2013 09:23:22 -0800
Subject: [PATCH 0087/2267] Revert "FM-103: Add metadata.json to all modules."

This reverts commit 9c5a684346c0a24a9485ae0ce1337705f3c7d1d1.

This caused problems with the mcollective module release, reverting
until this is proven to be a safe change.
---
 metadata.json | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 metadata.json

diff --git a/metadata.json b/metadata.json
deleted file mode 100644
index f7572b081e..0000000000
--- a/metadata.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "puppetlabs/apache",
-    "version": "0.9.0",
-    "summary": "Manage apache and mods",
-    "source": "git@github.com/puppetlabs/puppetlabs-apache.git",
-    "project_page": "http://github.com/puppetlabs/puppetlabs-apache",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "operatingsystem_support": [
-        "RedHat",
-        "OpenSUSE",
-        "SLES",
-        "SLED",
-        "Debian",
-        "Ubuntu"
-    ],
-    "puppet_version": [
-        2.7,
-        3.0,
-        3.1,
-        3.2,
-        3.3
-    ],
-    "dependencies": [
-        {
-            "name": "puppetlabs/stdlib",
-            "version_requirement": ">= 2.2.1"
-        },
-        {
-            "name": "puppetlabs/concat",
-            "version_requirement": ">= 1.0.0"
-        }
-    ]
-}

From 79b8806a47a4a4177489ecc1bd4005f819c5ccdd Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Wed, 27 Nov 2013 18:23:56 -0800
Subject: [PATCH 0088/2267] Release 0.10.0

Summary:

This release adds FreeBSD osfamily support and various other improvements to some mods.

Features:

- Add suPHP_UserGroup directive to directory context
- Add support for ScriptAliasMatch directives
- Set SSLOptions StdEnvVars in server context
- No implicit <Directory> entry for ScriptAlias path
- Add support for overriding ErrorDocument
- Add support for AliasMatch directives
- Disable default "allow from all" in vhost-directories
- Add WSGIPythonPath as an optional parameter to mod_wsgi.
- Add mod_rpaf support
- Add directives: IndexOptions, IndexOrderDefault
- Add ability to include additional external configurations in vhost
- need to use the provider variable not the provider key value from the directory hash for matches
- Support for FreeBSD and few other features
- Add new params to apache::mod::mime class
- Allow apache::mod to specify module id and path
- added $server_root parameter
- Add Allow and ExtendedStatus support to mod_status
- Expand vhost/_directories.pp directive support
- Add initial support for nss module (no directives in vhost template yet)
- added peruser and event mpms
- added $service_name parameter
- add parameter for TraceEnable
- Make LogLevel configurable for server and vhost
- Add documentation about $ip
- Add ability to pass ip (instead of wildcard) in default vhost files

Bugfixes:

- Don't listen on port or set NameVirtualHost for non-existent vhost
- only apply Directory defaults when provider is a directory
- Working mod_authnz_ldap support on Debian/Ubuntu
---
 CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++++
 Modulefile   |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4686ab21e..9528972ecd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,42 @@
+## 2013-12-05 Release 0.10.0
+### Summary:
+
+This release adds FreeBSD osfamily support and various other improvements to some mods.
+
+### Features:
+
+- Add suPHP_UserGroup directive to directory context
+- Add support for ScriptAliasMatch directives
+- Set SSLOptions StdEnvVars in server context
+- No implicit <Directory> entry for ScriptAlias path
+- Add support for overriding ErrorDocument
+- Add support for AliasMatch directives
+- Disable default "allow from all" in vhost-directories
+- Add WSGIPythonPath as an optional parameter to mod_wsgi. 
+- Add mod_rpaf support
+- Add directives: IndexOptions, IndexOrderDefault
+- Add ability to include additional external configurations in vhost
+- need to use the provider variable not the provider key value from the directory hash for matches
+- Support for FreeBSD and few other features
+- Add new params to apache::mod::mime class
+- Allow apache::mod to specify module id and path
+- added $server_root parameter
+- Add Allow and ExtendedStatus support to mod_status
+- Expand vhost/_directories.pp directive support
+- Add initial support for nss module (no directives in vhost template yet)
+- added peruser and event mpms
+- added $service_name parameter
+- add parameter for TraceEnable
+- Make LogLevel configurable for server and vhost
+- Add documentation about $ip
+- Add ability to pass ip (instead of wildcard) in default vhost files
+
+### Bugfixes:
+
+- Don't listen on port or set NameVirtualHost for non-existent vhost
+- only apply Directory defaults when provider is a directory
+- Working mod_authnz_ldap support on Debian/Ubuntu
+
 ## 2013-09-06 Release 0.9.0
 ### Summary:
 This release adds more parameters to the base apache class and apache defined
diff --git a/Modulefile b/Modulefile
index 800ccf5504..71bb19263f 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-apache'
-version '0.9.0'
+version '0.10.0'
 source 'git://github.com/puppetlabs/puppetlabs-apache.git'
 author 'puppetlabs'
 license 'Apache 2.0'

From baf6327e74c81d7c4b6a92182ae0dbffd4f61215 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 21 Nov 2013 14:26:24 -0800
Subject: [PATCH 0089/2267] Convert spec tests to beaker.

---
 Gemfile                                       |  5 +-
 Rakefile                                      |  1 -
 spec/acceptance/basic_spec.rb                 | 16 +++++
 spec/{system => acceptance}/class_spec.rb     | 18 ++---
 .../default_mods_spec.rb                      | 32 +++------
 spec/{system => acceptance}/itk_spec.rb       | 13 ++--
 spec/{system => acceptance}/mod_php_spec.rb   |  9 +--
 spec/{system => acceptance}/mod_suphp_spec.rb |  9 +--
 spec/acceptance/nodesets/centos-64-x64.yml    |  8 +++
 spec/acceptance/nodesets/default.yml          |  1 +
 .../nodesets/ubuntu-server-12042-x64.yml      |  8 +++
 spec/acceptance/nodesets/vagrant.key          | 27 ++++++++
 .../prefork_worker_spec.rb                    | 29 +++-----
 spec/{system => acceptance}/service_spec.rb   |  9 +--
 spec/{system => acceptance}/vhost_spec.rb     | 67 ++++++++++---------
 spec/spec_helper_acceptance.rb                | 27 ++++++++
 spec/spec_helper_system.rb                    | 28 --------
 spec/system/basic_spec.rb                     | 22 ------
 18 files changed, 167 insertions(+), 162 deletions(-)
 create mode 100644 spec/acceptance/basic_spec.rb
 rename spec/{system => acceptance}/class_spec.rb (78%)
 rename spec/{system => acceptance}/default_mods_spec.rb (70%)
 rename spec/{system => acceptance}/itk_spec.rb (70%)
 rename spec/{system => acceptance}/mod_php_spec.rb (89%)
 rename spec/{system => acceptance}/mod_suphp_spec.rb (87%)
 create mode 100644 spec/acceptance/nodesets/centos-64-x64.yml
 create mode 120000 spec/acceptance/nodesets/default.yml
 create mode 100644 spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 create mode 100644 spec/acceptance/nodesets/vagrant.key
 rename spec/{system => acceptance}/prefork_worker_spec.rb (72%)
 rename spec/{system => acceptance}/service_spec.rb (70%)
 rename spec/{system => acceptance}/vhost_spec.rb (85%)
 create mode 100644 spec/spec_helper_acceptance.rb
 delete mode 100644 spec/spec_helper_system.rb
 delete mode 100644 spec/system/basic_spec.rb

diff --git a/Gemfile b/Gemfile
index 7c8ea9e2ce..9dfc87712f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,10 +5,9 @@ group :development, :test do
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'serverspec',              :require => false
-  gem 'rspec-system',            :require => false
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
   gem 'puppet-lint',             :require => false
+  gem 'beaker',                  :require => false
+  gem 'beaker-rspec',            :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index bb60173e57..cd3d379958 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,2 +1 @@
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'rspec-system/rake_task'
diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
new file mode 100644
index 0000000000..29231771f8
--- /dev/null
+++ b/spec/acceptance/basic_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper_acceptance'
+
+describe 'basic tests:' do
+  pp = 'notice("foo")'
+  it { expect(apply_manifest(pp).exit_code).to eq(0) }
+end
+
+describe 'disable selinux:' do
+  pp = <<-EOS
+  exec { "setenforce 0":
+    path   => "/bin:/sbin:/usr/bin:/usr/sbin",
+    onlyif => "which setenforce && getenforce | grep Enforcing",
+  }
+  EOS
+  it { expect(apply_manifest(pp).exit_code).to eq(0) }
+end
diff --git a/spec/system/class_spec.rb b/spec/acceptance/class_spec.rb
similarity index 78%
rename from spec/system/class_spec.rb
rename to spec/acceptance/class_spec.rb
index 0e9afe543c..c22a0f329e 100644
--- a/spec/system/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -1,7 +1,7 @@
-require 'spec_helper_system'
+require 'spec_helper_acceptance'
 
 describe 'apache class' do
-  case node.facts['osfamily']
+  case fact('osfamily')
   when 'RedHat'
     package_name = 'httpd'
     service_name = 'httpd'
@@ -21,11 +21,8 @@ class { 'apache': }
       EOS
 
       # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
+      expect(apply_manifest(pp).exit_code).to_not eq(1)
+      expect(apply_manifest(pp).exit_code).to eq(0)
     end
 
     describe package(package_name) do
@@ -50,11 +47,8 @@ class { 'apache':
       EOS
 
       # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
+      expect(apply_manifest(pp).exit_code).to_not eq(1)
+      expect(apply_manifest(pp).exit_code).to eq(0)
     end
 
     describe service(service_name) do
diff --git a/spec/system/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
similarity index 70%
rename from spec/system/default_mods_spec.rb
rename to spec/acceptance/default_mods_spec.rb
index 9134fbb92f..8b88663b08 100644
--- a/spec/system/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -1,6 +1,6 @@
-require 'spec_helper_system'
+require 'spec_helper_acceptance'
 
-case node.facts['osfamily']
+case fact('osfamily')
 when 'RedHat'
   servicename = 'httpd'
 when 'Debian'
@@ -8,7 +8,7 @@
 when 'FreeBSD'
   servicename = 'apache22'
 else
-  raise "Unconfigured OS for apache service on #{node.facts['osfamily']}"
+  raise "Unconfigured OS for apache service on #{fact('osfamily')}"
 end
 
 describe 'apache::default_mods class' do
@@ -22,11 +22,8 @@ class { 'apache':
       EOS
 
       # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        [0,2].should include(r.exit_code)
-        r.refresh
-        r.exit_code.should be_zero
-      end
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      expect(apply_manifest(pp).exit_code).to eq(0)
     end
 
     describe service(servicename) do
@@ -51,17 +48,12 @@ class { 'apache':
         }
       EOS
 
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        [4,6].should include(r.exit_code)
-      end
+      apply_manifest(pp, { :acceptable_exit_codes => [4,6], :catch_failures => true })
     end
 
     describe "service #{servicename}" do
       it 'should not be running' do
-        shell("pidof #{servicename}") do |r|
-          r.exit_code.should eq(1)
-        end
+        shell("pidof #{servicename}", {:acceptable_exit_codes => 1})
       end
     end
   end
@@ -89,13 +81,9 @@ class { 'apache':
         }
       EOS
 
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        [0,2].should include(r.exit_code)
-        sleep 10 # avoid race condition on centos :(
-        r.refresh
-        r.exit_code.should be_zero
-      end
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      shell('sleep 10')
+      expect(apply_manifest(pp).exit_code).to eq(0)
     end
 
     describe service(servicename) do
diff --git a/spec/system/itk_spec.rb b/spec/acceptance/itk_spec.rb
similarity index 70%
rename from spec/system/itk_spec.rb
rename to spec/acceptance/itk_spec.rb
index 2d8765cf0a..dc77900846 100644
--- a/spec/system/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -1,6 +1,6 @@
-require 'spec_helper_system'
+require 'spec_helper_acceptance'
 
-case node.facts['osfamily']
+case fact('osfamily')
 when 'Debian'
   service_name = 'apache2'
 when 'FreeBSD'
@@ -21,12 +21,9 @@ class { 'apache':
           }
         EOS
 
-        # Run it twice and test for idempotency
-        puppet_apply(pp) do |r|
-          r.exit_code.should_not == 1
-          r.refresh
-          r.exit_code.should be_zero
-        end
+         # Run it twice and test for idempotency
+        expect([0,2]).to include (apply_manifest(pp).exit_code)
+        expect(apply_manifest(pp).exit_code).to eq(0)
       end
     end
 
diff --git a/spec/system/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
similarity index 89%
rename from spec/system/mod_php_spec.rb
rename to spec/acceptance/mod_php_spec.rb
index 9fad7c1487..d222269178 100644
--- a/spec/system/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,7 +1,7 @@
-require 'spec_helper_system'
+require 'spec_helper_acceptance'
 
 describe 'apache::mod::php class' do
-  case node.facts['osfamily']
+  case fact('osfamily')
   when 'Debian'
     mod_dir      = '/etc/apache2/mods-available'
     service_name = 'apache2'
@@ -15,7 +15,7 @@
 
   context "default php config" do
     it 'succeeds in puppeting php' do
-      puppet_apply(%{
+      pp= <<-EOS
         class { 'apache':
           mpm_module => 'prefork',
         }
@@ -29,7 +29,8 @@ class { 'apache::mod::php': }
           ensure  => file,
           content => "<?php phpinfo(); ?>\\n",
         }
-      }) { |r| [0,2].should include r.exit_code}
+      EOS
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
     end
 
     describe service(service_name) do
diff --git a/spec/system/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
similarity index 87%
rename from spec/system/mod_suphp_spec.rb
rename to spec/acceptance/mod_suphp_spec.rb
index 297b2d54aa..40c8376c58 100644
--- a/spec/system/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -1,11 +1,11 @@
-require 'spec_helper_system'
+require 'spec_helper_acceptance'
 
 describe 'apache::mod::suphp class' do
-  case node.facts['osfamily']
+  case fact('osfamily')
   when 'Debian'
     context "default suphp config" do
       it 'succeeds in puppeting suphp' do
-        puppet_apply(%{
+        pp = <<-EOS
           class { 'apache':
             mpm_module => 'prefork',
           }
@@ -22,7 +22,8 @@ class { 'apache::mod::suphp': }
             group   => 'puppet',
             content => "<?php echo get_current_user(); ?>\\n",
           }
-        }) { |r| [0,2].should include r.exit_code}
+        EOS
+        expect([0,2]).to include (apply_manifest(pp).exit_code)
       end
 
       describe service('apache2') do
diff --git a/spec/acceptance/nodesets/centos-64-x64.yml b/spec/acceptance/nodesets/centos-64-x64.yml
new file mode 100644
index 0000000000..8f57028b14
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-64-x64.yml
@@ -0,0 +1,8 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+    platform: el-6-i386
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
new file mode 120000
index 0000000000..2719644a6e
--- /dev/null
+++ b/spec/acceptance/nodesets/default.yml
@@ -0,0 +1 @@
+centos-64-x64.yml
\ No newline at end of file
diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
new file mode 100644
index 0000000000..2b8fe4a121
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
@@ -0,0 +1,8 @@
+HOSTS:
+  ubuntu-server-12042-x64:
+    roles:
+      - master
+    platform: ubuntu-server-12.04-amd64
+    box : ubuntu-server-12042-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
+    hypervisor : vagrant
diff --git a/spec/acceptance/nodesets/vagrant.key b/spec/acceptance/nodesets/vagrant.key
new file mode 100644
index 0000000000..7d6a083909
--- /dev/null
+++ b/spec/acceptance/nodesets/vagrant.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
+w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
+kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
+hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
+Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
+yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
+ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
+Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
+TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
+iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
+sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
+4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
+cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
+EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
+CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
+3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
+YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
+3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
+dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
+6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
+P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
+llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
+kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
+NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
+-----END RSA PRIVATE KEY-----
diff --git a/spec/system/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
similarity index 72%
rename from spec/system/prefork_worker_spec.rb
rename to spec/acceptance/prefork_worker_spec.rb
index 033e716197..59de6330dc 100644
--- a/spec/system/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -1,6 +1,6 @@
-require 'spec_helper_system'
+require 'spec_helper_acceptance'
 
-case node.facts['osfamily']
+case fact('osfamily')
 when 'RedHat'
   servicename = 'httpd'
 when 'Debian'
@@ -8,10 +8,10 @@
 when 'FreeBSD'
   servicename = 'apache22'
 else
-  raise "Unconfigured OS for apache service on #{node.facts['osfamily']}"
+  raise "Unconfigured OS for apache service on #{fact('osfamily')}"
 end
 
-case node.facts['osfamily']
+case fact('osfamily')
 when 'FreeBSD'
   describe 'apache::mod::event class' do
     describe 'running puppet code' do
@@ -24,11 +24,8 @@ class { 'apache':
         EOS
 
         # Run it twice and test for idempotency
-        puppet_apply(pp) do |r|
-          r.exit_code.should_not == 1
-          r.refresh
-          r.exit_code.should be_zero
-        end
+        expect([0,2]).to include (apply_manifest(pp).exit_code)
+        expect(apply_manifest(pp).exit_code).to eq(0)
       end
     end
 
@@ -50,11 +47,8 @@ class { 'apache':
       EOS
 
       # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      expect(apply_manifest(pp).exit_code).to eq(0)
     end
   end
 
@@ -75,11 +69,8 @@ class { 'apache':
       EOS
 
       # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      expect(apply_manifest(pp).exit_code).to eq(0)
     end
   end
 
diff --git a/spec/system/service_spec.rb b/spec/acceptance/service_spec.rb
similarity index 70%
rename from spec/system/service_spec.rb
rename to spec/acceptance/service_spec.rb
index 5f76600b35..e5e7c3bde7 100644
--- a/spec/system/service_spec.rb
+++ b/spec/acceptance/service_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_system'
+require 'spec_helper_acceptance'
 
 describe 'apache::service class' do
   describe 'adding dependencies in between the base class and service class' do
@@ -12,11 +12,8 @@ class { 'apache': }
       EOS
 
       # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        [0,2].should include(r.exit_code)
-        r.refresh
-        r.exit_code.should be_zero
-      end
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      expect(apply_manifest(pp).exit_code).to eq(0)
     end
   end
 end
diff --git a/spec/system/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
similarity index 85%
rename from spec/system/vhost_spec.rb
rename to spec/acceptance/vhost_spec.rb
index 3bab1cdbf2..e03badcf7e 100644
--- a/spec/system/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1,7 +1,7 @@
-require 'spec_helper_system'
+require 'spec_helper_acceptance'
 
 describe 'apache::vhost define' do
-  case node.facts['osfamily']
+  case fact('osfamily')
   when 'RedHat'
     vhost_dir = '/etc/httpd/conf.d'
     package_name = 'httpd'
@@ -18,9 +18,11 @@
 
   context "default vhost without ssl" do
     it 'should create a default vhost config' do
-      puppet_apply(%{
+      pp = <<-EOS
         class { 'apache': }
-      }) { |r| [0,2].should include r.exit_code}
+      EOS
+
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
     end
 
     describe file("#{vhost_dir}/15-default.conf") do
@@ -34,11 +36,12 @@ class { 'apache': }
 
   context 'default vhost with ssl' do
     it 'should create default vhost configs' do
-      puppet_apply(%{
+      pp = <<-EOS
         class { 'apache':
           default_ssl_vhost => true,
         }
-      }) { |r| [0,2].should include r.exit_code}
+      EOS
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
     end
 
     describe file("#{vhost_dir}/15-default.conf") do
@@ -53,13 +56,14 @@ class { 'apache':
 
   context 'new vhost on port 80' do
     it 'should configure an apache vhost' do
-      puppet_apply(%{
+      pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'first.example.com':
           port    => '80',
           docroot => '/var/www/first',
         }
-      }) { |r| [0,2].should include r.exit_code}
+      EOS
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
     end
 
     describe file("#{vhost_dir}/25-first.example.com.conf") do
@@ -70,7 +74,7 @@ class { 'apache': }
 
   context 'new proxy vhost on port 80' do
     it 'should configure an apache proxy vhost' do
-      puppet_apply(%{
+      pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'proxy.example.com':
           port    => '80',
@@ -79,7 +83,8 @@ class { 'apache': }
             { 'path' => '/foo', 'url' => 'http://backend-foo/'},
           ],
         }
-      }) { |r| [0,2].should include r.exit_code}
+      EOS
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
     end
 
     describe file("#{vhost_dir}/25-proxy.example.com.conf") do
@@ -92,7 +97,7 @@ class { 'apache': }
 
   context 'new vhost on port 80' do
     it 'should configure two apache vhosts' do
-      puppet_apply(%{
+      pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'first.example.com':
           port    => '80',
@@ -112,7 +117,8 @@ class { 'apache': }
           ensure  => file,
           content => "Hello from second\\n",
         }
-      }) { |r| [0,2].should include r.exit_code}
+      EOS
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
     end
 
     describe service(service_name) do
@@ -121,23 +127,21 @@ class { 'apache': }
     end
 
     it 'should answer to first.example.com' do
-      shell("/usr/bin/curl first.example.com:80") do |r|
+      shell("/usr/bin/curl first.example.com:80", {:acceptable_exit_codes => 0}) do |r|
         r.stdout.should == "Hello from first\n"
-        r.exit_code.should == 0
       end
     end
 
     it 'should answer to second.example.com' do
-      shell("/usr/bin/curl second.example.com:80") do |r|
+      shell("/usr/bin/curl second.example.com:80", {:acceptable_exit_codes => 0}) do |r|
         r.stdout.should == "Hello from second\n"
-        r.exit_code.should == 0
       end
     end
   end
 
   context 'apache_directories readme example, adapted' do
     it 'should configure a vhost with Files' do
-      puppet_apply(%{
+      pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'files.example.net':
           docroot     => '/var/www/files',
@@ -150,7 +154,8 @@ class { 'apache': }
           content => "Hello World\\n",
         }
         host { 'files.example.net': ip => '127.0.0.1', }
-      }) { |r| [0,2].should include r.exit_code}
+      EOS
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
     end
 
     describe service(service_name) do
@@ -159,19 +164,16 @@ class { 'apache': }
     end
 
     it 'should answer to files.example.net' do
-      shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak") do |r|
-        r.stderr.should =~ /curl: \(22\) The requested URL returned error: 403/
-        r.exit_code.should == 22
-      end
+      shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr.should =~ /curl: \(22\) The requested URL returned error: 403/
     end
 
   end
 
-  case node.facts['lsbdistcodename']
+  case fact('lsbdistcodename')
   when 'precise', 'wheezy'
     context 'vhost fallbackresouce example' do
       it 'should configure a vhost with Fallbackresource' do
-        puppet_apply(%{
+        pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'fallback.example.net':
           docroot         => '/var/www/fallback',
@@ -182,7 +184,8 @@ class { 'apache': }
           content => "Hello World\\n",
         }
         host { 'fallback.example.net': ip => '127.0.0.1', }
-                     }) { |r| [0,2].should include r.exit_code}
+        EOS
+        expect([0,2]).to include (apply_manifest(pp).exit_code)
       end
 
       describe service(service_name) do
@@ -191,9 +194,8 @@ class { 'apache': }
       end
 
       it 'should answer to fallback.example.net' do
-        shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist") do |r|
+        shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist", {:acceptable_exit_codes => 0}) do |r|
           r.stdout.should == "Hello World\n"
-          r.exit_code.should == 0
         end
       end
 
@@ -208,7 +210,7 @@ class { 'apache': }
 
   context 'virtual_docroot hosting separate sites' do
     it 'should configure a vhost with VirtualDocumentRoot' do
-      puppet_apply(%{
+      pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'virt.example.com':
           vhost_name      => '*',
@@ -223,7 +225,8 @@ class { 'apache': }
         file { [ '/var/www/virt/a', '/var/www/virt/b', ]: ensure => directory, }
         file { '/var/www/virt/a/index.html': ensure  => file, content => "Hello from a.virt\\n", }
         file { '/var/www/virt/b/index.html': ensure  => file, content => "Hello from b.virt\\n", }
-      }) { |r| [0,2].should include r.exit_code}
+      EOS
+      expect([0,2]).to include (apply_manifest(pp).exit_code)
     end
 
     describe service(service_name) do
@@ -232,16 +235,14 @@ class { 'apache': }
     end
 
     it 'should answer to a.virt.example.com' do
-      shell("/usr/bin/curl a.virt.example.com:80") do |r|
+      shell("/usr/bin/curl a.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
         r.stdout.should == "Hello from a.virt\n"
-        r.exit_code.should == 0
       end
     end
 
     it 'should answer to b.virt.example.com' do
-      shell("/usr/bin/curl b.virt.example.com:80") do |r|
+      shell("/usr/bin/curl b.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
         r.stdout.should == "Hello from b.virt\n"
-        r.exit_code.should == 0
       end
     end
   end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
new file mode 100644
index 0000000000..5cac72c4fb
--- /dev/null
+++ b/spec/spec_helper_acceptance.rb
@@ -0,0 +1,27 @@
+require 'beaker-rspec/spec_helper'
+require 'beaker-rspec/helpers/serverspec'
+
+hosts.each do |host|
+  # Install Puppet
+  install_package host, 'rubygems'
+  on host, 'gem install puppet --no-ri --no-rdoc'
+  on host, "mkdir -p #{host['distmoduledir']}"
+end
+
+RSpec.configure do |c|
+  # Project root
+  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  # Readable test descriptions
+  c.formatter = :documentation
+
+  # Configure all nodes in nodeset
+  c.before :suite do
+    # Install module and dependencies
+    puppet_module_install(:source => proj_root, :module_name => 'apache')
+    hosts.each do |host|
+      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
+    end
+  end
+end
diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb
deleted file mode 100644
index 55d51145a1..0000000000
--- a/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-require 'rspec-system-serverspec/helpers'
-include Serverspec::Helper::RSpecSystem
-include Serverspec::Helper::DetectOS
-include RSpecSystemPuppet::Helpers
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  c.include RSpecSystemPuppet::Helpers
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-
-    # Install modules and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'apache')
-    shell('puppet module install puppetlabs-concat --version 1.0.0')
-    shell('puppet module install puppetlabs-stdlib --version 2.4.0')
-  end
-end
-
diff --git a/spec/system/basic_spec.rb b/spec/system/basic_spec.rb
deleted file mode 100644
index a87f908411..0000000000
--- a/spec/system/basic_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper_system'
-
-describe 'basic tests:' do
-  # Using puppet_apply as a subject
-  context puppet_apply 'notice("foo")' do
-    its(:stdout) { should =~ /foo/ }
-    its(:stderr) { should be_empty }
-    its(:exit_code) { should be_zero }
-  end
-end
-
-describe 'disable selinux:' do
-  context puppet_apply '
-  exec { "setenforce 0":
-    path   => "/bin:/sbin:/usr/bin:/usr/sbin",
-    onlyif => "which setenforce && getenforce | grep Enforcing",
-  }
-  ' do
-    its(:stderr) { should be_empty }
-    its(:exit_code) { should_not == 1 }
-  end
-end

From 78c9d7c51bff0558725e9ab015249974484c4932 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 6 Dec 2013 16:50:25 -0800
Subject: [PATCH 0090/2267] Update for the latest gems

---
 spec/acceptance/basic_spec.rb          | 20 ++++++++------------
 spec/acceptance/class_spec.rb          |  9 ++++-----
 spec/acceptance/default_mods_spec.rb   | 14 +++++++++-----
 spec/acceptance/itk_spec.rb            |  4 ++--
 spec/acceptance/mod_php_spec.rb        |  2 +-
 spec/acceptance/mod_suphp_spec.rb      |  2 +-
 spec/acceptance/prefork_worker_spec.rb | 12 ++++++------
 spec/acceptance/service_spec.rb        |  4 ++--
 spec/acceptance/vhost_spec.rb          | 22 +++++++++++-----------
 9 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
index 29231771f8..bc456e9ed1 100644
--- a/spec/acceptance/basic_spec.rb
+++ b/spec/acceptance/basic_spec.rb
@@ -1,16 +1,12 @@
 require 'spec_helper_acceptance'
 
-describe 'basic tests:' do
-  pp = 'notice("foo")'
-  it { expect(apply_manifest(pp).exit_code).to eq(0) }
-end
-
 describe 'disable selinux:' do
-  pp = <<-EOS
-  exec { "setenforce 0":
-    path   => "/bin:/sbin:/usr/bin:/usr/sbin",
-    onlyif => "which setenforce && getenforce | grep Enforcing",
-  }
-  EOS
-  it { expect(apply_manifest(pp).exit_code).to eq(0) }
+  it "because otherwise apache won't work" do
+    apply_manifest(%{
+      exec { "setenforce 0":
+        path   => "/bin:/sbin:/usr/bin:/usr/sbin",
+        onlyif => "which setenforce && getenforce | grep Enforcing",
+      }
+    }, :catch_failures => true)
+  end
 end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index c22a0f329e..62107ed61b 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -14,15 +14,14 @@
   end
 
   context 'default parameters' do
-    # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
       class { 'apache': }
       EOS
 
       # Run it twice and test for idempotency
-      expect(apply_manifest(pp).exit_code).to_not eq(1)
-      expect(apply_manifest(pp).exit_code).to eq(0)
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
     describe package(package_name) do
@@ -47,8 +46,8 @@ class { 'apache':
       EOS
 
       # Run it twice and test for idempotency
-      expect(apply_manifest(pp).exit_code).to_not eq(1)
-      expect(apply_manifest(pp).exit_code).to eq(0)
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
     describe service(service_name) do
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 8b88663b08..df6463eca4 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -22,8 +22,8 @@ class { 'apache':
       EOS
 
       # Run it twice and test for idempotency
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
-      expect(apply_manifest(pp).exit_code).to eq(0)
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
     describe service(servicename) do
@@ -48,9 +48,13 @@ class { 'apache':
         }
       EOS
 
-      apply_manifest(pp, { :acceptable_exit_codes => [4,6], :catch_failures => true })
+      apply_manifest(pp, { :expect_failures => true })
     end
 
+    # Are these the same?
+    describe service(servicename) do
+      it { should_not be_running }
+    end
     describe "service #{servicename}" do
       it 'should not be running' do
         shell("pidof #{servicename}", {:acceptable_exit_codes => 1})
@@ -81,9 +85,9 @@ class { 'apache':
         }
       EOS
 
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
       shell('sleep 10')
-      expect(apply_manifest(pp).exit_code).to eq(0)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
     describe service(servicename) do
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index dc77900846..cabd71c5c6 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -22,8 +22,8 @@ class { 'apache':
         EOS
 
          # Run it twice and test for idempotency
-        expect([0,2]).to include (apply_manifest(pp).exit_code)
-        expect(apply_manifest(pp).exit_code).to eq(0)
+        apply_manifest(pp, :catch_failures => true)
+        expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
       end
     end
 
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index d222269178..f9c6f2c7f2 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -30,7 +30,7 @@ class { 'apache::mod::php': }
           content => "<?php phpinfo(); ?>\\n",
         }
       EOS
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
     end
 
     describe service(service_name) do
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 40c8376c58..84a641db59 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -23,7 +23,7 @@ class { 'apache::mod::suphp': }
             content => "<?php echo get_current_user(); ?>\\n",
           }
         EOS
-        expect([0,2]).to include (apply_manifest(pp).exit_code)
+        apply_manifest(pp, :catch_failures => true)
       end
 
       describe service('apache2') do
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 59de6330dc..8427fd045a 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -24,8 +24,8 @@ class { 'apache':
         EOS
 
         # Run it twice and test for idempotency
-        expect([0,2]).to include (apply_manifest(pp).exit_code)
-        expect(apply_manifest(pp).exit_code).to eq(0)
+        apply_manifest(pp, :catch_failures => true)
+        expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
       end
     end
 
@@ -47,8 +47,8 @@ class { 'apache':
       EOS
 
       # Run it twice and test for idempotency
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
-      expect(apply_manifest(pp).exit_code).to eq(0)
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
   end
 
@@ -69,8 +69,8 @@ class { 'apache':
       EOS
 
       # Run it twice and test for idempotency
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
-      expect(apply_manifest(pp).exit_code).to eq(0)
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
   end
 
diff --git a/spec/acceptance/service_spec.rb b/spec/acceptance/service_spec.rb
index e5e7c3bde7..c3124c8461 100644
--- a/spec/acceptance/service_spec.rb
+++ b/spec/acceptance/service_spec.rb
@@ -12,8 +12,8 @@ class { 'apache': }
       EOS
 
       # Run it twice and test for idempotency
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
-      expect(apply_manifest(pp).exit_code).to eq(0)
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
   end
 end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e03badcf7e..42d98033a0 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -22,7 +22,7 @@
         class { 'apache': }
       EOS
 
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
     end
 
     describe file("#{vhost_dir}/15-default.conf") do
@@ -41,7 +41,7 @@ class { 'apache':
           default_ssl_vhost => true,
         }
       EOS
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
     end
 
     describe file("#{vhost_dir}/15-default.conf") do
@@ -63,7 +63,7 @@ class { 'apache': }
           docroot => '/var/www/first',
         }
       EOS
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
     end
 
     describe file("#{vhost_dir}/25-first.example.com.conf") do
@@ -84,7 +84,7 @@ class { 'apache': }
           ],
         }
       EOS
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
     end
 
     describe file("#{vhost_dir}/25-proxy.example.com.conf") do
@@ -118,7 +118,7 @@ class { 'apache': }
           content => "Hello from second\\n",
         }
       EOS
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
     end
 
     describe service(service_name) do
@@ -155,7 +155,7 @@ class { 'apache': }
         }
         host { 'files.example.net': ip => '127.0.0.1', }
       EOS
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
     end
 
     describe service(service_name) do
@@ -185,7 +185,7 @@ class { 'apache': }
         }
         host { 'fallback.example.net': ip => '127.0.0.1', }
         EOS
-        expect([0,2]).to include (apply_manifest(pp).exit_code)
+        apply_manifest(pp, :catch_failures => true)
       end
 
       describe service(service_name) do
@@ -194,7 +194,7 @@ class { 'apache': }
       end
 
       it 'should answer to fallback.example.net' do
-        shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist", {:acceptable_exit_codes => 0}) do |r|
+        shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist") do |r|
           r.stdout.should == "Hello World\n"
         end
       end
@@ -226,7 +226,7 @@ class { 'apache': }
         file { '/var/www/virt/a/index.html': ensure  => file, content => "Hello from a.virt\\n", }
         file { '/var/www/virt/b/index.html': ensure  => file, content => "Hello from b.virt\\n", }
       EOS
-      expect([0,2]).to include (apply_manifest(pp).exit_code)
+      apply_manifest(pp, :catch_failures => true)
     end
 
     describe service(service_name) do
@@ -249,7 +249,7 @@ class { 'apache': }
 
   context 'proxy_pass for alternative vhost' do
     it 'should configure a local vhost and a proxy vhost' do
-      puppet_apply(%{
+      apply_manifest(%{
         class { 'apache': default_vhost => false, }
         apache::vhost { 'localhost':
           docroot => '/var/www/local',
@@ -272,7 +272,7 @@ class { 'apache': default_vhost => false, }
           ensure  => file,
           content => "Hello from localhost\\n",
         }
-      }) { |r| [0,2].should include r.exit_code}
+      }, :catch_failures => true)
     end
 
     describe service(service_name) do

From 7a4701d040ab28dde915192b49742ca789b11cd5 Mon Sep 17 00:00:00 2001
From: amvapor <amvapor@gmail.com>
Date: Fri, 20 Sep 2013 10:27:35 -0400
Subject: [PATCH 0091/2267] Setting up the ability to do multiple rewrites and
 conditions.

Depricating old rewrite_rule declaration in favour of a new rewrite declaration
Adds ability to inject comments directly above rewrite directives
Adds ability to define multiple rewrite rules
Adds ability to define multiple rewrite conditions on a rule set
---
 README.md                    | 64 ++++++++++++++++++++++++++++++------
 manifests/vhost.pp           | 50 ++++++++++++++++++++++++----
 spec/defines/vhost_spec.rb   | 63 +++++++++++++++++++++++++++++++++++
 templates/vhost/_rewrite.erb | 30 +++++++++++++++--
 tests/vhost.pp               | 22 ++++++++++++-
 5 files changed, 209 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index e08fe039d3..b567ef0c9a 100644
--- a/README.md
+++ b/README.md
@@ -969,44 +969,88 @@ Specifies additional request headers.
 
 #####`rewrite_base`
 
-Limits the `rewrite_rule` to the specified base URL. Defaults to 'undef'.
+Limits the `rewrites` to the specified base URL. Defaults to 'undef'.
 
 ```puppet
     apache::vhost { 'site.name.fdqn':
       …
-      rewrite_rule => '^index\.html$ welcome.html',
       rewrite_base => '/blog/',
+      rewrites => [
+        { rewrite_rule => ['^index\.html$ welcome.html'] }
+      ]
     }
 ```
 
 The above example would limit the index.html -> welcome.html rewrite to only something inside of http://example.com/blog/.
 
-#####`rewrite_cond`
+#####`rewrites`
 
-Rewrites a URL via `rewrite_rule` based on the truth of specified conditions. For example
+Creates URL rewrite rules. Defaults to 'undef'. This parameter allows you to specify, for example, that anyone trying to access index.html will be served welcome.html.
 
 ```puppet
     apache::vhost { 'site.name.fdqn':
       …
-      rewrite_cond => '%{HTTP_USER_AGENT} ^MSIE',
+      rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
     }
 ```
 
-will rewrite URLs only if the visitor is using IE. Defaults to 'undef'.
+Allows rewrite conditions, that when true, will execute the associated rule. For example
 
-*Note*: At the moment, each vhost is limited to a single list of rewrite conditions. In the future, you will be able to specify multiple `rewrite_cond` and `rewrite_rules` per vhost, so that different conditions get different rewrites.
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      rewrites => [
+        {
+          comment       => 'redirect IE',
+          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+          rewrite_rule => ['^index\.html$ welcome.html'],
+        }
+      ]
+    }
+```
 
-#####`rewrite_rule`
+will rewrite URLs only if the visitor is using IE.
 
-Creates URL rewrite rules. Defaults to 'undef'. This parameter allows you to specify, for example, that anyone trying to access index.html will be served welcome.html.
+Multiple conditions can be applied, the following will rewrite index.html to welcome.html only when the browser is lynx or mozilla version 1 or 2
 
 ```puppet
     apache::vhost { 'site.name.fdqn':
       …
-      rewrite_rule => '^index\.html$ welcome.html',
+      rewrites => [
+        {
+          comment       => 'Lynx or Mozilla v1/2',
+          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+          rewrite_rule => ['^index\.html$ welcome.html'],
+        }
+      ]
     }
 ```
 
+Multiple rewrites and conditions are also possible
+
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      rewrites => [
+        {
+          comment       => 'Lynx or Mozilla v1/2',
+          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+          rewrite_rule => ['^index\.html$ welcome.html'],
+        },
+        {
+          comment       => 'Internet Explorer',
+          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+          rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+        },
+        }
+          rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
+        }
+     ] 
+    }
+```
+
+refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions
+
 #####`scriptalias`
 
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin'
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5934a1d9a3..cac014d4e3 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -44,6 +44,24 @@
 #    docroot => '/path/to/docroot',
 #  }
 #
+#  # Multiple Mod Rewrites:
+#  apache::vhost { 'site.name.fqdn':
+#    port => '80',
+#    docroot => '/path/to/docroot',
+#    rewrites => [
+#      {
+#        comment       => 'force www domain',
+#        rewrite_cond => ['%{HTTP_HOST} ^([a-z.]+)?example.com$ [NC]', '%{HTTP_HOST} !^www. [NC]'],
+#        rewrite_rule => ['.? http://www.%1example.com%{REQUEST_URI} [R=301,L]']
+#      },
+#      {
+#        comment       => 'prevent image hotlinking',
+#        rewrite_cond => ['%{HTTP_REFERER} !^$', '%{HTTP_REFERER} !^http://(www.)?example.com/ [NC]'],
+#        rewrite_rule => ['.(gif|jpg|png)$ - [F]']
+#      },
+#    ]
+#  }
+#
 #  # SSL vhost with non-SSL rewrite:
 #  apache::vhost { 'site.name.fqdn':
 #    port    => '443',
@@ -52,8 +70,13 @@
 #  }
 #  apache::vhost { 'site.name.fqdn':
 #    port          => '80',
-#    rewrite_cond => '%{HTTPS} off',
-#    rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
+#    rewrites => [
+#      {
+#        comment       => "redirect non-SSL traffic to SSL site",
+#        rewrite_cond => ['%{HTTPS} off'],
+#        rewrite_rule => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}']
+#      }
+#    ]
 #  }
 #  apache::vhost { 'site.name.fqdn':
 #    port            => '80',
@@ -124,6 +147,7 @@
     $redirect_status             = undef,
     $rack_base_uris              = undef,
     $request_headers             = undef,
+    $rewrites                    = undef,
     $rewrite_rule                = undef,
     $rewrite_cond                = undef,
     $setenv                      = [],
@@ -159,6 +183,19 @@
   validate_bool($ssl)
   validate_bool($default_vhost)
   validate_bool($ssl_proxyengine)
+  if $rewrites {
+    validate_array($rewrites)
+    validate_hash($rewrites[0])
+  }
+
+  # Deprecated backwards-compatibility
+  if $rewrite_rule {
+    warning('Apache::Vhost: parameter rewrite_rule is deprecated in favor of rewrites')
+  }
+  if $rewrite_cond {
+    warning('Apache::Vhost parameter rewrite_cond is deprecated in favor of rewrites')
+  }
+
   if $wsgi_script_aliases {
     validate_hash($wsgi_script_aliases)
   }
@@ -292,9 +329,9 @@
   }
 
   # Load mod_rewrite if needed and not yet loaded
-  if $rewrite_rule {
-    if ! defined(Class['apache::mod::rewrite']) {
-      include apache::mod::rewrite
+  if $rewrites or $rewrite_cond {
+    if ! defined(Apache::Mod['rewrite']) {
+      apache::mod { 'rewrite': }
     }
   }
 
@@ -406,8 +443,7 @@
   # requestheader fragment:
   #   - $request_headers
   # rewrite fragment:
-  #   - $rewrite_rule
-  #   - $rewrite_cond
+  #   - $rewrites
   # scriptalias fragment:
   #   - $scriptalias
   #   - $scriptaliases
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3ce75c8d8d..0fc921f14c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -414,6 +414,40 @@
           :value => 'not a real rule',
           :match => [/^  RewriteRule not a real rule$/],
         },
+        {
+          :title => 'should accept rewrite rules',
+          :attr  => 'rewrites',
+          :value => [{'rewrite_rule' => ['not a real rule']}],
+          :match => [/^  RewriteRule not a real rule$/],
+        },
+        {
+          :title => 'should accept rewrite comment',
+          :attr  => 'rewrites',
+          :value => [{'comment' => 'rewrite comment', 'rewrite_rule' => ['not a real rule']}],
+          :match => [/^  #rewrite comment/],
+        },
+        {
+          :title => 'should accept rewrite conditions',
+          :attr  => 'rewrites',
+          :value => [{'comment' => 'redirect IE', 'rewrite_cond' => ['%{HTTP_USER_AGENT} ^MSIE'], 'rewrite_rule' => ['^index\.html$ welcome.html'],}],
+          :match => [
+            /^  #redirect IE$/,
+            /^  RewriteCond %{HTTP_USER_AGENT} \^MSIE$/,
+            /^  RewriteRule \^index\\\.html\$ welcome.html$/,
+          ],
+        },
+        {
+          :title => 'should accept multiple rewrites',
+          :attr  => 'rewrites',
+          :value => [
+            {'rewrite_rule' => ['not a real rule']},
+            {'rewrite_rule' => ['not a real rule two']},
+          ],
+          :match => [
+            /^  RewriteRule not a real rule$/,
+            /^  RewriteRule not a real rule two$/,
+          ],
+        },
         {
           :title => 'should block scm',
           :attr  => 'block',
@@ -850,6 +884,35 @@
         end
       end
 
+      describe 'when rewrites are specified' do
+        let :params do default_params.merge({
+          :rewrites => [
+            {
+              'comment'       => 'test rewrites',
+              'rewrite_cond' => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+              'rewrite_rule' => ['^index\.html$ welcome.html', '^index\.cgi$ index.php'],
+            }
+          ]
+        }) end
+        it 'should set RewriteConds and RewriteRules' do
+          should contain_file("25-#{title}.conf").with_content(
+            /^  #test rewrites$/
+          )
+          should contain_file("25-#{title}.conf").with_content(
+            /^  RewriteCond %\{HTTP_USER_AGENT\} \^Lynx\/ \[OR\]$/
+          )
+          should contain_file("25-#{title}.conf").with_content(
+            /^  RewriteCond %\{HTTP_USER_AGENT\} \^Mozilla\/\[12\]$/
+          )
+          should contain_file("25-#{title}.conf").with_content(
+            /^  RewriteRule \^index\\.html\$ welcome.html$/
+          )
+          should contain_file("25-#{title}.conf").with_content(
+            /^  RewriteRule \^index\\.cgi\$ index.php$/
+          )
+        end
+      end
+
       describe 'when rewrite_rule and rewrite_cond are specified' do
         let :params do default_params.merge({
           :rewrite_cond => '%{HTTPS} off',
diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index a39db1c96e..dbb437c1d6 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -1,5 +1,31 @@
-<% if @rewrite_rule -%>
+<% if @rewrites -%>
+  ## Rewrite rules
+  RewriteEngine On
+<% if @rewrite_base -%>
+  RewriteBase <%= @rewrite_base %>
+<% end -%>
+
+<% [@rewrites].flatten.compact.each do |rewrite_details| -%>
+<% if rewrite_details['comment'] -%>
+  #<%= rewrite_details['comment'] %>
+<% end -%>
+<% if rewrite_details['rewrite_cond'] -%>
+<%- Array(rewrite_details['rewrite_cond']).each do |commands| -%>
+<%- Array(commands).each do |command| -%>
+  RewriteCond <%= command %>
+<%- end -%>
+<% end -%>
+<% end -%>
+<%- Array(rewrite_details['rewrite_rule']).each do |commands| -%>
+<%- Array(commands).each do |command| -%>
+  RewriteRule <%= command %>
+<%- end -%>
 
+<% end -%>
+<% end -%>
+<%- end -%>
+<%# reverse compatibility %>
+<% if @rewrite_rule and !@rewrites -%>
   ## Rewrite rules
   RewriteEngine On
 <% if @rewrite_base -%>
@@ -11,4 +37,4 @@
 <% end -%>
 <% end -%>
   RewriteRule <%= @rewrite_rule %>
-<% end -%>
+<%- end -%>
diff --git a/tests/vhost.pp b/tests/vhost.pp
index 153a213dd2..0c801b4f0a 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -142,13 +142,33 @@
 
 # Vhost to redirect non-ssl to ssl
 apache::vhost { 'sixteenth.example.com non-ssl':
+  servername   => 'sixteenth.example.com',
+  port         => '80',
+  docroot      => '/var/www/sixteenth',
+  rewrites     => [
+    {
+      comment       => "redirect non-SSL traffic to SSL site",
+      rewrite_cond => ['%{HTTPS} off'],
+      rewrite_rule => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}'],
+    }
+  ]
+}
+apache::vhost { 'sixteenth.example.com ssl':
+  servername => 'sixteenth.example.com',
+  port       => '443',
+  docroot    => '/var/www/sixteenth',
+  ssl        => true,
+}
+
+# Vhost to redirect non-ssl to ssl using old rewrite method
+apache::vhost { 'sixteenth.example.com non-ssl old rewrite':
   servername   => 'sixteenth.example.com',
   port         => '80',
   docroot      => '/var/www/sixteenth',
   rewrite_cond => '%{HTTPS} off',
   rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
 }
-apache::vhost { 'sixteenth.example.com ssl':
+apache::vhost { 'sixteenth.example.com ssl old rewrite':
   servername => 'sixteenth.example.com',
   port       => '443',
   docroot    => '/var/www/sixteenth',

From db4e9eed87837c162eda86e3e3d0628c6b2c49bb Mon Sep 17 00:00:00 2001
From: Pablo Fredrikson <pfredrikson@brivincorp.com>
Date: Tue, 10 Dec 2013 11:40:41 -0300
Subject: [PATCH 0092/2267] added redirectmatch support

---
 manifests/vhost.pp            |  2 ++
 spec/defines/vhost_spec.rb    | 14 ++++++++++++++
 templates/vhost/_redirect.erb | 12 ++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index cac014d4e3..c5908ea975 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -145,6 +145,8 @@
     $redirect_source             = '/',
     $redirect_dest               = undef,
     $redirect_status             = undef,
+    $redirectmatch_status        = undef,
+    $redirectmatch_regexp        = undef,
     $rack_base_uris              = undef,
     $request_headers             = undef,
     $rewrites                    = undef,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 0fc921f14c..463800c8b0 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1063,6 +1063,20 @@
           it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/login} }
           it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
         end
+        describe 'redirect match rules' do
+          let :params do
+            default_params.merge({
+              :redirectmatch_status => [
+                '404',
+              ],
+              :redirectmatch_regexp   => [
+                '/\.git(/.*|$)',
+              ],
+            })
+          end
+
+          it { should contain_file("25-#{title}.conf").with_content %r{  RedirectMatch 404 } }
+        end
         describe 'without a status' do
           let :params do
             default_params.merge({
diff --git a/templates/vhost/_redirect.erb b/templates/vhost/_redirect.erb
index 66eee5e6d8..e865bd9afa 100644
--- a/templates/vhost/_redirect.erb
+++ b/templates/vhost/_redirect.erb
@@ -10,3 +10,15 @@
   Redirect <%= "#{@redirect_status_a[i]} " %><%= source %> <%= @redirect_dest_a[i] %>
 <% end -%>
 <% end -%>
+
+<%- if @redirectmatch_status and @redirectmatch_regexp -%>
+<% @redirectmatch_status_a = Array(@redirectmatch_status) -%>
+<% @redirectmatch_regexp_a = Array(@redirectmatch_regexp) -%>
+
+  ## RedirectMatch rules
+<% @redirectmatch_status_a.each_with_index do |status, i| -%>
+<% @redirectmatch_status_a[i] ||= @redirectmatch_status_a[0] -%>
+<% @redirectmatch_regexp_a[i] ||= @redirectmatch_regexp_a[0] -%>
+  RedirectMatch <%= "#{@redirectmatch_status_a[i]} " %> <%= @redirectmatch_regexp_a[i] %>
+<% end -%>
+<% end -%>

From ee65f518a321d01cdaee1a6654ac052e81c5fd14 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 12 Dec 2013 19:40:40 -0500
Subject: [PATCH 0093/2267] Fix $ports_file reference in Namevirtualhost.

This define was pointing at the params::ports_file version of the
variable, rather than the one defined in the main class, making it
impossible to correctly override.
---
 manifests/namevirtualhost.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index edbbfe4cf2..f5f0dad538 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -1,10 +1,9 @@
 define apache::namevirtualhost {
   $addr_port = $name
-  include apache::params
 
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
-    target  => $apache::params::ports_file,
+    target  => $apache::ports_file,
     content => template('apache/namevirtualhost.erb'),
   }
 }

From f2f22a28afe298c837829cb3731c72eba9919265 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 12 Dec 2013 19:49:45 -0500
Subject: [PATCH 0094/2267] Fix $ports_file reference in apache::listen.

This was pointing at ::params::ports_file instead of the main class,
causing relocation of the ports file to fail.
---
 manifests/listen.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/listen.pp b/manifests/listen.pp
index 57982ba269..3189fa8f77 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -1,10 +1,9 @@
 define apache::listen {
   $listen_addr_port = $name
-  include apache::params
 
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
-    target  => $apache::params::ports_file,
+    target  => $apache::ports_file,
     content => template('apache/listen.erb'),
   }
 }

From fc760acb9af5a616523bdda2926bcbc7a0e76a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Fri, 13 Dec 2013 18:28:38 +0100
Subject: [PATCH 0095/2267] update CONTRIBUTING with information about beaker

beaker has replaced our rspec-system tests. These new tests are run
differently. Before messing with our Rakefile, a good start is to just
document it.
---
 CONTRIBUTING.md | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ecf012ce90..be61e30aeb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -162,7 +162,13 @@ Use `bundle show [gemname]` to see where a bundled gem is installed.
 
 NOTE some systems may require you to run this command with sudo.
 
-With all dependencies installed we can now run the tests:
+If you already have those gems installed, make sure they are up-to-date:
+
+```shell
+% bundle update
+```
+
+With all dependencies in place and up-to-date we can now run the tests:
 
 ```shell
 % rake spec
@@ -174,7 +180,7 @@ and so on. rspec tests may have the same kind of dependencies as the
 module they are testing. While the module defines in its [Modulefile](./Modulefile),
 rspec tests define them in [.fixtures.yml](./fixtures.yml).
 
-Some puppet modules also come with [rspec-system](https://github.com/puppetlabs/rspec-system)
+Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
 tests. These tests spin up a virtual machine under
 [VirtualBox](https://www.virtualbox.org/)) with, controlling it with
 [Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
@@ -184,12 +190,13 @@ installed on your system.
 You can run them by issuing the following command
 
 ```shell
-% rake spec:system
+% rake spec_clean
+% rspec spec/acceptance
 ```
 
 This will now download a pre-fabricated image configured in [.nodeset.yml](./.nodeset.yml),
-install puppet, copy this module and install its dependencies per [spec/spec_helper_system.rb](./spec/spec_helper_system.rb)
-and then run all the tests under [spec/system](./spec/system).
+install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
+and then run all the tests under [spec/acceptance](./spec/acceptance).
 
 Writing Tests
 -------------
@@ -217,8 +224,6 @@ Additional Resources
 
 * [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
 
-* [Bug tracker (Redmine)](http://projects.puppetlabs.com/projects/modules)
-
 * [Patchwork](https://patchwork.puppetlabs.com)
 
 * [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)

From a70e4be7f9480e7ea474fc55d258b527188046bf Mon Sep 17 00:00:00 2001
From: chieping <takashi.honda.01@gmail.com>
Date: Fri, 6 Dec 2013 19:05:41 +0900
Subject: [PATCH 0096/2267] Support environment variable control for CustomLog

---
 README.md                  | 4 ++++
 manifests/vhost.pp         | 5 +++++
 spec/defines/vhost_spec.rb | 6 ++++++
 templates/vhost.conf.erb   | 4 +++-
 tests/vhost.pp             | 8 ++++++++
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8fae13e49d..7b04660a98 100644
--- a/README.md
+++ b/README.md
@@ -488,6 +488,10 @@ Sends all access log messages to syslog. Defaults to 'undef'.
 
 Specifies either a LogFormat nickname or custom format string for access log. Defaults to 'undef'.
 
+#####`access_log_env_var`
+
+Adds writing control of access log via environment variable of the access. Defaults to 'undef'.
+
 #####`add_listen`
 
 Determines whether the vhost creates a listen statement. The default value is 'true'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index dfc511f6bd..641962d582 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -126,6 +126,7 @@
     $access_log_pipe             = undef,
     $access_log_syslog           = undef,
     $access_log_format           = undef,
+    $access_log_env_var          = undef,
     $aliases                     = undef,
     $directories                 = undef,
     $error_log                   = true,
@@ -294,6 +295,9 @@
     $_access_log_format = 'combined'
   }
 
+  if $access_log_env_var {
+    $_access_log_env_var = "env=${access_log_env_var}"
+  }
 
   if $ip {
     if $port {
@@ -418,6 +422,7 @@
   # - $access_log
   # - $access_log_destination
   # - $_access_log_format
+  # - $_access_log_env_var
   # - $error_log
   # - $error_log_destination
   # - $error_documents
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 7f4889fa50..55f5546b54 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -720,6 +720,12 @@
             /^  VirtualDocumentRoot \/not\/default$/,
           ],
         },
+        {
+          :title => 'should contain environment variables',
+          :attr  => 'access_log_env_var',
+          :value => 'admin',
+          :match => [/CustomLog \/var\/log\/.+_access\.log combined env=admin$/]
+        },
 
       ].each do |param|
         describe "when #{param[:attr]} is #{param[:value]}" do
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index e8876fc4db..ea10143f7d 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -39,7 +39,9 @@
   LogLevel <%= @log_level %>
 <% end -%>
   ServerSignature Off
-<% if @access_log -%>
+<% if @access_log and @_access_log_env_var -%>
+  CustomLog <%= @access_log_destination %> <%= @_access_log_format %> <%= @_access_log_env_var %>
+<% elsif @access_log -%>
   CustomLog <%= @access_log_destination %> <%= @_access_log_format %>
 <% end -%>
 <%= scope.function_template(['apache/vhost/_block.erb']) -%>
diff --git a/tests/vhost.pp b/tests/vhost.pp
index 0c801b4f0a..77c592f6f1 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -227,3 +227,11 @@
         ssl_honorcipherorder  => 'On',
         add_listen            => 'false',
 }
+
+# Vhost with access log environment variables writing control
+apache::vhost { 'twentyfirst.example.com':
+  port               => '80',
+  docroot            => '/var/www/twentyfirst',
+  access_log_env_var => 'admin',
+}
+

From 13120bfe5bbc8083e7aafe1767f9658000c053a8 Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Sat, 14 Dec 2013 12:53:04 -0800
Subject: [PATCH 0097/2267] Fix rspec-puppet deprecation warnings

This commit changes all the spec tests to use contain_class
instead of include_class which is deprecated.
---
 spec/classes/apache_spec.rb          |  6 +++---
 spec/classes/dev_spec.rb             |  6 +++---
 spec/classes/mod/auth_kerb_spec.rb   |  6 +++---
 spec/classes/mod/authnz_ldap_spec.rb |  8 ++++----
 spec/classes/mod/dav_svn_spec.rb     |  6 +++---
 spec/classes/mod/dev_spec.rb         |  2 +-
 spec/classes/mod/dir_spec.rb         |  6 +++---
 spec/classes/mod/event_spec.rb       |  2 +-
 spec/classes/mod/fastcgi_spec.rb     |  4 ++--
 spec/classes/mod/fcgid_spec.rb       |  6 +++---
 spec/classes/mod/itk_spec.rb         |  4 ++--
 spec/classes/mod/passenger_spec.rb   |  6 +++---
 spec/classes/mod/perl_spec.rb        |  6 +++---
 spec/classes/mod/peruser_spec.rb     |  2 +-
 spec/classes/mod/php_spec.rb         |  8 ++++----
 spec/classes/mod/prefork_spec.rb     |  6 +++---
 spec/classes/mod/proxy_html_spec.rb  |  6 +++---
 spec/classes/mod/python_spec.rb      |  6 +++---
 spec/classes/mod/rpaf_spec.rb        |  4 ++--
 spec/classes/mod/ssl_spec.rb         |  6 +++---
 spec/classes/mod/suphp_spec.rb       |  4 ++--
 spec/classes/mod/worker_spec.rb      |  6 +++---
 spec/classes/mod/wsgi_spec.rb        |  6 +++---
 spec/defines/mod_spec.rb             |  8 ++++----
 spec/defines/vhost_spec.rb           | 16 ++++++++--------
 25 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 690cdaab0a..58d23d1d3b 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -9,7 +9,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_package("httpd").with(
       'notify' => 'Class[Apache::Service]',
       'ensure' => 'installed'
@@ -132,7 +132,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_package("httpd").with(
       'notify' => 'Class[Apache::Service]',
       'ensure' => 'installed'
@@ -370,7 +370,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_class("apache::package").with({'ensure' => 'present'}) }
     it { should contain_user("www") }
     it { should contain_group("www") }
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 3a094df480..e3d7dee399 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -8,7 +8,7 @@
         :operatingsystemrelease => '6',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_package("libaprutil1-dev") }
     it { should contain_package("libapr1-dev") }
     it { should contain_package("apache2-prefork-dev") }
@@ -20,7 +20,7 @@
         :operatingsystemrelease => '6',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_package("httpd-devel") }
   end
   context "on a FreeBSD OS" do
@@ -33,6 +33,6 @@
         :operatingsystemrelease => '9',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
   end
 end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 955be8da47..71c2349c39 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod("auth_kerb") }
     it { should contain_package("libapache2-mod-auth-kerb") }
   end
@@ -22,7 +22,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod("auth_kerb") }
     it { should contain_package("mod_auth_kerb") }
   end
@@ -34,7 +34,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod("auth_kerb") }
     it { should contain_package("www/mod_auth_kerb2") }
   end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index ac0373e866..c8e832d950 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -11,8 +11,8 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
-    it { should include_class("apache::mod::ldap") }
+    it { should contain_class("apache::params") }
+    it { should contain_class("apache::mod::ldap") }
     it { should contain_apache__mod('authnz_ldap') }
 
     context 'default verifyServerCert' do
@@ -40,8 +40,8 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
-    it { should include_class("apache::mod::ldap") }
+    it { should contain_class("apache::params") }
+    it { should contain_class("apache::mod::ldap") }
     it { should contain_apache__mod('authnz_ldap') }
 
     context 'default verifyServerCert' do
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index c0e25312ea..fe11bb8cb5 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('dav_svn') }
     it { should contain_package("libapache2-svn") }
   end
@@ -22,7 +22,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('dav_svn') }
     it { should contain_package("mod_dav_svn") }
   end
@@ -34,7 +34,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('dav_svn') }
     it { should contain_package("devel/subversion") }
   end
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index eee0bb1fa6..b72217aadd 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -17,7 +17,7 @@
           :operatingsystemrelease => operatingsystemrelease,
         }
       end
-      it { should include_class('apache::dev') }
+      it { should contain_class('apache::dev') }
     end
   end
 end
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 28aaf5c71a..b195eda0f7 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -13,7 +13,7 @@
       }
     end
     context "passing no parameters" do
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it { should contain_apache__mod('dir') }
       it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
       it { should contain_file('dir.conf').with_content(/ index\.html /) }
@@ -40,7 +40,7 @@
       }
     end
     context "passing no parameters" do
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it { should contain_apache__mod('dir') }
       it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
       it { should contain_file('dir.conf').with_content(/ index\.html /) }
@@ -67,7 +67,7 @@
       }
     end
     context "passing no parameters" do
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it { should contain_apache__mod('dir') }
       it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
       it { should contain_file('dir.conf').with_content(/ index\.html /) }
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index f695d1d526..7363e2fc92 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('event') }
     it { should contain_file("/usr/local/etc/apache22/Modules/event.conf").with_ensure('file') }
   end
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 43544d2b6d..8138bbab70 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('fastcgi') }
     it { should contain_package("libapache2-mod-fastcgi") }
     it { should contain_file('fastcgi.conf') }
@@ -24,7 +24,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('fastcgi') }
     it { should contain_package("mod_fastcgi") }
     it { should_not contain_file('fastcgi.conf') }
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index d356a839d5..5cc337291a 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('fcgid') }
     it { should contain_package("libapache2-mod-fcgid") }
   end
@@ -22,7 +22,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('fcgid') }
     it { should contain_package("mod_fcgid") }
   end
@@ -34,7 +34,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('fcgid') }
     it { should contain_package("www/mod_fcgid") }
   end
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index b531e942d8..443ace0cce 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('itk') }
     it { should contain_file("/etc/apache2/mods-available/itk.conf").with_ensure('file') }
     it { should contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') }
@@ -24,7 +24,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('itk') }
     it { should contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') }
   end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 1d148b60c9..d186503e51 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('passenger') }
     it { should contain_package("libapache2-mod-passenger") }
     it { should contain_file('passenger.conf').with({
@@ -88,7 +88,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('passenger') }
     it { should contain_package("mod_passenger") }
     it { should contain_file('passenger.conf').with({
@@ -105,7 +105,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('passenger') }
     it { should contain_package("www/rubygem-passenger") }
   end
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 27690e2a0f..3cb7a3e67a 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('perl') }
     it { should contain_package("libapache2-mod-perl2") }
   end
@@ -22,7 +22,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('perl') }
     it { should contain_package("mod_perl") }
   end
@@ -34,7 +34,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('perl') }
     it { should contain_package("www/mod_perl2") }
   end
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index 3d4a608461..062905ccc9 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('peruser') }
     it { should contain_file("/usr/local/etc/apache22/Modules/peruser.conf").with_ensure('file') }
   end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 31a85a7bfc..57708a398c 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -11,7 +11,7 @@
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it { should contain_apache__mod('php5') }
       it { should contain_package("libapache2-mod-php5") }
       it { should contain_file("php5.load").with(
@@ -39,7 +39,7 @@
       let :pre_condition do
         'class { "apache": }'
       end
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it { should contain_apache__mod('php5') }
       it { should contain_package("php") }
       it { should contain_file("php5.load").with(
@@ -61,7 +61,7 @@
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it { should contain_apache__mod('php5') }
       it { should contain_package("php") }
       it { should contain_file("php5.load").with(
@@ -81,7 +81,7 @@
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      it { should include_class('apache::params') }
+      it { should contain_class('apache::params') }
       it { should contain_apache__mod('php5') }
       it { should contain_package("lang/php5") }
       it { should contain_file('php5.load') }
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 7148f787a7..5436894227 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('prefork') }
     it { should contain_file("/etc/apache2/mods-available/prefork.conf").with_ensure('file') }
     it { should contain_file("/etc/apache2/mods-enabled/prefork.conf").with_ensure('link') }
@@ -24,7 +24,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('prefork') }
     it { should contain_file("/etc/httpd/conf.d/prefork.conf").with_ensure('file') }
     it { should contain_file_line("/etc/sysconfig/httpd prefork enable").with({
@@ -40,7 +40,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('prefork') }
     it { should contain_file("/usr/local/etc/apache22/Modules/prefork.conf").with_ensure('file') }
   end
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 10547d8330..90be60b0fe 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -14,7 +14,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('proxy_html') }
     it { should contain_package("libapache2-mod-proxy-html") }
   end
@@ -26,7 +26,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('proxy_html') }
     it { should contain_package("mod_proxy_html") }
   end
@@ -38,7 +38,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('proxy_html') }
     it { should contain_package("www/mod_proxy_html") }
   end
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index b29e4b5f89..9042d0f1bf 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod("python") }
     it { should contain_package("libapache2-mod-python") }
   end
@@ -22,7 +22,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod("python") }
     it { should contain_package("mod_python") }
   end
@@ -34,7 +34,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod("python") }
     it { should contain_package("www/mod_python3") }
   end
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 4f08fd81e5..d9c9015abf 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -12,7 +12,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('rpaf') }
     it { should contain_package("libapache2-mod-rpaf") }
     it { should contain_file('rpaf.conf').with({
@@ -47,7 +47,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('rpaf') }
     it { should contain_package("www/mod_rpaf2") }
     it { should contain_file('rpaf.conf').with({
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index b4e9255f05..45005a1913 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -21,7 +21,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class('apache::params') }
+    it { should contain_class('apache::params') }
     it { should contain_apache__mod('ssl') }
     it { should contain_package('mod_ssl') }
   end
@@ -34,7 +34,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class('apache::params') }
+    it { should contain_class('apache::params') }
     it { should contain_apache__mod('ssl') }
     it { should_not contain_package('libapache2-mod-ssl') }
   end
@@ -47,7 +47,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class('apache::params') }
+    it { should contain_class('apache::params') }
     it { should contain_apache__mod('ssl') }
   end
 end
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index 2d6517c330..382314d9a9 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_package("libapache2-mod-suphp") }
   end
   context "on a RedHat OS" do
@@ -21,7 +21,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_package("mod_suphp") }
   end
 end
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 4c504c01fb..1af8ff8c68 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('worker') }
     it { should contain_file("/etc/apache2/mods-available/worker.conf").with_ensure('file') }
     it { should contain_file("/etc/apache2/mods-enabled/worker.conf").with_ensure('link') }
@@ -24,7 +24,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('worker') }
     it { should contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') }
     it { should contain_file_line("/etc/sysconfig/httpd worker enable") }
@@ -37,7 +37,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('worker') }
     it { should contain_file("/usr/local/etc/apache22/Modules/worker.conf").with_ensure('file') }
   end
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 9549b1df7b..8d26526cb2 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -10,7 +10,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('wsgi') }
     it { should contain_package("libapache2-mod-wsgi") }
   end
@@ -22,7 +22,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('wsgi') }
     it { should contain_package("mod_wsgi") }
 
@@ -47,7 +47,7 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should include_class("apache::params") }
+    it { should contain_class("apache::params") }
     it { should contain_apache__mod('wsgi') }
     it { should contain_package("www/mod_wsgi") }
   end
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index 0bb5bf6b75..bbc5f0bdce 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -17,7 +17,7 @@
       let :title do
         'spec_m'
       end
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it "should manage the module load file" do
         should contain_file('spec_m.load').with({
           :path    => '/etc/httpd/conf.d/spec_m.load',
@@ -37,7 +37,7 @@
       # parameters
       let(:params) { {:package => 'mod_xsendfile'} }
 
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it { should contain_package('mod_xsendfile') }
     end
   end
@@ -55,7 +55,7 @@
       let :title do
         'spec_m'
       end
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it "should manage the module load file" do
         should contain_file('spec_m.load').with({
           :path    => '/etc/apache2/mods-available/spec_m.load',
@@ -90,7 +90,7 @@
       let :title do
         'spec_m'
       end
-      it { should include_class("apache::params") }
+      it { should contain_class("apache::params") }
       it "should manage the module load file" do
         should contain_file('spec_m.load').with({
           :path    => '/usr/local/etc/apache22/Modules/spec_m.load',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 7f4889fa50..0923e44866 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -24,8 +24,8 @@
       end
       let :params do default_params end
       let :facts do default_facts end
-      it { should include_class("apache") }
-      it { should include_class("apache::params") }
+      it { should contain_class("apache") }
+      it { should contain_class("apache::params") }
     end
     context "on Debian based systems" do
       let :default_facts do
@@ -37,8 +37,8 @@
       end
       let :params do default_params end
       let :facts do default_facts end
-      it { should include_class("apache") }
-      it { should include_class("apache::params") }
+      it { should contain_class("apache") }
+      it { should contain_class("apache::params") }
       it { should contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
@@ -59,8 +59,8 @@
       end
       let :params do default_params end
       let :facts do default_facts end
-      it { should include_class("apache") }
-      it { should include_class("apache::params") }
+      it { should contain_class("apache") }
+      it { should contain_class("apache::params") }
       it { should contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/usr/local/etc/apache22/Vhosts/25-rspec.example.com.conf'
@@ -77,8 +77,8 @@
     end
     describe 'basic assumptions' do
       let :params do default_params end
-      it { should include_class("apache") }
-      it { should include_class("apache::params") }
+      it { should contain_class("apache") }
+      it { should contain_class("apache::params") }
       it { should contain_apache__listen(params[:port]) }
       it { should contain_apache__namevirtualhost("*:#{params[:port]}") }
     end

From 32b324baae70aaf071b3d4c4c7af397da07714be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 17 Dec 2013 06:49:00 +0100
Subject: [PATCH 0098/2267] rspec-puppet's .nodeset.yml is now deprecated

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be61e30aeb..4a4ec6f656 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -194,7 +194,7 @@ You can run them by issuing the following command
 % rspec spec/acceptance
 ```
 
-This will now download a pre-fabricated image configured in [.nodeset.yml](./.nodeset.yml),
+This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
 install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
 and then run all the tests under [spec/acceptance](./spec/acceptance).
 

From 6db93dac50bb27e6b899041e1bbb8518bd693c6e Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 17 Dec 2013 12:18:45 -0500
Subject: [PATCH 0099/2267] Remove index parameters.

The current code allows you to set index_options but then ignores it.
Based on the git log for the commit that added this option it was
intended to be passed into directories.  The test that caught this
will be merged into spec/acceptance/vhost_spec.rb in a seperate PR.

You can reproduce the original failure with:

class { 'apache': }
host { 'test.server': ip => '127.0.0.1' }
apache::vhost { 'test.server':
  docroot    => '/tmp',
  index_options    => ['Charset=UTF-8'],
}

We're just going to remove them because they can be passed directly
into directory instead of indirectly.
---
 manifests/vhost.pp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 641962d582..0cdec4871a 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -114,8 +114,6 @@
     $servername                  = $name,
     $serveraliases               = [],
     $options                     = ['Indexes','FollowSymLinks','MultiViews'],
-    $index_options               = [],
-    $index_order_default         = [],
     $override                    = ['None'],
     $directoryindex              = '',
     $vhost_name                  = '*',

From 76c19e18ddfcb2406c50967263b9095d3d6533fe Mon Sep 17 00:00:00 2001
From: Jean-Denis Gebhardt <jean-denis.gebhardt@noris.net>
Date: Thu, 19 Dec 2013 13:50:44 +0100
Subject: [PATCH 0100/2267] Added support for mod_include

---
 README.md                | 1 +
 manifests/mod/include.pp | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 manifests/mod/include.pp

diff --git a/README.md b/README.md
index 7b04660a98..028b459c34 100644
--- a/README.md
+++ b/README.md
@@ -393,6 +393,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `fastcgi`
 * `fcgid`
 * `headers`
+* `include`
 * `info`
 * `itk`
 * `ldap`
diff --git a/manifests/mod/include.pp b/manifests/mod/include.pp
new file mode 100644
index 0000000000..9f2592f093
--- /dev/null
+++ b/manifests/mod/include.pp
@@ -0,0 +1,3 @@
+class apache::mod::include {
+  apache::mod { 'include': }
+}

From 61be25eae90d7fa6d09d3d6ed50b30bfda9e344c Mon Sep 17 00:00:00 2001
From: Matt Shields <matt@mattshields.org>
Date: Thu, 19 Dec 2013 10:53:22 -0500
Subject: [PATCH 0101/2267] Update init.pp

Fixed to all module to be used with Amazon Linux (fork of RHEL/CentOS)

facter osfamily operatingsystem
operatingsystem => Amazon
osfamily => Linux
---
 manifests/init.pp | 53 +++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index cecb7c4502..5147ebc3c7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -215,35 +215,30 @@
   }
 
   if $apache::params::conf_dir and $apache::params::conf_file {
-    case $::osfamily {
-      'debian': {
-        $docroot              = '/var/www'
-        $pidfile              = '${APACHE_PID_FILE}'
-        $error_log            = 'error.log'
-        $error_documents_path = '/usr/share/apache2/error'
-        $scriptalias          = '/usr/lib/cgi-bin'
-        $access_log_file      = 'access.log'
-      }
-      'redhat': {
-        $docroot              = '/var/www/html'
-        $pidfile              = 'run/httpd.pid'
-        $error_log            = 'error_log'
-        $error_documents_path = '/var/www/error'
-        $scriptalias          = '/var/www/cgi-bin'
-        $access_log_file      = 'access_log'
-      }
-      'freebsd': {
-        $docroot              = '/usr/local/www/apache22/data'
-        $pidfile              = '/var/run/httpd.pid'
-        $error_log            = 'httpd-error.log'
-        $error_documents_path = '/usr/local/www/apache22/error'
-        $scriptalias          = '/usr/local/www/apache22/cgi-bin'
-        $access_log_file      = 'httpd-access.log'
-      }
-      default: {
-        fail("Unsupported osfamily ${::osfamily}")
-      }
-    }
+    if $::osfamily == 'redhat' or $::operatingsystem == 'amazon' {
+      $docroot              = '/var/www/html'
+      $pidfile              = 'run/httpd.pid'
+      $error_log            = 'error_log'
+      $error_documents_path = '/var/www/error'
+      $scriptalias          = '/var/www/cgi-bin'
+      $access_log_file      = 'access_log'
+    } elsif $::osfamily == 'debian' {
+      $docroot              = '/var/www'
+      $pidfile              = '${APACHE_PID_FILE}'
+      $error_log            = 'error.log'
+      $error_documents_path = '/usr/share/apache2/error'
+      $scriptalias          = '/usr/lib/cgi-bin'
+      $access_log_file      = 'access.log'
+    } elsif $::osfamily == 'freebsd' {
+      $docroot              = '/usr/local/www/apache22/data'
+      $pidfile              = '/var/run/httpd.pid'
+      $error_log            = 'httpd-error.log'
+      $error_documents_path = '/usr/local/www/apache22/error'
+      $scriptalias          = '/usr/local/www/apache22/cgi-bin'
+      $access_log_file      = 'httpd-access.log'
+    } else {
+      fail("Unsupported osfamily ${::osfamily}")
+  }
 
     $apxs_workaround = $::osfamily ? {
       'freebsd' => true,

From 8b16a339b7caec483a3fd4699e42d8f93e429e19 Mon Sep 17 00:00:00 2001
From: Matt Shields <matt@mattshields.org>
Date: Thu, 19 Dec 2013 10:56:28 -0500
Subject: [PATCH 0102/2267] Update alias.pp

Fixed to all module to be used with Amazon Linux (fork of RHEL/CentOS)

facter osfamily operatingsystem
operatingsystem => Amazon
osfamily => Linux
---
 manifests/mod/alias.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 2880697236..aab196eaf2 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,7 +1,8 @@
 class apache::mod::alias {
-  $icons_path = $::osfamily ? {
+  $icons_path = $::osfamily or $::operatingsystem ? {
     'debian'  => '/usr/share/apache2/icons',
     'redhat'  => '/var/www/icons',
+    'amazon'  => '/var/www/icons',
     'freebsd' => '/usr/local/www/apache22/icons',
   }
   apache::mod { 'alias': }

From dcb1fc66ce32384469a9688f08a1b2fba69581b0 Mon Sep 17 00:00:00 2001
From: Pan <pan.luo@ubc.ca>
Date: Sat, 21 Dec 2013 23:15:32 -0800
Subject: [PATCH 0103/2267] Fix the servername used in log file name

The servername can be [schema://]hostname.domain[:port]. In the case of servername including schema and port, it is not appropriate to use as log file name. It will generate something like this: "ErrorLog /var/log/httpd/https://domain_error.log", which cause httpd failed to refresh/start.
---
 manifests/vhost.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 641962d582..97f1d09d02 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -268,9 +268,9 @@
     $access_log_destination = $access_log_syslog
   } else {
     if $ssl {
-      $access_log_destination = "${logroot}/${servername}_access_ssl.log"
+      $access_log_destination = "${logroot}/${name}_access_ssl.log"
     } else {
-      $access_log_destination = "${logroot}/${servername}_access.log"
+      $access_log_destination = "${logroot}/${name}_access.log"
     }
   }
 
@@ -282,9 +282,9 @@
     $error_log_destination = $error_log_syslog
   } else {
     if $ssl {
-      $error_log_destination = "${logroot}/${servername}_error_ssl.log"
+      $error_log_destination = "${logroot}/${name}_error_ssl.log"
     } else {
-      $error_log_destination = "${logroot}/${servername}_error.log"
+      $error_log_destination = "${logroot}/${name}_error.log"
     }
   }
 

From e786bfcdd0fb6fdc344e01976fa667a4187cdf41 Mon Sep 17 00:00:00 2001
From: Randy Stauner <randy@magnificent-tears.com>
Date: Tue, 7 Jan 2014 18:50:27 -0700
Subject: [PATCH 0104/2267] (docs) Fix apache::namevirtualhost example call
 style

The docs describe it as a defined type but the example shows it as a class.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 028b459c34..8230c2b242 100644
--- a/README.md
+++ b/README.md
@@ -1434,7 +1434,7 @@ Apache httpd requires that `Listen` directives must be added for every port. The
 Enables named-based hosting of a virtual host
 
 ```puppet
-    class { 'apache::namevirtualhost`: }
+    apache::namevirtualhost { '*:80': }
 ```
 
 Declaring this defined type will add all `NameVirtualHost` directives to the `ports.conf` file in the Apache https configuration directory. `apache::namevirtualhost` titles should always take the form of: `*`, `*:<port>`, `_default_:<port>`, `<ip>`, or `<ip>:<port>`.

From c96032c1494bd2e790f6d4cd54c1a0f2da7f9446 Mon Sep 17 00:00:00 2001
From: Randy Stauner <randy@magnificent-tears.com>
Date: Tue, 7 Jan 2014 19:02:07 -0700
Subject: [PATCH 0105/2267] (docs) Update list of `apache::mod::[name]` classes

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8230c2b242..a4f9e50862 100644
--- a/README.md
+++ b/README.md
@@ -378,6 +378,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `alias`
 * `auth_basic`
 * `auth_kerb`
+* `authnz_ldap`*
 * `autoindex`
 * `cache`
 * `cgi`
@@ -390,6 +391,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `dir`*
 * `disk_cache`
 * `event`
+* `expires`
 * `fastcgi`
 * `fcgid`
 * `headers`
@@ -399,7 +401,6 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `ldap`
 * `mime`
 * `mime_magic`*
-* `mpm_event`
 * `negotiation`
 * `nss`*
 * `passenger`*
@@ -409,6 +410,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `prefork`*
 * `proxy`*
 * `proxy_ajp`
+* `proxy_balancer`
 * `proxy_html`
 * `proxy_http`
 * `python`

From 880095637504a246c41d654e8c2752ae96b77e45 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Wed, 8 Jan 2014 21:15:40 +0000
Subject: [PATCH 0106/2267] Don't purge mods-available dir when separate enable
 dir is used

---
 manifests/init.pp           | 4 +++-
 spec/classes/apache_spec.rb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 5147ebc3c7..e7d6ce9827 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -145,10 +145,12 @@
       creates => $mod_dir,
       require => Package['httpd'],
     }
+    # Don't purge available modules if an enable dir is used
+    $purge_mod_dir = $purge_configs and !$mod_enable_dir
     file { $mod_dir:
       ensure  => directory,
       recurse => true,
-      purge   => $purge_configs,
+      purge   => $purge_mod_dir,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
     }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 58d23d1d3b..7dd82d351c 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -37,7 +37,7 @@
     it { should contain_file("/etc/apache2/mods-available").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
-      'purge'   => 'true',
+      'purge'   => 'false',
       'notify'  => 'Class[Apache::Service]',
       'require' => 'Package[httpd]'
       )

From 4defeb2b827bf54c78527b76a066808792e5bfbe Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 12 Dec 2013 14:40:44 -0500
Subject: [PATCH 0107/2267] Add additional beaker acceptance tests.

This extends the tests to cover all current parameters (minus two
vhost ones that are shortly to be removed).  Most of these tests
are the naive happy path, but even that has discovered some legitimate
issues along the way.
---
 spec/acceptance/apache_parameters_spec.rb  | 408 ++++++++++++++
 spec/acceptance/apache_ssl_spec.rb         |  89 +++
 spec/acceptance/nodesets/centos-59-x64.yml |   8 +
 spec/acceptance/vhost_spec.rb              | 599 +++++++++++++++++++++
 spec/spec_helper_acceptance.rb             |   4 +
 5 files changed, 1108 insertions(+)
 create mode 100644 spec/acceptance/apache_parameters_spec.rb
 create mode 100644 spec/acceptance/apache_ssl_spec.rb
 create mode 100644 spec/acceptance/nodesets/centos-59-x64.yml

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
new file mode 100644
index 0000000000..77971d7f99
--- /dev/null
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -0,0 +1,408 @@
+require 'spec_helper_acceptance'
+
+case fact('osfamily')
+when 'RedHat'
+  conf_dir = '/etc/httpd/conf'
+  confd_dir = '/etc/httpd/conf.d'
+  conf_file = '/etc/httpd/conf/httpd.conf'
+  ports_file = '/etc/httpd/conf/ports.conf'
+  vhost = '/etc/httpd/conf.d/15-default.conf'
+  service_name = 'httpd'
+  package_name = 'httpd'
+when 'Debian'
+  conf_dir = '/etc/apache2/conf.d'
+  confd_dir = '/etc/apache2/conf.d'
+  conf_file = '/etc/apache2/conf/apache2.conf'
+  ports_file = '/etc/httpd/conf/ports.conf'
+  vhost = '/etc/httpd/conf.d/15-default.conf'
+  service_name = 'apache2'
+  package_name = 'apache2'
+end
+
+describe 'apache parameters' do
+
+  # Currently this test only does something on FreeBSD.
+  describe 'default_confd_files => false' do
+    it 'doesnt do anything' do
+      pp = "class { 'apache': default_confd_files => false }"
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    if fact('osfamily') == 'FreeBSD'
+      describe file("#{confd_dir}/no-accf.conf.erb") do
+        it { should_not be_file }
+      end
+    end
+  end
+  describe 'default_confd_files => true' do
+    it 'copies conf.d files' do
+      pp = "class { 'apache': default_confd_files => true }"
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    if fact('osfamily') == 'FreeBSD'
+      describe file("#{confd_dir}/no-accf.conf.erb") do
+        it { should be_file }
+      end
+    end
+  end
+
+  describe 'when set adds a listen statement' do
+    it 'applys cleanly' do
+      pp = "class { 'apache': ip => '10.1.1.1', service_ensure => stopped }"
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file(ports_file) do
+      it { should be_file }
+      it { should contain 'Listen 10.1.1.1' }
+    end
+  end
+
+  describe 'service tests => true' do
+    it 'starts the service' do
+      pp = <<-EOS
+        class { 'apache':
+          service_enable => true,
+          service_ensure => running,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should be_running }
+      it { should be_enabled }
+    end
+  end
+
+  describe 'service tests => false' do
+    it 'stops the service' do
+      pp = <<-EOS
+        class { 'apache':
+          service_enable => false,
+          service_ensure => stopped,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should_not be_running }
+      it { should_not be_enabled }
+    end
+  end
+
+  describe 'purge parameters => false' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache':
+          purge_configs => false,
+          purge_vdir    => false,
+        }
+      EOS
+      shell("touch #{confd_dir}/test.conf")
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    # Ensure the file didn't disappear.
+    describe file("#{confd_dir}/test.conf") do
+      it { should be_file }
+    end
+  end
+
+  describe 'purge parameters => true' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache':
+          purge_configs => true,
+          purge_vdir    => true,
+        }
+      EOS
+      shell("touch #{confd_dir}/test.conf")
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    # File should be gone
+    describe file("#{confd_dir}/test.conf") do
+      it { should_not be_file }
+    end
+  end
+
+  describe 'serveradmin' do
+    it 'applies cleanly' do
+      pp = "class { 'apache': serveradmin => 'test@example.com' }"
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file(vhost) do
+      it { should be_file }
+      it { should contain 'ServerAdmin test@example.com' }
+    end
+  end
+
+  describe 'sendfile' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': sendfile => 'On' }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'EnableSendfile On' }
+    end
+
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': sendfile => 'Off' }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'Sendfile Off' }
+    end
+  end
+
+  describe 'error_documents' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': error_documents => true }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'Alias /error/' }
+    end
+  end
+
+  describe 'timeout' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': timeout => '1234' }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'Timeout 1234' }
+    end
+  end
+
+  describe 'httpd_dir' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
+          include 'apache::mod::nss'
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file("#{confd_dir}/nss.conf") do
+      it { should be_file }
+      it { should contain 'NSSCertificateDatabase /tmp/alias' }
+    end
+  end
+
+  describe 'server_root' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': server_root => '/tmp/root', service_ensure => stopped }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'ServerRoot "/tmp/root"' }
+    end
+  end
+
+  describe 'confd_dir' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': confd_dir => '/tmp/root', service_ensure => stopped }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'Include /tmp/root/*.conf' }
+    end
+  end
+
+  describe 'conf_template' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }"
+        shell('mkdir -p /etc/puppet/modules/another/templates')
+        shell('echo "testcontent" >> /etc/puppet/modules/another/templates/test.conf.erb')
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'testcontent' }
+    end
+  end
+
+  describe 'servername' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': servername => 'test.server', service_ensure => stopped }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'ServerName "test.server"' }
+    end
+  end
+
+  describe 'user' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache':
+            manage_user  => true,
+            manage_group => true,
+            user         => 'testweb',
+            group        => 'testweb',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe user('testweb') do
+      it { should exist }
+      it { should belong_to_group 'testweb' }
+    end
+
+    describe group('testweb') do
+      it { should exist }
+    end
+  end
+
+  describe 'keepalive' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': keepalive => 'On', keepalive_timeout => '30' }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'KeepAlive On' }
+      it { should contain 'KeepAliveTimeout 30' }
+    end
+  end
+
+  describe 'logging' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': logroot => '/tmp' }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file('/tmp/error_log') do
+      it { should be_file }
+    end
+  end
+
+  describe 'ports_file' do
+    it 'applys cleanly' do
+      pp = <<-EOS
+        class { 'apache':
+          ports_file     => '/tmp/ports_file',
+          ip             => '10.1.1.1',
+          service_ensure => stopped
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file('/tmp/ports_file') do
+      it { should be_file }
+      it { should contain 'Listen 10.1.1.1' }
+    end
+  end
+
+  describe 'server_tokens' do
+    it 'applys cleanly' do
+      pp = <<-EOS
+        class { 'apache':
+          server_tokens  => 'testtokens',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'ServerTokens testtokens' }
+    end
+  end
+
+  describe 'server_signature' do
+    it 'applys cleanly' do
+      pp = <<-EOS
+        class { 'apache':
+          server_signature  => 'testsig',
+          service_ensure    => stopped,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'ServerSignature testsig' }
+    end
+  end
+
+  describe 'trace_enable' do
+    it 'applys cleanly' do
+      pp = <<-EOS
+        class { 'apache':
+          trace_enable  => 'Off',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file(conf_file) do
+      it { should be_file }
+      it { should contain 'TraceEnable Off' }
+    end
+  end
+
+  describe 'package_ensure' do
+    it 'applys cleanly' do
+      pp = <<-EOS
+        class { 'apache':
+          package_ensure  => present,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe package(package_name) do
+      it { should be_installed }
+    end
+  end
+
+end
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
new file mode 100644
index 0000000000..62bf4c1bab
--- /dev/null
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -0,0 +1,89 @@
+require 'spec_helper_acceptance'
+
+case fact('osfamily')
+when 'RedHat'
+  vhost = '/etc/httpd/conf.d/15-default-ssl.conf'
+  vhostd = '/etc/httpd/conf.d'
+when 'Debian'
+  vhost = '/etc/apache2/conf/15-default-ssl.conf'
+  vhostd = '/etc/apache2/conf'
+end
+
+describe 'apache ssl' do
+
+  describe 'ssl parameters' do
+    it 'runs without error' do
+      pp = <<-EOS
+        class { 'apache':
+          service_ensure       => stopped,
+          default_ssl_vhost    => true,
+          default_ssl_cert     => '/tmp/ssl_cert',
+          default_ssl_key      => '/tmp/ssl_key',
+          default_ssl_chain    => '/tmp/ssl_chain',
+          default_ssl_ca       => '/tmp/ssl_ca',
+          default_ssl_crl_path => '/tmp/ssl_crl_path',
+          default_ssl_crl      => '/tmp/ssl_crl',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file(vhost) do
+      it { should be_file }
+      it { should contain 'SSLCertificateFile      /tmp/ssl_cert' }
+      it { should contain 'SSLCertificateKeyFile   /tmp/ssl_key' }
+      it { should contain 'SSLCertificateChainFile /tmp/ssl_chain' }
+      it { should contain 'SSLCACertificateFile    /tmp/ssl_ca' }
+      it { should contain 'SSLCARevocationPath     /tmp/ssl_crl_path' }
+      it { should contain 'SSLCARevocationFile     /tmp/ssl_crl' }
+    end
+  end
+
+  describe 'vhost ssl parameters' do
+    it 'runs without error' do
+      pp = <<-EOS
+        class { 'apache':
+          service_ensure       => stopped,
+        }
+
+        apache::vhost { 'test_ssl':
+          docroot              => '/tmp/test',
+          ssl                  => true,
+          ssl_cert             => '/tmp/ssl_cert',
+          ssl_key              => '/tmp/ssl_key',
+          ssl_chain            => '/tmp/ssl_chain',
+          ssl_ca               => '/tmp/ssl_ca',
+          ssl_crl_path         => '/tmp/ssl_crl_path',
+          ssl_crl              => '/tmp/ssl_crl',
+          ssl_certs_dir        => '/tmp',
+          ssl_protocol         => 'test',
+          ssl_cipher           => 'test',
+          ssl_honorcipherorder => 'test',
+          ssl_verify_client    => 'test',
+          ssl_verify_depth     => 'test',
+          ssl_options          => ['test', 'test1'],
+          ssl_proxyengine      => true,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhostd}/25-test_ssl.conf") do
+      it { should be_file }
+      it { should contain 'SSLCertificateFile      /tmp/ssl_cert' }
+      it { should contain 'SSLCertificateKeyFile   /tmp/ssl_key' }
+      it { should contain 'SSLCertificateChainFile /tmp/ssl_chain' }
+      it { should contain 'SSLCACertificateFile    /tmp/ssl_ca' }
+      it { should contain 'SSLCARevocationPath     /tmp/ssl_crl_path' }
+      it { should contain 'SSLCARevocationFile     /tmp/ssl_crl' }
+      it { should contain 'SSLProxyEngine On' }
+      it { should contain 'SSLProtocol             test' }
+      it { should contain 'SSLCipherSuite          test' }
+      it { should contain 'SSLHonorCipherOrder     test' }
+      it { should contain 'SSLVerifyClient         test' }
+      it { should contain 'SSLVerifyDepth          test' }
+      it { should contain 'SSLOptions test test1' }
+    end
+  end
+
+end
diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml
new file mode 100644
index 0000000000..b0a4ba845e
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-59-x64.yml
@@ -0,0 +1,8 @@
+HOSTS:
+  centos-59-x64:
+    roles:
+      - master
+    platform: centos-59-x64
+    box : centos-59-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
+    hypervisor : vagrant
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 42d98033a0..37ca201bb0 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -6,14 +6,43 @@
     vhost_dir = '/etc/httpd/conf.d'
     package_name = 'httpd'
     service_name = 'httpd'
+    ports_file = '/etc/httpd/conf/ports.conf'
+    suphp_handler = 'php5-script'
+    suphp_configpath = 'undef'
   when 'FreeBSD'
     vhost_dir = '/usr/local/etc/apache22/Vhosts'
     package_name = 'apache22'
     service_name = 'apache22'
+    ports_file = '/usr/local/etc/apache22/ports.conf'
   when 'Debian'
     vhost_dir = '/etc/apache2/sites-enabled'
     package_name = 'apache2'
     service_name = 'apache2'
+    ports_file = '/etc/apache2/conf/ports.conf'
+    suphp_handler = 'x-httpd-php'
+    suphp_configpath = '/etc/php5/apache2'
+  end
+
+  context 'no default vhosts' do
+    it 'should create no default vhosts' do
+      pp = <<-EOS
+        class { 'apache':
+          default_vhost => false,
+          default_ssl_vhost => false,
+          service_ensure => stopped
+        }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/15-default.conf") do
+      it { should_not be_file }
+    end
+
+    describe file("#{vhost_dir}/15-default-ssl.conf") do
+      it { should_not be_file }
+    end
   end
 
   context "default vhost without ssl" do
@@ -287,4 +316,574 @@ class { 'apache': default_vhost => false, }
       end
     end
   end
+
+  describe 'ip_based' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          ip_based   => true,
+          servername => 'test.server',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file(ports_file) do
+      it { should be_file }
+      it { should_not contain 'NameVirtualHost test.server' }
+    end
+  end
+
+  describe 'add_listen' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': default_vhost => false }
+        host { 'testlisten.server': ip => '127.0.0.1' }
+        apache::listen { '81': }
+        apache::vhost { 'testlisten.server':
+          docroot    => '/tmp',
+          port       => '80',
+          add_listen => false,
+          servername => 'testlisten.server',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file(ports_file) do
+      it { should be_file }
+      it { should_not contain 'Listen 80' }
+      it { should contain 'Listen 81' }
+    end
+  end
+
+  describe 'docroot' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot       => '/tmp/test',
+          docroot_owner => 'vagrant',
+          docroot_group => 'vagrant',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file('/tmp/test') do
+      it { should be_directory }
+      it { should be_owned_by 'vagrant' }
+      it { should be_grouped_into 'vagrant' }
+    end
+  end
+
+  describe 'default_vhost' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          default_vhost => true,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/10-test.server.conf") do
+      it { should be_file }
+    end
+  end
+
+  describe 'options' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          options    => ['Indexes','FollowSymLinks', 'ExecCGI'],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'Options Indexes FollowSymLinks ExecCGI' }
+    end
+  end
+
+  describe 'override' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          override   => ['All'],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'AllowOverride All' }
+    end
+  end
+
+  describe 'logroot' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          logroot    => '/tmp',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'CustomLog /tmp' }
+    end
+  end
+
+  ['access', 'error'].each do |logtype|
+    case logtype
+    when 'access'
+      logname = 'CustomLog'
+    when 'error'
+      logname = 'ErrorLog'
+    end
+
+    describe "#{logtype}_log" do
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot    => '/tmp',
+            logroot    => '/tmp',
+            #{logtype}_log => false,
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe file("#{vhost_dir}/25-test.server.conf") do
+        it { should be_file }
+        it { should_not contain "#{logname} /tmp" }
+      end
+    end
+
+    describe "#{logtype}_log_pipe" do
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot    => '/tmp',
+            logroot    => '/tmp',
+            #{logtype}_log_pipe => '|test',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe file("#{vhost_dir}/25-test.server.conf") do
+        it { should be_file }
+        it { should contain "#{logname} \"|test\"" }
+      end
+    end
+
+    describe "#{logtype}_log_syslog" do
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot    => '/tmp',
+            logroot    => '/tmp',
+            #{logtype}_log_syslog => 'syslog',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe file("#{vhost_dir}/25-test.server.conf") do
+        it { should be_file }
+        it { should contain "#{logname} syslog" }
+      end
+    end
+  end
+
+  describe 'access_log_format' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          logroot    => '/tmp',
+          access_log_syslog => 'syslog',
+          access_log_format => '%h %l',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'CustomLog syslog "%h %l"' }
+    end
+  end
+
+  describe 'aliases' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          aliases => [{ alias => '/image', path => '/ftp/pub/image' }],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'Alias /image /ftp/pub/image' }
+    end
+  end
+
+  describe 'scriptaliases' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'ScriptAlias /myscript /usr/share/myscript' }
+    end
+  end
+
+  describe 'proxy' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': service_ensure => stopped, }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          proxy_dest => 'test2',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'ProxyPass          / test2/' }
+    end
+  end
+
+  describe 'suphp' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': service_ensure => stopped, }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+          suphp_addhandler => '#{suphp_handler}',
+          suphp_engine     => 'on',
+          suphp_configpath => '#{suphp_configpath}',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain "suPHP_AddHandler #{suphp_handler}" }
+      it { should contain 'suPHP_Engine on' }
+      it { should contain "suPHP_ConfigPath #{suphp_configpath}" }
+    end
+  end
+
+  describe 'no_proxy_uris' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': service_ensure => stopped, }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+          proxy_dest       => 'http://test2',
+          no_proxy_uris    => [ 'http://test2/test' ],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'ProxyPass          / http://test2/' }
+      it { should contain 'ProxyPass        http://test2/test !' }
+    end
+  end
+
+  describe 'redirect' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+          redirect_source  => ['/images'],
+          redirect_dest    => ['http://test.server/'],
+          redirect_status  => ['permanent'],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'Redirect permanent /images http://test.server/' }
+    end
+  end
+
+  describe 'rack_base_uris' do
+    if fact('osfamily') == 'RedHat'
+      it 'adds epel' do
+        pp = "class { 'epel': }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+          rack_base_uris  => ['/test'],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'RackBaseURI /test' }
+    end
+  end
+
+
+  describe 'request_headers' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+          request_headers  => ['append MirrorID "mirror 12"'],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'append MirrorID "mirror 12"' }
+    end
+  end
+
+  describe 'rewrite rules' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+          rewrites => [
+            { comment => 'test',
+              rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
+              rewrite_rule => ['^index\.html$ welcome.html'],
+            }
+          ],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain '#test' }
+      it { should contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
+      it { should contain 'RewriteRule ^index.html$ welcome.html' }
+    end
+  end
+
+  describe 'setenv/setenvif' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot  => '/tmp',
+          setenv   => ['TEST /test'],
+          setenvif => ['Request_URI "\.gif$" object_is_image=gif']
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'SetEnv TEST /test' }
+      it { should contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
+    end
+  end
+
+  describe 'block' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot  => '/tmp',
+          block    => 'scm',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
+    end
+  end
+
+  describe 'wsgi' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::wsgi': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot                     => '/tmp',
+          wsgi_daemon_process         => 'wsgi',
+          wsgi_daemon_process_options => {processes => '2'},
+          wsgi_process_group          => 'vagrant',
+          wsgi_script_aliases         => { '/test' => '/test1' },
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'WSGIDaemonProcess wsgi processes=2' }
+      it { should contain 'WSGIProcessGroup vagrant' }
+      it { should contain 'WSGIScriptAlias /test /test1' }
+    end
+  end
+
+  describe 'custom_fragment' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot  => '/tmp',
+          custom_fragment => inline_template('#weird test string'),
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain '#weird test string' }
+    end
+  end
+
+  describe 'itk' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot  => '/tmp',
+          itk      => { user => 'vagrant', group => 'vagrant' }
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'AssignUserId vagrant vagrant' }
+    end
+  end
+
+  describe 'fastcgi' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::fastcgi': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot        => '/tmp',
+          fastcgi_server => 'localhost',
+          fastcgi_socket => '/tmp/fast/1234',
+          fastcgi_dir    => '/tmp/fast',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
+      it { should contain '<Directory /tmp/fast>' }
+    end
+  end
+
+  describe 'additional_includes' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        file { '/tmp/include': ensure => present, content => '#additional_includes' }
+        apache::vhost { 'test.server':
+          docroot             => '/tmp',
+          additional_includes => '/tmp/include',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'Include /tmp/include' }
+    end
+  end
+
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 5cac72c4fb..ef42b0a696 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -20,6 +20,10 @@
     # Install module and dependencies
     puppet_module_install(:source => proj_root, :module_name => 'apache')
     hosts.each do |host|
+      # Required for mod_passenger tests.
+      if fact('osfamily') == 'RedHat'
+        on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
+      end
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
     end

From bd51b7646ff5a328a0ef06e21801137aba675f48 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 13 Jan 2014 14:45:54 -0800
Subject: [PATCH 0108/2267] Updating specs and nodesets for more supported OSs
 and missing bits.

---
 spec/acceptance/apache_parameters_spec.rb     |  24 +-
 spec/acceptance/apache_ssl_spec.rb            |   6 +-
 spec/acceptance/mod_php_spec.rb               |  43 ++++
 spec/acceptance/mod_suphp_spec.rb             |   6 +-
 spec/acceptance/nodesets/centos-59-x64.yml    |   5 +-
 spec/acceptance/nodesets/centos-64-x64-pe.yml |  13 ++
 spec/acceptance/nodesets/centos-64-x64.yml    |   5 +-
 spec/acceptance/nodesets/debian-607-x64.yml   |  11 +
 spec/acceptance/nodesets/debian-70rc1-x64.yml |  11 +
 spec/acceptance/nodesets/fedora-18-x64.yml    |  11 +
 spec/acceptance/nodesets/sles-11sp1-x64.yml   |  11 +
 .../nodesets/ubuntu-server-10044-x64.yml      |  11 +
 .../nodesets/ubuntu-server-12042-x64.yml      |   5 +-
 spec/acceptance/vhost_spec.rb                 | 213 ++++++++++++------
 spec/defines/vhost_spec.rb                    |   4 +-
 spec/spec_helper_acceptance.rb                |  15 +-
 16 files changed, 302 insertions(+), 92 deletions(-)
 create mode 100644 spec/acceptance/nodesets/centos-64-x64-pe.yml
 create mode 100644 spec/acceptance/nodesets/debian-607-x64.yml
 create mode 100644 spec/acceptance/nodesets/debian-70rc1-x64.yml
 create mode 100644 spec/acceptance/nodesets/fedora-18-x64.yml
 create mode 100644 spec/acceptance/nodesets/sles-11sp1-x64.yml
 create mode 100644 spec/acceptance/nodesets/ubuntu-server-10044-x64.yml

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 77971d7f99..be398f0167 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -2,21 +2,21 @@
 
 case fact('osfamily')
 when 'RedHat'
-  conf_dir = '/etc/httpd/conf'
   confd_dir = '/etc/httpd/conf.d'
   conf_file = '/etc/httpd/conf/httpd.conf'
   ports_file = '/etc/httpd/conf/ports.conf'
   vhost = '/etc/httpd/conf.d/15-default.conf'
   service_name = 'httpd'
   package_name = 'httpd'
+  error_log = 'error_log'
 when 'Debian'
-  conf_dir = '/etc/apache2/conf.d'
-  confd_dir = '/etc/apache2/conf.d'
-  conf_file = '/etc/apache2/conf/apache2.conf'
-  ports_file = '/etc/httpd/conf/ports.conf'
-  vhost = '/etc/httpd/conf.d/15-default.conf'
+  confd_dir = '/etc/apache2/mods-available'
+  conf_file = '/etc/apache2/apache2.conf'
+  ports_file = '/etc/apache2/ports.conf'
+  vhost = '/etc/apache2/sites-available/15-default.conf'
   service_name = 'apache2'
   package_name = 'apache2'
+  error_log = 'error.log'
 end
 
 describe 'apache parameters' do
@@ -200,15 +200,15 @@ class { 'apache':
       it 'applies cleanly' do
         pp = <<-EOS
           class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
-          include 'apache::mod::nss'
+          include 'apache::mod::mime'
         EOS
         apply_manifest(pp, :catch_failures => true)
       end
     end
 
-    describe file("#{confd_dir}/nss.conf") do
+    describe file("#{confd_dir}/mime.conf") do
       it { should be_file }
-      it { should contain 'NSSCertificateDatabase /tmp/alias' }
+      it { should contain 'AddLanguage eo .eo' }
     end
   end
 
@@ -244,8 +244,8 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }"
-        shell('mkdir -p /etc/puppet/modules/another/templates')
-        shell('echo "testcontent" >> /etc/puppet/modules/another/templates/test.conf.erb')
+        shell("mkdir -p #{default['distmoduledir']}/another/templates")
+        shell("echo 'testcontent' >> #{default['distmoduledir']}/another/templates/test.conf.erb")
         apply_manifest(pp, :catch_failures => true)
       end
     end
@@ -318,7 +318,7 @@ class { 'apache':
       end
     end
 
-    describe file('/tmp/error_log') do
+    describe file("/tmp/#{error_log}") do
       it { should be_file }
     end
   end
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 62bf4c1bab..f577e5e934 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -2,11 +2,9 @@
 
 case fact('osfamily')
 when 'RedHat'
-  vhost = '/etc/httpd/conf.d/15-default-ssl.conf'
   vhostd = '/etc/httpd/conf.d'
 when 'Debian'
-  vhost = '/etc/apache2/conf/15-default-ssl.conf'
-  vhostd = '/etc/apache2/conf'
+  vhostd = '/etc/apache2/sites-available'
 end
 
 describe 'apache ssl' do
@@ -28,7 +26,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file(vhost) do
+    describe file("#{vhostd}/15-default-ssl.conf") do
       it { should be_file }
       it { should contain 'SSLCertificateFile      /tmp/ssl_cert' }
       it { should contain 'SSLCertificateKeyFile   /tmp/ssl_key' }
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index f9c6f2c7f2..3f3faaf9fe 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -3,12 +3,15 @@
 describe 'apache::mod::php class' do
   case fact('osfamily')
   when 'Debian'
+    vhost_dir    = '/etc/apache2/sites-enabled'
     mod_dir      = '/etc/apache2/mods-available'
     service_name = 'apache2'
   when 'RedHat'
+    vhost_dir    = '/etc/httpd/conf.d'
     mod_dir      = '/etc/httpd/conf.d'
     service_name = 'httpd'
   when 'FreeBSD'
+    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
     mod_dir      = '/usr/local/etc/apache22/Modules'
     service_name = 'apache22'
   end
@@ -49,4 +52,44 @@ class { 'apache::mod::php': }
       end
     end
   end
+
+  context "custom php admin_flag and php_admin_value" do
+    it 'succeeds in puppeting php' do
+      pp= <<-EOS
+        class { 'apache':
+          mpm_module => 'prefork',
+        }
+        class { 'apache::mod::php': }
+        apache::vhost { 'php.example.com':
+          port             => '80',
+          docroot          => '/var/www/php',
+          php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
+          php_admin_flags  => { 'engine' => 'on', },
+        }
+        host { 'php.example.com': ip => '127.0.0.1', }
+        file { '/var/www/php/index.php':
+          ensure  => file,
+          content => "<?php phpinfo(); ?>\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    describe file("#{vhost_dir}/25-php.example.com.conf") do
+      it { should contain "  php_admin_flag engine on" }
+      it { should contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
+    end
+
+    it 'should answer to php.example.com' do
+      shell("/usr/bin/curl php.example.com:80") do |r|
+        r.stdout.should =~ /\/usr\/share\/pear\//
+        r.exit_code.should == 0
+      end
+    end
+  end
 end
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 84a641db59..725ec2adb8 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -18,8 +18,8 @@ class { 'apache::mod::suphp': }
           host { 'suphp.example.com': ip => '127.0.0.1', }
           file { '/var/www/suphp/index.php':
             ensure  => file,
-            owner   => 'puppet',
-            group   => 'puppet',
+            owner   => 'daemon',
+            group   => 'daemon',
             content => "<?php echo get_current_user(); ?>\\n",
           }
         EOS
@@ -33,7 +33,7 @@ class { 'apache::mod::suphp': }
 
       it 'should answer to suphp.example.com' do
         shell("/usr/bin/curl suphp.example.com:80") do |r|
-          r.stdout.should =~ /^puppet$/
+          r.stdout.should =~ /^daemon$/
           r.exit_code.should == 0
         end
       end
diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml
index b0a4ba845e..cde1fe5a85 100644
--- a/spec/acceptance/nodesets/centos-59-x64.yml
+++ b/spec/acceptance/nodesets/centos-59-x64.yml
@@ -2,7 +2,10 @@ HOSTS:
   centos-59-x64:
     roles:
       - master
-    platform: centos-59-x64
+    platform: el-5-x86_64
     box : centos-59-x64-vbox4210-nocm
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
     hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml
new file mode 100644
index 0000000000..e408d1be77
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-64-x64-pe.yml
@@ -0,0 +1,13 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+      - database
+      - dashboard
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: pe
diff --git a/spec/acceptance/nodesets/centos-64-x64.yml b/spec/acceptance/nodesets/centos-64-x64.yml
index 8f57028b14..ce47212a8c 100644
--- a/spec/acceptance/nodesets/centos-64-x64.yml
+++ b/spec/acceptance/nodesets/centos-64-x64.yml
@@ -2,7 +2,10 @@ HOSTS:
   centos-64-x64:
     roles:
       - master
-    platform: el-6-i386
+    platform: el-6-x86_64
     box : centos-64-x64-vbox4210-nocm
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
     hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/nodesets/debian-607-x64.yml b/spec/acceptance/nodesets/debian-607-x64.yml
new file mode 100644
index 0000000000..e642e09925
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-607-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  debian-607-x64:
+    roles:
+      - master
+    platform: debian-6-amd64
+    box : debian-607-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/nodesets/debian-70rc1-x64.yml b/spec/acceptance/nodesets/debian-70rc1-x64.yml
new file mode 100644
index 0000000000..cbbbfb2cc6
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-70rc1-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  debian-70rc1-x64:
+    roles:
+      - master
+    platform: debian-7-amd64
+    box : debian-70rc1-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/nodesets/fedora-18-x64.yml b/spec/acceptance/nodesets/fedora-18-x64.yml
new file mode 100644
index 0000000000..086cae995c
--- /dev/null
+++ b/spec/acceptance/nodesets/fedora-18-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  fedora-18-x64:
+    roles:
+      - master
+    platform: fedora-18-x86_64
+    box : fedora-18-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/nodesets/sles-11sp1-x64.yml b/spec/acceptance/nodesets/sles-11sp1-x64.yml
new file mode 100644
index 0000000000..a9f01d5f42
--- /dev/null
+++ b/spec/acceptance/nodesets/sles-11sp1-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  sles-11sp1-x64:
+    roles:
+      - master
+    platform: sles-11-x86_64
+    box : sles-11sp1-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
new file mode 100644
index 0000000000..c1b8bdf8fa
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-10044-x64:
+    roles:
+      - master
+    platform: ubuntu-10.04-amd64
+    box : ubuntu-server-10044-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
index 2b8fe4a121..f7df2ccce1 100644
--- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
@@ -2,7 +2,10 @@ HOSTS:
   ubuntu-server-12042-x64:
     roles:
       - master
-    platform: ubuntu-server-12.04-amd64
+    platform: ubuntu-12.04-amd64
     box : ubuntu-server-12042-x64-vbox4210-nocm
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
     hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 37ca201bb0..9fc24ff170 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -18,7 +18,7 @@
     vhost_dir = '/etc/apache2/sites-enabled'
     package_name = 'apache2'
     service_name = 'apache2'
-    ports_file = '/etc/apache2/conf/ports.conf'
+    ports_file = '/etc/apache2/ports.conf'
     suphp_handler = 'x-httpd-php'
     suphp_configpath = '/etc/php5/apache2'
   end
@@ -65,6 +65,9 @@ class { 'apache': }
 
   context 'default vhost with ssl' do
     it 'should create default vhost configs' do
+      # Doesn't work on Ubuntu 10.04 because ssl.conf should contain
+      # 'file:/var/run/apache2/ssl_mutex' but contains
+      # 'file:${APACHE_RUN_DIR}/ssl_mutex'
       pp = <<-EOS
         class { 'apache':
           default_ssl_vhost => true,
@@ -168,34 +171,89 @@ class { 'apache': }
     end
   end
 
-  context 'apache_directories readme example, adapted' do
-    it 'should configure a vhost with Files' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'files.example.net':
-          docroot     => '/var/www/files',
-          directories => [
-            { path => '~ (\.swp|\.bak|~)$', 'provider' => 'files', 'deny' => 'from all' },
-          ],
-        }
-        file { '/var/www/files/index.html.bak':
-          ensure  => file,
-          content => "Hello World\\n",
-        }
-        host { 'files.example.net': ip => '127.0.0.1', }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
+  context 'apache_directories' do
+    describe 'readme example, adapted' do
+      it 'should configure a vhost with Files' do
+        pp = <<-EOS
+          class { 'apache': }
+          apache::vhost { 'files.example.net':
+            docroot     => '/var/www/files',
+            directories => [
+              { 'path' => '/var/www/files', },
+              { 'path' => '~ "(\.swp|\.bak|~)$"', 'provider' => 'files', 'deny' => 'from all' },
+            ],
+          }
+          file { '/var/www/files/index.html':
+            ensure  => file,
+            content => "Hello World\\n",
+          }
+          file { '/var/www/files/index.html.bak':
+            ensure  => file,
+            content => "Hello World\\n",
+          }
+          host { 'files.example.net': ip => '127.0.0.1', }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
 
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
+      describe service(service_name) do
+        it { should be_enabled }
+        it { should be_running }
+      end
 
-    it 'should answer to files.example.net' do
-      shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr.should =~ /curl: \(22\) The requested URL returned error: 403/
+      it 'should answer to files.example.net' do
+        shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
+        shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
+      end
     end
 
+    describe 'other Directory options' do
+      it 'should configure a vhost with multiple Directory sections' do
+        pp = <<-EOS
+          class { 'apache': }
+          apache::vhost { 'files.example.net':
+            docroot     => '/var/www/files',
+            directories => [
+              { 'path' => '/var/www/files', },
+              {
+                'provider'       => 'location',
+                'path'           => '/foo/',
+                'directoryindex' => 'notindex.html',
+              },
+              {
+                'provider' => 'files',
+                'path'     => '~ "private.html$"',
+                'deny'     => 'from all',
+              },
+            ],
+          }
+          file { '/var/www/files/foo':
+            ensure => directory,
+          }
+          file { '/var/www/files/foo/notindex.html':
+            ensure  => file,
+            content => "Hello Foo\\n",
+          }
+          file { '/var/www/files/private.html':
+            ensure  => file,
+            content => "Hello World\\n",
+          }
+          host { 'files.example.net': ip => '127.0.0.1', }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe service(service_name) do
+        it { should be_enabled }
+        it { should be_running }
+      end
+
+      it 'should answer to files.example.net' do
+        shell("/usr/bin/curl -sSf files.example.net:80/").stdout.should eq("Hello World\n")
+        shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout.should eq("Hello Foo\n")
+        shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
+      end
+    end
   end
 
   case fact('lsbdistcodename')
@@ -546,6 +604,27 @@ class { 'apache': }
     end
   end
 
+  describe 'access_log_env_var' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot            => '/tmp',
+          logroot            => '/tmp',
+          access_log_syslog  => 'syslog',
+          access_log_env_var => 'admin',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'CustomLog syslog combined env=admin' }
+    end
+  end
+
   describe 'aliases' do
     it 'applies cleanly' do
       pp = <<-EOS
@@ -668,29 +747,32 @@ class { 'apache': }
     end
   end
 
-  describe 'rack_base_uris' do
-    if fact('osfamily') == 'RedHat'
-      it 'adds epel' do
-        pp = "class { 'epel': }"
-        apply_manifest(pp, :catch_failures => true)
+  # Passenger isn't even in EPEL on el-5
+  if default['platform'] !~ /^el-5/
+    describe 'rack_base_uris' do
+      if fact('osfamily') == 'RedHat'
+        it 'adds epel' do
+          pp = "class { 'epel': }"
+          apply_manifest(pp, :catch_failures => true)
+        end
       end
-    end
 
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          rack_base_uris  => ['/test'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot          => '/tmp',
+            rack_base_uris  => ['/test'],
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'RackBaseURI /test' }
+      describe file("#{vhost_dir}/25-test.server.conf") do
+        it { should be_file }
+        it { should contain 'RackBaseURI /test' }
+      end
     end
   end
 
@@ -843,26 +925,29 @@ class { 'apache': }
     end
   end
 
-  describe 'fastcgi' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::fastcgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot        => '/tmp',
-          fastcgi_server => 'localhost',
-          fastcgi_socket => '/tmp/fast/1234',
-          fastcgi_dir    => '/tmp/fast',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
+  # So what does this work on?
+  if default['platform'] !~ /^(debian-(6|7)|el-(5|6))/
+    describe 'fastcgi' do
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': }
+          class { 'apache::mod::fastcgi': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot        => '/tmp',
+            fastcgi_server => 'localhost',
+            fastcgi_socket => '/tmp/fast/1234',
+            fastcgi_dir    => '/tmp/fast',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
-      it { should contain '<Directory /tmp/fast>' }
+      describe file("#{vhost_dir}/25-test.server.conf") do
+        it { should be_file }
+        it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
+        it { should contain '<Directory /tmp/fast>' }
+      end
     end
   end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 34b6ae9515..31233d6338 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -539,8 +539,8 @@
         {
           :title => 'should accept a php_admin_flags',
           :attr  => 'php_admin_flags',
-          :value => { 'php_engine' => 'on' },
-          :match => [/^  php_admin_flag php_engine on$/],
+          :value => { 'engine' => 'on' },
+          :match => [/^  php_admin_flag engine on$/],
         },
         {
           :title => 'should accept php_admin_values',
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index ef42b0a696..176529fdb7 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -2,10 +2,17 @@
 require 'beaker-rspec/helpers/serverspec'
 
 hosts.each do |host|
-  # Install Puppet
-  install_package host, 'rubygems'
-  on host, 'gem install puppet --no-ri --no-rdoc'
-  on host, "mkdir -p #{host['distmoduledir']}"
+  if host['platform'] =~ /debian/
+    on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
+  end
+  if host.is_pe?
+    install_pe
+  else
+    # Install Puppet
+    install_package host, 'rubygems'
+    on host, 'gem install puppet --no-ri --no-rdoc'
+    on host, "mkdir -p #{host['distmoduledir']}"
+  end
 end
 
 RSpec.configure do |c|

From b8cb7dd7bd745de740d6181282739e86a8caf2a1 Mon Sep 17 00:00:00 2001
From: Rob Terhaar <rob@atlanticdynamic.com>
Date: Wed, 15 Jan 2014 12:59:07 -0500
Subject: [PATCH 0109/2267] fix puppet-lint errors

---
 manifests/mod/proxy_balancer.pp |  4 ++--
 tests/vhost.pp                  |  6 +++---
 tests/vhost_directories.pp      | 22 ++++++++++++++++++----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 2d5a450bf0..f31e5eaffc 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -1,8 +1,8 @@
 class apache::mod::proxy_balancer {
-  
+
   include apache::mod::proxy
   include apache::mod::proxy_http
-  
+
   Class['apache::mod::proxy'] -> Class['apache::mod::proxy_balancer']
   Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_balancer']
   apache::mod { 'proxy_balancer': }
diff --git a/tests/vhost.pp b/tests/vhost.pp
index 77c592f6f1..7adc1213ed 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -147,9 +147,9 @@
   docroot      => '/var/www/sixteenth',
   rewrites     => [
     {
-      comment       => "redirect non-SSL traffic to SSL site",
-      rewrite_cond => ['%{HTTPS} off'],
-      rewrite_rule => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}'],
+      comment       => 'redirect non-SSL traffic to SSL site',
+      rewrite_cond  => ['%{HTTPS} off'],
+      rewrite_rule  => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}'],
     }
   ]
 }
diff --git a/tests/vhost_directories.pp b/tests/vhost_directories.pp
index d8fcc0f8f8..945a660f4c 100644
--- a/tests/vhost_directories.pp
+++ b/tests/vhost_directories.pp
@@ -7,8 +7,14 @@
 apache::vhost { 'readme.example.net':
   docroot     => '/var/www/readme',
   directories => [
-    { path => '/var/www/readme', 'ServerTokens' => 'prod' },
-    { path => '/usr/share/empty', 'allow' => 'from all' },
+    {
+      'path'         => '/var/www/readme',
+      'ServerTokens' => 'prod' ,
+    },
+    {
+      'path'  => '/usr/share/empty',
+      'allow' => 'from all',
+    },
   ],
 }
 
@@ -16,7 +22,11 @@
 apache::vhost { 'location.example.net':
   docroot     => '/var/www/location',
   directories => [
-    { path => '/location', 'provider' => 'location', 'ServerTokens' => 'prod' }, 
+    {
+      'path'         => '/location',
+      'provider'     => 'location',
+      'ServerTokens' => 'prod'
+    },
   ],
 }
 
@@ -24,7 +34,11 @@
 apache::vhost { 'files.example.net':
   docroot     => '/var/www/files',
   directories => [
-    { path => '~ (\.swp|\.bak|~)$', 'provider' => 'files', 'deny' => 'from all' }, 
+    {
+      'path'     => '~ (\.swp|\.bak|~)$',
+      'provider' => 'files',
+      'deny'     => 'from all'
+    },
   ],
 }
 

From 0ffea7becfb16dc4d89bd6dab64863d1c19891eb Mon Sep 17 00:00:00 2001
From: Rob Terhaar <rob@atlanticdynamic.com>
Date: Thu, 16 Jan 2014 12:22:44 -0500
Subject: [PATCH 0110/2267] clean more whitespace

---
 manifests/mod/nss.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index d96c11e9bd..a9a50a1068 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -4,11 +4,11 @@
   $passwd_file = undef
   ) {
   include apache::mod::mime
-  
+
   apache::mod { 'nss': }
 
   $httpd_dir = $apache::httpd_dir
-  
+
   # Template uses:
   # $transfer_log
   # $error_log

From a44bfb833a541659826247a01616668da86ba42a Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Sat, 18 Jan 2014 20:27:00 +0100
Subject: [PATCH 0111/2267] Support Header directives in vhost context

This is implemented quite similar to RequestHeader directives support.
Includes updated documentation and a simple spec test. Fixes issue #573.
---
 README.md                   | 14 ++++++++++++++
 manifests/vhost.pp          |  8 ++++++--
 spec/defines/vhost_spec.rb  |  9 +++++++++
 templates/vhost.conf.erb    |  1 +
 templates/vhost/_header.erb | 10 ++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 templates/vhost/_header.erb

diff --git a/README.md b/README.md
index a4f9e50862..cb3ca5a6aa 100644
--- a/README.md
+++ b/README.md
@@ -863,6 +863,20 @@ Specifies paths to additional static vhost-specific Apache configuration files.
 This option is useful when you need to implement a unique and/or custom
 configuration not supported by this module.
 
+#####`headers`
+
+Specifies additional response headers as per [the `mod_headers` documentation](http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header).
+
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      headers => [
+        'add Strict-Transport-Security "max-age=15768000"',
+        'merge Cache-Control no-cache env=CGI',
+      ],
+    }
+```
+
 #####`ip`
 
 The IP address the vhost listens on. Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 641962d582..7d7046d26f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -23,6 +23,7 @@
 #   of 'warn' is used.
 # - The $access_log specifies if *_access.log directives should be configured.
 # - The $ensure specifies if vhost file is present or absent.
+# - The $headers is a list of Header statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header
 # - The $request_headers is a list of RequestHeader statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
 # - $aliases is a list of Alias hashes for mod_alias as per http://httpd.apache.org/docs/current/mod/mod_alias.html
 #   each statement is a hash in the form of { alias => '/alias', path => '/real/path/to/directory' }
@@ -149,6 +150,7 @@
     $redirect_dest               = undef,
     $redirect_status             = undef,
     $rack_base_uris              = undef,
+    $headers                     = undef,
     $request_headers             = undef,
     $rewrites                    = undef,
     $rewrite_rule                = undef,
@@ -381,8 +383,8 @@
     $priority_real = '25'
   }
 
-  # Check if mod_headers is required to process $request_headers
-  if $request_headers {
+  # Check if mod_headers is required to process $headers/$request_headers
+  if $headers or $request_headers {
     if ! defined(Class['apache::mod::headers']) {
       include apache::mod::headers
     }
@@ -449,6 +451,8 @@
   #   - $redirect_source
   #   - $redirect_dest
   #   - $redirect_status
+  # header fragment
+  #   - $headers
   # requestheader fragment:
   #   - $request_headers
   # rewrite fragment:
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 31233d6338..7c96d936be 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -399,6 +399,15 @@
             /^  RackBaseURI \/rack2$/,
           ],
         },
+        {
+          :title => 'should accept headers',
+          :attr  => 'headers',
+          :value => ['add something', 'merge something_else'],
+          :match => [
+            /^  Header add something$/,
+            /^  Header merge something_else$/,
+          ],
+        },
         {
           :title => 'should accept request headers',
           :attr  => 'request_headers',
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index ea10143f7d..6245f63fe1 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -56,6 +56,7 @@
 <%= scope.function_template(['apache/vhost/_ssl.erb']) -%>
 <%= scope.function_template(['apache/vhost/_suphp.erb']) -%>
 <%= scope.function_template(['apache/vhost/_php_admin.erb']) -%>
+<%= scope.function_template(['apache/vhost/_header.erb']) -%>
 <%= scope.function_template(['apache/vhost/_requestheader.erb']) -%>
 <%= scope.function_template(['apache/vhost/_wsgi.erb']) -%>
 <%= scope.function_template(['apache/vhost/_custom_fragment.erb']) -%>
diff --git a/templates/vhost/_header.erb b/templates/vhost/_header.erb
new file mode 100644
index 0000000000..c0f68c8257
--- /dev/null
+++ b/templates/vhost/_header.erb
@@ -0,0 +1,10 @@
+<% if @headers and ! @headers.empty? -%>
+
+  ## Header rules
+  ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header
+  <%- Array(@headers).each do |header_statement| -%>
+    <%- if header_statement != '' -%>
+  Header <%= header_statement %>
+    <%- end -%>
+  <%- end -%>
+<% end -%>

From 0c1731c44df5964be5da46e65cd977b3c181ef72 Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Mon, 20 Jan 2014 15:11:09 -0800
Subject: [PATCH 0112/2267] Remove spec:system references and remove tabs from
 docs

---
 CONTRIBUTING.md | 12 ++++++------
 README.md       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4a4ec6f656..e1288478a2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ Checklist (and a short version for the impatient)
       number(s)), and should skip the full stop.
 
     - Associate the issue in the message. The first line should include
-			the issue number in the form "(#XXXX) Rest of message".
+      the issue number in the form "(#XXXX) Rest of message".
 
     - The body should provide a meaningful commit message, which:
 
@@ -31,8 +31,8 @@ Checklist (and a short version for the impatient)
     - Make sure that you have tests for the bug you are fixing, or
       feature you are adding.
 
-    - Make sure the test suites passe after your commit:
-      `rake spec spec:system` More information on [testing](#Testing) below
+    - Make sure the test suites passes after your commit:
+      `bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
 
     - When introducing a new feature, make sure it is properly
       documented in the README.md
@@ -64,7 +64,7 @@ The long version
   1.  Make separate commits for logically separate changes.
 
       Please break your commits down into logically consistent units
-      which include new or changed tests relevent to the rest of the
+      which include new or changed tests relevant to the rest of the
       change.  The goal of doing this is to make the diff easier to
       read for whoever is reviewing your code.  In general, the easier
       your diff is to read, the more likely someone will be happy to
@@ -91,7 +91,7 @@ The long version
       includes them.
 
       Please also check that you are not introducing any trailing
-      whitespaces or other "whitespace errors".  You can do this by
+      whitespace or other "whitespace errors".  You can do this by
       running "git diff --check" on your changes before you commit.
 
   2.  Sign the Contributor License Agreement
@@ -129,7 +129,7 @@ The long version
       If there is a GitHub issue associated with the change you
       submitted, then you should update the ticket to include the
       location of your branch, along with any other commentary you
-			may wish to make.
+      may wish to make.
 
 Testing
 =======
diff --git a/README.md b/README.md
index a4f9e50862..70f2dbc654 100644
--- a/README.md
+++ b/README.md
@@ -1496,7 +1496,7 @@ Quickstart:
     gem install bundler
     bundle install
     bundle exec rake spec
-    bundle exec rake spec:system
+    bundle exec rspec spec/acceptance
 
 ##Copyright and License
 

From ebbda9a6322d3f61ace6dc4c9affec8fa3e8f8e5 Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Mon, 20 Jan 2014 15:05:24 -0800
Subject: [PATCH 0113/2267] Add puppet-lint options to Rakefile

---
 Rakefile                         | 8 ++++++++
 manifests/default_confd_files.pp | 3 +++
 manifests/default_mods.pp        | 3 +++
 manifests/mod.pp                 | 4 ++--
 tests/vhost.pp                   | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index cd3d379958..9020623179 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1 +1,9 @@
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+
+PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send('disable_class_parameter_defaults')
+PuppetLint.configuration.send('disable_documentation')
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
index b45de86653..e40840e335 100644
--- a/manifests/default_confd_files.pp
+++ b/manifests/default_confd_files.pp
@@ -7,6 +7,9 @@
       'freebsd': {
         include apache::confd::no_accf
       }
+      default: {
+        # do nothing
+      }
     }
   }
 }
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 536cd7e334..f1f271eae3 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -86,6 +86,9 @@
       'worker': {
         include apache::mod::cgid
       }
+      default: {
+        # do nothing
+      }
     }
     include apache::mod::alias
     include apache::mod::autoindex
diff --git a/manifests/mod.pp b/manifests/mod.pp
index f11efc53b8..e8ce8a9ab5 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -19,7 +19,7 @@
   $mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
   if $lib {
     $_lib = $lib
-  } elsif "${mod_lib}" {
+  } elsif $mod_lib {
     $_lib = $mod_lib
   } else {
     $_lib = "mod_${mod}.so"
@@ -43,7 +43,7 @@
   $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
   if $package {
     $_package = $package
-  } elsif "${mod_package}" {
+  } elsif $mod_package {
     $_package = $mod_package
   }
   if $_package and ! defined(Package[$_package]) {
diff --git a/tests/vhost.pp b/tests/vhost.pp
index 7adc1213ed..f0d3f58e47 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -225,7 +225,7 @@
         ssl_protocol          => '-ALL +SSLv3 +TLSv1',
         ssl_cipher            => 'ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM',
         ssl_honorcipherorder  => 'On',
-        add_listen            => 'false',
+        add_listen            => false,
 }
 
 # Vhost with access log environment variables writing control

From 005bf615c96254f74cb2fd53207922ee50abcb2a Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Thu, 9 Jan 2014 10:45:17 +0000
Subject: [PATCH 0114/2267] Configure Passenger in separate .conf file on RH so
 PassengerRoot isn't lost

The mod_passenger RPM supplies /etc/httpd/conf.d/passenger.conf with the
correct PassengerRoot for the version of the package installed.  The most
reliable way to keep the PassengerRoot accurate is to leave this file in
place and then to install a second file (passenger_extra.conf) for other
Passenger customisations.

Hardcoding the PassengerRoot in the module means it gets out of step with
package repositories (3.0.21 is in EPEL6 at the time of writing, while the
module assumes .17).  Passenger 4.x refuses to start if the PassengerRoot is
incorrect.  The user of apache::mod::passenger is also able to override this
value, but they shouldn't be forced to, just to get a functioning install.

Fixes #560
---
 manifests/mod/passenger.pp         | 12 +++++++++++-
 manifests/params.pp                | 10 ++++++++--
 spec/classes/mod/passenger_spec.rb | 23 ++++++++++++++++++++---
 templates/mod/passenger.conf.erb   |  4 ++++
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index d4aba84907..e7561651d6 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -1,4 +1,6 @@
 class apache::mod::passenger (
+  $passenger_conf_file            = $apache::params::passenger_conf_file,
+  $passenger_conf_package_file    = $apache::params::passenger_conf_package_file,
   $passenger_high_performance     = undef,
   $passenger_pool_idle_time       = undef,
   $passenger_max_requests         = undef,
@@ -17,6 +19,14 @@
   } else {
     apache::mod { 'passenger': }
   }
+
+  # Managed by the package, but declare it to avoid purging
+  if $passenger_conf_package_file {
+    file { 'passenger_package.conf':
+      path => "${apache::mod_dir}/${passenger_conf_package_file}",
+    }
+  }
+
   # Template uses:
   # - $passenger_root
   # - $passenger_ruby
@@ -29,7 +39,7 @@
   # - $rails_autodetect
   file { 'passenger.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/passenger.conf",
+    path    => "${apache::mod_dir}/${passenger_conf_file}",
     content => template('apache/mod/passenger.conf.erb'),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
diff --git a/manifests/params.pp b/manifests/params.pp
index f846013c12..2a0554db12 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -56,8 +56,10 @@
     $default_ssl_cert     = '/etc/pki/tls/certs/localhost.crt'
     $default_ssl_key      = '/etc/pki/tls/private/localhost.key'
     $ssl_certs_dir        = '/etc/pki/tls/certs'
-    $passenger_root       = '/usr/share/rubygems/gems/passenger-3.0.17'
-    $passenger_ruby       = '/usr/bin/ruby'
+    $passenger_conf_file  = 'passenger_extra.conf'
+    $passenger_conf_package_file = 'passenger.conf'
+    $passenger_root       = undef
+    $passenger_ruby       = undef
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
@@ -115,6 +117,8 @@
     $default_ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key  = '/etc/ssl/private/ssl-cert-snakeoil.key'
     $ssl_certs_dir    = '/etc/ssl/certs'
+    $passenger_conf_file = 'passenger.conf'
+    $passenger_conf_package_file = undef
     $passenger_root   = '/usr'
     $passenger_ruby   = '/usr/bin/ruby'
     $suphp_addhandler  = 'x-httpd-php'
@@ -168,6 +172,8 @@
     $default_ssl_cert = '/usr/local/etc/apache22/server.crt'
     $default_ssl_key  = '/usr/local/etc/apache22/server.key'
     $ssl_certs_dir    = '/usr/local/etc/apache22'
+    $passenger_conf_file = 'passenger.conf'
+    $passenger_conf_package_file = undef
     $passenger_root   = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
     $passenger_ruby   = '/usr/bin/ruby'
     $suphp_addhandler = 'php5-script'
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index d186503e51..ace307b231 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -91,11 +91,28 @@
     it { should contain_class("apache::params") }
     it { should contain_apache__mod('passenger') }
     it { should contain_package("mod_passenger") }
-    it { should contain_file('passenger.conf').with({
+    it { should contain_file('passenger_package.conf').with({
       'path' => '/etc/httpd/conf.d/passenger.conf',
     }) }
-    it { should contain_file('passenger.conf').with_content(/^  PassengerRoot \/usr\/share\/rubygems\/gems\/passenger-3.0.17$/) }
-    it { should contain_file('passenger.conf').with_content(/^  PassengerRuby \/usr\/bin\/ruby$/) }
+    it { should contain_file('passenger_package.conf').without_content }
+    it { should contain_file('passenger_package.conf').without_source }
+    it { should contain_file('passenger.conf').with({
+      'path' => '/etc/httpd/conf.d/passenger_extra.conf',
+    }) }
+    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
+    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+    describe "with passenger_root => '/usr/lib/example'" do
+      let :params do
+        { :passenger_root => '/usr/lib/example' }
+      end
+      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot \/usr\/lib\/example$/) }
+    end
+    describe "with passenger_ruby => /user/lib/example/ruby" do
+      let :params do
+        { :passenger_ruby => '/user/lib/example/ruby' }
+      end
+      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby \/user\/lib\/example\/ruby$/) }
+    end
   end
   context "on a FreeBSD OS" do
     let :facts do
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index a2014cebb8..9395e2e39b 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -1,8 +1,12 @@
 # The Passanger Apache module configuration file is being
 # managed by Puppet and changes will be overwritten.
 <IfModule mod_passenger.c>
+  <%- if @passenger_root -%>
   PassengerRoot <%= @passenger_root %>
+  <%- end -%>
+  <%- if @passenger_ruby -%>
   PassengerRuby <%= @passenger_ruby %>
+  <%- end -%>
   <%- if @passenger_high_performance -%>
   PassengerHighPerformance <%= @passenger_high_performance %>
   <%- end -%>

From b8535962331908ff57c6afbb2b97f3d29be3e2b6 Mon Sep 17 00:00:00 2001
From: Garrett Honeycutt <code@garretthoneycutt.com>
Date: Thu, 23 Jan 2014 12:41:33 -0500
Subject: [PATCH 0115/2267] Enable fast finish in Travis

http://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b885627bfb..5efc64fa76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ env:
         n2CiR7V9V0mNR7/ymzDMF9yVBcgqyXMsp/C6u992Dd0U63ZwFpbRWkxuAeEY
         ioupWBkiczjVEo+sxn+gVOnx28pcH/X8kDWbr6wFOMIjO03K66Y=
 matrix:
+  fast_finish: true
   exclude:
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"

From f6eab06383783db2b801d71b116e39278328b913 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 23 Jan 2014 13:33:31 -0500
Subject: [PATCH 0116/2267] Delete this key, mistakenly added.

---
 spec/acceptance/nodesets/vagrant.key | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 spec/acceptance/nodesets/vagrant.key

diff --git a/spec/acceptance/nodesets/vagrant.key b/spec/acceptance/nodesets/vagrant.key
deleted file mode 100644
index 7d6a083909..0000000000
--- a/spec/acceptance/nodesets/vagrant.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
-w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
-kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
-hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
-Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
-yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
-ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
-Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
-TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
-iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
-sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
-4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
-cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
-EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
-CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
-3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
-YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
-3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
-dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
-6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
-P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
-llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
-kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
-+vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
-NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
------END RSA PRIVATE KEY-----

From 9cb01950d925c66277f328bec59243081da79764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Sun, 15 Dec 2013 21:46:37 +0100
Subject: [PATCH 0117/2267] directories are either a Hash or an Array of Hashes

this should fix #535

n.b.: older versions of puppet do not support unless
btw: When you switch from unless to if, you must also switch from
'foo or bar' to '!foo and !bar', because, logic.
---
 manifests/vhost.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f740c5e361..b339134cae 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -395,6 +395,9 @@
 
   ## Create a default directory list if none defined
   if $directories {
+    if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {
+      fail("Apache::Vhost[${name}]: 'directories' must be either a Hash or an Array of Hashes")
+    }
     $_directories = $directories
   } else {
     $_directories = [ {

From 5f43d825ec30239e315e1378f9a982dd123fc026 Mon Sep 17 00:00:00 2001
From: Guillaume Virlet <github@virlet.org>
Date: Sun, 26 Jan 2014 11:41:59 +0100
Subject: [PATCH 0118/2267] allow AuthGroupFile directive for vhosts

---
 templates/vhost/_directories.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 66a97dec83..0d74c450a0 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -108,6 +108,9 @@
     <%- if directory['auth_user_file'] -%>
     AuthUserFile <%= directory['auth_user_file'] %>
     <%- end -%>
+    <%- if directory['auth_group_file'] -%>
+    AuthGroupFile <%= directory['auth_group_file'] %>
+    <%- end -%>
     <%- if directory['auth_require'] -%>
     Require <%= directory['auth_require'] %>
     <%- end -%>

From 4f1f6cbc810d9eacf5dcb7005f40551bd1eed419 Mon Sep 17 00:00:00 2001
From: Guillaume Virlet <github@virlet.org>
Date: Sun, 26 Jan 2014 15:53:45 +0100
Subject: [PATCH 0119/2267] add auth_group_file option to README.md [ci skip]

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 407188946b..97fb7b963c 100644
--- a/README.md
+++ b/README.md
@@ -738,6 +738,11 @@ documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_basic.html#authbas
 Sets the value for `AuthUserFile` as per the [Apache AuthUserFile
 documentation](https://httpd.apache.org/docs/2.2/mod/mod_authn_file.html#authuserfile).
 
+######`auth_group_file`
+
+Sets the value for `AuthGroupFile` as per the [Apache AuthGroupFile
+documentation](https://httpd.apache.org/docs/2.2/mod/mod_authz_groupfile.html#authgroupfile).
+
 ######`auth_require`
 
 Sets the value for `AuthName` as per the [Apache Require

From 0b3c069b060ddb6b3a0922efda3b8d1417d38914 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Sat, 11 Jan 2014 12:05:47 -0700
Subject: [PATCH 0120/2267] quote paths for windows compatability

---
 spec/classes/apache_spec.rb         |  8 +--
 spec/classes/mod/mime_magic_spec.rb |  8 +--
 spec/classes/mod/passenger_spec.rb  | 12 ++--
 spec/classes/mod/wsgi_spec.rb       |  2 +-
 spec/defines/vhost_spec.rb          | 96 ++++++++++++++---------------
 templates/httpd.conf.erb            | 12 ++--
 templates/mod/cgid.conf.erb         |  2 +-
 templates/mod/dav_fs.conf.erb       |  2 +-
 templates/mod/fastcgi.conf.erb      |  2 +-
 templates/mod/mime_magic.conf.erb   |  2 +-
 templates/mod/nss.conf.erb          | 20 +++---
 templates/mod/passenger.conf.erb    |  6 +-
 templates/mod/peruser.conf.erb      |  4 +-
 templates/mod/ssl.conf.erb          |  2 +-
 templates/mod/userdir.conf.erb      |  2 +-
 templates/mod/wsgi.conf.erb         |  6 +-
 templates/vhost.conf.erb            | 10 +--
 templates/vhost/_aliases.erb        |  4 +-
 templates/vhost/_directories.erb    |  2 +-
 templates/vhost/_fastcgi.erb        |  2 +-
 templates/vhost/_scriptalias.erb    |  4 +-
 templates/vhost/_ssl.erb            | 14 ++---
 templates/vhost/_suphp.erb          |  2 +-
 templates/vhost/_wsgi.erb           |  2 +-
 24 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 7dd82d351c..655a0cf30a 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -213,10 +213,10 @@
         ) }
       end
 
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include /etc/httpd/conf\.d/\*\.conf$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include /etc/httpd/site\.d/\*\.conf$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include /etc/httpd/mod\.d/\*\.conf$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include /etc/httpd/mod\.d/\*\.load$} }
+      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
+      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*\.conf"$} }
+      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
+      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end
 
     describe "Alternate conf.d directory" do
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index 30e91ef097..d10d8345b8 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -21,7 +21,7 @@ def general_mime_magic_specs
 
     it do
       should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile /etc/apache2/magic\n"
+        "MIMEMagicFile \"/etc/apache2/magic\"\n"
       )
     end
 
@@ -41,7 +41,7 @@ def general_mime_magic_specs
 
       it do
         should contain_file("mime_magic.conf").with_content(
-          "MIMEMagicFile /tmp/Debian_magic\n"
+          "MIMEMagicFile \"/tmp/Debian_magic\"\n"
         )
       end
     end
@@ -61,7 +61,7 @@ def general_mime_magic_specs
 
     it do
       should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile /etc/httpd/conf/magic\n"
+        "MIMEMagicFile \"/etc/httpd/conf/magic\"\n"
       )
     end
 
@@ -84,7 +84,7 @@ def general_mime_magic_specs
 
     it do
       should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile /tmp/magic\n"
+        "MIMEMagicFile \"/tmp/magic\"\n"
       )
     end
   end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index ace307b231..37177f477f 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -16,8 +16,8 @@
     it { should contain_file('passenger.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
-    it { should contain_file('passenger.conf').with_content(/^  PassengerRoot \/usr$/) }
-    it { should contain_file('passenger.conf').with_content(/^  PassengerRuby \/usr\/bin\/ruby$/) }
+    it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr"$/) }
+    it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/bin\/ruby"$/) }
     describe "with passenger_high_performance => true" do
       let :params do
         { :passenger_high_performance => 'true' }
@@ -64,13 +64,13 @@
       let :params do
         { :passenger_root => '/usr/lib/example' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot \/usr\/lib\/example$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
     end
     describe "with passenger_ruby => /user/lib/example/ruby" do
       let :params do
         { :passenger_ruby => '/user/lib/example/ruby' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby \/user\/lib\/example\/ruby$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/user\/lib\/example\/ruby"$/) }
     end
     describe "with passenger_use_global_queue => true" do
       let :params do
@@ -105,13 +105,13 @@
       let :params do
         { :passenger_root => '/usr/lib/example' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot \/usr\/lib\/example$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
     end
     describe "with passenger_ruby => /user/lib/example/ruby" do
       let :params do
         { :passenger_ruby => '/user/lib/example/ruby' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby \/user\/lib\/example\/ruby$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/user\/lib\/example\/ruby"$/) }
     end
   end
   context "on a FreeBSD OS" do
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 8d26526cb2..44917cb88f 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -36,7 +36,7 @@
       let :params do
         { :wsgi_python_home => '/path/to/virtenv' }
       end
-      it {should contain_file('wsgi.conf').with_content(/^  WSGIPythonHome \/path\/to\/virtenv$/)}
+      it {should contain_file('wsgi.conf').with_content(/^  WSGIPythonHome "\/path\/to\/virtenv"$/)}
     end
   end
   context "on a FreeBSD OS" do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b1ab27503b..847768fffe 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -90,7 +90,7 @@
           :title => 'should contain docroot',
           :attr  => 'docroot',
           :value => '/not/default',
-          :match => [/^  DocumentRoot \/not\/default$/,/  <Directory \/not\/default>/],
+          :match => [/^  DocumentRoot "\/not\/default"$/,/  <Directory "\/not\/default">/],
         },
         {
           :title => 'should set a port',
@@ -165,7 +165,7 @@
           :title => 'should accept logroot',
           :attr  => 'logroot',
           :value => '/fake/log',
-          :match => [/CustomLog \/fake\/log\//,/ErrorLog \/fake\/log\//],
+          :match => [/CustomLog "\/fake\/log\//,/ErrorLog "\/fake\/log\//],
         },
         {
           :title => 'should accept log_level',
@@ -189,31 +189,31 @@
           :title => 'should accept syslog destination for access log',
           :attr  => 'access_log_syslog',
           :value => 'syslog:local1',
-          :match => [/CustomLog syslog:local1 combined$/],
+          :match => [/CustomLog "syslog:local1" combined$/],
         },
         {
           :title => 'should accept syslog destination for error log',
           :attr  => 'error_log_syslog',
           :value => 'syslog',
-          :match => [/ErrorLog syslog$/],
+          :match => [/ErrorLog "syslog"$/],
         },
         {
           :title => 'should accept custom format for access logs',
           :attr  => 'access_log_format',
           :value => '%h %{X-Forwarded-For}i %l %u %t \"%r\" %s %b  \"%{Referer}i\" \"%{User-agent}i\" \"Host: %{Host}i\" %T %D',
-          :match => [/CustomLog \/var\/log\/.+_access\.log "%h %\{X-Forwarded-For\}i %l %u %t \\"%r\\" %s %b  \\"%\{Referer\}i\\" \\"%\{User-agent\}i\\" \\"Host: %\{Host\}i\\" %T %D"$/],
+          :match => [/CustomLog "\/var\/log\/.+_access\.log" "%h %\{X-Forwarded-For\}i %l %u %t \\"%r\\" %s %b  \\"%\{Referer\}i\\" \\"%\{User-agent\}i\\" \\"Host: %\{Host\}i\\" %T %D"$/],
         },
         {
           :title => 'should contain access logs',
           :attr  => 'access_log',
           :value => true,
-          :match => [/CustomLog \/var\/log\/.+_access\.log combined$/],
+          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined$/],
         },
         {
           :title    => 'should not contain access logs',
           :attr     => 'access_log',
           :value    => false,
-          :notmatch => [/CustomLog \/var\/log\/.+_access\.log combined$/],
+          :notmatch => [/CustomLog "\/var\/log\/.+_access\.log" combined$/],
         },
         {
           :title => 'should contain error logs',
@@ -269,7 +269,7 @@
           :attr  => 'scriptalias',
           :value => '/usr/scripts',
           :match => [
-            /^  ScriptAlias \/cgi-bin\/ \/usr\/scripts$/,
+            /^  ScriptAlias \/cgi-bin\/ "\/usr\/scripts"$/,
           ],
         },
         {
@@ -277,7 +277,7 @@
           :attr     => 'scriptaliases',
           :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
           :match    => [
-            /^  ScriptAlias \/blah\/ \/usr\/scripts$/,
+            /^  ScriptAlias \/blah\/ "\/usr\/scripts"$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
@@ -286,8 +286,8 @@
           :attr     => 'scriptaliases',
           :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2', 'path' => '/usr/scripts' } ],
           :match    => [
-            /^  ScriptAlias \/blah \/usr\/scripts$/,
-            /^  ScriptAlias \/blah2 \/usr\/scripts$/,
+            /^  ScriptAlias \/blah "\/usr\/scripts"$/,
+            /^  ScriptAlias \/blah2 "\/usr\/scripts"$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
@@ -296,8 +296,8 @@
           :attr     => 'scriptaliases',
           :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts2/' } ],
           :match    => [
-            /^  ScriptAlias \/blah \/usr\/scripts$/,
-            /^  ScriptAlias \/blah2\/ \/usr\/scripts2\/$/,
+            /^  ScriptAlias \/blah "\/usr\/scripts"$/,
+            /^  ScriptAlias \/blah2\/ "\/usr\/scripts2\/"$/,
           ],
           :nomatch  => [/ScriptAlias \/cgi\-bin\//],
         },
@@ -309,7 +309,7 @@
           ## use FOO instead of $1 here.
           :value    => [ { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' } ],
           :match    => [
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) \/usr\/local\/apache\/cgi-binFOO$/
+            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/
           ],
         },
         {
@@ -323,8 +323,8 @@
             { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
           ],
           :match    => [
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) \/usr\/local\/apache\/cgi-binFOO$/,
-            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" \/var\/www\/bin\/gitolite-suexec-wrapper\/FOO$/,
+            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/,
+            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" "\/var\/www\/bin\/gitolite-suexec-wrapper\/FOO"$/,
           ],
         },
         {
@@ -340,10 +340,10 @@
             { 'alias' => '/trac', 'path' => '/etc/apache2/trac.fcgi' },
           ],
           :match    => [
-            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" \/var\/www\/bin\/gitolite-suexec-wrapper\/FOO$/,
-            /^  ScriptAlias \/git \/var\/www\/gitweb\/index\.cgi$/,
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) \/usr\/local\/apache\/cgi-binFOO$/,
-            /^  ScriptAlias \/trac \/etc\/apache2\/trac.fcgi$/,
+            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" "\/var\/www\/bin\/gitolite-suexec-wrapper\/FOO"$/,
+            /^  ScriptAlias \/git "\/var\/www\/gitweb\/index\.cgi"$/,
+            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/,
+            /^  ScriptAlias \/trac "\/etc\/apache2\/trac.fcgi"$/,
           ],
         },
         {
@@ -477,13 +477,13 @@
           :title => 'should accept an array of alias hashes',
           :attr  => 'aliases',
           :value => [ { 'alias' => '/', 'path' => '/var/www'} ],
-          :match => [/^  Alias \/ \/var\/www$/],
+          :match => [/^  Alias \/ "\/var\/www"$/],
         },
         {
           :title => 'should accept an alias hash',
           :attr  => 'aliases',
           :value => { 'alias' => '/', 'path' => '/var/www'},
-          :match => [/^  Alias \/ \/var\/www$/],
+          :match => [/^  Alias \/ "\/var\/www"$/],
         },
         {
           :title => 'should accept multiple aliases',
@@ -494,9 +494,9 @@
             { 'alias' => '/css', 'path' => '/opt/someapp/css'},
           ],
           :match => [
-            /^  Alias \/ \/var\/www$/,
-            /^  Alias \/cgi-bin \/var\/www\/cgi-bin$/,
-            /^  Alias \/css \/opt\/someapp\/css$/,
+            /^  Alias \/ "\/var\/www"$/,
+            /^  Alias \/cgi-bin "\/var\/www\/cgi-bin"$/,
+            /^  Alias \/css "\/opt\/someapp\/css"$/,
           ],
         },
         {
@@ -585,7 +585,7 @@
           :title => 'should accept a wsgi script alias',
           :attr  => 'wsgi_script_aliases',
           :value => { '/' => '/var/www/myapp.wsgi'},
-          :match => [/^  WSGIScriptAlias \/ \/var\/www\/myapp.wsgi$/],
+          :match => [/^  WSGIScriptAlias \/ "\/var\/www\/myapp.wsgi"$/],
         },
         {
           :title => 'should accept multiple wsgi aliases',
@@ -596,9 +596,9 @@
             '/'     => '/usr/local/wsgi/scripts/myapp.wsgi',
           },
           :match => [
-            /^  WSGIScriptAlias \/wiki \/usr\/local\/wsgi\/scripts\/mywiki.wsgi$/,
-            /^  WSGIScriptAlias \/blog \/usr\/local\/wsgi\/scripts\/myblog.wsgi$/,
-            /^  WSGIScriptAlias \/ \/usr\/local\/wsgi\/scripts\/myapp.wsgi$/,
+            /^  WSGIScriptAlias \/wiki "\/usr\/local\/wsgi\/scripts\/mywiki.wsgi"$/,
+            /^  WSGIScriptAlias \/blog "\/usr\/local\/wsgi\/scripts\/myblog.wsgi"$/,
+            /^  WSGIScriptAlias \/ "\/usr\/local\/wsgi\/scripts\/myapp.wsgi"$/,
           ],
         },
         {
@@ -607,7 +607,7 @@
           :value    => { 'path' => '/opt/app' },
           :notmatch => ['  <Directory /rspec/docroot>'],
           :match    => [
-            /^  <Directory \/opt\/app>$/,
+            /^  <Directory "\/opt\/app">$/,
             /^    AllowOverride None$/,
             /^    Order allow,deny$/,
             /^    Allow from all$/,
@@ -628,7 +628,7 @@
             'passenger_enabled' => 'onf',
           },
           :match    => [
-            /^  <Directory \/opt\/app>$/,
+            /^  <Directory "\/opt\/app">$/,
             /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
             /^    Allow from rspec.org$/,
             /^    AllowOverride Lol$/,
@@ -661,7 +661,7 @@
             },
           ],
           :match    => [
-            /^  <Directory \/opt\/app1>$/,
+            /^  <Directory "\/opt\/app1">$/,
             /^    Allow from rspec.org$/,
             /^    AllowOverride AuthConfig Indexes$/,
             /^    Deny from google.com$/,
@@ -669,7 +669,7 @@
             /^    Order deny,yned$/,
             /^    PassengerEnabled onf$/,
             /^  <\/Directory>$/,
-            /^  <Directory \/opt\/app2>$/,
+            /^  <Directory "\/opt\/app2">$/,
             /^    AllowOverride None$/,
             /^    Order allow,deny$/,
             /^    Allow from all$/,
@@ -686,9 +686,9 @@
             { 'path' => '/rspec/docroot'}
           ],
           :match    => [
-            /^  <Directory \/opt\/app>$/,
-            /^  <Directory \/var\/www>$/,
-            /^  <Directory \/rspec\/docroot>$/,
+            /^  <Directory "\/opt\/app">$/,
+            /^  <Directory "\/var\/www">$/,
+            /^  <Directory "\/rspec\/docroot">$/,
           ],
         },
         {
@@ -700,7 +700,7 @@
           },
           :notmatch => ['    AllowOverride None'],
           :match => [
-            /^  <Location \/>$/,
+            /^  <Location "\/">$/,
             /^    Order allow,deny$/,
             /^    Allow from all$/,
             /^  <\/Location>$/,
@@ -715,7 +715,7 @@
           },
           :notmatch => ['    AllowOverride None'],
           :match => [
-            /^  <Files index.html>$/,
+            /^  <Files "index.html">$/,
             /^    Order allow,deny$/,
             /^    Allow from all$/,
             /^  <\/Files>$/,
@@ -726,14 +726,14 @@
           :attr  => 'virtual_docroot',
           :value => '/not/default',
           :match => [
-            /^  VirtualDocumentRoot \/not\/default$/,
+            /^  VirtualDocumentRoot "\/not\/default"$/,
           ],
         },
         {
           :title => 'should contain environment variables',
           :attr  => 'access_log_env_var',
           :value => 'admin',
-          :match => [/CustomLog \/var\/log\/.+_access\.log combined env=admin$/]
+          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined env=admin$/]
         },
 
       ].each do |param|
@@ -765,43 +765,43 @@
             :title => 'should accept setting SSLCertificateFile',
             :attr  => 'ssl_cert',
             :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateFile      \/path\/to\/cert\.pem$/],
+            :match => [/^  SSLCertificateFile      "\/path\/to\/cert\.pem"$/],
         },
         {
             :title => 'should accept setting SSLCertificateKeyFile',
             :attr  => 'ssl_key',
             :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateKeyFile   \/path\/to\/cert\.pem$/],
+            :match => [/^  SSLCertificateKeyFile   "\/path\/to\/cert\.pem"$/],
         },
         {
             :title => 'should accept setting SSLCertificateChainFile',
             :attr  => 'ssl_chain',
             :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateChainFile \/path\/to\/cert\.pem$/],
+            :match => [/^  SSLCertificateChainFile "\/path\/to\/cert\.pem"$/],
         },
         {
             :title => 'should accept setting SSLCertificatePath',
             :attr  => 'ssl_certs_dir',
             :value => '/path/to/certs',
-            :match => [/^  SSLCACertificatePath    \/path\/to\/certs$/],
+            :match => [/^  SSLCACertificatePath    "\/path\/to\/certs"$/],
         },
         {
             :title => 'should accept setting SSLCertificateFile',
             :attr  => 'ssl_ca',
             :value => '/path/to/ca.pem',
-            :match => [/^  SSLCACertificateFile    \/path\/to\/ca\.pem$/],
+            :match => [/^  SSLCACertificateFile    "\/path\/to\/ca\.pem"$/],
         },
         {
             :title => 'should accept setting SSLRevocationPath',
             :attr  => 'ssl_crl_path',
             :value => '/path/to/crl',
-            :match => [/^  SSLCARevocationPath     \/path\/to\/crl$/],
+            :match => [/^  SSLCARevocationPath     "\/path\/to\/crl"$/],
         },
         {
             :title => 'should accept setting SSLRevocationFile',
             :attr  => 'ssl_crl',
             :value => '/path/to/crl.pem',
-            :match => [/^  SSLCARevocationFile     \/path\/to\/crl\.pem$/],
+            :match => [/^  SSLCARevocationFile     "\/path\/to\/crl\.pem"$/],
         },
         {
             :title => 'should accept setting SSLProxyEngine',
@@ -983,7 +983,7 @@
         }) end
         it 'should set suphp_configpath' do
           should contain_file("25-#{title}.conf").with_content(
-            /^  suPHP_ConfigPath \/etc\/php5\/apache2$/
+            /^  suPHP_ConfigPath "\/etc\/php5\/apache2"$/
           )
         end
       end
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 469836ec34..50a4db41b8 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -28,7 +28,7 @@ AccessFileName .htaccess
 
 DefaultType none
 HostnameLookups Off
-ErrorLog <%= @logroot %>/<%= @error_log %>
+ErrorLog "<%= @logroot %>/<%= @error_log %>"
 LogLevel <%= @log_level %>
 EnableSendfile <%= @sendfile %>
 
@@ -41,20 +41,20 @@ EnableSendfile <%= @sendfile %>
 #LoadModule fake_module libexec/apache22/mod_fake.so
 <% end -%>
 
-Include <%= @mod_load_dir %>/*.load
+Include "<%= @mod_load_dir %>/*.load"
 <% if @mod_load_dir != @confd_dir and @mod_load_dir != @vhost_load_dir -%>
-Include <%= @mod_load_dir %>/*.conf
+Include "<%= @mod_load_dir %>/*.conf"
 <% end -%>
-Include <%= @ports_file %>
+Include "<%= @ports_file %>"
 
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 
-Include <%= @confd_dir %>/*.conf
+Include "<%= @confd_dir %>/*.conf"
 <% if @vhost_load_dir != @confd_dir -%>
-Include <%= @vhost_load_dir %>/*.conf
+Include "<%= @vhost_load_dir %>/*.conf"
 <% end -%>
 
 <% if @error_documents -%>
diff --git a/templates/mod/cgid.conf.erb b/templates/mod/cgid.conf.erb
index d771012de9..5f82d7424c 100644
--- a/templates/mod/cgid.conf.erb
+++ b/templates/mod/cgid.conf.erb
@@ -1 +1 @@
-ScriptSock <%= @cgisock_path %>
+ScriptSock "<%= @cgisock_path %>"
diff --git a/templates/mod/dav_fs.conf.erb b/templates/mod/dav_fs.conf.erb
index 50edf004e9..3c53e9e14b 100644
--- a/templates/mod/dav_fs.conf.erb
+++ b/templates/mod/dav_fs.conf.erb
@@ -1 +1 @@
-DAVLockDB <%= @dav_lock %>
+DAVLockDB "<%= @dav_lock %>"
diff --git a/templates/mod/fastcgi.conf.erb b/templates/mod/fastcgi.conf.erb
index d02b12f77f..8d94a23614 100644
--- a/templates/mod/fastcgi.conf.erb
+++ b/templates/mod/fastcgi.conf.erb
@@ -2,5 +2,5 @@
 # managed by Puppet and changes will be overwritten.
 <IfModule mod_fastcgi.c>
   AddHandler fastcgi-script .fcgi
-  FastCgiIpcDir <%= @fastcgi_lib_path %>
+  FastCgiIpcDir "<%= @fastcgi_lib_path %>"
 </IfModule>
diff --git a/templates/mod/mime_magic.conf.erb b/templates/mod/mime_magic.conf.erb
index 4826a765c9..1ce1bc3c16 100644
--- a/templates/mod/mime_magic.conf.erb
+++ b/templates/mod/mime_magic.conf.erb
@@ -1 +1 @@
-MIMEMagicFile <%= @magic_file %>
+MIMEMagicFile "<%= @magic_file %>"
diff --git a/templates/mod/nss.conf.erb b/templates/mod/nss.conf.erb
index 8fd538b761..a29101bb30 100644
--- a/templates/mod/nss.conf.erb
+++ b/templates/mod/nss.conf.erb
@@ -2,16 +2,16 @@
 # This is the Apache server configuration file providing SSL support using.
 # the mod_nss plugin.  It contains the configuration directives to instruct
 # the server how to serve pages over an https connection.
-# 
+#
 # Do NOT simply read the instructions in here without understanding
 # what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.  
+# consult the online docs. You have been warned.
 #
 
 #LoadModule nss_module modules/libmodnss.so
 
 #
-# When we also provide SSL we have to listen to the 
+# When we also provide SSL we have to listen to the
 # standard HTTP port (see above) and to the HTTPS port
 #
 # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
@@ -37,7 +37,7 @@ AddType application/x-pkcs7-crl    .crl
 #   The filtering dialog program (`builtin' is a internal
 #   terminal dialog) has to provide the pass phrase on stdout.
 <% if @passwd_file -%>
-NSSPassPhraseDialog  file:<%= @passwd_file %>
+NSSPassPhraseDialog  "file:<%= @passwd_file %>"
 <% else -%>
 NSSPassPhraseDialog  builtin
 <% end -%>
@@ -47,7 +47,7 @@ NSSPassPhraseDialog  builtin
 #   restarts of Apache.
 NSSPassPhraseHelper /usr/sbin/nss_pcache
 
-#   Configure the SSL Session Cache. 
+#   Configure the SSL Session Cache.
 #   NSSSessionCacheSize is the number of entries in the cache.
 #   NSSSessionCacheTimeout is the SSL2 session timeout (in seconds).
 #   NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds).
@@ -93,8 +93,8 @@ NSSRequireSafeNegotiation off
 
 # mod_nss can log to separate log files, you can choose to do that if you'd like
 # LogLevel is not inherited from httpd.conf.
-ErrorLog <%= @error_log %>
-TransferLog <%= @transfer_log %>
+ErrorLog "<%= @error_log %>"
+TransferLog "<%= @transfer_log %>"
 LogLevel warn
 
 #   SSL Engine Switch:
@@ -138,7 +138,7 @@ NSSNickname Server-Cert
 #   The NSS security database directory that holds the certificates and
 #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
 #   Provide the directory that these files exist.
-NSSCertificateDatabase <%= @httpd_dir -%>/alias
+NSSCertificateDatabase "<%= @httpd_dir -%>/alias"
 
 #   Database Prefix:
 #   In order to be able to store multiple NSS databases in one directory
@@ -209,7 +209,7 @@ NSSCertificateDatabase <%= @httpd_dir -%>/alias
 #     and no other module can change it.
 #   o OptRenegotiate:
 #     This enables optimized SSL connection renegotiation handling when SSL
-#     directives are used in per-directory context. 
+#     directives are used in per-directory context.
 #NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
 <Files ~ "\.(cgi|shtml|phtml|php3?)$">
     NSSOptions +StdEnvVars
@@ -224,5 +224,5 @@ NSSCertificateDatabase <%= @httpd_dir -%>/alias
 #CustomLog /home/rcrit/redhat/apache/logs/ssl_request_log \
 #          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
-</VirtualHost>                                  
+</VirtualHost>
 
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 9395e2e39b..63c3f9e61b 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -2,10 +2,10 @@
 # managed by Puppet and changes will be overwritten.
 <IfModule mod_passenger.c>
   <%- if @passenger_root -%>
-  PassengerRoot <%= @passenger_root %>
+  PassengerRoot "<%= @passenger_root %>"
   <%- end -%>
   <%- if @passenger_ruby -%>
-  PassengerRuby <%= @passenger_ruby %>
+  PassengerRuby "<%= @passenger_ruby %>"
   <%- end -%>
   <%- if @passenger_high_performance -%>
   PassengerHighPerformance <%= @passenger_high_performance %>
@@ -30,5 +30,5 @@
   <%- end -%>
   <%- if @passenger_use_global_queue -%>
   PassengerUseGlobalQueue <%= @passenger_use_global_queue %>
-  <%- end -%> 
+  <%- end -%>
 </IfModule>
diff --git a/templates/mod/peruser.conf.erb b/templates/mod/peruser.conf.erb
index 8f44c72b0b..13c8d708db 100644
--- a/templates/mod/peruser.conf.erb
+++ b/templates/mod/peruser.conf.erb
@@ -7,6 +7,6 @@
   IdleTimeout         <%= @idletimeout %>
   ExpireTimeout       <%= @expiretimeout %>
   KeepAlive           <%= @keepalive %>
-  Include             <%= @mod_dir %>/peruser/multiplexers/*.conf
-  Include             <%= @mod_dir %>/peruser/processors/*.conf
+  Include             "<%= @mod_dir %>/peruser/multiplexers/*.conf"
+  Include             "<%= @mod_dir %>/peruser/processors/*.conf"
 </IfModule>
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index d42b0ad61a..f66b1c958c 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -8,7 +8,7 @@
   AddType application/x-pkcs7-crl    .crl
 
   SSLPassPhraseDialog  builtin
-  SSLSessionCache shmcb:<%= @session_cache %>
+  SSLSessionCache "shmcb:<%= @session_cache %>"
   SSLSessionCacheTimeout 300
 <% if @ssl_compression -%>
   SSLCompression Off
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index cfe2e3879c..e4c6ba55dd 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -4,7 +4,7 @@
 <% end -%>
   UserDir <%= @dir %>
 
-  <Directory <%= @home %>/*/<%= @dir %>>
+  <Directory "<%= @home %>/*/<%= @dir %>">
     AllowOverride FileInfo AuthConfig Limit Indexes
     Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
     <Limit GET POST OPTIONS>
diff --git a/templates/mod/wsgi.conf.erb b/templates/mod/wsgi.conf.erb
index ea2a49d1ae..18752d2c4a 100644
--- a/templates/mod/wsgi.conf.erb
+++ b/templates/mod/wsgi.conf.erb
@@ -5,9 +5,9 @@
   WSGISocketPrefix <%= @wsgi_socket_prefix %>
   <%- end -%>
   <%- if @wsgi_python_home -%>
-  WSGIPythonHome <%= @wsgi_python_home %>
+  WSGIPythonHome "<%= @wsgi_python_home %>"
   <%- end -%>
   <%- if @wsgi_python_path -%>
-  WSGIPythonPath <%= @wsgi_python_path %>
-  <%- end -%>  
+  WSGIPythonPath "<%= @wsgi_python_path %>"
+  <%- end -%>
 </IfModule>
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 6245f63fe1..9d52ba7c0f 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -11,9 +11,9 @@
 
   ## Vhost docroot
 <% if @virtual_docroot -%>
-  VirtualDocumentRoot <%= @virtual_docroot %>
+  VirtualDocumentRoot "<%= @virtual_docroot %>"
 <% else -%>
-  DocumentRoot <%= @docroot %>
+  DocumentRoot "<%= @docroot %>"
 <% end -%>
 <%= scope.function_template(['apache/vhost/_aliases.erb']) -%>
 
@@ -33,16 +33,16 @@
 
   ## Logging
 <% if @error_log -%>
-  ErrorLog <%= @error_log_destination %>
+  ErrorLog "<%= @error_log_destination %>"
 <% end -%>
 <% if @log_level -%>
   LogLevel <%= @log_level %>
 <% end -%>
   ServerSignature Off
 <% if @access_log and @_access_log_env_var -%>
-  CustomLog <%= @access_log_destination %> <%= @_access_log_format %> <%= @_access_log_env_var %>
+  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %> <%= @_access_log_env_var %>
 <% elsif @access_log -%>
-  CustomLog <%= @access_log_destination %> <%= @_access_log_format %>
+  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %>
 <% end -%>
 <%= scope.function_template(['apache/vhost/_block.erb']) -%>
 <%= scope.function_template(['apache/vhost/_error_document.erb']) -%>
diff --git a/templates/vhost/_aliases.erb b/templates/vhost/_aliases.erb
index 484379bba3..5fdd76ba24 100644
--- a/templates/vhost/_aliases.erb
+++ b/templates/vhost/_aliases.erb
@@ -3,9 +3,9 @@
   <%- [@aliases].flatten.compact.each do |alias_statement| -%>
     <%- if alias_statement["path"] != '' -%>
       <%- if alias_statement["alias"] and alias_statement["alias"] != '' -%>
-  Alias <%= alias_statement["alias"] %> <%= alias_statement["path"] %>
+  Alias <%= alias_statement["alias"] %> "<%= alias_statement["path"] %>"
       <%- elsif alias_statement["aliasmatch"] and alias_statement["aliasmatch"] != '' -%>
-  AliasMatch <%= alias_statement["aliasmatch"] %> <%= alias_statement["path"] %>
+  AliasMatch <%= alias_statement["aliasmatch"] %> "<%= alias_statement["path"] %>"
       <%- end -%>
     <%- end -%>
   <%- end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 0d74c450a0..9fdbf5ede7 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -7,7 +7,7 @@
     <%- provider = 'Directory' -%>
   <%- end -%>
 
-  <<%= provider + ' ' + directory['path'] %>>
+  <<%= provider %> "<%= directory['path'] %>">
     <%- if directory['headers'] -%>
       <%- Array(directory['headers']).each do |header| -%>
     Header <%= header %>
diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
index f0ff72c6b2..86ecf92184 100644
--- a/templates/vhost/_fastcgi.erb
+++ b/templates/vhost/_fastcgi.erb
@@ -4,7 +4,7 @@
 <% end -%>
 <% if @fastcgi_dir -%>
 
-  <Directory <%= @fastcgi_dir %>>
+  <Directory "<%= @fastcgi_dir %>">
     Options +ExecCGI
     AllowOverride All
     SetHandler fastcgi-script
diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index cdf3b87e49..5a757f6170 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -15,9 +15,9 @@
 <%- aliases.each do |salias| -%>
   <%- if salias["path"] != '' -%>
     <%- if salias["alias"] and salias["alias"] != '' -%>
-  ScriptAlias <%= salias['alias'] %> <%= salias['path'] %>
+  ScriptAlias <%= salias['alias'] %> "<%= salias['path'] %>"
     <%- elsif salias["aliasmatch"] and salias["aliasmatch"] != '' -%>
-  ScriptAliasMatch <%= salias['aliasmatch'] %> <%= salias['path'] %>
+  ScriptAliasMatch <%= salias['aliasmatch'] %> "<%= salias['path'] %>"
     <%- end -%>
   <%- end -%>
 <%- end -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 96027dce78..03c78ef427 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -2,20 +2,20 @@
 
   ## SSL directives
   SSLEngine on
-  SSLCertificateFile      <%= @ssl_cert %>
-  SSLCertificateKeyFile   <%= @ssl_key %>
+  SSLCertificateFile      "<%= @ssl_cert %>"
+  SSLCertificateKeyFile   "<%= @ssl_key %>"
 <% if @ssl_chain -%>
-  SSLCertificateChainFile <%= @ssl_chain %>
+  SSLCertificateChainFile "<%= @ssl_chain %>"
 <% end -%>
-  SSLCACertificatePath    <%= @ssl_certs_dir %>
+  SSLCACertificatePath    "<%= @ssl_certs_dir %>"
 <% if @ssl_ca -%>
-  SSLCACertificateFile    <%= @ssl_ca %>
+  SSLCACertificateFile    "<%= @ssl_ca %>"
 <% end -%>
 <% if @ssl_crl_path -%>
-  SSLCARevocationPath     <%= @ssl_crl_path %>
+  SSLCARevocationPath     "<%= @ssl_crl_path %>"
 <% end -%>
 <% if @ssl_crl -%>
-  SSLCARevocationFile     <%= @ssl_crl %>
+  SSLCARevocationFile     "<%= @ssl_crl %>"
 <% end -%>
 <% if @ssl_proxyengine -%>
   SSLProxyEngine On
diff --git a/templates/vhost/_suphp.erb b/templates/vhost/_suphp.erb
index 37aa299aa9..9389581805 100644
--- a/templates/vhost/_suphp.erb
+++ b/templates/vhost/_suphp.erb
@@ -6,6 +6,6 @@
   suPHP_Engine <%= @suphp_engine %>
 <% end -%>
 <% if @suphp_configpath -%>
-  suPHP_ConfigPath <%= @suphp_configpath %>
+  suPHP_ConfigPath "<%= @suphp_configpath %>"
 <% end -%>
 <% end -%>
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index d9970bddce..4a68eed8d6 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -9,7 +9,7 @@
 <% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
   <%- @wsgi_script_aliases.each do |a, p| -%>
     <%- if a != '' and p != ''-%>
-  WSGIScriptAlias <%= a %> <%= p %>
+  WSGIScriptAlias <%= a %> "<%= p %>"
     <%- end -%>
   <%- end -%>
 <% end -%>

From b47c68ddd1d9a033bdf4dd5d82b4950fcc8d3bbd Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Tue, 14 Jan 2014 11:59:41 -0700
Subject: [PATCH 0121/2267] add Match directive

---
 templates/vhost/_directories.erb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 9fdbf5ede7..1310bad3c7 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -6,8 +6,15 @@
   <%- else -%>
     <%- provider = 'Directory' -%>
   <%- end -%>
+  <%- if /^~(.*)/ =~ directory['path'] -%>
+  <%-# if /^~.*/.match(directory['path']) -%>
+    <%- path = $1.strip -%>
+    <%- provider += 'Match' -%>
+  <%- else -%>
+    <%- path = directory['path'] %>
+  <%- end -%>
 
-  <<%= provider %> "<%= directory['path'] %>">
+  <<%= provider %> "<%= path %>">
     <%- if directory['headers'] -%>
       <%- Array(directory['headers']).each do |header| -%>
     Header <%= header %>

From f4562009f21c6d37561655bc4daf9a51b37e9b67 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 29 Jan 2014 13:41:33 -0800
Subject: [PATCH 0122/2267] Revert "Update init.pp"

This reverts commit 61be25eae90d7fa6d09d3d6ed50b30bfda9e344c.
---
 manifests/init.pp | 53 ++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index e7d6ce9827..71a7e75569 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -217,30 +217,35 @@
   }
 
   if $apache::params::conf_dir and $apache::params::conf_file {
-    if $::osfamily == 'redhat' or $::operatingsystem == 'amazon' {
-      $docroot              = '/var/www/html'
-      $pidfile              = 'run/httpd.pid'
-      $error_log            = 'error_log'
-      $error_documents_path = '/var/www/error'
-      $scriptalias          = '/var/www/cgi-bin'
-      $access_log_file      = 'access_log'
-    } elsif $::osfamily == 'debian' {
-      $docroot              = '/var/www'
-      $pidfile              = '${APACHE_PID_FILE}'
-      $error_log            = 'error.log'
-      $error_documents_path = '/usr/share/apache2/error'
-      $scriptalias          = '/usr/lib/cgi-bin'
-      $access_log_file      = 'access.log'
-    } elsif $::osfamily == 'freebsd' {
-      $docroot              = '/usr/local/www/apache22/data'
-      $pidfile              = '/var/run/httpd.pid'
-      $error_log            = 'httpd-error.log'
-      $error_documents_path = '/usr/local/www/apache22/error'
-      $scriptalias          = '/usr/local/www/apache22/cgi-bin'
-      $access_log_file      = 'httpd-access.log'
-    } else {
-      fail("Unsupported osfamily ${::osfamily}")
-  }
+    case $::osfamily {
+      'debian': {
+        $docroot              = '/var/www'
+        $pidfile              = '${APACHE_PID_FILE}'
+        $error_log            = 'error.log'
+        $error_documents_path = '/usr/share/apache2/error'
+        $scriptalias          = '/usr/lib/cgi-bin'
+        $access_log_file      = 'access.log'
+      }
+      'redhat': {
+        $docroot              = '/var/www/html'
+        $pidfile              = 'run/httpd.pid'
+        $error_log            = 'error_log'
+        $error_documents_path = '/var/www/error'
+        $scriptalias          = '/var/www/cgi-bin'
+        $access_log_file      = 'access_log'
+      }
+      'freebsd': {
+        $docroot              = '/usr/local/www/apache22/data'
+        $pidfile              = '/var/run/httpd.pid'
+        $error_log            = 'httpd-error.log'
+        $error_documents_path = '/usr/local/www/apache22/error'
+        $scriptalias          = '/usr/local/www/apache22/cgi-bin'
+        $access_log_file      = 'httpd-access.log'
+      }
+      default: {
+        fail("Unsupported osfamily ${::osfamily}")
+      }
+    }
 
     $apxs_workaround = $::osfamily ? {
       'freebsd' => true,

From 5501994147f55ff97326ad1bda193ccf4e038afe Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 29 Jan 2014 13:41:42 -0800
Subject: [PATCH 0123/2267] Revert "Update alias.pp"

This reverts commit 8b16a339b7caec483a3fd4699e42d8f93e429e19.
---
 manifests/mod/alias.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index aab196eaf2..2880697236 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,8 +1,7 @@
 class apache::mod::alias {
-  $icons_path = $::osfamily or $::operatingsystem ? {
+  $icons_path = $::osfamily ? {
     'debian'  => '/usr/share/apache2/icons',
     'redhat'  => '/var/www/icons',
-    'amazon'  => '/var/www/icons',
     'freebsd' => '/usr/local/www/apache22/icons',
   }
   apache::mod { 'alias': }

From 016fbcaaf7e1c4c3bd9e1bde7982680d7a51cf0b Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Wed, 29 Jan 2014 23:52:32 +0000
Subject: [PATCH 0124/2267] Template file and spec test quote fix

Added quotes to Include in vhost.conf.erb
Added quotes to the expected results in the spec ruby fies
---
 spec/acceptance/apache_parameters_spec.rb |  2 +-
 spec/acceptance/apache_ssl_spec.rb        | 24 +++++++++----------
 spec/acceptance/vhost_spec.rb             | 28 +++++++++++------------
 templates/vhost.conf.erb                  |  2 +-
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index be398f0167..b2083f34fb 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -236,7 +236,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
 
     describe file(conf_file) do
       it { should be_file }
-      it { should contain 'Include /tmp/root/*.conf' }
+      it { should contain 'Include "/tmp/root/*.conf"' }
     end
   end
 
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index f577e5e934..2d45e40498 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -28,12 +28,12 @@ class { 'apache':
 
     describe file("#{vhostd}/15-default-ssl.conf") do
       it { should be_file }
-      it { should contain 'SSLCertificateFile      /tmp/ssl_cert' }
-      it { should contain 'SSLCertificateKeyFile   /tmp/ssl_key' }
-      it { should contain 'SSLCertificateChainFile /tmp/ssl_chain' }
-      it { should contain 'SSLCACertificateFile    /tmp/ssl_ca' }
-      it { should contain 'SSLCARevocationPath     /tmp/ssl_crl_path' }
-      it { should contain 'SSLCARevocationFile     /tmp/ssl_crl' }
+      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
+      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
+      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
+      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
+      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
     end
   end
 
@@ -68,12 +68,12 @@ class { 'apache':
 
     describe file("#{vhostd}/25-test_ssl.conf") do
       it { should be_file }
-      it { should contain 'SSLCertificateFile      /tmp/ssl_cert' }
-      it { should contain 'SSLCertificateKeyFile   /tmp/ssl_key' }
-      it { should contain 'SSLCertificateChainFile /tmp/ssl_chain' }
-      it { should contain 'SSLCACertificateFile    /tmp/ssl_ca' }
-      it { should contain 'SSLCARevocationPath     /tmp/ssl_crl_path' }
-      it { should contain 'SSLCARevocationFile     /tmp/ssl_crl' }
+      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
+      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
+      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
+      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
+      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
       it { should contain 'SSLProxyEngine On' }
       it { should contain 'SSLProtocol             test' }
       it { should contain 'SSLCipherSuite          test' }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 9fc24ff170..8ffff37550 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -180,7 +180,7 @@ class { 'apache': }
             docroot     => '/var/www/files',
             directories => [
               { 'path' => '/var/www/files', },
-              { 'path' => '~ "(\.swp|\.bak|~)$"', 'provider' => 'files', 'deny' => 'from all' },
+              { 'path' => '~ (\.swp|\.bak|~)$', 'provider' => 'files', 'deny' => 'from all' },
             ],
           }
           file { '/var/www/files/index.html':
@@ -222,7 +222,7 @@ class { 'apache': }
               },
               {
                 'provider' => 'files',
-                'path'     => '~ "private.html$"',
+                'path'     => '~ private.html$',
                 'deny'     => 'from all',
               },
             ],
@@ -510,7 +510,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'CustomLog /tmp' }
+      it { should contain '  CustomLog "/tmp"' }
     end
   end
 
@@ -538,7 +538,7 @@ class { 'apache': }
 
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
-        it { should_not contain "#{logname} /tmp" }
+        it { should_not contain "  #{logname} \"/tmp\"" }
       end
     end
 
@@ -558,7 +558,7 @@ class { 'apache': }
 
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
-        it { should contain "#{logname} \"|test\"" }
+        it { should contain "  #{logname} \"|test\"" }
       end
     end
 
@@ -578,7 +578,7 @@ class { 'apache': }
 
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
-        it { should contain "#{logname} syslog" }
+        it { should contain "  #{logname} \"syslog\"" }
       end
     end
   end
@@ -600,7 +600,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'CustomLog syslog "%h %l"' }
+      it { should contain 'CustomLog "syslog" "%h %l"' }
     end
   end
 
@@ -621,7 +621,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'CustomLog syslog combined env=admin' }
+      it { should contain 'CustomLog "syslog" combined env=admin' }
     end
   end
 
@@ -640,7 +640,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'Alias /image /ftp/pub/image' }
+      it { should contain 'Alias /image "/ftp/pub/image"' }
     end
   end
 
@@ -659,7 +659,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'ScriptAlias /myscript /usr/share/myscript' }
+      it { should contain 'ScriptAlias /myscript "/usr/share/myscript"' }
     end
   end
 
@@ -701,7 +701,7 @@ class { 'apache': service_ensure => stopped, }
       it { should be_file }
       it { should contain "suPHP_AddHandler #{suphp_handler}" }
       it { should contain 'suPHP_Engine on' }
-      it { should contain "suPHP_ConfigPath #{suphp_configpath}" }
+      it { should contain "suPHP_ConfigPath \"#{suphp_configpath}\"" }
     end
   end
 
@@ -883,7 +883,7 @@ class { 'apache::mod::wsgi': }
       it { should be_file }
       it { should contain 'WSGIDaemonProcess wsgi processes=2' }
       it { should contain 'WSGIProcessGroup vagrant' }
-      it { should contain 'WSGIScriptAlias /test /test1' }
+      it { should contain 'WSGIScriptAlias /test "/test1"' }
     end
   end
 
@@ -946,7 +946,7 @@ class { 'apache::mod::fastcgi': }
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
         it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
-        it { should contain '<Directory /tmp/fast>' }
+        it { should contain '<Directory "/tmp/fast">' }
       end
     end
   end
@@ -967,7 +967,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'Include /tmp/include' }
+      it { should contain 'Include "/tmp/include"' }
     end
   end
 
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 9d52ba7c0f..0eb69b0096 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -28,7 +28,7 @@
 
   ## Load additional static includes
 <% Array(@additional_includes).each do |include| %>
-  Include <%= include %>
+  Include "<%= include %>"
 <% end %>
 
   ## Logging

From 4ef8dfe69296cbc2e0e0267574c7adfeb6900d63 Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Thu, 30 Jan 2014 00:15:08 +0000
Subject: [PATCH 0125/2267] Look for match at end of provider

Check for the match string at the end of the provider instead of looking for tilde
---
 templates/vhost/_directories.erb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 1310bad3c7..25fba8312d 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -2,17 +2,12 @@
   <%- [@_directories].flatten.compact.each do |directory| -%>
     <%- if directory['path'] and directory['path'] != '' -%>
   <%- if directory['provider'] and [ 'directory', 'location', 'files' ].include?(directory['provider']) -%>
-    <%- provider = directory['provider'].capitalize -%>
+    <%- if /^(.*)match$/ =~ directory['provider'] -%>
+      <%- provider = directory['provider'].capitalize + 'Match' -%>
+    <%- end -%>
   <%- else -%>
     <%- provider = 'Directory' -%>
   <%- end -%>
-  <%- if /^~(.*)/ =~ directory['path'] -%>
-  <%-# if /^~.*/.match(directory['path']) -%>
-    <%- path = $1.strip -%>
-    <%- provider += 'Match' -%>
-  <%- else -%>
-    <%- path = directory['path'] %>
-  <%- end -%>
 
   <<%= provider %> "<%= path %>">
     <%- if directory['headers'] -%>

From 0bb57ae43b5d96f9ee4db65f22e0c0efc4e95d32 Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Thu, 30 Jan 2014 00:21:03 +0000
Subject: [PATCH 0126/2267] Fixed some template and specs for FilesMatch

---
 spec/acceptance/vhost_spec.rb |  6 +++---
 templates/httpd.conf.erb      | 10 +++++-----
 templates/mod/nss.conf.erb    |  4 ++--
 tests/vhost_directories.pp    |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 8ffff37550..e8630d6918 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -180,7 +180,7 @@ class { 'apache': }
             docroot     => '/var/www/files',
             directories => [
               { 'path' => '/var/www/files', },
-              { 'path' => '~ (\.swp|\.bak|~)$', 'provider' => 'files', 'deny' => 'from all' },
+              { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all' },
             ],
           }
           file { '/var/www/files/index.html':
@@ -221,8 +221,8 @@ class { 'apache': }
                 'directoryindex' => 'notindex.html',
               },
               {
-                'provider' => 'files',
-                'path'     => '~ private.html$',
+                'provider' => 'filesmatch',
+                'path'     => 'private.html$',
                 'deny'     => 'from all',
               },
             ],
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 50a4db41b8..0a03995b86 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -15,11 +15,11 @@ User <%= @user %>
 Group <%= @group %>
 
 AccessFileName .htaccess
-<Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
-    Satisfy all
-</Files>
+<FilesMatch "^\.ht">
+     Order allow,deny
+     Deny from all
+     Satisfy all
+</FilesMatch>
 
 <Directory />
   Options FollowSymLinks
diff --git a/templates/mod/nss.conf.erb b/templates/mod/nss.conf.erb
index a29101bb30..a5c81752f3 100644
--- a/templates/mod/nss.conf.erb
+++ b/templates/mod/nss.conf.erb
@@ -211,9 +211,9 @@ NSSCertificateDatabase "<%= @httpd_dir -%>/alias"
 #     This enables optimized SSL connection renegotiation handling when SSL
 #     directives are used in per-directory context.
 #NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
-<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+<FilesMatch "\.(cgi|shtml|phtml|php3?)$">
     NSSOptions +StdEnvVars
-</Files>
+</FilesMatch>
 <Directory "/var/www/cgi-bin">
     NSSOptions +StdEnvVars
 </Directory>
diff --git a/tests/vhost_directories.pp b/tests/vhost_directories.pp
index 945a660f4c..b8953ee321 100644
--- a/tests/vhost_directories.pp
+++ b/tests/vhost_directories.pp
@@ -35,8 +35,8 @@
   docroot     => '/var/www/files',
   directories => [
     {
-      'path'     => '~ (\.swp|\.bak|~)$',
-      'provider' => 'files',
+      'path'     => '(\.swp|\.bak|~)$',
+      'provider' => 'filesmatch',
       'deny'     => 'from all'
     },
   ],

From 332f6877958fc48f67d7cb2a8453203981eb546e Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Thu, 30 Jan 2014 09:04:16 +0000
Subject: [PATCH 0127/2267] Addd else to match check

---
 templates/vhost/_directories.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 25fba8312d..436dcfda6f 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -4,6 +4,8 @@
   <%- if directory['provider'] and [ 'directory', 'location', 'files' ].include?(directory['provider']) -%>
     <%- if /^(.*)match$/ =~ directory['provider'] -%>
       <%- provider = directory['provider'].capitalize + 'Match' -%>
+    <%- else -%>
+      <%- provider = directory['provider'].capitalize -%>
     <%- end -%>
   <%- else -%>
     <%- provider = 'Directory' -%>

From 2497a577402a96cb6ee21e4516dff57fa97115bc Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Thu, 30 Jan 2014 13:38:05 +0000
Subject: [PATCH 0128/2267] Added the path back in

---
 templates/vhost/_directories.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 436dcfda6f..d0d1515d2b 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -10,6 +10,7 @@
   <%- else -%>
     <%- provider = 'Directory' -%>
   <%- end -%>
+  <%- path = directory['path'] %>
 
   <<%= provider %> "<%= path %>">
     <%- if directory['headers'] -%>

From 66abac3da36a3697e0167f87f22cfb7267d6970f Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Thu, 30 Jan 2014 15:11:51 +0000
Subject: [PATCH 0129/2267] Fixed Include spec test

---
 spec/defines/vhost_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 847768fffe..57ee3a7714 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -534,9 +534,9 @@
             '/tmp/proxy_group_c',
           ],
           :match => [
-            /^  Include \/tmp\/proxy_group_a$/,
-            /^  Include \/tmp\/proxy_group_b$/,
-            /^  Include \/tmp\/proxy_group_c$/,
+            /^  Include "\/tmp\/proxy_group_a"$/,
+            /^  Include "\/tmp\/proxy_group_b"$/,
+            /^  Include "\/tmp\/proxy_group_c"$/,
           ],
         },
         {

From 0b8a23f45fe4538e4b35ee051ef05dada7853c3e Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 30 Jan 2014 11:22:28 -0800
Subject: [PATCH 0130/2267] Change serveradmin default to undef

`serveradmin` is expecting a string, but defaults to `false`. It should
be `undef` to match all the other string parameter defaults.
---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b339134cae..e67bc7b598 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -94,7 +94,7 @@
     $add_listen                  = true,
     $docroot_owner               = 'root',
     $docroot_group               = $apache::params::root_group,
-    $serveradmin                 = false,
+    $serveradmin                 = undef,
     $ssl                         = false,
     $ssl_cert                    = $apache::default_ssl_cert,
     $ssl_key                     = $apache::default_ssl_key,

From 531a6f13a13572a3ba1673e2fc7bdd2d860194e0 Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Thu, 30 Jan 2014 19:43:14 +0000
Subject: [PATCH 0131/2267] Added FilesMatch spec test and fixed template

---
 spec/defines/vhost_spec.rb       | 15 +++++++++++++++
 templates/vhost/_directories.erb |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 57ee3a7714..4fcb23dd47 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -721,6 +721,21 @@
             /^  <\/Files>$/,
           ],
         },
+        {
+          :title => 'should accept files match for provider',
+          :attr  => 'directories',
+          :value => {
+            'path'     => 'index.html',
+            'provider' => 'filesmatch',
+          },
+          :notmatch => ['    AllowOverride None'],
+          :match => [
+            /^  <FilesMatch "index.html">$/,
+            /^    Order allow,deny$/,
+            /^    Allow from all$/,
+            /^  <\/FilesMatch>$/,
+          ],
+        },
         {
           :title => 'should contain virtual_docroot',
           :attr  => 'virtual_docroot',
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index d0d1515d2b..986216a2cb 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -1,9 +1,9 @@
 <% if @_directories and ! @_directories.empty? -%>
   <%- [@_directories].flatten.compact.each do |directory| -%>
     <%- if directory['path'] and directory['path'] != '' -%>
-  <%- if directory['provider'] and [ 'directory', 'location', 'files' ].include?(directory['provider']) -%>
+  <%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
     <%- if /^(.*)match$/ =~ directory['provider'] -%>
-      <%- provider = directory['provider'].capitalize + 'Match' -%>
+      <%- provider = $1.capitalize + 'Match' -%>
     <%- else -%>
       <%- provider = directory['provider'].capitalize -%>
     <%- end -%>

From 3f18eb4c4fe9d217625fca3a8c73bd069687f489 Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Thu, 30 Jan 2014 23:17:12 +0000
Subject: [PATCH 0132/2267] Fixed the log pipe and more acceptance specs

---
 manifests/vhost.pp            | 4 ++--
 spec/acceptance/vhost_spec.rb | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b339134cae..789726be49 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -265,7 +265,7 @@
   if $access_log_file {
     $access_log_destination = "${logroot}/${access_log_file}"
   } elsif $access_log_pipe {
-    $access_log_destination = "\"${access_log_pipe}\""
+    $access_log_destination = "${access_log_pipe}"
   } elsif $access_log_syslog {
     $access_log_destination = $access_log_syslog
   } else {
@@ -279,7 +279,7 @@
   if $error_log_file {
     $error_log_destination = "${logroot}/${error_log_file}"
   } elsif $error_log_pipe {
-    $error_log_destination = "\"${error_log_pipe}\""
+    $error_log_destination = "${error_log_pipe}"
   } elsif $error_log_syslog {
     $error_log_destination = $error_log_syslog
   } else {
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e8630d6918..e6b8f1b928 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -510,7 +510,7 @@ class { 'apache': }
 
     describe file("#{vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain '  CustomLog "/tmp"' }
+      it { should contain '  CustomLog "/tmp' }
     end
   end
 
@@ -538,7 +538,7 @@ class { 'apache': }
 
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
-        it { should_not contain "  #{logname} \"/tmp\"" }
+        it { should_not contain "  #{logname} \"/tmp" }
       end
     end
 
@@ -558,7 +558,7 @@ class { 'apache': }
 
       describe file("#{vhost_dir}/25-test.server.conf") do
         it { should be_file }
-        it { should contain "  #{logname} \"|test\"" }
+        it { should contain "  #{logname} \"|test" }
       end
     end
 

From 9af1217b522941219bd679b4c24e5a86f6b163ae Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Fri, 31 Jan 2014 00:14:46 +0000
Subject: [PATCH 0133/2267] Debian mods-available no longer gets purged

---
 spec/acceptance/apache_parameters_spec.rb | 30 ++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index b2083f34fb..bcaa21f955 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -111,21 +111,23 @@ class { 'apache':
     end
   end
 
-  describe 'purge parameters => true' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          purge_configs => true,
-          purge_vdir    => true,
-        }
-      EOS
-      shell("touch #{confd_dir}/test.conf")
-      apply_manifest(pp, :catch_failures => true)
-    end
+  if fact('osfamily') != 'Debian'
+    describe 'purge parameters => true' do
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache':
+            purge_configs => true,
+            purge_vdir    => true,
+          }
+        EOS
+        shell("touch #{confd_dir}/test.conf")
+        apply_manifest(pp, :catch_failures => true)
+      end
 
-    # File should be gone
-    describe file("#{confd_dir}/test.conf") do
-      it { should_not be_file }
+      # File should be gone
+      describe file("#{confd_dir}/test.conf") do
+        it { should_not be_file }
+      end
     end
   end
 

From 510ecc6126fd76e1492adc1f45fea708ca9d08ec Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Thu, 30 Jan 2014 22:46:01 -0800
Subject: [PATCH 0134/2267] Release 0.11.0

Summary:

This release adds preliminary support for Windows compatibility and multiple rewrite support.

Backwards-incompatible Changes:

- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
  and will be removed in a future release.

Features:

- add Match directive
- quote paths for windows compatibility
- add auth_group_file option to README.md
- allow AuthGroupFile directive for vhosts
- Support Header directives in vhost context
- Don't purge mods-available dir when separate enable dir is used
- Fix the servername used in log file name
- Added support for mod_include
- Remove index parameters.
- Support environment variable control for CustomLog
- added redirectmatch support
- Setting up the ability to do multiple rewrites and conditions.
- Convert spec tests to beaker.
- Support php_admin_(flag|value)s

Bugfixes:

- directories are either a Hash or an Array of Hashes
- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
- (docs) Update list of `apache::mod::[name]` classes
- (docs) Fix apache::namevirtualhost example call style
- Fix $ports_file reference in apache::listen.
- Fix $ports_file reference in Namevirtualhost.
---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++
 Modulefile   |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9528972ecd..57d62e4c19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+## 2014-01-31 Release 0.11.0
+### Summary:
+
+This release adds preliminary support for Windows compatibility and multiple rewrite support.
+
+### Backwards-incompatible Changes:
+
+- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
+  and will be removed in a future release.
+
+### Features:
+
+- add Match directive
+- quote paths for windows compatibility
+- add auth_group_file option to README.md
+- allow AuthGroupFile directive for vhosts
+- Support Header directives in vhost context
+- Don't purge mods-available dir when separate enable dir is used
+- Fix the servername used in log file name
+- Added support for mod_include
+- Remove index parameters.
+- Support environment variable control for CustomLog
+- added redirectmatch support
+- Setting up the ability to do multiple rewrites and conditions.
+- Convert spec tests to beaker.
+- Support php_admin_(flag|value)s
+
+### Bugfixes:
+
+- directories are either a Hash or an Array of Hashes
+- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
+- (docs) Update list of `apache::mod::[name]` classes
+- (docs) Fix apache::namevirtualhost example call style
+- Fix $ports_file reference in apache::listen.
+- Fix $ports_file reference in Namevirtualhost.
+
+
 ## 2013-12-05 Release 0.10.0
 ### Summary:
 
diff --git a/Modulefile b/Modulefile
index 71bb19263f..1a1db1427f 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-apache'
-version '0.10.0'
+version '0.11.0'
 source 'git://github.com/puppetlabs/puppetlabs-apache.git'
 author 'puppetlabs'
 license 'Apache 2.0'

From 7a3b476de0d4da0004df7abe6b977c1988916e19 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 31 Jan 2014 10:02:02 -0800
Subject: [PATCH 0135/2267] Fix typos in templates/vhost/_itk.erb

Basically, this wouldn't have worked because of mass typos. FTFY
---
 templates/vhost/_itk.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/vhost/_itk.erb b/templates/vhost/_itk.erb
index 7d3bb51662..2971c7a7d0 100644
--- a/templates/vhost/_itk.erb
+++ b/templates/vhost/_itk.erb
@@ -4,11 +4,11 @@
      <%- if @itk["user"] and @itk["group"] -%>
      AssignUserId <%= @itk["user"] %> <%= @itk["group"] %>
      <%- end -%>
-     <%- if @itk["assignuieridexpr"] -%>
-     AssignUserIdExpr <%= @itk["assignuieridexpr"] %>
+     <%- if @itk["assignuseridexpr"] -%>
+     AssignUserIdExpr <%= @itk["assignuseridexpr"] %>
      <%- end -%>
-     <%- if @itk["assignuiergroupexpr"] -%>
-     AssignGroupIdExpr <%= @itk["assignuiergroupexpr"] %>
+     <%- if @itk["assigngroupidexpr"] -%>
+     AssignGroupIdExpr <%= @itk["assigngroupidexpr"] %>
      <%- end -%>
      <%- if @itk["maxclientvhost"] -%>
      MaxClientsVHost <%= @itk["maxclientvhost"] %>

From 9b77ec98b15fcc89596b74a72b4b7a9d5aebf874 Mon Sep 17 00:00:00 2001
From: jwilkins <jacob.wilkins@ge.com>
Date: Sat, 1 Feb 2014 16:23:44 -0500
Subject: [PATCH 0136/2267] templates/vhost/_proxy.erb misconfigures
 ProxyPassReverse

See here:
http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypassreverse

When enclosing ProxyPassReverse in a <Location> directive, you drop the
*first* argument, as it will be taken from the enclosing Location. The
second argument is the URL to which we are attempting to proxy.

Very simple change. Tested in my environment, works.
---
 templates/vhost/_proxy.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index a126dbc970..7e0221f957 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -6,7 +6,7 @@
 <% [@proxy_pass].flatten.compact.each do |proxy| %>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
   <Location <%= proxy['path']%>>
-    ProxyPassReverse /
+    ProxyPassReverse <%= proxy['url'] %>
   </Location>
 <% end %>
 <% if @proxy_dest -%>
@@ -15,6 +15,6 @@
 <% end %>
   ProxyPass          / <%= @proxy_dest %>/
   <Location          />
-    ProxyPassReverse /
+    ProxyPassReverse <%= @proxy_dest %>/
   </Location>
 <% end -%>

From 4f8f1640a7922b997ad6be788248fdf1ad58a2af Mon Sep 17 00:00:00 2001
From: Keith Johnson <kj@ubergeek42.com>
Date: Thu, 6 Feb 2014 11:21:31 -0500
Subject: [PATCH 0137/2267] Fix typo in mod passenger documentation

The rails_auto_detect and rack_auto_detect should not have an underscore between auto and detect.
---
 README.passenger.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.passenger.md b/README.passenger.md
index 4b36149dc2..cecacccc4f 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -49,13 +49,13 @@ Sets how often Passenger performs file system checks, at most once every _x_ sec
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
 
-## rack_auto_detect
+## rack_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is a Rack application. The default is `on`
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
 
-## rails_auto_detect
+## rails_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is a Rails application. The default is on.
 

From 37fced34ef82dc48d7488763f02694cf019e0f2c Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Sat, 28 Dec 2013 10:03:49 +0000
Subject: [PATCH 0138/2267] Added apache24 support

---
 manifests/default_mods.pp        |  33 ++++-
 manifests/init.pp                |   8 +-
 manifests/mod/alias.pp           |   4 +-
 manifests/mod/event.pp           |  14 ++-
 manifests/mod/itk.pp             |  19 +--
 manifests/mod/prefork.pp         |  38 +++---
 manifests/mod/ssl.pp             |  10 +-
 manifests/mod/worker.pp          |  37 +++---
 manifests/mpm.pp                 |  68 ++++++++++
 manifests/params.pp              |   2 +-
 manifests/version.pp             |  28 +++++
 manifests/vhost.pp               |  17 ++-
 spec/classes/apache_spec.rb      |  34 ++++-
 spec/classes/mod/event_spec.rb   |  71 +++++++++++
 spec/classes/mod/itk_spec.rb     |  29 ++++-
 spec/classes/mod/prefork_spec.rb |  62 +++++++++-
 spec/classes/mod/worker_spec.rb  |  59 ++++++++-
 spec/classes/params_spec.rb      |   4 +-
 spec/defines/vhost_spec.rb       | 206 +++++++++++++++++++++++++++----
 templates/httpd.conf.erb         |  12 ++
 templates/mod/alias.conf.erb     |   8 +-
 templates/mod/ssl.conf.erb       |   4 +
 templates/vhost/_directories.erb |  26 ++--
 23 files changed, 669 insertions(+), 124 deletions(-)
 create mode 100644 manifests/mpm.pp
 create mode 100644 manifests/version.pp

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index f1f271eae3..c8523fced1 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -1,6 +1,7 @@
 class apache::default_mods (
-  $all  = true,
-  $mods = undef,
+  $all            = true,
+  $mods           = undef,
+  $apache_version = $apache::apache_version
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
@@ -27,10 +28,8 @@
         include apache::mod::rewrite
         apache::mod { 'actions': }
         apache::mod { 'auth_digest': }
-        apache::mod { 'authn_alias': }
         apache::mod { 'authn_anon': }
         apache::mod { 'authn_dbm': }
-        apache::mod { 'authn_default': }
         apache::mod { 'authz_dbm': }
         apache::mod { 'authz_owner': }
         apache::mod { 'expires': }
@@ -42,6 +41,18 @@
         apache::mod { 'suexec': }
         apache::mod { 'usertrack': }
         apache::mod { 'version': }
+
+        if $apache_version >= 2.4 {
+          # Lets fork it
+          apache::mod { 'systemd': }
+
+          apache::mod { 'unixd': }
+          apache::mod { 'authn_core': }
+        }
+        else {
+          apache::mod { 'authn_alias': }
+          apache::mod { 'authn_default': }
+        }
       }
       'freebsd': {
         include apache::mod::cache
@@ -101,7 +112,19 @@
     include apache::mod::setenvif
     apache::mod { 'auth_basic': }
     apache::mod { 'authn_file': }
-    apache::mod { 'authz_default': }
+
+    if $apache_version >= 2.4 {
+      # authz_core is needed for 'Require' directive
+      apache::mod { 'authz_core':
+        id => 'authz_core_module',
+      }
+
+      # filter is needed by mod_deflate
+      apache::mod { 'filter': }
+    } else {
+      apache::mod { 'authz_default': }
+    }
+
     apache::mod { 'authz_groupfile': }
     apache::mod { 'authz_user': }
     apache::mod { 'env': }
diff --git a/manifests/init.pp b/manifests/init.pp
index 71a7e75569..94900ea5c1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -52,21 +52,21 @@
   $logroot              = $apache::params::logroot,
   $log_level            = $apache::params::log_level,
   $ports_file           = $apache::params::ports_file,
+  $apache_version       = $apache::version::default,
   $server_tokens        = 'OS',
   $server_signature     = 'On',
   $trace_enable         = 'On',
   $package_ensure       = 'installed',
 ) inherits apache::params {
-
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
   validate_bool($default_confd_files)
   # true/false is sufficient for both ensure and enable
   validate_bool($service_enable)
 
-  $valid_mpms_re = $::osfamily ? {
-    'FreeBSD' => '(event|itk|peruser|prefork|worker)',
-    default   => '(itk|prefork|worker)'
+  $valid_mpms_re = $apache_version ? {
+    2.4     => '(event|itk|peruser|prefork|worker)',
+    default => '(event|itk|prefork|worker)'
   }
 
   if $mpm_module {
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 2880697236..29ec831559 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,4 +1,6 @@
-class apache::mod::alias {
+class apache::mod::alias(
+  $apache_version = $apache::apache_version
+) {
   $icons_path = $::osfamily ? {
     'debian'  => '/usr/share/apache2/icons',
     'redhat'  => '/var/www/icons',
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 473f7c24cd..172113a287 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -6,6 +6,7 @@
   $threadsperchild     = '25',
   $maxrequestsperchild = '0',
   $serverlimit         = '25',
+  $apache_version      = $apache::apache_version,
 ) {
   if defined(Class['apache::mod::itk']) {
     fail('May not include both apache::mod::event and apache::mod::itk on the same node')
@@ -42,9 +43,16 @@
   }
 
   case $::osfamily {
-    'freebsd' : {
-      class { 'apache::package':
-        mpm_module => 'event'
+    'redhat': {
+      if $apache_version >= 2.4 {
+        apache::mpm{ 'event':
+          apache_version => $apache_version,
+        }
+      }
+    }
+    'debian','freebsd' : {
+      apache::mpm{ 'event':
+        apache_version => $apache_version,
       }
     }
     default: {
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 68ece8681a..cc582ac942 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -5,6 +5,7 @@
   $serverlimit         = '256',
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
+  $apache_version      = $apache::apache_version,
 ) {
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::itk and apache::mod::event on the same node')
@@ -40,21 +41,9 @@
   }
 
   case $::osfamily {
-    'debian' : {
-      file { "${apache::mod_enable_dir}/itk.conf":
-        ensure  => link,
-        target  => "${apache::mod_dir}/itk.conf",
-        require => Exec["mkdir ${apache::mod_enable_dir}"],
-        before  => File[$apache::mod_enable_dir],
-        notify  => Service['httpd'],
-      }
-      package { 'apache2-mpm-itk':
-        ensure => present,
-      }
-    }
-    'freebsd' : {
-      class { 'apache::package':
-        mpm_module => 'itk'
+    'debian', 'freebsd': {
+      apache::mpm{ 'itk':
+        apache_version => $apache_version,
       }
     }
     default: {
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index ecbf809a20..e5810829e4 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -5,6 +5,7 @@
   $serverlimit         = '256',
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
+  $apache_version      = $apache::apache_version,
 ) {
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
@@ -41,30 +42,25 @@
 
   case $::osfamily {
     'redhat': {
-      file_line { '/etc/sysconfig/httpd prefork enable':
-        ensure  => present,
-        path    => '/etc/sysconfig/httpd',
-        line    => '#HTTPD=/usr/sbin/httpd.worker',
-        match   => '#?HTTPD=/usr/sbin/httpd.worker',
-        require => Package['httpd'],
-        notify  => Service['httpd'],
+      if $apache_version >= 2.4 {
+        apache::mpm{ 'prefork':
+          apache_version => $apache_version,
+        }
       }
-    }
-    'debian': {
-      file { "${apache::mod_enable_dir}/prefork.conf":
-        ensure  => link,
-        target  => "${apache::mod_dir}/prefork.conf",
-        require => Exec["mkdir ${apache::mod_enable_dir}"],
-        before  => File[$apache::mod_enable_dir],
-        notify  => Service['httpd'],
-      }
-      package { 'apache2-mpm-prefork':
-        ensure => present,
+      else {
+        file_line { '/etc/sysconfig/httpd prefork enable':
+          ensure  => present,
+          path    => '/etc/sysconfig/httpd',
+          line    => '#HTTPD=/usr/sbin/httpd.worker',
+          match   => '#?HTTPD=/usr/sbin/httpd.worker',
+          require => Package['httpd'],
+          notify  => Service['httpd'],
+        }
       }
     }
-    'freebsd' : {
-      class { 'apache::package':
-        mpm_module => 'prefork'
+    'debian', 'freebsd' : {
+      apache::mpm{ 'prefork':
+        apache_version => $apache_version,
       }
     }
     default: {
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 3002d14be0..5756d89e7d 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,6 +1,7 @@
 class apache::mod::ssl (
   $ssl_compression = false,
   $ssl_options     = [ 'StdEnvVars' ],
+  $apache_version  = $apache::apache_version,
 ) {
   $session_cache = $::osfamily ? {
     'debian'  => '${APACHE_RUN_DIR}/ssl_scache(512000)',
@@ -14,7 +15,14 @@
   }
   apache::mod { 'ssl': }
 
-  # Template uses $ssl_compression, $ssl_options, $session_cache, $ssl_mutex
+  # Template uses
+  #
+  # $ssl_compression
+  # $ssl_options
+  # $session_cache,
+  # $ssl_mutex
+  # $apache_version
+  #
   file { 'ssl.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/ssl.conf",
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 272891176c..ae259fa0ed 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -6,6 +6,7 @@
   $threadsperchild     = '25',
   $maxrequestsperchild = '0',
   $serverlimit         = '25',
+  $apache_version      = $apache::apache_version,
 ) {
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::worker and apache::mod::event on the same node')
@@ -43,29 +44,25 @@
 
   case $::osfamily {
     'redhat': {
-      file_line { '/etc/sysconfig/httpd worker enable':
-        ensure => present,
-        path   => '/etc/sysconfig/httpd',
-        line   => 'HTTPD=/usr/sbin/httpd.worker',
-        match  => '#?HTTPD=/usr/sbin/httpd.worker',
-        notify => Service['httpd'],
+      if $apache_version >= 2.4 {
+        apache::mpm{ 'worker':
+          apache_version => $apache_version,
+        }
       }
-    }
-    'debian': {
-      file { "${apache::mod_enable_dir}/worker.conf":
-        ensure  => link,
-        target  => "${apache::mod_dir}/worker.conf",
-        require => Exec["mkdir ${apache::mod_enable_dir}"],
-        before  => File[$apache::mod_enable_dir],
-        notify  => Service['httpd'],
-      }
-      package { 'apache2-mpm-worker':
-        ensure => present,
+      else {
+        file_line { '/etc/sysconfig/httpd worker enable':
+          ensure  => present,
+          path    => '/etc/sysconfig/httpd',
+          line    => 'HTTPD=/usr/sbin/httpd.worker',
+          match   => '#?HTTPD=/usr/sbin/httpd.worker',
+          require => Package['httpd'],
+          notify  => Service['httpd'],
+        }
       }
     }
-    'freebsd' : {
-      class { 'apache::package':
-        mpm_module => 'worker'
+    'debian', 'freebsd': {
+      apache::mpm{ 'worker':
+        apache_version => $apache_version,
       }
     }
     default: {
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
new file mode 100644
index 0000000000..fd6f764183
--- /dev/null
+++ b/manifests/mpm.pp
@@ -0,0 +1,68 @@
+define apache::mpm (
+  $lib_path       = $apache::params::lib_path,
+  $apache_version = $apache::apache_version,
+) {
+  if ! defined(Class['apache']) {
+    fail('You must include the apache base class before using any apache defined resources')
+  }
+
+  $mpm     = $name
+  $mod_dir = $apache::mod_dir
+
+  $_lib  = "mod_mpm_${mpm}.so"
+  $_path = "${lib_path}/${_lib}"
+  $_id   = "mpm_${mpm}_module"
+
+  if $apache_version >= 2.4 {
+    file { "${mod_dir}/${mpm}.load":
+      ensure  => file,
+      path    => "${mod_dir}/${mpm}.load",
+      content => "LoadModule ${_id} ${_path}\n",
+      require => [
+        Package['httpd'],
+        Exec["mkdir ${mod_dir}"],
+      ],
+      before  => File[$mod_dir],
+      notify  => Service['httpd'],
+    }
+  }
+
+  case $::osfamily {
+    'debian': {
+      file { "${apache::mod_enable_dir}/${mpm}.conf":
+        ensure  => link,
+        target  => "${apache::mod_dir}/${mpm}.conf",
+        require => Exec["mkdir ${apache::mod_enable_dir}"],
+        before  => File[$apache::mod_enable_dir],
+        notify  => Service['httpd'],
+      }
+
+      if $apache_version >= 2.4 {
+        file { "${apache::mod_enable_dir}/${mpm}.load":
+          ensure  => link,
+          target  => "${apache::mod_dir}/${mpm}.load",
+          require => Exec["mkdir ${apache::mod_enable_dir}"],
+          before  => File[$apache::mod_enable_dir],
+          notify  => Service['httpd'],
+        }
+      }
+
+      if $apache_version < 2.4 {
+        package { "apache2-mpm-${mpm}":
+          ensure => present,
+        }
+      }
+    }
+    'freebsd': {
+      class { 'apache::package':
+        mpm_module => $mpm
+      }
+    }
+    'redhat': {
+      # so we don't fail
+    }
+    default: {
+      fail("Unsupported osfamily ${::osfamily}")
+    }
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 2a0554db12..1f5f45b413 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -18,7 +18,7 @@
 #
 # Sample Usage:
 #
-class apache::params {
+class apache::params inherits apache::version {
   # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
   $osr_array = split($::operatingsystemrelease,'[\/\.]')
   $distrelease = $osr_array[0]
diff --git a/manifests/version.pp b/manifests/version.pp
new file mode 100644
index 0000000000..4ed960df18
--- /dev/null
+++ b/manifests/version.pp
@@ -0,0 +1,28 @@
+# Class: apache::version
+#
+# Try to automatically detect the version by OS
+#
+class apache::version {
+  case $::osfamily {
+    'RedHat': {
+      if ($::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18) or ($::operatingsystem != 'Fedora' and $::operatingsystemrelease >= 7) {
+        $default = 2.4
+      } else {
+        $default = 2.2
+      }
+    }
+    'Debian': {
+      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
+        $default = 2.4
+      } else {
+        $default = 2.2
+      }
+    }
+    'FreeBSD': {
+      $default = 2.2
+    }
+    default: {
+      fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
+    }
+  }
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 2f24314ff5..cac091dee9 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -169,11 +169,13 @@
     $fastcgi_socket              = undef,
     $fastcgi_dir                 = undef,
     $additional_includes         = [],
+    $apache_version              = $apache::apache_version
   ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
   }
+
   $apache_name = $apache::params::apache_name
 
   validate_re($ensure, '^(present|absent)$',
@@ -400,15 +402,22 @@
     }
     $_directories = $directories
   } else {
-    $_directories = [ {
+    $_directory = {
       provider       => 'directory',
       path           => $docroot,
       options        => $options,
       allow_override => $override,
       directoryindex => $directoryindex,
-      order          => 'allow,deny',
-      allow          => 'from all',
-    } ]
+    }
+
+    if $apache_version == 2.4 {
+      $_directory[require] = 'all granted'
+    } else {
+      $_directory[order] = 'allow,deny'
+      $_directory[allow] = 'from all'
+    }
+
+    $_directories = [ $_directory ]
   }
 
   # Template uses:
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 655a0cf30a..1a9a58d1b8 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -73,6 +73,22 @@
       it { should_not contain_file("#{modname}.conf symlink") }
     end
 
+    context "with Apache version < 2.4" do
+      let :params do
+        { :apache_version => 2.2 }
+      end
+
+      it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        { :apache_version => 2.4 }
+      end
+
+      it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
+    end
+
     # Assert that both load files and conf files are placed and symlinked for these mods
     [
       'alias',
@@ -103,6 +119,7 @@
         'target' => "/etc/apache2/mods-available/#{modname}.conf"
       ) }
     end
+
     describe "Don't create user resource" do
       context "when parameter manage_user is false" do
         let :params do
@@ -213,7 +230,22 @@
         ) }
       end
 
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
+      context "with Apache version < 2.4" do
+        let :params do
+          { :apache_version => 2.2 }
+        end
+
+        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
+      end
+
+      context "with Apache version >= 2.4" do
+        let :params do
+          { :apache_version => 2.4 }
+        end
+
+        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
+      end
+
       it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*\.conf"$} }
       it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 7363e2fc92..320374a00d 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -14,4 +14,75 @@
     it { should_not contain_apache__mod('event') }
     it { should contain_file("/usr/local/etc/apache22/Modules/event.conf").with_ensure('file') }
   end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    it { should contain_class("apache::params") }
+    it { should_not contain_apache__mod('event') }
+    it { should contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') }
+    it { should contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') }
+
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => 2.2,
+        }
+      end
+
+      it { should_not contain_file("/etc/apache2/mods-available/event.load") }
+      it { should_not contain_file("/etc/apache2/mods-enabled/event.load") }
+
+      it { should contain_package("apache2-mpm-event") }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => 2.4,
+        }
+      end
+
+      it { should contain_file("/etc/apache2/mods-available/event.load").with({
+        'ensure'  => 'file',
+        'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n"
+        })
+      }
+      it { should contain_file("/etc/apache2/mods-enabled/event.load").with_ensure('link') }
+    end
+  end
+  context "on a RedHat OS" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => 2.4,
+        }
+      end
+
+      it { should contain_class("apache::params") }
+      it { should_not contain_apache__mod('worker') }
+      it { should_not contain_apache__mod('prefork') }
+
+      it { should contain_file("/etc/httpd/conf.d/event.conf").with_ensure('file') }
+
+      it { should contain_file("/etc/httpd/conf.d/event.load").with({
+        'ensure'  => 'file',
+        'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n",
+        })
+      }
+    end
+  end
 end
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 443ace0cce..032e122d48 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -14,7 +14,34 @@
     it { should_not contain_apache__mod('itk') }
     it { should contain_file("/etc/apache2/mods-available/itk.conf").with_ensure('file') }
     it { should contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') }
-    it { should contain_package("apache2-mpm-itk") }
+
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => 2.2,
+        }
+      end
+
+      it { should_not contain_file("/etc/apache2/mods-available/itk.load") }
+      it { should_not contain_file("/etc/apache2/mods-enabled/itk.load") }
+
+      it { should contain_package("apache2-mpm-itk") }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => 2.4,
+        }
+      end
+
+      it { should contain_file("/etc/apache2/mods-available/itk.load").with({
+        'ensure'  => 'file',
+        'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n"
+        })
+      }
+      it { should contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') }
+    end
   end
   context "on a FreeBSD OS" do
     let :facts do
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 5436894227..8eff78e4ab 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -14,7 +14,34 @@
     it { should_not contain_apache__mod('prefork') }
     it { should contain_file("/etc/apache2/mods-available/prefork.conf").with_ensure('file') }
     it { should contain_file("/etc/apache2/mods-enabled/prefork.conf").with_ensure('link') }
-    it { should contain_package("apache2-mpm-prefork") }
+
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => 2.2,
+        }
+      end
+
+      it { should_not contain_file("/etc/apache2/mods-available/prefork.load") }
+      it { should_not contain_file("/etc/apache2/mods-enabled/prefork.load") }
+
+      it { should contain_package("apache2-mpm-prefork") }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => 2.4,
+        }
+      end
+
+      it { should contain_file("/etc/apache2/mods-available/prefork.load").with({
+        'ensure'  => 'file',
+        'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n"
+        })
+      }
+      it { should contain_file("/etc/apache2/mods-enabled/prefork.load").with_ensure('link') }
+    end
   end
   context "on a RedHat OS" do
     let :facts do
@@ -27,10 +54,35 @@
     it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('prefork') }
     it { should contain_file("/etc/httpd/conf.d/prefork.conf").with_ensure('file') }
-    it { should contain_file_line("/etc/sysconfig/httpd prefork enable").with({
-      'require' => 'Package[httpd]',
-    })
-    }
+
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => 2.2,
+        }
+      end
+
+      it { should contain_file_line("/etc/sysconfig/httpd prefork enable").with({
+        'require' => 'Package[httpd]',
+        })
+      }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => 2.4,
+        }
+      end
+
+      it { should_not contain_apache__mod('event') }
+
+      it { should contain_file("/etc/httpd/conf.d/prefork.load").with({
+        'ensure'  => 'file',
+        'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n",
+        })
+      }
+    end
   end
   context "on a FreeBSD OS" do
     let :facts do
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 1af8ff8c68..504018e689 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -14,7 +14,34 @@
     it { should_not contain_apache__mod('worker') }
     it { should contain_file("/etc/apache2/mods-available/worker.conf").with_ensure('file') }
     it { should contain_file("/etc/apache2/mods-enabled/worker.conf").with_ensure('link') }
-    it { should contain_package("apache2-mpm-worker") }
+
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => 2.2,
+        }
+      end
+
+      it { should_not contain_file("/etc/apache2/mods-available/worker.load") }
+      it { should_not contain_file("/etc/apache2/mods-enabled/worker.load") }
+
+      it { should contain_package("apache2-mpm-worker") }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => 2.4,
+        }
+      end
+
+      it { should contain_file("/etc/apache2/mods-available/worker.load").with({
+        'ensure'  => 'file',
+        'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n"
+        })
+      }
+      it { should contain_file("/etc/apache2/mods-enabled/worker.load").with_ensure('link') }
+    end
   end
   context "on a RedHat OS" do
     let :facts do
@@ -27,7 +54,35 @@
     it { should contain_class("apache::params") }
     it { should_not contain_apache__mod('worker') }
     it { should contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') }
-    it { should contain_file_line("/etc/sysconfig/httpd worker enable") }
+
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => 2.2,
+        }
+      end
+
+      it { should contain_file_line("/etc/sysconfig/httpd worker enable").with({
+        'require' => 'Package[httpd]',
+        })
+      }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => 2.4,
+        }
+      end
+
+      it { should_not contain_apache__mod('event') }
+
+      it { should contain_file("/etc/httpd/conf.d/worker.load").with({
+        'ensure'  => 'file',
+        'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n",
+        })
+      }
+    end
   end
   context "on a FreeBSD OS" do
     let :facts do
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index 39e16b6f31..de1108af08 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -13,9 +13,9 @@
 
     # There are 4 resources in this class currently
     # there should not be any more resources because it is a params class
-    # The resources are class[apache::params], class[main], class[settings], stage[main]
+    # The resources are class[apache::version], class[apache::params], class[main], class[settings], stage[main]
     it "Should not contain any resources" do
-      subject.resources.size.should == 4
+      subject.resources.size.should == 5
     end
   end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 4fcb23dd47..3b39c26e0c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -601,6 +601,60 @@
             /^  WSGIScriptAlias \/ "\/usr\/local\/wsgi\/scripts\/myapp.wsgi"$/,
           ],
         },
+        {
+          :title => 'should contain environment variables',
+          :attr  => 'access_log_env_var',
+          :value => 'admin',
+          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined env=admin$/]
+        },
+        {
+          :title => 'should contain virtual_docroot',
+          :attr  => 'virtual_docroot',
+          :value => '/not/default',
+          :match => [
+            /^  VirtualDocumentRoot "\/not\/default"$/,
+          ],
+        },
+        {
+          :title    => 'should accept multiple directories',
+          :attr     => 'directories',
+          :value    => [
+            { 'path' => '/opt/app' },
+            { 'path' => '/var/www' },
+            { 'path' => '/rspec/docroot'}
+          ],
+          :match    => [
+            /^  <Directory "\/opt\/app">$/,
+            /^  <Directory "\/var\/www">$/,
+            /^  <Directory "\/rspec\/docroot">$/,
+          ],
+        },
+      ].each do |param|
+        describe "when #{param[:attr]} is #{param[:value]}" do
+          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
+
+          it { should contain_file("25-#{title}.conf").with_mode('0644') }
+          if param[:match]
+            it "#{param[:title]}: matches" do
+              param[:match].each do |match|
+                should contain_file("25-#{title}.conf").with_content( match )
+              end
+            end
+          end
+          if param[:notmatch]
+            it "#{param[:title]}: notmatches" do
+              param[:notmatch].each do |notmatch|
+                should_not contain_file("25-#{title}.conf").with_content( notmatch )
+              end
+            end
+          end
+        end
+      end
+    end
+
+    # Apache below 2.4 (Default Version). All match and notmatch should be a list of regexs and exact match strings
+    context ".conf content with $apache_version < 2.4" do
+      [
         {
           :title    => 'should accept a directory',
           :attr     => 'directories',
@@ -678,17 +732,128 @@
           ],
         },
         {
-          :title    => 'should accept multiple directories',
+          :title => 'should accept location for provider',
+          :attr  => 'directories',
+          :value => {
+            'path'     => '/',
+            'provider' => 'location',
+          },
+          :notmatch => ['    AllowOverride None'],
+          :match => [
+            /^  <Location "\/">$/,
+            /^    Order allow,deny$/,
+            /^    Allow from all$/,
+            /^  <\/Location>$/,
+          ],
+        },
+        {
+          :title => 'should accept files for provider',
+          :attr  => 'directories',
+          :value => {
+            'path'     => 'index.html',
+            'provider' => 'files',
+          },
+          :notmatch => ['    AllowOverride None'],
+          :match => [
+            /^  <Files "index.html">$/,
+            /^    Order allow,deny$/,
+            /^    Allow from all$/,
+            /^  <\/Files>$/,
+          ],
+        },
+      ].each do |param|
+        describe "when #{param[:attr]} is #{param[:value]}" do
+          let :params do default_params.merge({
+            param[:attr].to_sym => param[:value],
+            :apache_version => 2.2,
+          }) end
+
+          it { should contain_file("25-#{title}.conf").with_mode('0644') }
+          if param[:match]
+            it "#{param[:title]}: matches" do
+              param[:match].each do |match|
+                should contain_file("25-#{title}.conf").with_content( match )
+              end
+            end
+          end
+          if param[:notmatch]
+            it "#{param[:title]}: notmatches" do
+              param[:notmatch].each do |notmatch|
+                should_not contain_file("25-#{title}.conf").with_content( notmatch )
+              end
+            end
+          end
+        end
+      end
+    end
+
+    # Apache equals or above 2.4. All match and notmatch should be a list of regexs and exact match strings
+    context ".conf content with $apache_version >= 2.4" do
+      [
+        {
+          :title    => 'should accept a directory',
           :attr     => 'directories',
-          :value    => [
-            { 'path' => '/opt/app' },
-            { 'path' => '/var/www' },
-            { 'path' => '/rspec/docroot'}
+          :value    => { 'path' => '/opt/app' },
+          :notmatch => ['  <Directory /rspec/docroot>'],
+          :match    => [
+            /^  <Directory "\/opt\/app">$/,
+            /^    AllowOverride None$/,
+            /^    Require all granted$/,
+            /^  <\/Directory>$/,
           ],
+        },
+        {
+          :title    => 'should accept directory directives hash',
+          :attr     => 'directories',
+          :value    => {
+            'path'              => '/opt/app',
+            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+            'allow_override'    => 'Lol',
+            'options'           => '-MultiViews',
+            'require'           => 'something denied',
+            'passenger_enabled' => 'onf',
+          },
           :match    => [
             /^  <Directory "\/opt\/app">$/,
-            /^  <Directory "\/var\/www">$/,
-            /^  <Directory "\/rspec\/docroot">$/,
+            /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
+            /^    AllowOverride Lol$/,
+            /^    Options -MultiViews$/,
+            /^    Require something denied$/,
+            /^    PassengerEnabled onf$/,
+            /^  <\/Directory>$/,
+          ],
+        },
+        {
+          :title    => 'should accept directory directives with arrays and hashes',
+          :attr     => 'directories',
+          :value    => [
+            {
+              'path'              => '/opt/app1',
+              'allow_override'    => ['AuthConfig','Indexes'],
+              'options'           => ['-MultiViews','+MultiViews'],
+              'require'           => ['host','example.org'],
+              'passenger_enabled' => 'onf',
+            },
+            {
+              'path'        => '/opt/app2',
+              'addhandlers' => {
+                'handler'    => 'cgi-script',
+                'extensions' => '.cgi',
+              },
+            },
+          ],
+          :match    => [
+            /^  <Directory "\/opt\/app1">$/,
+            /^    AllowOverride AuthConfig Indexes$/,
+            /^    Options -MultiViews \+MultiViews$/,
+            /^    Require host example.org$/,
+            /^    PassengerEnabled onf$/,
+            /^  <\/Directory>$/,
+            /^  <Directory "\/opt\/app2">$/,
+            /^    AllowOverride None$/,
+            /^    Require all granted$/,
+            /^    AddHandler cgi-script .cgi$/,
+            /^  <\/Directory>$/,
           ],
         },
         {
@@ -701,8 +866,7 @@
           :notmatch => ['    AllowOverride None'],
           :match => [
             /^  <Location "\/">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
+            /^    Require all granted$/,
             /^  <\/Location>$/,
           ],
         },
@@ -716,8 +880,7 @@
           :notmatch => ['    AllowOverride None'],
           :match => [
             /^  <Files "index.html">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
+            /^    Require all granted$/,
             /^  <\/Files>$/,
           ],
         },
@@ -736,24 +899,12 @@
             /^  <\/FilesMatch>$/,
           ],
         },
-        {
-          :title => 'should contain virtual_docroot',
-          :attr  => 'virtual_docroot',
-          :value => '/not/default',
-          :match => [
-            /^  VirtualDocumentRoot "\/not\/default"$/,
-          ],
-        },
-        {
-          :title => 'should contain environment variables',
-          :attr  => 'access_log_env_var',
-          :value => 'admin',
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined env=admin$/]
-        },
-
       ].each do |param|
         describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
+          let :params do default_params.merge({
+            param[:attr].to_sym => param[:value],
+            :apache_version => 2.4,
+          }) end
 
           it { should contain_file("25-#{title}.conf").with_mode('0644') }
           if param[:match]
@@ -774,6 +925,7 @@
       end
     end
 
+    # All match and notmatch should be a list of regexs and exact match strings
     context ".conf content with SSL" do
       [
         {
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 0a03995b86..66b70836bb 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -16,9 +16,13 @@ Group <%= @group %>
 
 AccessFileName .htaccess
 <FilesMatch "^\.ht">
+<%- if @apache_version >= '2.4' -%>
+    Require all denied
+<%- else -%>
      Order allow,deny
      Deny from all
      Satisfy all
+<%- end -%>
 </FilesMatch>
 
 <Directory />
@@ -52,7 +56,11 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 
+<%- if @apache_version >= '2.4' -%>
+IncludeOptional "<%= @confd_dir %>/*.conf"
+<%- else -%>
 Include "<%= @confd_dir %>/*.conf"
+<%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
 Include "<%= @vhost_load_dir %>/*.conf"
 <% end -%>
@@ -66,8 +74,12 @@ Alias /error/ "<%= @error_documents_path %>/"
   Options IncludesNoExec
   AddOutputFilter Includes html
   AddHandler type-map var
+<%- if @apache_version == '2.4' -%>
+  Require all granted
+<%- else -%>
   Order allow,deny
   Allow from all
+<%- end -%>
   LanguagePriority en cs de es fr it nl sv pt-br ro
   ForceLanguagePriority Prefer Fallback
 </Directory>
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
index 52f16c1719..0a0c81593d 100644
--- a/templates/mod/alias.conf.erb
+++ b/templates/mod/alias.conf.erb
@@ -3,7 +3,11 @@ Alias /icons/ "<%= @icons_path %>/"
 <Directory "<%= @icons_path %>">
     Options Indexes MultiViews
     AllowOverride None
-    Order allow,deny
-    Allow from all
+<%- if @apache_version == '2.4' -%>
+    Require all granted
+<%- else -%>
+     Order allow,deny
+     Allow from all
+<%- end -%>
 </Directory>
 </IfModule>
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index f66b1c958c..763e13a9cf 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -13,7 +13,11 @@
 <% if @ssl_compression -%>
   SSLCompression Off
 <% end -%>
+  <% if @apache_version >= '2.4' -%>
+  SSLMutex sysvsem <%= @ssl_mutex %>
+  <% else -%>
   SSLMutex <%= @ssl_mutex %>
+  <% end -%>
   SSLCryptoDevice builtin
   SSLHonorCipherOrder On
   SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 986216a2cb..516d0798da 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -34,21 +34,29 @@
     AllowOverride None
       <%- end -%>
     <%- end -%>
-    <%- if directory['order'] and directory['order'] != '' -%>
-    Order <%= Array(directory['order']).join(',') %>
+    <%- if @apache_version == '2.4' -%>
+      <%- if directory['require'] and directory['require'] != '' -%>
+    Require <%= Array(directory['require']).join(' ') %>
+      <%- else -%>
+    Require all granted
+      <%- end -%>
     <%- else -%>
+      <%- if directory['order'] and directory['order'] != '' -%>
+    Order <%= Array(directory['order']).join(',') %>
+      <%- else -%>
     Order allow,deny
-    <%- end -%>
-    <%- if directory['deny'] and directory['deny'] != '' -%>
+      <%- end -%>
+      <%- if directory['deny'] and directory['deny'] != '' -%>
     Deny <%= directory['deny'] %>
-    <%- end -%>
-    <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
+      <%- end -%>
+      <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
     Allow <%= directory['allow'] %>
-    <%- elsif [ 'from all', 'from All' ].include?(directory['deny']) -%>
-    <%- elsif ! directory['deny'] and [ false, 'false', '' ].include?(directory['allow']) -%>
+      <%- elsif [ 'from all', 'from All' ].include?(directory['deny']) -%>
+      <%- elsif ! directory['deny'] and [ false, 'false', '' ].include?(directory['allow']) -%>
     Deny from all
-    <%- else -%>
+      <%- else -%>
     Allow from all
+      <%- end -%>
     <%- end -%>
     <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>
       <%- [directory['addhandlers']].flatten.compact.each do |addhandler| -%>

From 1ab4bef3e19e9aac38335c4e10092e11dbf24d03 Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Wed, 5 Feb 2014 21:16:43 +0000
Subject: [PATCH 0139/2267] Fix to lots of tests to work with apache24

---
 manifests/default_mods.pp                     |  20 ++
 manifests/mod/info.pp                         |   5 +-
 manifests/mod/ssl.pp                          |  28 ++-
 spec/acceptance/apache_parameters_spec.rb     |  83 ++++-----
 .../nodesets/ubuntu-server-1310-x64.yml       |  11 ++
 spec/acceptance/version.rb                    |  57 ++++++
 spec/acceptance/vhost_spec.rb                 | 173 +++++++++---------
 spec/defines/vhost_spec.rb                    |  18 +-
 templates/mod/info.conf.erb                   |   4 +
 templates/mod/ssl.conf.erb                    |   2 +-
 templates/vhost/_block.erb                    |   4 +
 templates/vhost/_fastcgi.erb                  |   6 +-
 12 files changed, 269 insertions(+), 142 deletions(-)
 create mode 100644 spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
 create mode 100644 spec/acceptance/version.rb

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index c8523fced1..09cc3be1eb 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -130,5 +130,25 @@
     apache::mod { 'env': }
   } elsif $mods {
     apache::default_mods::load { $mods: }
+
+    if $apache_version >= 2.4 {
+      # authz_core is needed for 'Require' directive
+      apache::mod { 'authz_core':
+        id => 'authz_core_module',
+      }
+
+      # filter is needed by mod_deflate
+      apache::mod { 'filter': }
+    }
+  } else {
+    if $apache_version >= 2.4 {
+      # authz_core is needed for 'Require' directive
+      apache::mod { 'authz_core':
+        id => 'authz_core_module',
+      }
+
+      # filter is needed by mod_deflate
+      apache::mod { 'filter': }
+    }
   }
 }
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index b76e1efb2a..627bf85ddf 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -1,8 +1,11 @@
 class apache::mod::info (
   $allow_from = ['127.0.0.1','::1'],
+  $apache_version = $apache::apache_version,
 ){
   apache::mod { 'info': }
-  # Template uses $allow_from
+  # Template uses
+  # $allow_from
+  # $apache_version
   file { 'info.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/info.conf",
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 5756d89e7d..f8e6c248c2 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -8,13 +8,33 @@
     'redhat'  => '/var/cache/mod_ssl/scache(512000)',
     'freebsd' => '/var/run/ssl_scache(512000)',
   }
-  $ssl_mutex = $::osfamily ? {
-    'debian'  => 'file:${APACHE_RUN_DIR}/ssl_mutex',
-    'redhat'  => 'default',
-    'freebsd' => 'default',
+
+  case $::osfamily {
+    'debian': {
+      if $apache_version >= 2.4 and $::operatingsystem == 'Ubuntu' {
+        file { "${APACHE_RUN_DIR}/ssl_mutex":
+          ensure => directory
+        }
+
+        $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex default'
+      } else {
+        $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex'
+      }
+    }
+    'redhat': {
+      $ssl_mutex = 'default'
+    }
+    'freebsd': {
+      $ssl_mutex = 'default'
+    }
   }
+
   apache::mod { 'ssl': }
 
+  if $apache_version >= 2.4 and $::operatingsystem == 'Ubuntu' {
+    apache::mod { 'socache_shmcb': }
+  }
+
   # Template uses
   #
   # $ssl_compression
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index bcaa21f955..597739f5c2 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -1,23 +1,5 @@
 require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  confd_dir = '/etc/httpd/conf.d'
-  conf_file = '/etc/httpd/conf/httpd.conf'
-  ports_file = '/etc/httpd/conf/ports.conf'
-  vhost = '/etc/httpd/conf.d/15-default.conf'
-  service_name = 'httpd'
-  package_name = 'httpd'
-  error_log = 'error_log'
-when 'Debian'
-  confd_dir = '/etc/apache2/mods-available'
-  conf_file = '/etc/apache2/apache2.conf'
-  ports_file = '/etc/apache2/ports.conf'
-  vhost = '/etc/apache2/sites-available/15-default.conf'
-  service_name = 'apache2'
-  package_name = 'apache2'
-  error_log = 'error.log'
-end
+require_relative './version.rb'
 
 describe 'apache parameters' do
 
@@ -41,7 +23,7 @@
     end
 
     if fact('osfamily') == 'FreeBSD'
-      describe file("#{confd_dir}/no-accf.conf.erb") do
+      describe file("#{$confd_dir}/no-accf.conf.erb") do
         it { should be_file }
       end
     end
@@ -53,7 +35,7 @@
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file(ports_file) do
+    describe file($ports_file) do
       it { should be_file }
       it { should contain 'Listen 10.1.1.1' }
     end
@@ -70,7 +52,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_running }
       it { should be_enabled }
     end
@@ -87,7 +69,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should_not be_running }
       it { should_not be_enabled }
     end
@@ -101,12 +83,12 @@ class { 'apache':
           purge_vdir    => false,
         }
       EOS
-      shell("touch #{confd_dir}/test.conf")
+      shell("touch #{$confd_dir}/test.conf")
       apply_manifest(pp, :catch_failures => true)
     end
 
     # Ensure the file didn't disappear.
-    describe file("#{confd_dir}/test.conf") do
+    describe file("#{$confd_dir}/test.conf") do
       it { should be_file }
     end
   end
@@ -120,12 +102,12 @@ class { 'apache':
             purge_vdir    => true,
           }
         EOS
-        shell("touch #{confd_dir}/test.conf")
+        shell("touch #{$confd_dir}/test.conf")
         apply_manifest(pp, :catch_failures => true)
       end
 
       # File should be gone
-      describe file("#{confd_dir}/test.conf") do
+      describe file("#{$confd_dir}/test.conf") do
         it { should_not be_file }
       end
     end
@@ -137,7 +119,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file(vhost) do
+    describe file($vhost) do
       it { should be_file }
       it { should contain 'ServerAdmin test@example.com' }
     end
@@ -151,7 +133,7 @@ class { 'apache':
       end
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'EnableSendfile On' }
     end
@@ -163,7 +145,7 @@ class { 'apache':
       end
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'Sendfile Off' }
     end
@@ -177,7 +159,7 @@ class { 'apache':
       end
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'Alias /error/' }
     end
@@ -191,7 +173,7 @@ class { 'apache':
       end
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'Timeout 1234' }
     end
@@ -208,7 +190,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file("#{confd_dir}/mime.conf") do
+    describe file("#{$confd_dir}/mime.conf") do
       it { should be_file }
       it { should contain 'AddLanguage eo .eo' }
     end
@@ -222,7 +204,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'ServerRoot "/tmp/root"' }
     end
@@ -236,9 +218,16 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file(conf_file) do
-      it { should be_file }
-      it { should contain 'Include "/tmp/root/*.conf"' }
+    if $apache_version >= 2.4
+      describe file($conf_file) do
+        it { should be_file }
+        it { should contain 'IncludeOptional "/tmp/root/*.conf"' }
+      end
+    else
+      describe file($conf_file) do
+        it { should be_file }
+        it { should contain 'Include "/tmp/root/*.conf"' }
+      end
     end
   end
 
@@ -252,7 +241,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'testcontent' }
     end
@@ -266,7 +255,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'ServerName "test.server"' }
     end
@@ -305,7 +294,7 @@ class { 'apache':
       end
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'KeepAlive On' }
       it { should contain 'KeepAliveTimeout 30' }
@@ -320,7 +309,7 @@ class { 'apache':
       end
     end
 
-    describe file("/tmp/#{error_log}") do
+    describe file("/tmp/#{$error_log}") do
       it { should be_file }
     end
   end
@@ -347,15 +336,15 @@ class { 'apache':
     it 'applys cleanly' do
       pp = <<-EOS
         class { 'apache':
-          server_tokens  => 'testtokens',
+          server_tokens  => 'Minor',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
-      it { should contain 'ServerTokens testtokens' }
+      it { should contain 'ServerTokens Minor' }
     end
   end
 
@@ -370,7 +359,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'ServerSignature testsig' }
     end
@@ -386,7 +375,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file(conf_file) do
+    describe file($conf_file) do
       it { should be_file }
       it { should contain 'TraceEnable Off' }
     end
@@ -402,7 +391,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe package(package_name) do
+    describe package($package_name) do
       it { should be_installed }
     end
   end
diff --git a/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
new file mode 100644
index 0000000000..f4b2366f3b
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1310-x64:
+    roles:
+      - master
+    platform: ubuntu-13.10-amd64
+    box : ubuntu-server-1310-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-1310-x64-virtualbox-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level   : debug
+  type: git
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
new file mode 100644
index 0000000000..62c5f3c397
--- /dev/null
+++ b/spec/acceptance/version.rb
@@ -0,0 +1,57 @@
+_osfamily               = fact('osfamily')
+_operatingsystem        = fact('operatingsystem')
+_operatingsystemrelease = fact('operatingsystemrelease').to_f
+
+case _osfamily
+when 'RedHat'
+  $confd_dir        = '/etc/httpd/conf.d'
+  $conf_file        = '/etc/httpd/conf/httpd.conf'
+  $ports_file       = '/etc/httpd/conf/ports.conf'
+  $vhost_dir        = '/etc/httpd/conf.d'
+  $vhost            = '/etc/httpd/conf.d/15-default.conf'
+  $run_dir          = '/var/run/httpd'
+  $service_name     = 'httpd'
+  $package_name     = 'httpd'
+  $error_log        = 'error_log'
+  $suphp_handler    = 'php5-script'
+  $suphp_configpath = 'undef'
+
+  if (_operatingsystem == 'Fedora' and _operatingsystemrelease >= 18) or (_operatingsystem != 'Fedora' and _operatingsystemrelease >= 7)
+    $apache_version = 2.4
+  else
+    $apache_version = 2.2
+  end
+when 'Debian'
+  $confd_dir        = '/etc/apache2/mods-available'
+  $conf_file        = '/etc/apache2/apache2.conf'
+  $ports_file       = '/etc/apache2/ports.conf'
+  $vhost            = '/etc/apache2/sites-available/15-default.conf'
+  $vhost_dir        = '/etc/apache2/sites-enabled'
+  $run_dir          = '/var/run/apache2'
+  $service_name     = 'apache2'
+  $package_name     = 'apache2'
+  $error_log        = 'error.log'
+  $suphp_handler    = 'x-httpd-php'
+  $suphp_configpath = '/etc/php5/apache2'
+
+  if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10
+    $apache_version = 2.4
+  else
+    $apache_version = 2.2
+  end
+when 'FreeBSD'
+  $confd_dir        = '/usr/local/etc/apache22/Includes'
+  $conf_file        = '/usr/local/etc/apache22/httpd.conf'
+  $ports_file       = '/usr/local/etc/apache22/Includes/ports.conf'
+  $vhost            = '/usr/local/etc/apache22/Vhosts/15-default.conf'
+  $vhost_dir        = '/usr/local/etc/apache22/Vhosts'
+  $run_dir          = '/var/run/apache22'
+  $service_name     = 'apache22'
+  $package_name     = 'apache22'
+  $error_log        = 'http-error.log'
+
+  $apache_version = 2.2
+else
+  fail RuntimeError, "Unsupported osfamily: #{_osfamily}"
+end
+
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e6b8f1b928..7d066241f7 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1,28 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::vhost define' do
-  case fact('osfamily')
-  when 'RedHat'
-    vhost_dir = '/etc/httpd/conf.d'
-    package_name = 'httpd'
-    service_name = 'httpd'
-    ports_file = '/etc/httpd/conf/ports.conf'
-    suphp_handler = 'php5-script'
-    suphp_configpath = 'undef'
-  when 'FreeBSD'
-    vhost_dir = '/usr/local/etc/apache22/Vhosts'
-    package_name = 'apache22'
-    service_name = 'apache22'
-    ports_file = '/usr/local/etc/apache22/ports.conf'
-  when 'Debian'
-    vhost_dir = '/etc/apache2/sites-enabled'
-    package_name = 'apache2'
-    service_name = 'apache2'
-    ports_file = '/etc/apache2/ports.conf'
-    suphp_handler = 'x-httpd-php'
-    suphp_configpath = '/etc/php5/apache2'
-  end
-
   context 'no default vhosts' do
     it 'should create no default vhosts' do
       pp = <<-EOS
@@ -36,11 +15,11 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/15-default.conf") do
+    describe file("#{$vhost_dir}/15-default.conf") do
       it { should_not be_file }
     end
 
-    describe file("#{vhost_dir}/15-default-ssl.conf") do
+    describe file("#{$vhost_dir}/15-default-ssl.conf") do
       it { should_not be_file }
     end
   end
@@ -54,11 +33,11 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/15-default.conf") do
+    describe file("#{$vhost_dir}/15-default.conf") do
       it { should contain '<VirtualHost \*:80>' }
     end
 
-    describe file("#{vhost_dir}/15-default-ssl.conf") do
+    describe file("#{$vhost_dir}/15-default-ssl.conf") do
       it { should_not be_file }
     end
   end
@@ -69,18 +48,24 @@ class { 'apache': }
       # 'file:/var/run/apache2/ssl_mutex' but contains
       # 'file:${APACHE_RUN_DIR}/ssl_mutex'
       pp = <<-EOS
+        file { '#{$run_dir}':
+          ensure  => 'directory',
+          recurse => true,
+        }
+
         class { 'apache':
           default_ssl_vhost => true,
+          require => File['#{$run_dir}'],
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/15-default.conf") do
+    describe file("#{$vhost_dir}/15-default.conf") do
       it { should contain '<VirtualHost \*:80>' }
     end
 
-    describe file("#{vhost_dir}/15-default-ssl.conf") do
+    describe file("#{$vhost_dir}/15-default-ssl.conf") do
       it { should contain '<VirtualHost \*:443>' }
       it { should contain "SSLEngine on" }
     end
@@ -90,15 +75,21 @@ class { 'apache':
     it 'should configure an apache vhost' do
       pp = <<-EOS
         class { 'apache': }
+        file { '#{$run_dir}':
+          ensure  => 'directory',
+          recurse => true,
+        }
+
         apache::vhost { 'first.example.com':
           port    => '80',
           docroot => '/var/www/first',
+          require => File['#{$run_dir}'],
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-first.example.com.conf") do
+    describe file("#{$vhost_dir}/25-first.example.com.conf") do
       it { should contain '<VirtualHost \*:80>' }
       it { should contain "ServerName first.example.com" }
     end
@@ -119,7 +110,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-proxy.example.com.conf") do
+    describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
       it { should contain '<VirtualHost \*:80>' }
       it { should contain "ServerName proxy.example.com" }
       it { should contain "ProxyPass" }
@@ -153,7 +144,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end
@@ -176,12 +167,21 @@ class { 'apache': }
       it 'should configure a vhost with Files' do
         pp = <<-EOS
           class { 'apache': }
+
+          if $apache::apache_version >= 2.4 {
+            $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
+          } else {
+            $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
+          }
+
+          $_directories = [
+            { 'path' => '/var/www/files', },
+            $_files_match_directory,
+          ]
+
           apache::vhost { 'files.example.net':
             docroot     => '/var/www/files',
-            directories => [
-              { 'path' => '/var/www/files', },
-              { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all' },
-            ],
+            directories => $_directories,
           }
           file { '/var/www/files/index.html':
             ensure  => file,
@@ -196,7 +196,7 @@ class { 'apache': }
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe service(service_name) do
+      describe service($service_name) do
         it { should be_enabled }
         it { should be_running }
       end
@@ -211,21 +211,22 @@ class { 'apache': }
       it 'should configure a vhost with multiple Directory sections' do
         pp = <<-EOS
           class { 'apache': }
+
+          if $apache::apache_version >= 2.4 {
+            $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
+          } else {
+            $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' }
+          }
+
+          $_directories = [
+            { 'path' => '/var/www/files', },
+            { 'path' => '/foo/', 'provider' => 'location', 'directoryindex' => 'notindex.html', },
+            $_files_match_directory,
+          ]
+
           apache::vhost { 'files.example.net':
             docroot     => '/var/www/files',
-            directories => [
-              { 'path' => '/var/www/files', },
-              {
-                'provider'       => 'location',
-                'path'           => '/foo/',
-                'directoryindex' => 'notindex.html',
-              },
-              {
-                'provider' => 'filesmatch',
-                'path'     => 'private.html$',
-                'deny'     => 'from all',
-              },
-            ],
+            directories => $_directories,
           }
           file { '/var/www/files/foo':
             ensure => directory,
@@ -243,7 +244,7 @@ class { 'apache': }
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe service(service_name) do
+      describe service($service_name) do
         it { should be_enabled }
         it { should be_running }
       end
@@ -275,7 +276,7 @@ class { 'apache': }
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe service(service_name) do
+      describe service($service_name) do
         it { should be_enabled }
         it { should be_running }
       end
@@ -316,7 +317,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end
@@ -362,7 +363,7 @@ class { 'apache': default_vhost => false, }
       }, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end
@@ -389,7 +390,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file(ports_file) do
+    describe file($ports_file) do
       it { should be_file }
       it { should_not contain 'NameVirtualHost test.server' }
     end
@@ -411,7 +412,7 @@ class { 'apache': default_vhost => false }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file(ports_file) do
+    describe file($ports_file) do
       it { should be_file }
       it { should_not contain 'Listen 80' }
       it { should contain 'Listen 81' }
@@ -452,7 +453,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/10-test.server.conf") do
+    describe file("#{$vhost_dir}/10-test.server.conf") do
       it { should be_file }
     end
   end
@@ -470,7 +471,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'Options Indexes FollowSymLinks ExecCGI' }
     end
@@ -489,7 +490,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'AllowOverride All' }
     end
@@ -508,7 +509,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain '  CustomLog "/tmp' }
     end
@@ -536,7 +537,7 @@ class { 'apache': }
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe file("#{vhost_dir}/25-test.server.conf") do
+      describe file("#{$vhost_dir}/25-test.server.conf") do
         it { should be_file }
         it { should_not contain "  #{logname} \"/tmp" }
       end
@@ -550,15 +551,15 @@ class { 'apache': }
           apache::vhost { 'test.server':
             docroot    => '/tmp',
             logroot    => '/tmp',
-            #{logtype}_log_pipe => '|test',
+            #{logtype}_log_pipe => '|/bin/sh',
           }
         EOS
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe file("#{vhost_dir}/25-test.server.conf") do
+      describe file("#{$vhost_dir}/25-test.server.conf") do
         it { should be_file }
-        it { should contain "  #{logname} \"|test" }
+        it { should contain "  #{logname} \"|/bin/sh" }
       end
     end
 
@@ -576,7 +577,7 @@ class { 'apache': }
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe file("#{vhost_dir}/25-test.server.conf") do
+      describe file("#{$vhost_dir}/25-test.server.conf") do
         it { should be_file }
         it { should contain "  #{logname} \"syslog\"" }
       end
@@ -598,7 +599,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'CustomLog "syslog" "%h %l"' }
     end
@@ -619,7 +620,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'CustomLog "syslog" combined env=admin' }
     end
@@ -638,7 +639,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'Alias /image "/ftp/pub/image"' }
     end
@@ -657,7 +658,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'ScriptAlias /myscript "/usr/share/myscript"' }
     end
@@ -676,7 +677,7 @@ class { 'apache': service_ensure => stopped, }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'ProxyPass          / test2/' }
     end
@@ -689,19 +690,19 @@ class { 'apache': service_ensure => stopped, }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
           docroot          => '/tmp',
-          suphp_addhandler => '#{suphp_handler}',
+          suphp_addhandler => '#{$suphp_handler}',
           suphp_engine     => 'on',
-          suphp_configpath => '#{suphp_configpath}',
+          suphp_configpath => '#{$suphp_configpath}',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain "suPHP_AddHandler #{suphp_handler}" }
+      it { should contain "suPHP_AddHandler #{$suphp_handler}" }
       it { should contain 'suPHP_Engine on' }
-      it { should contain "suPHP_ConfigPath \"#{suphp_configpath}\"" }
+      it { should contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" }
     end
   end
 
@@ -719,7 +720,7 @@ class { 'apache': service_ensure => stopped, }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'ProxyPass          / http://test2/' }
       it { should contain 'ProxyPass        http://test2/test !' }
@@ -741,7 +742,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'Redirect permanent /images http://test.server/' }
     end
@@ -769,7 +770,7 @@ class { 'apache': }
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe file("#{vhost_dir}/25-test.server.conf") do
+      describe file("#{$vhost_dir}/25-test.server.conf") do
         it { should be_file }
         it { should contain 'RackBaseURI /test' }
       end
@@ -790,7 +791,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'append MirrorID "mirror 12"' }
     end
@@ -814,7 +815,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain '#test' }
       it { should contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
@@ -836,7 +837,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'SetEnv TEST /test' }
       it { should contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
@@ -856,7 +857,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
     end
@@ -879,7 +880,7 @@ class { 'apache::mod::wsgi': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'WSGIDaemonProcess wsgi processes=2' }
       it { should contain 'WSGIProcessGroup vagrant' }
@@ -900,7 +901,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain '#weird test string' }
     end
@@ -919,7 +920,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'AssignUserId vagrant vagrant' }
     end
@@ -943,7 +944,7 @@ class { 'apache::mod::fastcgi': }
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe file("#{vhost_dir}/25-test.server.conf") do
+      describe file("#{$vhost_dir}/25-test.server.conf") do
         it { should be_file }
         it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
         it { should contain '<Directory "/tmp/fast">' }
@@ -965,7 +966,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
       it { should contain 'Include "/tmp/include"' }
     end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3b39c26e0c..150e20833f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -761,6 +761,21 @@
             /^  <\/Files>$/,
           ],
         },
+        {
+          :title => 'should accept files match for provider',
+          :attr  => 'directories',
+          :value => {
+            'path'     => 'index.html',
+            'provider' => 'filesmatch',
+          },
+          :notmatch => ['    AllowOverride None'],
+          :match => [
+            /^  <FilesMatch "index.html">$/,
+            /^    Order allow,deny$/,
+            /^    Allow from all$/,
+            /^  <\/FilesMatch>$/,
+          ],
+        },
       ].each do |param|
         describe "when #{param[:attr]} is #{param[:value]}" do
           let :params do default_params.merge({
@@ -894,8 +909,7 @@
           :notmatch => ['    AllowOverride None'],
           :match => [
             /^  <FilesMatch "index.html">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
+            /^    Require all granted$/,
             /^  <\/FilesMatch>$/,
           ],
         },
diff --git a/templates/mod/info.conf.erb b/templates/mod/info.conf.erb
index 01ffe95a91..0747da4307 100644
--- a/templates/mod/info.conf.erb
+++ b/templates/mod/info.conf.erb
@@ -1,6 +1,10 @@
 <Location /server-info>
     SetHandler server-info
+    <%- if @apache_version >= '2.4' -%>
+    Require ip <%= Array(@allow_from).join(" ") %>
+    <%- else -%>
     Order deny,allow
     Deny from all
     Allow from <%= Array(@allow_from).join(" ") %>
+    <%- end -%>
 </Location>
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 763e13a9cf..e1597f2f8b 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -14,7 +14,7 @@
   SSLCompression Off
 <% end -%>
   <% if @apache_version >= '2.4' -%>
-  SSLMutex sysvsem <%= @ssl_mutex %>
+  Mutex <%= @ssl_mutex %>
   <% else -%>
   SSLMutex <%= @ssl_mutex %>
   <% end -%>
diff --git a/templates/vhost/_block.erb b/templates/vhost/_block.erb
index f235f89d28..f3c835d2cb 100644
--- a/templates/vhost/_block.erb
+++ b/templates/vhost/_block.erb
@@ -4,7 +4,11 @@
 <% if @block.include? 'scm' -%>
   # Block access to SCM directories.
   <DirectoryMatch .*\.(svn|git|bzr)/.*>
+  <%- if @apache_version >= '2.4' -%>
+    Require all denied
+  <%- else -%>
     Deny From All
+  <%- end -%>
   </DirectoryMatch>
 <% end -%>
 <% end -%>
diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
index 86ecf92184..07129bc197 100644
--- a/templates/vhost/_fastcgi.erb
+++ b/templates/vhost/_fastcgi.erb
@@ -8,8 +8,12 @@
     Options +ExecCGI
     AllowOverride All
     SetHandler fastcgi-script
+  <%- if @apache_version >= '2.4' -%>
+    Require all granted
+  <%- else -%>
     Order allow,deny
-    Allow from all
+    Allow From All
+  <%- end -%>
     AuthBasicAuthoritative Off
   </Directory>
 

From c416bf40de261b80a93d39fd92a04fdcf07710c8 Mon Sep 17 00:00:00 2001
From: Scott Smith <smitherz82@gmail.com>
Date: Wed, 5 Feb 2014 23:12:58 +0000
Subject: [PATCH 0140/2267] Apache24 on Ubuntu SSL to use default mutex

Changed the ssl module to use default for the new Mutex with Apache 2.4
on Ubuntu
---
 manifests/mod/ssl.pp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index f8e6c248c2..55bcbc7d5f 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -12,11 +12,7 @@
   case $::osfamily {
     'debian': {
       if $apache_version >= 2.4 and $::operatingsystem == 'Ubuntu' {
-        file { "${APACHE_RUN_DIR}/ssl_mutex":
-          ensure => directory
-        }
-
-        $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex default'
+        $ssl_mutex = 'default'
       } else {
         $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex'
       }

From 04ddeaad56a3a54e183ac2f2026aadc67b3e55d1 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Fri, 7 Feb 2014 12:07:05 +0000
Subject: [PATCH 0141/2267] Ensure socache_shmcb is enabled on all Apache 2.4
 OSes

The SSLSessionCache option is specified as socache_shmcb, so the module must
be enabled.
---
 manifests/mod/ssl.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 55bcbc7d5f..fe171842d2 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -27,7 +27,7 @@
 
   apache::mod { 'ssl': }
 
-  if $apache_version >= 2.4 and $::operatingsystem == 'Ubuntu' {
+  if $apache_version >= 2.4 {
     apache::mod { 'socache_shmcb': }
   }
 

From a5dda0158fc18265e84796a9f41a5d6d7b1f1b1c Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin@puppetlabs.com>
Date: Sat, 8 Feb 2014 21:53:19 -0800
Subject: [PATCH 0142/2267] fix simple linting errors

---
 manifests/mod/ssl.pp | 3 +++
 manifests/package.pp | 2 +-
 manifests/vhost.pp   | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index fe171842d2..323d092b28 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -23,6 +23,9 @@
     'freebsd': {
       $ssl_mutex = 'default'
     }
+    default: {
+      fail("Unsupported osfamily ${::osfamily}")
+    }
   }
 
   apache::mod { 'ssl': }
diff --git a/manifests/package.pp b/manifests/package.pp
index 31bd311982..b91e25f6b1 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -26,7 +26,7 @@
         ensure => $ensure,
         path   => '/etc/make.conf',
         line   => "APACHE_PORT=${apache_package}",
-        match  => "^\\s*#?\\s*APACHE_PORT\\s*=\\s*",
+        match  => '^\\s*#?\\s*APACHE_PORT\\s*=\\s*',
         before => Package['httpd'],
       }
       # remove other packages
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index cac091dee9..b019b74e8e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -267,7 +267,7 @@
   if $access_log_file {
     $access_log_destination = "${logroot}/${access_log_file}"
   } elsif $access_log_pipe {
-    $access_log_destination = "${access_log_pipe}"
+    $access_log_destination = $access_log_pipe
   } elsif $access_log_syslog {
     $access_log_destination = $access_log_syslog
   } else {
@@ -281,7 +281,7 @@
   if $error_log_file {
     $error_log_destination = "${logroot}/${error_log_file}"
   } elsif $error_log_pipe {
-    $error_log_destination = "${error_log_pipe}"
+    $error_log_destination = $error_log_pipe
   } elsif $error_log_syslog {
     $error_log_destination = $error_log_syslog
   } else {

From c9be62255bedfb128ea057e98e98f84daa8e9a86 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin@puppetlabs.com>
Date: Sat, 8 Feb 2014 21:53:47 -0800
Subject: [PATCH 0143/2267] disable lint check for "single quoted variables"

Previously we were checking (and failing every linting run) because
the values for Debian configurations uses a syntax that looks like
Puppet variables.  This is regrettable since it's a valuable check but
the fix will probably require changing how the conf variables are
handled which is out of the scope of this PR.
---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rakefile b/Rakefile
index 9020623179..5868545f20 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,4 +6,5 @@ PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
+PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]

From 69139c7d3b5cbfee5a6615effa1c42126fb30886 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin@puppetlabs.com>
Date: Sat, 8 Feb 2014 21:58:02 -0800
Subject: [PATCH 0144/2267] use a .puppet-lint.rc for usage outside of rake
 tasks

---
 .puppet-lint.rc | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .puppet-lint.rc

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
new file mode 100644
index 0000000000..df733ca811
--- /dev/null
+++ b/.puppet-lint.rc
@@ -0,0 +1,5 @@
+--no-single_quote_string_with_variables-check
+--no-80chars-check
+--no-class_inherits_from_params_class-check
+--no-class_parameter_defaults-check
+--no-documentation-check

From 245224efc5671d7d774e349e9d84b1f8a55f7386 Mon Sep 17 00:00:00 2001
From: David Teirney <david.teirney@orionhealth.com>
Date: Sun, 9 Feb 2014 21:18:59 +1300
Subject: [PATCH 0145/2267] Update rspec definitions for the ProxyPassReverse
 location fix.

---
 spec/defines/vhost_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 150e20833f..76c908c80a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -353,7 +353,7 @@
           :match    => [
             /^  ProxyPass          \/ http:\/\/fake.com\/$/,
             /^  <Location          \/>$/,
-            /^    ProxyPassReverse \/$/,
+            /^    ProxyPassReverse http:\/\/fake.com\/$/,
             /^  <\/Location>$/,
           ],
           :notmatch => [/ProxyPass .+!$/],
@@ -365,7 +365,7 @@
           :match    => [
             /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
             /^  <Location \/path-a>$/,
-            /^    ProxyPassReverse \/$/,
+            /^    ProxyPassReverse http:\/\/fake.com\/a$/,
             /^  <\/Location>$/,
 
           ],
@@ -381,11 +381,11 @@
           :match    => [
             /^  ProxyPass \/path-a\/ http:\/\/fake.com\/a\/$/,
             /^  <Location \/path-a\/>$/,
-            /^    ProxyPassReverse \/$/,
+            /^    ProxyPassReverse http:\/\/fake.com\/a\/$/,
             /^  <\/Location>$/,
             /^  ProxyPass \/path-b http:\/\/fake.com\/b$/,
             /^  <Location \/path-b>$/,
-            /^    ProxyPassReverse \/$/,
+            /^    ProxyPassReverse http:\/\/fake.com\/b$/,
             /^  <\/Location>$/,
           ],
           :notmatch => [/ProxyPass .+!$/],

From 99d66352ad7bd5e92a3a3f7a59051ecd680d88fe Mon Sep 17 00:00:00 2001
From: Matt Dainty <matt@bodgit-n-scarper.com>
Date: Mon, 3 Feb 2014 16:40:13 +0000
Subject: [PATCH 0146/2267] Add WSGIApplicationGroup and WSGIImportScript
 directives

---
 README.md                 | 4 ++++
 manifests/vhost.pp        | 8 ++++++++
 templates/vhost/_wsgi.erb | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/README.md b/README.md
index 97fb7b963c..b36d7d2224 100644
--- a/README.md
+++ b/README.md
@@ -155,9 +155,13 @@ To set up a virtual host with WSGI
     apache::vhost { 'wsgi.example.com':
       port                        => '80',
       docroot                     => '/var/www/pythonapp',
+      wsgi_application_group      => '%{GLOBAL}',
       wsgi_daemon_process         => 'wsgi',
       wsgi_daemon_process_options =>
         { processes => '2', threads => '15', display-name => '%{GROUP}' },
+      wsgi_import_script          => '/var/www/demo.wsgi',
+      wsgi_import_script_options  =>
+        { process-group => 'wsgi', application-group => '%{GLOBAL}' },
       wsgi_process_group          => 'wsgi',
       wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
     }
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index cac091dee9..0742c80b41 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -159,8 +159,11 @@
     $setenvif                    = [],
     $block                       = [],
     $ensure                      = 'present',
+    $wsgi_application_group      = undef,
     $wsgi_daemon_process         = undef,
     $wsgi_daemon_process_options = undef,
+    $wsgi_import_script          = undef,
+    $wsgi_import_script_options  = undef,
     $wsgi_process_group          = undef,
     $wsgi_script_aliases         = undef,
     $custom_fragment             = undef,
@@ -209,6 +212,9 @@
   if $wsgi_daemon_process_options {
     validate_hash($wsgi_daemon_process_options)
   }
+  if $wsgi_import_script_options {
+    validate_hash($wsgi_import_script_options)
+  }
   if $itk {
     validate_hash($itk)
   }
@@ -495,7 +501,9 @@
   #   - $suphp_engine
   #   - $suphp_configpath
   # wsgi fragment:
+  #   - $wsgi_application_group
   #   - $wsgi_daemon_process
+  #   - $wsgi_import_script
   #   - $wsgi_process_group
   #   - $wsgi_script_aliases
   file { "${priority_real}-${filename}.conf":
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index 4a68eed8d6..474c30ff19 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -1,8 +1,14 @@
+<% if @wsgi_application_group -%>
+  WSGIApplicationGroup <%= @wsgi_application_group %>
+<% end -%>
 <% if @wsgi_daemon_process and @wsgi_daemon_process_options -%>
   WSGIDaemonProcess <%= @wsgi_daemon_process %> <%= @wsgi_daemon_process_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
 <% elsif @wsgi_daemon_process and !@wsgi_daemon_process_options -%>
   WSGIDaemonProcess <%= @wsgi_daemon_process %>
 <% end -%>
+<% if @wsgi_import_script and @wsgi_import_script_options -%>
+  WSGIImportScript <%= @wsgi_import_script %> <%= @wsgi_import_script_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
+<% end -%>
 <% if @wsgi_process_group -%>
   WSGIProcessGroup <%= @wsgi_process_group %>
 <% end -%>

From 32791446c7264a1a5187dddfa18a546c47854907 Mon Sep 17 00:00:00 2001
From: Matt Dainty <matt@bodgit-n-scarper.com>
Date: Wed, 5 Feb 2014 14:15:17 +0000
Subject: [PATCH 0147/2267] Add WSGIApplicationGroup & WSGIImportScript tests.

---
 spec/acceptance/vhost_spec.rb |  5 +++++
 spec/defines/vhost_spec.rb    | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 7d066241f7..205496a944 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -871,8 +871,11 @@ class { 'apache::mod::wsgi': }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
           docroot                     => '/tmp',
+          wsgi_application_group      => '%{GLOBAL}',
           wsgi_daemon_process         => 'wsgi',
           wsgi_daemon_process_options => {processes => '2'},
+          wsgi_import_script          => '/test1',
+          wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
           wsgi_process_group          => 'vagrant',
           wsgi_script_aliases         => { '/test' => '/test1' },
         }
@@ -882,7 +885,9 @@ class { 'apache::mod::wsgi': }
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
+      it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
       it { should contain 'WSGIDaemonProcess wsgi processes=2' }
+      it { should contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
       it { should contain 'WSGIProcessGroup vagrant' }
       it { should contain 'WSGIScriptAlias /test "/test1"' }
     end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 150e20833f..2cd2bb29d7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -601,6 +601,12 @@
             /^  WSGIScriptAlias \/ "\/usr\/local\/wsgi\/scripts\/myapp.wsgi"$/,
           ],
         },
+        {
+          :title => 'should accept a wsgi application group',
+          :attr  => 'wsgi_application_group',
+          :value => '%{GLOBAL}',
+          :match => [/^  WSGIApplicationGroup %{GLOBAL}$/],
+        },
         {
           :title => 'should contain environment variables',
           :attr  => 'access_log_env_var',
@@ -1116,6 +1122,18 @@
         end
       end
 
+      describe 'when wsgi_import_script and wsgi_import_script_options are specified' do
+        let :params do default_params.merge({
+          :wsgi_import_script         => '/var/www/demo.wsgi',
+          :wsgi_import_script_options => { 'application-group' => '%{GLOBAL}', 'process-group' => 'wsgi' },
+        }) end
+        it 'should set wsgi_import_script_options' do
+          should contain_file("25-#{title}.conf").with_content(
+            /^  WSGIImportScript \/var\/www\/demo.wsgi application-group=%{GLOBAL} process-group=wsgi$/
+          )
+        end
+      end
+
       describe 'when rewrites are specified' do
         let :params do default_params.merge({
           :rewrites => [

From 709e2e16cbb1c21821673aa038b91a77da55be6d Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 11 Feb 2014 14:53:12 -0800
Subject: [PATCH 0148/2267] The vagrant user doesn't exist on non-vagrant
 machines

---
 spec/acceptance/vhost_spec.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 205496a944..1ac3d8d570 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -426,8 +426,8 @@ class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
           docroot       => '/tmp/test',
-          docroot_owner => 'vagrant',
-          docroot_group => 'vagrant',
+          docroot_owner => 'nobody',
+          docroot_group => 'nobody',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -435,8 +435,8 @@ class { 'apache': }
 
     describe file('/tmp/test') do
       it { should be_directory }
-      it { should be_owned_by 'vagrant' }
-      it { should be_grouped_into 'vagrant' }
+      it { should be_owned_by 'nobody' }
+      it { should be_grouped_into 'nobody' }
     end
   end
 
@@ -876,7 +876,7 @@ class { 'apache::mod::wsgi': }
           wsgi_daemon_process_options => {processes => '2'},
           wsgi_import_script          => '/test1',
           wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
-          wsgi_process_group          => 'vagrant',
+          wsgi_process_group          => 'nobody',
           wsgi_script_aliases         => { '/test' => '/test1' },
         }
       EOS
@@ -888,7 +888,7 @@ class { 'apache::mod::wsgi': }
       it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
       it { should contain 'WSGIDaemonProcess wsgi processes=2' }
       it { should contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
-      it { should contain 'WSGIProcessGroup vagrant' }
+      it { should contain 'WSGIProcessGroup nobody' }
       it { should contain 'WSGIScriptAlias /test "/test1"' }
     end
   end
@@ -919,7 +919,7 @@ class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
           docroot  => '/tmp',
-          itk      => { user => 'vagrant', group => 'vagrant' }
+          itk      => { user => 'nobody', group => 'nobody' }
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -927,7 +927,7 @@ class { 'apache': }
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'AssignUserId vagrant vagrant' }
+      it { should contain 'AssignUserId nobody nobody' }
     end
   end
 

From b6c6c00efffb0c194197c053815aa6c510d56b99 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 11 Feb 2014 16:32:50 -0800
Subject: [PATCH 0149/2267] Allow custom gemsource

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 9dfc87712f..dd87fe8cff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
   gem 'rake',                    :require => false

From f1069cd34a7c3c615dc89754aaa3430e0de711b4 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 12 Feb 2014 17:54:35 -0800
Subject: [PATCH 0150/2267] Create user/group instead of using existing ones

The group `nobody` doesn't exist on debian so this fixes that failure.
---
 spec/acceptance/vhost_spec.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 1ac3d8d570..a45db82b01 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -422,12 +422,14 @@ class { 'apache': default_vhost => false }
   describe 'docroot' do
     it 'applies cleanly' do
       pp = <<-EOS
+        user { 'test_owner': ensure => present, }
+        group { 'test_group': ensure => present, }
         class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
           docroot       => '/tmp/test',
-          docroot_owner => 'nobody',
-          docroot_group => 'nobody',
+          docroot_owner => 'test_owner',
+          docroot_group => 'test_group',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -435,8 +437,8 @@ class { 'apache': }
 
     describe file('/tmp/test') do
       it { should be_directory }
-      it { should be_owned_by 'nobody' }
-      it { should be_grouped_into 'nobody' }
+      it { should be_owned_by 'test_owner' }
+      it { should be_grouped_into 'test_group' }
     end
   end
 

From 1ee31e340b10419dd0b274e8d3cb91941e4df4e0 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Tue, 18 Feb 2014 08:41:11 +0000
Subject: [PATCH 0151/2267] Replace mutating hashes with merge() for Puppet 3.5

---
 manifests/vhost.pp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 2b129311a3..22beec2e82 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -417,13 +417,17 @@
     }
 
     if $apache_version == 2.4 {
-      $_directory[require] = 'all granted'
+      $_directory_version = {
+        require => 'all granted',
+      }
     } else {
-      $_directory[order] = 'allow,deny'
-      $_directory[allow] = 'from all'
+      $_directory_version = {
+        order => 'allow,deny',
+        allow => 'from all',
+      }
     }
 
-    $_directories = [ $_directory ]
+    $_directories = [ merge($_directory, $_directory_version) ]
   }
 
   # Template uses:

From 8f248f72478a4c9b09a9d2b8695cf2969f4e0123 Mon Sep 17 00:00:00 2001
From: Lauren Rother <lauren.rother@puppetlabs.com>
Date: Wed, 15 Jan 2014 16:41:14 -0800
Subject: [PATCH 0152/2267] Updates README

Adds sections for new parameters, classes, and defined types not previously documented. Updates sections for parameters, classes, defined types, testing, and examples to reflect ongoing changes to the module. Edits for punctuation, spelling, grammar, clarity, consistency, formatting, and code correctness. Updates links to external documentation to point to the most recent and most pertinent docs.
---
 README.md | 1384 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 807 insertions(+), 577 deletions(-)

diff --git a/README.md b/README.md
index b36d7d2224..c960814f5c 100644
--- a/README.md
+++ b/README.md
@@ -4,27 +4,43 @@
 
 ####Table of Contents
 
-1. [Overview - What is the Apache module?](#overview)
+1. [Overview - What is the apache module?](#overview)
 2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with Apache](#setup)
-    * [Beginning with Apache - Installation](#beginning-with-apache)
-    * [Configure a Virtual Host - Basic options for getting started](#configure-a-virtual-host)
-4. [Usage - The classes, defined types, and their parameters available for configuration](#usage)
+3. [Setup - The basics of getting started with apache](#setup)
+    * [Beginning with apache - Installation](#beginning-with-apache)
+    * [Configure a virtual host - Basic options for getting started](#configure-a-virtual-host)
+4. [Usage - The classes and defined types available for configuration](#usage)
     * [Classes and Defined Types](#classes-and-defined-types)
         * [Class: apache](#class-apache)
+        * [Class: apache::default_mods](#class-apachedefault_mods)
+        * [Defined Type: apache::mod](#defined-type-apachemod)
         * [Classes: apache::mod::*](#classes-apachemodname)
+        * [Class: apache::mod::ssl](#class-apachemodssl)
+        * [Class: apache::mod::wsgi](#class-apachemodwsgi)
         * [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)
     * [Virtual Host Examples - Demonstrations of some configuration options](#virtual-host-examples)
-5. [Implementation - An under-the-hood peek at what the module is doing](#implementation)
-    * [Classes and Defined Types](#classes-and-defined-types)
+    * [Load Balancing](#load-balancing)
+        * [Defined Type: apache::balancer](#defined-type-apachebalancer)
+        * [Defined Type: apache::balancermember](#defined-type-apachebalancermember)
+        * [Examples - Load balancing with exported and non-exported resources](#examples)
+5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
+    * [Classes](#classes)
+        * [Public Classes](#public-classes)
+        * [Private Classes](#private-classes)
+    * [Defined Types](#defined-types)
+        * [Public Defined Types](#public-defined-types)
+        * [Private Defined Types](#private-defined-types)
     * [Templates](#templates)
 6. [Limitations - OS compatibility, etc.](#limitations)
 7. [Development - Guide for contributing to the module](#development)
-8. [Release Notes - Notes on the most recent updates to the module](#release-notes)
+    * [Contributing to the apache module](#contributing)
+    * [Running tests - A quick guide](#running-tests)
 
 ##Overview
 
-The Apache module allows you to set up virtual hosts and manage web services with minimal effort.
+The apache module allows you to set up virtual hosts and manage web services with minimal effort.
 
 ##Module Description
 
@@ -32,15 +48,15 @@ Apache is a widely-used web server, and this module provides a simplified way of
 
 ##Setup
 
-**What Apache affects:**
+**What apache affects:**
 
 * configuration files and directories (created and written to)
-    * **NOTE**: Configurations that are *not* managed by Puppet will be purged.
+    * **WARNING**: Configurations that are *not* managed by Puppet will be purged.
 * package/service/configuration files for Apache
 * Apache modules
 * virtual hosts
 * listened-to ports
-* `/etc/make.conf` on FreeBSD
+* `/etc/make.conf` on FreeBSD 
 
 ###Beginning with Apache
 
@@ -50,7 +66,7 @@ To install Apache with the default parameters
     class { 'apache':  }
 ```
 
-The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, RedHat systems have another). These defaults will work well in a testing environment, but are not suggested for production. To establish customized parameters
+The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, and RedHat systems have another, as do FreeBSD systems). These defaults will work well in a testing environment, but are not suggested for production. To establish customized parameters
 
 ```puppet
     class { 'apache':
@@ -78,7 +94,7 @@ To configure a very basic, name-based virtual host
 
 *Note:* The default priority is 15. If nothing matches this priority, the alphabetically first name-based vhost will be used. This is also true if you pass a higher priority and no names match anything else.
 
-A slightly more complicated example, which moves the docroot owner/group
+A slightly more complicated example, changes the docroot owner/group from the default 'root'
 
 ```puppet
     apache::vhost { 'second.example.com':
@@ -111,23 +127,22 @@ To set up a virtual host with SSL and specific SSL certificates
     }
 ```
 
-To set up a virtual host with IP address different than '*'
+Virtual hosts listen on '*' by default. To listen on a specific IP address
 
 ```puppet
     apache::vhost { 'subdomain.example.com':
       ip      => '127.0.0.1',
       port    => '80',
-      docrout => '/var/www/subdomain',
+      docroot => '/var/www/subdomain',
     }
 ```
 
-To set up a virtual host with wildcard alias for subdomain mapped to same named directory
-`http://examle.com.loc => /var/www/example.com`
+To set up a virtual host with a wildcard alias for the subdomain mapped to a same-named directory, for example: `http://example.com.loc` to `/var/www/example.com`
 
 ```puppet
     apache::vhost { 'subdomain.loc':
-      vhost_name => '*',
-      port       => '80',
+      vhost_name       => '*',
+      port             => '80',
       virtual_docroot' => '/var/www/%-2+',
       docroot          => '/var/www',
       serveraliases    => ['*.loc',],
@@ -157,8 +172,11 @@ To set up a virtual host with WSGI
       docroot                     => '/var/www/pythonapp',
       wsgi_application_group      => '%{GLOBAL}',
       wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options =>
-        { processes => '2', threads => '15', display-name => '%{GROUP}' },
+      wsgi_daemon_process_options => { 
+        processes    => '2', 
+        threads      => '15', 
+        display-name => '%{GROUP}',
+       },
       wsgi_import_script          => '/var/www/demo.wsgi',
       wsgi_import_script_options  =>
         { process-group => 'wsgi', application-group => '%{GLOBAL}' },
@@ -167,7 +185,7 @@ To set up a virtual host with WSGI
     }
 ```
 
-Starting 2.2.16, httpd supports [FallbackResource](https://httpd.apache.org/docs/2.2/mod/mod_dir.html#fallbackresource) which is a simple replace for common RewriteRules:
+Starting in Apache 2.2.16, httpd supports [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource), a simple replace for common RewriteRules.
 
 ```puppet
     apache::vhost { 'wordpress.example.com':
@@ -177,190 +195,202 @@ Starting 2.2.16, httpd supports [FallbackResource](https://httpd.apache.org/docs
     }
 ```
 
-Please note that the `disabled` argument to FallbackResource is only supported since 2.2.24.
+Please note that the 'disabled' argument to FallbackResource is only supported since Apache 2.2.24.
 
-To see a list of all virtual host parameters, [please go here](#defined-type-apachevhost). To see an extensive list of virtual host examples [please look here](#virtual-host-examples).
+See a list of all [virtual host parameters](#defined-type-apachevhost). See an extensive list of [virtual host examples](#virtual-host-examples).
 
 ##Usage
 
 ###Classes and Defined Types
 
-This module modifies Apache configuration files and directories and will purge any configuration not managed by Puppet. Configuration of Apache should be managed by Puppet, as non-puppet configuration files can cause unexpected failures.
+This module modifies Apache configuration files and directories, and will purge any configuration not managed by Puppet. Configuration of Apache should be managed by Puppet, as non-Puppet configuration files can cause unexpected failures.
 
-It is possible to temporarily disable full Puppet management by setting the `purge_configs` parameter within the base `apache` class to 'false'. This option should only be used as a temporary means of saving and relocating customized configurations.
+It is possible to temporarily disable full Puppet management by setting the [`purge_configs`](#purge_configs) parameter within the base `apache` class to 'false'. This option should only be used as a temporary means of saving and relocating customized configurations. See the [`purge_configs` parameter](#purge_configs) for more information.
 
 ####Class: `apache`
 
-The Apache module's primary class, `apache`, guides the basic setup of Apache on your system.
+The apache module's primary class, `apache`, guides the basic setup of Apache on your system.
 
 You may establish a default vhost in this class, the `vhost` class, or both. You may add additional vhost configurations for specific virtual hosts using a declaration of the `vhost` type.
 
 **Parameters within `apache`:**
 
-#####`default_mods`
+#####`confd_dir`
 
-Sets up Apache with default settings based on your OS. Defaults to 'true', set to 'false' for customized configuration.
+Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
 
-#####`default_vhost`
+#####`conf_template`
 
-Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
+Overrides the template used for the main apache configuration file. Defaults to 'apache/httpd.conf.erb'.
+
+*Note:* Using this parameter is potentially risky, as the module has been built for a minimal configuration file with the configuration primarily coming from conf.d/ entries.
 
 #####`default_confd_files`
 
-Generates default set of include-able apache configuration files under  `${apache::confd_dir}` directory. These configuration files correspond to what is usually installed with apache package on given platform.
+Generates default set of include-able Apache configuration files under  `${apache::confd_dir}` directory. These configuration files correspond to what is usually installed with the Apache package on a given platform.
 
-#####`default_ssl_vhost`
+#####`default_mods`
 
-Sets up a default SSL virtual host. Defaults to 'false'.
+Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names. 
 
-```puppet
-    apache::vhost { 'default-ssl':
-      port            => 443,
-      ssl             => true,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => "ssl_${access_log_file}",
-      }
-```
+Defaults to 'true', which will include the default [HTTPD mods](https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp).
 
-SSL vhosts only respond to HTTPS queries.
+If false, it will only include the mods required to make HTTPD work, and any other mods can be declared on their own.
 
-#####`default_ssl_cert`
+If an array, the apache module will include the array of mods listed.
+
+#####`default_ssl_ca`
 
-The default SSL certification, which is automatically set based on your operating system  (`/etc/pki/tls/certs/localhost.crt` for RedHat, `/etc/ssl/certs/ssl-cert-snakeoil.pem` for Debian, `/usr/local/etc/apache22/server.crt` for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default certificate authority, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
-#####`default_ssl_key`
+#####`default_ssl_cert`
 
-The default SSL key, which is automatically set based on your operating system (`/etc/pki/tls/private/localhost.key` for RedHat, `/etc/ssl/private/ssl-cert-snakeoil.key` for Debian, `/usr/local/etc/apache22/server.key` for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL certification, which is automatically set based on your operating system  ('/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_chain`
 
 The default SSL chain, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
-#####`default_ssl_ca`
+#####`default_ssl_crl`
 
-The default certificate authority, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default certificate revocation list to use, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_crl_path`
 
 The default certificate revocation list path, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
-#####`default_ssl_crl`
+#####`default_ssl_key`
 
-The default certificate revocation list to use, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
-#####`service_name`
+#####`default_ssl_vhost`
 
-Name of apache service to run. Defaults to: `'httpd'` on RedHat, `'apache2'` on Debian, and `'apache22'` on FreeBSD.
+Sets up a default SSL virtual host. Defaults to 'false'. If set to 'true', will set up the following vhost:
 
-#####`service_enable`
+```puppet
+    apache::vhost { 'default-ssl':
+      port            => 443,
+      ssl             => true,
+      docroot         => $docroot,
+      scriptalias     => $scriptalias,
+      serveradmin     => $serveradmin,
+      access_log_file => "ssl_${access_log_file}",
+      }
+```
 
-Determines whether the 'httpd' service is enabled when the machine is booted. Defaults to 'true'.
+SSL vhosts only respond to HTTPS queries.
 
-#####`service_ensure`
+#####`default_vhost`
 
-Determines whether the service should be running. Can be set to 'undef' which is useful when you want to let the service be managed by some other application like pacemaker. Defaults to 'running'.
+Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
 
-#####`purge_configs`
+#####`error_documents`
 
-Removes all other apache configs and vhosts, which is automatically set to true. Setting this to false is a stopgap measure to allow the apache module to coexist with existing or otherwise managed configuration. It is recommended that you move your configuration entirely to resources within this module.
+Enables custom error documents. Defaults to 'false'.
 
-#####`serveradmin`
+#####`httpd_dir`
 
-Sets the server administrator. Defaults to 'root@localhost'.
+Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but may have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
 
-#####`servername`
+#####`keepalive`
 
-Sets the servername. Defaults to fqdn provided by facter.
+Enables persistent connections.
 
-#####`server_root`
+#####`keepalive_timeout`
 
-A value to be set as `ServerRoot` in main configuration file (`httpd.conf`). Defaults to `/etc/httpd` on RedHat, `/etc/apache2` on Debian and `/usr/local` on FreeBSD.
+Sets the amount of time the server will wait for subsequent requests on a persistent connection. Defaults to '15'.
 
-#####`sendfile`
+#####`log_level`
 
-Makes Apache use the Linux kernel 'sendfile' to serve static files. Defaults to 'On'.
+Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info', or 'debug'.
 
-#####`server_root`
+#####`logroot`
 
-A value to be set as `ServerRoot` in main configuration file (`httpd.conf`). Defaults to `/etc/httpd` on RedHat and `/etc/apache2` on Debian.
+Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, and '/var/log/apache22' on FreeBSD.
 
-#####`error_documents`
+#####`manage_group`
 
-Enables custom error documents. Defaults to 'false'.
+Setting this to 'false' will stop the group resource from being created. This is for when you have a group, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established group would result in a duplicate resource error.
 
-#####`httpd_dir`
+#####`manage_user`
 
-Changes the base location of the configuration directories used for the service. This is useful for specially repackaged HTTPD builds but may have unintended consequences when used in combination with the default distribution packages. Default is based on your OS.
+Setting this to 'false' will stop the user resource from being created. This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
 
-#####`confd_dir`
+#####`mod_dir`
 
-Changes the location of the configuration directory your custom configuration files are placed in. Default is based on your OS.
+Changes the location of the configuration directory your Apache modules configuration files are placed in. Defaults to '/etc/httpd/conf.d' for RedHat, '/etc/apache2/mods-available' for Debian, and '/usr/local/etc/apache22/Modules' for FreeBSD.
 
-#####`vhost_dir`
+#####`mpm_module`
 
-Changes the location of the configuration directory your virtual host configuration files are placed in. Default is based on your OS.
+Determines which MPM is loaded and configured for the HTTPD process. Valid values are 'event', 'itk', 'peruser', 'prefork', 'worker', or 'false'. Defaults to 'prefork' on RedHat and FreeBSD, and 'worker' on Debian. Must be set to 'false' to explicitly declare the following classes with custom parameters:
 
-#####`mod_dir`
+* `apache::mod::event`
+* `apache::mod::itk`
+* `apache::mod::peruser`
+* `apache::mod::prefork`
+* `apache::mod::worker` 
 
-Changes the location of the configuration directory your Apache modules configuration files are placed in. Default is based on your OS.
+*Note:* Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `$mpm_module` you must uninstall all packages that depend on your currently-installed Apache. 
 
-#####`mpm_module`
+#####`package_ensure`
 
-Configures which mpm module is loaded and configured for the httpd process by the `apache::mod::event`, `apache::mod::itk`, `apache::mod::peruser`, `apache::mod::prefork` and `apache::mod::worker` classes. Must be set to `false` to explicitly declare `apache::mod::event`, `apache::mod::itk`, `apache::mod::peruser`,  `apache::mod::prefork` or `apache::mod::worker` classes with parameters. All possible values are `event`, `itk`, `peruser`, `prefork`, `worker` (valid values depend on agent's OS), or the boolean `false`. Defaults to `prefork` on RedHat and FreeBSD and `worker` on Debian. Note: on FreeBSD switching between different mpm modules is quite difficult (but possible). Before changing `$mpm_module` one has to deinstall all packages that depend on currently installed `apache`.
+Allows control over the package ensure attribute. Can be 'present','absent', or a version string.
 
-#####`conf_template`
+#####`ports_file`
 
-Setting this allows you to override the template used for the main apache configuration file.  This is a potentially risky thing to do as this module has been built around the concept of a minimal configuration file with most of the configuration coming in the form of conf.d/ entries.  Defaults to 'apache/httpd.conf.erb'.
+Changes the name of the file containing Apache ports configuration. Default is `${conf_dir}/ports.conf`.
 
-#####`keepalive`
+#####`purge_configs`
 
-Setting this allows you to enable persistent connections.
+Removes all other Apache configs and vhosts, defaults to 'true'. Setting this to 'false' is a stopgap measure to allow the apache module to coexist with existing or otherwise-managed configuration. It is recommended that you move your configuration entirely to resources within this module.
 
-#####`keepalive_timeout`
+#####`sendfile`
 
-Amount of time the server will wait for subsequent requests on a persistent connection. Defaults to '15'.
+Makes Apache use the Linux kernel sendfile to serve static files. Defaults to 'On'.
 
-#####`logroot`
+#####`serveradmin`
+
+Sets the server administrator. Defaults to 'root@localhost'.
+
+#####`servername`
 
-Changes the location of the directory Apache log files are placed in. Defaut is based on your OS.
+Sets the server name. Defaults to `fqdn` provided by Facter.
 
-#####`log_level`
+#####`server_root`
 
-Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are `emerg`, `alert`, `crit`, `error`, `warn`, `notice`, `info` or `debug`.
+Sets the root directory in which the server resides. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local' on FreeBSD.
 
-#####`ports_file`
+#####`server_signature`
 
-Changes the name of the file containing Apache ports configuration. Default is `${conf_dir}/ports.conf`.
+Configures a trailing footer line under server-generated documents. More information about [ServerSignature](http://httpd.apache.org/docs/current/mod/core.html#serversignature). Defaults to 'On'.
 
 #####`server_tokens`
 
-Controls how much information Apache sends to the browser about itself and the operating system. See Apache documentation for 'ServerTokens'. Defaults to 'OS'.
+Controls how much information Apache sends to the browser about itself and the operating system. More information about [ServerTokens](http://httpd.apache.org/docs/current/mod/core.html#servertokens). Defaults to 'OS'.
 
-#####`server_signature`
+#####`service_enable`
 
-Allows the configuration of a trailing footer line under server-generated documents. See Apache documentation for 'ServerSignature'. Defaults to 'On'.
+Determines whether the HTTPD service is enabled when the machine is booted. Defaults to 'true'.
 
-#####`trace_enable`
+#####`service_ensure`
 
-Controls, how TRACE requests per RFC 2616 are handled. See Apache documentation for 'TraceEnable'. Defaults to 'On'.
+Determines whether the service should be running. Can be set to 'undef', which is useful when you want to let the service be managed by some other application like Pacemaker. Defaults to 'running'.
 
-#####`manage_user`
+#####`service_name`
 
-Setting this to false will avoid the user resource to be created by this module. This is useful when you already have a user created in another puppet module and that you want to used it to run apache. Without this, it would result in a duplicate resource error.
+Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on Debian, and 'apache22' on FreeBSD.
 
-#####`manage_group`
+#####`trace_enable`
 
-Setting this to false will avoid the group resource to be created by this module. This is useful when you already have a group created in another puppet module and that you want to used it for apache. Without this, it would result in a duplicate resource error.
+Controls how TRACE requests per RFC 2616 are handled. More information about [TraceEnable](http://httpd.apache.org/docs/current/mod/core.html#traceenable). Defaults to 'On'.
 
-#####`package_ensure`
+#####`vhost_dir`
 
-Allow control over the package ensure statement. This is useful if you want to make sure apache is always at the latest version or whether it is only installed.
+Changes the location of the configuration directory your virtual host configuration files are placed in. Defaults to 'etc/httpd/conf.d' on RedHat, '/etc/apache2/sites-available' on Debian, and '/usr/local/etc/apache22/Vhosts' on FreeBSD.
 
 ####Class: `apache::default_mods`
 
-Installs default Apache modules based on what OS you are running
+Installs default Apache modules based on what OS you are running.
 
 ```puppet
     class { 'apache::default_mods': }
@@ -368,7 +398,7 @@ Installs default Apache modules based on what OS you are running
 
 ####Defined Type: `apache::mod`
 
-Used to enable arbitrary Apache httpd modules for which there is no specific `apache::mod::[name]` class. The `apache::mod` defined type will also install the required packages to enable the module, if any.
+Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class. The `apache::mod` defined type will also install the required packages to enable the module, if any.
 
 ```puppet
     apache::mod { 'rewrite': }
@@ -422,22 +452,22 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `rewrite`
 * `rpaf`*
 * `setenvif`
-* `ssl`* (see [apache::mod::ssl](#class-apachemodssl) below)
+* `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl) below)
 * `status`*
 * `suphp`
 * `userdir`*
 * `vhost_alias`
 * `worker`*
-* `wsgi` (see [apache::mod::wsgi](#class-apachemodwsgi) below)
+* `wsgi` (see [`apache::mod::wsgi`](#class-apachemodwsgi) below)
 * `xsendfile`
 
 Modules noted with a * indicate that the module has settings and, thus, a template that includes parameters. These parameters control the module's configuration. Most of the time, these parameters will not require any configuration or attention.
 
-The modules mentioned above, and other Apache modules that have templates, will cause template files to be dropped along with the mod install, and the module will not work without the template. Any mod without a template will install package but drop no files.
+The modules mentioned above, and other Apache modules that have templates, will cause template files to be dropped along with the mod install and the module will not work without the template. Any module without a template will install the package but drop no files.
 
 ####Class: `apache::mod::ssl`
 
-Installs Apache SSL capabilities and utilizes `ssl.conf.erb` template. These are the defaults:
+Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are the defaults:
 
 ```puppet
     class { 'apache::mod::ssl':
@@ -446,24 +476,31 @@ Installs Apache SSL capabilities and utilizes `ssl.conf.erb` template. These are
   }
 ```
 
-To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` parameter in `apache` to 'true' or set the `ssl` parameter in `apache::vhost` to 'true'.
+To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` parameter in `::apache` to 'true' or set the `ssl` parameter in `apache::vhost` to 'true'.
 
 ####Class: `apache::mod::wsgi`
 
+Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`. 
+
+For customized parameters, which tell Apache how Python is currently configured on the operating system,
+
 ```puppet
     class { 'apache::mod::wsgi':
       wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
-      wsgi_python_home   => '/path/to/virtenv',
-      wsgi_python_path   => '/path/to/virtenv/site-packages',
+      wsgi_python_home   => '/path/to/venv',
+      wsgi_python_path   => '/path/to/venv/site-packages',
     }
 ```
+
+More information about [WSGI](http://modwsgi.readthedocs.org/en/latest/).
+
 ####Defined Type: `apache::vhost`
 
-The Apache module allows a lot of flexibility in the set up and configuration of virtual hosts. This flexibility is due, in part, to `vhost`'s setup as a defined resource type, which allows it to be evaluated multiple times with different parameters.
+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.
 
-The `vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside of the defaults. You can set up a default vhost within the base `apache` class as well as set a customized vhost setup as default. Your customized vhost (priority 10) will be privileged over the base class vhost (15).
+The `vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default vhost within the base `::apache` class, as well as set a customized vhost as default. Your customized vhost (priority 10) will be privileged over the base class vhost (15).
 
-If you have a series of specific configurations and do not want a base `apache` class default vhost, make sure to set the base class default host to 'false'.
+If you have a series of specific configurations and do not want a base `::apache` class default vhost, make sure to set the base class `default_vhost` to 'false'.
 
 ```puppet
     class { 'apache':
@@ -473,15 +510,13 @@ If you have a series of specific configurations and do not want a base `apache`
 
 **Parameters within `apache::vhost`:**
 
-The default values for each parameter will vary based on operating system and type of virtual host.
-
 #####`access_log`
 
-Specifies whether `*_access.log` directives should be configured. Valid values are 'true' and 'false'. Defaults to 'true'.
+Specifies whether `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`) should be configured. Setting the value to 'false' will choose none. Defaults to 'true'. 
 
 #####`access_log_file`
 
-Points to the `*_access.log` file. Defaults to 'undef'.
+Sets the `*_access.log` filename that is placed in `$logroot`. Given a vhost, example.com, it defaults to 'example.com_ssl.log' for SSL vhosts and 'example.com_access.log' for non-SSL vhosts.
 
 #####`access_log_pipe`
 
@@ -493,40 +528,48 @@ Sends all access log messages to syslog. Defaults to 'undef'.
 
 #####`access_log_format`
 
-Specifies either a LogFormat nickname or custom format string for access log. Defaults to 'undef'.
+Specifies the use of either a LogFormat nickname or a custom format string for the access log. Defaults to 'combined'. See [these examples](http://httpd.apache.org/docs/current/mod/mod_log_config.html).
 
 #####`access_log_env_var`
 
-Adds writing control of access log via environment variable of the access. Defaults to 'undef'.
+Specifies that only requests with particular environment variables be logged. Defaults to 'undef'.
 
 #####`add_listen`
 
-Determines whether the vhost creates a listen statement. The default value is 'true'.
+Determines whether the vhost creates a Listen statement. The default value is 'true'.
+
+Setting `add_listen` to 'false' stops the vhost from creating a Listen statement, and this is important when you combine vhosts that are not passed an `ip` parameter with vhosts that *are* passed the `ip` parameter.
 
-Setting `add_listen` to 'false' stops the vhost from creating a listen statement, and this is important when you combine vhosts that are not passed an `ip` parameter with vhosts that *are* passed the `ip` parameter.
+#####`additional_includes`
+
+Specifies paths to additional static, vhost-specific Apache configuration files. Useful for implementing a unique, custom configuration not supported by this module. Can be an array. Defaults to '[]'.
 
 #####`aliases`
 
-Passes a list of hashes to the vhost to create `Alias` or `AliasMatch` statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). Each hash is expected to be of the form:
+Passes a list of hashes to the vhost to create Alias or AliasMatch directives as per the [mod_alias documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
 
-```
+```puppet
 aliases => [
-  { aliasmatch => '^/image/(.*)\.jpg$', path => '/files/jpg.images/$1.jpg' }
-  { alias      => '/image',             path => '/ftp/pub/image' },
+  { aliasmatch => '^/image/(.*)\.jpg$', 
+    path       => '/files/jpg.images/$1.jpg',
+  }
+  { alias      => '/image',
+    path       => '/ftp/pub/image', 
+  },
 ],
 ```
 
-For `Alias` and `AliasMatch` to work, each will need a corresponding `<Directory /path/to/directory>` or `<Location /path/to/directory>` block. The `Alias` and `AliasMatch` directives are created in the order specified in the `aliases` paramter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html) more specific `Alias` or `AliasMatch` directives should come before the more general ones to avoid shadowing.
+For `alias` and `aliasmatch` to work, each will need a corresponding context, such as '< Directory /path/to/directory>' or '<Location /path/to/directory>'. The Alias and AliasMatch directives are created in the order specified in the `aliases` parameter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html), more specific `alias` or `aliasmatch` parameters should come before the more general ones to avoid shadowing.
 
-**Note:** If `apache::mod::passenger` is loaded and `PassengerHighPerformance true` is set, then `Alias` may have issues honouring the `PassengerEnabled off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
+*Note:* If `apache::mod::passenger` is loaded and `PassengerHighPerformance => true` is set, then Alias may have issues honoring the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
 #####`block`
 
-Specifies the list of things Apache will block access to. The default is an empty set, '[]'. Currently, the only option is 'scm', which blocks web access to .svn, .git and .bzr directories. To add to this, please see the [Development](#development) section.
+Specifies the list of things Apache will block access to. The default is an empty set, '[]'. Currently, the only option is 'scm', which blocks web access to .svn, .git and .bzr directories.
 
 #####`custom_fragment`
 
-Pass a string of custom configuration directives to be placed at the end of the vhost configuration.
+Passes a string of custom configuration directives to be placed at the end of the vhost configuration. Defaults to 'undef'.
 
 #####`default_vhost`
 
@@ -534,656 +577,797 @@ Sets a given `apache::vhost` as the default to serve requests that do not match
 
 #####`directories`
 
-Passes a list of hashes to the vhost to create `<Directory /path/to/directory>...</Directory>` directive blocks as per the [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#directory).  The `path` key is required in these hashes. An optional `provider` defaults to `directory`.  Usage will typically look like:
+See the [`directories` section](#parameter-directories-for-apachevhost).
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path => '/path/to/directory', <directive> => <value> },
-        { path => '/path/to/another/directory', <directive> => <value> },
-      ],
-    }
-```
+#####`directoryindex`
 
-*Note:* At least one directory should match `docroot` parameter, once you start declaring directories `apache::vhost` assumes that all required `<Directory>` blocks will be declared.
+Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. [DirectoryIndex](http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex) has more information. Defaults to 'undef'.
 
-*Note:* If not defined a single default `<Directory>` block will be created that matches the `docroot` parameter.
+#####`docroot`
 
-`provider` can be set to any of `directory`, `files`, or `location`. If the [pathspec starts with a `~`](https://httpd.apache.org/docs/2.2/mod/core.html#files), httpd will interpret this as the equivalent of `DirectoryMatch`, `FilesMatch`, or `LocationMatch`, respectively.
+Provides the [DocumentRoot](http://httpd.apache.org/docs/current/mod/core.html#documentroot) directive, which identifies the directory Apache serves files from. Required. 
 
-```puppet
-    apache::vhost { 'files.example.net':
-      docroot     => '/var/www/files',
-      directories => [
-        { path => '~ (\.swp|\.bak|~)$', 'provider' => 'files', 'deny' => 'from all' },
-      ],
-    }
-```
+#####`docroot_group`
 
-The directives will be embedded within the `Directory` (`Files`, or `Location`) directive block, missing directives should be undefined and not be added, resulting in their default vaules in Apache. Currently this is the list of supported directives:
+Sets group access to the docroot directory. Defaults to 'root'.
 
-######`addhandlers`
+#####`docroot_owner`
 
-Sets `AddHandler` directives as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/mod_mime.html#addhandler). Accepts a list of hashes of the form `{ handler => 'handler-name', extensions => ['extension']}`. Note that `extensions` is a list of extenstions being handled by the handler.
-An example:
+Sets individual user access to the docroot directory. Defaults to 'root'.
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory',
-        addhandlers => [ { handler => 'cgi-script', extensions => ['.cgi']} ],
-      } ],
-    }
-```
+#####`error_log`
 
-######`allow`
+Specifies whether `*_error.log` directives should be configured. Defaults to 'true'.
 
-Sets an `Allow` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow). An example:
+#####`error_log_file`
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', allow => 'from example.org' } ],
-    }
-```
+Points to the `*_error.log` file. Given a vhost, example.com, it defaults to 'example.com_ssl_error.log' for SSL vhosts and 'example.com_access_error.log' for non-SSL vhosts.
 
-######`allow_override`
+#####`error_log_pipe`
 
-Sets the usage of `.htaccess` files as per the [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#allowoverride). Should accept in the form of a list or a string. An example:
+Specifies a pipe to send error log messages to. Defaults to 'undef'.
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', allow_override => ['AuthConfig', 'Indexes'] } ],
-    }
-```
+#####`error_log_syslog`
 
-######`deny`
+Sends all error log messages to syslog. Defaults to 'undef'.
+
+#####`error_documents`
 
-Sets an `Deny` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny). An example:
+A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this vhost. Defaults to '[]'. Example:
 
 ```puppet
     apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', deny => 'from example.org' } ],
+      error_documents => [
+        { 'error_code' => '503', 'document' => '/service-unavail' },
+        { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
+      ],
     }
 ```
-######`error_documents`
 
-A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/2.2/mod/core.html#errordocument) settings for this directory. Example:
+#####`ensure`
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      directories => [ { path => '/srv/www'
-        error_documents => [
-          { 'error_code' => '503', 'document' => '/service-unavail' },
-        ],
-      }]
-    }
-```
+Specifies if the vhost file is present or absent. Defaults to 'present'.
 
-######`headers`
+#####`fallbackresource`
 
-Adds lines for `Header` directives as per the [Apache Header documentation](http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header). An example:
+Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid values must either begin with a / or be 'disabled'. Defaults to 'undef'.
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => {
-        path    => '/path/to/directory',
-        headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-      },
-    }
-```
+#####`headers`
 
-######`options`
+Adds lines to replace, merge, or remove response headers. See [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Can be an array. Defaults to 'undef'.
 
-Lists the options for the given `<Directory>` block
+#####`ip`
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', options => ['Indexes','FollowSymLinks','MultiViews'] }],
-    }
-```
+Sets the IP address the vhost listens on. Defaults to listen on all IPs.
 
-######`index_options`
+#####`ip_based`
 
-Styles the list
+Enables an [IP-based](httpd.apache.org/docs/current/vhosts/ip-based.html) vhost. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based vhosts. Defaults to 'false'.
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', options => ['Indexes','FollowSymLinks','MultiViews'], index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'] }],
-    }
-```
+#####`itk`
 
-######`index_order_default`
-Sets the order of the list 
+Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys may be:
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', order => 'Allow,Deny', index_order_default => ['Descending', 'Date']}, ],
-    }
-```
+* user + group
+* `assignuseridexpr`
+* `assigngroupidexpr`
+* `maxclientvhost`
+* `nice`
+* `limituidrange` (Linux 3.5.0 or newer)
+* `limitgidrange` (Linux 3.5.0 or newer)
 
-######`order`
-Sets the order of processing `Allow` and `Deny` statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). An example:
+Usage will typically look like:
 
 ```puppet
     apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', order => 'Allow,Deny' } ],
+      docroot => '/path/to/directory',
+      itk     => {
+        user  => 'someuser',
+        group => 'somegroup',
+      },
     }
 ```
 
-######`auth_type`
+#####`logroot`
 
-Sets the value for `AuthType` as per the [Apache AuthType
-documentation](https://httpd.apache.org/docs/2.2/mod/core.html#authtype).
+Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
 
-######`auth_name`
+#####`log_level`
 
-Sets the value for `AuthName` as per the [Apache AuthName
-documentation](https://httpd.apache.org/docs/2.2/mod/core.html#authname).
+Specifies the verbosity of the error log. Defaults to 'warn' for the global server configuration and can be overridden on a per-vhost basis. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
 
-######`auth_digest_algorithm`
+#####`no_proxy_uris`
 
-Sets the value for `AuthDigestAlgorithm` as per the [Apache
-AuthDigestAlgorithm
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#authdigestalgorithm)
+Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
 
-######`auth_digest_domain`
+#####`options`
 
-Sets the value for `AuthDigestDomain` as per the [Apache AuthDigestDomain
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#authdigestdomain).
+Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. Defaults to '['Indexes','FollowSymLinks','MultiViews']', as demonstrated below:
 
-######`auth_digest_nonce_lifetime`
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      options => ['Indexes','FollowSymLinks','MultiViews'],
+    }
+```
 
-Sets the value for `AuthDigestNonceLifetime` as per the [Apache
-AuthDigestNonceLifetime
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#authdigestnoncelifetime)
+*Note:* If you use [`directories`](#parameter-directories-for-apachevhost), 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
-######`auth_digest_provider`
+#####`override`
 
-Sets the value for `AuthDigestProvider` as per the [Apache AuthDigestProvider
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#authdigestprovider).
+Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. Defaults to '[none]'.
 
-######`auth_digest_qop`
+#####`php_admin_flags & values`
 
-Sets the value for `AuthDigestQop` as per the [Apache AuthDigestQop
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#authdigestqop).
+Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '[]'.
 
-######`auth_digest_shmem_size`
+#####`port`
 
-Sets the value for `AuthAuthDigestShmemSize` as per the [Apache AuthDigestShmemSize
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#authdigestshmemsize).
+Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host will only listen on the port set in this parameter. 
 
-######`auth_basic_authoritative`
+#####`priority`
 
-Sets the value for `AuthBasicAuthoritative` as per the [Apache
-AuthBasicAuthoritative
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_basic.html#authbasicauthoritative).
+Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Defaults to '25'.
 
-######`auth_basic_fake`
+If nothing matches the priority, the first name-based vhost will be used. Likewise, passing a higher priority will cause the alphabetically first name-based vhost to be used if no other names match.
 
-Sets the value for `AuthBasicFake` as per the [Apache AuthBasicFake
-documentation](https://httpd.apache.org/docs/trunk/mod/mod_auth_basic.html#authbasicfake).
+*Note:* You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
 
-######`auth_basic_provider`
+#####`proxy_dest`
 
-Sets the value for `AuthBasicProvider` as per the [Apache AuthBasicProvider
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_auth_basic.html#authbasicprovider).
+Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
 
-######`auth_user_file`
+#####`proxy_pass`
 
-Sets the value for `AuthUserFile` as per the [Apache AuthUserFile
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_authn_file.html#authuserfile).
+Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
 
-######`auth_group_file`
+```puppet
+apache::vhost { 'site.name.fdqn':
+  … 
+  proxy_pass => [
+    { 'path' => '/a', 'url' => 'http://backend-a/' },
+    { 'path' => '/b', 'url' => 'http://backend-b/' },
+    { 'path' => '/c', 'url' => 'http://backend-a/c' },
+  ],
+}
+```
 
-Sets the value for `AuthGroupFile` as per the [Apache AuthGroupFile
-documentation](https://httpd.apache.org/docs/2.2/mod/mod_authz_groupfile.html#authgroupfile).
+#####`rack_base_uris`
 
-######`auth_require`
+Specifies the resource identifiers for a rack configuration. The file paths specified will be listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
 
-Sets the value for `AuthName` as per the [Apache Require
-documentation](https://httpd.apache.org/docs/2.2/mod/core.html#require)
+#####`redirect_dest`
 
+Specifies the address to redirect to. Defaults to 'undef'.
 
-######`passenger_enabled`
+#####`redirect_source`
 
-Sets the value for the `PassengerEnabled` directory to `on` or `off` as per the [Passenger documentation](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled).
+Specifies the source URIs that will redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length and the items will be order-dependent. 
 
 ```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', passenger_enabled => 'off' } ],
+    apache::vhost { 'site.name.fdqn':
+      …
+      redirect_source => ['/images','/downloads'],
+      redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
     }
 ```
 
-**Note:** This directive requires `apache::mod::passenger` to be active, Apache may not start with an unrecognised directive without it.
+#####`redirect_status`
 
-**Note:** Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the `PassengerEnabled` directive with the `PassengerHighPerformance` directive.
+Specifies the status to append to the redirect. Defaults to 'undef'.
 
-######`ssl_options`
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      redirect_status => ['temp','permanent'],
+    }
+```
 
-String or list of [`SSLOptions`](https://httpd.apache.org/docs/2.2/mod/mod_ssl.html#ssloptions) for the given `<Directory>` block. This overrides, or refines the [`SSLOptions`](https://httpd.apache.org/docs/2.2/mod/mod_ssl.html#ssloptions) of the parent block (either vhost, or server).
+#####`redirectmatch_regexp` & `redirectmatch_status`
+
+Determines which server status should be raised for a given regular expression. Entered as an array. Defaults to 'undef'.
 
 ```puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path => '/path/to/directory', ssl_options => '+ExportCertData' }
-        { path => '/path/to/different/dir', ssl_options => [ '-StdEnvVars', '+ExportCertData'] },
+    apache::vhost { 'site.name.fdqn':
+      …
+      redirectmatch_status => ['404','404'],
+      redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+    }
+```
+
+#####`request_headers`
+
+Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Defaults to 'undef'.
+
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      request_headers => [
+        'append MirrorID "mirror 12"',
+        'unset MirrorID',
       ],
     }
 ```
 
-######`suphp`
+#####`rewrites`
+
+Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'. 
 
-An array containing two values: User and group for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting.
-This directive must be used with `suphp_engine => on` in the vhost declaration. This directive only works in `<Directory>` or `<Location>`.
+For example, you can specify that anyone trying to access index.html will be served welcome.html
 
 ```puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path => '/path/to/directory', suphp => { user =>  'myappuser', group => 'myappgroup' }
+    apache::vhost { 'site.name.fdqn':
+      …
+      rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
+    }
+```
+
+The parameter allows rewrite conditions that, when true, will execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
+
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      rewrites => [
+        {
+          comment      => 'redirect IE',
+          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+          rewrite_rule => ['^index\.html$ welcome.html'],
+        },
       ],
     }
 ```
 
-######`php_admin_value` and `php_admin_flag`
+You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
 
-Allows per-vhost (and per-directory) setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user, or an application.
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      rewrites => [
+        {
+          comment      => 'Lynx or Mozilla v1/2',
+          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+          rewrite_rule => ['^index\.html$ welcome.html'],
+        },
+      ],
+    }
+```
 
-######`custom_fragment`
+Multiple rewrites and conditions are also possible
 
-Pass a string of custom configuration directives to be placed at the end of the
-directory configuration.
+```puppet
+    apache::vhost { 'site.name.fdqn':
+      …
+      rewrites => [
+        {
+          comment      => 'Lynx or Mozilla v1/2',
+          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+          rewrite_rule => ['^index\.html$ welcome.html'],
+        },
+        {
+          comment      => 'Internet Explorer',
+          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+          rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+        },
+        }
+          rewrite_base => /apps/,
+          rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
+        },
+     ], 
+    }
+```
 
-#####`directoryindex`
+Refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions.
 
-Set a DirectoryIndex directive, to set the list of resources to look for, when the client requests an index of the directory by specifying a / at the end of the directory name..
+#####`scriptalias`
 
-#####`docroot`
+Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for example: '/usr/scripts'. Defaults to 'undef'.
 
-Provides the DocumentRoot directive, identifying the directory Apache serves files from.
+#####`scriptaliases`
 
-#####`docroot_group`
+Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
 
-Sets group access to the docroot directory. Defaults to 'root'.
+```puppet
+    scriptaliases => [
+      {
+        alias => '/myscript',
+        path  => '/usr/share/myscript',
+      },
+      {
+        aliasmatch => '^/foo(.*)',
+        path       => '/usr/share/fooscripts$1',
+      },
+      {
+        aliasmatch => '^/bar/(.*)',
+        path       => '/usr/share/bar/wrapper.sh/$1',
+      },
+      {
+        alias => '/neatscript',
+        path  => '/usr/share/neatscript',
+      },
+    ]
+```
 
-#####`docroot_owner`
+The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, more specific aliases should come before more general ones to avoid shadowing.
 
-Sets individual user access to the docroot directory. Defaults to 'root'.
+#####`serveradmin`
 
-#####`error_log`
+Specifies the email address Apache will display when it renders one of its error pages. Defaults to 'undef'.
 
-Specifies whether `*_error.log` directives should be configured. Defaults to 'true'.
+#####`serveraliases`
 
-#####`error_log_file`
+Sets the [ServerAliases](http://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site. Defaults to '[]'.
 
-Points to the `*_error.log` file. Defaults to 'undef'.
+#####`servername`
 
-#####`error_log_pipe`
+Sets the servername corresponding to the hostname you connect to the virtual host at. Defaults to the title of the resource.
 
-Specifies a pipe to send error log messages to. Defaults to 'undef'.
+#####`setenv`
 
-#####`error_log_syslog`
+Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
 
-Sends all error log messages to syslog. Defaults to 'undef'.
+#####`setenvif`
 
-#####`error_documents`
+Used by HTTPD to conditionally set environment variables for vhosts. Defaults to '[]'.
+
+#####`suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
+
+Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG). 
+
+`suphp_addhandler` defaults to 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian.
 
-A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/2.2/mod/core.html#errordocument) settings for this vhost. Defaults to `[]`. Example:
+`suphp_configpath` defaults to 'undef' on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian.
+
+`suphp_engine` allows values 'on' or 'off'. Defaults to 'off'
+
+To set up a virtual host with suPHP
 
 ```puppet
-    apache::vhost { 'sample.example.net':
-      error_documents => [
-        { 'error_code' => '503', 'document' => '/service-unavail' },
-        { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
-      ],
+    apache::vhost { 'suphp.example.com':
+      port                => '80',
+      docroot             => '/home/appuser/myphpapp',
+      suphp_addhandler    => 'x-httpd-php',
+      suphp_engine        => 'on',
+      suphp_configpath    => '/etc/php5/apache2',
+      directories         => { path => '/home/appuser/myphpapp',
+        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
+      }
     }
 ```
 
-#####`ensure`
+#####`vhost_name`
 
-Specifies if the vhost file is present or absent.
+Enables name-based virtual hosting. If no IP is passed to the virtual host but the vhost is assigned a port, then the vhost name will be 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name will be set to the title of the resource. Defaults to '*'.
 
-#####`fastcgi_server`
+#####`virtual_docroot` 
 
-Specifies the filename as an external FastCGI application. Defaults to 'undef'.
+Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'. 
 
-#####`fastcgi_socket`
+```puppet
+    apache::vhost { 'subdomain.loc':
+      vhost_name       => '*',
+      port             => '80',
+      virtual_docroot' => '/var/www/%-2+',
+      docroot          => '/var/www',
+      serveraliases    => ['*.loc',],
+    }
+```
 
-Filename used to communicate with the web server.  Defaults to 'undef'.
+#####`wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, & `wsgi_script_aliases`
 
-#####`fastcgi_dir`
+Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 
-Directory to enable for FastCGI.  Defaults to 'undef'.
+`wsgi_daemon_process` sets the name of the WSGI daemon. It is a hash, accepting [these keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html), and it defaults to 'undef'.
 
-#####`additional_includes`
+`wsgi_daemon_process_options` is optional and defaults to 'undef'.
 
-Specifies paths to additional static vhost-specific Apache configuration files.
-This option is useful when you need to implement a unique and/or custom
-configuration not supported by this module.
+`wsgi_process_group` sets the group ID the virtual host will run under. Defaults to 'undef'.
 
-#####`headers`
+`wsgi_script_aliases` requires a hash of web paths to filesystem .wsgi paths. Defaults to 'undef'.
 
-Specifies additional response headers as per [the `mod_headers` documentation](http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header).
+To set up a virtual host with WSGI
 
 ```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      headers => [
-        'add Strict-Transport-Security "max-age=15768000"',
-        'merge Cache-Control no-cache env=CGI',
+    apache::vhost { 'wsgi.example.com':
+      port                        => '80',
+      docroot                     => '/var/www/pythonapp',
+      wsgi_daemon_process         => 'wsgi',
+      wsgi_daemon_process_options =>
+        { processes    => '2', 
+          threads      => '15', 
+          display-name => '%{GROUP}',
+         },
+      wsgi_process_group          => 'wsgi',
+      wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+    }
+```
+
+####Parameter `directories` for `apache::vhost`
+
+The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
+
+Each hash passed to `directories` must contain `path` as one of the keys.  You may also pass in `provider` which, if missing, defaults to 'directory'. (A full list of acceptable keys is below.) General usage will look something like
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path => '/path/to/directory', <key> => <value> },
+        { path => '/path/to/another/directory', <key> => <value> },
       ],
     }
 ```
 
-#####`ip`
+*Note:* At least one directory should match the `docroot` parameter. Once you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block will be created that matches the `docroot` parameter.
 
-The IP address the vhost listens on. Defaults to 'undef'.
+The `provider` key can be set to 'directory', 'files', or 'location'. If the path starts with a [~](https://httpd.apache.org/docs/current/mod/core.html#files), HTTPD will interpret this as the equivalent of DirectoryMatch, FilesMatch, or LocationMatch.
 
-#####`ip_based`
+```puppet
+    apache::vhost { 'files.example.net':
+      docroot     => '/var/www/files',
+      directories => [
+        { 'path'     => '/var/www/files', 
+          'provider' => 'files', 
+          'deny'     => 'from all' 
+         },
+      ],
+    }
+```
 
-Enables an IP-based vhost. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based vhosts. Defaults to 'false'.
+Available handlers, represented as keys, should be placed within the  `directory`,`'files`, or `location` hashes.  This looks like
 
-#####`logroot`
+```puppet
+  apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ { path => '/path/to/directory', handler => value } ],
+}
+```
 
-Specifies the location of the virtual host's logfiles. Defaults to `/var/log/<apache log location>/`.
+Any handlers you do not set in these hashes will be considered 'undefined' within Puppet and will not be added to the virtual host, resulting in the module using their default values. Currently this is the list of supported handlers:
 
-#####`log_level`
+######`addhandlers`
 
-Specifies the verbosity level of the error log. Defaults to `warn` for the global server configuration and can be overridden on a per-vhost basis using this parameter. Valid value for `log_level` is one of `emerg`, `alert`, `crit`, `error`, `warn`, `notice`, `info` or `debug`.
+Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`. 
 
-#####`no_proxy_uris`
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path        => '/path/to/directory',
+          addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
+        }, 
+      ],
+    }
+```
+
+######`allow`
 
-Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with `proxy_dest`.
+Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. 
 
-#####`options`
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path  => '/path/to/directory', 
+          allow => 'from example.org', 
+        }, 
+      ],
+    }
+```
 
-Lists the options for the given virtual host
+######`allow_override`
+
+Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
 
 ```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      options => ['Indexes','FollowSymLinks','MultiViews'],
+    apache::vhost { 'sample.example.net':
+      docroot      => '/path/to/directory',
+      directories  => [ 
+        { path           => '/path/to/directory', 
+          allow_override => ['AuthConfig', 'Indexes'], 
+        }, 
+      ],
     }
 ```
 
-#####`override`
+######`auth_basic_authoritative`
 
-Sets the overrides for the given virtual host. Accepts an array of AllowOverride arguments.
+Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative), which determines whether authorization and authentication are passed to lower level Apache modules.
 
-#####`port`
+######`auth_basic_fake`
 
-Sets the port the host is configured on.
+Sets the value for [AuthBasicFake](httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
 
-#####`priority`
+######`auth_basic_provider`
 
-Sets the relative load-order for Apache httpd VirtualHost configuration files. Defaults to '25'.
+Sets the value for [AuthBasicProvider] (httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
 
-If nothing matches the priority, the first name-based vhost will be used. Likewise, passing a higher priority will cause the alphabetically first name-based vhost to be used if no other names match.
+######`auth_digest_algorithm`
 
-*Note*: You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
+Sets the value for [AuthDigestAlgorithm](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
 
-#####`proxy_dest`
+######`auth_digest_domain`
 
-Specifies the destination address of a proxypass configuration. Defaults to 'undef'.
+Sets the value for [AuthDigestDomain](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
 
-#####`proxy_pass`
+######`auth_digest_nonce_lifetime`
 
-Specifies an array of path => uri for a proxypass configuration. Defaults to 'undef'.
+Sets the value for [AuthDigestNonceLifetime](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
 
-Example:
+######`auth_digest_provider`
 
-```puppet
-$proxy_pass = [
-  { 'path' => '/a', 'url' => 'http://backend-a/' },
-  { 'path' => '/b', 'url' => 'http://backend-b/' },
-  { 'path' => '/c', 'url' => 'http://backend-a/c' }
-]
+Sets the value for [AuthDigestProvider](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
 
-apache::vhost { 'site.name.fdqn':
-  …
-  proxy_pass       => $proxy_pass,
-}
-```
+######`auth_digest_qop`
 
-#####`rack_base_uris`
+Sets the value for [AuthDigestQop](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
 
-Specifies the resource identifiers for a rack configuration. The file paths specified will be listed as rack application roots for passenger/rack in the `_rack.erb` template. Defaults to 'undef'.
+######`auth_digest_shmem_size`
 
-#####`redirect_dest`
+Sets the value for [AuthAuthDigestShmemSize](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
 
-Specifies the address to redirect to. Defaults to 'undef'.
+######`auth_group_file`
 
-#####`redirect_source`
+Sets the value for [AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile), which sets the name of the text file containing the list of user groups for authorization.
 
-Specifies the source items? that will redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent.
+######`auth_name`
 
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_source => ['/images','/downloads'],
-      redirect_dest => ['http://img.example.com/','http://downloads.example.com/'],
-    }
-```
+Sets the value for [AuthName](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm.
 
-#####`redirect_status`
+######`auth_require`
 
-Specifies the status to append to the redirect. Defaults to 'undef'.
+Sets the entity name you're requiring to allow access. Read more about [Require](http://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives).
 
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_status => ['temp','permanent'],
-    }
+######`auth_type`
+
+Sets the value for [AuthType](httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
+
+######`auth_user_file`
+
+Sets the value for [AuthUserFile](httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
+
+######`custom_fragment`
+
+Pass a string of custom configuration directives to be placed at the end of the directory configuration.
+
+```puppet
+  apache::vhost { 'monitor':
+    … 
+    custom_fragment => '
+  <Location /balancer-manager>
+    SetHandler balancer-manager
+    Order allow,deny
+    Allow from all
+  </Location>
+  <Location /server-status>
+    SetHandler server-status
+    Order allow,deny
+    Allow from all
+  </Location>
+  ProxyStatus On',
+}
 ```
 
-#####`request_headers`
+######`deny`
 
-Specifies additional request headers.
+Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. 
 
 ```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      request_headers => [
-        'append MirrorID "mirror 12"',
-        'unset MirrorID',
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path => '/path/to/directory', 
+          deny => 'from example.org', 
+        }, 
       ],
     }
 ```
 
-#####`rewrite_base`
+######`error_documents`
 
-Limits the `rewrites` to the specified base URL. Defaults to 'undef'.
+An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory. 
 
 ```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrite_base => '/blog/',
-      rewrites => [
-        { rewrite_rule => ['^index\.html$ welcome.html'] }
-      ]
+    apache::vhost { 'sample.example.net':
+      directories => [ 
+        { path            => '/srv/www',
+          error_documents => [
+            { 'error_code' => '503', 
+              'document'   => '/service-unavail',
+            },
+          ],
+        },
+      ],
     }
 ```
 
-The above example would limit the index.html -> welcome.html rewrite to only something inside of http://example.com/blog/.
-
-#####`rewrites`
+######`headers`
 
-Creates URL rewrite rules. Defaults to 'undef'. This parameter allows you to specify, for example, that anyone trying to access index.html will be served welcome.html.
+Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 
 ```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => {
+        path    => '/path/to/directory',
+        headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+      },
     }
 ```
 
-Allows rewrite conditions, that when true, will execute the associated rule. For example
+######`index_options`
+
+Allows configuration settings for [directory indexing](httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
 
 ```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment       => 'redirect IE',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        }
-      ]
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path          => '/path/to/directory', 
+          options       => ['Indexes','FollowSymLinks','MultiViews'], 
+          index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
+        },
+      ],
     }
 ```
 
-will rewrite URLs only if the visitor is using IE.
+######`index_order_default`
 
-Multiple conditions can be applied, the following will rewrite index.html to welcome.html only when the browser is lynx or mozilla version 1 or 2
+Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
 
 ```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment       => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        }
-      ]
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path                => '/path/to/directory', 
+          order               => 'Allow,Deny', 
+          index_order_default => ['Descending', 'Date'],
+        }, 
+      ],
     }
 ```
 
-Multiple rewrites and conditions are also possible
+######`options`
+
+Lists the [Options](httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
 
 ```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment       => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-        {
-          comment       => 'Internet Explorer',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path    => '/path/to/directory', 
+          options => ['Indexes','FollowSymLinks','MultiViews'], 
         },
-        }
-          rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
-        }
-     ] 
+      ],
     }
 ```
 
-refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions
+######`order`
 
-#####`scriptalias`
+Sets the order of processing Allow and Deny statements as per [Apache core documentation](httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower.
 
-Defines a directory of CGI scripts to be aliased to the path '/cgi-bin'
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path  => '/path/to/directory', 
+          order => 'Allow,Deny', 
+        },
+      ],
+    }
+```
 
-#####`scriptaliases`
+######`passenger_enabled`
 
-Passes a list of hashes to the vhost to create `ScriptAlias` or `ScriptAliasMatch` statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). Each hash is expected to be of the form:
+Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
 
 ```puppet
-    scriptaliases => [
-      {
-        alias => '/myscript',
-        path  => '/usr/share/myscript',
-      },
-      {
-        aliasmatch => '^/foo(.*)',
-        path       => '/usr/share/fooscripts$1',
-      },
-      {
-        aliasmatch => '^/bar/(.*)',
-        path       => '/usr/share/bar/wrapper.sh/$1',
-      },
-      {
-        alias => '/neatscript',
-        path  => '/usr/share/neatscript',
-      },
-    ]
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path              => '/path/to/directory', 
+          passenger_enabled => 'on',
+        }, 
+      ],
+    }
 ```
 
-These directives are created in the order specified. As with `Alias` and `AliasMatch` directives the more specific aliases should come before the more general ones to avoid shadowing.
+*Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
-#####`serveradmin`
+######`php_admin_value` and `php_admin_flag`
 
-Specifies the email address Apache will display when it renders one of its error pages.
+`php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
 
-#####`serveraliases`
+######`ssl_options`
 
-Sets the server aliases of the site.
+String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
 
-#####`servername`
+```puppet
+    apache::vhost { 'secure.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path        => '/path/to/directory', 
+          ssl_options => '+ExportCertData', 
+        },
+        { path        => '/path/to/different/dir', 
+          ssl_options => [ '-StdEnvVars', '+ExportCertData'],
+        },
+      ],
+    }
+```
 
-Sets the primary name of the virtual host.
+######`suphp`
 
-#####`setenv`
+A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and may only be passed within `directories`.
 
-Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
+```puppet
+    apache::vhost { 'secure.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path  => '/path/to/directory', 
+          suphp => 
+            { user  =>  'myappuser', 
+              group => 'myappgroup', 
+            },
+        },
+      ],
+    }
+```
 
-#####`setenvif`
+####SSL parameters for `apache::vhost`
 
-Used by HTTPD to conditionally set environment variables for vhosts. Defaults to '[]'.
+All of the SSL parameters for `::vhost` will default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
 
 #####`ssl`
 
-Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'.
+Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'. 
 
 #####`ssl_ca`
 
-Specifies the certificate authority.
+Specifies the SSL certificate authority. Defaults to 'undef'.
 
 #####`ssl_cert`
 
-Specifies the SSL certification.
+Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD.
 
 #####`ssl_protocol`
 
-Specifies the SSL Protocol (SSLProtocol).
+Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'. 
+
+If you do not use this parameter, it will use the HTTPD default from ssl.conf.erb, 'all -SSLv2'.
 
 #####`ssl_cipher`
 
-Specifies the SSLCipherSuite.
+Specifies [SSLCipherSuite](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Defaults to 'undef'.
+
+If you do not use this parameter, it will use the HTTPD default from ssl.conf.erb, 'HIGH:MEDIUM:!aNULL:!MD5'.
 
 #####`ssl_honorcipherorder`
 
-Sets SSLHonorCipherOrder directive, used to prefer the server's cipher preference order
+Sets [SSLHonorCipherOrder](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), which is used to prefer the server's cipher preference order. Defaults to 'On' in the base `apache` config.
 
 #####`ssl_certs_dir`
 
-Specifies the location of the SSL certification directory. Defaults to `/etc/ssl/certs` on Debian and `/etc/pki/tls/certs` on RedHat.
+Specifies the location of the SSL certification directory. Defaults to '/etc/ssl/certs' on Debian, '/etc/pki/tls/certs' on RedHat, and '/usr/local/etc/apache22' on FreeBSD.
 
 #####`ssl_chain`
 
-Specifies the SSL chain.
+Specifies the SSL chain. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_crl`
 
-Specifies the certificate revocation list to use.
+Specifies the certificate revocation list to use. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_crl_path`
 
-Specifies the location of the certificate revocation list.
+Specifies the location of the certificate revocation list. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_key`
 
-Specifies the SSL key.
+Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_verify_client`
 
-Sets `SSLVerifyClient` directives as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/mod_ssl.html#sslverifyclient). Defaults to undef.
-An example:
+Sets the [SSLVerifyClient](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid values are: 'none', 'optional', 'require', and 'optional_no_ca'. Defaults to 'undef'.
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1194,8 +1378,7 @@ An example:
 
 #####`ssl_verify_depth`
 
-Sets `SSLVerifyDepth` directives as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/mod_ssl.html#sslverifydepth). Defaults to undef.
-An example:
+Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Defaults to 'undef'.
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1206,7 +1389,9 @@ An example:
 
 #####`ssl_options`
 
-Sets `SSLOptions` directives as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/mod_ssl.html#ssloptions). This is the global setting for the vhost and can be a string or an array. Defaults to undef. A single string example:
+Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'. 
+
+A string:
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1215,7 +1400,7 @@ Sets `SSLOptions` directives as per the [Apache Core documentation](http://httpd
     }
 ```
 
-An array of strings example:
+An array:
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1226,40 +1411,12 @@ An array of strings example:
 
 #####`ssl_proxyengine`
 
-Specifies whether to use `SSLProxyEngine` or not. Defaults to `false`.
-
-#####`vhost_name`
-
-This parameter is for use with name-based virtual hosting. Defaults to '*'.
-
-#####`itk`
-
-Hash containing infos to configure itk as per the [ITK documentation](http://mpm-itk.sesse.net/).
+Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid values are 'true' and 'false'. Defaults to 'false'.
 
-Keys could be:
-* user + group
-* assignuseridexpr
-* assigngroupidexpr
-* maxclientvhost
-* nice
-* limituidrange (Linux 3.5.0 or newer)
-* limitgidrange (Linux 3.5.0 or newer)
-
-Usage will typically look like:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      itk => {
-        user  => 'someuser',
-        group => 'somegroup',
-      },
-    }
-```
 
 ###Virtual Host Examples
 
-The Apache module allows you to set up pretty much any configuration of virtual host you might desire. This section will address some common configurations. Please see the [Tests section](https://github.com/puppetlabs/puppetlabs-apache/tree/master/tests) for even more examples.
+The apache module allows you to set up pretty much any configuration of virtual host you might need. This section will address some common configurations, but look at the [Tests section](https://github.com/puppetlabs/puppetlabs-apache/tree/master/tests) for even more examples.
 
 Configure a vhost with a server administrator
 
@@ -1427,48 +1584,67 @@ If you want to add two name-based vhosts so that they will answer on either 10.0
     }
 ```
 
-##Implementation
+###Load Balancing
 
-###Classes and Defined Types
+####Defined Type: `apache::balancer`
 
-####Class: `apache::dev`
+`apache::balancer` creates an Apache balancer cluster. Each balancer cluster needs one or more balancer members, which are declared with [`apache::balancermember`](#defined-type-apachebalancermember). 
 
-Installs Apache development libraries
+One `apache::balancer` defined resource should be defined for each Apache load balanced set of servers. The `apache::balancermember` resources for all balancer members can be exported and collected on a single Apache load balancer server using exported resources.
 
-```puppet
-    class { 'apache::dev': }
-```
+**Parameters within `apache::balancer`:**
 
-On FreeBSD you're required to define `apache::package` or `apache` class before `apache::dev`.
+#####`name`
 
-####Defined Type: `apache::listen`
+Sets the balancer cluster's title. This parameter will also set the title of the conf.d file.
 
-Controls which ports Apache binds to for listening based on the title:
+#####`proxy_set`
 
-```puppet
-    apache::listen { '80': }
-    apache::listen { '443': }
-```
+Configures key-value pairs as [ProxySet](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) lines. Accepts a hash, and defaults to '{}'.
 
-Declaring this defined type will add all `Listen` directives to the `ports.conf` file in the Apache httpd configuration directory.  `apache::listen` titles should always take the form of: `<port>`, `<ipv4>:<port>`, or `[<ipv6>]:<port>`
+#####`collect_exported`
 
-Apache httpd requires that `Listen` directives must be added for every port. The `apache::vhost` defined type will automatically add `Listen` directives unless the `apache::vhost` is passed `add_listen => false`.
+Determines whether or not to use exported resources. Valid values 'true' and 'false', defaults to 'true'. 
 
-####Defined Type: `apache::namevirtualhost`
+If you statically declare all of your backend servers, you should set this to 'false' to rely on existing declared balancer member resources. Also make sure to use `apache::balancermember` with array arguments.
 
-Enables named-based hosting of a virtual host
+If you wish to dynamically declare your backend servers via [exported resources](http://docs.puppetlabs.com/guides/exported_resources.html) collected on a central node, you must set this parameter to 'true' in order to collect the exported balancer member resources that were exported by the balancer member nodes.
 
+<<<<<<< HEAD
 ```puppet
     apache::namevirtualhost { '*:80': }
 ```
 
 Declaring this defined type will add all `NameVirtualHost` directives to the `ports.conf` file in the Apache https configuration directory. `apache::namevirtualhost` titles should always take the form of: `*`, `*:<port>`, `_default_:<port>`, `<ip>`, or `<ip>:<port>`.
+=======
+If you choose not to use exported resources, all balancer members will be configured in a single puppet run. If you are using exported resources, Puppet has to run on the balanced nodes, then run on the balancer.
+>>>>>>> Updates README
 
 ####Defined Type: `apache::balancermember`
 
-Define members of a proxy_balancer set (mod_proxy_balancer). Very useful when using exported resources.
+Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html), which will set up a balancer member inside a listening service configuration block in etc/apache/apache.cfg on the load balancer.
+
+**Parameters within `apache::balancermember`:**
+
+#####`name`
+
+Sets the title of the resource. This name will also set the name of the concat fragment.
 
-On every app server you can export a balancermember like this:
+#####`balancer_cluster`
+
+Sets the Apache service's instance name. This must match the name of a declared `apache::balancer` resource. Required.
+
+#####`url`
+
+Specifies the URL used to contact the balancer member server. Defaults to 'http://${::fqdn}/'.
+
+#####`options`
+
+An array of [options](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#balancermember) to be specified after the URL. Accepts any key-value pairs available to [ProxyPass](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass).
+
+####Examples
+
+To load balance with exported resources, export the `balancermember` from the balancer member
 
 ```puppet
       @@apache::balancermember { "${::fqdn}-puppet00":
@@ -1478,13 +1654,26 @@ On every app server you can export a balancermember like this:
       }
 ```
 
-And on the proxy itself you create the balancer cluster using the defined type apache::balancer:
+Then, on the proxy server, create the balancer cluster
 
 ```puppet
       apache::balancer { 'puppet00': }
 ```
 
-If you need to use ProxySet in the balncer config you can do as so:
+To load balance without exported resources, declare the following on the proxy
+
+```puppet
+    apache::balancer { 'puppet00': }
+    apache::balancermember { "${::fqdn}-puppet00":
+        balancer_cluster => 'puppet00',
+        url              => "ajp://${::fqdn}:8009"
+        options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
+      }
+```
+
+Then declare `apache::balancer` and `apache::balancermember` on the proxy server.
+
+If you need to use ProxySet in the balancer config
 
 ```puppet
       apache::balancer { 'puppet01':
@@ -1492,17 +1681,54 @@ If you need to use ProxySet in the balncer config you can do as so:
       }
 ```
 
+##Reference
+
+###Classes
+
+####Public Classes
+
+* [`apache`](#class-apache): Guides the basic setup of Apache.
+* `apache::dev`: Installs Apache development libraries. (*Note:* On FreeBSD, you must declare `apache::package` or `apache` before `apache::dev`.)
+* [`apache::mod::[name]`](#classes-apachemodname): Enables specific Apache HTTPD modules.
+ 
+####Private Classes
+
+* `apache::confd::no_accf`: Creates the no-accf.conf configuration file in conf.d, required by FreeBSD's Apache 2.4.
+* `apache::default_confd_files`: Includes conf.d files for FreeBSD.
+* `apache::default_mods`: Installs the Apache modules required to run the default configuration.
+* `apache::package`: Installs and configures basic Apache packages.
+* `apache::params`: Manages Apache parameters.
+* `apache::service`: Manages the Apache daemon.
+
+###Defined Types
+
+####Public Defined Types
+
+* `apache::balancer`: Creates an Apache balancer cluster.
+* `apache::balancermember`: Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html).
+* `apache::listen`: Based on the title, controls which ports Apache binds to for listening. Adds [Listen](http://httpd.apache.org/docs/current/bind.html) directives to ports.conf in the Apache HTTPD configuration directory. Titles take the form '<port>', '<ipv4>:<port>', or '<ipv6>:<port>'.
+* `apache::mod`: Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class.
+* `apache::namevirtualhost`: Enables name-based hosting of a virtual host. Adds all [NameVirtualHost](http://httpd.apache.org/docs/current/vhosts/name-based.html) directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles take the form '\*', '*:<port>', '\_default_:<port>, '<ip>', or '<ip>:<port>'.
+* `apache::vhost`: Allows specialized configurations for virtual hosts that have requirements outside the defaults. 
+
+####Private Defined Types
+
+* `apache::peruser::multiplexer`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
+* `apache::peruser::processor`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
+
 ###Templates
 
 The Apache module relies heavily on templates to enable the `vhost` and `apache::mod` defined types. These templates are built based on Facter facts around your operating system. Unless explicitly called out, most templates are not meant for configuration.
 
 ##Limitations
 
-This has been tested on Ubuntu Precise, Debian Wheezy, CentOS 5.8, and FreeBSD 9.1.
+This module is CI tested on Centos 5 & 6, Ubuntu 12.04, Debian 7, and RHEL 5 & 6 platforms against both the OSS and Enterprise version of Puppet. 
+
+The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions may occur.
 
 ##Development
 
-### Overview
+###Contributing
 
 Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
 
@@ -1510,9 +1736,9 @@ We want to keep it as easy as possible to contribute changes so that our modules
 
 You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
 
-### Running tests
+###Running tests
 
-This project contains tests for both [rspec-puppet](http://rspec-puppet.com/) and [rspec-system](https://github.com/puppetlabs/rspec-system) to verify functionality. For in-depth information please see their respective documentation.
+This project contains tests for both [rspec-puppet](http://rspec-puppet.com/) and [beaker-rspec](https://github.com/puppetlabs/beaker-rspec) to verify functionality. For in-depth information please see their respective documentation.
 
 Quickstart:
 
@@ -1520,6 +1746,7 @@ Quickstart:
     bundle install
     bundle exec rake spec
     bundle exec rspec spec/acceptance
+<<<<<<< HEAD
 
 ##Copyright and License
 
@@ -1538,3 +1765,6 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
+=======
+    RS_DEBUG=yes bundle exec rspec spec/acceptance 
+>>>>>>> Updates README

From 2712be8569628773b916eae6746e730263282c85 Mon Sep 17 00:00:00 2001
From: Lauren Rother <lauren.rother@puppetlabs.com>
Date: Tue, 18 Feb 2014 16:30:33 -0800
Subject: [PATCH 0153/2267] Final edits to fix merge conflicts

---
 README.md | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/README.md b/README.md
index c960814f5c..2644c88f7d 100644
--- a/README.md
+++ b/README.md
@@ -1610,15 +1610,7 @@ If you statically declare all of your backend servers, you should set this to 'f
 
 If you wish to dynamically declare your backend servers via [exported resources](http://docs.puppetlabs.com/guides/exported_resources.html) collected on a central node, you must set this parameter to 'true' in order to collect the exported balancer member resources that were exported by the balancer member nodes.
 
-<<<<<<< HEAD
-```puppet
-    apache::namevirtualhost { '*:80': }
-```
-
-Declaring this defined type will add all `NameVirtualHost` directives to the `ports.conf` file in the Apache https configuration directory. `apache::namevirtualhost` titles should always take the form of: `*`, `*:<port>`, `_default_:<port>`, `<ip>`, or `<ip>:<port>`.
-=======
 If you choose not to use exported resources, all balancer members will be configured in a single puppet run. If you are using exported resources, Puppet has to run on the balanced nodes, then run on the balancer.
->>>>>>> Updates README
 
 ####Defined Type: `apache::balancermember`
 
@@ -1746,25 +1738,4 @@ Quickstart:
     bundle install
     bundle exec rake spec
     bundle exec rspec spec/acceptance
-<<<<<<< HEAD
-
-##Copyright and License
-
-Copyright (C) 2012 [Puppet Labs](https://www.puppetlabs.com/) Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-=======
-    RS_DEBUG=yes bundle exec rspec spec/acceptance 
->>>>>>> Updates README
+    RS_DEBUG=yes bundle exec rspec spec/acceptance
\ No newline at end of file

From 109c25f82ab7bd8bab7d932e5d6bafe6da6d0c78 Mon Sep 17 00:00:00 2001
From: Lauren Rother <lauren.rother@puppetlabs.com>
Date: Tue, 18 Feb 2014 16:32:20 -0800
Subject: [PATCH 0154/2267] Fix replace/replacements

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2644c88f7d..21b7719327 100644
--- a/README.md
+++ b/README.md
@@ -185,7 +185,7 @@ To set up a virtual host with WSGI
     }
 ```
 
-Starting in Apache 2.2.16, httpd supports [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource), a simple replace for common RewriteRules.
+Starting in Apache 2.2.16, HTTPD supports [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource), a simple replacement for common RewriteRules.
 
 ```puppet
     apache::vhost { 'wordpress.example.com':

From eb0218ba4d22213acdd6cac76cf873c3c0b06d83 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Wed, 19 Feb 2014 10:58:45 -0500
Subject: [PATCH 0155/2267] Change test location to be under /tmp/.

---
 spec/acceptance/class_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 62107ed61b..b28121be6a 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -38,16 +38,16 @@ class { 'apache': }
     # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
-      file { '/apache': ensure => directory, }
+      file { '/tmp/apache_custom': ensure => directory, }
       class { 'apache':
-        mod_dir   => '/apache/mods',
-        vhost_dir => '/apache/vhosts',
+        mod_dir   => '/tmp/apache_custom/mods',
+        vhost_dir => '/tmp/apache_custom/vhosts',
       }
       EOS
 
       # Run it twice and test for idempotency
       apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe service(service_name) do

From 964884e2350b06f25dcfca38016098ab7aa21e24 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 18 Feb 2014 15:04:24 -0800
Subject: [PATCH 0156/2267] Add rewrite_base functionality to rewrites

Previously rewrite_base was a parameter to vhost, but was removed
incorrectly. When rewrites was created to replace rewrite_* parameters,
rewrite_base was forgotten. This adds back the deprecated rewrite_base
parameter and adds the rewrite_base support to the rewrites parameter.
---
 manifests/vhost.pp           |  4 ++++
 spec/defines/vhost_spec.rb   |  6 +++++-
 templates/vhost/_rewrite.erb | 37 +++++++++++++++++++-----------------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 22beec2e82..77c340ace9 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -153,6 +153,7 @@
     $headers                     = undef,
     $request_headers             = undef,
     $rewrites                    = undef,
+    $rewrite_base                = undef,
     $rewrite_rule                = undef,
     $rewrite_cond                = undef,
     $setenv                      = [],
@@ -199,6 +200,9 @@
   }
 
   # Deprecated backwards-compatibility
+  if $rewrite_base {
+    warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')
+  }
   if $rewrite_rule {
     warning('Apache::Vhost: parameter rewrite_rule is deprecated in favor of rewrites')
   }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 2cd2bb29d7..c166c9315f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1138,7 +1138,8 @@
         let :params do default_params.merge({
           :rewrites => [
             {
-              'comment'       => 'test rewrites',
+              'comment'      => 'test rewrites',
+              'rewrite_base' => '/mytestpath/',
               'rewrite_cond' => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
               'rewrite_rule' => ['^index\.html$ welcome.html', '^index\.cgi$ index.php'],
             }
@@ -1151,6 +1152,9 @@
           should contain_file("25-#{title}.conf").with_content(
             /^  RewriteCond %\{HTTP_USER_AGENT\} \^Lynx\/ \[OR\]$/
           )
+          should contain_file("25-#{title}.conf").with_content(
+            /^  RewriteBase \/mytestpath\/$/
+          )
           should contain_file("25-#{title}.conf").with_content(
             /^  RewriteCond %\{HTTP_USER_AGENT\} \^Mozilla\/\[12\]$/
           )
diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index dbb437c1d6..af8b45001e 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -1,28 +1,31 @@
-<% if @rewrites -%>
+<%- if @rewrites -%>
   ## Rewrite rules
   RewriteEngine On
-<% if @rewrite_base -%>
+  <%- if @rewrite_base -%>
   RewriteBase <%= @rewrite_base %>
-<% end -%>
+  <%- end -%>
 
-<% [@rewrites].flatten.compact.each do |rewrite_details| -%>
-<% if rewrite_details['comment'] -%>
+  <%- [@rewrites].flatten.compact.each do |rewrite_details| -%>
+    <%- if rewrite_details['comment'] -%>
   #<%= rewrite_details['comment'] %>
-<% end -%>
-<% if rewrite_details['rewrite_cond'] -%>
-<%- Array(rewrite_details['rewrite_cond']).each do |commands| -%>
-<%- Array(commands).each do |command| -%>
+    <%- end -%>
+    <%- if rewrite_details['rewrite_base'] -%>
+  RewriteBase <%= rewrite_details['rewrite_base'] %>
+    <%- end -%>
+    <%- if rewrite_details['rewrite_cond'] -%>
+      <%- Array(rewrite_details['rewrite_cond']).each do |commands| -%>
+        <%- Array(commands).each do |command| -%>
   RewriteCond <%= command %>
-<%- end -%>
-<% end -%>
-<% end -%>
-<%- Array(rewrite_details['rewrite_rule']).each do |commands| -%>
-<%- Array(commands).each do |command| -%>
+        <%- end -%>
+      <%- end -%>
+    <%- end -%>
+    <%- Array(rewrite_details['rewrite_rule']).each do |commands| -%>
+      <%- Array(commands).each do |command| -%>
   RewriteRule <%= command %>
-<%- end -%>
+      <%- end -%>
 
-<% end -%>
-<% end -%>
+    <%- end -%>
+  <%- end -%>
 <%- end -%>
 <%# reverse compatibility %>
 <% if @rewrite_rule and !@rewrites -%>

From b1668d8598e57e5f10085da872193b843c39cfc4 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 20 Feb 2014 11:58:04 -0800
Subject: [PATCH 0157/2267] Document apache::apache_version

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 21b7719327..fd21507cdc 100644
--- a/README.md
+++ b/README.md
@@ -215,6 +215,10 @@ You may establish a default vhost in this class, the `vhost` class, or both. You
 
 **Parameters within `apache`:**
 
+#####`apache_version`
+
+Configures the behavior of the module templates, package names, and default mods by setting the Apache version. Default is determined by the class `apache::version` using the OS family and release. It should not be configured manually without special reason.
+
 #####`confd_dir`
 
 Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
@@ -1738,4 +1742,4 @@ Quickstart:
     bundle install
     bundle exec rake spec
     bundle exec rspec spec/acceptance
-    RS_DEBUG=yes bundle exec rspec spec/acceptance
\ No newline at end of file
+    RS_DEBUG=yes bundle exec rspec spec/acceptance

From f73b4d40cc09e9a54578acbb7d5791c0a6ed5197 Mon Sep 17 00:00:00 2001
From: jonoterc <jon_obuchowski@terc.edu>
Date: Tue, 4 Feb 2014 00:24:10 -0500
Subject: [PATCH 0158/2267] enable overriding mod-level parameters for
 apache::mod::passenger

apache::mod::passenger didn't accept/pass (optional) mod parameters
through to apache::mod, so only auto-generated module parameters were
used.  Without this option apache::mod::passenger could not be used in
conjunction with passenger modules beyond those generated by OS package
system (in particular, modules compiled via
passenger-install-apache2-module, which use differing paths).  This
commit enables passing in all parameters used with "apache::mod",
documented in the passenger README

includes basic spec/acceptance tests; verifying a default installation
as well as passing in module loading parameters.

new tests revealed undocumented Redhat dependencies on a passenger-
specific repository as well as the EPEL repository; as a first step
these dependencies are being manually resolved during setup for the
acceptance testing suite.
---
 README.passenger.md                | 62 +++++++++++++++++++++++++-----
 manifests/mod/passenger.pp         | 37 ++++++++++++++----
 manifests/params.pp                |  4 +-
 spec/classes/mod/passenger_spec.rb | 31 ++++++++++++++-
 spec/spec_helper_acceptance.rb     | 23 +++++++++++
 5 files changed, 136 insertions(+), 21 deletions(-)

diff --git a/README.passenger.md b/README.passenger.md
index cecacccc4f..1cc21202b8 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -2,7 +2,9 @@
 
 Just enabling the Passenger module is insufficient for the use of Passenger in production. Passenger should be tunable to better fit the environment in which it is run while being aware of the resources it required.
 
-To this end the Apache passenger module has been modified to apply system wide Passenger tuning declarations to `passenger.conf`. Declarations specific to a virtual host should be passed through when defining a `vhost` (e.g. `rack_base_uris' parameter on the `apache::vhost` class, check `README.md`).
+To this end the Apache passenger module has been modified to apply system wide Passenger tuning declarations to `passenger.conf`. Declarations specific to a virtual host should be passed through when defining a `vhost` (e.g. `rack_base_uris` parameter on the `apache::vhost` class, check `README.md`).
+
+Also, general apache module loading parameters can be supplied to enable using a customized passenger module in place of a default-package-based version of the module.
 
 # Parameters for `apache::mod::passenger`
 
@@ -12,59 +14,99 @@ The following declarations are supported and can be passed to `apache::mod::pass
 class {'apache::mod::passenger':
   passenger_high_performance  => 'on',
   rails_autodetect            => 'off',
+  mod_lib_path                => '/usr/lib/apache2/custom_modules',
 }
 ```
 
 The general form is using the all lower case version of the declaration.
 
-If you pass a default value to `apache::mod::passenger` it will be ignored and not passed through to the configuration file.
+## Parameters used with passenger.conf
+
+If you pass a default value to `apache::mod::passenger` it will be ignored and not passed through to the configuration file. 
 
-## passenger_high_performance
+### passenger_high_performance
 
 Default is `off`, when turned `on` Passenger runs in a higher performance mode that can be less compatible with other Apache modules.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerHighPerformance
 
-## passenger_max_pool_size
+### passenger_max_pool_size
 
 Set's the maximum number of Passenger application processes that may simultaneously run. The default value is 6.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengermaxpoolsize_lt_integer_gt
 
-## passenger_pool_idle_time
+### passenger_pool_idle_time
 
 The maximum number of seconds a Passenger Application process will be allowed to remain idle before being shut down. The default value is 300.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerPoolIdleTime
 
-## passenger_max_requests
+### passenger_max_requests
 
 The maximum number of request a Passenger application will process before being restarted. The default value is 0, which indicates that a process will only shut down if the Pool Idle Time (see above) expires.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
 
-## passenger_stat_throttle_rate
+### passenger_stat_throttle_rate
 
 Sets how often Passenger performs file system checks, at most once every _x_ seconds. Default is 0, which means the checks are performed with every request.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
 
-## rack_autodetect
+### rack_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is a Rack application. The default is `on`
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
 
-## rails_autodetect
+### rails_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is a Rails application. The default is on.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_lt_on_off_gt
 
-## passenger_use_global_queue
+### passenger_use_global_queue
 
 Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is the default in Passenger 4.x and the versions >= 4.x have disabled this configuration option altogether.  Use with caution.
 
+## Parameters used to load the module
+
+Unlike the tuning parameters specified above, the following parameters are only used when loading customized passenger modules.
+
+### mod_package
+
+Allows overriding the default package name used for the passenger module package.
+
+### mod_package_ensure
+
+Allows overriding the package installation setting used by puppet when installing the passenger module. The default is 'present'.
+
+### mod_id
+
+Allows overriding the value used by apache to identify the passenger module. The default is 'passenger_module'.
+
+### mod_lib_path
+
+Allows overriding the directory path used by apache when loading the passenger module. The default is the value of `$apache::params::lib_path`.
+
+### mod_lib
+
+Allows overriding the library file name used by apache when loading the passenger module. The default is 'mod_passenger.so'.
+
+### mod_path
+
+Allows overriding the full path to the library file used by apache when loading the passenger module. The default is the concatenation of the `mod_lib_path` and `mod_lib` parameters.
+
+# Dependencies
+
+RedHat-based systems will need to configure additional package repositories in order to install Passenger, specifically:
+
+* [Extra Packages for Enterprise Linux](https://fedoraproject.org/wiki/EPEL)
+* [Phusion Passenger](http://passenger.stealthymonkeys.com)
+
+Configuration of these repositories is beyond the scope of this module and is left to the user.
+
 # Attribution
 
 The Passenger tuning parameters for the `apache::mod::puppet` Puppet class was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the PuppetLabs Apache module on GitHub.
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index e7561651d6..8eb7d2412d 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -11,14 +11,13 @@
   $passenger_ruby                 = $apache::params::passenger_ruby,
   $passenger_max_pool_size        = undef,
   $passenger_use_global_queue     = undef,
+  $mod_package                    = undef,
+  $mod_package_ensure             = undef,
+  $mod_lib                        = undef,
+  $mod_lib_path                   = undef,
+  $mod_id                         = undef,
+  $mod_path                       = undef,
 ) {
-  if $::osfamily == 'FreeBSD' {
-    apache::mod { 'passenger':
-      lib_path => "${passenger_root}/buildout/apache2"
-    }
-  } else {
-    apache::mod { 'passenger': }
-  }
 
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
@@ -27,6 +26,30 @@
     }
   }
 
+  $_package = $mod_package
+  $_package_ensure = $mod_package_ensure
+  $_lib = $mod_lib
+  if $::osfamily == 'FreeBSD' {
+    if $mod_lib_path {
+      $_lib_path = $mod_lib_path
+    } else {
+      $_lib_path = "${passenger_root}/buildout/apache2"
+    }
+  } else {
+    $_lib_path = $mod_lib_path
+  }
+
+  $_id = $mod_id
+  $_path = $mod_path
+  apache::mod { 'passenger':
+    package        => $_package,
+    package_ensure => $_package_ensure,
+    lib            => $_lib,
+    lib_path       => $_lib_path,
+    id             => $_id,
+    path           => $_path,
+  }
+
   # Template uses:
   # - $passenger_root
   # - $passenger_ruby
diff --git a/manifests/params.pp b/manifests/params.pp
index 1f5f45b413..ea24a87f71 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -58,8 +58,8 @@
     $ssl_certs_dir        = '/etc/pki/tls/certs'
     $passenger_conf_file  = 'passenger_extra.conf'
     $passenger_conf_package_file = 'passenger.conf'
-    $passenger_root       = undef
-    $passenger_ruby       = undef
+    $passenger_root       = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.19'
+    $passenger_ruby       = '/usr/bin/ruby'
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 37177f477f..a90b85d7a7 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -13,6 +13,9 @@
     it { should contain_class("apache::params") }
     it { should contain_apache__mod('passenger') }
     it { should contain_package("libapache2-mod-passenger") }
+    it { should contain_file('passenger.load').with({
+      'path' => '/etc/apache2/mods-available/passenger.load',
+    }) }
     it { should contain_file('passenger.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
@@ -78,6 +81,30 @@
       end
       it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue true$/) }
     end
+    describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
+      let :params do
+        { :mod_path => '/usr/lib/foo/mod_foo.so' }
+      end
+      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
+    end
+    describe "with mod_lib_path => '/usr/lib/foo'" do
+      let :params do
+        { :mod_lib_path => '/usr/lib/foo' }
+      end
+      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
+    end
+    describe "with mod_lib => 'mod_foo.so'" do
+      let :params do
+        { :mod_lib => 'mod_foo.so' }
+      end
+      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
+    end
+    describe "with mod_id => 'mod_foo'" do
+      let :params do
+        { :mod_id => 'mod_foo' }
+      end
+      it { should contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
+    end
 
   end
   context "on a RedHat OS" do
@@ -99,8 +126,8 @@
     it { should contain_file('passenger.conf').with({
       'path' => '/etc/httpd/conf.d/passenger_extra.conf',
     }) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+    it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/ruby\/gems\/1.8\/gems\/passenger-3\.0\.19"$/) }
+    it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/bin\/ruby"/) }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 176529fdb7..30b4fdb1f8 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -13,6 +13,29 @@
     on host, 'gem install puppet --no-ri --no-rdoc'
     on host, "mkdir -p #{host['distmoduledir']}"
   end
+
+  # host-specific repositories
+  repos = {
+    'centos-64-x64' => [
+        [
+          'http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm' ,
+          nil
+        ],
+        [
+          'http://passenger.stealthymonkeys.com/rhel/6/passenger-release.noarch.rpm',
+          'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc'
+        ]
+      ]
+  }
+
+  host_repos = repos[host.to_s] || []
+  host_repos.each do |repo_url,gpg_key|
+    puts "configuring #{host}-specific repo #{repo_url.inspect}"
+    unless gpg_key.nil?
+      shell("rpm --import #{gpg_key}")
+    end
+    shell("rpm -Uvh #{repo_url}")
+  end
 end
 
 RSpec.configure do |c|

From 9478cdb1db16f3d449149c3d839169aaf93b2974 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 21 Feb 2014 14:01:25 -0800
Subject: [PATCH 0159/2267] Windows, Suse, Solaris, and AIX are not supported.

---
 spec/acceptance/apache_parameters_spec.rb |  2 +-
 spec/acceptance/apache_ssl_spec.rb        |  2 +-
 spec/acceptance/basic_spec.rb             |  2 +-
 spec/acceptance/class_spec.rb             |  2 +-
 spec/acceptance/default_mods_spec.rb      |  2 +-
 spec/acceptance/itk_spec.rb               | 28 +++++++++++------------
 spec/acceptance/mod_php_spec.rb           |  2 +-
 spec/acceptance/mod_suphp_spec.rb         |  2 +-
 spec/acceptance/prefork_worker_spec.rb    |  6 ++---
 spec/acceptance/service_spec.rb           |  2 +-
 spec/acceptance/unsupported_spec.rb       | 13 +++++++++++
 spec/acceptance/version.rb                |  2 --
 spec/acceptance/vhost_spec.rb             |  2 +-
 spec/spec_helper_acceptance.rb            |  6 ++---
 14 files changed, 40 insertions(+), 33 deletions(-)
 create mode 100644 spec/acceptance/unsupported_spec.rb

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 597739f5c2..eeae55d45e 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache parameters' do
+describe 'apache parameters', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
 
   # Currently this test only does something on FreeBSD.
   describe 'default_confd_files => false' do
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 2d45e40498..649c02d841 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -7,7 +7,7 @@
   vhostd = '/etc/apache2/sites-available'
 end
 
-describe 'apache ssl' do
+describe 'apache ssl', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
 
   describe 'ssl parameters' do
     it 'runs without error' do
diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
index bc456e9ed1..6c2b3f462f 100644
--- a/spec/acceptance/basic_spec.rb
+++ b/spec/acceptance/basic_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'disable selinux:' do
+describe 'disable selinux:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   it "because otherwise apache won't work" do
     apply_manifest(%{
       exec { "setenforce 0":
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index b28121be6a..1f5921d596 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache class' do
+describe 'apache class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   case fact('osfamily')
   when 'RedHat'
     package_name = 'httpd'
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index df6463eca4..03e1445601 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -11,7 +11,7 @@
   raise "Unconfigured OS for apache service on #{fact('osfamily')}"
 end
 
-describe 'apache::default_mods class' do
+describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   describe 'no default mods' do
     # Using puppet_apply as a helper
     it 'should apply with no errors' do
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index cabd71c5c6..86fc2c01ce 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -10,26 +10,24 @@
   service_name = :skip
 end
 
-unless service_name.equal? :skip
-  describe 'apache::mod::itk class' do
-    describe 'running puppet code' do
-      # Using puppet_apply as a helper
-      it 'should work with no errors' do
-        pp = <<-EOS
+describe 'apache::mod::itk class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or service_name.equal? :skip do
+  describe 'running puppet code' do
+    # Using puppet_apply as a helper
+    it 'should work with no errors' do
+      pp = <<-EOS
           class { 'apache':
             mpm_module => 'itk',
           }
-        EOS
+      EOS
 
-         # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-      end
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
+  end
 
-    describe service(service_name) do
-      it { should be_running }
-      it { should be_enabled }
-    end
+  describe service(service_name) do
+    it { should be_running }
+    it { should be_enabled }
   end
 end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 3f3faaf9fe..d1c991621d 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::php class' do
+describe 'apache::mod::php class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   case fact('osfamily')
   when 'Debian'
     vhost_dir    = '/etc/apache2/sites-enabled'
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 725ec2adb8..9e26731d61 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::suphp class' do
+describe 'apache::mod::suphp class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   case fact('osfamily')
   when 'Debian'
     context "default suphp config" do
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 8427fd045a..beffe0a014 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -7,8 +7,6 @@
   servicename = 'apache2'
 when 'FreeBSD'
   servicename = 'apache22'
-else
-  raise "Unconfigured OS for apache service on #{fact('osfamily')}"
 end
 
 case fact('osfamily')
@@ -36,7 +34,7 @@ class { 'apache':
   end
 end
 
-describe 'apache::mod::worker class' do
+describe 'apache::mod::worker class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do
@@ -58,7 +56,7 @@ class { 'apache':
   end
 end
 
-describe 'apache::mod::prefork class' do
+describe 'apache::mod::prefork class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do
diff --git a/spec/acceptance/service_spec.rb b/spec/acceptance/service_spec.rb
index c3124c8461..b51ca386f0 100644
--- a/spec/acceptance/service_spec.rb
+++ b/spec/acceptance/service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::service class' do
+describe 'apache::service class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   describe 'adding dependencies in between the base class and service class' do
     it 'should work with no errors' do
       pp = <<-EOS
diff --git a/spec/acceptance/unsupported_spec.rb b/spec/acceptance/unsupported_spec.rb
new file mode 100644
index 0000000000..5a89cd2137
--- /dev/null
+++ b/spec/acceptance/unsupported_spec.rb
@@ -0,0 +1,13 @@
+equire 'spec_helper_acceptance'
+
+describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  it 'should fail' do
+    pp = <<-EOS
+      class { 'apache': }
+      apache::vhost { 'test.lan':
+        docroot => '/var/www',
+      }
+    EOS
+    expect(apply_manifest(pp, :expect_failures => true).to match(/is not supported/))
+  end
+end
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index 62c5f3c397..169054ec21 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -51,7 +51,5 @@
   $error_log        = 'http-error.log'
 
   $apache_version = 2.2
-else
-  fail RuntimeError, "Unsupported osfamily: #{_osfamily}"
 end
 
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index a45db82b01..b4458bf257 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::vhost define' do
+describe 'apache::vhost define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   context 'no default vhosts' do
     it 'should create no default vhosts' do
       pp = <<-EOS
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 176529fdb7..7d334ae9bd 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -8,13 +8,13 @@
   if host.is_pe?
     install_pe
   else
-    # Install Puppet
-    install_package host, 'rubygems'
-    on host, 'gem install puppet --no-ri --no-rdoc'
+    install_puppet
     on host, "mkdir -p #{host['distmoduledir']}"
   end
 end
 
+UNSUPPORTED_PLATFORMS = ['Suse','windows','AIX','Solaris']
+
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))

From 2a6c28a5e31251ab44b6db49ec89073752867567 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 21 Feb 2014 14:28:31 -0800
Subject: [PATCH 0160/2267] Fix WSGI import_script and mod_ssl issues on Lucid

The WSGIImportScript directive can't be used directly inside a
VirtualHost on Lucid, says the apache daemon.
---
 manifests/mod/ssl.pp          |  2 ++
 spec/acceptance/vhost_spec.rb | 22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 323d092b28..c38c111e49 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -13,6 +13,8 @@
     'debian': {
       if $apache_version >= 2.4 and $::operatingsystem == 'Ubuntu' {
         $ssl_mutex = 'default'
+      } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
+        $ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
       } else {
         $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex'
       }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index b4458bf257..f6749d35a1 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -44,9 +44,6 @@ class { 'apache': }
 
   context 'default vhost with ssl' do
     it 'should create default vhost configs' do
-      # Doesn't work on Ubuntu 10.04 because ssl.conf should contain
-      # 'file:/var/run/apache2/ssl_mutex' but contains
-      # 'file:${APACHE_RUN_DIR}/ssl_mutex'
       pp = <<-EOS
         file { '#{$run_dir}':
           ensure  => 'directory',
@@ -866,7 +863,24 @@ class { 'apache': }
   end
 
   describe 'wsgi' do
-    it 'applies cleanly' do
+    it 'import_script applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::wsgi': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot                     => '/tmp',
+          wsgi_application_group      => '%{GLOBAL}',
+          wsgi_daemon_process         => 'wsgi',
+          wsgi_daemon_process_options => {processes => '2'},
+          wsgi_process_group          => 'nobody',
+          wsgi_script_aliases         => { '/test' => '/test1' },
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    it 'import_script applies cleanly', :unless => fact('lsbcodename') == 'lucid' do
       pp = <<-EOS
         class { 'apache': }
         class { 'apache::mod::wsgi': }

From 176dc39d2a932fd006e9a3e21d393d70da5f8ac4 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Sat, 22 Feb 2014 15:19:26 -0800
Subject: [PATCH 0161/2267] Checking the stderr wasn't specified correctly

---
 spec/acceptance/unsupported_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/unsupported_spec.rb b/spec/acceptance/unsupported_spec.rb
index 5a89cd2137..f3efa5f5ad 100644
--- a/spec/acceptance/unsupported_spec.rb
+++ b/spec/acceptance/unsupported_spec.rb
@@ -8,6 +8,6 @@ class { 'apache': }
         docroot => '/var/www',
       }
     EOS
-    expect(apply_manifest(pp, :expect_failures => true).to match(/is not supported/))
+    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/is not supported/)
   end
 end

From 127c4ff28533a323ceca39a078d05e6b538312ea Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 24 Feb 2014 13:54:13 -0800
Subject: [PATCH 0162/2267] Typo'd require and wrong fail message

---
 spec/acceptance/unsupported_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/unsupported_spec.rb b/spec/acceptance/unsupported_spec.rb
index f3efa5f5ad..085845dbfc 100644
--- a/spec/acceptance/unsupported_spec.rb
+++ b/spec/acceptance/unsupported_spec.rb
@@ -1,4 +1,4 @@
-equire 'spec_helper_acceptance'
+require 'spec_helper_acceptance'
 
 describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   it 'should fail' do
@@ -8,6 +8,6 @@ class { 'apache': }
         docroot => '/var/www',
       }
     EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/is not supported/)
+    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported/i)
   end
 end

From bbf9278b24931444022aa67140d3505b748151da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Mon, 24 Feb 2014 17:20:38 +0100
Subject: [PATCH 0163/2267] ensure tests run faster

we do this by fully-qualifying classes, defines and variables.
---
 manifests/balancer.pp            |   2 +-
 manifests/confd/no_accf.pp       |   6 +-
 manifests/default_confd_files.pp |   2 +-
 manifests/default_mods.pp        | 170 +++++++++++++++----------------
 manifests/default_mods/load.pp   |   4 +-
 manifests/dev.pp                 |   4 +-
 manifests/init.pp                |  66 ++++++------
 manifests/listen.pp              |   2 +-
 manifests/mod.pp                 |  18 ++--
 manifests/mod/alias.pp           |   6 +-
 manifests/mod/auth_basic.pp      |   2 +-
 manifests/mod/auth_kerb.pp       |   2 +-
 manifests/mod/authnz_ldap.pp     |  10 +-
 manifests/mod/autoindex.pp       |   8 +-
 manifests/mod/cache.pp           |   2 +-
 manifests/mod/cgi.pp             |   4 +-
 manifests/mod/cgid.pp            |  10 +-
 manifests/mod/dav.pp             |   2 +-
 manifests/mod/dav_fs.pp          |  10 +-
 manifests/mod/dav_svn.pp         |   6 +-
 manifests/mod/deflate.pp         |   8 +-
 manifests/mod/dev.pp             |   2 +-
 manifests/mod/dir.pp             |   8 +-
 manifests/mod/disk_cache.pp      |  10 +-
 manifests/mod/event.pp           |  10 +-
 manifests/mod/expires.pp         |   2 +-
 manifests/mod/fastcgi.pp         |  10 +-
 manifests/mod/fcgid.pp           |   2 +-
 manifests/mod/headers.pp         |   4 +-
 manifests/mod/include.pp         |   2 +-
 manifests/mod/info.pp            |   8 +-
 manifests/mod/itk.pp             |  10 +-
 manifests/mod/ldap.pp            |   8 +-
 manifests/mod/mime.pp            |  12 +--
 manifests/mod/mime_magic.pp      |   8 +-
 manifests/mod/negotiation.pp     |   8 +-
 manifests/mod/nss.pp             |  16 +--
 manifests/mod/passenger.pp       |  20 ++--
 manifests/mod/perl.pp            |   2 +-
 manifests/mod/peruser.pp         |  26 ++---
 manifests/mod/php.pp             |  16 +--
 manifests/mod/prefork.pp         |  14 +--
 manifests/mod/proxy.pp           |   8 +-
 manifests/mod/proxy_ajp.pp       |   4 +-
 manifests/mod/proxy_balancer.pp  |  10 +-
 manifests/mod/proxy_html.pp      |  18 ++--
 manifests/mod/proxy_http.pp      |   4 +-
 manifests/mod/python.pp          |   2 +-
 manifests/mod/reqtimeout.pp      |   8 +-
 manifests/mod/rewrite.pp         |   4 +-
 manifests/mod/rpaf.pp            |   8 +-
 manifests/mod/setenvif.pp        |   8 +-
 manifests/mod/ssl.pp             |  12 +--
 manifests/mod/status.pp          |   8 +-
 manifests/mod/suphp.pp           |   8 +-
 manifests/mod/userdir.pp         |   8 +-
 manifests/mod/vhost_alias.pp     |   2 +-
 manifests/mod/worker.pp          |  14 +--
 manifests/mod/wsgi.pp            |   8 +-
 manifests/mod/xsendfile.pp       |   4 +-
 manifests/mpm.pp                 |  24 ++---
 manifests/namevirtualhost.pp     |   2 +-
 manifests/package.pp             |   4 +-
 manifests/params.pp              |   2 +-
 manifests/peruser/multiplexer.pp |   8 +-
 manifests/peruser/processor.pp   |   4 +-
 manifests/php.pp                 |   2 +-
 manifests/proxy.pp               |   2 +-
 manifests/python.pp              |   2 +-
 manifests/service.pp             |   2 +-
 manifests/ssl.pp                 |   2 +-
 manifests/vhost.pp               |  62 +++++------
 72 files changed, 398 insertions(+), 398 deletions(-)

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 1e4130fa35..30887823b6 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -43,7 +43,7 @@
   $collect_exported = true,
 ) {
   include concat::setup
-  include apache::mod::proxy_balancer
+  include ::apache::mod::proxy_balancer
 
   $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
 
diff --git a/manifests/confd/no_accf.pp b/manifests/confd/no_accf.pp
index 5f86eab107..f35c0c8b9d 100644
--- a/manifests/confd/no_accf.pp
+++ b/manifests/confd/no_accf.pp
@@ -2,9 +2,9 @@
   # Template uses no variables
   file { 'no-accf.conf':
     ensure  => 'file',
-    path    => "${apache::confd_dir}/no-accf.conf",
+    path    => "${::apache::confd_dir}/no-accf.conf",
     content => template('apache/confd/no-accf.conf.erb'),
-    require => Exec["mkdir ${apache::confd_dir}"],
-    before  => File[$apache::confd_dir],
+    require => Exec["mkdir ${::apache::confd_dir}"],
+    before  => File[$::apache::confd_dir],
   }
 }
diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
index e40840e335..c06b30c83b 100644
--- a/manifests/default_confd_files.pp
+++ b/manifests/default_confd_files.pp
@@ -5,7 +5,7 @@
   if $all {
     case $::osfamily {
       'freebsd': {
-        include apache::confd::no_accf
+        include ::apache::confd::no_accf
       }
       default: {
         # do nothing
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 09cc3be1eb..139503e3c5 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -1,154 +1,154 @@
 class apache::default_mods (
   $all            = true,
   $mods           = undef,
-  $apache_version = $apache::apache_version
+  $apache_version = $::apache::apache_version
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
   # them to make sure it works.
   case $::osfamily {
     'redhat', 'freebsd': {
-      apache::mod { 'log_config': }
+      ::apache::mod { 'log_config': }
     }
     default: {}
   }
-  apache::mod { 'authz_host': }
+  ::apache::mod { 'authz_host': }
 
   # The rest of the modules only get loaded if we want all modules enabled
   if $all {
     case $::osfamily {
       'debian': {
-        include apache::mod::reqtimeout
+        include ::apache::mod::reqtimeout
       }
       'redhat': {
-        include apache::mod::cache
-        include apache::mod::mime
-        include apache::mod::mime_magic
-        include apache::mod::vhost_alias
-        include apache::mod::rewrite
-        apache::mod { 'actions': }
-        apache::mod { 'auth_digest': }
-        apache::mod { 'authn_anon': }
-        apache::mod { 'authn_dbm': }
-        apache::mod { 'authz_dbm': }
-        apache::mod { 'authz_owner': }
-        apache::mod { 'expires': }
-        apache::mod { 'ext_filter': }
-        apache::mod { 'include': }
-        apache::mod { 'logio': }
-        apache::mod { 'speling': }
-        apache::mod { 'substitute': }
-        apache::mod { 'suexec': }
-        apache::mod { 'usertrack': }
-        apache::mod { 'version': }
+        include ::apache::mod::cache
+        include ::apache::mod::mime
+        include ::apache::mod::mime_magic
+        include ::apache::mod::vhost_alias
+        include ::apache::mod::rewrite
+        ::apache::mod { 'actions': }
+        ::apache::mod { 'auth_digest': }
+        ::apache::mod { 'authn_anon': }
+        ::apache::mod { 'authn_dbm': }
+        ::apache::mod { 'authz_dbm': }
+        ::apache::mod { 'authz_owner': }
+        ::apache::mod { 'expires': }
+        ::apache::mod { 'ext_filter': }
+        ::apache::mod { 'include': }
+        ::apache::mod { 'logio': }
+        ::apache::mod { 'speling': }
+        ::apache::mod { 'substitute': }
+        ::apache::mod { 'suexec': }
+        ::apache::mod { 'usertrack': }
+        ::apache::mod { 'version': }
 
         if $apache_version >= 2.4 {
           # Lets fork it
-          apache::mod { 'systemd': }
+          ::apache::mod { 'systemd': }
 
-          apache::mod { 'unixd': }
-          apache::mod { 'authn_core': }
+          ::apache::mod { 'unixd': }
+          ::apache::mod { 'authn_core': }
         }
         else {
-          apache::mod { 'authn_alias': }
-          apache::mod { 'authn_default': }
+          ::apache::mod { 'authn_alias': }
+          ::apache::mod { 'authn_default': }
         }
       }
       'freebsd': {
-        include apache::mod::cache
-        include apache::mod::disk_cache
-        include apache::mod::headers
-        include apache::mod::info
-        include apache::mod::mime_magic
-        include apache::mod::reqtimeout
-        include apache::mod::rewrite
-        include apache::mod::userdir
-        include apache::mod::vhost_alias
+        include ::apache::mod::cache
+        include ::apache::mod::disk_cache
+        include ::apache::mod::headers
+        include ::apache::mod::info
+        include ::apache::mod::mime_magic
+        include ::apache::mod::reqtimeout
+        include ::apache::mod::rewrite
+        include ::apache::mod::userdir
+        include ::apache::mod::vhost_alias
 
-        apache::mod { 'actions': }
-        apache::mod { 'asis': }
-        apache::mod { 'auth_digest': }
-        apache::mod { 'authn_alias': }
-        apache::mod { 'authn_anon': }
-        apache::mod { 'authn_dbm': }
-        apache::mod { 'authn_default': }
-        apache::mod { 'authz_dbm': }
-        apache::mod { 'authz_owner': }
-        apache::mod { 'cern_meta': }
-        apache::mod { 'charset_lite': }
-        apache::mod { 'dumpio': }
-        apache::mod { 'expires': }
-        apache::mod { 'file_cache': }
-        apache::mod { 'filter':}
-        apache::mod { 'imagemap':}
-        apache::mod { 'include': }
-        apache::mod { 'logio': }
-        apache::mod { 'speling': }
-        apache::mod { 'unique_id': }
-        apache::mod { 'usertrack': }
-        apache::mod { 'version': }
+        ::apache::mod { 'actions': }
+        ::apache::mod { 'asis': }
+        ::apache::mod { 'auth_digest': }
+        ::apache::mod { 'authn_alias': }
+        ::apache::mod { 'authn_anon': }
+        ::apache::mod { 'authn_dbm': }
+        ::apache::mod { 'authn_default': }
+        ::apache::mod { 'authz_dbm': }
+        ::apache::mod { 'authz_owner': }
+        ::apache::mod { 'cern_meta': }
+        ::apache::mod { 'charset_lite': }
+        ::apache::mod { 'dumpio': }
+        ::apache::mod { 'expires': }
+        ::apache::mod { 'file_cache': }
+        ::apache::mod { 'filter':}
+        ::apache::mod { 'imagemap':}
+        ::apache::mod { 'include': }
+        ::apache::mod { 'logio': }
+        ::apache::mod { 'speling': }
+        ::apache::mod { 'unique_id': }
+        ::apache::mod { 'usertrack': }
+        ::apache::mod { 'version': }
       }
       default: {}
     }
-    case $apache::mpm_module {
+    case $::apache::mpm_module {
       'prefork': {
-        include apache::mod::cgi
+        include ::apache::mod::cgi
       }
       'worker': {
-        include apache::mod::cgid
+        include ::apache::mod::cgid
       }
       default: {
         # do nothing
       }
     }
-    include apache::mod::alias
-    include apache::mod::autoindex
-    include apache::mod::dav
-    include apache::mod::dav_fs
-    include apache::mod::deflate
-    include apache::mod::dir
-    include apache::mod::mime
-    include apache::mod::negotiation
-    include apache::mod::setenvif
-    apache::mod { 'auth_basic': }
-    apache::mod { 'authn_file': }
+    include ::apache::mod::alias
+    include ::apache::mod::autoindex
+    include ::apache::mod::dav
+    include ::apache::mod::dav_fs
+    include ::apache::mod::deflate
+    include ::apache::mod::dir
+    include ::apache::mod::mime
+    include ::apache::mod::negotiation
+    include ::apache::mod::setenvif
+    ::apache::mod { 'auth_basic': }
+    ::apache::mod { 'authn_file': }
 
     if $apache_version >= 2.4 {
       # authz_core is needed for 'Require' directive
-      apache::mod { 'authz_core':
+      ::apache::mod { 'authz_core':
         id => 'authz_core_module',
       }
 
       # filter is needed by mod_deflate
-      apache::mod { 'filter': }
+      ::apache::mod { 'filter': }
     } else {
-      apache::mod { 'authz_default': }
+      ::apache::mod { 'authz_default': }
     }
 
-    apache::mod { 'authz_groupfile': }
-    apache::mod { 'authz_user': }
-    apache::mod { 'env': }
+    ::apache::mod { 'authz_groupfile': }
+    ::apache::mod { 'authz_user': }
+    ::apache::mod { 'env': }
   } elsif $mods {
-    apache::default_mods::load { $mods: }
+    ::apache::default_mods::load { $mods: }
 
     if $apache_version >= 2.4 {
       # authz_core is needed for 'Require' directive
-      apache::mod { 'authz_core':
+      ::apache::mod { 'authz_core':
         id => 'authz_core_module',
       }
 
       # filter is needed by mod_deflate
-      apache::mod { 'filter': }
+      ::apache::mod { 'filter': }
     }
   } else {
     if $apache_version >= 2.4 {
       # authz_core is needed for 'Require' directive
-      apache::mod { 'authz_core':
+      ::apache::mod { 'authz_core':
         id => 'authz_core_module',
       }
 
       # filter is needed by mod_deflate
-      apache::mod { 'filter': }
+      ::apache::mod { 'filter': }
     }
   }
 }
diff --git a/manifests/default_mods/load.pp b/manifests/default_mods/load.pp
index ae2f76e64c..356e9fa00e 100644
--- a/manifests/default_mods/load.pp
+++ b/manifests/default_mods/load.pp
@@ -1,8 +1,8 @@
 # private define
 define apache::default_mods::load ($module = $title) {
   if defined("apache::mod::${module}") {
-    include "apache::mod::${module}"
+    include "::apache::mod::${module}"
   } else {
-    apache::mod { $module: }
+    ::apache::mod { $module: }
   }
 }
diff --git a/manifests/dev.pp b/manifests/dev.pp
index 057475b159..4eaeb55782 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -2,8 +2,8 @@
   if $::osfamily == 'FreeBSD' and !defined(Class['apache::package']) {
     fail('apache::dev requires apache::package; please include apache or apache::package class first')
   }
-  include apache::params
-  $packages = $apache::params::dev_packages
+  include ::apache::params
+  $packages = $::apache::params::dev_packages
   package { $packages:
     ensure  => present,
     require => Package['httpd'],
diff --git a/manifests/init.pp b/manifests/init.pp
index 94900ea5c1..7f2565cf98 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,13 +13,13 @@
 # Sample Usage:
 #
 class apache (
-  $service_name         = $apache::params::service_name,
+  $service_name         = $::apache::params::service_name,
   $default_mods         = true,
   $default_vhost        = true,
   $default_confd_files  = true,
   $default_ssl_vhost    = false,
-  $default_ssl_cert     = $apache::params::default_ssl_cert,
-  $default_ssl_key      = $apache::params::default_ssl_key,
+  $default_ssl_cert     = $::apache::params::default_ssl_cert,
+  $default_ssl_key      = $::apache::params::default_ssl_key,
   $default_ssl_chain    = undef,
   $default_ssl_ca       = undef,
   $default_ssl_crl_path = undef,
@@ -33,31 +33,31 @@
   $sendfile             = 'On',
   $error_documents      = false,
   $timeout              = '120',
-  $httpd_dir            = $apache::params::httpd_dir,
-  $server_root          = $apache::params::server_root,
-  $confd_dir            = $apache::params::confd_dir,
-  $vhost_dir            = $apache::params::vhost_dir,
-  $vhost_enable_dir     = $apache::params::vhost_enable_dir,
-  $mod_dir              = $apache::params::mod_dir,
-  $mod_enable_dir       = $apache::params::mod_enable_dir,
-  $mpm_module           = $apache::params::mpm_module,
-  $conf_template        = $apache::params::conf_template,
-  $servername           = $apache::params::servername,
+  $httpd_dir            = $::apache::params::httpd_dir,
+  $server_root          = $::apache::params::server_root,
+  $confd_dir            = $::apache::params::confd_dir,
+  $vhost_dir            = $::apache::params::vhost_dir,
+  $vhost_enable_dir     = $::apache::params::vhost_enable_dir,
+  $mod_dir              = $::apache::params::mod_dir,
+  $mod_enable_dir       = $::apache::params::mod_enable_dir,
+  $mpm_module           = $::apache::params::mpm_module,
+  $conf_template        = $::apache::params::conf_template,
+  $servername           = $::apache::params::servername,
   $manage_user          = true,
   $manage_group         = true,
-  $user                 = $apache::params::user,
-  $group                = $apache::params::group,
-  $keepalive            = $apache::params::keepalive,
-  $keepalive_timeout    = $apache::params::keepalive_timeout,
-  $logroot              = $apache::params::logroot,
-  $log_level            = $apache::params::log_level,
-  $ports_file           = $apache::params::ports_file,
-  $apache_version       = $apache::version::default,
+  $user                 = $::apache::params::user,
+  $group                = $::apache::params::group,
+  $keepalive            = $::apache::params::keepalive,
+  $keepalive_timeout    = $::apache::params::keepalive_timeout,
+  $logroot              = $::apache::params::logroot,
+  $log_level            = $::apache::params::log_level,
+  $ports_file           = $::apache::params::ports_file,
+  $apache_version       = $::apache::version::default,
   $server_tokens        = 'OS',
   $server_signature     = 'On',
   $trace_enable         = 'On',
   $package_ensure       = 'installed',
-) inherits apache::params {
+) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
   validate_bool($default_confd_files)
@@ -81,7 +81,7 @@
   if $::osfamily != 'FreeBSD' {
     package { 'httpd':
       ensure => $package_ensure,
-      name   => $apache::params::apache_name,
+      name   => $::apache::params::apache_name,
       notify => Class['Apache::Service'],
     }
   }
@@ -110,7 +110,7 @@
   validate_re($log_level, $valid_log_level_re,
   "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
 
-  class { 'apache::service':
+  class { '::apache::service':
     service_name   => $service_name,
     service_enable => $service_enable,
     service_ensure => $service_ensure,
@@ -206,7 +206,7 @@
 
   concat { $ports_file:
     owner   => 'root',
-    group   => $apache::params::root_group,
+    group   => $::apache::params::root_group,
     mode    => '0644',
     notify  => Class['Apache::Service'],
     require => Package['httpd'],
@@ -216,7 +216,7 @@
     content => template('apache/ports_header.erb')
   }
 
-  if $apache::params::conf_dir and $apache::params::conf_file {
+  if $::apache::params::conf_dir and $::apache::params::conf_file {
     case $::osfamily {
       'debian': {
         $docroot              = '/var/www'
@@ -272,7 +272,7 @@
     # - $server_tokens
     # - $server_signature
     # - $trace_enable
-    file { "${apache::params::conf_dir}/${apache::params::conf_file}":
+    file { "${::apache::params::conf_dir}/${::apache::params::conf_file}":
       ensure  => file,
       content => template($conf_template),
       notify  => Class['Apache::Service'],
@@ -282,20 +282,20 @@
     # preserve back-wards compatibility to the times when default_mods was
     # only a boolean value. Now it can be an array (too)
     if is_array($default_mods) {
-      class { 'apache::default_mods':
+      class { '::apache::default_mods':
         all  => false,
         mods => $default_mods,
       }
     } else {
-      class { 'apache::default_mods':
+      class { '::apache::default_mods':
         all => $default_mods,
       }
     }
-    class { 'apache::default_confd_files':
+    class { '::apache::default_confd_files':
       all => $default_confd_files
     }
     if $mpm_module {
-      class { "apache::mod::${mpm_module}": }
+      class { "::apache::mod::${mpm_module}": }
     }
 
     $default_vhost_ensure = $default_vhost ? {
@@ -307,7 +307,7 @@
       false => 'absent'
     }
 
-    apache::vhost { 'default':
+    ::apache::vhost { 'default':
       ensure          => $default_vhost_ensure,
       port            => 80,
       docroot         => $docroot,
@@ -321,7 +321,7 @@
       'freebsd' => $access_log_file,
       default   => "ssl_${access_log_file}",
     }
-    apache::vhost { 'default-ssl':
+    ::apache::vhost { 'default-ssl':
       ensure          => $default_ssl_vhost_ensure,
       port            => 443,
       ssl             => true,
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 3189fa8f77..503ee8860b 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -3,7 +3,7 @@
 
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
-    target  => $apache::ports_file,
+    target  => $::apache::ports_file,
     content => template('apache/listen.erb'),
   }
 }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index e8ce8a9ab5..8be99afd00 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -2,7 +2,7 @@
   $package = undef,
   $package_ensure = 'present',
   $lib = undef,
-  $lib_path = $apache::params::lib_path,
+  $lib_path = $::apache::params::lib_path,
   $id = undef,
   $path = undef,
 ) {
@@ -12,10 +12,10 @@
 
   $mod = $name
   #include apache #This creates duplicate resources in rspec-puppet
-  $mod_dir = $apache::mod_dir
+  $mod_dir = $::apache::mod_dir
 
   # Determine if we have special lib
-  $mod_libs = $apache::params::mod_libs
+  $mod_libs = $::apache::params::mod_libs
   $mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
   if $lib {
     $_lib = $lib
@@ -39,7 +39,7 @@
   }
 
   # Determine if we have a package
-  $mod_packages = $apache::params::mod_packages
+  $mod_packages = $::apache::params::mod_packages
   $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
   if $package {
     $_package = $package
@@ -54,7 +54,7 @@
     $package_before = $::osfamily ? {
       'freebsd' => [
         File["${mod_dir}/${mod}.load"],
-        File["${apache::params::conf_dir}/${apache::params::conf_file}"]
+        File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
       ],
       default => File["${mod_dir}/${mod}.load"],
     }
@@ -70,7 +70,7 @@
     ensure  => file,
     path    => "${mod_dir}/${mod}.load",
     owner   => 'root',
-    group   => $apache::params::root_group,
+    group   => $::apache::params::root_group,
     mode    => '0644',
     content => "LoadModule ${_id} ${_path}\n",
     require => [
@@ -82,13 +82,13 @@
   }
 
   if $::osfamily == 'Debian' {
-    $enable_dir = $apache::mod_enable_dir
+    $enable_dir = $::apache::mod_enable_dir
     file{ "${mod}.load symlink":
       ensure  => link,
       path    => "${enable_dir}/${mod}.load",
       target  => "${mod_dir}/${mod}.load",
       owner   => 'root',
-      group   => $apache::params::root_group,
+      group   => $::apache::params::root_group,
       mode    => '0644',
       require => [
         File["${mod}.load"],
@@ -106,7 +106,7 @@
         path    => "${enable_dir}/${mod}.conf",
         target  => "${mod_dir}/${mod}.conf",
         owner   => 'root',
-        group   => $apache::params::root_group,
+        group   => $::apache::params::root_group,
         mode    => '0644',
         require => [
           File["${mod}.conf"],
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 29ec831559..ee017b490f 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -10,10 +10,10 @@
   # Template uses $icons_path
   file { 'alias.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/alias.conf",
+    path    => "${::apache::mod_dir}/alias.conf",
     content => template('apache/mod/alias.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/auth_basic.pp b/manifests/mod/auth_basic.pp
index 8c613eef7e..cacfafa4d3 100644
--- a/manifests/mod/auth_basic.pp
+++ b/manifests/mod/auth_basic.pp
@@ -1,3 +1,3 @@
 class apache::mod::auth_basic {
-  apache::mod { 'auth_basic': }
+  ::apache::mod { 'auth_basic': }
 }
diff --git a/manifests/mod/auth_kerb.pp b/manifests/mod/auth_kerb.pp
index 76c2de5b7b..6b53262a1b 100644
--- a/manifests/mod/auth_kerb.pp
+++ b/manifests/mod/auth_kerb.pp
@@ -1,5 +1,5 @@
 class apache::mod::auth_kerb {
-  apache::mod { 'auth_kerb': }
+  ::apache::mod { 'auth_kerb': }
 }
 
 
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 2ca2fc45fd..800e656e89 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,8 +1,8 @@
 class apache::mod::authnz_ldap (
   $verifyServerCert = true,
 ) {
-  include 'apache::mod::ldap'
-  apache::mod { 'authnz_ldap': }
+  include '::apache::mod::ldap'
+  ::apache::mod { 'authnz_ldap': }
 
   validate_bool($verifyServerCert)
 
@@ -10,10 +10,10 @@
   # - $verifyServerCert
   file { 'authnz_ldap.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/authnz_ldap.conf",
+    path    => "${::apache::mod_dir}/authnz_ldap.conf",
     content => template('apache/mod/authnz_ldap.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index 85b4278ef7..f5f0f07458 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -1,12 +1,12 @@
 class apache::mod::autoindex {
-  apache::mod { 'autoindex': }
+  ::apache::mod { 'autoindex': }
   # Template uses no variables
   file { 'autoindex.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/autoindex.conf",
+    path    => "${::apache::mod_dir}/autoindex.conf",
     content => template('apache/mod/autoindex.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/cache.pp b/manifests/mod/cache.pp
index 26d71bd06a..4ab9f44bae 100644
--- a/manifests/mod/cache.pp
+++ b/manifests/mod/cache.pp
@@ -1,3 +1,3 @@
 class apache::mod::cache {
-  apache::mod { 'cache': }
+  ::apache::mod { 'cache': }
 }
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index 2ad368a0ef..6c3c6aec8d 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -1,4 +1,4 @@
 class apache::mod::cgi {
-  Class['apache::mod::prefork'] -> Class['apache::mod::cgi']
-  apache::mod { 'cgi': }
+  Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
+  ::apache::mod { 'cgi': }
 }
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index c932ae2bec..5c89251a1c 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -1,5 +1,5 @@
 class apache::mod::cgid {
-  Class['apache::mod::worker'] -> Class['apache::mod::cgid']
+  Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
 
   # Debian specifies it's cgid sock path, but RedHat uses the default value
   # with no config file
@@ -8,15 +8,15 @@
     'freebsd' => 'cgisock',
     default   => undef,
   }
-  apache::mod { 'cgid': }
+  ::apache::mod { 'cgid': }
   if $cgisock_path {
     # Template uses $cgisock_path
     file { 'cgid.conf':
       ensure  => file,
-      path    => "${apache::mod_dir}/cgid.conf",
+      path    => "${::apache::mod_dir}/cgid.conf",
       content => template('apache/mod/cgid.conf.erb'),
-      require => Exec["mkdir ${apache::mod_dir}"],
-      before  => File[$apache::mod_dir],
+      require => Exec["mkdir ${::apache::mod_dir}"],
+      before  => File[$::apache::mod_dir],
       notify  => Service['httpd'],
     }
   }
diff --git a/manifests/mod/dav.pp b/manifests/mod/dav.pp
index 06aa087e30..ade9c0809c 100644
--- a/manifests/mod/dav.pp
+++ b/manifests/mod/dav.pp
@@ -1,3 +1,3 @@
 class apache::mod::dav {
-  apache::mod { 'dav': }
+  ::apache::mod { 'dav': }
 }
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index 53219be793..482f316171 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -5,16 +5,16 @@
     default   => '/var/lib/dav/lockdb',
   }
 
-  Class['apache::mod::dav'] -> Class['apache::mod::dav_fs']
-  apache::mod { 'dav_fs': }
+  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_fs']
+  ::apache::mod { 'dav_fs': }
 
   # Template uses: $dav_lock
   file { 'dav_fs.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/dav_fs.conf",
+    path    => "${::apache::mod_dir}/dav_fs.conf",
     content => template('apache/mod/dav_fs.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 4f34bd6954..3ffa759112 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -1,5 +1,5 @@
 class apache::mod::dav_svn {
-  Class['apache::mod::dav'] -> Class['apache::mod::dav_svn']
-  include apache::mod::dav
-  apache::mod { 'dav_svn': }
+  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
+  include ::apache::mod::dav
+  ::apache::mod { 'dav_svn': }
 }
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 97d1fdd8a1..9b597d9466 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -1,12 +1,12 @@
 class apache::mod::deflate {
-  apache::mod { 'deflate': }
+  ::apache::mod { 'deflate': }
   # Template uses no variables
   file { 'deflate.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/deflate.conf",
+    path    => "${::apache::mod_dir}/deflate.conf",
     content => template('apache/mod/deflate.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/dev.pp b/manifests/mod/dev.pp
index b5d146fbe4..5abdedd361 100644
--- a/manifests/mod/dev.pp
+++ b/manifests/mod/dev.pp
@@ -1,5 +1,5 @@
 class apache::mod::dev {
   # Development packages are not apache modules
   warning('apache::mod::dev is deprecated; please use apache::dev')
-  include apache::dev
+  include ::apache::dev
 }
diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index 39543e1167..11631305a4 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -6,16 +6,16 @@
   $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
 ) {
   validate_array($indexes)
-  apache::mod { 'dir': }
+  ::apache::mod { 'dir': }
 
   # Template uses
   # - $indexes
   file { 'dir.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/dir.conf",
+    path    => "${::apache::mod_dir}/dir.conf",
     content => template('apache/mod/dir.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index d28196768f..13c9c78352 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -7,18 +7,18 @@
   if $::osfamily != 'FreeBSD' {
     # FIXME: investigate why disk_cache was dependent on proxy
     # NOTE: on FreeBSD disk_cache is compiled by default but proxy is not
-    Class['apache::mod::proxy'] -> Class['apache::mod::disk_cache']
+    Class['::apache::mod::proxy'] -> Class['::apache::mod::disk_cache']
   }
-  Class['apache::mod::cache'] -> Class['apache::mod::disk_cache']
+  Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache']
 
   apache::mod { 'disk_cache': }
   # Template uses $cache_proxy
   file { 'disk_cache.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/disk_cache.conf",
+    path    => "${::apache::mod_dir}/disk_cache.conf",
     content => template('apache/mod/disk_cache.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 172113a287..cad00774c3 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -6,7 +6,7 @@
   $threadsperchild     = '25',
   $maxrequestsperchild = '0',
   $serverlimit         = '25',
-  $apache_version      = $apache::apache_version,
+  $apache_version      = $::apache::apache_version,
 ) {
   if defined(Class['apache::mod::itk']) {
     fail('May not include both apache::mod::event and apache::mod::itk on the same node')
@@ -22,7 +22,7 @@
   }
   File {
     owner => 'root',
-    group => $apache::params::root_group,
+    group => $::apache::params::root_group,
     mode  => '0644',
   }
 
@@ -34,11 +34,11 @@
   # - $threadsperchild
   # - $maxrequestsperchild
   # - $serverlimit
-  file { "${apache::mod_dir}/event.conf":
+  file { "${::apache::mod_dir}/event.conf":
     ensure  => file,
     content => template('apache/mod/event.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 
diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index 6c4b30aca9..aae4c59d98 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -1,3 +1,3 @@
 class apache::mod::expires {
-  apache::mod { 'expires': }
+  ::apache::mod { 'expires': }
 }
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index 28673d7bbe..a185bb31fa 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -2,9 +2,9 @@
 
   # Debian specifies it's fastcgi lib path, but RedHat uses the default value
   # with no config file
-  $fastcgi_lib_path = $apache::params::fastcgi_lib_path
+  $fastcgi_lib_path = $::apache::params::fastcgi_lib_path
 
-  apache::mod { 'fastcgi': }
+  ::apache::mod { 'fastcgi': }
 
   if $fastcgi_lib_path {
     # Template uses:
@@ -13,10 +13,10 @@
     # - $fastcgi_dir
     file { 'fastcgi.conf':
       ensure  => file,
-      path    => "${apache::mod_dir}/fastcgi.conf",
+      path    => "${::apache::mod_dir}/fastcgi.conf",
       content => template('apache/mod/fastcgi.conf.erb'),
-      require => Exec["mkdir ${apache::mod_dir}"],
-      before  => File[$apache::mod_dir],
+      require => Exec["mkdir ${::apache::mod_dir}"],
+      before  => File[$::apache::mod_dir],
       notify  => Service['httpd'],
     }
   }
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 4c777701e9..9eb7997427 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,3 +1,3 @@
 class apache::mod::fcgid {
-  apache::mod { 'fcgid': }
+  ::apache::mod { 'fcgid': }
 }
diff --git a/manifests/mod/headers.pp b/manifests/mod/headers.pp
index 5ff9887b15..d18c5e2793 100644
--- a/manifests/mod/headers.pp
+++ b/manifests/mod/headers.pp
@@ -1,3 +1,3 @@
 class apache::mod::headers {
-  apache::mod { 'headers': }
-}
\ No newline at end of file
+  ::apache::mod { 'headers': }
+}
diff --git a/manifests/mod/include.pp b/manifests/mod/include.pp
index 9f2592f093..edbe81f324 100644
--- a/manifests/mod/include.pp
+++ b/manifests/mod/include.pp
@@ -1,3 +1,3 @@
 class apache::mod::include {
-  apache::mod { 'include': }
+  ::apache::mod { 'include': }
 }
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 627bf85ddf..18f9ea1dfe 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -1,6 +1,6 @@
 class apache::mod::info (
   $allow_from = ['127.0.0.1','::1'],
-  $apache_version = $apache::apache_version,
+  $apache_version = $::apache::apache_version,
 ){
   apache::mod { 'info': }
   # Template uses
@@ -8,10 +8,10 @@
   # $apache_version
   file { 'info.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/info.conf",
+    path    => "${::apache::mod_dir}/info.conf",
     content => template('apache/mod/info.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index cc582ac942..1083e5ed24 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -5,7 +5,7 @@
   $serverlimit         = '256',
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
-  $apache_version      = $apache::apache_version,
+  $apache_version      = $::apache::apache_version,
 ) {
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::itk and apache::mod::event on the same node')
@@ -21,7 +21,7 @@
   }
   File {
     owner => 'root',
-    group => $apache::params::root_group,
+    group => $::apache::params::root_group,
     mode  => '0644',
   }
 
@@ -32,11 +32,11 @@
   # - $serverlimit
   # - $maxclients
   # - $maxrequestsperchild
-  file { "${apache::mod_dir}/itk.conf":
+  file { "${::apache::mod_dir}/itk.conf":
     ensure  => file,
     content => template('apache/mod/itk.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 097622c51e..f489291a28 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -1,12 +1,12 @@
 class apache::mod::ldap {
-  apache::mod { 'ldap': }
+  ::apache::mod { 'ldap': }
   # Template uses no variables
   file { 'ldap.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/ldap.conf",
+    path    => "${::apache::mod_dir}/ldap.conf",
     content => template('apache/mod/ldap.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index 5c9f4b7ada..8348a06ad3 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -1,21 +1,21 @@
 class apache::mod::mime (
-  $mime_support_package = $apache::params::mime_support_package,
-  $mime_types_config    = $apache::params::mime_types_config,
+  $mime_support_package = $::apache::params::mime_support_package,
+  $mime_types_config    = $::apache::params::mime_types_config,
 ) {
   apache::mod { 'mime': }
   # Template uses $mime_types_config
   file { 'mime.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/mime.conf",
+    path    => "${::apache::mod_dir}/mime.conf",
     content => template('apache/mod/mime.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
   if $mime_support_package {
     package { $mime_support_package:
       ensure => 'installed',
-      before => File["${apache::mod_dir}/mime.conf"],
+      before => File["${::apache::mod_dir}/mime.conf"],
     }
   }
 }
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index 5539d20e65..9de8bc4bc6 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -1,14 +1,14 @@
 class apache::mod::mime_magic (
-  $magic_file = "${apache::params::conf_dir}/magic"
+  $magic_file = "${::apache::params::conf_dir}/magic"
 ) {
   apache::mod { 'mime_magic': }
   # Template uses $magic_file
   file { 'mime_magic.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/mime_magic.conf",
+    path    => "${::apache::mod_dir}/mime_magic.conf",
     content => template('apache/mod/mime_magic.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index e10c4921de..eff685b15c 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -1,12 +1,12 @@
 class apache::mod::negotiation {
-  apache::mod { 'negotiation': }
+  ::apache::mod { 'negotiation': }
   # Template uses no variables
   file { 'negotiation.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/negotiation.conf",
+    path    => "${::apache::mod_dir}/negotiation.conf",
     content => template('apache/mod/negotiation.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index a9a50a1068..f0eff1cdf7 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -1,13 +1,13 @@
 class apache::mod::nss (
   $transfer_log = "${::apache::params::logroot}/access.log",
-  $error_log = "${::apache::params::logroot}/error.log",
-  $passwd_file = undef
-  ) {
-  include apache::mod::mime
+  $error_log    = "${::apache::params::logroot}/error.log",
+  $passwd_file  = undef
+) {
+  include ::apache::mod::mime
 
   apache::mod { 'nss': }
 
-  $httpd_dir = $apache::httpd_dir
+  $httpd_dir = $::apache::httpd_dir
 
   # Template uses:
   # $transfer_log
@@ -16,10 +16,10 @@
   # passwd_file
   file { 'nss.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/nss.conf",
+    path    => "${::apache::mod_dir}/nss.conf",
     content => template('apache/mod/nss.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index e7561651d6..6a7404daa0 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -1,29 +1,29 @@
 class apache::mod::passenger (
-  $passenger_conf_file            = $apache::params::passenger_conf_file,
-  $passenger_conf_package_file    = $apache::params::passenger_conf_package_file,
+  $passenger_conf_file            = $::apache::params::passenger_conf_file,
+  $passenger_conf_package_file    = $::apache::params::passenger_conf_package_file,
   $passenger_high_performance     = undef,
   $passenger_pool_idle_time       = undef,
   $passenger_max_requests         = undef,
   $passenger_stat_throttle_rate   = undef,
   $rack_autodetect                = undef,
   $rails_autodetect               = undef,
-  $passenger_root                 = $apache::params::passenger_root,
-  $passenger_ruby                 = $apache::params::passenger_ruby,
+  $passenger_root                 = $::apache::params::passenger_root,
+  $passenger_ruby                 = $::apache::params::passenger_ruby,
   $passenger_max_pool_size        = undef,
   $passenger_use_global_queue     = undef,
 ) {
   if $::osfamily == 'FreeBSD' {
-    apache::mod { 'passenger':
+    ::apache::mod { 'passenger':
       lib_path => "${passenger_root}/buildout/apache2"
     }
   } else {
-    apache::mod { 'passenger': }
+    ::apache::mod { 'passenger': }
   }
 
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
     file { 'passenger_package.conf':
-      path => "${apache::mod_dir}/${passenger_conf_package_file}",
+      path => "${::apache::mod_dir}/${passenger_conf_package_file}",
     }
   }
 
@@ -39,10 +39,10 @@
   # - $rails_autodetect
   file { 'passenger.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/${passenger_conf_file}",
+    path    => "${::apache::mod_dir}/${passenger_conf_file}",
     content => template('apache/mod/passenger.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/perl.pp b/manifests/mod/perl.pp
index 65832a0342..b57f25fd5f 100644
--- a/manifests/mod/perl.pp
+++ b/manifests/mod/perl.pp
@@ -1,3 +1,3 @@
 class apache::mod::perl {
-  apache::mod { 'perl': }
+  ::apache::mod { 'perl': }
 }
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index fafeff23a9..518655a1d4 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -22,11 +22,11 @@
   }
   File {
     owner => 'root',
-    group => $apache::params::root_group,
+    group => $::apache::params::root_group,
     mode  => '0644',
   }
 
-  $mod_dir = $apache::mod_dir
+  $mod_dir = $::apache::mod_dir
 
   # Template uses:
   # - $minspareprocessors
@@ -38,31 +38,31 @@
   # - $expiretimeout
   # - $keepalive
   # - $mod_dir
-  file { "${apache::mod_dir}/peruser.conf":
+  file { "${::apache::mod_dir}/peruser.conf":
     ensure  => file,
     content => template('apache/mod/peruser.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
-  file { "${apache::mod_dir}/peruser":
+  file { "${::apache::mod_dir}/peruser":
     ensure  => directory,
-    require => File[$apache::mod_dir],
+    require => File[$::apache::mod_dir],
   }
-  file { "${apache::mod_dir}/peruser/multiplexers":
+  file { "${::apache::mod_dir}/peruser/multiplexers":
     ensure  => directory,
-    require => File["${apache::mod_dir}/peruser"],
+    require => File["${::apache::mod_dir}/peruser"],
   }
-  file { "${apache::mod_dir}/peruser/processors":
+  file { "${::apache::mod_dir}/peruser/processors":
     ensure  => directory,
-    require => File["${apache::mod_dir}/peruser"],
+    require => File["${::apache::mod_dir}/peruser"],
   }
 
-  apache::peruser::multiplexer { '01-default': }
+  ::apache::peruser::multiplexer { '01-default': }
 
   case $::osfamily {
     'freebsd' : {
-      class { 'apache::package':
+      class { '::apache::package':
         mpm_module => 'peruser'
       }
     }
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index f4e01fe3b4..ace596d42d 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -4,23 +4,23 @@
   if ! defined(Class['apache::mod::prefork']) {
     fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
   }
-  apache::mod { 'php5':
+  ::apache::mod { 'php5':
     package_ensure => $package_ensure,
   }
 
-  include apache::mod::mime
-  include apache::mod::dir
-  Class['apache::mod::mime'] -> Class['apache::mod::dir'] -> Class['apache::mod::php']
+  include ::apache::mod::mime
+  include ::apache::mod::dir
+  Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
 
   file { 'php5.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/php5.conf",
+    path    => "${::apache::mod_dir}/php5.conf",
     content => template('apache/mod/php5.conf.erb'),
     require => [
-      Class['apache::mod::prefork'],
-      Exec["mkdir ${apache::mod_dir}"],
+      Class['::apache::mod::prefork'],
+      Exec["mkdir ${::apache::mod_dir}"],
     ],
-    before  => File[$apache::mod_dir],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index e5810829e4..d615acbddc 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -5,7 +5,7 @@
   $serverlimit         = '256',
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
-  $apache_version      = $apache::apache_version,
+  $apache_version      = $::apache::apache_version,
 ) {
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
@@ -21,7 +21,7 @@
   }
   File {
     owner => 'root',
-    group => $apache::params::root_group,
+    group => $::apache::params::root_group,
     mode  => '0644',
   }
 
@@ -32,18 +32,18 @@
   # - $serverlimit
   # - $maxclients
   # - $maxrequestsperchild
-  file { "${apache::mod_dir}/prefork.conf":
+  file { "${::apache::mod_dir}/prefork.conf":
     ensure  => file,
     content => template('apache/mod/prefork.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 
   case $::osfamily {
     'redhat': {
       if $apache_version >= 2.4 {
-        apache::mpm{ 'prefork':
+        ::apache::mpm{ 'prefork':
           apache_version => $apache_version,
         }
       }
@@ -59,7 +59,7 @@
       }
     }
     'debian', 'freebsd' : {
-      apache::mpm{ 'prefork':
+      ::apache::mpm{ 'prefork':
         apache_version => $apache_version,
       }
     }
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index f916734304..b6c0d6df7c 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -2,14 +2,14 @@
   $proxy_requests = 'Off',
   $allow_from = undef,
 ) {
-  apache::mod { 'proxy': }
+  ::apache::mod { 'proxy': }
   # Template uses $proxy_requests
   file { 'proxy.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/proxy.conf",
+    path    => "${::apache::mod_dir}/proxy.conf",
     content => template('apache/mod/proxy.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/proxy_ajp.pp b/manifests/mod/proxy_ajp.pp
index b366cb1df6..a011a17895 100644
--- a/manifests/mod/proxy_ajp.pp
+++ b/manifests/mod/proxy_ajp.pp
@@ -1,4 +1,4 @@
 class apache::mod::proxy_ajp {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_ajp']
-  apache::mod { 'proxy_ajp': }
+  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_ajp']
+  ::apache::mod { 'proxy_ajp': }
 }
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index f31e5eaffc..5a0768d8d0 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -1,10 +1,10 @@
 class apache::mod::proxy_balancer {
 
-  include apache::mod::proxy
-  include apache::mod::proxy_http
+  include ::apache::mod::proxy
+  include ::apache::mod::proxy_http
 
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_balancer']
-  Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_balancer']
-  apache::mod { 'proxy_balancer': }
+  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_balancer']
+  Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_balancer']
+  ::apache::mod { 'proxy_balancer': }
 
 }
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 050b65d4fc..91d7bd3c8f 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -1,28 +1,28 @@
 class apache::mod::proxy_html {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_html']
-  Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_html']
-  apache::mod { 'proxy_html': }
+  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
+  Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
+  ::apache::mod { 'proxy_html': }
   case $::osfamily {
     'RedHat': {
-      apache::mod { 'xml2enc': }
+      ::apache::mod { 'xml2enc': }
     }
     'Debian': {
-      $proxy_html_loadfiles = $apache::params::distrelease ? {
+      $proxy_html_loadfiles = $::apache::params::distrelease ? {
         '6'     => '/usr/lib/libxml2.so.2',
         default => "/usr/lib/${::hardwaremodel}-linux-gnu/libxml2.so.2",
       }
     }
     'FreeBSD': {
-      apache::mod { 'xml2enc': }
+      ::apache::mod { 'xml2enc': }
     }
   }
   # Template uses $icons_path
   file { 'proxy_html.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/proxy_html.conf",
+    path    => "${::apache::mod_dir}/proxy_html.conf",
     content => template('apache/mod/proxy_html.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/proxy_http.pp b/manifests/mod/proxy_http.pp
index 5b83df2c59..1579e68ee2 100644
--- a/manifests/mod/proxy_http.pp
+++ b/manifests/mod/proxy_http.pp
@@ -1,4 +1,4 @@
 class apache::mod::proxy_http {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_http']
-  apache::mod { 'proxy_http': }
+  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_http']
+  ::apache::mod { 'proxy_http': }
 }
diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp
index 8158b7e8ad..e326c8d757 100644
--- a/manifests/mod/python.pp
+++ b/manifests/mod/python.pp
@@ -1,5 +1,5 @@
 class apache::mod::python {
-  apache::mod { 'python': }
+  ::apache::mod { 'python': }
 }
 
 
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index b763b37850..80b3018306 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -1,12 +1,12 @@
 class apache::mod::reqtimeout {
-  apache::mod { 'reqtimeout': }
+  ::apache::mod { 'reqtimeout': }
   # Template uses no variables
   file { 'reqtimeout.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/reqtimeout.conf",
+    path    => "${::apache::mod_dir}/reqtimeout.conf",
     content => template('apache/mod/reqtimeout.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/rewrite.pp b/manifests/mod/rewrite.pp
index 147faab998..694f0b6f5c 100644
--- a/manifests/mod/rewrite.pp
+++ b/manifests/mod/rewrite.pp
@@ -1,4 +1,4 @@
 class apache::mod::rewrite {
-  include apache::params
-  apache::mod { 'rewrite': }
+  include ::apache::params
+  ::apache::mod { 'rewrite': }
 }
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index 94dc31ccac..6fbc1d4e04 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -3,7 +3,7 @@
   $proxy_ips   = [ '127.0.0.1' ],
   $header      = 'X-Forwarded-For'
 ) {
-  apache::mod { 'rpaf': }
+  ::apache::mod { 'rpaf': }
 
   # Template uses:
   # - $sethostname
@@ -11,10 +11,10 @@
   # - $header
   file { 'rpaf.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/rpaf.conf",
+    path    => "${::apache::mod_dir}/rpaf.conf",
     content => template('apache/mod/rpaf.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/setenvif.pp b/manifests/mod/setenvif.pp
index 1b60edde8b..15b1441d83 100644
--- a/manifests/mod/setenvif.pp
+++ b/manifests/mod/setenvif.pp
@@ -1,12 +1,12 @@
 class apache::mod::setenvif {
-  apache::mod { 'setenvif': }
+  ::apache::mod { 'setenvif': }
   # Template uses no variables
   file { 'setenvif.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/setenvif.conf",
+    path    => "${::apache::mod_dir}/setenvif.conf",
     content => template('apache/mod/setenvif.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 323d092b28..7b20a9ba72 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,7 +1,7 @@
 class apache::mod::ssl (
   $ssl_compression = false,
   $ssl_options     = [ 'StdEnvVars' ],
-  $apache_version  = $apache::apache_version,
+  $apache_version  = $::apache::apache_version,
 ) {
   $session_cache = $::osfamily ? {
     'debian'  => '${APACHE_RUN_DIR}/ssl_scache(512000)',
@@ -28,10 +28,10 @@
     }
   }
 
-  apache::mod { 'ssl': }
+  ::apache::mod { 'ssl': }
 
   if $apache_version >= 2.4 {
-    apache::mod { 'socache_shmcb': }
+    ::apache::mod { 'socache_shmcb': }
   }
 
   # Template uses
@@ -44,10 +44,10 @@
   #
   file { 'ssl.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/ssl.conf",
+    path    => "${::apache::mod_dir}/ssl.conf",
     content => template('apache/mod/ssl.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index ed73b99fdb..fdaba4b07a 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -29,14 +29,14 @@
 ){
   validate_array($allow_from)
   validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
-  apache::mod { 'status': }
+  ::apache::mod { 'status': }
   # Template uses $allow_from, $extended_status
   file { 'status.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/status.conf",
+    path    => "${::apache::mod_dir}/status.conf",
     content => template('apache/mod/status.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index 26473cf2e5..f9a572f463 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -1,13 +1,13 @@
 class apache::mod::suphp (
 ){
-  apache::mod { 'suphp': }
+  ::apache::mod { 'suphp': }
 
   file {'suphp.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/suphp.conf",
+    path    => "${::apache::mod_dir}/suphp.conf",
     content => template('apache/mod/suphp.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd']
   }
 }
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 69f4044fd4..27af54c667 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -3,15 +3,15 @@
   $dir = 'public_html',
   $disable_root = true,
 ) {
-  apache::mod { 'userdir': }
+  ::apache::mod { 'userdir': }
 
   # Template uses $home, $dir, $disable_root
   file { 'userdir.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/userdir.conf",
+    path    => "${::apache::mod_dir}/userdir.conf",
     content => template('apache/mod/userdir.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/mod/vhost_alias.pp b/manifests/mod/vhost_alias.pp
index ec40447a35..30ae122e15 100644
--- a/manifests/mod/vhost_alias.pp
+++ b/manifests/mod/vhost_alias.pp
@@ -1,3 +1,3 @@
 class apache::mod::vhost_alias {
-  apache::mod { 'vhost_alias': }
+  ::apache::mod { 'vhost_alias': }
 }
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index ae259fa0ed..8007953cf8 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -6,7 +6,7 @@
   $threadsperchild     = '25',
   $maxrequestsperchild = '0',
   $serverlimit         = '25',
-  $apache_version      = $apache::apache_version,
+  $apache_version      = $::apache::apache_version,
 ) {
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::worker and apache::mod::event on the same node')
@@ -22,7 +22,7 @@
   }
   File {
     owner => 'root',
-    group => $apache::params::root_group,
+    group => $::apache::params::root_group,
     mode  => '0644',
   }
 
@@ -34,18 +34,18 @@
   # - $threadsperchild
   # - $maxrequestsperchild
   # - $serverlimit
-  file { "${apache::mod_dir}/worker.conf":
+  file { "${::apache::mod_dir}/worker.conf":
     ensure  => file,
     content => template('apache/mod/worker.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
 
   case $::osfamily {
     'redhat': {
       if $apache_version >= 2.4 {
-        apache::mpm{ 'worker':
+        ::apache::mpm{ 'worker':
           apache_version => $apache_version,
         }
       }
@@ -61,7 +61,7 @@
       }
     }
     'debian', 'freebsd': {
-      apache::mpm{ 'worker':
+      ::apache::mpm{ 'worker':
         apache_version => $apache_version,
       }
     }
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 0d42714091..244a3458b4 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -3,7 +3,7 @@
   $wsgi_python_path   = undef,
   $wsgi_python_home   = undef,
 ){
-  apache::mod { 'wsgi': }
+  ::apache::mod { 'wsgi': }
 
   # Template uses:
   # - $wsgi_socket_prefix
@@ -11,10 +11,10 @@
   # - $wsgi_python_home
   file {'wsgi.conf':
     ensure  => file,
-    path    => "${apache::mod_dir}/wsgi.conf",
+    path    => "${::apache::mod_dir}/wsgi.conf",
     content => template('apache/mod/wsgi.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
     notify  => Service['httpd']
   }
 }
diff --git a/manifests/mod/xsendfile.pp b/manifests/mod/xsendfile.pp
index 571501a03b..7c5e88437a 100644
--- a/manifests/mod/xsendfile.pp
+++ b/manifests/mod/xsendfile.pp
@@ -1,4 +1,4 @@
 class apache::mod::xsendfile {
-  include apache::params
-  apache::mod { 'xsendfile': }
+  include ::apache::params
+  ::apache::mod { 'xsendfile': }
 }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index fd6f764183..b6b2cfebe8 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -1,13 +1,13 @@
 define apache::mpm (
-  $lib_path       = $apache::params::lib_path,
-  $apache_version = $apache::apache_version,
+  $lib_path       = $::apache::params::lib_path,
+  $apache_version = $::apache::apache_version,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
   }
 
   $mpm     = $name
-  $mod_dir = $apache::mod_dir
+  $mod_dir = $::apache::mod_dir
 
   $_lib  = "mod_mpm_${mpm}.so"
   $_path = "${lib_path}/${_lib}"
@@ -29,20 +29,20 @@
 
   case $::osfamily {
     'debian': {
-      file { "${apache::mod_enable_dir}/${mpm}.conf":
+      file { "${::apache::mod_enable_dir}/${mpm}.conf":
         ensure  => link,
-        target  => "${apache::mod_dir}/${mpm}.conf",
-        require => Exec["mkdir ${apache::mod_enable_dir}"],
-        before  => File[$apache::mod_enable_dir],
+        target  => "${::apache::mod_dir}/${mpm}.conf",
+        require => Exec["mkdir ${::apache::mod_enable_dir}"],
+        before  => File[$::apache::mod_enable_dir],
         notify  => Service['httpd'],
       }
 
       if $apache_version >= 2.4 {
-        file { "${apache::mod_enable_dir}/${mpm}.load":
+        file { "${::apache::mod_enable_dir}/${mpm}.load":
           ensure  => link,
-          target  => "${apache::mod_dir}/${mpm}.load",
-          require => Exec["mkdir ${apache::mod_enable_dir}"],
-          before  => File[$apache::mod_enable_dir],
+          target  => "${::apache::mod_dir}/${mpm}.load",
+          require => Exec["mkdir ${::apache::mod_enable_dir}"],
+          before  => File[$::apache::mod_enable_dir],
           notify  => Service['httpd'],
         }
       }
@@ -54,7 +54,7 @@
       }
     }
     'freebsd': {
-      class { 'apache::package':
+      class { '::apache::package':
         mpm_module => $mpm
       }
     }
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index f5f0dad538..4fa8795185 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -3,7 +3,7 @@
 
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
-    target  => $apache::ports_file,
+    target  => $::apache::ports_file,
     content => template('apache/namevirtualhost.erb'),
   }
 }
diff --git a/manifests/package.pp b/manifests/package.pp
index b91e25f6b1..c5ef315366 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -1,6 +1,6 @@
 class apache::package (
   $ensure     = 'present',
-  $mpm_module = $apache::params::mpm_module,
+  $mpm_module = $::apache::params::mpm_module,
 ) {
   case $::osfamily {
     'freebsd' : {
@@ -37,7 +37,7 @@
       })
     }
     default: {
-      $apache_package = $apache::params::apache_name
+      $apache_package = $::apache::params::apache_name
     }
   }
   package { 'httpd':
diff --git a/manifests/params.pp b/manifests/params.pp
index 1f5f45b413..be6e331af8 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -18,7 +18,7 @@
 #
 # Sample Usage:
 #
-class apache::params inherits apache::version {
+class apache::params inherits ::apache::version {
   # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
   $osr_array = split($::operatingsystemrelease,'[\/\.]')
   $distrelease = $osr_array[0]
diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
index 260f1b5a3d..9e57ac30b2 100644
--- a/manifests/peruser/multiplexer.pp
+++ b/manifests/peruser/multiplexer.pp
@@ -1,6 +1,6 @@
 define apache::peruser::multiplexer (
-  $user = $apache::user,
-  $group = $apache::group,
+  $user = $::apache::user,
+  $group = $::apache::group,
   $file = undef,
 ) {
   if ! $file {
@@ -8,10 +8,10 @@
   } else {
     $filename = $file
   }
-  file { "${apache::mod_dir}/peruser/multiplexers/${filename}":
+  file { "${::apache::mod_dir}/peruser/multiplexers/${filename}":
     ensure  => file,
     content => "Multiplexer ${user} ${group}\n",
-    require => File["${apache::mod_dir}/peruser/multiplexers"],
+    require => File["${::apache::mod_dir}/peruser/multiplexers"],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/peruser/processor.pp b/manifests/peruser/processor.pp
index c677cd6ca1..1d68934657 100644
--- a/manifests/peruser/processor.pp
+++ b/manifests/peruser/processor.pp
@@ -8,10 +8,10 @@
   } else {
     $filename = $file
   }
-  file { "${apache::mod_dir}/peruser/processors/${filename}":
+  file { "${::apache::mod_dir}/peruser/processors/${filename}":
     ensure  => file,
     content => "Processor ${user} ${group}\n",
-    require => File["${apache::mod_dir}/peruser/processors"],
+    require => File["${::apache::mod_dir}/peruser/processors"],
     notify  => Service['httpd'],
   }
 }
diff --git a/manifests/php.pp b/manifests/php.pp
index feb903e7be..9fa9c682e2 100644
--- a/manifests/php.pp
+++ b/manifests/php.pp
@@ -14,5 +14,5 @@
 #
 class apache::php {
   warning('apache::php is deprecated; please use apache::mod::php')
-  include apache::mod::php
+  include ::apache::mod::php
 }
diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index 0f4fde540b..050f36c278 100644
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -11,5 +11,5 @@
 #
 class apache::proxy {
   warning('apache::proxy is deprecated; please use apache::mod::proxy')
-  include apache::mod::proxy
+  include ::apache::mod::proxy
 }
diff --git a/manifests/python.pp b/manifests/python.pp
index 99ef289872..723a753f82 100644
--- a/manifests/python.pp
+++ b/manifests/python.pp
@@ -14,5 +14,5 @@
 #
 class apache::python {
   warning('apache::python is deprecated; please use apache::mod::python')
-  include apache::mod::python
+  include ::apache::mod::python
 }
diff --git a/manifests/service.pp b/manifests/service.pp
index 82a0b8ca61..b21a25f4b7 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -17,7 +17,7 @@
 #
 #
 class apache::service (
-  $service_name   = $apache::params::service_name,
+  $service_name   = $::apache::params::service_name,
   $service_enable = true,
   $service_ensure = 'running',
 ) {
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index 21662e1685..d0b36593d6 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -14,5 +14,5 @@
 #
 class apache::ssl {
   warning('apache::ssl is deprecated; please use apache::mod::ssl')
-  include apache::mod::ssl
+  include ::apache::mod::ssl
 }
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 77c340ace9..8525235e9d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -93,16 +93,16 @@
     $ip_based                    = false,
     $add_listen                  = true,
     $docroot_owner               = 'root',
-    $docroot_group               = $apache::params::root_group,
+    $docroot_group               = $::apache::params::root_group,
     $serveradmin                 = undef,
     $ssl                         = false,
-    $ssl_cert                    = $apache::default_ssl_cert,
-    $ssl_key                     = $apache::default_ssl_key,
-    $ssl_chain                   = $apache::default_ssl_chain,
-    $ssl_ca                      = $apache::default_ssl_ca,
-    $ssl_crl_path                = $apache::default_ssl_crl_path,
-    $ssl_crl                     = $apache::default_ssl_crl,
-    $ssl_certs_dir               = $apache::params::ssl_certs_dir,
+    $ssl_cert                    = $::apache::default_ssl_cert,
+    $ssl_key                     = $::apache::default_ssl_key,
+    $ssl_chain                   = $::apache::default_ssl_chain,
+    $ssl_ca                      = $::apache::default_ssl_ca,
+    $ssl_crl_path                = $::apache::default_ssl_crl_path,
+    $ssl_crl                     = $::apache::default_ssl_crl,
+    $ssl_certs_dir               = $::apache::params::ssl_certs_dir,
     $ssl_protocol                = undef,
     $ssl_cipher                  = undef,
     $ssl_honorcipherorder        = undef,
@@ -118,7 +118,7 @@
     $override                    = ['None'],
     $directoryindex              = '',
     $vhost_name                  = '*',
-    $logroot                     = $apache::logroot,
+    $logroot                     = $::apache::logroot,
     $log_level                   = undef,
     $access_log                  = true,
     $access_log_file             = undef,
@@ -138,9 +138,9 @@
     $scriptaliases               = [],
     $proxy_dest                  = undef,
     $proxy_pass                  = undef,
-    $suphp_addhandler            = $apache::params::suphp_addhandler,
-    $suphp_engine                = $apache::params::suphp_engine,
-    $suphp_configpath            = $apache::params::suphp_configpath,
+    $suphp_addhandler            = $::apache::params::suphp_addhandler,
+    $suphp_engine                = $::apache::params::suphp_engine,
+    $suphp_configpath            = $::apache::params::suphp_configpath,
     $php_admin_flags             = [],
     $php_admin_values            = [],
     $no_proxy_uris               = [],
@@ -173,14 +173,14 @@
     $fastcgi_socket              = undef,
     $fastcgi_dir                 = undef,
     $additional_includes         = [],
-    $apache_version              = $apache::apache_version
+    $apache_version              = $::apache::apache_version
   ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
   }
 
-  $apache_name = $apache::params::apache_name
+  $apache_name = $::apache::params::apache_name
 
   validate_re($ensure, '^(present|absent)$',
   "${ensure} is not supported for ensure.
@@ -241,13 +241,13 @@
   }
 
   if $ssl and $ensure == 'present' {
-    include apache::mod::ssl
+    include ::apache::mod::ssl
     # Required for the AddType lines.
-    include apache::mod::mime
+    include ::apache::mod::mime
   }
 
   if $virtual_docroot {
-    include apache::mod::vhost_alias
+    include ::apache::mod::vhost_alias
   }
 
   # This ensures that the docroot exists
@@ -339,50 +339,50 @@
       fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
     }
     if ! defined(Apache::Listen[$listen_addr_port]) and $listen_addr_port and $ensure == 'present' {
-      apache::listen { $listen_addr_port: }
+      ::apache::listen { $listen_addr_port: }
     }
   }
   if ! $ip_based {
     if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' {
-      apache::namevirtualhost { $nvh_addr_port: }
+      ::apache::namevirtualhost { $nvh_addr_port: }
     }
   }
 
   # Load mod_rewrite if needed and not yet loaded
   if $rewrites or $rewrite_cond {
     if ! defined(Apache::Mod['rewrite']) {
-      apache::mod { 'rewrite': }
+      ::apache::mod { 'rewrite': }
     }
   }
 
   # Load mod_alias if needed and not yet loaded
   if ($scriptalias or $scriptaliases != []) or ($redirect_source and $redirect_dest) {
     if ! defined(Class['apache::mod::alias']) {
-      include apache::mod::alias
+      include ::apache::mod::alias
     }
   }
 
   # Load mod_proxy if needed and not yet loaded
   if ($proxy_dest or $proxy_pass) {
     if ! defined(Class['apache::mod::proxy']) {
-      include apache::mod::proxy
+      include ::apache::mod::proxy
     }
     if ! defined(Class['apache::mod::proxy_http']) {
-      include apache::mod::proxy_http
+      include ::apache::mod::proxy_http
     }
   }
 
   # Load mod_passenger if needed and not yet loaded
   if $rack_base_uris {
     if ! defined(Class['apache::mod::passenger']) {
-      include apache::mod::passenger
+      include ::apache::mod::passenger
     }
   }
 
   # Load mod_fastci if needed and not yet loaded
   if $fastcgi_server and $fastcgi_socket {
     if ! defined(Class['apache::mod::fastcgi']) {
-      include apache::mod::fastcgi
+      include ::apache::mod::fastcgi
     }
   }
 
@@ -398,7 +398,7 @@
   # Check if mod_headers is required to process $headers/$request_headers
   if $headers or $request_headers {
     if ! defined(Class['apache::mod::headers']) {
-      include apache::mod::headers
+      include ::apache::mod::headers
     }
   }
 
@@ -516,10 +516,10 @@
   #   - $wsgi_script_aliases
   file { "${priority_real}-${filename}.conf":
     ensure  => $ensure,
-    path    => "${apache::vhost_dir}/${priority_real}-${filename}.conf",
+    path    => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
     content => template('apache/vhost.conf.erb'),
     owner   => 'root',
-    group   => $apache::params::root_group,
+    group   => $::apache::params::root_group,
     mode    => '0644',
     require => [
       Package['httpd'],
@@ -529,7 +529,7 @@
     notify  => Service['httpd'],
   }
   if $::osfamily == 'Debian' {
-    $vhost_enable_dir = $apache::vhost_enable_dir
+    $vhost_enable_dir = $::apache::vhost_enable_dir
     $vhost_symlink_ensure = $ensure ? {
       present => link,
       default => $ensure,
@@ -537,9 +537,9 @@
     file{ "${priority_real}-${filename}.conf symlink":
       ensure  => $vhost_symlink_ensure,
       path    => "${vhost_enable_dir}/${priority_real}-${filename}.conf",
-      target  => "${apache::vhost_dir}/${priority_real}-${filename}.conf",
+      target  => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
       owner   => 'root',
-      group   => $apache::params::root_group,
+      group   => $::apache::params::root_group,
       mode    => '0644',
       require => File["${priority_real}-${filename}.conf"],
       notify  => Service['httpd'],

From 769ff363a8a3c51e24f63a2494217d2d029289c6 Mon Sep 17 00:00:00 2001
From: jrnt30 <justin.r.nauman+github@gmail.com>
Date: Wed, 26 Feb 2014 17:05:11 -0600
Subject: [PATCH 0164/2267] Modifying hierarchy of the Version/Params to allow
 for proper parsing of release on Amazon Linux

---
 manifests/params.pp  |  7 -------
 manifests/version.pp | 11 +++++++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index be6e331af8..04c3b65fe5 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -19,13 +19,6 @@
 # Sample Usage:
 #
 class apache::params inherits ::apache::version {
-  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
-  $osr_array = split($::operatingsystemrelease,'[\/\.]')
-  $distrelease = $osr_array[0]
-  if ! $distrelease {
-    fail("Class['apache::params']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
-  }
-
   if($::fqdn) {
     $servername = $::fqdn
   } else {
diff --git a/manifests/version.pp b/manifests/version.pp
index 4ed960df18..581fdde6fe 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -3,16 +3,23 @@
 # Try to automatically detect the version by OS
 #
 class apache::version {
+  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
+  $osr_array = split($::operatingsystemrelease,'[\/\.]')
+  $distrelease = $osr_array[0]
+  if ! $distrelease {
+    fail("Class['apache::params']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
+  }
+  
   case $::osfamily {
     'RedHat': {
-      if ($::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18) or ($::operatingsystem != 'Fedora' and $::operatingsystemrelease >= 7) {
+      if ($::operatingsystem == 'Fedora' and $distrelease >= 18) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
         $default = 2.4
       } else {
         $default = 2.2
       }
     }
     'Debian': {
-      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
+      if $::operatingsystem == 'Ubuntu' and $distrelease >= 13.10 {
         $default = 2.4
       } else {
         $default = 2.2

From eef1ea1ee5714eb4ed8729fef9efa0f3e530cfc0 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 28 Feb 2014 09:45:27 -0800
Subject: [PATCH 0165/2267] Correct the tests for aix

---
 spec/acceptance/default_mods_spec.rb |  2 --
 spec/acceptance/version.rb           |  2 ++
 spec/acceptance/vhost_spec.rb        |  2 +-
 spec/spec_helper_acceptance.rb       | 21 ++++++++++++---------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 03e1445601..2b8b409e35 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -7,8 +7,6 @@
   servicename = 'apache2'
 when 'FreeBSD'
   servicename = 'apache22'
-else
-  raise "Unconfigured OS for apache service on #{fact('osfamily')}"
 end
 
 describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index 169054ec21..a3b80c1730 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -51,5 +51,7 @@
   $error_log        = 'http-error.log'
 
   $apache_version = 2.2
+else
+  $apache_version = 0
 end
 
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index f6749d35a1..b5c07290a7 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -880,7 +880,7 @@ class { 'apache::mod::wsgi': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    it 'import_script applies cleanly', :unless => fact('lsbcodename') == 'lucid' do
+    it 'import_script applies cleanly', :unless => (fact('lsbcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
       pp = <<-EOS
         class { 'apache': }
         class { 'apache::mod::wsgi': }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 7d334ae9bd..8e4115128d 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,15 +1,18 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 
-hosts.each do |host|
-  if host['platform'] =~ /debian/
-    on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-  end
-  if host.is_pe?
-    install_pe
-  else
-    install_puppet
-    on host, "mkdir -p #{host['distmoduledir']}"
+
+unless ENV['RS_PROVISION'] == 'no'
+  hosts.each do |host|
+    if host['platform'] =~ /debian/
+      on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
+    end
+    if host.is_pe?
+      install_pe
+    else
+      install_puppet
+      on host, "mkdir -p #{host['distmoduledir']}"
+    end
   end
 end
 

From 655d8dc601d939754e022120c3ec7048f345181d Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 28 Feb 2014 16:28:23 +0000
Subject: [PATCH 0166/2267] Block out WSGI tests for Ubuntu 10.

---
 README.md                     | 6 ++++++
 spec/acceptance/vhost_spec.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fd21507cdc..ddba31de03 100644
--- a/README.md
+++ b/README.md
@@ -1718,6 +1718,12 @@ The Apache module relies heavily on templates to enable the `vhost` and `apache:
 
 ##Limitations
 
+###Ubuntu 10.04
+
+The `apache::vhost::WSGIImportScript` parameter creates a statement inside the VirtualHost which is unsupported on older versions of Apache, causing this to fail.  This will be remedied in a future refactoring.
+
+###General
+
 This module is CI tested on Centos 5 & 6, Ubuntu 12.04, Debian 7, and RHEL 5 & 6 platforms against both the OSS and Enterprise version of Puppet. 
 
 The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions may occur.
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index b5c07290a7..e715e28ee4 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -899,7 +899,7 @@ class { 'apache::mod::wsgi': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
       it { should be_file }
       it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
       it { should contain 'WSGIDaemonProcess wsgi processes=2' }

From 6f45b714b28e44ffb45d990f581c3c928e8d3af2 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Sat, 1 Mar 2014 00:06:58 +0000
Subject: [PATCH 0167/2267] Correct the name of this fact.

---
 spec/acceptance/vhost_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e715e28ee4..547612e73f 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -880,7 +880,7 @@ class { 'apache::mod::wsgi': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    it 'import_script applies cleanly', :unless => (fact('lsbcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
+    it 'import_script applies cleanly', :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
       pp = <<-EOS
         class { 'apache': }
         class { 'apache::mod::wsgi': }
@@ -899,7 +899,7 @@ class { 'apache::mod::wsgi': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
+    describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
       it { should be_file }
       it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
       it { should contain 'WSGIDaemonProcess wsgi processes=2' }

From 416d4fc381fd4d615b23b8736770fb7872cf9590 Mon Sep 17 00:00:00 2001
From: Lauren Rother <lauren.rother@puppetlabs.com>
Date: Sat, 1 Mar 2014 12:51:18 -0800
Subject: [PATCH 0168/2267] Adds "Release Notes/Known Bugs" to Changelog,
 updates file format to markdown, standardizes the format of previous entries

Per a request to have initial release notes that specifically listed known issues for this PE 3.2 release, and barred by time constraints from automating a pull from open issues in JIRA, this commit adds a Release Note and Known Bug section to the Changelog for the imminent 3.2 release. As it will display on the Forge, updates file type to markdown and standardizes previous entries. Adds template for release notes to be filled in later.
---
 CHANGELOG.md | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57d62e4c19..ddeed5285e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,27 @@
+## 2014-03-04 Supported Release 1.0.x
+###Summary
+
+####Features
+
+####Bugfixes
+
+####Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+---
+
 ## 2014-01-31 Release 0.11.0
 ### Summary:
 
 This release adds preliminary support for Windows compatibility and multiple rewrite support.
 
-### Backwards-incompatible Changes:
+#### Backwards-incompatible Changes:
 
 - The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
   and will be removed in a future release.
 
-### Features:
+#### Features:
 
 - add Match directive
 - quote paths for windows compatibility
@@ -25,7 +38,7 @@ This release adds preliminary support for Windows compatibility and multiple rew
 - Convert spec tests to beaker.
 - Support php_admin_(flag|value)s
 
-### Bugfixes:
+#### Bugfixes:
 
 - directories are either a Hash or an Array of Hashes
 - Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
@@ -40,7 +53,7 @@ This release adds preliminary support for Windows compatibility and multiple rew
 
 This release adds FreeBSD osfamily support and various other improvements to some mods.
 
-### Features:
+#### Features:
 
 - Add suPHP_UserGroup directive to directory context
 - Add support for ScriptAliasMatch directives
@@ -68,7 +81,7 @@ This release adds FreeBSD osfamily support and various other improvements to som
 - Add documentation about $ip
 - Add ability to pass ip (instead of wildcard) in default vhost files
 
-### Bugfixes:
+#### Bugfixes:
 
 - Don't listen on port or set NameVirtualHost for non-existent vhost
 - only apply Directory defaults when provider is a directory
@@ -80,7 +93,7 @@ This release adds more parameters to the base apache class and apache defined
 resource to make the module more flexible. It also adds or enhances SuPHP,
 WSGI, and Passenger mod support, and support for the ITK mpm module.
 
-### Backwards-incompatible Changes:
+#### Backwards-incompatible Changes:
 - Remove many default mods that are not normally needed.
 - Remove `rewrite_base` `apache::vhost` parameter; did not work anyway.
 - Specify dependencies on stdlib >=2.4.0 (this was already the case, but
@@ -88,7 +101,7 @@ making explicit)
 - Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod`
 defined resource.
 
-### Features:
+#### Features:
 - `apache` class
   - Add `httpd_dir` parameter to change the location of the configuration
   files.
@@ -123,7 +136,7 @@ dependency chaining of `Class['apache'] -> <resource> ~>
 Class['apache::service']`
 - Added `apache::mod::proxy_balancer` class for `apache::balancer`
 
-### Bugfixes:
+#### Bugfixes:
 - Change dependency to puppetlabs-concat
 - Fix ruby 1.9 bug for `a2mod`
 - Change servername to be `$::hostname` if there is no `$::fqdn`
@@ -133,17 +146,17 @@ Class['apache::service']`
 array.
 
 ## 2013-07-26 Release 0.8.1
-### Bugfixes:
+#### Bugfixes:
 - Update `apache::mpm_module` detection for worker/prefork
 - Update `apache::mod::cgi` and `apache::mod::cgid` detection for
 worker/prefork
 
 ## 2013-07-16 Release 0.8.0
-### Features:
+#### Features:
 - Add `servername` parameter to `apache` class
 - Add `proxy_set` parameter to `apache::balancer` define
 
-### Bugfixes:
+#### Bugfixes:
 - Fix ordering for multiple `apache::balancer` clusters
 - Fix symlinking for sites-available on Debian-based OSs
 - Fix dependency ordering for recursive confdir management
@@ -151,13 +164,13 @@ worker/prefork
 - Documentation updates
 
 ## 2013-07-09 Release 0.7.0
-### Changes:
+#### Changes:
 - Essentially rewrite the module -- too many to list
 - `apache::vhost` has many abilities -- see README.md for details
 - `apache::mod::*` classes provide httpd mod-loading capabilities
 - `apache` base class is much more configurable
 
-### Bugfixes:
+#### Bugfixes:
 - Many. And many more to come
 
 ## 2013-03-2 Release 0.6.0
@@ -166,10 +179,10 @@ worker/prefork
 - make purging of vhost dir configurable
 
 ## 2012-08-24 Release 0.4.0
-### Changes:
+#### Changes:
 - `include apache` is now required when using `apache::mod::*`
 
-### Bugfixes:
+#### Bugfixes:
 - Fix syntax for validate_re
 - Fix formatting in vhost template
 - Fix spec tests such that they pass

From 736382c3d04932af8ebdcafdadcd020275b961c7 Mon Sep 17 00:00:00 2001
From: Adam Malone <adam@adammalone.net>
Date: Mon, 27 Jan 2014 16:35:24 +1100
Subject: [PATCH 0169/2267] Allows for the configuration of mod_actions,
 specifically the action type triggered by the request.

---
 README.md                        |  1 +
 manifests/default_mods.pp        |  4 ++--
 manifests/mod/actions.pp         |  3 +++
 manifests/vhost.pp               |  1 +
 spec/acceptance/vhost_spec.rb    | 19 +++++++++++++++++++
 spec/defines/vhost_spec.rb       | 13 ++++++++++++-
 templates/vhost.conf.erb         |  1 +
 templates/vhost/_action.erb      |  4 ++++
 templates/vhost/_scriptalias.erb |  2 +-
 9 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 manifests/mod/actions.pp
 create mode 100644 templates/vhost/_action.erb

diff --git a/README.md b/README.md
index fd21507cdc..353120e3ca 100644
--- a/README.md
+++ b/README.md
@@ -413,6 +413,7 @@ Used to enable arbitrary Apache HTTPD modules for which there is no specific `ap
 
 There are many `apache::mod::[name]` classes within this module that can be declared using `include`:
 
+* `actions`
 * `alias`
 * `auth_basic`
 * `auth_kerb`
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 139503e3c5..af98896216 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -21,12 +21,12 @@
         include ::apache::mod::reqtimeout
       }
       'redhat': {
+        include ::apache::mod::actions
         include ::apache::mod::cache
         include ::apache::mod::mime
         include ::apache::mod::mime_magic
         include ::apache::mod::vhost_alias
         include ::apache::mod::rewrite
-        ::apache::mod { 'actions': }
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
         ::apache::mod { 'authn_dbm': }
@@ -55,6 +55,7 @@
         }
       }
       'freebsd': {
+        include ::apache::mod::actions
         include ::apache::mod::cache
         include ::apache::mod::disk_cache
         include ::apache::mod::headers
@@ -65,7 +66,6 @@
         include ::apache::mod::userdir
         include ::apache::mod::vhost_alias
 
-        ::apache::mod { 'actions': }
         ::apache::mod { 'asis': }
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_alias': }
diff --git a/manifests/mod/actions.pp b/manifests/mod/actions.pp
new file mode 100644
index 0000000000..3b60f297fd
--- /dev/null
+++ b/manifests/mod/actions.pp
@@ -0,0 +1,3 @@
+class apache::mod::actions {
+  apache::mod { 'actions': }
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8525235e9d..5d61b267a6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -169,6 +169,7 @@
     $wsgi_script_aliases         = undef,
     $custom_fragment             = undef,
     $itk                         = undef,
+    $action                      = undef,
     $fastcgi_server              = undef,
     $fastcgi_socket              = undef,
     $fastcgi_dir                 = undef,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index f6749d35a1..d3133e0a3d 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -682,6 +682,25 @@ class { 'apache': service_ensure => stopped, }
     end
   end
 
+  describe 'actions' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+	  action => 'php-fastcgi',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'Action php-fastcgi /cgi-bin virtual' }
+    end
+  end
+
   describe 'suphp' do
     it 'applies cleanly' do
       pp = <<-EOS
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 46e6fd3950..b16ce88404 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -269,7 +269,7 @@
           :attr  => 'scriptalias',
           :value => '/usr/scripts',
           :match => [
-            /^  ScriptAlias \/cgi-bin\/ "\/usr\/scripts"$/,
+            /^  ScriptAlias \/cgi-bin "\/usr\/scripts"$/,
           ],
         },
         {
@@ -1179,6 +1179,17 @@
         end
       end
 
+      describe 'when action is specified specified' do
+        let :params do default_params.merge({
+          :action => 'php-fastcgi',
+        }) end
+        it 'should set Action' do
+          should contain_file("25-#{title}.conf").with_content(
+            /^  Action php-fastcgi \/cgi-bin virtual$/
+          )
+        end
+      end
+
       describe 'when suphp_engine is on and suphp_configpath is specified' do
         let :params do default_params.merge({
           :suphp_engine     => 'on',
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 0eb69b0096..673ea0c2bd 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -44,6 +44,7 @@
 <% elsif @access_log -%>
   CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %>
 <% end -%>
+<%= scope.function_template(['apache/vhost/_action.erb']) -%>
 <%= scope.function_template(['apache/vhost/_block.erb']) -%>
 <%= scope.function_template(['apache/vhost/_error_document.erb']) -%>
 <%= scope.function_template(['apache/vhost/_proxy.erb']) -%>
diff --git a/templates/vhost/_action.erb b/templates/vhost/_action.erb
new file mode 100644
index 0000000000..8a02290595
--- /dev/null
+++ b/templates/vhost/_action.erb
@@ -0,0 +1,4 @@
+<% if @action -%>
+
+  Action <%= @action %> /cgi-bin virtual
+<% end -%>
diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index 5a757f6170..bb4f6b316e 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -10,7 +10,7 @@
   ## Script alias directives
 <%# Combine scriptalais and scriptaliases into a single data structure -%>
 <%# for backward compatibility and ease of implementation -%>
-<%- aliases << { 'alias' => '/cgi-bin/', 'path' => @scriptalias } if @scriptalias -%>
+<%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%>
 <%- aliases.flatten.compact! -%>
 <%- aliases.each do |salias| -%>
   <%- if salias["path"] != '' -%>

From c39c04dbf8fce9531f2a8090d34ee7406bb73fb7 Mon Sep 17 00:00:00 2001
From: Lauren Rother <lauren.rother@puppetlabs.com>
Date: Sun, 2 Mar 2014 09:12:57 -0800
Subject: [PATCH 0170/2267] Cleans up first entry formatting in changelog

Somehow I just totally missed that the very first changelog entry wasn't formatted at all.
---
 CHANGELOG.md | 66 ++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddeed5285e..2c7ee39e77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -187,36 +187,36 @@ worker/prefork
 - Fix formatting in vhost template
 - Fix spec tests such that they pass
 
-    2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
-    e62e362 Fix broken tests for ssl, vhost, vhost::*
-    42c6363 Changes to match style guide and pass puppet-lint without error
-    42bc8ba changed name => path for file resources in order to name namevar by it's name
-    72e13de One end too much
-    0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
-    273f94d fix tests
-    a35ede5 (#13860) Make a2enmod/a2dismo commands optional
-    98d774e (#13860) Autorequire Package['httpd']
-    05fcec5 (#13073) Add missing puppet spec tests
-    541afda (#6899) Remove virtual a2mod definition
-    976cb69 (#13072) Move mod python and wsgi package names to params
-    323915a (#13060) Add .gitignore to repo
-    fdf40af (#13060) Remove pkg directory from source tree
-    fd90015 Add LICENSE file and update the ModuleFile
-    d3d0d23 Re-enable local php class
-    d7516c7 Make management of firewalls configurable for vhosts
-    60f83ba Explicitly lookup scope of apache_name in templates.
-    f4d287f (#12581) Add explicit ordering for vdir directory
-    88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
-    a776a8b (#11071) Fix to work with latest firewall module
-    2b79e8b (#11070) Add support for Scientific Linux
-    405b3e9 Fix for a2mod
-    57b9048 Commit apache::vhost::redirect Manifest
-    8862d01 Commit apache::vhost::proxy Manifest
-    d5c1fd0 Commit apache::mod::wsgi Manifest
-    a825ac7 Commit apache::mod::python Manifest
-    b77062f Commit Templates
-    9a51b4a Vhost File Declarations
-    6cf7312 Defaults for Parameters
-    6a5b11a Ensure installed
-    f672e46 a2mod fix
-    8a56ee9 add pthon support to apache
+##2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
+* e62e362 Fix broken tests for ssl, vhost, vhost::*
+* 42c6363 Changes to match style guide and pass puppet-lint without error
+* 42bc8ba changed name => path for file resources in order to name namevar by it's name
+* 72e13de One end too much
+* 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
+* 273f94d fix tests
+* a35ede5 (#13860) Make a2enmod/a2dismo commands optional
+* 98d774e (#13860) Autorequire Package['httpd']
+* 05fcec5 (#13073) Add missing puppet spec tests
+* 541afda (#6899) Remove virtual a2mod definition
+* 976cb69 (#13072) Move mod python and wsgi package names to params
+* 323915a (#13060) Add .gitignore to repo
+* fdf40af (#13060) Remove pkg directory from source tree
+* fd90015 Add LICENSE file and update the ModuleFile
+* d3d0d23 Re-enable local php class
+* d7516c7 Make management of firewalls configurable for vhosts
+* 60f83ba Explicitly lookup scope of apache_name in templates.
+* f4d287f (#12581) Add explicit ordering for vdir directory
+* 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
+* a776a8b (#11071) Fix to work with latest firewall module
+* 2b79e8b (#11070) Add support for Scientific Linux
+* 405b3e9 Fix for a2mod
+* 57b9048 Commit apache::vhost::redirect Manifest
+* 8862d01 Commit apache::vhost::proxy Manifest
+* d5c1fd0 Commit apache::mod::wsgi Manifest
+* a825ac7 Commit apache::mod::python Manifest
+* b77062f Commit Templates
+* 9a51b4a Vhost File Declarations
+* 6cf7312 Defaults for Parameters
+* 6a5b11a Ensure installed
+* f672e46 a2mod fix
+* 8a56ee9 add pthon support to apache
\ No newline at end of file

From b4153791317f895d64fcbe5bd4102156246548e7 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Mon, 3 Mar 2014 11:56:31 -0500
Subject: [PATCH 0171/2267] Add metadata for supported modules.

---
 metadata.json | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 metadata.json

diff --git a/metadata.json b/metadata.json
new file mode 100644
index 0000000000..2bfd442979
--- /dev/null
+++ b/metadata.json
@@ -0,0 +1,50 @@
+{
+    "operatingsystem_support": [
+      {
+        "operatingsystem": "RedHat",
+        "operatingsystemrelease": [
+          "5",
+          "6"
+        ]
+      },
+      {
+        "operatingsystem": "CentOS",
+        "operatingsystemrelease": [
+          "5",
+          "6"
+        ]
+      },
+      {
+        "operatingsystem": "OracleLinux",
+        "operatingsystemrelease": [
+          "5",
+          "6"
+        ]
+      },
+      {
+        "operatingsystem": "Scientific",
+        "operatingsystemrelease": [
+          "5",
+          "6"
+        ]
+      },
+      {
+        "operatingsystem": "Debian",
+        "operatingsystemrelease": [
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "Ubuntu",
+        "operatingsystemrelease": [
+          "10.04",
+          "12.04"
+        ]
+      }
+    ],
+    "requirements": [
+      { "name": "pe", "version_requirement": "3.2.x" },
+      { "name": "puppet", "version_requirement": "3.x" }
+    ]
+}

From eba8df9a630ddcdc68baa4fcbd84122e234eaad3 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Mon, 3 Mar 2014 19:14:26 +0000
Subject: [PATCH 0172/2267] Prepare supported module release 1.0.0.

---
 CHANGELOG.md | 15 +++++++++++++--
 Modulefile   |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c7ee39e77..74622ba84e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,21 @@
-## 2014-03-04 Supported Release 1.0.x
+## 2014-03-04 Supported Release 1.0.0
 ###Summary
 
+This is a supported release. This release introduces Apache 2.4 support for
+Debian and RHEL based osfamilies.
+
 ####Features
 
+- Add apache24 support
+- Add rewrite_base functionality to rewrites
+- Updated README documentation
+- Add WSGIApplicationGroup and WSGIImportScript directives
+
 ####Bugfixes
 
+- Replace mutating hashes with merge() for Puppet 3.5
+- Fix WSGI import_script and mod_ssl issues on Lucid
+
 ####Known Bugs
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
 * SLES is unsupported.
@@ -219,4 +230,4 @@ worker/prefork
 * 6cf7312 Defaults for Parameters
 * 6a5b11a Ensure installed
 * f672e46 a2mod fix
-* 8a56ee9 add pthon support to apache
\ No newline at end of file
+* 8a56ee9 add pthon support to apache
diff --git a/Modulefile b/Modulefile
index 1a1db1427f..1bee8e4ce5 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-apache'
-version '0.11.0'
+version '1.0.0'
 source 'git://github.com/puppetlabs/puppetlabs-apache.git'
 author 'puppetlabs'
 license 'Apache 2.0'

From 67d284a05d39076faedd4897a529c148a82f33c8 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Mon, 3 Mar 2014 21:41:38 +0000
Subject: [PATCH 0173/2267] Add in missing fields to work around a Puppet bug.

---
 metadata.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 2bfd442979..e5a6ae0eb3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,4 +1,11 @@
 {
+    "name": "puppetlabs-apache",
+    "version": "1.0.0",
+    "source": "https://github.com/puppetlabs/puppetlabs-apache",
+    "author": "Puppet Labs",
+    "license": "Apache-2.0",
+    "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
+    "summary": "Puppet module for Apache",
     "operatingsystem_support": [
       {
         "operatingsystem": "RedHat",
@@ -46,5 +53,6 @@
     "requirements": [
       { "name": "pe", "version_requirement": "3.2.x" },
       { "name": "puppet", "version_requirement": "3.x" }
-    ]
+    ],
+    "dependencies": []
 }

From efffa854f8ceed8c3b4094903df1619795eb5f95 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>
Date: Tue, 4 Mar 2014 12:49:26 +0100
Subject: [PATCH 0174/2267] Include mod wsgi when wsgi_daemon_process is given

---
 manifests/vhost.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5d61b267a6..b6c75dc51e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -251,6 +251,10 @@
     include ::apache::mod::vhost_alias
   }
 
+  if $wsgi_daemon_process {
+    include ::apache::mod::wsgi
+  }
+
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
   if ! defined(File[$docroot]) {

From 2ec128f0f63e49c74ebb87a6b41cfc2bda637614 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 4 Mar 2014 16:26:54 +0000
Subject: [PATCH 0175/2267] Replace the symlink with the actual file to resolve
 a PMT issue.

---
 spec/acceptance/nodesets/default.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 spec/acceptance/nodesets/default.yml

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 120000
index 2719644a6e..0000000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1 +0,0 @@
-centos-64-x64.yml
\ No newline at end of file
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
new file mode 100644
index 0000000000..ce47212a8c
--- /dev/null
+++ b/spec/acceptance/nodesets/default.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git

From 701f7113c322332fc48efdf61d27b57d7df9b80e Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 4 Mar 2014 16:30:21 +0000
Subject: [PATCH 0176/2267] Prepare a 1.0.1 supported release.

---
 CHANGELOG.md  | 13 +++++++++++++
 Modulefile    |  2 +-
 metadata.json |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74622ba84e..26e8d75d4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 2014-03-04 Supported Release 1.0.1
+###Summary
+
+This is a supported release.  This release removes a testing symlink that can
+cause trouble on systems where /var is on a seperate filesystem from the
+modulepath.
+
+####Features
+####Bugfixes
+####Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+ 
 ## 2014-03-04 Supported Release 1.0.0
 ###Summary
 
diff --git a/Modulefile b/Modulefile
index 1bee8e4ce5..227947cbba 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-apache'
-version '1.0.0'
+version '1.0.1'
 source 'git://github.com/puppetlabs/puppetlabs-apache.git'
 author 'puppetlabs'
 license 'Apache 2.0'
diff --git a/metadata.json b/metadata.json
index e5a6ae0eb3..58ef979304 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "puppetlabs-apache",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "source": "https://github.com/puppetlabs/puppetlabs-apache",
     "author": "Puppet Labs",
     "license": "Apache-2.0",

From e00f2783288eeaaff90f37122cbd5a8675173c94 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 5 Mar 2014 09:04:29 -0800
Subject: [PATCH 0177/2267] Remove PE support for master

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 58ef979304..26a14ae42a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -51,7 +51,6 @@
       }
     ],
     "requirements": [
-      { "name": "pe", "version_requirement": "3.2.x" },
       { "name": "puppet", "version_requirement": "3.x" }
     ],
     "dependencies": []

From 64fb41f85c17d9be74291f721c6d5e7f7acf5d14 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 5 Mar 2014 09:04:41 -0800
Subject: [PATCH 0178/2267] Remove travis autorelease

---
 .travis.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5efc64fa76..7269dd1390 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ branches:
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-  - .forge-releng/publish
 rvm:
   - 1.8.7
   - 1.9.3
@@ -17,12 +14,6 @@ env:
     - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
     - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
     - PUPPET_GEM_VERSION="~> 3.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: |-
-        MO4pB4bqBQJjm2yFHf3Mgho+y0Qv4GmMxTMhzI02tGy1V0HMtruZbR7EBN0i
-        n2CiR7V9V0mNR7/ymzDMF9yVBcgqyXMsp/C6u992Dd0U63ZwFpbRWkxuAeEY
-        ioupWBkiczjVEo+sxn+gVOnx28pcH/X8kDWbr6wFOMIjO03K66Y=
 matrix:
   fast_finish: true
   exclude:

From 7d84d59d4e1dcbbcd6b56c482e473ee4fc574b18 Mon Sep 17 00:00:00 2001
From: Phil Fenstermacher <pcfens@wm.edu>
Date: Tue, 25 Feb 2014 17:14:28 -0500
Subject: [PATCH 0179/2267] Add support for mod_pagespeed

---
 README.md                             |  53 ++++++++++++++
 manifests/mod/pagespeed.pp            |  48 ++++++++++++
 manifests/params.pp                   |   2 +
 spec/acceptance/mod_pagespeed_spec.rb |  85 ++++++++++++++++++++++
 spec/classes/mod/pagespeed_spec.rb    |  32 ++++++++
 spec/spec_helper_acceptance.rb        |   4 +
 templates/mod/pagespeed.conf.erb      | 101 ++++++++++++++++++++++++++
 7 files changed, 325 insertions(+)
 create mode 100644 manifests/mod/pagespeed.pp
 create mode 100644 spec/acceptance/mod_pagespeed_spec.rb
 create mode 100644 spec/classes/mod/pagespeed_spec.rb
 create mode 100644 templates/mod/pagespeed.conf.erb

diff --git a/README.md b/README.md
index 3b072f8d7e..f71ee33e53 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@
         * [Class: apache::default_mods](#class-apachedefault_mods)
         * [Defined Type: apache::mod](#defined-type-apachemod)
         * [Classes: apache::mod::*](#classes-apachemodname)
+        * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
         * [Class: apache::mod::ssl](#class-apachemodssl)
         * [Class: apache::mod::wsgi](#class-apachemodwsgi)
         * [Defined Type: apache::vhost](#defined-type-apachevhost)
@@ -442,6 +443,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `mime_magic`*
 * `negotiation`
 * `nss`*
+* `pagespeed` (see [`apache::mod::pagespeed`](#class-apachemodpagespeed) below)
 * `passenger`*
 * `perl`
 * `peruser`
@@ -470,6 +472,57 @@ Modules noted with a * indicate that the module has settings and, thus, a templa
 
 The modules mentioned above, and other Apache modules that have templates, will cause template files to be dropped along with the mod install and the module will not work without the template. Any module without a template will install the package but drop no files.
 
+####Class: `apache::mod::pagespeed`
+
+Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
+
+This module does *not* manage the software repositories needed to automatically install the
+mod-pagespeed-stable package. The module does however require that the package be installed,
+or be installable using the system's default package provider.  You should ensure that this
+pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
+
+These are the defaults:
+
+```puppet
+    class { 'apache::mod::pagespeed':
+      inherit_vhost_config          => 'on',
+      filter_xhtml                  => false,
+      cache_path                    => '/var/cache/mod_pagespeed/',
+      log_dir                       => '/var/log/pagespeed',
+      memache_servers               => [],
+      rewrite_level                 => 'CoreFilters',
+      disable_filters               => [],
+      enable_filters                => [],
+      forbid_filters                => [],
+      rewrite_deadline_per_flush_ms => 10,
+      additional_domains            => undef,
+      file_cache_size_kb            => 102400,
+      file_cache_clean_interval_ms  => 3600000,
+      lru_cache_per_process         => 1024,
+      lru_cache_byte_limit          => 16384,
+      css_flatten_max_bytes         => 2048,
+      css_inline_max_bytes          => 2048,
+      css_image_inline_max_bytes    => 2048,
+      image_inline_max_bytes        => 2048,
+      js_inline_max_bytes           => 2048,
+      css_outline_min_bytes         => 3000,
+      js_outline_min_bytes          => 3000,
+      inode_limit                   => 500000,
+      image_max_rewrites_at_once    => 8,
+      num_rewrite_threads           => 4,
+      num_expensive_rewrite_threads => 4,
+      collect_statistics            => 'on',
+      statistics_logging            => 'on',
+      allow_view_stats              => [],
+      allow_pagespeed_console       => [],
+      allow_pagespeed_message       => [],
+      message_buffer_size           => 100000,
+      additional_configuration      => { }
+    }
+```
+
+Full documentation for mod_pagespeed is available from [Google](http://modpagespeed.com).
+
 ####Class: `apache::mod::ssl`
 
 Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are the defaults:
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
new file mode 100644
index 0000000000..d58f99fe2e
--- /dev/null
+++ b/manifests/mod/pagespeed.pp
@@ -0,0 +1,48 @@
+class apache::mod::pagespeed (
+  $inherit_vhost_config          = 'on',
+  $filter_xhtml                  = false,
+  $cache_path                    = '/var/cache/mod_pagespeed/',
+  $log_dir                       = '/var/log/pagespeed',
+  $memache_servers               = [],
+  $rewrite_level                 = 'CoreFilters',
+  $disable_filters               = [],
+  $enable_filters                = [],
+  $forbid_filters                = [],
+  $rewrite_deadline_per_flush_ms = 10,
+  $additional_domains            = undef,
+  $file_cache_size_kb            = 102400,
+  $file_cache_clean_interval_ms  = 3600000,
+  $lru_cache_per_process         = 1024,
+  $lru_cache_byte_limit          = 16384,
+  $css_flatten_max_bytes         = 2048,
+  $css_inline_max_bytes          = 2048,
+  $css_image_inline_max_bytes    = 2048,
+  $image_inline_max_bytes        = 2048,
+  $js_inline_max_bytes           = 2048,
+  $css_outline_min_bytes         = 3000,
+  $js_outline_min_bytes          = 3000,
+  $inode_limit                   = 500000,
+  $image_max_rewrites_at_once    = 8,
+  $num_rewrite_threads           = 4,
+  $num_expensive_rewrite_threads = 4,
+  $collect_statistics            = 'on',
+  $statistics_logging            = 'on',
+  $allow_view_stats              = [],
+  $allow_pagespeed_console       = [],
+  $allow_pagespeed_message       = [],
+  $message_buffer_size           = 100000,
+  $additional_configuration      = {},
+){
+
+  apache::mod { 'pagespeed': }
+
+  file { 'pagespeed.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/pagespeed.conf",
+    content => template('apache/mod/pagespeed.conf.erb'),
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 04c3b65fe5..33c4927945 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -61,6 +61,7 @@
       'authnz_ldap' => 'mod_authz_ldap',
       'fastcgi'     => 'mod_fastcgi',
       'fcgid'       => 'mod_fcgid',
+      'pagespeed'   => 'mod-pagespeed-stable',
       'passenger'   => 'mod_passenger',
       'perl'        => 'mod_perl',
       'php5'        => $distrelease ? {
@@ -123,6 +124,7 @@
       'fastcgi'     => 'libapache2-mod-fastcgi',
       'fcgid'       => 'libapache2-mod-fcgid',
       'nss'         => 'libapache2-mod-nss',
+      'pagespeed'   => 'mod-pagespeed-stable',
       'passenger'   => 'libapache2-mod-passenger',
       'perl'        => 'libapache2-mod-perl2',
       'php5'        => 'libapache2-mod-php5',
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
new file mode 100644
index 0000000000..de59a347c1
--- /dev/null
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -0,0 +1,85 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::pagespeed class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  case fact('osfamily')
+  when 'Debian'
+    vhost_dir    = '/etc/apache2/sites-enabled'
+    mod_dir      = '/etc/apache2/mods-available'
+    service_name = 'apache2'
+  when 'RedHat'
+    vhost_dir    = '/etc/httpd/conf.d'
+    mod_dir      = '/etc/httpd/conf.d'
+    service_name = 'httpd'
+  when 'FreeBSD'
+    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
+    mod_dir      = '/usr/local/etc/apache22/Modules'
+    service_name = 'apache22'
+  end
+
+  context "default pagespeed config" do
+    it 'succeeds in puppeting pagespeed' do
+      pp= <<-EOS
+        if $::osfamily == 'Debian' {
+          class { 'apt': }
+
+          apt::source { 'mod-pagespeed':
+            key         => '7FAC5991',
+            key_server  => 'pgp.mit.edu',
+            location    => 'http://dl.google.com/linux/mod-pagespeed/deb/',
+            release     => 'stable',
+            repos       => 'main',
+            include_src => false,
+            before      => Class['apache'],
+          } 
+        } elsif $::osfamily == 'RedHat' {
+         yumrepo { 'mod-pagespeed':
+          baseurl  => 'http://dl.google.com/linux/mod-pagespeed/rpm/stable/x86_64',
+            enabled  => 1,
+            gpgcheck => 1,
+            gpgkey   => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',
+            before   => Class['apache'],
+          }
+        }
+
+        class { 'apache':
+          mpm_module => 'prefork',
+        }
+        class { 'apache::mod::pagespeed':
+          enable_filters  => ['remove_comments'],
+          disable_filters => ['extend_cache'],
+          forbid_filters  => ['rewrite_javascript'],
+        }
+        apache::vhost { 'pagespeed.example.com':
+          port    => '80',
+          docroot => '/var/www/pagespeed',
+        }
+        host { 'pagespeed.example.com': ip => '127.0.0.1', }
+        file { '/var/www/pagespeed/index.html':
+          ensure  => file,
+          content => "<html>\n<!-- comment -->\n<body>\n<p>Hello World!</p>\n</body>\n</html>",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    describe file("#{mod_dir}/pagespeed.conf") do
+      it { should contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" }
+      it { should contain "ModPagespeedEnableFilters remove_comments" }
+      it { should contain "ModPagespeedDisableFilters extend_cache" }
+      it { should contain "ModPagespeedForbidFilters rewrite_javascript" }
+    end
+
+    it 'should answer to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
+      shell("/usr/bin/curl pagespeed.example.com:80") do |r|
+        r.stdout.should =~ /<head\/>/
+        r.stdout.should_not =~ /<!-- comment -->/
+        r.exit_code.should == 0
+      end
+    end
+  end
+end
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
new file mode 100644
index 0000000000..7480a2b52f
--- /dev/null
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -0,0 +1,32 @@
+describe 'apache::mod::pagespeed', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should contain_class("apache::params") }
+    it { should contain_apache__mod('pagespeed') }
+    it { should contain_package("mod-pagespeed-stable") }
+    it { should contain_file('pagespeed.conf') }
+  end
+
+  context "on a RedHat OS" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should contain_class("apache::params") }
+    it { should contain_apache__mod('pagespeed') }
+    it { should contain_package("mod-pagespeed-stable") }
+    it { should contain_file('pagespeed.conf') }
+  end
+end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 8e4115128d..370de46c0d 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -34,6 +34,10 @@
       if fact('osfamily') == 'RedHat'
         on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
       end
+      # Required for manifest to make mod_pagespeed repository available
+      if fact('osfamily') == 'Debian'
+        on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
+      end
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
     end
diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
new file mode 100644
index 0000000000..3bbf7f29b4
--- /dev/null
+++ b/templates/mod/pagespeed.conf.erb
@@ -0,0 +1,101 @@
+ModPagespeed on
+
+ModPagespeedInheritVHostConfig <%= @inherit_vhost_config %>
+AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html
+<% if @filter_xhtml -%>
+AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER application/xhtml+xml
+<% end -%>
+ModPagespeedFileCachePath "<%= @cache_path %>"
+ModPagespeedLogDir "<%= @log_dir %>"
+    
+<% @memache_servers.each do |server| -%>
+ModPagespeedMemcachedServers <%= server -%>
+<% end -%>
+
+ModPagespeedRewriteLevel <%= @rewrite_level -%>
+
+<% @disable_filters.each do |filter| -%>
+ModPagespeedDisableFilters <%= filter -%>
+<% end -%>
+    
+<% @enable_filters.each do |filter| -%>
+ModPagespeedEnableFilters <%= filter -%>
+<% end -%>
+
+<% @forbid_filters.each do |filter| -%>
+ModPagespeedForbidFilters <%= filter -%>
+<% end -%>
+
+ModPagespeedRewriteDeadlinePerFlushMs <%= @rewrite_deadline_per_flush_ms %>
+
+<% if @additional_domains -%>
+ModPagespeedDomain <%= @additional_domains -%>
+<% end -%>
+
+ModPagespeedFileCacheSizeKb          <%= @file_cache_size_kb %>
+ModPagespeedFileCacheCleanIntervalMs <%= @file_cache_clean_interval_ms %>
+ModPagespeedLRUCacheKbPerProcess     <%= @lru_cache_per_process %>
+ModPagespeedLRUCacheByteLimit        <%= @lru_cache_byte_limit %>
+ModPagespeedCssFlattenMaxBytes       <%= @css_flatten_max_bytes %>
+ModPagespeedCssInlineMaxBytes        <%= @css_inline_max_bytes %>
+ModPagespeedCssImageInlineMaxBytes   <%= @css_image_inline_max_bytes %>
+ModPagespeedImageInlineMaxBytes      <%= @image_inline_max_bytes %>
+ModPagespeedJsInlineMaxBytes         <%= @js_inline_max_bytes %>
+ModPagespeedCssOutlineMinBytes       <%= @css_outline_min_bytes %>
+ModPagespeedJsOutlineMinBytes        <%= @js_outline_min_bytes %>
+
+
+ModPagespeedFileCacheInodeLimit <%= @inode_limit %>
+ModPagespeedImageMaxRewritesAtOnce <%= @image_max_rewrites_at_once %>
+
+ModPagespeedNumRewriteThreads <%= @num_rewrite_threads %>
+ModPagespeedNumExpensiveRewriteThreads <%= @num_expensive_rewrite_threads %>
+
+ModPagespeedStatistics <%= @collect_statistics %>
+
+<Location /mod_pagespeed_statistics>
+    Order allow,deny
+    # You may insert other "Allow from" lines to add hosts you want to
+    # allow to look at generated statistics.  Another possibility is
+    # to comment out the "Order" and "Allow" options from the config
+    # file, to allow any client that can reach your server to examine
+    # statistics.  This might be appropriate in an experimental setup or
+    # if the Apache server is protected by a reverse proxy that will
+    # filter URLs in some fashion.
+    Allow from localhost
+    Allow from 127.0.0.1
+    Allow from ::1
+    <% @allow_view_stats.each do |host| -%>
+    Allow from <%= host %>
+    <% end -%>
+    SetHandler mod_pagespeed_statistics
+</Location>
+
+ModPagespeedStatisticsLogging <%= @statistics_logging %>
+<Location /pagespeed_console>
+    Order allow,deny
+    Allow from localhost
+    Allow from 127.0.0.1
+    Allow from ::1
+    <% @allow_pagespeed_console.each do |host| -%>
+    Allow from <%= host %>
+    <% end -%>
+    SetHandler pagespeed_console
+</Location>
+
+ModPagespeedMessageBufferSize <%= @message_buffer_size %>
+
+<Location /mod_pagespeed_message>
+    Order allow,deny
+    Allow from localhost
+    Allow from 127.0.0.1
+    Allow from ::1
+    <% @allow_pagespeed_message.each do |host| -%>
+    Allow from <%= host %>
+    <% end -%>
+    SetHandler mod_pagespeed_message
+</Location>
+
+<% @additional_configuration.each_pair do |key, value| -%>
+<%= key %> <%= value %>
+<% end -%>

From 094000e0b63b66a2eabc92986b77df9b5e38c96e Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <csanchez@maestrodev.com>
Date: Mon, 10 Mar 2014 12:03:58 +0100
Subject: [PATCH 0180/2267] lint fixes

---
 manifests/params.pp  | 2 +-
 manifests/version.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 04c3b65fe5..fbb53c0ae4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -63,7 +63,7 @@
       'fcgid'       => 'mod_fcgid',
       'passenger'   => 'mod_passenger',
       'perl'        => 'mod_perl',
-      'php5'        => $distrelease ? {
+      'php5'        => $::apache::version::distrelease ? {
         '5'     => 'php53',
         default => 'php',
       },
diff --git a/manifests/version.pp b/manifests/version.pp
index 581fdde6fe..70fe919b6e 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -9,7 +9,7 @@
   if ! $distrelease {
     fail("Class['apache::params']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
   }
-  
+
   case $::osfamily {
     'RedHat': {
       if ($::operatingsystem == 'Fedora' and $distrelease >= 18) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {

From 391bd5b54d9eabc443fd1c3fe8c3c9baca6340e0 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <csanchez@maestrodev.com>
Date: Mon, 10 Mar 2014 11:52:09 +0100
Subject: [PATCH 0181/2267] Apache version in Ubuntu 13.10 is 2.4

Fix incorrect distrelease comparison
---
 manifests/version.pp        |  2 +-
 spec/classes/apache_spec.rb | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index 581fdde6fe..f3cec42594 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -19,7 +19,7 @@
       }
     }
     'Debian': {
-      if $::operatingsystem == 'Ubuntu' and $distrelease >= 13.10 {
+      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
         $default = 2.4
       } else {
         $default = 2.2
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 1a9a58d1b8..b437928973 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -140,6 +140,39 @@
         it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Group www-data\n} }
       end
     end
+
+    context "on Ubuntu" do
+      let :facts do
+        super().merge({
+          :operatingsystem => 'Ubuntu'
+        })
+      end
+
+      context "13.10" do
+        let :facts do
+          super().merge({
+            :operatingsystemrelease => '13.10'
+          })
+        end
+        it { should contain_class('apache').with_apache_version('2.4') }
+      end
+      context "12.04" do
+        let :facts do
+          super().merge({
+            :operatingsystemrelease => '12.04'
+          })
+        end
+        it { should contain_class('apache').with_apache_version('2.2') }
+      end
+      context "13.04" do
+        let :facts do
+          super().merge({
+            :operatingsystemrelease => '13.04'
+          })
+        end
+        it { should contain_class('apache').with_apache_version('2.2') }
+      end
+    end
   end
   context "on a RedHat 5 OS" do
     let :facts do

From ac167f3881fb8af632afc36c69a69c75db4d360b Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <csanchez@maestrodev.com>
Date: Mon, 10 Mar 2014 14:03:35 +0100
Subject: [PATCH 0182/2267] actions module is not included by default in
 Debian/Ubuntu

Fix acceptance tests
---
 spec/acceptance/vhost_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index dc759dbf62..a2fa419407 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -688,10 +688,11 @@ class { 'apache': service_ensure => stopped, }
         class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
-          docroot          => '/tmp',
-	  action => 'php-fastcgi',
+          docroot => '/tmp',
+          action  => 'php-fastcgi',
         }
       EOS
+      pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian'
       apply_manifest(pp, :catch_failures => true)
     end
 

From df5df926b6adfd7dcdb2923bda932f2a3011fafe Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <csanchez@maestrodev.com>
Date: Tue, 18 Feb 2014 12:29:49 +0100
Subject: [PATCH 0183/2267] apache::mod::mime does not compile due to wrong
 file dependency

Update rspec-puppet and add compilation specs to catch these errors
Add basic acceptance test for apache::mod::mime
Fix too many backslashes in FreeBSD regex for APACHE_PORT
---
 Gemfile                          |  2 +-
 manifests/mod/mime.pp            |  2 +-
 manifests/package.pp             |  2 +-
 spec/acceptance/mod_mime_spec.rb | 34 +++++++++++++++++++++++++
 spec/classes/mod/mime_spec.rb    | 43 ++++++++++++++++++++++++++++++++
 spec/spec_helper.rb              |  8 ++++++
 6 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 spec/acceptance/mod_mime_spec.rb
 create mode 100644 spec/classes/mod/mime_spec.rb

diff --git a/Gemfile b/Gemfile
index dd87fe8cff..679e7d3efc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
   gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
+  gem 'rspec-puppet', '>=1.0.0', :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index 8348a06ad3..ccdb5d4b3c 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -15,7 +15,7 @@
   if $mime_support_package {
     package { $mime_support_package:
       ensure => 'installed',
-      before => File["${::apache::mod_dir}/mime.conf"],
+      before => File['mime.conf'],
     }
   }
 }
diff --git a/manifests/package.pp b/manifests/package.pp
index c5ef315366..b86167a397 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -26,7 +26,7 @@
         ensure => $ensure,
         path   => '/etc/make.conf',
         line   => "APACHE_PORT=${apache_package}",
-        match  => '^\\s*#?\\s*APACHE_PORT\\s*=\\s*',
+        match  => '^\s*#?\s*APACHE_PORT\s*=\s*',
         before => Package['httpd'],
       }
       # remove other packages
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
new file mode 100644
index 0000000000..71a7037a62
--- /dev/null
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::mime class' do
+  case fact('osfamily')
+  when 'Debian'
+    mod_dir      = '/etc/apache2/mods-available'
+    service_name = 'apache2'
+  when 'RedHat'
+    mod_dir      = '/etc/httpd/conf.d'
+    service_name = 'httpd'
+  when 'FreeBSD'
+    mod_dir      = '/usr/local/etc/apache22/Modules'
+    service_name = 'apache22'
+  end
+
+  context "default mime config" do
+    it 'succeeds in puppeting mime' do
+      pp= <<-EOS
+        class { 'apache': }
+        include apache::mod::mime
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    describe file("#{mod_dir}/mime.conf") do
+      it { should contain "AddType application/x-compress .Z" }
+    end
+  end
+end
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
new file mode 100644
index 0000000000..835a5a9004
--- /dev/null
+++ b/spec/classes/mod/mime_spec.rb
@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+# This function is called inside the OS specific conte, :compilexts
+def general_mime_specs
+  it { should contain_apache__mod("mime") }
+end
+
+describe 'apache::mod::mime', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+
+  context "On a Debian OS with default params", :compile do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    general_mime_specs()
+
+    it { should contain_file("mime.conf").with_path('/etc/apache2/mods-available/mime.conf') }
+
+  end
+
+  context "on a RedHat OS with default params", :compile do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    general_mime_specs()
+
+    it { should contain_file("mime.conf").with_path("/etc/httpd/conf.d/mime.conf") }
+
+  end
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2c6f56649a..f880d274d8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1 +1,9 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+end
+
+shared_examples :compile, :compile => true do
+  it { should compile.with_all_deps }
+end

From 59600890fa372be4ba459882cac4214cbcc446fe Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <csanchez@maestrodev.com>
Date: Sat, 8 Mar 2014 19:26:13 +0100
Subject: [PATCH 0184/2267] Bad dependency to .load files in apache::mod

Fixes error "expected that the catalogue would include File[/etc/apache2/mods-available/proxy_html.load]"
Add compilation specs
---
 manifests/mod.pp                    | 4 ++--
 spec/classes/mod/auth_kerb_spec.rb  | 6 +++---
 spec/classes/mod/proxy_html_spec.rb | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 8be99afd00..318012680a 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -53,10 +53,10 @@
     # the module gets installed.
     $package_before = $::osfamily ? {
       'freebsd' => [
-        File["${mod_dir}/${mod}.load"],
+        File["${mod}.load"],
         File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
       ],
-      default => File["${mod_dir}/${mod}.load"],
+      default => File["${mod}.load"],
     }
     # $_package may be an array
     package { $_package:
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 71c2349c39..670270d228 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -2,7 +2,7 @@
   let :pre_condition do
     'include apache'
   end
-  context "on a Debian OS" do
+  context "on a Debian OS", :compile do
     let :facts do
       {
         :osfamily               => 'Debian',
@@ -14,7 +14,7 @@
     it { should contain_apache__mod("auth_kerb") }
     it { should contain_package("libapache2-mod-auth-kerb") }
   end
-  context "on a RedHat OS" do
+  context "on a RedHat OS", :compile do
     let :facts do
       {
         :osfamily               => 'RedHat',
@@ -26,7 +26,7 @@
     it { should contain_apache__mod("auth_kerb") }
     it { should contain_package("mod_auth_kerb") }
   end
-  context "on a FreeBSD OS" do
+  context "on a FreeBSD OS", :compile do
     let :facts do
       {
         :osfamily               => 'FreeBSD',
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 90be60b0fe..5ae11f6d06 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -6,7 +6,7 @@
       'include apache::mod::proxy_http',
     ]
   end
-  context "on a Debian OS" do
+  context "on a Debian OS", :compile do
     let :facts do
       {
         :osfamily               => 'Debian',
@@ -18,7 +18,7 @@
     it { should contain_apache__mod('proxy_html') }
     it { should contain_package("libapache2-mod-proxy-html") }
   end
-  context "on a RedHat OS" do
+  context "on a RedHat OS", :compile do
     let :facts do
       {
         :osfamily               => 'RedHat',
@@ -30,7 +30,7 @@
     it { should contain_apache__mod('proxy_html') }
     it { should contain_package("mod_proxy_html") }
   end
-  context "on a FreeBSD OS" do
+  context "on a FreeBSD OS", :compile do
     let :facts do
       {
         :osfamily               => 'FreeBSD',

From eee54e962a8c3039427e78984d6e1f7d49972376 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <csanchez@maestrodev.com>
Date: Sun, 9 Mar 2014 12:23:00 +0100
Subject: [PATCH 0185/2267] proxy_html needs to load libxml2 library before
 loading module in Debian

Allow passing list of files to load before loading the module to apache::mod
libxml2 path in i686 hardwaremodel is /usr/lib/i386-linux-gnu/libxml2.so.2
Add acceptance tests for proxy_html and debian 7.3
---
 manifests/mod.pp                            |  3 +-
 manifests/mod/proxy_html.pp                 | 23 +++++++----
 spec/acceptance/mod_proxy_html_spec.rb      | 36 ++++++++++++++++++
 spec/acceptance/nodesets/debian-73-i386.yml | 11 ++++++
 spec/acceptance/nodesets/debian-73-x64.yml  | 11 ++++++
 spec/classes/mod/proxy_html_spec.rb         | 42 ++++++++++++++++-----
 templates/mod/load.erb                      |  7 ++++
 templates/mod/proxy_html.conf.erb           |  6 ---
 8 files changed, 115 insertions(+), 24 deletions(-)
 create mode 100644 spec/acceptance/mod_proxy_html_spec.rb
 create mode 100644 spec/acceptance/nodesets/debian-73-i386.yml
 create mode 100644 spec/acceptance/nodesets/debian-73-x64.yml
 create mode 100644 templates/mod/load.erb

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 318012680a..9d65bd91f1 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -5,6 +5,7 @@
   $lib_path = $::apache::params::lib_path,
   $id = undef,
   $path = undef,
+  $loadfiles = undef,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
@@ -72,7 +73,7 @@
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
-    content => "LoadModule ${_id} ${_path}\n",
+    content => template('apache/mod/load.erb'),
     require => [
       Package['httpd'],
       Exec["mkdir ${mod_dir}"],
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 91d7bd3c8f..a30c328c90 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -1,21 +1,28 @@
 class apache::mod::proxy_html {
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
   Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
-  ::apache::mod { 'proxy_html': }
+
+  # Add libxml2
   case $::osfamily {
-    'RedHat': {
+    /RedHat|FreeBSD/: {
       ::apache::mod { 'xml2enc': }
     }
     'Debian': {
-      $proxy_html_loadfiles = $::apache::params::distrelease ? {
-        '6'     => '/usr/lib/libxml2.so.2',
-        default => "/usr/lib/${::hardwaremodel}-linux-gnu/libxml2.so.2",
+      $gnu_path = $::hardwaremodel ? {
+        'i686'  => 'i386',
+        default => $::hardwaremodel,
+      }
+      $loadfiles = $::apache::params::distrelease ? {
+        '6'     => ['/usr/lib/libxml2.so.2'],
+        default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
       }
     }
-    'FreeBSD': {
-      ::apache::mod { 'xml2enc': }
-    }
   }
+
+  ::apache::mod { 'proxy_html':
+    loadfiles => $loadfiles,
+  }
+
   # Template uses $icons_path
   file { 'proxy_html.conf':
     ensure  => file,
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
new file mode 100644
index 0000000000..ddfa66dd91
--- /dev/null
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -0,0 +1,36 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::proxy_html class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  case fact('osfamily')
+  when 'Debian'
+    service_name = 'apache2'
+  when 'RedHat'
+    service_name = 'httpd'
+  when 'FreeBSD'
+    service_name = 'apache22'
+  end
+
+  context "default proxy_html config" do
+    if fact('osfamily') == 'RedHat'
+      it 'adds epel' do
+        pp = "class { 'epel': }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    it 'succeeds in puppeting proxy_html' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::proxy': }
+        class { 'apache::mod::proxy_http': }
+        class { 'apache::mod::proxy_html': }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+  end
+end
diff --git a/spec/acceptance/nodesets/debian-73-i386.yml b/spec/acceptance/nodesets/debian-73-i386.yml
new file mode 100644
index 0000000000..a38902d897
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-73-i386.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  debian-73-i386:
+    roles:
+      - master
+    platform: debian-7-i386
+    box : debian-73-i386-virtualbox-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-i386-virtualbox-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/nodesets/debian-73-x64.yml b/spec/acceptance/nodesets/debian-73-x64.yml
new file mode 100644
index 0000000000..f9cf0c9b8a
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-73-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  debian-73-x64:
+    roles:
+      - master
+    platform: debian-7-amd64
+    box : debian-73-x64-virtualbox-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 5ae11f6d06..000a24e2f9 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -6,17 +6,41 @@
       'include apache::mod::proxy_http',
     ]
   end
-  context "on a Debian OS", :compile do
+  context "on a Debian OS" do
+    shared_examples "debian" do |loadfiles|
+      it { should contain_class("apache::params") }
+      it { should contain_apache__mod('proxy_html').with(:loadfiles => loadfiles) }
+      it { should contain_package("libapache2-mod-proxy-html") }
+    end
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
+        :osfamily       => 'Debian',
+        :concat_basedir => '/dne',
+        :architecture   => 'i386'
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html') }
-    it { should contain_package("libapache2-mod-proxy-html") }
+
+    context "on squeeze" do
+      let(:facts) { super().merge({ :operatingsystemrelease => '6' }) }
+      it_behaves_like "debian", ['/usr/lib/libxml2.so.2']
+    end
+    context "on wheezy" do
+      let(:facts) { super().merge({ :operatingsystemrelease => '7' }) }
+      context "i386" do
+        let(:facts) { super().merge({
+          :hardwaremodel => 'i686',
+          :architecture  => 'i386'
+        })}
+        it_behaves_like "debian", ["/usr/lib/i386-linux-gnu/libxml2.so.2"]
+      end
+      context "x64" do
+        let(:facts) { super().merge({
+          :hardwaremodel => 'x86_64',
+          :architecture  => 'amd64'
+        })}
+        it_behaves_like "debian", ["/usr/lib/x86_64-linux-gnu/libxml2.so.2"]
+      end
+    end
   end
   context "on a RedHat OS", :compile do
     let :facts do
@@ -27,7 +51,7 @@
       }
     end
     it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html') }
+    it { should contain_apache__mod('proxy_html').with(:loadfiles => nil) }
     it { should contain_package("mod_proxy_html") }
   end
   context "on a FreeBSD OS", :compile do
@@ -39,7 +63,7 @@
       }
     end
     it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html') }
+    it { should contain_apache__mod('proxy_html').with(:loadfiles => nil) }
     it { should contain_package("www/mod_proxy_html") }
   end
 end
diff --git a/templates/mod/load.erb b/templates/mod/load.erb
new file mode 100644
index 0000000000..51f45edb21
--- /dev/null
+++ b/templates/mod/load.erb
@@ -0,0 +1,7 @@
+<% if @loadfiles -%>
+<% Array(@loadfiles).each do |loadfile| -%>
+LoadFile <%= loadfile %>
+<% end -%>
+
+<% end -%>
+LoadModule <%= @_id %> <%= @_path %>
diff --git a/templates/mod/proxy_html.conf.erb b/templates/mod/proxy_html.conf.erb
index 7f5898ef74..fea15f393f 100644
--- a/templates/mod/proxy_html.conf.erb
+++ b/templates/mod/proxy_html.conf.erb
@@ -1,9 +1,3 @@
-<% if @proxy_html_loadfiles -%>
-<% Array(@proxy_html_loadfiles).each do |loadfile| -%>
-LoadFile <%= loadfile %>
-<% end -%>
-
-<% end -%>
 ProxyHTMLLinks  a               href
 ProxyHTMLLinks  area            href
 ProxyHTMLLinks  link            href

From eabdb5056fa65a0670905d23c8380dcc28d4fc9d Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <csanchez@maestrodev.com>
Date: Sun, 9 Mar 2014 17:00:21 +0100
Subject: [PATCH 0186/2267] Add a CentOS 6.5 beaker node

---
 spec/acceptance/nodesets/centos-65-x64.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 spec/acceptance/nodesets/centos-65-x64.yml

diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
new file mode 100644
index 0000000000..89de021346
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  centos-65-x64:
+    roles:
+      - master
+    platform: el-6-x86_65
+    box : centos-65-x64-virtualbox-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git

From 43c175f58d3089846a540d4154431303cf7421e7 Mon Sep 17 00:00:00 2001
From: Niek Beernink <n.beernink@oxilion.nl>
Date: Mon, 17 Mar 2014 15:15:23 +0100
Subject: [PATCH 0187/2267] Add extra parameters to mod::php

---
 manifests/mod/php.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index ace596d42d..ed9b008b30 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -1,11 +1,15 @@
 class apache::mod::php (
+  $package        = undef,
   $package_ensure = 'present',
+  $path           = undef,
 ) {
   if ! defined(Class['apache::mod::prefork']) {
     fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
   }
   ::apache::mod { 'php5':
+    package        => $package,
     package_ensure => $package_ensure,
+    path           => $path,
   }
 
   include ::apache::mod::mime

From 98f21a076fc0d20c71537a708e140faeaf4995b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@affinitic.be>
Date: Tue, 18 Mar 2014 14:37:16 +0100
Subject: [PATCH 0188/2267] fix missing ensure on concat::fragment resources

---
 manifests/balancer.pp        | 3 +++
 manifests/balancermember.pp  | 1 +
 manifests/init.pp            | 1 +
 manifests/listen.pp          | 1 +
 manifests/namevirtualhost.pp | 1 +
 5 files changed, 7 insertions(+)

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 30887823b6..ac2bc88e44 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -55,6 +55,7 @@
   }
 
   concat::fragment { "00-${name}-header":
+    ensure  => present,
     target  => $target,
     order   => '01',
     content => "<Proxy balancer://${name}>\n",
@@ -67,12 +68,14 @@
   # concat fragments. We don't have to do anything about them.
 
   concat::fragment { "01-${name}-proxyset":
+    ensure  => present,
     target  => $target,
     order   => '19',
     content => inline_template("<% proxy_set.each do |key, value| %> Proxyset <%= key %>=<%= value %>\n<% end %>"),
   }
 
   concat::fragment { "01-${name}-footer":
+    ensure  => present,
     target  => $target,
     order   => '20',
     content => "</Proxy>\n",
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index c48cb1ebbf..121e2c5533 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -46,6 +46,7 @@
 ) {
 
   concat::fragment { "BalancerMember ${url}":
+    ensure  => present,
     target  => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
     content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index 7f2565cf98..6287ff8580 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -212,6 +212,7 @@
     require => Package['httpd'],
   }
   concat::fragment { 'Apache ports header':
+    ensure  => present,
     target  => $ports_file,
     content => template('apache/ports_header.erb')
   }
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 503ee8860b..e6a8a3c767 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -3,6 +3,7 @@
 
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
+    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/listen.erb'),
   }
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index 4fa8795185..f8c3a80d85 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -3,6 +3,7 @@
 
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
+    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/namevirtualhost.erb'),
   }

From 3b6a46faea0728b89732e8d59bfb9a6087793c5a Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Sun, 23 Mar 2014 10:33:50 -0400
Subject: [PATCH 0189/2267] fix missing comma in sample config

there was a missing comma in the sample to handle redirect from
http to https site, making it invalid puppet syntax.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f71ee33e53..d4a454c685 100644
--- a/README.md
+++ b/README.md
@@ -1555,7 +1555,7 @@ Configure a vhost to redirect non-SSL connections to SSL
       servername      => 'sixteenth.example.com',
       port            => '80',
       docroot         => '/var/www/sixteenth',
-      redirect_status => 'permanent'
+      redirect_status => 'permanent',
       redirect_dest   => 'https://sixteenth.example.com/'
     }
     apache::vhost { 'sixteenth.example.com ssl':

From af13807b8e528ecc8e379213a19ceb9056d51d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Wed, 19 Mar 2014 10:24:47 +0100
Subject: [PATCH 0190/2267] Allow extending LogFormats

by passing a hash of additional LogFormats, we can extend the existing
definitions.
---
 README.md                                 |  8 ++++++++
 manifests/init.pp                         |  1 +
 spec/acceptance/apache_parameters_spec.rb | 23 +++++++++++++++++++++++
 spec/classes/apache_spec.rb               | 14 ++++++++++++++
 templates/httpd.conf.erb                  |  5 +++++
 5 files changed, 51 insertions(+)

diff --git a/README.md b/README.md
index d4a454c685..4bbda2952d 100644
--- a/README.md
+++ b/README.md
@@ -309,6 +309,14 @@ Sets the amount of time the server will wait for subsequent requests on a persis
 
 Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info', or 'debug'.
 
+#####`log_formats`
+
+Define additional [LogFormats](https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat). This is done in a Hash:
+
+```puppet
+  $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
+```
+
 #####`logroot`
 
 Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, and '/var/log/apache22' on FreeBSD.
diff --git a/manifests/init.pp b/manifests/init.pp
index 6287ff8580..cabeee4c0e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -51,6 +51,7 @@
   $keepalive_timeout    = $::apache::params::keepalive_timeout,
   $logroot              = $::apache::params::logroot,
   $log_level            = $::apache::params::log_level,
+  $log_formats          = {},
   $ports_file           = $::apache::params::ports_file,
   $apache_version       = $::apache::version::default,
   $server_tokens        = 'OS',
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index eeae55d45e..90134be144 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -286,6 +286,29 @@ class { 'apache':
     end
   end
 
+  describe 'logformats' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache':
+          { log_formats => {
+              'vhost_common'   => '%v %h %l %u %t \"%r\" %>s %b',
+              'vhost_combined' => '%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"',
+            }
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file($conf_file) do
+      it { should be_file }
+      it { should contain 'LogFormat %v %h %l %u %t \"%r\" %>s %b" vhost_common' }
+      it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined' }
+    end
+  end
+
+
   describe 'keepalive' do
     describe 'setup' do
       it 'applies cleanly' do
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index b437928973..6e0b705333 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -141,6 +141,20 @@
       end
     end
 
+    describe "Add extra LogFormats" do
+      context "When parameter log_formats is a hash" do
+        let :params do
+          { :log_formats => {
+            'vhost_common'   => "%v %h %l %u %t \"%r\" %>s %b",
+            'vhost_combined' => "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
+          } }
+        end
+
+        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
+        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined\n} }
+      end
+    end
+
     context "on Ubuntu" do
       let :facts do
         super().merge({
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 66b70836bb..43b32bda2c 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -55,6 +55,11 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combine
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
+<% if @log_formats and !@log_formats.empty? -%>
+  <%- @log_formats.each do |nickname,format| -%>
+LogFormat "<%= format -%>" <%= nickname %>
+  <%- end -%>
+<% end -%>
 
 <%- if @apache_version >= '2.4' -%>
 IncludeOptional "<%= @confd_dir %>/*.conf"

From 0bb362ad68797816ac0b01e58286dc5e149d26e1 Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Tue, 25 Mar 2014 08:45:05 -0700
Subject: [PATCH 0191/2267] Fixed travis by updating Gemfile to pin Rake to
 10.1.1

The latest Rake update requires Ruby >= 1.9. This update
fixes the failing 1.8.7 tests by pinning Rake to the last
supported version on ruby 1.8.7.
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 679e7d3efc..0ad4ddffca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
-  gem 'rake',                    :require => false
+  gem 'rake', '10.1.1',          :require => false
   gem 'rspec-puppet', '>=1.0.0', :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'serverspec',              :require => false

From fd3ebd143b6c5b84528013245afb305e6946c286 Mon Sep 17 00:00:00 2001
From: Niek Beernink <n.beernink@oxilion.nl>
Date: Tue, 25 Mar 2014 17:19:11 +0100
Subject: [PATCH 0192/2267] rename package param, add tests and documentation

---
 README.md                    | 13 +++++++++++++
 manifests/mod/php.pp         |  4 ++--
 spec/classes/mod/php_spec.rb | 18 ++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f71ee33e53..1804fe5971 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
         * [Defined Type: apache::mod](#defined-type-apachemod)
         * [Classes: apache::mod::*](#classes-apachemodname)
         * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
+        * [Class: apache::mod::php](#class-apachemodphp)
         * [Class: apache::mod::ssl](#class-apachemodssl)
         * [Class: apache::mod::wsgi](#class-apachemodwsgi)
         * [Defined Type: apache::vhost](#defined-type-apachevhost)
@@ -523,6 +524,18 @@ These are the defaults:
 
 Full documentation for mod_pagespeed is available from [Google](http://modpagespeed.com).
 
+####Class: `apache::mod::php`
+
+Installs and configures mod_php. The defaults are OS-dependant.
+
+Overriding the package name:
+```
+  class {'::apache::mod::php':
+    package_name => "php54-php",
+    path         => "${::apache::params::lib_path}/libphp54-php5.so",
+  }
+```
+
 ####Class: `apache::mod::ssl`
 
 Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are the defaults:
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index ed9b008b30..8c1b94d6bb 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -1,5 +1,5 @@
 class apache::mod::php (
-  $package        = undef,
+  $package_name   = undef,
   $package_ensure = 'present',
   $path           = undef,
 ) {
@@ -7,7 +7,7 @@
     fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
   }
   ::apache::mod { 'php5':
-    package        => $package,
+    package        => $package_name,
     package_ensure => $package_ensure,
     path           => $path,
   }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 57708a398c..29adc870f4 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -46,6 +46,24 @@
         :content => "LoadModule php5_module modules/libphp5.so\n"
       ) }
     end
+    context "with alternative package name" do let :pre_condition do
+        'class { "apache": }'
+      end
+      let :params do
+        { :package_name => 'php54'}
+      end
+      it { should contain_package("php54") }
+    end
+    context "with alternative path" do let :pre_condition do
+        'class { "apache": }'
+      end
+      let :params do
+        { :path => 'alternative-path'}
+      end
+      it { should contain_file("php5.load").with(
+        :content => "LoadModule php5_module alternative-path\n"
+      ) }
+    end
     context "with specific version" do
       let :pre_condition do
         'class { "apache": }'

From 835b3422ee585c9503e61b5009d815c20a8a4787 Mon Sep 17 00:00:00 2001
From: Christian Kaenzig <christian.kaenzig@camptocamp.com>
Date: Thu, 27 Mar 2014 15:09:01 +0100
Subject: [PATCH 0193/2267] Fix typo in service.pp doc

---
 manifests/service.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/service.pp b/manifests/service.pp
index b21a25f4b7..e958b1bc51 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -12,7 +12,7 @@
 # Sample Usage:
 #
 #    sometype { 'foo':
-#      notify => Class['apache::service],
+#      notify => Class['apache::service'],
 #    }
 #
 #

From d0883b92116939695217a72681c1a8b1c5cd85d8 Mon Sep 17 00:00:00 2001
From: jonoterc <jon_obuchowski@terc.edu>
Date: Sat, 29 Mar 2014 02:56:06 -0400
Subject: [PATCH 0194/2267] Enable overriding mod-level parameters for
 apache::mod::passenger

Apache::mod::passenger didn't accept/pass (optional) mod parameters
through to apache::mod, so only auto-generated module parameters were
used. Without this option, apache::mod::passenger could not be used in
conjunction with passenger modules beyond those generated by the OS
package system (in particular, modules compiled via
passenger-install-apache2-module, which uses differing paths). This
commit enables passing in all parameters used with "apache::mod",
documented in the passenger README file.

Modified default RedHat passenger parameters for cleaned-up
installation (prior parameters worked with Apache, but broke
passenger-* utilities, incl. passenger-status & passenger-root).

Updated spec/class tests to verify mod-level parameters; also,
updated RedHat tests to accomodate updated default parameters.

Added spec/acceptance tests for passenger, verifying default
installations for RedHat and Debian systems. RedHat installation test
installs (required) EPEL and http://passenger.stealthymonkeys.com
package repositories.
---
 .gitignore                            |   1 +
 README.passenger.md                   |  62 ++++++--
 manifests/mod/passenger.pp            |  38 ++++-
 manifests/params.pp                   |   8 +-
 spec/acceptance/mod_passenger_spec.rb | 213 ++++++++++++++++++++++++++
 spec/classes/mod/passenger_spec.rb    |  40 +++--
 6 files changed, 331 insertions(+), 31 deletions(-)
 create mode 100644 spec/acceptance/mod_passenger_spec.rb

diff --git a/.gitignore b/.gitignore
index e8f52b4451..f751a15d6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ vendor
 spec/fixtures
 .rspec_system
 .bundle
+.vagrant
 .*sw*
diff --git a/README.passenger.md b/README.passenger.md
index cecacccc4f..1cc21202b8 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -2,7 +2,9 @@
 
 Just enabling the Passenger module is insufficient for the use of Passenger in production. Passenger should be tunable to better fit the environment in which it is run while being aware of the resources it required.
 
-To this end the Apache passenger module has been modified to apply system wide Passenger tuning declarations to `passenger.conf`. Declarations specific to a virtual host should be passed through when defining a `vhost` (e.g. `rack_base_uris' parameter on the `apache::vhost` class, check `README.md`).
+To this end the Apache passenger module has been modified to apply system wide Passenger tuning declarations to `passenger.conf`. Declarations specific to a virtual host should be passed through when defining a `vhost` (e.g. `rack_base_uris` parameter on the `apache::vhost` class, check `README.md`).
+
+Also, general apache module loading parameters can be supplied to enable using a customized passenger module in place of a default-package-based version of the module.
 
 # Parameters for `apache::mod::passenger`
 
@@ -12,59 +14,99 @@ The following declarations are supported and can be passed to `apache::mod::pass
 class {'apache::mod::passenger':
   passenger_high_performance  => 'on',
   rails_autodetect            => 'off',
+  mod_lib_path                => '/usr/lib/apache2/custom_modules',
 }
 ```
 
 The general form is using the all lower case version of the declaration.
 
-If you pass a default value to `apache::mod::passenger` it will be ignored and not passed through to the configuration file.
+## Parameters used with passenger.conf
+
+If you pass a default value to `apache::mod::passenger` it will be ignored and not passed through to the configuration file. 
 
-## passenger_high_performance
+### passenger_high_performance
 
 Default is `off`, when turned `on` Passenger runs in a higher performance mode that can be less compatible with other Apache modules.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerHighPerformance
 
-## passenger_max_pool_size
+### passenger_max_pool_size
 
 Set's the maximum number of Passenger application processes that may simultaneously run. The default value is 6.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengermaxpoolsize_lt_integer_gt
 
-## passenger_pool_idle_time
+### passenger_pool_idle_time
 
 The maximum number of seconds a Passenger Application process will be allowed to remain idle before being shut down. The default value is 300.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerPoolIdleTime
 
-## passenger_max_requests
+### passenger_max_requests
 
 The maximum number of request a Passenger application will process before being restarted. The default value is 0, which indicates that a process will only shut down if the Pool Idle Time (see above) expires.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
 
-## passenger_stat_throttle_rate
+### passenger_stat_throttle_rate
 
 Sets how often Passenger performs file system checks, at most once every _x_ seconds. Default is 0, which means the checks are performed with every request.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
 
-## rack_autodetect
+### rack_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is a Rack application. The default is `on`
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
 
-## rails_autodetect
+### rails_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is a Rails application. The default is on.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_lt_on_off_gt
 
-## passenger_use_global_queue
+### passenger_use_global_queue
 
 Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is the default in Passenger 4.x and the versions >= 4.x have disabled this configuration option altogether.  Use with caution.
 
+## Parameters used to load the module
+
+Unlike the tuning parameters specified above, the following parameters are only used when loading customized passenger modules.
+
+### mod_package
+
+Allows overriding the default package name used for the passenger module package.
+
+### mod_package_ensure
+
+Allows overriding the package installation setting used by puppet when installing the passenger module. The default is 'present'.
+
+### mod_id
+
+Allows overriding the value used by apache to identify the passenger module. The default is 'passenger_module'.
+
+### mod_lib_path
+
+Allows overriding the directory path used by apache when loading the passenger module. The default is the value of `$apache::params::lib_path`.
+
+### mod_lib
+
+Allows overriding the library file name used by apache when loading the passenger module. The default is 'mod_passenger.so'.
+
+### mod_path
+
+Allows overriding the full path to the library file used by apache when loading the passenger module. The default is the concatenation of the `mod_lib_path` and `mod_lib` parameters.
+
+# Dependencies
+
+RedHat-based systems will need to configure additional package repositories in order to install Passenger, specifically:
+
+* [Extra Packages for Enterprise Linux](https://fedoraproject.org/wiki/EPEL)
+* [Phusion Passenger](http://passenger.stealthymonkeys.com)
+
+Configuration of these repositories is beyond the scope of this module and is left to the user.
+
 # Attribution
 
 The Passenger tuning parameters for the `apache::mod::puppet` Puppet class was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the PuppetLabs Apache module on GitHub.
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 6a7404daa0..b39ae2634e 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -11,15 +11,13 @@
   $passenger_ruby                 = $::apache::params::passenger_ruby,
   $passenger_max_pool_size        = undef,
   $passenger_use_global_queue     = undef,
+  $mod_package                    = undef,
+  $mod_package_ensure             = undef,
+  $mod_lib                        = undef,
+  $mod_lib_path                   = undef,
+  $mod_id                         = undef,
+  $mod_path                       = undef,
 ) {
-  if $::osfamily == 'FreeBSD' {
-    ::apache::mod { 'passenger':
-      lib_path => "${passenger_root}/buildout/apache2"
-    }
-  } else {
-    ::apache::mod { 'passenger': }
-  }
-
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
     file { 'passenger_package.conf':
@@ -27,6 +25,30 @@
     }
   }
 
+  $_package = $mod_package
+  $_package_ensure = $mod_package_ensure
+  $_lib = $mod_lib
+  if $::osfamily == 'FreeBSD' {
+    if $mod_lib_path {
+      $_lib_path = $mod_lib_path
+    } else {
+      $_lib_path = "${passenger_root}/buildout/apache2"
+    }
+  } else {
+    $_lib_path = $mod_lib_path
+  }
+
+  $_id = $mod_id
+  $_path = $mod_path
+  ::apache::mod { 'passenger':
+    package        => $_package,
+    package_ensure => $_package_ensure,
+    lib            => $_lib,
+    lib_path       => $_lib_path,
+    id             => $_id,
+    path           => $_path,
+  }
+
   # Template uses:
   # - $passenger_root
   # - $passenger_ruby
diff --git a/manifests/params.pp b/manifests/params.pp
index 43f3566aff..eaedc148e7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -49,10 +49,10 @@
     $default_ssl_cert     = '/etc/pki/tls/certs/localhost.crt'
     $default_ssl_key      = '/etc/pki/tls/private/localhost.key'
     $ssl_certs_dir        = '/etc/pki/tls/certs'
-    $passenger_conf_file  = 'passenger_extra.conf'
-    $passenger_conf_package_file = 'passenger.conf'
-    $passenger_root       = undef
-    $passenger_ruby       = undef
+    $passenger_conf_file  = 'passenger.conf'
+    $passenger_conf_package_file = undef
+    $passenger_root       = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.19'
+    $passenger_ruby       = '/usr/bin/ruby'
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
new file mode 100644
index 0000000000..7443b0e8b5
--- /dev/null
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -0,0 +1,213 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::passenger class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  case fact('osfamily')
+  when 'Debian'
+    service_name = 'apache2'
+    mod_dir = '/etc/apache2/mods-available/'
+    conf_file = "#{mod_dir}passenger.conf"
+    load_file = "#{mod_dir}passenger.load"
+    passenger_root = '/usr'
+    passenger_ruby = '/usr/bin/ruby'
+    passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so'
+    rackapp_user = 'www-data'
+    rackapp_group = 'www-data'
+  when 'RedHat'
+    service_name = 'httpd'
+    mod_dir = '/etc/httpd/conf.d/'
+    conf_file = "#{mod_dir}passenger.conf"
+    load_file = "#{mod_dir}passenger.load"
+    passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.19'
+    passenger_ruby = '/usr/bin/ruby'
+    passenger_module_path = 'modules/mod_passenger.so'
+    rackapp_user = 'apache'
+    rackapp_group = 'apache'
+  end
+
+  pp_rackapp = <<-EOS
+          /* a simple ruby rack 'hellow world' app */
+          file { '/var/www/passenger':
+            ensure  => directory,
+            owner   => '#{rackapp_user}',
+            group   => '#{rackapp_group}',
+            require => Class['apache::mod::passenger'],
+          }
+          file { '/var/www/passenger/config.ru':
+            ensure  => file,
+            owner   => '#{rackapp_user}',
+            group   => '#{rackapp_group}',
+            content => "app = proc { |env| [200, { \\"Content-Type\\" => \\"text/html\\" }, [\\"hello <b>world</b>\\"]] }\\nrun app",
+            require => File['/var/www/passenger'] ,
+          }
+          apache::vhost { 'passenger.example.com':
+            port    => '80',
+            docroot => '/var/www/passenger/public',
+            docroot_group => '#{rackapp_group}' ,
+            docroot_owner => '#{rackapp_user}' ,
+            custom_fragment => "PassengerRuby  #{passenger_ruby}\\nRailsEnv  development" ,
+            require => File['/var/www/passenger/config.ru'] ,
+          }
+          host { 'passenger.example.com': ip => '127.0.0.1', }
+  EOS
+
+  case fact('osfamily')
+  when 'Debian'
+    context "default passenger config" do
+      it 'succeeds in puppeting passenger' do
+        pp = <<-EOS
+          /* stock apache and mod_passenger */
+          class { 'apache': }
+          class { 'apache::mod::passenger': }
+          #{pp_rackapp}
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe service(service_name) do
+        it { should be_enabled }
+        it { should be_running }
+      end
+      
+      describe file(conf_file) do
+        it { should contain "PassengerRoot \"#{passenger_root}\"" }
+        it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+      end
+
+      describe file(load_file) do
+        it { should contain "LoadModule passenger_module #{passenger_module_path}" }
+      end
+
+      it 'should output status via passenger-memory-stats' do
+        shell("sudo /usr/sbin/passenger-memory-stats") do |r|
+          r.stdout.should =~ /Apache processes/
+          r.stdout.should =~ /Nginx processes/
+          r.stdout.should =~ /Passenger processes/
+          r.stdout.should =~ /### Processes: [0-9]+/
+          r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+      
+          r.exit_code.should == 0
+        end
+      end
+      
+      # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
+      # even when the passenger process is successfully installed and running
+      unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
+        it 'should output status via passenger-status' do
+          # xml output not available on ubunutu <= 10.04, so sticking with default pool output
+          shell("sudo /usr/sbin/passenger-status") do |r|
+            # spacing may vary
+            r.stdout.should =~ /[\-]+ General information [\-]+/
+            r.stdout.should =~ /max[ ]+= [0-9]+/
+            r.stdout.should =~ /count[ ]+= [0-9]+/
+            r.stdout.should =~ /active[ ]+= [0-9]+/
+            r.stdout.should =~ /inactive[ ]+= [0-9]+/
+            r.stdout.should =~ /Waiting on global queue: [0-9]+/
+      
+            r.exit_code.should == 0
+          end
+        end
+      end
+      
+      it 'should answer to passenger.example.com' do
+        shell("/usr/bin/curl passenger.example.com:80") do |r|
+          r.stdout.should =~ /^hello <b>world<\/b>$/
+          r.exit_code.should == 0
+        end
+      end
+      
+    end
+
+  when 'RedHat'
+    # no fedora 18 passenger package yet
+    unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18)
+
+      context "default passenger config" do
+        it 'succeeds in puppeting passenger' do
+          pp = <<-EOS
+            /* EPEL and passenger repositories */
+            class { 'epel': }
+            exec { 'passenger.repo GPG key':
+              command => '/usr/bin/sudo /usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
+              creates => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
+            }
+            file { 'passenger.repo GPG key':
+              ensure  => file,
+              path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
+              require => Exec['passenger.repo GPG key'],
+            }
+            epel::rpm_gpg_key { 'passenger.stealthymonkeys.com':
+              path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
+              require => [
+                Class['epel'],
+                File['passenger.repo GPG key'],
+              ]
+            }
+            yumrepo { 'passenger':
+              baseurl         => 'http://passenger.stealthymonkeys.com/rhel/$releasever/$basearch' ,
+              descr           => 'Red Hat Enterprise $releasever - Phusion Passenger',
+              enabled         => 1,
+              gpgcheck        => 1,
+              gpgkey          => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
+              mirrorlist      => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
+              require => [
+                Epel::Rpm_gpg_key['passenger.stealthymonkeys.com'],
+              ],
+            }
+            /* apache and mod_passenger */
+            class { 'apache':
+                require => [
+                  Class['epel'],
+              ],
+            }
+            class { 'apache::mod::passenger':
+              require => [
+                Yumrepo['passenger']
+              ],
+            }
+            #{pp_rackapp}
+          EOS
+          apply_manifest(pp, :catch_failures => true)
+        end
+
+        describe service(service_name) do
+          it { should be_enabled }
+          it { should be_running }
+        end
+      
+        describe file(conf_file) do
+          it { should contain "PassengerRoot \"#{passenger_root}\"" }
+          it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+        end
+
+        describe file(load_file) do
+          it { should contain "LoadModule passenger_module #{passenger_module_path}" }
+        end
+
+        # note: passenger-memory-stats is not installed on Redhat
+
+        it 'should output status via passenger-status' do
+          shell("sudo /usr/bin/passenger-status") do |r|
+            # spacing may vary
+            r.stdout.should =~ /[\-]+ General information [\-]+/
+            r.stdout.should =~ /max[ ]+= [0-9]+/
+            r.stdout.should =~ /count[ ]+= [0-9]+/
+            r.stdout.should =~ /active[ ]+= [0-9]+/
+            r.stdout.should =~ /inactive[ ]+= [0-9]+/
+            r.stdout.should =~ /Waiting on global queue: [0-9]+/
+      
+            r.exit_code.should == 0
+          end
+        end
+      
+        it 'should answer to passenger.example.com' do
+          shell("/usr/bin/curl passenger.example.com:80") do |r|
+            r.stdout.should =~ /^hello <b>world<\/b>$/
+            r.exit_code.should == 0
+          end
+        end
+      end
+
+    end
+
+  end
+end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 37177f477f..e65798a355 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -13,6 +13,9 @@
     it { should contain_class("apache::params") }
     it { should contain_apache__mod('passenger') }
     it { should contain_package("libapache2-mod-passenger") }
+    it { should contain_file('passenger.load').with({
+      'path' => '/etc/apache2/mods-available/passenger.load',
+    }) }
     it { should contain_file('passenger.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
@@ -78,6 +81,30 @@
       end
       it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue true$/) }
     end
+    describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
+      let :params do
+        { :mod_path => '/usr/lib/foo/mod_foo.so' }
+      end
+      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
+    end
+    describe "with mod_lib_path => '/usr/lib/foo'" do
+      let :params do
+        { :mod_lib_path => '/usr/lib/foo' }
+      end
+      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
+    end
+    describe "with mod_lib => 'mod_foo.so'" do
+      let :params do
+        { :mod_lib => 'mod_foo.so' }
+      end
+      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
+    end
+    describe "with mod_id => 'mod_foo'" do
+      let :params do
+        { :mod_id => 'mod_foo' }
+      end
+      it { should contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
+    end
 
   end
   context "on a RedHat OS" do
@@ -91,16 +118,11 @@
     it { should contain_class("apache::params") }
     it { should contain_apache__mod('passenger') }
     it { should contain_package("mod_passenger") }
-    it { should contain_file('passenger_package.conf').with({
-      'path' => '/etc/httpd/conf.d/passenger.conf',
-    }) }
-    it { should contain_file('passenger_package.conf').without_content }
-    it { should contain_file('passenger_package.conf').without_source }
-    it { should contain_file('passenger.conf').with({
-      'path' => '/etc/httpd/conf.d/passenger_extra.conf',
+    it { should contain_file('passenger.load').with({
+      'path' => '/etc/httpd/conf.d/passenger.load',
     }) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+    it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/ruby\/gems\/1.8\/gems\/passenger-3\.0\.19"$/) }
+    it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/bin\/ruby"/) }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }

From fa0fd41938cba1ae2433fd89a15af217aef6cee9 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Sat, 29 Mar 2014 07:29:19 -0400
Subject: [PATCH 0195/2267] fix inverted ssl compression

Apache 2.4 defaults SSLCompression Off. The ssl module provides a
parameter for ssl_compression which defaults false. If it is set
to true, the template actually would add another SSLCompression Off
stanza (not the expected SSLCompression On).
---
 templates/mod/ssl.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index e1597f2f8b..bcaddffe70 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -11,7 +11,7 @@
   SSLSessionCache "shmcb:<%= @session_cache %>"
   SSLSessionCacheTimeout 300
 <% if @ssl_compression -%>
-  SSLCompression Off
+  SSLCompression On
 <% end -%>
   <% if @apache_version >= '2.4' -%>
   Mutex <%= @ssl_mutex %>

From 679e3ddd6ee2ee6fd6a631568cc2ef68ac07ed30 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Sat, 29 Mar 2014 07:33:30 -0400
Subject: [PATCH 0196/2267] allow global setting of SSL cipher

ssl_cipher is setable per vhost already, this makes it an option
that can be sent once per the entire configuration instead of at
each vhost.
---
 manifests/mod/ssl.pp       | 1 +
 templates/mod/ssl.conf.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index d644ac5ef7..7370746e60 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,6 +1,7 @@
 class apache::mod::ssl (
   $ssl_compression = false,
   $ssl_options     = [ 'StdEnvVars' ],
+  $ssl_cipher      = 'HIGH:MEDIUM:!aNULL:!MD5',
   $apache_version  = $::apache::apache_version,
 ) {
   $session_cache = $::osfamily ? {
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index bcaddffe70..a393193a76 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -20,7 +20,7 @@
   <% end -%>
   SSLCryptoDevice builtin
   SSLHonorCipherOrder On
-  SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
+  SSLCipherSuite <%= @ssl_cipher %>
   SSLProtocol all -SSLv2
 <% if @ssl_options -%>
   SSLOptions <%= @ssl_options.compact.join(' ') %>

From ee1d846f0c6d1b910ee70a8acd2cb522d0258fc3 Mon Sep 17 00:00:00 2001
From: arnoudj <arnoud@de-jonge.org>
Date: Tue, 1 Apr 2014 15:38:09 +0200
Subject: [PATCH 0197/2267] Allow Apache service not to be managed by Puppet

Currently Apache can either configured to be 'running' or 'stopped'. In our cluster setup Apache is managed by Pacemaker, so Puppet should not interfere. Setting ensure to 'UNSET' will now set ensure to undef for the Apache service.
---
 manifests/service.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/service.pp b/manifests/service.pp
index e958b1bc51..acb01473c4 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -27,8 +27,13 @@
   }
   validate_bool($service_enable)
 
+  $_service_ensure = $service_ensure ? {
+    'UNSET' => undef,
+    default => $service_ensure,
+  }
+  
   service { 'httpd':
-    ensure => $service_ensure,
+    ensure => $_service_ensure,
     name   => $service_name,
     enable => $service_enable,
   }

From 97ba6c5c53fcaddce51f4387cb343d946f474c32 Mon Sep 17 00:00:00 2001
From: Matt Dainty <matt@bodgit-n-scarper.com>
Date: Mon, 3 Feb 2014 16:12:11 +0000
Subject: [PATCH 0198/2267] Add support for SetHandler directive

---
 README.md                        | 15 +++++++++++++++
 templates/vhost/_directories.erb |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/README.md b/README.md
index 53e68e164d..9bfc8e7516 100644
--- a/README.md
+++ b/README.md
@@ -1335,6 +1335,21 @@ Sets the order of processing Allow and Deny statements as per [Apache core docum
     }
 ```
 
+######`sethandler`
+
+Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [ 
+        { path       => '/path/to/directory', 
+          sethandler => 'None', 
+        }
+      ],
+    }
+```
+
 ######`passenger_enabled`
 
 Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 516d0798da..efa26ce4e9 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -63,6 +63,9 @@
     AddHandler <%= addhandler['handler'] %> <%= Array(addhandler['extensions']).join(' ') %>
       <%- end -%>
     <%- end -%>
+    <%- if directory['sethandler'] and directory['sethandler'] != '' -%>
+    SetHandler <%= directory['sethandler'] %>
+    <%- end -%>
     <%- if directory['passenger_enabled'] and directory['passenger_enabled'] != '' -%>
     PassengerEnabled <%= directory['passenger_enabled'] %>
     <%- end -%>

From b05d141a8d81f871e9540f8fb53aba926e9d82d4 Mon Sep 17 00:00:00 2001
From: Matt Dainty <matt@bodgit-n-scarper.com>
Date: Tue, 4 Feb 2014 16:33:36 +0000
Subject: [PATCH 0199/2267] Add SetHandler tests

---
 spec/acceptance/vhost_spec.rb | 32 ++++++++++++++++++++++++++++++++
 spec/defines/vhost_spec.rb    |  2 ++
 2 files changed, 34 insertions(+)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index a2fa419407..01c9dcbb0f 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -252,6 +252,38 @@ class { 'apache': }
         shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
       end
     end
+
+    describe 'SetHandler directive' do
+      it 'should configure a vhost with a SetHandler directive' do
+        pp = <<-EOS
+          class { 'apache': }
+          apache::mod { 'status': }
+          host { 'files.example.net': ip => '127.0.0.1', }
+          apache::vhost { 'files.example.net':
+            docroot     => '/var/www/files',
+            directories => [
+              { path => '/var/www/files', },
+              { path => '/server-status', provider => 'location', sethandler => 'server-status', },
+            ],
+          }
+          file { '/var/www/files/index.html':
+            ensure  => file,
+            content => "Hello World\\n",
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe service($service_name) do
+        it { should be_enabled }
+        it { should be_running }
+      end
+
+      it 'should answer to files.example.net' do
+        shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
+        shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout.should match(/Scoreboard: /)
+      end
+    end
   end
 
   case fact('lsbdistcodename')
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b16ce88404..234fdbd0b0 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -686,6 +686,7 @@
             'options'           => '-MultiViews',
             'order'             => 'deny,yned',
             'passenger_enabled' => 'onf',
+            'sethandler'        => 'None',
           },
           :match    => [
             /^  <Directory "\/opt\/app">$/,
@@ -695,6 +696,7 @@
             /^    Deny from google.com$/,
             /^    Options -MultiViews$/,
             /^    Order deny,yned$/,
+            /^    SetHandler None$/,
             /^    PassengerEnabled onf$/,
             /^  <\/Directory>$/,
           ],

From f4b824120447013e63b73ea366b43a5ed8e4fe6b Mon Sep 17 00:00:00 2001
From: Arnoud de Jonge <arnoud@de-jonge.org>
Date: Thu, 3 Apr 2014 12:47:17 +0000
Subject: [PATCH 0200/2267] The apache class now accepts true, false, 'running'
 or 'stopped' for the parameter service_ensure. Any other value wil result in
 the parameter 'ensure' for the Apache service being set to undef.

---
 README.md                    |  2 +-
 manifests/service.pp         | 12 ++++++++----
 spec/classes/service_spec.rb |  5 +++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 53e68e164d..f530992264 100644
--- a/README.md
+++ b/README.md
@@ -388,7 +388,7 @@ Determines whether the HTTPD service is enabled when the machine is booted. Defa
 
 #####`service_ensure`
 
-Determines whether the service should be running. Can be set to 'undef', which is useful when you want to let the service be managed by some other application like Pacemaker. Defaults to 'running'.
+Determines whether the service should be running. Valid values are true, false, 'running' or 'stopped' when Puppet should manage the service. Any other value will set ensure to false for the Apache service, which is useful when you want to let the service be managed by some other application like Pacemaker. Defaults to 'running'.
 
 #####`service_name`
 
diff --git a/manifests/service.pp b/manifests/service.pp
index acb01473c4..381741c68d 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -27,11 +27,15 @@
   }
   validate_bool($service_enable)
 
-  $_service_ensure = $service_ensure ? {
-    'UNSET' => undef,
-    default => $service_ensure,
+  case $service_ensure {
+    true, false, 'running', 'stopped': {
+      $_service_enable = $service_enable
+    }
+    default: {
+      $_service_enable = undef
+    }
   }
-  
+
   service { 'httpd':
     ensure => $_service_ensure,
     name   => $service_name,
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index accc549462..5419a68160 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -72,6 +72,11 @@
         )
       }
     end
+
+    context "with $service_ensure => 'UNDEF'" do
+      let (:params) {{ :service_ensure => 'UNDEF' }}
+      it { should contain_service("httpd").without_ensure }
+    end
   end
 
 

From d37004a7de5c77df461531971e8db5f941b48239 Mon Sep 17 00:00:00 2001
From: Arnoud de Jonge <arnoud@de-jonge.org>
Date: Thu, 3 Apr 2014 13:10:37 +0000
Subject: [PATCH 0201/2267] Whoops

---
 manifests/service.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/service.pp b/manifests/service.pp
index 381741c68d..0c1f7b96aa 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -29,10 +29,10 @@
 
   case $service_ensure {
     true, false, 'running', 'stopped': {
-      $_service_enable = $service_enable
+      $_service_ensure = $service_ensure
     }
     default: {
-      $_service_enable = undef
+      $_service_ensure = undef
     }
   }
 

From 9aa2ded1a2aec47aa31f1ccc592defed5547c585 Mon Sep 17 00:00:00 2001
From: Ryan Chouinard <rchouinard@gmail.com>
Date: Wed, 26 Feb 2014 18:27:21 -0500
Subject: [PATCH 0202/2267] Add basic support for mod_speling

---
 README.md                        |  1 +
 manifests/default_mods.pp        |  4 ++--
 manifests/mod/speling.pp         |  3 +++
 spec/classes/mod/speling_spec.rb | 26 ++++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 manifests/mod/speling.pp
 create mode 100644 spec/classes/mod/speling_spec.rb

diff --git a/README.md b/README.md
index 9bfc8e7516..3d422fd092 100644
--- a/README.md
+++ b/README.md
@@ -468,6 +468,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `rewrite`
 * `rpaf`*
 * `setenvif`
+* `speling`
 * `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl) below)
 * `status`*
 * `suphp`
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index af98896216..cf26e2802f 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -27,6 +27,7 @@
         include ::apache::mod::mime_magic
         include ::apache::mod::vhost_alias
         include ::apache::mod::rewrite
+        include ::apache::mod::speling
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
         ::apache::mod { 'authn_dbm': }
@@ -36,7 +37,6 @@
         ::apache::mod { 'ext_filter': }
         ::apache::mod { 'include': }
         ::apache::mod { 'logio': }
-        ::apache::mod { 'speling': }
         ::apache::mod { 'substitute': }
         ::apache::mod { 'suexec': }
         ::apache::mod { 'usertrack': }
@@ -65,6 +65,7 @@
         include ::apache::mod::rewrite
         include ::apache::mod::userdir
         include ::apache::mod::vhost_alias
+        include ::apache::mod::speling
 
         ::apache::mod { 'asis': }
         ::apache::mod { 'auth_digest': }
@@ -83,7 +84,6 @@
         ::apache::mod { 'imagemap':}
         ::apache::mod { 'include': }
         ::apache::mod { 'logio': }
-        ::apache::mod { 'speling': }
         ::apache::mod { 'unique_id': }
         ::apache::mod { 'usertrack': }
         ::apache::mod { 'version': }
diff --git a/manifests/mod/speling.pp b/manifests/mod/speling.pp
new file mode 100644
index 0000000000..eb46d78f04
--- /dev/null
+++ b/manifests/mod/speling.pp
@@ -0,0 +1,3 @@
+class apache::mod::speling {
+  ::apache::mod { 'speling': }
+}
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
new file mode 100644
index 0000000000..987291a3f3
--- /dev/null
+++ b/spec/classes/mod/speling_spec.rb
@@ -0,0 +1,26 @@
+describe 'apache::mod::speling', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should contain_apache__mod('speling') }
+  end
+
+  context "on a RedHat OS" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { should contain_apache__mod('speling') }
+  end
+end

From 1fa0d705fde87e86ffe2e7608c872976c9802d80 Mon Sep 17 00:00:00 2001
From: Christian Kaenzig <christian.kaenzig@camptocamp.com>
Date: Sat, 5 Apr 2014 15:37:30 +0200
Subject: [PATCH 0203/2267] add docroot_mode parameter to vhost

---
 README.md                     | 4 ++++
 manifests/vhost.pp            | 2 ++
 spec/acceptance/vhost_spec.rb | 2 ++
 spec/defines/vhost_spec.rb    | 6 ++++--
 tests/vhost.pp                | 3 ++-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 53e68e164d..50ca5ea00e 100644
--- a/README.md
+++ b/README.md
@@ -674,6 +674,10 @@ Sets group access to the docroot directory. Defaults to 'root'.
 
 Sets individual user access to the docroot directory. Defaults to 'root'.
 
+#####`docroot_mode`
+
+Sets access permissions of the docroot directory. Defaults to 'undef'.
+
 #####`error_log`
 
 Specifies whether `*_error.log` directives should be configured. Defaults to 'true'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b6c75dc51e..7cfe11ab4d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -94,6 +94,7 @@
     $add_listen                  = true,
     $docroot_owner               = 'root',
     $docroot_group               = $::apache::params::root_group,
+    $docroot_mode                = undef,
     $serveradmin                 = undef,
     $ssl                         = false,
     $ssl_cert                    = $::apache::default_ssl_cert,
@@ -262,6 +263,7 @@
       ensure  => directory,
       owner   => $docroot_owner,
       group   => $docroot_group,
+      mode    => $docroot_mode,
       require => Package['httpd'],
     }
   }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index a2fa419407..0353f58c04 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -427,6 +427,7 @@ class { 'apache': }
           docroot       => '/tmp/test',
           docroot_owner => 'test_owner',
           docroot_group => 'test_group',
+          docroot_mode  => '0750',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -436,6 +437,7 @@ class { 'apache': }
       it { should be_directory }
       it { should be_owned_by 'test_owner' }
       it { should be_grouped_into 'test_group' }
+      it { should be_mode '0750' }
     end
   end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b16ce88404..efba89dd90 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1096,16 +1096,18 @@
           expect { subject }.to raise_error(Puppet::Error, /'error_log_file' and 'error_log_pipe' cannot be defined at the same time/)
         end
       end
-      describe 'when docroot owner is specified' do
+      describe 'when docroot owner and mode is specified' do
         let :params do default_params.merge({
           :docroot_owner => 'testuser',
           :docroot_group => 'testgroup',
+          :docroot_mode  => '0750',
         }) end
-        it 'should set vhost ownership' do
+        it 'should set vhost ownership and permissions' do
           should contain_file(params[:docroot]).with({
             :ensure => :directory,
             :owner  => 'testuser',
             :group  => 'testgroup',
+            :mode   => '0750',
           })
         end
       end
diff --git a/tests/vhost.pp b/tests/vhost.pp
index f0d3f58e47..a6c61360a7 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -13,12 +13,13 @@
   docroot => '/var/www/first',
 }
 
-# Vhost with different docroot owner/group
+# Vhost with different docroot owner/group/mode
 apache::vhost { 'second.example.com':
   port          => '80',
   docroot       => '/var/www/second',
   docroot_owner => 'third',
   docroot_group => 'third',
+  docroot_mode  => '0770',
 }
 
 # Vhost with serveradmin

From 73f94870ebbf39f62073675c7228faf4cbee19b8 Mon Sep 17 00:00:00 2001
From: jonoterc <jon_obuchowski@terc.edu>
Date: Mon, 7 Apr 2014 13:41:47 -0400
Subject: [PATCH 0204/2267] revert apache::mod::passenger default parameters
 for RedHat

The prior commit modified the default parameters for mod::passenger for
RedHat, hardcoding paths related to the installed package; these changes
were unnecessary and are being reverted.

The changes were originally prompted by (new) spec acceptance temps
leveraging passenger-status (to verify that passenger is running); these
tests were not working under RedHat; revisiting with the original
default parameters revealed that the RedHat tests were misconfigured
(the required PASSENGER_TMPDIR environment was not being set), so those
have been corrected.

Also, spec/class tests have be reverted to reflect the (reverted)
expected parameters.
---
 manifests/params.pp                   |  8 +++---
 spec/acceptance/mod_passenger_spec.rb | 41 ++++++++++++++++++---------
 spec/classes/mod/passenger_spec.rb    |  9 ++++--
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index eaedc148e7..43f3566aff 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -49,10 +49,10 @@
     $default_ssl_cert     = '/etc/pki/tls/certs/localhost.crt'
     $default_ssl_key      = '/etc/pki/tls/private/localhost.key'
     $ssl_certs_dir        = '/etc/pki/tls/certs'
-    $passenger_conf_file  = 'passenger.conf'
-    $passenger_conf_package_file = undef
-    $passenger_root       = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.19'
-    $passenger_ruby       = '/usr/bin/ruby'
+    $passenger_conf_file  = 'passenger_extra.conf'
+    $passenger_conf_package_file = 'passenger.conf'
+    $passenger_root       = undef
+    $passenger_ruby       = undef
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 7443b0e8b5..e1ea23ec80 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -17,8 +17,10 @@
     mod_dir = '/etc/httpd/conf.d/'
     conf_file = "#{mod_dir}passenger.conf"
     load_file = "#{mod_dir}passenger.load"
-    passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.19'
+    # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part
+    passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.1'
     passenger_ruby = '/usr/bin/ruby'
+    passenger_tempdir = '/var/run/rubygem-passenger'
     passenger_module_path = 'modules/mod_passenger.so'
     rackapp_user = 'apache'
     rackapp_group = 'apache'
@@ -67,7 +69,7 @@ class { 'apache::mod::passenger': }
         it { should be_enabled }
         it { should be_running }
       end
-      
+
       describe file(conf_file) do
         it { should contain "PassengerRoot \"#{passenger_root}\"" }
         it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
@@ -84,11 +86,11 @@ class { 'apache::mod::passenger': }
           r.stdout.should =~ /Passenger processes/
           r.stdout.should =~ /### Processes: [0-9]+/
           r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
-      
+
           r.exit_code.should == 0
         end
       end
-      
+
       # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
       # even when the passenger process is successfully installed and running
       unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
@@ -102,19 +104,19 @@ class { 'apache::mod::passenger': }
             r.stdout.should =~ /active[ ]+= [0-9]+/
             r.stdout.should =~ /inactive[ ]+= [0-9]+/
             r.stdout.should =~ /Waiting on global queue: [0-9]+/
-      
+
             r.exit_code.should == 0
           end
         end
       end
-      
+
       it 'should answer to passenger.example.com' do
         shell("/usr/bin/curl passenger.example.com:80") do |r|
           r.stdout.should =~ /^hello <b>world<\/b>$/
           r.exit_code.should == 0
         end
       end
-      
+
     end
 
   when 'RedHat'
@@ -173,20 +175,31 @@ class { 'apache::mod::passenger':
           it { should be_enabled }
           it { should be_running }
         end
-      
+
         describe file(conf_file) do
-          it { should contain "PassengerRoot \"#{passenger_root}\"" }
-          it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+          it { should contain "PassengerRoot #{passenger_root}" }
+          it { should contain "PassengerRuby #{passenger_ruby}" }
+          it { should contain "PassengerTempDir #{passenger_tempdir}" }
         end
 
         describe file(load_file) do
           it { should contain "LoadModule passenger_module #{passenger_module_path}" }
         end
 
-        # note: passenger-memory-stats is not installed on Redhat
+        it 'should output status via passenger-memory-stats' do
+          shell("sudo /usr/bin/passenger-memory-stats") do |r|
+            r.stdout.should =~ /Apache processes/
+            r.stdout.should =~ /Nginx processes/
+            r.stdout.should =~ /Passenger processes/
+            r.stdout.should =~ /### Processes: [0-9]+/
+            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+
+            r.exit_code.should == 0
+          end
+        end
 
         it 'should output status via passenger-status' do
-          shell("sudo /usr/bin/passenger-status") do |r|
+          shell("sudo PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
             # spacing may vary
             r.stdout.should =~ /[\-]+ General information [\-]+/
             r.stdout.should =~ /max[ ]+= [0-9]+/
@@ -194,11 +207,11 @@ class { 'apache::mod::passenger':
             r.stdout.should =~ /active[ ]+= [0-9]+/
             r.stdout.should =~ /inactive[ ]+= [0-9]+/
             r.stdout.should =~ /Waiting on global queue: [0-9]+/
-      
+
             r.exit_code.should == 0
           end
         end
-      
+
         it 'should answer to passenger.example.com' do
           shell("/usr/bin/curl passenger.example.com:80") do |r|
             r.stdout.should =~ /^hello <b>world<\/b>$/
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index e65798a355..08cff41554 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -118,11 +118,16 @@
     it { should contain_class("apache::params") }
     it { should contain_apache__mod('passenger') }
     it { should contain_package("mod_passenger") }
+    it { should contain_file('passenger_package.conf').with({
+      'path' => '/etc/httpd/conf.d/passenger.conf',
+    }) }
+    it { should contain_file('passenger_package.conf').without_content }
+    it { should contain_file('passenger_package.conf').without_source }
     it { should contain_file('passenger.load').with({
       'path' => '/etc/httpd/conf.d/passenger.load',
     }) }
-    it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/ruby\/gems\/1.8\/gems\/passenger-3\.0\.19"$/) }
-    it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/bin\/ruby"/) }
+    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
+    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }

From 5ab2a471e46c3d12b6999cd13613828085bf69f6 Mon Sep 17 00:00:00 2001
From: Bryan Hughes <khan@nmt.edu>
Date: Thu, 3 Apr 2014 14:13:18 -0600
Subject: [PATCH 0205/2267] Add rewrites to vhost directories

(#MODULES-111) Duplicate rewrites parameter from apache::vhost
as an array of hashes placed in the directories parameter
to enable use of mod_rewrite directives in vhost directories.

Add documentation to Parameter directories for apache::vhost for
rewrites array.

Add tests to vhost directory rewrites

Add spec/acceptance and spec/defines tests for vhost entries of
directory with rewrites.

These tests are based on WP permalinks.
---
 README.md                        | 25 ++++++++++++
 spec/acceptance/vhost_spec.rb    | 39 ++++++++++++++++++
 spec/defines/vhost_spec.rb       | 68 ++++++++++++++++++++++++++++++++
 templates/vhost/_directories.erb | 24 +++++++++++
 4 files changed, 156 insertions(+)

diff --git a/README.md b/README.md
index 9bfc8e7516..8c5ca23708 100644
--- a/README.md
+++ b/README.md
@@ -1371,6 +1371,31 @@ Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/
 
 `php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
 
+######`rewrites`
+
+Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
+
+```puppet
+    apache::vhost { 'secure.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path        => '/path/to/directory',
+          rewrites => [ { comment      => 'Permalink Rewrites',
+                          rewrite_base => '/'
+                        },
+                        { rewrite_rule => [ '^index\.php$ - [L]' ]
+                        },
+                        { rewrite_cond => [ '%{REQUEST_FILENAME} !-f',
+                                            '%{REQUEST_FILENAME} !-d',
+                                          ],
+                          rewrite_rule => [ '. /index.php [L]' ],
+                        }
+                      ],
+        },
+      ],
+    }
+```
+
 ######`ssl_options`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 01c9dcbb0f..f1be842620 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -874,6 +874,45 @@ class { 'apache': }
     end
   end
 
+  describe 'directory rewrite rules' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot      => '/tmp',
+          directories  => [
+            {
+            path => '/tmp',
+            rewrites => [
+              {
+              comment => 'Permalink Rewrites',
+              rewrite_base => '/',
+              },
+              { rewrite_rule => [ '^index\.php$ - [L]' ] },
+              { rewrite_cond => [
+                '%{REQUEST_FILENAME} !-f',
+                '%{REQUEST_FILENAME} !-d',                                                                                             ],                                                                                                                     rewrite_rule => [ '. /index.php [L]' ],                                                                              }
+              ],
+            },
+            ],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain '#Permalink Rewrites' }
+      it { should contain 'RewriteEngine On' }
+      it { should contain 'RewriteBase /' }
+      it { should contain 'RewriteRule ^index\.php$ - [L]' }
+      it { should contain 'RewriteCond %{REQUEST_FILENAME} !-f' }
+      it { should contain 'RewriteCond %{REQUEST_FILENAME} !-d' }
+      it { should contain 'RewriteRule . /index.php [L]' }
+    end
+  end
+
   describe 'setenv/setenvif' do
     it 'applies cleanly' do
       pp = <<-EOS
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 234fdbd0b0..4941ecf33d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -739,6 +739,40 @@
             /^  <\/Directory>$/,
           ],
         },
+        {
+          :title  => 'should accept directory directives with rewrites array',
+          :attr   => 'directories',
+          :value  => [
+            {
+              'path'      => '/opt/app3',
+              'rewrites'  => [
+                {
+                  'comment' => 'Permalink Rewrites',
+                  'rewrite_base' => '/',
+                  'rewrite_rule' => [ '^index\.php$ - [L]' ],
+                },
+                {
+                  'rewrite_cond' => [
+                    '%{REQUEST_FILENAME} !-f',
+                    '%{REQUEST_FILENAME} !-d',
+                  ],
+                  'rewrite_rule' => [ '. /index.php [L]' ],
+                }
+              ]
+            }
+          ],
+          :match  => [
+            /^  <Directory "\/opt\/app3">$/,
+            /^    #Permalink Rewrites$/,
+            /^    RewriteEngine On$/,
+            /^    RewriteBase \/$/,
+            /^    RewriteRule \^index\\.php\$ - \[L\]$/,
+            /^    RewriteCond %{REQUEST_FILENAME} !-f$/,
+            /^    RewriteCond %{REQUEST_FILENAME} !-d$/,
+            /^    RewriteRule . \/index.php \[L\]$/,
+            /^  <\/Directory>$/,
+          ],
+        },
         {
           :title => 'should accept location for provider',
           :attr  => 'directories',
@@ -879,6 +913,40 @@
             /^  <\/Directory>$/,
           ],
         },
+        {
+          :title  => 'should accept directory directives with rewrites array',
+          :attr   => 'directories',
+          :value  => [
+            {
+              'path'      => '/opt/app3',
+              'rewrites'  => [
+                {
+                  'comment' => 'Permalink Rewrites',
+                  'rewrite_base' => '/',
+                  'rewrite_rule' => [ '^index\.php$ - [L]' ],
+                },
+                {
+                  'rewrite_cond' => [
+                    '%{REQUEST_FILENAME} !-f',
+                    '%{REQUEST_FILENAME} !-d',
+                  ],
+                  'rewrite_rule' => [ '. /index.php [L]' ],
+                }
+              ]
+            }
+          ],
+          :match  => [
+            /^  <Directory "\/opt\/app3">$/,
+            /^    #Permalink Rewrites$/,
+            /^    RewriteEngine On$/,
+            /^    RewriteBase \/$/,
+            /^    RewriteRule \^index\\.php\$ - \[L\]$/,
+            /^    RewriteCond %{REQUEST_FILENAME} !-f$/,
+            /^    RewriteCond %{REQUEST_FILENAME} !-d$/,
+            /^    RewriteRule . \/index.php \[L\]$/,
+            /^  <\/Directory>$/,
+          ],
+        },
         {
           :title => 'should accept location for provider',
           :attr  => 'directories',
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index efa26ce4e9..dbc38e41ec 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -153,6 +153,30 @@
     <%- if directory['suphp'] and @suphp_engine == 'on' -%>
     suPHP_UserGroup <%= directory['suphp']['user'] %> <%= directory['suphp']['group'] %>
     <%- end -%>
+    <%- if directory['rewrites'] -%>
+    # Rewrite rules
+    RewriteEngine On
+    <%- directory['rewrites'].flatten.compact.each do |rewrite_details| -%>
+      <%- if rewrite_details['comment'] -%>
+    #<%= rewrite_details['comment'] %>
+      <%- end -%>
+      <%- if rewrite_details['rewrite_base'] -%>
+    RewriteBase <%= rewrite_details['rewrite_base'] %>
+     <%- end -%>
+      <%- if rewrite_details['rewrite_cond'] -%>
+        <%- Array(rewrite_details['rewrite_cond']).each do |commands| -%>
+          <%- Array(commands).each do |command| -%>
+    RewriteCond <%= command %>
+          <%- end -%>
+        <%- end -%>
+      <%- end -%>
+      <%- Array(rewrite_details['rewrite_rule']).each do |commands| -%>
+       <%- Array(commands).each do |command| -%>
+    RewriteRule <%= command %>
+       <%- end -%>
+      <%- end -%>
+    <%- end -%>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>

From 00fb3fa4c8d7cf37791a433586e1e28181bf97a4 Mon Sep 17 00:00:00 2001
From: Chris Baldauf <chris.baldauf@gmail.com>
Date: Fri, 11 Apr 2014 20:54:48 -0400
Subject: [PATCH 0206/2267] Fixing typo with braces in the rewrite section.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9bfc8e7516..98cebb9a97 100644
--- a/README.md
+++ b/README.md
@@ -927,7 +927,7 @@ Multiple rewrites and conditions are also possible
           rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
           rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
         },
-        }
+        {
           rewrite_base => /apps/,
           rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
         },

From a444355f84445c0dcf2ca475f07bbbd1a64eb963 Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <sander@hoentjen.eu>
Date: Mon, 14 Apr 2014 14:34:25 +0200
Subject: [PATCH 0207/2267] order proxy_set option so it doesn't change between
 runs

---
 manifests/balancer.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index ac2bc88e44..173aaec2dd 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -71,7 +71,7 @@
     ensure  => present,
     target  => $target,
     order   => '19',
-    content => inline_template("<% proxy_set.each do |key, value| %> Proxyset <%= key %>=<%= value %>\n<% end %>"),
+    content => inline_template("<% proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= proxy_set[key] %>\n<% end %>"),
   }
 
   concat::fragment { "01-${name}-footer":

From a6f92a98b864e218eb3fde0405ffcca1a1bde2f3 Mon Sep 17 00:00:00 2001
From: Bram Vogelaar <bram@attachmentgenie.com>
Date: Tue, 22 Apr 2014 15:04:18 +0200
Subject: [PATCH 0208/2267] turning MaxKeepAliveRequests into a variable

---
 manifests/init.pp                         | 2 ++
 manifests/params.pp                       | 3 +++
 spec/acceptance/apache_parameters_spec.rb | 3 ++-
 templates/httpd.conf.erb                  | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index cabeee4c0e..6f94f44e70 100644
--- 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
index eaedc148e7..fc8e29c4f2 100644
--- 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
index 90134be144..45903cd3d3 100644
--- 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
index 43b32bda2c..7ee8f1fe66 100644
--- 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 %>

From e42f7685e5229ba3b4fcf58ebeaa50bcdbb6d657 Mon Sep 17 00:00:00 2001
From: Bram Vogelaar <bram@attachmentgenie.com>
Date: Tue, 22 Apr 2014 16:08:32 +0200
Subject: [PATCH 0209/2267] introducing new setting to documentation

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 98cebb9a97..ad37b72dc3 100644
--- a/README.md
+++ b/README.md
@@ -306,6 +306,10 @@ Enables persistent connections.
 
 Sets the amount of time the server will wait for subsequent requests on a persistent connection. Defaults to '15'.
 
+#####`maxkeepaliverequests`
+
+Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.
+
 #####`log_level`
 
 Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info', or 'debug'.

From 94f2d772360a2a9e7acbf15e513d50753c209771 Mon Sep 17 00:00:00 2001
From: Bram Vogelaar <bram@attachmentgenie.com>
Date: Wed, 23 Apr 2014 09:35:00 +0200
Subject: [PATCH 0210/2267] renaming variable to be inline with other variables

maxkeepaliverequests => max_keepalive_requests
---
 README.md                                 | 2 +-
 manifests/init.pp                         | 4 ++--
 manifests/params.pp                       | 6 +++---
 spec/acceptance/apache_parameters_spec.rb | 2 +-
 templates/httpd.conf.erb                  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ad37b72dc3..df07f09b46 100644
--- a/README.md
+++ b/README.md
@@ -306,7 +306,7 @@ Enables persistent connections.
 
 Sets the amount of time the server will wait for subsequent requests on a persistent connection. Defaults to '15'.
 
-#####`maxkeepaliverequests`
+#####`max_keepalive_requests`
 
 Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 6f94f44e70..069399b6da 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -49,7 +49,7 @@
   $group                = $::apache::params::group,
   $keepalive            = $::apache::params::keepalive,
   $keepalive_timeout    = $::apache::params::keepalive_timeout,
-  $maxkeepaliverequests = $apache::params::maxkeepaliverequests,
+  $max_keepalive_requests = $apache::params::max_keepalive_requests,
   $logroot              = $::apache::params::logroot,
   $log_level            = $::apache::params::log_level,
   $log_formats          = {},
@@ -271,7 +271,7 @@
     # - $apxs_workaround
     # - $keepalive
     # - $keepalive_timeout
-    # - $maxkeepaliverequests
+    # - $max_keepalive_requests
     # - $server_root
     # - $server_tokens
     # - $server_signature
diff --git a/manifests/params.pp b/manifests/params.pp
index fc8e29c4f2..33297674cd 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -85,7 +85,7 @@
     $conf_template        = 'apache/httpd.conf.erb'
     $keepalive            = 'Off'
     $keepalive_timeout    = 15
-    $maxkeepaliverequests = 100
+    $max_keepalive_requests = 100
     $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
@@ -142,7 +142,7 @@
     $conf_template     = 'apache/httpd.conf.erb'
     $keepalive         = 'Off'
     $keepalive_timeout = 15
-    $maxkeepaliverequests = 100
+    $max_keepalive_requests = 100
     $fastcgi_lib_path  = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config = '/etc/mime.types'
@@ -201,7 +201,7 @@
     $conf_template        = 'apache/httpd.conf.erb'
     $keepalive            = 'Off'
     $keepalive_timeout    = 15
-    $maxkeepaliverequests = 100
+    $max_keepalive_requests = 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
index 45903cd3d3..670ceaebe1 100644
--- 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', maxkeepaliverequests => '200' }"
+        pp = "class { 'apache': keepalive => 'On', keepalive_timeout => '30', max_keepalive_requests => '200' }"
         apply_manifest(pp, :catch_failures => true)
       end
     end
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 7ee8f1fe66..dd43cb95d2 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -8,7 +8,7 @@ ServerRoot "<%= @server_root %>"
 PidFile <%= @pidfile %>
 Timeout <%= @timeout %>
 KeepAlive <%= @keepalive %>
-MaxKeepAliveRequests <%= @maxkeepaliverequests %>
+MaxKeepAliveRequests <%= @max_keepalive_requests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
 
 User <%= @user %>

From 8c504df09f614f69269409e605c6274dba107850 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 24 Apr 2014 13:36:44 -0700
Subject: [PATCH 0211/2267] Fixing typos!

---
 spec/acceptance/apache_parameters_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 90134be144..058bd6452e 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -291,9 +291,9 @@ class { 'apache':
       it 'applies cleanly' do
         pp = <<-EOS
           class { 'apache':
-          { log_formats => {
-              'vhost_common'   => '%v %h %l %u %t \"%r\" %>s %b',
-              'vhost_combined' => '%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"',
+            log_formats => {
+              'vhost_common'   => '%v %h %l %u %t \\\"%r\\\" %>s %b',
+              'vhost_combined' => '%v %h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\"',
             }
           }
         EOS
@@ -303,7 +303,7 @@ class { 'apache':
 
     describe file($conf_file) do
       it { should be_file }
-      it { should contain 'LogFormat %v %h %l %u %t \"%r\" %>s %b" vhost_common' }
+      it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common' }
       it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined' }
     end
   end

From 373a8a9e6b9e43b23e6cd641602a8cf7aa5e8a65 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 25 Apr 2014 15:04:38 -0700
Subject: [PATCH 0212/2267] Don't include the NameVirtualHost directives in
 apache >= 2.4, and add tests for this that will at least work with Ubuntu
 13.10 and Ubuntu 14.04.

Tests will still work anywhere with apache < 2.4, but haven't been updated to support RHEL7 yet.
---
 manifests/vhost.pp            |  2 +-
 spec/acceptance/vhost_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b6c75dc51e..24b782e76d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -348,7 +348,7 @@
     }
   }
   if ! $ip_based {
-    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' {
+    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and $apache_version < 2.4 {
       ::apache::namevirtualhost { $nvh_addr_port: }
     }
   }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 01c9dcbb0f..72294e2ea8 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -484,6 +484,16 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
+    describe file($ports_file) do
+      it { should be_file }
+      case fact('lsbdistcodename')
+      when 'saucy', 'trusty'
+        it { should_not contain 'NameVirtualHost test.server' }
+      else
+        it { should contain 'NameVirtualHost test.server' }
+      end
+    end
+
     describe file("#{$vhost_dir}/10-test.server.conf") do
       it { should be_file }
     end

From c733ea438e8c105b90faf1aec425a1187402d85f Mon Sep 17 00:00:00 2001
From: cvdwel <github@nospam.kritz.nl>
Date: Sat, 26 Apr 2014 20:50:00 +0200
Subject: [PATCH 0213/2267] Remove non-SSL rewrite example from apache::vhost

As apache::vhosts requires $docroot to be set, this example doesn't work. However the non-SSL to SSL rewrite is a very common use case (and setting $docroot to /dev/null doesn't work either). Parameter $docroot should be optional. Or at least it should be possible to skip docroot management (create dir, set owner etc.) for example by setting $manage_docroot = false.
---
 manifests/vhost.pp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b6c75dc51e..0a9bf2e418 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -70,16 +70,6 @@
 #    docroot => '/path/to/docroot',
 #  }
 #  apache::vhost { 'site.name.fqdn':
-#    port          => '80',
-#    rewrites => [
-#      {
-#        comment       => "redirect non-SSL traffic to SSL site",
-#        rewrite_cond => ['%{HTTPS} off'],
-#        rewrite_rule => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}']
-#      }
-#    ]
-#  }
-#  apache::vhost { 'site.name.fqdn':
 #    port            => '80',
 #    docroot         => '/path/to/other_docroot',
 #    custom_fragment => template("${module_name}/my_fragment.erb"),

From 2e6648d2eacb2b8f3375acb495226830fbe25e8a Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <github@kohlvanwijngaarden.nl>
Date: Sat, 26 Apr 2014 21:02:21 +0200
Subject: [PATCH 0214/2267] Fix platform for centos-6.5

It looks like an accidental replace from 64 to 65 in the platform.
---
 spec/acceptance/nodesets/centos-65-x64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
index 89de021346..ac76349736 100644
--- a/spec/acceptance/nodesets/centos-65-x64.yml
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -2,7 +2,7 @@ HOSTS:
   centos-65-x64:
     roles:
       - master
-    platform: el-6-x86_65
+    platform: el-6-x86_64
     box : centos-65-x64-virtualbox-nocm
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
     hypervisor : vagrant

From debc086adb591179678be8908320671129d5ecfe Mon Sep 17 00:00:00 2001
From: Michael Speth <mspeth@monky-games.com>
Date: Fri, 4 Apr 2014 10:23:14 +1300
Subject: [PATCH 0215/2267] Added WSGIPassAuthorization option to vhost.

---
 manifests/vhost.pp        | 1 +
 templates/vhost/_wsgi.erb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 24b782e76d..f2e736cbf1 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -167,6 +167,7 @@
     $wsgi_import_script_options  = undef,
     $wsgi_process_group          = undef,
     $wsgi_script_aliases         = undef,
+    $wsgi_pass_authorization     = undef,
     $custom_fragment             = undef,
     $itk                         = undef,
     $action                      = undef,
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index 474c30ff19..473b223ab6 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -19,3 +19,6 @@
     <%- end -%>
   <%- end -%>
 <% end -%>
+<% if @wsgi_pass_authorization -%>
+  WSGIPassAuthorization <%= @wsgi_pass_authorization %>
+<% end -%>

From 920df08fc87c065e477c86ed42d6fa3734228804 Mon Sep 17 00:00:00 2001
From: Michael Speth <mspeth@monky-games.com>
Date: Mon, 7 Apr 2014 10:08:52 +1200
Subject: [PATCH 0216/2267] Added The ProxyPreserveHost option to vhosts.

---
 manifests/vhost.pp         | 1 +
 templates/vhost/_proxy.erb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f2e736cbf1..5797482330 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -144,6 +144,7 @@
     $php_admin_flags             = [],
     $php_admin_values            = [],
     $no_proxy_uris               = [],
+    $proxy_preserve_host         = false,
     $redirect_source             = '/',
     $redirect_dest               = undef,
     $redirect_status             = undef,
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 7e0221f957..2c5e24edef 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -3,6 +3,9 @@
   ## Proxy rules
   ProxyRequests Off
 <%- end -%>
+<% if @proxy_preserve_host %>
+  ProxyPreserveHost On
+<% end %>
 <% [@proxy_pass].flatten.compact.each do |proxy| %>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
   <Location <%= proxy['path']%>>

From 8481e7de122040d0db691cec6620c9de97534333 Mon Sep 17 00:00:00 2001
From: Michael Speth <mspeth@monky-games.com>
Date: Mon, 7 Apr 2014 19:00:31 +1200
Subject: [PATCH 0217/2267] Updated readme with WSGIPassAuthorization
 information, updated spec and rspec tests for WSGIPassAuthorization.

---
 README.md                     | 4 +++-
 spec/acceptance/vhost_spec.rb | 3 +++
 spec/defines/vhost_spec.rb    | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 98cebb9a97..a2b328a5d2 100644
--- a/README.md
+++ b/README.md
@@ -1031,7 +1031,7 @@ Sets up a virtual host with a wildcard alias subdomain mapped to a directory wit
     }
 ```
 
-#####`wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, & `wsgi_script_aliases`
+#####`wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
 
 Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 
@@ -1043,6 +1043,8 @@ Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 
 `wsgi_script_aliases` requires a hash of web paths to filesystem .wsgi paths. Defaults to 'undef'.
 
+`wsgi_pass_authorization` the WSGI application handles authorisation instead of Apache when set to 'On'. For more information see [here] (http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).  Defaults to 'undef' where apache will set the defaults setting to 'Off'.
+
 To set up a virtual host with WSGI
 
 ```puppet
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 72294e2ea8..7b4deac841 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -937,6 +937,7 @@ class { 'apache::mod::wsgi': }
           wsgi_daemon_process_options => {processes => '2'},
           wsgi_process_group          => 'nobody',
           wsgi_script_aliases         => { '/test' => '/test1' },
+	  wsgi_pass_authorization     => 'On',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -956,6 +957,7 @@ class { 'apache::mod::wsgi': }
           wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
           wsgi_process_group          => 'nobody',
           wsgi_script_aliases         => { '/test' => '/test1' },
+	  wsgi_pass_authorization     => 'On',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -968,6 +970,7 @@ class { 'apache::mod::wsgi': }
       it { should contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
       it { should contain 'WSGIProcessGroup nobody' }
       it { should contain 'WSGIScriptAlias /test "/test1"' }
+      it { should contain 'WSGIPassAuthorization On' }
     end
   end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 234fdbd0b0..f3244cd65c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -607,6 +607,12 @@
           :value => '%{GLOBAL}',
           :match => [/^  WSGIApplicationGroup %{GLOBAL}$/],
         },
+        {
+          :title => 'should accept a wsgi pass authorization',
+          :attr  => 'wsgi_pass_authorization',
+          :value => 'On',
+          :match => [/^  WSGIPassAuthorization On$/],
+        },
         {
           :title => 'should contain environment variables',
           :attr  => 'access_log_env_var',

From 16e8c500ad008b98e4a6bc9b89403448370f5696 Mon Sep 17 00:00:00 2001
From: Michael Speth <mspeth@monky-games.com>
Date: Thu, 10 Apr 2014 12:07:17 +1200
Subject: [PATCH 0218/2267] added documentation and test for ProxyPreserveHost
 option

---
 README.md                     | 4 ++++
 manifests/vhost.pp            | 1 +
 spec/acceptance/vhost_spec.rb | 2 ++
 spec/defines/vhost_spec.rb    | 8 +++++++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a2b328a5d2..654423f5b4 100644
--- a/README.md
+++ b/README.md
@@ -759,6 +759,10 @@ Specifies the verbosity of the error log. Defaults to 'warn' for the global serv
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
 
+#####`proxy_preserve_host`
+
+Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypreservehost).  true Enables the Host: line from an incoming request to be proxied to the host instead of hostname .  false sets this option to off (default).
+
 #####`options`
 
 Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. Defaults to '['Indexes','FollowSymLinks','MultiViews']', as demonstrated below:
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5797482330..21f9907aae 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -478,6 +478,7 @@
   # proxy fragment:
   #   - $proxy_dest
   #   - $no_proxy_uris
+  #   - $proxy_preserve_host (true to set ProxyPreserveHost to on and false to off
   # rack fragment:
   #   - $rack_base_uris
   # redirect fragment:
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 7b4deac841..7a2874920f 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -102,6 +102,7 @@ class { 'apache': }
           proxy_pass => [
             { 'path' => '/foo', 'url' => 'http://backend-foo/'},
           ],
+    	  proxy_preserve_host   => true, 
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -111,6 +112,7 @@ class { 'apache': }
       it { should contain '<VirtualHost \*:80>' }
       it { should contain "ServerName proxy.example.com" }
       it { should contain "ProxyPass" }
+      it { should contain "ProxyPreserveHost On" }
       it { should_not contain "<Proxy \*>" }
     end
   end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f3244cd65c..b6c48a86cd 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -608,11 +608,17 @@
           :match => [/^  WSGIApplicationGroup %{GLOBAL}$/],
         },
         {
-          :title => 'should accept a wsgi pass authorization',
+          :title => 'should set wsgi pass authorization',
           :attr  => 'wsgi_pass_authorization',
           :value => 'On',
           :match => [/^  WSGIPassAuthorization On$/],
         },
+        {
+          :title => 'should set wsgi pass authorization false',
+          :attr  => 'wsgi_pass_authorization',
+          :value => 'Off',
+          :match => [/^  WSGIPassAuthorization Off$/],
+        },
         {
           :title => 'should contain environment variables',
           :attr  => 'access_log_env_var',

From c647db040758cbe2a3fb08662126819701062831 Mon Sep 17 00:00:00 2001
From: Xavier leune <xleune@commentcamarche.net>
Date: Tue, 1 Apr 2014 11:48:03 +0200
Subject: [PATCH 0219/2267] Allow custom extensions for php handler

---
 manifests/mod/php.pp        | 2 ++
 templates/mod/php5.conf.erb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 8c1b94d6bb..2d954db5b7 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -2,10 +2,12 @@
   $package_name   = undef,
   $package_ensure = 'present',
   $path           = undef,
+  $extensions     = ['.php'],
 ) {
   if ! defined(Class['apache::mod::prefork']) {
     fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
   }
+  validate_array($extensions)
   ::apache::mod { 'php5':
     package        => $package_name,
     package_ensure => $package_ensure,
diff --git a/templates/mod/php5.conf.erb b/templates/mod/php5.conf.erb
index 9eef7628a8..2b0c8f7845 100644
--- a/templates/mod/php5.conf.erb
+++ b/templates/mod/php5.conf.erb
@@ -14,7 +14,7 @@
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
-AddHandler php5-script .php
+AddHandler php5-script <%= @extensions.join(' ') %>
 AddType text/html .php
 
 #

From 5a8df9ff5c7033cdf302425444fa4f5abd1d3808 Mon Sep 17 00:00:00 2001
From: Xavier leune <xleune@commentcamarche.net>
Date: Tue, 1 Apr 2014 16:01:26 +0200
Subject: [PATCH 0220/2267] Changing extensions.join to
 extensions.flatten.compact.join

---
 templates/mod/php5.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/php5.conf.erb b/templates/mod/php5.conf.erb
index 2b0c8f7845..25ae102e09 100644
--- a/templates/mod/php5.conf.erb
+++ b/templates/mod/php5.conf.erb
@@ -14,7 +14,7 @@
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
-AddHandler php5-script <%= @extensions.join(' ') %>
+AddHandler php5-script <%= @@extensions.flatten.compact.join(' ') %>
 AddType text/html .php
 
 #

From fc347a870155dbfb9b8e9075ed15c296ccb66f29 Mon Sep 17 00:00:00 2001
From: Xavier leune <xleune@commentcamarche.net>
Date: Tue, 1 Apr 2014 16:10:33 +0200
Subject: [PATCH 0221/2267] Typo

---
 templates/mod/php5.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/php5.conf.erb b/templates/mod/php5.conf.erb
index 25ae102e09..44df2ae066 100644
--- a/templates/mod/php5.conf.erb
+++ b/templates/mod/php5.conf.erb
@@ -14,7 +14,7 @@
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
-AddHandler php5-script <%= @@extensions.flatten.compact.join(' ') %>
+AddHandler php5-script <%= @extensions.flatten.compact.join(' ') %>
 AddType text/html .php
 
 #

From 15b3adc6f6d2b587db1b97b6ba742cc0e713b756 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 1 May 2014 17:01:19 -0700
Subject: [PATCH 0222/2267] Use access_compat on 2.4, and update pagespeed to
 load the correct module in 2.4.

---
 manifests/default_mods.pp  |  3 +++
 manifests/mod/pagespeed.pp | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index cf26e2802f..e38f2422a4 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -121,6 +121,9 @@
 
       # filter is needed by mod_deflate
       ::apache::mod { 'filter': }
+
+      # lots of stuff seems to break without access_compat
+      ::apache::mod { 'access_compat': }
     } else {
       ::apache::mod { 'authz_default': }
     }
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index d58f99fe2e..cca30eb50e 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -34,7 +34,14 @@
   $additional_configuration      = {},
 ){
 
-  apache::mod { 'pagespeed': }
+  $_lib = $::apache::apache_version ? {
+    2.4     => 'mod_pagespeed_ap24.so',
+    default => undef
+  }
+
+  apache::mod { 'pagespeed':
+    lib => $_lib,
+  }
 
   file { 'pagespeed.conf':
     ensure  => file,
@@ -44,5 +51,4 @@
     before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
-
 }

From 8fb2dfd46c5a17a36bef16081b25ce4e401115b7 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 1 May 2014 17:04:09 -0700
Subject: [PATCH 0223/2267] Update specs

---
 manifests/mod/php.pp            | 1 +
 spec/acceptance/mod_php_spec.rb | 8 +++++---
 spec/classes/mod/php_spec.rb    | 8 ++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 2d954db5b7..b797936bde 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -18,6 +18,7 @@
   include ::apache::mod::dir
   Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
 
+  # Template uses $extensions
   file { 'php5.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/php5.conf",
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index d1c991621d..cf8054053e 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -53,13 +53,15 @@ class { 'apache::mod::php': }
     end
   end
 
-  context "custom php admin_flag and php_admin_value" do
+  context "custom extensions, php_admin_flag, and php_admin_value" do
     it 'succeeds in puppeting php' do
       pp= <<-EOS
         class { 'apache':
           mpm_module => 'prefork',
         }
-        class { 'apache::mod::php': }
+        class { 'apache::mod::php':
+          extensions => ['.php','.php5'],
+        }
         apache::vhost { 'php.example.com':
           port             => '80',
           docroot          => '/var/www/php',
@@ -67,7 +69,7 @@ class { 'apache::mod::php': }
           php_admin_flags  => { 'engine' => 'on', },
         }
         host { 'php.example.com': ip => '127.0.0.1', }
-        file { '/var/www/php/index.php':
+        file { '/var/www/php/index.php5':
           ensure  => file,
           content => "<?php phpinfo(); ?>\\n",
         }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 29adc870f4..32b2ff0994 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -64,6 +64,14 @@
         :content => "LoadModule php5_module alternative-path\n"
       ) }
     end
+    context "with alternative extensions" do let :pre_condition do
+        'class { "apache": }'
+      end
+      let :params do
+        { :extensions => ['.php','.php5']}
+      end
+      it { should contain_file("php5.conf").with_content =~ /AddHandler php5-script .php .php5\n/ }
+    end
     context "with specific version" do
       let :pre_condition do
         'class { "apache": }'

From 9d2067c2e71ecc9bea9402e535536d47db4f3a4c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>
Date: Thu, 1 May 2014 19:22:52 +0200
Subject: [PATCH 0224/2267] Add suexec support

This adds the suexec_user_group parameter to vhost and introduces a
class apache::mod::suexec, which is included when the parameter is used.
---
 manifests/default_mods.pp   |  2 +-
 manifests/mod/suexec.pp     |  3 +++
 manifests/vhost.pp          | 12 +++++++++++-
 spec/defines/vhost_spec.rb  | 10 ++++++++++
 templates/vhost.conf.erb    |  1 +
 templates/vhost/_suexec.erb |  4 ++++
 6 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 manifests/mod/suexec.pp
 create mode 100644 templates/vhost/_suexec.erb

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index af98896216..adeef8f25c 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -26,6 +26,7 @@
         include ::apache::mod::mime
         include ::apache::mod::mime_magic
         include ::apache::mod::vhost_alias
+        include ::apache::mod::suexec
         include ::apache::mod::rewrite
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
@@ -38,7 +39,6 @@
         ::apache::mod { 'logio': }
         ::apache::mod { 'speling': }
         ::apache::mod { 'substitute': }
-        ::apache::mod { 'suexec': }
         ::apache::mod { 'usertrack': }
         ::apache::mod { 'version': }
 
diff --git a/manifests/mod/suexec.pp b/manifests/mod/suexec.pp
new file mode 100644
index 0000000000..ded013d499
--- /dev/null
+++ b/manifests/mod/suexec.pp
@@ -0,0 +1,3 @@
+class apache::mod::suexec {
+  ::apache::mod { 'suexec': }
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 24b782e76d..90162f13a8 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -174,7 +174,8 @@
     $fastcgi_socket              = undef,
     $fastcgi_dir                 = undef,
     $additional_includes         = [],
-    $apache_version              = $::apache::apache_version
+    $apache_version              = $::apache::apache_version,
+    $suexec_user_group           = undef,
   ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -200,6 +201,11 @@
     validate_hash($rewrites[0])
   }
 
+  if $suexec_user_group {
+    validate_re($suexec_user_group, '^\w+ \w+$',
+    "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
+  }
+
   # Deprecated backwards-compatibility
   if $rewrite_base {
     warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')
@@ -255,6 +261,10 @@
     include ::apache::mod::wsgi
   }
 
+  if $suexec_user_group {
+    include ::apache::mod::suexec
+  }
+
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
   if ! defined(File[$docroot]) {
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 234fdbd0b0..0e63701486 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1308,6 +1308,16 @@
         end
       end
 
+      describe 'when suexec_user_group is specified' do
+        let :params do
+          default_params.merge({
+            :suexec_user_group => 'nobody nogroup',
+          })
+        end
+
+        it { should contain_file("25-#{title}.conf").with_content %r{^  SuexecUserGroup nobody nogroup$} }
+      end
+
       describe 'redirect rules' do
         describe 'without lockstep arrays' do
           let :params do
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 673ea0c2bd..64024cfef3 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -62,4 +62,5 @@
 <%= scope.function_template(['apache/vhost/_wsgi.erb']) -%>
 <%= scope.function_template(['apache/vhost/_custom_fragment.erb']) -%>
 <%= scope.function_template(['apache/vhost/_fastcgi.erb']) -%>
+<%= scope.function_template(['apache/vhost/_suexec.erb']) -%>
 </VirtualHost>
diff --git a/templates/vhost/_suexec.erb b/templates/vhost/_suexec.erb
new file mode 100644
index 0000000000..8a7ae0f17f
--- /dev/null
+++ b/templates/vhost/_suexec.erb
@@ -0,0 +1,4 @@
+<% if @suexec_user_group -%>
+
+  SuexecUserGroup <%= @suexec_user_group %>
+<% end -%>

From 6b14fd08e13a27fa11eb5169c2baa8079b0228c5 Mon Sep 17 00:00:00 2001
From: Greg Sutcliffe <gsutclif@redhat.com>
Date: Mon, 28 Apr 2014 15:38:59 +0100
Subject: [PATCH 0225/2267]  Configure Passenger in separate .conf file on
 Debian so PassengerRoot isn't lost

The changes in 005bf615c are also necessary for Ubuntu 14.04 which now
ships Passenger 4.x
---
 manifests/params.pp                   | 72 +++++++++++++--------------
 spec/acceptance/mod_passenger_spec.rb | 23 ++++++---
 spec/classes/mod/passenger_spec.rb    | 35 +++++++++----
 3 files changed, 77 insertions(+), 53 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 29e9fd2fc9..c7a042a7db 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -90,36 +90,36 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
   } elsif $::osfamily == 'Debian' {
-    $user             = 'www-data'
-    $group            = 'www-data'
-    $root_group       = 'root'
-    $apache_name      = 'apache2'
-    $service_name     = 'apache2'
-    $httpd_dir        = '/etc/apache2'
-    $server_root      = '/etc/apache2'
-    $conf_dir         = $httpd_dir
-    $confd_dir        = "${httpd_dir}/conf.d"
-    $mod_dir          = "${httpd_dir}/mods-available"
-    $mod_enable_dir   = "${httpd_dir}/mods-enabled"
-    $vhost_dir        = "${httpd_dir}/sites-available"
-    $vhost_enable_dir = "${httpd_dir}/sites-enabled"
-    $conf_file        = 'apache2.conf'
-    $ports_file       = "${conf_dir}/ports.conf"
-    $logroot          = '/var/log/apache2'
-    $lib_path         = '/usr/lib/apache2/modules'
-    $mpm_module       = 'worker'
-    $dev_packages     = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
-    $default_ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-    $default_ssl_key  = '/etc/ssl/private/ssl-cert-snakeoil.key'
-    $ssl_certs_dir    = '/etc/ssl/certs'
-    $passenger_conf_file = 'passenger.conf'
-    $passenger_conf_package_file = undef
-    $passenger_root   = '/usr'
-    $passenger_ruby   = '/usr/bin/ruby'
-    $suphp_addhandler  = 'x-httpd-php'
-    $suphp_engine      = 'off'
-    $suphp_configpath  = '/etc/php5/apache2'
-    $mod_packages     = {
+    $user                = 'www-data'
+    $group               = 'www-data'
+    $root_group          = 'root'
+    $apache_name         = 'apache2'
+    $service_name        = 'apache2'
+    $httpd_dir           = '/etc/apache2'
+    $server_root         = '/etc/apache2'
+    $conf_dir            = $httpd_dir
+    $confd_dir           = "${httpd_dir}/conf.d"
+    $mod_dir             = "${httpd_dir}/mods-available"
+    $mod_enable_dir      = "${httpd_dir}/mods-enabled"
+    $vhost_dir           = "${httpd_dir}/sites-available"
+    $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
+    $conf_file           = 'apache2.conf'
+    $ports_file          = "${conf_dir}/ports.conf"
+    $logroot             = '/var/log/apache2'
+    $lib_path            = '/usr/lib/apache2/modules'
+    $mpm_module          = 'worker'
+    $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
+    $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
+    $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
+    $ssl_certs_dir       = '/etc/ssl/certs'
+    $passenger_conf_file = 'passenger_extra.conf'
+    $passenger_conf_package_file = 'passenger.conf'
+    $passenger_root      = undef
+    $passenger_ruby      = undef
+    $suphp_addhandler    = 'x-httpd-php'
+    $suphp_engine        = 'off'
+    $suphp_configpath    = '/etc/php5/apache2'
+    $mod_packages        = {
       'auth_kerb'   => 'libapache2-mod-auth-kerb',
       'dav_svn'     => 'libapache2-svn',
       'fastcgi'     => 'libapache2-mod-fastcgi',
@@ -136,16 +136,16 @@
       'wsgi'        => 'libapache2-mod-wsgi',
       'xsendfile'   => 'libapache2-mod-xsendfile',
     }
-    $mod_libs         = {
+    $mod_libs             = {
       'php5' => 'libphp5.so',
     }
-    $conf_template     = 'apache/httpd.conf.erb'
-    $keepalive         = 'Off'
-    $keepalive_timeout = 15
+    $conf_template          = 'apache/httpd.conf.erb'
+    $keepalive              = 'Off'
+    $keepalive_timeout      = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path  = '/var/lib/apache2/fastcgi'
+    $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
-    $mime_types_config = '/etc/mime.types'
+    $mime_types_config    = '/etc/mime.types'
   } elsif $::osfamily == 'FreeBSD' {
     $user             = 'www'
     $group            = 'www'
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index e1ea23ec80..5b6c6d8570 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -5,7 +5,7 @@
   when 'Debian'
     service_name = 'apache2'
     mod_dir = '/etc/apache2/mods-available/'
-    conf_file = "#{mod_dir}passenger.conf"
+    conf_file = "#{mod_dir}passenger_extra.conf"
     load_file = "#{mod_dir}passenger.load"
     passenger_root = '/usr'
     passenger_ruby = '/usr/bin/ruby'
@@ -71,8 +71,9 @@ class { 'apache::mod::passenger': }
       end
 
       describe file(conf_file) do
-        it { should contain "PassengerRoot \"#{passenger_root}\"" }
-        it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+        # passenger_extra.conf only contains directives if overridden from the class params
+        it { should_not contain "PassengerRoot \"#{passenger_root}\"" }
+        it { should_not contain "PassengerRuby \"#{passenger_ruby}\"" }
       end
 
       describe file(load_file) do
@@ -99,11 +100,17 @@ class { 'apache::mod::passenger': }
           shell("sudo /usr/sbin/passenger-status") do |r|
             # spacing may vary
             r.stdout.should =~ /[\-]+ General information [\-]+/
-            r.stdout.should =~ /max[ ]+= [0-9]+/
-            r.stdout.should =~ /count[ ]+= [0-9]+/
-            r.stdout.should =~ /active[ ]+= [0-9]+/
-            r.stdout.should =~ /inactive[ ]+= [0-9]+/
-            r.stdout.should =~ /Waiting on global queue: [0-9]+/
+            if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
+              r.stdout.should =~ /Max pool size[ ]+: [0-9]+/
+              r.stdout.should =~ /Processes[ ]+: [0-9]+/
+              r.stdout.should =~ /Requests in top-level queue[ ]+: [0-9]+/
+            else
+              r.stdout.should =~ /max[ ]+= [0-9]+/
+              r.stdout.should =~ /count[ ]+= [0-9]+/
+              r.stdout.should =~ /active[ ]+= [0-9]+/
+              r.stdout.should =~ /inactive[ ]+= [0-9]+/
+              r.stdout.should =~ /Waiting on global queue: [0-9]+/
+            end
 
             r.exit_code.should == 0
           end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 08cff41554..608b3c47d9 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -16,11 +16,28 @@
     it { should contain_file('passenger.load').with({
       'path' => '/etc/apache2/mods-available/passenger.load',
     }) }
-    it { should contain_file('passenger.conf').with({
+    it { should contain_file('passenger_package.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
-    it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr"$/) }
-    it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/bin\/ruby"$/) }
+    it { should contain_file('passenger_package.conf').without_content }
+    it { should contain_file('passenger_package.conf').without_source }
+    it { should contain_file('passenger.conf').with({
+      'path' => '/etc/apache2/mods-available/passenger_extra.conf',
+    }) }
+    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
+    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+    describe "with passenger_root => '/usr/lib/example'" do
+      let :params do
+        { :passenger_root => '/usr/lib/example' }
+      end
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
+    end
+    describe "with passenger_ruby => /usr/lib/example/ruby" do
+      let :params do
+        { :passenger_ruby => '/usr/lib/example/ruby' }
+      end
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
+    end
     describe "with passenger_high_performance => true" do
       let :params do
         { :passenger_high_performance => 'true' }
@@ -69,11 +86,11 @@
       end
       it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
     end
-    describe "with passenger_ruby => /user/lib/example/ruby" do
+    describe "with passenger_ruby => /usr/lib/example/ruby" do
       let :params do
-        { :passenger_ruby => '/user/lib/example/ruby' }
+        { :passenger_ruby => '/usr/lib/example/ruby' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/user\/lib\/example\/ruby"$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
     end
     describe "with passenger_use_global_queue => true" do
       let :params do
@@ -134,11 +151,11 @@
       end
       it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
     end
-    describe "with passenger_ruby => /user/lib/example/ruby" do
+    describe "with passenger_ruby => /usr/lib/example/ruby" do
       let :params do
-        { :passenger_ruby => '/user/lib/example/ruby' }
+        { :passenger_ruby => '/usr/lib/example/ruby' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/user\/lib\/example\/ruby"$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
     end
   end
   context "on a FreeBSD OS" do

From 1d72c4146034dc94e02cb9c37fa6c050f1b08a24 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 24 Apr 2014 13:36:15 -0700
Subject: [PATCH 0226/2267] Add a nodeset for Ubuntu 14.04.

---
 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
new file mode 100644
index 0000000000..cba1cd04c2
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box : puppetlabs/ubuntu-14.04-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  log_level   : debug
+  type: git

From 7895319cd0cb5ac3172ecbf59fe71791e7724453 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 5 May 2014 14:27:03 -0400
Subject: [PATCH 0227/2267] 'be_mode' was getting confused by the leading 0.

---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 6fa42a6b16..93b3f1f3a2 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -469,7 +469,7 @@ class { 'apache': }
       it { should be_directory }
       it { should be_owned_by 'test_owner' }
       it { should be_grouped_into 'test_group' }
-      it { should be_mode '0750' }
+      it { should be_mode 750 }
     end
   end
 

From f19ec7670fbc10913867c102478dd8e2381f85e7 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 7 May 2014 19:23:07 -0400
Subject: [PATCH 0228/2267] Some initial cleanup for RHEL7.

There are still some test issues, although mostly related to the lack of 'normal' EPEL and passenger packages.  Also, still need to fix SELinux for non-standard paths, but that's going to be a big change.
---
 manifests/default_mods.pp                 |  9 +++++----
 spec/acceptance/apache_parameters_spec.rb | 12 ++++++++----
 spec/acceptance/class_spec.rb             |  7 ++++---
 spec/acceptance/mod_proxy_html_spec.rb    |  2 +-
 spec/acceptance/vhost_spec.rb             | 16 +++++++++-------
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 3800b5b79c..c8f7446cf6 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -9,6 +9,11 @@
   case $::osfamily {
     'redhat', 'freebsd': {
       ::apache::mod { 'log_config': }
+      if $apache_version >= 2.4 {
+        # Lets fork it
+        ::apache::mod { 'systemd': }
+        ::apache::mod { 'unixd': }
+      }
     }
     default: {}
   }
@@ -43,10 +48,6 @@
         ::apache::mod { 'version': }
 
         if $apache_version >= 2.4 {
-          # Lets fork it
-          ::apache::mod { 'systemd': }
-
-          ::apache::mod { 'unixd': }
           ::apache::mod { 'authn_core': }
         }
         else {
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 629c360e34..808190dfaa 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -328,12 +328,15 @@ class { 'apache':
   describe 'logging' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': logroot => '/tmp' }"
+        pp = <<-EOS
+          file { '/apache_spec': ensure => directory, }
+          class { 'apache': logroot => '/apache_spec' }
+        EOS
         apply_manifest(pp, :catch_failures => true)
       end
     end
 
-    describe file("/tmp/#{$error_log}") do
+    describe file("/apache_spec/#{$error_log}") do
       it { should be_file }
     end
   end
@@ -341,8 +344,9 @@ class { 'apache':
   describe 'ports_file' do
     it 'applys cleanly' do
       pp = <<-EOS
+        file { '/apache_spec': ensure => directory, }
         class { 'apache':
-          ports_file     => '/tmp/ports_file',
+          ports_file     => '/apache_spec/ports_file',
           ip             => '10.1.1.1',
           service_ensure => stopped
         }
@@ -350,7 +354,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file('/tmp/ports_file') do
+    describe file('/apache_spec/ports_file') do
       it { should be_file }
       it { should contain 'Listen 10.1.1.1' }
     end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 1f5921d596..ca1255745f 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -38,10 +38,11 @@ class { 'apache': }
     # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
-      file { '/tmp/apache_custom': ensure => directory, }
+      file { '/apache_spec': ensure => directory, }
+      file { '/apache_spec/apache_custom': ensure => directory, }
       class { 'apache':
-        mod_dir   => '/tmp/apache_custom/mods',
-        vhost_dir => '/tmp/apache_custom/vhosts',
+        mod_dir   => '/apache_spec/apache_custom/mods',
+        vhost_dir => '/apache_spec/apache_custom/vhosts',
       }
       EOS
 
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index ddfa66dd91..b34daacbff 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -11,7 +11,7 @@
   end
 
   context "default proxy_html config" do
-    if fact('osfamily') == 'RedHat'
+    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
       it 'adds epel' do
         pp = "class { 'epel': }"
         apply_manifest(pp, :catch_failures => true)
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 93b3f1f3a2..816327f3c9 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -488,8 +488,9 @@ class { 'apache': }
 
     describe file($ports_file) do
       it { should be_file }
-      case fact('lsbdistcodename')
-      when 'saucy', 'trusty'
+      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
+        it { should_not contain 'NameVirtualHost test.server' }
+      elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10)/
         it { should_not contain 'NameVirtualHost test.server' }
       else
         it { should contain 'NameVirtualHost test.server' }
@@ -1012,7 +1013,7 @@ class { 'apache': }
   end
 
   # So what does this work on?
-  if default['platform'] !~ /^(debian-(6|7)|el-(5|6))/
+  if default['platform'] !~ /^(debian-(6|7)|el-(5|6|7))/
     describe 'fastcgi' do
       it 'applies cleanly' do
         pp = <<-EOS
@@ -1042,10 +1043,11 @@ class { 'apache::mod::fastcgi': }
       pp = <<-EOS
         class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
-        file { '/tmp/include': ensure => present, content => '#additional_includes' }
+        file { '/apache_spec': ensure => directory, }
+        file { '/apache_spec/include': ensure => present, content => '#additional_includes' }
         apache::vhost { 'test.server':
-          docroot             => '/tmp',
-          additional_includes => '/tmp/include',
+          docroot             => '/apache_spec',
+          additional_includes => '/apache_spec/include',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -1053,7 +1055,7 @@ class { 'apache': }
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { should be_file }
-      it { should contain 'Include "/tmp/include"' }
+      it { should contain 'Include "/apache_spec/include"' }
     end
   end
 

From 2ea49e1cb462b7ef7ca573595f348ea2dee9e601 Mon Sep 17 00:00:00 2001
From: Jesse Cotton <jcotton1123@gmail.com>
Date: Wed, 23 Apr 2014 14:14:18 +0000
Subject: [PATCH 0229/2267] Add fastcgi external server defined type

---
 README.md                           | 51 ++++++++++++++++
 manifests/fastcgi/server.pp         | 23 ++++++++
 spec/defines/fastcgi_server_spec.rb | 90 +++++++++++++++++++++++++++++
 templates/fastcgi/server.erb        |  3 +
 4 files changed, 167 insertions(+)
 create mode 100644 manifests/fastcgi/server.pp
 create mode 100644 spec/defines/fastcgi_server_spec.rb
 create mode 100644 templates/fastcgi/server.erb

diff --git a/README.md b/README.md
index 98cebb9a97..ec579af217 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@
         * [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)
+        * [Defined Type: apache::fastcgi::server](#defined-type-fastcgi-server)
     * [Virtual Host Examples - Demonstrations of some configuration options](#virtual-host-examples)
     * [Load Balancing](#load-balancing)
         * [Defined Type: apache::balancer](#defined-type-apachebalancer)
@@ -1507,6 +1508,56 @@ An array:
 
 Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid values are 'true' and 'false'. Defaults to 'false'.
 
+####Defined Type: FastCGI Server
+
+This type is intended for use with mod_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
+
+Ex:
+
+```puppet
+apache::fastcgi::server { 'php':
+  host      => '127.0.0.1:9000',
+  timeout   => 15,
+  flush     => false,
+  faux_path => '/var/www/php.fcgi',
+  alias     => '/php.fcgi',
+  file_type => 'application/x-httpd-php'
+}
+```
+
+Within your virtual host, you can then configure the specified file type to be handled by the fastcgi server specified above.
+
+```puppet
+apache::vhost { 'www':
+  ...
+  custom_fragment = 'AddType application/x-httpd-php .php'
+  ...
+}
+```
+
+#####`host`
+
+The hostname or IP address and TCP port number (1-65535) of the FastCGI server.
+
+#####`timeout`
+
+The number of seconds of FastCGI application inactivity allowed before the request is aborted and the event is logged (at the error LogLevel). The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond (by writing and flushing) within this period, the request will be aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
+
+#####`flush`
+
+Force a write to the client as data is received from the application. By default, mod_fastcgi buffers data in order to free the application as quickly as possible.
+
+#####`faux_path`
+
+`faux_path` does not have to exist in the local filesystem. URIs that Apache resolves to this filename will be handled by this external FastCGI application.
+
+#####`alias`
+
+A unique alias. This is used internally to link the action with the FastCGI server.
+
+#####`file_type`
+
+The MIME-type of the file's that will be processed by the FastCGI server. 
 
 ###Virtual Host Examples
 
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
new file mode 100644
index 0000000000..f62cb04530
--- /dev/null
+++ b/manifests/fastcgi/server.pp
@@ -0,0 +1,23 @@
+define apache::fastcgi::server (
+  $host          = '127.0.0.1:9000',
+  $timeout       = 15,
+  $flush         = false,
+  $faux_path     = "/var/www/$name.fcgi",
+  $alias         = "/$name.fcgi",
+  $file_type     = 'application/x-httpd-php'
+) {
+
+  Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server["$title"]
+
+  file { "fastcgi-pool-$name.conf":
+    ensure  => present,
+    path    => "${::apache::confd_dir}/fastcgi-pool-$name.conf",
+    owner   => 'root',
+    group   => $::apache::params::root_group,
+    mode    => '0644',
+    content => template('apache/fastcgi/server.erb'),
+    require => Exec["mkdir ${::apache::confd_dir}"],
+    before  => File[$::apache::confd_dir],
+    notify  => Service['httpd']
+  }
+}
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
new file mode 100644
index 0000000000..89e9b2041f
--- /dev/null
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe 'apache::fastcgi::server', :type => :define do
+  let :pre_condition do
+    'include apache'
+  end
+  let :title do
+    'www'
+  end
+  describe 'os-dependent items' do
+    context "on RedHat based systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+        }
+      end
+      let :facts do default_facts end
+      it { should contain_class("apache") }
+      it { should contain_class("apache::mod::fastcgi") }
+      it { should contain_file("fastcgi-pool-#{title}.conf").with(
+        :ensure => 'present',
+        :path => "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf"
+      ) }
+    end
+    context "on Debian based systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+        }
+      end
+      let :facts do default_facts end
+      it { should contain_class("apache") }
+      it { should contain_class("apache::mod::fastcgi") }
+      it { should contain_file("fastcgi-pool-#{title}.conf").with(
+        :ensure => 'present',
+        :path   => "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf"
+      ) }
+    end
+    context "on FreeBSD systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'FreeBSD',
+          :operatingsystemrelease => '9',
+          :concat_basedir         => '/dne',
+        }
+      end
+      let :facts do default_facts end
+      it { should contain_class("apache") }
+      it { should contain_class("apache::mod::fastcgi") }
+      it { should contain_file("fastcgi-pool-#{title}.conf").with(
+        :ensure => 'present',
+        :path   => "/usr/local/etc/apache22/Includes/fastcgi-pool-#{title}.conf"
+      ) }
+    end
+  end
+  describe 'os-independent items' do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    describe ".conf content" do
+      let :params do
+        {
+          :host      => '127.0.0.1:9001',
+          :timeout   => 30,
+          :flush     => true,
+          :faux_path => '/var/www/php-www.fcgi',
+          :alias     => '/php-www.fcgi',
+          :file_type => 'application/x-httpd-php'
+        }
+      end
+      let :expected do
+'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -host 127.0.0.1:9001
+Alias /php-www.fcgi /var/www/php-www.fcgi
+Action application/x-httpd-php /php-www.fcgi
+'
+      end
+      it do
+        should contain_file("fastcgi-pool-www.conf").with_content(expected)
+      end
+    end
+  end
+end
diff --git a/templates/fastcgi/server.erb b/templates/fastcgi/server.erb
new file mode 100644
index 0000000000..c16eae8cfd
--- /dev/null
+++ b/templates/fastcgi/server.erb
@@ -0,0 +1,3 @@
+FastCGIExternalServer <%= @faux_path %> -idle-timeout <%= @timeout %> <%= if @flush then '-flush' end %> -host <%= @host %>
+Alias <%= @alias %> <%= faux_path %>
+Action <%= @file_type %> <%= @alias %>

From 8f03f6c873706a70127b3e96532bbb4a5962c019 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 8 May 2014 18:50:16 -0400
Subject: [PATCH 0230/2267] SELinux updates.

Updates to the tests to make them work when SELinux is in enforcing mode. Also update the documentation with information on what needs to be done if you're using custom paths with SELinux.
---
 README.md                                 | 33 ++++++++++++++++++++++-
 spec/acceptance/apache_parameters_spec.rb | 14 ++++++++++
 spec/acceptance/class_spec.rb             | 14 ++++++++++
 spec/acceptance/vhost_spec.rb             | 14 ++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4b317cd50b..2e509cb9d6 100644
--- a/README.md
+++ b/README.md
@@ -1823,10 +1823,41 @@ The `apache::vhost::WSGIImportScript` parameter creates a statement inside the V
 
 ###General
 
-This module is CI tested on Centos 5 & 6, Ubuntu 12.04, Debian 7, and RHEL 5 & 6 platforms against both the OSS and Enterprise version of Puppet. 
+This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet. 
 
 The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions may occur.
 
+###SELinux and Custom Paths
+
+If you are running with SELinux in enforcing mode and want to use custom paths for your `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you will need to manage the context for the files yourself.
+
+Something along the lines of:
+
+```puppet
+        exec { 'set_apache_defaults':
+          command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"',
+          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          require => Package['policycoreutils-python'],
+        }
+        package { 'policycoreutils-python': ensure => installed }
+        exec { 'restorecon_apache':
+          command => 'restorecon -Rv /apache_spec',
+          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          before  => Service['httpd'],
+          require => Class['apache'],
+        }
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        file { '/custom/path': ensure => directory, }
+        file { '/custom/path/include': ensure => present, content => '#additional_includes' }
+        apache::vhost { 'test.server':
+          docroot             => '/custom/path',
+          additional_includes => '/custom/path/include',
+        }
+```
+
+You need to set the contexts using `semanage fcontext` not `chcon` because `file {...}` resources will reset the context to the values in the database if the resource isn't specifying the context.
+
 ##Development
 
 ###Contributing
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 808190dfaa..187d6ffe81 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -329,6 +329,20 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = <<-EOS
+          if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
+            package { 'policycoreutils-python': ensure => installed }
+            exec { 'set_apache_defaults':
+              command => 'semanage fcontext -a -t httpd_log_t "/apache_spec(/.*)?"',
+              path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+              require => Package['policycoreutils-python'],
+            }
+            exec { 'restorecon_apache':
+              command => 'restorecon -Rv /apache_spec',
+              path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+              before  => Service['httpd'],
+              require => Class['apache'],
+            }
+          }
           file { '/apache_spec': ensure => directory, }
           class { 'apache': logroot => '/apache_spec' }
         EOS
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index ca1255745f..c942cf8377 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -38,6 +38,20 @@ class { 'apache': }
     # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
+      if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
+        package { 'policycoreutils-python': ensure => installed }
+        exec { 'set_apache_defaults':
+          command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
+          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          require => Package['policycoreutils-python'],
+        }
+        exec { 'restorecon_apache':
+          command => 'restorecon -Rv /apache_spec',
+          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          before  => Service['httpd'],
+          require => Class['apache'],
+        }
+      }
       file { '/apache_spec': ensure => directory, }
       file { '/apache_spec/apache_custom': ensure => directory, }
       class { 'apache':
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 816327f3c9..3591a07322 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1041,6 +1041,20 @@ class { 'apache::mod::fastcgi': }
   describe 'additional_includes' do
     it 'applies cleanly' do
       pp = <<-EOS
+        if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
+          exec { 'set_apache_defaults':
+            command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
+            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+            require => Package['policycoreutils-python'],
+          }
+          package { 'policycoreutils-python': ensure => installed }
+          exec { 'restorecon_apache':
+            command => 'restorecon -Rv /apache_spec',
+            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+            before  => Service['httpd'],
+            require => Class['apache'],
+          }
+        }
         class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
         file { '/apache_spec': ensure => directory, }

From e7a512e0163d3f198b44402dc3555a665dd4081d Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 9 May 2014 14:29:19 -0400
Subject: [PATCH 0231/2267] Fix issues in the travis-ci build.

---
 spec/classes/mod/php_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 32b2ff0994..e228dd7817 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -70,7 +70,7 @@
       let :params do
         { :extensions => ['.php','.php5']}
       end
-      it { should contain_file("php5.conf").with_content =~ /AddHandler php5-script .php .php5\n/ }
+      it { should contain_file("php5.conf").with_content(/AddHandler php5-script .php .php5\n/) }
     end
     context "with specific version" do
       let :pre_condition do

From fc9e519214398588eed6f32cbf24f94b69d3183b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 12 May 2014 14:38:26 -0400
Subject: [PATCH 0232/2267] Fix failing tests on RHEL5.

A couple of missing packages, and the RHEL5 image also had SELinux in enforcing mode.
---
 spec/acceptance/apache_parameters_spec.rb | 11 ++++++++---
 spec/acceptance/class_spec.rb             | 11 ++++++++---
 spec/acceptance/mod_passenger_spec.rb     |  4 ++--
 spec/acceptance/mod_proxy_html_spec.rb    |  5 ++++-
 spec/acceptance/vhost_spec.rb             | 11 ++++++++---
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 187d6ffe81..14e5a1b8e3 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -329,12 +329,17 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = <<-EOS
-          if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
-            package { 'policycoreutils-python': ensure => installed }
+          if $::osfamily == 'RedHat' and $::selinux == 'true' {
+            $semanage_package = $::operatingsystemmajrelease ? {
+              '5'       => 'policycoreutils',
+              'default' => 'policycoreutils-python',
+            }
+
+            package { $semanage_package: ensure => installed }
             exec { 'set_apache_defaults':
               command => 'semanage fcontext -a -t httpd_log_t "/apache_spec(/.*)?"',
               path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-              require => Package['policycoreutils-python'],
+              require => Package[$semanage_package],
             }
             exec { 'restorecon_apache':
               command => 'restorecon -Rv /apache_spec',
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index c942cf8377..830e3ed5b6 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -38,12 +38,17 @@ class { 'apache': }
     # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
-      if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
-        package { 'policycoreutils-python': ensure => installed }
+      if $::osfamily == 'RedHat' and $::selinux == 'true' {
+        $semanage_package = $::operatingsystemmajrelease ? {
+          '5'       => 'policycoreutils',
+          'default' => 'policycoreutils-python',
+        }
+
+        package { $semanage_package: ensure => installed }
         exec { 'set_apache_defaults':
           command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
           path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package['policycoreutils-python'],
+          require => Package[$semanage_package],
         }
         exec { 'restorecon_apache':
           command => 'restorecon -Rv /apache_spec',
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 5b6c6d8570..68622eecbc 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -127,8 +127,8 @@ class { 'apache::mod::passenger': }
     end
 
   when 'RedHat'
-    # no fedora 18 passenger package yet
-    unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18)
+    # no fedora 18 passenger package yet, and rhel5 packages only exist for ruby 1.8.5
+    unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18) or (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5' and fact('rubyversion') != '1.8.5')
 
       context "default passenger config" do
         it 'succeeds in puppeting passenger' do
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index b34daacbff..f015f99941 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -23,7 +23,10 @@
         class { 'apache': }
         class { 'apache::mod::proxy': }
         class { 'apache::mod::proxy_http': }
-        class { 'apache::mod::proxy_html': }
+        # mod_proxy_html doesn't exist in RHEL5
+        if $::osfamily == 'RedHat' and $::operatingsystemmajrelease != '5' {
+          class { 'apache::mod::proxy_html': }
+        }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 3591a07322..34778cc049 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1041,13 +1041,18 @@ class { 'apache::mod::fastcgi': }
   describe 'additional_includes' do
     it 'applies cleanly' do
       pp = <<-EOS
-        if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
+        if $::osfamily == 'RedHat' and $::selinux == 'true' {
           exec { 'set_apache_defaults':
             command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
             path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-            require => Package['policycoreutils-python'],
+            require => Package[$semanage_package],
           }
-          package { 'policycoreutils-python': ensure => installed }
+          $semanage_package = $::operatingsystemmajrelease ? {
+            '5'       => 'policycoreutils',
+            'default' => 'policycoreutils-python',
+          }
+
+          package { $semanage_package: ensure => installed }
           exec { 'restorecon_apache':
             command => 'restorecon -Rv /apache_spec',
             path    => '/bin:/usr/bin/:/sbin:/usr/sbin',

From 8e7ef1550cc8a4f816a0f4d7235df36b48664998 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 12 May 2014 15:01:44 -0400
Subject: [PATCH 0233/2267] Fix lib path for Ubuntu 10.04.

---
 manifests/mod/proxy_html.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index a30c328c90..69894f21c3 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -14,6 +14,7 @@
       }
       $loadfiles = $::apache::params::distrelease ? {
         '6'     => ['/usr/lib/libxml2.so.2'],
+        '10'    => ['/usr/lib/libxml2.so.2'],
         default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
       }
     }

From 204038e1f8767db504b3ccf07dd54f3f0aa7958b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 12 May 2014 16:50:12 -0400
Subject: [PATCH 0234/2267] Add notes in README about untested functionality
 for RHEL5 and RHEL7.

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 2e509cb9d6..3f5fbfecaa 100644
--- a/README.md
+++ b/README.md
@@ -1821,6 +1821,14 @@ The Apache module relies heavily on templates to enable the `vhost` and `apache:
 
 The `apache::vhost::WSGIImportScript` parameter creates a statement inside the VirtualHost which is unsupported on older versions of Apache, causing this to fail.  This will be remedied in a future refactoring.
 
+###RHEL/CentOS 5
+
+The `apache::mod::passenger` and `apache::mod::proxy_html` classes are untested since repositories are missing compatible packages.   
+
+###RHEL/CentOS 7
+
+The `apache::mod::passenger` class is untested as the repository does not have packages for EL7 yet.  The fact that passenger packages aren't available also makes us unable to test the `rack_base_uri` parameter in `apache::vhost`.
+
 ###General
 
 This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet. 

From e083e8f306bb3879c92da9050ed9622a9fcbab2c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 13 May 2014 16:55:53 -0400
Subject: [PATCH 0235/2267] Update supported versions in metadata.json

---
 metadata.json | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/metadata.json b/metadata.json
index 26a14ae42a..92663a43c4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -11,28 +11,35 @@
         "operatingsystem": "RedHat",
         "operatingsystemrelease": [
           "5",
-          "6"
+          "6",
+          "7"
         ]
       },
       {
         "operatingsystem": "CentOS",
         "operatingsystemrelease": [
           "5",
-          "6"
+          "6",
+          "7"
+
         ]
       },
       {
         "operatingsystem": "OracleLinux",
         "operatingsystemrelease": [
           "5",
-          "6"
+          "6",
+          "7"
+
         ]
       },
       {
         "operatingsystem": "Scientific",
         "operatingsystemrelease": [
           "5",
-          "6"
+          "6",
+          "7"
+
         ]
       },
       {
@@ -46,7 +53,8 @@
         "operatingsystem": "Ubuntu",
         "operatingsystemrelease": [
           "10.04",
-          "12.04"
+          "12.04",
+          "14.04"
         ]
       }
     ],

From 2c58046332145c024f7b848f040b6f139be784ba Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Wed, 14 May 2014 17:39:23 -0400
Subject: [PATCH 0236/2267] Prepare a 1.1.0 release.

---
 CHANGELOG.md  | 35 +++++++++++++++++++++++++++++++++++
 Modulefile    |  2 +-
 metadata.json |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26e8d75d4d..c77316a488 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+## 2014-04-14 Supported Release 1.1.0
+
+###Summary
+
+This release primarily focuses on extending the httpd 2.4 support, tested
+through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger 
+4 support, as well as several new modules and important bugfixes.
+
+####Features
+
+- Add support for RHEL7 and Ubuntu 14.04
+- More complete apache24 support
+- Passenger 4 support
+- Add support for max_keepalive_requests and log_formats parameters
+- Add mod_pagespeed support
+- Add mod_speling support
+- Added several parameters for mod_passenger
+- Added ssl_cipher parameter to apache::mod::ssl
+- Improved examples in documentation
+- Added docroot_mode, action, and suexec_user_group parameters to apache::vhost
+- Add support for custom extensions for mod_php
+- Improve proxy_html support for Debian
+
+####Bugfixes
+
+- Remove NameVirtualHost directive for apache >= 2.4
+- Order proxy_set option so it doesn't change between runs
+- Fix inverted SSL compression
+- Fix missing ensure on concat::fragment resources
+- Fix bad dependencies in apache::mod and apache::mod::mime
+
+####Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
 ## 2014-03-04 Supported Release 1.0.1
 ###Summary
 
diff --git a/Modulefile b/Modulefile
index 227947cbba..49a712bcdd 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-apache'
-version '1.0.1'
+version '1.1.0'
 source 'git://github.com/puppetlabs/puppetlabs-apache.git'
 author 'puppetlabs'
 license 'Apache 2.0'
diff --git a/metadata.json b/metadata.json
index 92663a43c4..5fd476b7f1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "puppetlabs-apache",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "source": "https://github.com/puppetlabs/puppetlabs-apache",
     "author": "Puppet Labs",
     "license": "Apache-2.0",

From 0aa6b0f72f07d80974a4743a59ff1ac342937ebf Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Wed, 14 May 2014 12:12:22 -0700
Subject: [PATCH 0237/2267] (MODULES-910) Convert @apache_version to a string

Three part version numbers cannot be floats and must
be represented as strings. This commit changes all instances
of $apache_version and any comparsions to use strings and the
versioncmp function.

This also fixes comparsion of Float and String errors with future
parser enabled.
---
 manifests/default_mods.pp                 | 10 +++++-----
 manifests/init.pp                         |  2 +-
 manifests/mod/event.pp                    |  2 +-
 manifests/mod/pagespeed.pp                |  2 +-
 manifests/mod/prefork.pp                  |  2 +-
 manifests/mod/ssl.pp                      |  4 ++--
 manifests/mod/worker.pp                   |  2 +-
 manifests/mpm.pp                          |  6 +++---
 manifests/version.pp                      | 10 +++++-----
 manifests/vhost.pp                        |  4 ++--
 spec/acceptance/apache_parameters_spec.rb |  2 +-
 spec/acceptance/version.rb                | 12 ++++++------
 spec/acceptance/vhost_spec.rb             |  4 ++--
 spec/classes/apache_spec.rb               |  8 ++++----
 spec/classes/mod/event_spec.rb            |  6 +++---
 spec/classes/mod/itk_spec.rb              |  4 ++--
 spec/classes/mod/prefork_spec.rb          |  8 ++++----
 spec/classes/mod/worker_spec.rb           |  8 ++++----
 spec/defines/vhost_spec.rb                |  4 ++--
 templates/httpd.conf.erb                  |  6 +++---
 templates/mod/alias.conf.erb              |  2 +-
 templates/mod/info.conf.erb               |  2 +-
 templates/mod/ssl.conf.erb                |  2 +-
 templates/vhost/_block.erb                |  2 +-
 templates/vhost/_directories.erb          |  2 +-
 templates/vhost/_fastcgi.erb              |  2 +-
 26 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index c8f7446cf6..f665d7383e 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -9,7 +9,7 @@
   case $::osfamily {
     'redhat', 'freebsd': {
       ::apache::mod { 'log_config': }
-      if $apache_version >= 2.4 {
+      if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         ::apache::mod { 'systemd': }
         ::apache::mod { 'unixd': }
@@ -47,7 +47,7 @@
         ::apache::mod { 'usertrack': }
         ::apache::mod { 'version': }
 
-        if $apache_version >= 2.4 {
+        if versioncmp($apache_version, '2.4') >= 0 {
           ::apache::mod { 'authn_core': }
         }
         else {
@@ -114,7 +114,7 @@
     ::apache::mod { 'auth_basic': }
     ::apache::mod { 'authn_file': }
 
-    if $apache_version >= 2.4 {
+      if versioncmp($apache_version, '2.4') >= 0 {
       # authz_core is needed for 'Require' directive
       ::apache::mod { 'authz_core':
         id => 'authz_core_module',
@@ -135,7 +135,7 @@
   } elsif $mods {
     ::apache::default_mods::load { $mods: }
 
-    if $apache_version >= 2.4 {
+    if versioncmp($apache_version, '2.4') >= 0 {
       # authz_core is needed for 'Require' directive
       ::apache::mod { 'authz_core':
         id => 'authz_core_module',
@@ -145,7 +145,7 @@
       ::apache::mod { 'filter': }
     }
   } else {
-    if $apache_version >= 2.4 {
+    if versioncmp($apache_version, '2.4') >= 0 {
       # authz_core is needed for 'Require' directive
       ::apache::mod { 'authz_core':
         id => 'authz_core_module',
diff --git a/manifests/init.pp b/manifests/init.pp
index 069399b6da..9f77d5b4e7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -67,7 +67,7 @@
   validate_bool($service_enable)
 
   $valid_mpms_re = $apache_version ? {
-    2.4     => '(event|itk|peruser|prefork|worker)',
+    '2.4'   => '(event|itk|peruser|prefork|worker)',
     default => '(event|itk|prefork|worker)'
   }
 
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index cad00774c3..cb7ed96cd6 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -44,7 +44,7 @@
 
   case $::osfamily {
     'redhat': {
-      if $apache_version >= 2.4 {
+      if versioncmp($apache_version, '2.4') >= 0 {
         apache::mpm{ 'event':
           apache_version => $apache_version,
         }
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index cca30eb50e..f4827c22a7 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -35,7 +35,7 @@
 ){
 
   $_lib = $::apache::apache_version ? {
-    2.4     => 'mod_pagespeed_ap24.so',
+    '2.4'   => 'mod_pagespeed_ap24.so',
     default => undef
   }
 
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index d615acbddc..b3adeae8c8 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -42,7 +42,7 @@
 
   case $::osfamily {
     'redhat': {
-      if $apache_version >= 2.4 {
+      if versioncmp($apache_version, '2.4') >= 0 {
         ::apache::mpm{ 'prefork':
           apache_version => $apache_version,
         }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 7370746e60..dd178150c9 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -12,7 +12,7 @@
 
   case $::osfamily {
     'debian': {
-      if $apache_version >= 2.4 and $::operatingsystem == 'Ubuntu' {
+      if versioncmp($apache_version, '2.4') >= 0 and $::operatingsystem == 'Ubuntu' {
         $ssl_mutex = 'default'
       } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
         $ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
@@ -33,7 +33,7 @@
 
   ::apache::mod { 'ssl': }
 
-  if $apache_version >= 2.4 {
+  if versioncmp($apache_version, '2.4') >= 0 {
     ::apache::mod { 'socache_shmcb': }
   }
 
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 8007953cf8..3251a1a0ed 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -44,7 +44,7 @@
 
   case $::osfamily {
     'redhat': {
-      if $apache_version >= 2.4 {
+      if versioncmp($apache_version, '2.4') >= 0 {
         ::apache::mpm{ 'worker':
           apache_version => $apache_version,
         }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index b6b2cfebe8..6437016ba7 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -13,7 +13,7 @@
   $_path = "${lib_path}/${_lib}"
   $_id   = "mpm_${mpm}_module"
 
-  if $apache_version >= 2.4 {
+  if versioncmp($apache_version, '2.4') >= 0 {
     file { "${mod_dir}/${mpm}.load":
       ensure  => file,
       path    => "${mod_dir}/${mpm}.load",
@@ -37,7 +37,7 @@
         notify  => Service['httpd'],
       }
 
-      if $apache_version >= 2.4 {
+      if versioncmp($apache_version, '2.4') >= 0 {
         file { "${::apache::mod_enable_dir}/${mpm}.load":
           ensure  => link,
           target  => "${::apache::mod_dir}/${mpm}.load",
@@ -47,7 +47,7 @@
         }
       }
 
-      if $apache_version < 2.4 {
+      if versioncmp($apache_version, '2.4') < 0 {
         package { "apache2-mpm-${mpm}":
           ensure => present,
         }
diff --git a/manifests/version.pp b/manifests/version.pp
index 9deb37631e..a8592d5e95 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -13,20 +13,20 @@
   case $::osfamily {
     'RedHat': {
       if ($::operatingsystem == 'Fedora' and $distrelease >= 18) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
-        $default = 2.4
+        $default = '2.4'
       } else {
-        $default = 2.2
+        $default = '2.2'
       }
     }
     'Debian': {
       if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
-        $default = 2.4
+        $default = '2.4'
       } else {
-        $default = 2.2
+        $default = '2.2'
       }
     }
     'FreeBSD': {
-      $default = 2.2
+      $default = '2.2'
     }
     default: {
       fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 45897e8e01..0cdfd708ed 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -350,7 +350,7 @@
     }
   }
   if ! $ip_based {
-    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and $apache_version < 2.4 {
+    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) {
       ::apache::namevirtualhost { $nvh_addr_port: }
     }
   }
@@ -427,7 +427,7 @@
       directoryindex => $directoryindex,
     }
 
-    if $apache_version == 2.4 {
+    if versioncmp($apache_version, '2.4') >= 0 {
       $_directory_version = {
         require => 'all granted',
       }
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 14e5a1b8e3..4fa3bf6ec6 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -218,7 +218,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    if $apache_version >= 2.4
+    if $apache_version == '2.4'
       describe file($conf_file) do
         it { should be_file }
         it { should contain 'IncludeOptional "/tmp/root/*.conf"' }
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index a3b80c1730..27498354b4 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -17,9 +17,9 @@
   $suphp_configpath = 'undef'
 
   if (_operatingsystem == 'Fedora' and _operatingsystemrelease >= 18) or (_operatingsystem != 'Fedora' and _operatingsystemrelease >= 7)
-    $apache_version = 2.4
+    $apache_version = '2.4'
   else
-    $apache_version = 2.2
+    $apache_version = '2.2'
   end
 when 'Debian'
   $confd_dir        = '/etc/apache2/mods-available'
@@ -35,9 +35,9 @@
   $suphp_configpath = '/etc/php5/apache2'
 
   if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10
-    $apache_version = 2.4
+    $apache_version = '2.4'
   else
-    $apache_version = 2.2
+    $apache_version = '2.2'
   end
 when 'FreeBSD'
   $confd_dir        = '/usr/local/etc/apache22/Includes'
@@ -50,8 +50,8 @@
   $package_name     = 'apache22'
   $error_log        = 'http-error.log'
 
-  $apache_version = 2.2
+  $apache_version = '2.2'
 else
-  $apache_version = 0
+  $apache_version = '0'
 end
 
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 34778cc049..186a9986f0 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -165,7 +165,7 @@ class { 'apache': }
         pp = <<-EOS
           class { 'apache': }
 
-          if $apache::apache_version >= 2.4 {
+          if versioncmp($apache::apache_version, '2.4') >= 0 {
             $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
           } else {
             $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
@@ -209,7 +209,7 @@ class { 'apache': }
         pp = <<-EOS
           class { 'apache': }
 
-          if $apache::apache_version >= 2.4 {
+          if versioncmp($apache::apache_version, '2.4') >= 0 {
             $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
           } else {
             $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 6e0b705333..3290f5b425 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -75,7 +75,7 @@
 
     context "with Apache version < 2.4" do
       let :params do
-        { :apache_version => 2.2 }
+        { :apache_version => '2.2' }
       end
 
       it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
@@ -83,7 +83,7 @@
 
     context "with Apache version >= 2.4" do
       let :params do
-        { :apache_version => 2.4 }
+        { :apache_version => '2.4' }
       end
 
       it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
@@ -279,7 +279,7 @@
 
       context "with Apache version < 2.4" do
         let :params do
-          { :apache_version => 2.2 }
+          { :apache_version => '2.2' }
         end
 
         it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
@@ -287,7 +287,7 @@
 
       context "with Apache version >= 2.4" do
         let :params do
-          { :apache_version => 2.4 }
+          { :apache_version => '2.4' }
         end
 
         it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 320374a00d..6ae471ff3f 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -31,7 +31,7 @@
     context "with Apache version < 2.4" do
       let :params do
         {
-          :apache_version => 2.2,
+          :apache_version => '2.2',
         }
       end
 
@@ -44,7 +44,7 @@
     context "with Apache version >= 2.4" do
       let :params do
         {
-          :apache_version => 2.4,
+          :apache_version => '2.4',
         }
       end
 
@@ -68,7 +68,7 @@
     context "with Apache version >= 2.4" do
       let :params do
         {
-          :apache_version => 2.4,
+          :apache_version => '2.4',
         }
       end
 
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 032e122d48..d431c5c766 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -18,7 +18,7 @@
     context "with Apache version < 2.4" do
       let :params do
         {
-          :apache_version => 2.2,
+          :apache_version => '2.2',
         }
       end
 
@@ -31,7 +31,7 @@
     context "with Apache version >= 2.4" do
       let :params do
         {
-          :apache_version => 2.4,
+          :apache_version => '2.4',
         }
       end
 
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 8eff78e4ab..9ef49d78f2 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -18,7 +18,7 @@
     context "with Apache version < 2.4" do
       let :params do
         {
-          :apache_version => 2.2,
+          :apache_version => '2.2',
         }
       end
 
@@ -31,7 +31,7 @@
     context "with Apache version >= 2.4" do
       let :params do
         {
-          :apache_version => 2.4,
+          :apache_version => '2.4',
         }
       end
 
@@ -58,7 +58,7 @@
     context "with Apache version < 2.4" do
       let :params do
         {
-          :apache_version => 2.2,
+          :apache_version => '2.2',
         }
       end
 
@@ -71,7 +71,7 @@
     context "with Apache version >= 2.4" do
       let :params do
         {
-          :apache_version => 2.4,
+          :apache_version => '2.4',
         }
       end
 
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 504018e689..a8176c570d 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -18,7 +18,7 @@
     context "with Apache version < 2.4" do
       let :params do
         {
-          :apache_version => 2.2,
+          :apache_version => '2.2',
         }
       end
 
@@ -31,7 +31,7 @@
     context "with Apache version >= 2.4" do
       let :params do
         {
-          :apache_version => 2.4,
+          :apache_version => '2.4',
         }
       end
 
@@ -58,7 +58,7 @@
     context "with Apache version < 2.4" do
       let :params do
         {
-          :apache_version => 2.2,
+          :apache_version => '2.2',
         }
       end
 
@@ -71,7 +71,7 @@
     context "with Apache version >= 2.4" do
       let :params do
         {
-          :apache_version => 2.4,
+          :apache_version => '2.4',
         }
       end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index efdeaae57d..f085e13ed9 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -788,7 +788,7 @@
         describe "when #{param[:attr]} is #{param[:value]}" do
           let :params do default_params.merge({
             param[:attr].to_sym => param[:value],
-            :apache_version => 2.2,
+            :apache_version => '2.2',
           }) end
 
           it { should contain_file("25-#{title}.conf").with_mode('0644') }
@@ -925,7 +925,7 @@
         describe "when #{param[:attr]} is #{param[:value]}" do
           let :params do default_params.merge({
             param[:attr].to_sym => param[:value],
-            :apache_version => 2.4,
+            :apache_version => '2.4',
           }) end
 
           it { should contain_file("25-#{title}.conf").with_mode('0644') }
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index dd43cb95d2..c73a33dfc9 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -16,7 +16,7 @@ Group <%= @group %>
 
 AccessFileName .htaccess
 <FilesMatch "^\.ht">
-<%- if @apache_version >= '2.4' -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require all denied
 <%- else -%>
      Order allow,deny
@@ -61,7 +61,7 @@ LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>
 
-<%- if @apache_version >= '2.4' -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @confd_dir %>/*.conf"
 <%- else -%>
 Include "<%= @confd_dir %>/*.conf"
@@ -79,7 +79,7 @@ Alias /error/ "<%= @error_documents_path %>/"
   Options IncludesNoExec
   AddOutputFilter Includes html
   AddHandler type-map var
-<%- if @apache_version == '2.4' -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   Require all granted
 <%- else -%>
   Order allow,deny
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
index 0a0c81593d..151a806c9f 100644
--- a/templates/mod/alias.conf.erb
+++ b/templates/mod/alias.conf.erb
@@ -3,7 +3,7 @@ Alias /icons/ "<%= @icons_path %>/"
 <Directory "<%= @icons_path %>">
     Options Indexes MultiViews
     AllowOverride None
-<%- if @apache_version == '2.4' -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require all granted
 <%- else -%>
      Order allow,deny
diff --git a/templates/mod/info.conf.erb b/templates/mod/info.conf.erb
index 0747da4307..d5288fb8c9 100644
--- a/templates/mod/info.conf.erb
+++ b/templates/mod/info.conf.erb
@@ -1,6 +1,6 @@
 <Location /server-info>
     SetHandler server-info
-    <%- if @apache_version >= '2.4' -%>
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require ip <%= Array(@allow_from).join(" ") %>
     <%- else -%>
     Order deny,allow
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index a393193a76..24274050c2 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -13,7 +13,7 @@
 <% if @ssl_compression -%>
   SSLCompression On
 <% end -%>
-  <% if @apache_version >= '2.4' -%>
+  <% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   Mutex <%= @ssl_mutex %>
   <% else -%>
   SSLMutex <%= @ssl_mutex %>
diff --git a/templates/vhost/_block.erb b/templates/vhost/_block.erb
index f3c835d2cb..d0776829da 100644
--- a/templates/vhost/_block.erb
+++ b/templates/vhost/_block.erb
@@ -4,7 +4,7 @@
 <% if @block.include? 'scm' -%>
   # Block access to SCM directories.
   <DirectoryMatch .*\.(svn|git|bzr)/.*>
-  <%- if @apache_version >= '2.4' -%>
+  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require all denied
   <%- else -%>
     Deny From All
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index efa26ce4e9..71c61a02c8 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -34,7 +34,7 @@
     AllowOverride None
       <%- end -%>
     <%- end -%>
-    <%- if @apache_version == '2.4' -%>
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       <%- if directory['require'] and directory['require'] != '' -%>
     Require <%= Array(directory['require']).join(' ') %>
       <%- else -%>
diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
index 07129bc197..3a2baa5596 100644
--- a/templates/vhost/_fastcgi.erb
+++ b/templates/vhost/_fastcgi.erb
@@ -8,7 +8,7 @@
     Options +ExecCGI
     AllowOverride All
     SetHandler fastcgi-script
-  <%- if @apache_version >= '2.4' -%>
+  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require all granted
   <%- else -%>
     Order allow,deny

From 644cb9694db682880196a7ed10daf00fddb59f6e Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 21 May 2014 18:20:10 -0400
Subject: [PATCH 0238/2267] default shouldn't be quoted in the selector.

---
 spec/acceptance/apache_parameters_spec.rb | 4 ++--
 spec/acceptance/class_spec.rb             | 4 ++--
 spec/acceptance/vhost_spec.rb             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 14e5a1b8e3..019ad24deb 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -331,8 +331,8 @@ class { 'apache':
         pp = <<-EOS
           if $::osfamily == 'RedHat' and $::selinux == 'true' {
             $semanage_package = $::operatingsystemmajrelease ? {
-              '5'       => 'policycoreutils',
-              'default' => 'policycoreutils-python',
+              '5'     => 'policycoreutils',
+              default => 'policycoreutils-python',
             }
 
             package { $semanage_package: ensure => installed }
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 830e3ed5b6..bb41bf8f80 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -40,8 +40,8 @@ class { 'apache': }
       pp = <<-EOS
       if $::osfamily == 'RedHat' and $::selinux == 'true' {
         $semanage_package = $::operatingsystemmajrelease ? {
-          '5'       => 'policycoreutils',
-          'default' => 'policycoreutils-python',
+          '5'     => 'policycoreutils',
+          default => 'policycoreutils-python',
         }
 
         package { $semanage_package: ensure => installed }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 34778cc049..7b229d1f5f 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1048,8 +1048,8 @@ class { 'apache::mod::fastcgi': }
             require => Package[$semanage_package],
           }
           $semanage_package = $::operatingsystemmajrelease ? {
-            '5'       => 'policycoreutils',
-            'default' => 'policycoreutils-python',
+            '5'     => 'policycoreutils',
+            default => 'policycoreutils-python',
           }
 
           package { $semanage_package: ensure => installed }

From 731329c8586c8af67203c3757a88af5a332fedfb Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 21 May 2014 19:23:51 -0400
Subject: [PATCH 0239/2267] Update PE version requirements.

---
 metadata.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.json b/metadata.json
index 5fd476b7f1..15317ff18e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -59,6 +59,7 @@
       }
     ],
     "requirements": [
+      { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" },
       { "name": "puppet", "version_requirement": "3.x" }
     ],
     "dependencies": []

From 6a60fe48b1c8a2a813191cd9670258b559fc3c49 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 22 May 2014 18:56:04 -0400
Subject: [PATCH 0240/2267] Resolve test failures on apache.

---
 spec/acceptance/class_spec.rb         | 17 ++++++++++-------
 spec/acceptance/mod_passenger_spec.rb | 10 +++++-----
 spec/acceptance/vhost_spec.rb         |  9 ++++-----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index bb41bf8f80..a2899f6bfb 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -46,15 +46,18 @@ class { 'apache': }
 
         package { $semanage_package: ensure => installed }
         exec { 'set_apache_defaults':
-          command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package[$semanage_package],
+          command     => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
+          path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          subscribe   => Package[$semanage_package],
+          refreshonly => true,
         }
         exec { 'restorecon_apache':
-          command => 'restorecon -Rv /apache_spec',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
-          require => Class['apache'],
+          command     => 'restorecon -Rv /apache_spec',
+          path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          before      => Service['httpd'],
+          require     => Class['apache'],
+          subscribe   => Exec['set_apache_defaults'],
+          refreshonly => true,
         }
       }
       file { '/apache_spec': ensure => directory, }
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 68622eecbc..dd65c5d3ed 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -81,7 +81,7 @@ class { 'apache::mod::passenger': }
       end
 
       it 'should output status via passenger-memory-stats' do
-        shell("sudo /usr/sbin/passenger-memory-stats") do |r|
+        shell("/usr/sbin/passenger-memory-stats") do |r|
           r.stdout.should =~ /Apache processes/
           r.stdout.should =~ /Nginx processes/
           r.stdout.should =~ /Passenger processes/
@@ -97,7 +97,7 @@ class { 'apache::mod::passenger': }
       unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
         it 'should output status via passenger-status' do
           # xml output not available on ubunutu <= 10.04, so sticking with default pool output
-          shell("sudo /usr/sbin/passenger-status") do |r|
+          shell("/usr/sbin/passenger-status") do |r|
             # spacing may vary
             r.stdout.should =~ /[\-]+ General information [\-]+/
             if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
@@ -136,7 +136,7 @@ class { 'apache::mod::passenger': }
             /* EPEL and passenger repositories */
             class { 'epel': }
             exec { 'passenger.repo GPG key':
-              command => '/usr/bin/sudo /usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
+              command => '/usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
               creates => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
             }
             file { 'passenger.repo GPG key':
@@ -194,7 +194,7 @@ class { 'apache::mod::passenger':
         end
 
         it 'should output status via passenger-memory-stats' do
-          shell("sudo /usr/bin/passenger-memory-stats") do |r|
+          shell("/usr/bin/passenger-memory-stats") do |r|
             r.stdout.should =~ /Apache processes/
             r.stdout.should =~ /Nginx processes/
             r.stdout.should =~ /Passenger processes/
@@ -206,7 +206,7 @@ class { 'apache::mod::passenger':
         end
 
         it 'should output status via passenger-status' do
-          shell("sudo PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
+          shell("PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
             # spacing may vary
             r.stdout.should =~ /[\-]+ General information [\-]+/
             r.stdout.should =~ /max[ ]+= [0-9]+/
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 7b229d1f5f..c99e7d5246 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1042,16 +1042,15 @@ class { 'apache::mod::fastcgi': }
     it 'applies cleanly' do
       pp = <<-EOS
         if $::osfamily == 'RedHat' and $::selinux == 'true' {
+          $semanage_package = $::operatingsystemmajrelease ? {
+            '5'     => 'policycoreutils',
+            default => 'policycoreutils-python',
+          }
           exec { 'set_apache_defaults':
             command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
             path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
             require => Package[$semanage_package],
           }
-          $semanage_package = $::operatingsystemmajrelease ? {
-            '5'     => 'policycoreutils',
-            default => 'policycoreutils-python',
-          }
-
           package { $semanage_package: ensure => installed }
           exec { 'restorecon_apache':
             command => 'restorecon -Rv /apache_spec',

From 179fb89d0d00fa5c214004581d8bc7c8ec4f2fb1 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 23 May 2014 16:29:25 +0200
Subject: [PATCH 0241/2267] Add fcgid options

This adds fcgid.conf to configure the fcgid module. It also adds the
FcgidWrapper option to vhost's directories.

The vhost option lacks any validation and allows users to shoot
themselves in the foot, but without iteration from the puppet future
parser I don't see a way to add the validation. Iteration would also
allow auto including apache::mod::fcgid.
---
 README.md                         | 36 ++++++++++++++++++
 manifests/mod/fcgid.pp            | 15 +++++++-
 spec/acceptance/mod_fcgid_spec.rb | 62 +++++++++++++++++++++++++++++++
 spec/classes/mod/fcgid_spec.rb    | 40 ++++++++++++++++++--
 spec/defines/vhost_spec.rb        | 36 ++++++++++++++++++
 templates/mod/fcgid.conf.erb      |  5 +++
 templates/vhost/_directories.erb  |  3 ++
 7 files changed, 192 insertions(+), 5 deletions(-)
 create mode 100644 spec/acceptance/mod_fcgid_spec.rb
 create mode 100644 templates/mod/fcgid.conf.erb

diff --git a/README.md b/README.md
index fd5cb87dc3..d4f388ccc4 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@
         * [Class: apache::mod::php](#class-apachemodphp)
         * [Class: apache::mod::ssl](#class-apachemodssl)
         * [Class: apache::mod::wsgi](#class-apachemodwsgi)
+        * [Class: apache::mod::fcgid](#class-apachemodfcgid)
         * [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)
@@ -578,6 +579,41 @@ For customized parameters, which tell Apache how Python is currently configured
 
 More information about [WSGI](http://modwsgi.readthedocs.org/en/latest/).
 
+####Class: `apache::mod::fcgid`
+
+Installs and configures mod_fcgid.
+
+The class makes no effort to list all available options, but rather uses an options hash to allow for ultimate flexibility:
+
+```puppet
+    class { 'apache::mod::fcgid':
+      options => {
+        'FcgidIPCDir'  => '/var/run/fcgidsock',
+        'SharememPath' => '/var/run/fcgid_shm',
+        'AddHandler'   => 'fcgid-script .fcgi',
+      },
+    }
+```
+
+For a full list op options, see the [official mod_fcgid documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).
+
+It is also possible to set the FcgidWrapper per directory per vhost. You must ensure the fcgid module is loaded because there is no auto loading.
+
+```puppet
+    include apache::mod::fcgid
+    apache::vhost { 'example.org':
+      docroot     => '/var/www/html',
+      directories => {
+        path        => '/var/www/html',
+        fcgiwrapper => {
+          command => '/usr/local/bin/fcgiwrapper',
+        }
+      },
+    }
+```
+
+See [FcgidWrapper documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#fcgidwrapper) for more information.
+
 ####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.
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 9eb7997427..70997768bc 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,3 +1,16 @@
-class apache::mod::fcgid {
+class apache::mod::fcgid(
+  $options = {},
+) {
   ::apache::mod { 'fcgid': }
+
+  # Template uses:
+  # - $options
+  file { 'fcgid.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/fcgid.conf",
+    content => template('apache/mod/fcgid.conf.erb'),
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Service['httpd'],
+  }
 }
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
new file mode 100644
index 0000000000..52f793be06
--- /dev/null
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::fcgid class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  case fact('osfamily')
+  when 'Debian'
+    # Not implemented
+  when 'RedHat'
+    context "default fcgid config" do
+      it 'succeeds in puppeting fcgid' do
+        pp = <<-EOS
+          class { 'epel': } # mod_fcgid lives in epel
+          class { 'apache': }
+          class { 'apache::mod::php': } # For /usr/bin/php-cgi
+          class { 'apache::mod::fcgid':
+            options => {
+              'FcgidIPCDir'  => '/var/run/fcgidsock',
+            },
+          }
+          apache::vhost { 'fcgid.example.com':
+            port        => '80',
+            docroot     => '/var/www/fcgid',
+            directories => {
+              path        => '/var/www/fcgid',
+              options     => '+ExecCGI',
+              addhandlers => {
+                handler    => 'fcgid-script',
+                extensions => '.php',
+              },
+              fcgiwrapper => {
+                command => '/usr/bin/php-cgi',
+                suffix  => '.php',
+              }
+            },
+          }
+          file { '/var/www/fcgid/index.php':
+            ensure  => file,
+            owner   => 'root',
+            group   => 'root',
+            content => "<?php echo 'Hello world'; ?>\\n",
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe service('httpd') do
+        it { should be_enabled }
+        it { should be_running }
+      end
+
+      it 'should answer to fcgid.example.com' do
+        shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
+          r.stdout.should =~ /^Hello world$/
+          r.exit_code.should == 0
+        end
+      end
+
+      it 'should run a php-cgi process' do
+        shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0])
+      end
+    end
+  end
+end
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 5cc337291a..df5da582e7 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -1,7 +1,10 @@
-describe 'apache::mod::fcgid', :type => :class do
+require 'spec_helper'
+
+describe 'apache::mod::fcgid' do
   let :pre_condition do
     'include apache'
   end
+
   context "on a Debian OS" do
     let :facts do
       {
@@ -14,6 +17,7 @@
     it { should contain_apache__mod('fcgid') }
     it { should contain_package("libapache2-mod-fcgid") }
   end
+
   context "on a RedHat OS" do
     let :facts do
       {
@@ -22,10 +26,37 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fcgid') }
-    it { should contain_package("mod_fcgid") }
+
+    describe 'without parameters' do
+      it { should contain_class("apache::params") }
+      it { should contain_apache__mod('fcgid') }
+      it { should contain_package("mod_fcgid") }
+    end
+
+    describe 'with parameters' do
+      let :params do {
+        :options                     => {
+          'FcgidIPCDir'               => '/var/run/fcgidsock',
+          'SharememPath'              => '/var/run/fcgid_shm',
+          'FcgidMinProcessesPerClass' => '0',
+          'AddHandler'                => 'fcgid-script .fcgi',
+        }
+      } end
+
+      it 'should contain the correct config' do
+        content = subject.resource('file', 'fcgid.conf').send(:parameters)[:content]
+        content.split("\n").reject { |c| c =~ /(^#|^$)/ }.should == [
+          '<IfModule mod_fcgid.c>',
+          '  AddHandler fcgid-script .fcgi',
+          '  FcgidIPCDir /var/run/fcgidsock',
+          '  FcgidMinProcessesPerClass 0',
+          '  SharememPath /var/run/fcgid_shm',
+          '</IfModule>',
+        ]
+      end
+    end
   end
+
   context "on a FreeBSD OS" do
     let :facts do
       {
@@ -34,6 +65,7 @@
         :concat_basedir         => '/dne',
       }
     end
+
     it { should contain_class("apache::params") }
     it { should contain_apache__mod('fcgid') }
     it { should contain_package("www/mod_fcgid") }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 933d31fb94..fde65d1f20 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1280,6 +1280,42 @@
         end
       end
 
+      describe 'fcgid directory options' do
+        describe 'No fcgiwrapper' do
+          let :params do
+            default_params.merge({
+              :directories      => { 'path' => '/srv/www' },
+            })
+          end
+
+          it { should_not contain_file("25-#{title}.conf").with_content(%r{FcgidWrapper}) }
+        end
+
+        describe 'Only a command' do
+          let :params do
+            default_params.merge({
+              :directories      => { 'path' => '/srv/www',
+                'fcgiwrapper' => { 'command' => '/usr/local/bin/fcgiwrapper' },
+              }
+            })
+          end
+
+          it { should contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper  $}) }
+        end
+
+        describe 'All parameters' do
+          let :params do
+            default_params.merge({
+              :directories    => { 'path' => '/srv/www',
+                'fcgiwrapper' => { 'command' => '/usr/local/bin/fcgiwrapper', 'suffix' => '.php', 'virtual' => 'virtual' },
+              }
+            })
+          end
+
+          it { should contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper .php virtual$}) }
+        end
+      end
+
       describe 'various ip/port combos' do
         describe 'when ip_based is true' do
           let :params do default_params.merge({ :ip_based => true }) end
diff --git a/templates/mod/fcgid.conf.erb b/templates/mod/fcgid.conf.erb
new file mode 100644
index 0000000000..a82bc30df9
--- /dev/null
+++ b/templates/mod/fcgid.conf.erb
@@ -0,0 +1,5 @@
+<IfModule mod_fcgid.c>
+<% @options.sort_by {|key, value| key}.each do |key, value| -%>
+  <%= key %> <%= value %>
+<% end -%>
+</IfModule>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 71c61a02c8..498bfc699a 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -153,6 +153,9 @@
     <%- if directory['suphp'] and @suphp_engine == 'on' -%>
     suPHP_UserGroup <%= directory['suphp']['user'] %> <%= directory['suphp']['group'] %>
     <%- end -%>
+    <%- if directory['fcgiwrapper'] -%>
+    FcgidWrapper <%= directory['fcgiwrapper']['command'] %> <%= directory['fcgiwrapper']['suffix'] %> <%= directory['fcgiwrapper']['virtual'] %>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>

From 9cc8f3dec01fcb0cef11a44166d84f3d4b2b442e Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 23 May 2014 13:54:45 -0400
Subject: [PATCH 0242/2267] MODULES-956 Added loadfile_name parameter to
 apache::mod.

This will allow for more control over the module load order, since
they appear to be loaded alphabetically.
---
 README.md                            |  4 ++++
 manifests/mod.pp                     | 25 ++++++++++++++++---------
 spec/acceptance/default_mods_spec.rb | 25 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index fd5cb87dc3..d5b82e9351 100644
--- a/README.md
+++ b/README.md
@@ -310,6 +310,10 @@ Sets the amount of time the server will wait for subsequent requests on a persis
 
 Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.
 
+#####`loadfile_name`
+
+Sets the file name for the module loadfile. Should be in the format *.load.  This can be used to set the module load order.
+
 #####`log_level`
 
 Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info', or 'debug'.
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 9d65bd91f1..968bd3eb48 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -1,11 +1,12 @@
 define apache::mod (
-  $package = undef,
+  $package        = undef,
   $package_ensure = 'present',
-  $lib = undef,
-  $lib_path = $::apache::params::lib_path,
-  $id = undef,
-  $path = undef,
-  $loadfiles = undef,
+  $lib            = undef,
+  $lib_path       = $::apache::params::lib_path,
+  $id             = undef,
+  $path           = undef,
+  $loadfile_name  = undef,
+  $loadfiles      = undef,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
@@ -39,6 +40,12 @@
     $_id = "${mod}_module"
   }
 
+  if $loadfile_name {
+    $_loadfile_name = $loadfile_name
+  } else {
+    $_loadfile_name = "${mod}.load"
+  }
+
   # Determine if we have a package
   $mod_packages = $::apache::params::mod_packages
   $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
@@ -69,7 +76,7 @@
 
   file { "${mod}.load":
     ensure  => file,
-    path    => "${mod_dir}/${mod}.load",
+    path    => "${mod_dir}/${_loadfile_name}",
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
@@ -86,8 +93,8 @@
     $enable_dir = $::apache::mod_enable_dir
     file{ "${mod}.load symlink":
       ensure  => link,
-      path    => "${enable_dir}/${mod}.load",
-      target  => "${mod_dir}/${mod}.load",
+      path    => "${enable_dir}/${_loadfile_name}",
+      target  => "${mod_dir}/${_loadfile_name}",
       owner   => 'root',
       group   => $::apache::params::root_group,
       mode    => '0644',
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 2b8b409e35..c7f8755605 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -2,10 +2,13 @@
 
 case fact('osfamily')
 when 'RedHat'
+  mod_dir     = '/etc/httpd/conf.d'
   servicename = 'httpd'
 when 'Debian'
+  mod_dir     = '/etc/apache2/mods-available'
   servicename = 'apache2'
 when 'FreeBSD'
+  mod_dir     = '/usr/local/etc/apache22/Modules'
   servicename = 'apache22'
 end
 
@@ -92,4 +95,26 @@ class { 'apache':
       it { should be_running }
     end
   end
+
+  describe 'change loadfile name' do
+    it 'should apply with no errors' do
+      pp = <<-EOS
+        class { 'apache': default_mods => false }
+        ::apache::mod { 'auth_basic': 
+          loadfile_name => 'zz_auth_basic.load',
+        }
+      EOS
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    end
+
+    describe service(servicename) do
+      it { should be_running }
+    end
+
+    describe file("#{mod_dir}/zz_auth_basic.load") do
+      it { should be_file }
+    end
+  end
 end

From bfa206ec522aa2cad5a4a33da7d4297693c1e77e Mon Sep 17 00:00:00 2001
From: Ken Geis <geis.ken@gmail.com>
Date: Sun, 25 May 2014 16:28:56 -0700
Subject: [PATCH 0243/2267] Update README.md

Add http:// protocol to URLs referring to Apache web site so that markdown processor doesn't think that they are relative URLs.
---
 README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index fd5cb87dc3..ffd2ae7aed 100644
--- a/README.md
+++ b/README.md
@@ -730,7 +730,7 @@ Sets the IP address the vhost listens on. Defaults to listen on all IPs.
 
 #####`ip_based`
 
-Enables an [IP-based](httpd.apache.org/docs/current/vhosts/ip-based.html) vhost. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based vhosts. Defaults to 'false'.
+Enables an [IP-based](http://httpd.apache.org/docs/current/vhosts/ip-based.html) vhost. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based vhosts. Defaults to 'false'.
 
 #####`itk`
 
@@ -1169,35 +1169,35 @@ Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/curren
 
 ######`auth_basic_fake`
 
-Sets the value for [AuthBasicFake](httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
+Sets the value for [AuthBasicFake](http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
 
 ######`auth_basic_provider`
 
-Sets the value for [AuthBasicProvider] (httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
+Sets the value for [AuthBasicProvider] (http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
 
 ######`auth_digest_algorithm`
 
-Sets the value for [AuthDigestAlgorithm](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
+Sets the value for [AuthDigestAlgorithm](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
 
 ######`auth_digest_domain`
 
-Sets the value for [AuthDigestDomain](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
+Sets the value for [AuthDigestDomain](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
 
 ######`auth_digest_nonce_lifetime`
 
-Sets the value for [AuthDigestNonceLifetime](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
+Sets the value for [AuthDigestNonceLifetime](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
 
 ######`auth_digest_provider`
 
-Sets the value for [AuthDigestProvider](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
+Sets the value for [AuthDigestProvider](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
 
 ######`auth_digest_qop`
 
-Sets the value for [AuthDigestQop](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
+Sets the value for [AuthDigestQop](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
 
 ######`auth_digest_shmem_size`
 
-Sets the value for [AuthAuthDigestShmemSize](httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
+Sets the value for [AuthAuthDigestShmemSize](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
 
 ######`auth_group_file`
 
@@ -1213,11 +1213,11 @@ Sets the entity name you're requiring to allow access. Read more about [Require]
 
 ######`auth_type`
 
-Sets the value for [AuthType](httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
+Sets the value for [AuthType](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
 
 ######`auth_user_file`
 
-Sets the value for [AuthUserFile](httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
+Sets the value for [AuthUserFile](http://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
 
 ######`custom_fragment`
 
@@ -1290,7 +1290,7 @@ Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.htm
 
 ######`index_options`
 
-Allows configuration settings for [directory indexing](httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
+Allows configuration settings for [directory indexing](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1322,7 +1322,7 @@ Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoind
 
 ######`options`
 
-Lists the [Options](httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
+Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
 
 ```puppet
     apache::vhost { 'sample.example.net':

From 88408f13dc1ebcde320748f82d766ad2847f3adc Mon Sep 17 00:00:00 2001
From: Malefitz <michael.gusek@pro-direct-finance.de>
Date: Mon, 26 May 2014 09:50:33 +0200
Subject: [PATCH 0244/2267] Add ability for handling more than one 'Allow
 from'-directive in _directories.erb

---
 README.md                        |  2 +-
 spec/acceptance/vhost_spec.rb    | 13 ++++++++++++-
 templates/vhost/_directories.erb |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fd5cb87dc3..648823cd4e 100644
--- a/README.md
+++ b/README.md
@@ -1135,7 +1135,7 @@ Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhand
 
 ######`allow`
 
-Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. 
+Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
 ```puppet
     apache::vhost { 'sample.example.net':
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2a55a5d133..c43d3f9e9e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -214,7 +214,10 @@ class { 'apache': }
           if versioncmp($apache::apache_version, '2.4') >= 0 {
             $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
           } else {
-            $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' }
+            $_files_match_directory = [ 
+              { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' },
+              { 'path' => '/bar/bar.html', 'provider' => 'location', allow => [ 'from 127.0.0.1', ] },
+            ]
           }
 
           $_directories = [
@@ -238,6 +241,13 @@ class { 'apache': }
             ensure  => file,
             content => "Hello World\\n",
           }
+          file { '/var/www/files/bar':
+            ensure => directory,
+          }
+          file { '/var/www/files/bar/bar.html':
+            ensure  => file,
+            content => "Hello Bar\\n",
+          }
           host { 'files.example.net': ip => '127.0.0.1', }
         EOS
         apply_manifest(pp, :catch_failures => true)
@@ -252,6 +262,7 @@ class { 'apache': }
         shell("/usr/bin/curl -sSf files.example.net:80/").stdout.should eq("Hello World\n")
         shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout.should eq("Hello Foo\n")
         shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
+        shell("/usr/bin/curl -sSf files.example.net:80/bar/bar.html").stdout.should eq("Hello Bar\n")
       end
     end
 
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 71c61a02c8..5a719e0932 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -50,7 +50,13 @@
     Deny <%= directory['deny'] %>
       <%- end -%>
       <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
+        <%- if directory['allow'].kind_of?(Array) -%>
+          <%- Array(directory['allow']).each do |access| -%>
+    Allow <%=  access %>
+        <%- end -%>
+      <%- else -%>
     Allow <%= directory['allow'] %>
+      <%- end -%>
       <%- elsif [ 'from all', 'from All' ].include?(directory['deny']) -%>
       <%- elsif ! directory['deny'] and [ false, 'false', '' ].include?(directory['allow']) -%>
     Deny from all

From 8a44be7e1e977bc3d5d7386dce21a46407113d14 Mon Sep 17 00:00:00 2001
From: Xavier leune <xleune@commentcamarche.net>
Date: Mon, 26 May 2014 11:51:09 +0200
Subject: [PATCH 0245/2267] Change inclusion of apache::mod::rewrite in
 vhost.pp

---
 manifests/vhost.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 45897e8e01..049c85b8cf 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -357,8 +357,8 @@
 
   # Load mod_rewrite if needed and not yet loaded
   if $rewrites or $rewrite_cond {
-    if ! defined(Apache::Mod['rewrite']) {
-      ::apache::mod { 'rewrite': }
+    if ! defined(Class['apache::mod::rewrite']) {
+      include ::apache::mod::rewrite
     }
   }
 

From a3632214e3e793d5199d015054715bf4e706630d Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 27 May 2014 12:48:45 -0400
Subject: [PATCH 0246/2267] Let's not hardcode x86_64...

---
 spec/acceptance/mod_pagespeed_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index de59a347c1..2b55627295 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -33,7 +33,7 @@ class { 'apt': }
           } 
         } elsif $::osfamily == 'RedHat' {
          yumrepo { 'mod-pagespeed':
-          baseurl  => 'http://dl.google.com/linux/mod-pagespeed/rpm/stable/x86_64',
+          baseurl  => "http://dl.google.com/linux/mod-pagespeed/rpm/stable/$::architecture",
             enabled  => 1,
             gpgcheck => 1,
             gpgkey   => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',

From ad0500ea53b019985f368e01489ee7a7a69d9a72 Mon Sep 17 00:00:00 2001
From: n00by <stefan.kleindl@rise-world.com>
Date: Tue, 27 May 2014 19:15:28 +0200
Subject: [PATCH 0247/2267] Update _proxy.erb

doing some formatting. removing unnecessary line breaks.
---
 templates/vhost/_proxy.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 2c5e24edef..a1d2e52923 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -5,15 +5,15 @@
 <%- end -%>
 <% if @proxy_preserve_host %>
   ProxyPreserveHost On
-<% end %>
-<% [@proxy_pass].flatten.compact.each do |proxy| %>
+<%- end -%>
+<%- [@proxy_pass].flatten.compact.each do |proxy| -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
   <Location <%= proxy['path']%>>
     ProxyPassReverse <%= proxy['url'] %>
   </Location>
 <% end %>
 <% if @proxy_dest -%>
-<% Array(@no_proxy_uris).each do |uri| %>
+<%- Array(@no_proxy_uris).each do |uri| -%>
   ProxyPass        <%= uri %> !
 <% end %>
   ProxyPass          / <%= @proxy_dest %>/

From 7bc201a1de78840d417a279decd3d6ca8222f20b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 28 May 2014 12:57:14 -0400
Subject: [PATCH 0248/2267] Renamed file resource to use loadfile_name if
 provided.

---
 manifests/mod.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 968bd3eb48..964ef51a41 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -74,7 +74,7 @@
     }
   }
 
-  file { "${mod}.load":
+  file { "${_loadfile_name}":
     ensure  => file,
     path    => "${mod_dir}/${_loadfile_name}",
     owner   => 'root',

From d4dbd9ba6491e88838aa3d7d3bb64bbfe1761e5e Mon Sep 17 00:00:00 2001
From: Matthias Baur <thats@matthiasbaur.me>
Date: Sat, 5 Apr 2014 19:19:05 +0200
Subject: [PATCH 0249/2267] Add support for SVN authentication (mod_authz_svn)

Add dependency for authz_svn. This is needed, since the mod is included in the dav_svn system package. Thanks @hunner for pointing this out!

- Add parameter for controling the enabl-/disabling of the authz_svn module. (Disabled by default)
- Optimize the dependency management

Mark dav_svn module as a module which has optional setings.

Add loadfile_name parameter for better module load order

Add acceptance test for dav_svn module
---
 README.md                           |  2 +-
 manifests/mod/dav_svn.pp            | 17 ++++++---
 spec/acceptance/mod_dav_svn_spec.rb | 55 +++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 spec/acceptance/mod_dav_svn_spec.rb

diff --git a/README.md b/README.md
index d5b82e9351..e5c053788a 100644
--- a/README.md
+++ b/README.md
@@ -442,7 +442,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `cgid`
 * `dav`
 * `dav_fs`
-* `dav_svn`
+* `dav_svn`*
 * `deflate`
 * `dev`
 * `dir`*
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 3ffa759112..0fd667bc3f 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -1,5 +1,14 @@
-class apache::mod::dav_svn {
-  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
-  include ::apache::mod::dav
-  ::apache::mod { 'dav_svn': }
+class apache::mod::dav_svn (
+  $authz_svn_enabled = false,
+) {
+    Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
+    include ::apache::mod::dav
+    ::apache::mod { 'dav_svn': } 
+    
+    if $authz_svn_enabled {
+      ::apache::mod { 'authz_svn':
+        loadfile_name => 'dav_svn_authz_svn.load',
+        require       => Apache::Mod['dav_svn'],
+      }
+    }
 }
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
new file mode 100644
index 0000000000..299ce2f12e
--- /dev/null
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::dav_svn class' do
+  case fact('osfamily')
+  when 'Debian'
+    mod_dir      = '/etc/apache2/mods-available'
+    service_name = 'apache2'
+  when 'RedHat'
+    mod_dir      = '/etc/httpd/conf.d'
+    service_name = 'httpd'
+  when 'FreeBSD'
+    mod_dir      = '/usr/local/etc/apache22/Modules'
+    service_name = 'apache22'
+  end
+
+  context "default dav_svn config" do
+    it 'succeeds in puppeting dav_svn' do
+      pp= <<-EOS
+        class { 'apache': }
+        include apache::mod::dav_svn
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    describe file("#{mod_dir}/dav_svn.load") do
+      it { should contain "LoadModule dav_svn_module" }
+    end
+  end
+
+  context "dav_svn with enabled authz_svn config" do
+    it 'succeeds in puppeting dav_svn' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::dav_svn':
+            authz_svn_enabled => true,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    describe file("#{mod_dir}/authz_svn.load") do
+      it { should contain "LoadModule authz_svn_module" }
+    end
+  end
+end

From a4f8c39509e4ef4b078d9f2ad4ca5277e2fc4922 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 29 May 2014 12:36:15 -0400
Subject: [PATCH 0250/2267] Only run mod_mime test on supported platforms.

---
 spec/acceptance/mod_mime_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index 71a7037a62..04b7dacc3e 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::mime class' do
+describe 'apache::mod::mime class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   case fact('osfamily')
   when 'Debian'
     mod_dir      = '/etc/apache2/mods-available'

From 22e660dca231526e4c9ff8c28f25c41119a6c4f7 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 30 May 2014 15:56:37 -0700
Subject: [PATCH 0251/2267] Fix passenger repo on Scientific linux

Because passenger is lame and only provides repos for `$releasever` of
6, 6Server, and 6.0 through 6.3, but Scientific linux has a
`$releasever` of `6.5` (rhel6 has `6Sverver`)
---
 spec/acceptance/mod_passenger_spec.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index dd65c5d3ed..085904975c 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -151,9 +151,13 @@ class { 'epel': }
                 File['passenger.repo GPG key'],
               ]
             }
+            $releasever_string = $operatingsystem ? {
+              'Scientific' => '6',
+              default      => '$releasever',
+            }
             yumrepo { 'passenger':
-              baseurl         => 'http://passenger.stealthymonkeys.com/rhel/$releasever/$basearch' ,
-              descr           => 'Red Hat Enterprise $releasever - Phusion Passenger',
+              baseurl         => "http://passenger.stealthymonkeys.com/rhel/${releasever_string}/\\$basearch" ,
+              descr           => "Red Hat Enterprise ${releasever_string} - Phusion Passenger",
               enabled         => 1,
               gpgcheck        => 1,
               gpgkey          => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',

From 722cdc09c4eb60770ddef79a690064d3e6e47b93 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 2 Jun 2014 14:25:43 -0400
Subject: [PATCH 0252/2267] Filename not updated in the test.

---
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 299ce2f12e..412b794540 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -48,7 +48,7 @@ class { 'apache::mod::dav_svn':
       it { should be_running }
     end
 
-    describe file("#{mod_dir}/authz_svn.load") do
+    describe file("#{mod_dir}/dav_svn_authz_svn.load") do
       it { should contain "LoadModule authz_svn_module" }
     end
   end

From 460775670a3297c0850fda53c82af2d3272ce827 Mon Sep 17 00:00:00 2001
From: Phil Fenstermacher <pcfens@wm.edu>
Date: Mon, 2 Jun 2014 13:27:02 -0400
Subject: [PATCH 0253/2267] Add better native support for Apache 2.4 when
 mod_access_compat isn't installed/enabled

---
 manifests/mod/ldap.pp            |  6 ++++--
 manifests/mod/pagespeed.pp       |  1 +
 manifests/mod/proxy.pp           |  3 ++-
 manifests/mod/status.pp          |  3 ++-
 manifests/mod/userdir.pp         |  3 ++-
 templates/mod/ldap.conf.erb      |  4 ++++
 templates/mod/pagespeed.conf.erb | 35 +++++++++++++++-----------------
 templates/mod/proxy.conf.erb     |  4 ++++
 templates/mod/status.conf.erb    |  4 ++++
 templates/mod/userdir.conf.erb   | 12 +++++++++--
 10 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index f489291a28..d3b17ff5b8 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -1,6 +1,8 @@
-class apache::mod::ldap {
+class apache::mod::ldap (
+  $apache_version = $::apache::apache_version,
+){
   ::apache::mod { 'ldap': }
-  # Template uses no variables
+  # Template uses $apache_version
   file { 'ldap.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/ldap.conf",
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index f4827c22a7..8c1c03bd5d 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -32,6 +32,7 @@
   $allow_pagespeed_message       = [],
   $message_buffer_size           = 100000,
   $additional_configuration      = {},
+  $apache_version                = $::apache::apache_version,
 ){
 
   $_lib = $::apache::apache_version ? {
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index b6c0d6df7c..03c1e78c95 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -1,9 +1,10 @@
 class apache::mod::proxy (
   $proxy_requests = 'Off',
   $allow_from = undef,
+  $apache_version = $::apache::apache_version,
 ) {
   ::apache::mod { 'proxy': }
-  # Template uses $proxy_requests
+  # Template uses $proxy_requests, $apache_version
   file { 'proxy.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/proxy.conf",
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index fdaba4b07a..cfab5d58ea 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -26,11 +26,12 @@
 class apache::mod::status (
   $allow_from      = ['127.0.0.1','::1'],
   $extended_status = 'On',
+  $apache_version = $::apache::apache_version,
 ){
   validate_array($allow_from)
   validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
   ::apache::mod { 'status': }
-  # Template uses $allow_from, $extended_status
+  # Template uses $allow_from, $extended_status, $apache_version
   file { 'status.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/status.conf",
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 27af54c667..accfe64a79 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -2,10 +2,11 @@
   $home = '/home',
   $dir = 'public_html',
   $disable_root = true,
+  $apache_version = $::apache::apache_version,
 ) {
   ::apache::mod { 'userdir': }
 
-  # Template uses $home, $dir, $disable_root
+  # Template uses $home, $dir, $disable_root, $apache_version
   file { 'userdir.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/userdir.conf",
diff --git a/templates/mod/ldap.conf.erb b/templates/mod/ldap.conf.erb
index 14f33ab2b2..0019776175 100644
--- a/templates/mod/ldap.conf.erb
+++ b/templates/mod/ldap.conf.erb
@@ -1,7 +1,11 @@
 <Location /ldap-status>
     SetHandler ldap-status
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    Require ip 127.0.0.1 ::1
+    <%- else -%>
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1 ::1
     Satisfy all
+    <%- end -%>
 </Location>
diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
index 3bbf7f29b4..a4d8a7220e 100644
--- a/templates/mod/pagespeed.conf.erb
+++ b/templates/mod/pagespeed.conf.erb
@@ -54,7 +54,6 @@ ModPagespeedNumExpensiveRewriteThreads <%= @num_expensive_rewrite_threads %>
 ModPagespeedStatistics <%= @collect_statistics %>
 
 <Location /mod_pagespeed_statistics>
-    Order allow,deny
     # You may insert other "Allow from" lines to add hosts you want to
     # allow to look at generated statistics.  Another possibility is
     # to comment out the "Order" and "Allow" options from the config
@@ -62,37 +61,35 @@ ModPagespeedStatistics <%= @collect_statistics %>
     # statistics.  This might be appropriate in an experimental setup or
     # if the Apache server is protected by a reverse proxy that will
     # filter URLs in some fashion.
-    Allow from localhost
-    Allow from 127.0.0.1
-    Allow from ::1
-    <% @allow_view_stats.each do |host| -%>
-    Allow from <%= host %>
-    <% end -%>
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    Require ip 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
+    <%- else -%>
+    Order allow,deny
+    Allow from 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
+    <%- end -%>
     SetHandler mod_pagespeed_statistics
 </Location>
 
 ModPagespeedStatisticsLogging <%= @statistics_logging %>
 <Location /pagespeed_console>
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
+    <%- else -%>
     Order allow,deny
-    Allow from localhost
-    Allow from 127.0.0.1
-    Allow from ::1
-    <% @allow_pagespeed_console.each do |host| -%>
-    Allow from <%= host %>
-    <% end -%>
+    Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
+    <%- end -%>
     SetHandler pagespeed_console
 </Location>
 
 ModPagespeedMessageBufferSize <%= @message_buffer_size %>
 
 <Location /mod_pagespeed_message>
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
+    <%- else -%>
     Order allow,deny
-    Allow from localhost
-    Allow from 127.0.0.1
-    Allow from ::1
-    <% @allow_pagespeed_message.each do |host| -%>
-    Allow from <%= host %>
-    <% end -%>
+    Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
+    <%- end -%>
     SetHandler mod_pagespeed_message
 </Location>
 
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index 1f4a4129c8..5ea829eeb3 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -10,9 +10,13 @@
 
   <% if @proxy_requests != 'Off' or ( @allow_from and ! @allow_from.empty? ) -%>
   <Proxy *>
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    Require ip <%= Array(@allow_from).join(" ") %>
+    <%- else -%>
     Order deny,allow
     Deny from all
     Allow from <%= Array(@allow_from).join(" ") %>
+    <%- end -%>
   </Proxy>
   <% end -%>
 
diff --git a/templates/mod/status.conf.erb b/templates/mod/status.conf.erb
index c00c16a78d..84f2e03430 100644
--- a/templates/mod/status.conf.erb
+++ b/templates/mod/status.conf.erb
@@ -1,8 +1,12 @@
 <Location /server-status>
     SetHandler server-status
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    Require ip <%= Array(@allow_from).join(" ") %>
+    <%- else -%>
     Order deny,allow
     Deny from all
     Allow from <%= Array(@allow_from).join(" ") %>
+    <%- end -%>
 </Location>
 ExtendedStatus <%= @extended_status %>
 
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index e4c6ba55dd..add525d5ea 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -8,12 +8,20 @@
     AllowOverride FileInfo AuthConfig Limit Indexes
     Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
     <Limit GET POST OPTIONS>
+      <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+      Require all denied
+      <%- else -%>
       Order allow,deny
       Allow from all
+      <%- end -%>
     </Limit>
     <LimitExcept GET POST OPTIONS>
-      Order deny,allow
-      Deny from all
+      <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+      Require all denied
+      <%- else -%>
+      Order allow,deny
+      Allow from all
+      <%- end -%>
     </LimitExcept>
   </Directory>
 </IfModule>

From 9c3da14815da62500b9c4c650e334b0e087d6d0d Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 2 Jun 2014 14:45:57 -0400
Subject: [PATCH 0254/2267] Missed some file resource namechanges.

---
 manifests/mod.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 964ef51a41..69a081912a 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -61,10 +61,10 @@
     # the module gets installed.
     $package_before = $::osfamily ? {
       'freebsd' => [
-        File["${mod}.load"],
+        File[$_loadfile_name],
         File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
       ],
-      default => File["${mod}.load"],
+      default => File[$_loadfile_name],
     }
     # $_package may be an array
     package { $_package:
@@ -91,7 +91,7 @@
 
   if $::osfamily == 'Debian' {
     $enable_dir = $::apache::mod_enable_dir
-    file{ "${mod}.load symlink":
+    file{ "${_loadfile_name} symlink":
       ensure  => link,
       path    => "${enable_dir}/${_loadfile_name}",
       target  => "${mod_dir}/${_loadfile_name}",
@@ -99,7 +99,7 @@
       group   => $::apache::params::root_group,
       mode    => '0644',
       require => [
-        File["${mod}.load"],
+        File[$_loadfile_name],
         Exec["mkdir ${enable_dir}"],
       ],
       before  => File[$enable_dir],

From 78ee7ff8eec066553fe1334efe9ee0f225df68d0 Mon Sep 17 00:00:00 2001
From: Thomas Steinert <thomas.steinert@adytonsystems.com>
Date: Tue, 3 Jun 2014 08:36:45 +0200
Subject: [PATCH 0255/2267] Change the site-include regexp to work better with
 Debian/Ubuntu as it is commonly used practice to omit the '.conf' part on
 vhost files.

---
 spec/classes/apache_spec.rb | 2 +-
 templates/httpd.conf.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 3290f5b425..5bf9851d4e 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -293,7 +293,7 @@
         it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
       end
 
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*\.conf"$} }
+      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
       it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index c73a33dfc9..cac3aaf102 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -67,7 +67,7 @@ IncludeOptional "<%= @confd_dir %>/*.conf"
 Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
-Include "<%= @vhost_load_dir %>/*.conf"
+Include "<%= @vhost_load_dir %>/*"
 <% end -%>
 
 <% if @error_documents -%>

From 22cb343ab0e6d36a6e92a1795fa4b30bdc1e25c1 Mon Sep 17 00:00:00 2001
From: Niek Beernink <n.beernink@oxilion.nl>
Date: Tue, 3 Jun 2014 12:16:23 +0200
Subject: [PATCH 0256/2267] make logroot_mode configurable

---
 manifests/vhost.pp         |  2 ++
 spec/defines/vhost_spec.rb | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index fe0ef28c3d..d894fca71f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -110,6 +110,7 @@
     $directoryindex              = '',
     $vhost_name                  = '*',
     $logroot                     = $::apache::logroot,
+    $logroot_mode                = undef,
     $log_level                   = undef,
     $access_log                  = true,
     $access_log_file             = undef,
@@ -274,6 +275,7 @@
   if ! defined(File[$logroot]) {
     file { $logroot:
       ensure  => directory,
+      mode    => $logroot_mode,
       require => Package['httpd'],
     }
   }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index fde65d1f20..2152d79b55 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1110,6 +1110,18 @@
           expect { subject }.to raise_error(Puppet::Error, /'error_log_file' and 'error_log_pipe' cannot be defined at the same time/)
         end
       end
+      describe 'when logroot and logroot_mode are specified' do
+        let :params do default_params.merge({
+          :logroot       => '/rspec/logroot',
+          :logroot_mode  => '0755',
+        }) end
+        it 'should set logroot mode' do
+          should contain_file(params[:logroot]).with({
+            :ensure => :directory,
+            :mode   => '0755',
+          })
+        end
+      end
       describe 'when docroot owner and mode is specified' do
         let :params do default_params.merge({
           :docroot_owner => 'testuser',

From c07e6f7fa6edc21aaeabc52464cab55afd8c085b Mon Sep 17 00:00:00 2001
From: Matt Dainty <matt@bodgit-n-scarper.com>
Date: Tue, 3 Jun 2014 13:44:34 +0100
Subject: [PATCH 0257/2267] Add DeflateFilterNote directives

Add the three standard DeflateFilterNote directives when using mod_deflate
based on the examples in the documentation here:

http://httpd.apache.org/docs/2.2/mod/mod_deflate.html
---
 spec/acceptance/mod_deflate_spec.rb | 40 +++++++++++++++
 spec/classes/mod/deflate_spec.rb    | 78 +++++++++++++++++++++++++++++
 templates/mod/deflate.conf.erb      |  4 ++
 3 files changed, 122 insertions(+)
 create mode 100644 spec/acceptance/mod_deflate_spec.rb
 create mode 100644 spec/classes/mod/deflate_spec.rb

diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
new file mode 100644
index 0000000000..b2ffc1436a
--- /dev/null
+++ b/spec/acceptance/mod_deflate_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::deflate class' do
+  case fact('osfamily')
+  when 'Debian'
+    mod_dir      = '/etc/apache2/mods-available'
+    service_name = 'apache2'
+  when 'RedHat'
+    mod_dir      = '/etc/httpd/conf.d'
+    service_name = 'httpd'
+  when 'FreeBSD'
+    mod_dir      = '/usr/local/etc/apache22/Modules'
+    service_name = 'apache22'
+  end
+
+  context "default deflate config" do
+    it 'succeeds in puppeting deflate' do
+      pp= <<-EOS
+        class { 'apache': }
+        include apache::mod::deflate
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    describe file("#{mod_dir}/deflate.conf") do
+      it { should contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" }
+      it { should contain "AddOutputFilterByType DEFLATE text/css" }
+      it { should contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" }
+      it { should contain "AddOutputFilterByType DEFLATE application/rss+xml" }
+      it { should contain "DeflateFilterNote Input instream" }
+      it { should contain "DeflateFilterNote Output outstream" }
+      it { should contain "DeflateFilterNote Ratio ratio" }
+    end
+  end
+end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
new file mode 100644
index 0000000000..405d1a42b9
--- /dev/null
+++ b/spec/classes/mod/deflate_spec.rb
@@ -0,0 +1,78 @@
+# This function is called inside the OS specific contexts
+def general_deflate_specs
+  it { should contain_apache__mod("deflate") }
+
+  it do
+    should contain_file("deflate.conf").with_content(
+      "AddOutputFilterByType DEFLATE text/html text/plain text/xml\n"\
+      "AddOutputFilterByType DEFLATE text/css\n"\
+      "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript\n"\
+      "AddOutputFilterByType DEFLATE application/rss+xml\n"\
+      "\n"\
+      "DeflateFilterNote Input instream\n"\
+      "DeflateFilterNote Output outstream\n"\
+      "DeflateFilterNote Ratio ratio\n"
+    )
+  end
+end
+
+describe 'apache::mod::deflate', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+
+  context "On a Debian OS with default params" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    # Load the more generic tests for this context
+    general_deflate_specs()
+
+    it { should contain_file("deflate.conf").with({
+      :ensure => 'file',
+      :path   => '/etc/apache2/mods-available/deflate.conf',
+    } ) }
+    it { should contain_file("deflate.conf symlink").with({
+      :ensure => 'link',
+      :path   => '/etc/apache2/mods-enabled/deflate.conf',
+    } ) }
+  end
+
+  context "on a RedHat OS with default params" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    # Load the more generic tests for this context
+    general_deflate_specs()
+
+    it { should contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") }
+  end
+
+  context "On a FreeBSD OS with default params" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    # Load the more generic tests for this context
+    general_deflate_specs()
+
+    it { should contain_file("deflate.conf").with({
+      :ensure => 'file',
+      :path   => '/usr/local/etc/apache22/Modules/deflate.conf',
+    } ) }
+  end
+end
diff --git a/templates/mod/deflate.conf.erb b/templates/mod/deflate.conf.erb
index d0997dfebb..a3cdf0552e 100644
--- a/templates/mod/deflate.conf.erb
+++ b/templates/mod/deflate.conf.erb
@@ -2,3 +2,7 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml
 AddOutputFilterByType DEFLATE text/css
 AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
 AddOutputFilterByType DEFLATE application/rss+xml
+
+DeflateFilterNote Input instream
+DeflateFilterNote Output outstream
+DeflateFilterNote Ratio ratio

From cae25161a2ecf12c63ca3fd99a38e494cf141592 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Mon, 26 May 2014 20:32:04 +0200
Subject: [PATCH 0258/2267] Rework Passenger support for Debian and update docs

This will undo the changes introduced in PR #711 because they are not
useful or necessary for Debian and Ubuntu, and did not work correctly
anyway. Fixes MODULES-1012.

Set correct default values for PassengerRoot, PassengerRuby and
PassengerDefaultRuby depending on the Debian or Ubuntu release. For
Debian 7 and Ubuntu 12.04 PassengerRoot is '/usr' while for Ubuntu 14.04
it is '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'.
PassengerRuby is '/usr/bin/ruby' for Debian 7/Ubuntu 12.04 while
PassengerDefaultRuby is unset, because this directive does not exist for
the Passenger verions packaged for these operating systems. For Ubuntu
14.04 PassengerRuby is unset and PassengerDefaultRuby is
'/usr/bin/ruby' instead.

Includes partially rewritten and updated Passenger documentation in
README.passenger.md, explaining the way things are handled for
Debian/Ubuntu and CentOS, where 'passenger.conf' is left untouched and
'passenger_extra.conf' contains the Puppet-managed Passenger
configuration. Also explains the user's responsibility to set
PassengerRoot correctly when using third-party or custom Passenger
packages, as the defaults only work for the Passenger versions and
packages shipped with the operating system.

Since Debian and Ubuntu ship with libapache2-mod-passenger packages that
will not change the packaged Passenger version over time (unlike EPEL
might) there is no need to tip-toe around the 'passenger.conf' file
installed by these packages.

Also contains updated and cleaned up Passenger spec and acceptance
tests.
---
 README.passenger.md                   | 201 ++++++++++++++++++++++----
 manifests/mod/passenger.pp            |  16 ++
 manifests/params.pp                   |  53 ++++++-
 spec/acceptance/mod_passenger_spec.rb |  77 +++++++++-
 spec/classes/mod/passenger_spec.rb    | 100 +++++++++----
 templates/mod/passenger.conf.erb      |   3 +
 6 files changed, 377 insertions(+), 73 deletions(-)

diff --git a/README.passenger.md b/README.passenger.md
index 1cc21202b8..4b4caa8c09 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -1,115 +1,258 @@
 # Passenger
 
-Just enabling the Passenger module is insufficient for the use of Passenger in production. Passenger should be tunable to better fit the environment in which it is run while being aware of the resources it required.
+Just enabling the Passenger module is insufficient for the use of Passenger in
+production. Passenger should be tunable to better fit the environment in which
+it is run while being aware of the resources it required.
 
-To this end the Apache passenger module has been modified to apply system wide Passenger tuning declarations to `passenger.conf`. Declarations specific to a virtual host should be passed through when defining a `vhost` (e.g. `rack_base_uris` parameter on the `apache::vhost` class, check `README.md`).
+To this end the Apache passenger module has been modified to apply system wide
+Passenger tuning declarations to `passenger.conf`. Declarations specific to a
+virtual host should be passed through when defining a `vhost` (e.g.
+`rack_base_uris` parameter on the `apache::vhost` type, check `README.md`).
 
-Also, general apache module loading parameters can be supplied to enable using a customized passenger module in place of a default-package-based version of the module.
+Also, general apache module loading parameters can be supplied to enable using
+a customized passenger module in place of a default-package-based version of
+the module.
+
+# Operating system support and Passenger versions
+
+The most important configuration directive for the Apache Passenger module is
+`PassengerRoot`. Its value depends on the Passenger version used (2.x, 3.x or
+4.x) and on the operating system package from which the Apache Passenger module
+is installed.
+
+The following table summarises the current *default versions* and
+`PassengerRoot` settings for the operating systems supported by
+puppetlabs-apache:
+
+OS               | Passenger version  | `PassengerRoot` 
+---------------- | ------------------ | ----------------
+Debian 7         | 3.0.13             | /usr
+Ubuntu 12.04     | 2.2.11             | /usr
+Ubuntu 14.04     | 4.0.37             | /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini 
+RHEL with EPEL6  | 3.0.21             | /usr/lib/ruby/gems/1.8/gems/passenger-3.0.21 
+
+As mentioned in `README.md` there are no compatible packages available for
+RHEL/CentOS 5 or RHEL/CentOS 7.
+
+## Configuration files and locations on RHEL/CentOS
+
+Notice two important points:
+
+1. The Passenger version packaged in the EPEL repositories may change over time.
+2. The value of `PassengerRoot` depends on the Passenger version installed.
+
+To prevent the puppetlabs-apache module from having to keep up with these
+package versions the Passenger configuration files installed by the
+packages are left untouched by this module. All configuration is placed in an
+extra configuration file managed by puppetlabs-apache.
+
+This means '/etc/httpd/conf.d/passenger.conf' is installed by the
+`mod_passenger` package and contains correct values for `PassengerRoot` and
+`PassengerRuby`. Puppet will ignore this file. Additional configuration
+directives as described in the remainder of this document are placed in
+'/etc/httpd/conf.d/passenger_extra.conf', managed by Puppet.
+
+This pertains *only* to RHEL/CentOS, *not* Debian and Ubuntu.
+
+## Third-party and custom Passenger packages and versions
+
+The Passenger version distributed by the default OS packages may be too old to
+be useful. Newer versions may be installed via Gems, from source or from
+third-party OS packages.
+
+Most notably the Passenger developers officially provide Debian packages for a
+variety of Debian and Ubuntu releases in the [Passenger APT
+repository](https://oss-binaries.phusionpassenger.com/apt/passenger). Read more
+about [installing these packages in the offical user
+guide](http://www.modrails.com/documentation/Users%20guide%20Apache.html#install_on_debian_ubuntu).
+
+If you install custom Passenger packages and newer version make sure to set the
+directives `PassengerRoot`, `PassengerRuby` and/or `PassengerDefaultRuby`
+correctly, or Passenger and Apache will fail to function properly.
+
+For Passenger 4.x packages on Debian and Ubuntu the `PassengerRoot` directive
+should almost universally be set to
+`/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini`.
 
 # Parameters for `apache::mod::passenger`
 
-The following declarations are supported and can be passed to `apache::mod::passenger` as parameters, for example:
+The following class parameters configure Passenger in a global, server-wide
+context.
 
-```
-class {'apache::mod::passenger':
-  passenger_high_performance  => 'on',
-  rails_autodetect            => 'off',
-  mod_lib_path                => '/usr/lib/apache2/custom_modules',
+Example:
+
+```puppet
+class { 'apache::mod::passenger':
+  passenger_root             => '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini',
+  passenger_default_ruby     => '/usr/bin/ruby1.9.3',
+  passenger_high_performance => 'on',
+  rails_autodetect           => 'off',
+  mod_lib_path               => '/usr/lib/apache2/custom_modules',
 }
 ```
 
-The general form is using the all lower case version of the declaration.
+The general form is using the all lower-case version of the configuration
+directive, with underscores instead of CamelCase.
 
 ## Parameters used with passenger.conf
 
-If you pass a default value to `apache::mod::passenger` it will be ignored and not passed through to the configuration file. 
+If you pass a default value to `apache::mod::passenger` it will be ignored and
+not passed through to the configuration file. 
+
+### passenger_root
+
+The location to the Phusion Passenger root directory. This configuration option
+is essential to Phusion Passenger, and allows Phusion Passenger to locate its
+own data files. 
+
+The default depends on the Passenger version and the means of installation. See
+the above section on operating system support, versions and packages for more
+information.
+
+http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerroot_lt_directory_gt
+
+### passenger_default_ruby
+
+This option specifies the default Ruby interpreter to use for web apps as well
+as for all sorts of internal Phusion Passenger helper scripts, e.g. the one
+used by PassengerPreStart.
+
+This directive was introduced in Passenger 4.0.0 and will not work in versions
+< 4.x. Do not set this parameter if your Passenger version is older than 4.0.0.
+
+Defaults to `undef` for all operating systems except Ubuntu 14.04, where it is
+set to '/usr/bin/ruby'.
+
+http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerDefaultRuby
+
+### passenger_ruby
+
+This directive is the same as `passenger_default_ruby` for Passenger versions
+< 4.x and must be used instead of `passenger_default_ruby` for such versions.
+
+It makes no sense to set `PassengerRuby` for Passenger >= 4.x. That
+directive should only be used to override the value of `PassengerDefaultRuby`
+on a non-global context, i.e. in `<VirtualHost>`, `<Directory>`, `<Location>`
+and so on.
+
+Defaults to `/usr/bin/ruby` for all supported operating systems except Ubuntu
+14.04, where it is set to `undef`.
+
+http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerRuby
 
 ### passenger_high_performance
 
-Default is `off`, when turned `on` Passenger runs in a higher performance mode that can be less compatible with other Apache modules.
+Default is `off`. When turned `on` Passenger runs in a higher performance mode
+that can be less compatible with other Apache modules.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerHighPerformance
 
 ### passenger_max_pool_size
 
-Set's the maximum number of Passenger application processes that may simultaneously run. The default value is 6.
+Sets the maximum number of Passenger application processes that may
+simultaneously run. The default value is 6.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengermaxpoolsize_lt_integer_gt
 
 ### passenger_pool_idle_time
 
-The maximum number of seconds a Passenger Application process will be allowed to remain idle before being shut down. The default value is 300.
+The maximum number of seconds a Passenger Application process will be allowed
+to remain idle before being shut down. The default value is 300.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerPoolIdleTime
 
 ### passenger_max_requests
 
-The maximum number of request a Passenger application will process before being restarted. The default value is 0, which indicates that a process will only shut down if the Pool Idle Time (see above) expires.
+The maximum number of request a Passenger application will process before being
+restarted. The default value is 0, which indicates that a process will only
+shut down if the Pool Idle Time (see above) expires.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
 
 ### passenger_stat_throttle_rate
 
-Sets how often Passenger performs file system checks, at most once every _x_ seconds. Default is 0, which means the checks are performed with every request.
+Sets how often Passenger performs file system checks, at most once every _x_
+seconds. Default is 0, which means the checks are performed with every request.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
 
 ### rack_autodetect
 
-Should Passenger automatically detect if the document root of a virtual host is a Rack application. The default is `on`
+Should Passenger automatically detect if the document root of a virtual host is
+a Rack application. Not set by default (`undef`). Note that this directive has
+been removed in Passenger 4.0.0 and `PassengerEnabled` should be used instead.
+Use this directive only on Passenger < 4.x.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
 
 ### rails_autodetect
 
-Should Passenger automatically detect if the document root of a virtual host is a Rails application. The default is on.
+Should Passenger automatically detect if the document root of a virtual host is
+a Rails application.  Not set by default (`undef`). Note that this directive
+has been removed in Passenger 4.0.0 and `PassengerEnabled` should be used
+instead. Use this directive only on Passenger < 4.x.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_lt_on_off_gt
 
 ### passenger_use_global_queue
 
-Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is the default in Passenger 4.x and the versions >= 4.x have disabled this configuration option altogether.  Use with caution.
+Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is
+the default in Passenger 4.x and the versions >= 4.x have disabled this
+configuration option altogether.  Use with caution.
 
 ## Parameters used to load the module
 
-Unlike the tuning parameters specified above, the following parameters are only used when loading customized passenger modules.
+Unlike the tuning parameters specified above, the following parameters are only
+used when loading customized passenger modules.
 
 ### mod_package
 
-Allows overriding the default package name used for the passenger module package.
+Allows overriding the default package name used for the passenger module
+package.
 
 ### mod_package_ensure
 
-Allows overriding the package installation setting used by puppet when installing the passenger module. The default is 'present'.
+Allows overriding the package installation setting used by puppet when
+installing the passenger module. The default is 'present'.
 
 ### mod_id
 
-Allows overriding the value used by apache to identify the passenger module. The default is 'passenger_module'.
+Allows overriding the value used by apache to identify the passenger module.
+The default is 'passenger_module'.
 
 ### mod_lib_path
 
-Allows overriding the directory path used by apache when loading the passenger module. The default is the value of `$apache::params::lib_path`.
+Allows overriding the directory path used by apache when loading the passenger
+module. The default is the value of `$apache::params::lib_path`.
 
 ### mod_lib
 
-Allows overriding the library file name used by apache when loading the passenger module. The default is 'mod_passenger.so'.
+Allows overriding the library file name used by apache when loading the
+passenger module. The default is 'mod_passenger.so'.
 
 ### mod_path
 
-Allows overriding the full path to the library file used by apache when loading the passenger module. The default is the concatenation of the `mod_lib_path` and `mod_lib` parameters.
+Allows overriding the full path to the library file used by apache when loading
+the passenger module. The default is the concatenation of the `mod_lib_path`
+and `mod_lib` parameters.
 
 # Dependencies
 
-RedHat-based systems will need to configure additional package repositories in order to install Passenger, specifically:
+RedHat-based systems will need to configure additional package repositories in
+order to install Passenger, specifically:
 
 * [Extra Packages for Enterprise Linux](https://fedoraproject.org/wiki/EPEL)
 * [Phusion Passenger](http://passenger.stealthymonkeys.com)
 
-Configuration of these repositories is beyond the scope of this module and is left to the user.
+Configuration of these repositories is beyond the scope of this module and is
+left to the user.
 
 # Attribution
 
-The Passenger tuning parameters for the `apache::mod::puppet` Puppet class was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the PuppetLabs Apache module on GitHub.
+The Passenger tuning parameters for the `apache::mod::passenger` Puppet class
+was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the
+NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the
+PuppetLabs Apache module on GitHub.
 
 * https://github.com/puppetlabs/puppetlabs-apache
 * https://github.com/nesi/puppetlabs-apache
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index b39ae2634e..12139cb2b4 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -9,6 +9,7 @@
   $rails_autodetect               = undef,
   $passenger_root                 = $::apache::params::passenger_root,
   $passenger_ruby                 = $::apache::params::passenger_ruby,
+  $passenger_default_ruby         = $::apache::params::passenger_default_ruby,
   $passenger_max_pool_size        = undef,
   $passenger_use_global_queue     = undef,
   $mod_package                    = undef,
@@ -23,6 +24,20 @@
     file { 'passenger_package.conf':
       path => "${::apache::mod_dir}/${passenger_conf_package_file}",
     }
+  } else {
+    # Remove passenger_extra.conf left over from before Passenger support was
+    # reworked for Debian. This is a temporary fix for users running this
+    # module from master after release 1.0.1 It will be removed in two
+    # releases from now.
+    $passenger_package_conf_ensure = $::osfamily ? {
+      'Debian' => 'absent',
+      default  => undef,
+    }
+
+    file { 'passenger_package.conf':
+      ensure => $passenger_package_conf_ensure,
+      path   => "${::apache::mod_dir}/passenger_extra.conf",
+    }
   }
 
   $_package = $mod_package
@@ -52,6 +67,7 @@
   # Template uses:
   # - $passenger_root
   # - $passenger_ruby
+  # - $passenger_default_ruby
   # - $passenger_max_pool_size
   # - $passenger_high_performance
   # - $passenger_max_requests
diff --git a/manifests/params.pp b/manifests/params.pp
index c7a042a7db..f9e98623b3 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -53,6 +53,7 @@
     $passenger_conf_package_file = 'passenger.conf'
     $passenger_root       = undef
     $passenger_ruby       = undef
+    $passenger_default_ruby = undef
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
@@ -112,10 +113,6 @@
     $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
     $ssl_certs_dir       = '/etc/ssl/certs'
-    $passenger_conf_file = 'passenger_extra.conf'
-    $passenger_conf_package_file = 'passenger.conf'
-    $passenger_root      = undef
-    $passenger_ruby      = undef
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
@@ -146,6 +143,53 @@
     $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
+
+    #
+    # Passenger-specific settings
+    #
+
+    $passenger_conf_file         = 'passenger.conf'
+    $passenger_conf_package_file = undef
+
+    case $::operatingsystem {
+      'Ubuntu': {
+        case $::lsbdistrelease {
+          '12.04': {
+            $passenger_root         = '/usr'
+            $passenger_ruby         = '/usr/bin/ruby'
+            $passenger_default_ruby = undef
+          }
+          '14.04': {
+            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+            $passenger_ruby         = undef
+            $passenger_default_ruby = '/usr/bin/ruby'
+          }
+          default: {
+            # The following settings may or may not work on Ubuntu releases not
+            # supported by this module.
+            $passenger_root         = '/usr'
+            $passenger_ruby         = '/usr/bin/ruby'
+            $passenger_default_ruby = undef
+          }
+        }
+      }
+      'Debian': {
+        case $::lsbdistcodename {
+          'wheezy': {
+            $passenger_root         = '/usr'
+            $passenger_ruby         = '/usr/bin/ruby'
+            $passenger_default_ruby = undef
+          }
+          default: {
+            # The following settings may or may not work on Debian releases not
+            # supported by this module.
+            $passenger_root         = '/usr'
+            $passenger_ruby         = '/usr/bin/ruby'
+            $passenger_default_ruby = undef
+          }
+        }
+      }
+    }
   } elsif $::osfamily == 'FreeBSD' {
     $user             = 'www'
     $group            = 'www'
@@ -173,6 +217,7 @@
     $passenger_conf_package_file = undef
     $passenger_root   = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
     $passenger_ruby   = '/usr/bin/ruby'
+    $passenger_default_ruby = undef
     $suphp_addhandler = 'php5-script'
     $suphp_engine     = 'off'
     $suphp_configpath = undef
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 68622eecbc..fbfac1672a 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -5,10 +5,39 @@
   when 'Debian'
     service_name = 'apache2'
     mod_dir = '/etc/apache2/mods-available/'
-    conf_file = "#{mod_dir}passenger_extra.conf"
+    conf_file = "#{mod_dir}passenger.conf"
     load_file = "#{mod_dir}passenger.load"
-    passenger_root = '/usr'
-    passenger_ruby = '/usr/bin/ruby'
+
+    case fact('operatingsystem')
+    when 'Ubuntu'
+      case fact('lsbdistrelease')
+      when '10.04'
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      when '12.04'
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      when '14.04'
+        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+        passenger_ruby         = '/usr/bin/ruby'
+        passenger_default_ruby = '/usr/bin/ruby'
+      else
+        # This may or may not work on Ubuntu releases other than the above
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      end
+    when 'Debian'
+      case fact('lsbdistcodename')
+      when 'wheezy'
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      else
+        # This may or may not work on Debian releases other than the above
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      end
+    end
+
     passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so'
     rackapp_user = 'www-data'
     rackapp_group = 'www-data'
@@ -71,9 +100,36 @@ class { 'apache::mod::passenger': }
       end
 
       describe file(conf_file) do
-        # passenger_extra.conf only contains directives if overridden from the class params
-        it { should_not contain "PassengerRoot \"#{passenger_root}\"" }
-        it { should_not contain "PassengerRuby \"#{passenger_ruby}\"" }
+        it { should contain "PassengerRoot \"#{passenger_root}\"" }
+
+        case fact('operatingsystem')
+        when 'Ubuntu'
+          case fact('lsbdistrelease')
+          when '10.04'
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          when '12.04'
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          when '14.04'
+            it { should contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerRuby/" }
+          else
+            # This may or may not work on Ubuntu releases other than the above
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          end
+        when 'Debian'
+          case fact('lsbdistcodename')
+          when 'wheezy'
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          else
+            # This may or may not work on Debian releases other than the above
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          end
+        end
       end
 
       describe file(load_file) do
@@ -85,8 +141,13 @@ class { 'apache::mod::passenger': }
           r.stdout.should =~ /Apache processes/
           r.stdout.should =~ /Nginx processes/
           r.stdout.should =~ /Passenger processes/
-          r.stdout.should =~ /### Processes: [0-9]+/
-          r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+
+          # passenger-memory-stats output on Ubuntu 14.04 does not contain
+          # these two lines
+          unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
+            r.stdout.should =~ /### Processes: [0-9]+/
+            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+          end
 
           r.exit_code.should == 0
         end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 608b3c47d9..1821e0c710 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -16,16 +16,10 @@
     it { should contain_file('passenger.load').with({
       'path' => '/etc/apache2/mods-available/passenger.load',
     }) }
-    it { should contain_file('passenger_package.conf').with({
-      'path' => '/etc/apache2/mods-available/passenger.conf',
-    }) }
-    it { should contain_file('passenger_package.conf').without_content }
-    it { should contain_file('passenger_package.conf').without_source }
     it { should contain_file('passenger.conf').with({
-      'path' => '/etc/apache2/mods-available/passenger_extra.conf',
+      'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+    it { should contain_file('passenger_package.conf').with_ensure('absent') }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }
@@ -38,11 +32,17 @@
       end
       it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
     end
-    describe "with passenger_high_performance => true" do
+    describe "with passenger_default_ruby => /usr/lib/example/ruby1.9.3" do
+      let :params do
+        { :passenger_ruby => '/usr/lib/example/ruby1.9.3' }
+      end
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
+    end
+    describe "with passenger_high_performance => on" do
       let :params do
-        { :passenger_high_performance => 'true' }
+        { :passenger_high_performance => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerHighPerformance true$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerHighPerformance on$/) }
     end
     describe "with passenger_pool_idle_time => 1200" do
       let :params do
@@ -68,35 +68,23 @@
       end
       it { should contain_file('passenger.conf').with_content(/^  PassengerMaxPoolSize 16$/) }
     end
-    describe "with rack_autodetect => true" do
+    describe "with rack_autodetect => on" do
       let :params do
-        { :rack_autodetect => true }
+        { :rack_autodetect => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  RackAutoDetect true$/) }
+      it { should contain_file('passenger.conf').with_content(/^  RackAutoDetect on$/) }
     end
-    describe "with rails_autodetect => true" do
+    describe "with rails_autodetect => on" do
       let :params do
-        { :rails_autodetect => true }
+        { :rails_autodetect => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  RailsAutoDetect true$/) }
+      it { should contain_file('passenger.conf').with_content(/^  RailsAutoDetect on$/) }
     end
-    describe "with passenger_root => '/usr/lib/example'" do
+    describe "with passenger_use_global_queue => on" do
       let :params do
-        { :passenger_root => '/usr/lib/example' }
+        { :passenger_use_global_queue => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
-    end
-    describe "with passenger_ruby => /usr/lib/example/ruby" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
-    end
-    describe "with passenger_use_global_queue => true" do
-      let :params do
-        { :passenger_use_global_queue => 'true' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue true$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue on$/) }
     end
     describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
       let :params do
@@ -123,7 +111,55 @@
       it { should contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
     end
 
+    context "with Ubuntu 12.04 defaults" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '12.04',
+          :operatingsystem        => 'Ubuntu',
+          :lsbdistrelease         => '12.04',
+          :concat_basedir         => '/dne',
+        }
+      end
+
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
+      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
+    end
+
+    context "with Ubuntu 14.04 defaults" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '14.04',
+          :operatingsystem        => 'Ubuntu',
+          :lsbdistrelease         => '14.04',
+          :concat_basedir         => '/dne',
+        }
+      end
+
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
+      it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+      it { should contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
+    end
+
+    context "with Debian 7 defaults" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '7.3',
+          :operatingsystem        => 'Debian',
+          :lsbdistcodename        => 'wheezy',
+          :concat_basedir         => '/dne',
+        }
+      end
+
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
+      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
+    end
   end
+
   context "on a RedHat OS" do
     let :facts do
       {
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 63c3f9e61b..dd9eee3b13 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -7,6 +7,9 @@
   <%- if @passenger_ruby -%>
   PassengerRuby "<%= @passenger_ruby %>"
   <%- end -%>
+  <%- if @passenger_default_ruby -%>
+  PassengerDefaultRuby "<%= @passenger_default_ruby %>"
+  <%- end -%>
   <%- if @passenger_high_performance -%>
   PassengerHighPerformance <%= @passenger_high_performance %>
   <%- end -%>

From 2771531843fc4062f8136b9e41e75175f629a9c6 Mon Sep 17 00:00:00 2001
From: Niek Beernink <n.beernink@oxilion.nl>
Date: Tue, 3 Jun 2014 12:16:23 +0200
Subject: [PATCH 0259/2267] make logroot_mode configurable

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index e57ef983c7..300aa66507 100644
--- a/README.md
+++ b/README.md
@@ -331,6 +331,11 @@ Define additional [LogFormats](https://httpd.apache.org/docs/current/mod/mod_log
 
 Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, and '/var/log/apache22' on FreeBSD.
 
+#####`logroot_mode`
+
+Overrides the mode the logroot directory is set to. Defaults to undef. Do NOT give people write access to the directory the logs are stored
+in without being aware of the consequences; see http://httpd.apache.org/docs/2.4/logs.html#security for details.
+
 #####`manage_group`
 
 Setting this to 'false' will stop the group resource from being created. This is for when you have a group, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established group would result in a duplicate resource error.

From c605967c1f7d187f316caee752c1cba10ce327e8 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Thu, 5 Jun 2014 00:02:47 +0200
Subject: [PATCH 0260/2267] Remove an unnecessary empty line in directories

This just replaces a closing `%>` with a `-%>` in `_directories.erb`.
---
 templates/vhost/_directories.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 498bfc699a..922d94cd61 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -10,7 +10,7 @@
   <%- else -%>
     <%- provider = 'Directory' -%>
   <%- end -%>
-  <%- path = directory['path'] %>
+  <%- path = directory['path'] -%>
 
   <<%= provider %> "<%= path %>">
     <%- if directory['headers'] -%>

From 12e90abb375f6ddb7b593cfb473fe8c9a25bbd21 Mon Sep 17 00:00:00 2001
From: "Angel L. Mateo" <amateo@um.es>
Date: Fri, 23 May 2014 13:09:15 +0200
Subject: [PATCH 0261/2267] Add parameters to provide content, template or
 source to the php module

---
 README.md                       | 23 +++++++++
 manifests/mod/php.pp            | 24 +++++++++-
 spec/acceptance/mod_php_spec.rb | 76 +++++++++++++++++++++++++++++
 spec/classes/mod/php_spec.rb    | 84 +++++++++++++++++++++++++++++++++
 spec/fixtures/files/spec        |  1 +
 5 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/files/spec

diff --git a/README.md b/README.md
index 3f472c9bc9..385130df31 100644
--- a/README.md
+++ b/README.md
@@ -554,6 +554,29 @@ Overriding the package name:
   }
 ```
 
+Overriding the default configuartion:
+```puppet
+  class {'::apache::mod::php':
+    source => 'puppet:///modules/apache/my_php.conf',
+  }
+```
+
+or 
+```puppet
+  class {'::apache::mod::php':
+    template => 'apache/php.conf.erb',
+  }
+```
+
+or
+
+```puppet
+  class {'::apache::mod::php':
+    content => '
+AddHandler php5-script .php
+AddType text/html .php',
+  }
+```
 ####Class: `apache::mod::ssl`
 
 Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are the defaults:
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index b797936bde..a94bfe50bd 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -3,11 +3,29 @@
   $package_ensure = 'present',
   $path           = undef,
   $extensions     = ['.php'],
+  $content        = undef,
+  $template       = 'apache/mod/php5.conf.erb',
+  $source         = undef,
 ) {
   if ! defined(Class['apache::mod::prefork']) {
     fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
   }
   validate_array($extensions)
+
+  if $source and ($content or $template != 'apache/mod/php5.conf.erb') {
+    warning('source and content or template parameters are provided. source parameter will be used')
+  } elsif $content and $template != 'apache/mod/php5.conf.erb' {
+    warning('content and template parameters are provided. content parameter will be used')
+  }
+
+  $manage_content = $source ? {
+    undef   => $content ? {
+      undef   => template($template),
+      default => $content,
+    },
+    default => undef,
+  }
+
   ::apache::mod { 'php5':
     package        => $package_name,
     package_ensure => $package_ensure,
@@ -22,7 +40,11 @@
   file { 'php5.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/php5.conf",
-    content => template('apache/mod/php5.conf.erb'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    content => $manage_content,
+    source  => $source,
     require => [
       Class['::apache::mod::prefork'],
       Exec["mkdir ${::apache::mod_dir}"],
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index cf8054053e..ca21fbcd7e 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -94,4 +94,80 @@ class { 'apache::mod::php':
       end
     end
   end
+
+  context "provide custom config file" do
+    it 'succeeds in puppeting php' do
+      pp= <<-EOS
+        class {'apache':
+          mpm_module => 'prefork',
+        }
+        class {'apache::mod::php':
+          content => '# somecontent',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{mod_dir}/php5.conf") do
+      it { should contain "# somecontent" }
+    end
+  end
+
+  context "provide content and template config file" do
+    it 'succeeds in puppeting php' do
+      pp= <<-EOS
+        class {'apache':
+          mpm_module => 'prefork',
+        }
+        class {'apache::mod::php':
+          content  => '# somecontent',
+          template => 'apache/mod/php5.conf.erb',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{mod_dir}/php5.conf") do
+      it { should contain "# somecontent" }
+    end
+  end
+
+  context "provide source has priority over content" do
+    it 'succeeds in puppeting php' do
+      pp= <<-EOS
+        class {'apache':
+          mpm_module => 'prefork',
+        }
+        class {'apache::mod::php':
+          content => '# somecontent',
+          source  => 'puppet:///modules/apache/spec',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{mod_dir}/php5.conf") do
+      it { should contain "# This is a file only for spec testing" }
+    end
+  end
+
+  context "provide source has priority over template" do
+    it 'succeeds in puppeting php' do
+      pp= <<-EOS
+        class {'apache':
+          mpm_module => 'prefork',
+        }
+        class {'apache::mod::php':
+          template => 'apache/mod/php5.conf.erb',
+          source   => 'puppet:///modules/apache/spec',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{mod_dir}/php5.conf") do
+      it { should contain "# This is a file only for spec testing" }
+    end
+  end
+
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index e228dd7817..7d13bffba0 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -122,4 +122,88 @@
       end
     end
   end
+  describe "OS independent tests" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+    context 'with content param' do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let :params do
+        { :content => 'somecontent' }
+      end
+      it { should contain_file('php5.conf').with(
+        :content => 'somecontent'
+      ) }
+    end
+    context 'with template param' do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let :params do
+        { :template => 'apache/mod/php5.conf.erb' }
+      end
+      it { should contain_file('php5.conf').with(
+        :content => /^# PHP is an HTML-embedded scripting language which attempts to make it/
+      ) }
+    end
+    context 'with source param' do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let :params do
+        { :source => 'some-path' }
+      end
+      it { should contain_file('php5.conf').with(
+        :source => 'some-path'
+      ) }
+    end
+    context 'content has priority over template' do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let :params do
+        {
+          :template => 'apache/mod/php5.conf.erb',
+          :content  => 'somecontent'
+        }
+      end
+      it { should contain_file('php5.conf').with(
+        :content => 'somecontent'
+      ) }
+    end
+    context 'source has priority over template' do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let :params do
+        {
+          :template => 'apache/mod/php5.conf.erb',
+          :source   => 'some-path'
+        }
+      end
+      it { should contain_file('php5.conf').with(
+        :source => 'some-path'
+      ) }
+    end
+    context 'source has priority over content' do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let :params do
+        {
+          :content => 'somecontent',
+          :source  => 'some-path'
+        }
+      end
+      it { should contain_file('php5.conf').with(
+        :source => 'some-path'
+      ) }
+    end
+  end
 end
diff --git a/spec/fixtures/files/spec b/spec/fixtures/files/spec
new file mode 100644
index 0000000000..76e9a14466
--- /dev/null
+++ b/spec/fixtures/files/spec
@@ -0,0 +1 @@
+# This is a file only for spec testing

From 240197fe3b12759bf6b913dda8956f1158e3ff97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?=
 <mickael.canevet@camptocamp.com>
Date: Wed, 7 May 2014 16:35:31 +0200
Subject: [PATCH 0262/2267] Fix module usage with strict_variables

---
 .travis.yml                          |  1 +
 manifests/mod.pp                     |  2 ++
 manifests/mod/proxy_html.pp          |  1 +
 manifests/package.pp                 |  2 +-
 manifests/params.pp                  |  2 ++
 manifests/vhost.pp                   |  2 ++
 spec/classes/apache_spec.rb          | 20 +++++++++++++++++
 spec/classes/dev_spec.rb             |  4 ++++
 spec/classes/mod/auth_kerb_spec.rb   | 15 +++++++++++++
 spec/classes/mod/authnz_ldap_spec.rb | 11 ++++++++++
 spec/classes/mod/dav_svn_spec.rb     | 15 +++++++++++++
 spec/classes/mod/deflate_spec.rb     | 12 +++++++++++
 spec/classes/mod/dev_spec.rb         | 11 ++++++----
 spec/classes/mod/dir_spec.rb         | 15 +++++++++++++
 spec/classes/mod/event_spec.rb       | 15 +++++++++++++
 spec/classes/mod/fastcgi_spec.rb     | 11 ++++++++++
 spec/classes/mod/fcgid_spec.rb       | 15 ++++++++++++-
 spec/classes/mod/info_spec.rb        | 20 +++++++++++++++++
 spec/classes/mod/itk_spec.rb         | 11 ++++++++++
 spec/classes/mod/mime_magic_spec.rb  | 16 ++++++++++++++
 spec/classes/mod/mime_spec.rb        |  9 ++++++++
 spec/classes/mod/pagespeed_spec.rb   | 11 ++++++++++
 spec/classes/mod/passenger_spec.rb   | 21 ++++++++++++++++++
 spec/classes/mod/perl_spec.rb        | 15 +++++++++++++
 spec/classes/mod/peruser_spec.rb     |  6 ++++++
 spec/classes/mod/php_spec.rb         | 15 +++++++++++++
 spec/classes/mod/prefork_spec.rb     | 15 +++++++++++++
 spec/classes/mod/proxy_html_spec.rb  | 22 ++++++++++++++++---
 spec/classes/mod/python_spec.rb      | 15 +++++++++++++
 spec/classes/mod/rpaf_spec.rb        | 11 ++++++++++
 spec/classes/mod/speling_spec.rb     | 11 ++++++++++
 spec/classes/mod/ssl_spec.rb         | 19 +++++++++++++++++
 spec/classes/mod/status_spec.rb      | 32 ++++++++++++++++++++++++++++
 spec/classes/mod/suphp_spec.rb       | 11 ++++++++++
 spec/classes/mod/worker_spec.rb      | 15 +++++++++++++
 spec/classes/mod/wsgi_spec.rb        | 15 +++++++++++++
 spec/classes/params_spec.rb          |  5 +++++
 spec/classes/service_spec.rb         | 13 +++++++++++
 spec/defines/mod_spec.rb             | 13 +++++++++++
 spec/defines/vhost_spec.rb           | 18 ++++++++++++++++
 spec/spec_helper.rb                  | 16 ++++++++++++++
 41 files changed, 500 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7269dd1390..1d00b8eb04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ env:
     - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
     - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
     - PUPPET_GEM_VERSION="~> 3.0"
+    - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
 matrix:
   fast_finish: true
   exclude:
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 69a081912a..aa5ea3f3bd 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -53,6 +53,8 @@
     $_package = $package
   } elsif $mod_package {
     $_package = $mod_package
+  } else {
+    $_package = undef
   }
   if $_package and ! defined(Package[$_package]) {
     # note: FreeBSD/ports uses apxs tool to activate modules; apxs clutters
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 69894f21c3..549eb117fa 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -6,6 +6,7 @@
   case $::osfamily {
     /RedHat|FreeBSD/: {
       ::apache::mod { 'xml2enc': }
+      $loadfiles = undef
     }
     'Debian': {
       $gnu_path = $::hardwaremodel ? {
diff --git a/manifests/package.pp b/manifests/package.pp
index b86167a397..a4e4015c52 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -1,7 +1,7 @@
 class apache::package (
   $ensure     = 'present',
   $mpm_module = $::apache::params::mpm_module,
-) {
+) inherits ::apache::params {
   case $::osfamily {
     'freebsd' : {
       $all_mpms = [
diff --git a/manifests/params.pp b/manifests/params.pp
index f9e98623b3..d272afb319 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -39,7 +39,9 @@
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
     $mod_dir              = "${httpd_dir}/conf.d"
+    $mod_enable_dir       = undef
     $vhost_dir            = "${httpd_dir}/conf.d"
+    $vhost_enable_dir     = undef
     $conf_file            = 'httpd.conf'
     $ports_file           = "${conf_dir}/ports.conf"
     $logroot              = '/var/log/httpd'
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index acb1bb50ad..40edad7e21 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -327,6 +327,7 @@
       $listen_addr_port = "${ip}:${port}"
       $nvh_addr_port = "${ip}:${port}"
     } else {
+      $listen_addr_port = undef
       $nvh_addr_port = $ip
       if ! $servername and ! $ip_based {
         fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters for name-based vhosts")
@@ -337,6 +338,7 @@
       $listen_addr_port = $port
       $nvh_addr_port = "${vhost_name}:${port}"
     } else {
+      $listen_addr_port = undef
       $nvh_addr_port = $name
       if ! $servername {
         fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters, and/or 'servername' parameter")
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 5bf9851d4e..f32fec8088 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -4,8 +4,13 @@
   context "on a Debian OS" do
     let :facts do
       {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :lsbdistcodename        => 'squeeze',
         :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
       }
     end
@@ -165,6 +170,7 @@
       context "13.10" do
         let :facts do
           super().merge({
+            :lsbdistrelease         => '13.10',
             :operatingsystemrelease => '13.10'
           })
         end
@@ -173,6 +179,7 @@
       context "12.04" do
         let :facts do
           super().merge({
+            :lsbdistrelease         => '12.04',
             :operatingsystemrelease => '12.04'
           })
         end
@@ -181,6 +188,7 @@
       context "13.04" do
         let :facts do
           super().merge({
+            :lsbdistrelease         => '13.04',
             :operatingsystemrelease => '13.04'
           })
         end
@@ -191,9 +199,13 @@
   context "on a RedHat 5 OS" do
     let :facts do
       {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '5',
         :concat_basedir         => '/dne',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -444,9 +456,13 @@
   context "on a FreeBSD OS" do
     let :facts do
       {
+        :id                     => 'root',
+        :kernel                 => 'FreeBSD',
         :osfamily               => 'FreeBSD',
+        :operatingsystem        => 'FreeBSD',
         :operatingsystemrelease => '9',
         :concat_basedir         => '/dne',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -516,9 +532,13 @@
   context 'on all OSes' do
     let :facts do
       {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     context 'default vhost defaults' do
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index e3d7dee399..eceadca4a7 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -4,7 +4,9 @@
   context "on a Debian OS" do
     let :facts do
       {
+        :lsbdistcodename        => 'squeeze',
         :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
       }
     end
@@ -17,6 +19,7 @@
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '6',
       }
     end
@@ -30,6 +33,7 @@
     let :facts do
       {
         :osfamily               => 'FreeBSD',
+        :operatingsystem        => 'FreeBSD',
         :operatingsystemrelease => '9',
       }
     end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 670270d228..6e2c16b7e9 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::auth_kerb', :type => :class do
   let :pre_condition do
     'include apache'
@@ -5,8 +7,13 @@
   context "on a Debian OS", :compile do
     let :facts do
       {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :lsbdistcodename        => 'squeeze',
         :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
       }
     end
@@ -17,8 +24,12 @@
   context "on a RedHat OS", :compile do
     let :facts do
       {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
       }
     end
@@ -29,8 +40,12 @@
   context "on a FreeBSD OS", :compile do
     let :facts do
       {
+        :id                     => 'root',
+        :kernel                 => 'FreeBSD',
         :osfamily               => 'FreeBSD',
+        :operatingsystem        => 'FreeBSD',
         :operatingsystemrelease => '9',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
       }
     end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index c8e832d950..d9ca5398b1 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::authnz_ldap', :type => :class do
   let :pre_condition do
     'include apache'
@@ -6,9 +8,14 @@
   context "on a Debian OS" do
     let :facts do
       {
+        :lsbdistcodename        => 'squeeze',
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :operatingsystem        => 'Debian',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -38,6 +45,10 @@
         :osfamily               => 'RedHat',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :operatingsystem        => 'RedHat',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index fe11bb8cb5..4898cdece1 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::dav_svn', :type => :class do
   let :pre_condition do
     'include apache'
@@ -5,9 +7,14 @@
   context "on a Debian OS" do
     let :facts do
       {
+        :lsbdistcodename        => 'squeeze',
         :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',
       }
     end
     it { should contain_class("apache::params") }
@@ -20,6 +27,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -32,6 +43,10 @@
         :osfamily               => 'FreeBSD',
         :operatingsystemrelease => '9',
         :concat_basedir         => '/dne',
+        :operatingsystem        => 'FreeBSD',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 405d1a42b9..f8eb881013 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 # This function is called inside the OS specific contexts
 def general_deflate_specs
   it { should contain_apache__mod("deflate") }
@@ -24,8 +26,12 @@ def general_deflate_specs
   context "On a Debian OS with default params" do
     let :facts do
       {
+        :id                     => 'root',
+        :lsbdistcodename        => 'squeeze',
         :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
       }
     end
@@ -46,8 +52,11 @@ def general_deflate_specs
   context "on a RedHat OS with default params" do
     let :facts do
       {
+        :id                     => 'root',
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
       }
     end
@@ -61,8 +70,11 @@ def general_deflate_specs
   context "On a FreeBSD OS with default params" do
     let :facts do
       {
+        :id                     => 'root',
         :osfamily               => 'FreeBSD',
+        :operatingsystem        => 'FreeBSD',
         :operatingsystemrelease => '9',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
       }
     end
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index b72217aadd..0de62afcb5 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -1,10 +1,11 @@
 require 'spec_helper'
+
 describe 'apache::mod::dev', :type => :class do
   [
-    ['RedHat',  '6'],
-    ['Debian',  '6'],
-    ['FreeBSD', '9'],
-  ].each do |osfamily, operatingsystemrelease|
+    ['RedHat',  '6', 'Santiago'],
+    ['Debian',  '6', 'squeeze'],
+    ['FreeBSD', '9', 'FreeBSD'],
+  ].each do |osfamily, operatingsystemrelease, lsbdistcodename|
     if osfamily == 'FreeBSD'
       let :pre_condition do
         'include apache::package'
@@ -13,7 +14,9 @@
     context "on a #{osfamily} OS" do
       let :facts do
         {
+          :lsbdistcodename        => lsbdistcodename,
           :osfamily               => osfamily,
+          :operatingsystem        => osfamily,
           :operatingsystemrelease => operatingsystemrelease,
         }
       end
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index b195eda0f7..8bcdc0b6be 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::dir', :type => :class do
   let :pre_condition do
     'class { "apache":
@@ -10,6 +12,11 @@
         :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
@@ -37,6 +44,10 @@
         :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
@@ -64,6 +75,10 @@
         :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
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 6ae471ff3f..850bd5c55b 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::event', :type => :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
@@ -8,6 +10,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -17,9 +23,14 @@
   context "on a Debian OS" do
     let :facts do
       {
+        :lsbdistcodename        => 'squeeze',
         :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',
       }
     end
 
@@ -62,6 +73,10 @@
         :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
 
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 8138bbab70..98ad2e8706 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::fastcgi', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -22,6 +29,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index df5da582e7..16719415d5 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'apache::mod::fcgid' do
+describe 'apache::mod::fcgid', :type => :class do
   let :pre_condition do
     'include apache'
   end
@@ -11,6 +11,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -24,6 +29,10 @@
         :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
 
@@ -63,6 +72,10 @@
         :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
 
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 21d253e98a..ed078c519f 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 # This function is called inside the OS specific contexts
 def general_info_specs
   it { should contain_apache__mod("info") }
@@ -25,6 +27,11 @@ def general_info_specs
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
@@ -47,6 +54,10 @@ def general_info_specs
         :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
 
@@ -62,6 +73,10 @@ def general_info_specs
         :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
 
@@ -80,6 +95,11 @@ def general_info_specs
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     let :params do
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index d431c5c766..d9fe2e3d12 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::itk', :type => :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -49,6 +56,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index d10d8345b8..e9984ecbaf 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 # This function is called inside the OS specific contexts
 def general_mime_magic_specs
   it { should contain_apache__mod("mime_magic") }
@@ -14,6 +16,11 @@ def general_mime_magic_specs
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
@@ -54,6 +61,10 @@ def general_mime_magic_specs
         :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
 
@@ -75,6 +86,11 @@ def general_mime_magic_specs
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 835a5a9004..2b6154fb81 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -16,6 +16,11 @@ def general_mime_specs
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
@@ -31,6 +36,10 @@ def general_mime_specs
         :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
 
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index 7480a2b52f..9439f719e6 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::pagespeed', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -22,6 +29,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 1821e0c710..3bf7d29952 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::passenger', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -119,6 +126,8 @@
           :operatingsystem        => 'Ubuntu',
           :lsbdistrelease         => '12.04',
           :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       end
 
@@ -135,6 +144,8 @@
           :operatingsystem        => 'Ubuntu',
           :lsbdistrelease         => '14.04',
           :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       end
 
@@ -151,6 +162,8 @@
           :operatingsystem        => 'Debian',
           :lsbdistcodename        => 'wheezy',
           :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       end
 
@@ -166,6 +179,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -200,6 +217,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 3cb7a3e67a..f674318e28 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::perl', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -20,6 +27,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -32,6 +43,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index 062905ccc9..e1ee004e93 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::peruser', :type => :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
@@ -8,6 +10,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index e228dd7817..cba128a826 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::php', :type => :class do
   describe "on a Debian OS" do
     let :facts do
@@ -5,6 +7,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     context "with mpm_module => prefork" do
@@ -33,6 +40,10 @@
         :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 "with default params" do
@@ -101,6 +112,10 @@
         :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 "with mpm_module => prefork" do
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 9ef49d78f2..847aecf9c7 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::prefork', :type => :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -49,6 +56,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -90,6 +101,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 000a24e2f9..77e1ab15de 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::proxy_html', :type => :class do
   let :pre_condition do
     [
@@ -14,9 +16,15 @@
     end
     let :facts do
       {
-        :osfamily       => 'Debian',
-        :concat_basedir => '/dne',
-        :architecture   => 'i386'
+        :osfamily        => 'Debian',
+        :concat_basedir  => '/dne',
+        :architecture    => 'i386',
+        :lsbdistcodename => 'squeeze',
+        :operatingsystem => 'Debian',
+        :id              => 'root',
+        :kernel          => 'Linux',
+        :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :hardwaremodel   => 'i386',
       }
     end
 
@@ -48,6 +56,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -60,6 +72,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 9042d0f1bf..d2d1fca7b9 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::python', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -20,6 +27,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -32,6 +43,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index d9c9015abf..949dd5702b 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::rpaf', :type => :class do
   let :pre_condition do
     [
@@ -10,6 +12,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -45,6 +52,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index 987291a3f3..e7e6e1d640 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::speling', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_apache__mod('speling') }
@@ -19,6 +26,10 @@
         :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
     it { should contain_apache__mod('speling') }
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 45005a1913..11e7964ded 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::ssl', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,10 @@
         :osfamily               => 'Magic',
         :operatingsystemrelease => '0',
         :concat_basedir         => '/dne',
+        :operatingsystem        => 'Magic',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { expect { subject }.to raise_error(Puppet::Error, /Unsupported osfamily:/) }
@@ -19,6 +25,10 @@
         :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
     it { should contain_class('apache::params') }
@@ -32,6 +42,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class('apache::params') }
@@ -45,6 +60,10 @@
         :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
     it { should contain_class('apache::params') }
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 0a06588792..5023bc7bf1 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -31,6 +31,11 @@ def status_conf_spec(allow_from, extended_status)
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
@@ -56,6 +61,10 @@ def status_conf_spec(allow_from, extended_status)
         :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
 
@@ -73,6 +82,11 @@ def status_conf_spec(allow_from, extended_status)
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     let :params do
@@ -92,6 +106,11 @@ def status_conf_spec(allow_from, extended_status)
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     let :params do
@@ -110,6 +129,10 @@ def status_conf_spec(allow_from, extended_status)
         :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',
       }
     end
     let :params do
@@ -130,6 +153,11 @@ def status_conf_spec(allow_from, extended_status)
           :osfamily               => 'Debian',
           :operatingsystemrelease => '6',
           :concat_basedir         => '/dne',
+          :lsbdistcodename        => 'squeeze',
+          :operatingsystem        => 'Debian',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       end
       let :params do
@@ -150,6 +178,10 @@ def status_conf_spec(allow_from, extended_status)
           :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',
         }
       end
       let :params do
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index 382314d9a9..cb91997ac1 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::suphp', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -19,6 +26,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index a8176c570d..3c9c1cf246 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::worker', :type => :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -49,6 +56,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -90,6 +101,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 44917cb88f..d4c391a291 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::wsgi', :type => :class do
   let :pre_condition do
     'include apache'
@@ -8,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_class("apache::params") }
@@ -20,6 +27,10 @@
         :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
     it { should contain_class("apache::params") }
@@ -45,6 +56,10 @@
         :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
     it { should contain_class("apache::params") }
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index de1108af08..eaa178c41d 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -7,6 +7,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_apache__params }
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 5419a68160..2cd075357d 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -10,6 +10,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_service("httpd").with(
@@ -86,6 +91,10 @@
         :osfamily               => 'RedHat',
         :operatingsystemrelease => '5',
         :concat_basedir         => '/dne',
+        :operatingsystem        => 'RedHat',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { should contain_service("httpd").with(
@@ -102,6 +111,10 @@
         :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
     it { should contain_service("httpd").with(
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index bbc5f0bdce..e6d5214097 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -10,6 +10,10 @@
         :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
 
@@ -48,6 +52,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
@@ -83,6 +92,10 @@
         :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
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index fde65d1f20..4037b3011c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -20,6 +20,10 @@
           :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
       let :params do default_params end
@@ -33,6 +37,11 @@
           :osfamily               => 'Debian',
           :operatingsystemrelease => '6',
           :concat_basedir         => '/dne',
+          :lsbdistcodename        => 'squeeze',
+          :operatingsystem        => 'Debian',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       end
       let :params do default_params end
@@ -55,6 +64,10 @@
           :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
       let :params do default_params end
@@ -73,6 +86,11 @@
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     describe 'basic assumptions' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f880d274d8..65379ee38a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,6 +2,22 @@
 
 RSpec.configure do |c|
   c.treat_symbols_as_metadata_keys_with_true_values = true
+
+  c.before :each do
+    # Ensure that we don't accidentally cache facts and environment
+    # between test cases.
+    Facter::Util::Loader.any_instance.stubs(:load_all)
+    Facter.clear
+    Facter.clear_messages
+
+    # Store any environment variables away to be restored later
+    @old_env = {}
+    ENV.each_key {|k| @old_env[k] = ENV[k]}
+
+    if ENV['STRICT_VARIABLES'] == 'yes'
+      Puppet.settings[:strict_variables]=true
+    end
+  end
 end
 
 shared_examples :compile, :compile => true do

From 815f5cd745f5f89e5fe9d3c5db623db956f4b8f4 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 6 Jun 2014 10:08:35 -0400
Subject: [PATCH 0263/2267] Convert specs to RSpec 3.0.0 syntax with Transpec

This conversion is done by Transpec 2.2.1 with the following command:
    transpec spec/classes

* 384 conversions
    from: it { should ... }
      to: it { is_expected.to ... }

* 47 conversions
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

* 3 conversions
    from: obj.should
      to: expect(obj).to

* 2 conversions
    from: == expected
      to: eq(expected)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
---
 spec/classes/apache_spec.rb          | 182 +++++++++++++--------------
 spec/classes/dev_spec.rb             |  14 +--
 spec/classes/mod/auth_kerb_spec.rb   |  18 +--
 spec/classes/mod/authnz_ldap_spec.rb |  24 ++--
 spec/classes/mod/dav_svn_spec.rb     |  18 +--
 spec/classes/mod/deflate_spec.rb     |  12 +-
 spec/classes/mod/dev_spec.rb         |   2 +-
 spec/classes/mod/dir_spec.rb         |  66 +++++-----
 spec/classes/mod/event_spec.rb       |  34 ++---
 spec/classes/mod/fastcgi_spec.rb     |  16 +--
 spec/classes/mod/fcgid_spec.rb       |  22 ++--
 spec/classes/mod/info_spec.rb        |  14 +--
 spec/classes/mod/itk_spec.rb         |  24 ++--
 spec/classes/mod/mime_magic_spec.rb  |  16 +--
 spec/classes/mod/mime_spec.rb        |   6 +-
 spec/classes/mod/pagespeed_spec.rb   |  16 +--
 spec/classes/mod/passenger_spec.rb   |  88 ++++++-------
 spec/classes/mod/perl_spec.rb        |  18 +--
 spec/classes/mod/peruser_spec.rb     |   6 +-
 spec/classes/mod/php_spec.rb         |  42 +++----
 spec/classes/mod/prefork_spec.rb     |  36 +++---
 spec/classes/mod/proxy_html_spec.rb  |  18 +--
 spec/classes/mod/python_spec.rb      |  18 +--
 spec/classes/mod/rpaf_spec.rb        |  32 ++---
 spec/classes/mod/speling_spec.rb     |   4 +-
 spec/classes/mod/ssl_spec.rb         |  16 +--
 spec/classes/mod/status_spec.rb      |  20 +--
 spec/classes/mod/suphp_spec.rb       |   8 +-
 spec/classes/mod/worker_spec.rb      |  36 +++---
 spec/classes/mod/wsgi_spec.rb        |  22 ++--
 spec/classes/params_spec.rb          |   4 +-
 spec/classes/service_spec.rb         |  18 +--
 32 files changed, 435 insertions(+), 435 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index f32fec8088..55d71e0397 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -14,16 +14,16 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd").with(
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_package("httpd").with(
       'notify' => 'Class[Apache::Service]',
       'ensure' => 'installed'
       )
     }
-    it { should contain_user("www-data") }
-    it { should contain_group("www-data") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/etc/apache2/sites-enabled").with(
+    it { is_expected.to contain_user("www-data") }
+    it { is_expected.to contain_group("www-data") }
+    it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/etc/apache2/sites-enabled").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
       'purge'   => 'true',
@@ -31,7 +31,7 @@
       'require' => 'Package[httpd]'
       )
     }
-    it { should contain_file("/etc/apache2/mods-enabled").with(
+    it { is_expected.to contain_file("/etc/apache2/mods-enabled").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
       'purge'   => 'true',
@@ -39,7 +39,7 @@
       'require' => 'Package[httpd]'
       )
     }
-    it { should contain_file("/etc/apache2/mods-available").with(
+    it { is_expected.to contain_file("/etc/apache2/mods-available").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
       'purge'   => 'false',
@@ -47,7 +47,7 @@
       'require' => 'Package[httpd]'
       )
     }
-    it { should contain_concat("/etc/apache2/ports.conf").with(
+    it { is_expected.to contain_concat("/etc/apache2/ports.conf").with(
       'owner'   => 'root',
       'group'   => 'root',
       'mode'    => '0644',
@@ -65,17 +65,17 @@
       'dav',
       'env'
     ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
+      it { is_expected.to contain_file("#{modname}.load").with(
         'path'   => "/etc/apache2/mods-available/#{modname}.load",
         'ensure' => 'file'
       ) }
-      it { should contain_file("#{modname}.load symlink").with(
+      it { is_expected.to contain_file("#{modname}.load symlink").with(
         'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
         'ensure' => 'link',
         'target' => "/etc/apache2/mods-available/#{modname}.load"
       ) }
-      it { should_not contain_file("#{modname}.conf") }
-      it { should_not contain_file("#{modname}.conf symlink") }
+      it { is_expected.not_to contain_file("#{modname}.conf") }
+      it { is_expected.not_to contain_file("#{modname}.conf symlink") }
     end
 
     context "with Apache version < 2.4" do
@@ -83,7 +83,7 @@
         { :apache_version => '2.2' }
       end
 
-      it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
+      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
     end
 
     context "with Apache version >= 2.4" do
@@ -91,7 +91,7 @@
         { :apache_version => '2.4' }
       end
 
-      it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
+      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
     end
 
     # Assert that both load files and conf files are placed and symlinked for these mods
@@ -105,20 +105,20 @@
       'negotiation',
       'setenvif',
     ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
+      it { is_expected.to contain_file("#{modname}.load").with(
         'path'   => "/etc/apache2/mods-available/#{modname}.load",
         'ensure' => 'file'
       ) }
-      it { should contain_file("#{modname}.load symlink").with(
+      it { is_expected.to contain_file("#{modname}.load symlink").with(
         'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
         'ensure' => 'link',
         'target' => "/etc/apache2/mods-available/#{modname}.load"
       ) }
-      it { should contain_file("#{modname}.conf").with(
+      it { is_expected.to contain_file("#{modname}.conf").with(
         'path'   => "/etc/apache2/mods-available/#{modname}.conf",
         'ensure' => 'file'
       ) }
-      it { should contain_file("#{modname}.conf symlink").with(
+      it { is_expected.to contain_file("#{modname}.conf symlink").with(
         'path'   => "/etc/apache2/mods-enabled/#{modname}.conf",
         'ensure' => 'link',
         'target' => "/etc/apache2/mods-available/#{modname}.conf"
@@ -131,8 +131,8 @@
           { :manage_user => false }
         end
 
-        it { should_not contain_user('www-data') }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^User www-data\n} }
+        it { is_expected.not_to contain_user('www-data') }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^User www-data\n} }
       end
     end
     describe "Don't create group resource" do
@@ -141,8 +141,8 @@
           { :manage_group => false }
         end
 
-        it { should_not contain_group('www-data') }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Group www-data\n} }
+        it { is_expected.not_to contain_group('www-data') }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^Group www-data\n} }
       end
     end
 
@@ -155,8 +155,8 @@
           } }
         end
 
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined\n} }
       end
     end
 
@@ -174,7 +174,7 @@
             :operatingsystemrelease => '13.10'
           })
         end
-        it { should contain_class('apache').with_apache_version('2.4') }
+        it { is_expected.to contain_class('apache').with_apache_version('2.4') }
       end
       context "12.04" do
         let :facts do
@@ -183,7 +183,7 @@
             :operatingsystemrelease => '12.04'
           })
         end
-        it { should contain_class('apache').with_apache_version('2.2') }
+        it { is_expected.to contain_class('apache').with_apache_version('2.2') }
       end
       context "13.04" do
         let :facts do
@@ -192,7 +192,7 @@
             :operatingsystemrelease => '13.04'
           })
         end
-        it { should contain_class('apache').with_apache_version('2.2') }
+        it { is_expected.to contain_class('apache').with_apache_version('2.2') }
       end
     end
   end
@@ -208,16 +208,16 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd").with(
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_package("httpd").with(
       'notify' => 'Class[Apache::Service]',
       'ensure' => 'installed'
       )
     }
-    it { should contain_user("apache") }
-    it { should contain_group("apache") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/etc/httpd/conf.d").with(
+    it { is_expected.to contain_user("apache") }
+    it { is_expected.to contain_group("apache") }
+    it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/etc/httpd/conf.d").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
       'purge'   => 'true',
@@ -225,7 +225,7 @@
       'require' => 'Package[httpd]'
       )
     }
-    it { should contain_concat("/etc/httpd/conf/ports.conf").with(
+    it { is_expected.to contain_concat("/etc/httpd/conf/ports.conf").with(
       'owner'   => 'root',
       'group'   => 'root',
       'mode'    => '0644',
@@ -242,7 +242,7 @@
       end
 
       ['mod.d','site.d','conf.d'].each do |dir|
-        it { should contain_file("/etc/httpd/#{dir}").with(
+        it { is_expected.to contain_file("/etc/httpd/#{dir}").with(
           'ensure'  => 'directory',
           'recurse' => 'true',
           'purge'   => 'true',
@@ -262,10 +262,10 @@
         'dav',
         'env',
       ].each do |modname|
-        it { should contain_file("#{modname}.load").with_path(
+        it { is_expected.to contain_file("#{modname}.load").with_path(
           "/etc/httpd/mod.d/#{modname}.load"
         ) }
-        it { should_not contain_file("#{modname}.conf").with_path(
+        it { is_expected.not_to contain_file("#{modname}.conf").with_path(
           "/etc/httpd/mod.d/#{modname}.conf"
         ) }
       end
@@ -281,10 +281,10 @@
         'negotiation',
         'setenvif',
       ].each do |modname|
-        it { should contain_file("#{modname}.load").with_path(
+        it { is_expected.to contain_file("#{modname}.load").with_path(
           "/etc/httpd/mod.d/#{modname}.load"
         ) }
-        it { should contain_file("#{modname}.conf").with_path(
+        it { is_expected.to contain_file("#{modname}.conf").with_path(
           "/etc/httpd/mod.d/#{modname}.conf"
         ) }
       end
@@ -294,7 +294,7 @@
           { :apache_version => '2.2' }
         end
 
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
       end
 
       context "with Apache version >= 2.4" do
@@ -302,12 +302,12 @@
           { :apache_version => '2.4' }
         end
 
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
       end
 
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
+      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
+      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
+      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end
 
     describe "Alternate conf.d directory" do
@@ -315,7 +315,7 @@
         { :confd_dir => '/etc/httpd/special_conf.d' }
       end
 
-      it { should contain_file("/etc/httpd/special_conf.d").with(
+      it { is_expected.to contain_file("/etc/httpd/special_conf.d").with(
         'ensure'  => 'directory',
         'recurse' => 'true',
         'purge'   => 'true',
@@ -330,32 +330,32 @@
           { :mpm_module => false }
         end
         it 'should not declare mpm modules' do
-          should_not contain_class('apache::mod::event')
-          should_not contain_class('apache::mod::itk')
-          should_not contain_class('apache::mod::peruser')
-          should_not contain_class('apache::mod::prefork')
-          should_not contain_class('apache::mod::worker')
+          is_expected.not_to contain_class('apache::mod::event')
+          is_expected.not_to contain_class('apache::mod::itk')
+          is_expected.not_to contain_class('apache::mod::peruser')
+          is_expected.not_to contain_class('apache::mod::prefork')
+          is_expected.not_to contain_class('apache::mod::worker')
         end
       end
       context "when declaring mpm_module => prefork" do
         let :params do
           { :mpm_module => 'prefork' }
         end
-        it { should contain_class('apache::mod::prefork') }
-        it { should_not contain_class('apache::mod::event') }
-        it { should_not contain_class('apache::mod::itk') }
-        it { should_not contain_class('apache::mod::peruser') }
-        it { should_not contain_class('apache::mod::worker') }
+        it { is_expected.to contain_class('apache::mod::prefork') }
+        it { is_expected.not_to contain_class('apache::mod::event') }
+        it { is_expected.not_to contain_class('apache::mod::itk') }
+        it { is_expected.not_to contain_class('apache::mod::peruser') }
+        it { is_expected.not_to contain_class('apache::mod::worker') }
       end
       context "when declaring mpm_module => worker" do
         let :params do
           { :mpm_module => 'worker' }
         end
-        it { should contain_class('apache::mod::worker') }
-        it { should_not contain_class('apache::mod::event') }
-        it { should_not contain_class('apache::mod::itk') }
-        it { should_not contain_class('apache::mod::peruser') }
-        it { should_not contain_class('apache::mod::prefork') }
+        it { is_expected.to contain_class('apache::mod::worker') }
+        it { is_expected.not_to contain_class('apache::mod::event') }
+        it { is_expected.not_to contain_class('apache::mod::itk') }
+        it { is_expected.not_to contain_class('apache::mod::peruser') }
+        it { is_expected.not_to contain_class('apache::mod::prefork') }
       end
       context "when declaring mpm_module => breakme" do
         let :params do
@@ -370,13 +370,13 @@
         let :params do
           { :conf_template => 'apache/httpd.conf.erb' }
         end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^# Security\n} }
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^# Security\n} }
       end
       context "with non-default" do
         let :params do
           { :conf_template => 'site_apache/fake.conf.erb' }
         end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Fake template for rspec.$} }
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Fake template for rspec.$} }
       end
     end
 
@@ -386,8 +386,8 @@
           { :default_mods => false }
         end
 
-        it { should contain_apache__mod('authz_host') }
-        it { should_not contain_apache__mod('env') }
+        it { is_expected.to contain_apache__mod('authz_host') }
+        it { is_expected.not_to contain_apache__mod('env') }
       end
       context "custom" do
         let :params do
@@ -401,10 +401,10 @@
           ]}
         end
 
-        it { should contain_apache__mod('authz_host') }
-        it { should contain_apache__mod('env') }
-        it { should contain_class('apache::mod::info') }
-        it { should contain_class('apache::mod::mime') }
+        it { is_expected.to contain_apache__mod('authz_host') }
+        it { is_expected.to contain_apache__mod('env') }
+        it { is_expected.to contain_class('apache::mod::info') }
+        it { is_expected.to contain_class('apache::mod::mime') }
       end
     end
     describe "Don't create user resource" do
@@ -413,8 +413,8 @@
           { :manage_user => false }
         end
 
-        it { should_not contain_user('apache') }
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^User apache\n} }
+        it { is_expected.not_to contain_user('apache') }
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^User apache\n} }
       end
     end
     describe "Don't create group resource" do
@@ -423,8 +423,8 @@
           { :manage_group => false }
         end
 
-        it { should_not contain_group('apache') }
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Group apache\n} }
+        it { is_expected.not_to contain_group('apache') }
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Group apache\n} }
 
       end
     end
@@ -443,13 +443,13 @@
         let :params do
           { :sendfile => 'On' }
         end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile On\n} }
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile On\n} }
       end
       context "Off" do
         let :params do
           { :sendfile => 'Off' }
         end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile Off\n} }
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile Off\n} }
       end
     end
   end
@@ -465,26 +465,26 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::package").with({'ensure' => 'present'}) }
-    it { should contain_user("www") }
-    it { should contain_group("www") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/usr/local/etc/apache22/Vhosts").with(
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_class("apache::package").with({'ensure' => 'present'}) }
+    it { is_expected.to contain_user("www") }
+    it { is_expected.to contain_group("www") }
+    it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/usr/local/etc/apache22/Vhosts").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
       'purge'   => 'true',
       'notify'  => 'Class[Apache::Service]',
       'require' => 'Package[httpd]'
     ) }
-    it { should contain_file("/usr/local/etc/apache22/Modules").with(
+    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
       'purge'   => 'true',
       'notify'  => 'Class[Apache::Service]',
       'require' => 'Package[httpd]'
     ) }
-    it { should contain_concat("/usr/local/etc/apache22/ports.conf").with(
+    it { is_expected.to contain_concat("/usr/local/etc/apache22/ports.conf").with(
       'owner'   => 'root',
       'group'   => 'wheel',
       'mode'    => '0644',
@@ -501,11 +501,11 @@
       'dav',
       'env'
     ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
+      it { is_expected.to contain_file("#{modname}.load").with(
         'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
         'ensure' => 'file'
       ) }
-      it { should_not contain_file("#{modname}.conf") }
+      it { is_expected.not_to contain_file("#{modname}.conf") }
     end
 
     # Assert that both load files and conf files are placed for these mods
@@ -519,11 +519,11 @@
       'negotiation',
       'setenvif',
     ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
+      it { is_expected.to contain_file("#{modname}.load").with(
         'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
         'ensure' => 'file'
       ) }
-      it { should contain_file("#{modname}.conf").with(
+      it { is_expected.to contain_file("#{modname}.conf").with(
         'path'   => "/usr/local/etc/apache22/Modules/#{modname}.conf",
         'ensure' => 'file'
       ) }
@@ -542,22 +542,22 @@
       }
     end
     context 'default vhost defaults' do
-      it { should contain_apache__vhost('default').with_ensure('present') }
-      it { should contain_apache__vhost('default-ssl').with_ensure('absent') }
+      it { is_expected.to contain_apache__vhost('default').with_ensure('present') }
+      it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('absent') }
     end
     context 'without default non-ssl vhost' do
       let :params do {
         :default_vhost  => false
       }
       end
-      it { should contain_apache__vhost('default').with_ensure('absent') }
+      it { is_expected.to contain_apache__vhost('default').with_ensure('absent') }
     end
     context 'with default ssl vhost' do
       let :params do {
           :default_ssl_vhost  => true
         }
       end
-      it { should contain_apache__vhost('default-ssl').with_ensure('present') }
+      it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('present') }
     end
   end
 end
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index eceadca4a7..df342d40e8 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -10,10 +10,10 @@
         :operatingsystemrelease => '6',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_package("libaprutil1-dev") }
-    it { should contain_package("libapr1-dev") }
-    it { should contain_package("apache2-prefork-dev") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_package("libaprutil1-dev") }
+    it { is_expected.to contain_package("libapr1-dev") }
+    it { is_expected.to contain_package("apache2-prefork-dev") }
   end
   context "on a RedHat OS" do
     let :facts do
@@ -23,8 +23,8 @@
         :operatingsystemrelease => '6',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd-devel") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_package("httpd-devel") }
   end
   context "on a FreeBSD OS" do
     let :pre_condition do
@@ -37,6 +37,6 @@
         :operatingsystemrelease => '9',
       }
     end
-    it { should contain_class("apache::params") }
+    it { is_expected.to contain_class("apache::params") }
   end
 end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 6e2c16b7e9..1706bfb8d3 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -17,9 +17,9 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("libapache2-mod-auth-kerb") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("auth_kerb") }
+    it { is_expected.to contain_package("libapache2-mod-auth-kerb") }
   end
   context "on a RedHat OS", :compile do
     let :facts do
@@ -33,9 +33,9 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("mod_auth_kerb") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("auth_kerb") }
+    it { is_expected.to contain_package("mod_auth_kerb") }
   end
   context "on a FreeBSD OS", :compile do
     let :facts do
@@ -49,8 +49,8 @@
         :concat_basedir         => '/dne',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("www/mod_auth_kerb2") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("auth_kerb") }
+    it { is_expected.to contain_package("www/mod_auth_kerb2") }
   end
 end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index d9ca5398b1..a0a913a6e2 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -18,23 +18,23 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::mod::ldap") }
-    it { should contain_apache__mod('authnz_ldap') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_class("apache::mod::ldap") }
+    it { is_expected.to contain_apache__mod('authnz_ldap') }
 
     context 'default verifyServerCert' do
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
+      it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
     end
 
     context 'verifyServerCert = false' do
       let(:params) { { :verifyServerCert => false } }
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
+      it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
     end
 
     context 'verifyServerCert = wrong' do
       let(:params) { { :verifyServerCert => 'wrong' } }
       it 'should raise an error' do
-        expect { should raise_error Puppet::Error }
+        expect { is_expected.to raise_error Puppet::Error }
       end
     end
   end #Debian
@@ -51,23 +51,23 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::mod::ldap") }
-    it { should contain_apache__mod('authnz_ldap') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_class("apache::mod::ldap") }
+    it { is_expected.to contain_apache__mod('authnz_ldap') }
 
     context 'default verifyServerCert' do
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
+      it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
     end
 
     context 'verifyServerCert = false' do
       let(:params) { { :verifyServerCert => false } }
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
+      it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
     end
 
     context 'verifyServerCert = wrong' do
       let(:params) { { :verifyServerCert => 'wrong' } }
       it 'should raise an error' do
-        expect { should raise_error Puppet::Error }
+        expect { is_expected.to raise_error Puppet::Error }
       end
     end
   end # Redhat
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 4898cdece1..859174af77 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -17,9 +17,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("libapache2-svn") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('dav_svn') }
+    it { is_expected.to contain_package("libapache2-svn") }
   end
   context "on a RedHat OS" do
     let :facts do
@@ -33,9 +33,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("mod_dav_svn") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('dav_svn') }
+    it { is_expected.to contain_package("mod_dav_svn") }
   end
   context "on a FreeBSD OS" do
     let :facts do
@@ -49,8 +49,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("devel/subversion") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('dav_svn') }
+    it { is_expected.to contain_package("devel/subversion") }
   end
 end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index f8eb881013..227c97a829 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -2,10 +2,10 @@
 
 # This function is called inside the OS specific contexts
 def general_deflate_specs
-  it { should contain_apache__mod("deflate") }
+  it { is_expected.to contain_apache__mod("deflate") }
 
   it do
-    should contain_file("deflate.conf").with_content(
+    is_expected.to contain_file("deflate.conf").with_content(
       "AddOutputFilterByType DEFLATE text/html text/plain text/xml\n"\
       "AddOutputFilterByType DEFLATE text/css\n"\
       "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript\n"\
@@ -39,11 +39,11 @@ def general_deflate_specs
     # Load the more generic tests for this context
     general_deflate_specs()
 
-    it { should contain_file("deflate.conf").with({
+    it { is_expected.to contain_file("deflate.conf").with({
       :ensure => 'file',
       :path   => '/etc/apache2/mods-available/deflate.conf',
     } ) }
-    it { should contain_file("deflate.conf symlink").with({
+    it { is_expected.to contain_file("deflate.conf symlink").with({
       :ensure => 'link',
       :path   => '/etc/apache2/mods-enabled/deflate.conf',
     } ) }
@@ -64,7 +64,7 @@ def general_deflate_specs
     # Load the more generic tests for this context
     general_deflate_specs()
 
-    it { should contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") }
+    it { is_expected.to contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") }
   end
 
   context "On a FreeBSD OS with default params" do
@@ -82,7 +82,7 @@ def general_deflate_specs
     # Load the more generic tests for this context
     general_deflate_specs()
 
-    it { should contain_file("deflate.conf").with({
+    it { is_expected.to contain_file("deflate.conf").with({
       :ensure => 'file',
       :path   => '/usr/local/etc/apache22/Modules/deflate.conf',
     } ) }
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 0de62afcb5..84d80e344a 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -20,7 +20,7 @@
           :operatingsystemrelease => operatingsystemrelease,
         }
       end
-      it { should contain_class('apache::dev') }
+      it { is_expected.to contain_class('apache::dev') }
     end
   end
 end
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 8bcdc0b6be..1efed2fe79 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -20,22 +20,22 @@
       }
     end
     context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('dir') }
+      it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
     end
     context "passing indexes => ['example.txt','fearsome.aspx']" do
       let :params do
         {:indexes => ['example.txt','fearsome.aspx']}
       end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
     end
   end
   context "on a RedHat OS" do
@@ -51,22 +51,22 @@
       }
     end
     context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('dir') }
+      it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
     end
     context "passing indexes => ['example.txt','fearsome.aspx']" do
       let :params do
         {:indexes => ['example.txt','fearsome.aspx']}
       end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
     end
   end
   context "on a FreeBSD OS" do
@@ -82,22 +82,22 @@
       }
     end
     context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('dir') }
+      it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
     end
     context "passing indexes => ['example.txt','fearsome.aspx']" do
       let :params do
         {:indexes => ['example.txt','fearsome.aspx']}
       end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
     end
   end
 end
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 850bd5c55b..3061ca9b1f 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -16,9 +16,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('event') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/event.conf").with_ensure('file') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('event') }
+    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/event.conf").with_ensure('file') }
   end
   context "on a Debian OS" do
     let :facts do
@@ -34,10 +34,10 @@
       }
     end
 
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('event') }
-    it { should contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('event') }
+    it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') }
+    it { is_expected.to contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') }
 
     context "with Apache version < 2.4" do
       let :params do
@@ -46,10 +46,10 @@
         }
       end
 
-      it { should_not contain_file("/etc/apache2/mods-available/event.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/event.load") }
+      it { is_expected.not_to contain_file("/etc/apache2/mods-available/event.load") }
+      it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/event.load") }
 
-      it { should contain_package("apache2-mpm-event") }
+      it { is_expected.to contain_package("apache2-mpm-event") }
     end
 
     context "with Apache version >= 2.4" do
@@ -59,12 +59,12 @@
         }
       end
 
-      it { should contain_file("/etc/apache2/mods-available/event.load").with({
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.load").with({
         'ensure'  => 'file',
         'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n"
         })
       }
-      it { should contain_file("/etc/apache2/mods-enabled/event.load").with_ensure('link') }
+      it { is_expected.to contain_file("/etc/apache2/mods-enabled/event.load").with_ensure('link') }
     end
   end
   context "on a RedHat OS" do
@@ -87,13 +87,13 @@
         }
       end
 
-      it { should contain_class("apache::params") }
-      it { should_not contain_apache__mod('worker') }
-      it { should_not contain_apache__mod('prefork') }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.not_to contain_apache__mod('worker') }
+      it { is_expected.not_to contain_apache__mod('prefork') }
 
-      it { should contain_file("/etc/httpd/conf.d/event.conf").with_ensure('file') }
+      it { is_expected.to contain_file("/etc/httpd/conf.d/event.conf").with_ensure('file') }
 
-      it { should contain_file("/etc/httpd/conf.d/event.load").with({
+      it { is_expected.to contain_file("/etc/httpd/conf.d/event.load").with({
         'ensure'  => 'file',
         'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n",
         })
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 98ad2e8706..126c5cc3ef 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -17,10 +17,10 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fastcgi') }
-    it { should contain_package("libapache2-mod-fastcgi") }
-    it { should contain_file('fastcgi.conf') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('fastcgi') }
+    it { is_expected.to contain_package("libapache2-mod-fastcgi") }
+    it { is_expected.to contain_file('fastcgi.conf') }
   end
 
   context "on a RedHat OS" do
@@ -35,9 +35,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fastcgi') }
-    it { should contain_package("mod_fastcgi") }
-    it { should_not contain_file('fastcgi.conf') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('fastcgi') }
+    it { is_expected.to contain_package("mod_fastcgi") }
+    it { is_expected.not_to contain_file('fastcgi.conf') }
   end
 end
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 16719415d5..ab47a5a8e3 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -18,9 +18,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fcgid') }
-    it { should contain_package("libapache2-mod-fcgid") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('fcgid') }
+    it { is_expected.to contain_package("libapache2-mod-fcgid") }
   end
 
   context "on a RedHat OS" do
@@ -37,9 +37,9 @@
     end
 
     describe 'without parameters' do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('fcgid') }
-      it { should contain_package("mod_fcgid") }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('fcgid') }
+      it { is_expected.to contain_package("mod_fcgid") }
     end
 
     describe 'with parameters' do
@@ -54,14 +54,14 @@
 
       it 'should contain the correct config' do
         content = subject.resource('file', 'fcgid.conf').send(:parameters)[:content]
-        content.split("\n").reject { |c| c =~ /(^#|^$)/ }.should == [
+        expect(content.split("\n").reject { |c| c =~ /(^#|^$)/ }).to eq([
           '<IfModule mod_fcgid.c>',
           '  AddHandler fcgid-script .fcgi',
           '  FcgidIPCDir /var/run/fcgidsock',
           '  FcgidMinProcessesPerClass 0',
           '  SharememPath /var/run/fcgid_shm',
           '</IfModule>',
-        ]
+        ])
       end
     end
   end
@@ -79,8 +79,8 @@
       }
     end
 
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fcgid') }
-    it { should contain_package("www/mod_fcgid") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('fcgid') }
+    it { is_expected.to contain_package("www/mod_fcgid") }
   end
 end
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index ed078c519f..3415dec67e 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -2,10 +2,10 @@
 
 # This function is called inside the OS specific contexts
 def general_info_specs
-  it { should contain_apache__mod("info") }
+  it { is_expected.to contain_apache__mod("info") }
 
   it do
-    should contain_file("info.conf").with_content(
+    is_expected.to contain_file("info.conf").with_content(
       "<Location /server-info>\n"\
       "    SetHandler server-info\n"\
       "    Order deny,allow\n"\
@@ -38,11 +38,11 @@ def general_info_specs
     # Load the more generic tests for this context
     general_info_specs()
 
-    it { should contain_file("info.conf").with({
+    it { is_expected.to contain_file("info.conf").with({
       :ensure => 'file',
       :path   => '/etc/apache2/mods-available/info.conf',
     } ) }
-    it { should contain_file("info.conf symlink").with({
+    it { is_expected.to contain_file("info.conf symlink").with({
       :ensure => 'link',
       :path   => '/etc/apache2/mods-enabled/info.conf',
     } ) }
@@ -64,7 +64,7 @@ def general_info_specs
     # Load the more generic tests for this context
     general_info_specs()
 
-    it { should contain_file("info.conf").with_path("/etc/httpd/conf.d/info.conf") }
+    it { is_expected.to contain_file("info.conf").with_path("/etc/httpd/conf.d/info.conf") }
   end
 
   context "On a FreeBSD OS with default params" do
@@ -83,7 +83,7 @@ def general_info_specs
     # Load the more generic tests for this context
     general_info_specs()
 
-    it { should contain_file("info.conf").with({
+    it { is_expected.to contain_file("info.conf").with({
       :ensure => 'file',
       :path   => '/usr/local/etc/apache22/Modules/info.conf',
     } ) }
@@ -106,7 +106,7 @@ def general_info_specs
       { :allow_from => ['10.10.10.10','11.11.11.11'] }
     end
     it do
-      should contain_file("info.conf").with_content(
+      is_expected.to contain_file("info.conf").with_content(
         "<Location /server-info>\n"\
         "    SetHandler server-info\n"\
         "    Order deny,allow\n"\
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index d9fe2e3d12..b5d50a18af 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -17,10 +17,10 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('itk') }
-    it { should contain_file("/etc/apache2/mods-available/itk.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('itk') }
+    it { is_expected.to contain_file("/etc/apache2/mods-available/itk.conf").with_ensure('file') }
+    it { is_expected.to contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') }
 
     context "with Apache version < 2.4" do
       let :params do
@@ -29,10 +29,10 @@
         }
       end
 
-      it { should_not contain_file("/etc/apache2/mods-available/itk.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/itk.load") }
+      it { is_expected.not_to contain_file("/etc/apache2/mods-available/itk.load") }
+      it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/itk.load") }
 
-      it { should contain_package("apache2-mpm-itk") }
+      it { is_expected.to contain_package("apache2-mpm-itk") }
     end
 
     context "with Apache version >= 2.4" do
@@ -42,12 +42,12 @@
         }
       end
 
-      it { should contain_file("/etc/apache2/mods-available/itk.load").with({
+      it { is_expected.to contain_file("/etc/apache2/mods-available/itk.load").with({
         'ensure'  => 'file',
         'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n"
         })
       }
-      it { should contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') }
+      it { is_expected.to contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') }
     end
   end
   context "on a FreeBSD OS" do
@@ -62,8 +62,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('itk') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('itk') }
+    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') }
   end
 end
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index e9984ecbaf..5e78230e28 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -2,7 +2,7 @@
 
 # This function is called inside the OS specific contexts
 def general_mime_magic_specs
-  it { should contain_apache__mod("mime_magic") }
+  it { is_expected.to contain_apache__mod("mime_magic") }
 end
 
 describe 'apache::mod::mime_magic', :type => :class do
@@ -27,16 +27,16 @@ def general_mime_magic_specs
     general_mime_magic_specs()
 
     it do
-      should contain_file("mime_magic.conf").with_content(
+      is_expected.to contain_file("mime_magic.conf").with_content(
         "MIMEMagicFile \"/etc/apache2/magic\"\n"
       )
     end
 
-    it { should contain_file("mime_magic.conf").with({
+    it { is_expected.to contain_file("mime_magic.conf").with({
       :ensure => 'file',
       :path   => '/etc/apache2/mods-available/mime_magic.conf',
     } ) }
-    it { should contain_file("mime_magic.conf symlink").with({
+    it { is_expected.to contain_file("mime_magic.conf symlink").with({
       :ensure => 'link',
       :path   => '/etc/apache2/mods-enabled/mime_magic.conf',
     } ) }
@@ -47,7 +47,7 @@ def general_mime_magic_specs
       end
 
       it do
-        should contain_file("mime_magic.conf").with_content(
+        is_expected.to contain_file("mime_magic.conf").with_content(
           "MIMEMagicFile \"/tmp/Debian_magic\"\n"
         )
       end
@@ -71,12 +71,12 @@ def general_mime_magic_specs
     general_mime_magic_specs()
 
     it do
-      should contain_file("mime_magic.conf").with_content(
+      is_expected.to contain_file("mime_magic.conf").with_content(
         "MIMEMagicFile \"/etc/httpd/conf/magic\"\n"
       )
     end
 
-    it { should contain_file("mime_magic.conf").with_path("/etc/httpd/conf.d/mime_magic.conf") }
+    it { is_expected.to contain_file("mime_magic.conf").with_path("/etc/httpd/conf.d/mime_magic.conf") }
 
   end
 
@@ -99,7 +99,7 @@ def general_mime_magic_specs
     end
 
     it do
-      should contain_file("mime_magic.conf").with_content(
+      is_expected.to contain_file("mime_magic.conf").with_content(
         "MIMEMagicFile \"/tmp/magic\"\n"
       )
     end
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 2b6154fb81..32edbc4b02 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -2,7 +2,7 @@
 
 # This function is called inside the OS specific conte, :compilexts
 def general_mime_specs
-  it { should contain_apache__mod("mime") }
+  it { is_expected.to contain_apache__mod("mime") }
 end
 
 describe 'apache::mod::mime', :type => :class do
@@ -26,7 +26,7 @@ def general_mime_specs
 
     general_mime_specs()
 
-    it { should contain_file("mime.conf").with_path('/etc/apache2/mods-available/mime.conf') }
+    it { is_expected.to contain_file("mime.conf").with_path('/etc/apache2/mods-available/mime.conf') }
 
   end
 
@@ -45,7 +45,7 @@ def general_mime_specs
 
     general_mime_specs()
 
-    it { should contain_file("mime.conf").with_path("/etc/httpd/conf.d/mime.conf") }
+    it { is_expected.to contain_file("mime.conf").with_path("/etc/httpd/conf.d/mime.conf") }
 
   end
 
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index 9439f719e6..c4abd3e100 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -17,10 +17,10 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('pagespeed') }
-    it { should contain_package("mod-pagespeed-stable") }
-    it { should contain_file('pagespeed.conf') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('pagespeed') }
+    it { is_expected.to contain_package("mod-pagespeed-stable") }
+    it { is_expected.to contain_file('pagespeed.conf') }
   end
 
   context "on a RedHat OS" do
@@ -35,9 +35,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('pagespeed') }
-    it { should contain_package("mod-pagespeed-stable") }
-    it { should contain_file('pagespeed.conf') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('pagespeed') }
+    it { is_expected.to contain_package("mod-pagespeed-stable") }
+    it { is_expected.to contain_file('pagespeed.conf') }
   end
 end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 3bf7d29952..7fc1e3a63f 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -17,105 +17,105 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("libapache2-mod-passenger") }
-    it { should contain_file('passenger.load').with({
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_package("libapache2-mod-passenger") }
+    it { is_expected.to contain_file('passenger.load').with({
       'path' => '/etc/apache2/mods-available/passenger.load',
     }) }
-    it { should contain_file('passenger.conf').with({
+    it { is_expected.to contain_file('passenger.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
-    it { should contain_file('passenger_package.conf').with_ensure('absent') }
+    it { is_expected.to contain_file('passenger_package.conf').with_ensure('absent') }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }
       end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
     end
     describe "with passenger_ruby => /usr/lib/example/ruby" do
       let :params do
         { :passenger_ruby => '/usr/lib/example/ruby' }
       end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
     end
     describe "with passenger_default_ruby => /usr/lib/example/ruby1.9.3" do
       let :params do
         { :passenger_ruby => '/usr/lib/example/ruby1.9.3' }
       end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
     end
     describe "with passenger_high_performance => on" do
       let :params do
         { :passenger_high_performance => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerHighPerformance on$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerHighPerformance on$/) }
     end
     describe "with passenger_pool_idle_time => 1200" do
       let :params do
         { :passenger_pool_idle_time => 1200 }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerPoolIdleTime 1200$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerPoolIdleTime 1200$/) }
     end
     describe "with passenger_max_requests => 20" do
       let :params do
         { :passenger_max_requests => 20 }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerMaxRequests 20$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxRequests 20$/) }
     end
     describe "with passenger_stat_throttle_rate => 10" do
       let :params do
         { :passenger_stat_throttle_rate => 10 }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerStatThrottleRate 10$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerStatThrottleRate 10$/) }
     end
     describe "with passenger_max_pool_size => 16" do
       let :params do
         { :passenger_max_pool_size => 16 }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerMaxPoolSize 16$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxPoolSize 16$/) }
     end
     describe "with rack_autodetect => on" do
       let :params do
         { :rack_autodetect => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  RackAutoDetect on$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  RackAutoDetect on$/) }
     end
     describe "with rails_autodetect => on" do
       let :params do
         { :rails_autodetect => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  RailsAutoDetect on$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  RailsAutoDetect on$/) }
     end
     describe "with passenger_use_global_queue => on" do
       let :params do
         { :passenger_use_global_queue => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue on$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue on$/) }
     end
     describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
       let :params do
         { :mod_path => '/usr/lib/foo/mod_foo.so' }
       end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
+      it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
     end
     describe "with mod_lib_path => '/usr/lib/foo'" do
       let :params do
         { :mod_lib_path => '/usr/lib/foo' }
       end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
+      it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
     end
     describe "with mod_lib => 'mod_foo.so'" do
       let :params do
         { :mod_lib => 'mod_foo.so' }
       end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
+      it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
     end
     describe "with mod_id => 'mod_foo'" do
       let :params do
         { :mod_id => 'mod_foo' }
       end
-      it { should contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
+      it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
     end
 
     context "with Ubuntu 12.04 defaults" do
@@ -131,9 +131,9 @@
         }
       end
 
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
+      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
     end
 
     context "with Ubuntu 14.04 defaults" do
@@ -149,9 +149,9 @@
         }
       end
 
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
+      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
     end
 
     context "with Debian 7 defaults" do
@@ -167,9 +167,9 @@
         }
       end
 
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
+      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
     end
   end
 
@@ -185,30 +185,30 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("mod_passenger") }
-    it { should contain_file('passenger_package.conf').with({
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_package("mod_passenger") }
+    it { is_expected.to contain_file('passenger_package.conf').with({
       'path' => '/etc/httpd/conf.d/passenger.conf',
     }) }
-    it { should contain_file('passenger_package.conf').without_content }
-    it { should contain_file('passenger_package.conf').without_source }
-    it { should contain_file('passenger.load').with({
+    it { is_expected.to contain_file('passenger_package.conf').without_content }
+    it { is_expected.to contain_file('passenger_package.conf').without_source }
+    it { is_expected.to contain_file('passenger.load').with({
       'path' => '/etc/httpd/conf.d/passenger.load',
     }) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+    it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) }
+    it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
     end
     describe "with passenger_ruby => /usr/lib/example/ruby" do
       let :params do
         { :passenger_ruby => '/usr/lib/example/ruby' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
     end
   end
   context "on a FreeBSD OS" do
@@ -223,8 +223,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("www/rubygem-passenger") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_package("www/rubygem-passenger") }
   end
 end
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index f674318e28..2c14c31f06 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -17,9 +17,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("libapache2-mod-perl2") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('perl') }
+    it { is_expected.to contain_package("libapache2-mod-perl2") }
   end
   context "on a RedHat OS" do
     let :facts do
@@ -33,9 +33,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("mod_perl") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('perl') }
+    it { is_expected.to contain_package("mod_perl") }
   end
   context "on a FreeBSD OS" do
     let :facts do
@@ -49,8 +49,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("www/mod_perl2") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('perl') }
+    it { is_expected.to contain_package("www/mod_perl2") }
   end
 end
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index e1ee004e93..c0dfc96f55 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -16,8 +16,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('peruser') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/peruser.conf").with_ensure('file') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('peruser') }
+    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/peruser.conf").with_ensure('file') }
   end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index cba128a826..c1fd14b01e 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -18,10 +18,10 @@
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("libapache2-mod-php5") }
-      it { should contain_file("php5.load").with(
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("libapache2-mod-php5") }
+      it { is_expected.to contain_file("php5.load").with(
         :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
       ) }
     end
@@ -50,10 +50,10 @@
       let :pre_condition do
         'class { "apache": }'
       end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("php") }
-      it { should contain_file("php5.load").with(
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("php") }
+      it { is_expected.to contain_file("php5.load").with(
         :content => "LoadModule php5_module modules/libphp5.so\n"
       ) }
     end
@@ -63,7 +63,7 @@
       let :params do
         { :package_name => 'php54'}
       end
-      it { should contain_package("php54") }
+      it { is_expected.to contain_package("php54") }
     end
     context "with alternative path" do let :pre_condition do
         'class { "apache": }'
@@ -71,7 +71,7 @@
       let :params do
         { :path => 'alternative-path'}
       end
-      it { should contain_file("php5.load").with(
+      it { is_expected.to contain_file("php5.load").with(
         :content => "LoadModule php5_module alternative-path\n"
       ) }
     end
@@ -81,7 +81,7 @@
       let :params do
         { :extensions => ['.php','.php5']}
       end
-      it { should contain_file("php5.conf").with_content(/AddHandler php5-script .php .php5\n/) }
+      it { is_expected.to contain_file("php5.conf").with_content(/AddHandler php5-script .php .php5\n/) }
     end
     context "with specific version" do
       let :pre_condition do
@@ -90,7 +90,7 @@
       let :params do
         { :package_ensure => '5.3.13'}
       end
-      it { should contain_package("php").with(
+      it { is_expected.to contain_package("php").with(
         :ensure => '5.3.13'
       ) }
     end
@@ -98,10 +98,10 @@
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("php") }
-      it { should contain_file("php5.load").with(
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("php") }
+      it { is_expected.to contain_file("php5.load").with(
         :content => "LoadModule php5_module modules/libphp5.so\n"
       ) }
     end
@@ -122,10 +122,10 @@
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      it { should contain_class('apache::params') }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("lang/php5") }
-      it { should contain_file('php5.load') }
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("lang/php5") }
+      it { is_expected.to contain_file('php5.load') }
     end
     # FIXME: not sure about the following context
     context 'with mpm_module => worker' do
@@ -133,7 +133,7 @@
         'class { "apache": mpm_module => worker, }'
       end
       it 'should raise an error' do
-        expect { subject.should contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
+        expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
       end
     end
   end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 847aecf9c7..34bca08dc0 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -17,10 +17,10 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/etc/apache2/mods-available/prefork.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/prefork.conf").with_ensure('link') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('prefork') }
+    it { is_expected.to contain_file("/etc/apache2/mods-available/prefork.conf").with_ensure('file') }
+    it { is_expected.to contain_file("/etc/apache2/mods-enabled/prefork.conf").with_ensure('link') }
 
     context "with Apache version < 2.4" do
       let :params do
@@ -29,10 +29,10 @@
         }
       end
 
-      it { should_not contain_file("/etc/apache2/mods-available/prefork.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/prefork.load") }
+      it { is_expected.not_to contain_file("/etc/apache2/mods-available/prefork.load") }
+      it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/prefork.load") }
 
-      it { should contain_package("apache2-mpm-prefork") }
+      it { is_expected.to contain_package("apache2-mpm-prefork") }
     end
 
     context "with Apache version >= 2.4" do
@@ -42,12 +42,12 @@
         }
       end
 
-      it { should contain_file("/etc/apache2/mods-available/prefork.load").with({
+      it { is_expected.to contain_file("/etc/apache2/mods-available/prefork.load").with({
         'ensure'  => 'file',
         'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n"
         })
       }
-      it { should contain_file("/etc/apache2/mods-enabled/prefork.load").with_ensure('link') }
+      it { is_expected.to contain_file("/etc/apache2/mods-enabled/prefork.load").with_ensure('link') }
     end
   end
   context "on a RedHat OS" do
@@ -62,9 +62,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/etc/httpd/conf.d/prefork.conf").with_ensure('file') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('prefork') }
+    it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").with_ensure('file') }
 
     context "with Apache version < 2.4" do
       let :params do
@@ -73,7 +73,7 @@
         }
       end
 
-      it { should contain_file_line("/etc/sysconfig/httpd prefork enable").with({
+      it { is_expected.to contain_file_line("/etc/sysconfig/httpd prefork enable").with({
         'require' => 'Package[httpd]',
         })
       }
@@ -86,9 +86,9 @@
         }
       end
 
-      it { should_not contain_apache__mod('event') }
+      it { is_expected.not_to contain_apache__mod('event') }
 
-      it { should contain_file("/etc/httpd/conf.d/prefork.load").with({
+      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.load").with({
         'ensure'  => 'file',
         'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n",
         })
@@ -107,8 +107,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/prefork.conf").with_ensure('file') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('prefork') }
+    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/prefork.conf").with_ensure('file') }
   end
 end
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 77e1ab15de..81a2bb5371 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -10,9 +10,9 @@
   end
   context "on a Debian OS" do
     shared_examples "debian" do |loadfiles|
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('proxy_html').with(:loadfiles => loadfiles) }
-      it { should contain_package("libapache2-mod-proxy-html") }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => loadfiles) }
+      it { is_expected.to contain_package("libapache2-mod-proxy-html") }
     end
     let :facts do
       {
@@ -62,9 +62,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { should contain_package("mod_proxy_html") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
+    it { is_expected.to contain_package("mod_proxy_html") }
   end
   context "on a FreeBSD OS", :compile do
     let :facts do
@@ -78,8 +78,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { should contain_package("www/mod_proxy_html") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
+    it { is_expected.to contain_package("www/mod_proxy_html") }
   end
 end
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index d2d1fca7b9..17b62d43bd 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -17,9 +17,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("libapache2-mod-python") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("python") }
+    it { is_expected.to contain_package("libapache2-mod-python") }
   end
   context "on a RedHat OS" do
     let :facts do
@@ -33,9 +33,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("mod_python") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("python") }
+    it { is_expected.to contain_package("mod_python") }
   end
   context "on a FreeBSD OS" do
     let :facts do
@@ -49,8 +49,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("www/mod_python3") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("python") }
+    it { is_expected.to contain_package("www/mod_python3") }
   end
 end
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 949dd5702b..ca3a594848 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -19,31 +19,31 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('rpaf') }
-    it { should contain_package("libapache2-mod-rpaf") }
-    it { should contain_file('rpaf.conf').with({
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('rpaf') }
+    it { is_expected.to contain_package("libapache2-mod-rpaf") }
+    it { is_expected.to contain_file('rpaf.conf').with({
       'path' => '/etc/apache2/mods-available/rpaf.conf',
     }) }
-    it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
 
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
       end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
     end
     describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
       let :params do
         { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
       end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
     end
     describe "with header => X-Real-IP" do
       let :params do
         { :header => 'X-Real-IP' }
       end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
     end
   end
   context "on a FreeBSD OS" do
@@ -58,31 +58,31 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('rpaf') }
-    it { should contain_package("www/mod_rpaf2") }
-    it { should contain_file('rpaf.conf').with({
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('rpaf') }
+    it { is_expected.to contain_package("www/mod_rpaf2") }
+    it { is_expected.to contain_file('rpaf.conf').with({
       'path' => '/usr/local/etc/apache22/Modules/rpaf.conf',
     }) }
-    it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
 
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
       end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
     end
     describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
       let :params do
         { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
       end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
     end
     describe "with header => X-Real-IP" do
       let :params do
         { :header => 'X-Real-IP' }
       end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
     end
   end
 end
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index e7e6e1d640..814e0d6720 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -17,7 +17,7 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_apache__mod('speling') }
+    it { is_expected.to contain_apache__mod('speling') }
   end
 
   context "on a RedHat OS" do
@@ -32,6 +32,6 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_apache__mod('speling') }
+    it { is_expected.to contain_apache__mod('speling') }
   end
 end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 11e7964ded..fb6ba4eb57 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -31,9 +31,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
-    it { should contain_package('mod_ssl') }
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('ssl') }
+    it { is_expected.to contain_package('mod_ssl') }
   end
 
   context 'on a Debian OS' do
@@ -49,9 +49,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
-    it { should_not contain_package('libapache2-mod-ssl') }
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('ssl') }
+    it { is_expected.not_to contain_package('libapache2-mod-ssl') }
   end
 
   context 'on a FreeBSD OS' do
@@ -66,7 +66,7 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('ssl') }
   end
 end
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 5023bc7bf1..adb60861ba 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -3,7 +3,7 @@
 # Helper function for testing the contents of `status.conf`
 def status_conf_spec(allow_from, extended_status)
   it do
-    should contain_file("status.conf").with_content(
+    is_expected.to contain_file("status.conf").with_content(
       "<Location /server-status>\n"\
       "    SetHandler server-status\n"\
       "    Order deny,allow\n"\
@@ -39,16 +39,16 @@ def status_conf_spec(allow_from, extended_status)
       }
     end
 
-    it { should contain_apache__mod("status") }
+    it { is_expected.to contain_apache__mod("status") }
 
     status_conf_spec(["127.0.0.1", "::1"], "On")
 
-    it { should contain_file("status.conf").with({
+    it { is_expected.to contain_file("status.conf").with({
       :ensure => 'file',
       :path   => '/etc/apache2/mods-available/status.conf',
     } ) }
 
-    it { should contain_file("status.conf symlink").with({
+    it { is_expected.to contain_file("status.conf symlink").with({
       :ensure => 'link',
       :path   => '/etc/apache2/mods-enabled/status.conf',
     } ) }
@@ -68,11 +68,11 @@ def status_conf_spec(allow_from, extended_status)
       }
     end
 
-    it { should contain_apache__mod("status") }
+    it { is_expected.to contain_apache__mod("status") }
 
     status_conf_spec(["127.0.0.1", "::1"], "On")
 
-    it { should contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
+    it { is_expected.to contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
 
   end
 
@@ -118,7 +118,7 @@ def status_conf_spec(allow_from, extended_status)
     end
     it 'should expect to succeed array validation' do
       expect {
-        should contain_file("status.conf")
+        is_expected.to contain_file("status.conf")
       }.not_to raise_error()
     end
   end
@@ -140,7 +140,7 @@ def status_conf_spec(allow_from, extended_status)
     end
     it 'should expect to fail array validation' do
       expect {
-        should contain_file("status.conf")
+        is_expected.to contain_file("status.conf")
       }.to raise_error(Puppet::Error)
     end
   end
@@ -165,7 +165,7 @@ def status_conf_spec(allow_from, extended_status)
       end
       it 'should expect to succeed regular expression validation' do
         expect {
-          should contain_file("status.conf")
+          is_expected.to contain_file("status.conf")
         }.not_to raise_error()
       end
     end
@@ -189,7 +189,7 @@ def status_conf_spec(allow_from, extended_status)
       end
       it 'should expect to fail regular expression validation' do
         expect {
-          should contain_file("status.conf")
+          is_expected.to contain_file("status.conf")
         }.to raise_error(Puppet::Error)
       end
     end
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index cb91997ac1..b74b4c8646 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -17,8 +17,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_package("libapache2-mod-suphp") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_package("libapache2-mod-suphp") }
   end
   context "on a RedHat OS" do
     let :facts do
@@ -32,7 +32,7 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_package("mod_suphp") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_package("mod_suphp") }
   end
 end
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 3c9c1cf246..c0a790b180 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -17,10 +17,10 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/etc/apache2/mods-available/worker.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/worker.conf").with_ensure('link') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('worker') }
+    it { is_expected.to contain_file("/etc/apache2/mods-available/worker.conf").with_ensure('file') }
+    it { is_expected.to contain_file("/etc/apache2/mods-enabled/worker.conf").with_ensure('link') }
 
     context "with Apache version < 2.4" do
       let :params do
@@ -29,10 +29,10 @@
         }
       end
 
-      it { should_not contain_file("/etc/apache2/mods-available/worker.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/worker.load") }
+      it { is_expected.not_to contain_file("/etc/apache2/mods-available/worker.load") }
+      it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/worker.load") }
 
-      it { should contain_package("apache2-mpm-worker") }
+      it { is_expected.to contain_package("apache2-mpm-worker") }
     end
 
     context "with Apache version >= 2.4" do
@@ -42,12 +42,12 @@
         }
       end
 
-      it { should contain_file("/etc/apache2/mods-available/worker.load").with({
+      it { is_expected.to contain_file("/etc/apache2/mods-available/worker.load").with({
         'ensure'  => 'file',
         'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n"
         })
       }
-      it { should contain_file("/etc/apache2/mods-enabled/worker.load").with_ensure('link') }
+      it { is_expected.to contain_file("/etc/apache2/mods-enabled/worker.load").with_ensure('link') }
     end
   end
   context "on a RedHat OS" do
@@ -62,9 +62,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('worker') }
+    it { is_expected.to contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') }
 
     context "with Apache version < 2.4" do
       let :params do
@@ -73,7 +73,7 @@
         }
       end
 
-      it { should contain_file_line("/etc/sysconfig/httpd worker enable").with({
+      it { is_expected.to contain_file_line("/etc/sysconfig/httpd worker enable").with({
         'require' => 'Package[httpd]',
         })
       }
@@ -86,9 +86,9 @@
         }
       end
 
-      it { should_not contain_apache__mod('event') }
+      it { is_expected.not_to contain_apache__mod('event') }
 
-      it { should contain_file("/etc/httpd/conf.d/worker.load").with({
+      it { is_expected.to contain_file("/etc/httpd/conf.d/worker.load").with({
         'ensure'  => 'file',
         'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n",
         })
@@ -107,8 +107,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/worker.conf").with_ensure('file') }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('worker') }
+    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/worker.conf").with_ensure('file') }
   end
 end
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index d4c391a291..5945e3bebf 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -17,9 +17,9 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("libapache2-mod-wsgi") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_package("libapache2-mod-wsgi") }
   end
   context "on a RedHat OS" do
     let :facts do
@@ -33,21 +33,21 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("mod_wsgi") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_package("mod_wsgi") }
 
     describe "with custom WSGISocketPrefix" do
       let :params do
         { :wsgi_socket_prefix => 'run/wsgi' }
       end
-      it {should contain_file('wsgi.conf').with_content(/^  WSGISocketPrefix run\/wsgi$/)}
+      it {is_expected.to contain_file('wsgi.conf').with_content(/^  WSGISocketPrefix run\/wsgi$/)}
     end
     describe "with custom WSGIPythonHome" do
       let :params do
         { :wsgi_python_home => '/path/to/virtenv' }
       end
-      it {should contain_file('wsgi.conf').with_content(/^  WSGIPythonHome "\/path\/to\/virtenv"$/)}
+      it {is_expected.to contain_file('wsgi.conf').with_content(/^  WSGIPythonHome "\/path\/to\/virtenv"$/)}
     end
   end
   context "on a FreeBSD OS" do
@@ -62,8 +62,8 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("www/mod_wsgi") }
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_package("www/mod_wsgi") }
   end
 end
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index eaa178c41d..6f63758a3a 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -14,13 +14,13 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_apache__params }
+    it { is_expected.to contain_apache__params }
 
     # There are 4 resources in this class currently
     # there should not be any more resources because it is a params class
     # The resources are class[apache::version], class[apache::params], class[main], class[settings], stage[main]
     it "Should not contain any resources" do
-      subject.resources.size.should == 5
+      expect(subject.resources.size).to eq(5)
     end
   end
 end
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 2cd075357d..4d6efbe3fd 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -17,7 +17,7 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_service("httpd").with(
+    it { is_expected.to contain_service("httpd").with(
       'name'      => 'apache2',
       'ensure'    => 'running',
       'enable'    => 'true'
@@ -26,7 +26,7 @@
 
     context "with $service_name => 'foo'" do
       let (:params) {{ :service_name => 'foo' }}
-      it { should contain_service("httpd").with(
+      it { is_expected.to contain_service("httpd").with(
         'name'      => 'foo'
         )
       }
@@ -34,7 +34,7 @@
 
     context "with $service_enable => true" do
       let (:params) {{ :service_enable => true }}
-      it { should contain_service("httpd").with(
+      it { is_expected.to contain_service("httpd").with(
         'name'      => 'apache2',
         'ensure'    => 'running',
         'enable'    => 'true'
@@ -44,7 +44,7 @@
 
     context "with $service_enable => false" do
       let (:params) {{ :service_enable => false }}
-      it { should contain_service("httpd").with(
+      it { is_expected.to contain_service("httpd").with(
         'name'      => 'apache2',
         'ensure'    => 'running',
         'enable'    => 'false'
@@ -62,7 +62,7 @@
 
     context "with $service_ensure => 'running'" do
       let (:params) {{ :service_ensure => 'running', }}
-      it { should contain_service("httpd").with(
+      it { is_expected.to contain_service("httpd").with(
         'ensure'    => 'running',
         'enable'    => 'true'
         )
@@ -71,7 +71,7 @@
 
     context "with $service_ensure => 'stopped'" do
       let (:params) {{ :service_ensure => 'stopped', }}
-      it { should contain_service("httpd").with(
+      it { is_expected.to contain_service("httpd").with(
         'ensure'    => 'stopped',
         'enable'    => 'true'
         )
@@ -80,7 +80,7 @@
 
     context "with $service_ensure => 'UNDEF'" do
       let (:params) {{ :service_ensure => 'UNDEF' }}
-      it { should contain_service("httpd").without_ensure }
+      it { is_expected.to contain_service("httpd").without_ensure }
     end
   end
 
@@ -97,7 +97,7 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_service("httpd").with(
+    it { is_expected.to contain_service("httpd").with(
       'name'      => 'httpd',
       'ensure'    => 'running',
       'enable'    => 'true'
@@ -117,7 +117,7 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { should contain_service("httpd").with(
+    it { is_expected.to contain_service("httpd").with(
       'name'      => 'apache22',
       'ensure'    => 'running',
       'enable'    => 'true'

From 9f97fc7c8d5cee1e62dac560bf034ca3997e1f33 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 6 Jun 2014 10:11:14 -0400
Subject: [PATCH 0264/2267] Convert specs to RSpec 3.0.0 syntax with Transpec

This conversion is done by Transpec 2.2.1 with the following command:
    transpec spec/defines

* 65 conversions
    from: it { should ... }
      to: it { is_expected.to ... }

* 9 conversions
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

For more details: https://github.com/yujinakayama/transpec#supported-conversions
---
 spec/defines/mod_spec.rb   |  18 ++---
 spec/defines/vhost_spec.rb | 130 ++++++++++++++++++-------------------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index e6d5214097..377c877926 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -21,9 +21,9 @@
       let :title do
         'spec_m'
       end
-      it { should contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::params") }
       it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
+        is_expected.to contain_file('spec_m.load').with({
           :path    => '/etc/httpd/conf.d/spec_m.load',
           :content => "LoadModule spec_m_module modules/mod_spec_m.so\n",
           :owner   => 'root',
@@ -41,8 +41,8 @@
       # parameters
       let(:params) { {:package => 'mod_xsendfile'} }
 
-      it { should contain_class("apache::params") }
-      it { should contain_package('mod_xsendfile') }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_package('mod_xsendfile') }
     end
   end
 
@@ -64,9 +64,9 @@
       let :title do
         'spec_m'
       end
-      it { should contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::params") }
       it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
+        is_expected.to contain_file('spec_m.load').with({
           :path    => '/etc/apache2/mods-available/spec_m.load',
           :content => "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
           :owner   => 'root',
@@ -75,7 +75,7 @@
         } )
       end
       it "should link the module load file" do
-        should contain_file('spec_m.load symlink').with({
+        is_expected.to contain_file('spec_m.load symlink').with({
           :path   => '/etc/apache2/mods-enabled/spec_m.load',
           :target => '/etc/apache2/mods-available/spec_m.load',
           :owner   => 'root',
@@ -103,9 +103,9 @@
       let :title do
         'spec_m'
       end
-      it { should contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::params") }
       it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
+        is_expected.to contain_file('spec_m.load').with({
           :path    => '/usr/local/etc/apache22/Modules/spec_m.load',
           :content => "LoadModule spec_m_module /usr/local/libexec/apache22/mod_spec_m.so\n",
           :owner   => 'root',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 4037b3011c..d8233a323e 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -28,8 +28,8 @@
       end
       let :params do default_params end
       let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_class("apache::params") }
     end
     context "on Debian based systems" do
       let :default_facts do
@@ -46,13 +46,13 @@
       end
       let :params do default_params end
       let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_file("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
       ) }
-      it { should contain_file("25-rspec.example.com.conf symlink").with(
+      it { is_expected.to contain_file("25-rspec.example.com.conf symlink").with(
         :ensure => 'link',
         :path   => '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
         :target => '/etc/apache2/sites-available/25-rspec.example.com.conf'
@@ -72,9 +72,9 @@
       end
       let :params do default_params end
       let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_file("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/usr/local/etc/apache22/Vhosts/25-rspec.example.com.conf'
       ) }
@@ -95,10 +95,10 @@
     end
     describe 'basic assumptions' do
       let :params do default_params end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_apache__listen(params[:port]) }
-      it { should contain_apache__namevirtualhost("*:#{params[:port]}") }
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__listen(params[:port]) }
+      it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
     end
 
     # All match and notmatch should be a list of regexs and exact match strings
@@ -669,18 +669,18 @@
         describe "when #{param[:attr]} is #{param[:value]}" do
           let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
 
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
+          it { is_expected.to contain_file("25-#{title}.conf").with_mode('0644') }
           if param[:match]
             it "#{param[:title]}: matches" do
               param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
+                is_expected.to contain_file("25-#{title}.conf").with_content( match )
               end
             end
           end
           if param[:notmatch]
             it "#{param[:title]}: notmatches" do
               param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
+                is_expected.not_to contain_file("25-#{title}.conf").with_content( notmatch )
               end
             end
           end
@@ -821,18 +821,18 @@
             :apache_version => '2.2',
           }) end
 
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
+          it { is_expected.to contain_file("25-#{title}.conf").with_mode('0644') }
           if param[:match]
             it "#{param[:title]}: matches" do
               param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
+                is_expected.to contain_file("25-#{title}.conf").with_content( match )
               end
             end
           end
           if param[:notmatch]
             it "#{param[:title]}: notmatches" do
               param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
+                is_expected.not_to contain_file("25-#{title}.conf").with_content( notmatch )
               end
             end
           end
@@ -958,18 +958,18 @@
             :apache_version => '2.4',
           }) end
 
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
+          it { is_expected.to contain_file("25-#{title}.conf").with_mode('0644') }
           if param[:match]
             it "#{param[:title]}: matches" do
               param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
+                is_expected.to contain_file("25-#{title}.conf").with_content( match )
               end
             end
           end
           if param[:notmatch]
             it "#{param[:title]}: notmatches" do
               param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
+                is_expected.not_to contain_file("25-#{title}.conf").with_content( notmatch )
               end
             end
           end
@@ -1090,18 +1090,18 @@
               :ssl                => true,
             } )
           end
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
+          it { is_expected.to contain_file("25-#{title}.conf").with_mode('0644') }
           if param[:match]
             it "#{param[:title]}: matches" do
               param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
+                is_expected.to contain_file("25-#{title}.conf").with_content( match )
               end
             end
           end
           if param[:notmatch]
             it "#{param[:title]}: notmatches" do
               param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
+                is_expected.not_to contain_file("25-#{title}.conf").with_content( notmatch )
               end
             end
           end
@@ -1135,7 +1135,7 @@
           :docroot_mode  => '0750',
         }) end
         it 'should set vhost ownership and permissions' do
-          should contain_file(params[:docroot]).with({
+          is_expected.to contain_file(params[:docroot]).with({
             :ensure => :directory,
             :owner  => 'testuser',
             :group  => 'testgroup',
@@ -1150,7 +1150,7 @@
           :wsgi_daemon_process_options => { 'processes' => '2', 'threads' => '15' },
         }) end
         it 'should set wsgi_daemon_process_options' do
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  WSGIDaemonProcess example.org processes=2 threads=15$/
           )
         end
@@ -1162,7 +1162,7 @@
           :wsgi_import_script_options => { 'application-group' => '%{GLOBAL}', 'process-group' => 'wsgi' },
         }) end
         it 'should set wsgi_import_script_options' do
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  WSGIImportScript \/var\/www\/demo.wsgi application-group=%{GLOBAL} process-group=wsgi$/
           )
         end
@@ -1180,22 +1180,22 @@
           ]
         }) end
         it 'should set RewriteConds and RewriteRules' do
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  #test rewrites$/
           )
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  RewriteCond %\{HTTP_USER_AGENT\} \^Lynx\/ \[OR\]$/
           )
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  RewriteBase \/mytestpath\/$/
           )
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  RewriteCond %\{HTTP_USER_AGENT\} \^Mozilla\/\[12\]$/
           )
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  RewriteRule \^index\\.html\$ welcome.html$/
           )
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  RewriteRule \^index\\.cgi\$ index.php$/
           )
         end
@@ -1207,7 +1207,7 @@
           :rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
         }) end
         it 'should set RewriteCond' do
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  RewriteCond %\{HTTPS\} off$/
           )
         end
@@ -1218,7 +1218,7 @@
           :action => 'php-fastcgi',
         }) end
         it 'should set Action' do
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  Action php-fastcgi \/cgi-bin virtual$/
           )
         end
@@ -1230,7 +1230,7 @@
           :suphp_configpath => '/etc/php5/apache2',
         }) end
         it 'should set suphp_configpath' do
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  suPHP_ConfigPath "\/etc\/php5\/apache2"$/
           )
         end
@@ -1242,7 +1242,7 @@
           :suphp_addhandler => 'x-httpd-php',
         }) end
         it 'should set suphp_addhandler' do
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^  suPHP_AddHandler x-httpd-php/
           )
         end
@@ -1256,7 +1256,7 @@
           }
         }) end
         it 'should set suphp_UserGroup' do
-          should contain_file("25-#{title}.conf").with_content(
+          is_expected.to contain_file("25-#{title}.conf").with_content(
             /^    suPHP_UserGroup myappuser myappgroup/
           )
         end
@@ -1265,7 +1265,7 @@
       describe 'priority/default settings' do
         describe 'when neither priority/default is specified' do
           let :params do default_params end
-          it { should contain_file("25-#{title}.conf").with_path(
+          it { is_expected.to contain_file("25-#{title}.conf").with_path(
             /25-#{title}.conf/
           ) }
         end
@@ -1276,7 +1276,7 @@
               :default_vhost => true,
             })
           end
-          it { should contain_file("15-#{title}.conf").with_path(
+          it { is_expected.to contain_file("15-#{title}.conf").with_path(
             /15-#{title}.conf/
           ) }
         end
@@ -1284,7 +1284,7 @@
           let :params do
             default_params.merge({ :priority => 14, })
           end
-          it { should contain_file("14-#{title}.conf").with_path(
+          it { is_expected.to contain_file("14-#{title}.conf").with_path(
             /14-#{title}.conf/
           ) }
         end
@@ -1292,7 +1292,7 @@
           let :params do
             default_params.merge({ :default_vhost => true, })
           end
-          it { should contain_file("10-#{title}.conf").with_path(
+          it { is_expected.to contain_file("10-#{title}.conf").with_path(
             /10-#{title}.conf/
           ) }
         end
@@ -1306,7 +1306,7 @@
             })
           end
 
-          it { should_not contain_file("25-#{title}.conf").with_content(%r{FcgidWrapper}) }
+          it { is_expected.not_to contain_file("25-#{title}.conf").with_content(%r{FcgidWrapper}) }
         end
 
         describe 'Only a command' do
@@ -1318,7 +1318,7 @@
             })
           end
 
-          it { should contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper  $}) }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper  $}) }
         end
 
         describe 'All parameters' do
@@ -1330,7 +1330,7 @@
             })
           end
 
-          it { should contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper .php virtual$}) }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper .php virtual$}) }
         end
       end
 
@@ -1338,25 +1338,25 @@
         describe 'when ip_based is true' do
           let :params do default_params.merge({ :ip_based => true }) end
           it 'should not specify a NameVirtualHost' do
-            should contain_apache__listen(params[:port])
-            should_not contain_apache__namevirtualhost("*:#{params[:port]}")
+            is_expected.to contain_apache__listen(params[:port])
+            is_expected.not_to contain_apache__namevirtualhost("*:#{params[:port]}")
           end
         end
 
         describe 'when ip_based is default' do
           let :params do default_params end
           it 'should specify a NameVirtualHost' do
-            should contain_apache__listen(params[:port])
-            should contain_apache__namevirtualhost("*:#{params[:port]}")
+            is_expected.to contain_apache__listen(params[:port])
+            is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}")
           end
         end
 
         describe 'when an ip is set' do
           let :params do default_params.merge({ :ip => '10.0.0.1' }) end
           it 'should specify a NameVirtualHost for the ip' do
-            should_not contain_apache__listen(params[:port])
-            should contain_apache__listen("10.0.0.1:#{params[:port]}")
-            should contain_apache__namevirtualhost("10.0.0.1:#{params[:port]}")
+            is_expected.not_to contain_apache__listen(params[:port])
+            is_expected.to contain_apache__listen("10.0.0.1:#{params[:port]}")
+            is_expected.to contain_apache__namevirtualhost("10.0.0.1:#{params[:port]}")
           end
         end
 
@@ -1369,9 +1369,9 @@
             }
           end
           it 'should specify a NameVirtualHost for the ip' do
-            should_not contain_apache__listen(params[:ip])
-            should_not contain_apache__namevirtualhost(params[:ip])
-            should contain_file("25-#{title}.conf").with_content %r{<VirtualHost 10\.0\.0\.1>}
+            is_expected.not_to contain_apache__listen(params[:ip])
+            is_expected.not_to contain_apache__namevirtualhost(params[:ip])
+            is_expected.to contain_file("25-#{title}.conf").with_content %r{<VirtualHost 10\.0\.0\.1>}
           end
         end
       end
@@ -1383,7 +1383,7 @@
           })
         end
 
-        it { should contain_file("25-#{title}.conf").with_content %r{^  SuexecUserGroup nobody nogroup$} }
+        it { is_expected.to contain_file("25-#{title}.conf").with_content %r{^  SuexecUserGroup nobody nogroup$} }
       end
 
       describe 'redirect rules' do
@@ -1405,8 +1405,8 @@
             })
           end
 
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/login} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/login} }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
         end
         describe 'redirect match rules' do
           let :params do
@@ -1420,7 +1420,7 @@
             })
           end
 
-          it { should contain_file("25-#{title}.conf").with_content %r{  RedirectMatch 404 } }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  RedirectMatch 404 } }
         end
         describe 'without a status' do
           let :params do
@@ -1436,8 +1436,8 @@
             })
           end
 
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /login http://10\.0\.0\.10/login} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect  /login http://10\.0\.0\.10/login} }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
         end
         describe 'with a single status and dest' do
           let :params do
@@ -1451,8 +1451,8 @@
             })
           end
 
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/test} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /logout http://10\.0\.0\.10/test} }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/test} }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /logout http://10\.0\.0\.10/test} }
         end
 
         describe 'with a directoryindex specified' do
@@ -1461,7 +1461,7 @@
               :directoryindex => 'index.php'
             })
           end
-          it { should contain_file("25-#{title}.conf").with_content %r{DirectoryIndex index.php} }
+          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{DirectoryIndex index.php} }
 	end
       end
     end

From 013251853f36c1e957c6e0f80d001a21ba93b163 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 6 Jun 2014 10:12:25 -0400
Subject: [PATCH 0265/2267] Convert specs to RSpec 3.0.0 syntax with Transpec

This conversion is done by Transpec 2.2.1 with the following command:
    transpec spec/unit

* 4 conversions
    from: obj.should
      to: expect(obj).to

* 3 conversions
    from: == expected
      to: eq(expected)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
---
 spec/unit/provider/a2mod/gentoo_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index ddb9dddda4..78f902bf72 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -11,7 +11,7 @@
 
   [:conf_file, :instances, :modules, :initvars, :conf_file, :clear].each do |method|
     it "should respond to the class method #{method}" do
-      provider_class.should respond_to(method)
+      expect(provider_class).to respond_to(method)
     end
   end
 
@@ -24,21 +24,21 @@
       @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
       provider_class.expects(:filetype).returns(@filetype)
 
-      provider_class.modules.should == %w{bar baz foo}
+      expect(provider_class.modules).to eq(%w{bar baz foo})
     end
 
     it "should cache the module list" do
       @filetype.expects(:read).once.returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
       provider_class.expects(:filetype).once.returns(@filetype)
 
-      2.times { provider_class.modules.should == %w{bar baz foo} }
+      2.times { expect(provider_class.modules).to eq(%w{bar baz foo}) }
     end
 
     it "should normalize parameters" do
       @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAR"\n})
       provider_class.expects(:filetype).returns(@filetype)
 
-      provider_class.modules.should == %w{bar foo}
+      expect(provider_class.modules).to eq(%w{bar foo})
     end
   end
 

From 2d3724db4182e6682bc9d228b997d7f0bc344502 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 6 Jun 2014 10:14:15 -0400
Subject: [PATCH 0266/2267] Convert specs to RSpec 3.0.0 syntax with Transpec

This conversion is done by Transpec 2.2.1 with the following command:
    transpec spec/acceptance

* 234 conversions
    from: it { should ... }
      to: it { is_expected.to ... }

* 58 conversions
    from: obj.should
      to: expect(obj).to

* 33 conversions
    from: =~ /pattern/
      to: match(/pattern/)

* 20 conversions
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

* 18 conversions
    from: == expected
      to: eq(expected)

* 1 conversion
    from: obj.should_not
      to: expect(obj).not_to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
---
 spec/acceptance/apache_parameters_spec.rb | 104 +++++-----
 spec/acceptance/apache_ssl_spec.rb        |  42 ++--
 spec/acceptance/class_spec.rb             |  10 +-
 spec/acceptance/default_mods_spec.rb      |  10 +-
 spec/acceptance/itk_spec.rb               |   4 +-
 spec/acceptance/mod_dav_svn_spec.rb       |  12 +-
 spec/acceptance/mod_deflate_spec.rb       |  18 +-
 spec/acceptance/mod_fcgid_spec.rb         |   8 +-
 spec/acceptance/mod_mime_spec.rb          |   6 +-
 spec/acceptance/mod_pagespeed_spec.rb     |  18 +-
 spec/acceptance/mod_passenger_spec.rb     | 110 +++++-----
 spec/acceptance/mod_php_spec.rb           |  22 +-
 spec/acceptance/mod_proxy_html_spec.rb    |   4 +-
 spec/acceptance/mod_suphp_spec.rb         |   8 +-
 spec/acceptance/prefork_worker_spec.rb    |  12 +-
 spec/acceptance/vhost_spec.rb             | 238 +++++++++++-----------
 16 files changed, 313 insertions(+), 313 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 4fa3bf6ec6..54b4242251 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -12,7 +12,7 @@
 
     if fact('osfamily') == 'FreeBSD'
       describe file("#{confd_dir}/no-accf.conf.erb") do
-        it { should_not be_file }
+        it { is_expected.not_to be_file }
       end
     end
   end
@@ -24,7 +24,7 @@
 
     if fact('osfamily') == 'FreeBSD'
       describe file("#{$confd_dir}/no-accf.conf.erb") do
-        it { should be_file }
+        it { is_expected.to be_file }
       end
     end
   end
@@ -36,8 +36,8 @@
     end
 
     describe file($ports_file) do
-      it { should be_file }
-      it { should contain 'Listen 10.1.1.1' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Listen 10.1.1.1' }
     end
   end
 
@@ -53,8 +53,8 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      it { should be_running }
-      it { should be_enabled }
+      it { is_expected.to be_running }
+      it { is_expected.to be_enabled }
     end
   end
 
@@ -70,8 +70,8 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      it { should_not be_running }
-      it { should_not be_enabled }
+      it { is_expected.not_to be_running }
+      it { is_expected.not_to be_enabled }
     end
   end
 
@@ -89,7 +89,7 @@ class { 'apache':
 
     # Ensure the file didn't disappear.
     describe file("#{$confd_dir}/test.conf") do
-      it { should be_file }
+      it { is_expected.to be_file }
     end
   end
 
@@ -108,7 +108,7 @@ class { 'apache':
 
       # File should be gone
       describe file("#{$confd_dir}/test.conf") do
-        it { should_not be_file }
+        it { is_expected.not_to be_file }
       end
     end
   end
@@ -120,8 +120,8 @@ class { 'apache':
     end
 
     describe file($vhost) do
-      it { should be_file }
-      it { should contain 'ServerAdmin test@example.com' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ServerAdmin test@example.com' }
     end
   end
 
@@ -134,8 +134,8 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'EnableSendfile On' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'EnableSendfile On' }
     end
 
     describe 'setup' do
@@ -146,8 +146,8 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Sendfile Off' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Sendfile Off' }
     end
   end
 
@@ -160,8 +160,8 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Alias /error/' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Alias /error/' }
     end
   end
 
@@ -174,8 +174,8 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Timeout 1234' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Timeout 1234' }
     end
   end
 
@@ -191,8 +191,8 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     end
 
     describe file("#{$confd_dir}/mime.conf") do
-      it { should be_file }
-      it { should contain 'AddLanguage eo .eo' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'AddLanguage eo .eo' }
     end
   end
 
@@ -205,8 +205,8 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerRoot "/tmp/root"' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ServerRoot "/tmp/root"' }
     end
   end
 
@@ -220,13 +220,13 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
 
     if $apache_version == '2.4'
       describe file($conf_file) do
-        it { should be_file }
-        it { should contain 'IncludeOptional "/tmp/root/*.conf"' }
+        it { is_expected.to be_file }
+        it { is_expected.to contain 'IncludeOptional "/tmp/root/*.conf"' }
       end
     else
       describe file($conf_file) do
-        it { should be_file }
-        it { should contain 'Include "/tmp/root/*.conf"' }
+        it { is_expected.to be_file }
+        it { is_expected.to contain 'Include "/tmp/root/*.conf"' }
       end
     end
   end
@@ -242,8 +242,8 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'testcontent' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'testcontent' }
     end
   end
 
@@ -256,8 +256,8 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerName "test.server"' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ServerName "test.server"' }
     end
   end
 
@@ -277,12 +277,12 @@ class { 'apache':
     end
 
     describe user('testweb') do
-      it { should exist }
-      it { should belong_to_group 'testweb' }
+      it { is_expected.to exist }
+      it { is_expected.to belong_to_group 'testweb' }
     end
 
     describe group('testweb') do
-      it { should exist }
+      it { is_expected.to exist }
     end
   end
 
@@ -302,9 +302,9 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common' }
-      it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common' }
+      it { is_expected.to contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined' }
     end
   end
 
@@ -318,10 +318,10 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'KeepAlive On' }
-      it { should contain 'KeepAliveTimeout 30' }
-      it { should contain 'MaxKeepAliveRequests 200' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'KeepAlive On' }
+      it { is_expected.to contain 'KeepAliveTimeout 30' }
+      it { is_expected.to contain 'MaxKeepAliveRequests 200' }
     end
   end
 
@@ -356,7 +356,7 @@ class { 'apache': logroot => '/apache_spec' }
     end
 
     describe file("/apache_spec/#{$error_log}") do
-      it { should be_file }
+      it { is_expected.to be_file }
     end
   end
 
@@ -374,8 +374,8 @@ class { 'apache':
     end
 
     describe file('/apache_spec/ports_file') do
-      it { should be_file }
-      it { should contain 'Listen 10.1.1.1' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Listen 10.1.1.1' }
     end
   end
 
@@ -390,8 +390,8 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerTokens Minor' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ServerTokens Minor' }
     end
   end
 
@@ -407,8 +407,8 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerSignature testsig' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ServerSignature testsig' }
     end
   end
 
@@ -423,8 +423,8 @@ class { 'apache':
     end
 
     describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'TraceEnable Off' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'TraceEnable Off' }
     end
   end
 
@@ -439,7 +439,7 @@ class { 'apache':
     end
 
     describe package($package_name) do
-      it { should be_installed }
+      it { is_expected.to be_installed }
     end
   end
 
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 649c02d841..3cfe593481 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -27,13 +27,13 @@ class { 'apache':
     end
 
     describe file("#{vhostd}/15-default-ssl.conf") do
-      it { should be_file }
-      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
-      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
-      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
-      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
-      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
-      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
+      it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
+      it { is_expected.to contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
+      it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { is_expected.to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
+      it { is_expected.to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
     end
   end
 
@@ -67,20 +67,20 @@ class { 'apache':
     end
 
     describe file("#{vhostd}/25-test_ssl.conf") do
-      it { should be_file }
-      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
-      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
-      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
-      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
-      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
-      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
-      it { should contain 'SSLProxyEngine On' }
-      it { should contain 'SSLProtocol             test' }
-      it { should contain 'SSLCipherSuite          test' }
-      it { should contain 'SSLHonorCipherOrder     test' }
-      it { should contain 'SSLVerifyClient         test' }
-      it { should contain 'SSLVerifyDepth          test' }
-      it { should contain 'SSLOptions test test1' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
+      it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
+      it { is_expected.to contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
+      it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { is_expected.to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
+      it { is_expected.to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
+      it { is_expected.to contain 'SSLProxyEngine On' }
+      it { is_expected.to contain 'SSLProtocol             test' }
+      it { is_expected.to contain 'SSLCipherSuite          test' }
+      it { is_expected.to contain 'SSLHonorCipherOrder     test' }
+      it { is_expected.to contain 'SSLVerifyClient         test' }
+      it { is_expected.to contain 'SSLVerifyDepth          test' }
+      it { is_expected.to contain 'SSLOptions test test1' }
     end
   end
 
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 830e3ed5b6..d9b80b5c35 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -25,12 +25,12 @@ class { 'apache': }
     end
 
     describe package(package_name) do
-      it { should be_installed }
+      it { is_expected.to be_installed }
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
   end
 
@@ -71,8 +71,8 @@ class { 'apache':
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
   end
 end
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index c7f8755605..2565ce77b9 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -28,7 +28,7 @@ class { 'apache':
     end
 
     describe service(servicename) do
-      it { should be_running }
+      it { is_expected.to be_running }
     end
   end
 
@@ -54,7 +54,7 @@ class { 'apache':
 
     # Are these the same?
     describe service(servicename) do
-      it { should_not be_running }
+      it { is_expected.not_to be_running }
     end
     describe "service #{servicename}" do
       it 'should not be running' do
@@ -92,7 +92,7 @@ class { 'apache':
     end
 
     describe service(servicename) do
-      it { should be_running }
+      it { is_expected.to be_running }
     end
   end
 
@@ -110,11 +110,11 @@ class { 'apache': default_mods => false }
     end
 
     describe service(servicename) do
-      it { should be_running }
+      it { is_expected.to be_running }
     end
 
     describe file("#{mod_dir}/zz_auth_basic.load") do
-      it { should be_file }
+      it { is_expected.to be_file }
     end
   end
 end
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 86fc2c01ce..b810657ec3 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -27,7 +27,7 @@ class { 'apache':
   end
 
   describe service(service_name) do
-    it { should be_running }
-    it { should be_enabled }
+    it { is_expected.to be_running }
+    it { is_expected.to be_enabled }
   end
 end
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 412b794540..ff90d331f3 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -23,12 +23,12 @@ class { 'apache': }
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     describe file("#{mod_dir}/dav_svn.load") do
-      it { should contain "LoadModule dav_svn_module" }
+      it { is_expected.to contain "LoadModule dav_svn_module" }
     end
   end
 
@@ -44,12 +44,12 @@ class { 'apache::mod::dav_svn':
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     describe file("#{mod_dir}/dav_svn_authz_svn.load") do
-      it { should contain "LoadModule authz_svn_module" }
+      it { is_expected.to contain "LoadModule authz_svn_module" }
     end
   end
 end
diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
index b2ffc1436a..6052cc283f 100644
--- a/spec/acceptance/mod_deflate_spec.rb
+++ b/spec/acceptance/mod_deflate_spec.rb
@@ -23,18 +23,18 @@ class { 'apache': }
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     describe file("#{mod_dir}/deflate.conf") do
-      it { should contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" }
-      it { should contain "AddOutputFilterByType DEFLATE text/css" }
-      it { should contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" }
-      it { should contain "AddOutputFilterByType DEFLATE application/rss+xml" }
-      it { should contain "DeflateFilterNote Input instream" }
-      it { should contain "DeflateFilterNote Output outstream" }
-      it { should contain "DeflateFilterNote Ratio ratio" }
+      it { is_expected.to contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" }
+      it { is_expected.to contain "AddOutputFilterByType DEFLATE text/css" }
+      it { is_expected.to contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" }
+      it { is_expected.to contain "AddOutputFilterByType DEFLATE application/rss+xml" }
+      it { is_expected.to contain "DeflateFilterNote Input instream" }
+      it { is_expected.to contain "DeflateFilterNote Output outstream" }
+      it { is_expected.to contain "DeflateFilterNote Ratio ratio" }
     end
   end
 end
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 52f793be06..8e94fa08fa 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -43,14 +43,14 @@ class { 'apache::mod::fcgid':
       end
 
       describe service('httpd') do
-        it { should be_enabled }
-        it { should be_running }
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
       end
 
       it 'should answer to fcgid.example.com' do
         shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
-          r.stdout.should =~ /^Hello world$/
-          r.exit_code.should == 0
+          expect(r.stdout).to match(/^Hello world$/)
+          expect(r.exit_code).to eq(0)
         end
       end
 
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index 71a7037a62..e2a2512db6 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -23,12 +23,12 @@ class { 'apache': }
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     describe file("#{mod_dir}/mime.conf") do
-      it { should contain "AddType application/x-compress .Z" }
+      it { is_expected.to contain "AddType application/x-compress .Z" }
     end
   end
 end
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index de59a347c1..14e75b4d79 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -63,22 +63,22 @@ class { 'apache::mod::pagespeed':
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     describe file("#{mod_dir}/pagespeed.conf") do
-      it { should contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" }
-      it { should contain "ModPagespeedEnableFilters remove_comments" }
-      it { should contain "ModPagespeedDisableFilters extend_cache" }
-      it { should contain "ModPagespeedForbidFilters rewrite_javascript" }
+      it { is_expected.to contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" }
+      it { is_expected.to contain "ModPagespeedEnableFilters remove_comments" }
+      it { is_expected.to contain "ModPagespeedDisableFilters extend_cache" }
+      it { is_expected.to contain "ModPagespeedForbidFilters rewrite_javascript" }
     end
 
     it 'should answer to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
       shell("/usr/bin/curl pagespeed.example.com:80") do |r|
-        r.stdout.should =~ /<head\/>/
-        r.stdout.should_not =~ /<!-- comment -->/
-        r.exit_code.should == 0
+        expect(r.stdout).to match(/<head\/>/)
+        expect(r.stdout).not_to match(/<!-- comment -->/)
+        expect(r.exit_code).to eq(0)
       end
     end
   end
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index fbfac1672a..3362daeb27 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -95,61 +95,61 @@ class { 'apache::mod::passenger': }
       end
 
       describe service(service_name) do
-        it { should be_enabled }
-        it { should be_running }
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
       end
 
       describe file(conf_file) do
-        it { should contain "PassengerRoot \"#{passenger_root}\"" }
+        it { is_expected.to contain "PassengerRoot \"#{passenger_root}\"" }
 
         case fact('operatingsystem')
         when 'Ubuntu'
           case fact('lsbdistrelease')
           when '10.04'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           when '12.04'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           when '14.04'
-            it { should contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerRuby/" }
+            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerRuby/" }
           else
             # This may or may not work on Ubuntu releases other than the above
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           end
         when 'Debian'
           case fact('lsbdistcodename')
           when 'wheezy'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           else
             # This may or may not work on Debian releases other than the above
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           end
         end
       end
 
       describe file(load_file) do
-        it { should contain "LoadModule passenger_module #{passenger_module_path}" }
+        it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
       end
 
       it 'should output status via passenger-memory-stats' do
         shell("sudo /usr/sbin/passenger-memory-stats") do |r|
-          r.stdout.should =~ /Apache processes/
-          r.stdout.should =~ /Nginx processes/
-          r.stdout.should =~ /Passenger processes/
+          expect(r.stdout).to match(/Apache processes/)
+          expect(r.stdout).to match(/Nginx processes/)
+          expect(r.stdout).to match(/Passenger processes/)
 
           # passenger-memory-stats output on Ubuntu 14.04 does not contain
           # these two lines
           unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
-            r.stdout.should =~ /### Processes: [0-9]+/
-            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+            expect(r.stdout).to match(/### Processes: [0-9]+/)
+            expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
           end
 
-          r.exit_code.should == 0
+          expect(r.exit_code).to eq(0)
         end
       end
 
@@ -160,28 +160,28 @@ class { 'apache::mod::passenger': }
           # xml output not available on ubunutu <= 10.04, so sticking with default pool output
           shell("sudo /usr/sbin/passenger-status") do |r|
             # spacing may vary
-            r.stdout.should =~ /[\-]+ General information [\-]+/
+            expect(r.stdout).to match(/[\-]+ General information [\-]+/)
             if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
-              r.stdout.should =~ /Max pool size[ ]+: [0-9]+/
-              r.stdout.should =~ /Processes[ ]+: [0-9]+/
-              r.stdout.should =~ /Requests in top-level queue[ ]+: [0-9]+/
+              expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/)
+              expect(r.stdout).to match(/Processes[ ]+: [0-9]+/)
+              expect(r.stdout).to match(/Requests in top-level queue[ ]+: [0-9]+/)
             else
-              r.stdout.should =~ /max[ ]+= [0-9]+/
-              r.stdout.should =~ /count[ ]+= [0-9]+/
-              r.stdout.should =~ /active[ ]+= [0-9]+/
-              r.stdout.should =~ /inactive[ ]+= [0-9]+/
-              r.stdout.should =~ /Waiting on global queue: [0-9]+/
+              expect(r.stdout).to match(/max[ ]+= [0-9]+/)
+              expect(r.stdout).to match(/count[ ]+= [0-9]+/)
+              expect(r.stdout).to match(/active[ ]+= [0-9]+/)
+              expect(r.stdout).to match(/inactive[ ]+= [0-9]+/)
+              expect(r.stdout).to match(/Waiting on global queue: [0-9]+/)
             end
 
-            r.exit_code.should == 0
+            expect(r.exit_code).to eq(0)
           end
         end
       end
 
       it 'should answer to passenger.example.com' do
         shell("/usr/bin/curl passenger.example.com:80") do |r|
-          r.stdout.should =~ /^hello <b>world<\/b>$/
-          r.exit_code.should == 0
+          expect(r.stdout).to match(/^hello <b>world<\/b>$/)
+          expect(r.exit_code).to eq(0)
         end
       end
 
@@ -240,50 +240,50 @@ class { 'apache::mod::passenger':
         end
 
         describe service(service_name) do
-          it { should be_enabled }
-          it { should be_running }
+          it { is_expected.to be_enabled }
+          it { is_expected.to be_running }
         end
 
         describe file(conf_file) do
-          it { should contain "PassengerRoot #{passenger_root}" }
-          it { should contain "PassengerRuby #{passenger_ruby}" }
-          it { should contain "PassengerTempDir #{passenger_tempdir}" }
+          it { is_expected.to contain "PassengerRoot #{passenger_root}" }
+          it { is_expected.to contain "PassengerRuby #{passenger_ruby}" }
+          it { is_expected.to contain "PassengerTempDir #{passenger_tempdir}" }
         end
 
         describe file(load_file) do
-          it { should contain "LoadModule passenger_module #{passenger_module_path}" }
+          it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
         end
 
         it 'should output status via passenger-memory-stats' do
           shell("sudo /usr/bin/passenger-memory-stats") do |r|
-            r.stdout.should =~ /Apache processes/
-            r.stdout.should =~ /Nginx processes/
-            r.stdout.should =~ /Passenger processes/
-            r.stdout.should =~ /### Processes: [0-9]+/
-            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+            expect(r.stdout).to match(/Apache processes/)
+            expect(r.stdout).to match(/Nginx processes/)
+            expect(r.stdout).to match(/Passenger processes/)
+            expect(r.stdout).to match(/### Processes: [0-9]+/)
+            expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
 
-            r.exit_code.should == 0
+            expect(r.exit_code).to eq(0)
           end
         end
 
         it 'should output status via passenger-status' do
           shell("sudo PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
             # spacing may vary
-            r.stdout.should =~ /[\-]+ General information [\-]+/
-            r.stdout.should =~ /max[ ]+= [0-9]+/
-            r.stdout.should =~ /count[ ]+= [0-9]+/
-            r.stdout.should =~ /active[ ]+= [0-9]+/
-            r.stdout.should =~ /inactive[ ]+= [0-9]+/
-            r.stdout.should =~ /Waiting on global queue: [0-9]+/
+            expect(r.stdout).to match(/[\-]+ General information [\-]+/)
+            expect(r.stdout).to match(/max[ ]+= [0-9]+/)
+            expect(r.stdout).to match(/count[ ]+= [0-9]+/)
+            expect(r.stdout).to match(/active[ ]+= [0-9]+/)
+            expect(r.stdout).to match(/inactive[ ]+= [0-9]+/)
+            expect(r.stdout).to match(/Waiting on global queue: [0-9]+/)
 
-            r.exit_code.should == 0
+            expect(r.exit_code).to eq(0)
           end
         end
 
         it 'should answer to passenger.example.com' do
           shell("/usr/bin/curl passenger.example.com:80") do |r|
-            r.stdout.should =~ /^hello <b>world<\/b>$/
-            r.exit_code.should == 0
+            expect(r.stdout).to match(/^hello <b>world<\/b>$/)
+            expect(r.exit_code).to eq(0)
           end
         end
       end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index cf8054053e..0b46dbc66f 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -37,18 +37,18 @@ class { 'apache::mod::php': }
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     describe file("#{mod_dir}/php5.conf") do
-      it { should contain "DirectoryIndex index.php" }
+      it { is_expected.to contain "DirectoryIndex index.php" }
     end
 
     it 'should answer to php.example.com' do
       shell("/usr/bin/curl php.example.com:80") do |r|
-        r.stdout.should =~ /PHP Version/
-        r.exit_code.should == 0
+        expect(r.stdout).to match(/PHP Version/)
+        expect(r.exit_code).to eq(0)
       end
     end
   end
@@ -78,19 +78,19 @@ class { 'apache::mod::php':
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     describe file("#{vhost_dir}/25-php.example.com.conf") do
-      it { should contain "  php_admin_flag engine on" }
-      it { should contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
+      it { is_expected.to contain "  php_admin_flag engine on" }
+      it { is_expected.to contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
     end
 
     it 'should answer to php.example.com' do
       shell("/usr/bin/curl php.example.com:80") do |r|
-        r.stdout.should =~ /\/usr\/share\/pear\//
-        r.exit_code.should == 0
+        expect(r.stdout).to match(/\/usr\/share\/pear\//)
+        expect(r.exit_code).to eq(0)
       end
     end
   end
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index f015f99941..eab162b1a3 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -32,8 +32,8 @@ class { 'apache::mod::proxy_html': }
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
   end
 end
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 9e26731d61..1b91581441 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -27,14 +27,14 @@ class { 'apache::mod::suphp': }
       end
 
       describe service('apache2') do
-        it { should be_enabled }
-        it { should be_running }
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
       end
 
       it 'should answer to suphp.example.com' do
         shell("/usr/bin/curl suphp.example.com:80") do |r|
-          r.stdout.should =~ /^daemon$/
-          r.exit_code.should == 0
+          expect(r.stdout).to match(/^daemon$/)
+          expect(r.exit_code).to eq(0)
         end
       end
     end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index beffe0a014..562ff5323d 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -28,8 +28,8 @@ class { 'apache':
     end
 
     describe service(servicename) do
-      it { should be_running }
-      it { should be_enabled }
+      it { is_expected.to be_running }
+      it { is_expected.to be_enabled }
     end
   end
 end
@@ -51,8 +51,8 @@ class { 'apache':
   end
 
   describe service(servicename) do
-    it { should be_running }
-    it { should be_enabled }
+    it { is_expected.to be_running }
+    it { is_expected.to be_enabled }
   end
 end
 
@@ -73,7 +73,7 @@ class { 'apache':
   end
 
   describe service(servicename) do
-    it { should be_running }
-    it { should be_enabled }
+    it { is_expected.to be_running }
+    it { is_expected.to be_enabled }
   end
 end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index c43d3f9e9e..259581c54f 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -16,11 +16,11 @@ class { 'apache':
     end
 
     describe file("#{$vhost_dir}/15-default.conf") do
-      it { should_not be_file }
+      it { is_expected.not_to be_file }
     end
 
     describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should_not be_file }
+      it { is_expected.not_to be_file }
     end
   end
 
@@ -34,11 +34,11 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/15-default.conf") do
-      it { should contain '<VirtualHost \*:80>' }
+      it { is_expected.to contain '<VirtualHost \*:80>' }
     end
 
     describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should_not be_file }
+      it { is_expected.not_to be_file }
     end
   end
 
@@ -59,12 +59,12 @@ class { 'apache':
     end
 
     describe file("#{$vhost_dir}/15-default.conf") do
-      it { should contain '<VirtualHost \*:80>' }
+      it { is_expected.to contain '<VirtualHost \*:80>' }
     end
 
     describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should contain '<VirtualHost \*:443>' }
-      it { should contain "SSLEngine on" }
+      it { is_expected.to contain '<VirtualHost \*:443>' }
+      it { is_expected.to contain "SSLEngine on" }
     end
   end
 
@@ -87,8 +87,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-first.example.com.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-      it { should contain "ServerName first.example.com" }
+      it { is_expected.to contain '<VirtualHost \*:80>' }
+      it { is_expected.to contain "ServerName first.example.com" }
     end
   end
 
@@ -109,11 +109,11 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-      it { should contain "ServerName proxy.example.com" }
-      it { should contain "ProxyPass" }
-      it { should contain "ProxyPreserveHost On" }
-      it { should_not contain "<Proxy \*>" }
+      it { is_expected.to contain '<VirtualHost \*:80>' }
+      it { is_expected.to contain "ServerName proxy.example.com" }
+      it { is_expected.to contain "ProxyPass" }
+      it { is_expected.to contain "ProxyPreserveHost On" }
+      it { is_expected.not_to contain "<Proxy \*>" }
     end
   end
 
@@ -144,19 +144,19 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     it 'should answer to first.example.com' do
       shell("/usr/bin/curl first.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from first\n"
+        expect(r.stdout).to eq("Hello from first\n")
       end
     end
 
     it 'should answer to second.example.com' do
       shell("/usr/bin/curl second.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from second\n"
+        expect(r.stdout).to eq("Hello from second\n")
       end
     end
   end
@@ -196,13 +196,13 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
       end
 
       it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
+        expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout).to eq("Hello World\n")
+        expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr).to match(/curl: \(22\) The requested URL returned error: 403/)
       end
     end
 
@@ -254,15 +254,15 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
       end
 
       it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout.should eq("Hello Foo\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
-        shell("/usr/bin/curl -sSf files.example.net:80/bar/bar.html").stdout.should eq("Hello Bar\n")
+        expect(shell("/usr/bin/curl -sSf files.example.net:80/").stdout).to eq("Hello World\n")
+        expect(shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout).to eq("Hello Foo\n")
+        expect(shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr).to match(/curl: \(22\) The requested URL returned error: 403/)
+        expect(shell("/usr/bin/curl -sSf files.example.net:80/bar/bar.html").stdout).to eq("Hello Bar\n")
       end
     end
 
@@ -288,13 +288,13 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
       end
 
       it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout.should match(/Scoreboard: /)
+        expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout).to eq("Hello World\n")
+        expect(shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout).to match(/Scoreboard: /)
       end
     end
   end
@@ -319,13 +319,13 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
       end
 
       it 'should answer to fallback.example.net' do
         shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist") do |r|
-          r.stdout.should == "Hello World\n"
+          expect(r.stdout).to eq("Hello World\n")
         end
       end
 
@@ -360,19 +360,19 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     it 'should answer to a.virt.example.com' do
       shell("/usr/bin/curl a.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from a.virt\n"
+        expect(r.stdout).to eq("Hello from a.virt\n")
       end
     end
 
     it 'should answer to b.virt.example.com' do
       shell("/usr/bin/curl b.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from b.virt\n"
+        expect(r.stdout).to eq("Hello from b.virt\n")
       end
     end
   end
@@ -406,14 +406,14 @@ class { 'apache': default_vhost => false, }
     end
 
     describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
 
     it 'should get a response from the back end' do
       shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
-        r.stdout.should == "Hello from localhost\n"
-        r.exit_code.should == 0
+        expect(r.stdout).to eq("Hello from localhost\n")
+        expect(r.exit_code).to eq(0)
       end
     end
   end
@@ -433,8 +433,8 @@ class { 'apache': }
     end
 
     describe file($ports_file) do
-      it { should be_file }
-      it { should_not contain 'NameVirtualHost test.server' }
+      it { is_expected.to be_file }
+      it { is_expected.not_to contain 'NameVirtualHost test.server' }
     end
   end
 
@@ -455,9 +455,9 @@ class { 'apache': default_vhost => false }
     end
 
     describe file($ports_file) do
-      it { should be_file }
-      it { should_not contain 'Listen 80' }
-      it { should contain 'Listen 81' }
+      it { is_expected.to be_file }
+      it { is_expected.not_to contain 'Listen 80' }
+      it { is_expected.to contain 'Listen 81' }
     end
   end
 
@@ -479,10 +479,10 @@ class { 'apache': }
     end
 
     describe file('/tmp/test') do
-      it { should be_directory }
-      it { should be_owned_by 'test_owner' }
-      it { should be_grouped_into 'test_group' }
-      it { should be_mode 750 }
+      it { is_expected.to be_directory }
+      it { is_expected.to be_owned_by 'test_owner' }
+      it { is_expected.to be_grouped_into 'test_group' }
+      it { is_expected.to be_mode 750 }
     end
   end
 
@@ -500,18 +500,18 @@ class { 'apache': }
     end
 
     describe file($ports_file) do
-      it { should be_file }
+      it { is_expected.to be_file }
       if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-        it { should_not contain 'NameVirtualHost test.server' }
+        it { is_expected.not_to contain 'NameVirtualHost test.server' }
       elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10)/
-        it { should_not contain 'NameVirtualHost test.server' }
+        it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
-        it { should contain 'NameVirtualHost test.server' }
+        it { is_expected.to contain 'NameVirtualHost test.server' }
       end
     end
 
     describe file("#{$vhost_dir}/10-test.server.conf") do
-      it { should be_file }
+      it { is_expected.to be_file }
     end
   end
 
@@ -529,8 +529,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Options Indexes FollowSymLinks ExecCGI' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Options Indexes FollowSymLinks ExecCGI' }
     end
   end
 
@@ -548,8 +548,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'AllowOverride All' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'AllowOverride All' }
     end
   end
 
@@ -567,8 +567,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '  CustomLog "/tmp' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain '  CustomLog "/tmp' }
     end
   end
 
@@ -595,8 +595,8 @@ class { 'apache': }
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should_not contain "  #{logname} \"/tmp" }
+        it { is_expected.to be_file }
+        it { is_expected.not_to contain "  #{logname} \"/tmp" }
       end
     end
 
@@ -615,8 +615,8 @@ class { 'apache': }
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain "  #{logname} \"|/bin/sh" }
+        it { is_expected.to be_file }
+        it { is_expected.to contain "  #{logname} \"|/bin/sh" }
       end
     end
 
@@ -635,8 +635,8 @@ class { 'apache': }
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain "  #{logname} \"syslog\"" }
+        it { is_expected.to be_file }
+        it { is_expected.to contain "  #{logname} \"syslog\"" }
       end
     end
   end
@@ -657,8 +657,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'CustomLog "syslog" "%h %l"' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'CustomLog "syslog" "%h %l"' }
     end
   end
 
@@ -678,8 +678,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'CustomLog "syslog" combined env=admin' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'CustomLog "syslog" combined env=admin' }
     end
   end
 
@@ -697,8 +697,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Alias /image "/ftp/pub/image"' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Alias /image "/ftp/pub/image"' }
     end
   end
 
@@ -716,8 +716,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ScriptAlias /myscript "/usr/share/myscript"' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
     end
   end
 
@@ -735,8 +735,8 @@ class { 'apache': service_ensure => stopped, }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ProxyPass          / test2/' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ProxyPass          / test2/' }
     end
   end
 
@@ -755,8 +755,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Action php-fastcgi /cgi-bin virtual' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Action php-fastcgi /cgi-bin virtual' }
     end
   end
 
@@ -776,10 +776,10 @@ class { 'apache': service_ensure => stopped, }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain "suPHP_AddHandler #{$suphp_handler}" }
-      it { should contain 'suPHP_Engine on' }
-      it { should contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" }
+      it { is_expected.to be_file }
+      it { is_expected.to contain "suPHP_AddHandler #{$suphp_handler}" }
+      it { is_expected.to contain 'suPHP_Engine on' }
+      it { is_expected.to contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" }
     end
   end
 
@@ -798,9 +798,9 @@ class { 'apache': service_ensure => stopped, }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ProxyPass          / http://test2/' }
-      it { should contain 'ProxyPass        http://test2/test !' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ProxyPass          / http://test2/' }
+      it { is_expected.to contain 'ProxyPass        http://test2/test !' }
     end
   end
 
@@ -820,8 +820,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Redirect permanent /images http://test.server/' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Redirect permanent /images http://test.server/' }
     end
   end
 
@@ -848,8 +848,8 @@ class { 'apache': }
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain 'RackBaseURI /test' }
+        it { is_expected.to be_file }
+        it { is_expected.to contain 'RackBaseURI /test' }
       end
     end
   end
@@ -869,8 +869,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'append MirrorID "mirror 12"' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'append MirrorID "mirror 12"' }
     end
   end
 
@@ -893,10 +893,10 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '#test' }
-      it { should contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
-      it { should contain 'RewriteRule ^index.html$ welcome.html' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain '#test' }
+      it { is_expected.to contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
+      it { is_expected.to contain 'RewriteRule ^index.html$ welcome.html' }
     end
   end
 
@@ -915,9 +915,9 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'SetEnv TEST /test' }
-      it { should contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SetEnv TEST /test' }
+      it { is_expected.to contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
     end
   end
 
@@ -935,8 +935,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
     end
   end
 
@@ -980,13 +980,13 @@ class { 'apache::mod::wsgi': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
-      it { should be_file }
-      it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
-      it { should contain 'WSGIDaemonProcess wsgi processes=2' }
-      it { should contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
-      it { should contain 'WSGIProcessGroup nobody' }
-      it { should contain 'WSGIScriptAlias /test "/test1"' }
-      it { should contain 'WSGIPassAuthorization On' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
+      it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
+      it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
+      it { is_expected.to contain 'WSGIProcessGroup nobody' }
+      it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
+      it { is_expected.to contain 'WSGIPassAuthorization On' }
     end
   end
 
@@ -1004,8 +1004,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '#weird test string' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain '#weird test string' }
     end
   end
 
@@ -1023,8 +1023,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'AssignUserId nobody nobody' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'AssignUserId nobody nobody' }
     end
   end
 
@@ -1047,9 +1047,9 @@ class { 'apache::mod::fastcgi': }
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
-        it { should contain '<Directory "/tmp/fast">' }
+        it { is_expected.to be_file }
+        it { is_expected.to contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
+        it { is_expected.to contain '<Directory "/tmp/fast">' }
       end
     end
   end
@@ -1089,8 +1089,8 @@ class { 'apache': }
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Include "/apache_spec/include"' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Include "/apache_spec/include"' }
     end
   end
 

From ae714e0fa7dda9a741c1cefef7541815366582a8 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 2 Jun 2014 09:17:47 -0600
Subject: [PATCH 0267/2267] MODULES-1065: Add ThreadLimit to mod::worker

---
 manifests/mod/worker.pp         |  2 ++
 spec/classes/mod/worker_spec.rb | 47 +++++++++++++++++++++++++++++++++
 templates/mod/worker.conf.erb   |  1 +
 3 files changed, 50 insertions(+)

diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 3251a1a0ed..0d2815964b 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -6,6 +6,7 @@
   $threadsperchild     = '25',
   $maxrequestsperchild = '0',
   $serverlimit         = '25',
+  $threadlimit         = '64',
   $apache_version      = $::apache::apache_version,
 ) {
   if defined(Class['apache::mod::event']) {
@@ -34,6 +35,7 @@
   # - $threadsperchild
   # - $maxrequestsperchild
   # - $serverlimit
+  # - $threadLimit
   file { "${::apache::mod_dir}/worker.conf":
     ensure  => file,
     content => template('apache/mod/worker.conf.erb'),
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index a8176c570d..e6cca61860 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -96,4 +96,51 @@
     it { should_not contain_apache__mod('worker') }
     it { should contain_file("/usr/local/etc/apache22/Modules/worker.conf").with_ensure('file') }
   end
+
+  # Template config doesn't vary by distro
+  context "on all distros" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    context 'defaults' do
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+25$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+2$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+150$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+25$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+75$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+25$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+0$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+64$/) }
+    end
+
+    context 'setting params' do
+      let :params do
+        {
+          :serverlimit          => 10,
+          :startservers         => 11,
+          :maxclients           => 12,
+          :minsparethreads      => 13,
+          :maxsparethreads      => 14,
+          :threadsperchild      => 15,
+          :maxrequestsperchild  => 16,
+          :threadlimit          => 17
+        }
+      end
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+10$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+11$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+12$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+13$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+14$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+15$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+16$/) }
+      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+17$/) }
+    end
+  end
 end
diff --git a/templates/mod/worker.conf.erb b/templates/mod/worker.conf.erb
index f0bba39085..597e05f8d5 100644
--- a/templates/mod/worker.conf.erb
+++ b/templates/mod/worker.conf.erb
@@ -6,4 +6,5 @@
   MaxSpareThreads     <%= @maxsparethreads %>
   ThreadsPerChild     <%= @threadsperchild %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
+  ThreadLimit         <%= @threadlimit %>
 </IfModule>

From aa012cf397e5bc54c1fab6bb1755f826c7673e1f Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Mon, 9 Jun 2014 11:28:15 -0400
Subject: [PATCH 0268/2267] Pin rspec to 2.x.

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index 0ad4ddffca..ae7ff8c56b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
   gem 'rake', '10.1.1',          :require => false
+  gem 'rspec', '~> 2.11',        :require => false
   gem 'rspec-puppet', '>=1.0.0', :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'serverspec',              :require => false

From 3ad5b244c947b173007df5b27da48376284eb438 Mon Sep 17 00:00:00 2001
From: Travis Fields <cyberious@users.noreply.github.com>
Date: Mon, 9 Jun 2014 08:37:48 -0700
Subject: [PATCH 0269/2267] Pin rspec to ~> 2.11

---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 0ad4ddffca..fc45295a10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,8 @@ group :development, :test do
   gem 'puppet-lint',             :require => false
   gem 'beaker',                  :require => false
   gem 'beaker-rspec',            :require => false
-end
+  gem 'rspec', '~> 2.11',        :require => false
+end  
 
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false

From 0925fc2991841c1d59bfcdc820eef2b9dcb4e830 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 9 Jun 2014 13:12:37 -0400
Subject: [PATCH 0270/2267] Delete gentoo a2mod tests.

The tests are broken and we don't support gentoo, so deleting.
---
 spec/unit/provider/a2mod/gentoo_spec.rb | 184 ------------------------
 1 file changed, 184 deletions(-)
 delete mode 100644 spec/unit/provider/a2mod/gentoo_spec.rb

diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
deleted file mode 100644
index ddb9dddda4..0000000000
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-provider_class = Puppet::Type.type(:a2mod).provider(:gentoo)
-
-describe provider_class do
-  before :each do
-    provider_class.clear
-  end
-
-  [:conf_file, :instances, :modules, :initvars, :conf_file, :clear].each do |method|
-    it "should respond to the class method #{method}" do
-      provider_class.should respond_to(method)
-    end
-  end
-
-  describe "when fetching modules" do
-    before do
-      @filetype = mock()
-    end
-
-    it "should return a sorted array of the defined parameters" do
-      @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
-      provider_class.expects(:filetype).returns(@filetype)
-
-      provider_class.modules.should == %w{bar baz foo}
-    end
-
-    it "should cache the module list" do
-      @filetype.expects(:read).once.returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
-      provider_class.expects(:filetype).once.returns(@filetype)
-
-      2.times { provider_class.modules.should == %w{bar baz foo} }
-    end
-
-    it "should normalize parameters" do
-      @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAR"\n})
-      provider_class.expects(:filetype).returns(@filetype)
-
-      provider_class.modules.should == %w{bar foo}
-    end
-  end
-
-  describe "when prefetching" do
-    it "should match providers to resources" do
-      provider = mock("ssl_provider", :name => "ssl")
-      resource = mock("ssl_resource")
-      resource.expects(:provider=).with(provider)
-
-      provider_class.expects(:instances).returns([provider])
-      provider_class.prefetch("ssl" => resource)
-    end
-  end
-
-  describe "when flushing" do
-    before :each do
-      @filetype = mock()
-      @filetype.stubs(:backup)
-      provider_class.expects(:filetype).at_least_once.returns(@filetype)
-
-      @info = mock()
-      @info.stubs(:[]).with(:name).returns("info")
-      @info.stubs(:provider=)
-
-      @mpm = mock()
-      @mpm.stubs(:[]).with(:name).returns("mpm")
-      @mpm.stubs(:provider=)
-
-      @ssl = mock()
-      @ssl.stubs(:[]).with(:name).returns("ssl")
-      @ssl.stubs(:provider=)
-    end
-
-    it "should add modules whose ensure is present" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D INFO"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      provider_class.flush
-    end
-
-    it "should remove modules whose ensure is present" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-D INFO"})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS=""})
-
-      @info.stubs(:should).with(:ensure).returns(:absent)
-      @info.stubs(:provider=)
-      provider_class.prefetch("info" => @info)
-
-      provider_class.flush
-    end
-
-    it "should not modify providers without resources" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-D INFO -D MPM"})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D MPM -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:absent)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should write the modules in sorted order" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D INFO -D MPM -D SSL"})
-
-      @mpm.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("mpm" => @mpm)
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should write the records back once" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should only modify the line containing APACHE2_OPTS" do
-      @filetype.expects(:read).at_least_once.returns(%Q{# Comment\nAPACHE2_OPTS=""\n# Another comment})
-      @filetype.expects(:write).once.with(%Q{# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      provider_class.flush
-    end
-
-    it "should restore any arbitrary arguments" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-Y -D MPM -X"})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-Y -X -D INFO -D MPM"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      provider_class.flush
-    end
-
-    it "should backup the file once if changes were made" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      @filetype.unstub(:backup)
-      @filetype.expects(:backup)
-      provider_class.flush
-    end
-
-    it "should not write the file or run backups if no changes were made" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-X -D INFO -D SSL -Y"})
-      @filetype.expects(:write).never
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      @filetype.unstub(:backup)
-      @filetype.expects(:backup).never
-      provider_class.flush
-    end
-  end
-end

From 198aa99e8e5925cd1bdf9bfd832f0e923e4e8a2b Mon Sep 17 00:00:00 2001
From: "Angel L. Mateo" <amateo@um.es>
Date: Thu, 3 Apr 2014 13:09:37 +0200
Subject: [PATCH 0271/2267] Add parameters to configure negotiation module

---
 README.md                                    | 23 ++++++
 manifests/mod/negotiation.pp                 | 11 ++-
 spec/acceptance/mod_negotiation_spec.rb      | 80 ++++++++++++++++++++
 spec/classes/mod/negotiation_spec.rb         | 59 +++++++++++++++
 spec/fixtures/files/negotiation.conf         |  4 +
 spec/fixtures/templates/negotiation.conf.erb |  4 +
 templates/mod/negotiation.conf.erb           |  4 +-
 7 files changed, 182 insertions(+), 3 deletions(-)
 create mode 100644 spec/acceptance/mod_negotiation_spec.rb
 create mode 100644 spec/classes/mod/negotiation_spec.rb
 create mode 100644 spec/fixtures/files/negotiation.conf
 create mode 100644 spec/fixtures/templates/negotiation.conf.erb

diff --git a/README.md b/README.md
index 385130df31..7f4ff7ed8e 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@
         * [Class: apache::mod::ssl](#class-apachemodssl)
         * [Class: apache::mod::wsgi](#class-apachemodwsgi)
         * [Class: apache::mod::fcgid](#class-apachemodfcgid)
+        * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
         * [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)
@@ -641,6 +642,28 @@ It is also possible to set the FcgidWrapper per directory per vhost. You must en
 
 See [FcgidWrapper documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#fcgidwrapper) for more information.
 
+####Class: `apache::mod::negotiation`
+
+Installs and configures mod_negotiation. If there are not provided any
+parameter, default apache mod_negotiation configuration is done.
+
+```puppet
+  class { '::apache::mod::negotiation':
+    force_language_priority => 'Prefer',
+    language_priority       => [ 'es', 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo' ],
+  }
+```
+
+**Parameters within `apache::mod::negotiation`:**
+
+#####`force_language_priority`
+
+A string that sets the `ForceLanguagePriority` option. Defaults to `Prefer Fallback`.
+
+#####`language_priority`
+
+An array of languages to set the `LanguagePriority` option of the module.
+
 ####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.
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index eff685b15c..af36b5bd82 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -1,4 +1,13 @@
-class apache::mod::negotiation {
+class apache::mod::negotiation (
+  $force_language_priority = 'Prefer Fallback',
+  $language_priority = [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+                        'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
+                        'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
+                        'zh-TW' ],
+) {
+  validate_string($force_language_priority)
+  validate_array($language_priority)
+
   ::apache::mod { 'negotiation': }
   # Template uses no variables
   file { 'negotiation.conf':
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
new file mode 100644
index 0000000000..33dcdd982d
--- /dev/null
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -0,0 +1,80 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::negotiation class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  case fact('osfamily')
+  when 'Debian'
+    vhost_dir    = '/etc/apache2/sites-enabled'
+    mod_dir      = '/etc/apache2/mods-available'
+    service_name = 'apache2'
+  when 'RedHat'
+    vhost_dir    = '/etc/httpd/conf.d'
+    mod_dir      = '/etc/httpd/conf.d'
+    service_name = 'httpd'
+  when 'FreeBSD'
+    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
+    mod_dir      = '/usr/local/etc/apache22/Modules'
+    service_name = 'apache22'
+  end
+
+  context "default negotiation config" do
+    it 'succeeds in puppeting negotiation' do
+      pp= <<-EOS
+        class { '::apache': }
+        class { '::apache::mod::negotiation': }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$mod_dir}/negotiation.conf") do
+      it { should contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+ForceLanguagePriority Prefer Fallback" }
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+  end
+
+  context "with alternative force_language_priority" do
+    it 'succeeds in puppeting negotiation' do
+      pp= <<-EOS
+        class { '::apache': }
+        class { '::apache::mod::negotiation':
+          force_language_priority => 'Prefer',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$mod_dir}/negotiation.conf") do
+      it { should contain "ForceLanguagePriority Prefer" }
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+  end
+
+  context "with alternative language_priority" do
+    it 'succeeds in puppeting negotiation' do
+      pp= <<-EOS
+        class { '::apache': }
+        class { '::apache::mod::negotiation':
+          language_priority => [ 'en', 'es' ],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$mod_dir}/negotiation.conf") do
+      it { should contain "LanguagePriority en es" }
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+  end
+end
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
new file mode 100644
index 0000000000..a5d4ba92d2
--- /dev/null
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe 'apache::mod::negotiation', :type => :class do
+  describe "OS independent tests" do
+
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    context "default params" do
+      let :pre_condition do
+        'class {"::apache": }'
+      end
+      it { should contain_class("apache") }
+      it do
+        should contain_file('negotiation.conf').with( {
+          :ensure  => 'file',
+          :content => 'LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+ForceLanguagePriority Prefer Fallback
+',
+        } )
+      end
+    end
+
+    context 'with force_language_priority parameter' do
+      let :pre_condition do
+        'class {"::apache": default_mods => ["negotiation"]}'
+      end
+      let :params do
+        { :force_language_priority => 'Prefer' }
+      end
+      it do
+        should contain_file('negotiation.conf').with( {
+          :ensure  => 'file',
+          :content => /^ForceLanguagePriority Prefer$/,
+        } )
+      end
+    end
+
+    context 'with language_priority parameter' do
+      let :pre_condition do
+        'class {"::apache": default_mods => ["negotiation"]}'
+      end
+      let :params do
+        { :language_priority => [ 'en', 'es' ] }
+      end
+      it do
+        should contain_file('negotiation.conf').with( {
+          :ensure  => 'file',
+          :content => /^LanguagePriority en es$/,
+        } )
+      end
+    end
+  end
+end
diff --git a/spec/fixtures/files/negotiation.conf b/spec/fixtures/files/negotiation.conf
new file mode 100644
index 0000000000..c0bb8b9fd2
--- /dev/null
+++ b/spec/fixtures/files/negotiation.conf
@@ -0,0 +1,4 @@
+# This is a file only for spec testing
+
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+ForceLanguagePriority Prefer Fallback
diff --git a/spec/fixtures/templates/negotiation.conf.erb b/spec/fixtures/templates/negotiation.conf.erb
new file mode 100644
index 0000000000..5575022463
--- /dev/null
+++ b/spec/fixtures/templates/negotiation.conf.erb
@@ -0,0 +1,4 @@
+# This is a template only for spec testing
+
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+ForceLanguagePriority Prefer Fallback
diff --git a/templates/mod/negotiation.conf.erb b/templates/mod/negotiation.conf.erb
index 50921019bc..55b2ab5299 100644
--- a/templates/mod/negotiation.conf.erb
+++ b/templates/mod/negotiation.conf.erb
@@ -1,2 +1,2 @@
-LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
-ForceLanguagePriority Prefer Fallback
+LanguagePriority <%= @language_priority.join(' ') %>
+ForceLanguagePriority <%= @force_language_priority %>

From a306c0c77f39c55661bf0f8048845f3b5c64e322 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 11 Jun 2014 14:22:28 -0400
Subject: [PATCH 0272/2267] Add test case for graceful failure on OSX.

---
 spec/classes/apache_spec.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 6e0b705333..429ab805b0 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -540,4 +540,18 @@
       it { should contain_apache__vhost('default-ssl').with_ensure('present') }
     end
   end
+  context 'with unsupported osfamily' do
+    let :facts do
+      { :osfamily        => 'Darwin',
+        :operatingsystemrelease => '13.1.0',
+        :concat_basedir         => '/dne',
+      }
+    end
+
+    it do
+      expect {
+       should compile
+      }.to raise_error(Puppet::Error, /Unsupported osfamily/)
+    end
+  end
 end

From 9f19e32a89b0dc4a1ac0d7355b8db3bbf92fff70 Mon Sep 17 00:00:00 2001
From: "Angel L. Mateo" <amateo@um.es>
Date: Thu, 12 Jun 2014 08:28:14 +0200
Subject: [PATCH 0273/2267] * force_language_priority can be now an array and
 language_priority a string * coerce parameters to an array

---
 manifests/mod/negotiation.pp       | 8 ++++++--
 templates/mod/negotiation.conf.erb | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index af36b5bd82..0bdbfdc3cc 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -5,8 +5,12 @@
                         'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
                         'zh-TW' ],
 ) {
-  validate_string($force_language_priority)
-  validate_array($language_priority)
+  if !is_array($force_language_priority) and !is_string($force_language_priority) {
+    fail('force_languague_priority must be a string or array of strings')
+  }
+  if !is_array($language_priority) and !is_string($language_priority) {
+    fail('force_languague_priority must be a string or array of strings')
+  }
 
   ::apache::mod { 'negotiation': }
   # Template uses no variables
diff --git a/templates/mod/negotiation.conf.erb b/templates/mod/negotiation.conf.erb
index 55b2ab5299..2fb4700d68 100644
--- a/templates/mod/negotiation.conf.erb
+++ b/templates/mod/negotiation.conf.erb
@@ -1,2 +1,2 @@
-LanguagePriority <%= @language_priority.join(' ') %>
-ForceLanguagePriority <%= @force_language_priority %>
+LanguagePriority <%= Array(@language_priority).join(' ') %>
+ForceLanguagePriority <%= Array(@force_language_priority).join(' ') %>

From 2d58357042e7681ae169d01e1a403cc805627037 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 15 Jun 2014 11:13:40 +0200
Subject: [PATCH 0274/2267] Add the Satisfy parameter to the directory
 fragment.

---
 README.md                        | 14 ++++++
 spec/acceptance/vhost_spec.rb    | 78 ++++++++++++++++++++++++++++++++
 spec/defines/vhost_spec.rb       | 10 ++++
 templates/vhost/_directories.erb |  3 ++
 4 files changed, 105 insertions(+)

diff --git a/README.md b/README.md
index 385130df31..d66092b390 100644
--- a/README.md
+++ b/README.md
@@ -1413,6 +1413,20 @@ Sets the order of processing Allow and Deny statements as per [Apache core docum
     }
 ```
 
+######`satisfy`
+
+Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower.
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path    => '/path/to/directory',
+          satisfy => 'Any',
+        }
+      ],
+    }
+
 ######`sethandler`
 
 Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index c43d3f9e9e..38f40f7917 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -297,6 +297,84 @@ class { 'apache': }
         shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout.should match(/Scoreboard: /)
       end
     end
+
+  describe 'Satisfy and Auth directive' do
+      it 'should configure a vhost with Satisfy and Auth directive' do
+        pp = <<-EOS
+          class { 'apache': }
+          host { 'files.example.net': ip => '127.0.0.1', }
+          apache::vhost { 'files.example.net':
+            docroot     => '/var/www/files',
+            directories => [
+              {
+                path => '/var/www/files/foo',
+                auth_type => 'Basic',
+                auth_name => 'Basic Auth',
+                auth_user_file => '/var/www/htpasswd',
+                auth_require => "valid-user",
+              },
+              {
+                path => '/var/www/files/bar',
+                auth_type => 'Basic',
+                auth_name => 'Basic Auth',
+                auth_user_file => '/var/www/htpasswd',
+                auth_require => 'valid-user',
+                satisfy => 'Any',
+              },
+              {
+                path => '/var/www/files/baz',
+                allow => 'from 10.10.10.10',
+                auth_type => 'Basic',
+                auth_name => 'Basic Auth',
+                auth_user_file => '/var/www/htpasswd',
+                auth_require => 'valid-user',
+                satisfy => 'Any',
+              },
+            ],
+          }
+          file { '/var/www/files/foo':
+            ensure => directory,
+          }
+          file { '/var/www/files/bar':
+            ensure => directory,
+          }
+          file { '/var/www/files/baz':
+            ensure => directory,
+          }
+          file { '/var/www/files/foo/index.html':
+            ensure  => file,
+            content => "Hello World\\n",
+          }
+          file { '/var/www/files/bar/index.html':
+            ensure  => file,
+            content => "Hello World\\n",
+          }
+          file { '/var/www/files/baz/index.html':
+            ensure  => file,
+            content => "Hello World\\n",
+          }
+          file { '/var/www/htpasswd':
+            ensure  => file,
+            content => "login:IZ7jMcLSx0oQk", # "password" as password
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe service($service_name) do
+        it { should be_enabled }
+        it { should be_running }
+      end
+
+      it 'should answer to files.example.net' do
+        shell("/usr/bin/curl -sSf files.example.net:80/foo/index.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 401/)
+        shell("/usr/bin/curl -sSf -u login:password files.example.net:80/foo/index.html").stdout.should eq("Hello World\n")
+        shell("/usr/bin/curl -sSf files.example.net:80/bar/index.html").stdout.should eq("Hello World\n")
+        shell("/usr/bin/curl -sSf -u login:password files.example.net:80/bar/index.html").stdout.should eq("Hello World\n")
+        shell("/usr/bin/curl -sSf files.example.net:80/baz/index.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 401/)
+        shell("/usr/bin/curl -sSf -u login:password files.example.net:80/baz/index.html").stdout.should eq("Hello World\n")
+      end
+    end
   end
 
   case fact('lsbdistcodename')
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 4037b3011c..90a779854b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -717,6 +717,11 @@
             'order'             => 'deny,yned',
             'passenger_enabled' => 'onf',
             'sethandler'        => 'None',
+            'auth_type'         => 'Basic',
+            'auth_name'         => 'Basic Auth',
+            'auth_user_file'    => '/opt/app/htpasswd',
+            'auth_require'      => 'valid-user',
+            'satisfy'           => 'Any',
           },
           :match    => [
             /^  <Directory "\/opt\/app">$/,
@@ -728,6 +733,11 @@
             /^    Order deny,yned$/,
             /^    SetHandler None$/,
             /^    PassengerEnabled onf$/,
+            /^    AuthType Basic$/,
+            /^    AuthName "Basic Auth"$/,
+            /^    AuthUserFile \/opt\/app\/htpasswd$/,
+            /^    Require valid-user$/,
+            /^    Satisfy Any$/,
             /^  <\/Directory>$/,
           ],
         },
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index f4307c7618..ea2db8bdcb 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -63,6 +63,9 @@
       <%- else -%>
     Allow from all
       <%- end -%>
+      <%- if directory['satisfy'] and directory['satisfy'] != '' -%>
+    Satisfy <%= directory['satisfy'] %>
+      <%- end -%>
     <%- end -%>
     <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>
       <%- [directory['addhandlers']].flatten.compact.each do |addhandler| -%>

From 4f65ef399fabb8640fd4ed5c8ac647e7022b44ff Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 25 Jun 2014 08:09:10 -0700
Subject: [PATCH 0275/2267] Add configuration file for modulesync

https://github.com/puppetlabs/modulesync
---
 .sync.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .sync.yml

diff --git a/.sync.yml b/.sync.yml
new file mode 100644
index 0000000000..4ecd6afd0e
--- /dev/null
+++ b/.sync.yml
@@ -0,0 +1,20 @@
+---
+.travis.yml:
+  excludes:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+  env_matrix:
+    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    - PUPPET_GEM_VERSION="~> 3.0"
+    - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+spec/spec_helper.rb:
+  unmanaged: true

From 8bd6b6ce8e5f224ee2ab0739446ff1aa2ead048b Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 25 Jun 2014 17:23:09 -0700
Subject: [PATCH 0276/2267] Sync files

---
 .gitignore                                    | 13 ++++----
 .travis.yml                                   | 30 +++++++++----------
 Gemfile                                       | 13 +++-----
 spec/acceptance/nodesets/centos-59-x64.yml    |  1 -
 spec/acceptance/nodesets/centos-64-x64-pe.yml |  1 -
 spec/acceptance/nodesets/centos-65-x64.yml    |  5 ++--
 .../nodesets/ubuntu-server-10044-x64.yml      |  3 +-
 .../nodesets/ubuntu-server-12042-x64.yml      |  3 +-
 spec/spec.opts                                |  6 ++--
 9 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index f751a15d6e..b5b7a00d67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
-.pkg
+pkg/
 Gemfile.lock
-vendor
-spec/fixtures
-.rspec_system
-.bundle
-.vagrant
-.*sw*
+vendor/
+spec/fixtures/
+.vagrant/
+.bundle/
+coverage/
diff --git a/.travis.yml b/.travis.yml
index 1d00b8eb04..15db85135e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 branches:
   only:
-  - master
+    - master
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
@@ -11,22 +11,22 @@ rvm:
   - 2.0.0
 env:
   matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0"
-    - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+  - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+  - PUPPET_GEM_VERSION="~> 3.0"
+  - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
 matrix:
   fast_finish: true
   exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 3.2.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index fc45295a10..9074f1e75b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,20 +1,15 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
-  gem 'rake', '10.1.1',          :require => false
-  gem 'rspec-puppet', '>=1.0.0', :require => false
+  gem 'rake',                    :require => false
+  gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
   gem 'beaker',                  :require => false
   gem 'beaker-rspec',            :require => false
-  gem 'rspec', '~> 2.11',        :require => false
-end  
-
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
+  gem 'pry',                     :require => false
+  gem 'simplecov',               :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml
index cde1fe5a85..2ad90b86aa 100644
--- a/spec/acceptance/nodesets/centos-59-x64.yml
+++ b/spec/acceptance/nodesets/centos-59-x64.yml
@@ -7,5 +7,4 @@ HOSTS:
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  log_level: debug
   type: git
diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml
index e408d1be77..7d9242f1b9 100644
--- a/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ b/spec/acceptance/nodesets/centos-64-x64-pe.yml
@@ -9,5 +9,4 @@ HOSTS:
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  log_level: debug
   type: pe
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
index ac76349736..4e2cb809e8 100644
--- a/spec/acceptance/nodesets/centos-65-x64.yml
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -3,9 +3,8 @@ HOSTS:
     roles:
       - master
     platform: el-6-x86_64
-    box : centos-65-x64-virtualbox-nocm
+    box : centos-65-x64-vbox436-nocm
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
     hypervisor : vagrant
 CONFIG:
-  log_level: debug
-  type: git
+  type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
index c1b8bdf8fa..5ca1514e40 100644
--- a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
@@ -7,5 +7,4 @@ HOSTS:
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  log_level: debug
-  type: git
+  type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
index f7df2ccce1..d065b304f8 100644
--- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
@@ -7,5 +7,4 @@ HOSTS:
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  log_level: debug
-  type: git
+  type: foss
diff --git a/spec/spec.opts b/spec/spec.opts
index de653df4b3..91cd6427ed 100644
--- a/spec/spec.opts
+++ b/spec/spec.opts
@@ -1,4 +1,6 @@
---format s
+--format
+s
 --colour
---loadby mtime
+--loadby
+mtime
 --backtrace

From 4849904d57d46c2a57d34e3e508fbdf12ab65175 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 1 Jun 2014 15:08:02 +0200
Subject: [PATCH 0277/2267] Keep the default loadfile for authz_svn on Debian.
 Fix acceptance tests due to the new naming.

---
 manifests/mod/dav_svn.pp            |  5 ++++-
 spec/acceptance/mod_dav_svn_spec.rb | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 0fd667bc3f..977e477012 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -7,7 +7,10 @@
     
     if $authz_svn_enabled {
       ::apache::mod { 'authz_svn':
-        loadfile_name => 'dav_svn_authz_svn.load',
+        loadfile_name => $::osfamily ? {
+          'Debian' => undef,
+          default  => 'dav_svn_authz_svn.load',
+        },
         require       => Apache::Mod['dav_svn'],
       }
     }
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index ff90d331f3..5125ada0b2 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -3,14 +3,17 @@
 describe 'apache::mod::dav_svn class' do
   case fact('osfamily')
   when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
+    mod_dir             = '/etc/apache2/mods-available'
+    service_name        = 'apache2'
+    authz_svn_load_file = 'authz_svn.load'
   when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
+    mod_dir             = '/etc/httpd/conf.d'
+    service_name        = 'httpd'
+    authz_svn_load_file = 'dav_svn_authz_svn.load'
   when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
+    mod_dir             = '/usr/local/etc/apache22/Modules'
+    service_name        = 'apache22'
+    authz_svn_load_file = 'dav_svn_authz_svn.load'
   end
 
   context "default dav_svn config" do
@@ -48,7 +51,7 @@ class { 'apache::mod::dav_svn':
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/dav_svn_authz_svn.load") do
+    describe file("#{mod_dir}/#{authz_svn_load_file}") do
       it { is_expected.to contain "LoadModule authz_svn_module" }
     end
   end

From a7858b17439b2db73326fbf80e5ba3b9c30f8f6e Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Fri, 27 Jun 2014 10:08:58 -0700
Subject: [PATCH 0278/2267] Update .sync.yml to support new .travis.yml configs

---
 .sync.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 4ecd6afd0e..51a4c60a4b 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,20 +1,9 @@
 ---
 .travis.yml:
-  excludes:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-  env_matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0"
-    - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+  extras:
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
 spec/spec_helper.rb:
   unmanaged: true

From 59f152fecebe4d29efc6cf98137b7cee534918e9 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Fri, 27 Jun 2014 10:52:03 -0700
Subject: [PATCH 0279/2267] Synchronize .travis.yml

---
 .travis.yml | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15db85135e..22dcca7081 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,21 @@
 ---
-branches:
-  only:
-    - master
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-  - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-  - PUPPET_GEM_VERSION="~> 3.0"
-  - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
 matrix:
   fast_finish: true
-  exclude:
-  - rvm: 1.9.3
+  include:
+  - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.9.3
+  - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.2.0"
+    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
 notifications:
   email: false

From e8ebe477edfca1deb7ac8f246836d213a34da972 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Fri, 27 Jun 2014 11:21:17 -0700
Subject: [PATCH 0280/2267] Fix tests for fastcgi

The fastcgi server define wasn't including apache::mod::fastcgi, but
this is idempotent and required, since it declares a dependency on
Apache::Mod['fastcgi'].

I also cleaned up some linting things and put the notify on the service
class instead of the service resource (as is the newer pattern).
---
 manifests/fastcgi/server.pp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index f62cb04530..4937d4e0f7 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -2,22 +2,23 @@
   $host          = '127.0.0.1:9000',
   $timeout       = 15,
   $flush         = false,
-  $faux_path     = "/var/www/$name.fcgi",
-  $alias         = "/$name.fcgi",
+  $faux_path     = "/var/www/${name}.fcgi",
+  $alias         = "/${name}.fcgi",
   $file_type     = 'application/x-httpd-php'
 ) {
+  include apache::mod::fastcgi
 
-  Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server["$title"]
+  Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server[$title]
 
-  file { "fastcgi-pool-$name.conf":
+  file { "fastcgi-pool-${name}.conf":
     ensure  => present,
-    path    => "${::apache::confd_dir}/fastcgi-pool-$name.conf",
+    path    => "${::apache::confd_dir}/fastcgi-pool-${name}.conf",
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
     content => template('apache/fastcgi/server.erb'),
     require => Exec["mkdir ${::apache::confd_dir}"],
     before  => File[$::apache::confd_dir],
-    notify  => Service['httpd']
+    notify  => Class['apache::service'],
   }
 }

From a56edb2b0a6bf66c72366939cfe6ba613a94e2dd Mon Sep 17 00:00:00 2001
From: Juan Treminio <jtreminio@gmail.com>
Date: Fri, 27 Jun 2014 22:38:20 -0500
Subject: [PATCH 0281/2267] Adds @ to faux_path template variable

---
 templates/fastcgi/server.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/fastcgi/server.erb b/templates/fastcgi/server.erb
index c16eae8cfd..74530c449e 100644
--- a/templates/fastcgi/server.erb
+++ b/templates/fastcgi/server.erb
@@ -1,3 +1,3 @@
 FastCGIExternalServer <%= @faux_path %> -idle-timeout <%= @timeout %> <%= if @flush then '-flush' end %> -host <%= @host %>
-Alias <%= @alias %> <%= faux_path %>
+Alias <%= @alias %> <%= @faux_path %>
 Action <%= @file_type %> <%= @alias %>

From 807db14fc1d294ebcd4f3f835a725149b0d6850a Mon Sep 17 00:00:00 2001
From: Juan Treminio <jtreminio@gmail.com>
Date: Sat, 28 Jun 2014 01:17:33 -0500
Subject: [PATCH 0282/2267] Changes $alias to $fcgi_alias to preent Puppet
 complaining about using that name

---
 manifests/fastcgi/server.pp  | 2 +-
 templates/fastcgi/server.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index 4937d4e0f7..afc7c8860f 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -3,7 +3,7 @@
   $timeout       = 15,
   $flush         = false,
   $faux_path     = "/var/www/${name}.fcgi",
-  $alias         = "/${name}.fcgi",
+  $fcgi_alias    = "/${name}.fcgi",
   $file_type     = 'application/x-httpd-php'
 ) {
   include apache::mod::fastcgi
diff --git a/templates/fastcgi/server.erb b/templates/fastcgi/server.erb
index c16eae8cfd..5920e784cb 100644
--- a/templates/fastcgi/server.erb
+++ b/templates/fastcgi/server.erb
@@ -1,3 +1,3 @@
 FastCGIExternalServer <%= @faux_path %> -idle-timeout <%= @timeout %> <%= if @flush then '-flush' end %> -host <%= @host %>
-Alias <%= @alias %> <%= faux_path %>
-Action <%= @file_type %> <%= @alias %>
+Alias <%= @fcgi_alias %> <%= faux_path %>
+Action <%= @file_type %> <%= @fcgi_alias %>

From 576f4b75916ede41d1bcf594a47c9521987cf067 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 30 Jun 2014 10:57:41 -0700
Subject: [PATCH 0283/2267] Update Gemfile for .travis.yml defaults

---
 Gemfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 9074f1e75b..e960f7c4b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,12 @@ group :development, :test do
   gem 'simplecov',               :require => false
 end
 
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else

From 240aca0a831a1ad394683c97641238af2ee350e9 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 30 Jun 2014 11:18:38 -0700
Subject: [PATCH 0284/2267] Update tests for strict variable testing

---
 spec/classes/mod/negotiation_spec.rb |  2 ++
 spec/classes/mod/php_spec.rb         |  2 ++
 spec/classes/mod/worker_spec.rb      |  2 ++
 spec/defines/fastcgi_server_spec.rb  | 10 ++++++++++
 4 files changed, 16 insertions(+)

diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index a5d4ba92d2..f4a8d64e00 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -6,6 +6,8 @@
     let :facts do
       {
         :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :lsbdistcodename        => 'squeeze',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
       }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 7b4ef3e822..0252cd5055 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -141,7 +141,9 @@
     let :facts do
       {
         :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
+        :lsbdistcodename        => 'squeeze',
         :concat_basedir         => '/dne',
       }
     end
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 4b83e31850..07b27e3dae 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -117,7 +117,9 @@
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'CentOS',
         :operatingsystemrelease => '6',
+        :id                     => 'root',
         :concat_basedir         => '/dne',
       }
     end
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 89e9b2041f..68cd208cfc 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -12,7 +12,9 @@
       let :default_facts do
         {
           :osfamily               => 'RedHat',
+          :operatingsystem        => 'CentOS',
           :operatingsystemrelease => '6',
+          :id                     => 'root',
           :concat_basedir         => '/dne',
         }
       end
@@ -28,7 +30,10 @@
       let :default_facts do
         {
           :osfamily               => 'Debian',
+          :operatingsystem        => 'Debian',
           :operatingsystemrelease => '6',
+          :lsbdistcodename        => 'squeeze',
+          :id                     => 'root',
           :concat_basedir         => '/dne',
         }
       end
@@ -44,7 +49,9 @@
       let :default_facts do
         {
           :osfamily               => 'FreeBSD',
+          :operatingsystem        => 'FreeBSD',
           :operatingsystemrelease => '9',
+          :id                     => 'root',
           :concat_basedir         => '/dne',
         }
       end
@@ -61,7 +68,10 @@
     let :facts do
       {
         :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
+        :lsbdistcodename        => 'squeeze',
+        :id                     => 'root',
         :concat_basedir         => '/dne',
       }
     end

From 2dbb1ec540e71fb2f920891d213d88774faf5c14 Mon Sep 17 00:00:00 2001
From: Jesse Cotton <jcotton1123@gmail.com>
Date: Wed, 2 Jul 2014 02:38:37 +0000
Subject: [PATCH 0285/2267] Add param to ctrl purging of vhost dir

---
 README.md                                 |  4 ++++
 manifests/init.pp                         | 12 ++++++++++--
 spec/acceptance/apache_parameters_spec.rb | 22 +++++++++++++++++-----
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index e9f1388196..d6bef12d09 100644
--- a/README.md
+++ b/README.md
@@ -374,6 +374,10 @@ Changes the name of the file containing Apache ports configuration. Default is `
 
 Removes all other Apache configs and vhosts, defaults to 'true'. Setting this to 'false' is a stopgap measure to allow the apache module to coexist with existing or otherwise-managed configuration. It is recommended that you move your configuration entirely to resources within this module.
 
+#####`purge_vhost_configs`
+
+If `vhost_dir` != `confd_dir`, this controls the removal of any configurations that are not managed by puppet within `vhost_dir`. It defaults to the value of `purge_configs`. Setting this to false is a stopgap measure to allow the apache module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`
+
 #####`sendfile`
 
 Makes Apache use the Linux kernel sendfile to serve static files. Defaults to 'On'.
diff --git a/manifests/init.pp b/manifests/init.pp
index 9f77d5b4e7..2c63fd7437 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,6 +28,7 @@
   $service_enable       = true,
   $service_ensure       = 'running',
   $purge_configs        = true,
+  $purge_vhost_dir      = undef,
   $purge_vdir           = false,
   $serveradmin          = 'root@localhost',
   $sendfile             = 'On',
@@ -126,6 +127,13 @@
     $purge_confd = $purge_configs
   }
 
+  # Set purge vhostd appropriately
+  if $purge_vhost_dir == undef {
+    $purge_vhostd = $purge_confd
+  } else {
+    $purge_vhostd = $purge_vhost_dir
+  }
+
   Exec {
     path => '/bin:/sbin:/usr/bin:/usr/sbin',
   }
@@ -183,7 +191,7 @@
     file { $vhost_dir:
       ensure  => directory,
       recurse => true,
-      purge   => $purge_configs,
+      purge   => $purge_vhostd,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
     }
@@ -198,7 +206,7 @@
     file { $vhost_enable_dir:
       ensure  => directory,
       recurse => true,
-      purge   => $purge_configs,
+      purge   => $purge_vhostd,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
     }
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 54b4242251..5c26703ac9 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -79,18 +79,24 @@ class { 'apache':
     it 'applies cleanly' do
       pp = <<-EOS
         class { 'apache':
-          purge_configs => false,
-          purge_vdir    => false,
+          purge_configs   => false,
+          purge_vdir      => false,
+          purge_vhost_dir => false,
+          vhost_dir       => "#{confd_dir}.vhosts"
         }
       EOS
       shell("touch #{$confd_dir}/test.conf")
+      shell("mkdir -p #{$confd_dir}.vhosts && touch #{$confd_dir}.vhosts/test.conf")
       apply_manifest(pp, :catch_failures => true)
     end
 
-    # Ensure the file didn't disappear.
+    # Ensure the files didn't disappear.
     describe file("#{$confd_dir}/test.conf") do
       it { is_expected.to be_file }
     end
+    describe file("#{$confd_dir}.vhosts/test.conf") do
+      it { is_expected.to be_file }
+    end
   end
 
   if fact('osfamily') != 'Debian'
@@ -98,11 +104,14 @@ class { 'apache':
       it 'applies cleanly' do
         pp = <<-EOS
           class { 'apache':
-            purge_configs => true,
-            purge_vdir    => true,
+            purge_configs   => true,
+            purge_vdir      => true,
+            purge_vhost_dir => true,
+            vhost_dir       => "#{confd_dir}.vhosts"
           }
         EOS
         shell("touch #{$confd_dir}/test.conf")
+        shell("mkdir -p #{$confd_dir}.vhosts && touch #{$confd_dir}.vhosts/test.conf")
         apply_manifest(pp, :catch_failures => true)
       end
 
@@ -110,6 +119,9 @@ class { 'apache':
       describe file("#{$confd_dir}/test.conf") do
         it { is_expected.not_to be_file }
       end
+      describe file("#{$confd_dir}.vhosts/test.conf") do
+        it { is_expected.not_to be_file }
+      end
     end
   end
 

From bec6a5f91d9c4979575b87e76c56204e59598d46 Mon Sep 17 00:00:00 2001
From: Tim Bishop <tim@bishnet.net>
Date: Wed, 2 Jul 2014 23:39:52 +0100
Subject: [PATCH 0286/2267] Allow ssl_certs_dir to be unset.

In some cases we don't want SSLCACertificatePath to be set at all.
If we're using SSLCACertificateFile instead to verify clients we
might want that to be the only CA used. Most other options in this
template are optional, so I don't see why this one can't be too.
---
 templates/vhost/_ssl.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 03c78ef427..174f0a1891 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -7,7 +7,9 @@
 <% if @ssl_chain -%>
   SSLCertificateChainFile "<%= @ssl_chain %>"
 <% end -%>
+<% if @ssl_certs_dir -%>
   SSLCACertificatePath    "<%= @ssl_certs_dir %>"
+<% end -%>
 <% if @ssl_ca -%>
   SSLCACertificateFile    "<%= @ssl_ca %>"
 <% end -%>

From adc096dd2fc8a4ec70de721fae753dacbb6fd316 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Thu, 3 Jul 2014 09:53:31 -0700
Subject: [PATCH 0287/2267] Add validate and lint tasks to travis script

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 22dcca7081..86222c2813 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: ruby
 bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:

From e94f504e25444aa26a080132c8edf371512f3f4e Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Thu, 3 Jul 2014 11:33:19 -0700
Subject: [PATCH 0288/2267] Disable 'Only variable string' lint check in
 .sync.yml

mod.pp#79 needs to quote this variable to work.
---
 .sync.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index 51a4c60a4b..96d3c2bdb6 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -5,5 +5,8 @@
     env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+Rakefile:
+  extra_disabled_lint_checks:
+  - 'disable_only_variable_string'
 spec/spec_helper.rb:
   unmanaged: true

From 292d2c28d7417a8f735a7bdf947ab73cce898372 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Thu, 3 Jul 2014 11:45:03 -0700
Subject: [PATCH 0289/2267] Fix failing lint tests

Disabled checking for only variables in strings and fixed trailing spaces.
---
 Rakefile                 | 1 +
 manifests/mod/dav_svn.pp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 5868545f20..e1f7f013cd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,4 +7,5 @@ PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+PuppetLint.configuration.send('disable_only_variable_string')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 0fd667bc3f..98166c7fcd 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -3,8 +3,8 @@
 ) {
     Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
     include ::apache::mod::dav
-    ::apache::mod { 'dav_svn': } 
-    
+    ::apache::mod { 'dav_svn': }
+
     if $authz_svn_enabled {
       ::apache::mod { 'authz_svn':
         loadfile_name => 'dav_svn_authz_svn.load',

From e496d8511d16e3d46e981a4780ee495a6e8f7769 Mon Sep 17 00:00:00 2001
From: Jesse Cotton <jcotton1123@gmail.com>
Date: Wed, 2 Jul 2014 03:44:25 +0000
Subject: [PATCH 0290/2267] Add deflate params types and notes

---
 README.md                        | 23 +++++++++++++++++++++++
 manifests/mod/deflate.pp         | 16 ++++++++++++++--
 spec/classes/mod/deflate_spec.rb | 17 ++++++++++++-----
 templates/mod/deflate.conf.erb   | 13 ++++++-------
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index e9f1388196..24c688e899 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@
         * [Class: apache::mod::wsgi](#class-apachemodwsgi)
         * [Class: apache::mod::fcgid](#class-apachemodfcgid)
         * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
+        * [Class: apache::mod::deflate](#class-apachemoddeflate)
         * [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)
@@ -670,6 +671,28 @@ A string that sets the `ForceLanguagePriority` option. Defaults to `Prefer Fallb
 
 An array of languages to set the `LanguagePriority` option of the module.
 
+####Class: `apache::mod::deflate`
+
+Installs and configures mod_deflate. If no parameters are provided, a default configuration is applied.
+
+```puppet
+  class { '::apache::mod::deflate':
+    types => [ 'text/html', 'text/css' ],
+    notes => {
+      'Input' => 'instream',
+      'Ratio' => 'ratio',
+    },
+  }
+```
+
+#####`types`
+
+An array of mime types that will be deflated.
+
+#####`notes`
+
+A hash where the key represents the type and the value represents the note name.
+
 ####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.
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 9b597d9466..561cbadbf9 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -1,6 +1,18 @@
-class apache::mod::deflate {
+class apache::mod::deflate (
+  $types = [
+    'text/html text/plain text/xml',
+    'text/css',
+    'application/x-javascript application/javascript application/ecmascript',
+    'application/rss+xml'
+  ],
+  $notes = {
+    'Input'  => 'instream',
+    'Output' => 'outstream',
+    'Ratio'  => 'ratio'
+  }
+) {
   ::apache::mod { 'deflate': }
-  # Template uses no variables
+
   file { 'deflate.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/deflate.conf",
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 227c97a829..164dbfa2ea 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -6,13 +6,10 @@ def general_deflate_specs
 
   it do
     is_expected.to contain_file("deflate.conf").with_content(
-      "AddOutputFilterByType DEFLATE text/html text/plain text/xml\n"\
       "AddOutputFilterByType DEFLATE text/css\n"\
-      "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript\n"\
-      "AddOutputFilterByType DEFLATE application/rss+xml\n"\
+      "AddOutputFilterByType DEFLATE text/html\n"\
       "\n"\
       "DeflateFilterNote Input instream\n"\
-      "DeflateFilterNote Output outstream\n"\
       "DeflateFilterNote Ratio ratio\n"
     )
   end
@@ -20,7 +17,17 @@ def general_deflate_specs
 
 describe 'apache::mod::deflate', :type => :class do
   let :pre_condition do
-    'include apache'
+    'class { "apache":
+      default_mods => false,
+    }
+    class { "apache::mod::deflate":
+      types => [ "text/html", "text/css" ],
+      notes => {
+        "Input" => "instream",
+        "Ratio" => "ratio",
+      }
+    }
+    '
   end
 
   context "On a Debian OS with default params" do
diff --git a/templates/mod/deflate.conf.erb b/templates/mod/deflate.conf.erb
index a3cdf0552e..ede8b2e768 100644
--- a/templates/mod/deflate.conf.erb
+++ b/templates/mod/deflate.conf.erb
@@ -1,8 +1,7 @@
-AddOutputFilterByType DEFLATE text/html text/plain text/xml
-AddOutputFilterByType DEFLATE text/css
-AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
-AddOutputFilterByType DEFLATE application/rss+xml
+<%- @types.sort.each do |type| -%>
+AddOutputFilterByType DEFLATE <%= type %>
+<%- end -%>
 
-DeflateFilterNote Input instream
-DeflateFilterNote Output outstream
-DeflateFilterNote Ratio ratio
+<%- @notes.sort.each do |type,note| -%>
+DeflateFilterNote <%= type %> <%=note %>
+<%- end -%>

From 306682ad913052bfca5f11eaee79035fed908a44 Mon Sep 17 00:00:00 2001
From: Jesse Cotton <jcotton1123@gmail.com>
Date: Thu, 3 Jul 2014 22:39:23 +0000
Subject: [PATCH 0291/2267] Remove deprecated purge_vdir; Rename variables

---
 manifests/init.pp | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 2c63fd7437..f6aa7ea3a9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -29,7 +29,6 @@
   $service_ensure       = 'running',
   $purge_configs        = true,
   $purge_vhost_dir      = undef,
-  $purge_vdir           = false,
   $serveradmin          = 'root@localhost',
   $sendfile             = 'On',
   $error_documents      = false,
@@ -119,19 +118,11 @@
     service_ensure => $service_ensure,
   }
 
-  # Deprecated backwards-compatibility
-  if $purge_vdir {
-    warning('Class[\'apache\'] parameter purge_vdir is deprecated in favor of purge_configs')
-    $purge_confd = $purge_vdir
-  } else {
-    $purge_confd = $purge_configs
-  }
-
   # Set purge vhostd appropriately
   if $purge_vhost_dir == undef {
-    $purge_vhostd = $purge_confd
+    $_purge_vhost_dir = $purge_configs
   } else {
-    $purge_vhostd = $purge_vhost_dir
+    $_purge_vhost_dir = $purge_vhost_dir
   }
 
   Exec {
@@ -145,7 +136,7 @@
   file { $confd_dir:
     ensure  => directory,
     recurse => true,
-    purge   => $purge_confd,
+    purge   => $purge_configs,
     notify  => Class['Apache::Service'],
     require => Package['httpd'],
   }
@@ -191,7 +182,7 @@
     file { $vhost_dir:
       ensure  => directory,
       recurse => true,
-      purge   => $purge_vhostd,
+      purge   => $_purge_vhost_dir,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
     }
@@ -206,7 +197,7 @@
     file { $vhost_enable_dir:
       ensure  => directory,
       recurse => true,
-      purge   => $purge_vhostd,
+      purge   => $_purge_vhost_dir,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
     }

From b62bb06ae59933f2552e8e231db1829fb778e8cb Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 8 Jul 2014 15:36:17 -0400
Subject: [PATCH 0292/2267] Mark tests depending on passenger as pending on
 RHEL7.

---
 spec/acceptance/mod_passenger_spec.rb | 176 +++++++++++++-------------
 spec/acceptance/vhost_spec.rb         |  44 ++++---
 2 files changed, 113 insertions(+), 107 deletions(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 085904975c..a51fc9cd51 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -130,108 +130,110 @@ class { 'apache::mod::passenger': }
     # no fedora 18 passenger package yet, and rhel5 packages only exist for ruby 1.8.5
     unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18) or (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5' and fact('rubyversion') != '1.8.5')
 
-      context "default passenger config" do
-        it 'succeeds in puppeting passenger' do
-          pp = <<-EOS
-            /* EPEL and passenger repositories */
-            class { 'epel': }
-            exec { 'passenger.repo GPG key':
-              command => '/usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-              creates => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-            }
-            file { 'passenger.repo GPG key':
-              ensure  => file,
-              path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-              require => Exec['passenger.repo GPG key'],
-            }
-            epel::rpm_gpg_key { 'passenger.stealthymonkeys.com':
-              path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-              require => [
-                Class['epel'],
-                File['passenger.repo GPG key'],
-              ]
-            }
-            $releasever_string = $operatingsystem ? {
-              'Scientific' => '6',
-              default      => '$releasever',
-            }
-            yumrepo { 'passenger':
-              baseurl         => "http://passenger.stealthymonkeys.com/rhel/${releasever_string}/\\$basearch" ,
-              descr           => "Red Hat Enterprise ${releasever_string} - Phusion Passenger",
-              enabled         => 1,
-              gpgcheck        => 1,
-              gpgkey          => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-              mirrorlist      => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
-              require => [
-                Epel::Rpm_gpg_key['passenger.stealthymonkeys.com'],
-              ],
-            }
-            /* apache and mod_passenger */
-            class { 'apache':
+      if fact('operatingsystem') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
+        pending('test passenger - RHEL7 packages don\'t exist')
+      else
+        context "default passenger config" do
+          it 'succeeds in puppeting passenger' do
+            pp = <<-EOS
+              /* EPEL and passenger repositories */
+              class { 'epel': }
+              exec { 'passenger.repo GPG key':
+                command => '/usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
+                creates => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
+              }
+              file { 'passenger.repo GPG key':
+                ensure  => file,
+                path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
+                require => Exec['passenger.repo GPG key'],
+              }
+              epel::rpm_gpg_key { 'passenger.stealthymonkeys.com':
+                path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
                 require => [
                   Class['epel'],
-              ],
-            }
-            class { 'apache::mod::passenger':
-              require => [
-                Yumrepo['passenger']
-              ],
-            }
-            #{pp_rackapp}
-          EOS
-          apply_manifest(pp, :catch_failures => true)
-        end
+                  File['passenger.repo GPG key'],
+                ]
+              }
+              $releasever_string = $operatingsystem ? {
+                'Scientific' => '6',
+                default      => '$releasever',
+              }
+              yumrepo { 'passenger':
+                baseurl         => "http://passenger.stealthymonkeys.com/rhel/${releasever_string}/\\$basearch" ,
+                descr           => "Red Hat Enterprise ${releasever_string} - Phusion Passenger",
+                enabled         => 1,
+                gpgcheck        => 1,
+                gpgkey          => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
+                mirrorlist      => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
+                require => [
+                  Epel::Rpm_gpg_key['passenger.stealthymonkeys.com'],
+                ],
+              }
+              /* apache and mod_passenger */
+              class { 'apache':
+                  require => [
+                    Class['epel'],
+                ],
+              }
+              class { 'apache::mod::passenger':
+                require => [
+                  Yumrepo['passenger']
+                ],
+              }
+              #{pp_rackapp}
+            EOS
+            apply_manifest(pp, :catch_failures => true)
+          end
 
-        describe service(service_name) do
-          it { should be_enabled }
-          it { should be_running }
-        end
+          describe service(service_name) do
+            it { should be_enabled }
+            it { should be_running }
+          end
 
-        describe file(conf_file) do
-          it { should contain "PassengerRoot #{passenger_root}" }
-          it { should contain "PassengerRuby #{passenger_ruby}" }
-          it { should contain "PassengerTempDir #{passenger_tempdir}" }
-        end
+          describe file(conf_file) do
+            it { should contain "PassengerRoot #{passenger_root}" }
+            it { should contain "PassengerRuby #{passenger_ruby}" }
+            it { should contain "PassengerTempDir #{passenger_tempdir}" }
+          end
 
-        describe file(load_file) do
-          it { should contain "LoadModule passenger_module #{passenger_module_path}" }
-        end
+          describe file(load_file) do
+            it { should contain "LoadModule passenger_module #{passenger_module_path}" }
+          end
 
-        it 'should output status via passenger-memory-stats' do
-          shell("/usr/bin/passenger-memory-stats") do |r|
-            r.stdout.should =~ /Apache processes/
-            r.stdout.should =~ /Nginx processes/
-            r.stdout.should =~ /Passenger processes/
-            r.stdout.should =~ /### Processes: [0-9]+/
-            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+          it 'should output status via passenger-memory-stats' do
+            shell("/usr/bin/passenger-memory-stats") do |r|
+              r.stdout.should =~ /Apache processes/
+              r.stdout.should =~ /Nginx processes/
+              r.stdout.should =~ /Passenger processes/
+              r.stdout.should =~ /### Processes: [0-9]+/
+              r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
 
-            r.exit_code.should == 0
+              r.exit_code.should == 0
+            end
           end
-        end
 
-        it 'should output status via passenger-status' do
-          shell("PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
-            # spacing may vary
-            r.stdout.should =~ /[\-]+ General information [\-]+/
-            r.stdout.should =~ /max[ ]+= [0-9]+/
-            r.stdout.should =~ /count[ ]+= [0-9]+/
-            r.stdout.should =~ /active[ ]+= [0-9]+/
-            r.stdout.should =~ /inactive[ ]+= [0-9]+/
-            r.stdout.should =~ /Waiting on global queue: [0-9]+/
+          it 'should output status via passenger-status' do
+            shell("PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
+              # spacing may vary
+              r.stdout.should =~ /[\-]+ General information [\-]+/
+              r.stdout.should =~ /max[ ]+= [0-9]+/
+              r.stdout.should =~ /count[ ]+= [0-9]+/
+              r.stdout.should =~ /active[ ]+= [0-9]+/
+              r.stdout.should =~ /inactive[ ]+= [0-9]+/
+              r.stdout.should =~ /Waiting on global queue: [0-9]+/
 
-            r.exit_code.should == 0
+              r.exit_code.should == 0
+            end
           end
-        end
 
-        it 'should answer to passenger.example.com' do
-          shell("/usr/bin/curl passenger.example.com:80") do |r|
-            r.stdout.should =~ /^hello <b>world<\/b>$/
-            r.exit_code.should == 0
+          it 'should answer to passenger.example.com' do
+            shell("/usr/bin/curl passenger.example.com:80") do |r|
+              r.stdout.should =~ /^hello <b>world<\/b>$/
+              r.exit_code.should == 0
+            end
           end
         end
       end
-
     end
-
   end
 end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index c99e7d5246..63309da521 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -814,29 +814,33 @@ class { 'apache': }
 
   # Passenger isn't even in EPEL on el-5
   if default['platform'] !~ /^el-5/
-    describe 'rack_base_uris' do
-      if fact('osfamily') == 'RedHat'
-        it 'adds epel' do
-          pp = "class { 'epel': }"
-          apply_manifest(pp, :catch_failures => true)
+    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
+      pending('Since we don\'t have passenger on RHEL7 rack_base_uris tests will fail')
+    else
+      describe 'rack_base_uris' do
+        if fact('osfamily') == 'RedHat'
+          it 'adds epel' do
+            pp = "class { 'epel': }"
+            apply_manifest(pp, :catch_failures => true)
+          end
         end
-      end
 
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot          => '/tmp',
-            rack_base_uris  => ['/test'],
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
+        it 'applies cleanly' do
+          pp = <<-EOS
+            class { 'apache': }
+            host { 'test.server': ip => '127.0.0.1' }
+            apache::vhost { 'test.server':
+              docroot          => '/tmp',
+              rack_base_uris  => ['/test'],
+            }
+          EOS
+          apply_manifest(pp, :catch_failures => true)
+        end
 
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain 'RackBaseURI /test' }
+        describe file("#{$vhost_dir}/25-test.server.conf") do
+          it { should be_file }
+          it { should contain 'RackBaseURI /test' }
+        end
       end
     end
   end

From 28d2371f370e8a9a17bee019b6248d501bf71d57 Mon Sep 17 00:00:00 2001
From: GeneBean <me@technicalissues.us>
Date: Tue, 8 Jul 2014 23:19:06 -0400
Subject: [PATCH 0293/2267] Added the ability to customize mod_info's settings.
 Updated README.md with new settings info. Updated tests for apache::mod::info

---
 README.md                     |  50 ++++++++++++++-
 manifests/mod/info.pp         |   5 +-
 spec/classes/mod/info_spec.rb | 116 ++++++++++++++++++++--------------
 templates/mod/info.conf.erb   |  15 ++++-
 4 files changed, 133 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index d6bef12d09..8176b1db06 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@
         * [Class: apache::default_mods](#class-apachedefault_mods)
         * [Defined Type: apache::mod](#defined-type-apachemod)
         * [Classes: apache::mod::*](#classes-apachemodname)
+        * [Class: apache::mod::info](#class-apachemodinfo)
         * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
         * [Class: apache::mod::php](#class-apachemodphp)
         * [Class: apache::mod::ssl](#class-apachemodssl)
@@ -465,7 +466,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `fcgid`
 * `headers`
 * `include`
-* `info`
+* `info`*
 * `itk`
 * `ldap`
 * `mime`
@@ -502,6 +503,53 @@ Modules noted with a * indicate that the module has settings and, thus, a templa
 
 The modules mentioned above, and other Apache modules that have templates, will cause template files to be dropped along with the mod install and the module will not work without the template. Any module without a template will install the package but drop no files.
 
+####Class: `apache::mod::info`
+
+Installs and manages mod_info which provides a comprehensive overview of the server configuration. 
+
+Full documentation for mod_info is available from [Apache](http://httpd.apache.org/docs/2.2/mod/mod_info.html).
+
+These are the default settings:
+
+```puppet
+  $allow_from      = ['127.0.0.1','::1'],
+  $apache_version  = $::apache::apache_version,
+  $restrict_access = true,
+```
+
+To set the addresses that are allowed to access /server-info add the following:
+
+```puppet
+  class {'apache::mod::info':
+    allow_from      => [
+      '10.10.36',
+      '10.10.38',
+      '127.0.0.1',
+    ],
+  }
+```
+
+To disable the access restrictions add the following:
+
+```puppet
+  class {'apache::mod::info':
+    restrict_access => false,
+  }
+```
+
+It is not recommended to leave this set to false though it can be very useful for testing. For this reason, you can insert this setting in your normal code to temporarily disable the restrictions like so:
+
+```puppet
+  class {'apache::mod::info':
+    restrict_access => false, # false disables the block below
+    allow_from      => [
+      '10.10.36',
+      '10.10.38',
+      '127.0.0.1',
+    ],
+  }
+```
+
 ####Class: `apache::mod::pagespeed`
 
 Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 18f9ea1dfe..2c3d56ed88 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -1,6 +1,7 @@
 class apache::mod::info (
-  $allow_from = ['127.0.0.1','::1'],
-  $apache_version = $::apache::apache_version,
+  $allow_from      = ['127.0.0.1','::1'],
+  $apache_version  = $::apache::apache_version,
+  $restrict_access = true,
 ){
   apache::mod { 'info': }
   # Template uses
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 3415dec67e..20ed127dcb 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -1,27 +1,73 @@
-require 'spec_helper'
-
 # This function is called inside the OS specific contexts
 def general_info_specs
-  it { is_expected.to contain_apache__mod("info") }
+  it { is_expected.to contain_apache__mod('info') }
 
-  it do
-    is_expected.to contain_file("info.conf").with_content(
-      "<Location /server-info>\n"\
-      "    SetHandler server-info\n"\
-      "    Order deny,allow\n"\
-      "    Deny from all\n"\
-      "    Allow from 127.0.0.1 ::1\n"\
-      "</Location>\n"
-    )
+  context 'passing no parameters' do
+    it {
+      is_expected.to contain_file('info.conf').with_content(
+        "<Location /server-info>\n"\
+        "    SetHandler server-info\n"\
+        "    Order deny,allow\n"\
+        "    Deny from all\n"\
+        "    Allow from 127.0.0.1\n"\
+        "    Allow from ::1\n"\
+        "</Location>\n"
+      )
+    }
+  end
+  context 'passing restrict_access => false' do
+    let :params do {
+      :restrict_access => false
+    }
+    end
+    it {
+      is_expected.to contain_file('info.conf').with_content(
+        "<Location /server-info>\n"\
+        "    SetHandler server-info\n"\
+        "</Location>\n"
+      )
+    }
+  end
+  context "passing allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']" do
+    let :params do
+      {:allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']}
+    end
+    it {
+      is_expected.to contain_file('info.conf').with_content(
+        "<Location /server-info>\n"\
+        "    SetHandler server-info\n"\
+        "    Order deny,allow\n"\
+        "    Deny from all\n"\
+        "    Allow from 10.10.1.2\n"\
+        "    Allow from 192.168.1.2\n"\
+        "    Allow from 127.0.0.1\n"\
+        "</Location>\n"
+      )
+    }
+  end
+  context 'passing both restrict_access and allow_from' do
+    let :params do
+      {
+        :restrict_access => false,
+        :allow_from      => ['10.10.1.2', '192.168.1.2', '127.0.0.1']
+      }
+    end
+    it {
+      is_expected.to contain_file('info.conf').with_content(
+        "<Location /server-info>\n"\
+        "    SetHandler server-info\n"\
+        "</Location>\n"
+      )
+    }
   end
 end
 
 describe 'apache::mod::info', :type => :class do
   let :pre_condition do
-    'include apache'
+    "class { 'apache': default_mods => false, }"
   end
 
-  context "On a Debian OS with default params" do
+  context 'On a Debian OS' do
     let :facts do
       {
         :osfamily               => 'Debian',
@@ -38,17 +84,17 @@ def general_info_specs
     # Load the more generic tests for this context
     general_info_specs()
 
-    it { is_expected.to contain_file("info.conf").with({
+    it { is_expected.to contain_file('info.conf').with({
       :ensure => 'file',
       :path   => '/etc/apache2/mods-available/info.conf',
     } ) }
-    it { is_expected.to contain_file("info.conf symlink").with({
+    it { is_expected.to contain_file('info.conf symlink').with({
       :ensure => 'link',
       :path   => '/etc/apache2/mods-enabled/info.conf',
     } ) }
   end
 
-  context "on a RedHat OS with default params" do
+  context 'on a RedHat OS' do
     let :facts do
       {
         :osfamily               => 'RedHat',
@@ -64,10 +110,13 @@ def general_info_specs
     # Load the more generic tests for this context
     general_info_specs()
 
-    it { is_expected.to contain_file("info.conf").with_path("/etc/httpd/conf.d/info.conf") }
+    it { is_expected.to contain_file('info.conf').with({
+      :ensure => 'file',
+      :path   => '/etc/httpd/conf.d/info.conf',
+      } ) }
   end
 
-  context "On a FreeBSD OS with default params" do
+  context 'on a FreeBSD OS' do
     let :facts do
       {
         :osfamily               => 'FreeBSD',
@@ -83,37 +132,10 @@ def general_info_specs
     # Load the more generic tests for this context
     general_info_specs()
 
-    it { is_expected.to contain_file("info.conf").with({
+    it { is_expected.to contain_file('info.conf').with({
       :ensure => 'file',
       :path   => '/usr/local/etc/apache22/Modules/info.conf',
     } ) }
   end
 
-  context "with $allow_from => ['10.10.10.10','11.11.11.11']" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      { :allow_from => ['10.10.10.10','11.11.11.11'] }
-    end
-    it do
-      is_expected.to contain_file("info.conf").with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "    Order deny,allow\n"\
-        "    Deny from all\n"\
-        "    Allow from 10.10.10.10 11.11.11.11\n"\
-        "</Location>\n"
-      )
-    end
-  end
 end
diff --git a/templates/mod/info.conf.erb b/templates/mod/info.conf.erb
index d5288fb8c9..1a025b7a6e 100644
--- a/templates/mod/info.conf.erb
+++ b/templates/mod/info.conf.erb
@@ -1,10 +1,19 @@
 <Location /server-info>
     SetHandler server-info
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+<%- if @restrict_access -%>
+  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
+  <%- else -%>
     Order deny,allow
     Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
+    <%- if @allow_from and ! @allow_from.empty? -%>
+      <%- @allow_from.each do |allowed| -%>
+    Allow from <%= allowed %>
+      <%- end -%>
+    <%- else -%>
+    Allow from 127.0.0.1
+    Allow from ::1
     <%- end -%>
+  <%- end -%>
+<%- end -%>
 </Location>

From eab15fba55e88f572462ada6c655e8744cdf2c32 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 15 Jul 2014 11:45:52 -0400
Subject: [PATCH 0294/2267] Prepare a 1.1.1 release.

---
 CHANGELOG.md  |   6 +++
 Modulefile    |  12 -----
 metadata.json | 142 +++++++++++++++++++++++++++-----------------------
 3 files changed, 84 insertions(+), 76 deletions(-)
 delete mode 100644 Modulefile

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c77316a488..b598fdd2ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+##2014-07-15 - Supported Release 1.1.1
+###Summary
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
 ## 2014-04-14 Supported Release 1.1.0
 
 ###Summary
diff --git a/Modulefile b/Modulefile
deleted file mode 100644
index 49a712bcdd..0000000000
--- a/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name 'puppetlabs-apache'
-version '1.1.0'
-source 'git://github.com/puppetlabs/puppetlabs-apache.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'Puppet module for Apache'
-description 'Module for Apache configuration'
-project_page 'https://github.com/puppetlabs/puppetlabs-apache'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 2.4.0'
-dependency 'puppetlabs/concat', '>= 1.0.0'
diff --git a/metadata.json b/metadata.json
index 15317ff18e..f225f70e90 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,66 +1,80 @@
 {
-    "name": "puppetlabs-apache",
-    "version": "1.1.0",
-    "source": "https://github.com/puppetlabs/puppetlabs-apache",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
-    "summary": "Puppet module for Apache",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "RedHat",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "CentOS",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "OracleLinux",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "Scientific",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04",
-          "14.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" },
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
+  "name": "puppetlabs-apache",
+  "version": "1.1.1",
+  "author": "puppetlabs",
+  "summary": "Puppet module for Apache",
+  "license": "Apache 2.0",
+  "source": "git://github.com/puppetlabs/puppetlabs-apache.git",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
+  "issues_url": "https://github.com/puppetlabs/puppetlabs-apache/issues",
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Scientific",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "10.04",
+        "12.04",
+        "14.04"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.2.0 < 3.4.0"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": "3.x"
+    }
+  ],
+  "description": "Module for Apache configuration",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 2.4.0"
+    },
+    {
+      "name": "puppetlabs/concat",
+      "version_requirement": ">= 1.0.0"
+    }
+  ]
 }

From cd8abecc459a5669959a808f14dd64107148b030 Mon Sep 17 00:00:00 2001
From: Mathew Winstone <mathew.winstone@gmail.com>
Date: Tue, 15 Jul 2014 12:35:21 -0400
Subject: [PATCH 0295/2267] Removed stray quotation

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6bef12d09..1833b397fc 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ To set up a virtual host with a wildcard alias for the subdomain mapped to a sam
     apache::vhost { 'subdomain.loc':
       vhost_name       => '*',
       port             => '80',
-      virtual_docroot' => '/var/www/%-2+',
+      virtual_docroot  => '/var/www/%-2+',
       docroot          => '/var/www',
       serveraliases    => ['*.loc',],
     }

From 232965c6628f9eebae84222b5d5664537df52589 Mon Sep 17 00:00:00 2001
From: Jim Stallings <“jestallin@gmail.com”>
Date: Tue, 22 Jul 2014 20:54:54 -0400
Subject: [PATCH 0296/2267] Add authn_core mod to ubuntu trusty defaults

---
 manifests/default_mods.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index f665d7383e..03696f3d7c 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -24,6 +24,9 @@
     case $::osfamily {
       'debian': {
         include ::apache::mod::reqtimeout
+        if versioncmp($apache_version, '2.4') >= 0 {
+          ::apache::mod { 'authn_core': }
+        }
       }
       'redhat': {
         include ::apache::mod::actions

From dfaae9a00cb70bb536bdd889ac3c4011f36e0c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 29 Jul 2014 16:59:15 +0200
Subject: [PATCH 0297/2267] introduce flag to manage the docroot

manage_docroot defaults to `true` to retain backwards compatibility.
This flag is  useful if the docroot is created by other, conflicting
means such as vcsrepo.
---
 README.md                  | 4 ++++
 manifests/vhost.pp         | 3 ++-
 spec/defines/vhost_spec.rb | 9 +++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 09669e9cea..1bcf660509 100644
--- a/README.md
+++ b/README.md
@@ -827,6 +827,10 @@ Sets individual user access to the docroot directory. Defaults to 'root'.
 
 Sets access permissions of the docroot directory. Defaults to 'undef'.
 
+#####`manage_docroot`
+
+Whether to manage to docroot directory at all. Defaults to 'true'.
+
 #####`error_log`
 
 Specifies whether `*_error.log` directives should be configured. Defaults to 'true'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 55ff8007d0..d4b554b4c7 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -77,6 +77,7 @@
 #
 define apache::vhost(
     $docroot,
+    $manage_docroot              = true,
     $virtual_docroot             = false,
     $port                        = undef,
     $ip                          = undef,
@@ -261,7 +262,7 @@
 
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
-  if ! defined(File[$docroot]) {
+  if ! defined(File[$docroot]) and $manage_docroot {
     file { $docroot:
       ensure  => directory,
       owner   => $docroot_owner,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index c30e54e8f5..2beb8c987d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1166,6 +1166,15 @@
         end
       end
 
+      describe 'when docroot is *not* managed' do
+        let :params do default_params.merge({
+          :manage_docroot=> false,
+        }) end
+        it 'should not contain docroot ' do
+          is_expected.not_to contain_file(params[:docroot])
+        end
+      end
+
       describe 'when wsgi_daemon_process and wsgi_daemon_process_options are specified' do
         let :params do default_params.merge({
           :wsgi_daemon_process         => 'example.org',

From 1db1e476d002af303596b933d25129579bcd9156 Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yguenane@gmail.com>
Date: Tue, 29 Jul 2014 18:28:31 -0400
Subject: [PATCH 0298/2267] vhost: Create the $logroot only when necessary.

Currently, there is no way to specify default `$logroot` directory permissions.
It will always take the one from default.

Admitting we specify `apache::default_vhost: false`, this will ensure
`default_vhost_ensure` is set to absent. Then it will call
`apache::vhost { 'default'` with `ensure = absent`.

The problem is that the file resource that defines `$logroot` is surrounded
only by an `if !defined()`, so since when default pass it is not defined - yet,
it is true, it then enters and create the `$logroot` with default permissions.

Even if I specify `apache::default_vhost: false` and specify the `$logroot_mode`
of my custom `apache::vhost`, it will never make it in, since it as already be defined.
---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d4b554b4c7..36b94338c6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -273,7 +273,7 @@
   }
 
   # Same as above, but for logroot
-  if ! defined(File[$logroot]) {
+  if ! defined(File[$logroot]) and $ensure == 'present' {
     file { $logroot:
       ensure  => directory,
       mode    => $logroot_mode,

From 63a1a822dee6e01c36b25026835cb799663efda8 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 29 Jul 2014 15:55:42 -0700
Subject: [PATCH 0299/2267] Fix strict variables

---
 spec/classes/mod/negotiation_spec.rb | 2 ++
 spec/classes/mod/php_spec.rb         | 2 ++
 spec/classes/mod/worker_spec.rb      | 1 +
 spec/defines/fastcgi_server_spec.rb  | 4 ++++
 4 files changed, 9 insertions(+)

diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index f4a8d64e00..814660e1a1 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -10,6 +10,8 @@
         :lsbdistcodename        => 'squeeze',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 0252cd5055..76fd692267 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -145,6 +145,8 @@
         :operatingsystemrelease => '6',
         :lsbdistcodename        => 'squeeze',
         :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     context 'with content param' do
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 07b27e3dae..c2ede28a2b 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -121,6 +121,7 @@
         :operatingsystemrelease => '6',
         :id                     => 'root',
         :concat_basedir         => '/dne',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 68cd208cfc..794659e62b 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -16,6 +16,7 @@
           :operatingsystemrelease => '6',
           :id                     => 'root',
           :concat_basedir         => '/dne',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       end
       let :facts do default_facts end
@@ -35,6 +36,7 @@
           :lsbdistcodename        => 'squeeze',
           :id                     => 'root',
           :concat_basedir         => '/dne',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       end
       let :facts do default_facts end
@@ -53,6 +55,7 @@
           :operatingsystemrelease => '9',
           :id                     => 'root',
           :concat_basedir         => '/dne',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       end
       let :facts do default_facts end
@@ -73,6 +76,7 @@
         :lsbdistcodename        => 'squeeze',
         :id                     => 'root',
         :concat_basedir         => '/dne',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     describe ".conf content" do

From d6d120a4c92f343962bf1993b0163a650c671f04 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 5 Aug 2014 13:10:21 -0400
Subject: [PATCH 0300/2267] Update spec tests and README for fcgi_server

Fixes #781
---
 README.md                           | 12 ++++++------
 spec/defines/fastcgi_server_spec.rb | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 46bde67cf2..26b92e2b79 100644
--- a/README.md
+++ b/README.md
@@ -1715,12 +1715,12 @@ Ex:
 
 ```puppet
 apache::fastcgi::server { 'php':
-  host      => '127.0.0.1:9000',
-  timeout   => 15,
-  flush     => false,
-  faux_path => '/var/www/php.fcgi',
-  alias     => '/php.fcgi',
-  file_type => 'application/x-httpd-php'
+  host       => '127.0.0.1:9000',
+  timeout    => 15,
+  flush      => false,
+  faux_path  => '/var/www/php.fcgi',
+  fcgi_alias => '/php.fcgi',
+  file_type  => 'application/x-httpd-php'
 }
 ```
 
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 794659e62b..4a8762c868 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -82,12 +82,12 @@
     describe ".conf content" do
       let :params do
         {
-          :host      => '127.0.0.1:9001',
-          :timeout   => 30,
-          :flush     => true,
-          :faux_path => '/var/www/php-www.fcgi',
-          :alias     => '/php-www.fcgi',
-          :file_type => 'application/x-httpd-php'
+          :host       => '127.0.0.1:9001',
+          :timeout    => 30,
+          :flush      => true,
+          :faux_path  => '/var/www/php-www.fcgi',
+          :fcgi_alias => '/php-www.fcgi',
+          :file_type  => 'application/x-httpd-php'
         }
       end
       let :expected do

From 2093c1e763ffa0760bbe92cb7ba912979062daae Mon Sep 17 00:00:00 2001
From: Juan Treminio <jtreminio@gmail.com>
Date: Wed, 6 Aug 2014 15:04:43 -0500
Subject: [PATCH 0301/2267] Set $ssl_mutex to default for Debian
 $apache_version > 2.4

---
 manifests/mod/ssl.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index dd178150c9..0159148517 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -12,7 +12,7 @@
 
   case $::osfamily {
     'debian': {
-      if versioncmp($apache_version, '2.4') >= 0 and $::operatingsystem == 'Ubuntu' {
+      if versioncmp($apache_version, '2.4') >= 0 {
         $ssl_mutex = 'default'
       } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
         $ssl_mutex = 'file:/var/run/apache2/ssl_mutex'

From fcb4a09e38d8a7aaba7eefc90ce031d5cb9bc84d Mon Sep 17 00:00:00 2001
From: corvus_ch <christian.haeusler@md-systems.ch>
Date: Tue, 5 Aug 2014 08:33:15 +0200
Subject: [PATCH 0302/2267] Support itk with mod php

---
 manifests/mod/php.pp         | 11 ++++++---
 spec/classes/mod/php_spec.rb | 45 +++++++++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index a94bfe50bd..ad0ff48a0e 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -7,8 +7,14 @@
   $template       = 'apache/mod/php5.conf.erb',
   $source         = undef,
 ) {
-  if ! defined(Class['apache::mod::prefork']) {
-    fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
+  if defined(Class['apache::mod::prefork']) {
+    Class['::apache::mod::prefork']->File['php5.conf']
+  }
+  elsif defined(Class['apache::mod::itk']) {
+    Class['::apache::mod::itk']->File['php5.conf']
+  }
+  else {
+    fail('apache::mod::php requires apache::mod::prefork or apache::mod::itk; please enable mpm_module => \'prefork\' or mpm_module => \'itk\' on Class[\'apache\']')
   }
   validate_array($extensions)
 
@@ -46,7 +52,6 @@
     content => $manage_content,
     source  => $source,
     require => [
-      Class['::apache::mod::prefork'],
       Exec["mkdir ${::apache::mod_dir}"],
     ],
     before  => File[$::apache::mod_dir],
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 76fd692267..c61cdf6f53 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -19,19 +19,24 @@
         'class { "apache": mpm_module => prefork, }'
       end
       it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::mod::prefork") }
       it { is_expected.to contain_apache__mod('php5') }
       it { is_expected.to contain_package("libapache2-mod-php5") }
       it { is_expected.to contain_file("php5.load").with(
         :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
       ) }
     end
-    context 'with mpm_module => worker' do
+    context "with mpm_module => itk" do
       let :pre_condition do
-        'class { "apache": mpm_module => worker, }'
-      end
-      it 'should raise an error' do
-        expect { subject }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
+        'class { "apache": mpm_module => itk, }'
       end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::mod::itk") }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("libapache2-mod-php5") }
+      it { is_expected.to contain_file("php5.load").with(
+        :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
+      ) }
     end
   end
   describe "on a RedHat OS" do
@@ -99,12 +104,21 @@
         'class { "apache": mpm_module => prefork, }'
       end
       it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::mod::prefork") }
       it { is_expected.to contain_apache__mod('php5') }
       it { is_expected.to contain_package("php") }
       it { is_expected.to contain_file("php5.load").with(
         :content => "LoadModule php5_module modules/libphp5.so\n"
       ) }
     end
+    context "with mpm_module => itk" do
+      let :pre_condition do
+        'class { "apache": mpm_module => itk, }'
+      end
+      it 'should raise an error' do
+        expect { expect(subject).to contain_class("apache::mod::itk") }.to raise_error Puppet::Error, /Unsupported osfamily RedHat/
+      end
+    end
   end
   describe "on a FreeBSD OS" do
     let :facts do
@@ -127,14 +141,15 @@
       it { is_expected.to contain_package("lang/php5") }
       it { is_expected.to contain_file('php5.load') }
     end
-    # FIXME: not sure about the following context
-    context 'with mpm_module => worker' do
+    context "with mpm_module => itk" do
       let :pre_condition do
-        'class { "apache": mpm_module => worker, }'
-      end
-      it 'should raise an error' do
-        expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
+        'class { "apache": mpm_module => itk, }'
       end
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::itk') }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("lang/php5") }
+      it { is_expected.to contain_file('php5.load') }
     end
   end
   describe "OS independent tests" do
@@ -224,5 +239,13 @@
         :source => 'some-path'
       ) }
     end
+    context 'with mpm_module => worker' do
+      let :pre_condition do
+        'class { "apache": mpm_module => worker, }'
+      end
+      it 'should raise an error' do
+        expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork' or mpm_module => 'itk'/
+      end
+    end
   end
 end

From 990ffef724926297f5f4a5a690812de1067a22f9 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Wed, 6 Aug 2014 13:25:39 +0200
Subject: [PATCH 0303/2267] Add a timeouts parameter to apache::mod::reqtimeout

---
 README.md                           |  19 +++++
 manifests/mod/reqtimeout.pp         |   4 +-
 spec/classes/mod/reqtimeout_spec.rb | 112 ++++++++++++++++++++++++++++
 templates/mod/reqtimeout.conf.erb   |   5 +-
 4 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100644 spec/classes/mod/reqtimeout_spec.rb

diff --git a/README.md b/README.md
index 26b92e2b79..06d428ce27 100644
--- a/README.md
+++ b/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.
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index 80b3018306..62088873bb 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/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':
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
new file mode 100644
index 0000000000..07c09b0940
--- /dev/null
+++ b/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
diff --git a/templates/mod/reqtimeout.conf.erb b/templates/mod/reqtimeout.conf.erb
index 9a18800da5..6ffc5ffe25 100644
--- a/templates/mod/reqtimeout.conf.erb
+++ b/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 -%>

From 231832ebb3590a0263b525ecfe3051d8f32cfe13 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Wed, 6 Aug 2014 12:43:33 +0200
Subject: [PATCH 0304/2267] Allow to set ProxyPassReverse attributes on a vhost

This commit allows you to add an array or a string as a proxy_pass['reverse_url']
parameter.

Useful when used with mod_balancer.
---
 README.md                  |  4 ++++
 spec/defines/vhost_spec.rb | 27 +++++++++++++++++++++++++++
 templates/vhost/_proxy.erb |  6 ++++++
 3 files changed, 37 insertions(+)

diff --git a/README.md b/README.md
index 26b92e2b79..550d468eda 100644
--- a/README.md
+++ b/README.md
@@ -991,10 +991,14 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
     { 'path' => '/c', 'url' => 'http://backend-a/c' },
+    { 'path' => '/l', 'url' => 'http://backend-xy',
+      'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
   ],
 }
 ```
 
+`reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
+
 #####`rack_base_uris`
 
 Specifies the resource identifiers for a rack configuration. The file paths specified will be listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 2beb8c987d..ea7047935c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -389,6 +389,33 @@
           ],
           :notmatch => [/ProxyPass .+!$/],
         },
+        {
+          :title    => 'should accept reverse_urls string',
+          :attr     => 'proxy_pass',
+          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a', 'reverse_urls' => 'http://127.0.0.1:8080' },
+          :match    => [
+            /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
+            /^  <Location \/path-a>$/,
+            /^    ProxyPassReverse http:\/\/127.0.0.1:8080$/,
+            /^  <\/Location>$/,
+
+          ],
+          :notmatch => [/^    ProxyPassReverse http:\/\/fake.com\/a$/],
+        },
+        {
+          :title    => 'should accept reverse_urls array',
+          :attr     => 'proxy_pass',
+          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a', 'reverse_urls' => ['http://127.0.0.1:8080', 'http://127.0.0.1:8081'] },
+          :match    => [
+            /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
+            /^  <Location \/path-a>$/,
+            /^    ProxyPassReverse http:\/\/127.0.0.1:8080$/,
+            /^    ProxyPassReverse http:\/\/127.0.0.1:8081$/,
+            /^  <\/Location>$/,
+
+          ],
+          :notmatch => [/^    ProxyPassReverse http:\/\/fake.com\/a$/],
+        },
         {
           :title    => 'should accept proxy_pass array of hash',
           :attr     => 'proxy_pass',
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index a1d2e52923..8802bc16ba 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -9,7 +9,13 @@
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
   <Location <%= proxy['path']%>>
+  <%- if proxy['reverse_urls'].nil? -%>
     ProxyPassReverse <%= proxy['url'] %>
+  <%- else -%>
+    <%- Array(proxy['reverse_urls']).each do |reverse_url| -%>
+    ProxyPassReverse <%= reverse_url %>
+    <%- end -%>
+  <%- end -%>
   </Location>
 <% end %>
 <% if @proxy_dest -%>

From fa8bf120e787b71b3586d1198cff8408c41bd105 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 7 Aug 2014 16:38:26 -0400
Subject: [PATCH 0305/2267] Add a validate_string check for custom_fragment.

---
 manifests/vhost.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 36b94338c6..2d1d3d2615 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -242,6 +242,10 @@
     validate_re($fallbackresource, '^/|disabled', 'Please make sure fallbackresource starts with a / (or is "disabled")')
   }
 
+  if $custom_fragment {
+    validate_string($custom_fragment)
+  }
+
   if $ssl and $ensure == 'present' {
     include ::apache::mod::ssl
     # Required for the AddType lines.

From fbc2916e02cc76886ea1b93fc7f598a6cec9a0c0 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 7 Aug 2014 18:03:16 -0400
Subject: [PATCH 0306/2267] Removed extra whitespace

Fixed missing -%>
---
 templates/vhost.conf.erb     | 4 ++--
 templates/vhost/_proxy.erb   | 6 +++---
 templates/vhost/_rewrite.erb | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 64024cfef3..95ad3ce7df 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -27,9 +27,9 @@
 <%= scope.function_template(['apache/vhost/_directories.erb']) -%>
 
   ## Load additional static includes
-<% Array(@additional_includes).each do |include| %>
+<% Array(@additional_includes).each do |include| -%>
   Include "<%= include %>"
-<% end %>
+<% end -%>
 
   ## Logging
 <% if @error_log -%>
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index a1d2e52923..2c6972a805 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -3,7 +3,7 @@
   ## Proxy rules
   ProxyRequests Off
 <%- end -%>
-<% if @proxy_preserve_host %>
+<% if @proxy_preserve_host -%>
   ProxyPreserveHost On
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
@@ -11,11 +11,11 @@
   <Location <%= proxy['path']%>>
     ProxyPassReverse <%= proxy['url'] %>
   </Location>
-<% end %>
+<% end -%>
 <% if @proxy_dest -%>
 <%- Array(@no_proxy_uris).each do |uri| -%>
   ProxyPass        <%= uri %> !
-<% end %>
+<% end -%>
   ProxyPass          / <%= @proxy_dest %>/
   <Location          />
     ProxyPassReverse <%= @proxy_dest %>/
diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index af8b45001e..c995868d75 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -27,7 +27,7 @@
     <%- end -%>
   <%- end -%>
 <%- end -%>
-<%# reverse compatibility %>
+<%# reverse compatibility -%>
 <% if @rewrite_rule and !@rewrites -%>
   ## Rewrite rules
   RewriteEngine On

From 935ee100ebe0b7c1b302669a9f74a25919f18455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 31 Jul 2014 11:27:49 +0200
Subject: [PATCH 0307/2267] fix for #802: when !manage_docroot, don't require
 it

in #802 we introduced manage_docroot, however, I overlooked a place in
the code were we `require` it. This patch moves the priority_real, and
filename evaluation above, so we can simply use a `before`.

Perhaps we should cluster all variable transformation right below the
validation code?
---
 manifests/vhost.pp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 2d1d3d2615..522560d9a9 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -264,6 +264,18 @@
     include ::apache::mod::suexec
   }
 
+  # Configure the defaultness of a vhost
+  if $priority {
+    $priority_real = $priority
+  } elsif $default_vhost {
+    $priority_real = '10'
+  } else {
+    $priority_real = '25'
+  }
+
+  ## Apache include does not always work with spaces in the filename
+  $filename = regsubst($name, ' ', '_', 'G')
+
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
   if ! defined(File[$docroot]) and $manage_docroot {
@@ -273,6 +285,7 @@
       group   => $docroot_group,
       mode    => $docroot_mode,
       require => Package['httpd'],
+      before  => File["${priority_real}-${filename}.conf"],
     }
   }
 
@@ -404,15 +417,6 @@
     }
   }
 
-  # Configure the defaultness of a vhost
-  if $priority {
-    $priority_real = $priority
-  } elsif $default_vhost {
-    $priority_real = '10'
-  } else {
-    $priority_real = '25'
-  }
-
   # Check if mod_headers is required to process $headers/$request_headers
   if $headers or $request_headers {
     if ! defined(Class['apache::mod::headers']) {
@@ -420,9 +424,6 @@
     }
   }
 
-  ## Apache include does not always work with spaces in the filename
-  $filename = regsubst($name, ' ', '_', 'G')
-
   ## Create a default directory list if none defined
   if $directories {
     if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {
@@ -542,7 +543,6 @@
     mode    => '0644',
     require => [
       Package['httpd'],
-      File[$docroot],
       File[$logroot],
     ],
     notify  => Service['httpd'],

From c180f2e6039e8164b2bd31745da151b77bf7789e Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 8 Aug 2014 10:34:51 -0400
Subject: [PATCH 0308/2267] MODULES-913 Documentation update

The configuration is not propagated properly if you start your path with
~, update the documentation to remove that claim and add the *match
providers.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d4a4d89aa9..3d2ac35d1b 100644
--- a/README.md
+++ b/README.md
@@ -1287,7 +1287,7 @@ Each hash passed to `directories` must contain `path` as one of the keys.  You m
 
 *Note:* At least one directory should match the `docroot` parameter. Once you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block will be created that matches the `docroot` parameter.
 
-The `provider` key can be set to 'directory', 'files', or 'location'. If the path starts with a [~](https://httpd.apache.org/docs/current/mod/core.html#files), HTTPD will interpret this as the equivalent of DirectoryMatch, FilesMatch, or LocationMatch.
+The `provider` key can be set to 'directory', 'files', 'location', 'directorymatch', 'filesmatch', or 'locationmatch'. 
 
 ```puppet
     apache::vhost { 'files.example.net':

From d0852758bb9ca39494eafd383b2b6a78990b5c08 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Fri, 8 Aug 2014 11:35:10 -0700
Subject: [PATCH 0309/2267] Call install_* methods only once in
 spec_helper_acceptance

---
 spec/spec_helper_acceptance.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 370de46c0d..976a605595 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -3,16 +3,19 @@
 
 
 unless ENV['RS_PROVISION'] == 'no'
+  foss_opts = { :version        => '3.6.2',
+                :facter_version => '2.1.0',
+                :hiera_version  => '1.3.4',
+                :default_action => 'gem_install' }
+
+  if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
+
   hosts.each do |host|
     if host['platform'] =~ /debian/
       on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
     end
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
+
+    on host, "mkdir -p #{host['distmoduledir']}"
   end
 end
 

From 05370c247250cba765ed03dc5eee0a1cbda75522 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Fri, 8 Aug 2014 13:17:14 -0700
Subject: [PATCH 0310/2267] Don't support acceptance testing against apache on
 windows or osx

---
 spec/spec_helper_acceptance.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 976a605595..8af5252456 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -3,10 +3,9 @@
 
 
 unless ENV['RS_PROVISION'] == 'no'
-  foss_opts = { :version        => '3.6.2',
-                :facter_version => '2.1.0',
-                :hiera_version  => '1.3.4',
-                :default_action => 'gem_install' }
+  # This will install the latest available package on el and deb based
+  # systems fail on windows and osx, and install via gem on other *nixes
+  foss_opts = { :default_action => 'gem_install' }
 
   if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
 

From 4736f50933d140d543fcbd13330105e1c51f45b6 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Mon, 11 Aug 2014 14:39:21 +0200
Subject: [PATCH 0311/2267] Call @proxy_set insteat of proxy_set in
 inline_template

This commit removes the following depreciation message:
Variable access via 'proxy_set' is deprecated. Use '@proxy_set' instead.
---
 manifests/balancer.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 173aaec2dd..b836897c46 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -71,7 +71,7 @@
     ensure  => present,
     target  => $target,
     order   => '19',
-    content => inline_template("<% proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= proxy_set[key] %>\n<% end %>"),
+    content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"),
   }
 
   concat::fragment { "01-${name}-footer":

From 15a668717e4df363cc539ab20d9a8e19f5a954c2 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 13 Aug 2014 19:43:19 -0400
Subject: [PATCH 0312/2267] Fix dependency loop in vhost

Also fix missing backslash from test for rewrites.
---
 manifests/vhost.pp            | 6 ++----
 spec/acceptance/vhost_spec.rb | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 522560d9a9..cc9d837e70 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -295,6 +295,7 @@
       ensure  => directory,
       mode    => $logroot_mode,
       require => Package['httpd'],
+      before  => File["${priority_real}-${filename}.conf"],
     }
   }
 
@@ -541,10 +542,7 @@
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
-    require => [
-      Package['httpd'],
-      File[$logroot],
-    ],
+    require => Package['httpd'],
     notify  => Service['httpd'],
   }
   if $::osfamily == 'Debian' {
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index f8e26f7e22..9ecf347751 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -997,7 +997,7 @@ class { 'apache': }
               comment => 'Permalink Rewrites',
               rewrite_base => '/',
               },
-              { rewrite_rule => [ '^index\.php$ - [L]' ] },
+              { rewrite_rule => [ '^index\\.php$ - [L]' ] },
               { rewrite_cond => [
                 '%{REQUEST_FILENAME} !-f',
                 '%{REQUEST_FILENAME} !-d',                                                                                             ],                                                                                                                     rewrite_rule => [ '. /index.php [L]' ],                                                                              }

From 503be6d4e26788f215c0938dbca81df792f31ba6 Mon Sep 17 00:00:00 2001
From: Steven Merrill <steven.merrill@gmail.com>
Date: Wed, 13 Aug 2014 16:32:44 -0400
Subject: [PATCH 0313/2267] Allow other manifests to define ::apache::mod{
 'ssl': }.

This will allow Apache from the httpd24 SCL on RHELish systems to
include the proper mod_ssl package while still letting ssl
::apache::vhost defines work as expected.

Add package_name param to ::apache::mod::ssl.

Add a test for the package_name parameter.

Update the package_name parameter test.
---
 manifests/mod/ssl.pp         | 5 ++++-
 spec/classes/mod/ssl_spec.rb | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 0159148517..ff0e929272 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -3,6 +3,7 @@
   $ssl_options     = [ 'StdEnvVars' ],
   $ssl_cipher      = 'HIGH:MEDIUM:!aNULL:!MD5',
   $apache_version  = $::apache::apache_version,
+  $package_name    = undef,
 ) {
   $session_cache = $::osfamily ? {
     'debian'  => '${APACHE_RUN_DIR}/ssl_scache(512000)',
@@ -31,7 +32,9 @@
     }
   }
 
-  ::apache::mod { 'ssl': }
+  ::apache::mod { 'ssl':
+    package => $package_name,
+  }
 
   if versioncmp($apache_version, '2.4') >= 0 {
     ::apache::mod { 'socache_shmcb': }
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index fb6ba4eb57..93f04e3ca5 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -34,6 +34,15 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
     it { is_expected.to contain_package('mod_ssl') }
+    context 'with a custom package_name parameter' do
+      let :params do
+        { :package_name => 'httpd24-mod_ssl' }
+      end
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('ssl') }
+      it { is_expected.to contain_package('httpd24-mod_ssl') }
+      it { is_expected.not_to contain_package('mod_ssl') }
+    end
   end
 
   context 'on a Debian OS' do

From e15c1b76a480996b6805918da0269feea3e62d09 Mon Sep 17 00:00:00 2001
From: Steven Merrill <steven.merrill@gmail.com>
Date: Wed, 13 Aug 2014 17:56:18 -0400
Subject: [PATCH 0314/2267] Allow overriding the detected $apache_name.

This will mainly be useful for supporting Red Hat Software Collections,
where 'httpd24-httpd' installs Apache 2.4 alongside Apache 2.2 in the
base repository. The $service_name parameter already allows
customization of the service to use, but not the package.

Document the ::apache::apache_name parameter.

Add a test for the apache_name param.
---
 README.md                   |  4 ++++
 manifests/init.pp           |  3 ++-
 spec/classes/apache_spec.rb | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3d2ac35d1b..eaf36b14ab 100644
--- a/README.md
+++ b/README.md
@@ -425,6 +425,10 @@ Controls how TRACE requests per RFC 2616 are handled. More information about [Tr
 
 Changes the location of the configuration directory your virtual host configuration files are placed in. Defaults to 'etc/httpd/conf.d' on RedHat, '/etc/apache2/sites-available' on Debian, and '/usr/local/etc/apache22/Vhosts' on FreeBSD.
 
+#####`apache_name`
+
+The name of the Apache package to install. This is automatically detected in `::apache::params`. You may need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.
+
 ####Class: `apache::default_mods`
 
 Installs default Apache modules based on what OS you are running.
diff --git a/manifests/init.pp b/manifests/init.pp
index f6aa7ea3a9..709c507da9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,6 +13,7 @@
 # Sample Usage:
 #
 class apache (
+  $apache_name          = $::apache::params::apache_name,
   $service_name         = $::apache::params::service_name,
   $default_mods         = true,
   $default_vhost        = true,
@@ -83,7 +84,7 @@
   if $::osfamily != 'FreeBSD' {
     package { 'httpd':
       ensure => $package_ensure,
-      name   => $::apache::params::apache_name,
+      name   => $apache_name,
       notify => Class['Apache::Service'],
     }
   }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 73411110f0..c647226329 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -541,6 +541,18 @@
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
+    context 'with a custom apache_name parameter' do
+      let :params do {
+        :apache_name => 'httpd24-httpd'
+      }
+      end
+      it { is_expected.to contain_package("httpd").with(
+        'notify' => 'Class[Apache::Service]',
+        'ensure' => 'installed',
+        'name'   => 'httpd24-httpd'
+        )
+      }
+    end
     context 'default vhost defaults' do
       it { is_expected.to contain_apache__vhost('default').with_ensure('present') }
       it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('absent') }

From 80be736246422b2e4d8da571e9777fd0f783f10f Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ekohlvanwijngaarden@antagonist.nl>
Date: Fri, 27 Jun 2014 12:41:19 +0200
Subject: [PATCH 0315/2267] Add regex validation to wsgi_pass_authorization

---
 manifests/vhost.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index cc9d837e70..31f61d6e84 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -201,6 +201,12 @@
     "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
   }
 
+  if $wsgi_pass_authorization {
+    validate_re(downcase($wsgi_pass_authorization), '^(on|off)$',
+    "${wsgi_pass_authorization} is not supported for wsgi_pass_authorization.
+    Allowed values are 'on' and 'off'.")
+  }
+
   # Deprecated backwards-compatibility
   if $rewrite_base {
     warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')

From bd890c22ba2d8ee1b929052056ca310d2d26bdc0 Mon Sep 17 00:00:00 2001
From: Steven Merrill <steven.merrill@gmail.com>
Date: Sat, 16 Aug 2014 22:50:37 -0400
Subject: [PATCH 0316/2267] Add apache::conf_dir, use it instead of params.

This is another change needed to make the httpd24 Software Collection
work on RHELish boxes.

Fix mod_systemd on RHEL/CentOS 6.

Puppet < 3.0 does not have unless.

Try another fix for Puppet 2.7 / Facter 1.7.

Add README and tests for ::apache::conf_dir.
---
 README.md                   |  4 ++++
 manifests/default_mods.pp   |  5 ++++-
 manifests/init.pp           |  5 +++--
 manifests/mod.pp            |  2 +-
 manifests/mod/mime_magic.pp |  2 +-
 spec/classes/apache_spec.rb | 12 ++++++++++++
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index eaf36b14ab..e6828afed8 100644
--- a/README.md
+++ b/README.md
@@ -227,6 +227,10 @@ You may establish a default vhost in this class, the `vhost` class, or both. You
 
 Configures the behavior of the module templates, package names, and default mods by setting the Apache version. Default is determined by the class `apache::version` using the OS family and release. It should not be configured manually without special reason.
 
+#####`conf_dir`
+
+Changes the location of the configuration directory the main configuration file is placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
+
 #####`confd_dir`
 
 Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 03696f3d7c..80cca7046c 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -11,7 +11,10 @@
       ::apache::mod { 'log_config': }
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
-        ::apache::mod { 'systemd': }
+        # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
+        if !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) {
+          ::apache::mod { 'systemd': }
+        }
         ::apache::mod { 'unixd': }
       }
     }
diff --git a/manifests/init.pp b/manifests/init.pp
index 709c507da9..1c9c758618 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -36,6 +36,7 @@
   $timeout              = '120',
   $httpd_dir            = $::apache::params::httpd_dir,
   $server_root          = $::apache::params::server_root,
+  $conf_dir             = $::apache::params::conf_dir,
   $confd_dir            = $::apache::params::confd_dir,
   $vhost_dir            = $::apache::params::vhost_dir,
   $vhost_enable_dir     = $::apache::params::vhost_enable_dir,
@@ -219,7 +220,7 @@
     content => template('apache/ports_header.erb')
   }
 
-  if $::apache::params::conf_dir and $::apache::params::conf_file {
+  if $::apache::conf_dir and $::apache::params::conf_file {
     case $::osfamily {
       'debian': {
         $docroot              = '/var/www'
@@ -276,7 +277,7 @@
     # - $server_tokens
     # - $server_signature
     # - $trace_enable
-    file { "${::apache::params::conf_dir}/${::apache::params::conf_file}":
+    file { "${::apache::conf_dir}/${::apache::params::conf_file}":
       ensure  => file,
       content => template($conf_template),
       notify  => Class['Apache::Service'],
diff --git a/manifests/mod.pp b/manifests/mod.pp
index aa5ea3f3bd..2795578ec8 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -64,7 +64,7 @@
     $package_before = $::osfamily ? {
       'freebsd' => [
         File[$_loadfile_name],
-        File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
+        File["${::apache::conf_dir}/${::apache::params::conf_file}"]
       ],
       default => File[$_loadfile_name],
     }
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index 9de8bc4bc6..c276268e4d 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -1,5 +1,5 @@
 class apache::mod::mime_magic (
-  $magic_file = "${::apache::params::conf_dir}/magic"
+  $magic_file = "${::apache::conf_dir}/magic"
 ) {
   apache::mod { 'mime_magic': }
   # Template uses $magic_file
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index c647226329..198f1138bf 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -310,6 +310,18 @@
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end
 
+    describe "Alternate conf directory" do
+      let :params do
+        { :conf_dir => '/opt/rh/root/etc/httpd/conf' }
+      end
+
+      it { is_expected.to contain_file("/opt/rh/root/etc/httpd/conf/httpd.conf").with(
+        'ensure'  => 'file',
+        'notify'  => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
+      ) }
+    end
+
     describe "Alternate conf.d directory" do
       let :params do
         { :confd_dir => '/etc/httpd/special_conf.d' }

From f1d64a0a0b71af0102d10da69e333aa9ac5a15f5 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 11 Aug 2014 20:02:47 -0400
Subject: [PATCH 0317/2267] Convert apache::vhost to use concat fragments.

Lint failures fixed:
 - class_parameter_defaults check removed in puppet-lint 1.0
 - alignment for tests/vhost.pp
 - need to add relative
---
 .puppet-lint.rc                          |    1 -
 README.md                                |   14 +
 Rakefile                                 |    2 +-
 manifests/vhost.pp                       |  707 +++++---
 metadata.json                            |    2 +-
 spec/defines/vhost_spec.rb               | 1887 +++++-----------------
 templates/vhost/_access_log.erb          |    5 +
 templates/vhost/_additional_includes.erb |    5 +
 templates/vhost/_directories.erb         |    2 +
 templates/vhost/_docroot.erb             |    7 +
 templates/vhost/_fallbackresource.erb    |    4 +
 templates/vhost/_file_footer.erb         |    1 +
 templates/vhost/_file_header.erb         |   10 +
 templates/vhost/_itk.erb                 |    1 +
 templates/vhost/_logging.erb             |   10 +
 templates/vhost/_php_admin.erb           |   12 +-
 templates/vhost/_redirect.erb            |    9 +-
 templates/vhost/_rewrite.erb             |   12 +-
 templates/vhost/_serveralias.erb         |    4 +-
 templates/vhost/_serversignature.erb     |    1 +
 templates/vhost/_setenv.erb              |    8 +-
 templates/vhost/_ssl.erb                 |   48 +-
 templates/vhost/_suphp.erb               |   12 +-
 tests/vhost.pp                           |   38 +-
 24 files changed, 1018 insertions(+), 1784 deletions(-)
 create mode 100644 templates/vhost/_access_log.erb
 create mode 100644 templates/vhost/_additional_includes.erb
 create mode 100644 templates/vhost/_docroot.erb
 create mode 100644 templates/vhost/_fallbackresource.erb
 create mode 100644 templates/vhost/_file_footer.erb
 create mode 100644 templates/vhost/_file_header.erb
 create mode 100644 templates/vhost/_logging.erb
 create mode 100644 templates/vhost/_serversignature.erb

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index df733ca811..ef187bbdaa 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,5 +1,4 @@
 --no-single_quote_string_with_variables-check
 --no-80chars-check
 --no-class_inherits_from_params_class-check
---no-class_parameter_defaults-check
 --no-documentation-check
diff --git a/README.md b/README.md
index eaf36b14ab..df2c70d5a3 100644
--- a/README.md
+++ b/README.md
@@ -774,6 +774,20 @@ The Apache module allows a lot of flexibility in the setup and configuration of
 
 The `vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default vhost within the base `::apache` class, as well as set a customized vhost as default. Your customized vhost (priority 10) will be privileged over the base class vhost (15).
 
+The `vhost` defined type uses `concat::fragment` to build the configuration file, so if you want to inject custom fragments for pieces of the configuration not supported by default by the defined type, you can simply add a custom fragment.  For the `order` parameter for the custom fragment, the `vhost` defined type uses multiples of 10, so any order that isn't a multiple of 10 should work.
+
+```puppet
+    apache::vhost { "example.com":
+      docroot  => '/var/www/html',
+      priority => '25',
+    }
+    concat::fragment { "example.com-my_custom_fragment":
+      target  => '25-example.com.conf',
+      order   => 11,
+      content => '# my custom comment',
+    }
+```
+
 If you have a series of specific configurations and do not want a base `::apache` class default vhost, make sure to set the base class `default_vhost` to 'false'.
 
 ```puppet
diff --git a/Rakefile b/Rakefile
index e1f7f013cd..01c85eb991 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,9 +2,9 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
 PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.send('disable_only_variable_string')
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index cc9d837e70..95289ac40c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1,177 +1,101 @@
-# Definition: apache::vhost
-#
-# This class installs Apache Virtual Hosts
-#
-# Parameters:
-# - The $port to configure the host on
-# - The $docroot provides the DocumentRoot variable
-# - The $virtual_docroot provides VirtualDocumentationRoot variable
-# - The $serveradmin will specify an email address for Apache that it will
-#   display when it renders one of it's error pages
-# - The $ssl option is set true or false to enable SSL for this Virtual Host
-# - The $priority of the site
-# - The $servername is the primary name of the virtual host
-# - The $serveraliases of the site
-# - The $ip to configure the host on, defaulting to *
-# - The $options for the given vhost
-# - The $override for the given vhost (list of AllowOverride arguments)
-# - The $vhost_name for name based virtualhosting, defaulting to *
-# - The $logroot specifies the location of the virtual hosts logfiles, default
-#   to /var/log/<apache log location>/
-# - The $log_level specifies the verbosity of the error log for this vhost. Not
-#   set by default for the vhost, instead the global server configuration default
-#   of 'warn' is used.
-# - The $access_log specifies if *_access.log directives should be configured.
-# - The $ensure specifies if vhost file is present or absent.
-# - The $headers is a list of Header statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header
-# - The $request_headers is a list of RequestHeader statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-# - $aliases is a list of Alias hashes for mod_alias as per http://httpd.apache.org/docs/current/mod/mod_alias.html
-#   each statement is a hash in the form of { alias => '/alias', path => '/real/path/to/directory' }
-# - $directories is a lost of hashes for creating <Directory> statements as per http://httpd.apache.org/docs/2.2/mod/core.html#directory
-#   each statement is a hash in the form of { path => '/path/to/directory', <directive> => <value>}
-#   see README.md for list of supported directives.
-#
-# Actions:
-# - Install Apache Virtual Hosts
-#
-# Requires:
-# - The apache class
-#
-# Sample Usage:
-#
-#  # Simple vhost definition:
-#  apache::vhost { 'site.name.fqdn':
-#    port => '80',
-#    docroot => '/path/to/docroot',
-#  }
-#
-#  # Multiple Mod Rewrites:
-#  apache::vhost { 'site.name.fqdn':
-#    port => '80',
-#    docroot => '/path/to/docroot',
-#    rewrites => [
-#      {
-#        comment       => 'force www domain',
-#        rewrite_cond => ['%{HTTP_HOST} ^([a-z.]+)?example.com$ [NC]', '%{HTTP_HOST} !^www. [NC]'],
-#        rewrite_rule => ['.? http://www.%1example.com%{REQUEST_URI} [R=301,L]']
-#      },
-#      {
-#        comment       => 'prevent image hotlinking',
-#        rewrite_cond => ['%{HTTP_REFERER} !^$', '%{HTTP_REFERER} !^http://(www.)?example.com/ [NC]'],
-#        rewrite_rule => ['.(gif|jpg|png)$ - [F]']
-#      },
-#    ]
-#  }
-#
-#  # SSL vhost with non-SSL rewrite:
-#  apache::vhost { 'site.name.fqdn':
-#    port    => '443',
-#    ssl     => true,
-#    docroot => '/path/to/docroot',
-#  }
-#  apache::vhost { 'site.name.fqdn':
-#    port            => '80',
-#    docroot         => '/path/to/other_docroot',
-#    custom_fragment => template("${module_name}/my_fragment.erb"),
-#  }
-#
+# See README.md for usage information
 define apache::vhost(
-    $docroot,
-    $manage_docroot              = true,
-    $virtual_docroot             = false,
-    $port                        = undef,
-    $ip                          = undef,
-    $ip_based                    = false,
-    $add_listen                  = true,
-    $docroot_owner               = 'root',
-    $docroot_group               = $::apache::params::root_group,
-    $docroot_mode                = undef,
-    $serveradmin                 = undef,
-    $ssl                         = false,
-    $ssl_cert                    = $::apache::default_ssl_cert,
-    $ssl_key                     = $::apache::default_ssl_key,
-    $ssl_chain                   = $::apache::default_ssl_chain,
-    $ssl_ca                      = $::apache::default_ssl_ca,
-    $ssl_crl_path                = $::apache::default_ssl_crl_path,
-    $ssl_crl                     = $::apache::default_ssl_crl,
-    $ssl_certs_dir               = $::apache::params::ssl_certs_dir,
-    $ssl_protocol                = undef,
-    $ssl_cipher                  = undef,
-    $ssl_honorcipherorder        = undef,
-    $ssl_verify_client           = undef,
-    $ssl_verify_depth            = undef,
-    $ssl_options                 = undef,
-    $ssl_proxyengine             = false,
-    $priority                    = undef,
-    $default_vhost               = false,
-    $servername                  = $name,
-    $serveraliases               = [],
-    $options                     = ['Indexes','FollowSymLinks','MultiViews'],
-    $override                    = ['None'],
-    $directoryindex              = '',
-    $vhost_name                  = '*',
-    $logroot                     = $::apache::logroot,
-    $logroot_mode                = undef,
-    $log_level                   = undef,
-    $access_log                  = true,
-    $access_log_file             = undef,
-    $access_log_pipe             = undef,
-    $access_log_syslog           = undef,
-    $access_log_format           = undef,
-    $access_log_env_var          = undef,
-    $aliases                     = undef,
-    $directories                 = undef,
-    $error_log                   = true,
-    $error_log_file              = undef,
-    $error_log_pipe              = undef,
-    $error_log_syslog            = undef,
-    $error_documents             = [],
-    $fallbackresource            = undef,
-    $scriptalias                 = undef,
-    $scriptaliases               = [],
-    $proxy_dest                  = undef,
-    $proxy_pass                  = undef,
-    $suphp_addhandler            = $::apache::params::suphp_addhandler,
-    $suphp_engine                = $::apache::params::suphp_engine,
-    $suphp_configpath            = $::apache::params::suphp_configpath,
-    $php_admin_flags             = [],
-    $php_admin_values            = [],
-    $no_proxy_uris               = [],
-    $proxy_preserve_host         = false,
-    $redirect_source             = '/',
-    $redirect_dest               = undef,
-    $redirect_status             = undef,
-    $redirectmatch_status        = undef,
-    $redirectmatch_regexp        = undef,
-    $rack_base_uris              = undef,
-    $headers                     = undef,
-    $request_headers             = undef,
-    $rewrites                    = undef,
-    $rewrite_base                = undef,
-    $rewrite_rule                = undef,
-    $rewrite_cond                = undef,
-    $setenv                      = [],
-    $setenvif                    = [],
-    $block                       = [],
-    $ensure                      = 'present',
-    $wsgi_application_group      = undef,
-    $wsgi_daemon_process         = undef,
-    $wsgi_daemon_process_options = undef,
-    $wsgi_import_script          = undef,
-    $wsgi_import_script_options  = undef,
-    $wsgi_process_group          = undef,
-    $wsgi_script_aliases         = undef,
-    $wsgi_pass_authorization     = undef,
-    $custom_fragment             = undef,
-    $itk                         = undef,
-    $action                      = undef,
-    $fastcgi_server              = undef,
-    $fastcgi_socket              = undef,
-    $fastcgi_dir                 = undef,
-    $additional_includes         = [],
-    $apache_version              = $::apache::apache_version,
-    $suexec_user_group           = undef,
-  ) {
+  $docroot,
+  $manage_docroot              = true,
+  $virtual_docroot             = false,
+  $port                        = undef,
+  $ip                          = undef,
+  $ip_based                    = false,
+  $add_listen                  = true,
+  $docroot_owner               = 'root',
+  $docroot_group               = $::apache::params::root_group,
+  $docroot_mode                = undef,
+  $serveradmin                 = undef,
+  $ssl                         = false,
+  $ssl_cert                    = $::apache::default_ssl_cert,
+  $ssl_key                     = $::apache::default_ssl_key,
+  $ssl_chain                   = $::apache::default_ssl_chain,
+  $ssl_ca                      = $::apache::default_ssl_ca,
+  $ssl_crl_path                = $::apache::default_ssl_crl_path,
+  $ssl_crl                     = $::apache::default_ssl_crl,
+  $ssl_certs_dir               = $::apache::params::ssl_certs_dir,
+  $ssl_protocol                = undef,
+  $ssl_cipher                  = undef,
+  $ssl_honorcipherorder        = undef,
+  $ssl_verify_client           = undef,
+  $ssl_verify_depth            = undef,
+  $ssl_options                 = undef,
+  $ssl_proxyengine             = false,
+  $priority                    = undef,
+  $default_vhost               = false,
+  $servername                  = $name,
+  $serveraliases               = [],
+  $options                     = ['Indexes','FollowSymLinks','MultiViews'],
+  $override                    = ['None'],
+  $directoryindex              = '',
+  $vhost_name                  = '*',
+  $logroot                     = $::apache::logroot,
+  $logroot_mode                = undef,
+  $log_level                   = undef,
+  $access_log                  = true,
+  $access_log_file             = undef,
+  $access_log_pipe             = undef,
+  $access_log_syslog           = undef,
+  $access_log_format           = undef,
+  $access_log_env_var          = undef,
+  $aliases                     = undef,
+  $directories                 = undef,
+  $error_log                   = true,
+  $error_log_file              = undef,
+  $error_log_pipe              = undef,
+  $error_log_syslog            = undef,
+  $error_documents             = [],
+  $fallbackresource            = undef,
+  $scriptalias                 = undef,
+  $scriptaliases               = [],
+  $proxy_dest                  = undef,
+  $proxy_pass                  = undef,
+  $suphp_addhandler            = $::apache::params::suphp_addhandler,
+  $suphp_engine                = $::apache::params::suphp_engine,
+  $suphp_configpath            = $::apache::params::suphp_configpath,
+  $php_admin_flags             = [],
+  $php_admin_values            = [],
+  $no_proxy_uris               = [],
+  $proxy_preserve_host         = false,
+  $redirect_source             = '/',
+  $redirect_dest               = undef,
+  $redirect_status             = undef,
+  $redirectmatch_status        = undef,
+  $redirectmatch_regexp        = undef,
+  $rack_base_uris              = undef,
+  $headers                     = undef,
+  $request_headers             = undef,
+  $rewrites                    = undef,
+  $rewrite_base                = undef,
+  $rewrite_rule                = undef,
+  $rewrite_cond                = undef,
+  $setenv                      = [],
+  $setenvif                    = [],
+  $block                       = [],
+  $ensure                      = 'present',
+  $wsgi_application_group      = undef,
+  $wsgi_daemon_process         = undef,
+  $wsgi_daemon_process_options = undef,
+  $wsgi_import_script          = undef,
+  $wsgi_import_script_options  = undef,
+  $wsgi_process_group          = undef,
+  $wsgi_script_aliases         = undef,
+  $wsgi_pass_authorization     = undef,
+  $custom_fragment             = undef,
+  $itk                         = undef,
+  $action                      = undef,
+  $fastcgi_server              = undef,
+  $fastcgi_socket              = undef,
+  $fastcgi_dir                 = undef,
+  $additional_includes         = [],
+  $apache_version              = $::apache::apache_version,
+  $suexec_user_group           = undef,
+) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
@@ -285,7 +209,7 @@
       group   => $docroot_group,
       mode    => $docroot_mode,
       require => Package['httpd'],
-      before  => File["${priority_real}-${filename}.conf"],
+      before  => Concat["${priority_real}-${filename}.conf"],
     }
   }
 
@@ -454,91 +378,9 @@
     $_directories = [ merge($_directory, $_directory_version) ]
   }
 
-  # Template uses:
-  # - $nvh_addr_port
-  # - $servername
-  # - $serveradmin
-  # - $docroot
-  # - $virtual_docroot
-  # - $options
-  # - $override
-  # - $logroot
-  # - $name
-  # - $aliases
-  # - $_directories
-  # - $log_level
-  # - $access_log
-  # - $access_log_destination
-  # - $_access_log_format
-  # - $_access_log_env_var
-  # - $error_log
-  # - $error_log_destination
-  # - $error_documents
-  # - $fallbackresource
-  # - $custom_fragment
-  # - $additional_includes
-  # block fragment:
-  #   - $block
-  # directories fragment:
-  #   - $passenger_enabled
-  #   - $php_admin_flags
-  #   - $php_admin_values
-  #   - $directories (a list of key-value hashes is expected)
-  # fastcgi fragment:
-  #   - $fastcgi_server
-  #   - $fastcgi_socket
-  #   - $fastcgi_dir
-  # proxy fragment:
-  #   - $proxy_dest
-  #   - $no_proxy_uris
-  #   - $proxy_preserve_host (true to set ProxyPreserveHost to on and false to off
-  # rack fragment:
-  #   - $rack_base_uris
-  # redirect fragment:
-  #   - $redirect_source
-  #   - $redirect_dest
-  #   - $redirect_status
-  # header fragment
-  #   - $headers
-  # requestheader fragment:
-  #   - $request_headers
-  # rewrite fragment:
-  #   - $rewrites
-  # scriptalias fragment:
-  #   - $scriptalias
-  #   - $scriptaliases
-  #   - $ssl
-  # serveralias fragment:
-  #   - $serveraliases
-  # setenv fragment:
-  #   - $setenv
-  #   - $setenvif
-  # ssl fragment:
-  #   - $ssl
-  #   - $ssl_cert
-  #   - $ssl_key
-  #   - $ssl_chain
-  #   - $ssl_certs_dir
-  #   - $ssl_ca
-  #   - $ssl_crl
-  #   - $ssl_crl_path
-  #   - $ssl_verify_client
-  #   - $ssl_verify_depth
-  #   - $ssl_options
-  # suphp fragment:
-  #   - $suphp_addhandler
-  #   - $suphp_engine
-  #   - $suphp_configpath
-  # wsgi fragment:
-  #   - $wsgi_application_group
-  #   - $wsgi_daemon_process
-  #   - $wsgi_import_script
-  #   - $wsgi_process_group
-  #   - $wsgi_script_aliases
-  file { "${priority_real}-${filename}.conf":
+  concat { "${priority_real}-${filename}.conf":
     ensure  => $ensure,
     path    => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
-    content => template('apache/vhost.conf.erb'),
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
@@ -558,8 +400,357 @@
       owner   => 'root',
       group   => $::apache::params::root_group,
       mode    => '0644',
-      require => File["${priority_real}-${filename}.conf"],
+      require => Concat["${priority_real}-${filename}.conf"],
       notify  => Service['httpd'],
     }
   }
+
+  # Template uses:
+  # - $nvh_addr_port
+  # - $servername
+  # - $serveradmin
+  concat::fragment { "${name}-apache-header":
+    target  => "${priority_real}-${filename}.conf",
+    order   => 0,
+    content => template('apache/vhost/_file_header.erb'),
+  }
+
+  # Template uses:
+  # - $virtual_docroot
+  # - $docroot
+  concat::fragment { "${name}-docroot":
+    target  => "${priority_real}-${filename}.conf",
+    order   => 10,
+    content => template('apache/vhost/_docroot.erb'),
+  }
+
+  # Template uses:
+  # - $aliases
+  if $aliases and ! empty($aliases) {
+    concat::fragment { "${name}-aliases":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 20,
+      content => template('apache/vhost/_aliases.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $itk
+  # - $::kernelversion
+  if $itk and ! empty($itk) {
+    concat::fragment { "${name}-itk":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 30,
+      content => template('apache/vhost/_itk.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $fallbackresource
+  if $fallbackresource {
+    concat::fragment { "${name}-fallbackresource":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 40,
+      content => template('apache/vhost/_fallbackresource.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $_directories
+  # - $docroot
+  # - $apache_version
+  # - $suphp_engine
+  if $_directories and ! empty($_directories) {
+    concat::fragment { "${name}-directories":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 50,
+      content => template('apache/vhost/_directories.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $additional_includes
+  if $additional_includes and ! empty($additional_includes) {
+    concat::fragment { "${name}-additional_includes":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 60,
+      content => template('apache/vhost/_additional_includes.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $error_log
+  # - $log_level
+  # - $error_log_destination
+  # - $log_level
+  if $error_log or $log_level {
+    concat::fragment { "${name}-logging":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 70,
+      content => template('apache/vhost/_logging.erb'),
+    }
+  }
+
+  # Template uses no variables
+  concat::fragment { "${name}-serversignature":
+    target  => "${priority_real}-${filename}.conf",
+    order   => 80,
+    content => template('apache/vhost/_serversignature.erb'),
+  }
+
+  # Template uses:
+  # - $access_log
+  # - $_access_log_env_var
+  # - $access_log_destination
+  # - $_access_log_format
+  # - $_access_log_env_var
+  if $access_log {
+    concat::fragment { "${name}-access_log":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 90,
+      content => template('apache/vhost/_access_log.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $action
+  if $action {
+    concat::fragment { "${name}-action":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 100,
+      content => template('apache/vhost/_action.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $block
+  # - $apache_version
+  if $block and ! empty($block) {
+    concat::fragment { "${name}-block":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 110,
+      content => template('apache/vhost/_block.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $error_documents
+  if $error_documents and ! empty($error_documents) {
+    concat::fragment { "${name}-error_document":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 120,
+      content => template('apache/vhost/_error_document.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $proxy_dest
+  # - $proxy_pass
+  # - $proxy_preserve_host
+  # - $no_proxy_uris
+  if $proxy_dest or $proxy_pass {
+    concat::fragment { "${name}-proxy":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 130,
+      content => template('apache/vhost/_proxy.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $rack_base_uris
+  if $rack_base_uris {
+    concat::fragment { "${name}-rack":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 140,
+      content => template('apache/vhost/_rack.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $redirect_source
+  # - $redirect_dest
+  # - $redirect_status
+  # - $redirect_dest_a
+  # - $redirect_source_a
+  # - $redirect_status_a
+  # - $redirectmatch_status
+  # - $redirectmatch_regexp
+  # - $redirectmatch_status_a
+  # - $redirectmatch_regexp_a
+  if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp) {
+    concat::fragment { "${name}-redirect":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 150,
+      content => template('apache/vhost/_redirect.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $rewrites
+  # - $rewrite_base
+  # - $rewrite_rule
+  # - $rewrite_cond
+  if $rewrites or $rewrite_rule {
+    concat::fragment { "${name}-rewrite":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 160,
+      content => template('apache/vhost/_rewrite.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $scriptaliases
+  # - $scriptalias
+  if $scriptaliases and ! empty($scriptaliases) {
+    concat::fragment { "${name}-scriptalias":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 170,
+      content => template('apache/vhost/_scriptalias.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $serveraliases
+  if $serveraliases and ! empty($serveraliases) {
+    concat::fragment { "${name}-serveralias":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 180,
+      content => template('apache/vhost/_serveralias.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $setenv
+  # - $setenvif
+  if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
+    concat::fragment { "${name}-setenv":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 190,
+      content => template('apache/vhost/_setenv.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $ssl
+  # - $ssl_cert
+  # - $ssl_key
+  # - $ssl_chain
+  # - $ssl_certs_dir
+  # - $ssl_ca
+  # - $ssl_crl_path
+  # - $ssl_crl
+  # - $ssl_proxyengine
+  # - $ssl_protocol
+  # - $ssl_cipher
+  # - $ssl_honorcipherorder
+  # - $ssl_verify_client
+  # - $ssl_verify_depth
+  # - $ssl_options
+  if $ssl {
+    concat::fragment { "${name}-ssl":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 200,
+      content => template('apache/vhost/_ssl.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $suphp_engine
+  # - $suphp_addhandler
+  # - $suphp_configpath
+  if $suphp_engine == 'on' {
+    concat::fragment { "${name}-suphp":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 210,
+      content => template('apache/vhost/_suphp.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $php_admin_values
+  # - $php_admin_flags
+  if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) {
+    concat::fragment { "${name}-php_admin":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 220,
+      content => template('apache/vhost/_php_admin.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $headers
+  if $headers and ! empty($headers) {
+    concat::fragment { "${name}-header":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 230,
+      content => template('apache/vhost/_header.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $request_headers
+  if $request_headers and ! empty($request_headers) {
+    concat::fragment { "${name}-requestheader":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 240,
+      content => template('apache/vhost/_requestheader.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $wsgi_application_group
+  # - $wsgi_daemon_process
+  # - $wsgi_daemon_process_options
+  # - $wsgi_import_script
+  # - $wsgi_import_script_options
+  # - $wsgi_process_group
+  # - $wsgi_script_aliases
+  # - $wsgi_pass_authorization
+  if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
+    concat::fragment { "${name}-wsgi":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 250,
+      content => template('apache/vhost/_wsgi.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $custom_fragment
+  if $custom_fragment {
+    concat::fragment { "${name}-custom_fragment":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 260,
+      content => template('apache/vhost/_custom_fragment.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $fastcgi_server
+  # - $fastcgi_socket
+  # - $fastcgi_dir
+  # - $apache_version
+  if $fastcgi_server or $fastcgi_dir {
+    concat::fragment { "${name}-fastcgi":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 270,
+      content => template('apache/vhost/_fastcgi.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $suexec_user_group
+  if $suexec_user_group {
+    concat::fragment { "${name}-suexec":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 280,
+      content => template('apache/vhost/_suexec.erb'),
+    }
+  }
+
+  # Template uses no variables
+  concat::fragment { "${name}-file_footer":
+    target  => "${priority_real}-${filename}.conf",
+    order   => 999,
+    content => template('apache/vhost/_file_footer.erb'),
+  }
 }
diff --git a/metadata.json b/metadata.json
index f225f70e90..fba59e7c39 100644
--- a/metadata.json
+++ b/metadata.json
@@ -74,7 +74,7 @@
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.0.0"
+      "version_requirement": ">= 1.1.0"
     }
   ]
 }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index e47765bf75..bc131a1c55 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'apache::vhost', :type => :define do
   let :pre_condition do
-    'class { "apache": default_vhost => false, }'
+    'class { "apache": default_vhost => false, default_mods => false, }'
   end
   let :title do
     'rspec.example.com'
@@ -100,1496 +100,481 @@
       it { is_expected.to contain_apache__listen(params[:port]) }
       it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
     end
-
-    # All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content" do
-      [
-        {
-          :title => 'should contain docroot',
-          :attr  => 'docroot',
-          :value => '/not/default',
-          :match => [/^  DocumentRoot "\/not\/default"$/,/  <Directory "\/not\/default">/],
-        },
-        {
-          :title => 'should set a port',
-          :attr  => 'port',
-          :value => '8080',
-          :match => [/^<VirtualHost \*:8080>$/],
-        },
-        {
-          :title => 'should set an ip',
-          :attr  => 'ip',
-          :value => '10.0.0.1',
-          :match => [/^<VirtualHost 10\.0\.0\.1:84>$/],
-        },
-        {
-          :title => 'should set a serveradmin',
-          :attr  => 'serveradmin',
-          :value => 'test@test.com',
-          :match => [/^  ServerAdmin test@test.com$/],
-        },
-        {
-          :title => 'should enable ssl',
-          :attr  => 'ssl',
-          :value => true,
-          :match => [/^  SSLEngine on$/],
-        },
-        {
-          :title => 'should set a servername',
-          :attr  => 'servername',
-          :value => 'param.test',
-          :match => [/^  ServerName param.test$/],
-        },
-        {
-          :title => 'should accept server aliases',
-          :attr  => 'serveraliases',
-          :value => ['one.com','two.com'],
-          :match => [
-            /^  ServerAlias one\.com$/,
-            /^  ServerAlias two\.com$/
-          ],
-        },
-        {
-          :title => 'should accept setenv',
-          :attr  => 'setenv',
-          :value => ['TEST1 one','TEST2 two'],
-          :match => [
-            /^  SetEnv TEST1 one$/,
-            /^  SetEnv TEST2 two$/
-          ],
-        },
-        {
-          :title => 'should accept setenvif',
-          :attr  => 'setenvif',
-          ## These are bugged in rspec-puppet; the $1 is droped
-          #:value => ['Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1'],
-          #:match => ['  SetEnvIf Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1'],
-          :value => ['Host "^test\.com$" VHOST_ACCESS=test'],
-          :match => [/^  SetEnvIf Host "\^test\\.com\$" VHOST_ACCESS=test$/],
-        },
-        {
-          :title => 'should accept options',
-          :attr  => 'options',
-          :value => ['Fake','Options'],
-          :match => [/^    Options Fake Options$/],
-        },
-        {
-          :title => 'should accept overrides',
-          :attr  => 'override',
-          :value => ['Fake', 'Override'],
-          :match => [/^    AllowOverride Fake Override$/],
-        },
-        {
-          :title => 'should accept logroot',
-          :attr  => 'logroot',
-          :value => '/fake/log',
-          :match => [/CustomLog "\/fake\/log\//,/ErrorLog "\/fake\/log\//],
-        },
-        {
-          :title => 'should accept log_level',
-          :attr  => 'log_level',
-          :value => 'info',
-          :match => [/LogLevel info/],
-        },
-        {
-          :title => 'should accept pipe destination for access log',
-          :attr  => 'access_log_pipe',
-          :value => '| /bin/fake/logging',
-          :match => [/CustomLog "| \/bin\/fake\/logging" combined$/],
-        },
-        {
-          :title => 'should accept pipe destination for error log',
-          :attr  => 'error_log_pipe',
-          :value => '| /bin/fake/logging',
-          :match => [/ErrorLog "| \/bin\/fake\/logging" combined$/],
-        },
-        {
-          :title => 'should accept syslog destination for access log',
-          :attr  => 'access_log_syslog',
-          :value => 'syslog:local1',
-          :match => [/CustomLog "syslog:local1" combined$/],
-        },
-        {
-          :title => 'should accept syslog destination for error log',
-          :attr  => 'error_log_syslog',
-          :value => 'syslog',
-          :match => [/ErrorLog "syslog"$/],
-        },
-        {
-          :title => 'should accept custom format for access logs',
-          :attr  => 'access_log_format',
-          :value => '%h %{X-Forwarded-For}i %l %u %t \"%r\" %s %b  \"%{Referer}i\" \"%{User-agent}i\" \"Host: %{Host}i\" %T %D',
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" "%h %\{X-Forwarded-For\}i %l %u %t \\"%r\\" %s %b  \\"%\{Referer\}i\\" \\"%\{User-agent\}i\\" \\"Host: %\{Host\}i\\" %T %D"$/],
-        },
-        {
-          :title => 'should contain access logs',
-          :attr  => 'access_log',
-          :value => true,
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined$/],
-        },
-        {
-          :title    => 'should not contain access logs',
-          :attr     => 'access_log',
-          :value    => false,
-          :notmatch => [/CustomLog "\/var\/log\/.+_access\.log" combined$/],
-        },
-        {
-          :title => 'should contain error logs',
-          :attr  => 'error_log',
-          :value => true,
-          :match => [/ErrorLog.+$/],
-        },
-        {
-          :title    => 'should not contain error logs',
-          :attr     => 'error_log',
-          :value    => false,
-          :notmatch => [/ErrorLog.+$/],
-        },
-        {
-          :title    => 'should set ErrorDocument 503',
-          :attr     => 'error_documents',
-          :value    => [ { 'error_code' => '503', 'document' => '"Go away, the backend is broken."'}],
-          :match => [/^  ErrorDocument 503 "Go away, the backend is broken."$/],
-        },
-        {
-          :title    => 'should set ErrorDocuments 503 407',
-          :attr     => 'error_documents',
-          :value    => [
-            { 'error_code' => '503', 'document' => '/service-unavail'},
-            { 'error_code' => '407', 'document' => 'https://example.com/proxy/login'},
-          ],
-          :match => [
-            /^  ErrorDocument 503 \/service-unavail$/,
-            /^  ErrorDocument 407 https:\/\/example\.com\/proxy\/login$/,
-          ],
-        },
-        {
-          :title    => 'should set ErrorDocument 503 in directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/srv/www', 'error_documents' => [{ 'error_code' => '503', 'document' => '"Go away, the backend is broken."'}] },
-          :match => [/^    ErrorDocument 503 "Go away, the backend is broken."$/],
-        },
-        {
-          :title    => 'should set ErrorDocuments 503 407 in directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/srv/www', 'error_documents' =>
-          [
-            { 'error_code' => '503', 'document' => '/service-unavail'},
-            { 'error_code' => '407', 'document' => 'https://example.com/proxy/login'},
-          ]},
-          :match => [
-            /^    ErrorDocument 503 \/service-unavail$/,
-            /^    ErrorDocument 407 https:\/\/example\.com\/proxy\/login$/,
-          ],
-        },
-        {
-          :title => 'should accept a scriptalias',
-          :attr  => 'scriptalias',
-          :value => '/usr/scripts',
-          :match => [
-            /^  ScriptAlias \/cgi-bin "\/usr\/scripts"$/,
-          ],
-        },
-        {
-          :title    => 'should accept a single scriptaliases',
-          :attr     => 'scriptaliases',
-          :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
-          :match    => [
-            /^  ScriptAlias \/blah\/ "\/usr\/scripts"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept multiple scriptaliases',
-          :attr     => 'scriptaliases',
-          :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2', 'path' => '/usr/scripts' } ],
-          :match    => [
-            /^  ScriptAlias \/blah "\/usr\/scripts"$/,
-            /^  ScriptAlias \/blah2 "\/usr\/scripts"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept multiple scriptaliases with and without trailing slashes',
-          :attr     => 'scriptaliases',
-          :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts2/' } ],
-          :match    => [
-            /^  ScriptAlias \/blah "\/usr\/scripts"$/,
-            /^  ScriptAlias \/blah2\/ "\/usr\/scripts2\/"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept a ScriptAliasMatch directive',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [ { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' } ],
-          :match    => [
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/
-          ],
-        },
-        {
-          :title    => 'should accept multiple ScriptAliasMatch directives',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [
-            { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' },
-            { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
-          ],
-          :match    => [
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/,
-            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" "\/var\/www\/bin\/gitolite-suexec-wrapper\/FOO"$/,
-          ],
-        },
-        {
-          :title    => 'should accept mixed ScriptAlias and ScriptAliasMatch directives',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [
-            { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
-            { 'alias' => '/git', 'path' => '/var/www/gitweb/index.cgi' },
-            { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' },
-            { 'alias' => '/trac', 'path' => '/etc/apache2/trac.fcgi' },
-          ],
-          :match    => [
-            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" "\/var\/www\/bin\/gitolite-suexec-wrapper\/FOO"$/,
-            /^  ScriptAlias \/git "\/var\/www\/gitweb\/index\.cgi"$/,
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/,
-            /^  ScriptAlias \/trac "\/etc\/apache2\/trac.fcgi"$/,
-          ],
-        },
-        {
-          :title    => 'should accept proxy destinations',
-          :attr     => 'proxy_dest',
-          :value    => 'http://fake.com',
-          :match    => [
-            /^  ProxyPass          \/ http:\/\/fake.com\/$/,
-            /^  <Location          \/>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/$/,
-            /^  <\/Location>$/,
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title    => 'should accept proxy_pass hash',
-          :attr     => 'proxy_pass',
-          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a' },
-          :match    => [
-            /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
-            /^  <Location \/path-a>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/a$/,
-            /^  <\/Location>$/,
-
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title    => 'should accept reverse_urls string',
-          :attr     => 'proxy_pass',
-          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a', 'reverse_urls' => 'http://127.0.0.1:8080' },
-          :match    => [
-            /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
-            /^  <Location \/path-a>$/,
-            /^    ProxyPassReverse http:\/\/127.0.0.1:8080$/,
-            /^  <\/Location>$/,
-
-          ],
-          :notmatch => [/^    ProxyPassReverse http:\/\/fake.com\/a$/],
-        },
-        {
-          :title    => 'should accept reverse_urls array',
-          :attr     => 'proxy_pass',
-          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a', 'reverse_urls' => ['http://127.0.0.1:8080', 'http://127.0.0.1:8081'] },
-          :match    => [
-            /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
-            /^  <Location \/path-a>$/,
-            /^    ProxyPassReverse http:\/\/127.0.0.1:8080$/,
-            /^    ProxyPassReverse http:\/\/127.0.0.1:8081$/,
-            /^  <\/Location>$/,
-
-          ],
-          :notmatch => [/^    ProxyPassReverse http:\/\/fake.com\/a$/],
-        },
-        {
-          :title    => 'should accept proxy_pass array of hash',
-          :attr     => 'proxy_pass',
-          :value    => [
-            { 'path' => '/path-a/', 'url' => 'http://fake.com/a/' },
-            { 'path' => '/path-b', 'url' => 'http://fake.com/b' },
-          ],
-          :match    => [
-            /^  ProxyPass \/path-a\/ http:\/\/fake.com\/a\/$/,
-            /^  <Location \/path-a\/>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/a\/$/,
-            /^  <\/Location>$/,
-            /^  ProxyPass \/path-b http:\/\/fake.com\/b$/,
-            /^  <Location \/path-b>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/b$/,
-            /^  <\/Location>$/,
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title => 'should enable rack',
-          :attr  => 'rack_base_uris',
-          :value => ['/rack1','/rack2'],
-          :match => [
-            /^  RackBaseURI \/rack1$/,
-            /^  RackBaseURI \/rack2$/,
-          ],
-        },
-        {
-          :title => 'should accept headers',
-          :attr  => 'headers',
-          :value => ['add something', 'merge something_else'],
-          :match => [
-            /^  Header add something$/,
-            /^  Header merge something_else$/,
-          ],
-        },
-        {
-          :title => 'should accept request headers',
-          :attr  => 'request_headers',
-          :value => ['append something', 'unset something_else'],
-          :match => [
-            /^  RequestHeader append something$/,
-            /^  RequestHeader unset something_else$/,
-          ],
-        },
-        {
-          :title => 'should accept rewrite rules',
-          :attr  => 'rewrite_rule',
-          :value => 'not a real rule',
-          :match => [/^  RewriteRule not a real rule$/],
-        },
-        {
-          :title => 'should accept rewrite rules',
-          :attr  => 'rewrites',
-          :value => [{'rewrite_rule' => ['not a real rule']}],
-          :match => [/^  RewriteRule not a real rule$/],
-        },
-        {
-          :title => 'should accept rewrite comment',
-          :attr  => 'rewrites',
-          :value => [{'comment' => 'rewrite comment', 'rewrite_rule' => ['not a real rule']}],
-          :match => [/^  #rewrite comment/],
-        },
-        {
-          :title => 'should accept rewrite conditions',
-          :attr  => 'rewrites',
-          :value => [{'comment' => 'redirect IE', 'rewrite_cond' => ['%{HTTP_USER_AGENT} ^MSIE'], 'rewrite_rule' => ['^index\.html$ welcome.html'],}],
-          :match => [
-            /^  #redirect IE$/,
-            /^  RewriteCond %{HTTP_USER_AGENT} \^MSIE$/,
-            /^  RewriteRule \^index\\\.html\$ welcome.html$/,
-          ],
-        },
-        {
-          :title => 'should accept multiple rewrites',
-          :attr  => 'rewrites',
-          :value => [
-            {'rewrite_rule' => ['not a real rule']},
-            {'rewrite_rule' => ['not a real rule two']},
-          ],
-          :match => [
-            /^  RewriteRule not a real rule$/,
-            /^  RewriteRule not a real rule two$/,
-          ],
-        },
-        {
-          :title => 'should block scm',
-          :attr  => 'block',
-          :value => 'scm',
-          :match => [/^  <DirectoryMatch \.\*\\\.\(svn\|git\|bzr\)\/\.\*>$/],
-        },
-        {
-          :title => 'should accept a custom fragment',
-          :attr  => 'custom_fragment',
-          :value => "  Some custom fragment line\n  That spans multiple lines",
-          :match => [
-            /^  Some custom fragment line$/,
-            /^  That spans multiple lines$/,
-            /^<\/VirtualHost>$/,
-          ],
-        },
-        {
-          :title => 'should accept an array of alias hashes',
-          :attr  => 'aliases',
-          :value => [ { 'alias' => '/', 'path' => '/var/www'} ],
-          :match => [/^  Alias \/ "\/var\/www"$/],
-        },
-        {
-          :title => 'should accept an alias hash',
-          :attr  => 'aliases',
-          :value => { 'alias' => '/', 'path' => '/var/www'},
-          :match => [/^  Alias \/ "\/var\/www"$/],
-        },
-        {
-          :title => 'should accept multiple aliases',
-          :attr  => 'aliases',
-          :value => [
-            { 'alias' => '/', 'path' => '/var/www'},
-            { 'alias' => '/cgi-bin', 'path' => '/var/www/cgi-bin'},
-            { 'alias' => '/css', 'path' => '/opt/someapp/css'},
-          ],
-          :match => [
-            /^  Alias \/ "\/var\/www"$/,
-            /^  Alias \/cgi-bin "\/var\/www\/cgi-bin"$/,
-            /^  Alias \/css "\/opt\/someapp\/css"$/,
-          ],
-        },
-        {
-          :title => 'should accept an aliasmatch hash',
-          :attr  => 'aliases',
-          ## XXX As mentioned above, rspec-puppet drops the $1. Thus, these
-          # tests don't work.
-          #:value => { 'aliasmatch' => '^/image/(.*).gif', 'path' => '/files/gifs/$1.gif' },
-          #:match => [/^  AliasMatch \^\/image\/\(\.\*\)\.gif \/files\/gifs\/\$1\.gif$/],
-        },
-        {
-          :title => 'should accept a array of alias and aliasmatch hashes mixed',
-          :attr  => 'aliases',
-          ## XXX As mentioned above, rspec-puppet drops the $1. Thus, these
-          # tests don't work.
-          #:value => [
-          #  { 'alias' => '/css', 'path' => '/files/css' },
-          #  { 'aliasmatch' => '^/image/(.*).gif', 'path' => '/files/gifs/$1.gif' },
-          #  { 'aliasmatch' => '^/image/(.*).jpg', 'path' => '/files/jpgs/$1.jpg' },
-          #  { 'alias' => '/image', 'path' => '/files/images' },
-          #],
-          #:match => [
-          #  /^  Alias \/css \/files\/css$/,
-          #  /^  AliasMatch \^\/image\/\(.\*\)\.gif \/files\/gifs\/\$1\.gif$/,
-          #  /^  AliasMatch \^\/image\/\(.\*\)\.jpg \/files\/jpgs\/\$1\.jpg$/,
-          #  /^  Alias \/image \/files\/images$/
-          #],
-        },
-        {
-          :title => 'should accept multiple additional includes',
-          :attr  => 'additional_includes',
-          :value => [
-            '/tmp/proxy_group_a',
-            '/tmp/proxy_group_b',
-            '/tmp/proxy_group_c',
-          ],
-          :match => [
-            /^  Include "\/tmp\/proxy_group_a"$/,
-            /^  Include "\/tmp\/proxy_group_b"$/,
-            /^  Include "\/tmp\/proxy_group_c"$/,
-          ],
-        },
-        {
-          :title => 'should accept a suPHP_Engine',
-          :attr  => 'suphp_engine',
-          :value => 'on',
-          :match => [/^  suPHP_Engine on$/],
-        },
-        {
-          :title => 'should accept a php_admin_flags',
-          :attr  => 'php_admin_flags',
-          :value => { 'engine' => 'on' },
-          :match => [/^  php_admin_flag engine on$/],
-        },
-        {
-          :title => 'should accept php_admin_values',
-          :attr  => 'php_admin_values',
-          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
-          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept php_admin_flags in directories',
-          :attr  => 'directories',
-          :value => {
-						'path'            => '/srv/www',
-						'php_admin_flags' => { 'php_engine' => 'on' }
-					},
-          :match => [/^    php_admin_flag php_engine on$/],
-        },
-        {
-          :title => 'should accept php_admin_values',
-          :attr  => 'php_admin_values',
-          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
-          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept php_admin_values in directories',
-          :attr  => 'directories',
-          :value => {
-            'path'             => '/srv/www',
-            'php_admin_values' => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' }
-          },
-          :match => [/^    php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept a wsgi script alias',
-          :attr  => 'wsgi_script_aliases',
-          :value => { '/' => '/var/www/myapp.wsgi'},
-          :match => [/^  WSGIScriptAlias \/ "\/var\/www\/myapp.wsgi"$/],
-        },
-        {
-          :title => 'should accept multiple wsgi aliases',
-          :attr  => 'wsgi_script_aliases',
-          :value => {
-            '/wiki' => '/usr/local/wsgi/scripts/mywiki.wsgi',
-            '/blog' => '/usr/local/wsgi/scripts/myblog.wsgi',
-            '/'     => '/usr/local/wsgi/scripts/myapp.wsgi',
-          },
-          :match => [
-            /^  WSGIScriptAlias \/wiki "\/usr\/local\/wsgi\/scripts\/mywiki.wsgi"$/,
-            /^  WSGIScriptAlias \/blog "\/usr\/local\/wsgi\/scripts\/myblog.wsgi"$/,
-            /^  WSGIScriptAlias \/ "\/usr\/local\/wsgi\/scripts\/myapp.wsgi"$/,
-          ],
-        },
-        {
-          :title => 'should accept a wsgi application group',
-          :attr  => 'wsgi_application_group',
-          :value => '%{GLOBAL}',
-          :match => [/^  WSGIApplicationGroup %{GLOBAL}$/],
-        },
-        {
-          :title => 'should set wsgi pass authorization',
-          :attr  => 'wsgi_pass_authorization',
-          :value => 'On',
-          :match => [/^  WSGIPassAuthorization On$/],
-        },
-        {
-          :title => 'should set wsgi pass authorization false',
-          :attr  => 'wsgi_pass_authorization',
-          :value => 'Off',
-          :match => [/^  WSGIPassAuthorization Off$/],
-        },
-        {
-          :title => 'should contain environment variables',
-          :attr  => 'access_log_env_var',
-          :value => 'admin',
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined env=admin$/]
-        },
-        {
-          :title => 'should contain virtual_docroot',
-          :attr  => 'virtual_docroot',
-          :value => '/not/default',
-          :match => [
-            /^  VirtualDocumentRoot "\/not\/default"$/,
-          ],
-        },
-        {
-          :title    => 'should accept multiple directories',
-          :attr     => 'directories',
-          :value    => [
-            { 'path' => '/opt/app' },
-            { 'path' => '/var/www' },
-            { 'path' => '/rspec/docroot'}
-          ],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^  <Directory "\/var\/www">$/,
-            /^  <Directory "\/rspec\/docroot">$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                is_expected.to contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                is_expected.not_to contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # Apache below 2.4 (Default Version). All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with $apache_version < 2.4" do
-      [
-        {
-          :title    => 'should accept a directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/opt/app' },
-          :notmatch => ['  <Directory /rspec/docroot>'],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    AllowOverride None$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives hash',
-          :attr     => 'directories',
-          :value    => {
-            'path'              => '/opt/app',
-            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            'allow'             => 'from rspec.org',
-            'allow_override'    => 'Lol',
-            'deny'              => 'from google.com',
-            'options'           => '-MultiViews',
-            'order'             => 'deny,yned',
-            'passenger_enabled' => 'onf',
-            'sethandler'        => 'None',
-            'auth_type'         => 'Basic',
-            'auth_name'         => 'Basic Auth',
-            'auth_user_file'    => '/opt/app/htpasswd',
-            'auth_require'      => 'valid-user',
-            'satisfy'           => 'Any',
+    context 'set everything!' do
+      let :params do
+        {
+          'docroot'                     => '/var/www/foo',
+          'manage_docroot'              => false,
+          'virtual_docroot'             => true,
+          'port'                        => '8080',
+          'ip'                          => '127.0.0.1',
+          'ip_based'                    => true,
+          'add_listen'                  => false,
+          'docroot_owner'               => 'user',
+          'docroot_group'               => 'wheel',
+          'docroot_mode'                => '0664',
+          'serveradmin'                 => 'foo@localhost',
+          'ssl'                         => true,
+          'ssl_cert'                    => '/ssl/cert',
+          'ssl_key'                     => '/ssl/key',
+          'ssl_chain'                   => '/ssl/chain',
+          'ssl_crl_path'                => '/ssl/crl',
+          'ssl_crl'                     => 'foo.crl',
+          'ssl_certs_dir'               => '/ssl/certs',
+          'ssl_protocol'                => 'SSLv2',
+          'ssl_cipher'                  => 'HIGH',
+          'ssl_honorcipherorder'        => 'Off',
+          'ssl_verify_client'           => 'optional',
+          'ssl_verify_depth'            => '3',
+          'ssl_options'                 => '+ExportCertData',
+          'ssl_proxyengine'             => true,
+          'priority'                    => '30',
+          'default_vhost'               => true,
+          'servername'                  => 'example.com',
+          'serveraliases'               => ['test-example.com'],
+          'options'                     => ['MultiView'],
+          'override'                    => ['All'],
+          'directoryindex'              => 'index.html',
+          'vhost_name'                  => 'test',
+          'logroot'                     => '/var/www/logs',
+          'logroot_mode'                => '0600',
+          'log_level'                   => 'crit',
+          'access_log'                  => false,
+          'access_log_file'             => 'httpd_access_log',
+          'access_log_pipe'             => '',
+          'access_log_syslog'           => true,
+          'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
+          'access_log_env_var'          => '',
+          'aliases'                     => '/image',
+          'directories'                 => {
+            'path'     => '/var/www/files',
+            'provider' => 'files',
+            'deny'     => 'from all'
           },
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
-            /^    Allow from rspec.org$/,
-            /^    AllowOverride Lol$/,
-            /^    Deny from google.com$/,
-            /^    Options -MultiViews$/,
-            /^    Order deny,yned$/,
-            /^    SetHandler None$/,
-            /^    PassengerEnabled onf$/,
-            /^    AuthType Basic$/,
-            /^    AuthName "Basic Auth"$/,
-            /^    AuthUserFile \/opt\/app\/htpasswd$/,
-            /^    Require valid-user$/,
-            /^    Satisfy Any$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives with arrays and hashes',
-          :attr     => 'directories',
-          :value    => [
+          'error_log'                   => false,
+          'error_log_file'              => 'httpd_error_log',
+          'error_log_pipe'              => '',
+          'error_log_syslog'            => true,
+          'error_documents'             => 'true',
+          'fallbackresource'            => '/index.php',
+          'scriptalias'                 => '/usr/lib/cgi-bin',
+          'scriptaliases'               => [
             {
-              'path'              => '/opt/app1',
-              'allow'             => 'from rspec.org',
-              'allow_override'    => ['AuthConfig','Indexes'],
-              'deny'              => 'from google.com',
-              'options'           => ['-MultiViews','+MultiViews'],
-              'order'             => ['deny','yned'],
-              'passenger_enabled' => 'onf',
+              'alias' => '/myscript',
+              'path'  => '/usr/share/myscript',
             },
             {
-              'path'        => '/opt/app2',
-              'addhandlers' => {
-                'handler'    => 'cgi-script',
-                'extensions' => '.cgi',
-              },
+              'aliasmatch' => '^/foo(.*)',
+              'path'       => '/usr/share/fooscripts$1',
             },
           ],
-          :match    => [
-            /^  <Directory "\/opt\/app1">$/,
-            /^    Allow from rspec.org$/,
-            /^    AllowOverride AuthConfig Indexes$/,
-            /^    Deny from google.com$/,
-            /^    Options -MultiViews \+MultiViews$/,
-            /^    Order deny,yned$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-            /^  <Directory "\/opt\/app2">$/,
-            /^    AllowOverride None$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^    AddHandler cgi-script .cgi$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title  => 'should accept directory directives with rewrites array',
-          :attr   => 'directories',
-          :value  => [
+          'proxy_dest'                  => '/',
+          'proxy_pass'                  => [
             {
-              'path'      => '/opt/app3',
-              'rewrites'  => [
-                {
-                  'comment' => 'Permalink Rewrites',
-                  'rewrite_base' => '/',
-                  'rewrite_rule' => [ '^index\.php$ - [L]' ],
-                },
-                {
-                  'rewrite_cond' => [
-                    '%{REQUEST_FILENAME} !-f',
-                    '%{REQUEST_FILENAME} !-d',
-                  ],
-                  'rewrite_rule' => [ '. /index.php [L]' ],
-                }
-              ]
+              'path' => '/a',
+              'url'  => 'http://backend-a/'
             }
           ],
-          :match  => [
-            /^  <Directory "\/opt\/app3">$/,
-            /^    #Permalink Rewrites$/,
-            /^    RewriteEngine On$/,
-            /^    RewriteBase \/$/,
-            /^    RewriteRule \^index\\.php\$ - \[L\]$/,
-            /^    RewriteCond %{REQUEST_FILENAME} !-f$/,
-            /^    RewriteCond %{REQUEST_FILENAME} !-d$/,
-            /^    RewriteRule . \/index.php \[L\]$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title => 'should accept location for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => '/',
-            'provider' => 'location',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Location "\/">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Location>$/,
-          ],
-        },
-        {
-          :title => 'should accept files for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'files',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Files "index.html">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Files>$/,
-          ],
-        },
-        {
-          :title => 'should accept files match for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'filesmatch',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <FilesMatch "index.html">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/FilesMatch>$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :apache_version => '2.2',
-          }) end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                is_expected.to contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                is_expected.not_to contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # Apache equals or above 2.4. All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with $apache_version >= 2.4" do
-      [
-        {
-          :title    => 'should accept a directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/opt/app' },
-          :notmatch => ['  <Directory /rspec/docroot>'],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    AllowOverride None$/,
-            /^    Require all granted$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives hash',
-          :attr     => 'directories',
-          :value    => {
-            'path'              => '/opt/app',
-            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            'allow_override'    => 'Lol',
-            'options'           => '-MultiViews',
-            'require'           => 'something denied',
-            'passenger_enabled' => 'onf',
-          },
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
-            /^    AllowOverride Lol$/,
-            /^    Options -MultiViews$/,
-            /^    Require something denied$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives with arrays and hashes',
-          :attr     => 'directories',
-          :value    => [
+          'suphp_addhandler'            => 'foo',
+          'suphp_engine'                => 'on',
+          'suphp_configpath'            => '/var/www/html',
+          'php_admin_flags'             => ['foo', 'bar'],
+          'php_admin_values'            => ['true', 'false'],
+          'no_proxy_uris'               => '/foo',
+          'proxy_preserve_host'         => true,
+          'redirect_source'             => '/bar',
+          'redirect_dest'               => '/',
+          'redirect_status'             => 'temp',
+          'redirectmatch_status'        => ['404'],
+          'redirectmatch_regexp'        => ['\.git$'],
+          'rack_base_uris'              => ['/rackapp1'],
+          'headers'                     => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+          'request_headers'             => ['append MirrorID "mirror 12"'],
+          'rewrites'                    => [
             {
-              'path'              => '/opt/app1',
-              'allow_override'    => ['AuthConfig','Indexes'],
-              'options'           => ['-MultiViews','+MultiViews'],
-              'require'           => ['host','example.org'],
-              'passenger_enabled' => 'onf',
-            },
-            {
-              'path'        => '/opt/app2',
-              'addhandlers' => {
-                'handler'    => 'cgi-script',
-                'extensions' => '.cgi',
-              },
-            },
-          ],
-          :match    => [
-            /^  <Directory "\/opt\/app1">$/,
-            /^    AllowOverride AuthConfig Indexes$/,
-            /^    Options -MultiViews \+MultiViews$/,
-            /^    Require host example.org$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-            /^  <Directory "\/opt\/app2">$/,
-            /^    AllowOverride None$/,
-            /^    Require all granted$/,
-            /^    AddHandler cgi-script .cgi$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title  => 'should accept directory directives with rewrites array',
-          :attr   => 'directories',
-          :value  => [
-            {
-              'path'      => '/opt/app3',
-              'rewrites'  => [
-                {
-                  'comment' => 'Permalink Rewrites',
-                  'rewrite_base' => '/',
-                  'rewrite_rule' => [ '^index\.php$ - [L]' ],
-                },
-                {
-                  'rewrite_cond' => [
-                    '%{REQUEST_FILENAME} !-f',
-                    '%{REQUEST_FILENAME} !-d',
-                  ],
-                  'rewrite_rule' => [ '. /index.php [L]' ],
-                }
-              ]
+              'rewrite_rule' => ['^index\.html$ welcome.html']
             }
           ],
-          :match  => [
-            /^  <Directory "\/opt\/app3">$/,
-            /^    #Permalink Rewrites$/,
-            /^    RewriteEngine On$/,
-            /^    RewriteBase \/$/,
-            /^    RewriteRule \^index\\.php\$ - \[L\]$/,
-            /^    RewriteCond %{REQUEST_FILENAME} !-f$/,
-            /^    RewriteCond %{REQUEST_FILENAME} !-d$/,
-            /^    RewriteRule . \/index.php \[L\]$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title => 'should accept location for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => '/',
-            'provider' => 'location',
+          'rewrite_base'                => '/',
+          'rewrite_rule'                => '^index\.html$ welcome.html',
+          'rewrite_cond'                => '%{HTTP_USER_AGENT} ^MSIE',
+          'setenv'                      => ['FOO=/bin/true'],
+          'setenvif'                    => 'Request_URI "\.gif$" object_is_image=gif',
+          'block'                       => 'scm',
+          'wsgi_application_group'      => '%{GLOBAL}',
+          'wsgi_daemon_process'         => 'wsgi',
+          'wsgi_daemon_process_options' => {
+            'processes'    => '2',
+            'threads'      => '15',
+            'display-name' => '%{GROUP}',
           },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Location "\/">$/,
-            /^    Require all granted$/,
-            /^  <\/Location>$/,
-          ],
-        },
-        {
-          :title => 'should accept files for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'files',
+          'wsgi_import_script'          => '/var/www/demo.wsgi',
+          'wsgi_import_script_options'  => {
+            'process-group'     => 'wsgi',
+            'application-group' => '%{GLOBAL}'
           },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Files "index.html">$/,
-            /^    Require all granted$/,
-            /^  <\/Files>$/,
-          ],
-        },
-        {
-          :title => 'should accept files match for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'filesmatch',
+          'wsgi_process_group'          => 'wsgi',
+          'wsgi_script_aliases'         => {
+            '/' => '/var/www/demo.wsgi'
           },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <FilesMatch "index.html">$/,
-            /^    Require all granted$/,
-            /^  <\/FilesMatch>$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :apache_version => '2.4',
-          }) end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                is_expected.to contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                is_expected.not_to contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
+          'wsgi_pass_authorization'     => 'On',
+          'custom_fragment'             => '#custom string',
+          'itk'                         => {
+            'user'  => 'someuser',
+            'group' => 'somegroup'
+          },
+          'action'                      => 'foo',
+          'fastcgi_server'              => 'localhost',
+          'fastcgi_socket'              => '/tmp/fastcgi.socket',
+          'fastcgi_dir'                 => '/tmp',
+          'additional_includes'         => '/custom/path/includes',
+          'apache_version'              => '2.4',
+          'suexec_user_group'           => 'root root',
+        }
       end
-    end
-
-    # All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with SSL" do
-      [
-        {
-            :title => 'should accept setting SSLCertificateFile',
-            :attr  => 'ssl_cert',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateFile      "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificateKeyFile',
-            :attr  => 'ssl_key',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateKeyFile   "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificateChainFile',
-            :attr  => 'ssl_chain',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateChainFile "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificatePath',
-            :attr  => 'ssl_certs_dir',
-            :value => '/path/to/certs',
-            :match => [/^  SSLCACertificatePath    "\/path\/to\/certs"$/],
-        },
+      let :facts do
         {
-            :title => 'should accept setting SSLCertificateFile',
-            :attr  => 'ssl_ca',
-            :value => '/path/to/ca.pem',
-            :match => [/^  SSLCACertificateFile    "\/path\/to\/ca\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLRevocationPath',
-            :attr  => 'ssl_crl_path',
-            :value => '/path/to/crl',
-            :match => [/^  SSLCARevocationPath     "\/path\/to\/crl"$/],
-        },
-        {
-            :title => 'should accept setting SSLRevocationFile',
-            :attr  => 'ssl_crl',
-            :value => '/path/to/crl.pem',
-            :match => [/^  SSLCARevocationFile     "\/path\/to\/crl\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLProxyEngine',
-            :attr  => 'ssl_proxyengine',
-            :value => true,
-            :match => [/^  SSLProxyEngine On$/],
-        },
-        {
-            :title => 'should accept setting SSLProtocol',
-            :attr  => 'ssl_protocol',
-            :value => 'all -SSLv2',
-            :match => [/^  SSLProtocol             all -SSLv2$/],
-        },
-        {
-            :title => 'should accept setting SSLCipherSuite',
-            :attr  => 'ssl_cipher',
-            :value => 'RC4-SHA:HIGH:!ADH:!SSLv2',
-            :match => [/^  SSLCipherSuite          RC4-SHA:HIGH:!ADH:!SSLv2$/],
-        },
-        {
-            :title => 'should accept setting SSLHonorCipherOrder',
-            :attr  => 'ssl_honorcipherorder',
-            :value => 'On',
-            :match => [/^  SSLHonorCipherOrder     On$/],
-        },
-        {
-            :title => 'should accept setting SSLVerifyClient',
-            :attr  => 'ssl_verify_client',
-            :value => 'optional',
-            :match => [/^  SSLVerifyClient         optional$/],
-        },
-        {
-            :title => 'should accept setting SSLVerifyDepth',
-            :attr  => 'ssl_verify_depth',
-            :value => '1',
-            :match => [/^  SSLVerifyDepth          1$/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with a string',
-            :attr  => 'ssl_options',
-            :value => '+ExportCertData',
-            :match => [/^  SSLOptions \+ExportCertData$/],
-        },
+          :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',
+          :kernelversion          => '3.6.2',
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to_not contain_file('/var/www/foo') }
+      it { is_expected.to contain_class('apache::mod::ssl') }
+      it { is_expected.to contain_class('apache::mod::mime') }
+      it { is_expected.to contain_class('apache::mod::vhost_alias') }
+      it { is_expected.to contain_class('apache::mod::wsgi') }
+      it { is_expected.to contain_class('apache::mod::suexec') }
+      it { is_expected.to contain_file('/var/www/logs') }
+      it { is_expected.to contain_class('apache::mod::rewrite') }
+      it { is_expected.to contain_class('apache::mod::alias') }
+      it { is_expected.to contain_class('apache::mod::proxy') }
+      it { is_expected.to contain_class('apache::mod::proxy_http') }
+      it { is_expected.to contain_class('apache::mod::passenger') }
+      it { is_expected.to contain_class('apache::mod::passenger') }
+      it { is_expected.to contain_class('apache::mod::fastcgi') }
+      it { is_expected.to contain_class('apache::mod::headers') }
+      it { is_expected.to contain_concat('30-rspec.example.com.conf').with({
+        'owner'   => 'root',
+        'mode'    => '0644',
+        'require' => 'Package[httpd]',
+        'notify'  => 'Service[httpd]',
+      })
+      }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-access_log') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-setenv') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
+    end
+    context 'not everything can be set together...' do
+      let :params do
+        {
+          'access_log_pipe' => '/dev/null',
+          'error_log_pipe'  => '/dev/null',
+          'docroot'         => '/var/www/foo',
+          'ensure'          => 'absent',
+          'manage_docroot'  => true,
+          'logroot'         => '/tmp/logroot',
+        }
+      end
+      let :facts do
         {
-            :title => 'should accept setting SSLOptions with an array',
-            :attr  => 'ssl_options',
-            :value => ['+StrictRequire','+ExportCertData'],
-            :match => [/^  SSLOptions \+StrictRequire \+ExportCertData/],
-        },
+          :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',
+          :kernelversion          => '3.6.2',
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to_not contain_class('apache::mod::ssl') }
+      it { is_expected.to_not contain_class('apache::mod::mime') }
+      it { is_expected.to_not contain_class('apache::mod::vhost_alias') }
+      it { is_expected.to_not contain_class('apache::mod::wsgi') }
+      it { is_expected.to_not contain_class('apache::mod::suexec') }
+      it { is_expected.to_not contain_class('apache::mod::rewrite') }
+      it { is_expected.to contain_class('apache::mod::alias') }
+      it { is_expected.to_not contain_class('apache::mod::proxy') }
+      it { is_expected.to_not contain_class('apache::mod::proxy_http') }
+      it { is_expected.to_not contain_class('apache::mod::passenger') }
+      it { is_expected.to_not contain_class('apache::mod::headers') }
+      it { is_expected.to contain_file('/var/www/foo') }
+      it { is_expected.to_not contain_file('/tmp/logroot') }
+      it { is_expected.to contain_concat('25-rspec.example.com.conf').with({
+        'ensure' => 'absent',
+      })
+      }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-aliases') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-itk') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-fallbackresource') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-additional_includes') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-action') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-block') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-error_document') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-proxy') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-rack') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-redirect') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-rewrite') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-scriptalias') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-serveralias') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-setenv') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-ssl') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-suphp') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-php_admin') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-header') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-requestheader') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-wsgi') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-custom_fragment') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-fastcgi') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-suexec') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
+    end
+  end
+  describe 'validation' do
+    context 'bad ensure' do
+      let :params do
         {
-            :title => 'should accept setting SSLOptions with a string in directories',
-            :attr  => 'directories',
-            :value => { 'path' => '/srv/www', 'ssl_options' => '+ExportCertData'},
-            :match => [/^    SSLOptions \+ExportCertData$/],
-        },
+          'docroot' => '/rspec/docroot',
+          'ensure'  => 'bogus',
+        }
+      end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad suphp_engine' do
+      let :params do
         {
-            :title => 'should accept setting SSLOptions with an array in directories',
-            :attr  => 'directories',
-            :value => { 'path' => '/srv/www', 'ssl_options' => ['-StdEnvVars','+ExportCertData']},
-            :match => [/^    SSLOptions -StdEnvVars \+ExportCertData/],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]} with SSL" do
-          let :params do
-            default_params.merge( {
-              param[:attr].to_sym => param[:value],
-              :ssl                => true,
-            } )
-          end
-          it { is_expected.to contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                is_expected.to contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                is_expected.not_to contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
+          'docroot'      => '/rspec/docroot',
+          'suphp_engine' => 'bogus',
+        }
       end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
     end
-
-    context 'attribute resources' do
-      describe 'when access_log_file and access_log_pipe are specified' do
-        let :params do default_params.merge({
-          :access_log_file => 'fake.log',
-          :access_log_pipe => '| /bin/fake',
-        }) end
-        it 'should cause a failure' do
-          expect { subject }.to raise_error(Puppet::Error, /'access_log_file' and 'access_log_pipe' cannot be defined at the same time/)
-        end
+    context 'bad ip_based' do
+      let :params do
+        {
+          'docroot'  => '/rspec/docroot',
+          'ip_based' => 'bogus',
+        }
       end
-      describe 'when error_log_file and error_log_pipe are specified' do
-        let :params do default_params.merge({
-          :error_log_file => 'fake.log',
-          :error_log_pipe => '| /bin/fake',
-        }) end
-        it 'should cause a failure' do
-          expect { subject }.to raise_error(Puppet::Error, /'error_log_file' and 'error_log_pipe' cannot be defined at the same time/)
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad access_log' do
+      let :params do
+        {
+          'docroot'    => '/rspec/docroot',
+          'access_log' => 'bogus',
+        }
       end
-      describe 'when logroot and logroot_mode are specified' do
-        let :params do default_params.merge({
-          :logroot       => '/rspec/logroot',
-          :logroot_mode  => '0755',
-        }) end
-        it 'should set logroot mode' do
-          should contain_file(params[:logroot]).with({
-            :ensure => :directory,
-            :mode   => '0755',
-          })
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad error_log' do
+      let :params do
+        {
+          'docroot'   => '/rspec/docroot',
+          'error_log' => 'bogus',
+        }
       end
-      describe 'when docroot owner and mode is specified' do
-        let :params do default_params.merge({
-          :docroot_owner => 'testuser',
-          :docroot_group => 'testgroup',
-          :docroot_mode  => '0750',
-        }) end
-        it 'should set vhost ownership and permissions' do
-          is_expected.to contain_file(params[:docroot]).with({
-            :ensure => :directory,
-            :owner  => 'testuser',
-            :group  => 'testgroup',
-            :mode   => '0750',
-          })
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad_ssl' do
+      let :params do
+        {
+          'docroot' => '/rspec/docroot',
+          'ssl'     => 'bogus',
+        }
       end
-
-      describe 'when docroot is *not* managed' do
-        let :params do default_params.merge({
-          :manage_docroot=> false,
-        }) end
-        it 'should not contain docroot ' do
-          is_expected.not_to contain_file(params[:docroot])
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad default_vhost' do
+      let :params do
+        {
+          'docroot'       => '/rspec/docroot',
+          'default_vhost' => 'bogus',
+        }
       end
-
-      describe 'when wsgi_daemon_process and wsgi_daemon_process_options are specified' do
-        let :params do default_params.merge({
-          :wsgi_daemon_process         => 'example.org',
-          :wsgi_daemon_process_options => { 'processes' => '2', 'threads' => '15' },
-        }) end
-        it 'should set wsgi_daemon_process_options' do
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  WSGIDaemonProcess example.org processes=2 threads=15$/
-          )
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad ssl_proxyengine' do
+      let :params do
+        {
+          'docroot'         => '/rspec/docroot',
+          'ssl_proxyengine' => 'bogus',
+        }
       end
-
-      describe 'when wsgi_import_script and wsgi_import_script_options are specified' do
-        let :params do default_params.merge({
-          :wsgi_import_script         => '/var/www/demo.wsgi',
-          :wsgi_import_script_options => { 'application-group' => '%{GLOBAL}', 'process-group' => 'wsgi' },
-        }) end
-        it 'should set wsgi_import_script_options' do
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  WSGIImportScript \/var\/www\/demo.wsgi application-group=%{GLOBAL} process-group=wsgi$/
-          )
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad rewrites' do
+      let :params do
+        {
+          'docroot'  => '/rspec/docroot',
+          'rewrites' => 'bogus',
+        }
       end
-
-      describe 'when rewrites are specified' do
-        let :params do default_params.merge({
-          :rewrites => [
-            {
-              'comment'      => 'test rewrites',
-              'rewrite_base' => '/mytestpath/',
-              'rewrite_cond' => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-              'rewrite_rule' => ['^index\.html$ welcome.html', '^index\.cgi$ index.php'],
-            }
-          ]
-        }) end
-        it 'should set RewriteConds and RewriteRules' do
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  #test rewrites$/
-          )
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTP_USER_AGENT\} \^Lynx\/ \[OR\]$/
-          )
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  RewriteBase \/mytestpath\/$/
-          )
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTP_USER_AGENT\} \^Mozilla\/\[12\]$/
-          )
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  RewriteRule \^index\\.html\$ welcome.html$/
-          )
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  RewriteRule \^index\\.cgi\$ index.php$/
-          )
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad rewrites 2' do
+      let :params do
+        {
+          'docroot'  => '/rspec/docroot',
+          'rewrites' => ['bogus'],
+        }
       end
-
-      describe 'when rewrite_rule and rewrite_cond are specified' do
-        let :params do default_params.merge({
-          :rewrite_cond => '%{HTTPS} off',
-          :rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
-        }) end
-        it 'should set RewriteCond' do
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTPS\} off$/
-          )
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad suexec_user_group' do
+      let :params do
+        {
+          'docroot'           => '/rspec/docroot',
+          'suexec_user_group' => 'bogus',
+        }
       end
-
-      describe 'when action is specified specified' do
-        let :params do default_params.merge({
-          :action => 'php-fastcgi',
-        }) end
-        it 'should set Action' do
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  Action php-fastcgi \/cgi-bin virtual$/
-          )
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad wsgi_script_alias' do
+      let :params do
+        {
+          'docroot'           => '/rspec/docroot',
+          'wsgi_script_alias' => 'bogus',
+        }
       end
-
-      describe 'when suphp_engine is on and suphp_configpath is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :suphp_configpath => '/etc/php5/apache2',
-        }) end
-        it 'should set suphp_configpath' do
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  suPHP_ConfigPath "\/etc\/php5\/apache2"$/
-          )
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad wsgi_daemon_process_options' do
+      let :params do
+        {
+          'docroot'                     => '/rspec/docroot',
+          'wsgi_daemon_process_options' => 'bogus',
+        }
       end
-
-      describe 'when suphp_engine is on and suphp_addhandler is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :suphp_addhandler => 'x-httpd-php',
-        }) end
-        it 'should set suphp_addhandler' do
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^  suPHP_AddHandler x-httpd-php/
-          )
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad wsgi_import_script_alias' do
+      let :params do
+        {
+          'docroot'                  => '/rspec/docroot',
+          'wsgi_import_script_alias' => 'bogus',
+        }
       end
-
-      describe 'when suphp_engine is on and suphp { user & group } is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :directories      => { 'path' => '/srv/www',
-            'suphp' => { 'user' => 'myappuser', 'group' => 'myappgroup' },
-          }
-        }) end
-        it 'should set suphp_UserGroup' do
-          is_expected.to contain_file("25-#{title}.conf").with_content(
-            /^    suPHP_UserGroup myappuser myappgroup/
-          )
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad itk' do
+      let :params do
+        {
+          'docroot' => '/rspec/docroot',
+          'itk'     => 'bogus',
+        }
       end
-
-      describe 'priority/default settings' do
-        describe 'when neither priority/default is specified' do
-          let :params do default_params end
-          it { is_expected.to contain_file("25-#{title}.conf").with_path(
-            /25-#{title}.conf/
-          ) }
-        end
-        describe 'when both priority/default_vhost is specified' do
-          let :params do
-            default_params.merge({
-              :priority      => 15,
-              :default_vhost => true,
-            })
-          end
-          it { is_expected.to contain_file("15-#{title}.conf").with_path(
-            /15-#{title}.conf/
-          ) }
-        end
-        describe 'when only priority is specified' do
-          let :params do
-            default_params.merge({ :priority => 14, })
-          end
-          it { is_expected.to contain_file("14-#{title}.conf").with_path(
-            /14-#{title}.conf/
-          ) }
-        end
-        describe 'when only default is specified' do
-          let :params do
-            default_params.merge({ :default_vhost => true, })
-          end
-          it { is_expected.to contain_file("10-#{title}.conf").with_path(
-            /10-#{title}.conf/
-          ) }
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad log_level' do
+      let :params do
+        {
+          'docroot'   => '/rspec/docroot',
+          'log_level' => 'bogus',
+        }
       end
-
-      describe 'fcgid directory options' do
-        describe 'No fcgiwrapper' do
-          let :params do
-            default_params.merge({
-              :directories      => { 'path' => '/srv/www' },
-            })
-          end
-
-          it { is_expected.not_to contain_file("25-#{title}.conf").with_content(%r{FcgidWrapper}) }
-        end
-
-        describe 'Only a command' do
-          let :params do
-            default_params.merge({
-              :directories      => { 'path' => '/srv/www',
-                'fcgiwrapper' => { 'command' => '/usr/local/bin/fcgiwrapper' },
-              }
-            })
-          end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper  $}) }
-        end
-
-        describe 'All parameters' do
-          let :params do
-            default_params.merge({
-              :directories    => { 'path' => '/srv/www',
-                'fcgiwrapper' => { 'command' => '/usr/local/bin/fcgiwrapper', 'suffix' => '.php', 'virtual' => 'virtual' },
-              }
-            })
-          end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper .php virtual$}) }
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'access_log_file and access_log_pipe' do
+      let :params do
+        {
+          'docroot'         => '/rspec/docroot',
+          'access_log_file' => 'bogus',
+          'access_log_pipe' => 'bogus',
+        }
       end
-
-      describe 'various ip/port combos' do
-        describe 'when ip_based is true' do
-          let :params do default_params.merge({ :ip_based => true }) end
-          it 'should not specify a NameVirtualHost' do
-            is_expected.to contain_apache__listen(params[:port])
-            is_expected.not_to contain_apache__namevirtualhost("*:#{params[:port]}")
-          end
-        end
-
-        describe 'when ip_based is default' do
-          let :params do default_params end
-          it 'should specify a NameVirtualHost' do
-            is_expected.to contain_apache__listen(params[:port])
-            is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}")
-          end
-        end
-
-        describe 'when an ip is set' do
-          let :params do default_params.merge({ :ip => '10.0.0.1' }) end
-          it 'should specify a NameVirtualHost for the ip' do
-            is_expected.not_to contain_apache__listen(params[:port])
-            is_expected.to contain_apache__listen("10.0.0.1:#{params[:port]}")
-            is_expected.to contain_apache__namevirtualhost("10.0.0.1:#{params[:port]}")
-          end
-        end
-
-        describe 'an ip_based vhost without a port' do
-          let :params do
-            {
-              :docroot  => '/fake',
-              :ip       => '10.0.0.1',
-              :ip_based => true,
-            }
-          end
-          it 'should specify a NameVirtualHost for the ip' do
-            is_expected.not_to contain_apache__listen(params[:ip])
-            is_expected.not_to contain_apache__namevirtualhost(params[:ip])
-            is_expected.to contain_file("25-#{title}.conf").with_content %r{<VirtualHost 10\.0\.0\.1>}
-          end
-        end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'error_log_file and error_log_pipe' do
+      let :params do
+        {
+          'docroot'        => '/rspec/docroot',
+          'error_log_file' => 'bogus',
+          'error_log_pipe' => 'bogus',
+        }
       end
-
-      describe 'when suexec_user_group is specified' do
-        let :params do
-          default_params.merge({
-            :suexec_user_group => 'nobody nogroup',
-          })
-        end
-
-        it { is_expected.to contain_file("25-#{title}.conf").with_content %r{^  SuexecUserGroup nobody nogroup$} }
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad fallbackresource' do
+      let :params do
+        {
+          'docroot'          => '/rspec/docroot',
+          'fallbackresource' => 'bogus',
+        }
       end
-
-      describe 'redirect rules' do
-        describe 'without lockstep arrays' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => [
-                'http://10.0.0.10/login',
-                'http://10.0.0.10/logout',
-              ],
-              :redirect_status   => [
-                'permanent',
-                '',
-              ],
-            })
-          end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/login} }
-          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
-        end
-        describe 'redirect match rules' do
-          let :params do
-            default_params.merge({
-              :redirectmatch_status => [
-                '404',
-              ],
-              :redirectmatch_regexp   => [
-                '/\.git(/.*|$)',
-              ],
-            })
-          end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  RedirectMatch 404 } }
-        end
-        describe 'without a status' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => [
-                'http://10.0.0.10/login',
-                'http://10.0.0.10/logout',
-              ],
-            })
-          end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect  /login http://10\.0\.0\.10/login} }
-          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
-        end
-        describe 'with a single status and dest' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => 'http://10.0.0.10/test',
-              :redirect_status => 'permanent',
-            })
-          end
-
-          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/test} }
-          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /logout http://10\.0\.0\.10/test} }
-        end
-
-        describe 'with a directoryindex specified' do
-          let :params do
-            default_params.merge({
-              :directoryindex => 'index.php'
-            })
-          end
-          it { is_expected.to contain_file("25-#{title}.conf").with_content %r{DirectoryIndex index.php} }
-	end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
+    context 'bad custom_fragment' do
+      let :params do
+        {
+          'docroot'         => '/rspec/docroot',
+          'custom_fragment' => true,
+        }
       end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
     end
   end
 end
diff --git a/templates/vhost/_access_log.erb b/templates/vhost/_access_log.erb
new file mode 100644
index 0000000000..1ec47ff710
--- /dev/null
+++ b/templates/vhost/_access_log.erb
@@ -0,0 +1,5 @@
+<% if @access_log and @_access_log_env_var -%>
+  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %> <%= @_access_log_env_var %>
+<% elsif @access_log -%>
+  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %>
+<% end -%>
diff --git a/templates/vhost/_additional_includes.erb b/templates/vhost/_additional_includes.erb
new file mode 100644
index 0000000000..d4d5f91342
--- /dev/null
+++ b/templates/vhost/_additional_includes.erb
@@ -0,0 +1,5 @@
+<% Array(@additional_includes).each do |include| -%>
+  
+  ## Load additional static includes
+  Include "<%= include %>"
+<% end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index accd724489..9ead456128 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -1,4 +1,6 @@
 <% if @_directories and ! @_directories.empty? -%>
+
+  ## Directories, there should at least be a declaration for <%= @docroot %>
   <%- [@_directories].flatten.compact.each do |directory| -%>
     <%- if directory['path'] and directory['path'] != '' -%>
   <%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
diff --git a/templates/vhost/_docroot.erb b/templates/vhost/_docroot.erb
new file mode 100644
index 0000000000..6039fa63cf
--- /dev/null
+++ b/templates/vhost/_docroot.erb
@@ -0,0 +1,7 @@
+
+  ## Vhost docroot
+<% if @virtual_docroot -%>
+  VirtualDocumentRoot "<%= @virtual_docroot %>"
+<% else -%>
+  DocumentRoot "<%= @docroot %>"
+<% end -%>
diff --git a/templates/vhost/_fallbackresource.erb b/templates/vhost/_fallbackresource.erb
new file mode 100644
index 0000000000..f1e4c35dc4
--- /dev/null
+++ b/templates/vhost/_fallbackresource.erb
@@ -0,0 +1,4 @@
+<% if @fallbackresource -%>
+
+  FallbackResource <%= @fallbackresource %>
+<% end -%>
diff --git a/templates/vhost/_file_footer.erb b/templates/vhost/_file_footer.erb
new file mode 100644
index 0000000000..84035efa47
--- /dev/null
+++ b/templates/vhost/_file_footer.erb
@@ -0,0 +1 @@
+</VirtualHost>
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
new file mode 100644
index 0000000000..e6f2f95e76
--- /dev/null
+++ b/templates/vhost/_file_header.erb
@@ -0,0 +1,10 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+
+<VirtualHost <%= @nvh_addr_port %>>
+  ServerName <%= @servername %>
+<% if @serveradmin -%>
+  ServerAdmin <%= @serveradmin %>
+<% end -%>
diff --git a/templates/vhost/_itk.erb b/templates/vhost/_itk.erb
index 2971c7a7d0..803a73db7f 100644
--- a/templates/vhost/_itk.erb
+++ b/templates/vhost/_itk.erb
@@ -1,4 +1,5 @@
 <% if @itk and ! @itk.empty? -%>
+
   ## ITK statement
   <IfModule mpm_itk_module>
      <%- if @itk["user"] and @itk["group"] -%>
diff --git a/templates/vhost/_logging.erb b/templates/vhost/_logging.erb
new file mode 100644
index 0000000000..35a924d29b
--- /dev/null
+++ b/templates/vhost/_logging.erb
@@ -0,0 +1,10 @@
+<% if @error_log or @log_level -%>
+
+  ## Logging
+<% end -%>
+<% if @error_log -%>
+  ErrorLog "<%= @error_log_destination %>"
+<% end -%>
+<% if @log_level -%>
+  LogLevel <%= @log_level %>
+<% end -%>
diff --git a/templates/vhost/_php_admin.erb b/templates/vhost/_php_admin.erb
index 59536cbc99..b79b818df9 100644
--- a/templates/vhost/_php_admin.erb
+++ b/templates/vhost/_php_admin.erb
@@ -1,12 +1,12 @@
 <% if @php_admin_values and not @php_admin_values.empty? -%>
-<% @php_admin_values.each do |key,value| -%>
+  <%- @php_admin_values.each do |key,value| -%>
   php_admin_value <%= key %> <%= value %>
-<% end -%>
+  <%- end -%>
 <% end -%>
 <% if @php_admin_flags and not @php_admin_flags.empty? -%>
-<% @php_admin_flags.each do |key,flag| -%>
-<%# normalize flag -%>
-<% if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
+  <%- @php_admin_flags.each do |key,flag| -%>
+    <%-# normalize flag -%>
+    <%- if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
   php_admin_flag <%= key %> <%= flag %>
-<% end -%>
+  <%- end -%>
 <% end -%>
diff --git a/templates/vhost/_redirect.erb b/templates/vhost/_redirect.erb
index e865bd9afa..819d6e7694 100644
--- a/templates/vhost/_redirect.erb
+++ b/templates/vhost/_redirect.erb
@@ -4,21 +4,20 @@
 <% @redirect_status_a = Array(@redirect_status) -%>
 
   ## Redirect rules
-<% @redirect_source_a.each_with_index do |source, i| -%>
+  <%- @redirect_source_a.each_with_index do |source, i| -%>
 <% @redirect_dest_a[i] ||= @redirect_dest_a[0] -%>
 <% @redirect_status_a[i] ||= @redirect_status_a[0] -%>
   Redirect <%= "#{@redirect_status_a[i]} " %><%= source %> <%= @redirect_dest_a[i] %>
+  <%- end -%>
 <% end -%>
-<% end -%>
-
 <%- if @redirectmatch_status and @redirectmatch_regexp -%>
 <% @redirectmatch_status_a = Array(@redirectmatch_status) -%>
 <% @redirectmatch_regexp_a = Array(@redirectmatch_regexp) -%>
 
   ## RedirectMatch rules
-<% @redirectmatch_status_a.each_with_index do |status, i| -%>
+  <%- @redirectmatch_status_a.each_with_index do |status, i| -%>
 <% @redirectmatch_status_a[i] ||= @redirectmatch_status_a[0] -%>
 <% @redirectmatch_regexp_a[i] ||= @redirectmatch_regexp_a[0] -%>
   RedirectMatch <%= "#{@redirectmatch_status_a[i]} " %> <%= @redirectmatch_regexp_a[i] %>
-<% end -%>
+  <%- end -%>
 <% end -%>
diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index c995868d75..46dd95691c 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -31,13 +31,13 @@
 <% if @rewrite_rule and !@rewrites -%>
   ## Rewrite rules
   RewriteEngine On
-<% if @rewrite_base -%>
+  <%- if @rewrite_base -%>
   RewriteBase <%= @rewrite_base %>
-<% end -%>
-<% if @rewrite_cond -%>
-<% Array(@rewrite_cond).each do |cond| -%>
+  <%- end -%>
+  <%- if @rewrite_cond -%>
+    <%- Array(@rewrite_cond).each do |cond| -%>
   RewriteCond <%= cond %>
-<% end -%>
-<% end -%>
+    <%- end -%>
+  <%- end -%>
   RewriteRule <%= @rewrite_rule %>
 <%- end -%>
diff --git a/templates/vhost/_serveralias.erb b/templates/vhost/_serveralias.erb
index 278b6ddc53..e08a55e328 100644
--- a/templates/vhost/_serveralias.erb
+++ b/templates/vhost/_serveralias.erb
@@ -1,7 +1,7 @@
 <% if @serveraliases and ! @serveraliases.empty? -%>
 
   ## Server aliases
-<% Array(@serveraliases).each do |serveralias| -%>
+  <%- Array(@serveraliases).each do |serveralias| -%>
   ServerAlias <%= serveralias %>
-<% end -%>
+  <%- end -%>
 <% end -%>
diff --git a/templates/vhost/_serversignature.erb b/templates/vhost/_serversignature.erb
new file mode 100644
index 0000000000..ff13aaf452
--- /dev/null
+++ b/templates/vhost/_serversignature.erb
@@ -0,0 +1 @@
+  ServerSignature Off
diff --git a/templates/vhost/_setenv.erb b/templates/vhost/_setenv.erb
index d5f9ea8450..ce1fa955ef 100644
--- a/templates/vhost/_setenv.erb
+++ b/templates/vhost/_setenv.erb
@@ -1,12 +1,12 @@
 <% if @setenv and ! @setenv.empty? -%>
 
   ## SetEnv/SetEnvIf for environment variables
-<% Array(@setenv).each do |envvar| -%>
+  <%- Array(@setenv).each do |envvar| -%>
   SetEnv <%= envvar %>
-<% end -%>
+  <%- end -%>
 <% end -%>
 <% if @setenvif and ! @setenvif.empty? -%>
-<% Array(@setenvif).each do |envifvar| -%>
+  <%- Array(@setenvif).each do |envifvar| -%>
   SetEnvIf <%= envifvar %>
-<% end -%>
+  <%- end -%>
 <% end -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 174f0a1891..55289ae7e9 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -4,40 +4,40 @@
   SSLEngine on
   SSLCertificateFile      "<%= @ssl_cert %>"
   SSLCertificateKeyFile   "<%= @ssl_key %>"
-<% if @ssl_chain -%>
+  <%- if @ssl_chain -%>
   SSLCertificateChainFile "<%= @ssl_chain %>"
-<% end -%>
-<% if @ssl_certs_dir -%>
+  <%- end -%>
+  <%- if @ssl_certs_dir -%>
   SSLCACertificatePath    "<%= @ssl_certs_dir %>"
-<% end -%>
-<% if @ssl_ca -%>
+  <%- end -%>
+  <%- if @ssl_ca -%>
   SSLCACertificateFile    "<%= @ssl_ca %>"
-<% end -%>
-<% if @ssl_crl_path -%>
+  <%- end -%>
+  <%- if @ssl_crl_path -%>
   SSLCARevocationPath     "<%= @ssl_crl_path %>"
-<% end -%>
-<% if @ssl_crl -%>
+  <%- end -%>
+  <%- if @ssl_crl -%>
   SSLCARevocationFile     "<%= @ssl_crl %>"
-<% end -%>
-<% if @ssl_proxyengine -%>
+  <%- end -%>
+  <%- if @ssl_proxyengine -%>
   SSLProxyEngine On
-<% end -%>
-<% if @ssl_protocol -%>
+  <%- end -%>
+  <%- if @ssl_protocol -%>
   SSLProtocol             <%= @ssl_protocol %>
-<% end -%>
-<% if @ssl_cipher -%>
+  <%- end -%>
+  <%- if @ssl_cipher -%>
   SSLCipherSuite          <%= @ssl_cipher %>
-<% end -%>
-<% if @ssl_honorcipherorder -%>
+  <%- end -%>
+  <%- if @ssl_honorcipherorder -%>
   SSLHonorCipherOrder     <%= @ssl_honorcipherorder %>
-<% end -%>
-<% if @ssl_verify_client -%>
+  <%- end -%>
+  <%- if @ssl_verify_client -%>
   SSLVerifyClient         <%= @ssl_verify_client %>
-<% end -%>
-<% if @ssl_verify_depth -%>
+  <%- end -%>
+  <%- if @ssl_verify_depth -%>
   SSLVerifyDepth          <%= @ssl_verify_depth %>
-<% end -%>
-<% if @ssl_options -%>
+  <%- end -%>
+  <%- if @ssl_options -%>
   SSLOptions <%= Array(@ssl_options).join(' ') %>
-<% end -%>
+  <%- end -%>
 <% end -%>
diff --git a/templates/vhost/_suphp.erb b/templates/vhost/_suphp.erb
index 9389581805..e394b6f94a 100644
--- a/templates/vhost/_suphp.erb
+++ b/templates/vhost/_suphp.erb
@@ -1,11 +1,11 @@
 <% if @suphp_engine == 'on' -%>
-<% if @suphp_addhandler -%>
+  <%- if @suphp_addhandler -%>
   suPHP_AddHandler <%= @suphp_addhandler %>
-<% end -%>
-<% if @suphp_engine -%>
+  <%- end -%>
+  <%- if @suphp_engine -%>
   suPHP_Engine <%= @suphp_engine %>
-<% end -%>
-<% if @suphp_configpath -%>
+  <%- end -%>
+  <%- if @suphp_configpath -%>
   suPHP_ConfigPath "<%= @suphp_configpath %>"
-<% end -%>
+  <%- end -%>
 <% end -%>
diff --git a/tests/vhost.pp b/tests/vhost.pp
index a6c61360a7..4ffb782990 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -143,14 +143,14 @@
 
 # Vhost to redirect non-ssl to ssl
 apache::vhost { 'sixteenth.example.com non-ssl':
-  servername   => 'sixteenth.example.com',
-  port         => '80',
-  docroot      => '/var/www/sixteenth',
-  rewrites     => [
+  servername => 'sixteenth.example.com',
+  port       => '80',
+  docroot    => '/var/www/sixteenth',
+  rewrites   => [
     {
-      comment       => 'redirect non-SSL traffic to SSL site',
-      rewrite_cond  => ['%{HTTPS} off'],
-      rewrite_rule  => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}'],
+      comment      => 'redirect non-SSL traffic to SSL site',
+      rewrite_cond => ['%{HTTPS} off'],
+      rewrite_rule => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}'],
     }
   ]
 }
@@ -215,18 +215,18 @@
 
 # Vhost with SSLProtocol,SSLCipherSuite, SSLHonorCipherOrder
 apache::vhost { 'securedomain.com':
-        priority              => '10',
-        vhost_name            => 'www.securedomain.com',
-        port                  => '443',
-        docroot               => '/var/www/secure',
-        ssl                   => true,
-        ssl_cert              => '/etc/ssl/securedomain.cert',
-        ssl_key               => '/etc/ssl/securedomain.key',
-        ssl_chain             => '/etc/ssl/securedomain.crt',
-        ssl_protocol          => '-ALL +SSLv3 +TLSv1',
-        ssl_cipher            => 'ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM',
-        ssl_honorcipherorder  => 'On',
-        add_listen            => false,
+        priority             => '10',
+        vhost_name           => 'www.securedomain.com',
+        port                 => '443',
+        docroot              => '/var/www/secure',
+        ssl                  => true,
+        ssl_cert             => '/etc/ssl/securedomain.cert',
+        ssl_key              => '/etc/ssl/securedomain.key',
+        ssl_chain            => '/etc/ssl/securedomain.crt',
+        ssl_protocol         => '-ALL +SSLv3 +TLSv1',
+        ssl_cipher           => 'ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM',
+        ssl_honorcipherorder => 'On',
+        add_listen           => false,
 }
 
 # Vhost with access log environment variables writing control

From cd5bc5b858412cf8fef616992d10e17ca95273ac Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 21 Aug 2014 13:17:33 -0400
Subject: [PATCH 0318/2267] Add --relative flag

---
 .puppet-lint.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index ef187bbdaa..0b3cfad25d 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,3 +1,4 @@
+--relative
 --no-single_quote_string_with_variables-check
 --no-80chars-check
 --no-class_inherits_from_params_class-check

From 4740e84763a8d336c6db13c59cd2a94f0ff461ca Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 21 Aug 2014 15:07:51 -0400
Subject: [PATCH 0319/2267] Add missing kernel fact

---
 spec/classes/mod/deflate_spec.rb     | 3 +++
 spec/classes/mod/negotiation_spec.rb | 1 +
 spec/classes/mod/passenger_spec.rb   | 4 ++++
 spec/classes/mod/php_spec.rb         | 1 +
 spec/classes/mod/worker_spec.rb      | 1 +
 spec/defines/fastcgi_server_spec.rb  | 4 ++++
 6 files changed, 14 insertions(+)

diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 164dbfa2ea..c61010f28a 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -35,6 +35,7 @@ class { "apache::mod::deflate":
       {
         :id                     => 'root',
         :lsbdistcodename        => 'squeeze',
+        :kernel                 => 'Linux',
         :osfamily               => 'Debian',
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
@@ -60,6 +61,7 @@ class { "apache::mod::deflate":
     let :facts do
       {
         :id                     => 'root',
+        :kernel                 => 'Linux',
         :osfamily               => 'RedHat',
         :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '6',
@@ -78,6 +80,7 @@ class { "apache::mod::deflate":
     let :facts do
       {
         :id                     => 'root',
+        :kernel                 => 'FreeBSD',
         :osfamily               => 'FreeBSD',
         :operatingsystem        => 'FreeBSD',
         :operatingsystemrelease => '9',
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 814660e1a1..d01442cb9a 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -7,6 +7,7 @@
       {
         :osfamily               => 'Debian',
         :operatingsystem        => 'Debian',
+        :kernel                 => 'Linux',
         :lsbdistcodename        => 'squeeze',
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 7fc1e3a63f..23154014a4 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -9,6 +9,7 @@
       {
         :osfamily               => 'Debian',
         :operatingsystemrelease => '6',
+        :kernel                 => 'Linux',
         :concat_basedir         => '/dne',
         :lsbdistcodename        => 'squeeze',
         :operatingsystem        => 'Debian',
@@ -123,6 +124,7 @@
         {
           :osfamily               => 'Debian',
           :operatingsystemrelease => '12.04',
+          :kernel                 => 'Linux',
           :operatingsystem        => 'Ubuntu',
           :lsbdistrelease         => '12.04',
           :concat_basedir         => '/dne',
@@ -142,6 +144,7 @@
           :osfamily               => 'Debian',
           :operatingsystemrelease => '14.04',
           :operatingsystem        => 'Ubuntu',
+          :kernel                 => 'Linux',
           :lsbdistrelease         => '14.04',
           :concat_basedir         => '/dne',
           :id                     => 'root',
@@ -160,6 +163,7 @@
           :osfamily               => 'Debian',
           :operatingsystemrelease => '7.3',
           :operatingsystem        => 'Debian',
+          :kernel                 => 'Linux',
           :lsbdistcodename        => 'wheezy',
           :concat_basedir         => '/dne',
           :id                     => 'root',
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index c61cdf6f53..cf61318797 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -158,6 +158,7 @@
         :osfamily               => 'Debian',
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
+        :kernel                 => 'Linux',
         :lsbdistcodename        => 'squeeze',
         :concat_basedir         => '/dne',
         :id                     => 'root',
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index c2ede28a2b..5902c2c7ea 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -119,6 +119,7 @@
         :osfamily               => 'RedHat',
         :operatingsystem        => 'CentOS',
         :operatingsystemrelease => '6',
+        :kernel                 => 'Linux',
         :id                     => 'root',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 4a8762c868..1dc8fd444a 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -14,6 +14,7 @@
           :osfamily               => 'RedHat',
           :operatingsystem        => 'CentOS',
           :operatingsystemrelease => '6',
+          :kernel                 => 'Linux',
           :id                     => 'root',
           :concat_basedir         => '/dne',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -34,6 +35,7 @@
           :operatingsystem        => 'Debian',
           :operatingsystemrelease => '6',
           :lsbdistcodename        => 'squeeze',
+          :kernel                 => 'Linux',
           :id                     => 'root',
           :concat_basedir         => '/dne',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -53,6 +55,7 @@
           :osfamily               => 'FreeBSD',
           :operatingsystem        => 'FreeBSD',
           :operatingsystemrelease => '9',
+          :kernel                 => 'FreeBSD',
           :id                     => 'root',
           :concat_basedir         => '/dne',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -74,6 +77,7 @@
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
         :lsbdistcodename        => 'squeeze',
+        :kernel                 => 'Linux',
         :id                     => 'root',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',

From 9a39347d655cd6a9dcd1e2dd4165c3312eebc181 Mon Sep 17 00:00:00 2001
From: Emanuele 'Tex' Tessore <setola@gmail.com>
Date: Mon, 7 Jul 2014 17:35:32 +0200
Subject: [PATCH 0320/2267] fixed type bug

---
 manifests/vhost.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0c7f03cd49..0dff1b91c8 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -300,8 +300,8 @@
     if $ip and defined(Apache::Listen[$port]) {
       fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
     }
-    if ! defined(Apache::Listen[$listen_addr_port]) and $listen_addr_port and $ensure == 'present' {
-      ::apache::listen { $listen_addr_port: }
+    if ! defined(Apache::Listen["$listen_addr_port"]) and $listen_addr_port and $ensure == 'present' {
+      ::apache::listen { "$listen_addr_port": }
     }
   }
   if ! $ip_based {

From 118e7479b63387b68f1d92a509f968cff501ab0b Mon Sep 17 00:00:00 2001
From: Emanuele Tessore <setola@webdev0.citexnetwork.com>
Date: Fri, 8 Aug 2014 09:34:02 +0200
Subject: [PATCH 0321/2267] make puppetlint happy with ${variable} syntax

---
 manifests/vhost.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0dff1b91c8..7dd6d5f44b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -300,8 +300,8 @@
     if $ip and defined(Apache::Listen[$port]) {
       fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
     }
-    if ! defined(Apache::Listen["$listen_addr_port"]) and $listen_addr_port and $ensure == 'present' {
-      ::apache::listen { "$listen_addr_port": }
+    if ! defined(Apache::Listen["${listen_addr_port}"]) and $listen_addr_port and $ensure == 'present' {
+      ::apache::listen { "${listen_addr_port}": }
     }
   }
   if ! $ip_based {

From 3f4630cb29f3c96a7cfc25efa3f06e7a9ae44032 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 26 Aug 2014 15:26:41 -0400
Subject: [PATCH 0322/2267] Apparently missed one of these in the conversion

Use Concat instead of File.
---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7dd6d5f44b..1755c2979c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -225,7 +225,7 @@
       ensure  => directory,
       mode    => $logroot_mode,
       require => Package['httpd'],
-      before  => File["${priority_real}-${filename}.conf"],
+      before  => Concat["${priority_real}-${filename}.conf"],
     }
   }
 

From 1b4e9429aa89168389a9a0b5d4491ed5cc7ec0e8 Mon Sep 17 00:00:00 2001
From: Riley Shott <rileyshott@gmail.com>
Date: Thu, 31 Jul 2014 17:19:10 -0700
Subject: [PATCH 0323/2267] Allow for better $logroot management

This commit now allows you to set the directory permissions on the default
$logroot directory by exposing $logroot_mode in init.pp. It also adds a
$logroot_ensure parameter to apache::vhost that can toggle the creation of a
vhost's logroot resource.
---
 README.md                  | 11 ++++++++++-
 manifests/init.pp          |  3 +++
 manifests/params.pp        |  3 +++
 manifests/vhost.pp         |  9 +++++++--
 spec/defines/vhost_spec.rb | 23 +++++++++++++++++++++--
 5 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4c01d27ff5..dd6be895d3 100644
--- a/README.md
+++ b/README.md
@@ -342,7 +342,7 @@ Changes the directory where Apache log files for the virtual host are placed. De
 
 #####`logroot_mode`
 
-Overrides the mode the logroot directory is set to. Defaults to undef. Do NOT give people write access to the directory the logs are stored
+Overrides the mode the default logroot directory is set to ($::apache::logroot). Defaults to undef. Do NOT give people write access to the directory the logs are stored
 in without being aware of the consequences; see http://httpd.apache.org/docs/2.4/logs.html#security for details.
 
 #####`manage_group`
@@ -972,6 +972,15 @@ Usage will typically look like:
 
 Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
 
+#####`$logroot_ensure`
+
+Determines whether or not to remove the logroot directory for a virtual host. Valid values are 'directory', or 'absent'.
+
+#####`logroot_mode`
+
+Overrides the mode the logroot directory is set to. Defaults to undef. Do NOT give people write access to the directory the logs are stored
+in without being aware of the consequences; see http://httpd.apache.org/docs/2.4/logs.html#security for details.
+
 #####`log_level`
 
 Specifies the verbosity of the error log. Defaults to 'warn' for the global server configuration and can be overridden on a per-vhost basis. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
diff --git a/manifests/init.pp b/manifests/init.pp
index 1c9c758618..f35fafbaa1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -53,6 +53,7 @@
   $keepalive_timeout    = $::apache::params::keepalive_timeout,
   $max_keepalive_requests = $apache::params::max_keepalive_requests,
   $logroot              = $::apache::params::logroot,
+  $logroot_mode         = $::apache::params::logroot_mode,
   $log_level            = $::apache::params::log_level,
   $log_formats          = {},
   $ports_file           = $::apache::params::ports_file,
@@ -321,6 +322,7 @@
       access_log_file => $access_log_file,
       priority        => '15',
       ip              => $ip,
+      logroot_mode    => $logroot_mode,
     }
     $ssl_access_log_file = $::osfamily ? {
       'freebsd' => $access_log_file,
@@ -336,6 +338,7 @@
       access_log_file => $ssl_access_log_file,
       priority        => '15',
       ip              => $ip,
+      logroot_mode    => $logroot_mode,
     }
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index d272afb319..d5d1265a6b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -45,6 +45,7 @@
     $conf_file            = 'httpd.conf'
     $ports_file           = "${conf_dir}/ports.conf"
     $logroot              = '/var/log/httpd'
+    $logroot_mode         = undef
     $lib_path             = 'modules'
     $mpm_module           = 'prefork'
     $dev_packages         = 'httpd-devel'
@@ -109,6 +110,7 @@
     $conf_file           = 'apache2.conf'
     $ports_file          = "${conf_dir}/ports.conf"
     $logroot             = '/var/log/apache2'
+    $logroot_mode        = undef
     $lib_path            = '/usr/lib/apache2/modules'
     $mpm_module          = 'worker'
     $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
@@ -209,6 +211,7 @@
     $conf_file        = 'httpd.conf'
     $ports_file       = "${conf_dir}/ports.conf"
     $logroot          = '/var/log/apache22'
+    $logroot_mode     = undef
     $lib_path         = '/usr/local/libexec/apache22'
     $mpm_module       = 'prefork'
     $dev_packages     = undef
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1755c2979c..b9c8406a62 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -35,6 +35,7 @@
   $directoryindex              = '',
   $vhost_name                  = '*',
   $logroot                     = $::apache::logroot,
+  $logroot_ensure              = 'directory',
   $logroot_mode                = undef,
   $log_level                   = undef,
   $access_log                  = true,
@@ -154,6 +155,10 @@
   if $itk {
     validate_hash($itk)
   }
+  
+  validate_re($logroot_ensure, '^(directory|absent)$',
+  "${logroot_ensure} is not supported for logroot_ensure.
+  Allowed values are 'directory' and 'absent'.")
 
   if $log_level {
     validate_re($log_level, '^(emerg|alert|crit|error|warn|notice|info|debug)$',
@@ -220,9 +225,9 @@
   }
 
   # Same as above, but for logroot
-  if ! defined(File[$logroot]) and $ensure == 'present' {
+  if ! defined(File[$logroot]) {
     file { $logroot:
-      ensure  => directory,
+      ensure  => $logroot_ensure,
       mode    => $logroot_mode,
       require => Package['httpd'],
       before  => Concat["${priority_real}-${filename}.conf"],
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index bc131a1c55..c5e1fe05ef 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -137,6 +137,7 @@
           'directoryindex'              => 'index.html',
           'vhost_name'                  => 'test',
           'logroot'                     => '/var/www/logs',
+          'logroot_ensure'              => 'directory',
           'logroot_mode'                => '0600',
           'log_level'                   => 'crit',
           'access_log'                  => false,
@@ -252,7 +253,11 @@
       it { is_expected.to contain_class('apache::mod::vhost_alias') }
       it { is_expected.to contain_class('apache::mod::wsgi') }
       it { is_expected.to contain_class('apache::mod::suexec') }
-      it { is_expected.to contain_file('/var/www/logs') }
+      it { is_expected.to contain_file('/var/www/logs').with({
+        'ensure' => 'directory',
+        'mode'   => '0600',
+      })
+      }
       it { is_expected.to contain_class('apache::mod::rewrite') }
       it { is_expected.to contain_class('apache::mod::alias') }
       it { is_expected.to contain_class('apache::mod::proxy') }
@@ -308,6 +313,7 @@
           'ensure'          => 'absent',
           'manage_docroot'  => true,
           'logroot'         => '/tmp/logroot',
+          'logroot_ensure'  => 'absent',
         }
       end
       let :facts do
@@ -336,7 +342,10 @@
       it { is_expected.to_not contain_class('apache::mod::passenger') }
       it { is_expected.to_not contain_class('apache::mod::headers') }
       it { is_expected.to contain_file('/var/www/foo') }
-      it { is_expected.to_not contain_file('/tmp/logroot') }
+      it { is_expected.to contain_file('/tmp/logroot').with({
+        'ensure' => 'absent',
+      })
+      }
       it { is_expected.to contain_concat('25-rspec.example.com.conf').with({
         'ensure' => 'absent',
       })
@@ -524,6 +533,16 @@
       let :facts do default_facts end
       it { expect { is_expected.to compile }.to raise_error }
     end
+    context 'bad logroot_ensure' do
+      let :params do
+        {
+          'docroot'   => '/rspec/docroot',
+          'log_level' => 'bogus',
+        }
+      end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
     context 'bad log_level' do
       let :params do
         {

From 4ece06161f8b6d114640f97c42db5f1cfb43a222 Mon Sep 17 00:00:00 2001
From: ThatGraemeGuy <thatgraemeguy@users.noreply.github.com>
Date: Wed, 27 Aug 2014 14:29:14 +0200
Subject: [PATCH 0324/2267] Added missing syntax highlight to 1st
 apache::mod::php example

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c01d27ff5..99cb9f0ba0 100644
--- a/README.md
+++ b/README.md
@@ -616,7 +616,7 @@ Full documentation for mod_pagespeed is available from [Google](http://modpagesp
 Installs and configures mod_php. The defaults are OS-dependant.
 
 Overriding the package name:
-```
+```puppet
   class {'::apache::mod::php':
     package_name => "php54-php",
     path         => "${::apache::params::lib_path}/libphp54-php5.so",

From 4a8b692b0381261cc7dec2f4551fc73a2a409d11 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Tue, 26 Aug 2014 14:21:00 +0200
Subject: [PATCH 0325/2267] Allow multiple balancermembers with the same url

Currently you can't set multiple balancermembers with the same url even
if they are bind to different balancers.

This commit fixes that unwanted behaviour.
---
 manifests/balancermember.pp         |  2 +-
 spec/defines/balancermember_spec.rb | 36 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 spec/defines/balancermember_spec.rb

diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 121e2c5533..459081a716 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -45,7 +45,7 @@
   $options = [],
 ) {
 
-  concat::fragment { "BalancerMember ${url}":
+  concat::fragment { "BalancerMember ${name}":
     ensure  => present,
     target  => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
     content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
new file mode 100644
index 0000000000..b7293b390e
--- /dev/null
+++ b/spec/defines/balancermember_spec.rb
@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'apache::balancermember', :type => :define do
+  let :pre_condition do
+    'include apache
+    apache::balancer {"balancer":}
+    apache::balancer {"balancer-external":}
+    apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancer-external"}
+    '
+  end
+  let :title do
+    'http://127.0.0.1:8080/'
+  end
+  let :params do
+    {
+      :options          => [],
+      :url              => 'http://127.0.0.1:8080/',
+      :balancer_cluster => 'balancer-internal'
+    }
+  end
+  let :facts do
+    {
+      :osfamily               => 'Debian',
+      :operatingsystem        => 'Debian',
+      :operatingsystemrelease => '6',
+      :lsbdistcodename        => 'squeeze',
+      :id                     => 'root',
+      :concat_basedir         => '/dne',
+      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      :kernel                 => 'Linux',
+    }
+  end
+  describe "allows multiple balancermembers with the same url" do
+    it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/') }
+  end
+end

From d2ad8ec2fc5a638d96862d30ccc80eed225487b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Mon, 30 Jun 2014 13:44:57 +0200
Subject: [PATCH 0326/2267] function to munge booleans to httpd's On/Off

this function tries to recognize booleans of any kind and convert
(normalize) them httpd's accepted On/Off.
Failing that, it will simply return the string it was passed. As such it
can be used, for instance for:

    $server_signature = true
    $server_signature = false
    $server_signature = 'mail'
---
 lib/puppet/parser/functions/bool2httpd.rb     | 30 +++++++++++
 .../parser/functions/bool2httpd_spec.rb       | 54 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 lib/puppet/parser/functions/bool2httpd.rb
 create mode 100644 spec/unit/puppet/parser/functions/bool2httpd_spec.rb

diff --git a/lib/puppet/parser/functions/bool2httpd.rb b/lib/puppet/parser/functions/bool2httpd.rb
new file mode 100644
index 0000000000..5fb79f6f58
--- /dev/null
+++ b/lib/puppet/parser/functions/bool2httpd.rb
@@ -0,0 +1,30 @@
+Puppet::Parser::Functions::newfunction(:bool2httpd, :type => :rvalue, :doc => <<-EOS
+Transform a supposed boolean to On or Off. Pass all other values through.
+Given a nil value (undef), bool2httpd will return 'Off'
+
+Example:
+
+    $trace_enable     = false
+    $server_signature = 'mail'
+
+    bool2httpd($trace_enable)
+    # => 'Off'
+    bool2httpd($server_signature)
+    # => 'mail'
+    bool2httpd(undef)
+    # => 'Off'
+
+EOS
+) do |args|
+  raise(Puppet::ParseError, "bool2httpd() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
+
+  arg = args[0]
+
+  if arg.nil? or arg == false or arg =~ /false/i or arg == :undef
+    return 'Off'
+  elsif arg == true or arg =~ /true/i
+    return 'On'
+  end
+
+  return arg.to_s
+end
diff --git a/spec/unit/puppet/parser/functions/bool2httpd_spec.rb b/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
new file mode 100644
index 0000000000..b0bcbb6220
--- /dev/null
+++ b/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
@@ -0,0 +1,54 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+describe "the bool2httpd function" do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  it "should exist" do
+    expect(Puppet::Parser::Functions.function("bool2httpd")).to eq("function_bool2httpd")
+  end
+
+  it "should raise a ParseError if there is less than 1 arguments" do
+    expect { scope.function_bool2httpd([]) }.to( raise_error(Puppet::ParseError))
+  end
+
+  it "should convert true to 'On'" do
+    result = scope.function_bool2httpd([true])
+    expect(result).to(eq('On'))
+  end
+
+  it "should convert true to a string" do
+    result = scope.function_bool2httpd([true])
+    expect(result.class).to(eq(String))
+  end
+
+  it "should convert false to 'Off'" do
+    result = scope.function_bool2httpd([false])
+    expect(result).to(eq('Off'))
+  end
+
+  it "should convert false to a string" do
+    result = scope.function_bool2httpd([false])
+    expect(result.class).to(eq(String))
+  end
+
+  it "should accept (and return) any string" do
+    result = scope.function_bool2httpd(["mail"])
+    expect(result).to(eq('mail'))
+  end
+
+  it "should accept a nil value (and return Off)" do
+    result = scope.function_bool2httpd([nil])
+    expect(result).to(eq('Off'))
+  end
+
+  it "should accept an undef value (and return 'Off')" do
+    result = scope.function_bool2httpd([:undef])
+    expect(result).to(eq('Off'))
+  end
+
+  it "should return a default value on non-matches" do
+    result = scope.function_bool2httpd(['foo'])
+    expect(result).to(eq('foo'))
+  end
+end

From e550ec293be9f329f793c22b97731035994c37eb Mon Sep 17 00:00:00 2001
From: Geoff Williams <geoff.williams@puppetlabs.com>
Date: Fri, 29 Aug 2014 12:48:00 +1000
Subject: [PATCH 0327/2267] force class definition checks to use absolute scope

---
 manifests/mod/php.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index ad0ff48a0e..c1f76065a6 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -7,10 +7,10 @@
   $template       = 'apache/mod/php5.conf.erb',
   $source         = undef,
 ) {
-  if defined(Class['apache::mod::prefork']) {
+  if defined(Class['::apache::mod::prefork']) {
     Class['::apache::mod::prefork']->File['php5.conf']
   }
-  elsif defined(Class['apache::mod::itk']) {
+  elsif defined(Class['::apache::mod::itk']) {
     Class['::apache::mod::itk']->File['php5.conf']
   }
   else {

From 873d829e6663d9a6b92635320d0070156a1fc304 Mon Sep 17 00:00:00 2001
From: Dan Bode <bodepd@gmail.com>
Date: Thu, 4 Sep 2014 11:21:13 +0530
Subject: [PATCH 0328/2267] Ensure that mod packages are installed before conf

Currently, there is no strict ordering that ensures
that the conf file is only created after a mods
packages are installed.

This means that it is possible for the .conf file to be
created before package installation.

In the case of libapache2-mod-wsgi (3.4-4ubuntu2.1.14.04.1),
this lead to a package install failure on Ubuntu Trusty

dpkg: error processing package libapache2-mod-wsgi (--configure):
subprocess installed post-installation script returned error exit status 1
Errors were encountered while processing:
  libapache2-mod-wsgi
  Sub-process /usr/bin/dpkg returned an error code (1)

The order is ensured by this patch by assuming that the mod.conf
file is named: "${mod}.conf" (the same assumption made by the related
symlink) and placing a conditional dependency on all packages indicated
being required for the installation of the module.
---
 manifests/mod.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 2795578ec8..b937e8f050 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -68,6 +68,8 @@
       ],
       default => File[$_loadfile_name],
     }
+    # if there are any packages, they should be installed before the associated conf file
+    Package[$_package] -> File<| title == "${mod}.conf" |>
     # $_package may be an array
     package { $_package:
       ensure  => $package_ensure,

From f4ecfa2b9ab94f37dfd663f10e4bc02a242c1d3f Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 2 Sep 2014 16:45:37 -0400
Subject: [PATCH 0329/2267] Add defined type for handling custom configs

Initially I was looking to handle custom configs by creating a temporary
file, validating that file, and creating a file under apache's
`$confd_dir` only if that validation passed. Ubuntu caused issues for me
though, and apachectl was unable to validate config files under
non-default paths. Thus, I ended up with a file resource and two execs,
to remove the config if invalid, and notify the httpd service if valid.

There were some bugs with existing acceptance tests, so fixed those too.
---
 README.md                                 |  41 +++++++
 manifests/custom_config.pp                |  60 ++++++++++
 spec/acceptance/apache_parameters_spec.rb |  10 +-
 spec/acceptance/custom_config_spec.rb     |  38 ++++++
 spec/acceptance/version.rb                |   5 +-
 spec/defines/custom_config_spec.rb        | 137 ++++++++++++++++++++++
 6 files changed, 284 insertions(+), 7 deletions(-)
 create mode 100644 manifests/custom_config.pp
 create mode 100644 spec/acceptance/custom_config_spec.rb
 create mode 100644 spec/defines/custom_config_spec.rb

diff --git a/README.md b/README.md
index df2c70d5a3..6632e0992e 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@
 4. [Usage - The classes and defined types available for configuration](#usage)
     * [Classes and Defined Types](#classes-and-defined-types)
         * [Class: apache](#class-apache)
+        * [Defined Type: apache::custom_config](#defined-type-apachecustom_config)
         * [Class: apache::default_mods](#class-apachedefault_mods)
         * [Defined Type: apache::mod](#defined-type-apachemod)
         * [Classes: apache::mod::*](#classes-apachemodname)
@@ -429,6 +430,46 @@ Changes the location of the configuration directory your virtual host configurat
 
 The name of the Apache package to install. This is automatically detected in `::apache::params`. You may need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.
 
+####Defined Type: `apache::custom_config`
+
+Allows you to create custom configs for Apache. The configuration files will only be added to the Apache confd dir if the file is valid. An error will be raised during the puppet run if the file is invalid and `$verify_config` is `true`.
+
+```puppet
+    apache::custom_config { 'test':
+        content => '# Test',
+    }
+```
+
+**Parameters within `apache::custom_config`:**
+
+#####`ensure`
+
+Specify whether the configuration file is present or absent. Defaults to 'present'. Valid values are 'present' and 'absent'.
+
+#####`confdir`
+
+The directory to place the configuration file in. Defaults to `$::apache::confd_dir`.
+
+#####`content`
+
+The content of the configuration file. Only one of `$content` and `$source` can be specified.
+
+#####`priority`
+
+The priority of the configuration file, used for ordering. Defaults to '25'.
+
+#####`source`
+
+The source of the configuration file. Only one of `$content` and `$source` can be specified.
+
+#####`verify_command`
+
+The command to use to verify the configuration file. It should use a fully qualified command. Defaults to '/usr/sbin/apachectl -t'. The `$verify_command` will only be used if `$verify_config` is `true`. If the `$verify_command` fails the configuration file will be deleted, the Apache service will not be notified, and an error will be raised during the puppet run.
+
+#####`verify_config`
+
+Boolean to specify whether the configuration file should be validated before the Apache service is notified. Defaults to `true`.
+
 ####Class: `apache::default_mods`
 
 Installs default Apache modules based on what OS you are running.
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
new file mode 100644
index 0000000000..543ace94e5
--- /dev/null
+++ b/manifests/custom_config.pp
@@ -0,0 +1,60 @@
+# See README.md for usage information
+define apache::custom_config (
+  $ensure         = 'present',
+  $confdir        = $::apache::confd_dir,
+  $content        = undef,
+  $priority       = '25',
+  $source         = undef,
+  $verify_command = '/usr/sbin/apachectl -t',
+  $verify_config  = true,
+) {
+
+  if $content and $source {
+    fail('Only one of $content and $source can be specified.')
+  }
+
+  if $ensure == 'present' and ! $content and ! $source {
+    fail('One of $content and $source must be specified.')
+  }
+
+  validate_re($ensure, '^(present|absent)$',
+  "${ensure} is not supported for ensure.
+  Allowed values are 'present' and 'absent'.")
+
+  validate_bool($verify_config)
+
+  ## Apache include does not always work with spaces in the filename
+  $filename  = regsubst($name, ' ', '_', 'G')
+
+  if ! $verify_config or $ensure == 'absent' {
+    $notifies = Service['httpd']
+  } else {
+    $notifies = undef
+  }
+
+  file { "apache_${name}":
+    ensure  => $ensure,
+    path    => "${confdir}/${priority}-${filename}.conf",
+    content => $content,
+    source  => $source,
+    require => Package['httpd'],
+    notify  => $notifies,
+  }
+
+  if $ensure == 'present' and $verify_config {
+    exec { "service notify for ${name}":
+      command     => $verify_command,
+      subscribe   => File["apache_${name}"],
+      refreshonly => true,
+      notify      => Service['httpd'],
+      before      => Exec["remove ${name} if invalid"],
+    }
+
+    exec { "remove ${name} if invalid":
+      command     => "/bin/rm ${confdir}/${priority}-${filename}.conf",
+      unless      => $verify_command,
+      subscribe   => File["apache_${name}"],
+      refreshonly => true,
+    }
+  }
+}
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 983bbb1676..3a21ab0eb2 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -11,7 +11,7 @@
     end
 
     if fact('osfamily') == 'FreeBSD'
-      describe file("#{confd_dir}/no-accf.conf.erb") do
+      describe file("#{$confd_dir}/no-accf.conf.erb") do
         it { is_expected.not_to be_file }
       end
     end
@@ -80,9 +80,8 @@ class { 'apache':
       pp = <<-EOS
         class { 'apache':
           purge_configs   => false,
-          purge_vdir      => false,
           purge_vhost_dir => false,
-          vhost_dir       => "#{confd_dir}.vhosts"
+          vhost_dir       => "#{$confd_dir}.vhosts"
         }
       EOS
       shell("touch #{$confd_dir}/test.conf")
@@ -105,9 +104,8 @@ class { 'apache':
         pp = <<-EOS
           class { 'apache':
             purge_configs   => true,
-            purge_vdir      => true,
             purge_vhost_dir => true,
-            vhost_dir       => "#{confd_dir}.vhosts"
+            vhost_dir       => "#{$confd_dir}.vhosts"
           }
         EOS
         shell("touch #{$confd_dir}/test.conf")
@@ -202,7 +200,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file("#{$confd_dir}/mime.conf") do
+    describe file("#{$mod_dir}/mime.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'AddLanguage eo .eo' }
     end
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
new file mode 100644
index 0000000000..fce6bb306f
--- /dev/null
+++ b/spec/acceptance/custom_config_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper_acceptance'
+require_relative './version.rb'
+
+describe 'apache::custom_config define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  context 'invalid config' do
+    it 'should not add the config' do
+      pp = <<-EOS
+        class { 'apache': }
+        apache::custom_config { 'acceptance_test':
+          content => 'INVALID',
+        }
+      EOS
+
+      apply_manifest(pp, :expect_failures => true)
+    end
+
+    describe file("#{$confd_dir}/25-acceptance_test.conf") do
+      it { is_expected.not_to be_file }
+    end
+  end
+
+  context 'valid config' do
+    it 'should add the config' do
+      pp = <<-EOS
+        class { 'apache': }
+        apache::custom_config { 'acceptance_test':
+          content => '# just a comment',
+        }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$confd_dir}/25-acceptance_test.conf") do
+      it { is_expected.to contain '# just a comment' }
+    end
+  end
+end
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index 27498354b4..b88412b42f 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -5,6 +5,7 @@
 case _osfamily
 when 'RedHat'
   $confd_dir        = '/etc/httpd/conf.d'
+  $mod_dir          = '/etc/httpd/conf.d'
   $conf_file        = '/etc/httpd/conf/httpd.conf'
   $ports_file       = '/etc/httpd/conf/ports.conf'
   $vhost_dir        = '/etc/httpd/conf.d'
@@ -22,7 +23,8 @@
     $apache_version = '2.2'
   end
 when 'Debian'
-  $confd_dir        = '/etc/apache2/mods-available'
+  $confd_dir        = '/etc/apache2/conf.d'
+  $mod_dir          = '/etc/apache2/mods-available'
   $conf_file        = '/etc/apache2/apache2.conf'
   $ports_file       = '/etc/apache2/ports.conf'
   $vhost            = '/etc/apache2/sites-available/15-default.conf'
@@ -41,6 +43,7 @@
   end
 when 'FreeBSD'
   $confd_dir        = '/usr/local/etc/apache22/Includes'
+  $mod_dir          = '/usr/local/etc/apache22/Modules'
   $conf_file        = '/usr/local/etc/apache22/httpd.conf'
   $ports_file       = '/usr/local/etc/apache22/Includes/ports.conf'
   $vhost            = '/usr/local/etc/apache22/Vhosts/15-default.conf'
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
new file mode 100644
index 0000000000..187b8a7b56
--- /dev/null
+++ b/spec/defines/custom_config_spec.rb
@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+describe 'apache::custom_config', :type => :define do
+  let :pre_condition do
+    'class { "apache": }'
+  end
+  let :title do
+    'rspec'
+  end
+  let :facts do
+    {
+      :osfamily               => 'Debian',
+      :operatingsystemrelease => '6',
+      :concat_basedir         => '/',
+      :lsbdistcodename        => 'squeeze',
+      :operatingsystem        => 'Debian',
+      :id                     => 'root',
+      :kernel                 => 'Linux',
+      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+  context 'defaults with content' do
+    let :params do
+      {
+        'content' => '# Test',
+      }
+    end
+    it { is_expected.to contain_exec("service notify for rspec").with({
+      'refreshonly' => 'true',
+      'subscribe'   => 'File[apache_rspec]',
+      'command'     => '/usr/sbin/apachectl -t',
+      'notify'      => 'Service[httpd]',
+      'before'      => 'Exec[remove rspec if invalid]',
+    })
+    }
+    it { is_expected.to contain_exec("remove rspec if invalid").with({
+      'unless'      => '/usr/sbin/apachectl -t',
+      'subscribe'   => 'File[apache_rspec]',
+      'refreshonly' => 'true',
+    })
+    }
+    it { is_expected.to contain_file("apache_rspec").with({
+      'ensure'  => 'present',
+      'content' => '# Test',
+      'require' => 'Package[httpd]',
+    })
+    }
+  end
+  context 'set everything with source' do
+    let :params do
+      {
+        'confdir'        => '/dne',
+        'priority'       => '30',
+        'source'         => 'puppet:///modules/apache/test',
+        'verify_command' => '/bin/true',
+      }
+    end
+    it { is_expected.to contain_exec("service notify for rspec").with({
+      'command'     => '/bin/true',
+    })
+    }
+    it { is_expected.to contain_exec("remove rspec if invalid").with({
+      'command'     => '/bin/rm /dne/30-rspec.conf',
+      'unless'      => '/bin/true',
+    })
+    }
+    it { is_expected.to contain_file("apache_rspec").with({
+      'path'   => '/dne/30-rspec.conf',
+      'ensure'  => 'present',
+      'source' => 'puppet:///modules/apache/test',
+      'require' => 'Package[httpd]',
+    })
+    }
+  end
+  context 'verify_config => false' do
+    let :params do
+      {
+        'content'       => '# test',
+        'verify_config' => false,
+      }
+    end
+    it { is_expected.to_not contain_exec('service notify for rspec') }
+    it { is_expected.to_not contain_exec('remove rspec if invalid') }
+    it { is_expected.to contain_file('apache_rspec').with({
+      'notify' => 'Service[httpd]'
+    })
+    }
+  end
+  context 'ensure => absent' do
+    let :params do
+      {
+        'ensure' => 'absent'
+      }
+    end
+    it { is_expected.to_not contain_exec('service notify for rspec') }
+    it { is_expected.to_not contain_exec('remove rspec if invalid') }
+    it { is_expected.to contain_file('apache_rspec').with({
+      'ensure' => 'absent',
+    })
+    }
+  end
+  describe 'validation' do
+    context 'both content and source' do
+      let :params do
+        {
+          'content' => 'foo',
+          'source'  => 'bar',
+        }
+      end
+      it do
+        expect {
+          should compile
+        }.to raise_error(Puppet::Error, /Only one of \$content and \$source can be specified\./)
+      end
+    end
+    context 'neither content nor source' do
+      it do
+        expect {
+          should compile
+        }.to raise_error(Puppet::Error, /One of \$content and \$source must be specified\./)
+      end
+    end
+    context 'bad ensure' do
+      let :params do
+        {
+          'content' => 'foo',
+          'ensure'  => 'foo',
+        }
+      end
+      it do
+        expect {
+          should compile
+        }.to raise_error(Puppet::Error, /is not supported for ensure/)
+      end
+    end
+  end
+end

From c24e2fae07c2af07ae72cf24d3ece07c7d739792 Mon Sep 17 00:00:00 2001
From: Pi3r <pradermecker@yahoo.ca>
Date: Sun, 7 Sep 2014 22:05:19 +0200
Subject: [PATCH 0330/2267] Clean-up hash lookup and avoid local undef var

---
 manifests/mod.pp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 2795578ec8..776a6c59f2 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -18,11 +18,10 @@
 
   # Determine if we have special lib
   $mod_libs = $::apache::params::mod_libs
-  $mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
   if $lib {
     $_lib = $lib
-  } elsif $mod_lib {
-    $_lib = $mod_lib
+  } elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack
+    $_lib = $mod_libs[$mod]
   } else {
     $_lib = "mod_${mod}.so"
   }
@@ -48,11 +47,10 @@
 
   # Determine if we have a package
   $mod_packages = $::apache::params::mod_packages
-  $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
   if $package {
     $_package = $package
-  } elsif $mod_package {
-    $_package = $mod_package
+  } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
+    $_package = $mod_packages[$mod]
   } else {
     $_package = undef
   }

From b1c2ce0ca59ace35fa476aa913dc03440ce55f55 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Tue, 9 Sep 2014 17:18:16 +0200
Subject: [PATCH 0331/2267] Fix formatting of sethandler description

The code example in the `satisfy` section didn't close the code block.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 28ba28b6bb..9f6b95aca3 100644
--- a/README.md
+++ b/README.md
@@ -1629,6 +1629,7 @@ Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.a
         }
       ],
     }
+```
 
 ######`sethandler`
 

From ba8f8159c2416467e1464f85f3ce235143439de6 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Tue, 9 Sep 2014 11:09:11 -0700
Subject: [PATCH 0332/2267] (FM-1876) Remove trailing whitespace from
 manifests/vhost.pp

This commit allows apache's lint tests to pass
---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b9c8406a62..730ed05856 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -155,7 +155,7 @@
   if $itk {
     validate_hash($itk)
   }
-  
+
   validate_re($logroot_ensure, '^(directory|absent)$',
   "${logroot_ensure} is not supported for logroot_ensure.
   Allowed values are 'directory' and 'absent'.")

From a529a407e62e61ae641d2f283721b2911925eccf Mon Sep 17 00:00:00 2001
From: Victor Passapera <vpassapera@gmail.com>
Date: Tue, 9 Sep 2014 11:28:38 -0700
Subject: [PATCH 0333/2267] Update vhost.pp

Getting duplicate declaration errors for logroots managed from puppet and *not* apache even though it tries to create it if not defined.
---
 manifests/vhost.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 730ed05856..0f5c6182be 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -35,6 +35,7 @@
   $directoryindex              = '',
   $vhost_name                  = '*',
   $logroot                     = $::apache::logroot,
+  $manage_logroot              = true,
   $logroot_ensure              = 'directory',
   $logroot_mode                = undef,
   $log_level                   = undef,
@@ -225,7 +226,7 @@
   }
 
   # Same as above, but for logroot
-  if ! defined(File[$logroot]) {
+  if ! defined(File[$logroot]) and $manage_logroot {
     file { $logroot:
       ensure  => $logroot_ensure,
       mode    => $logroot_mode,

From 7a98903b42ff1f12656a24e229fc37958608f0c1 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Wed, 10 Sep 2014 10:33:29 -0700
Subject: [PATCH 0334/2267] Fix issue with puppet_module_install, removed and
 using updated method from beaker core copy_module_to

---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 370de46c0d..0ae9335f69 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -28,8 +28,8 @@
   # Configure all nodes in nodeset
   c.before :suite do
     # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'apache')
     hosts.each do |host|
+      copy_module_to(host, :source => proj_root, :module_name => 'apache')
       # Required for mod_passenger tests.
       if fact('osfamily') == 'RedHat'
         on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }

From 9a9877fc82f5f758fcf102ea48939e509f819ede Mon Sep 17 00:00:00 2001
From: chris <chris@vdwel.net>
Date: Sat, 13 Sep 2014 14:19:22 +0200
Subject: [PATCH 0335/2267] Fix typo in mod::pagespeed memache_servers

---
 README.md                        | 2 +-
 manifests/mod/pagespeed.pp       | 2 +-
 templates/mod/pagespeed.conf.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 98cebb9a97..8993048ae3 100644
--- a/README.md
+++ b/README.md
@@ -498,7 +498,7 @@ These are the defaults:
       filter_xhtml                  => false,
       cache_path                    => '/var/cache/mod_pagespeed/',
       log_dir                       => '/var/log/pagespeed',
-      memache_servers               => [],
+      memcache_servers              => [],
       rewrite_level                 => 'CoreFilters',
       disable_filters               => [],
       enable_filters                => [],
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index d58f99fe2e..065957ebbd 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -3,7 +3,7 @@
   $filter_xhtml                  = false,
   $cache_path                    = '/var/cache/mod_pagespeed/',
   $log_dir                       = '/var/log/pagespeed',
-  $memache_servers               = [],
+  $memcache_servers              = [],
   $rewrite_level                 = 'CoreFilters',
   $disable_filters               = [],
   $enable_filters                = [],
diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
index 3bbf7f29b4..fbdfa303dc 100644
--- a/templates/mod/pagespeed.conf.erb
+++ b/templates/mod/pagespeed.conf.erb
@@ -8,7 +8,7 @@ AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER application/xhtml+xml
 ModPagespeedFileCachePath "<%= @cache_path %>"
 ModPagespeedLogDir "<%= @log_dir %>"
     
-<% @memache_servers.each do |server| -%>
+<% @memcache_servers.each do |server| -%>
 ModPagespeedMemcachedServers <%= server -%>
 <% end -%>
 

From aa4d07a8b6294c192a98a197ac6d9356b92c9a23 Mon Sep 17 00:00:00 2001
From: olivierHa <olivier.hanesse@gmail.com>
Date: Mon, 15 Sep 2014 09:03:06 +0200
Subject: [PATCH 0336/2267] Fix correct type for php_admin and sort hash

---
 manifests/vhost.pp             | 4 ++--
 templates/vhost/_php_admin.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 730ed05856..0d90d55851 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -59,8 +59,8 @@
   $suphp_addhandler            = $::apache::params::suphp_addhandler,
   $suphp_engine                = $::apache::params::suphp_engine,
   $suphp_configpath            = $::apache::params::suphp_configpath,
-  $php_admin_flags             = [],
-  $php_admin_values            = [],
+  $php_admin_flags             = {},
+  $php_admin_values            = {},
   $no_proxy_uris               = [],
   $proxy_preserve_host         = false,
   $redirect_source             = '/',
diff --git a/templates/vhost/_php_admin.erb b/templates/vhost/_php_admin.erb
index b79b818df9..c0c8dd60a7 100644
--- a/templates/vhost/_php_admin.erb
+++ b/templates/vhost/_php_admin.erb
@@ -1,10 +1,10 @@
 <% if @php_admin_values and not @php_admin_values.empty? -%>
-  <%- @php_admin_values.each do |key,value| -%>
+  <%- @php_admin_values.sort.each do |key,value| -%>
   php_admin_value <%= key %> <%= value %>
   <%- end -%>
 <% end -%>
 <% if @php_admin_flags and not @php_admin_flags.empty? -%>
-  <%- @php_admin_flags.each do |key,flag| -%>
+  <%- @php_admin_flags.sort.each do |key,flag| -%>
     <%-# normalize flag -%>
     <%- if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
   php_admin_flag <%= key %> <%= flag %>

From 2b3a9f030ff77824a30b20a642ea97379fdf4d95 Mon Sep 17 00:00:00 2001
From: Matthias Baur <matthias.baur@dmc.de>
Date: Fri, 5 Sep 2014 18:48:24 +0200
Subject: [PATCH 0337/2267] Fix some Puppet Lint errors

---
 manifests/init.pp       | 2 +-
 manifests/mod.pp        | 2 +-
 manifests/mod/cgid.pp   | 2 +-
 manifests/mod/dav_fs.pp | 2 +-
 manifests/mod/ssl.pp    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index f35fafbaa1..7fcd533e55 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -225,7 +225,7 @@
     case $::osfamily {
       'debian': {
         $docroot              = '/var/www'
-        $pidfile              = '${APACHE_PID_FILE}'
+        $pidfile              = "\${APACHE_PID_FILE}"
         $error_log            = 'error.log'
         $error_documents_path = '/usr/share/apache2/error'
         $scriptalias          = '/usr/lib/cgi-bin'
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 2795578ec8..1d38d3c4f7 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -76,7 +76,7 @@
     }
   }
 
-  file { "${_loadfile_name}":
+  file { $_loadfile_name:
     ensure  => file,
     path    => "${mod_dir}/${_loadfile_name}",
     owner   => 'root',
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 5c89251a1c..2a0c178e01 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -4,7 +4,7 @@
   # Debian specifies it's cgid sock path, but RedHat uses the default value
   # with no config file
   $cgisock_path = $::osfamily ? {
-    'debian'  => '${APACHE_RUN_DIR}/cgisock',
+    'debian'  => "\${APACHE_RUN_DIR}/cgisock",
     'freebsd' => 'cgisock',
     default   => undef,
   }
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index 482f316171..0cb663f5c5 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -1,6 +1,6 @@
 class apache::mod::dav_fs {
   $dav_lock = $::osfamily ? {
-    'debian'  => '${APACHE_LOCK_DIR}/DAVLock',
+    'debian'  => "\${APACHE_LOCK_DIR}/DAVLock",
     'freebsd' => '/usr/local/var/DavLock',
     default   => '/var/lib/dav/lockdb',
   }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index ff0e929272..7e115fb661 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -6,7 +6,7 @@
   $package_name    = undef,
 ) {
   $session_cache = $::osfamily ? {
-    'debian'  => '${APACHE_RUN_DIR}/ssl_scache(512000)',
+    'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
     'redhat'  => '/var/cache/mod_ssl/scache(512000)',
     'freebsd' => '/var/run/ssl_scache(512000)',
   }
@@ -18,7 +18,7 @@
       } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
         $ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
       } else {
-        $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex'
+        $ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex"
       }
     }
     'redhat': {

From 0d39322210794f9164b1f07821632cab2adec6d9 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Tue, 16 Sep 2014 15:38:52 -0700
Subject: [PATCH 0338/2267] MODULES-1294 Fix issue with auth_require not taking
 precedence over default of require all granted, added checks for require and
 auth_require before adding the default

---
 templates/vhost/_directories.erb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index efa26ce4e9..b39d636f70 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -37,7 +37,11 @@
     <%- if @apache_version == '2.4' -%>
       <%- if directory['require'] and directory['require'] != '' -%>
     Require <%= Array(directory['require']).join(' ') %>
-      <%- else -%>
+      <%- end -%>
+      <%- if directory['auth_require'] -%>
+    Require <%= directory['auth_require'] %>
+      <%- end -%>
+      <%- if !(directory['require'] and directory['require'] != '') && !(directory['auth_require']) -%>
     Require all granted
       <%- end -%>
     <%- else -%>
@@ -127,9 +131,6 @@
     <%- if directory['auth_group_file'] -%>
     AuthGroupFile <%= directory['auth_group_file'] %>
     <%- end -%>
-    <%- if directory['auth_require'] -%>
-    Require <%= directory['auth_require'] %>
-    <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>
     <%- end -%>

From 1dc3451fa772ba7b5cfe027a2a04fe1c6086f41b Mon Sep 17 00:00:00 2001
From: Mike Dorman <mdorman@godaddy.com>
Date: Thu, 18 Sep 2014 17:14:25 -0600
Subject: [PATCH 0339/2267] Changing $port to interpolated string "${port}" to
 fix "Cannot use Fixnum where String is expected" errors under Puppet 3.7.x

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0d90d55851..762aa28fbf 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -302,7 +302,7 @@
     }
   }
   if $add_listen {
-    if $ip and defined(Apache::Listen[$port]) {
+    if $ip and defined(Apache::Listen["${port}"]) {
       fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
     }
     if ! defined(Apache::Listen["${listen_addr_port}"]) and $listen_addr_port and $ensure == 'present' {

From d84e426649542d537e999f5bc5d2aba47fac06e0 Mon Sep 17 00:00:00 2001
From: chris <chris@vdwel.net>
Date: Fri, 19 Sep 2014 11:29:20 +0200
Subject: [PATCH 0340/2267] Fix missing newline after ModPagespeed filter and
 memcached servers directives

---
 templates/mod/pagespeed.conf.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
index b5c68d52e0..a1b6f117a4 100644
--- a/templates/mod/pagespeed.conf.erb
+++ b/templates/mod/pagespeed.conf.erb
@@ -9,21 +9,21 @@ ModPagespeedFileCachePath "<%= @cache_path %>"
 ModPagespeedLogDir "<%= @log_dir %>"
     
 <% @memcache_servers.each do |server| -%>
-ModPagespeedMemcachedServers <%= server -%>
+ModPagespeedMemcachedServers <%= server %>
 <% end -%>
 
 ModPagespeedRewriteLevel <%= @rewrite_level -%>
 
 <% @disable_filters.each do |filter| -%>
-ModPagespeedDisableFilters <%= filter -%>
+ModPagespeedDisableFilters <%= filter %>
 <% end -%>
     
 <% @enable_filters.each do |filter| -%>
-ModPagespeedEnableFilters <%= filter -%>
+ModPagespeedEnableFilters <%= filter %>
 <% end -%>
 
 <% @forbid_filters.each do |filter| -%>
-ModPagespeedForbidFilters <%= filter -%>
+ModPagespeedForbidFilters <%= filter %>
 <% end -%>
 
 ModPagespeedRewriteDeadlinePerFlushMs <%= @rewrite_deadline_per_flush_ms %>

From 9bd66e088e5bfeb1c0b690ae4b2500bf3dd0b5e6 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Mon, 22 Sep 2014 13:50:26 -0700
Subject: [PATCH 0341/2267] (FM-1907) Fix mod_negotation system tests

Previously we were including the base apache class and then including the
'apache::mod::negotiation' class. However the apache class includes
'apache::mod::negoatiation' by default. Telling apache not to use its
default mods fixes this error.

There was also a reference to '$mod_dir' when finding the negotiation.conf
instead of just 'mod_dir'.

s/puppet code/ruby code/g fixed the issue. :)
---
 spec/acceptance/mod_negotiation_spec.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
index 33dcdd982d..25e4acbeae 100644
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -19,13 +19,13 @@
   context "default negotiation config" do
     it 'succeeds in puppeting negotiation' do
       pp= <<-EOS
-        class { '::apache': }
+        class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation': }
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$mod_dir}/negotiation.conf") do
+    describe file("#{mod_dir}/negotiation.conf") do
       it { should contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
 ForceLanguagePriority Prefer Fallback" }
     end
@@ -39,7 +39,7 @@ class { '::apache::mod::negotiation': }
   context "with alternative force_language_priority" do
     it 'succeeds in puppeting negotiation' do
       pp= <<-EOS
-        class { '::apache': }
+        class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation':
           force_language_priority => 'Prefer',
         }
@@ -47,7 +47,7 @@ class { '::apache::mod::negotiation':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$mod_dir}/negotiation.conf") do
+    describe file("#{mod_dir}/negotiation.conf") do
       it { should contain "ForceLanguagePriority Prefer" }
     end
 
@@ -60,7 +60,7 @@ class { '::apache::mod::negotiation':
   context "with alternative language_priority" do
     it 'succeeds in puppeting negotiation' do
       pp= <<-EOS
-        class { '::apache': }
+        class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation':
           language_priority => [ 'en', 'es' ],
         }
@@ -68,7 +68,7 @@ class { '::apache::mod::negotiation':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$mod_dir}/negotiation.conf") do
+    describe file("#{mod_dir}/negotiation.conf") do
       it { should contain "LanguagePriority en es" }
     end
 

From 57f83d96ed110768f273474a8769b360b086c54d Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Mon, 22 Sep 2014 15:58:37 -0700
Subject: [PATCH 0342/2267] (FM-1908) fixup mod_php tests

Previously we were testing that the source attribute for
apache::mod::php overrode the content and template attributes. This
began failing with the removal of files/spec file (it was the target
used by the source attribute in testing. These are the kinds of tests
that are slated for removal with the test refactor, best course is to
remove them now.
---
 spec/acceptance/mod_php_spec.rb | 38 ---------------------------------
 1 file changed, 38 deletions(-)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 8ce732b984..a0efe7fb86 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -132,42 +132,4 @@ class {'apache::mod::php':
     end
   end
 
-  context "provide source has priority over content" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content => '# somecontent',
-          source  => 'puppet:///modules/apache/spec',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# This is a file only for spec testing" }
-    end
-  end
-
-  context "provide source has priority over template" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          template => 'apache/mod/php5.conf.erb',
-          source   => 'puppet:///modules/apache/spec',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# This is a file only for spec testing" }
-    end
-  end
-
 end

From a53b9edb1f2478fe76133cbe7e190f3537ced30a Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Mon, 22 Sep 2014 17:50:08 -0700
Subject: [PATCH 0343/2267] (FM-1911) Fixup passenger system test

Previously we were running a command via sudo, which requires a TTY. The
testing framework does not allocate a TTY by default, passing the
`:pty => true` option corrects this.
---
 spec/acceptance/mod_passenger_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 54b6a77313..2fcb6a8f75 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -262,7 +262,7 @@ class { 'apache::mod::passenger':
           end
 
           it 'should output status via passenger-memory-stats' do
-            shell("sudo /usr/bin/passenger-memory-stats") do |r|
+            shell("sudo /usr/bin/passenger-memory-stats", :pty => true) do |r|
               expect(r.stdout).to match(/Apache processes/)
               expect(r.stdout).to match(/Nginx processes/)
               expect(r.stdout).to match(/Passenger processes/)

From 2f48954a34dcd8b0686ff8020d5071e57ba5e0a1 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Tue, 23 Sep 2014 10:58:30 -0700
Subject: [PATCH 0344/2267] (FM-1913) fix passenger tests on EL derivatives

Previously we were excluding by "operatingsystem" == "RedHat" which
doesn't account for RedHat derivatives like Centos. This changes the
tests to check against "osfamily" instead.
---
 spec/acceptance/mod_passenger_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 54b6a77313..e3e4203f96 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -191,7 +191,7 @@ class { 'apache::mod::passenger': }
     # no fedora 18 passenger package yet, and rhel5 packages only exist for ruby 1.8.5
     unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18) or (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5' and fact('rubyversion') != '1.8.5')
 
-      if fact('operatingsystem') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
+      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
         pending('test passenger - RHEL7 packages don\'t exist')
       else
         context "default passenger config" do

From ae374ccea4a44e404975b74c12b18cdcbb18b6d2 Mon Sep 17 00:00:00 2001
From: Wolfgang Schreiner <wolfgang.schreiner@prosiebensat1digital.de>
Date: Thu, 25 Sep 2014 14:40:22 +0200
Subject: [PATCH 0345/2267] Update default_mods.pp

This should cover the case that on a Amazon AWS Image that is based on RHEL6/CentOS6 but the Apache in version 2.4 should be used, to avoid to load the non existing systemd Apache module.
---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 80cca7046c..7e8381f031 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -12,7 +12,7 @@
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) {
+        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon' and versioncmp($::operatingsystemrelease, '2014.09') <= 0  ) ) {
           ::apache::mod { 'systemd': }
         }
         ::apache::mod { 'unixd': }

From 8d09ecd81ce1001d9461570716d20898fe336f4a Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Tue, 16 Sep 2014 10:17:33 -0400
Subject: [PATCH 0346/2267] (#MODULES-1332) set osfamily default for
 wsgi_socket_prefix

Add an osfamily based default class parameter value for the
wsgi_socket_prefix parameter of apache::mod::wsgi.  The default
value on RedHat osfamily platforms is '/var/run/wsgi'.  On other
platforms, use the Apache default.
---
 manifests/mod/wsgi.pp         |  2 +-
 manifests/params.pp           |  7 +++++++
 spec/classes/mod/wsgi_spec.rb | 15 ++++++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 244a3458b4..2a47bb68e3 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -1,5 +1,5 @@
 class apache::mod::wsgi (
-  $wsgi_socket_prefix = undef,
+  $wsgi_socket_prefix = $::apache::params::wsgi_socket_prefix,
   $wsgi_python_path   = undef,
   $wsgi_python_home   = undef,
 ){
diff --git a/manifests/params.pp b/manifests/params.pp
index d5d1265a6b..07bbf530f6 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -93,6 +93,11 @@
     $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
+    if $::osfamily == "RedHat" {
+      $wsgi_socket_prefix = '/var/run/wsgi'
+    } else {
+      $wsgi_socket_prefix = undef
+    }
   } elsif $::osfamily == 'Debian' {
     $user                = 'www-data'
     $group               = 'www-data'
@@ -194,6 +199,7 @@
         }
       }
     }
+    $wsgi_socket_prefix = undef
   } elsif $::osfamily == 'FreeBSD' {
     $user             = 'www'
     $group            = 'www'
@@ -255,6 +261,7 @@
     $fastcgi_lib_path     = undef # TODO: revisit
     $mime_support_package = 'misc/mime-support'
     $mime_types_config    = '/usr/local/etc/mime.types'
+    $wsgi_socket_prefix   = undef
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 5945e3bebf..3875d3fd09 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -18,7 +18,10 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => nil
+      )
+    }
     it { is_expected.to contain_package("libapache2-mod-wsgi") }
   end
   context "on a RedHat OS" do
@@ -34,7 +37,10 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => '/var/run/wsgi'
+      )
+    }
     it { is_expected.to contain_package("mod_wsgi") }
 
     describe "with custom WSGISocketPrefix" do
@@ -63,7 +69,10 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => nil
+      )
+    }
     it { is_expected.to contain_package("www/mod_wsgi") }
   end
 end

From 1c40da0835095344be0379182c901165f5332aa9 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 26 Sep 2014 15:24:06 -0400
Subject: [PATCH 0347/2267] MODULES-1348 - apache::vhost concat ordering

Need to set `order => 'numeric'` for the concat resource in
apache::vhost so that the fragments get concatenated in the correct
order.
---
 manifests/vhost.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 762aa28fbf..7fcfd3df16 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -395,6 +395,7 @@
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
+    order   => 'numeric',
     require => Package['httpd'],
     notify  => Service['httpd'],
   }

From cf9d120a37a562f1206e6e08f4adf4b5d27fca6d Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 26 Sep 2014 16:20:18 -0400
Subject: [PATCH 0348/2267] Revert "Remove deprecated purge_vdir; Rename
 variables"

---
 manifests/init.pp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 7fcd533e55..ed0fb099b2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,6 +30,7 @@
   $service_ensure       = 'running',
   $purge_configs        = true,
   $purge_vhost_dir      = undef,
+  $purge_vdir           = false,
   $serveradmin          = 'root@localhost',
   $sendfile             = 'On',
   $error_documents      = false,
@@ -121,11 +122,19 @@
     service_ensure => $service_ensure,
   }
 
+  # Deprecated backwards-compatibility
+  if $purge_vdir {
+    warning('Class[\'apache\'] parameter purge_vdir is deprecated in favor of purge_configs')
+    $purge_confd = $purge_vdir
+  } else {
+    $purge_confd = $purge_configs
+  }
+
   # Set purge vhostd appropriately
   if $purge_vhost_dir == undef {
-    $_purge_vhost_dir = $purge_configs
+    $purge_vhostd = $purge_confd
   } else {
-    $_purge_vhost_dir = $purge_vhost_dir
+    $purge_vhostd = $purge_vhost_dir
   }
 
   Exec {
@@ -139,7 +148,7 @@
   file { $confd_dir:
     ensure  => directory,
     recurse => true,
-    purge   => $purge_configs,
+    purge   => $purge_confd,
     notify  => Class['Apache::Service'],
     require => Package['httpd'],
   }
@@ -185,7 +194,7 @@
     file { $vhost_dir:
       ensure  => directory,
       recurse => true,
-      purge   => $_purge_vhost_dir,
+      purge   => $purge_vhostd,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
     }
@@ -200,7 +209,7 @@
     file { $vhost_enable_dir:
       ensure  => directory,
       recurse => true,
-      purge   => $_purge_vhost_dir,
+      purge   => $purge_vhostd,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
     }

From 7a8776877d3578f16d3ff538d94738cbc3e52bfc Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 26 Sep 2014 18:26:22 -0400
Subject: [PATCH 0349/2267] Revert "Fix duplicate declarations when puppet
 manages logroot for vhosts"

---
 manifests/vhost.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7ef2ee8a23..762aa28fbf 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -35,7 +35,6 @@
   $directoryindex              = '',
   $vhost_name                  = '*',
   $logroot                     = $::apache::logroot,
-  $manage_logroot              = true,
   $logroot_ensure              = 'directory',
   $logroot_mode                = undef,
   $log_level                   = undef,
@@ -226,7 +225,7 @@
   }
 
   # Same as above, but for logroot
-  if ! defined(File[$logroot]) and $manage_logroot {
+  if ! defined(File[$logroot]) {
     file { $logroot:
       ensure  => $logroot_ensure,
       mode    => $logroot_mode,

From bf724e47aaf38021ac9814cc342757e9c99016a3 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Fri, 26 Sep 2014 16:01:18 -0700
Subject: [PATCH 0350/2267] Update to include auth_required for versions other
 than 2.4 but keeping at the top of the section

---
 templates/vhost/_directories.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index ef620bbdc4..2ef916eca2 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -47,6 +47,9 @@
     Require all granted
       <%- end -%>
     <%- else -%>
+      <%- if directory['auth_require'] -%>
+    Require <%= directory['auth_require'] %>
+      <%- end -%>
       <%- if directory['order'] and directory['order'] != '' -%>
     Order <%= Array(directory['order']).join(',') %>
       <%- else -%>

From acc798056b11f5312f77e5c18255ba35c9a544d6 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Thu, 25 Sep 2014 16:25:06 +0100
Subject: [PATCH 0351/2267] Add support to set SSLCARevocationCheck on Apache
 2.4

Apache 2.4 needs an additional SSLCARevocationCheck directive to enable
checking of a CRL, e.g. for a Puppet master vhost.

See https://github.com/puppetlabs/puppet/commit/b02af7e05d9b9a3bc23474933d8d7f6cd6191158
for more background
---
 README.md                          |  8 +++
 manifests/init.pp                  | 99 +++++++++++++++---------------
 manifests/vhost.pp                 |  3 +
 spec/acceptance/apache_ssl_spec.rb | 29 ++++++---
 templates/vhost/_ssl.erb           |  3 +
 5 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/README.md b/README.md
index 92edc74646..2d6e8ce235 100644
--- a/README.md
+++ b/README.md
@@ -276,6 +276,10 @@ The default certificate revocation list to use, which is automatically set to 'u
 
 The default certificate revocation list path, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
 
+#####`default_ssl_crl_check`
+
+Sets the default certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), which is automatically set to 'undef'. This default will work out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher, the value will be ignored on older versions.
+
 #####`default_ssl_key`
 
 The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
@@ -1776,6 +1780,10 @@ Specifies the certificate revocation list to use. Defaults to 'undef'. (This def
 
 Specifies the location of the certificate revocation list. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
+#####`ssl_crl_check`
+
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), defaults to 'undef'. This default will work out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher, the value will be ignored on older versions.
+
 #####`ssl_key`
 
 Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
diff --git a/manifests/init.pp b/manifests/init.pp
index ed0fb099b2..74e3d6a055 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,56 +13,57 @@
 # Sample Usage:
 #
 class apache (
-  $apache_name          = $::apache::params::apache_name,
-  $service_name         = $::apache::params::service_name,
-  $default_mods         = true,
-  $default_vhost        = true,
-  $default_confd_files  = true,
-  $default_ssl_vhost    = false,
-  $default_ssl_cert     = $::apache::params::default_ssl_cert,
-  $default_ssl_key      = $::apache::params::default_ssl_key,
-  $default_ssl_chain    = undef,
-  $default_ssl_ca       = undef,
-  $default_ssl_crl_path = undef,
-  $default_ssl_crl      = undef,
-  $ip                   = undef,
-  $service_enable       = true,
-  $service_ensure       = 'running',
-  $purge_configs        = true,
-  $purge_vhost_dir      = undef,
-  $purge_vdir           = false,
-  $serveradmin          = 'root@localhost',
-  $sendfile             = 'On',
-  $error_documents      = false,
-  $timeout              = '120',
-  $httpd_dir            = $::apache::params::httpd_dir,
-  $server_root          = $::apache::params::server_root,
-  $conf_dir             = $::apache::params::conf_dir,
-  $confd_dir            = $::apache::params::confd_dir,
-  $vhost_dir            = $::apache::params::vhost_dir,
-  $vhost_enable_dir     = $::apache::params::vhost_enable_dir,
-  $mod_dir              = $::apache::params::mod_dir,
-  $mod_enable_dir       = $::apache::params::mod_enable_dir,
-  $mpm_module           = $::apache::params::mpm_module,
-  $conf_template        = $::apache::params::conf_template,
-  $servername           = $::apache::params::servername,
-  $manage_user          = true,
-  $manage_group         = true,
-  $user                 = $::apache::params::user,
-  $group                = $::apache::params::group,
-  $keepalive            = $::apache::params::keepalive,
-  $keepalive_timeout    = $::apache::params::keepalive_timeout,
+  $apache_name            = $::apache::params::apache_name,
+  $service_name           = $::apache::params::service_name,
+  $default_mods           = true,
+  $default_vhost          = true,
+  $default_confd_files    = true,
+  $default_ssl_vhost      = false,
+  $default_ssl_cert       = $::apache::params::default_ssl_cert,
+  $default_ssl_key        = $::apache::params::default_ssl_key,
+  $default_ssl_chain      = undef,
+  $default_ssl_ca         = undef,
+  $default_ssl_crl_path   = undef,
+  $default_ssl_crl        = undef,
+  $default_ssl_crl_check  = undef,
+  $ip                     = undef,
+  $service_enable         = true,
+  $service_ensure         = 'running',
+  $purge_configs          = true,
+  $purge_vhost_dir        = undef,
+  $purge_vdir             = false,
+  $serveradmin            = 'root@localhost',
+  $sendfile               = 'On',
+  $error_documents        = false,
+  $timeout                = '120',
+  $httpd_dir              = $::apache::params::httpd_dir,
+  $server_root            = $::apache::params::server_root,
+  $conf_dir               = $::apache::params::conf_dir,
+  $confd_dir              = $::apache::params::confd_dir,
+  $vhost_dir              = $::apache::params::vhost_dir,
+  $vhost_enable_dir       = $::apache::params::vhost_enable_dir,
+  $mod_dir                = $::apache::params::mod_dir,
+  $mod_enable_dir         = $::apache::params::mod_enable_dir,
+  $mpm_module             = $::apache::params::mpm_module,
+  $conf_template          = $::apache::params::conf_template,
+  $servername             = $::apache::params::servername,
+  $manage_user            = true,
+  $manage_group           = true,
+  $user                   = $::apache::params::user,
+  $group                  = $::apache::params::group,
+  $keepalive              = $::apache::params::keepalive,
+  $keepalive_timeout      = $::apache::params::keepalive_timeout,
   $max_keepalive_requests = $apache::params::max_keepalive_requests,
-  $logroot              = $::apache::params::logroot,
-  $logroot_mode         = $::apache::params::logroot_mode,
-  $log_level            = $::apache::params::log_level,
-  $log_formats          = {},
-  $ports_file           = $::apache::params::ports_file,
-  $apache_version       = $::apache::version::default,
-  $server_tokens        = 'OS',
-  $server_signature     = 'On',
-  $trace_enable         = 'On',
-  $package_ensure       = 'installed',
+  $logroot                = $::apache::params::logroot,
+  $logroot_mode           = $::apache::params::logroot_mode,
+  $log_level              = $::apache::params::log_level,
+  $log_formats            = {},
+  $ports_file             = $::apache::params::ports_file,
+  $apache_version         = $::apache::version::default,
+  $server_tokens          = 'OS',
+  $server_signature       = 'On',
+  $trace_enable           = 'On',
+  $package_ensure         = 'installed',
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7fcfd3df16..1586f34a3e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -18,6 +18,7 @@
   $ssl_ca                      = $::apache::default_ssl_ca,
   $ssl_crl_path                = $::apache::default_ssl_crl_path,
   $ssl_crl                     = $::apache::default_ssl_crl,
+  $ssl_crl_check               = $::apache::default_ssl_crl_check,
   $ssl_certs_dir               = $::apache::params::ssl_certs_dir,
   $ssl_protocol                = undef,
   $ssl_cipher                  = undef,
@@ -651,6 +652,7 @@
   # - $ssl_ca
   # - $ssl_crl_path
   # - $ssl_crl
+  # - $ssl_crl_check
   # - $ssl_proxyengine
   # - $ssl_protocol
   # - $ssl_cipher
@@ -658,6 +660,7 @@
   # - $ssl_verify_client
   # - $ssl_verify_depth
   # - $ssl_options
+  # - $apache_version
   if $ssl {
     concat::fragment { "${name}-ssl":
       target  => "${priority_real}-${filename}.conf",
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 3cfe593481..f8023fa240 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 case fact('osfamily')
 when 'RedHat'
@@ -13,14 +14,15 @@
     it 'runs without error' do
       pp = <<-EOS
         class { 'apache':
-          service_ensure       => stopped,
-          default_ssl_vhost    => true,
-          default_ssl_cert     => '/tmp/ssl_cert',
-          default_ssl_key      => '/tmp/ssl_key',
-          default_ssl_chain    => '/tmp/ssl_chain',
-          default_ssl_ca       => '/tmp/ssl_ca',
-          default_ssl_crl_path => '/tmp/ssl_crl_path',
-          default_ssl_crl      => '/tmp/ssl_crl',
+          service_ensure        => stopped,
+          default_ssl_vhost     => true,
+          default_ssl_cert      => '/tmp/ssl_cert',
+          default_ssl_key       => '/tmp/ssl_key',
+          default_ssl_chain     => '/tmp/ssl_chain',
+          default_ssl_ca        => '/tmp/ssl_ca',
+          default_ssl_crl_path  => '/tmp/ssl_crl_path',
+          default_ssl_crl       => '/tmp/ssl_crl',
+          default_ssl_crl_check => 'chain',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -34,6 +36,11 @@ class { 'apache':
       it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
       it { is_expected.to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
       it { is_expected.to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
+      if $apache_version == '2.4'
+        it { is_expected.to contain 'SSLCARevocationCheck    "chain"' }
+      else
+        it { is_expected.not_to contain 'SSLCARevocationCheck' }
+      end
     end
   end
 
@@ -53,6 +60,7 @@ class { 'apache':
           ssl_ca               => '/tmp/ssl_ca',
           ssl_crl_path         => '/tmp/ssl_crl_path',
           ssl_crl              => '/tmp/ssl_crl',
+          ssl_crl_check        => 'chain',
           ssl_certs_dir        => '/tmp',
           ssl_protocol         => 'test',
           ssl_cipher           => 'test',
@@ -81,6 +89,11 @@ class { 'apache':
       it { is_expected.to contain 'SSLVerifyClient         test' }
       it { is_expected.to contain 'SSLVerifyDepth          test' }
       it { is_expected.to contain 'SSLOptions test test1' }
+      if $apache_version == '2.4'
+        it { is_expected.to contain 'SSLCARevocationCheck    "chain"' }
+      else
+        it { is_expected.not_to contain 'SSLCARevocationCheck' }
+      end
     end
   end
 
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 55289ae7e9..70213f48c1 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -19,6 +19,9 @@
   <%- if @ssl_crl -%>
   SSLCARevocationFile     "<%= @ssl_crl %>"
   <%- end -%>
+  <%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  SSLCARevocationCheck    "<%= @ssl_crl_check %>"
+  <%- end -%>
   <%- if @ssl_proxyengine -%>
   SSLProxyEngine On
   <%- end -%>

From de15de31eaecf460148e82223158f7fb4dd98865 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 13:26:18 -0500
Subject: [PATCH 0352/2267] 1.2.0 prep

---
 CHANGELOG.md  | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
 metadata.json |  4 +--
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b598fdd2ac..dad6c4b5ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,71 @@
+##2014-09-30 - Supported Release 1.2.0
+###Summary
+
+This release features many improvements and bugfixes, including several new defines, a reworking of apache::vhost for more extensibility, and many new parameters for more customization. This release also includes improved support for strict variables and the future parser.
+
+####Features
+- Convert apache::vhost to use concat for easier extensions
+- Test improvements
+- Added apache::custom_config defined type to allow validation of configs before they are created
+- Added bool2httpd function to convert true/false to apache 'On' and 'Off'. Intended for internal use in the module.
+- Added logroot_mode and logroot_ensure to apache::vhost
+- Improved SCL support
+  - added apache::conf_dir
+  - allow overriding of apache_name
+  - allow overriding of the mod_ssl package name
+- Add support for reverse_urls/ProxyPassReverse in apache::vhost
+- Add apache::vhost::manage_docroot
+- Add apache::purge_vhost_dir parameter
+- Add satisfy directive in apache::vhost::directories
+- Add apache::fastcgi::server defined type
+- Add apache::vhost::proxy_preserve_host
+- Add apache::vhost::wsgi_pass_authorization
+- Add support for rewrites in the apache::vhost::directories parameter
+- If the service_ensure parameter in apache::service is set to anything other than true, false, running, or stopped, ensure will not be passed to the service resource, allowing for the service to not be managed by puppet
+- Improvements to apache::mod*
+  - Add restrict_access parameter to apache::mod::info
+  - Add force_language_priority and language_priority parameters to apache::mod::negotiation
+  - Add threadlimit parameter to mod::worker
+  - Add content, template, and source parameters to apache::mod::php
+  - Add mod_authz_svn support via the authz_svn_enabled parameter in apache::mod::dav_svn
+  - Add loadfile_name parameter to apache::mod
+  - Add apache::mod::deflate class
+  - Add types and notes parameters to apache::mod::deflate
+  - Add options parameter to apache::mod::fcgid
+
+####Bugfixes
+- Set osfamily defaults for wsgi_socket_prefix
+- Support multiple balancermembers with the same url
+- Validate apache::vhost::wsgi_pass_authorization
+- Validate apache::vhost::custom_fragment
+- Add support for itk with mod_php
+- Allow apache::vhost::ssl_certs_dir to not be set
+- Improved passenger support for Debian
+- Improved 2.4 support without mod_access_compat
+- Support for more than one 'Allow from'-directive in _directories.erb
+- Don't load systemd on Amazon linux based on CentOS6 with apache 2.4
+- Fix missing newline in ModPagespeed filter and memcached servers directive
+- Use interpolated strings instead of numbers where required by future parser
+- Make auth_require take precedence over default with apache 2.4
+- Lint fixes
+- Set default for php_admin_flags and php_admin_values to be empty hash instead of empty array
+- Correct typo in mod::pagespeed
+- spec_helper fixes
+- Install mod packages before dealing with the configuration
+- Use absolute scope to check class definition in apache::mod::php
+- Fix dependency loop in apache::vhost
+- Properly scope variables in the inline template in apache::balancer
+- Documentation clarification, typos, and formatting
+- Set apache::mod::ssl::ssl_mutex to default for debian on apache >= 2.4
+- Strict variables fixes
+- Add authn_core mode to Ubuntu trusty defaults
+- Keep default loadfile for authz_svn on Debian
+- Remove '.conf' from the site-include regexp for better Ubuntu/Debian support
+
+####Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
 ##2014-07-15 - Supported Release 1.1.1
 ###Summary
 
diff --git a/metadata.json b/metadata.json
index fba59e7c39..e8ae293d96 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "author": "puppetlabs",
   "summary": "Puppet module for Apache",
   "license": "Apache 2.0",
@@ -59,7 +59,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.2.0 < 3.4.0"
+      "version_requirement": "3.x"
     },
     {
       "name": "puppet",

From bb6ef28ebad84948151c0d8852555e23ad12f0fd Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 15:03:20 -0500
Subject: [PATCH 0353/2267] Updates to mod::fcgid test don't work on RHEL5

---
 spec/acceptance/mod_fcgid_spec.rb | 97 +++++++++++++++----------------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 8e94fa08fa..2511b46ce6 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,62 +1,57 @@
 require 'spec_helper_acceptance'
 
 describe 'apache::mod::fcgid class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    # Not implemented
-  when 'RedHat'
-    context "default fcgid config" do
-      it 'succeeds in puppeting fcgid' do
-        pp = <<-EOS
-          class { 'epel': } # mod_fcgid lives in epel
-          class { 'apache': }
-          class { 'apache::mod::php': } # For /usr/bin/php-cgi
-          class { 'apache::mod::fcgid':
-            options => {
-              'FcgidIPCDir'  => '/var/run/fcgidsock',
+  context "default fcgid config", :if => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') do
+    it 'succeeds in puppeting fcgid' do
+      pp = <<-EOS
+        class { 'epel': } # mod_fcgid lives in epel
+        class { 'apache': }
+        class { 'apache::mod::php': } # For /usr/bin/php-cgi
+        class { 'apache::mod::fcgid':
+          options => {
+            'FcgidIPCDir'  => '/var/run/fcgidsock',
+          },
+        }
+        apache::vhost { 'fcgid.example.com':
+          port        => '80',
+          docroot     => '/var/www/fcgid',
+          directories => {
+            path        => '/var/www/fcgid',
+            options     => '+ExecCGI',
+            addhandlers => {
+              handler    => 'fcgid-script',
+              extensions => '.php',
             },
-          }
-          apache::vhost { 'fcgid.example.com':
-            port        => '80',
-            docroot     => '/var/www/fcgid',
-            directories => {
-              path        => '/var/www/fcgid',
-              options     => '+ExecCGI',
-              addhandlers => {
-                handler    => 'fcgid-script',
-                extensions => '.php',
-              },
-              fcgiwrapper => {
-                command => '/usr/bin/php-cgi',
-                suffix  => '.php',
-              }
-            },
-          }
-          file { '/var/www/fcgid/index.php':
-            ensure  => file,
-            owner   => 'root',
-            group   => 'root',
-            content => "<?php echo 'Hello world'; ?>\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
+            fcgiwrapper => {
+              command => '/usr/bin/php-cgi',
+              suffix  => '.php',
+            }
+          },
+        }
+        file { '/var/www/fcgid/index.php':
+          ensure  => file,
+          owner   => 'root',
+          group   => 'root',
+          content => "<?php echo 'Hello world'; ?>\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
 
-      describe service('httpd') do
-        it { is_expected.to be_enabled }
-        it { is_expected.to be_running }
-      end
+    describe service('httpd') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
 
-      it 'should answer to fcgid.example.com' do
-        shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
-          expect(r.stdout).to match(/^Hello world$/)
-          expect(r.exit_code).to eq(0)
-        end
+    it 'should answer to fcgid.example.com' do
+      shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
+        expect(r.stdout).to match(/^Hello world$/)
+        expect(r.exit_code).to eq(0)
       end
+    end
 
-      it 'should run a php-cgi process' do
-        shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0])
-      end
+    it 'should run a php-cgi process' do
+      shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0])
     end
   end
 end

From 0f2a0b33dd5399219fd37ffdde8bde335c7da246 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 15:25:21 -0500
Subject: [PATCH 0354/2267] Fix custom_config check for ubuntu precise.

---
 manifests/custom_config.pp | 2 +-
 manifests/params.pp        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 543ace94e5..cadc2354db 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -5,7 +5,7 @@
   $content        = undef,
   $priority       = '25',
   $source         = undef,
-  $verify_command = '/usr/sbin/apachectl -t',
+  $verify_command = $::apache::params::verify_command,
   $verify_config  = true,
 ) {
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 07bbf530f6..6c37f14ef1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -28,6 +28,11 @@
   # The default error log level
   $log_level = 'warn'
 
+  if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
+    $verify_command = '/usr/sbin/apache2ctl -t'
+  } else {
+    $verify_command = '/usr/sbin/apachectl -t'
+  }
   if $::osfamily == 'RedHat' or $::operatingsystem == 'amazon' {
     $user                 = 'apache'
     $group                = 'apache'

From 0bdb75754ec8c914ff7d83e1965faf2713dedea8 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Fri, 7 Sep 2012 15:06:25 +1200
Subject: [PATCH 0355/2267] changed from depreciated apache::dev to
 apache::mod::dev

---
 tests/dev.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dev.pp b/tests/dev.pp
index 805ad7e373..6c4f95571d 100644
--- a/tests/dev.pp
+++ b/tests/dev.pp
@@ -1 +1 @@
-include apache::dev
+include apache::mod::dev

From e8f7566d2788436ed1b73504e1951277b5ed2b5b Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Thu, 20 Sep 2012 13:41:50 +1200
Subject: [PATCH 0356/2267] Created the apache::mod::shib class to install the
 mod_shib Shibboleth module for Apache2

http://shibboleth.net/
---
 manifests/mod/shib.pp | 58 +++++++++++++++++++++++++++++++++++++++++++
 manifests/params.pp   |  7 ++++--
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 manifests/mod/shib.pp

diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
new file mode 100644
index 0000000000..3580abf345
--- /dev/null
+++ b/manifests/mod/shib.pp
@@ -0,0 +1,58 @@
+class apache::mod::shib(
+	$shib_admin			= $apache::serveradmin,
+	$shib_hostname	= $fqdn,
+	$logoLocation		= "/shibboleth-sp/logo.jpg",
+	$styleSheet			= "/shibboleth-sp/main.css",
+	$shib_conf_dir	= '/etc/shibboleth',
+	$shib_conf_file	= 'shibboleth2.xml',
+	$handlerSSL			= 'true'
+){
+
+	$shib_conf = "${shib_conf_dir}/${shib_conf_file}"
+	$mod_shib = 'shib2'
+
+	apache::mod {$mod_shib: }
+
+	file{$shib_conf_dir:
+		ensure	=> directory,
+		require => Apache::Mod[$mod_shib]
+	}
+
+	file{$shib_conf:
+		ensure	=> file,
+		replace	=> false,
+		require => [Apache::Mod[$mod_shib],File[$shib_conf_dir]],
+	}
+
+	augeas{"shib_SPconfig_errors":
+		lens		=> 'Xml.lns',
+		incl		=> $shib_conf,
+		context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
+		changes => [
+			"set Errors/#attribute/supportContact ${shib_admin}",
+			"set Errors/#attribute/logoLocation ${logoLocation}",
+			"set Errors/#attribute/styleSheet ${styleSheet}",
+		],
+		notify	=> Service['httpd'],
+	}
+
+	augeas{"shib_SPconfig_hostname":
+		lens		=> 'Xml.lns',
+		incl		=> $shib_conf,
+		context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
+		changes => [
+			"set #attribute/entityID https://${shib_hostname}/shibboleth",
+			"set Sessions/#attribute/handlerURL https://${shib_hostname}/Shibboleth.sso",
+		],
+		notify	=> Service['httpd'],
+	}
+
+	augeas{"shib_SPconfig_handlerSSL":
+		lens		=> 'Xml.lns',
+		incl		=> $shib_conf,
+		context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
+		changes => ["set Sessions/#attribute/handlerSSL ${handlerSSL}",],
+		notify	=> Service['httpd'],
+	}
+
+}
\ No newline at end of file
diff --git a/manifests/params.pp b/manifests/params.pp
index 07bbf530f6..fc9a86e320 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -60,6 +60,7 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
+    # NOTE: The module for Shibboleth is not available to RH/CentOS without an additional repository. http://wiki.aaf.edu.au/tech-info/sp-install-guide
     $mod_packages         = {
       'auth_kerb'   => 'mod_auth_kerb',
       'authnz_ldap' => 'mod_authz_ldap',
@@ -81,6 +82,7 @@
       'suphp'       => 'mod_suphp',
       'xsendfile'   => 'mod_xsendfile',
       'nss'         => 'mod_nss',
+      'shib2'       => 'shibboleth',
     }
     $mod_libs             = {
       'php5' => 'libphp5.so',
@@ -141,6 +143,7 @@
       'suphp'       => 'libapache2-mod-suphp',
       'wsgi'        => 'libapache2-mod-wsgi',
       'xsendfile'   => 'libapache2-mod-xsendfile',
+      'shib2'       => 'libapache2-mod-shib2',
     }
     $mod_libs             = {
       'php5' => 'libphp5.so',
@@ -238,7 +241,6 @@
       # NOTE: 'php' needs to enable APACHE option in make config
       # NOTE: 'dav_svn' needs to enable MOD_DAV_SVN make config
       # NOTE: not sure where the shibboleth should come from
-      # NOTE: don't know where the shibboleth module should come from
       'auth_kerb'  => 'www/mod_auth_kerb2',
       'fcgid'      => 'www/mod_fcgid',
       'passenger'  => 'www/rubygem-passenger',
@@ -249,7 +251,8 @@
       'wsgi'       => 'www/mod_wsgi',
       'dav_svn'    => 'devel/subversion',
       'xsendfile'  => 'www/mod_xsendfile',
-      'rpaf'       => 'www/mod_rpaf2'
+      'rpaf'       => 'www/mod_rpaf2',
+      'shib2'      => 'security/shibboleth2-sp',
     }
     $mod_libs         = {
       'php5' => 'libphp5.so',

From f5523e7e03409f1abe712056cdffc0ad7cc2d54c Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Fri, 21 Sep 2012 14:20:26 +1200
Subject: [PATCH 0357/2267] define a shibboleth sso resource

---
 manifests/mod/shib/sso.pp | 57 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 manifests/mod/shib/sso.pp

diff --git a/manifests/mod/shib/sso.pp b/manifests/mod/shib/sso.pp
new file mode 100644
index 0000000000..0d89b25449
--- /dev/null
+++ b/manifests/mod/shib/sso.pp
@@ -0,0 +1,57 @@
+define apache::mod::shib::sso(
+	$discoveryURL				= undef,
+	$idpURL							= undef,
+	$discoveryProtocol	= "SAMLDS"
+){
+
+	require apache::mod::shib
+
+	info("The shibboleth configuration file is ${apache::mod::shib::shib_conf}")
+
+	if $discoveryURL and $idpURL {
+		err("apache::mod::shib::sso must have one of discoveryURL or idpURL set, not both.")
+	} elsif !$discoveryURL and !$idpURL {
+		err("apache::mod::shib::sso must have one of discoveryURL or idpURL set, not neither.")
+	} else {
+
+		if $idpURL {
+			$entityID_aug = "set SSO/#attribute/entityID ${idpURL}"
+		} else {
+			$entityID_aug = "rm SSO/#attribute/entityID"
+		}
+
+		info("The entityID augaes change is ${entityID_aug}")
+
+		augeas{"shib_SPconfig_sso_entityID":
+			lens		=> 'Xml.lns',
+			incl		=> $apache::mod::shib::shib_conf,
+			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
+			changes => [$entityID_aug,],
+			notify	=> Service['httpd'],
+		}
+
+		if $discoveryURL {
+			$discoveryURL_aug = "set SSO/#attribute/discoveryURL ${discoveryURL}"
+		} else {
+			$discoveryURL_aug = "rm SSO/#attribute/discoveryURL"
+		}
+
+		info("The discoveryURL augeas change is ${discoveryURL_aug}")
+
+		augeas{"shib_SPconfig_sso_discoveryURL":
+			lens		=> 'Xml.lns',
+			incl		=> $apache::mod::shib::shib_conf,
+			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
+			changes => [$discoveryURL_aug,],
+			notify	=> Service['httpd'],
+		}
+
+		augeas{"shib_SPconfig_sso_discoveryProtocol":
+			lens		=> 'Xml.lns',
+			incl		=> $apache::mod::shib::shib_conf,
+			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
+			changes => ["set SSO/#attribute/discoveryProtocol ${discoveryProtocol}",],
+			notify	=> Service['httpd'],
+		}
+	}
+}
\ No newline at end of file

From bfc2c7c2b245f6884958de6337138c49471253d9 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Fri, 21 Sep 2012 16:50:34 +1200
Subject: [PATCH 0358/2267] Stubbing out metadata for shib

---
 manifests/mod/shib/metadata.pp | 14 ++++++++++++++
 manifests/mod/shib/sso.pp      | 12 +++---------
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 manifests/mod/shib/metadata.pp

diff --git a/manifests/mod/shib/metadata.pp b/manifests/mod/shib/metadata.pp
new file mode 100644
index 0000000000..005bf1e8f1
--- /dev/null
+++ b/manifests/mod/shib/metadata.pp
@@ -0,0 +1,14 @@
+define apache::mod::shib::metadata(
+	$provider_uri,
+	$cert_uri,
+	$backing_file_dir 	= $apache::mod::shib::shib_conf_dir,
+	$backing_file_name 	= inline_template("<%= provider_uri.split('/').last  %>")
+){
+
+	require apache::mod::shib
+
+	$backing_file = "${backing_file_dir}/${backing_file_name}"
+
+
+
+}
\ No newline at end of file
diff --git a/manifests/mod/shib/sso.pp b/manifests/mod/shib/sso.pp
index 0d89b25449..3960441dbd 100644
--- a/manifests/mod/shib/sso.pp
+++ b/manifests/mod/shib/sso.pp
@@ -6,8 +6,6 @@
 
 	require apache::mod::shib
 
-	info("The shibboleth configuration file is ${apache::mod::shib::shib_conf}")
-
 	if $discoveryURL and $idpURL {
 		err("apache::mod::shib::sso must have one of discoveryURL or idpURL set, not both.")
 	} elsif !$discoveryURL and !$idpURL {
@@ -20,9 +18,7 @@
 			$entityID_aug = "rm SSO/#attribute/entityID"
 		}
 
-		info("The entityID augaes change is ${entityID_aug}")
-
-		augeas{"shib_SPconfig_sso_entityID":
+		augeas{"shib_sso_${name}_entityID":
 			lens		=> 'Xml.lns',
 			incl		=> $apache::mod::shib::shib_conf,
 			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
@@ -36,9 +32,7 @@
 			$discoveryURL_aug = "rm SSO/#attribute/discoveryURL"
 		}
 
-		info("The discoveryURL augeas change is ${discoveryURL_aug}")
-
-		augeas{"shib_SPconfig_sso_discoveryURL":
+		augeas{"shib_sso_${name}_discoveryURL":
 			lens		=> 'Xml.lns',
 			incl		=> $apache::mod::shib::shib_conf,
 			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
@@ -46,7 +40,7 @@
 			notify	=> Service['httpd'],
 		}
 
-		augeas{"shib_SPconfig_sso_discoveryProtocol":
+		augeas{"shib_sso_${name}_discoveryProtocol":
 			lens		=> 'Xml.lns',
 			incl		=> $apache::mod::shib::shib_conf,
 			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",

From 4bb15767419b5b6e218d0bd938d29c1bcc88ad68 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Mon, 24 Sep 2012 16:30:27 +1200
Subject: [PATCH 0359/2267] Download metadata and metadata certificate from
 provider.

---
 manifests/mod/shib/metadata.pp | 50 ++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/shib/metadata.pp b/manifests/mod/shib/metadata.pp
index 005bf1e8f1..015f428cc4 100644
--- a/manifests/mod/shib/metadata.pp
+++ b/manifests/mod/shib/metadata.pp
@@ -1,14 +1,60 @@
+# Currently this can only create a _single_ metadata provider
+# it will need to be modified to permit multiple metadata providers
 define apache::mod::shib::metadata(
 	$provider_uri,
 	$cert_uri,
-	$backing_file_dir 	= $apache::mod::shib::shib_conf_dir,
-	$backing_file_name 	= inline_template("<%= provider_uri.split('/').last  %>")
+	$backing_file_dir 				= $apache::mod::shib::shib_conf_dir,
+	$backing_file_name 				= inline_template("<%= provider_uri.split('/').last  %>"),
+	$cert_dir									= $apache::mod::shib::shib_conf_dir,
+	$cert_file_name						= inline_template("<%= cert_uri.split('/').last  %>"),
+	$provider_type						= 'XML',
+	$provider_reload_interval	= "7200",
+	$metadata_filter_max_validity_interval	= "2419200"	
 ){
 
 	require apache::mod::shib
 
 	$backing_file = "${backing_file_dir}/${backing_file_name}"
+	$cert_file		= "${cert_dir}/${cert_file_name}"
 
+	# Get the Metadata signing certificate
+	exec{'get_${name}_metadata_cert':
+		path	=> ['/usr/bin'],
+		command => "wget ${cert_uri} -O ${cert_file}",
+		creates => $cert_file,
+		notify	=> Service['httpd'],
+	}
 
+	# This puts the MetadataProvider entry in the 'right' place
+	augeas{"shib_${name}_create_metadata_provider":
+		lens		=> 'Xml.lns',
+		incl		=> $apache::mod::shib::shib_conf,
+		context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
+		changes => [
+			"ins MetadataProvider after Errors",
+		],
+		onlyif	=> 'match MetadataProvider/#attribute/uri size == 0',
+		notify	=> Service['httpd'],
+		require => Exec['get_${name}_metadata_cert'],
+	}
+
+	# This will update the attributes and child nodes if they change
+	augeas{"shib_${name}_metadata_provider":
+		lens		=> 'Xml.lns',
+		incl		=> $apache::mod::shib::shib_conf,
+		context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
+		changes => [
+			"set MetadataProvider/#attribute/type ${provider_type}",
+			"set MetadataProvider/#attribute/uri ${provider_uri}",
+			"set MetadataProvider/#attribute/backingFilePath ${backing_file}",
+			"set MetadataProvider/#attribute/reloadInterva ${provider_reload_interval}",
+			"set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil",
+			"set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval ${metadata_filter_max_validity_interval}",
+			"set MetadataProvider/MetadataFilter[2]/#attribute/type Signature",
+			"set MetadataProvider/MetadataFilter[2]/#attribute/certificate ${cert_file}",
+		],
+		notify	=> Service['httpd'],
+		require => [Exec['get_${name}_metadata_cert'],Augeas["shib_${name}_create_metadata_provider"]],
+	}
 
 }
\ No newline at end of file

From 8046a2682ae933ec2c0a7922a3d8fe07d4681e97 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Tue, 25 Sep 2012 16:23:47 +1200
Subject: [PATCH 0360/2267] Create a resource for downloading attribute map
 files

---
 manifests/mod/shib/attribute_map.pp | 32 +++++++++++++++++++++++++++++
 manifests/mod/shib/metadata.pp      |  6 +++---
 manifests/mod/shib/sso.pp           | 28 ++++++++-----------------
 3 files changed, 44 insertions(+), 22 deletions(-)
 create mode 100644 manifests/mod/shib/attribute_map.pp

diff --git a/manifests/mod/shib/attribute_map.pp b/manifests/mod/shib/attribute_map.pp
new file mode 100644
index 0000000000..d9ad90cc54
--- /dev/null
+++ b/manifests/mod/shib/attribute_map.pp
@@ -0,0 +1,32 @@
+define apache::mod::shib::attribute_map(
+	$attribute_map_uri,
+	$attribute_map_dir 	= $apache::mod::shib::shib_conf_dir,
+	$attribute_map_name = inline_template("<%= attribute_map_uri.split('/').last  %>"),
+	$max_age	= '21'
+){
+
+	require apache::mod::shib
+
+	$attribute_map = "${attribute_map_dir}/${attribute_map_name}"
+
+	# Download the attribute map, refresh after $max_age days
+	exec{"get_${name}_attribute_map":
+		path	=> ['/usr/bin'],
+		command => "wget ${attribute_map_uri} -O ${attribute_map}",
+		unless	=> "test `find ${attribute_map} -mtime +${max_age}`",
+		notify	=> Service['httpd'],
+	}
+
+	# Make sure the shibboleth config is pointing at the attribute map
+	augeas{"shib_${name}_attribute_map":
+		lens		=> 'Xml.lns',
+		incl		=> $apache::mod::shib::shib_conf,
+		context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
+		changes => [
+			"set AttributeExtractor/#attribute/path ${attribute_map_name}",
+		],
+		notify	=> Service['httpd'],
+		require => Exec["get_${name}_attribute_map"],
+	}
+
+}
\ No newline at end of file
diff --git a/manifests/mod/shib/metadata.pp b/manifests/mod/shib/metadata.pp
index 015f428cc4..875bef16e1 100644
--- a/manifests/mod/shib/metadata.pp
+++ b/manifests/mod/shib/metadata.pp
@@ -18,7 +18,7 @@
 	$cert_file		= "${cert_dir}/${cert_file_name}"
 
 	# Get the Metadata signing certificate
-	exec{'get_${name}_metadata_cert':
+	exec{"get_${name}_metadata_cert":
 		path	=> ['/usr/bin'],
 		command => "wget ${cert_uri} -O ${cert_file}",
 		creates => $cert_file,
@@ -35,7 +35,7 @@
 		],
 		onlyif	=> 'match MetadataProvider/#attribute/uri size == 0',
 		notify	=> Service['httpd'],
-		require => Exec['get_${name}_metadata_cert'],
+		require => Exec["get_${name}_metadata_cert"],
 	}
 
 	# This will update the attributes and child nodes if they change
@@ -54,7 +54,7 @@
 			"set MetadataProvider/MetadataFilter[2]/#attribute/certificate ${cert_file}",
 		],
 		notify	=> Service['httpd'],
-		require => [Exec['get_${name}_metadata_cert'],Augeas["shib_${name}_create_metadata_provider"]],
+		require => [Exec["get_${name}_metadata_cert"],Augeas["shib_${name}_create_metadata_provider"]],
 	}
 
 }
\ No newline at end of file
diff --git a/manifests/mod/shib/sso.pp b/manifests/mod/shib/sso.pp
index 3960441dbd..816a1a0f8d 100644
--- a/manifests/mod/shib/sso.pp
+++ b/manifests/mod/shib/sso.pp
@@ -1,7 +1,8 @@
 define apache::mod::shib::sso(
 	$discoveryURL				= undef,
 	$idpURL							= undef,
-	$discoveryProtocol	= "SAMLDS"
+	$discoveryProtocol	= "SAMLDS",
+	$ECP_support				= false
 ){
 
 	require apache::mod::shib
@@ -18,33 +19,22 @@
 			$entityID_aug = "rm SSO/#attribute/entityID"
 		}
 
-		augeas{"shib_sso_${name}_entityID":
-			lens		=> 'Xml.lns',
-			incl		=> $apache::mod::shib::shib_conf,
-			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
-			changes => [$entityID_aug,],
-			notify	=> Service['httpd'],
-		}
-
 		if $discoveryURL {
 			$discoveryURL_aug = "set SSO/#attribute/discoveryURL ${discoveryURL}"
 		} else {
 			$discoveryURL_aug = "rm SSO/#attribute/discoveryURL"
 		}
 
-		augeas{"shib_sso_${name}_discoveryURL":
-			lens		=> 'Xml.lns',
-			incl		=> $apache::mod::shib::shib_conf,
-			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
-			changes => [$discoveryURL_aug,],
-			notify	=> Service['httpd'],
-		}
-
-		augeas{"shib_sso_${name}_discoveryProtocol":
+		augeas{"shib_sso_${name}_attributes":
 			lens		=> 'Xml.lns',
 			incl		=> $apache::mod::shib::shib_conf,
 			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
-			changes => ["set SSO/#attribute/discoveryProtocol ${discoveryProtocol}",],
+			changes => [
+				$entityID_aug,
+				$discoveryURL_aug,
+				"set SSO/#attribute/discoveryProtocol ${discoveryProtocol}",
+				"set SSO/#attribute/ECP ${ECP_support}",
+			],
 			notify	=> Service['httpd'],
 		}
 	}

From 4f6899539c612ea1588dbccf33947828fa556566 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Thu, 27 Sep 2012 11:04:32 +1200
Subject: [PATCH 0361/2267] Define the back end certifiate as a resource
 because there will only be one.

---
 manifests/mod/shib.pp              |  2 ++
 manifests/mod/shib/backend_cert.pp | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 manifests/mod/shib/backend_cert.pp

diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 3580abf345..8f52e8577f 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -5,6 +5,8 @@
 	$styleSheet			= "/shibboleth-sp/main.css",
 	$shib_conf_dir	= '/etc/shibboleth',
 	$shib_conf_file	= 'shibboleth2.xml',
+	$shib_sp_cert		= 'sp-cert.pem',
+	$shib_bin_dir		= '/usr/sbin',
 	$handlerSSL			= 'true'
 ){
 
diff --git a/manifests/mod/shib/backend_cert.pp b/manifests/mod/shib/backend_cert.pp
new file mode 100644
index 0000000000..02d3ceee46
--- /dev/null
+++ b/manifests/mod/shib/backend_cert.pp
@@ -0,0 +1,14 @@
+class apache::mod::shib::backend_cert(
+	$sp_hostname		= $fqdn
+){
+
+	require apache::mod::shib
+
+	$sp_cert = "${apache::mod::shib::shib_conf_dir}/${apache::mod::shib::shib_sp_cert}"
+
+	exec{"shib_keygen_${sp_hostname}":
+		path 		=> [$apache::mod::shib::shib_bin_dir,'/usr/bin','/bin'],
+		command	=> "shib-keygen -h ${sp_hostname} -e https://${sp_hostname}/shibbloeth",
+		unless	=> "openssl x509 -noout -in ${sp_cert} -issuer|grep ${sp_hostname}",
+	}
+}
\ No newline at end of file

From 92f8b487fb881cec61b334a584d90a75dc35056c Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Thu, 27 Sep 2012 16:51:09 +1200
Subject: [PATCH 0362/2267] Documentation (and a few tweaks to make code match
 docs)

---
 README.md                          |   2 +
 README.mod_shib.md                 | 201 +++++++++++++++++++++++++++++
 manifests/mod/shib/backend_cert.pp |   2 +-
 3 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 README.mod_shib.md

diff --git a/README.md b/README.md
index 2d6e8ce235..d5e388f57b 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,8 @@ A slightly more complicated example, changes the docroot owner/group from the de
       docroot_group => 'third',
     }
 ```
+For details on using the Shibboleth module (a.k.a. `mod_shib`) see [the Shibboleth README](README.mod_shib.md)
+
 
 To set up a virtual host with SSL and default SSL certificates
 
diff --git a/README.mod_shib.md b/README.mod_shib.md
new file mode 100644
index 0000000000..58a7d7c3b4
--- /dev/null
+++ b/README.mod_shib.md
@@ -0,0 +1,201 @@
+# Shibboleth module for Apache
+
+The module `apache::mod::shib` configures the Apache Shibboleth Service Provider (SP) module in a manner consistent and compatible with the usage of the Puppetlabs Apache Module. Once this module is installed and configured it should just be a matter of specifying `authType shibboleth` in an Apache Virtual Host declaration.
+
+## Shibboleth
+
+Shibboleth is among the world's most widely deployed federated identity solutions, connecting users to applications both within and between organizations. Every software component of the Shibboleth system is free and open source.
+
+Shibboleth is an open-source project that provides Single Sign-On capabilities and allows sites to make informed authorization decisions for individual access of protected on-line resources in a privacy-preserving manner.
+
+* http://shibboleth.net/
+
+# Example Usage
+
+The following is an example installation:
+
+```
+# Set up Apache
+class{'apache': }
+class{'apache::mod::shib': }
+
+# Set up the Shibboleth Single Sign On (sso) module
+apache::mod::shib::sso{'Federation_Directory':
+  discoveryURL  => 'https://example.federation.org/ds/DS',
+}
+
+apache::mod::shib::metadata{'Federation_metadata':
+  provider_uri  => 'https://example.federation.org/metadata/fed-metadata-signed.xml',
+  cert_uri      => 'http://example.federation.org/metadata/fed-metadata-cert.pem',
+}
+
+apache::mod::shib::attribute_map{'Federation_attribute_map':
+  attribute_map_uri => 'https://example.federation.org/download/attribute-map.xml',
+}
+
+include apache::mod::shib::backend_cert
+```
+# Example Usage Breakdown
+
+The following sections describe the sequence given in the Example Usage
+
+## Apache and Shibboleth
+
+```
+# Set up Apache
+class{'apache': }
+class{'apache::mod::shib': }
+```
+
+Setting up the `apache` class from the PuppetLabs Apache Module is a requirement, no extra configuration is required. It is recommended that the `serveradmin` parameter is set.
+
+This is followed by installing the Shibboleth module (`mod_shib`) for Apache. This provides the absolute minimum installation which could then be configured further with parameters.
+
+## Configure Single Sign On with a Discovery Service
+
+```
+# Set up the Shibboleth Single Sign On (SSO) module
+apache::mod::shib::sso{'Federation_Directory':
+  discoveryURL  => 'https://example.federation.org/ds/DS',
+}
+```
+
+This snippet sets up a Single Sign On (SSO) service that uses a Directory Service to handle multiple federated Identity Providers (IDp). 
+
+*Note:* The URL is an example only, the Federation should provide the correct URL to use for its directory service.
+
+*Note:* Alternatively if only a single IDp is to be used, use the `idpURL` parameter instead. The `idpURL` and `discoveryURL` parameters are mutually exclusive, the SSO can only use one or the other.
+
+## Federation Metadata and Certificate
+
+```
+apache::mod::shib::metadata{'Federation_metadata':
+  provider_uri  => 'https://example.federation.org/metadata/fed-metadata-signed.xml',
+  cert_uri      => 'http://example.federation.org/metadata/fed-metadata-cert.pem',
+}
+```
+
+Currently `apache::mod::shib::metadata` only supports a single metadata provider, but it is possible to configure Shibboleth to use multiple metadata in a co-federated environment, hence this has been defined as a resource to permit multiple declarations. This requires two URIs, one to obtain the Federation metadata XML file, and another to obtain the Federation metadata signing certificate.
+
+# Updating the Attribute map
+
+```
+apache::mod::shib::attribute_map{'Federation_attribute_map':
+  attribute_map_uri => 'https://example.federation.org/download/attribute-map.xml',
+}
+```
+
+This is optional, and will allow `mod_shib` to use a customised attribute map downloaded from the provided URI. By default this is updated every 21 days. The parameter `max_age` can be used to set the number of days between updates.
+
+# Create the Back-end x509 Certificate
+
+```
+include apache::mod::shib::backend_cert
+```
+
+This creates a self signed back-end x509 certificate and key with which this Service Provider can be registered with a Federation. This method currently just runs the `shib-keygen` command with the values supplied in the `apache::mod::shib` configuration. This certificate will be regenerated on a new deployment unless it has been saved or backed up. It is recommended that a specified certificate is deployed by Puppet from a private file server, or using a suitable x509 certificate management Puppet Module. Maintaining the back-end certificate is important as this is how a Service Provider identifies itself to other Shibboleth services.
+
+The following snippet uploads a certificate, and uses parameters to configure Shibboleth to use it:
+
+```puppet
+class{'apache':
+  servername => 'example.com'
+}
+
+file{'/etc/shibboleth/example.com.crt':
+  ensure => 'file'
+  source => 'puppet:///private/example.com.crt'
+}
+
+class{'apache::mod::shib':
+  shib_sp_cert  => 'example.com.crt'
+}
+```
+
+# Classes and Resources
+
+The `apache::mod::shib` module provides the following classes and resource definitions:
+
+## Class: `apache::mod::shib`
+
+### Parameters for `apache::mod::shib`
+
+* `shib_admin`      Sets the Shibboleth administrator's email address, defaults to `apache::serveradmin`
+* `shib_hostname`   Sets the host name to be used in the Shibboleth configuration, defaults to `fqdn`
+* `logoLocation`    Sets the location relative to the web root of the 'logo' to be used on error pages, defaults to `/shibboleth-sp/logo.jpg`
+* `styleSheet`      = Sets the location relative to the web root of the CSS style sheet to be used on error pages, defaults to `/shibboleth-sp/main.css`
+* `shib_conf_dir`   Sets the directory where the Shibboleth configuration is stored, defaults to `/etc/shibboleth`
+* `shib_conf_file`  Sets the name of the Shibboleth configuration file, defaults to `shibboleth2.xml`
+* `shib_sp_cert`    Sets the name of the Shibboleth Service Provider back end certificate, defaults to `sp-cert.pem`
+* `shib_bin_dir`    Sets the location of the Shibboleth tools (esp. shib-keygen), defaults to  `/usr/sbin`
+* `handlerSSL`      Sets the `handlerSSL` attribute in to `true` or `false`, defaults to `true`
+
+## Resource: `apache::mod::shib::attribute_map`
+
+### Parameters for `apache::mod::shib::attribute_map`
+
+* `attribute_map_uri`   Sets the URI for downloading the Attribute map from. There is no default, and this parameter is required.
+* `attribute_map_dir`   Sets the directory into which the attribute map is downloaded, defaults to `apache::mod::shib::shib_conf_dir`
+* `attribute_map_name`  Sets the file name for the Attribute map file, by default this is extracted from the `attribute_map_uri`
+* `max_age`             Sets the maximum age in days for the Attribute map before downloading and replacing it, defaults to `21` days
+
+## Class: `apache::mod::shib::backend_cert`
+
+### Parameters for `apache::mod::shib::backend_cert`
+
+* `sp_hostname`         Set's the hostname used to sign the back-end certifcated, defaults to `apache::mod::shib::shib_hostname`
+
+## Resource: `apache::mod::shib::metadata`
+
+### Parameters for `apache::mod::shib::metadata`
+
+* `provider_uri`            Sets URI for the metadata provider, there is no default and this parameter is required.
+* `cert_uri`                Sets the URI for the metadata signing certificate, there is no default and this parameter is required.
+* `backing_file_dir`        Sets the directory into which the metadata is downloaded into, defaults to `apache::mod::shib::shib_conf_dir`
+* `backing_file_name`       Sets the name of the metadata backing file, by default this is derived from the `provider_uir`
+* `cert_dir`                Sets the directory into which the certificate is downloaded into
+* `cert_file_name`          Sets the name of the certificate file, by default this is derived from the `cert_uri`
+* `provider_type`           Sets the metadata provider type, defaults to 'XML'
+* `provider_reload_interval`  Set's the metadata reload interval in seconds, defaults to "7200"
+* `metadata_filter_max_validity_interval` Sets the maximum interval for reloading the metadata_filter, defaults to "2419200" seconds
+
+## Resource: `apache::mod::shib::sso`
+
+### Prameters for `apache::mod::shib::sso`
+* `discoveryURL`        The URL of the discovery service, is undefined by default
+* `idpURL`              The URL of a single IDp, is undefined by default
+* `discoveryProtocol`   Sets the discovery protocol for the discovery service provided in the `discoveryURL`, defaults to "SAMLDS",
+* `ecp_support`         Sets support for non-web based ECP logins, by default this is `false`
+
+**Note:** Either one of `discoveryURL` or `idpURL` is required, but not both.
+
+# Registration
+
+Manual resgistration of the Service Provider is still required. By default, the file `/etc/shibboleth/sp-key.pem` contains the public key of the back-end certificate used for secure comminucation within the Shibboleth Federation.
+
+# Attribution
+
+The `apache::mod::shib` Puppet module was created Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the PuppetLabs Apache module on GitHub.
+
+* https://github.com/puppetlabs/puppetlabs-apache
+* https://github.com/nesi/puppetlabs-apache
+* http://www.nesi.org.nz//
+* https://tuakiri.ac.nz/confluence/display/Tuakiri/Home
+
+# Copyright and License
+
+Copyright (C) 2012 [Puppet Labs](https://www.puppetlabs.com/) Inc
+
+Puppet Labs can be contacted at: info@puppetlabs.com
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/manifests/mod/shib/backend_cert.pp b/manifests/mod/shib/backend_cert.pp
index 02d3ceee46..b1078b2dfe 100644
--- a/manifests/mod/shib/backend_cert.pp
+++ b/manifests/mod/shib/backend_cert.pp
@@ -1,5 +1,5 @@
 class apache::mod::shib::backend_cert(
-	$sp_hostname		= $fqdn
+	$sp_hostname		= $apache::mod::shib::shib_hostname
 ){
 
 	require apache::mod::shib

From 207d3160e4fc180b40469615c8e081965dde15db Mon Sep 17 00:00:00 2001
From: Aaron Hicks <Aethylred@gmail.com>
Date: Fri, 28 Sep 2012 10:24:45 +1200
Subject: [PATCH 0363/2267]  Update and expand spec tests, including code fixes
 to match expected behaviour.

---
 README.mod_shib.md                          |   2 +-
 manifests/mod/shib.pp                       | 136 +++++++++------
 manifests/mod/shib/attribute_map.pp         |  50 +++---
 manifests/mod/shib/backend_cert.pp          |  22 ++-
 manifests/mod/shib/metadata.pp              |  98 ++++++-----
 manifests/mod/shib/sso.pp                   |  66 ++++----
 spec/classes/mod/shib/backend_cert_spec.rb  |  64 +++++++
 spec/classes/mod/shib_spec.rb               | 116 +++++++++++++
 spec/defines/mod/shib/attribute_map_spec.rb | 112 ++++++++++++
 spec/defines/mod/shib/metadata_spec.rb      | 178 ++++++++++++++++++++
 spec/defines/mod/shib/sso_spec.rb           | 152 +++++++++++++++++
 11 files changed, 822 insertions(+), 174 deletions(-)
 create mode 100644 spec/classes/mod/shib/backend_cert_spec.rb
 create mode 100644 spec/classes/mod/shib_spec.rb
 create mode 100644 spec/defines/mod/shib/attribute_map_spec.rb
 create mode 100644 spec/defines/mod/shib/metadata_spec.rb
 create mode 100644 spec/defines/mod/shib/sso_spec.rb

diff --git a/README.mod_shib.md b/README.mod_shib.md
index 58a7d7c3b4..db95f5af67 100644
--- a/README.mod_shib.md
+++ b/README.mod_shib.md
@@ -171,7 +171,7 @@ The `apache::mod::shib` module provides the following classes and resource defin
 
 # Registration
 
-Manual resgistration of the Service Provider is still required. By default, the file `/etc/shibboleth/sp-key.pem` contains the public key of the back-end certificate used for secure comminucation within the Shibboleth Federation.
+Manual resgistration of the Service Provider is still required. By default, the file `/etc/shibboleth/sp-cert.pem` contains the public key of the back-end certificate used for secure comminucation within the Shibboleth Federation.
 
 # Attribution
 
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 8f52e8577f..f95996867f 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -1,60 +1,86 @@
 class apache::mod::shib(
-	$shib_admin			= $apache::serveradmin,
-	$shib_hostname	= $fqdn,
-	$logoLocation		= "/shibboleth-sp/logo.jpg",
-	$styleSheet			= "/shibboleth-sp/main.css",
-	$shib_conf_dir	= '/etc/shibboleth',
-	$shib_conf_file	= 'shibboleth2.xml',
-	$shib_sp_cert		= 'sp-cert.pem',
-	$shib_bin_dir		= '/usr/sbin',
-	$handlerSSL			= 'true'
+  $shib_admin         = $apache::serveradmin,
+  $shib_hostname      = $::fqdn,
+  $logoLocation       = '/shibboleth-sp/logo.jpg',
+  $styleSheet         = '/shibboleth-sp/main.css',
+  $shib_conf_dir      = '/etc/shibboleth',
+  $shib_conf_file     = 'shibboleth2.xml',
+  $shib_sp_cert       = 'sp-cert.pem',
+  $shib_bin_dir       = '/usr/sbin',
+  $handlerSSL         = true,
+  $consistent_address = true
 ){
 
-	$shib_conf = "${shib_conf_dir}/${shib_conf_file}"
-	$mod_shib = 'shib2'
-
-	apache::mod {$mod_shib: }
-
-	file{$shib_conf_dir:
-		ensure	=> directory,
-		require => Apache::Mod[$mod_shib]
-	}
-
-	file{$shib_conf:
-		ensure	=> file,
-		replace	=> false,
-		require => [Apache::Mod[$mod_shib],File[$shib_conf_dir]],
-	}
-
-	augeas{"shib_SPconfig_errors":
-		lens		=> 'Xml.lns',
-		incl		=> $shib_conf,
-		context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
-		changes => [
-			"set Errors/#attribute/supportContact ${shib_admin}",
-			"set Errors/#attribute/logoLocation ${logoLocation}",
-			"set Errors/#attribute/styleSheet ${styleSheet}",
-		],
-		notify	=> Service['httpd'],
-	}
-
-	augeas{"shib_SPconfig_hostname":
-		lens		=> 'Xml.lns',
-		incl		=> $shib_conf,
-		context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
-		changes => [
-			"set #attribute/entityID https://${shib_hostname}/shibboleth",
-			"set Sessions/#attribute/handlerURL https://${shib_hostname}/Shibboleth.sso",
-		],
-		notify	=> Service['httpd'],
-	}
-
-	augeas{"shib_SPconfig_handlerSSL":
-		lens		=> 'Xml.lns',
-		incl		=> $shib_conf,
-		context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
-		changes => ["set Sessions/#attribute/handlerSSL ${handlerSSL}",],
-		notify	=> Service['httpd'],
-	}
+  $shib_conf = "${shib_conf_dir}/${shib_conf_file}"
+  $mod_shib = 'shib2'
+
+  apache::mod {$mod_shib:
+    id => 'mod_shib',
+  }
+
+  # by requiring the Apache::Mod, this should wait for the package
+  # to create the directory and not need to manage it
+  file{$shib_conf_dir:
+    ensure  => 'directory',
+    require => Apache::Mod[$mod_shib]
+  }
+
+  # by requiring the Apache::Mod, this will just define the file
+  # created when installing the package.
+  file{$shib_conf:
+    ensure  => 'file',
+    replace => false,
+    require => [Apache::Mod[$mod_shib],File[$shib_conf_dir]],
+  }
+
+  # augeas should auto-require the file $shib_conf
+  augeas{'shib_SPconfig_errors':
+    lens    => 'Xml.lns',
+    incl    => $shib_conf,
+    context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
+    changes => [
+      "set Errors/#attribute/supportContact ${shib_admin}",
+      "set Errors/#attribute/logoLocation ${logoLocation}",
+      "set Errors/#attribute/styleSheet ${styleSheet}",
+    ],
+    notify  => Service['httpd','shibd'],
+  }
+
+  augeas{'shib_SPconfig_consistent_address':
+    lens    => 'Xml.lns',
+    incl    => $shib_conf,
+    context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
+    changes => [
+      "set Sessions/#attribute/consistentAddress ${consistent_address}",
+    ],
+    notify  => Service['httpd','shibd'],
+  }
+
+  augeas{'shib_SPconfig_hostname':
+    lens    => 'Xml.lns',
+    incl    => $shib_conf,
+    context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
+    changes => [
+      "set #attribute/entityID https://${shib_hostname}/shibboleth",
+      "set Sessions/#attribute/handlerURL https://${shib_hostname}/Shibboleth.sso",
+    ],
+    notify  => Service['httpd','shibd'],
+  }
+
+  augeas{'shib_SPconfig_handlerSSL':
+    lens    => 'Xml.lns',
+    incl    => $shib_conf,
+    context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
+    changes => ["set Sessions/#attribute/handlerSSL ${handlerSSL}",],
+    notify  => Service['httpd','shibd'],
+  }
+
+  service{'shibd':
+    ensure      => 'running',
+    enable      => true,
+    hasrestart  => true,
+    hasstatus   => true,
+    require     => Apache::Mod[$mod_shib],
+  }
 
 }
\ No newline at end of file
diff --git a/manifests/mod/shib/attribute_map.pp b/manifests/mod/shib/attribute_map.pp
index d9ad90cc54..e330f9939c 100644
--- a/manifests/mod/shib/attribute_map.pp
+++ b/manifests/mod/shib/attribute_map.pp
@@ -1,32 +1,32 @@
+# parameter setup allows an attribute_map to bedownloaded with one name
+# and saved locally by another.
 define apache::mod::shib::attribute_map(
-	$attribute_map_uri,
-	$attribute_map_dir 	= $apache::mod::shib::shib_conf_dir,
-	$attribute_map_name = inline_template("<%= attribute_map_uri.split('/').last  %>"),
-	$max_age	= '21'
+  $attribute_map_uri,
+  $attribute_map_dir  = $::apache::mod::shib::shib_conf_dir,
+  $attribute_map_name = inline_template("<%= attribute_map_uri.split('/').last  %>"),
+  $max_age  = '21'
 ){
 
-	require apache::mod::shib
+  $attribute_map = "${attribute_map_dir}/${attribute_map_name}"
 
-	$attribute_map = "${attribute_map_dir}/${attribute_map_name}"
+  # Download the attribute map, refresh after $max_age days
+  exec{"get_${name}_attribute_map":
+    path    => ['/usr/bin'],
+    command => "wget ${attribute_map_uri} -O ${attribute_map}",
+    unless  => "test `find ${attribute_map} -mtime +${max_age}`",
+    notify  => Service['httpd','shibd'],
+  }
 
-	# Download the attribute map, refresh after $max_age days
-	exec{"get_${name}_attribute_map":
-		path	=> ['/usr/bin'],
-		command => "wget ${attribute_map_uri} -O ${attribute_map}",
-		unless	=> "test `find ${attribute_map} -mtime +${max_age}`",
-		notify	=> Service['httpd'],
-	}
-
-	# Make sure the shibboleth config is pointing at the attribute map
-	augeas{"shib_${name}_attribute_map":
-		lens		=> 'Xml.lns',
-		incl		=> $apache::mod::shib::shib_conf,
-		context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
-		changes => [
-			"set AttributeExtractor/#attribute/path ${attribute_map_name}",
-		],
-		notify	=> Service['httpd'],
-		require => Exec["get_${name}_attribute_map"],
-	}
+  # Make sure the shibboleth config is pointing at the attribute map
+  augeas{"shib_${name}_attribute_map":
+    lens    => 'Xml.lns',
+    incl    => $::apache::mod::shib::shib_conf,
+    context => "/files${::apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
+    changes => [
+      "set AttributeExtractor/#attribute/path ${attribute_map_name}",
+    ],
+    notify  => Service['httpd','shibd'],
+    require => Exec["get_${name}_attribute_map"],
+  }
 
 }
\ No newline at end of file
diff --git a/manifests/mod/shib/backend_cert.pp b/manifests/mod/shib/backend_cert.pp
index b1078b2dfe..4eefd58e9b 100644
--- a/manifests/mod/shib/backend_cert.pp
+++ b/manifests/mod/shib/backend_cert.pp
@@ -1,14 +1,18 @@
+# This generates a self signed x509 certificate used to secure connections
+# with a Shibboleth Federation registry. If the key is ever lost or overwritten
+# the certificate will have to be re-registered.
+# Alternativly, the certificate could be deployed from the puppetmaster
 class apache::mod::shib::backend_cert(
-	$sp_hostname		= $apache::mod::shib::shib_hostname
-){
+  $sp_hostname    = $apache::mod::shib::shib_hostname
+) {
 
-	require apache::mod::shib
+  require apache::mod::shib
 
-	$sp_cert = "${apache::mod::shib::shib_conf_dir}/${apache::mod::shib::shib_sp_cert}"
+  $sp_cert = "${::apache::mod::shib::shib_conf_dir}/${::apache::mod::shib::shib_sp_cert}"
 
-	exec{"shib_keygen_${sp_hostname}":
-		path 		=> [$apache::mod::shib::shib_bin_dir,'/usr/bin','/bin'],
-		command	=> "shib-keygen -h ${sp_hostname} -e https://${sp_hostname}/shibbloeth",
-		unless	=> "openssl x509 -noout -in ${sp_cert} -issuer|grep ${sp_hostname}",
-	}
+  exec{"shib_keygen_${sp_hostname}":
+    path    => [$::apache::mod::shib::shib_bin_dir,'/usr/bin','/bin'],
+    command => "shib-keygen -f -h ${sp_hostname} -e https://${sp_hostname}/shibbloeth",
+    unless  => "openssl x509 -noout -in ${sp_cert} -issuer|grep ${sp_hostname}",
+  }
 }
\ No newline at end of file
diff --git a/manifests/mod/shib/metadata.pp b/manifests/mod/shib/metadata.pp
index 875bef16e1..a5ac386c4f 100644
--- a/manifests/mod/shib/metadata.pp
+++ b/manifests/mod/shib/metadata.pp
@@ -1,60 +1,58 @@
 # Currently this can only create a _single_ metadata provider
 # it will need to be modified to permit multiple metadata providers
 define apache::mod::shib::metadata(
-	$provider_uri,
-	$cert_uri,
-	$backing_file_dir 				= $apache::mod::shib::shib_conf_dir,
-	$backing_file_name 				= inline_template("<%= provider_uri.split('/').last  %>"),
-	$cert_dir									= $apache::mod::shib::shib_conf_dir,
-	$cert_file_name						= inline_template("<%= cert_uri.split('/').last  %>"),
-	$provider_type						= 'XML',
-	$provider_reload_interval	= "7200",
-	$metadata_filter_max_validity_interval	= "2419200"	
+  $provider_uri,
+  $cert_uri,
+  $backing_file_dir         = $::apache::mod::shib::shib_conf_dir,
+  $backing_file_name        = inline_template("<%= provider_uri.split('/').last  %>"),
+  $cert_dir                 = $::apache::mod::shib::shib_conf_dir,
+  $cert_file_name           = inline_template("<%= cert_uri.split('/').last  %>"),
+  $provider_type            = 'XML',
+  $provider_reload_interval = '7200',
+  $metadata_filter_max_validity_interval  = '2419200'
 ){
 
-	require apache::mod::shib
+  $backing_file = "${backing_file_dir}/${backing_file_name}"
+  $cert_file    = "${cert_dir}/${cert_file_name}"
 
-	$backing_file = "${backing_file_dir}/${backing_file_name}"
-	$cert_file		= "${cert_dir}/${cert_file_name}"
+  # Get the Metadata signing certificate
+  exec{"get_${name}_metadata_cert":
+    path    => ['/usr/bin'],
+    command => "wget ${cert_uri} -O ${cert_file}",
+    creates => $cert_file,
+    notify  => Service['httpd','shibd'],
+  }
 
-	# Get the Metadata signing certificate
-	exec{"get_${name}_metadata_cert":
-		path	=> ['/usr/bin'],
-		command => "wget ${cert_uri} -O ${cert_file}",
-		creates => $cert_file,
-		notify	=> Service['httpd'],
-	}
+  # This puts the MetadataProvider entry in the 'right' place
+  augeas{"shib_${name}_create_metadata_provider":
+    lens    => 'Xml.lns',
+    incl    => $::apache::mod::shib::shib_conf,
+    context => "/files${::apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
+    changes => [
+      'ins MetadataProvider after Errors',
+    ],
+    onlyif  => 'match MetadataProvider/#attribute/uri size == 0',
+    notify  => Service['httpd','shibd'],
+    require => Exec["get_${name}_metadata_cert"],
+  }
 
-	# This puts the MetadataProvider entry in the 'right' place
-	augeas{"shib_${name}_create_metadata_provider":
-		lens		=> 'Xml.lns',
-		incl		=> $apache::mod::shib::shib_conf,
-		context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
-		changes => [
-			"ins MetadataProvider after Errors",
-		],
-		onlyif	=> 'match MetadataProvider/#attribute/uri size == 0',
-		notify	=> Service['httpd'],
-		require => Exec["get_${name}_metadata_cert"],
-	}
-
-	# This will update the attributes and child nodes if they change
-	augeas{"shib_${name}_metadata_provider":
-		lens		=> 'Xml.lns',
-		incl		=> $apache::mod::shib::shib_conf,
-		context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
-		changes => [
-			"set MetadataProvider/#attribute/type ${provider_type}",
-			"set MetadataProvider/#attribute/uri ${provider_uri}",
-			"set MetadataProvider/#attribute/backingFilePath ${backing_file}",
-			"set MetadataProvider/#attribute/reloadInterva ${provider_reload_interval}",
-			"set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil",
-			"set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval ${metadata_filter_max_validity_interval}",
-			"set MetadataProvider/MetadataFilter[2]/#attribute/type Signature",
-			"set MetadataProvider/MetadataFilter[2]/#attribute/certificate ${cert_file}",
-		],
-		notify	=> Service['httpd'],
-		require => [Exec["get_${name}_metadata_cert"],Augeas["shib_${name}_create_metadata_provider"]],
-	}
+  # This will update the attributes and child nodes if they change
+  augeas{"shib_${name}_metadata_provider":
+    lens    => 'Xml.lns',
+    incl    => $::apache::mod::shib::shib_conf,
+    context => "/files${::apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
+    changes => [
+      "set MetadataProvider/#attribute/type ${provider_type}",
+      "set MetadataProvider/#attribute/uri ${provider_uri}",
+      "set MetadataProvider/#attribute/backingFilePath ${backing_file}",
+      "set MetadataProvider/#attribute/reloadInterval ${provider_reload_interval}",
+      'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
+      "set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval ${metadata_filter_max_validity_interval}",
+      'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
+      "set MetadataProvider/MetadataFilter[2]/#attribute/certificate ${cert_file}",
+    ],
+    notify  => Service['httpd','shibd'],
+    require => [Exec["get_${name}_metadata_cert"],Augeas["shib_${name}_create_metadata_provider"]],
+  }
 
 }
\ No newline at end of file
diff --git a/manifests/mod/shib/sso.pp b/manifests/mod/shib/sso.pp
index 816a1a0f8d..2f8a4a9672 100644
--- a/manifests/mod/shib/sso.pp
+++ b/manifests/mod/shib/sso.pp
@@ -1,41 +1,39 @@
 define apache::mod::shib::sso(
-	$discoveryURL				= undef,
-	$idpURL							= undef,
-	$discoveryProtocol	= "SAMLDS",
-	$ECP_support				= false
+  $discoveryURL       = undef,
+  $idpURL             = undef,
+  $discoveryProtocol  = 'SAMLDS',
+  $ecp_support        = false
 ){
 
-	require apache::mod::shib
+  if $discoveryURL and $idpURL {
+    err('apache::mod::shib::sso must have one of discoveryURL or idpURL set, not both.')
+  } elsif !$discoveryURL and !$idpURL {
+    err('apache::mod::shib::sso must have one of discoveryURL or idpURL set, not neither.')
+  } else {
 
-	if $discoveryURL and $idpURL {
-		err("apache::mod::shib::sso must have one of discoveryURL or idpURL set, not both.")
-	} elsif !$discoveryURL and !$idpURL {
-		err("apache::mod::shib::sso must have one of discoveryURL or idpURL set, not neither.")
-	} else {
+    if $idpURL {
+      $entityID_aug = "set SSO/#attribute/entityID ${idpURL}"
+    } else {
+      $entityID_aug = 'rm SSO/#attribute/entityID'
+    }
 
-		if $idpURL {
-			$entityID_aug = "set SSO/#attribute/entityID ${idpURL}"
-		} else {
-			$entityID_aug = "rm SSO/#attribute/entityID"
-		}
+    if $discoveryURL {
+      $discoveryURL_aug = "set SSO/#attribute/discoveryURL ${discoveryURL}"
+    } else {
+      $discoveryURL_aug = 'rm SSO/#attribute/discoveryURL'
+    }
 
-		if $discoveryURL {
-			$discoveryURL_aug = "set SSO/#attribute/discoveryURL ${discoveryURL}"
-		} else {
-			$discoveryURL_aug = "rm SSO/#attribute/discoveryURL"
-		}
-
-		augeas{"shib_sso_${name}_attributes":
-			lens		=> 'Xml.lns',
-			incl		=> $apache::mod::shib::shib_conf,
-			context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
-			changes => [
-				$entityID_aug,
-				$discoveryURL_aug,
-				"set SSO/#attribute/discoveryProtocol ${discoveryProtocol}",
-				"set SSO/#attribute/ECP ${ECP_support}",
-			],
-			notify	=> Service['httpd'],
-		}
-	}
+    augeas{"shib_sso_${name}_attributes":
+      lens    => 'Xml.lns',
+      incl    => $apache::mod::shib::shib_conf,
+      context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
+      changes => [
+        $entityID_aug,
+        $discoveryURL_aug,
+        "set SSO/#attribute/discoveryProtocol ${discoveryProtocol}",
+        "set SSO/#attribute/ECP ${ecp_support}",
+      ],
+      notify  => Service['httpd','shibd'],
+    }
+  }
 }
\ No newline at end of file
diff --git a/spec/classes/mod/shib/backend_cert_spec.rb b/spec/classes/mod/shib/backend_cert_spec.rb
new file mode 100644
index 0000000000..92558da4fe
--- /dev/null
+++ b/spec/classes/mod/shib/backend_cert_spec.rb
@@ -0,0 +1,64 @@
+describe 'apache::mod::shib::backend_cert', :type => :class do
+  let :pre_condition do
+    "include apache\ninclude apache::mod::shib"
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :fqdn                   => 'test.example.com',
+      }
+    end
+    describe 'with no parameters' do
+      it { should contain_class('apache::mod::shib') }
+      it { should contain_exec('shib_keygen_test.example.com').with(
+        'path'    => ['/usr/sbin','/usr/bin','/bin'],
+        'command' => 'shib-keygen -f -h test.example.com -e https://test.example.com/shibbloeth',
+        'unless'  => 'openssl x509 -noout -in /etc/shibboleth/sp-cert.pem -issuer|grep test.example.com'
+      ) }
+    end
+    describe 'when given a hostname' do
+      let(:params){ { :sp_hostname => 'test.example.org' } }
+      it { should contain_exec('shib_keygen_test.example.org').with(
+        'command' => 'shib-keygen -f -h test.example.org -e https://test.example.org/shibbloeth',
+        'unless'  => 'openssl x509 -noout -in /etc/shibboleth/sp-cert.pem -issuer|grep test.example.org'
+      ) }
+    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',
+        :fqdn                   => 'test.example.com',
+      }
+    end
+    describe 'with no parameters' do
+      it { should contain_class('apache::mod::shib') }
+      it { should contain_exec('shib_keygen_test.example.com').with(
+        'path'    => ['/usr/sbin','/usr/bin','/bin'],
+        'command' => 'shib-keygen -f -h test.example.com -e https://test.example.com/shibbloeth',
+        'unless'  => 'openssl x509 -noout -in /etc/shibboleth/sp-cert.pem -issuer|grep test.example.com'
+      ) }
+    end
+    describe 'when given a hostname' do
+      let(:params){ { :sp_hostname => 'test.example.org' } }
+      it { should contain_exec('shib_keygen_test.example.org').with(
+        'command' => 'shib-keygen -f -h test.example.org -e https://test.example.org/shibbloeth',
+        'unless'  => 'openssl x509 -noout -in /etc/shibboleth/sp-cert.pem -issuer|grep test.example.org'
+      ) }
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
new file mode 100644
index 0000000000..9193072217
--- /dev/null
+++ b/spec/classes/mod/shib_spec.rb
@@ -0,0 +1,116 @@
+describe 'apache::mod::shib', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :fqdn                   => 'test.example.com',
+      }
+    end
+    describe 'with no parameters' do
+      it { should contain_apache__mod('shib2') }
+      it { should contain_file('/etc/shibboleth').with(
+        'ensure'  => 'directory',
+        'require' => 'Apache::Mod[shib2]'
+      ) }
+      it { should contain_file('/etc/shibboleth/shibboleth2.xml').with(
+        'ensure'  => 'file',
+        'replace' => false,
+        'require' => ['Apache::Mod[shib2]','File[/etc/shibboleth]']
+      ) }
+      it { should contain_augeas('shib_SPconfig_errors').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set Errors/#attribute/supportContact root@localhost',
+          'set Errors/#attribute/logoLocation /shibboleth-sp/logo.jpg',
+          'set Errors/#attribute/styleSheet /shibboleth-sp/main.css',
+        ],
+        'notify'  => 'Service[httpd]'
+      ) }
+      it { should contain_augeas('shib_SPconfig_hostname').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set #attribute/entityID https://test.example.com/shibboleth',
+          'set Sessions/#attribute/handlerURL https://test.example.com/Shibboleth.sso',
+        ],
+        'notify'  => 'Service[httpd]'
+      ) }
+      it { should contain_augeas('shib_SPconfig_handlerSSL').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => ['set Sessions/#attribute/handlerSSL true',],
+        'notify'  => 'Service[httpd]'
+      ) }
+      # The apache module isn't set up for testing the changes augeas makes.
+    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',
+        :fqdn                   => 'test.example.com',
+      }
+    end
+    describe 'with no parameters' do
+      it { should contain_apache__mod('shib2') }
+      it { should contain_file('/etc/shibboleth').with(
+        'ensure'  => 'directory',
+        'require' => 'Apache::Mod[shib2]'
+      ) }
+      it { should contain_file('/etc/shibboleth/shibboleth2.xml').with(
+        'ensure'  => 'file',
+        'replace' => false,
+        'require' => ['Apache::Mod[shib2]','File[/etc/shibboleth]']
+      ) }
+      it { should contain_augeas('shib_SPconfig_errors').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set Errors/#attribute/supportContact root@localhost',
+          'set Errors/#attribute/logoLocation /shibboleth-sp/logo.jpg',
+          'set Errors/#attribute/styleSheet /shibboleth-sp/main.css',
+        ],
+        'notify'  => 'Service[httpd]'
+      ) }
+      it { should contain_augeas('shib_SPconfig_hostname').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set #attribute/entityID https://test.example.com/shibboleth',
+          'set Sessions/#attribute/handlerURL https://test.example.com/Shibboleth.sso',
+        ],
+        'notify'  => 'Service[httpd]'
+      ) }
+      it { should contain_augeas('shib_SPconfig_handlerSSL').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => ['set Sessions/#attribute/handlerSSL true',],
+        'notify'  => 'Service[httpd]'
+      ) }
+      # The apache module isn't set up for testing the changes augeas makes.
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/defines/mod/shib/attribute_map_spec.rb b/spec/defines/mod/shib/attribute_map_spec.rb
new file mode 100644
index 0000000000..47c577ea17
--- /dev/null
+++ b/spec/defines/mod/shib/attribute_map_spec.rb
@@ -0,0 +1,112 @@
+describe 'apache::mod::shib::attribute_map', :type => :define do
+  let :pre_condition do
+    "include apache\ninclude apache::mod::shib"
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    let(:title){ 'map_name' }
+    describe 'with minimum parameters' do
+      let(:params){ { :attribute_map_uri => 'http://example.org/attribute_map.xml' } }
+      it { should contain_class("apache::mod::shib") }
+      it { should contain_exec("get_map_name_attribute_map").with(
+        'path'    => ['/usr/bin'],
+        'command' => 'wget http://example.org/attribute_map.xml -O /etc/shibboleth/attribute_map.xml',
+        'unless'  => 'test `find /etc/shibboleth/attribute_map.xml -mtime +21`',
+        'notify'  => 'Service[httpd]'
+      ) }
+      it { should contain_augeas("shib_map_name_attribute_map").with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set AttributeExtractor/#attribute/path attribute_map.xml',
+        ],
+        'notify'  => 'Service[httpd]',
+        'require' => 'Exec[get_map_name_attribute_map]'
+      ) }
+    end
+    describe 'with all parameters' do
+      let(:params){ {
+        :attribute_map_uri  => 'http://bob.org/bobs_attribute_map.xml',
+        :attribute_map_dir  => '/some/path/to',
+        :attribute_map_name => 'bob.xml',
+        :max_age            => '5'
+      } }
+      it { should contain_exec("get_map_name_attribute_map").with(
+        'command' => 'wget http://bob.org/bobs_attribute_map.xml -O /some/path/to/bob.xml',
+        'unless'  => 'test `find /some/path/to/bob.xml -mtime +5`'
+      ) }
+      it { should contain_augeas("shib_map_name_attribute_map").with(
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set AttributeExtractor/#attribute/path bob.xml',
+        ]
+      ) }
+    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
+    let(:title){ 'map_name' }
+    describe 'with minimum parameters' do
+      let(:params){ { :attribute_map_uri => 'http://example.org/attribute_map.xml' } }
+      it { should contain_class("apache::mod::shib") }
+      it { should contain_exec("get_map_name_attribute_map").with(
+        'path'    => ['/usr/bin'],
+        'command' => 'wget http://example.org/attribute_map.xml -O /etc/shibboleth/attribute_map.xml',
+        'unless'  => 'test `find /etc/shibboleth/attribute_map.xml -mtime +21`',
+        'notify'  => 'Service[httpd]'
+      ) }
+      it { should contain_augeas("shib_map_name_attribute_map").with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set AttributeExtractor/#attribute/path attribute_map.xml',
+        ],
+        'notify'  => 'Service[httpd]',
+        'require' => 'Exec[get_map_name_attribute_map]'
+      ) }
+    end
+    describe 'with all parameters' do
+      let(:params){ {
+        :attribute_map_uri  => 'http://bob.org/bobs_attribute_map.xml',
+        :attribute_map_dir  => '/some/path/to',
+        :attribute_map_name => 'bob.xml',
+        :max_age            => '5'
+      } }
+      it { should contain_exec("get_map_name_attribute_map").with(
+        'command' => 'wget http://bob.org/bobs_attribute_map.xml -O /some/path/to/bob.xml',
+        'unless'  => 'test `find /some/path/to/bob.xml -mtime +5`'
+      ) }
+      it { should contain_augeas("shib_map_name_attribute_map").with(
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set AttributeExtractor/#attribute/path bob.xml',
+        ]
+      ) }
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/defines/mod/shib/metadata_spec.rb b/spec/defines/mod/shib/metadata_spec.rb
new file mode 100644
index 0000000000..5bb4e78157
--- /dev/null
+++ b/spec/defines/mod/shib/metadata_spec.rb
@@ -0,0 +1,178 @@
+describe 'apache::mod::shib::metadata', :type => :define do
+  let :pre_condition do
+    "include apache\ninclude apache::mod::shib"
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    let(:title){ 'metadata_name' }
+    describe 'with minimum parameters' do
+      let(:params){ {
+        :provider_uri => 'http://example.org/provider',
+        :cert_uri     => 'http://example.org/cert.crt'
+      } }
+      it { should contain_class('apache::mod::shib') }
+      it { should contain_exec('get_metadata_name_metadata_cert').with(
+        'path'    => ['/usr/bin'],
+        'command' => 'wget http://example.org/cert.crt -O /etc/shibboleth/cert.crt',
+        'creates' => '/etc/shibboleth/cert.crt',
+        'notify'  => 'Service[httpd]'
+      ) }
+      it { should contain_augeas('shib_metadata_name_create_metadata_provider').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'ins MetadataProvider after Errors',
+        ],
+        'onlyif'  => 'match MetadataProvider/#attribute/uri size == 0',
+        'notify'  => 'Service[httpd]',
+        'require' => 'Exec[get_metadata_name_metadata_cert]'
+      ) }
+      it { should contain_augeas("shib_metadata_name_metadata_provider").with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set MetadataProvider/#attribute/type XML',
+          'set MetadataProvider/#attribute/uri http://example.org/provider',
+          'set MetadataProvider/#attribute/backingFilePath /etc/shibboleth/provider',
+          'set MetadataProvider/#attribute/reloadInterval 7200',
+          'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
+          'set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval 2419200',
+          'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
+          'set MetadataProvider/MetadataFilter[2]/#attribute/certificate /etc/shibboleth/cert.crt',
+        ],
+        'notify'  => 'Service[httpd]',
+        'require' => ['Exec[get_metadata_name_metadata_cert]','Augeas[shib_metadata_name_create_metadata_provider]']
+      ) }
+    end
+    describe 'with all parameters' do
+      let(:params){ {
+        :provider_uri => 'http://example.org/provider',
+        :cert_uri     => 'http://example.org/cert.crt',
+        :backing_file_dir         => '/path/to',
+        :backing_file_name        => 'bob.xml',
+        :cert_dir                 => '/path/to/certs',
+        :cert_file_name           => 'bobs_cert.crt',
+        :provider_type            => 'JSON',
+        :provider_reload_interval => '1000',
+        :metadata_filter_max_validity_interval  => '100000'
+      } }
+      it { should contain_exec('get_metadata_name_metadata_cert').with(
+        'command' => 'wget http://example.org/cert.crt -O /path/to/certs/bobs_cert.crt',
+        'creates' => '/path/to/certs/bobs_cert.crt'
+      ) }
+      it { should contain_augeas("shib_metadata_name_metadata_provider").with(
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set MetadataProvider/#attribute/type JSON',
+          'set MetadataProvider/#attribute/uri http://example.org/provider',
+          'set MetadataProvider/#attribute/backingFilePath /path/to/bob.xml',
+          'set MetadataProvider/#attribute/reloadInterval 1000',
+          'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
+          'set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval 100000',
+          'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
+          'set MetadataProvider/MetadataFilter[2]/#attribute/certificate /path/to/certs/bobs_cert.crt'
+        ]
+      ) }
+    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
+    let(:title){ 'metadata_name' }
+    describe 'with minimum parameters' do
+      let(:params){ {
+        :provider_uri => 'http://example.org/provider',
+        :cert_uri     => 'http://example.org/cert.crt'
+      } }
+      it { should contain_class('apache::mod::shib') }
+      it { should contain_exec('get_metadata_name_metadata_cert').with(
+        'path'    => ['/usr/bin'],
+        'command' => 'wget http://example.org/cert.crt -O /etc/shibboleth/cert.crt',
+        'creates' => '/etc/shibboleth/cert.crt',
+        'notify'  => 'Service[httpd]'
+      ) }
+      it { should contain_augeas('shib_metadata_name_create_metadata_provider').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'ins MetadataProvider after Errors',
+        ],
+        'onlyif'  => 'match MetadataProvider/#attribute/uri size == 0',
+        'notify'  => 'Service[httpd]',
+        'require' => 'Exec[get_metadata_name_metadata_cert]'
+      ) }
+      it { should contain_augeas("shib_metadata_name_metadata_provider").with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set MetadataProvider/#attribute/type XML',
+          'set MetadataProvider/#attribute/uri http://example.org/provider',
+          'set MetadataProvider/#attribute/backingFilePath /etc/shibboleth/provider',
+          'set MetadataProvider/#attribute/reloadInterval 7200',
+          'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
+          'set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval 2419200',
+          'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
+          'set MetadataProvider/MetadataFilter[2]/#attribute/certificate /etc/shibboleth/cert.crt',
+        ],
+        'notify'  => 'Service[httpd]',
+        'require' => ['Exec[get_metadata_name_metadata_cert]','Augeas[shib_metadata_name_create_metadata_provider]']
+      ) }
+    end
+    describe 'with all parameters' do
+      let(:params){ {
+        :provider_uri => 'http://example.org/provider',
+        :cert_uri     => 'http://example.org/cert.crt',
+        :backing_file_dir         => '/path/to',
+        :backing_file_name        => 'bob.xml',
+        :cert_dir                 => '/path/to/certs',
+        :cert_file_name           => 'bobs_cert.crt',
+        :provider_type            => 'JSON',
+        :provider_reload_interval => '1000',
+        :metadata_filter_max_validity_interval  => '100000'
+      } }
+      it { should contain_exec('get_metadata_name_metadata_cert').with(
+        'command' => 'wget http://example.org/cert.crt -O /path/to/certs/bobs_cert.crt',
+        'creates' => '/path/to/certs/bobs_cert.crt'
+      ) }
+      it { should contain_augeas("shib_metadata_name_metadata_provider").with(
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
+        'changes' => [
+          'set MetadataProvider/#attribute/type JSON',
+          'set MetadataProvider/#attribute/uri http://example.org/provider',
+          'set MetadataProvider/#attribute/backingFilePath /path/to/bob.xml',
+          'set MetadataProvider/#attribute/reloadInterval 1000',
+          'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
+          'set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval 100000',
+          'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
+          'set MetadataProvider/MetadataFilter[2]/#attribute/certificate /path/to/certs/bobs_cert.crt'
+        ]
+      ) }
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/defines/mod/shib/sso_spec.rb b/spec/defines/mod/shib/sso_spec.rb
new file mode 100644
index 0000000000..12dbd4729c
--- /dev/null
+++ b/spec/defines/mod/shib/sso_spec.rb
@@ -0,0 +1,152 @@
+describe 'apache::mod::shib::sso', :type => :define do
+  let :pre_condition do
+    'include apache'
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    let(:title){ 'sso_name' }
+    describe 'with a Discovery Service' do
+      let(:params){ { :idpURL => 'http://example.org/IDP/' } }
+      it { should contain_class('apache::mod::shib') }
+      it { should contain_augeas('shib_sso_sso_name_attributes').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults/Sessions',
+        'changes' => [
+          'set SSO/#attribute/entityID http://example.org/IDP/',
+          'rm SSO/#attribute/discoveryURL',
+          'set SSO/#attribute/discoveryProtocol SAMLDS',
+          'set SSO/#attribute/ECP false'
+        ],
+        'notify'  => 'Service[httpd]'
+      ) }
+    end
+    describe 'with an Identity Provider' do
+      let(:params){ { :discoveryURL => 'http://example.org/DS/' } }
+      it { should contain_class('apache::mod::shib') }
+      it { should contain_augeas('shib_sso_sso_name_attributes').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults/Sessions',
+        'changes' => [
+          'rm SSO/#attribute/entityID',
+          'set SSO/#attribute/discoveryURL http://example.org/DS/',
+          'set SSO/#attribute/discoveryProtocol SAMLDS',
+          'set SSO/#attribute/ECP false'
+        ],
+        'notify'  => 'Service[httpd]'
+      ) }
+    end
+    describe 'when choosing a protocol and enabling ECP' do
+      let(:params){ {
+        :idpURL             => 'http://example.org/IDP/',
+        :discoveryProtocol  => 'PIDGEONS',
+        :ecp_support        => true
+      } }
+      it { should contain_augeas('shib_sso_sso_name_attributes').with_changes(
+        [
+          'set SSO/#attribute/entityID http://example.org/IDP/',
+          'rm SSO/#attribute/discoveryURL',
+          'set SSO/#attribute/discoveryProtocol PIDGEONS',
+          'set SSO/#attribute/ECP true'
+        ]
+      ) }
+    end
+    describe 'when both a Directory Service and an Identity Provider are given' do
+      let(:params){ {
+        :idpURL             => 'http://example.org/IDP/',
+        :discoveryURL => 'http://example.org/DS/'
+      } }
+      # Can't test for error messages
+      it { should_not contain_augeas('shib_sso_sso_name_attributes') }
+    end
+    describe 'with no parameters' do
+      # Can't test for error messages
+      it { should_not contain_augeas('shib_sso_sso_name_attributes') }
+    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
+    let(:title){ 'sso_name' }
+    describe 'with a Discovery Service' do
+      let(:params){ { :idpURL => 'http://example.org/IDP/' } }
+      it { should contain_class('apache::mod::shib') }
+      it { should contain_augeas('shib_sso_sso_name_attributes').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults/Sessions',
+        'changes' => [
+          'set SSO/#attribute/entityID http://example.org/IDP/',
+          'rm SSO/#attribute/discoveryURL',
+          'set SSO/#attribute/discoveryProtocol SAMLDS',
+          'set SSO/#attribute/ECP false'
+        ],
+        'notify'  => 'Service[httpd]'
+      ) }
+    end
+    describe 'with an Identity Provider' do
+      let(:params){ { :discoveryURL => 'http://example.org/DS/' } }
+      it { should contain_class('apache::mod::shib') }
+      it { should contain_augeas('shib_sso_sso_name_attributes').with(
+        'lens'    => 'Xml.lns',
+        'incl'    => '/etc/shibboleth/shibboleth2.xml',
+        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults/Sessions',
+        'changes' => [
+          'rm SSO/#attribute/entityID',
+          'set SSO/#attribute/discoveryURL http://example.org/DS/',
+          'set SSO/#attribute/discoveryProtocol SAMLDS',
+          'set SSO/#attribute/ECP false'
+        ],
+        'notify'  => 'Service[httpd]'
+      ) }
+    end
+    describe 'when choosing a protocol and enabling ECP' do
+      let(:params){ {
+        :idpURL             => 'http://example.org/IDP/',
+        :discoveryProtocol  => 'PIDGEONS',
+        :ecp_support        => true
+      } }
+      it { should contain_augeas('shib_sso_sso_name_attributes').with_changes(
+        [
+          'set SSO/#attribute/entityID http://example.org/IDP/',
+          'rm SSO/#attribute/discoveryURL',
+          'set SSO/#attribute/discoveryProtocol PIDGEONS',
+          'set SSO/#attribute/ECP true'
+        ]
+      ) }
+    end
+    describe 'when both a Directory Service and an Identity Provider are given' do
+      let(:params){ {
+        :idpURL             => 'http://example.org/IDP/',
+        :discoveryURL => 'http://example.org/DS/'
+      } }
+      # Can't test for error messages
+      it { should_not contain_augeas('shib_sso_sso_name_attributes') }
+    end
+    describe 'with no parameters' do
+      # Can't test for error messages
+      it { should_not contain_augeas('shib_sso_sso_name_attributes') }
+    end
+  end
+end
\ No newline at end of file

From 049fd54b57e8a4f28ceeea4888456eafe1509fa1 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Fri, 26 Sep 2014 11:50:25 +1200
Subject: [PATCH 0364/2267] Stripping out the shibboleth daemon config out into
 a separate module.

---
 manifests/mod/shib.pp                       |  85 +---------
 manifests/mod/shib/attribute_map.pp         |  32 ----
 manifests/mod/shib/backend_cert.pp          |  18 --
 manifests/mod/shib/metadata.pp              |  58 -------
 manifests/mod/shib/sso.pp                   |  39 -----
 spec/classes/mod/shib/backend_cert_spec.rb  |  64 -------
 spec/classes/mod/shib_spec.rb               |  80 +--------
 spec/defines/mod/shib/attribute_map_spec.rb | 112 ------------
 spec/defines/mod/shib/metadata_spec.rb      | 178 --------------------
 spec/defines/mod/shib/sso_spec.rb           | 152 -----------------
 10 files changed, 9 insertions(+), 809 deletions(-)
 delete mode 100644 manifests/mod/shib/attribute_map.pp
 delete mode 100644 manifests/mod/shib/backend_cert.pp
 delete mode 100644 manifests/mod/shib/metadata.pp
 delete mode 100644 manifests/mod/shib/sso.pp
 delete mode 100644 spec/classes/mod/shib/backend_cert_spec.rb
 delete mode 100644 spec/defines/mod/shib/attribute_map_spec.rb
 delete mode 100644 spec/defines/mod/shib/metadata_spec.rb
 delete mode 100644 spec/defines/mod/shib/sso_spec.rb

diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index f95996867f..8ec4c6dd11 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -1,86 +1,15 @@
-class apache::mod::shib(
-  $shib_admin         = $apache::serveradmin,
-  $shib_hostname      = $::fqdn,
-  $logoLocation       = '/shibboleth-sp/logo.jpg',
-  $styleSheet         = '/shibboleth-sp/main.css',
-  $shib_conf_dir      = '/etc/shibboleth',
-  $shib_conf_file     = 'shibboleth2.xml',
-  $shib_sp_cert       = 'sp-cert.pem',
-  $shib_bin_dir       = '/usr/sbin',
-  $handlerSSL         = true,
-  $consistent_address = true
-){
+class apache::mod::shib (
+  $suppress_warning = false,
+) {
+
+  if $::osfamily == 'RedHat' and ! $suppress_warning {
+    warning('RedHat distributions do not have Apache mod_shib in their default package repositories.')
+  }
 
-  $shib_conf = "${shib_conf_dir}/${shib_conf_file}"
   $mod_shib = 'shib2'
 
   apache::mod {$mod_shib:
     id => 'mod_shib',
   }
 
-  # by requiring the Apache::Mod, this should wait for the package
-  # to create the directory and not need to manage it
-  file{$shib_conf_dir:
-    ensure  => 'directory',
-    require => Apache::Mod[$mod_shib]
-  }
-
-  # by requiring the Apache::Mod, this will just define the file
-  # created when installing the package.
-  file{$shib_conf:
-    ensure  => 'file',
-    replace => false,
-    require => [Apache::Mod[$mod_shib],File[$shib_conf_dir]],
-  }
-
-  # augeas should auto-require the file $shib_conf
-  augeas{'shib_SPconfig_errors':
-    lens    => 'Xml.lns',
-    incl    => $shib_conf,
-    context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
-    changes => [
-      "set Errors/#attribute/supportContact ${shib_admin}",
-      "set Errors/#attribute/logoLocation ${logoLocation}",
-      "set Errors/#attribute/styleSheet ${styleSheet}",
-    ],
-    notify  => Service['httpd','shibd'],
-  }
-
-  augeas{'shib_SPconfig_consistent_address':
-    lens    => 'Xml.lns',
-    incl    => $shib_conf,
-    context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
-    changes => [
-      "set Sessions/#attribute/consistentAddress ${consistent_address}",
-    ],
-    notify  => Service['httpd','shibd'],
-  }
-
-  augeas{'shib_SPconfig_hostname':
-    lens    => 'Xml.lns',
-    incl    => $shib_conf,
-    context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
-    changes => [
-      "set #attribute/entityID https://${shib_hostname}/shibboleth",
-      "set Sessions/#attribute/handlerURL https://${shib_hostname}/Shibboleth.sso",
-    ],
-    notify  => Service['httpd','shibd'],
-  }
-
-  augeas{'shib_SPconfig_handlerSSL':
-    lens    => 'Xml.lns',
-    incl    => $shib_conf,
-    context => "/files${shib_conf}/SPConfig/ApplicationDefaults",
-    changes => ["set Sessions/#attribute/handlerSSL ${handlerSSL}",],
-    notify  => Service['httpd','shibd'],
-  }
-
-  service{'shibd':
-    ensure      => 'running',
-    enable      => true,
-    hasrestart  => true,
-    hasstatus   => true,
-    require     => Apache::Mod[$mod_shib],
-  }
-
 }
\ No newline at end of file
diff --git a/manifests/mod/shib/attribute_map.pp b/manifests/mod/shib/attribute_map.pp
deleted file mode 100644
index e330f9939c..0000000000
--- a/manifests/mod/shib/attribute_map.pp
+++ /dev/null
@@ -1,32 +0,0 @@
-# parameter setup allows an attribute_map to bedownloaded with one name
-# and saved locally by another.
-define apache::mod::shib::attribute_map(
-  $attribute_map_uri,
-  $attribute_map_dir  = $::apache::mod::shib::shib_conf_dir,
-  $attribute_map_name = inline_template("<%= attribute_map_uri.split('/').last  %>"),
-  $max_age  = '21'
-){
-
-  $attribute_map = "${attribute_map_dir}/${attribute_map_name}"
-
-  # Download the attribute map, refresh after $max_age days
-  exec{"get_${name}_attribute_map":
-    path    => ['/usr/bin'],
-    command => "wget ${attribute_map_uri} -O ${attribute_map}",
-    unless  => "test `find ${attribute_map} -mtime +${max_age}`",
-    notify  => Service['httpd','shibd'],
-  }
-
-  # Make sure the shibboleth config is pointing at the attribute map
-  augeas{"shib_${name}_attribute_map":
-    lens    => 'Xml.lns',
-    incl    => $::apache::mod::shib::shib_conf,
-    context => "/files${::apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
-    changes => [
-      "set AttributeExtractor/#attribute/path ${attribute_map_name}",
-    ],
-    notify  => Service['httpd','shibd'],
-    require => Exec["get_${name}_attribute_map"],
-  }
-
-}
\ No newline at end of file
diff --git a/manifests/mod/shib/backend_cert.pp b/manifests/mod/shib/backend_cert.pp
deleted file mode 100644
index 4eefd58e9b..0000000000
--- a/manifests/mod/shib/backend_cert.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# This generates a self signed x509 certificate used to secure connections
-# with a Shibboleth Federation registry. If the key is ever lost or overwritten
-# the certificate will have to be re-registered.
-# Alternativly, the certificate could be deployed from the puppetmaster
-class apache::mod::shib::backend_cert(
-  $sp_hostname    = $apache::mod::shib::shib_hostname
-) {
-
-  require apache::mod::shib
-
-  $sp_cert = "${::apache::mod::shib::shib_conf_dir}/${::apache::mod::shib::shib_sp_cert}"
-
-  exec{"shib_keygen_${sp_hostname}":
-    path    => [$::apache::mod::shib::shib_bin_dir,'/usr/bin','/bin'],
-    command => "shib-keygen -f -h ${sp_hostname} -e https://${sp_hostname}/shibbloeth",
-    unless  => "openssl x509 -noout -in ${sp_cert} -issuer|grep ${sp_hostname}",
-  }
-}
\ No newline at end of file
diff --git a/manifests/mod/shib/metadata.pp b/manifests/mod/shib/metadata.pp
deleted file mode 100644
index a5ac386c4f..0000000000
--- a/manifests/mod/shib/metadata.pp
+++ /dev/null
@@ -1,58 +0,0 @@
-# Currently this can only create a _single_ metadata provider
-# it will need to be modified to permit multiple metadata providers
-define apache::mod::shib::metadata(
-  $provider_uri,
-  $cert_uri,
-  $backing_file_dir         = $::apache::mod::shib::shib_conf_dir,
-  $backing_file_name        = inline_template("<%= provider_uri.split('/').last  %>"),
-  $cert_dir                 = $::apache::mod::shib::shib_conf_dir,
-  $cert_file_name           = inline_template("<%= cert_uri.split('/').last  %>"),
-  $provider_type            = 'XML',
-  $provider_reload_interval = '7200',
-  $metadata_filter_max_validity_interval  = '2419200'
-){
-
-  $backing_file = "${backing_file_dir}/${backing_file_name}"
-  $cert_file    = "${cert_dir}/${cert_file_name}"
-
-  # Get the Metadata signing certificate
-  exec{"get_${name}_metadata_cert":
-    path    => ['/usr/bin'],
-    command => "wget ${cert_uri} -O ${cert_file}",
-    creates => $cert_file,
-    notify  => Service['httpd','shibd'],
-  }
-
-  # This puts the MetadataProvider entry in the 'right' place
-  augeas{"shib_${name}_create_metadata_provider":
-    lens    => 'Xml.lns',
-    incl    => $::apache::mod::shib::shib_conf,
-    context => "/files${::apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
-    changes => [
-      'ins MetadataProvider after Errors',
-    ],
-    onlyif  => 'match MetadataProvider/#attribute/uri size == 0',
-    notify  => Service['httpd','shibd'],
-    require => Exec["get_${name}_metadata_cert"],
-  }
-
-  # This will update the attributes and child nodes if they change
-  augeas{"shib_${name}_metadata_provider":
-    lens    => 'Xml.lns',
-    incl    => $::apache::mod::shib::shib_conf,
-    context => "/files${::apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults",
-    changes => [
-      "set MetadataProvider/#attribute/type ${provider_type}",
-      "set MetadataProvider/#attribute/uri ${provider_uri}",
-      "set MetadataProvider/#attribute/backingFilePath ${backing_file}",
-      "set MetadataProvider/#attribute/reloadInterval ${provider_reload_interval}",
-      'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
-      "set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval ${metadata_filter_max_validity_interval}",
-      'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
-      "set MetadataProvider/MetadataFilter[2]/#attribute/certificate ${cert_file}",
-    ],
-    notify  => Service['httpd','shibd'],
-    require => [Exec["get_${name}_metadata_cert"],Augeas["shib_${name}_create_metadata_provider"]],
-  }
-
-}
\ No newline at end of file
diff --git a/manifests/mod/shib/sso.pp b/manifests/mod/shib/sso.pp
deleted file mode 100644
index 2f8a4a9672..0000000000
--- a/manifests/mod/shib/sso.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-define apache::mod::shib::sso(
-  $discoveryURL       = undef,
-  $idpURL             = undef,
-  $discoveryProtocol  = 'SAMLDS',
-  $ecp_support        = false
-){
-
-  if $discoveryURL and $idpURL {
-    err('apache::mod::shib::sso must have one of discoveryURL or idpURL set, not both.')
-  } elsif !$discoveryURL and !$idpURL {
-    err('apache::mod::shib::sso must have one of discoveryURL or idpURL set, not neither.')
-  } else {
-
-    if $idpURL {
-      $entityID_aug = "set SSO/#attribute/entityID ${idpURL}"
-    } else {
-      $entityID_aug = 'rm SSO/#attribute/entityID'
-    }
-
-    if $discoveryURL {
-      $discoveryURL_aug = "set SSO/#attribute/discoveryURL ${discoveryURL}"
-    } else {
-      $discoveryURL_aug = 'rm SSO/#attribute/discoveryURL'
-    }
-
-    augeas{"shib_sso_${name}_attributes":
-      lens    => 'Xml.lns',
-      incl    => $apache::mod::shib::shib_conf,
-      context => "/files${apache::mod::shib::shib_conf}/SPConfig/ApplicationDefaults/Sessions",
-      changes => [
-        $entityID_aug,
-        $discoveryURL_aug,
-        "set SSO/#attribute/discoveryProtocol ${discoveryProtocol}",
-        "set SSO/#attribute/ECP ${ecp_support}",
-      ],
-      notify  => Service['httpd','shibd'],
-    }
-  }
-}
\ No newline at end of file
diff --git a/spec/classes/mod/shib/backend_cert_spec.rb b/spec/classes/mod/shib/backend_cert_spec.rb
deleted file mode 100644
index 92558da4fe..0000000000
--- a/spec/classes/mod/shib/backend_cert_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-describe 'apache::mod::shib::backend_cert', :type => :class do
-  let :pre_condition do
-    "include apache\ninclude apache::mod::shib"
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :fqdn                   => 'test.example.com',
-      }
-    end
-    describe 'with no parameters' do
-      it { should contain_class('apache::mod::shib') }
-      it { should contain_exec('shib_keygen_test.example.com').with(
-        'path'    => ['/usr/sbin','/usr/bin','/bin'],
-        'command' => 'shib-keygen -f -h test.example.com -e https://test.example.com/shibbloeth',
-        'unless'  => 'openssl x509 -noout -in /etc/shibboleth/sp-cert.pem -issuer|grep test.example.com'
-      ) }
-    end
-    describe 'when given a hostname' do
-      let(:params){ { :sp_hostname => 'test.example.org' } }
-      it { should contain_exec('shib_keygen_test.example.org').with(
-        'command' => 'shib-keygen -f -h test.example.org -e https://test.example.org/shibbloeth',
-        'unless'  => 'openssl x509 -noout -in /etc/shibboleth/sp-cert.pem -issuer|grep test.example.org'
-      ) }
-    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',
-        :fqdn                   => 'test.example.com',
-      }
-    end
-    describe 'with no parameters' do
-      it { should contain_class('apache::mod::shib') }
-      it { should contain_exec('shib_keygen_test.example.com').with(
-        'path'    => ['/usr/sbin','/usr/bin','/bin'],
-        'command' => 'shib-keygen -f -h test.example.com -e https://test.example.com/shibbloeth',
-        'unless'  => 'openssl x509 -noout -in /etc/shibboleth/sp-cert.pem -issuer|grep test.example.com'
-      ) }
-    end
-    describe 'when given a hostname' do
-      let(:params){ { :sp_hostname => 'test.example.org' } }
-      it { should contain_exec('shib_keygen_test.example.org').with(
-        'command' => 'shib-keygen -f -h test.example.org -e https://test.example.org/shibbloeth',
-        'unless'  => 'openssl x509 -noout -in /etc/shibboleth/sp-cert.pem -issuer|grep test.example.org'
-      ) }
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index 9193072217..e515db96df 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -17,45 +17,7 @@
       }
     end
     describe 'with no parameters' do
-      it { should contain_apache__mod('shib2') }
-      it { should contain_file('/etc/shibboleth').with(
-        'ensure'  => 'directory',
-        'require' => 'Apache::Mod[shib2]'
-      ) }
-      it { should contain_file('/etc/shibboleth/shibboleth2.xml').with(
-        'ensure'  => 'file',
-        'replace' => false,
-        'require' => ['Apache::Mod[shib2]','File[/etc/shibboleth]']
-      ) }
-      it { should contain_augeas('shib_SPconfig_errors').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set Errors/#attribute/supportContact root@localhost',
-          'set Errors/#attribute/logoLocation /shibboleth-sp/logo.jpg',
-          'set Errors/#attribute/styleSheet /shibboleth-sp/main.css',
-        ],
-        'notify'  => 'Service[httpd]'
-      ) }
-      it { should contain_augeas('shib_SPconfig_hostname').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set #attribute/entityID https://test.example.com/shibboleth',
-          'set Sessions/#attribute/handlerURL https://test.example.com/Shibboleth.sso',
-        ],
-        'notify'  => 'Service[httpd]'
-      ) }
-      it { should contain_augeas('shib_SPconfig_handlerSSL').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => ['set Sessions/#attribute/handlerSSL true',],
-        'notify'  => 'Service[httpd]'
-      ) }
-      # The apache module isn't set up for testing the changes augeas makes.
+      it { should contain_apache__mod('shib2').with_id('mod_shib') }
     end
   end
   context "on a RedHat OS" do
@@ -72,45 +34,7 @@
       }
     end
     describe 'with no parameters' do
-      it { should contain_apache__mod('shib2') }
-      it { should contain_file('/etc/shibboleth').with(
-        'ensure'  => 'directory',
-        'require' => 'Apache::Mod[shib2]'
-      ) }
-      it { should contain_file('/etc/shibboleth/shibboleth2.xml').with(
-        'ensure'  => 'file',
-        'replace' => false,
-        'require' => ['Apache::Mod[shib2]','File[/etc/shibboleth]']
-      ) }
-      it { should contain_augeas('shib_SPconfig_errors').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set Errors/#attribute/supportContact root@localhost',
-          'set Errors/#attribute/logoLocation /shibboleth-sp/logo.jpg',
-          'set Errors/#attribute/styleSheet /shibboleth-sp/main.css',
-        ],
-        'notify'  => 'Service[httpd]'
-      ) }
-      it { should contain_augeas('shib_SPconfig_hostname').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set #attribute/entityID https://test.example.com/shibboleth',
-          'set Sessions/#attribute/handlerURL https://test.example.com/Shibboleth.sso',
-        ],
-        'notify'  => 'Service[httpd]'
-      ) }
-      it { should contain_augeas('shib_SPconfig_handlerSSL').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => ['set Sessions/#attribute/handlerSSL true',],
-        'notify'  => 'Service[httpd]'
-      ) }
-      # The apache module isn't set up for testing the changes augeas makes.
+      it { should contain_apache__mod('shib2').with_id('mod_shib') }
     end
   end
 end
\ No newline at end of file
diff --git a/spec/defines/mod/shib/attribute_map_spec.rb b/spec/defines/mod/shib/attribute_map_spec.rb
deleted file mode 100644
index 47c577ea17..0000000000
--- a/spec/defines/mod/shib/attribute_map_spec.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-describe 'apache::mod::shib::attribute_map', :type => :define do
-  let :pre_condition do
-    "include apache\ninclude apache::mod::shib"
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let(:title){ 'map_name' }
-    describe 'with minimum parameters' do
-      let(:params){ { :attribute_map_uri => 'http://example.org/attribute_map.xml' } }
-      it { should contain_class("apache::mod::shib") }
-      it { should contain_exec("get_map_name_attribute_map").with(
-        'path'    => ['/usr/bin'],
-        'command' => 'wget http://example.org/attribute_map.xml -O /etc/shibboleth/attribute_map.xml',
-        'unless'  => 'test `find /etc/shibboleth/attribute_map.xml -mtime +21`',
-        'notify'  => 'Service[httpd]'
-      ) }
-      it { should contain_augeas("shib_map_name_attribute_map").with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set AttributeExtractor/#attribute/path attribute_map.xml',
-        ],
-        'notify'  => 'Service[httpd]',
-        'require' => 'Exec[get_map_name_attribute_map]'
-      ) }
-    end
-    describe 'with all parameters' do
-      let(:params){ {
-        :attribute_map_uri  => 'http://bob.org/bobs_attribute_map.xml',
-        :attribute_map_dir  => '/some/path/to',
-        :attribute_map_name => 'bob.xml',
-        :max_age            => '5'
-      } }
-      it { should contain_exec("get_map_name_attribute_map").with(
-        'command' => 'wget http://bob.org/bobs_attribute_map.xml -O /some/path/to/bob.xml',
-        'unless'  => 'test `find /some/path/to/bob.xml -mtime +5`'
-      ) }
-      it { should contain_augeas("shib_map_name_attribute_map").with(
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set AttributeExtractor/#attribute/path bob.xml',
-        ]
-      ) }
-    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
-    let(:title){ 'map_name' }
-    describe 'with minimum parameters' do
-      let(:params){ { :attribute_map_uri => 'http://example.org/attribute_map.xml' } }
-      it { should contain_class("apache::mod::shib") }
-      it { should contain_exec("get_map_name_attribute_map").with(
-        'path'    => ['/usr/bin'],
-        'command' => 'wget http://example.org/attribute_map.xml -O /etc/shibboleth/attribute_map.xml',
-        'unless'  => 'test `find /etc/shibboleth/attribute_map.xml -mtime +21`',
-        'notify'  => 'Service[httpd]'
-      ) }
-      it { should contain_augeas("shib_map_name_attribute_map").with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set AttributeExtractor/#attribute/path attribute_map.xml',
-        ],
-        'notify'  => 'Service[httpd]',
-        'require' => 'Exec[get_map_name_attribute_map]'
-      ) }
-    end
-    describe 'with all parameters' do
-      let(:params){ {
-        :attribute_map_uri  => 'http://bob.org/bobs_attribute_map.xml',
-        :attribute_map_dir  => '/some/path/to',
-        :attribute_map_name => 'bob.xml',
-        :max_age            => '5'
-      } }
-      it { should contain_exec("get_map_name_attribute_map").with(
-        'command' => 'wget http://bob.org/bobs_attribute_map.xml -O /some/path/to/bob.xml',
-        'unless'  => 'test `find /some/path/to/bob.xml -mtime +5`'
-      ) }
-      it { should contain_augeas("shib_map_name_attribute_map").with(
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set AttributeExtractor/#attribute/path bob.xml',
-        ]
-      ) }
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/defines/mod/shib/metadata_spec.rb b/spec/defines/mod/shib/metadata_spec.rb
deleted file mode 100644
index 5bb4e78157..0000000000
--- a/spec/defines/mod/shib/metadata_spec.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-describe 'apache::mod::shib::metadata', :type => :define do
-  let :pre_condition do
-    "include apache\ninclude apache::mod::shib"
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let(:title){ 'metadata_name' }
-    describe 'with minimum parameters' do
-      let(:params){ {
-        :provider_uri => 'http://example.org/provider',
-        :cert_uri     => 'http://example.org/cert.crt'
-      } }
-      it { should contain_class('apache::mod::shib') }
-      it { should contain_exec('get_metadata_name_metadata_cert').with(
-        'path'    => ['/usr/bin'],
-        'command' => 'wget http://example.org/cert.crt -O /etc/shibboleth/cert.crt',
-        'creates' => '/etc/shibboleth/cert.crt',
-        'notify'  => 'Service[httpd]'
-      ) }
-      it { should contain_augeas('shib_metadata_name_create_metadata_provider').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'ins MetadataProvider after Errors',
-        ],
-        'onlyif'  => 'match MetadataProvider/#attribute/uri size == 0',
-        'notify'  => 'Service[httpd]',
-        'require' => 'Exec[get_metadata_name_metadata_cert]'
-      ) }
-      it { should contain_augeas("shib_metadata_name_metadata_provider").with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set MetadataProvider/#attribute/type XML',
-          'set MetadataProvider/#attribute/uri http://example.org/provider',
-          'set MetadataProvider/#attribute/backingFilePath /etc/shibboleth/provider',
-          'set MetadataProvider/#attribute/reloadInterval 7200',
-          'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
-          'set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval 2419200',
-          'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
-          'set MetadataProvider/MetadataFilter[2]/#attribute/certificate /etc/shibboleth/cert.crt',
-        ],
-        'notify'  => 'Service[httpd]',
-        'require' => ['Exec[get_metadata_name_metadata_cert]','Augeas[shib_metadata_name_create_metadata_provider]']
-      ) }
-    end
-    describe 'with all parameters' do
-      let(:params){ {
-        :provider_uri => 'http://example.org/provider',
-        :cert_uri     => 'http://example.org/cert.crt',
-        :backing_file_dir         => '/path/to',
-        :backing_file_name        => 'bob.xml',
-        :cert_dir                 => '/path/to/certs',
-        :cert_file_name           => 'bobs_cert.crt',
-        :provider_type            => 'JSON',
-        :provider_reload_interval => '1000',
-        :metadata_filter_max_validity_interval  => '100000'
-      } }
-      it { should contain_exec('get_metadata_name_metadata_cert').with(
-        'command' => 'wget http://example.org/cert.crt -O /path/to/certs/bobs_cert.crt',
-        'creates' => '/path/to/certs/bobs_cert.crt'
-      ) }
-      it { should contain_augeas("shib_metadata_name_metadata_provider").with(
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set MetadataProvider/#attribute/type JSON',
-          'set MetadataProvider/#attribute/uri http://example.org/provider',
-          'set MetadataProvider/#attribute/backingFilePath /path/to/bob.xml',
-          'set MetadataProvider/#attribute/reloadInterval 1000',
-          'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
-          'set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval 100000',
-          'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
-          'set MetadataProvider/MetadataFilter[2]/#attribute/certificate /path/to/certs/bobs_cert.crt'
-        ]
-      ) }
-    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
-    let(:title){ 'metadata_name' }
-    describe 'with minimum parameters' do
-      let(:params){ {
-        :provider_uri => 'http://example.org/provider',
-        :cert_uri     => 'http://example.org/cert.crt'
-      } }
-      it { should contain_class('apache::mod::shib') }
-      it { should contain_exec('get_metadata_name_metadata_cert').with(
-        'path'    => ['/usr/bin'],
-        'command' => 'wget http://example.org/cert.crt -O /etc/shibboleth/cert.crt',
-        'creates' => '/etc/shibboleth/cert.crt',
-        'notify'  => 'Service[httpd]'
-      ) }
-      it { should contain_augeas('shib_metadata_name_create_metadata_provider').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'ins MetadataProvider after Errors',
-        ],
-        'onlyif'  => 'match MetadataProvider/#attribute/uri size == 0',
-        'notify'  => 'Service[httpd]',
-        'require' => 'Exec[get_metadata_name_metadata_cert]'
-      ) }
-      it { should contain_augeas("shib_metadata_name_metadata_provider").with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set MetadataProvider/#attribute/type XML',
-          'set MetadataProvider/#attribute/uri http://example.org/provider',
-          'set MetadataProvider/#attribute/backingFilePath /etc/shibboleth/provider',
-          'set MetadataProvider/#attribute/reloadInterval 7200',
-          'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
-          'set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval 2419200',
-          'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
-          'set MetadataProvider/MetadataFilter[2]/#attribute/certificate /etc/shibboleth/cert.crt',
-        ],
-        'notify'  => 'Service[httpd]',
-        'require' => ['Exec[get_metadata_name_metadata_cert]','Augeas[shib_metadata_name_create_metadata_provider]']
-      ) }
-    end
-    describe 'with all parameters' do
-      let(:params){ {
-        :provider_uri => 'http://example.org/provider',
-        :cert_uri     => 'http://example.org/cert.crt',
-        :backing_file_dir         => '/path/to',
-        :backing_file_name        => 'bob.xml',
-        :cert_dir                 => '/path/to/certs',
-        :cert_file_name           => 'bobs_cert.crt',
-        :provider_type            => 'JSON',
-        :provider_reload_interval => '1000',
-        :metadata_filter_max_validity_interval  => '100000'
-      } }
-      it { should contain_exec('get_metadata_name_metadata_cert').with(
-        'command' => 'wget http://example.org/cert.crt -O /path/to/certs/bobs_cert.crt',
-        'creates' => '/path/to/certs/bobs_cert.crt'
-      ) }
-      it { should contain_augeas("shib_metadata_name_metadata_provider").with(
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults',
-        'changes' => [
-          'set MetadataProvider/#attribute/type JSON',
-          'set MetadataProvider/#attribute/uri http://example.org/provider',
-          'set MetadataProvider/#attribute/backingFilePath /path/to/bob.xml',
-          'set MetadataProvider/#attribute/reloadInterval 1000',
-          'set MetadataProvider/MetadataFilter[1]/#attribute/type RequireValidUntil',
-          'set MetadataProvider/MetadataFilter[1]/#attribute/maxValidityInterval 100000',
-          'set MetadataProvider/MetadataFilter[2]/#attribute/type Signature',
-          'set MetadataProvider/MetadataFilter[2]/#attribute/certificate /path/to/certs/bobs_cert.crt'
-        ]
-      ) }
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/defines/mod/shib/sso_spec.rb b/spec/defines/mod/shib/sso_spec.rb
deleted file mode 100644
index 12dbd4729c..0000000000
--- a/spec/defines/mod/shib/sso_spec.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-describe 'apache::mod::shib::sso', :type => :define do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let(:title){ 'sso_name' }
-    describe 'with a Discovery Service' do
-      let(:params){ { :idpURL => 'http://example.org/IDP/' } }
-      it { should contain_class('apache::mod::shib') }
-      it { should contain_augeas('shib_sso_sso_name_attributes').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults/Sessions',
-        'changes' => [
-          'set SSO/#attribute/entityID http://example.org/IDP/',
-          'rm SSO/#attribute/discoveryURL',
-          'set SSO/#attribute/discoveryProtocol SAMLDS',
-          'set SSO/#attribute/ECP false'
-        ],
-        'notify'  => 'Service[httpd]'
-      ) }
-    end
-    describe 'with an Identity Provider' do
-      let(:params){ { :discoveryURL => 'http://example.org/DS/' } }
-      it { should contain_class('apache::mod::shib') }
-      it { should contain_augeas('shib_sso_sso_name_attributes').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults/Sessions',
-        'changes' => [
-          'rm SSO/#attribute/entityID',
-          'set SSO/#attribute/discoveryURL http://example.org/DS/',
-          'set SSO/#attribute/discoveryProtocol SAMLDS',
-          'set SSO/#attribute/ECP false'
-        ],
-        'notify'  => 'Service[httpd]'
-      ) }
-    end
-    describe 'when choosing a protocol and enabling ECP' do
-      let(:params){ {
-        :idpURL             => 'http://example.org/IDP/',
-        :discoveryProtocol  => 'PIDGEONS',
-        :ecp_support        => true
-      } }
-      it { should contain_augeas('shib_sso_sso_name_attributes').with_changes(
-        [
-          'set SSO/#attribute/entityID http://example.org/IDP/',
-          'rm SSO/#attribute/discoveryURL',
-          'set SSO/#attribute/discoveryProtocol PIDGEONS',
-          'set SSO/#attribute/ECP true'
-        ]
-      ) }
-    end
-    describe 'when both a Directory Service and an Identity Provider are given' do
-      let(:params){ {
-        :idpURL             => 'http://example.org/IDP/',
-        :discoveryURL => 'http://example.org/DS/'
-      } }
-      # Can't test for error messages
-      it { should_not contain_augeas('shib_sso_sso_name_attributes') }
-    end
-    describe 'with no parameters' do
-      # Can't test for error messages
-      it { should_not contain_augeas('shib_sso_sso_name_attributes') }
-    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
-    let(:title){ 'sso_name' }
-    describe 'with a Discovery Service' do
-      let(:params){ { :idpURL => 'http://example.org/IDP/' } }
-      it { should contain_class('apache::mod::shib') }
-      it { should contain_augeas('shib_sso_sso_name_attributes').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults/Sessions',
-        'changes' => [
-          'set SSO/#attribute/entityID http://example.org/IDP/',
-          'rm SSO/#attribute/discoveryURL',
-          'set SSO/#attribute/discoveryProtocol SAMLDS',
-          'set SSO/#attribute/ECP false'
-        ],
-        'notify'  => 'Service[httpd]'
-      ) }
-    end
-    describe 'with an Identity Provider' do
-      let(:params){ { :discoveryURL => 'http://example.org/DS/' } }
-      it { should contain_class('apache::mod::shib') }
-      it { should contain_augeas('shib_sso_sso_name_attributes').with(
-        'lens'    => 'Xml.lns',
-        'incl'    => '/etc/shibboleth/shibboleth2.xml',
-        'context' => '/files/etc/shibboleth/shibboleth2.xml/SPConfig/ApplicationDefaults/Sessions',
-        'changes' => [
-          'rm SSO/#attribute/entityID',
-          'set SSO/#attribute/discoveryURL http://example.org/DS/',
-          'set SSO/#attribute/discoveryProtocol SAMLDS',
-          'set SSO/#attribute/ECP false'
-        ],
-        'notify'  => 'Service[httpd]'
-      ) }
-    end
-    describe 'when choosing a protocol and enabling ECP' do
-      let(:params){ {
-        :idpURL             => 'http://example.org/IDP/',
-        :discoveryProtocol  => 'PIDGEONS',
-        :ecp_support        => true
-      } }
-      it { should contain_augeas('shib_sso_sso_name_attributes').with_changes(
-        [
-          'set SSO/#attribute/entityID http://example.org/IDP/',
-          'rm SSO/#attribute/discoveryURL',
-          'set SSO/#attribute/discoveryProtocol PIDGEONS',
-          'set SSO/#attribute/ECP true'
-        ]
-      ) }
-    end
-    describe 'when both a Directory Service and an Identity Provider are given' do
-      let(:params){ {
-        :idpURL             => 'http://example.org/IDP/',
-        :discoveryURL => 'http://example.org/DS/'
-      } }
-      # Can't test for error messages
-      it { should_not contain_augeas('shib_sso_sso_name_attributes') }
-    end
-    describe 'with no parameters' do
-      # Can't test for error messages
-      it { should_not contain_augeas('shib_sso_sso_name_attributes') }
-    end
-  end
-end
\ No newline at end of file

From 4c8b6ad77ad9cbc86c283f0909f954f078dbda7c Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Mon, 29 Sep 2014 14:15:51 +1300
Subject: [PATCH 0365/2267] AllowEncodedSlashes can have a server default set
 with the apache class, and overridden with an apache::vhost declaration

---
 README.md                   |  8 ++++++++
 manifests/init.pp           |  5 +++++
 manifests/vhost.pp          |  9 +++++++++
 spec/classes/apache_spec.rb | 16 ++++++++++++++++
 spec/defines/vhost_spec.rb  |  1 +
 templates/httpd.conf.erb    |  3 +++
 templates/vhost.conf.erb    |  3 +++
 7 files changed, 45 insertions(+)

diff --git a/README.md b/README.md
index d5e388f57b..8472cad871 100644
--- a/README.md
+++ b/README.md
@@ -226,6 +226,10 @@ You may establish a default vhost in this class, the `vhost` class, or both. You
 
 **Parameters within `apache`:**
 
+#####`allow_encoded_slashes`
+
+This sets the server default for the [`AllowEncodedSlashes` declaration](http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes) which modifies the responses to URLs with `\` and `/` characters. The default is undefined, which will omit the declaration from the server configuration and select the Apache default setting of `Off`. Allowed values are: `on`, `off` or `nodecode`.
+
 #####`apache_version`
 
 Configures the behavior of the module templates, package names, and default mods by setting the Apache version. Default is determined by the class `apache::version` using the OS family and release. It should not be configured manually without special reason.
@@ -902,6 +906,10 @@ For `alias` and `aliasmatch` to work, each will need a corresponding context, su
 
 *Note:* If `apache::mod::passenger` is loaded and `PassengerHighPerformance => true` is set, then Alias may have issues honoring the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
+#####`allow_encoded_slashes`
+
+This sets the [`AllowEncodedSlashes` declaration](http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes) for the vhost, overriding the server default. This modifies the vhost responses to URLs with `\` and `/` characters. The default is undefined, which will omit the declaration from the server configuration and select the Apache default setting of `Off`. Allowed values are: `on`, `off` or `nodecode`.
+
 #####`block`
 
 Specifies the list of things Apache will block access to. The default is an empty set, '[]'. Currently, the only option is 'scm', which blocks web access to .svn, .git and .bzr directories.
diff --git a/manifests/init.pp b/manifests/init.pp
index 74e3d6a055..b5e9204570 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -63,6 +63,7 @@
   $server_tokens          = 'OS',
   $server_signature       = 'On',
   $trace_enable           = 'On',
+  $allow_encoded_slashes  = undef,
   $package_ensure         = 'installed',
 ) inherits ::apache::params {
   validate_bool($default_vhost)
@@ -80,6 +81,10 @@
     validate_re($mpm_module, $valid_mpms_re)
   }
 
+  if $allow_encoded_slashes {
+    validate_re($allow_encoded_slashes, '(^on$|^off$|^nodecode$)', "${allow_encoded_slashes} is not permitted for allow_encoded_slashes. Allowed values are 'on', 'off' or 'nodecode'.")
+  }
+
   # NOTE: on FreeBSD it's mpm module's responsibility to install httpd package.
   # NOTE: the same strategy may be introduced for other OSes. For this, you
   # should delete the 'if' block below and modify all MPM modules' manifests
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1586f34a3e..0f28d728d5 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -96,6 +96,7 @@
   $fastcgi_dir                 = undef,
   $additional_includes         = [],
   $apache_version              = $::apache::apache_version,
+  $allow_encoded_slashes       = undef,
   $suexec_user_group           = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
@@ -122,6 +123,8 @@
     validate_hash($rewrites[0])
   }
 
+  # Input validation begins
+
   if $suexec_user_group {
     validate_re($suexec_user_group, '^\w+ \w+$',
     "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
@@ -182,6 +185,12 @@
     validate_string($custom_fragment)
   }
 
+  if $allow_encoded_slashes {
+    validate_re($allow_encoded_slashes, '(^on$|^off$|^nodecode$)', "${allow_encoded_slashes} is not permitted for allow_encoded_slashes. Allowed values are 'on', 'off' or 'nodecode'.")
+  }
+
+  # Input validation ends
+
   if $ssl and $ensure == 'present' {
     include ::apache::mod::ssl
     # Required for the AddType lines.
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 198f1138bf..dc5d6b46a1 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -94,6 +94,14 @@
       it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
     end
 
+    context "when specifying slash encoding behaviour" do
+      let :params do
+        { :allow_encoded_slashes => 'nodecode' }
+      end
+
+      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AllowEncodedSlashes nodecode$} }
+    end
+
     # Assert that both load files and conf files are placed and symlinked for these mods
     [
       'alias',
@@ -305,6 +313,14 @@
         it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
       end
 
+      context "when specifying slash encoding behaviour" do
+        let :params do
+          { :allow_encoded_slashes => 'nodecode' }
+        end
+
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^AllowEncodedSlashes nodecode$} }
+      end
+
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index c5e1fe05ef..5908a7ede9 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -231,6 +231,7 @@
           'additional_includes'         => '/custom/path/includes',
           'apache_version'              => '2.4',
           'suexec_user_group'           => 'root root',
+          'allow_encoded_slashes'       => 'nodecode'
         }
       end
       let :facts do
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index cac3aaf102..68d6b50ae2 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -35,6 +35,9 @@ HostnameLookups Off
 ErrorLog "<%= @logroot %>/<%= @error_log %>"
 LogLevel <%= @log_level %>
 EnableSendfile <%= @sendfile %>
+<%- if @allow_encoded_slashes -%>
+AllowEncodedSlashes <%= @allow_encoded_slashes %>
+<%- end -%>
 
 #Listen 80
 
diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 95ad3ce7df..859a3ae7f4 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -22,6 +22,9 @@
 <% if @fallbackresource -%>
   FallbackResource <%= @fallbackresource %>
 <% end -%>
+<%- if @allow_encoded_slashes -%>
+  AllowEncodedSlashes <%= @allow_encoded_slashes %>
+<%- end -%>
 
   ## Directories, there should at least be a declaration for <%= @docroot %>
 <%= scope.function_template(['apache/vhost/_directories.erb']) -%>

From 14f5b784454522d4e45b5f7c1992ae1e1a65896a Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 16:15:04 -0500
Subject: [PATCH 0366/2267] Fix dav_svn for debian 6

---
 manifests/mod/dav_svn.pp            | 25 ++++++++++++++-----------
 spec/acceptance/mod_dav_svn_spec.rb |  6 +++++-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index c46976e850..36af06fa41 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -1,17 +1,20 @@
 class apache::mod::dav_svn (
   $authz_svn_enabled = false,
 ) {
-    Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
-    include ::apache::mod::dav
-    ::apache::mod { 'dav_svn': }
+  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
+  include ::apache::mod::dav
+  ::apache::mod { 'dav_svn': }
 
-    if $authz_svn_enabled {
-      ::apache::mod { 'authz_svn':
-        loadfile_name => $::osfamily ? {
-          'Debian' => undef,
-          default  => 'dav_svn_authz_svn.load',
-        },
-        require       => Apache::Mod['dav_svn'],
-      }
+  if $::osfamily == 'Debian' and $::operatingsystemmajrelease != '6' {
+    $loadfile_name = undef
+  } else {
+    $loadfile_name = 'dav_svn_authz_svn.load'
+  }
+
+  if $authz_svn_enabled {
+    ::apache::mod { 'authz_svn':
+      loadfile_name => $loadfile_name,
+      require       => Apache::Mod['dav_svn'],
     }
+  }
 }
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 5125ada0b2..90e0db5636 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -5,7 +5,11 @@
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
     service_name        = 'apache2'
-    authz_svn_load_file = 'authz_svn.load'
+    if fact('operatingsystemmajrelease') == '6'
+      authz_svn_load_file = 'dav_svn_authz_svn.load'
+    else
+      authz_svn_load_file = 'authz_svn.load'
+    end
   when 'RedHat'
     mod_dir             = '/etc/httpd/conf.d'
     service_name        = 'httpd'

From 318f5f6773a12faafca7a9d4f0d4d31a4afe3599 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Tue, 30 Sep 2014 10:06:17 +1300
Subject: [PATCH 0367/2267] Add the minimum required shibboleth declarations to
 directories hashes. Ignored if mod_shib not defined.

---
 manifests/vhost.pp               | 4 ++++
 templates/vhost/_directories.erb | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0f28d728d5..863ca6a127 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -248,6 +248,9 @@
   # Is apache::mod::passenger enabled (or apache::mod['passenger'])
   $passenger_enabled = defined(Apache::Mod['passenger'])
 
+  # Is apache::mod::shib enabled (or apache::mod['shib2'])
+  $shibboleth_enabled = defined(Apache::Mod['shib2'])
+
   # Define log file names
   if $access_log_file {
     $access_log_destination = "${logroot}/${access_log_file}"
@@ -482,6 +485,7 @@
   # - $docroot
   # - $apache_version
   # - $suphp_engine
+  # - $shibboleth_enabled
   if $_directories and ! empty($_directories) {
     concat::fragment { "${name}-directories":
       target  => "${priority_real}-${filename}.conf",
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 2ef916eca2..e1ce20f573 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -195,6 +195,14 @@
         <%- end -%>
       <%- end -%>
     <%- end -%>
+    <%- if @shibboleth_enabled -%>
+      <%- if directory['shib_require_setting'] and ! directory['shib_require_setting'].empty? -%>
+    ShibRequireSetting <%- directory['shib_require_setting'] -%>
+      <%- end -%>
+      <%- if directory['shib_use_headers'] and ! directory['shib_use_headers'].empty? -%>
+    ShibUseHeaders <%- directory['shib_use_headers'] -%>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>

From 776437cf64e0e203bbb2b1fa2742607731ab7f31 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Tue, 30 Sep 2014 12:12:02 +1300
Subject: [PATCH 0368/2267] Update documentation for mod_shib

---
 README.md          |  29 ++++++-
 README.mod_shib.md | 201 ---------------------------------------------
 2 files changed, 27 insertions(+), 203 deletions(-)
 delete mode 100644 README.mod_shib.md

diff --git a/README.md b/README.md
index 8472cad871..db2750eb8d 100644
--- a/README.md
+++ b/README.md
@@ -113,8 +113,6 @@ A slightly more complicated example, changes the docroot owner/group from the de
       docroot_group => 'third',
     }
 ```
-For details on using the Shibboleth module (a.k.a. `mod_shib`) see [the Shibboleth README](README.mod_shib.md)
-
 
 To set up a virtual host with SSL and default SSL certificates
 
@@ -550,6 +548,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `rewrite`
 * `rpaf`*
 * `setenvif`
+* `shib`* (see [`apache::mod::shib`](#class-apachemodshib) below)
 * `speling`
 * `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl) below)
 * `status`*
@@ -697,6 +696,12 @@ AddHandler php5-script .php
 AddType text/html .php',
   }
 ```
+####Class: `apache::mod::shib`
+
+Installs the [Shibboleth](http://shibboleth.net/) module for Apache which allows the use of SAML2 Single-Sign-On (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. This class only installs and configures the Apache components of a Shibboleth Service Provider (a web application that consumes Shibboleth SSO identities). The Shibboleth configuration can be managed manually, with puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
+
+Defining this class enables the Shibboleth specific parameters in `apache::vhost` instances.
+
 ####Class: `apache::mod::ssl`
 
 Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are the defaults:
@@ -1706,6 +1711,26 @@ Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array
     }
 ```
 
+######`shib_request_setting`
+
+Allows an valid content setting to be set or altered for the application request. This command takes two parameters, the name of the content setting, and the value to set it to.Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
+
+```puppet
+    apache::vhost { 'secure.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path                  => '/path/to/directory',
+          shib_require_setting  => 'requiresession 1',
+          shib_use_headers      => 'On',
+        },
+      ],
+    }
+```
+
+######`shib_use_headers`
+
+When set to 'On' this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details. 
+
 ######`ssl_options`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
diff --git a/README.mod_shib.md b/README.mod_shib.md
deleted file mode 100644
index db95f5af67..0000000000
--- a/README.mod_shib.md
+++ /dev/null
@@ -1,201 +0,0 @@
-# Shibboleth module for Apache
-
-The module `apache::mod::shib` configures the Apache Shibboleth Service Provider (SP) module in a manner consistent and compatible with the usage of the Puppetlabs Apache Module. Once this module is installed and configured it should just be a matter of specifying `authType shibboleth` in an Apache Virtual Host declaration.
-
-## Shibboleth
-
-Shibboleth is among the world's most widely deployed federated identity solutions, connecting users to applications both within and between organizations. Every software component of the Shibboleth system is free and open source.
-
-Shibboleth is an open-source project that provides Single Sign-On capabilities and allows sites to make informed authorization decisions for individual access of protected on-line resources in a privacy-preserving manner.
-
-* http://shibboleth.net/
-
-# Example Usage
-
-The following is an example installation:
-
-```
-# Set up Apache
-class{'apache': }
-class{'apache::mod::shib': }
-
-# Set up the Shibboleth Single Sign On (sso) module
-apache::mod::shib::sso{'Federation_Directory':
-  discoveryURL  => 'https://example.federation.org/ds/DS',
-}
-
-apache::mod::shib::metadata{'Federation_metadata':
-  provider_uri  => 'https://example.federation.org/metadata/fed-metadata-signed.xml',
-  cert_uri      => 'http://example.federation.org/metadata/fed-metadata-cert.pem',
-}
-
-apache::mod::shib::attribute_map{'Federation_attribute_map':
-  attribute_map_uri => 'https://example.federation.org/download/attribute-map.xml',
-}
-
-include apache::mod::shib::backend_cert
-```
-# Example Usage Breakdown
-
-The following sections describe the sequence given in the Example Usage
-
-## Apache and Shibboleth
-
-```
-# Set up Apache
-class{'apache': }
-class{'apache::mod::shib': }
-```
-
-Setting up the `apache` class from the PuppetLabs Apache Module is a requirement, no extra configuration is required. It is recommended that the `serveradmin` parameter is set.
-
-This is followed by installing the Shibboleth module (`mod_shib`) for Apache. This provides the absolute minimum installation which could then be configured further with parameters.
-
-## Configure Single Sign On with a Discovery Service
-
-```
-# Set up the Shibboleth Single Sign On (SSO) module
-apache::mod::shib::sso{'Federation_Directory':
-  discoveryURL  => 'https://example.federation.org/ds/DS',
-}
-```
-
-This snippet sets up a Single Sign On (SSO) service that uses a Directory Service to handle multiple federated Identity Providers (IDp). 
-
-*Note:* The URL is an example only, the Federation should provide the correct URL to use for its directory service.
-
-*Note:* Alternatively if only a single IDp is to be used, use the `idpURL` parameter instead. The `idpURL` and `discoveryURL` parameters are mutually exclusive, the SSO can only use one or the other.
-
-## Federation Metadata and Certificate
-
-```
-apache::mod::shib::metadata{'Federation_metadata':
-  provider_uri  => 'https://example.federation.org/metadata/fed-metadata-signed.xml',
-  cert_uri      => 'http://example.federation.org/metadata/fed-metadata-cert.pem',
-}
-```
-
-Currently `apache::mod::shib::metadata` only supports a single metadata provider, but it is possible to configure Shibboleth to use multiple metadata in a co-federated environment, hence this has been defined as a resource to permit multiple declarations. This requires two URIs, one to obtain the Federation metadata XML file, and another to obtain the Federation metadata signing certificate.
-
-# Updating the Attribute map
-
-```
-apache::mod::shib::attribute_map{'Federation_attribute_map':
-  attribute_map_uri => 'https://example.federation.org/download/attribute-map.xml',
-}
-```
-
-This is optional, and will allow `mod_shib` to use a customised attribute map downloaded from the provided URI. By default this is updated every 21 days. The parameter `max_age` can be used to set the number of days between updates.
-
-# Create the Back-end x509 Certificate
-
-```
-include apache::mod::shib::backend_cert
-```
-
-This creates a self signed back-end x509 certificate and key with which this Service Provider can be registered with a Federation. This method currently just runs the `shib-keygen` command with the values supplied in the `apache::mod::shib` configuration. This certificate will be regenerated on a new deployment unless it has been saved or backed up. It is recommended that a specified certificate is deployed by Puppet from a private file server, or using a suitable x509 certificate management Puppet Module. Maintaining the back-end certificate is important as this is how a Service Provider identifies itself to other Shibboleth services.
-
-The following snippet uploads a certificate, and uses parameters to configure Shibboleth to use it:
-
-```puppet
-class{'apache':
-  servername => 'example.com'
-}
-
-file{'/etc/shibboleth/example.com.crt':
-  ensure => 'file'
-  source => 'puppet:///private/example.com.crt'
-}
-
-class{'apache::mod::shib':
-  shib_sp_cert  => 'example.com.crt'
-}
-```
-
-# Classes and Resources
-
-The `apache::mod::shib` module provides the following classes and resource definitions:
-
-## Class: `apache::mod::shib`
-
-### Parameters for `apache::mod::shib`
-
-* `shib_admin`      Sets the Shibboleth administrator's email address, defaults to `apache::serveradmin`
-* `shib_hostname`   Sets the host name to be used in the Shibboleth configuration, defaults to `fqdn`
-* `logoLocation`    Sets the location relative to the web root of the 'logo' to be used on error pages, defaults to `/shibboleth-sp/logo.jpg`
-* `styleSheet`      = Sets the location relative to the web root of the CSS style sheet to be used on error pages, defaults to `/shibboleth-sp/main.css`
-* `shib_conf_dir`   Sets the directory where the Shibboleth configuration is stored, defaults to `/etc/shibboleth`
-* `shib_conf_file`  Sets the name of the Shibboleth configuration file, defaults to `shibboleth2.xml`
-* `shib_sp_cert`    Sets the name of the Shibboleth Service Provider back end certificate, defaults to `sp-cert.pem`
-* `shib_bin_dir`    Sets the location of the Shibboleth tools (esp. shib-keygen), defaults to  `/usr/sbin`
-* `handlerSSL`      Sets the `handlerSSL` attribute in to `true` or `false`, defaults to `true`
-
-## Resource: `apache::mod::shib::attribute_map`
-
-### Parameters for `apache::mod::shib::attribute_map`
-
-* `attribute_map_uri`   Sets the URI for downloading the Attribute map from. There is no default, and this parameter is required.
-* `attribute_map_dir`   Sets the directory into which the attribute map is downloaded, defaults to `apache::mod::shib::shib_conf_dir`
-* `attribute_map_name`  Sets the file name for the Attribute map file, by default this is extracted from the `attribute_map_uri`
-* `max_age`             Sets the maximum age in days for the Attribute map before downloading and replacing it, defaults to `21` days
-
-## Class: `apache::mod::shib::backend_cert`
-
-### Parameters for `apache::mod::shib::backend_cert`
-
-* `sp_hostname`         Set's the hostname used to sign the back-end certifcated, defaults to `apache::mod::shib::shib_hostname`
-
-## Resource: `apache::mod::shib::metadata`
-
-### Parameters for `apache::mod::shib::metadata`
-
-* `provider_uri`            Sets URI for the metadata provider, there is no default and this parameter is required.
-* `cert_uri`                Sets the URI for the metadata signing certificate, there is no default and this parameter is required.
-* `backing_file_dir`        Sets the directory into which the metadata is downloaded into, defaults to `apache::mod::shib::shib_conf_dir`
-* `backing_file_name`       Sets the name of the metadata backing file, by default this is derived from the `provider_uir`
-* `cert_dir`                Sets the directory into which the certificate is downloaded into
-* `cert_file_name`          Sets the name of the certificate file, by default this is derived from the `cert_uri`
-* `provider_type`           Sets the metadata provider type, defaults to 'XML'
-* `provider_reload_interval`  Set's the metadata reload interval in seconds, defaults to "7200"
-* `metadata_filter_max_validity_interval` Sets the maximum interval for reloading the metadata_filter, defaults to "2419200" seconds
-
-## Resource: `apache::mod::shib::sso`
-
-### Prameters for `apache::mod::shib::sso`
-* `discoveryURL`        The URL of the discovery service, is undefined by default
-* `idpURL`              The URL of a single IDp, is undefined by default
-* `discoveryProtocol`   Sets the discovery protocol for the discovery service provided in the `discoveryURL`, defaults to "SAMLDS",
-* `ecp_support`         Sets support for non-web based ECP logins, by default this is `false`
-
-**Note:** Either one of `discoveryURL` or `idpURL` is required, but not both.
-
-# Registration
-
-Manual resgistration of the Service Provider is still required. By default, the file `/etc/shibboleth/sp-cert.pem` contains the public key of the back-end certificate used for secure comminucation within the Shibboleth Federation.
-
-# Attribution
-
-The `apache::mod::shib` Puppet module was created Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the PuppetLabs Apache module on GitHub.
-
-* https://github.com/puppetlabs/puppetlabs-apache
-* https://github.com/nesi/puppetlabs-apache
-* http://www.nesi.org.nz//
-* https://tuakiri.ac.nz/confluence/display/Tuakiri/Home
-
-# Copyright and License
-
-Copyright (C) 2012 [Puppet Labs](https://www.puppetlabs.com/) Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file

From dc7e772761b86d3693265b49ddfcaefa324fe59e Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 18:10:42 -0500
Subject: [PATCH 0369/2267] Fix vhost and mod_passenger tests on deb7

Also fix broken tests with strict variables.
---
 README.md                             |  2 ++
 spec/acceptance/mod_passenger_spec.rb |  4 +--
 spec/acceptance/vhost_spec.rb         |  3 ++
 spec/classes/mod/dav_svn_spec.rb      | 47 ++++++++++++++-------------
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 2d6e8ce235..2768b82ba2 100644
--- a/README.md
+++ b/README.md
@@ -1696,6 +1696,8 @@ Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array
     }
 ```
 
+***Note*** If you include rewrites in your directories make sure you are also including `apache::mod::rewrite`. You may also want to consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
+
 ######`ssl_options`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index d141322348..9a758a44ee 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -137,7 +137,7 @@ class { 'apache::mod::passenger': }
       end
 
       it 'should output status via passenger-memory-stats' do
-        shell("sudo /usr/sbin/passenger-memory-stats") do |r|
+        shell("/usr/sbin/passenger-memory-stats") do |r|
           expect(r.stdout).to match(/Apache processes/)
           expect(r.stdout).to match(/Nginx processes/)
           expect(r.stdout).to match(/Passenger processes/)
@@ -262,7 +262,7 @@ class { 'apache::mod::passenger':
           end
 
           it 'should output status via passenger-memory-stats' do
-            shell("sudo /usr/bin/passenger-memory-stats", :pty => true) do |r|
+            shell("/usr/bin/passenger-memory-stats", :pty => true) do |r|
               expect(r.stdout).to match(/Apache processes/)
               expect(r.stdout).to match(/Nginx processes/)
               expect(r.stdout).to match(/Passenger processes/)
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 9ecf347751..1441091e5d 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -987,6 +987,9 @@ class { 'apache': }
       pp = <<-EOS
         class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
+        if ! defined(Class['apache::mod::rewrite']) {
+          include ::apache::mod::rewrite
+        }
         apache::vhost { 'test.server':
           docroot      => '/tmp',
           directories  => [
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 859174af77..95abef9948 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -7,14 +7,15 @@
   context "on a Debian OS" do
     let :facts do
       {
-        :lsbdistcodename        => 'squeeze',
-        :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',
+        :osfamily                  => 'Debian',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'Debian',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -24,13 +25,14 @@
   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',
+        :osfamily                  => 'RedHat',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'RedHat',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -40,13 +42,14 @@
   context "on a FreeBSD OS" do
     let :facts do
       {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :osfamily                  => 'FreeBSD',
+        :operatingsystemrelease    => '9',
+        :operatingsystemmajrelease => '9',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'FreeBSD',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { is_expected.to contain_class("apache::params") }

From 9715ac06dd931416660fc53f92190dc52a87668c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 30 Sep 2014 14:41:14 -0500
Subject: [PATCH 0370/2267] Need fcgid to load after unixd on RHEL7

---
 manifests/mod/fcgid.pp         | 10 ++++-
 spec/classes/mod/fcgid_spec.rb | 71 +++++++++++++++++++++++-----------
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 70997768bc..70761e41d7 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,7 +1,15 @@
 class apache::mod::fcgid(
   $options = {},
 ) {
-  ::apache::mod { 'fcgid': }
+  if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
+    $loadfile_name = 'unixd_fcgid.load'
+  } else {
+    $loadfile_name = undef
+  }
+
+  ::apache::mod { 'fcgid':
+    loadfile_name => $loadfile_name
+  }
 
   # Template uses:
   # - $options
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index ab47a5a8e3..a342e58135 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -8,14 +8,15 @@
   context "on a Debian OS" do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :osfamily                  => 'Debian',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :lsbdistcodename           => 'squeeze',
+        :operatingsystem           => 'Debian',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -26,13 +27,14 @@
   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',
+        :osfamily                  => 'RedHat',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'RedHat',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
@@ -66,16 +68,41 @@
     end
   end
 
+  context "on RHEL7" do
+    let :facts do
+      {
+        :osfamily                  => 'RedHat',
+        :operatingsystemrelease    => '7',
+        :operatingsystemmajrelease => '7',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'RedHat',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+
+    describe 'without parameters' do
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('fcgid').with({
+        'loadfile_name' => 'unixd_fcgid.load'
+      })
+      }
+      it { is_expected.to contain_package("mod_fcgid") }
+    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',
+        :osfamily                  => 'FreeBSD',
+        :operatingsystemrelease    => '9',
+        :operatingsystemmajrelease => '9',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'FreeBSD',
+        :id                        => 'root',
+        :kernel                    => 'FreeBSD',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 

From 5a929a058ab8fbe00dab9a38478c018f65654c81 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Wed, 1 Oct 2014 11:35:44 +1300
Subject: [PATCH 0371/2267] Actually insert those values into the template...
 and we need the line ending too.

---
 templates/vhost/_directories.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index e1ce20f573..d8bba5e658 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -197,10 +197,10 @@
     <%- end -%>
     <%- if @shibboleth_enabled -%>
       <%- if directory['shib_require_setting'] and ! directory['shib_require_setting'].empty? -%>
-    ShibRequireSetting <%- directory['shib_require_setting'] -%>
+    ShibRequireSetting <%= directory['shib_require_setting'] %>
       <%- end -%>
       <%- if directory['shib_use_headers'] and ! directory['shib_use_headers'].empty? -%>
-    ShibUseHeaders <%- directory['shib_use_headers'] -%>
+    ShibUseHeaders <%= directory['shib_use_headers'] %>
       <%- end -%>
     <%- end -%>
     <%- if directory['custom_fragment'] -%>

From c78f99c0ec51c8d2d9df3a8232b8134e564c8e62 Mon Sep 17 00:00:00 2001
From: James Woodward <james@matoch.com>
Date: Thu, 2 Oct 2014 12:26:35 -0600
Subject: [PATCH 0372/2267] Resolves MODULES 1369 RedirectMatch rules do not
 work in Apache module

The existing template creates a line of the format
RedirectMatch permanent /(test)
This can not work with apache as the URL is a mandatory part of the redirect. To resolve this the patch creates a new variable redirectmatch_dest which follows the same flow as the redirectmatch_status and redirectmatch_regexp variables.
All three variables must be supplied and will generate a line of the format
RedirectMatch permanent /(test) http://www.example.com
---
 README.md                     | 5 +++--
 manifests/vhost.pp            | 5 ++++-
 spec/defines/vhost_spec.rb    | 1 +
 templates/vhost/_redirect.erb | 6 ++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index db2750eb8d..cb428bc216 100644
--- a/README.md
+++ b/README.md
@@ -1140,15 +1140,16 @@ Specifies the status to append to the redirect. Defaults to 'undef'.
     }
 ```
 
-#####`redirectmatch_regexp` & `redirectmatch_status`
+#####`redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
 
-Determines which server status should be raised for a given regular expression. Entered as an array. Defaults to 'undef'.
+Determines which server status should be raised for a given regular expression and where to forward teh user to. Entered as an arrays. Defaults to 'undef'.
 
 ```puppet
     apache::vhost { 'site.name.fdqn':
       …
       redirectmatch_status => ['404','404'],
       redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+      redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
     }
 ```
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 863ca6a127..23360bf69a 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -69,6 +69,7 @@
   $redirect_status             = undef,
   $redirectmatch_status        = undef,
   $redirectmatch_regexp        = undef,
+  $redirectmatch_dest          = undef,
   $rack_base_uris              = undef,
   $headers                     = undef,
   $request_headers             = undef,
@@ -601,9 +602,11 @@
   # - $redirect_status_a
   # - $redirectmatch_status
   # - $redirectmatch_regexp
+  # - $redirectmatch_dest
   # - $redirectmatch_status_a
   # - $redirectmatch_regexp_a
-  if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp) {
+  # - $redirectmatch_dest
+  if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp and $redirectmatch_dest) {
     concat::fragment { "${name}-redirect":
       target  => "${priority_real}-${filename}.conf",
       order   => 150,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 5908a7ede9..d3e49bb3bd 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -188,6 +188,7 @@
           'redirect_status'             => 'temp',
           'redirectmatch_status'        => ['404'],
           'redirectmatch_regexp'        => ['\.git$'],
+          'redirectmatch_dest'          => ['http://www.example.com'],
           'rack_base_uris'              => ['/rackapp1'],
           'headers'                     => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
           'request_headers'             => ['append MirrorID "mirror 12"'],
diff --git a/templates/vhost/_redirect.erb b/templates/vhost/_redirect.erb
index 819d6e7694..69bbfd09de 100644
--- a/templates/vhost/_redirect.erb
+++ b/templates/vhost/_redirect.erb
@@ -10,14 +10,16 @@
   Redirect <%= "#{@redirect_status_a[i]} " %><%= source %> <%= @redirect_dest_a[i] %>
   <%- end -%>
 <% end -%>
-<%- if @redirectmatch_status and @redirectmatch_regexp -%>
+<%- if @redirectmatch_status and @redirectmatch_regexp and @redirectmatch_dest -%>
 <% @redirectmatch_status_a = Array(@redirectmatch_status) -%>
 <% @redirectmatch_regexp_a = Array(@redirectmatch_regexp) -%>
+<% @redirectmatch_dest_a = Array(@redirectmatch_dest) -%>
 
   ## RedirectMatch rules
   <%- @redirectmatch_status_a.each_with_index do |status, i| -%>
 <% @redirectmatch_status_a[i] ||= @redirectmatch_status_a[0] -%>
 <% @redirectmatch_regexp_a[i] ||= @redirectmatch_regexp_a[0] -%>
-  RedirectMatch <%= "#{@redirectmatch_status_a[i]} " %> <%= @redirectmatch_regexp_a[i] %>
+<% @redirectmatch_dest_a[i] ||= @redirectmatch_dest_a[0] -%>
+  RedirectMatch <%= "#{@redirectmatch_status_a[i]} " %> <%= @redirectmatch_regexp_a[i] %> <%= @redirectmatch_dest_a[i] %>
   <%- end -%>
 <% end -%>

From e8810a17f46c7e6e4374272c5bb0dd1f2e0db96a Mon Sep 17 00:00:00 2001
From: James Woodward <james@matoch.com>
Date: Thu, 2 Oct 2014 12:42:10 -0600
Subject: [PATCH 0373/2267] Fixes two errors in the redirectmatch usage
 description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cb428bc216..163e72ae2f 100644
--- a/README.md
+++ b/README.md
@@ -1142,7 +1142,7 @@ Specifies the status to append to the redirect. Defaults to 'undef'.
 
 #####`redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
 
-Determines which server status should be raised for a given regular expression and where to forward teh user to. Entered as an arrays. Defaults to 'undef'.
+Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Defaults to 'undef'.
 
 ```puppet
     apache::vhost { 'site.name.fdqn':

From acee4c5670ff3c77c4b45a691e99c98820ac2e46 Mon Sep 17 00:00:00 2001
From: Dave Seff <Dave.Seff@cmegroup.com>
Date: Thu, 2 Oct 2014 15:27:06 -0400
Subject: [PATCH 0374/2267] ScriptAlias needs to come before Alias.

Otherwise you end up getting this error on startup:
The ScriptAlias directive in xxx at line xxx will probably never match because it overlaps an earlier Alias.
---
 templates/vhost.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 859a3ae7f4..5a9337134f 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -15,6 +15,7 @@
 <% else -%>
   DocumentRoot "<%= @docroot %>"
 <% end -%>
+<%= scope.function_template(['apache/vhost/_scriptalias.erb']) -%>
 <%= scope.function_template(['apache/vhost/_aliases.erb']) -%>
 
 <%= scope.function_template(['apache/vhost/_itk.erb']) -%>
@@ -54,7 +55,6 @@
 <%= scope.function_template(['apache/vhost/_rack.erb']) -%>
 <%= scope.function_template(['apache/vhost/_redirect.erb']) -%>
 <%= scope.function_template(['apache/vhost/_rewrite.erb']) -%>
-<%= scope.function_template(['apache/vhost/_scriptalias.erb']) -%>
 <%= scope.function_template(['apache/vhost/_serveralias.erb']) -%>
 <%= scope.function_template(['apache/vhost/_setenv.erb']) -%>
 <%= scope.function_template(['apache/vhost/_ssl.erb']) -%>

From 6ba3afe1f6888884fb70e594ded0b1be4c0a9b91 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 2 Oct 2014 12:51:11 -0700
Subject: [PATCH 0375/2267] Revert "ScriptAlias needs to come before Alias."

---
 templates/vhost.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 5a9337134f..859a3ae7f4 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -15,7 +15,6 @@
 <% else -%>
   DocumentRoot "<%= @docroot %>"
 <% end -%>
-<%= scope.function_template(['apache/vhost/_scriptalias.erb']) -%>
 <%= scope.function_template(['apache/vhost/_aliases.erb']) -%>
 
 <%= scope.function_template(['apache/vhost/_itk.erb']) -%>
@@ -55,6 +54,7 @@
 <%= scope.function_template(['apache/vhost/_rack.erb']) -%>
 <%= scope.function_template(['apache/vhost/_redirect.erb']) -%>
 <%= scope.function_template(['apache/vhost/_rewrite.erb']) -%>
+<%= scope.function_template(['apache/vhost/_scriptalias.erb']) -%>
 <%= scope.function_template(['apache/vhost/_serveralias.erb']) -%>
 <%= scope.function_template(['apache/vhost/_setenv.erb']) -%>
 <%= scope.function_template(['apache/vhost/_ssl.erb']) -%>

From 4aa884385b9b65c3afe83db71d4743e2e50d525f Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Thu, 2 Oct 2014 20:18:53 -0700
Subject: [PATCH 0376/2267] Remove deprecated concat::setup class

This commit removes the deprecated concat::setup and bumps the
dependency on concat to >= 1.1.1 to avoid an idempotency bug in v1.1.0
---
 manifests/balancer.pp | 1 -
 metadata.json         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index b836897c46..a59b6762b8 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -42,7 +42,6 @@
   $proxy_set = {},
   $collect_exported = true,
 ) {
-  include concat::setup
   include ::apache::mod::proxy_balancer
 
   $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
diff --git a/metadata.json b/metadata.json
index fba59e7c39..f84ff41b8a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -74,7 +74,7 @@
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.1.0"
+      "version_requirement": ">= 1.1.1"
     }
   ]
 }

From 998d06aee36a3ef4c47bc905b0ce881defad8b97 Mon Sep 17 00:00:00 2001
From: deltab <daniel@easetechnology.co.uk>
Date: Tue, 7 Oct 2014 14:51:15 +0100
Subject: [PATCH 0377/2267] Fix broken link to Order directive docs

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 163e72ae2f..e500cb4f9e 100644
--- a/README.md
+++ b/README.md
@@ -1623,7 +1623,7 @@ Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options)
 
 ######`order`
 
-Sets the order of processing Allow and Deny statements as per [Apache core documentation](httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower.
+Sets the order of processing Allow and Deny statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower.
 
 ```puppet
     apache::vhost { 'sample.example.net':

From 846adab58e5fa7371fe40915dc54e523cfb50359 Mon Sep 17 00:00:00 2001
From: Nick Howes <n.howes@warwick.ac.uk>
Date: Fri, 10 Oct 2014 16:46:30 +0100
Subject: [PATCH 0378/2267] Fix Shib setting rules.

ShibRequireSetting is not a real thing. I think it was a mixup between ShibRequireSession
and ShibRequestSetting. I've replaced it with separate options for both. The latter is
an array as you can set a variety of diffrent settings, while the latter is a simple
On or Off value. Each item in the settings array should be the name and value of the setting,
e.g. ['requireSession false', 'applicationId myresource']
---
 templates/vhost/_directories.erb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index d8bba5e658..16a6e4facf 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -196,8 +196,13 @@
       <%- end -%>
     <%- end -%>
     <%- if @shibboleth_enabled -%>
-      <%- if directory['shib_require_setting'] and ! directory['shib_require_setting'].empty? -%>
-    ShibRequireSetting <%= directory['shib_require_setting'] %>
+      <%- if directory['shib_require_session'] and ! directory['shib_require_session'].empty? -%>
+    ShibRequireSession <%= directory['shib_require_session'] %>
+      <%- end -%>
+      <%- if directory['shib_request_settings'] -%>
+        <%- Array(directory['shib_request_settings']).each do |setting| -%>
+    ShibRequestSetting <%= setting %>
+        <%- end -%>
       <%- end -%>
       <%- if directory['shib_use_headers'] and ! directory['shib_use_headers'].empty? -%>
     ShibUseHeaders <%= directory['shib_use_headers'] %>

From da02e70480e13fbf277bc0a44e7e269186f1a25d Mon Sep 17 00:00:00 2001
From: Nick Howes <n.howes@warwick.ac.uk>
Date: Fri, 10 Oct 2014 16:57:18 +0100
Subject: [PATCH 0379/2267] shib_request_settings now a hash intead of array.

---
 templates/vhost/_directories.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 16a6e4facf..e756875f29 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -199,9 +199,9 @@
       <%- if directory['shib_require_session'] and ! directory['shib_require_session'].empty? -%>
     ShibRequireSession <%= directory['shib_require_session'] %>
       <%- end -%>
-      <%- if directory['shib_request_settings'] -%>
-        <%- Array(directory['shib_request_settings']).each do |setting| -%>
-    ShibRequestSetting <%= setting %>
+      <%- if directory['shib_request_settings'] and ! directory['shib_request_settings'].empty? -%>
+        <%- directory['shib_request_settings'].each do |key,value| -%>
+    ShibRequestSetting <%= key %> <%= value %>
         <%- end -%>
       <%- end -%>
       <%- if directory['shib_use_headers'] and ! directory['shib_use_headers'].empty? -%>

From e5d5f642966c3f1a6acb09802961bbcb76706b03 Mon Sep 17 00:00:00 2001
From: John Dewey <john@dewey.ws>
Date: Mon, 13 Oct 2014 16:54:49 -0700
Subject: [PATCH 0380/2267] (#1423) Added the WSGIChunkedRequest directive to
 vhost

This option is necessary[1] when running OpenStack's keystone on Apache.

[1] https://review.openstack.org/#/c/34835/
---
 README.md                     | 3 +++
 manifests/vhost.pp            | 1 +
 spec/acceptance/vhost_spec.rb | 7 +++++--
 spec/defines/vhost_spec.rb    | 1 +
 templates/vhost/_wsgi.erb     | 3 +++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e500cb4f9e..e880556524 100644
--- a/README.md
+++ b/README.md
@@ -1344,6 +1344,8 @@ Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 
 `wsgi_pass_authorization` the WSGI application handles authorisation instead of Apache when set to 'On'. For more information see [here] (http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).  Defaults to 'undef' where apache will set the defaults setting to 'Off'.
 
+`wsgi_chunked_request` enables support for chunked requests. Defaults to 'undef'.
+
 To set up a virtual host with WSGI
 
 ```puppet
@@ -1358,6 +1360,7 @@ To set up a virtual host with WSGI
          },
       wsgi_process_group          => 'wsgi',
       wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+      wsgi_chunked_request        => 'On',
     }
 ```
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 23360bf69a..adfd0ac5f3 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -89,6 +89,7 @@
   $wsgi_process_group          = undef,
   $wsgi_script_aliases         = undef,
   $wsgi_pass_authorization     = undef,
+  $wsgi_chunked_request        = undef,
   $custom_fragment             = undef,
   $itk                         = undef,
   $action                      = undef,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 9ecf347751..5d1fbd0781 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1074,7 +1074,8 @@ class { 'apache::mod::wsgi': }
           wsgi_daemon_process_options => {processes => '2'},
           wsgi_process_group          => 'nobody',
           wsgi_script_aliases         => { '/test' => '/test1' },
-    wsgi_pass_authorization     => 'On',
+          wsgi_pass_authorization     => 'On',
+          wsgi_chunked_request        => 'On',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -1094,7 +1095,8 @@ class { 'apache::mod::wsgi': }
           wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
           wsgi_process_group          => 'nobody',
           wsgi_script_aliases         => { '/test' => '/test1' },
-    wsgi_pass_authorization     => 'On',
+          wsgi_pass_authorization     => 'On',
+          wsgi_chunked_request        => 'On',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -1108,6 +1110,7 @@ class { 'apache::mod::wsgi': }
       it { is_expected.to contain 'WSGIProcessGroup nobody' }
       it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
       it { is_expected.to contain 'WSGIPassAuthorization On' }
+      it { is_expected.to contain 'WSGIChunkedRequest On' }
     end
   end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index d3e49bb3bd..7141dc651f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -225,6 +225,7 @@
             'user'  => 'someuser',
             'group' => 'somegroup'
           },
+          'wsgi_chunked_request'        => 'On',
           'action'                      => 'foo',
           'fastcgi_server'              => 'localhost',
           'fastcgi_socket'              => '/tmp/fastcgi.socket',
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index 473b223ab6..a0d4ded654 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -22,3 +22,6 @@
 <% if @wsgi_pass_authorization -%>
   WSGIPassAuthorization <%= @wsgi_pass_authorization %>
 <% end -%>
+<% if @wsgi_chunked_request -%>
+  WSGIChunkedRequest <%= @wsgi_chunked_request %>
+<% end -%>

From 5cdb25cdfa959330e77b2ef3ced0996750bf69ce Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppetlabs.com>
Date: Tue, 14 Oct 2014 14:55:59 -0700
Subject: [PATCH 0381/2267] DOCUMENT-112: Clarifying DirectoryMatch info

Also a few light general copy edits.
---
 README.md | 227 ++++++++++++++++++++++++++----------------------------
 1 file changed, 110 insertions(+), 117 deletions(-)

diff --git a/README.md b/README.md
index e500cb4f9e..34cb9524ed 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ To install Apache with the default parameters
     class { 'apache':  }
 ```
 
-The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, and RedHat systems have another, as do FreeBSD systems). These defaults will work well in a testing environment, but are not suggested for production. To establish customized parameters
+The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, and RedHat systems have another, as do FreeBSD systems). These defaults work well in a testing environment, but are not suggested for production. To establish customized parameters
 
 ```puppet
     class { 'apache':
@@ -86,7 +86,7 @@ The defaults are determined by your operating system (e.g. Debian systems have o
 
 ###Configure a virtual host
 
-Declaring the `apache` class will create a default virtual host by setting up a vhost on port 80, listening on all interfaces and serving `$apache::docroot`.
+Declaring the `apache` class creates a default virtual host by setting up a vhost on port 80, listening on all interfaces and serving `$apache::docroot`.
 
 ```puppet
     class { 'apache': }
@@ -101,7 +101,7 @@ To configure a very basic, name-based virtual host
     }
 ```
 
-*Note:* The default priority is 15. If nothing matches this priority, the alphabetically first name-based vhost will be used. This is also true if you pass a higher priority and no names match anything else.
+*Note:* The default priority is 15. If nothing matches this priority, the alphabetically first name-based vhost is used. This is also true if you pass a higher priority and no names match anything else.
 
 A slightly more complicated example, changes the docroot owner/group from the default 'root'
 
@@ -212,7 +212,7 @@ See a list of all [virtual host parameters](#defined-type-apachevhost). See an e
 
 ###Classes and Defined Types
 
-This module modifies Apache configuration files and directories, and will purge any configuration not managed by Puppet. Configuration of Apache should be managed by Puppet, as non-Puppet configuration files can cause unexpected failures.
+This module modifies Apache configuration files and directories and purges any configuration not managed by Puppet. Configuration of Apache should be managed by Puppet, as non-Puppet configuration files can cause unexpected failures.
 
 It is possible to temporarily disable full Puppet management by setting the [`purge_configs`](#purge_configs) parameter within the base `apache` class to 'false'. This option should only be used as a temporary means of saving and relocating customized configurations. See the [`purge_configs` parameter](#purge_configs) for more information.
 
@@ -220,13 +220,13 @@ It is possible to temporarily disable full Puppet management by setting the [`pu
 
 The apache module's primary class, `apache`, guides the basic setup of Apache on your system.
 
-You may establish a default vhost in this class, the `vhost` class, or both. You may add additional vhost configurations for specific virtual hosts using a declaration of the `vhost` type.
+You can establish a default vhost in this class, the `vhost` class, or both. You can add additional vhost configurations for specific virtual hosts using a declaration of the `vhost` type.
 
 **Parameters within `apache`:**
 
 #####`allow_encoded_slashes`
 
-This sets the server default for the [`AllowEncodedSlashes` declaration](http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes) which modifies the responses to URLs with `\` and `/` characters. The default is undefined, which will omit the declaration from the server configuration and select the Apache default setting of `Off`. Allowed values are: `on`, `off` or `nodecode`.
+This sets the server default for the [`AllowEncodedSlashes` declaration](http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes) which modifies the responses to URLs with `\` and `/` characters. The default is undefined, which omits the declaration from the server configuration and select the Apache default setting of `Off`. Allowed values are: `on`, `off` or `nodecode`.
 
 #####`apache_version`
 
@@ -254,43 +254,43 @@ Generates default set of include-able Apache configuration files under  `${apach
 
 Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names. 
 
-Defaults to 'true', which will include the default [HTTPD mods](https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp).
+Defaults to 'true', which includes the default [HTTPD mods](https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp).
 
-If false, it will only include the mods required to make HTTPD work, and any other mods can be declared on their own.
+If false, it only includes the mods required to make HTTPD work, and any other mods can be declared on their own.
 
-If an array, the apache module will include the array of mods listed.
+If an array, the apache module includes the array of mods listed.
 
 #####`default_ssl_ca`
 
-The default certificate authority, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default certificate authority, which is automatically set to 'undef'. This default works out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_cert`
 
-The default SSL certification, which is automatically set based on your operating system  ('/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL certification, which is automatically set based on your operating system  ('/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD). This default works out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_chain`
 
-The default SSL chain, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL chain, which is automatically set to 'undef'. This default works out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_crl`
 
-The default certificate revocation list to use, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default certificate revocation list to use, which is automatically set to 'undef'. This default works out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_crl_path`
 
-The default certificate revocation list path, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default certificate revocation list path, which is automatically set to 'undef'. This default works out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_crl_check`
 
-Sets the default certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), which is automatically set to 'undef'. This default will work out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher, the value will be ignored on older versions.
+Sets the default certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), which is automatically set to 'undef'. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher, the value is ignored on older versions.
 
 #####`default_ssl_key`
 
-The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD). This default works out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_vhost`
 
-Sets up a default SSL virtual host. Defaults to 'false'. If set to 'true', will set up the following vhost:
+Sets up a default SSL virtual host. Defaults to 'false'. If set to 'true', sets up the following vhost:
 
 ```puppet
     apache::vhost { 'default-ssl':
@@ -315,7 +315,7 @@ Enables custom error documents. Defaults to 'false'.
 
 #####`httpd_dir`
 
-Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but may have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
+Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but might have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
 
 #####`keepalive`
 
@@ -323,7 +323,7 @@ Enables persistent connections.
 
 #####`keepalive_timeout`
 
-Sets the amount of time the server will wait for subsequent requests on a persistent connection. Defaults to '15'.
+Sets the amount of time the server waits for subsequent requests on a persistent connection. Defaults to '15'.
 
 #####`max_keepalive_requests`
 
@@ -356,11 +356,11 @@ in without being aware of the consequences; see http://httpd.apache.org/docs/2.4
 
 #####`manage_group`
 
-Setting this to 'false' will stop the group resource from being created. This is for when you have a group, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established group would result in a duplicate resource error.
+Setting this to 'false' stops the group resource from being created. This is for when you have a group, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established group would result in a duplicate resource error.
 
 #####`manage_user`
 
-Setting this to 'false' will stop the user resource from being created. This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
+Setting this to 'false' stops the user resource from being created. This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
 
 #####`mod_dir`
 
@@ -392,7 +392,7 @@ Removes all other Apache configs and vhosts, defaults to 'true'. Setting this to
 
 #####`purge_vhost_configs`
 
-If `vhost_dir` != `confd_dir`, this controls the removal of any configurations that are not managed by puppet within `vhost_dir`. It defaults to the value of `purge_configs`. Setting this to false is a stopgap measure to allow the apache module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`
+If `vhost_dir` != `confd_dir`, this controls the removal of any configurations that are not managed by Puppet within `vhost_dir`. It defaults to the value of `purge_configs`. Setting this to false is a stopgap measure to allow the apache module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`
 
 #####`sendfile`
 
@@ -424,7 +424,7 @@ Determines whether the HTTPD service is enabled when the machine is booted. Defa
 
 #####`service_ensure`
 
-Determines whether the service should be running. Valid values are true, false, 'running' or 'stopped' when Puppet should manage the service. Any other value will set ensure to false for the Apache service, which is useful when you want to let the service be managed by some other application like Pacemaker. Defaults to 'running'.
+Determines whether the service should be running. Valid values are 'true', 'false', 'running', or 'stopped' when Puppet should manage the service. Any other value sets ensure to 'false' for the Apache service, which is useful when you want to let the service be managed by some other application like Pacemaker. Defaults to 'running'.
 
 #####`service_name`
 
@@ -440,11 +440,11 @@ Changes the location of the configuration directory your virtual host configurat
 
 #####`apache_name`
 
-The name of the Apache package to install. This is automatically detected in `::apache::params`. You may need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.
+The name of the Apache package to install. This is automatically detected in `::apache::params`. You might need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.
 
 ####Defined Type: `apache::custom_config`
 
-Allows you to create custom configs for Apache. The configuration files will only be added to the Apache confd dir if the file is valid. An error will be raised during the puppet run if the file is invalid and `$verify_config` is `true`.
+Allows you to create custom configs for Apache. The configuration files are only added to the Apache confd dir if the file is valid. An error is raised during the Puppet run if the file is invalid and `$verify_config` is `true`.
 
 ```puppet
     apache::custom_config { 'test':
@@ -476,7 +476,7 @@ The source of the configuration file. Only one of `$content` and `$source` can b
 
 #####`verify_command`
 
-The command to use to verify the configuration file. It should use a fully qualified command. Defaults to '/usr/sbin/apachectl -t'. The `$verify_command` will only be used if `$verify_config` is `true`. If the `$verify_command` fails the configuration file will be deleted, the Apache service will not be notified, and an error will be raised during the puppet run.
+The command to use to verify the configuration file. It should use a fully qualified command. Defaults to '/usr/sbin/apachectl -t'. The `$verify_command` is only used if `$verify_config` is `true`. If the `$verify_command` fails, the configuration file is deleted, the Apache service is not notified, and an error is raised during the Puppet run.
 
 #####`verify_config`
 
@@ -492,7 +492,7 @@ Installs default Apache modules based on what OS you are running.
 
 ####Defined Type: `apache::mod`
 
-Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class. The `apache::mod` defined type will also install the required packages to enable the module, if any.
+Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class. The `apache::mod` defined type also installs the required packages to enable the module, if any.
 
 ```puppet
     apache::mod { 'rewrite': }
@@ -559,9 +559,9 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `wsgi` (see [`apache::mod::wsgi`](#class-apachemodwsgi) below)
 * `xsendfile`
 
-Modules noted with a * indicate that the module has settings and, thus, a template that includes parameters. These parameters control the module's configuration. Most of the time, these parameters will not require any configuration or attention.
+Modules noted with a * indicate that the module has settings and, thus, a template that includes parameters. These parameters control the module's configuration. Most of the time, these parameters do not require any configuration or attention.
 
-The modules mentioned above, and other Apache modules that have templates, will cause template files to be dropped along with the mod install and the module will not work without the template. Any module without a template will install the package but drop no files.
+The modules mentioned above, and other Apache modules that have templates, cause template files to be dropped along with the mod install. The module will not work without the template. Any module without a template installs the package but drops no files.
 
 ####Class: `apache::mod::info`
 
@@ -617,7 +617,7 @@ Installs and manages mod_pagespeed, which is a Google module that rewrites web p
 This module does *not* manage the software repositories needed to automatically install the
 mod-pagespeed-stable package. The module does however require that the package be installed,
 or be installable using the system's default package provider.  You should ensure that this
-pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
+pre-requisite is met or declaring `apache::mod::pagespeed` causes the Puppet run to fail.
 
 These are the defaults:
 
@@ -698,7 +698,7 @@ AddType text/html .php',
 ```
 ####Class: `apache::mod::shib`
 
-Installs the [Shibboleth](http://shibboleth.net/) module for Apache which allows the use of SAML2 Single-Sign-On (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. This class only installs and configures the Apache components of a Shibboleth Service Provider (a web application that consumes Shibboleth SSO identities). The Shibboleth configuration can be managed manually, with puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
+Installs the [Shibboleth](http://shibboleth.net/) module for Apache which allows the use of SAML2 Single-Sign-On (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. This class only installs and configures the Apache components of a Shibboleth Service Provider (a web application that consumes Shibboleth SSO identities). The Shibboleth configuration can be managed manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
 
 Defining this class enables the Shibboleth specific parameters in `apache::vhost` instances.
 
@@ -804,7 +804,7 @@ Installs and configures mod_deflate. If no parameters are provided, a default co
 
 #####`types`
 
-An array of mime types that will be deflated.
+An array of mime types to be deflated.
 
 #####`notes`
 
@@ -830,11 +830,11 @@ A string or an array that sets the `RequestReadTimeout` option. Defaults to
 
 ####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.
+The Apache module allows a lot of flexibility in the setup and configuration of virtual hosts. This flexibility is due, in part, to `vhost` being a defined resource type, which allows it to be evaluated multiple times with different parameters.
 
 The `vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default vhost within the base `::apache` class, as well as set a customized vhost as default. Your customized vhost (priority 10) will be privileged over the base class vhost (15).
 
-The `vhost` defined type uses `concat::fragment` to build the configuration file, so if you want to inject custom fragments for pieces of the configuration not supported by default by the defined type, you can simply add a custom fragment.  For the `order` parameter for the custom fragment, the `vhost` defined type uses multiples of 10, so any order that isn't a multiple of 10 should work.
+The `vhost` defined type uses `concat::fragment` to build the configuration file, so if you want to inject custom fragments for pieces of the configuration not supported by default by the defined type, you can add a custom fragment.  For the `order` parameter for the custom fragment, the `vhost` defined type uses multiples of 10, so any order that isn't a multiple of 10 should work.
 
 ```puppet
     apache::vhost { "example.com":
@@ -860,7 +860,7 @@ If you have a series of specific configurations and do not want a base `::apache
 
 #####`access_log`
 
-Specifies whether `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`) should be configured. Setting the value to 'false' will choose none. Defaults to 'true'. 
+Specifies whether `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`) should be configured. Setting the value to 'false' chooses none. Defaults to 'true'. 
 
 #####`access_log_file`
 
@@ -907,17 +907,17 @@ aliases => [
 ],
 ```
 
-For `alias` and `aliasmatch` to work, each will need a corresponding context, such as '< Directory /path/to/directory>' or '<Location /path/to/directory>'. The Alias and AliasMatch directives are created in the order specified in the `aliases` parameter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html), more specific `alias` or `aliasmatch` parameters should come before the more general ones to avoid shadowing.
+For `alias` and `aliasmatch` to work, each needs a corresponding context, such as '< Directory /path/to/directory>' or '<Location /path/to/directory>'. The Alias and AliasMatch directives are created in the order specified in the `aliases` parameter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html), more specific `alias` or `aliasmatch` parameters should come before the more general ones to avoid shadowing.
 
-*Note:* If `apache::mod::passenger` is loaded and `PassengerHighPerformance => true` is set, then Alias may have issues honoring the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
+*Note:* If `apache::mod::passenger` is loaded and `PassengerHighPerformance => true` is set, then Alias might have issues honoring the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
 #####`allow_encoded_slashes`
 
-This sets the [`AllowEncodedSlashes` declaration](http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes) for the vhost, overriding the server default. This modifies the vhost responses to URLs with `\` and `/` characters. The default is undefined, which will omit the declaration from the server configuration and select the Apache default setting of `Off`. Allowed values are: `on`, `off` or `nodecode`.
+This sets the [`AllowEncodedSlashes` declaration](http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes) for the vhost, overriding the server default. This modifies the vhost responses to URLs with `\` and `/` characters. The default is undefined, which omits the declaration from the server configuration and select the Apache default setting of `Off`. Allowed values are: `on`, `off` or `nodecode`.
 
 #####`block`
 
-Specifies the list of things Apache will block access to. The default is an empty set, '[]'. Currently, the only option is 'scm', which blocks web access to .svn, .git and .bzr directories.
+Specifies the list of things Apache blocks access to. The default is an empty set, '[]'. Currently, the only option is 'scm', which blocks web access to .svn, .git and .bzr directories.
 
 #####`custom_fragment`
 
@@ -1006,7 +1006,7 @@ Enables an [IP-based](http://httpd.apache.org/docs/current/vhosts/ip-based.html)
 
 #####`itk`
 
-Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys may be:
+Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys can be:
 
 * user + group
 * `assignuseridexpr`
@@ -1016,7 +1016,7 @@ Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys may be:
 * `limituidrange` (Linux 3.5.0 or newer)
 * `limitgidrange` (Linux 3.5.0 or newer)
 
-Usage will typically look like:
+Usage typically looks like:
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1076,13 +1076,13 @@ Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.ne
 
 #####`port`
 
-Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host will only listen on the port set in this parameter. 
+Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host only listens on the port set in this parameter. 
 
 #####`priority`
 
 Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Defaults to '25'.
 
-If nothing matches the priority, the first name-based vhost will be used. Likewise, passing a higher priority will cause the alphabetically first name-based vhost to be used if no other names match.
+If nothing matches the priority, the first name-based vhost is used. Likewise, passing a higher priority causes the alphabetically first name-based vhost to be used if no other names match.
 
 *Note:* You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
 
@@ -1111,7 +1111,7 @@ apache::vhost { 'site.name.fdqn':
 
 #####`rack_base_uris`
 
-Specifies the resource identifiers for a rack configuration. The file paths specified will be listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
+Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
 
 #####`redirect_dest`
 
@@ -1119,7 +1119,7 @@ Specifies the address to redirect to. Defaults to 'undef'.
 
 #####`redirect_source`
 
-Specifies the source URIs that will redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length and the items will be order-dependent. 
+Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent. 
 
 ```puppet
     apache::vhost { 'site.name.fdqn':
@@ -1171,7 +1171,7 @@ Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mo
 
 Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'. 
 
-For example, you can specify that anyone trying to access index.html will be served welcome.html
+For example, you can specify that anyone trying to access index.html is served welcome.html
 
 ```puppet
     apache::vhost { 'site.name.fdqn':
@@ -1180,7 +1180,7 @@ For example, you can specify that anyone trying to access index.html will be ser
     }
 ```
 
-The parameter allows rewrite conditions that, when true, will execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
+The parameter allows rewrite conditions that, when true, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
 
 ```puppet
     apache::vhost { 'site.name.fdqn':
@@ -1269,7 +1269,7 @@ The ScriptAlias and ScriptAliasMatch directives are created in the order specifi
 
 #####`serveradmin`
 
-Specifies the email address Apache will display when it renders one of its error pages. Defaults to 'undef'.
+Specifies the email address Apache displays when it renders one of its error pages. Defaults to 'undef'.
 
 #####`serveraliases`
 
@@ -1314,7 +1314,7 @@ To set up a virtual host with suPHP
 
 #####`vhost_name`
 
-Enables name-based virtual hosting. If no IP is passed to the virtual host but the vhost is assigned a port, then the vhost name will be 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name will be set to the title of the resource. Defaults to '*'.
+Enables name-based virtual hosting. If no IP is passed to the virtual host, but the vhost is assigned a port, then the vhost name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name is set to the title of the resource. Defaults to '*'.
 
 #####`virtual_docroot` 
 
@@ -1338,11 +1338,11 @@ Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 
 `wsgi_daemon_process_options` is optional and defaults to 'undef'.
 
-`wsgi_process_group` sets the group ID the virtual host will run under. Defaults to 'undef'.
+`wsgi_process_group` sets the group ID the virtual host runs under. Defaults to 'undef'.
 
 `wsgi_script_aliases` requires a hash of web paths to filesystem .wsgi paths. Defaults to 'undef'.
 
-`wsgi_pass_authorization` the WSGI application handles authorisation instead of Apache when set to 'On'. For more information see [here] (http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).  Defaults to 'undef' where apache will set the defaults setting to 'Off'.
+`wsgi_pass_authorization` the WSGI application handles authorisation instead of Apache when set to 'On'. For more information see [here] (http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).  Defaults to 'undef' where apache sets the defaults setting to 'Off'.
 
 To set up a virtual host with WSGI
 
@@ -1365,21 +1365,11 @@ To set up a virtual host with WSGI
 
 The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
 
-Each hash passed to `directories` must contain `path` as one of the keys.  You may also pass in `provider` which, if missing, defaults to 'directory'. (A full list of acceptable keys is below.) General usage will look something like
+The `path` key sets the path for the directory, files, and location blocks, and it can be a regex for matching providers. Each hash passed to `directories` **must** contain `path` as one of the keys. 
 
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path => '/path/to/directory', <key> => <value> },
-        { path => '/path/to/another/directory', <key> => <value> },
-      ],
-    }
-```
+The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'location', 'directorymatch', 'filesmatch', or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file. 
 
-*Note:* At least one directory should match the `docroot` parameter. Once you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block will be created that matches the `docroot` parameter.
-
-The `provider` key can be set to 'directory', 'files', 'location', 'directorymatch', 'filesmatch', or 'locationmatch'. 
+General `directories` usage looks something like
 
 ```puppet
     apache::vhost { 'files.example.net':
@@ -1393,16 +1383,18 @@ The `provider` key can be set to 'directory', 'files', 'location', 'directorymat
     }
 ```
 
-Available handlers, represented as keys, should be placed within the  `directory`,`'files`, or `location` hashes.  This looks like
+*Note:* At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
+
+Available handlers, represented as keys, should be placed within the `directory`,`'files`, or `location` hashes.  This looks like
 
 ```puppet
-  apache::vhost { 'sample.example.net':
+    apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [ { path => '/path/to/directory', handler => value } ],
 }
 ```
 
-Any handlers you do not set in these hashes will be considered 'undefined' within Puppet and will not be added to the virtual host, resulting in the module using their default values. Currently this is the list of supported handlers:
+Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are: 
 
 ######`addhandlers`
 
@@ -1421,7 +1413,7 @@ Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhand
 
 ######`allow`
 
-Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
+Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1529,7 +1521,7 @@ Pass a string of custom configuration directives to be placed at the end of the
 
 ######`deny`
 
-Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. 
+Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. 
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1623,7 +1615,7 @@ Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options)
 
 ######`order`
 
-Sets the order of processing Allow and Deny statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower.
+Sets the order of processing Allow and Deny statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1636,57 +1628,58 @@ Sets the order of processing Allow and Deny statements as per [Apache core docum
     }
 ```
 
-######`satisfy`
+######`passenger_enabled`
 
-Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower.
+Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
 
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [
-        { path    => '/path/to/directory',
-          satisfy => 'Any',
-        }
+      directories => [ 
+        { path              => '/path/to/directory', 
+          passenger_enabled => 'on',
+        }, 
       ],
     }
 ```
 
-######`sethandler`
+*Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
-Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
+######`php_admin_value` and `php_admin_flag`
+
+`php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
+
+
+######`satisfy`
+
+Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path       => '/path/to/directory', 
-          sethandler => 'None', 
+      directories => [
+        { path    => '/path/to/directory',
+          satisfy => 'Any',
         }
       ],
     }
 ```
 
-######`passenger_enabled`
+######`sethandler`
 
-Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
+Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
 
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [ 
-        { path              => '/path/to/directory', 
-          passenger_enabled => 'on',
-        }, 
+        { path       => '/path/to/directory', 
+          sethandler => 'None', 
+        }
       ],
     }
 ```
 
-*Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
-
-######`php_admin_value` and `php_admin_flag`
-
-`php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
-
 ######`rewrites`
 
 Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
@@ -1752,7 +1745,7 @@ String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl
 
 ######`suphp`
 
-A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and may only be passed within `directories`.
+A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and can only be passed within `directories`.
 
 ```puppet
     apache::vhost { 'secure.example.net':
@@ -1770,7 +1763,7 @@ A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://w
 
 ####SSL parameters for `apache::vhost`
 
-All of the SSL parameters for `::vhost` will default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
+All of the SSL parameters for `::vhost` default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
 
 #####`ssl`
 
@@ -1788,13 +1781,13 @@ Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/ce
 
 Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'. 
 
-If you do not use this parameter, it will use the HTTPD default from ssl.conf.erb, 'all -SSLv2'.
+If you do not use this parameter, it uses the HTTPD default from ssl.conf.erb, 'all -SSLv2'.
 
 #####`ssl_cipher`
 
 Specifies [SSLCipherSuite](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Defaults to 'undef'.
 
-If you do not use this parameter, it will use the HTTPD default from ssl.conf.erb, 'HIGH:MEDIUM:!aNULL:!MD5'.
+If you do not use this parameter, it uses the HTTPD default from ssl.conf.erb, 'HIGH:MEDIUM:!aNULL:!MD5'.
 
 #####`ssl_honorcipherorder`
 
@@ -1806,23 +1799,23 @@ Specifies the location of the SSL certification directory. Defaults to '/etc/ssl
 
 #####`ssl_chain`
 
-Specifies the SSL chain. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the SSL chain. Defaults to 'undef'. (This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_crl`
 
-Specifies the certificate revocation list to use. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the certificate revocation list to use. Defaults to 'undef'. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_crl_path`
 
-Specifies the location of the certificate revocation list. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the location of the certificate revocation list. Defaults to 'undef'. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_crl_check`
 
-Sets the certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), defaults to 'undef'. This default will work out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher, the value will be ignored on older versions.
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), defaults to 'undef'. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
 
 #####`ssl_key`
 
-Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_verify_client`
 
@@ -1905,7 +1898,7 @@ The hostname or IP address and TCP port number (1-65535) of the FastCGI server.
 
 #####`timeout`
 
-The number of seconds of FastCGI application inactivity allowed before the request is aborted and the event is logged (at the error LogLevel). The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond (by writing and flushing) within this period, the request will be aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
+The number of seconds of FastCGI application inactivity allowed before the request is aborted and the event is logged (at the error LogLevel). The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond (by writing and flushing) within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
 
 #####`flush`
 
@@ -1913,7 +1906,7 @@ Force a write to the client as data is received from the application. By default
 
 #####`faux_path`
 
-`faux_path` does not have to exist in the local filesystem. URIs that Apache resolves to this filename will be handled by this external FastCGI application.
+`faux_path` does not have to exist in the local filesystem. URIs that Apache resolves to this filename are handled by this external FastCGI application.
 
 #####`alias`
 
@@ -1921,11 +1914,11 @@ A unique alias. This is used internally to link the action with the FastCGI serv
 
 #####`file_type`
 
-The MIME-type of the file's that will be processed by the FastCGI server. 
+The MIME-type of the file to be processed by the FastCGI server. 
 
 ###Virtual Host Examples
 
-The apache module allows you to set up pretty much any configuration of virtual host you might need. This section will address some common configurations, but look at the [Tests section](https://github.com/puppetlabs/puppetlabs-apache/tree/master/tests) for even more examples.
+The apache module allows you to set up pretty much any configuration of virtual host you might need. This section addresses some common configurations, but look at the [Tests section](https://github.com/puppetlabs/puppetlabs-apache/tree/master/tests) for even more examples.
 
 Configure a vhost with a server administrator
 
@@ -2019,14 +2012,14 @@ Configure a vhost to redirect non-SSL connections to SSL
 
 - - -
 
-Set up IP-based vhosts on any listen port and have them respond to requests on specific IP addresses. In this example, we will set listening on ports 80 and 81. This is required because the example vhosts are not declared with a port parameter.
+Set up IP-based vhosts on any listen port and have them respond to requests on specific IP addresses. In this example, we set listening on ports 80 and 81. This is required because the example vhosts are not declared with a port parameter.
 
 ```puppet
     apache::listen { '80': }
     apache::listen { '81': }
 ```
 
-Then we will set up the IP-based vhosts
+Then we set up the IP-based vhosts
 
 ```puppet
     apache::vhost { 'first.example.com':
@@ -2043,7 +2036,7 @@ Then we will set up the IP-based vhosts
 
 - - -
 
-Configure a mix of name-based and IP-based vhosts. First, we will add two IP-based vhosts on 10.0.0.10, one SSL and one non-SSL
+Configure a mix of name-based and IP-based vhosts. First, we add two IP-based vhosts on 10.0.0.10, one SSL and one non-SSL
 
 ```puppet
     apache::vhost { 'The first IP-based vhost, non-ssl':
@@ -2063,7 +2056,7 @@ Configure a mix of name-based and IP-based vhosts. First, we will add two IP-bas
     }
 ```
 
-Then, we will add two name-based vhosts listening on 10.0.0.20
+Then, we add two name-based vhosts listening on 10.0.0.20
 
 ```puppet
     apache::vhost { 'second.example.com':
@@ -2078,7 +2071,7 @@ Then, we will add two name-based vhosts listening on 10.0.0.20
     }
 ```
 
-If you want to add two name-based vhosts so that they will answer on either 10.0.0.10 or 10.0.0.20, you **MUST** declare `add_listen => 'false'` to disable the otherwise automatic 'Listen 80', as it will conflict with the preceding IP-based vhosts.
+If you want to add two name-based vhosts so that they answer on either 10.0.0.10 or 10.0.0.20, you **MUST** declare `add_listen => 'false'` to disable the otherwise automatic 'Listen 80', as it conflicts with the preceding IP-based vhosts.
 
 ```puppet
     apache::vhost { 'fourth.example.com':
@@ -2105,7 +2098,7 @@ One `apache::balancer` defined resource should be defined for each Apache load b
 
 #####`name`
 
-Sets the balancer cluster's title. This parameter will also set the title of the conf.d file.
+Sets the balancer cluster's title. This parameter also sets the title of the conf.d file.
 
 #####`proxy_set`
 
@@ -2119,17 +2112,17 @@ If you statically declare all of your backend servers, you should set this to 'f
 
 If you wish to dynamically declare your backend servers via [exported resources](http://docs.puppetlabs.com/guides/exported_resources.html) collected on a central node, you must set this parameter to 'true' in order to collect the exported balancer member resources that were exported by the balancer member nodes.
 
-If you choose not to use exported resources, all balancer members will be configured in a single puppet run. If you are using exported resources, Puppet has to run on the balanced nodes, then run on the balancer.
+If you choose not to use exported resources, all balancer members will be configured in a single Puppet run. If you are using exported resources, Puppet has to run on the balanced nodes, then run on the balancer.
 
 ####Defined Type: `apache::balancermember`
 
-Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html), which will set up a balancer member inside a listening service configuration block in etc/apache/apache.cfg on the load balancer.
+Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html), which sets up a balancer member inside a listening service configuration block in etc/apache/apache.cfg on the load balancer.
 
 **Parameters within `apache::balancermember`:**
 
 #####`name`
 
-Sets the title of the resource. This name will also set the name of the concat fragment.
+Sets the title of the resource. This name also sets the name of the concat fragment.
 
 #####`balancer_cluster`
 
@@ -2239,11 +2232,11 @@ The `apache::mod::passenger` class is untested as the repository does not have p
 
 This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet. 
 
-The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions may occur.
+The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions can occur.
 
 ###SELinux and Custom Paths
 
-If you are running with SELinux in enforcing mode and want to use custom paths for your `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you will need to manage the context for the files yourself.
+If you are running with SELinux in enforcing mode and want to use custom paths for your `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you need to manage the context for the files yourself.
 
 Something along the lines of:
 
@@ -2270,7 +2263,7 @@ Something along the lines of:
         }
 ```
 
-You need to set the contexts using `semanage fcontext` not `chcon` because `file {...}` resources will reset the context to the values in the database if the resource isn't specifying the context.
+You need to set the contexts using `semanage fcontext` not `chcon` because `file {...}` resources reset the context to the values in the database if the resource isn't specifying the context.
 
 ##Development
 

From 2b7cf7f9db407ed8a19a453dbb427ced91a5e6bf Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppetlabs.com>
Date: Tue, 14 Oct 2014 16:02:56 -0700
Subject: [PATCH 0382/2267] DOCUMENT-112: Clarified path key values

Edits to directory path key values.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 34cb9524ed..560545b98f 100644
--- a/README.md
+++ b/README.md
@@ -1365,7 +1365,7 @@ To set up a virtual host with WSGI
 
 The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
 
-The `path` key sets the path for the directory, files, and location blocks, and it can be a regex for matching providers. Each hash passed to `directories` **must** contain `path` as one of the keys. 
+The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys. 
 
 The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'location', 'directorymatch', 'filesmatch', or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file. 
 

From 7fa34ca598f5a6b6221039645a0abd5535dd525c Mon Sep 17 00:00:00 2001
From: David Schmitt <david@dasz.at>
Date: Wed, 15 Oct 2014 16:35:02 +0200
Subject: [PATCH 0383/2267] Fix misleading error message

This optimization reduces debugging time when hitting it by approximately 10 minutes ;-)
---
 manifests/version.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index a8592d5e95..dc5288dca0 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -7,7 +7,7 @@
   $osr_array = split($::operatingsystemrelease,'[\/\.]')
   $distrelease = $osr_array[0]
   if ! $distrelease {
-    fail("Class['apache::params']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
+    fail("Class['apache::version']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
   }
 
   case $::osfamily {

From 52788078d749ad04675d00cc3ef456a305f8be51 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Wed, 15 Oct 2014 16:16:09 +0100
Subject: [PATCH 0384/2267] Add Passenger related parameters to vhost

---
 README.md                      | 20 ++++++++++++++++++++
 manifests/vhost.pp             | 21 +++++++++++++++++++++
 spec/defines/vhost_spec.rb     | 10 +++++++++-
 templates/vhost/_passenger.erb | 15 +++++++++++++++
 4 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 templates/vhost/_passenger.erb

diff --git a/README.md b/README.md
index 560545b98f..53d4ffea84 100644
--- a/README.md
+++ b/README.md
@@ -1070,6 +1070,26 @@ Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) f
 
 Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. Defaults to '[none]'.
 
+#####`passenger_app_root`
+
+Sets [PassengerRoot](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppRoot), the location of the Passenger application root if different from the DocumentRoot.
+
+#####`passenger_ruby`
+
+Sets [PassengerRuby](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerRuby) on this virtual host, the Ruby interpreter to use for the application.
+
+#####`passenger_min_instances`
+
+Sets [PassengerMinInstances](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerMinInstances), the minimum number of application processes to run.
+
+#####`passenger_start_timeout`
+
+Sets [PassengerStartTimeout](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#_passengerstarttimeout_lt_seconds_gt), the timeout for the application startup.
+
+#####`passenger_pre_start`
+
+Sets [PassengerPreStart](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerPreStart), the URL of the application if pre-starting is required.
+
 #####`php_admin_flags & values`
 
 Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '[]'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 23360bf69a..d871390239 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -99,6 +99,11 @@
   $apache_version              = $::apache::apache_version,
   $allow_encoded_slashes       = undef,
   $suexec_user_group           = undef,
+  $passenger_app_root          = undef,
+  $passenger_ruby              = undef,
+  $passenger_min_instances     = undef,
+  $passenger_start_timeout     = undef,
+  $passenger_pre_start         = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -210,6 +215,10 @@
     include ::apache::mod::suexec
   }
 
+  if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+    include ::apache::mod::passenger
+  }
+
   # Configure the defaultness of a vhost
   if $priority {
     $priority_real = $priority
@@ -778,6 +787,18 @@
     }
   }
 
+  # Template uses:
+  # - $passenger_app_root
+  # - $passenger_ruby
+  # - $passenger_min_instances
+  # - $passenger_start_timeout
+  # - $passenger_pre_start
+  concat::fragment { "${name}-passenger":
+    target  => "${priority_real}-${filename}.conf",
+    order   => 290,
+    content => template('apache/vhost/_passenger.erb'),
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}-${filename}.conf",
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index d3e49bb3bd..ceca1d7065 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -232,7 +232,12 @@
           'additional_includes'         => '/custom/path/includes',
           'apache_version'              => '2.4',
           'suexec_user_group'           => 'root root',
-          'allow_encoded_slashes'       => 'nodecode'
+          'allow_encoded_slashes'       => 'nodecode',
+          'passenger_app_root'          => '/usr/share/myapp',
+          'passenger_ruby'              => '/usr/bin/ruby1.9.1',
+          'passenger_min_instances'     => '1',
+          'passenger_start_timeout'     => '600',
+          'passenger_pre_start'         => 'http://localhost/myapp'
         }
       end
       let :facts do
@@ -255,6 +260,7 @@
       it { is_expected.to contain_class('apache::mod::vhost_alias') }
       it { is_expected.to contain_class('apache::mod::wsgi') }
       it { is_expected.to contain_class('apache::mod::suexec') }
+      it { is_expected.to contain_class('apache::mod::passenger') }
       it { is_expected.to contain_file('/var/www/logs').with({
         'ensure' => 'directory',
         'mode'   => '0600',
@@ -304,6 +310,7 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
     context 'not everything can be set together...' do
@@ -336,6 +343,7 @@
       it { is_expected.to_not contain_class('apache::mod::mime') }
       it { is_expected.to_not contain_class('apache::mod::vhost_alias') }
       it { is_expected.to_not contain_class('apache::mod::wsgi') }
+      it { is_expected.to_not contain_class('apache::mod::passenger') }
       it { is_expected.to_not contain_class('apache::mod::suexec') }
       it { is_expected.to_not contain_class('apache::mod::rewrite') }
       it { is_expected.to contain_class('apache::mod::alias') }
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
new file mode 100644
index 0000000000..df2a86d376
--- /dev/null
+++ b/templates/vhost/_passenger.erb
@@ -0,0 +1,15 @@
+<% if @passenger_app_root -%>
+  PassengerAppRoot <%= @passenger_app_root %>
+<% end -%>
+<% if @passenger_ruby -%>
+  PassengerRuby <%= @passenger_ruby %>
+<% end -%>
+<% if @passenger_min_instances -%>
+  PassengerMinInstances <%= @passenger_min_instances %>
+<% end -%>
+<% if @passenger_start_timeout -%>
+  PassengerStartTimeout <%= @passenger_start_timeout %>
+<% end -%>
+<% if @passenger_pre_start -%>
+  PassengerPreStart <%= @passenger_pre_start %>
+<% end -%>

From f8953f71c0bd838c72aa91be4fbabf7dae148da6 Mon Sep 17 00:00:00 2001
From: Tim Skirvin <tskirvin@killfile.org>
Date: Wed, 15 Oct 2014 13:38:02 -0500
Subject: [PATCH 0385/2267] Turning off SSLv3 by default, re: CVE-2014-3566
 (POODLE SSL vuln.)

---
 README.md                  | 2 +-
 templates/mod/ssl.conf.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 560545b98f..edcef14d15 100644
--- a/README.md
+++ b/README.md
@@ -1781,7 +1781,7 @@ Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/ce
 
 Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'. 
 
-If you do not use this parameter, it uses the HTTPD default from ssl.conf.erb, 'all -SSLv2'.
+If you do not use this parameter, it uses the HTTPD default from ssl.conf.erb, 'all -SSLv2 -SSLv3'.
 
 #####`ssl_cipher`
 
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 24274050c2..35ec92afd9 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -21,7 +21,7 @@
   SSLCryptoDevice builtin
   SSLHonorCipherOrder On
   SSLCipherSuite <%= @ssl_cipher %>
-  SSLProtocol all -SSLv2
+  SSLProtocol all -SSLv2 -SSLv3
 <% if @ssl_options -%>
   SSLOptions <%= @ssl_options.compact.join(' ') %>
 <% end -%>

From a92b8fb4cb840526c8271fb23bee0df7fd3a0a99 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Wed, 15 Oct 2014 16:58:24 +0100
Subject: [PATCH 0386/2267] Add parameter for AddDefaultCharset virtual host
 directive

---
 README.md                     |  4 ++++
 manifests/vhost.pp            | 11 +++++++++++
 spec/defines/vhost_spec.rb    |  5 ++++-
 templates/vhost/_charsets.erb |  4 ++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 templates/vhost/_charsets.erb

diff --git a/README.md b/README.md
index a0c84b9cca..fda2cd9904 100644
--- a/README.md
+++ b/README.md
@@ -882,6 +882,10 @@ Specifies the use of either a LogFormat nickname or a custom format string for t
 
 Specifies that only requests with particular environment variables be logged. Defaults to 'undef'.
 
+#####`add_default_charset`
+
+Sets [AddDefaultCharset](http://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset), a default value for the media charset, which is added to text/plain and text/html responses.
+
 #####`add_listen`
 
 Determines whether the vhost creates a Listen statement. The default value is 'true'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8e5e7a4e69..fd942fe5e1 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -105,6 +105,7 @@
   $passenger_min_instances     = undef,
   $passenger_start_timeout     = undef,
   $passenger_pre_start         = undef,
+  $add_default_charset         = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -800,6 +801,16 @@
     content => template('apache/vhost/_passenger.erb'),
   }
 
+  # Template uses:
+  # - $add_default_charset
+  if $add_default_charset {
+    concat::fragment { "${name}-charsets":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 300,
+      content => template('apache/vhost/_charsets.erb'),
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}-${filename}.conf",
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index a65e48a863..3eac5ffb45 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -238,7 +238,8 @@
           'passenger_ruby'              => '/usr/bin/ruby1.9.1',
           'passenger_min_instances'     => '1',
           'passenger_start_timeout'     => '600',
-          'passenger_pre_start'         => 'http://localhost/myapp'
+          'passenger_pre_start'         => 'http://localhost/myapp',
+          'add_default_charset'         => 'UTF-8',
         }
       end
       let :facts do
@@ -312,6 +313,7 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
     context 'not everything can be set together...' do
@@ -390,6 +392,7 @@
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-custom_fragment') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-fastcgi') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-suexec') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-charsets') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
   end
diff --git a/templates/vhost/_charsets.erb b/templates/vhost/_charsets.erb
new file mode 100644
index 0000000000..ef83def4b9
--- /dev/null
+++ b/templates/vhost/_charsets.erb
@@ -0,0 +1,4 @@
+<% if @add_default_charset -%>
+
+  AddDefaultCharset <%= @add_default_charset %>
+<% end -%>

From 7897f372717114fe82010827b5ac551837e62a24 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Fri, 17 Oct 2014 04:00:27 +0200
Subject: [PATCH 0387/2267] Allow specifying all alias directives in `aliases`

Controlling the order of the Alias, ScriptAlias, AliasMatch and
ScriptAliasMatch directives is important to avoid directives shadowing
each other. Having an `aliases` parameter for Alias and AliasMatch
directives and a `scriptalias` parameter for ScriptAlias and
ScriptAliasMatch directives means all Aliases appear before all
ScriptAliases in the vhost configuration file, which means an Alias
directive can shadow a ScriptAlias directive. This breaks things like
the Nagios web interface.

Instead, extend `aliases` and its template to support hashes with
`scriptalias` and `scriptaliasmatch` keys so that all kinds of alias
directives can be specified in a single list, making it easy to control
their order.

Contains updated documentation and spec and acceptance tests.

The `scriptaliases` parameter still works as before but the
documentation now contains a deprecation notice informing users to use
`aliases` instead.
---
 README.md                     | 25 +++++++++++++++++++------
 spec/acceptance/vhost_spec.rb |  6 +++++-
 templates/vhost/_aliases.erb  |  4 ++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index edcef14d15..fcb3e29603 100644
--- a/README.md
+++ b/README.md
@@ -894,20 +894,31 @@ Specifies paths to additional static, vhost-specific Apache configuration files.
 
 #####`aliases`
 
-Passes a list of hashes to the vhost to create Alias or AliasMatch directives as per the [mod_alias documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
+Passes a list of hashes to the vhost to create Alias, AliasMatch, ScriptAlias or ScriptAliasMatch directives as per the [mod_alias documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
 
 ```puppet
 aliases => [
-  { aliasmatch => '^/image/(.*)\.jpg$', 
-    path       => '/files/jpg.images/$1.jpg',
+  { aliasmatch       => '^/image/(.*)\.jpg$',
+    path             => '/files/jpg.images/$1.jpg',
   }
-  { alias      => '/image',
-    path       => '/ftp/pub/image', 
+  { alias            => '/image',
+    path             => '/ftp/pub/image',
+  },
+  { scriptaliasmatch => '^/cgi-bin(.*)',
+    path             => '/usr/local/share/cgi-bin$1',
+  },
+  { scriptalias      => '/nagios/cgi-bin/',
+    path             => '/usr/lib/nagios/cgi-bin/',
+  },
+  { alias            => '/nagios',
+    path             => '/usr/share/nagios/html',
   },
 ],
 ```
 
-For `alias` and `aliasmatch` to work, each needs a corresponding context, such as '< Directory /path/to/directory>' or '<Location /path/to/directory>'. The Alias and AliasMatch directives are created in the order specified in the `aliases` parameter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html), more specific `alias` or `aliasmatch` parameters should come before the more general ones to avoid shadowing.
+For `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` to work, each needs a corresponding context, such as `<Directory /path/to/directory>` or `<Location /some/location/here>`. The directives are created in the order specified in the `aliases` parameter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html), more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters should come before the more general ones to avoid shadowing.
+
+*Note*: Using the `aliases` parameter is preferred over the `scriptaliases` parameter since here the order of the various alias directives among each other can be controlled precisely. Defining ScriptAliases using the `scriptaliases` parameter means *all* ScriptAlias directives will come after *all* Alias directives, which can lead to Alias directives shadowing ScriptAlias directives. This is often problematic, for example in case of Nagios.
 
 *Note:* If `apache::mod::passenger` is loaded and `PassengerHighPerformance => true` is set, then Alias might have issues honoring the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
@@ -1242,6 +1253,8 @@ Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for exa
 
 #####`scriptaliases`
 
+*Note*: This parameter is deprecated in favour of the `aliases` parameter.
+
 Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
 
 ```puppet
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 9ecf347751..170e5cc959 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -768,7 +768,10 @@ class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
           docroot    => '/tmp',
-          aliases => [{ alias => '/image', path => '/ftp/pub/image' }],
+          aliases => [
+            { alias       => '/image'    , path => '/ftp/pub/image' }   ,
+            { scriptalias => '/myscript' , path => '/usr/share/myscript' }
+          ],
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -777,6 +780,7 @@ class { 'apache': }
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Alias /image "/ftp/pub/image"' }
+      it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
     end
   end
 
diff --git a/templates/vhost/_aliases.erb b/templates/vhost/_aliases.erb
index 5fdd76ba24..f9771bc728 100644
--- a/templates/vhost/_aliases.erb
+++ b/templates/vhost/_aliases.erb
@@ -6,6 +6,10 @@
   Alias <%= alias_statement["alias"] %> "<%= alias_statement["path"] %>"
       <%- elsif alias_statement["aliasmatch"] and alias_statement["aliasmatch"] != '' -%>
   AliasMatch <%= alias_statement["aliasmatch"] %> "<%= alias_statement["path"] %>"
+      <%- elsif alias_statement["scriptalias"] and alias_statement["scriptalias"] != '' -%>
+  ScriptAlias <%= alias_statement["scriptalias"] %> "<%= alias_statement["path"] %>"
+      <%- elsif alias_statement["scriptaliasmatch"] and alias_statement["scriptaliasmatch"] != '' -%>
+  ScriptAliasMatch <%= alias_statement["scriptaliasmatch"] %> "<%= alias_statement["path"] %>"
       <%- end -%>
     <%- end -%>
   <%- end -%>

From 23f22ec8cb8b5ba14f5da2b9143ff1617ee96ea3 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 20 Oct 2014 10:34:06 -0700
Subject: [PATCH 0388/2267] Remove OEL5

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index e8ae293d96..9607d4997a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -27,7 +27,6 @@
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7"
       ]

From be3e526dff2ba67ee150a9e3a9602cc9b7609bbb Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 20 Oct 2014 14:38:54 -0700
Subject: [PATCH 0389/2267] Update loadfile name for Ubuntu 10.04

---
 manifests/mod/dav_svn.pp            | 2 +-
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 36af06fa41..d13a7d886f 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -5,7 +5,7 @@
   include ::apache::mod::dav
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and $::operatingsystemmajrelease != '6' {
+  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04') {
     $loadfile_name = undef
   } else {
     $loadfile_name = 'dav_svn_authz_svn.load'
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 90e0db5636..28cd5705f8 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -5,7 +5,7 @@
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
     service_name        = 'apache2'
-    if fact('operatingsystemmajrelease') == '6'
+    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'

From e3ac319923819f0f176f48e43beecd8770c7bc1b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 21 Oct 2014 15:50:32 -0700
Subject: [PATCH 0390/2267] OEL7 packaging has some issues

This makes mod_dav_svn and mod_fcgid unable to install.
---
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 spec/acceptance/mod_fcgid_spec.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 28cd5705f8..189bb15c42 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::dav_svn class' do
+describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') do
   case fact('osfamily')
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 2511b46ce6..e99a7f299e 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::fcgid class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::fcgid class', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7')) do
   context "default fcgid config", :if => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') do
     it 'succeeds in puppeting fcgid' do
       pp = <<-EOS

From 0e93f27ba9b6850715ca7e5ef285ff8d132c2062 Mon Sep 17 00:00:00 2001
From: Jesse Weisner <jesse@weisner.ca>
Date: Tue, 21 Oct 2014 19:06:30 -0700
Subject: [PATCH 0391/2267] add php_flag, php_value to docs

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index ba805b8cbe..0c612b672a 100644
--- a/README.md
+++ b/README.md
@@ -1105,6 +1105,10 @@ Sets [PassengerStartTimeout](https://www.phusionpassenger.com/documentation/User
 
 Sets [PassengerPreStart](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerPreStart), the URL of the application if pre-starting is required.
 
+#####`php_flags & values`
+
+Allows per-vhost setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Defaults to '[]'.
+
 #####`php_admin_flags & values`
 
 Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '[]'.
@@ -1684,6 +1688,10 @@ Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/
 ```
 
 *Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
+ 
+######`php_value` and `php_flag`
+
+`php_value` sets the value of the directory, and `php_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
 
 ######`php_admin_value` and `php_admin_flag`
 

From 3e50baecdb8a2128907dea8374556f93d99c15d8 Mon Sep 17 00:00:00 2001
From: Jesse Weisner <jesse@weisner.ca>
Date: Tue, 21 Oct 2014 19:15:48 -0700
Subject: [PATCH 0392/2267] duplicate php_admin_{value,flag} for
 php_{value,flag}

---
 manifests/vhost.pp               | 13 +++++++++++++
 templates/vhost/_directories.erb | 11 +++++++++++
 templates/vhost/_php.erb         | 12 ++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 templates/vhost/_php.erb

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index fd942fe5e1..325345857f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -60,6 +60,8 @@
   $suphp_addhandler            = $::apache::params::suphp_addhandler,
   $suphp_engine                = $::apache::params::suphp_engine,
   $suphp_configpath            = $::apache::params::suphp_configpath,
+  $php_flags                   = {},
+  $php_values                  = {},
   $php_admin_flags             = {},
   $php_admin_values            = {},
   $no_proxy_uris               = [],
@@ -708,6 +710,17 @@
     }
   }
 
+  # Template uses:
+  # - $php_values
+  # - $php_flags
+  if ($php_values and ! empty($php_values)) or ($php_flags and ! empty($php_flags)) {
+    concat::fragment { "${name}-php":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 220,
+      content => template('apache/vhost/_php.erb'),
+    }
+  }
+
   # Template uses:
   # - $php_admin_values
   # - $php_admin_flags
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index e756875f29..c27cabb199 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -87,6 +87,17 @@
     <%- if directory['passenger_enabled'] and directory['passenger_enabled'] != '' -%>
     PassengerEnabled <%= directory['passenger_enabled'] %>
     <%- end -%>
+    <%- if directory['php_flags'] and ! directory['php_flags'].empty? -%>
+      <%- directory['php_flags'].each do |flag,value| -%>
+      <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
+    php_flag <%= "#{flag} #{value}" %>
+      <%- end -%>
+    <%- end -%>
+    <%- if directory['php_values'] and ! directory['php_values'].empty? -%>
+      <%- directory['php_values'].each do |key,value| -%>
+    php_value <%= "#{key} #{value}" %>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['php_admin_flags'] and ! directory['php_admin_flags'].empty? -%>
       <%- directory['php_admin_flags'].each do |flag,value| -%>
       <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
diff --git a/templates/vhost/_php.erb b/templates/vhost/_php.erb
new file mode 100644
index 0000000000..369fdb7f92
--- /dev/null
+++ b/templates/vhost/_php.erb
@@ -0,0 +1,12 @@
+<% if @php_values and not @php_values.empty? -%>
+  <%- @php_values.sort.each do |key,value| -%>
+  php_value <%= key %> <%= value %>
+  <%- end -%>
+<% end -%>
+<% if @php_flags and not @php_flags.empty? -%>
+  <%- @php_flags.sort.each do |key,flag| -%>
+    <%-# normalize flag -%>
+    <%- if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
+  php_flag <%= key %> <%= flag %>
+  <%- end -%>
+<% end -%>
\ No newline at end of file

From adb90bf1c243f11f68c571cc2690517312f6ac98 Mon Sep 17 00:00:00 2001
From: Jesse Weisner <jesse@weisner.ca>
Date: Tue, 21 Oct 2014 19:22:06 -0700
Subject: [PATCH 0393/2267] add tests

---
 spec/acceptance/mod_php_spec.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index a0efe7fb86..91eab0f1f7 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -53,7 +53,7 @@ class { 'apache::mod::php': }
     end
   end
 
-  context "custom extensions, php_admin_flag, and php_admin_value" do
+  context "custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value" do
     it 'succeeds in puppeting php' do
       pp= <<-EOS
         class { 'apache':
@@ -65,6 +65,8 @@ class { 'apache::mod::php':
         apache::vhost { 'php.example.com':
           port             => '80',
           docroot          => '/var/www/php',
+          php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
+          php_flags        => { 'display_errors' => 'on', },
           php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
           php_admin_flags  => { 'engine' => 'on', },
         }
@@ -83,6 +85,8 @@ class { 'apache::mod::php':
     end
 
     describe file("#{vhost_dir}/25-php.example.com.conf") do
+      it { is_expected.to contain "  php_flag display_errors on" }
+      it { is_expected.to contain "  php_value include_path .:/usr/share/pear:/usr/bin/php" }
       it { is_expected.to contain "  php_admin_flag engine on" }
       it { is_expected.to contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
     end

From 6b0a8b25509905c1b5011c4aabed887143700800 Mon Sep 17 00:00:00 2001
From: Moritz Kobel <moritz.kobel@itds.ch>
Date: Wed, 22 Oct 2014 16:43:25 +0200
Subject: [PATCH 0394/2267] Add params to proxy_pass to provide ProxyPass
 key=value connection settings

---
 README.md                  | 3 ++-
 templates/vhost/_proxy.erb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ba805b8cbe..28787297e1 100644
--- a/README.md
+++ b/README.md
@@ -1135,7 +1135,7 @@ apache::vhost { 'site.name.fdqn':
   proxy_pass => [
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
-    { 'path' => '/c', 'url' => 'http://backend-a/c' },
+    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => 'max=20 ttl=120 retry=300' },
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
   ],
@@ -1143,6 +1143,7 @@ apache::vhost { 'site.name.fdqn':
 ```
 
 `reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
+`params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
 
 #####`rack_base_uris`
 
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 045c906911..0f21af2ec3 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -7,7 +7,8 @@
   ProxyPreserveHost On
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
-  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
+  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if proxy['params'].nil? == false -%> <%= proxy['params'] %> <%- end -%>
+
   <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>
     ProxyPassReverse <%= proxy['url'] %>

From e02a4d5670c46a8a82eff8dcb32e852aa12bcd0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?=
 <mickael.canevet@camptocamp.com>
Date: Thu, 23 Oct 2014 11:12:42 +0200
Subject: [PATCH 0395/2267] Fix authnz_ldap package name on el7

---
 manifests/params.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index d8922e9fde..90f805af81 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -68,7 +68,10 @@
     # NOTE: The module for Shibboleth is not available to RH/CentOS without an additional repository. http://wiki.aaf.edu.au/tech-info/sp-install-guide
     $mod_packages         = {
       'auth_kerb'   => 'mod_auth_kerb',
-      'authnz_ldap' => 'mod_authz_ldap',
+      'authnz_ldap' => $::apache::version::distrelease ? {
+        '7'     => 'mod_ldap',
+        default => 'mod_authz_ldap',
+      },
       'fastcgi'     => 'mod_fastcgi',
       'fcgid'       => 'mod_fcgid',
       'pagespeed'   => 'mod-pagespeed-stable',

From 332c66c0adffff9583027337f15abf514db560fb Mon Sep 17 00:00:00 2001
From: Moritz Kobel <moritz@tandemblog.ch>
Date: Thu, 23 Oct 2014 13:16:44 +0200
Subject: [PATCH 0396/2267] cleanup condition

---
 templates/vhost/_proxy.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 0f21af2ec3..190239de92 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -7,7 +7,7 @@
   ProxyPreserveHost On
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
-  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if proxy['params'].nil? == false -%> <%= proxy['params'] %> <%- end -%>
+  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if !proxy['params'].nil? -%> <%= proxy['params'] %> <%- end -%>
 
   <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>

From e49b77c68c5cbcb36072d220e3432a5f20b3f35f Mon Sep 17 00:00:00 2001
From: Ben Sandberg <ben@pdxfixit.com>
Date: Thu, 23 Oct 2014 14:06:21 -0700
Subject: [PATCH 0397/2267] passenger concat needs to be wrapped in a check

---
 manifests/vhost.pp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index fd942fe5e1..0841dfff47 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -795,10 +795,12 @@
   # - $passenger_min_instances
   # - $passenger_start_timeout
   # - $passenger_pre_start
-  concat::fragment { "${name}-passenger":
-    target  => "${priority_real}-${filename}.conf",
-    order   => 290,
-    content => template('apache/vhost/_passenger.erb'),
+  if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+    concat::fragment { "${name}-passenger":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 290,
+      content => template('apache/vhost/_passenger.erb'),
+    }
   }
 
   # Template uses:

From dd69adc9827fae3b7294a98c31cc45b44c8fc30b Mon Sep 17 00:00:00 2001
From: Thomas Mueller <mueller@puzzle.ch>
Date: Fri, 24 Oct 2014 14:02:20 +0200
Subject: [PATCH 0398/2267] (MODULES-1457) apache::vhost: SSLCACertificatePath
 can't be unset

The SSLCACertificatePath is always set. The check for @ssl_certs_dir only
covers "undef". As there is a default value in ::apache::params for
ssl_certs_dir it needs to be overriden with an empty string.

Right now the _ssl.erb template outputs 'SSLCACertificatePath ""' for an empty
string, which triggers a failing reload of httpd.

This patch just adds a "&& @ssl_certs_dir != ''" to the condition.

On a Puppet master passenger vhost it's probably  security relevant setting,
as it enables all system CA signed certificates access.

Related patch: https://github.com/puppetlabs/puppetlabs-apache/pull/787
---
 templates/vhost/_ssl.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 70213f48c1..516992558f 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -7,7 +7,7 @@
   <%- if @ssl_chain -%>
   SSLCertificateChainFile "<%= @ssl_chain %>"
   <%- end -%>
-  <%- if @ssl_certs_dir -%>
+  <%- if @ssl_certs_dir && @ssl_certs_dir != '' -%>
   SSLCACertificatePath    "<%= @ssl_certs_dir %>"
   <%- end -%>
   <%- if @ssl_ca -%>

From 95426e5f2bc43ae99205f0d10afbea3e82301b5e Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 15:03:20 -0500
Subject: [PATCH 0399/2267] Updates to mod::fcgid test don't work on RHEL5

---
 spec/acceptance/mod_fcgid_spec.rb | 97 +++++++++++++++----------------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 8e94fa08fa..2511b46ce6 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,62 +1,57 @@
 require 'spec_helper_acceptance'
 
 describe 'apache::mod::fcgid class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    # Not implemented
-  when 'RedHat'
-    context "default fcgid config" do
-      it 'succeeds in puppeting fcgid' do
-        pp = <<-EOS
-          class { 'epel': } # mod_fcgid lives in epel
-          class { 'apache': }
-          class { 'apache::mod::php': } # For /usr/bin/php-cgi
-          class { 'apache::mod::fcgid':
-            options => {
-              'FcgidIPCDir'  => '/var/run/fcgidsock',
+  context "default fcgid config", :if => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') do
+    it 'succeeds in puppeting fcgid' do
+      pp = <<-EOS
+        class { 'epel': } # mod_fcgid lives in epel
+        class { 'apache': }
+        class { 'apache::mod::php': } # For /usr/bin/php-cgi
+        class { 'apache::mod::fcgid':
+          options => {
+            'FcgidIPCDir'  => '/var/run/fcgidsock',
+          },
+        }
+        apache::vhost { 'fcgid.example.com':
+          port        => '80',
+          docroot     => '/var/www/fcgid',
+          directories => {
+            path        => '/var/www/fcgid',
+            options     => '+ExecCGI',
+            addhandlers => {
+              handler    => 'fcgid-script',
+              extensions => '.php',
             },
-          }
-          apache::vhost { 'fcgid.example.com':
-            port        => '80',
-            docroot     => '/var/www/fcgid',
-            directories => {
-              path        => '/var/www/fcgid',
-              options     => '+ExecCGI',
-              addhandlers => {
-                handler    => 'fcgid-script',
-                extensions => '.php',
-              },
-              fcgiwrapper => {
-                command => '/usr/bin/php-cgi',
-                suffix  => '.php',
-              }
-            },
-          }
-          file { '/var/www/fcgid/index.php':
-            ensure  => file,
-            owner   => 'root',
-            group   => 'root',
-            content => "<?php echo 'Hello world'; ?>\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
+            fcgiwrapper => {
+              command => '/usr/bin/php-cgi',
+              suffix  => '.php',
+            }
+          },
+        }
+        file { '/var/www/fcgid/index.php':
+          ensure  => file,
+          owner   => 'root',
+          group   => 'root',
+          content => "<?php echo 'Hello world'; ?>\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
 
-      describe service('httpd') do
-        it { is_expected.to be_enabled }
-        it { is_expected.to be_running }
-      end
+    describe service('httpd') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
 
-      it 'should answer to fcgid.example.com' do
-        shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
-          expect(r.stdout).to match(/^Hello world$/)
-          expect(r.exit_code).to eq(0)
-        end
+    it 'should answer to fcgid.example.com' do
+      shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
+        expect(r.stdout).to match(/^Hello world$/)
+        expect(r.exit_code).to eq(0)
       end
+    end
 
-      it 'should run a php-cgi process' do
-        shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0])
-      end
+    it 'should run a php-cgi process' do
+      shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0])
     end
   end
 end

From ccb07c6a613821756ab784e7204f43e89915ece0 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 15:25:21 -0500
Subject: [PATCH 0400/2267] Fix custom_config check for ubuntu precise.

---
 manifests/custom_config.pp | 2 +-
 manifests/params.pp        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 543ace94e5..cadc2354db 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -5,7 +5,7 @@
   $content        = undef,
   $priority       = '25',
   $source         = undef,
-  $verify_command = '/usr/sbin/apachectl -t',
+  $verify_command = $::apache::params::verify_command,
   $verify_config  = true,
 ) {
 
diff --git a/manifests/params.pp b/manifests/params.pp
index fc9a86e320..d8922e9fde 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -28,6 +28,11 @@
   # The default error log level
   $log_level = 'warn'
 
+  if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
+    $verify_command = '/usr/sbin/apache2ctl -t'
+  } else {
+    $verify_command = '/usr/sbin/apachectl -t'
+  }
   if $::osfamily == 'RedHat' or $::operatingsystem == 'amazon' {
     $user                 = 'apache'
     $group                = 'apache'

From bb849cdec4330dd68b3b85b072bf2cf72d87b6c5 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 16:15:04 -0500
Subject: [PATCH 0401/2267] Fix dav_svn for debian 6

---
 manifests/mod/dav_svn.pp            | 25 ++++++++++++++-----------
 spec/acceptance/mod_dav_svn_spec.rb |  6 +++++-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index c46976e850..36af06fa41 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -1,17 +1,20 @@
 class apache::mod::dav_svn (
   $authz_svn_enabled = false,
 ) {
-    Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
-    include ::apache::mod::dav
-    ::apache::mod { 'dav_svn': }
+  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
+  include ::apache::mod::dav
+  ::apache::mod { 'dav_svn': }
 
-    if $authz_svn_enabled {
-      ::apache::mod { 'authz_svn':
-        loadfile_name => $::osfamily ? {
-          'Debian' => undef,
-          default  => 'dav_svn_authz_svn.load',
-        },
-        require       => Apache::Mod['dav_svn'],
-      }
+  if $::osfamily == 'Debian' and $::operatingsystemmajrelease != '6' {
+    $loadfile_name = undef
+  } else {
+    $loadfile_name = 'dav_svn_authz_svn.load'
+  }
+
+  if $authz_svn_enabled {
+    ::apache::mod { 'authz_svn':
+      loadfile_name => $loadfile_name,
+      require       => Apache::Mod['dav_svn'],
     }
+  }
 }
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 5125ada0b2..90e0db5636 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -5,7 +5,11 @@
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
     service_name        = 'apache2'
-    authz_svn_load_file = 'authz_svn.load'
+    if fact('operatingsystemmajrelease') == '6'
+      authz_svn_load_file = 'dav_svn_authz_svn.load'
+    else
+      authz_svn_load_file = 'authz_svn.load'
+    end
   when 'RedHat'
     mod_dir             = '/etc/httpd/conf.d'
     service_name        = 'httpd'

From 4fe8892df667ee650b9980fb6d0af6203e2b5e20 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 18:10:42 -0500
Subject: [PATCH 0402/2267] Fix vhost and mod_passenger tests on deb7

Also fix broken tests with strict variables.
---
 README.md                             |  2 ++
 spec/acceptance/mod_passenger_spec.rb |  4 +--
 spec/acceptance/vhost_spec.rb         |  3 ++
 spec/classes/mod/dav_svn_spec.rb      | 47 ++++++++++++++-------------
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index ba805b8cbe..28c541d44c 100644
--- a/README.md
+++ b/README.md
@@ -1745,6 +1745,8 @@ Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array
     }
 ```
 
+***Note*** If you include rewrites in your directories make sure you are also including `apache::mod::rewrite`. You may also want to consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
+
 ######`shib_request_setting`
 
 Allows an valid content setting to be set or altered for the application request. This command takes two parameters, the name of the content setting, and the value to set it to.Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index d141322348..9a758a44ee 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -137,7 +137,7 @@ class { 'apache::mod::passenger': }
       end
 
       it 'should output status via passenger-memory-stats' do
-        shell("sudo /usr/sbin/passenger-memory-stats") do |r|
+        shell("/usr/sbin/passenger-memory-stats") do |r|
           expect(r.stdout).to match(/Apache processes/)
           expect(r.stdout).to match(/Nginx processes/)
           expect(r.stdout).to match(/Passenger processes/)
@@ -262,7 +262,7 @@ class { 'apache::mod::passenger':
           end
 
           it 'should output status via passenger-memory-stats' do
-            shell("sudo /usr/bin/passenger-memory-stats", :pty => true) do |r|
+            shell("/usr/bin/passenger-memory-stats", :pty => true) do |r|
               expect(r.stdout).to match(/Apache processes/)
               expect(r.stdout).to match(/Nginx processes/)
               expect(r.stdout).to match(/Passenger processes/)
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 08c717fc9c..d45eaee9fa 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -991,6 +991,9 @@ class { 'apache': }
       pp = <<-EOS
         class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
+        if ! defined(Class['apache::mod::rewrite']) {
+          include ::apache::mod::rewrite
+        }
         apache::vhost { 'test.server':
           docroot      => '/tmp',
           directories  => [
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 859174af77..95abef9948 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -7,14 +7,15 @@
   context "on a Debian OS" do
     let :facts do
       {
-        :lsbdistcodename        => 'squeeze',
-        :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',
+        :osfamily                  => 'Debian',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'Debian',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -24,13 +25,14 @@
   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',
+        :osfamily                  => 'RedHat',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'RedHat',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -40,13 +42,14 @@
   context "on a FreeBSD OS" do
     let :facts do
       {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :osfamily                  => 'FreeBSD',
+        :operatingsystemrelease    => '9',
+        :operatingsystemmajrelease => '9',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'FreeBSD',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { is_expected.to contain_class("apache::params") }

From 1be599daf1aa1da5e591a506f7fb43f2e21ea36b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 30 Sep 2014 14:41:14 -0500
Subject: [PATCH 0403/2267] Need fcgid to load after unixd on RHEL7

---
 manifests/mod/fcgid.pp         | 10 ++++-
 spec/classes/mod/fcgid_spec.rb | 71 +++++++++++++++++++++++-----------
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 70997768bc..70761e41d7 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,7 +1,15 @@
 class apache::mod::fcgid(
   $options = {},
 ) {
-  ::apache::mod { 'fcgid': }
+  if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
+    $loadfile_name = 'unixd_fcgid.load'
+  } else {
+    $loadfile_name = undef
+  }
+
+  ::apache::mod { 'fcgid':
+    loadfile_name => $loadfile_name
+  }
 
   # Template uses:
   # - $options
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index ab47a5a8e3..a342e58135 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -8,14 +8,15 @@
   context "on a Debian OS" do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :osfamily                  => 'Debian',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :lsbdistcodename           => 'squeeze',
+        :operatingsystem           => 'Debian',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -26,13 +27,14 @@
   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',
+        :osfamily                  => 'RedHat',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'RedHat',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 
@@ -66,16 +68,41 @@
     end
   end
 
+  context "on RHEL7" do
+    let :facts do
+      {
+        :osfamily                  => 'RedHat',
+        :operatingsystemrelease    => '7',
+        :operatingsystemmajrelease => '7',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'RedHat',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+
+    describe 'without parameters' do
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('fcgid').with({
+        'loadfile_name' => 'unixd_fcgid.load'
+      })
+      }
+      it { is_expected.to contain_package("mod_fcgid") }
+    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',
+        :osfamily                  => 'FreeBSD',
+        :operatingsystemrelease    => '9',
+        :operatingsystemmajrelease => '9',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'FreeBSD',
+        :id                        => 'root',
+        :kernel                    => 'FreeBSD',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 

From 56f884f00e93298adf15058e1b7ad4475b448669 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 20 Oct 2014 10:34:06 -0700
Subject: [PATCH 0404/2267] Remove OEL5

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index f84ff41b8a..3063ccf649 100644
--- a/metadata.json
+++ b/metadata.json
@@ -27,7 +27,6 @@
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7"
       ]

From 9d4bb7c9351fc88923983f67675b266726a45445 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 20 Oct 2014 14:38:54 -0700
Subject: [PATCH 0405/2267] Update loadfile name for Ubuntu 10.04

---
 manifests/mod/dav_svn.pp            | 2 +-
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 36af06fa41..d13a7d886f 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -5,7 +5,7 @@
   include ::apache::mod::dav
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and $::operatingsystemmajrelease != '6' {
+  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04') {
     $loadfile_name = undef
   } else {
     $loadfile_name = 'dav_svn_authz_svn.load'
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 90e0db5636..28cd5705f8 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -5,7 +5,7 @@
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
     service_name        = 'apache2'
-    if fact('operatingsystemmajrelease') == '6'
+    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'

From 1f9aaad9ff55451cf2b18bdfaaf25f9bce39c364 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 21 Oct 2014 15:50:32 -0700
Subject: [PATCH 0406/2267] OEL7 packaging has some issues

This makes mod_dav_svn and mod_fcgid unable to install.
---
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 spec/acceptance/mod_fcgid_spec.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 28cd5705f8..189bb15c42 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::dav_svn class' do
+describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') do
   case fact('osfamily')
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 2511b46ce6..e99a7f299e 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::fcgid class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::fcgid class', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7')) do
   context "default fcgid config", :if => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') do
     it 'succeeds in puppeting fcgid' do
       pp = <<-EOS

From 88c6a98a5cfd33a7ba75a15ad6b09621b71768a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Wed, 22 Oct 2014 12:15:04 +0200
Subject: [PATCH 0407/2267] allow disabling default vhosts under 2.4

when disabling the default vhost(s) under 2.4, there's nothing to
include in $sites-enabled/, which causes the following error:

    The apache2 configtest failed.
    Output of config test was:
    apache2: Syntax error on line 46 of /etc/apache2/apache2.conf: No
    matches for the wildcard '*' in '/etc/apache2/sites-enabled', failing
    (use IncludeOptional if required)
    Action 'configtest' failed.
    The Apache error log may have more information.

by using IncludeOptional (as recommended), we allow the use of httpd as
simple web server, with single purpose configuration, without having to
define a (default) vhost.
---
 templates/httpd.conf.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 68d6b50ae2..e1075e38c9 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -70,7 +70,11 @@ IncludeOptional "<%= @confd_dir %>/*.conf"
 Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+IncludeOptional "<%= @vhost_load_dir %>/*"
+<%- else -%>
 Include "<%= @vhost_load_dir %>/*"
+<%- end -%>
 <% end -%>
 
 <% if @error_documents -%>

From 8f2df799b242321c750372c5baa6eb83222bfde5 Mon Sep 17 00:00:00 2001
From: Jeff Tickle <ticklejw@appstate.edu>
Date: Thu, 16 Oct 2014 14:00:55 -0400
Subject: [PATCH 0408/2267] Added ssl_protocol parameter to apache::mod::ssl

makes it easier to fix things like POODLE
---
 README.md                  | 1 +
 manifests/mod/ssl.pp       | 1 +
 templates/mod/ssl.conf.erb | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1418696bf2..a4ab395c91 100644
--- a/README.md
+++ b/README.md
@@ -710,6 +710,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
     class { 'apache::mod::ssl':
       ssl_compression => false,
       ssl_options     => [ 'StdEnvVars' ],
+      ssl_protocol    => 'all -SSLv2 -SSLv3',
   }
 ```
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 7e115fb661..293e9319cc 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -2,6 +2,7 @@
   $ssl_compression = false,
   $ssl_options     = [ 'StdEnvVars' ],
   $ssl_cipher      = 'HIGH:MEDIUM:!aNULL:!MD5',
+  $ssl_protocol    = [ 'all', '-SSLv2', '-SSLv3' ],
   $apache_version  = $::apache::apache_version,
   $package_name    = undef,
 ) {
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 35ec92afd9..e92e37e7a9 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -21,7 +21,7 @@
   SSLCryptoDevice builtin
   SSLHonorCipherOrder On
   SSLCipherSuite <%= @ssl_cipher %>
-  SSLProtocol all -SSLv2 -SSLv3
+  SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
 <% if @ssl_options -%>
   SSLOptions <%= @ssl_options.compact.join(' ') %>
 <% end -%>

From 2799c4e405caff93571d05bd86bf062f3b795ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 28 Oct 2014 15:14:26 +0100
Subject: [PATCH 0409/2267] fix ssl_protocol docs to be in line with code

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4ab395c91..02932ff34e 100644
--- a/README.md
+++ b/README.md
@@ -710,7 +710,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
     class { 'apache::mod::ssl':
       ssl_compression => false,
       ssl_options     => [ 'StdEnvVars' ],
-      ssl_protocol    => 'all -SSLv2 -SSLv3',
+      ssl_protocol    => [ 'all', '-SSLv2', '-SSLv3'],
   }
 ```
 

From 360239c8dc5fc3eded26d27cb2cc5fa932193874 Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@frib.msu.edu>
Date: Fri, 6 Jun 2014 22:23:19 -0400
Subject: [PATCH 0410/2267] Support parameters along with proxy_pass

---
 README.md                  | 4 +++-
 templates/vhost/_proxy.erb | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1418696bf2..22c7f0fb9c 100644
--- a/README.md
+++ b/README.md
@@ -1127,7 +1127,7 @@ Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/
 
 #####`proxy_pass`
 
-Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
+Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters can be added as an array.
 
 ```puppet
 apache::vhost { 'site.name.fdqn':
@@ -1138,6 +1138,8 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => 'max=20 ttl=120 retry=300' },
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
+    { 'path' => '/d', 'url' => 'http://backend-a/d',
+      'params' => ['retry=0', 'timeout=5'] },
   ],
 }
 ```
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 190239de92..8477157956 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -8,7 +8,6 @@
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if !proxy['params'].nil? -%> <%= proxy['params'] %> <%- end -%>
-
   <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>
     ProxyPassReverse <%= proxy['url'] %>

From 934f2d4884b945f53150e5e6d488f1256ad8dc77 Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@frib.msu.edu>
Date: Mon, 18 Aug 2014 14:27:27 -0400
Subject: [PATCH 0411/2267] Support keywords along with proxy_pass, use hash
 for params

---
 README.md                  | 4 +++-
 templates/vhost/_proxy.erb | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 22c7f0fb9c..d31ae362f5 100644
--- a/README.md
+++ b/README.md
@@ -1139,7 +1139,9 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
     { 'path' => '/d', 'url' => 'http://backend-a/d',
-      'params' => ['retry=0', 'timeout=5'] },
+      'params' => { 'retry' => '0', 'timeout' => '5' }, },
+    { 'path' => '/e', 'url' => 'http://backend-a/e',
+      'keywords' => ['nocanon', 'interpolate'] },
   ],
 }
 ```
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 8477157956..dd25e2c87a 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -7,7 +7,13 @@
   ProxyPreserveHost On
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
-  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if !proxy['params'].nil? -%> <%= proxy['params'] %> <%- end -%>
+  ProxyPass <%= proxy['path'] %> <%= proxy['url'] -%>
+  <%- if proxy['params'] -%>
+    <%- proxy['params'].each_pair do |key, value| -%> <%= key %>=<%= value -%>
+    <%- end -%>
+  <%- end -%>
+  <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
+  <%- end %>
   <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>
     ProxyPassReverse <%= proxy['url'] %>

From 4c54a52c17e346e0c487e293c7727cb131aaca06 Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@frib.msu.edu>
Date: Mon, 18 Aug 2014 17:22:40 -0400
Subject: [PATCH 0412/2267] Add some tests for ProxyPass parameters

---
 tests/vhost_proxypass.pp | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 tests/vhost_proxypass.pp

diff --git a/tests/vhost_proxypass.pp b/tests/vhost_proxypass.pp
new file mode 100644
index 0000000000..968de41959
--- /dev/null
+++ b/tests/vhost_proxypass.pp
@@ -0,0 +1,60 @@
+## vhost with proxyPass directive
+# NB: Please see the other vhost_*.pp example files for further
+# examples.
+
+# Base class. Declares default vhost on port 80 and default ssl
+# vhost on port 443 listening on all interfaces and serving
+# $apache::docroot
+class { 'apache': }
+
+# Most basic vhost with proxy_pass
+apache::vhost { 'first.example.com':
+  port        => 80,
+  docroot     => '/var/www/first',
+  proxy_pass  => [
+    {
+      'path'   => '/first',
+      'url'    => "http://localhost:8080/first"
+    },
+  ],
+}
+
+# vhost with proxy_pass and parameters
+apache::vhost { 'second.example.com':
+  port        => 80,
+  docroot     => '/var/www/second',
+  proxy_pass  => [
+    {
+      'path'   => '/second',
+      'url'    => "http://localhost:8080/second",
+      'params' => {'retry' => '0', 'timeout' => '5'}
+    },
+  ],
+}
+
+# vhost with proxy_pass and keywords
+apache::vhost { 'third.example.com':
+  port        => 80,
+  docroot     => '/var/www/third',
+  proxy_pass  => [
+    {
+      'path'   => '/third',
+      'url'    => "http://localhost:8080/third",
+      'keywords' => ['noquery', 'interpolate']
+    },
+  ],
+}
+
+# vhost with proxy_pass, parameters and keywords
+apache::vhost { 'fourth.example.com':
+  port        => 80,
+  docroot     => '/var/www/fourth',
+  proxy_pass  => [
+    {
+      'path'   => '/fourth',
+      'url'    => "http://localhost:8080/fourth",
+      'params' => {'retry' => '0', 'timeout' => '5'},
+      'keywords' => ['noquery', 'interpolate']
+    },
+  ],
+}
\ No newline at end of file

From 0edb041427f4b6019db48d776b351833558552d6 Mon Sep 17 00:00:00 2001
From: Tim Hartmann <tfhartmann@gmail.com>
Date: Thu, 23 Oct 2014 15:50:15 -0400
Subject: [PATCH 0413/2267] Linting and adding some tests

Adding tests
---
 spec/defines/vhost_spec.rb | 16 +++++++++---
 tests/vhost_proxypass.pp   | 50 +++++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3eac5ffb45..84a95bf44d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -172,8 +172,13 @@
           'proxy_dest'                  => '/',
           'proxy_pass'                  => [
             {
-              'path' => '/a',
-              'url'  => 'http://backend-a/'
+              'path'     => '/a',
+              'url'      => 'http://backend-a/',
+              'keywords' => ['noquery', 'interpolate'],
+              'params'   => {
+                      'retry'   => '0',
+                      'timeout' => '5'
+              }
             }
           ],
           'suphp_addhandler'            => 'foo',
@@ -296,7 +301,12 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /retry=0/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /timeout=5/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /noquery interpolate/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
diff --git a/tests/vhost_proxypass.pp b/tests/vhost_proxypass.pp
index 968de41959..e911f85f9d 100644
--- a/tests/vhost_proxypass.pp
+++ b/tests/vhost_proxypass.pp
@@ -9,37 +9,40 @@
 
 # Most basic vhost with proxy_pass
 apache::vhost { 'first.example.com':
-  port        => 80,
-  docroot     => '/var/www/first',
-  proxy_pass  => [
+  port       => 80,
+  docroot    => '/var/www/first',
+  proxy_pass => [
     {
-      'path'   => '/first',
-      'url'    => "http://localhost:8080/first"
+      'path' => '/first',
+      'url'  => 'http://localhost:8080/first'
     },
   ],
 }
 
 # vhost with proxy_pass and parameters
 apache::vhost { 'second.example.com':
-  port        => 80,
-  docroot     => '/var/www/second',
-  proxy_pass  => [
+  port       => 80,
+  docroot    => '/var/www/second',
+  proxy_pass => [
     {
       'path'   => '/second',
-      'url'    => "http://localhost:8080/second",
-      'params' => {'retry' => '0', 'timeout' => '5'}
+      'url'    => 'http://localhost:8080/second',
+      'params' => {
+        'retry'   => '0',
+        'timeout' => '5'
+        }
     },
   ],
 }
 
 # vhost with proxy_pass and keywords
 apache::vhost { 'third.example.com':
-  port        => 80,
-  docroot     => '/var/www/third',
-  proxy_pass  => [
+  port       => 80,
+  docroot    => '/var/www/third',
+  proxy_pass => [
     {
-      'path'   => '/third',
-      'url'    => "http://localhost:8080/third",
+      'path'     => '/third',
+      'url'      => 'http://localhost:8080/third',
       'keywords' => ['noquery', 'interpolate']
     },
   ],
@@ -47,14 +50,17 @@
 
 # vhost with proxy_pass, parameters and keywords
 apache::vhost { 'fourth.example.com':
-  port        => 80,
-  docroot     => '/var/www/fourth',
-  proxy_pass  => [
+  port       => 80,
+  docroot    => '/var/www/fourth',
+  proxy_pass => [
     {
-      'path'   => '/fourth',
-      'url'    => "http://localhost:8080/fourth",
-      'params' => {'retry' => '0', 'timeout' => '5'},
+      'path'     => '/fourth',
+      'url'      => 'http://localhost:8080/fourth',
+      'params'   => {
+        'retry'   => '0',
+        'timeout' => '5'
+        },
       'keywords' => ['noquery', 'interpolate']
     },
   ],
-}
\ No newline at end of file
+}

From 040546da0e13f62a86be3a0a73b78299b63734ce Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 28 Oct 2014 12:21:55 -0400
Subject: [PATCH 0414/2267] Satisfy doesn't work with apache 2.4

The ability to use the more complex Require* syntax for apache 2.4
will be added eventually, but Satisfy shouldn't be tested as that is
deprecated in apache.
---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index d45eaee9fa..966f85cf5e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -298,7 +298,7 @@ class { 'apache': }
       end
     end
 
-    describe 'Satisfy and Auth directive' do
+    describe 'Satisfy and Auth directive', :unless => $apache_version == '2.4' do
       it 'should configure a vhost with Satisfy and Auth directive' do
         pp = <<-EOS
           class { 'apache': }

From c44e513dd69f459f81a49bfa0874a7ec556294ff Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 28 Oct 2014 16:49:15 -0400
Subject: [PATCH 0415/2267] wsgi_chunked_request doesn't work on lucid

---
 spec/acceptance/vhost_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 966f85cf5e..483b74945c 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1082,7 +1082,6 @@ class { 'apache::mod::wsgi': }
           wsgi_process_group          => 'nobody',
           wsgi_script_aliases         => { '/test' => '/test1' },
           wsgi_pass_authorization     => 'On',
-          wsgi_chunked_request        => 'On',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)

From b85460162d319af89cf4ab17a64aec325c604d79 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 29 Oct 2014 10:34:20 -0400
Subject: [PATCH 0416/2267] Update metadata

Fix PE compatibility, update issues URL, and fix requirements to match
output from PMT.
---
 metadata.json | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/metadata.json b/metadata.json
index 3063ccf649..f2266960f4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -6,7 +6,7 @@
   "license": "Apache 2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-apache.git",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
-  "issues_url": "https://github.com/puppetlabs/puppetlabs-apache/issues",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -58,7 +58,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.2.0 < 3.4.0"
+      "version_requirement": "3.x"
     },
     {
       "name": "puppet",
@@ -67,13 +67,7 @@
   ],
   "description": "Module for Apache configuration",
   "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 2.4.0"
-    },
-    {
-      "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.1.1"
-    }
+    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0"},
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1"}
   ]
 }

From be2bfab1f98cd86d7048d84f6abea17206d59c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Wed, 22 Oct 2014 12:02:59 +0200
Subject: [PATCH 0417/2267] MODULES-1446: mod_version is now builtin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

while we are not loading it (by default), we should make it easier for
people transitioning their configuration from 2.2 to 2.4 to find issues:
thus adding a warning when someone tries to load mod_version.

---

things i have learned during this pr:

× @hunner: There is no '&&' in puppet; only 'and'*

× add puppet to PATH, so vim can check syntax. thanks @mhaskel
especially for the patience.

*zuhl.
---
 README.md                 | 10 ++++++++++
 manifests/default_mods.pp |  8 ++++----
 manifests/mod/version.pp  |  8 ++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 manifests/mod/version.pp

diff --git a/README.md b/README.md
index 02932ff34e..3b71c5baac 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@
         * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
         * [Class: apache::mod::deflate](#class-apachemoddeflate)
         * [Class: apache::mod::reqtimeout](#class-apachemodreqtimeout)
+        * [Class: apache::mod::version](#class-apachemodversion)
         * [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)
@@ -823,6 +824,15 @@ mod_reqtimeout configuration.
   }
 ```
 
+####Class: `apache::mod::reqtimeout`
+
+This wrapper around mod_version warns on Debian and Ubuntu systems with Apache httpd 2.4
+about loading mod_version, as on these platforms it's already built-in.
+
+```puppet
+  include '::apache::mod::version'
+```
+
 #####`timeouts`
 
 A string or an array that sets the `RequestReadTimeout` option. Defaults to
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 7e8381f031..71759030b5 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -36,10 +36,11 @@
         include ::apache::mod::cache
         include ::apache::mod::mime
         include ::apache::mod::mime_magic
-        include ::apache::mod::vhost_alias
-        include ::apache::mod::suexec
         include ::apache::mod::rewrite
         include ::apache::mod::speling
+        include ::apache::mod::suexec
+        include ::apache::mod::version
+        include ::apache::mod::vhost_alias
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
         ::apache::mod { 'authn_dbm': }
@@ -51,7 +52,6 @@
         ::apache::mod { 'logio': }
         ::apache::mod { 'substitute': }
         ::apache::mod { 'usertrack': }
-        ::apache::mod { 'version': }
 
         if versioncmp($apache_version, '2.4') >= 0 {
           ::apache::mod { 'authn_core': }
@@ -71,6 +71,7 @@
         include ::apache::mod::reqtimeout
         include ::apache::mod::rewrite
         include ::apache::mod::userdir
+        include ::apache::mod::version
         include ::apache::mod::vhost_alias
         include ::apache::mod::speling
 
@@ -93,7 +94,6 @@
         ::apache::mod { 'logio': }
         ::apache::mod { 'unique_id': }
         ::apache::mod { 'usertrack': }
-        ::apache::mod { 'version': }
       }
       default: {}
     }
diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
new file mode 100644
index 0000000000..c0e405686a
--- /dev/null
+++ b/manifests/mod/version.pp
@@ -0,0 +1,8 @@
+class apache::mod::version {
+
+  if ($::osfamily == 'debian' and versioncmp($apache_version, '2.4') >= 0) {
+    warning("${module_name}: module version_module is built-in and can't be loaded")
+  } else {
+    ::apache::mod { 'version': }
+  }
+}

From e20f70750d72dd61abf354b113ebc3c030f7521c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 29 Oct 2014 15:37:22 -0400
Subject: [PATCH 0418/2267] Relying on missing fact

Ubuntu 10.04 with PE3.3 is missing the operatingsystemmajrelease fact,
so check either operatingsystemmajrelease or operatingsystemrelease.
---
 manifests/mod/dav_svn.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index d13a7d886f..6e70598d0a 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -5,7 +5,7 @@
   include ::apache::mod::dav
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04') {
+  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04') {
     $loadfile_name = undef
   } else {
     $loadfile_name = 'dav_svn_authz_svn.load'

From 61789fa9d8f84757c42cc9e8ed91154d834dd108 Mon Sep 17 00:00:00 2001
From: Steffen Zieger <me@saz.sh>
Date: Thu, 30 Oct 2014 15:45:37 +0100
Subject: [PATCH 0419/2267] Fixes indentation of versioncmp

---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 7e8381f031..fef78d6388 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -120,7 +120,7 @@
     ::apache::mod { 'auth_basic': }
     ::apache::mod { 'authn_file': }
 
-      if versioncmp($apache_version, '2.4') >= 0 {
+    if versioncmp($apache_version, '2.4') >= 0 {
       # authz_core is needed for 'Require' directive
       ::apache::mod { 'authz_core':
         id => 'authz_core_module',

From 4002f9bffde12f67f60f839b3d23779f201ff84f Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 30 Oct 2014 11:27:41 -0700
Subject: [PATCH 0420/2267] Update the test to match the fix from yesterday

---
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 189bb15c42..7e5afed520 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -5,7 +5,7 @@
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
     service_name        = 'apache2'
-    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04'
+    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'

From e72fd7021cb63f90746e2cccc952d98f539526eb Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <shoentjen@antagonist.nl>
Date: Wed, 5 Nov 2014 11:49:32 +0100
Subject: [PATCH 0421/2267] add sort to LogFormats to ensure consistency
 between runs

---
 templates/httpd.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index e1075e38c9..54d24c8ae3 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -59,7 +59,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 <% if @log_formats and !@log_formats.empty? -%>
-  <%- @log_formats.each do |nickname,format| -%>
+  <%- @log_formats.sort.each do |nickname,format| -%>
 LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>

From 3111c0dcd1920342cb2dcae3732573e91424e219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
Date: Mon, 18 Aug 2014 18:38:26 +0200
Subject: [PATCH 0422/2267] Add support for specifying the docroot option for
 RHEL SCL httpd24

The pattern of defining these variables in the init.pp goes back into 2012.
However, it's much better to use the params.pp pattern for this purpose, and
it's also required to make this work with the RHEL's Software Collections.
Without this patch, the Apache::Vhost['default'] is instantiated (regardless
whether it's with ensure => absent or present) and bails out due to /var/www
being missing on asystem which has never had RHEL6's regular httpd package
installed.
---
 manifests/init.pp   | 4 +---
 manifests/params.pp | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index b5e9204570..32966b86f7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -59,6 +59,7 @@
   $log_level              = $::apache::params::log_level,
   $log_formats            = {},
   $ports_file             = $::apache::params::ports_file,
+  $docroot                = $::apache::params::docroot,
   $apache_version         = $::apache::version::default,
   $server_tokens          = 'OS',
   $server_signature       = 'On',
@@ -239,7 +240,6 @@
   if $::apache::conf_dir and $::apache::params::conf_file {
     case $::osfamily {
       'debian': {
-        $docroot              = '/var/www'
         $pidfile              = "\${APACHE_PID_FILE}"
         $error_log            = 'error.log'
         $error_documents_path = '/usr/share/apache2/error'
@@ -247,7 +247,6 @@
         $access_log_file      = 'access.log'
       }
       'redhat': {
-        $docroot              = '/var/www/html'
         $pidfile              = 'run/httpd.pid'
         $error_log            = 'error_log'
         $error_documents_path = '/var/www/error'
@@ -255,7 +254,6 @@
         $access_log_file      = 'access_log'
       }
       'freebsd': {
-        $docroot              = '/usr/local/www/apache22/data'
         $pidfile              = '/var/run/httpd.pid'
         $error_log            = 'httpd-error.log'
         $error_documents_path = '/usr/local/www/apache22/error'
diff --git a/manifests/params.pp b/manifests/params.pp
index d8922e9fde..6b6f38891a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -100,6 +100,7 @@
     $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
+    $docroot              = '/var/www/html'
     if $::osfamily == "RedHat" {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
@@ -160,6 +161,7 @@
     $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
+    $docroot              = '/var/www'
 
     #
     # Passenger-specific settings
@@ -270,6 +272,7 @@
     $mime_support_package = 'misc/mime-support'
     $mime_types_config    = '/usr/local/etc/mime.types'
     $wsgi_socket_prefix   = undef
+    $docroot              = '/usr/local/www/apache22/data'
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }

From e4aadd546e8e9dff8027ef467776a3353729ce15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 30 Sep 2014 15:43:19 +0200
Subject: [PATCH 0423/2267] add documentation for `docroot` (in init)

and apparently strip a lot of trailing white-space. thanks lighttable
let's see what this breaks...
---
 README.md | 146 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 76 insertions(+), 70 deletions(-)

diff --git a/README.md b/README.md
index a1846b5261..b98749b584 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Apache is a widely-used web server, and this module provides a simplified way of
 * Apache modules
 * virtual hosts
 * listened-to ports
-* `/etc/make.conf` on FreeBSD 
+* `/etc/make.conf` on FreeBSD
 
 ###Beginning with Apache
 
@@ -182,9 +182,9 @@ To set up a virtual host with WSGI
       docroot                     => '/var/www/pythonapp',
       wsgi_application_group      => '%{GLOBAL}',
       wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options => { 
-        processes    => '2', 
-        threads      => '15', 
+      wsgi_daemon_process_options => {
+        processes    => '2',
+        threads      => '15',
         display-name => '%{GROUP}',
        },
       wsgi_import_script          => '/var/www/demo.wsgi',
@@ -253,7 +253,7 @@ Generates default set of include-able Apache configuration files under  `${apach
 
 #####`default_mods`
 
-Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names. 
+Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names.
 
 Defaults to 'true', which includes the default [HTTPD mods](https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp).
 
@@ -310,6 +310,10 @@ SSL vhosts only respond to HTTPS queries.
 
 Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
 
+#####`docroot`
+
+Changes the location of the default [Documentroot](https://httpd.apache.org/docs/current/mod/core.html#documentroot). Defaults to '/var/www/html' on RedHat, '/var/www' on Debian, and '/usr/local/www/apache22/data' on FreeBSD.
+
 #####`error_documents`
 
 Enables custom error documents. Defaults to 'false'.
@@ -375,9 +379,9 @@ Determines which MPM is loaded and configured for the HTTPD process. Valid value
 * `apache::mod::itk`
 * `apache::mod::peruser`
 * `apache::mod::prefork`
-* `apache::mod::worker` 
+* `apache::mod::worker`
 
-*Note:* Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `$mpm_module` you must uninstall all packages that depend on your currently-installed Apache. 
+*Note:* Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `$mpm_module` you must uninstall all packages that depend on your currently-installed Apache.
 
 #####`package_ensure`
 
@@ -566,7 +570,7 @@ The modules mentioned above, and other Apache modules that have templates, cause
 
 ####Class: `apache::mod::info`
 
-Installs and manages mod_info which provides a comprehensive overview of the server configuration. 
+Installs and manages mod_info which provides a comprehensive overview of the server configuration.
 
 Full documentation for mod_info is available from [Apache](http://httpd.apache.org/docs/2.2/mod/mod_info.html).
 
@@ -681,7 +685,7 @@ Overriding the default configuartion:
   }
 ```
 
-or 
+or
 ```puppet
   class {'::apache::mod::php':
     template => 'apache/php.conf.erb',
@@ -719,7 +723,7 @@ To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` par
 
 ####Class: `apache::mod::wsgi`
 
-Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`. 
+Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`.
 
 For customized parameters, which tell Apache how Python is currently configured on the operating system,
 
@@ -963,7 +967,9 @@ Sets the list of resources to look for when a client requests an index of the di
 
 #####`docroot`
 
-Provides the [DocumentRoot](http://httpd.apache.org/docs/current/mod/core.html#documentroot) directive, which identifies the directory Apache serves files from. Required. 
+Provides the
+[DocumentRoot](http://httpd.apache.org/docs/current/mod/core.html#documentroot)
+directive, which identifies the directory Apache serves files from. Required.
 
 #####`docroot_group`
 
@@ -1142,7 +1148,7 @@ Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/do
 
 ```puppet
 apache::vhost { 'site.name.fdqn':
-  … 
+  …
   proxy_pass => [
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
@@ -1220,7 +1226,7 @@ Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mo
 
 #####`rewrites`
 
-Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'. 
+Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'.
 
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
@@ -1281,7 +1287,7 @@ Multiple rewrites and conditions are also possible
           rewrite_base => /apps/,
           rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
         },
-     ], 
+     ],
     }
 ```
 
@@ -1342,7 +1348,7 @@ Used by HTTPD to conditionally set environment variables for vhosts. Defaults to
 
 #####`suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
 
-Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG). 
+Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
 
 `suphp_addhandler` defaults to 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian.
 
@@ -1369,9 +1375,9 @@ To set up a virtual host with suPHP
 
 Enables name-based virtual hosting. If no IP is passed to the virtual host, but the vhost is assigned a port, then the vhost name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name is set to the title of the resource. Defaults to '*'.
 
-#####`virtual_docroot` 
+#####`virtual_docroot`
 
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'. 
+Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'.
 
 ```puppet
     apache::vhost { 'subdomain.loc':
@@ -1407,8 +1413,8 @@ To set up a virtual host with WSGI
       docroot                     => '/var/www/pythonapp',
       wsgi_daemon_process         => 'wsgi',
       wsgi_daemon_process_options =>
-        { processes    => '2', 
-          threads      => '15', 
+        { processes    => '2',
+          threads      => '15',
           display-name => '%{GROUP}',
          },
       wsgi_process_group          => 'wsgi',
@@ -1431,9 +1437,9 @@ General `directories` usage looks something like
     apache::vhost { 'files.example.net':
       docroot     => '/var/www/files',
       directories => [
-        { 'path'     => '/var/www/files', 
-          'provider' => 'files', 
-          'deny'     => 'from all' 
+        { 'path'     => '/var/www/files',
+          'provider' => 'files',
+          'deny'     => 'from all'
          },
       ],
     }
@@ -1454,15 +1460,15 @@ Any handlers you do not set in these hashes are considered 'undefined' within Pu
 
 ######`addhandlers`
 
-Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`. 
+Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`.
 
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
+      directories => [
         { path        => '/path/to/directory',
           addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
-        }, 
+        },
       ],
     }
 ```
@@ -1474,10 +1480,10 @@ Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow)
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path  => '/path/to/directory', 
-          allow => 'from example.org', 
-        }, 
+      directories => [
+        { path  => '/path/to/directory',
+          allow => 'from example.org',
+        },
       ],
     }
 ```
@@ -1489,10 +1495,10 @@ Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot      => '/path/to/directory',
-      directories  => [ 
-        { path           => '/path/to/directory', 
-          allow_override => ['AuthConfig', 'Indexes'], 
-        }, 
+      directories  => [
+        { path           => '/path/to/directory',
+          allow_override => ['AuthConfig', 'Indexes'],
+        },
       ],
     }
 ```
@@ -1559,7 +1565,7 @@ Pass a string of custom configuration directives to be placed at the end of the
 
 ```puppet
   apache::vhost { 'monitor':
-    … 
+    …
     custom_fragment => '
   <Location /balancer-manager>
     SetHandler balancer-manager
@@ -1582,24 +1588,24 @@ Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) dir
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path => '/path/to/directory', 
-          deny => 'from example.org', 
-        }, 
+      directories => [
+        { path => '/path/to/directory',
+          deny => 'from example.org',
+        },
       ],
     }
 ```
 
 ######`error_documents`
 
-An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory. 
+An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
 
 ```puppet
     apache::vhost { 'sample.example.net':
-      directories => [ 
+      directories => [
         { path            => '/srv/www',
           error_documents => [
-            { 'error_code' => '503', 
+            { 'error_code' => '503',
               'document'   => '/service-unavail',
             },
           ],
@@ -1629,9 +1635,9 @@ Allows configuration settings for [directory indexing](http://httpd.apache.org/d
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path          => '/path/to/directory', 
-          options       => ['Indexes','FollowSymLinks','MultiViews'], 
+      directories => [
+        { path          => '/path/to/directory',
+          options       => ['Indexes','FollowSymLinks','MultiViews'],
           index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
         },
       ],
@@ -1645,11 +1651,11 @@ Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoind
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path                => '/path/to/directory', 
-          order               => 'Allow,Deny', 
+      directories => [
+        { path                => '/path/to/directory',
+          order               => 'Allow,Deny',
           index_order_default => ['Descending', 'Date'],
-        }, 
+        },
       ],
     }
 ```
@@ -1661,9 +1667,9 @@ Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options)
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path    => '/path/to/directory', 
-          options => ['Indexes','FollowSymLinks','MultiViews'], 
+      directories => [
+        { path    => '/path/to/directory',
+          options => ['Indexes','FollowSymLinks','MultiViews'],
         },
       ],
     }
@@ -1676,9 +1682,9 @@ Sets the order of processing Allow and Deny statements as per [Apache core docum
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path  => '/path/to/directory', 
-          order => 'Allow,Deny', 
+      directories => [
+        { path  => '/path/to/directory',
+          order => 'Allow,Deny',
         },
       ],
     }
@@ -1791,10 +1797,10 @@ String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl
     apache::vhost { 'secure.example.net':
       docroot     => '/path/to/directory',
       directories => [
-        { path        => '/path/to/directory', 
-          ssl_options => '+ExportCertData', 
+        { path        => '/path/to/directory',
+          ssl_options => '+ExportCertData',
         },
-        { path        => '/path/to/different/dir', 
+        { path        => '/path/to/different/dir',
           ssl_options => [ '-StdEnvVars', '+ExportCertData'],
         },
       ],
@@ -1809,10 +1815,10 @@ A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://w
     apache::vhost { 'secure.example.net':
       docroot     => '/path/to/directory',
       directories => [
-        { path  => '/path/to/directory', 
-          suphp => 
-            { user  =>  'myappuser', 
-              group => 'myappgroup', 
+        { path  => '/path/to/directory',
+          suphp =>
+            { user  =>  'myappuser',
+              group => 'myappgroup',
             },
         },
       ],
@@ -1825,7 +1831,7 @@ All of the SSL parameters for `::vhost` default to whatever is set in the base `
 
 #####`ssl`
 
-Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'. 
+Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'.
 
 #####`ssl_ca`
 
@@ -1837,7 +1843,7 @@ Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/ce
 
 #####`ssl_protocol`
 
-Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'. 
+Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'.
 
 If you do not use this parameter, it uses the HTTPD default from ssl.conf.erb, 'all -SSLv2 -SSLv3'.
 
@@ -1899,7 +1905,7 @@ Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#
 
 #####`ssl_options`
 
-Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'. 
+Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'.
 
 A string:
 
@@ -2148,7 +2154,7 @@ If you want to add two name-based vhosts so that they answer on either 10.0.0.10
 
 ####Defined Type: `apache::balancer`
 
-`apache::balancer` creates an Apache balancer cluster. Each balancer cluster needs one or more balancer members, which are declared with [`apache::balancermember`](#defined-type-apachebalancermember). 
+`apache::balancer` creates an Apache balancer cluster. Each balancer cluster needs one or more balancer members, which are declared with [`apache::balancermember`](#defined-type-apachebalancermember).
 
 One `apache::balancer` defined resource should be defined for each Apache load balanced set of servers. The `apache::balancermember` resources for all balancer members can be exported and collected on a single Apache load balancer server using exported resources.
 
@@ -2164,7 +2170,7 @@ Configures key-value pairs as [ProxySet](http://httpd.apache.org/docs/current/mo
 
 #####`collect_exported`
 
-Determines whether or not to use exported resources. Valid values 'true' and 'false', defaults to 'true'. 
+Determines whether or not to use exported resources. Valid values 'true' and 'false', defaults to 'true'.
 
 If you statically declare all of your backend servers, you should set this to 'false' to rely on existing declared balancer member resources. Also make sure to use `apache::balancermember` with array arguments.
 
@@ -2242,7 +2248,7 @@ If you need to use ProxySet in the balancer config
 * [`apache`](#class-apache): Guides the basic setup of Apache.
 * `apache::dev`: Installs Apache development libraries. (*Note:* On FreeBSD, you must declare `apache::package` or `apache` before `apache::dev`.)
 * [`apache::mod::[name]`](#classes-apachemodname): Enables specific Apache HTTPD modules.
- 
+
 ####Private Classes
 
 * `apache::confd::no_accf`: Creates the no-accf.conf configuration file in conf.d, required by FreeBSD's Apache 2.4.
@@ -2261,7 +2267,7 @@ If you need to use ProxySet in the balancer config
 * `apache::listen`: Based on the title, controls which ports Apache binds to for listening. Adds [Listen](http://httpd.apache.org/docs/current/bind.html) directives to ports.conf in the Apache HTTPD configuration directory. Titles take the form '<port>', '<ipv4>:<port>', or '<ipv6>:<port>'.
 * `apache::mod`: Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class.
 * `apache::namevirtualhost`: Enables name-based hosting of a virtual host. Adds all [NameVirtualHost](http://httpd.apache.org/docs/current/vhosts/name-based.html) directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles take the form '\*', '*:<port>', '\_default_:<port>, '<ip>', or '<ip>:<port>'.
-* `apache::vhost`: Allows specialized configurations for virtual hosts that have requirements outside the defaults. 
+* `apache::vhost`: Allows specialized configurations for virtual hosts that have requirements outside the defaults.
 
 ####Private Defined Types
 
@@ -2280,7 +2286,7 @@ The `apache::vhost::WSGIImportScript` parameter creates a statement inside the V
 
 ###RHEL/CentOS 5
 
-The `apache::mod::passenger` and `apache::mod::proxy_html` classes are untested since repositories are missing compatible packages.   
+The `apache::mod::passenger` and `apache::mod::proxy_html` classes are untested since repositories are missing compatible packages.
 
 ###RHEL/CentOS 7
 
@@ -2288,7 +2294,7 @@ The `apache::mod::passenger` class is untested as the repository does not have p
 
 ###General
 
-This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet. 
+This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet.
 
 The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions can occur.
 

From 38d797025c5f76871ad844d6fa57a4aff7b2572e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 30 Sep 2014 16:42:57 +0200
Subject: [PATCH 0424/2267] add spec test for (default) docroot directory

, which is now a parameter to init.pp
---
 spec/classes/apache_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index dc5d6b46a1..c1ecf80cc3 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -23,6 +23,10 @@
     it { is_expected.to contain_user("www-data") }
     it { is_expected.to contain_group("www-data") }
     it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/var/www").with(
+      'ensure'  => 'directory',
+      )
+    }
     it { is_expected.to contain_file("/etc/apache2/sites-enabled").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
@@ -225,6 +229,10 @@
     it { is_expected.to contain_user("apache") }
     it { is_expected.to contain_group("apache") }
     it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/var/www/html").with(
+      'ensure'  => 'directory',
+      )
+    }
     it { is_expected.to contain_file("/etc/httpd/conf.d").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
@@ -498,6 +506,10 @@
     it { is_expected.to contain_user("www") }
     it { is_expected.to contain_group("www") }
     it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/usr/local/www/apache22/data").with(
+      'ensure'  => 'directory',
+      )
+    }
     it { is_expected.to contain_file("/usr/local/etc/apache22/Vhosts").with(
       'ensure'  => 'directory',
       'recurse' => 'true',

From a65f3f74108d36604553dc400dce781000a4bf91 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 7 Nov 2014 11:37:33 -0800
Subject: [PATCH 0425/2267] Fix unit test failures with ruby 1.8.7

rspec with 1.8.7 seems to be having issues with trailing commas and
unescaped '{' or '}' within the %r{} block.
---
 spec/classes/apache_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index c1ecf80cc3..fe61a9796b 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -24,7 +24,7 @@
     it { is_expected.to contain_group("www-data") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/var/www").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/etc/apache2/sites-enabled").with(
@@ -168,7 +168,7 @@
         end
 
         it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" vhost_combined\n} }
       end
     end
 
@@ -230,7 +230,7 @@
     it { is_expected.to contain_group("apache") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/var/www/html").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/etc/httpd/conf.d").with(
@@ -507,7 +507,7 @@
     it { is_expected.to contain_group("www") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/usr/local/www/apache22/data").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/usr/local/etc/apache22/Vhosts").with(

From d25883ac591f67bbfca3ec69d6637cc36998dcb4 Mon Sep 17 00:00:00 2001
From: Pi3r <pradermecker@yahoo.ca>
Date: Sun, 7 Sep 2014 22:05:19 +0200
Subject: [PATCH 0426/2267] Clean-up hash lookup and avoid local undef var

---
 manifests/mod.pp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 4ffde61b18..88cdcd6a5b 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -18,11 +18,10 @@
 
   # Determine if we have special lib
   $mod_libs = $::apache::params::mod_libs
-  $mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
   if $lib {
     $_lib = $lib
-  } elsif $mod_lib {
-    $_lib = $mod_lib
+  } elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack
+    $_lib = $mod_libs[$mod]
   } else {
     $_lib = "mod_${mod}.so"
   }
@@ -48,11 +47,10 @@
 
   # Determine if we have a package
   $mod_packages = $::apache::params::mod_packages
-  $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
   if $package {
     $_package = $package
-  } elsif $mod_package {
-    $_package = $mod_package
+  } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
+    $_package = $mod_packages[$mod]
   } else {
     $_package = undef
   }

From 304d66c3ae98066faa9aadfe762aa32eb993d628 Mon Sep 17 00:00:00 2001
From: Moritz Kobel <moritz.kobel@itds.ch>
Date: Wed, 22 Oct 2014 16:43:25 +0200
Subject: [PATCH 0427/2267] Add params to proxy_pass to provide ProxyPass
 key=value connection settings

---
 README.md                  | 3 ++-
 templates/vhost/_proxy.erb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 28c541d44c..1418696bf2 100644
--- a/README.md
+++ b/README.md
@@ -1135,7 +1135,7 @@ apache::vhost { 'site.name.fdqn':
   proxy_pass => [
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
-    { 'path' => '/c', 'url' => 'http://backend-a/c' },
+    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => 'max=20 ttl=120 retry=300' },
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
   ],
@@ -1143,6 +1143,7 @@ apache::vhost { 'site.name.fdqn':
 ```
 
 `reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
+`params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
 
 #####`rack_base_uris`
 
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 045c906911..0f21af2ec3 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -7,7 +7,8 @@
   ProxyPreserveHost On
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
-  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
+  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if proxy['params'].nil? == false -%> <%= proxy['params'] %> <%- end -%>
+
   <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>
     ProxyPassReverse <%= proxy['url'] %>

From b4e5213ad1014f0c6a65c90bfd52965385c28ed4 Mon Sep 17 00:00:00 2001
From: Moritz Kobel <moritz@tandemblog.ch>
Date: Thu, 23 Oct 2014 13:16:44 +0200
Subject: [PATCH 0428/2267] cleanup condition

---
 templates/vhost/_proxy.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 0f21af2ec3..190239de92 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -7,7 +7,7 @@
   ProxyPreserveHost On
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
-  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if proxy['params'].nil? == false -%> <%= proxy['params'] %> <%- end -%>
+  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if !proxy['params'].nil? -%> <%= proxy['params'] %> <%- end -%>
 
   <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>

From 7b9ad0dbc2570855962ada4e04f9f4f26005400e Mon Sep 17 00:00:00 2001
From: Ben Sandberg <ben@pdxfixit.com>
Date: Thu, 23 Oct 2014 14:06:21 -0700
Subject: [PATCH 0429/2267] passenger concat needs to be wrapped in a check

---
 manifests/vhost.pp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index fd942fe5e1..0841dfff47 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -795,10 +795,12 @@
   # - $passenger_min_instances
   # - $passenger_start_timeout
   # - $passenger_pre_start
-  concat::fragment { "${name}-passenger":
-    target  => "${priority_real}-${filename}.conf",
-    order   => 290,
-    content => template('apache/vhost/_passenger.erb'),
+  if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+    concat::fragment { "${name}-passenger":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 290,
+      content => template('apache/vhost/_passenger.erb'),
+    }
   }
 
   # Template uses:

From 760a3444814f34a902d838a9837e9f8c595f42c5 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <mueller@puzzle.ch>
Date: Fri, 24 Oct 2014 14:02:20 +0200
Subject: [PATCH 0430/2267] (MODULES-1457) apache::vhost: SSLCACertificatePath
 can't be unset

The SSLCACertificatePath is always set. The check for @ssl_certs_dir only
covers "undef". As there is a default value in ::apache::params for
ssl_certs_dir it needs to be overriden with an empty string.

Right now the _ssl.erb template outputs 'SSLCACertificatePath ""' for an empty
string, which triggers a failing reload of httpd.

This patch just adds a "&& @ssl_certs_dir != ''" to the condition.

On a Puppet master passenger vhost it's probably  security relevant setting,
as it enables all system CA signed certificates access.

Related patch: https://github.com/puppetlabs/puppetlabs-apache/pull/787
---
 templates/vhost/_ssl.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 70213f48c1..516992558f 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -7,7 +7,7 @@
   <%- if @ssl_chain -%>
   SSLCertificateChainFile "<%= @ssl_chain %>"
   <%- end -%>
-  <%- if @ssl_certs_dir -%>
+  <%- if @ssl_certs_dir && @ssl_certs_dir != '' -%>
   SSLCACertificatePath    "<%= @ssl_certs_dir %>"
   <%- end -%>
   <%- if @ssl_ca -%>

From e440b809f1151f3baf7a8d6fbf9f62372cc385d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Wed, 22 Oct 2014 12:15:04 +0200
Subject: [PATCH 0431/2267] allow disabling default vhosts under 2.4

when disabling the default vhost(s) under 2.4, there's nothing to
include in $sites-enabled/, which causes the following error:

    The apache2 configtest failed.
    Output of config test was:
    apache2: Syntax error on line 46 of /etc/apache2/apache2.conf: No
    matches for the wildcard '*' in '/etc/apache2/sites-enabled', failing
    (use IncludeOptional if required)
    Action 'configtest' failed.
    The Apache error log may have more information.

by using IncludeOptional (as recommended), we allow the use of httpd as
simple web server, with single purpose configuration, without having to
define a (default) vhost.
---
 templates/httpd.conf.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 68d6b50ae2..e1075e38c9 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -70,7 +70,11 @@ IncludeOptional "<%= @confd_dir %>/*.conf"
 Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+IncludeOptional "<%= @vhost_load_dir %>/*"
+<%- else -%>
 Include "<%= @vhost_load_dir %>/*"
+<%- end -%>
 <% end -%>
 
 <% if @error_documents -%>

From bd4ad7b2c80ae7f52f508a4bf732698a0238a5a6 Mon Sep 17 00:00:00 2001
From: Jeff Tickle <ticklejw@appstate.edu>
Date: Thu, 16 Oct 2014 14:00:55 -0400
Subject: [PATCH 0432/2267] Added ssl_protocol parameter to apache::mod::ssl

makes it easier to fix things like POODLE
---
 README.md                  | 1 +
 manifests/mod/ssl.pp       | 1 +
 templates/mod/ssl.conf.erb | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1418696bf2..a4ab395c91 100644
--- a/README.md
+++ b/README.md
@@ -710,6 +710,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
     class { 'apache::mod::ssl':
       ssl_compression => false,
       ssl_options     => [ 'StdEnvVars' ],
+      ssl_protocol    => 'all -SSLv2 -SSLv3',
   }
 ```
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 7e115fb661..293e9319cc 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -2,6 +2,7 @@
   $ssl_compression = false,
   $ssl_options     = [ 'StdEnvVars' ],
   $ssl_cipher      = 'HIGH:MEDIUM:!aNULL:!MD5',
+  $ssl_protocol    = [ 'all', '-SSLv2', '-SSLv3' ],
   $apache_version  = $::apache::apache_version,
   $package_name    = undef,
 ) {
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 35ec92afd9..e92e37e7a9 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -21,7 +21,7 @@
   SSLCryptoDevice builtin
   SSLHonorCipherOrder On
   SSLCipherSuite <%= @ssl_cipher %>
-  SSLProtocol all -SSLv2 -SSLv3
+  SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
 <% if @ssl_options -%>
   SSLOptions <%= @ssl_options.compact.join(' ') %>
 <% end -%>

From 6cbc3d04506b75c2834a10f2755948804fde1d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 28 Oct 2014 15:14:26 +0100
Subject: [PATCH 0433/2267] fix ssl_protocol docs to be in line with code

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4ab395c91..02932ff34e 100644
--- a/README.md
+++ b/README.md
@@ -710,7 +710,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
     class { 'apache::mod::ssl':
       ssl_compression => false,
       ssl_options     => [ 'StdEnvVars' ],
-      ssl_protocol    => 'all -SSLv2 -SSLv3',
+      ssl_protocol    => [ 'all', '-SSLv2', '-SSLv3'],
   }
 ```
 

From f27d4f87302144426d85c8b92913a97d839d7dd4 Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@frib.msu.edu>
Date: Fri, 6 Jun 2014 22:23:19 -0400
Subject: [PATCH 0434/2267] Support parameters along with proxy_pass

---
 README.md                  | 4 +++-
 templates/vhost/_proxy.erb | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 02932ff34e..a2f2a4e569 100644
--- a/README.md
+++ b/README.md
@@ -1128,7 +1128,7 @@ Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/
 
 #####`proxy_pass`
 
-Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
+Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters can be added as an array.
 
 ```puppet
 apache::vhost { 'site.name.fdqn':
@@ -1139,6 +1139,8 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => 'max=20 ttl=120 retry=300' },
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
+    { 'path' => '/d', 'url' => 'http://backend-a/d',
+      'params' => ['retry=0', 'timeout=5'] },
   ],
 }
 ```
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 190239de92..8477157956 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -8,7 +8,6 @@
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if !proxy['params'].nil? -%> <%= proxy['params'] %> <%- end -%>
-
   <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>
     ProxyPassReverse <%= proxy['url'] %>

From 63ed0d31e2b9adddf6bae57f984bf007fc404db8 Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@frib.msu.edu>
Date: Mon, 18 Aug 2014 14:27:27 -0400
Subject: [PATCH 0435/2267] Support keywords along with proxy_pass, use hash
 for params

---
 README.md                  | 4 +++-
 templates/vhost/_proxy.erb | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a2f2a4e569..0e24abfd8d 100644
--- a/README.md
+++ b/README.md
@@ -1140,7 +1140,9 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
     { 'path' => '/d', 'url' => 'http://backend-a/d',
-      'params' => ['retry=0', 'timeout=5'] },
+      'params' => { 'retry' => '0', 'timeout' => '5' }, },
+    { 'path' => '/e', 'url' => 'http://backend-a/e',
+      'keywords' => ['nocanon', 'interpolate'] },
   ],
 }
 ```
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 8477157956..dd25e2c87a 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -7,7 +7,13 @@
   ProxyPreserveHost On
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
-  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>   <%- if !proxy['params'].nil? -%> <%= proxy['params'] %> <%- end -%>
+  ProxyPass <%= proxy['path'] %> <%= proxy['url'] -%>
+  <%- if proxy['params'] -%>
+    <%- proxy['params'].each_pair do |key, value| -%> <%= key %>=<%= value -%>
+    <%- end -%>
+  <%- end -%>
+  <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
+  <%- end %>
   <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>
     ProxyPassReverse <%= proxy['url'] %>

From 92c6c9a1d7e1ef45e8068e9e2ed627b80070a05a Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@frib.msu.edu>
Date: Mon, 18 Aug 2014 17:22:40 -0400
Subject: [PATCH 0436/2267] Add some tests for ProxyPass parameters

---
 tests/vhost_proxypass.pp | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 tests/vhost_proxypass.pp

diff --git a/tests/vhost_proxypass.pp b/tests/vhost_proxypass.pp
new file mode 100644
index 0000000000..968de41959
--- /dev/null
+++ b/tests/vhost_proxypass.pp
@@ -0,0 +1,60 @@
+## vhost with proxyPass directive
+# NB: Please see the other vhost_*.pp example files for further
+# examples.
+
+# Base class. Declares default vhost on port 80 and default ssl
+# vhost on port 443 listening on all interfaces and serving
+# $apache::docroot
+class { 'apache': }
+
+# Most basic vhost with proxy_pass
+apache::vhost { 'first.example.com':
+  port        => 80,
+  docroot     => '/var/www/first',
+  proxy_pass  => [
+    {
+      'path'   => '/first',
+      'url'    => "http://localhost:8080/first"
+    },
+  ],
+}
+
+# vhost with proxy_pass and parameters
+apache::vhost { 'second.example.com':
+  port        => 80,
+  docroot     => '/var/www/second',
+  proxy_pass  => [
+    {
+      'path'   => '/second',
+      'url'    => "http://localhost:8080/second",
+      'params' => {'retry' => '0', 'timeout' => '5'}
+    },
+  ],
+}
+
+# vhost with proxy_pass and keywords
+apache::vhost { 'third.example.com':
+  port        => 80,
+  docroot     => '/var/www/third',
+  proxy_pass  => [
+    {
+      'path'   => '/third',
+      'url'    => "http://localhost:8080/third",
+      'keywords' => ['noquery', 'interpolate']
+    },
+  ],
+}
+
+# vhost with proxy_pass, parameters and keywords
+apache::vhost { 'fourth.example.com':
+  port        => 80,
+  docroot     => '/var/www/fourth',
+  proxy_pass  => [
+    {
+      'path'   => '/fourth',
+      'url'    => "http://localhost:8080/fourth",
+      'params' => {'retry' => '0', 'timeout' => '5'},
+      'keywords' => ['noquery', 'interpolate']
+    },
+  ],
+}
\ No newline at end of file

From b1b7689a7f0d15ab490873b4b68b754ae4f6e7c6 Mon Sep 17 00:00:00 2001
From: Tim Hartmann <tfhartmann@gmail.com>
Date: Thu, 23 Oct 2014 15:50:15 -0400
Subject: [PATCH 0437/2267] Linting and adding some tests

Adding tests
---
 spec/defines/vhost_spec.rb | 16 +++++++++---
 tests/vhost_proxypass.pp   | 50 +++++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3eac5ffb45..84a95bf44d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -172,8 +172,13 @@
           'proxy_dest'                  => '/',
           'proxy_pass'                  => [
             {
-              'path' => '/a',
-              'url'  => 'http://backend-a/'
+              'path'     => '/a',
+              'url'      => 'http://backend-a/',
+              'keywords' => ['noquery', 'interpolate'],
+              'params'   => {
+                      'retry'   => '0',
+                      'timeout' => '5'
+              }
             }
           ],
           'suphp_addhandler'            => 'foo',
@@ -296,7 +301,12 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /retry=0/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /timeout=5/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /noquery interpolate/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
diff --git a/tests/vhost_proxypass.pp b/tests/vhost_proxypass.pp
index 968de41959..e911f85f9d 100644
--- a/tests/vhost_proxypass.pp
+++ b/tests/vhost_proxypass.pp
@@ -9,37 +9,40 @@
 
 # Most basic vhost with proxy_pass
 apache::vhost { 'first.example.com':
-  port        => 80,
-  docroot     => '/var/www/first',
-  proxy_pass  => [
+  port       => 80,
+  docroot    => '/var/www/first',
+  proxy_pass => [
     {
-      'path'   => '/first',
-      'url'    => "http://localhost:8080/first"
+      'path' => '/first',
+      'url'  => 'http://localhost:8080/first'
     },
   ],
 }
 
 # vhost with proxy_pass and parameters
 apache::vhost { 'second.example.com':
-  port        => 80,
-  docroot     => '/var/www/second',
-  proxy_pass  => [
+  port       => 80,
+  docroot    => '/var/www/second',
+  proxy_pass => [
     {
       'path'   => '/second',
-      'url'    => "http://localhost:8080/second",
-      'params' => {'retry' => '0', 'timeout' => '5'}
+      'url'    => 'http://localhost:8080/second',
+      'params' => {
+        'retry'   => '0',
+        'timeout' => '5'
+        }
     },
   ],
 }
 
 # vhost with proxy_pass and keywords
 apache::vhost { 'third.example.com':
-  port        => 80,
-  docroot     => '/var/www/third',
-  proxy_pass  => [
+  port       => 80,
+  docroot    => '/var/www/third',
+  proxy_pass => [
     {
-      'path'   => '/third',
-      'url'    => "http://localhost:8080/third",
+      'path'     => '/third',
+      'url'      => 'http://localhost:8080/third',
       'keywords' => ['noquery', 'interpolate']
     },
   ],
@@ -47,14 +50,17 @@
 
 # vhost with proxy_pass, parameters and keywords
 apache::vhost { 'fourth.example.com':
-  port        => 80,
-  docroot     => '/var/www/fourth',
-  proxy_pass  => [
+  port       => 80,
+  docroot    => '/var/www/fourth',
+  proxy_pass => [
     {
-      'path'   => '/fourth',
-      'url'    => "http://localhost:8080/fourth",
-      'params' => {'retry' => '0', 'timeout' => '5'},
+      'path'     => '/fourth',
+      'url'      => 'http://localhost:8080/fourth',
+      'params'   => {
+        'retry'   => '0',
+        'timeout' => '5'
+        },
       'keywords' => ['noquery', 'interpolate']
     },
   ],
-}
\ No newline at end of file
+}

From 379f7a5d7643f52e5ae37c24ea7bc3f3645ee8eb Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 28 Oct 2014 12:21:55 -0400
Subject: [PATCH 0438/2267] Satisfy doesn't work with apache 2.4

The ability to use the more complex Require* syntax for apache 2.4
will be added eventually, but Satisfy shouldn't be tested as that is
deprecated in apache.
---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index d45eaee9fa..966f85cf5e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -298,7 +298,7 @@ class { 'apache': }
       end
     end
 
-    describe 'Satisfy and Auth directive' do
+    describe 'Satisfy and Auth directive', :unless => $apache_version == '2.4' do
       it 'should configure a vhost with Satisfy and Auth directive' do
         pp = <<-EOS
           class { 'apache': }

From dcd805152f5e666b3dfd486ddc65ae2f72e88bc8 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 28 Oct 2014 16:49:15 -0400
Subject: [PATCH 0439/2267] wsgi_chunked_request doesn't work on lucid

---
 spec/acceptance/vhost_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 966f85cf5e..483b74945c 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1082,7 +1082,6 @@ class { 'apache::mod::wsgi': }
           wsgi_process_group          => 'nobody',
           wsgi_script_aliases         => { '/test' => '/test1' },
           wsgi_pass_authorization     => 'On',
-          wsgi_chunked_request        => 'On',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)

From dda1b8020e5d523fe2d3dc4a43f90fac972ce7f7 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 29 Oct 2014 10:34:20 -0400
Subject: [PATCH 0440/2267] Update metadata

Fix PE compatibility, update issues URL, and fix requirements to match
output from PMT.
---
 metadata.json | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/metadata.json b/metadata.json
index 79344a839c..f6361a10e0 100644
--- a/metadata.json
+++ b/metadata.json
@@ -6,7 +6,7 @@
   "license": "Apache 2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-apache.git",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
-  "issues_url": "https://github.com/puppetlabs/puppetlabs-apache/issues",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -67,13 +67,7 @@
   ],
   "description": "Module for Apache configuration",
   "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 2.4.0"
-    },
-    {
-      "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.1.1"
-    }
+    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0"},
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1"}
   ]
 }

From 1f531b342da4f92e34041e605615905afeb0d7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Wed, 22 Oct 2014 12:02:59 +0200
Subject: [PATCH 0441/2267] MODULES-1446: mod_version is now builtin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

while we are not loading it (by default), we should make it easier for
people transitioning their configuration from 2.2 to 2.4 to find issues:
thus adding a warning when someone tries to load mod_version.

---

things i have learned during this pr:

× @hunner: There is no '&&' in puppet; only 'and'*

× add puppet to PATH, so vim can check syntax. thanks @mhaskel
especially for the patience.

*zuhl.
---
 README.md                 | 10 ++++++++++
 manifests/default_mods.pp |  8 ++++----
 manifests/mod/version.pp  |  8 ++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 manifests/mod/version.pp

diff --git a/README.md b/README.md
index 0e24abfd8d..a1846b5261 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@
         * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
         * [Class: apache::mod::deflate](#class-apachemoddeflate)
         * [Class: apache::mod::reqtimeout](#class-apachemodreqtimeout)
+        * [Class: apache::mod::version](#class-apachemodversion)
         * [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)
@@ -823,6 +824,15 @@ mod_reqtimeout configuration.
   }
 ```
 
+####Class: `apache::mod::reqtimeout`
+
+This wrapper around mod_version warns on Debian and Ubuntu systems with Apache httpd 2.4
+about loading mod_version, as on these platforms it's already built-in.
+
+```puppet
+  include '::apache::mod::version'
+```
+
 #####`timeouts`
 
 A string or an array that sets the `RequestReadTimeout` option. Defaults to
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 7e8381f031..71759030b5 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -36,10 +36,11 @@
         include ::apache::mod::cache
         include ::apache::mod::mime
         include ::apache::mod::mime_magic
-        include ::apache::mod::vhost_alias
-        include ::apache::mod::suexec
         include ::apache::mod::rewrite
         include ::apache::mod::speling
+        include ::apache::mod::suexec
+        include ::apache::mod::version
+        include ::apache::mod::vhost_alias
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
         ::apache::mod { 'authn_dbm': }
@@ -51,7 +52,6 @@
         ::apache::mod { 'logio': }
         ::apache::mod { 'substitute': }
         ::apache::mod { 'usertrack': }
-        ::apache::mod { 'version': }
 
         if versioncmp($apache_version, '2.4') >= 0 {
           ::apache::mod { 'authn_core': }
@@ -71,6 +71,7 @@
         include ::apache::mod::reqtimeout
         include ::apache::mod::rewrite
         include ::apache::mod::userdir
+        include ::apache::mod::version
         include ::apache::mod::vhost_alias
         include ::apache::mod::speling
 
@@ -93,7 +94,6 @@
         ::apache::mod { 'logio': }
         ::apache::mod { 'unique_id': }
         ::apache::mod { 'usertrack': }
-        ::apache::mod { 'version': }
       }
       default: {}
     }
diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
new file mode 100644
index 0000000000..c0e405686a
--- /dev/null
+++ b/manifests/mod/version.pp
@@ -0,0 +1,8 @@
+class apache::mod::version {
+
+  if ($::osfamily == 'debian' and versioncmp($apache_version, '2.4') >= 0) {
+    warning("${module_name}: module version_module is built-in and can't be loaded")
+  } else {
+    ::apache::mod { 'version': }
+  }
+}

From 4e86abe59446aac4b1621ebc3f1d77fafc2a9762 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 29 Oct 2014 15:37:22 -0400
Subject: [PATCH 0442/2267] Relying on missing fact

Ubuntu 10.04 with PE3.3 is missing the operatingsystemmajrelease fact,
so check either operatingsystemmajrelease or operatingsystemrelease.
---
 manifests/mod/dav_svn.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index d13a7d886f..6e70598d0a 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -5,7 +5,7 @@
   include ::apache::mod::dav
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04') {
+  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04') {
     $loadfile_name = undef
   } else {
     $loadfile_name = 'dav_svn_authz_svn.load'

From 6790eec742f07c2f9150e36d54e71936d03738b7 Mon Sep 17 00:00:00 2001
From: Steffen Zieger <me@saz.sh>
Date: Thu, 30 Oct 2014 15:45:37 +0100
Subject: [PATCH 0443/2267] Fixes indentation of versioncmp

---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 71759030b5..09e360a49e 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -120,7 +120,7 @@
     ::apache::mod { 'auth_basic': }
     ::apache::mod { 'authn_file': }
 
-      if versioncmp($apache_version, '2.4') >= 0 {
+    if versioncmp($apache_version, '2.4') >= 0 {
       # authz_core is needed for 'Require' directive
       ::apache::mod { 'authz_core':
         id => 'authz_core_module',

From 1823dc2fcdfcddeea127a7cc5be055247966c8f8 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 30 Oct 2014 11:27:41 -0700
Subject: [PATCH 0444/2267] Update the test to match the fix from yesterday

---
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 189bb15c42..7e5afed520 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -5,7 +5,7 @@
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
     service_name        = 'apache2'
-    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04'
+    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'

From 692fabc5d5c7bb4626fe96b7db4020b25ea6e94b Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <shoentjen@antagonist.nl>
Date: Wed, 5 Nov 2014 11:49:32 +0100
Subject: [PATCH 0445/2267] add sort to LogFormats to ensure consistency
 between runs

---
 templates/httpd.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index e1075e38c9..54d24c8ae3 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -59,7 +59,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 <% if @log_formats and !@log_formats.empty? -%>
-  <%- @log_formats.each do |nickname,format| -%>
+  <%- @log_formats.sort.each do |nickname,format| -%>
 LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>

From c5a9ec2a61343c007a542b405e264112982709f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
Date: Mon, 18 Aug 2014 18:38:26 +0200
Subject: [PATCH 0446/2267] Add support for specifying the docroot option for
 RHEL SCL httpd24

The pattern of defining these variables in the init.pp goes back into 2012.
However, it's much better to use the params.pp pattern for this purpose, and
it's also required to make this work with the RHEL's Software Collections.
Without this patch, the Apache::Vhost['default'] is instantiated (regardless
whether it's with ensure => absent or present) and bails out due to /var/www
being missing on asystem which has never had RHEL6's regular httpd package
installed.
---
 manifests/init.pp   | 4 +---
 manifests/params.pp | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index b5e9204570..32966b86f7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -59,6 +59,7 @@
   $log_level              = $::apache::params::log_level,
   $log_formats            = {},
   $ports_file             = $::apache::params::ports_file,
+  $docroot                = $::apache::params::docroot,
   $apache_version         = $::apache::version::default,
   $server_tokens          = 'OS',
   $server_signature       = 'On',
@@ -239,7 +240,6 @@
   if $::apache::conf_dir and $::apache::params::conf_file {
     case $::osfamily {
       'debian': {
-        $docroot              = '/var/www'
         $pidfile              = "\${APACHE_PID_FILE}"
         $error_log            = 'error.log'
         $error_documents_path = '/usr/share/apache2/error'
@@ -247,7 +247,6 @@
         $access_log_file      = 'access.log'
       }
       'redhat': {
-        $docroot              = '/var/www/html'
         $pidfile              = 'run/httpd.pid'
         $error_log            = 'error_log'
         $error_documents_path = '/var/www/error'
@@ -255,7 +254,6 @@
         $access_log_file      = 'access_log'
       }
       'freebsd': {
-        $docroot              = '/usr/local/www/apache22/data'
         $pidfile              = '/var/run/httpd.pid'
         $error_log            = 'httpd-error.log'
         $error_documents_path = '/usr/local/www/apache22/error'
diff --git a/manifests/params.pp b/manifests/params.pp
index 90f805af81..6a221fd633 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -103,6 +103,7 @@
     $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
+    $docroot              = '/var/www/html'
     if $::osfamily == "RedHat" {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
@@ -163,6 +164,7 @@
     $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
+    $docroot              = '/var/www'
 
     #
     # Passenger-specific settings
@@ -273,6 +275,7 @@
     $mime_support_package = 'misc/mime-support'
     $mime_types_config    = '/usr/local/etc/mime.types'
     $wsgi_socket_prefix   = undef
+    $docroot              = '/usr/local/www/apache22/data'
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }

From 6330c899c394603d06a8e8cb2ea3ae3717946249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 30 Sep 2014 15:43:19 +0200
Subject: [PATCH 0447/2267] add documentation for `docroot` (in init)

and apparently strip a lot of trailing white-space. thanks lighttable
let's see what this breaks...
---
 README.md | 146 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 76 insertions(+), 70 deletions(-)

diff --git a/README.md b/README.md
index a1846b5261..b98749b584 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Apache is a widely-used web server, and this module provides a simplified way of
 * Apache modules
 * virtual hosts
 * listened-to ports
-* `/etc/make.conf` on FreeBSD 
+* `/etc/make.conf` on FreeBSD
 
 ###Beginning with Apache
 
@@ -182,9 +182,9 @@ To set up a virtual host with WSGI
       docroot                     => '/var/www/pythonapp',
       wsgi_application_group      => '%{GLOBAL}',
       wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options => { 
-        processes    => '2', 
-        threads      => '15', 
+      wsgi_daemon_process_options => {
+        processes    => '2',
+        threads      => '15',
         display-name => '%{GROUP}',
        },
       wsgi_import_script          => '/var/www/demo.wsgi',
@@ -253,7 +253,7 @@ Generates default set of include-able Apache configuration files under  `${apach
 
 #####`default_mods`
 
-Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names. 
+Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names.
 
 Defaults to 'true', which includes the default [HTTPD mods](https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp).
 
@@ -310,6 +310,10 @@ SSL vhosts only respond to HTTPS queries.
 
 Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
 
+#####`docroot`
+
+Changes the location of the default [Documentroot](https://httpd.apache.org/docs/current/mod/core.html#documentroot). Defaults to '/var/www/html' on RedHat, '/var/www' on Debian, and '/usr/local/www/apache22/data' on FreeBSD.
+
 #####`error_documents`
 
 Enables custom error documents. Defaults to 'false'.
@@ -375,9 +379,9 @@ Determines which MPM is loaded and configured for the HTTPD process. Valid value
 * `apache::mod::itk`
 * `apache::mod::peruser`
 * `apache::mod::prefork`
-* `apache::mod::worker` 
+* `apache::mod::worker`
 
-*Note:* Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `$mpm_module` you must uninstall all packages that depend on your currently-installed Apache. 
+*Note:* Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `$mpm_module` you must uninstall all packages that depend on your currently-installed Apache.
 
 #####`package_ensure`
 
@@ -566,7 +570,7 @@ The modules mentioned above, and other Apache modules that have templates, cause
 
 ####Class: `apache::mod::info`
 
-Installs and manages mod_info which provides a comprehensive overview of the server configuration. 
+Installs and manages mod_info which provides a comprehensive overview of the server configuration.
 
 Full documentation for mod_info is available from [Apache](http://httpd.apache.org/docs/2.2/mod/mod_info.html).
 
@@ -681,7 +685,7 @@ Overriding the default configuartion:
   }
 ```
 
-or 
+or
 ```puppet
   class {'::apache::mod::php':
     template => 'apache/php.conf.erb',
@@ -719,7 +723,7 @@ To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` par
 
 ####Class: `apache::mod::wsgi`
 
-Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`. 
+Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`.
 
 For customized parameters, which tell Apache how Python is currently configured on the operating system,
 
@@ -963,7 +967,9 @@ Sets the list of resources to look for when a client requests an index of the di
 
 #####`docroot`
 
-Provides the [DocumentRoot](http://httpd.apache.org/docs/current/mod/core.html#documentroot) directive, which identifies the directory Apache serves files from. Required. 
+Provides the
+[DocumentRoot](http://httpd.apache.org/docs/current/mod/core.html#documentroot)
+directive, which identifies the directory Apache serves files from. Required.
 
 #####`docroot_group`
 
@@ -1142,7 +1148,7 @@ Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/do
 
 ```puppet
 apache::vhost { 'site.name.fdqn':
-  … 
+  …
   proxy_pass => [
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
@@ -1220,7 +1226,7 @@ Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mo
 
 #####`rewrites`
 
-Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'. 
+Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'.
 
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
@@ -1281,7 +1287,7 @@ Multiple rewrites and conditions are also possible
           rewrite_base => /apps/,
           rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
         },
-     ], 
+     ],
     }
 ```
 
@@ -1342,7 +1348,7 @@ Used by HTTPD to conditionally set environment variables for vhosts. Defaults to
 
 #####`suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
 
-Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG). 
+Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
 
 `suphp_addhandler` defaults to 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian.
 
@@ -1369,9 +1375,9 @@ To set up a virtual host with suPHP
 
 Enables name-based virtual hosting. If no IP is passed to the virtual host, but the vhost is assigned a port, then the vhost name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name is set to the title of the resource. Defaults to '*'.
 
-#####`virtual_docroot` 
+#####`virtual_docroot`
 
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'. 
+Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'.
 
 ```puppet
     apache::vhost { 'subdomain.loc':
@@ -1407,8 +1413,8 @@ To set up a virtual host with WSGI
       docroot                     => '/var/www/pythonapp',
       wsgi_daemon_process         => 'wsgi',
       wsgi_daemon_process_options =>
-        { processes    => '2', 
-          threads      => '15', 
+        { processes    => '2',
+          threads      => '15',
           display-name => '%{GROUP}',
          },
       wsgi_process_group          => 'wsgi',
@@ -1431,9 +1437,9 @@ General `directories` usage looks something like
     apache::vhost { 'files.example.net':
       docroot     => '/var/www/files',
       directories => [
-        { 'path'     => '/var/www/files', 
-          'provider' => 'files', 
-          'deny'     => 'from all' 
+        { 'path'     => '/var/www/files',
+          'provider' => 'files',
+          'deny'     => 'from all'
          },
       ],
     }
@@ -1454,15 +1460,15 @@ Any handlers you do not set in these hashes are considered 'undefined' within Pu
 
 ######`addhandlers`
 
-Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`. 
+Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`.
 
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
+      directories => [
         { path        => '/path/to/directory',
           addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
-        }, 
+        },
       ],
     }
 ```
@@ -1474,10 +1480,10 @@ Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow)
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path  => '/path/to/directory', 
-          allow => 'from example.org', 
-        }, 
+      directories => [
+        { path  => '/path/to/directory',
+          allow => 'from example.org',
+        },
       ],
     }
 ```
@@ -1489,10 +1495,10 @@ Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot      => '/path/to/directory',
-      directories  => [ 
-        { path           => '/path/to/directory', 
-          allow_override => ['AuthConfig', 'Indexes'], 
-        }, 
+      directories  => [
+        { path           => '/path/to/directory',
+          allow_override => ['AuthConfig', 'Indexes'],
+        },
       ],
     }
 ```
@@ -1559,7 +1565,7 @@ Pass a string of custom configuration directives to be placed at the end of the
 
 ```puppet
   apache::vhost { 'monitor':
-    … 
+    …
     custom_fragment => '
   <Location /balancer-manager>
     SetHandler balancer-manager
@@ -1582,24 +1588,24 @@ Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) dir
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path => '/path/to/directory', 
-          deny => 'from example.org', 
-        }, 
+      directories => [
+        { path => '/path/to/directory',
+          deny => 'from example.org',
+        },
       ],
     }
 ```
 
 ######`error_documents`
 
-An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory. 
+An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
 
 ```puppet
     apache::vhost { 'sample.example.net':
-      directories => [ 
+      directories => [
         { path            => '/srv/www',
           error_documents => [
-            { 'error_code' => '503', 
+            { 'error_code' => '503',
               'document'   => '/service-unavail',
             },
           ],
@@ -1629,9 +1635,9 @@ Allows configuration settings for [directory indexing](http://httpd.apache.org/d
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path          => '/path/to/directory', 
-          options       => ['Indexes','FollowSymLinks','MultiViews'], 
+      directories => [
+        { path          => '/path/to/directory',
+          options       => ['Indexes','FollowSymLinks','MultiViews'],
           index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
         },
       ],
@@ -1645,11 +1651,11 @@ Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoind
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path                => '/path/to/directory', 
-          order               => 'Allow,Deny', 
+      directories => [
+        { path                => '/path/to/directory',
+          order               => 'Allow,Deny',
           index_order_default => ['Descending', 'Date'],
-        }, 
+        },
       ],
     }
 ```
@@ -1661,9 +1667,9 @@ Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options)
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path    => '/path/to/directory', 
-          options => ['Indexes','FollowSymLinks','MultiViews'], 
+      directories => [
+        { path    => '/path/to/directory',
+          options => ['Indexes','FollowSymLinks','MultiViews'],
         },
       ],
     }
@@ -1676,9 +1682,9 @@ Sets the order of processing Allow and Deny statements as per [Apache core docum
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path  => '/path/to/directory', 
-          order => 'Allow,Deny', 
+      directories => [
+        { path  => '/path/to/directory',
+          order => 'Allow,Deny',
         },
       ],
     }
@@ -1791,10 +1797,10 @@ String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl
     apache::vhost { 'secure.example.net':
       docroot     => '/path/to/directory',
       directories => [
-        { path        => '/path/to/directory', 
-          ssl_options => '+ExportCertData', 
+        { path        => '/path/to/directory',
+          ssl_options => '+ExportCertData',
         },
-        { path        => '/path/to/different/dir', 
+        { path        => '/path/to/different/dir',
           ssl_options => [ '-StdEnvVars', '+ExportCertData'],
         },
       ],
@@ -1809,10 +1815,10 @@ A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://w
     apache::vhost { 'secure.example.net':
       docroot     => '/path/to/directory',
       directories => [
-        { path  => '/path/to/directory', 
-          suphp => 
-            { user  =>  'myappuser', 
-              group => 'myappgroup', 
+        { path  => '/path/to/directory',
+          suphp =>
+            { user  =>  'myappuser',
+              group => 'myappgroup',
             },
         },
       ],
@@ -1825,7 +1831,7 @@ All of the SSL parameters for `::vhost` default to whatever is set in the base `
 
 #####`ssl`
 
-Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'. 
+Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'.
 
 #####`ssl_ca`
 
@@ -1837,7 +1843,7 @@ Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/ce
 
 #####`ssl_protocol`
 
-Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'. 
+Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'.
 
 If you do not use this parameter, it uses the HTTPD default from ssl.conf.erb, 'all -SSLv2 -SSLv3'.
 
@@ -1899,7 +1905,7 @@ Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#
 
 #####`ssl_options`
 
-Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'. 
+Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'.
 
 A string:
 
@@ -2148,7 +2154,7 @@ If you want to add two name-based vhosts so that they answer on either 10.0.0.10
 
 ####Defined Type: `apache::balancer`
 
-`apache::balancer` creates an Apache balancer cluster. Each balancer cluster needs one or more balancer members, which are declared with [`apache::balancermember`](#defined-type-apachebalancermember). 
+`apache::balancer` creates an Apache balancer cluster. Each balancer cluster needs one or more balancer members, which are declared with [`apache::balancermember`](#defined-type-apachebalancermember).
 
 One `apache::balancer` defined resource should be defined for each Apache load balanced set of servers. The `apache::balancermember` resources for all balancer members can be exported and collected on a single Apache load balancer server using exported resources.
 
@@ -2164,7 +2170,7 @@ Configures key-value pairs as [ProxySet](http://httpd.apache.org/docs/current/mo
 
 #####`collect_exported`
 
-Determines whether or not to use exported resources. Valid values 'true' and 'false', defaults to 'true'. 
+Determines whether or not to use exported resources. Valid values 'true' and 'false', defaults to 'true'.
 
 If you statically declare all of your backend servers, you should set this to 'false' to rely on existing declared balancer member resources. Also make sure to use `apache::balancermember` with array arguments.
 
@@ -2242,7 +2248,7 @@ If you need to use ProxySet in the balancer config
 * [`apache`](#class-apache): Guides the basic setup of Apache.
 * `apache::dev`: Installs Apache development libraries. (*Note:* On FreeBSD, you must declare `apache::package` or `apache` before `apache::dev`.)
 * [`apache::mod::[name]`](#classes-apachemodname): Enables specific Apache HTTPD modules.
- 
+
 ####Private Classes
 
 * `apache::confd::no_accf`: Creates the no-accf.conf configuration file in conf.d, required by FreeBSD's Apache 2.4.
@@ -2261,7 +2267,7 @@ If you need to use ProxySet in the balancer config
 * `apache::listen`: Based on the title, controls which ports Apache binds to for listening. Adds [Listen](http://httpd.apache.org/docs/current/bind.html) directives to ports.conf in the Apache HTTPD configuration directory. Titles take the form '<port>', '<ipv4>:<port>', or '<ipv6>:<port>'.
 * `apache::mod`: Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class.
 * `apache::namevirtualhost`: Enables name-based hosting of a virtual host. Adds all [NameVirtualHost](http://httpd.apache.org/docs/current/vhosts/name-based.html) directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles take the form '\*', '*:<port>', '\_default_:<port>, '<ip>', or '<ip>:<port>'.
-* `apache::vhost`: Allows specialized configurations for virtual hosts that have requirements outside the defaults. 
+* `apache::vhost`: Allows specialized configurations for virtual hosts that have requirements outside the defaults.
 
 ####Private Defined Types
 
@@ -2280,7 +2286,7 @@ The `apache::vhost::WSGIImportScript` parameter creates a statement inside the V
 
 ###RHEL/CentOS 5
 
-The `apache::mod::passenger` and `apache::mod::proxy_html` classes are untested since repositories are missing compatible packages.   
+The `apache::mod::passenger` and `apache::mod::proxy_html` classes are untested since repositories are missing compatible packages.
 
 ###RHEL/CentOS 7
 
@@ -2288,7 +2294,7 @@ The `apache::mod::passenger` class is untested as the repository does not have p
 
 ###General
 
-This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet. 
+This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet.
 
 The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions can occur.
 

From 87be4908f1192800ab93672e0e978002e1703612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Tue, 30 Sep 2014 16:42:57 +0200
Subject: [PATCH 0448/2267] add spec test for (default) docroot directory

, which is now a parameter to init.pp
---
 spec/classes/apache_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index dc5d6b46a1..c1ecf80cc3 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -23,6 +23,10 @@
     it { is_expected.to contain_user("www-data") }
     it { is_expected.to contain_group("www-data") }
     it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/var/www").with(
+      'ensure'  => 'directory',
+      )
+    }
     it { is_expected.to contain_file("/etc/apache2/sites-enabled").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
@@ -225,6 +229,10 @@
     it { is_expected.to contain_user("apache") }
     it { is_expected.to contain_group("apache") }
     it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/var/www/html").with(
+      'ensure'  => 'directory',
+      )
+    }
     it { is_expected.to contain_file("/etc/httpd/conf.d").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
@@ -498,6 +506,10 @@
     it { is_expected.to contain_user("www") }
     it { is_expected.to contain_group("www") }
     it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/usr/local/www/apache22/data").with(
+      'ensure'  => 'directory',
+      )
+    }
     it { is_expected.to contain_file("/usr/local/etc/apache22/Vhosts").with(
       'ensure'  => 'directory',
       'recurse' => 'true',

From d75e4d32423338f56bbeac2540fcf846860b329b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 7 Nov 2014 11:37:33 -0800
Subject: [PATCH 0449/2267] Fix unit test failures with ruby 1.8.7

rspec with 1.8.7 seems to be having issues with trailing commas and
unescaped '{' or '}' within the %r{} block.
---
 spec/classes/apache_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index c1ecf80cc3..fe61a9796b 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -24,7 +24,7 @@
     it { is_expected.to contain_group("www-data") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/var/www").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/etc/apache2/sites-enabled").with(
@@ -168,7 +168,7 @@
         end
 
         it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" vhost_combined\n} }
       end
     end
 
@@ -230,7 +230,7 @@
     it { is_expected.to contain_group("apache") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/var/www/html").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/etc/httpd/conf.d").with(
@@ -507,7 +507,7 @@
     it { is_expected.to contain_group("www") }
     it { is_expected.to contain_class("apache::service") }
     it { is_expected.to contain_file("/usr/local/www/apache22/data").with(
-      'ensure'  => 'directory',
+      'ensure'  => 'directory'
       )
     }
     it { is_expected.to contain_file("/usr/local/etc/apache22/Vhosts").with(

From ef71aa9d05d275dbb46e8821b8d742b629dce56f Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 10 Nov 2014 11:37:00 -0800
Subject: [PATCH 0450/2267] 1.2.0 prep

---
 CHANGELOG.md | 55 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dad6c4b5ed..c2ccb4c6c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,37 +6,69 @@ This release features many improvements and bugfixes, including several new defi
 ####Features
 - Convert apache::vhost to use concat for easier extensions
 - Test improvements
+- Synchronize files with modulesync
+- Strict variable and future parser support
 - Added apache::custom_config defined type to allow validation of configs before they are created
 - Added bool2httpd function to convert true/false to apache 'On' and 'Off'. Intended for internal use in the module.
-- Added logroot_mode and logroot_ensure to apache::vhost
 - Improved SCL support
-  - added apache::conf_dir
-  - allow overriding of apache_name
   - allow overriding of the mod_ssl package name
 - Add support for reverse_urls/ProxyPassReverse in apache::vhost
-- Add apache::vhost::manage_docroot
-- Add apache::purge_vhost_dir parameter
 - Add satisfy directive in apache::vhost::directories
 - Add apache::fastcgi::server defined type
-- Add apache::vhost::proxy_preserve_host
-- Add apache::vhost::wsgi_pass_authorization
+- New parameters - apache
+  - allow_encoded_slashes
+  - apache_name
+  - conf_dir
+  - default_ssl_crl_check
+  - docroot
+  - logroot_mode
+  - purge_vhost_dir
+- New parameters - apache::vhost
+  - add_default_charset
+  - allow_encoded_slashes
+  - logroot_ensure
+  - logroot_mode
+  - manage_docroot
+  - passenger_app_root
+  - passenger_min_instances
+  - passenger_pre_start
+  - passenger_ruby
+  - passenger_start_timeout
+  - proxy_preserve_host
+  - redirectmatch_dest
+  - ssl_crl_check
+  - wsgi_chunked_request
+  - wsgi_pass_authorization
+- Add support for ScriptAlias and ScriptAliasMatch in the apache::vhost::aliases parameter
 - Add support for rewrites in the apache::vhost::directories parameter
 - If the service_ensure parameter in apache::service is set to anything other than true, false, running, or stopped, ensure will not be passed to the service resource, allowing for the service to not be managed by puppet
+- Turn of SSLv3 by default
 - Improvements to apache::mod*
   - Add restrict_access parameter to apache::mod::info
   - Add force_language_priority and language_priority parameters to apache::mod::negotiation
-  - Add threadlimit parameter to mod::worker
+  - Add threadlimit parameter to apache::mod::worker
   - Add content, template, and source parameters to apache::mod::php
   - Add mod_authz_svn support via the authz_svn_enabled parameter in apache::mod::dav_svn
   - Add loadfile_name parameter to apache::mod
   - Add apache::mod::deflate class
-  - Add types and notes parameters to apache::mod::deflate
   - Add options parameter to apache::mod::fcgid
+  - Add timeouts parameter to apache::mod::reqtimeout
+  - Add apache::mod::shib
+  - Add apache_version parameter to apache::mod::ldap
+  - Add magic_file parameter to apache::mod::mime_magic
+  - Add apache_version parameter to apache::mod::pagespeed
+  - Add passenger_default_ruby parameter to apache::mod::passenger
+  - Add content, template, and source parameters to apache::mod::php
+  - Add apache_version parameter to apache::mod::proxy
+  - Add loadfiles parameter to apache::mod::proxy_html
+  - Add ssl_protocol and package_name parameters to apache::mod::ssl
+  - Add apache_version parameter to apache::mod::status
+  - Add apache_version parameter to apache::mod::userdir
+  - Add apache::mod::version class
 
 ####Bugfixes
 - Set osfamily defaults for wsgi_socket_prefix
 - Support multiple balancermembers with the same url
-- Validate apache::vhost::wsgi_pass_authorization
 - Validate apache::vhost::custom_fragment
 - Add support for itk with mod_php
 - Allow apache::vhost::ssl_certs_dir to not be set
@@ -61,6 +93,9 @@ This release features many improvements and bugfixes, including several new defi
 - Add authn_core mode to Ubuntu trusty defaults
 - Keep default loadfile for authz_svn on Debian
 - Remove '.conf' from the site-include regexp for better Ubuntu/Debian support
+- Load unixd before fcgid for EL7
+- Fix RedirectMatch rules
+- Fix misleading error message in apache::version
 
 ####Known Bugs
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.

From a51bfa87e3c1c2ea17aaf4d590ad26758a07c5de Mon Sep 17 00:00:00 2001
From: enekogb <perreko@gmail.com>
Date: Wed, 12 Nov 2014 09:47:35 +0100
Subject: [PATCH 0451/2267] Add $status_path parameter to change mod_status url

---
 README.md                       | 18 +++++++++++++++++-
 manifests/mod/status.pp         |  7 +++++--
 spec/classes/mod/status_spec.rb | 13 +++++++------
 templates/mod/status.conf.erb   |  2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index b98749b584..564e65536a 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@
         * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
         * [Class: apache::mod::php](#class-apachemodphp)
         * [Class: apache::mod::ssl](#class-apachemodssl)
+        * [Class: apache::mod::status](#class-apachemodstatus)
         * [Class: apache::mod::wsgi](#class-apachemodwsgi)
         * [Class: apache::mod::fcgid](#class-apachemodfcgid)
         * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
@@ -556,7 +557,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `shib`* (see [`apache::mod::shib`](#class-apachemodshib) below)
 * `speling`
 * `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl) below)
-* `status`*
+* `status`* (see [`apache::mod::status`](#class-apachemodstatus) below)
 * `suphp`
 * `userdir`*
 * `vhost_alias`
@@ -721,6 +722,21 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
 
 To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` parameter in `::apache` to 'true' or set the `ssl` parameter in `apache::vhost` to 'true'.
 
+####Class: `apache::mod::status`
+
+Installs Apache mod_status and uses the status.conf.erb template. These are the defaults:
+
+```puppet
+    class { 'apache::mod::status':
+      allow_from      = ['127.0.0.1','::1'],
+      extended_status = 'On',
+      status_path     = '/server-status',
+){
+      
+      
+  }
+```
+
 ####Class: `apache::mod::wsgi`
 
 Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`.
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index cfab5d58ea..9c61836960 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -9,7 +9,9 @@
 #   /server-status URL.  Defaults to ['127.0.0.1', '::1'].
 # - $extended_status track and display extended status information. Valid
 #   values are 'On' or 'Off'.  Defaults to 'On'.
-#
+# - $status_path is the path assigned to the Location directive which
+#   defines the URL to access the server status. Defaults to '/server-status'.
+# 
 # Actions:
 # - Enable and configure Apache mod_status
 #
@@ -27,11 +29,12 @@
   $allow_from      = ['127.0.0.1','::1'],
   $extended_status = 'On',
   $apache_version = $::apache::apache_version,
+  $status_path     = '/server-status',
 ){
   validate_array($allow_from)
   validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
   ::apache::mod { 'status': }
-  # Template uses $allow_from, $extended_status, $apache_version
+  # Template uses $allow_from, $extended_status, $apache_version, $status_path
   file { 'status.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/status.conf",
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index adb60861ba..502562959c 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 # Helper function for testing the contents of `status.conf`
-def status_conf_spec(allow_from, extended_status)
+def status_conf_spec(allow_from, extended_status, status_path)
   it do
     is_expected.to contain_file("status.conf").with_content(
-      "<Location /server-status>\n"\
+      "<Location #{status_path}>\n"\
       "    SetHandler server-status\n"\
       "    Order deny,allow\n"\
       "    Deny from all\n"\
@@ -41,7 +41,7 @@ def status_conf_spec(allow_from, extended_status)
 
     it { is_expected.to contain_apache__mod("status") }
 
-    status_conf_spec(["127.0.0.1", "::1"], "On")
+    status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status")
 
     it { is_expected.to contain_file("status.conf").with({
       :ensure => 'file',
@@ -70,13 +70,13 @@ def status_conf_spec(allow_from, extended_status)
 
     it { is_expected.to contain_apache__mod("status") }
 
-    status_conf_spec(["127.0.0.1", "::1"], "On")
+    status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status")
 
     it { is_expected.to contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
 
   end
 
-  context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off'" do
+  context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
     let :facts do
       {
         :osfamily               => 'Debian',
@@ -93,10 +93,11 @@ def status_conf_spec(allow_from, extended_status)
       {
         :allow_from => ['10.10.10.10','11.11.11.11'],
         :extended_status => 'Off',
+        :status_path => '/custom-status',
       }
     end
 
-    status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off")
+    status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off", "/custom-status")
 
   end
 
diff --git a/templates/mod/status.conf.erb b/templates/mod/status.conf.erb
index 84f2e03430..f02ed156ff 100644
--- a/templates/mod/status.conf.erb
+++ b/templates/mod/status.conf.erb
@@ -1,4 +1,4 @@
-<Location /server-status>
+<Location <%= @status_path %>>
     SetHandler server-status
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require ip <%= Array(@allow_from).join(" ") %>

From fdd960abe8e92420365e4c78ebd678f6b03f86f2 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <tonio.cotten@gmail.com>
Date: Wed, 12 Nov 2014 16:34:15 +0100
Subject: [PATCH 0452/2267] 'allow_encoded_slashes' was omitted

---
 manifests/vhost.pp                         | 62 +++++++++++++---------
 spec/defines/vhost_spec.rb                 |  1 +
 templates/vhost/_allow_encoded_slashes.erb |  4 ++
 3 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 templates/vhost/_allow_encoded_slashes.erb

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0841dfff47..50b3a1ec4a 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -491,6 +491,16 @@
       content => template('apache/vhost/_fallbackresource.erb'),
     }
   }
+  
+  # Template uses:
+  # - $allow_encoded_slashes
+  if $allow_encoded_slashes {
+    concat::fragment { "${name}-allow_encoded_slashes":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 50,
+      content => template('apache/vhost/_allow_encoded_slashes.erb'),
+    }
+  }
 
   # Template uses:
   # - $_directories
@@ -501,7 +511,7 @@
   if $_directories and ! empty($_directories) {
     concat::fragment { "${name}-directories":
       target  => "${priority_real}-${filename}.conf",
-      order   => 50,
+      order   => 60,
       content => template('apache/vhost/_directories.erb'),
     }
   }
@@ -511,7 +521,7 @@
   if $additional_includes and ! empty($additional_includes) {
     concat::fragment { "${name}-additional_includes":
       target  => "${priority_real}-${filename}.conf",
-      order   => 60,
+      order   => 70,
       content => template('apache/vhost/_additional_includes.erb'),
     }
   }
@@ -524,7 +534,7 @@
   if $error_log or $log_level {
     concat::fragment { "${name}-logging":
       target  => "${priority_real}-${filename}.conf",
-      order   => 70,
+      order   => 80,
       content => template('apache/vhost/_logging.erb'),
     }
   }
@@ -532,7 +542,7 @@
   # Template uses no variables
   concat::fragment { "${name}-serversignature":
     target  => "${priority_real}-${filename}.conf",
-    order   => 80,
+    order   => 90,
     content => template('apache/vhost/_serversignature.erb'),
   }
 
@@ -545,7 +555,7 @@
   if $access_log {
     concat::fragment { "${name}-access_log":
       target  => "${priority_real}-${filename}.conf",
-      order   => 90,
+      order   => 100,
       content => template('apache/vhost/_access_log.erb'),
     }
   }
@@ -555,7 +565,7 @@
   if $action {
     concat::fragment { "${name}-action":
       target  => "${priority_real}-${filename}.conf",
-      order   => 100,
+      order   => 110,
       content => template('apache/vhost/_action.erb'),
     }
   }
@@ -566,7 +576,7 @@
   if $block and ! empty($block) {
     concat::fragment { "${name}-block":
       target  => "${priority_real}-${filename}.conf",
-      order   => 110,
+      order   => 120,
       content => template('apache/vhost/_block.erb'),
     }
   }
@@ -576,7 +586,7 @@
   if $error_documents and ! empty($error_documents) {
     concat::fragment { "${name}-error_document":
       target  => "${priority_real}-${filename}.conf",
-      order   => 120,
+      order   => 130,
       content => template('apache/vhost/_error_document.erb'),
     }
   }
@@ -589,7 +599,7 @@
   if $proxy_dest or $proxy_pass {
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}-${filename}.conf",
-      order   => 130,
+      order   => 140,
       content => template('apache/vhost/_proxy.erb'),
     }
   }
@@ -599,7 +609,7 @@
   if $rack_base_uris {
     concat::fragment { "${name}-rack":
       target  => "${priority_real}-${filename}.conf",
-      order   => 140,
+      order   => 150,
       content => template('apache/vhost/_rack.erb'),
     }
   }
@@ -620,7 +630,7 @@
   if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp and $redirectmatch_dest) {
     concat::fragment { "${name}-redirect":
       target  => "${priority_real}-${filename}.conf",
-      order   => 150,
+      order   => 160,
       content => template('apache/vhost/_redirect.erb'),
     }
   }
@@ -633,7 +643,7 @@
   if $rewrites or $rewrite_rule {
     concat::fragment { "${name}-rewrite":
       target  => "${priority_real}-${filename}.conf",
-      order   => 160,
+      order   => 170,
       content => template('apache/vhost/_rewrite.erb'),
     }
   }
@@ -644,7 +654,7 @@
   if $scriptaliases and ! empty($scriptaliases) {
     concat::fragment { "${name}-scriptalias":
       target  => "${priority_real}-${filename}.conf",
-      order   => 170,
+      order   => 180,
       content => template('apache/vhost/_scriptalias.erb'),
     }
   }
@@ -654,7 +664,7 @@
   if $serveraliases and ! empty($serveraliases) {
     concat::fragment { "${name}-serveralias":
       target  => "${priority_real}-${filename}.conf",
-      order   => 180,
+      order   => 190,
       content => template('apache/vhost/_serveralias.erb'),
     }
   }
@@ -665,7 +675,7 @@
   if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
     concat::fragment { "${name}-setenv":
       target  => "${priority_real}-${filename}.conf",
-      order   => 190,
+      order   => 200,
       content => template('apache/vhost/_setenv.erb'),
     }
   }
@@ -691,7 +701,7 @@
   if $ssl {
     concat::fragment { "${name}-ssl":
       target  => "${priority_real}-${filename}.conf",
-      order   => 200,
+      order   => 210,
       content => template('apache/vhost/_ssl.erb'),
     }
   }
@@ -703,7 +713,7 @@
   if $suphp_engine == 'on' {
     concat::fragment { "${name}-suphp":
       target  => "${priority_real}-${filename}.conf",
-      order   => 210,
+      order   => 220,
       content => template('apache/vhost/_suphp.erb'),
     }
   }
@@ -714,7 +724,7 @@
   if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) {
     concat::fragment { "${name}-php_admin":
       target  => "${priority_real}-${filename}.conf",
-      order   => 220,
+      order   => 230,
       content => template('apache/vhost/_php_admin.erb'),
     }
   }
@@ -724,7 +734,7 @@
   if $headers and ! empty($headers) {
     concat::fragment { "${name}-header":
       target  => "${priority_real}-${filename}.conf",
-      order   => 230,
+      order   => 240,
       content => template('apache/vhost/_header.erb'),
     }
   }
@@ -734,7 +744,7 @@
   if $request_headers and ! empty($request_headers) {
     concat::fragment { "${name}-requestheader":
       target  => "${priority_real}-${filename}.conf",
-      order   => 240,
+      order   => 250,
       content => template('apache/vhost/_requestheader.erb'),
     }
   }
@@ -751,7 +761,7 @@
   if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
     concat::fragment { "${name}-wsgi":
       target  => "${priority_real}-${filename}.conf",
-      order   => 250,
+      order   => 260,
       content => template('apache/vhost/_wsgi.erb'),
     }
   }
@@ -761,7 +771,7 @@
   if $custom_fragment {
     concat::fragment { "${name}-custom_fragment":
       target  => "${priority_real}-${filename}.conf",
-      order   => 260,
+      order   => 270,
       content => template('apache/vhost/_custom_fragment.erb'),
     }
   }
@@ -774,7 +784,7 @@
   if $fastcgi_server or $fastcgi_dir {
     concat::fragment { "${name}-fastcgi":
       target  => "${priority_real}-${filename}.conf",
-      order   => 270,
+      order   => 280,
       content => template('apache/vhost/_fastcgi.erb'),
     }
   }
@@ -784,7 +794,7 @@
   if $suexec_user_group {
     concat::fragment { "${name}-suexec":
       target  => "${priority_real}-${filename}.conf",
-      order   => 280,
+      order   => 290,
       content => template('apache/vhost/_suexec.erb'),
     }
   }
@@ -798,7 +808,7 @@
   if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}-${filename}.conf",
-      order   => 290,
+      order   => 300,
       content => template('apache/vhost/_passenger.erb'),
     }
   }
@@ -808,7 +818,7 @@
   if $add_default_charset {
     concat::fragment { "${name}-charsets":
       target  => "${priority_real}-${filename}.conf",
-      order   => 300,
+      order   => 310,
       content => template('apache/vhost/_charsets.erb'),
     }
   }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 84a95bf44d..d80752d8ae 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -322,6 +322,7 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
diff --git a/templates/vhost/_allow_encoded_slashes.erb b/templates/vhost/_allow_encoded_slashes.erb
new file mode 100644
index 0000000000..40c73433b1
--- /dev/null
+++ b/templates/vhost/_allow_encoded_slashes.erb
@@ -0,0 +1,4 @@
+<%- if @allow_encoded_slashes -%>
+
+  AllowEncodedSlashes <%= @allow_encoded_slashes %>
+<%- end -%>

From a425c288cc357dc1d9c8dd4738b086365ec6adf5 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 13 Nov 2014 11:23:07 -0800
Subject: [PATCH 0453/2267] We should get rid of unused templates

Otherwise we run the risk of having updates going into the wrong place
---
 templates/vhost.conf.erb | 69 ----------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 templates/vhost.conf.erb

diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
deleted file mode 100644
index 859a3ae7f4..0000000000
--- a/templates/vhost.conf.erb
+++ /dev/null
@@ -1,69 +0,0 @@
-# ************************************
-# Vhost template in module puppetlabs-apache
-# Managed by Puppet
-# ************************************
-
-<VirtualHost <%= @nvh_addr_port %>>
-  ServerName <%= @servername %>
-<% if @serveradmin -%>
-  ServerAdmin <%= @serveradmin %>
-<% end -%>
-
-  ## Vhost docroot
-<% if @virtual_docroot -%>
-  VirtualDocumentRoot "<%= @virtual_docroot %>"
-<% else -%>
-  DocumentRoot "<%= @docroot %>"
-<% end -%>
-<%= scope.function_template(['apache/vhost/_aliases.erb']) -%>
-
-<%= scope.function_template(['apache/vhost/_itk.erb']) -%>
-
-<% if @fallbackresource -%>
-  FallbackResource <%= @fallbackresource %>
-<% end -%>
-<%- if @allow_encoded_slashes -%>
-  AllowEncodedSlashes <%= @allow_encoded_slashes %>
-<%- end -%>
-
-  ## Directories, there should at least be a declaration for <%= @docroot %>
-<%= scope.function_template(['apache/vhost/_directories.erb']) -%>
-
-  ## Load additional static includes
-<% Array(@additional_includes).each do |include| -%>
-  Include "<%= include %>"
-<% end -%>
-
-  ## Logging
-<% if @error_log -%>
-  ErrorLog "<%= @error_log_destination %>"
-<% end -%>
-<% if @log_level -%>
-  LogLevel <%= @log_level %>
-<% end -%>
-  ServerSignature Off
-<% if @access_log and @_access_log_env_var -%>
-  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %> <%= @_access_log_env_var %>
-<% elsif @access_log -%>
-  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %>
-<% end -%>
-<%= scope.function_template(['apache/vhost/_action.erb']) -%>
-<%= scope.function_template(['apache/vhost/_block.erb']) -%>
-<%= scope.function_template(['apache/vhost/_error_document.erb']) -%>
-<%= scope.function_template(['apache/vhost/_proxy.erb']) -%>
-<%= scope.function_template(['apache/vhost/_rack.erb']) -%>
-<%= scope.function_template(['apache/vhost/_redirect.erb']) -%>
-<%= scope.function_template(['apache/vhost/_rewrite.erb']) -%>
-<%= scope.function_template(['apache/vhost/_scriptalias.erb']) -%>
-<%= scope.function_template(['apache/vhost/_serveralias.erb']) -%>
-<%= scope.function_template(['apache/vhost/_setenv.erb']) -%>
-<%= scope.function_template(['apache/vhost/_ssl.erb']) -%>
-<%= scope.function_template(['apache/vhost/_suphp.erb']) -%>
-<%= scope.function_template(['apache/vhost/_php_admin.erb']) -%>
-<%= scope.function_template(['apache/vhost/_header.erb']) -%>
-<%= scope.function_template(['apache/vhost/_requestheader.erb']) -%>
-<%= scope.function_template(['apache/vhost/_wsgi.erb']) -%>
-<%= scope.function_template(['apache/vhost/_custom_fragment.erb']) -%>
-<%= scope.function_template(['apache/vhost/_fastcgi.erb']) -%>
-<%= scope.function_template(['apache/vhost/_suexec.erb']) -%>
-</VirtualHost>

From 8d22b806eb528e3d8c93bf5229b86b9529bce7b9 Mon Sep 17 00:00:00 2001
From: muresan <muresan@users.noreply.github.com>
Date: Fri, 14 Nov 2014 17:05:02 +0000
Subject: [PATCH 0454/2267] Updated _directories.erb to add support for
 'SetEnv'

Updated _directories.erb to add support for 'SetEnv'.
---
 templates/vhost/_directories.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index e756875f29..9827e38c7a 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -195,6 +195,11 @@
         <%- end -%>
       <%- end -%>
     <%- end -%>
+    <%- if directory['setenv'] -%>
+      <%- Array(directory['setenv']).each do |setenv| -%>
+    SetEnv <%= setenv %>
+      <%- end -%>
+    <%- end -%>
     <%- if @shibboleth_enabled -%>
       <%- if directory['shib_require_session'] and ! directory['shib_require_session'].empty? -%>
     ShibRequireSession <%= directory['shib_require_session'] %>

From a767f1510a619785cdba4b3ca0fc484bfd300b5c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 17 Nov 2014 13:42:05 -0800
Subject: [PATCH 0455/2267] MODULES-1403 - fix doc bug

---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 564e65536a..c565da3ab2 100644
--- a/README.md
+++ b/README.md
@@ -1582,7 +1582,10 @@ Pass a string of custom configuration directives to be placed at the end of the
 ```puppet
   apache::vhost { 'monitor':
     …
-    custom_fragment => '
+    directories => [
+      {
+        path => '/path/to/directory',
+        custom_fragment => '
   <Location /balancer-manager>
     SetHandler balancer-manager
     Order allow,deny
@@ -1594,7 +1597,9 @@ Pass a string of custom configuration directives to be placed at the end of the
     Allow from all
   </Location>
   ProxyStatus On',
-}
+      },
+    ]
+  }
 ```
 
 ######`deny`

From 6d100c8033468e34c96a6cd8161a89b149201e94 Mon Sep 17 00:00:00 2001
From: Mike Delaney <mike.delaney@sonos.com>
Date: Tue, 30 Sep 2014 08:54:03 -0400
Subject: [PATCH 0456/2267] MODULES-1384 - idempotency for wsgi_script_aliases

When parsing wsgi_aliases, sort the keys then generate the underlying template.
---
 templates/vhost/_wsgi.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index a0d4ded654..9f01d40910 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -13,9 +13,9 @@
   WSGIProcessGroup <%= @wsgi_process_group %>
 <% end -%>
 <% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
-  <%- @wsgi_script_aliases.each do |a, p| -%>
-    <%- if a != '' and p != ''-%>
-  WSGIScriptAlias <%= a %> "<%= p %>"
+  <%- @wsgi_script_aliases.keys.sort.each do |key| -%>
+    <%- if key != '' and @wsgi_script_aliases[key] != ''-%>
+  WSGIScriptAlias <%= key %> "<%= @wsgi_script_aliases[key] %>"
     <%- end -%>
   <%- end -%>
 <% end -%>

From 5ac2f34e46f7347ba04fd86f5096ffc4f287e164 Mon Sep 17 00:00:00 2001
From: Geoffrey Corey <coreyg@apache.org>
Date: Tue, 18 Nov 2014 14:37:03 +0100
Subject: [PATCH 0457/2267] Add configurable options for mpm_event

---
 manifests/mod/event.pp         | 20 ++++++++++++--------
 spec/classes/mod/event_spec.rb | 33 +++++++++++++++++++++++++++++++++
 templates/mod/event.conf.erb   |  4 ++++
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index cb7ed96cd6..f2b28fde28 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -1,12 +1,16 @@
 class apache::mod::event (
-  $startservers        = '2',
-  $maxclients          = '150',
-  $minsparethreads     = '25',
-  $maxsparethreads     = '75',
-  $threadsperchild     = '25',
-  $maxrequestsperchild = '0',
-  $serverlimit         = '25',
-  $apache_version      = $::apache::apache_version,
+  $startservers           = '2',
+  $maxclients             = '150',
+  $minsparethreads        = '25',
+  $maxsparethreads        = '75',
+  $threadsperchild        = '25',
+  $maxrequestsperchild    = '0',
+  $serverlimit            = '25',
+  $apache_version         = $::apache::apache_version,
+  $threadlimit            = '64',
+  $listenbacklog          = '511',
+  $maxrequestworkers      = '256',
+  $maxconnectionsperchild = '0',
 ) {
   if defined(Class['apache::mod::itk']) {
     fail('May not include both apache::mod::event and apache::mod::itk on the same node')
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 3061ca9b1f..f85f4d3288 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -34,11 +34,44 @@
       }
     end
 
+
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.not_to contain_apache__mod('event') }
     it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') }
     it { is_expected.to contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') }
 
+    context "Test mpm_event params" do
+      let :params do
+        {
+          :serverlimit            => '0',
+          :startservers           => '1',
+          :maxclients             => '2',
+          :minsparethreads        => '3',
+          :maxsparethreads        => '4',
+          :threadsperchild        => '5',
+          :maxrequestsperchild    => '6',
+          :threadlimit            => '7',
+          :listenbacklog          => '8',
+          :maxrequestworkers      => '9',
+          :maxconnectionsperchild => '10',
+        }
+      end
+    
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file')
+           .with_content(/^\s*ServerLimit\s*0/)
+           .with_content(/^\s*StartServers\s*1/)
+           .with_content(/^\s*MaxClients\s*2/)
+           .with_content(/^\s*MinSpareThreads\s*3/)
+           .with_content(/^\s*MaxSpareThreads\s*4/)
+           .with_content(/^\s*ThreadsPerChild\s*5/)
+           .with_content(/^\s*MaxRequestsPerChild\s*6/)
+           .with_content(/^\s*ThreadLimit\s*7/)
+           .with_content(/^\s*ListenBacklog\s*8/)
+           .with_content(/^\s*MaxRequestWorkers\s*9/)
+           .with_content(/^\s*MaxConnectionsPerChild\s*10/)
+      }
+    end
+
     context "with Apache version < 2.4" do
       let :params do
         {
diff --git a/templates/mod/event.conf.erb b/templates/mod/event.conf.erb
index 40099543d5..e7ef7ea6ea 100644
--- a/templates/mod/event.conf.erb
+++ b/templates/mod/event.conf.erb
@@ -6,4 +6,8 @@
   MaxSpareThreads     <%= @maxsparethreads %>
   ThreadsPerChild     <%= @threadsperchild %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
+  ThreadLimit         <%= @threadlimit %>
+  ListenBacklog       <%= @listenbacklog %>
+  MaxRequestWorkers   <%= @maxrequestworkers %>
+  MaxConnectionsPerChild <%= @maxconnectionsperchild %>
 </IfModule>

From 468647c1ea2e9a95b7633fe419a24c5b9f447815 Mon Sep 17 00:00:00 2001
From: Geoffrey Corey <coreyg@apache.org>
Date: Wed, 19 Nov 2014 14:12:50 +0100
Subject: [PATCH 0458/2267] Add basic mpm_event docs, fix formatting, appease
 older ruby

---
 README.md                      | 20 ++++++++++++++++++--
 spec/classes/mod/event_spec.rb | 24 +++++++++++-------------
 templates/mod/event.conf.erb   | 20 ++++++++++----------
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index c565da3ab2..719e6bde14 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
         * [Class: apache::default_mods](#class-apachedefault_mods)
         * [Defined Type: apache::mod](#defined-type-apachemod)
         * [Classes: apache::mod::*](#classes-apachemodname)
+        * [Class: apache::mod::event](#class-apachemodevent)
         * [Class: apache::mod::info](#class-apachemodinfo)
         * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
         * [Class: apache::mod::php](#class-apachemodphp)
@@ -525,7 +526,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `dev`
 * `dir`*
 * `disk_cache`
-* `event`
+* `event`(see [`apache::mod::event`](#class-apachemodevent) below)
 * `expires`
 * `fastcgi`
 * `fcgid`
@@ -569,11 +570,26 @@ Modules noted with a * indicate that the module has settings and, thus, a templa
 
 The modules mentioned above, and other Apache modules that have templates, cause template files to be dropped along with the mod install. The module will not work without the template. Any module without a template installs the package but drops no files.
 
+####Class:  `apache::mod::event
+
+Installs and manages mpm_event module.
+
+Full Documentation for mpm_event is available from [Apache](https://httpd.apache.org/docs/current/mod/event.html).
+
+To configure the event thread limit:
+
+```puppet
+  class {'apache::mod::event':
+    $threadlimit      => '128',
+  }
+```
+  
+
 ####Class: `apache::mod::info`
 
 Installs and manages mod_info which provides a comprehensive overview of the server configuration.
 
-Full documentation for mod_info is available from [Apache](http://httpd.apache.org/docs/2.2/mod/mod_info.html).
+Full documentation for mod_info is available from [Apache](https://httpd.apache.org/docs/current/mod/mod_info.html).
 
 These are the default settings:
 
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index f85f4d3288..7030a72e8b 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -57,19 +57,17 @@
         }
       end
     
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file')
-           .with_content(/^\s*ServerLimit\s*0/)
-           .with_content(/^\s*StartServers\s*1/)
-           .with_content(/^\s*MaxClients\s*2/)
-           .with_content(/^\s*MinSpareThreads\s*3/)
-           .with_content(/^\s*MaxSpareThreads\s*4/)
-           .with_content(/^\s*ThreadsPerChild\s*5/)
-           .with_content(/^\s*MaxRequestsPerChild\s*6/)
-           .with_content(/^\s*ThreadLimit\s*7/)
-           .with_content(/^\s*ListenBacklog\s*8/)
-           .with_content(/^\s*MaxRequestWorkers\s*9/)
-           .with_content(/^\s*MaxConnectionsPerChild\s*10/)
-      }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxClients\s*2/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MinSpareThreads\s*3/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxSpareThreads\s*4/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadsPerChild\s*5/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestsPerChild\s*6/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestWorkers\s*9/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxConnectionsPerChild\s*10/) }
     end
 
     context "with Apache version < 2.4" do
diff --git a/templates/mod/event.conf.erb b/templates/mod/event.conf.erb
index e7ef7ea6ea..970ce088ce 100644
--- a/templates/mod/event.conf.erb
+++ b/templates/mod/event.conf.erb
@@ -1,13 +1,13 @@
 <IfModule mpm_event_module>
-  ServerLimit         <%= @serverlimit %>
-  StartServers        <%= @startservers %>
-  MaxClients          <%= @maxclients %>
-  MinSpareThreads     <%= @minsparethreads %>
-  MaxSpareThreads     <%= @maxsparethreads %>
-  ThreadsPerChild     <%= @threadsperchild %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-  ThreadLimit         <%= @threadlimit %>
-  ListenBacklog       <%= @listenbacklog %>
-  MaxRequestWorkers   <%= @maxrequestworkers %>
+  ServerLimit            <%= @serverlimit %>
+  StartServers           <%= @startservers %>
+  MaxClients             <%= @maxclients %>
+  MinSpareThreads        <%= @minsparethreads %>
+  MaxSpareThreads        <%= @maxsparethreads %>
+  ThreadsPerChild        <%= @threadsperchild %>
+  MaxRequestsPerChild    <%= @maxrequestsperchild %>
+  ThreadLimit            <%= @threadlimit %>
+  ListenBacklog          <%= @listenbacklog %>
+  MaxRequestWorkers      <%= @maxrequestworkers %>
   MaxConnectionsPerChild <%= @maxconnectionsperchild %>
 </IfModule>

From fb729a09f9d1ea586ab04bd163617483748b550e Mon Sep 17 00:00:00 2001
From: Joshua Brunner <j.brunner@nexbyte.com>
Date: Tue, 11 Nov 2014 16:13:21 +0100
Subject: [PATCH 0459/2267] Omit priority prefix if {priority => false} passed
 to vhost/custom_config

Do not prefix filenames in apache::vhost and apache::custom_config when
priority is set to false.
---
 README.md                             |    4 +
 manifests/custom_config.pp            |   13 +-
 manifests/vhost.pp                    | 1489 +++++++++++++------------
 spec/acceptance/custom_config_spec.rb |   17 +
 spec/acceptance/vhost_spec.rb         |   16 +
 5 files changed, 793 insertions(+), 746 deletions(-)

diff --git a/README.md b/README.md
index 719e6bde14..d0d90bab28 100644
--- a/README.md
+++ b/README.md
@@ -477,6 +477,8 @@ The content of the configuration file. Only one of `$content` and `$source` can
 
 The priority of the configuration file, used for ordering. Defaults to '25'.
 
+Pass priority `false` to omit the priority prefix in file names.
+
 #####`source`
 
 The source of the configuration file. Only one of `$content` and `$source` can be specified.
@@ -1170,6 +1172,8 @@ If nothing matches the priority, the first name-based vhost is used. Likewise, p
 
 *Note:* You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
 
+Pass priority `false` to omit the priority prefix in file names.
+
 #####`proxy_dest`
 
 Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index cadc2354db..7bd4d3ed8e 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -23,8 +23,15 @@
 
   validate_bool($verify_config)
 
+  if $priority {
+    $priority_prefix = "${priority}-"
+  } else {
+    $priority_prefix = ''
+  }
+
   ## Apache include does not always work with spaces in the filename
-  $filename  = regsubst($name, ' ', '_', 'G')
+  $filename_middle = regsubst($name, ' ', '_', 'G')
+  $filename = "${priority_prefix}${filename_middle}.conf"
 
   if ! $verify_config or $ensure == 'absent' {
     $notifies = Service['httpd']
@@ -34,7 +41,7 @@
 
   file { "apache_${name}":
     ensure  => $ensure,
-    path    => "${confdir}/${priority}-${filename}.conf",
+    path    => "${confdir}/${filename}",
     content => $content,
     source  => $source,
     require => Package['httpd'],
@@ -51,7 +58,7 @@
     }
 
     exec { "remove ${name} if invalid":
-      command     => "/bin/rm ${confdir}/${priority}-${filename}.conf",
+      command     => "/bin/rm ${confdir}/${filename}",
       unless      => $verify_command,
       subscribe   => File["apache_${name}"],
       refreshonly => true,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 50b3a1ec4a..997866980b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -61,772 +61,775 @@
   $suphp_engine                = $::apache::params::suphp_engine,
   $suphp_configpath            = $::apache::params::suphp_configpath,
   $php_admin_flags             = {},
-  $php_admin_values            = {},
-  $no_proxy_uris               = [],
-  $proxy_preserve_host         = false,
-  $redirect_source             = '/',
-  $redirect_dest               = undef,
-  $redirect_status             = undef,
-  $redirectmatch_status        = undef,
-  $redirectmatch_regexp        = undef,
-  $redirectmatch_dest          = undef,
-  $rack_base_uris              = undef,
-  $headers                     = undef,
-  $request_headers             = undef,
-  $rewrites                    = undef,
-  $rewrite_base                = undef,
-  $rewrite_rule                = undef,
-  $rewrite_cond                = undef,
-  $setenv                      = [],
-  $setenvif                    = [],
-  $block                       = [],
-  $ensure                      = 'present',
-  $wsgi_application_group      = undef,
-  $wsgi_daemon_process         = undef,
-  $wsgi_daemon_process_options = undef,
-  $wsgi_import_script          = undef,
-  $wsgi_import_script_options  = undef,
-  $wsgi_process_group          = undef,
-  $wsgi_script_aliases         = undef,
-  $wsgi_pass_authorization     = undef,
-  $wsgi_chunked_request        = undef,
-  $custom_fragment             = undef,
-  $itk                         = undef,
-  $action                      = undef,
-  $fastcgi_server              = undef,
-  $fastcgi_socket              = undef,
-  $fastcgi_dir                 = undef,
-  $additional_includes         = [],
-  $apache_version              = $::apache::apache_version,
-  $allow_encoded_slashes       = undef,
-  $suexec_user_group           = undef,
-  $passenger_app_root          = undef,
-  $passenger_ruby              = undef,
-  $passenger_min_instances     = undef,
-  $passenger_start_timeout     = undef,
-  $passenger_pre_start         = undef,
-  $add_default_charset         = undef,
-) {
-  # The base class must be included first because it is used by parameter defaults
-  if ! defined(Class['apache']) {
-    fail('You must include the apache base class before using any apache defined resources')
-  }
-
-  $apache_name = $::apache::params::apache_name
-
-  validate_re($ensure, '^(present|absent)$',
-  "${ensure} is not supported for ensure.
-  Allowed values are 'present' and 'absent'.")
-  validate_re($suphp_engine, '^(on|off)$',
-  "${suphp_engine} is not supported for suphp_engine.
-  Allowed values are 'on' and 'off'.")
-  validate_bool($ip_based)
-  validate_bool($access_log)
-  validate_bool($error_log)
-  validate_bool($ssl)
-  validate_bool($default_vhost)
-  validate_bool($ssl_proxyengine)
-  if $rewrites {
-    validate_array($rewrites)
-    validate_hash($rewrites[0])
-  }
-
-  # Input validation begins
-
-  if $suexec_user_group {
-    validate_re($suexec_user_group, '^\w+ \w+$',
-    "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
-  }
-
-  if $wsgi_pass_authorization {
-    validate_re(downcase($wsgi_pass_authorization), '^(on|off)$',
-    "${wsgi_pass_authorization} is not supported for wsgi_pass_authorization.
-    Allowed values are 'on' and 'off'.")
-  }
-
-  # Deprecated backwards-compatibility
-  if $rewrite_base {
-    warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')
-  }
-  if $rewrite_rule {
-    warning('Apache::Vhost: parameter rewrite_rule is deprecated in favor of rewrites')
-  }
-  if $rewrite_cond {
-    warning('Apache::Vhost parameter rewrite_cond is deprecated in favor of rewrites')
-  }
-
-  if $wsgi_script_aliases {
-    validate_hash($wsgi_script_aliases)
-  }
-  if $wsgi_daemon_process_options {
-    validate_hash($wsgi_daemon_process_options)
-  }
-  if $wsgi_import_script_options {
-    validate_hash($wsgi_import_script_options)
-  }
-  if $itk {
-    validate_hash($itk)
-  }
-
-  validate_re($logroot_ensure, '^(directory|absent)$',
-  "${logroot_ensure} is not supported for logroot_ensure.
-  Allowed values are 'directory' and 'absent'.")
-
-  if $log_level {
-    validate_re($log_level, '^(emerg|alert|crit|error|warn|notice|info|debug)$',
-    "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
-  }
-
-  if $access_log_file and $access_log_pipe {
-    fail("Apache::Vhost[${name}]: 'access_log_file' and 'access_log_pipe' cannot be defined at the same time")
-  }
-
-  if $error_log_file and $error_log_pipe {
-    fail("Apache::Vhost[${name}]: 'error_log_file' and 'error_log_pipe' cannot be defined at the same time")
-  }
-
-  if $fallbackresource {
-    validate_re($fallbackresource, '^/|disabled', 'Please make sure fallbackresource starts with a / (or is "disabled")')
-  }
-
-  if $custom_fragment {
-    validate_string($custom_fragment)
-  }
-
-  if $allow_encoded_slashes {
-    validate_re($allow_encoded_slashes, '(^on$|^off$|^nodecode$)', "${allow_encoded_slashes} is not permitted for allow_encoded_slashes. Allowed values are 'on', 'off' or 'nodecode'.")
-  }
-
-  # Input validation ends
-
-  if $ssl and $ensure == 'present' {
-    include ::apache::mod::ssl
-    # Required for the AddType lines.
-    include ::apache::mod::mime
-  }
-
-  if $virtual_docroot {
-    include ::apache::mod::vhost_alias
-  }
-
-  if $wsgi_daemon_process {
-    include ::apache::mod::wsgi
-  }
-
-  if $suexec_user_group {
-    include ::apache::mod::suexec
-  }
-
-  if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
-    include ::apache::mod::passenger
-  }
-
-  # Configure the defaultness of a vhost
-  if $priority {
-    $priority_real = $priority
-  } elsif $default_vhost {
-    $priority_real = '10'
-  } else {
-    $priority_real = '25'
-  }
-
-  ## Apache include does not always work with spaces in the filename
-  $filename = regsubst($name, ' ', '_', 'G')
-
-  # This ensures that the docroot exists
-  # But enables it to be specified across multiple vhost resources
-  if ! defined(File[$docroot]) and $manage_docroot {
-    file { $docroot:
-      ensure  => directory,
-      owner   => $docroot_owner,
-      group   => $docroot_group,
-      mode    => $docroot_mode,
-      require => Package['httpd'],
-      before  => Concat["${priority_real}-${filename}.conf"],
-    }
-  }
-
-  # Same as above, but for logroot
-  if ! defined(File[$logroot]) {
-    file { $logroot:
-      ensure  => $logroot_ensure,
-      mode    => $logroot_mode,
-      require => Package['httpd'],
-      before  => Concat["${priority_real}-${filename}.conf"],
-    }
-  }
-
-
-  # Is apache::mod::passenger enabled (or apache::mod['passenger'])
-  $passenger_enabled = defined(Apache::Mod['passenger'])
-
-  # Is apache::mod::shib enabled (or apache::mod['shib2'])
-  $shibboleth_enabled = defined(Apache::Mod['shib2'])
-
-  # Define log file names
-  if $access_log_file {
-    $access_log_destination = "${logroot}/${access_log_file}"
-  } elsif $access_log_pipe {
-    $access_log_destination = $access_log_pipe
-  } elsif $access_log_syslog {
-    $access_log_destination = $access_log_syslog
-  } else {
-    if $ssl {
-      $access_log_destination = "${logroot}/${name}_access_ssl.log"
-    } else {
-      $access_log_destination = "${logroot}/${name}_access.log"
-    }
-  }
-
-  if $error_log_file {
-    $error_log_destination = "${logroot}/${error_log_file}"
-  } elsif $error_log_pipe {
-    $error_log_destination = $error_log_pipe
-  } elsif $error_log_syslog {
-    $error_log_destination = $error_log_syslog
-  } else {
-    if $ssl {
-      $error_log_destination = "${logroot}/${name}_error_ssl.log"
-    } else {
-      $error_log_destination = "${logroot}/${name}_error.log"
-    }
-  }
-
-  # Set access log format
-  if $access_log_format {
-    $_access_log_format = "\"${access_log_format}\""
-  } else {
-    $_access_log_format = 'combined'
-  }
-
-  if $access_log_env_var {
-    $_access_log_env_var = "env=${access_log_env_var}"
-  }
-
-  if $ip {
-    if $port {
-      $listen_addr_port = "${ip}:${port}"
-      $nvh_addr_port = "${ip}:${port}"
-    } else {
-      $listen_addr_port = undef
-      $nvh_addr_port = $ip
-      if ! $servername and ! $ip_based {
-        fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters for name-based vhosts")
-      }
-    }
-  } else {
-    if $port {
-      $listen_addr_port = $port
-      $nvh_addr_port = "${vhost_name}:${port}"
-    } else {
-      $listen_addr_port = undef
-      $nvh_addr_port = $name
-      if ! $servername {
-        fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters, and/or 'servername' parameter")
-      }
-    }
-  }
-  if $add_listen {
-    if $ip and defined(Apache::Listen["${port}"]) {
-      fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
-    }
-    if ! defined(Apache::Listen["${listen_addr_port}"]) and $listen_addr_port and $ensure == 'present' {
-      ::apache::listen { "${listen_addr_port}": }
-    }
-  }
-  if ! $ip_based {
-    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) {
-      ::apache::namevirtualhost { $nvh_addr_port: }
-    }
-  }
-
-  # Load mod_rewrite if needed and not yet loaded
-  if $rewrites or $rewrite_cond {
-    if ! defined(Class['apache::mod::rewrite']) {
-      include ::apache::mod::rewrite
-    }
-  }
-
-  # Load mod_alias if needed and not yet loaded
-  if ($scriptalias or $scriptaliases != []) or ($redirect_source and $redirect_dest) {
-    if ! defined(Class['apache::mod::alias']) {
-      include ::apache::mod::alias
-    }
-  }
-
-  # Load mod_proxy if needed and not yet loaded
-  if ($proxy_dest or $proxy_pass) {
-    if ! defined(Class['apache::mod::proxy']) {
-      include ::apache::mod::proxy
-    }
-    if ! defined(Class['apache::mod::proxy_http']) {
-      include ::apache::mod::proxy_http
-    }
-  }
-
-  # Load mod_passenger if needed and not yet loaded
-  if $rack_base_uris {
-    if ! defined(Class['apache::mod::passenger']) {
-      include ::apache::mod::passenger
-    }
-  }
-
-  # Load mod_fastci if needed and not yet loaded
-  if $fastcgi_server and $fastcgi_socket {
-    if ! defined(Class['apache::mod::fastcgi']) {
-      include ::apache::mod::fastcgi
-    }
-  }
-
-  # Check if mod_headers is required to process $headers/$request_headers
-  if $headers or $request_headers {
-    if ! defined(Class['apache::mod::headers']) {
-      include ::apache::mod::headers
-    }
-  }
-
-  ## Create a default directory list if none defined
-  if $directories {
-    if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {
-      fail("Apache::Vhost[${name}]: 'directories' must be either a Hash or an Array of Hashes")
-    }
-    $_directories = $directories
-  } else {
-    $_directory = {
-      provider       => 'directory',
-      path           => $docroot,
-      options        => $options,
-      allow_override => $override,
-      directoryindex => $directoryindex,
-    }
-
-    if versioncmp($apache_version, '2.4') >= 0 {
-      $_directory_version = {
-        require => 'all granted',
+    $php_admin_values            = {},
+      $no_proxy_uris               = [],
+      $proxy_preserve_host         = false,
+      $redirect_source             = '/',
+      $redirect_dest               = undef,
+      $redirect_status             = undef,
+      $redirectmatch_status        = undef,
+      $redirectmatch_regexp        = undef,
+      $redirectmatch_dest          = undef,
+      $rack_base_uris              = undef,
+      $headers                     = undef,
+      $request_headers             = undef,
+      $rewrites                    = undef,
+      $rewrite_base                = undef,
+      $rewrite_rule                = undef,
+      $rewrite_cond                = undef,
+      $setenv                      = [],
+      $setenvif                    = [],
+      $block                       = [],
+      $ensure                      = 'present',
+      $wsgi_application_group      = undef,
+      $wsgi_daemon_process         = undef,
+      $wsgi_daemon_process_options = undef,
+      $wsgi_import_script          = undef,
+      $wsgi_import_script_options  = undef,
+      $wsgi_process_group          = undef,
+      $wsgi_script_aliases         = undef,
+      $wsgi_pass_authorization     = undef,
+      $wsgi_chunked_request        = undef,
+      $custom_fragment             = undef,
+      $itk                         = undef,
+      $action                      = undef,
+      $fastcgi_server              = undef,
+      $fastcgi_socket              = undef,
+      $fastcgi_dir                 = undef,
+      $additional_includes         = [],
+      $apache_version              = $::apache::apache_version,
+      $allow_encoded_slashes       = undef,
+      $suexec_user_group           = undef,
+      $passenger_app_root          = undef,
+      $passenger_ruby              = undef,
+      $passenger_min_instances     = undef,
+      $passenger_start_timeout     = undef,
+      $passenger_pre_start         = undef,
+      $add_default_charset         = undef,
+      ) {
+        # The base class must be included first because it is used by parameter defaults
+        if ! defined(Class['apache']) {
+          fail('You must include the apache base class before using any apache defined resources')
+        }
+        
+        $apache_name = $::apache::params::apache_name
+        
+        validate_re($ensure, '^(present|absent)$',
+        "${ensure} is not supported for ensure.
+        Allowed values are 'present' and 'absent'.")
+        validate_re($suphp_engine, '^(on|off)$',
+        "${suphp_engine} is not supported for suphp_engine.
+        Allowed values are 'on' and 'off'.")
+        validate_bool($ip_based)
+        validate_bool($access_log)
+        validate_bool($error_log)
+        validate_bool($ssl)
+        validate_bool($default_vhost)
+        validate_bool($ssl_proxyengine)
+        if $rewrites {
+          validate_array($rewrites)
+          validate_hash($rewrites[0])
+        }
+        
+        # Input validation begins
+        
+        if $suexec_user_group {
+          validate_re($suexec_user_group, '^\w+ \w+$',
+          "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
+        }
+        
+        if $wsgi_pass_authorization {
+          validate_re(downcase($wsgi_pass_authorization), '^(on|off)$',
+          "${wsgi_pass_authorization} is not supported for wsgi_pass_authorization.
+          Allowed values are 'on' and 'off'.")
+        }
+        
+        # Deprecated backwards-compatibility
+        if $rewrite_base {
+          warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')
+        }
+        if $rewrite_rule {
+          warning('Apache::Vhost: parameter rewrite_rule is deprecated in favor of rewrites')
+        }
+        if $rewrite_cond {
+          warning('Apache::Vhost parameter rewrite_cond is deprecated in favor of rewrites')
+        }
+        
+        if $wsgi_script_aliases {
+          validate_hash($wsgi_script_aliases)
+        }
+        if $wsgi_daemon_process_options {
+          validate_hash($wsgi_daemon_process_options)
+        }
+        if $wsgi_import_script_options {
+          validate_hash($wsgi_import_script_options)
+        }
+        if $itk {
+          validate_hash($itk)
+        }
+        
+        validate_re($logroot_ensure, '^(directory|absent)$',
+        "${logroot_ensure} is not supported for logroot_ensure.
+        Allowed values are 'directory' and 'absent'.")
+        
+        if $log_level {
+          validate_re($log_level, '^(emerg|alert|crit|error|warn|notice|info|debug)$',
+          "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
+        }
+        
+        if $access_log_file and $access_log_pipe {
+          fail("Apache::Vhost[${name}]: 'access_log_file' and 'access_log_pipe' cannot be defined at the same time")
+        }
+        
+        if $error_log_file and $error_log_pipe {
+          fail("Apache::Vhost[${name}]: 'error_log_file' and 'error_log_pipe' cannot be defined at the same time")
+        }
+        
+        if $fallbackresource {
+          validate_re($fallbackresource, '^/|disabled', 'Please make sure fallbackresource starts with a / (or is "disabled")')
+        }
+        
+        if $custom_fragment {
+          validate_string($custom_fragment)
+        }
+        
+        if $allow_encoded_slashes {
+          validate_re($allow_encoded_slashes, '(^on$|^off$|^nodecode$)', "${allow_encoded_slashes} is not permitted for allow_encoded_slashes. Allowed values are 'on', 'off' or 'nodecode'.")
+        }
+        
+        # Input validation ends
+        
+        if $ssl and $ensure == 'present' {
+          include ::apache::mod::ssl
+          # Required for the AddType lines.
+          include ::apache::mod::mime
+        }
+        
+        if $virtual_docroot {
+          include ::apache::mod::vhost_alias
+        }
+        
+        if $wsgi_daemon_process {
+          include ::apache::mod::wsgi
+        }
+        
+        if $suexec_user_group {
+          include ::apache::mod::suexec
+        }
+        
+        if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+          include ::apache::mod::passenger
+        }
+        
+        # Configure the defaultness of a vhost
+        if $priority {
+          $priority_prefix = "${priority}-"
+          } elsif $priority == false {
+            $priority_prefix = ''
+            } elsif $default_vhost {
+              $priority_prefix = '10-'
+              } else {
+                $priority_prefix = '25-'
+              }
+              
+              ## Apache include does not always work with spaces in the filename
+              $filename_middle = regsubst($name, ' ', '_', 'G')
+              $filename = "${priority_prefix}${filename_middle}.conf"
+              
+              # This ensures that the docroot exists
+              # But enables it to be specified across multiple vhost resources
+              if ! defined(File[$docroot]) and $manage_docroot {
+                file { $docroot:
+                  ensure  => directory,
+                  owner   => $docroot_owner,
+                  group   => $docroot_group,
+                  mode    => $docroot_mode,
+                  require => Package['httpd'],
+                  before  => Concat[$filename],
+                }
+              }
+              
+              # Same as above, but for logroot
+              if ! defined(File[$logroot]) {
+                file { $logroot:
+                  ensure  => $logroot_ensure,
+                  mode    => $logroot_mode,
+                  require => Package['httpd'],
+                  before  => Concat[$filename],
+                }
+              }
+              
+              
+              # Is apache::mod::passenger enabled (or apache::mod['passenger'])
+              $passenger_enabled = defined(Apache::Mod['passenger'])
+              
+              # Is apache::mod::shib enabled (or apache::mod['shib2'])
+              $shibboleth_enabled = defined(Apache::Mod['shib2'])
+              
+              # Define log file names
+              if $access_log_file {
+                $access_log_destination = "${logroot}/${access_log_file}"
+                } elsif $access_log_pipe {
+                  $access_log_destination = $access_log_pipe
+                  } elsif $access_log_syslog {
+                    $access_log_destination = $access_log_syslog
+                    } else {
+                      if $ssl {
+                        $access_log_destination = "${logroot}/${name}_access_ssl.log"
+                        } else {
+                          $access_log_destination = "${logroot}/${name}_access.log"
+                        }
+                      }
+                      
+                      if $error_log_file {
+                        $error_log_destination = "${logroot}/${error_log_file}"
+                        } elsif $error_log_pipe {
+                          $error_log_destination = $error_log_pipe
+                          } elsif $error_log_syslog {
+                            $error_log_destination = $error_log_syslog
+                            } else {
+                              if $ssl {
+                                $error_log_destination = "${logroot}/${name}_error_ssl.log"
+                                } else {
+                                  $error_log_destination = "${logroot}/${name}_error.log"
+                                }
+                              }
+                              
+                              # Set access log format
+                              if $access_log_format {
+                                $_access_log_format = "\"${access_log_format}\""
+                                } else {
+                                  $_access_log_format = 'combined'
+                                }
+                                
+                                if $access_log_env_var {
+                                  $_access_log_env_var = "env=${access_log_env_var}"
+                                }
+                                
+                                if $ip {
+                                  if $port {
+                                    $listen_addr_port = "${ip}:${port}"
+                                    $nvh_addr_port = "${ip}:${port}"
+                                    } else {
+                                      $listen_addr_port = undef
+                                      $nvh_addr_port = $ip
+                                      if ! $servername and ! $ip_based {
+                                        fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters for name-based vhosts")
+                                      }
+                                    }
+                                    } else {
+                                      if $port {
+                                        $listen_addr_port = $port
+                                        $nvh_addr_port = "${vhost_name}:${port}"
+                                        } else {
+                                          $listen_addr_port = undef
+                                          $nvh_addr_port = $name
+                                          if ! $servername {
+                                            fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters, and/or 'servername' parameter")
+                                          }
+                                        }
+                                      }
+                                      if $add_listen {
+                                        if $ip and defined(Apache::Listen["${port}"]) {
+                                          fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
+                                        }
+                                        if ! defined(Apache::Listen["${listen_addr_port}"]) and $listen_addr_port and $ensure == 'present' {
+                                          ::apache::listen { "${listen_addr_port}": }
+                                        }
+                                      }
+                                      if ! $ip_based {
+                                        if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) {
+                                          ::apache::namevirtualhost { $nvh_addr_port: }
+                                        }
+                                      }
+                                      
+                                      # Load mod_rewrite if needed and not yet loaded
+                                      if $rewrites or $rewrite_cond {
+                                        if ! defined(Class['apache::mod::rewrite']) {
+                                          include ::apache::mod::rewrite
+                                        }
+                                      }
+                                      
+                                      # Load mod_alias if needed and not yet loaded
+                                      if ($scriptalias or $scriptaliases != []) or ($redirect_source and $redirect_dest) {
+                                        if ! defined(Class['apache::mod::alias']) {
+                                          include ::apache::mod::alias
+                                        }
+                                      }
+                                      
+                                      # Load mod_proxy if needed and not yet loaded
+                                      if ($proxy_dest or $proxy_pass) {
+                                        if ! defined(Class['apache::mod::proxy']) {
+                                          include ::apache::mod::proxy
+                                        }
+                                        if ! defined(Class['apache::mod::proxy_http']) {
+                                          include ::apache::mod::proxy_http
+                                        }
+                                      }
+                                      
+                                      # Load mod_passenger if needed and not yet loaded
+                                      if $rack_base_uris {
+                                        if ! defined(Class['apache::mod::passenger']) {
+                                          include ::apache::mod::passenger
+                                        }
+                                      }
+                                      
+                                      # Load mod_fastci if needed and not yet loaded
+                                      if $fastcgi_server and $fastcgi_socket {
+                                        if ! defined(Class['apache::mod::fastcgi']) {
+                                          include ::apache::mod::fastcgi
+                                        }
+                                      }
+                                      
+                                      # Check if mod_headers is required to process $headers/$request_headers
+                                      if $headers or $request_headers {
+                                        if ! defined(Class['apache::mod::headers']) {
+                                          include ::apache::mod::headers
+                                        }
+                                      }
+                                      
+                                      ## Create a default directory list if none defined
+                                      if $directories {
+                                        if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {
+                                          fail("Apache::Vhost[${name}]: 'directories' must be either a Hash or an Array of Hashes")
+                                        }
+                                        $_directories = $directories
+                                        } else {
+                                          $_directory = {
+                                            provider       => 'directory',
+                                            path           => $docroot,
+                                            options        => $options,
+                                            allow_override => $override,
+                                            directoryindex => $directoryindex,
+                                          }
+                                          
+                                          if versioncmp($apache_version, '2.4') >= 0 {
+                                            $_directory_version = {
+                                              require => 'all granted',
+                                            }
+                                            } else {
+                                              $_directory_version = {
+                                                order => 'allow,deny',
+                                                allow => 'from all',
+                                              }
+                                            }
+                                            
+                                            $_directories = [ merge($_directory, $_directory_version) ]
+                                          }
+                                          
+                                          concat { $filename:
+                                            ensure  => $ensure,
+                                            path    => "${::apache::vhost_dir}/${filename}",
+                                            owner   => 'root',
+                                            group   => $::apache::params::root_group,
+                                            mode    => '0644',
+                                            order   => 'numeric',
+                                            require => Package['httpd'],
+                                            notify  => Service['httpd'],
+                                          }
+                                          if $::osfamily == 'Debian' {
+                                            $vhost_enable_dir = $::apache::vhost_enable_dir
+                                            $vhost_symlink_ensure = $ensure ? {
+                                              present => link,
+                                              default => $ensure,
+                                            }
+                                            file{ "${filename} symlink":
+                                            ensure  => $vhost_symlink_ensure,
+                                            path    => "${vhost_enable_dir}/${filename}",
+                                            target  => "${::apache::vhost_dir}/${filename}",
+                                            owner   => 'root',
+                                            group   => $::apache::params::root_group,
+                                            mode    => '0644',
+                                            require => Concat[$filename],
+                                            notify  => Service['httpd'],
+                                          }
+                                        }
+                                        
+                                        # Template uses:
+                                        # - $nvh_addr_port
+                                        # - $servername
+                                        # - $serveradmin
+                                        concat::fragment { "${name}-apache-header":
+                                        target  => $filename,
+                                        order   => 0,
+                                        content => template('apache/vhost/_file_header.erb'),
+                                      }
+                                      
+                                      # Template uses:
+                                      # - $virtual_docroot
+                                      # - $docroot
+                                      concat::fragment { "${name}-docroot":
+                                      target  => $filename,
+                                      order   => 10,
+                                      content => template('apache/vhost/_docroot.erb'),
+                                    }
+                                    
+                                    # Template uses:
+                                    # - $aliases
+                                    if $aliases and ! empty($aliases) {
+                                      concat::fragment { "${name}-aliases":
+                                      target  => $filename,
+                                      order   => 20,
+                                      content => template('apache/vhost/_aliases.erb'),
+                                    }
+                                  }
+                                  
+                                  # Template uses:
+                                  # - $itk
+                                  # - $::kernelversion
+                                  if $itk and ! empty($itk) {
+                                    concat::fragment { "${name}-itk":
+                                    target  => $filename,
+                                    order   => 30,
+                                    content => template('apache/vhost/_itk.erb'),
+                                  }
+                                }
+                                
+                                # Template uses:
+                                # - $fallbackresource
+                                if $fallbackresource {
+                                  concat::fragment { "${name}-fallbackresource":
+                                  target  => $filename,
+                                  order   => 40,
+                                  content => template('apache/vhost/_fallbackresource.erb'),
+                                }
+                              }
+                              
+                              # Template uses:
+                              # - $allow_encoded_slashes
+                              if $allow_encoded_slashes {
+                                concat::fragment { "${name}-allow_encoded_slashes":
+                                target  => $filename,
+                                order   => 50,
+                                content => template('apache/vhost/_allow_encoded_slashes.erb'),
+                              }
+                            }
+                            
+                            # Template uses:
+                            # - $_directories
+                            # - $docroot
+                            # - $apache_version
+                            # - $suphp_engine
+                            # - $shibboleth_enabled
+                            if $_directories and ! empty($_directories) {
+                              concat::fragment { "${name}-directories":
+                              target  => $filename,
+                              order   => 60,
+                              content => template('apache/vhost/_directories.erb'),
+                            }
+                          }
+                          
+                          # Template uses:
+                          # - $additional_includes
+                          if $additional_includes and ! empty($additional_includes) {
+                            concat::fragment { "${name}-additional_includes":
+                            target  => $filename,
+                            order   => 70,
+                            content => template('apache/vhost/_additional_includes.erb'),
+                          }
+                        }
+                        
+                        # Template uses:
+                        # - $error_log
+                        # - $log_level
+                        # - $error_log_destination
+                        # - $log_level
+                        if $error_log or $log_level {
+                          concat::fragment { "${name}-logging":
+                          target  => $filename,
+                          order   => 80,
+                          content => template('apache/vhost/_logging.erb'),
+                        }
+                      }
+                      
+                      # Template uses no variables
+                      concat::fragment { "${name}-serversignature":
+                      target  => $filename,
+                      order   => 90,
+                      content => template('apache/vhost/_serversignature.erb'),
+                    }
+                    
+                    # Template uses:
+                    # - $access_log
+                    # - $_access_log_env_var
+                    # - $access_log_destination
+                    # - $_access_log_format
+                    # - $_access_log_env_var
+                    if $access_log {
+                      concat::fragment { "${name}-access_log":
+                      target  => $filename,
+                      order   => 100,
+                      content => template('apache/vhost/_access_log.erb'),
+                    }
+                  }
+                  
+                  # Template uses:
+                  # - $action
+                  if $action {
+                    concat::fragment { "${name}-action":
+                    target  => $filename,
+                    order   => 110,
+                    content => template('apache/vhost/_action.erb'),
+                  }
+                }
+                
+                # Template uses:
+                # - $block
+                # - $apache_version
+                if $block and ! empty($block) {
+                  concat::fragment { "${name}-block":
+                  target  => $filename,
+                  order   => 120,
+                  content => template('apache/vhost/_block.erb'),
+                }
+              }
+              
+              # Template uses:
+              # - $error_documents
+              if $error_documents and ! empty($error_documents) {
+                concat::fragment { "${name}-error_document":
+                target  => $filename,
+                order   => 130,
+                content => template('apache/vhost/_error_document.erb'),
+              }
+            }
+            
+            # Template uses:
+            # - $proxy_dest
+            # - $proxy_pass
+            # - $proxy_preserve_host
+            # - $no_proxy_uris
+            if $proxy_dest or $proxy_pass {
+              concat::fragment { "${name}-proxy":
+              target  => $filename,
+              order   => 140,
+              content => template('apache/vhost/_proxy.erb'),
+            }
+          }
+          
+          # Template uses:
+          # - $rack_base_uris
+          if $rack_base_uris {
+            concat::fragment { "${name}-rack":
+            target  => $filename,
+            order   => 150,
+            content => template('apache/vhost/_rack.erb'),
+          }
+        }
+        
+        # Template uses:
+        # - $redirect_source
+        # - $redirect_dest
+        # - $redirect_status
+        # - $redirect_dest_a
+        # - $redirect_source_a
+        # - $redirect_status_a
+        # - $redirectmatch_status
+        # - $redirectmatch_regexp
+        # - $redirectmatch_dest
+        # - $redirectmatch_status_a
+        # - $redirectmatch_regexp_a
+        # - $redirectmatch_dest
+        if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp and $redirectmatch_dest) {
+          concat::fragment { "${name}-redirect":
+          target  => $filename,
+          order   => 160,
+          content => template('apache/vhost/_redirect.erb'),
+        }
       }
-    } else {
-      $_directory_version = {
-        order => 'allow,deny',
-        allow => 'from all',
+      
+      # Template uses:
+      # - $rewrites
+      # - $rewrite_base
+      # - $rewrite_rule
+      # - $rewrite_cond
+      if $rewrites or $rewrite_rule {
+        concat::fragment { "${name}-rewrite":
+        target  => $filename,
+        order   => 170,
+        content => template('apache/vhost/_rewrite.erb'),
       }
     }
-
-    $_directories = [ merge($_directory, $_directory_version) ]
-  }
-
-  concat { "${priority_real}-${filename}.conf":
-    ensure  => $ensure,
-    path    => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
-    owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => '0644',
-    order   => 'numeric',
-    require => Package['httpd'],
-    notify  => Service['httpd'],
-  }
-  if $::osfamily == 'Debian' {
-    $vhost_enable_dir = $::apache::vhost_enable_dir
-    $vhost_symlink_ensure = $ensure ? {
-      present => link,
-      default => $ensure,
-    }
-    file{ "${priority_real}-${filename}.conf symlink":
-      ensure  => $vhost_symlink_ensure,
-      path    => "${vhost_enable_dir}/${priority_real}-${filename}.conf",
-      target  => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
-      owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => '0644',
-      require => Concat["${priority_real}-${filename}.conf"],
-      notify  => Service['httpd'],
-    }
-  }
-
-  # Template uses:
-  # - $nvh_addr_port
-  # - $servername
-  # - $serveradmin
-  concat::fragment { "${name}-apache-header":
-    target  => "${priority_real}-${filename}.conf",
-    order   => 0,
-    content => template('apache/vhost/_file_header.erb'),
-  }
-
-  # Template uses:
-  # - $virtual_docroot
-  # - $docroot
-  concat::fragment { "${name}-docroot":
-    target  => "${priority_real}-${filename}.conf",
-    order   => 10,
-    content => template('apache/vhost/_docroot.erb'),
-  }
-
-  # Template uses:
-  # - $aliases
-  if $aliases and ! empty($aliases) {
-    concat::fragment { "${name}-aliases":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 20,
-      content => template('apache/vhost/_aliases.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $itk
-  # - $::kernelversion
-  if $itk and ! empty($itk) {
-    concat::fragment { "${name}-itk":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 30,
-      content => template('apache/vhost/_itk.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $fallbackresource
-  if $fallbackresource {
-    concat::fragment { "${name}-fallbackresource":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 40,
-      content => template('apache/vhost/_fallbackresource.erb'),
-    }
-  }
-  
-  # Template uses:
-  # - $allow_encoded_slashes
-  if $allow_encoded_slashes {
-    concat::fragment { "${name}-allow_encoded_slashes":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 50,
-      content => template('apache/vhost/_allow_encoded_slashes.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $_directories
-  # - $docroot
-  # - $apache_version
-  # - $suphp_engine
-  # - $shibboleth_enabled
-  if $_directories and ! empty($_directories) {
-    concat::fragment { "${name}-directories":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 60,
-      content => template('apache/vhost/_directories.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $additional_includes
-  if $additional_includes and ! empty($additional_includes) {
-    concat::fragment { "${name}-additional_includes":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 70,
-      content => template('apache/vhost/_additional_includes.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $error_log
-  # - $log_level
-  # - $error_log_destination
-  # - $log_level
-  if $error_log or $log_level {
-    concat::fragment { "${name}-logging":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 80,
-      content => template('apache/vhost/_logging.erb'),
-    }
-  }
-
-  # Template uses no variables
-  concat::fragment { "${name}-serversignature":
-    target  => "${priority_real}-${filename}.conf",
-    order   => 90,
-    content => template('apache/vhost/_serversignature.erb'),
-  }
-
-  # Template uses:
-  # - $access_log
-  # - $_access_log_env_var
-  # - $access_log_destination
-  # - $_access_log_format
-  # - $_access_log_env_var
-  if $access_log {
-    concat::fragment { "${name}-access_log":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 100,
-      content => template('apache/vhost/_access_log.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $action
-  if $action {
-    concat::fragment { "${name}-action":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 110,
-      content => template('apache/vhost/_action.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $block
-  # - $apache_version
-  if $block and ! empty($block) {
-    concat::fragment { "${name}-block":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 120,
-      content => template('apache/vhost/_block.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $error_documents
-  if $error_documents and ! empty($error_documents) {
-    concat::fragment { "${name}-error_document":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 130,
-      content => template('apache/vhost/_error_document.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $proxy_dest
-  # - $proxy_pass
-  # - $proxy_preserve_host
-  # - $no_proxy_uris
-  if $proxy_dest or $proxy_pass {
-    concat::fragment { "${name}-proxy":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 140,
-      content => template('apache/vhost/_proxy.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $rack_base_uris
-  if $rack_base_uris {
-    concat::fragment { "${name}-rack":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 150,
-      content => template('apache/vhost/_rack.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $redirect_source
-  # - $redirect_dest
-  # - $redirect_status
-  # - $redirect_dest_a
-  # - $redirect_source_a
-  # - $redirect_status_a
-  # - $redirectmatch_status
-  # - $redirectmatch_regexp
-  # - $redirectmatch_dest
-  # - $redirectmatch_status_a
-  # - $redirectmatch_regexp_a
-  # - $redirectmatch_dest
-  if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp and $redirectmatch_dest) {
-    concat::fragment { "${name}-redirect":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 160,
-      content => template('apache/vhost/_redirect.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $rewrites
-  # - $rewrite_base
-  # - $rewrite_rule
-  # - $rewrite_cond
-  if $rewrites or $rewrite_rule {
-    concat::fragment { "${name}-rewrite":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 170,
-      content => template('apache/vhost/_rewrite.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $scriptaliases
-  # - $scriptalias
-  if $scriptaliases and ! empty($scriptaliases) {
-    concat::fragment { "${name}-scriptalias":
-      target  => "${priority_real}-${filename}.conf",
+    
+    # Template uses:
+    # - $scriptaliases
+    # - $scriptalias
+    if $scriptaliases and ! empty($scriptaliases) {
+      concat::fragment { "${name}-scriptalias":
+      target  => $filename,
       order   => 180,
       content => template('apache/vhost/_scriptalias.erb'),
     }
   }
-
+  
   # Template uses:
   # - $serveraliases
   if $serveraliases and ! empty($serveraliases) {
     concat::fragment { "${name}-serveralias":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 190,
-      content => template('apache/vhost/_serveralias.erb'),
-    }
+    target  => $filename,
+    order   => 190,
+    content => template('apache/vhost/_serveralias.erb'),
   }
+}
 
-  # Template uses:
-  # - $setenv
-  # - $setenvif
-  if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
-    concat::fragment { "${name}-setenv":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 200,
-      content => template('apache/vhost/_setenv.erb'),
-    }
-  }
+# Template uses:
+# - $setenv
+# - $setenvif
+if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
+  concat::fragment { "${name}-setenv":
+  target  => $filename,
+  order   => 200,
+  content => template('apache/vhost/_setenv.erb'),
+}
+}
 
-  # Template uses:
-  # - $ssl
-  # - $ssl_cert
-  # - $ssl_key
-  # - $ssl_chain
-  # - $ssl_certs_dir
-  # - $ssl_ca
-  # - $ssl_crl_path
-  # - $ssl_crl
-  # - $ssl_crl_check
-  # - $ssl_proxyengine
-  # - $ssl_protocol
-  # - $ssl_cipher
-  # - $ssl_honorcipherorder
-  # - $ssl_verify_client
-  # - $ssl_verify_depth
-  # - $ssl_options
-  # - $apache_version
-  if $ssl {
-    concat::fragment { "${name}-ssl":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 210,
-      content => template('apache/vhost/_ssl.erb'),
-    }
-  }
+# Template uses:
+# - $ssl
+# - $ssl_cert
+# - $ssl_key
+# - $ssl_chain
+# - $ssl_certs_dir
+# - $ssl_ca
+# - $ssl_crl_path
+# - $ssl_crl
+# - $ssl_crl_check
+# - $ssl_proxyengine
+# - $ssl_protocol
+# - $ssl_cipher
+# - $ssl_honorcipherorder
+# - $ssl_verify_client
+# - $ssl_verify_depth
+# - $ssl_options
+# - $apache_version
+if $ssl {
+  concat::fragment { "${name}-ssl":
+  target  => $filename,
+  order   => 210,
+  content => template('apache/vhost/_ssl.erb'),
+}
+}
 
-  # Template uses:
-  # - $suphp_engine
-  # - $suphp_addhandler
-  # - $suphp_configpath
-  if $suphp_engine == 'on' {
-    concat::fragment { "${name}-suphp":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 220,
-      content => template('apache/vhost/_suphp.erb'),
-    }
-  }
+# Template uses:
+# - $suphp_engine
+# - $suphp_addhandler
+# - $suphp_configpath
+if $suphp_engine == 'on' {
+  concat::fragment { "${name}-suphp":
+  target  => $filename,
+  order   => 220,
+  content => template('apache/vhost/_suphp.erb'),
+}
+}
 
-  # Template uses:
-  # - $php_admin_values
-  # - $php_admin_flags
-  if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) {
-    concat::fragment { "${name}-php_admin":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 230,
-      content => template('apache/vhost/_php_admin.erb'),
-    }
-  }
+# Template uses:
+# - $php_admin_values
+# - $php_admin_flags
+if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) {
+  concat::fragment { "${name}-php_admin":
+  target  => $filename,
+  order   => 230,
+  content => template('apache/vhost/_php_admin.erb'),
+}
+}
 
-  # Template uses:
-  # - $headers
-  if $headers and ! empty($headers) {
-    concat::fragment { "${name}-header":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 240,
-      content => template('apache/vhost/_header.erb'),
-    }
-  }
+# Template uses:
+# - $headers
+if $headers and ! empty($headers) {
+  concat::fragment { "${name}-header":
+  target  => $filename,
+  order   => 240,
+  content => template('apache/vhost/_header.erb'),
+}
+}
 
-  # Template uses:
-  # - $request_headers
-  if $request_headers and ! empty($request_headers) {
-    concat::fragment { "${name}-requestheader":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 250,
-      content => template('apache/vhost/_requestheader.erb'),
-    }
-  }
+# Template uses:
+# - $request_headers
+if $request_headers and ! empty($request_headers) {
+  concat::fragment { "${name}-requestheader":
+  target  => $filename,
+  order   => 250,
+  content => template('apache/vhost/_requestheader.erb'),
+}
+}
 
-  # Template uses:
-  # - $wsgi_application_group
-  # - $wsgi_daemon_process
-  # - $wsgi_daemon_process_options
-  # - $wsgi_import_script
-  # - $wsgi_import_script_options
-  # - $wsgi_process_group
-  # - $wsgi_script_aliases
-  # - $wsgi_pass_authorization
-  if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
-    concat::fragment { "${name}-wsgi":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 260,
-      content => template('apache/vhost/_wsgi.erb'),
-    }
-  }
+# Template uses:
+# - $wsgi_application_group
+# - $wsgi_daemon_process
+# - $wsgi_daemon_process_options
+# - $wsgi_import_script
+# - $wsgi_import_script_options
+# - $wsgi_process_group
+# - $wsgi_script_aliases
+# - $wsgi_pass_authorization
+if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
+  concat::fragment { "${name}-wsgi":
+  target  => $filename,
+  order   => 260,
+  content => template('apache/vhost/_wsgi.erb'),
+}
+}
 
-  # Template uses:
-  # - $custom_fragment
-  if $custom_fragment {
-    concat::fragment { "${name}-custom_fragment":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 270,
-      content => template('apache/vhost/_custom_fragment.erb'),
-    }
-  }
+# Template uses:
+# - $custom_fragment
+if $custom_fragment {
+  concat::fragment { "${name}-custom_fragment":
+  target  => $filename,
+  order   => 270,
+  content => template('apache/vhost/_custom_fragment.erb'),
+}
+}
 
-  # Template uses:
-  # - $fastcgi_server
-  # - $fastcgi_socket
-  # - $fastcgi_dir
-  # - $apache_version
-  if $fastcgi_server or $fastcgi_dir {
-    concat::fragment { "${name}-fastcgi":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 280,
-      content => template('apache/vhost/_fastcgi.erb'),
-    }
-  }
+# Template uses:
+# - $fastcgi_server
+# - $fastcgi_socket
+# - $fastcgi_dir
+# - $apache_version
+if $fastcgi_server or $fastcgi_dir {
+  concat::fragment { "${name}-fastcgi":
+  target  => $filename,
+  order   => 280,
+  content => template('apache/vhost/_fastcgi.erb'),
+}
+}
 
-  # Template uses:
-  # - $suexec_user_group
-  if $suexec_user_group {
-    concat::fragment { "${name}-suexec":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 290,
-      content => template('apache/vhost/_suexec.erb'),
-    }
-  }
+# Template uses:
+# - $suexec_user_group
+if $suexec_user_group {
+  concat::fragment { "${name}-suexec":
+  target  => $filename,
+  order   => 290,
+  content => template('apache/vhost/_suexec.erb'),
+}
+}
 
-  # Template uses:
-  # - $passenger_app_root
-  # - $passenger_ruby
-  # - $passenger_min_instances
-  # - $passenger_start_timeout
-  # - $passenger_pre_start
-  if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
-    concat::fragment { "${name}-passenger":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 300,
-      content => template('apache/vhost/_passenger.erb'),
-    }
-  }
+# Template uses:
+# - $passenger_app_root
+# - $passenger_ruby
+# - $passenger_min_instances
+# - $passenger_start_timeout
+# - $passenger_pre_start
+if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+  concat::fragment { "${name}-passenger":
+  target  => $filename,
+  order   => 300,
+  content => template('apache/vhost/_passenger.erb'),
+}
+}
 
-  # Template uses:
-  # - $add_default_charset
-  if $add_default_charset {
-    concat::fragment { "${name}-charsets":
-      target  => "${priority_real}-${filename}.conf",
-      order   => 310,
-      content => template('apache/vhost/_charsets.erb'),
-    }
-  }
+# Template uses:
+# - $add_default_charset
+if $add_default_charset {
+  concat::fragment { "${name}-charsets":
+  target  => $filename,
+  order   => 310,
+  content => template('apache/vhost/_charsets.erb'),
+}
+}
 
-  # Template uses no variables
-  concat::fragment { "${name}-file_footer":
-    target  => "${priority_real}-${filename}.conf",
-    order   => 999,
-    content => template('apache/vhost/_file_footer.erb'),
-  }
+# Template uses no variables
+concat::fragment { "${name}-file_footer":
+target  => $filename,
+order   => 999,
+content => template('apache/vhost/_file_footer.erb'),
+}
 }
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index fce6bb306f..bbceaca3e7 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -35,4 +35,21 @@ class { 'apache': }
       it { is_expected.to contain '# just a comment' }
     end
   end
+
+  describe 'custom_config without priority prefix' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        apache::custom_config { 'prefix_test':
+          priority => false,
+          content => '# just a comment',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/prefix_test.conf") do
+      it { is_expected.to be_file }
+    end
+  end
 end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 483b74945c..72d30f10ff 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1223,4 +1223,20 @@ class { 'apache': }
     end
   end
 
+  describe 'virtualhost without priority prefix' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        apache::vhost { 'test.server':
+          priority => false,
+          docroot => '/tmp'
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/test.server.conf") do
+      it { is_expected.to be_file }
+    end
+  end
 end

From 2bae808dce4f2edbd23516d216445ae9ed0e2a85 Mon Sep 17 00:00:00 2001
From: Lauren Rother <lauren.rother@puppetlabs.com>
Date: Thu, 20 Nov 2014 15:34:34 -0800
Subject: [PATCH 0460/2267] Add metadata summary per FM-1523

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index f6361a10e0..f59c55a60b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -2,7 +2,7 @@
   "name": "puppetlabs-apache",
   "version": "1.2.0",
   "author": "puppetlabs",
-  "summary": "Puppet module for Apache",
+  "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache 2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-apache.git",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",

From d833c3e6a81752453738becf56fafd8c0d996d09 Mon Sep 17 00:00:00 2001
From: Lauren Rother <lauren.rother@puppetlabs.com>
Date: Fri, 21 Nov 2014 11:08:20 -0800
Subject: [PATCH 0461/2267] Fix MODULES-1510

Removes wiki link from Contributing section and replaces it with newly-created docs site link.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 719e6bde14..8994e6baa2 100644
--- a/README.md
+++ b/README.md
@@ -2374,7 +2374,7 @@ Puppet Labs modules on the Puppet Forge are open projects, and community contrib
 
 We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
 
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
+Read the complete module [contribution guide](https://docs.puppetlabs.com/forge/contributing.html)
 
 ###Running tests
 

From 5efcdcda4a71f69dbe80ca8326dfdc2d13ab8829 Mon Sep 17 00:00:00 2001
From: valeriominetti <valeriominetti@users.noreply.github.com>
Date: Wed, 26 Nov 2014 14:58:52 +0100
Subject: [PATCH 0462/2267] MODULES-825:  apache 2.4  mod_itk needs mod_prefork

in apache 2.4 mod_prefork can be installed along with mod_itk

On ubuntu 14.04 mod_itk library name is "mpm_itk.so" instead of "mod_mpm_itk.so".
Added an if statement that creates a symlink in case of a debian distro. this preserve old manifest behaviour in library loading while fixing ubuntu bug.
---
 manifests/mod/itk.pp     | 6 ++++--
 manifests/mod/prefork.pp | 6 ++++--
 manifests/mpm.pp         | 7 +++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 1083e5ed24..dc020b810a 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -13,8 +13,10 @@
   if defined(Class['apache::mod::peruser']) {
     fail('May not include both apache::mod::itk and apache::mod::peruser on the same node')
   }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
+  if versioncmp($apache_version, '2.4') < 0 {
+    if defined(Class['apache::mod::prefork']) {
+      fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
+    }
   }
   if defined(Class['apache::mod::worker']) {
     fail('May not include both apache::mod::itk and apache::mod::worker on the same node')
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index b3adeae8c8..6a66ef1c90 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -10,8 +10,10 @@
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
   }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
+  if versioncmp($apache_version, '2.4') < 0 {
+    if defined(Class['apache::mod::itk']) {
+      fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
+    }
   }
   if defined(Class['apache::mod::peruser']) {
     fail('May not include both apache::mod::prefork and apache::mod::peruser on the same node')
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 6437016ba7..ca976a41bd 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -45,6 +45,13 @@
           before  => File[$::apache::mod_enable_dir],
           notify  => Service['httpd'],
         }
+        
+        if $mpm == 'itk' {
+            file { "${lib_path}/mod_mpm_itk.so":
+              ensure  => link,
+              target  => "${lib_path}/mpm_itk.so"
+            }
+        }
       }
 
       if versioncmp($apache_version, '2.4') < 0 {

From 66036ddae62ce92377381846c0ad4d21ba72da29 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Tue, 2 Dec 2014 11:41:33 -0800
Subject: [PATCH 0463/2267] Update for using Geppetto plugin in CI

---
 .geppetto-rc.json | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .geppetto-rc.json

diff --git a/.geppetto-rc.json b/.geppetto-rc.json
new file mode 100644
index 0000000000..7df2329891
--- /dev/null
+++ b/.geppetto-rc.json
@@ -0,0 +1,9 @@
+{
+  "excludes": [
+    "**/contrib/**",
+    "**/examples/**",
+    "**/tests/**",
+    "**/spec/**",
+    "**/pkg/**"
+  ]
+}

From 8f89cae176f0b6bb97c54f48f5859834c3422bb8 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Tue, 2 Dec 2014 16:43:07 -0800
Subject: [PATCH 0464/2267] Fix uninitialized variable lint

---
 manifests/mod/version.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
index c0e405686a..1cc4412e1d 100644
--- a/manifests/mod/version.pp
+++ b/manifests/mod/version.pp
@@ -1,4 +1,6 @@
-class apache::mod::version {
+class apache::mod::version(
+  $apache_version = $::apache::apache_version
+) {
 
   if ($::osfamily == 'debian' and versioncmp($apache_version, '2.4') >= 0) {
     warning("${module_name}: module version_module is built-in and can't be loaded")

From 371da59865bff0d410f1c40d97ef5b8331ecda05 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Tue, 2 Dec 2014 20:14:31 -0700
Subject: [PATCH 0465/2267] add centos7 beaker host

---
 spec/acceptance/nodesets/centos-70-x64.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 spec/acceptance/nodesets/centos-70-x64.yml

diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml
new file mode 100644
index 0000000000..2ab0052043
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-70-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  centos-70-x64:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box : puppetlabs/centos-7.0-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  log_level: verbose
+  type: foss

From f2b83cb22a9313e7f44a1f4e697a6ebabbb26870 Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Sun, 7 Dec 2014 12:16:17 -0800
Subject: [PATCH 0466/2267] Fix linting errors

---
 manifests/mpm.pp    | 6 +++---
 manifests/params.pp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index ca976a41bd..180686cfa3 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -45,11 +45,11 @@
           before  => File[$::apache::mod_enable_dir],
           notify  => Service['httpd'],
         }
-        
+
         if $mpm == 'itk' {
             file { "${lib_path}/mod_mpm_itk.so":
-              ensure  => link,
-              target  => "${lib_path}/mpm_itk.so"
+              ensure => link,
+              target => "${lib_path}/mpm_itk.so"
             }
         }
       }
diff --git a/manifests/params.pp b/manifests/params.pp
index 6a221fd633..7c836146cc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -104,7 +104,7 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
-    if $::osfamily == "RedHat" {
+    if $::osfamily == 'RedHat' {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
       $wsgi_socket_prefix = undef

From 4bb91692bcd05c3e0dde16d05025384e65ccc048 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Mon, 8 Dec 2014 13:02:02 -0500
Subject: [PATCH 0467/2267] Fix support for Fedora Rawhide

---
 manifests/version.pp        |  2 +-
 spec/classes/apache_spec.rb | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index dc5288dca0..fae008a84d 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -12,7 +12,7 @@
 
   case $::osfamily {
     'RedHat': {
-      if ($::operatingsystem == 'Fedora' and $distrelease >= 18) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
+      if ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
         $default = '2.4'
       } else {
         $default = '2.2'
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index fe61a9796b..a9d9438544 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -488,6 +488,42 @@
         it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile Off\n} }
       end
     end
+    context "on Fedora" do
+      let :facts do
+        super().merge({
+          :operatingsystem => 'Fedora'
+        })
+      end
+
+      context "21" do
+        let :facts do
+          super().merge({
+            :lsbdistrelease         => '21',
+            :operatingsystemrelease => '21'
+          })
+        end
+        it { is_expected.to contain_class('apache').with_apache_version('2.4') }
+      end
+      context "Rawhide" do
+        let :facts do
+          super().merge({
+            :lsbdistrelease         => 'Rawhide',
+            :operatingsystemrelease => 'Rawhide'
+          })
+        end
+        it { is_expected.to contain_class('apache').with_apache_version('2.4') }
+      end
+      # kinda obsolete
+      context "17" do
+        let :facts do
+          super().merge({
+            :lsbdistrelease         => '17',
+            :operatingsystemrelease => '17'
+          })
+        end
+        it { is_expected.to contain_class('apache').with_apache_version('2.2') }
+      end
+    end
   end
   context "on a FreeBSD OS" do
     let :facts do

From 4bf9de724f8421411efa4daee42b91fb473f71a5 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 8 Dec 2014 10:23:13 -0800
Subject: [PATCH 0468/2267] Update .travis.yml, Gemfile, Rakefile, and
 CONTRIBUTING.md

---
 .travis.yml     |  2 +-
 CONTRIBUTING.md | 22 ++++------------------
 Gemfile         | 12 +++++++-----
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86222c2813..bd66c7d1c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 language: ruby
-bundler_args: --without development
+bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e1288478a2..f1cbde4bbf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,11 +41,9 @@ Checklist (and a short version for the impatient)
 
     * Pre-requisites:
 
-      - Sign the [Contributor License Agreement](https://cla.puppetlabs.com/)
-
       - Make sure you have a [GitHub account](https://github.com/join)
 
-      - [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for.
+      - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
 
     * Preferred method:
 
@@ -94,17 +92,7 @@ The long version
       whitespace or other "whitespace errors".  You can do this by
       running "git diff --check" on your changes before you commit.
 
-  2.  Sign the Contributor License Agreement
-
-      Before we can accept your changes, we do need a signed Puppet
-      Labs Contributor License Agreement (CLA).
-
-      You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/)
-
-      If you have any questions about the CLA, please feel free to
-      contact Puppet Labs via email at cla-submissions@puppetlabs.com.
-
-  3.  Sending your patches
+  2.  Sending your patches
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
@@ -124,7 +112,7 @@ The long version
       in order to open a pull request.
 
 
-  4.  Update the related GitHub issue.
+  3.  Update the related GitHub issue.
 
       If there is a GitHub issue associated with the change you
       submitted, then you should update the ticket to include the
@@ -220,14 +208,12 @@ review.
 Additional Resources
 ====================
 
-* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
+* [Getting additional help](http://puppetlabs.com/community/get-help)
 
 * [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
 
 * [Patchwork](https://patchwork.puppetlabs.com)
 
-* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
-
 * [General GitHub documentation](http://help.github.com/)
 
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
diff --git a/Gemfile b/Gemfile
index e960f7c4b7..0684f19238 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,15 +1,17 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-group :development, :test do
+group :development, :unit_tests do
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
   gem 'simplecov',               :require => false
+  gem 'puppet_facts',            :require => false
+end
+
+group :system_tests do
+  gem 'beaker-rspec',  :require => false
+  gem 'serverspec',    :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']

From e079dc81c441ea2f460ae0bee89d402556bde9df Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 8 Dec 2014 22:52:02 -0800
Subject: [PATCH 0469/2267] Add json gem

The puppet_facts gem implicitly depends on the json gem.
On Ruby 1.8.7, json is not built in. On Puppet 2.7, it is
not explicitly pulled in by the hiera gem. So we add it
here explicitly.
---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index 0684f19238..12fd363eac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ group :development, :unit_tests do
   gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
+  gem 'json',                    :require => false
 end
 
 group :system_tests do

From dd4a8d8fb7579d0461e40be8a92308a4e288b2a4 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@dasz.at>
Date: Tue, 16 Dec 2014 22:32:56 +0100
Subject: [PATCH 0470/2267] acceptance: add test for actual port

---
 spec/acceptance/class_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index e006251cf8..954b6ac587 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -32,6 +32,10 @@ class { 'apache': }
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
+
+    describe port(80) do
+      it { should be_listening }
+    end
   end
 
   context 'custom site/mod dir parameters' do

From afca7d5317d783e64e3f974146a80b48565b6be3 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Wed, 17 Dec 2014 11:55:15 +0100
Subject: [PATCH 0471/2267] Fix apache::mod::version title

written as apache::mod::reqtimeout
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8994e6baa2..f580bb6bc9 100644
--- a/README.md
+++ b/README.md
@@ -860,7 +860,7 @@ mod_reqtimeout configuration.
   }
 ```
 
-####Class: `apache::mod::reqtimeout`
+####Class: `apache::mod::version`
 
 This wrapper around mod_version warns on Debian and Ubuntu systems with Apache httpd 2.4
 about loading mod_version, as on these platforms it's already built-in.

From 45efd31927f60ddf795410ea99d15a856db8a9b1 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Tue, 2 Dec 2014 20:08:03 -0700
Subject: [PATCH 0472/2267] add mod_security apache module

---
 README.md                            |  85 ++++--
 manifests/mod/security.pp            |  64 ++++
 manifests/params.pp                  |  54 ++++
 manifests/security/rule_link.pp      |  12 +
 manifests/vhost.pp                   |  30 +-
 spec/acceptance/mod_security_spec.rb | 228 ++++++++++++++
 spec/classes/mod/security_spec.rb    |  93 ++++++
 spec/defines/modsec_link_spec.rb     |  51 ++++
 templates/mod/security.conf.erb      |  68 +++++
 templates/mod/security_crs.conf.erb  | 428 +++++++++++++++++++++++++++
 templates/vhost/_security.erb        |  20 ++
 11 files changed, 1114 insertions(+), 19 deletions(-)
 create mode 100644 manifests/mod/security.pp
 create mode 100644 manifests/security/rule_link.pp
 create mode 100644 spec/acceptance/mod_security_spec.rb
 create mode 100644 spec/classes/mod/security_spec.rb
 create mode 100644 spec/defines/modsec_link_spec.rb
 create mode 100644 templates/mod/security.conf.erb
 create mode 100644 templates/mod/security_crs.conf.erb
 create mode 100644 templates/vhost/_security.erb

diff --git a/README.md b/README.md
index 8994e6baa2..87c385348c 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@
         * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
         * [Class: apache::mod::deflate](#class-apachemoddeflate)
         * [Class: apache::mod::reqtimeout](#class-apachemodreqtimeout)
+        * [Class: apache::mod::security](#class-modsecurity)
         * [Class: apache::mod::version](#class-apachemodversion)
         * [Defined Type: apache::vhost](#defined-type-apachevhost)
         * [Parameter: `directories` for apache::vhost](#parameter-directories-for-apachevhost)
@@ -555,6 +556,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `rewrite`
 * `rpaf`*
 * `setenvif`
+* `security`
 * `shib`* (see [`apache::mod::shib`](#class-apachemodshib) below)
 * `speling`
 * `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl) below)
@@ -583,7 +585,7 @@ To configure the event thread limit:
     $threadlimit      => '128',
   }
 ```
-  
+
 
 ####Class: `apache::mod::info`
 
@@ -748,8 +750,8 @@ Installs Apache mod_status and uses the status.conf.erb template. These are the
       extended_status = 'On',
       status_path     = '/server-status',
 ){
-      
-      
+
+
   }
 ```
 
@@ -875,6 +877,24 @@ A string or an array that sets the `RequestReadTimeout` option. Defaults to
 `['header=20-40,MinRate=500', 'body=20,MinRate=500']`.
 
 
+####Class: `apache::mod::security`
+
+Installs and configures mod_security.  Defaults to enabled and running on all
+vhosts.
+
+```puppet
+  include '::apache::mod::security'
+```
+
+#####`modsec_dir`
+
+Directory to install the modsec configuration and activated rules links into
+
+#####`activated_rules`
+
+Array of rules from the modsec_crs_path to activate by symlinking to
+${modsec_dir}/activated_rules.
+
 ####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` being a defined resource type, which allows it to be evaluated multiple times with different parameters.
@@ -907,7 +927,7 @@ If you have a series of specific configurations and do not want a base `::apache
 
 #####`access_log`
 
-Specifies whether `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`) should be configured. Setting the value to 'false' chooses none. Defaults to 'true'. 
+Specifies whether `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`) should be configured. Setting the value to 'false' chooses none. Defaults to 'true'.
 
 #####`access_log_file`
 
@@ -1109,6 +1129,34 @@ in without being aware of the consequences; see http://httpd.apache.org/docs/2.4
 
 Specifies the verbosity of the error log. Defaults to 'warn' for the global server configuration and can be overridden on a per-vhost basis. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
 
+######`modsec_body_limit`
+
+Configures the maximum request body size (in bytes) ModSecurity will accept for buffering
+
+######`modsec_disable_vhost`
+
+Boolean.  Only valid if apache::mod::security is included.  Used to disable mod_security on an individual vhost.  Only relevant if apache::mod::security is included.
+
+######`modsec_disable_ids`
+
+Array of mod_security IDs to remove from the vhost.  Also takes a hash allowing removal of an ID from a specific location.
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      modsec_disable_ids => [ 90015, 90016 ],
+    }
+```
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
+    }
+```
+
+######`modsec_disable_ips`
+
+Array of IPs to exclude from mod_security rule matching
+
 #####`no_proxy_uris`
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
@@ -1160,7 +1208,7 @@ Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.ne
 
 #####`port`
 
-Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host only listens on the port set in this parameter. 
+Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host only listens on the port set in this parameter.
 
 #####`priority`
 
@@ -1208,7 +1256,7 @@ Specifies the address to redirect to. Defaults to 'undef'.
 
 #####`redirect_source`
 
-Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent. 
+Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent.
 
 ```puppet
     apache::vhost { 'site.name.fdqn':
@@ -1459,9 +1507,9 @@ To set up a virtual host with WSGI
 
 The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
 
-The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys. 
+The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys.
 
-The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'location', 'directorymatch', 'filesmatch', or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file. 
+The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'location', 'directorymatch', 'filesmatch', or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
 
 General `directories` usage looks something like
 
@@ -1488,7 +1536,7 @@ Available handlers, represented as keys, should be placed within the `directory`
 }
 ```
 
-Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are: 
+Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are:
 
 ######`addhandlers`
 
@@ -1620,7 +1668,7 @@ Pass a string of custom configuration directives to be placed at the end of the
 
 ######`deny`
 
-Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. 
+Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
 ```puppet
     apache::vhost { 'sample.example.net':
@@ -1734,10 +1782,10 @@ Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path              => '/path/to/directory', 
+      directories => [
+        { path              => '/path/to/directory',
           passenger_enabled => 'on',
-        }, 
+        },
       ],
     }
 ```
@@ -1771,9 +1819,9 @@ Sets a `SetHandler` directive as per the [Apache Core documentation](http://http
 ```puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
-      directories => [ 
-        { path       => '/path/to/directory', 
-          sethandler => 'None', 
+      directories => [
+        { path       => '/path/to/directory',
+          sethandler => 'None',
         }
       ],
     }
@@ -1824,7 +1872,7 @@ Allows an valid content setting to be set or altered for the application request
 
 ######`shib_use_headers`
 
-When set to 'On' this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details. 
+When set to 'On' this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
 ######`ssl_options`
 
@@ -2015,7 +2063,7 @@ A unique alias. This is used internally to link the action with the FastCGI serv
 
 #####`file_type`
 
-The MIME-type of the file to be processed by the FastCGI server. 
+The MIME-type of the file to be processed by the FastCGI server.
 
 ###Virtual Host Examples
 
@@ -2310,6 +2358,7 @@ If you need to use ProxySet in the balancer config
 
 * `apache::peruser::multiplexer`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
 * `apache::peruser::processor`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
+* `apache::security::file_link`: Links the activated_rules from apache::mod::security to the respective CRS rules on disk.
 
 ###Templates
 
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
new file mode 100644
index 0000000000..9641d70df5
--- /dev/null
+++ b/manifests/mod/security.pp
@@ -0,0 +1,64 @@
+class apache::mod::security (
+  $crs_package     = $::apache::params::modsec_crs_package,
+  $activated_rules = $::apache::params::modsec_default_rules,
+  $modsec_dir      = $::apache::params::modsec_dir,
+){
+
+  if $::osfamily == 'FreeBSD' {
+    fail('FreeBSD is not currently supported')
+  }
+
+  ::apache::mod { 'security':
+    id  => 'security2_module',
+    lib => 'mod_security2.so',
+  }
+
+  ::apache::mod { 'unique_id_module':
+    id  => 'unique_id_module',
+    lib => 'mod_unique_id.so',
+  }
+
+  if $crs_package  {
+    package { $crs_package:
+      ensure => 'latest',
+      before => File['security.conf'],
+    }
+  }
+
+  # Template uses:
+  # - $modsec_dir
+  file { 'security.conf':
+    ensure  => file,
+    content => template('apache/mod/security.conf.erb'),
+    path    => "${::apache::mod_dir}/security.conf",
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+
+  file { $modsec_dir:
+    ensure  => directory,
+    owner   => $::apache::params::user,
+    group   => $::apache::params::group,
+    mode    => '0555',
+    purge   => true,
+    recurse => true,
+  }
+
+  file { "${modsec_dir}/activated_rules":
+    ensure => directory,
+    owner  => $::apache::params::user,
+    group  => $::apache::params::group,
+    mode   => '0555',
+  }
+
+  file { "${modsec_dir}/security_crs.conf":
+    ensure  => file,
+    content => template('apache/mod/security_crs.conf.erb'),
+    require => File[$modsec_dir],
+    notify  => Service['httpd'],
+  }
+
+  apache::security::rule_link { $activated_rules: }
+
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 6a221fd633..ac92b2b147 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -83,6 +83,7 @@
       },
       'proxy_html'  => 'mod_proxy_html',
       'python'      => 'mod_python',
+      'security'    => 'mod_security',
       'shibboleth'  => 'shibboleth',
       'ssl'         => 'mod_ssl',
       'wsgi'        => 'mod_wsgi',
@@ -109,6 +110,32 @@
     } else {
       $wsgi_socket_prefix = undef
     }
+    $modsec_crs_package   = 'mod_security_crs'
+    $modsec_crs_path      = '/usr/lib/modsecurity.d'
+    $modsec_dir           = '/etc/httpd/modsecurity.d'
+    $modsec_default_rules = [
+      'base_rules/modsecurity_35_bad_robots.data',
+      'base_rules/modsecurity_35_scanners.data',
+      'base_rules/modsecurity_40_generic_attacks.data',
+      'base_rules/modsecurity_41_sql_injection_attacks.data',
+      'base_rules/modsecurity_50_outbound.data',
+      'base_rules/modsecurity_50_outbound_malware.data',
+      'base_rules/modsecurity_crs_20_protocol_violations.conf',
+      'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
+      'base_rules/modsecurity_crs_23_request_limits.conf',
+      'base_rules/modsecurity_crs_30_http_policy.conf',
+      'base_rules/modsecurity_crs_35_bad_robots.conf',
+      'base_rules/modsecurity_crs_40_generic_attacks.conf',
+      'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
+      'base_rules/modsecurity_crs_41_xss_attacks.conf',
+      'base_rules/modsecurity_crs_42_tight_security.conf',
+      'base_rules/modsecurity_crs_45_trojans.conf',
+      'base_rules/modsecurity_crs_47_common_exceptions.conf',
+      'base_rules/modsecurity_crs_49_inbound_blocking.conf',
+      'base_rules/modsecurity_crs_50_outbound.conf',
+      'base_rules/modsecurity_crs_59_outbound_blocking.conf',
+      'base_rules/modsecurity_crs_60_correlation.conf'
+    ]
   } elsif $::osfamily == 'Debian' {
     $user                = 'www-data'
     $group               = 'www-data'
@@ -149,6 +176,7 @@
       'proxy_html'  => 'libapache2-mod-proxy-html',
       'python'      => 'libapache2-mod-python',
       'rpaf'        => 'libapache2-mod-rpaf',
+      'security'    => 'libapache2-modsecurity',
       'suphp'       => 'libapache2-mod-suphp',
       'wsgi'        => 'libapache2-mod-wsgi',
       'xsendfile'   => 'libapache2-mod-xsendfile',
@@ -165,6 +193,32 @@
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www'
+    $modsec_crs_package   = 'modsecurity-crs'
+    $modsec_crs_path      = '/usr/share/modsecurity-crs'
+    $modsec_dir           = '/etc/modsecurity'
+    $modsec_default_rules = [
+      'base_rules/modsecurity_35_bad_robots.data',
+      'base_rules/modsecurity_35_scanners.data',
+      'base_rules/modsecurity_40_generic_attacks.data',
+      'base_rules/modsecurity_41_sql_injection_attacks.data',
+      'base_rules/modsecurity_50_outbound.data',
+      'base_rules/modsecurity_50_outbound_malware.data',
+      'base_rules/modsecurity_crs_20_protocol_violations.conf',
+      'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
+      'base_rules/modsecurity_crs_23_request_limits.conf',
+      'base_rules/modsecurity_crs_30_http_policy.conf',
+      'base_rules/modsecurity_crs_35_bad_robots.conf',
+      'base_rules/modsecurity_crs_40_generic_attacks.conf',
+      'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
+      'base_rules/modsecurity_crs_41_xss_attacks.conf',
+      'base_rules/modsecurity_crs_42_tight_security.conf',
+      'base_rules/modsecurity_crs_45_trojans.conf',
+      'base_rules/modsecurity_crs_47_common_exceptions.conf',
+      'base_rules/modsecurity_crs_49_inbound_blocking.conf',
+      'base_rules/modsecurity_crs_50_outbound.conf',
+      'base_rules/modsecurity_crs_59_outbound_blocking.conf',
+      'base_rules/modsecurity_crs_60_correlation.conf'
+    ]
 
     #
     # Passenger-specific settings
diff --git a/manifests/security/rule_link.pp b/manifests/security/rule_link.pp
new file mode 100644
index 0000000000..1ddc9d6aa3
--- /dev/null
+++ b/manifests/security/rule_link.pp
@@ -0,0 +1,12 @@
+define apache::security::rule_link () {
+
+  $parts = split($title, '/')
+  $filename = $parts[-1]
+
+  file { $filename:
+    ensure  => 'link',
+    path    => "${::apache::mod::security::modsec_dir}/activated_rules/${filename}",
+    target  => "${::apache::params::modsec_crs_path}/${title}",
+    require => File["${::apache::mod::security::modsec_dir}/activated_rules"],
+  }
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 50b3a1ec4a..711dffeeb2 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -106,6 +106,10 @@
   $passenger_start_timeout     = undef,
   $passenger_pre_start         = undef,
   $add_default_charset         = undef,
+  $modsec_disable_vhost        = undef,
+  $modsec_disable_ids          = undef,
+  $modsec_disable_ips          = undef,
+  $modsec_body_limit           = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -414,6 +418,17 @@
     $_directories = [ merge($_directory, $_directory_version) ]
   }
 
+  ## Create a global LocationMatch if locations aren't defined
+  if $modsec_disable_ids {
+    if is_hash($modsec_disable_ids) {
+      $_modsec_disable_ids = $modsec_disable_ids
+    } elsif is_array($modsec_disable_ids) {
+      $_modsec_disable_ids = { '.*' => $modsec_disable_ids }
+    } else {
+      fail("Apache::Vhost[${name}]: 'modsec_disable_ids' must be either a Hash of location/IDs or an Array of IDs")
+    }
+  }
+
   concat { "${priority_real}-${filename}.conf":
     ensure  => $ensure,
     path    => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
@@ -491,7 +506,7 @@
       content => template('apache/vhost/_fallbackresource.erb'),
     }
   }
-  
+
   # Template uses:
   # - $allow_encoded_slashes
   if $allow_encoded_slashes {
@@ -823,6 +838,19 @@
     }
   }
 
+  # Template uses:
+  # - $modsec_disable_vhost
+  # - $modsec_disable_ids
+  # - $modsec_disable_ips
+  # - $modsec_body_limit
+  if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips {
+    concat::fragment { "${name}-security":
+      target  => "${priority_real}-${filename}.conf",
+      order   => 320,
+      content => template('apache/vhost/_security.erb')
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}-${filename}.conf",
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
new file mode 100644
index 0000000000..74d1cd26ea
--- /dev/null
+++ b/spec/acceptance/mod_security_spec.rb
@@ -0,0 +1,228 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::security class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  case fact('osfamily')
+  when 'Debian'
+    mod_dir      = '/etc/apache2/mods-available'
+    service_name = 'apache2'
+    package_name = 'apache2'
+  when 'RedHat'
+    mod_dir      = '/etc/httpd/conf.d'
+    service_name = 'httpd'
+    package_name = 'httpd'
+  end
+
+  context "default mod_security config" do
+    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
+      it 'adds epel' do
+        pp = "class { 'epel': }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    it 'succeeds in puppeting mod_security' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port    => '80',
+          docroot => '/var/www/html',
+        }
+        host { 'modsec.example.com': ip => '127.0.0.1', }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => 'Index page',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe package(package_name) do
+      it { is_expected.to be_installed }
+    end
+
+    describe file("#{mod_dir}/security.conf") do
+      it { is_expected.to contain "mod_security2.c" }
+    end
+
+    it 'should return index page' do
+      shell('/usr/bin/curl -H"User-Agent: beaker" modsec.example.com:80') do |r|
+        expect(r.stdout).to match(/Index page/)
+        expect(r.exit_code).to eq(0)
+      end
+    end
+
+    it 'should block query with SQL' do
+      shell '/usr/bin/curl -H"User-Agent beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    end
+
+  end #default mod_security config
+
+  context "mod_security should allow disabling by vhost" do
+    it 'succeeds in puppeting mod_security' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port           => '80',
+          docroot        => '/var/www/html',
+        }
+        host { 'modsec.example.com': ip => '127.0.0.1', }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => "Index page\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{mod_dir}/security.conf") do
+      it { is_expected.to contain "mod_security2.c" }
+    end
+
+    it 'should block query with SQL' do
+      shell '/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    end
+
+    it 'should disable mod_security per vhost' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port                 => '80',
+          docroot              => '/var/www/html',
+          modsec_disable_vhost => false,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    it 'should return index page' do
+      shell('/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+        expect(r.stdout).to match(/Index page/)
+        expect(r.exit_code).to eq(0)
+      end
+    end
+  end #mod_security should allow disabling by vhost
+
+  context "mod_security should allow disabling by ip" do
+    it 'succeeds in puppeting mod_security' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port           => '80',
+          docroot        => '/var/www/html',
+        }
+        host { 'modsec.example.com': ip => '127.0.0.1', }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => "Index page\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{mod_dir}/security.conf") do
+      it { is_expected.to contain "mod_security2.c" }
+    end
+
+    it 'should block query with SQL' do
+      shell '/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    end
+
+    it 'should disable mod_security per vhost' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port               => '80',
+          docroot            => '/var/www/html',
+          modsec_disable_ips => [ '127.0.0.1' ],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    it 'should return index page' do
+      shell('/usr/bin/curl -H"User-Agent: beaker" modsec.example.com:80') do |r|
+        expect(r.stdout).to match(/Index page/)
+        expect(r.exit_code).to eq(0)
+      end
+    end
+  end #mod_security should allow disabling by ip
+
+  context "mod_security should allow disabling by id" do
+    it 'succeeds in puppeting mod_security' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port           => '80',
+          docroot        => '/var/www/html',
+        }
+        host { 'modsec.example.com': ip => '127.0.0.1', }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => 'Index page',
+        }
+        file { '/var/www/html/index2.html':
+          ensure  => file,
+          content => 'Page 2',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service(service_name) do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{mod_dir}/security.conf") do
+      it { is_expected.to contain "mod_security2.c" }
+    end
+
+    it 'should block query with SQL' do
+      shell '/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    end
+
+    it 'should disable mod_security per vhost' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port               => '80',
+          docroot            => '/var/www/html',
+          modsec_disable_ids => [ '950007' ],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    it 'should return index page' do
+      shell('/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+        expect(r.stdout).to match(/Index page/)
+        expect(r.exit_code).to eq(0)
+      end
+    end
+
+  end #mod_security should allow disabling by id
+
+
+end #apache::mod::security class
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
new file mode 100644
index 0000000000..05586c2caa
--- /dev/null
+++ b/spec/classes/mod/security_spec.rb
@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe 'apache::mod::security', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+
+  context "on RedHat based systems" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'CentOS',
+        :operatingsystemrelease => '7',
+        :kernel                 => 'Linux',
+        :id                     => 'root',
+        :concat_basedir         => '/',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    it { should contain_apache__mod('security').with(
+      :id => 'security2_module',
+      :lib => 'mod_security2.so'
+    ) }
+    it { should contain_apache__mod('unique_id_module').with(
+      :id => 'unique_id_module',
+      :lib => 'mod_unique_id.so'
+    ) }
+    it { should contain_package('mod_security_crs') }
+    it { should contain_file('security.conf').with(
+      :path => '/etc/httpd/conf.d/security.conf'
+    ) }
+    it { should contain_file('/etc/httpd/modsecurity.d').with(
+      :ensure => 'directory',
+      :path => '/etc/httpd/modsecurity.d',
+      :owner => 'apache',
+      :group => 'apache'
+    ) }
+    it { should contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
+      :ensure => 'directory',
+      :path => '/etc/httpd/modsecurity.d/activated_rules',
+      :owner => 'apache',
+      :group => 'apache'
+    ) }
+    it { should contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with(
+      :path => '/etc/httpd/modsecurity.d/security_crs.conf'
+    ) }
+    it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+  end
+
+  context "on Debian based systems" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/',
+        :lsbdistcodename        => 'squeeze',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :kernel                 => 'Linux'
+      }
+    end
+    it { should contain_apache__mod('security').with(
+      :id => 'security2_module',
+      :lib => 'mod_security2.so'
+    ) }
+    it { should contain_apache__mod('unique_id_module').with(
+      :id => 'unique_id_module',
+      :lib => 'mod_unique_id.so'
+    ) }
+    it { should contain_package('modsecurity-crs') }
+    it { should contain_file('security.conf').with(
+      :path => '/etc/apache2/mods-available/security.conf'
+    ) }
+    it { should contain_file('/etc/modsecurity').with(
+      :ensure => 'directory',
+      :path => '/etc/modsecurity',
+      :owner => 'www-data',
+      :group => 'www-data'
+    ) }
+    it { should contain_file('/etc/modsecurity/activated_rules').with(
+      :ensure => 'directory',
+      :path => '/etc/modsecurity/activated_rules',
+      :owner => 'www-data',
+      :group => 'www-data'
+    ) }
+    it { should contain_file('/etc/modsecurity/security_crs.conf').with(
+      :path => '/etc/modsecurity/security_crs.conf'
+    ) }
+    it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+  end
+
+end
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
new file mode 100644
index 0000000000..c1633d01d8
--- /dev/null
+++ b/spec/defines/modsec_link_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe 'apache::security::rule_link', :type => :define do
+  let :pre_condition do
+    'class { "apache": }
+    class { "apache::mod::security": activated_rules => [] }
+    '
+  end
+
+  let :title do
+    'base_rules/modsecurity_35_bad_robots.data'
+  end
+
+  context "on RedHat based systems" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'CentOS',
+        :operatingsystemrelease => '7',
+        :kernel                 => 'Linux',
+        :id                     => 'root',
+        :concat_basedir         => '/',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    it { should contain_file('modsecurity_35_bad_robots.data').with(
+      :path => '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+      :target => '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data'
+    ) }
+  end
+
+  context "on Debian based systems" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/',
+        :lsbdistcodename        => 'squeeze',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :kernel                 => 'Linux'
+      }
+    end
+    it { should contain_file('modsecurity_35_bad_robots.data').with(
+      :path => '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
+      :target => '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data'
+    ) }
+  end
+
+end
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
new file mode 100644
index 0000000000..ed884eadde
--- /dev/null
+++ b/templates/mod/security.conf.erb
@@ -0,0 +1,68 @@
+<IfModule mod_security2.c>
+    # ModSecurity Core Rules Set configuration
+<%- if scope.function_versioncmp([scope.lookupvar('::apache::apache_version'), '2.4']) >= 0 -%>
+    IncludeOptional <%= @modsec_dir %>/*.conf
+    IncludeOptional <%= @modsec_dir %>/activated_rules/*.conf
+<%- else -%>
+    Include <%= @modsec_dir %>/*.conf
+    Include <%= @modsec_dir %>/activated_rules/*.conf
+<%- end -%>
+
+    # Default recommended configuration
+    SecRuleEngine On
+    SecRequestBodyAccess On
+    SecRule REQUEST_HEADERS:Content-Type "text/xml" \
+      "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML"
+    SecRequestBodyLimit 13107200
+    SecRequestBodyNoFilesLimit 131072
+    SecRequestBodyInMemoryLimit 131072
+    SecRequestBodyLimitAction Reject
+    SecRule REQBODY_ERROR "!@eq 0" \
+      "id:'200001', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2"
+    SecRule MULTIPART_STRICT_ERROR "!@eq 0" \
+      "id:'200002',phase:2,t:none,log,deny,status:44,msg:'Multipart request body failed strict validation: \
+      PE %{REQBODY_PROCESSOR_ERROR}, \
+      BQ %{MULTIPART_BOUNDARY_QUOTED}, \
+      BW %{MULTIPART_BOUNDARY_WHITESPACE}, \
+      DB %{MULTIPART_DATA_BEFORE}, \
+      DA %{MULTIPART_DATA_AFTER}, \
+      HF %{MULTIPART_HEADER_FOLDING}, \
+      LF %{MULTIPART_LF_LINE}, \
+      SM %{MULTIPART_MISSING_SEMICOLON}, \
+      IQ %{MULTIPART_INVALID_QUOTING}, \
+      IP %{MULTIPART_INVALID_PART}, \
+      IH %{MULTIPART_INVALID_HEADER_FOLDING}, \
+      FL %{MULTIPART_FILE_LIMIT_EXCEEDED}'"
+
+    SecRule MULTIPART_UNMATCHED_BOUNDARY "!@eq 0" \
+      "id:'200003',phase:2,t:none,log,deny,status:44,msg:'Multipart parser detected a possible unmatched boundary.'"
+
+    SecPcreMatchLimit 1000
+    SecPcreMatchLimitRecursion 1000
+
+    SecRule TX:/^MSC_/ "!@streq 0" \
+      "id:'200004',phase:2,t:none,deny,msg:'ModSecurity internal error flagged: %{MATCHED_VAR_NAME}'"
+
+    SecResponseBodyAccess Off
+    SecResponseBodyMimeType text/plain text/html text/xml
+    SecResponseBodyLimit 524288
+    SecResponseBodyLimitAction ProcessPartial
+    SecDebugLogLevel 0
+    SecAuditEngine RelevantOnly
+    SecAuditLogRelevantStatus "^(?:5|4(?!04))"
+    SecAuditLogParts ABIJDEFHZ
+    SecAuditLogType Serial
+    SecArgumentSeparator &
+    SecCookieFormat 0
+<%- if scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
+    SecDebugLog /var/log/apache2/modsec_debug.log
+    SecAuditLog /var/log/apache2/modsec_audit.log
+    SecTmpDir /var/cache/modsecurity
+    SecDataDir /var/cache/modsecurity
+<% else -%>
+    SecDebugLog /var/log/httpd/modsec_debug.log
+    SecAuditLog /var/log/httpd/modsec_audit.log
+    SecTmpDir /var/lib/mod_security
+    SecDataDir /var/lib/mod_security
+<% end -%>
+</IfModule>
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
new file mode 100644
index 0000000000..4a990eb3a5
--- /dev/null
+++ b/templates/mod/security_crs.conf.erb
@@ -0,0 +1,428 @@
+# ---------------------------------------------------------------
+# Core ModSecurity Rule Set ver.2.2.6
+# Copyright (C) 2006-2012 Trustwave All rights reserved.
+#
+# The OWASP ModSecurity Core Rule Set is distributed under
+# Apache Software License (ASL) version 2
+# Please see the enclosed LICENCE file for full details.
+# ---------------------------------------------------------------
+
+
+#
+# -- [[ Recommended Base Configuration ]] -------------------------------------------------
+#
+# The configuration directives/settings in this file are used to control
+# the OWASP ModSecurity CRS. These settings do **NOT** configure the main
+# ModSecurity settings such as:
+#
+# - SecRuleEngine
+# - SecRequestBodyAccess
+# - SecAuditEngine
+# - SecDebugLog
+#
+# You should use the modsecurity.conf-recommended file that comes with the
+# ModSecurity source code archive.
+#
+# Ref: http://mod-security.svn.sourceforge.net/viewvc/mod-security/m2/trunk/modsecurity.conf-recommended
+#
+
+
+#
+# -- [[ Rule Version ]] -------------------------------------------------------------------
+#
+# Rule version data is added to the "Producer" line of Section H of the Audit log:
+#
+# - Producer: ModSecurity for Apache/2.7.0-rc1 (http://www.modsecurity.org/); OWASP_CRS/2.2.4.
+#
+# Ref: https://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Reference_Manual#SecComponentSignature
+#
+SecComponentSignature "OWASP_CRS/2.2.6"
+
+
+#
+# -- [[ Modes of Operation: Self-Contained vs. Collaborative Detection ]] -----------------
+#
+# Each detection rule uses the "block" action which will inherit the SecDefaultAction
+# specified below.  Your settings here will determine which mode of operation you use.
+#
+# -- [[ Self-Contained Mode ]] --
+# Rules inherit the "deny" disruptive action.  The first rule that matches will block.
+#
+# -- [[ Collaborative Detection Mode ]] --
+# This is a "delayed blocking" mode of operation where each matching rule will inherit
+# the "pass" action and will only contribute to anomaly scores.  Transactional blocking
+# can be applied
+#
+# -- [[ Alert Logging Control ]] --
+# You have three options -
+#
+# - To log to both the Apache error_log and ModSecurity audit_log file use: "log"
+# - To log *only* to the ModSecurity audit_log file use: "nolog,auditlog"
+# - To log *only* to the Apache error_log file use: "log,noauditlog"
+#
+# Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html
+# Ref: https://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Reference_Manual#SecDefaultAction
+#
+SecDefaultAction "phase:1,deny,log"
+
+
+#
+# -- [[ Collaborative Detection Severity Levels ]] ----------------------------------------
+#
+# These are the default scoring points for each severity level.  You may
+# adjust these to you liking.  These settings will be used in macro expansion
+# in the rules to increment the anomaly scores when rules match.
+#
+# These are the default Severity ratings (with anomaly scores) of the individual rules -
+#
+#    - 2: Critical - Anomaly Score of 5.
+#         Is the highest severity level possible without correlation.  It is
+#         normally generated by the web attack rules (40 level files).
+#    - 3: Error - Anomaly Score of 4.
+#         Is generated mostly from outbound leakage rules (50 level files).
+#    - 4: Warning - Anomaly Score of 3.
+#         Is generated by malicious client rules (35 level files).
+#    - 5: Notice - Anomaly Score of 2.
+#         Is generated by the Protocol policy and anomaly files.
+#
+SecAction \
+  "id:'900001', \
+  phase:1, \
+  t:none, \
+  setvar:tx.critical_anomaly_score=5, \
+  setvar:tx.error_anomaly_score=4, \
+  setvar:tx.warning_anomaly_score=3, \
+  setvar:tx.notice_anomaly_score=2, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Collaborative Detection Scoring Threshold Levels ]] ------------------------------
+#
+# These variables are used in macro expansion in the 49 inbound blocking and 59
+# outbound blocking files.
+#
+# **MUST HAVE** ModSecurity v2.5.12 or higher to use macro expansion in numeric
+# operators.  If you have an earlier version, edit the 49/59 files directly to
+# set the appropriate anomaly score levels.
+#
+# You should set the score to the proper threshold you would prefer. If set to "5"
+# it will work similarly to previous Mod CRS rules and will create an event in the error_log
+# file if there are any rules that match.  If you would like to lessen the number of events
+# generated in the error_log file, you should increase the anomaly score threshold to
+# something like "20".  This would only generate an event in the error_log file if
+# there are multiple lower severity rule matches or if any 1 higher severity item matches.
+#
+SecAction \
+  "id:'900002', \
+  phase:1, \
+  t:none, \
+  setvar:tx.inbound_anomaly_score_level=5, \
+  nolog, \
+  pass"
+
+
+SecAction \
+  "id:'900003', \
+  phase:1, \
+  t:none, \
+  setvar:tx.outbound_anomaly_score_level=4, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Collaborative Detection Blocking ]] -----------------------------------------------
+#
+# This is a collaborative detection mode where each rule will increment an overall
+# anomaly score for the transaction. The scores are then evaluated in the following files:
+#
+# Inbound anomaly score - checked in the modsecurity_crs_49_inbound_blocking.conf file
+# Outbound anomaly score - checked in the modsecurity_crs_59_outbound_blocking.conf file
+#
+# If you want to use anomaly scoring mode, then uncomment this line.
+#
+#SecAction \
+  "id:'900004', \
+  phase:1, \
+  t:none, \
+  setvar:tx.anomaly_score_blocking=on, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ GeoIP Database ]] -----------------------------------------------------------------
+#
+# There are some rulesets that need to inspect the GEO data of the REMOTE_ADDR data.
+#
+# You must first download the MaxMind GeoIP Lite City DB -
+#
+#       http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+#
+# You then need to define the proper path for the SecGeoLookupDb directive
+#
+# Ref: http://blog.spiderlabs.com/2010/10/detecting-malice-with-modsecurity-geolocation-data.html
+# Ref: http://blog.spiderlabs.com/2010/11/detecting-malice-with-modsecurity-ip-forensics.html
+#
+#SecGeoLookupDb /opt/modsecurity/lib/GeoLiteCity.dat
+
+#
+# -- [[ Regression Testing Mode ]] --------------------------------------------------------
+#
+# If you are going to run the regression testing mode, you should uncomment the
+# following rule. It will enable DetectionOnly mode for the SecRuleEngine and
+# will enable Response Header tagging so that the client testing script can see
+# which rule IDs have matched.
+#
+# You must specify the your source IP address where you will be running the tests
+# from.
+#
+#SecRule REMOTE_ADDR "@ipMatch 192.168.1.100" \
+  "id:'900005', \
+  phase:1, \
+  t:none, \
+  ctl:ruleEngine=DetectionOnly, \
+  setvar:tx.regression_testing=1, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ HTTP Policy Settings ]] ----------------------------------------------------------
+#
+# Set the following policy settings here and they will be propagated to the 23 rules
+# file (modsecurity_common_23_request_limits.conf) by using macro expansion.
+# If you run into false positives, you can adjust the settings here.
+#
+# Only the max number of args is uncommented by default as there are a high rate
+# of false positives.  Uncomment the items you wish to set.
+#
+#
+# -- Maximum number of arguments in request limited
+SecAction \
+  "id:'900006', \
+  phase:1, \
+  t:none, \
+  setvar:tx.max_num_args=255, \
+  nolog, \
+  pass"
+
+#
+# -- Limit argument name length
+#SecAction \
+  "id:'900007', \
+  phase:1, \
+  t:none, \
+  setvar:tx.arg_name_length=100, \
+  nolog, \
+  pass"
+
+#
+# -- Limit value name length
+#SecAction \
+  "id:'900008', \
+  phase:1, \
+  t:none, \
+  setvar:tx.arg_length=400, \
+  nolog, \
+  pass"
+
+#
+# -- Limit arguments total length
+#SecAction \
+  "id:'900009', \
+  phase:1, \
+  t:none, \
+  setvar:tx.total_arg_length=64000, \
+  nolog, \
+  pass"
+
+#
+# -- Individual file size is limited
+#SecAction \
+  "id:'900010', \
+  phase:1, \
+  t:none, \
+  setvar:tx.max_file_size=1048576, \
+  nolog, \
+  pass"
+
+#
+# -- Combined file size is limited
+#SecAction \
+  "id:'900011', \
+  phase:1, \
+  t:none, \
+  setvar:tx.combined_file_sizes=1048576, \
+  nolog, \
+  pass"
+
+
+#
+# Set the following policy settings here and they will be propagated to the 30 rules
+# file (modsecurity_crs_30_http_policy.conf) by using macro expansion.
+# If you run into false positves, you can adjust the settings here.
+#
+SecAction \
+  "id:'900012', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.allowed_methods=GET HEAD POST OPTIONS', \
+  setvar:'tx.allowed_request_content_type=application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf', \
+  setvar:'tx.allowed_http_versions=HTTP/0.9 HTTP/1.0 HTTP/1.1', \
+  setvar:'tx.restricted_extensions=.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/', \
+  setvar:'tx.restricted_headers=/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Content Security Policy (CSP) Settings ]] -----------------------------------------
+#
+# The purpose of these settings is to send CSP response headers to
+# Mozilla FireFox users so that you can enforce how dynamic content
+# is used. CSP usage helps to prevent XSS attacks against your users.
+#
+# Reference Link:
+#
+#	https://developer.mozilla.org/en/Security/CSP
+#
+# Uncomment this SecAction line if you want use CSP enforcement.
+# You need to set the appropriate directives and settings for your site/domain and
+# and activate the CSP file in the experimental_rules directory.
+#
+# Ref: http://blog.spiderlabs.com/2011/04/modsecurity-advanced-topic-of-the-week-integrating-content-security-policy-csp.html
+#
+#SecAction \
+  "id:'900013', \
+  phase:1, \
+  t:none, \
+  setvar:tx.csp_report_only=1, \
+  setvar:tx.csp_report_uri=/csp_violation_report, \
+  setenv:'csp_policy=allow \'self\'; img-src *.yoursite.com; media-src *.yoursite.com; style-src *.yoursite.com; frame-ancestors *.yoursite.com; script-src *.yoursite.com; report-uri %{tx.csp_report_uri}', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Brute Force Protection ]] ---------------------------------------------------------
+#
+# If you are using the Brute Force Protection rule set, then uncomment the following
+# lines and set the following variables:
+# - Protected URLs: resources to protect (e.g. login pages) - set to your login page
+# - Burst Time Slice Interval: time interval window to monitor for bursts
+# - Request Threshold: request # threshold to trigger a burst
+# - Block Period: temporary block timeout
+#
+#SecAction \
+  "id:'900014', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.brute_force_protected_urls=/login.jsp /partner_login.php', \
+  setvar:'tx.brute_force_burst_time_slice=60', \
+  setvar:'tx.brute_force_counter_threshold=10', \
+  setvar:'tx.brute_force_block_timeout=300', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ DoS Protection ]] ----------------------------------------------------------------
+#
+# If you are using the DoS Protection rule set, then uncomment the following
+# lines and set the following variables:
+# - Burst Time Slice Interval: time interval window to monitor for bursts
+# - Request Threshold: request # threshold to trigger a burst
+# - Block Period: temporary block timeout
+#
+#SecAction \
+  "id:'900015', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.dos_burst_time_slice=60', \
+  setvar:'tx.dos_counter_threshold=100', \
+  setvar:'tx.dos_block_timeout=600', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Check UTF enconding ]] -----------------------------------------------------------
+#
+# We only want to apply this check if UTF-8 encoding is actually used by the site, otherwise
+# it will result in false positives.
+#
+# Uncomment this line if your site uses UTF8 encoding
+#SecAction \
+  "id:'900016', \
+  phase:1, \
+  t:none, \
+  setvar:tx.crs_validate_utf8_encoding=1, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Enable XML Body Parsing ]] -------------------------------------------------------
+#
+# The rules in this file will trigger the XML parser upon an XML request
+#
+# Initiate XML Processor in case of xml content-type
+#
+SecRule REQUEST_HEADERS:Content-Type "text/xml" \
+  "id:'900017', \
+  phase:1, \
+  t:none,t:lowercase, \
+  nolog, \
+  pass, \
+  chain"
+	SecRule REQBODY_PROCESSOR "!@streq XML" \
+	  "ctl:requestBodyProcessor=XML"
+
+
+#
+# -- [[ Global and IP Collections ]] -----------------------------------------------------
+#
+# Create both Global and IP collections for rules to use
+# There are some CRS rules that assume that these two collections
+# have already been initiated.
+#
+SecRule REQUEST_HEADERS:User-Agent "^(.*)$" \
+  "id:'900018', \
+  phase:1, \
+  t:none,t:sha1,t:hexEncode, \
+  setvar:tx.ua_hash=%{matched_var}, \
+  nolog, \
+  pass"
+
+
+SecRule REQUEST_HEADERS:x-forwarded-for "^\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b" \
+  "id:'900019', \
+  phase:1, \
+  t:none, \
+  capture, \
+  setvar:tx.real_ip=%{tx.1}, \
+  nolog, \
+  pass"
+
+
+SecRule &TX:REAL_IP "!@eq 0" \
+  "id:'900020', \
+  phase:1, \
+  t:none, \
+  initcol:global=global, \
+  initcol:ip=%{tx.real_ip}_%{tx.ua_hash}, \
+  nolog, \
+  pass"
+
+
+SecRule &TX:REAL_IP "@eq 0" \
+  "id:'900021', \
+  phase:1, \
+  t:none, \
+  initcol:global=global, \
+  initcol:ip=%{remote_addr}_%{tx.ua_hash}, \
+  nolog, \
+  pass"
diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
new file mode 100644
index 0000000000..5ab0a5b5da
--- /dev/null
+++ b/templates/vhost/_security.erb
@@ -0,0 +1,20 @@
+<% if @modsec_disable_vhost -%>
+  SecRuleEngine Off
+<% end -%>
+<% if @_modsec_disable_ids.is_a?(Hash) -%>
+<%   @_modsec_disable_ids.each do |location,rules| -%>
+  <LocationMatch <%= location %>>
+<%     Array(rules).each do |rule| -%>
+    SecRuleRemoveById <%= rule %>
+<%     end -%>
+  </LocationMatch>
+<%   end -%>
+<% end -%>
+<% ips = Array(@modsec_disable_ips).join(',') %>
+<% if ips != '' %>
+  SecRule REMOTE_ADDR "<%= ips %>" "nolog,allow,id:1234123455"
+  SecAction  "phase:2,pass,nolog,id:1234123456"
+<% end -%>
+<% if @modsec_body_limit -%>
+  SecRequestBodyLimit <%= @modsec_body_limit %>
+<% end -%>

From 69456070d21de95457eea754362fef890335a26c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 18 Dec 2014 16:36:59 -0800
Subject: [PATCH 0473/2267] Fix tests from #948

---
 spec/acceptance/mod_security_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 74d1cd26ea..2e7948023c 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -101,7 +101,7 @@ class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port                 => '80',
           docroot              => '/var/www/html',
-          modsec_disable_vhost => false,
+          modsec_disable_vhost => true,
         }
       EOS
       apply_manifest(pp, :catch_failures => true)

From a1309d889b0387c923e76603cbcaa2e23caec275 Mon Sep 17 00:00:00 2001
From: Armin ranjbar <zoup@zoup.org>
Date: Fri, 19 Dec 2014 16:56:42 +0330
Subject: [PATCH 0474/2267] Fixes version automatic detection for debian
 jessie; Debian 8, Jessie uses Apache version 2.4

---
 manifests/version.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/version.pp b/manifests/version.pp
index dc5288dca0..4c245339e0 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -21,6 +21,8 @@
     'Debian': {
       if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
         $default = '2.4'
+      } elsif $::operatingsystem == 'Debian' and $::operatingsystemrelease == 'jessie/sid' {
+        $default = '2.4'
       } else {
         $default = '2.2'
       }

From c47f0e45749058edf2b85767fa7a70308fc478f8 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 19 Dec 2014 11:06:32 -0800
Subject: [PATCH 0475/2267] Paths should be different for all deb based OSes

Not just ubuntu. Fix for #948
---
 templates/mod/security.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index ed884eadde..7597c461f6 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -54,7 +54,7 @@
     SecAuditLogType Serial
     SecArgumentSeparator &
     SecCookieFormat 0
-<%- if scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
+<%- if scope.lookupvar('::osfamily') == 'Debian' -%>
     SecDebugLog /var/log/apache2/modsec_debug.log
     SecAuditLog /var/log/apache2/modsec_audit.log
     SecTmpDir /var/cache/modsecurity

From bb96180f62a1897a9f81dfb6a821f2f10c9bdfd3 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Thu, 4 Dec 2014 05:58:54 -0700
Subject: [PATCH 0476/2267] MODULES-1382: support multiple access log
 directives

---
 manifests/vhost.pp              | 56 +++++++++++++--------------
 spec/acceptance/vhost_spec.rb   | 28 ++++++++++++++
 spec/defines/vhost_spec.rb      | 67 +++++++++++++++++++++++++++++++++
 templates/vhost/_access_log.erb | 24 ++++++++++--
 4 files changed, 143 insertions(+), 32 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 52a8056f70..9e05cb566f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -40,11 +40,12 @@
   $logroot_mode                = undef,
   $log_level                   = undef,
   $access_log                  = true,
-  $access_log_file             = undef,
-  $access_log_pipe             = undef,
-  $access_log_syslog           = undef,
-  $access_log_format           = undef,
-  $access_log_env_var          = undef,
+  $access_log_file             = false,
+  $access_log_pipe             = false,
+  $access_log_syslog           = false,
+  $access_log_format           = false,
+  $access_log_env_var          = false,
+  $access_logs                 = undef,
   $aliases                     = undef,
   $directories                 = undef,
   $error_log                   = true,
@@ -269,19 +270,28 @@
   # Is apache::mod::shib enabled (or apache::mod['shib2'])
   $shibboleth_enabled = defined(Apache::Mod['shib2'])
 
-  # Define log file names
-  if $access_log_file {
-    $access_log_destination = "${logroot}/${access_log_file}"
-  } elsif $access_log_pipe {
-    $access_log_destination = $access_log_pipe
-  } elsif $access_log_syslog {
-    $access_log_destination = $access_log_syslog
-  } else {
-    if $ssl {
-      $access_log_destination = "${logroot}/${name}_access_ssl.log"
+  if $access_log and !$access_logs {
+    if $access_log_file {
+      $_logs_dest = "${logroot}/${access_log_file}"
+    } elsif $access_log_pipe {
+      $_logs_dest = $access_log_pipe
+    } elsif $access_log_syslog {
+      $_logs_dest = $access_log_syslog
     } else {
-      $access_log_destination = "${logroot}/${name}_access.log"
+      $_logs_dest = undef
     }
+    $_access_logs = [{
+      'file'        => $access_log_file,
+      'pipe'        => $access_log_pipe,
+      'syslog'      => $access_log_syslog,
+      'format'      => $access_log_format,
+      'env'         => $access_log_env_var
+    }]
+  } elsif $access_logs {
+    if !is_array($access_logs) {
+      fail("Apache::Vhost[${name}]: access_logs must be an array of hashes")
+    }
+    $_access_logs = $access_logs
   }
 
   if $error_log_file {
@@ -298,17 +308,6 @@
     }
   }
 
-  # Set access log format
-  if $access_log_format {
-    $_access_log_format = "\"${access_log_format}\""
-  } else {
-    $_access_log_format = 'combined'
-  }
-
-  if $access_log_env_var {
-    $_access_log_env_var = "env=${access_log_env_var}"
-  }
-
   if $ip {
     if $port {
       $listen_addr_port = "${ip}:${port}"
@@ -569,7 +568,8 @@
   # - $access_log_destination
   # - $_access_log_format
   # - $_access_log_env_var
-  if $access_log {
+  # - $access_logs
+  if $access_log or $access_logs {
     concat::fragment { "${name}-access_log":
       target  => "${priority_real}-${filename}.conf",
       order   => 100,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 483b74945c..0aff9268c1 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -761,6 +761,34 @@ class { 'apache': }
     end
   end
 
+  describe 'multiple access_logs' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot            => '/tmp',
+          logroot            => '/tmp',
+          access_logs => [
+            {'file' => 'log1'},
+            {'file' => 'log2', 'env' => 'admin' },
+            {'file' => '/var/tmp/log3', 'format' => '%h %l'},
+            {'syslog' => 'syslog' }
+          ]
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'CustomLog "/tmp/log1" combined' }
+      it { is_expected.to contain 'CustomLog "/tmp/log2" combined env=admin' }
+      it { is_expected.to contain 'CustomLog "/var/tmp/log3" "%h %l"' }
+      it { is_expected.to contain 'CustomLog "syslog" combined' }
+    end
+  end
+
   describe 'aliases' do
     it 'applies cleanly' do
       pp = <<-EOS
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index d80752d8ae..66b1862508 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -407,6 +407,63 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
   end
+  describe 'access logs' 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 'single log file' do
+      let(:params) do
+        {
+          'docroot'         => '/rspec/docroot',
+          'access_log_file' => 'my_log_file',
+        }
+      end
+      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+        :content => /^\s+CustomLog.*my_log_file" combined\s*$/
+      )}
+    end
+    context 'single log file with environment' do
+      let(:params) do
+        {
+          'docroot'            => '/rspec/docroot',
+          'access_log_file'    => 'my_log_file',
+          'access_log_env_var' => 'prod'
+        }
+      end
+      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+        :content => /^\s+CustomLog.*my_log_file" combined\s+env=prod$/
+      )}
+    end
+    context 'multiple log files' do
+      let(:params) do
+        {
+          'docroot'     => '/rspec/docroot',
+          'access_logs' => [
+            { 'file' => '/tmp/log1', 'env' => 'dev' },
+            { 'file' => 'log2' },
+            { 'syslog' => 'syslog', 'format' => '%h %l' }
+          ],
+        }
+      end
+      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+        :content => /^\s+CustomLog "\/tmp\/log1"\s+combined\s+env=dev$/
+      )}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+        :content => /^\s+CustomLog "\/var\/log\/httpd\/log2"\s+combined\s*$/
+      )}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+        :content => /^\s+CustomLog "syslog" "%h %l"\s*$/
+      )}
+    end
+  end # access logs
   describe 'validation' do
     context 'bad ensure' do
       let :params do
@@ -620,5 +677,15 @@
       let :facts do default_facts end
       it { expect { is_expected.to compile }.to raise_error }
     end
+    context 'bad access_logs' do
+      let :params do
+        {
+          'docroot'     => '/rspec/docroot',
+          'access_logs' => '/var/log/somewhere',
+        }
+      end
+      let :facts do default_facts end
+      it { expect { is_expected.to compile }.to raise_error }
+    end
   end
 end
diff --git a/templates/vhost/_access_log.erb b/templates/vhost/_access_log.erb
index 1ec47ff710..d1ec426a4a 100644
--- a/templates/vhost/_access_log.erb
+++ b/templates/vhost/_access_log.erb
@@ -1,5 +1,21 @@
-<% if @access_log and @_access_log_env_var -%>
-  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %> <%= @_access_log_env_var %>
-<% elsif @access_log -%>
-  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %>
+<% @_access_logs.each do |log| -%>
+<%   env ||= "env=#{log['env']}" if log['env'] -%>
+<%   env ||= '' -%>
+<%   format ||= "\"#{log['format']}\"" if log['format'] -%>
+<%   format ||= 'combined' -%>
+<%   if log['file'] -%>
+<%     if log['file'].chars.first == '/' -%>
+<%       destination = "#{log['file']}" -%>
+<%     else -%>
+<%       destination = "#{@logroot}/#{log['file']}" -%>
+<%     end -%>
+<%   elsif log['syslog'] -%>
+<%     destination = "syslog" -%>
+<%   elsif log['pipe'] -%>
+<%     destination = log['pipe'] -%>
+<%   else -%>
+<%     destination ||= "#{@logroot}/#{@name}_access_ssl.log" if @ssl -%>
+<%     destination ||= "#{@logroot}/#{@name}_access.log" -%>
+<%   end -%>
+  CustomLog "<%= destination %>" <%= format %> <%= env %>
 <% end -%>

From 1c40ea31f96ca8d551164eb983d3192b6e0d397c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 23 Dec 2014 11:25:30 -0800
Subject: [PATCH 0477/2267] Don't run tests on platforms they don't work on

Also, some formatting cleanup.
---
 spec/acceptance/mod_security_spec.rb | 42 ++++++++++++++--------------
 spec/spec_helper_acceptance.rb       |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 2e7948023c..60295787e0 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::security class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::security class', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise'))) do
   case fact('osfamily')
   when 'Debian'
     mod_dir      = '/etc/apache2/mods-available'
@@ -22,13 +22,13 @@
 
     it 'succeeds in puppeting mod_security' do
       pp= <<-EOS
+        host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
           docroot => '/var/www/html',
         }
-        host { 'modsec.example.com': ip => '127.0.0.1', }
         file { '/var/www/html/index.html':
           ensure  => file,
           content => 'Index page',
@@ -51,14 +51,14 @@ class { 'apache::mod::security': }
     end
 
     it 'should return index page' do
-      shell('/usr/bin/curl -H"User-Agent: beaker" modsec.example.com:80') do |r|
+      shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
         expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
     end
 
     it 'should block query with SQL' do
-      shell '/usr/bin/curl -H"User-Agent beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
     end
 
   end #default mod_security config
@@ -66,16 +66,16 @@ class { 'apache::mod::security': }
   context "mod_security should allow disabling by vhost" do
     it 'succeeds in puppeting mod_security' do
       pp= <<-EOS
+        host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
-          port           => '80',
-          docroot        => '/var/www/html',
+          port    => '80',
+          docroot => '/var/www/html',
         }
-        host { 'modsec.example.com': ip => '127.0.0.1', }
         file { '/var/www/html/index.html':
           ensure  => file,
-          content => "Index page\\n",
+          content => 'Index page',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -91,7 +91,7 @@ class { 'apache::mod::security': }
     end
 
     it 'should block query with SQL' do
-      shell '/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
     end
 
     it 'should disable mod_security per vhost' do
@@ -108,7 +108,7 @@ class { 'apache::mod::security': }
     end
 
     it 'should return index page' do
-      shell('/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
         expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
@@ -118,16 +118,16 @@ class { 'apache::mod::security': }
   context "mod_security should allow disabling by ip" do
     it 'succeeds in puppeting mod_security' do
       pp= <<-EOS
+        host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
-          port           => '80',
-          docroot        => '/var/www/html',
+          port    => '80',
+          docroot => '/var/www/html',
         }
-        host { 'modsec.example.com': ip => '127.0.0.1', }
         file { '/var/www/html/index.html':
           ensure  => file,
-          content => "Index page\\n",
+          content => 'Index page',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -143,7 +143,7 @@ class { 'apache::mod::security': }
     end
 
     it 'should block query with SQL' do
-      shell '/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
     end
 
     it 'should disable mod_security per vhost' do
@@ -160,7 +160,7 @@ class { 'apache::mod::security': }
     end
 
     it 'should return index page' do
-      shell('/usr/bin/curl -H"User-Agent: beaker" modsec.example.com:80') do |r|
+      shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
         expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
@@ -170,13 +170,13 @@ class { 'apache::mod::security': }
   context "mod_security should allow disabling by id" do
     it 'succeeds in puppeting mod_security' do
       pp= <<-EOS
+        host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
-          port           => '80',
-          docroot        => '/var/www/html',
+          port    => '80',
+          docroot => '/var/www/html',
         }
-        host { 'modsec.example.com': ip => '127.0.0.1', }
         file { '/var/www/html/index.html':
           ensure  => file,
           content => 'Index page',
@@ -199,7 +199,7 @@ class { 'apache::mod::security': }
     end
 
     it 'should block query with SQL' do
-      shell '/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
     end
 
     it 'should disable mod_security per vhost' do
@@ -216,7 +216,7 @@ class { 'apache::mod::security': }
     end
 
     it 'should return index page' do
-      shell('/usr/bin/curl -H"User-Agent: beaker" -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
         expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 94178fbd7f..ce388328f9 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -41,7 +41,7 @@
         on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
       end
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module','install','puppetlabs-concat', '--version 1.1.1', '--force'), { :acceptable_exit_codes => [0,1] }
     end
   end
 end

From 649cc799b75dfc6eef4e5cfce8bfc3b1b595ac58 Mon Sep 17 00:00:00 2001
From: Jason Antman <jason@jasonantman.com>
Date: Fri, 24 Oct 2014 09:13:48 -0400
Subject: [PATCH 0478/2267] MODULES-1458 allow specifying mod_wsgi package and
 path/module name

---
 README.md                     | 16 ++++++++++++
 manifests/mod/wsgi.pp         | 22 ++++++++++++++++-
 spec/classes/mod/wsgi_spec.rb | 46 +++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba805b8cbe..ee6e03ec79 100644
--- a/README.md
+++ b/README.md
@@ -729,6 +729,22 @@ For customized parameters, which tell Apache how Python is currently configured
     }
 ```
 
+To specify an alternate mod\_wsgi package name to install and the name of the module .so it provides,
+(e.g. a "python27-mod\_wsgi" package that provides "python27-mod_wsgi.so" in the default module directory):
+
+```puppet
+    class { 'apache::mod::wsgi':
+      wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
+      wsgi_python_home   => '/path/to/venv',
+      wsgi_python_path   => '/path/to/venv/site-packages',
+	  package_name       => 'python27-mod_wsgi',
+	  mod_path           => 'python27-mod_wsgi.so',
+    }
+```
+
+If ``mod_path`` does not contain "/", it will be prefixed by the default module path
+for your OS; otherwise, it will be used literally.
+
 More information about [WSGI](http://modwsgi.readthedocs.org/en/latest/).
 
 ####Class: `apache::mod::fcgid`
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 2a47bb68e3..7841706035 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -2,8 +2,28 @@
   $wsgi_socket_prefix = $::apache::params::wsgi_socket_prefix,
   $wsgi_python_path   = undef,
   $wsgi_python_home   = undef,
+  $package_name       = undef,
+  $mod_path           = undef,
 ){
-  ::apache::mod { 'wsgi': }
+
+  if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) {
+    fail('apache::mod::wsgi - both package_name and mod_path must be specified!')
+  }
+
+  if $package_name != undef {
+    if $mod_path =~ /\// {
+      $_mod_path = $mod_path
+    } else {
+      $_mod_path = "${::apache::params::lib_path}/${mod_path}"
+    }
+    ::apache::mod { 'wsgi':
+      package => $package_name,
+      path    => $_mod_path,
+    }
+  }
+  else {
+    ::apache::mod { 'wsgi': }
+  }
 
   # Template uses:
   # - $wsgi_socket_prefix
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 3875d3fd09..a68c808305 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -55,6 +55,52 @@
       end
       it {is_expected.to contain_file('wsgi.conf').with_content(/^  WSGIPythonHome "\/path\/to\/virtenv"$/)}
     end
+    describe "with custom package_name and mod_path" do
+      let :params do
+        {
+          :package_name => 'mod_wsgi_package',
+          :mod_path     => '/foo/bar/baz',
+        }
+      end
+      it { is_expected.to contain_apache__mod('wsgi').with({
+          'package' => 'mod_wsgi_package',
+          'path'    => '/foo/bar/baz',
+        })
+      }
+      it { is_expected.to contain_package("mod_wsgi_package") }
+      it { is_expected.to contain_file('wsgi.load').with_content(%r"LoadModule wsgi_module /foo/bar/baz") }
+    end
+    describe "with custom mod_path not containing /" do
+      let :params do
+        {
+          :package_name => 'mod_wsgi_package',
+          :mod_path     => 'wsgi_mod_name.so',
+        }
+      end
+      it { is_expected.to contain_apache__mod('wsgi').with({
+          'path'     => 'modules/wsgi_mod_name.so',
+          'package'  => 'mod_wsgi_package',
+        })
+      }
+      it { is_expected.to contain_file('wsgi.load').with_content(%r"LoadModule wsgi_module modules/wsgi_mod_name.so") }
+
+    end
+    describe "with package_name but no mod_path" do
+      let :params do
+        {
+          :mod_path => '/foo/bar/baz',
+        }
+      end
+      it { expect { subject }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ }
+    end
+    describe "with mod_path but no package_name" do
+      let :params do
+        {
+          :package_name => '/foo/bar/baz',
+        }
+      end
+      it { expect { subject }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ }
+    end
   end
   context "on a FreeBSD OS" do
     let :facts do

From 54fce8ab86810aa844b5cbc7e1d68e45cd6878a7 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 29 Dec 2014 10:40:50 -0800
Subject: [PATCH 0479/2267] Add IntelliJ files to the ignore list

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b5b7a00d67..b5db85e051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+.idea/
+*.iml

From 1bd26e02e69f0da6b4fc3c162ef50b80faa43ebd Mon Sep 17 00:00:00 2001
From: John Woffindin <john.woffindin@orionhealth.com>
Date: Wed, 19 Nov 2014 14:46:40 +1300
Subject: [PATCH 0480/2267] Add support for SSLPassPhraseDialog to be specified
 for mod_ssl.

Defaults to 'builtin' to match the current behavior.
---
 README.md                    |  7 ++++---
 manifests/mod/ssl.pp         | 13 +++++++------
 spec/classes/mod/ssl_spec.rb | 29 +++++++++++++++++++++++++++++
 templates/mod/ssl.conf.erb   |  2 +-
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 019e0e1fa8..09616ad41c 100644
--- a/README.md
+++ b/README.md
@@ -732,9 +732,10 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
 
 ```puppet
     class { 'apache::mod::ssl':
-      ssl_compression => false,
-      ssl_options     => [ 'StdEnvVars' ],
-      ssl_protocol    => [ 'all', '-SSLv2', '-SSLv3'],
+      ssl_compression        => false,
+      ssl_options            => [ 'StdEnvVars' ],
+      ssl_pass_phrase_dialog => 'builtin',
+      ssl_protocol           => [ 'all', '-SSLv2', '-SSLv3'],
   }
 ```
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 293e9319cc..c1278ff74f 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,10 +1,11 @@
 class apache::mod::ssl (
-  $ssl_compression = false,
-  $ssl_options     = [ 'StdEnvVars' ],
-  $ssl_cipher      = 'HIGH:MEDIUM:!aNULL:!MD5',
-  $ssl_protocol    = [ 'all', '-SSLv2', '-SSLv3' ],
-  $apache_version  = $::apache::apache_version,
-  $package_name    = undef,
+  $ssl_compression        = false,
+  $ssl_options            = [ 'StdEnvVars' ],
+  $ssl_cipher             = 'HIGH:MEDIUM:!aNULL:!MD5',
+  $ssl_protocol           = [ 'all', '-SSLv2', '-SSLv3' ],
+  $ssl_pass_phrase_dialog = 'builtin',
+  $apache_version         = $::apache::apache_version,
+  $package_name           = undef,
 ) {
   $session_cache = $::osfamily ? {
     'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 93f04e3ca5..f3fc7ae645 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -78,4 +78,33 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
   end
+
+  # Template config doesn't vary by distro
+  context "on all distros" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'CentOS',
+        :operatingsystemrelease => '6',
+        :kernel                 => 'Linux',
+        :id                     => 'root',
+        :concat_basedir         => '/dne',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+
+    context 'not setting ssl_pass_phrase_dialog' do
+      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog builtin$/)}
+    end
+
+    context 'setting ssl_pass_phrase_dialog' do
+      let :params do
+        {
+          :ssl_pass_phrase_dialog => 'exec:/path/to/program',
+        }
+      end
+      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog exec:\/path\/to\/program$/)}
+    end
+
+  end
 end
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index e92e37e7a9..a0e61650e0 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -7,7 +7,7 @@
   AddType application/x-x509-ca-cert .crt
   AddType application/x-pkcs7-crl    .crl
 
-  SSLPassPhraseDialog  builtin
+  SSLPassPhraseDialog <%= @ssl_pass_phrase_dialog %>
   SSLSessionCache "shmcb:<%= @session_cache %>"
   SSLSessionCacheTimeout 300
 <% if @ssl_compression -%>

From 0012b4ab952f745de06953e486dbcbb71bddd127 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Dec 2014 14:56:16 -0800
Subject: [PATCH 0481/2267] $::selinux is a bool, not a string

---
 spec/acceptance/apache_parameters_spec.rb | 2 +-
 spec/acceptance/class_spec.rb             | 2 +-
 spec/acceptance/vhost_spec.rb             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 3a21ab0eb2..50ee3e85fa 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -339,7 +339,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = <<-EOS
-          if $::osfamily == 'RedHat' and $::selinux == 'true' {
+          if $::osfamily == 'RedHat' and $::selinux {
             $semanage_package = $::operatingsystemmajrelease ? {
               '5'     => 'policycoreutils',
               default => 'policycoreutils-python',
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 954b6ac587..92870bb6ac 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -42,7 +42,7 @@ class { 'apache': }
     # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
-      if $::osfamily == 'RedHat' and $::selinux == 'true' {
+      if $::osfamily == 'RedHat' and $::selinux {
         $semanage_package = $::operatingsystemmajrelease ? {
           '5'     => 'policycoreutils',
           default => 'policycoreutils-python',
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 483b74945c..ec143756f2 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1187,7 +1187,7 @@ class { 'apache::mod::fastcgi': }
   describe 'additional_includes' do
     it 'applies cleanly' do
       pp = <<-EOS
-        if $::osfamily == 'RedHat' and $::selinux == 'true' {
+        if $::osfamily == 'RedHat' and $::selinux {
           $semanage_package = $::operatingsystemmajrelease ? {
             '5'     => 'policycoreutils',
             default => 'policycoreutils-python',

From b659a8effaeb62b862594204688cbb53a2410145 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 30 Dec 2014 11:13:03 -0800
Subject: [PATCH 0482/2267] Make sure we're using system ruby in the
 mod_passenger tests

PE ships with different versions of ruby than the version mod_passenger
was compiled against. Make sure we use the system ruby in the tests.
---
 spec/acceptance/mod_passenger_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 9a758a44ee..4b3516f69e 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -137,7 +137,7 @@ class { 'apache::mod::passenger': }
       end
 
       it 'should output status via passenger-memory-stats' do
-        shell("/usr/sbin/passenger-memory-stats") do |r|
+        shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats") do |r|
           expect(r.stdout).to match(/Apache processes/)
           expect(r.stdout).to match(/Nginx processes/)
           expect(r.stdout).to match(/Passenger processes/)
@@ -158,7 +158,7 @@ class { 'apache::mod::passenger': }
       unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
         it 'should output status via passenger-status' do
           # xml output not available on ubunutu <= 10.04, so sticking with default pool output
-          shell("/usr/sbin/passenger-status") do |r|
+          shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r|
             # spacing may vary
             expect(r.stdout).to match(/[\-]+ General information [\-]+/)
             if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'

From 9416be717d48ec1cb6ac85498693477b9432b390 Mon Sep 17 00:00:00 2001
From: Pete Soloway <pete@puppetlabs.com>
Date: Tue, 30 Dec 2014 11:41:59 -0800
Subject: [PATCH 0483/2267] Added code example for setenv class

Example usage is based on the Apache docs' own example for the SetEnv directive:
http://httpd.apache.org/docs/2.2/mod/mod_env.html#setenv

Change requested here:
https://tickets.puppetlabs.com/browse/DOCUMENT-204
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 019e0e1fa8..aa9266cddc 100644
--- a/README.md
+++ b/README.md
@@ -1426,6 +1426,14 @@ Sets the servername corresponding to the hostname you connect to the virtual hos
 
 Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
 
+Example:
+
+```puppet
+     apache::vhost {'setenv.example.com':
+         setenv  => ['SPECIAL_PATH /foo/bin'],
+      }
+```
+
 #####`setenvif`
 
 Used by HTTPD to conditionally set environment variables for vhosts. Defaults to '[]'.

From 1db205abccb41d633d7babb5338c7c7f3b6b0efd Mon Sep 17 00:00:00 2001
From: Pete Soloway <pete@puppetlabs.com>
Date: Tue, 30 Dec 2014 14:07:47 -0800
Subject: [PATCH 0484/2267] Corrected style errors

Thanks for the edits, Hunter! Can you validate my corrections? I'm making these in-browser, and GitHub's editor might be throwing me off by converting my spaces to tabs.
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index aa9266cddc..b517027208 100644
--- a/README.md
+++ b/README.md
@@ -1429,9 +1429,9 @@ Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
 Example:
 
 ```puppet
-     apache::vhost {'setenv.example.com':
-         setenv  => ['SPECIAL_PATH /foo/bin'],
-      }
+    apache::vhost { 'setenv.example.com':
+      setenv => ['SPECIAL_PATH /foo/bin'],
+    }
 ```
 
 #####`setenvif`

From 48080116661465d082543a335d4e1629332a7b6a Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 30 Dec 2014 14:34:30 -0800
Subject: [PATCH 0485/2267] Strict variable fix

---
 manifests/version.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index 010061b703..f22797c4cb 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -12,14 +12,14 @@
 
   case $::osfamily {
     'RedHat': {
-      if ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
+      if ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($distrelease, '7') >= 0) {
         $default = '2.4'
       } else {
         $default = '2.2'
       }
     }
     'Debian': {
-      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
+      if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0 {
         $default = '2.4'
       } elsif $::operatingsystem == 'Debian' and $::operatingsystemrelease == 'jessie/sid' {
         $default = '2.4'

From 46574de24196a71bdcd83485d23beac105d40d9d Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Fri, 2 Jan 2015 02:33:31 +0100
Subject: [PATCH 0486/2267] fix apache_version for Debian >7

---
 manifests/version.pp       | 2 +-
 spec/acceptance/version.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index f22797c4cb..8304bb1a0c 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -21,7 +21,7 @@
     'Debian': {
       if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0 {
         $default = '2.4'
-      } elsif $::operatingsystem == 'Debian' and $::operatingsystemrelease == 'jessie/sid' {
+      } elsif $::operatingsystem == 'Debian' and versioncmp($distrelease, '8') >= 0 {
         $default = '2.4'
       } else {
         $default = '2.2'
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index b88412b42f..c1578c52e6 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -38,6 +38,8 @@
 
   if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10
     $apache_version = '2.4'
+  elsif _operatingsystem == 'Debian' and _operatingsystemrelease >= 8.0
+    $apache_version = '2.4'
   else
     $apache_version = '2.2'
   end

From 35d7d04afdd8b6e0d00fa5807420d531bc7de86c Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Fri, 2 Jan 2015 03:28:29 +0100
Subject: [PATCH 0487/2267] add passenger support for Debian/jessie

---
 README.passenger.md                   |  1 +
 manifests/params.pp                   |  5 +++++
 spec/acceptance/mod_passenger_spec.rb | 12 ++++++++++--
 spec/classes/mod/passenger_spec.rb    | 19 +++++++++++++++++++
 templates/mod/passenger.conf.erb      |  2 +-
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/README.passenger.md b/README.passenger.md
index 4b4caa8c09..84e6992ffa 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -27,6 +27,7 @@ puppetlabs-apache:
 OS               | Passenger version  | `PassengerRoot` 
 ---------------- | ------------------ | ----------------
 Debian 7         | 3.0.13             | /usr
+Debian 8         | 4.0.53             | /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
 Ubuntu 12.04     | 2.2.11             | /usr
 Ubuntu 14.04     | 4.0.37             | /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini 
 RHEL with EPEL6  | 3.0.21             | /usr/lib/ruby/gems/1.8/gems/passenger-3.0.21 
diff --git a/manifests/params.pp b/manifests/params.pp
index d7e00ca18b..616102fa62 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -256,6 +256,11 @@
             $passenger_ruby         = '/usr/bin/ruby'
             $passenger_default_ruby = undef
           }
+          'jessie': {
+            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+            $passenger_ruby         = undef
+            $passenger_default_ruby = '/usr/bin/ruby'
+          }
           default: {
             # The following settings may or may not work on Debian releases not
             # supported by this module.
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 4b3516f69e..f6e710db01 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -31,6 +31,10 @@
       when 'wheezy'
         passenger_root = '/usr'
         passenger_ruby = '/usr/bin/ruby'
+      when 'jessie'
+        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+        passenger_ruby         = '/usr/bin/ruby'
+        passenger_default_ruby = '/usr/bin/ruby'
       else
         # This may or may not work on Debian releases other than the above
         passenger_root = '/usr'
@@ -124,6 +128,9 @@ class { 'apache::mod::passenger': }
           when 'wheezy'
             it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
             it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+          when 'jessie'
+            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerRuby/" }
           else
             # This may or may not work on Debian releases other than the above
             it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
@@ -142,9 +149,10 @@ class { 'apache::mod::passenger': }
           expect(r.stdout).to match(/Nginx processes/)
           expect(r.stdout).to match(/Passenger processes/)
 
-          # passenger-memory-stats output on Ubuntu 14.04 does not contain
+          # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
           # these two lines
-          unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
+          unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or
+                 (fact('operatingsystem') == 'Debian' && fact('operatingsystemrelease') == '8.0'))
             expect(r.stdout).to match(/### Processes: [0-9]+/)
             expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
           end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 23154014a4..0093d4b919 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -175,6 +175,25 @@
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
       it { is_expected.to contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
     end
+
+    context "with Debian 8 defaults" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '8.0',
+          :operatingsystem        => 'Debian',
+          :kernel                 => 'Linux',
+          :lsbdistcodename        => 'jessie',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        }
+      end
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
+      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
+    end
   end
 
   context "on a RedHat OS" do
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index dd9eee3b13..a56d2d5d14 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -1,4 +1,4 @@
-# The Passanger Apache module configuration file is being
+# The Passenger Apache module configuration file is being
 # managed by Puppet and changes will be overwritten.
 <IfModule mod_passenger.c>
   <%- if @passenger_root -%>

From 52bb5c77bd3832fb7b7dc2bfb3fb663058f1ecd8 Mon Sep 17 00:00:00 2001
From: Jason Lingohr <lingfish@users.noreply.github.com>
Date: Mon, 12 Jan 2015 17:41:36 +1100
Subject: [PATCH 0488/2267] Typo for custom_fragment example

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cc48f837a2..484bb3eb7d 100644
--- a/README.md
+++ b/README.md
@@ -2069,7 +2069,7 @@ Within your virtual host, you can then configure the specified file type to be h
 ```puppet
 apache::vhost { 'www':
   ...
-  custom_fragment = 'AddType application/x-httpd-php .php'
+  custom_fragment => 'AddType application/x-httpd-php .php'
   ...
 }
 ```

From 7511cdaeaba8adc9afbadfaa60d65fe77abccdfa Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Thu, 4 Dec 2014 03:32:21 -0700
Subject: [PATCH 0489/2267] MODULES-1554: update error docs and icons path for
 RHEL7-based systems

---
 manifests/init.pp              |  3 --
 manifests/mod/alias.pp         |  7 +++-
 manifests/params.pp            |  8 +++-
 spec/classes/mod/alias_spec.rb | 68 ++++++++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 spec/classes/mod/alias_spec.rb

diff --git a/manifests/init.pp b/manifests/init.pp
index 32966b86f7..a8084131fb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -242,21 +242,18 @@
       'debian': {
         $pidfile              = "\${APACHE_PID_FILE}"
         $error_log            = 'error.log'
-        $error_documents_path = '/usr/share/apache2/error'
         $scriptalias          = '/usr/lib/cgi-bin'
         $access_log_file      = 'access.log'
       }
       'redhat': {
         $pidfile              = 'run/httpd.pid'
         $error_log            = 'error_log'
-        $error_documents_path = '/var/www/error'
         $scriptalias          = '/var/www/cgi-bin'
         $access_log_file      = 'access_log'
       }
       'freebsd': {
         $pidfile              = '/var/run/httpd.pid'
         $error_log            = 'httpd-error.log'
-        $error_documents_path = '/usr/local/www/apache22/error'
         $scriptalias          = '/usr/local/www/apache22/cgi-bin'
         $access_log_file      = 'httpd-access.log'
       }
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index ee017b490f..0e019abbd1 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,9 +1,14 @@
 class apache::mod::alias(
   $apache_version = $apache::apache_version
 ) {
+  $ver24 = versioncmp($apache_version, 2.4) >= 0
+
   $icons_path = $::osfamily ? {
     'debian'  => '/usr/share/apache2/icons',
-    'redhat'  => '/var/www/icons',
+    'redhat'  => $ver24 ? {
+      true    => '/usr/share/httpd/icons',
+      default => '/var/www/icons',
+    },
     'freebsd' => '/usr/local/www/apache22/icons',
   }
   apache::mod { 'alias': }
diff --git a/manifests/params.pp b/manifests/params.pp
index 616102fa62..7e19d99fa9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -105,7 +105,11 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
-    if $::osfamily == 'RedHat' {
+    $error_documents_path = $::apache::version::distrelease ? {
+      '7'     => '/usr/share/httpd/error',
+      default => '/var/www/error'
+    }
+    if $::osfamily == "RedHat" {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
       $wsgi_socket_prefix = undef
@@ -219,6 +223,7 @@
       'base_rules/modsecurity_crs_59_outbound_blocking.conf',
       'base_rules/modsecurity_crs_60_correlation.conf'
     ]
+    $error_documents_path = '/usr/share/apache2/error'
 
     #
     # Passenger-specific settings
@@ -335,6 +340,7 @@
     $mime_types_config    = '/usr/local/etc/mime.types'
     $wsgi_socket_prefix   = undef
     $docroot              = '/usr/local/www/apache22/data'
+    $error_documents_path = '/usr/local/www/apache22/error'
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
new file mode 100644
index 0000000000..503575af61
--- /dev/null
+++ b/spec/classes/mod/alias_spec.rb
@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe 'apache::mod::alias', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+  context "on a Debian OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :lsbdistcodename        => 'squeeze',
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { is_expected.to contain_apache__mod("alias") }
+    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"/) }
+  end
+  context "on a RedHat 6-based OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { is_expected.to contain_apache__mod("alias") }
+    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/var\/www\/icons\/"/) }
+  end
+  context "on a RedHat 7-based OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '7',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { is_expected.to contain_apache__mod("alias") }
+    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"/) }
+  end
+  context "on a FreeBSD OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'FreeBSD',
+        :osfamily               => 'FreeBSD',
+        :operatingsystem        => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+      }
+    end
+    it { is_expected.to contain_apache__mod("alias") }
+    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/local\/www\/apache22\/icons\/"/) }
+  end
+end

From 4a96814e13a81d8a434a104929c2f0a265a69e43 Mon Sep 17 00:00:00 2001
From: Farzad FARID <ffarid@pragmatic-source.com>
Date: Fri, 16 Jan 2015 10:09:53 +0100
Subject: [PATCH 0490/2267] ssl_protocol expects a string, not an array.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 484bb3eb7d..2de3522992 100644
--- a/README.md
+++ b/README.md
@@ -735,7 +735,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
       ssl_compression        => false,
       ssl_options            => [ 'StdEnvVars' ],
       ssl_pass_phrase_dialog => 'builtin',
-      ssl_protocol           => [ 'all', '-SSLv2', '-SSLv3'],
+      ssl_protocol           => 'all -SSLv2 -SSLv3',
   }
 ```
 

From 3c3df650278ef17bb4931922e7a3a775ab128464 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Sat, 17 Jan 2015 06:06:28 -0700
Subject: [PATCH 0491/2267] fix versioncmp test in mod::alias

---
 manifests/mod/alias.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 0e019abbd1..40480c3d4c 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,7 +1,7 @@
 class apache::mod::alias(
   $apache_version = $apache::apache_version
 ) {
-  $ver24 = versioncmp($apache_version, 2.4) >= 0
+  $ver24 = versioncmp($apache_version, '2.4') >= 0
 
   $icons_path = $::osfamily ? {
     'debian'  => '/usr/share/apache2/icons',

From 6ab9b84fb3d5b46eaf111603d7cf5d0a8e3dce12 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Tue, 20 Jan 2015 15:37:40 +0100
Subject: [PATCH 0492/2267] Fix doc about confd_dir on Debian

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 484bb3eb7d..49a9ddbd0b 100644
--- a/README.md
+++ b/README.md
@@ -242,7 +242,7 @@ Changes the location of the configuration directory the main configuration file
 
 #####`confd_dir`
 
-Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
+Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2/conf.d' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
 
 #####`conf_template`
 

From 83df47136427292973d813777fcd69ef5bb8ae72 Mon Sep 17 00:00:00 2001
From: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
Date: Tue, 20 Jan 2015 15:23:25 +0100
Subject: [PATCH 0493/2267] Specify mod_proxy_connect module for Apache >=
 2.3.5

mod_proxy_connect was moved to own module since Apache >= 2.3.5.
AllowCONNECT directive won't work without this module on Ubuntu 14.04 or
Debian 8.

Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
---
 manifests/mod/proxy_connect.pp         |  8 +++++
 spec/classes/mod/proxy_connect_spec.rb | 50 ++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 manifests/mod/proxy_connect.pp
 create mode 100644 spec/classes/mod/proxy_connect_spec.rb

diff --git a/manifests/mod/proxy_connect.pp b/manifests/mod/proxy_connect.pp
new file mode 100644
index 0000000000..3bae848446
--- /dev/null
+++ b/manifests/mod/proxy_connect.pp
@@ -0,0 +1,8 @@
+class apache::mod::proxy_connect (
+  $apache_version  = $::apache::apache_version,
+) {
+  if versioncmp($apache_version, '2.4') >= 0 {
+    Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_connect']
+    ::apache::mod { 'proxy_connect': }
+  }
+}
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
new file mode 100644
index 0000000000..c54d255a5e
--- /dev/null
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'apache::mod::proxy_connect', :type => :class do
+  let :pre_condition do
+    [
+      'include apache',
+      'include apache::mod::proxy',
+    ]
+  end
+  context 'on a Debian OS' do
+    let :facts do
+      {
+        :osfamily        => 'Debian',
+        :concat_basedir  => '/dne',
+        :operatingsystem => 'Debian',
+        :id              => 'root',
+        :kernel          => 'Linux',
+        :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    context 'with Apache version < 2.4' do
+      let :facts do
+        super().merge({
+          :operatingsystemrelease => '7.0',
+          :lsbdistcodename        => 'wheezy',
+        })
+      end
+      let :params do
+        {
+          :apache_version => '2.2',
+        }
+      end
+      it { is_expected.not_to contain_apache__mod('proxy_connect') }
+    end
+    context 'with Apache version >= 2.4' do
+      let :facts do
+        super().merge({
+          :operatingsystemrelease => '8.0',
+          :lsbdistcodename        => 'jessie',
+        })
+      end
+      let :params do
+        {
+          :apache_version => '2.4',
+        }
+      end
+      it { is_expected.to contain_apache__mod('proxy_connect') }
+    end
+  end
+end

From a4cbf7920727b4328da9a44f8af5480d9a30039e Mon Sep 17 00:00:00 2001
From: Nigel Gibbs <nigel@gibbsoft.com>
Date: Wed, 21 Jan 2015 22:32:30 +0000
Subject: [PATCH 0494/2267] Quoted params to versioncmp in mod/alias.pp to
 avoid type error

---
 manifests/mod/alias.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 0e019abbd1..40480c3d4c 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,7 +1,7 @@
 class apache::mod::alias(
   $apache_version = $apache::apache_version
 ) {
-  $ver24 = versioncmp($apache_version, 2.4) >= 0
+  $ver24 = versioncmp($apache_version, '2.4') >= 0
 
   $icons_path = $::osfamily ? {
     'debian'  => '/usr/share/apache2/icons',

From da59ce65e3f790f5fcba7a3d52bbb78c64f1e4b0 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Wed, 21 Jan 2015 13:02:53 -0800
Subject: [PATCH 0495/2267] modules-1559 apache module no service refresh

---
 README.md                                 |  4 +++
 manifests/init.pp                         |  3 +++
 manifests/mod.pp                          |  6 ++---
 manifests/mod/alias.pp                    |  2 +-
 manifests/mod/authnz_ldap.pp              |  2 +-
 manifests/mod/autoindex.pp                |  2 +-
 manifests/mod/cgid.pp                     |  2 +-
 manifests/mod/dav_fs.pp                   |  2 +-
 manifests/mod/deflate.pp                  |  2 +-
 manifests/mod/dir.pp                      |  2 +-
 manifests/mod/disk_cache.pp               |  2 +-
 manifests/mod/event.pp                    |  2 +-
 manifests/mod/fastcgi.pp                  |  2 +-
 manifests/mod/fcgid.pp                    |  2 +-
 manifests/mod/info.pp                     |  2 +-
 manifests/mod/itk.pp                      |  2 +-
 manifests/mod/ldap.pp                     |  2 +-
 manifests/mod/mime.pp                     |  2 +-
 manifests/mod/mime_magic.pp               |  2 +-
 manifests/mod/negotiation.pp              |  2 +-
 manifests/mod/nss.pp                      |  2 +-
 manifests/mod/pagespeed.pp                |  2 +-
 manifests/mod/passenger.pp                |  2 +-
 manifests/mod/peruser.pp                  |  2 +-
 manifests/mod/php.pp                      |  2 +-
 manifests/mod/prefork.pp                  |  4 +--
 manifests/mod/proxy.pp                    |  2 +-
 manifests/mod/proxy_html.pp               |  2 +-
 manifests/mod/reqtimeout.pp               |  2 +-
 manifests/mod/rpaf.pp                     |  2 +-
 manifests/mod/security.pp                 |  4 +--
 manifests/mod/setenvif.pp                 |  2 +-
 manifests/mod/ssl.pp                      |  2 +-
 manifests/mod/status.pp                   |  2 +-
 manifests/mod/suphp.pp                    |  2 +-
 manifests/mod/userdir.pp                  |  2 +-
 manifests/mod/worker.pp                   |  4 +--
 manifests/mod/wsgi.pp                     |  2 +-
 manifests/mpm.pp                          |  6 ++---
 manifests/peruser/multiplexer.pp          |  2 +-
 manifests/peruser/processor.pp            |  2 +-
 manifests/service.pp                      | 13 +++++----
 manifests/vhost.pp                        |  4 +--
 spec/acceptance/apache_parameters_spec.rb | 19 +++++++++++++
 spec/classes/service_spec.rb              | 33 +++++++++++++++++++++++
 spec/defines/vhost_spec.rb                |  2 +-
 46 files changed, 116 insertions(+), 54 deletions(-)

diff --git a/README.md b/README.md
index 484bb3eb7d..d48e237f91 100644
--- a/README.md
+++ b/README.md
@@ -438,6 +438,10 @@ Determines whether the service should be running. Valid values are 'true', 'fals
 
 Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on Debian, and 'apache22' on FreeBSD.
 
+#####`service_manage`
+
+Determines whether the HTTPD service state is managed by Puppet . Defaults to 'true'.
+
 #####`trace_enable`
 
 Controls how TRACE requests per RFC 2616 are handled. More information about [TraceEnable](http://httpd.apache.org/docs/current/mod/core.html#traceenable). Defaults to 'On'.
diff --git a/manifests/init.pp b/manifests/init.pp
index a8084131fb..81f32e26a8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,6 +28,7 @@
   $default_ssl_crl_check  = undef,
   $ip                     = undef,
   $service_enable         = true,
+  $service_manage         = true,
   $service_ensure         = 'running',
   $purge_configs          = true,
   $purge_vhost_dir        = undef,
@@ -72,6 +73,7 @@
   validate_bool($default_confd_files)
   # true/false is sufficient for both ensure and enable
   validate_bool($service_enable)
+  validate_bool($service_manage)
 
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
@@ -126,6 +128,7 @@
   class { '::apache::service':
     service_name   => $service_name,
     service_enable => $service_enable,
+    service_manage => $service_manage,
     service_ensure => $service_ensure,
   }
 
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 88cdcd6a5b..0891bf0b77 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -88,7 +88,7 @@
       Exec["mkdir ${mod_dir}"],
     ],
     before  => File[$mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   if $::osfamily == 'Debian' {
@@ -105,7 +105,7 @@
         Exec["mkdir ${enable_dir}"],
       ],
       before  => File[$enable_dir],
-      notify  => Service['httpd'],
+      notify  => Class['apache::service'],
     }
     # Each module may have a .conf file as well, which should be
     # defined in the class apache::mod::module
@@ -123,7 +123,7 @@
           Exec["mkdir ${enable_dir}"],
         ],
         before  => File[$enable_dir],
-        notify  => Service['httpd'],
+        notify  => Class['apache::service'],
       }
     }
   }
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 0e019abbd1..f1f331da28 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -19,6 +19,6 @@
     content => template('apache/mod/alias.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 800e656e89..b75369ffcd 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -14,6 +14,6 @@
     content => template('apache/mod/authnz_ldap.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index f5f0f07458..c0969a814e 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -7,6 +7,6 @@
     content => template('apache/mod/autoindex.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 2a0c178e01..ee9044cd5a 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -17,7 +17,7 @@
       content => template('apache/mod/cgid.conf.erb'),
       require => Exec["mkdir ${::apache::mod_dir}"],
       before  => File[$::apache::mod_dir],
-      notify  => Service['httpd'],
+      notify  => Class['apache::service'],
     }
   }
 }
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index 0cb663f5c5..af037e32d0 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -15,6 +15,6 @@
     content => template('apache/mod/dav_fs.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 561cbadbf9..9b8d43621c 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -19,6 +19,6 @@
     content => template('apache/mod/deflate.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index 11631305a4..6243a1bb7d 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -16,6 +16,6 @@
     content => template('apache/mod/dir.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 13c9c78352..54c0528379 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -19,6 +19,6 @@
     content => template('apache/mod/disk_cache.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index f2b28fde28..18a226ee53 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -43,7 +43,7 @@
     content => template('apache/mod/event.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   case $::osfamily {
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index a185bb31fa..1f7e5df4fb 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -17,7 +17,7 @@
       content => template('apache/mod/fastcgi.conf.erb'),
       require => Exec["mkdir ${::apache::mod_dir}"],
       before  => File[$::apache::mod_dir],
-      notify  => Service['httpd'],
+      notify  => Class['apache::service'],
     }
   }
 
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 70761e41d7..a143c2b434 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -19,6 +19,6 @@
     content => template('apache/mod/fcgid.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 2c3d56ed88..f0d03eb0f6 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -13,6 +13,6 @@
     content => template('apache/mod/info.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index dc020b810a..49794945d4 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -39,7 +39,7 @@
     content => template('apache/mod/itk.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   case $::osfamily {
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index d3b17ff5b8..fbd56d539a 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -9,6 +9,6 @@
     content => template('apache/mod/ldap.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index ccdb5d4b3c..86000d1679 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -10,7 +10,7 @@
     content => template('apache/mod/mime.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
   if $mime_support_package {
     package { $mime_support_package:
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index c276268e4d..c057b01f50 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -9,6 +9,6 @@
     content => template('apache/mod/mime_magic.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index 0bdbfdc3cc..02a3a0e64d 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -20,6 +20,6 @@
     content => template('apache/mod/negotiation.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index f0eff1cdf7..132b41b3f6 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -20,6 +20,6 @@
     content => template('apache/mod/nss.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index efe100861d..588849c472 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -50,6 +50,6 @@
     content => template('apache/mod/pagespeed.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 12139cb2b4..7ff6b71be3 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -81,6 +81,6 @@
     content => template('apache/mod/passenger.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 518655a1d4..107e47ce81 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -43,7 +43,7 @@
     content => template('apache/mod/peruser.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
   file { "${::apache::mod_dir}/peruser":
     ensure  => directory,
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index c1f76065a6..4c5d85d56c 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -55,6 +55,6 @@
       Exec["mkdir ${::apache::mod_dir}"],
     ],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 6a66ef1c90..90fa39a89c 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -39,7 +39,7 @@
     content => template('apache/mod/prefork.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   case $::osfamily {
@@ -56,7 +56,7 @@
           line    => '#HTTPD=/usr/sbin/httpd.worker',
           match   => '#?HTTPD=/usr/sbin/httpd.worker',
           require => Package['httpd'],
-          notify  => Service['httpd'],
+          notify  => Class['apache::service'],
         }
       }
     }
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 03c1e78c95..8c685d55b5 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -11,6 +11,6 @@
     content => template('apache/mod/proxy.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 549eb117fa..279cb64ade 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -32,6 +32,6 @@
     content => template('apache/mod/proxy_html.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index 62088873bb..34c96a6784 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -9,6 +9,6 @@
     content => template('apache/mod/reqtimeout.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index 6fbc1d4e04..12b86eb8bd 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -15,6 +15,6 @@
     content => template('apache/mod/rpaf.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 9641d70df5..57b75726e1 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -33,7 +33,7 @@
     path    => "${::apache::mod_dir}/security.conf",
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   file { $modsec_dir:
@@ -56,7 +56,7 @@
     ensure  => file,
     content => template('apache/mod/security_crs.conf.erb'),
     require => File[$modsec_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   apache::security::rule_link { $activated_rules: }
diff --git a/manifests/mod/setenvif.pp b/manifests/mod/setenvif.pp
index 15b1441d83..c73102dfbe 100644
--- a/manifests/mod/setenvif.pp
+++ b/manifests/mod/setenvif.pp
@@ -7,6 +7,6 @@
     content => template('apache/mod/setenvif.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index c1278ff74f..4036fd28af 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -56,6 +56,6 @@
     content => template('apache/mod/ssl.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 9c61836960..4c3f8d9e25 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -41,6 +41,6 @@
     content => template('apache/mod/status.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index f9a572f463..c50beea06c 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -8,7 +8,7 @@
     content => template('apache/mod/suphp.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd']
+    notify  => Class['apache::service'],
   }
 }
 
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index accfe64a79..038e0790bc 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -13,6 +13,6 @@
     content => template('apache/mod/userdir.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 0d2815964b..48d1c9f229 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -41,7 +41,7 @@
     content => template('apache/mod/worker.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   case $::osfamily {
@@ -58,7 +58,7 @@
           line    => 'HTTPD=/usr/sbin/httpd.worker',
           match   => '#?HTTPD=/usr/sbin/httpd.worker',
           require => Package['httpd'],
-          notify  => Service['httpd'],
+          notify  => Class['apache::service'],
         }
       }
     }
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 7841706035..80f9738ff9 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -35,7 +35,7 @@
     content => template('apache/mod/wsgi.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd']
+    notify  => Class['apache::service'],
   }
 }
 
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 180686cfa3..a5cca49882 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -23,7 +23,7 @@
         Exec["mkdir ${mod_dir}"],
       ],
       before  => File[$mod_dir],
-      notify  => Service['httpd'],
+      notify  => Class['apache::service'],
     }
   }
 
@@ -34,7 +34,7 @@
         target  => "${::apache::mod_dir}/${mpm}.conf",
         require => Exec["mkdir ${::apache::mod_enable_dir}"],
         before  => File[$::apache::mod_enable_dir],
-        notify  => Service['httpd'],
+        notify  => Class['apache::service'],
       }
 
       if versioncmp($apache_version, '2.4') >= 0 {
@@ -43,7 +43,7 @@
           target  => "${::apache::mod_dir}/${mpm}.load",
           require => Exec["mkdir ${::apache::mod_enable_dir}"],
           before  => File[$::apache::mod_enable_dir],
-          notify  => Service['httpd'],
+          notify  => Class['apache::service'],
         }
 
         if $mpm == 'itk' {
diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
index 9e57ac30b2..97143a1d4f 100644
--- a/manifests/peruser/multiplexer.pp
+++ b/manifests/peruser/multiplexer.pp
@@ -12,6 +12,6 @@
     ensure  => file,
     content => "Multiplexer ${user} ${group}\n",
     require => File["${::apache::mod_dir}/peruser/multiplexers"],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/peruser/processor.pp b/manifests/peruser/processor.pp
index 1d68934657..30de61d7c4 100644
--- a/manifests/peruser/processor.pp
+++ b/manifests/peruser/processor.pp
@@ -12,6 +12,6 @@
     ensure  => file,
     content => "Processor ${user} ${group}\n",
     require => File["${::apache::mod_dir}/peruser/processors"],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/service.pp b/manifests/service.pp
index 0c1f7b96aa..d934f3d46b 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -20,12 +20,14 @@
   $service_name   = $::apache::params::service_name,
   $service_enable = true,
   $service_ensure = 'running',
+  $service_manage = true,
 ) {
   # The base class must be included first because parameter defaults depend on it
   if ! defined(Class['apache::params']) {
     fail('You must include the apache::params class before using any apache defined resources')
   }
   validate_bool($service_enable)
+  validate_bool($service_manage)
 
   case $service_ensure {
     true, false, 'running', 'stopped': {
@@ -35,10 +37,11 @@
       $_service_ensure = undef
     }
   }
-
-  service { 'httpd':
-    ensure => $_service_ensure,
-    name   => $service_name,
-    enable => $service_enable,
+  if $service_manage {
+    service { 'httpd':
+      ensure => $_service_ensure,
+      name   => $service_name,
+      enable => $service_enable,
+    }
   }
 }
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9e05cb566f..3c0b149dfe 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -438,7 +438,7 @@
     mode    => '0644',
     order   => 'numeric',
     require => Package['httpd'],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
   if $::osfamily == 'Debian' {
     $vhost_enable_dir = $::apache::vhost_enable_dir
@@ -454,7 +454,7 @@
       group   => $::apache::params::root_group,
       mode    => '0644',
       require => Concat["${priority_real}-${filename}.conf"],
-      notify  => Service['httpd'],
+      notify  => Class['apache::service'],
     }
   }
 
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 50ee3e85fa..82d589f78d 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -46,6 +46,7 @@
       pp = <<-EOS
         class { 'apache':
           service_enable => true,
+          service_manage => true,
           service_ensure => running,
         }
       EOS
@@ -75,6 +76,24 @@ class { 'apache':
     end
   end
 
+  describe 'service manage => false' do
+    it 'we dont manage the service, so it shouldnt start the service' do
+      pp = <<-EOS
+        class { 'apache':
+          service_enable => true,
+          service_manage => false,
+          service_ensure => true,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service($service_name) do
+      it { is_expected.not_to be_running }
+      it { is_expected.not_to be_enabled }
+    end
+  end
+
   describe 'purge parameters => false' do
     it 'applies cleanly' do
       pp = <<-EOS
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 4d6efbe3fd..fda1f51279 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -60,6 +60,14 @@
       end
     end
 
+    context "$service_manage must be a bool" do
+      let (:params) {{ :service_manage => 'not-a-boolean' }}
+
+      it 'should fail' do
+        expect { subject }.to raise_error(Puppet::Error, /is not a boolean/)
+      end
+    end
+
     context "with $service_ensure => 'running'" do
       let (:params) {{ :service_ensure => 'running', }}
       it { is_expected.to contain_service("httpd").with(
@@ -124,4 +132,29 @@
       )
     }
   end
+
+  context "on a RedHat 5 OS, do not manage service" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '5',
+        :concat_basedir         => '/dne',
+        :operatingsystem        => 'RedHat',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    let(:params) do
+      {
+        'service_ensure' => 'running',
+        'service_name'   => 'httpd',
+        'service_manage' => false
+      }
+    end
+    it 'should not manage the httpd service' do
+      subject.should_not contain_service('httpd')
+    end
+  end
+
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 66b1862508..16b7f4e41d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -285,7 +285,7 @@
         'owner'   => 'root',
         'mode'    => '0644',
         'require' => 'Package[httpd]',
-        'notify'  => 'Service[httpd]',
+        'notify'  => 'Class[Apache::Service]',
       })
       }
       it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }

From cc36364179836f4152dafc9d40f78b611c220bf9 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 21 Jan 2015 16:36:22 -0800
Subject: [PATCH 0496/2267] MODULES-1680 - sort php_* hashes for idempotency

They were already being sorted in templates/vhost/_php*.erb, but not in
templates/vhost/_directories.erb
---
 templates/vhost/_directories.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 703afaa8dd..97f2318c64 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -88,24 +88,24 @@
     PassengerEnabled <%= directory['passenger_enabled'] %>
     <%- end -%>
     <%- if directory['php_flags'] and ! directory['php_flags'].empty? -%>
-      <%- directory['php_flags'].each do |flag,value| -%>
+      <%- directory['php_flags'].sort.each do |flag,value| -%>
       <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
     php_flag <%= "#{flag} #{value}" %>
       <%- end -%>
     <%- end -%>
     <%- if directory['php_values'] and ! directory['php_values'].empty? -%>
-      <%- directory['php_values'].each do |key,value| -%>
+      <%- directory['php_values'].sort.each do |key,value| -%>
     php_value <%= "#{key} #{value}" %>
       <%- end -%>
     <%- end -%>
     <%- if directory['php_admin_flags'] and ! directory['php_admin_flags'].empty? -%>
-      <%- directory['php_admin_flags'].each do |flag,value| -%>
+      <%- directory['php_admin_flags'].sort.each do |flag,value| -%>
       <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
     php_admin_flag <%= "#{flag} #{value}" %>
       <%- end -%>
     <%- end -%>
     <%- if directory['php_admin_values'] and ! directory['php_admin_values'].empty? -%>
-      <%- directory['php_admin_values'].each do |key,value| -%>
+      <%- directory['php_admin_values'].sort.each do |key,value| -%>
     php_admin_value <%= "#{key} #{value}" %>
       <%- end -%>
     <%- end -%>

From 361ce833ba13cf555a54eec850e5d8579898fb3b Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Thu, 22 Jan 2015 05:35:56 -0700
Subject: [PATCH 0497/2267] MODULES-1696: ensure mod::setenvif is included if
 needed

---
 manifests/vhost.pp         | 6 ++++++
 spec/defines/vhost_spec.rb | 1 +
 2 files changed, 7 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9e05cb566f..d26f281f92 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -390,6 +390,12 @@
     }
   }
 
+  if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
+    if ! defined(Class['apache::mod::setenvif']) {
+      include ::apache::mod::setenvif
+    }
+  }
+
   ## Create a default directory list if none defined
   if $directories {
     if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 66b1862508..7545a6e505 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -281,6 +281,7 @@
       it { is_expected.to contain_class('apache::mod::passenger') }
       it { is_expected.to contain_class('apache::mod::fastcgi') }
       it { is_expected.to contain_class('apache::mod::headers') }
+      it { is_expected.to contain_class('apache::mod::setenvif') }
       it { is_expected.to contain_concat('30-rspec.example.com.conf').with({
         'owner'   => 'root',
         'mode'    => '0644',

From 16e2a0de444fcf48ca0497b90341aa68674054d2 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Thu, 15 Jan 2015 06:41:47 -0700
Subject: [PATCH 0498/2267] MODULES-1688: fix indenting in
 vhost/_directories.erb template

---
 templates/vhost/_directories.erb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 97f2318c64..685dad9a1f 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -3,20 +3,20 @@
   ## Directories, there should at least be a declaration for <%= @docroot %>
   <%- [@_directories].flatten.compact.each do |directory| -%>
     <%- if directory['path'] and directory['path'] != '' -%>
-  <%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
-    <%- if /^(.*)match$/ =~ directory['provider'] -%>
-      <%- provider = $1.capitalize + 'Match' -%>
-    <%- else -%>
-      <%- provider = directory['provider'].capitalize -%>
-    <%- end -%>
-  <%- else -%>
-    <%- provider = 'Directory' -%>
-  <%- end -%>
-  <%- path = directory['path'] -%>
+      <%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
+        <%- if /^(.*)match$/ =~ directory['provider'] -%>
+          <%- provider = $1.capitalize + 'Match' -%>
+        <%- else -%>
+          <%- provider = directory['provider'].capitalize -%>
+        <%- end -%>
+      <%- else -%>
+        <%- provider = 'Directory' -%>
+      <%- end -%>
+      <%- path = directory['path'] -%>
 
   <<%= provider %> "<%= path %>">
-    <%- if directory['headers'] -%>
-      <%- Array(directory['headers']).each do |header| -%>
+      <%- if directory['headers'] -%>
+        <%- Array(directory['headers']).each do |header| -%>
     Header <%= header %>
       <%- end -%>
     <%- end -%>
@@ -89,7 +89,7 @@
     <%- end -%>
     <%- if directory['php_flags'] and ! directory['php_flags'].empty? -%>
       <%- directory['php_flags'].sort.each do |flag,value| -%>
-      <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
+        <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
     php_flag <%= "#{flag} #{value}" %>
       <%- end -%>
     <%- end -%>
@@ -100,7 +100,7 @@
     <%- end -%>
     <%- if directory['php_admin_flags'] and ! directory['php_admin_flags'].empty? -%>
       <%- directory['php_admin_flags'].sort.each do |flag,value| -%>
-      <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
+        <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
     php_admin_flag <%= "#{flag} #{value}" %>
       <%- end -%>
     <%- end -%>

From a723b5609723295630419e701035474eb5e2d140 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Fri, 23 Jan 2015 06:44:51 -0700
Subject: [PATCH 0499/2267] add configuration options to mod_security

---
 README.md                           | 23 ++++++++++++++++++++++-
 manifests/mod/security.pp           | 25 ++++++++++++++++++-------
 manifests/security/rule_link.pp     |  1 +
 templates/mod/security_crs.conf.erb |  8 ++++----
 4 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d48e237f91..eef827481a 100644
--- a/README.md
+++ b/README.md
@@ -907,6 +907,10 @@ vhosts.
   include '::apache::mod::security'
 ```
 
+#####`crs_package`
+
+Name of package to install containing crs rules
+
 #####`modsec_dir`
 
 Directory to install the modsec configuration and activated rules links into
@@ -916,6 +920,23 @@ Directory to install the modsec configuration and activated rules links into
 Array of rules from the modsec_crs_path to activate by symlinking to
 ${modsec_dir}/activated_rules.
 
+#####`allowed_methods`
+
+HTTP methods allowed by mod_security
+
+#####`content_types`
+
+Content-types allowed by mod_security
+
+#####`restricted_extensions`
+
+Extensions prohibited by mod_security
+
+#####`restricted_headers`
+
+Headers restricted by mod_security
+
+
 ####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` being a defined resource type, which allows it to be evaluated multiple times with different parameters.
@@ -1824,7 +1845,7 @@ Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/
 ```
 
 *Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
- 
+
 ######`php_value` and `php_flag`
 
 `php_value` sets the value of the directory, and `php_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 57b75726e1..84e55e2921 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -1,7 +1,11 @@
 class apache::mod::security (
-  $crs_package     = $::apache::params::modsec_crs_package,
-  $activated_rules = $::apache::params::modsec_default_rules,
-  $modsec_dir      = $::apache::params::modsec_dir,
+  $crs_package           = $::apache::params::modsec_crs_package,
+  $activated_rules       = $::apache::params::modsec_default_rules,
+  $modsec_dir            = $::apache::params::modsec_dir,
+  $allowed_methods       = 'GET HEAD POST OPTIONS',
+  $content_types         = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
+  $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
+  $restricted_headers    = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
 ){
 
   if $::osfamily == 'FreeBSD' {
@@ -31,6 +35,8 @@
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
     path    => "${::apache::mod_dir}/security.conf",
+    owner   => $::apache::params::user,
+    group   => $::apache::params::group,
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
     notify  => Class['apache::service'],
@@ -42,14 +48,19 @@
     group   => $::apache::params::group,
     mode    => '0555',
     purge   => true,
+    force   => true,
     recurse => true,
   }
 
   file { "${modsec_dir}/activated_rules":
-    ensure => directory,
-    owner  => $::apache::params::user,
-    group  => $::apache::params::group,
-    mode   => '0555',
+    ensure  => directory,
+    owner   => $::apache::params::user,
+    group   => $::apache::params::group,
+    mode    => '0555',
+    purge   => true,
+    force   => true,
+    recurse => true,
+    notify  => Class['apache::service'],
   }
 
   file { "${modsec_dir}/security_crs.conf":
diff --git a/manifests/security/rule_link.pp b/manifests/security/rule_link.pp
index 1ddc9d6aa3..a56a2d97f0 100644
--- a/manifests/security/rule_link.pp
+++ b/manifests/security/rule_link.pp
@@ -8,5 +8,6 @@
     path    => "${::apache::mod::security::modsec_dir}/activated_rules/${filename}",
     target  => "${::apache::params::modsec_crs_path}/${title}",
     require => File["${::apache::mod::security::modsec_dir}/activated_rules"],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 4a990eb3a5..016efc797e 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -269,11 +269,11 @@ SecAction \
   "id:'900012', \
   phase:1, \
   t:none, \
-  setvar:'tx.allowed_methods=GET HEAD POST OPTIONS', \
-  setvar:'tx.allowed_request_content_type=application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf', \
+  setvar:'tx.allowed_methods=<%= @allowed_methods -%>', \
+  setvar:'tx.allowed_request_content_type=<%= @content_types -%>', \
   setvar:'tx.allowed_http_versions=HTTP/0.9 HTTP/1.0 HTTP/1.1', \
-  setvar:'tx.restricted_extensions=.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/', \
-  setvar:'tx.restricted_headers=/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/', \
+  setvar:'tx.restricted_extensions=<%= @restricted_extensions -%>', \
+  setvar:'tx.restricted_headers=<%= @restricted_headers -%>', \
   nolog, \
   pass"
 

From df385d64095cad7369ed404351e2a8c5f8207937 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 4 Feb 2015 17:02:03 +0100
Subject: [PATCH 0500/2267] Pin rspec gems

---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 12fd363eac..62c5693973 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,8 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
   gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
+  gem 'rspec-core', '3.1.7',     :require => false
+  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false

From ad7d6bc9bb1594dc792ae82dd0fe1a89d10ca3bc Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Wed, 4 Feb 2015 13:36:01 -0700
Subject: [PATCH 0501/2267] use bool2httpd for server_signature and
 trace_enable

---
 templates/httpd.conf.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 54d24c8ae3..9b889ac508 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -1,7 +1,7 @@
 # Security
 ServerTokens <%= @server_tokens %>
-ServerSignature <%= @server_signature %>
-TraceEnable <%= @trace_enable %>
+ServerSignature <%= scope.function_bool2httpd([@server_signature]) %>
+TraceEnable <%= scope.function_bool2httpd([@trace_enable]) %>
 
 ServerName "<%= @servername %>"
 ServerRoot "<%= @server_root %>"

From 67f9c0cf665452fd30bb87ec073c8ee0b368083f Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 4 Feb 2015 14:01:10 -0800
Subject: [PATCH 0502/2267] (MODULES-1719) Add parameter for SSLRandomSeed
 bytes

---
 README.md                    | 6 ++++--
 manifests/mod/ssl.pp         | 1 +
 spec/classes/mod/ssl_spec.rb | 9 +++++++++
 templates/mod/ssl.conf.erb   | 4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a4b17ae596..b36b16d89b 100644
--- a/README.md
+++ b/README.md
@@ -738,9 +738,11 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
     class { 'apache::mod::ssl':
       ssl_compression        => false,
       ssl_options            => [ 'StdEnvVars' ],
+      ssl_cipher             => 'HIGH:MEDIUM:!aNULL:!MD5',
+      ssl_protocol           => ['all','-SSLv2','-SSLv3'],
       ssl_pass_phrase_dialog => 'builtin',
-      ssl_protocol           => 'all -SSLv2 -SSLv3',
-  }
+      ssl_random_seed_bytes  => '512',
+    }
 ```
 
 To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` parameter in `::apache` to 'true' or set the `ssl` parameter in `apache::vhost` to 'true'.
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 4036fd28af..f2b62459e3 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -4,6 +4,7 @@
   $ssl_cipher             = 'HIGH:MEDIUM:!aNULL:!MD5',
   $ssl_protocol           = [ 'all', '-SSLv2', '-SSLv3' ],
   $ssl_pass_phrase_dialog = 'builtin',
+  $ssl_random_seed_bytes  = '512',
   $apache_version         = $::apache::apache_version,
   $package_name           = undef,
 ) {
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index f3fc7ae645..75a844151e 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -106,5 +106,14 @@
       it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog exec:\/path\/to\/program$/)}
     end
 
+    context 'setting ssl_random_seed_bytes' do
+      let :params do
+        {
+          :ssl_random_seed_bytes => '1024',
+        }
+      end
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLRandomSeed startup file:/dev/urandom 1024$})}
+    end
+
   end
 end
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index a0e61650e0..6fb25c16ee 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -1,8 +1,8 @@
 <IfModule mod_ssl.c>
   SSLRandomSeed startup builtin
-  SSLRandomSeed startup file:/dev/urandom 512
+  SSLRandomSeed startup file:/dev/urandom <%= @ssl_random_seed_bytes %>
   SSLRandomSeed connect builtin
-  SSLRandomSeed connect file:/dev/urandom 512
+  SSLRandomSeed connect file:/dev/urandom <%= @ssl_random_seed_bytes %>
 
   AddType application/x-x509-ca-cert .crt
   AddType application/x-pkcs7-crl    .crl

From 555825e4911ea87b25d3f840b9ca1ca8a87f7f79 Mon Sep 17 00:00:00 2001
From: Zachary Alex Stern <zacharyalexstern@gmail.com>
Date: Fri, 6 Feb 2015 13:18:09 -0800
Subject: [PATCH 0503/2267] Fix license for forge linting.

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index f59c55a60b..73ef359875 100644
--- a/metadata.json
+++ b/metadata.json
@@ -3,7 +3,7 @@
   "version": "1.2.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-apache.git",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",

From 18ade35b9da6a6c0dea0ade8875e23e77548e080 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Mon, 9 Feb 2015 14:23:56 +0100
Subject: [PATCH 0504/2267] ssl_protocol expects a string, not an array.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b36b16d89b..42d04bc337 100644
--- a/README.md
+++ b/README.md
@@ -739,7 +739,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
       ssl_compression        => false,
       ssl_options            => [ 'StdEnvVars' ],
       ssl_cipher             => 'HIGH:MEDIUM:!aNULL:!MD5',
-      ssl_protocol           => ['all','-SSLv2','-SSLv3'],
+      ssl_protocol           => 'all -SSLv2 -SSLv3',
       ssl_pass_phrase_dialog => 'builtin',
       ssl_random_seed_bytes  => '512',
     }

From 5bc940d74121815119c140cd0f96c0995fd65a67 Mon Sep 17 00:00:00 2001
From: cristi1979 <cristi.falcas@gmail.com>
Date: Wed, 10 Sep 2014 10:12:03 +0300
Subject: [PATCH 0505/2267]  add _additional_includes.erb

---
 README.md                                 |  4 ++++
 manifests/init.pp                         |  2 ++
 manifests/params.pp                       |  1 +
 spec/acceptance/apache_parameters_spec.rb |  2 +-
 spec/classes/apache_spec.rb               | 10 ++++++++--
 templates/httpd.conf.erb                  |  2 +-
 templates/vhost/_additional_includes.erb  |  9 +++++++--
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a4b17ae596..35d9cf6b74 100644
--- a/README.md
+++ b/README.md
@@ -1001,6 +1001,10 @@ Determines whether the vhost creates a Listen statement. The default value is 't
 
 Setting `add_listen` to 'false' stops the vhost from creating a Listen statement, and this is important when you combine vhosts that are not passed an `ip` parameter with vhosts that *are* passed the `ip` parameter.
 
+#####`use_optional_includes`
+
+Specifies if for apache > 2.4 it should use IncludeOptional instead of Include.
+
 #####`additional_includes`
 
 Specifies paths to additional static, vhost-specific Apache configuration files. Useful for implementing a unique, custom configuration not supported by this module. Can be an array. Defaults to '[]'.
diff --git a/manifests/init.pp b/manifests/init.pp
index 81f32e26a8..74cf753db4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -67,6 +67,7 @@
   $trace_enable           = 'On',
   $allow_encoded_slashes  = undef,
   $package_ensure         = 'installed',
+  $use_optional_includes  = $::apache::params::use_optional_includes,
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
@@ -74,6 +75,7 @@
   # true/false is sufficient for both ensure and enable
   validate_bool($service_enable)
   validate_bool($service_manage)
+  validate_bool($use_optional_includes)
 
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
diff --git a/manifests/params.pp b/manifests/params.pp
index 7e19d99fa9..7568179fdc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -27,6 +27,7 @@
 
   # The default error log level
   $log_level = 'warn'
+  $use_optional_includes = false
 
   if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
     $verify_command = '/usr/sbin/apache2ctl -t'
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 82d589f78d..4c6fa7f56d 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -242,7 +242,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
   describe 'confd_dir' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': confd_dir => '/tmp/root', service_ensure => stopped }"
+        pp = "class { 'apache': confd_dir => '/tmp/root', service_ensure => stopped, use_optional_includes => true }"
         apply_manifest(pp, :catch_failures => true)
       end
     end
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index a9d9438544..a8786bba5e 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -92,7 +92,10 @@
 
     context "with Apache version >= 2.4" do
       let :params do
-        { :apache_version => '2.4' }
+        {
+          :apache_version => '2.4',
+          :use_optional_includes => true
+        }
       end
 
       it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
@@ -315,7 +318,10 @@
 
       context "with Apache version >= 2.4" do
         let :params do
-          { :apache_version => '2.4' }
+          {
+            :apache_version => '2.4',
+            :use_optional_includes => true
+          }
         end
 
         it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 54d24c8ae3..fd9b0a293d 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -64,7 +64,7 @@ LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>
 
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%>
 IncludeOptional "<%= @confd_dir %>/*.conf"
 <%- else -%>
 Include "<%= @confd_dir %>/*.conf"
diff --git a/templates/vhost/_additional_includes.erb b/templates/vhost/_additional_includes.erb
index d4d5f91342..aa9f0fe351 100644
--- a/templates/vhost/_additional_includes.erb
+++ b/templates/vhost/_additional_includes.erb
@@ -1,5 +1,10 @@
 <% Array(@additional_includes).each do |include| -%>
-  
+
   ## Load additional static includes
-  Include "<%= include %>"
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%>
+IncludeOptional "<%= include %>"
+<%- else -%>
+Include "<%= include %>"
+<%- end -%>
+
 <% end -%>

From 1581972e83c52b6fd3e56fc41b0c8319788f017f Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 11 Feb 2015 07:53:32 -0800
Subject: [PATCH 0506/2267] Fix for PR 845

`use_optional_includes` should only be used for `additional_includes`,
otherwise things don't work.
---
 README.md                | 2 +-
 templates/httpd.conf.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e18516a1f5..96339e86fe 100644
--- a/README.md
+++ b/README.md
@@ -1005,7 +1005,7 @@ Setting `add_listen` to 'false' stops the vhost from creating a Listen statement
 
 #####`use_optional_includes`
 
-Specifies if for apache > 2.4 it should use IncludeOptional instead of Include.
+Specifies if for apache > 2.4 it should use IncludeOptional instead of Include for `additional_includes`. Defaults to 'false'.
 
 #####`additional_includes`
 
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 417526ba3c..9b889ac508 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -64,7 +64,7 @@ LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>
 
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @confd_dir %>/*.conf"
 <%- else -%>
 Include "<%= @confd_dir %>/*.conf"

From c971a1fd088f0212e2e703397a63f58b91c592a5 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 11 Feb 2015 07:44:26 -0800
Subject: [PATCH 0507/2267] FM-2140 - Fix for suphp test

Add a sleep in the suphp test to allow things to start up properly
---
 spec/acceptance/mod_suphp_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 1b91581441..190edfc613 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -32,6 +32,7 @@ class { 'apache::mod::suphp': }
       end
 
       it 'should answer to suphp.example.com' do
+        shell("/bin/sleep 10")
         shell("/usr/bin/curl suphp.example.com:80") do |r|
           expect(r.stdout).to match(/^daemon$/)
           expect(r.exit_code).to eq(0)

From e11d499722ea60332cb32758144a20c98403849f Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 11 Feb 2015 11:35:50 -0800
Subject: [PATCH 0508/2267] Concat started using a new fact

---
 spec/classes/apache_spec.rb            | 5 +++++
 spec/classes/dev_spec.rb               | 3 +++
 spec/classes/mod/alias_spec.rb         | 4 ++++
 spec/classes/mod/auth_kerb_spec.rb     | 3 +++
 spec/classes/mod/authnz_ldap_spec.rb   | 2 ++
 spec/classes/mod/dav_svn_spec.rb       | 3 +++
 spec/classes/mod/deflate_spec.rb       | 3 +++
 spec/classes/mod/dev_spec.rb           | 1 +
 spec/classes/mod/dir_spec.rb           | 3 +++
 spec/classes/mod/event_spec.rb         | 3 +++
 spec/classes/mod/fastcgi_spec.rb       | 2 ++
 spec/classes/mod/fcgid_spec.rb         | 4 ++++
 spec/classes/mod/info_spec.rb          | 3 +++
 spec/classes/mod/itk_spec.rb           | 2 ++
 spec/classes/mod/mime_magic_spec.rb    | 3 +++
 spec/classes/mod/mime_spec.rb          | 2 ++
 spec/classes/mod/negotiation_spec.rb   | 1 +
 spec/classes/mod/pagespeed_spec.rb     | 2 ++
 spec/classes/mod/passenger_spec.rb     | 7 +++++++
 spec/classes/mod/perl_spec.rb          | 3 +++
 spec/classes/mod/peruser_spec.rb       | 1 +
 spec/classes/mod/php_spec.rb           | 4 ++++
 spec/classes/mod/prefork_spec.rb       | 3 +++
 spec/classes/mod/proxy_connect_spec.rb | 1 +
 spec/classes/mod/proxy_html_spec.rb    | 3 +++
 spec/classes/mod/python_spec.rb        | 3 +++
 spec/classes/mod/reqtimeout_spec.rb    | 3 +++
 spec/classes/mod/rpaf_spec.rb          | 2 ++
 spec/classes/mod/security_spec.rb      | 4 +++-
 spec/classes/mod/shib_spec.rb          | 4 +++-
 spec/classes/mod/speling_spec.rb       | 2 ++
 spec/classes/mod/ssl_spec.rb           | 5 +++++
 spec/classes/mod/status_spec.rb        | 7 +++++++
 spec/classes/mod/suphp_spec.rb         | 2 ++
 spec/classes/mod/worker_spec.rb        | 4 ++++
 spec/classes/mod/wsgi_spec.rb          | 3 +++
 spec/classes/params_spec.rb            | 1 +
 spec/classes/service_spec.rb           | 4 ++++
 spec/defines/balancermember_spec.rb    | 1 +
 spec/defines/custom_config_spec.rb     | 1 +
 spec/defines/fastcgi_server_spec.rb    | 4 ++++
 spec/defines/mod_spec.rb               | 3 +++
 spec/defines/modsec_link_spec.rb       | 4 +++-
 spec/defines/vhost_spec.rb             | 7 +++++++
 44 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index a8786bba5e..6d1e3ca00e 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -12,6 +12,7 @@
         :operatingsystemrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -221,6 +222,7 @@
         :operatingsystemrelease => '5',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -541,6 +543,7 @@
         :operatingsystemrelease => '9',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -621,6 +624,7 @@
         :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context 'with a custom apache_name parameter' do
@@ -659,6 +663,7 @@
       { :osfamily        => 'Darwin',
         :operatingsystemrelease => '13.1.0',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index df342d40e8..83292b1b15 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -8,6 +8,7 @@
         :osfamily               => 'Debian',
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -21,6 +22,7 @@
         :osfamily               => 'RedHat',
         :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '6',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -35,6 +37,7 @@
         :osfamily               => 'FreeBSD',
         :operatingsystem        => 'FreeBSD',
         :operatingsystemrelease => '9',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 503575af61..7f1458ccf8 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -15,6 +15,7 @@
         :operatingsystemrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_apache__mod("alias") }
@@ -30,6 +31,7 @@
         :operatingsystemrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_apache__mod("alias") }
@@ -45,6 +47,7 @@
         :operatingsystemrelease => '7',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_apache__mod("alias") }
@@ -60,6 +63,7 @@
         :operatingsystemrelease => '9',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_apache__mod("alias") }
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 1706bfb8d3..8f82ff4dd4 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -15,6 +15,7 @@
         :operatingsystemrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -31,6 +32,7 @@
         :operatingsystemrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -47,6 +49,7 @@
         :operatingsystemrelease => '9',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index a0a913a6e2..f897833996 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -16,6 +16,7 @@
         :kernel                 => 'Linux',
         :operatingsystem        => 'Debian',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -49,6 +50,7 @@
         :kernel                 => 'Linux',
         :operatingsystem        => 'RedHat',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 95abef9948..791baae03c 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -16,6 +16,7 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -33,6 +34,7 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -50,6 +52,7 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index c61010f28a..343e940f63 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -41,6 +41,7 @@ class { "apache::mod::deflate":
         :operatingsystemrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
 
@@ -67,6 +68,7 @@ class { "apache::mod::deflate":
         :operatingsystemrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
 
@@ -86,6 +88,7 @@ class { "apache::mod::deflate":
         :operatingsystemrelease => '9',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 84d80e344a..f653389776 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -18,6 +18,7 @@
           :osfamily               => osfamily,
           :operatingsystem        => osfamily,
           :operatingsystemrelease => operatingsystemrelease,
+          :is_pe                  => false,
         }
       end
       it { is_expected.to contain_class('apache::dev') }
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 1efed2fe79..8aec59fed0 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -17,6 +17,7 @@
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :lsbdistcodename        => 'squeeze',
+        :is_pe                  => false,
       }
     end
     context "passing no parameters" do
@@ -48,6 +49,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context "passing no parameters" do
@@ -79,6 +81,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context "passing no parameters" do
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 7030a72e8b..bc5aa41106 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -14,6 +14,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -31,6 +32,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -108,6 +110,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 126c5cc3ef..e204bb7460 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -33,6 +34,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index a342e58135..214ec75bea 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -17,6 +17,7 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -35,6 +36,7 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -79,6 +81,7 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -103,6 +106,7 @@
         :id                        => 'root',
         :kernel                    => 'FreeBSD',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 20ed127dcb..cdf1663456 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -78,6 +78,7 @@ def general_info_specs
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -104,6 +105,7 @@ def general_info_specs
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -126,6 +128,7 @@ def general_info_specs
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index b5d50a18af..5556f5ee7c 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -60,6 +61,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index 5e78230e28..f846ce386b 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -21,6 +21,7 @@ def general_mime_magic_specs
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -65,6 +66,7 @@ def general_mime_magic_specs
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -91,6 +93,7 @@ def general_mime_magic_specs
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 32edbc4b02..3c7ad88d18 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -21,6 +21,7 @@ def general_mime_specs
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -40,6 +41,7 @@ def general_mime_specs
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index d01442cb9a..813e76def0 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -13,6 +13,7 @@
         :concat_basedir         => '/dne',
         :id                     => 'root',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index c4abd3e100..c3f5a41447 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -33,6 +34,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 0093d4b919..9c9935939e 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -16,6 +16,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -130,6 +131,7 @@
           :concat_basedir         => '/dne',
           :id                     => 'root',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
 
@@ -149,6 +151,7 @@
           :concat_basedir         => '/dne',
           :id                     => 'root',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
 
@@ -168,6 +171,7 @@
           :concat_basedir         => '/dne',
           :id                     => 'root',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
 
@@ -187,6 +191,7 @@
           :concat_basedir         => '/dne',
           :id                     => 'root',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
 
@@ -206,6 +211,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -244,6 +250,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 2c14c31f06..5bfe8ff2d2 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -31,6 +32,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -47,6 +49,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index c0dfc96f55..9ae063cceb 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -14,6 +14,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index cf61318797..1508863513 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -12,6 +12,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context "with mpm_module => prefork" do
@@ -49,6 +50,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context "with default params" do
@@ -130,6 +132,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context "with mpm_module => prefork" do
@@ -163,6 +166,7 @@
         :concat_basedir         => '/dne',
         :id                     => 'root',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context 'with content param' do
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 34bca08dc0..f5c0e93759 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -60,6 +61,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -105,6 +107,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index c54d255a5e..f4b4cc2e6b 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -16,6 +16,7 @@
         :id              => 'root',
         :kernel          => 'Linux',
         :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context 'with Apache version < 2.4' do
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 81a2bb5371..ce3e70c3a9 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -25,6 +25,7 @@
         :kernel          => 'Linux',
         :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :hardwaremodel   => 'i386',
+        :is_pe                  => false,
       }
     end
 
@@ -60,6 +61,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -76,6 +78,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 17b62d43bd..9b6d846de0 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -31,6 +32,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -47,6 +49,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index 07c09b0940..97aa7db453 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -17,6 +17,7 @@
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :lsbdistcodename        => 'squeeze',
+        :is_pe                  => false,
       }
     end
     context "passing no parameters" do
@@ -51,6 +52,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context "passing no parameters" do
@@ -85,6 +87,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context "passing no parameters" do
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index ca3a594848..418797bdf8 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -17,6 +17,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -56,6 +57,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 05586c2caa..93f751ee4e 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :concat_basedir         => '/',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { should contain_apache__mod('security').with(
@@ -57,7 +58,8 @@
         :lsbdistcodename        => 'squeeze',
         :id                     => 'root',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :kernel                 => 'Linux'
+        :kernel                 => 'Linux',
+        :is_pe                  => false,
       }
     end
     it { should contain_apache__mod('security').with(
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index e515db96df..0254d4c3c6 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -14,6 +14,7 @@
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :fqdn                   => 'test.example.com',
+        :is_pe                  => false,
       }
     end
     describe 'with no parameters' do
@@ -31,10 +32,11 @@
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :fqdn                   => 'test.example.com',
+        :is_pe                  => false,
       }
     end
     describe 'with no parameters' do
       it { should contain_apache__mod('shib2').with_id('mod_shib') }
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index 814e0d6720..b07af25897 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_apache__mod('speling') }
@@ -30,6 +31,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_apache__mod('speling') }
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 75a844151e..f7755ed362 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -14,6 +14,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { expect { subject }.to raise_error(Puppet::Error, /Unsupported osfamily:/) }
@@ -29,6 +30,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class('apache::params') }
@@ -56,6 +58,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class('apache::params') }
@@ -73,6 +76,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class('apache::params') }
@@ -90,6 +94,7 @@
         :id                     => 'root',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 502562959c..e3b3d24428 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -36,6 +36,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -65,6 +66,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -87,6 +89,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     let :params do
@@ -112,6 +115,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     let :params do
@@ -134,6 +138,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     let :params do
@@ -159,6 +164,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
           :id                     => 'root',
           :kernel                 => 'Linux',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
       let :params do
@@ -183,6 +189,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
           :id                     => 'root',
           :kernel                 => 'Linux',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
       let :params do
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index b74b4c8646..9b20000f30 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -30,6 +31,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 5902c2c7ea..7afdb70e6a 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -60,6 +61,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -105,6 +107,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -123,6 +126,7 @@
         :id                     => 'root',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index a68c808305..e8dd00db0a 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -34,6 +35,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -112,6 +114,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index 6f63758a3a..92b314f92e 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -12,6 +12,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_apache__params }
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index fda1f51279..786b3935f4 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -15,6 +15,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_service("httpd").with(
@@ -103,6 +104,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_service("httpd").with(
@@ -123,6 +125,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_service("httpd").with(
@@ -143,6 +146,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     let(:params) do
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index b7293b390e..0322d308eb 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -28,6 +28,7 @@
       :concat_basedir         => '/dne',
       :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       :kernel                 => 'Linux',
+      :is_pe                  => false,
     }
   end
   describe "allows multiple balancermembers with the same url" do
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 187b8a7b56..e9650a736b 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -17,6 +17,7 @@
       :id                     => 'root',
       :kernel                 => 'Linux',
       :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      :is_pe                  => false,
     }
   end
   context 'defaults with content' do
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 1dc8fd444a..8aa422dbcb 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -18,6 +18,7 @@
           :id                     => 'root',
           :concat_basedir         => '/dne',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
       let :facts do default_facts end
@@ -39,6 +40,7 @@
           :id                     => 'root',
           :concat_basedir         => '/dne',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
       let :facts do default_facts end
@@ -59,6 +61,7 @@
           :id                     => 'root',
           :concat_basedir         => '/dne',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
       let :facts do default_facts end
@@ -81,6 +84,7 @@
         :id                     => 'root',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     describe ".conf content" do
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index 377c877926..dbeaf4ac40 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -14,6 +14,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -57,6 +58,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -96,6 +98,7 @@
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index c1633d01d8..a5b4c5390c 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -21,6 +21,7 @@ class { "apache::mod::security": activated_rules => [] }
         :id                     => 'root',
         :concat_basedir         => '/',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     it { should contain_file('modsecurity_35_bad_robots.data').with(
@@ -39,7 +40,8 @@ class { "apache::mod::security": activated_rules => [] }
         :lsbdistcodename        => 'squeeze',
         :id                     => 'root',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :kernel                 => 'Linux'
+        :kernel                 => 'Linux',
+        :is_pe                  => false,
       }
     end
     it { should contain_file('modsecurity_35_bad_robots.data').with(
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9a8746a233..e52c901587 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -24,6 +24,7 @@
           :id                     => 'root',
           :kernel                 => 'Linux',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
       let :params do default_params end
@@ -42,6 +43,7 @@
           :id                     => 'root',
           :kernel                 => 'Linux',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
       let :params do default_params end
@@ -68,6 +70,7 @@
           :id                     => 'root',
           :kernel                 => 'FreeBSD',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
       let :params do default_params end
@@ -91,6 +94,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     describe 'basic assumptions' do
@@ -257,6 +261,7 @@
           :kernel                 => 'Linux',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           :kernelversion          => '3.6.2',
+          :is_pe                  => false,
         }
       end
 
@@ -350,6 +355,7 @@
           :kernel                 => 'Linux',
           :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           :kernelversion          => '3.6.2',
+          :is_pe                  => false,
         }
       end
 
@@ -418,6 +424,7 @@
         :id                     => 'root',
         :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
     context 'single log file' do

From be8de013021a924cbf0024afef604db4e4e865f8 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 11 Feb 2015 14:20:13 -0800
Subject: [PATCH 0509/2267] Fixup for PR 928 - omit priority

There were a lot of conflicts in vhost so I updated them manually rather
than in the merge.
---
 manifests/vhost.pp | 94 +++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index edd589a623..5d2ad8e5d6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -230,11 +230,13 @@
 
   # Configure the defaultness of a vhost
   if $priority {
-    $priority_real = $priority
+    $priority_real = "${priority}-"
+  } elsif $priority == false {
+    $priority_real = ''
   } elsif $default_vhost {
-    $priority_real = '10'
+    $priority_real = '10-'
   } else {
-    $priority_real = '25'
+    $priority_real = '25-'
   }
 
   ## Apache include does not always work with spaces in the filename
@@ -249,7 +251,7 @@
       group   => $docroot_group,
       mode    => $docroot_mode,
       require => Package['httpd'],
-      before  => Concat["${priority_real}-${filename}.conf"],
+      before  => Concat["${priority_real}${filename}.conf"],
     }
   }
 
@@ -259,7 +261,7 @@
       ensure  => $logroot_ensure,
       mode    => $logroot_mode,
       require => Package['httpd'],
-      before  => Concat["${priority_real}-${filename}.conf"],
+      before  => Concat["${priority_real}${filename}.conf"],
     }
   }
 
@@ -436,9 +438,9 @@
     }
   }
 
-  concat { "${priority_real}-${filename}.conf":
+  concat { "${priority_real}${filename}.conf":
     ensure  => $ensure,
-    path    => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
+    path    => "${::apache::vhost_dir}/${priority_real}${filename}.conf",
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
@@ -452,14 +454,14 @@
       present => link,
       default => $ensure,
     }
-    file{ "${priority_real}-${filename}.conf symlink":
+    file{ "${priority_real}${filename}.conf symlink":
       ensure  => $vhost_symlink_ensure,
-      path    => "${vhost_enable_dir}/${priority_real}-${filename}.conf",
-      target  => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
+      path    => "${vhost_enable_dir}/${priority_real}${filename}.conf",
+      target  => "${::apache::vhost_dir}/${priority_real}${filename}.conf",
       owner   => 'root',
       group   => $::apache::params::root_group,
       mode    => '0644',
-      require => Concat["${priority_real}-${filename}.conf"],
+      require => Concat["${priority_real}${filename}.conf"],
       notify  => Class['apache::service'],
     }
   }
@@ -469,7 +471,7 @@
   # - $servername
   # - $serveradmin
   concat::fragment { "${name}-apache-header":
-    target  => "${priority_real}-${filename}.conf",
+    target  => "${priority_real}${filename}.conf",
     order   => 0,
     content => template('apache/vhost/_file_header.erb'),
   }
@@ -478,7 +480,7 @@
   # - $virtual_docroot
   # - $docroot
   concat::fragment { "${name}-docroot":
-    target  => "${priority_real}-${filename}.conf",
+    target  => "${priority_real}${filename}.conf",
     order   => 10,
     content => template('apache/vhost/_docroot.erb'),
   }
@@ -487,7 +489,7 @@
   # - $aliases
   if $aliases and ! empty($aliases) {
     concat::fragment { "${name}-aliases":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 20,
       content => template('apache/vhost/_aliases.erb'),
     }
@@ -498,7 +500,7 @@
   # - $::kernelversion
   if $itk and ! empty($itk) {
     concat::fragment { "${name}-itk":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 30,
       content => template('apache/vhost/_itk.erb'),
     }
@@ -508,7 +510,7 @@
   # - $fallbackresource
   if $fallbackresource {
     concat::fragment { "${name}-fallbackresource":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 40,
       content => template('apache/vhost/_fallbackresource.erb'),
     }
@@ -518,7 +520,7 @@
   # - $allow_encoded_slashes
   if $allow_encoded_slashes {
     concat::fragment { "${name}-allow_encoded_slashes":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 50,
       content => template('apache/vhost/_allow_encoded_slashes.erb'),
     }
@@ -532,7 +534,7 @@
   # - $shibboleth_enabled
   if $_directories and ! empty($_directories) {
     concat::fragment { "${name}-directories":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 60,
       content => template('apache/vhost/_directories.erb'),
     }
@@ -542,7 +544,7 @@
   # - $additional_includes
   if $additional_includes and ! empty($additional_includes) {
     concat::fragment { "${name}-additional_includes":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 70,
       content => template('apache/vhost/_additional_includes.erb'),
     }
@@ -555,7 +557,7 @@
   # - $log_level
   if $error_log or $log_level {
     concat::fragment { "${name}-logging":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 80,
       content => template('apache/vhost/_logging.erb'),
     }
@@ -563,7 +565,7 @@
 
   # Template uses no variables
   concat::fragment { "${name}-serversignature":
-    target  => "${priority_real}-${filename}.conf",
+    target  => "${priority_real}${filename}.conf",
     order   => 90,
     content => template('apache/vhost/_serversignature.erb'),
   }
@@ -577,7 +579,7 @@
   # - $access_logs
   if $access_log or $access_logs {
     concat::fragment { "${name}-access_log":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 100,
       content => template('apache/vhost/_access_log.erb'),
     }
@@ -587,7 +589,7 @@
   # - $action
   if $action {
     concat::fragment { "${name}-action":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 110,
       content => template('apache/vhost/_action.erb'),
     }
@@ -598,7 +600,7 @@
   # - $apache_version
   if $block and ! empty($block) {
     concat::fragment { "${name}-block":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 120,
       content => template('apache/vhost/_block.erb'),
     }
@@ -608,7 +610,7 @@
   # - $error_documents
   if $error_documents and ! empty($error_documents) {
     concat::fragment { "${name}-error_document":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 130,
       content => template('apache/vhost/_error_document.erb'),
     }
@@ -621,7 +623,7 @@
   # - $no_proxy_uris
   if $proxy_dest or $proxy_pass {
     concat::fragment { "${name}-proxy":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 140,
       content => template('apache/vhost/_proxy.erb'),
     }
@@ -631,7 +633,7 @@
   # - $rack_base_uris
   if $rack_base_uris {
     concat::fragment { "${name}-rack":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 150,
       content => template('apache/vhost/_rack.erb'),
     }
@@ -652,7 +654,7 @@
   # - $redirectmatch_dest
   if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp and $redirectmatch_dest) {
     concat::fragment { "${name}-redirect":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 160,
       content => template('apache/vhost/_redirect.erb'),
     }
@@ -665,7 +667,7 @@
   # - $rewrite_cond
   if $rewrites or $rewrite_rule {
     concat::fragment { "${name}-rewrite":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 170,
       content => template('apache/vhost/_rewrite.erb'),
     }
@@ -676,7 +678,7 @@
   # - $scriptalias
   if $scriptaliases and ! empty($scriptaliases) {
     concat::fragment { "${name}-scriptalias":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 180,
       content => template('apache/vhost/_scriptalias.erb'),
     }
@@ -686,7 +688,7 @@
   # - $serveraliases
   if $serveraliases and ! empty($serveraliases) {
     concat::fragment { "${name}-serveralias":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 190,
       content => template('apache/vhost/_serveralias.erb'),
     }
@@ -697,7 +699,7 @@
   # - $setenvif
   if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
     concat::fragment { "${name}-setenv":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 200,
       content => template('apache/vhost/_setenv.erb'),
     }
@@ -723,7 +725,7 @@
   # - $apache_version
   if $ssl {
     concat::fragment { "${name}-ssl":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 210,
       content => template('apache/vhost/_ssl.erb'),
     }
@@ -735,7 +737,7 @@
   # - $suphp_configpath
   if $suphp_engine == 'on' {
     concat::fragment { "${name}-suphp":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 220,
       content => template('apache/vhost/_suphp.erb'),
     }
@@ -746,7 +748,7 @@
   # - $php_flags
   if ($php_values and ! empty($php_values)) or ($php_flags and ! empty($php_flags)) {
     concat::fragment { "${name}-php":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 220,
       content => template('apache/vhost/_php.erb'),
     }
@@ -757,7 +759,7 @@
   # - $php_admin_flags
   if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) {
     concat::fragment { "${name}-php_admin":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 230,
       content => template('apache/vhost/_php_admin.erb'),
     }
@@ -767,7 +769,7 @@
   # - $headers
   if $headers and ! empty($headers) {
     concat::fragment { "${name}-header":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 240,
       content => template('apache/vhost/_header.erb'),
     }
@@ -777,7 +779,7 @@
   # - $request_headers
   if $request_headers and ! empty($request_headers) {
     concat::fragment { "${name}-requestheader":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 250,
       content => template('apache/vhost/_requestheader.erb'),
     }
@@ -794,7 +796,7 @@
   # - $wsgi_pass_authorization
   if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
     concat::fragment { "${name}-wsgi":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 260,
       content => template('apache/vhost/_wsgi.erb'),
     }
@@ -804,7 +806,7 @@
   # - $custom_fragment
   if $custom_fragment {
     concat::fragment { "${name}-custom_fragment":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 270,
       content => template('apache/vhost/_custom_fragment.erb'),
     }
@@ -817,7 +819,7 @@
   # - $apache_version
   if $fastcgi_server or $fastcgi_dir {
     concat::fragment { "${name}-fastcgi":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 280,
       content => template('apache/vhost/_fastcgi.erb'),
     }
@@ -827,7 +829,7 @@
   # - $suexec_user_group
   if $suexec_user_group {
     concat::fragment { "${name}-suexec":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 290,
       content => template('apache/vhost/_suexec.erb'),
     }
@@ -841,7 +843,7 @@
   # - $passenger_pre_start
   if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
     concat::fragment { "${name}-passenger":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 300,
       content => template('apache/vhost/_passenger.erb'),
     }
@@ -851,7 +853,7 @@
   # - $add_default_charset
   if $add_default_charset {
     concat::fragment { "${name}-charsets":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 310,
       content => template('apache/vhost/_charsets.erb'),
     }
@@ -864,7 +866,7 @@
   # - $modsec_body_limit
   if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips {
     concat::fragment { "${name}-security":
-      target  => "${priority_real}-${filename}.conf",
+      target  => "${priority_real}${filename}.conf",
       order   => 320,
       content => template('apache/vhost/_security.erb')
     }
@@ -872,7 +874,7 @@
 
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
-    target  => "${priority_real}-${filename}.conf",
+    target  => "${priority_real}${filename}.conf",
     order   => 999,
     content => template('apache/vhost/_file_footer.erb'),
   }

From 1e50cd6f32d722281d8294168b6f58691f526792 Mon Sep 17 00:00:00 2001
From: Seth Lyons <slyons@fxcm.com>
Date: Tue, 23 Dec 2014 00:47:25 +0000
Subject: [PATCH 0510/2267] change default version for freebsd from 2.2 to 2.4

---
 README.md                               |   1 +
 manifests/default_mods.pp               |  22 ++---
 manifests/init.pp                       |   2 +-
 manifests/mod/alias.pp                  |   2 +-
 manifests/mod/cgi.pp                    |   8 +-
 manifests/mod/cgid.pp                   |   7 +-
 manifests/mod/disk_cache.pp             |   8 +-
 manifests/mod/filter.pp                 |   3 +
 manifests/mod/peruser.pp                | 107 ++++++++++++------------
 manifests/mod/php.pp                    |   6 +-
 manifests/mpm.pp                        |   5 +-
 manifests/package.pp                    |  69 ++++++++-------
 manifests/params.pp                     |  26 +++---
 manifests/version.pp                    |   2 +-
 spec/acceptance/class_spec.rb           |   4 +-
 spec/acceptance/default_mods_spec.rb    |   4 +-
 spec/acceptance/itk_spec.rb             |   2 +-
 spec/acceptance/mod_dav_svn_spec.rb     |   4 +-
 spec/acceptance/mod_deflate_spec.rb     |   4 +-
 spec/acceptance/mod_mime_spec.rb        |   4 +-
 spec/acceptance/mod_negotiation_spec.rb |   6 +-
 spec/acceptance/mod_pagespeed_spec.rb   |   6 +-
 spec/acceptance/mod_php_spec.rb         |   6 +-
 spec/acceptance/mod_proxy_html_spec.rb  |   2 +-
 spec/acceptance/prefork_worker_spec.rb  |   2 +-
 spec/acceptance/version.rb              |  18 ++--
 spec/classes/apache_spec.rb             |  17 ++--
 spec/classes/mod/alias_spec.rb          |   4 +-
 spec/classes/mod/deflate_spec.rb        |   2 +-
 spec/classes/mod/event_spec.rb          |   2 +-
 spec/classes/mod/info_spec.rb           |  68 +++++++++++++--
 spec/classes/mod/itk_spec.rb            |   6 +-
 spec/classes/mod/peruser_spec.rb        |  10 ++-
 spec/classes/mod/php_spec.rb            |   6 +-
 spec/classes/mod/prefork_spec.rb        |   2 +-
 spec/classes/mod/rpaf_spec.rb           |   2 +-
 spec/classes/mod/worker_spec.rb         |   2 +-
 spec/classes/service_spec.rb            |   2 +-
 spec/defines/fastcgi_server_spec.rb     |   2 +-
 spec/defines/mod_spec.rb                |   4 +-
 spec/defines/vhost_spec.rb              |   2 +-
 41 files changed, 278 insertions(+), 183 deletions(-)
 create mode 100644 manifests/mod/filter.pp

diff --git a/README.md b/README.md
index 984e2ce300..a8d621e4ed 100644
--- a/README.md
+++ b/README.md
@@ -535,6 +535,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `expires`
 * `fastcgi`
 * `fcgid`
+* `filter`
 * `headers`
 * `include`
 * `info`*
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 09e360a49e..d3f5dc0a90 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -7,7 +7,7 @@
   # They are not configurable at this time, so we just include
   # them to make sure it works.
   case $::osfamily {
-    'redhat', 'freebsd': {
+    'redhat': {
       ::apache::mod { 'log_config': }
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
@@ -18,6 +18,10 @@
         ::apache::mod { 'unixd': }
       }
     }
+    'freebsd': {
+      ::apache::mod { 'log_config': }
+      ::apache::mod { 'unixd': }
+    }
     default: {}
   }
   ::apache::mod { 'authz_host': }
@@ -74,26 +78,27 @@
         include ::apache::mod::version
         include ::apache::mod::vhost_alias
         include ::apache::mod::speling
+        include ::apache::mod::filter
 
         ::apache::mod { 'asis': }
         ::apache::mod { 'auth_digest': }
-        ::apache::mod { 'authn_alias': }
+        ::apache::mod { 'auth_form': }
         ::apache::mod { 'authn_anon': }
+        ::apache::mod { 'authn_core': }
         ::apache::mod { 'authn_dbm': }
-        ::apache::mod { 'authn_default': }
+        ::apache::mod { 'authn_socache': }
+        ::apache::mod { 'authz_dbd': }
         ::apache::mod { 'authz_dbm': }
         ::apache::mod { 'authz_owner': }
-        ::apache::mod { 'cern_meta': }
-        ::apache::mod { 'charset_lite': }
         ::apache::mod { 'dumpio': }
         ::apache::mod { 'expires': }
         ::apache::mod { 'file_cache': }
-        ::apache::mod { 'filter':}
         ::apache::mod { 'imagemap':}
         ::apache::mod { 'include': }
         ::apache::mod { 'logio': }
+        ::apache::mod { 'request': }
+        ::apache::mod { 'session': }
         ::apache::mod { 'unique_id': }
-        ::apache::mod { 'usertrack': }
       }
       default: {}
     }
@@ -126,9 +131,6 @@
         id => 'authz_core_module',
       }
 
-      # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
-
       # lots of stuff seems to break without access_compat
       ::apache::mod { 'access_compat': }
     } else {
diff --git a/manifests/init.pp b/manifests/init.pp
index 74cf753db4..f7b89076d8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -259,7 +259,7 @@
       'freebsd': {
         $pidfile              = '/var/run/httpd.pid'
         $error_log            = 'httpd-error.log'
-        $scriptalias          = '/usr/local/www/apache22/cgi-bin'
+        $scriptalias          = '/usr/local/www/apache24/cgi-bin'
         $access_log_file      = 'httpd-access.log'
       }
       default: {
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index ff196b01a3..c9f8e4dab1 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -9,7 +9,7 @@
       true    => '/usr/share/httpd/icons',
       default => '/var/www/icons',
     },
-    'freebsd' => '/usr/local/www/apache22/icons',
+    'freebsd' => '/usr/local/www/apache24/icons',
   }
   apache::mod { 'alias': }
   # Template uses $icons_path
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index 6c3c6aec8d..91352e8c8d 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -1,4 +1,10 @@
 class apache::mod::cgi {
-  Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
+  case $::osfamily {
+    'FreeBSD': {}
+    default: {
+      Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
+    }
+  }
+
   ::apache::mod { 'cgi': }
 }
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index ee9044cd5a..8946f652b9 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -1,5 +1,10 @@
 class apache::mod::cgid {
-  Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
+  case $::osfamily {
+    'FreeBSD': {}
+    default: {
+      Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
+    }
+  }
 
   # Debian specifies it's cgid sock path, but RedHat uses the default value
   # with no config file
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 54c0528379..2730809cf1 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -4,6 +4,12 @@
     'redhat'  => '/var/cache/mod_proxy',
     'freebsd' => '/var/cache/mod_disk_cache',
   }
+
+  $mod_name = $::osfamily ? {
+    'FreeBSD' => 'cache_disk',
+    default   => 'disk_cache',
+  }
+
   if $::osfamily != 'FreeBSD' {
     # FIXME: investigate why disk_cache was dependent on proxy
     # NOTE: on FreeBSD disk_cache is compiled by default but proxy is not
@@ -11,7 +17,7 @@
   }
   Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache']
 
-  apache::mod { 'disk_cache': }
+  apache::mod { $mod_name: }
   # Template uses $cache_proxy
   file { 'disk_cache.conf':
     ensure  => file,
diff --git a/manifests/mod/filter.pp b/manifests/mod/filter.pp
new file mode 100644
index 0000000000..26dc488b3a
--- /dev/null
+++ b/manifests/mod/filter.pp
@@ -0,0 +1,3 @@
+class apache::mod::filter {
+  ::apache::mod { 'filter': }
+}
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 107e47ce81..6b9dfad95f 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -8,66 +8,63 @@
   $expiretimeout = '120',
   $keepalive = 'Off',
 ) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::peruser and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::peruser and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::peruser and apache::mod::prefork on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::peruser and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  $mod_dir = $::apache::mod_dir
-
-  # Template uses:
-  # - $minspareprocessors
-  # - $minprocessors
-  # - $maxprocessors
-  # - $maxclients
-  # - $maxrequestsperchild
-  # - $idletimeout
-  # - $expiretimeout
-  # - $keepalive
-  # - $mod_dir
-  file { "${::apache::mod_dir}/peruser.conf":
-    ensure  => file,
-    content => template('apache/mod/peruser.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Class['apache::service'],
-  }
-  file { "${::apache::mod_dir}/peruser":
-    ensure  => directory,
-    require => File[$::apache::mod_dir],
-  }
-  file { "${::apache::mod_dir}/peruser/multiplexers":
-    ensure  => directory,
-    require => File["${::apache::mod_dir}/peruser"],
-  }
-  file { "${::apache::mod_dir}/peruser/processors":
-    ensure  => directory,
-    require => File["${::apache::mod_dir}/peruser"],
-  }
-
-  ::apache::peruser::multiplexer { '01-default': }
 
   case $::osfamily {
     'freebsd' : {
-      class { '::apache::package':
-        mpm_module => 'peruser'
-      }
+      fail("Unsupported osfamily ${::osfamily}")
     }
     default: {
-      fail("Unsupported osfamily ${::osfamily}")
+      if defined(Class['apache::mod::event']) {
+        fail('May not include both apache::mod::peruser and apache::mod::event on the same node')
+      }
+      if defined(Class['apache::mod::itk']) {
+        fail('May not include both apache::mod::peruser and apache::mod::itk on the same node')
+      }
+      if defined(Class['apache::mod::prefork']) {
+        fail('May not include both apache::mod::peruser and apache::mod::prefork on the same node')
+      }
+      if defined(Class['apache::mod::worker']) {
+        fail('May not include both apache::mod::peruser and apache::mod::worker on the same node')
+      }
+      File {
+        owner => 'root',
+        group => $::apache::params::root_group,
+        mode  => '0644',
+      }
+
+      $mod_dir = $::apache::mod_dir
+
+      # Template uses:
+      # - $minspareprocessors
+      # - $minprocessors
+      # - $maxprocessors
+      # - $maxclients
+      # - $maxrequestsperchild
+      # - $idletimeout
+      # - $expiretimeout
+      # - $keepalive
+      # - $mod_dir
+      file { "${::apache::mod_dir}/peruser.conf":
+        ensure  => file,
+        content => template('apache/mod/peruser.conf.erb'),
+        require => Exec["mkdir ${::apache::mod_dir}"],
+        before  => File[$::apache::mod_dir],
+        notify  => Class['apache::service'],
+      }
+      file { "${::apache::mod_dir}/peruser":
+        ensure  => directory,
+        require => File[$::apache::mod_dir],
+      }
+      file { "${::apache::mod_dir}/peruser/multiplexers":
+        ensure  => directory,
+        require => File["${::apache::mod_dir}/peruser"],
+      }
+      file { "${::apache::mod_dir}/peruser/processors":
+        ensure  => directory,
+        require => File["${::apache::mod_dir}/peruser"],
+      }
+
+      ::apache::peruser::multiplexer { '01-default': }
     }
   }
 }
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 4c5d85d56c..1d1274f3b4 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -6,7 +6,9 @@
   $content        = undef,
   $template       = 'apache/mod/php5.conf.erb',
   $source         = undef,
-) {
+  $root_group     = $::apache::params::root_group,
+) inherits apache::params {
+
   if defined(Class['::apache::mod::prefork']) {
     Class['::apache::mod::prefork']->File['php5.conf']
   }
@@ -47,7 +49,7 @@
     ensure  => file,
     path    => "${::apache::mod_dir}/php5.conf",
     owner   => 'root',
-    group   => 'root',
+    group   => $root_group,
     mode    => '0644',
     content => $manage_content,
     source  => $source,
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index a5cca49882..2b33634f29 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -13,7 +13,10 @@
   $_path = "${lib_path}/${_lib}"
   $_id   = "mpm_${mpm}_module"
 
-  if versioncmp($apache_version, '2.4') >= 0 {
+  if versioncmp($apache_version, '2.4') >= 0 and
+    (($::osfamily != 'FreeBSD') or
+    ($::osfamily == 'FreeBSD' and $mpm == 'itk')) {
+
     file { "${mod_dir}/${mpm}.load":
       ensure  => file,
       path    => "${mod_dir}/${mpm}.load",
diff --git a/manifests/package.pp b/manifests/package.pp
index a4e4015c52..56e81e5b74 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -3,43 +3,54 @@
   $mpm_module = $::apache::params::mpm_module,
 ) inherits ::apache::params {
   case $::osfamily {
-    'freebsd' : {
-      $all_mpms = [
-        'www/apache22',
-        'www/apache22-worker-mpm',
-        'www/apache22-event-mpm',
-        'www/apache22-itk-mpm',
-        'www/apache22-peruser-mpm',
-      ]
-      if $mpm_module {
-        $apache_package = $mpm_module ? {
-          'prefork' => 'www/apache22',
-          default   => "www/apache22-${mpm_module}-mpm"
+    'FreeBSD': {
+      case $mpm_module {
+        'prefork': {
+          $SET = 'MPM_PREFORK'
+          $UNSET = 'MPM_WORKER MPM_EVENT'
         }
-      } else {
-        $apache_package = 'www/apache22'
+        'worker': {
+          $SET = 'MPM_WORKER'
+          $UNSET = 'MPM_PERFORK MPM_EVENT'
+        }
+        'event': {
+          $SET = 'MPM_EVENT'
+          $UNSET = 'MPM_PERFORK MPM_WORKER'
+        }
+        'itk': {
+          $SET = nil
+          $UNSET = nil
+          package { 'www/mod_mpm_itk':
+            ensure => installed,
+          }
+        }
+        default: { fail("MPM module ${mpm_module} not supported on FreeBSD") }
       }
-      $other_mpms = delete($all_mpms, $apache_package)
-      # Configure ports to have apache module packages dependent on correct
-      # version of apache package (apache22, apache22-worker-mpm, ...)
-      file_line { 'APACHE_PORT in /etc/make.conf':
-        ensure => $ensure,
-        path   => '/etc/make.conf',
-        line   => "APACHE_PORT=${apache_package}",
-        match  => '^\s*#?\s*APACHE_PORT\s*=\s*',
-        before => Package['httpd'],
+
+      # Configure ports to have apache build options set correctly
+      if $SET {
+        file_line {
+          'apache SET options in /etc/make.conf':
+            ensure => $ensure,
+            path   => '/etc/make.conf',
+            line   => "apache24_SET_FORCE= ${SET}",
+            match  => '^apache24_SET_FORCE=.*',
+            before => Package['httpd'];
+          'apache UNSET options in /etc/make.conf':
+            ensure => $ensure,
+            path   => '/etc/make.conf',
+            line   => "apache24_UNSET_FORCE= ${UNSET}",
+            match  => '^apache24_UNSET_FORCE=.*',
+            before => Package['httpd'];
+        }
       }
-      # remove other packages
-      ensure_resource('package', $other_mpms, {
-        ensure  => absent,
-        before  => Package['httpd'],
-        require => File_line['APACHE_PORT in /etc/make.conf'],
-      })
+      $apache_package = $::apache::params::apache_name
     }
     default: {
       $apache_package = $::apache::params::apache_name
     }
   }
+
   package { 'httpd':
     ensure => $ensure,
     name   => $apache_package,
diff --git a/manifests/params.pp b/manifests/params.pp
index 7568179fdc..2a77b033eb 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -110,7 +110,7 @@
       '7'     => '/usr/share/httpd/error',
       default => '/var/www/error'
     }
-    if $::osfamily == "RedHat" {
+    if $::osfamily == 'RedHat' {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
       $wsgi_socket_prefix = undef
@@ -282,9 +282,9 @@
     $user             = 'www'
     $group            = 'www'
     $root_group       = 'wheel'
-    $apache_name      = 'apache22'
-    $service_name     = 'apache22'
-    $httpd_dir        = '/usr/local/etc/apache22'
+    $apache_name      = 'apache24'
+    $service_name     = 'apache24'
+    $httpd_dir        = '/usr/local/etc/apache24'
     $server_root      = '/usr/local'
     $conf_dir         = $httpd_dir
     $confd_dir        = "${httpd_dir}/Includes"
@@ -294,14 +294,14 @@
     $vhost_enable_dir = undef
     $conf_file        = 'httpd.conf'
     $ports_file       = "${conf_dir}/ports.conf"
-    $logroot          = '/var/log/apache22'
+    $logroot          = '/var/log/apache24'
     $logroot_mode     = undef
-    $lib_path         = '/usr/local/libexec/apache22'
+    $lib_path         = '/usr/local/libexec/apache24'
     $mpm_module       = 'prefork'
     $dev_packages     = undef
-    $default_ssl_cert = '/usr/local/etc/apache22/server.crt'
-    $default_ssl_key  = '/usr/local/etc/apache22/server.key'
-    $ssl_certs_dir    = '/usr/local/etc/apache22'
+    $default_ssl_cert = '/usr/local/etc/apache24/server.crt'
+    $default_ssl_key  = '/usr/local/etc/apache24/server.key'
+    $ssl_certs_dir    = '/usr/local/etc/apache24'
     $passenger_conf_file = 'passenger.conf'
     $passenger_conf_package_file = undef
     $passenger_root   = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
@@ -311,7 +311,7 @@
     $suphp_engine     = 'off'
     $suphp_configpath = undef
     $mod_packages     = {
-      # NOTE: I list here only modules that are not included in www/apache22
+      # NOTE: I list here only modules that are not included in www/apache24
       # NOTE: 'passenger' needs to enable APACHE_SUPPORT in make config
       # NOTE: 'php' needs to enable APACHE option in make config
       # NOTE: 'dav_svn' needs to enable MOD_DAV_SVN make config
@@ -320,7 +320,7 @@
       'fcgid'      => 'www/mod_fcgid',
       'passenger'  => 'www/rubygem-passenger',
       'perl'       => 'www/mod_perl2',
-      'php5'       => 'lang/php5',
+      'php5'       => 'www/mod_php5',
       'proxy_html' => 'www/mod_proxy_html',
       'python'     => 'www/mod_python3',
       'wsgi'       => 'www/mod_wsgi',
@@ -340,8 +340,8 @@
     $mime_support_package = 'misc/mime-support'
     $mime_types_config    = '/usr/local/etc/mime.types'
     $wsgi_socket_prefix   = undef
-    $docroot              = '/usr/local/www/apache22/data'
-    $error_documents_path = '/usr/local/www/apache22/error'
+    $docroot              = '/usr/local/www/apache24/data'
+    $error_documents_path = '/usr/local/www/apache24/error'
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
diff --git a/manifests/version.pp b/manifests/version.pp
index 8304bb1a0c..7f1da0f071 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -28,7 +28,7 @@
       }
     }
     'FreeBSD': {
-      $default = '2.2'
+      $default = '2.4'
     }
     default: {
       fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 92870bb6ac..76e5cd612f 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -9,8 +9,8 @@
     package_name = 'apache2'
     service_name = 'apache2'
   when 'FreeBSD'
-    package_name = 'apache22'
-    service_name = 'apache22'
+    package_name = 'apache24'
+    service_name = 'apache24'
   end
 
   context 'default parameters' do
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 2565ce77b9..f06a966af9 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -8,8 +8,8 @@
   mod_dir     = '/etc/apache2/mods-available'
   servicename = 'apache2'
 when 'FreeBSD'
-  mod_dir     = '/usr/local/etc/apache22/Modules'
-  servicename = 'apache22'
+  mod_dir     = '/usr/local/etc/apache24/Modules'
+  servicename = 'apache24'
 end
 
 describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index b810657ec3..2dde8f407e 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -4,7 +4,7 @@
 when 'Debian'
   service_name = 'apache2'
 when 'FreeBSD'
-  service_name = 'apache22'
+  service_name = 'apache24'
 else
   # Not implemented yet
   service_name = :skip
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 7e5afed520..10c9b77d75 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -15,8 +15,8 @@
     service_name        = 'httpd'
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   when 'FreeBSD'
-    mod_dir             = '/usr/local/etc/apache22/Modules'
-    service_name        = 'apache22'
+    mod_dir             = '/usr/local/etc/apache24/Modules'
+    service_name        = 'apache24'
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   end
 
diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
index 6052cc283f..668897c049 100644
--- a/spec/acceptance/mod_deflate_spec.rb
+++ b/spec/acceptance/mod_deflate_spec.rb
@@ -9,8 +9,8 @@
     mod_dir      = '/etc/httpd/conf.d'
     service_name = 'httpd'
   when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
+    mod_dir      = '/usr/local/etc/apache24/Modules'
+    service_name = 'apache24'
   end
 
   context "default deflate config" do
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index ff93dbca67..6bd959ce3a 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -9,8 +9,8 @@
     mod_dir      = '/etc/httpd/conf.d'
     service_name = 'httpd'
   when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
+    mod_dir      = '/usr/local/etc/apache24/Modules'
+    service_name = 'apache24'
   end
 
   context "default mime config" do
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
index 25e4acbeae..371ab0f1d6 100644
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -11,9 +11,9 @@
     mod_dir      = '/etc/httpd/conf.d'
     service_name = 'httpd'
   when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
+    vhost_dir    = '/usr/local/etc/apache24/Vhosts'
+    mod_dir      = '/usr/local/etc/apache24/Modules'
+    service_name = 'apache24'
   end
 
   context "default negotiation config" do
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 0bc07389da..24b6807946 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -11,9 +11,9 @@
     mod_dir      = '/etc/httpd/conf.d'
     service_name = 'httpd'
   when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
+    vhost_dir    = '/usr/local/etc/apache24/Vhosts'
+    mod_dir      = '/usr/local/etc/apache24/Modules'
+    service_name = 'apache24'
   end
 
   context "default pagespeed config" do
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 91eab0f1f7..28da68d3af 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -11,9 +11,9 @@
     mod_dir      = '/etc/httpd/conf.d'
     service_name = 'httpd'
   when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
+    vhost_dir    = '/usr/local/etc/apache24/Vhosts'
+    mod_dir      = '/usr/local/etc/apache24/Modules'
+    service_name = 'apache24'
   end
 
   context "default php config" do
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index eab162b1a3..91bb0a097c 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -7,7 +7,7 @@
   when 'RedHat'
     service_name = 'httpd'
   when 'FreeBSD'
-    service_name = 'apache22'
+    service_name = 'apache24'
   end
 
   context "default proxy_html config" do
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 562ff5323d..5ed8726d63 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -6,7 +6,7 @@
 when 'Debian'
   servicename = 'apache2'
 when 'FreeBSD'
-  servicename = 'apache22'
+  servicename = 'apache24'
 end
 
 case fact('osfamily')
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index c1578c52e6..098b0f41c3 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -44,15 +44,15 @@
     $apache_version = '2.2'
   end
 when 'FreeBSD'
-  $confd_dir        = '/usr/local/etc/apache22/Includes'
-  $mod_dir          = '/usr/local/etc/apache22/Modules'
-  $conf_file        = '/usr/local/etc/apache22/httpd.conf'
-  $ports_file       = '/usr/local/etc/apache22/Includes/ports.conf'
-  $vhost            = '/usr/local/etc/apache22/Vhosts/15-default.conf'
-  $vhost_dir        = '/usr/local/etc/apache22/Vhosts'
-  $run_dir          = '/var/run/apache22'
-  $service_name     = 'apache22'
-  $package_name     = 'apache22'
+  $confd_dir        = '/usr/local/etc/apache24/Includes'
+  $mod_dir          = '/usr/local/etc/apache24/Modules'
+  $conf_file        = '/usr/local/etc/apache24/httpd.conf'
+  $ports_file       = '/usr/local/etc/apache24/Includes/ports.conf'
+  $vhost            = '/usr/local/etc/apache24/Vhosts/15-default.conf'
+  $vhost_dir        = '/usr/local/etc/apache24/Vhosts'
+  $run_dir          = '/var/run/apache24'
+  $service_name     = 'apache24'
+  $package_name     = 'apache24'
   $error_log        = 'http-error.log'
 
   $apache_version = '2.2'
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 6d1e3ca00e..ebe267d7ad 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -540,7 +540,7 @@
         :kernel                 => 'FreeBSD',
         :osfamily               => 'FreeBSD',
         :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
+        :operatingsystemrelease => '10',
         :concat_basedir         => '/dne',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :is_pe                  => false,
@@ -551,25 +551,25 @@
     it { is_expected.to contain_user("www") }
     it { is_expected.to contain_group("www") }
     it { is_expected.to contain_class("apache::service") }
-    it { is_expected.to contain_file("/usr/local/www/apache22/data").with(
+    it { is_expected.to contain_file("/usr/local/www/apache24/data").with(
       'ensure'  => 'directory'
       )
     }
-    it { is_expected.to contain_file("/usr/local/etc/apache22/Vhosts").with(
+    it { is_expected.to contain_file("/usr/local/etc/apache24/Vhosts").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
       'purge'   => 'true',
       'notify'  => 'Class[Apache::Service]',
       'require' => 'Package[httpd]'
     ) }
-    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules").with(
+    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules").with(
       'ensure'  => 'directory',
       'recurse' => 'true',
       'purge'   => 'true',
       'notify'  => 'Class[Apache::Service]',
       'require' => 'Package[httpd]'
     ) }
-    it { is_expected.to contain_concat("/usr/local/etc/apache22/ports.conf").with(
+    it { is_expected.to contain_concat("/usr/local/etc/apache24/ports.conf").with(
       'owner'   => 'root',
       'group'   => 'wheel',
       'mode'    => '0644',
@@ -579,7 +579,6 @@
     [
       'auth_basic',
       'authn_file',
-      'authz_default',
       'authz_groupfile',
       'authz_host',
       'authz_user',
@@ -587,7 +586,7 @@
       'env'
     ].each do |modname|
       it { is_expected.to contain_file("#{modname}.load").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
+        'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
         'ensure' => 'file'
       ) }
       it { is_expected.not_to contain_file("#{modname}.conf") }
@@ -605,11 +604,11 @@
       'setenvif',
     ].each do |modname|
       it { is_expected.to contain_file("#{modname}.load").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
+        'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
         'ensure' => 'file'
       ) }
       it { is_expected.to contain_file("#{modname}.conf").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.conf",
+        'path'   => "/usr/local/etc/apache24/Modules/#{modname}.conf",
         'ensure' => 'file'
       ) }
     end
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 7f1458ccf8..151c37e65a 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -60,13 +60,13 @@
         :kernel                 => 'FreeBSD',
         :osfamily               => 'FreeBSD',
         :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
+        :operatingsystemrelease => '10',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
         :is_pe                  => false,
       }
     end
     it { is_expected.to contain_apache__mod("alias") }
-    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/local\/www\/apache22\/icons\/"/) }
+    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/local\/www\/apache24\/icons\/"/) }
   end
 end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 343e940f63..2eb6f5e8ad 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -97,7 +97,7 @@ class { "apache::mod::deflate":
 
     it { is_expected.to contain_file("deflate.conf").with({
       :ensure => 'file',
-      :path   => '/usr/local/etc/apache22/Modules/deflate.conf',
+      :path   => '/usr/local/etc/apache24/Modules/deflate.conf',
     } ) }
   end
 end
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index bc5aa41106..796b6c3931 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -19,7 +19,7 @@
     end
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.not_to contain_apache__mod('event') }
-    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/event.conf").with_ensure('file') }
+    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/event.conf").with_ensure('file') }
   end
   context "on a Debian OS" do
     let :facts do
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index cdf1663456..32c6339dd9 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -1,5 +1,5 @@
 # This function is called inside the OS specific contexts
-def general_info_specs
+def general_info_specs_22
   it { is_expected.to contain_apache__mod('info') }
 
   context 'passing no parameters' do
@@ -62,6 +62,62 @@ def general_info_specs
   end
 end
 
+def general_info_specs_24
+  it { is_expected.to contain_apache__mod('info') }
+
+  context 'passing no parameters' do
+    it {
+      is_expected.to contain_file('info.conf').with_content(
+        "<Location /server-info>\n"\
+        "    SetHandler server-info\n"\
+        "    Require ip 127.0.0.1 ::1\n"\
+        "</Location>\n"
+      )
+    }
+  end
+  context 'passing restrict_access => false' do
+    let :params do {
+      :restrict_access => false
+    }
+    end
+    it {
+      is_expected.to contain_file('info.conf').with_content(
+        "<Location /server-info>\n"\
+        "    SetHandler server-info\n"\
+        "</Location>\n"
+      )
+    }
+  end
+  context "passing allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']" do
+    let :params do
+      {:allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']}
+    end
+    it {
+      is_expected.to contain_file('info.conf').with_content(
+        "<Location /server-info>\n"\
+        "    SetHandler server-info\n"\
+        "    Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n"\
+        "</Location>\n"
+      )
+    }
+  end
+  context 'passing both restrict_access and allow_from' do
+    let :params do
+      {
+        :restrict_access => false,
+        :allow_from      => ['10.10.1.2', '192.168.1.2', '127.0.0.1']
+      }
+    end
+    it {
+      is_expected.to contain_file('info.conf').with_content(
+        "<Location /server-info>\n"\
+        "    SetHandler server-info\n"\
+        "</Location>\n"
+      )
+    }
+  end
+end
+
 describe 'apache::mod::info', :type => :class do
   let :pre_condition do
     "class { 'apache': default_mods => false, }"
@@ -83,7 +139,7 @@ def general_info_specs
     end
 
     # Load the more generic tests for this context
-    general_info_specs()
+    general_info_specs_22()
 
     it { is_expected.to contain_file('info.conf').with({
       :ensure => 'file',
@@ -110,7 +166,7 @@ def general_info_specs
     end
 
     # Load the more generic tests for this context
-    general_info_specs()
+    general_info_specs_22()
 
     it { is_expected.to contain_file('info.conf').with({
       :ensure => 'file',
@@ -122,7 +178,7 @@ def general_info_specs
     let :facts do
       {
         :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
+        :operatingsystemrelease => '10',
         :concat_basedir         => '/dne',
         :operatingsystem        => 'FreeBSD',
         :id                     => 'root',
@@ -133,11 +189,11 @@ def general_info_specs
     end
 
     # Load the more generic tests for this context
-    general_info_specs()
+    general_info_specs_24()
 
     it { is_expected.to contain_file('info.conf').with({
       :ensure => 'file',
-      :path   => '/usr/local/etc/apache22/Modules/info.conf',
+      :path   => '/usr/local/etc/apache24/Modules/info.conf',
     } ) }
   end
 
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 5556f5ee7c..1644408761 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -55,17 +55,19 @@
     let :facts do
       {
         :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
+        :operatingsystemrelease => '10',
         :concat_basedir         => '/dne',
         :operatingsystem        => 'FreeBSD',
         :id                     => 'root',
         :kernel                 => 'FreeBSD',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :is_pe                  => false,
+        :mpm_module             => 'itk',
       }
     end
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.not_to contain_apache__mod('itk') }
-    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') }
+    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/itk.conf").with_ensure('file') }
+    it { is_expected.to contain_package("www/mod_mpm_itk") }
   end
 end
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index 9ae063cceb..d38f8bba62 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -8,7 +8,7 @@
     let :facts do
       {
         :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
+        :operatingsystemrelease => '10',
         :concat_basedir         => '/dne',
         :operatingsystem        => 'FreeBSD',
         :id                     => 'root',
@@ -17,8 +17,10 @@
         :is_pe                  => false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.not_to contain_apache__mod('peruser') }
-    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/peruser.conf").with_ensure('file') }
+    it do
+      expect {
+        should compile
+      }.to raise_error(Puppet::Error, /Unsupported osfamily FreeBSD/)
+    end
   end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 1508863513..f2dbfb1a91 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -126,7 +126,7 @@
     let :facts do
       {
         :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
+        :operatingsystemrelease => '10',
         :concat_basedir         => '/dne',
         :operatingsystem        => 'FreeBSD',
         :id                     => 'root',
@@ -141,7 +141,7 @@
       end
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("lang/php5") }
+      it { is_expected.to contain_package("www/mod_php5") }
       it { is_expected.to contain_file('php5.load') }
     end
     context "with mpm_module => itk" do
@@ -151,7 +151,7 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::itk') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("lang/php5") }
+      it { is_expected.to contain_package("www/mod_php5") }
       it { is_expected.to contain_file('php5.load') }
     end
   end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index f5c0e93759..58c06e0bda 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -112,6 +112,6 @@
     end
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.not_to contain_apache__mod('prefork') }
-    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/prefork.conf").with_ensure('file') }
+    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/prefork.conf").with_ensure('file') }
   end
 end
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 418797bdf8..d2d5c342d1 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -64,7 +64,7 @@
     it { is_expected.to contain_apache__mod('rpaf') }
     it { is_expected.to contain_package("www/mod_rpaf2") }
     it { is_expected.to contain_file('rpaf.conf').with({
-      'path' => '/usr/local/etc/apache22/Modules/rpaf.conf',
+      'path' => '/usr/local/etc/apache24/Modules/rpaf.conf',
     }) }
     it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
 
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 7afdb70e6a..bb99a0fe65 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -112,7 +112,7 @@
     end
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.not_to contain_apache__mod('worker') }
-    it { is_expected.to contain_file("/usr/local/etc/apache22/Modules/worker.conf").with_ensure('file') }
+    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/worker.conf").with_ensure('file') }
   end
 
   # Template config doesn't vary by distro
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 786b3935f4..ef3504d19e 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -129,7 +129,7 @@
       }
     end
     it { is_expected.to contain_service("httpd").with(
-      'name'      => 'apache22',
+      'name'      => 'apache24',
       'ensure'    => 'running',
       'enable'    => 'true'
       )
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 8aa422dbcb..efb913e6b0 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -69,7 +69,7 @@
       it { should contain_class("apache::mod::fastcgi") }
       it { should contain_file("fastcgi-pool-#{title}.conf").with(
         :ensure => 'present',
-        :path   => "/usr/local/etc/apache22/Includes/fastcgi-pool-#{title}.conf"
+        :path   => "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf"
       ) }
     end
   end
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index dbeaf4ac40..3700b0edb4 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -109,8 +109,8 @@
       it { is_expected.to contain_class("apache::params") }
       it "should manage the module load file" do
         is_expected.to contain_file('spec_m.load').with({
-          :path    => '/usr/local/etc/apache22/Modules/spec_m.load',
-          :content => "LoadModule spec_m_module /usr/local/libexec/apache22/mod_spec_m.so\n",
+          :path    => '/usr/local/etc/apache24/Modules/spec_m.load',
+          :content => "LoadModule spec_m_module /usr/local/libexec/apache24/mod_spec_m.so\n",
           :owner   => 'root',
           :group   => 'wheel',
           :mode    => '0644',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index e52c901587..3e8b6edab5 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -79,7 +79,7 @@
       it { is_expected.to contain_class("apache::params") }
       it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
-        :path   => '/usr/local/etc/apache22/Vhosts/25-rspec.example.com.conf'
+        :path   => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf'
       ) }
     end
   end

From 7bf9f4e133d3f6471e375492b6db3f960e4fecd5 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Thu, 12 Feb 2015 09:55:06 +0000
Subject: [PATCH 0511/2267] removing a no longer working nodeset

---
 spec/acceptance/nodesets/sles-11sp1-x64.yml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 spec/acceptance/nodesets/sles-11sp1-x64.yml

diff --git a/spec/acceptance/nodesets/sles-11sp1-x64.yml b/spec/acceptance/nodesets/sles-11sp1-x64.yml
deleted file mode 100644
index a9f01d5f42..0000000000
--- a/spec/acceptance/nodesets/sles-11sp1-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  sles-11sp1-x64:
-    roles:
-      - master
-    platform: sles-11-x86_64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git

From c00cdd4473eb064a185049a547a137b9c3433228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=B6rner?= <martin.moerner@aperto.de>
Date: Wed, 28 Jan 2015 22:23:16 +0100
Subject: [PATCH 0512/2267] Symlinks on all distros

- Create symlinks on all distros (not just Debian) when a separate
  $vhost_enable_dir is used. Without this a different
  $vhost_enable_dir as conf.d on centos does not create symlinks
  to enable vhosts.
- added a $vhost_enable_dir acceptance test
---
 manifests/vhost.pp            |  2 +-
 spec/acceptance/vhost_spec.rb | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 3c0b149dfe..62472afad3 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -440,7 +440,7 @@
     require => Package['httpd'],
     notify  => Class['apache::service'],
   }
-  if $::osfamily == 'Debian' {
+  if $::apache::vhost_enable_dir {
     $vhost_enable_dir = $::apache::vhost_enable_dir
     $vhost_symlink_ensure = $ensure ? {
       present => link,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 7309672ce9..5560ec5c07 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -92,6 +92,39 @@ class { 'apache': }
     end
   end
 
+  context 'new vhost with enable symlink' do
+    it 'should configure an apache vhost and symlink it from $vhost_enable_dir' do
+      pp = <<-EOS
+        class { 'apache':
+          vhost_enable_dir => "#{$httpd_dir}/sites-enabled",
+        }
+        file { '#{$run_dir}':
+          ensure  => 'directory',
+          recurse => true,
+        }
+
+        apache::vhost { 'first.example.com':
+          port    => '80',
+          docroot => '/var/www/first',
+          require => File['#{$run_dir}'],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-first.example.com.conf") do
+      it { is_expected.to contain '<VirtualHost \*:80>' }
+      it { is_expected.to contain "ServerName first.example.com" }
+    end
+    describe file("#{$httpd_dir}/sites-enabled") do
+      it { is_expected.to contain_file("25-first.example.com.conf").with(
+        :ensure => 'link',
+        :path   => "#{$httpd_dir}/sites-enabled/25-first.example.com.conf",
+        :target => "#{$vhost_dir}/25-first.example.com.conf"
+      ) }
+    end
+  end
+
   context 'new proxy vhost on port 80' do
     it 'should configure an apache proxy vhost' do
       pp = <<-EOS

From bbe6d29a331081b68e20a1e89ee5e3ca7044ee94 Mon Sep 17 00:00:00 2001
From: Phil Fenstermacher <pcfens@wm.edu>
Date: Thu, 30 Oct 2014 10:47:30 -0400
Subject: [PATCH 0513/2267] Add support for mod_auth_cas module configuration

---
 README.md                         |  8 ++++-
 manifests/mod/auth_cas.pp         | 48 +++++++++++++++++++++++++++
 manifests/params.pp               |  7 +++-
 spec/classes/mod/auth_cas_spec.rb | 54 +++++++++++++++++++++++++++++++
 templates/mod/auth_cas.conf.erb   | 40 +++++++++++++++++++++++
 5 files changed, 155 insertions(+), 2 deletions(-)
 create mode 100644 manifests/mod/auth_cas.pp
 create mode 100644 spec/classes/mod/auth_cas_spec.rb
 create mode 100644 templates/mod/auth_cas.conf.erb

diff --git a/README.md b/README.md
index 2d0e3599b1..651d1b1385 100644
--- a/README.md
+++ b/README.md
@@ -520,6 +520,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `actions`
 * `alias`
 * `auth_basic`
+* `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas) below)
 * `auth_kerb`
 * `authnz_ldap`*
 * `autoindex`
@@ -578,7 +579,7 @@ Modules noted with a * indicate that the module has settings and, thus, a templa
 
 The modules mentioned above, and other Apache modules that have templates, cause template files to be dropped along with the mod install. The module will not work without the template. Any module without a template installs the package but drops no files.
 
-####Class:  `apache::mod::event
+####Class:  `apache::mod::event`
 
 Installs and manages mpm_event module.
 
@@ -592,6 +593,11 @@ To configure the event thread limit:
   }
 ```
 
+####Class: `apache::mod::auth_cas`
+
+Installs and manages mod_auth_cas. The parameters `cas_login_url` and `cas_validate_url` are required.
+
+Full documentation on mod_auth_cas is available from [JASIG](https://github.com/Jasig/mod_auth_cas).
 
 ####Class: `apache::mod::info`
 
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
new file mode 100644
index 0000000000..fdb5ee80a2
--- /dev/null
+++ b/manifests/mod/auth_cas.pp
@@ -0,0 +1,48 @@
+class apache::mod::auth_cas (
+  $cas_login_url,
+  $cas_validate_url,
+  $cas_cookie_path          = $::apache::params::cas_cookie_path,
+  $cas_version              = 2,
+  $cas_debug                = 'Off',
+  $cas_validate_depth       = undef,
+  $cas_certificate_path     = undef,
+  $cas_proxy_validate_url   = undef,
+  $cas_root_proxied_as      = undef,
+  $cas_cookie_entropy       = undef,
+  $cas_timeout              = undef,
+  $cas_idle_timeout         = undef,
+  $cas_cache_clean_interval = undef,
+  $cas_cookie_domain        = undef,
+  $cas_cookie_http_only     = undef,
+  $cas_authoritative        = undef,
+  $suppress_warning         = false,
+) {
+
+  validate_string($cas_login_url, $cas_validate_url, $cas_cookie_path)
+
+  if $::osfamily == 'RedHat' and ! $suppress_warning {
+    warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')
+  }
+
+  ::apache::mod { 'auth_cas': }
+
+  file { $cas_cookie_path:
+    ensure => directory,
+    before => File['auth_cas.conf'],
+    mode   => '0750',
+    owner  => $apache::user,
+    group  => $apache::group,
+  }
+
+  # Template uses
+  # - All variables beginning with cas_
+  file { 'auth_cas.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/auth_cas.conf",
+    content => template('apache/mod/auth_cas.conf.erb'),
+    require => [ Exec["mkdir ${::apache::mod_dir}"], ],
+    before  => File[$::apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 7568179fdc..685579e349 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -67,7 +67,9 @@
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
     # NOTE: The module for Shibboleth is not available to RH/CentOS without an additional repository. http://wiki.aaf.edu.au/tech-info/sp-install-guide
+    # NOTE: The auth_cas module isn't available to RH/CentOS without enabling EPEL.
     $mod_packages         = {
+      'auth_cas'    => 'mod_auth_cas',
       'auth_kerb'   => 'mod_auth_kerb',
       'authnz_ldap' => $::apache::version::distrelease ? {
         '7'     => 'mod_ldap',
@@ -110,11 +112,12 @@
       '7'     => '/usr/share/httpd/error',
       default => '/var/www/error'
     }
-    if $::osfamily == "RedHat" {
+    if $::osfamily == 'RedHat' {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
       $wsgi_socket_prefix = undef
     }
+    $cas_cookie_path      = '/var/cache/mod_auth_cas/'
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
@@ -169,6 +172,7 @@
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
     $mod_packages        = {
+      'auth_cas'    => 'libapache2-mod-auth-cas',
       'auth_kerb'   => 'libapache2-mod-auth-kerb',
       'dav_svn'     => 'libapache2-svn',
       'fastcgi'     => 'libapache2-mod-fastcgi',
@@ -198,6 +202,7 @@
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www'
+    $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
     $modsec_crs_package   = 'modsecurity-crs'
     $modsec_crs_path      = '/usr/share/modsecurity-crs'
     $modsec_dir           = '/etc/modsecurity'
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
new file mode 100644
index 0000000000..53c13c5a12
--- /dev/null
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe 'apache::mod::auth_cas', :type => :class do
+  let :params do
+    {
+      :cas_login_url    => 'https://cas.example.com/login',
+      :cas_validate_url => 'https://cas.example.com/validate',
+    }
+  end
+
+  let :pre_condition do
+    'include ::apache'
+  end
+
+  context "on a Debian OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :lsbdistcodename        => 'squeeze',
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("auth_cas") }
+    it { is_expected.to contain_package("libapache2-mod-auth-cas") }
+    it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/apache2/mods-available/auth_cas.conf') }
+    it { is_expected.to contain_file("/var/cache/apache2/mod_auth_cas/").with_owner('www-data') }
+  end
+  context "on a RedHat OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("auth_cas") }
+    it { is_expected.to contain_package("mod_auth_cas") }
+    it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/httpd/conf.d/auth_cas.conf') }
+    it { is_expected.to contain_file("/var/cache/mod_auth_cas/").with_owner('apache') }
+  end
+end
diff --git a/templates/mod/auth_cas.conf.erb b/templates/mod/auth_cas.conf.erb
new file mode 100644
index 0000000000..926bd65f52
--- /dev/null
+++ b/templates/mod/auth_cas.conf.erb
@@ -0,0 +1,40 @@
+CASCookiePath <%= @cas_cookie_path %>
+CASLoginURL <%= @cas_login_url %>
+CASValidateURL <%= @cas_validate_url %>
+
+CASVersion <%= @cas_version %>
+CASDebug <%= @cas_debug %>
+
+<% if @cas_certificate_path -%>
+CASCertificatePath <%= @cas_certificate_path %>
+<% end -%>
+<% if @cas_proxy_validate_url -%>
+CASProxyValidateURL <%= @cas_proxy_validate_url %>
+<% end -%>
+<% if @cas_validate_depth -%>
+CASValidateDepth <%= @cas_validate_depth %>
+<% end -%>
+<% if @cas_root_proxied_as -%>
+CASRootProxiedAs <%= @cas_root_proxied_as %>
+<% end -%>
+<% if @cas_cookie_entropy -%>
+CASCookieEntropy <%= @cas_cookie_entropy %>
+<% end -%>
+<% if @cas_timeout -%>
+CASTimeout <%= @cas_timeout %>
+<% end -%>
+<% if @cas_idle_timeout -%>
+CASIdleTimeout <%= @cas_idle_timeout %>
+<% end -%>
+<% if @cas_cache_clean_interval -%>
+CASCacheCleanInterval <%= @cas_cache_clean_interval %>
+<% end -%>
+<% if @cas_cookie_domain -%>
+CASCookieDomain <%= @cas_cookie_domain %>
+<% end -%>
+<% if @cas_cookie_http_only -%>
+CASCookieHttpOnly <%= @cas_cookie_http_only %>
+<% end -%>
+<% if @cas_authoritative -%>
+CASAuthoritative <%= @cas_authoritative %>
+<% end -%>

From c0d3866f95eb4339acb2bc4f8186c6e74428854c Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 11 Feb 2015 15:00:22 -0800
Subject: [PATCH 0514/2267] Ensure that linter fails on warnings

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 01c85eb991..416807dadc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
-PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')

From 14c84595b8dcf8b535b340f46ef682243211227d Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 12 Feb 2015 13:37:08 -0800
Subject: [PATCH 0515/2267] Remove the ' ' for gepetto?

---
 manifests/package.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/package.pp b/manifests/package.pp
index 56e81e5b74..d4d96202f2 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -33,13 +33,13 @@
           'apache SET options in /etc/make.conf':
             ensure => $ensure,
             path   => '/etc/make.conf',
-            line   => "apache24_SET_FORCE= ${SET}",
+            line   => "apache24_SET_FORCE=${SET}",
             match  => '^apache24_SET_FORCE=.*',
             before => Package['httpd'];
           'apache UNSET options in /etc/make.conf':
             ensure => $ensure,
             path   => '/etc/make.conf',
-            line   => "apache24_UNSET_FORCE= ${UNSET}",
+            line   => "apache24_UNSET_FORCE=${UNSET}",
             match  => '^apache24_UNSET_FORCE=.*',
             before => Package['httpd'];
         }

From 3c43cf68f685e68897290ffb0980a9cf613abefd Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 12 Feb 2015 14:13:26 -0800
Subject: [PATCH 0516/2267] Move test for symlinks to unit tests

---
 spec/acceptance/vhost_spec.rb | 33 ---------------------------------
 spec/defines/vhost_spec.rb    |  7 ++++++-
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e003ab886b..ce504cc3a3 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -92,39 +92,6 @@ class { 'apache': }
     end
   end
 
-  context 'new vhost with enable symlink' do
-    it 'should configure an apache vhost and symlink it from $vhost_enable_dir' do
-      pp = <<-EOS
-        class { 'apache':
-          vhost_enable_dir => "#{$httpd_dir}/sites-enabled",
-        }
-        file { '#{$run_dir}':
-          ensure  => 'directory',
-          recurse => true,
-        }
-
-        apache::vhost { 'first.example.com':
-          port    => '80',
-          docroot => '/var/www/first',
-          require => File['#{$run_dir}'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-first.example.com.conf") do
-      it { is_expected.to contain '<VirtualHost \*:80>' }
-      it { is_expected.to contain "ServerName first.example.com" }
-    end
-    describe file("#{$httpd_dir}/sites-enabled") do
-      it { is_expected.to contain_file("25-first.example.com.conf").with(
-        :ensure => 'link',
-        :path   => "#{$httpd_dir}/sites-enabled/25-first.example.com.conf",
-        :target => "#{$vhost_dir}/25-first.example.com.conf"
-      ) }
-    end
-  end
-
   context 'new proxy vhost on port 80' do
     it 'should configure an apache proxy vhost' do
       pp = <<-EOS
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3e8b6edab5..807488369e 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'apache::vhost', :type => :define do
   let :pre_condition do
-    'class { "apache": default_vhost => false, default_mods => false, }'
+    'class { "apache": default_vhost => false, default_mods => false, vhost_enable_dir => "/etc/apache2/sites-enabled"}'
   end
   let :title do
     'rspec.example.com'
@@ -294,6 +294,11 @@
         'notify'  => 'Class[Apache::Service]',
       })
       }
+      it { is_expected.to contain_file('30-rspec.example.com.conf symlink').with({
+        'ensure' => 'link',
+        'path'   => '/etc/apache2/sites-enabled/30-rspec.example.com.conf',
+      })
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') }

From 0aae912bf26ff9004aac91a4d4f3100cbf09346d Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 12 Feb 2015 15:50:52 -0800
Subject: [PATCH 0517/2267] Bad variables for freebsd patch

---
 manifests/package.pp | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/manifests/package.pp b/manifests/package.pp
index d4d96202f2..395c03103c 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -6,20 +6,20 @@
     'FreeBSD': {
       case $mpm_module {
         'prefork': {
-          $SET = 'MPM_PREFORK'
-          $UNSET = 'MPM_WORKER MPM_EVENT'
+          $set = 'MPM_PREFORK'
+          $unset = 'MPM_WORKER MPM_EVENT'
         }
         'worker': {
-          $SET = 'MPM_WORKER'
-          $UNSET = 'MPM_PERFORK MPM_EVENT'
+          $set = 'MPM_WORKER'
+          $unset = 'MPM_PERFORK MPM_EVENT'
         }
         'event': {
-          $SET = 'MPM_EVENT'
-          $UNSET = 'MPM_PERFORK MPM_WORKER'
+          $set = 'MPM_EVENT'
+          $unset = 'MPM_PERFORK MPM_WORKER'
         }
         'itk': {
-          $SET = nil
-          $UNSET = nil
+          $set = undef
+          $unset = undef
           package { 'www/mod_mpm_itk':
             ensure => installed,
           }
@@ -28,20 +28,20 @@
       }
 
       # Configure ports to have apache build options set correctly
-      if $SET {
-        file_line {
-          'apache SET options in /etc/make.conf':
-            ensure => $ensure,
-            path   => '/etc/make.conf',
-            line   => "apache24_SET_FORCE=${SET}",
-            match  => '^apache24_SET_FORCE=.*',
-            before => Package['httpd'];
-          'apache UNSET options in /etc/make.conf':
-            ensure => $ensure,
-            path   => '/etc/make.conf',
-            line   => "apache24_UNSET_FORCE=${UNSET}",
-            match  => '^apache24_UNSET_FORCE=.*',
-            before => Package['httpd'];
+      if $set {
+        file_line { 'apache SET options in /etc/make.conf':
+          ensure => $ensure,
+          path   => '/etc/make.conf',
+          line   => "apache24_SET_FORCE=${set}",
+          match  => '^apache24_SET_FORCE=.*',
+          before => Package['httpd'],
+        }
+        file_line { 'apache UNSET options in /etc/make.conf':
+          ensure => $ensure,
+          path   => '/etc/make.conf',
+          line   => "apache24_UNSET_FORCE=${unset}",
+          match  => '^apache24_UNSET_FORCE=.*',
+          before => Package['httpd'],
         }
       }
       $apache_package = $::apache::params::apache_name

From 2990db0da3c0bdd0259d3a2bbca008009215990b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 13 Feb 2015 09:45:32 -0800
Subject: [PATCH 0518/2267] Lost this in PR996

---
 manifests/default_mods.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index d3f5dc0a90..2415464505 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -126,6 +126,9 @@
     ::apache::mod { 'authn_file': }
 
     if versioncmp($apache_version, '2.4') >= 0 {
+      # filter is needed by mod_deflate
+      include ::apache::mod::filter
+
       # authz_core is needed for 'Require' directive
       ::apache::mod { 'authz_core':
         id => 'authz_core_module',

From d4bbb168b3d648e602905deb78ac704294d7f052 Mon Sep 17 00:00:00 2001
From: Cristian Falcas <cristi.falcas@gmail.com>
Date: Sun, 15 Feb 2015 18:21:06 +0200
Subject: [PATCH 0519/2267] Update README.md

params from proxy_pass needs to be a hash (considering the erb templates/vhost/_proxy.erb)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 174e58120d..3b22ff46dd 100644
--- a/README.md
+++ b/README.md
@@ -1295,7 +1295,7 @@ apache::vhost { 'site.name.fdqn':
   proxy_pass => [
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
-    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => 'max=20 ttl=120 retry=300' },
+    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300},
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
     { 'path' => '/d', 'url' => 'http://backend-a/d',

From 55b3d8bef410f25933f3b7ca02160e90a434fb6a Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Fri, 13 Feb 2015 09:29:45 +0100
Subject: [PATCH 0520/2267] add ProxyErrorOverride directive

add tests for proxy_error_override
---
 README.md                     | 4 ++++
 manifests/vhost.pp            | 1 +
 spec/acceptance/vhost_spec.rb | 2 ++
 spec/defines/vhost_spec.rb    | 1 +
 templates/vhost/_proxy.erb    | 3 +++
 5 files changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 3b22ff46dd..54839ef088 100644
--- a/README.md
+++ b/README.md
@@ -1222,6 +1222,10 @@ Specifies URLs you do not want to proxy. This parameter is meant to be used in c
 
 Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypreservehost).  true Enables the Host: line from an incoming request to be proxied to the host instead of hostname .  false sets this option to off (default).
 
+#####`proxy_error_override`
+
+Sets the [ProxyErrorOverride Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxyerroroverride). This directive controls whether apache should override error pages for proxied content. This option is off by default.
+
 #####`options`
 
 Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. Defaults to '['Indexes','FollowSymLinks','MultiViews']', as demonstrated below:
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b772654cf2..1113a1ea9f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -67,6 +67,7 @@
   $php_admin_values            = {},
   $no_proxy_uris               = [],
   $proxy_preserve_host         = false,
+  $proxy_error_override        = false,
   $redirect_source             = '/',
   $redirect_dest               = undef,
   $redirect_status             = undef,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index ce504cc3a3..24f3afd98e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -103,6 +103,7 @@ class { 'apache': }
             { 'path' => '/foo', 'url' => 'http://backend-foo/'},
           ],
         proxy_preserve_host   => true,
+        proxy_error_override  => true,
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -113,6 +114,7 @@ class { 'apache': }
       it { is_expected.to contain "ServerName proxy.example.com" }
       it { is_expected.to contain "ProxyPass" }
       it { is_expected.to contain "ProxyPreserveHost On" }
+      it { is_expected.to contain "ProxyErrorOverride On" }
       it { is_expected.not_to contain "<Proxy \*>" }
     end
   end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 807488369e..483617f4c7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -192,6 +192,7 @@
           'php_admin_values'            => ['true', 'false'],
           'no_proxy_uris'               => '/foo',
           'proxy_preserve_host'         => true,
+          'proxy_error_override'        => true,
           'redirect_source'             => '/bar',
           'redirect_dest'               => '/',
           'redirect_status'             => 'temp',
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index dd25e2c87a..58fcc98177 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -6,6 +6,9 @@
 <% if @proxy_preserve_host -%>
   ProxyPreserveHost On
 <%- end -%>
+<% if @proxy_error_override -%>
+  ProxyErrorOverride On
+<%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>

From c11c6224daccc4718c8bf3061eb164dd1e7e399a Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Sun, 18 Jan 2015 14:55:49 +0100
Subject: [PATCH 0521/2267] MODULES-1622: Allow multiple Deny directives in a
 directory

---
 README.md                        |  2 +-
 spec/defines/vhost_spec.rb       | 19 ++++++++++++++-----
 templates/vhost/_directories.erb |  8 +++++++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 484bb3eb7d..b821c6513b 100644
--- a/README.md
+++ b/README.md
@@ -1697,7 +1697,7 @@ Pass a string of custom configuration directives to be placed at the end of the
 
 ######`deny`
 
-Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
+Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
 ```puppet
     apache::vhost { 'sample.example.net':
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 66b1862508..1d442ae3dc 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -147,11 +147,20 @@
           'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
           'access_log_env_var'          => '',
           'aliases'                     => '/image',
-          'directories'                 => {
-            'path'     => '/var/www/files',
-            'provider' => 'files',
-            'deny'     => 'from all'
-          },
+          'directories'                 => [
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'allow'    => [ 'from 127.0.0.1', 'from 127.0.0.2', ],
+              'deny'     => [ 'from 127.0.0.3', 'from 127.0.0.4', ],
+            },
+            {
+              'path'     => '/var/www/foo',
+              'provider' => 'files',
+              'allow'    => 'from 127.0.0.1',
+              'deny'     => 'from all',
+            },
+          ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
           'error_log_pipe'              => '',
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 703afaa8dd..41916f3feb 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -55,8 +55,14 @@
       <%- else -%>
     Order allow,deny
       <%- end -%>
-      <%- if directory['deny'] and directory['deny'] != '' -%>
+      <%- if directory['deny'] and ! [ false, 'false', '' ].include?(directory['deny']) -%>
+        <%- if directory['deny'].kind_of?(Array) -%>
+          <%- Array(directory['deny']).each do |restrict| -%>
+    Deny <%=  restrict %>
+          <%- end -%>
+        <%- else -%>
     Deny <%= directory['deny'] %>
+        <%- end -%>
       <%- end -%>
       <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
         <%- if directory['allow'].kind_of?(Array) -%>

From a530b41fcf67c73bd4abc9eaf99a72e5340dc942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Berger?= <soeren.berger@u1337.de>
Date: Wed, 21 Jan 2015 02:50:16 +0100
Subject: [PATCH 0522/2267] Add RewriteMap support

---
 README.md                     |  7 ++++++-
 manifests/vhost.pp            |  1 +
 spec/acceptance/vhost_spec.rb |  2 ++
 templates/vhost/_rewrite.erb  |  7 +++++++
 tests/vhost.pp                | 15 +++++++++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 484bb3eb7d..bf95956589 100644
--- a/README.md
+++ b/README.md
@@ -1327,7 +1327,7 @@ Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mo
 
 #####`rewrites`
 
-Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'.
+Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Defaults to 'undef'.
 
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
@@ -1388,6 +1388,11 @@ Multiple rewrites and conditions are also possible
           rewrite_base => /apps/,
           rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
         },
+        { comment      => 'Rewrite to lower case',
+          rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
+          rewrite_map  => ['lc int:tolower'],
+          rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+        },
      ],
     }
 ```
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9e05cb566f..3fa1965138 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -657,6 +657,7 @@
   # - $rewrite_base
   # - $rewrite_rule
   # - $rewrite_cond
+  # - $rewrite_map
   if $rewrites or $rewrite_rule {
     concat::fragment { "${name}-rewrite":
       target  => "${priority_real}-${filename}.conf",
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 7309672ce9..03855488a8 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -999,6 +999,7 @@ class { 'apache': }
             { comment => 'test',
               rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
               rewrite_rule => ['^index\.html$ welcome.html'],
+              rewrite_map  => ['lc int:tolower'],
             }
           ],
         }
@@ -1011,6 +1012,7 @@ class { 'apache': }
       it { is_expected.to contain '#test' }
       it { is_expected.to contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
       it { is_expected.to contain 'RewriteRule ^index.html$ welcome.html' }
+      it { is_expected.to contain 'RewriteMap lc int:tolower' }
     end
   end
 
diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index 46dd95691c..81e3bc4679 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -19,6 +19,13 @@
         <%- end -%>
       <%- end -%>
     <%- end -%>
+    <%- if rewrite_details['rewrite_map'] -%>
+      <%- Array(rewrite_details['rewrite_map']).each do |commands| -%>
+        <%- Array(commands).each do |command| -%>
+  RewriteMap <%= command %>
+        <%- end -%>
+      <%- end -%>
+    <%- end -%>
     <%- Array(rewrite_details['rewrite_rule']).each do |commands| -%>
       <%- Array(commands).each do |command| -%>
   RewriteRule <%= command %>
diff --git a/tests/vhost.pp b/tests/vhost.pp
index 4ffb782990..a46b677846 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -154,6 +154,21 @@
     }
   ]
 }
+
+# Rewrite a URL to lower case
+apache::vhost { 'sixteenth.example.com non-ssl':
+  servername => 'sixteenth.example.com',
+  port       => '80',
+  docroot    => '/var/www/sixteenth',
+  rewrites   => [
+    { comment      => 'Rewrite to lower case',
+      rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
+      rewrite_map  => ['lc int:tolower'],
+      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+    }
+  ]
+}
+
 apache::vhost { 'sixteenth.example.com ssl':
   servername => 'sixteenth.example.com',
   port       => '443',

From d431fce700f357a6330544490788bd124b2982dd Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpdavs@gmail.com>
Date: Tue, 17 Feb 2015 15:03:39 +0000
Subject: [PATCH 0523/2267] Supersede ssl_random_seed_bytes with
 ssl_random_seeds option to allow setting of both random source and bytes.

---
 README.md                    |  7 ++++++-
 manifests/mod/ssl.pp         |  8 +++++++-
 spec/classes/mod/ssl_spec.rb | 12 ++++++++----
 templates/mod/ssl.conf.erb   |  9 +++++----
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 7a2a9dfdfa..9976db3e40 100644
--- a/README.md
+++ b/README.md
@@ -750,7 +750,12 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
       ssl_cipher             => 'HIGH:MEDIUM:!aNULL:!MD5',
       ssl_protocol           => 'all -SSLv2 -SSLv3',
       ssl_pass_phrase_dialog => 'builtin',
-      ssl_random_seed_bytes  => '512',
+      ssl_random_seeds       => [
+        'startup builtin',
+        'startup file:/dev/urandom 512',
+        'connect builtin',
+        'connect file:/dev/urandom 512',
+      ],
     }
 ```
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index f2b62459e3..b0a511a35e 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -4,7 +4,12 @@
   $ssl_cipher             = 'HIGH:MEDIUM:!aNULL:!MD5',
   $ssl_protocol           = [ 'all', '-SSLv2', '-SSLv3' ],
   $ssl_pass_phrase_dialog = 'builtin',
-  $ssl_random_seed_bytes  = '512',
+  $ssl_random_seeds = [
+    'startup builtin',
+    'startup file:/dev/urandom 512',
+    'connect builtin',
+    'connect file:/dev/urandom 512',
+  ],
   $apache_version         = $::apache::apache_version,
   $package_name           = undef,
 ) {
@@ -49,6 +54,7 @@
   # $ssl_options
   # $session_cache,
   # $ssl_mutex
+  # $ssl_random_seeds
   # $apache_version
   #
   file { 'ssl.conf':
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index f7755ed362..a657567abe 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -111,13 +111,17 @@
       it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog exec:\/path\/to\/program$/)}
     end
 
-    context 'setting ssl_random_seed_bytes' do
+    context 'setting ssl_random_seeds' do
       let :params do
         {
-          :ssl_random_seed_bytes => '1024',
-        }
+          :ssl_random_seeds => ['startup builtin',
+                                'startup file:/dev/random 256',
+                                'connect file:/dev/urandom 1024' ],
+         }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLRandomSeed startup file:/dev/urandom 1024$})}
+      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLRandomSeed startup builtin$/)}
+      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLRandomSeed startup file:\/dev\/random 256$/)}
+      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLRandomSeed connect file:\/dev\/urandom 1024$/)}
     end
 
   end
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 6fb25c16ee..e9155545b0 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -1,8 +1,9 @@
 <IfModule mod_ssl.c>
-  SSLRandomSeed startup builtin
-  SSLRandomSeed startup file:/dev/urandom <%= @ssl_random_seed_bytes %>
-  SSLRandomSeed connect builtin
-  SSLRandomSeed connect file:/dev/urandom <%= @ssl_random_seed_bytes %>
+  <%- Array(@ssl_random_seeds).each do |ssl_random_seed| -%>
+    <%- if ssl_random_seed != '' -%>
+  SSLRandomSeed <%= ssl_random_seed %>
+    <%- end -%>
+  <%- end -%>
 
   AddType application/x-x509-ca-cert .crt
   AddType application/x-pkcs7-crl    .crl

From 5607d87fe2a7eeb6d8a3013939087d1825b828ff Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpdavs@gmail.com>
Date: Tue, 17 Feb 2015 16:56:38 +0000
Subject: [PATCH 0524/2267] ssl.pp: Fixed indent.

---
 manifests/mod/ssl.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index b0a511a35e..9e352cbf1b 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -4,7 +4,7 @@
   $ssl_cipher             = 'HIGH:MEDIUM:!aNULL:!MD5',
   $ssl_protocol           = [ 'all', '-SSLv2', '-SSLv3' ],
   $ssl_pass_phrase_dialog = 'builtin',
-  $ssl_random_seeds = [
+  $ssl_random_seeds       = [
     'startup builtin',
     'startup file:/dev/urandom 512',
     'connect builtin',

From c89bb3e79df54e1eae58af98b581ba044f359474 Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Tue, 17 Feb 2015 18:04:55 +0100
Subject: [PATCH 0525/2267] Add tests and check content of directories concat
 fragment

---
 spec/defines/vhost_spec.rb | 45 ++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 1d442ae3dc..29828de72f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -147,20 +147,10 @@
           'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
           'access_log_env_var'          => '',
           'aliases'                     => '/image',
-          'directories'                 => [
-            {
-              'path'     => '/var/www/files',
-              'provider' => 'files',
-              'allow'    => [ 'from 127.0.0.1', 'from 127.0.0.2', ],
-              'deny'     => [ 'from 127.0.0.3', 'from 127.0.0.4', ],
-            },
-            {
-              'path'     => '/var/www/foo',
-              'provider' => 'files',
-              'allow'    => 'from 127.0.0.1',
-              'deny'     => 'from all',
-            },
-          ],
+          'directories'                 => {
+            'path'     => '/var/www/files',
+            'provider' => 'files',
+          },
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
           'error_log_pipe'              => '',
@@ -346,6 +336,21 @@
           'manage_docroot'  => true,
           'logroot'         => '/tmp/logroot',
           'logroot_ensure'  => 'absent',
+          'directories'     => [
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'allow'    => [ 'from 127.0.0.1', 'from 127.0.0.2', ],
+              'deny'     => [ 'from 127.0.0.3', 'from 127.0.0.4', ],
+            },
+            {
+              'path'     => '/var/www/foo',
+              'provider' => 'files',
+              'allow'    => 'from 127.0.0.5',
+              'deny'     => 'from all',
+            },
+          ],
+
         }
       end
       let :facts do
@@ -389,6 +394,18 @@
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-itk') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-fallbackresource') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Allow from 127\.0\.0\.1$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Allow from 127\.0\.0\.2$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Allow from 127\.0\.0\.5$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Deny from 127\.0\.0\.3$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Deny from 127\.0\.0\.4$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Deny from all$/ ) }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }

From 438209d3e091bbef7679be101d3f1a218309c46b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 13 Feb 2015 14:29:58 -0800
Subject: [PATCH 0526/2267] 1.3.0 prep

---
 CHANGELOG.md  | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 metadata.json |  2 +-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2ccb4c6c3..967e8a237d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,62 @@
+##2015-02-17 - Supported Release 1.3.0
+###Summary
+
+This release has many new features and bugfixes, including the ability to optionally not trigger service restarts on config changes.
+
+####Features
+- New parameters - `apache`
+  - `service_manage`
+  - `use_optional_includes`
+- New parameters - `apache::service`
+  - `service_manage`
+- New parameters - `apache::vhost`
+  - `access_logs`
+  - `php_flags`
+  - `php_values`
+  - `modsec_disable_vhost`
+  - `modsec_disable_ids`
+  - `modsec_disable_ips`
+  - `modsec_body_limit`
+- Improved FreeBSD support
+- Add ability to omit priority prefix if `$priority` is set to false
+- Add `apache::security::rule_link` define
+- Improvements to `apache::mod::*`
+  - Add `apache::mod::auth_cass` class
+  - Add `threadlimit`, `listenbacklog`, `maxrequestworkers`, `maxconnectionsperchild` parameters to `apache::mod::event`
+  - Add `apache::mod::filter` class
+  - Add `root_group` to `apache::mod::php`
+  - Add `apache::mod::proxy_connect` class
+  - Add `apache::mod::security` class
+  - Add `ssl_pass_phrase_dialog` and `ssl_random_seed_bytes parameters to `apache::mod::ssl` (MODULES-1719)
+  - Add `status_path` parameter to `apache::mod::status`
+  - Add `apache_version` parameter to `apache::mod::version`
+  - Add `package_name` and `mod_path` parameters to `apache::mod::wsgi` (MODULES-1458)
+- Improved SCL support
+  - Add support for specifying the docroot
+- Updated `_directories.erb` to add support for SetEnv
+- Support multiple access log directives (MODULES-1382)
+- Add passenger support for Debian Jessie
+- Add support for not having puppet restart the apache service (MODULES-1559)
+
+####Bugfixes
+- For apache 2.4 `mod_itk` requires `mod_prefork` (MODULES-825)
+- Allow SSLCACertificatePath to be unset in `apache::vhost` (MODULES-1457)
+- Load fcgid after unixd on RHEL7
+- Allow disabling default vhost for Apache 2.4
+- Test fixes
+- `mod_version` is now built-in (MODULES-1446)
+- Sort LogFormats for idempotency
+- `allow_encoded_slashes` was omitted from `apache::vhost`
+- Fix documentation bug (MODULES-1403, MODULES-1510)
+- Sort `wsgi_script_aliases` for idempotency (MODULES-1384)
+- lint fixes
+- Fix automatic version detection for Debian Jessie
+- Fix error docs and icons path for RHEL7-based systems (MODULES-1554)
+- Sort php_* hashes for idempotency (MODULES-1680)
+- Ensure `mod::setenvif` is included if needed (MODULES-1696)
+- Fix indentation in `vhost/_directories.erb` template (MODULES-1688)
+- Create symlinks on all distros if `vhost_enable_dir` is specified
+
 ##2014-09-30 - Supported Release 1.2.0
 ###Summary
 
diff --git a/metadata.json b/metadata.json
index 73ef359875..d778e3bfae 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 082c58423c3d1d90361aeb4e3623d3290fdfd7b6 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 17 Feb 2015 09:21:08 -0800
Subject: [PATCH 0527/2267] Test was using the wrong directory

---
 spec/acceptance/custom_config_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index bbceaca3e7..8b59f703fb 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -48,7 +48,7 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$vhost_dir}/prefix_test.conf") do
+    describe file("#{$confd_dir}/prefix_test.conf") do
       it { is_expected.to be_file }
     end
   end

From 70db610ac98595bb149ab7cf180ca9bb3a4aa9c7 Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Wed, 18 Feb 2015 16:26:42 +0100
Subject: [PATCH 0528/2267] adjust params and mpm to recent FreeBSD packages

---
 manifests/mpm.pp    | 5 +----
 manifests/params.pp | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 2b33634f29..a5cca49882 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -13,10 +13,7 @@
   $_path = "${lib_path}/${_lib}"
   $_id   = "mpm_${mpm}_module"
 
-  if versioncmp($apache_version, '2.4') >= 0 and
-    (($::osfamily != 'FreeBSD') or
-    ($::osfamily == 'FreeBSD' and $mpm == 'itk')) {
-
+  if versioncmp($apache_version, '2.4') >= 0 {
     file { "${mod_dir}/${mpm}.load":
       ensure  => file,
       path    => "${mod_dir}/${mpm}.load",
diff --git a/manifests/params.pp b/manifests/params.pp
index add2d94aed..a2ec04fd7e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -309,8 +309,8 @@
     $ssl_certs_dir    = '/usr/local/etc/apache24'
     $passenger_conf_file = 'passenger.conf'
     $passenger_conf_package_file = undef
-    $passenger_root   = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
-    $passenger_ruby   = '/usr/bin/ruby'
+    $passenger_root   = '/usr/local/lib/ruby/gems/2.0/gems/passenger-4.0.58'
+    $passenger_ruby   = '/usr/local/bin/ruby'
     $passenger_default_ruby = undef
     $suphp_addhandler = 'php5-script'
     $suphp_engine     = 'off'

From 3a702ecf4e3ae3c474743feba0ecbbde98cebe29 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Wed, 18 Feb 2015 10:34:51 -0800
Subject: [PATCH 0529/2267] SuPHP acceptance fixes?, chasing the test bug that
 is timing

---
 spec/acceptance/mod_suphp_spec.rb | 42 +++++++++++++++++--------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 190edfc613..308173a118 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -2,10 +2,10 @@
 
 describe 'apache::mod::suphp class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   case fact('osfamily')
-  when 'Debian'
-    context "default suphp config" do
-      it 'succeeds in puppeting suphp' do
-        pp = <<-EOS
+    when 'Debian'
+      context "default suphp config" do
+        it 'succeeds in puppeting suphp' do
+          pp = <<-EOS
           class { 'apache':
             mpm_module => 'prefork',
           }
@@ -22,24 +22,28 @@ class { 'apache::mod::suphp': }
             group   => 'daemon',
             content => "<?php echo get_current_user(); ?>\\n",
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
+          EOS
+          apply_manifest(pp, :catch_failures => true)
+        end
 
-      describe service('apache2') do
-        it { is_expected.to be_enabled }
-        it { is_expected.to be_running }
-      end
+        describe service('apache2') do
+          it { is_expected.to be_enabled }
+          it { is_expected.to be_running }
+        end
 
-      it 'should answer to suphp.example.com' do
-        shell("/bin/sleep 10")
-        shell("/usr/bin/curl suphp.example.com:80") do |r|
-          expect(r.stdout).to match(/^daemon$/)
-          expect(r.exit_code).to eq(0)
+        it 'should answer to suphp.example.com' do
+          timeout = 0
+          loop do
+            r = shell('curl suphp.example.com:80')
+            timeout += 1
+            break if timeout > 20 || r.stdout =~ /^daemon$/
+            sleep(1)
+          end
+          shell("/usr/bin/curl suphp.example.com:80") do |r|
+            expect(r.stdout).to match(/^daemon$/)
+            expect(r.exit_code).to eq(0)
+          end
         end
       end
-    end
-  when 'RedHat'
-    # Not implemented yet
   end
 end

From 7f97336e47c60ca2ff3114cd2f4008837b01381b Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Wed, 18 Feb 2015 13:08:05 -0800
Subject: [PATCH 0530/2267] Fixed an order of operations issue in the test that
 caused some weird behavior when apache would delay or not restart after a
 file was dropped into the docroot

---
 spec/acceptance/mod_suphp_spec.rb | 40 ++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 308173a118..fa0125e496 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -6,22 +6,24 @@
       context "default suphp config" do
         it 'succeeds in puppeting suphp' do
           pp = <<-EOS
-          class { 'apache':
-            mpm_module => 'prefork',
-          }
-          class { 'apache::mod::php': }
-          class { 'apache::mod::suphp': }
-          apache::vhost { 'suphp.example.com':
-            port    => '80',
-            docroot => '/var/www/suphp',
-          }
-          host { 'suphp.example.com': ip => '127.0.0.1', }
-          file { '/var/www/suphp/index.php':
-            ensure  => file,
-            owner   => 'daemon',
-            group   => 'daemon',
-            content => "<?php echo get_current_user(); ?>\\n",
-          }
+class { 'apache':
+  mpm_module => 'prefork',
+}
+host { 'suphp.example.com': ip => '127.0.0.1', }
+apache::vhost { 'suphp.example.com':
+  port    => '80',
+  docroot => '/var/www/suphp',
+}
+file { '/var/www/suphp/index.php':
+  ensure  => file,
+  owner   => 'daemon',
+  group   => 'daemon',
+  content => "<?php echo get_current_user(); ?>\\n",
+  require => File['/var/www/suphp'],
+  before  => Class['apache::mod::php'],
+}
+class { 'apache::mod::php': }
+class { 'apache::mod::suphp': }
           EOS
           apply_manifest(pp, :catch_failures => true)
         end
@@ -36,7 +38,11 @@ class { 'apache::mod::suphp': }
           loop do
             r = shell('curl suphp.example.com:80')
             timeout += 1
-            break if timeout > 20 || r.stdout =~ /^daemon$/
+            break if r.stdout =~ /^daemon$/
+            if timeout > 40
+              expect(timeout < 40).to be true
+              break
+            end
             sleep(1)
           end
           shell("/usr/bin/curl suphp.example.com:80") do |r|

From 7cee3052e888e1308b5b010b5b7b07ca6317ad6d Mon Sep 17 00:00:00 2001
From: Kylo Ginsberg <kylo@puppetlabs.com>
Date: Thu, 19 Feb 2015 13:46:54 -0800
Subject: [PATCH 0531/2267] (maint) Remove travis badge

Travis runs of puppetlabs-apache take quite a while and clog the travis
pipeline for other puppetlabs projects , so it seemed like a good idea
to restrict travis builds to PRs, but not to merges to master.
As a side effect, this renders the travis badge stale, so removing it.
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 019e0e1fa8..1627df4e3b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 #apache
 
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-apache.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-apache)
-
 ####Table of Contents
 
 1. [Overview - What is the apache module?](#overview)

From cfc2846f403b60efc4cbc80ae131e324a71d3b24 Mon Sep 17 00:00:00 2001
From: Olli Helenius <olli.helenius@onesto.fi>
Date: Fri, 20 Feb 2015 11:03:31 +0200
Subject: [PATCH 0532/2267] Add support for Passenger's PassengerAppEnv setting

(#1776) Add support for specifying PassengerAppEnv
either as a global setting to `apache::mod::passenger` or
per `apache::vhost`.
---
 README.md                          | 4 ++++
 README.passenger.md                | 8 ++++++++
 manifests/mod/passenger.pp         | 2 ++
 manifests/vhost.pp                 | 6 ++++--
 spec/classes/mod/passenger_spec.rb | 6 ++++++
 spec/defines/vhost_spec.rb         | 1 +
 templates/mod/passenger.conf.erb   | 3 +++
 templates/vhost/_passenger.erb     | 3 +++
 8 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9976db3e40..3e5b879a45 100644
--- a/README.md
+++ b/README.md
@@ -1252,6 +1252,10 @@ Sets the overrides for the specified virtual host. Accepts an array of [AllowOve
 
 Sets [PassengerRoot](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppRoot), the location of the Passenger application root if different from the DocumentRoot.
 
+#####`passenger_app_env`
+
+Sets [PassengerAppEnv](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppEnv), the environment for the Passenger application. If not specifies, defaults to the global setting or 'production'.
+
 #####`passenger_ruby`
 
 Sets [PassengerRuby](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerRuby) on this virtual host, the Ruby interpreter to use for the application.
diff --git a/README.passenger.md b/README.passenger.md
index 84e6992ffa..5b33d29096 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -201,6 +201,14 @@ Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is
 the default in Passenger 4.x and the versions >= 4.x have disabled this
 configuration option altogether.  Use with caution.
 
+### passenger_app_env
+
+Sets the global default `PassengerAppEnv` for Passenger applications. Not set by
+default (`undef`) and thus defaults to Passenger's built-in value of 'production'.
+This directive can be overridden in an `apache::vhost` resource.
+
+https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppEnv
+
 ## Parameters used to load the module
 
 Unlike the tuning parameters specified above, the following parameters are only
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 7ff6b71be3..e0c35295a8 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -12,6 +12,7 @@
   $passenger_default_ruby         = $::apache::params::passenger_default_ruby,
   $passenger_max_pool_size        = undef,
   $passenger_use_global_queue     = undef,
+  $passenger_app_env              = undef,
   $mod_package                    = undef,
   $mod_package_ensure             = undef,
   $mod_lib                        = undef,
@@ -73,6 +74,7 @@
   # - $passenger_max_requests
   # - $passenger_stat_throttle_rate
   # - $passenger_use_global_queue
+  # - $passenger_app_env
   # - $rack_autodetect
   # - $rails_autodetect
   file { 'passenger.conf':
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index dc6ca58811..1828b7e0a4 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -105,6 +105,7 @@
   $allow_encoded_slashes       = undef,
   $suexec_user_group           = undef,
   $passenger_app_root          = undef,
+  $passenger_app_env           = undef,
   $passenger_ruby              = undef,
   $passenger_min_instances     = undef,
   $passenger_start_timeout     = undef,
@@ -225,7 +226,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
     include ::apache::mod::passenger
   }
 
@@ -839,11 +840,12 @@
 
   # Template uses:
   # - $passenger_app_root
+  # - $passenger_app_env
   # - $passenger_ruby
   # - $passenger_min_instances
   # - $passenger_start_timeout
   # - $passenger_pre_start
-  if $passenger_app_root or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 9c9935939e..af51602e13 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -95,6 +95,12 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue on$/) }
     end
+    describe "with passenger_app_env => 'foo'" do
+      let :params do
+        { :passenger_app_env => 'foo' }
+      end
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerAppEnv foo$/) }
+    end
     describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
       let :params do
         { :mod_path => '/usr/lib/foo/mod_foo.so' }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 483617f4c7..6dc6f4e780 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -245,6 +245,7 @@
           'suexec_user_group'           => 'root root',
           'allow_encoded_slashes'       => 'nodecode',
           'passenger_app_root'          => '/usr/share/myapp',
+          'passenger_app_env'           => 'test',
           'passenger_ruby'              => '/usr/bin/ruby1.9.1',
           'passenger_min_instances'     => '1',
           'passenger_start_timeout'     => '600',
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index a56d2d5d14..22805f5a70 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -34,4 +34,7 @@
   <%- if @passenger_use_global_queue -%>
   PassengerUseGlobalQueue <%= @passenger_use_global_queue %>
   <%- end -%>
+  <%- if @passenger_app_env -%>
+  PassengerAppEnv <%= @passenger_app_env %>
+  <%- end -%>
 </IfModule>
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index df2a86d376..130e769353 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -1,6 +1,9 @@
 <% if @passenger_app_root -%>
   PassengerAppRoot <%= @passenger_app_root %>
 <% end -%>
+<% if @passenger_app_env -%>
+  PassengerAppEnv <%= @passenger_app_env %>
+<% end -%>
 <% if @passenger_ruby -%>
   PassengerRuby <%= @passenger_ruby %>
 <% end -%>

From 5bb84d2daad0cb87c59cfb9c470492d6dbd71d3e Mon Sep 17 00:00:00 2001
From: Harald Skoglund <harald.skoglund@schibstedpayment.no>
Date: Fri, 20 Feb 2015 15:36:52 +0100
Subject: [PATCH 0533/2267] fix bug in scriptalias code that keeps scriptalias
 from beeing included

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index dc6ca58811..103288c45f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -678,7 +678,7 @@
   # Template uses:
   # - $scriptaliases
   # - $scriptalias
-  if $scriptaliases and ! empty($scriptaliases) {
+  if ( $scriptalias or $scriptaliases != [] ) {
     concat::fragment { "${name}-scriptalias":
       target  => "${priority_real}${filename}.conf",
       order   => 180,

From 669b303331f2718e59aa7ce0f19fb7c7ef2fe8e7 Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Fri, 20 Feb 2015 19:59:19 +0100
Subject: [PATCH 0534/2267] MODULES-1784 check for deprecated options and fail
 when they are unsupported

---
 templates/vhost/_directories.erb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 423e56f852..6244c73c36 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -2,6 +2,20 @@
 
   ## Directories, there should at least be a declaration for <%= @docroot %>
   <%- [@_directories].flatten.compact.each do |directory| -%>
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+      <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
+        <%- scope.function_fail(["Apache::Vhost: Using allow is not supported in your Apache version"]) -%>
+      <%- end -%>
+      <%- if directory['deny'] and ! [ false, 'false', '' ].include?(directory['deny']) -%>
+        <%- scope.function_fail(["Apache::Vhost: Using deny is not supported in your Apache version"]) -%>
+      <%- end -%>
+      <%- if directory['order'] and ! [ false, 'false', '' ].include?(directory['order']) -%>
+        <%- scope.function_fail(["Apache::Vhost: Using order is not supported in your Apache version"]) -%>
+      <%- end -%>
+      <%- if directory['satisfy'] and ! [ false, 'false', '' ].include?(directory['satisfy']) -%>
+        <%- scope.function_fail(["Apache::Vhost: Using satisfy is not supported in your Apache version"]) -%>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['path'] and directory['path'] != '' -%>
       <%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
         <%- if /^(.*)match$/ =~ directory['provider'] -%>

From c40c1d0932d0c166f18fa5487af1dd704cffc13b Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Sat, 21 Feb 2015 15:08:05 +0100
Subject: [PATCH 0535/2267] MODULES-1779 install package mod_ldap on CentOS 7

---
 manifests/params.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index a2ec04fd7e..7a27926778 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -77,6 +77,10 @@
       },
       'fastcgi'     => 'mod_fastcgi',
       'fcgid'       => 'mod_fcgid',
+      'ldap'        => $::apache::version::distrelease ? {
+        '7'     => 'mod_ldap',
+        default => undef,
+      },
       'pagespeed'   => 'mod-pagespeed-stable',
       'passenger'   => 'mod_passenger',
       'perl'        => 'mod_perl',

From 48465e51734a3f94c2dab4ce0862cc202c340918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=B6rner?= <martin.moerner@aperto.de>
Date: Sun, 22 Feb 2015 14:49:41 +0100
Subject: [PATCH 0536/2267] Fixed default config warning

AH00513: WARNING: MaxRequestWorkers of 256 is not an integer
multiple of ThreadsPerChild of 25, decreasing to nearest multiple
250, for a maximum of 10 servers.
---
 manifests/mod/event.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 18a226ee53..28053a6590 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -9,7 +9,7 @@
   $apache_version         = $::apache::apache_version,
   $threadlimit            = '64',
   $listenbacklog          = '511',
-  $maxrequestworkers      = '256',
+  $maxrequestworkers      = '250',
   $maxconnectionsperchild = '0',
 ) {
   if defined(Class['apache::mod::itk']) {

From 5bc7a0bc7e5370b0a2a420512fe6e596886ab0f2 Mon Sep 17 00:00:00 2001
From: derdanne <dk@marketing-factory.de>
Date: Tue, 24 Feb 2015 10:36:41 +0100
Subject: [PATCH 0537/2267] add gentoo compatibility

---
 .fixtures.yml                           |  1 +
 README.md                               | 41 +++++++++--------
 manifests/default_mods.pp               |  8 +++-
 manifests/init.pp                       | 17 +++++++
 manifests/mod/alias.pp                  |  1 +
 manifests/mod/disk_cache.pp             |  1 +
 manifests/mod/event.pp                  |  5 ++
 manifests/mod/itk.pp                    |  5 ++
 manifests/mod/peruser.pp                |  6 +++
 manifests/mod/prefork.pp                |  5 ++
 manifests/mod/proxy_html.pp             |  2 +-
 manifests/mod/ssl.pp                    |  4 ++
 manifests/mod/worker.pp                 |  5 ++
 manifests/params.pp                     | 61 +++++++++++++++++++++++++
 manifests/version.pp                    |  3 ++
 spec/acceptance/class_spec.rb           |  3 ++
 spec/acceptance/default_mods_spec.rb    |  5 +-
 spec/acceptance/mod_deflate_spec.rb     |  3 ++
 spec/acceptance/mod_mime_spec.rb        |  3 ++
 spec/acceptance/mod_negotiation_spec.rb |  4 ++
 spec/acceptance/mod_pagespeed_spec.rb   |  6 ++-
 spec/acceptance/mod_php_spec.rb         |  4 ++
 spec/acceptance/mod_proxy_html_spec.rb  |  2 +
 spec/acceptance/prefork_worker_spec.rb  |  2 +
 spec/acceptance/version.rb              | 13 ++++++
 spec/classes/apache_spec.rb             | 42 +++++++++++++++++
 spec/classes/dev_spec.rb                | 15 ++++++
 spec/classes/mod/auth_kerb_spec.rb      | 17 +++++++
 spec/classes/mod/dav_svn_spec.rb        | 17 +++++++
 spec/classes/mod/deflate_spec.rb        | 23 ++++++++++
 spec/classes/mod/dir_spec.rb            | 32 +++++++++++++
 spec/classes/mod/event_spec.rb          | 19 +++++++-
 spec/classes/mod/fcgid_spec.rb          | 19 ++++++++
 spec/classes/mod/info_spec.rb           | 22 +++++++++
 spec/classes/mod/passenger_spec.rb      | 17 +++++++
 spec/classes/mod/perl_spec.rb           | 17 +++++++
 spec/classes/mod/peruser_spec.rb        | 17 +++++++
 spec/classes/mod/php_spec.rb            | 33 +++++++++++++
 spec/classes/mod/prefork_spec.rb        | 17 +++++++
 spec/classes/mod/proxy_html_spec.rb     | 17 +++++++
 spec/classes/mod/python_spec.rb         | 17 +++++++
 spec/classes/mod/reqtimeout_spec.rb     | 35 ++++++++++++++
 spec/classes/mod/rpaf_spec.rb           | 40 ++++++++++++++++
 spec/classes/mod/ssl_spec.rb            | 18 +++++++-
 spec/classes/mod/worker_spec.rb         | 17 +++++++
 spec/classes/mod/wsgi_spec.rb           | 20 ++++++++
 spec/classes/service_spec.rb            | 45 +++++++++---------
 spec/defines/fastcgi_server_spec.rb     | 21 +++++++++
 spec/defines/mod_spec.rb                | 31 +++++++++++++
 spec/defines/vhost_spec.rb              | 22 +++++++++
 50 files changed, 750 insertions(+), 50 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index b5f76c03ac..6eddf260f6 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -2,5 +2,6 @@ fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
     concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
+    portage: "git://github.com/gentoo/puppet-portage.git"
   symlinks:
     apache: "#{source_dir}"
diff --git a/README.md b/README.md
index b7a84ff94c..099230c2d9 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,8 @@ Apache is a widely-used web server, and this module provides a simplified way of
 * Apache modules
 * virtual hosts
 * listened-to ports
-* `/etc/make.conf` on FreeBSD
+* `/etc/make.conf` on FreeBSD and Gentoo
+* depends on module 'gentoo/puppet-portage' for Gentoo
 
 ###Beginning with Apache
 
@@ -79,7 +80,7 @@ To install Apache with the default parameters
     class { 'apache':  }
 ```
 
-The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, and RedHat systems have another, as do FreeBSD systems). These defaults work well in a testing environment, but are not suggested for production. To establish customized parameters
+The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, and RedHat systems have another, as do FreeBSD and Gentoo systems). These defaults work well in a testing environment, but are not suggested for production. To establish customized parameters
 
 ```puppet
     class { 'apache':
@@ -238,11 +239,11 @@ Configures the behavior of the module templates, package names, and default mods
 
 #####`conf_dir`
 
-Changes the location of the configuration directory the main configuration file is placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
+Changes the location of the configuration directory the main configuration file is placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, '/usr/local/etc/apache22' on FreeBSD, and '/etc/apache2' on Gentoo.
 
 #####`confd_dir`
 
-Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2/conf.d' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
+Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2/conf.d' on Debian, '/usr/local/etc/apache22' on FreeBSD, and '/etc/apache2/conf.d' on Gentoo.
 
 #####`conf_template`
 
@@ -270,7 +271,7 @@ The default certificate authority, which is automatically set to 'undef'. This d
 
 #####`default_ssl_cert`
 
-The default SSL certification, which is automatically set based on your operating system  ('/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD). This default works out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL certification, which is automatically set based on your operating system  ('/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, '/usr/local/etc/apache22/server.crt' for FreeBSD, and '/etc/ssl/apache2/server.crt' for Gentoo). This default works out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_chain`
 
@@ -290,7 +291,7 @@ Sets the default certificate revocation check level via the [SSLCARevocationChec
 
 #####`default_ssl_key`
 
-The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD). This default works out of the box but must be updated with your specific certificate information before being used in production.
+The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, '/usr/local/etc/apache22/server.key' for FreeBSD, and '/etc/ssl/apache2/server.key' for Gentoo). This default works out of the box but must be updated with your specific certificate information before being used in production.
 
 #####`default_ssl_vhost`
 
@@ -315,7 +316,7 @@ Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [cu
 
 #####`docroot`
 
-Changes the location of the default [Documentroot](https://httpd.apache.org/docs/current/mod/core.html#documentroot). Defaults to '/var/www/html' on RedHat, '/var/www' on Debian, and '/usr/local/www/apache22/data' on FreeBSD.
+Changes the location of the default [Documentroot](https://httpd.apache.org/docs/current/mod/core.html#documentroot). Defaults to '/var/www/html' on RedHat, '/var/www' on Debian, '/usr/local/www/apache22/data' on FreeBSD, and '/var/www/localhost/htdocs' on Gentoo.
 
 #####`error_documents`
 
@@ -323,7 +324,7 @@ Enables custom error documents. Defaults to 'false'.
 
 #####`httpd_dir`
 
-Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but might have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
+Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but might have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, '/usr/local/etc/apache22' on FreeBSD, and '/etc/apache2' on Gentoo.
 
 #####`keepalive`
 
@@ -355,7 +356,7 @@ Define additional [LogFormats](https://httpd.apache.org/docs/current/mod/mod_log
 
 #####`logroot`
 
-Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, and '/var/log/apache22' on FreeBSD.
+Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, '/var/log/apache22' on FreeBSD, and '/var/log/apache2' on Gentoo.
 
 #####`logroot_mode`
 
@@ -372,11 +373,11 @@ Setting this to 'false' stops the user resource from being created. This is for
 
 #####`mod_dir`
 
-Changes the location of the configuration directory your Apache modules configuration files are placed in. Defaults to '/etc/httpd/conf.d' for RedHat, '/etc/apache2/mods-available' for Debian, and '/usr/local/etc/apache22/Modules' for FreeBSD.
+Changes the location of the configuration directory your Apache modules configuration files are placed in. Defaults to '/etc/httpd/conf.d' for RedHat, '/etc/apache2/mods-available' for Debian, '/usr/local/etc/apache22/Modules' for FreeBSD, and '/etc/apache2/modules.d' on Gentoo.
 
 #####`mpm_module`
 
-Determines which MPM is loaded and configured for the HTTPD process. Valid values are 'event', 'itk', 'peruser', 'prefork', 'worker', or 'false'. Defaults to 'prefork' on RedHat and FreeBSD, and 'worker' on Debian. Must be set to 'false' to explicitly declare the following classes with custom parameters:
+Determines which MPM is loaded and configured for the HTTPD process. Valid values are 'event', 'itk', 'peruser', 'prefork', 'worker', or 'false'. Defaults to 'prefork' on RedHat, FreeBSD and Gentoo, and 'worker' on Debian. Must be set to 'false' to explicitly declare the following classes with custom parameters:
 
 * `apache::mod::event`
 * `apache::mod::itk`
@@ -416,7 +417,7 @@ Sets the server name. Defaults to `fqdn` provided by Facter.
 
 #####`server_root`
 
-Sets the root directory in which the server resides. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local' on FreeBSD.
+Sets the root directory in which the server resides. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, '/usr/local' on FreeBSD, and '/var/www' on Gentoo.
 
 #####`server_signature`
 
@@ -436,7 +437,7 @@ Determines whether the service should be running. Valid values are 'true', 'fals
 
 #####`service_name`
 
-Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on Debian, and 'apache22' on FreeBSD.
+Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on Debian and Gentoo, and 'apache22' on FreeBSD.
 
 #####`service_manage`
 
@@ -448,7 +449,7 @@ Controls how TRACE requests per RFC 2616 are handled. More information about [Tr
 
 #####`vhost_dir`
 
-Changes the location of the configuration directory your virtual host configuration files are placed in. Defaults to 'etc/httpd/conf.d' on RedHat, '/etc/apache2/sites-available' on Debian, and '/usr/local/etc/apache22/Vhosts' on FreeBSD.
+Changes the location of the configuration directory your virtual host configuration files are placed in. Defaults to 'etc/httpd/conf.d' on RedHat, '/etc/apache2/sites-available' on Debian, '/usr/local/etc/apache22/Vhosts' on FreeBSD, and '/etc/apache2/vhosts.d' on Gentoo.
 
 #####`apache_name`
 
@@ -1515,9 +1516,9 @@ Used by HTTPD to conditionally set environment variables for vhosts. Defaults to
 
 Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
 
-`suphp_addhandler` defaults to 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian.
+`suphp_addhandler` defaults to 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian and Gentoo.
 
-`suphp_configpath` defaults to 'undef' on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian.
+`suphp_configpath` defaults to 'undef' on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian and Gentoo.
 
 `suphp_engine` allows values 'on' or 'off'. Defaults to 'off'
 
@@ -2013,7 +2014,7 @@ Specifies the SSL certificate authority. Defaults to 'undef'.
 
 #####`ssl_cert`
 
-Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD.
+Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, '/usr/local/etc/apache22/server.crt' for FreeBSD, and '/etc/ssl/apache2/server.crt' on Gentoo.
 
 #####`ssl_protocol`
 
@@ -2033,7 +2034,7 @@ Sets [SSLHonorCipherOrder](http://httpd.apache.org/docs/current/mod/mod_ssl.html
 
 #####`ssl_certs_dir`
 
-Specifies the location of the SSL certification directory. Defaults to '/etc/ssl/certs' on Debian, '/etc/pki/tls/certs' on RedHat, and '/usr/local/etc/apache22' on FreeBSD.
+Specifies the location of the SSL certification directory. Defaults to '/etc/ssl/certs' on Debian, '/etc/pki/tls/certs' on RedHat, '/usr/local/etc/apache22' on FreeBSD, and '/etc/ssl/apache2' on Gentoo.
 
 #####`ssl_chain`
 
@@ -2053,7 +2054,7 @@ Sets the certificate revocation check level via the [SSLCARevocationCheck direct
 
 #####`ssl_key`
 
-Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, '/usr/local/etc/apache22/server.key' for FreeBSD, and '/etc/ssl/apache2/server.key' on Gentoo. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 #####`ssl_verify_client`
 
@@ -2471,7 +2472,7 @@ The `apache::mod::passenger` class is untested as the repository does not have p
 
 This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet.
 
-The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions can occur.
+The module contains support for other distributions and operating systems, such as FreeBSD, Gentoo and Amazon Linux, but is not formally tested on those and regressions can occur.
 
 ###SELinux and Custom Paths
 
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 2415464505..b600b1be7c 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -24,8 +24,12 @@
     }
     default: {}
   }
-  ::apache::mod { 'authz_host': }
-
+  case $::osfamily {
+    'gentoo': {}
+    default: {
+      ::apache::mod { 'authz_host': }
+    }
+  }
   # The rest of the modules only get loaded if we want all modules enabled
   if $all {
     case $::osfamily {
diff --git a/manifests/init.pp b/manifests/init.pp
index f7b89076d8..b3da9ff0a5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -261,6 +261,23 @@
         $error_log            = 'httpd-error.log'
         $scriptalias          = '/usr/local/www/apache24/cgi-bin'
         $access_log_file      = 'httpd-access.log'
+      } 'gentoo': {
+        $pidfile              = '/run/apache2.pid'
+        $error_log            = 'error.log'
+        $error_documents_path = '/usr/share/apache2/error'
+        $scriptalias          = '/var/www/localhost/cgi-bin'
+        $access_log_file      = 'access.log'
+
+        ::portage::makeconf { 'apache2_modules':
+          content => $default_mods,
+        }
+        file { [
+          '/etc/apache2/modules.d/.keep_www-servers_apache-2',
+          '/etc/apache2/vhosts.d/.keep_www-servers_apache-2'
+        ]:
+          ensure  => absent,
+          require => Package['httpd'],
+        }
       }
       default: {
         fail("Unsupported osfamily ${::osfamily}")
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index c9f8e4dab1..ca3f226b38 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -10,6 +10,7 @@
       default => '/var/www/icons',
     },
     'freebsd' => '/usr/local/www/apache24/icons',
+    'gentoo'  => '/usr/share/apache2/icons',
   }
   apache::mod { 'alias': }
   # Template uses $icons_path
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 2730809cf1..2b9d8a9101 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -3,6 +3,7 @@
     'debian'  => '/var/cache/apache2/mod_disk_cache',
     'redhat'  => '/var/cache/mod_proxy',
     'freebsd' => '/var/cache/mod_disk_cache',
+    'gentoo'  => '/var/cache/apache2/mod_disk_cache',
   }
 
   $mod_name = $::osfamily ? {
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 18a226ee53..8dc26e5e6b 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -59,6 +59,11 @@
         apache_version => $apache_version,
       }
     }
+    'gentoo': {
+      ::portage::makeconf { 'apache2_mpms':
+        content => 'event',
+      }
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 49794945d4..2be7d832db 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -48,6 +48,11 @@
         apache_version => $apache_version,
       }
     }
+    'gentoo': {
+      ::portage::makeconf { 'apache2_mpms':
+        content => 'itk',
+      }
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 6b9dfad95f..b6a8015f94 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -14,6 +14,12 @@
       fail("Unsupported osfamily ${::osfamily}")
     }
     default: {
+      if $::osfamily == 'gentoo' {
+        ::portage::makeconf { 'apache2_mpms':
+          content => 'peruser',
+        }
+      }
+
       if defined(Class['apache::mod::event']) {
         fail('May not include both apache::mod::peruser and apache::mod::event on the same node')
       }
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 90fa39a89c..035e8818a4 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -65,6 +65,11 @@
         apache_version => $apache_version,
       }
     }
+    'gentoo': {
+      ::portage::makeconf { 'apache2_mpms':
+        content => 'prefork',
+      }
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 279cb64ade..8b910c2510 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -4,7 +4,7 @@
 
   # Add libxml2
   case $::osfamily {
-    /RedHat|FreeBSD/: {
+    /RedHat|FreeBSD|Gentoo/: {
       ::apache::mod { 'xml2enc': }
       $loadfiles = undef
     }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 9e352cbf1b..c1f118f4a8 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -17,6 +17,7 @@
     'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
     'redhat'  => '/var/cache/mod_ssl/scache(512000)',
     'freebsd' => '/var/run/ssl_scache(512000)',
+    'gentoo'  => '/var/run/ssl_scache(512000)',
   }
 
   case $::osfamily {
@@ -35,6 +36,9 @@
     'freebsd': {
       $ssl_mutex = 'default'
     }
+    'gentoo': {
+      $ssl_mutex = 'default'
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 48d1c9f229..02a1beae37 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -67,6 +67,11 @@
         apache_version => $apache_version,
       }
     }
+    'gentoo': {
+      ::portage::makeconf { 'apache2_mpms':
+        content => 'worker',
+      }
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/manifests/params.pp b/manifests/params.pp
index add2d94aed..386fec3c14 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -347,6 +347,67 @@
     $wsgi_socket_prefix   = undef
     $docroot              = '/usr/local/www/apache24/data'
     $error_documents_path = '/usr/local/www/apache24/error'
+  } elsif $::osfamily == 'Gentoo' {
+    $user             = 'apache'
+    $group            = 'apache'
+    $root_group       = 'wheel'
+    $apache_name      = 'www-servers/apache'
+    $service_name     = 'apache2'
+    $httpd_dir        = '/etc/apache2'
+    $server_root      = '/var/www'
+    $conf_dir         = $httpd_dir
+    $confd_dir        = "${httpd_dir}/conf.d"
+    $mod_dir          = "${httpd_dir}/modules.d"
+    $mod_enable_dir   = undef
+    $vhost_dir        = "${httpd_dir}/vhosts.d"
+    $vhost_enable_dir = undef
+    $conf_file        = 'httpd.conf'
+    $ports_file       = "${conf_dir}/ports.conf"
+    $logroot          = '/var/log/apache2'
+    $logroot_mode     = undef
+    $lib_path         = '/usr/lib/apache2/modules'
+    $mpm_module       = 'prefork'
+    $dev_packages     = undef
+    $default_ssl_cert = '/etc/ssl/apache2/server.crt'
+    $default_ssl_key  = '/etc/ssl/apache2/server.key'
+    $ssl_certs_dir    = '/etc/ssl/apache2'
+    $passenger_root   = '/usr'
+    $passenger_ruby   = '/usr/bin/ruby'
+    $passenger_conf_file = 'passenger.conf'
+    $passenger_conf_package_file = undef
+    $passenger_default_ruby = undef
+    $suphp_addhandler = 'x-httpd-php'
+    $suphp_engine     = 'off'
+    $suphp_configpath = '/etc/php5/apache2'
+    $mod_packages     = {
+      # NOTE: I list here only modules that are not included in www-servers/apache
+      'auth_kerb'  => 'www-apache/mod_auth_kerb',
+      'fcgid'      => 'www-apache/mod_fcgid',
+      'passenger'  => 'www-apache/passenger',
+      'perl'       => 'www-apache/mod_perl',
+      'php5'       => 'dev-lang/php',
+      'proxy_html' => 'www-apache/mod_proxy_html',
+      'proxy_fcgi' => 'www-apache/mod_proxy_fcgi',
+      'python'     => 'www-apache/mod_python',
+      'wsgi'       => 'www-apache/mod_wsgi',
+      'dav_svn'    => 'dev-vcs/subversion',
+      'xsendfile'  => 'www-apache/mod_xsendfile',
+      'rpaf'       => 'www-apache/mod_rpaf',
+      'xml2enc'    => 'www-apache/mod_xml2enc',
+    }
+    $mod_libs         = {
+      'php5' => 'libphp5.so',
+    }
+    $conf_template        = 'apache/httpd.conf.erb'
+    $keepalive            = 'Off'
+    $keepalive_timeout    = 15
+    $max_keepalive_requests = 100
+    $fastcgi_lib_path     = undef # TODO: revisit
+    $mime_support_package = 'app-misc/mime-types'
+    $mime_types_config    = '/etc/mime.types'
+    $wsgi_socket_prefix   = undef
+    $docroot              = '/var/www/localhost/htdocs'
+    $error_documents_path = '/usr/share/apache2/error'
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
diff --git a/manifests/version.pp b/manifests/version.pp
index 7f1da0f071..ce3b907694 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -30,6 +30,9 @@
     'FreeBSD': {
       $default = '2.4'
     }
+    'Gentoo': {
+      $default = '2.4'
+    }
     default: {
       fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
     }
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 76e5cd612f..0a7d67bbb0 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -11,6 +11,9 @@
   when 'FreeBSD'
     package_name = 'apache24'
     service_name = 'apache24'
+  when 'Gentoo'
+    package_name = 'www-servers/apache'
+    service_name = 'apache2'
   end
 
   context 'default parameters' do
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index f06a966af9..0199f180b3 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -10,6 +10,9 @@
 when 'FreeBSD'
   mod_dir     = '/usr/local/etc/apache24/Modules'
   servicename = 'apache24'
+when 'Gentoo'
+  mod_dir     = '/etc/apache2/modules.d'
+  servicename = 'apache2'
 end
 
 describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
@@ -100,7 +103,7 @@ class { 'apache':
     it 'should apply with no errors' do
       pp = <<-EOS
         class { 'apache': default_mods => false }
-        ::apache::mod { 'auth_basic': 
+        ::apache::mod { 'auth_basic':
           loadfile_name => 'zz_auth_basic.load',
         }
       EOS
diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
index 668897c049..3b505bdbfd 100644
--- a/spec/acceptance/mod_deflate_spec.rb
+++ b/spec/acceptance/mod_deflate_spec.rb
@@ -11,6 +11,9 @@
   when 'FreeBSD'
     mod_dir      = '/usr/local/etc/apache24/Modules'
     service_name = 'apache24'
+  when 'Gentoo'
+    mod_dir      = '/etc/apache2/modules.d'
+    service_name = 'apache2'
   end
 
   context "default deflate config" do
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index 6bd959ce3a..d1886c4bde 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -11,6 +11,9 @@
   when 'FreeBSD'
     mod_dir      = '/usr/local/etc/apache24/Modules'
     service_name = 'apache24'
+  when 'Gentoo'
+    mod_dir      = '/etc/apache2/modules.d'
+    service_name = 'apache2'
   end
 
   context "default mime config" do
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
index 371ab0f1d6..a44edbf268 100644
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -14,6 +14,10 @@
     vhost_dir    = '/usr/local/etc/apache24/Vhosts'
     mod_dir      = '/usr/local/etc/apache24/Modules'
     service_name = 'apache24'
+  when 'Gentoo'
+    vhost_dir    = '/etc/apache2/vhosts.d'
+    mod_dir      = '/etc/apache2/modules.d'
+    service_name = 'apache2'
   end
 
   context "default negotiation config" do
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 24b6807946..5fa342e9ae 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -14,6 +14,10 @@
     vhost_dir    = '/usr/local/etc/apache24/Vhosts'
     mod_dir      = '/usr/local/etc/apache24/Modules'
     service_name = 'apache24'
+  when 'Gentoo'
+    vhost_dir    = '/etc/apache2/vhosts.d'
+    mod_dir      = '/etc/apache2/modules.d'
+    service_name = 'apache2'
   end
 
   context "default pagespeed config" do
@@ -30,7 +34,7 @@ class { 'apt': }
             repos       => 'main',
             include_src => false,
             before      => Class['apache'],
-          } 
+          }
         } elsif $::osfamily == 'RedHat' {
          yumrepo { 'mod-pagespeed':
           baseurl  => "http://dl.google.com/linux/mod-pagespeed/rpm/stable/$::architecture",
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 28da68d3af..502ec1ddcd 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -14,6 +14,10 @@
     vhost_dir    = '/usr/local/etc/apache24/Vhosts'
     mod_dir      = '/usr/local/etc/apache24/Modules'
     service_name = 'apache24'
+  when 'Gentoo'
+    vhost_dir    = '/etc/apache2/vhosts.d'
+    mod_dir      = '/etc/apache2/modules.d'
+    service_name = 'apache2'
   end
 
   context "default php config" do
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index 91bb0a097c..e456000890 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -8,6 +8,8 @@
     service_name = 'httpd'
   when 'FreeBSD'
     service_name = 'apache24'
+  when 'Gentoo'
+    service_name = 'apache2'
   end
 
   context "default proxy_html config" do
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 5ed8726d63..0ac27232d3 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -7,6 +7,8 @@
   servicename = 'apache2'
 when 'FreeBSD'
   servicename = 'apache24'
+when 'Gentoo'
+  servicename = 'apache2'
 end
 
 case fact('osfamily')
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index 098b0f41c3..117e23d9fe 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -56,6 +56,19 @@
   $error_log        = 'http-error.log'
 
   $apache_version = '2.2'
+when 'Gentoo'
+  $confd_dir        = '/etc/apache2/conf.d'
+  $mod_dir          = '/etc/apache2/modules.d'
+  $conf_file        = '/etc/apache2/httpd.conf'
+  $ports_file       = '/etc/apache2/ports.conf'
+  $vhost            = '/etc/apache2/vhosts.d/15-default.conf'
+  $vhost_dir        = '/etc/apache2/vhosts.d'
+  $run_dir          = '/var/run/apache2'
+  $service_name     = 'apache2'
+  $package_name     = 'www-servers/apache'
+  $error_log        = 'http-error.log'
+
+  $apache_version = '2.4'
 else
   $apache_version = '0'
 end
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index ebe267d7ad..a9fe707cf7 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -613,6 +613,48 @@
       ) }
     end
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_user("apache") }
+    it { is_expected.to contain_group("apache") }
+    it { is_expected.to contain_class("apache::service") }
+    it { is_expected.to contain_file("/var/www/localhost/htdocs").with(
+      'ensure'  => 'directory'
+      )
+    }
+    it { is_expected.to contain_file("/etc/apache2/vhosts.d").with(
+      'ensure'  => 'directory',
+      'recurse' => 'true',
+      'purge'   => 'true',
+      'notify'  => 'Class[Apache::Service]',
+      'require' => 'Package[httpd]'
+    ) }
+    it { is_expected.to contain_file("/etc/apache2/modules.d").with(
+      'ensure'  => 'directory',
+      'recurse' => 'true',
+      'purge'   => 'true',
+      'notify'  => 'Class[Apache::Service]',
+      'require' => 'Package[httpd]'
+    ) }
+    it { is_expected.to contain_concat("/etc/apache2/ports.conf").with(
+      'owner'   => 'root',
+      'group'   => 'wheel',
+      'mode'    => '0644',
+      'notify'  => 'Class[Apache::Service]'
+    ) }
+  end
   context 'on all OSes' do
     let :facts do
       {
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 83292b1b15..09a031a394 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -42,4 +42,19 @@
     end
     it { is_expected.to contain_class("apache::params") }
   end
+  context "on a Gentoo OS" do
+    let :pre_condition do
+      'include apache::package'
+    end
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+  end
 end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 8f82ff4dd4..beba378a9d 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -56,4 +56,21 @@
     it { is_expected.to contain_apache__mod("auth_kerb") }
     it { is_expected.to contain_package("www/mod_auth_kerb2") }
   end
+  context "on a Gentoo OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("auth_kerb") }
+    it { is_expected.to contain_package("www-apache/mod_auth_kerb") }
+  end
 end
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 791baae03c..06c6b870f2 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -59,4 +59,21 @@
     it { is_expected.to contain_apache__mod('dav_svn') }
     it { is_expected.to contain_package("devel/subversion") }
   end
+  context "on a Gentoo OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :kernel                 => 'Linux',
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('dav_svn') }
+    it { is_expected.to contain_package("dev-vcs/subversion") }
+  end
 end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 2eb6f5e8ad..d0d8fedc21 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -100,4 +100,27 @@ class { "apache::mod::deflate":
       :path   => '/usr/local/etc/apache24/Modules/deflate.conf',
     } ) }
   end
+
+  context "On a Gentoo OS with default params" do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+
+    # Load the more generic tests for this context
+    general_deflate_specs()
+
+    it { is_expected.to contain_file("deflate.conf").with({
+      :ensure => 'file',
+      :path   => '/etc/apache2/modules.d/deflate.conf',
+    } ) }
+  end
 end
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 8aec59fed0..11622a41cb 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -103,4 +103,36 @@
       it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
     end
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    context "passing no parameters" do
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('dir') }
+      it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+    end
+    context "passing indexes => ['example.txt','fearsome.aspx']" do
+      let :params do
+        {:indexes => ['example.txt','fearsome.aspx']}
+      end
+      it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
+      it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+    end
+  end
 end
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 796b6c3931..dd0a427eaf 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -21,6 +21,23 @@
     it { is_expected.not_to contain_apache__mod('event') }
     it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/event.conf").with_ensure('file') }
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('event') }
+    it { is_expected.to contain_file("/etc/apache2/modules.d/event.conf").with_ensure('file') }
+  end
   context "on a Debian OS" do
     let :facts do
       {
@@ -58,7 +75,7 @@
           :maxconnectionsperchild => '10',
         }
       end
-    
+
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxClients\s*2/) }
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 214ec75bea..f772ff7a25 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -114,4 +114,23 @@
     it { is_expected.to contain_apache__mod('fcgid') }
     it { is_expected.to contain_package("www/mod_fcgid") }
   end
+
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily                  => 'Gentoo',
+        :operatingsystem           => 'Gentoo',
+        :operatingsystemrelease    => '3.16.1-gentoo',
+        :concat_basedir            => '/dne',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('fcgid') }
+    it { is_expected.to contain_package("www-apache/mod_fcgid") }
+  end
 end
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 32c6339dd9..b444bc0037 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -197,4 +197,26 @@ def general_info_specs_24
     } ) }
   end
 
+  context 'on a Gentoo OS' do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+
+    # Load the more generic tests for this context
+    general_info_specs_24()
+
+    it { is_expected.to contain_file('info.conf').with({
+      :ensure => 'file',
+      :path   => '/etc/apache2/modules.d/info.conf',
+    } ) }
+  end
 end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 9c9935939e..619c8f4f1e 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -257,4 +257,21 @@
     it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("www/rubygem-passenger") }
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_package("www-apache/passenger") }
+  end
 end
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 5bfe8ff2d2..17ee1b366b 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -56,4 +56,21 @@
     it { is_expected.to contain_apache__mod('perl') }
     it { is_expected.to contain_package("www/mod_perl2") }
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :operatingsystem        => 'Gentoo',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('perl') }
+    it { is_expected.to contain_package("www-apache/mod_perl") }
+  end
 end
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index d38f8bba62..f39cbcf6c4 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -23,4 +23,21 @@
       }.to raise_error(Puppet::Error, /Unsupported osfamily FreeBSD/)
     end
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('peruser') }
+    it { is_expected.to contain_file("/etc/apache2/modules.d/peruser.conf").with_ensure('file') }
+  end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index f2dbfb1a91..246b3bbd49 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -155,6 +155,39 @@
       it { is_expected.to contain_file('php5.load') }
     end
   end
+  describe "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    context "with mpm_module => prefork" do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("dev-lang/php") }
+      it { is_expected.to contain_file('php5.load') }
+    end
+    context "with mpm_module => itk" do
+      let :pre_condition do
+        'class { "apache": mpm_module => itk, }'
+      end
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::itk') }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("dev-lang/php") }
+      it { is_expected.to contain_file('php5.load') }
+    end
+  end
   describe "OS independent tests" do
     let :facts do
       {
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 58c06e0bda..3e2954fc71 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -114,4 +114,21 @@
     it { is_expected.not_to contain_apache__mod('prefork') }
     it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/prefork.conf").with_ensure('file') }
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('prefork') }
+    it { is_expected.to contain_file("/etc/apache2/modules.d/prefork.conf").with_ensure('file') }
+  end
 end
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index ce3e70c3a9..80106931e0 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -85,4 +85,21 @@
     it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
     it { is_expected.to contain_package("www/mod_proxy_html") }
   end
+  context "on a Gentoo OS", :compile do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
+    it { is_expected.to contain_package("www-apache/mod_proxy_html") }
+  end
 end
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 9b6d846de0..46c4cde3a2 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -56,4 +56,21 @@
     it { is_expected.to contain_apache__mod("python") }
     it { is_expected.to contain_package("www/mod_python3") }
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod("python") }
+    it { is_expected.to contain_package("www-apache/mod_python") }
+  end
 end
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index 97aa7db453..1869eb68dc 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -112,4 +112,39 @@
       it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600$/) }
     end
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    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
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index d2d5c342d1..83591bc282 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -68,6 +68,46 @@
     }) }
     it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
 
+    describe "with sethostname => true" do
+      let :params do
+        { :sethostname => 'true' }
+      end
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+    end
+    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
+      let :params do
+        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
+      end
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+    end
+    describe "with header => X-Real-IP" do
+      let :params do
+        { :header => 'X-Real-IP' }
+      end
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+    end
+  end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('rpaf') }
+    it { is_expected.to contain_package("www-apache/mod_rpaf") }
+    it { is_expected.to contain_file('rpaf.conf').with({
+      'path' => '/etc/apache2/modules.d/rpaf.conf',
+    }) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index a657567abe..217c9ee8ba 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -83,6 +83,23 @@
     it { is_expected.to contain_apache__mod('ssl') }
   end
 
+  context 'on a Gentoo OS' do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('ssl') }
+  end
+
   # Template config doesn't vary by distro
   context "on all distros" do
     let :facts do
@@ -123,6 +140,5 @@
       it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLRandomSeed startup file:\/dev\/random 256$/)}
       it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLRandomSeed connect file:\/dev\/urandom 1024$/)}
     end
-
   end
 end
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index bb99a0fe65..38a79aeb26 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -114,6 +114,23 @@
     it { is_expected.not_to contain_apache__mod('worker') }
     it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/worker.conf").with_ensure('file') }
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('worker') }
+    it { is_expected.to contain_file("/etc/apache2/modules.d/worker.conf").with_ensure('file') }
+  end
 
   # Template config doesn't vary by distro
   context "on all distros" do
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index e8dd00db0a..3f03ec907f 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -124,4 +124,24 @@
     }
     it { is_expected.to contain_package("www/mod_wsgi") }
   end
+  context "on a Gentoo OS" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => nil
+      )
+    }
+    it { is_expected.to contain_package("www-apache/mod_wsgi") }
+  end
 end
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index ef3504d19e..09906b0d35 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -94,7 +94,7 @@
   end
 
 
-  context "on a RedHat 5 OS" do
+  context "on a RedHat 5 OS, do not manage service" do
     let :facts do
       {
         :osfamily               => 'RedHat',
@@ -107,12 +107,16 @@
         :is_pe                  => false,
       }
     end
-    it { is_expected.to contain_service("httpd").with(
-      'name'      => 'httpd',
-      'ensure'    => 'running',
-      'enable'    => 'true'
-      )
-    }
+    let(:params) do
+      {
+        'service_ensure' => 'running',
+        'service_name'   => 'httpd',
+        'service_manage' => false
+      }
+    end
+    it 'should not manage the httpd service' do
+      subject.should_not contain_service('httpd')
+    end
   end
 
   context "on a FreeBSD 5 OS" do
@@ -136,29 +140,24 @@
     }
   end
 
-  context "on a RedHat 5 OS, do not manage service" do
+  context "on a Gentoo OS" do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '5',
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
         :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
         :id                     => 'root',
         :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
         :is_pe                  => false,
       }
     end
-    let(:params) do
-      {
-        'service_ensure' => 'running',
-        'service_name'   => 'httpd',
-        'service_manage' => false
-      }
-    end
-    it 'should not manage the httpd service' do
-      subject.should_not contain_service('httpd')
-    end
+    it { is_expected.to contain_service("httpd").with(
+      'name'      => 'apache2',
+      'ensure'    => 'running',
+      'enable'    => 'true'
+      )
+    }
   end
-
 end
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index efb913e6b0..1a6d3199c4 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -72,6 +72,27 @@
         :path   => "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf"
       ) }
     end
+    context "on Gentoo systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'Gentoo',
+          :operatingsystem        => 'Gentoo',
+          :operatingsystemrelease => '3.16.1-gentoo',
+          :concat_basedir         => '/dne',
+          :kernel                 => 'Linux',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :facts do default_facts end
+      it { should contain_class("apache") }
+      it { should contain_class("apache::mod::fastcgi") }
+      it { should contain_file("fastcgi-pool-#{title}.conf").with(
+        :ensure => 'present',
+        :path   => "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf"
+      ) }
+    end
   end
   describe 'os-independent items' do
     let :facts do
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index 3700b0edb4..e4e9845290 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -118,4 +118,35 @@
       end
     end
   end
+
+  context "on a Gentoo osfamily" do
+    let :facts do
+      {
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+
+    describe "for non-special modules" do
+      let :title do
+        'spec_m'
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it "should manage the module load file" do
+        is_expected.to contain_file('spec_m.load').with({
+          :path    => '/etc/apache2/modules.d/spec_m.load',
+          :content => "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
+          :owner   => 'root',
+          :group   => 'wheel',
+          :mode    => '0644',
+        } )
+      end
+    end
+  end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 2e77391a13..d2153a605b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -82,6 +82,28 @@
         :path   => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf'
       ) }
     end
+    context "on Gentoo systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'Gentoo',
+          :operatingsystem        => 'Gentoo',
+          :operatingsystemrelease => '3.16.1-gentoo',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :params do default_params end
+      let :facts do default_facts end
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
+        :ensure => 'present',
+        :path   => '/etc/apache2/vhosts.d/25-rspec.example.com.conf'
+      ) }
+    end
   end
   describe 'os-independent items' do
     let :facts do

From 25be287baff98b7d72b31d837a7697a299eff39f Mon Sep 17 00:00:00 2001
From: Eric Shamow <eric.shamow@gmail.com>
Date: Tue, 30 Sep 2014 19:53:34 -0700
Subject: [PATCH 0538/2267] (#1391) Correct Ubuntu Trusty mod_prefork package
 name

This module calls apache2-prefork-dev as the package
name for the mod_prefork module for all Debian-flavored Linuxes. However
Ubuntu 14.04 changes this to apache2-dev and makes apache2-prefork-dev
an alias.

The result is that calling this resource, even with the package
installed, always results in a package changed purged to present
message, as it's scanning dpkg for apache2-prefork-dev, finding the
package missing, and then installing the alias via apt.
---
 manifests/params.pp      |  6 +++++-
 spec/classes/dev_spec.rb | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 23ebeb1ba1..80675a3530 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -168,7 +168,6 @@
     $logroot_mode        = undef
     $lib_path            = '/usr/lib/apache2/modules'
     $mpm_module          = 'worker'
-    $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
     $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
     $ssl_certs_dir       = '/etc/ssl/certs'
@@ -234,6 +233,11 @@
       'base_rules/modsecurity_crs_60_correlation.conf'
     ]
     $error_documents_path = '/usr/share/apache2/error'
+    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) {
+      $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
+    } else {
+      $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
+    }
 
     #
     # Passenger-specific settings
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 09a031a394..6857132a15 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -16,6 +16,16 @@
     it { is_expected.to contain_package("libapr1-dev") }
     it { is_expected.to contain_package("apache2-prefork-dev") }
   end
+  context "on an Ubuntu 14 OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Ubuntu',
+        :operatingsystemrelease => '14.04',
+      }
+    end
+    it { is_expected.to contain_package("apache2-dev") }
+  end
   context "on a RedHat OS" do
     let :facts do
       {

From d5329d63a90991df44633b18bf367f43440a5337 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 25 Feb 2015 16:48:14 -0800
Subject: [PATCH 0539/2267] Add facts to work with strict variables.

---
 spec/classes/dev_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 6857132a15..e2e0b47af8 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -19,9 +19,12 @@
   context "on an Ubuntu 14 OS" do
     let :facts do
       {
+        :lsbdistrelease         => '14.04',
+        :lsbdistcodename        => 'trusty',
         :osfamily               => 'Debian',
         :operatingsystem        => 'Ubuntu',
         :operatingsystemrelease => '14.04',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_package("apache2-dev") }

From 47f900759fa417572fbb0f6e5f9509474808eb6e Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu, 26 Feb 2015 13:09:25 +0100
Subject: [PATCH 0540/2267] (#1391) Correct Debian jessie mod_prefork dev
 package name

This module calls apache2-prefork-dev as the package
name for the mod_prefork module for all Debian-flavored Linuxes. However
Ubuntu 14.04 changes this to apache2-dev and makes apache2-prefork-dev
an alias.

The result is that calling this resource, even with the package
installed, always results in a package changed purged to present
message, as it's scanning dpkg for apache2-prefork-dev, finding the
package missing, and then installing the alias via apt.

Relates to 25be287baf for the Ubuntu part
---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 80675a3530..54b74e64bc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -233,7 +233,7 @@
       'base_rules/modsecurity_crs_60_correlation.conf'
     ]
     $error_documents_path = '/usr/share/apache2/error'
-    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) {
+    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
       $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
     } else {
       $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']

From a99f0f7aa44c3a7a94200476b1d01abc47c924f4 Mon Sep 17 00:00:00 2001
From: grafjo <graf.johannes@gmail.com>
Date: Thu, 26 Feb 2015 14:00:24 +0100
Subject: [PATCH 0541/2267] Fixed vhost proxy_pass params documentation

brace was missing
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1009527ddd..2fcc25f0c5 100644
--- a/README.md
+++ b/README.md
@@ -1307,7 +1307,7 @@ apache::vhost { 'site.name.fdqn':
   proxy_pass => [
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
-    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300},
+    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
     { 'path' => '/d', 'url' => 'http://backend-a/d',

From 29bc0b3b53cbb482741321c7fa169b787605abde Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@ciao.leguide.com>
Date: Thu, 26 Feb 2015 14:46:52 +0100
Subject: [PATCH 0542/2267] Add tests for allow, deny, order and satisfy
 deprecation validation

---
 spec/defines/vhost_spec.rb | 96 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 2e77391a13..35240e7648 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -354,12 +354,14 @@
               'provider' => 'files',
               'allow'    => [ 'from 127.0.0.1', 'from 127.0.0.2', ],
               'deny'     => [ 'from 127.0.0.3', 'from 127.0.0.4', ],
+              'satisfy'  => 'any',
             },
             {
               'path'     => '/var/www/foo',
               'provider' => 'files',
               'allow'    => 'from 127.0.0.5',
               'deny'     => 'from all',
+              'order'    => 'deny,allow',
             },
           ],
 
@@ -419,6 +421,10 @@
         :content => /^\s+Deny from 127\.0\.0\.4$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Deny from all$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Satisfy any$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Order deny,allow$/ ) }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
@@ -728,4 +734,94 @@
       it { expect { is_expected.to compile }.to raise_error }
     end
   end
+  describe 'allow/deny/order/satisfy deprecation validation' do
+    let :default_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',
+        :is_pe                  => false,
+      }
+    end
+    context 'bad allow parameter' do
+      let :params do
+        {
+          'docroot'        => '/var/www/files',
+          'apache_version' => '2.4',
+          'directories'    => {
+            'path'     => '/var/www/files',
+            'provider' => 'files',
+            'allow'    => 'from 127.0.0.1',
+          },
+        }
+      end
+      let :facts do default_facts end
+      it do
+        expect {
+          should contain_concat__fragment('rspec.example.com-directories')
+        }.to raise_error(Puppet::Error)
+      end
+    end
+    context 'bad deny parameter' do
+      let :params do
+        {
+          'docroot'        => '/var/www/files',
+          'apache_version' => '2.4',
+          'directories'    => {
+            'path'     => '/var/www/files',
+            'provider' => 'files',
+            'deny'     => 'from 127.0.0.1',
+          },
+        }
+      end
+      let :facts do default_facts end
+      it do
+        expect {
+          should contain_concat__fragment('rspec.example.com-directories')
+        }.to raise_error(Puppet::Error)
+      end
+    end
+    context 'bad satisfy parameter' do
+      let :params do
+        {
+          'docroot'        => '/var/www/files',
+          'apache_version' => '2.4',
+          'directories'    => {
+            'path'     => '/var/www/files',
+            'provider' => 'files',
+            'satisfy'  => 'any',
+          },
+        }
+      end
+      let :facts do default_facts end
+      it do
+        expect {
+          should contain_concat__fragment('rspec.example.com-directories')
+        }.to raise_error(Puppet::Error)
+      end
+    end
+    context 'bad order parameter' do
+      let :params do
+        {
+          'docroot'        => '/var/www/files',
+          'apache_version' => '2.4',
+          'directories'    => {
+            'path'     => '/var/www/files',
+            'provider' => 'files',
+            'order'    => 'deny,allow',
+          },
+        }
+      end
+      let :facts do default_facts end
+      it do
+        expect {
+          should contain_concat__fragment('rspec.example.com-directories')
+        }.to raise_error(Puppet::Error)
+      end
+    end
+  end
 end

From 49ae67227d7c7bbb6393db6c8adfed18bf9ffbc3 Mon Sep 17 00:00:00 2001
From: Tyler Antonio <tantonio@ualberta.ca>
Date: Thu, 26 Feb 2015 08:46:25 -0700
Subject: [PATCH 0543/2267] Corrected error in documentation for ssl_protocol
 and ssl_cipher.

---
 README.md | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 1009527ddd..2dd6fbd1ed 100644
--- a/README.md
+++ b/README.md
@@ -747,7 +747,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
       ssl_compression        => false,
       ssl_options            => [ 'StdEnvVars' ],
       ssl_cipher             => 'HIGH:MEDIUM:!aNULL:!MD5',
-      ssl_protocol           => 'all -SSLv2 -SSLv3',
+      ssl_protocol           => [ 'all', '-SSLv2', '-SSLv3' ],
       ssl_pass_phrase_dialog => 'builtin',
       ssl_random_seeds       => [
         'startup builtin',
@@ -2020,15 +2020,11 @@ Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/ce
 
 #####`ssl_protocol`
 
-Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'.
-
-If you do not use this parameter, it uses the HTTPD default from ssl.conf.erb, 'all -SSLv2 -SSLv3'.
+Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array of accepted protocols. Defaults to 'all', '-SSLv2', '-SSLv3'.
 
 #####`ssl_cipher`
 
-Specifies [SSLCipherSuite](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Defaults to 'undef'.
-
-If you do not use this parameter, it uses the HTTPD default from ssl.conf.erb, 'HIGH:MEDIUM:!aNULL:!MD5'.
+Specifies [SSLCipherSuite](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Defaults to 'HIGH:MEDIUM:!aNULL:!MD5'.
 
 #####`ssl_honorcipherorder`
 

From 3abb4c24b8ad652dced9b28904e8cc9252609e0f Mon Sep 17 00:00:00 2001
From: Niek Beernink <n.beernink@oxilion.nl>
Date: Wed, 26 Nov 2014 11:15:57 +0100
Subject: [PATCH 0544/2267] make icons directorylisting configurable

---
 README.md                    | 16 +++++++++++++++-
 manifests/mod/alias.pp       |  3 ++-
 templates/mod/alias.conf.erb |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9bc6e8d670..f61346f0fc 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@
         * [Class: apache::default_mods](#class-apachedefault_mods)
         * [Defined Type: apache::mod](#defined-type-apachemod)
         * [Classes: apache::mod::*](#classes-apachemodname)
+        * [Class: apache::mod::alias](#class-apachemodalias)
         * [Class: apache::mod::event](#class-apachemodevent)
         * [Class: apache::mod::info](#class-apachemodinfo)
         * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
@@ -517,7 +518,7 @@ Used to enable arbitrary Apache HTTPD modules for which there is no specific `ap
 There are many `apache::mod::[name]` classes within this module that can be declared using `include`:
 
 * `actions`
-* `alias`
+* `alias`(see [`apache::mod::alias`](#class-apachemodalias) below)
 * `auth_basic`
 * `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas) below)
 * `auth_kerb`
@@ -579,6 +580,19 @@ Modules noted with a * indicate that the module has settings and, thus, a templa
 
 The modules mentioned above, and other Apache modules that have templates, cause template files to be dropped along with the mod install. The module will not work without the template. Any module without a template installs the package but drops no files.
 
+###Class: `apache::mod::alias`
+
+Installs and manages the alias module.
+
+Full Documentation for alias is available from [Apache](https://httpd.apache.org/docs/current/mod/mod_alias.html).
+
+To disable directory listing for the icons directory:
+```puppet
+  class { 'apache::mod::alias':
+    icons_options => 'None',
+  }
+```
+
 ####Class:  `apache::mod::event`
 
 Installs and manages mpm_event module.
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index ca3f226b38..c1f60fd62e 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,5 +1,6 @@
 class apache::mod::alias(
-  $apache_version = $apache::apache_version
+  $apache_version = $apache::apache_version,
+  $icons_options  = 'Indexes MultiViews',
 ) {
   $ver24 = versioncmp($apache_version, '2.4') >= 0
 
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
index 151a806c9f..2056476e82 100644
--- a/templates/mod/alias.conf.erb
+++ b/templates/mod/alias.conf.erb
@@ -1,7 +1,7 @@
 <IfModule alias_module>
 Alias /icons/ "<%= @icons_path %>/"
 <Directory "<%= @icons_path %>">
-    Options Indexes MultiViews
+    Options <%= @icons_options %>
     AllowOverride None
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require all granted

From c6568bce5634cc269e439c5191492196c51f3de5 Mon Sep 17 00:00:00 2001
From: Jochen Haeberle <jh@sensano.com>
Date: Fri, 2 Jan 2015 18:31:51 +0100
Subject: [PATCH 0545/2267] allow some include apache::mod:: statements needed
 for basic_auth. The modules could not be inclued if you set default_mods =>
 false.

---
 manifests/mod/authn_file.pp    | 3 +++
 manifests/mod/authz_default.pp | 3 +++
 manifests/mod/authz_user.pp    | 3 +++
 3 files changed, 9 insertions(+)
 create mode 100644 manifests/mod/authn_file.pp
 create mode 100644 manifests/mod/authz_default.pp
 create mode 100644 manifests/mod/authz_user.pp

diff --git a/manifests/mod/authn_file.pp b/manifests/mod/authn_file.pp
new file mode 100644
index 0000000000..bc787244a2
--- /dev/null
+++ b/manifests/mod/authn_file.pp
@@ -0,0 +1,3 @@
+class apache::mod::authn_file {
+  ::apache::mod { 'authn_file': }
+}
diff --git a/manifests/mod/authz_default.pp b/manifests/mod/authz_default.pp
new file mode 100644
index 0000000000..23edd9b5ac
--- /dev/null
+++ b/manifests/mod/authz_default.pp
@@ -0,0 +1,3 @@
+class apache::mod::authz_default {
+  ::apache::mod { 'authz_default': }
+}
diff --git a/manifests/mod/authz_user.pp b/manifests/mod/authz_user.pp
new file mode 100644
index 0000000000..948a3e2c97
--- /dev/null
+++ b/manifests/mod/authz_user.pp
@@ -0,0 +1,3 @@
+class apache::mod::authz_user {
+  ::apache::mod { 'authz_user': }
+}

From f134c393d439bc9c0ed91a44e7d649c79aa8d163 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 26 Feb 2015 12:56:47 -0800
Subject: [PATCH 0546/2267] Add docs and update default_mods to use the new
 classes

---
 README.md                 | 3 +++
 manifests/default_mods.pp | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9bc6e8d670..e6f43b751c 100644
--- a/README.md
+++ b/README.md
@@ -521,7 +521,10 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `auth_basic`
 * `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas) below)
 * `auth_kerb`
+* `authn_file`
 * `authnz_ldap`*
+* `authz_default`
+* `authz_user`
 * `autoindex`
 * `cache`
 * `cgi`
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index b600b1be7c..a05b5f81e6 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -118,6 +118,7 @@
       }
     }
     include ::apache::mod::alias
+    include ::apache::mod::authn_file
     include ::apache::mod::autoindex
     include ::apache::mod::dav
     include ::apache::mod::dav_fs
@@ -127,7 +128,6 @@
     include ::apache::mod::negotiation
     include ::apache::mod::setenvif
     ::apache::mod { 'auth_basic': }
-    ::apache::mod { 'authn_file': }
 
     if versioncmp($apache_version, '2.4') >= 0 {
       # filter is needed by mod_deflate
@@ -141,11 +141,12 @@
       # lots of stuff seems to break without access_compat
       ::apache::mod { 'access_compat': }
     } else {
-      ::apache::mod { 'authz_default': }
+      include ::apache::mod::authz_default
     }
 
+    include ::apache::mod::authz_user
+
     ::apache::mod { 'authz_groupfile': }
-    ::apache::mod { 'authz_user': }
     ::apache::mod { 'env': }
   } elsif $mods {
     ::apache::default_mods::load { $mods: }

From 3886f68511ced54acfc4e8bda4f706a60ed59439 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 26 Feb 2015 11:48:37 -0800
Subject: [PATCH 0547/2267] Adds tests

---
 spec/classes/mod/alias_spec.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 151c37e65a..9bb28b3aa2 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -53,6 +53,30 @@
     it { is_expected.to contain_apache__mod("alias") }
     it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"/) }
   end
+  context "with icons options", :compile do
+    let :pre_condition do
+      'class { apache: default_mods => false }'
+    end
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '7',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    let :params do
+      {
+        'icons_options' => 'foo'
+      }
+    end
+    it { is_expected.to contain_apache__mod("alias") }
+    it { is_expected.to contain_file("alias.conf").with(:content => /Options foo/) }
+  end
   context "on a FreeBSD OS", :compile do
     let :facts do
       {

From 7c6199c43d493223d80ce079cea885769e242ea2 Mon Sep 17 00:00:00 2001
From: Roman Garifullin <r.garifullin@xsolla.com>
Date: Mon, 2 Feb 2015 20:13:47 +0500
Subject: [PATCH 0548/2267] add proper array support for require

now valid access rules are generated from directory template
---
 templates/vhost/_directories.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 423e56f852..3aa42ec93b 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -38,7 +38,9 @@
     <%- end -%>
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       <%- if directory['require'] and directory['require'] != '' -%>
-    Require <%= Array(directory['require']).join(' ') %>
+        <%- Array(directory['require']).each do |require| -%>
+    Require <%= require %>
+        <%- end -%>
       <%- end -%>
       <%- if directory['auth_require'] -%>
     Require <%= directory['auth_require'] %>

From 0780062e0f8bbfce2200e505e0747eeadd095472 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 26 Feb 2015 14:56:45 -0800
Subject: [PATCH 0549/2267] Added tests and cleaned up the template

---
 spec/defines/vhost_spec.rb       | 24 +++++++++++++++++++-----
 templates/vhost/_directories.erb |  4 ++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f294ab2ce5..f230ba9cd7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -173,10 +173,18 @@
           'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
           'access_log_env_var'          => '',
           'aliases'                     => '/image',
-          'directories'                 => {
-            'path'     => '/var/www/files',
-            'provider' => 'files',
-          },
+          'directories'                 => [
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'require'  => [ 'valid-user', 'all denied', ],
+            },
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'require'  => 'all granted',
+            },
+          ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
           'error_log_pipe'              => '',
@@ -277,7 +285,7 @@
       let :facts do
         {
           :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
+          :operatingsystemrelease => '7',
           :concat_basedir         => '/dne',
           :operatingsystem        => 'RedHat',
           :id                     => 'root',
@@ -328,6 +336,12 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require valid-user$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require all denied$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require all granted$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 3aa42ec93b..0bfabd0117 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -38,8 +38,8 @@
     <%- end -%>
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       <%- if directory['require'] and directory['require'] != '' -%>
-        <%- Array(directory['require']).each do |require| -%>
-    Require <%= require %>
+        <%- Array(directory['require']).each do |req| -%>
+    Require <%= req %>
         <%- end -%>
       <%- end -%>
       <%- if directory['auth_require'] -%>

From aef4a7edd87c00be12c145f1d90d6db84d0ebaf4 Mon Sep 17 00:00:00 2001
From: Seth Lyons <slyons@fxcm.com>
Date: Wed, 4 Mar 2015 21:14:24 +0000
Subject: [PATCH 0550/2267] include mod filter when needed instead of
 instantiating it

---
 manifests/default_mods.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index a05b5f81e6..145c4feeb3 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -158,7 +158,7 @@
       }
 
       # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
+      include ::apache::mod::filter
     }
   } else {
     if versioncmp($apache_version, '2.4') >= 0 {
@@ -168,7 +168,7 @@
       }
 
       # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
+      include ::apache::mod::filter
     }
   }
 }

From df3fd8b3f1dcb58de127ae530310353d129cfbf8 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 4 Mar 2015 13:45:08 -0800
Subject: [PATCH 0551/2267] Don't manage docroot when default vhosts are
 disabled

As the code is now, if you set default_vhost or default_ssl_vhost to
false, the docroot directory will still be managed, but you will be
unable to set non-default ownership. Set manage_docroot to the value of
default*_vhost in the vhost resource declarations.
---
 manifests/init.pp           | 2 ++
 spec/classes/apache_spec.rb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index b3da9ff0a5..a001c051b5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -355,6 +355,7 @@
       priority        => '15',
       ip              => $ip,
       logroot_mode    => $logroot_mode,
+      manage_docroot  => $default_vhost,
     }
     $ssl_access_log_file = $::osfamily ? {
       'freebsd' => $access_log_file,
@@ -371,6 +372,7 @@
       priority        => '15',
       ip              => $ip,
       logroot_mode    => $logroot_mode,
+      manage_docroot  => $default_ssl_vhost,
     }
   }
 }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index a9fe707cf7..8dfbe3815a 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -690,6 +690,7 @@
       }
       end
       it { is_expected.to contain_apache__vhost('default').with_ensure('absent') }
+      it { is_expected.not_to contain_file('/var/www/html') }
     end
     context 'with default ssl vhost' do
       let :params do {
@@ -697,6 +698,7 @@
         }
       end
       it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('present') }
+      it { is_expected.to contain_file('/var/www/html') }
     end
   end
   context 'with unsupported osfamily' do

From 58517efdd00a6eb825a1b9f272b581485d13d94c Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Fri, 6 Mar 2015 13:06:24 +0100
Subject: [PATCH 0552/2267] Documentation: fix Quickstart instructions for Ruby
 1.8.7 (Red Hat)

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1683f62f0e..69723a0f3e 100644
--- a/README.md
+++ b/README.md
@@ -2535,9 +2535,14 @@ Read the complete module [contribution guide](https://docs.puppetlabs.com/forge/
 This project contains tests for both [rspec-puppet](http://rspec-puppet.com/) and [beaker-rspec](https://github.com/puppetlabs/beaker-rspec) to verify functionality. For in-depth information please see their respective documentation.
 
 Quickstart:
-
+  Ruby > 1.8.7
     gem install bundler
     bundle install
     bundle exec rake spec
     bundle exec rspec spec/acceptance
     RS_DEBUG=yes bundle exec rspec spec/acceptance
+
+  Ruby = 1.8.7
+    gem install bundler
+    bundle install --without system_tests
+    bundle exec rake spec

From 38ccc5b392085161f2d4caedfeecb9175f855ff1 Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Tue, 17 Feb 2015 13:02:07 +0100
Subject: [PATCH 0553/2267] Style fix

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a001c051b5..4e596c09d0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -54,7 +54,7 @@
   $group                  = $::apache::params::group,
   $keepalive              = $::apache::params::keepalive,
   $keepalive_timeout      = $::apache::params::keepalive_timeout,
-  $max_keepalive_requests = $apache::params::max_keepalive_requests,
+  $max_keepalive_requests = $::apache::params::max_keepalive_requests,
   $logroot                = $::apache::params::logroot,
   $logroot_mode           = $::apache::params::logroot_mode,
   $log_level              = $::apache::params::log_level,

From de5903281b26c2484c1bc5b1aeaed61b6de8a2de Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Fri, 6 Mar 2015 16:40:36 +0100
Subject: [PATCH 0554/2267] Add support for DefaultCharSet directive

---
 README.md                | 4 ++++
 manifests/init.pp        | 1 +
 templates/httpd.conf.erb | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 69723a0f3e..e3a817f7c1 100644
--- a/README.md
+++ b/README.md
@@ -250,6 +250,10 @@ Overrides the template used for the main apache configuration file. Defaults to
 
 *Note:* Using this parameter is potentially risky, as the module has been built for a minimal configuration file with the configuration primarily coming from conf.d/ entries.
 
+#####`default_charset`
+
+If defined, the value will be set as `AddDefaultCharset` in the main configuration file. It is undefined by default.
+
 #####`default_confd_files`
 
 Generates default set of include-able Apache configuration files under  `${apache::confd_dir}` directory. These configuration files correspond to what is usually installed with the Apache package on a given platform.
diff --git a/manifests/init.pp b/manifests/init.pp
index a001c051b5..2bdbeb8bba 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,6 +17,7 @@
   $service_name           = $::apache::params::service_name,
   $default_mods           = true,
   $default_vhost          = true,
+  $default_charset        = undef,
   $default_confd_files    = true,
   $default_ssl_vhost      = false,
   $default_ssl_cert       = $::apache::params::default_ssl_cert,
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 9b889ac508..50d57e29ec 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -30,6 +30,10 @@ AccessFileName .htaccess
   AllowOverride None
 </Directory>
 
+<% if @default_charset -%>
+AddDefaultCharset <%= @default_charset %>
+<% end -%>
+
 DefaultType none
 HostnameLookups Off
 ErrorLog "<%= @logroot %>/<%= @error_log %>"

From 65735038b07418ad734f2d7298c26208200959b0 Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Fri, 6 Mar 2015 17:11:28 +0100
Subject: [PATCH 0555/2267] Add basic test for the default charset

---
 spec/classes/apache_spec.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 8dfbe3815a..6848771c60 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -110,6 +110,14 @@
       it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AllowEncodedSlashes nodecode$} }
     end
 
+    context "when specifying default character set" do
+      let :params do
+        { :default_charset => 'none' }
+      end
+
+      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AddDefaultCharset none$} }
+    end
+
     # Assert that both load files and conf files are placed and symlinked for these mods
     [
       'alias',
@@ -337,6 +345,14 @@
         it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^AllowEncodedSlashes nodecode$} }
       end
 
+      context "when specifying default character set" do
+        let :params do
+          { :default_charset => 'none' }
+        end
+
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^AddDefaultCharset none$} }
+      end
+
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }

From 3f94e6b1235d2432d4d6d0d4a7ed1650121f4841 Mon Sep 17 00:00:00 2001
From: Nate Butler <nathan.butler@gmail.com>
Date: Fri, 6 Mar 2015 13:30:51 -0500
Subject: [PATCH 0556/2267] Ensure resources notify Apache::Service class

(#MODULES-1829) Fix resources that notify Service[httpd]

With the introduction of the service_manage bool, the Service[httpd]
class will not be part of the catalog if false. However there are still
some resources which notify Service[httpd] instead of the wrapper
Apache::Service class and these choke on undefined Service[httpd]
resource if service_manage is false.
---
 README.md                          | 2 +-
 manifests/balancer.pp              | 2 +-
 manifests/custom_config.pp         | 4 ++--
 manifests/mod/auth_cas.pp          | 2 +-
 spec/defines/custom_config_spec.rb | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 69723a0f3e..576cd888f3 100644
--- a/README.md
+++ b/README.md
@@ -2505,7 +2505,7 @@ Something along the lines of:
         exec { 'restorecon_apache':
           command => 'restorecon -Rv /apache_spec',
           path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
+          before  => Class['Apache::Service'],
           require => Class['apache'],
         }
         class { 'apache': }
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index a59b6762b8..765dae6290 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -50,7 +50,7 @@
     owner  => '0',
     group  => '0',
     mode   => '0644',
-    notify => Service['httpd'],
+    notify => Class['Apache::Service'],
   }
 
   concat::fragment { "00-${name}-header":
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 7bd4d3ed8e..ceb1fd077a 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -34,7 +34,7 @@
   $filename = "${priority_prefix}${filename_middle}.conf"
 
   if ! $verify_config or $ensure == 'absent' {
-    $notifies = Service['httpd']
+    $notifies = Class['Apache::Service']
   } else {
     $notifies = undef
   }
@@ -53,7 +53,7 @@
       command     => $verify_command,
       subscribe   => File["apache_${name}"],
       refreshonly => true,
-      notify      => Service['httpd'],
+      notify      => Class['Apache::Service'],
       before      => Exec["remove ${name} if invalid"],
     }
 
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index fdb5ee80a2..5b13af66a2 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -42,7 +42,7 @@
     content => template('apache/mod/auth_cas.conf.erb'),
     require => [ Exec["mkdir ${::apache::mod_dir}"], ],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['Apache::Service'],
   }
 
 }
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index e9650a736b..4a38a1fcf8 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -30,7 +30,7 @@
       'refreshonly' => 'true',
       'subscribe'   => 'File[apache_rspec]',
       'command'     => '/usr/sbin/apachectl -t',
-      'notify'      => 'Service[httpd]',
+      'notify'      => 'Class[Apache::Service]',
       'before'      => 'Exec[remove rspec if invalid]',
     })
     }
@@ -83,7 +83,7 @@
     it { is_expected.to_not contain_exec('service notify for rspec') }
     it { is_expected.to_not contain_exec('remove rspec if invalid') }
     it { is_expected.to contain_file('apache_rspec').with({
-      'notify' => 'Service[httpd]'
+      'notify' => 'Class[Apache::Service]'
     })
     }
   end

From aea676e036e4e3dbffbb3997058d7837f61d3745 Mon Sep 17 00:00:00 2001
From: Josh Baer <jbaer01@gmail.com>
Date: Sun, 8 Mar 2015 12:58:01 +0100
Subject: [PATCH 0557/2267] Fix typo in fallbackresource

Minor change, fallbackresource incorrectly typed as fallbackresouce
---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 0780631bb5..6fe87c5a84 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -381,7 +381,7 @@ class { 'apache': }
 
   case fact('lsbdistcodename')
   when 'precise', 'wheezy'
-    context 'vhost fallbackresouce example' do
+    context 'vhost fallbackresource example' do
       it 'should configure a vhost with Fallbackresource' do
         pp = <<-EOS
         class { 'apache': }

From 78fd5e4618cf2973956d2193d04cd774ebd54246 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Tue, 10 Mar 2015 16:16:50 -0400
Subject: [PATCH 0558/2267] Added missing comma in the aliases example section

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 063c7ec95f..6de64712b9 100644
--- a/README.md
+++ b/README.md
@@ -1053,7 +1053,7 @@ Passes a list of hashes to the vhost to create Alias, AliasMatch, ScriptAlias or
 aliases => [
   { aliasmatch       => '^/image/(.*)\.jpg$',
     path             => '/files/jpg.images/$1.jpg',
-  }
+  },
   { alias            => '/image',
     path             => '/ftp/pub/image',
   },

From 4270df47ac1887211fc50ac88b1ae094bd28917b Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Thu, 6 Mar 2014 09:59:29 +0100
Subject: [PATCH 0559/2267] Apache: give a lower priority to mod_passenger

We need mod_proxy loaded before mod_passenger, load order is alphabetic
unless defined within the Apache httpd module code itself.
For mod_passenger, this isn't defined, mod_proxy also doesn't know about
mod_passenger.
---
 manifests/mod/passenger.pp         |  6 +++---
 manifests/params.pp                |  8 ++++----
 spec/classes/mod/passenger_spec.rb | 24 ++++++++++++------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index e0c35295a8..b6cd9c33c1 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -15,9 +15,9 @@
   $passenger_app_env              = undef,
   $mod_package                    = undef,
   $mod_package_ensure             = undef,
-  $mod_lib                        = undef,
+  $mod_lib                        = 'mod_passenger.so',
   $mod_lib_path                   = undef,
-  $mod_id                         = undef,
+  $mod_id                         = 'passenger_module',
   $mod_path                       = undef,
 ) {
   # Managed by the package, but declare it to avoid purging
@@ -56,7 +56,7 @@
 
   $_id = $mod_id
   $_path = $mod_path
-  ::apache::mod { 'passenger':
+  ::apache::mod { 'zpassenger':
     package        => $_package,
     package_ensure => $_package_ensure,
     lib            => $_lib,
diff --git a/manifests/params.pp b/manifests/params.pp
index 54b74e64bc..937719219b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -82,7 +82,7 @@
         default => undef,
       },
       'pagespeed'   => 'mod-pagespeed-stable',
-      'passenger'   => 'mod_passenger',
+      'zpassenger'   => 'mod_passenger',
       'perl'        => 'mod_perl',
       'php5'        => $::apache::version::distrelease ? {
         '5'     => 'php53',
@@ -182,7 +182,7 @@
       'fcgid'       => 'libapache2-mod-fcgid',
       'nss'         => 'libapache2-mod-nss',
       'pagespeed'   => 'mod-pagespeed-stable',
-      'passenger'   => 'libapache2-mod-passenger',
+      'zpassenger'  => 'libapache2-mod-passenger',
       'perl'        => 'libapache2-mod-perl2',
       'php5'        => 'libapache2-mod-php5',
       'proxy_html'  => 'libapache2-mod-proxy-html',
@@ -331,7 +331,7 @@
       # NOTE: not sure where the shibboleth should come from
       'auth_kerb'  => 'www/mod_auth_kerb2',
       'fcgid'      => 'www/mod_fcgid',
-      'passenger'  => 'www/rubygem-passenger',
+      'zpassenger' => 'www/rubygem-passenger',
       'perl'       => 'www/mod_perl2',
       'php5'       => 'www/mod_php5',
       'proxy_html' => 'www/mod_proxy_html',
@@ -391,7 +391,7 @@
       # NOTE: I list here only modules that are not included in www-servers/apache
       'auth_kerb'  => 'www-apache/mod_auth_kerb',
       'fcgid'      => 'www-apache/mod_fcgid',
-      'passenger'  => 'www-apache/passenger',
+      'zpassenger' => 'www-apache/passenger',
       'perl'       => 'www-apache/mod_perl',
       'php5'       => 'dev-lang/php',
       'proxy_html' => 'www-apache/mod_proxy_html',
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 78823d88b3..01cf78beec 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -20,10 +20,10 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_apache__mod('zpassenger') }
     it { is_expected.to contain_package("libapache2-mod-passenger") }
-    it { is_expected.to contain_file('passenger.load').with({
-      'path' => '/etc/apache2/mods-available/passenger.load',
+    it { is_expected.to contain_file('zpassenger.load').with({
+      'path' => '/etc/apache2/mods-available/zpassenger.load',
     }) }
     it { is_expected.to contain_file('passenger.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
@@ -105,25 +105,25 @@
       let :params do
         { :mod_path => '/usr/lib/foo/mod_foo.so' }
       end
-      it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
+      it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
     end
     describe "with mod_lib_path => '/usr/lib/foo'" do
       let :params do
         { :mod_lib_path => '/usr/lib/foo' }
       end
-      it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
+      it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
     end
     describe "with mod_lib => 'mod_foo.so'" do
       let :params do
         { :mod_lib => 'mod_foo.so' }
       end
-      it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
+      it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
     end
     describe "with mod_id => 'mod_foo'" do
       let :params do
         { :mod_id => 'mod_foo' }
       end
-      it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
+      it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
     end
 
     context "with Ubuntu 12.04 defaults" do
@@ -221,15 +221,15 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_apache__mod('zpassenger') }
     it { is_expected.to contain_package("mod_passenger") }
     it { is_expected.to contain_file('passenger_package.conf').with({
       'path' => '/etc/httpd/conf.d/passenger.conf',
     }) }
     it { is_expected.to contain_file('passenger_package.conf').without_content }
     it { is_expected.to contain_file('passenger_package.conf').without_source }
-    it { is_expected.to contain_file('passenger.load').with({
-      'path' => '/etc/httpd/conf.d/passenger.load',
+    it { is_expected.to contain_file('zpassenger.load').with({
+      'path' => '/etc/httpd/conf.d/zpassenger.load',
     }) }
     it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) }
     it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
@@ -260,7 +260,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_apache__mod('zpassenger') }
     it { is_expected.to contain_package("www/rubygem-passenger") }
   end
   context "on a Gentoo OS" do
@@ -277,7 +277,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_apache__mod('zpassenger') }
     it { is_expected.to contain_package("www-apache/passenger") }
   end
 end

From 6679778d9c30f1b65308775a905b6375e6834939 Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Thu, 12 Mar 2015 10:02:04 +0100
Subject: [PATCH 0560/2267] Allow setting environment variables inside the
 proxy locations

This patch adds support to set variables using 'SetEnv' inside proxy
locations. This is needed to support some backends that don't properly
support HTTP/1.1, as it allows a fallback by the Apache httpd server.
For details see [1] (Apache httpd documentation) and [2] (use case).

[1] http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#envsettings
[2] https://wiki.jenkins-ci.org/display/JENKINS/Running+Jenkins+behind+Apache
---
 README.md                  | 3 +++
 spec/defines/vhost_spec.rb | 7 ++++++-
 templates/vhost/_proxy.erb | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6de64712b9..975e8a0e7c 100644
--- a/README.md
+++ b/README.md
@@ -1335,12 +1335,15 @@ apache::vhost { 'site.name.fdqn':
       'params' => { 'retry' => '0', 'timeout' => '5' }, },
     { 'path' => '/e', 'url' => 'http://backend-a/e',
       'keywords' => ['nocanon', 'interpolate'] },
+    { 'path' => '/f', 'url' => 'http://backend-f/',
+      'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
   ],
 }
 ```
 
 `reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
 `params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
+`setenv` is optional and is an array to set environment variables for the proxy directive, for details see http://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings
 
 #####`rack_base_uris`
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 18e4257c83..cd6c9c5c8e 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -211,7 +211,8 @@
               'params'   => {
                       'retry'   => '0',
                       'timeout' => '5'
-              }
+              },
+              'setenv'   => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'],
             }
           ],
           'suphp_addhandler'            => 'foo',
@@ -353,6 +354,10 @@
               /retry=0/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
               /timeout=5/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /SetEnv force-proxy-request-1.0 1/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /SetEnv proxy-nokeepalive 1/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
               /noquery interpolate/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 58fcc98177..f026c87674 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -25,6 +25,11 @@
     ProxyPassReverse <%= reverse_url %>
     <%- end -%>
   <%- end -%>
+  <%- if proxy['setenv'] -%>
+    <%- Array(proxy['setenv']).each do |setenv_var| -%>
+    SetEnv <%= setenv_var -%>
+    <%- end -%>
+  <%- end -%>
   </Location>
 <% end -%>
 <% if @proxy_dest -%>

From bdbd5344920d5bb1c746e22ba959163eec2ac7ab Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Tue, 3 Mar 2015 14:34:31 +0100
Subject: [PATCH 0561/2267] Remove Debian workaround as it broke Red Hat
 systems

---
 manifests/mod/passenger.pp         | 14 --------------
 spec/classes/mod/passenger_spec.rb |  1 -
 2 files changed, 15 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index e0c35295a8..3409c25c0f 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -25,20 +25,6 @@
     file { 'passenger_package.conf':
       path => "${::apache::mod_dir}/${passenger_conf_package_file}",
     }
-  } else {
-    # Remove passenger_extra.conf left over from before Passenger support was
-    # reworked for Debian. This is a temporary fix for users running this
-    # module from master after release 1.0.1 It will be removed in two
-    # releases from now.
-    $passenger_package_conf_ensure = $::osfamily ? {
-      'Debian' => 'absent',
-      default  => undef,
-    }
-
-    file { 'passenger_package.conf':
-      ensure => $passenger_package_conf_ensure,
-      path   => "${::apache::mod_dir}/passenger_extra.conf",
-    }
   }
 
   $_package = $mod_package
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 78823d88b3..41b5a87817 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -28,7 +28,6 @@
     it { is_expected.to contain_file('passenger.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
-    it { is_expected.to contain_file('passenger_package.conf').with_ensure('absent') }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }

From 97e9352fd6e6908005df7e1a51bd92a5e1b42a60 Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Thu, 12 Mar 2015 16:23:06 +0100
Subject: [PATCH 0562/2267] Apache: allow setting the default type

This setting is only valid on Apache httpd 2.2 (and possibly lower)
---
 README.md                   |  4 +++
 manifests/init.pp           |  1 +
 spec/classes/apache_spec.rb | 66 +++++++++++++++++++++++++++++++++++++
 templates/httpd.conf.erb    |  4 ++-
 4 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6de64712b9..c2a99e5efc 100644
--- a/README.md
+++ b/README.md
@@ -313,6 +313,10 @@ Sets up a default SSL virtual host. Defaults to 'false'. If set to 'true', sets
 
 SSL vhosts only respond to HTTPS queries.
 
+#####`default_type`
+
+(Apache httpd 2.2 only) MIME content-type that will be sent if the server cannot determine a type in any other way. This directive has been deprecated in Apache httpd 2.4, and only exists there for backwards compatibility of configuration files.
+
 #####`default_vhost`
 
 Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
diff --git a/manifests/init.pp b/manifests/init.pp
index 9a9a36b8e3..0b8544f93a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,6 +27,7 @@
   $default_ssl_crl_path   = undef,
   $default_ssl_crl        = undef,
   $default_ssl_crl_check  = undef,
+  $default_type           = 'none',
   $ip                     = undef,
   $service_enable         = true,
   $service_manage         = true,
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 6848771c60..2be2ef346a 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -149,6 +149,40 @@
       ) }
     end
 
+    describe "Check default type" do
+      context "with Apache version < 2.4" do
+        let :params do
+          {
+            :apache_version => '2.2',
+          }
+        end
+    
+       context "when default_type => 'none'" do
+          let :params do
+            { :default_type => 'none' }
+          end
+    
+          it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^DefaultType none$} }
+        end
+        context "when default_type => 'text/plain'" do
+          let :params do
+            { :default_type => 'text/plain' }
+          end
+    
+          it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^DefaultType text/plain$} }
+        end
+      end
+   
+      context "with Apache version >= 2.4" do
+        let :params do
+          {
+            :apache_version => '2.4',
+          }
+        end
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^DefaultType [.]*$} }
+      end
+    end
+
     describe "Don't create user resource" do
       context "when parameter manage_user is false" do
         let :params do
@@ -353,6 +387,38 @@
         it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^AddDefaultCharset none$} }
       end
 
+      context "with Apache version < 2.4" do
+        let :params do
+          {
+            :apache_version => '2.2',
+          }
+        end
+
+       context "when default_type => 'none'" do
+          let :params do
+            { :default_type => 'none' }
+          end
+
+          it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^DefaultType none$} }
+        end
+        context "when default_type => 'text/plain'" do
+          let :params do
+            { :default_type => 'text/plain' }
+          end
+
+          it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^DefaultType text/plain$} }
+        end
+      end
+
+      context "with Apache version >= 2.4" do
+        let :params do
+          {
+            :apache_version => '2.4',
+          }
+        end
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^DefaultType [.]*$} }
+      end
+
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 50d57e29ec..6c50e28711 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -34,7 +34,9 @@ AccessFileName .htaccess
 AddDefaultCharset <%= @default_charset %>
 <% end -%>
 
-DefaultType none
+<%- if scope.function_versioncmp([@apache_version, '2.4']) < 0 -%>
+DefaultType <%= @default_type %>
+<%- end -%>
 HostnameLookups Off
 ErrorLog "<%= @logroot %>/<%= @error_log %>"
 LogLevel <%= @log_level %>

From 07f7240ce52cd3f4f01b4641d2b054d7b3a85d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 12 Mar 2015 21:11:24 +0100
Subject: [PATCH 0563/2267] add parameters to globall configure expires

* check if expiresdefault is set, before trying to set it..
* [{}] is a really really silly default for an array of hashes, in case
  anyone wondered
* all dates must be quoted
---
 README.md                        | 27 ++++++++++
 manifests/mod/expires.pp         | 19 +++++++-
 spec/classes/mod/expires_spec.rb | 84 ++++++++++++++++++++++++++++++++
 templates/mod/expires.conf.erb   | 11 +++++
 4 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 spec/classes/mod/expires_spec.rb
 create mode 100644 templates/mod/expires.conf.erb

diff --git a/README.md b/README.md
index c2a99e5efc..9bb1f70601 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@
         * [Class: apache::mod::php](#class-apachemodphp)
         * [Class: apache::mod::ssl](#class-apachemodssl)
         * [Class: apache::mod::status](#class-apachemodstatus)
+        * [Class: apache::mod::expires](#class-apachemodexpires)
         * [Class: apache::mod::wsgi](#class-apachemodwsgi)
         * [Class: apache::mod::fcgid](#class-apachemodfcgid)
         * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
@@ -800,6 +801,32 @@ Installs Apache mod_status and uses the status.conf.erb template. These are the
   }
 ```
 
+####Class: `apache::mod::expires`
+
+Installs Apache mod_expires and uses the expires.conf.erb template. These are the defaults:
+
+```puppet
+    class { 'apache::mod::expires':
+      expires_active  = true,
+      expires_default = undef,
+      expires_by_type = undef,
+){
+
+
+  }
+```
+
+`expires_by_type` is an array of Hashes, describing a set of types and their expire times:
+
+```puppet
+  class { 'apache::mod::expires':
+    expires_by_type = [
+      { 'text/json' => 'access plus 1 month' },
+      { 'text/html' => 'access plus 1 year' },
+    ]
+  }
+```
+
 ####Class: `apache::mod::wsgi`
 
 Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`.
diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index aae4c59d98..8c1ce84410 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -1,3 +1,20 @@
-class apache::mod::expires {
+class apache::mod::expires (
+  $expires_active  = true,
+  $expires_default = undef,
+  $expires_by_type = undef,
+) {
   ::apache::mod { 'expires': }
+
+  # Template uses
+  # $expries_active
+  # $expries_default
+  # $expries_by_type
+  file { 'expires.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/expires.conf",
+    content => template('apache/mod/expires.conf.erb'),
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
 }
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
new file mode 100644
index 0000000000..e6eab7c48d
--- /dev/null
+++ b/spec/classes/mod/expires_spec.rb
@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe 'apache::mod::expires', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+  context "with expires active", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :lsbdistcodename        => 'squeeze',
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_apache__mod("expires") }
+    it { is_expected.to contain_file("expires.conf").with(:content => /ExpiresActive On\n/) }
+  end
+  context "with expires default", :compile do
+    let :pre_condition do
+      'class { apache: default_mods => false }'
+    end
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '7',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    let :params do
+      {
+        'expires_default' => 'access plus 1 month'
+      }
+    end
+    it { is_expected.to contain_apache__mod("expires") }
+    it { is_expected.to contain_file("expires.conf").with_content(
+        "ExpiresActive On\n" \
+        "ExpiresDefault \"access plus 1 month\"\n"
+      )
+    }
+  end
+  context "with expires by type", :compile do
+    let :pre_condition do
+      'class { apache: default_mods => false }'
+    end
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '7',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    let :params do
+      {
+        'expires_by_type' => [
+          { 'text/json' => 'mod plus 1 day' },
+          { 'text/html' => 'access plus 1 year' },
+        ]
+      }
+    end
+    it { is_expected.to contain_apache__mod("expires") }
+    it { is_expected.to contain_file("expires.conf").with_content(
+        "ExpiresActive On\n" \
+        "ExpiresByType text/json \"mod plus 1 day\"\n" \
+        "ExpiresByType text/html \"access plus 1 year\"\n"
+      )
+    }
+  end
+end
diff --git a/templates/mod/expires.conf.erb b/templates/mod/expires.conf.erb
new file mode 100644
index 0000000000..7660cfcd05
--- /dev/null
+++ b/templates/mod/expires.conf.erb
@@ -0,0 +1,11 @@
+ExpiresActive <%= scope.function_bool2httpd([@expires_active]) %>
+<%- if ! @expires_default.nil? and ! @expires_default.empty? -%>
+ExpiresDefault "<%= @expires_default %>"
+<%- end -%>
+<%- if ! @expires_by_type.nil? and ! @expires_by_type.empty? -%>
+<%-   [@expires_by_type].flatten.each do |line| -%>
+<%-     line.map do |type, seconds| -%>
+ExpiresByType <%= type %> "<%= seconds -%>"
+<%-     end -%>
+<%-   end -%>
+<%- end -%>

From e0255bdf8d983654fb35d2a3d3dcd3deccfcc4df Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dimitri.savineau@enovance.com>
Date: Tue, 20 Jan 2015 11:13:19 -0500
Subject: [PATCH 0564/2267] Add mod_remoteip module

http://httpd.apache.org/docs/2.4/mod/mod_remoteip.html
---
 README.md                         |  1 +
 manifests/mod/remoteip.pp         | 27 ++++++++++++++++
 spec/classes/mod/remoteip_spec.rb | 53 +++++++++++++++++++++++++++++++
 templates/mod/remoteip.conf.erb   | 21 ++++++++++++
 4 files changed, 102 insertions(+)
 create mode 100644 manifests/mod/remoteip.pp
 create mode 100644 spec/classes/mod/remoteip_spec.rb
 create mode 100644 templates/mod/remoteip.conf.erb

diff --git a/README.md b/README.md
index c2a99e5efc..2628d25c29 100644
--- a/README.md
+++ b/README.md
@@ -572,6 +572,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `proxy_http`
 * `python`
 * `reqtimeout`
+* `remoteip`*
 * `rewrite`
 * `rpaf`*
 * `setenvif`
diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
new file mode 100644
index 0000000000..564390e94d
--- /dev/null
+++ b/manifests/mod/remoteip.pp
@@ -0,0 +1,27 @@
+class apache::mod::remoteip (
+  $header            = 'X-Forwarded-For',
+  $proxy_ips         = [ '127.0.0.1' ],
+  $proxies_header    = undef,
+  $trusted_proxy_ips = undef,
+  $apache_version    = $::apache::apache_version
+) {
+  if versioncmp($apache_version, '2.4') < 0 {
+    fail('mod_remoteip is only available in Apache 2.4')
+  }
+
+  ::apache::mod { 'remoteip': }
+
+  # Template uses:
+  # - $header
+  # - $proxy_ips
+  # - $proxies_header
+  # - $trusted_proxy_ips
+  file { 'remoteip.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/remoteip.conf",
+    content => template('apache/mod/remoteip.conf.erb'),
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Service['httpd'],
+  }
+}
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
new file mode 100644
index 0000000000..e3d095351a
--- /dev/null
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe 'apache::mod::remoteip', :type => :class do
+  let :pre_condition do
+    [
+      'include apache',
+    ]
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '8',
+        :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'jessie',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    let :params do
+      { :apache_version => '2.4' }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('remoteip') }
+    it { is_expected.to contain_file('remoteip.conf').with({
+      'path' => '/etc/apache2/mods-available/remoteip.conf',
+    }) }
+
+    describe "with header X-Forwarded-For" do
+      let :params do
+        { :header => 'X-Forwarded-For' }
+      end
+      it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPHeader X-Forwarded-For$/) }
+    end
+    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
+      let :params do
+        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
+      end
+      it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPInternalProxy 10.42.17.8$/) }
+      it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPInternalProxy 10.42.18.99$/) }
+    end
+    describe "with Apache version < 2.4" do
+      let :params do
+        { :apache_version => '2.2' }
+      end
+      it 'should fail' do
+        expect { subject }.to raise_error(Puppet::Error, /mod_remoteip is only available in Apache 2.4/)
+      end
+    end
+  end
+end
diff --git a/templates/mod/remoteip.conf.erb b/templates/mod/remoteip.conf.erb
new file mode 100644
index 0000000000..0adff71108
--- /dev/null
+++ b/templates/mod/remoteip.conf.erb
@@ -0,0 +1,21 @@
+# Declare the header field which should be parsed for useragent IP addresses
+RemoteIPHeader <%= @header %>
+
+# Declare client intranet IP addresses trusted to present
+# the RemoteIPHeader value
+<%- @proxy_ips.each do |proxy| -%>
+RemoteIPInternalProxy <%= proxy %>
+<%- end -%>
+
+# Declare the header field which will record all intermediate IP addresses
+<%- if @proxies_header -%>
+RemoteIPProxiesHeader <%= @proxies_header %>
+<%- end -%>
+
+# Declare client intranet IP addresses trusted to present
+# the RemoteIPHeader value
+<%- if @trusted_proxy_ips -%>
+  <%- @trusted_proxy_ips.each do |proxy| -%>
+RemoteIPTrustedProxy <%= proxy %>
+  <%- end -%>
+<%- end -%>

From 12232f76e1c4c070610a8eac882a3e051509e5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Fri, 13 Mar 2015 19:11:14 +0100
Subject: [PATCH 0565/2267] remoteip: force-cast and flatten arguments to
 arrays

---
 templates/mod/remoteip.conf.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/mod/remoteip.conf.erb b/templates/mod/remoteip.conf.erb
index 0adff71108..b4518f9b04 100644
--- a/templates/mod/remoteip.conf.erb
+++ b/templates/mod/remoteip.conf.erb
@@ -1,21 +1,23 @@
 # Declare the header field which should be parsed for useragent IP addresses
 RemoteIPHeader <%= @header %>
 
+<%- if @proxy_ips -%>
 # Declare client intranet IP addresses trusted to present
 # the RemoteIPHeader value
-<%- @proxy_ips.each do |proxy| -%>
+<%-   [@proxy_ips].flatten.each do |proxy| -%>
 RemoteIPInternalProxy <%= proxy %>
+<%-   end -%>
 <%- end -%>
 
-# Declare the header field which will record all intermediate IP addresses
 <%- if @proxies_header -%>
+# Declare the header field which will record all intermediate IP addresses
 RemoteIPProxiesHeader <%= @proxies_header %>
 <%- end -%>
 
+<%- if @trusted_proxy_ips -%>
 # Declare client intranet IP addresses trusted to present
 # the RemoteIPHeader value
-<%- if @trusted_proxy_ips -%>
-  <%- @trusted_proxy_ips.each do |proxy| -%>
+  <%- [@trusted_proxy_ips].flatten.each do |proxy| -%>
 RemoteIPTrustedProxy <%= proxy %>
   <%- end -%>
 <%- end -%>

From 92ba6467508a9f8620c4cbf460878d9e59dd23cf Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Fri, 23 Jan 2015 16:10:34 +0100
Subject: [PATCH 0566/2267] Apache - mod_passenger: allow setting
 PassengerMinInstances

---
 manifests/mod/passenger.pp         | 2 ++
 spec/classes/mod/passenger_spec.rb | 6 ++++++
 templates/mod/passenger.conf.erb   | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index f5104e2e03..2f0a80b79f 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -11,6 +11,7 @@
   $passenger_ruby                 = $::apache::params::passenger_ruby,
   $passenger_default_ruby         = $::apache::params::passenger_default_ruby,
   $passenger_max_pool_size        = undef,
+  $passenger_min_instances        = undef,
   $passenger_use_global_queue     = undef,
   $passenger_app_env              = undef,
   $mod_package                    = undef,
@@ -56,6 +57,7 @@
   # - $passenger_ruby
   # - $passenger_default_ruby
   # - $passenger_max_pool_size
+  # - $passenger_min_instances
   # - $passenger_high_performance
   # - $passenger_max_requests
   # - $passenger_stat_throttle_rate
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index c8430aa1ff..bd37f5b530 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -76,6 +76,12 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxPoolSize 16$/) }
     end
+    describe "with passenger_min_instances => 5" do
+      let :params do
+        { :passenger_min_instances => 5 }
+      end
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMinInstances 5$/) }
+    end
     describe "with rack_autodetect => on" do
       let :params do
         { :rack_autodetect => 'on' }
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 22805f5a70..e50a2d636c 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -16,6 +16,9 @@
   <%- if @passenger_max_pool_size -%>
   PassengerMaxPoolSize <%= @passenger_max_pool_size %>
   <%- end -%>
+  <%- if @passenger_min_instances -%>
+  PassengerMinInstances <%= @passenger_min_instances %>
+  <%- end -%>
   <%- if @passenger_pool_idle_time -%>
   PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
   <%- end -%>

From 1eed398e201ef392bd9e1e0dc42c2d70e2659686 Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Wed, 5 Mar 2014 15:10:07 +0100
Subject: [PATCH 0567/2267] Apache: add support for the ProxyPassMatch
 directive

---
 README.md                  |  8 ++++++++
 manifests/vhost.pp         |  6 +++++-
 spec/defines/vhost_spec.rb | 13 +++++++++++++
 templates/vhost/_proxy.erb | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 96a7b1ac7c..7f338e96db 100644
--- a/README.md
+++ b/README.md
@@ -1247,6 +1247,10 @@ Array of IPs to exclude from mod_security rule matching
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
 
+#####`no_proxy_uris_match`
+
+This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
+
 #####`proxy_preserve_host`
 
 Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypreservehost).  true Enables the Host: line from an incoming request to be proxied to the host instead of hostname .  false sets this option to off (default).
@@ -1349,6 +1353,10 @@ apache::vhost { 'site.name.fdqn':
 `params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
 `setenv` is optional and is an array to set environment variables for the proxy directive, for details see http://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings
 
+#####`proxy_pass_match`
+
+This directive is equivalent to proxy_pass, but takes regular expressions, see [ProxyPassMatch](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
+
 #####`rack_base_uris`
 
 Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 3c5808f6e9..70d2a57bb9 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -57,7 +57,10 @@
   $scriptalias                 = undef,
   $scriptaliases               = [],
   $proxy_dest                  = undef,
+  $proxy_dest_match            = undef,
+  $proxy_dest_reverse_match    = undef,
   $proxy_pass                  = undef,
+  $proxy_pass_match            = undef,
   $suphp_addhandler            = $::apache::params::suphp_addhandler,
   $suphp_engine                = $::apache::params::suphp_engine,
   $suphp_configpath            = $::apache::params::suphp_configpath,
@@ -66,6 +69,7 @@
   $php_admin_flags             = {},
   $php_admin_values            = {},
   $no_proxy_uris               = [],
+  $no_proxy_uris_match         = [],
   $proxy_preserve_host         = false,
   $proxy_error_override        = false,
   $redirect_source             = '/',
@@ -364,7 +368,7 @@
   }
 
   # Load mod_proxy if needed and not yet loaded
-  if ($proxy_dest or $proxy_pass) {
+  if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match) {
     if ! defined(Class['apache::mod::proxy']) {
       include ::apache::mod::proxy
     }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index cd6c9c5c8e..fd47876d9c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -215,12 +215,25 @@
               'setenv'   => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'],
             }
           ],
+          'proxy_pass_match'            => [
+            {
+              'path'     => '/a',
+              'url'      => 'http://backend-a/',
+              'keywords' => ['noquery', 'interpolate'],
+              'params'   => {
+                      'retry'   => '0',
+                      'timeout' => '5'
+              },
+              'setenv'   => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'],
+            }
+          ],
           'suphp_addhandler'            => 'foo',
           'suphp_engine'                => 'on',
           'suphp_configpath'            => '/var/www/html',
           'php_admin_flags'             => ['foo', 'bar'],
           'php_admin_values'            => ['true', 'false'],
           'no_proxy_uris'               => '/foo',
+          'no_proxy_uris_match'         => '/foomatch',
           'proxy_preserve_host'         => true,
           'proxy_error_override'        => true,
           'redirect_source'             => '/bar',
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index f026c87674..67c8eb274a 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -32,6 +32,29 @@
   <%- end -%>
   </Location>
 <% end -%>
+<% [@proxy_pass_match].flatten.compact.each do |proxy| %>
+  ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] %>
+  <%- if proxy['params'] -%>
+    <%- proxy['params'].each_pair do |key, value| -%> <%= key %>=<%= value -%>
+    <%- end -%>
+  <%- end -%>
+  <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
+  <%- end %>
+  <Location <%= proxy['path']%>>
+  <%- if proxy['reverse_urls'].nil? -%>
+    ProxyPassReverse <%= proxy['url'] %>
+  <%- else -%>
+    <%- Array(proxy['reverse_urls']).each do |reverse_url| -%>
+    ProxyPassReverse <%= reverse_url %>
+    <%- end -%>
+  <%- end -%>
+  <%- if proxy['setenv'] -%>
+    <%- Array(proxy['setenv']).each do |setenv_var| -%>
+    SetEnv <%= setenv_var -%>
+    <%- end -%>
+  <%- end -%>
+  </Location>
+<% end -%>
 <% if @proxy_dest -%>
 <%- Array(@no_proxy_uris).each do |uri| -%>
   ProxyPass        <%= uri %> !
@@ -41,3 +64,12 @@
     ProxyPassReverse <%= @proxy_dest %>/
   </Location>
 <% end -%>
+<% if @proxy_dest_match -%>
+<%- Array(@no_proxy_uris_match).each do |uri| -%>
+  ProxyPassMatch        <%= uri %> !
+<% end -%>
+  ProxyPassMatch          / <%= @proxy_dest_match %>/
+  <Location          />
+    ProxyPassReverse <%= @proxy_dest_reverse_match %>/
+  </Location>
+<% end -%>

From 84411341b85ef4eaad8529de890262df5a159385 Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Mon, 16 Mar 2015 12:46:31 +0100
Subject: [PATCH 0568/2267] Documentation: style fix

Use a code block for the commands so they are displayed properly on
GitHub.
---
 README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 96a7b1ac7c..c3ea9ca4d2 100644
--- a/README.md
+++ b/README.md
@@ -2546,14 +2546,21 @@ Read the complete module [contribution guide](https://docs.puppetlabs.com/forge/
 This project contains tests for both [rspec-puppet](http://rspec-puppet.com/) and [beaker-rspec](https://github.com/puppetlabs/beaker-rspec) to verify functionality. For in-depth information please see their respective documentation.
 
 Quickstart:
-  Ruby > 1.8.7
+
+####Ruby > 1.8.7
+
+```
     gem install bundler
     bundle install
     bundle exec rake spec
     bundle exec rspec spec/acceptance
     RS_DEBUG=yes bundle exec rspec spec/acceptance
+```
 
-  Ruby = 1.8.7
+####Ruby = 1.8.7
+
+```
     gem install bundler
     bundle install --without system_tests
     bundle exec rake spec
+```

From 9b96fc1452902530572a6a29d39311f9b261a4b8 Mon Sep 17 00:00:00 2001
From: Niklas H <niklas+github@lanpartei.de>
Date: Mon, 16 Mar 2015 18:13:24 +0100
Subject: [PATCH 0569/2267] allow acess to userdirs again

After fixing the permission directives for Apache 2.4 in 
460775670a, the userdirs were not accessible anymore because of `Require all denied.
---
 templates/mod/userdir.conf.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index add525d5ea..754824cdc8 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -9,7 +9,7 @@
     Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
     <Limit GET POST OPTIONS>
       <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      Require all denied
+      Require all granted
       <%- else -%>
       Order allow,deny
       Allow from all
@@ -17,7 +17,7 @@
     </Limit>
     <LimitExcept GET POST OPTIONS>
       <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      Require all denied
+      Require all granted
       <%- else -%>
       Order allow,deny
       Allow from all

From fca58388400fcb78a001cebaa2a159611af3f92e Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 16 Mar 2015 10:21:45 -0700
Subject: [PATCH 0570/2267] Give a lower priority to mod_passenger

This was initially implemented in #1060.
---
 manifests/mod/passenger.pp            | 7 ++++---
 manifests/params.pp                   | 8 ++++----
 spec/acceptance/mod_passenger_spec.rb | 4 ++--
 spec/classes/mod/passenger_spec.rb    | 8 ++++----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index b6cd9c33c1..d6030edbf9 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -15,9 +15,9 @@
   $passenger_app_env              = undef,
   $mod_package                    = undef,
   $mod_package_ensure             = undef,
-  $mod_lib                        = 'mod_passenger.so',
+  $mod_lib                        = undef,
   $mod_lib_path                   = undef,
-  $mod_id                         = 'passenger_module',
+  $mod_id                         = undef,
   $mod_path                       = undef,
 ) {
   # Managed by the package, but declare it to avoid purging
@@ -56,13 +56,14 @@
 
   $_id = $mod_id
   $_path = $mod_path
-  ::apache::mod { 'zpassenger':
+  ::apache::mod { 'passenger':
     package        => $_package,
     package_ensure => $_package_ensure,
     lib            => $_lib,
     lib_path       => $_lib_path,
     id             => $_id,
     path           => $_path,
+    loadfile_name  => 'zpassenger.load',
   }
 
   # Template uses:
diff --git a/manifests/params.pp b/manifests/params.pp
index 937719219b..54b74e64bc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -82,7 +82,7 @@
         default => undef,
       },
       'pagespeed'   => 'mod-pagespeed-stable',
-      'zpassenger'   => 'mod_passenger',
+      'passenger'   => 'mod_passenger',
       'perl'        => 'mod_perl',
       'php5'        => $::apache::version::distrelease ? {
         '5'     => 'php53',
@@ -182,7 +182,7 @@
       'fcgid'       => 'libapache2-mod-fcgid',
       'nss'         => 'libapache2-mod-nss',
       'pagespeed'   => 'mod-pagespeed-stable',
-      'zpassenger'  => 'libapache2-mod-passenger',
+      'passenger'   => 'libapache2-mod-passenger',
       'perl'        => 'libapache2-mod-perl2',
       'php5'        => 'libapache2-mod-php5',
       'proxy_html'  => 'libapache2-mod-proxy-html',
@@ -331,7 +331,7 @@
       # NOTE: not sure where the shibboleth should come from
       'auth_kerb'  => 'www/mod_auth_kerb2',
       'fcgid'      => 'www/mod_fcgid',
-      'zpassenger' => 'www/rubygem-passenger',
+      'passenger'  => 'www/rubygem-passenger',
       'perl'       => 'www/mod_perl2',
       'php5'       => 'www/mod_php5',
       'proxy_html' => 'www/mod_proxy_html',
@@ -391,7 +391,7 @@
       # NOTE: I list here only modules that are not included in www-servers/apache
       'auth_kerb'  => 'www-apache/mod_auth_kerb',
       'fcgid'      => 'www-apache/mod_fcgid',
-      'zpassenger' => 'www-apache/passenger',
+      'passenger'  => 'www-apache/passenger',
       'perl'       => 'www-apache/mod_perl',
       'php5'       => 'dev-lang/php',
       'proxy_html' => 'www-apache/mod_proxy_html',
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index f6e710db01..7b2d0da9af 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -6,7 +6,7 @@
     service_name = 'apache2'
     mod_dir = '/etc/apache2/mods-available/'
     conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}passenger.load"
+    load_file = "#{mod_dir}zpassenger.load"
 
     case fact('operatingsystem')
     when 'Ubuntu'
@@ -49,7 +49,7 @@
     service_name = 'httpd'
     mod_dir = '/etc/httpd/conf.d/'
     conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}passenger.load"
+    load_file = "#{mod_dir}zpassenger.load"
     # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part
     passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.1'
     passenger_ruby = '/usr/bin/ruby'
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 01cf78beec..e05b1e39bb 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -20,7 +20,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('zpassenger') }
+    it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("libapache2-mod-passenger") }
     it { is_expected.to contain_file('zpassenger.load').with({
       'path' => '/etc/apache2/mods-available/zpassenger.load',
@@ -221,7 +221,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('zpassenger') }
+    it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("mod_passenger") }
     it { is_expected.to contain_file('passenger_package.conf').with({
       'path' => '/etc/httpd/conf.d/passenger.conf',
@@ -260,7 +260,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('zpassenger') }
+    it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("www/rubygem-passenger") }
   end
   context "on a Gentoo OS" do
@@ -277,7 +277,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('zpassenger') }
+    it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("www-apache/passenger") }
   end
 end

From d1ec93703cc11628947a155e670974b4f9dde1a5 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 16 Mar 2015 16:23:33 -0700
Subject: [PATCH 0571/2267] Document all the parameters added in #1069

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index e1f0341579..01ee2654f9 100644
--- a/README.md
+++ b/README.md
@@ -1353,6 +1353,14 @@ apache::vhost { 'site.name.fdqn':
 `params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
 `setenv` is optional and is an array to set environment variables for the proxy directive, for details see http://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings
 
+#####`proxy_dest_match`
+
+This directive is equivalent to proxy_dest, but takes regular expressions, see [ProxyPassMatch](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
+
+#####`proxy_dest_reverse_match`
+
+Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See [ProxyPassReverse](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) for details.
+
 #####`proxy_pass_match`
 
 This directive is equivalent to proxy_pass, but takes regular expressions, see [ProxyPassMatch](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.

From e5fd9d0621581251c98373fdf1b585401efcf130 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 16 Mar 2015 16:33:26 -0700
Subject: [PATCH 0572/2267] 1.4.0 prep

---
 CHANGELOG.md  | 43 +++++++++++++++++++++++++++++++++++++++++++
 metadata.json |  6 +++---
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 967e8a237d..c300701cca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,46 @@
+##2015-03-17 - Supported Release 1.4.0
+###Summary
+
+This release fixes the issue where the docroot was still managed even if the default vhosts were disabled and has many other features and bugfixes including improved support for 'deny' and 'require' as arrays in the 'directories' parameter under `apache::vhost`
+
+####Features
+- New parameters to `apache`
+  - `default_charset`
+  - `default_type`
+- New parameters to `apache::vhost`
+  - `proxy_error_override`
+  - `passenger_app_env` (MODULES-1776)
+  - `proxy_dest_match`
+  - `proxy_dest_reverse_match`
+  - `proxy_pass_match`
+  - `no_proxy_uris_match`
+- New parameters to `apache::mod::passenger`
+  - `passenger_app_env`
+  - `passenger_min_instances`
+- New parameter to `apache::mod::alias`
+  - `icons_options`
+- New classes added under `apache::mod::*`
+  - `authn_file`
+  - `authz_default`
+  - `authz_user`
+- Added support for 'deny' as an array in 'directories' under `apache::vhost`
+- Added support for RewriteMap
+- Improved support for FreeBSD. (Note: If using apache < 2.4.12, see the discussion [here](https://github.com/puppetlabs/puppetlabs-apache/pull/1030))
+- Added check for deprecated options in directories and fail when they are unsupported
+- Added gentoo compatibility
+- Added proper array support for `require` in the `directories` parameter in `apache::vhost`
+- Added support for `setenv` inside proxy locations
+
+###Bugfixes
+- Fix issue in `apache::vhost` that was preventing the scriptalias fragment from being included (MODULES-1784)
+- Install required `mod_ldap` package for EL7 (MODULES-1779)
+- Change default value of `maxrequestworkers` in `apache::mod::event` to be a multiple of the default `ThreadsPerChild` of 25.
+- Use the correct `mod_prefork` package name for trusty and jessie
+- Don't manage docroot when default vhosts are disabled
+- Ensure resources notify `Class['Apache::Service']` instead of `Service['httpd']` (MODULES-1829)
+- Change the loadfile name for `mod_passenger` so `mod_proxy` will load by default before `mod_passenger`
+- Remove old Debian work-around that removed `passenger_extra.conf`
+
 ##2015-02-17 - Supported Release 1.3.0
 ###Summary
 
diff --git a/metadata.json b/metadata.json
index d778e3bfae..feb7daa194 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -67,7 +67,7 @@
   ],
   "description": "Module for Apache configuration",
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1"}
+    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"}
   ]
 }

From c6a4574ebc4b5946e9778c15c6eac48fa75a7236 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 16 Mar 2015 15:13:38 -0700
Subject: [PATCH 0573/2267] Revert "Supersede ssl_random_seed_bytes with
 ssl_random_seeds option to allow setting of both random source and bytes."

This reverts commit d431fce700f357a6330544490788bd124b2982dd.

Reverting this commit as it introduces a backwards incompatible change,
removing the `ssl_random_seed_bytes` parameter.

Conflicts:
	manifests/mod/ssl.pp
---
 README.md                    |  7 +------
 manifests/mod/ssl.pp         |  8 +-------
 spec/classes/mod/ssl_spec.rb | 12 ++++--------
 templates/mod/ssl.conf.erb   |  9 ++++-----
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index e1f0341579..aab37667c1 100644
--- a/README.md
+++ b/README.md
@@ -774,12 +774,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
       ssl_cipher             => 'HIGH:MEDIUM:!aNULL:!MD5',
       ssl_protocol           => [ 'all', '-SSLv2', '-SSLv3' ],
       ssl_pass_phrase_dialog => 'builtin',
-      ssl_random_seeds       => [
-        'startup builtin',
-        'startup file:/dev/urandom 512',
-        'connect builtin',
-        'connect file:/dev/urandom 512',
-      ],
+      ssl_random_seed_bytes  => '512',
     }
 ```
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index c1f118f4a8..5296a1d512 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -4,12 +4,7 @@
   $ssl_cipher             = 'HIGH:MEDIUM:!aNULL:!MD5',
   $ssl_protocol           = [ 'all', '-SSLv2', '-SSLv3' ],
   $ssl_pass_phrase_dialog = 'builtin',
-  $ssl_random_seeds       = [
-    'startup builtin',
-    'startup file:/dev/urandom 512',
-    'connect builtin',
-    'connect file:/dev/urandom 512',
-  ],
+  $ssl_random_seed_bytes  = '512',
   $apache_version         = $::apache::apache_version,
   $package_name           = undef,
 ) {
@@ -58,7 +53,6 @@
   # $ssl_options
   # $session_cache,
   # $ssl_mutex
-  # $ssl_random_seeds
   # $apache_version
   #
   file { 'ssl.conf':
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 217c9ee8ba..7ef8fba5c2 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -128,17 +128,13 @@
       it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog exec:\/path\/to\/program$/)}
     end
 
-    context 'setting ssl_random_seeds' do
+    context 'setting ssl_random_seed_bytes' do
       let :params do
         {
-          :ssl_random_seeds => ['startup builtin',
-                                'startup file:/dev/random 256',
-                                'connect file:/dev/urandom 1024' ],
-         }
+          :ssl_random_seed_bytes => '1024',
+        }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLRandomSeed startup builtin$/)}
-      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLRandomSeed startup file:\/dev\/random 256$/)}
-      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLRandomSeed connect file:\/dev\/urandom 1024$/)}
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLRandomSeed startup file:/dev/urandom 1024$})}
     end
   end
 end
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index e9155545b0..6fb25c16ee 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -1,9 +1,8 @@
 <IfModule mod_ssl.c>
-  <%- Array(@ssl_random_seeds).each do |ssl_random_seed| -%>
-    <%- if ssl_random_seed != '' -%>
-  SSLRandomSeed <%= ssl_random_seed %>
-    <%- end -%>
-  <%- end -%>
+  SSLRandomSeed startup builtin
+  SSLRandomSeed startup file:/dev/urandom <%= @ssl_random_seed_bytes %>
+  SSLRandomSeed connect builtin
+  SSLRandomSeed connect file:/dev/urandom <%= @ssl_random_seed_bytes %>
 
   AddType application/x-x509-ca-cert .crt
   AddType application/x-pkcs7-crl    .crl

From 17ed791e50dbbc89667c55bc08c10cb4b00fb5ef Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 17 Mar 2015 13:52:47 -0700
Subject: [PATCH 0574/2267] Debian 7 is very inconsistent with mod_suphp

It works fine on all the ubuntus. It's clearly ok. I don't know why
debian 7 does this.
---
 spec/acceptance/mod_suphp_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index fa0125e496..33f57fba6c 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper_acceptance'
 
 describe 'apache::mod::suphp class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-    when 'Debian'
+  case fact('operatingsystem')
+    when 'Ubuntu'
       context "default suphp config" do
         it 'succeeds in puppeting suphp' do
           pp = <<-EOS

From 66c66516c48c8a9241d4cf2208c6a54ac09d1668 Mon Sep 17 00:00:00 2001
From: Frank Groeneveld <frank@ivaldi.nl>
Date: Wed, 18 Mar 2015 14:29:11 +0100
Subject: [PATCH 0575/2267] Make Options directive configurable for mod userdir

---
 manifests/mod/userdir.pp       | 1 +
 templates/mod/userdir.conf.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 038e0790bc..4b3d0b8e80 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -3,6 +3,7 @@
   $dir = 'public_html',
   $disable_root = true,
   $apache_version = $::apache::apache_version,
+  $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ],
 ) {
   ::apache::mod { 'userdir': }
 
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index add525d5ea..377fdb097f 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -6,7 +6,7 @@
 
   <Directory "<%= @home %>/*/<%= @dir %>">
     AllowOverride FileInfo AuthConfig Limit Indexes
-    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+    Options <%= @options.join(' ') %>
     <Limit GET POST OPTIONS>
       <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       Require all denied

From 48d7aa04200bf758b7592c3a29f9bc823e4d96aa Mon Sep 17 00:00:00 2001
From: Seth Lyons <seth.lyons@gmail.com>
Date: Wed, 18 Mar 2015 12:45:00 -0400
Subject: [PATCH 0576/2267] add section for FreeBSD limitations

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index a7a396be5f..b06e0ff620 100644
--- a/README.md
+++ b/README.md
@@ -2542,6 +2542,10 @@ Something along the lines of:
 
 You need to set the contexts using `semanage fcontext` not `chcon` because `file {...}` resources reset the context to the values in the database if the resource isn't specifying the context.
 
+###FreeBSD
+
+In order to use this module on FreeBSD, you *must* use apache24-2.4.12 (www/apache24) or newer.
+
 ##Development
 
 ###Contributing

From 945e1e75de8c29341986e23a0650dc0e90a077f0 Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Wed, 18 Mar 2015 19:35:31 +0100
Subject: [PATCH 0577/2267] Allow settings to be overridden as parameters to
 apache::mod::ssl

---
 README.md                  | 15 +++++++++------
 manifests/mod/ssl.pp       | 26 +++++++++++++++++---------
 spec/defines/vhost_spec.rb |  6 ++++++
 templates/mod/ssl.conf.erb | 12 ++++++------
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index a7a396be5f..32bafc2231 100644
--- a/README.md
+++ b/README.md
@@ -769,12 +769,15 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
 
 ```puppet
     class { 'apache::mod::ssl':
-      ssl_compression        => false,
-      ssl_options            => [ 'StdEnvVars' ],
-      ssl_cipher             => 'HIGH:MEDIUM:!aNULL:!MD5',
-      ssl_protocol           => [ 'all', '-SSLv2', '-SSLv3' ],
-      ssl_pass_phrase_dialog => 'builtin',
-      ssl_random_seed_bytes  => '512',
+      ssl_compression         => false,
+      ssl_cryptodevice        => 'builtin',
+      ssl_options             => [ 'StdEnvVars' ],
+      ssl_cipher              => 'HIGH:MEDIUM:!aNULL:!MD5',
+      ssl_honorcipherorder    => 'On',
+      ssl_protocol            => [ 'all', '-SSLv2', '-SSLv3' ],
+      ssl_pass_phrase_dialog  => 'builtin',
+      ssl_random_seed_bytes   => '512',
+      ssl_sessioncachetimeout => '300',
     }
 ```
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 5296a1d512..4a6b823347 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,12 +1,15 @@
 class apache::mod::ssl (
-  $ssl_compression        = false,
-  $ssl_options            = [ 'StdEnvVars' ],
-  $ssl_cipher             = 'HIGH:MEDIUM:!aNULL:!MD5',
-  $ssl_protocol           = [ 'all', '-SSLv2', '-SSLv3' ],
-  $ssl_pass_phrase_dialog = 'builtin',
-  $ssl_random_seed_bytes  = '512',
-  $apache_version         = $::apache::apache_version,
-  $package_name           = undef,
+  $ssl_compression         = false,
+  $ssl_cryptodevice        = 'builtin',
+  $ssl_options             = [ 'StdEnvVars' ],
+  $ssl_cipher              = 'HIGH:MEDIUM:!aNULL:!MD5',
+  $ssl_honorcipherorder    = 'On',
+  $ssl_protocol            = [ 'all', '-SSLv2', '-SSLv3' ],
+  $ssl_pass_phrase_dialog  = 'builtin',
+  $ssl_random_seed_bytes   = '512',
+  $ssl_sessioncachetimeout = '300',
+  $apache_version          = $::apache::apache_version,
+  $package_name            = undef,
 ) {
   $session_cache = $::osfamily ? {
     'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
@@ -50,9 +53,14 @@
   # Template uses
   #
   # $ssl_compression
+  # $ssl_cryptodevice
+  # $ssl_cipher
+  # $ssl_honorcipherorder
   # $ssl_options
-  # $session_cache,
+  # $session_cache
   # $ssl_mutex
+  # $ssl_random_seed_bytes
+  # $ssl_sessioncachetimeout
   # $apache_version
   #
   file { 'ssl.conf':
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index fd47876d9c..add8a2b4ab 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -313,6 +313,12 @@
       it { is_expected.to compile }
       it { is_expected.to_not contain_file('/var/www/foo') }
       it { is_expected.to contain_class('apache::mod::ssl') }
+      it { is_expected.to contain_file('ssl.conf').with(
+        :content => /^\s+SSLHonorCipherOrder On$/ ) }
+      it { is_expected.to contain_file('ssl.conf').with(
+        :content => /^\s+SSLPassPhraseDialog builtin$/ ) }
+      it { is_expected.to contain_file('ssl.conf').with(
+        :content => /^\s+SSLSessionCacheTimeout 300$/ ) }
       it { is_expected.to contain_class('apache::mod::mime') }
       it { is_expected.to contain_class('apache::mod::vhost_alias') }
       it { is_expected.to contain_class('apache::mod::wsgi') }
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 6fb25c16ee..933aa1fcc8 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -9,17 +9,17 @@
 
   SSLPassPhraseDialog <%= @ssl_pass_phrase_dialog %>
   SSLSessionCache "shmcb:<%= @session_cache %>"
-  SSLSessionCacheTimeout 300
+  SSLSessionCacheTimeout <%= @ssl_sessioncachetimeout %>
 <% if @ssl_compression -%>
   SSLCompression On
 <% end -%>
-  <% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   Mutex <%= @ssl_mutex %>
-  <% else -%>
+  <%- else -%>
   SSLMutex <%= @ssl_mutex %>
-  <% end -%>
-  SSLCryptoDevice builtin
-  SSLHonorCipherOrder On
+  <%- end -%>
+  SSLCryptoDevice <%= @ssl_cryptodevice %>
+  SSLHonorCipherOrder <%= @ssl_honorcipherorder %>
   SSLCipherSuite <%= @ssl_cipher %>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
 <% if @ssl_options -%>

From 6c261046746471428b55e6258f35d646f0b6fe63 Mon Sep 17 00:00:00 2001
From: Ken Geis <geis.ken@gmail.com>
Date: Thu, 19 Mar 2015 22:43:34 -0700
Subject: [PATCH 0578/2267] fix typo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c300701cca..b6dd08ab44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,7 +64,7 @@ This release has many new features and bugfixes, including the ability to option
 - Add ability to omit priority prefix if `$priority` is set to false
 - Add `apache::security::rule_link` define
 - Improvements to `apache::mod::*`
-  - Add `apache::mod::auth_cass` class
+  - Add `apache::mod::auth_cas` class
   - Add `threadlimit`, `listenbacklog`, `maxrequestworkers`, `maxconnectionsperchild` parameters to `apache::mod::event`
   - Add `apache::mod::filter` class
   - Add `root_group` to `apache::mod::php`

From 43c5c5e7fcd444a790f4d38d4103422042e0346d Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Sun, 22 Mar 2015 17:43:41 +0100
Subject: [PATCH 0579/2267] MODULES-1789 add initial mod_geoip support

---
 README.md                        | 36 ++++++++++++++++++++++++++++++++
 manifests/mod/geoip.pp           | 29 +++++++++++++++++++++++++
 manifests/params.pp              |  1 +
 templates/mod/geoip.conf.erb     | 22 +++++++++++++++++++
 templates/vhost/_directories.erb |  3 +++
 5 files changed, 91 insertions(+)
 create mode 100644 manifests/mod/geoip.pp
 create mode 100644 templates/mod/geoip.conf.erb

diff --git a/README.md b/README.md
index ee88972742..87f4412887 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
         * [Classes: apache::mod::*](#classes-apachemodname)
         * [Class: apache::mod::alias](#class-apachemodalias)
         * [Class: apache::mod::event](#class-apachemodevent)
+        * [Class: apache::mod::geoip](#class-apachemodgeoip)
         * [Class: apache::mod::info](#class-apachemodinfo)
         * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
         * [Class: apache::mod::php](#class-apachemodphp)
@@ -624,6 +625,25 @@ Installs and manages mod_auth_cas. The parameters `cas_login_url` and `cas_valid
 
 Full documentation on mod_auth_cas is available from [JASIG](https://github.com/Jasig/mod_auth_cas).
 
+####Class: `apache::mod::geoip`
+
+Installs and manages mod_geoip.
+
+Full documentation on mod_geoip is available from [MaxMind](http://dev.maxmind.com/geoip/legacy/mod_geoip2/).
+
+These are the default settings:
+
+```puppet
+  class {'apache::mod::geoip':
+    $enable => 'Off',
+    $dbfile => '/usr/share/GeoIP/GeoIP.dat',
+    $flag   => 'Standard',
+    $output => 'All',
+  }
+```
+
+The parameter `dbfile` can be a single directory or a hash of directories.
+
 ####Class: `apache::mod::info`
 
 Installs and manages mod_info which provides a comprehensive overview of the server configuration.
@@ -1829,6 +1849,22 @@ An array of hashes used to override the [ErrorDocument](https://httpd.apache.org
     }
 ```
 
+######`geoip_enable`
+
+Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive.
+Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
+
+```puppet
+    apache::vhost { 'first.example.com':
+      docroot     => '/var/www/first',
+      directories => [
+        { path         => '/var/www/first',
+          geoip_enable => 'On',
+        },
+      ],
+    }
+```
+
 ######`headers`
 
 Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
new file mode 100644
index 0000000000..5f4a8ab1d8
--- /dev/null
+++ b/manifests/mod/geoip.pp
@@ -0,0 +1,29 @@
+class apache::mod::geoip (
+  $enable                  = 'Off',
+  $dbfile                  = '/usr/share/GeoIP/GeoIP.dat',
+  $flag                    = 'Standard',
+  $output                  = 'All',
+  $enableutf8              = undef,
+  $scanproxyheaders        = undef,
+  $uselastxforwarededforip = undef,
+) {
+  ::apache::mod { 'geoip': }
+
+  # Template uses:
+  # - enable
+  # - dbfile
+  # - flag
+  # - output
+  # - enableutf8
+  # - scanproxyheaders
+  # - uselastxforwarededforip
+  file { 'geoip.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/geoip.conf",
+    content => template('apache/mod/geoip.conf.erb'),
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
+
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 54b74e64bc..ce5edec124 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -77,6 +77,7 @@
       },
       'fastcgi'     => 'mod_fastcgi',
       'fcgid'       => 'mod_fcgid',
+      'geoip'       => 'mod_geoip',
       'ldap'        => $::apache::version::distrelease ? {
         '7'     => 'mod_ldap',
         default => undef,
diff --git a/templates/mod/geoip.conf.erb b/templates/mod/geoip.conf.erb
new file mode 100644
index 0000000000..92f5dd6871
--- /dev/null
+++ b/templates/mod/geoip.conf.erb
@@ -0,0 +1,22 @@
+GeoIPEnable <%= @enable %>
+
+<%- if @dbfile and ! [ false, 'false', '' ].include?(@dbfile) -%>
+    <%- if @dbfile.kind_of?(Array) -%>
+      <%- Array(@dbfile).each do |file| -%>
+GeoIPDBFile <%= file %> <%= @flag %>
+      <%- end -%>
+    <%- else -%>
+GeoIPDBFile <%= @dbfile %> <%= @flag %>
+    <%- end -%>
+<%- end -%>
+GeoIPOutput <%= @output %>
+<% if @enableutf8 -%>
+GeoIPEnableUTF8 <%= @enableutf8 %>
+<% end -%>
+<% if @scanproxyheaders -%>
+GeoIPScanProxyHeaders <%= @scanproxyheaders %>
+<% end -%>
+<% if @uselastxforwarededforip -%>
+GeoIPUseLastXForwardedForIP <%= @uselastxforwarededforip %>
+<% end -%>
+
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 4f40cace4e..e31e31b0d4 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -34,6 +34,9 @@
     Header <%= header %>
       <%- end -%>
     <%- end -%>
+    <%- if directory['geoip_enable'] and directory['geoip_enable'] != '' -%>
+    GeoIPEnable <%= directory['geoip_enable'] %>
+    <%- end -%>
     <%- if directory['options'] -%>
     Options <%= Array(directory['options']).join(' ') %>
     <%- end -%>

From fefaa40ed3fe7b5fc35b6028a3bf1c908c688be9 Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Mon, 23 Mar 2015 17:53:50 +0100
Subject: [PATCH 0580/2267] Fix variable names, convert flags to bool and use
 bool2httpd function

---
 README.md                        | 12 ++++++------
 manifests/mod/geoip.pp           | 22 +++++++++++-----------
 templates/mod/geoip.conf.erb     | 22 +++++++++++-----------
 templates/vhost/_directories.erb |  4 ++--
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 87f4412887..804645a2d4 100644
--- a/README.md
+++ b/README.md
@@ -635,14 +635,14 @@ These are the default settings:
 
 ```puppet
   class {'apache::mod::geoip':
-    $enable => 'Off',
-    $dbfile => '/usr/share/GeoIP/GeoIP.dat',
-    $flag   => 'Standard',
-    $output => 'All',
+    $enable  => false,
+    $db_file => '/usr/share/GeoIP/GeoIP.dat',
+    $flag    => 'Standard',
+    $output  => 'All',
   }
 ```
 
-The parameter `dbfile` can be a single directory or a hash of directories.
+The parameter `db_file` can be a single directory or a hash of directories.
 
 ####Class: `apache::mod::info`
 
@@ -1859,7 +1859,7 @@ Note that you must declare `class {'apache::mod::geoip': }` before using this di
       docroot     => '/var/www/first',
       directories => [
         { path         => '/var/www/first',
-          geoip_enable => 'On',
+          geoip_enable => true,
         },
       ],
     }
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index 5f4a8ab1d8..4e87cb96a6 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -1,22 +1,22 @@
 class apache::mod::geoip (
-  $enable                  = 'Off',
-  $dbfile                  = '/usr/share/GeoIP/GeoIP.dat',
-  $flag                    = 'Standard',
-  $output                  = 'All',
-  $enableutf8              = undef,
-  $scanproxyheaders        = undef,
-  $uselastxforwarededforip = undef,
+  $enable                     = false,
+  $db_file                    = '/usr/share/GeoIP/GeoIP.dat',
+  $flag                       = 'Standard',
+  $output                     = 'All',
+  $enable_utf8                = undef,
+  $scan_proxy_headers         = undef,
+  $use_last_xforwarededfor_ip = undef,
 ) {
   ::apache::mod { 'geoip': }
 
   # Template uses:
   # - enable
-  # - dbfile
+  # - db_file
   # - flag
   # - output
-  # - enableutf8
-  # - scanproxyheaders
-  # - uselastxforwarededforip
+  # - enable_utf8
+  # - scan_proxy_headers
+  # - use_last_xforwarededfor_ip
   file { 'geoip.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/geoip.conf",
diff --git a/templates/mod/geoip.conf.erb b/templates/mod/geoip.conf.erb
index 92f5dd6871..84b5dfe92c 100644
--- a/templates/mod/geoip.conf.erb
+++ b/templates/mod/geoip.conf.erb
@@ -1,22 +1,22 @@
-GeoIPEnable <%= @enable %>
+GeoIPEnable <%= scope.function_bool2httpd([@enable]) %>
 
-<%- if @dbfile and ! [ false, 'false', '' ].include?(@dbfile) -%>
-    <%- if @dbfile.kind_of?(Array) -%>
-      <%- Array(@dbfile).each do |file| -%>
+<%- if @db_file and ! [ false, 'false', '' ].include?(@db_file) -%>
+    <%- if @db_file.kind_of?(Array) -%>
+      <%- Array(@db_file).each do |file| -%>
 GeoIPDBFile <%= file %> <%= @flag %>
       <%- end -%>
     <%- else -%>
-GeoIPDBFile <%= @dbfile %> <%= @flag %>
+GeoIPDBFile <%= @db_file %> <%= @flag %>
     <%- end -%>
 <%- end -%>
 GeoIPOutput <%= @output %>
-<% if @enableutf8 -%>
-GeoIPEnableUTF8 <%= @enableutf8 %>
+<% if ! @enable_utf8.nil? -%>
+GeoIPEnableUTF8 <%= scope.function_bool2httpd([@enable_utf8]) %>
 <% end -%>
-<% if @scanproxyheaders -%>
-GeoIPScanProxyHeaders <%= @scanproxyheaders %>
+<% if ! @scan_proxy_headers.nil? -%>
+GeoIPScanProxyHeaders <%= scope.function_bool2httpd([@scan_proxy_headers]) %>
 <% end -%>
-<% if @uselastxforwarededforip -%>
-GeoIPUseLastXForwardedForIP <%= @uselastxforwarededforip %>
+<% if ! @use_last_xforwarededfor_ip.nil? -%>
+GeoIPUseLastXForwardedForIP <%= scope.function_bool2httpd([@use_last_xforwarededfor_ip]) %>
 <% end -%>
 
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index e31e31b0d4..43afb0397a 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -34,8 +34,8 @@
     Header <%= header %>
       <%- end -%>
     <%- end -%>
-    <%- if directory['geoip_enable'] and directory['geoip_enable'] != '' -%>
-    GeoIPEnable <%= directory['geoip_enable'] %>
+    <%- if ! directory['geoip_enable'].nil? -%>
+    GeoIPEnable <%= scope.function_bool2httpd([directory['geoip_enable']]) %>
     <%- end -%>
     <%- if directory['options'] -%>
     Options <%= Array(directory['options']).join(' ') %>

From 6314dec51c4e8b5d8a7133754b2fd32c5bf721cd Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Thu, 19 Mar 2015 14:34:37 -0700
Subject: [PATCH 0581/2267] Update tests for rspec-puppet 2.0

This patch:
 - changes the raise_error matcher and the resource inspection to use
   `catalogue` instead of `subject` since `subject` since `subject` is
   not evaluated the way it used to be
 - changes `should compile` to `catalogue` in other raise_error
   matchers to be consistent
 - changes the resource count to use an rspec-puppet method instead of
   inspecting the subject and adjusting for meta resources
 - unpins rspec-puppet
---
 Gemfile                            | 1 -
 spec/classes/apache_spec.rb        | 6 +++---
 spec/classes/mod/fcgid_spec.rb     | 2 +-
 spec/classes/mod/peruser_spec.rb   | 2 +-
 spec/classes/mod/ssl_spec.rb       | 2 +-
 spec/classes/mod/wsgi_spec.rb      | 4 ++--
 spec/classes/params_spec.rb        | 5 +----
 spec/classes/service_spec.rb       | 4 ++--
 spec/defines/custom_config_spec.rb | 6 +++---
 9 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 62c5693973..2452d15b82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 group :development, :unit_tests do
   gem 'rake',                    :require => false
   gem 'rspec-core', '3.1.7',     :require => false
-  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 2be2ef346a..07ef1cc270 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -487,7 +487,7 @@
         let :params do
           { :mpm_module => 'breakme' }
         end
-        it { expect { subject }.to raise_error Puppet::Error, /does not match/ }
+        it { expect { catalogue }.to raise_error Puppet::Error, /does not match/ }
       end
     end
 
@@ -561,7 +561,7 @@
         end
         it "should fail" do
           expect do
-            subject
+            catalogue
           end.to raise_error(Puppet::Error, /"foo" does not match/)
         end
       end
@@ -794,7 +794,7 @@
 
     it do
       expect {
-       should compile
+       catalogue
       }.to raise_error(Puppet::Error, /Unsupported osfamily/)
     end
   end
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index f772ff7a25..096717d351 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -57,7 +57,7 @@
       } end
 
       it 'should contain the correct config' do
-        content = subject.resource('file', 'fcgid.conf').send(:parameters)[:content]
+        content = catalogue.resource('file', 'fcgid.conf').send(:parameters)[:content]
         expect(content.split("\n").reject { |c| c =~ /(^#|^$)/ }).to eq([
           '<IfModule mod_fcgid.c>',
           '  AddHandler fcgid-script .fcgi',
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index f39cbcf6c4..097a36fff1 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -19,7 +19,7 @@
     end
     it do
       expect {
-        should compile
+        catalogue
       }.to raise_error(Puppet::Error, /Unsupported osfamily FreeBSD/)
     end
   end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 7ef8fba5c2..50aa8292fe 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -17,7 +17,7 @@
         :is_pe                  => false,
       }
     end
-    it { expect { subject }.to raise_error(Puppet::Error, /Unsupported osfamily:/) }
+    it { expect { catalogue }.to raise_error(Puppet::Error, /Unsupported osfamily:/) }
   end
 
   context 'on a RedHat OS' do
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 3f03ec907f..5fe313acf4 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -93,7 +93,7 @@
           :mod_path => '/foo/bar/baz',
         }
       end
-      it { expect { subject }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ }
+      it { expect { catalogue }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ }
     end
     describe "with mod_path but no package_name" do
       let :params do
@@ -101,7 +101,7 @@
           :package_name => '/foo/bar/baz',
         }
       end
-      it { expect { subject }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ }
+      it { expect { catalogue }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ }
     end
   end
   context "on a FreeBSD OS" do
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index 92b314f92e..d02209497b 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -17,11 +17,8 @@
     end
     it { is_expected.to contain_apache__params }
 
-    # There are 4 resources in this class currently
-    # there should not be any more resources because it is a params class
-    # The resources are class[apache::version], class[apache::params], class[main], class[settings], stage[main]
     it "Should not contain any resources" do
-      expect(subject.resources.size).to eq(5)
+      should have_resource_count(0)
     end
   end
 end
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 09906b0d35..42935aea68 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -57,7 +57,7 @@
       let (:params) {{ :service_enable => 'not-a-boolean' }}
 
       it 'should fail' do
-        expect { subject }.to raise_error(Puppet::Error, /is not a boolean/)
+        expect { catalogue }.to raise_error(Puppet::Error, /is not a boolean/)
       end
     end
 
@@ -65,7 +65,7 @@
       let (:params) {{ :service_manage => 'not-a-boolean' }}
 
       it 'should fail' do
-        expect { subject }.to raise_error(Puppet::Error, /is not a boolean/)
+        expect { catalogue }.to raise_error(Puppet::Error, /is not a boolean/)
       end
     end
 
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 4a38a1fcf8..a5efd15a2f 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -110,14 +110,14 @@
       end
       it do
         expect {
-          should compile
+          catalogue
         }.to raise_error(Puppet::Error, /Only one of \$content and \$source can be specified\./)
       end
     end
     context 'neither content nor source' do
       it do
         expect {
-          should compile
+          catalogue
         }.to raise_error(Puppet::Error, /One of \$content and \$source must be specified\./)
       end
     end
@@ -130,7 +130,7 @@
       end
       it do
         expect {
-          should compile
+          catalogue
         }.to raise_error(Puppet::Error, /is not supported for ensure/)
       end
     end

From 09afbcacc82b8fe535695980464baedfd66efccc Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 11 Feb 2015 14:55:52 -0800
Subject: [PATCH 0582/2267] Packages can't have undef names in future parser

FreeBSD sets undef as its dev package list. Spec tests with the future
parser claim this is invalid. This probably should not have worked with
the current parser anyway. This patch adds a conditional so that dev
packages are explicitly installed or not installed if they are needed.
---
 manifests/dev.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/dev.pp b/manifests/dev.pp
index 4eaeb55782..6bd865606c 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -4,8 +4,10 @@
   }
   include ::apache::params
   $packages = $::apache::params::dev_packages
-  package { $packages:
-    ensure  => present,
-    require => Package['httpd'],
+  if $packages { # FreeBSD doesn't have dev packages to install
+    package { $packages:
+      ensure  => present,
+      require => Package['httpd'],
+    }
   }
 }

From 85269f1c7bb385ea8b2c52a3b15374627e702f97 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 11 Feb 2015 14:58:16 -0800
Subject: [PATCH 0583/2267] Update vhost spec for future parser

Setting a variable to '' in the future parser is not the same as
leaving it unset. This patch removes parameter declarations where the
parameter being set would conflict with another parameter.
---
 spec/defines/vhost_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index add8a2b4ab..865fe963d7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -168,7 +168,6 @@
           'log_level'                   => 'crit',
           'access_log'                  => false,
           'access_log_file'             => 'httpd_access_log',
-          'access_log_pipe'             => '',
           'access_log_syslog'           => true,
           'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
           'access_log_env_var'          => '',
@@ -187,7 +186,6 @@
           ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
-          'error_log_pipe'              => '',
           'error_log_syslog'            => true,
           'error_documents'             => 'true',
           'fallbackresource'            => '/index.php',

From c46221e169ab3d0874eeef22c5b7a717d3c1ee98 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Thu, 19 Mar 2015 14:14:57 -0700
Subject: [PATCH 0584/2267] Remove unneeded gem dependencies

puppetlabs_spec_helper takes care of these dependencies for us.
---
 Gemfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2452d15b82..cc77f38cfa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,8 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
-  gem 'rake',                    :require => false
   gem 'rspec-core', '3.1.7',     :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false

From a7afbdb3450a8af6269a4de77c2b652529269638 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 23 Mar 2015 11:54:13 -0700
Subject: [PATCH 0585/2267] Put Puppet 2.7 envs in .sync.yml

We want to eventually drop puppet 2.7 support in all modules. This will
be easier if the central modulesync config repo isn't enforcing that
all modules test on 2.7. When support needs to be dropped, we can just
remove it from this .sync.yml file.
---
 .sync.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 96d3c2bdb6..9c89f69186 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,10 +1,10 @@
 ---
 .travis.yml:
   extras:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 Rakefile:
   extra_disabled_lint_checks:
   - 'disable_only_variable_string'

From 4182dcf269c3dfc1e209d2968e59d9ceb2795d85 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 23 Mar 2015 12:19:16 -0700
Subject: [PATCH 0586/2267] Update .travis.yml

This commit makes the following changes to the test matrix:

- Runs tests on ruby 2.1.5 instead of 2.0.0
- Runs tests on ruby 1.8.7 with puppet 3.x
- Adds an environment to run on an intermediate 3.x puppet version
  instead of latest (specifically 3.4.x)
- Adds an environment to run with the future parser on latest puppet.
  This would affect the test runs for the validate and spec checks.
- Runs the tests on docker
---
 .travis.yml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd66c7d1c3..d1a0d7cd93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,28 @@
 ---
+sudo: false
 language: ruby
 bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
   - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
+  - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
+  - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 notifications:
   email: false

From 92b04aaeee8776ab9031a56c31ac12548bb196df Mon Sep 17 00:00:00 2001
From: Alice Nodelman <alice@puppetlabs.com>
Date: Tue, 24 Mar 2015 11:35:33 -0700
Subject: [PATCH 0587/2267] (BKR-147) add Gemfile setting for BEAKER_VERSION
 for puppet...

puppetdb, etc

- support for BEAKER_VERSION and BEAKER_RSPEC_VERSION in gemfile
---
 Gemfile | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 62c5693973..e1ae0fa56a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,15 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
+def location_for(place, fake_version = nil)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
 group :development, :unit_tests do
   gem 'rake',                    :require => false
   gem 'rspec-core', '3.1.7',     :require => false
@@ -11,8 +21,17 @@ group :development, :unit_tests do
   gem 'json',                    :require => false
 end
 
+beaker_version = ENV['BEAKER_VERSION']
+beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
 group :system_tests do
-  gem 'beaker-rspec',  :require => false
+  if beaker_version
+    gem 'beaker', *location_for(beaker_version)
+  end
+  if beaker_rspec_version
+    gem 'beaker-rspec', *location_for(beaker_rspec_version)
+  else
+    gem 'beaker-rspec',  :require => false
+  end
   gem 'serverspec',    :require => false
 end
 

From d0b9e8207d730360060465fef4e5accadc73b94f Mon Sep 17 00:00:00 2001
From: stanner <stanner@vtti.vt.edu>
Date: Wed, 25 Mar 2015 14:52:55 -0400
Subject: [PATCH 0588/2267] Fixed setting multiple env_var in a location block
 for proxy pass.

---
 templates/vhost/_proxy.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 67c8eb274a..f290fcb764 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -27,7 +27,7 @@
   <%- end -%>
   <%- if proxy['setenv'] -%>
     <%- Array(proxy['setenv']).each do |setenv_var| -%>
-    SetEnv <%= setenv_var -%>
+    SetEnv <%= setenv_var %>
     <%- end -%>
   <%- end -%>
   </Location>

From 4290182ba4b0432bcb0deae2e2ab963dd116a456 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 9 Mar 2015 14:30:01 +0100
Subject: [PATCH 0589/2267] no longer enforce default value for $apache_name

---
 manifests/package.pp | 4 ++--
 manifests/vhost.pp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/package.pp b/manifests/package.pp
index 395c03103c..6595cb92dd 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -44,10 +44,10 @@
           before => Package['httpd'],
         }
       }
-      $apache_package = $::apache::params::apache_name
+      $apache_package = $::apache::apache_name
     }
     default: {
-      $apache_package = $::apache::params::apache_name
+      $apache_package = $::apache::apache_name
     }
   }
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 70d2a57bb9..4cb440b535 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -125,7 +125,7 @@
     fail('You must include the apache base class before using any apache defined resources')
   }
 
-  $apache_name = $::apache::params::apache_name
+  $apache_name = $::apache::apache_name
 
   validate_re($ensure, '^(present|absent)$',
   "${ensure} is not supported for ensure.

From 296aab51eb4925dcc80cb60bd2d99f51d121df99 Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@persgroep.be>
Date: Mon, 16 Mar 2015 13:29:38 +0100
Subject: [PATCH 0590/2267] The base class must be defined first so the
 parameters are known

This also implies the dependency for the tests needed to be changed.
Because of the changed dependency, tests needed some extra facts to please
the concat module.
---
 manifests/dev.pp             |  3 ---
 manifests/package.pp         |  6 ++++++
 spec/classes/dev_spec.rb     | 29 +++++++++++++++++++++++------
 spec/classes/mod/dev_spec.rb | 20 +++++++++++---------
 4 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/manifests/dev.pp b/manifests/dev.pp
index 6bd865606c..b1947e9344 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -1,7 +1,4 @@
 class apache::dev {
-  if $::osfamily == 'FreeBSD' and !defined(Class['apache::package']) {
-    fail('apache::dev requires apache::package; please include apache or apache::package class first')
-  }
   include ::apache::params
   $packages = $::apache::params::dev_packages
   if $packages { # FreeBSD doesn't have dev packages to install
diff --git a/manifests/package.pp b/manifests/package.pp
index 6595cb92dd..728b26010e 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -2,6 +2,12 @@
   $ensure     = 'present',
   $mpm_module = $::apache::params::mpm_module,
 ) inherits ::apache::params {
+
+  # The base class must be included first because it is used by parameter defaults
+  if ! defined(Class['apache']) {
+    fail('You must include the apache base class before using any apache defined resources')
+  }
+
   case $::osfamily {
     'FreeBSD': {
       case $mpm_module {
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index e2e0b47af8..eb3d76593a 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe 'apache::dev', :type => :class do
+  let(:pre_condition) {[
+    'include apache'
+  ]}
   context "on a Debian OS" do
     let :facts do
       {
@@ -9,6 +12,10 @@
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
         :is_pe                  => false,
+        :concat_basedir         => '/foo',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        :kernel                 => 'Linux'
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -25,6 +32,10 @@
         :operatingsystem        => 'Ubuntu',
         :operatingsystemrelease => '14.04',
         :is_pe                  => false,
+        :concat_basedir         => '/foo',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        :kernel                 => 'Linux'
       }
     end
     it { is_expected.to contain_package("apache2-dev") }
@@ -36,29 +47,31 @@
         :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '6',
         :is_pe                  => false,
+        :concat_basedir         => '/foo',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        :kernel                 => 'Linux'
       }
     end
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.to contain_package("httpd-devel") }
   end
   context "on a FreeBSD OS" do
-    let :pre_condition do
-      'include apache::package'
-    end
     let :facts do
       {
         :osfamily               => 'FreeBSD',
         :operatingsystem        => 'FreeBSD',
         :operatingsystemrelease => '9',
         :is_pe                  => false,
+        :concat_basedir         => '/foo',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        :kernel                 => 'FreeBSD'
       }
     end
     it { is_expected.to contain_class("apache::params") }
   end
   context "on a Gentoo OS" do
-    let :pre_condition do
-      'include apache::package'
-    end
     let :facts do
       {
         :osfamily               => 'Gentoo',
@@ -66,6 +79,10 @@
         :operatingsystemrelease => '3.16.1-gentoo',
         :concat_basedir         => '/dne',
         :is_pe                  => false,
+        :concat_basedir         => '/foo',
+        :id                     => 'root',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        :kernel                 => 'Linux'
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index f653389776..1686a02755 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -1,16 +1,14 @@
 require 'spec_helper'
 
 describe 'apache::mod::dev', :type => :class do
+  let(:pre_condition) {[
+    'include apache'
+  ]}
   [
-    ['RedHat',  '6', 'Santiago'],
-    ['Debian',  '6', 'squeeze'],
-    ['FreeBSD', '9', 'FreeBSD'],
-  ].each do |osfamily, operatingsystemrelease, lsbdistcodename|
-    if osfamily == 'FreeBSD'
-      let :pre_condition do
-        'include apache::package'
-      end
-    end
+    ['RedHat',  '6', 'Santiago', 'Linux'],
+    ['Debian',  '6', 'squeeze', 'Linux'],
+    ['FreeBSD', '9', 'FreeBSD', 'FreeBSD'],
+  ].each do |osfamily, operatingsystemrelease, lsbdistcodename, kernel|
     context "on a #{osfamily} OS" do
       let :facts do
         {
@@ -19,6 +17,10 @@
           :operatingsystem        => osfamily,
           :operatingsystemrelease => operatingsystemrelease,
           :is_pe                  => false,
+          :concat_basedir         => '/foo',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+          :kernel                 => kernel
         }
       end
       it { is_expected.to contain_class('apache::dev') }

From 11d0a0abb2fa2d4a1bb5a5f98c4d28a847378b57 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Thu, 26 Mar 2015 13:15:01 -0700
Subject: [PATCH 0591/2267] Fix remoteip unit test for rspec-puppet 2

We updated the rspec-puppet tests, then merged e0255bdf,which assumed
rspec-puppet 1. This patch updates the newly merged tests for the
remoteip mod.
---
 spec/classes/mod/remoteip_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index e3d095351a..c9f5b4e831 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -46,7 +46,7 @@
         { :apache_version => '2.2' }
       end
       it 'should fail' do
-        expect { subject }.to raise_error(Puppet::Error, /mod_remoteip is only available in Apache 2.4/)
+        expect { catalogue }.to raise_error(Puppet::Error, /mod_remoteip is only available in Apache 2.4/)
       end
     end
   end

From 8f8f6acf0dfefa7a7f6496404a0ce68d5c32a34f Mon Sep 17 00:00:00 2001
From: Pmoranga <pmoranga@users.noreply.github.com>
Date: Sat, 28 Mar 2015 21:41:48 +0100
Subject: [PATCH 0592/2267] fix syntax of code examples

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index a6e3258d69..d9acce283b 100644
--- a/README.md
+++ b/README.md
@@ -811,9 +811,9 @@ Installs Apache mod_status and uses the status.conf.erb template. These are the
 
 ```puppet
     class { 'apache::mod::status':
-      allow_from      = ['127.0.0.1','::1'],
-      extended_status = 'On',
-      status_path     = '/server-status',
+      allow_from      => ['127.0.0.1','::1'],
+      extended_status => 'On',
+      status_path     => '/server-status',
 ){
 
 
@@ -826,9 +826,9 @@ Installs Apache mod_expires and uses the expires.conf.erb template. These are th
 
 ```puppet
     class { 'apache::mod::expires':
-      expires_active  = true,
-      expires_default = undef,
-      expires_by_type = undef,
+      expires_active  => true,
+      expires_default => undef,
+      expires_by_type => undef,
 ){
 
 
@@ -839,7 +839,7 @@ Installs Apache mod_expires and uses the expires.conf.erb template. These are th
 
 ```puppet
   class { 'apache::mod::expires':
-    expires_by_type = [
+    expires_by_type => [
       { 'text/json' => 'access plus 1 month' },
       { 'text/html' => 'access plus 1 year' },
     ]
@@ -868,8 +868,8 @@ To specify an alternate mod\_wsgi package name to install and the name of the mo
       wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
       wsgi_python_home   => '/path/to/venv',
       wsgi_python_path   => '/path/to/venv/site-packages',
-	  package_name       => 'python27-mod_wsgi',
-	  mod_path           => 'python27-mod_wsgi.so',
+      package_name       => 'python27-mod_wsgi',
+      mod_path           => 'python27-mod_wsgi.so',
     }
 ```
 

From 8ffc8a4b73fece51223a2f8cb5dbff3403095f48 Mon Sep 17 00:00:00 2001
From: Ken Geis <geis.ken@gmail.com>
Date: Mon, 30 Mar 2015 15:57:03 -0700
Subject: [PATCH 0593/2267] Update README.md

fix typo
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a6e3258d69..5a6a356fa0 100644
--- a/README.md
+++ b/README.md
@@ -1705,7 +1705,7 @@ General `directories` usage looks something like
 
 *Note:* At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
 
-Available handlers, represented as keys, should be placed within the `directory`,`'files`, or `location` hashes.  This looks like
+Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes.  This looks like
 
 ```puppet
     apache::vhost { 'sample.example.net':

From 8190107158fb2e3fe868810f5b5d736c4d08f519 Mon Sep 17 00:00:00 2001
From: Christian Kaenzig <christian.kaenzig@camptocamp.com>
Date: Tue, 31 Mar 2015 11:36:17 +0200
Subject: [PATCH 0594/2267] (MODULES-1874) Fix proxy_connect module on apache
 >= 2.2

As discussed in MODULES-1874, the proxy_connect module exists since
Apache 2.2, so there is no reason to restrict it to Apache >= 2.4.
---
 manifests/mod/proxy_connect.pp         |  2 +-
 spec/classes/mod/proxy_connect_spec.rb | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/proxy_connect.pp b/manifests/mod/proxy_connect.pp
index 3bae848446..7adef1f899 100644
--- a/manifests/mod/proxy_connect.pp
+++ b/manifests/mod/proxy_connect.pp
@@ -1,7 +1,7 @@
 class apache::mod::proxy_connect (
   $apache_version  = $::apache::apache_version,
 ) {
-  if versioncmp($apache_version, '2.4') >= 0 {
+  if versioncmp($apache_version, '2.2') >= 0 {
     Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_connect']
     ::apache::mod { 'proxy_connect': }
   }
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index f4b4cc2e6b..dbb314c2bf 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -19,7 +19,7 @@
         :is_pe                  => false,
       }
     end
-    context 'with Apache version < 2.4' do
+    context 'with Apache version < 2.2' do
       let :facts do
         super().merge({
           :operatingsystemrelease => '7.0',
@@ -28,11 +28,25 @@
       end
       let :params do
         {
-          :apache_version => '2.2',
+          :apache_version => '2.1',
         }
       end
       it { is_expected.not_to contain_apache__mod('proxy_connect') }
     end
+    context 'with Apache version = 2.2' do
+      let :facts do
+        super().merge({
+          :operatingsystemrelease => '7.0',
+          :lsbdistcodename        => 'wheezy',
+        })
+      end
+      let :params do
+        {
+          :apache_version => '2.2',
+        }
+      end
+      it { is_expected.to contain_apache__mod('proxy_connect') }
+    end
     context 'with Apache version >= 2.4' do
       let :facts do
         super().merge({

From c901662a60f92632fa8eecbc478b1ef24d3f4c56 Mon Sep 17 00:00:00 2001
From: Neil Prockter <prockter@lse.ac.uk>
Date: Thu, 9 Apr 2015 22:49:33 +0100
Subject: [PATCH 0595/2267] validate_apache_log_level function to apply same
 test to both apache class and vhost - trace levels also supported

---
 .../functions/validate_apache_log_level.rb    | 27 +++++++++++++
 manifests/init.pp                             |  5 +--
 manifests/vhost.pp                            |  3 +-
 .../functions/validate_apache_log_level.rb    | 39 +++++++++++++++++++
 4 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 lib/puppet/parser/functions/validate_apache_log_level.rb
 create mode 100644 spec/unit/puppet/parser/functions/validate_apache_log_level.rb

diff --git a/lib/puppet/parser/functions/validate_apache_log_level.rb b/lib/puppet/parser/functions/validate_apache_log_level.rb
new file mode 100644
index 0000000000..8a1ade0bed
--- /dev/null
+++ b/lib/puppet/parser/functions/validate_apache_log_level.rb
@@ -0,0 +1,27 @@
+module Puppet::Parser::Functions
+  newfunction(:validate_apache_log_level, :doc => <<-'ENDHEREDOC') do |args|
+    Perform simple validation of a string against the list of known log
+    levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel
+        validate_apache_loglevel('info')
+
+    Modules maybe specified with their own levels like these:
+        validate_apache_loglevel('warn ssl:info')
+        validate_apache_loglevel('warn mod_ssl.c:info')
+        validate_apache_loglevel('warn ssl_module:info')
+
+    Expected to be used from the main or vhost.
+    
+    Might be used from directory too later as apaceh supports that
+
+    ENDHEREDOC
+    if (args.size != 1) then
+      raise Puppet::ParseError, ("validate_apache_loglevel(): wrong number of arguments (#{args.length}; must be 1)")
+    end
+
+    log_level = args[0]
+    msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."
+
+    raise Puppet::ParseError, (msg) unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
+
+  end
+end
diff --git a/manifests/init.pp b/manifests/init.pp
index 0b8544f93a..fc7049b9b7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -124,10 +124,7 @@
     }
   }
 
-  $valid_log_level_re = '(emerg|alert|crit|error|warn|notice|info|debug)'
-
-  validate_re($log_level, $valid_log_level_re,
-  "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
+  validate_apache_log_level($log_level)
 
   class { '::apache::service':
     service_name   => $service_name,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4cb440b535..fb4136805b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -186,8 +186,7 @@
   Allowed values are 'directory' and 'absent'.")
 
   if $log_level {
-    validate_re($log_level, '^(emerg|alert|crit|error|warn|notice|info|debug)$',
-    "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
+    validate_apache_log_level($log_level)
   }
 
   if $access_log_file and $access_log_pipe {
diff --git a/spec/unit/puppet/parser/functions/validate_apache_log_level.rb b/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
new file mode 100644
index 0000000000..dfef66eeab
--- /dev/null
+++ b/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
@@ -0,0 +1,39 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+describe "the validate_apache_log_level function" do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  it "should exist" do
+    expect(Puppet::Parser::Functions.function("validate_apache_log_level")).to eq("function_validate_apache_log_level")
+  end
+
+  it "should raise a ParseError if there is less than 1 arguments" do
+    expect { scope.function_validate_apache_log_level([]) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should raise a ParseError when given garbage" do
+    expect { scope.function_validate_apache_log_level(['garbage']) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should not raise a ParseError when given a plain log level" do
+    expect { scope.function_validate_apache_log_level(['info']) }.to_not raise_error 
+  end
+
+  it "should not raise a ParseError when given a log level and module log level" do
+    expect { scope.function_validate_apache_log_level(['warn ssl:info']) }.to_not raise_error 
+  end
+
+  it "should not raise a ParseError when given a log level and module log level" do
+    expect { scope.function_validate_apache_log_level(['warn mod_ssl.c:info']) }.to_not raise_error 
+  end
+
+  it "should not raise a ParseError when given a log level and module log level" do
+    expect { scope.function_validate_apache_log_level(['warn ssl_module:info']) }.to_not raise_error 
+  end
+
+  it "should not raise a ParseError when given a trace level" do
+    expect { scope.function_validate_apache_log_level(['trace4']) }.to_not raise_error 
+  end
+
+end

From b1d640ffd5d79fd7442eab2f3f4120ce73406025 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 9 Mar 2015 14:45:59 +0100
Subject: [PATCH 0596/2267] make $lib_path configurable

---
 README.md             | 4 ++++
 manifests/init.pp     | 1 +
 manifests/mod.pp      | 2 +-
 manifests/mod/wsgi.pp | 2 +-
 manifests/mpm.pp      | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 22519bc48c..c64da7ae87 100644
--- a/README.md
+++ b/README.md
@@ -347,6 +347,10 @@ Sets the amount of time the server waits for subsequent requests on a persistent
 
 Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.
 
+#####`lib_path`
+
+Specifies the location where apache module files are stored. It should not be configured manually without special reason.
+
 #####`loadfile_name`
 
 Sets the file name for the module loadfile. Should be in the format *.load.  This can be used to set the module load order.
diff --git a/manifests/init.pp b/manifests/init.pp
index 0b8544f93a..02c11dbf17 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -48,6 +48,7 @@
   $mod_dir                = $::apache::params::mod_dir,
   $mod_enable_dir         = $::apache::params::mod_enable_dir,
   $mpm_module             = $::apache::params::mpm_module,
+  $lib_path               = $::apache::params::lib_path,
   $conf_template          = $::apache::params::conf_template,
   $servername             = $::apache::params::servername,
   $manage_user            = true,
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 0891bf0b77..bc52d2e201 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -2,7 +2,7 @@
   $package        = undef,
   $package_ensure = 'present',
   $lib            = undef,
-  $lib_path       = $::apache::params::lib_path,
+  $lib_path       = $::apache::lib_path,
   $id             = undef,
   $path           = undef,
   $loadfile_name  = undef,
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 80f9738ff9..bff5b46b7c 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -14,7 +14,7 @@
     if $mod_path =~ /\// {
       $_mod_path = $mod_path
     } else {
-      $_mod_path = "${::apache::params::lib_path}/${mod_path}"
+      $_mod_path = "${::apache::lib_path}/${mod_path}"
     }
     ::apache::mod { 'wsgi':
       package => $package_name,
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index a5cca49882..2478184f51 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -1,5 +1,5 @@
 define apache::mpm (
-  $lib_path       = $::apache::params::lib_path,
+  $lib_path       = $::apache::lib_path,
   $apache_version = $::apache::apache_version,
 ) {
   if ! defined(Class['apache']) {

From b4c7ce6f9dafdd792db5bd3db0b19bf368f5e33b Mon Sep 17 00:00:00 2001
From: Maurits Landewers <m.landewers@oxilion.nl>
Date: Tue, 14 Apr 2015 11:41:25 +0200
Subject: [PATCH 0597/2267] Fix typo in expires documentation

---
 manifests/mod/expires.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index 8c1ce84410..10542916aa 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -6,9 +6,9 @@
   ::apache::mod { 'expires': }
 
   # Template uses
-  # $expries_active
-  # $expries_default
-  # $expries_by_type
+  # $expires_active
+  # $expires_default
+  # $expires_by_type
   file { 'expires.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/expires.conf",

From 7fdafeeb3bdda9c5fc4d7bb1cfaa3c236e1b40e5 Mon Sep 17 00:00:00 2001
From: Matthias Kneer <matze@roterruler.de>
Date: Tue, 14 Apr 2015 12:56:10 +0200
Subject: [PATCH 0598/2267] - Changed vhost.pp to make use of the proxy
 template when proxy_pass_match is defined - Added rspec tests for
 proxy_pass_match

---
 manifests/vhost.pp            |  3 +-
 spec/acceptance/vhost_spec.rb | 68 +++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index fb4136805b..bbb5e61f2b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -624,9 +624,10 @@
   # Template uses:
   # - $proxy_dest
   # - $proxy_pass
+  # - $proxy_pass_match
   # - $proxy_preserve_host
   # - $no_proxy_uris
-  if $proxy_dest or $proxy_pass {
+  if $proxy_dest or $proxy_pass or $proxy_pass_match {
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}${filename}.conf",
       order   => 140,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 6fe87c5a84..08594fa228 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -119,6 +119,33 @@ class { 'apache': }
     end
   end
 
+  context 'new proxy vhost on port 80' do
+    it 'should configure an apache proxy vhost' do
+      pp = <<-EOS
+        class { 'apache': }
+        apache::vhost { 'proxy.example.com':
+          port    => '80',
+          docroot => '/var/www/proxy',
+          proxy_pass_match => [
+            { 'path' => '/foo', 'url' => 'http://backend-foo/'},
+          ],
+        proxy_preserve_host   => true,
+        proxy_error_override  => true,
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
+      it { is_expected.to contain '<VirtualHost \*:80>' }
+      it { is_expected.to contain "ServerName proxy.example.com" }
+      it { is_expected.to contain "ProxyPassMatch" }
+      it { is_expected.to contain "ProxyPreserveHost On" }
+      it { is_expected.to contain "ProxyErrorOverride On" }
+      it { is_expected.not_to contain "<Proxy \*>" }
+    end
+  end
+
   context 'new vhost on port 80' do
     it 'should configure two apache vhosts' do
       pp = <<-EOS
@@ -498,6 +525,47 @@ class { 'apache': default_vhost => false, }
     end
   end
 
+  context 'proxy_pass_match for alternative vhost' do
+    it 'should configure a local vhost and a proxy vhost' do
+      apply_manifest(%{
+        class { 'apache': default_vhost => false, }
+        apache::vhost { 'localhost':
+          docroot => '/var/www/local',
+          ip      => '127.0.0.1',
+          port    => '8888',
+        }
+        apache::listen { '*:80': }
+        apache::vhost { 'proxy.example.com':
+          docroot    => '/var/www',
+          port       => '80',
+          add_listen => false,
+          proxy_pass_match => {
+            'path' => '/',
+            'url'  => 'http://localhost:8888/subdir/',
+          },
+        }
+        host { 'proxy.example.com': ip => '127.0.0.1', }
+        file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
+        file { '/var/www/local/subdir/index.html':
+          ensure  => file,
+          content => "Hello from localhost\\n",
+        }
+                     }, :catch_failures => true)
+    end
+
+    describe service($service_name) do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    it 'should get a response from the back end' do
+      shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
+        expect(r.stdout).to eq("Hello from localhost\n")
+        expect(r.exit_code).to eq(0)
+      end
+    end
+  end
+
   describe 'ip_based' do
     it 'applies cleanly' do
       pp = <<-EOS

From 26b77592d86bc3f4fe9cc68277c844b000a8799d Mon Sep 17 00:00:00 2001
From: Matthias Kneer <matze@roterruler.de>
Date: Tue, 14 Apr 2015 14:08:48 +0200
Subject: [PATCH 0599/2267] - Changed rspec test for proxy_pass_match to be
 more precise

---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 08594fa228..434607531f 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -139,7 +139,7 @@ class { 'apache': }
     describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
       it { is_expected.to contain "ServerName proxy.example.com" }
-      it { is_expected.to contain "ProxyPassMatch" }
+      it { is_expected.to contain "ProxyPassMatch\s+/foo http://backend-foo/" }
       it { is_expected.to contain "ProxyPreserveHost On" }
       it { is_expected.to contain "ProxyErrorOverride On" }
       it { is_expected.not_to contain "<Proxy \*>" }

From 3c2063330d4ecfbf9c89d4b4c4e7459f476e4d8f Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Tue, 14 Apr 2015 12:25:30 -0700
Subject: [PATCH 0600/2267] Use string instead, not regex, for file test

The beaker-rspec contains matcher does not understand "+" in the
context of checking whether a string is contained in a file resource
(though it does seem to understand "\s" just fine), which was causing
acceptance test failures. Since we know the exact string to expect we
just remove the regular expression bits.
---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 434607531f..b5d51e91f4 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -139,7 +139,7 @@ class { 'apache': }
     describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
       it { is_expected.to contain "ServerName proxy.example.com" }
-      it { is_expected.to contain "ProxyPassMatch\s+/foo http://backend-foo/" }
+      it { is_expected.to contain "ProxyPassMatch /foo http://backend-foo/" }
       it { is_expected.to contain "ProxyPreserveHost On" }
       it { is_expected.to contain "ProxyErrorOverride On" }
       it { is_expected.not_to contain "<Proxy \*>" }

From 880cf46d1d9a78b090008ee45f115e12059d1f38 Mon Sep 17 00:00:00 2001
From: Joe Gracyk <jgracyk@gmail.com>
Date: Wed, 15 Apr 2015 23:31:30 -0700
Subject: [PATCH 0601/2267] MODULES-1937: avoids matching Amazon Linux as
 RHEL7+

---
 manifests/version.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index ce3b907694..a50c9ec243 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -12,7 +12,9 @@
 
   case $::osfamily {
     'RedHat': {
-      if ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($distrelease, '7') >= 0) {
+      if ($::operatingsystem == 'Amazon') {
+        $default = '2.2'
+      } elsif ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($distrelease, '7') >= 0) {
         $default = '2.4'
       } else {
         $default = '2.2'

From 0e20f6da35c970cbc70394a78840632f58a90838 Mon Sep 17 00:00:00 2001
From: Joe Gracyk <jgracyk@gmail.com>
Date: Wed, 15 Apr 2015 23:33:03 -0700
Subject: [PATCH 0602/2267] Removed a misleading portion of a comment

---
 manifests/version.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index a50c9ec243..a0c9d0dc92 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -3,7 +3,7 @@
 # Try to automatically detect the version by OS
 #
 class apache::version {
-  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
+  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, etc.
   $osr_array = split($::operatingsystemrelease,'[\/\.]')
   $distrelease = $osr_array[0]
   if ! $distrelease {

From 8440eeca0a7dc49f72b60f35908ecb748cd505bf Mon Sep 17 00:00:00 2001
From: maneesh <maneesh.poyil@hp.com>
Date: Tue, 14 Apr 2015 14:19:36 -0700
Subject: [PATCH 0603/2267] check if ensure present before including alias
 module

---
 manifests/vhost.pp         | 2 +-
 spec/defines/vhost_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bbb5e61f2b..17f61e3132 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -361,7 +361,7 @@
 
   # Load mod_alias if needed and not yet loaded
   if ($scriptalias or $scriptaliases != []) or ($redirect_source and $redirect_dest) {
-    if ! defined(Class['apache::mod::alias']) {
+    if ! defined(Class['apache::mod::alias'])  and ($ensure == 'present') {
       include ::apache::mod::alias
     }
   }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 865fe963d7..9bdcaba36c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -448,7 +448,7 @@
       it { is_expected.to_not contain_class('apache::mod::passenger') }
       it { is_expected.to_not contain_class('apache::mod::suexec') }
       it { is_expected.to_not contain_class('apache::mod::rewrite') }
-      it { is_expected.to contain_class('apache::mod::alias') }
+      it { is_expected.to_not contain_class('apache::mod::alias') }
       it { is_expected.to_not contain_class('apache::mod::proxy') }
       it { is_expected.to_not contain_class('apache::mod::proxy_http') }
       it { is_expected.to_not contain_class('apache::mod::passenger') }

From 98766fd6790092df829c1a5f7546c1f6c8639aff Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 17 Apr 2015 15:22:58 -0700
Subject: [PATCH 0604/2267] Use concat 1.2.x

---
 .fixtures.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 6eddf260f6..4645a757fc 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,7 +1,9 @@
 fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
+    concat:
+      repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
+      branch: "1.2.x"
     portage: "git://github.com/gentoo/puppet-portage.git"
   symlinks:
     apache: "#{source_dir}"

From f1f554b57fd841adfcfcf263ed5afb2c4d958b09 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Thu, 23 Apr 2015 14:11:36 +0200
Subject: [PATCH 0605/2267] (#1971) new $service_restart parameter to influence
 httpd.

Adds a new parameter to apache and apache::service to
permit restart paramter to the httpd service to be set.

For instance this allows to a restart to be configured
as apachectl graceful for instance.

Fixes https://tickets.puppetlabs.com/browse/MODULES-1971

the change is fully backwards compatible.
---
 README.md                    |  5 +++++
 manifests/init.pp            | 10 ++++++----
 manifests/service.pp         |  8 +++++---
 spec/classes/service_spec.rb | 12 ++++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c64da7ae87..268b071b12 100644
--- a/README.md
+++ b/README.md
@@ -456,6 +456,11 @@ Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on
 
 Determines whether the HTTPD service state is managed by Puppet . Defaults to 'true'.
 
+#####`service_restart`
+
+Determines whether the HTTPD service restart command should be anything other than the default managed by Puppet.  Defaults to undef.
+
+
 #####`trace_enable`
 
 Controls how TRACE requests per RFC 2616 are handled. More information about [TraceEnable](http://httpd.apache.org/docs/current/mod/core.html#traceenable). Defaults to 'On'.
diff --git a/manifests/init.pp b/manifests/init.pp
index 37d866ad6d..22b2361aef 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -32,6 +32,7 @@
   $service_enable         = true,
   $service_manage         = true,
   $service_ensure         = 'running',
+  $service_restart        = undef,
   $purge_configs          = true,
   $purge_vhost_dir        = undef,
   $purge_vdir             = false,
@@ -128,10 +129,11 @@
   validate_apache_log_level($log_level)
 
   class { '::apache::service':
-    service_name   => $service_name,
-    service_enable => $service_enable,
-    service_manage => $service_manage,
-    service_ensure => $service_ensure,
+    service_name    => $service_name,
+    service_enable  => $service_enable,
+    service_manage  => $service_manage,
+    service_ensure  => $service_ensure,
+    service_restart => $service_restart,
   }
 
   # Deprecated backwards-compatibility
diff --git a/manifests/service.pp b/manifests/service.pp
index d934f3d46b..708027921c 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -21,6 +21,7 @@
   $service_enable = true,
   $service_ensure = 'running',
   $service_manage = true,
+  $service_restart = undef
 ) {
   # The base class must be included first because parameter defaults depend on it
   if ! defined(Class['apache::params']) {
@@ -39,9 +40,10 @@
   }
   if $service_manage {
     service { 'httpd':
-      ensure => $_service_ensure,
-      name   => $service_name,
-      enable => $service_enable,
+      ensure  => $_service_ensure,
+      name    => $service_name,
+      enable  => $service_enable,
+      restart => $service_restart
     }
   }
 }
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 42935aea68..4c851385cd 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -91,6 +91,18 @@
       let (:params) {{ :service_ensure => 'UNDEF' }}
       it { is_expected.to contain_service("httpd").without_ensure }
     end
+
+    context "with $service_restart unset" do
+      it { is_expected.to contain_service("httpd").without_restart }
+    end
+
+    context "with $service_restart => '/usr/sbin/apachectl graceful'" do
+     let (:params) {{ :service_restart => '/usr/sbin/apachectl graceful' }}
+     it { is_expected.to contain_service("httpd").with(
+        'restart' => '/usr/sbin/apachectl graceful'
+      )
+     }
+    end
   end
 
 

From 73a1b9cc9a49e5d4dd7c7083ca52d6a6c9ddbd2c Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Fri, 24 Apr 2015 09:55:17 -0700
Subject: [PATCH 0606/2267] pin apt to 1.8.0 in spec_helper_acceptance

---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index ce388328f9..1091edcaf2 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -38,7 +38,7 @@
       end
       # Required for manifest to make mod_pagespeed repository available
       if fact('osfamily') == 'Debian'
-        on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
+        on host, puppet('module','install','puppetlabs-apt', '--version 1.8.0', '--force'), { :acceptable_exit_codes => [0,1] }
       end
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module','install','puppetlabs-concat', '--version 1.1.1', '--force'), { :acceptable_exit_codes => [0,1] }

From cab441ea5727db1954cfbf67de51200876e0df7a Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 22 Apr 2015 11:46:38 -0700
Subject: [PATCH 0607/2267] Update PE dependency in 1.4.x

PE < 3.7.0 binds to puppetlabs-concat 1.0.x, which is incompatible with
the vhost rewrite that was added in puppetlabs-apache 1.2.0.
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index feb7daa194..1466e42e1a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -58,7 +58,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.7.0 < 4.0.0"
     },
     {
       "name": "puppet",

From 06536478de0ab3b329af05cc7ae11a2cd145b7fb Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 22 Apr 2015 13:00:43 -0700
Subject: [PATCH 0608/2267] 1.4.1 prep

---
 CHANGELOG.md  | 4 ++++
 metadata.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6dd08ab44..44ca14c391 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+##2015-04-28 - Supported Release 1.4.1
+
+This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module.
+
 ##2015-03-17 - Supported Release 1.4.0
 ###Summary
 
diff --git a/metadata.json b/metadata.json
index 1466e42e1a..e860ca4070 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 842e8918c30771fb26f6c5cf861fc85dacee006a Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 30 Apr 2015 10:31:39 -0700
Subject: [PATCH 0609/2267] MODULES-1968 - Update the template to warn if using
 deprecated options

---
 spec/defines/vhost_spec.rb       | 90 --------------------------------
 templates/vhost/_directories.erb |  8 +--
 2 files changed, 4 insertions(+), 94 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 865fe963d7..816fd99a1f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -793,94 +793,4 @@
       it { expect { is_expected.to compile }.to raise_error }
     end
   end
-  describe 'allow/deny/order/satisfy deprecation validation' do
-    let :default_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',
-        :is_pe                  => false,
-      }
-    end
-    context 'bad allow parameter' do
-      let :params do
-        {
-          'docroot'        => '/var/www/files',
-          'apache_version' => '2.4',
-          'directories'    => {
-            'path'     => '/var/www/files',
-            'provider' => 'files',
-            'allow'    => 'from 127.0.0.1',
-          },
-        }
-      end
-      let :facts do default_facts end
-      it do
-        expect {
-          should contain_concat__fragment('rspec.example.com-directories')
-        }.to raise_error(Puppet::Error)
-      end
-    end
-    context 'bad deny parameter' do
-      let :params do
-        {
-          'docroot'        => '/var/www/files',
-          'apache_version' => '2.4',
-          'directories'    => {
-            'path'     => '/var/www/files',
-            'provider' => 'files',
-            'deny'     => 'from 127.0.0.1',
-          },
-        }
-      end
-      let :facts do default_facts end
-      it do
-        expect {
-          should contain_concat__fragment('rspec.example.com-directories')
-        }.to raise_error(Puppet::Error)
-      end
-    end
-    context 'bad satisfy parameter' do
-      let :params do
-        {
-          'docroot'        => '/var/www/files',
-          'apache_version' => '2.4',
-          'directories'    => {
-            'path'     => '/var/www/files',
-            'provider' => 'files',
-            'satisfy'  => 'any',
-          },
-        }
-      end
-      let :facts do default_facts end
-      it do
-        expect {
-          should contain_concat__fragment('rspec.example.com-directories')
-        }.to raise_error(Puppet::Error)
-      end
-    end
-    context 'bad order parameter' do
-      let :params do
-        {
-          'docroot'        => '/var/www/files',
-          'apache_version' => '2.4',
-          'directories'    => {
-            'path'     => '/var/www/files',
-            'provider' => 'files',
-            'order'    => 'deny,allow',
-          },
-        }
-      end
-      let :facts do default_facts end
-      it do
-        expect {
-          should contain_concat__fragment('rspec.example.com-directories')
-        }.to raise_error(Puppet::Error)
-      end
-    end
-  end
 end
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 43afb0397a..1f45d2c0e6 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -4,16 +4,16 @@
   <%- [@_directories].flatten.compact.each do |directory| -%>
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
-        <%- scope.function_fail(["Apache::Vhost: Using allow is not supported in your Apache version"]) -%>
+        <%- scope.function_warning(["Apache::Vhost: Using allow is deprecated in your Apache version"]) -%>
       <%- end -%>
       <%- if directory['deny'] and ! [ false, 'false', '' ].include?(directory['deny']) -%>
-        <%- scope.function_fail(["Apache::Vhost: Using deny is not supported in your Apache version"]) -%>
+        <%- scope.function_warning(["Apache::Vhost: Using deny is deprecated in your Apache version"]) -%>
       <%- end -%>
       <%- if directory['order'] and ! [ false, 'false', '' ].include?(directory['order']) -%>
-        <%- scope.function_fail(["Apache::Vhost: Using order is not supported in your Apache version"]) -%>
+        <%- scope.function_warning(["Apache::Vhost: Using order is deprecated in your Apache version"]) -%>
       <%- end -%>
       <%- if directory['satisfy'] and ! [ false, 'false', '' ].include?(directory['satisfy']) -%>
-        <%- scope.function_fail(["Apache::Vhost: Using satisfy is not supported in your Apache version"]) -%>
+        <%- scope.function_warning(["Apache::Vhost: Using satisfy is deprecated in your Apache version"]) -%>
       <%- end -%>
     <%- end -%>
     <%- if directory['path'] and directory['path'] != '' -%>

From 2c1b49fa4bc6042738c3642046029aef31ff3b88 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 6 May 2015 13:56:46 -0700
Subject: [PATCH 0610/2267] These slow travis way down.

---
 .sync.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 9c89f69186..e5f5f79bae 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,10 +1,5 @@
 ---
 .travis.yml:
-  extras:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 Rakefile:
   extra_disabled_lint_checks:
   - 'disable_only_variable_string'

From 21efbdaa24cf5000266227f35ca209fa90052779 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 6 May 2015 14:30:28 -0700
Subject: [PATCH 0611/2267] sync via modulesync

---
 .travis.yml | 10 ----------
 Gemfile     |  9 +++------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1a0d7cd93..ecf7d9076b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,23 +6,13 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
   - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index fcd27d5344..fb7202c83c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,8 @@ group :development, :unit_tests do
   gem 'json',                    :require => false
 end
 
-beaker_version = ENV['BEAKER_VERSION']
-beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
 group :system_tests do
-  if beaker_version
-    gem 'beaker', *location_for(beaker_version)
-  end
-  if beaker_rspec_version
+  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  :require => false
@@ -32,6 +27,8 @@ group :system_tests do
   gem 'serverspec',    :require => false
 end
 
+
+
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else

From a80726f24fd03736fcbb934a4a1af960ae5c65eb Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 6 May 2015 14:32:17 -0700
Subject: [PATCH 0612/2267] beaker gemfile fixes

---
 Gemfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index fb7202c83c..2b1b7cd8d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,9 @@ group :development, :unit_tests do
 end
 
 group :system_tests do
+  if beaker_version = ENV['BEAKER_VERSION']
+    gem 'beaker', *location_for(beaker_version)
+  end
   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else

From 4673e29e0328ea6e8410a5f59e9545372d0111f4 Mon Sep 17 00:00:00 2001
From: Dave Garbus <davega@spiceworks.com>
Date: Tue, 19 May 2015 11:10:34 -0500
Subject: [PATCH 0613/2267] Add the ability to specify
 GeoIPScanProxyHeaderField for mod_geoip

---
 manifests/mod/geoip.pp       | 2 ++
 templates/mod/geoip.conf.erb | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index 4e87cb96a6..1f8fb08eeb 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -5,6 +5,7 @@
   $output                     = 'All',
   $enable_utf8                = undef,
   $scan_proxy_headers         = undef,
+  $scan_proxy_header_field    = undef,
   $use_last_xforwarededfor_ip = undef,
 ) {
   ::apache::mod { 'geoip': }
@@ -16,6 +17,7 @@
   # - output
   # - enable_utf8
   # - scan_proxy_headers
+  # - scan_proxy_header_field
   # - use_last_xforwarededfor_ip
   file { 'geoip.conf':
     ensure  => file,
diff --git a/templates/mod/geoip.conf.erb b/templates/mod/geoip.conf.erb
index 84b5dfe92c..00e61d98b4 100644
--- a/templates/mod/geoip.conf.erb
+++ b/templates/mod/geoip.conf.erb
@@ -16,6 +16,9 @@ GeoIPEnableUTF8 <%= scope.function_bool2httpd([@enable_utf8]) %>
 <% if ! @scan_proxy_headers.nil? -%>
 GeoIPScanProxyHeaders <%= scope.function_bool2httpd([@scan_proxy_headers]) %>
 <% end -%>
+<% if ! @scan_proxy_header_field.nil? -%>
+GeoIPScanProxyHeaderField <%= @scan_proxy_header_field %>
+<% end -%>
 <% if ! @use_last_xforwarededfor_ip.nil? -%>
 GeoIPUseLastXForwardedForIP <%= scope.function_bool2httpd([@use_last_xforwarededfor_ip]) %>
 <% end -%>

From 3691442c6841871da3e2db40a919b448689f85c4 Mon Sep 17 00:00:00 2001
From: Jamie Riedesel <jriedesel@microstrategy.com>
Date: Tue, 19 May 2015 14:19:59 -0400
Subject: [PATCH 0614/2267] Add user and group directives to Class: apache
 documentation

The `user` and `group` parameters to `::apache` have existed for quite some time. This provides documentation about them.
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 268b071b12..f12907c2f5 100644
--- a/README.md
+++ b/README.md
@@ -331,6 +331,10 @@ Changes the location of the default [Documentroot](https://httpd.apache.org/docs
 
 Enables custom error documents. Defaults to 'false'.
 
+#####`group`
+
+Changes the group that Apache will answer requests as. The parent process will continue to be run as root, but resource accesses by child processes will be done under this group. By default, puppet will attempt to manage this group as a resource under `::apache`. If this is not what you want, set [`manage_group`](#manage_group) to 'false'. Defaults to the OS-specific default user for apache, as detected in `::apache::params`.
+
 #####`httpd_dir`
 
 Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but might have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, '/usr/local/etc/apache22' on FreeBSD, and '/etc/apache2' on Gentoo.
@@ -469,6 +473,10 @@ Controls how TRACE requests per RFC 2616 are handled. More information about [Tr
 
 Changes the location of the configuration directory your virtual host configuration files are placed in. Defaults to 'etc/httpd/conf.d' on RedHat, '/etc/apache2/sites-available' on Debian, '/usr/local/etc/apache22/Vhosts' on FreeBSD, and '/etc/apache2/vhosts.d' on Gentoo.
 
+#####`user`
+
+Changes the user that Apache will answer requests as. The parent process will continue to be run as root, but resource accesses by child processes will be done under this user. By default, puppet will attept to manage this user as a resource under `::apache`. If this is not what you want, set [`manage_user`](#manage_user) to 'false'. Defaults to the OS-specific default user for apache, as detected in `::apache::params`.
+
 #####`apache_name`
 
 The name of the Apache package to install. This is automatically detected in `::apache::params`. You might need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.

From 740429e1f03430fb440c4d70c125101fa82f03c9 Mon Sep 17 00:00:00 2001
From: Christian Kaenzig <christian.kaenzig@camptocamp.com>
Date: Tue, 26 May 2015 12:03:52 +0200
Subject: [PATCH 0615/2267] Fix in README.md for default values of php_flags

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f12907c2f5..ef509ff4a8 100644
--- a/README.md
+++ b/README.md
@@ -1365,11 +1365,11 @@ Sets [PassengerPreStart](https://www.phusionpassenger.com/documentation/Users%20
 
 #####`php_flags & values`
 
-Allows per-vhost setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Defaults to '[]'.
+Allows per-vhost setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Defaults to '{}'.
 
 #####`php_admin_flags & values`
 
-Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '[]'.
+Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '{}'.
 
 #####`port`
 

From 91d23fd13317765734a03641f4dee42b2813c744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Thu, 9 Apr 2015 15:03:02 +0200
Subject: [PATCH 0616/2267] Do not offload overriding LogFormats to httpd

if an admin overrides one of the pre-existing formats, do not offload
that to httpd: check for it, and replace it at configuration
generation time.
---
 README.md                   | 13 ++++++++++++-
 spec/classes/apache_spec.rb | 17 +++++++++++++++++
 templates/httpd.conf.erb    |  8 ++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f12907c2f5..e5698dcc79 100644
--- a/README.md
+++ b/README.md
@@ -357,7 +357,7 @@ Specifies the location where apache module files are stored. It should not be co
 
 #####`loadfile_name`
 
-Sets the file name for the module loadfile. Should be in the format *.load.  This can be used to set the module load order.
+Sets the file name for the module loadfile. Should be in the format \*.load.  This can be used to set the module load order.
 
 #####`log_level`
 
@@ -371,6 +371,17 @@ Define additional [LogFormats](https://httpd.apache.org/docs/current/mod/mod_log
   $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
 ```
 
+There are a number of predefined LogFormats in the httpd.conf that Puppet writes out:
+
+```httpd
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+```
+
+If your `$log_formats` contains one of those, they will be overwritten with **your** definition.
+
 #####`logroot`
 
 Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, '/var/log/apache22' on FreeBSD, and '/var/log/apache2' on Gentoo.
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 07ef1cc270..77fa7e3e2c 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -218,6 +218,23 @@
       end
     end
 
+    describe "Override existing LogFormats" do
+      context "When parameter log_formats is a hash" do
+        let :params do
+          { :log_formats => {
+            'common'   => "%v %h %l %u %t \"%r\" %>s %b",
+            'combined' => "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
+          } }
+        end
+
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} }
+        it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} }
+      end
+    end
+
     context "on Ubuntu" do
       let :facts do
         super().merge({
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 6c50e28711..8664a43e4d 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -60,10 +60,18 @@ Include "<%= @mod_load_dir %>/*.conf"
 <% end -%>
 Include "<%= @ports_file %>"
 
+<% unless @log_formats.has_key?('combined') -%>
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+<% end -%>
+<% unless @log_formats.has_key?('common') -%>
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
+<% end -%>
+<% unless @log_formats.has_key?('referer') -%>
 LogFormat "%{Referer}i -> %U" referer
+<% end -%>
+<% unless @log_formats.has_key?('agent') -%>
 LogFormat "%{User-agent}i" agent
+<% end -%>
 <% if @log_formats and !@log_formats.empty? -%>
   <%- @log_formats.sort.each do |nickname,format| -%>
 LogFormat "<%= format -%>" <%= nickname %>

From e98359bd240ac546a5c866f484de04587c4d7fa1 Mon Sep 17 00:00:00 2001
From: Christophe Vanlancker <christophe.vanlancker@inuits.eu>
Date: Tue, 12 May 2015 14:30:34 +0200
Subject: [PATCH 0617/2267] Add basic initial support for SLES 11

Signed-off-by: Christophe Vanlancker <christophe.vanlancker@inuits.eu>
---
 manifests/default_mods.pp |  3 ++
 manifests/init.pp         |  6 ++++
 manifests/mod.pp          | 35 +++++++++++++++++++++++
 manifests/mod/alias.pp    |  1 +
 manifests/mod/prefork.pp  |  2 +-
 manifests/mod/worker.pp   |  2 +-
 manifests/mpm.pp          | 32 +++++++++++++++++++++
 manifests/params.pp       | 60 +++++++++++++++++++++++++++++++++++++++
 manifests/version.pp      |  3 ++
 9 files changed, 142 insertions(+), 2 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 145c4feeb3..d609707b24 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -22,6 +22,9 @@
       ::apache::mod { 'log_config': }
       ::apache::mod { 'unixd': }
     }
+    'Suse': {
+      ::apache::mod { 'log_config': }
+    }
     default: {}
   }
   case $::osfamily {
diff --git a/manifests/init.pp b/manifests/init.pp
index 22b2361aef..9e6da98138 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -281,6 +281,12 @@
           require => Package['httpd'],
         }
       }
+      'Suse': {
+        $pidfile              = '/var/run/httpd2.pid'
+        $error_log            = 'error.log'
+        $scriptalias          = '/usr/lib/cgi-bin'
+        $access_log_file      = 'access.log'
+      }
       default: {
         fail("Unsupported osfamily ${::osfamily}")
       }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index bc52d2e201..920114a7c7 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -126,5 +126,40 @@
         notify  => Class['apache::service'],
       }
     }
+  } elsif $::osfamily == 'Suse' {
+    $enable_dir = $::apache::mod_enable_dir
+    file{ "${_loadfile_name} symlink":
+      ensure  => link,
+      path    => "${enable_dir}/${_loadfile_name}",
+      target  => "${mod_dir}/${_loadfile_name}",
+      owner   => 'root',
+      group   => $::apache::params::root_group,
+      mode    => '0644',
+      require => [
+        File[$_loadfile_name],
+        Exec["mkdir ${enable_dir}"],
+      ],
+      before  => File[$enable_dir],
+      notify  => Class['apache::service'],
+    }
+    # Each module may have a .conf file as well, which should be
+    # defined in the class apache::mod::module
+    # Some modules do not require this file.
+    if defined(File["${mod}.conf"]) {
+      file{ "${mod}.conf symlink":
+        ensure  => link,
+        path    => "${enable_dir}/${mod}.conf",
+        target  => "${mod_dir}/${mod}.conf",
+        owner   => 'root',
+        group   => $::apache::params::root_group,
+        mode    => '0644',
+        require => [
+          File["${mod}.conf"],
+          Exec["mkdir ${enable_dir}"],
+        ],
+        before  => File[$enable_dir],
+        notify  => Class['apache::service'],
+      }
+    }
   }
 }
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index c1f60fd62e..2f078f6456 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -6,6 +6,7 @@
 
   $icons_path = $::osfamily ? {
     'debian'  => '/usr/share/apache2/icons',
+    'Suse'    => '/usr/share/apache2/icons',
     'redhat'  => $ver24 ? {
       true    => '/usr/share/httpd/icons',
       default => '/var/www/icons',
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 035e8818a4..91567de114 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -60,7 +60,7 @@
         }
       }
     }
-    'debian', 'freebsd' : {
+    'debian', 'freebsd', 'Suse' : {
       ::apache::mpm{ 'prefork':
         apache_version => $apache_version,
       }
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 02a1beae37..25925f8073 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -62,7 +62,7 @@
         }
       }
     }
-    'debian', 'freebsd': {
+    'debian', 'freebsd', 'Suse': {
       ::apache::mpm{ 'worker':
         apache_version => $apache_version,
       }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 2478184f51..9e77349454 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -68,6 +68,38 @@
     'redhat': {
       # so we don't fail
     }
+    'Suse': {
+      file { "${::apache::mod_enable_dir}/${mpm}.conf":
+        ensure  => link,
+        target  => "${::apache::mod_dir}/${mpm}.conf",
+        require => Exec["mkdir ${::apache::mod_enable_dir}"],
+        before  => File[$::apache::mod_enable_dir],
+        notify  => Class['apache::service'],
+      }
+
+      if versioncmp($apache_version, '2.4') >= 0 {
+        file { "${::apache::mod_enable_dir}/${mpm}.load":
+          ensure  => link,
+          target  => "${::apache::mod_dir}/${mpm}.load",
+          require => Exec["mkdir ${::apache::mod_enable_dir}"],
+          before  => File[$::apache::mod_enable_dir],
+          notify  => Class['apache::service'],
+        }
+
+        if $mpm == 'itk' {
+            file { "${lib_path}/mod_mpm_itk.so":
+              ensure => link,
+              target => "${lib_path}/mpm_itk.so"
+            }
+        }
+      }
+
+      if versioncmp($apache_version, '2.4') < 0 {
+        package { "apache2-${mpm}":
+          ensure => present,
+        }
+      }
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
diff --git a/manifests/params.pp b/manifests/params.pp
index ce5edec124..b5d1421362 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -417,6 +417,66 @@
     $wsgi_socket_prefix   = undef
     $docroot              = '/var/www/localhost/htdocs'
     $error_documents_path = '/usr/share/apache2/error'
+  } elsif $::osfamily == 'Suse' {
+    $user                = 'wwwrun'
+    $group               = 'wwwrun'
+    $root_group          = 'root'
+    $apache_name         = 'apache2'
+    $service_name        = 'apache2'
+    $httpd_dir           = '/etc/apache2'
+    $server_root         = '/etc/apache2'
+    $conf_dir            = $httpd_dir
+    $confd_dir           = "${httpd_dir}/conf.d"
+    $mod_dir             = "${httpd_dir}/mods-available"
+    $mod_enable_dir      = "${httpd_dir}/mods-enabled"
+    $vhost_dir           = "${httpd_dir}/sites-available"
+    $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
+    $conf_file           = 'httpd.conf'
+    $ports_file          = "${conf_dir}/ports.conf"
+    $logroot             = '/var/log/apache2'
+    $logroot_mode        = undef
+    $lib_path            = '/usr/lib64/apache2-prefork/'
+    $mpm_module          = 'prefork'
+    $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
+    $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
+    $ssl_certs_dir       = '/etc/ssl/certs'
+    $suphp_addhandler    = 'x-httpd-php'
+    $suphp_engine        = 'off'
+    $suphp_configpath    = '/etc/php5/apache2'
+    $mod_packages        = {
+      'auth_kerb'   => 'apache2-mod_auth_kerb',
+      'fcgid'       => 'apache2-mod_fcgid',
+      'perl'        => 'apache2-mod_perl',
+      'php5'        => 'apache2-mod_php53',
+      'python'      => 'apache2-mod_python',
+    }
+    $mod_libs             = {
+      'php5' => 'libphp5.so',
+    }
+    $conf_template          = 'apache/httpd.conf.erb'
+    $keepalive              = 'Off'
+    $keepalive_timeout      = 15
+    $max_keepalive_requests = 100
+    $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
+    $mime_support_package = 'aaa_base'
+    $mime_types_config    = '/etc/mime.types'
+    $docroot              = '/srv/www'
+    $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
+    $error_documents_path = '/usr/share/apache2/error'
+    $dev_packages        = ['libapr-util1-devel', 'libapr1-devel']
+
+    #
+    # Passenger-specific settings
+    #
+
+    $passenger_conf_file          = 'passenger.conf'
+    $passenger_conf_package_file  = undef
+
+    $passenger_root               = '/usr'
+    $passenger_ruby               = '/usr/bin/ruby'
+    $passenger_default_ruby       = undef
+    $wsgi_socket_prefix           = undef
+
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
diff --git a/manifests/version.pp b/manifests/version.pp
index ce3b907694..bdf1629b04 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -33,6 +33,9 @@
     'Gentoo': {
       $default = '2.4'
     }
+    'Suse': {
+      $default = '2.2'
+    }
     default: {
       fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
     }

From 53a0d7379d093ae48e328598511701eef18792c1 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Sun, 17 May 2015 19:11:18 -0400
Subject: [PATCH 0618/2267] Added the ability to define the IndexStyleSheet
 setting for a directory

---
 README.md                        | 24 +++++++++++++++++++++---
 spec/defines/vhost_spec.rb       | 14 ++++++++++++++
 templates/vhost/_directories.erb |  3 +++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 268b071b12..2d656a0244 100644
--- a/README.md
+++ b/README.md
@@ -1924,9 +1924,10 @@ Allows configuration settings for [directory indexing](http://httpd.apache.org/d
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
-        { path          => '/path/to/directory',
-          options       => ['Indexes','FollowSymLinks','MultiViews'],
-          index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
+        { path           => '/path/to/directory',
+          directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work
+          options        => ['Indexes','FollowSymLinks','MultiViews'],
+          index_options  => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
         },
       ],
     }
@@ -1948,6 +1949,23 @@ Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoind
     }
 ```
 
+######`index_style_sheet`
+
+Sets the [IndexStyleSheet](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet) which adds a CSS stylesheet to the directory index.
+
+```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path              => '/path/to/directory',
+          options           => ['Indexes','FollowSymLinks','MultiViews'],
+          index_options     => ['FancyIndexing'],
+          index_style_sheet => '/styles/style.css',
+        },
+      ],
+    }
+```
+
 ######`options`
 
 Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 816fd99a1f..73836d350d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -183,6 +183,12 @@
               'provider' => 'files',
               'require'  => 'all granted',
             },
+            { 'path'              => '/var/www/files/indexed_directory',
+              'directoryindex'    => 'disabled',
+              'options'           => ['Indexes','FollowSymLinks','MultiViews'],
+              'index_options'     => ['FancyIndexing'],
+              'index_style_sheet' => '/styles/style.css',
+            },
           ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
@@ -360,6 +366,14 @@
         :content => /^\s+Require all denied$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Require all granted$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+IndexOptions\sFancyIndexing$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+IndexStyleSheet\s'\/styles\/style\.css'$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+DirectoryIndex\sdisabled$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 1f45d2c0e6..529d9bdffa 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -46,6 +46,9 @@
       <%- end -%>
       <%- if directory['index_order_default'] -%>
     IndexOrderDefault <%= Array(directory['index_order_default']).join(' ') %>
+      <%- end -%>
+      <%- if directory['index_style_sheet'] -%>
+    IndexStyleSheet '<%= directory['index_style_sheet'] %>'
       <%- end -%>
       <%- if directory['allow_override'] -%>
     AllowOverride <%= Array(directory['allow_override']).join(' ') %>

From 6f3668603b830193e5fa3f5d9d4482dc90a0d023 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu, 7 May 2015 17:29:27 +0200
Subject: [PATCH 0619/2267] Move authn_core module to a class

---
 README.md                   |  1 +
 manifests/default_mods.pp   | 12 ++++--------
 manifests/mod/authn_core.pp |  7 +++++++
 spec/classes/apache_spec.rb |  1 +
 4 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 manifests/mod/authn_core.pp

diff --git a/README.md b/README.md
index 9af78168ac..b78cec33a7 100644
--- a/README.md
+++ b/README.md
@@ -560,6 +560,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `auth_basic`
 * `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas) below)
 * `auth_kerb`
+* `authn_core`
 * `authn_file`
 * `authnz_ldap`*
 * `authz_default`
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index d609707b24..0d8969ca69 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -37,13 +37,12 @@
   if $all {
     case $::osfamily {
       'debian': {
+        include ::apache::mod::authn_core
         include ::apache::mod::reqtimeout
-        if versioncmp($apache_version, '2.4') >= 0 {
-          ::apache::mod { 'authn_core': }
-        }
       }
       'redhat': {
         include ::apache::mod::actions
+        include ::apache::mod::authn_core
         include ::apache::mod::cache
         include ::apache::mod::mime
         include ::apache::mod::mime_magic
@@ -64,16 +63,14 @@
         ::apache::mod { 'substitute': }
         ::apache::mod { 'usertrack': }
 
-        if versioncmp($apache_version, '2.4') >= 0 {
-          ::apache::mod { 'authn_core': }
-        }
-        else {
+        if versioncmp($apache_version, '2.4') < 0 {
           ::apache::mod { 'authn_alias': }
           ::apache::mod { 'authn_default': }
         }
       }
       'freebsd': {
         include ::apache::mod::actions
+        include ::apache::mod::authn_core
         include ::apache::mod::cache
         include ::apache::mod::disk_cache
         include ::apache::mod::headers
@@ -91,7 +88,6 @@
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'auth_form': }
         ::apache::mod { 'authn_anon': }
-        ::apache::mod { 'authn_core': }
         ::apache::mod { 'authn_dbm': }
         ::apache::mod { 'authn_socache': }
         ::apache::mod { 'authz_dbd': }
diff --git a/manifests/mod/authn_core.pp b/manifests/mod/authn_core.pp
new file mode 100644
index 0000000000..c5ce5b1070
--- /dev/null
+++ b/manifests/mod/authn_core.pp
@@ -0,0 +1,7 @@
+class apache::mod::authn_core(
+  $apache_version = $::apache::apache_version
+) {
+  if versioncmp($apache_version, '2.4') >= 0 {
+    ::apache::mod { 'authn_core': }
+  }
+}
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 77fa7e3e2c..b82eafa0de 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -677,6 +677,7 @@
     # Assert that load files are placed for these mods, but no conf file.
     [
       'auth_basic',
+      'authn_core',
       'authn_file',
       'authz_groupfile',
       'authz_host',

From 223b18bad82464d3923e15fa5b2bbc34439184d6 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 27 May 2015 08:11:04 -0700
Subject: [PATCH 0620/2267] Add ability to unittest puppet 4

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index ecf7d9076b..742380f6b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,5 +14,10 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  allow_failures:
+    - rvm: 2.1.6
+      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false

From 1919eb3d2a81809ce998bbbc7f53d6d2f18edf12 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Wed, 20 May 2015 18:55:41 +0100
Subject: [PATCH 0621/2267] Support puppetlabs-concat 2.x

2.0.0 is compatible with current 1.x usage, so permit either 1.x or 2.x
to satisfy the concat dependency.  Move all ensure parameters from
concat::fragment to concat itself.
---
 .fixtures.yml                | 4 +---
 manifests/balancer.pp        | 4 +---
 manifests/balancermember.pp  | 1 -
 manifests/init.pp            | 2 +-
 manifests/listen.pp          | 1 -
 manifests/namevirtualhost.pp | 1 -
 metadata.json                | 2 +-
 spec/defines/vhost_spec.rb   | 6 +++---
 8 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 4645a757fc..6eddf260f6 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,9 +1,7 @@
 fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    concat:
-      repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
-      branch: "1.2.x"
+    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
     portage: "git://github.com/gentoo/puppet-portage.git"
   symlinks:
     apache: "#{source_dir}"
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 765dae6290..1c2391ebd4 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -47,6 +47,7 @@
   $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
 
   concat { $target:
+    ensure => present,
     owner  => '0',
     group  => '0',
     mode   => '0644',
@@ -54,7 +55,6 @@
   }
 
   concat::fragment { "00-${name}-header":
-    ensure  => present,
     target  => $target,
     order   => '01',
     content => "<Proxy balancer://${name}>\n",
@@ -67,14 +67,12 @@
   # concat fragments. We don't have to do anything about them.
 
   concat::fragment { "01-${name}-proxyset":
-    ensure  => present,
     target  => $target,
     order   => '19',
     content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"),
   }
 
   concat::fragment { "01-${name}-footer":
-    ensure  => present,
     target  => $target,
     order   => '20',
     content => "</Proxy>\n",
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 459081a716..c2be588804 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -46,7 +46,6 @@
 ) {
 
   concat::fragment { "BalancerMember ${name}":
-    ensure  => present,
     target  => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
     content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index 22b2361aef..217890ffaa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -232,6 +232,7 @@
   }
 
   concat { $ports_file:
+    ensure  => present,
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
@@ -239,7 +240,6 @@
     require => Package['httpd'],
   }
   concat::fragment { 'Apache ports header':
-    ensure  => present,
     target  => $ports_file,
     content => template('apache/ports_header.erb')
   }
diff --git a/manifests/listen.pp b/manifests/listen.pp
index e6a8a3c767..503ee8860b 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -3,7 +3,6 @@
 
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
-    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/listen.erb'),
   }
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index f8c3a80d85..4fa8795185 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -3,7 +3,6 @@
 
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
-    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/namevirtualhost.erb'),
   }
diff --git a/metadata.json b/metadata.json
index e860ca4070..139a436487 100644
--- a/metadata.json
+++ b/metadata.json
@@ -68,6 +68,6 @@
   "description": "Module for Apache configuration",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"}
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
   ]
 }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 816fd99a1f..be3da156e9 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -50,7 +50,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
       ) }
@@ -77,7 +77,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf'
       ) }
@@ -99,7 +99,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/vhosts.d/25-rspec.example.com.conf'
       ) }

From f71a8dec1af1f50c64a0280b633981e8d93c0409 Mon Sep 17 00:00:00 2001
From: Dave Garbus <davega@spiceworks.com>
Date: Mon, 1 Jun 2015 12:40:18 -0500
Subject: [PATCH 0622/2267] Adding docs for apache::mod::geoip per
 puppetlabs/puppetlabs-apache#1128

---
 README.md | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 087bbc8694..6022ed6e15 100644
--- a/README.md
+++ b/README.md
@@ -666,14 +666,44 @@ These are the default settings:
 
 ```puppet
   class {'apache::mod::geoip':
-    $enable  => false,
-    $db_file => '/usr/share/GeoIP/GeoIP.dat',
-    $flag    => 'Standard',
-    $output  => 'All',
+    enable  => false,
+    db_file => '/usr/share/GeoIP/GeoIP.dat',
+    flag    => 'Standard',
+    output  => 'All',
   }
 ```
 
-The parameter `db_file` can be a single directory or a hash of directories.
+#####`enable`
+
+Boolean. Enable or Disable mod_geoip globally. Defaults to false.
+
+#####`db_file`
+
+The full path to your GeoIP database file. Defaults to `/usr/share/GeoIP/GeoIP.dat`. This parameter optionally takes an array of paths for multiple GeoIP database files.
+
+#####`flag`
+
+GeoIP Flag. Defaults to 'Standard'.
+
+#####`output`
+
+Defines which output variables to use. Defaults to 'All'.
+
+#####`enable_utf8`
+
+Boolean. Changes the output from ISO-8859-1 (Latin-1) to UTF-8.
+
+#####`scan_proxy_headers`
+
+Boolean. Enables the GeoIPScanProxyHeaders option. More information can be found [here](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives).
+
+#####`scan_proxy_header_field`
+
+Specifies which header that mod_geoip should look at to determine the client's IP address.
+
+#####`use_last_xforwarededfor_ip`
+
+Boolean. If a comma-separated list of IP addresses is found, use the last IP address for the client's IP.
 
 ####Class: `apache::mod::info`
 

From 409ddd29eb3625e584dd9bac80f1124cc5e3734b Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 3 Jun 2015 08:09:03 -0700
Subject: [PATCH 0623/2267] Add changelog for 1.5.0 relesase

---
 CHANGELOG.md  | 32 ++++++++++++++++++++++++++++++++
 metadata.json |  8 +++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44ca14c391..6e0b1ee87e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+##2015-06-16 - Supported Release 1.5.0
+### Summary
+This release primarily adds Suse compatibility. It also adds a handful of other
+parameters for greater configuration control.
+
+### Features
+- Now compatible with concat 1.x and 2.x
+- Add `apache::lib_path` parameter
+- Add `apache::service_restart` parameter
+- Add `apache::vhost::geoip_enable` parameter
+- Add `apache::mod::geoip` class
+- Add `apache::mod::remoteip` class
+- Add parameters to `apache::mod::expires` class
+- Add `index_style_sheet` handling to `apache::vhost::directories`
+- Add some compatibility for SLES 11
+- Add `apache::mod::ssl::ssl_sessioncachetimeout` parameter
+- Add `apache::mod::ssl::ssl_cryptodevice` parameter
+- Add `apache::mod::ssl::ssl_honorcipherorder` parameter
+- Add `apache::mod::userdir::options` parameter
+
+### Bugfixes
+- Document `apache::user` parameter
+- Document `apache::group` parameter
+- Fix apache::dev on FreeBSD
+- Fix proxy\_connect on apache >= 2.2
+- Validate log levels better
+- Fix `apache::apache_name` for package and vhost
+- Fix Debian Jessie mod\_prefork package name
+- Fix alias module being declared even when vhost is absent
+- Fix proxy\_pass\_match handling in vhost's proxy template
+- Fix userdir access permissions
+
 ##2015-04-28 - Supported Release 1.4.1
 
 This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module.
diff --git a/metadata.json b/metadata.json
index 139a436487..d4300066c9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -46,6 +46,12 @@
         "7"
       ]
     },
+    {
+      "operatingsystem": "SLES",
+      "operatingsystemrelease": [
+        "11 SP1"
+      ]
+    },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [

From 2a1d700c035dba0d0f17a2c16d3e42ab0dc3c61b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 4 Jun 2015 14:10:44 -0700
Subject: [PATCH 0624/2267] Incorrect date in the changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e0b1ee87e..bfd53c5e48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-##2015-06-16 - Supported Release 1.5.0
+##2015-06-09 - Supported Release 1.5.0
 ### Summary
 This release primarily adds Suse compatibility. It also adds a handful of other
 parameters for greater configuration control.

From 3a5894eab90d47fff925f0f4c8b5806727e64b9f Mon Sep 17 00:00:00 2001
From: Jonathan Tripathy <jt@puppetlabs.com>
Date: Fri, 5 Jun 2015 12:23:32 +0100
Subject: [PATCH 0625/2267] Updated travisci file to remove allow_failures for
 Puppet 4

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 742380f6b4..16d694bb6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,5 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
-  allow_failures:
-    - rvm: 2.1.6
-      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false

From e58cf4578a450ea0497f8e02b92389a7a1af2ab7 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Mon, 8 Jun 2015 21:46:52 -0700
Subject: [PATCH 0626/2267] (maint) allow specifying PUPPET_VERSION in
 acceptance

---
 spec/spec_helper_acceptance.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 1091edcaf2..66d1d7c430 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -5,7 +5,10 @@
 unless ENV['RS_PROVISION'] == 'no'
   # This will install the latest available package on el and deb based
   # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = { :default_action => 'gem_install' }
+  foss_opts = {
+    :default_action => 'gem_install',
+    :version        => (ENV['PUPPET_VERSION'] || '3.8.1'),
+  }
 
   if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
 

From 1507ed260f53bd63499610b51c664d35d7a0c009 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 9 Jun 2015 13:58:32 -0700
Subject: [PATCH 0627/2267] Revert "Support puppetlabs-concat 2.x"

---
 .fixtures.yml                | 4 +++-
 manifests/balancer.pp        | 4 +++-
 manifests/balancermember.pp  | 1 +
 manifests/init.pp            | 2 +-
 manifests/listen.pp          | 1 +
 manifests/namevirtualhost.pp | 1 +
 metadata.json                | 2 +-
 spec/defines/vhost_spec.rb   | 6 +++---
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 6eddf260f6..4645a757fc 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,7 +1,9 @@
 fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
+    concat:
+      repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
+      branch: "1.2.x"
     portage: "git://github.com/gentoo/puppet-portage.git"
   symlinks:
     apache: "#{source_dir}"
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 1c2391ebd4..765dae6290 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -47,7 +47,6 @@
   $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
 
   concat { $target:
-    ensure => present,
     owner  => '0',
     group  => '0',
     mode   => '0644',
@@ -55,6 +54,7 @@
   }
 
   concat::fragment { "00-${name}-header":
+    ensure  => present,
     target  => $target,
     order   => '01',
     content => "<Proxy balancer://${name}>\n",
@@ -67,12 +67,14 @@
   # concat fragments. We don't have to do anything about them.
 
   concat::fragment { "01-${name}-proxyset":
+    ensure  => present,
     target  => $target,
     order   => '19',
     content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"),
   }
 
   concat::fragment { "01-${name}-footer":
+    ensure  => present,
     target  => $target,
     order   => '20',
     content => "</Proxy>\n",
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index c2be588804..459081a716 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -46,6 +46,7 @@
 ) {
 
   concat::fragment { "BalancerMember ${name}":
+    ensure  => present,
     target  => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
     content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index 1dfe6b0d50..9e6da98138 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -232,7 +232,6 @@
   }
 
   concat { $ports_file:
-    ensure  => present,
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
@@ -240,6 +239,7 @@
     require => Package['httpd'],
   }
   concat::fragment { 'Apache ports header':
+    ensure  => present,
     target  => $ports_file,
     content => template('apache/ports_header.erb')
   }
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 503ee8860b..e6a8a3c767 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -3,6 +3,7 @@
 
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
+    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/listen.erb'),
   }
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index 4fa8795185..f8c3a80d85 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -3,6 +3,7 @@
 
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
+    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/namevirtualhost.erb'),
   }
diff --git a/metadata.json b/metadata.json
index d4300066c9..71bad1d354 100644
--- a/metadata.json
+++ b/metadata.json
@@ -74,6 +74,6 @@
   "description": "Module for Apache configuration",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"}
   ]
 }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index a3ce4919f7..47c1b1f455 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -50,7 +50,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
       ) }
@@ -77,7 +77,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf'
       ) }
@@ -99,7 +99,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/vhosts.d/25-rspec.example.com.conf'
       ) }

From f54393e60eaec4e926eaf6cfadee729d81650130 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 9 Jun 2015 13:58:32 -0700
Subject: [PATCH 0628/2267] Revert "Support puppetlabs-concat 2.x"

---
 .fixtures.yml                | 4 +++-
 manifests/balancer.pp        | 4 +++-
 manifests/balancermember.pp  | 1 +
 manifests/init.pp            | 2 +-
 manifests/listen.pp          | 1 +
 manifests/namevirtualhost.pp | 1 +
 metadata.json                | 2 +-
 spec/defines/vhost_spec.rb   | 6 +++---
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 6eddf260f6..4645a757fc 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,7 +1,9 @@
 fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
+    concat:
+      repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
+      branch: "1.2.x"
     portage: "git://github.com/gentoo/puppet-portage.git"
   symlinks:
     apache: "#{source_dir}"
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 1c2391ebd4..765dae6290 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -47,7 +47,6 @@
   $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
 
   concat { $target:
-    ensure => present,
     owner  => '0',
     group  => '0',
     mode   => '0644',
@@ -55,6 +54,7 @@
   }
 
   concat::fragment { "00-${name}-header":
+    ensure  => present,
     target  => $target,
     order   => '01',
     content => "<Proxy balancer://${name}>\n",
@@ -67,12 +67,14 @@
   # concat fragments. We don't have to do anything about them.
 
   concat::fragment { "01-${name}-proxyset":
+    ensure  => present,
     target  => $target,
     order   => '19',
     content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"),
   }
 
   concat::fragment { "01-${name}-footer":
+    ensure  => present,
     target  => $target,
     order   => '20',
     content => "</Proxy>\n",
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index c2be588804..459081a716 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -46,6 +46,7 @@
 ) {
 
   concat::fragment { "BalancerMember ${name}":
+    ensure  => present,
     target  => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
     content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index 1dfe6b0d50..9e6da98138 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -232,7 +232,6 @@
   }
 
   concat { $ports_file:
-    ensure  => present,
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
@@ -240,6 +239,7 @@
     require => Package['httpd'],
   }
   concat::fragment { 'Apache ports header':
+    ensure  => present,
     target  => $ports_file,
     content => template('apache/ports_header.erb')
   }
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 503ee8860b..e6a8a3c767 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -3,6 +3,7 @@
 
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
+    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/listen.erb'),
   }
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index 4fa8795185..f8c3a80d85 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -3,6 +3,7 @@
 
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
+    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/namevirtualhost.erb'),
   }
diff --git a/metadata.json b/metadata.json
index d4300066c9..71bad1d354 100644
--- a/metadata.json
+++ b/metadata.json
@@ -74,6 +74,6 @@
   "description": "Module for Apache configuration",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"}
   ]
 }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index a3ce4919f7..47c1b1f455 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -50,7 +50,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
       ) }
@@ -77,7 +77,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf'
       ) }
@@ -99,7 +99,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/vhosts.d/25-rspec.example.com.conf'
       ) }

From 9f1559ed4d8e8d95254c580d548dd7282079c0bd Mon Sep 17 00:00:00 2001
From: Chris Liles <christopherliles@gmail.com>
Date: Wed, 3 Jun 2015 14:52:13 -0700
Subject: [PATCH 0629/2267] Amazon Linux does not support systemd. Having the
 versioncmp makes this fail on newer versions (which do not yet support
 systemd). Run this on 2015.03 and you end up with an apache server that will
 not start.

---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 0d8969ca69..637b2bbe52 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -12,7 +12,7 @@
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon' and versioncmp($::operatingsystemrelease, '2014.09') <= 0  ) ) {
+        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !$::operatingsystem == 'Amazon' ) {
           ::apache::mod { 'systemd': }
         }
         ::apache::mod { 'unixd': }

From 667335f634f131132b46221afd22ab8b065dcce7 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 10 Jun 2015 11:37:50 -0700
Subject: [PATCH 0630/2267] Updated changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfd53c5e48..7a722a8a9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,9 @@
-##2015-06-09 - Supported Release 1.5.0
+##2015-06-11 - Supported Release 1.5.0
 ### Summary
 This release primarily adds Suse compatibility. It also adds a handful of other
 parameters for greater configuration control.
 
 ### Features
-- Now compatible with concat 1.x and 2.x
 - Add `apache::lib_path` parameter
 - Add `apache::service_restart` parameter
 - Add `apache::vhost::geoip_enable` parameter
@@ -29,6 +28,7 @@ parameters for greater configuration control.
 - Fix alias module being declared even when vhost is absent
 - Fix proxy\_pass\_match handling in vhost's proxy template
 - Fix userdir access permissions
+- Fix issue where the module was trying to use systemd on Amazon Linux.
 
 ##2015-04-28 - Supported Release 1.4.1
 

From 87cd728cdc6d65945f0948bf8421bce8f98c364b Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 10 Jun 2015 16:15:11 -0700
Subject: [PATCH 0631/2267] fixes bug introduced by PR1133

---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 637b2bbe52..9e3c2c69a7 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -12,7 +12,7 @@
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !$::operatingsystem == 'Amazon' ) {
+        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon') ) {
           ::apache::mod { 'systemd': }
         }
         ::apache::mod { 'unixd': }

From a29cf82ec7217f65b6dae523d5482a14c5c36e2c Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Thu, 11 Jun 2015 08:35:53 -0700
Subject: [PATCH 0632/2267] makes the acceptance tests more robust by ensuring
 selinux is disabled on all runs.

Previously, selinux was disabled by the basic_spec acceptance tests, which set up
the rest of the tests. However to make this more robust, we need to disable selinux
from spec_helper_acceptance so that all runs get the disabling.
---
 spec/acceptance/basic_spec.rb  | 12 ------------
 spec/spec_helper_acceptance.rb |  7 +++++++
 2 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 spec/acceptance/basic_spec.rb

diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
deleted file mode 100644
index 6c2b3f462f..0000000000
--- a/spec/acceptance/basic_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'disable selinux:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it "because otherwise apache won't work" do
-    apply_manifest(%{
-      exec { "setenforce 0":
-        path   => "/bin:/sbin:/usr/bin:/usr/sbin",
-        onlyif => "which setenforce && getenforce | grep Enforcing",
-      }
-    }, :catch_failures => true)
-  end
-end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 1091edcaf2..599cc5663e 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -42,6 +42,13 @@
       end
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module','install','puppetlabs-concat', '--version 1.1.1', '--force'), { :acceptable_exit_codes => [0,1] }
+
+      # Make sure selinux is disabled before each test or apache won't work.
+      if ! UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))
+        on host, puppet('apply', '-e',
+                          %{"exec { 'setenforce 0': path   => '/bin:/sbin:/usr/bin:/usr/sbin', onlyif => 'which setenforce && getenforce | grep Enforcing', }"}),
+                          { :acceptable_exit_codes => [0] }
+      end
     end
   end
 end

From 4069e79b1fce1714f2966c82259e51e2344ecfbf Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 10 Jun 2015 17:03:50 -0700
Subject: [PATCH 0633/2267] Add the helper to install puppet/pe/puppet-agent

---
 Gemfile                        |  1 +
 spec/spec_helper_acceptance.rb | 21 ++-------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2b1b7cd8d9..bfe64b186a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ group :system_tests do
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false
+  gem 'beaker-puppet_install_helper', :require => false
 end
 
 
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 66d1d7c430..4243cd2ca9 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,25 +1,8 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
+require 'beaker/puppet_install_helper'
 
-
-unless ENV['RS_PROVISION'] == 'no'
-  # This will install the latest available package on el and deb based
-  # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = {
-    :default_action => 'gem_install',
-    :version        => (ENV['PUPPET_VERSION'] || '3.8.1'),
-  }
-
-  if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
-
-  hosts.each do |host|
-    if host['platform'] =~ /debian/
-      on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-    end
-
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
+run_puppet_install_helper
 
 UNSUPPORTED_PLATFORMS = ['Suse','windows','AIX','Solaris']
 

From c7ce06cac84c2c57c5fb25852f2e8573555607d0 Mon Sep 17 00:00:00 2001
From: Tobias Muellerleile <tobias@muellerleile.net>
Date: Thu, 21 May 2015 14:04:40 +0200
Subject: [PATCH 0634/2267] Add ssl_openssl_conf_cmd param (apache::mod::ssl
 and apache::vhost)

---
 README.md                    | 5 +++++
 manifests/mod/ssl.pp         | 2 ++
 manifests/vhost.pp           | 2 ++
 spec/classes/mod/ssl_spec.rb | 9 +++++++++
 spec/defines/vhost_spec.rb   | 3 +++
 templates/mod/ssl.conf.erb   | 3 +++
 templates/vhost/_ssl.erb     | 3 +++
 7 files changed, 27 insertions(+)

diff --git a/README.md b/README.md
index 087bbc8694..f954533e1a 100644
--- a/README.md
+++ b/README.md
@@ -823,6 +823,7 @@ Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are t
       ssl_compression         => false,
       ssl_cryptodevice        => 'builtin',
       ssl_options             => [ 'StdEnvVars' ],
+      ssl_openssl_conf_cmd    => undef,
       ssl_cipher              => 'HIGH:MEDIUM:!aNULL:!MD5',
       ssl_honorcipherorder    => 'On',
       ssl_protocol            => [ 'all', '-SSLv2', '-SSLv3' ],
@@ -2251,6 +2252,10 @@ An array:
     }
 ```
 
+#####`ssl_openssl_conf_cmd`
+
+Sets the [SSLOpenSSLConfCmd](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. Defaults to 'undef'.
+
 #####`ssl_proxyengine`
 
 Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid values are 'true' and 'false'. Defaults to 'false'.
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 4a6b823347..9e68d21b70 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -2,6 +2,7 @@
   $ssl_compression         = false,
   $ssl_cryptodevice        = 'builtin',
   $ssl_options             = [ 'StdEnvVars' ],
+  $ssl_openssl_conf_cmd    = undef,
   $ssl_cipher              = 'HIGH:MEDIUM:!aNULL:!MD5',
   $ssl_honorcipherorder    = 'On',
   $ssl_protocol            = [ 'all', '-SSLv2', '-SSLv3' ],
@@ -57,6 +58,7 @@
   # $ssl_cipher
   # $ssl_honorcipherorder
   # $ssl_options
+  # $ssl_openssl_conf_cmd
   # $session_cache
   # $ssl_mutex
   # $ssl_random_seed_bytes
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 17f61e3132..60b5124e11 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -26,6 +26,7 @@
   $ssl_verify_client           = undef,
   $ssl_verify_depth            = undef,
   $ssl_options                 = undef,
+  $ssl_openssl_conf_cmd        = undef,
   $ssl_proxyengine             = false,
   $priority                    = undef,
   $default_vhost               = false,
@@ -729,6 +730,7 @@
   # - $ssl_verify_client
   # - $ssl_verify_depth
   # - $ssl_options
+  # - $ssl_openssl_conf_cmd
   # - $apache_version
   if $ssl {
     concat::fragment { "${name}-ssl":
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 50aa8292fe..1e8b94edca 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -136,5 +136,14 @@
       end
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLRandomSeed startup file:/dev/urandom 1024$})}
     end
+
+    context 'setting ssl_openssl_conf_cmd' do
+      let :params do
+        {
+          :ssl_openssl_conf_cmd => 'DHParameters "foo.pem"',
+        }
+      end
+      it { is_expected.to contain_file('ssl.conf').with_content(/^\s+SSLOpenSSLConfCmd DHParameters "foo.pem"$/)}
+    end
   end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 47c1b1f455..489c9b43f4 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -153,6 +153,7 @@
           'ssl_verify_client'           => 'optional',
           'ssl_verify_depth'            => '3',
           'ssl_options'                 => '+ExportCertData',
+          'ssl_openssl_conf_cmd'        => 'DHParameters "foo.pem"',
           'ssl_proxyengine'             => true,
           'priority'                    => '30',
           'default_vhost'               => true,
@@ -398,6 +399,8 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-setenv') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+        :content => /^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 933aa1fcc8..96b80b0036 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -25,4 +25,7 @@
 <% if @ssl_options -%>
   SSLOptions <%= @ssl_options.compact.join(' ') %>
 <% end -%>
+<%- if @ssl_openssl_conf_cmd -%>
+  SSLOpenSSLConfCmd <%= @ssl_openssl_conf_cmd %>
+<%- end -%>
 </IfModule>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 516992558f..c2d9413509 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -43,4 +43,7 @@
   <%- if @ssl_options -%>
   SSLOptions <%= Array(@ssl_options).join(' ') %>
   <%- end -%>
+  <%- if @ssl_openssl_conf_cmd -%>
+  SSLOpenSSLConfCmd       <%= @ssl_openssl_conf_cmd %>
+  <%- end -%>
 <% end -%>

From 09ce83ef037a3a3c9fba0f5cac3746fa4ddcbb5b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 4 Jun 2015 14:10:44 -0700
Subject: [PATCH 0635/2267] Incorrect date in the changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e0b1ee87e..bfd53c5e48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-##2015-06-16 - Supported Release 1.5.0
+##2015-06-09 - Supported Release 1.5.0
 ### Summary
 This release primarily adds Suse compatibility. It also adds a handful of other
 parameters for greater configuration control.

From c054232b398605f900cf02995679b26ce7f215fa Mon Sep 17 00:00:00 2001
From: Chris Liles <christopherliles@gmail.com>
Date: Wed, 3 Jun 2015 14:52:13 -0700
Subject: [PATCH 0636/2267] Amazon Linux does not support systemd. Having the
 versioncmp makes this fail on newer versions (which do not yet support
 systemd). Run this on 2015.03 and you end up with an apache server that will
 not start.

---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 0d8969ca69..637b2bbe52 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -12,7 +12,7 @@
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon' and versioncmp($::operatingsystemrelease, '2014.09') <= 0  ) ) {
+        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !$::operatingsystem == 'Amazon' ) {
           ::apache::mod { 'systemd': }
         }
         ::apache::mod { 'unixd': }

From 27d7074fa7cf6f6aae083734e93e82141dce6dd2 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 10 Jun 2015 11:37:50 -0700
Subject: [PATCH 0637/2267] Updated changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfd53c5e48..7a722a8a9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,9 @@
-##2015-06-09 - Supported Release 1.5.0
+##2015-06-11 - Supported Release 1.5.0
 ### Summary
 This release primarily adds Suse compatibility. It also adds a handful of other
 parameters for greater configuration control.
 
 ### Features
-- Now compatible with concat 1.x and 2.x
 - Add `apache::lib_path` parameter
 - Add `apache::service_restart` parameter
 - Add `apache::vhost::geoip_enable` parameter
@@ -29,6 +28,7 @@ parameters for greater configuration control.
 - Fix alias module being declared even when vhost is absent
 - Fix proxy\_pass\_match handling in vhost's proxy template
 - Fix userdir access permissions
+- Fix issue where the module was trying to use systemd on Amazon Linux.
 
 ##2015-04-28 - Supported Release 1.4.1
 

From 4f386295d9c6783dc1737c65f200bfea1aa06cfa Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 10 Jun 2015 16:15:11 -0700
Subject: [PATCH 0638/2267] fixes bug introduced by PR1133

---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 637b2bbe52..9e3c2c69a7 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -12,7 +12,7 @@
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !$::operatingsystem == 'Amazon' ) {
+        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon') ) {
           ::apache::mod { 'systemd': }
         }
         ::apache::mod { 'unixd': }

From 44bc7216a4501da453eb4143773e42baeb870daf Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Thu, 11 Jun 2015 08:35:53 -0700
Subject: [PATCH 0639/2267] makes the acceptance tests more robust by ensuring
 selinux is disabled on all runs.

Previously, selinux was disabled by the basic_spec acceptance tests, which set up
the rest of the tests. However to make this more robust, we need to disable selinux
from spec_helper_acceptance so that all runs get the disabling.
---
 spec/acceptance/basic_spec.rb  | 12 ------------
 spec/spec_helper_acceptance.rb |  7 +++++++
 2 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 spec/acceptance/basic_spec.rb

diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
deleted file mode 100644
index 6c2b3f462f..0000000000
--- a/spec/acceptance/basic_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'disable selinux:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it "because otherwise apache won't work" do
-    apply_manifest(%{
-      exec { "setenforce 0":
-        path   => "/bin:/sbin:/usr/bin:/usr/sbin",
-        onlyif => "which setenforce && getenforce | grep Enforcing",
-      }
-    }, :catch_failures => true)
-  end
-end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 4243cd2ca9..e93465c9cb 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -28,6 +28,13 @@
       end
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module','install','puppetlabs-concat', '--version 1.1.1', '--force'), { :acceptable_exit_codes => [0,1] }
+
+      # Make sure selinux is disabled before each test or apache won't work.
+      if ! UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))
+        on host, puppet('apply', '-e',
+                          %{"exec { 'setenforce 0': path   => '/bin:/sbin:/usr/bin:/usr/sbin', onlyif => 'which setenforce && getenforce | grep Enforcing', }"}),
+                          { :acceptable_exit_codes => [0] }
+      end
     end
   end
 end

From 9e4f8ef9204459b6447138df52041a37b9549171 Mon Sep 17 00:00:00 2001
From: Bryan Andrews <bryanandrews@gmail.com>
Date: Thu, 18 Jun 2015 11:39:17 -0700
Subject: [PATCH 0640/2267] adding support for a filters array to apache::vhost

---
 README.md                    | 30 ++++++++++++++++++++++++++++++
 manifests/vhost.pp           | 18 ++++++++++++++++++
 templates/vhost/_filters.erb | 10 ++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 templates/vhost/_filters.erb

diff --git a/README.md b/README.md
index 68a91e94c3..9bf0df0446 100644
--- a/README.md
+++ b/README.md
@@ -210,6 +210,21 @@ Starting in Apache 2.2.16, HTTPD supports [FallbackResource](https://httpd.apach
     }
 ```
 
+To set up a virtual host with filter rules
+
+```puppet
+    apache::vhost { 'subdomain.loc':
+      port             => '80',
+      filters          => [
+        'FilterDeclare COMPRESS',
+        'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/html',
+        'FilterChain COMPRESS',
+        'FilterProtocol COMPRESS  DEFLATE change=yes;byteranges=no',
+      ],
+      docroot          => '/var/www/html',
+    }
+```
+
 Please note that the 'disabled' argument to FallbackResource is only supported since Apache 2.2.24.
 
 See a list of all [virtual host parameters](#defined-type-apachevhost). See an extensive list of [virtual host examples](#virtual-host-examples).
@@ -1529,6 +1544,21 @@ Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mo
     }
 ```
 
+#####`filters`
+
+[Filters](http://httpd.apache.org/docs/2.2/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
+
+```puppet
+    apache::vhost { "$::fqdn":
+      filters => [
+        'FilterDeclare   COMPRESS',
+        'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
+        'FilterChain     COMPRESS',
+        'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
+      ],
+    }
+```
+
 #####`rewrites`
 
 Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 60b5124e11..09b6e14906 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -82,6 +82,7 @@
   $rack_base_uris              = undef,
   $headers                     = undef,
   $request_headers             = undef,
+  $filters                     = undef,
   $rewrites                    = undef,
   $rewrite_base                = undef,
   $rewrite_rule                = undef,
@@ -398,6 +399,13 @@
     }
   }
 
+  # Check if mod_headers is required to process $headers/$request_headers
+  if $filters {
+    if ! defined(Class['apache::mod::filters']) {
+      include ::apache::mod::filters
+    }
+  }
+
   if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
     if ! defined(Class['apache::mod::setenvif']) {
       include ::apache::mod::setenvif
@@ -882,6 +890,16 @@
     }
   }
 
+  # Template uses:
+  # - $filters
+  if $filters and ! empty($filters) {
+    concat::fragment { "${name}-filters":
+      target  => "${priority_real}${filename}.conf",
+      order   => 330,
+      content => template('apache/vhost/_filters.erb'),
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
diff --git a/templates/vhost/_filters.erb b/templates/vhost/_filters.erb
new file mode 100644
index 0000000000..b862597349
--- /dev/null
+++ b/templates/vhost/_filters.erb
@@ -0,0 +1,10 @@
+<% if @filters and ! @filters.empty? -%>
+
+  ## Filter module rules
+  ## as per http://httpd.apache.org/docs/2.2/mod/mod_filter.html
+  <%- Array(@filters).each do |filter| -%>
+    <%- if filter != '' -%>
+  <%= filter %>
+    <%- end -%>
+  <%- end -%>
+<% end -%>

From 2f525f0045aaae49422b58eb273da3c2fedfd623 Mon Sep 17 00:00:00 2001
From: Bryan Andrews <bryanandrews@gmail.com>
Date: Thu, 18 Jun 2015 11:45:36 -0700
Subject: [PATCH 0641/2267] fixed mod filter name and docs

---
 README.md          | 39 +++++++++++++++++++--------------------
 manifests/vhost.pp |  4 ++--
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 9bf0df0446..cf29e07ac4 100644
--- a/README.md
+++ b/README.md
@@ -216,10 +216,10 @@ To set up a virtual host with filter rules
     apache::vhost { 'subdomain.loc':
       port             => '80',
       filters          => [
-        'FilterDeclare COMPRESS',
-        'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/html',
-        'FilterChain COMPRESS',
-        'FilterProtocol COMPRESS  DEFLATE change=yes;byteranges=no',
+        'FilterDeclare  COMPRESS',
+        'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html',
+        'FilterChain    COMPRESS',
+        'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no',
       ],
       docroot          => '/var/www/html',
     }
@@ -1283,6 +1283,21 @@ Specifies if the vhost file is present or absent. Defaults to 'present'.
 
 Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid values must either begin with a / or be 'disabled'. Defaults to 'undef'.
 
+#####`filters`
+
+[Filters](http://httpd.apache.org/docs/2.2/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
+
+```puppet
+    apache::vhost { "$::fqdn":
+      filters => [
+        'FilterDeclare   COMPRESS',
+        'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
+        'FilterChain     COMPRESS',
+        'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
+      ],
+    }
+```
+
 #####`headers`
 
 Adds lines to replace, merge, or remove response headers. See [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Can be an array. Defaults to 'undef'.
@@ -1543,22 +1558,6 @@ Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mo
       ],
     }
 ```
-
-#####`filters`
-
-[Filters](http://httpd.apache.org/docs/2.2/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
-
-```puppet
-    apache::vhost { "$::fqdn":
-      filters => [
-        'FilterDeclare   COMPRESS',
-        'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
-        'FilterChain     COMPRESS',
-        'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
-      ],
-    }
-```
-
 #####`rewrites`
 
 Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 09b6e14906..7debe6fc4d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -401,8 +401,8 @@
 
   # Check if mod_headers is required to process $headers/$request_headers
   if $filters {
-    if ! defined(Class['apache::mod::filters']) {
-      include ::apache::mod::filters
+    if ! defined(Class['apache::mod::filter']) {
+      include ::apache::mod::filter
     }
   }
 

From c77abfc6f40d4054c04eb2d6fd8fe27ded79fce9 Mon Sep 17 00:00:00 2001
From: Bryan Andrews <bryanandrews@gmail.com>
Date: Thu, 18 Jun 2015 11:51:22 -0700
Subject: [PATCH 0642/2267] doc updates about mod_filter for apache::vhost

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7debe6fc4d..e15ea66681 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -399,7 +399,7 @@
     }
   }
 
-  # Check if mod_headers is required to process $headers/$request_headers
+  # Check if mod_filter is required to process $filters
   if $filters {
     if ! defined(Class['apache::mod::filter']) {
       include ::apache::mod::filter

From 3aff134feadfbdd5280606064c6c2fd59360e5f5 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 19 Jun 2015 11:43:00 -0700
Subject: [PATCH 0643/2267] Set obsoletes=0 on el7 to work around PUP-4497

---
 spec/acceptance/mod_security_spec.rb | 12 ++++++++++++
 spec/spec_helper_acceptance.rb       |  1 +
 2 files changed, 13 insertions(+)

diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 60295787e0..18de2804e1 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -18,6 +18,18 @@
         pp = "class { 'epel': }"
         apply_manifest(pp, :catch_failures => true)
       end
+    elsif fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
+      it 'changes obsoletes, per PUP-4497' do
+        pp = <<-EOS
+          ini_setting { 'obsoletes':
+            path    => '/etc/yum.conf',
+            section => 'main',
+            setting => 'obsoletes',
+            value   => '0',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
     end
 
     it 'succeeds in puppeting mod_security' do
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index e93465c9cb..6304c222bc 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -21,6 +21,7 @@
       # Required for mod_passenger tests.
       if fact('osfamily') == 'RedHat'
         on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
+        on host, puppet('module','install','puppetlabs/inifile'), { :acceptable_exit_codes => [0,1] }
       end
       # Required for manifest to make mod_pagespeed repository available
       if fact('osfamily') == 'Debian'

From 4da8f4949977bfbbed702bb4ab6a2fbed11a9ffb Mon Sep 17 00:00:00 2001
From: Farzad FARID <ffarid@pragmatic-source.com>
Date: Fri, 10 Apr 2015 00:58:32 +0200
Subject: [PATCH 0644/2267] Fix test condition for proxy directives.

The _proxy.erb partial template must also be inserted when only @proxy_dest_match
or @proxy_dest_match are set.
---
 manifests/vhost.pp         |  2 +-
 spec/defines/vhost_spec.rb | 24 ++++++++++++++++++++++++
 templates/vhost/_proxy.erb |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 60b5124e11..976bd1f8bd 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -628,7 +628,7 @@
   # - $proxy_pass_match
   # - $proxy_preserve_host
   # - $no_proxy_uris
-  if $proxy_dest or $proxy_pass or $proxy_pass_match {
+  if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match {
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}${filename}.conf",
       order   => 140,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 489c9b43f4..325a06333e 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -414,6 +414,30 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
+    context 'proxy_pass_match' do
+      let :params do
+        {
+          'docroot'          => '/rspec/docroot',
+          'proxy_pass_match'            => [
+            {
+              'path'     => '.*',
+              'url'      => 'http://backend-a/',
+            }
+          ],
+        }
+      end
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /ProxyPassMatch .* http:\/\/backend-a\//).with_content(/## Proxy rules/) }
+    end
+    context 'proxy_dest_match' do
+      let :params do
+        {
+          'docroot'          => '/rspec/docroot',
+          'proxy_dest_match' => '/'
+        }
+      end
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(/## Proxy rules/) }
+    end
     context 'not everything can be set together...' do
       let :params do
         {
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index f290fcb764..157e2ef402 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -1,4 +1,4 @@
-<% if @proxy_dest or @proxy_pass -%>
+<% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match -%>
 
   ## Proxy rules
   ProxyRequests Off

From fe118fb556974701bcd35e2cb379b6ce094759d6 Mon Sep 17 00:00:00 2001
From: Bryan Andrews <bryanandrews@gmail.com>
Date: Mon, 22 Jun 2015 13:06:46 -0700
Subject: [PATCH 0645/2267] added unit test for apache::vhost  support

---
 tests/vhost_filter.pp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tests/vhost_filter.pp

diff --git a/tests/vhost_filter.pp b/tests/vhost_filter.pp
new file mode 100644
index 0000000000..15ddf42773
--- /dev/null
+++ b/tests/vhost_filter.pp
@@ -0,0 +1,17 @@
+# Base class. Declares default vhost on port 80 with filers.
+class { 'apache': }
+
+# Example from README adapted.
+apache::vhost { 'readme.example.net':
+  docroot     => '/var/www/html',
+  filters             => [
+    'FilterDeclare   COMPRESS',
+    'FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/html',
+    'FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/css',
+    'FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/plain',
+    'FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/xml',
+    'FilterChain     COMPRESS',
+    'FilterProtocol  COMPRESS  DEFLATE change=yes;byteranges=no',
+  ],
+}
+

From a79a581efc1837879377588274d1f04e40650230 Mon Sep 17 00:00:00 2001
From: Bryan Andrews <bryanandrews@gmail.com>
Date: Mon, 22 Jun 2015 18:17:27 -0700
Subject: [PATCH 0646/2267] typo fixed in unit test

---
 tests/vhost_filter.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/vhost_filter.pp b/tests/vhost_filter.pp
index 15ddf42773..ab339737f9 100644
--- a/tests/vhost_filter.pp
+++ b/tests/vhost_filter.pp
@@ -1,4 +1,4 @@
-# Base class. Declares default vhost on port 80 with filers.
+# Base class. Declares default vhost on port 80 with filters.
 class { 'apache': }
 
 # Example from README adapted.

From 1314c27bf0ee0c1d6403b6dec88de60d570b7b3b Mon Sep 17 00:00:00 2001
From: Bryan Andrews <bryanandrews@gmail.com>
Date: Tue, 23 Jun 2015 15:15:47 -0700
Subject: [PATCH 0647/2267] added spec test for apache::vhost filters support

---
 spec/defines/vhost_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 489c9b43f4..c1a1f888a9 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -255,6 +255,15 @@
               'rewrite_rule' => ['^index\.html$ welcome.html']
             }
           ],
+          'filters'                     => [
+            'FilterDeclare COMPRESS',
+            'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/html',
+            'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/css',
+            'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/plain',
+            'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/xml',
+            'FilterChain COMPRESS',
+            'FilterProtocol COMPRESS  DEFLATE change=yes;byteranges=no',
+          ],
           'rewrite_base'                => '/',
           'rewrite_rule'                => '^index\.html$ welcome.html',
           'rewrite_cond'                => '%{HTTP_USER_AGENT} ^MSIE',
@@ -342,6 +351,7 @@
       it { is_expected.to contain_class('apache::mod::passenger') }
       it { is_expected.to contain_class('apache::mod::fastcgi') }
       it { is_expected.to contain_class('apache::mod::headers') }
+      it { is_expected.to contain_class('apache::mod::filter') }
       it { is_expected.to contain_class('apache::mod::setenvif') }
       it { is_expected.to contain_concat('30-rspec.example.com.conf').with({
         'owner'   => 'root',
@@ -404,6 +414,8 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
+        :content => /^\s+FilterDeclare COMPRESS$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }

From 2c27798702074eccc4cdabb3d5af7d8d1d035d2f Mon Sep 17 00:00:00 2001
From: Jonathan Tripathy <jt@puppetlabs.com>
Date: Wed, 24 Jun 2015 14:19:19 +0100
Subject: [PATCH 0648/2267] MODULES-2148 - Readme update for timeout property.

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 68a91e94c3..92f566c185 100644
--- a/README.md
+++ b/README.md
@@ -475,6 +475,9 @@ Determines whether the HTTPD service state is managed by Puppet . Defaults to 't
 
 Determines whether the HTTPD service restart command should be anything other than the default managed by Puppet.  Defaults to undef.
 
+#####`timeout`
+
+Sets the amount of seconds the server will wait for certain events before failing a request. Defaults to 120.
 
 #####`trace_enable`
 

From f0810d29170403e13d3403028b8dcd6f426a4640 Mon Sep 17 00:00:00 2001
From: Olivier Hanesse <olivier.hanesse@gmail.com>
Date: Mon, 29 Jun 2015 11:28:47 +0200
Subject: [PATCH 0649/2267] Fix: missing package for mod_geoip on Debian
 systems

---
 manifests/params.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index b5d1421362..a4ad8293c7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -181,6 +181,7 @@
       'dav_svn'     => 'libapache2-svn',
       'fastcgi'     => 'libapache2-mod-fastcgi',
       'fcgid'       => 'libapache2-mod-fcgid',
+      'geoip'       => 'libapache2-mod-geoip',
       'nss'         => 'libapache2-mod-nss',
       'pagespeed'   => 'mod-pagespeed-stable',
       'passenger'   => 'libapache2-mod-passenger',

From 11fc4774373776542d1eb886261f721bc804e919 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 1 Jul 2015 11:54:25 -0700
Subject: [PATCH 0650/2267] Installs net-tools on RHEL7, so that be_listening
 tests work

---
 spec/spec_helper_acceptance.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 6304c222bc..d767b1e60a 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -15,6 +15,15 @@
 
   # Configure all nodes in nodeset
   c.before :suite do
+    # net-tools required for netstat utility being used by be_listening
+    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
+      pp = <<-EOS
+        package { 'net-tools': ensure => installed }
+      EOS
+
+      apply_manifest_on(agents, pp, :catch_failures => false)
+    end
+
     # Install module and dependencies
     hosts.each do |host|
       copy_module_to(host, :source => proj_root, :module_name => 'apache')

From 15d513467f5a2111d0ec8a2bdb1351ef59822c52 Mon Sep 17 00:00:00 2001
From: dconry <dconry@users.noreply.github.com>
Date: Wed, 15 Jul 2015 14:14:04 -0400
Subject: [PATCH 0651/2267] Fix _proxy.erb to put multiple SetEnv

Fix _proxy.erb to put multiple SetEnv directives on separate lines for ProxyMatch blocks.  This was already fixed for plain ProxyPass blocks.
---
 templates/vhost/_proxy.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 157e2ef402..29d35cae98 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -50,7 +50,7 @@
   <%- end -%>
   <%- if proxy['setenv'] -%>
     <%- Array(proxy['setenv']).each do |setenv_var| -%>
-    SetEnv <%= setenv_var -%>
+    SetEnv <%= setenv_var %>
     <%- end -%>
   <%- end -%>
   </Location>

From f3e861efcb19346c98e12a55dba759556375a6d5 Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <shoentjen@antagonist.nl>
Date: Wed, 22 Jul 2015 12:40:35 +0200
Subject: [PATCH 0652/2267] add possibility to set icons_path to false so no
 alias will be set for it

---
 manifests/mod/alias.pp | 31 ++++++++++++-------------------
 manifests/params.pp    |  8 ++++++++
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 2f078f6456..5b59baa01d 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,27 +1,20 @@
 class apache::mod::alias(
   $apache_version = $apache::apache_version,
   $icons_options  = 'Indexes MultiViews',
-) {
-  $ver24 = versioncmp($apache_version, '2.4') >= 0
+  # set icons_path to false to disable the alias
+  $icons_path     = $::apache::params::alias_icons_path,
 
-  $icons_path = $::osfamily ? {
-    'debian'  => '/usr/share/apache2/icons',
-    'Suse'    => '/usr/share/apache2/icons',
-    'redhat'  => $ver24 ? {
-      true    => '/usr/share/httpd/icons',
-      default => '/var/www/icons',
-    },
-    'freebsd' => '/usr/local/www/apache24/icons',
-    'gentoo'  => '/usr/share/apache2/icons',
-  }
+) {
   apache::mod { 'alias': }
   # Template uses $icons_path
-  file { 'alias.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/alias.conf",
-    content => template('apache/mod/alias.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Class['apache::service'],
+  if $icons_path {
+    file { 'alias.conf':
+      ensure  => file,
+      path    => "${::apache::mod_dir}/alias.conf",
+      content => template('apache/mod/alias.conf.erb'),
+      require => Exec["mkdir ${::apache::mod_dir}"],
+      before  => File[$::apache::mod_dir],
+      notify  => Class['apache::service'],
+    }
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index b5d1421362..22e47f6386 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -113,6 +113,10 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
+    $alias_icons_path     = $::apache::version::distrelease ? {
+      '7'     => '/usr/share/httpd/icons',
+      default => '/var/www/icons',
+    }
     $error_documents_path = $::apache::version::distrelease ? {
       '7'     => '/usr/share/httpd/error',
       default => '/var/www/error'
@@ -233,6 +237,7 @@
       'base_rules/modsecurity_crs_59_outbound_blocking.conf',
       'base_rules/modsecurity_crs_60_correlation.conf'
     ]
+    $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
       $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
@@ -355,6 +360,7 @@
     $mime_types_config    = '/usr/local/etc/mime.types'
     $wsgi_socket_prefix   = undef
     $docroot              = '/usr/local/www/apache24/data'
+    $alias_icons_path     = '/usr/local/www/apache24/icons'
     $error_documents_path = '/usr/local/www/apache24/error'
   } elsif $::osfamily == 'Gentoo' {
     $user             = 'apache'
@@ -416,6 +422,7 @@
     $mime_types_config    = '/etc/mime.types'
     $wsgi_socket_prefix   = undef
     $docroot              = '/var/www/localhost/htdocs'
+    $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
   } elsif $::osfamily == 'Suse' {
     $user                = 'wwwrun'
@@ -462,6 +469,7 @@
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/srv/www'
     $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
+    $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     $dev_packages        = ['libapr-util1-devel', 'libapr1-devel']
 

From eaa0044c9a4cbf6602543f3f61f868ce088dbbb1 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 22 Jul 2015 14:09:36 -0700
Subject: [PATCH 0653/2267] fixes ordering of mod_security tests to pass on
 debian7

---
 spec/acceptance/mod_security_spec.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 18de2804e1..eaf7e1cef7 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -62,15 +62,17 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    it 'should return index page' do
-      shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
-        expect(r.stdout).to match(/Index page/)
-        expect(r.exit_code).to eq(0)
+    describe 'should be listening on port 80' do
+      it 'should return index page' do
+        shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
+          expect(r.stdout).to match(/Index page/)
+          expect(r.exit_code).to eq(0)
+        end
       end
-    end
 
-    it 'should block query with SQL' do
-      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      it 'should block query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      end
     end
 
   end #default mod_security config

From 8b00664a26728ca3556b532caa1ececa95962ed2 Mon Sep 17 00:00:00 2001
From: Ricardo Melo <ricardo.melo@gameloft.com>
Date: Fri, 24 Jul 2015 13:01:32 -0400
Subject: [PATCH 0654/2267] Adding use_optional_includes parameter to vhost
 define.

---
 manifests/vhost.pp         | 1 +
 spec/defines/vhost_spec.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 920359fed0..b48906095f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -107,6 +107,7 @@
   $fastcgi_socket              = undef,
   $fastcgi_dir                 = undef,
   $additional_includes         = [],
+  $use_optional_includes       = $::apache::use_optional_includes,
   $apache_version              = $::apache::apache_version,
   $allow_encoded_slashes       = undef,
   $suexec_user_group           = undef,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b17faa36ea..dac685eb95 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -299,6 +299,7 @@
           'fastcgi_dir'                 => '/tmp',
           'additional_includes'         => '/custom/path/includes',
           'apache_version'              => '2.4',
+          'use_optional_includes'       => true,
           'suexec_user_group'           => 'root root',
           'allow_encoded_slashes'       => 'nodecode',
           'passenger_app_root'          => '/usr/share/myapp',

From bbbe6044478799412b08921e9fb3c84164450566 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 27 Jul 2015 11:20:11 -0700
Subject: [PATCH 0655/2267] 1.6.0 prep

---
 CHANGELOG.md  | 20 +++++++++++++++++---
 metadata.json | 16 ++++++++--------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a722a8a9c..172cdf418c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,23 @@
+##2015-07-28 - Supported Release 1.6.0
+###Summary
+This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds.
+
+####Features
+- Add `scan_proxy_header_field` parameter to `apache::mod::geoip`
+- Add `ssl_openssl_conf_cmd` parameter to `apache::vhost` and `apache::mod::ssl`
+- Add `filters` parameter to `apache::vhost`
+
+####Bugfixes
+- Test updates
+- Do not use systemd on Amazon Linux
+- Add missing docs for `timeout` parameter (MODULES-2148)
+
 ##2015-06-11 - Supported Release 1.5.0
-### Summary
+###Summary
 This release primarily adds Suse compatibility. It also adds a handful of other
 parameters for greater configuration control.
 
-### Features
+####Features
 - Add `apache::lib_path` parameter
 - Add `apache::service_restart` parameter
 - Add `apache::vhost::geoip_enable` parameter
@@ -17,7 +31,7 @@ parameters for greater configuration control.
 - Add `apache::mod::ssl::ssl_honorcipherorder` parameter
 - Add `apache::mod::userdir::options` parameter
 
-### Bugfixes
+####Bugfixes
 - Document `apache::user` parameter
 - Document `apache::group` parameter
 - Fix apache::dev on FreeBSD
diff --git a/metadata.json b/metadata.json
index 71bad1d354..a0e3fc2fac 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,12 +1,16 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-apache.git",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"}
+  ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -64,16 +68,12 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.7.0 < 4.0.0"
+      "version_requirement": ">= 3.7.0 < 2015.3.0"
     },
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 5.0.0"
     }
   ],
-  "description": "Module for Apache configuration",
-  "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"}
-  ]
+  "description": "Module for Apache configuration"
 }

From a403853cded8764c64e84f3dfe6985f3da6b5a95 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Mon, 27 Jul 2015 12:20:32 -0700
Subject: [PATCH 0656/2267] update to CHANGELOG

---
 CHANGELOG.md | 72 ++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 172cdf418c..985194bf54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,23 @@
-##2015-07-28 - Supported Release 1.6.0
-###Summary
+## 2015-07-28 - Supported Release 1.6.0
+### Summary
 This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds.
 
-####Features
+#### Features
 - Add `scan_proxy_header_field` parameter to `apache::mod::geoip`
 - Add `ssl_openssl_conf_cmd` parameter to `apache::vhost` and `apache::mod::ssl`
 - Add `filters` parameter to `apache::vhost`
 
-####Bugfixes
+#### Bugfixes
 - Test updates
 - Do not use systemd on Amazon Linux
 - Add missing docs for `timeout` parameter (MODULES-2148)
 
-##2015-06-11 - Supported Release 1.5.0
-###Summary
+## 2015-06-11 - Supported Release 1.5.0
+### Summary
 This release primarily adds Suse compatibility. It also adds a handful of other
 parameters for greater configuration control.
 
-####Features
+#### Features
 - Add `apache::lib_path` parameter
 - Add `apache::service_restart` parameter
 - Add `apache::vhost::geoip_enable` parameter
@@ -31,7 +31,7 @@ parameters for greater configuration control.
 - Add `apache::mod::ssl::ssl_honorcipherorder` parameter
 - Add `apache::mod::userdir::options` parameter
 
-####Bugfixes
+#### Bugfixes
 - Document `apache::user` parameter
 - Document `apache::group` parameter
 - Fix apache::dev on FreeBSD
@@ -44,16 +44,16 @@ parameters for greater configuration control.
 - Fix userdir access permissions
 - Fix issue where the module was trying to use systemd on Amazon Linux.
 
-##2015-04-28 - Supported Release 1.4.1
+## 2015-04-28 - Supported Release 1.4.1
 
 This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module.
 
-##2015-03-17 - Supported Release 1.4.0
+## 2015-03-17 - Supported Release 1.4.0
 ###Summary
 
 This release fixes the issue where the docroot was still managed even if the default vhosts were disabled and has many other features and bugfixes including improved support for 'deny' and 'require' as arrays in the 'directories' parameter under `apache::vhost`
 
-####Features
+#### Features
 - New parameters to `apache`
   - `default_charset`
   - `default_type`
@@ -81,7 +81,7 @@ This release fixes the issue where the docroot was still managed even if the def
 - Added proper array support for `require` in the `directories` parameter in `apache::vhost`
 - Added support for `setenv` inside proxy locations
 
-###Bugfixes
+### Bugfixes
 - Fix issue in `apache::vhost` that was preventing the scriptalias fragment from being included (MODULES-1784)
 - Install required `mod_ldap` package for EL7 (MODULES-1779)
 - Change default value of `maxrequestworkers` in `apache::mod::event` to be a multiple of the default `ThreadsPerChild` of 25.
@@ -91,12 +91,12 @@ This release fixes the issue where the docroot was still managed even if the def
 - Change the loadfile name for `mod_passenger` so `mod_proxy` will load by default before `mod_passenger`
 - Remove old Debian work-around that removed `passenger_extra.conf`
 
-##2015-02-17 - Supported Release 1.3.0
-###Summary
+## 2015-02-17 - Supported Release 1.3.0
+### Summary
 
 This release has many new features and bugfixes, including the ability to optionally not trigger service restarts on config changes.
 
-####Features
+#### Features
 - New parameters - `apache`
   - `service_manage`
   - `use_optional_includes`
@@ -131,7 +131,7 @@ This release has many new features and bugfixes, including the ability to option
 - Add passenger support for Debian Jessie
 - Add support for not having puppet restart the apache service (MODULES-1559)
 
-####Bugfixes
+#### Bugfixes
 - For apache 2.4 `mod_itk` requires `mod_prefork` (MODULES-825)
 - Allow SSLCACertificatePath to be unset in `apache::vhost` (MODULES-1457)
 - Load fcgid after unixd on RHEL7
@@ -150,12 +150,12 @@ This release has many new features and bugfixes, including the ability to option
 - Fix indentation in `vhost/_directories.erb` template (MODULES-1688)
 - Create symlinks on all distros if `vhost_enable_dir` is specified
 
-##2014-09-30 - Supported Release 1.2.0
-###Summary
+## 2014-09-30 - Supported Release 1.2.0
+### Summary
 
 This release features many improvements and bugfixes, including several new defines, a reworking of apache::vhost for more extensibility, and many new parameters for more customization. This release also includes improved support for strict variables and the future parser.
 
-####Features
+#### Features
 - Convert apache::vhost to use concat for easier extensions
 - Test improvements
 - Synchronize files with modulesync
@@ -218,7 +218,7 @@ This release features many improvements and bugfixes, including several new defi
   - Add apache_version parameter to apache::mod::userdir
   - Add apache::mod::version class
 
-####Bugfixes
+#### Bugfixes
 - Set osfamily defaults for wsgi_socket_prefix
 - Support multiple balancermembers with the same url
 - Validate apache::vhost::custom_fragment
@@ -249,25 +249,25 @@ This release features many improvements and bugfixes, including several new defi
 - Fix RedirectMatch rules
 - Fix misleading error message in apache::version
 
-####Known Bugs
+#### Known Bugs
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
 * SLES is unsupported.
 
-##2014-07-15 - Supported Release 1.1.1
-###Summary
+## 2014-07-15 - Supported Release 1.1.1
+### Summary
 
 This release merely updates metadata.json so the module can be uninstalled and
 upgraded via the puppet module command.
 
 ## 2014-04-14 Supported Release 1.1.0
 
-###Summary
+### Summary
 
 This release primarily focuses on extending the httpd 2.4 support, tested
 through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger 
 4 support, as well as several new modules and important bugfixes.
 
-####Features
+#### Features
 
 - Add support for RHEL7 and Ubuntu 14.04
 - More complete apache24 support
@@ -282,7 +282,7 @@ through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger
 - Add support for custom extensions for mod_php
 - Improve proxy_html support for Debian
 
-####Bugfixes
+#### Bugfixes
 
 - Remove NameVirtualHost directive for apache >= 2.4
 - Order proxy_set option so it doesn't change between runs
@@ -290,42 +290,42 @@ through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger
 - Fix missing ensure on concat::fragment resources
 - Fix bad dependencies in apache::mod and apache::mod::mime
 
-####Known Bugs
+#### Known Bugs
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
 * SLES is unsupported.
 
 ## 2014-03-04 Supported Release 1.0.1
-###Summary
+### Summary
 
 This is a supported release.  This release removes a testing symlink that can
 cause trouble on systems where /var is on a seperate filesystem from the
 modulepath.
 
-####Features
-####Bugfixes
-####Known Bugs
+#### Features
+#### Bugfixes
+#### Known Bugs
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
 * SLES is unsupported.
  
 ## 2014-03-04 Supported Release 1.0.0
-###Summary
+### Summary
 
 This is a supported release. This release introduces Apache 2.4 support for
 Debian and RHEL based osfamilies.
 
-####Features
+#### Features
 
 - Add apache24 support
 - Add rewrite_base functionality to rewrites
 - Updated README documentation
 - Add WSGIApplicationGroup and WSGIImportScript directives
 
-####Bugfixes
+#### Bugfixes
 
 - Replace mutating hashes with merge() for Puppet 3.5
 - Fix WSGI import_script and mod_ssl issues on Lucid
 
-####Known Bugs
+#### Known Bugs
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
 * SLES is unsupported.
 
@@ -507,7 +507,7 @@ worker/prefork
 - Fix formatting in vhost template
 - Fix spec tests such that they pass
 
-##2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
+## 2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
 * e62e362 Fix broken tests for ssl, vhost, vhost::*
 * 42c6363 Changes to match style guide and pass puppet-lint without error
 * 42bc8ba changed name => path for file resources in order to name namevar by it's name

From b1a3cc18f3d07ec239b5183384c12798f83b852f Mon Sep 17 00:00:00 2001
From: Phil Fenstermacher <pcfens@wm.edu>
Date: Mon, 6 Jul 2015 16:55:53 -0400
Subject: [PATCH 0657/2267] Include full path for UserDir directive

---
 templates/mod/userdir.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index 9032a3acc7..83263c3d02 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -2,7 +2,7 @@
 <% if @disable_root -%>
   UserDir disabled root
 <% end -%>
-  UserDir <%= @dir %>
+  UserDir <%= @home %>/*/<%= @dir %>
 
   <Directory "<%= @home %>/*/<%= @dir %>">
     AllowOverride FileInfo AuthConfig Limit Indexes

From 8b2e700360f2a36ce19f9b1cc56640d3014ede25 Mon Sep 17 00:00:00 2001
From: Mason Malone <mason@masonm.org>
Date: Wed, 29 Jul 2015 09:55:50 -0400
Subject: [PATCH 0658/2267] Fix apache::mod::cgid so it can be used with the
 event MPM

Before this, attempting to include apache::mod::cgid when using the event MPM
raised the following error:
Could not find resource 'Class[Apache::Mod::Worker]' for relationship on 'Class[Apache::Mod::Cgid]'
---
 manifests/mod/cgid.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 8946f652b9..6db6b287d1 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -2,7 +2,12 @@
   case $::osfamily {
     'FreeBSD': {}
     default: {
-      Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
+      if defined(Class['::apache::mod::worker']) {
+        Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
+      }
+      elsif defined(Class['::apache::mod::event']) {
+        Class['::apache::mod::event'] -> Class['::apache::mod::cgid']
+      }
     }
   }
 

From 4cca48fd04fc2c7986ad8bb020a233e28317c918 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Mon, 27 Jul 2015 13:42:18 -0700
Subject: [PATCH 0659/2267] fixes timing of mod_security tests for aio

While running AIO tests on RHEL6, the httpd service takes a bit longer
to init. Since Apache init scripts return and completes init asynchronously
this causes tests to fail. Adding a short sleep here to wait for the service
to init compensates for the slower init.
---
 spec/acceptance/mod_security_spec.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index eaf7e1cef7..67ad7d5b84 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::security class', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise'))) do
+describe 'apache::mod::security class', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy'))) do
   case fact('osfamily')
   when 'Debian'
     mod_dir      = '/etc/apache2/mods-available'
@@ -47,6 +47,11 @@ class { 'apache::mod::security': }
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
+
+      #Need to add a short sleep here because on RHEL6 the service takes a bit longer to init
+      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
+        sleep 5
+      end
     end
 
     describe service(service_name) do

From 4646f7be28f38f8f361a9f64408de26585ca4d41 Mon Sep 17 00:00:00 2001
From: Katharina Drexel <Katharina.Drexel@noris.de>
Date: Thu, 30 Jul 2015 12:55:59 +0200
Subject: [PATCH 0660/2267] we also want to have groups with '-' like
 vhost-users

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 920359fed0..9018a29a1b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -149,7 +149,7 @@
   # Input validation begins
 
   if $suexec_user_group {
-    validate_re($suexec_user_group, '^\w+ \w+$',
+    validate_re($suexec_user_group, '^[\w-]+ [\w-]+$',
     "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
   }
 

From 9f0c303e79a88eaae59a332fa62159082b93f9b3 Mon Sep 17 00:00:00 2001
From: Soren Morton <soren.morton@kount.com>
Date: Fri, 8 May 2015 20:13:29 +0000
Subject: [PATCH 0661/2267] Adding ability to enable/disable the secruleengine
 through a parameter

---
 README.md                       | 4 ++++
 manifests/mod/security.pp       | 1 +
 manifests/params.pp             | 2 ++
 templates/mod/security.conf.erb | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 44c87997ef..58da99da09 100644
--- a/README.md
+++ b/README.md
@@ -1079,6 +1079,10 @@ Name of package to install containing crs rules
 
 Directory to install the modsec configuration and activated rules links into
 
+#####`modsec_secruleengine`
+
+Configures the rules engine. Valid vaules are On, Off, and DetectionOnly
+
 #####`activated_rules`
 
 Array of rules from the modsec_crs_path to activate by symlinking to
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 84e55e2921..050b1bd6fa 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -2,6 +2,7 @@
   $crs_package           = $::apache::params::modsec_crs_package,
   $activated_rules       = $::apache::params::modsec_default_rules,
   $modsec_dir            = $::apache::params::modsec_dir,
+  $modsec_secruleengine  = $::apache::params::modsec_secruleengine,
   $allowed_methods       = 'GET HEAD POST OPTIONS',
   $content_types         = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
   $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
diff --git a/manifests/params.pp b/manifests/params.pp
index b5d1421362..084987a66d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -126,6 +126,7 @@
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
+    $modsec_secruleengine = 'On'
     $modsec_default_rules = [
       'base_rules/modsecurity_35_bad_robots.data',
       'base_rules/modsecurity_35_scanners.data',
@@ -210,6 +211,7 @@
     $modsec_crs_package   = 'modsecurity-crs'
     $modsec_crs_path      = '/usr/share/modsecurity-crs'
     $modsec_dir           = '/etc/modsecurity'
+    $modsec_secruleengine = 'On'
     $modsec_default_rules = [
       'base_rules/modsecurity_35_bad_robots.data',
       'base_rules/modsecurity_35_scanners.data',
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 7597c461f6..ac28402c64 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -9,7 +9,7 @@
 <%- end -%>
 
     # Default recommended configuration
-    SecRuleEngine On
+    SecRuleEngine <%= @modsec_secruleengine %>
     SecRequestBodyAccess On
     SecRule REQUEST_HEADERS:Content-Type "text/xml" \
       "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML"

From 9b7bde91968dea386b59be53f8f6b6d2e66779dd Mon Sep 17 00:00:00 2001
From: Brendan Murtagh <brendanrmurtagh@gmail.com>
Date: Wed, 29 Jul 2015 16:13:49 -0400
Subject: [PATCH 0662/2267] Added documentation for ForceType directive
 (MODULES-2152)

Merge clean up. Sorry, no a git pro
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 44c87997ef..e1726c5688 100644
--- a/README.md
+++ b/README.md
@@ -1301,6 +1301,10 @@ Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.htm
     }
 ```
 
+#####`force_type`
+
+Sets the [ForceType](http://httpd.apache.org/docs/2.2/mod/core.html#forcetype) directive, to force all matching files to be served with the specified MIME content-type.
+
 #####`headers`
 
 Adds lines to replace, merge, or remove response headers. See [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Can be an array. Defaults to 'undef'.

From f87394e74838ea9e9d9e07dc22da25898e928766 Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <shoentjen@antagonist.nl>
Date: Wed, 22 Jul 2015 12:40:35 +0200
Subject: [PATCH 0663/2267] add possibility to set icons_path to false so no
 alias will be set for it

---
 manifests/mod/alias.pp | 31 ++++++++++++-------------------
 manifests/params.pp    |  8 ++++++++
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 2f078f6456..5b59baa01d 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,27 +1,20 @@
 class apache::mod::alias(
   $apache_version = $apache::apache_version,
   $icons_options  = 'Indexes MultiViews',
-) {
-  $ver24 = versioncmp($apache_version, '2.4') >= 0
+  # set icons_path to false to disable the alias
+  $icons_path     = $::apache::params::alias_icons_path,
 
-  $icons_path = $::osfamily ? {
-    'debian'  => '/usr/share/apache2/icons',
-    'Suse'    => '/usr/share/apache2/icons',
-    'redhat'  => $ver24 ? {
-      true    => '/usr/share/httpd/icons',
-      default => '/var/www/icons',
-    },
-    'freebsd' => '/usr/local/www/apache24/icons',
-    'gentoo'  => '/usr/share/apache2/icons',
-  }
+) {
   apache::mod { 'alias': }
   # Template uses $icons_path
-  file { 'alias.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/alias.conf",
-    content => template('apache/mod/alias.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Class['apache::service'],
+  if $icons_path {
+    file { 'alias.conf':
+      ensure  => file,
+      path    => "${::apache::mod_dir}/alias.conf",
+      content => template('apache/mod/alias.conf.erb'),
+      require => Exec["mkdir ${::apache::mod_dir}"],
+      before  => File[$::apache::mod_dir],
+      notify  => Class['apache::service'],
+    }
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index b5d1421362..22e47f6386 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -113,6 +113,10 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
+    $alias_icons_path     = $::apache::version::distrelease ? {
+      '7'     => '/usr/share/httpd/icons',
+      default => '/var/www/icons',
+    }
     $error_documents_path = $::apache::version::distrelease ? {
       '7'     => '/usr/share/httpd/error',
       default => '/var/www/error'
@@ -233,6 +237,7 @@
       'base_rules/modsecurity_crs_59_outbound_blocking.conf',
       'base_rules/modsecurity_crs_60_correlation.conf'
     ]
+    $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
       $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
@@ -355,6 +360,7 @@
     $mime_types_config    = '/usr/local/etc/mime.types'
     $wsgi_socket_prefix   = undef
     $docroot              = '/usr/local/www/apache24/data'
+    $alias_icons_path     = '/usr/local/www/apache24/icons'
     $error_documents_path = '/usr/local/www/apache24/error'
   } elsif $::osfamily == 'Gentoo' {
     $user             = 'apache'
@@ -416,6 +422,7 @@
     $mime_types_config    = '/etc/mime.types'
     $wsgi_socket_prefix   = undef
     $docroot              = '/var/www/localhost/htdocs'
+    $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
   } elsif $::osfamily == 'Suse' {
     $user                = 'wwwrun'
@@ -462,6 +469,7 @@
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/srv/www'
     $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
+    $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     $dev_packages        = ['libapr-util1-devel', 'libapr1-devel']
 

From 90c4befeea0cadba006adf93fe5d93908159160d Mon Sep 17 00:00:00 2001
From: Katharina Drexel <Katharina.Drexel@noris.de>
Date: Thu, 30 Jul 2015 12:55:59 +0200
Subject: [PATCH 0664/2267] we also want to have groups with '-' like
 vhost-users

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 920359fed0..9018a29a1b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -149,7 +149,7 @@
   # Input validation begins
 
   if $suexec_user_group {
-    validate_re($suexec_user_group, '^\w+ \w+$',
+    validate_re($suexec_user_group, '^[\w-]+ [\w-]+$',
     "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
   }
 

From 4daaa34da62eb0d4a42c2649f8dbcb3574daf974 Mon Sep 17 00:00:00 2001
From: Soren Morton <soren.morton@kount.com>
Date: Fri, 8 May 2015 20:13:29 +0000
Subject: [PATCH 0665/2267] Adding ability to enable/disable the secruleengine
 through a parameter

---
 README.md                       | 4 ++++
 manifests/mod/security.pp       | 1 +
 manifests/params.pp             | 2 ++
 templates/mod/security.conf.erb | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 44c87997ef..58da99da09 100644
--- a/README.md
+++ b/README.md
@@ -1079,6 +1079,10 @@ Name of package to install containing crs rules
 
 Directory to install the modsec configuration and activated rules links into
 
+#####`modsec_secruleengine`
+
+Configures the rules engine. Valid vaules are On, Off, and DetectionOnly
+
 #####`activated_rules`
 
 Array of rules from the modsec_crs_path to activate by symlinking to
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 84e55e2921..050b1bd6fa 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -2,6 +2,7 @@
   $crs_package           = $::apache::params::modsec_crs_package,
   $activated_rules       = $::apache::params::modsec_default_rules,
   $modsec_dir            = $::apache::params::modsec_dir,
+  $modsec_secruleengine  = $::apache::params::modsec_secruleengine,
   $allowed_methods       = 'GET HEAD POST OPTIONS',
   $content_types         = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
   $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
diff --git a/manifests/params.pp b/manifests/params.pp
index 22e47f6386..7d88d10053 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -130,6 +130,7 @@
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
+    $modsec_secruleengine = 'On'
     $modsec_default_rules = [
       'base_rules/modsecurity_35_bad_robots.data',
       'base_rules/modsecurity_35_scanners.data',
@@ -214,6 +215,7 @@
     $modsec_crs_package   = 'modsecurity-crs'
     $modsec_crs_path      = '/usr/share/modsecurity-crs'
     $modsec_dir           = '/etc/modsecurity'
+    $modsec_secruleengine = 'On'
     $modsec_default_rules = [
       'base_rules/modsecurity_35_bad_robots.data',
       'base_rules/modsecurity_35_scanners.data',
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 7597c461f6..ac28402c64 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -9,7 +9,7 @@
 <%- end -%>
 
     # Default recommended configuration
-    SecRuleEngine On
+    SecRuleEngine <%= @modsec_secruleengine %>
     SecRequestBodyAccess On
     SecRule REQUEST_HEADERS:Content-Type "text/xml" \
       "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML"

From 11b1bd827918437b7c4dc6da200a3b36274d966c Mon Sep 17 00:00:00 2001
From: Brendan Murtagh <brendanrmurtagh@gmail.com>
Date: Wed, 29 Jul 2015 16:13:49 -0400
Subject: [PATCH 0666/2267] Added documentation for ForceType directive
 (MODULES-2152)

Merge clean up. Sorry, no a git pro
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 58da99da09..0ce6402404 100644
--- a/README.md
+++ b/README.md
@@ -1305,6 +1305,10 @@ Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.htm
     }
 ```
 
+#####`force_type`
+
+Sets the [ForceType](http://httpd.apache.org/docs/2.2/mod/core.html#forcetype) directive, to force all matching files to be served with the specified MIME content-type.
+
 #####`headers`
 
 Adds lines to replace, merge, or remove response headers. See [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Can be an array. Defaults to 'undef'.

From fb4aa9b10983cd2b575fc1c78cdb510313b1bf06 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Thu, 30 Jul 2015 14:46:03 -0700
Subject: [PATCH 0667/2267] Removes ruby 1.8.7 from the travisci test matrix

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16d694bb6e..c418ab5f2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.1.5

From 660dda1e14edb86994d7ef49917406bd3ef68f98 Mon Sep 17 00:00:00 2001
From: Garrett Guillotte <gguillotte@users.noreply.github.com>
Date: Thu, 2 Jul 2015 15:50:31 -0700
Subject: [PATCH 0668/2267] Apache readme reorganization.

Massive reorg and style edit, bringing the way we present classes,
defines, and parameters in line with our established styles. Documents
several undocumented parameters and default values, especially in Apache
module classes.

This work is incomplete; there are many more undocumented parameters and
more style and formatting consistency issues to resolve.
---
 README.md           | 3034 ++++++++++++++++++++++++-------------------
 README.passenger.md |   54 +-
 2 files changed, 1699 insertions(+), 1389 deletions(-)

diff --git a/README.md b/README.md
index 0ce6402404..dd9851f96d 100644
--- a/README.md
+++ b/README.md
@@ -1,582 +1,1164 @@
-#apache
-
-####Table of Contents
-
-1. [Overview - What is the apache module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with apache](#setup)
-    * [Beginning with apache - Installation](#beginning-with-apache)
-    * [Configure a virtual host - Basic options for getting started](#configure-a-virtual-host)
-4. [Usage - The classes and defined types available for configuration](#usage)
-    * [Classes and Defined Types](#classes-and-defined-types)
-        * [Class: apache](#class-apache)
-        * [Defined Type: apache::custom_config](#defined-type-apachecustom_config)
-        * [Class: apache::default_mods](#class-apachedefault_mods)
-        * [Defined Type: apache::mod](#defined-type-apachemod)
-        * [Classes: apache::mod::*](#classes-apachemodname)
-        * [Class: apache::mod::alias](#class-apachemodalias)
-        * [Class: apache::mod::event](#class-apachemodevent)
-        * [Class: apache::mod::geoip](#class-apachemodgeoip)
-        * [Class: apache::mod::info](#class-apachemodinfo)
-        * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
-        * [Class: apache::mod::php](#class-apachemodphp)
-        * [Class: apache::mod::ssl](#class-apachemodssl)
-        * [Class: apache::mod::status](#class-apachemodstatus)
-        * [Class: apache::mod::expires](#class-apachemodexpires)
-        * [Class: apache::mod::wsgi](#class-apachemodwsgi)
-        * [Class: apache::mod::fcgid](#class-apachemodfcgid)
-        * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
-        * [Class: apache::mod::deflate](#class-apachemoddeflate)
-        * [Class: apache::mod::reqtimeout](#class-apachemodreqtimeout)
-        * [Class: apache::mod::security](#class-modsecurity)
-        * [Class: apache::mod::version](#class-apachemodversion)
-        * [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)
-        * [Defined Type: apache::fastcgi::server](#defined-type-fastcgi-server)
-    * [Virtual Host Examples - Demonstrations of some configuration options](#virtual-host-examples)
-    * [Load Balancing](#load-balancing)
-        * [Defined Type: apache::balancer](#defined-type-apachebalancer)
-        * [Defined Type: apache::balancermember](#defined-type-apachebalancermember)
-        * [Examples - Load balancing with exported and non-exported resources](#examples)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-    * [Classes](#classes)
-        * [Public Classes](#public-classes)
-        * [Private Classes](#private-classes)
-    * [Defined Types](#defined-types)
-        * [Public Defined Types](#public-defined-types)
-        * [Private Defined Types](#private-defined-types)
-    * [Templates](#templates)
-6. [Limitations - OS compatibility, etc.](#limitations)
-7. [Development - Guide for contributing to the module](#development)
-    * [Contributing to the apache module](#contributing)
-    * [Running tests - A quick guide](#running-tests)
-
-##Overview
-
-The apache module allows you to set up virtual hosts and manage web services with minimal effort.
-
-##Module Description
-
-Apache is a widely-used web server, and this module provides a simplified way of creating configurations to manage your infrastructure. This includes the ability to configure and manage a range of different virtual host setups, as well as a streamlined way to install and configure Apache modules.
-
-##Setup
-
-**What apache affects:**
-
-* configuration files and directories (created and written to)
-    * **WARNING**: Configurations that are *not* managed by Puppet will be purged.
-* package/service/configuration files for Apache
-* Apache modules
-* virtual hosts
-* listened-to ports
-* `/etc/make.conf` on FreeBSD and Gentoo
-* depends on module 'gentoo/puppet-portage' for Gentoo
-
-###Beginning with Apache
-
-To install Apache with the default parameters
-
-```puppet
-    class { 'apache':  }
-```
-
-The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, and RedHat systems have another, as do FreeBSD and Gentoo systems). These defaults work well in a testing environment, but are not suggested for production. To establish customized parameters
-
-```puppet
-    class { 'apache':
-      default_mods        => false,
-      default_confd_files => false,
-    }
-```
+# apache
+
+[Module description]: #module-description
+
+[Setup]: #setup
+[Beginning with Apache]: #beginning-with-apache
+
+[Usage]: #usage
+[Configuring virtual hosts]: #configuring-virtual-hosts
+[Configuring virtual hosts with SSL]: #configuring-virtual-hosts-with-ssl
+[Configuring virtual host port and address bindings]: #configuring-virtual-host-port-and-address-bindings
+[Configuring virtual hosts for apps and processors]: #configuring-virtual-hosts-for-apps-and-processors
+[Configuring IP-based virtual hosts]: #configuring-ip-based-virtual-hosts
+[Installing Apache modules]: #installing-apache-modules
+[Installing arbitrary modules]: #installing-arbitrary-modules
+[Installing specific modules]: #installing-specific-modules
+[Configuring FastCGI servers]: #configuring-fastcgi-servers-to-handle-php-files
+[Load balancing examples]: #load-balancing-examples
+
+[Reference]: #reference
+[Public classes]: #public-classes
+[Private classes]: #private-classes
+[Public defines]: #public-defines
+[Private defines]: #private-defines
+[Templates]: #templates
+
+[Limitations]: #limitations
+
+[Development]: #development
+[Contributing]: #contributing
+[Running tests]: #running-tests
+
+[`AddDefaultCharset`]: http://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
+[`add_listen`]: #add_listen
+[`Alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#alias
+[`AliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#aliasmatch
+[aliased servers]: https://httpd.apache.org/docs/current/urlmapping.html
+[`AllowEncodedSlashes`]: http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes
+[`apache`]: #class-apache
+[`apache_version`]: #apache_version
+[`apache::balancer`]: #define-apachebalancer
+[`apache::balancermember`]: #define-apachebalancermember
+[`apache::fastcgi::server`]: #define-apachefastcgiserver
+[`apache::mod`]: #define-apachemod
+[`apache::mod::<MODULE NAME>`]: #classes-apachemodmodule-name
+[`apache::mod::event`]: #class-apachemodevent
+[`apache::mod::itk`]: #class-apachemoditk
+[`apache::mod::passenger`]: #class-apachemodpassenger
+[`apache::mod::peruser`]: #class-apachemodperuser
+[`apache::mod::prefork`]: #class-apachemodprefork
+[`apache::mod::proxy_html`]: #class-apachemodproxy_html
+[`apache::mod::security`]: #class-apachemodsecurity
+[`apache::mod::ssl`]: #class-apachemodssl
+[`apache::mod::worker`]: #class-apachemodworker
+[`apache::params`]: #class-apacheparams
+[`apache::version`]: #class-apacheversion
+[`apache::vhost`]: #define-apachevhost
+[`apache::vhost::WSGIImportScript`]: #wsgiimportscript
+[Apache HTTP Server]: http://httpd.apache.org
+[Apache modules]: http://httpd.apache.org/docs/current/mod/
+[array]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_array.html
+
+[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
+
+[certificate revocation list]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationfile
+[certificate revocation list path]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationpath
+[common gateway interface]: http://httpd.apache.org/docs/current/howto/cgi.html
+[`confd_dir`]: #confd_dir
+[`content`]: #content
+[custom error documents]: http://httpd.apache.org/docs/current/custom-error.html
+[`custom_fragment`]: #custom_fragment
+
+[`default_mods`]: #default_mods
+[`default_ssl_crl`]: #default_ssl_crl
+[`default_ssl_crl_path`]: #default_ssl_crl_path
+[`default_ssl_vhost`]: #default_ssl_vhost
+[`directory`]: #directory
+[`DirectoryIndex`]: http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+[`docroot`]: #docroot
+[`docroot_owner`]: #docroot_owner
+[`docroot_group`]: #docroot_group
+[`DocumentRoot`]: https://httpd.apache.org/docs/current/mod/core.html#documentroot
+
+[`EnableSendfile`]: http://httpd.apache.org/docs/current/mod/core.html#enablesendfile
+[`ExpiresByType`]: http://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype
+[enforcing mode]: http://selinuxproject.org/page/Guide/Mode
+[`ensure`]: https://docs.puppetlabs.com/references/latest/type.html#package-attribute-ensure
+[exported resources]: http://docs.puppetlabs.com/latest/reference/lang_exported.md
+[`ExtendedStatus`]: http://httpd.apache.org/docs/current/mod/core.html#extendedstatus
+
+[Facter]: http://docs.puppetlabs.com/facter/
+[FastCGI]: http://www.fastcgi.com/
+[FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
+[`fallbackresource`]: #fallbackresource
+[filter rules]: http://httpd.apache.org/docs/current/filter.html
+[`filters`]: #filters
+[`ForceType`]: http://httpd.apache.org/docs/current/mod/core.html#forcetype
+
+[GeoIPScanProxyHeaders]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives
+[`gentoo/puppet-portage`]: https://github.com/gentoo/puppet-portage
+
+[Hash]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_hash.html
+
+[`IncludeOptional`]: http://httpd.apache.org/docs/current/mod/core.html#includeoptional
+[`Include`]: http://httpd.apache.org/docs/current/mod/core.html#include
+[interval syntax]: http://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn
+[`ip`]: #ip
+[`ip_based`]: #ip_based
+[IP-based virtual hosts]: http://httpd.apache.org/docs/current/vhosts/ip-based.html
+
+[`KeepAlive`]: http://httpd.apache.org/docs/current/mod/core.html#keepalive
+[`KeepAliveTimeout`]: http://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout
+[`keepalive` parameter]: #keepalive
+[`keepalive_timeout`]: #keepalive_timeout
+
+[`lib`]: #lib
+[`lib_path`]: #lib_path
+[`Listen`]: http://httpd.apache.org/docs/current/bind.html
+[`ListenBackLog`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#listenbacklog
+[`LoadFile`]: https://httpd.apache.org/docs/current/mod/mod_so.html#loadfile
+[`LogFormat`]: https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat
+[`logroot`]: #logroot
+[Log security]: http://httpd.apache.org/docs/current/logs.html#security
+
+[`manage_user`]: #manage_user
+[`manage_group`]: #manage_group
+[`MaxConnectionsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild
+[`max_keepalive_requests`]: #max_keepalive_requests
+[`MaxRequestWorkers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxrequestworkers
+[`MaxSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxsparethreads
+[MIME `content-type`]: https://www.iana.org/assignments/media-types/media-types.xhtml
+[`MinSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#minsparethreads
+[`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html
+[`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
+[`mod_authnz_external`]: https://code.google.com/p/mod-auth-external/
+[`mod_expires`]: http://httpd.apache.org/docs/current/mod/mod_expires.html
+[`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
+[`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/
+[`mod_info`]: https://httpd.apache.org/docs/current/mod/mod_info.html
+[`mod_mpm_event`]: https://httpd.apache.org/docs/current/mod/event.html
+[`mod_negotiation`]: http://httpd.apache.org/docs/current/mod/mod_negotiation.html
+[`mod_pagespeed`]: https://developers.google.com/speed/pagespeed/module/?hl=en
+[`mod_php`]: http://php.net/manual/en/book.apache.php
+[`mod_proxy`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html
+[`mod_proxy_balancer`]: http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
+[`mod_reqtimeout`]: http://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
+[`mod_security`]: https://www.modsecurity.org/
+[`mod_ssl`]: http://httpd.apache.org/docs/current/mod/mod_ssl.html
+[`mod_status`]: http://httpd.apache.org/docs/current/mod/mod_status.html
+[`mod_version`]: http://httpd.apache.org/docs/current/mod/mod_version.html
+[`mod_wsgi`]: http://modwsgi.readthedocs.org/en/latest/
+[module contribution guide]: http://docs.puppetlabs.com/forge/contributing.html
+[`mpm_module`]: #mpm_module
+[multi-processing module]: http://httpd.apache.org/docs/current/mpm.html
+
+[name-based virtual hosts]: https://httpd.apache.org/docs/current/vhosts/name-based.html
+
+[open source Puppet]: http://docs.puppetlabs.com/puppet/
+[`Options`]: https://httpd.apache.org/docs/current/mod/core.html#options
+
+[`path`]: #path
+[`Peruser`]: http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr
+[`port`]: #port
+[`priority`]: #defines-apachevhost
+[`ProxyPass`]: http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass
+[`ProxySet`]: http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset
+[Puppet Enterprise]: http://docs.puppetlabs.com/pe/
+[Puppet Forge]: http://forge.puppetlabs.com
+[Puppet Labs]: http://puppetlabs.com
+[Puppet module]: http://docs.puppetlabs.com/puppet/latest/reference/modules_fundamentals.html
+[Puppet module's code]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp
+[`purge_configs`]: #purge_configs
+[`purge_vhost_configs`]: #purge_vhost_configs
+[Python]: https://www.python.org/
+
+[Rack]: http://rack.github.io/
+[`rack_base_uris`]: #rack_base_uris
+[RFC 2616]: https://www.ietf.org/rfc/rfc2616.txt
+[`RequestReadTimeout`]: http://httpd.apache.org/docs/current/mod/mod_reqtimeout.html#requestreadtimeout
+[rspec-puppet]: http://rspec-puppet.com/
+
+[`ScriptAlias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptalias
+[`ScriptAliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptaliasmatch
+[`scriptalias`]: #scriptalias
+[SELinux]: http://selinuxproject.org/
+[`ServerAdmin`]: http://httpd.apache.org/docs/current/mod/core.html#serveradmin
+[`serveraliases`]: #serveraliases
+[`ServerLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#serverlimit
+[`ServerName`]: http://httpd.apache.org/docs/current/mod/core.html#servername
+[`ServerRoot`]: http://httpd.apache.org/docs/current/mod/core.html#serverroot
+[`ServerTokens`]: http://httpd.apache.org/docs/current/mod/core.html#servertokens
+[`ServerSignature`]: http://httpd.apache.org/docs/current/mod/core.html#serversignature
+[Service attribute restart]: http://docs.puppetlabs.com/references/latest/type.html#service-attribute-restart
+[`source`]: #source
+[SSLCARevocationCheck]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck
+[SSL certificate key file]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile
+[SSL chain]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatechainfile
+[SSL encryption]: https://httpd.apache.org/docs/current/ssl/index.html
+[`ssl`]: #ssl
+[`ssl_cert`]: #ssl_cert
+[`ssl_compression`]: #ssl_compression
+[`ssl_key`]: #ssl_key
+[`StartServers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#startservers
+[suPHP]: http://www.suphp.org/Home.html
+[`suphp_addhandler`]: #suphp_addhandler
+[`suphp_configpath`]: #suphp_configpath
+[`suphp_engine`]: #suphp_engine
+[supported operating system]: https://forge.puppetlabs.com/supported#puppet-supported-modules-compatibility-matrix
+
+[`ThreadLimit`]: http://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit
+[`ThreadsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadsperchild
+[`TimeOut`]: http://httpd.apache.org/docs/current/mod/core.html#timeout
+[template]: http://docs.puppetlabs.com/puppet/latest/reference/lang_template.html
+[`TraceEnable`]: http://httpd.apache.org/docs/current/mod/core.html#traceenable
+
+[`verify_config`]: #verify_config
+[`vhost`]: #define-apachevhost
+[`vhost_dir`]: #vhost_dir
+[`virtual_docroot`]: #virtual_docroot
+
+[Web Server Gateway Interface]: https://www.python.org/dev/peps/pep-3333/#abstract
+[`WSGIPythonPath`]: https://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPythonPath
+[`WSGIPythonHome`]: https://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPythonHome
+
+#### Table of Contents
+
+1. [Module description - What is the apache module, and what does it do?][Module description]
+2. [Setup - The basics of getting started with apache][Setup]
+    - [Beginning with Apache - Installation][Beginning with Apache]
+3. [Usage - The classes and defined types available for configuration][Usage]
+    - [Configuring virtual hosts - Examples to help get started][Configuring virtual hosts]
+    - [Configuring FastCGI servers to handle PHP files][Configuring FastCGI servers]
+    - [Load balancing with exported and non-exported resources][Load balancing examples]
+4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
+    - [Public classes][]
+    - [Private classes][]
+    - [Public defines][]
+    - [Private defines][]
+    - [Templates][]
+5. [Limitations - OS compatibility, etc.][Limitations]
+6. [Development - Guide for contributing to the module][Development]
+    - [Contributing to the apache module][Contributing]
+    - [Running tests - A quick guide][Running tests]
+
+## Module description
+
+[Apache HTTP Server][] (also called Apache HTTPD, or simply Apache) is a widely used web server. This [Puppet module][] simplifies the task of creating configurations to manage Apache servers in your infrastructure. It can configure and manage a range of virtual host setups and provides a streamlined way to install and configure [Apache modules][].
+
+## Setup
+
+**What the apache Puppet module affects:**
+
+- Configuration files and directories (created and written to)
+  - **WARNING**: Configurations *not* managed by Puppet will be purged.
+- Package/service/configuration files for Apache
+- Apache modules
+- Virtual hosts
+- Listened-to ports
+- `/etc/make.conf` on FreeBSD and Gentoo
+
+On Gentoo, this module depends on the [`gentoo/puppet-portage`][] Puppet module. Note that while several options apply or enable certain features and settings for Gentoo, it is not a [supported operating system][] for this module.
+
+**Note**: This module modifies Apache configuration files and directories and purges any configuration not managed by Puppet. Apache configuration should be managed by Puppet, as unmanaged configuration files can cause unexpected failures.
+
+To temporarily disable full Puppet management, set the [`purge_configs`][] parameter in the [`apache`][] class declaration to 'false'. We recommend using this only as a temporary means of saving and relocating customized configurations.
+
+### Beginning with Apache
+
+To have Puppet install Apache with the default parameters, declare the [`apache`][] class:
+
+~~~ puppet
+class { 'apache': }
+~~~
+
+The Puppet module applies a default configuration based on your operating system; Debian, Red Hat, FreeBSD, and Gentoo systems each have unique default configurations. These defaults work in testing environments but are not suggested for production, and Puppet recommends customizing the class's parameters to suit your site. Use the [Reference](#reference) section to find information about the class's parameters and their default values.
+
+You can customize parameters when declaring the `apache` class. For instance, this declaration installs Apache without the apache module's [default virtual host configuration][Configuring virtual hosts], allowing you to customize all Apache virtual hosts:
+
+~~~ puppet
+class { 'apache':
+  default_vhosts => false,
+}
+~~~
 
-###Configure a virtual host
+## Usage
 
-Declaring the `apache` class creates a default virtual host by setting up a vhost on port 80, listening on all interfaces and serving `$apache::docroot`.
+### Configuring a virtual host
 
-```puppet
-    class { 'apache': }
-```
+The default [`apache`][] class sets up a virtual host on port 80, listening on all interfaces and serving the [`docroot`][] parameter's default directory of `/var/www`.
 
-To configure a very basic, name-based virtual host
+**Note**: See the [`apache::vhost`][] define's reference for a list of all virtual host parameters.
 
-```puppet
-    apache::vhost { 'first.example.com':
-      port    => '80',
-      docroot => '/var/www/first',
-    }
-```
+To configure basic [name-based virtual hosts][], specify the [`port`][] and [`docroot`][] parameters in the [`apache::vhost`][] define:
 
-*Note:* The default priority is 15. If nothing matches this priority, the alphabetically first name-based vhost is used. This is also true if you pass a higher priority and no names match anything else.
+~~~ puppet
+apache::vhost { 'vhost.example.com':
+  port    => '80',
+  docroot => '/var/www/vhost',
+}
+~~~
 
-A slightly more complicated example, changes the docroot owner/group from the default 'root'
+**Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] define applies a default [`priority`][] of 15, which Puppet interprets by prefixing the virtual host's file name with `15-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to 'false', Apache still processes virtual hosts in alphabetical order.
 
-```puppet
-    apache::vhost { 'second.example.com':
-      port          => '80',
-      docroot       => '/var/www/second',
-      docroot_owner => 'third',
-      docroot_group => 'third',
-    }
-```
+To configure user and group ownership for `docroot`, use the [`docroot_owner`][] and [`docroot_group`][] parameters:
 
-To set up a virtual host with SSL and default SSL certificates
+~~~ puppet
+apache::vhost { 'user.example.com':
+  port          => '80',
+  docroot       => '/var/www/user',
+  docroot_owner => 'www-data',
+  docroot_group => 'www-data',
+}
+~~~
 
-```puppet
-    apache::vhost { 'ssl.example.com':
-      port    => '443',
-      docroot => '/var/www/ssl',
-      ssl     => true,
-    }
-```
+#### Configuring virtual hosts with SSL
 
-To set up a virtual host with SSL and specific SSL certificates
+To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accomodate HTTPS requests:
 
-```puppet
-    apache::vhost { 'fourth.example.com':
-      port     => '443',
-      docroot  => '/var/www/fourth',
-      ssl      => true,
-      ssl_cert => '/etc/ssl/fourth.example.com.cert',
-      ssl_key  => '/etc/ssl/fourth.example.com.key',
-    }
-```
+~~~ puppet
+apache::vhost { 'ssl.example.com':
+  port    => '443',
+  docroot => '/var/www/ssl',
+  ssl     => true,
+}
+~~~
 
-Virtual hosts listen on '*' by default. To listen on a specific IP address
+To configure a virtual host to use SSL and specific SSL certificates, use the paths to the certificate and key in the [`ssl_cert`][] and [`ssl_key`][] parameters, respectively:
 
-```puppet
-    apache::vhost { 'subdomain.example.com':
-      ip      => '127.0.0.1',
-      port    => '80',
-      docroot => '/var/www/subdomain',
-    }
-```
+~~~ puppet
+apache::vhost { 'cert.example.com':
+  port     => '443',
+  docroot  => '/var/www/cert',
+  ssl      => true,
+  ssl_cert => '/etc/ssl/fourth.example.com.cert',
+  ssl_key  => '/etc/ssl/fourth.example.com.key',
+}
+~~~
 
-To set up a virtual host with a wildcard alias for the subdomain mapped to a same-named directory, for example: `http://example.com.loc` to `/var/www/example.com`
+To configure a mix of SSL and unencrypted virtual hosts at the same domain, declare them with separate [`apache::vhost`] defines:
 
-```puppet
-    apache::vhost { 'subdomain.loc':
-      vhost_name       => '*',
-      port             => '80',
-      virtual_docroot  => '/var/www/%-2+',
-      docroot          => '/var/www',
-      serveraliases    => ['*.loc',],
-    }
-```
+~~~ puppet
+# The non-ssl virtual host
+apache::vhost { 'mix.example.com non-ssl':
+  servername => 'mix.example.com',
+  port       => '80',
+  docroot    => '/var/www/mix',
+}
 
-To set up a virtual host with suPHP
+# The SSL virtual host at the same domain
+apache::vhost { 'mix.example.com ssl':
+  servername => 'mix.example.com',
+  port       => '443',
+  docroot    => '/var/www/mix',
+  ssl        => true,
+}
+~~~
 
-```puppet
-    apache::vhost { 'suphp.example.com':
-      port                => '80',
-      docroot             => '/home/appuser/myphpapp',
-      suphp_addhandler    => 'x-httpd-php',
-      suphp_engine        => 'on',
-      suphp_configpath    => '/etc/php5/apache2',
-      directories         => { path => '/home/appuser/myphpapp',
-        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
-      }
-    }
-```
+To configure a virtual host to redirect unencrypted connections to SSL, declare them with separate [`apache::vhost`] defines and redirect unencrypted requests to the virtual host with SSL enabled:
 
-To set up a virtual host with WSGI
+~~~ puppet
+apache::vhost { 'redirect.example.com non-ssl':
+  servername      => 'redirect.example.com',
+  port            => '80',
+  docroot         => '/var/www/redirect',
+  redirect_status => 'permanent',
+  redirect_dest   => 'https://redirect.example.com/'
+}
 
-```puppet
-    apache::vhost { 'wsgi.example.com':
-      port                        => '80',
-      docroot                     => '/var/www/pythonapp',
-      wsgi_application_group      => '%{GLOBAL}',
-      wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options => {
-        processes    => '2',
-        threads      => '15',
-        display-name => '%{GROUP}',
-       },
-      wsgi_import_script          => '/var/www/demo.wsgi',
-      wsgi_import_script_options  =>
-        { process-group => 'wsgi', application-group => '%{GLOBAL}' },
-      wsgi_process_group          => 'wsgi',
-      wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-    }
-```
+apache::vhost { 'redirect.example.com ssl':
+  servername => 'redirect.example.com',
+  port       => '443',
+  docroot    => '/var/www/redirect',
+  ssl        => true,
+}
+~~~
 
-Starting in Apache 2.2.16, HTTPD supports [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource), a simple replacement for common RewriteRules.
+#### Configuring virtual host port and address bindings
 
-```puppet
-    apache::vhost { 'wordpress.example.com':
-      port                => '80',
-      docroot             => '/var/www/wordpress',
-      fallbackresource    => '/index.php',
-    }
-```
+Virtual hosts listen on all IP addresses ('*') by default. To configure the virtual host to listen on a specific IP address, use the [`ip`][] parameter:
 
-To set up a virtual host with filter rules
+~~~ puppet
+apache::vhost { 'ip.example.com':
+  ip      => '127.0.0.1',
+  port    => '80',
+  docroot => '/var/www/ip',
+}
+~~~
 
-```puppet
-    apache::vhost { 'subdomain.loc':
-      port             => '80',
-      filters          => [
-        'FilterDeclare  COMPRESS',
-        'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html',
-        'FilterChain    COMPRESS',
-        'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no',
-      ],
-      docroot          => '/var/www/html',
-    }
-```
+To configure a virtual host with [aliased servers][], refer to the aliases using the [`serveraliases`][] parameter:
+
+~~~ puppet
+apache::vhost { 'aliases.example.com':
+  serveraliases => [
+    'aliases.example.org',
+    'aliases.example.net',
+  ],
+  port          => '80',
+  docroot       => '/var/www/aliases',
+}
+~~~
+
+To set up a virtual host with a wildcard alias for the subdomain mapped to a same-named directory, such as 'http://example.com.loc' mapped to `/var/www/example.com`, define the wildcard alias using the [`serveraliases`][] parameter and the document root with the [`virtual_docroot`][] parameter:
+
+~~~ puppet
+apache::vhost { 'subdomain.loc':
+  vhost_name      => '*',
+  port            => '80',
+  virtual_docroot => '/var/www/%-2+',
+  docroot         => '/var/www',
+  serveraliases   => ['*.loc',],
+}
+~~~
+
+To configure a virtual host with [filter rules][], pass the filter directives as an [array][] using the [`filters`][] parameter:
+
+~~~ puppet
+apache::vhost { 'subdomain.loc':
+  port    => '80',
+  filters => [
+    'FilterDeclare  COMPRESS',
+    'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html',
+    'FilterChain    COMPRESS',
+    'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no',
+  ],
+  docroot => '/var/www/html',
+}
+~~~
+
+#### Configuring virtual hosts for apps and processors
+
+To set up a virtual host with [suPHP][], use the [`suphp_engine`][] parameter to enable the suPHP engine, [`suphp_addhandler`][] parameter to define a MIME type, [`suphp_configpath`][] to set which path suPHP passes to the PHP interpreter, and the [`directory`][] parameter to configure Directory, File, and Location directive blocks:
+
+~~~ puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => [
+    { 'path'  => '/home/appuser/myphpapp',
+      'suphp' => { 
+        user  => 'myappuser',
+        group => 'myappgroup',
+      },
+    },
+  ],
+}
+~~~
+
+You can use a set of parameters to configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) for [Python][] applications:
+
+~~~ puppet
+apache::vhost { 'wsgi.example.com':
+  port                        => '80',
+  docroot                     => '/var/www/pythonapp',
+  wsgi_application_group      => '%{GLOBAL}',
+  wsgi_daemon_process         => 'wsgi',
+  wsgi_daemon_process_options => {
+    processes    => '2',
+    threads      => '15',
+    display-name => '%{GROUP}',
+  },
+  wsgi_import_script          => '/var/www/demo.wsgi',
+  wsgi_import_script_options  => {
+    process-group     => 'wsgi',
+    application-group => '%{GLOBAL}',
+  },
+  wsgi_process_group          => 'wsgi',
+  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+}
+~~~
+
+Starting in Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement for common RewriteRules. You can set a FallbackResource using the [`fallbackresource`][] parameter:
+
+~~~ puppet
+apache::vhost { 'wordpress.example.com':
+  port             => '80',
+  docroot          => '/var/www/wordpress',
+  fallbackresource => '/index.php',
+}
+~~~
+
+**Note**: The `fallbackresource` parameter only supports the 'disabled' value since Apache 2.2.24.
+
+To configure a virtual host with a designated directory for [Common Gateway Interface][] (CGI) files, use the [`scriptalias`][] parameter to define the `cgi-bin` path:
+
+~~~ puppet
+apache::vhost { 'cgi.example.com':
+  port        => '80',
+  docroot     => '/var/www/cgi',
+  scriptalias => '/usr/lib/cgi-bin',
+}
+~~~
+
+To configure a virtual host for [Rack][], use the [`rack_base_uris`][] parameter:
+
+~~~ puppet
+apache::vhost { 'rack.example.com':
+  port           => '80',
+  docroot        => '/var/www/rack',
+  rack_base_uris => ['/rackapp1', '/rackapp2'],
+}
+~~~
+
+#### Configuring IP-based virtual hosts
+
+You can configure [IP-based virtual hosts][] to listen on any port and have them respond to requests on specific IP addresses. In this example, we set the server to listen on ports 80 and 81 because the example virtual hosts are _not_ declared with a [`port`][] parameter:
+
+~~~ puppet
+apache::listen { '80': }
+
+apache::listen { '81': }
+~~~
+
+Then we configure the IP-based virtual hosts with the [`ip_based`][] parameter:
+
+~~~ puppet
+apache::vhost { 'first.example.com':
+  ip       => '10.0.0.10',
+  docroot  => '/var/www/first',
+  ip_based => true,
+}
+
+apache::vhost { 'second.example.com':
+  ip       => '10.0.0.11',
+  docroot  => '/var/www/second',
+  ip_based => true,
+}
+~~~
+
+You can also configure a mix of IP- and [name-based virtual hosts][], and in any combination of [SSL][SSL encryption] and unencrypted configurations. First, we add two IP-based virtual hosts on an IP address (in this example, 10.0.0.10). One uses SSL and the other is unencrypted:
+
+~~~ puppet
+apache::vhost { 'The first IP-based virtual host, non-ssl':
+  servername => 'first.example.com',
+  ip         => '10.0.0.10',
+  port       => '80',
+  ip_based   => true,
+  docroot    => '/var/www/first',
+}
+
+apache::vhost { 'The first IP-based vhost, ssl':
+  servername => 'first.example.com',
+  ip         => '10.0.0.10',
+  port       => '443',
+  ip_based   => true,
+  docroot    => '/var/www/first-ssl',
+  ssl        => true,
+}
+~~~
 
-Please note that the 'disabled' argument to FallbackResource is only supported since Apache 2.2.24.
+Next, we add two name-based virtual hosts listening on a second IP address (10.0.0.20):
 
-See a list of all [virtual host parameters](#defined-type-apachevhost). See an extensive list of [virtual host examples](#virtual-host-examples).
+~~~ puppet
+apache::vhost { 'second.example.com':
+  ip      => '10.0.0.20',
+  port    => '80',
+  docroot => '/var/www/second',
+}
+
+apache::vhost { 'third.example.com':
+  ip      => '10.0.0.20',
+  port    => '80',
+  docroot => '/var/www/third',
+}
+~~~
+
+To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, you **must** set the [`add_listen`][] parameter to 'false' to disable the default Apache setting of `Listen 80`, as it conflicts with the preceding IP-based virtual hosts.
+
+~~~ puppet
+apache::vhost { 'fourth.example.com':
+  port       => '80',
+  docroot    => '/var/www/fourth',
+  add_listen => false,
+}
+
+apache::vhost { 'fifth.example.com':
+  port       => '80',
+  docroot    => '/var/www/fifth',
+  add_listen => false,
+}
+~~~
+
+### Installing Apache modules
+
+There's two ways to install [Apache modules][] using the Puppet apache module:
+
+- Use the [`apache::mod::<MODULE NAME>`][] classes to [install specific Apache modules with parameters][Installing specific modules].
+- Use the [`apache::mod`][] define to [install arbitrary Apache modules][Installing arbitrary modules].
+
+#### Installing specific modules
+
+The Puppet apache module supports installing many common [Apache modules][], often with parameterized configuration options. For a list of supported Apache modules, see the [`apache::mod::<MODULE NAME>`][] class references.
+
+For example, you can install the `mod_ssl` Apache module with default settings by declaring the [`apache::mod::ssl`][] class:
+
+~~~ puppet
+class { 'apache::mod::ssl': }
+~~~
+
+[`apache::mod::ssl`][] has several parameterized options that you can set when declaring it. For instance, to enable `mod_ssl` with compression enabled, set the [`ssl_compression`][] parameter to 'true':
+
+~~~ puppet
+class { 'apache::mod::ssl':
+  ssl_compression => true,
+}
+~~~
+
+Note that some modules have prerequisites, which are documented in their references under [`apache::mod::<MODULE NAME>`][].
+
+#### Installing arbitrary modules
+
+You can pass the name of any module that your operating system's package manager can install to the [`apache::mod`][] define to install it. Unlike the specific-module classes, the [`apache::mod`][] define doesn't tailor the installation based on other installed modules or with specific parameters---Puppet only grabs and installs the module's package, leaving detailed configuration up to you. 
+
+For example, to install the [`mod_authnz_external`][] Apache module, declare the define with the 'mod_authnz_external' name:
 
-##Usage
+~~~ puppet
+apache::mod { 'mod_authnz_external': }
+~~~
 
-###Classes and Defined Types
+There's several optional parameters you can specify when defining Apache modules this way. See the [define's reference][`apache::mod`] for details.
 
-This module modifies Apache configuration files and directories and purges any configuration not managed by Puppet. Configuration of Apache should be managed by Puppet, as non-Puppet configuration files can cause unexpected failures.
+### Configuring FastCGI servers to handle PHP files
+
+Add the [`apache::fastcgi::server`][] define to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
+
+~~~ puppet
+apache::fastcgi::server { 'php':
+  host       => '127.0.0.1:9000',
+  timeout    => 15,
+  flush      => false,
+  faux_path  => '/var/www/php.fcgi',
+  fcgi_alias => '/php.fcgi',
+  file_type  => 'application/x-httpd-php'
+}
+~~~
+
+You can then use the [`custom_fragment`] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
+
+~~~ puppet
+apache::vhost { 'www':
+  ...
+  custom_fragment => 'AddType application/x-httpd-php .php'
+  ...
+}
+~~~
+
+### Load balancing examples
+
+Apache supports load balancing across groups of servers through the [`mod_proxy`][] Apache module. Puppet supports configuring Apache load balancing groups (also known as balancer clusters) through the [`apache::balancer`][] and [`apache::balancermember`][] defines.
+
+To enable load balancing with [exported resources][], export the [`apache::balancermember`][] define from the load balancer member server:
+
+~~~ puppet
+@@apache::balancermember { "${::fqdn}-puppet00":
+  balancer_cluster => 'puppet00',
+  url              => "ajp://${::fqdn}:8009",
+  options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
+}
+~~~
 
-It is possible to temporarily disable full Puppet management by setting the [`purge_configs`](#purge_configs) parameter within the base `apache` class to 'false'. This option should only be used as a temporary means of saving and relocating customized configurations. See the [`purge_configs` parameter](#purge_configs) for more information.
+Then, on the proxy server, create the load balancing group:
 
-####Class: `apache`
+~~~ puppet
+apache::balancer { 'puppet00': }
+~~~
 
-The apache module's primary class, `apache`, guides the basic setup of Apache on your system.
+To enable load balancing without exporting resources, declare the following on the proxy server:
 
-You can establish a default vhost in this class, the `vhost` class, or both. You can add additional vhost configurations for specific virtual hosts using a declaration of the `vhost` type.
+~~~ puppet
+apache::balancer { 'puppet00': }
+
+apache::balancermember { "${::fqdn}-puppet00":
+    balancer_cluster => 'puppet00',
+    url              => "ajp://${::fqdn}:8009",
+    options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
+  }
+~~~
+
+Then declare the `apache::balancer` and `apache::balancermember` defines on the proxy server.
+
+If you need to use the [ProxySet](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) directive on the balancer, use the [`proxy_set`](#proxy_set) parameter of `apache::balancer`:
+
+~~~ puppet
+apache::balancer { 'puppet01':
+  proxy_set => {
+    'stickysession' => 'JSESSIONID',
+  },
+}
+~~~
+
+## Reference
+
+- [**Public Classes**](#public-classes)
+    - [Class: apache](#class-apache)
+    - [Class: apache::dev](#class-apachedev)
+    - [Classes: apache::mod::*](#classes-apachemodname)
+- [**Private Classes**](#private-classes)
+    - [Class: apache::confd::no_accf](#class-apacheconfdno_accf)
+    - [Class: apache::default_confd_files](#class-apachedefault_confd_files)
+    - [Class: apache::default_mods](#class-apachedefault_mods)
+    - [Class: apache::package](#class-apachepackage)
+    - [Class: apache::params](#class-apacheparams)
+    - [Class: apache::service](#class-apacheservice)
+    - [Class: apache::version](#class-apacheversion)
+- [**Public Defines**](#public-defines)
+    - [Define: apache::balancer](#define-apachebalancer)
+    - [Define: apache::balancermember](#define-apachebalancermember)
+    - [Define: apache::custom_config](#define-apachecustom_config)
+    - [Define: apache::fastcgi::server](#define-fastcgi-server)
+    - [Define: apache::listen](#define-apachelisten)
+    - [Define: apache::mod](#define-apachemod)
+    - [Define: apache::namevirtualhost](#define-apachenamevirtualhost)
+    - [Define: apache::vhost](#define-apachevhost)
+- [**Private Defines**](#private-defines)
+    - [Define: apache::default_mods::load](#define-default_mods-load)
+    - [Define: apache::peruser::multiplexer](#define-apacheperusermultiplexer)
+    - [Define: apache::peruser::processor](#define-apacheperuserprocessor)
+    - [Define: apache::security::file_link](#define-apachesecurityfile_link)
+- [**Templates**](#templates)
+
+### Public Classes
+
+#### Class: `apache`
+
+Guides the basic setup and installation of Apache on your system.
+
+When this class is declared with the default options, Puppet:
+
+- Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
+- Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system.
+- Configures the server with a default virtual host and standard port ('80') and address ('*') bindings.
+- Creates a document root directory determined by your operating system, typically `/var/www`.
+- Starts the Apache service.
+
+You can simply declare the default `apache` class:
+
+~~~ puppet
+class { 'apache': }
+~~~
+
+You can establish a default virtual host in this class, by using the [`apache::vhost`][] define, or both. You can also configure additional specific virtual hosts with the [`apache::vhost`][] define. Puppet recommends customizing the `apache` class's declaration with the following parameters, as its default settings are not optimized for production.
 
 **Parameters within `apache`:**
 
-#####`allow_encoded_slashes`
+##### `allow_encoded_slashes`
 
-This sets the server default for the [`AllowEncodedSlashes` declaration](http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes) which modifies the responses to URLs with `\` and `/` characters. The default is undefined, which omits the declaration from the server configuration and select the Apache default setting of `Off`. Allowed values are: `on`, `off` or `nodecode`.
+Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. Valid options: 'on', 'off', 'nodecode'. Default: 'undef', which omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
 
-#####`apache_version`
+##### `apache_version`
 
-Configures the behavior of the module templates, package names, and default mods by setting the Apache version. Default is determined by the class `apache::version` using the OS family and release. It should not be configured manually without special reason.
+Configures module template behavior, package names, and default Apache modules by defining the version of Apache to use. Default: Determined by your operating system family and release via the [`apache::version`][] class. Puppet recommends against manually configuring this parameter without reason.
 
-#####`conf_dir`
+##### `conf_dir`
 
-Changes the location of the configuration directory the main configuration file is placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, '/usr/local/etc/apache22' on FreeBSD, and '/etc/apache2' on Gentoo.
+Sets the directory where the Apache server's main configuration file is located. Default: Depends on your operating system.
 
-#####`confd_dir`
+- **Debian**: `/etc/apache2`
+- **FreeBSD**: `/usr/local/etc/apache22`
+- **Gentoo**: `/etc/apache2`
+- **Red Hat**: `/etc/httpd/conf`
 
-Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2/conf.d' on Debian, '/usr/local/etc/apache22' on FreeBSD, and '/etc/apache2/conf.d' on Gentoo.
+##### `conf_template`
 
-#####`conf_template`
+Defines the [template][] used for the main Apache configuration file. Default: `apache/httpd.conf.erb`. Modifying this parameter is potentially risky, as the apache Puppet module is designed to use a minimal configuration file customized by `conf.d` entries.
 
-Overrides the template used for the main apache configuration file. Defaults to 'apache/httpd.conf.erb'.
+##### `confd_dir`
 
-*Note:* Using this parameter is potentially risky, as the module has been built for a minimal configuration file with the configuration primarily coming from conf.d/ entries.
+Sets the location of the Apache server's custom configuration directory. Default: Depends on your operating system.
 
-#####`default_charset`
+- **Debian**: `/etc/apache2/conf.d`
+- **FreeBSD**: `/usr/local/etc/apache22`
+- **Gentoo**: `/etc/apache2/conf.d`
+- **Red Hat**: `/etc/httpd/conf`
 
-If defined, the value will be set as `AddDefaultCharset` in the main configuration file. It is undefined by default.
+##### `default_charset`
 
-#####`default_confd_files`
+Used as the [`AddDefaultCharset`][] directive in the main configuration file. Default: 'undef'.
 
-Generates default set of include-able Apache configuration files under  `${apache::confd_dir}` directory. These configuration files correspond to what is usually installed with the Apache package on a given platform.
+##### `default_confd_files`
 
-#####`default_mods`
+Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system. Valid options: Boolean. Default: 'true'.
 
-Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names.
+##### `default_mods`
 
-Defaults to 'true', which includes the default [HTTPD mods](https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp).
+Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: 'true', 'false', or an array of Apache module names. Default: 'true'.
 
-If false, it only includes the mods required to make HTTPD work, and any other mods can be declared on their own.
+If this parameter's value is 'false', Puppet only includes the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] define. 
 
-If an array, the apache module includes the array of mods listed.
+If 'true', Puppet installs additional modules, the list of which depends on the operating system as well as the [`apache_version`][] and [`mpm_module`][] parameters' values. As these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
 
-#####`default_ssl_ca`
+If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
-The default certificate authority, which is automatically set to 'undef'. This default works out of the box but must be updated with your specific certificate information before being used in production.
+##### `default_ssl_ca`
 
-#####`default_ssl_cert`
+Sets the default certificate authority for the Apache server. Default: 'undef'. 
 
-The default SSL certification, which is automatically set based on your operating system  ('/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, '/usr/local/etc/apache22/server.crt' for FreeBSD, and '/etc/ssl/apache2/server.crt' for Gentoo). This default works out of the box but must be updated with your specific certificate information before being used in production.
+While this default value results in a functioning Apache server, you **must** update this parameter with your certificate authority information before deploying this server in a production environment.
 
-#####`default_ssl_chain`
+##### `default_ssl_cert`
 
-The default SSL chain, which is automatically set to 'undef'. This default works out of the box but must be updated with your specific certificate information before being used in production.
+Sets the [SSL encryption][] certificate location. Default: Determined by your operating system.
 
-#####`default_ssl_crl`
+- **Debian**: `/etc/ssl/certs/ssl-cert-snakeoil.pem`
+- **FreeBSD**: `/usr/local/etc/apache22/server.crt`
+- **Gentoo**: `/etc/ssl/apache2/server.crt`
+- **Red Hat**: `/etc/pki/tls/certs/localhost.crt`
 
-The default certificate revocation list to use, which is automatically set to 'undef'. This default works out of the box but must be updated with your specific certificate information before being used in production.
+While the default value results in a functioning Apache server, you **must** update this parameter with your certificate location before deploying this server in a production environment.
 
-#####`default_ssl_crl_path`
+##### `default_ssl_chain`
 
-The default certificate revocation list path, which is automatically set to 'undef'. This default works out of the box but must be updated with your specific certificate information before being used in production.
+Sets the default [SSL chain][] location. Default: 'undef'. 
 
-#####`default_ssl_crl_check`
+While this default value results in a functioning Apache server, you **must** update this parameter with your SSL chain before deploying this server in a production environment.
 
-Sets the default certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), which is automatically set to 'undef'. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher, the value is ignored on older versions.
+##### `default_ssl_crl`
 
-#####`default_ssl_key`
+Sets the path of the default [certificate revocation list][] (CRL) file to use. Default: 'undef'.
 
-The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, '/usr/local/etc/apache22/server.key' for FreeBSD, and '/etc/ssl/apache2/server.key' for Gentoo). This default works out of the box but must be updated with your specific certificate information before being used in production.
+While this default value results in a functioning Apache server, you **must** update this parameter with your CRL file's path before deploying this server in a production environment. You can use this parameter with or in place of the [`default_ssl_crl_path`][].
 
-#####`default_ssl_vhost`
+##### `default_ssl_crl_path`
 
-Sets up a default SSL virtual host. Defaults to 'false'. If set to 'true', sets up the following vhost:
+Sets the server's [certificate revocation list path][], which contains your CRLs. Default: 'undef'. 
 
-```puppet
-    apache::vhost { 'default-ssl':
-      port            => 443,
-      ssl             => true,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => "ssl_${access_log_file}",
-      }
-```
+While this default value results in a functioning Apache server, you **must** update this parameter with the CRL path before deploying this server in a production environment.
+
+##### `default_ssl_crl_check`
+
+Sets the default certificate revocation check level via the [`SSLCARevocationCheck`] directive. Default: 'undef'.
+
+While this default value results in a functioning Apache server, you **must** specify this parameter when using certificate revocation lists in a production environment.
+
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
+##### `default_ssl_key`
+
+Sets the [SSL certificate key file][] location. Default: Determined by your operating system.
+
+- **Debian**: `/etc/ssl/private/ssl-cert-snakeoil.key`
+- **FreeBSD**: `/usr/local/etc/apache22/server.key`
+- **Gentoo**: `/etc/ssl/apache2/server.key`
+- **Red Hat**: `/etc/pki/tls/private/localhost.key`
+
+While these default values result in a functioning Apache server, you **must** update this parameter with your SSL key's location before deploying this server in a production environment.
+
+##### `default_ssl_vhost`
+
+Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean. Default: 'false'. 
+
+If 'true', Puppet automatically configures the following virtual host using the [`apache::vhost`][] define:
+
+~~~ puppet
+apache::vhost { 'default-ssl':
+  port            => 443,
+  ssl             => true,
+  docroot         => $docroot,
+  scriptalias     => $scriptalias,
+  serveradmin     => $serveradmin,
+  access_log_file => "ssl_${access_log_file}",
+  }
+~~~
+
+**Note**: SSL virtual hosts only respond to HTTPS queries.
 
-SSL vhosts only respond to HTTPS queries.
+##### `default_type`
 
-#####`default_type`
+_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer and only exists for backwards compatibility in configuration files. Default: 'undef'.
 
-(Apache httpd 2.2 only) MIME content-type that will be sent if the server cannot determine a type in any other way. This directive has been deprecated in Apache httpd 2.4, and only exists there for backwards compatibility of configuration files.
+##### `default_vhost`
 
-#####`default_vhost`
+Configures a default virtual host when the class is declared. Valid options: Boolean. Default: 'true'. 
 
-Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
+To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to 'false'.
 
-#####`docroot`
+##### `docroot`
 
-Changes the location of the default [Documentroot](https://httpd.apache.org/docs/current/mod/core.html#documentroot). Defaults to '/var/www/html' on RedHat, '/var/www' on Debian, '/usr/local/www/apache22/data' on FreeBSD, and '/var/www/localhost/htdocs' on Gentoo.
+Sets the default [`DocumentRoot`][] location. Default: Determined by your operating system.
 
-#####`error_documents`
+- **Debian**: `/var/www`
+- **FreeBSD**: `/usr/local/www/apache22/data`
+- **Gentoo**: `/var/www/localhost/htdocs`
+- **Red Hat**: `/var/www/html`
 
-Enables custom error documents. Defaults to 'false'.
+##### `error_documents`
 
-#####`group`
+Determines whether to enable [custom error documents][] on the Apache server. Valid options: Boolean. Default: 'false'.
 
-Changes the group that Apache will answer requests as. The parent process will continue to be run as root, but resource accesses by child processes will be done under this group. By default, puppet will attempt to manage this group as a resource under `::apache`. If this is not what you want, set [`manage_group`](#manage_group) to 'false'. Defaults to the OS-specific default user for apache, as detected in `::apache::params`.
+##### `group`
 
-#####`httpd_dir`
+Sets the group ID that owns any Apache processes spawned to answer requests. 
 
-Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but might have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, '/usr/local/etc/apache22' on FreeBSD, and '/etc/apache2' on Gentoo.
+By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To to prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to 'false'.
 
-#####`keepalive`
+**Note**: Modifying this parameter only changes the group ID that Apache uses to spawn child processes to access resources. It does not change the user that owns the parent server process.
 
-Enables persistent connections.
+##### `httpd_dir`
 
-#####`keepalive_timeout`
+Sets the Apache server's base configuration directory. This is useful for specially repackaged Apache server builds but might have unintended consequences when combined with the default distribution packages. Default: Determined by your operating system.
 
-Sets the amount of time the server waits for subsequent requests on a persistent connection. Defaults to '15'.
+- **Debian**: `/etc/apache2`
+- **FreeBSD**: `/usr/local/etc/apache22`
+- **Gentoo**: `/etc/apache2`
+- **Red Hat**: `/etc/httpd`
 
-#####`max_keepalive_requests`
+##### `keepalive`
 
-Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.
+Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. Valid options: 'Off', 'On'. Default: 'Off'.
 
-#####`lib_path`
+If 'On', use the [`keepalive_timeout`][] and [`max_keepalive_requests`][] parameters to set relevant options.
 
-Specifies the location where apache module files are stored. It should not be configured manually without special reason.
+##### `keepalive_timeout`
 
-#####`loadfile_name`
+Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. Default: '15'. 
 
-Sets the file name for the module loadfile. Should be in the format \*.load.  This can be used to set the module load order.
+This parameter is only relevant if the [`keepalive` parameter][] is enabled.
 
-#####`log_level`
+##### `max_keepalive_requests`
 
-Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info', or 'debug'.
+Limits the number of requests allowed per connection when the [`keepalive` parameter][] is enabled. Default: '100'.
 
-#####`log_formats`
+##### `lib_path`
 
-Define additional [LogFormats](https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat). This is done in a Hash:
+Specifies the location where [Apache module][] files are stored. Default: Depends on the operating system.
 
-```puppet
-  $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
-```
+- **Debian** and **Gentoo**: `/usr/lib/apache2/modules`
+- **FreeBSD**: `/usr/local/libexec/apache24`
+- **Red Hat**: `modules`
 
-There are a number of predefined LogFormats in the httpd.conf that Puppet writes out:
+**Note**: Do not configure this parameter manually without special reason.
 
-```httpd
+##### `loadfile_name`
+
+Sets the [`LoadFile`] directive's filename. Valid options: Filenames in the format `\*.load`. 
+
+This can be used to set the module load order.
+
+##### `log_level`
+
+Changes the error log's verbosity. Valid options: 'alert', 'crit', 'debug', 'emerg', 'error', 'info', 'notice', 'warn'. Default: 'warn'.
+
+##### `log_formats`
+
+Define additional [`LogFormat`][] directives. Valid options: A [Hash][], such as:
+
+~~~ puppet
+$log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
+~~~
+
+There are a number of predefined `LogFormats` in the `httpd.conf` that Puppet creates:
+
+~~~ httpd
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
-```
+~~~
 
-If your `$log_formats` contains one of those, they will be overwritten with **your** definition.
+If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition.
 
-#####`logroot`
+##### `logroot`
 
-Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, '/var/log/apache22' on FreeBSD, and '/var/log/apache2' on Gentoo.
+Changes the directory of Apache log files for the virtual host. Default: Determined by your operating system.
 
-#####`logroot_mode`
+- **Debian**: `/var/log/apache2`
+- **FreeBSD**: `/var/log/apache22`
+- **Gentoo**: `/var/log/apache2`
+- **Red Hat**: `/var/log/httpd`
 
-Overrides the mode the default logroot directory is set to ($::apache::logroot). Defaults to undef. Do NOT give people write access to the directory the logs are stored
-in without being aware of the consequences; see http://httpd.apache.org/docs/2.4/logs.html#security for details.
+##### `logroot_mode`
 
-#####`manage_group`
+Overrides the default [`logroot`][] directory's mode. Default: 'undef'. 
 
-Setting this to 'false' stops the group resource from being created. This is for when you have a group, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established group would result in a duplicate resource error.
+**Note**: Do _not_ grant write access to the directory where the logs are stored without being aware of the consequences. See the [Apache documentation][Log security] for details.
 
-#####`manage_user`
+##### `manage_group`
 
-Setting this to 'false' stops the user resource from being created. This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
+When 'false', stops Puppet from creating the group resource. Valid options: Boolean. Default: 'true'. 
 
-#####`mod_dir`
+If you have a group created from another Puppet module that you want to use to run Apache, set this to 'false'. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
 
-Changes the location of the configuration directory your Apache modules configuration files are placed in. Defaults to '/etc/httpd/conf.d' for RedHat, '/etc/apache2/mods-available' for Debian, '/usr/local/etc/apache22/Modules' for FreeBSD, and '/etc/apache2/modules.d' on Gentoo.
+##### `manage_user`
 
-#####`mpm_module`
+When 'false', stops Puppet from creating the user resource. Valid options: Boolean. Default: 'true'.
 
-Determines which MPM is loaded and configured for the HTTPD process. Valid values are 'event', 'itk', 'peruser', 'prefork', 'worker', or 'false'. Defaults to 'prefork' on RedHat, FreeBSD and Gentoo, and 'worker' on Debian. Must be set to 'false' to explicitly declare the following classes with custom parameters:
+This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
 
-* `apache::mod::event`
-* `apache::mod::itk`
-* `apache::mod::peruser`
-* `apache::mod::prefork`
-* `apache::mod::worker`
+##### `mod_dir`
 
-*Note:* Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `$mpm_module` you must uninstall all packages that depend on your currently-installed Apache.
+Sets where Puppet places configuration files for your [Apache modules][]. Default: Determined by your operating system.
 
-#####`package_ensure`
+- **Debian**: `/etc/apache2/mods-available`
+- **FreeBSD**: `/usr/local/etc/apache22/Modules`
+- **Gentoo**: `/etc/apache2/modules.d`
+- **Red Hat**: `/etc/httpd/conf.d`
 
-Allows control over the package ensure attribute. Can be 'present','absent', or a version string.
+##### `mpm_module`
 
-#####`ports_file`
+Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Valid options: 'event', 'itk', 'peruser', 'prefork', 'worker', or 'false'. Default: Determined by your operating system.
 
-Changes the name of the file containing Apache ports configuration. Default is `${conf_dir}/ports.conf`.
+- **Debian**: `worker`
+- **FreeBSD, Gentoo, and Red Hat**: `prefork`
 
-#####`purge_configs`
+You must set this to 'false' to explicitly declare the following classes with custom parameters:
 
-Removes all other Apache configs and vhosts, defaults to 'true'. Setting this to 'false' is a stopgap measure to allow the apache module to coexist with existing or otherwise-managed configuration. It is recommended that you move your configuration entirely to resources within this module.
+- [`apache::mod::event`][]
+- [`apache::mod::itk`][]
+- [`apache::mod::peruser`][]
+- [`apache::mod::prefork`][]
+- [`apache::mod::worker`][]
 
-#####`purge_vhost_configs`
+**Note**: Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `mpm_module`, you must uninstall all packages that depend on your installed Apache server.
 
-If `vhost_dir` != `confd_dir`, this controls the removal of any configurations that are not managed by Puppet within `vhost_dir`. It defaults to the value of `purge_configs`. Setting this to false is a stopgap measure to allow the apache module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`
+##### `package_ensure`
 
-#####`sendfile`
+Controls the `package` resource's [`ensure`][] attribute. Valid options: 'absent', 'installed' (or the equivalent 'present'), or a version string. Default: 'installed'.
 
-Makes Apache use the Linux kernel sendfile to serve static files. Defaults to 'On'.
+##### `ports_file`
 
-#####`serveradmin`
+Sets the path to the file containing Apache ports configuration. Default: `{$conf_dir}/ports.conf`.
 
-Sets the server administrator. Defaults to 'root@localhost'.
+##### `purge_configs`
 
-#####`servername`
+Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: 'true'. 
 
-Sets the server name. Defaults to `fqdn` provided by Facter.
+Setting this to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_configs`][].
 
-#####`server_root`
+##### `purge_vhost_configs`
 
-Sets the root directory in which the server resides. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, '/usr/local' on FreeBSD, and '/var/www' on Gentoo.
+If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, the Boolean parameter `purge_vhost_configs` determines whether Puppet removes any configurations inside `vhost_dir` _not_ managed by Puppet. Default: same as [`purge_configs`][].
 
-#####`server_signature`
+Setting `purge_vhost_configs` to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
-Configures a trailing footer line under server-generated documents. More information about [ServerSignature](http://httpd.apache.org/docs/current/mod/core.html#serversignature). Defaults to 'On'.
+##### `sendfile`
 
-#####`server_tokens`
+Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the [`EnableSendfile`][] directive. Valid options: 'On', 'Off'. Default: 'On'.
 
-Controls how much information Apache sends to the browser about itself and the operating system. More information about [ServerTokens](http://httpd.apache.org/docs/current/mod/core.html#servertokens). Defaults to 'OS'.
+##### `serveradmin`
 
-#####`service_enable`
+Sets the Apache server administrator's contact information via Apache's [`ServerAdmin`][] directive. Default: 'root@localhost'.
 
-Determines whether the HTTPD service is enabled when the machine is booted. Defaults to 'true'.
+##### `servername`
 
-#####`service_ensure`
+Sets the Apache server name via Apache's [`ServerName`][] directive. Default: the 'fqdn' fact reported by [Facter][].
 
-Determines whether the service should be running. Valid values are 'true', 'false', 'running', or 'stopped' when Puppet should manage the service. Any other value sets ensure to 'false' for the Apache service, which is useful when you want to let the service be managed by some other application like Pacemaker. Defaults to 'running'.
+##### `server_root`
 
-#####`service_name`
+Sets the Apache server's root directory via Apache's [`ServerRoot`][] directive. Default: determined by your operating system.
 
-Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on Debian and Gentoo, and 'apache22' on FreeBSD.
+- **Debian**: `/etc/apache2`
+- **FreeBSD**: `/usr/local`
+- **Gentoo**: `/var/www`
+- **Red Hat**: `/etc/httpd`
 
-#####`service_manage`
+##### `server_signature`
 
-Determines whether the HTTPD service state is managed by Puppet . Defaults to 'true'.
+Configures a trailing footer line to display at the bottom of server-generated documents, such as error documents and output of certain [Apache modules][], via Apache's [`ServerSignature`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
 
-#####`service_restart`
+##### `server_tokens`
 
-Determines whether the HTTPD service restart command should be anything other than the default managed by Puppet.  Defaults to undef.
+Controls how much information Apache sends to the browser about itself and the operating system, via Apache's [`ServerTokens`][] directive. Defaults to 'OS'.
 
-#####`timeout`
+##### `service_enable`
 
-Sets the amount of seconds the server will wait for certain events before failing a request. Defaults to 120.
+Determines whether Puppet enables the Apache HTTPD service when the system is booted. Valid options: Boolean. Default: 'true'.
 
-#####`trace_enable`
+##### `service_ensure`
 
-Controls how TRACE requests per RFC 2616 are handled. More information about [TraceEnable](http://httpd.apache.org/docs/current/mod/core.html#traceenable). Defaults to 'On'.
+Determines whether Puppet should make sure the service is running. Valid options: 'true' (equivalent to 'running'), 'false' (equivalent to 'stopped'). Default: 'running'.
 
-#####`vhost_dir`
+The 'false' or 'stopped' values set the 'httpd' service resource's `ensure` parameter to 'false', which is useful when you want to let the service be managed by another application, such as Pacemaker. 
 
-Changes the location of the configuration directory your virtual host configuration files are placed in. Defaults to 'etc/httpd/conf.d' on RedHat, '/etc/apache2/sites-available' on Debian, '/usr/local/etc/apache22/Vhosts' on FreeBSD, and '/etc/apache2/vhosts.d' on Gentoo.
+##### `service_name`
 
-#####`user`
+Sets the name of the Apache service. Default: determined by your operating system.
 
-Changes the user that Apache will answer requests as. The parent process will continue to be run as root, but resource accesses by child processes will be done under this user. By default, puppet will attept to manage this user as a resource under `::apache`. If this is not what you want, set [`manage_user`](#manage_user) to 'false'. Defaults to the OS-specific default user for apache, as detected in `::apache::params`.
+- **Debian and Gentoo**: `apache2`
+- **FreeBSD**: `apache22`
+- **Red Hat**: `httpd`
 
-#####`apache_name`
+##### `service_manage`
 
-The name of the Apache package to install. This is automatically detected in `::apache::params`. You might need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.
+Determines whether Puppet manages the HTTPD service's state. Default: 'true'.
 
-####Defined Type: `apache::custom_config`
+##### `service_restart`
 
-Allows you to create custom configs for Apache. The configuration files are only added to the Apache confd dir if the file is valid. An error is raised during the Puppet run if the file is invalid and `$verify_config` is `true`.
+Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. Default: 'undef', which uses the [default Puppet behavior][Service attribute restart].
 
-```puppet
-    apache::custom_config { 'test':
-        content => '# Test',
-    }
-```
+##### `timeout`
 
-**Parameters within `apache::custom_config`:**
+Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request. Defaults to 120.
 
-#####`ensure`
+##### `trace_enable`
 
-Specify whether the configuration file is present or absent. Defaults to 'present'. Valid values are 'present' and 'absent'.
+Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceEnable`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
 
-#####`confdir`
+##### `vhost_dir`
 
-The directory to place the configuration file in. Defaults to `$::apache::confd_dir`.
+Changes your virtual host configuration files' location. Default: determined by your operating system.
 
-#####`content`
+- **Debian**: `/etc/apache2/sites-available`
+- **FreeBSD**: `/usr/local/etc/apache22/Vhosts`
+- **Gentoo**: `/etc/apache2/vhosts.d`
+- **Red Hat**: `etc/httpd/conf.d`
 
-The content of the configuration file. Only one of `$content` and `$source` can be specified.
+##### `user`
 
-#####`priority`
+Changes the user Apache uses to answer requests. Apache's parent process will continue to be run as root, but child processes will access resources as the user defined by this parameter. 
 
-The priority of the configuration file, used for ordering. Defaults to '25'.
+Default: Puppet sets the default value via the [`apache::params`][] class, which manages the user based on your operating system:
 
-Pass priority `false` to omit the priority prefix in file names.
+- **Debian**: 'www-data'
+- **FreeBSD**: 'www'
+- **Gentoo** and **Red Hat**: 'apache'
+
+To prevent Puppet from managing the user, set the [`manage_user`][] parameter to 'false'.
 
-#####`source`
+##### `apache_name`
 
-The source of the configuration file. Only one of `$content` and `$source` can be specified.
+The name of the Apache package to install. Default: Puppet sets the default value via the [`apache::params`][] class, which manages the user based on your operating system:
 
-#####`verify_command`
+The default value is determined by your operating system:
 
-The command to use to verify the configuration file. It should use a fully qualified command. Defaults to '/usr/sbin/apachectl -t'. The `$verify_command` is only used if `$verify_config` is `true`. If the `$verify_command` fails, the configuration file is deleted, the Apache service is not notified, and an error is raised during the Puppet run.
+- **Debian**: 'apache2'
+- **FreeBSD**: 'apache24'
+- **Gentoo**: 'www-servers/apache'
+- **Red Hat**: 'httpd'
 
-#####`verify_config`
+You might need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.
 
-Boolean to specify whether the configuration file should be validated before the Apache service is notified. Defaults to `true`.
+#### Class: `apache::dev`
 
-####Class: `apache::default_mods`
+Installs Apache development libraries. By default, the package name is defined by the [`dev_packages`] parameter of the [`apache::params`] class based on your operating system:
 
-Installs default Apache modules based on what OS you are running.
+The default value is determined by your operating system:
 
-```puppet
-    class { 'apache::default_mods': }
-```
+- **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions
+- **FreeBSD**: 'undef'; see note below 
+- **Gentoo**: 'undef'
+- **Red Hat**: 'httpd-devel'
 
-####Defined Type: `apache::mod`
+**Note**: On FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
 
-Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class. The `apache::mod` defined type also installs the required packages to enable the module, if any.
+#### Classes: `apache::mod::<MODULE NAME>`
 
-```puppet
-    apache::mod { 'rewrite': }
-    apache::mod { 'ldap': }
-```
+Enables specific [Apache modules][]. You can enable and configure an Apache module by declaring its class. For example, to install and enable [`mod_alias`][] with no icons, you can declare the [`apache::mod::alias`][] class with the `icons_options` parameter set to 'None':
 
-####Classes: `apache::mod::[name]`
+~~~ puppet
+class { 'apache::mod::alias':
+  icons_options => 'None',
+}
+~~~
 
-There are many `apache::mod::[name]` classes within this module that can be declared using `include`:
+The following Apache modules have supported classes, many of which allow for parameterized configuration. You can install other Apache modules with the [`apache::mod`][] define.
 
 * `actions`
-* `alias`(see [`apache::mod::alias`](#class-apachemodalias) below)
+* `alias` (see [`apache::mod::alias`](#class-apachemodalias))
 * `auth_basic`
-* `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas) below)
+* `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas))
 * `auth_kerb`
 * `authn_core`
 * `authn_file`
@@ -594,11 +1176,12 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `dev`
 * `dir`*
 * `disk_cache`
-* `event`(see [`apache::mod::event`](#class-apachemodevent) below)
+* `event` (see [`apache::mod::event`](#class-apachemodevent))
 * `expires`
 * `fastcgi`
 * `fcgid`
 * `filter`
+* `geoip` (see [`apache::mod::geoip`][])
 * `headers`
 * `include`
 * `info`*
@@ -608,7 +1191,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `mime_magic`*
 * `negotiation`
 * `nss`*
-* `pagespeed` (see [`apache::mod::pagespeed`](#class-apachemodpagespeed) below)
+* `pagespeed` (see [`apache::mod::pagespeed`](#class-apachemodpagespeed))
 * `passenger`*
 * `perl`
 * `peruser`
@@ -626,562 +1209,549 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `rpaf`*
 * `setenvif`
 * `security`
-* `shib`* (see [`apache::mod::shib`](#class-apachemodshib) below)
+* `shib`* (see [`apache::mod::shib`](#class-apachemodshib))
 * `speling`
-* `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl) below)
-* `status`* (see [`apache::mod::status`](#class-apachemodstatus) below)
+* `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl))
+* `status`* (see [`apache::mod::status`](#class-apachemodstatus))
 * `suphp`
 * `userdir`*
+* `version`
 * `vhost_alias`
 * `worker`*
-* `wsgi` (see [`apache::mod::wsgi`](#class-apachemodwsgi) below)
+* `wsgi` (see [`apache::mod::wsgi`](#class-apachemodwsgi))
 * `xsendfile`
 
-Modules noted with a * indicate that the module has settings and, thus, a template that includes parameters. These parameters control the module's configuration. Most of the time, these parameters do not require any configuration or attention.
+Modules noted with a * indicate that the module has settings and a template that includes parameters to configure the module. Most Apache module class parameters have default values and don't require configuration. For modules with templates, Puppet installs template files with the module; these template files are required for the module to work.
 
-The modules mentioned above, and other Apache modules that have templates, cause template files to be dropped along with the mod install. The module will not work without the template. Any module without a template installs the package but drops no files.
+##### Class: `apache::mod::alias`
 
-###Class: `apache::mod::alias`
+Installs and manages [`mod_alias`][].
 
-Installs and manages the alias module.
+**Parameters within `apache::mod::alias`**:
 
-Full Documentation for alias is available from [Apache](https://httpd.apache.org/docs/current/mod/mod_alias.html).
+* `icons_options`: Disables directory listings for the icons directory, via Apache [`Options`] directive. Default: 'Indexes MultiViews'.
+* `icons_path`: Sets the local path for an `/icons/` Alias. Default: depends on your operating system.
 
-To disable directory listing for the icons directory:
-```puppet
-  class { 'apache::mod::alias':
-    icons_options => 'None',
-  }
-```
+- **Debian**: `/usr/share/apache2/icons`
+- **FreeBSD**: `/usr/local/www/apache24/icons`
+- **Gentoo**: `/var/www/icons`
+- **Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
 
-####Class:  `apache::mod::event`
+##### Class: `apache::mod::event`
 
-Installs and manages mpm_event module.
+Installs and manages [`mod_mpm_event`][]. You can't include both `apache::mod::event` and [`apache::mod::itk`][], [`apache::mod::peruser`][], [`apache::mod::prefork`][], or [`apache::mod::worker`][] on the same server.
 
-Full Documentation for mpm_event is available from [Apache](https://httpd.apache.org/docs/current/mod/event.html).
+**Parameters within `apache::mod::event`**:
 
-To configure the event thread limit:
+- `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive. Default: '511'.
+- `maxclients` (_Apache 2.3.12 or older_: `maxrequestworkers`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Default: '150'.
+- `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Default: '0'.
+- `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Default: '75' and '25', respectively.
+- `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Default: '25'.
+- `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Default: '2'.
+- `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Default: '64'.
+- `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. Default: '25'.
 
-```puppet
-  class {'apache::mod::event':
-    $threadlimit      => '128',
-  }
-```
+##### Class: `apache::mod::auth_cas`
 
-####Class: `apache::mod::auth_cas`
+Installs and manages [`mod_auth_cas`][]. Its parameters share names with the Apache module's directives.
 
-Installs and manages mod_auth_cas. The parameters `cas_login_url` and `cas_validate_url` are required.
+The `cas_login_url` and `cas_validate_url` parameters are required; several other parameters have 'undef' default values.
 
-Full documentation on mod_auth_cas is available from [JASIG](https://github.com/Jasig/mod_auth_cas).
+**Parameters within `apache::mod::auth_cas`**:
 
-####Class: `apache::mod::geoip`
+- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. Default: 'undef'.
+- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`. Default: 'undef'.
+- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings. Default: 'undef'.
+- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header. Default: 'undef'.
+- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. Default: 'undef'.
+- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies. Default: 'undef'.
+- `cas_debug`: Determines whether to enable the module's debugging mode. Default: 'Off'.
+- `cas_idle_timeout`: Default: 'undef'.
+- `cas_login_url`: **Required**. Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and don't have an active session.
+- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. Default: 'undef'.
+- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. Default: 'undef'.
+- `cas_validate_depth`: Limits the depth for chained certificate validation. Default: 'undef'.
+- `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string.
+- `cas_version`: The CAS protocol version to adhere to. Valid options: '1', '2'. Default: '2'.
 
-Installs and manages mod_geoip.
+##### Class: `apache::mod::deflate`
 
-Full documentation on mod_geoip is available from [MaxMind](http://dev.maxmind.com/geoip/legacy/mod_geoip2/).
+Installs and configures [`mod_deflate`][].
 
-These are the default settings:
+**Parameters within `apache::mod::deflate`:**
 
-```puppet
-  class {'apache::mod::geoip':
-    enable  => false,
-    db_file => '/usr/share/GeoIP/GeoIP.dat',
-    flag    => 'Standard',
-    output  => 'All',
-  }
-```
+- `types`: An [array][] of [MIME types][MIME `content-type`] to be deflated. Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml' ].
+- `notes`: A [Hash][] where the key represents the type and the value represents the note name. Default: { 'Input'  => 'instream', 'Output' => 'outstream', 'Ratio'  => 'ratio' }
 
-#####`enable`
+##### Class: `apache::mod::expires`
 
-Boolean. Enable or Disable mod_geoip globally. Defaults to false.
+Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate its configuration.
 
-#####`db_file`
+**Parameters within `apache::mod::expires`**:
 
-The full path to your GeoIP database file. Defaults to `/usr/share/GeoIP/GeoIP.dat`. This parameter optionally takes an array of paths for multiple GeoIP database files.
+- `expires_active`: Enables generation of `Expires` headers for a document realm. Default: 'true'.
+- `expires_default`: Default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][]. Default: undef.
+- `expires_by_type`: Describes a set of [MIME `content-type`][] and their expiration times. Valid options: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content-type` (i.e. 'text/json') and its value following valid [interval syntax][]. Default: undef.
 
-#####`flag`
+##### Class: `apache::mod::fcgid`
 
-GeoIP Flag. Defaults to 'Standard'.
+Installs and configures [`mod_fcgid`][].
 
-#####`output`
+The class makes no effort to individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [Hash][]. For example:
 
-Defines which output variables to use. Defaults to 'All'.
+~~~ puppet
+class { 'apache::mod::fcgid':
+  options => {
+    'FcgidIPCDir'  => '/var/run/fcgidsock',
+    'SharememPath' => '/var/run/fcgid_shm',
+    'AddHandler'   => 'fcgid-script .fcgi',
+  },
+}
+~~~
 
-#####`enable_utf8`
+For a full list of options, see the [official `mod_fcgid` documentation][`mod_fcgid`].
 
-Boolean. Changes the output from ISO-8859-1 (Latin-1) to UTF-8.
+If you include `apache::mod::fcgid`, you can set the [`FcgidWrapper`][] per directory, per virtual host. The module must be loaded first; Puppet will not automatically enable it if you set the `fcgiwrapper` parameter in `apache::vhost`.
 
-#####`scan_proxy_headers`
+~~~ puppet
+include apache::mod::fcgid
 
-Boolean. Enables the GeoIPScanProxyHeaders option. More information can be found [here](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives).
+apache::vhost { 'example.org':
+  docroot     => '/var/www/html',
+  directories => {
+    path        => '/var/www/html',
+    fcgiwrapper => {
+      command => '/usr/local/bin/fcgiwrapper',
+    }
+  },
+}
+~~~
 
-#####`scan_proxy_header_field`
+##### Class: `apache::mod::geoip`
 
-Specifies which header that mod_geoip should look at to determine the client's IP address.
+Installs and manages [`mod_geoip`][].
 
-#####`use_last_xforwarededfor_ip`
+**Parameters within `apache::mod::geoip`**:
 
-Boolean. If a comma-separated list of IP addresses is found, use the last IP address for the client's IP.
+- `db_file`: Sets the path to your GeoIP database file. Valid options: a path, or an [array][] paths for multiple GeoIP database files. Default: `/usr/share/GeoIP/GeoIP.dat`.
+- `enable`: Determines whether to globally enable [`mod_geoip`][]. Valid options: Boolean. Default: 'false'.
+- `flag`: Sets the GeoIP flag. Valid options: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'. Default: 'Standard'.
+- `output`: Defines which output variables to use. Valid options: 'All', 'Env', 'Request', 'Notes'. Default: 'All'.
+- `enable_utf8`: Changes the output from ISO-8859-1 (Latin-1) to UTF-8. Valid options: Boolean. Default: 'undef'.
+- `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option. Valid options: Boolean. Default: 'undef'.
+- `scan_proxy_header_field`: Specifies which header [`mod_geoip`][] should look at to determine the client's IP address. Default: 'undef'.
+- `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP if a comma-separated list of IP addresses is found. Valid options: Boolean. Default: 'undef'.
 
-####Class: `apache::mod::info`
+##### Class: `apache::mod::info`
 
-Installs and manages mod_info which provides a comprehensive overview of the server configuration.
+Installs and manages [`mod_info`][], which provides a comprehensive overview of the server configuration.
 
-Full documentation for mod_info is available from [Apache](https://httpd.apache.org/docs/current/mod/mod_info.html).
+**Parameters within `apache::mod::info`**:
 
-These are the default settings:
+- `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server-info`. Valid options: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either. Default: ['127.0.0.1','::1']
+- `apache_version`: Default: `$::apache::apache_version`,
+- `restrict_access`: Determines whether to enable access restrictions. If 'false', the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: 'true'.
 
-```puppet
-  $allow_from      = ['127.0.0.1','::1'],
-  $apache_version  = $::apache::apache_version,
-  $restrict_access = true,
-```
+##### Class: `apache::mod::negotiation`
 
-To set the addresses that are allowed to access /server-info add the following:
+Installs and configures [`mod_negotiation`][].
 
-```puppet
-  class {'apache::mod::info':
-    allow_from      => [
-      '10.10.36',
-      '10.10.38',
-      '127.0.0.1',
-    ],
-  }
-```
+**Parameters within `apache::mod::negotiation`:**
 
-To disable the access restrictions add the following:
+- `force_language_priority`: Sets the `ForceLanguagePriority` option. Valid option: String. Default: `Prefer Fallback`.
+- `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module. Default: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN', 'zh-TW' ]
 
-```puppet
-  class {'apache::mod::info':
-    restrict_access => false,
-  }
-```
-
-It is not recommended to leave this set to false though it can be very useful for testing. For this reason, you can insert this setting in your normal code to temporarily disable the restrictions like so:
-
-```puppet
-  class {'apache::mod::info':
-    restrict_access => false, # false disables the block below
-    allow_from      => [
-      '10.10.36',
-      '10.10.38',
-      '127.0.0.1',
-    ],
-  }
-```
-
-####Class: `apache::mod::pagespeed`
-
-Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
-
-This module does *not* manage the software repositories needed to automatically install the
-mod-pagespeed-stable package. The module does however require that the package be installed,
-or be installable using the system's default package provider.  You should ensure that this
-pre-requisite is met or declaring `apache::mod::pagespeed` causes the Puppet run to fail.
-
-These are the defaults:
-
-```puppet
-    class { 'apache::mod::pagespeed':
-      inherit_vhost_config          => 'on',
-      filter_xhtml                  => false,
-      cache_path                    => '/var/cache/mod_pagespeed/',
-      log_dir                       => '/var/log/pagespeed',
-      memcache_servers              => [],
-      rewrite_level                 => 'CoreFilters',
-      disable_filters               => [],
-      enable_filters                => [],
-      forbid_filters                => [],
-      rewrite_deadline_per_flush_ms => 10,
-      additional_domains            => undef,
-      file_cache_size_kb            => 102400,
-      file_cache_clean_interval_ms  => 3600000,
-      lru_cache_per_process         => 1024,
-      lru_cache_byte_limit          => 16384,
-      css_flatten_max_bytes         => 2048,
-      css_inline_max_bytes          => 2048,
-      css_image_inline_max_bytes    => 2048,
-      image_inline_max_bytes        => 2048,
-      js_inline_max_bytes           => 2048,
-      css_outline_min_bytes         => 3000,
-      js_outline_min_bytes          => 3000,
-      inode_limit                   => 500000,
-      image_max_rewrites_at_once    => 8,
-      num_rewrite_threads           => 4,
-      num_expensive_rewrite_threads => 4,
-      collect_statistics            => 'on',
-      statistics_logging            => 'on',
-      allow_view_stats              => [],
-      allow_pagespeed_console       => [],
-      allow_pagespeed_message       => [],
-      message_buffer_size           => 100000,
-      additional_configuration      => { }
-    }
-```
+##### Class: `apache::mod::pagespeed`
 
-Full documentation for mod_pagespeed is available from [Google](http://modpagespeed.com).
+Installs and manages [`mod_pagespeed`], a Google module that rewrites web pages to reduce latency and bandwidth.
 
-####Class: `apache::mod::php`
+While this Apache module requires the `mod-pagespeed-stable` package, Puppet **doesn't** manage the software repositories required to automatically install the package. If you declare this class when the package is either not installed or not available to your package manager, your Puppet run will fail.
 
-Installs and configures mod_php. The defaults are OS-dependant.
+**Parameters within `apache::mod::info`**:
 
-Overriding the package name:
-```puppet
-  class {'::apache::mod::php':
-    package_name => "php54-php",
-    path         => "${::apache::params::lib_path}/libphp54-php5.so",
-  }
-```
+- `inherit_vhost_config`: Default: 'on'.
+- `filter_xhtml`: Default: false.
+- `cache_path`: Default: '/var/cache/mod_pagespeed/'.
+- `log_dir`: Default: '/var/log/pagespeed'.
+- `memcache_servers`: Default: [].
+- `rewrite_level`: Default: 'CoreFilters'.
+- `disable_filters`: Default: [].
+- `enable_filters`: Default: [].
+- `forbid_filters`: Default: [].
+- `rewrite_deadline_per_flush_ms`: Default: 10.
+- `additional_domains`: Default: undef.
+- `file_cache_size_kb`: Default: 102400.
+- `file_cache_clean_interval_ms`: Default: 3600000.
+- `lru_cache_per_process`: Default: 1024.
+- `lru_cache_byte_limit`: Default: 16384.
+- `css_flatten_max_bytes`: Default: 2048.
+- `css_inline_max_bytes`: Default: 2048.
+- `css_image_inline_max_bytes`: Default: 2048.
+- `image_inline_max_bytes`: Default: 2048.
+- `js_inline_max_bytes`: Default: 2048.
+- `css_outline_min_bytes`: Default: 3000.
+- `js_outline_min_bytes`: Default: 3000.
+- `inode_limit`: Default: 500000.
+- `image_max_rewrites_at_once`: Default: 8.
+- `num_rewrite_threads`: Default: 4.
+- `num_expensive_rewrite_threads`: Default: 4.
+- `collect_statistics`: Default: 'on'.
+- `statistics_logging`: Default: 'on'.
+- `allow_view_stats`: Default: [].
+- `allow_pagespeed_console`: Default: [].
+- `allow_pagespeed_message`: Default: [].
+- `message_buffer_size`: Default: 100000.
+- `additional_configuration`: Default: { }.
 
-Overriding the default configuartion:
-```puppet
-  class {'::apache::mod::php':
-    source => 'puppet:///modules/apache/my_php.conf',
-  }
-```
+The class's parameters correspond to the module's directives. See the [module's documentation][`mod_pagespeed`] for details.
 
-or
-```puppet
-  class {'::apache::mod::php':
-    template => 'apache/php.conf.erb',
-  }
-```
+##### Class: `apache::mod::php`
 
-or
+Installs and configures [`mod_php`][]. 
 
-```puppet
-  class {'::apache::mod::php':
-    content => '
-AddHandler php5-script .php
-AddType text/html .php',
-  }
-```
-####Class: `apache::mod::shib`
+**Parameters within `apache::mod::php`**:
 
-Installs the [Shibboleth](http://shibboleth.net/) module for Apache which allows the use of SAML2 Single-Sign-On (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. This class only installs and configures the Apache components of a Shibboleth Service Provider (a web application that consumes Shibboleth SSO identities). The Shibboleth configuration can be managed manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
+Default values depend on your operating system.
 
-Defining this class enables the Shibboleth specific parameters in `apache::vhost` instances.
+> **Note**: This list is incomplete. Most of this class's parameters correspond to `mod_php` directives; see the [module's documentation][`mod_php`] for details.
 
-####Class: `apache::mod::ssl`
+- `package_name`: Names the package that installs `php_mod`.
+- `path`: Defines the path to the `mod_php` shared object (`.so`) file.
+- `source`: Defines the path to the default configuration. Valid options include a `puppet:///` paths. 
+- `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
+- `content`: Adds arbitrary content to `php.conf`.
 
-Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are the defaults:
+##### Class: `apache::mod::reqtimeout`
 
-```puppet
-    class { 'apache::mod::ssl':
-      ssl_compression         => false,
-      ssl_cryptodevice        => 'builtin',
-      ssl_options             => [ 'StdEnvVars' ],
-      ssl_openssl_conf_cmd    => undef,
-      ssl_cipher              => 'HIGH:MEDIUM:!aNULL:!MD5',
-      ssl_honorcipherorder    => 'On',
-      ssl_protocol            => [ 'all', '-SSLv2', '-SSLv3' ],
-      ssl_pass_phrase_dialog  => 'builtin',
-      ssl_random_seed_bytes   => '512',
-      ssl_sessioncachetimeout => '300',
-    }
-```
+Installs and configures [`mod_reqtimeout`][].
 
-To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` parameter in `::apache` to 'true' or set the `ssl` parameter in `apache::vhost` to 'true'.
+**Parameters within `apache::mod::reqtimeout`**:
 
-####Class: `apache::mod::status`
+- `timeouts`: A string or [array][] that sets the [`RequestReadTimeout`][] option. Default: ['header=20-40,MinRate=500', 'body=20,MinRate=500'].
 
-Installs Apache mod_status and uses the status.conf.erb template. These are the defaults:
+##### Class: `apache::mod::shib`
 
-```puppet
-    class { 'apache::mod::status':
-      allow_from      => ['127.0.0.1','::1'],
-      extended_status => 'On',
-      status_path     => '/server-status',
-){
+Installs the [Shibboleth](http://shibboleth.net/) Apache module `mod_shib`, which enables SAML2 single sign-on (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. This class only installs and configures the Apache components of a web application that consumes Shibboleth SSO identities, also known as a Shibboleth Service Provider. You can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
 
+Defining this class enables Shibboleth-specific parameters in `apache::vhost` instances.
 
-  }
-```
+##### Class: `apache::mod::ssl`
 
-####Class: `apache::mod::expires`
+Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration. 
 
-Installs Apache mod_expires and uses the expires.conf.erb template. These are the defaults:
+**Parameters within `apache::mod::ssl`**:
 
-```puppet
-    class { 'apache::mod::expires':
-      expires_active  => true,
-      expires_default => undef,
-      expires_by_type => undef,
-){
+- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5'.
+- `ssl_compression`: Default: 'false'.
+- `ssl_cryptodevice`: Default: 'builtin'.
+- `ssl_honorcipherorder`: Default: 'On'.
+- `ssl_openssl_conf_cmd`: Default: 'undef'.
+- `ssl_options`: Default: [ 'StdEnvVars' ]
+- `ssl_pass_phrase_dialog`: Default: 'builtin'.
+- `ssl_protocol`: Default: [ 'all', '-SSLv2', '-SSLv3' ].
+- `ssl_random_seed_bytes`: Default: '512'.
+- `ssl_sessioncachetimeout`: Default: '300'.
 
+To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to 'true' **o**r the [`ssl`][] parameter in [`apache::vhost`][] to 'true'.
 
-  }
-```
+##### Class: `apache::mod::status`
 
-`expires_by_type` is an array of Hashes, describing a set of types and their expire times:
+Installs [`mod_status`][] and uses the `status.conf.erb` template to generate its configuration.
 
-```puppet
-  class { 'apache::mod::expires':
-    expires_by_type => [
-      { 'text/json' => 'access plus 1 month' },
-      { 'text/html' => 'access plus 1 year' },
-    ]
-  }
-```
+**Parameters within `apache::mod::status`**:
 
-####Class: `apache::mod::wsgi`
+- `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/server-status`. Default: ['127.0.0.1','::1'].
+- `extended_status`: Determines whether to track extended status information for each request, via the [`ExtendedStatus`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
+- `status_path`: The server location of the status page. Default: '/server-status'.
 
-Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`.
+##### Class: `apache::mod::version`
 
-For customized parameters, which tell Apache how Python is currently configured on the operating system,
+Installs [`mod_version`][] on many operating systems and Apache configurations.
 
-```puppet
-    class { 'apache::mod::wsgi':
-      wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
-      wsgi_python_home   => '/path/to/venv',
-      wsgi_python_path   => '/path/to/venv/site-packages',
-    }
-```
-
-To specify an alternate mod\_wsgi package name to install and the name of the module .so it provides,
-(e.g. a "python27-mod\_wsgi" package that provides "python27-mod_wsgi.so" in the default module directory):
-
-```puppet
-    class { 'apache::mod::wsgi':
-      wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
-      wsgi_python_home   => '/path/to/venv',
-      wsgi_python_path   => '/path/to/venv/site-packages',
-      package_name       => 'python27-mod_wsgi',
-      mod_path           => 'python27-mod_wsgi.so',
-    }
-```
+If Debian and Ubuntu systems with Apache 2.4 are classified with `apache::mod::version`, Puppet warns that `mod_version` is built-in and can't be loaded.
 
-If ``mod_path`` does not contain "/", it will be prefixed by the default module path
-for your OS; otherwise, it will be used literally.
+##### Class: `apache::mod::security`
 
-More information about [WSGI](http://modwsgi.readthedocs.org/en/latest/).
+Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs by default on all virtual hosts.
 
-####Class: `apache::mod::fcgid`
+**Parameters within `apache::mod::security`**:
 
-Installs and configures mod_fcgid.
+- `activated_rules`: An [array][] of rules from the `modsec_crs_path` to activate via symlinks. Default: `modsec_default_rules` in [`apache::params`][].
+- `allowed_methods`: A space-separated list of allowed HTTP methods. Default: 'GET HEAD POST OPTIONS'.
+- `content_types`: A list of one or more allowed [MIME types][MIME `content-type`]. Default: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'
+- `crs_package`: Names the package that installs CRS rules. Default: `modsec_crs_package` in [`apache::params`][].
+- `modsec_dir`: Defines the path where Puppet installs the modsec configuration and activated rules links. Default: 'On', set by `modsec_dir` in [`apache::params`][].
+${modsec_dir}/activated_rules.
+- `modsec_secruleengine`: Configures the modsec rules engine. Valid options: 'On', 'Off', and 'DetectionOnly'. Default: `modsec_secruleengine` in [`apache::params`][].
+- `restricted_extensions`: A space-separated list of prohibited file extensions. Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
+- `restricted_headers`: A list of restricted headers separated by slashes and spaces. Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
 
-The class makes no effort to list all available options, but rather uses an options hash to allow for ultimate flexibility:
+##### Class: `apache::mod::wsgi`
 
-```puppet
-    class { 'apache::mod::fcgid':
-      options => {
-        'FcgidIPCDir'  => '/var/run/fcgidsock',
-        'SharememPath' => '/var/run/fcgid_shm',
-        'AddHandler'   => 'fcgid-script .fcgi',
-      },
-    }
-```
+Enables Python support via [`mod_wsgi`][].
 
-For a full list op options, see the [official mod_fcgid documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).
+**Parameters within `apache::mod::wsgi`**:
 
-It is also possible to set the FcgidWrapper per directory per vhost. You must ensure the fcgid module is loaded because there is no auto loading.
+- `mod_path`: Defines the path to the `mod_wsgi` shared object (`.so`) file. Default: undef.
+  - If the `mod_path` parameter doesn't contain `/`, Puppet prefixes it with your operating system's default module path.
+Otherwise, Puppet follows it literally.
+- `package_name`: Names the package that installs `mod_wsgi`. Default: undef.
+- `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. Valid options: path. Default: undef.
+- `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site-packages'. Valid options: path. Default: undef.
+- `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE_RUN_DIR}WSGI". Default: `wsgi_socket_prefix` in [`apache::params`][].
 
-```puppet
-    include apache::mod::fcgid
-    apache::vhost { 'example.org':
-      docroot     => '/var/www/html',
-      directories => {
-        path        => '/var/www/html',
-        fcgiwrapper => {
-          command => '/usr/local/bin/fcgiwrapper',
-        }
-      },
-    }
-```
+The class's parameters correspond to the module's directives. See the [module's documentation][`mod_wsgi`] for details.
 
-See [FcgidWrapper documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#fcgidwrapper) for more information.
+### Private Classes
 
-####Class: `apache::mod::negotiation`
+#### Class: `apache::confd::no_accf`
 
-Installs and configures mod_negotiation. If there are not provided any
-parameter, default apache mod_negotiation configuration is done.
+Creates the `no-accf.conf` configuration file in `conf.d`, required by FreeBSD's Apache 2.4.
 
-```puppet
-  class { '::apache::mod::negotiation':
-    force_language_priority => 'Prefer',
-    language_priority       => [ 'es', 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo' ],
-  }
-```
+#### Class: `apache::default_confd_files`
 
-**Parameters within `apache::mod::negotiation`:**
+Includes `conf.d` files for FreeBSD.
 
-#####`force_language_priority`
+#### Class: `apache::default_mods`
 
-A string that sets the `ForceLanguagePriority` option. Defaults to `Prefer Fallback`.
+Installs the Apache modules required to run the default configuration. See the `apache` class's [`default_mods`][] parameter for details.
 
-#####`language_priority`
+#### Class: `apache::package`
 
-An array of languages to set the `LanguagePriority` option of the module.
+Installs and configures basic Apache packages.
 
-####Class: `apache::mod::deflate`
+#### Class: `apache::params`
 
-Installs and configures mod_deflate. If no parameters are provided, a default configuration is applied.
+Manages Apache parameters for different operating systems.
 
-```puppet
-  class { '::apache::mod::deflate':
-    types => [ 'text/html', 'text/css' ],
-    notes => {
-      'Input' => 'instream',
-      'Ratio' => 'ratio',
-    },
-  }
-```
+#### Class: `apache::service`
 
-#####`types`
+Manages the Apache daemon.
 
-An array of mime types to be deflated.
+#### Class: `apache::version`
 
-#####`notes`
+Attempts to automatically detect the Apache version based on the operating system.
 
-A hash where the key represents the type and the value represents the note name.
+### Public Defines
 
+#### Define: `apache::balancer`
 
-####Class: `apache::mod::reqtimeout`
+Creates an Apache load balancing group, also known as a balancer cluster, using [`mod_proxy`][]. Each load balancing group needs one or more balancer members, which you can declare in Puppet with the  [`apache::balancermember`][] define.
 
-Installs and configures mod_reqtimeout. Defaults to recommended apache
-mod_reqtimeout configuration.
+Declare one `apache::balancer` define for each Apache load balancing group. You can export `apache::balancermember` defines for all balancer members and collect them on a single Apache load balancer server using [exported resources][].
 
-```puppet
-  class { '::apache::mod::reqtimeout':
-    timeouts => ['header=20-40,MinRate=500', 'body=20,MinRate=500'],
-  }
-```
+**Parameters within `apache::balancer`**:
 
-####Class: `apache::mod::version`
+##### `name`
 
-This wrapper around mod_version warns on Debian and Ubuntu systems with Apache httpd 2.4
-about loading mod_version, as on these platforms it's already built-in.
+Sets the title of the balancer cluster and name of the `conf.d` file containing its configuration.
 
-```puppet
-  include '::apache::mod::version'
-```
+##### `proxy_set`
 
-#####`timeouts`
+Configures key-value pairs as [`ProxySet`][] lines. Valid options: [Hash][]. Default: '{}'.
 
-A string or an array that sets the `RequestReadTimeout` option. Defaults to
-`['header=20-40,MinRate=500', 'body=20,MinRate=500']`.
+##### `collect_exported`
 
+Determines whether to use [exported resources][]. Valid options: Boolean. Default: 'true'.
 
-####Class: `apache::mod::security`
+If you statically declare all of your backend servers, set this parameter to 'false' to rely on existing, declared balancer member resources. Also, use `apache::balancermember` with [array][] arguments.
 
-Installs and configures mod_security.  Defaults to enabled and running on all
-vhosts.
+To dynamically declare backend servers via exported resources collected on a central node, set this parameter to 'true' to collect the balancer member resources exported by the balancer member nodes.
 
-```puppet
-  include '::apache::mod::security'
-```
+If you don't use exported resources, a single Puppet run configures all balancer members. If you use exported resources, Puppet has to run on the balanced nodes first, then run on the balancer.
 
-#####`crs_package`
+#### Define: `apache::balancermember`
 
-Name of package to install containing crs rules
+Defines members of [`mod_proxy_balancer`][], which sets up a balancer member inside a listening service configuration block in the load balancer's `apache.cfg`.
 
-#####`modsec_dir`
+**Parameters within `apache::balancermember`**:
 
-Directory to install the modsec configuration and activated rules links into
+##### `balancer_cluster`
 
-#####`modsec_secruleengine`
+**Required**. Sets the Apache service's instance name, and must match the name of a declared [`apache::balancer`][] resource.
 
-Configures the rules engine. Valid vaules are On, Off, and DetectionOnly
+##### `url`
 
-#####`activated_rules`
+Specifies the URL used to contact the balancer member server. Default:  'http://${::fqdn}/'.
 
-Array of rules from the modsec_crs_path to activate by symlinking to
-${modsec_dir}/activated_rules.
+##### `options`
 
-#####`allowed_methods`
+Specifies an [array][] of [options](http://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the URL, and accepts any key-value pairs available to [`ProxyPass`][]. Default: an empty array.
 
-HTTP methods allowed by mod_security
+#### Define: `apache::custom_config`
 
-#####`content_types`
+Adds a custom configuration file to the Apache server's `conf.d` directory. If the file is invalid and this define's `$verify_config` parameter is 'true', Puppet throws an error during a Puppet run.
 
-Content-types allowed by mod_security
+**Parameters within `apache::custom_config`**:
 
-#####`restricted_extensions`
+##### `ensure`
 
-Extensions prohibited by mod_security
+Specifies whether the configuration file should be present. Valid options: 'absent', 'present'. Default: 'present'.
 
-#####`restricted_headers`
+##### `confdir`
 
-Headers restricted by mod_security
+Sets the directory in which Puppet places configuration files. Default: '$::apache::confd_dir'.
 
+##### `content`
 
-####Defined Type: `apache::vhost`
+Sets the configuration file's content. The `content` and [`source`][] parameters are exclusive of each other.
 
-The Apache module allows a lot of flexibility in the setup and configuration of virtual hosts. This flexibility is due, in part, to `vhost` being a defined resource type, which allows it to be evaluated multiple times with different parameters.
+##### `priority`
 
-The `vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default vhost within the base `::apache` class, as well as set a customized vhost as default. Your customized vhost (priority 10) will be privileged over the base class vhost (15).
+Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. The default value is `25`. 
 
-The `vhost` defined type uses `concat::fragment` to build the configuration file, so if you want to inject custom fragments for pieces of the configuration not supported by default by the defined type, you can add a custom fragment.  For the `order` parameter for the custom fragment, the `vhost` defined type uses multiples of 10, so any order that isn't a multiple of 10 should work.
+To omit the priority prefix in the configuration file's name, set this parameter to `false`.
 
-```puppet
-    apache::vhost { "example.com":
-      docroot  => '/var/www/html',
-      priority => '25',
-    }
-    concat::fragment { "example.com-my_custom_fragment":
-      target  => '25-example.com.conf',
-      order   => 11,
-      content => '# my custom comment',
-    }
-```
+##### `source`
 
-If you have a series of specific configurations and do not want a base `::apache` class default vhost, make sure to set the base class `default_vhost` to 'false'.
+Points to the configuration file's source. The [`content`][] and `source` parameters are exclusive of each other.
 
-```puppet
-    class { 'apache':
-      default_vhost => false,
-    }
-```
+##### `verify_command`
+
+Specifies the command Puppet uses to verify the configuration file. Use a fully qualified command. Default: `/usr/sbin/apachectl -t`.
+
+This parameter is only used if the [`verify_config`][] parameter's value is 'true'. If the `verify_command` fails, the Puppet run deletes the configuration file, does not notify the Apache service, and raises an error.
+
+##### `verify_config`
+
+Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: `true`.
+
+#### Define: `apache::fastcgi::server`
+
+Defines one or more external FastCGI servers to handle specific file types. Use this define with [`mod_fastcgi`][FastCGI].
+
+**Parameters within `apache::fastcgi::server`:**
+
+##### `host`
+
+Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
+
+##### `timeout`
+
+Sets the number of seconds a [FastCGI][] application can be inactive before aborting the request and logging the event at the error LogLevel. The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond by writing and flushing within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
 
-**Parameters within `apache::vhost`:**
+##### `flush`
 
-#####`access_log`
+Forces [`mod_fastcgi`][FastCGI] to write to the client as data is received from the application. By default, `mod_fastcgi` buffers data in order to free the application as quickly as possible.
 
-Specifies whether `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`) should be configured. Setting the value to 'false' chooses none. Defaults to 'true'.
+##### `faux_path`
 
-#####`access_log_file`
+Apache has [FastCGI][] handle URIs that resolve to this filename. The path set in this parameter does not have to exist in the local filesystem.
 
-Sets the `*_access.log` filename that is placed in `$logroot`. Given a vhost, example.com, it defaults to 'example.com_ssl.log' for SSL vhosts and 'example.com_access.log' for non-SSL vhosts.
+##### `alias`
 
-#####`access_log_pipe`
+Internally links actions with the FastCGI server. This alias must be unique.
 
-Specifies a pipe to send access log messages to. Defaults to 'undef'.
+##### `file_type`
 
-#####`access_log_syslog`
+Sets the [MIME `content-type`][] of the file to be processed by the FastCGI server.
 
-Sends all access log messages to syslog. Defaults to 'undef'.
+#### Define: `apache::listen`
 
-#####`access_log_format`
+Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this define, and titles take the form '<PORT>', '<IPV4>:<PORT>', or '<IPV6>:<PORT>'.
 
-Specifies the use of either a LogFormat nickname or a custom format string for the access log. Defaults to 'combined'. See [these examples](http://httpd.apache.org/docs/current/mod/mod_log_config.html).
+#### Define: `apache::mod`
 
-#####`access_log_env_var`
+Installs packages for an Apache module that doesn't have a corresponding [`apache::mod::<MODULE NAME>`][] class, and checks for or places the module's default configuration files in the Apache server's `module` and `enable` directories. The default locations depend on your operating system.
+
+**Parameters within `apache::mod`**: 
+
+##### `package`
+
+**Required**. Names the package Puppet uses to install the Apache module.
+
+##### `package_ensure`
+
+Determines whether Puppet ensures the Apache module should be installed. Valid options: 'absent', 'present'. Default: 'present'.
+
+##### `lib`
+
+Defines the module's shared object name. Its default value is `mod_$name.so`, and it should not be configured manually without special reason.
+
+##### `lib_path`
+
+Specifies a path to the module's libraries. Default: the `apache` class's [`lib_path`][] parameter. 
+
+Don't manually set this parameter without special reason. The [`path`][] parameter overrides this value.
+
+##### `loadfile_name`
+
+Sets the filename for the module's [`LoadFile`][] directive, which can also set the module load order as Apache processes them in alphanumeric order. Valid options: filenames formatted `\*.load`. Default: `$name.load`.
+
+##### `loadfiles`
+
+Specifies an [array][] of [`LoadFile`][] directives.
+
+##### `path`
+
+Specifies a path to the module. Default: [`lib_path`][]/[`lib`][]. Don't manually set this parameter without special reason.
+
+#### Define: `apache::namevirtualhost`
+
+Enables [name-based virtual hosts][] and adds all related directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles can take the forms '\*', '*:<PORT>', '\_default_:<PORT>, '<IP>', or '<IP>:<PORT>'.
+
+#### Define: `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` being a defined resource type, which allows Apache to evaluate it multiple times with different parameters.
+
+The `apache::vhost` define allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default virtual host within the base `::apache` class, as well as set a customized virtual host as the default. Customized virtual hosts have a lower numeric [`priority`][] than the base class's, causing Apache to process the customized virtual host first.
+
+The `apache::vhost` define uses `concat::fragment` to build the configuration file. To inject custom fragments for pieces of the configuration that the define doesn't inherently support, add a custom fragment. 
+
+For the custom fragment's `order` parameter, the `apache::vhost` define uses multiples of 10, so any `order` that isn't a multiple of 10 should work.
+
+**Parameters within `apache::vhost`**:
+
+##### `access_log`
+
+Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). Valid options: Boolean. Default: 'true'.
+
+##### `access_log_env_var`
 
 Specifies that only requests with particular environment variables be logged. Defaults to 'undef'.
 
-#####`add_default_charset`
+##### `access_log_file`
+
+Sets the filename of the `*_access.log` placed in [`logroot`][]. Given a virtual host---for instance, example.com---it defaults to 'example.com_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com_access.log' for unencrypted virtual hosts.
+
+##### `access_log_format`
+
+Specifies the use of either a [`LogFormat`][] nickname or a custom-formatted string for the access log. Default: 'combined'.
+
+##### `access_log_pipe`
+
+Specifies a pipe where Apache sends access log messages. Default: 'undef'.
+
+##### `access_log_syslog`
 
-Sets [AddDefaultCharset](http://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset), a default value for the media charset, which is added to text/plain and text/html responses.
+Sends all access log messages to syslog. Default: 'undef'.
 
-#####`add_listen`
+##### `add_default_charset`
 
-Determines whether the vhost creates a Listen statement. The default value is 'true'.
+Sets a default media charset value for the [`AddDefaultCharset`][] directive, which is added to `text/plain` and `text/html` responses.
 
-Setting `add_listen` to 'false' stops the vhost from creating a Listen statement, and this is important when you combine vhosts that are not passed an `ip` parameter with vhosts that *are* passed the `ip` parameter.
+##### `add_listen`
 
-#####`use_optional_includes`
+Determines whether the virtual host creates a [`Listen`][] statement. Valid options: Boolean. Default: 'true'.
 
-Specifies if for apache > 2.4 it should use IncludeOptional instead of Include for `additional_includes`. Defaults to 'false'.
+Setting `add_listen` to 'false' prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are.
 
-#####`additional_includes`
+##### `use_optional_includes`
 
-Specifies paths to additional static, vhost-specific Apache configuration files. Useful for implementing a unique, custom configuration not supported by this module. Can be an array. Defaults to '[]'.
+Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer. Valid options: Boolean. Default: 'false'.
 
-#####`aliases`
+##### `additional_includes`
 
-Passes a list of hashes to the vhost to create Alias, AliasMatch, ScriptAlias or ScriptAliasMatch directives as per the [mod_alias documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
+Specifies paths to additional static, virtual host-specific Apache configuration files. You can use this parameter to implement a unique, custom configuration not supported by this module. Valid options: a string path or [array][] of them. Default: an empty array.
 
-```puppet
+##### `aliases`
+
+Passes a list of [Hashes][Hash] to the virtual host to create [`Alias`][], [`AliasMatch`][], [`ScriptAlias`][] or [`ScriptAliasMatch`][] directives as per the [`mod_alias`][] documentation.
+
+For example:
+
+~~~ puppet
 aliases => [
   { aliasmatch       => '^/image/(.*)\.jpg$',
     path             => '/files/jpg.images/$1.jpg',
@@ -1199,102 +1769,100 @@ aliases => [
     path             => '/usr/share/nagios/html',
   },
 ],
-```
+~~~
 
-For `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` to work, each needs a corresponding context, such as `<Directory /path/to/directory>` or `<Location /some/location/here>`. The directives are created in the order specified in the `aliases` parameter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html), more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters should come before the more general ones to avoid shadowing.
+For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs a corresponding context, such as `<Directory /path/to/directory>` or `<Location /some/location/here>`. Puppet creates the directives in the order specified in the `aliases` parameter. As described in the [`mod_alias`][] documentation, add more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more general ones to avoid shadowing.
 
-*Note*: Using the `aliases` parameter is preferred over the `scriptaliases` parameter since here the order of the various alias directives among each other can be controlled precisely. Defining ScriptAliases using the `scriptaliases` parameter means *all* ScriptAlias directives will come after *all* Alias directives, which can lead to Alias directives shadowing ScriptAlias directives. This is often problematic, for example in case of Nagios.
+**Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because you can precisely control the various alias directives' order. Defining `ScriptAliases` using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` directives. This often causes problems, for example with Nagios.
 
-*Note:* If `apache::mod::passenger` is loaded and `PassengerHighPerformance => true` is set, then Alias might have issues honoring the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
+If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is 'true', the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
-#####`allow_encoded_slashes`
+##### `allow_encoded_slashes`
 
-This sets the [`AllowEncodedSlashes` declaration](http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes) for the vhost, overriding the server default. This modifies the vhost responses to URLs with `\` and `/` characters. The default is undefined, which omits the declaration from the server configuration and select the Apache default setting of `Off`. Allowed values are: `on`, `off` or `nodecode`.
+Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Valid options: 'nodecode', 'off', 'on'. Default: undef, which omits the declaration from the server configuration and selects the Apache default setting of `Off`. 
 
-#####`block`
+##### `block`
 
-Specifies the list of things Apache blocks access to. The default is an empty set, '[]'. Currently, the only option is 'scm', which blocks web access to .svn, .git and .bzr directories.
+Specifies the list of things to which Apache blocks access. Valid option: 'scm', which blocks web access to `.svn`, `.git`, and `.bzr` directories. Default: an empty [array][].
 
-#####`custom_fragment`
+##### `custom_fragment`
 
-Passes a string of custom configuration directives to be placed at the end of the vhost configuration. Defaults to 'undef'.
+Passes a string of custom configuration directives to place at the end of the virtual host configuration. Default: 'undef'.
 
-#####`default_vhost`
+##### `default_vhost`
 
-Sets a given `apache::vhost` as the default to serve requests that do not match any other `apache::vhost` definitions. The default value is 'false'.
+Sets a given `apache::vhost` define as the default to serve requests that do not match any other `apache::vhost` defines. Default: 'false'.
 
-#####`directories`
+##### `directories`
 
-See the [`directories` section](#parameter-directories-for-apachevhost).
+See the [`directories`](#parameter-directories-for-apachevhost) section.
 
-#####`directoryindex`
+##### `directoryindex`
 
-Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. [DirectoryIndex](http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex) has more information. Defaults to 'undef'.
+Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details. Default: 'undef'.
 
-#####`docroot`
+##### `docroot`
 
-Provides the
-[DocumentRoot](http://httpd.apache.org/docs/current/mod/core.html#documentroot)
-directive, which identifies the directory Apache serves files from. Required.
+**Required**. Sets the [`DocumentRoot`][] location, from which Apache serves files.
 
-#####`docroot_group`
+##### `docroot_group`
 
-Sets group access to the docroot directory. Defaults to 'root'.
+Sets group access to the [`docroot`][] directory. Defaults to 'root'.
 
-#####`docroot_owner`
+##### `docroot_owner`
 
 Sets individual user access to the docroot directory. Defaults to 'root'.
 
-#####`docroot_mode`
+##### `docroot_mode`
 
 Sets access permissions of the docroot directory. Defaults to 'undef'.
 
-#####`manage_docroot`
+##### `manage_docroot`
 
 Whether to manage to docroot directory at all. Defaults to 'true'.
 
-#####`error_log`
+##### `error_log`
 
 Specifies whether `*_error.log` directives should be configured. Defaults to 'true'.
 
-#####`error_log_file`
+##### `error_log_file`
 
 Points to the `*_error.log` file. Given a vhost, example.com, it defaults to 'example.com_ssl_error.log' for SSL vhosts and 'example.com_access_error.log' for non-SSL vhosts.
 
-#####`error_log_pipe`
+##### `error_log_pipe`
 
 Specifies a pipe to send error log messages to. Defaults to 'undef'.
 
-#####`error_log_syslog`
+##### `error_log_syslog`
 
 Sends all error log messages to syslog. Defaults to 'undef'.
 
-#####`error_documents`
+##### `error_documents`
 
 A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this vhost. Defaults to '[]'. Example:
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       error_documents => [
         { 'error_code' => '503', 'document' => '/service-unavail' },
         { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
       ],
     }
-```
+~~~
 
-#####`ensure`
+##### `ensure`
 
 Specifies if the vhost file is present or absent. Defaults to 'present'.
 
-#####`fallbackresource`
+##### `fallbackresource`
 
 Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid values must either begin with a / or be 'disabled'. Defaults to 'undef'.
 
-#####`filters`
+##### `filters`
 
 [Filters](http://httpd.apache.org/docs/2.2/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
 
-```puppet
+~~~ puppet
     apache::vhost { "$::fqdn":
       filters => [
         'FilterDeclare   COMPRESS',
@@ -1303,25 +1871,25 @@ Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.htm
         'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
       ],
     }
-```
+~~~
 
-#####`force_type`
+##### `force_type`
 
-Sets the [ForceType](http://httpd.apache.org/docs/2.2/mod/core.html#forcetype) directive, to force all matching files to be served with the specified MIME content-type.
+Sets the [`ForceType`][] directive, which forces Apache to serve all matching files with the specified [MIME `content-type`][].
 
-#####`headers`
+##### `headers`
 
 Adds lines to replace, merge, or remove response headers. See [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Can be an array. Defaults to 'undef'.
 
-#####`ip`
+##### `ip`
 
 Sets the IP address the vhost listens on. Defaults to listen on all IPs.
 
-#####`ip_based`
+##### `ip_based`
 
 Enables an [IP-based](http://httpd.apache.org/docs/current/vhosts/ip-based.html) vhost. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based vhosts. Defaults to 'false'.
 
-#####`itk`
+##### `itk`
 
 Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys can be:
 
@@ -1335,7 +1903,7 @@ Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys can be:
 
 Usage typically looks like:
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot => '/path/to/directory',
       itk     => {
@@ -1343,123 +1911,123 @@ Usage typically looks like:
         group => 'somegroup',
       },
     }
-```
+~~~
 
-#####`logroot`
+##### `logroot`
 
 Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
 
-#####`$logroot_ensure`
+##### `$logroot_ensure`
 
 Determines whether or not to remove the logroot directory for a virtual host. Valid values are 'directory', or 'absent'.
 
-#####`logroot_mode`
+##### `logroot_mode`
 
 Overrides the mode the logroot directory is set to. Defaults to undef. Do NOT give people write access to the directory the logs are stored
 in without being aware of the consequences; see http://httpd.apache.org/docs/2.4/logs.html#security for details.
 
-#####`log_level`
+##### `log_level`
 
 Specifies the verbosity of the error log. Defaults to 'warn' for the global server configuration and can be overridden on a per-vhost basis. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
 
-######`modsec_body_limit`
+###### `modsec_body_limit`
 
 Configures the maximum request body size (in bytes) ModSecurity will accept for buffering
 
-######`modsec_disable_vhost`
+###### `modsec_disable_vhost`
 
 Boolean.  Only valid if apache::mod::security is included.  Used to disable mod_security on an individual vhost.  Only relevant if apache::mod::security is included.
 
-######`modsec_disable_ids`
+###### `modsec_disable_ids`
 
 Array of mod_security IDs to remove from the vhost.  Also takes a hash allowing removal of an ID from a specific location.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       modsec_disable_ids => [ 90015, 90016 ],
     }
-```
+~~~
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
     }
-```
+~~~
 
-######`modsec_disable_ips`
+###### `modsec_disable_ips`
 
 Array of IPs to exclude from mod_security rule matching
 
-#####`no_proxy_uris`
+##### `no_proxy_uris`
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
 
-#####`no_proxy_uris_match`
+##### `no_proxy_uris_match`
 
 This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
-#####`proxy_preserve_host`
+##### `proxy_preserve_host`
 
 Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypreservehost).  true Enables the Host: line from an incoming request to be proxied to the host instead of hostname .  false sets this option to off (default).
 
-#####`proxy_error_override`
+##### `proxy_error_override`
 
 Sets the [ProxyErrorOverride Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxyerroroverride). This directive controls whether apache should override error pages for proxied content. This option is off by default.
 
-#####`options`
+##### `options`
 
 Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. Defaults to '['Indexes','FollowSymLinks','MultiViews']', as demonstrated below:
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       options => ['Indexes','FollowSymLinks','MultiViews'],
     }
-```
+~~~
 
 *Note:* If you use [`directories`](#parameter-directories-for-apachevhost), 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
-#####`override`
+##### `override`
 
 Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. Defaults to '[none]'.
 
-#####`passenger_app_root`
+##### `passenger_app_root`
 
 Sets [PassengerRoot](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppRoot), the location of the Passenger application root if different from the DocumentRoot.
 
-#####`passenger_app_env`
+##### `passenger_app_env`
 
 Sets [PassengerAppEnv](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppEnv), the environment for the Passenger application. If not specifies, defaults to the global setting or 'production'.
 
-#####`passenger_ruby`
+##### `passenger_ruby`
 
 Sets [PassengerRuby](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerRuby) on this virtual host, the Ruby interpreter to use for the application.
 
-#####`passenger_min_instances`
+##### `passenger_min_instances`
 
 Sets [PassengerMinInstances](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerMinInstances), the minimum number of application processes to run.
 
-#####`passenger_start_timeout`
+##### `passenger_start_timeout`
 
 Sets [PassengerStartTimeout](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#_passengerstarttimeout_lt_seconds_gt), the timeout for the application startup.
 
-#####`passenger_pre_start`
+##### `passenger_pre_start`
 
 Sets [PassengerPreStart](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerPreStart), the URL of the application if pre-starting is required.
 
-#####`php_flags & values`
+##### `php_flags & values`
 
 Allows per-vhost setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Defaults to '{}'.
 
-#####`php_admin_flags & values`
+##### `php_admin_flags & values`
 
 Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '{}'.
 
-#####`port`
+##### `port`
 
 Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host only listens on the port set in this parameter.
 
-#####`priority`
+##### `priority`
 
 Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Defaults to '25'.
 
@@ -1469,15 +2037,15 @@ If nothing matches the priority, the first name-based vhost is used. Likewise, p
 
 Pass priority `false` to omit the priority prefix in file names.
 
-#####`proxy_dest`
+##### `proxy_dest`
 
 Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
 
-#####`proxy_pass`
+##### `proxy_pass`
 
 Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters can be added as an array.
 
-```puppet
+~~~ puppet
 apache::vhost { 'site.name.fdqn':
   …
   proxy_pass => [
@@ -1494,73 +2062,73 @@ apache::vhost { 'site.name.fdqn':
       'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
   ],
 }
-```
+~~~
 
 `reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
 `params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
 `setenv` is optional and is an array to set environment variables for the proxy directive, for details see http://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings
 
-#####`proxy_dest_match`
+##### `proxy_dest_match`
 
 This directive is equivalent to proxy_dest, but takes regular expressions, see [ProxyPassMatch](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
 
-#####`proxy_dest_reverse_match`
+##### `proxy_dest_reverse_match`
 
 Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See [ProxyPassReverse](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) for details.
 
-#####`proxy_pass_match`
+##### `proxy_pass_match`
 
 This directive is equivalent to proxy_pass, but takes regular expressions, see [ProxyPassMatch](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
 
-#####`rack_base_uris`
+##### `rack_base_uris`
 
 Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
 
-#####`redirect_dest`
+##### `redirect_dest`
 
 Specifies the address to redirect to. Defaults to 'undef'.
 
-#####`redirect_source`
+##### `redirect_source`
 
 Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent.
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       redirect_source => ['/images','/downloads'],
       redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
     }
-```
+~~~
 
-#####`redirect_status`
+##### `redirect_status`
 
 Specifies the status to append to the redirect. Defaults to 'undef'.
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       redirect_status => ['temp','permanent'],
     }
-```
+~~~
 
-#####`redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
+##### `redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
 
 Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Defaults to 'undef'.
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       redirectmatch_status => ['404','404'],
       redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
       redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
     }
-```
+~~~
 
-#####`request_headers`
+##### `request_headers`
 
 Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Defaults to 'undef'.
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       request_headers => [
@@ -1568,23 +2136,23 @@ Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mo
         'unset MirrorID',
       ],
     }
-```
-#####`rewrites`
+~~~
+##### `rewrites`
 
 Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Defaults to 'undef'.
 
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
     }
-```
+~~~
 
 The parameter allows rewrite conditions that, when true, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       rewrites => [
@@ -1595,11 +2163,11 @@ The parameter allows rewrite conditions that, when true, execute the associated
         },
       ],
     }
-```
+~~~
 
 You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       rewrites => [
@@ -1610,11 +2178,11 @@ You can also apply multiple conditions. For instance, rewrite index.html to welc
         },
       ],
     }
-```
+~~~
 
 Multiple rewrites and conditions are also possible
 
-```puppet
+~~~ puppet
     apache::vhost { 'site.name.fdqn':
       …
       rewrites => [
@@ -1639,21 +2207,21 @@ Multiple rewrites and conditions are also possible
         },
      ],
     }
-```
+~~~
 
 Refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions.
 
-#####`scriptalias`
+##### `scriptalias`
 
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for example: '/usr/scripts'. Defaults to 'undef'.
 
-#####`scriptaliases`
+##### `scriptaliases`
 
 *Note*: This parameter is deprecated in favour of the `aliases` parameter.
 
 Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
 
-```puppet
+~~~ puppet
     scriptaliases => [
       {
         alias => '/myscript',
@@ -1672,39 +2240,39 @@ Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAli
         path  => '/usr/share/neatscript',
       },
     ]
-```
+~~~
 
 The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, more specific aliases should come before more general ones to avoid shadowing.
 
-#####`serveradmin`
+##### `serveradmin`
 
 Specifies the email address Apache displays when it renders one of its error pages. Defaults to 'undef'.
 
-#####`serveraliases`
+##### `serveraliases`
 
 Sets the [ServerAliases](http://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site. Defaults to '[]'.
 
-#####`servername`
+##### `servername`
 
 Sets the servername corresponding to the hostname you connect to the virtual host at. Defaults to the title of the resource.
 
-#####`setenv`
+##### `setenv`
 
 Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
 
 Example:
 
-```puppet
+~~~ puppet
     apache::vhost { 'setenv.example.com':
       setenv => ['SPECIAL_PATH /foo/bin'],
     }
-```
+~~~
 
-#####`setenvif`
+##### `setenvif`
 
 Used by HTTPD to conditionally set environment variables for vhosts. Defaults to '[]'.
 
-#####`suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
+##### `suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
 
 Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
 
@@ -1716,7 +2284,7 @@ Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=
 
 To set up a virtual host with suPHP
 
-```puppet
+~~~ puppet
     apache::vhost { 'suphp.example.com':
       port                => '80',
       docroot             => '/home/appuser/myphpapp',
@@ -1727,17 +2295,17 @@ To set up a virtual host with suPHP
         'suphp'           => { user => 'myappuser', group => 'myappgroup' },
       }
     }
-```
+~~~
 
-#####`vhost_name`
+##### `vhost_name`
 
 Enables name-based virtual hosting. If no IP is passed to the virtual host, but the vhost is assigned a port, then the vhost name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name is set to the title of the resource. Defaults to '*'.
 
-#####`virtual_docroot`
+##### `virtual_docroot`
 
 Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'.
 
-```puppet
+~~~ puppet
     apache::vhost { 'subdomain.loc':
       vhost_name       => '*',
       port             => '80',
@@ -1745,9 +2313,9 @@ Sets up a virtual host with a wildcard alias subdomain mapped to a directory wit
       docroot          => '/var/www',
       serveraliases    => ['*.loc',],
     }
-```
+~~~
 
-#####`wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
+##### `wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
 
 Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 
@@ -1765,7 +2333,7 @@ Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 
 To set up a virtual host with WSGI
 
-```puppet
+~~~ puppet
     apache::vhost { 'wsgi.example.com':
       port                        => '80',
       docroot                     => '/var/www/pythonapp',
@@ -1779,7 +2347,7 @@ To set up a virtual host with WSGI
       wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
       wsgi_chunked_request        => 'On',
     }
-```
+~~~
 
 ####Parameter `directories` for `apache::vhost`
 
@@ -1791,7 +2359,7 @@ The `provider` key is optional. If missing, this key defaults to 'directory'. Va
 
 General `directories` usage looks something like
 
-```puppet
+~~~ puppet
     apache::vhost { 'files.example.net':
       docroot     => '/var/www/files',
       directories => [
@@ -1801,26 +2369,26 @@ General `directories` usage looks something like
          },
       ],
     }
-```
+~~~
 
 *Note:* At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
 
 Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes.  This looks like
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [ { path => '/path/to/directory', handler => value } ],
 }
-```
+~~~
 
 Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are:
 
-######`addhandlers`
+###### `addhandlers`
 
 Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -1829,13 +2397,13 @@ Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhand
         },
       ],
     }
-```
+~~~
 
-######`allow`
+###### `allow`
 
 Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -1844,13 +2412,13 @@ Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow)
         },
       ],
     }
-```
+~~~
 
-######`allow_override`
+###### `allow_override`
 
 Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot      => '/path/to/directory',
       directories  => [
@@ -1859,69 +2427,69 @@ Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs
         },
       ],
     }
-```
+~~~
 
-######`auth_basic_authoritative`
+###### `auth_basic_authoritative`
 
 Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative), which determines whether authorization and authentication are passed to lower level Apache modules.
 
-######`auth_basic_fake`
+###### `auth_basic_fake`
 
 Sets the value for [AuthBasicFake](http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
 
-######`auth_basic_provider`
+###### `auth_basic_provider`
 
 Sets the value for [AuthBasicProvider] (http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
 
-######`auth_digest_algorithm`
+###### `auth_digest_algorithm`
 
 Sets the value for [AuthDigestAlgorithm](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
 
-######`auth_digest_domain`
+###### `auth_digest_domain`
 
 Sets the value for [AuthDigestDomain](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
 
-######`auth_digest_nonce_lifetime`
+###### `auth_digest_nonce_lifetime`
 
 Sets the value for [AuthDigestNonceLifetime](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
 
-######`auth_digest_provider`
+###### `auth_digest_provider`
 
 Sets the value for [AuthDigestProvider](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
 
-######`auth_digest_qop`
+###### `auth_digest_qop`
 
 Sets the value for [AuthDigestQop](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
 
-######`auth_digest_shmem_size`
+###### `auth_digest_shmem_size`
 
 Sets the value for [AuthAuthDigestShmemSize](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
 
-######`auth_group_file`
+###### `auth_group_file`
 
 Sets the value for [AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile), which sets the name of the text file containing the list of user groups for authorization.
 
-######`auth_name`
+###### `auth_name`
 
 Sets the value for [AuthName](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm.
 
-######`auth_require`
+###### `auth_require`
 
 Sets the entity name you're requiring to allow access. Read more about [Require](http://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives).
 
-######`auth_type`
+###### `auth_type`
 
 Sets the value for [AuthType](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
 
-######`auth_user_file`
+###### `auth_user_file`
 
 Sets the value for [AuthUserFile](http://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
 
-######`custom_fragment`
+###### `custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the directory configuration.
 
-```puppet
+~~~ puppet
   apache::vhost { 'monitor':
     …
     directories => [
@@ -1942,13 +2510,13 @@ Pass a string of custom configuration directives to be placed at the end of the
       },
     ]
   }
-```
+~~~
 
-######`deny`
+###### `deny`
 
 Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -1957,13 +2525,13 @@ Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) dir
         },
       ],
     }
-```
+~~~
 
-######`error_documents`
+###### `error_documents`
 
 An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       directories => [
         { path            => '/srv/www',
@@ -1975,14 +2543,14 @@ An array of hashes used to override the [ErrorDocument](https://httpd.apache.org
         },
       ],
     }
-```
+~~~
 
-######`geoip_enable`
+###### `geoip_enable`
 
 Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive.
 Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
 
-```puppet
+~~~ puppet
     apache::vhost { 'first.example.com':
       docroot     => '/var/www/first',
       directories => [
@@ -1991,13 +2559,13 @@ Note that you must declare `class {'apache::mod::geoip': }` before using this di
         },
       ],
     }
-```
+~~~
 
-######`headers`
+###### `headers`
 
 Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => {
@@ -2005,13 +2573,13 @@ Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.htm
         headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
       },
     }
-```
+~~~
 
-######`index_options`
+###### `index_options`
 
 Allows configuration settings for [directory indexing](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2022,13 +2590,13 @@ Allows configuration settings for [directory indexing](http://httpd.apache.org/d
         },
       ],
     }
-```
+~~~
 
-######`index_order_default`
+###### `index_order_default`
 
 Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2038,13 +2606,13 @@ Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoind
         },
       ],
     }
-```
+~~~
 
-######`index_style_sheet`
+###### `index_style_sheet`
 
 Sets the [IndexStyleSheet](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet) which adds a CSS stylesheet to the directory index.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2055,13 +2623,13 @@ Sets the [IndexStyleSheet](http://httpd.apache.org/docs/current/mod/mod_autoinde
         },
       ],
     }
-```
+~~~
 
-######`options`
+###### `options`
 
 Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2070,13 +2638,13 @@ Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options)
         },
       ],
     }
-```
+~~~
 
-######`order`
+###### `order`
 
 Sets the order of processing Allow and Deny statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2085,13 +2653,13 @@ Sets the order of processing Allow and Deny statements as per [Apache core docum
         },
       ],
     }
-```
+~~~
 
-######`passenger_enabled`
+###### `passenger_enabled`
 
 Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2100,24 +2668,24 @@ Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/
         },
       ],
     }
-```
+~~~
 
 *Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
-######`php_value` and `php_flag`
+###### `php_value` and `php_flag`
 
 `php_value` sets the value of the directory, and `php_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
 
-######`php_admin_value` and `php_admin_flag`
+###### `php_admin_value` and `php_admin_flag`
 
 `php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
 
 
-######`satisfy`
+###### `satisfy`
 
 Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2126,13 +2694,13 @@ Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.a
         }
       ],
     }
-```
+~~~
 
-######`sethandler`
+###### `sethandler`
 
 Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2141,13 +2709,13 @@ Sets a `SetHandler` directive as per the [Apache Core documentation](http://http
         }
       ],
     }
-```
+~~~
 
-######`rewrites`
+###### `rewrites`
 
 Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
 
-```puppet
+~~~ puppet
     apache::vhost { 'secure.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2166,15 +2734,15 @@ Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array
         },
       ],
     }
-```
+~~~
 
 ***Note*** If you include rewrites in your directories make sure you are also including `apache::mod::rewrite`. You may also want to consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
 
-######`shib_request_setting`
+###### `shib_request_setting`
 
 Allows an valid content setting to be set or altered for the application request. This command takes two parameters, the name of the content setting, and the value to set it to.Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
-```puppet
+~~~ puppet
     apache::vhost { 'secure.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2184,17 +2752,17 @@ Allows an valid content setting to be set or altered for the application request
         },
       ],
     }
-```
+~~~
 
-######`shib_use_headers`
+###### `shib_use_headers`
 
 When set to 'On' this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
-######`ssl_options`
+###### `ssl_options`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
 
-```puppet
+~~~ puppet
     apache::vhost { 'secure.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2206,13 +2774,13 @@ String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl
         },
       ],
     }
-```
+~~~
 
-######`suphp`
+###### `suphp`
 
 A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and can only be passed within `directories`.
 
-```puppet
+~~~ puppet
     apache::vhost { 'secure.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2224,119 +2792,119 @@ A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://w
         },
       ],
     }
-```
+~~~
 
 ####SSL parameters for `apache::vhost`
 
 All of the SSL parameters for `::vhost` default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
 
-#####`ssl`
+##### `ssl`
 
 Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'.
 
-#####`ssl_ca`
+##### `ssl_ca`
 
 Specifies the SSL certificate authority. Defaults to 'undef'.
 
-#####`ssl_cert`
+##### `ssl_cert`
 
 Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, '/usr/local/etc/apache22/server.crt' for FreeBSD, and '/etc/ssl/apache2/server.crt' on Gentoo.
 
-#####`ssl_protocol`
+##### `ssl_protocol`
 
 Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array of accepted protocols. Defaults to 'all', '-SSLv2', '-SSLv3'.
 
-#####`ssl_cipher`
+##### `ssl_cipher`
 
 Specifies [SSLCipherSuite](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Defaults to 'HIGH:MEDIUM:!aNULL:!MD5'.
 
-#####`ssl_honorcipherorder`
+##### `ssl_honorcipherorder`
 
 Sets [SSLHonorCipherOrder](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), which is used to prefer the server's cipher preference order. Defaults to 'On' in the base `apache` config.
 
-#####`ssl_certs_dir`
+##### `ssl_certs_dir`
 
 Specifies the location of the SSL certification directory. Defaults to '/etc/ssl/certs' on Debian, '/etc/pki/tls/certs' on RedHat, '/usr/local/etc/apache22' on FreeBSD, and '/etc/ssl/apache2' on Gentoo.
 
-#####`ssl_chain`
+##### `ssl_chain`
 
 Specifies the SSL chain. Defaults to 'undef'. (This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
-#####`ssl_crl`
+##### `ssl_crl`
 
 Specifies the certificate revocation list to use. Defaults to 'undef'. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
-#####`ssl_crl_path`
+##### `ssl_crl_path`
 
 Specifies the location of the certificate revocation list. Defaults to 'undef'. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
-#####`ssl_crl_check`
+##### `ssl_crl_check`
 
 Sets the certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), defaults to 'undef'. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
 
-#####`ssl_key`
+##### `ssl_key`
 
 Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, '/usr/local/etc/apache22/server.key' for FreeBSD, and '/etc/ssl/apache2/server.key' on Gentoo. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
-#####`ssl_verify_client`
+##### `ssl_verify_client`
 
 Sets the [SSLVerifyClient](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid values are: 'none', 'optional', 'require', and 'optional_no_ca'. Defaults to 'undef'.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_verify_client => 'optional',
     }
-```
+~~~
 
-#####`ssl_verify_depth`
+##### `ssl_verify_depth`
 
 Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Defaults to 'undef'.
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_verify_depth => 1,
     }
-```
+~~~
 
-#####`ssl_options`
+##### `ssl_options`
 
 Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'.
 
 A string:
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_options => '+ExportCertData',
     }
-```
+~~~
 
 An array:
 
-```puppet
+~~~ puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_options => [ '+StrictRequire', '+ExportCertData' ],
     }
-```
+~~~
 
-#####`ssl_openssl_conf_cmd`
+##### `ssl_openssl_conf_cmd`
 
 Sets the [SSLOpenSSLConfCmd](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. Defaults to 'undef'.
 
-#####`ssl_proxyengine`
+##### `ssl_proxyengine`
 
 Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid values are 'true' and 'false'. Defaults to 'false'.
 
-####Defined Type: FastCGI Server
+####Define: FastCGI Server
 
 This type is intended for use with mod_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
 
 Ex:
 
-```puppet
+~~~ puppet
 apache::fastcgi::server { 'php':
   host       => '127.0.0.1:9000',
   timeout    => 15,
@@ -2345,426 +2913,168 @@ apache::fastcgi::server { 'php':
   fcgi_alias => '/php.fcgi',
   file_type  => 'application/x-httpd-php'
 }
-```
+~~~
 
 Within your virtual host, you can then configure the specified file type to be handled by the fastcgi server specified above.
 
-```puppet
+~~~ puppet
 apache::vhost { 'www':
   ...
   custom_fragment => 'AddType application/x-httpd-php .php'
   ...
 }
-```
+~~~
 
-#####`host`
+##### `host`
 
 The hostname or IP address and TCP port number (1-65535) of the FastCGI server.
 
-#####`timeout`
+##### `timeout`
 
 The number of seconds of FastCGI application inactivity allowed before the request is aborted and the event is logged (at the error LogLevel). The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond (by writing and flushing) within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
 
-#####`flush`
+##### `flush`
 
 Force a write to the client as data is received from the application. By default, mod_fastcgi buffers data in order to free the application as quickly as possible.
 
-#####`faux_path`
+##### `faux_path`
 
 `faux_path` does not have to exist in the local filesystem. URIs that Apache resolves to this filename are handled by this external FastCGI application.
 
-#####`alias`
+##### `alias`
 
 A unique alias. This is used internally to link the action with the FastCGI server.
 
-#####`file_type`
+##### `file_type`
 
 The MIME-type of the file to be processed by the FastCGI server.
 
-###Virtual Host Examples
+### Private Defines
 
-The apache module allows you to set up pretty much any configuration of virtual host you might need. This section addresses some common configurations, but look at the [Tests section](https://github.com/puppetlabs/puppetlabs-apache/tree/master/tests) for even more examples.
+#### Define: `apache::peruser::multiplexer`
 
-Configure a vhost with a server administrator
+This define checks if an Apache module has a class. If it does, it includes that class. If it does not, it passes the module name to the [`apache::mod`][] define.
 
-```puppet
-    apache::vhost { 'third.example.com':
-      port        => '80',
-      docroot     => '/var/www/third',
-      serveradmin => 'admin@example.com',
-    }
-```
+#### Define: `apache::peruser::multiplexer`
 
-- - -
+Enables the [`Peruser`][] module for FreeBSD only.
 
-Set up a vhost with aliased servers
+#### Define: `apache::peruser::processor`
 
-```puppet
-    apache::vhost { 'sixth.example.com':
-      serveraliases => [
-        'sixth.example.org',
-        'sixth.example.net',
-      ],
-      port          => '80',
-      docroot       => '/var/www/fifth',
-    }
-```
+Enables the [`Peruser`][] module for FreeBSD only.
 
-- - -
+#### Define: `apache::security::file_link`
 
-Configure a vhost with a cgi-bin
+Links the `activated_rules` from [`apache::mod::security`][] to the respective CRS rules on disk.
 
-```puppet
-    apache::vhost { 'eleventh.example.com':
-      port        => '80',
-      docroot     => '/var/www/eleventh',
-      scriptalias => '/usr/lib/cgi-bin',
-    }
-```
+### Templates
 
-- - -
+The Apache module relies heavily on templates to enable the [`apache::vhost`][] and [`apache::mod`][] defines. These templates are built based on [Facter][] facts specific to your operating system. Unless explicitly called out, most templates are not meant for configuration.
 
-Set up a vhost with a rack configuration
+## Limitations
 
-```puppet
-    apache::vhost { 'fifteenth.example.com':
-      port           => '80',
-      docroot        => '/var/www/fifteenth',
-      rack_base_uris => ['/rackapp1', '/rackapp2'],
-    }
-```
+### Ubuntu 10.04
 
-- - -
+The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
 
-Set up a mix of SSL and non-SSL vhosts at the same domain
+### RHEL/CentOS 5
 
-```puppet
-    #The non-ssl vhost
-    apache::vhost { 'first.example.com non-ssl':
-      servername => 'first.example.com',
-      port       => '80',
-      docroot    => '/var/www/first',
-    }
+The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested since repositories are missing compatible packages.
 
-    #The SSL vhost at the same domain
-    apache::vhost { 'first.example.com ssl':
-      servername => 'first.example.com',
-      port       => '443',
-      docroot    => '/var/www/first',
-      ssl        => true,
-    }
-```
+### RHEL/CentOS 7
 
-- - -
+The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] define's [`rack_base_uri`][] parameter.
 
-Configure a vhost to redirect non-SSL connections to SSL
+### General
 
-```puppet
-    apache::vhost { 'sixteenth.example.com non-ssl':
-      servername      => 'sixteenth.example.com',
-      port            => '80',
-      docroot         => '/var/www/sixteenth',
-      redirect_status => 'permanent',
-      redirect_dest   => 'https://sixteenth.example.com/'
-    }
-    apache::vhost { 'sixteenth.example.com ssl':
-      servername => 'sixteenth.example.com',
-      port       => '443',
-      docroot    => '/var/www/sixteenth',
-      ssl        => true,
-    }
-```
-
-- - -
-
-Set up IP-based vhosts on any listen port and have them respond to requests on specific IP addresses. In this example, we set listening on ports 80 and 81. This is required because the example vhosts are not declared with a port parameter.
-
-```puppet
-    apache::listen { '80': }
-    apache::listen { '81': }
-```
-
-Then we set up the IP-based vhosts
-
-```puppet
-    apache::vhost { 'first.example.com':
-      ip       => '10.0.0.10',
-      docroot  => '/var/www/first',
-      ip_based => true,
-    }
-    apache::vhost { 'second.example.com':
-      ip       => '10.0.0.11',
-      docroot  => '/var/www/second',
-      ip_based => true,
-    }
-```
-
-- - -
-
-Configure a mix of name-based and IP-based vhosts. First, we add two IP-based vhosts on 10.0.0.10, one SSL and one non-SSL
-
-```puppet
-    apache::vhost { 'The first IP-based vhost, non-ssl':
-      servername => 'first.example.com',
-      ip         => '10.0.0.10',
-      port       => '80',
-      ip_based   => true,
-      docroot    => '/var/www/first',
-    }
-    apache::vhost { 'The first IP-based vhost, ssl':
-      servername => 'first.example.com',
-      ip         => '10.0.0.10',
-      port       => '443',
-      ip_based   => true,
-      docroot    => '/var/www/first-ssl',
-      ssl        => true,
-    }
-```
-
-Then, we add two name-based vhosts listening on 10.0.0.20
-
-```puppet
-    apache::vhost { 'second.example.com':
-      ip      => '10.0.0.20',
-      port    => '80',
-      docroot => '/var/www/second',
-    }
-    apache::vhost { 'third.example.com':
-      ip      => '10.0.0.20',
-      port    => '80',
-      docroot => '/var/www/third',
-    }
-```
-
-If you want to add two name-based vhosts so that they answer on either 10.0.0.10 or 10.0.0.20, you **MUST** declare `add_listen => 'false'` to disable the otherwise automatic 'Listen 80', as it conflicts with the preceding IP-based vhosts.
-
-```puppet
-    apache::vhost { 'fourth.example.com':
-      port       => '80',
-      docroot    => '/var/www/fourth',
-      add_listen => false,
-    }
-    apache::vhost { 'fifth.example.com':
-      port       => '80',
-      docroot    => '/var/www/fifth',
-      add_listen => false,
-    }
-```
-
-###Load Balancing
-
-####Defined Type: `apache::balancer`
-
-`apache::balancer` creates an Apache balancer cluster. Each balancer cluster needs one or more balancer members, which are declared with [`apache::balancermember`](#defined-type-apachebalancermember).
-
-One `apache::balancer` defined resource should be defined for each Apache load balanced set of servers. The `apache::balancermember` resources for all balancer members can be exported and collected on a single Apache load balancer server using exported resources.
-
-**Parameters within `apache::balancer`:**
-
-#####`name`
-
-Sets the balancer cluster's title. This parameter also sets the title of the conf.d file.
-
-#####`proxy_set`
-
-Configures key-value pairs as [ProxySet](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) lines. Accepts a hash, and defaults to '{}'.
-
-#####`collect_exported`
-
-Determines whether or not to use exported resources. Valid values 'true' and 'false', defaults to 'true'.
-
-If you statically declare all of your backend servers, you should set this to 'false' to rely on existing declared balancer member resources. Also make sure to use `apache::balancermember` with array arguments.
-
-If you wish to dynamically declare your backend servers via [exported resources](http://docs.puppetlabs.com/guides/exported_resources.html) collected on a central node, you must set this parameter to 'true' in order to collect the exported balancer member resources that were exported by the balancer member nodes.
-
-If you choose not to use exported resources, all balancer members will be configured in a single Puppet run. If you are using exported resources, Puppet has to run on the balanced nodes, then run on the balancer.
-
-####Defined Type: `apache::balancermember`
-
-Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html), which sets up a balancer member inside a listening service configuration block in etc/apache/apache.cfg on the load balancer.
-
-**Parameters within `apache::balancermember`:**
-
-#####`name`
-
-Sets the title of the resource. This name also sets the name of the concat fragment.
-
-#####`balancer_cluster`
+This module is CI tested against both [open source Puppet][] and [Puppet Enterprise][] on:
 
-Sets the Apache service's instance name. This must match the name of a declared `apache::balancer` resource. Required.
+- CentOS 5 and 6
+- Ubuntu 12.04 and 14.04
+- Debian 7
+- RHEL 5, 6, and 7
 
-#####`url`
+This module also provides functions for other distributions and operating systems, such as FreeBSD, Gentoo, and Amazon Linux, but is not formally tested on them and are subject to regressions.
 
-Specifies the URL used to contact the balancer member server. Defaults to 'http://${::fqdn}/'.
+### SELinux and custom paths
 
-#####`options`
+If [SELinux][] is in [enforcing mode][] and you want to use custom paths for `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you need to manage the files' context yourself.
 
-An array of [options](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#balancermember) to be specified after the URL. Accepts any key-value pairs available to [ProxyPass](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass).
+You can do this with Puppet:
 
-####Examples
-
-To load balance with exported resources, export the `balancermember` from the balancer member
-
-```puppet
-      @@apache::balancermember { "${::fqdn}-puppet00":
-        balancer_cluster => 'puppet00',
-        url              => "ajp://${::fqdn}:8009"
-        options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-      }
-```
-
-Then, on the proxy server, create the balancer cluster
-
-```puppet
-      apache::balancer { 'puppet00': }
-```
-
-To load balance without exported resources, declare the following on the proxy
-
-```puppet
-    apache::balancer { 'puppet00': }
-    apache::balancermember { "${::fqdn}-puppet00":
-        balancer_cluster => 'puppet00',
-        url              => "ajp://${::fqdn}:8009"
-        options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-      }
-```
-
-Then declare `apache::balancer` and `apache::balancermember` on the proxy server.
-
-If you need to use ProxySet in the balancer config
-
-```puppet
-      apache::balancer { 'puppet01':
-        proxy_set => {'stickysession' => 'JSESSIONID'},
-      }
-```
-
-##Reference
-
-###Classes
-
-####Public Classes
-
-* [`apache`](#class-apache): Guides the basic setup of Apache.
-* `apache::dev`: Installs Apache development libraries. (*Note:* On FreeBSD, you must declare `apache::package` or `apache` before `apache::dev`.)
-* [`apache::mod::[name]`](#classes-apachemodname): Enables specific Apache HTTPD modules.
-
-####Private Classes
-
-* `apache::confd::no_accf`: Creates the no-accf.conf configuration file in conf.d, required by FreeBSD's Apache 2.4.
-* `apache::default_confd_files`: Includes conf.d files for FreeBSD.
-* `apache::default_mods`: Installs the Apache modules required to run the default configuration.
-* `apache::package`: Installs and configures basic Apache packages.
-* `apache::params`: Manages Apache parameters.
-* `apache::service`: Manages the Apache daemon.
-
-###Defined Types
-
-####Public Defined Types
-
-* `apache::balancer`: Creates an Apache balancer cluster.
-* `apache::balancermember`: Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html).
-* `apache::listen`: Based on the title, controls which ports Apache binds to for listening. Adds [Listen](http://httpd.apache.org/docs/current/bind.html) directives to ports.conf in the Apache HTTPD configuration directory. Titles take the form '<port>', '<ipv4>:<port>', or '<ipv6>:<port>'.
-* `apache::mod`: Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class.
-* `apache::namevirtualhost`: Enables name-based hosting of a virtual host. Adds all [NameVirtualHost](http://httpd.apache.org/docs/current/vhosts/name-based.html) directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles take the form '\*', '*:<port>', '\_default_:<port>, '<ip>', or '<ip>:<port>'.
-* `apache::vhost`: Allows specialized configurations for virtual hosts that have requirements outside the defaults.
-
-####Private Defined Types
-
-* `apache::peruser::multiplexer`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
-* `apache::peruser::processor`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
-* `apache::security::file_link`: Links the activated_rules from apache::mod::security to the respective CRS rules on disk.
-
-###Templates
-
-The Apache module relies heavily on templates to enable the `vhost` and `apache::mod` defined types. These templates are built based on Facter facts around your operating system. Unless explicitly called out, most templates are not meant for configuration.
-
-##Limitations
-
-###Ubuntu 10.04
-
-The `apache::vhost::WSGIImportScript` parameter creates a statement inside the VirtualHost which is unsupported on older versions of Apache, causing this to fail.  This will be remedied in a future refactoring.
-
-###RHEL/CentOS 5
-
-The `apache::mod::passenger` and `apache::mod::proxy_html` classes are untested since repositories are missing compatible packages.
-
-###RHEL/CentOS 7
-
-The `apache::mod::passenger` class is untested as the repository does not have packages for EL7 yet.  The fact that passenger packages aren't available also makes us unable to test the `rack_base_uri` parameter in `apache::vhost`.
-
-###General
+~~~ puppet
+exec { 'set_apache_defaults':
+  command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"',
+  path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+  require => Package['policycoreutils-python'],
+}
 
-This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet.
+package { 'policycoreutils-python':
+  ensure => installed,
+}
 
-The module contains support for other distributions and operating systems, such as FreeBSD, Gentoo and Amazon Linux, but is not formally tested on those and regressions can occur.
+exec { 'restorecon_apache':
+  command => 'restorecon -Rv /apache_spec',
+  path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+  before  => Class['Apache::Service'],
+  require => Class['apache'],
+}
 
-###SELinux and Custom Paths
+class { 'apache': }
 
-If you are running with SELinux in enforcing mode and want to use custom paths for your `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you need to manage the context for the files yourself.
+host { 'test.server':
+  ip => '127.0.0.1',
+}
 
-Something along the lines of:
+file { '/custom/path':
+  ensure => directory,
+}
 
-```puppet
-        exec { 'set_apache_defaults':
-          command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package['policycoreutils-python'],
-        }
-        package { 'policycoreutils-python': ensure => installed }
-        exec { 'restorecon_apache':
-          command => 'restorecon -Rv /apache_spec',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Class['Apache::Service'],
-          require => Class['apache'],
-        }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        file { '/custom/path': ensure => directory, }
-        file { '/custom/path/include': ensure => present, content => '#additional_includes' }
-        apache::vhost { 'test.server':
-          docroot             => '/custom/path',
-          additional_includes => '/custom/path/include',
-        }
-```
+file { '/custom/path/include': 
+  ensure  => present, 
+  content => '#additional_includes',
+}
 
-You need to set the contexts using `semanage fcontext` not `chcon` because `file {...}` resources reset the context to the values in the database if the resource isn't specifying the context.
+apache::vhost { 'test.server':
+  docroot             => '/custom/path',
+  additional_includes => '/custom/path/include',
+}
+~~~
 
-###FreeBSD
+You need to set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
-In order to use this module on FreeBSD, you *must* use apache24-2.4.12 (www/apache24) or newer.
+### FreeBSD
 
-##Development
+In order to use this module on FreeBSD, you _must_ use apache24-2.4.12 (www/apache24) or newer.
 
-###Contributing
+## Development
 
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
+### Contributing
 
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+[Puppet Labs][] modules on the [Puppet Forge][] are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve.
 
-Read the complete module [contribution guide](https://docs.puppetlabs.com/forge/contributing.html)
+We want to make it as easy as possible to contribute changes so our modules work in your environment, but we also need contributors to follow a few guidelines to help us maintain and improve the modules' quality.
 
-###Running tests
+For more information, please read the complete [module contribution guide][].
 
-This project contains tests for both [rspec-puppet](http://rspec-puppet.com/) and [beaker-rspec](https://github.com/puppetlabs/beaker-rspec) to verify functionality. For in-depth information please see their respective documentation.
+### Running tests
 
-Quickstart:
+This project contains tests for both [rspec-puppet][] and [beaker-rspec][] to verify functionality. For detailed information on using these tools, please see their respective documentation.
 
-####Ruby > 1.8.7
+#### Testing quickstart: Ruby > 1.8.7
 
-```
-    gem install bundler
-    bundle install
-    bundle exec rake spec
-    bundle exec rspec spec/acceptance
-    RS_DEBUG=yes bundle exec rspec spec/acceptance
-```
+~~~
+gem install bundler
+bundle install
+bundle exec rake spec
+bundle exec rspec spec/acceptance
+RS_DEBUG=yes bundle exec rspec spec/acceptance
+~~~
 
-####Ruby = 1.8.7
+#### Testing quickstart: Ruby = 1.8.7
 
-```
-    gem install bundler
-    bundle install --without system_tests
-    bundle exec rake spec
-```
+~~~
+gem install bundler
+bundle install --without system_tests
+bundle exec rake spec
+~~~
diff --git a/README.passenger.md b/README.passenger.md
index 5b33d29096..7a2aada9b5 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -13,7 +13,7 @@ Also, general apache module loading parameters can be supplied to enable using
 a customized passenger module in place of a default-package-based version of
 the module.
 
-# Operating system support and Passenger versions
+## Operating system support and Passenger versions
 
 The most important configuration directive for the Apache Passenger module is
 `PassengerRoot`. Its value depends on the Passenger version used (2.x, 3.x or
@@ -35,7 +35,7 @@ RHEL with EPEL6  | 3.0.21             | /usr/lib/ruby/gems/1.8/gems/passenger-3.
 As mentioned in `README.md` there are no compatible packages available for
 RHEL/CentOS 5 or RHEL/CentOS 7.
 
-## Configuration files and locations on RHEL/CentOS
+### Configuration files and locations on RHEL/CentOS
 
 Notice two important points:
 
@@ -55,7 +55,7 @@ directives as described in the remainder of this document are placed in
 
 This pertains *only* to RHEL/CentOS, *not* Debian and Ubuntu.
 
-## Third-party and custom Passenger packages and versions
+### Third-party and custom Passenger packages and versions
 
 The Passenger version distributed by the default OS packages may be too old to
 be useful. Newer versions may be installed via Gems, from source or from
@@ -75,7 +75,7 @@ For Passenger 4.x packages on Debian and Ubuntu the `PassengerRoot` directive
 should almost universally be set to
 `/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini`.
 
-# Parameters for `apache::mod::passenger`
+## Parameters for `apache::mod::passenger`
 
 The following class parameters configure Passenger in a global, server-wide
 context.
@@ -95,12 +95,12 @@ class { 'apache::mod::passenger':
 The general form is using the all lower-case version of the configuration
 directive, with underscores instead of CamelCase.
 
-## Parameters used with passenger.conf
+### Parameters used with passenger.conf
 
 If you pass a default value to `apache::mod::passenger` it will be ignored and
 not passed through to the configuration file. 
 
-### passenger_root
+#### passenger_root
 
 The location to the Phusion Passenger root directory. This configuration option
 is essential to Phusion Passenger, and allows Phusion Passenger to locate its
@@ -112,7 +112,7 @@ information.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerroot_lt_directory_gt
 
-### passenger_default_ruby
+#### passenger_default_ruby
 
 This option specifies the default Ruby interpreter to use for web apps as well
 as for all sorts of internal Phusion Passenger helper scripts, e.g. the one
@@ -126,7 +126,7 @@ set to '/usr/bin/ruby'.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerDefaultRuby
 
-### passenger_ruby
+#### passenger_ruby
 
 This directive is the same as `passenger_default_ruby` for Passenger versions
 < 4.x and must be used instead of `passenger_default_ruby` for such versions.
@@ -141,28 +141,28 @@ Defaults to `/usr/bin/ruby` for all supported operating systems except Ubuntu
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerRuby
 
-### passenger_high_performance
+#### passenger_high_performance
 
 Default is `off`. When turned `on` Passenger runs in a higher performance mode
 that can be less compatible with other Apache modules.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerHighPerformance
 
-### passenger_max_pool_size
+#### passenger_max_pool_size
 
 Sets the maximum number of Passenger application processes that may
 simultaneously run. The default value is 6.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengermaxpoolsize_lt_integer_gt
 
-### passenger_pool_idle_time
+#### passenger_pool_idle_time
 
 The maximum number of seconds a Passenger Application process will be allowed
 to remain idle before being shut down. The default value is 300.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerPoolIdleTime
 
-### passenger_max_requests
+#### passenger_max_requests
 
 The maximum number of request a Passenger application will process before being
 restarted. The default value is 0, which indicates that a process will only
@@ -170,14 +170,14 @@ shut down if the Pool Idle Time (see above) expires.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
 
-### passenger_stat_throttle_rate
+#### passenger_stat_throttle_rate
 
 Sets how often Passenger performs file system checks, at most once every _x_
 seconds. Default is 0, which means the checks are performed with every request.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
 
-### rack_autodetect
+#### rack_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is
 a Rack application. Not set by default (`undef`). Note that this directive has
@@ -186,7 +186,7 @@ Use this directive only on Passenger < 4.x.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
 
-### rails_autodetect
+#### rails_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is
 a Rails application.  Not set by default (`undef`). Note that this directive
@@ -195,13 +195,13 @@ instead. Use this directive only on Passenger < 4.x.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_lt_on_off_gt
 
-### passenger_use_global_queue
+#### passenger_use_global_queue
 
 Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is
 the default in Passenger 4.x and the versions >= 4.x have disabled this
 configuration option altogether.  Use with caution.
 
-### passenger_app_env
+#### passenger_app_env
 
 Sets the global default `PassengerAppEnv` for Passenger applications. Not set by
 default (`undef`) and thus defaults to Passenger's built-in value of 'production'.
@@ -209,43 +209,43 @@ This directive can be overridden in an `apache::vhost` resource.
 
 https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppEnv
 
-## Parameters used to load the module
+### Parameters used to load the module
 
 Unlike the tuning parameters specified above, the following parameters are only
 used when loading customized passenger modules.
 
-### mod_package
+#### mod_package
 
 Allows overriding the default package name used for the passenger module
 package.
 
-### mod_package_ensure
+#### mod_package_ensure
 
 Allows overriding the package installation setting used by puppet when
 installing the passenger module. The default is 'present'.
 
-### mod_id
+#### mod_id
 
 Allows overriding the value used by apache to identify the passenger module.
 The default is 'passenger_module'.
 
-### mod_lib_path
+#### mod_lib_path
 
 Allows overriding the directory path used by apache when loading the passenger
 module. The default is the value of `$apache::params::lib_path`.
 
-### mod_lib
+#### mod_lib
 
 Allows overriding the library file name used by apache when loading the
 passenger module. The default is 'mod_passenger.so'.
 
-### mod_path
+#### mod_path
 
 Allows overriding the full path to the library file used by apache when loading
 the passenger module. The default is the concatenation of the `mod_lib_path`
 and `mod_lib` parameters.
 
-# Dependencies
+## Dependencies
 
 RedHat-based systems will need to configure additional package repositories in
 order to install Passenger, specifically:
@@ -256,7 +256,7 @@ order to install Passenger, specifically:
 Configuration of these repositories is beyond the scope of this module and is
 left to the user.
 
-# Attribution
+## Attribution
 
 The Passenger tuning parameters for the `apache::mod::passenger` Puppet class
 was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the
@@ -268,7 +268,7 @@ PuppetLabs Apache module on GitHub.
 * http://www.nesi.org.nz//
 * https://tuakiri.ac.nz/confluence/display/Tuakiri/Home
 
-# Copyright and License
+## Copyright and License
 
 Copyright (C) 2012 [Puppet Labs](https://www.puppetlabs.com/) Inc
 

From 62e1370fbfc9e7e0e1f8a2458b7f66102dcbf26c Mon Sep 17 00:00:00 2001
From: Garrett Guillotte <gguillotte@users.noreply.github.com>
Date: Fri, 31 Jul 2015 11:06:22 -0700
Subject: [PATCH 0669/2267] DOC-1493: Resolve broken links.

Corrects several broken markdown links.
---
 README.md | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index dd9851f96d..2e457ffb9b 100644
--- a/README.md
+++ b/README.md
@@ -43,15 +43,21 @@
 [`apache::fastcgi::server`]: #define-apachefastcgiserver
 [`apache::mod`]: #define-apachemod
 [`apache::mod::<MODULE NAME>`]: #classes-apachemodmodule-name
+[`apache::mod::alias`]: #class-apachemodalias
+[`apache::mod::auth_cas`]: #class-apachemodauth_cas
 [`apache::mod::event`]: #class-apachemodevent
+[`apache::mod::geoip`]: #class-apachemodgeoip
 [`apache::mod::itk`]: #class-apachemoditk
 [`apache::mod::passenger`]: #class-apachemodpassenger
 [`apache::mod::peruser`]: #class-apachemodperuser
 [`apache::mod::prefork`]: #class-apachemodprefork
 [`apache::mod::proxy_html`]: #class-apachemodproxy_html
 [`apache::mod::security`]: #class-apachemodsecurity
+[`apache::mod::shib`]: #class-apachemodshib
 [`apache::mod::ssl`]: #class-apachemodssl
+[`apache::mod::status`]: #class-apachemodstatus
 [`apache::mod::worker`]: #class-apachemodworker
+[`apache::mod::wsgi`]: #class-apachemodwsgi
 [`apache::params`]: #class-apacheparams
 [`apache::version`]: #class-apacheversion
 [`apache::vhost`]: #define-apachevhost
@@ -74,7 +80,9 @@
 [`default_ssl_crl`]: #default_ssl_crl
 [`default_ssl_crl_path`]: #default_ssl_crl_path
 [`default_ssl_vhost`]: #default_ssl_vhost
+[`dev_packages`]: #dev_packages
 [`directory`]: #directory
+[`directories`]: #parameter-directories-for-apachevhost
 [`DirectoryIndex`]: http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
 [`docroot`]: #docroot
 [`docroot_owner`]: #docroot_owner
@@ -192,7 +200,7 @@
 [`ServerSignature`]: http://httpd.apache.org/docs/current/mod/core.html#serversignature
 [Service attribute restart]: http://docs.puppetlabs.com/references/latest/type.html#service-attribute-restart
 [`source`]: #source
-[SSLCARevocationCheck]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck
+[`SSLCARevocationCheck`]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck
 [SSL certificate key file]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile
 [SSL chain]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatechainfile
 [SSL encryption]: https://httpd.apache.org/docs/current/ssl/index.html
@@ -829,7 +837,7 @@ While this default value results in a functioning Apache server, you **must** up
 
 ##### `default_ssl_crl_check`
 
-Sets the default certificate revocation check level via the [`SSLCARevocationCheck`] directive. Default: 'undef'.
+Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. Default: 'undef'.
 
 While this default value results in a functioning Apache server, you **must** specify this parameter when using certificate revocation lists in a production environment.
 
@@ -923,7 +931,7 @@ Limits the number of requests allowed per connection when the [`keepalive` param
 
 ##### `lib_path`
 
-Specifies the location where [Apache module][] files are stored. Default: Depends on the operating system.
+Specifies the location where [Apache module][Apache modules] files are stored. Default: Depends on the operating system.
 
 - **Debian** and **Gentoo**: `/usr/lib/apache2/modules`
 - **FreeBSD**: `/usr/local/libexec/apache24`
@@ -1132,7 +1140,7 @@ You might need to override this if you are using a non-standard Apache package,
 
 #### Class: `apache::dev`
 
-Installs Apache development libraries. By default, the package name is defined by the [`dev_packages`] parameter of the [`apache::params`] class based on your operating system:
+Installs Apache development libraries. By default, the package name is defined by the [`dev_packages`][] parameter of the [`apache::params`][] class based on your operating system:
 
 The default value is determined by your operating system:
 
@@ -1156,9 +1164,9 @@ class { 'apache::mod::alias':
 The following Apache modules have supported classes, many of which allow for parameterized configuration. You can install other Apache modules with the [`apache::mod`][] define.
 
 * `actions`
-* `alias` (see [`apache::mod::alias`](#class-apachemodalias))
+* `alias` (see [`apache::mod::alias`][])
 * `auth_basic`
-* `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas))
+* `auth_cas`* (see [`apache::mod::auth_cas`][])
 * `auth_kerb`
 * `authn_core`
 * `authn_file`
@@ -1176,7 +1184,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `dev`
 * `dir`*
 * `disk_cache`
-* `event` (see [`apache::mod::event`](#class-apachemodevent))
+* `event` (see [`apache::mod::event`][])
 * `expires`
 * `fastcgi`
 * `fcgid`
@@ -1191,11 +1199,11 @@ The following Apache modules have supported classes, many of which allow for par
 * `mime_magic`*
 * `negotiation`
 * `nss`*
-* `pagespeed` (see [`apache::mod::pagespeed`](#class-apachemodpagespeed))
+* `pagespeed` (see [`apache::mod::pagespeed`][])
 * `passenger`*
 * `perl`
 * `peruser`
-* `php` (requires [`mpm_module`](#mpm_module) set to `prefork`)
+* `php` (requires [`mpm_module`][] set to `prefork`)
 * `prefork`*
 * `proxy`*
 * `proxy_ajp`
@@ -1209,16 +1217,16 @@ The following Apache modules have supported classes, many of which allow for par
 * `rpaf`*
 * `setenvif`
 * `security`
-* `shib`* (see [`apache::mod::shib`](#class-apachemodshib))
+* `shib`* (see [`apache::mod::shib`])
 * `speling`
-* `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl))
-* `status`* (see [`apache::mod::status`](#class-apachemodstatus))
+* `ssl`* (see [`apache::mod::ssl`][])
+* `status`* (see [`apache::mod::status`][])
 * `suphp`
 * `userdir`*
 * `version`
 * `vhost_alias`
 * `worker`*
-* `wsgi` (see [`apache::mod::wsgi`](#class-apachemodwsgi))
+* `wsgi` (see [`apache::mod::wsgi`][])
 * `xsendfile`
 
 Modules noted with a * indicate that the module has settings and a template that includes parameters to configure the module. Most Apache module class parameters have default values and don't require configuration. For modules with templates, Puppet installs template files with the module; these template files are required for the module to work.
@@ -1968,15 +1976,17 @@ This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
 ##### `proxy_preserve_host`
 
-Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypreservehost).  true Enables the Host: line from an incoming request to be proxied to the host instead of hostname .  false sets this option to off (default).
+Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). Valid options: Boolean. Default: 'false'. 
+
+Setting this parameter to 'true' enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. 'false' sets this option to 'Off'.
 
 ##### `proxy_error_override`
 
-Sets the [ProxyErrorOverride Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxyerroroverride). This directive controls whether apache should override error pages for proxied content. This option is off by default.
+Sets the [ProxyErrorOverride Directive](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether apache should override error pages for proxied content. This option is off by default.
 
 ##### `options`
 
-Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. Defaults to '['Indexes','FollowSymLinks','MultiViews']', as demonstrated below:
+Sets the [`Options`][] for the specified virtual host. Default: ['Indexes','FollowSymLinks','MultiViews'], as demonstrated below:
 
 ~~~ puppet
     apache::vhost { 'site.name.fdqn':
@@ -1985,7 +1995,7 @@ Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) f
     }
 ~~~
 
-*Note:* If you use [`directories`](#parameter-directories-for-apachevhost), 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
+**Note**: If you use the [`directories`][] parameter of [`apache::vhost`][], 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
 ##### `override`
 
@@ -2983,7 +2993,7 @@ The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are u
 
 ### RHEL/CentOS 7
 
-The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] define's [`rack_base_uri`][] parameter.
+The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] define's [`rack_base_uris`][] parameter.
 
 ### General
 

From 2d4723f42a9f132c6c43c0c62dbb50fb3d6e5112 Mon Sep 17 00:00:00 2001
From: "Jacob A. Ela" <ela@pediatrics.wisc.edu>
Date: Wed, 13 May 2015 08:33:35 -0500
Subject: [PATCH 0670/2267] mod_passenger: allow setting PassengerSpawnMethod

---
 README.passenger.md                |  9 +++++++++
 manifests/mod/passenger.pp         |  7 +++++++
 spec/classes/mod/passenger_spec.rb | 12 ++++++++++++
 templates/mod/passenger.conf.erb   |  3 +++
 4 files changed, 31 insertions(+)

diff --git a/README.passenger.md b/README.passenger.md
index 7a2aada9b5..d50b3f4897 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -170,6 +170,15 @@ shut down if the Pool Idle Time (see above) expires.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
 
+#### passenger_spawn_method
+
+Sets the method by which Ruby application processes are spawned.  Default is `smart`
+which caches code using the app preloader.
+
+Passenger >= 4.0 renamed `conservative` to `direct` and `smart-lv2` to `smart`.
+
+https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerSpawnMethod
+
 #### passenger_stat_throttle_rate
 
 Sets how often Passenger performs file system checks, at most once every _x_
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 03cce4d892..efd3486896 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -4,6 +4,7 @@
   $passenger_high_performance     = undef,
   $passenger_pool_idle_time       = undef,
   $passenger_max_requests         = undef,
+  $passenger_spawn_method         = undef,
   $passenger_stat_throttle_rate   = undef,
   $rack_autodetect                = undef,
   $rails_autodetect               = undef,
@@ -21,6 +22,11 @@
   $mod_id                         = undef,
   $mod_path                       = undef,
 ) {
+
+  if $passenger_spawn_method {
+    validate_re($passenger_spawn_method, '(^smart$|^direct$|^smart-lv2$|^conservative$)', "${passenger_spawn_method} is not permitted for passenger_spawn_method. Allowed values are 'smart', 'direct', 'smart-lv2', or 'conservative'.")
+  }
+
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
     file { 'passenger_package.conf':
@@ -61,6 +67,7 @@
   # - $passenger_min_instances
   # - $passenger_high_performance
   # - $passenger_max_requests
+  # - $passenger_spawn_method
   # - $passenger_stat_throttle_rate
   # - $passenger_use_global_queue
   # - $passenger_app_env
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 07ce358fe2..40ac749f6a 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -64,6 +64,18 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxRequests 20$/) }
     end
+    describe "with passenger_spawn_method => bogus" do
+      let :params do
+        { :passenger_spawn_method => 'bogus' }
+      end
+      it { is_expected.to raise_error(Puppet::Error, /not permitted for passenger_spawn_method/) }
+    end
+    describe "with passenger_spawn_method => direct" do
+      let :params do
+        { :passenger_spawn_method => 'direct' }
+      end
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerSpawnMethod direct$/) }
+    end
     describe "with passenger_stat_throttle_rate => 10" do
       let :params do
         { :passenger_stat_throttle_rate => 10 }
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index e50a2d636c..1af4eaaa4b 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -25,6 +25,9 @@
   <%- if @passenger_max_requests -%>
   PassengerMaxRequests <%= @passenger_max_requests %>
   <%- end -%>
+  <%- if @passenger_spawn_method -%>
+  PassengerSpawnMethod <%= @passenger_spawn_method %>
+  <%- end -%>
   <%- if @passenger_stat_throttle_rate -%>
   PassengerStatThrottleRate <%= @passenger_stat_throttle_rate %>
   <%- end -%>

From eb022c68b35d42ca145973d846e3ff8ec8fc10b5 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 6 Aug 2015 10:52:01 -0700
Subject: [PATCH 0671/2267] Update README.md

Closes #1172
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2e457ffb9b..802b21f3e8 100644
--- a/README.md
+++ b/README.md
@@ -780,7 +780,7 @@ Sets the location of the Apache server's custom configuration directory. Default
 - **Debian**: `/etc/apache2/conf.d`
 - **FreeBSD**: `/usr/local/etc/apache22`
 - **Gentoo**: `/etc/apache2/conf.d`
-- **Red Hat**: `/etc/httpd/conf`
+- **Red Hat**: `/etc/httpd/conf.d`
 
 ##### `default_charset`
 
@@ -1111,7 +1111,7 @@ Changes your virtual host configuration files' location. Default: determined by
 - **Debian**: `/etc/apache2/sites-available`
 - **FreeBSD**: `/usr/local/etc/apache22/Vhosts`
 - **Gentoo**: `/etc/apache2/vhosts.d`
-- **Red Hat**: `etc/httpd/conf.d`
+- **Red Hat**: `/etc/httpd/conf.d`
 
 ##### `user`
 

From e504da604dca75fc584c96c1359c8aa79d1daf9f Mon Sep 17 00:00:00 2001
From: Phil Fenstermacher <phillip.fenstermacher@gmail.com>
Date: Mon, 6 Jul 2015 22:40:39 -0400
Subject: [PATCH 0672/2267] mod::alias should be included when the aliases
 parameter is used (even without scriptaliases)

---
 manifests/vhost.pp         |  2 +-
 spec/defines/vhost_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index af48d2f3f0..0fb37851c1 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -363,7 +363,7 @@
   }
 
   # Load mod_alias if needed and not yet loaded
-  if ($scriptalias or $scriptaliases != []) or ($redirect_source and $redirect_dest) {
+  if ($scriptalias and $scriptaliases != []) or ($aliases and $aliases != []) or ($redirect_source and $redirect_dest) {
     if ! defined(Class['apache::mod::alias'])  and ($ensure == 'present') {
       include ::apache::mod::alias
     }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index dac685eb95..cb8c9e84bb 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -427,6 +427,20 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
+    context 'set only aliases' do
+      let :params do
+        {
+          'docroot' => '/rspec/docroot',
+          'aliases' => [
+            {
+              'alias' => '/alias',
+              'path'  => '/rspec/docroot',
+            },
+          ]
+        }
+      end
+      it { is_expected.to contain_class('apache::mod::alias')}
+    end
     context 'proxy_pass_match' do
       let :params do
         {

From 7e4c6bc55043506140c950876f53299fb324d0b0 Mon Sep 17 00:00:00 2001
From: Jamie Cressey <jamie.cressey@gamesparks.com>
Date: Wed, 24 Jun 2015 11:17:20 +0100
Subject: [PATCH 0673/2267] Adding support to mod_disk_cache for >= 2.4

Adding support to mod_disk_cache for >= 2.4
---
 README.md                         |  14 +++-
 manifests/mod/disk_cache.pp       |  41 ++++++-----
 spec/classes/mod/disk_cache.rb    | 111 ++++++++++++++++++++++++++++++
 templates/mod/disk_cache.conf.erb |  12 ++--
 4 files changed, 153 insertions(+), 25 deletions(-)
 create mode 100644 spec/classes/mod/disk_cache.rb

diff --git a/README.md b/README.md
index 802b21f3e8..c1909782c6 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@
 [`apache::mod::<MODULE NAME>`]: #classes-apachemodmodule-name
 [`apache::mod::alias`]: #class-apachemodalias
 [`apache::mod::auth_cas`]: #class-apachemodauth_cas
+[`apache::mod::disk_cache`]: #class-apachemoddisk_cache
 [`apache::mod::event`]: #class-apachemodevent
 [`apache::mod::geoip`]: #class-apachemodgeoip
 [`apache::mod::itk`]: #class-apachemoditk
@@ -1183,7 +1184,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `deflate`
 * `dev`
 * `dir`*
-* `disk_cache`
+* `disk_cache` (see [`apache::mod::disk_cache`][])
 * `event` (see [`apache::mod::event`][])
 * `expires`
 * `fastcgi`
@@ -1245,6 +1246,17 @@ Installs and manages [`mod_alias`][].
 - **Gentoo**: `/var/www/icons`
 - **Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
 
+####Class: `apache::mod::disk_cache`
+
+Installs and configures mod_disk_cache. The cache root is determined based on apache version and OS. It can be specified directly as well.
+
+Specifying the cache root:
+```puppet
+  class {'::apache::mod::disk_cache':
+    cache_root => '/path/to/cache',
+  }
+```
+
 ##### Class: `apache::mod::event`
 
 Installs and manages [`mod_mpm_event`][]. You can't include both `apache::mod::event` and [`apache::mod::itk`][], [`apache::mod::peruser`][], [`apache::mod::prefork`][], or [`apache::mod::worker`][] on the same server.
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 2b9d8a9101..2f0a476fa4 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -1,25 +1,34 @@
-class apache::mod::disk_cache {
-  $cache_root = $::osfamily ? {
-    'debian'  => '/var/cache/apache2/mod_disk_cache',
-    'redhat'  => '/var/cache/mod_proxy',
-    'freebsd' => '/var/cache/mod_disk_cache',
-    'gentoo'  => '/var/cache/apache2/mod_disk_cache',
+class apache::mod::disk_cache (
+  $cache_root = undef,
+) {
+  if $cache_root {
+    $_cache_root = $cache_root
   }
-
-  $mod_name = $::osfamily ? {
-    'FreeBSD' => 'cache_disk',
-    default   => 'disk_cache',
+  elsif versioncmp($::apache::apache_version, '2.4') >= 0 {
+    $_cache_root = $::osfamily ? {
+      'debian'  => '/var/cache/apache2/mod_cache_disk',
+      'redhat'  => '/var/cache/httpd/proxy',
+      'freebsd' => '/var/cache/mod_cache_disk',
+    }
+  }
+  else {
+    $_cache_root = $::osfamily ? {
+      'debian'  => '/var/cache/apache2/mod_disk_cache',
+      'redhat'  => '/var/cache/mod_proxy',
+      'freebsd' => '/var/cache/mod_disk_cache',
+    }
   }
 
-  if $::osfamily != 'FreeBSD' {
-    # FIXME: investigate why disk_cache was dependent on proxy
-    # NOTE: on FreeBSD disk_cache is compiled by default but proxy is not
-    Class['::apache::mod::proxy'] -> Class['::apache::mod::disk_cache']
+  if versioncmp($::apache::apache_version, '2.4') >= 0 {
+    apache::mod { 'cache_disk': }
   }
+  else {
+    apache::mod { 'disk_cache': }
+  }
+
   Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache']
 
-  apache::mod { $mod_name: }
-  # Template uses $cache_proxy
+  # Template uses $_cache_root
   file { 'disk_cache.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/disk_cache.conf",
diff --git a/spec/classes/mod/disk_cache.rb b/spec/classes/mod/disk_cache.rb
new file mode 100644
index 0000000000..263b4cac64
--- /dev/null
+++ b/spec/classes/mod/disk_cache.rb
@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe 'apache::mod::disk_cache', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+  context "on a Debian OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :lsbdistcodename        => 'squeeze',
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => '2.2',
+        }
+      end
+
+      it { is_expected.to contain_apache__mod("disk_cache") }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+    end
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => '2.4',
+        }
+      end
+
+      it { is_expected.to contain_apache__mod("cache_disk") }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+    end
+  end
+
+  context "on a RedHat 6-based OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '6',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => '2.2',
+        }
+      end
+
+      it { is_expected.to contain_apache__mod("disk_cache") }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+    end
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => '2.4',
+        }
+      end
+
+      it { is_expected.to contain_apache__mod("cache_disk") }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+    end
+  end
+  context "on a FreeBSD OS", :compile do
+    let :facts do
+      {
+        :id                     => 'root',
+        :kernel                 => 'FreeBSD',
+        :osfamily               => 'FreeBSD',
+        :operatingsystem        => 'FreeBSD',
+        :operatingsystemrelease => '10',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :concat_basedir         => '/dne',
+        :is_pe                  => false,
+      }
+    end
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => '2.2',
+        }
+      end
+
+      it { is_expected.to contain_apache__mod("disk_cache") }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+    end
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => '2.4',
+        }
+      end
+
+      it { is_expected.to contain_apache__mod("cache_disk") }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+    end
+  end
+end
diff --git a/templates/mod/disk_cache.conf.erb b/templates/mod/disk_cache.conf.erb
index 0c7e2c4b73..b1b460e522 100644
--- a/templates/mod/disk_cache.conf.erb
+++ b/templates/mod/disk_cache.conf.erb
@@ -1,8 +1,4 @@
-<IfModule mod_proxy.c>
-  <IfModule mod_disk_cache.c>
-     CacheEnable disk /
-     CacheRoot "<%= @cache_root %>"
-     CacheDirLevels 2
-     CacheDirLength 1
-  </IfModule>
-</IfModule>
+CacheEnable disk /
+CacheRoot "<%= @_cache_root %>"
+CacheDirLevels 2
+CacheDirLength 1

From 1bf0aba5f6c457149786878afaba525bec940118 Mon Sep 17 00:00:00 2001
From: Seth Lyons <seth.lyons@gmail.com>
Date: Sun, 9 Aug 2015 20:23:21 -0400
Subject: [PATCH 0674/2267] load unixd before fcgid on all operating systems
 (see #879)

---
 manifests/mod/fcgid.pp                        | 13 +++------
 spec/classes/mod/fcgid_spec.rb                | 27 ++++++++++++-------
 .../{fcgid.conf.erb => unixd_fcgid.conf.erb}  |  0
 3 files changed, 21 insertions(+), 19 deletions(-)
 rename templates/mod/{fcgid.conf.erb => unixd_fcgid.conf.erb} (100%)

diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index a143c2b434..9786670338 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,22 +1,17 @@
 class apache::mod::fcgid(
   $options = {},
 ) {
-  if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
-    $loadfile_name = 'unixd_fcgid.load'
-  } else {
-    $loadfile_name = undef
-  }
 
   ::apache::mod { 'fcgid':
-    loadfile_name => $loadfile_name
+    loadfile_name => 'unixd_fcgid.load',
   }
 
   # Template uses:
   # - $options
-  file { 'fcgid.conf':
+  file { 'unixd_fcgid.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/fcgid.conf",
-    content => template('apache/mod/fcgid.conf.erb'),
+    path    => "${::apache::mod_dir}/unixd_fcgid.conf",
+    content => template('apache/mod/unixd_fcgid.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 096717d351..98953625ac 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -21,7 +21,9 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('fcgid') }
+    it { is_expected.to contain_apache__mod('fcgid').with({
+      'loadfile_name' => 'unixd_fcgid.load'
+    }) }
     it { is_expected.to contain_package("libapache2-mod-fcgid") }
   end
 
@@ -36,13 +38,15 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        :is_pe                     => false,
       }
     end
 
     describe 'without parameters' do
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod('fcgid') }
+      it { is_expected.to contain_apache__mod('fcgid').with({
+        'loadfile_name' => 'unixd_fcgid.load'
+      }) }
       it { is_expected.to contain_package("mod_fcgid") }
     end
 
@@ -57,7 +61,7 @@
       } end
 
       it 'should contain the correct config' do
-        content = catalogue.resource('file', 'fcgid.conf').send(:parameters)[:content]
+        content = catalogue.resource('file', 'unixd_fcgid.conf').send(:parameters)[:content]
         expect(content.split("\n").reject { |c| c =~ /(^#|^$)/ }).to eq([
           '<IfModule mod_fcgid.c>',
           '  AddHandler fcgid-script .fcgi',
@@ -89,8 +93,7 @@
       it { is_expected.to contain_class("apache::params") }
       it { is_expected.to contain_apache__mod('fcgid').with({
         'loadfile_name' => 'unixd_fcgid.load'
-      })
-      }
+      }) }
       it { is_expected.to contain_package("mod_fcgid") }
     end
   end
@@ -99,8 +102,8 @@
     let :facts do
       {
         :osfamily                  => 'FreeBSD',
-        :operatingsystemrelease    => '9',
-        :operatingsystemmajrelease => '9',
+        :operatingsystemrelease    => '10',
+        :operatingsystemmajrelease => '10',
         :concat_basedir            => '/dne',
         :operatingsystem           => 'FreeBSD',
         :id                        => 'root',
@@ -111,7 +114,9 @@
     end
 
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('fcgid') }
+    it { is_expected.to contain_apache__mod('fcgid').with({
+      'loadfile_name' => 'unixd_fcgid.load'
+    }) }
     it { is_expected.to contain_package("www/mod_fcgid") }
   end
 
@@ -130,7 +135,9 @@
     end
 
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('fcgid') }
+    it { is_expected.to contain_apache__mod('fcgid').with({
+      'loadfile_name' => 'unixd_fcgid.load'
+    }) }
     it { is_expected.to contain_package("www-apache/mod_fcgid") }
   end
 end
diff --git a/templates/mod/fcgid.conf.erb b/templates/mod/unixd_fcgid.conf.erb
similarity index 100%
rename from templates/mod/fcgid.conf.erb
rename to templates/mod/unixd_fcgid.conf.erb

From 3ff15a5e7e3fc3cc9adb7efd23c89169adde8a07 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 12 Aug 2015 15:53:43 -0700
Subject: [PATCH 0675/2267] fixes conditional in vhost aliases

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0fb37851c1..20b1aa6b91 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -363,7 +363,7 @@
   }
 
   # Load mod_alias if needed and not yet loaded
-  if ($scriptalias and $scriptaliases != []) or ($aliases and $aliases != []) or ($redirect_source and $redirect_dest) {
+  if ($scriptalias or $scriptaliases != []) or ($aliases and $aliases != []) or ($redirect_source and $redirect_dest) {
     if ! defined(Class['apache::mod::alias'])  and ($ensure == 'present') {
       include ::apache::mod::alias
     }

From cd1102bb20bc6ed876994986f28931248fa200dd Mon Sep 17 00:00:00 2001
From: Vamegh Hedayati <vhedayati@ev9.io>
Date: Wed, 22 Jul 2015 11:49:47 +0100
Subject: [PATCH 0676/2267] Add support for user modifiable installation of
 mod_systemd and pidfile locations.

default_mods.pp --> added use_systemd option, if running a custom build of apache on
                    centos7, user modifiable boolean option provided

init.pp --> added pidfile and use_systemd option both of which go to params.pp and allow
            these values to be set in hiera. changed all osfamily choices for conf_dir
            removed setting the $pidfile variable (now done in params).

params.pp --> added $use_systemd, by default set to true to mimic original behaviour.
              added $pidfile, set to mimic exact same behaviour as used in init.pp,
              except now user changeable via hiera.

updated documentation, to include the 2 new options.
---
 README.md                 | 64 ++++++++++++++++++++++-----------------
 manifests/default_mods.pp |  7 +++--
 manifests/init.pp         |  7 ++---
 manifests/params.pp       |  7 +++++
 4 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index c1909782c6..769b937b8d 100644
--- a/README.md
+++ b/README.md
@@ -448,7 +448,7 @@ apache::vhost { 'suphp.example.com':
   suphp_configpath => '/etc/php5/apache2',
   directories      => [
     { 'path'  => '/home/appuser/myphpapp',
-      'suphp' => { 
+      'suphp' => {
         user  => 'myappuser',
         group => 'myappgroup',
       },
@@ -620,7 +620,7 @@ Note that some modules have prerequisites, which are documented in their referen
 
 #### Installing arbitrary modules
 
-You can pass the name of any module that your operating system's package manager can install to the [`apache::mod`][] define to install it. Unlike the specific-module classes, the [`apache::mod`][] define doesn't tailor the installation based on other installed modules or with specific parameters---Puppet only grabs and installs the module's package, leaving detailed configuration up to you. 
+You can pass the name of any module that your operating system's package manager can install to the [`apache::mod`][] define to install it. Unlike the specific-module classes, the [`apache::mod`][] define doesn't tailor the installation based on other installed modules or with specific parameters---Puppet only grabs and installs the module's package, leaving detailed configuration up to you.
 
 For example, to install the [`mod_authnz_external`][] Apache module, declare the define with the 'mod_authnz_external' name:
 
@@ -795,7 +795,7 @@ Determines whether Puppet generates a default set of includable Apache configura
 
 Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: 'true', 'false', or an array of Apache module names. Default: 'true'.
 
-If this parameter's value is 'false', Puppet only includes the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] define. 
+If this parameter's value is 'false', Puppet only includes the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] define.
 
 If 'true', Puppet installs additional modules, the list of which depends on the operating system as well as the [`apache_version`][] and [`mpm_module`][] parameters' values. As these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
 
@@ -803,7 +803,7 @@ If this parameter contains an array, Puppet instead enables all passed Apache mo
 
 ##### `default_ssl_ca`
 
-Sets the default certificate authority for the Apache server. Default: 'undef'. 
+Sets the default certificate authority for the Apache server. Default: 'undef'.
 
 While this default value results in a functioning Apache server, you **must** update this parameter with your certificate authority information before deploying this server in a production environment.
 
@@ -820,7 +820,7 @@ While the default value results in a functioning Apache server, you **must** upd
 
 ##### `default_ssl_chain`
 
-Sets the default [SSL chain][] location. Default: 'undef'. 
+Sets the default [SSL chain][] location. Default: 'undef'.
 
 While this default value results in a functioning Apache server, you **must** update this parameter with your SSL chain before deploying this server in a production environment.
 
@@ -832,7 +832,7 @@ While this default value results in a functioning Apache server, you **must** up
 
 ##### `default_ssl_crl_path`
 
-Sets the server's [certificate revocation list path][], which contains your CRLs. Default: 'undef'. 
+Sets the server's [certificate revocation list path][], which contains your CRLs. Default: 'undef'.
 
 While this default value results in a functioning Apache server, you **must** update this parameter with the CRL path before deploying this server in a production environment.
 
@@ -857,7 +857,7 @@ While these default values result in a functioning Apache server, you **must** u
 
 ##### `default_ssl_vhost`
 
-Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean. Default: 'false'. 
+Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean. Default: 'false'.
 
 If 'true', Puppet automatically configures the following virtual host using the [`apache::vhost`][] define:
 
@@ -880,7 +880,7 @@ _Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot ot
 
 ##### `default_vhost`
 
-Configures a default virtual host when the class is declared. Valid options: Boolean. Default: 'true'. 
+Configures a default virtual host when the class is declared. Valid options: Boolean. Default: 'true'.
 
 To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to 'false'.
 
@@ -899,7 +899,7 @@ Determines whether to enable [custom error documents][] on the Apache server. Va
 
 ##### `group`
 
-Sets the group ID that owns any Apache processes spawned to answer requests. 
+Sets the group ID that owns any Apache processes spawned to answer requests.
 
 By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To to prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to 'false'.
 
@@ -922,7 +922,7 @@ If 'On', use the [`keepalive_timeout`][] and [`max_keepalive_requests`][] parame
 
 ##### `keepalive_timeout`
 
-Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. Default: '15'. 
+Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. Default: '15'.
 
 This parameter is only relevant if the [`keepalive` parameter][] is enabled.
 
@@ -942,7 +942,7 @@ Specifies the location where [Apache module][Apache modules] files are stored. D
 
 ##### `loadfile_name`
 
-Sets the [`LoadFile`] directive's filename. Valid options: Filenames in the format `\*.load`. 
+Sets the [`LoadFile`] directive's filename. Valid options: Filenames in the format `\*.load`.
 
 This can be used to set the module load order.
 
@@ -980,13 +980,13 @@ Changes the directory of Apache log files for the virtual host. Default: Determi
 
 ##### `logroot_mode`
 
-Overrides the default [`logroot`][] directory's mode. Default: 'undef'. 
+Overrides the default [`logroot`][] directory's mode. Default: 'undef'.
 
 **Note**: Do _not_ grant write access to the directory where the logs are stored without being aware of the consequences. See the [Apache documentation][Log security] for details.
 
 ##### `manage_group`
 
-When 'false', stops Puppet from creating the group resource. Valid options: Boolean. Default: 'true'. 
+When 'false', stops Puppet from creating the group resource. Valid options: Boolean. Default: 'true'.
 
 If you have a group created from another Puppet module that you want to use to run Apache, set this to 'false'. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
 
@@ -1026,13 +1026,17 @@ You must set this to 'false' to explicitly declare the following classes with cu
 
 Controls the `package` resource's [`ensure`][] attribute. Valid options: 'absent', 'installed' (or the equivalent 'present'), or a version string. Default: 'installed'.
 
+##### `pidfile`
+
+Allows settting a custom location for the pid file - useful if using a custom built Apache rpm. Defaults to 'run/httpd.pid' on RedHat, '/var/run/httpd.pid on FreeBSD and '\${APACHE_PID_FILE}' on Debian.
+
 ##### `ports_file`
 
 Sets the path to the file containing Apache ports configuration. Default: `{$conf_dir}/ports.conf`.
 
 ##### `purge_configs`
 
-Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: 'true'. 
+Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: 'true'.
 
 Setting this to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_configs`][].
 
@@ -1079,7 +1083,7 @@ Determines whether Puppet enables the Apache HTTPD service when the system is bo
 
 Determines whether Puppet should make sure the service is running. Valid options: 'true' (equivalent to 'running'), 'false' (equivalent to 'stopped'). Default: 'running'.
 
-The 'false' or 'stopped' values set the 'httpd' service resource's `ensure` parameter to 'false', which is useful when you want to let the service be managed by another application, such as Pacemaker. 
+The 'false' or 'stopped' values set the 'httpd' service resource's `ensure` parameter to 'false', which is useful when you want to let the service be managed by another application, such as Pacemaker.
 
 ##### `service_name`
 
@@ -1105,6 +1109,10 @@ Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apach
 
 Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceEnable`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
 
+##### `use_systemd`
+
+Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom built rpms. This can either be 'true' or 'false, defaults to 'true'.
+
 ##### `vhost_dir`
 
 Changes your virtual host configuration files' location. Default: determined by your operating system.
@@ -1116,7 +1124,7 @@ Changes your virtual host configuration files' location. Default: determined by
 
 ##### `user`
 
-Changes the user Apache uses to answer requests. Apache's parent process will continue to be run as root, but child processes will access resources as the user defined by this parameter. 
+Changes the user Apache uses to answer requests. Apache's parent process will continue to be run as root, but child processes will access resources as the user defined by this parameter.
 
 Default: Puppet sets the default value via the [`apache::params`][] class, which manages the user based on your operating system:
 
@@ -1146,7 +1154,7 @@ Installs Apache development libraries. By default, the package name is defined b
 The default value is determined by your operating system:
 
 - **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions
-- **FreeBSD**: 'undef'; see note below 
+- **FreeBSD**: 'undef'; see note below
 - **Gentoo**: 'undef'
 - **Red Hat**: 'httpd-devel'
 
@@ -1428,7 +1436,7 @@ The class's parameters correspond to the module's directives. See the [module's
 
 ##### Class: `apache::mod::php`
 
-Installs and configures [`mod_php`][]. 
+Installs and configures [`mod_php`][].
 
 **Parameters within `apache::mod::php`**:
 
@@ -1438,7 +1446,7 @@ Default values depend on your operating system.
 
 - `package_name`: Names the package that installs `php_mod`.
 - `path`: Defines the path to the `mod_php` shared object (`.so`) file.
-- `source`: Defines the path to the default configuration. Valid options include a `puppet:///` paths. 
+- `source`: Defines the path to the default configuration. Valid options include a `puppet:///` paths.
 - `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
 - `content`: Adds arbitrary content to `php.conf`.
 
@@ -1458,7 +1466,7 @@ Defining this class enables Shibboleth-specific parameters in `apache::vhost` in
 
 ##### Class: `apache::mod::ssl`
 
-Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration. 
+Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration.
 
 **Parameters within `apache::mod::ssl`**:
 
@@ -1619,7 +1627,7 @@ Sets the configuration file's content. The `content` and [`source`][] parameters
 
 ##### `priority`
 
-Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. The default value is `25`. 
+Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. The default value is `25`.
 
 To omit the priority prefix in the configuration file's name, set this parameter to `false`.
 
@@ -1675,7 +1683,7 @@ Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directo
 
 Installs packages for an Apache module that doesn't have a corresponding [`apache::mod::<MODULE NAME>`][] class, and checks for or places the module's default configuration files in the Apache server's `module` and `enable` directories. The default locations depend on your operating system.
 
-**Parameters within `apache::mod`**: 
+**Parameters within `apache::mod`**:
 
 ##### `package`
 
@@ -1691,7 +1699,7 @@ Defines the module's shared object name. Its default value is `mod_$name.so`, an
 
 ##### `lib_path`
 
-Specifies a path to the module's libraries. Default: the `apache` class's [`lib_path`][] parameter. 
+Specifies a path to the module's libraries. Default: the `apache` class's [`lib_path`][] parameter.
 
 Don't manually set this parameter without special reason. The [`path`][] parameter overrides this value.
 
@@ -1717,7 +1725,7 @@ The Apache module allows a lot of flexibility in the setup and configuration of
 
 The `apache::vhost` define allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default virtual host within the base `::apache` class, as well as set a customized virtual host as the default. Customized virtual hosts have a lower numeric [`priority`][] than the base class's, causing Apache to process the customized virtual host first.
 
-The `apache::vhost` define uses `concat::fragment` to build the configuration file. To inject custom fragments for pieces of the configuration that the define doesn't inherently support, add a custom fragment. 
+The `apache::vhost` define uses `concat::fragment` to build the configuration file. To inject custom fragments for pieces of the configuration that the define doesn't inherently support, add a custom fragment.
 
 For the custom fragment's `order` parameter, the `apache::vhost` define uses multiples of 10, so any `order` that isn't a multiple of 10 should work.
 
@@ -1799,7 +1807,7 @@ If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is 'tru
 
 ##### `allow_encoded_slashes`
 
-Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Valid options: 'nodecode', 'off', 'on'. Default: undef, which omits the declaration from the server configuration and selects the Apache default setting of `Off`. 
+Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Valid options: 'nodecode', 'off', 'on'. Default: undef, which omits the declaration from the server configuration and selects the Apache default setting of `Off`.
 
 ##### `block`
 
@@ -1988,7 +1996,7 @@ This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
 ##### `proxy_preserve_host`
 
-Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). Valid options: Boolean. Default: 'false'. 
+Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). Valid options: Boolean. Default: 'false'.
 
 Setting this parameter to 'true' enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. 'false' sets this option to 'Off'.
 
@@ -3052,8 +3060,8 @@ file { '/custom/path':
   ensure => directory,
 }
 
-file { '/custom/path/include': 
-  ensure  => present, 
+file { '/custom/path/include':
+  ensure  => present,
   content => '#additional_includes',
 }
 
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 9e3c2c69a7..1c3820bf09 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -1,7 +1,8 @@
 class apache::default_mods (
   $all            = true,
   $mods           = undef,
-  $apache_version = $::apache::apache_version
+  $apache_version = $::apache::apache_version,
+  $use_systemd    = $::apache::use_systemd,
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
@@ -13,7 +14,9 @@
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
         if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon') ) {
-          ::apache::mod { 'systemd': }
+          if ($use_systemd) {
+            ::apache::mod { 'systemd': }
+          }
         }
         ::apache::mod { 'unixd': }
       }
diff --git a/manifests/init.pp b/manifests/init.pp
index 9e6da98138..5f02bfd61f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -52,6 +52,7 @@
   $lib_path               = $::apache::params::lib_path,
   $conf_template          = $::apache::params::conf_template,
   $servername             = $::apache::params::servername,
+  $pidfile                = $::apache::params::pidfile,
   $manage_user            = true,
   $manage_group           = true,
   $user                   = $::apache::params::user,
@@ -72,6 +73,7 @@
   $allow_encoded_slashes  = undef,
   $package_ensure         = 'installed',
   $use_optional_includes  = $::apache::params::use_optional_includes,
+  $use_systemd            = $::apache::params::use_systemd,
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
@@ -247,24 +249,20 @@
   if $::apache::conf_dir and $::apache::params::conf_file {
     case $::osfamily {
       'debian': {
-        $pidfile              = "\${APACHE_PID_FILE}"
         $error_log            = 'error.log'
         $scriptalias          = '/usr/lib/cgi-bin'
         $access_log_file      = 'access.log'
       }
       'redhat': {
-        $pidfile              = 'run/httpd.pid'
         $error_log            = 'error_log'
         $scriptalias          = '/var/www/cgi-bin'
         $access_log_file      = 'access_log'
       }
       'freebsd': {
-        $pidfile              = '/var/run/httpd.pid'
         $error_log            = 'httpd-error.log'
         $scriptalias          = '/usr/local/www/apache24/cgi-bin'
         $access_log_file      = 'httpd-access.log'
       } 'gentoo': {
-        $pidfile              = '/run/apache2.pid'
         $error_log            = 'error.log'
         $error_documents_path = '/usr/share/apache2/error'
         $scriptalias          = '/var/www/localhost/cgi-bin'
@@ -282,7 +280,6 @@
         }
       }
       'Suse': {
-        $pidfile              = '/var/run/httpd2.pid'
         $error_log            = 'error.log'
         $scriptalias          = '/usr/lib/cgi-bin'
         $access_log_file      = 'access.log'
diff --git a/manifests/params.pp b/manifests/params.pp
index 63a338ba9c..6a26128eaa 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -29,6 +29,9 @@
   $log_level = 'warn'
   $use_optional_includes = false
 
+  # should we use systemd module?
+  $use_systemd = true
+
   if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } else {
@@ -50,6 +53,7 @@
     $vhost_enable_dir     = undef
     $conf_file            = 'httpd.conf'
     $ports_file           = "${conf_dir}/ports.conf"
+    $pidfile              = 'run/httpd.pid'
     $logroot              = '/var/log/httpd'
     $logroot_mode         = undef
     $lib_path             = 'modules'
@@ -170,6 +174,7 @@
     $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
     $conf_file           = 'apache2.conf'
     $ports_file          = "${conf_dir}/ports.conf"
+    $pidfile             = "\${APACHE_PID_FILE}"
     $logroot             = '/var/log/apache2'
     $logroot_mode        = undef
     $lib_path            = '/usr/lib/apache2/modules'
@@ -316,6 +321,7 @@
     $vhost_enable_dir = undef
     $conf_file        = 'httpd.conf'
     $ports_file       = "${conf_dir}/ports.conf"
+    $pidfile          = '/var/run/httpd.pid'
     $logroot          = '/var/log/apache24'
     $logroot_mode     = undef
     $lib_path         = '/usr/local/libexec/apache24'
@@ -443,6 +449,7 @@
     $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
     $conf_file           = 'httpd.conf'
     $ports_file          = "${conf_dir}/ports.conf"
+    $pidfile             = '/var/run/httpd2.pid'
     $logroot             = '/var/log/apache2'
     $logroot_mode        = undef
     $lib_path            = '/usr/lib64/apache2-prefork/'

From d4dbc720c69e4a92384bb492cc78a3f82db81c78 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Thu, 13 Aug 2015 13:23:03 -0700
Subject: [PATCH 0677/2267] corrects mod_cgid worker/event defaults

---
 manifests/mod/cgid.pp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 6db6b287d1..4094c3281a 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -2,11 +2,10 @@
   case $::osfamily {
     'FreeBSD': {}
     default: {
-      if defined(Class['::apache::mod::worker']) {
-        Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
-      }
-      elsif defined(Class['::apache::mod::event']) {
+      if defined(Class['::apache::mod::event']) {
         Class['::apache::mod::event'] -> Class['::apache::mod::cgid']
+      } else {
+        Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
       }
     }
   }

From ea54cf0e46d585596b6e83f714b0b34a07d5caeb Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Mon, 17 Aug 2015 01:02:43 +0200
Subject: [PATCH 0678/2267] The purge_vhost_configs parameter is actually
 called purge_vhost_dir

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 769b937b8d..6ddc2e91be 100644
--- a/README.md
+++ b/README.md
@@ -179,7 +179,7 @@
 [Puppet module]: http://docs.puppetlabs.com/puppet/latest/reference/modules_fundamentals.html
 [Puppet module's code]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp
 [`purge_configs`]: #purge_configs
-[`purge_vhost_configs`]: #purge_vhost_configs
+[`purge_vhost_dir`]: #purge_vhost_dir
 [Python]: https://www.python.org/
 
 [Rack]: http://rack.github.io/
@@ -1038,13 +1038,13 @@ Sets the path to the file containing Apache ports configuration. Default: `{$con
 
 Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: 'true'.
 
-Setting this to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_configs`][].
+Setting this to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
 
-##### `purge_vhost_configs`
+##### `purge_vhost_dir`
 
-If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, the Boolean parameter `purge_vhost_configs` determines whether Puppet removes any configurations inside `vhost_dir` _not_ managed by Puppet. Default: same as [`purge_configs`][].
+If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, the Boolean parameter `purge_vhost_dir` determines whether Puppet removes any configurations inside `vhost_dir` _not_ managed by Puppet. Default: same as [`purge_configs`][].
 
-Setting `purge_vhost_configs` to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
+Setting `purge_vhost_dir` to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
 ##### `sendfile`
 

From d245182d0b13faaecfd7cc45589a6e26f05ff41c Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@mirantis.com>
Date: Tue, 18 Aug 2015 16:46:09 -0500
Subject: [PATCH 0679/2267] Add ListenBacklog for mod worker (MODULES-2432)

This change adds the ListenBacklog option for the worker module.
---
 manifests/mod/worker.pp         | 56 +++++++++++++++++++++++++++++++++
 spec/classes/mod/worker_spec.rb |  5 ++-
 templates/mod/worker.conf.erb   |  1 +
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 25925f8073..2e6a6421b2 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -1,3 +1,57 @@
+# == Class: apache::mod::worker
+#
+#
+# === Parameters
+#
+#  [*startservers*]
+#   (optional) The number of child server processes created on startup
+#   Defaults is '2'
+#
+#  [*maxclients*]
+#   (optional) 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.
+#   Default is '150'
+#
+#  [*minsparethreads*]
+#   (optional) Minimum number of idle threads to handle request spikes.
+#   Default is '25'
+#
+#  [*maxsparethreads*]
+#   (optional) Maximum number of idle threads.
+#   Default is '75'
+#
+#  [*threadsperchild*]
+#   (optional) The number of threads created by each child process.
+#   Default is '25'
+#
+#  [*maxrequestsperchild*]
+#   (optional) Limit on the number of connectiojns an individual child server
+#   process will handle. This is the old name and is still supported. The new
+#   name is MaxConnectionsPerChild as of 2.3.9+.
+#   Default is '0'
+#
+#  [*serverlimit*]
+#   (optional) With worker, use this directive only if your MaxRequestWorkers
+#   and ThreadsPerChild settings require more than 16 server processes
+#   (default). Do not set the value of this directive any higher than the
+#   number of server processes required by what you may want for
+#   MaxRequestWorkers and ThreadsPerChild.
+#   Default is '25'
+#
+#  [*threadlimit*]
+#   (optional) This directive sets the maximum configured value for
+#   ThreadsPerChild for the lifetime of the Apache httpd process.
+#   Default is '64'
+#
+#  [*listenbacklog*]
+#    (optional) Maximum length of the queue of pending connections.
+#    Defaults is '511'
+#
+#  [*apache_version*]
+#   (optional)
+#   Default is $::apache::apache_version
+#
 class apache::mod::worker (
   $startservers        = '2',
   $maxclients          = '150',
@@ -7,6 +61,7 @@
   $maxrequestsperchild = '0',
   $serverlimit         = '25',
   $threadlimit         = '64',
+  $listenbacklog       = '511',
   $apache_version      = $::apache::apache_version,
 ) {
   if defined(Class['apache::mod::event']) {
@@ -36,6 +91,7 @@
   # - $maxrequestsperchild
   # - $serverlimit
   # - $threadLimit
+  # - $listenbacklog
   file { "${::apache::mod_dir}/worker.conf":
     ensure  => file,
     content => template('apache/mod/worker.conf.erb'),
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 38a79aeb26..9d0d8e5e01 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -157,6 +157,7 @@
       it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+25$/) }
       it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+0$/) }
       it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+64$/) }
+      it { should contain_file("/etc/httpd/conf.d/worker.conf").with(:content => /^\s*ListenBacklog\s*511/) }
     end
 
     context 'setting params' do
@@ -169,7 +170,8 @@
           :maxsparethreads      => 14,
           :threadsperchild      => 15,
           :maxrequestsperchild  => 16,
-          :threadlimit          => 17
+          :threadlimit          => 17,
+          :listenbacklog        => 8,
         }
       end
       it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
@@ -181,6 +183,7 @@
       it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+15$/) }
       it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+16$/) }
       it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+17$/) }
+      it { should contain_file("/etc/httpd/conf.d/worker.conf").with(:content => /^\s*ListenBacklog\s*8/) }
     end
   end
 end
diff --git a/templates/mod/worker.conf.erb b/templates/mod/worker.conf.erb
index 597e05f8d5..ad2bc44610 100644
--- a/templates/mod/worker.conf.erb
+++ b/templates/mod/worker.conf.erb
@@ -7,4 +7,5 @@
   ThreadsPerChild     <%= @threadsperchild %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
   ThreadLimit         <%= @threadlimit %>
+  ListenBacklog       <%= @listenbacklog %>
 </IfModule>

From b2f842c9c03e86de855422827954fbb9e4471b87 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Tue, 18 Aug 2015 13:21:19 +0200
Subject: [PATCH 0680/2267] (MODULES-2458) Support for mod_auth_mellon.

mod_auth_melon is an authentication module
for apache. Configurations such as the following
are now supported.

```puppet
class{'apache':
      default_mods        => false,
      default_confd_files => false,
      default_vhost       => false,
}
class{'apache::mod::auth_mellon':
     mellon_cache_size => 101
}
apache::vhost{$::fqdn:
  docroot => '/var/www/html',
  port    => 443,
  ssl     => true,
  ssl_key => "/etc/certs/${::fqdn}.key",
  ssl_cert => "/etc/certs/${::fqdn}.cert",
  directories => [
      {  path           => '/',
         provider       => 'directory',
         mellon_enable  => 'info',
         mellon_merge_env_vars => 'On',
         mellon_endpoint_path => '/mellon',
         mellon_sp_private_key_file => "/etc/certs/${::fqdn}.key",
         mellon_sp_cert_file => "/etc/certs/${::fqdn}.cert",
         mellon_idp_metadata_file => "/etc/httpd/conf.d/mellon/FederationMetadata.xml",
         mellon_set_env_no_prefix => { "user" => "http://schemas.xmlsoap.org/claims/UPN",
                                   "ADFS_GROUP" => "http://schemas.xmlsoap.org/claims/Group",
                                   "ADFS_EMAIL" => "http://schemas.xmlsoap.org/claims/EmailAddress"},
         mellon_user => 'ADFS_LOGIN',
      },
      { path => '/protected',
        provider => 'location',
        auth_type => 'Mellon',
        auth_require => 'valid-user',
        mellon_enable => 'auth',
        mellon_cond => ['ADFS_LOGIN straylen [MAP]']
      },
  ]
}

```
---
 README.md                            | 86 +++++++++++++++++++++++++++
 manifests/mod/auth_mellon.pp         | 24 ++++++++
 manifests/params.pp                  | 11 ++++
 spec/classes/mod/auth_mellon_spec.rb | 87 ++++++++++++++++++++++++++++
 templates/mod/auth_mellon.conf.erb   | 21 +++++++
 templates/vhost/_directories.erb     | 31 ++++++++++
 6 files changed, 260 insertions(+)
 create mode 100644 manifests/mod/auth_mellon.pp
 create mode 100644 spec/classes/mod/auth_mellon_spec.rb
 create mode 100644 templates/mod/auth_mellon.conf.erb

diff --git a/README.md b/README.md
index 769b937b8d..ac0e4c1616 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@
 [`apache::mod::<MODULE NAME>`]: #classes-apachemodmodule-name
 [`apache::mod::alias`]: #class-apachemodalias
 [`apache::mod::auth_cas`]: #class-apachemodauth_cas
+[`apache::mod::auth_mellon`]: #class-apachemodauth_mellon
 [`apache::mod::disk_cache`]: #class-apachemoddisk_cache
 [`apache::mod::event`]: #class-apachemodevent
 [`apache::mod::geoip`]: #class-apachemodgeoip
@@ -142,6 +143,7 @@
 [`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html
 [`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
 [`mod_authnz_external`]: https://code.google.com/p/mod-auth-external/
+[`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
 [`mod_expires`]: http://httpd.apache.org/docs/current/mod/mod_expires.html
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
 [`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/
@@ -1176,6 +1178,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `alias` (see [`apache::mod::alias`][])
 * `auth_basic`
 * `auth_cas`* (see [`apache::mod::auth_cas`][])
+* `auth_mellon`* (see [`apache::mod::auth_mellon`][])
 * `auth_kerb`
 * `authn_core`
 * `authn_file`
@@ -1303,6 +1306,26 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 - `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 - `cas_version`: The CAS protocol version to adhere to. Valid options: '1', '2'. Default: '2'.
 
+##### Class: `apache::mod::auth_mellon`
+
+Installs and manages [`mod_auth_mellon`][]. It's parameters share names with the Apache module's directives.
+
+~~~puppet
+class{'apache::mod::auth_mellon':
+  mellon_cache_size => 101
+}
+~~~
+
+**Parameters within `apache::mod::auth_mellon`**:
+
+- `mellon_cache_size`: Size in megabytes of mellon cache.
+- `mellon_cache_entry_size`: Maximum size for single session.
+- `mellon_lock_file`: Location of lock file.
+- `mellon_post_directory`: Full path where post requests are saved.
+- `mellon_post_ttl`: Time to keep post requests.
+- `mellon_post_size`: Maximum size of post requests.
+- `mellon_post_count`: Maxmum number of post requests.
+
 ##### Class: `apache::mod::deflate`
 
 Installs and configures [`mod_deflate`][].
@@ -2655,6 +2678,69 @@ Sets the [IndexStyleSheet](http://httpd.apache.org/docs/current/mod/mod_autoinde
     }
 ~~~
 
+###### `mellon_enable`
+
+Sets the [MellonEnable](https://github.com/UNINETT/mod_auth_mellon) to enable auth_melon on a location.
+
+~~~ puppet
+apache::vhost{'sample.example.net':
+  docroot => '/path/to/directory',
+  directories => [
+    { path                       => '/',
+      provider                   => 'directory',
+      mellon_enable              => 'info',
+      mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key,
+      mellon_endpoint_path       => '/mellon',
+      mellon_set_env_no_prefix   => { 'ADFS_GROUP' => 'http://schemas.xmlsoap.org/claims/Group',
+                                      'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress'},
+      mellon_user => 'ADFS_LOGIN'
+    },
+    { path => '/protected',
+      provider => 'location',
+      mellon_enable => 'auth',
+      auth_type => 'Mellon',
+      auth_require => 'valid-user',
+      mellon_cond => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]']
+    }
+  ]
+}
+
+###### `mellon_cond`
+
+Sets the [MellonCond](https://github.com/UNINETT/mod_auth_mellon) is an array of mellon conditions that must
+be met to grant access.
+
+
+###### `mellon_endpoint_path`
+
+Sets the [MellonEndpointPath](https://github.com/UNINETT/mod_auth_mellon) to set melon endpoint path.
+
+###### `mellon_idp_metadata_file`
+
+Sets the [MellonIDPMetadataFile](https://github.com/UNINETT/mod_auth_mellon) location of idp metadata file.
+
+###### `mellon_saml_rsponse_dump`
+
+Sets the [MellonSamlRepsponseDump](https://github.com/UNINETT/mod_auth_mellon) to enable debug of SAML.
+
+###### `mellon_set_env_no_prefix`
+
+Sets the [MellonSetEnvNoPrefix](https://github.com/UNINETT/mod_auth_mellon) is a hash of attribute names to map
+to environment variables.
+
+
+###### `mellon_sp_private_key_file`
+
+Sets the [MellonSPPrivateKeyFile](https://github.com/UNINETT/mod_auth_mellon) private key location of service provider.
+
+###### `mellon_sp_cert_file`
+
+Sets the [MellonSPCertFile](https://github.com/UNINETT/mod_auth_mellon) public key location of service provider.
+
+###### `mellon_user`
+
+Sets the [MellonUser](https://github.com/UNINETT/mod_auth_mellon) attribute we should use for the username.
+
 ###### `options`
 
 Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
new file mode 100644
index 0000000000..79f6ffebb2
--- /dev/null
+++ b/manifests/mod/auth_mellon.pp
@@ -0,0 +1,24 @@
+class apache::mod::auth_mellon (
+  $mellon_cache_size = $::apache::params::mellon_cache_size,
+  $mellon_lock_file  = $::apache::params::mellon_lock_file,
+  $mellon_post_directory = $::apache::params::mellon_post_directory,
+  $mellon_cache_entry_size = undef,
+  $mellon_post_ttl = undef,
+  $mellon_post_size = undef,
+  $mellon_post_count = undef
+) {
+
+  ::apache::mod { 'auth_mellon': }
+
+  # Template uses
+  # - All variables beginning with mellon_
+  file { 'auth_mellon.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/auth_mellon.conf",
+    content => template('apache/mod/auth_mellon.conf.erb'),
+    require => [ Exec["mkdir ${::apache::mod_dir}"], ],
+    before  => File[$::apache::mod_dir],
+    notify  => Class['Apache::Service'],
+  }
+
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 6a26128eaa..5c5233ccdb 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -75,6 +75,7 @@
     $mod_packages         = {
       'auth_cas'    => 'mod_auth_cas',
       'auth_kerb'   => 'mod_auth_kerb',
+      'auth_mellon' => 'mod_auth_mellon',
       'authnz_ldap' => $::apache::version::distrelease ? {
         '7'     => 'mod_ldap',
         default => 'mod_authz_ldap',
@@ -131,6 +132,9 @@
       $wsgi_socket_prefix = undef
     }
     $cas_cookie_path      = '/var/cache/mod_auth_cas/'
+    $mellon_lock_file     = '/run/mod_auth_mellon/lock'
+    $mellon_cache_size    = 100
+    $mellon_post_directory = undef
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
@@ -188,6 +192,7 @@
     $mod_packages        = {
       'auth_cas'    => 'libapache2-mod-auth-cas',
       'auth_kerb'   => 'libapache2-mod-auth-kerb',
+      'auth_mellon' => 'libapache2-mod-auth-mellon',
       'dav_svn'     => 'libapache2-svn',
       'fastcgi'     => 'libapache2-mod-fastcgi',
       'fcgid'       => 'libapache2-mod-fcgid',
@@ -218,6 +223,9 @@
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www'
     $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
+    $mellon_lock_file     = undef
+    $mellon_cache_size    = undef
+    $mellon_post_directory = '/var/cache/apache2/mod_auth_mellon/'
     $modsec_crs_package   = 'modsecurity-crs'
     $modsec_crs_path      = '/usr/share/modsecurity-crs'
     $modsec_dir           = '/etc/modsecurity'
@@ -479,6 +487,9 @@
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/srv/www'
     $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
+    $mellon_lock_file     = undef
+    $mellon_cache_size    = undef
+    $mellon_post_directory = undef
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     $dev_packages        = ['libapr-util1-devel', 'libapr1-devel']
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
new file mode 100644
index 0000000000..f022e48108
--- /dev/null
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -0,0 +1,87 @@
+describe 'apache::mod::auth_mellon', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :fqdn                   => 'test.example.com',
+        :is_pe                  => false,
+      }
+    end
+    describe 'with no parameters' do
+      it { should contain_apache__mod('auth_mellon') }
+      it { should contain_package('libapache2-mod-auth-mellon') }
+      it { should contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
+      it { should contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") }
+    end
+    describe 'with parameters' do
+      let :params do
+        { :mellon_cache_size => '200',
+          :mellon_cache_entry_size => '2010',
+          :mellon_lock_file => '/tmp/junk',
+          :mellon_post_directory => '/tmp/post',
+          :mellon_post_ttl => '5',
+          :mellon_post_size => '8',
+          :mellon_post_count => '10'
+        }
+      end
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) }
+    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',
+        :fqdn                   => 'test.example.com',
+        :is_pe                  => false,
+      }
+    end
+    describe 'with no parameters' do
+      it { should contain_apache__mod('auth_mellon') }
+      it { should contain_package('mod_auth_mellon') }
+      it { should contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') }
+      it { should contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") }
+    end
+    describe 'with parameters' do
+      let :params do
+        { :mellon_cache_size => '200',
+          :mellon_cache_entry_size => '2010',
+          :mellon_lock_file => '/tmp/junk',
+          :mellon_post_directory => '/tmp/post',
+          :mellon_post_ttl => '5',
+          :mellon_post_size => '8',
+          :mellon_post_count => '10'
+        }
+      end
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) }
+      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) }
+    end
+  end
+end
diff --git a/templates/mod/auth_mellon.conf.erb b/templates/mod/auth_mellon.conf.erb
new file mode 100644
index 0000000000..e36a733907
--- /dev/null
+++ b/templates/mod/auth_mellon.conf.erb
@@ -0,0 +1,21 @@
+<%- if @mellon_cache_size -%>
+MellonCacheSize <%= @mellon_cache_size %>
+<%- end -%>
+<%- if @mellon_cache_entry_size -%>
+MellonCacheEntrySize <%= @mellon_cache_entry_size %>
+<%- end -%>
+<%- if @mellon_lock_file -%>
+MellonLockFile "<%= @mellon_lock_file %>"
+<%- end -%>
+<%- if @mellon_post_directory -%>
+MellonPostDirectory "<%= @mellon_post_directory %>"
+<%- end -%>
+<%- if @mellon_post_ttl -%>
+MellonPostTTL <%= @mellon_post_ttl %>
+<%- end -%>
+<%- if @mellon_post_size -%>
+MellonPostSize <%= @mellon_post_size %>
+<%- end -%>
+<%- if @mellon_post_count -%>
+MellonPostCount <%= @mellon_post_count %>
+<%- end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 529d9bdffa..189bd57701 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -252,6 +252,37 @@
     ShibUseHeaders <%= directory['shib_use_headers'] %>
       <%- end -%>
     <%- end -%>
+    <%- if directory['mellon_enable'] -%>
+    MellonEnable "<%= directory['mellon_enable'] %>"
+      <%- if directory['mellon_endpoint_path'] -%>
+    MellonEndpointPath "<%= directory['mellon_endpoint_path'] %>"
+      <%- end -%>
+      <%- if directory['mellon_sp_private_key_file'] -%>
+    MellonSPPrivateKeyFile "<%= directory['mellon_sp_private_key_file'] %>"
+      <%- end -%>
+      <%- if directory['mellon_sp_cert_file'] -%>
+    MellonSPCertFile "<%= directory['mellon_sp_cert_file'] %>"
+      <%- end -%>
+      <%- if directory['mellon_idp_metadata_file'] -%>
+    MellonIDPMetadataFile "<%= directory['mellon_idp_metadata_file'] %>"
+      <%- end -%>
+      <%- if directory['mellon_set_env_no_prefix'] -%>
+        <%- directory['mellon_set_env_no_prefix'].each do |key, value| -%>
+    MellonSetEnvNoPrefix "<%= key %>" "<%= value %>"
+        <%- end -%>
+      <%- end -%>
+      <%- if directory['mellon_user'] -%>
+    MellonUser "<%= directory['mellon_user'] %>"
+      <%- end -%>
+      <%- if directory['mellon_saml_response_dump'] -%>
+    MellonSamlResponseDump "<%= directory['mellon_saml_response_dump'] %>"
+      <%- end -%>
+      <%- if directory['mellon_cond'] -%>
+        <%- Array(directory['mellon_cond']).each do |cond| -%>
+    MellonCond <%= cond %>
+         <%- end -%>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>

From 3b5e4db1c5cb9194b757c7ca4a3f30f79e7103e5 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 24 Aug 2015 14:50:23 -0700
Subject: [PATCH 0681/2267] MODULES-2439 - ProxyPassMatch parameters were
 ending up on a newline

---
 spec/defines/vhost_spec.rb | 3 ++-
 templates/vhost/_proxy.erb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index cb8c9e84bb..5dce3f748b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -449,12 +449,13 @@
             {
               'path'     => '.*',
               'url'      => 'http://backend-a/',
+              'params'   => { 'timeout' => 300 },
             }
           ],
         }
       end
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /ProxyPassMatch .* http:\/\/backend-a\//).with_content(/## Proxy rules/) }
+              /ProxyPassMatch .* http:\/\/backend-a\/ timeout=300/).with_content(/## Proxy rules/) }
     end
     context 'proxy_dest_match' do
       let :params do
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 29d35cae98..71512fdba2 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -33,7 +33,7 @@
   </Location>
 <% end -%>
 <% [@proxy_pass_match].flatten.compact.each do |proxy| %>
-  ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] %>
+  ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
     <%- proxy['params'].each_pair do |key, value| -%> <%= key %>=<%= value -%>
     <%- end -%>

From 059b92b9403a555984734b988b7352adbbf7b602 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Tue, 18 Aug 2015 23:37:43 +0200
Subject: [PATCH 0682/2267] Catch that mod_authz_default has been removed in
 Apache 2.4

Having it in the server config will prevent the server from starting as the module file cannot be found.
---
 manifests/mod/authz_default.pp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/authz_default.pp b/manifests/mod/authz_default.pp
index 23edd9b5ac..e457774ae5 100644
--- a/manifests/mod/authz_default.pp
+++ b/manifests/mod/authz_default.pp
@@ -1,3 +1,9 @@
-class apache::mod::authz_default {
-  ::apache::mod { 'authz_default': }
+class apache::mod::authz_default(
+    $apache_version = $::apache::apache_version
+) {
+  if versioncmp($apache_version, '2.4') >= 0 {
+    warning('apache::mod::authz_default has been removed in Apache 2.4')
+  } else {
+    ::apache::mod { 'authz_default': }
+  }
 }

From 7cf4b96f7806c9960ffd002b6c9f4a6cc8720800 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Wed, 12 Aug 2015 14:44:45 +0200
Subject: [PATCH 0683/2267] Support the mod_proxy ProxyPassReverseCookiePath
 directive

---
 README.md                  |  3 +++
 spec/defines/vhost_spec.rb | 14 ++++++++++----
 templates/vhost/_proxy.erb |  5 +++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9cfde923ed..58e8e03ebf 100644
--- a/README.md
+++ b/README.md
@@ -2113,11 +2113,14 @@ apache::vhost { 'site.name.fdqn':
       'keywords' => ['nocanon', 'interpolate'] },
     { 'path' => '/f', 'url' => 'http://backend-f/',
       'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+    { 'path' => '/g', 'url' => 'http://backend-g/',
+      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}], },
   ],
 }
 ~~~
 
 `reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
+`reverse_cookies` is optional and is used to set ProxyPassReverseCookiePath.
 `params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
 `setenv` is optional and is an array to set environment variables for the proxy directive, for details see http://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 5dce3f748b..3b9a6fdbd9 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -210,10 +210,14 @@
           'proxy_dest'                  => '/',
           'proxy_pass'                  => [
             {
-              'path'     => '/a',
-              'url'      => 'http://backend-a/',
-              'keywords' => ['noquery', 'interpolate'],
-              'params'   => {
+              'path'            => '/a',
+              'url'             => 'http://backend-a/',
+              'keywords'        => ['noquery', 'interpolate'],
+              'reverse_cookies' => [{
+                'path'          => '/a',
+                'url'           => 'http://backend-a/',
+              }],
+              'params'          => {
                       'retry'   => '0',
                       'timeout' => '5'
               },
@@ -403,6 +407,8 @@
               /SetEnv proxy-nokeepalive 1/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
               /noquery interpolate/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /ProxyPassReverseCookiePath\s+\/a\s+http:\/\//) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 71512fdba2..3f94af9112 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -18,6 +18,11 @@
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
   <%- end %>
   <Location <%= proxy['path']%>>
+  <%- if not proxy['reverse_cookies'].nil? -%>
+    <%- Array(proxy['reverse_cookies']).each do |reverse_cookies| -%>
+    ProxyPassReverseCookiePath <%= reverse_cookies['path'] %> <%= reverse_cookies['url'] %>
+    <%- end -%>
+  <%- end -%>
   <%- if proxy['reverse_urls'].nil? -%>
     ProxyPassReverse <%= proxy['url'] %>
   <%- else -%>

From 6e05f67d5732cf6beee9a7cc77c52830137fbce2 Mon Sep 17 00:00:00 2001
From: Holt Wilkins <hwilkins@palantir.com>
Date: Fri, 21 Aug 2015 18:19:52 +1000
Subject: [PATCH 0684/2267] Add support for the Apache
 SSLProxyMachineCertificateFile directive which allows the apache reverse
 proxy to use a client certificate to authenticate to its upstream

---
 README.md                | 11 +++++++++++
 manifests/vhost.pp       |  2 ++
 templates/vhost/_ssl.erb |  3 +++
 3 files changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 769b937b8d..a1de3d734f 100644
--- a/README.md
+++ b/README.md
@@ -2898,6 +2898,17 @@ Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#
     }
 ~~~
 
+##### `ssl_proxy_machine_cert`
+
+Sets the [SSLProxyMachineCertificateFile](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers.  This file should be a concatenation of the PEM-encoded certificate files in order of preference.  Defaults to 'undef'.
+
+~~~ puppet
+    apache::vhost { 'sample.example.net':
+      …
+      ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
+    }
+~~~
+
 ##### `ssl_options`
 
 Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 20b1aa6b91..c44bba5891 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -25,6 +25,7 @@
   $ssl_honorcipherorder        = undef,
   $ssl_verify_client           = undef,
   $ssl_verify_depth            = undef,
+  $ssl_proxy_machine_cert      = undef,
   $ssl_options                 = undef,
   $ssl_openssl_conf_cmd        = undef,
   $ssl_proxyengine             = false,
@@ -738,6 +739,7 @@
   # - $ssl_honorcipherorder
   # - $ssl_verify_client
   # - $ssl_verify_depth
+  # - $ssl_proxy_machine_cert
   # - $ssl_options
   # - $ssl_openssl_conf_cmd
   # - $apache_version
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index c2d9413509..e99b739a67 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -40,6 +40,9 @@
   <%- if @ssl_verify_depth -%>
   SSLVerifyDepth          <%= @ssl_verify_depth %>
   <%- end -%>
+  <%- if @ssl_proxy_machine_cert -%>
+  SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
+  <%- end -%>
   <%- if @ssl_options -%>
   SSLOptions <%= Array(@ssl_options).join(' ') %>
   <%- end -%>

From be089859927b99237de02a821a6f786c722c326e Mon Sep 17 00:00:00 2001
From: Niklas Grossmann <ngrossmann@amadeus.com>
Date: Wed, 2 Sep 2015 15:12:37 +0200
Subject: [PATCH 0685/2267] MODULES-2513 mod::ssl fails on SLES

Add SLES/Suse support to mod::ssl.
---
 manifests/mod/ssl.pp         | 17 +++++++++++------
 spec/classes/mod/ssl_spec.rb | 16 ++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 9e68d21b70..475f233a50 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -12,12 +12,6 @@
   $apache_version          = $::apache::apache_version,
   $package_name            = undef,
 ) {
-  $session_cache = $::osfamily ? {
-    'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
-    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
-    'freebsd' => '/var/run/ssl_scache(512000)',
-    'gentoo'  => '/var/run/ssl_scache(512000)',
-  }
 
   case $::osfamily {
     'debian': {
@@ -38,11 +32,22 @@
     'gentoo': {
       $ssl_mutex = 'default'
     }
+    'Suse': {
+      $ssl_mutex = 'default'
+    }
     default: {
       fail("Unsupported osfamily ${::osfamily}")
     }
   }
 
+  $session_cache = $::osfamily ? {
+    'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
+    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
+    'freebsd' => '/var/run/ssl_scache(512000)',
+    'gentoo'  => '/var/run/ssl_scache(512000)',
+    'Suse'    => '/var/lib/apache2/ssl_scache(512000)'
+  }
+
   ::apache::mod { 'ssl':
     package => $package_name,
   }
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 1e8b94edca..0fd813d7e1 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -100,6 +100,22 @@
     it { is_expected.to contain_apache__mod('ssl') }
   end
 
+  context 'on a Suse OS' do
+    let :facts do
+      {
+        :osfamily               => 'Suse',
+        :operatingsystem        => 'SLES',
+        :operatingsystemrelease => '11.2',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('ssl') }
+  end
   # Template config doesn't vary by distro
   context "on all distros" do
     let :facts do

From 2311945635b113afb6f367a288df563fd2b1abc5 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Fri, 4 Sep 2015 11:07:19 +0200
Subject: [PATCH 0686/2267] Fix mellon docs formatting

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d95ac6b534..dc1eb18c7e 100644
--- a/README.md
+++ b/README.md
@@ -2707,6 +2707,7 @@ apache::vhost{'sample.example.net':
     }
   ]
 }
+~~~
 
 ###### `mellon_cond`
 

From a221fdcb6d1963b4dfbfb1468fce13fea07f5d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20POIROUX?= <leo.poiroux@gmail.com>
Date: Mon, 7 Sep 2015 15:25:04 +0200
Subject: [PATCH 0687/2267] Deflate "application/json" by default

Hello,
How can I customize the "types" of "deflate " while using " default_mods " ?
I need to deflate "application/json".

JSON is a common text resource types on the web which should be served with HTTP compression:
https://zoompf.com/blog/2012/02/lose-the-wait-http-compression

Thks
---
 manifests/mod/deflate.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 9b8d43621c..0748a54e57 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -3,7 +3,8 @@
     'text/html text/plain text/xml',
     'text/css',
     'application/x-javascript application/javascript application/ecmascript',
-    'application/rss+xml'
+    'application/rss+xml',
+    'application/json'
   ],
   $notes = {
     'Input'  => 'instream',

From f11f5f77ab67268ec39a07e4d42d28790f766dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20POIROUX?= <leo.poiroux@gmail.com>
Date: Tue, 8 Sep 2015 12:24:17 +0200
Subject: [PATCH 0688/2267] Added application/json on default DEFLATE
 configuration

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dc1eb18c7e..b6af020e65 100644
--- a/README.md
+++ b/README.md
@@ -1332,7 +1332,7 @@ Installs and configures [`mod_deflate`][].
 
 **Parameters within `apache::mod::deflate`:**
 
-- `types`: An [array][] of [MIME types][MIME `content-type`] to be deflated. Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml' ].
+- `types`: An [array][] of [MIME types][MIME `content-type`] to be deflated. Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json' ].
 - `notes`: A [Hash][] where the key represents the type and the value represents the note name. Default: { 'Input'  => 'instream', 'Output' => 'outstream', 'Ratio'  => 'ratio' }
 
 ##### Class: `apache::mod::expires`

From 9367580e2dc72df792fdafc48c5a9c94d7725a59 Mon Sep 17 00:00:00 2001
From: Aaron Russell <aaron@therussells.me>
Date: Fri, 3 Jul 2015 09:48:50 -0400
Subject: [PATCH 0689/2267] (MODULES-2188) Add support for PassengerBaseURI in
 Apache This adds a varaible and template block for using PassengerBaseURI in
 the vhost

---
 README.md                                |  4 ++++
 manifests/vhost.pp                       | 16 ++++++++++++++++
 spec/defines/vhost_spec.rb               |  1 +
 templates/vhost/_passenger_base_uris.erb |  7 +++++++
 tests/vhost.pp                           |  8 ++++++++
 5 files changed, 36 insertions(+)
 create mode 100644 templates/vhost/_passenger_base_uris.erb

diff --git a/README.md b/README.md
index 769b937b8d..ff4ce0007b 100644
--- a/README.md
+++ b/README.md
@@ -2114,6 +2114,10 @@ This directive is equivalent to proxy_pass, but takes regular expressions, see [
 
 Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
 
+#####`passenger_base_uris`
+
+Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. Defaults to 'undef'.
+
 ##### `redirect_dest`
 
 Specifies the address to redirect to. Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 20b1aa6b91..1c72242688 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -80,6 +80,7 @@
   $redirectmatch_regexp        = undef,
   $redirectmatch_dest          = undef,
   $rack_base_uris              = undef,
+  $passenger_base_uris         = undef,
   $headers                     = undef,
   $request_headers             = undef,
   $filters                     = undef,
@@ -386,6 +387,11 @@
     }
   }
 
+  # Load mod_passenger if needed and not yet loaded
+  if $passenger_base_uris {
+      include ::apache::mod::passenger
+  }
+
   # Load mod_fastci if needed and not yet loaded
   if $fastcgi_server and $fastcgi_socket {
     if ! defined(Class['apache::mod::fastcgi']) {
@@ -655,6 +661,16 @@
     }
   }
 
+  # Template uses:
+  # - $passenger_base_uris
+  if $passenger_base_uris {
+    concat::fragment { "${name}-passenger_uris":
+      target  => "${priority_real}${filename}.conf",
+      order   => 155,
+      content => template('apache/vhost/_passenger_base_uris.erb'),
+    }
+  }
+
   # Template uses:
   # - $redirect_source
   # - $redirect_dest
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index cb8c9e84bb..82301c4efb 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -248,6 +248,7 @@
           'redirectmatch_regexp'        => ['\.git$'],
           'redirectmatch_dest'          => ['http://www.example.com'],
           'rack_base_uris'              => ['/rackapp1'],
+          'passenger_base_uris'         => ['/passengerapp1'],
           'headers'                     => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
           'request_headers'             => ['append MirrorID "mirror 12"'],
           'rewrites'                    => [
diff --git a/templates/vhost/_passenger_base_uris.erb b/templates/vhost/_passenger_base_uris.erb
new file mode 100644
index 0000000000..f3ef5aa0a5
--- /dev/null
+++ b/templates/vhost/_passenger_base_uris.erb
@@ -0,0 +1,7 @@
+<% if @passenger_base_uris -%>
+
+  ## Enable passenger base uris
+<% Array(@passenger_base_uris).each do |uri| -%>
+  PassengerBaseURI <%= uri %>
+<% end -%>
+<% end -%>
diff --git a/tests/vhost.pp b/tests/vhost.pp
index a46b677846..0cf8da75c4 100644
--- a/tests/vhost.pp
+++ b/tests/vhost.pp
@@ -141,6 +141,7 @@
   rack_base_uris => ['/rackapp1', '/rackapp2'],
 }
 
+
 # Vhost to redirect non-ssl to ssl
 apache::vhost { 'sixteenth.example.com non-ssl':
   servername => 'sixteenth.example.com',
@@ -251,3 +252,10 @@
   access_log_env_var => 'admin',
 }
 
+# Vhost with a passenger_base configuration
+apache::vhost { 'twentysecond.example.com':
+  port           => '80',
+  docroot        => '/var/www/twentysecond',
+  rack_base_uris => ['/passengerapp1', '/passengerapp2'],
+}
+

From 49fed02c87da035d9cd85aafe115b7ed447d92ca Mon Sep 17 00:00:00 2001
From: Edmund Craske <edmund.craske@bjss.com>
Date: Mon, 14 Sep 2015 13:29:36 +0100
Subject: [PATCH 0690/2267] Fix typo of MPM_PREFORK

Was unsetting 'MPM_PERFORK', so 'MPM_PREFORK' would not have been
unset correctly.
---
 manifests/package.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/package.pp b/manifests/package.pp
index 728b26010e..5c59f2546d 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -17,11 +17,11 @@
         }
         'worker': {
           $set = 'MPM_WORKER'
-          $unset = 'MPM_PERFORK MPM_EVENT'
+          $unset = 'MPM_PREFORK MPM_EVENT'
         }
         'event': {
           $set = 'MPM_EVENT'
-          $unset = 'MPM_PERFORK MPM_WORKER'
+          $unset = 'MPM_PREFORK MPM_WORKER'
         }
         'itk': {
           $set = undef

From bf948c05e253b43ed0bae1ca36868af4af617860 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Fri, 14 Aug 2015 13:07:35 +0200
Subject: [PATCH 0691/2267] (MODULES-2419) - Add mod_auth_kerb parameters to
 vhost.

https://tickets.puppetlabs.com/browse/MODULES-2419

The following kerberos parameters can be set within
a vhost.

  KrbMethodNegotiate
  KrbMethodK5Passwd
  KrbAuthoritative
  KrbAuthRealms
  Krb5Keytab
  KrbLocalUserMapping

Reference for mod_auth_kerb:
http://modauthkerb.sourceforge.net/configure.html
https://bugzilla.redhat.com/show_bug.cgi?id=970678
---
 README.md                      | 45 ++++++++++++++++++++++++++++++++++
 manifests/vhost.pp             | 28 +++++++++++++++++++++
 spec/defines/vhost_spec.rb     | 17 +++++++++++++
 templates/vhost/_auth_kerb.erb | 23 +++++++++++++++++
 4 files changed, 113 insertions(+)
 create mode 100644 templates/vhost/_auth_kerb.erb

diff --git a/README.md b/README.md
index b6af020e65..fdc4c97765 100644
--- a/README.md
+++ b/README.md
@@ -1964,6 +1964,51 @@ Usage typically looks like:
     }
 ~~~
 
+##### `auth_kerb`
+
+Enable mod_auth_kerb parameters for a virtual host. Valid values are 'true' or 'false'. Defaults to 'false'.
+
+Usage typically looks like:
+
+~~~ puppet
+    apache::vhost {'sample.example.net':
+      auth_kerb              => true,
+      krb_method_negotiate   => 'on',
+      krb_auth_realms        => ['EXAMPLE.ORG'],
+      krb_local_user_mapping => 'on',
+      directories            => { 
+        path         => '/var/www/html',
+        auth_name    => 'Kerberos Login',
+        auth_type    => 'Kerberos',
+        auth_require => 'valid-user',
+      }
+    }
+~~~
+
+##### `krb_method_negotiate`
+
+To enable or disable the use of the Negotiate method. Defaults is 'on'
+
+##### `krb_method_k5passwd`
+
+To enable or disable the use of password based authentication for Kerberos v5. Default is 'on'
+
+##### `krb_authoritative`
+
+If set to off this directive allow authentication controls to be pass on to another modules.  Default is 'on'
+
+##### `krb_auth_realms`
+
+Specifies an array Kerberos realm(s) to be used for authentication. Default is []
+
+##### `krb_5keytab`
+
+Location of the Kerberos V5 keytab file. Not set by default.
+
+##### `krb_local_user_mapping`
+
+Strips @REALM from username for further use. Not set by default.
+
 ##### `logroot`
 
 Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index c44bba5891..027e490796 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -123,6 +123,13 @@
   $modsec_disable_ids          = undef,
   $modsec_disable_ips          = undef,
   $modsec_body_limit           = undef,
+  $auth_kerb                   = false,
+  $krb_method_negotiate        = 'on',
+  $krb_method_k5passwd         = 'on',
+  $krb_authoritative           = 'on',
+  $krb_auth_realms             = [],
+  $krb_5keytab                 = undef,
+  $krb_local_user_mapping      = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -213,6 +220,7 @@
     validate_re($allow_encoded_slashes, '(^on$|^off$|^nodecode$)', "${allow_encoded_slashes} is not permitted for allow_encoded_slashes. Allowed values are 'on', 'off' or 'nodecode'.")
   }
 
+  validate_bool($auth_kerb)
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -221,6 +229,10 @@
     include ::apache::mod::mime
   }
 
+  if $auth_kerb and $ensure == 'present' {
+    include ::apache::mod::auth_kerb
+  }
+
   if $virtual_docroot {
     include ::apache::mod::vhost_alias
   }
@@ -751,6 +763,22 @@
     }
   }
 
+  # Template uses:
+  # - $auth_kerb
+  # - $krb_method_negotiate
+  # - $krb_method_k5passwd
+  # - $krb_authoritative
+  # - $krb_auth_realms
+  # - $krb_5keytab 
+  # - $krb_local_user_mapping
+  if $auth_kerb {
+    concat::fragment { "${name}-auth_kerb":
+      target  => "${priority_real}${filename}.conf",
+      order   => 210,
+      content => template('apache/vhost/_auth_kerb.erb'),
+    }
+  }
+
   # Template uses:
   # - $suphp_engine
   # - $suphp_addhandler
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3b9a6fdbd9..8d6ced9d4a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -313,6 +313,13 @@
           'passenger_start_timeout'     => '600',
           'passenger_pre_start'         => 'http://localhost/myapp',
           'add_default_charset'         => 'UTF-8',
+          'auth_kerb'                   => true,
+          'krb_method_negotiate'        => 'off',
+          'krb_method_k5passwd'         => 'off',
+          'krb_authoritative'           => 'off',
+          'krb_auth_realms'             => ['EXAMPLE.ORG','EXAMPLE.NET'],
+          'krb_5keytab'                 => '/tmp/keytab5',
+          'krb_local_user_mapping'      => 'off',
         }
       end
       let :facts do
@@ -432,6 +439,16 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbMethodNegotiate\soff$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbAuthoritative\soff$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+Krb5Keytab\s\/tmp\/keytab5$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbLocalUserMapping\soff$/)}
     end
     context 'set only aliases' do
       let :params do
diff --git a/templates/vhost/_auth_kerb.erb b/templates/vhost/_auth_kerb.erb
new file mode 100644
index 0000000000..9179ee8b2a
--- /dev/null
+++ b/templates/vhost/_auth_kerb.erb
@@ -0,0 +1,23 @@
+<% if @auth_kerb -%>
+
+  ## Kerberos directives
+  <%- if @krb_method_negotiate -%>
+  KrbMethodNegotiate <%= @krb_method_negotiate %>
+  <%- end -%>
+  <%- if @krb_method_k5passwd -%>
+  KrbMethodK5Passwd <%= @krb_method_k5passwd %>
+  <%- end -%>
+  <%- if @krb_authoritative -%>
+  KrbAuthoritative <%= @krb_authoritative %>
+  <%- end -%>
+  <%- if @krb_auth_realms and @krb_auth_realms.length >= 1 -%>
+  KrbAuthRealms <%= @krb_auth_realms.join(' ') %>
+  <%- end -%>
+  <%- if @krb_5keytab -%>
+  Krb5Keytab <%= @krb_5keytab %>
+  <%- end -%>
+  <%- if @krb_local_user_mapping -%>
+  KrbLocalUserMapping <%= @krb_local_user_mapping -%>
+  <%- end -%>
+
+<% end -%>

From 05613d7f0979237f176778c0fa6ebfb9cc10f8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20R=C3=BCssel?= <ruessel@synyx.de>
Date: Mon, 21 Sep 2015 16:13:37 +0200
Subject: [PATCH 0692/2267] also install mod_authn_alias as default mod in
 debian for apache < 2.4

---
 manifests/default_mods.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 1c3820bf09..a1d2c89ef3 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -42,6 +42,9 @@
       'debian': {
         include ::apache::mod::authn_core
         include ::apache::mod::reqtimeout
+        if versioncmp($apache_version, '2.4') < 0 {
+          ::apache::mod { 'authn_alias': }
+        }
       }
       'redhat': {
         include ::apache::mod::actions

From 2ab10465fee10c150f3f8f98c74730ad7b8d3d24 Mon Sep 17 00:00:00 2001
From: Athanasios Douitsis <aduitsis@cpan.org>
Date: Tue, 22 Sep 2015 15:14:05 +0300
Subject: [PATCH 0693/2267] Fix erroneous example in README.md

Fix error regarding the shib_request_settings setting for a vhost directory. Also, fix value of said attribute to a hash instead of a string.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1a4eb4d4ae..925ba5ae01 100644
--- a/README.md
+++ b/README.md
@@ -2916,7 +2916,7 @@ Allows an valid content setting to be set or altered for the application request
       docroot     => '/path/to/directory',
       directories => [
         { path                  => '/path/to/directory',
-          shib_require_setting  => 'requiresession 1',
+          shib_request_settings => { 'requiresession' => 'On' },
           shib_use_headers      => 'On',
         },
       ],

From 99daf49c2fa0149a50d996f51cf49ece01e315a4 Mon Sep 17 00:00:00 2001
From: Freddy Spierenburg <freddy@telegraafnet.nl>
Date: Tue, 22 Sep 2015 18:22:00 +0200
Subject: [PATCH 0694/2267] MODULES-2613 Small style cleanup to
 templates/vhost/_additional_includes.erb

The file templates/vhost/_additional_includes.erb can use a small cleanup (IMHO).

Without this commit the includes are not nicely indented in line with the comment and the rest of the configuration file. This commit fixes that.
---
 templates/vhost/_additional_includes.erb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/templates/vhost/_additional_includes.erb b/templates/vhost/_additional_includes.erb
index aa9f0fe351..a07bb81125 100644
--- a/templates/vhost/_additional_includes.erb
+++ b/templates/vhost/_additional_includes.erb
@@ -2,9 +2,8 @@
 
   ## Load additional static includes
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%>
-IncludeOptional "<%= include %>"
+  IncludeOptional "<%= include %>"
 <%- else -%>
-Include "<%= include %>"
+  Include "<%= include %>"
 <%- end -%>
-
 <% end -%>

From 10d632b99b3f84f7f70421a64c62bdbb72f2d824 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Wed, 23 Sep 2015 15:26:15 +0200
Subject: [PATCH 0695/2267] (MODULES-2616) Optionally set LimitRequestFieldSize
 on an apache::vhost

Support setting of LimitRequestFieldSize on a vhost.

```puppet
apache::vhost{'foo':
  limit_request_field_size => 1234
}
```

by default value is unset.

http://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize
https://tickets.puppetlabs.com/browse/MODULES-2616
---
 README.md                   |  4 ++++
 manifests/vhost.pp          | 14 ++++++++++++++
 spec/defines/vhost_spec.rb  |  4 ++++
 templates/vhost/_limits.erb |  5 +++++
 4 files changed, 27 insertions(+)
 create mode 100644 templates/vhost/_limits.erb

diff --git a/README.md b/README.md
index 925ba5ae01..1f69c825b1 100644
--- a/README.md
+++ b/README.md
@@ -2009,6 +2009,10 @@ Location of the Kerberos V5 keytab file. Not set by default.
 
 Strips @REALM from username for further use. Not set by default.
 
+##### `limit_request_field_size`
+
+[Limits](http://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize) the size of the HTTP request header allowed from the client. Default is 'undef'.
+
 ##### `logroot`
 
 Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 42a3a373b2..25530bccb8 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -131,6 +131,7 @@
   $krb_auth_realms             = [],
   $krb_5keytab                 = undef,
   $krb_local_user_mapping      = undef,
+  $limit_request_field_size    = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -222,6 +223,10 @@
   }
 
   validate_bool($auth_kerb)
+
+  if $limit_request_field_size {
+    validate_integer($limit_request_field_size)
+  }
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -946,6 +951,15 @@
       content => template('apache/vhost/_filters.erb'),
     }
   }
+  # Template uses:
+  # - $limit_request_field_size
+  if $limit_request_field_size {
+    concat::fragment { "${name}-limits":
+      target  => "${priority_real}${filename}.conf",
+      order   => 330,
+      content => template('apache/vhost/_limits.erb'),
+    }
+  }
 
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 713d8726da..03140931fc 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -321,6 +321,7 @@
           'krb_auth_realms'             => ['EXAMPLE.ORG','EXAMPLE.NET'],
           'krb_5keytab'                 => '/tmp/keytab5',
           'krb_local_user_mapping'      => 'off',
+          'limit_request_field_size'    => '54321',
         }
       end
       let :facts do
@@ -450,6 +451,8 @@
         :content => /^\s+Krb5Keytab\s\/tmp\/keytab5$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
         :content => /^\s+KrbLocalUserMapping\soff$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-limits').with(
+        :content => /^\s+LimitRequestFieldSize\s54321$/)}
     end
     context 'set only aliases' do
       let :params do
@@ -601,6 +604,7 @@
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-fastcgi') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-suexec') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-charsets') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-limits') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
   end
diff --git a/templates/vhost/_limits.erb b/templates/vhost/_limits.erb
new file mode 100644
index 0000000000..0bd56db353
--- /dev/null
+++ b/templates/vhost/_limits.erb
@@ -0,0 +1,5 @@
+
+  ## Limit Request Values
+<% if @limit_request_field_size -%>
+  LimitRequestFieldSize <%= @limit_request_field_size %>
+<% end -%>

From 7a67ab19c0a65617654145a1f683f40c28a14386 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Thu, 24 Sep 2015 06:03:24 -0600
Subject: [PATCH 0696/2267] add SecUploadDir parameter to support file uploads
 with mod_security

---
 templates/mod/security.conf.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index ac28402c64..7b2da76135 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -59,10 +59,13 @@
     SecAuditLog /var/log/apache2/modsec_audit.log
     SecTmpDir /var/cache/modsecurity
     SecDataDir /var/cache/modsecurity
+    SecUploadDir /var/cache/modsecurity
 <% else -%>
     SecDebugLog /var/log/httpd/modsec_debug.log
     SecAuditLog /var/log/httpd/modsec_audit.log
     SecTmpDir /var/lib/mod_security
     SecDataDir /var/lib/mod_security
+    SecUploadDir /var/lib/mod_security
 <% end -%>
+    SecUploadKeepFiles Off
 </IfModule>

From e2b6bcfee0a0e9f9a1eef57eb44d3ca315e3b37e Mon Sep 17 00:00:00 2001
From: Mark Jeffcoat <Mark.Jeffcoat@motive.com>
Date: Thu, 24 Sep 2015 16:15:29 -0500
Subject: [PATCH 0697/2267] Correct typo in default_vhost => false example.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1f69c825b1..f720c4202a 100644
--- a/README.md
+++ b/README.md
@@ -289,7 +289,7 @@ You can customize parameters when declaring the `apache` class. For instance, th
 
 ~~~ puppet
 class { 'apache':
-  default_vhosts => false,
+  default_vhost => false,
 }
 ~~~
 

From 2ad38d913ede0e35897c70b863f2c50a1b4a29e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Mon, 31 Aug 2015 18:43:02 +0200
Subject: [PATCH 0698/2267] Add an option to configure PassengerLogFile

PassengerLogFile (available since 5.0.5) allows us to configure a
separate file where (all) applications running under passenger will send
their stdout/stderr to.

This is helpful in reducing noise when trying to parse httpd's error log
---
 README.md                          | 4 ++++
 manifests/mod/passenger.pp         | 5 +++++
 spec/classes/mod/passenger_spec.rb | 6 ++++++
 templates/mod/passenger.conf.erb   | 3 +++
 4 files changed, 18 insertions(+)

diff --git a/README.md b/README.md
index f720c4202a..a56b8597b6 100644
--- a/README.md
+++ b/README.md
@@ -2101,6 +2101,10 @@ Sets [PassengerRoot](https://www.phusionpassenger.com/documentation/Users%20guid
 
 Sets [PassengerAppEnv](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppEnv), the environment for the Passenger application. If not specifies, defaults to the global setting or 'production'.
 
+##### `passenger_log_file`
+
+By default Passenger log messages are written to the Apache global error log. With [PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile), you can have those messages logged to a different file instead. n.b.: This option is only available since Passenger 5.0.5
+
 ##### `passenger_ruby`
 
 Sets [PassengerRuby](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerRuby) on this virtual host, the Ruby interpreter to use for the application.
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index efd3486896..4f7cb7f04a 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -15,6 +15,7 @@
   $passenger_min_instances        = undef,
   $passenger_use_global_queue     = undef,
   $passenger_app_env              = undef,
+  $passenger_log_file             = undef,
   $mod_package                    = undef,
   $mod_package_ensure             = undef,
   $mod_lib                        = undef,
@@ -26,6 +27,9 @@
   if $passenger_spawn_method {
     validate_re($passenger_spawn_method, '(^smart$|^direct$|^smart-lv2$|^conservative$)', "${passenger_spawn_method} is not permitted for passenger_spawn_method. Allowed values are 'smart', 'direct', 'smart-lv2', or 'conservative'.")
   }
+  if $passenger_log_file {
+    validate_absolute_path($passenger_log_file)
+  }
 
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
@@ -70,6 +74,7 @@
   # - $passenger_spawn_method
   # - $passenger_stat_throttle_rate
   # - $passenger_use_global_queue
+  # - $passenger_log_file
   # - $passenger_app_env
   # - $rack_autodetect
   # - $rails_autodetect
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 40ac749f6a..c438241e06 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -118,6 +118,12 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerAppEnv foo$/) }
     end
+    describe "with passenger_log_file => '/var/log/apache2/passenger.log'" do
+      let :params do
+        { :passenger_log_file => '/var/log/apache2/passenger.log' }
+      end
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogFile /var/log/apache2/passenger.log$}) }
+    end
     describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
       let :params do
         { :mod_path => '/usr/lib/foo/mod_foo.so' }
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 1af4eaaa4b..9bd13c22ac 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -43,4 +43,7 @@
   <%- if @passenger_app_env -%>
   PassengerAppEnv <%= @passenger_app_env %>
   <%- end -%>
+  <%- if @passenger_log_file -%>
+  PassengerLogFile <%= @passenger_log_file %>
+  <%- end -%>
 </IfModule>

From b68b6aead3552617df74d72e031ebdb236ebd48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Mon, 28 Sep 2015 15:00:31 +0200
Subject: [PATCH 0699/2267] the passenger documentation has moved. follow it.

also, remove the wildly out-dated README.passenger.md
---
 README.md           |  12 +-
 README.passenger.md | 296 --------------------------------------------
 2 files changed, 6 insertions(+), 302 deletions(-)
 delete mode 100644 README.passenger.md

diff --git a/README.md b/README.md
index a56b8597b6..e571bc51eb 100644
--- a/README.md
+++ b/README.md
@@ -2095,11 +2095,11 @@ Sets the overrides for the specified virtual host. Accepts an array of [AllowOve
 
 ##### `passenger_app_root`
 
-Sets [PassengerRoot](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppRoot), the location of the Passenger application root if different from the DocumentRoot.
+Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot), the location of the Passenger application root if different from the DocumentRoot.
 
 ##### `passenger_app_env`
 
-Sets [PassengerAppEnv](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppEnv), the environment for the Passenger application. If not specifies, defaults to the global setting or 'production'.
+Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv), the environment for the Passenger application. If not specifies, defaults to the global setting or 'production'.
 
 ##### `passenger_log_file`
 
@@ -2107,19 +2107,19 @@ By default Passenger log messages are written to the Apache global error log. Wi
 
 ##### `passenger_ruby`
 
-Sets [PassengerRuby](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerRuby) on this virtual host, the Ruby interpreter to use for the application.
+Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby) on this virtual host, the Ruby interpreter to use for the application.
 
 ##### `passenger_min_instances`
 
-Sets [PassengerMinInstances](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerMinInstances), the minimum number of application processes to run.
+Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances), the minimum number of application processes to run.
 
 ##### `passenger_start_timeout`
 
-Sets [PassengerStartTimeout](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#_passengerstarttimeout_lt_seconds_gt), the timeout for the application startup.
+Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout), the timeout for the application startup.
 
 ##### `passenger_pre_start`
 
-Sets [PassengerPreStart](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerPreStart), the URL of the application if pre-starting is required.
+Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart), the URL of the application if pre-starting is required.
 
 ##### `php_flags & values`
 
diff --git a/README.passenger.md b/README.passenger.md
deleted file mode 100644
index d50b3f4897..0000000000
--- a/README.passenger.md
+++ /dev/null
@@ -1,296 +0,0 @@
-# Passenger
-
-Just enabling the Passenger module is insufficient for the use of Passenger in
-production. Passenger should be tunable to better fit the environment in which
-it is run while being aware of the resources it required.
-
-To this end the Apache passenger module has been modified to apply system wide
-Passenger tuning declarations to `passenger.conf`. Declarations specific to a
-virtual host should be passed through when defining a `vhost` (e.g.
-`rack_base_uris` parameter on the `apache::vhost` type, check `README.md`).
-
-Also, general apache module loading parameters can be supplied to enable using
-a customized passenger module in place of a default-package-based version of
-the module.
-
-## Operating system support and Passenger versions
-
-The most important configuration directive for the Apache Passenger module is
-`PassengerRoot`. Its value depends on the Passenger version used (2.x, 3.x or
-4.x) and on the operating system package from which the Apache Passenger module
-is installed.
-
-The following table summarises the current *default versions* and
-`PassengerRoot` settings for the operating systems supported by
-puppetlabs-apache:
-
-OS               | Passenger version  | `PassengerRoot` 
----------------- | ------------------ | ----------------
-Debian 7         | 3.0.13             | /usr
-Debian 8         | 4.0.53             | /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
-Ubuntu 12.04     | 2.2.11             | /usr
-Ubuntu 14.04     | 4.0.37             | /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini 
-RHEL with EPEL6  | 3.0.21             | /usr/lib/ruby/gems/1.8/gems/passenger-3.0.21 
-
-As mentioned in `README.md` there are no compatible packages available for
-RHEL/CentOS 5 or RHEL/CentOS 7.
-
-### Configuration files and locations on RHEL/CentOS
-
-Notice two important points:
-
-1. The Passenger version packaged in the EPEL repositories may change over time.
-2. The value of `PassengerRoot` depends on the Passenger version installed.
-
-To prevent the puppetlabs-apache module from having to keep up with these
-package versions the Passenger configuration files installed by the
-packages are left untouched by this module. All configuration is placed in an
-extra configuration file managed by puppetlabs-apache.
-
-This means '/etc/httpd/conf.d/passenger.conf' is installed by the
-`mod_passenger` package and contains correct values for `PassengerRoot` and
-`PassengerRuby`. Puppet will ignore this file. Additional configuration
-directives as described in the remainder of this document are placed in
-'/etc/httpd/conf.d/passenger_extra.conf', managed by Puppet.
-
-This pertains *only* to RHEL/CentOS, *not* Debian and Ubuntu.
-
-### Third-party and custom Passenger packages and versions
-
-The Passenger version distributed by the default OS packages may be too old to
-be useful. Newer versions may be installed via Gems, from source or from
-third-party OS packages.
-
-Most notably the Passenger developers officially provide Debian packages for a
-variety of Debian and Ubuntu releases in the [Passenger APT
-repository](https://oss-binaries.phusionpassenger.com/apt/passenger). Read more
-about [installing these packages in the offical user
-guide](http://www.modrails.com/documentation/Users%20guide%20Apache.html#install_on_debian_ubuntu).
-
-If you install custom Passenger packages and newer version make sure to set the
-directives `PassengerRoot`, `PassengerRuby` and/or `PassengerDefaultRuby`
-correctly, or Passenger and Apache will fail to function properly.
-
-For Passenger 4.x packages on Debian and Ubuntu the `PassengerRoot` directive
-should almost universally be set to
-`/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini`.
-
-## Parameters for `apache::mod::passenger`
-
-The following class parameters configure Passenger in a global, server-wide
-context.
-
-Example:
-
-```puppet
-class { 'apache::mod::passenger':
-  passenger_root             => '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini',
-  passenger_default_ruby     => '/usr/bin/ruby1.9.3',
-  passenger_high_performance => 'on',
-  rails_autodetect           => 'off',
-  mod_lib_path               => '/usr/lib/apache2/custom_modules',
-}
-```
-
-The general form is using the all lower-case version of the configuration
-directive, with underscores instead of CamelCase.
-
-### Parameters used with passenger.conf
-
-If you pass a default value to `apache::mod::passenger` it will be ignored and
-not passed through to the configuration file. 
-
-#### passenger_root
-
-The location to the Phusion Passenger root directory. This configuration option
-is essential to Phusion Passenger, and allows Phusion Passenger to locate its
-own data files. 
-
-The default depends on the Passenger version and the means of installation. See
-the above section on operating system support, versions and packages for more
-information.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerroot_lt_directory_gt
-
-#### passenger_default_ruby
-
-This option specifies the default Ruby interpreter to use for web apps as well
-as for all sorts of internal Phusion Passenger helper scripts, e.g. the one
-used by PassengerPreStart.
-
-This directive was introduced in Passenger 4.0.0 and will not work in versions
-< 4.x. Do not set this parameter if your Passenger version is older than 4.0.0.
-
-Defaults to `undef` for all operating systems except Ubuntu 14.04, where it is
-set to '/usr/bin/ruby'.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerDefaultRuby
-
-#### passenger_ruby
-
-This directive is the same as `passenger_default_ruby` for Passenger versions
-< 4.x and must be used instead of `passenger_default_ruby` for such versions.
-
-It makes no sense to set `PassengerRuby` for Passenger >= 4.x. That
-directive should only be used to override the value of `PassengerDefaultRuby`
-on a non-global context, i.e. in `<VirtualHost>`, `<Directory>`, `<Location>`
-and so on.
-
-Defaults to `/usr/bin/ruby` for all supported operating systems except Ubuntu
-14.04, where it is set to `undef`.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerRuby
-
-#### passenger_high_performance
-
-Default is `off`. When turned `on` Passenger runs in a higher performance mode
-that can be less compatible with other Apache modules.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerHighPerformance
-
-#### passenger_max_pool_size
-
-Sets the maximum number of Passenger application processes that may
-simultaneously run. The default value is 6.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengermaxpoolsize_lt_integer_gt
-
-#### passenger_pool_idle_time
-
-The maximum number of seconds a Passenger Application process will be allowed
-to remain idle before being shut down. The default value is 300.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerPoolIdleTime
-
-#### passenger_max_requests
-
-The maximum number of request a Passenger application will process before being
-restarted. The default value is 0, which indicates that a process will only
-shut down if the Pool Idle Time (see above) expires.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
-
-#### passenger_spawn_method
-
-Sets the method by which Ruby application processes are spawned.  Default is `smart`
-which caches code using the app preloader.
-
-Passenger >= 4.0 renamed `conservative` to `direct` and `smart-lv2` to `smart`.
-
-https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerSpawnMethod
-
-#### passenger_stat_throttle_rate
-
-Sets how often Passenger performs file system checks, at most once every _x_
-seconds. Default is 0, which means the checks are performed with every request.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
-
-#### rack_autodetect
-
-Should Passenger automatically detect if the document root of a virtual host is
-a Rack application. Not set by default (`undef`). Note that this directive has
-been removed in Passenger 4.0.0 and `PassengerEnabled` should be used instead.
-Use this directive only on Passenger < 4.x.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
-
-#### rails_autodetect
-
-Should Passenger automatically detect if the document root of a virtual host is
-a Rails application.  Not set by default (`undef`). Note that this directive
-has been removed in Passenger 4.0.0 and `PassengerEnabled` should be used
-instead. Use this directive only on Passenger < 4.x.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_lt_on_off_gt
-
-#### passenger_use_global_queue
-
-Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is
-the default in Passenger 4.x and the versions >= 4.x have disabled this
-configuration option altogether.  Use with caution.
-
-#### passenger_app_env
-
-Sets the global default `PassengerAppEnv` for Passenger applications. Not set by
-default (`undef`) and thus defaults to Passenger's built-in value of 'production'.
-This directive can be overridden in an `apache::vhost` resource.
-
-https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerAppEnv
-
-### Parameters used to load the module
-
-Unlike the tuning parameters specified above, the following parameters are only
-used when loading customized passenger modules.
-
-#### mod_package
-
-Allows overriding the default package name used for the passenger module
-package.
-
-#### mod_package_ensure
-
-Allows overriding the package installation setting used by puppet when
-installing the passenger module. The default is 'present'.
-
-#### mod_id
-
-Allows overriding the value used by apache to identify the passenger module.
-The default is 'passenger_module'.
-
-#### mod_lib_path
-
-Allows overriding the directory path used by apache when loading the passenger
-module. The default is the value of `$apache::params::lib_path`.
-
-#### mod_lib
-
-Allows overriding the library file name used by apache when loading the
-passenger module. The default is 'mod_passenger.so'.
-
-#### mod_path
-
-Allows overriding the full path to the library file used by apache when loading
-the passenger module. The default is the concatenation of the `mod_lib_path`
-and `mod_lib` parameters.
-
-## Dependencies
-
-RedHat-based systems will need to configure additional package repositories in
-order to install Passenger, specifically:
-
-* [Extra Packages for Enterprise Linux](https://fedoraproject.org/wiki/EPEL)
-* [Phusion Passenger](http://passenger.stealthymonkeys.com)
-
-Configuration of these repositories is beyond the scope of this module and is
-left to the user.
-
-## Attribution
-
-The Passenger tuning parameters for the `apache::mod::passenger` Puppet class
-was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the
-NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the
-PuppetLabs Apache module on GitHub.
-
-* https://github.com/puppetlabs/puppetlabs-apache
-* https://github.com/nesi/puppetlabs-apache
-* http://www.nesi.org.nz//
-* https://tuakiri.ac.nz/confluence/display/Tuakiri/Home
-
-## Copyright and License
-
-Copyright (C) 2012 [Puppet Labs](https://www.puppetlabs.com/) Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

From 1a981c7d048d410662bf256eea233015b9b3613f Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Wed, 30 Sep 2015 13:52:47 +0200
Subject: [PATCH 0700/2267] (MODULES-2649) Allow SetOutputFilter to be set on a
 directory.

e.g

```puppet
apache::vhost{'abc.example.org':
  directories => [
    { path              => '/path/to/filtered',
      set_output_filter => 'puppetdb-filter',
    },
  ],
}
```

* https://tickets.puppetlabs.com/browse/MODULES-2649
* http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter
---
 README.md                        | 15 +++++++++++++++
 spec/defines/vhost_spec.rb       |  5 +++++
 templates/vhost/_directories.erb |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/README.md b/README.md
index f720c4202a..e9cf59eee6 100644
--- a/README.md
+++ b/README.md
@@ -2884,6 +2884,21 @@ Sets a `SetHandler` directive as per the [Apache Core documentation](http://http
     }
 ~~~
 
+###### `set_output_filter`
+
+Sets a `SetOutputFilter` directive as per [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter). An example:
+
+~~~ puppet
+    apache::vhost{ 'filter.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path              => '/path/to/directory',
+          set_output_filter => puppetdb-strip-resource-params,
+        },
+      ],
+    }
+~~~
+
 ###### `rewrites`
 
 Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 03140931fc..6fd59f9157 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -190,6 +190,9 @@
               'index_options'     => ['FancyIndexing'],
               'index_style_sheet' => '/styles/style.css',
             },
+            { 'path'              => '/var/www/files/output_filtered',
+              'set_output_filter' => 'output_filter',
+            },
           ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
@@ -399,6 +402,8 @@
         :content => /^\s+IndexStyleSheet\s'\/styles\/style\.css'$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+DirectoryIndex\sdisabled$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+SetOutputFilter\soutput_filter$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 189bd57701..bcb958601a 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -239,6 +239,9 @@
     SetEnv <%= setenv %>
       <%- end -%>
     <%- end -%>
+    <%- if directory['set_output_filter'] -%>
+    SetOutputFilter <%= directory['set_output_filter'] %>
+    <%- end -%>
     <%- if @shibboleth_enabled -%>
       <%- if directory['shib_require_session'] and ! directory['shib_require_session'].empty? -%>
     ShibRequireSession <%= directory['shib_require_session'] %>

From a59015bb12b556b17b33068902a4b005bffc6b08 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Fri, 25 Sep 2015 10:13:49 +0200
Subject: [PATCH 0701/2267] (MODULES-2647) Optinally set parameters for
 mod_ext_filter module

Permits the

* ExtFilterDefine to be set multiple times on a server.
* ExtFilterOptions to be set on a directory context.

```puppet
class{'apache':
  default_mods => false,
  directories  => [
    { path               => '/var/www/filter',
      ext_filter_options => 'LogStderr Onfail=abort',
    },
  ],
}
class{'apache::mod::ext_filter':
  ext_filter_define => {
    'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
    'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
  },
}
```

* https://tickets.puppetlabs.com/browse/MODULES-2647
* http://httpd.apache.org/docs/current/mod/mod_ext_filter.html
---
 README.md                           | 36 ++++++++++++++++
 manifests/default_mods.pp           |  2 +-
 manifests/mod/ext_filter.pp         | 24 +++++++++++
 spec/classes/mod/ext_filter_spec.rb | 66 +++++++++++++++++++++++++++++
 templates/mod/ext_filter.conf.erb   |  6 +++
 templates/vhost/_directories.erb    |  3 ++
 6 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 manifests/mod/ext_filter.pp
 create mode 100644 spec/classes/mod/ext_filter_spec.rb
 create mode 100644 templates/mod/ext_filter.conf.erb

diff --git a/README.md b/README.md
index e9cf59eee6..76eab50a48 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@
 [`apache::mod::auth_mellon`]: #class-apachemodauth_mellon
 [`apache::mod::disk_cache`]: #class-apachemoddisk_cache
 [`apache::mod::event`]: #class-apachemodevent
+[`apache::mod::ext_filter`]: #class-apachemodext_filter
 [`apache::mod::geoip`]: #class-apachemodgeoip
 [`apache::mod::itk`]: #class-apachemoditk
 [`apache::mod::passenger`]: #class-apachemodpassenger
@@ -145,6 +146,7 @@
 [`mod_authnz_external`]: https://code.google.com/p/mod-auth-external/
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
 [`mod_expires`]: http://httpd.apache.org/docs/current/mod/mod_expires.html
+[`mod_ext_filter`]: http://httpd.apache.org/docs/current/mod/mod_ext_filter.html
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
 [`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/
 [`mod_info`]: https://httpd.apache.org/docs/current/mod/mod_info.html
@@ -1198,6 +1200,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `disk_cache` (see [`apache::mod::disk_cache`][])
 * `event` (see [`apache::mod::event`][])
 * `expires`
+* `ext_filter` (see [`apache::mod::ext_filter`][])
 * `fastcgi`
 * `fcgid`
 * `filter`
@@ -1345,6 +1348,23 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 - `expires_default`: Default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][]. Default: undef.
 - `expires_by_type`: Describes a set of [MIME `content-type`][] and their expiration times. Valid options: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content-type` (i.e. 'text/json') and its value following valid [interval syntax][]. Default: undef.
 
+##### Class: `apache::mod::ext_filter`
+
+Installs and configures [`mod_ext_filter`][].
+
+~~~ puppet
+class{'apache::mod::ext_filter':
+  ext_filter_define => {
+    'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
+    'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
+  },
+}
+~~~
+
+**Parameters within `apache::mod::ext_filter`**:
+
+- `ext_filter_define`: A hash of filter names and their parameters. Default: undef.
+
 ##### Class: `apache::mod::fcgid`
 
 Installs and configures [`mod_fcgid`][].
@@ -2654,6 +2674,22 @@ An array of hashes used to override the [ErrorDocument](https://httpd.apache.org
     }
 ~~~
 
+###### `ext_filter_options`
+
+Sets the [ExtFilterOptions](http://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
+Note that you must delcare `class {'apache::mod::ext_filter': }` before using this directive.
+
+~~~ puppet
+    apache::vhost{ 'filter.example.org':
+      docroot => '/var/www/filter',
+      directories => [
+        { path               => '/var/www/filter',
+          ext_filter_options => 'LogStderr Onfail=abort',
+        },
+      ],
+    }
+~~~
+
 ###### `geoip_enable`
 
 Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive.
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index a1d2c89ef3..fd057d113f 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -50,6 +50,7 @@
         include ::apache::mod::actions
         include ::apache::mod::authn_core
         include ::apache::mod::cache
+        include ::apache::mod::ext_filter
         include ::apache::mod::mime
         include ::apache::mod::mime_magic
         include ::apache::mod::rewrite
@@ -63,7 +64,6 @@
         ::apache::mod { 'authz_dbm': }
         ::apache::mod { 'authz_owner': }
         ::apache::mod { 'expires': }
-        ::apache::mod { 'ext_filter': }
         ::apache::mod { 'include': }
         ::apache::mod { 'logio': }
         ::apache::mod { 'substitute': }
diff --git a/manifests/mod/ext_filter.pp b/manifests/mod/ext_filter.pp
new file mode 100644
index 0000000000..b78abb6071
--- /dev/null
+++ b/manifests/mod/ext_filter.pp
@@ -0,0 +1,24 @@
+class apache::mod::ext_filter(
+  $ext_filter_define = undef
+) {
+
+  if $ext_filter_define {
+    validate_hash($ext_filter_define)
+  }
+
+  ::apache::mod { 'ext_filter': }
+
+  # Template uses
+  # -$ext_filter_define
+
+  if $ext_filter_define {
+    file { 'ext_filter.conf':
+      ensure  => file,
+      path    => "${::apache::mod_dir}/ext_filter.conf",
+      content => template('apache/mod/ext_filter.conf.erb'),
+      require => [ Exec["mkdir ${::apache::mod_dir}"], ],
+      before  => File[$::apache::mod_dir],
+      notify  => Class['Apache::Service'],
+    }
+  }
+}
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
new file mode 100644
index 0000000000..afa71c1083
--- /dev/null
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -0,0 +1,66 @@
+describe 'apache::mod::ext_filter', :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',
+        :lsbdistcodename        => 'squeeze',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :fqdn                   => 'test.example.com',
+        :is_pe                  => false,
+      }
+    end
+    describe 'with no parameters' do
+      it { is_expected.to contain_apache__mod('ext_filter') }
+      it { is_expected.not_to contain_file('ext_filter.conf') }
+    end
+    describe 'with parameters' do
+      let :params do
+        { :ext_filter_define =>  {'filtA' => 'input=A output=B',
+                                  'filtB' => 'input=C cmd="C"' },
+        }
+      end
+      it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtA\s+input=A output=B$/) }
+      it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtB\s+input=C cmd="C"$/) }
+    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',
+        :fqdn                   => 'test.example.com',
+        :is_pe                  => false,
+      }
+    end
+    describe 'with no parameters' do
+      it { is_expected.to contain_apache__mod('ext_filter') }
+      it { is_expected.not_to contain_file('ext_filter.conf') }
+    end
+    describe 'with parameters' do
+      let :params do
+        { :ext_filter_define =>  {'filtA' => 'input=A output=B',
+                                  'filtB' => 'input=C cmd="C"' },
+        }
+      end
+      it { is_expected.to contain_file('ext_filter.conf').with_path('/etc/httpd/conf.d/ext_filter.conf') }
+      it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtA\s+input=A output=B$/) }
+      it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtB\s+input=C cmd="C"$/) }
+    end
+  end
+end
diff --git a/templates/mod/ext_filter.conf.erb b/templates/mod/ext_filter.conf.erb
new file mode 100644
index 0000000000..67f98fd4c7
--- /dev/null
+++ b/templates/mod/ext_filter.conf.erb
@@ -0,0 +1,6 @@
+# mod_ext_filter definitions
+<%- if @ext_filter_define.length >= 1 -%>
+<%- @ext_filter_define.keys.sort.each do |name| -%>
+ExtFilterDefine <%= name %> <%= @ext_filter_define[name] %>
+<%- end -%>
+<%- end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index bcb958601a..df6b6615e4 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -198,6 +198,9 @@
     ExpiresByType <%= rule %>
     <%- end -%>
     <%- end -%>
+    <%- if directory['ext_filter_options'] -%>
+    ExtFilterOptions <%= directory['ext_filter_options'] %>
+    <%- end -%>
     <%- if directory['force_type'] -%>
     ForceType <%= directory['force_type'] %>
     <%- end -%>

From e500a5582e1b31996e14f4588ba656527cd1d1e7 Mon Sep 17 00:00:00 2001
From: orthographic-pedant <travis.hoppe+orthographicpendant@gmail.com>
Date: Wed, 30 Sep 2015 13:19:05 -0400
Subject: [PATCH 0702/2267] Fixed typographical error, changed accomodate to
 accommodate in README.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 76eab50a48..a5012f4db9 100644
--- a/README.md
+++ b/README.md
@@ -327,7 +327,7 @@ apache::vhost { 'user.example.com':
 
 #### Configuring virtual hosts with SSL
 
-To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accomodate HTTPS requests:
+To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accommodate HTTPS requests:
 
 ~~~ puppet
 apache::vhost { 'ssl.example.com':

From 8447589abcec675f3ee57e6607861e937e850877 Mon Sep 17 00:00:00 2001
From: Bruno Furtado <bfurtado@demonware.net>
Date: Wed, 30 Sep 2015 18:40:16 +0100
Subject: [PATCH 0703/2267] Change SSLProtocol in apache::vhost to be space
 separated

---
 templates/vhost/_ssl.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index e99b739a67..3a76bd45de 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -26,7 +26,7 @@
   SSLProxyEngine On
   <%- end -%>
   <%- if @ssl_protocol -%>
-  SSLProtocol             <%= @ssl_protocol %>
+  SSLProtocol             <%= @ssl_protocol.compact.join(' ') %>
   <%- end -%>
   <%- if @ssl_cipher -%>
   SSLCipherSuite          <%= @ssl_cipher %>

From d57816b90b9639a5213794b3a408f7aa4d679ea5 Mon Sep 17 00:00:00 2001
From: Bruno Furtado <bfurtado@demonware.net>
Date: Thu, 1 Oct 2015 13:16:57 +0100
Subject: [PATCH 0704/2267] Added support for both string and array on
 ssl_protocol for apache::vhost

---
 templates/vhost/_ssl.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 3a76bd45de..a3d76fb13e 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -26,7 +26,7 @@
   SSLProxyEngine On
   <%- end -%>
   <%- if @ssl_protocol -%>
-  SSLProtocol             <%= @ssl_protocol.compact.join(' ') %>
+  SSLProtocol             <%= [@ssl_protocol].flatten.compact.join(' ') %>
   <%- end -%>
   <%- if @ssl_cipher -%>
   SSLCipherSuite          <%= @ssl_cipher %>

From 445d4367ddd076109ce36c95bf69d08de72beaa6 Mon Sep 17 00:00:00 2001
From: Tobias Brox <tobias@redpill-linpro.com>
Date: Thu, 8 Oct 2015 16:41:27 +0200
Subject: [PATCH 0705/2267] RC4 is deprecated, ref
 https://community.qualys.com/blogs/securitylabs/2013/09/17/updated-ssltls-deployment-best-practices-deprecate-rc4
 - usage will downgrade the SSL rating from A to B on their rating service at
 https://www.ssllabs.com/ssltest/

---
 README.md            | 2 +-
 manifests/mod/ssl.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a5012f4db9..3a36c2efff 100644
--- a/README.md
+++ b/README.md
@@ -1513,7 +1513,7 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 
 **Parameters within `apache::mod::ssl`**:
 
-- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5'.
+- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
 - `ssl_compression`: Default: 'false'.
 - `ssl_cryptodevice`: Default: 'builtin'.
 - `ssl_honorcipherorder`: Default: 'On'.
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 475f233a50..a653badeda 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -3,7 +3,7 @@
   $ssl_cryptodevice        = 'builtin',
   $ssl_options             = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd    = undef,
-  $ssl_cipher              = 'HIGH:MEDIUM:!aNULL:!MD5',
+  $ssl_cipher              = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4',
   $ssl_honorcipherorder    = 'On',
   $ssl_protocol            = [ 'all', '-SSLv2', '-SSLv3' ],
   $ssl_pass_phrase_dialog  = 'builtin',

From 4c87d22f47b0d89dc69496947c8deab841ae4d25 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Sun, 4 Oct 2015 12:39:58 +0200
Subject: [PATCH 0706/2267] Add option to configure the include pattern for the
 vhost_enable dir

---
 README.md                | 10 ++++++++++
 manifests/init.pp        |  1 +
 manifests/params.pp      |  2 ++
 templates/httpd.conf.erb |  4 ++--
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3a36c2efff..5066caac99 100644
--- a/README.md
+++ b/README.md
@@ -1126,6 +1126,16 @@ Changes your virtual host configuration files' location. Default: determined by
 - **Gentoo**: `/etc/apache2/vhosts.d`
 - **Red Hat**: `/etc/httpd/conf.d`
 
+##### `vhost_include_pattern`
+
+Defines the pattern for files included from the `vhost_dir`. This defaults to '*', also for BC with previous versions of this module.
+
+However, you may want to set this to a value like '[^.#]\*.conf[^~]' to make sure files accidentally created in this directory (from version
+control systems, editor backups or the like) are *not* included in your server configuration.
+
+A value of '*.conf' is what is shipped by some operating systems. Also note that this module will, by default, create config files ending
+in '.conf'.
+
 ##### `user`
 
 Changes the user Apache uses to answer requests. Apache's parent process will continue to be run as root, but child processes will access resources as the user defined by this parameter.
diff --git a/manifests/init.pp b/manifests/init.pp
index 5f02bfd61f..873b42ef47 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,6 +46,7 @@
   $confd_dir              = $::apache::params::confd_dir,
   $vhost_dir              = $::apache::params::vhost_dir,
   $vhost_enable_dir       = $::apache::params::vhost_enable_dir,
+  $vhost_include_pattern  = $::apache::params::vhost_include_pattern,
   $mod_dir                = $::apache::params::mod_dir,
   $mod_enable_dir         = $::apache::params::mod_enable_dir,
   $mpm_module             = $::apache::params::mpm_module,
diff --git a/manifests/params.pp b/manifests/params.pp
index 5c5233ccdb..a2ab7382c6 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -32,6 +32,8 @@
   # should we use systemd module?
   $use_systemd = true
 
+  $vhost_include_pattern = '*'
+
   if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } else {
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 8664a43e4d..e0d16e1229 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -85,9 +85,9 @@ Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-IncludeOptional "<%= @vhost_load_dir %>/*"
+IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
 <%- else -%>
-Include "<%= @vhost_load_dir %>/*"
+Include "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
 <%- end -%>
 <% end -%>
 

From f57f7f75e5324f3ab857ad05c29fad4a5ea0354a Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Thu, 8 Oct 2015 20:02:00 -0400
Subject: [PATCH 0707/2267] (MODULES-2120) Allow empty docroot

README.md updated
If `docroot` and [`manage_docroot`][] are both set to `false`, no
[`DocumentRoot`][] will be set and the accompanying
`<Directory /path/to/directory>` block will not be created.
---
 README.md                    |  3 +++
 manifests/vhost.pp           | 20 ++++++++++++++------
 templates/vhost/_docroot.erb |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 5066caac99..762689d07b 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@
 [`logroot`]: #logroot
 [Log security]: http://httpd.apache.org/docs/current/logs.html#security
 
+[`manage_docroot`]: #manage_docroot
 [`manage_user`]: #manage_user
 [`manage_group`]: #manage_group
 [`MaxConnectionsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild
@@ -1886,6 +1887,8 @@ Sets the list of resources to look for when a client requests an index of the di
 
 **Required**. Sets the [`DocumentRoot`][] location, from which Apache serves files.
 
+If `docroot` and [`manage_docroot`][] are both set to `false`, no [`DocumentRoot`][] will be set and the accompanying `<Directory /path/to/directory>` block will not be created.
+
 ##### `docroot_group`
 
 Sets group access to the [`docroot`][] directory. Defaults to 'root'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 25530bccb8..36d425ef13 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -227,6 +227,12 @@
   if $limit_request_field_size {
     validate_integer($limit_request_field_size)
   }
+
+  # Validate the docroot as a string if:
+  # - $manage_docroot is true
+  if $manage_docroot {
+    validate_string($docroot)
+  }
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -271,7 +277,7 @@
 
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
-  if ! defined(File[$docroot]) and $manage_docroot {
+  if $manage_docroot and $docroot and ! defined(File[$docroot]) {
     file { $docroot:
       ensure  => directory,
       owner   => $docroot_owner,
@@ -443,7 +449,7 @@
       fail("Apache::Vhost[${name}]: 'directories' must be either a Hash or an Array of Hashes")
     }
     $_directories = $directories
-  } else {
+  } elsif $docroot {
     $_directory = {
       provider       => 'directory',
       path           => $docroot,
@@ -518,10 +524,12 @@
   # Template uses:
   # - $virtual_docroot
   # - $docroot
-  concat::fragment { "${name}-docroot":
-    target  => "${priority_real}${filename}.conf",
-    order   => 10,
-    content => template('apache/vhost/_docroot.erb'),
+  if $docroot {
+    concat::fragment { "${name}-docroot":
+      target  => "${priority_real}${filename}.conf",
+      order   => 10,
+      content => template('apache/vhost/_docroot.erb'),
+    }
   }
 
   # Template uses:
diff --git a/templates/vhost/_docroot.erb b/templates/vhost/_docroot.erb
index 6039fa63cf..b67998b4b4 100644
--- a/templates/vhost/_docroot.erb
+++ b/templates/vhost/_docroot.erb
@@ -2,6 +2,6 @@
   ## Vhost docroot
 <% if @virtual_docroot -%>
   VirtualDocumentRoot "<%= @virtual_docroot %>"
-<% else -%>
+<% elsif @docroot -%>
   DocumentRoot "<%= @docroot %>"
 <% end -%>

From 9d8efecc1e8baa65d20f11457791ff65d7b8ed56 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Thu, 8 Oct 2015 23:55:50 +0200
Subject: [PATCH 0708/2267] Install all modules before adding custom configs

The problem is that we have defines (apache::custom_config and apache::mod) on both sides so we cannot easily reference the one side from the other (when we want to avoid the <||> syntax). So, we use an anchor as the reference point and make things happen before or after that.
---
 manifests/custom_config.pp         | 3 ++-
 manifests/init.pp                  | 4 ++++
 manifests/mod.pp                   | 2 ++
 spec/defines/custom_config_spec.rb | 8 ++++----
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index ceb1fd077a..7ce755b35c 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -49,12 +49,13 @@
   }
 
   if $ensure == 'present' and $verify_config {
-    exec { "service notify for ${name}":
+    exec { "syntax verification for ${name}":
       command     => $verify_command,
       subscribe   => File["apache_${name}"],
       refreshonly => true,
       notify      => Class['Apache::Service'],
       before      => Exec["remove ${name} if invalid"],
+      require     => Anchor['::apache::modules_set_up']
     }
 
     exec { "remove ${name} if invalid":
diff --git a/manifests/init.pp b/manifests/init.pp
index 873b42ef47..7baa65713c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -381,4 +381,8 @@
       manage_docroot  => $default_ssl_vhost,
     }
   }
+
+  # This anchor can be used as a reference point for things that need to happen *after*
+  # all modules have been put in place.
+  anchor { '::apache::modules_set_up': }
 }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 920114a7c7..abdbfcbed5 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -162,4 +162,6 @@
       }
     }
   }
+
+  Apache::Mod[$name] -> Anchor['::apache::modules_set_up']
 }
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index a5efd15a2f..7d566b0716 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -26,7 +26,7 @@
         'content' => '# Test',
       }
     end
-    it { is_expected.to contain_exec("service notify for rspec").with({
+    it { is_expected.to contain_exec("syntax verification for rspec").with({
       'refreshonly' => 'true',
       'subscribe'   => 'File[apache_rspec]',
       'command'     => '/usr/sbin/apachectl -t',
@@ -56,7 +56,7 @@
         'verify_command' => '/bin/true',
       }
     end
-    it { is_expected.to contain_exec("service notify for rspec").with({
+    it { is_expected.to contain_exec("syntax verification for rspec").with({
       'command'     => '/bin/true',
     })
     }
@@ -80,7 +80,7 @@
         'verify_config' => false,
       }
     end
-    it { is_expected.to_not contain_exec('service notify for rspec') }
+    it { is_expected.to_not contain_exec('syntax verification for rspec') }
     it { is_expected.to_not contain_exec('remove rspec if invalid') }
     it { is_expected.to contain_file('apache_rspec').with({
       'notify' => 'Class[Apache::Service]'
@@ -93,7 +93,7 @@
         'ensure' => 'absent'
       }
     end
-    it { is_expected.to_not contain_exec('service notify for rspec') }
+    it { is_expected.to_not contain_exec('syntax verification for rspec') }
     it { is_expected.to_not contain_exec('remove rspec if invalid') }
     it { is_expected.to contain_file('apache_rspec').with({
       'ensure' => 'absent',

From bb5b27ee2757d312b60873245a0f333ff4bc8ed5 Mon Sep 17 00:00:00 2001
From: Bruno Furtado <bfurtado@demonware.net>
Date: Sun, 11 Oct 2015 21:33:40 +0100
Subject: [PATCH 0709/2267] Added tests and updated docs for string and array
 support on ssl_protocol for apache::vhost.

---
 README.md                     |  2 +-
 spec/acceptance/vhost_spec.rb | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 76eab50a48..ff5ecb0485 100644
--- a/README.md
+++ b/README.md
@@ -3036,7 +3036,7 @@ Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/ce
 
 ##### `ssl_protocol`
 
-Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array of accepted protocols. Defaults to 'all', '-SSLv2', '-SSLv3'.
+Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array or space separated string of accepted protocols. Defaults to 'all', '-SSLv2', '-SSLv3'.
 
 ##### `ssl_cipher`
 
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index b5d51e91f4..dd6d03cd19 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1339,4 +1339,31 @@ class { 'apache': }
       it { is_expected.to be_file }
     end
   end
+
+  describe 'SSLProtocol directive' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        apache::vhost { 'test.server':
+          docroot => '/tmp',
+          ssl_protocol => ['All', '-SSLv2'],
+        }
+        apache::vhost { 'test2.server':
+          docroot => '/tmp',
+          ssl_protocol => 'All -SSLv2',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLProtocol All -SSLv2' }
+    end
+
+    describe file("#{$vhost_dir}/25-test2.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLProtocol All -SSLv2' }
+    end
+  end
 end

From b63aac22781cc9cafe33aea9c300f2e36890f643 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 13 Oct 2015 16:08:54 +0100
Subject: [PATCH 0710/2267] (MAINT) add a small test for no-docroot-mode

---
 spec/defines/vhost_spec.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 6fd59f9157..2964e9b280 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -612,6 +612,16 @@
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-limits') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
+    context 'when not setting nor managing the docroot' do
+      let :params do
+        {
+          'docroot'                     => false,
+          'manage_docroot'              => false,
+        }
+      end
+      it { is_expected.to compile }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
+    end
   end
   describe 'access logs' do
     let :facts do

From 680f3a9ff04e4d7f057942d72a8834a9be205ad2 Mon Sep 17 00:00:00 2001
From: Damon Conway <damon.conway@alchemysystems.com>
Date: Tue, 6 Oct 2015 12:22:37 -0700
Subject: [PATCH 0711/2267] (MODULES-2673) Adding dev_packages to apache class.
 Allows use of httpd24u-devel from the IUS repo.

Adding documentation to README for dev_packages param to the apache class.
Adding include apache::dev to example for dev_packages param.
---
 README.md         | 14 ++++++++++++++
 manifests/dev.pp  |  2 +-
 manifests/init.pp |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a5012f4db9..4f43961768 100644
--- a/README.md
+++ b/README.md
@@ -888,6 +888,20 @@ Configures a default virtual host when the class is declared. Valid options: Boo
 
 To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to 'false'.
 
+##### `dev_packages`
+
+Configures a specific dev package to use. Valid options: String.  Default: 'OS default httpd dev package'.
+
+Example for using httpd 2.4 from the IUS yum repo:
+
+~~~ puppet
+include ::apache::dev
+class { 'apache':
+  apache_name  => 'httpd24u',
+  dev_packages => 'httpd24u-devel',
+}
+~~~
+
 ##### `docroot`
 
 Sets the default [`DocumentRoot`][] location. Default: Determined by your operating system.
diff --git a/manifests/dev.pp b/manifests/dev.pp
index b1947e9344..fdebf59f55 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -1,6 +1,6 @@
 class apache::dev {
   include ::apache::params
-  $packages = $::apache::params::dev_packages
+  $packages = $::apache::dev_packages
   if $packages { # FreeBSD doesn't have dev packages to install
     package { $packages:
       ensure  => present,
diff --git a/manifests/init.pp b/manifests/init.pp
index 5f02bfd61f..2361c5457b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,6 +28,7 @@
   $default_ssl_crl        = undef,
   $default_ssl_crl_check  = undef,
   $default_type           = 'none',
+  $dev_packages           = $::apache::params::dev_packages,
   $ip                     = undef,
   $service_enable         = true,
   $service_manage         = true,

From 94b2f0f8dc97a66ee62184edaaf25bb5c1ba0221 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 14 Oct 2015 17:57:12 +0100
Subject: [PATCH 0712/2267] (MODULES-2680) fix default nodeset to actually work

Centos boxes prior to 6.6 cannot connect to fedoraproject's mirror, because
of SSL issues.
---
 spec/acceptance/nodesets/centos-59-x64.yml    | 10 ----------
 spec/acceptance/nodesets/centos-64-x64-pe.yml | 12 ------------
 spec/acceptance/nodesets/centos-64-x64.yml    | 11 -----------
 spec/acceptance/nodesets/centos-65-x64.yml    | 10 ----------
 spec/acceptance/nodesets/default.yml          |  5 ++---
 5 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 spec/acceptance/nodesets/centos-59-x64.yml
 delete mode 100644 spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 spec/acceptance/nodesets/centos-64-x64.yml
 delete mode 100644 spec/acceptance/nodesets/centos-65-x64.yml

diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index 2ad90b86aa..0000000000
--- a/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b9..0000000000
--- a/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/spec/acceptance/nodesets/centos-64-x64.yml b/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index ce47212a8c..0000000000
--- a/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
deleted file mode 100644
index 4e2cb809e8..0000000000
--- a/spec/acceptance/nodesets/centos-65-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index ce47212a8c..00e141d092 100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1,10 +1,9 @@
 HOSTS:
-  centos-64-x64:
+  centos-66-x64:
     roles:
       - master
     platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    box : puppetlabs/centos-6.6-64-nocm
     hypervisor : vagrant
 CONFIG:
   log_level: debug

From 1d46f7b6573e6d0ebbe269fa7006575f8087bbc4 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 14 Oct 2015 17:58:04 +0100
Subject: [PATCH 0713/2267] (MODULES-2655) fix acceptance tests to correctly
 detect SELinux

$::selinux can be a string that says "false", but evaluates to `true` in
the `if`.
---
 spec/acceptance/apache_parameters_spec.rb | 2 +-
 spec/acceptance/class_spec.rb             | 2 +-
 spec/acceptance/vhost_spec.rb             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 4c6fa7f56d..c46a220432 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -358,7 +358,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = <<-EOS
-          if $::osfamily == 'RedHat' and $::selinux {
+          if $::osfamily == 'RedHat' and "$::selinux" == "true" {
             $semanage_package = $::operatingsystemmajrelease ? {
               '5'     => 'policycoreutils',
               default => 'policycoreutils-python',
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 0a7d67bbb0..0cf1c36f90 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -45,7 +45,7 @@ class { 'apache': }
     # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
-      if $::osfamily == 'RedHat' and $::selinux {
+      if $::osfamily == 'RedHat' and "$::selinux" == "true" {
         $semanage_package = $::operatingsystemmajrelease ? {
           '5'     => 'policycoreutils',
           default => 'policycoreutils-python',
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index dd6d03cd19..6ca7c350e1 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1287,7 +1287,7 @@ class { 'apache::mod::fastcgi': }
   describe 'additional_includes' do
     it 'applies cleanly' do
       pp = <<-EOS
-        if $::osfamily == 'RedHat' and $::selinux {
+        if $::osfamily == 'RedHat' and "$::selinux" == "true" {
           $semanage_package = $::operatingsystemmajrelease ? {
             '5'     => 'policycoreutils',
             default => 'policycoreutils-python',

From 72df6f3c6dbe992b60ffcb15ccb0c720ee1f7b0a Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 14 Oct 2015 20:05:24 +0100
Subject: [PATCH 0714/2267] (MODULES-2655) Fix acceptance testing for
 SSLProtocol behaviour for real

---
 spec/acceptance/vhost_spec.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 6ca7c350e1..e903b38d82 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1345,11 +1345,13 @@ class { 'apache': }
       pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'test.server':
-          docroot => '/tmp',
+          docroot      => '/tmp',
+          ssl          => true,
           ssl_protocol => ['All', '-SSLv2'],
         }
         apache::vhost { 'test2.server':
-          docroot => '/tmp',
+          docroot      => '/tmp',
+          ssl          => true,
           ssl_protocol => 'All -SSLv2',
         }
       EOS
@@ -1358,12 +1360,12 @@ class { 'apache': }
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain 'SSLProtocol All -SSLv2' }
+      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
     end
 
     describe file("#{$vhost_dir}/25-test2.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain 'SSLProtocol All -SSLv2' }
+      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
     end
   end
 end

From f10e309f40ff5f3ed1cb2f199edd56bbc72c28c4 Mon Sep 17 00:00:00 2001
From: wickedOne <wicliff.wolda@gmail.com>
Date: Fri, 16 Oct 2015 08:39:42 +0200
Subject: [PATCH 0715/2267] RewriteLock support

added ability to define a RewriteLock file in the httpd.conf for apache version 2.2
---
 manifests/init.pp        | 1 +
 templates/httpd.conf.erb | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 5db9e90c7d..de6472f9ed 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -55,6 +55,7 @@
   $conf_template          = $::apache::params::conf_template,
   $servername             = $::apache::params::servername,
   $pidfile                = $::apache::params::pidfile,
+  $rewrite_lock           = false,
   $manage_user            = true,
   $manage_group           = true,
   $user                   = $::apache::params::user,
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index e0d16e1229..6fb9892442 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -11,6 +11,10 @@ KeepAlive <%= @keepalive %>
 MaxKeepAliveRequests <%= @max_keepalive_requests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
 
+<%- if @rewrite_lock and scope.function_versioncmp([@apache_version, '2.2']) <= 0 -%>
+RewriteLock <%= @rewrite_lock %>
+<%- end -%>
+
 User <%= @user %>
 Group <%= @group %>
 

From d38cc4d48f1ab1c027bfd44ac9574fbda2e00196 Mon Sep 17 00:00:00 2001
From: wickedOne <wicliff.wolda@gmail.com>
Date: Fri, 16 Oct 2015 12:46:52 +0200
Subject: [PATCH 0716/2267] added rewrite lock tests and doc

---
 README.md                   |  8 +++++++-
 manifests/init.pp           |  7 ++++++-
 spec/classes/apache_spec.rb | 39 +++++++++++++++++++++++++++++++++----
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 51d2f5dad7..8abaa58197 100644
--- a/README.md
+++ b/README.md
@@ -1065,6 +1065,12 @@ If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parame
 
 Setting `purge_vhost_dir` to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
+##### `rewrite_lock`
+
+Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your vhost. Default: 'undef'.
+
+This parameter only applies to Apache version 2.2 or lower and is ignored on newer versions.
+
 ##### `sendfile`
 
 Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the [`EnableSendfile`][] directive. Valid options: 'On', 'Off'. Default: 'On'.
@@ -2023,7 +2029,7 @@ Usage typically looks like:
       krb_method_negotiate   => 'on',
       krb_auth_realms        => ['EXAMPLE.ORG'],
       krb_local_user_mapping => 'on',
-      directories            => { 
+      directories            => {
         path         => '/var/www/html',
         auth_name    => 'Kerberos Login',
         auth_type    => 'Kerberos',
diff --git a/manifests/init.pp b/manifests/init.pp
index de6472f9ed..d894e324fc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -55,7 +55,7 @@
   $conf_template          = $::apache::params::conf_template,
   $servername             = $::apache::params::servername,
   $pidfile                = $::apache::params::pidfile,
-  $rewrite_lock           = false,
+  $rewrite_lock           = undef,
   $manage_user            = true,
   $manage_group           = true,
   $user                   = $::apache::params::user,
@@ -297,6 +297,10 @@
       default   => false
     }
 
+    if $rewrite_lock {
+      validate_absolute_path($rewrite_lock)
+    }
+
     # Template uses:
     # - $pidfile
     # - $user
@@ -318,6 +322,7 @@
     # - $server_tokens
     # - $server_signature
     # - $trace_enable
+    # - $rewrite_lock
     file { "${::apache::conf_dir}/${::apache::params::conf_file}":
       ensure  => file,
       content => template($conf_template),
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index b82eafa0de..0f4d0c5baa 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -156,23 +156,23 @@
             :apache_version => '2.2',
           }
         end
-    
+
        context "when default_type => 'none'" do
           let :params do
             { :default_type => 'none' }
           end
-    
+
           it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^DefaultType none$} }
         end
         context "when default_type => 'text/plain'" do
           let :params do
             { :default_type => 'text/plain' }
           end
-    
+
           it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^DefaultType text/plain$} }
         end
       end
-   
+
       context "with Apache version >= 2.4" do
         let :params do
           {
@@ -388,6 +388,37 @@
         it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
       end
 
+      context "with Apache version < 2.4" do
+        let :params do
+          {
+            :apache_version => '2.2',
+            :rewrite_lock => '/var/lock/subsys/rewrite-lock'
+          }
+        end
+
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^RewriteLock /var/lock/subsys/rewrite-lock$} }
+      end
+
+      context "with Apache version < 2.4" do
+        let :params do
+          {
+            :apache_version => '2.2'
+          }
+        end
+
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^RewriteLock [.]*$} }
+      end
+
+      context "with Apache version >= 2.4" do
+        let :params do
+          {
+            :apache_version => '2.4',
+            :rewrite_lock => '/var/lock/subsys/rewrite-lock'
+          }
+        end
+        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^RewriteLock [.]*$} }
+      end
+
       context "when specifying slash encoding behaviour" do
         let :params do
           { :allow_encoded_slashes => 'nodecode' }

From e226ba8c340acd9eb6f5e887d9958205ba9fb221 Mon Sep 17 00:00:00 2001
From: Mason Malone <mason@masonm.org>
Date: Wed, 21 Oct 2015 13:03:20 -0400
Subject: [PATCH 0717/2267] Fix ordering issue with conf_file and ports_file

The httpd.conf.erb template explicitly includes the $ports_file, but the resource that uses that
template doesn't have a dependency on $ports_file. This means it's possible for a declaration of the
apache::custom_config resource to get run between when $conf_file is written and $ports_file is
written. This will cause syntax verification via "apachectl -t" to always fail, causing the
custom_config to be removed if the $verify_config flag is set to "true". Example:

    ==> ops: Notice: /Stage[main]/Jci_nagios::Server/Apache::Custom_config[cgid]/Exec[service notify for cgid]/returns: httpd: Syntax error on line 37 of /etc/httpd/conf/httpd.conf: Could not open configuration file /etc/httpd/conf/ports.conf: No such file or directory
    ==> ops: Error: /Stage[main]/Jci_nagios::Server/Apache::Custom_config[cgid]/Exec[service notify for cgid]: Failed to call refresh: /usr/sbin/apachectl -t returned 1 instead of one of [0]
    ==> ops: Error: /Stage[main]/Jci_nagios::Server/Apache::Custom_config[cgid]/Exec[service notify for cgid]: /usr/sbin/apachectl -t returned 1 instead of one of [0]
    ==> ops: Notice: /Stage[main]/Jci_nagios::Server/Apache::Custom_config[cgid]/Exec[remove cgid if invalid]: Triggered 'refresh' from 1 events

I wrote a test that reproduces this behavior by using ordering arrows to force apache::custom_config
to run before $ports_file is written. This is rather artificial, but I wasn't able to get this is
happen "naturally" in the test environment. Take my word for it that it's possible.
---
 manifests/init.pp                     |  2 +-
 spec/acceptance/custom_config_spec.rb | 21 +++++++++++++++++++++
 spec/classes/apache_spec.rb           |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index d894e324fc..6aaa57cacb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -327,7 +327,7 @@
       ensure  => file,
       content => template($conf_template),
       notify  => Class['Apache::Service'],
-      require => Package['httpd'],
+      require => [Package['httpd'], File[$ports_file]],
     }
 
     # preserve back-wards compatibility to the times when default_mods was
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index 8b59f703fb..4bfd02f8d6 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -52,4 +52,25 @@ class { 'apache': }
       it { is_expected.to be_file }
     end
   end
+
+  describe 'custom_config only applied after configs are written' do
+    it 'applies in the right order' do
+      pp = <<-EOS
+        class { 'apache': }
+
+        apache::custom_config { 'ordering_test':
+          content => '# just a comment',
+        }
+
+        # Try to wedge the apache::custom_config call between when httpd.conf is written and
+        # ports.conf is written. This should trigger a dependency cycle
+        File["#{$conf_file}"] -> Apache::Custom_config['ordering_test'] -> File["#{$ports_file}"]
+      EOS
+      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Failed to apply catalog: Found 1 dependency cycle/i)
+    end
+
+    describe file("#{$confd_dir}/25-ordering_test.conf") do
+      it { is_expected.not_to be_file }
+    end
+  end
 end
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 0f4d0c5baa..60c03495ea 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -480,7 +480,7 @@
       it { is_expected.to contain_file("/opt/rh/root/etc/httpd/conf/httpd.conf").with(
         'ensure'  => 'file',
         'notify'  => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
+        'require' => ['Package[httpd]', 'File[/etc/httpd/conf/ports.conf]'],
       ) }
     end
 

From a686d99566e3133cc1801e5aa20abe97700903cf Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Fri, 23 Oct 2015 15:17:47 +0100
Subject: [PATCH 0718/2267] reduce constraints on regex to fix pe tests

---
 spec/acceptance/custom_config_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index 4bfd02f8d6..d4526e801d 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -66,7 +66,7 @@ class { 'apache': }
         # ports.conf is written. This should trigger a dependency cycle
         File["#{$conf_file}"] -> Apache::Custom_config['ordering_test'] -> File["#{$ports_file}"]
       EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Failed to apply catalog: Found 1 dependency cycle/i)
+      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Found 1 dependency cycle/i)
     end
 
     describe file("#{$confd_dir}/25-ordering_test.conf") do

From fcc4d43f46ee2a0d835b7bbf1ba90387eabf3719 Mon Sep 17 00:00:00 2001
From: abednarik <alejandro.bednarik@gmail.com>
Date: Wed, 28 Oct 2015 12:10:47 -0300
Subject: [PATCH 0719/2267] (MODULES-2651) Default document root update for
 Ubuntu 14.04 and Debian 8

For security reasons Debian changes default docroot to /var/www/html. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730372
---
 README.md           | 2 +-
 manifests/params.pp | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8abaa58197..5089cfc946 100644
--- a/README.md
+++ b/README.md
@@ -907,7 +907,7 @@ class { 'apache':
 
 Sets the default [`DocumentRoot`][] location. Default: Determined by your operating system.
 
-- **Debian**: `/var/www`
+- **Debian**: `/var/www/html`
 - **FreeBSD**: `/usr/local/www/apache22/data`
 - **Gentoo**: `/var/www/localhost/htdocs`
 - **Red Hat**: `/var/www/html`
diff --git a/manifests/params.pp b/manifests/params.pp
index a2ab7382c6..36d2815fac 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -223,7 +223,11 @@
     $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
-    $docroot              = '/var/www'
+    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
+      $docroot              = '/var/www/html'
+    } else {
+      $docroot              = '/var/www'
+    }
     $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
     $mellon_lock_file     = undef
     $mellon_cache_size    = undef

From c492b2b8094ef3d3cb51bfa43b3b386a1fbf0c70 Mon Sep 17 00:00:00 2001
From: Benedikt Bock <benediktbock@KAMPI00000009.dm-mac.int>
Date: Wed, 14 Oct 2015 17:42:17 +0200
Subject: [PATCH 0720/2267] Allow multiple IP addresses per vhost

To make a vhost reachable over 2 IP addresses we need to configure 2
similar vhosts which differ in the IP address. This change allows to use an array
of IPs.
---
 README.md                        | 10 ++++++
 manifests/vhost.pp               | 12 ++++----
 spec/acceptance/vhost_spec.rb    | 53 ++++++++++++++++++++++++++++++++
 spec/defines/vhost_spec.rb       | 34 ++++++++++++++++++++
 templates/vhost/_file_header.erb |  2 +-
 5 files changed, 104 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 5066caac99..2f405c6c93 100644
--- a/README.md
+++ b/README.md
@@ -399,6 +399,16 @@ apache::vhost { 'ip.example.com':
 }
 ~~~
 
+It is also possible to configure more than one IP address per vhost by using an array of IP addresses for the [`ip`][] parameter:
+
+~~~ puppet
+apache::vhost { 'ip.example.com':
+  ip      => ['127.0.0.1','169.254.1.1'],
+  port    => '80',
+  docroot => '/var/www/ip',
+}
+~~~
+
 To configure a virtual host with [aliased servers][], refer to the aliases using the [`serveraliases`][] parameter:
 
 ~~~ puppet
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 25530bccb8..43739c966f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -339,8 +339,8 @@
 
   if $ip {
     if $port {
-      $listen_addr_port = "${ip}:${port}"
-      $nvh_addr_port = "${ip}:${port}"
+      $listen_addr_port = suffix(any2array($ip),":${port}")
+      $nvh_addr_port = suffix(any2array($ip),":${port}")
     } else {
       $listen_addr_port = undef
       $nvh_addr_port = $ip
@@ -364,13 +364,13 @@
     if $ip and defined(Apache::Listen["${port}"]) {
       fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
     }
-    if ! defined(Apache::Listen["${listen_addr_port}"]) and $listen_addr_port and $ensure == 'present' {
-      ::apache::listen { "${listen_addr_port}": }
+    if $listen_addr_port and $ensure == 'present' {
+      ensure_resource('apache::listen', $listen_addr_port)
     }
   }
   if ! $ip_based {
-    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) {
-      ::apache::namevirtualhost { $nvh_addr_port: }
+    if $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) {
+      ensure_resource('apache::namevirtualhost', $nvh_addr_port)
     }
   }
 
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index b5d51e91f4..5c967209cf 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -190,6 +190,59 @@ class { 'apache': }
     end
   end
 
+  context 'new vhost with multiple IP addresses on port 80' do
+    it 'should configure one apache vhost with 2 ip addresses' do
+      pp = <<-EOS
+        class { 'apache':
+          default_vhost => false,
+        }
+        apache::vhost { 'example.com':
+          port     => '80',
+          ip       => ['127.0.0.1','::1'],
+          ip_based => true,
+          docroot  => '/var/www/html',
+        }
+        host { 'ipv4.example.com': ip => '127.0.0.1', }
+        host { 'ipv6.example.com': ip => '::1', }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => "Hello from vhost\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service($service_name) do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{$vhost_dir}/25-example.com.conf") do
+      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 ::1:80>' }
+      it { is_expected.to contain "ServerName example.com" }
+    end
+
+    describe file($ports_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Listen 127.0.0.1:80' }
+      it { is_expected.to contain 'Listen ::1:80' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' }
+      it { is_expected.not_to contain 'NameVirtualHost ::1:80' }
+    end
+
+    it 'should answer to ipv4.example.com' do
+      shell("/usr/bin/curl ipv4.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+
+    it 'should answer to ipv6.example.com' do
+      shell("/usr/bin/curl ipv6.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+  end
+
   context 'apache_directories' do
     describe 'readme example, adapted' do
       it 'should configure a vhost with Files' do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 6fd59f9157..0a86963364 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -459,6 +459,40 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-limits').with(
         :content => /^\s+LimitRequestFieldSize\s54321$/)}
     end
+    context 'vhost with multiple ip addresses' do
+      let :params do
+        {
+          'port'                        => '80',
+          'ip'                          => ['127.0.0.1','::1'],
+          'ip_based'                    => true,
+          'servername'                  => 'example.com',
+          'docroot'                     => '/var/www/html',
+          'add_listen'                  => true,
+          'ensure'                      => 'present'
+        }
+      end
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :kernelversion          => '3.6.2',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+        :content => /[.\/m]*<VirtualHost 127.0.0.1:80 ::1:80>[.\/m]*$/ ) }
+      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
+      it { is_expected.to contain_concat__fragment('Listen ::1:80') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost ::1:80') }
+    end
     context 'set only aliases' do
       let :params do
         {
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index e6f2f95e76..9350781d6f 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -3,7 +3,7 @@
 # Managed by Puppet
 # ************************************
 
-<VirtualHost <%= @nvh_addr_port %>>
+<VirtualHost <%= [@nvh_addr_port].flatten.compact.join(' ') %>>
   ServerName <%= @servername %>
 <% if @serveradmin -%>
   ServerAdmin <%= @serveradmin %>

From eb660a6c65270715f4b0f039b8b42bf70fad88c9 Mon Sep 17 00:00:00 2001
From: Damon Conway <damon.conway@alchemysystems.com>
Date: Mon, 19 Oct 2015 16:14:10 -0700
Subject: [PATCH 0721/2267] (MODULES-2756) Adding include ::apache so mkdir
 exec works properly

---
 manifests/mod/deflate.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 0748a54e57..d771209673 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -12,6 +12,7 @@
     'Ratio'  => 'ratio'
   }
 ) {
+  include ::apache
   ::apache::mod { 'deflate': }
 
   file { 'deflate.conf':

From 6fde679c37b44be6d5b5b7d058969ddce6009ae4 Mon Sep 17 00:00:00 2001
From: abednarik <alejandro.bednarik@gmail.com>
Date: Wed, 28 Oct 2015 23:25:38 -0300
Subject: [PATCH 0722/2267] (MODULES-2651) Default document root update for
 Ubuntu 14.04 and Debian 8

Added test cases for Debian 8 and Ubuntu 14.04
---
 spec/classes/apache_spec.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 60c03495ea..a766764527 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -235,6 +235,18 @@
       end
     end
 
+    context "8" do
+      let :facts do
+        super().merge({
+          :lsbdistcodename        => 'jessie',
+          :operatingsystemrelease => '8'
+        })
+      end
+      it { is_expected.to contain_file("/var/www/html").with(
+        'ensure'  => 'directory'
+         )
+        }
+      end
     context "on Ubuntu" do
       let :facts do
         super().merge({
@@ -242,6 +254,18 @@
         })
       end
 
+      context "14.04" do
+        let :facts do
+          super().merge({
+            :lsbdistrelease         => '14.04',
+            :operatingsystemrelease => '14.04'
+          })
+        end
+        it { is_expected.to contain_file("/var/www/html").with(
+          'ensure'  => 'directory'
+          )
+        }
+      end
       context "13.10" do
         let :facts do
           super().merge({

From 633f10dd848d4f764b4ee174eb0bef98d9b9dead Mon Sep 17 00:00:00 2001
From: Doug Knight <doug.knight@karmix.org>
Date: Thu, 22 Oct 2015 11:08:09 -0800
Subject: [PATCH 0723/2267] add ability to overide file name generation in
 custom_config

---
 README.md                             |  4 ++++
 manifests/custom_config.pp            | 23 ++++++++++++++---------
 spec/acceptance/custom_config_spec.rb | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 8abaa58197..22dcae6a72 100644
--- a/README.md
+++ b/README.md
@@ -1699,6 +1699,10 @@ Sets the directory in which Puppet places configuration files. Default: '$::apac
 
 Sets the configuration file's content. The `content` and [`source`][] parameters are exclusive of each other.
 
+##### `filename`
+
+Sets the name of the file under `confdir` in which Puppet stores the configuration.  The default behavior is to generate the file name from the `priority` parameter and the resource name.
+
 ##### `priority`
 
 Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. The default value is `25`.
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 7ce755b35c..d93c468920 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -7,6 +7,7 @@
   $source         = undef,
   $verify_command = $::apache::params::verify_command,
   $verify_config  = true,
+  $filename       = undef,
 ) {
 
   if $content and $source {
@@ -23,15 +24,19 @@
 
   validate_bool($verify_config)
 
-  if $priority {
-    $priority_prefix = "${priority}-"
+  if $filename {
+    $_filename = $filename
   } else {
-    $priority_prefix = ''
-  }
+    if $priority {
+      $priority_prefix = "${priority}-"
+    } else {
+      $priority_prefix = ''
+    }
 
-  ## Apache include does not always work with spaces in the filename
-  $filename_middle = regsubst($name, ' ', '_', 'G')
-  $filename = "${priority_prefix}${filename_middle}.conf"
+    ## Apache include does not always work with spaces in the filename
+    $filename_middle = regsubst($name, ' ', '_', 'G')
+    $_filename = "${priority_prefix}${filename_middle}.conf"
+  }
 
   if ! $verify_config or $ensure == 'absent' {
     $notifies = Class['Apache::Service']
@@ -41,7 +46,7 @@
 
   file { "apache_${name}":
     ensure  => $ensure,
-    path    => "${confdir}/${filename}",
+    path    => "${confdir}/${_filename}",
     content => $content,
     source  => $source,
     require => Package['httpd'],
@@ -59,7 +64,7 @@
     }
 
     exec { "remove ${name} if invalid":
-      command     => "/bin/rm ${confdir}/${filename}",
+      command     => "/bin/rm ${confdir}/${_filename}",
       unless      => $verify_command,
       subscribe   => File["apache_${name}"],
       refreshonly => true,
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index d4526e801d..683e6b648b 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -36,6 +36,24 @@ class { 'apache': }
     end
   end
 
+  context 'with a custom filename' do
+    it 'should store content in the described file' do
+      pp = <<-EOS
+        class { 'apache': }
+        apache::custom_config { 'filename_test':
+          filename => 'custom_filename',
+          content  => '# just another comment',
+        }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$confd_dir}/custom_filename") do
+      it { is_expected.to contain '# just another comment' }
+    end
+  end
+
   describe 'custom_config without priority prefix' do
     it 'applies cleanly' do
       pp = <<-EOS

From b63ea4ca653ee9335882557c199158f22888cd7a Mon Sep 17 00:00:00 2001
From: Damon Conway <damon.conway@alchemysystems.com>
Date: Wed, 28 Oct 2015 10:28:54 -0700
Subject: [PATCH 0724/2267] (MODULES-2757) Adding if around ServerName in
 template

Adding feature to README
---
 README.md                        | 2 ++
 templates/vhost/_file_header.erb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 2953d8aba4..fbf56e00dc 100644
--- a/README.md
+++ b/README.md
@@ -1093,6 +1093,8 @@ Sets the Apache server administrator's contact information via Apache's [`Server
 
 Sets the Apache server name via Apache's [`ServerName`][] directive. Default: the 'fqdn' fact reported by [Facter][].
 
+Setting to false will not set ServerName at all.
+
 ##### `server_root`
 
 Sets the Apache server's root directory via Apache's [`ServerRoot`][] directive. Default: determined by your operating system.
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index 9350781d6f..5fd636a1e9 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -4,7 +4,9 @@
 # ************************************
 
 <VirtualHost <%= [@nvh_addr_port].flatten.compact.join(' ') %>>
+<% if @servername -%>
   ServerName <%= @servername %>
+<% end -%>
 <% if @serveradmin -%>
   ServerAdmin <%= @serveradmin %>
 <% end -%>

From cc3e55a97ce4a0c89ffd6ffc5729ba695ddc25bd Mon Sep 17 00:00:00 2001
From: prabin5 <milkywaydev5@gmail.com>
Date: Fri, 23 Oct 2015 18:19:22 -0400
Subject: [PATCH 0725/2267] Update mime.conf.erb to support dynamic AddHandler
 AddType AddOutputFilter

---
 manifests/init.pp                |  1 +
 manifests/mod/mime.pp            |  1 +
 manifests/params.pp              | 13 +++++++++++++
 spec/acceptance/mod_mime_spec.rb |  3 +++
 templates/mod/mime.conf.erb      |  8 +++++---
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 6aaa57cacb..5a865b761d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -77,6 +77,7 @@
   $package_ensure         = 'installed',
   $use_optional_includes  = $::apache::params::use_optional_includes,
   $use_systemd            = $::apache::params::use_systemd,
+  $mime_types_additional  = $::apache::params::mime_types_additional,
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index 86000d1679..ace7663df1 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -1,6 +1,7 @@
 class apache::mod::mime (
   $mime_support_package = $::apache::params::mime_support_package,
   $mime_types_config    = $::apache::params::mime_types_config,
+  $mime_types_additional = $::apache::mime_types_additional,
 ) {
   apache::mod { 'mime': }
   # Template uses $mime_types_config
diff --git a/manifests/params.pp b/manifests/params.pp
index a2ab7382c6..b0f22652fb 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -29,6 +29,19 @@
   $log_level = 'warn'
   $use_optional_includes = false
 
+  # Default mime types settings
+  $mime_types_additional = {
+    'AddHandler' => {
+      'type-map' => 'var'
+      },
+    'AddType'    => {
+      'type-map' => '.shtml'
+      },
+    'AddOutputFilter' => {
+      'INCLUDES'      => '.shtml'
+      },
+  }
+
   # should we use systemd module?
   $use_systemd = true
 
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index d1886c4bde..78f73f53b5 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -32,6 +32,9 @@ class { 'apache': }
 
     describe file("#{mod_dir}/mime.conf") do
       it { is_expected.to contain "AddType application/x-compress .Z" }
+      it { is_expected.to contain "AddHandler type-map var\n" }
+      it { is_expected.to contain "AddType type-map .shtml\n" }
+      it { is_expected.to contain "AddOutputFilter INCLUDES .shtml\n" }
     end
   end
 end
diff --git a/templates/mod/mime.conf.erb b/templates/mod/mime.conf.erb
index a69a424a6a..8101cf031f 100644
--- a/templates/mod/mime.conf.erb
+++ b/templates/mod/mime.conf.erb
@@ -31,6 +31,8 @@ AddLanguage sv .sv
 AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
 
-AddHandler type-map var
-AddType text/html .shtml
-AddOutputFilter INCLUDES .shtml
+<%- @mime_types_additional.sort.each do |add_mime, config| -%>
+        <%- config.each do |type, extension| %>
+<%= add_mime %> <%= type %> <%= extension%>
+        <%- end -%>
+<% end %>

From 55cc3b4e8f4bc859a1255cb57be2c7923005d822 Mon Sep 17 00:00:00 2001
From: Benedikt Bock <benedikt_bock@web.de>
Date: Sun, 1 Nov 2015 19:33:23 +0100
Subject: [PATCH 0726/2267] (MODULES-2764) Enclose IPv6 addresses in square
 brackets

The apache module does enclose IPv6 addresses in square brackets as
apache recommends

Apache 2.2:
https://httpd.apache.org/docs/2.2/en/bind.html
https://httpd.apache.org/docs/2.2/en/mod/core.html#virtualhost
https://httpd.apache.org/docs/2.2/en/mod/core.html#namevirtualhost
Apache 2.4:
https://httpd.apache.org/docs/2.4/en/bind.html
https://httpd.apache.org/docs/2.4/en/mod/core.html#virtualhost

added some tests for the custom function enclose_ipv6
---
 lib/puppet/parser/functions/enclose_ipv6.rb   | 38 +++++++++++
 manifests/vhost.pp                            |  9 +--
 spec/acceptance/vhost_spec.rb                 | 50 +++++++++++++-
 spec/defines/vhost_spec.rb                    | 40 +++++++++++-
 .../parser/functions/enclose_ipv6_spec.rb     | 65 +++++++++++++++++++
 5 files changed, 192 insertions(+), 10 deletions(-)
 create mode 100644 lib/puppet/parser/functions/enclose_ipv6.rb
 create mode 100644 spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb

diff --git a/lib/puppet/parser/functions/enclose_ipv6.rb b/lib/puppet/parser/functions/enclose_ipv6.rb
new file mode 100644
index 0000000000..7b064b6a0c
--- /dev/null
+++ b/lib/puppet/parser/functions/enclose_ipv6.rb
@@ -0,0 +1,38 @@
+#
+# enclose_ipv6.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:enclose_ipv6, :type => :rvalue, :doc => <<-EOS
+Takes an array of ip addresses and encloses the ipv6 addresses with square brackets.
+    EOS
+  ) do |arguments|
+
+    require 'ipaddr'
+
+    if (arguments.size != 1) then
+      raise(Puppet::ParseError, "enclose_ipv6(): Wrong number of arguments "+
+        "given #{arguments.size} for 1")
+    end
+    unless arguments[0].is_a?(String) or arguments[0].is_a?(Array) then
+      raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument type "+
+        "given #{arguments[0].class} expected String or Array")
+    end
+
+    input = [arguments[0]].flatten.compact
+    result = []
+
+    input.each do |val|
+      begin
+        ip = IPAddr.new(val)
+      rescue ArgumentError
+        raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument "+
+          "given #{val} is not an ip address.")
+      end
+      val = "[#{ip.to_s}]" if ip.ipv6?
+      result = [result,val]
+    end
+
+    return result.flatten.compact
+  end
+end
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4556015e02..172d961090 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -344,12 +344,13 @@
   }
 
   if $ip {
+    $_ip = enclose_ipv6($ip)
     if $port {
-      $listen_addr_port = suffix(any2array($ip),":${port}")
-      $nvh_addr_port = suffix(any2array($ip),":${port}")
+      $listen_addr_port = suffix(any2array($_ip),":${port}")
+      $nvh_addr_port = suffix(any2array($_ip),":${port}")
     } else {
       $listen_addr_port = undef
-      $nvh_addr_port = $ip
+      $nvh_addr_port = $_ip
       if ! $servername and ! $ip_based {
         fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters for name-based vhosts")
       }
@@ -798,7 +799,7 @@
   # - $krb_method_k5passwd
   # - $krb_authoritative
   # - $krb_auth_realms
-  # - $krb_5keytab 
+  # - $krb_5keytab
   # - $krb_local_user_mapping
   if $auth_kerb {
     concat::fragment { "${name}-auth_kerb":
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 37ac83a0ae..77c019f128 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -218,16 +218,16 @@ class { 'apache':
     end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
-      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 ::1:80>' }
+      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 [::1]:80>' }
       it { is_expected.to contain "ServerName example.com" }
     end
 
     describe file($ports_file) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Listen 127.0.0.1:80' }
-      it { is_expected.to contain 'Listen ::1:80' }
+      it { is_expected.to contain 'Listen [::1]:80' }
       it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' }
-      it { is_expected.not_to contain 'NameVirtualHost ::1:80' }
+      it { is_expected.not_to contain 'NameVirtualHost [::1]:80' }
     end
 
     it 'should answer to ipv4.example.com' do
@@ -243,6 +243,50 @@ class { 'apache':
     end
   end
 
+  context 'new vhost with IPv6 address on port 80' do
+    it 'should configure one apache vhost with an ipv6 address' do
+      pp = <<-EOS
+        class { 'apache':
+          default_vhost  => false,
+        }
+        apache::vhost { 'example.com':
+          port           => '80',
+          ip             => '::1',
+          ip_based       => true,
+          docroot        => '/var/www/html',
+        }
+        host { 'ipv6.example.com': ip => '::1', }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => "Hello from vhost\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service($service_name) do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{$vhost_dir}/25-example.com.conf") do
+      it { is_expected.to contain '<VirtualHost [::1]:80>' }
+      it { is_expected.to contain "ServerName example.com" }
+    end
+
+    describe file($ports_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Listen [::1]:80' }
+      it { is_expected.not_to contain 'NameVirtualHost [::1]:80' }
+    end
+
+    it 'should answer to ipv6.example.com' do
+      shell("/usr/bin/curl ipv6.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+  end
+
   context 'apache_directories' do
     describe 'readme example, adapted' do
       it 'should configure a vhost with Files' do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f092f41341..7d62d92be4 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -487,12 +487,46 @@
 
       it { is_expected.to compile }
       it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-        :content => /[.\/m]*<VirtualHost 127.0.0.1:80 ::1:80>[.\/m]*$/ ) }
+        :content => /[.\/m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[.\/m]*$/ ) }
       it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
-      it { is_expected.to contain_concat__fragment('Listen ::1:80') }
+      it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
       it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost ::1:80') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') }
     end
+
+    context 'vhost with ipv6 address' do
+      let :params do
+        {
+          'port'                        => '80',
+          'ip'                          => '::1',
+          'ip_based'                    => true,
+          'servername'                  => 'example.com',
+          'docroot'                     => '/var/www/html',
+          'add_listen'                  => true,
+          'ensure'                      => 'present'
+        }
+      end
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :kernelversion          => '3.6.2',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+        :content => /[.\/m]*<VirtualHost \[::1\]:80>[.\/m]*$/ ) }
+      it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') }
+    end
+
     context 'set only aliases' do
       let :params do
         {
diff --git a/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb b/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
new file mode 100644
index 0000000000..508f62aea4
--- /dev/null
+++ b/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
@@ -0,0 +1,65 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+describe "the enclose_ipv6 function" do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  it "should exist" do
+    expect(Puppet::Parser::Functions.function("enclose_ipv6")).to eq("function_enclose_ipv6")
+  end
+
+  it "should raise a ParseError if there is less than 1 arguments" do
+    expect { scope.function_enclose_ipv6([]) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should raise a ParseError if there is more than 1 arguments" do
+    expect { scope.function_enclose_ipv6(['argument1','argument2']) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should raise a ParseError when given garbage" do
+    expect { scope.function_enclose_ipv6(['garbage']) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should raise a ParseError when given something else than a string or an array" do
+    expect { scope.function_enclose_ipv6([['1' => '127.0.0.1']]) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should not raise a ParseError when given a single ip string" do
+    expect { scope.function_enclose_ipv6(['127.0.0.1']) }.to_not raise_error
+  end
+
+  it "should not raise a ParseError when given an array of ip strings" do
+    expect { scope.function_enclose_ipv6([['127.0.0.1','fe80::1']]) }.to_not raise_error
+  end
+
+  it "should not raise a ParseError when given differently notations of ip addresses" do
+    expect { scope.function_enclose_ipv6([['127.0.0.1','fe80::1','[fe80::1]']]) }.to_not raise_error
+  end
+
+  it "should raise a ParseError when given a wrong ipv4 address" do
+    expect { scope.function_enclose_ipv6(['127..0.0.1']) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should raise a ParseError when given a ipv4 address with square brackets" do
+    expect { scope.function_enclose_ipv6(['[127.0.0.1]']) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should raise a ParseError when given a wrong ipv6 address" do
+    expect { scope.function_enclose_ipv6(['fe80:::1']) }.to( raise_error(Puppet::ParseError) )
+  end
+
+  it "should embrace ipv6 adresses within an array of ip addresses" do
+    result = scope.function_enclose_ipv6([['127.0.0.1','fe80::1','[fe80::1]']])
+    expect(result).to(eq(['127.0.0.1','[fe80::1]','[fe80::1]']))
+  end
+
+  it "should embrace a single ipv6 adresse" do
+    result = scope.function_enclose_ipv6(['fe80::1'])
+    expect(result).to(eq(['[fe80::1]']))
+  end
+
+  it "should not embrace a single ipv4 adresse" do
+    result = scope.function_enclose_ipv6(['127.0.0.1'])
+    expect(result).to(eq(['127.0.0.1']))
+  end
+end

From cc443e96e3ca7d0eeda9b76145df681e2882e402 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Wed, 4 Nov 2015 14:07:50 +0000
Subject: [PATCH 0727/2267] removing an over complicated test case

---
 spec/acceptance/mod_passenger_spec.rb | 110 --------------------------
 1 file changed, 110 deletions(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 7b2d0da9af..5af9113e5c 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -194,115 +194,5 @@ class { 'apache::mod::passenger': }
       end
 
     end
-
-  when 'RedHat'
-    # no fedora 18 passenger package yet, and rhel5 packages only exist for ruby 1.8.5
-    unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18) or (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5' and fact('rubyversion') != '1.8.5')
-
-      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-        pending('test passenger - RHEL7 packages don\'t exist')
-      else
-        context "default passenger config" do
-          it 'succeeds in puppeting passenger' do
-            pp = <<-EOS
-              /* EPEL and passenger repositories */
-              class { 'epel': }
-              exec { 'passenger.repo GPG key':
-                command => '/usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-                creates => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-              }
-              file { 'passenger.repo GPG key':
-                ensure  => file,
-                path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-                require => Exec['passenger.repo GPG key'],
-              }
-              epel::rpm_gpg_key { 'passenger.stealthymonkeys.com':
-                path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-                require => [
-                  Class['epel'],
-                  File['passenger.repo GPG key'],
-                ]
-              }
-              $releasever_string = $operatingsystem ? {
-                'Scientific' => '6',
-                default      => '$releasever',
-              }
-              yumrepo { 'passenger':
-                baseurl         => "http://passenger.stealthymonkeys.com/rhel/${releasever_string}/\\$basearch" ,
-                descr           => "Red Hat Enterprise ${releasever_string} - Phusion Passenger",
-                enabled         => 1,
-                gpgcheck        => 1,
-                gpgkey          => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-                mirrorlist      => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
-                require => [
-                  Epel::Rpm_gpg_key['passenger.stealthymonkeys.com'],
-                ],
-              }
-              /* apache and mod_passenger */
-              class { 'apache':
-                  require => [
-                    Class['epel'],
-                ],
-              }
-              class { 'apache::mod::passenger':
-                require => [
-                  Yumrepo['passenger']
-                ],
-              }
-              #{pp_rackapp}
-            EOS
-            apply_manifest(pp, :catch_failures => true)
-          end
-
-          describe service(service_name) do
-            it { is_expected.to be_enabled }
-            it { is_expected.to be_running }
-          end
-
-          describe file(conf_file) do
-            it { is_expected.to contain "PassengerRoot #{passenger_root}" }
-            it { is_expected.to contain "PassengerRuby #{passenger_ruby}" }
-            it { is_expected.to contain "PassengerTempDir #{passenger_tempdir}" }
-          end
-
-          describe file(load_file) do
-            it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
-          end
-
-          it 'should output status via passenger-memory-stats' do
-            shell("/usr/bin/passenger-memory-stats", :pty => true) do |r|
-              expect(r.stdout).to match(/Apache processes/)
-              expect(r.stdout).to match(/Nginx processes/)
-              expect(r.stdout).to match(/Passenger processes/)
-              expect(r.stdout).to match(/### Processes: [0-9]+/)
-              expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
-
-              expect(r.exit_code).to eq(0)
-            end
-          end
-
-          it 'should output status via passenger-status' do
-            shell("PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
-              # spacing may vary
-              r.stdout.should =~ /[\-]+ General information [\-]+/
-              r.stdout.should =~ /max[ ]+= [0-9]+/
-              r.stdout.should =~ /count[ ]+= [0-9]+/
-              r.stdout.should =~ /active[ ]+= [0-9]+/
-              r.stdout.should =~ /inactive[ ]+= [0-9]+/
-              r.stdout.should =~ /Waiting on global queue: [0-9]+/
-
-              r.exit_code.should == 0
-            end
-          end
-
-          it 'should answer to passenger.example.com' do
-            shell("/usr/bin/curl passenger.example.com:80") do |r|
-              r.stdout.should =~ /^hello <b>world<\/b>$/
-              r.exit_code.should == 0
-            end
-          end
-        end
-      end
-    end
   end
 end

From 846b77bf7da0ad4cf76121996bfc540def20af1a Mon Sep 17 00:00:00 2001
From: Benedikt Bock <benedikt_bock@web.de>
Date: Fri, 6 Nov 2015 14:13:37 +0100
Subject: [PATCH 0728/2267] Ruby 2.0 introduces IPAddr::InvalidAddressError

---
 lib/puppet/parser/functions/enclose_ipv6.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/parser/functions/enclose_ipv6.rb b/lib/puppet/parser/functions/enclose_ipv6.rb
index 7b064b6a0c..968bd723ed 100644
--- a/lib/puppet/parser/functions/enclose_ipv6.rb
+++ b/lib/puppet/parser/functions/enclose_ipv6.rb
@@ -10,6 +10,11 @@ module Puppet::Parser::Functions
 
     require 'ipaddr'
 
+    rescuable_exceptions = [ ArgumentError ]
+    if defined?(IPAddr::InvalidAddressError)
+	    rescuable_exceptions << IPAddr::InvalidAddressError
+    end
+
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "enclose_ipv6(): Wrong number of arguments "+
         "given #{arguments.size} for 1")
@@ -25,7 +30,7 @@ module Puppet::Parser::Functions
     input.each do |val|
       begin
         ip = IPAddr.new(val)
-      rescue ArgumentError
+      rescue *rescuable_exceptions
         raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument "+
           "given #{val} is not an ip address.")
       end

From e54b1adf2d73323b83316f45df748a37c818ea95 Mon Sep 17 00:00:00 2001
From: Olivier Hanesse <olivier.hanesse@gmail.com>
Date: Mon, 9 Nov 2015 15:07:27 +0100
Subject: [PATCH 0729/2267] Fix typo about dynamic AddHandler/AddType

Last commit about dynamic AddHandler/AddType introduces a little typo
The "right" syntax should be :

AddType text/html .shtml
---
 manifests/params.pp              | 2 +-
 spec/acceptance/mod_mime_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 285f440d41..9e8cad39b4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -35,7 +35,7 @@
       'type-map' => 'var'
       },
     'AddType'    => {
-      'type-map' => '.shtml'
+      'text/html' => '.shtml'
       },
     'AddOutputFilter' => {
       'INCLUDES'      => '.shtml'
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index 78f73f53b5..89b3c800fa 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -33,7 +33,7 @@ class { 'apache': }
     describe file("#{mod_dir}/mime.conf") do
       it { is_expected.to contain "AddType application/x-compress .Z" }
       it { is_expected.to contain "AddHandler type-map var\n" }
-      it { is_expected.to contain "AddType type-map .shtml\n" }
+      it { is_expected.to contain "AddType text/html .shtml\n" }
       it { is_expected.to contain "AddOutputFilter INCLUDES .shtml\n" }
     end
   end

From 0feea4f62eb3139188d939cea279e7625dc0591a Mon Sep 17 00:00:00 2001
From: Olivier Hanesse <olivier.hanesse@gmail.com>
Date: Mon, 9 Nov 2015 16:37:09 +0100
Subject: [PATCH 0730/2267] Add missing parameters in mod_auth_kerb

According to the http://modauthkerb.sourceforge.net/configure.html webpage,
the following parameters are missing.
---
 README.md                      | 12 ++++++++++++
 manifests/vhost.pp             |  3 +++
 spec/defines/vhost_spec.rb     |  6 ++++++
 templates/vhost/_auth_kerb.erb | 11 ++++++++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fbf56e00dc..340cd2d787 100644
--- a/README.md
+++ b/README.md
@@ -2074,6 +2074,18 @@ Location of the Kerberos V5 keytab file. Not set by default.
 
 Strips @REALM from username for further use. Not set by default.
 
+##### `krb_verify_kdc`
+
+This option can be used to disable the verification tickets against local keytab to prevent KDC spoofing attacks. Default is 'on'
+
+##### `krb_servicename`
+
+Specifies the service name that will be used by Apache for authentication. Corresponding key of this name must be stored in the keytab. Default is 'HTTP'
+
+##### `krb_save_credentials`
+
+This option enables credential saving functionality. Default is 'off'
+
 ##### `limit_request_field_size`
 
 [Limits](http://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize) the size of the HTTP request header allowed from the client. Default is 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4556015e02..537465ce3f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -131,6 +131,9 @@
   $krb_auth_realms             = [],
   $krb_5keytab                 = undef,
   $krb_local_user_mapping      = undef,
+  $krb_verify_kdc              = 'on',
+  $krb_servicename             = 'HTTP',
+  $krb_save_credentials        = 'off',
   $limit_request_field_size    = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f092f41341..7bcfb0f677 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -456,6 +456,12 @@
         :content => /^\s+Krb5Keytab\s\/tmp\/keytab5$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
         :content => /^\s+KrbLocalUserMapping\soff$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbServiceName\sHTTP$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbSaveCredentials\soff$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbVerifyKDC\son$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-limits').with(
         :content => /^\s+LimitRequestFieldSize\s54321$/)}
     end
diff --git a/templates/vhost/_auth_kerb.erb b/templates/vhost/_auth_kerb.erb
index 9179ee8b2a..97f4c1fc69 100644
--- a/templates/vhost/_auth_kerb.erb
+++ b/templates/vhost/_auth_kerb.erb
@@ -17,7 +17,16 @@
   Krb5Keytab <%= @krb_5keytab %>
   <%- end -%>
   <%- if @krb_local_user_mapping -%>
-  KrbLocalUserMapping <%= @krb_local_user_mapping -%>
+  KrbLocalUserMapping <%= @krb_local_user_mapping %>
+  <%- end -%>
+  <%- if @krb_verify_kdc -%>
+  KrbVerifyKDC <%= @krb_verify_kdc %>
+  <%- end -%>
+  <%- if @krb_servicename -%>
+  KrbServiceName <%= @krb_servicename %>
+  <%- end -%>
+  <%- if @krb_save_credentials -%>
+  KrbSaveCredentials <%= @krb_save_credentials -%>
   <%- end -%>
 
 <% end -%>

From 0fe758857f5cd9e17869f353f0f4984669bd2841 Mon Sep 17 00:00:00 2001
From: Alex Harvey <Alex.Harvey@team.telstra.com>
Date: Wed, 11 Nov 2015 18:00:33 +1100
Subject: [PATCH 0731/2267] (MODULES-2811) Add missing helper lines to spec
 files

---
 spec/classes/mod/auth_mellon_spec.rb                 | 2 ++
 spec/classes/mod/ext_filter_spec.rb                  | 2 ++
 spec/classes/mod/info_spec.rb                        | 2 ++
 spec/classes/mod/shib_spec.rb                        | 2 ++
 spec/unit/provider/a2mod/gentoo_spec.rb              | 2 --
 spec/unit/puppet/parser/functions/bool2httpd_spec.rb | 1 -
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index f022e48108..4fac1c3e86 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::auth_mellon', :type => :class do
   let :pre_condition do
     'include apache'
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index afa71c1083..ed61db9f20 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::ext_filter', :type => :class do
   let :pre_condition do
     'class { "apache":
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index b444bc0037..8ecbcdd2a3 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 # This function is called inside the OS specific contexts
 def general_info_specs_22
   it { is_expected.to contain_apache__mod('info') }
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index 0254d4c3c6..11193b2766 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'apache::mod::shib', :type => :class do
   let :pre_condition do
     'include apache'
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index 78f902bf72..e472745e92 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -1,5 +1,3 @@
-#!/usr/bin/env rspec
-
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:a2mod).provider(:gentoo)
diff --git a/spec/unit/puppet/parser/functions/bool2httpd_spec.rb b/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
index b0bcbb6220..19d35e5922 100644
--- a/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
+++ b/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe "the bool2httpd function" do

From b74fdf5a95bc2a7cc0f17c1e45311be656006afb Mon Sep 17 00:00:00 2001
From: Alex Harvey <Alex.Harvey@team.telstra.com>
Date: Wed, 11 Nov 2015 18:22:36 +1100
Subject: [PATCH 0732/2267] (MODULES-2812) Fix deprecation warning in
 service_spec.rb

---
 spec/classes/service_spec.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 4c851385cd..f53937a7ff 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -126,9 +126,7 @@
         'service_manage' => false
       }
     end
-    it 'should not manage the httpd service' do
-      subject.should_not contain_service('httpd')
-    end
+    it { is_expected.not_to contain_service('httpd') }
   end
 
   context "on a FreeBSD 5 OS" do

From 678c02aa8bfd132f5c5dfa1086b6f5d48721e57b Mon Sep 17 00:00:00 2001
From: Alex Harvey <Alex.Harvey@team.telstra.com>
Date: Wed, 11 Nov 2015 18:28:44 +1100
Subject: [PATCH 0733/2267] (MODULES-2813) Fix deprecation warning in
 spec_helper.rb

---
 spec/spec_helper.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 65379ee38a..475b72c07b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,6 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
 
 RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-
   c.before :each do
     # Ensure that we don't accidentally cache facts and environment
     # between test cases.

From 1bfb80975273ab95f8085fb2440d5cf278661c6d Mon Sep 17 00:00:00 2001
From: rexcze <rexcze@alca.local>
Date: Wed, 11 Nov 2015 16:45:48 +0100
Subject: [PATCH 0734/2267] Add support for changing mod_nss listen port

---
 manifests/mod/nss.pp       | 3 ++-
 templates/mod/nss.conf.erb | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index 132b41b3f6..d275cc493e 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -1,7 +1,8 @@
 class apache::mod::nss (
   $transfer_log = "${::apache::params::logroot}/access.log",
   $error_log    = "${::apache::params::logroot}/error.log",
-  $passwd_file  = undef
+  $passwd_file  = undef,
+  $port     = 8443,
 ) {
   include ::apache::mod::mime
 
diff --git a/templates/mod/nss.conf.erb b/templates/mod/nss.conf.erb
index a5c81752f3..22762ccac7 100644
--- a/templates/mod/nss.conf.erb
+++ b/templates/mod/nss.conf.erb
@@ -17,7 +17,7 @@
 # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
 #       Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:443"
 #
-Listen 8443
+Listen <%= @port %>
 
 ##
 ##  SSL Global Context
@@ -84,7 +84,7 @@ NSSRequireSafeNegotiation off
 ## SSL Virtual Host Context
 ##
 
-<VirtualHost _default_:8443>
+<VirtualHost _default_:<%= @nss_port %>>
 
 #   General setup for the virtual host
 #DocumentRoot "/etc/httpd/htdocs"

From a9bf898738d579811530ea7a4958b6e740eabe4a Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Thu, 12 Nov 2015 12:07:12 +0000
Subject: [PATCH 0735/2267] removing redhat passenger tests, for now

---
 spec/acceptance/vhost_spec.rb | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 37ac83a0ae..2d3b834747 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1058,40 +1058,6 @@ class { 'apache': }
     end
   end
 
-  # Passenger isn't even in EPEL on el-5
-  if default['platform'] !~ /^el-5/
-    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-      pending('Since we don\'t have passenger on RHEL7 rack_base_uris tests will fail')
-    else
-      describe 'rack_base_uris' do
-        if fact('osfamily') == 'RedHat'
-          it 'adds epel' do
-            pp = "class { 'epel': }"
-            apply_manifest(pp, :catch_failures => true)
-          end
-        end
-
-        it 'applies cleanly' do
-          pp = <<-EOS
-            class { 'apache': }
-            host { 'test.server': ip => '127.0.0.1' }
-            apache::vhost { 'test.server':
-              docroot          => '/tmp',
-              rack_base_uris  => ['/test'],
-            }
-          EOS
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        describe file("#{$vhost_dir}/25-test.server.conf") do
-          it { is_expected.to be_file }
-          it { is_expected.to contain 'RackBaseURI /test' }
-        end
-      end
-    end
-  end
-
-
   describe 'request_headers' do
     it 'applies cleanly' do
       pp = <<-EOS

From b9b9565170308a0a3d04577a37c88fa743f5a96e Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Fri, 13 Nov 2015 15:00:59 +0000
Subject: [PATCH 0736/2267] updating the test to use ipv4 addresses

---
 spec/acceptance/vhost_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2d3b834747..c4a34b1f1c 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -198,12 +198,12 @@ class { 'apache':
         }
         apache::vhost { 'example.com':
           port     => '80',
-          ip       => ['127.0.0.1','::1'],
+          ip       => ['127.0.0.1','127.0.0.2'],
           ip_based => true,
           docroot  => '/var/www/html',
         }
         host { 'ipv4.example.com': ip => '127.0.0.1', }
-        host { 'ipv6.example.com': ip => '::1', }
+        host { 'ipv6.example.com': ip => '127.0.0.2', }
         file { '/var/www/html/index.html':
           ensure  => file,
           content => "Hello from vhost\\n",
@@ -218,16 +218,16 @@ class { 'apache':
     end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
-      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 ::1:80>' }
+      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.2:80>' }
       it { is_expected.to contain "ServerName example.com" }
     end
 
     describe file($ports_file) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Listen 127.0.0.1:80' }
-      it { is_expected.to contain 'Listen ::1:80' }
+      it { is_expected.to contain 'Listen 127.0.0.2:80' }
       it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' }
-      it { is_expected.not_to contain 'NameVirtualHost ::1:80' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:80' }
     end
 
     it 'should answer to ipv4.example.com' do

From bfcf6cc066fd041750ef30fc7c45b4cdffa4e814 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Fri, 30 Oct 2015 17:53:02 +0000
Subject: [PATCH 0737/2267] 1.7.0 release prep

---
 CHANGELOG.md                                 | 48 ++++++++++++++++++++
 README.md                                    |  4 ++
 {tests => examples}/apache.pp                |  0
 {tests => examples}/dev.pp                   |  0
 {tests => examples}/init.pp                  |  0
 {tests => examples}/mod_load_params.pp       |  0
 {tests => examples}/mods.pp                  |  0
 {tests => examples}/mods_custom.pp           |  0
 {tests => examples}/php.pp                   |  0
 {tests => examples}/vhost.pp                 |  0
 {tests => examples}/vhost_directories.pp     |  0
 {tests => examples}/vhost_filter.pp          |  4 +-
 {tests => examples}/vhost_ip_based.pp        |  0
 {tests => examples}/vhost_proxypass.pp       |  0
 {tests => examples}/vhost_ssl.pp             |  0
 {tests => examples}/vhosts_without_listen.pp |  0
 metadata.json                                |  2 +-
 17 files changed, 55 insertions(+), 3 deletions(-)
 rename {tests => examples}/apache.pp (100%)
 rename {tests => examples}/dev.pp (100%)
 rename {tests => examples}/init.pp (100%)
 rename {tests => examples}/mod_load_params.pp (100%)
 rename {tests => examples}/mods.pp (100%)
 rename {tests => examples}/mods_custom.pp (100%)
 rename {tests => examples}/php.pp (100%)
 rename {tests => examples}/vhost.pp (100%)
 rename {tests => examples}/vhost_directories.pp (100%)
 rename {tests => examples}/vhost_filter.pp (90%)
 rename {tests => examples}/vhost_ip_based.pp (100%)
 rename {tests => examples}/vhost_proxypass.pp (100%)
 rename {tests => examples}/vhost_ssl.pp (100%)
 rename {tests => examples}/vhosts_without_listen.pp (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 985194bf54..fb33a13633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,51 @@
+## 2015-11-17 - Supported Release 1.7.0
+### Summary
+This release includes many new features and bugfixes. There are test, documentation and misc improvements.
+
+#### Features
+- allow groups with - like vhost-users 
+- ability to enable/disable the secruleengine through a parameter
+- add mod_auth_kerb parameters to vhost
+- client auth for reverse proxy
+- support for mod_auth_mellon
+- change SSLProtocol in apache::vhost to be space separated
+- RewriteLock support
+
+#### Bugfixes
+- fix apache::mod::cgid so it can be used with the event MPM 
+- load unixd before fcgid on all operating systems
+- fixes conditional in vhost aliases
+- corrects mod_cgid worker/event defaults
+- ProxyPassMatch parameters were ending up on a newline
+- catch that mod_authz_default has been removed in Apache 2.4
+- mod::ssl fails on SLES
+- fix typo of MPM_PREFORK for FreeBSD package install 
+- install all modules before adding custom configs
+- fix acceptance testing for SSLProtocol behaviour for real
+- fix ordering issue with conf_file and ports_file 
+
+#### Known Issues
+- mod_passenger is having issues installing on Redhat/Centos 6, This is due to package dependency issues.
+
+#### Improvements
+- added docs for forcetype directive
+- removes ruby 1.8.7 from the travisci test matrix
+- readme reorganisation, minor fixups
+- support the mod_proxy ProxyPassReverseCookiePath directive
+- the purge_vhost_configs parameter is actually called purge_vhost_dir
+- add ListenBacklog for mod worker
+- deflate application/json by default 
+- install mod_authn_alias as default mod in debian for apache < 2.4
+- optionally set LimitRequestFieldSize on an apache::vhost
+- add SecUploadDir parameter to support file uploads with mod_security
+- optionally set parameters for mod_ext_filter module
+- allow SetOutputFilter to be set on a directory
+- RC4 is deprecated
+- allow empty docroot
+- add option to configure the include pattern for the vhost_enable dir
+- allow multiple IP addresses per vhost
+- default document root update for Ubuntu 14.04 and Debian 8 
+
 ## 2015-07-28 - Supported Release 1.6.0
 ### Summary
 This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds.
diff --git a/README.md b/README.md
index 2953d8aba4..8601939aa1 100644
--- a/README.md
+++ b/README.md
@@ -3259,6 +3259,10 @@ The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside t
 
 The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested since repositories are missing compatible packages.
 
+### RHEL/CentOS 6
+
+The [`apache::mod::passenger`][] class is not installing as the the EL6 repository is missing compatible packages.
+
 ### RHEL/CentOS 7
 
 The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] define's [`rack_base_uris`][] parameter.
diff --git a/tests/apache.pp b/examples/apache.pp
similarity index 100%
rename from tests/apache.pp
rename to examples/apache.pp
diff --git a/tests/dev.pp b/examples/dev.pp
similarity index 100%
rename from tests/dev.pp
rename to examples/dev.pp
diff --git a/tests/init.pp b/examples/init.pp
similarity index 100%
rename from tests/init.pp
rename to examples/init.pp
diff --git a/tests/mod_load_params.pp b/examples/mod_load_params.pp
similarity index 100%
rename from tests/mod_load_params.pp
rename to examples/mod_load_params.pp
diff --git a/tests/mods.pp b/examples/mods.pp
similarity index 100%
rename from tests/mods.pp
rename to examples/mods.pp
diff --git a/tests/mods_custom.pp b/examples/mods_custom.pp
similarity index 100%
rename from tests/mods_custom.pp
rename to examples/mods_custom.pp
diff --git a/tests/php.pp b/examples/php.pp
similarity index 100%
rename from tests/php.pp
rename to examples/php.pp
diff --git a/tests/vhost.pp b/examples/vhost.pp
similarity index 100%
rename from tests/vhost.pp
rename to examples/vhost.pp
diff --git a/tests/vhost_directories.pp b/examples/vhost_directories.pp
similarity index 100%
rename from tests/vhost_directories.pp
rename to examples/vhost_directories.pp
diff --git a/tests/vhost_filter.pp b/examples/vhost_filter.pp
similarity index 90%
rename from tests/vhost_filter.pp
rename to examples/vhost_filter.pp
index ab339737f9..ca1a8bbe03 100644
--- a/tests/vhost_filter.pp
+++ b/examples/vhost_filter.pp
@@ -3,8 +3,8 @@
 
 # Example from README adapted.
 apache::vhost { 'readme.example.net':
-  docroot     => '/var/www/html',
-  filters             => [
+  docroot => '/var/www/html',
+  filters => [
     'FilterDeclare   COMPRESS',
     'FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/html',
     'FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/css',
diff --git a/tests/vhost_ip_based.pp b/examples/vhost_ip_based.pp
similarity index 100%
rename from tests/vhost_ip_based.pp
rename to examples/vhost_ip_based.pp
diff --git a/tests/vhost_proxypass.pp b/examples/vhost_proxypass.pp
similarity index 100%
rename from tests/vhost_proxypass.pp
rename to examples/vhost_proxypass.pp
diff --git a/tests/vhost_ssl.pp b/examples/vhost_ssl.pp
similarity index 100%
rename from tests/vhost_ssl.pp
rename to examples/vhost_ssl.pp
diff --git a/tests/vhosts_without_listen.pp b/examples/vhosts_without_listen.pp
similarity index 100%
rename from tests/vhosts_without_listen.pp
rename to examples/vhosts_without_listen.pp
diff --git a/metadata.json b/metadata.json
index a0e3fc2fac..f06e6d529c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 8dc87f961f4d6e031ae3b7d0c5fa34abea59d0ae Mon Sep 17 00:00:00 2001
From: Garrett Guillotte <gguillotte@users.noreply.github.com>
Date: Mon, 16 Nov 2015 17:32:48 -0800
Subject: [PATCH 0738/2267] (docs) Fix issues with the 1.7.0 readme.

Fixes several typos and links, and reorganizes the
`apache::mod::auth_mellon`, `mellon_enable`,
and `auth_kerb` sections, and document missing
default values.
---
 README.md           | 850 +++++++++++++++++++++-----------------------
 README.passenger.md |   2 +-
 2 files changed, 411 insertions(+), 441 deletions(-)

diff --git a/README.md b/README.md
index 8601939aa1..15565edfbe 100644
--- a/README.md
+++ b/README.md
@@ -144,8 +144,11 @@
 [`MinSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#minsparethreads
 [`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html
 [`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
+[`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html
 [`mod_authnz_external`]: https://code.google.com/p/mod-auth-external/
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
+[`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
+[`mod_cache_disk`]: https://httpd.apache.org/docs/current/mod/mod_cache_disk.html
 [`mod_expires`]: http://httpd.apache.org/docs/current/mod/mod_expires.html
 [`mod_ext_filter`]: http://httpd.apache.org/docs/current/mod/mod_ext_filter.html
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
@@ -1301,16 +1304,22 @@ Installs and manages [`mod_alias`][].
 - **Gentoo**: `/var/www/icons`
 - **Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
 
-####Class: `apache::mod::disk_cache`
+#### Class: `apache::mod::disk_cache`
 
-Installs and configures mod_disk_cache. The cache root is determined based on apache version and OS. It can be specified directly as well.
+Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4. The default cache root depends on the Apache version and operating system: 
 
-Specifying the cache root:
-```puppet
-  class {'::apache::mod::disk_cache':
-    cache_root => '/path/to/cache',
-  }
-```
+- **Debian**: `/var/cache/apache2/mod_cache_disk`
+- **FreeBSD**: `/var/cache/mod_cache_disk`
+- **Red Hat, Apache 2.4**: `/var/cache/httpd/proxy`
+- **Red Hat, Apache 2.2**: `/var/cache/mod_proxy`
+
+You can specify the cache root by passing a path as a string to the `cache_root` parameter.
+
+~~~ puppet
+class {'::apache::mod::disk_cache':
+  cache_root => '/path/to/cache',
+}
+~~~
 
 ##### Class: `apache::mod::event`
 
@@ -1352,29 +1361,29 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
 ##### Class: `apache::mod::auth_mellon`
 
-Installs and manages [`mod_auth_mellon`][]. It's parameters share names with the Apache module's directives.
+Installs and manages [`mod_auth_mellon`][]. Its parameters share names with the Apache module's directives.
 
-~~~puppet
-class{'apache::mod::auth_mellon':
-  mellon_cache_size => 101
+~~~ puppet
+class{ 'apache::mod::auth_mellon':
+  mellon_cache_size => 101,
 }
 ~~~
 
 **Parameters within `apache::mod::auth_mellon`**:
 
-- `mellon_cache_size`: Size in megabytes of mellon cache.
-- `mellon_cache_entry_size`: Maximum size for single session.
-- `mellon_lock_file`: Location of lock file.
-- `mellon_post_directory`: Full path where post requests are saved.
-- `mellon_post_ttl`: Time to keep post requests.
-- `mellon_post_size`: Maximum size of post requests.
-- `mellon_post_count`: Maxmum number of post requests.
+- `mellon_cache_entry_size`: Maximum size for a single session. Default: 'undef'.
+- `mellon_cache_size`: Size in megabytes of the mellon cache. Default: 100.
+- `mellon_lock_file`: Location of lock file. Default: '`/run/mod_auth_mellon/lock`'.
+- `mellon_post_directory`: Full path where post requests are saved. Default: '`/var/cache/apache2/mod_auth_mellon/`'
+- `mellon_post_ttl`: Time to keep post requests. Default: 'undef'.
+- `mellon_post_size`: Maximum size of post requests. Default: 'undef'.
+- `mellon_post_count`: Maximum number of post requests. Default: 'undef'.
 
 ##### Class: `apache::mod::deflate`
 
 Installs and configures [`mod_deflate`][].
 
-**Parameters within `apache::mod::deflate`:**
+**Parameters within `apache::mod::deflate`**:
 
 - `types`: An [array][] of [MIME types][MIME `content-type`] to be deflated. Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json' ].
 - `notes`: A [Hash][] where the key represents the type and the value represents the note name. Default: { 'Input'  => 'instream', 'Output' => 'outstream', 'Ratio'  => 'ratio' }
@@ -1394,7 +1403,7 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 Installs and configures [`mod_ext_filter`][].
 
 ~~~ puppet
-class{'apache::mod::ext_filter':
+class { 'apache::mod::ext_filter':
   ext_filter_define => {
     'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
     'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
@@ -1410,7 +1419,7 @@ class{'apache::mod::ext_filter':
 
 Installs and configures [`mod_fcgid`][].
 
-The class makes no effort to individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [Hash][]. For example:
+The class makes no effort to individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [hash][]. For example:
 
 ~~~ puppet
 class { 'apache::mod::fcgid':
@@ -1530,7 +1539,7 @@ Default values depend on your operating system.
 
 - `package_name`: Names the package that installs `php_mod`.
 - `path`: Defines the path to the `mod_php` shared object (`.so`) file.
-- `source`: Defines the path to the default configuration. Valid options include a `puppet:///` paths.
+- `source`: Defines the path to the default configuration. Valid options include a `puppet:///` path.
 - `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
 - `content`: Adds arbitrary content to `php.conf`.
 
@@ -2018,59 +2027,44 @@ Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys can be:
 Usage typically looks like:
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot => '/path/to/directory',
-      itk     => {
-        user  => 'someuser',
-        group => 'somegroup',
-      },
-    }
+apache::vhost { 'sample.example.net':
+  docroot => '/path/to/directory',
+  itk     => {
+    user  => 'someuser',
+    group => 'somegroup',
+  },
+}
 ~~~
 
 ##### `auth_kerb`
 
-Enable mod_auth_kerb parameters for a virtual host. Valid values are 'true' or 'false'. Defaults to 'false'.
+Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid values are 'true' or 'false'. Defaults to 'false'.
 
 Usage typically looks like:
 
 ~~~ puppet
-    apache::vhost {'sample.example.net':
-      auth_kerb              => true,
-      krb_method_negotiate   => 'on',
-      krb_auth_realms        => ['EXAMPLE.ORG'],
-      krb_local_user_mapping => 'on',
-      directories            => {
-        path         => '/var/www/html',
-        auth_name    => 'Kerberos Login',
-        auth_type    => 'Kerberos',
-        auth_require => 'valid-user',
-      }
-    }
+apache::vhost { 'sample.example.net':
+  auth_kerb              => true,
+  krb_method_negotiate   => 'on',
+  krb_auth_realms        => ['EXAMPLE.ORG'],
+  krb_local_user_mapping => 'on',
+  directories            => {
+    path         => '/var/www/html',
+    auth_name    => 'Kerberos Login',
+    auth_type    => 'Kerberos',
+    auth_require => 'valid-user',
+  },
+}
 ~~~
 
-##### `krb_method_negotiate`
-
-To enable or disable the use of the Negotiate method. Defaults is 'on'
-
-##### `krb_method_k5passwd`
-
-To enable or disable the use of password based authentication for Kerberos v5. Default is 'on'
-
-##### `krb_authoritative`
-
-If set to off this directive allow authentication controls to be pass on to another modules.  Default is 'on'
+Related parameters follow the names of `mod_auth_kerb` directives:
 
-##### `krb_auth_realms`
-
-Specifies an array Kerberos realm(s) to be used for authentication. Default is []
-
-##### `krb_5keytab`
-
-Location of the Kerberos V5 keytab file. Not set by default.
-
-##### `krb_local_user_mapping`
-
-Strips @REALM from username for further use. Not set by default.
+- `krb_method_negotiate`: Determines whether to use the Negotiate method. Default: 'on'.
+- `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'.
+- `krb_authoritative`: If set to 'off', authentication controls can be passed on to another module. Default: 'on'.
+- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: `[]`.
+- `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: undef.
+- `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: undef.
 
 ##### `limit_request_field_size`
 
@@ -2265,11 +2259,11 @@ Specifies the address to redirect to. Defaults to 'undef'.
 Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent.
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_source => ['/images','/downloads'],
-      redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  redirect_source => ['/images','/downloads'],
+  redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+}
 ~~~
 
 ##### `redirect_status`
@@ -2277,10 +2271,10 @@ Specifies the source URIs that redirect to the destination specified in `redirec
 Specifies the status to append to the redirect. Defaults to 'undef'.
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_status => ['temp','permanent'],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  redirect_status => ['temp','permanent'],
+}
 ~~~
 
 ##### `redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
@@ -2288,12 +2282,12 @@ Specifies the status to append to the redirect. Defaults to 'undef'.
 Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Defaults to 'undef'.
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirectmatch_status => ['404','404'],
-      redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-      redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
+}
 ~~~
 
 ##### `request_headers`
@@ -2301,13 +2295,13 @@ Determines which server status should be raised for a given regular expression a
 Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Defaults to 'undef'.
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      request_headers => [
-        'append MirrorID "mirror 12"',
-        'unset MirrorID',
-      ],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  request_headers => [
+    'append MirrorID "mirror 12"',
+    'unset MirrorID',
+  ],
+}
 ~~~
 ##### `rewrites`
 
@@ -2316,69 +2310,69 @@ Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
+}
 ~~~
 
 The parameter allows rewrite conditions that, when true, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'redirect IE',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-      ],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'redirect IE',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
 ~~~
 
 You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-      ],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
 ~~~
 
 Multiple rewrites and conditions are also possible
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-        {
-          comment      => 'Internet Explorer',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
-        },
-        {
-          rewrite_base => /apps/,
-          rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
-        },
-        { comment      => 'Rewrite to lower case',
-          rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
-          rewrite_map  => ['lc int:tolower'],
-          rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
-        },
-     ],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+    {
+      comment      => 'Internet Explorer',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+    },
+    {
+      rewrite_base => /apps/,
+      rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
+    },
+    { comment      => 'Rewrite to lower case',
+      rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
+      rewrite_map  => ['lc int:tolower'],
+      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+    },
+  ],
+}
 ~~~
 
 Refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions.
@@ -2389,32 +2383,32 @@ Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for exa
 
 ##### `scriptaliases`
 
-*Note*: This parameter is deprecated in favour of the `aliases` parameter.
+**Note**: This parameter is deprecated in favor of the `aliases` parameter.
 
-Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
+Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html).
 
 ~~~ puppet
-    scriptaliases => [
-      {
-        alias => '/myscript',
-        path  => '/usr/share/myscript',
-      },
-      {
-        aliasmatch => '^/foo(.*)',
-        path       => '/usr/share/fooscripts$1',
-      },
-      {
-        aliasmatch => '^/bar/(.*)',
-        path       => '/usr/share/bar/wrapper.sh/$1',
-      },
-      {
-        alias => '/neatscript',
-        path  => '/usr/share/neatscript',
-      },
-    ]
+scriptaliases => [
+  {
+    alias => '/myscript',
+    path  => '/usr/share/myscript',
+  },
+  {
+    aliasmatch => '^/foo(.*)',
+    path       => '/usr/share/fooscripts$1',
+  },
+  {
+    aliasmatch => '^/bar/(.*)',
+    path       => '/usr/share/bar/wrapper.sh/$1',
+  },
+  {
+    alias => '/neatscript',
+    path  => '/usr/share/neatscript',
+  },
+]
 ~~~
 
-The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, more specific aliases should come before more general ones to avoid shadowing.
+The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases before more general ones to avoid shadowing.
 
 ##### `serveradmin`
 
@@ -2435,9 +2429,9 @@ Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
 Example:
 
 ~~~ puppet
-    apache::vhost { 'setenv.example.com':
-      setenv => ['SPECIAL_PATH /foo/bin'],
-    }
+apache::vhost { 'setenv.example.com':
+  setenv => ['SPECIAL_PATH /foo/bin'],
+}
 ~~~
 
 ##### `setenvif`
@@ -2457,16 +2451,16 @@ Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=
 To set up a virtual host with suPHP
 
 ~~~ puppet
-    apache::vhost { 'suphp.example.com':
-      port                => '80',
-      docroot             => '/home/appuser/myphpapp',
-      suphp_addhandler    => 'x-httpd-php',
-      suphp_engine        => 'on',
-      suphp_configpath    => '/etc/php5/apache2',
-      directories         => { path => '/home/appuser/myphpapp',
-        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
-      }
-    }
+apache::vhost { 'suphp.example.com':
+  port                => '80',
+  docroot             => '/home/appuser/myphpapp',
+  suphp_addhandler    => 'x-httpd-php',
+  suphp_engine        => 'on',
+  suphp_configpath    => '/etc/php5/apache2',
+  directories         => { path => '/home/appuser/myphpapp',
+    'suphp'           => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
 ~~~
 
 ##### `vhost_name`
@@ -2478,13 +2472,13 @@ Enables name-based virtual hosting. If no IP is passed to the virtual host, but
 Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'.
 
 ~~~ puppet
-    apache::vhost { 'subdomain.loc':
-      vhost_name       => '*',
-      port             => '80',
-      virtual_docroot' => '/var/www/%-2+',
-      docroot          => '/var/www',
-      serveraliases    => ['*.loc',],
-    }
+apache::vhost { 'subdomain.loc':
+  vhost_name       => '*',
+  port             => '80',
+  virtual_docroot' => '/var/www/%-2+',
+  docroot          => '/var/www',
+  serveraliases    => ['*.loc',],
+}
 ~~~
 
 ##### `wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
@@ -2506,22 +2500,22 @@ Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 To set up a virtual host with WSGI
 
 ~~~ puppet
-    apache::vhost { 'wsgi.example.com':
-      port                        => '80',
-      docroot                     => '/var/www/pythonapp',
-      wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options =>
-        { processes    => '2',
-          threads      => '15',
-          display-name => '%{GROUP}',
-         },
-      wsgi_process_group          => 'wsgi',
-      wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-      wsgi_chunked_request        => 'On',
-    }
+apache::vhost { 'wsgi.example.com':
+  port                        => '80',
+  docroot                     => '/var/www/pythonapp',
+  wsgi_daemon_process         => 'wsgi',
+  wsgi_daemon_process_options =>
+    { processes    => '2',
+      threads      => '15',
+      display-name => '%{GROUP}',
+     },
+  wsgi_process_group          => 'wsgi',
+  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+  wsgi_chunked_request        => 'On',
+}
 ~~~
 
-####Parameter `directories` for `apache::vhost`
+#### Parameter `directories` for `apache::vhost`
 
 The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
 
@@ -2532,15 +2526,15 @@ The `provider` key is optional. If missing, this key defaults to 'directory'. Va
 General `directories` usage looks something like
 
 ~~~ puppet
-    apache::vhost { 'files.example.net':
-      docroot     => '/var/www/files',
-      directories => [
-        { 'path'     => '/var/www/files',
-          'provider' => 'files',
-          'deny'     => 'from all'
-         },
-      ],
-    }
+apache::vhost { 'files.example.net':
+  docroot     => '/var/www/files',
+  directories => [
+    { 'path'     => '/var/www/files',
+      'provider' => 'files',
+      'deny'     => 'from all',
+     },
+  ],
+}
 ~~~
 
 *Note:* At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
@@ -2548,9 +2542,9 @@ General `directories` usage looks something like
 Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes.  This looks like
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', handler => value } ],
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [ { path => '/path/to/directory', handler => value } ],
 }
 ~~~
 
@@ -2561,14 +2555,14 @@ Any handlers you do not set in these hashes are considered 'undefined' within Pu
 Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path        => '/path/to/directory',
-          addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
+    },
+  ],
+}
 ~~~
 
 ###### `allow`
@@ -2576,14 +2570,14 @@ Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhand
 Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path  => '/path/to/directory',
-          allow => 'from example.org',
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      allow => 'from example.org',
+    },
+  ],
+}
 ~~~
 
 ###### `allow_override`
@@ -2591,14 +2585,14 @@ Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow)
 Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot      => '/path/to/directory',
-      directories  => [
-        { path           => '/path/to/directory',
-          allow_override => ['AuthConfig', 'Indexes'],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot      => '/path/to/directory',
+  directories  => [
+    { path           => '/path/to/directory',
+      allow_override => ['AuthConfig', 'Indexes'],
+    },
+  ],
+}
 ~~~
 
 ###### `auth_basic_authoritative`
@@ -2704,33 +2698,33 @@ Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) dir
 An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      directories => [
-        { path            => '/srv/www',
-          error_documents => [
-            { 'error_code' => '503',
-              'document'   => '/service-unavail',
-            },
-          ],
+apache::vhost { 'sample.example.net':
+  directories => [
+    { path            => '/srv/www',
+      error_documents => [
+        { 'error_code' => '503',
+          'document'   => '/service-unavail',
         },
       ],
-    }
+    },
+  ],
+}
 ~~~
 
 ###### `ext_filter_options`
 
-Sets the [ExtFilterOptions](http://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
-Note that you must delcare `class {'apache::mod::ext_filter': }` before using this directive.
+Sets the [ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
+Note that you must declare `class { 'apache::mod::ext_filter': }` before using this directive.
 
 ~~~ puppet
-    apache::vhost{ 'filter.example.org':
-      docroot => '/var/www/filter',
-      directories => [
-        { path               => '/var/www/filter',
-          ext_filter_options => 'LogStderr Onfail=abort',
-        },
-      ],
-    }
+apache::vhost { 'filter.example.org':
+  docroot     => '/var/www/filter',
+  directories => [
+    { path               => '/var/www/filter',
+      ext_filter_options => 'LogStderr Onfail=abort',
+    },
+  ],
+}
 ~~~
 
 ###### `geoip_enable`
@@ -2739,14 +2733,14 @@ Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configura
 Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
 
 ~~~ puppet
-    apache::vhost { 'first.example.com':
-      docroot     => '/var/www/first',
-      directories => [
-        { path         => '/var/www/first',
-          geoip_enable => true,
-        },
-      ],
-    }
+apache::vhost { 'first.example.com':
+  docroot     => '/var/www/first',
+  directories => [
+    { path         => '/var/www/first',
+      geoip_enable => true,
+    },
+  ],
+}
 ~~~
 
 ###### `headers`
@@ -2754,13 +2748,13 @@ Note that you must declare `class {'apache::mod::geoip': }` before using this di
 Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => {
-        path    => '/path/to/directory',
-        headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-      },
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => {
+    path    => '/path/to/directory',
+    headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+  },
+}
 ~~~
 
 ###### `index_options`
@@ -2768,58 +2762,58 @@ Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.htm
 Allows configuration settings for [directory indexing](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path           => '/path/to/directory',
-          directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work
-          options        => ['Indexes','FollowSymLinks','MultiViews'],
-          index_options  => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path           => '/path/to/directory',
+      directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work
+      options        => ['Indexes','FollowSymLinks','MultiViews'],
+      index_options  => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
+    },
+  ],
+}
 ~~~
 
 ###### `index_order_default`
 
-Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
+Sets the [default ordering](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path                => '/path/to/directory',
-          order               => 'Allow,Deny',
-          index_order_default => ['Descending', 'Date'],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path                => '/path/to/directory',
+      order               => 'Allow,Deny',
+      index_order_default => ['Descending', 'Date'],
+    },
+  ],
+}
 ~~~
 
 ###### `index_style_sheet`
 
-Sets the [IndexStyleSheet](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet) which adds a CSS stylesheet to the directory index.
+Sets the [IndexStyleSheet](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet), which adds a CSS stylesheet to the directory index.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path              => '/path/to/directory',
-          options           => ['Indexes','FollowSymLinks','MultiViews'],
-          index_options     => ['FancyIndexing'],
-          index_style_sheet => '/styles/style.css',
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      options           => ['Indexes','FollowSymLinks','MultiViews'],
+      index_options     => ['FancyIndexing'],
+      index_style_sheet => '/styles/style.css',
+    },
+  ],
+}
 ~~~
 
 ###### `mellon_enable`
 
-Sets the [MellonEnable](https://github.com/UNINETT/mod_auth_mellon) to enable auth_melon on a location.
+Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_melon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.
 
 ~~~ puppet
-apache::vhost{'sample.example.net':
-  docroot => '/path/to/directory',
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
   directories => [
     { path                       => '/',
       provider                   => 'directory',
@@ -2827,69 +2821,45 @@ apache::vhost{'sample.example.net':
       mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key,
       mellon_endpoint_path       => '/mellon',
       mellon_set_env_no_prefix   => { 'ADFS_GROUP' => 'http://schemas.xmlsoap.org/claims/Group',
-                                      'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress'},
-      mellon_user => 'ADFS_LOGIN'
+                                      'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress', },
+      mellon_user => 'ADFS_LOGIN',
     },
-    { path => '/protected',
-      provider => 'location',
+    { path          => '/protected',
+      provider      => 'location',
       mellon_enable => 'auth',
-      auth_type => 'Mellon',
-      auth_require => 'valid-user',
-      mellon_cond => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]']
-    }
+      auth_type     => 'Mellon',
+      auth_require  => 'valid-user',
+      mellon_cond   => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]'],
+    },
   ]
 }
 ~~~
 
-###### `mellon_cond`
-
-Sets the [MellonCond](https://github.com/UNINETT/mod_auth_mellon) is an array of mellon conditions that must
-be met to grant access.
-
-
-###### `mellon_endpoint_path`
-
-Sets the [MellonEndpointPath](https://github.com/UNINETT/mod_auth_mellon) to set melon endpoint path.
-
-###### `mellon_idp_metadata_file`
-
-Sets the [MellonIDPMetadataFile](https://github.com/UNINETT/mod_auth_mellon) location of idp metadata file.
-
-###### `mellon_saml_rsponse_dump`
+Related parameters follow the names of `mod_auth_melon` directives:
 
-Sets the [MellonSamlRepsponseDump](https://github.com/UNINETT/mod_auth_mellon) to enable debug of SAML.
-
-###### `mellon_set_env_no_prefix`
-
-Sets the [MellonSetEnvNoPrefix](https://github.com/UNINETT/mod_auth_mellon) is a hash of attribute names to map
+- `mellon_cond`: Takes an array of mellon conditions that must be met to grant access, and creates a [MellonCond][`mod_auth_melon`] directive for each item in the array.
+- `mellon_endpoint_path`: Sets the [MellonEndpointPath][`mod_auth_melon`] to set the mellon endpoint path.
+- `mellon_idp_metadata_file`: Sets the [MellonIDPMetadataFile][`mod_auth_melon`] location of the IDP metadata file.
+- `mellon_saml_rsponse_dump`: Sets the [MellonSamlResponseDump][`mod_auth_melon`] directive to enable debug of SAML.
+- `mellon_set_env_no_prefix`: Sets the [MellonSetEnvNoPrefix][`mod_auth_melon`] directive to a hash of attribute names to map
 to environment variables.
-
-
-###### `mellon_sp_private_key_file`
-
-Sets the [MellonSPPrivateKeyFile](https://github.com/UNINETT/mod_auth_mellon) private key location of service provider.
-
-###### `mellon_sp_cert_file`
-
-Sets the [MellonSPCertFile](https://github.com/UNINETT/mod_auth_mellon) public key location of service provider.
-
-###### `mellon_user`
-
-Sets the [MellonUser](https://github.com/UNINETT/mod_auth_mellon) attribute we should use for the username.
+- `mellon_sp_private_key_file`: Sets the [MellonSPPrivateKeyFile][`mod_auth_melon`] directive for the private key location of the service provider.
+- `mellon_sp_cert_file`: Sets the [MellonSPCertFile][`mod_auth_melon`] directive for the public key location of the service provider.
+- `mellon_user`: Sets the [MellonUser][`mod_auth_melon`] attribute to use for the username.
 
 ###### `options`
 
-Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
+Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path    => '/path/to/directory',
-          options => ['Indexes','FollowSymLinks','MultiViews'],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      options => ['Indexes','FollowSymLinks','MultiViews'],
+    },
+  ],
+}
 ~~~
 
 ###### `order`
@@ -2897,32 +2867,32 @@ Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options)
 Sets the order of processing Allow and Deny statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path  => '/path/to/directory',
-          order => 'Allow,Deny',
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      order => 'Allow,Deny',
+    },
+  ],
+}
 ~~~
 
 ###### `passenger_enabled`
 
-Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
+Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directive to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path              => '/path/to/directory',
-          passenger_enabled => 'on',
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      passenger_enabled => 'on',
+    },
+  ],
+}
 ~~~
 
-*Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
+**Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
 ###### `php_value` and `php_flag`
 
@@ -2935,47 +2905,47 @@ Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/
 
 ###### `satisfy`
 
-Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
+Sets a `Satisfy` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path    => '/path/to/directory',
-          satisfy => 'Any',
-        }
-      ],
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      satisfy => 'Any',
     }
+  ],
+}
 ~~~
 
 ###### `sethandler`
 
-Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
+Sets a `SetHandler` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler).
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path       => '/path/to/directory',
-          sethandler => 'None',
-        }
-      ],
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path       => '/path/to/directory',
+      sethandler => 'None',
     }
+  ],
+}
 ~~~
 
 ###### `set_output_filter`
 
-Sets a `SetOutputFilter` directive as per [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter). An example:
+Sets a `SetOutputFilter` directive per the [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
 
 ~~~ puppet
-    apache::vhost{ 'filter.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path              => '/path/to/directory',
-          set_output_filter => puppetdb-strip-resource-params,
-        },
-      ],
-    }
+apache::vhost{ 'filter.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      set_output_filter => puppetdb-strip-resource-params,
+    },
+  ],
+}
 ~~~
 
 ###### `rewrites`
@@ -2983,64 +2953,64 @@ Sets a `SetOutputFilter` directive as per [Apache Core documentation](http://htt
 Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
 
 ~~~ puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path        => '/path/to/directory',
-          rewrites => [ { comment      => 'Permalink Rewrites',
-                          rewrite_base => '/'
-                        },
-                        { rewrite_rule => [ '^index\.php$ - [L]' ]
-                        },
-                        { rewrite_cond => [ '%{REQUEST_FILENAME} !-f',
-                                            '%{REQUEST_FILENAME} !-d',
-                                          ],
-                          rewrite_rule => [ '. /index.php [L]' ],
-                        }
-                      ],
-        },
-      ],
-    }
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      rewrites => [ { comment      => 'Permalink Rewrites',
+                      rewrite_base => '/'
+                    },
+                    { rewrite_rule => [ '^index\.php$ - [L]' ]
+                    },
+                    { rewrite_cond => [ '%{REQUEST_FILENAME} !-f',
+                                        '%{REQUEST_FILENAME} !-d',
+                                      ],
+                      rewrite_rule => [ '. /index.php [L]' ],
+                    }
+                  ],
+    },
+  ],
+}
 ~~~
 
-***Note*** If you include rewrites in your directories make sure you are also including `apache::mod::rewrite`. You may also want to consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
+***Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
 
 ###### `shib_request_setting`
 
-Allows an valid content setting to be set or altered for the application request. This command takes two parameters, the name of the content setting, and the value to set it to.Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
+Allows a valid content setting to be set or altered for the application request. This command takes two parameters: the name of the content setting, and the value to set it to. Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
 ~~~ puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path                  => '/path/to/directory',
-          shib_request_settings => { 'requiresession' => 'On' },
-          shib_use_headers      => 'On',
-        },
-      ],
-    }
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path                  => '/path/to/directory',
+      shib_request_settings => { 'requiresession' => 'On' },
+      shib_use_headers      => 'On',
+    },
+  ],
+}
 ~~~
 
 ###### `shib_use_headers`
 
-When set to 'On' this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
+When set to 'On', this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
 ###### `ssl_options`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
 
 ~~~ puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path        => '/path/to/directory',
-          ssl_options => '+ExportCertData',
-        },
-        { path        => '/path/to/different/dir',
-          ssl_options => [ '-StdEnvVars', '+ExportCertData'],
-        },
-      ],
-    }
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      ssl_options => '+ExportCertData',
+    },
+    { path        => '/path/to/different/dir',
+      ssl_options => [ '-StdEnvVars', '+ExportCertData'],
+    },
+  ],
+}
 ~~~
 
 ###### `suphp`
@@ -3048,20 +3018,20 @@ String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl
 A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and can only be passed within `directories`.
 
 ~~~ puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path  => '/path/to/directory',
-          suphp =>
-            { user  =>  'myappuser',
-              group => 'myappgroup',
-            },
-        },
-      ],
-    }
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      suphp => {
+        user  => 'myappuser',
+        group => 'myappgroup',
+      },
+    },
+  ],
+}
 ~~~
 
-####SSL parameters for `apache::vhost`
+#### SSL parameters for `apache::vhost`
 
 All of the SSL parameters for `::vhost` default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
 
diff --git a/README.passenger.md b/README.passenger.md
index d50b3f4897..c16c5a4a45 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -172,7 +172,7 @@ http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRe
 
 #### passenger_spawn_method
 
-Sets the method by which Ruby application processes are spawned.  Default is `smart`
+Sets the method by which Ruby application processes are spawned. Default is 'smart',
 which caches code using the app preloader.
 
 Passenger >= 4.0 renamed `conservative` to `direct` and `smart-lv2` to `smart`.

From f35a65d1f531eb78bafe9cd4be883c3322553073 Mon Sep 17 00:00:00 2001
From: Robert Vargason <robert@vargason.at>
Date: Wed, 18 Nov 2015 12:14:49 +0100
Subject: [PATCH 0739/2267] Leave require directive unmanaged

Instead to default require to 'Require all granted' if no 'require'
parameter is set for a directory, leave require unmanaged in apache 2.4
if needed. This is useful for complex authentication/authorization
requirements which are handled in a custom fragment.
---
 README.md                        | 29 ++++++++++++++
 spec/defines/vhost_spec.rb       | 67 ++++++++++++++++++++++++++++++++
 templates/vhost/_directories.erb |  4 +-
 3 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 32ac2cbea2..86c1d9c9b3 100644
--- a/README.md
+++ b/README.md
@@ -2951,6 +2951,35 @@ Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/
 `php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
 
 
+###### `require`
+
+
+Sets a `Require` directive as per the [Apache Authz documentation](http://httpd.apache.org/docs/current/mod/mod_authz_core.html#require). If no `require` is set, it will default to `Require all granted`.
+
+~~~ puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path    => '/path/to/directory',
+          require => 'IP 10.17.42.23',
+        }
+      ],
+    }
+~~~
+
+If `require` is set to `unmanaged` it will not be set at all. This is useful for complex authentication/authorization requirements which are handled in a custom fragment.
+
+~~~ puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path    => '/path/to/directory',
+          require => 'unmanaged',
+        }
+      ],
+    }
+~~~
+
 ###### `satisfy`
 
 Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 76dc950574..3f53472543 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -978,5 +978,72 @@
       let :facts do default_facts end
       it { expect { is_expected.to compile }.to raise_error }
     end
+    context 'default of require all granted' do
+      let :params do
+        {
+          'docroot'         => '/var/www/foo',
+          'directories'     => [
+            {
+              'path'     => '/var/www/foo/files',
+              'provider' => 'files',
+            },
+          ],
+
+        }
+      end
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :kernelversion          => '3.19.2',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_file('25-rspec.example.com.conf') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require all granted$/ ) }
+    end
+    context 'require unmanaged' do
+      let :params do
+        {
+          'docroot'         => '/var/www/foo',
+          'directories'     => [
+            {
+              'path'     => '/var/www/foo',
+              'require'  => 'unmanaged',
+            },
+          ],
+
+        }
+      end
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :kernelversion          => '3.19.2',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_file('25-rspec.example.com.conf') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require all granted$/ )
+      }
+    end
   end
 end
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index df6b6615e4..b1475513c9 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -57,7 +57,7 @@
       <%- end -%>
     <%- end -%>
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      <%- if directory['require'] and directory['require'] != '' -%>
+      <%- if directory['require'] && directory['require'] != '' && directory['require'] !~ /unmanaged/i -%>
         <%- Array(directory['require']).each do |req| -%>
     Require <%= req %>
         <%- end -%>
@@ -65,7 +65,7 @@
       <%- if directory['auth_require'] -%>
     Require <%= directory['auth_require'] %>
       <%- end -%>
-      <%- if !(directory['require'] and directory['require'] != '') && !(directory['auth_require']) -%>
+      <%- if !(directory['require'] && directory['require'] != '') && directory['require'] !~ /unmanaged/i && !(directory['auth_require']) -%>
     Require all granted
       <%- end -%>
     <%- else -%>

From da972b98455631a101884e09c448c8c966ee27ac Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Wed, 18 Nov 2015 15:34:49 +0100
Subject: [PATCH 0740/2267] (MODULES-2834) Support SSLProxyCheckPeerCN and
 SSLProxyCheckPeerName settings

Allows SSLProxyCheckPeerCN and SSLProxyCheckPeerName to be set on
an SSL enabled vhost.

```puppet
apache::vhost{'foo':
   ssl_proxy_check_peer_cn   => 'on',
   ssl_proxy_check_peer_name => 'on'
}
```

results in

```
SSLProxyCheckPeerCN  on
SSLProxyCheckPeerName on
```

apache configuration with in a vhost.

* https://tickets.puppetlabs.com/browse/MODULES-2834
* http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn
* http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername
---
 README.md                  |  9 +++++++++
 manifests/vhost.pp         | 12 ++++++++++++
 spec/defines/vhost_spec.rb |  7 +++++++
 templates/vhost/_ssl.erb   |  6 ++++++
 4 files changed, 34 insertions(+)

diff --git a/README.md b/README.md
index 32ac2cbea2..dfdd8fe872 100644
--- a/README.md
+++ b/README.md
@@ -3164,6 +3164,15 @@ Sets the [SSLProxyMachineCertificateFile](http://httpd.apache.org/docs/current/m
     }
 ~~~
 
+##### `ssl_proxy_check_peer_cn`
+ 
+Sets the [SSLProxyMachinePeerCN](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specified whether the remote server certificate's CN field is compared against the hostname of the request URL .  Defaults to 'undef'.
+
+
+##### `ssl_proxy_check_peer_name`
+ 
+Sets the [SSLProxyMachinePeerName](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specified whether the remote server certificate's CN field is compared against the hostname of the request URL .  Defaults to 'undef'.
+
 ##### `ssl_options`
 
 Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e2725b8aea..2b7c50f48c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -25,6 +25,8 @@
   $ssl_honorcipherorder        = undef,
   $ssl_verify_client           = undef,
   $ssl_verify_depth            = undef,
+  $ssl_proxy_check_peer_cn     = undef,
+  $ssl_proxy_check_peer_name   = undef,
   $ssl_proxy_machine_cert      = undef,
   $ssl_options                 = undef,
   $ssl_openssl_conf_cmd        = undef,
@@ -236,6 +238,14 @@
   if $manage_docroot {
     validate_string($docroot)
   }
+
+  if $ssl_proxy_check_peer_cn {
+    validate_re($ssl_proxy_check_peer_cn,'(^on$|^off$)',"${ssl_proxy_check_peer_cn} is not permitted for ssl_proxy_check_peer_cn. Allowed values are 'on' or 'off'.")
+  }
+  if $ssl_proxy_check_peer_name {
+    validate_re($ssl_proxy_check_peer_name,'(^on$|^off$)',"${ssl_proxy_check_peer_name} is not permitted for ssl_proxy_check_peer_name. Allowed values are 'on' or 'off'.")
+  }
+
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -784,6 +794,8 @@
   # - $ssl_honorcipherorder
   # - $ssl_verify_client
   # - $ssl_verify_depth
+  # - $ssl_proxy_check_peer_cn
+  # - $ssl_proxy_check_peer_name
   # - $ssl_proxy_machine_cert
   # - $ssl_options
   # - $ssl_openssl_conf_cmd
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 76dc950574..c5c14ea53f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -154,7 +154,10 @@
           'ssl_verify_depth'            => '3',
           'ssl_options'                 => '+ExportCertData',
           'ssl_openssl_conf_cmd'        => 'DHParameters "foo.pem"',
+          'ssl_proxy_check_peer_cn'     => 'on',
+          'ssl_proxy_check_peer_name'   => 'on',
           'ssl_proxyengine'             => true,
+
           'priority'                    => '30',
           'default_vhost'               => true,
           'servername'                  => 'example.com',
@@ -432,6 +435,10 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
         :content => /^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+        :content => /^\s+SSLProxyCheckPeerCN\s+on$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+        :content => /^\s+SSLProxyCheckPeerName\s+on$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index a3d76fb13e..aaadebdbc1 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -40,6 +40,12 @@
   <%- if @ssl_verify_depth -%>
   SSLVerifyDepth          <%= @ssl_verify_depth %>
   <%- end -%>
+  <%- if @ssl_proxy_check_peer_cn -%>
+  SSLProxyCheckPeerCN     <%= @ssl_proxy_check_peer_cn %>
+  <%- end -%>
+  <%- if @ssl_proxy_check_peer_name -%>
+  SSLProxyCheckPeerName   <%= @ssl_proxy_check_peer_name %>
+  <%- end -%>
   <%- if @ssl_proxy_machine_cert -%>
   SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
   <%- end -%>

From f98838a297f4a2563da4bf6128d1d6f57ae6a567 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Wed, 4 Nov 2015 14:07:50 +0000
Subject: [PATCH 0741/2267] removing an over complicated test case

---
 spec/acceptance/mod_passenger_spec.rb | 110 --------------------------
 1 file changed, 110 deletions(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 7b2d0da9af..5af9113e5c 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -194,115 +194,5 @@ class { 'apache::mod::passenger': }
       end
 
     end
-
-  when 'RedHat'
-    # no fedora 18 passenger package yet, and rhel5 packages only exist for ruby 1.8.5
-    unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18) or (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5' and fact('rubyversion') != '1.8.5')
-
-      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-        pending('test passenger - RHEL7 packages don\'t exist')
-      else
-        context "default passenger config" do
-          it 'succeeds in puppeting passenger' do
-            pp = <<-EOS
-              /* EPEL and passenger repositories */
-              class { 'epel': }
-              exec { 'passenger.repo GPG key':
-                command => '/usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-                creates => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-              }
-              file { 'passenger.repo GPG key':
-                ensure  => file,
-                path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-                require => Exec['passenger.repo GPG key'],
-              }
-              epel::rpm_gpg_key { 'passenger.stealthymonkeys.com':
-                path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-                require => [
-                  Class['epel'],
-                  File['passenger.repo GPG key'],
-                ]
-              }
-              $releasever_string = $operatingsystem ? {
-                'Scientific' => '6',
-                default      => '$releasever',
-              }
-              yumrepo { 'passenger':
-                baseurl         => "http://passenger.stealthymonkeys.com/rhel/${releasever_string}/\\$basearch" ,
-                descr           => "Red Hat Enterprise ${releasever_string} - Phusion Passenger",
-                enabled         => 1,
-                gpgcheck        => 1,
-                gpgkey          => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-                mirrorlist      => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
-                require => [
-                  Epel::Rpm_gpg_key['passenger.stealthymonkeys.com'],
-                ],
-              }
-              /* apache and mod_passenger */
-              class { 'apache':
-                  require => [
-                    Class['epel'],
-                ],
-              }
-              class { 'apache::mod::passenger':
-                require => [
-                  Yumrepo['passenger']
-                ],
-              }
-              #{pp_rackapp}
-            EOS
-            apply_manifest(pp, :catch_failures => true)
-          end
-
-          describe service(service_name) do
-            it { is_expected.to be_enabled }
-            it { is_expected.to be_running }
-          end
-
-          describe file(conf_file) do
-            it { is_expected.to contain "PassengerRoot #{passenger_root}" }
-            it { is_expected.to contain "PassengerRuby #{passenger_ruby}" }
-            it { is_expected.to contain "PassengerTempDir #{passenger_tempdir}" }
-          end
-
-          describe file(load_file) do
-            it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
-          end
-
-          it 'should output status via passenger-memory-stats' do
-            shell("/usr/bin/passenger-memory-stats", :pty => true) do |r|
-              expect(r.stdout).to match(/Apache processes/)
-              expect(r.stdout).to match(/Nginx processes/)
-              expect(r.stdout).to match(/Passenger processes/)
-              expect(r.stdout).to match(/### Processes: [0-9]+/)
-              expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
-
-              expect(r.exit_code).to eq(0)
-            end
-          end
-
-          it 'should output status via passenger-status' do
-            shell("PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
-              # spacing may vary
-              r.stdout.should =~ /[\-]+ General information [\-]+/
-              r.stdout.should =~ /max[ ]+= [0-9]+/
-              r.stdout.should =~ /count[ ]+= [0-9]+/
-              r.stdout.should =~ /active[ ]+= [0-9]+/
-              r.stdout.should =~ /inactive[ ]+= [0-9]+/
-              r.stdout.should =~ /Waiting on global queue: [0-9]+/
-
-              r.exit_code.should == 0
-            end
-          end
-
-          it 'should answer to passenger.example.com' do
-            shell("/usr/bin/curl passenger.example.com:80") do |r|
-              r.stdout.should =~ /^hello <b>world<\/b>$/
-              r.exit_code.should == 0
-            end
-          end
-        end
-      end
-    end
   end
 end

From eb6f4a03a6ce397c2530f01187e101ad504573bf Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Thu, 12 Nov 2015 12:07:12 +0000
Subject: [PATCH 0742/2267] removing redhat passenger tests, for now

---
 spec/acceptance/vhost_spec.rb | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 77c019f128..36a0eb2acd 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1102,40 +1102,6 @@ class { 'apache': }
     end
   end
 
-  # Passenger isn't even in EPEL on el-5
-  if default['platform'] !~ /^el-5/
-    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-      pending('Since we don\'t have passenger on RHEL7 rack_base_uris tests will fail')
-    else
-      describe 'rack_base_uris' do
-        if fact('osfamily') == 'RedHat'
-          it 'adds epel' do
-            pp = "class { 'epel': }"
-            apply_manifest(pp, :catch_failures => true)
-          end
-        end
-
-        it 'applies cleanly' do
-          pp = <<-EOS
-            class { 'apache': }
-            host { 'test.server': ip => '127.0.0.1' }
-            apache::vhost { 'test.server':
-              docroot          => '/tmp',
-              rack_base_uris  => ['/test'],
-            }
-          EOS
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        describe file("#{$vhost_dir}/25-test.server.conf") do
-          it { is_expected.to be_file }
-          it { is_expected.to contain 'RackBaseURI /test' }
-        end
-      end
-    end
-  end
-
-
   describe 'request_headers' do
     it 'applies cleanly' do
       pp = <<-EOS

From 9ff42c171596baf8c1db71adc38ca388468df1c2 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Fri, 13 Nov 2015 15:00:59 +0000
Subject: [PATCH 0743/2267] updating the test to use ipv4 addresses

---
 spec/acceptance/vhost_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 36a0eb2acd..5fa91d5dc7 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -198,12 +198,12 @@ class { 'apache':
         }
         apache::vhost { 'example.com':
           port     => '80',
-          ip       => ['127.0.0.1','::1'],
+          ip       => ['127.0.0.1','127.0.0.2'],
           ip_based => true,
           docroot  => '/var/www/html',
         }
         host { 'ipv4.example.com': ip => '127.0.0.1', }
-        host { 'ipv6.example.com': ip => '::1', }
+        host { 'ipv6.example.com': ip => '127.0.0.2', }
         file { '/var/www/html/index.html':
           ensure  => file,
           content => "Hello from vhost\\n",
@@ -218,16 +218,16 @@ class { 'apache':
     end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
-      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 [::1]:80>' }
+      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.2:80>' }
       it { is_expected.to contain "ServerName example.com" }
     end
 
     describe file($ports_file) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Listen 127.0.0.1:80' }
-      it { is_expected.to contain 'Listen [::1]:80' }
+      it { is_expected.to contain 'Listen 127.0.0.2:80' }
       it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' }
-      it { is_expected.not_to contain 'NameVirtualHost [::1]:80' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:80' }
     end
 
     it 'should answer to ipv4.example.com' do

From 57d995d749c8f1c26bbe7dbce547363165254d4d Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Fri, 30 Oct 2015 17:53:02 +0000
Subject: [PATCH 0744/2267] 1.7.0 release prep

---
 CHANGELOG.md                                 | 48 ++++++++++++++++++++
 README.md                                    |  4 ++
 {tests => examples}/apache.pp                |  0
 {tests => examples}/dev.pp                   |  0
 {tests => examples}/init.pp                  |  0
 {tests => examples}/mod_load_params.pp       |  0
 {tests => examples}/mods.pp                  |  0
 {tests => examples}/mods_custom.pp           |  0
 {tests => examples}/php.pp                   |  0
 {tests => examples}/vhost.pp                 |  0
 {tests => examples}/vhost_directories.pp     |  0
 {tests => examples}/vhost_filter.pp          |  4 +-
 {tests => examples}/vhost_ip_based.pp        |  0
 {tests => examples}/vhost_proxypass.pp       |  0
 {tests => examples}/vhost_ssl.pp             |  0
 {tests => examples}/vhosts_without_listen.pp |  0
 metadata.json                                |  2 +-
 17 files changed, 55 insertions(+), 3 deletions(-)
 rename {tests => examples}/apache.pp (100%)
 rename {tests => examples}/dev.pp (100%)
 rename {tests => examples}/init.pp (100%)
 rename {tests => examples}/mod_load_params.pp (100%)
 rename {tests => examples}/mods.pp (100%)
 rename {tests => examples}/mods_custom.pp (100%)
 rename {tests => examples}/php.pp (100%)
 rename {tests => examples}/vhost.pp (100%)
 rename {tests => examples}/vhost_directories.pp (100%)
 rename {tests => examples}/vhost_filter.pp (90%)
 rename {tests => examples}/vhost_ip_based.pp (100%)
 rename {tests => examples}/vhost_proxypass.pp (100%)
 rename {tests => examples}/vhost_ssl.pp (100%)
 rename {tests => examples}/vhosts_without_listen.pp (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 985194bf54..fb33a13633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,51 @@
+## 2015-11-17 - Supported Release 1.7.0
+### Summary
+This release includes many new features and bugfixes. There are test, documentation and misc improvements.
+
+#### Features
+- allow groups with - like vhost-users 
+- ability to enable/disable the secruleengine through a parameter
+- add mod_auth_kerb parameters to vhost
+- client auth for reverse proxy
+- support for mod_auth_mellon
+- change SSLProtocol in apache::vhost to be space separated
+- RewriteLock support
+
+#### Bugfixes
+- fix apache::mod::cgid so it can be used with the event MPM 
+- load unixd before fcgid on all operating systems
+- fixes conditional in vhost aliases
+- corrects mod_cgid worker/event defaults
+- ProxyPassMatch parameters were ending up on a newline
+- catch that mod_authz_default has been removed in Apache 2.4
+- mod::ssl fails on SLES
+- fix typo of MPM_PREFORK for FreeBSD package install 
+- install all modules before adding custom configs
+- fix acceptance testing for SSLProtocol behaviour for real
+- fix ordering issue with conf_file and ports_file 
+
+#### Known Issues
+- mod_passenger is having issues installing on Redhat/Centos 6, This is due to package dependency issues.
+
+#### Improvements
+- added docs for forcetype directive
+- removes ruby 1.8.7 from the travisci test matrix
+- readme reorganisation, minor fixups
+- support the mod_proxy ProxyPassReverseCookiePath directive
+- the purge_vhost_configs parameter is actually called purge_vhost_dir
+- add ListenBacklog for mod worker
+- deflate application/json by default 
+- install mod_authn_alias as default mod in debian for apache < 2.4
+- optionally set LimitRequestFieldSize on an apache::vhost
+- add SecUploadDir parameter to support file uploads with mod_security
+- optionally set parameters for mod_ext_filter module
+- allow SetOutputFilter to be set on a directory
+- RC4 is deprecated
+- allow empty docroot
+- add option to configure the include pattern for the vhost_enable dir
+- allow multiple IP addresses per vhost
+- default document root update for Ubuntu 14.04 and Debian 8 
+
 ## 2015-07-28 - Supported Release 1.6.0
 ### Summary
 This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds.
diff --git a/README.md b/README.md
index 86c1d9c9b3..67a2f12301 100644
--- a/README.md
+++ b/README.md
@@ -3306,6 +3306,10 @@ The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside t
 
 The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested since repositories are missing compatible packages.
 
+### RHEL/CentOS 6
+
+The [`apache::mod::passenger`][] class is not installing as the the EL6 repository is missing compatible packages.
+
 ### RHEL/CentOS 7
 
 The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] define's [`rack_base_uris`][] parameter.
diff --git a/tests/apache.pp b/examples/apache.pp
similarity index 100%
rename from tests/apache.pp
rename to examples/apache.pp
diff --git a/tests/dev.pp b/examples/dev.pp
similarity index 100%
rename from tests/dev.pp
rename to examples/dev.pp
diff --git a/tests/init.pp b/examples/init.pp
similarity index 100%
rename from tests/init.pp
rename to examples/init.pp
diff --git a/tests/mod_load_params.pp b/examples/mod_load_params.pp
similarity index 100%
rename from tests/mod_load_params.pp
rename to examples/mod_load_params.pp
diff --git a/tests/mods.pp b/examples/mods.pp
similarity index 100%
rename from tests/mods.pp
rename to examples/mods.pp
diff --git a/tests/mods_custom.pp b/examples/mods_custom.pp
similarity index 100%
rename from tests/mods_custom.pp
rename to examples/mods_custom.pp
diff --git a/tests/php.pp b/examples/php.pp
similarity index 100%
rename from tests/php.pp
rename to examples/php.pp
diff --git a/tests/vhost.pp b/examples/vhost.pp
similarity index 100%
rename from tests/vhost.pp
rename to examples/vhost.pp
diff --git a/tests/vhost_directories.pp b/examples/vhost_directories.pp
similarity index 100%
rename from tests/vhost_directories.pp
rename to examples/vhost_directories.pp
diff --git a/tests/vhost_filter.pp b/examples/vhost_filter.pp
similarity index 90%
rename from tests/vhost_filter.pp
rename to examples/vhost_filter.pp
index ab339737f9..ca1a8bbe03 100644
--- a/tests/vhost_filter.pp
+++ b/examples/vhost_filter.pp
@@ -3,8 +3,8 @@
 
 # Example from README adapted.
 apache::vhost { 'readme.example.net':
-  docroot     => '/var/www/html',
-  filters             => [
+  docroot => '/var/www/html',
+  filters => [
     'FilterDeclare   COMPRESS',
     'FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/html',
     'FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/css',
diff --git a/tests/vhost_ip_based.pp b/examples/vhost_ip_based.pp
similarity index 100%
rename from tests/vhost_ip_based.pp
rename to examples/vhost_ip_based.pp
diff --git a/tests/vhost_proxypass.pp b/examples/vhost_proxypass.pp
similarity index 100%
rename from tests/vhost_proxypass.pp
rename to examples/vhost_proxypass.pp
diff --git a/tests/vhost_ssl.pp b/examples/vhost_ssl.pp
similarity index 100%
rename from tests/vhost_ssl.pp
rename to examples/vhost_ssl.pp
diff --git a/tests/vhosts_without_listen.pp b/examples/vhosts_without_listen.pp
similarity index 100%
rename from tests/vhosts_without_listen.pp
rename to examples/vhosts_without_listen.pp
diff --git a/metadata.json b/metadata.json
index a0e3fc2fac..f06e6d529c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From ea1202f270ff0452b89fbbd7d68d14b255ba8de6 Mon Sep 17 00:00:00 2001
From: Garrett Guillotte <gguillotte@users.noreply.github.com>
Date: Mon, 16 Nov 2015 17:32:48 -0800
Subject: [PATCH 0745/2267] (docs) Fix issues with the 1.7.0 readme.

Fixes several typos and links, and reorganizes the
`apache::mod::auth_mellon`, `mellon_enable`,
and `auth_kerb` sections, and document missing
default values.
---
 README.md | 850 ++++++++++++++++++++++++++----------------------------
 1 file changed, 410 insertions(+), 440 deletions(-)

diff --git a/README.md b/README.md
index 67a2f12301..279754a08f 100644
--- a/README.md
+++ b/README.md
@@ -144,8 +144,11 @@
 [`MinSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#minsparethreads
 [`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html
 [`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
+[`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html
 [`mod_authnz_external`]: https://code.google.com/p/mod-auth-external/
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
+[`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
+[`mod_cache_disk`]: https://httpd.apache.org/docs/current/mod/mod_cache_disk.html
 [`mod_expires`]: http://httpd.apache.org/docs/current/mod/mod_expires.html
 [`mod_ext_filter`]: http://httpd.apache.org/docs/current/mod/mod_ext_filter.html
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
@@ -1303,16 +1306,22 @@ Installs and manages [`mod_alias`][].
 - **Gentoo**: `/var/www/icons`
 - **Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
 
-####Class: `apache::mod::disk_cache`
+#### Class: `apache::mod::disk_cache`
 
-Installs and configures mod_disk_cache. The cache root is determined based on apache version and OS. It can be specified directly as well.
+Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4. The default cache root depends on the Apache version and operating system: 
 
-Specifying the cache root:
-```puppet
-  class {'::apache::mod::disk_cache':
-    cache_root => '/path/to/cache',
-  }
-```
+- **Debian**: `/var/cache/apache2/mod_cache_disk`
+- **FreeBSD**: `/var/cache/mod_cache_disk`
+- **Red Hat, Apache 2.4**: `/var/cache/httpd/proxy`
+- **Red Hat, Apache 2.2**: `/var/cache/mod_proxy`
+
+You can specify the cache root by passing a path as a string to the `cache_root` parameter.
+
+~~~ puppet
+class {'::apache::mod::disk_cache':
+  cache_root => '/path/to/cache',
+}
+~~~
 
 ##### Class: `apache::mod::event`
 
@@ -1354,29 +1363,29 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
 ##### Class: `apache::mod::auth_mellon`
 
-Installs and manages [`mod_auth_mellon`][]. It's parameters share names with the Apache module's directives.
+Installs and manages [`mod_auth_mellon`][]. Its parameters share names with the Apache module's directives.
 
-~~~puppet
-class{'apache::mod::auth_mellon':
-  mellon_cache_size => 101
+~~~ puppet
+class{ 'apache::mod::auth_mellon':
+  mellon_cache_size => 101,
 }
 ~~~
 
 **Parameters within `apache::mod::auth_mellon`**:
 
-- `mellon_cache_size`: Size in megabytes of mellon cache.
-- `mellon_cache_entry_size`: Maximum size for single session.
-- `mellon_lock_file`: Location of lock file.
-- `mellon_post_directory`: Full path where post requests are saved.
-- `mellon_post_ttl`: Time to keep post requests.
-- `mellon_post_size`: Maximum size of post requests.
-- `mellon_post_count`: Maxmum number of post requests.
+- `mellon_cache_entry_size`: Maximum size for a single session. Default: 'undef'.
+- `mellon_cache_size`: Size in megabytes of the mellon cache. Default: 100.
+- `mellon_lock_file`: Location of lock file. Default: '`/run/mod_auth_mellon/lock`'.
+- `mellon_post_directory`: Full path where post requests are saved. Default: '`/var/cache/apache2/mod_auth_mellon/`'
+- `mellon_post_ttl`: Time to keep post requests. Default: 'undef'.
+- `mellon_post_size`: Maximum size of post requests. Default: 'undef'.
+- `mellon_post_count`: Maximum number of post requests. Default: 'undef'.
 
 ##### Class: `apache::mod::deflate`
 
 Installs and configures [`mod_deflate`][].
 
-**Parameters within `apache::mod::deflate`:**
+**Parameters within `apache::mod::deflate`**:
 
 - `types`: An [array][] of [MIME types][MIME `content-type`] to be deflated. Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json' ].
 - `notes`: A [Hash][] where the key represents the type and the value represents the note name. Default: { 'Input'  => 'instream', 'Output' => 'outstream', 'Ratio'  => 'ratio' }
@@ -1396,7 +1405,7 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 Installs and configures [`mod_ext_filter`][].
 
 ~~~ puppet
-class{'apache::mod::ext_filter':
+class { 'apache::mod::ext_filter':
   ext_filter_define => {
     'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
     'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
@@ -1412,7 +1421,7 @@ class{'apache::mod::ext_filter':
 
 Installs and configures [`mod_fcgid`][].
 
-The class makes no effort to individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [Hash][]. For example:
+The class makes no effort to individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [hash][]. For example:
 
 ~~~ puppet
 class { 'apache::mod::fcgid':
@@ -1532,7 +1541,7 @@ Default values depend on your operating system.
 
 - `package_name`: Names the package that installs `php_mod`.
 - `path`: Defines the path to the `mod_php` shared object (`.so`) file.
-- `source`: Defines the path to the default configuration. Valid options include a `puppet:///` paths.
+- `source`: Defines the path to the default configuration. Valid options include a `puppet:///` path.
 - `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
 - `content`: Adds arbitrary content to `php.conf`.
 
@@ -2020,59 +2029,44 @@ Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys can be:
 Usage typically looks like:
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot => '/path/to/directory',
-      itk     => {
-        user  => 'someuser',
-        group => 'somegroup',
-      },
-    }
+apache::vhost { 'sample.example.net':
+  docroot => '/path/to/directory',
+  itk     => {
+    user  => 'someuser',
+    group => 'somegroup',
+  },
+}
 ~~~
 
 ##### `auth_kerb`
 
-Enable mod_auth_kerb parameters for a virtual host. Valid values are 'true' or 'false'. Defaults to 'false'.
+Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid values are 'true' or 'false'. Defaults to 'false'.
 
 Usage typically looks like:
 
 ~~~ puppet
-    apache::vhost {'sample.example.net':
-      auth_kerb              => true,
-      krb_method_negotiate   => 'on',
-      krb_auth_realms        => ['EXAMPLE.ORG'],
-      krb_local_user_mapping => 'on',
-      directories            => {
-        path         => '/var/www/html',
-        auth_name    => 'Kerberos Login',
-        auth_type    => 'Kerberos',
-        auth_require => 'valid-user',
-      }
-    }
+apache::vhost { 'sample.example.net':
+  auth_kerb              => true,
+  krb_method_negotiate   => 'on',
+  krb_auth_realms        => ['EXAMPLE.ORG'],
+  krb_local_user_mapping => 'on',
+  directories            => {
+    path         => '/var/www/html',
+    auth_name    => 'Kerberos Login',
+    auth_type    => 'Kerberos',
+    auth_require => 'valid-user',
+  },
+}
 ~~~
 
-##### `krb_method_negotiate`
-
-To enable or disable the use of the Negotiate method. Defaults is 'on'
-
-##### `krb_method_k5passwd`
-
-To enable or disable the use of password based authentication for Kerberos v5. Default is 'on'
-
-##### `krb_authoritative`
-
-If set to off this directive allow authentication controls to be pass on to another modules.  Default is 'on'
-
-##### `krb_auth_realms`
+Related parameters follow the names of `mod_auth_kerb` directives:
 
-Specifies an array Kerberos realm(s) to be used for authentication. Default is []
-
-##### `krb_5keytab`
-
-Location of the Kerberos V5 keytab file. Not set by default.
-
-##### `krb_local_user_mapping`
-
-Strips @REALM from username for further use. Not set by default.
+- `krb_method_negotiate`: Determines whether to use the Negotiate method. Default: 'on'.
+- `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'.
+- `krb_authoritative`: If set to 'off', authentication controls can be passed on to another module. Default: 'on'.
+- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: `[]`.
+- `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: undef.
+- `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: undef.
 
 ##### `krb_verify_kdc`
 
@@ -2283,11 +2277,11 @@ Specifies the address to redirect to. Defaults to 'undef'.
 Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent.
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_source => ['/images','/downloads'],
-      redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  redirect_source => ['/images','/downloads'],
+  redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+}
 ~~~
 
 ##### `redirect_status`
@@ -2295,10 +2289,10 @@ Specifies the source URIs that redirect to the destination specified in `redirec
 Specifies the status to append to the redirect. Defaults to 'undef'.
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_status => ['temp','permanent'],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  redirect_status => ['temp','permanent'],
+}
 ~~~
 
 ##### `redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
@@ -2306,12 +2300,12 @@ Specifies the status to append to the redirect. Defaults to 'undef'.
 Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Defaults to 'undef'.
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirectmatch_status => ['404','404'],
-      redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-      redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
+}
 ~~~
 
 ##### `request_headers`
@@ -2319,13 +2313,13 @@ Determines which server status should be raised for a given regular expression a
 Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Defaults to 'undef'.
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      request_headers => [
-        'append MirrorID "mirror 12"',
-        'unset MirrorID',
-      ],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  request_headers => [
+    'append MirrorID "mirror 12"',
+    'unset MirrorID',
+  ],
+}
 ~~~
 ##### `rewrites`
 
@@ -2334,69 +2328,69 @@ Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
+}
 ~~~
 
 The parameter allows rewrite conditions that, when true, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'redirect IE',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-      ],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'redirect IE',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
 ~~~
 
 You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-      ],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
 ~~~
 
 Multiple rewrites and conditions are also possible
 
 ~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-        {
-          comment      => 'Internet Explorer',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
-        },
-        {
-          rewrite_base => /apps/,
-          rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
-        },
-        { comment      => 'Rewrite to lower case',
-          rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
-          rewrite_map  => ['lc int:tolower'],
-          rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
-        },
-     ],
-    }
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+    {
+      comment      => 'Internet Explorer',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+    },
+    {
+      rewrite_base => /apps/,
+      rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
+    },
+    { comment      => 'Rewrite to lower case',
+      rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
+      rewrite_map  => ['lc int:tolower'],
+      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+    },
+  ],
+}
 ~~~
 
 Refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions.
@@ -2407,32 +2401,32 @@ Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for exa
 
 ##### `scriptaliases`
 
-*Note*: This parameter is deprecated in favour of the `aliases` parameter.
+**Note**: This parameter is deprecated in favor of the `aliases` parameter.
 
-Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
+Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html).
 
 ~~~ puppet
-    scriptaliases => [
-      {
-        alias => '/myscript',
-        path  => '/usr/share/myscript',
-      },
-      {
-        aliasmatch => '^/foo(.*)',
-        path       => '/usr/share/fooscripts$1',
-      },
-      {
-        aliasmatch => '^/bar/(.*)',
-        path       => '/usr/share/bar/wrapper.sh/$1',
-      },
-      {
-        alias => '/neatscript',
-        path  => '/usr/share/neatscript',
-      },
-    ]
+scriptaliases => [
+  {
+    alias => '/myscript',
+    path  => '/usr/share/myscript',
+  },
+  {
+    aliasmatch => '^/foo(.*)',
+    path       => '/usr/share/fooscripts$1',
+  },
+  {
+    aliasmatch => '^/bar/(.*)',
+    path       => '/usr/share/bar/wrapper.sh/$1',
+  },
+  {
+    alias => '/neatscript',
+    path  => '/usr/share/neatscript',
+  },
+]
 ~~~
 
-The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, more specific aliases should come before more general ones to avoid shadowing.
+The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases before more general ones to avoid shadowing.
 
 ##### `serveradmin`
 
@@ -2453,9 +2447,9 @@ Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
 Example:
 
 ~~~ puppet
-    apache::vhost { 'setenv.example.com':
-      setenv => ['SPECIAL_PATH /foo/bin'],
-    }
+apache::vhost { 'setenv.example.com':
+  setenv => ['SPECIAL_PATH /foo/bin'],
+}
 ~~~
 
 ##### `setenvif`
@@ -2475,16 +2469,16 @@ Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=
 To set up a virtual host with suPHP
 
 ~~~ puppet
-    apache::vhost { 'suphp.example.com':
-      port                => '80',
-      docroot             => '/home/appuser/myphpapp',
-      suphp_addhandler    => 'x-httpd-php',
-      suphp_engine        => 'on',
-      suphp_configpath    => '/etc/php5/apache2',
-      directories         => { path => '/home/appuser/myphpapp',
-        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
-      }
-    }
+apache::vhost { 'suphp.example.com':
+  port                => '80',
+  docroot             => '/home/appuser/myphpapp',
+  suphp_addhandler    => 'x-httpd-php',
+  suphp_engine        => 'on',
+  suphp_configpath    => '/etc/php5/apache2',
+  directories         => { path => '/home/appuser/myphpapp',
+    'suphp'           => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
 ~~~
 
 ##### `vhost_name`
@@ -2496,13 +2490,13 @@ Enables name-based virtual hosting. If no IP is passed to the virtual host, but
 Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'.
 
 ~~~ puppet
-    apache::vhost { 'subdomain.loc':
-      vhost_name       => '*',
-      port             => '80',
-      virtual_docroot' => '/var/www/%-2+',
-      docroot          => '/var/www',
-      serveraliases    => ['*.loc',],
-    }
+apache::vhost { 'subdomain.loc':
+  vhost_name       => '*',
+  port             => '80',
+  virtual_docroot' => '/var/www/%-2+',
+  docroot          => '/var/www',
+  serveraliases    => ['*.loc',],
+}
 ~~~
 
 ##### `wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
@@ -2524,22 +2518,22 @@ Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 To set up a virtual host with WSGI
 
 ~~~ puppet
-    apache::vhost { 'wsgi.example.com':
-      port                        => '80',
-      docroot                     => '/var/www/pythonapp',
-      wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options =>
-        { processes    => '2',
-          threads      => '15',
-          display-name => '%{GROUP}',
-         },
-      wsgi_process_group          => 'wsgi',
-      wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-      wsgi_chunked_request        => 'On',
-    }
+apache::vhost { 'wsgi.example.com':
+  port                        => '80',
+  docroot                     => '/var/www/pythonapp',
+  wsgi_daemon_process         => 'wsgi',
+  wsgi_daemon_process_options =>
+    { processes    => '2',
+      threads      => '15',
+      display-name => '%{GROUP}',
+     },
+  wsgi_process_group          => 'wsgi',
+  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+  wsgi_chunked_request        => 'On',
+}
 ~~~
 
-####Parameter `directories` for `apache::vhost`
+#### Parameter `directories` for `apache::vhost`
 
 The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
 
@@ -2550,15 +2544,15 @@ The `provider` key is optional. If missing, this key defaults to 'directory'. Va
 General `directories` usage looks something like
 
 ~~~ puppet
-    apache::vhost { 'files.example.net':
-      docroot     => '/var/www/files',
-      directories => [
-        { 'path'     => '/var/www/files',
-          'provider' => 'files',
-          'deny'     => 'from all'
-         },
-      ],
-    }
+apache::vhost { 'files.example.net':
+  docroot     => '/var/www/files',
+  directories => [
+    { 'path'     => '/var/www/files',
+      'provider' => 'files',
+      'deny'     => 'from all',
+     },
+  ],
+}
 ~~~
 
 *Note:* At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
@@ -2566,9 +2560,9 @@ General `directories` usage looks something like
 Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes.  This looks like
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', handler => value } ],
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [ { path => '/path/to/directory', handler => value } ],
 }
 ~~~
 
@@ -2579,14 +2573,14 @@ Any handlers you do not set in these hashes are considered 'undefined' within Pu
 Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path        => '/path/to/directory',
-          addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
+    },
+  ],
+}
 ~~~
 
 ###### `allow`
@@ -2594,14 +2588,14 @@ Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhand
 Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path  => '/path/to/directory',
-          allow => 'from example.org',
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      allow => 'from example.org',
+    },
+  ],
+}
 ~~~
 
 ###### `allow_override`
@@ -2609,14 +2603,14 @@ Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow)
 Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot      => '/path/to/directory',
-      directories  => [
-        { path           => '/path/to/directory',
-          allow_override => ['AuthConfig', 'Indexes'],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot      => '/path/to/directory',
+  directories  => [
+    { path           => '/path/to/directory',
+      allow_override => ['AuthConfig', 'Indexes'],
+    },
+  ],
+}
 ~~~
 
 ###### `auth_basic_authoritative`
@@ -2722,33 +2716,33 @@ Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) dir
 An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      directories => [
-        { path            => '/srv/www',
-          error_documents => [
-            { 'error_code' => '503',
-              'document'   => '/service-unavail',
-            },
-          ],
+apache::vhost { 'sample.example.net':
+  directories => [
+    { path            => '/srv/www',
+      error_documents => [
+        { 'error_code' => '503',
+          'document'   => '/service-unavail',
         },
       ],
-    }
+    },
+  ],
+}
 ~~~
 
 ###### `ext_filter_options`
 
-Sets the [ExtFilterOptions](http://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
-Note that you must delcare `class {'apache::mod::ext_filter': }` before using this directive.
+Sets the [ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
+Note that you must declare `class { 'apache::mod::ext_filter': }` before using this directive.
 
 ~~~ puppet
-    apache::vhost{ 'filter.example.org':
-      docroot => '/var/www/filter',
-      directories => [
-        { path               => '/var/www/filter',
-          ext_filter_options => 'LogStderr Onfail=abort',
-        },
-      ],
-    }
+apache::vhost { 'filter.example.org':
+  docroot     => '/var/www/filter',
+  directories => [
+    { path               => '/var/www/filter',
+      ext_filter_options => 'LogStderr Onfail=abort',
+    },
+  ],
+}
 ~~~
 
 ###### `geoip_enable`
@@ -2757,14 +2751,14 @@ Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configura
 Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
 
 ~~~ puppet
-    apache::vhost { 'first.example.com':
-      docroot     => '/var/www/first',
-      directories => [
-        { path         => '/var/www/first',
-          geoip_enable => true,
-        },
-      ],
-    }
+apache::vhost { 'first.example.com':
+  docroot     => '/var/www/first',
+  directories => [
+    { path         => '/var/www/first',
+      geoip_enable => true,
+    },
+  ],
+}
 ~~~
 
 ###### `headers`
@@ -2772,13 +2766,13 @@ Note that you must declare `class {'apache::mod::geoip': }` before using this di
 Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => {
-        path    => '/path/to/directory',
-        headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-      },
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => {
+    path    => '/path/to/directory',
+    headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+  },
+}
 ~~~
 
 ###### `index_options`
@@ -2786,58 +2780,58 @@ Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.htm
 Allows configuration settings for [directory indexing](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path           => '/path/to/directory',
-          directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work
-          options        => ['Indexes','FollowSymLinks','MultiViews'],
-          index_options  => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path           => '/path/to/directory',
+      directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work
+      options        => ['Indexes','FollowSymLinks','MultiViews'],
+      index_options  => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
+    },
+  ],
+}
 ~~~
 
 ###### `index_order_default`
 
-Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
+Sets the [default ordering](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path                => '/path/to/directory',
-          order               => 'Allow,Deny',
-          index_order_default => ['Descending', 'Date'],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path                => '/path/to/directory',
+      order               => 'Allow,Deny',
+      index_order_default => ['Descending', 'Date'],
+    },
+  ],
+}
 ~~~
 
 ###### `index_style_sheet`
 
-Sets the [IndexStyleSheet](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet) which adds a CSS stylesheet to the directory index.
+Sets the [IndexStyleSheet](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet), which adds a CSS stylesheet to the directory index.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path              => '/path/to/directory',
-          options           => ['Indexes','FollowSymLinks','MultiViews'],
-          index_options     => ['FancyIndexing'],
-          index_style_sheet => '/styles/style.css',
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      options           => ['Indexes','FollowSymLinks','MultiViews'],
+      index_options     => ['FancyIndexing'],
+      index_style_sheet => '/styles/style.css',
+    },
+  ],
+}
 ~~~
 
 ###### `mellon_enable`
 
-Sets the [MellonEnable](https://github.com/UNINETT/mod_auth_mellon) to enable auth_melon on a location.
+Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_melon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.
 
 ~~~ puppet
-apache::vhost{'sample.example.net':
-  docroot => '/path/to/directory',
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
   directories => [
     { path                       => '/',
       provider                   => 'directory',
@@ -2845,69 +2839,45 @@ apache::vhost{'sample.example.net':
       mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key,
       mellon_endpoint_path       => '/mellon',
       mellon_set_env_no_prefix   => { 'ADFS_GROUP' => 'http://schemas.xmlsoap.org/claims/Group',
-                                      'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress'},
-      mellon_user => 'ADFS_LOGIN'
+                                      'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress', },
+      mellon_user => 'ADFS_LOGIN',
     },
-    { path => '/protected',
-      provider => 'location',
+    { path          => '/protected',
+      provider      => 'location',
       mellon_enable => 'auth',
-      auth_type => 'Mellon',
-      auth_require => 'valid-user',
-      mellon_cond => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]']
-    }
+      auth_type     => 'Mellon',
+      auth_require  => 'valid-user',
+      mellon_cond   => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]'],
+    },
   ]
 }
 ~~~
 
-###### `mellon_cond`
+Related parameters follow the names of `mod_auth_melon` directives:
 
-Sets the [MellonCond](https://github.com/UNINETT/mod_auth_mellon) is an array of mellon conditions that must
-be met to grant access.
-
-
-###### `mellon_endpoint_path`
-
-Sets the [MellonEndpointPath](https://github.com/UNINETT/mod_auth_mellon) to set melon endpoint path.
-
-###### `mellon_idp_metadata_file`
-
-Sets the [MellonIDPMetadataFile](https://github.com/UNINETT/mod_auth_mellon) location of idp metadata file.
-
-###### `mellon_saml_rsponse_dump`
-
-Sets the [MellonSamlRepsponseDump](https://github.com/UNINETT/mod_auth_mellon) to enable debug of SAML.
-
-###### `mellon_set_env_no_prefix`
-
-Sets the [MellonSetEnvNoPrefix](https://github.com/UNINETT/mod_auth_mellon) is a hash of attribute names to map
+- `mellon_cond`: Takes an array of mellon conditions that must be met to grant access, and creates a [MellonCond][`mod_auth_melon`] directive for each item in the array.
+- `mellon_endpoint_path`: Sets the [MellonEndpointPath][`mod_auth_melon`] to set the mellon endpoint path.
+- `mellon_idp_metadata_file`: Sets the [MellonIDPMetadataFile][`mod_auth_melon`] location of the IDP metadata file.
+- `mellon_saml_rsponse_dump`: Sets the [MellonSamlResponseDump][`mod_auth_melon`] directive to enable debug of SAML.
+- `mellon_set_env_no_prefix`: Sets the [MellonSetEnvNoPrefix][`mod_auth_melon`] directive to a hash of attribute names to map
 to environment variables.
-
-
-###### `mellon_sp_private_key_file`
-
-Sets the [MellonSPPrivateKeyFile](https://github.com/UNINETT/mod_auth_mellon) private key location of service provider.
-
-###### `mellon_sp_cert_file`
-
-Sets the [MellonSPCertFile](https://github.com/UNINETT/mod_auth_mellon) public key location of service provider.
-
-###### `mellon_user`
-
-Sets the [MellonUser](https://github.com/UNINETT/mod_auth_mellon) attribute we should use for the username.
+- `mellon_sp_private_key_file`: Sets the [MellonSPPrivateKeyFile][`mod_auth_melon`] directive for the private key location of the service provider.
+- `mellon_sp_cert_file`: Sets the [MellonSPCertFile][`mod_auth_melon`] directive for the public key location of the service provider.
+- `mellon_user`: Sets the [MellonUser][`mod_auth_melon`] attribute to use for the username.
 
 ###### `options`
 
-Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
+Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path    => '/path/to/directory',
-          options => ['Indexes','FollowSymLinks','MultiViews'],
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      options => ['Indexes','FollowSymLinks','MultiViews'],
+    },
+  ],
+}
 ~~~
 
 ###### `order`
@@ -2915,32 +2885,32 @@ Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options)
 Sets the order of processing Allow and Deny statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path  => '/path/to/directory',
-          order => 'Allow,Deny',
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      order => 'Allow,Deny',
+    },
+  ],
+}
 ~~~
 
 ###### `passenger_enabled`
 
-Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
+Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directive to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path              => '/path/to/directory',
-          passenger_enabled => 'on',
-        },
-      ],
-    }
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      passenger_enabled => 'on',
+    },
+  ],
+}
 ~~~
 
-*Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
+**Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
 ###### `php_value` and `php_flag`
 
@@ -2982,47 +2952,47 @@ If `require` is set to `unmanaged` it will not be set at all. This is useful for
 
 ###### `satisfy`
 
-Sets a `Satisfy` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
+Sets a `Satisfy` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path    => '/path/to/directory',
-          satisfy => 'Any',
-        }
-      ],
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      satisfy => 'Any',
     }
+  ],
+}
 ~~~
 
 ###### `sethandler`
 
-Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
+Sets a `SetHandler` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler).
 
 ~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path       => '/path/to/directory',
-          sethandler => 'None',
-        }
-      ],
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path       => '/path/to/directory',
+      sethandler => 'None',
     }
+  ],
+}
 ~~~
 
 ###### `set_output_filter`
 
-Sets a `SetOutputFilter` directive as per [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter). An example:
+Sets a `SetOutputFilter` directive per the [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
 
 ~~~ puppet
-    apache::vhost{ 'filter.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path              => '/path/to/directory',
-          set_output_filter => puppetdb-strip-resource-params,
-        },
-      ],
-    }
+apache::vhost{ 'filter.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      set_output_filter => puppetdb-strip-resource-params,
+    },
+  ],
+}
 ~~~
 
 ###### `rewrites`
@@ -3030,64 +3000,64 @@ Sets a `SetOutputFilter` directive as per [Apache Core documentation](http://htt
 Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
 
 ~~~ puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path        => '/path/to/directory',
-          rewrites => [ { comment      => 'Permalink Rewrites',
-                          rewrite_base => '/'
-                        },
-                        { rewrite_rule => [ '^index\.php$ - [L]' ]
-                        },
-                        { rewrite_cond => [ '%{REQUEST_FILENAME} !-f',
-                                            '%{REQUEST_FILENAME} !-d',
-                                          ],
-                          rewrite_rule => [ '. /index.php [L]' ],
-                        }
-                      ],
-        },
-      ],
-    }
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      rewrites => [ { comment      => 'Permalink Rewrites',
+                      rewrite_base => '/'
+                    },
+                    { rewrite_rule => [ '^index\.php$ - [L]' ]
+                    },
+                    { rewrite_cond => [ '%{REQUEST_FILENAME} !-f',
+                                        '%{REQUEST_FILENAME} !-d',
+                                      ],
+                      rewrite_rule => [ '. /index.php [L]' ],
+                    }
+                  ],
+    },
+  ],
+}
 ~~~
 
-***Note*** If you include rewrites in your directories make sure you are also including `apache::mod::rewrite`. You may also want to consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
+***Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
 
 ###### `shib_request_setting`
 
-Allows an valid content setting to be set or altered for the application request. This command takes two parameters, the name of the content setting, and the value to set it to.Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
+Allows a valid content setting to be set or altered for the application request. This command takes two parameters: the name of the content setting, and the value to set it to. Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
 ~~~ puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path                  => '/path/to/directory',
-          shib_request_settings => { 'requiresession' => 'On' },
-          shib_use_headers      => 'On',
-        },
-      ],
-    }
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path                  => '/path/to/directory',
+      shib_request_settings => { 'requiresession' => 'On' },
+      shib_use_headers      => 'On',
+    },
+  ],
+}
 ~~~
 
 ###### `shib_use_headers`
 
-When set to 'On' this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
+When set to 'On', this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
 ###### `ssl_options`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
 
 ~~~ puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path        => '/path/to/directory',
-          ssl_options => '+ExportCertData',
-        },
-        { path        => '/path/to/different/dir',
-          ssl_options => [ '-StdEnvVars', '+ExportCertData'],
-        },
-      ],
-    }
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      ssl_options => '+ExportCertData',
+    },
+    { path        => '/path/to/different/dir',
+      ssl_options => [ '-StdEnvVars', '+ExportCertData'],
+    },
+  ],
+}
 ~~~
 
 ###### `suphp`
@@ -3095,20 +3065,20 @@ String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl
 A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and can only be passed within `directories`.
 
 ~~~ puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path  => '/path/to/directory',
-          suphp =>
-            { user  =>  'myappuser',
-              group => 'myappgroup',
-            },
-        },
-      ],
-    }
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      suphp => {
+        user  => 'myappuser',
+        group => 'myappgroup',
+      },
+    },
+  ],
+}
 ~~~
 
-####SSL parameters for `apache::vhost`
+#### SSL parameters for `apache::vhost`
 
 All of the SSL parameters for `::vhost` default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
 

From 064aeb64eef4a7219b157fbe8f65ab4420616115 Mon Sep 17 00:00:00 2001
From: Luke Bigum <Luke.Bigum@lmax.com>
Date: Fri, 13 Nov 2015 14:40:13 +0000
Subject: [PATCH 0746/2267] Added support for LDAPTrustedGlobalCert option to
 apache::mod::ldap

fixed misnamed heading

documentation for apache::mod::ldap

fixed hyperlinks

fixed hyperlinks
---
 README.md                     | 21 +++++++++-
 manifests/mod/ldap.pp         |  7 +++-
 spec/classes/mod/ldap_spec.rb | 78 +++++++++++++++++++++++++++++++++++
 templates/mod/ldap.conf.erb   |  3 ++
 4 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 spec/classes/mod/ldap_spec.rb

diff --git a/README.md b/README.md
index 32ac2cbea2..5847fc1221 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@
 [`apache::mod::ext_filter`]: #class-apachemodext_filter
 [`apache::mod::geoip`]: #class-apachemodgeoip
 [`apache::mod::itk`]: #class-apachemoditk
+[`apache::mod::ldap`]: #class-apachemodldap
 [`apache::mod::passenger`]: #class-apachemodpassenger
 [`apache::mod::peruser`]: #class-apachemodperuser
 [`apache::mod::prefork`]: #class-apachemodprefork
@@ -151,6 +152,7 @@
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
 [`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/
 [`mod_info`]: https://httpd.apache.org/docs/current/mod/mod_info.html
+[`mod_ldap`]: https://httpd.apache.org/docs/2.2/mod/mod_ldap.html
 [`mod_mpm_event`]: https://httpd.apache.org/docs/current/mod/event.html
 [`mod_negotiation`]: http://httpd.apache.org/docs/current/mod/mod_negotiation.html
 [`mod_pagespeed`]: https://developers.google.com/speed/pagespeed/module/?hl=en
@@ -1467,6 +1469,23 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 - `apache_version`: Default: `$::apache::apache_version`,
 - `restrict_access`: Determines whether to enable access restrictions. If 'false', the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: 'true'.
 
+##### Class: `apache::mod::ldap`
+
+Installs and configures [`mod_ldap`][]. Allows you to modify the
+[`LDAPTrustedGlobalCert`](https://httpd.apache.org/docs/2.2/mod/mod_ldap.html#ldaptrustedglobalcert) Directive:
+
+~~~puppet
+class { 'apache::mod::ldap':
+  ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt'
+  ldap_trusted_global_cert_type => 'CA_DER',
+}
+~~~
+
+**Parameters within `apache::mod::ldap`:**
+
+- `ldap_trusted_global_cert_file`: Path and file name of the trusted CA certificates to use when establishing SSL or TLS connections to an LDAP server.
+- `ldap_trusted_global_cert_type`: The global trust certificate format. Defaults to 'CA_BASE64'.
+
 ##### Class: `apache::mod::negotiation`
 
 Installs and configures [`mod_negotiation`][].
@@ -1482,7 +1501,7 @@ Installs and manages [`mod_pagespeed`], a Google module that rewrites web pages
 
 While this Apache module requires the `mod-pagespeed-stable` package, Puppet **doesn't** manage the software repositories required to automatically install the package. If you declare this class when the package is either not installed or not available to your package manager, your Puppet run will fail.
 
-**Parameters within `apache::mod::info`**:
+**Parameters within `apache::mod::pagespeed`**:
 
 - `inherit_vhost_config`: Default: 'on'.
 - `filter_xhtml`: Default: false.
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index fbd56d539a..d084186717 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -1,6 +1,11 @@
 class apache::mod::ldap (
-  $apache_version = $::apache::apache_version,
+  $apache_version                = $::apache::apache_version,
+  $ldap_trusted_global_cert_file = undef,
+  $ldap_trusted_global_cert_type = 'CA_BASE64',
 ){
+  if ($ldap_trusted_global_cert_file) {
+    validate_string($ldap_trusted_global_cert_type)
+  }
   ::apache::mod { 'ldap': }
   # Template uses $apache_version
   file { 'ldap.conf':
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
new file mode 100644
index 0000000000..2b82d8d1bb
--- /dev/null
+++ b/spec/classes/mod/ldap_spec.rb
@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe 'apache::mod::ldap', :type => :class do
+  let :pre_condition do
+    'include apache'
+  end
+
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :lsbdistcodename        => 'squeeze',
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :operatingsystem        => 'Debian',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_class("apache::mod::ldap") }
+    it { is_expected.to contain_apache__mod('ldap') }
+
+    context 'default ldap_trusted_global_cert_file' do
+      it { is_expected.to contain_file('ldap.conf').without_content(/^LDAPTrustedGlobalCert/) }
+    end
+
+    context 'ldap_trusted_global_cert_file param' do
+      let(:params) { { :ldap_trusted_global_cert_file => 'ca.pem' } }
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
+    end
+
+    context 'ldap_trusted_global_cert_file and ldap_trusted_global_cert_type params' do
+      let(:params) {{
+        :ldap_trusted_global_cert_file => 'ca.pem',
+        :ldap_trusted_global_cert_type => 'CA_DER'
+      }}
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
+    end
+  end #Debian
+
+  context "on a RedHat OS" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :operatingsystem        => 'RedHat',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_class("apache::mod::ldap") }
+    it { is_expected.to contain_apache__mod('ldap') }
+
+    context 'default ldap_trusted_global_cert_file' do
+      it { is_expected.to contain_file('ldap.conf').without_content(/^LDAPTrustedGlobalCert/) }
+    end
+
+    context 'ldap_trusted_global_cert_file param' do
+      let(:params) { { :ldap_trusted_global_cert_file => 'ca.pem' } }
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
+    end
+
+    context 'ldap_trusted_global_cert_file and ldap_trusted_global_cert_type params' do
+      let(:params) {{
+        :ldap_trusted_global_cert_file => 'ca.pem',
+        :ldap_trusted_global_cert_type => 'CA_DER'
+      }}
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
+    end
+  end # Redhat
+end
diff --git a/templates/mod/ldap.conf.erb b/templates/mod/ldap.conf.erb
index 0019776175..fbb4b92136 100644
--- a/templates/mod/ldap.conf.erb
+++ b/templates/mod/ldap.conf.erb
@@ -9,3 +9,6 @@
     Satisfy all
     <%- end -%>
 </Location>
+<% if @ldap_trusted_global_cert_file -%>
+LDAPTrustedGlobalCert <%= @ldap_trusted_global_cert_type %> <%= @ldap_trusted_global_cert_file %>
+<% end -%>

From eb3f397aba7d85e7ace09c6e8ed94b5228b25cf7 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Mon, 23 Nov 2015 11:56:39 +0000
Subject: [PATCH 0747/2267] 1.7.1 release

---
 CHANGELOG.md  | 5 +++++
 metadata.json | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb33a13633..50ad0db538 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Supported Release 1.7.1
+###Summary
+
+Small release for support of newer Puppet versions.
+
 ## 2015-11-17 - Supported Release 1.7.0
 ### Summary
 This release includes many new features and bugfixes. There are test, documentation and misc improvements.
diff --git a/metadata.json b/metadata.json
index f06e6d529c..85e6889497 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -68,7 +68,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.7.0 < 2015.3.0"
+      "version_requirement": ">= 3.7.0 < 2015.4.0"
     },
     {
       "name": "puppet",

From 9c2aa42c778041d003193b5a1c030a639f378d91 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Tue, 24 Nov 2015 15:19:37 +0000
Subject: [PATCH 0748/2267] Improved changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50ad0db538..737aa4553b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## Supported Release 1.7.1
 ###Summary
 
-Small release for support of newer Puppet versions.
+Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
 
 ## 2015-11-17 - Supported Release 1.7.0
 ### Summary

From d51a86aee8fa9de9cab35aa8d213d69ba17b4407 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Thu, 26 Nov 2015 17:29:53 +0000
Subject: [PATCH 0749/2267] (MODULES-2703) Allow mod pagespeed to take an array
 of lines as additional_configuration

---
 README.md                          |  2 +-
 spec/classes/mod/pagespeed_spec.rb | 11 ++++++++++-
 templates/mod/pagespeed.conf.erb   |  4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 293a6c02ba..8172c25b17 100644
--- a/README.md
+++ b/README.md
@@ -1544,7 +1544,7 @@ While this Apache module requires the `mod-pagespeed-stable` package, Puppet **d
 - `allow_pagespeed_console`: Default: [].
 - `allow_pagespeed_message`: Default: [].
 - `message_buffer_size`: Default: 100000.
-- `additional_configuration`: Default: { }.
+- `additional_configuration`: Default: { }. A hash of directive/value pairs or an array of lines to insert at the end of the pagespeed configuration.
 
 The class's parameters correspond to the module's directives. See the [module's documentation][`mod_pagespeed`] for details.
 
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index c3f5a41447..44c60053e0 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -21,7 +21,16 @@
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.to contain_apache__mod('pagespeed') }
     it { is_expected.to contain_package("mod-pagespeed-stable") }
-    it { is_expected.to contain_file('pagespeed.conf') }
+
+    context "when setting additional_configuration to a Hash" do
+      let :params do { :additional_configuration => { 'Key' => 'Value' } } end
+      it { is_expected.to contain_file('pagespeed.conf').with_content /Key Value/ }
+    end
+
+    context "when setting additional_configuration to an Array" do
+      let :params do { :additional_configuration => [ 'Key Value' ] } end
+      it { is_expected.to contain_file('pagespeed.conf').with_content /Key Value/ }
+    end
   end
 
   context "on a RedHat OS" do
diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
index a1b6f117a4..1f54c12f81 100644
--- a/templates/mod/pagespeed.conf.erb
+++ b/templates/mod/pagespeed.conf.erb
@@ -93,6 +93,10 @@ ModPagespeedMessageBufferSize <%= @message_buffer_size %>
     SetHandler mod_pagespeed_message
 </Location>
 
+<% if @additional_configuration.is_a? Array -%>
+<%= @additional_configuration.join('\n') %>
+<% else -%>
 <% @additional_configuration.each_pair do |key, value| -%>
 <%= key %> <%= value %>
 <% end -%>
+<% end -%>

From 50b8ffe05c99057815a08d26c43dccec0dff9526 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Thu, 26 Nov 2015 17:30:04 +0000
Subject: [PATCH 0750/2267] (MAINT) whitespace cleanup

---
 README.md                        | 2 +-
 templates/mod/pagespeed.conf.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8172c25b17..ceaa975e92 100644
--- a/README.md
+++ b/README.md
@@ -1310,7 +1310,7 @@ Installs and manages [`mod_alias`][].
 
 #### Class: `apache::mod::disk_cache`
 
-Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4. The default cache root depends on the Apache version and operating system: 
+Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4. The default cache root depends on the Apache version and operating system:
 
 - **Debian**: `/var/cache/apache2/mod_cache_disk`
 - **FreeBSD**: `/var/cache/mod_cache_disk`
diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
index 1f54c12f81..051cf5bedb 100644
--- a/templates/mod/pagespeed.conf.erb
+++ b/templates/mod/pagespeed.conf.erb
@@ -7,7 +7,7 @@ AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER application/xhtml+xml
 <% end -%>
 ModPagespeedFileCachePath "<%= @cache_path %>"
 ModPagespeedLogDir "<%= @log_dir %>"
-    
+
 <% @memcache_servers.each do |server| -%>
 ModPagespeedMemcachedServers <%= server %>
 <% end -%>
@@ -17,7 +17,7 @@ ModPagespeedRewriteLevel <%= @rewrite_level -%>
 <% @disable_filters.each do |filter| -%>
 ModPagespeedDisableFilters <%= filter %>
 <% end -%>
-    
+
 <% @enable_filters.each do |filter| -%>
 ModPagespeedEnableFilters <%= filter %>
 <% end -%>

From ddb6e4f81dd573a282e95028d2e220d564cc6ecd Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Thu, 26 Nov 2015 17:59:09 +0000
Subject: [PATCH 0751/2267] (MODULES-2682) Update Apache Configuration to use
 FilesMatch instead of AddHandler for PHP Files.

The issue with this is that the extension handling behaviour of apache is
not well known by most php developers, and many php scripts are open to
security issues if this configuration is used (most commonly these scripts
handle upload forms which white list image extensions). For example
foo.php.jpg will be handled by php.

Many distro's no longer use AddHandler in their default config:
  http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/php5/vivid/view/head:/debian/php5.conf.

The PHP manual also recommends avoiding it:
  http://php.net/manual/en/install.unix.apache2.php#example-20

This is based on Alejandro Bednarik's <alejandro.bednarik@gmail.com> original
fix, I added proper regex escaping, and a changelog entry. All bugs are mine.
---
 CHANGELOG.md                 | 11 +++++++++++
 spec/classes/mod/php_spec.rb |  2 +-
 templates/mod/php5.conf.erb  |  5 +++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb33a13633..2f7a39786a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## UNRELEASED
+### Summary
+
+TODO
+
+###
+
+#### Security
+
+* apache::mod::php now uses FilesMatch to configure the php handler. This is following the recommended upstream configuration guidelines (http://php.net/manual/en/install.unix.apache2.php#example-20) and distribution's default config (e.g.: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/php5/vivid/view/head:/debian/php5.conf). It avoids inadvertently exposing the PHP handler to executing uploads with names like 'file.php.jpg', but might impact setups with unusual requirements.
+
 ## 2015-11-17 - Supported Release 1.7.0
 ### Summary
 This release includes many new features and bugfixes. There are test, documentation and misc improvements.
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 246b3bbd49..6814b8a8f1 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -88,7 +88,7 @@
       let :params do
         { :extensions => ['.php','.php5']}
       end
-      it { is_expected.to contain_file("php5.conf").with_content(/AddHandler php5-script .php .php5\n/) }
+      it { is_expected.to contain_file("php5.conf").with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) }
     end
     context "with specific version" do
       let :pre_condition do
diff --git a/templates/mod/php5.conf.erb b/templates/mod/php5.conf.erb
index 44df2ae066..3fd1000390 100644
--- a/templates/mod/php5.conf.erb
+++ b/templates/mod/php5.conf.erb
@@ -14,8 +14,9 @@
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
-AddHandler php5-script <%= @extensions.flatten.compact.join(' ') %>
-AddType text/html .php
+<FilesMatch ".+(<%= @extensions.flatten.compact.collect { |s| Regexp.escape(s) }.join('|') %>)$">
+    SetHandler php5-script
+</FilesMatch>
 
 #
 # Add index.php to the list of files that will be served as directory

From 4f5a6b4c17f0dc0d6536b112dd887725fa53e86f Mon Sep 17 00:00:00 2001
From: abednarik <alejandro.bednarik@gmail.com>
Date: Wed, 4 Nov 2015 12:56:16 -0300
Subject: [PATCH 0752/2267] (MODULES-2773) Duplicate Entries in Spec Files

Small update to fix 2 warnings due to some duplicate entries.
---
 spec/classes/dev_spec.rb           | 1 -
 spec/classes/mod/passenger_spec.rb | 1 -
 2 files changed, 2 deletions(-)

diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index eb3d76593a..933d677031 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -77,7 +77,6 @@
         :osfamily               => 'Gentoo',
         :operatingsystem        => 'Gentoo',
         :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
         :is_pe                  => false,
         :concat_basedir         => '/foo',
         :id                     => 'root',
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index c438241e06..34dcc5c6f3 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -14,7 +14,6 @@
         :lsbdistcodename        => 'squeeze',
         :operatingsystem        => 'Debian',
         :id                     => 'root',
-        :kernel                 => 'Linux',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :is_pe                  => false,
       }

From 574b74f3cf1320b8a485c40f20f0edd70d758c43 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Mon, 30 Nov 2015 14:54:40 +0000
Subject: [PATCH 0753/2267] (MODULES-2682, FM-3919) Use more FilesMatch

FilesMatch and AddHandler do not interact correctly, which caused the fcgi
tests to (correctly) complain about php-cgi not being started for the fcgi
configuration.

Using FilesMatch in all cases addresses both the original security issue
(better) and leads to correct resolution of handlers again.
---
 templates/mod/fastcgi.conf.erb   | 4 +++-
 templates/vhost/_directories.erb | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/mod/fastcgi.conf.erb b/templates/mod/fastcgi.conf.erb
index 8d94a23614..93c8d86ab0 100644
--- a/templates/mod/fastcgi.conf.erb
+++ b/templates/mod/fastcgi.conf.erb
@@ -1,6 +1,8 @@
 # The Fastcgi Apache module configuration file is being
 # managed by Puppet and changes will be overwritten.
 <IfModule mod_fastcgi.c>
-  AddHandler fastcgi-script .fcgi
+  <FilesMatch ".+(\.fcgi)$">
+    SetHandler fastcgi-script
+  </FilesMatch>
   FastCgiIpcDir "<%= @fastcgi_lib_path %>"
 </IfModule>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index b1475513c9..c95fda5a15 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -106,7 +106,9 @@
     <%- end -%>
     <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>
       <%- [directory['addhandlers']].flatten.compact.each do |addhandler| -%>
-    AddHandler <%= addhandler['handler'] %> <%= Array(addhandler['extensions']).join(' ') %>
+    <FilesMatch ".+(<%= Array(addhandler['extensions']).collect { |s| Regexp.escape(s) }.join('|') %>)$">
+        SetHandler <%= addhandler['handler'] %>
+    </FilesMatch>
       <%- end -%>
     <%- end -%>
     <%- if directory['sethandler'] and directory['sethandler'] != '' -%>

From 7465f0f12cc55cbf1a793064651a5fbd316c0659 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 1 Dec 2015 13:46:40 +0000
Subject: [PATCH 0754/2267] (MAINT) remove merge conflicts from mergeback

---
 README.md | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/README.md b/README.md
index 84cd2f36ab..ceaa975e92 100644
--- a/README.md
+++ b/README.md
@@ -1310,11 +1310,7 @@ Installs and manages [`mod_alias`][].
 
 #### Class: `apache::mod::disk_cache`
 
-<<<<<<< HEAD
 Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4. The default cache root depends on the Apache version and operating system:
-=======
-Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4. The default cache root depends on the Apache version and operating system: 
->>>>>>> upstream/1.7.x
 
 - **Debian**: `/var/cache/apache2/mod_cache_disk`
 - **FreeBSD**: `/var/cache/mod_cache_disk`
@@ -2087,7 +2083,6 @@ apache::vhost { 'sample.example.net':
 ~~~
 
 Related parameters follow the names of `mod_auth_kerb` directives:
-<<<<<<< HEAD
 
 - `krb_method_negotiate`: Determines whether to use the Negotiate method. Default: 'on'.
 - `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'.
@@ -2107,15 +2102,6 @@ Specifies the service name that will be used by Apache for authentication. Corre
 ##### `krb_save_credentials`
 
 This option enables credential saving functionality. Default is 'off'
-=======
-
-- `krb_method_negotiate`: Determines whether to use the Negotiate method. Default: 'on'.
-- `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'.
-- `krb_authoritative`: If set to 'off', authentication controls can be passed on to another module. Default: 'on'.
-- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: `[]`.
-- `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: undef.
-- `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: undef.
->>>>>>> upstream/1.7.x
 
 ##### `limit_request_field_size`
 
@@ -2960,7 +2946,6 @@ apache::vhost { 'sample.example.net':
 
 ###### `require`
 
-<<<<<<< HEAD
 
 Sets a `Require` directive as per the [Apache Authz documentation](http://httpd.apache.org/docs/current/mod/mod_authz_core.html#require). If no `require` is set, it will default to `Require all granted`.
 
@@ -2972,22 +2957,9 @@ Sets a `Require` directive as per the [Apache Authz documentation](http://httpd.
           require => 'IP 10.17.42.23',
         }
       ],
-=======
-Sets a `Satisfy` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
-
-~~~ puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path    => '/path/to/directory',
-      satisfy => 'Any',
->>>>>>> upstream/1.7.x
     }
-  ],
-}
 ~~~
 
-<<<<<<< HEAD
 If `require` is set to `unmanaged` it will not be set at all. This is useful for complex authentication/authorization requirements which are handled in a custom fragment.
 
 ~~~ puppet
@@ -2998,26 +2970,11 @@ If `require` is set to `unmanaged` it will not be set at all. This is useful for
           require => 'unmanaged',
         }
       ],
-=======
-###### `sethandler`
-
-Sets a `SetHandler` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler).
-
-~~~ puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path       => '/path/to/directory',
-      sethandler => 'None',
->>>>>>> upstream/1.7.x
     }
-  ],
-}
 ~~~
 
 ###### `satisfy`
 
-<<<<<<< HEAD
 Sets a `Satisfy` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
 
 ~~~ puppet
@@ -3051,11 +3008,6 @@ apache::vhost { 'sample.example.net':
 Sets a `SetOutputFilter` directive per the [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
 
 ~~~ puppet
-=======
-Sets a `SetOutputFilter` directive per the [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
-
-~~~ puppet
->>>>>>> upstream/1.7.x
 apache::vhost{ 'filter.example.net':
   docroot     => '/path/to/directory',
   directories => [

From 32b70e69ef3cf648c3570edf4472f026a6a128bb Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 1 Dec 2015 14:18:27 +0000
Subject: [PATCH 0755/2267] (MAINT) rip out unused UNSUPPORTED_PLATFORMS test
 flagging

The underlying use-case for this pattern is meanwhile adressed by other
means and the pattern itself is not applied consistently across all tests.
Therefore this rips it out completely.
---
 spec/acceptance/apache_parameters_spec.rb |   2 +-
 spec/acceptance/apache_ssl_spec.rb        |   2 +-
 spec/acceptance/class_spec.rb             |   2 +-
 spec/acceptance/custom_config_spec.rb     |   2 +-
 spec/acceptance/default_mods_spec.rb      |   2 +-
 spec/acceptance/itk_spec.rb               |   2 +-
 spec/acceptance/mod_fcgid_spec.rb         |   4 +-
 spec/acceptance/mod_mime_spec.rb          |   2 +-
 spec/acceptance/mod_negotiation_spec.rb   |   2 +-
 spec/acceptance/mod_pagespeed_spec.rb     |   2 +-
 spec/acceptance/mod_passenger_spec.rb     |   2 +-
 spec/acceptance/mod_php_spec.rb           |   2 +-
 spec/acceptance/mod_proxy_html_spec.rb    |   2 +-
 spec/acceptance/mod_security_spec.rb      |   2 +-
 spec/acceptance/mod_suphp_spec.rb         |  56 ++++++------
 spec/acceptance/prefork_worker_spec.rb    |   4 +-
 spec/acceptance/service_spec.rb           |   2 +-
 spec/acceptance/unsupported_spec.rb       |  13 ---
 spec/acceptance/vhost_spec.rb             | 100 +++++++++++-----------
 spec/spec_helper_acceptance.rb            |  26 +++---
 20 files changed, 109 insertions(+), 122 deletions(-)
 delete mode 100644 spec/acceptance/unsupported_spec.rb

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index c46a220432..b82527115f 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache parameters', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache parameters' do
 
   # Currently this test only does something on FreeBSD.
   describe 'default_confd_files => false' do
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index f8023fa240..ccf65c7273 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -8,7 +8,7 @@
   vhostd = '/etc/apache2/sites-available'
 end
 
-describe 'apache ssl', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache ssl' do
 
   describe 'ssl parameters' do
     it 'runs without error' do
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 0cf1c36f90..47b0d36fa0 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache class' do
   case fact('osfamily')
   when 'RedHat'
     package_name = 'httpd'
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index 683e6b648b..fe73d111bd 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::custom_config define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::custom_config define' do
   context 'invalid config' do
     it 'should not add the config' do
       pp = <<-EOS
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 0199f180b3..c2d6a8c26d 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -15,7 +15,7 @@
   servicename = 'apache2'
 end
 
-describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::default_mods class' do
   describe 'no default mods' do
     # Using puppet_apply as a helper
     it 'should apply with no errors' do
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 2dde8f407e..a1ab4bede0 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -10,7 +10,7 @@
   service_name = :skip
 end
 
-describe 'apache::mod::itk class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or service_name.equal? :skip do
+describe 'apache::mod::itk class', :unless => service_name.equal? :skip do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index e99a7f299e..647f0128e4 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::fcgid class', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7')) do
-  context "default fcgid config", :if => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') do
+describe 'apache::mod::fcgid class', :if => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') or (fact('operatingsystem') != 'OracleLinux' and fact('operatingsystemmajrelease') != '7') do
+  context "default fcgid config" do
     it 'succeeds in puppeting fcgid' do
       pp = <<-EOS
         class { 'epel': } # mod_fcgid lives in epel
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index 89b3c800fa..e47360b5e0 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::mime class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::mime class' do
   case fact('osfamily')
   when 'Debian'
     mod_dir      = '/etc/apache2/mods-available'
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
index a44edbf268..48eb896b67 100644
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::negotiation class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::negotiation class' do
   case fact('osfamily')
   when 'Debian'
     vhost_dir    = '/etc/apache2/sites-enabled'
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 5fa342e9ae..f8060a167e 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::pagespeed class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::pagespeed class' do
   case fact('osfamily')
   when 'Debian'
     vhost_dir    = '/etc/apache2/sites-enabled'
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 5af9113e5c..df9cd9e13e 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::passenger class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::passenger class' do
   case fact('osfamily')
   when 'Debian'
     service_name = 'apache2'
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 502ec1ddcd..a42f523738 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::php class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::php class' do
   case fact('osfamily')
   when 'Debian'
     vhost_dir    = '/etc/apache2/sites-enabled'
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index e456000890..840ea563f1 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::proxy_html class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::proxy_html class' do
   case fact('osfamily')
   when 'Debian'
     service_name = 'apache2'
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 67ad7d5b84..4fcf0f551b 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::security class', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy'))) do
+describe 'apache::mod::security class', :unless => (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy')) do
   case fact('osfamily')
   when 'Debian'
     mod_dir      = '/etc/apache2/mods-available'
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 33f57fba6c..da2c6042e1 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -1,11 +1,9 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::suphp class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('operatingsystem')
-    when 'Ubuntu'
-      context "default suphp config" do
-        it 'succeeds in puppeting suphp' do
-          pp = <<-EOS
+describe 'apache::mod::suphp class', :if => fact('operatingsystem') == 'Ubuntu' do
+  context "default suphp config" do
+    it 'succeeds in puppeting suphp' do
+      pp = <<-EOS
 class { 'apache':
   mpm_module => 'prefork',
 }
@@ -24,32 +22,32 @@ class { 'apache':
 }
 class { 'apache::mod::php': }
 class { 'apache::mod::suphp': }
-          EOS
-          apply_manifest(pp, :catch_failures => true)
-        end
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
 
-        describe service('apache2') do
-          it { is_expected.to be_enabled }
-          it { is_expected.to be_running }
-        end
+    describe service('apache2') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
 
-        it 'should answer to suphp.example.com' do
-          timeout = 0
-          loop do
-            r = shell('curl suphp.example.com:80')
-            timeout += 1
-            break if r.stdout =~ /^daemon$/
-            if timeout > 40
-              expect(timeout < 40).to be true
-              break
-            end
-            sleep(1)
-          end
-          shell("/usr/bin/curl suphp.example.com:80") do |r|
-            expect(r.stdout).to match(/^daemon$/)
-            expect(r.exit_code).to eq(0)
-          end
+    it 'should answer to suphp.example.com' do
+      timeout = 0
+      loop do
+        r = shell('curl suphp.example.com:80')
+        timeout += 1
+        break if r.stdout =~ /^daemon$/
+        if timeout > 40
+          expect(timeout < 40).to be true
+          break
         end
+        sleep(1)
       end
+      shell("/usr/bin/curl suphp.example.com:80") do |r|
+        expect(r.stdout).to match(/^daemon$/)
+        expect(r.exit_code).to eq(0)
+      end
+    end
+
   end
 end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 0ac27232d3..234b6acefb 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -36,7 +36,7 @@ class { 'apache':
   end
 end
 
-describe 'apache::mod::worker class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::worker class' do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do
@@ -58,7 +58,7 @@ class { 'apache':
   end
 end
 
-describe 'apache::mod::prefork class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::mod::prefork class' do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do
diff --git a/spec/acceptance/service_spec.rb b/spec/acceptance/service_spec.rb
index b51ca386f0..c3124c8461 100644
--- a/spec/acceptance/service_spec.rb
+++ b/spec/acceptance/service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::service class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::service class' do
   describe 'adding dependencies in between the base class and service class' do
     it 'should work with no errors' do
       pp = <<-EOS
diff --git a/spec/acceptance/unsupported_spec.rb b/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 085845dbfc..0000000000
--- a/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should fail' do
-    pp = <<-EOS
-      class { 'apache': }
-      apache::vhost { 'test.lan':
-        docroot => '/var/www',
-      }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported/i)
-  end
-end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 5fa91d5dc7..02df7be89a 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::vhost define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'apache::vhost define' do
   context 'no default vhosts' do
     it 'should create no default vhosts' do
       pp = <<-EOS
@@ -505,8 +505,8 @@ class { 'apache': }
 
   case fact('lsbdistcodename')
   when 'precise', 'wheezy'
-    context 'vhost fallbackresource example' do
-      it 'should configure a vhost with Fallbackresource' do
+    context 'vhost FallbackResource example' do
+      it 'should configure a vhost with FallbackResource' do
         pp = <<-EOS
         class { 'apache': }
         apache::vhost { 'fallback.example.net':
@@ -1232,54 +1232,58 @@ class { 'apache': }
   end
 
   describe 'wsgi' do
-    it 'import_script applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::wsgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot                     => '/tmp',
-          wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => 'wsgi',
-          wsgi_daemon_process_options => {processes => '2'},
-          wsgi_process_group          => 'nobody',
-          wsgi_script_aliases         => { '/test' => '/test1' },
-          wsgi_pass_authorization     => 'On',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    context 'on lucid', :if => fact('lsbdistcodename') == 'lucid' do
+      it 'import_script applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': }
+          class { 'apache::mod::wsgi': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot                     => '/tmp',
+            wsgi_application_group      => '%{GLOBAL}',
+            wsgi_daemon_process         => 'wsgi',
+            wsgi_daemon_process_options => {processes => '2'},
+            wsgi_process_group          => 'nobody',
+            wsgi_script_aliases         => { '/test' => '/test1' },
+            wsgi_pass_authorization     => 'On',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
     end
 
-    it 'import_script applies cleanly', :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
-      pp = <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::wsgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot                     => '/tmp',
-          wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => 'wsgi',
-          wsgi_daemon_process_options => {processes => '2'},
-          wsgi_import_script          => '/test1',
-          wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
-          wsgi_process_group          => 'nobody',
-          wsgi_script_aliases         => { '/test' => '/test1' },
-          wsgi_pass_authorization     => 'On',
-          wsgi_chunked_request        => 'On',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
+    context 'on everything but lucid', :unless => fact('lsbdistcodename') == 'lucid' do
+      it 'import_script applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': }
+          class { 'apache::mod::wsgi': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot                     => '/tmp',
+            wsgi_application_group      => '%{GLOBAL}',
+            wsgi_daemon_process         => 'wsgi',
+            wsgi_daemon_process_options => {processes => '2'},
+            wsgi_import_script          => '/test1',
+            wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
+            wsgi_process_group          => 'nobody',
+            wsgi_script_aliases         => { '/test' => '/test1' },
+            wsgi_pass_authorization     => 'On',
+            wsgi_chunked_request        => 'On',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
 
-    describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
-      it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
-      it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
-      it { is_expected.to contain 'WSGIProcessGroup nobody' }
-      it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
-      it { is_expected.to contain 'WSGIPassAuthorization On' }
-      it { is_expected.to contain 'WSGIChunkedRequest On' }
+      describe file("#{$vhost_dir}/25-test.server.conf") do
+        it { is_expected.to be_file }
+        it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
+        it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
+        it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
+        it { is_expected.to contain 'WSGIProcessGroup nobody' }
+        it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
+        it { is_expected.to contain 'WSGIPassAuthorization On' }
+        it { is_expected.to contain 'WSGIChunkedRequest On' }
+      end
     end
   end
 
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index d767b1e60a..b47434659e 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -4,8 +4,6 @@
 
 run_puppet_install_helper
 
-UNSUPPORTED_PLATFORMS = ['Suse','windows','AIX','Solaris']
-
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
@@ -27,24 +25,24 @@
     # Install module and dependencies
     hosts.each do |host|
       copy_module_to(host, :source => proj_root, :module_name => 'apache')
+
+      on host, puppet('module','install','puppetlabs-stdlib')
+      on host, puppet('module','install','puppetlabs-concat', '--version 1.1.1', '--force')
+
       # Required for mod_passenger tests.
       if fact('osfamily') == 'RedHat'
-        on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
-        on host, puppet('module','install','puppetlabs/inifile'), { :acceptable_exit_codes => [0,1] }
+        on host, puppet('module','install','stahnma/epel')
+        on host, puppet('module','install','puppetlabs/inifile')
       end
+
       # Required for manifest to make mod_pagespeed repository available
       if fact('osfamily') == 'Debian'
-        on host, puppet('module','install','puppetlabs-apt', '--version 1.8.0', '--force'), { :acceptable_exit_codes => [0,1] }
-      end
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-concat', '--version 1.1.1', '--force'), { :acceptable_exit_codes => [0,1] }
-
-      # Make sure selinux is disabled before each test or apache won't work.
-      if ! UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))
-        on host, puppet('apply', '-e',
-                          %{"exec { 'setenforce 0': path   => '/bin:/sbin:/usr/bin:/usr/sbin', onlyif => 'which setenforce && getenforce | grep Enforcing', }"}),
-                          { :acceptable_exit_codes => [0] }
+        on host, puppet('module','install','puppetlabs-apt', '--version 1.8.0', '--force')
       end
+
+      # Make sure selinux is disabled so the tests work.
+      on host, puppet('apply', '-e',
+                        %{"exec { 'setenforce 0': path   => '/bin:/sbin:/usr/bin:/usr/sbin', onlyif => 'which setenforce && getenforce | grep Enforcing', }"})
     end
   end
 end

From a8cd52b77e3e2fd495f57edf9b3440f740dcbabf Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 1 Dec 2015 14:32:03 +0000
Subject: [PATCH 0756/2267] (MAINT) sort out IPv6 tests that doen't apply to
 old Ubuntu systems

---
 spec/acceptance/vhost_spec.rb  | 14 +++++++-------
 spec/spec_helper_acceptance.rb |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 02df7be89a..552318c204 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -202,8 +202,8 @@ class { 'apache':
           ip_based => true,
           docroot  => '/var/www/html',
         }
-        host { 'ipv4.example.com': ip => '127.0.0.1', }
-        host { 'ipv6.example.com': ip => '127.0.0.2', }
+        host { 'host1.example.com': ip => '127.0.0.1', }
+        host { 'host2.example.com': ip => '127.0.0.2', }
         file { '/var/www/html/index.html':
           ensure  => file,
           content => "Hello from vhost\\n",
@@ -230,20 +230,20 @@ class { 'apache':
       it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:80' }
     end
 
-    it 'should answer to ipv4.example.com' do
-      shell("/usr/bin/curl ipv4.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'should answer to host1.example.com' do
+      shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
-    it 'should answer to ipv6.example.com' do
-      shell("/usr/bin/curl ipv6.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'should answer to host2.example.com' do
+      shell("/usr/bin/curl host2.example.com:80", {:acceptable_exit_codes => 0}) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
   end
 
-  context 'new vhost with IPv6 address on port 80' do
+  context 'new vhost with IPv6 address on port 80', :ipv6 do
     it 'should configure one apache vhost with an ipv6 address' do
       pp = <<-EOS
         class { 'apache':
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index b47434659e..7c01bc1760 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -5,6 +5,11 @@
 run_puppet_install_helper
 
 RSpec.configure do |c|
+  # apache on Ubuntu 10.04 and 12.04 doesn't like IPv6 VirtualHosts, so we skip ipv6 tests on those systems
+  unless fact('operatingsystem') == 'Ubuntu' and (fact('operatingsystemrelease') == '10.04' or fact('operatingsystemrelease') == '12.04')
+    c.filter_run_including :ipv6 => true
+  end
+
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 

From 2392dd58b1c44f5c7715e43829bd0761d740fc1d Mon Sep 17 00:00:00 2001
From: Jakub Bittner <rexcze@gmail.com>
Date: Tue, 1 Dec 2015 15:54:36 +0100
Subject: [PATCH 0757/2267] changed typo

After changing variable nss_port to port in manifest file I did not changed port variable on "VirtualHost" line. Fixed
---
 templates/mod/nss.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/nss.conf.erb b/templates/mod/nss.conf.erb
index 22762ccac7..b6ea504877 100644
--- a/templates/mod/nss.conf.erb
+++ b/templates/mod/nss.conf.erb
@@ -84,7 +84,7 @@ NSSRequireSafeNegotiation off
 ## SSL Virtual Host Context
 ##
 
-<VirtualHost _default_:<%= @nss_port %>>
+<VirtualHost _default_:<%= @port %>>
 
 #   General setup for the virtual host
 #DocumentRoot "/etc/httpd/htdocs"

From 4c386e482c698171a8b41ecba39cda22697f6f7d Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 1 Dec 2015 17:45:04 +0000
Subject: [PATCH 0758/2267] (MAINT) fix syntax errors and the filter config

---
 spec/acceptance/itk_spec.rb       | 5 +----
 spec/acceptance/mod_fcgid_spec.rb | 2 +-
 spec/spec_helper_acceptance.rb    | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index a1ab4bede0..13fb817c91 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -5,12 +5,9 @@
   service_name = 'apache2'
 when 'FreeBSD'
   service_name = 'apache24'
-else
-  # Not implemented yet
-  service_name = :skip
 end
 
-describe 'apache::mod::itk class', :unless => service_name.equal? :skip do
+describe 'apache::mod::itk class', :if => service_name do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 647f0128e4..8f01053fc6 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::fcgid class', :if => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') or (fact('operatingsystem') != 'OracleLinux' and fact('operatingsystemmajrelease') != '7') do
+describe 'apache::mod::fcgid class', :if => ((fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') or (fact('operatingsystem') != 'OracleLinux' and fact('operatingsystemmajrelease') != '7')) do
   context "default fcgid config" do
     it 'succeeds in puppeting fcgid' do
       pp = <<-EOS
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 7c01bc1760..715ea1f6bf 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -6,8 +6,8 @@
 
 RSpec.configure do |c|
   # apache on Ubuntu 10.04 and 12.04 doesn't like IPv6 VirtualHosts, so we skip ipv6 tests on those systems
-  unless fact('operatingsystem') == 'Ubuntu' and (fact('operatingsystemrelease') == '10.04' or fact('operatingsystemrelease') == '12.04')
-    c.filter_run_including :ipv6 => true
+  if fact('operatingsystem') == 'Ubuntu' and (fact('operatingsystemrelease') == '10.04' or fact('operatingsystemrelease') == '12.04')
+    c.filter_run_excluding :ipv6 => true
   end
 
   # Project root

From 776d32e8a1d4f630d54835daeee66d2d11a4f303 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Tue, 1 Dec 2015 16:34:00 -0700
Subject: [PATCH 0759/2267] (MAINT) Fix conditional flag on mod_fcgid test.

---
 spec/acceptance/mod_fcgid_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 8f01053fc6..ce3b5b5b27 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::fcgid class', :if => ((fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') or (fact('operatingsystem') != 'OracleLinux' and fact('operatingsystemmajrelease') != '7')) do
+describe 'apache::mod::fcgid class', :if => ((fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') and !(fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7')) do
   context "default fcgid config" do
     it 'succeeds in puppeting fcgid' do
       pp = <<-EOS

From 1fb2b8af2e3e9f7b3f5ff280c47bc90c01c65edc Mon Sep 17 00:00:00 2001
From: Christian Kaenzig <christian.kaenzig@camptocamp.com>
Date: Wed, 25 Nov 2015 15:52:02 +0100
Subject: [PATCH 0760/2267] Set SSLProxy directives even if ssl is false

RewriteRules and ProxyPass directives can require SSLProxy*
configurations even if SSLEngine is not enabled.
---
 manifests/vhost.pp            | 17 +++++++++++++----
 spec/defines/vhost_spec.rb    | 20 ++++++++++++++++++--
 templates/vhost/_ssl.erb      | 12 ------------
 templates/vhost/_sslproxy.erb | 14 ++++++++++++++
 4 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 templates/vhost/_sslproxy.erb

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 2b7c50f48c..0827e881b2 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -788,15 +788,11 @@
   # - $ssl_crl_path
   # - $ssl_crl
   # - $ssl_crl_check
-  # - $ssl_proxyengine
   # - $ssl_protocol
   # - $ssl_cipher
   # - $ssl_honorcipherorder
   # - $ssl_verify_client
   # - $ssl_verify_depth
-  # - $ssl_proxy_check_peer_cn
-  # - $ssl_proxy_check_peer_name
-  # - $ssl_proxy_machine_cert
   # - $ssl_options
   # - $ssl_openssl_conf_cmd
   # - $apache_version
@@ -808,6 +804,19 @@
     }
   }
 
+  # Template uses:
+  # - $ssl_proxyengine
+  # - $ssl_proxy_check_peer_cn
+  # - $ssl_proxy_check_peer_name
+  # - $ssl_proxy_machine_cert
+  if $ssl_proxyengine {
+    concat::fragment { "${name}-sslproxy":
+      target  => "${priority_real}${filename}.conf",
+      order   => 210,
+      content => template('apache/vhost/_sslproxy.erb'),
+    }
+  }
+
   # Template uses:
   # - $auth_kerb
   # - $krb_method_negotiate
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9e68424c68..f1f2d4f74f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -435,9 +435,12 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
         :content => /^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+        :content => /^\s+SSLProxyEngine On$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
         :content => /^\s+SSLProxyCheckPeerCN\s+on$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
         :content => /^\s+SSLProxyCheckPeerName\s+on$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
@@ -681,6 +684,7 @@
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-serveralias') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-setenv') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-ssl') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-sslproxy') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-suphp') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-php_admin') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-header') }
@@ -703,6 +707,18 @@
       it { is_expected.to compile }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
     end
+    context 'ssl_proxyengine without ssl' do
+      let :params do
+        {
+          'docroot'         => '/rspec/docroot',
+          'ssl'             => false,
+          'ssl_proxyengine' => true,
+        }
+      end
+      it { is_expected.to compile }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
+    end
   end
   describe 'access logs' do
     let :facts do
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index aaadebdbc1..797435cc19 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -22,9 +22,6 @@
   <%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   SSLCARevocationCheck    "<%= @ssl_crl_check %>"
   <%- end -%>
-  <%- if @ssl_proxyengine -%>
-  SSLProxyEngine On
-  <%- end -%>
   <%- if @ssl_protocol -%>
   SSLProtocol             <%= [@ssl_protocol].flatten.compact.join(' ') %>
   <%- end -%>
@@ -40,15 +37,6 @@
   <%- if @ssl_verify_depth -%>
   SSLVerifyDepth          <%= @ssl_verify_depth %>
   <%- end -%>
-  <%- if @ssl_proxy_check_peer_cn -%>
-  SSLProxyCheckPeerCN     <%= @ssl_proxy_check_peer_cn %>
-  <%- end -%>
-  <%- if @ssl_proxy_check_peer_name -%>
-  SSLProxyCheckPeerName   <%= @ssl_proxy_check_peer_name %>
-  <%- end -%>
-  <%- if @ssl_proxy_machine_cert -%>
-  SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
-  <%- end -%>
   <%- if @ssl_options -%>
   SSLOptions <%= Array(@ssl_options).join(' ') %>
   <%- end -%>
diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
new file mode 100644
index 0000000000..e58d52d0ba
--- /dev/null
+++ b/templates/vhost/_sslproxy.erb
@@ -0,0 +1,14 @@
+<% if @ssl_proxyengine -%>
+
+  # SSL Proxy directives
+  SSLProxyEngine On
+  <%- if @ssl_proxy_check_peer_cn -%>
+  SSLProxyCheckPeerCN     <%= @ssl_proxy_check_peer_cn %>
+  <%- end -%>
+  <%- if @ssl_proxy_check_peer_name -%>
+  SSLProxyCheckPeerName   <%= @ssl_proxy_check_peer_name %>
+  <%- end -%>
+  <%- if @ssl_proxy_machine_cert -%>
+  SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
+  <%- end -%>
+<% end -%>

From a6c6f10e6325c6c8266cf06ae17d81dd3c309acf Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 2 Dec 2015 15:28:52 +0000
Subject: [PATCH 0761/2267] (MODULES-2200) fix itk configuration on Ubuntu

After uncovering the issues with this code with the last commits, this
now fixes the code to actually configure the ITK MPM.
---
 manifests/mod/itk.pp         | 11 +++++++++++
 manifests/mpm.pp             | 30 +++++++++++++++++++++---------
 spec/acceptance/itk_spec.rb  |  9 +++++----
 spec/classes/mod/itk_spec.rb |  8 ++++++++
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 2be7d832db..fb293ab289 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -17,6 +17,17 @@
     if defined(Class['apache::mod::prefork']) {
       fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
     }
+  } else {
+    # prefork is a requirement for itk in 2.4; except on FreeBSD, which is special
+    if $::osfamily == 'FreeBSD' {
+      if defined(Class['apache::mod::prefork']) {
+        fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
+      }
+    } else {
+      if ! defined(Class['apache::mod::prefork']) {
+        fail('apache::mod::prefork is a prerequisite for apache::mod::itk, please arrange for it to be included.')
+      }
+    }
   }
   if defined(Class['apache::mod::worker']) {
     fail('May not include both apache::mod::itk and apache::mod::worker on the same node')
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 9e77349454..e89c6f6034 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -47,14 +47,26 @@
         }
 
         if $mpm == 'itk' {
-            file { "${lib_path}/mod_mpm_itk.so":
-              ensure => link,
-              target => "${lib_path}/mpm_itk.so"
-            }
+          file { "${lib_path}/mod_mpm_itk.so":
+            ensure  => link,
+            target  => "${lib_path}/mpm_itk.so",
+            require => Package['httpd'],
+            before  => Class['apache::service'],
+          }
         }
       }
 
-      if versioncmp($apache_version, '2.4') < 0 {
+      if $mpm == 'itk' and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '14.04' {
+        # workaround https://bugs.launchpad.net/ubuntu/+source/mpm-itk/+bug/1286882
+        exec {
+          '/usr/sbin/a2dismod mpm_event':
+            onlyif  => '/usr/bin/test -e /etc/apache2/mods-enabled/mpm_event.load',
+            require => Package['httpd'],
+            before  => Package['apache2-mpm-itk'],
+        }
+      }
+
+      if versioncmp($apache_version, '2.4') < 0 or $mpm == 'itk' {
         package { "apache2-mpm-${mpm}":
           ensure => present,
         }
@@ -87,10 +99,10 @@
         }
 
         if $mpm == 'itk' {
-            file { "${lib_path}/mod_mpm_itk.so":
-              ensure => link,
-              target => "${lib_path}/mpm_itk.so"
-            }
+          file { "${lib_path}/mod_mpm_itk.so":
+            ensure => link,
+            target => "${lib_path}/mpm_itk.so"
+          }
         }
       }
 
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 13fb817c91..84339d7535 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -12,14 +12,15 @@
     # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
-          class { 'apache':
-            mpm_module => 'itk',
-          }
+        class { 'apache':
+          mpm_module => 'prefork',
+        }
+        class { 'apache::mod::itk': }
       EOS
 
       # Run it twice and test for idempotency
       apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+      apply_manifest(pp, :catch_changes => true)
     end
   end
 
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 1644408761..cd2e6c67a7 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -37,6 +37,10 @@
     end
 
     context "with Apache version >= 2.4" do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+
       let :params do
         {
           :apache_version => '2.4',
@@ -52,6 +56,10 @@
     end
   end
   context "on a FreeBSD OS" do
+    let :pre_condition do
+      'class { "apache": mpm_module => false, }'
+    end
+
     let :facts do
       {
         :osfamily               => 'FreeBSD',

From 89b7caae8a459daa17e77b0bdb2623ea8660a15e Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 2 Dec 2015 16:08:56 +0000
Subject: [PATCH 0762/2267] (MODULES-2865) fix $mpm_module logic for 'false'

---
 manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 5a865b761d..c5eedd8afa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -92,7 +92,7 @@
     default => '(event|itk|prefork|worker)'
   }
 
-  if $mpm_module {
+  if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans
     validate_re($mpm_module, $valid_mpms_re)
   }
 
@@ -346,7 +346,7 @@
     class { '::apache::default_confd_files':
       all => $default_confd_files
     }
-    if $mpm_module {
+    if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans
       class { "::apache::mod::${mpm_module}": }
     }
 

From c341d8a860f88e2e6353f9aa3a2683c9a3ce15ab Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 2 Dec 2015 16:21:17 -0700
Subject: [PATCH 0763/2267] Fixes ITK validation for Gentoo.

---
 manifests/mod/itk.pp | 4 ++--
 manifests/mpm.pp     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index fb293ab289..990f853eaf 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -18,8 +18,8 @@
       fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
     }
   } else {
-    # prefork is a requirement for itk in 2.4; except on FreeBSD, which is special
-    if $::osfamily == 'FreeBSD' {
+    # prefork is a requirement for itk in 2.4; except on FreeBSD and Gentoo, which are special
+    if $::osfamily =~ /^(FreeBSD|Gentoo)/ {
       if defined(Class['apache::mod::prefork']) {
         fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
       }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index e89c6f6034..557d083093 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -77,6 +77,9 @@
         mpm_module => $mpm
       }
     }
+    'gentoo': {
+      # so we don't fail
+    }
     'redhat': {
       # so we don't fail
     }

From 878157f4d46b31684e6c5f136c0a52041e0eb18b Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Thu, 3 Dec 2015 16:11:21 +0000
Subject: [PATCH 0764/2267] (MAINT) fixup another edge-case of ITK installation
 found by CI

---
 manifests/mpm.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 557d083093..6d5abe522f 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -69,6 +69,7 @@
       if versioncmp($apache_version, '2.4') < 0 or $mpm == 'itk' {
         package { "apache2-mpm-${mpm}":
           ensure => present,
+          before => File[$::apache::mod_dir],
         }
       }
     }

From cd37e613d405c45607a34d9ea232cdeaaf134ad2 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Fri, 4 Dec 2015 16:32:10 +0000
Subject: [PATCH 0765/2267] (MAINT) depend on the right mod dir to restore
 idempotency

---
 manifests/mpm.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 6d5abe522f..1535409101 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -69,7 +69,11 @@
       if versioncmp($apache_version, '2.4') < 0 or $mpm == 'itk' {
         package { "apache2-mpm-${mpm}":
           ensure => present,
-          before => File[$::apache::mod_dir],
+        }
+        if $::apache::mod_enable_dir {
+          Package["apache2-mpm-${mpm}"] {
+            before => File[$::apache::mod_enable_dir],
+          }
         }
       }
     }

From c9f6606ac4ca0c2f23d06146bae7e2e05eec4be8 Mon Sep 17 00:00:00 2001
From: Klavs Klavsen <klavs@EnableIT.dk>
Date: Tue, 8 Dec 2015 10:32:51 +0100
Subject: [PATCH 0766/2267] enable setting LimitRequestFieldSize globally as it
 does not actually work to increase it, inside a vhost

---
 manifests/init.pp        | 1 +
 templates/httpd.conf.erb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index c5eedd8afa..bb50d0b2e9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -63,6 +63,7 @@
   $keepalive              = $::apache::params::keepalive,
   $keepalive_timeout      = $::apache::params::keepalive_timeout,
   $max_keepalive_requests = $::apache::params::max_keepalive_requests,
+  $limitreqfieldsize      = '8190',
   $logroot                = $::apache::params::logroot,
   $logroot_mode           = $::apache::params::logroot_mode,
   $log_level              = $::apache::params::log_level,
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 6fb9892442..cc6998b9b9 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -10,6 +10,7 @@ Timeout <%= @timeout %>
 KeepAlive <%= @keepalive %>
 MaxKeepAliveRequests <%= @max_keepalive_requests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
+LimitRequestFieldSize <%= @limitreqfieldsize %>
 
 <%- if @rewrite_lock and scope.function_versioncmp([@apache_version, '2.2']) <= 0 -%>
 RewriteLock <%= @rewrite_lock %>

From e0f6eb0a1284f663b455500bed3752181e76f19c Mon Sep 17 00:00:00 2001
From: Klavs Klavsen <klavs@EnableIT.dk>
Date: Wed, 9 Dec 2015 09:30:39 +0100
Subject: [PATCH 0767/2267] remove vhost LimitRequestFieldSize option and add
 rspec test for new option.

---
 README.md                                 |  5 +----
 manifests/vhost.pp                        | 14 --------------
 spec/acceptance/apache_parameters_spec.rb | 14 ++++++++++++++
 spec/defines/vhost_spec.rb                |  5 +----
 templates/vhost/_limits.erb               |  5 -----
 5 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 templates/vhost/_limits.erb

diff --git a/README.md b/README.md
index df2a038507..4243496c65 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,7 @@
 [`KeepAliveTimeout`]: http://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout
 [`keepalive` parameter]: #keepalive
 [`keepalive_timeout`]: #keepalive_timeout
+[`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize
 
 [`lib`]: #lib
 [`lib_path`]: #lib_path
@@ -2103,10 +2104,6 @@ Specifies the service name that will be used by Apache for authentication. Corre
 
 This option enables credential saving functionality. Default is 'off'
 
-##### `limit_request_field_size`
-
-[Limits](http://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize) the size of the HTTP request header allowed from the client. Default is 'undef'.
-
 ##### `logroot`
 
 Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0827e881b2..a87df2c1c6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -136,7 +136,6 @@
   $krb_verify_kdc              = 'on',
   $krb_servicename             = 'HTTP',
   $krb_save_credentials        = 'off',
-  $limit_request_field_size    = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -229,10 +228,6 @@
 
   validate_bool($auth_kerb)
 
-  if $limit_request_field_size {
-    validate_integer($limit_request_field_size)
-  }
-
   # Validate the docroot as a string if:
   # - $manage_docroot is true
   if $manage_docroot {
@@ -984,15 +979,6 @@
       content => template('apache/vhost/_filters.erb'),
     }
   }
-  # Template uses:
-  # - $limit_request_field_size
-  if $limit_request_field_size {
-    concat::fragment { "${name}-limits":
-      target  => "${priority_real}${filename}.conf",
-      order   => 330,
-      content => template('apache/vhost/_limits.erb'),
-    }
-  }
 
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index b82527115f..00e486fb64 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -354,6 +354,20 @@ class { 'apache':
     end
   end
 
+  describe 'limitrequestfieldsize' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': limitreqfieldsize => '16830' }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file($conf_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'LimitRequestFieldSize 16830' }
+    end
+  end
+
   describe 'logging' do
     describe 'setup' do
       it 'applies cleanly' do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f1f2d4f74f..9dd563a9c6 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -326,8 +326,7 @@
           'krb_authoritative'           => 'off',
           'krb_auth_realms'             => ['EXAMPLE.ORG','EXAMPLE.NET'],
           'krb_5keytab'                 => '/tmp/keytab5',
-          'krb_local_user_mapping'      => 'off',
-          'limit_request_field_size'    => '54321',
+          'krb_local_user_mapping'      => 'off'
         }
       end
       let :facts do
@@ -472,8 +471,6 @@
         :content => /^\s+KrbSaveCredentials\soff$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
         :content => /^\s+KrbVerifyKDC\son$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-limits').with(
-        :content => /^\s+LimitRequestFieldSize\s54321$/)}
     end
     context 'vhost with multiple ip addresses' do
       let :params do
diff --git a/templates/vhost/_limits.erb b/templates/vhost/_limits.erb
deleted file mode 100644
index 0bd56db353..0000000000
--- a/templates/vhost/_limits.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-  ## Limit Request Values
-<% if @limit_request_field_size -%>
-  LimitRequestFieldSize <%= @limit_request_field_size %>
-<% end -%>

From 893e02dbb1a41e038a3fae6116aae475527b5b69 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 9 Dec 2015 14:16:48 +0000
Subject: [PATCH 0768/2267] (MAINT) fixup ITK tests for older debian-based
 releases

---
 spec/acceptance/itk_spec.rb | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 84339d7535..b222a86220 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -3,20 +3,37 @@
 case fact('osfamily')
 when 'Debian'
   service_name = 'apache2'
+  majrelease = fact('operatingsystemmajrelease')
+  if [ '6', '7', '10.04', '12.04'].contains(majrelease)
+    variant = :itk_only
+  else
+    variant = :prefork
+  end
 when 'FreeBSD'
   service_name = 'apache24'
+  majrelease = fact('operatingsystemmajrelease')
+  variant = :prefork
 end
 
 describe 'apache::mod::itk class', :if => service_name do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::itk': }
-      EOS
+      pp = case variant
+           when :prefork
+             <<-EOS
+               class { 'apache':
+                 mpm_module => 'prefork',
+               }
+               class { 'apache::mod::itk': }
+             EOS
+           when :itk_only
+             <<-EOS
+               class { 'apache':
+                 mpm_module => 'itk',
+               }
+             EOS
+           end
 
       # Run it twice and test for idempotency
       apply_manifest(pp, :catch_failures => true)

From 751fc24078c24f8ad1b2c33faef4d1eacc533f52 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 9 Dec 2015 18:46:29 +0000
Subject: [PATCH 0769/2267] (MAINT) fix "typo" in last commit

---
 spec/acceptance/itk_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index b222a86220..c220a70f88 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -4,7 +4,7 @@
 when 'Debian'
   service_name = 'apache2'
   majrelease = fact('operatingsystemmajrelease')
-  if [ '6', '7', '10.04', '12.04'].contains(majrelease)
+  if [ '6', '7', '10.04', '12.04'].include?(majrelease)
     variant = :itk_only
   else
     variant = :prefork

From b9f630a60811694916ecf8758103d4bca2ac6038 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 19 Nov 2015 14:30:36 -0500
Subject: [PATCH 0770/2267] Add ::apache::vhost::custom

Here we are adding a thin wrapper to apache::custom_config but setting
default specific to the vhost apache folder.

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 README.md                         | 22 +++++++
 manifests/vhost.pp                |  2 +
 manifests/vhost/custom.pp         | 37 ++++++++++++
 spec/defines/vhost_custom_spec.rb | 99 +++++++++++++++++++++++++++++++
 4 files changed, 160 insertions(+)
 create mode 100644 manifests/vhost/custom.pp
 create mode 100644 spec/defines/vhost_custom_spec.rb

diff --git a/README.md b/README.md
index 279754a08f..41556562ee 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@
 [`apache::params`]: #class-apacheparams
 [`apache::version`]: #class-apacheversion
 [`apache::vhost`]: #define-apachevhost
+[`apache::vhost::custom`]: #define-apachevhostcustom
 [`apache::vhost::WSGIImportScript`]: #wsgiimportscript
 [Apache HTTP Server]: http://httpd.apache.org
 [Apache modules]: http://httpd.apache.org/docs/current/mod/
@@ -740,6 +741,7 @@ apache::balancer { 'puppet01':
     - [Define: apache::mod](#define-apachemod)
     - [Define: apache::namevirtualhost](#define-apachenamevirtualhost)
     - [Define: apache::vhost](#define-apachevhost)
+    - [Define: apache::vhost::custom](#define-apachevhostcustom)
 - [**Private Defines**](#private-defines)
     - [Define: apache::default_mods::load](#define-default_mods-load)
     - [Define: apache::peruser::multiplexer](#define-apacheperusermultiplexer)
@@ -3244,6 +3246,26 @@ A unique alias. This is used internally to link the action with the FastCGI serv
 
 The MIME-type of the file to be processed by the FastCGI server.
 
+#### Define: `apache::vhost::custom`
+
+The `apache::vhost::custom` is a thin wrapper to the `apache::custom_config``
+define. We are simply overriding some of the default settings specifc to the
+vhost directory in Apache.
+
+**Parameters within `apache::vhost::custom`**:
+
+##### `content`
+
+Sets the configuration file's content.
+
+##### `ensure`
+
+Specifies if the vhost file is present or absent. Defaults to 'present'.
+
+##### `priority`
+
+Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Defaults to '25'.
+
 ### Private Defines
 
 #### Define: `apache::peruser::multiplexer`
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e2725b8aea..341d6ad14e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -497,6 +497,8 @@
     require => Package['httpd'],
     notify  => Class['apache::service'],
   }
+  # NOTE(pabelanger): This code is duplicated in ::apache::vhost::custom and
+  # needs to be converted into something generic.
   if $::apache::vhost_enable_dir {
     $vhost_enable_dir = $::apache::vhost_enable_dir
     $vhost_symlink_ensure = $ensure ? {
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
new file mode 100644
index 0000000000..d85e4d091b
--- /dev/null
+++ b/manifests/vhost/custom.pp
@@ -0,0 +1,37 @@
+# See README.md for usage information
+define apache::vhost::custom(
+  $content,
+  $ensure = 'present',
+  $priority = '25',
+) {
+  include ::apache
+
+  ## Apache include does not always work with spaces in the filename
+  $filename = regsubst($name, ' ', '_', 'G')
+
+  ::apache::custom_config { $filename:
+    ensure   => $ensure,
+    confdir  => $::apache::vhost_dir,
+    content  => $content,
+    priority => $priority,
+  }
+
+  # NOTE(pabelanger): This code is duplicated in ::apache::vhost and needs to
+  # converted into something generic.
+  if $::apache::vhost_enable_dir {
+    $vhost_symlink_ensure = $ensure ? {
+      present => link,
+      default => $ensure,
+    }
+
+    file { "${priority}-${filename}.conf symlink":
+      ensure  => $vhost_symlink_ensure,
+      path    => "${::apache::vhost_enable_dir}/${priority}-${filename}.conf",
+      target  => "${::apache::vhost_dir}/${priority}-${filename}.conf",
+      owner   => 'root',
+      group   => $::apache::params::root_group,
+      mode    => '0644',
+      require => Apache::Custom_config[$filename],
+    }
+  }
+}
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
new file mode 100644
index 0000000000..804be86b80
--- /dev/null
+++ b/spec/defines/vhost_custom_spec.rb
@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe 'apache::vhost::custom', :type => :define do
+  let :title do
+    'rspec.example.com'
+  end
+  let :default_params do
+    {
+      :content => 'foobar'
+    }
+  end
+  describe 'os-dependent items' do
+    context "on RedHat based systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '6',
+          :operatingsystem        => 'RedHat',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :params do default_params end
+      let :facts do default_facts end
+    end
+    context "on Debian based systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :lsbdistcodename        => 'squeeze',
+          :operatingsystem        => 'Debian',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :params do default_params end
+      let :facts do default_facts end
+      it { is_expected.to contain_file("apache_rspec.example.com").with(
+        :ensure  => 'present',
+        :content => 'foobar',
+        :path    => '/etc/apache2/sites-available/25-rspec.example.com.conf',
+      ) }
+      it { is_expected.to contain_file("25-rspec.example.com.conf symlink").with(
+        :ensure => 'link',
+        :path   => '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
+        :target => '/etc/apache2/sites-available/25-rspec.example.com.conf'
+      ) }
+    end
+    context "on FreeBSD systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'FreeBSD',
+          :operatingsystemrelease => '9',
+          :operatingsystem        => 'FreeBSD',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'FreeBSD',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :params do default_params end
+      let :facts do default_facts end
+      it { is_expected.to contain_file("apache_rspec.example.com").with(
+        :ensure  => 'present',
+        :content => 'foobar',
+        :path    => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf',
+      ) }
+    end
+    context "on Gentoo systems" do
+      let :default_facts do
+        {
+          :osfamily               => 'Gentoo',
+          :operatingsystem        => 'Gentoo',
+          :operatingsystemrelease => '3.16.1-gentoo',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :params do default_params end
+      let :facts do default_facts end
+      it { is_expected.to contain_file("apache_rspec.example.com").with(
+        :ensure  => 'present',
+        :content => 'foobar',
+        :path    => '/etc/apache2/vhosts.d/25-rspec.example.com.conf',
+      ) }
+    end
+  end
+end

From 4a24c1cf5890a4ae50d76994eaae8c7f9f810117 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 15 Dec 2015 10:13:33 -0500
Subject: [PATCH 0771/2267] Make sure snake-oil certs are installed for beaker

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 spec/spec_helper_acceptance.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 715ea1f6bf..6bfdefd714 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -27,6 +27,11 @@
       apply_manifest_on(agents, pp, :catch_failures => false)
     end
 
+    if fact('osfamily') == 'Debian'
+      # Make sure snake-oil certs are installed.
+      shell 'apt-get install -y ssl-cert'
+    end
+
     # Install module and dependencies
     hosts.each do |host|
       copy_module_to(host, :source => proj_root, :module_name => 'apache')

From 6bd03a7a2b606bd83ea3521b34235bcccaa667b5 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 15 Dec 2015 11:39:17 -0500
Subject: [PATCH 0772/2267] Add note about fastcgi usage

libapache2-mod-fastcgi exists only in multiverse for Ubuntu, so warn
the user they need to enable it.

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 README.md                     | 2 ++
 spec/acceptance/vhost_spec.rb | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 5c0f81655a..57ba525bfa 100644
--- a/README.md
+++ b/README.md
@@ -3228,6 +3228,8 @@ Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/cu
 
 This type is intended for use with mod_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
 
+** Note ** If using Ubuntu 10.04+, you'll need to manually enable the multiverse repository.
+
 Ex:
 
 ~~~ puppet
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 552318c204..a51ab58223 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1330,6 +1330,13 @@ class { 'apache': }
     describe 'fastcgi' do
       it 'applies cleanly' do
         pp = <<-EOS
+          if ($::operatingsystem == 'Ubuntu' and versioncpm($::operatingsystemrelease, '10.04' >= 0)) {
+            include ::apt
+            apt::ppa { 'multiverse':
+              before => Class['Apache::Mod::Fastcgi'],
+            }
+          }
+
           class { 'apache': }
           class { 'apache::mod::fastcgi': }
           host { 'test.server': ip => '127.0.0.1' }

From af214ea39edca965c1ba481f6287759e63112afd Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 15 Dec 2015 14:23:32 -0500
Subject: [PATCH 0773/2267] Fix syntax error with versioncmp

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index a51ab58223..5d0294130e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1330,7 +1330,7 @@ class { 'apache': }
     describe 'fastcgi' do
       it 'applies cleanly' do
         pp = <<-EOS
-          if ($::operatingsystem == 'Ubuntu' and versioncpm($::operatingsystemrelease, '10.04' >= 0)) {
+          if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '10.04') >= 0 {
             include ::apt
             apt::ppa { 'multiverse':
               before => Class['Apache::Mod::Fastcgi'],

From 924511e1b1ceef79cd06a4833f883534dd48c125 Mon Sep 17 00:00:00 2001
From: Timo Goebel <mail@timogoebel.name>
Date: Tue, 15 Dec 2015 22:40:44 +0100
Subject: [PATCH 0774/2267] fix validation error when empty array is passed as
 rewrites parameter

Manifest compilation fails when an empty array is passed as rewrites
parameter to vhost defined type.
This commit makes the code to compile nicely.
---
 manifests/vhost.pp         |  4 +++-
 spec/defines/vhost_spec.rb | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7e48317a8d..99ce02c58d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -158,7 +158,9 @@
   validate_bool($ssl_proxyengine)
   if $rewrites {
     validate_array($rewrites)
-    validate_hash($rewrites[0])
+    unless empty($rewrites) {
+      validate_hash($rewrites[0])
+    }
   }
 
   # Input validation begins
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9dd563a9c6..4ac727ea9b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -776,6 +776,18 @@
     end
   end # access logs
   describe 'validation' do
+    let :default_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',
+        :is_pe                  => false,
+      }
+    end
     context 'bad ensure' do
       let :params do
         {
@@ -876,6 +888,16 @@
       let :facts do default_facts end
       it { expect { is_expected.to compile }.to raise_error }
     end
+    context 'empty rewrites' do
+      let :params do
+        {
+          'docroot'  => '/rspec/docroot',
+          'rewrites' => [],
+        }
+      end
+      let :facts do default_facts end
+      it { is_expected.to compile }
+    end
     context 'bad suexec_user_group' do
       let :params do
         {

From 530adf44da90a5d7438f13fa797afddc0da60ac6 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 15 Dec 2015 16:41:24 -0500
Subject: [PATCH 0775/2267] Skip fastcgi acceptance testing for Centos 7

Since we don't have any packaging for it.

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 spec/acceptance/vhost_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 5d0294130e..a1fae93b76 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1326,7 +1326,8 @@ class { 'apache': }
   end
 
   # So what does this work on?
-  if default['platform'] !~ /^(debian-(6|7)|el-(5|6|7))/
+  # Skip Centos-7 not fastcgi packaging
+  if default['platform'] !~ /^(debian-(6|7)|el-(5|6))/
     describe 'fastcgi' do
       it 'applies cleanly' do
         pp = <<-EOS

From aae1a6664efc200640eccd203db6831dd57f8d71 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 15 Dec 2015 17:56:26 -0500
Subject: [PATCH 0776/2267] Limit fastcgi testing to Debian osfamily

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 spec/acceptance/vhost_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index a1fae93b76..322769afba 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1325,9 +1325,9 @@ class { 'apache': }
     end
   end
 
-  # So what does this work on?
-  # Skip Centos-7 not fastcgi packaging
-  if default['platform'] !~ /^(debian-(6|7)|el-(5|6))/
+  # Limit testing to Debian, since Centos does not have fastcgi package.
+  case fact('osfamily')
+  when 'Debian'
     describe 'fastcgi' do
       it 'applies cleanly' do
         pp = <<-EOS

From 2e15018dd24d74c78a50a9483cf39b791f3ff7ec Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 16 Dec 2015 16:42:09 -0700
Subject: [PATCH 0777/2267] (maint) fixes the fastcgi test for debian and older
 ubuntu releases

---
 spec/acceptance/vhost_spec.rb | 41 +++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 322769afba..adfa683968 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1331,10 +1331,43 @@ class { 'apache': }
     describe 'fastcgi' do
       it 'applies cleanly' do
         pp = <<-EOS
-          if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '10.04') >= 0 {
+          unless $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '12.04') >= 0 {
+            $_os = $::operatingsystem
+
+            if $_os == 'Ubuntu' {
+              $_location = "http://archive.ubuntu.com/"
+              $_security_location = "http://archive.ubuntu.com/"
+              $_release = $::lsbdistcodename
+              $_release_security = "${_release}-security"
+              $_repos = "main universe multiverse"
+            } else {
+              $_location = "http://httpredir.debian.org/debian/"
+              $_security_location = "http://security.debian.org/"
+              $_release = $::lsbdistcodename
+              $_release_security = "${_release}/updates"
+              $_repos = "main contrib non-free"
+            }
+
             include ::apt
-            apt::ppa { 'multiverse':
-              before => Class['Apache::Mod::Fastcgi'],
+            apt::source { "${_os}_${_release}":
+              location    => $_location,
+              release     => $_release,
+              repos       => $_repos,
+              include_src => false,
+            }
+
+            apt::source { "${_os}_${_release}-updates":
+              location    => $_location,
+              release     => "${_release}-updates",
+              repos       => $_repos,
+              include_src => false,
+            }
+
+            apt::source { "${_os}_${_release}-security":
+              location    => $_security_location,
+              release     => $_release_security,
+              repos       => $_repos,
+              include_src => false,
             }
           }
 
@@ -1348,7 +1381,7 @@ class { 'apache::mod::fastcgi': }
             fastcgi_dir    => '/tmp/fast',
           }
         EOS
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_failures => true, :acceptable_exit_codes => [0, 2])
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do

From 407af7b70d90ef2897d062bf00ca11f78cd25608 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Thu, 17 Dec 2015 18:40:33 +0100
Subject: [PATCH 0778/2267] Support proxy provider for vhost directories

This simple commmit adds the ability to use a proxy provider for
directories.

http://httpd.apache.org/docs/current/sections.html

My use case is to have a <Proxy "*"> section to apply directives to all
my proxies definitions.
---
 README.md                        | 2 +-
 spec/defines/vhost_spec.rb       | 6 ++++++
 templates/vhost/_directories.erb | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 57ba525bfa..31068f44eb 100644
--- a/README.md
+++ b/README.md
@@ -2561,7 +2561,7 @@ The `directories` parameter within the `apache::vhost` class passes an array of
 
 The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys.
 
-The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'location', 'directorymatch', 'filesmatch', or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
+The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'proxy', 'location', 'directorymatch', 'filesmatch', 'proxymatch' or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
 
 General `directories` usage looks something like
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9dd563a9c6..b0800abe42 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -187,6 +187,10 @@
               'provider' => 'files',
               'require'  => 'all granted',
             },
+            {
+              'path'     => '*',
+              'provider' => 'proxy',
+            },
             { 'path'              => '/var/www/files/indexed_directory',
               'directoryindex'    => 'disabled',
               'options'           => ['Indexes','FollowSymLinks','MultiViews'],
@@ -390,6 +394,8 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<Proxy "\*">$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Require valid-user$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index c95fda5a15..49a9bd9011 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -17,7 +17,7 @@
       <%- end -%>
     <%- end -%>
     <%- if directory['path'] and directory['path'] != '' -%>
-      <%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
+      <%- if directory['provider'] and directory['provider'].match('(directory|location|files|proxy)') -%>
         <%- if /^(.*)match$/ =~ directory['provider'] -%>
           <%- provider = $1.capitalize + 'Match' -%>
         <%- else -%>

From e90496f9671333eec2ffb1eeb1afe7bbdfc27059 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Thu, 17 Dec 2015 15:28:29 -0700
Subject: [PATCH 0779/2267] (maint) fixes fastcgi tests on ubuntu lucid

---
 spec/acceptance/vhost_spec.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index adfa683968..9d5306b282 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1370,7 +1370,12 @@ class { 'apache': }
               include_src => false,
             }
           }
+        EOS
+
+        #apt-get update may not run clean here. Should be OK.
+        apply_manifest(pp, :catch_failures => false)
 
+        pp2 = <<-EOS
           class { 'apache': }
           class { 'apache::mod::fastcgi': }
           host { 'test.server': ip => '127.0.0.1' }
@@ -1381,7 +1386,7 @@ class { 'apache::mod::fastcgi': }
             fastcgi_dir    => '/tmp/fast',
           }
         EOS
-        apply_manifest(pp, :catch_failures => true, :acceptable_exit_codes => [0, 2])
+        apply_manifest(pp2, :catch_failures => true, :acceptable_exit_codes => [0, 2])
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do

From e6837d8a5e8f481295fe1a45d9d1a6bd950c4028 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 18 Dec 2015 12:52:26 +0300
Subject: [PATCH 0780/2267] Add X-Forwarded-For into log_formats defaults

In order to log the X-Forwarded-For client ip address or the real
client ip address add LogFormats default directive.
---
 templates/httpd.conf.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index cc6998b9b9..9c854cfc31 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -77,6 +77,9 @@ LogFormat "%{Referer}i -> %U" referer
 <% unless @log_formats.has_key?('agent') -%>
 LogFormat "%{User-agent}i" agent
 <% end -%>
+<% unless @log_formats.has_key?('forwarded') -%>
+LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
+<% end -%>
 <% if @log_formats and !@log_formats.empty? -%>
   <%- @log_formats.sort.each do |nickname,format| -%>
 LogFormat "<%= format -%>" <%= nickname %>

From 1dfc02d9036e501570aebabc8d02945073e33a6d Mon Sep 17 00:00:00 2001
From: wolfgang hotwagner <wolfgang.hotwagner@toscom.at>
Date: Wed, 4 Nov 2015 23:12:42 +0100
Subject: [PATCH 0781/2267] 	Added support for modsecurity parameter
 SecPcreMatchLimit and SecPcreMatchLimitRecursion

fixed default variables for secpcrematchlimit(recursion) in params.pp

added documentation for SecPcreMatchLimit and SecPcreMatchLimitRecursion. also changed the default value to 1500(its modsecurity's default value)

removed modsec_-prefix from variable names
---
 README.md                       | 2 ++
 manifests/mod/security.pp       | 4 ++++
 manifests/params.pp             | 4 ++++
 templates/mod/security.conf.erb | 4 ++--
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 57ba525bfa..aeef9705d4 100644
--- a/README.md
+++ b/README.md
@@ -1631,6 +1631,8 @@ ${modsec_dir}/activated_rules.
 - `modsec_secruleengine`: Configures the modsec rules engine. Valid options: 'On', 'Off', and 'DetectionOnly'. Default: `modsec_secruleengine` in [`apache::params`][].
 - `restricted_extensions`: A space-separated list of prohibited file extensions. Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
 - `restricted_headers`: A list of restricted headers separated by slashes and spaces. Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
+- `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. Default: '1500'
+- `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
 
 ##### Class: `apache::mod::wsgi`
 
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 050b1bd6fa..c4b8c6407f 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -3,6 +3,8 @@
   $activated_rules       = $::apache::params::modsec_default_rules,
   $modsec_dir            = $::apache::params::modsec_dir,
   $modsec_secruleengine  = $::apache::params::modsec_secruleengine,
+  $secpcrematchlimit = $::apache::params::secpcrematchlimit,
+  $secpcrematchlimitrecursion = $::apache::params::secpcrematchlimitrecursion,
   $allowed_methods       = 'GET HEAD POST OPTIONS',
   $content_types         = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
   $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
@@ -32,6 +34,8 @@
 
   # Template uses:
   # - $modsec_dir
+  # - secpcrematchlimit
+  # - secpcrematchlimitrecursion
   file { 'security.conf':
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
diff --git a/manifests/params.pp b/manifests/params.pp
index 9e8cad39b4..6aba3f56f3 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -153,6 +153,8 @@
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
+    $secpcrematchlimit = 1500
+    $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
     $modsec_default_rules = [
       'base_rules/modsecurity_35_bad_robots.data',
@@ -248,6 +250,8 @@
     $modsec_crs_package   = 'modsecurity-crs'
     $modsec_crs_path      = '/usr/share/modsecurity-crs'
     $modsec_dir           = '/etc/modsecurity'
+    $secpcrematchlimit = 1500
+    $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
     $modsec_default_rules = [
       'base_rules/modsecurity_35_bad_robots.data',
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 7b2da76135..a71f5887d1 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -37,8 +37,8 @@
     SecRule MULTIPART_UNMATCHED_BOUNDARY "!@eq 0" \
       "id:'200003',phase:2,t:none,log,deny,status:44,msg:'Multipart parser detected a possible unmatched boundary.'"
 
-    SecPcreMatchLimit 1000
-    SecPcreMatchLimitRecursion 1000
+    SecPcreMatchLimit <%= @secpcrematchlimit %>
+    SecPcreMatchLimitRecursion <%= @secpcrematchlimitrecursion %>
 
     SecRule TX:/^MSC_/ "!@streq 0" \
       "id:'200004',phase:2,t:none,deny,msg:'ModSecurity internal error flagged: %{MATCHED_VAR_NAME}'"

From 6b8aa3ae30d5033b88d57eae622a8bfef91f1bf8 Mon Sep 17 00:00:00 2001
From: Devin Christensen <quixoten@gmail.com>
Date: Thu, 17 Dec 2015 13:35:00 -0700
Subject: [PATCH 0782/2267] Put headers and request headers before proxy

---
 manifests/vhost.pp | 68 +++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 99ce02c58d..9ce9a91f4d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -676,6 +676,26 @@
     }
   }
 
+  # Template uses:
+  # - $headers
+  if $headers and ! empty($headers) {
+    concat::fragment { "${name}-header":
+      target  => "${priority_real}${filename}.conf",
+      order   => 140,
+      content => template('apache/vhost/_header.erb'),
+    }
+  }
+
+  # Template uses:
+  # - $request_headers
+  if $request_headers and ! empty($request_headers) {
+    concat::fragment { "${name}-requestheader":
+      target  => "${priority_real}${filename}.conf",
+      order   => 150,
+      content => template('apache/vhost/_requestheader.erb'),
+    }
+  }
+
   # Template uses:
   # - $proxy_dest
   # - $proxy_pass
@@ -685,7 +705,7 @@
   if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match {
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}${filename}.conf",
-      order   => 140,
+      order   => 160,
       content => template('apache/vhost/_proxy.erb'),
     }
   }
@@ -695,7 +715,7 @@
   if $rack_base_uris {
     concat::fragment { "${name}-rack":
       target  => "${priority_real}${filename}.conf",
-      order   => 150,
+      order   => 170,
       content => template('apache/vhost/_rack.erb'),
     }
   }
@@ -705,7 +725,7 @@
   if $passenger_base_uris {
     concat::fragment { "${name}-passenger_uris":
       target  => "${priority_real}${filename}.conf",
-      order   => 155,
+      order   => 175,
       content => template('apache/vhost/_passenger_base_uris.erb'),
     }
   }
@@ -726,7 +746,7 @@
   if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp and $redirectmatch_dest) {
     concat::fragment { "${name}-redirect":
       target  => "${priority_real}${filename}.conf",
-      order   => 160,
+      order   => 180,
       content => template('apache/vhost/_redirect.erb'),
     }
   }
@@ -740,7 +760,7 @@
   if $rewrites or $rewrite_rule {
     concat::fragment { "${name}-rewrite":
       target  => "${priority_real}${filename}.conf",
-      order   => 170,
+      order   => 190,
       content => template('apache/vhost/_rewrite.erb'),
     }
   }
@@ -751,7 +771,7 @@
   if ( $scriptalias or $scriptaliases != [] ) {
     concat::fragment { "${name}-scriptalias":
       target  => "${priority_real}${filename}.conf",
-      order   => 180,
+      order   => 200,
       content => template('apache/vhost/_scriptalias.erb'),
     }
   }
@@ -761,7 +781,7 @@
   if $serveraliases and ! empty($serveraliases) {
     concat::fragment { "${name}-serveralias":
       target  => "${priority_real}${filename}.conf",
-      order   => 190,
+      order   => 210,
       content => template('apache/vhost/_serveralias.erb'),
     }
   }
@@ -772,7 +792,7 @@
   if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
     concat::fragment { "${name}-setenv":
       target  => "${priority_real}${filename}.conf",
-      order   => 200,
+      order   => 220,
       content => template('apache/vhost/_setenv.erb'),
     }
   }
@@ -798,7 +818,7 @@
   if $ssl {
     concat::fragment { "${name}-ssl":
       target  => "${priority_real}${filename}.conf",
-      order   => 210,
+      order   => 230,
       content => template('apache/vhost/_ssl.erb'),
     }
   }
@@ -811,7 +831,7 @@
   if $ssl_proxyengine {
     concat::fragment { "${name}-sslproxy":
       target  => "${priority_real}${filename}.conf",
-      order   => 210,
+      order   => 230,
       content => template('apache/vhost/_sslproxy.erb'),
     }
   }
@@ -827,7 +847,7 @@
   if $auth_kerb {
     concat::fragment { "${name}-auth_kerb":
       target  => "${priority_real}${filename}.conf",
-      order   => 210,
+      order   => 230,
       content => template('apache/vhost/_auth_kerb.erb'),
     }
   }
@@ -839,7 +859,7 @@
   if $suphp_engine == 'on' {
     concat::fragment { "${name}-suphp":
       target  => "${priority_real}${filename}.conf",
-      order   => 220,
+      order   => 240,
       content => template('apache/vhost/_suphp.erb'),
     }
   }
@@ -850,7 +870,7 @@
   if ($php_values and ! empty($php_values)) or ($php_flags and ! empty($php_flags)) {
     concat::fragment { "${name}-php":
       target  => "${priority_real}${filename}.conf",
-      order   => 220,
+      order   => 240,
       content => template('apache/vhost/_php.erb'),
     }
   }
@@ -860,29 +880,9 @@
   # - $php_admin_flags
   if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) {
     concat::fragment { "${name}-php_admin":
-      target  => "${priority_real}${filename}.conf",
-      order   => 230,
-      content => template('apache/vhost/_php_admin.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $headers
-  if $headers and ! empty($headers) {
-    concat::fragment { "${name}-header":
-      target  => "${priority_real}${filename}.conf",
-      order   => 240,
-      content => template('apache/vhost/_header.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $request_headers
-  if $request_headers and ! empty($request_headers) {
-    concat::fragment { "${name}-requestheader":
       target  => "${priority_real}${filename}.conf",
       order   => 250,
-      content => template('apache/vhost/_requestheader.erb'),
+      content => template('apache/vhost/_php_admin.erb'),
     }
   }
 

From f001dfb231f41aac73d97a7878eb29c9e4880c24 Mon Sep 17 00:00:00 2001
From: Onur Cem Celebi <onur_cem.celebi@baloise.com>
Date: Tue, 22 Dec 2015 17:54:08 +0100
Subject: [PATCH 0783/2267] Support ProxPassReverseCookieDomain directive
 (mod_proxy)

---
 README.md                  |  4 ++--
 spec/defines/vhost_spec.rb | 16 ++++++++++++----
 templates/vhost/_proxy.erb |  7 ++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 57ba525bfa..bd879ed59f 100644
--- a/README.md
+++ b/README.md
@@ -2260,13 +2260,13 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/f', 'url' => 'http://backend-f/',
       'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
     { 'path' => '/g', 'url' => 'http://backend-g/',
-      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}], },
+      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
   ],
 }
 ~~~
 
 `reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
-`reverse_cookies` is optional and is used to set ProxyPassReverseCookiePath.
+`reverse_cookies` is optional and is used to set ProxyPassReverseCookiePath and/or ProxyPassReverseCookieDomain.
 `params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
 `setenv` is optional and is an array to set environment variables for the proxy directive, for details see http://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9dd563a9c6..0096e06029 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -219,10 +219,16 @@
               'path'            => '/a',
               'url'             => 'http://backend-a/',
               'keywords'        => ['noquery', 'interpolate'],
-              'reverse_cookies' => [{
-                'path'          => '/a',
-                'url'           => 'http://backend-a/',
-              }],
+              'reverse_cookies' => [
+								{
+                  'path'          => '/a',
+                  'url'           => 'http://backend-a/',
+                },
+                {
+                  'domain' => 'foo',
+                  'url'    => 'http://foo',
+                }
+              ],
               'params'          => {
                       'retry'   => '0',
                       'timeout' => '5'
@@ -425,6 +431,8 @@
               /noquery interpolate/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
               /ProxyPassReverseCookiePath\s+\/a\s+http:\/\//) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 3f94af9112..9e9c05170f 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -20,7 +20,12 @@
   <Location <%= proxy['path']%>>
   <%- if not proxy['reverse_cookies'].nil? -%>
     <%- Array(proxy['reverse_cookies']).each do |reverse_cookies| -%>
-    ProxyPassReverseCookiePath <%= reverse_cookies['path'] %> <%= reverse_cookies['url'] %>
+      <%- if reverse_cookies['path'] -%>
+        ProxyPassReverseCookiePath <%= reverse_cookies['path'] %> <%= reverse_cookies['url'] %>
+      <%- end -%>
+      <%- if reverse_cookies['domain'] -%>
+        ProxyPassReverseCookieDomain <%= reverse_cookies['domain'] %> <%= reverse_cookies['url'] %>
+      <%- end -%>
     <%- end -%>
   <%- end -%>
   <%- if proxy['reverse_urls'].nil? -%>

From 7db484aacbebba67a879b195d83bfc604c619daf Mon Sep 17 00:00:00 2001
From: Onur Cem Celebi <onur_cem.celebi@baloise.com>
Date: Fri, 18 Dec 2015 08:55:43 +0100
Subject: [PATCH 0784/2267] Add ProxyPreserveHost off mode explicitly

---
 templates/vhost/_proxy.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 3f94af9112..c34153b4e9 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -5,6 +5,8 @@
 <%- end -%>
 <% if @proxy_preserve_host -%>
   ProxyPreserveHost On
+<% else -%>
+  ProxyPreserveHost Off
 <%- end -%>
 <% if @proxy_error_override -%>
   ProxyErrorOverride On

From 0ab0e393f0e7254bc28f69b624cf212f120a254c Mon Sep 17 00:00:00 2001
From: Onur Cem Celebi <onur_cem.celebi@baloise.com>
Date: Fri, 18 Dec 2015 08:14:41 +0100
Subject: [PATCH 0785/2267] Support the mod_ssl SSLProxyVerify directive

---
 README.md                     | 4 ++++
 manifests/vhost.pp            | 6 ++++++
 spec/defines/vhost_spec.rb    | 1 +
 templates/vhost/_sslproxy.erb | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 57ba525bfa..49ef133f49 100644
--- a/README.md
+++ b/README.md
@@ -3174,6 +3174,10 @@ Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#
     }
 ~~~
 
+##### `ssl_proxy_verify`
+
+Sets the [SSLProxyVerify](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server.  Defaults to 'undef'.
+
 ##### `ssl_proxy_machine_cert`
 
 Sets the [SSLProxyMachineCertificateFile](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers.  This file should be a concatenation of the PEM-encoded certificate files in order of preference.  Defaults to 'undef'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7e48317a8d..21abb13fbe 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -25,6 +25,7 @@
   $ssl_honorcipherorder        = undef,
   $ssl_verify_client           = undef,
   $ssl_verify_depth            = undef,
+  $ssl_proxy_verify            = undef,
   $ssl_proxy_check_peer_cn     = undef,
   $ssl_proxy_check_peer_name   = undef,
   $ssl_proxy_machine_cert      = undef,
@@ -234,6 +235,10 @@
     validate_string($docroot)
   }
 
+  if $ssl_proxy_verify {
+    validate_re($ssl_proxy_verify,'^(none|optional|require|optional_no_ca)$',"${ssl_proxy_verify} is not permitted for ssl_proxy_verify. Allowed values are 'none', 'optional', 'require' or 'optional_no_ca'.")
+  }
+
   if $ssl_proxy_check_peer_cn {
     validate_re($ssl_proxy_check_peer_cn,'(^on$|^off$)',"${ssl_proxy_check_peer_cn} is not permitted for ssl_proxy_check_peer_cn. Allowed values are 'on' or 'off'.")
   }
@@ -803,6 +808,7 @@
 
   # Template uses:
   # - $ssl_proxyengine
+  # - $ssl_proxy_verify
   # - $ssl_proxy_check_peer_cn
   # - $ssl_proxy_check_peer_name
   # - $ssl_proxy_machine_cert
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9dd563a9c6..edc87d12c7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -154,6 +154,7 @@
           'ssl_verify_depth'            => '3',
           'ssl_options'                 => '+ExportCertData',
           'ssl_openssl_conf_cmd'        => 'DHParameters "foo.pem"',
+          'ssl_proxy_verify'            => 'require',
           'ssl_proxy_check_peer_cn'     => 'on',
           'ssl_proxy_check_peer_name'   => 'on',
           'ssl_proxyengine'             => true,
diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
index e58d52d0ba..568d9d1d0d 100644
--- a/templates/vhost/_sslproxy.erb
+++ b/templates/vhost/_sslproxy.erb
@@ -2,6 +2,9 @@
 
   # SSL Proxy directives
   SSLProxyEngine On
+  <%- if @ssl_proxy_verify -%>
+  SSLProxyVerify <%= @ssl_proxy_verify %>
+  <%- end -%>
   <%- if @ssl_proxy_check_peer_cn -%>
   SSLProxyCheckPeerCN     <%= @ssl_proxy_check_peer_cn %>
   <%- end -%>

From e825422b0080e66b32cd05ed51b5ccae69325c74 Mon Sep 17 00:00:00 2001
From: Jason Hancock <jason.b.hancock@jpl.nasa.gov>
Date: Thu, 17 Dec 2015 10:41:15 -0800
Subject: [PATCH 0786/2267] EL7 uses conf.modules.d directory for modules.

This is briefly mentioned in
[MODULES-1734](https://tickets.puppetlabs.com/browse/MODULES-1734), but
the EL7 uses the conf.modules.d directory for module configuration.

Also cleaned up some of the acceptance tests to use the common config in
`version.rb` to DRY
---
 manifests/params.pp                     |  5 +++-
 spec/acceptance/apache_ssl_spec.rb      | 11 ++-------
 spec/acceptance/class_spec.rb           | 22 ++++-------------
 spec/acceptance/default_mods_spec.rb    | 30 +++++++----------------
 spec/acceptance/mod_dav_svn_spec.rb     | 15 ++++--------
 spec/acceptance/mod_deflate_spec.rb     | 20 +++-------------
 spec/acceptance/mod_mime_spec.rb        | 20 +++-------------
 spec/acceptance/mod_negotiation_spec.rb | 32 ++++++-------------------
 spec/acceptance/mod_pagespeed_spec.rb   | 23 ++----------------
 spec/acceptance/mod_passenger_spec.rb   | 14 +++++------
 spec/acceptance/mod_php_spec.rb         | 32 ++++++-------------------
 spec/acceptance/mod_proxy_html_spec.rb  | 14 ++---------
 spec/acceptance/mod_security_spec.rb    | 30 ++++++++---------------
 spec/acceptance/prefork_worker_spec.rb  | 18 ++++----------
 spec/acceptance/version.rb              |  3 ++-
 spec/classes/mod/security_spec.rb       |  2 +-
 16 files changed, 70 insertions(+), 221 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 9e8cad39b4..ab6c0d1e83 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -62,7 +62,10 @@
     $server_root          = '/etc/httpd'
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
-    $mod_dir              = "${httpd_dir}/conf.d"
+    $mod_dir              = $::apache::version::distrelease ? {
+      '7'     => "${httpd_dir}/conf.modules.d",
+      default => "${httpd_dir}/conf.d",
+    }
     $mod_enable_dir       = undef
     $vhost_dir            = "${httpd_dir}/conf.d"
     $vhost_enable_dir     = undef
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index ccf65c7273..254a3c35a2 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -1,13 +1,6 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-case fact('osfamily')
-when 'RedHat'
-  vhostd = '/etc/httpd/conf.d'
-when 'Debian'
-  vhostd = '/etc/apache2/sites-available'
-end
-
 describe 'apache ssl' do
 
   describe 'ssl parameters' do
@@ -28,7 +21,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhostd}/15-default-ssl.conf") do
+    describe file("#{$vhost_dir}/15-default-ssl.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
@@ -74,7 +67,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhostd}/25-test_ssl.conf") do
+    describe file("#{$vhost_dir}/25-test_ssl.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 47b0d36fa0..0e797b61d8 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -1,21 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache class' do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name = 'httpd'
-    service_name = 'httpd'
-  when 'Debian'
-    package_name = 'apache2'
-    service_name = 'apache2'
-  when 'FreeBSD'
-    package_name = 'apache24'
-    service_name = 'apache24'
-  when 'Gentoo'
-    package_name = 'www-servers/apache'
-    service_name = 'apache2'
-  end
-
   context 'default parameters' do
     it 'should work with no errors' do
       pp = <<-EOS
@@ -27,11 +13,11 @@ class { 'apache': }
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
-    describe package(package_name) do
+    describe package($package_name) do
       it { is_expected.to be_installed }
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -80,7 +66,7 @@ class { 'apache':
       apply_manifest(pp, :catch_changes => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index c2d6a8c26d..8cfc531b1d 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -1,19 +1,5 @@
 require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  mod_dir     = '/etc/httpd/conf.d'
-  servicename = 'httpd'
-when 'Debian'
-  mod_dir     = '/etc/apache2/mods-available'
-  servicename = 'apache2'
-when 'FreeBSD'
-  mod_dir     = '/usr/local/etc/apache24/Modules'
-  servicename = 'apache24'
-when 'Gentoo'
-  mod_dir     = '/etc/apache2/modules.d'
-  servicename = 'apache2'
-end
+require_relative './version.rb'
 
 describe 'apache::default_mods class' do
   describe 'no default mods' do
@@ -30,7 +16,7 @@ class { 'apache':
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.to be_running }
     end
   end
@@ -56,12 +42,12 @@ class { 'apache':
     end
 
     # Are these the same?
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.not_to be_running }
     end
-    describe "service #{servicename}" do
+    describe "service #{$service_name}" do
       it 'should not be running' do
-        shell("pidof #{servicename}", {:acceptable_exit_codes => 1})
+        shell("pidof #{$service_name}", {:acceptable_exit_codes => 1})
       end
     end
   end
@@ -94,7 +80,7 @@ class { 'apache':
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.to be_running }
     end
   end
@@ -112,11 +98,11 @@ class { 'apache': default_mods => false }
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/zz_auth_basic.load") do
+    describe file("#{$mod_dir}/zz_auth_basic.load") do
       it { is_expected.to be_file }
     end
   end
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 10c9b77d75..e4092d03a1 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -1,22 +1,17 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') do
   case fact('osfamily')
   when 'Debian'
-    mod_dir             = '/etc/apache2/mods-available'
-    service_name        = 'apache2'
     if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'
     end
   when 'RedHat'
-    mod_dir             = '/etc/httpd/conf.d'
-    service_name        = 'httpd'
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   when 'FreeBSD'
-    mod_dir             = '/usr/local/etc/apache24/Modules'
-    service_name        = 'apache24'
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   end
 
@@ -29,12 +24,12 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/dav_svn.load") do
+    describe file("#{$mod_dir}/dav_svn.load") do
       it { is_expected.to contain "LoadModule dav_svn_module" }
     end
   end
@@ -50,12 +45,12 @@ class { 'apache::mod::dav_svn':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/#{authz_svn_load_file}") do
+    describe file("#{$mod_dir}/#{authz_svn_load_file}") do
       it { is_expected.to contain "LoadModule authz_svn_module" }
     end
   end
diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
index 3b505bdbfd..c1ee4d3848 100644
--- a/spec/acceptance/mod_deflate_spec.rb
+++ b/spec/acceptance/mod_deflate_spec.rb
@@ -1,21 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::deflate class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default deflate config" do
     it 'succeeds in puppeting deflate' do
       pp= <<-EOS
@@ -25,12 +11,12 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/deflate.conf") do
+    describe file("#{$mod_dir}/deflate.conf") do
       it { is_expected.to contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" }
       it { is_expected.to contain "AddOutputFilterByType DEFLATE text/css" }
       it { is_expected.to contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" }
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index e47360b5e0..ead76adc17 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -1,21 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::mime class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default mime config" do
     it 'succeeds in puppeting mime' do
       pp= <<-EOS
@@ -25,12 +11,12 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/mime.conf") do
+    describe file("#{$mod_dir}/mime.conf") do
       it { is_expected.to contain "AddType application/x-compress .Z" }
       it { is_expected.to contain "AddHandler type-map var\n" }
       it { is_expected.to contain "AddType text/html .shtml\n" }
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
index 48eb896b67..142b412ade 100644
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -1,25 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::negotiation class' do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache24/Vhosts'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    vhost_dir    = '/etc/apache2/vhosts.d'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default negotiation config" do
     it 'succeeds in puppeting negotiation' do
       pp= <<-EOS
@@ -29,12 +11,12 @@ class { '::apache::mod::negotiation': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{mod_dir}/negotiation.conf") do
+    describe file("#{$mod_dir}/negotiation.conf") do
       it { should contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
 ForceLanguagePriority Prefer Fallback" }
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end
@@ -51,11 +33,11 @@ class { '::apache::mod::negotiation':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{mod_dir}/negotiation.conf") do
+    describe file("#{$mod_dir}/negotiation.conf") do
       it { should contain "ForceLanguagePriority Prefer" }
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end
@@ -72,11 +54,11 @@ class { '::apache::mod::negotiation':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{mod_dir}/negotiation.conf") do
+    describe file("#{$mod_dir}/negotiation.conf") do
       it { should contain "LanguagePriority en es" }
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index f8060a167e..ab50a54d0e 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -1,25 +1,6 @@
 require 'spec_helper_acceptance'
 
 describe 'apache::mod::pagespeed class' do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache24/Vhosts'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    vhost_dir    = '/etc/apache2/vhosts.d'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default pagespeed config" do
     it 'succeeds in puppeting pagespeed' do
       pp= <<-EOS
@@ -66,12 +47,12 @@ class { 'apache::mod::pagespeed':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/pagespeed.conf") do
+    describe file("#{$mod_dir}/pagespeed.conf") do
       it { is_expected.to contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" }
       it { is_expected.to contain "ModPagespeedEnableFilters remove_comments" }
       it { is_expected.to contain "ModPagespeedDisableFilters extend_cache" }
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index df9cd9e13e..88c8aff329 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::passenger class' do
   case fact('osfamily')
   when 'Debian'
-    service_name = 'apache2'
     mod_dir = '/etc/apache2/mods-available/'
-    conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}zpassenger.load"
+    conf_file = "#{$mod_dir}/passenger.conf"
+    load_file = "#{$mod_dir}/zpassenger.load"
 
     case fact('operatingsystem')
     when 'Ubuntu'
@@ -46,10 +46,8 @@
     rackapp_user = 'www-data'
     rackapp_group = 'www-data'
   when 'RedHat'
-    service_name = 'httpd'
-    mod_dir = '/etc/httpd/conf.d/'
-    conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}zpassenger.load"
+    conf_file = "#{$mod_dir}/passenger.conf"
+    load_file = "#{$mod_dir}/zpassenger.load"
     # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part
     passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.1'
     passenger_ruby = '/usr/bin/ruby'
@@ -98,7 +96,7 @@ class { 'apache::mod::passenger': }
         apply_manifest(pp, :catch_failures => true)
       end
 
-      describe service(service_name) do
+      describe service($service_name) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index a42f523738..a5529851fb 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,25 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::php class' do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache24/Vhosts'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    vhost_dir    = '/etc/apache2/vhosts.d'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default php config" do
     it 'succeeds in puppeting php' do
       pp= <<-EOS
@@ -40,12 +22,12 @@ class { 'apache::mod::php': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/php5.conf") do
+    describe file("#{$mod_dir}/php5.conf") do
       it { is_expected.to contain "DirectoryIndex index.php" }
     end
 
@@ -83,12 +65,12 @@ class { 'apache::mod::php':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{vhost_dir}/25-php.example.com.conf") do
+    describe file("#{$vhost_dir}/25-php.example.com.conf") do
       it { is_expected.to contain "  php_flag display_errors on" }
       it { is_expected.to contain "  php_value include_path .:/usr/share/pear:/usr/bin/php" }
       it { is_expected.to contain "  php_admin_flag engine on" }
@@ -116,7 +98,7 @@ class {'apache::mod::php':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{mod_dir}/php5.conf") do
+    describe file("#{$mod_dir}/php5.conf") do
       it { should contain "# somecontent" }
     end
   end
@@ -135,7 +117,7 @@ class {'apache::mod::php':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{mod_dir}/php5.conf") do
+    describe file("#{$mod_dir}/php5.conf") do
       it { should contain "# somecontent" }
     end
   end
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index 840ea563f1..3e11586917 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -1,17 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::proxy_html class' do
-  case fact('osfamily')
-  when 'Debian'
-    service_name = 'apache2'
-  when 'RedHat'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    service_name = 'apache24'
-  when 'Gentoo'
-    service_name = 'apache2'
-  end
-
   context "default proxy_html config" do
     if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
       it 'adds epel' do
@@ -33,7 +23,7 @@ class { 'apache::mod::proxy_html': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 4fcf0f551b..75f4175881 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -1,17 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::security class', :unless => (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy')) do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-    package_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-    package_name = 'httpd'
-  end
-
   context "default mod_security config" do
     if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
       it 'adds epel' do
@@ -54,16 +44,16 @@ class { 'apache::mod::security': }
       end
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe package(package_name) do
+    describe package($package_name) do
       it { is_expected.to be_installed }
     end
 
-    describe file("#{mod_dir}/security.conf") do
+    describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain "mod_security2.c" }
     end
 
@@ -100,12 +90,12 @@ class { 'apache::mod::security': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/security.conf") do
+    describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain "mod_security2.c" }
     end
 
@@ -152,12 +142,12 @@ class { 'apache::mod::security': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/security.conf") do
+    describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain "mod_security2.c" }
     end
 
@@ -208,12 +198,12 @@ class { 'apache::mod::security': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/security.conf") do
+    describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain "mod_security2.c" }
     end
 
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 234b6acefb..7ba13950d5 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -1,15 +1,5 @@
 require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  servicename = 'httpd'
-when 'Debian'
-  servicename = 'apache2'
-when 'FreeBSD'
-  servicename = 'apache24'
-when 'Gentoo'
-  servicename = 'apache2'
-end
+require_relative './version.rb'
 
 case fact('osfamily')
 when 'FreeBSD'
@@ -29,7 +19,7 @@ class { 'apache':
       end
     end
 
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -52,7 +42,7 @@ class { 'apache':
     end
   end
 
-  describe service(servicename) do
+  describe service($service_name) do
     it { is_expected.to be_running }
     it { is_expected.to be_enabled }
   end
@@ -74,7 +64,7 @@ class { 'apache':
     end
   end
 
-  describe service(servicename) do
+  describe service($service_name) do
     it { is_expected.to be_running }
     it { is_expected.to be_enabled }
   end
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index 117e23d9fe..88cf509b7b 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -5,7 +5,6 @@
 case _osfamily
 when 'RedHat'
   $confd_dir        = '/etc/httpd/conf.d'
-  $mod_dir          = '/etc/httpd/conf.d'
   $conf_file        = '/etc/httpd/conf/httpd.conf'
   $ports_file       = '/etc/httpd/conf/ports.conf'
   $vhost_dir        = '/etc/httpd/conf.d'
@@ -19,8 +18,10 @@
 
   if (_operatingsystem == 'Fedora' and _operatingsystemrelease >= 18) or (_operatingsystem != 'Fedora' and _operatingsystemrelease >= 7)
     $apache_version = '2.4'
+    $mod_dir        = '/etc/httpd/conf.modules.d'
   else
     $apache_version = '2.2'
+    $mod_dir        = '/etc/httpd/conf.d'
   end
 when 'Debian'
   $confd_dir        = '/etc/apache2/conf.d'
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 93f751ee4e..ba0bb2f711 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -28,7 +28,7 @@
     ) }
     it { should contain_package('mod_security_crs') }
     it { should contain_file('security.conf').with(
-      :path => '/etc/httpd/conf.d/security.conf'
+      :path => '/etc/httpd/conf.modules.d/security.conf'
     ) }
     it { should contain_file('/etc/httpd/modsecurity.d').with(
       :ensure => 'directory',

From 12b695ab82c9a344e87d3f73b4dae1864cb90dac Mon Sep 17 00:00:00 2001
From: Seth Lyons <seth.lyons@gmail.com>
Date: Thu, 24 Dec 2015 21:18:04 -0500
Subject: [PATCH 0787/2267] the custom fragment needs to be indented two spaces
 so that it lines up with the rest of the configuration

---
 templates/vhost/_custom_fragment.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_custom_fragment.erb b/templates/vhost/_custom_fragment.erb
index 973964655e..35c264adb9 100644
--- a/templates/vhost/_custom_fragment.erb
+++ b/templates/vhost/_custom_fragment.erb
@@ -1,5 +1,5 @@
 <% if @custom_fragment -%>
 
   ## Custom fragment
-<%= @custom_fragment %>
+  <%= @custom_fragment %>
 <% end -%>

From 19e3ee61e8a1a0ab5d6b0288038b6750ad4c8b7f Mon Sep 17 00:00:00 2001
From: Peter Slootweg <peter.slootweg@abz.nl>
Date: Wed, 6 Jan 2016 09:43:34 +0100
Subject: [PATCH 0788/2267] (#2948) ensure order of ProxyPass and
 ProxyPassMatch parameters

change iteration over hash elements from 'each_pair' to sorted keys. As the
order of hash elements is not specified, and might be different every run,
sorted keys ensure that the order of ProxyPass and ProxyPassMatch parameters
are the same every time.
---
 templates/vhost/_proxy.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 16a889cb4c..4a918373da 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -14,7 +14,7 @@
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
-    <%- proxy['params'].each_pair do |key, value| -%> <%= key %>=<%= value -%>
+    <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
     <%- end -%>
   <%- end -%>
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
@@ -47,7 +47,7 @@
 <% [@proxy_pass_match].flatten.compact.each do |proxy| %>
   ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
-    <%- proxy['params'].each_pair do |key, value| -%> <%= key %>=<%= value -%>
+    <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
     <%- end -%>
   <%- end -%>
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>

From 2e6cd7aad53a6e9db97c618fa0a432fc3182574c Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Fri, 1 Jan 2016 12:54:48 -0500
Subject: [PATCH 0789/2267] Support itk on redhat

---
 manifests/mod/itk.pp         | 20 +++++++++++++++
 spec/acceptance/itk_spec.rb  | 10 +++++++-
 spec/classes/mod/itk_spec.rb | 49 ++++++++++++++++++++++++++++++++++++
 spec/classes/mod/php_spec.rb | 10 +++++---
 4 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 990f853eaf..6f07966755 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -54,6 +54,26 @@
   }
 
   case $::osfamily {
+    'redhat': {
+      package { 'httpd-itk':
+        ensure => present,
+      }
+      if versioncmp($apache_version, '2.4') >= 0 {
+        ::apache::mpm{ 'itk':
+          apache_version => $apache_version,
+        }
+      }
+      else {
+        file_line { '/etc/sysconfig/httpd itk enable':
+          ensure  => present,
+          path    => '/etc/sysconfig/httpd',
+          line    => 'HTTPD=/usr/sbin/httpd.itk',
+          match   => '#?HTTPD=/usr/sbin/httpd.itk',
+          require => Package['httpd'],
+          notify  => Class['apache::service'],
+        }
+      }
+    }
     'debian', 'freebsd': {
       apache::mpm{ 'itk':
         apache_version => $apache_version,
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index c220a70f88..dbc8b6251b 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -4,7 +4,15 @@
 when 'Debian'
   service_name = 'apache2'
   majrelease = fact('operatingsystemmajrelease')
-  if [ '6', '7', '10.04', '12.04'].include?(majrelease)
+  if ['6', '7', '10.04', '12.04'].include?(majrelease)
+    variant = :itk_only
+  else
+    variant = :prefork
+  end
+when 'RedHat'
+  service_name = 'httpd'
+  majrelease = fact('operatingsystemmajrelease')
+  if ['5', '6'].include?(majrelease)
     variant = :itk_only
   else
     variant = :prefork
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index cd2e6c67a7..27369f1443 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -55,6 +55,55 @@
       it { is_expected.to contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') }
     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',
+        :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.not_to contain_apache__mod('itk') }
+    it { is_expected.to contain_file("/etc/httpd/conf.d/itk.conf").with_ensure('file') }
+    it { is_expected.to contain_package("httpd-itk") }
+
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => '2.2',
+        }
+      end
+
+      it { is_expected.to contain_file_line("/etc/sysconfig/httpd itk enable").with({
+        'require' => 'Package[httpd]',
+        })
+      }
+    end
+
+    context "with Apache version >= 2.4" do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+
+      let :params do
+        {
+          :apache_version => '2.4',
+        }
+      end
+
+      it { is_expected.to contain_file("/etc/httpd/conf.d/itk.load").with({
+        'ensure'  => 'file',
+        'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n"
+        })
+      }
+    end
+  end
   context "on a FreeBSD OS" do
     let :pre_condition do
       'class { "apache": mpm_module => false, }'
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 6814b8a8f1..3aaa3d329b 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -117,9 +117,13 @@
       let :pre_condition do
         'class { "apache": mpm_module => itk, }'
       end
-      it 'should raise an error' do
-        expect { expect(subject).to contain_class("apache::mod::itk") }.to raise_error Puppet::Error, /Unsupported osfamily RedHat/
-      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::mod::itk") }
+      it { is_expected.to contain_apache__mod('php5') }
+      it { is_expected.to contain_package("php") }
+      it { is_expected.to contain_file("php5.load").with(
+        :content => "LoadModule php5_module modules/libphp5.so\n"
+      ) }
     end
   end
   describe "on a FreeBSD OS" do

From db5b0bfb09959622ea1c6cc299b58057b94c588f Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Fri, 8 Jan 2016 09:27:18 -0700
Subject: [PATCH 0790/2267] MODULES-2956: Enable options within location block
 on proxy_match

---
 README.md                  |  8 +++++---
 spec/defines/vhost_spec.rb | 12 ++++++++++++
 templates/vhost/_proxy.erb |  5 +++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b0ea212a41..fb4451021f 100644
--- a/README.md
+++ b/README.md
@@ -2242,7 +2242,7 @@ Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/
 
 ##### `proxy_pass`
 
-Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters can be added as an array.
+Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters and location options can be added as an array.
 
 ~~~ puppet
 apache::vhost { 'site.name.fdqn':
@@ -2251,6 +2251,8 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
     { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
+    { 'path' => '/c', 'url' => 'http://backend-a/c',
+      'options' => {'Require'=>'valid-user', 'AuthType'=>'Kerberos', 'AuthName'=>'Kerberos Login'}},
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
     { 'path' => '/d', 'url' => 'http://backend-a/d',
@@ -3190,12 +3192,12 @@ Sets the [SSLProxyMachineCertificateFile](http://httpd.apache.org/docs/current/m
 ~~~
 
 ##### `ssl_proxy_check_peer_cn`
- 
+
 Sets the [SSLProxyMachinePeerCN](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specified whether the remote server certificate's CN field is compared against the hostname of the request URL .  Defaults to 'undef'.
 
 
 ##### `ssl_proxy_check_peer_name`
- 
+
 Sets the [SSLProxyMachinePeerName](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specified whether the remote server certificate's CN field is compared against the hostname of the request URL .  Defaults to 'undef'.
 
 ##### `ssl_options`
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 98d70239a8..40d93a0eea 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -238,6 +238,11 @@
                       'retry'   => '0',
                       'timeout' => '5'
               },
+              'options'         => {
+                'Require'  =>'valid-user',
+                'AuthType' =>'Kerberos',
+                'AuthName' =>'"Kerberos Login"'
+              },
               'setenv'   => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'],
             }
           ],
@@ -440,6 +445,13 @@
               /ProxyPassReverseCookiePath\s+\/a\s+http:\/\//) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
               /ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /Require valid-user/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /AuthType Kerberos/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /AuthName "Kerberos Login"/) }
+
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 4a918373da..6eb0c3c9a8 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -42,6 +42,11 @@
     SetEnv <%= setenv_var %>
     <%- end -%>
   <%- end -%>
+  <%- if proxy['options'] -%>
+    <%- proxy['options'].keys.sort.each do |key| -%>
+    <%= key %> <%= proxy['options'][key] %>
+    <%- end -%>
+  <%- end -%>
   </Location>
 <% end -%>
 <% [@proxy_pass_match].flatten.compact.each do |proxy| %>

From 4ae775a3662f668deaf6a972db48947b0fa3bafb Mon Sep 17 00:00:00 2001
From: Craig Holyoak <cholyoak@redlands.qld.edu.au>
Date: Tue, 8 Dec 2015 08:21:16 +1000
Subject: [PATCH 0791/2267] Fix paths and packages for the shib2 module on
 Debian pre Jessie

---
 manifests/params.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 9e8cad39b4..644f6788f2 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -221,13 +221,20 @@
       'python'      => 'libapache2-mod-python',
       'rpaf'        => 'libapache2-mod-rpaf',
       'security'    => 'libapache2-modsecurity',
+      'shib2'       => 'libapache2-mod-shib2',
       'suphp'       => 'libapache2-mod-suphp',
       'wsgi'        => 'libapache2-mod-wsgi',
       'xsendfile'   => 'libapache2-mod-xsendfile',
       'shib2'       => 'libapache2-mod-shib2',
     }
+    if $::osfamily == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0 {
+      $shib2_lib = 'mod_shib_22.so'
+    } else {
+      $shib2_lib = 'mod_shib2.so'
+    }
     $mod_libs             = {
-      'php5' => 'libphp5.so',
+      'php5'  => 'libphp5.so',
+      'shib2' => $shib2_lib
     }
     $conf_template          = 'apache/httpd.conf.erb'
     $keepalive              = 'Off'

From 9dd474b760178fe42c7e568999099c1c87eab2c1 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Mon, 11 Jan 2016 12:57:04 +0000
Subject: [PATCH 0792/2267] fix ordering of catalogue for redhat 7

---
 manifests/mod/security.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 050b1bd6fa..4571e2fd29 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -26,7 +26,7 @@
   if $crs_package  {
     package { $crs_package:
       ensure => 'latest',
-      before => File['security.conf'],
+      before => File[$::apache::confd_dir],
     }
   }
 

From cf92e835bbdd4066fe0527398911904b3fc76aa0 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Mon, 11 Jan 2016 18:39:37 +0300
Subject: [PATCH 0793/2267] Update docs for predefined LogFormats

Add missed predefined "forwarded" log format into docs.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fb4451021f..9b1074beb1 100644
--- a/README.md
+++ b/README.md
@@ -1002,6 +1002,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combine
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
+LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
 ~~~
 
 If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition.

From d9034acf0040bb237fdc85eda29575a62d659c6d Mon Sep 17 00:00:00 2001
From: Ryan Kennedy <rkennedy@2ndwatch.com>
Date: Mon, 11 Jan 2016 11:19:11 -0800
Subject: [PATCH 0794/2267] Fixing error in Amazon $operatingsystem comparison

---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index c343a4d2b0..28692001c0 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -52,7 +52,7 @@
   } else {
     $verify_command = '/usr/sbin/apachectl -t'
   }
-  if $::osfamily == 'RedHat' or $::operatingsystem == 'amazon' {
+  if $::osfamily == 'RedHat' or $::operatingsystem =~ /^[Aa]mazon$/ {
     $user                 = 'apache'
     $group                = 'apache'
     $root_group           = 'root'

From b1d20042f02931a05c64a29fd47c9078f6c0ab43 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Tue, 12 Jan 2016 13:03:43 +0100
Subject: [PATCH 0795/2267] Add some mod::passenger documentation.

---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9b1074beb1..1caf8ae2a7 100644
--- a/README.md
+++ b/README.md
@@ -161,6 +161,7 @@
 [`mod_mpm_event`]: https://httpd.apache.org/docs/current/mod/event.html
 [`mod_negotiation`]: http://httpd.apache.org/docs/current/mod/mod_negotiation.html
 [`mod_pagespeed`]: https://developers.google.com/speed/pagespeed/module/?hl=en
+[`mod_passenger`]: https://www.phusionpassenger.com/library/config/apache/reference/
 [`mod_php`]: http://php.net/manual/en/book.apache.php
 [`mod_proxy`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html
 [`mod_proxy_balancer`]: http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
@@ -1267,7 +1268,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `negotiation`
 * `nss`*
 * `pagespeed` (see [`apache::mod::pagespeed`][])
-* `passenger`*
+* `passenger`* (see [`apache::mod::passenger`][])
 * `perl`
 * `peruser`
 * `php` (requires [`mpm_module`][] set to `prefork`)
@@ -1482,6 +1483,17 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 - `apache_version`: Default: `$::apache::apache_version`,
 - `restrict_access`: Determines whether to enable access restrictions. If 'false', the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: 'true'.
 
+##### Class: `apache::mod::passenger`
+
+Installs and manages [`mod_passenger`][].
+
+**Parameters within `apache::mod::passenger`**:
+- `passenger_high_performance` Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). Valid options: on, off. Default: undef.
+- `passenger_pool_idle_time` Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime). Default: undef
+- `passenger_max_pool_size` Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize). Default: undef.
+- `passenger_max_requests` Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests). Default: undef.
+- ...
+
 ##### Class: `apache::mod::ldap`
 
 Installs and configures [`mod_ldap`][]. Allows you to modify the

From bd6239c59d3f77962ba9785024cf87f2ef7ff74c Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Tue, 12 Jan 2016 13:15:05 +0100
Subject: [PATCH 0796/2267] (MODULES-2964) Enable PassengerMaxRequestQueueSize
 to be set

* https://tickets.puppetlabs.com/browse/MODULES-2964
* https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize
---
 README.md                          |  1 +
 manifests/mod/passenger.pp         | 47 +++++++++++++++---------------
 spec/classes/mod/passenger_spec.rb |  7 +++++
 templates/mod/passenger.conf.erb   |  3 ++
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 1caf8ae2a7..38277a326f 100644
--- a/README.md
+++ b/README.md
@@ -1491,6 +1491,7 @@ Installs and manages [`mod_passenger`][].
 - `passenger_high_performance` Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). Valid options: on, off. Default: undef.
 - `passenger_pool_idle_time` Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime). Default: undef
 - `passenger_max_pool_size` Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize). Default: undef.
+- `passenger_max_request_queue_size` Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize). Default: undef.
 - `passenger_max_requests` Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests). Default: undef.
 - ...
 
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 4f7cb7f04a..8d3622d304 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -1,27 +1,28 @@
 class apache::mod::passenger (
-  $passenger_conf_file            = $::apache::params::passenger_conf_file,
-  $passenger_conf_package_file    = $::apache::params::passenger_conf_package_file,
-  $passenger_high_performance     = undef,
-  $passenger_pool_idle_time       = undef,
-  $passenger_max_requests         = undef,
-  $passenger_spawn_method         = undef,
-  $passenger_stat_throttle_rate   = undef,
-  $rack_autodetect                = undef,
-  $rails_autodetect               = undef,
-  $passenger_root                 = $::apache::params::passenger_root,
-  $passenger_ruby                 = $::apache::params::passenger_ruby,
-  $passenger_default_ruby         = $::apache::params::passenger_default_ruby,
-  $passenger_max_pool_size        = undef,
-  $passenger_min_instances        = undef,
-  $passenger_use_global_queue     = undef,
-  $passenger_app_env              = undef,
-  $passenger_log_file             = undef,
-  $mod_package                    = undef,
-  $mod_package_ensure             = undef,
-  $mod_lib                        = undef,
-  $mod_lib_path                   = undef,
-  $mod_id                         = undef,
-  $mod_path                       = undef,
+  $passenger_conf_file              = $::apache::params::passenger_conf_file,
+  $passenger_conf_package_file      = $::apache::params::passenger_conf_package_file,
+  $passenger_high_performance       = undef,
+  $passenger_pool_idle_time         = undef,
+  $passenger_max_request_queue_size = undef,
+  $passenger_max_requests           = undef,
+  $passenger_spawn_method           = undef,
+  $passenger_stat_throttle_rate     = undef,
+  $rack_autodetect                  = undef,
+  $rails_autodetect                 = undef,
+  $passenger_root                   = $::apache::params::passenger_root,
+  $passenger_ruby                   = $::apache::params::passenger_ruby,
+  $passenger_default_ruby           = $::apache::params::passenger_default_ruby,
+  $passenger_max_pool_size          = undef,
+  $passenger_min_instances          = undef,
+  $passenger_use_global_queue       = undef,
+  $passenger_app_env                = undef,
+  $passenger_log_file               = undef,
+  $mod_package                      = undef,
+  $mod_package_ensure               = undef,
+  $mod_lib                          = undef,
+  $mod_lib_path                     = undef,
+  $mod_id                           = undef,
+  $mod_path                         = undef,
 ) {
 
   if $passenger_spawn_method {
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 34dcc5c6f3..1cae95c456 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -57,6 +57,13 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerPoolIdleTime 1200$/) }
     end
+    describe "with passenger_max_request_queue_size => 100" do
+      let :params do
+        { :passenger_max_request_queue_size => 100 }
+      end
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxRequestQueueSize 100$/) }
+    end
+
     describe "with passenger_max_requests => 20" do
       let :params do
         { :passenger_max_requests => 20 }
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 9bd13c22ac..8a3e9d4f37 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -22,6 +22,9 @@
   <%- if @passenger_pool_idle_time -%>
   PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
   <%- end -%>
+  <%- if @passenger_max_request_queue_size -%>
+  PassengerMaxRequestQueueSize <%= @passenger_max_request_queue_size %>
+  <%- end -%>
   <%- if @passenger_max_requests -%>
   PassengerMaxRequests <%= @passenger_max_requests %>
   <%- end -%>

From d4fb48aa501e0e86d4a57efd3e5fade978a24fdb Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Tue, 12 Jan 2016 13:21:26 +0000
Subject: [PATCH 0797/2267] itk tests on redhat need epel

---
 spec/acceptance/itk_spec.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index dbc8b6251b..cb0da28849 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -24,6 +24,14 @@
 end
 
 describe 'apache::mod::itk class', :if => service_name do
+  describe 'setting up epel(for itk) for redhat' do
+    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6|7)/
+      it 'adds epel' do
+        pp = "class { 'epel': }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+  end
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do

From ac31d2ec0fcaf2e962cc3d5b0590b512d69744d8 Mon Sep 17 00:00:00 2001
From: Alan Chalmers <alan.chalmers@gmail.com>
Date: Tue, 12 Jan 2016 13:53:31 +1100
Subject: [PATCH 0798/2267] MODULES-2958 : correct CustomLog syslog entry

---
 templates/vhost/_access_log.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_access_log.erb b/templates/vhost/_access_log.erb
index d1ec426a4a..894daa7ce4 100644
--- a/templates/vhost/_access_log.erb
+++ b/templates/vhost/_access_log.erb
@@ -10,7 +10,7 @@
 <%       destination = "#{@logroot}/#{log['file']}" -%>
 <%     end -%>
 <%   elsif log['syslog'] -%>
-<%     destination = "syslog" -%>
+<%     destination = log['syslog'] -%>
 <%   elsif log['pipe'] -%>
 <%     destination = log['pipe'] -%>
 <%   else -%>

From 99add117df452d2c513a3a7c36d9fd0416e696b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Wed, 13 Jan 2016 11:47:05 +0100
Subject: [PATCH 0799/2267] proxy: remove workaround for old broken clients

this has been fixed for a long time
(https://bz.apache.org/bugzilla/show_bug.cgi?id=38864) and the
workaround documented by @niq http://www.apachetutor.org/admin/reverseproxies
hasn't been necessary for a long time.
---
 templates/vhost/_proxy.erb | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 6eb0c3c9a8..1cc2720b78 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -19,27 +19,26 @@
   <%- end -%>
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
   <%- end %>
-  <Location <%= proxy['path']%>>
   <%- if not proxy['reverse_cookies'].nil? -%>
     <%- Array(proxy['reverse_cookies']).each do |reverse_cookies| -%>
       <%- if reverse_cookies['path'] -%>
-        ProxyPassReverseCookiePath <%= reverse_cookies['path'] %> <%= reverse_cookies['url'] %>
+  ProxyPassReverseCookiePath <%= reverse_cookies['path'] %> <%= reverse_cookies['url'] %>
       <%- end -%>
       <%- if reverse_cookies['domain'] -%>
-        ProxyPassReverseCookieDomain <%= reverse_cookies['domain'] %> <%= reverse_cookies['url'] %>
+  ProxyPassReverseCookieDomain <%= reverse_cookies['domain'] %> <%= reverse_cookies['url'] %>
       <%- end -%>
     <%- end -%>
   <%- end -%>
   <%- if proxy['reverse_urls'].nil? -%>
-    ProxyPassReverse <%= proxy['url'] %>
+  ProxyPassReverse <%= proxy['url'] %>
   <%- else -%>
     <%- Array(proxy['reverse_urls']).each do |reverse_url| -%>
-    ProxyPassReverse <%= reverse_url %>
+  ProxyPassReverse <%= reverse_url %>
     <%- end -%>
   <%- end -%>
   <%- if proxy['setenv'] -%>
     <%- Array(proxy['setenv']).each do |setenv_var| -%>
-    SetEnv <%= setenv_var %>
+  SetEnv <%= setenv_var %>
     <%- end -%>
   <%- end -%>
   <%- if proxy['options'] -%>
@@ -47,7 +46,6 @@
     <%= key %> <%= proxy['options'][key] %>
     <%- end -%>
   <%- end -%>
-  </Location>
 <% end -%>
 <% [@proxy_pass_match].flatten.compact.each do |proxy| %>
   ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] -%>
@@ -57,36 +55,30 @@
   <%- end -%>
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
   <%- end %>
-  <Location <%= proxy['path']%>>
   <%- if proxy['reverse_urls'].nil? -%>
-    ProxyPassReverse <%= proxy['url'] %>
+  ProxyPassReverse <%= proxy['url'] %>
   <%- else -%>
     <%- Array(proxy['reverse_urls']).each do |reverse_url| -%>
-    ProxyPassReverse <%= reverse_url %>
+  ProxyPassReverse <%= reverse_url %>
     <%- end -%>
   <%- end -%>
   <%- if proxy['setenv'] -%>
     <%- Array(proxy['setenv']).each do |setenv_var| -%>
-    SetEnv <%= setenv_var %>
+  SetEnv <%= setenv_var %>
     <%- end -%>
   <%- end -%>
-  </Location>
 <% end -%>
 <% if @proxy_dest -%>
 <%- Array(@no_proxy_uris).each do |uri| -%>
   ProxyPass        <%= uri %> !
 <% end -%>
-  ProxyPass          / <%= @proxy_dest %>/
-  <Location          />
-    ProxyPassReverse <%= @proxy_dest %>/
-  </Location>
+  ProxyPass        / <%= @proxy_dest %>/
+  ProxyPassReverse / <%= @proxy_dest %>/
 <% end -%>
 <% if @proxy_dest_match -%>
 <%- Array(@no_proxy_uris_match).each do |uri| -%>
-  ProxyPassMatch        <%= uri %> !
+  ProxyPassMatch   <%= uri %> !
 <% end -%>
-  ProxyPassMatch          / <%= @proxy_dest_match %>/
-  <Location          />
-    ProxyPassReverse <%= @proxy_dest_reverse_match %>/
-  </Location>
+  ProxyPassMatch   / <%= @proxy_dest_match %>/
+  ProxyPassReverse / <%= @proxy_dest_reverse_match %>/
 <% end -%>

From 4a8211097975c1680eb575963bd27406680e6f9d Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Thu, 14 Jan 2016 12:04:56 +0000
Subject: [PATCH 0800/2267] a path is needed for ProxyPassReverse

---
 spec/acceptance/vhost_spec.rb | 4 ++--
 templates/vhost/_proxy.erb    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 9d5306b282..d18495eab4 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1013,7 +1013,7 @@ class { 'apache': service_ensure => stopped, }
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain 'ProxyPass          / test2/' }
+      it { is_expected.to contain 'ProxyPass        / test2/' }
     end
   end
 
@@ -1076,8 +1076,8 @@ class { 'apache': service_ensure => stopped, }
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain 'ProxyPass          / http://test2/' }
       it { is_expected.to contain 'ProxyPass        http://test2/test !' }
+      it { is_expected.to contain 'ProxyPass        / http://test2/' }
     end
   end
 
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 1cc2720b78..4e36361ca1 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -30,10 +30,10 @@
     <%- end -%>
   <%- end -%>
   <%- if proxy['reverse_urls'].nil? -%>
-  ProxyPassReverse <%= proxy['url'] %>
+  ProxyPassReverse <%= proxy['path'] %> <%= proxy['url'] %>
   <%- else -%>
     <%- Array(proxy['reverse_urls']).each do |reverse_url| -%>
-  ProxyPassReverse <%= reverse_url %>
+  ProxyPassReverse <%= proxy['path'] %> <%= reverse_url %>
     <%- end -%>
   <%- end -%>
   <%- if proxy['setenv'] -%>
@@ -56,10 +56,10 @@
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
   <%- end %>
   <%- if proxy['reverse_urls'].nil? -%>
-  ProxyPassReverse <%= proxy['url'] %>
+  ProxyPassReverse <%= proxy['path'] %> <%= proxy['url'] %>
   <%- else -%>
     <%- Array(proxy['reverse_urls']).each do |reverse_url| -%>
-  ProxyPassReverse <%= reverse_url %>
+  ProxyPassReverse <%= proxy['path'] %> <%= reverse_url %>
     <%- end -%>
   <%- end -%>
   <%- if proxy['setenv'] -%>

From 42bf228282fb540eb084d048f1d69748dc48f87d Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Thu, 14 Jan 2016 18:38:56 +0000
Subject: [PATCH 0801/2267] modify tests for debian 8 and add tests

---
 spec/acceptance/apache_parameters_spec.rb  | 18 +++++-
 spec/acceptance/class_spec.rb              | 12 +++-
 spec/acceptance/itk_spec.rb                |  6 +-
 spec/acceptance/mod_dav_svn_spec.rb        | 12 +++-
 spec/acceptance/mod_deflate_spec.rb        |  6 +-
 spec/acceptance/mod_mime_spec.rb           |  6 +-
 spec/acceptance/mod_negotiation_spec.rb    | 18 +++++-
 spec/acceptance/mod_pagespeed_spec.rb      |  6 +-
 spec/acceptance/mod_passenger_spec.rb      | 11 +++-
 spec/acceptance/mod_php_spec.rb            | 12 +++-
 spec/acceptance/mod_proxy_html_spec.rb     |  6 +-
 spec/acceptance/mod_security_spec.rb       | 24 ++++++--
 spec/acceptance/mod_suphp_spec.rb          |  6 +-
 spec/acceptance/nodesets/debian-82-x64.yml | 10 ++++
 spec/acceptance/prefork_worker_spec.rb     | 18 +++++-
 spec/acceptance/vhost_spec.rb              | 68 ++++++++++++++++++----
 16 files changed, 200 insertions(+), 39 deletions(-)
 create mode 100644 spec/acceptance/nodesets/debian-82-x64.yml

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 00e486fb64..c44b2cfaec 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -55,7 +55,11 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.to be_running }
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
     end
   end
 
@@ -72,7 +76,11 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.not_to be_running }
-      it { is_expected.not_to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
     end
   end
 
@@ -90,7 +98,11 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.not_to be_running }
-      it { is_expected.not_to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
     end
   end
 
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 0e797b61d8..cd13985f69 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -18,7 +18,11 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -67,7 +71,11 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
   end
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index cb0da28849..f0f14bddc5 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -59,6 +59,10 @@ class { 'apache':
 
   describe service(service_name) do
     it { is_expected.to be_running }
-    it { is_expected.to be_enabled }
+    if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      pending 'Should be enabled - Bug 760616 on Debian 8'
+    else
+      it { should be_enabled }
+    end
   end
 end
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index e4092d03a1..9abd12aed2 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -25,7 +25,11 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -46,7 +50,11 @@ class { 'apache::mod::dav_svn':
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
index c1ee4d3848..1b55e087a1 100644
--- a/spec/acceptance/mod_deflate_spec.rb
+++ b/spec/acceptance/mod_deflate_spec.rb
@@ -12,7 +12,11 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index ead76adc17..f8bc7c15c0 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -12,7 +12,11 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
index 142b412ade..56c29e3187 100644
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -17,7 +17,11 @@ class { '::apache::mod::negotiation': }
     end
 
     describe service($service_name) do
-      it { should be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { should be_running }
     end
   end
@@ -38,7 +42,11 @@ class { '::apache::mod::negotiation':
     end
 
     describe service($service_name) do
-      it { should be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { should be_running }
     end
   end
@@ -59,7 +67,11 @@ class { '::apache::mod::negotiation':
     end
 
     describe service($service_name) do
-      it { should be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { should be_running }
     end
   end
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index ab50a54d0e..2434fbb4eb 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -48,7 +48,11 @@ class { 'apache::mod::pagespeed':
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 88c8aff329..086c93eea7 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -97,7 +97,11 @@ class { 'apache::mod::passenger': }
       end
 
       describe service($service_name) do
-        it { is_expected.to be_enabled }
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
         it { is_expected.to be_running }
       end
 
@@ -150,7 +154,7 @@ class { 'apache::mod::passenger': }
           # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
           # these two lines
           unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or
-                 (fact('operatingsystem') == 'Debian' && fact('operatingsystemrelease') == '8.0'))
+                 (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'))
             expect(r.stdout).to match(/### Processes: [0-9]+/)
             expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
           end
@@ -167,7 +171,8 @@ class { 'apache::mod::passenger': }
           shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r|
             # spacing may vary
             expect(r.stdout).to match(/[\-]+ General information [\-]+/)
-            if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
+            if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' or
+               fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
               expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/)
               expect(r.stdout).to match(/Processes[ ]+: [0-9]+/)
               expect(r.stdout).to match(/Requests in top-level queue[ ]+: [0-9]+/)
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index a5529851fb..11bcafcba5 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -23,7 +23,11 @@ class { 'apache::mod::php': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -66,7 +70,11 @@ class { 'apache::mod::php':
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index 3e11586917..f87d825837 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -24,7 +24,11 @@ class { 'apache::mod::proxy_html': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
   end
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 75f4175881..d6f2987df6 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -45,7 +45,11 @@ class { 'apache::mod::security': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -91,7 +95,11 @@ class { 'apache::mod::security': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -143,7 +151,11 @@ class { 'apache::mod::security': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -199,7 +211,11 @@ class { 'apache::mod::security': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index da2c6042e1..fb23b504d5 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -27,7 +27,11 @@ class { 'apache::mod::suphp': }
     end
 
     describe service('apache2') do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/nodesets/debian-82-x64.yml b/spec/acceptance/nodesets/debian-82-x64.yml
new file mode 100644
index 0000000000..800c49aaa4
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-82-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  debian-82:
+    roles:
+      - master
+    platform: debian-8-amd64
+    box: puppetlabs/debian-8.2-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 7ba13950d5..22eaaddeaa 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -21,7 +21,11 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.to be_running }
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
     end
   end
 end
@@ -44,7 +48,11 @@ class { 'apache':
 
   describe service($service_name) do
     it { is_expected.to be_running }
-    it { is_expected.to be_enabled }
+    if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      pending 'Should be enabled - Bug 760616 on Debian 8'
+    else
+      it { should be_enabled }
+    end
   end
 end
 
@@ -66,6 +74,10 @@ class { 'apache':
 
   describe service($service_name) do
     it { is_expected.to be_running }
-    it { is_expected.to be_enabled }
+    if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      pending 'Should be enabled - Bug 760616 on Debian 8'
+    else
+      it { should be_enabled }
+    end
   end
 end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index d18495eab4..b9b3a80acc 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -173,7 +173,11 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -213,7 +217,11 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -265,7 +273,11 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -322,7 +334,11 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { is_expected.to be_enabled }
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
         it { is_expected.to be_running }
       end
 
@@ -380,7 +396,11 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { is_expected.to be_enabled }
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
         it { is_expected.to be_running }
       end
 
@@ -414,7 +434,11 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { is_expected.to be_enabled }
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
         it { is_expected.to be_running }
       end
 
@@ -488,7 +512,11 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { should be_enabled }
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
         it { should be_running }
       end
 
@@ -523,7 +551,11 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        it { is_expected.to be_enabled }
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
         it { is_expected.to be_running }
       end
 
@@ -564,7 +596,11 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -610,7 +646,11 @@ class { 'apache': default_vhost => false, }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -651,7 +691,11 @@ class { 'apache': default_vhost => false, }
     end
 
     describe service($service_name) do
-      it { is_expected.to be_enabled }
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
       it { is_expected.to be_running }
     end
 
@@ -750,6 +794,8 @@ class { 'apache': }
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10)/
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
+      elsif fact('operatingsystem') == 'Debian' and fact('operatingsystemmajrelease') == '8'
+        it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
         it { is_expected.to contain 'NameVirtualHost test.server' }
       end

From 80fb727f1a524261dcbf3fbbf2f3d8af6209066f Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Thu, 14 Jan 2016 21:55:28 +0000
Subject: [PATCH 0802/2267] fixing apache_parameters_spec.rb

---
 spec/acceptance/apache_parameters_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index c44b2cfaec..923df6666c 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -58,7 +58,7 @@ class { 'apache':
       if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
     end
   end
@@ -79,7 +79,7 @@ class { 'apache':
       if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.not_to be_enabled }
       end
     end
   end
@@ -101,7 +101,7 @@ class { 'apache':
       if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.not_to be_enabled }
       end
     end
   end

From ee47dcbecdf93fa5e1b867495f3bbaf65bd3b84a Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Fri, 15 Jan 2016 15:15:42 +0000
Subject: [PATCH 0803/2267] install epel for RH in acceptance. clean itk test

---
 spec/acceptance/itk_spec.rb    | 22 ++++++++--------------
 spec/spec_helper_acceptance.rb |  6 ++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index f0f14bddc5..5be43b1fed 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -10,12 +10,14 @@
     variant = :prefork
   end
 when 'RedHat'
-  service_name = 'httpd'
-  majrelease = fact('operatingsystemmajrelease')
-  if ['5', '6'].include?(majrelease)
-    variant = :itk_only
-  else
-    variant = :prefork
+  unless fact('operatingsystemmajrelease') == '5'
+    service_name = 'httpd'
+    majrelease = fact('operatingsystemmajrelease')
+    if ['6'].include?(majrelease)
+      variant = :itk_only
+    else
+      variant = :prefork
+    end
   end
 when 'FreeBSD'
   service_name = 'apache24'
@@ -24,14 +26,6 @@
 end
 
 describe 'apache::mod::itk class', :if => service_name do
-  describe 'setting up epel(for itk) for redhat' do
-    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6|7)/
-      it 'adds epel' do
-        pp = "class { 'epel': }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-  end
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     it 'should work with no errors' do
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 6bfdefd714..cdaec445d8 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -43,6 +43,12 @@
       if fact('osfamily') == 'RedHat'
         on host, puppet('module','install','stahnma/epel')
         on host, puppet('module','install','puppetlabs/inifile')
+        #we need epel installed, so we can get plugins, wsgi, mime ...
+        pp = <<-EOS
+          class { 'epel': }
+        EOS
+
+        apply_manifest_on(host, pp, :catch_failures => true)
       end
 
       # Required for manifest to make mod_pagespeed repository available

From 0f01b59c8ccb303b78ac1cd433d6144f844d6daf Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Fri, 15 Jan 2016 16:39:40 +0100
Subject: [PATCH 0804/2267] add paramter to set config file permissions

---
 README.md                   |  4 ++++
 manifests/balancer.pp       |  2 +-
 manifests/fastcgi/server.pp |  2 +-
 manifests/init.pp           |  3 ++-
 manifests/mod.pp            | 10 +++++-----
 manifests/mod/event.pp      |  2 +-
 manifests/mod/itk.pp        |  2 +-
 manifests/mod/peruser.pp    |  2 +-
 manifests/mod/php.pp        |  2 +-
 manifests/mod/prefork.pp    |  2 +-
 manifests/mod/worker.pp     |  2 +-
 manifests/params.pp         |  3 +++
 manifests/vhost.pp          |  4 ++--
 manifests/vhost/custom.pp   |  2 +-
 spec/classes/apache_spec.rb | 10 ++++++++++
 spec/defines/mod_spec.rb    | 14 ++++++++++++++
 16 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 38277a326f..707720a2b6 100644
--- a/README.md
+++ b/README.md
@@ -1160,6 +1160,10 @@ Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceE
 
 Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom built rpms. This can either be 'true' or 'false, defaults to 'true'.
 
+##### `file_mode`
+
+The desired permissions mode for config files, in symbolic or numeric notation. This value must be a string. Defaults to '0644'.
+
 ##### `vhost_dir`
 
 Changes your virtual host configuration files' location. Default: determined by your operating system.
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 765dae6290..9b7511a032 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -49,7 +49,7 @@
   concat { $target:
     owner  => '0',
     group  => '0',
-    mode   => '0644',
+    mode   => $::apache::file_mode,
     notify => Class['Apache::Service'],
   }
 
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index afc7c8860f..ec89bf7785 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -15,7 +15,7 @@
     path    => "${::apache::confd_dir}/fastcgi-pool-${name}.conf",
     owner   => 'root',
     group   => $::apache::params::root_group,
-    mode    => '0644',
+    mode    => $::apache::file_mode,
     content => template('apache/fastcgi/server.erb'),
     require => Exec["mkdir ${::apache::confd_dir}"],
     before  => File[$::apache::confd_dir],
diff --git a/manifests/init.pp b/manifests/init.pp
index bb50d0b2e9..9422d09d8b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -79,6 +79,7 @@
   $use_optional_includes  = $::apache::params::use_optional_includes,
   $use_systemd            = $::apache::params::use_systemd,
   $mime_types_additional  = $::apache::params::mime_types_additional,
+  $file_mode              = $::apache::params::file_mode,
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
@@ -241,7 +242,7 @@
   concat { $ports_file:
     owner   => 'root',
     group   => $::apache::params::root_group,
-    mode    => '0644',
+    mode    => $::apache::file_mode,
     notify  => Class['Apache::Service'],
     require => Package['httpd'],
   }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index abdbfcbed5..33b4de1ab3 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -81,7 +81,7 @@
     path    => "${mod_dir}/${_loadfile_name}",
     owner   => 'root',
     group   => $::apache::params::root_group,
-    mode    => '0644',
+    mode    => $::apache::file_mode,
     content => template('apache/mod/load.erb'),
     require => [
       Package['httpd'],
@@ -99,7 +99,7 @@
       target  => "${mod_dir}/${_loadfile_name}",
       owner   => 'root',
       group   => $::apache::params::root_group,
-      mode    => '0644',
+      mode    => $::apache::file_mode,
       require => [
         File[$_loadfile_name],
         Exec["mkdir ${enable_dir}"],
@@ -117,7 +117,7 @@
         target  => "${mod_dir}/${mod}.conf",
         owner   => 'root',
         group   => $::apache::params::root_group,
-        mode    => '0644',
+        mode    => $::apache::file_mode,
         require => [
           File["${mod}.conf"],
           Exec["mkdir ${enable_dir}"],
@@ -134,7 +134,7 @@
       target  => "${mod_dir}/${_loadfile_name}",
       owner   => 'root',
       group   => $::apache::params::root_group,
-      mode    => '0644',
+      mode    => $::apache::file_mode,
       require => [
         File[$_loadfile_name],
         Exec["mkdir ${enable_dir}"],
@@ -152,7 +152,7 @@
         target  => "${mod_dir}/${mod}.conf",
         owner   => 'root',
         group   => $::apache::params::root_group,
-        mode    => '0644',
+        mode    => $::apache::file_mode,
         require => [
           File["${mod}.conf"],
           Exec["mkdir ${enable_dir}"],
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 389120cb79..0ca201e560 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -27,7 +27,7 @@
   File {
     owner => 'root',
     group => $::apache::params::root_group,
-    mode  => '0644',
+    mode  => $::apache::file_mode,
   }
 
   # Template uses:
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 6f07966755..dd8a9e3a2d 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -35,7 +35,7 @@
   File {
     owner => 'root',
     group => $::apache::params::root_group,
-    mode  => '0644',
+    mode  => $::apache::file_mode,
   }
 
   # Template uses:
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index b6a8015f94..4eb5669d8c 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -35,7 +35,7 @@
       File {
         owner => 'root',
         group => $::apache::params::root_group,
-        mode  => '0644',
+        mode  => $::apache::file_mode,
       }
 
       $mod_dir = $::apache::mod_dir
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 1d1274f3b4..3d45f87a8a 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -50,7 +50,7 @@
     path    => "${::apache::mod_dir}/php5.conf",
     owner   => 'root',
     group   => $root_group,
-    mode    => '0644',
+    mode    => $::apache::file_mode,
     content => $manage_content,
     source  => $source,
     require => [
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 91567de114..85d8b84d4c 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -24,7 +24,7 @@
   File {
     owner => 'root',
     group => $::apache::params::root_group,
-    mode  => '0644',
+    mode  => $::apache::file_mode,
   }
 
   # Template uses:
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 2e6a6421b2..9e417e0c41 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -79,7 +79,7 @@
   File {
     owner => 'root',
     group => $::apache::params::root_group,
-    mode  => '0644',
+    mode  => $::apache::file_mode,
   }
 
   # Template uses:
diff --git a/manifests/params.pp b/manifests/params.pp
index 28692001c0..4120d074c7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -45,6 +45,9 @@
   # should we use systemd module?
   $use_systemd = true
 
+  # Default mode for files
+  $file_mode = '0644'
+
   $vhost_include_pattern = '*'
 
   if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index df271a98f3..8b5422e5ae 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -504,7 +504,7 @@
     path    => "${::apache::vhost_dir}/${priority_real}${filename}.conf",
     owner   => 'root',
     group   => $::apache::params::root_group,
-    mode    => '0644',
+    mode    => $::apache::file_mode,
     order   => 'numeric',
     require => Package['httpd'],
     notify  => Class['apache::service'],
@@ -523,7 +523,7 @@
       target  => "${::apache::vhost_dir}/${priority_real}${filename}.conf",
       owner   => 'root',
       group   => $::apache::params::root_group,
-      mode    => '0644',
+      mode    => $::apache::file_mode,
       require => Concat["${priority_real}${filename}.conf"],
       notify  => Class['apache::service'],
     }
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index d85e4d091b..12567f5dbd 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -30,7 +30,7 @@
       target  => "${::apache::vhost_dir}/${priority}-${filename}.conf",
       owner   => 'root',
       group   => $::apache::params::root_group,
-      mode    => '0644',
+      mode    => $::apache::file_mode,
       require => Apache::Custom_config[$filename],
     }
   }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index a766764527..45f8a690c6 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -835,6 +835,16 @@
         )
       }
     end
+    context 'with a custom file_mode parameter' do
+      let :params do {
+        :file_mode => '0640'
+      }
+      end
+      it { is_expected.to contain_concat("/etc/httpd/conf/ports.conf").with(
+        'mode' => '0640',
+      )
+      }
+    end
     context 'default vhost defaults' do
       it { is_expected.to contain_apache__vhost('default').with_ensure('present') }
       it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('absent') }
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index e4e9845290..1697190a32 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -34,6 +34,20 @@
       end
     end
 
+    describe "with file_mode set" do
+      let :pre_condition do
+        "class {'::apache': file_mode => '0640'}"
+      end
+      let :title do
+        'spec_m'
+      end
+      it "should manage the module load file" do
+        is_expected.to contain_file('spec_m.load').with({
+          :mode    => '0640',
+        } )
+      end
+    end
+
     describe "with shibboleth module and package param passed" do
       # name/title for the apache::mod define
       let :title do

From 7b17dad57ee5cc2aec51d553950cc093eefcaf06 Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Mon, 18 Jan 2016 15:42:07 +0100
Subject: [PATCH 0805/2267] fix vhosts listen to wildcard ip

---
 lib/puppet/parser/functions/enclose_ipv6.rb   | 18 +++++-----
 spec/defines/vhost_spec.rb                    | 33 +++++++++++++++++++
 .../parser/functions/enclose_ipv6_spec.rb     |  8 +++--
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/lib/puppet/parser/functions/enclose_ipv6.rb b/lib/puppet/parser/functions/enclose_ipv6.rb
index 968bd723ed..80ffc3acae 100644
--- a/lib/puppet/parser/functions/enclose_ipv6.rb
+++ b/lib/puppet/parser/functions/enclose_ipv6.rb
@@ -28,16 +28,18 @@ module Puppet::Parser::Functions
     result = []
 
     input.each do |val|
-      begin
-        ip = IPAddr.new(val)
-      rescue *rescuable_exceptions
-        raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument "+
-          "given #{val} is not an ip address.")
+      unless val == '*'
+        begin
+          ip = IPAddr.new(val)
+        rescue *rescuable_exceptions
+          raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument "+
+                "given #{val} is not an ip address.")
+        end
+        val = "[#{ip.to_s}]" if ip.ipv6?
       end
-      val = "[#{ip.to_s}]" if ip.ipv6?
-      result = [result,val]
+      result << val
     end
 
-    return result.flatten.compact
+    return result.uniq
   end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 40d93a0eea..9a3027604f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -567,6 +567,39 @@
       it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') }
     end
 
+    context 'vhost with wildcard ip address' do
+      let :params do
+        {
+          'port'                        => '80',
+          'ip'                          => '*',
+          'ip_based'                    => true,
+          'servername'                  => 'example.com',
+          'docroot'                     => '/var/www/html',
+          'add_listen'                  => true,
+          'ensure'                      => 'present'
+        }
+      end
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :kernelversion          => '3.6.2',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+        :content => /[.\/m]*<VirtualHost \*:80>[.\/m]*$/ ) }
+      it { is_expected.to contain_concat__fragment('Listen *:80') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost *:80') }
+    end
+
     context 'set only aliases' do
       let :params do
         {
diff --git a/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb b/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
index 508f62aea4..b162127d06 100644
--- a/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
+++ b/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
@@ -28,6 +28,10 @@
     expect { scope.function_enclose_ipv6(['127.0.0.1']) }.to_not raise_error
   end
 
+  it "should not raise a ParseError when given * as ip string" do
+    expect { scope.function_enclose_ipv6(['*']) }.to_not raise_error
+  end
+
   it "should not raise a ParseError when given an array of ip strings" do
     expect { scope.function_enclose_ipv6([['127.0.0.1','fe80::1']]) }.to_not raise_error
   end
@@ -49,8 +53,8 @@
   end
 
   it "should embrace ipv6 adresses within an array of ip addresses" do
-    result = scope.function_enclose_ipv6([['127.0.0.1','fe80::1','[fe80::1]']])
-    expect(result).to(eq(['127.0.0.1','[fe80::1]','[fe80::1]']))
+    result = scope.function_enclose_ipv6([['127.0.0.1','fe80::1','[fe80::2]']])
+    expect(result).to(eq(['127.0.0.1','[fe80::1]','[fe80::2]']))
   end
 
   it "should embrace a single ipv6 adresse" do

From dbfc3844541b745cef87251a32db94ab6178bd1a Mon Sep 17 00:00:00 2001
From: Daniel Klockenkaemper <dk@marketing-factory.de>
Date: Tue, 19 Jan 2016 11:24:11 +0100
Subject: [PATCH 0806/2267] update module handling for gentoo when used apache
 2.4 add module authnz_external as external package in gentoo

---
 manifests/init.pp   | 19 +++++++++++++++++--
 manifests/params.pp | 27 ++++++++++++++-------------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index bb50d0b2e9..8eb156fdf4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -273,9 +273,24 @@
         $scriptalias          = '/var/www/localhost/cgi-bin'
         $access_log_file      = 'access.log'
 
-        ::portage::makeconf { 'apache2_modules':
-          content => $default_mods,
+        if is_array($default_mods) {
+          if versioncmp($apache_version, '2.4') >= 0 {
+            if defined('apache::mod::ssl') {
+              ::portage::makeconf { 'apache2_modules':
+                content => concat($default_mods, [ 'authz_core', 'socache_shmcb' ]),
+              }
+            } else {
+              ::portage::makeconf { 'apache2_modules':
+                content => concat($default_mods, 'authz_core'),
+              }
+            }
+          } else {
+            ::portage::makeconf { 'apache2_modules':
+              content => $default_mods,
+            }
+          }
         }
+
         file { [
           '/etc/apache2/modules.d/.keep_www-servers_apache-2',
           '/etc/apache2/vhosts.d/.keep_www-servers_apache-2'
diff --git a/manifests/params.pp b/manifests/params.pp
index 28692001c0..ffe36bcc7e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -442,19 +442,20 @@
     $suphp_configpath = '/etc/php5/apache2'
     $mod_packages     = {
       # NOTE: I list here only modules that are not included in www-servers/apache
-      'auth_kerb'  => 'www-apache/mod_auth_kerb',
-      'fcgid'      => 'www-apache/mod_fcgid',
-      'passenger'  => 'www-apache/passenger',
-      'perl'       => 'www-apache/mod_perl',
-      'php5'       => 'dev-lang/php',
-      'proxy_html' => 'www-apache/mod_proxy_html',
-      'proxy_fcgi' => 'www-apache/mod_proxy_fcgi',
-      'python'     => 'www-apache/mod_python',
-      'wsgi'       => 'www-apache/mod_wsgi',
-      'dav_svn'    => 'dev-vcs/subversion',
-      'xsendfile'  => 'www-apache/mod_xsendfile',
-      'rpaf'       => 'www-apache/mod_rpaf',
-      'xml2enc'    => 'www-apache/mod_xml2enc',
+      'auth_kerb'       => 'www-apache/mod_auth_kerb',
+      'authnz_external' => 'www-apache/mod_authnz_external',
+      'fcgid'           => 'www-apache/mod_fcgid',
+      'passenger'       => 'www-apache/passenger',
+      'perl'            => 'www-apache/mod_perl',
+      'php5'            => 'dev-lang/php',
+      'proxy_html'      => 'www-apache/mod_proxy_html',
+      'proxy_fcgi'      => 'www-apache/mod_proxy_fcgi',
+      'python'          => 'www-apache/mod_python',
+      'wsgi'            => 'www-apache/mod_wsgi',
+      'dav_svn'         => 'dev-vcs/subversion',
+      'xsendfile'       => 'www-apache/mod_xsendfile',
+      'rpaf'            => 'www-apache/mod_rpaf',
+      'xml2enc'         => 'www-apache/mod_xml2enc',
     }
     $mod_libs         = {
       'php5' => 'libphp5.so',

From 6d4fcd8160d315a02a4e1fe441e550710f9b7e40 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Mon, 18 Jan 2016 22:02:01 +0000
Subject: [PATCH 0807/2267] work around pup_5016, debian8 2015.2 service fault

---
 spec/acceptance/class_spec.rb          | 73 ++++++++++++--------------
 spec/acceptance/default_mods_spec.rb   | 29 ++++------
 spec/acceptance/itk_spec.rb            | 38 +++++++-------
 spec/acceptance/prefork_worker_spec.rb | 21 ++++----
 spec/acceptance/service_spec.rb        | 21 ++++----
 spec/spec_helper_acceptance.rb         | 16 ++++++
 6 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index cd13985f69..aff79eb082 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -3,15 +3,13 @@
 
 describe 'apache class' do
   context 'default parameters' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apache': }
+    let(:pp) do
+      <<-EOS
+        class { 'apache': }
       EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
+    # Run it twice and test for idempotency
+    it_behaves_like "a idempotent resource"
 
     describe package($package_name) do
       it { is_expected.to be_installed }
@@ -33,43 +31,42 @@ class { 'apache': }
 
   context 'custom site/mod dir parameters' do
     # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-      if $::osfamily == 'RedHat' and "$::selinux" == "true" {
-        $semanage_package = $::operatingsystemmajrelease ? {
-          '5'     => 'policycoreutils',
-          default => 'policycoreutils-python',
-        }
+    let(:pp) do
+      <<-EOS
+        if $::osfamily == 'RedHat' and "$::selinux" == "true" {
+          $semanage_package = $::operatingsystemmajrelease ? {
+            '5'     => 'policycoreutils',
+            default => 'policycoreutils-python',
+          }
 
-        package { $semanage_package: ensure => installed }
-        exec { 'set_apache_defaults':
-          command     => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-          path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          subscribe   => Package[$semanage_package],
-          refreshonly => true,
+          package { $semanage_package: ensure => installed }
+          exec { 'set_apache_defaults':
+            command     => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
+            path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
+            subscribe   => Package[$semanage_package],
+            refreshonly => true,
+          }
+          exec { 'restorecon_apache':
+            command     => 'restorecon -Rv /apache_spec',
+            path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
+            before      => Service['httpd'],
+            require     => Class['apache'],
+            subscribe   => Exec['set_apache_defaults'],
+            refreshonly => true,
+          }
         }
-        exec { 'restorecon_apache':
-          command     => 'restorecon -Rv /apache_spec',
-          path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before      => Service['httpd'],
-          require     => Class['apache'],
-          subscribe   => Exec['set_apache_defaults'],
-          refreshonly => true,
+        file { '/apache_spec': ensure => directory, }
+        file { '/apache_spec/apache_custom': ensure => directory, }
+        class { 'apache':
+          mod_dir   => '/apache_spec/apache_custom/mods',
+          vhost_dir => '/apache_spec/apache_custom/vhosts',
         }
-      }
-      file { '/apache_spec': ensure => directory, }
-      file { '/apache_spec/apache_custom': ensure => directory, }
-      class { 'apache':
-        mod_dir   => '/apache_spec/apache_custom/mods',
-        vhost_dir => '/apache_spec/apache_custom/vhosts',
-      }
       EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
     end
 
+    # Run it twice and test for idempotency
+    it_behaves_like "a idempotent resource"
+
     describe service($service_name) do
       if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
         pending 'Should be enabled - Bug 760616 on Debian 8'
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 8cfc531b1d..3f28526966 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -4,18 +4,16 @@
 describe 'apache::default_mods class' do
   describe 'no default mods' do
     # Using puppet_apply as a helper
-    it 'should apply with no errors' do
-      pp = <<-EOS
+    let(:pp) do
+      <<-EOS
         class { 'apache':
           default_mods => false,
         }
       EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
+    # Run it twice and test for idempotency
+    it_behaves_like "a idempotent resource"
     describe service($service_name) do
       it { is_expected.to be_running }
     end
@@ -54,8 +52,8 @@ class { 'apache':
 
   describe 'alternative default mods' do
     # Using puppet_apply as a helper
-    it 'should apply with no errors' do
-      pp = <<-EOS
+    let(:pp) do
+      <<-EOS
         class { 'apache':
           default_mods => [
             'info',
@@ -74,11 +72,8 @@ class { 'apache':
           setenv  => 'TEST1 one',
         }
       EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      shell('sleep 10')
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
+    it_behaves_like "a idempotent resource"
 
     describe service($service_name) do
       it { is_expected.to be_running }
@@ -86,18 +81,16 @@ class { 'apache':
   end
 
   describe 'change loadfile name' do
-    it 'should apply with no errors' do
-      pp = <<-EOS
+    let(:pp) do
+      <<-EOS
         class { 'apache': default_mods => false }
         ::apache::mod { 'auth_basic':
           loadfile_name => 'zz_auth_basic.load',
         }
       EOS
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
-
+    # Run it twice and test for idempotency
+    it_behaves_like "a idempotent resource"
     describe service($service_name) do
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 5be43b1fed..059589a3f0 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -28,27 +28,25 @@
 describe 'apache::mod::itk class', :if => service_name do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = case variant
-           when :prefork
-             <<-EOS
-               class { 'apache':
-                 mpm_module => 'prefork',
-               }
-               class { 'apache::mod::itk': }
-             EOS
-           when :itk_only
-             <<-EOS
-               class { 'apache':
-                 mpm_module => 'itk',
-               }
-             EOS
-           end
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
+    let(:pp) do
+      case variant
+        when :prefork
+          <<-EOS
+            class { 'apache':
+              mpm_module => 'prefork',
+            }
+            class { 'apache::mod::itk': }
+          EOS
+        when :itk_only
+          <<-EOS
+            class { 'apache':
+              mpm_module => 'itk',
+            }
+          EOS
+        end
     end
+    # Run it twice and test for idempotency
+    it_behaves_like "a idempotent resource"
   end
 
   describe service(service_name) do
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 22eaaddeaa..6687161440 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -33,17 +33,16 @@ class { 'apache':
 describe 'apache::mod::worker class' do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
+    let(:pp) do
+      <<-EOS
         class { 'apache':
           mpm_module => 'worker',
         }
       EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
+
+    # Run it twice and test for idempotency
+    it_behaves_like "a idempotent resource"
   end
 
   describe service($service_name) do
@@ -59,17 +58,15 @@ class { 'apache':
 describe 'apache::mod::prefork class' do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
+    let(:pp) do
+      <<-EOS
         class { 'apache':
           mpm_module => 'prefork',
         }
       EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
+    # Run it twice and test for idempotency
+    it_behaves_like "a idempotent resource"
   end
 
   describe service($service_name) do
diff --git a/spec/acceptance/service_spec.rb b/spec/acceptance/service_spec.rb
index c3124c8461..c62a34973a 100644
--- a/spec/acceptance/service_spec.rb
+++ b/spec/acceptance/service_spec.rb
@@ -2,18 +2,17 @@
 
 describe 'apache::service class' do
   describe 'adding dependencies in between the base class and service class' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apache': }
-      file { '/tmp/test':
-        require => Class['apache'],
-        notify  => Class['apache::service'],
-      }
+    let(:pp) do
+      <<-EOS
+        class { 'apache': }
+        file { '/tmp/test':
+          require => Class['apache'],
+          notify  => Class['apache::service'],
+        }
       EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
+
+    # Run it twice and test for idempotency
+    it_behaves_like "a idempotent resource"
   end
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index cdaec445d8..307f7b7106 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -16,6 +16,12 @@
   # Readable test descriptions
   c.formatter = :documentation
 
+  # detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case
+  # also note how fact('puppetversion') is not available because of PUP-4359
+  if fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '8' && shell('puppet --version').stdout =~ /^4\.2/
+    c.filter_run_excluding :skip_pup_5016 => true
+  end
+
   # Configure all nodes in nodeset
   c.before :suite do
     # net-tools required for netstat utility being used by be_listening
@@ -62,3 +68,13 @@ class { 'epel': }
     end
   end
 end
+
+shared_examples "a idempotent resource" do
+  it 'should apply with no errors' do
+    apply_manifest(pp, :catch_failures => true)
+  end
+
+  it 'should apply a second time without changes', :skip_pup_5016 do
+    apply_manifest(pp, :catch_changes => true)
+  end
+end

From fc3bea1dace807b786c437edcd5311c8d3a3a19a Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Wed, 20 Jan 2016 10:49:32 +0100
Subject: [PATCH 0808/2267] add file_mode to mod manifests

---
 manifests/mod/alias.pp       | 1 +
 manifests/mod/auth_cas.pp    | 1 +
 manifests/mod/auth_mellon.pp | 1 +
 manifests/mod/authnz_ldap.pp | 1 +
 manifests/mod/autoindex.pp   | 1 +
 manifests/mod/cgid.pp        | 1 +
 manifests/mod/dav_fs.pp      | 1 +
 manifests/mod/deflate.pp     | 1 +
 manifests/mod/dir.pp         | 1 +
 manifests/mod/disk_cache.pp  | 1 +
 manifests/mod/event.pp       | 1 +
 manifests/mod/expires.pp     | 1 +
 manifests/mod/ext_filter.pp  | 1 +
 manifests/mod/fastcgi.pp     | 1 +
 manifests/mod/fcgid.pp       | 1 +
 manifests/mod/geoip.pp       | 1 +
 manifests/mod/info.pp        | 1 +
 manifests/mod/itk.pp         | 1 +
 manifests/mod/ldap.pp        | 1 +
 manifests/mod/mime.pp        | 1 +
 manifests/mod/mime_magic.pp  | 1 +
 manifests/mod/negotiation.pp | 1 +
 manifests/mod/nss.pp         | 1 +
 manifests/mod/pagespeed.pp   | 1 +
 manifests/mod/peruser.pp     | 1 +
 manifests/mod/proxy.pp       | 1 +
 manifests/mod/proxy_html.pp  | 1 +
 manifests/mod/remoteip.pp    | 1 +
 manifests/mod/rpaf.pp        | 1 +
 manifests/mod/security.pp    | 1 +
 manifests/mod/setenvif.pp    | 1 +
 manifests/mod/ssl.pp         | 1 +
 manifests/mod/status.pp      | 3 ++-
 manifests/mod/suphp.pp       | 1 +
 manifests/mod/userdir.pp     | 1 +
 manifests/mod/wsgi.pp        | 1 +
 36 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 5b59baa01d..eac21ba661 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -11,6 +11,7 @@
     file { 'alias.conf':
       ensure  => file,
       path    => "${::apache::mod_dir}/alias.conf",
+      mode    => $::apache::file_mode,
       content => template('apache/mod/alias.conf.erb'),
       require => Exec["mkdir ${::apache::mod_dir}"],
       before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 5b13af66a2..0d1b9111ab 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -39,6 +39,7 @@
   file { 'auth_cas.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/auth_cas.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/auth_cas.conf.erb'),
     require => [ Exec["mkdir ${::apache::mod_dir}"], ],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index 79f6ffebb2..129441bf41 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -15,6 +15,7 @@
   file { 'auth_mellon.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/auth_mellon.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/auth_mellon.conf.erb'),
     require => [ Exec["mkdir ${::apache::mod_dir}"], ],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index b75369ffcd..70d0a63630 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -11,6 +11,7 @@
   file { 'authnz_ldap.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/authnz_ldap.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/authnz_ldap.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index c0969a814e..c8cd0658d8 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -4,6 +4,7 @@
   file { 'autoindex.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/autoindex.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/autoindex.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 4094c3281a..891cdd75b4 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -23,6 +23,7 @@
     file { 'cgid.conf':
       ensure  => file,
       path    => "${::apache::mod_dir}/cgid.conf",
+      mode    => $::apache::file_mode,
       content => template('apache/mod/cgid.conf.erb'),
       require => Exec["mkdir ${::apache::mod_dir}"],
       before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index af037e32d0..f652d4c216 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -12,6 +12,7 @@
   file { 'dav_fs.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/dav_fs.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/dav_fs.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 0748a54e57..e63eeca47d 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -17,6 +17,7 @@
   file { 'deflate.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/deflate.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/deflate.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index 6243a1bb7d..bce05e0a44 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -13,6 +13,7 @@
   file { 'dir.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/dir.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/dir.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 2f0a476fa4..051d69894c 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -32,6 +32,7 @@
   file { 'disk_cache.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/disk_cache.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/disk_cache.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 0ca201e560..6c70589a35 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -40,6 +40,7 @@
   # - $serverlimit
   file { "${::apache::mod_dir}/event.conf":
     ensure  => file,
+    mode    => $::apache::file_mode,
     content => template('apache/mod/event.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index 10542916aa..1531fc54d9 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -12,6 +12,7 @@
   file { 'expires.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/expires.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/expires.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/ext_filter.pp b/manifests/mod/ext_filter.pp
index b78abb6071..244c2b1da1 100644
--- a/manifests/mod/ext_filter.pp
+++ b/manifests/mod/ext_filter.pp
@@ -15,6 +15,7 @@
     file { 'ext_filter.conf':
       ensure  => file,
       path    => "${::apache::mod_dir}/ext_filter.conf",
+      mode    => $::apache::file_mode,
       content => template('apache/mod/ext_filter.conf.erb'),
       require => [ Exec["mkdir ${::apache::mod_dir}"], ],
       before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index 1f7e5df4fb..c4da5b1e63 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -14,6 +14,7 @@
     file { 'fastcgi.conf':
       ensure  => file,
       path    => "${::apache::mod_dir}/fastcgi.conf",
+      mode    => $::apache::file_mode,
       content => template('apache/mod/fastcgi.conf.erb'),
       require => Exec["mkdir ${::apache::mod_dir}"],
       before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 9786670338..4c0f919388 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -11,6 +11,7 @@
   file { 'unixd_fcgid.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/unixd_fcgid.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/unixd_fcgid.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index 1f8fb08eeb..2ff5d21918 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -22,6 +22,7 @@
   file { 'geoip.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/geoip.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/geoip.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index f0d03eb0f6..bed35af3a1 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -10,6 +10,7 @@
   file { 'info.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/info.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/info.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index dd8a9e3a2d..2d5bf04c1c 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -47,6 +47,7 @@
   # - $maxrequestsperchild
   file { "${::apache::mod_dir}/itk.conf":
     ensure  => file,
+    mode    => $::apache::file_mode,
     content => template('apache/mod/itk.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index d084186717..95219bd41d 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -11,6 +11,7 @@
   file { 'ldap.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/ldap.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/ldap.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index ace7663df1..0665eb639c 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -8,6 +8,7 @@
   file { 'mime.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/mime.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/mime.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index c057b01f50..722b0df402 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -6,6 +6,7 @@
   file { 'mime_magic.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/mime_magic.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/mime_magic.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index 02a3a0e64d..b9aec3673f 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -16,6 +16,7 @@
   # Template uses no variables
   file { 'negotiation.conf':
     ensure  => file,
+    mode    => $::apache::file_mode,
     path    => "${::apache::mod_dir}/negotiation.conf",
     content => template('apache/mod/negotiation.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index d275cc493e..16c285e939 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -18,6 +18,7 @@
   file { 'nss.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/nss.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/nss.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index 588849c472..e787d88ef5 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -47,6 +47,7 @@
   file { 'pagespeed.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/pagespeed.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/pagespeed.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 4eb5669d8c..e875a5afcc 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -52,6 +52,7 @@
       # - $mod_dir
       file { "${::apache::mod_dir}/peruser.conf":
         ensure  => file,
+        mode    => $::apache::file_mode,
         content => template('apache/mod/peruser.conf.erb'),
         require => Exec["mkdir ${::apache::mod_dir}"],
         before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 8c685d55b5..73b054ab36 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -8,6 +8,7 @@
   file { 'proxy.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/proxy.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/proxy.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 8b910c2510..24f332334a 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -29,6 +29,7 @@
   file { 'proxy_html.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/proxy_html.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/proxy_html.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index 564390e94d..abceb08c7d 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -19,6 +19,7 @@
   file { 'remoteip.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/remoteip.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/remoteip.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index 12b86eb8bd..f21c43ebda 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -12,6 +12,7 @@
   file { 'rpaf.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/rpaf.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/rpaf.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 4571e2fd29..de8210118b 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -35,6 +35,7 @@
   file { 'security.conf':
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
+    mode    => $::apache::file_mode,
     path    => "${::apache::mod_dir}/security.conf",
     owner   => $::apache::params::user,
     group   => $::apache::params::group,
diff --git a/manifests/mod/setenvif.pp b/manifests/mod/setenvif.pp
index c73102dfbe..63d3e321b4 100644
--- a/manifests/mod/setenvif.pp
+++ b/manifests/mod/setenvif.pp
@@ -4,6 +4,7 @@
   file { 'setenvif.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/setenvif.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/setenvif.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index a653badeda..dcc31ce8f3 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -73,6 +73,7 @@
   file { 'ssl.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/ssl.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/ssl.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 4c3f8d9e25..d11a464d79 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -11,7 +11,7 @@
 #   values are 'On' or 'Off'.  Defaults to 'On'.
 # - $status_path is the path assigned to the Location directive which
 #   defines the URL to access the server status. Defaults to '/server-status'.
-# 
+#
 # Actions:
 # - Enable and configure Apache mod_status
 #
@@ -38,6 +38,7 @@
   file { 'status.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/status.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/status.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index c50beea06c..5d426d7948 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -5,6 +5,7 @@
   file {'suphp.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/suphp.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/suphp.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 4b3d0b8e80..516bb11654 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -11,6 +11,7 @@
   file { 'userdir.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/userdir.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/userdir.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index bff5b46b7c..d1b8214753 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -32,6 +32,7 @@
   file {'wsgi.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/wsgi.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/wsgi.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],

From 2c54785de4f76ed431eaa2d1060458408f62f6b3 Mon Sep 17 00:00:00 2001
From: slava <vvalyavskiy@mirantis.com>
Date: Wed, 20 Jan 2016 16:09:05 +0300
Subject: [PATCH 0809/2267] Specify owning permissions for logroot directory

The main goal of this patch is to prevent inheritance of owning
permissions for File resource. For example, if we define somewhere in
high level manifest 'owner' and 'group' values, it will be passed to
apache module and wrong owning permissions will be set. It's critical
for 'logroot' folder as we have '0750' permissions for this folder in
apache package by default.
---
 README.md                  | 8 ++++++++
 manifests/vhost.pp         | 4 ++++
 spec/defines/vhost_spec.rb | 2 ++
 3 files changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 707720a2b6..488421a368 100644
--- a/README.md
+++ b/README.md
@@ -2137,6 +2137,14 @@ Determines whether or not to remove the logroot directory for a virtual host. Va
 Overrides the mode the logroot directory is set to. Defaults to undef. Do NOT give people write access to the directory the logs are stored
 in without being aware of the consequences; see http://httpd.apache.org/docs/2.4/logs.html#security for details.
 
+##### `logroot_owner`
+
+Sets individual user access to the logroot directory. Defaults to 'undef'.
+
+##### `logroot_group`
+
+Sets group access to the [`logroot`][] directory. Defaults to 'undef'.
+
 ##### `log_level`
 
 Specifies the verbosity of the error log. Defaults to 'warn' for the global server configuration and can be overridden on a per-vhost basis. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8b5422e5ae..2201e72cd3 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -43,6 +43,8 @@
   $logroot                     = $::apache::logroot,
   $logroot_ensure              = 'directory',
   $logroot_mode                = undef,
+  $logroot_owner               = undef,
+  $logroot_group               = undef,
   $log_level                   = undef,
   $access_log                  = true,
   $access_log_file             = false,
@@ -307,6 +309,8 @@
   if ! defined(File[$logroot]) {
     file { $logroot:
       ensure  => $logroot_ensure,
+      owner   => $logroot_owner,
+      group   => $logroot_group,
       mode    => $logroot_mode,
       require => Package['httpd'],
       before  => Concat["${priority_real}${filename}.conf"],
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9a3027604f..12653e9b1d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -170,6 +170,8 @@
           'logroot'                     => '/var/www/logs',
           'logroot_ensure'              => 'directory',
           'logroot_mode'                => '0600',
+          'logroot_owner'               => 'root',
+          'logroot_group'               => 'root',
           'log_level'                   => 'crit',
           'access_log'                  => false,
           'access_log_file'             => 'httpd_access_log',

From ce48f577e38baed14d348c6a6ed71a6cd54398ea Mon Sep 17 00:00:00 2001
From: Jonathan Tripathy <jt@puppetlabs.com>
Date: Fri, 22 Jan 2016 16:13:35 +0000
Subject: [PATCH 0810/2267] Release Prep 1.8.0

---
 CHANGELOG.md  | 42 ++++++++++++++++++++++++++++++++++++------
 metadata.json |  5 +++--
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db27b34baa..e787047623 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,43 @@
-## UNRELEASED
+## 2016-01-26 - Supported Release 1.8.0
 ### Summary
+This release includes a lot of bug fixes and feature updates, including support for Debian 8, as well as many test improvements.
 
-TODO
-
-###
+#### Features
+- Debian 8 Support.
+- Added the 'file_mode' property to allow a custom permission setting for config files.
+- Enable 'PassengerMaxRequestQueueSize' to be set for mod_passenger.
+- MODULES-2956: Enable options within location block on proxy_match.
+- Support itk on redhat.
+- Support the mod_ssl SSLProxyVerify directive.
+- Support ProxPassReverseCookieDomain directive (mod_proxy).
+- Support proxy provider for vhost directories.
+- Added new 'apache::vhost::custom' resource.
 
-#### Security
+#### Bugfixes
+- Fixed ProxyPassReverse configuration.
+- Fixed error in Amazon operatingsystem detection.
+- Fixed mod_security catalog ordering issues for RedHat 7.
+- Fixed paths and packages for the shib2 apache module on Debian pre Jessie.
+- Fixed EL7 directory path for apache modules.
+- Fixed validation error when empty array is passed for the rewrites parameter.
+- Idempotency fixes with regards to '::apache::mod_enable_dir'.
+- ITK fixes.
+- (MODULES-2865) fix $mpm_module logic for 'false'.
+- Set SSLProxy directives even if ssl is false, due to issue with RewriteRules and ProxyPass directives.
+- Enable setting LimitRequestFieldSize globally, and remove it from vhost.
 
-* apache::mod::php now uses FilesMatch to configure the php handler. This is following the recommended upstream configuration guidelines (http://php.net/manual/en/install.unix.apache2.php#example-20) and distribution's default config (e.g.: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/php5/vivid/view/head:/debian/php5.conf). It avoids inadvertently exposing the PHP handler to executing uploads with names like 'file.php.jpg', but might impact setups with unusual requirements.
+#### Improvements
+- apache::mod::php now uses FilesMatch to configure the php handler. This is following the recommended upstream configuration guidelines (http://php.net/manual/en/install.unix.apache2.php#example-20) and distribution's default config (e.g.: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/php5/vivid/view/head:/debian/php5.conf). It avoids inadvertently exposing the PHP handler to executing uploads with names like 'file.php.jpg', but might impact setups with unusual requirements.
+- Improved compatibility for Gentoo.
+- Vhosts can now be supplied with a wildcard listen value.
+- Numerous test improvements.
+- Removed workarounds for https://bz.apache.org/bugzilla/show_bug.cgi?id=38864 as the issues have been fixed in Apache.
+- Documentation updates.
+- Ensureed order of ProxyPass and ProxyPassMatch parameters.
+- Ensure that ProxyPreserveHost is set to off mode explicitly if not set in manifest.
+- Put headers and request headers before proxy with regards to template generation.
+- Added X-Forwarded-For into log_formats defaults.
+- (MODULES-2703) Allow mod pagespeed to take an array of lines as additional_configuration.
 
 ## Supported Release 1.7.1
 ###Summary
diff --git a/metadata.json b/metadata.json
index 85e6889497..af2b56b3ba 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -47,7 +47,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {

From 5532bd08e9d71f56c65701c8134a726db48751a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Barbeira?= <fbarbeira@gmail.com>
Date: Wed, 27 Jan 2016 09:23:32 +0100
Subject: [PATCH 0811/2267] Remove white space.

---
 manifests/mod/status.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 4c3f8d9e25..3dc0695e9d 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -11,7 +11,7 @@
 #   values are 'On' or 'Off'.  Defaults to 'On'.
 # - $status_path is the path assigned to the Location directive which
 #   defines the URL to access the server status. Defaults to '/server-status'.
-# 
+#
 # Actions:
 # - Enable and configure Apache mod_status
 #

From c748b4502da5534e0ffafd24e5b688e2c1585cd8 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@dasz.at>
Date: Mon, 25 Jan 2016 14:12:10 +0000
Subject: [PATCH 0812/2267] (FM-4049) Update to current msync configs [2c99161]

---
 .gitignore                                    |  1 +
 .rspec                                        |  2 ++
 .travis.yml                                   | 15 +++++++------
 CONTRIBUTING.md                               |  6 ++---
 Gemfile                                       | 22 +++++++++----------
 Rakefile                                      |  3 ++-
 spec/acceptance/nodesets/centos-59-x64.yml    | 10 +++++++++
 spec/acceptance/nodesets/centos-64-x64-pe.yml | 12 ++++++++++
 spec/acceptance/nodesets/centos-65-x64.yml    | 10 +++++++++
 9 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 .rspec
 create mode 100644 spec/acceptance/nodesets/centos-59-x64.yml
 create mode 100644 spec/acceptance/nodesets/centos-64-x64-pe.yml
 create mode 100644 spec/acceptance/nodesets/centos-65-x64.yml

diff --git a/.gitignore b/.gitignore
index b5db85e051..3190277498 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+log/
 .idea/
 *.iml
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000000..16f9cdb013
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--color
+--format documentation
diff --git a/.travis.yml b/.travis.yml
index c418ab5f2a..e6314a4700 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,19 @@
 ---
 sudo: false
 language: ruby
+cache: bundler
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake validate lint spec"
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f1cbde4bbf..bfeaa701ca 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -159,7 +159,7 @@ If you already have those gems installed, make sure they are up-to-date:
 With all dependencies in place and up-to-date we can now run the tests:
 
 ```shell
-% rake spec
+% bundle exec rake spec
 ```
 
 This will execute all the [rspec tests](http://rspec-puppet.com/) tests
@@ -178,8 +178,8 @@ installed on your system.
 You can run them by issuing the following command
 
 ```shell
-% rake spec_clean
-% rspec spec/acceptance
+% bundle exec rake spec_clean
+% bundle exec rspec spec/acceptance
 ```
 
 This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
diff --git a/Gemfile b/Gemfile
index bfe64b186a..ced190e770 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
+  if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]
@@ -11,14 +11,16 @@ def location_for(place, fake_version = nil)
 end
 
 group :development, :unit_tests do
-  gem 'rspec-core', '3.1.7',     :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'simplecov',               :require => false
-  gem 'puppet_facts',            :require => false
-  gem 'json',                    :require => false
+  gem 'json',                      :require => false
+  gem 'metadata-json-lint',        :require => false
+  gem 'puppet_facts',              :require => false
+  gem 'puppet-blacksmith',         :require => false
+  gem 'puppetlabs_spec_helper',    :require => false
+  gem 'rspec-puppet', '>= 2.3.2',  :require => false
+  gem 'simplecov',                 :require => false
 end
-
 group :system_tests do
+  gem 'beaker-puppet_install_helper',  :require => false
   if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   end
@@ -27,12 +29,10 @@ group :system_tests do
   else
     gem 'beaker-rspec',  :require => false
   end
-  gem 'serverspec',    :require => false
-  gem 'beaker-puppet_install_helper', :require => false
+  gem 'master_manipulator',            :require => false
+  gem 'serverspec',                    :require => false
 end
 
-
-
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else
diff --git a/Rakefile b/Rakefile
index 416807dadc..636508b00e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,6 @@
-require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'puppetlabs_spec_helper/rake_tasks'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml
new file mode 100644
index 0000000000..2ad90b86aa
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-59-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  centos-59-x64:
+    roles:
+      - master
+    platform: el-5-x86_64
+    box : centos-59-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: git
diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml
new file mode 100644
index 0000000000..7d9242f1b9
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-64-x64-pe.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+      - database
+      - dashboard
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: pe
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
new file mode 100644
index 0000000000..4e2cb809e8
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  centos-65-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-65-x64-vbox436-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

From ecc290983dee972535020079587f99a0025e5237 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Thu, 28 Jan 2016 08:46:57 +0000
Subject: [PATCH 0813/2267] Preserve /etc/httpd/conf.d/passenger.conf on EL7

mod_passenger provides a passenger.conf containing PassengerRoot to
ensure the service starts up correctly.  On EL7, this is installed at
/etc/httpd/conf.d/passenger.conf and has been protected from purging
since 005bf61.

The change in 2a608592 to move LoadModule config files to
/etc/httpd/conf.modules.d/ on EL7 also affected the path of the
protected passenger.conf.  This change reverts the path change to match
the packages.

In summary, prior to 2a608592 (release 1.7.0):

- /etc/httpd/conf.d/passenger.conf with PassengerRoot (packaged)
- /etc/httpd/conf.d/passenger_extra.conf with apache::mod::passenger settings
- /etc/httpd/conf.d/zpassenger.load with LoadModule

In 2a608592 (release 1.8.0):

- /etc/httpd/conf.modules.d/passenger_extra.conf with apache::mod::passenger settings
- /etc/httpd/conf.modules.d/zpassenger.load with LoadModule
- /etc/httpd/conf.d/passenger.conf is purged

With this commit:

- /etc/httpd/conf.modules.d/passenger_extra.conf with apache::mod::passenger settings
- /etc/httpd/conf.modules.d/zpassenger.load with LoadModule
- /etc/httpd/conf.d/passenger.conf with PassengerRoot (packaged)
---
 manifests/mod/passenger.pp         |  2 +-
 spec/classes/mod/passenger_spec.rb | 63 ++++++++++++++++++------------
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 8d3622d304..fa67f01cb9 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -35,7 +35,7 @@
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
     file { 'passenger_package.conf':
-      path => "${::apache::mod_dir}/${passenger_conf_package_file}",
+      path => "${::apache::confd_dir}/${passenger_conf_package_file}",
     }
   }
 
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 1cae95c456..d7e9ce9ed0 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -237,10 +237,9 @@
   end
 
   context "on a RedHat OS" do
-    let :facts do
+    let :rh_facts do
       {
         :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
         :concat_basedir         => '/dne',
         :operatingsystem        => 'RedHat',
         :id                     => 'root',
@@ -249,30 +248,46 @@
         :is_pe                  => false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package("mod_passenger") }
-    it { is_expected.to contain_file('passenger_package.conf').with({
-      'path' => '/etc/httpd/conf.d/passenger.conf',
-    }) }
-    it { is_expected.to contain_file('passenger_package.conf').without_content }
-    it { is_expected.to contain_file('passenger_package.conf').without_source }
-    it { is_expected.to contain_file('zpassenger.load').with({
-      'path' => '/etc/httpd/conf.d/zpassenger.load',
-    }) }
-    it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) }
-    it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
-    describe "with passenger_root => '/usr/lib/example'" do
-      let :params do
-        { :passenger_root => '/usr/lib/example' }
+
+    context "on EL6" do
+      let(:facts) { rh_facts.merge(:operatingsystemrelease => '6') }
+
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('passenger') }
+      it { is_expected.to contain_package("mod_passenger") }
+      it { is_expected.to contain_file('passenger_package.conf').with({
+        'path' => '/etc/httpd/conf.d/passenger.conf',
+      }) }
+      it { is_expected.to contain_file('passenger_package.conf').without_content }
+      it { is_expected.to contain_file('passenger_package.conf').without_source }
+      it { is_expected.to contain_file('zpassenger.load').with({
+        'path' => '/etc/httpd/conf.d/zpassenger.load',
+      }) }
+      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) }
+      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
+      describe "with passenger_root => '/usr/lib/example'" do
+        let :params do
+          { :passenger_root => '/usr/lib/example' }
+        end
+        it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
-    end
-    describe "with passenger_ruby => /usr/lib/example/ruby" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby' }
+      describe "with passenger_ruby => /usr/lib/example/ruby" do
+        let :params do
+          { :passenger_ruby => '/usr/lib/example/ruby' }
+        end
+        it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
+    end
+
+    context "on EL7" do
+      let(:facts) { rh_facts.merge(:operatingsystemrelease => '7') }
+
+      it { is_expected.to contain_file('passenger_package.conf').with({
+        'path' => '/etc/httpd/conf.d/passenger.conf',
+      }) }
+      it { is_expected.to contain_file('zpassenger.load').with({
+        'path' => '/etc/httpd/conf.modules.d/zpassenger.load',
+      }) }
     end
   end
   context "on a FreeBSD OS" do

From 5e431279017e900966fc843d75a97c943448d016 Mon Sep 17 00:00:00 2001
From: Joseph Yaworski <joseph.yaworski@fireeye.com>
Date: Fri, 29 Jan 2016 14:51:43 -0500
Subject: [PATCH 0814/2267] Add apache_version fact

---
 lib/facter/apache_version.rb     |  8 ++++++++
 spec/unit/apache_version_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 lib/facter/apache_version.rb
 create mode 100644 spec/unit/apache_version_spec.rb

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
new file mode 100644
index 0000000000..b45c888346
--- /dev/null
+++ b/lib/facter/apache_version.rb
@@ -0,0 +1,8 @@
+Facter.add(:apache_version) do
+  setcode do
+    if Facter::Util::Resolution.which('apachectl')
+      apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
+      %r{^Server version: Apache\/([\w\.]+) \(([\w]+)\)}.match(apache_version)[1]
+    end
+  end
+end
diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/apache_version_spec.rb
new file mode 100644
index 0000000000..30f6ef9914
--- /dev/null
+++ b/spec/unit/apache_version_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Facter::Util::Fact do
+  before do
+    Facter.clear
+  end
+
+  describe 'apache_version' do
+    context 'with value' do
+      before :each do
+        Facter::Util::Resolution.stubs(:which).with('apachectl').returns(true)
+        Facter::Util::Resolution.stubs(:exec).with('apachectl -v 2>&1').returns('Server version: Apache/2.4.16 (Unix)
+                                                                                  Server built:   Jul 31 2015 15:53:26')
+      end
+      it do
+        expect(Facter.fact(:apache_version).value).to eq('2.4.16')
+      end
+    end
+  end
+end

From 4b0cd61c7e7f06c744e17a2d4cd64a5033abbdae Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Fri, 29 Jan 2016 13:12:36 -0700
Subject: [PATCH 0815/2267] Removes pinning of concat dependency to <2.0.0

---
 .fixtures.yml                  | 4 +---
 metadata.json                  | 2 +-
 spec/spec_helper_acceptance.rb | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 4645a757fc..6eddf260f6 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,9 +1,7 @@
 fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    concat:
-      repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
-      branch: "1.2.x"
+    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
     portage: "git://github.com/gentoo/puppet-portage.git"
   symlinks:
     apache: "#{source_dir}"
diff --git a/metadata.json b/metadata.json
index af2b56b3ba..460502a181 100644
--- a/metadata.json
+++ b/metadata.json
@@ -9,7 +9,7 @@
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"}
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
   ],
   "operatingsystem_support": [
     {
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 307f7b7106..b6ec0b5856 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -43,7 +43,7 @@
       copy_module_to(host, :source => proj_root, :module_name => 'apache')
 
       on host, puppet('module','install','puppetlabs-stdlib')
-      on host, puppet('module','install','puppetlabs-concat', '--version 1.1.1', '--force')
+      on host, puppet('module','install','puppetlabs-concat')
 
       # Required for mod_passenger tests.
       if fact('osfamily') == 'RedHat'
@@ -59,7 +59,7 @@ class { 'epel': }
 
       # Required for manifest to make mod_pagespeed repository available
       if fact('osfamily') == 'Debian'
-        on host, puppet('module','install','puppetlabs-apt', '--version 1.8.0', '--force')
+        on host, puppet('module','install','puppetlabs-apt')
       end
 
       # Make sure selinux is disabled so the tests work.

From e96a933bef3d6bdeadd78ceb2185fe6a5b3b30d5 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Fri, 29 Jan 2016 13:09:52 -0700
Subject: [PATCH 0816/2267] (MODULES-3018) Fixes Apache to work correctly with
 Concat.

---
 manifests/init.pp                     |  2 +-
 spec/acceptance/custom_config_spec.rb |  2 +-
 spec/classes/apache_spec.rb           |  2 +-
 spec/defines/vhost_spec.rb            | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index b67c9f2fb3..13eb5f7172 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -345,7 +345,7 @@
       ensure  => file,
       content => template($conf_template),
       notify  => Class['Apache::Service'],
-      require => [Package['httpd'], File[$ports_file]],
+      require => [Package['httpd'], Concat[$ports_file]],
     }
 
     # preserve back-wards compatibility to the times when default_mods was
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index fe73d111bd..c8e254e858 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -82,7 +82,7 @@ class { 'apache': }
 
         # Try to wedge the apache::custom_config call between when httpd.conf is written and
         # ports.conf is written. This should trigger a dependency cycle
-        File["#{$conf_file}"] -> Apache::Custom_config['ordering_test'] -> File["#{$ports_file}"]
+        File["#{$conf_file}"] -> Apache::Custom_config['ordering_test'] -> Concat["#{$ports_file}"]
       EOS
       expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Found 1 dependency cycle/i)
     end
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 45f8a690c6..34d56ba4f7 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -504,7 +504,7 @@
       it { is_expected.to contain_file("/opt/rh/root/etc/httpd/conf/httpd.conf").with(
         'ensure'  => 'file',
         'notify'  => 'Class[Apache::Service]',
-        'require' => ['Package[httpd]', 'File[/etc/httpd/conf/ports.conf]'],
+        'require' => ['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'],
       ) }
     end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9a3027604f..e6456ae265 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -50,7 +50,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
       ) }
@@ -77,7 +77,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf'
       ) }
@@ -99,7 +99,7 @@
       let :facts do default_facts end
       it { is_expected.to contain_class("apache") }
       it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_file("25-rspec.example.com.conf").with(
+      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
         :ensure => 'present',
         :path   => '/etc/apache2/vhosts.d/25-rspec.example.com.conf'
       ) }
@@ -1108,7 +1108,7 @@
       end
 
       it { is_expected.to compile }
-      it { is_expected.to contain_file('25-rspec.example.com.conf') }
+      it { is_expected.to contain_concat('25-rspec.example.com.conf') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Require all granted$/ ) }
@@ -1141,7 +1141,7 @@
       end
 
       it { is_expected.to compile }
-      it { is_expected.to contain_file('25-rspec.example.com.conf') }
+      it { is_expected.to contain_concat('25-rspec.example.com.conf') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Require all granted$/ )

From a91d9d7293c0cb26b9bf7b1344ced6fb3dfadcd4 Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <mkennedy@clearwateranalytics.com>
Date: Thu, 15 Oct 2015 12:58:52 -0600
Subject: [PATCH 0817/2267] ThreadLimit needs to be above MaxClients or it is
 ignored. https://bz.apache.org/bugzilla/show_bug.cgi?id=46113

---
 templates/mod/worker.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/worker.conf.erb b/templates/mod/worker.conf.erb
index ad2bc44610..8ad6451c75 100644
--- a/templates/mod/worker.conf.erb
+++ b/templates/mod/worker.conf.erb
@@ -1,11 +1,11 @@
 <IfModule mpm_worker_module>
   ServerLimit         <%= @serverlimit %>
   StartServers        <%= @startservers %>
+  ThreadLimit         <%= @threadlimit %>
   MaxClients          <%= @maxclients %>
   MinSpareThreads     <%= @minsparethreads %>
   MaxSpareThreads     <%= @maxsparethreads %>
   ThreadsPerChild     <%= @threadsperchild %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
-  ThreadLimit         <%= @threadlimit %>
   ListenBacklog       <%= @listenbacklog %>
 </IfModule>

From 9fa1dd71aef812bde52337ea6a4b589d53ca10f1 Mon Sep 17 00:00:00 2001
From: Daehyung Lee <daehyung@gmail.com>
Date: Mon, 11 Jan 2016 14:03:33 +0900
Subject: [PATCH 0818/2267] Added support cache related options to
 apache::mod::ldap

Not to set the any options if you were not specified
---
 manifests/mod/ldap.pp       |  5 +++++
 templates/mod/ldap.conf.erb | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index d084186717..8586756d5a 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -2,6 +2,11 @@
   $apache_version                = $::apache::apache_version,
   $ldap_trusted_global_cert_file = undef,
   $ldap_trusted_global_cert_type = 'CA_BASE64',
+  $ldap_shared_cache_size        = undef,
+  $ldap_cache_entries            = undef,
+  $ldap_cache_ttl                = undef,
+  $ldap_opcache_entries          = undef,
+  $ldap_opcache_ttl              = undef,
 ){
   if ($ldap_trusted_global_cert_file) {
     validate_string($ldap_trusted_global_cert_type)
diff --git a/templates/mod/ldap.conf.erb b/templates/mod/ldap.conf.erb
index fbb4b92136..424fbe8ee7 100644
--- a/templates/mod/ldap.conf.erb
+++ b/templates/mod/ldap.conf.erb
@@ -12,3 +12,18 @@
 <% if @ldap_trusted_global_cert_file -%>
 LDAPTrustedGlobalCert <%= @ldap_trusted_global_cert_type %> <%= @ldap_trusted_global_cert_file %>
 <% end -%>
+<%- if @ldap_shared_cache_size -%>
+LDAPSharedCacheSize <%= @ldap_shared_cache_size %>
+<%- end -%>
+<%- if @ldap_cache_entries -%>
+LDAPCacheEntries <%= @ldap_cache_entries %>
+<%- end -%>
+<%- if @ldap_cache_ttl -%>
+LDAPCacheTTL <%= @ldap_cache_ttl %>
+<%- end -%>
+<%- if @ldap_opcache_entries -%>
+LDAPOpCacheEntries <%= @ldap_opcache_entries %>
+<%- end -%>
+<%- if @ldap_opcache_ttl -%>
+LDAPOpCacheTTL <%= @ldap_opcache_ttl %>
+<%- end -%>

From ed74be3277eac484254e0bb887c736b35c14389e Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Mon, 1 Feb 2016 11:14:11 +0000
Subject: [PATCH 0819/2267] adding docs and tests for ldap parameter additions

---
 README.md                     | 10 ++++++++++
 spec/classes/mod/ldap_spec.rb | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 707720a2b6..05b368686f 100644
--- a/README.md
+++ b/README.md
@@ -1508,6 +1508,11 @@ Installs and configures [`mod_ldap`][]. Allows you to modify the
 class { 'apache::mod::ldap':
   ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt'
   ldap_trusted_global_cert_type => 'CA_DER',
+  ldap_shared_cache_size        => '500000',
+  ldap_cache_entries            => '1024',
+  ldap_cache_ttl                => '600',
+  ldap_opcache_entries          => '1024',
+  ldap_opcache_ttl              => '600',
 }
 ~~~
 
@@ -1515,6 +1520,11 @@ class { 'apache::mod::ldap':
 
 - `ldap_trusted_global_cert_file`: Path and file name of the trusted CA certificates to use when establishing SSL or TLS connections to an LDAP server.
 - `ldap_trusted_global_cert_type`: The global trust certificate format. Defaults to 'CA_BASE64'.
+- `ldap_shared_cache_size`: Size in bytes of the shared-memory cache.
+- `ldap_cache_entries`: Maximum number of entries in the primary LDAP cache.
+- `ldap_cache_ttl`: Time that cached items remain valid.
+- `ldap_opcache_entries`: Number of entries used to cache LDAP compare operations.
+- `ldap_opcache_ttl`: Time that entries in the operation cache remain valid.
 
 ##### Class: `apache::mod::negotiation`
 
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 2b82d8d1bb..f51cafd4f7 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -32,12 +32,22 @@
       it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
     end
 
-    context 'ldap_trusted_global_cert_file and ldap_trusted_global_cert_type params' do
+    context 'set multiple ldap params' do
       let(:params) {{
         :ldap_trusted_global_cert_file => 'ca.pem',
-        :ldap_trusted_global_cert_type => 'CA_DER'
+        :ldap_trusted_global_cert_type => 'CA_DER',
+        :ldap_shared_cache_size        => '500000',
+        :ldap_cache_entries            => '1024',
+        :ldap_cache_ttl                => '600',
+        :ldap_opcache_entries          => '1024',
+        :ldap_opcache_ttl              => '600'
       }}
       it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPSharedCacheSize 500000$/) }
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPCacheEntries 1024$/) }
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPCacheTTL 600$/) }
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPOpCacheEntries 1024$/) }
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPOpCacheTTL 600$/) }
     end
   end #Debian
 

From 2f78dab061378ed6e0e5b7c6aa670dd2625dea14 Mon Sep 17 00:00:00 2001
From: Bob Vincent <robert.vincent1@verizon.com>
Date: Fri, 29 Jan 2016 17:02:16 -0500
Subject: [PATCH 0820/2267] Bugfix: require concat, not file

---
 manifests/init.pp           | 2 +-
 spec/classes/apache_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index b67c9f2fb3..13eb5f7172 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -345,7 +345,7 @@
       ensure  => file,
       content => template($conf_template),
       notify  => Class['Apache::Service'],
-      require => [Package['httpd'], File[$ports_file]],
+      require => [Package['httpd'], Concat[$ports_file]],
     }
 
     # preserve back-wards compatibility to the times when default_mods was
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 45f8a690c6..34d56ba4f7 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -504,7 +504,7 @@
       it { is_expected.to contain_file("/opt/rh/root/etc/httpd/conf/httpd.conf").with(
         'ensure'  => 'file',
         'notify'  => 'Class[Apache::Service]',
-        'require' => ['Package[httpd]', 'File[/etc/httpd/conf/ports.conf]'],
+        'require' => ['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'],
       ) }
     end
 

From 9996cb23a118ee14806197a8597be1c0cbe2e70b Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 2 Feb 2016 16:34:39 -0800
Subject: [PATCH 0821/2267] Fix passenger on redhat systems

Passenger needs their own repository now, so this PR adds that repo to
the apache::mod::passenger class.

It also updates the readme documenting which mods need epel or other
extra repositories (or at least the packages provided by those repos).

It also updates the style of the readme and some other linting issues.
---
 README.md                             | 545 +++++++++++++-------------
 manifests/mod/passenger.pp            |  16 +
 manifests/params.pp                   |  26 +-
 spec/acceptance/mod_passenger_spec.rb |  46 +--
 spec/acceptance/vhost_spec.rb         |  27 ++
 5 files changed, 355 insertions(+), 305 deletions(-)

diff --git a/README.md b/README.md
index f4dbe7829c..1ee7ce5ae6 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,6 @@
 [`apache::version`]: #class-apacheversion
 [`apache::vhost`]: #define-apachevhost
 [`apache::vhost::custom`]: #define-apachevhostcustom
-[`apache::vhost::WSGIImportScript`]: #wsgiimportscript
 [Apache HTTP Server]: http://httpd.apache.org
 [Apache modules]: http://httpd.apache.org/docs/current/mod/
 [array]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_array.html
@@ -290,19 +289,19 @@ To temporarily disable full Puppet management, set the [`purge_configs`][] param
 
 To have Puppet install Apache with the default parameters, declare the [`apache`][] class:
 
-~~~ puppet
+``` puppet
 class { 'apache': }
-~~~
+```
 
 The Puppet module applies a default configuration based on your operating system; Debian, Red Hat, FreeBSD, and Gentoo systems each have unique default configurations. These defaults work in testing environments but are not suggested for production, and Puppet recommends customizing the class's parameters to suit your site. Use the [Reference](#reference) section to find information about the class's parameters and their default values.
 
 You can customize parameters when declaring the `apache` class. For instance, this declaration installs Apache without the apache module's [default virtual host configuration][Configuring virtual hosts], allowing you to customize all Apache virtual hosts:
 
-~~~ puppet
+``` puppet
 class { 'apache':
   default_vhost => false,
 }
-~~~
+```
 
 ## Usage
 
@@ -314,41 +313,41 @@ The default [`apache`][] class sets up a virtual host on port 80, listening on a
 
 To configure basic [name-based virtual hosts][], specify the [`port`][] and [`docroot`][] parameters in the [`apache::vhost`][] define:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'vhost.example.com':
   port    => '80',
   docroot => '/var/www/vhost',
 }
-~~~
+```
 
 **Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] define applies a default [`priority`][] of 15, which Puppet interprets by prefixing the virtual host's file name with `15-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to 'false', Apache still processes virtual hosts in alphabetical order.
 
 To configure user and group ownership for `docroot`, use the [`docroot_owner`][] and [`docroot_group`][] parameters:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'user.example.com':
   port          => '80',
   docroot       => '/var/www/user',
   docroot_owner => 'www-data',
   docroot_group => 'www-data',
 }
-~~~
+```
 
 #### Configuring virtual hosts with SSL
 
 To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accommodate HTTPS requests:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'ssl.example.com':
   port    => '443',
   docroot => '/var/www/ssl',
   ssl     => true,
 }
-~~~
+```
 
 To configure a virtual host to use SSL and specific SSL certificates, use the paths to the certificate and key in the [`ssl_cert`][] and [`ssl_key`][] parameters, respectively:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'cert.example.com':
   port     => '443',
   docroot  => '/var/www/cert',
@@ -356,11 +355,11 @@ apache::vhost { 'cert.example.com':
   ssl_cert => '/etc/ssl/fourth.example.com.cert',
   ssl_key  => '/etc/ssl/fourth.example.com.key',
 }
-~~~
+```
 
 To configure a mix of SSL and unencrypted virtual hosts at the same domain, declare them with separate [`apache::vhost`] defines:
 
-~~~ puppet
+``` puppet
 # The non-ssl virtual host
 apache::vhost { 'mix.example.com non-ssl':
   servername => 'mix.example.com',
@@ -375,11 +374,11 @@ apache::vhost { 'mix.example.com ssl':
   docroot    => '/var/www/mix',
   ssl        => true,
 }
-~~~
+```
 
 To configure a virtual host to redirect unencrypted connections to SSL, declare them with separate [`apache::vhost`] defines and redirect unencrypted requests to the virtual host with SSL enabled:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'redirect.example.com non-ssl':
   servername      => 'redirect.example.com',
   port            => '80',
@@ -394,33 +393,33 @@ apache::vhost { 'redirect.example.com ssl':
   docroot    => '/var/www/redirect',
   ssl        => true,
 }
-~~~
+```
 
 #### Configuring virtual host port and address bindings
 
-Virtual hosts listen on all IP addresses ('*') by default. To configure the virtual host to listen on a specific IP address, use the [`ip`][] parameter:
+Virtual hosts listen on all IP addresses ('\*') by default. To configure the virtual host to listen on a specific IP address, use the [`ip`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'ip.example.com':
   ip      => '127.0.0.1',
   port    => '80',
   docroot => '/var/www/ip',
 }
-~~~
+```
 
 It is also possible to configure more than one IP address per vhost by using an array of IP addresses for the [`ip`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'ip.example.com':
   ip      => ['127.0.0.1','169.254.1.1'],
   port    => '80',
   docroot => '/var/www/ip',
 }
-~~~
+```
 
 To configure a virtual host with [aliased servers][], refer to the aliases using the [`serveraliases`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'aliases.example.com':
   serveraliases => [
     'aliases.example.org',
@@ -429,11 +428,11 @@ apache::vhost { 'aliases.example.com':
   port          => '80',
   docroot       => '/var/www/aliases',
 }
-~~~
+```
 
 To set up a virtual host with a wildcard alias for the subdomain mapped to a same-named directory, such as 'http://example.com.loc' mapped to `/var/www/example.com`, define the wildcard alias using the [`serveraliases`][] parameter and the document root with the [`virtual_docroot`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
   port            => '80',
@@ -441,11 +440,11 @@ apache::vhost { 'subdomain.loc':
   docroot         => '/var/www',
   serveraliases   => ['*.loc',],
 }
-~~~
+```
 
 To configure a virtual host with [filter rules][], pass the filter directives as an [array][] using the [`filters`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'subdomain.loc':
   port    => '80',
   filters => [
@@ -456,13 +455,13 @@ apache::vhost { 'subdomain.loc':
   ],
   docroot => '/var/www/html',
 }
-~~~
+```
 
 #### Configuring virtual hosts for apps and processors
 
 To set up a virtual host with [suPHP][], use the [`suphp_engine`][] parameter to enable the suPHP engine, [`suphp_addhandler`][] parameter to define a MIME type, [`suphp_configpath`][] to set which path suPHP passes to the PHP interpreter, and the [`directory`][] parameter to configure Directory, File, and Location directive blocks:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'suphp.example.com':
   port             => '80',
   docroot          => '/home/appuser/myphpapp',
@@ -478,11 +477,11 @@ apache::vhost { 'suphp.example.com':
     },
   ],
 }
-~~~
+```
 
 You can use a set of parameters to configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) for [Python][] applications:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'wsgi.example.com':
   port                        => '80',
   docroot                     => '/var/www/pythonapp',
@@ -501,53 +500,53 @@ apache::vhost { 'wsgi.example.com':
   wsgi_process_group          => 'wsgi',
   wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
 }
-~~~
+```
 
 Starting in Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement for common RewriteRules. You can set a FallbackResource using the [`fallbackresource`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'wordpress.example.com':
   port             => '80',
   docroot          => '/var/www/wordpress',
   fallbackresource => '/index.php',
 }
-~~~
+```
 
 **Note**: The `fallbackresource` parameter only supports the 'disabled' value since Apache 2.2.24.
 
 To configure a virtual host with a designated directory for [Common Gateway Interface][] (CGI) files, use the [`scriptalias`][] parameter to define the `cgi-bin` path:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'cgi.example.com':
   port        => '80',
   docroot     => '/var/www/cgi',
   scriptalias => '/usr/lib/cgi-bin',
 }
-~~~
+```
 
 To configure a virtual host for [Rack][], use the [`rack_base_uris`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'rack.example.com':
   port           => '80',
   docroot        => '/var/www/rack',
   rack_base_uris => ['/rackapp1', '/rackapp2'],
 }
-~~~
+```
 
 #### Configuring IP-based virtual hosts
 
 You can configure [IP-based virtual hosts][] to listen on any port and have them respond to requests on specific IP addresses. In this example, we set the server to listen on ports 80 and 81 because the example virtual hosts are _not_ declared with a [`port`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::listen { '80': }
 
 apache::listen { '81': }
-~~~
+```
 
 Then we configure the IP-based virtual hosts with the [`ip_based`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'first.example.com':
   ip       => '10.0.0.10',
   docroot  => '/var/www/first',
@@ -559,11 +558,11 @@ apache::vhost { 'second.example.com':
   docroot  => '/var/www/second',
   ip_based => true,
 }
-~~~
+```
 
 You can also configure a mix of IP- and [name-based virtual hosts][], and in any combination of [SSL][SSL encryption] and unencrypted configurations. First, we add two IP-based virtual hosts on an IP address (in this example, 10.0.0.10). One uses SSL and the other is unencrypted:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'The first IP-based virtual host, non-ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
@@ -580,11 +579,11 @@ apache::vhost { 'The first IP-based vhost, ssl':
   docroot    => '/var/www/first-ssl',
   ssl        => true,
 }
-~~~
+```
 
 Next, we add two name-based virtual hosts listening on a second IP address (10.0.0.20):
 
-~~~ puppet
+``` puppet
 apache::vhost { 'second.example.com':
   ip      => '10.0.0.20',
   port    => '80',
@@ -596,11 +595,11 @@ apache::vhost { 'third.example.com':
   port    => '80',
   docroot => '/var/www/third',
 }
-~~~
+```
 
 To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, you **must** set the [`add_listen`][] parameter to 'false' to disable the default Apache setting of `Listen 80`, as it conflicts with the preceding IP-based virtual hosts.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'fourth.example.com':
   port       => '80',
   docroot    => '/var/www/fourth',
@@ -612,7 +611,7 @@ apache::vhost { 'fifth.example.com':
   docroot    => '/var/www/fifth',
   add_listen => false,
 }
-~~~
+```
 
 ### Installing Apache modules
 
@@ -627,17 +626,17 @@ The Puppet apache module supports installing many common [Apache modules][], oft
 
 For example, you can install the `mod_ssl` Apache module with default settings by declaring the [`apache::mod::ssl`][] class:
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::ssl': }
-~~~
+```
 
 [`apache::mod::ssl`][] has several parameterized options that you can set when declaring it. For instance, to enable `mod_ssl` with compression enabled, set the [`ssl_compression`][] parameter to 'true':
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::ssl':
   ssl_compression => true,
 }
-~~~
+```
 
 Note that some modules have prerequisites, which are documented in their references under [`apache::mod::<MODULE NAME>`][].
 
@@ -645,11 +644,11 @@ Note that some modules have prerequisites, which are documented in their referen
 
 You can pass the name of any module that your operating system's package manager can install to the [`apache::mod`][] define to install it. Unlike the specific-module classes, the [`apache::mod`][] define doesn't tailor the installation based on other installed modules or with specific parameters---Puppet only grabs and installs the module's package, leaving detailed configuration up to you.
 
-For example, to install the [`mod_authnz_external`][] Apache module, declare the define with the 'mod_authnz_external' name:
+For example, to install the [`mod_authnz_external`][] Apache module, declare the define with the 'mod\_authnz\_external' name:
 
-~~~ puppet
+``` puppet
 apache::mod { 'mod_authnz_external': }
-~~~
+```
 
 There's several optional parameters you can specify when defining Apache modules this way. See the [define's reference][`apache::mod`] for details.
 
@@ -657,7 +656,7 @@ There's several optional parameters you can specify when defining Apache modules
 
 Add the [`apache::fastcgi::server`][] define to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
 
-~~~ puppet
+``` puppet
 apache::fastcgi::server { 'php':
   host       => '127.0.0.1:9000',
   timeout    => 15,
@@ -666,17 +665,17 @@ apache::fastcgi::server { 'php':
   fcgi_alias => '/php.fcgi',
   file_type  => 'application/x-httpd-php'
 }
-~~~
+```
 
 You can then use the [`custom_fragment`] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'www':
   ...
   custom_fragment => 'AddType application/x-httpd-php .php'
   ...
 }
-~~~
+```
 
 ### Load balancing examples
 
@@ -684,23 +683,23 @@ Apache supports load balancing across groups of servers through the [`mod_proxy`
 
 To enable load balancing with [exported resources][], export the [`apache::balancermember`][] define from the load balancer member server:
 
-~~~ puppet
+``` puppet
 @@apache::balancermember { "${::fqdn}-puppet00":
   balancer_cluster => 'puppet00',
   url              => "ajp://${::fqdn}:8009",
   options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
 }
-~~~
+```
 
 Then, on the proxy server, create the load balancing group:
 
-~~~ puppet
+``` puppet
 apache::balancer { 'puppet00': }
-~~~
+```
 
 To enable load balancing without exporting resources, declare the following on the proxy server:
 
-~~~ puppet
+``` puppet
 apache::balancer { 'puppet00': }
 
 apache::balancermember { "${::fqdn}-puppet00":
@@ -708,26 +707,26 @@ apache::balancermember { "${::fqdn}-puppet00":
     url              => "ajp://${::fqdn}:8009",
     options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
   }
-~~~
+```
 
 Then declare the `apache::balancer` and `apache::balancermember` defines on the proxy server.
 
 If you need to use the [ProxySet](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) directive on the balancer, use the [`proxy_set`](#proxy_set) parameter of `apache::balancer`:
 
-~~~ puppet
+``` puppet
 apache::balancer { 'puppet01':
   proxy_set => {
     'stickysession' => 'JSESSIONID',
   },
 }
-~~~
+```
 
 ## Reference
 
 - [**Public Classes**](#public-classes)
     - [Class: apache](#class-apache)
     - [Class: apache::dev](#class-apachedev)
-    - [Classes: apache::mod::*](#classes-apachemodname)
+    - [Classes: apache::mod::\*](#classes-apachemodname)
 - [**Private Classes**](#private-classes)
     - [Class: apache::confd::no_accf](#class-apacheconfdno_accf)
     - [Class: apache::default_confd_files](#class-apachedefault_confd_files)
@@ -763,15 +762,15 @@ When this class is declared with the default options, Puppet:
 
 - Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
 - Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system.
-- Configures the server with a default virtual host and standard port ('80') and address ('*') bindings.
+- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
 - Creates a document root directory determined by your operating system, typically `/var/www`.
 - Starts the Apache service.
 
 You can simply declare the default `apache` class:
 
-~~~ puppet
+``` puppet
 class { 'apache': }
-~~~
+```
 
 You can establish a default virtual host in this class, by using the [`apache::vhost`][] define, or both. You can also configure additional specific virtual hosts with the [`apache::vhost`][] define. Puppet recommends customizing the `apache` class's declaration with the following parameters, as its default settings are not optimized for production.
 
@@ -885,7 +884,7 @@ Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean.
 
 If 'true', Puppet automatically configures the following virtual host using the [`apache::vhost`][] define:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'default-ssl':
   port            => 443,
   ssl             => true,
@@ -894,7 +893,7 @@ apache::vhost { 'default-ssl':
   serveradmin     => $serveradmin,
   access_log_file => "ssl_${access_log_file}",
   }
-~~~
+```
 
 **Note**: SSL virtual hosts only respond to HTTPS queries.
 
@@ -914,13 +913,13 @@ Configures a specific dev package to use. Valid options: String.  Default: 'OS d
 
 Example for using httpd 2.4 from the IUS yum repo:
 
-~~~ puppet
+``` puppet
 include ::apache::dev
 class { 'apache':
   apache_name  => 'httpd24u',
   dev_packages => 'httpd24u-devel',
 }
-~~~
+```
 
 ##### `docroot`
 
@@ -992,19 +991,19 @@ Changes the error log's verbosity. Valid options: 'alert', 'crit', 'debug', 'eme
 
 Define additional [`LogFormat`][] directives. Valid options: A [Hash][], such as:
 
-~~~ puppet
+``` puppet
 $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
-~~~
+```
 
 There are a number of predefined `LogFormats` in the `httpd.conf` that Puppet creates:
 
-~~~ httpd
+``` httpd
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
-~~~
+```
 
 If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition.
 
@@ -1175,13 +1174,12 @@ Changes your virtual host configuration files' location. Default: determined by
 
 ##### `vhost_include_pattern`
 
-Defines the pattern for files included from the `vhost_dir`. This defaults to '*', also for BC with previous versions of this module.
+Defines the pattern for files included from the `vhost_dir`. This defaults to '\*', also for BC with previous versions of this module.
 
 However, you may want to set this to a value like '[^.#]\*.conf[^~]' to make sure files accidentally created in this directory (from version
 control systems, editor backups or the like) are *not* included in your server configuration.
 
-A value of '*.conf' is what is shipped by some operating systems. Also note that this module will, by default, create config files ending
-in '.conf'.
+A value of '\*.conf' is what is shipped by some operating systems. Also note that this module will, by default, create config files ending in '.conf'.
 
 ##### `user`
 
@@ -1225,23 +1223,23 @@ The default value is determined by your operating system:
 
 Enables specific [Apache modules][]. You can enable and configure an Apache module by declaring its class. For example, to install and enable [`mod_alias`][] with no icons, you can declare the [`apache::mod::alias`][] class with the `icons_options` parameter set to 'None':
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::alias':
   icons_options => 'None',
 }
-~~~
+```
 
 The following Apache modules have supported classes, many of which allow for parameterized configuration. You can install other Apache modules with the [`apache::mod`][] define.
 
 * `actions`
 * `alias` (see [`apache::mod::alias`][])
 * `auth_basic`
-* `auth_cas`* (see [`apache::mod::auth_cas`][])
-* `auth_mellon`* (see [`apache::mod::auth_mellon`][])
+* `auth_cas`\* (see [`apache::mod::auth_cas`][])
+* `auth_mellon`\* (see [`apache::mod::auth_mellon`][])
 * `auth_kerb`
 * `authn_core`
 * `authn_file`
-* `authnz_ldap`*
+* `authnz_ldap`\*
 * `authz_default`
 * `authz_user`
 * `autoindex`
@@ -1250,10 +1248,10 @@ The following Apache modules have supported classes, many of which allow for par
 * `cgid`
 * `dav`
 * `dav_fs`
-* `dav_svn`*
-* `deflate`
+* `dav_svn`\*
+* `deflate\`
 * `dev`
-* `dir`*
+* `dir`\*
 * `disk_cache` (see [`apache::mod::disk_cache`][])
 * `event` (see [`apache::mod::event`][])
 * `expires`
@@ -1264,40 +1262,40 @@ The following Apache modules have supported classes, many of which allow for par
 * `geoip` (see [`apache::mod::geoip`][])
 * `headers`
 * `include`
-* `info`*
+* `info`\*
 * `itk`
 * `ldap`
 * `mime`
-* `mime_magic`*
+* `mime_magic`\*
 * `negotiation`
-* `nss`*
+* `nss`\*
 * `pagespeed` (see [`apache::mod::pagespeed`][])
-* `passenger`* (see [`apache::mod::passenger`][])
+* `passenger`\* (see [`apache::mod::passenger`][])
 * `perl`
 * `peruser`
 * `php` (requires [`mpm_module`][] set to `prefork`)
-* `prefork`*
-* `proxy`*
+* `prefork`\*
+* `proxy`\*
 * `proxy_ajp`
 * `proxy_balancer`
-* `proxy_html`
+* `proxy_html` (see [`apache::mod::proxy_html`][])
 * `proxy_http`
 * `python`
 * `reqtimeout`
-* `remoteip`*
+* `remoteip`\*
 * `rewrite`
-* `rpaf`*
+* `rpaf`\*
 * `setenvif`
 * `security`
-* `shib`* (see [`apache::mod::shib`])
+* `shib`\* (see [`apache::mod::shib`])
 * `speling`
-* `ssl`* (see [`apache::mod::ssl`][])
-* `status`* (see [`apache::mod::status`][])
+* `ssl`\* (see [`apache::mod::ssl`][])
+* `status`\* (see [`apache::mod::status`][])
 * `suphp`
-* `userdir`*
+* `userdir`\*
 * `version`
 * `vhost_alias`
-* `worker`*
+* `worker`\*
 * `wsgi` (see [`apache::mod::wsgi`][])
 * `xsendfile`
 
@@ -1328,11 +1326,11 @@ Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`
 
 You can specify the cache root by passing a path as a string to the `cache_root` parameter.
 
-~~~ puppet
+``` puppet
 class {'::apache::mod::disk_cache':
   cache_root => '/path/to/cache',
 }
-~~~
+```
 
 ##### Class: `apache::mod::event`
 
@@ -1355,6 +1353,8 @@ Installs and manages [`mod_auth_cas`][]. Its parameters share names with the Apa
 
 The `cas_login_url` and `cas_validate_url` parameters are required; several other parameters have 'undef' default values.
 
+**Note**: The auth\_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL. See [https://github.com/Jasig/mod_auth_cas]()
+
 **Parameters within `apache::mod::auth_cas`**:
 
 - `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. Default: 'undef'.
@@ -1376,11 +1376,11 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
 Installs and manages [`mod_auth_mellon`][]. Its parameters share names with the Apache module's directives.
 
-~~~ puppet
+``` puppet
 class{ 'apache::mod::auth_mellon':
   mellon_cache_size => 101,
 }
-~~~
+```
 
 **Parameters within `apache::mod::auth_mellon`**:
 
@@ -1415,14 +1415,14 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 
 Installs and configures [`mod_ext_filter`][].
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::ext_filter':
   ext_filter_define => {
     'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
     'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
   },
 }
-~~~
+```
 
 **Parameters within `apache::mod::ext_filter`**:
 
@@ -1434,7 +1434,7 @@ Installs and configures [`mod_fcgid`][].
 
 The class makes no effort to individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [hash][]. For example:
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::fcgid':
   options => {
     'FcgidIPCDir'  => '/var/run/fcgidsock',
@@ -1442,13 +1442,13 @@ class { 'apache::mod::fcgid':
     'AddHandler'   => 'fcgid-script .fcgi',
   },
 }
-~~~
+```
 
 For a full list of options, see the [official `mod_fcgid` documentation][`mod_fcgid`].
 
 If you include `apache::mod::fcgid`, you can set the [`FcgidWrapper`][] per directory, per virtual host. The module must be loaded first; Puppet will not automatically enable it if you set the `fcgiwrapper` parameter in `apache::vhost`.
 
-~~~ puppet
+``` puppet
 include apache::mod::fcgid
 
 apache::vhost { 'example.org':
@@ -1460,7 +1460,7 @@ apache::vhost { 'example.org':
     }
   },
 }
-~~~
+```
 
 ##### Class: `apache::mod::geoip`
 
@@ -1504,7 +1504,7 @@ Installs and manages [`mod_passenger`][].
 Installs and configures [`mod_ldap`][]. Allows you to modify the
 [`LDAPTrustedGlobalCert`](https://httpd.apache.org/docs/2.2/mod/mod_ldap.html#ldaptrustedglobalcert) Directive:
 
-~~~puppet
+```puppet
 class { 'apache::mod::ldap':
   ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt'
   ldap_trusted_global_cert_type => 'CA_DER',
@@ -1514,7 +1514,7 @@ class { 'apache::mod::ldap':
   ldap_opcache_entries          => '1024',
   ldap_opcache_ttl              => '600',
 }
-~~~
+```
 
 **Parameters within `apache::mod::ldap`:**
 
@@ -1545,7 +1545,7 @@ While this Apache module requires the `mod-pagespeed-stable` package, Puppet **d
 
 - `inherit_vhost_config`: Default: 'on'.
 - `filter_xhtml`: Default: false.
-- `cache_path`: Default: '/var/cache/mod_pagespeed/'.
+- `cache_path`: Default: '/var/cache/mod\_pagespeed/'.
 - `log_dir`: Default: '/var/log/pagespeed'.
 - `memcache_servers`: Default: [].
 - `rewrite_level`: Default: 'CoreFilters'.
@@ -1579,6 +1579,18 @@ While this Apache module requires the `mod-pagespeed-stable` package, Puppet **d
 
 The class's parameters correspond to the module's directives. See the [module's documentation][`mod_pagespeed`] for details.
 
+##### Class: `apache::mod::passenger`
+
+Installs and configures mod\_passenger
+
+**Parameters within `apache::mod::passenger`**:
+
+- `manage_repo`: Manage phusionpassenger.com repository. Default: true.
+
+TODO: The parameters section is incomplete.
+
+**Note**: The passenger module isn't available on RH/CentOS without providing dependency packages provided by EPEL and mod\_passengers own custom repository. See the `manage_repo` parameter above and [https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()
+
 ##### Class: `apache::mod::php`
 
 Installs and configures [`mod_php`][].
@@ -1595,6 +1607,10 @@ Default values depend on your operating system.
 - `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
 - `content`: Adds arbitrary content to `php.conf`.
 
+##### Class: `apache::mod::proxy_html`
+
+**Note**: There is no official package available for mod\_proxy\_html and thus it must be made available by means outside of the control of the apache module.
+
 ##### Class: `apache::mod::reqtimeout`
 
 Installs and configures [`mod_reqtimeout`][].
@@ -1609,6 +1625,8 @@ Installs the [Shibboleth](http://shibboleth.net/) Apache module `mod_shib`, whic
 
 Defining this class enables Shibboleth-specific parameters in `apache::vhost` instances.
 
+**Note**: The shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories. See [http://wiki.aaf.edu.au/tech-info/sp-install-guide]()
+
 ##### Class: `apache::mod::ssl`
 
 Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration.
@@ -1655,7 +1673,7 @@ Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs b
 - `content_types`: A list of one or more allowed [MIME types][MIME `content-type`]. Default: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'
 - `crs_package`: Names the package that installs CRS rules. Default: `modsec_crs_package` in [`apache::params`][].
 - `modsec_dir`: Defines the path where Puppet installs the modsec configuration and activated rules links. Default: 'On', set by `modsec_dir` in [`apache::params`][].
-${modsec_dir}/activated_rules.
+${modsec\_dir}/activated\_rules.
 - `modsec_secruleengine`: Configures the modsec rules engine. Valid options: 'On', 'Off', and 'DetectionOnly'. Default: `modsec_secruleengine` in [`apache::params`][].
 - `restricted_extensions`: A space-separated list of prohibited file extensions. Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
 - `restricted_headers`: A list of restricted headers separated by slashes and spaces. Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
@@ -1674,7 +1692,7 @@ Otherwise, Puppet follows it literally.
 - `package_name`: Names the package that installs `mod_wsgi`. Default: undef.
 - `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. Valid options: path. Default: undef.
 - `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site-packages'. Valid options: path. Default: undef.
-- `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE_RUN_DIR}WSGI". Default: `wsgi_socket_prefix` in [`apache::params`][].
+- `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE\_RUN\_DIR}WSGI". Default: `wsgi_socket_prefix` in [`apache::params`][].
 
 The class's parameters correspond to the module's directives. See the [module's documentation][`mod_wsgi`] for details.
 
@@ -1766,7 +1784,7 @@ Specifies whether the configuration file should be present. Valid options: 'abse
 
 ##### `confdir`
 
-Sets the directory in which Puppet places configuration files. Default: '$::apache::confd_dir'.
+Sets the directory in which Puppet places configuration files. Default: '$::apache::confd\_dir'.
 
 ##### `content`
 
@@ -1828,7 +1846,7 @@ Sets the [MIME `content-type`][] of the file to be processed by the FastCGI serv
 
 #### Define: `apache::listen`
 
-Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this define, and titles take the form '<PORT>', '<IPV4>:<PORT>', or '<IPV6>:<PORT>'.
+Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this define, and titles take the form '\<PORT\>', '\<IPV4\>:\<PORT\>', or '\<IPV6\>:\<PORT\>'.
 
 #### Define: `apache::mod`
 
@@ -1868,7 +1886,7 @@ Specifies a path to the module. Default: [`lib_path`][]/[`lib`][]. Don't manuall
 
 #### Define: `apache::namevirtualhost`
 
-Enables [name-based virtual hosts][] and adds all related directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles can take the forms '\*', '*:<PORT>', '\_default_:<PORT>, '<IP>', or '<IP>:<PORT>'.
+Enables [name-based virtual hosts][] and adds all related directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles can take the forms '\*', '\*:\<PORT\>', '\_default\_:\<PORT\>, '\<IP\>', or '\<IP\>:\<PORT\>'.
 
 #### Define: `apache::vhost`
 
@@ -1892,7 +1910,7 @@ Specifies that only requests with particular environment variables be logged. De
 
 ##### `access_log_file`
 
-Sets the filename of the `*_access.log` placed in [`logroot`][]. Given a virtual host---for instance, example.com---it defaults to 'example.com_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com_access.log' for unencrypted virtual hosts.
+Sets the filename of the `*_access.log` placed in [`logroot`][]. Given a virtual host---for instance, example.com---it defaults to 'example.com\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_access.log' for unencrypted virtual hosts.
 
 ##### `access_log_format`
 
@@ -1930,7 +1948,7 @@ Passes a list of [Hashes][Hash] to the virtual host to create [`Alias`][], [`Ali
 
 For example:
 
-~~~ puppet
+``` puppet
 aliases => [
   { aliasmatch       => '^/image/(.*)\.jpg$',
     path             => '/files/jpg.images/$1.jpg',
@@ -1948,7 +1966,7 @@ aliases => [
     path             => '/usr/share/nagios/html',
   },
 ],
-~~~
+```
 
 For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs a corresponding context, such as `<Directory /path/to/directory>` or `<Location /some/location/here>`. Puppet creates the directives in the order specified in the `aliases` parameter. As described in the [`mod_alias`][] documentation, add more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more general ones to avoid shadowing.
 
@@ -2008,7 +2026,7 @@ Specifies whether `*_error.log` directives should be configured. Defaults to 'tr
 
 ##### `error_log_file`
 
-Points to the `*_error.log` file. Given a vhost, example.com, it defaults to 'example.com_ssl_error.log' for SSL vhosts and 'example.com_access_error.log' for non-SSL vhosts.
+Points to the `*_error.log` file. Given a vhost, example.com, it defaults to 'example.com\_ssl\_error.log' for SSL vhosts and 'example.com_access_error.log' for non-SSL vhosts.
 
 ##### `error_log_pipe`
 
@@ -2022,14 +2040,14 @@ Sends all error log messages to syslog. Defaults to 'undef'.
 
 A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this vhost. Defaults to '[]'. Example:
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       error_documents => [
         { 'error_code' => '503', 'document' => '/service-unavail' },
         { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
       ],
     }
-~~~
+```
 
 ##### `ensure`
 
@@ -2043,7 +2061,7 @@ Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.htm
 
 [Filters](http://httpd.apache.org/docs/2.2/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
 
-~~~ puppet
+``` puppet
     apache::vhost { "$::fqdn":
       filters => [
         'FilterDeclare   COMPRESS',
@@ -2052,7 +2070,7 @@ Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.htm
         'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
       ],
     }
-~~~
+```
 
 ##### `force_type`
 
@@ -2084,7 +2102,7 @@ Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys can be:
 
 Usage typically looks like:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot => '/path/to/directory',
   itk     => {
@@ -2092,7 +2110,7 @@ apache::vhost { 'sample.example.net':
     group => 'somegroup',
   },
 }
-~~~
+```
 
 ##### `auth_kerb`
 
@@ -2100,7 +2118,7 @@ Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid values are 'true
 
 Usage typically looks like:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   auth_kerb              => true,
   krb_method_negotiate   => 'on',
@@ -2113,7 +2131,7 @@ apache::vhost { 'sample.example.net':
     auth_require => 'valid-user',
   },
 }
-~~~
+```
 
 Related parameters follow the names of `mod_auth_kerb` directives:
 
@@ -2138,7 +2156,7 @@ This option enables credential saving functionality. Default is 'off'
 
 ##### `logroot`
 
-Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
+Specifies the location of the virtual host's logfiles. Defaults to '/var/log/\<apache log location\>/'.
 
 ##### `$logroot_ensure`
 
@@ -2165,17 +2183,17 @@ Boolean.  Only valid if apache::mod::security is included.  Used to disable mod_
 
 Array of mod_security IDs to remove from the vhost.  Also takes a hash allowing removal of an ID from a specific location.
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       modsec_disable_ids => [ 90015, 90016 ],
     }
-~~~
+```
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
     }
-~~~
+```
 
 ###### `modsec_disable_ips`
 
@@ -2203,12 +2221,12 @@ Sets the [ProxyErrorOverride Directive](http://httpd.apache.org/docs/current/mod
 
 Sets the [`Options`][] for the specified virtual host. Default: ['Indexes','FollowSymLinks','MultiViews'], as demonstrated below:
 
-~~~ puppet
+``` puppet
     apache::vhost { 'site.name.fdqn':
       …
       options => ['Indexes','FollowSymLinks','MultiViews'],
     }
-~~~
+```
 
 **Note**: If you use the [`directories`][] parameter of [`apache::vhost`][], 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
@@ -2274,7 +2292,7 @@ Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/
 
 Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters and location options can be added as an array.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   proxy_pass => [
@@ -2295,7 +2313,7 @@ apache::vhost { 'site.name.fdqn':
       'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
   ],
 }
-~~~
+```
 
 `reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
 `reverse_cookies` is optional and is used to set ProxyPassReverseCookiePath and/or ProxyPassReverseCookieDomain.
@@ -2316,11 +2334,11 @@ This directive is equivalent to proxy_pass, but takes regular expressions, see [
 
 ##### `rack_base_uris`
 
-Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
+Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the \_rack.erb template. Defaults to 'undef'.
 
 #####`passenger_base_uris`
 
-Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. Defaults to 'undef'.
+Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the \_passenger\_base\_uris.erb template. Defaults to 'undef'.
 
 ##### `redirect_dest`
 
@@ -2330,43 +2348,43 @@ Specifies the address to redirect to. Defaults to 'undef'.
 
 Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   redirect_source => ['/images','/downloads'],
   redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
 }
-~~~
+```
 
 ##### `redirect_status`
 
 Specifies the status to append to the redirect. Defaults to 'undef'.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   redirect_status => ['temp','permanent'],
 }
-~~~
+```
 
 ##### `redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
 
 Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Defaults to 'undef'.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   redirectmatch_status => ['404','404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
 }
-~~~
+```
 
 ##### `request_headers`
 
 Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Defaults to 'undef'.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   request_headers => [
@@ -2374,23 +2392,23 @@ apache::vhost { 'site.name.fdqn':
     'unset MirrorID',
   ],
 }
-~~~
+```
 ##### `rewrites`
 
 Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Defaults to 'undef'.
 
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
 }
-~~~
+```
 
 The parameter allows rewrite conditions that, when true, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   rewrites => [
@@ -2401,11 +2419,11 @@ apache::vhost { 'site.name.fdqn':
     },
   ],
 }
-~~~
+```
 
 You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   rewrites => [
@@ -2416,11 +2434,11 @@ apache::vhost { 'site.name.fdqn':
     },
   ],
 }
-~~~
+```
 
 Multiple rewrites and conditions are also possible
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   rewrites => [
@@ -2445,7 +2463,7 @@ apache::vhost { 'site.name.fdqn':
     },
   ],
 }
-~~~
+```
 
 Refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions.
 
@@ -2459,7 +2477,7 @@ Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for exa
 
 Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html).
 
-~~~ puppet
+``` puppet
 scriptaliases => [
   {
     alias => '/myscript',
@@ -2478,7 +2496,7 @@ scriptaliases => [
     path  => '/usr/share/neatscript',
   },
 ]
-~~~
+```
 
 The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases before more general ones to avoid shadowing.
 
@@ -2500,11 +2518,11 @@ Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
 
 Example:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'setenv.example.com':
   setenv => ['SPECIAL_PATH /foo/bin'],
 }
-~~~
+```
 
 ##### `setenvif`
 
@@ -2522,7 +2540,7 @@ Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=
 
 To set up a virtual host with suPHP
 
-~~~ puppet
+``` puppet
 apache::vhost { 'suphp.example.com':
   port                => '80',
   docroot             => '/home/appuser/myphpapp',
@@ -2533,17 +2551,17 @@ apache::vhost { 'suphp.example.com':
     'suphp'           => { user => 'myappuser', group => 'myappgroup' },
   }
 }
-~~~
+```
 
 ##### `vhost_name`
 
-Enables name-based virtual hosting. If no IP is passed to the virtual host, but the vhost is assigned a port, then the vhost name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name is set to the title of the resource. Defaults to '*'.
+Enables name-based virtual hosting. If no IP is passed to the virtual host, but the vhost is assigned a port, then the vhost name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name is set to the title of the resource. Defaults to '\*'.
 
 ##### `virtual_docroot`
 
 Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name       => '*',
   port             => '80',
@@ -2551,7 +2569,7 @@ apache::vhost { 'subdomain.loc':
   docroot          => '/var/www',
   serveraliases    => ['*.loc',],
 }
-~~~
+```
 
 ##### `wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
 
@@ -2571,7 +2589,7 @@ Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
 
 To set up a virtual host with WSGI
 
-~~~ puppet
+``` puppet
 apache::vhost { 'wsgi.example.com':
   port                        => '80',
   docroot                     => '/var/www/pythonapp',
@@ -2585,11 +2603,11 @@ apache::vhost { 'wsgi.example.com':
   wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
   wsgi_chunked_request        => 'On',
 }
-~~~
+```
 
 #### Parameter `directories` for `apache::vhost`
 
-The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
+The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '\< Directory /path/to/directory\>...\</Directory\>'.
 
 The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys.
 
@@ -2597,7 +2615,7 @@ The `provider` key is optional. If missing, this key defaults to 'directory'. Va
 
 General `directories` usage looks something like
 
-~~~ puppet
+``` puppet
 apache::vhost { 'files.example.net':
   docroot     => '/var/www/files',
   directories => [
@@ -2607,18 +2625,18 @@ apache::vhost { 'files.example.net':
      },
   ],
 }
-~~~
+```
 
 *Note:* At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
 
 Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes.  This looks like
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [ { path => '/path/to/directory', handler => value } ],
 }
-~~~
+```
 
 Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are:
 
@@ -2626,7 +2644,7 @@ Any handlers you do not set in these hashes are considered 'undefined' within Pu
 
 Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2635,13 +2653,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `allow`
 
 Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2650,13 +2668,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `allow_override`
 
 Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot      => '/path/to/directory',
   directories  => [
@@ -2665,7 +2683,7 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `auth_basic_authoritative`
 
@@ -2727,7 +2745,7 @@ Sets the value for [AuthUserFile](http://httpd.apache.org/docs/current/mod/mod_a
 
 Pass a string of custom configuration directives to be placed at the end of the directory configuration.
 
-~~~ puppet
+``` puppet
   apache::vhost { 'monitor':
     …
     directories => [
@@ -2748,13 +2766,13 @@ Pass a string of custom configuration directives to be placed at the end of the
       },
     ]
   }
-~~~
+```
 
 ###### `deny`
 
 Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2763,13 +2781,13 @@ Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) dir
         },
       ],
     }
-~~~
+```
 
 ###### `error_documents`
 
 An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   directories => [
     { path            => '/srv/www',
@@ -2781,14 +2799,14 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `ext_filter_options`
 
 Sets the [ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
 Note that you must declare `class { 'apache::mod::ext_filter': }` before using this directive.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'filter.example.org':
   docroot     => '/var/www/filter',
   directories => [
@@ -2797,14 +2815,14 @@ apache::vhost { 'filter.example.org':
     },
   ],
 }
-~~~
+```
 
 ###### `geoip_enable`
 
 Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive.
 Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'first.example.com':
   docroot     => '/var/www/first',
   directories => [
@@ -2813,13 +2831,13 @@ apache::vhost { 'first.example.com':
     },
   ],
 }
-~~~
+```
 
 ###### `headers`
 
 Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => {
@@ -2827,13 +2845,13 @@ apache::vhost { 'sample.example.net':
     headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
   },
 }
-~~~
+```
 
 ###### `index_options`
 
 Allows configuration settings for [directory indexing](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2844,13 +2862,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `index_order_default`
 
 Sets the [default ordering](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2860,13 +2878,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `index_style_sheet`
 
 Sets the [IndexStyleSheet](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet), which adds a CSS stylesheet to the directory index.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2877,13 +2895,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `mellon_enable`
 
 Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_melon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2905,7 +2923,7 @@ apache::vhost { 'sample.example.net':
     },
   ]
 }
-~~~
+```
 
 Related parameters follow the names of `mod_auth_melon` directives:
 
@@ -2923,7 +2941,7 @@ to environment variables.
 
 Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2932,13 +2950,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `order`
 
 Sets the order of processing Allow and Deny statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2947,13 +2965,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `passenger_enabled`
 
 Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directive to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2962,7 +2980,7 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
@@ -2980,7 +2998,7 @@ apache::vhost { 'sample.example.net':
 
 Sets a `Require` directive as per the [Apache Authz documentation](http://httpd.apache.org/docs/current/mod/mod_authz_core.html#require). If no `require` is set, it will default to `Require all granted`.
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -2989,11 +3007,11 @@ Sets a `Require` directive as per the [Apache Authz documentation](http://httpd.
         }
       ],
     }
-~~~
+```
 
 If `require` is set to `unmanaged` it will not be set at all. This is useful for complex authentication/authorization requirements which are handled in a custom fragment.
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       docroot     => '/path/to/directory',
       directories => [
@@ -3002,13 +3020,13 @@ If `require` is set to `unmanaged` it will not be set at all. This is useful for
         }
       ],
     }
-~~~
+```
 
 ###### `satisfy`
 
 Sets a `Satisfy` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3017,13 +3035,13 @@ apache::vhost { 'sample.example.net':
     }
   ],
 }
-~~~
+```
 
 ###### `sethandler`
 
 Sets a `SetHandler` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler).
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3032,13 +3050,13 @@ apache::vhost { 'sample.example.net':
     }
   ],
 }
-~~~
+```
 
 ###### `set_output_filter`
 
 Sets a `SetOutputFilter` directive per the [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
 
-~~~ puppet
+``` puppet
 apache::vhost{ 'filter.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3047,13 +3065,13 @@ apache::vhost{ 'filter.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `rewrites`
 
 Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'secure.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3072,15 +3090,15 @@ apache::vhost { 'secure.example.net':
     },
   ],
 }
-~~~
+```
 
-***Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
+**Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
 
 ###### `shib_request_setting`
 
 Allows a valid content setting to be set or altered for the application request. This command takes two parameters: the name of the content setting, and the value to set it to. Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'secure.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3090,7 +3108,7 @@ apache::vhost { 'secure.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `shib_use_headers`
 
@@ -3100,7 +3118,7 @@ When set to 'On', this turns on the use of request headers to publish attributes
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'secure.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3112,13 +3130,13 @@ apache::vhost { 'secure.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `suphp`
 
 A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and can only be passed within `directories`.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'secure.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3130,7 +3148,7 @@ apache::vhost { 'secure.example.net':
     },
   ],
 }
-~~~
+```
 
 #### SSL parameters for `apache::vhost`
 
@@ -3186,25 +3204,25 @@ Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tl
 
 ##### `ssl_verify_client`
 
-Sets the [SSLVerifyClient](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid values are: 'none', 'optional', 'require', and 'optional_no_ca'. Defaults to 'undef'.
+Sets the [SSLVerifyClient](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid values are: 'none', 'optional', 'require', and 'optional\_no\_ca'. Defaults to 'undef'.
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_verify_client => 'optional',
     }
-~~~
+```
 
 ##### `ssl_verify_depth`
 
 Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Defaults to 'undef'.
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_verify_depth => 1,
     }
-~~~
+```
 
 ##### `ssl_proxy_verify`
 
@@ -3214,12 +3232,12 @@ Sets the [SSLProxyVerify](http://httpd.apache.org/docs/current/mod/mod_ssl.html#
 
 Sets the [SSLProxyMachineCertificateFile](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers.  This file should be a concatenation of the PEM-encoded certificate files in order of preference.  Defaults to 'undef'.
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
     }
-~~~
+```
 
 ##### `ssl_proxy_check_peer_cn`
 
@@ -3236,21 +3254,21 @@ Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslo
 
 A string:
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_options => '+ExportCertData',
     }
-~~~
+```
 
 An array:
 
-~~~ puppet
+``` puppet
     apache::vhost { 'sample.example.net':
       …
       ssl_options => [ '+StrictRequire', '+ExportCertData' ],
     }
-~~~
+```
 
 ##### `ssl_openssl_conf_cmd`
 
@@ -3262,13 +3280,13 @@ Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/cu
 
 ####Define: FastCGI Server
 
-This type is intended for use with mod_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
+This type is intended for use with mod\_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
 
 ** Note ** If using Ubuntu 10.04+, you'll need to manually enable the multiverse repository.
 
 Ex:
 
-~~~ puppet
+``` puppet
 apache::fastcgi::server { 'php':
   host       => '127.0.0.1:9000',
   timeout    => 15,
@@ -3277,17 +3295,17 @@ apache::fastcgi::server { 'php':
   fcgi_alias => '/php.fcgi',
   file_type  => 'application/x-httpd-php'
 }
-~~~
+```
 
 Within your virtual host, you can then configure the specified file type to be handled by the fastcgi server specified above.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'www':
   ...
   custom_fragment => 'AddType application/x-httpd-php .php'
   ...
 }
-~~~
+```
 
 ##### `host`
 
@@ -3299,7 +3317,7 @@ The number of seconds of FastCGI application inactivity allowed before the reque
 
 ##### `flush`
 
-Force a write to the client as data is received from the application. By default, mod_fastcgi buffers data in order to free the application as quickly as possible.
+Force a write to the client as data is received from the application. By default, mod\_fastcgi buffers data in order to free the application as quickly as possible.
 
 ##### `faux_path`
 
@@ -3357,22 +3375,6 @@ The Apache module relies heavily on templates to enable the [`apache::vhost`][]
 
 ## Limitations
 
-### Ubuntu 10.04
-
-The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
-
-### RHEL/CentOS 5
-
-The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested since repositories are missing compatible packages.
-
-### RHEL/CentOS 6
-
-The [`apache::mod::passenger`][] class is not installing as the the EL6 repository is missing compatible packages.
-
-### RHEL/CentOS 7
-
-The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] define's [`rack_base_uris`][] parameter.
-
 ### General
 
 This module is CI tested against both [open source Puppet][] and [Puppet Enterprise][] on:
@@ -3384,13 +3386,22 @@ This module is CI tested against both [open source Puppet][] and [Puppet Enterpr
 
 This module also provides functions for other distributions and operating systems, such as FreeBSD, Gentoo, and Amazon Linux, but is not formally tested on them and are subject to regressions.
 
+### Ubuntu 10.04
+
+The [`apache::vhost::wsgi_import_script`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
+
+### RHEL/CentOS
+The [`apache::mod::auth_cas`][], [`apache::mod::passenger`][], [`apache::mod::proxy_html`][] and [`apache::mod::shib`][] classes are not functional on RH/CentOS without providing dependency packages from extra repositories.
+
+See their respective documentation above for related repositories and packages.
+
 ### SELinux and custom paths
 
 If [SELinux][] is in [enforcing mode][] and you want to use custom paths for `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you need to manage the files' context yourself.
 
 You can do this with Puppet:
 
-~~~ puppet
+``` puppet
 exec { 'set_apache_defaults':
   command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"',
   path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
@@ -3427,7 +3438,7 @@ apache::vhost { 'test.server':
   docroot             => '/custom/path',
   additional_includes => '/custom/path/include',
 }
-~~~
+```
 
 You need to set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
@@ -3451,18 +3462,18 @@ This project contains tests for both [rspec-puppet][] and [beaker-rspec][] to ve
 
 #### Testing quickstart: Ruby > 1.8.7
 
-~~~
+```
 gem install bundler
 bundle install
 bundle exec rake spec
 bundle exec rspec spec/acceptance
 RS_DEBUG=yes bundle exec rspec spec/acceptance
-~~~
+```
 
 #### Testing quickstart: Ruby = 1.8.7
 
-~~~
+```
 gem install bundler
 bundle install --without system_tests
 bundle exec rake spec
-~~~
+```
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 8d3622d304..d0b9f73fee 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -17,6 +17,7 @@
   $passenger_use_global_queue       = undef,
   $passenger_app_env                = undef,
   $passenger_log_file               = undef,
+  $manage_repo                      = true,
   $mod_package                      = undef,
   $mod_package_ensure               = undef,
   $mod_lib                          = undef,
@@ -52,6 +53,21 @@
     $_lib_path = $mod_lib_path
   }
 
+  if $::osfamily == 'RedHat' and $manage_repo {
+    yumrepo { 'passenger':
+      ensure        => 'present',
+      baseurl       => 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch',
+      descr         => 'passenger',
+      enabled       => '1',
+      gpgcheck      => '0',
+      gpgkey        => 'https://packagecloud.io/gpg.key',
+      repo_gpgcheck => '1',
+      sslcacert     => '/etc/pki/tls/certs/ca-bundle.crt',
+      sslverify     => '1',
+      before        => Apache::Mod['passenger'],
+    }
+  }
+
   $_id = $mod_id
   $_path = $mod_path
   ::apache::mod { 'passenger':
diff --git a/manifests/params.pp b/manifests/params.pp
index abef55e0ba..a8cd7bfebd 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -31,15 +31,9 @@
 
   # Default mime types settings
   $mime_types_additional = {
-    'AddHandler' => {
-      'type-map' => 'var'
-      },
-    'AddType'    => {
-      'text/html' => '.shtml'
-      },
-    'AddOutputFilter' => {
-      'INCLUDES'      => '.shtml'
-      },
+    'AddHandler'      => { 'type-map'  => 'var', },
+    'AddType'         => { 'text/html' => '.shtml', },
+    'AddOutputFilter' => { 'INCLUDES'  => '.shtml', },
   }
 
   # should we use systemd module?
@@ -91,9 +85,8 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
-    # NOTE: The module for Shibboleth is not available to RH/CentOS without an additional repository. http://wiki.aaf.edu.au/tech-info/sp-install-guide
-    # NOTE: The auth_cas module isn't available to RH/CentOS without enabling EPEL.
     $mod_packages         = {
+      # NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
       'auth_cas'    => 'mod_auth_cas',
       'auth_kerb'   => 'mod_auth_kerb',
       'auth_mellon' => 'mod_auth_mellon',
@@ -109,6 +102,10 @@
         default => undef,
       },
       'pagespeed'   => 'mod-pagespeed-stable',
+      # NOTE: The passenger module isn't available on RH/CentOS without
+      # providing dependency packages provided by EPEL and passenger
+      # repositories. See
+      # https://www.phusionpassenger.com/library/install/apache/install/oss/el7/
       'passenger'   => 'mod_passenger',
       'perl'        => 'mod_perl',
       'php5'        => $::apache::version::distrelease ? {
@@ -118,6 +115,9 @@
       'proxy_html'  => 'mod_proxy_html',
       'python'      => 'mod_python',
       'security'    => 'mod_security',
+      # NOTE: The module for Shibboleth is not available on RH/CentOS without
+      # providing dependency packages provided by Shibboleth's repositories.
+      # See http://wiki.aaf.edu.au/tech-info/sp-install-guide
       'shibboleth'  => 'shibboleth',
       'ssl'         => 'mod_ssl',
       'wsgi'        => 'mod_wsgi',
@@ -183,7 +183,7 @@
       'base_rules/modsecurity_crs_49_inbound_blocking.conf',
       'base_rules/modsecurity_crs_50_outbound.conf',
       'base_rules/modsecurity_crs_59_outbound_blocking.conf',
-      'base_rules/modsecurity_crs_60_correlation.conf'
+      'base_rules/modsecurity_crs_60_correlation.conf',
     ]
   } elsif $::osfamily == 'Debian' {
     $user                = 'www-data'
@@ -287,7 +287,7 @@
       'base_rules/modsecurity_crs_49_inbound_blocking.conf',
       'base_rules/modsecurity_crs_50_outbound.conf',
       'base_rules/modsecurity_crs_59_outbound_blocking.conf',
-      'base_rules/modsecurity_crs_60_correlation.conf'
+      'base_rules/modsecurity_crs_60_correlation.conf',
     ]
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 086c93eea7..fd967d1ea6 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -49,38 +49,34 @@
     conf_file = "#{$mod_dir}/passenger.conf"
     load_file = "#{$mod_dir}/zpassenger.load"
     # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part
-    passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.1'
+    passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
     passenger_ruby = '/usr/bin/ruby'
-    passenger_tempdir = '/var/run/rubygem-passenger'
     passenger_module_path = 'modules/mod_passenger.so'
     rackapp_user = 'apache'
     rackapp_group = 'apache'
   end
 
   pp_rackapp = <<-EOS
-          /* a simple ruby rack 'hellow world' app */
-          file { '/var/www/passenger':
-            ensure  => directory,
-            owner   => '#{rackapp_user}',
-            group   => '#{rackapp_group}',
-            require => Class['apache::mod::passenger'],
-          }
-          file { '/var/www/passenger/config.ru':
-            ensure  => file,
-            owner   => '#{rackapp_user}',
-            group   => '#{rackapp_group}',
-            content => "app = proc { |env| [200, { \\"Content-Type\\" => \\"text/html\\" }, [\\"hello <b>world</b>\\"]] }\\nrun app",
-            require => File['/var/www/passenger'] ,
-          }
-          apache::vhost { 'passenger.example.com':
-            port    => '80',
-            docroot => '/var/www/passenger/public',
-            docroot_group => '#{rackapp_group}' ,
-            docroot_owner => '#{rackapp_user}' ,
-            custom_fragment => "PassengerRuby  #{passenger_ruby}\\nRailsEnv  development" ,
-            require => File['/var/www/passenger/config.ru'] ,
-          }
-          host { 'passenger.example.com': ip => '127.0.0.1', }
+    /* a simple ruby rack 'hello world' app */
+    file { '/var/www/passenger':
+      ensure => directory,
+      owner  => '#{rackapp_user}',
+      group  => '#{rackapp_group}',
+    }
+    file { '/var/www/passenger/config.ru':
+      ensure  => file,
+      owner   => '#{rackapp_user}',
+      group   => '#{rackapp_group}',
+      content => "app = proc { |env| [200, { \\"Content-Type\\" => \\"text/html\\" }, [\\"hello <b>world</b>\\"]] }\\nrun app",
+    }
+    apache::vhost { 'passenger.example.com':
+      port          => '80',
+      docroot       => '/var/www/passenger/public',
+      docroot_group => '#{rackapp_group}',
+      docroot_owner => '#{rackapp_user}',
+      require       => File['/var/www/passenger/config.ru'],
+    }
+    host { 'passenger.example.com': ip => '127.0.0.1', }
   EOS
 
   case fact('osfamily')
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index b9b3a80acc..90b42e0e6e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1106,6 +1106,33 @@ class { 'apache': service_ensure => stopped, }
     end
   end
 
+  # Passenger isn't even in EPEL on el-5
+  if (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5')
+    describe 'rack_base_uris' do
+      before :all do
+        pp = "if $::osfamily == 'RedHat' { include epel }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      it 'applies cleanly' do
+        pp = <<-EOS
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot          => '/tmp',
+            rack_base_uris  => ['/test'],
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe file("#{$vhost_dir}/25-test.server.conf") do
+        it { is_expected.to be_file }
+        it { is_expected.to contain 'RackBaseURI /test' }
+      end
+    end
+  end
+
   describe 'no_proxy_uris' do
     it 'applies cleanly' do
       pp = <<-EOS

From b1f60c7c4297de78350a10cbede8ed1149df0fdd Mon Sep 17 00:00:00 2001
From: Alan Chalmers <alan.chalmers@gmail.com>
Date: Wed, 3 Feb 2016 16:32:28 +1100
Subject: [PATCH 0822/2267] allow status code on redirect match to be optional
 and not a requirement   as per apache documentation  
 http://httpd.apache.org/docs/2.2/mod/mod_alias.html#redirectmatch

---
 manifests/vhost.pp            |  2 +-
 templates/vhost/_redirect.erb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8b5422e5ae..912be76e52 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -748,7 +748,7 @@
   # - $redirectmatch_status_a
   # - $redirectmatch_regexp_a
   # - $redirectmatch_dest
-  if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp and $redirectmatch_dest) {
+  if ($redirect_source and $redirect_dest) or ($redirectmatch_regexp and $redirectmatch_dest) {
     concat::fragment { "${name}-redirect":
       target  => "${priority_real}${filename}.conf",
       order   => 180,
diff --git a/templates/vhost/_redirect.erb b/templates/vhost/_redirect.erb
index 69bbfd09de..209da646cc 100644
--- a/templates/vhost/_redirect.erb
+++ b/templates/vhost/_redirect.erb
@@ -22,4 +22,14 @@
 <% @redirectmatch_dest_a[i] ||= @redirectmatch_dest_a[0] -%>
   RedirectMatch <%= "#{@redirectmatch_status_a[i]} " %> <%= @redirectmatch_regexp_a[i] %> <%= @redirectmatch_dest_a[i] %>
   <%- end -%>
+<%- elsif @redirectmatch_regexp and @redirectmatch_dest -%>
+<% @redirectmatch_regexp_a = Array(@redirectmatch_regexp) -%>
+<% @redirectmatch_dest_a = Array(@redirectmatch_dest) -%>
+
+  ## RedirectMatch rules
+  <%- @redirectmatch_regexp_a.each_with_index do |status, i| -%>
+<% @redirectmatch_regexp_a[i] ||= @redirectmatch_regexp_a[0] -%>
+<% @redirectmatch_dest_a[i] ||= @redirectmatch_dest_a[0] -%>
+  RedirectMatch <%= @redirectmatch_regexp_a[i] %> <%= @redirectmatch_dest_a[i] %>
+  <%- end -%>
 <% end -%>

From fe1dae9f59c756b86d05dd4e3e921b2838031e6d Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 3 Feb 2016 12:24:18 -0800
Subject: [PATCH 0823/2267] Need to know where mod_dir is

---
 spec/acceptance/mod_pagespeed_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 2434fbb4eb..009df6a101 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::pagespeed class' do
   context "default pagespeed config" do

From a85588aa66dbd9c83f3cb0434bc99256618728f3 Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Wed, 20 Jan 2016 11:39:11 +0100
Subject: [PATCH 0824/2267] add parameter root_directory_options

---
 README.md                   | 4 ++++
 manifests/init.pp           | 1 +
 manifests/params.pp         | 3 +++
 spec/classes/apache_spec.rb | 8 ++++++++
 templates/httpd.conf.erb    | 2 +-
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 707720a2b6..f768eb2d7c 100644
--- a/README.md
+++ b/README.md
@@ -1164,6 +1164,10 @@ Controls whether the systemd module should be installed on Centos 7 servers, thi
 
 The desired permissions mode for config files, in symbolic or numeric notation. This value must be a string. Defaults to '0644'.
 
+##### `root_directory_options`
+
+Array of the desired options for the / directory in httpd.conf. Defaults to 'FollowSymLinks'.
+
 ##### `vhost_dir`
 
 Changes your virtual host configuration files' location. Default: determined by your operating system.
diff --git a/manifests/init.pp b/manifests/init.pp
index 9422d09d8b..008ab92e26 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -80,6 +80,7 @@
   $use_systemd            = $::apache::params::use_systemd,
   $mime_types_additional  = $::apache::params::mime_types_additional,
   $file_mode              = $::apache::params::file_mode,
+  $root_directory_options = $::apache::params::root_directory_options,
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
diff --git a/manifests/params.pp b/manifests/params.pp
index 4120d074c7..faff49a6c8 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -48,6 +48,9 @@
   # Default mode for files
   $file_mode = '0644'
 
+  # Default options for / directory
+  $root_directory_options = ['FollowSymLinks']
+
   $vhost_include_pattern = '*'
 
   if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 45f8a690c6..6b9b6b881f 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -845,9 +845,17 @@
       )
       }
     end
+    context 'with a custom root_directory_options parameter' do
+      let :params do {
+        :root_directory_options => ['-Indexes', '-FollowSymLinks']
+      }
+      end
+      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options -Indexes -FollowSymLinks} }
+    end
     context 'default vhost defaults' do
       it { is_expected.to contain_apache__vhost('default').with_ensure('present') }
       it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('absent') }
+      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks} }
     end
     context 'without default non-ssl vhost' do
       let :params do {
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 9c854cfc31..448d1fec55 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -31,7 +31,7 @@ AccessFileName .htaccess
 </FilesMatch>
 
 <Directory />
-  Options FollowSymLinks
+  Options <%= Array(@root_directory_options).join(' ') %>
   AllowOverride None
 </Directory>
 

From 8871f0be57b66d3b4259efa2bb00b3eec11e0e35 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 4 Feb 2016 15:06:28 -0800
Subject: [PATCH 0825/2267] Disable passenger tests other than vhost

The module does not yet manage passenger.conf with puppet and so any two
tests that use passenger with non-passenger tests between them will
cause failures.
---
 spec/acceptance/mod_passenger_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index fd967d1ea6..5798545ea2 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -2,9 +2,11 @@
 require_relative './version.rb'
 
 describe 'apache::mod::passenger class' do
+  pending 'This cannot run in the same test run as apache::vhost with passenger
+  as the passenger.conf file is not yet managed by puppet and will be wiped out
+  between tests and not replaced'
   case fact('osfamily')
   when 'Debian'
-    mod_dir = '/etc/apache2/mods-available/'
     conf_file = "#{$mod_dir}/passenger.conf"
     load_file = "#{$mod_dir}/zpassenger.load"
 

From 8ca7a6697ab907803789b2aa63e304f19e3497d3 Mon Sep 17 00:00:00 2001
From: Guy Van den Bergh <guy.vandenbergh@icts.kuleuven.be>
Date: Fri, 5 Feb 2016 11:59:54 +0100
Subject: [PATCH 0826/2267] changed rpaf Configuration Directives: RPAF ->
 RPAF_

---
 spec/classes/mod/rpaf_spec.rb | 24 ++++++++++++------------
 templates/mod/rpaf.conf.erb   | 14 +++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 83591bc282..6b2ddd92f3 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -26,25 +26,25 @@
     it { is_expected.to contain_file('rpaf.conf').with({
       'path' => '/etc/apache2/mods-available/rpaf.conf',
     }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_enable On$/) }
 
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_sethostname On$/) }
     end
     describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
       let :params do
         { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_proxyIPs 10.42.17.8 10.42.18.99$/) }
     end
     describe "with header => X-Real-IP" do
       let :params do
         { :header => 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_header X-Real-IP$/) }
     end
   end
   context "on a FreeBSD OS" do
@@ -66,25 +66,25 @@
     it { is_expected.to contain_file('rpaf.conf').with({
       'path' => '/usr/local/etc/apache24/Modules/rpaf.conf',
     }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_enable On$/) }
 
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_sethostname On$/) }
     end
     describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
       let :params do
         { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_proxyIPs 10.42.17.8 10.42.18.99$/) }
     end
     describe "with header => X-Real-IP" do
       let :params do
         { :header => 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_header X-Real-IP$/) }
     end
   end
   context "on a Gentoo OS" do
@@ -106,25 +106,25 @@
     it { is_expected.to contain_file('rpaf.conf').with({
       'path' => '/etc/apache2/modules.d/rpaf.conf',
     }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_enable On$/) }
 
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_sethostname On$/) }
     end
     describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
       let :params do
         { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_proxyIPs 10.42.17.8 10.42.18.99$/) }
     end
     describe "with header => X-Real-IP" do
       let :params do
         { :header => 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_header X-Real-IP$/) }
     end
   end
 end
diff --git a/templates/mod/rpaf.conf.erb b/templates/mod/rpaf.conf.erb
index 56e2398b55..e0ed8dce8d 100644
--- a/templates/mod/rpaf.conf.erb
+++ b/templates/mod/rpaf.conf.erb
@@ -1,15 +1,15 @@
 # Enable reverse proxy add forward
-RPAFenable On
-# RPAFsethostname will, when enabled, take the incoming X-Host header and
+RPAF_enable On
+# RPAF_sethostname will, when enabled, take the incoming X-Host header and
 # update the virtual host settings accordingly. This allows to have the same
 # hostnames as in the "real" configuration for the forwarding proxy.
 <% if @sethostname -%>
-RPAFsethostname On
+RPAF_sethostname On
 <% else -%>
-RPAFsethostname Off
+RPAF_sethostname Off
 <% end -%>
 # Which IPs are forwarding requests to us
-RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %>
-# Setting RPAFheader allows you to change the header name to parse from the
+RPAF_proxyIPs <%= Array(@proxy_ips).join(" ") %>
+# Setting RPAF_header allows you to change the header name to parse from the
 # default X-Forwarded-For to something of your choice.
-RPAFheader <%= @header %>
+RPAF_header <%= @header %>

From 65f41c0cb54f3a7ff2843e7c8e4e78b6a90d7257 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Fri, 29 Jan 2016 14:36:28 -0700
Subject: [PATCH 0827/2267] quote php_values when the value is a string

---
 spec/acceptance/mod_php_spec.rb | 2 +-
 templates/vhost/_php.erb        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 11bcafcba5..f9919646f0 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -80,7 +80,7 @@ class { 'apache::mod::php':
 
     describe file("#{$vhost_dir}/25-php.example.com.conf") do
       it { is_expected.to contain "  php_flag display_errors on" }
-      it { is_expected.to contain "  php_value include_path .:/usr/share/pear:/usr/bin/php" }
+      it { is_expected.to contain "  php_value include_path \".:/usr/share/pear:/usr/bin/php\"" }
       it { is_expected.to contain "  php_admin_flag engine on" }
       it { is_expected.to contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
     end
diff --git a/templates/vhost/_php.erb b/templates/vhost/_php.erb
index 369fdb7f92..8032a1ade2 100644
--- a/templates/vhost/_php.erb
+++ b/templates/vhost/_php.erb
@@ -1,6 +1,10 @@
 <% if @php_values and not @php_values.empty? -%>
   <%- @php_values.sort.each do |key,value| -%>
+    <%- if value.is_a? String -%>
+  php_value <%= key %> "<%= value %>"
+    <%- else -%>
   php_value <%= key %> <%= value %>
+    <%- end -%>
   <%- end -%>
 <% end -%>
 <% if @php_flags and not @php_flags.empty? -%>
@@ -9,4 +13,4 @@
     <%- if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
   php_flag <%= key %> <%= flag %>
   <%- end -%>
-<% end -%>
\ No newline at end of file
+<% end -%>

From f1ea11bb5be89956171687b7a5b226b25d20fd3b Mon Sep 17 00:00:00 2001
From: Bob Vincent <robert.vincent1@verizon.com>
Date: Mon, 1 Feb 2016 11:00:39 -0500
Subject: [PATCH 0828/2267] Fix in custom fact "apache_version" for RHEL.

The custom fact defined by lib/facter/apache_version.rb runs
"apachectl -v" and applies the following regular expression:

  ^Server version: Apache\/([\w\.]+) \(([\w]+)\)

On RHEL 7.1, running apachectl -v produces the following output:

  Server version: Apache/2.4.6 (Red Hat Enterprise Linux)

The regex fails to match the output because it does not allow
for whitespace inside the parentheses.  The following modified
regex matches properly:

  ^Server version: Apache\/([\w\.]+) \(([\w ]+)\)
---
 lib/facter/apache_version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index b45c888346..b84d776150 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -2,7 +2,7 @@
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
-      %r{^Server version: Apache\/([\w\.]+) \(([\w]+)\)}.match(apache_version)[1]
+      %r{^Server version: Apache\/([\w\.]+) \(([\w ]+)\)}.match(apache_version)[1]
     end
   end
 end

From 28e0f3e8b1d797af4b56dcc0b1397077e86f94a7 Mon Sep 17 00:00:00 2001
From: Garrett Guillotte <gguillotte@users.noreply.github.com>
Date: Mon, 25 Jan 2016 16:41:07 -0800
Subject: [PATCH 0829/2267] Edit and restyle the README.

-   Adds more default values for parameters.
-   Styles parameters and values more consistently.
-   Updates several broken or outdated external links.
-   Fixes broken internal links.
-   Replaces "define" (as a noun) with "defined type" for clarity.
-   Updates code fences from tildes to backticks.
-   Fixes mispelled references to `mod_auth_mellon`.
---
 README.md | 1468 +++++++++++++++++++++++++++--------------------------
 1 file changed, 745 insertions(+), 723 deletions(-)

diff --git a/README.md b/README.md
index 707720a2b6..77c27e7372 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@
 [Reference]: #reference
 [Public classes]: #public-classes
 [Private classes]: #private-classes
-[Public defines]: #public-defines
-[Private defines]: #private-defines
+[Public defined types]: #public-defined-types
+[Private defined types]: #private-defined-types
 [Templates]: #templates
 
 [Limitations]: #limitations
@@ -30,18 +30,18 @@
 [Contributing]: #contributing
 [Running tests]: #running-tests
 
-[`AddDefaultCharset`]: http://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
+[`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
 [`add_listen`]: #add_listen
 [`Alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#alias
 [`AliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#aliasmatch
 [aliased servers]: https://httpd.apache.org/docs/current/urlmapping.html
-[`AllowEncodedSlashes`]: http://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes
+[`AllowEncodedSlashes`]: https://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes
 [`apache`]: #class-apache
 [`apache_version`]: #apache_version
-[`apache::balancer`]: #define-apachebalancer
-[`apache::balancermember`]: #define-apachebalancermember
-[`apache::fastcgi::server`]: #define-apachefastcgiserver
-[`apache::mod`]: #define-apachemod
+[`apache::balancer`]: #defined-type-apachebalancer
+[`apache::balancermember`]: #defined-type-apachebalancermember
+[`apache::fastcgi::server`]: #defined-type-apachefastcgiserver
+[`apache::mod`]: #defined-type-apachemod
 [`apache::mod::<MODULE NAME>`]: #classes-apachemodmodule-name
 [`apache::mod::alias`]: #class-apachemodalias
 [`apache::mod::auth_cas`]: #class-apachemodauth_cas
@@ -64,21 +64,21 @@
 [`apache::mod::wsgi`]: #class-apachemodwsgi
 [`apache::params`]: #class-apacheparams
 [`apache::version`]: #class-apacheversion
-[`apache::vhost`]: #define-apachevhost
-[`apache::vhost::custom`]: #define-apachevhostcustom
+[`apache::vhost`]: #defined-type-apachevhost
+[`apache::vhost::custom`]: #defined-type-apachevhostcustom
 [`apache::vhost::WSGIImportScript`]: #wsgiimportscript
-[Apache HTTP Server]: http://httpd.apache.org
-[Apache modules]: http://httpd.apache.org/docs/current/mod/
+[Apache HTTP Server]: https://httpd.apache.org
+[Apache modules]: https://httpd.apache.org/docs/current/mod/
 [array]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_array.html
 
 [beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
 
-[certificate revocation list]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationfile
-[certificate revocation list path]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationpath
-[common gateway interface]: http://httpd.apache.org/docs/current/howto/cgi.html
+[certificate revocation list]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationfile
+[certificate revocation list path]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationpath
+[common gateway interface]: https://httpd.apache.org/docs/current/howto/cgi.html
 [`confd_dir`]: #confd_dir
 [`content`]: #content
-[custom error documents]: http://httpd.apache.org/docs/current/custom-error.html
+[custom error documents]: https://httpd.apache.org/docs/current/custom-error.html
 [`custom_fragment`]: #custom_fragment
 
 [`default_mods`]: #default_mods
@@ -88,53 +88,56 @@
 [`dev_packages`]: #dev_packages
 [`directory`]: #directory
 [`directories`]: #parameter-directories-for-apachevhost
-[`DirectoryIndex`]: http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+[`DirectoryIndex`]: https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
 [`docroot`]: #docroot
 [`docroot_owner`]: #docroot_owner
 [`docroot_group`]: #docroot_group
 [`DocumentRoot`]: https://httpd.apache.org/docs/current/mod/core.html#documentroot
 
-[`EnableSendfile`]: http://httpd.apache.org/docs/current/mod/core.html#enablesendfile
-[`ExpiresByType`]: http://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype
+[`EnableSendfile`]: https://httpd.apache.org/docs/current/mod/core.html#enablesendfile
 [enforcing mode]: http://selinuxproject.org/page/Guide/Mode
 [`ensure`]: https://docs.puppetlabs.com/references/latest/type.html#package-attribute-ensure
+[`error_log_file`]: #error_log_file
+[`error_log_syslog`]: #error_log_syslog
+[`error_log_pipe`]: #error_log_pipe
+[`ExpiresByType`]: https://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype
 [exported resources]: http://docs.puppetlabs.com/latest/reference/lang_exported.md
-[`ExtendedStatus`]: http://httpd.apache.org/docs/current/mod/core.html#extendedstatus
+[`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus
 
 [Facter]: http://docs.puppetlabs.com/facter/
 [FastCGI]: http://www.fastcgi.com/
 [FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
 [`fallbackresource`]: #fallbackresource
-[filter rules]: http://httpd.apache.org/docs/current/filter.html
+[filter rules]: https://httpd.apache.org/docs/current/filter.html
 [`filters`]: #filters
-[`ForceType`]: http://httpd.apache.org/docs/current/mod/core.html#forcetype
+[`ForceType`]: https://httpd.apache.org/docs/current/mod/core.html#forcetype
 
 [GeoIPScanProxyHeaders]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives
 [`gentoo/puppet-portage`]: https://github.com/gentoo/puppet-portage
 
 [Hash]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_hash.html
 
-[`IncludeOptional`]: http://httpd.apache.org/docs/current/mod/core.html#includeoptional
-[`Include`]: http://httpd.apache.org/docs/current/mod/core.html#include
-[interval syntax]: http://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn
+[`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional
+[`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include
+[interval syntax]: https://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn
 [`ip`]: #ip
 [`ip_based`]: #ip_based
-[IP-based virtual hosts]: http://httpd.apache.org/docs/current/vhosts/ip-based.html
+[IP-based virtual hosts]: https://httpd.apache.org/docs/current/vhosts/ip-based.html
 
-[`KeepAlive`]: http://httpd.apache.org/docs/current/mod/core.html#keepalive
-[`KeepAliveTimeout`]: http://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout
+[`KeepAlive`]: https://httpd.apache.org/docs/current/mod/core.html#keepalive
+[`KeepAliveTimeout`]: https://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout
 [`keepalive` parameter]: #keepalive
 [`keepalive_timeout`]: #keepalive_timeout
 [`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize
 
 [`lib`]: #lib
 [`lib_path`]: #lib_path
-[`Listen`]: http://httpd.apache.org/docs/current/bind.html
+[`Listen`]: https://httpd.apache.org/docs/current/bind.html
 [`ListenBackLog`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#listenbacklog
 [`LoadFile`]: https://httpd.apache.org/docs/current/mod/mod_so.html#loadfile
 [`LogFormat`]: https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat
 [`logroot`]: #logroot
-[Log security]: http://httpd.apache.org/docs/current/logs.html#security
+[Log security]: https://httpd.apache.org/docs/current/logs.html#security
 
 [`manage_docroot`]: #manage_docroot
 [`manage_user`]: #manage_user
@@ -148,48 +151,53 @@
 [`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html
 [`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
 [`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html
-[`mod_authnz_external`]: https://code.google.com/p/mod-auth-external/
+[`mod_authnz_external`]: https://github.com/phokz/mod-auth-external
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
 [`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
 [`mod_cache_disk`]: https://httpd.apache.org/docs/current/mod/mod_cache_disk.html
-[`mod_expires`]: http://httpd.apache.org/docs/current/mod/mod_expires.html
-[`mod_ext_filter`]: http://httpd.apache.org/docs/current/mod/mod_ext_filter.html
+[`mod_expires`]: https://httpd.apache.org/docs/current/mod/mod_expires.html
+[`mod_ext_filter`]: https://httpd.apache.org/docs/current/mod/mod_ext_filter.html
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
 [`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/
 [`mod_info`]: https://httpd.apache.org/docs/current/mod/mod_info.html
 [`mod_ldap`]: https://httpd.apache.org/docs/2.2/mod/mod_ldap.html
 [`mod_mpm_event`]: https://httpd.apache.org/docs/current/mod/event.html
-[`mod_negotiation`]: http://httpd.apache.org/docs/current/mod/mod_negotiation.html
+[`mod_negotiation`]: https://httpd.apache.org/docs/current/mod/mod_negotiation.html
 [`mod_pagespeed`]: https://developers.google.com/speed/pagespeed/module/?hl=en
 [`mod_passenger`]: https://www.phusionpassenger.com/library/config/apache/reference/
 [`mod_php`]: http://php.net/manual/en/book.apache.php
 [`mod_proxy`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html
-[`mod_proxy_balancer`]: http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
-[`mod_reqtimeout`]: http://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
+[`mod_proxy_balancer`]: https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
+[`mod_reqtimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
+[`mod_rewrite`]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html
 [`mod_security`]: https://www.modsecurity.org/
-[`mod_ssl`]: http://httpd.apache.org/docs/current/mod/mod_ssl.html
-[`mod_status`]: http://httpd.apache.org/docs/current/mod/mod_status.html
-[`mod_version`]: http://httpd.apache.org/docs/current/mod/mod_version.html
-[`mod_wsgi`]: http://modwsgi.readthedocs.org/en/latest/
-[module contribution guide]: http://docs.puppetlabs.com/forge/contributing.html
+[`mod_ssl`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html
+[`mod_status`]: https://httpd.apache.org/docs/current/mod/mod_status.html
+[`mod_version`]: https://httpd.apache.org/docs/current/mod/mod_version.html
+[`mod_wsgi`]: https://modwsgi.readthedocs.org/en/latest/
+[module contribution guide]: https://docs.puppetlabs.com/forge/contributing.html
 [`mpm_module`]: #mpm_module
-[multi-processing module]: http://httpd.apache.org/docs/current/mpm.html
+[multi-processing module]: https://httpd.apache.org/docs/current/mpm.html
 
 [name-based virtual hosts]: https://httpd.apache.org/docs/current/vhosts/name-based.html
+[`no_proxy_uris`]: #no_proxy_uris
 
-[open source Puppet]: http://docs.puppetlabs.com/puppet/
+[open source Puppet]: https://docs.puppetlabs.com/puppet/
 [`Options`]: https://httpd.apache.org/docs/current/mod/core.html#options
 
 [`path`]: #path
-[`Peruser`]: http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr
+[`Peruser`]: https://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr
 [`port`]: #port
-[`priority`]: #defines-apachevhost
-[`ProxyPass`]: http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass
-[`ProxySet`]: http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset
-[Puppet Enterprise]: http://docs.puppetlabs.com/pe/
-[Puppet Forge]: http://forge.puppetlabs.com
-[Puppet Labs]: http://puppetlabs.com
-[Puppet module]: http://docs.puppetlabs.com/puppet/latest/reference/modules_fundamentals.html
+[`priority`]: #defined-types-apachevhost
+[`proxy_dest`]: #proxy_dest
+[`proxy_dest_match`]: #proxy_dest_match
+[`proxy_pass`]: #proxy_pass
+[`ProxyPass`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass
+[`ProxySet`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset
+[Puppet Enterprise]: https://docs.puppetlabs.com/pe/
+[Puppet Forge]: https://forge.puppetlabs.com
+[Puppet Labs]: https://puppetlabs.com
+[Puppet module]: https://docs.puppetlabs.com/puppet/latest/reference/modules_fundamentals.html
 [Puppet module's code]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp
 [`purge_configs`]: #purge_configs
 [`purge_vhost_dir`]: #purge_vhost_dir
@@ -198,24 +206,24 @@
 [Rack]: http://rack.github.io/
 [`rack_base_uris`]: #rack_base_uris
 [RFC 2616]: https://www.ietf.org/rfc/rfc2616.txt
-[`RequestReadTimeout`]: http://httpd.apache.org/docs/current/mod/mod_reqtimeout.html#requestreadtimeout
+[`RequestReadTimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html#requestreadtimeout
 [rspec-puppet]: http://rspec-puppet.com/
 
 [`ScriptAlias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptalias
 [`ScriptAliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptaliasmatch
 [`scriptalias`]: #scriptalias
 [SELinux]: http://selinuxproject.org/
-[`ServerAdmin`]: http://httpd.apache.org/docs/current/mod/core.html#serveradmin
+[`ServerAdmin`]: https://httpd.apache.org/docs/current/mod/core.html#serveradmin
 [`serveraliases`]: #serveraliases
 [`ServerLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#serverlimit
-[`ServerName`]: http://httpd.apache.org/docs/current/mod/core.html#servername
-[`ServerRoot`]: http://httpd.apache.org/docs/current/mod/core.html#serverroot
-[`ServerTokens`]: http://httpd.apache.org/docs/current/mod/core.html#servertokens
-[`ServerSignature`]: http://httpd.apache.org/docs/current/mod/core.html#serversignature
+[`ServerName`]: https://httpd.apache.org/docs/current/mod/core.html#servername
+[`ServerRoot`]: https://httpd.apache.org/docs/current/mod/core.html#serverroot
+[`ServerTokens`]: https://httpd.apache.org/docs/current/mod/core.html#servertokens
+[`ServerSignature`]: https://httpd.apache.org/docs/current/mod/core.html#serversignature
 [Service attribute restart]: http://docs.puppetlabs.com/references/latest/type.html#service-attribute-restart
 [`source`]: #source
-[`SSLCARevocationCheck`]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck
-[SSL certificate key file]: http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile
+[`SSLCARevocationCheck`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck
+[SSL certificate key file]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile
 [SSL chain]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatechainfile
 [SSL encryption]: https://httpd.apache.org/docs/current/ssl/index.html
 [`ssl`]: #ssl
@@ -229,20 +237,20 @@
 [`suphp_engine`]: #suphp_engine
 [supported operating system]: https://forge.puppetlabs.com/supported#puppet-supported-modules-compatibility-matrix
 
-[`ThreadLimit`]: http://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit
+[`ThreadLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit
 [`ThreadsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadsperchild
-[`TimeOut`]: http://httpd.apache.org/docs/current/mod/core.html#timeout
+[`TimeOut`]: https://httpd.apache.org/docs/current/mod/core.html#timeout
 [template]: http://docs.puppetlabs.com/puppet/latest/reference/lang_template.html
-[`TraceEnable`]: http://httpd.apache.org/docs/current/mod/core.html#traceenable
+[`TraceEnable`]: https://httpd.apache.org/docs/current/mod/core.html#traceenable
 
 [`verify_config`]: #verify_config
-[`vhost`]: #define-apachevhost
+[`vhost`]: #defined-type-apachevhost
 [`vhost_dir`]: #vhost_dir
 [`virtual_docroot`]: #virtual_docroot
 
 [Web Server Gateway Interface]: https://www.python.org/dev/peps/pep-3333/#abstract
-[`WSGIPythonPath`]: https://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPythonPath
-[`WSGIPythonHome`]: https://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPythonHome
+[`WSGIPythonPath`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonPath.html
+[`WSGIPythonHome`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonHome.html
 
 #### Table of Contents
 
@@ -256,8 +264,8 @@
 4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
     - [Public classes][]
     - [Private classes][]
-    - [Public defines][]
-    - [Private defines][]
+    - [Public defined types][]
+    - [Private defined types][]
     - [Templates][]
 5. [Limitations - OS compatibility, etc.][Limitations]
 6. [Development - Guide for contributing to the module][Development]
@@ -282,27 +290,27 @@
 
 On Gentoo, this module depends on the [`gentoo/puppet-portage`][] Puppet module. Note that while several options apply or enable certain features and settings for Gentoo, it is not a [supported operating system][] for this module.
 
-**Note**: This module modifies Apache configuration files and directories and purges any configuration not managed by Puppet. Apache configuration should be managed by Puppet, as unmanaged configuration files can cause unexpected failures.
+> **Note**: This module modifies Apache configuration files and directories and purges any configuration not managed by Puppet. Apache configuration should be managed by Puppet, as unmanaged configuration files can cause unexpected failures.
 
-To temporarily disable full Puppet management, set the [`purge_configs`][] parameter in the [`apache`][] class declaration to 'false'. We recommend using this only as a temporary means of saving and relocating customized configurations.
+To temporarily disable full Puppet management, set the [`purge_configs`][] parameter in the [`apache`][] class declaration to false. We recommend using this only as a temporary means of saving and relocating customized configurations.
 
 ### Beginning with Apache
 
 To have Puppet install Apache with the default parameters, declare the [`apache`][] class:
 
-~~~ puppet
+``` puppet
 class { 'apache': }
-~~~
+```
 
 The Puppet module applies a default configuration based on your operating system; Debian, Red Hat, FreeBSD, and Gentoo systems each have unique default configurations. These defaults work in testing environments but are not suggested for production, and Puppet recommends customizing the class's parameters to suit your site. Use the [Reference](#reference) section to find information about the class's parameters and their default values.
 
 You can customize parameters when declaring the `apache` class. For instance, this declaration installs Apache without the apache module's [default virtual host configuration][Configuring virtual hosts], allowing you to customize all Apache virtual hosts:
 
-~~~ puppet
+``` puppet
 class { 'apache':
   default_vhost => false,
 }
-~~~
+```
 
 ## Usage
 
@@ -310,45 +318,45 @@ class { 'apache':
 
 The default [`apache`][] class sets up a virtual host on port 80, listening on all interfaces and serving the [`docroot`][] parameter's default directory of `/var/www`.
 
-**Note**: See the [`apache::vhost`][] define's reference for a list of all virtual host parameters.
+> **Note**: See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters.
 
-To configure basic [name-based virtual hosts][], specify the [`port`][] and [`docroot`][] parameters in the [`apache::vhost`][] define:
+To configure basic [name-based virtual hosts][], specify the [`port`][] and [`docroot`][] parameters in the [`apache::vhost`][] defined type:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'vhost.example.com':
   port    => '80',
   docroot => '/var/www/vhost',
 }
-~~~
+```
 
-**Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] define applies a default [`priority`][] of 15, which Puppet interprets by prefixing the virtual host's file name with `15-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to 'false', Apache still processes virtual hosts in alphabetical order.
+> **Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] defined type applies a default [`priority`][] of 15, which Puppet interprets by prefixing the virtual host's file name with `15-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to false, Apache still processes virtual hosts in alphabetical order.
 
 To configure user and group ownership for `docroot`, use the [`docroot_owner`][] and [`docroot_group`][] parameters:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'user.example.com':
   port          => '80',
   docroot       => '/var/www/user',
   docroot_owner => 'www-data',
   docroot_group => 'www-data',
 }
-~~~
+```
 
 #### Configuring virtual hosts with SSL
 
 To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accommodate HTTPS requests:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'ssl.example.com':
   port    => '443',
   docroot => '/var/www/ssl',
   ssl     => true,
 }
-~~~
+```
 
 To configure a virtual host to use SSL and specific SSL certificates, use the paths to the certificate and key in the [`ssl_cert`][] and [`ssl_key`][] parameters, respectively:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'cert.example.com':
   port     => '443',
   docroot  => '/var/www/cert',
@@ -356,11 +364,11 @@ apache::vhost { 'cert.example.com':
   ssl_cert => '/etc/ssl/fourth.example.com.cert',
   ssl_key  => '/etc/ssl/fourth.example.com.key',
 }
-~~~
+```
 
-To configure a mix of SSL and unencrypted virtual hosts at the same domain, declare them with separate [`apache::vhost`] defines:
+To configure a mix of SSL and unencrypted virtual hosts at the same domain, declare them with separate [`apache::vhost`][] defined types:
 
-~~~ puppet
+``` puppet
 # The non-ssl virtual host
 apache::vhost { 'mix.example.com non-ssl':
   servername => 'mix.example.com',
@@ -375,11 +383,11 @@ apache::vhost { 'mix.example.com ssl':
   docroot    => '/var/www/mix',
   ssl        => true,
 }
-~~~
+```
 
-To configure a virtual host to redirect unencrypted connections to SSL, declare them with separate [`apache::vhost`] defines and redirect unencrypted requests to the virtual host with SSL enabled:
+To configure a virtual host to redirect unencrypted connections to SSL, declare them with separate [`apache::vhost`][] defined types and redirect unencrypted requests to the virtual host with SSL enabled:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'redirect.example.com non-ssl':
   servername      => 'redirect.example.com',
   port            => '80',
@@ -394,33 +402,33 @@ apache::vhost { 'redirect.example.com ssl':
   docroot    => '/var/www/redirect',
   ssl        => true,
 }
-~~~
+```
 
 #### Configuring virtual host port and address bindings
 
 Virtual hosts listen on all IP addresses ('*') by default. To configure the virtual host to listen on a specific IP address, use the [`ip`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'ip.example.com':
   ip      => '127.0.0.1',
   port    => '80',
   docroot => '/var/www/ip',
 }
-~~~
+```
 
-It is also possible to configure more than one IP address per vhost by using an array of IP addresses for the [`ip`][] parameter:
+It is also possible to configure more than one IP address per virtual host by using an array of IP addresses for the [`ip`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'ip.example.com':
   ip      => ['127.0.0.1','169.254.1.1'],
   port    => '80',
   docroot => '/var/www/ip',
 }
-~~~
+```
 
 To configure a virtual host with [aliased servers][], refer to the aliases using the [`serveraliases`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'aliases.example.com':
   serveraliases => [
     'aliases.example.org',
@@ -429,11 +437,11 @@ apache::vhost { 'aliases.example.com':
   port          => '80',
   docroot       => '/var/www/aliases',
 }
-~~~
+```
 
 To set up a virtual host with a wildcard alias for the subdomain mapped to a same-named directory, such as 'http://example.com.loc' mapped to `/var/www/example.com`, define the wildcard alias using the [`serveraliases`][] parameter and the document root with the [`virtual_docroot`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
   port            => '80',
@@ -441,11 +449,11 @@ apache::vhost { 'subdomain.loc':
   docroot         => '/var/www',
   serveraliases   => ['*.loc',],
 }
-~~~
+```
 
 To configure a virtual host with [filter rules][], pass the filter directives as an [array][] using the [`filters`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'subdomain.loc':
   port    => '80',
   filters => [
@@ -456,13 +464,13 @@ apache::vhost { 'subdomain.loc':
   ],
   docroot => '/var/www/html',
 }
-~~~
+```
 
 #### Configuring virtual hosts for apps and processors
 
 To set up a virtual host with [suPHP][], use the [`suphp_engine`][] parameter to enable the suPHP engine, [`suphp_addhandler`][] parameter to define a MIME type, [`suphp_configpath`][] to set which path suPHP passes to the PHP interpreter, and the [`directory`][] parameter to configure Directory, File, and Location directive blocks:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'suphp.example.com':
   port             => '80',
   docroot          => '/home/appuser/myphpapp',
@@ -478,11 +486,11 @@ apache::vhost { 'suphp.example.com':
     },
   ],
 }
-~~~
+```
 
 You can use a set of parameters to configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) for [Python][] applications:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'wsgi.example.com':
   port                        => '80',
   docroot                     => '/var/www/pythonapp',
@@ -501,53 +509,53 @@ apache::vhost { 'wsgi.example.com':
   wsgi_process_group          => 'wsgi',
   wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
 }
-~~~
+```
 
 Starting in Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement for common RewriteRules. You can set a FallbackResource using the [`fallbackresource`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'wordpress.example.com':
   port             => '80',
   docroot          => '/var/www/wordpress',
   fallbackresource => '/index.php',
 }
-~~~
+```
 
-**Note**: The `fallbackresource` parameter only supports the 'disabled' value since Apache 2.2.24.
+> **Note**: The `fallbackresource` parameter only supports the 'disabled' value since Apache 2.2.24.
 
 To configure a virtual host with a designated directory for [Common Gateway Interface][] (CGI) files, use the [`scriptalias`][] parameter to define the `cgi-bin` path:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'cgi.example.com':
   port        => '80',
   docroot     => '/var/www/cgi',
   scriptalias => '/usr/lib/cgi-bin',
 }
-~~~
+```
 
 To configure a virtual host for [Rack][], use the [`rack_base_uris`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'rack.example.com':
   port           => '80',
   docroot        => '/var/www/rack',
   rack_base_uris => ['/rackapp1', '/rackapp2'],
 }
-~~~
+```
 
 #### Configuring IP-based virtual hosts
 
 You can configure [IP-based virtual hosts][] to listen on any port and have them respond to requests on specific IP addresses. In this example, we set the server to listen on ports 80 and 81 because the example virtual hosts are _not_ declared with a [`port`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::listen { '80': }
 
 apache::listen { '81': }
-~~~
+```
 
 Then we configure the IP-based virtual hosts with the [`ip_based`][] parameter:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'first.example.com':
   ip       => '10.0.0.10',
   docroot  => '/var/www/first',
@@ -559,11 +567,11 @@ apache::vhost { 'second.example.com':
   docroot  => '/var/www/second',
   ip_based => true,
 }
-~~~
+```
 
 You can also configure a mix of IP- and [name-based virtual hosts][], and in any combination of [SSL][SSL encryption] and unencrypted configurations. First, we add two IP-based virtual hosts on an IP address (in this example, 10.0.0.10). One uses SSL and the other is unencrypted:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'The first IP-based virtual host, non-ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
@@ -580,11 +588,11 @@ apache::vhost { 'The first IP-based vhost, ssl':
   docroot    => '/var/www/first-ssl',
   ssl        => true,
 }
-~~~
+```
 
 Next, we add two name-based virtual hosts listening on a second IP address (10.0.0.20):
 
-~~~ puppet
+``` puppet
 apache::vhost { 'second.example.com':
   ip      => '10.0.0.20',
   port    => '80',
@@ -596,11 +604,11 @@ apache::vhost { 'third.example.com':
   port    => '80',
   docroot => '/var/www/third',
 }
-~~~
+```
 
-To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, you **must** set the [`add_listen`][] parameter to 'false' to disable the default Apache setting of `Listen 80`, as it conflicts with the preceding IP-based virtual hosts.
+To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, you **must** set the [`add_listen`][] parameter to false to disable the default Apache setting of `Listen 80`, as it conflicts with the preceding IP-based virtual hosts.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'fourth.example.com':
   port       => '80',
   docroot    => '/var/www/fourth',
@@ -612,14 +620,14 @@ apache::vhost { 'fifth.example.com':
   docroot    => '/var/www/fifth',
   add_listen => false,
 }
-~~~
+```
 
 ### Installing Apache modules
 
-There's two ways to install [Apache modules][] using the Puppet apache module:
+There are two ways to install [Apache modules][] using the Puppet apache module:
 
 - Use the [`apache::mod::<MODULE NAME>`][] classes to [install specific Apache modules with parameters][Installing specific modules].
-- Use the [`apache::mod`][] define to [install arbitrary Apache modules][Installing arbitrary modules].
+- Use the [`apache::mod`][] defined type to [install arbitrary Apache modules][Installing arbitrary modules].
 
 #### Installing specific modules
 
@@ -627,37 +635,37 @@ The Puppet apache module supports installing many common [Apache modules][], oft
 
 For example, you can install the `mod_ssl` Apache module with default settings by declaring the [`apache::mod::ssl`][] class:
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::ssl': }
-~~~
+```
 
-[`apache::mod::ssl`][] has several parameterized options that you can set when declaring it. For instance, to enable `mod_ssl` with compression enabled, set the [`ssl_compression`][] parameter to 'true':
+[`apache::mod::ssl`][] has several parameterized options that you can set when declaring it. For instance, to enable `mod_ssl` with compression enabled, set the [`ssl_compression`][] parameter to true:
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::ssl':
   ssl_compression => true,
 }
-~~~
+```
 
 Note that some modules have prerequisites, which are documented in their references under [`apache::mod::<MODULE NAME>`][].
 
 #### Installing arbitrary modules
 
-You can pass the name of any module that your operating system's package manager can install to the [`apache::mod`][] define to install it. Unlike the specific-module classes, the [`apache::mod`][] define doesn't tailor the installation based on other installed modules or with specific parameters---Puppet only grabs and installs the module's package, leaving detailed configuration up to you.
+You can pass the name of any module that your operating system's package manager can install to the [`apache::mod`][] defined type to install it. Unlike the specific-module classes, the [`apache::mod`][] defined type doesn't tailor the installation based on other installed modules or with specific parameters---Puppet only grabs and installs the module's package, leaving detailed configuration up to you.
 
-For example, to install the [`mod_authnz_external`][] Apache module, declare the define with the 'mod_authnz_external' name:
+For example, to install the [`mod_authnz_external`][] Apache module, declare the defined type with the 'mod_authnz_external' name:
 
-~~~ puppet
+``` puppet
 apache::mod { 'mod_authnz_external': }
-~~~
+```
 
-There's several optional parameters you can specify when defining Apache modules this way. See the [define's reference][`apache::mod`] for details.
+There are several optional parameters you can specify when defining Apache modules this way. See the [defined type's reference][`apache::mod`] for details.
 
 ### Configuring FastCGI servers to handle PHP files
 
-Add the [`apache::fastcgi::server`][] define to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
+Add the [`apache::fastcgi::server`][] defined type to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
 
-~~~ puppet
+``` puppet
 apache::fastcgi::server { 'php':
   host       => '127.0.0.1:9000',
   timeout    => 15,
@@ -666,69 +674,69 @@ apache::fastcgi::server { 'php':
   fcgi_alias => '/php.fcgi',
   file_type  => 'application/x-httpd-php'
 }
-~~~
+```
 
-You can then use the [`custom_fragment`] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
+You can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'www':
   ...
   custom_fragment => 'AddType application/x-httpd-php .php'
   ...
 }
-~~~
+```
 
 ### Load balancing examples
 
-Apache supports load balancing across groups of servers through the [`mod_proxy`][] Apache module. Puppet supports configuring Apache load balancing groups (also known as balancer clusters) through the [`apache::balancer`][] and [`apache::balancermember`][] defines.
+Apache supports load balancing across groups of servers through the [`mod_proxy`][] Apache module. Puppet supports configuring Apache load balancing groups (also known as balancer clusters) through the [`apache::balancer`][] and [`apache::balancermember`][] defined types.
 
-To enable load balancing with [exported resources][], export the [`apache::balancermember`][] define from the load balancer member server:
+To enable load balancing with [exported resources][], export the [`apache::balancermember`][] defined type from the load balancer member server:
 
-~~~ puppet
+``` puppet
 @@apache::balancermember { "${::fqdn}-puppet00":
   balancer_cluster => 'puppet00',
   url              => "ajp://${::fqdn}:8009",
   options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
 }
-~~~
+```
 
 Then, on the proxy server, create the load balancing group:
 
-~~~ puppet
+``` puppet
 apache::balancer { 'puppet00': }
-~~~
+```
 
 To enable load balancing without exporting resources, declare the following on the proxy server:
 
-~~~ puppet
+``` puppet
 apache::balancer { 'puppet00': }
 
 apache::balancermember { "${::fqdn}-puppet00":
-    balancer_cluster => 'puppet00',
-    url              => "ajp://${::fqdn}:8009",
-    options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-  }
-~~~
+  balancer_cluster => 'puppet00',
+  url              => "ajp://${::fqdn}:8009",
+  options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
+}
+```
 
-Then declare the `apache::balancer` and `apache::balancermember` defines on the proxy server.
+Then declare the `apache::balancer` and `apache::balancermember` defined types on the proxy server.
 
-If you need to use the [ProxySet](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) directive on the balancer, use the [`proxy_set`](#proxy_set) parameter of `apache::balancer`:
+If you need to use the [ProxySet](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) directive on the balancer, use the [`proxy_set`](#proxy_set) parameter of `apache::balancer`:
 
-~~~ puppet
+``` puppet
 apache::balancer { 'puppet01':
   proxy_set => {
     'stickysession' => 'JSESSIONID',
   },
 }
-~~~
+```
 
 ## Reference
 
-- [**Public Classes**](#public-classes)
+- [**Public classes**](#public-classes)
     - [Class: apache](#class-apache)
     - [Class: apache::dev](#class-apachedev)
     - [Classes: apache::mod::*](#classes-apachemodname)
-- [**Private Classes**](#private-classes)
+- [**Private classes**](#private-classes)
     - [Class: apache::confd::no_accf](#class-apacheconfdno_accf)
     - [Class: apache::default_confd_files](#class-apachedefault_confd_files)
     - [Class: apache::default_mods](#class-apachedefault_mods)
@@ -736,21 +744,21 @@ apache::balancer { 'puppet01':
     - [Class: apache::params](#class-apacheparams)
     - [Class: apache::service](#class-apacheservice)
     - [Class: apache::version](#class-apacheversion)
-- [**Public Defines**](#public-defines)
-    - [Define: apache::balancer](#define-apachebalancer)
-    - [Define: apache::balancermember](#define-apachebalancermember)
-    - [Define: apache::custom_config](#define-apachecustom_config)
-    - [Define: apache::fastcgi::server](#define-fastcgi-server)
-    - [Define: apache::listen](#define-apachelisten)
-    - [Define: apache::mod](#define-apachemod)
-    - [Define: apache::namevirtualhost](#define-apachenamevirtualhost)
-    - [Define: apache::vhost](#define-apachevhost)
-    - [Define: apache::vhost::custom](#define-apachevhostcustom)
-- [**Private Defines**](#private-defines)
-    - [Define: apache::default_mods::load](#define-default_mods-load)
-    - [Define: apache::peruser::multiplexer](#define-apacheperusermultiplexer)
-    - [Define: apache::peruser::processor](#define-apacheperuserprocessor)
-    - [Define: apache::security::file_link](#define-apachesecurityfile_link)
+- [**Public defined types**](#public-defined-types)
+    - [Defined type: apache::balancer](#defined-type-apachebalancer)
+    - [Defined type: apache::balancermember](#defined-type-apachebalancermember)
+    - [Defined type: apache::custom_config](#defined-type-apachecustom_config)
+    - [Defined type: apache::fastcgi::server](#defined-type-fastcgi-server)
+    - [Defined type: apache::listen](#defined-type-apachelisten)
+    - [Defined type: apache::mod](#defined-type-apachemod)
+    - [Defined type: apache::namevirtualhost](#defined-type-apachenamevirtualhost)
+    - [Defined type: apache::vhost](#defined-type-apachevhost)
+    - [Defined type: apache::vhost::custom](#defined-type-apachevhostcustom)
+- [**Private defined types**](#private-defined-types)
+    - [Defined type: apache::default_mods::load](#defined-type-default_mods-load)
+    - [Defined type: apache::peruser::multiplexer](#defined-type-apacheperusermultiplexer)
+    - [Defined type: apache::peruser::processor](#defined-type-apacheperuserprocessor)
+    - [Defined type: apache::security::file_link](#defined-type-apachesecurityfile_link)
 - [**Templates**](#templates)
 
 ### Public Classes
@@ -769,17 +777,17 @@ When this class is declared with the default options, Puppet:
 
 You can simply declare the default `apache` class:
 
-~~~ puppet
+``` puppet
 class { 'apache': }
-~~~
+```
 
-You can establish a default virtual host in this class, by using the [`apache::vhost`][] define, or both. You can also configure additional specific virtual hosts with the [`apache::vhost`][] define. Puppet recommends customizing the `apache` class's declaration with the following parameters, as its default settings are not optimized for production.
+You can establish a default virtual host in this class, by using the [`apache::vhost`][] defined type, or both. You can also configure additional specific virtual hosts with the [`apache::vhost`][] defined type. Puppet recommends customizing the `apache` class's declaration with the following parameters, as its default settings are not optimized for production.
 
 **Parameters within `apache`:**
 
 ##### `allow_encoded_slashes`
 
-Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. Valid options: 'on', 'off', 'nodecode'. Default: 'undef', which omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
+Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. Valid options: 'on', 'off', 'nodecode'. Default: undef, which omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
 
 ##### `apache_version`
 
@@ -809,25 +817,25 @@ Sets the location of the Apache server's custom configuration directory. Default
 
 ##### `default_charset`
 
-Used as the [`AddDefaultCharset`][] directive in the main configuration file. Default: 'undef'.
+Used as the [`AddDefaultCharset`][] directive in the main configuration file. Default: undef.
 
 ##### `default_confd_files`
 
-Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system. Valid options: Boolean. Default: 'true'.
+Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system. Valid options: Boolean. Default: true.
 
 ##### `default_mods`
 
-Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: 'true', 'false', or an array of Apache module names. Default: 'true'.
+Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: true, false, or an array of Apache module names. Default: true.
 
-If this parameter's value is 'false', Puppet only includes the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] define.
+If this parameter's value is false, Puppet includes only the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] defined type.
 
-If 'true', Puppet installs additional modules, the list of which depends on the operating system as well as the [`apache_version`][] and [`mpm_module`][] parameters' values. As these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
+If true, Puppet installs additional modules, the list of which depends on the operating system as well as the [`apache_version`][] and [`mpm_module`][] parameters' values. As these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
 
 If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
 ##### `default_ssl_ca`
 
-Sets the default certificate authority for the Apache server. Default: 'undef'.
+Sets the default certificate authority for the Apache server. Default: undef.
 
 While this default value results in a functioning Apache server, you **must** update this parameter with your certificate authority information before deploying this server in a production environment.
 
@@ -844,25 +852,25 @@ While the default value results in a functioning Apache server, you **must** upd
 
 ##### `default_ssl_chain`
 
-Sets the default [SSL chain][] location. Default: 'undef'.
+Sets the default [SSL chain][] location. Default: undef.
 
 While this default value results in a functioning Apache server, you **must** update this parameter with your SSL chain before deploying this server in a production environment.
 
 ##### `default_ssl_crl`
 
-Sets the path of the default [certificate revocation list][] (CRL) file to use. Default: 'undef'.
+Sets the path of the default [certificate revocation list][] (CRL) file to use. Default: undef.
 
 While this default value results in a functioning Apache server, you **must** update this parameter with your CRL file's path before deploying this server in a production environment. You can use this parameter with or in place of the [`default_ssl_crl_path`][].
 
 ##### `default_ssl_crl_path`
 
-Sets the server's [certificate revocation list path][], which contains your CRLs. Default: 'undef'.
+Sets the server's [certificate revocation list path][], which contains your CRLs. Default: undef.
 
 While this default value results in a functioning Apache server, you **must** update this parameter with the CRL path before deploying this server in a production environment.
 
 ##### `default_ssl_crl_check`
 
-Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. Default: 'undef'.
+Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. Default: undef.
 
 While this default value results in a functioning Apache server, you **must** specify this parameter when using certificate revocation lists in a production environment.
 
@@ -881,11 +889,11 @@ While these default values result in a functioning Apache server, you **must** u
 
 ##### `default_ssl_vhost`
 
-Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean. Default: 'false'.
+Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean. Default: false.
 
-If 'true', Puppet automatically configures the following virtual host using the [`apache::vhost`][] define:
+If true, Puppet automatically configures the following virtual host using the [`apache::vhost`][] defined type:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'default-ssl':
   port            => 443,
   ssl             => true,
@@ -894,33 +902,39 @@ apache::vhost { 'default-ssl':
   serveradmin     => $serveradmin,
   access_log_file => "ssl_${access_log_file}",
   }
-~~~
+```
 
-**Note**: SSL virtual hosts only respond to HTTPS queries.
+> **Note**: SSL virtual hosts only respond to HTTPS queries.
 
 ##### `default_type`
 
-_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer and only exists for backwards compatibility in configuration files. Default: 'undef'.
+_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer and only exists for backwards compatibility in configuration files. Default: undef.
 
 ##### `default_vhost`
 
-Configures a default virtual host when the class is declared. Valid options: Boolean. Default: 'true'.
+Configures a default virtual host when the class is declared. Valid options: Boolean. Default: true.
 
-To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to 'false'.
+To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to false.
 
 ##### `dev_packages`
 
-Configures a specific dev package to use. Valid options: String.  Default: 'OS default httpd dev package'.
+Configures a specific dev package to use. Valid options: A string or array of strings. Default: Depends on the operating system.
+
+- **Red Hat:** 'httpd-devel'
+- **Debian 8/Ubuntu 13.10 or newer:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
+- **Older Debian/Ubuntu versions:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
+- **FreeBSD, Gentoo:** undef
+- **Suse:** ['libapr-util1-devel', 'libapr1-devel']
 
 Example for using httpd 2.4 from the IUS yum repo:
 
-~~~ puppet
+``` puppet
 include ::apache::dev
 class { 'apache':
   apache_name  => 'httpd24u',
   dev_packages => 'httpd24u-devel',
 }
-~~~
+```
 
 ##### `docroot`
 
@@ -933,15 +947,15 @@ Sets the default [`DocumentRoot`][] location. Default: Determined by your operat
 
 ##### `error_documents`
 
-Determines whether to enable [custom error documents][] on the Apache server. Valid options: Boolean. Default: 'false'.
+Determines whether to enable [custom error documents][] on the Apache server. Valid options: Boolean. Default: false.
 
 ##### `group`
 
 Sets the group ID that owns any Apache processes spawned to answer requests.
 
-By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To to prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to 'false'.
+By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To to prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to false.
 
-**Note**: Modifying this parameter only changes the group ID that Apache uses to spawn child processes to access resources. It does not change the user that owns the parent server process.
+> **Note**: Modifying this parameter only changes the group ID that Apache uses to spawn child processes to access resources. It does not change the user that owns the parent server process.
 
 ##### `httpd_dir`
 
@@ -976,7 +990,7 @@ Specifies the location where [Apache module][Apache modules] files are stored. D
 - **FreeBSD**: `/usr/local/libexec/apache24`
 - **Red Hat**: `modules`
 
-**Note**: Do not configure this parameter manually without special reason.
+> **Note**: Do not configure this parameter manually without special reason.
 
 ##### `loadfile_name`
 
@@ -990,21 +1004,21 @@ Changes the error log's verbosity. Valid options: 'alert', 'crit', 'debug', 'eme
 
 ##### `log_formats`
 
-Define additional [`LogFormat`][] directives. Valid options: A [Hash][], such as:
+Define additional [`LogFormat`][] directives. Valid options: A [hash][], such as:
 
-~~~ puppet
+``` puppet
 $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
-~~~
+```
 
 There are a number of predefined `LogFormats` in the `httpd.conf` that Puppet creates:
 
-~~~ httpd
+``` httpd
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
-~~~
+```
 
 If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition.
 
@@ -1019,19 +1033,19 @@ Changes the directory of Apache log files for the virtual host. Default: Determi
 
 ##### `logroot_mode`
 
-Overrides the default [`logroot`][] directory's mode. Default: 'undef'.
+Overrides the default [`logroot`][] directory's mode. Default: undef.
 
-**Note**: Do _not_ grant write access to the directory where the logs are stored without being aware of the consequences. See the [Apache documentation][Log security] for details.
+> **Note**: Do _not_ grant write access to the directory where the logs are stored without being aware of the consequences. See the [Apache documentation][Log security] for details.
 
 ##### `manage_group`
 
-When 'false', stops Puppet from creating the group resource. Valid options: Boolean. Default: 'true'.
+When false, stops Puppet from creating the group resource. Valid options: Boolean. Default: true.
 
-If you have a group created from another Puppet module that you want to use to run Apache, set this to 'false'. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
+If you have a group created from another Puppet module that you want to use to run Apache, set this to false. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
 
 ##### `manage_user`
 
-When 'false', stops Puppet from creating the user resource. Valid options: Boolean. Default: 'true'.
+When false, stops Puppet from creating the user resource. Valid options: Boolean. Default: true.
 
 This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
 
@@ -1046,12 +1060,12 @@ Sets where Puppet places configuration files for your [Apache modules][]. Defaul
 
 ##### `mpm_module`
 
-Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Valid options: 'event', 'itk', 'peruser', 'prefork', 'worker', or 'false'. Default: Determined by your operating system.
+Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Valid options: 'event', 'itk', 'peruser', 'prefork', 'worker', or false. Default: Determined by your operating system.
 
-- **Debian**: `worker`
-- **FreeBSD, Gentoo, and Red Hat**: `prefork`
+- **Debian**: 'worker'
+- **FreeBSD, Gentoo, and Red Hat**: 'prefork'
 
-You must set this to 'false' to explicitly declare the following classes with custom parameters:
+You must set this to false to explicitly declare the following classes with custom parameters:
 
 - [`apache::mod::event`][]
 - [`apache::mod::itk`][]
@@ -1059,7 +1073,7 @@ You must set this to 'false' to explicitly declare the following classes with cu
 - [`apache::mod::prefork`][]
 - [`apache::mod::worker`][]
 
-**Note**: Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `mpm_module`, you must uninstall all packages that depend on your installed Apache server.
+> **Note**: Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `mpm_module`, you must uninstall all packages that depend on your installed Apache server.
 
 ##### `package_ensure`
 
@@ -1067,27 +1081,31 @@ Controls the `package` resource's [`ensure`][] attribute. Valid options: 'absent
 
 ##### `pidfile`
 
-Allows settting a custom location for the pid file - useful if using a custom built Apache rpm. Defaults to 'run/httpd.pid' on RedHat, '/var/run/httpd.pid on FreeBSD and '\${APACHE_PID_FILE}' on Debian.
+Allows settting a custom location for the pid file - useful if using a custom built Apache rpm. Default: Depends on operating system.
+
+- **Debian:** '\${APACHE_PID_FILE}'
+- **FreeBSD:** '/var/run/httpd.pid'
+- **Red Hat:** 'run/httpd.pid'
 
 ##### `ports_file`
 
-Sets the path to the file containing Apache ports configuration. Default: `{$conf_dir}/ports.conf`.
+Sets the path to the file containing Apache ports configuration. Default: '{$conf_dir}/ports.conf'.
 
 ##### `purge_configs`
 
-Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: 'true'.
+Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: true.
 
-Setting this to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
+Setting this to false is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
 
 ##### `purge_vhost_dir`
 
-If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, the Boolean parameter `purge_vhost_dir` determines whether Puppet removes any configurations inside `vhost_dir` _not_ managed by Puppet. Default: same as [`purge_configs`][].
+If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, the Boolean parameter `purge_vhost_dir` determines whether Puppet removes any configurations inside `vhost_dir` _not_ managed by Puppet. Valid options: Boolean. Default: same as [`purge_configs`][].
 
-Setting `purge_vhost_dir` to 'false' is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
+Setting `purge_vhost_dir` to false is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
 ##### `rewrite_lock`
 
-Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your vhost. Default: 'undef'.
+Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your virtual host. Default: undef.
 
 This parameter only applies to Apache version 2.2 or lower and is ignored on newer versions.
 
@@ -1120,11 +1138,11 @@ Configures a trailing footer line to display at the bottom of server-generated d
 
 ##### `server_tokens`
 
-Controls how much information Apache sends to the browser about itself and the operating system, via Apache's [`ServerTokens`][] directive. Defaults to 'OS'.
+Controls how much information Apache sends to the browser about itself and the operating system, via Apache's [`ServerTokens`][] directive. Default: 'OS'.
 
 ##### `service_enable`
 
-Determines whether Puppet enables the Apache HTTPD service when the system is booted. Valid options: Boolean. Default: 'true'.
+Determines whether Puppet enables the Apache HTTPD service when the system is booted. Valid options: Boolean. Default: true.
 
 ##### `service_ensure`
 
@@ -1136,21 +1154,21 @@ The 'false' or 'stopped' values set the 'httpd' service resource's `ensure` para
 
 Sets the name of the Apache service. Default: determined by your operating system.
 
-- **Debian and Gentoo**: `apache2`
-- **FreeBSD**: `apache22`
-- **Red Hat**: `httpd`
+- **Debian and Gentoo**: 'apache2'
+- **FreeBSD**: 'apache22'
+- **Red Hat**: 'httpd'
 
 ##### `service_manage`
 
-Determines whether Puppet manages the HTTPD service's state. Default: 'true'.
+Determines whether Puppet manages the HTTPD service's state. Valid options: Boolean. Default: true.
 
 ##### `service_restart`
 
-Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. Default: 'undef', which uses the [default Puppet behavior][Service attribute restart].
+Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. Default: undef, which uses the [default Puppet behavior][Service attribute restart].
 
 ##### `timeout`
 
-Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request. Defaults to 120.
+Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request. Default: 120.
 
 ##### `trace_enable`
 
@@ -1158,11 +1176,11 @@ Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceE
 
 ##### `use_systemd`
 
-Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom built rpms. This can either be 'true' or 'false, defaults to 'true'.
+Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs. Valid options: Boolean. Default: true.
 
 ##### `file_mode`
 
-The desired permissions mode for config files, in symbolic or numeric notation. This value must be a string. Defaults to '0644'.
+Sets the desired permissions mode for config files, in symbolic or numeric notation. Valid options: A string. Default: '0644'.
 
 ##### `vhost_dir`
 
@@ -1175,13 +1193,11 @@ Changes your virtual host configuration files' location. Default: determined by
 
 ##### `vhost_include_pattern`
 
-Defines the pattern for files included from the `vhost_dir`. This defaults to '*', also for BC with previous versions of this module.
+Defines the pattern for files included from the `vhost_dir`. Default: '*', also for BC with previous versions of this module.
 
-However, you may want to set this to a value like '[^.#]\*.conf[^~]' to make sure files accidentally created in this directory (from version
-control systems, editor backups or the like) are *not* included in your server configuration.
+However, you might want to set this to a value like '[^.#]\*.conf[^~]' to make sure files accidentally created in this directory (such as files created by version control systems or editor backups) are *not* included in your server configuration.
 
-A value of '*.conf' is what is shipped by some operating systems. Also note that this module will, by default, create config files ending
-in '.conf'.
+Some operating systems ship with a value of '*.conf'. Also note that this module will, by default, create configuration files ending in '.conf'.
 
 ##### `user`
 
@@ -1193,7 +1209,7 @@ Default: Puppet sets the default value via the [`apache::params`][] class, which
 - **FreeBSD**: 'www'
 - **Gentoo** and **Red Hat**: 'apache'
 
-To prevent Puppet from managing the user, set the [`manage_user`][] parameter to 'false'.
+To prevent Puppet from managing the user, set the [`manage_user`][] parameter to false.
 
 ##### `apache_name`
 
@@ -1219,19 +1235,19 @@ The default value is determined by your operating system:
 - **Gentoo**: 'undef'
 - **Red Hat**: 'httpd-devel'
 
-**Note**: On FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
+> **Note**: On FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
 
 #### Classes: `apache::mod::<MODULE NAME>`
 
 Enables specific [Apache modules][]. You can enable and configure an Apache module by declaring its class. For example, to install and enable [`mod_alias`][] with no icons, you can declare the [`apache::mod::alias`][] class with the `icons_options` parameter set to 'None':
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::alias':
   icons_options => 'None',
 }
-~~~
+```
 
-The following Apache modules have supported classes, many of which allow for parameterized configuration. You can install other Apache modules with the [`apache::mod`][] define.
+The following Apache modules have supported classes, many of which allow for parameterized configuration. You can install other Apache modules with the [`apache::mod`][] defined type.
 
 * `actions`
 * `alias` (see [`apache::mod::alias`][])
@@ -1328,11 +1344,11 @@ Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`
 
 You can specify the cache root by passing a path as a string to the `cache_root` parameter.
 
-~~~ puppet
+``` puppet
 class {'::apache::mod::disk_cache':
   cache_root => '/path/to/cache',
 }
-~~~
+```
 
 ##### Class: `apache::mod::event`
 
@@ -1357,18 +1373,18 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
 **Parameters within `apache::mod::auth_cas`**:
 
-- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. Default: 'undef'.
-- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`. Default: 'undef'.
-- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings. Default: 'undef'.
-- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header. Default: 'undef'.
-- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. Default: 'undef'.
-- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies. Default: 'undef'.
+- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. Default: undef.
+- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`. Default: undef.
+- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings. Default: undef.
+- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header. Default: undef.
+- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. Default: undef.
+- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies. Default: undef.
 - `cas_debug`: Determines whether to enable the module's debugging mode. Default: 'Off'.
-- `cas_idle_timeout`: Default: 'undef'.
+- `cas_idle_timeout`: Default: undef.
 - `cas_login_url`: **Required**. Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and don't have an active session.
-- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. Default: 'undef'.
-- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. Default: 'undef'.
-- `cas_validate_depth`: Limits the depth for chained certificate validation. Default: 'undef'.
+- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. Default: undef.
+- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. Default: undef.
+- `cas_validate_depth`: Limits the depth for chained certificate validation. Default: undef.
 - `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 - `cas_version`: The CAS protocol version to adhere to. Valid options: '1', '2'. Default: '2'.
 
@@ -1376,21 +1392,21 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
 Installs and manages [`mod_auth_mellon`][]. Its parameters share names with the Apache module's directives.
 
-~~~ puppet
+``` puppet
 class{ 'apache::mod::auth_mellon':
   mellon_cache_size => 101,
 }
-~~~
+```
 
 **Parameters within `apache::mod::auth_mellon`**:
 
-- `mellon_cache_entry_size`: Maximum size for a single session. Default: 'undef'.
+- `mellon_cache_entry_size`: Maximum size for a single session. Default: undef.
 - `mellon_cache_size`: Size in megabytes of the mellon cache. Default: 100.
 - `mellon_lock_file`: Location of lock file. Default: '`/run/mod_auth_mellon/lock`'.
 - `mellon_post_directory`: Full path where post requests are saved. Default: '`/var/cache/apache2/mod_auth_mellon/`'
-- `mellon_post_ttl`: Time to keep post requests. Default: 'undef'.
-- `mellon_post_size`: Maximum size of post requests. Default: 'undef'.
-- `mellon_post_count`: Maximum number of post requests. Default: 'undef'.
+- `mellon_post_ttl`: Time to keep post requests. Default: undef.
+- `mellon_post_size`: Maximum size of post requests. Default: undef.
+- `mellon_post_count`: Maximum number of post requests. Default: undef.
 
 ##### Class: `apache::mod::deflate`
 
@@ -1407,7 +1423,7 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 
 **Parameters within `apache::mod::expires`**:
 
-- `expires_active`: Enables generation of `Expires` headers for a document realm. Default: 'true'.
+- `expires_active`: Enables generation of `Expires` headers for a document realm. Valid options: Boolean. Default: true.
 - `expires_default`: Default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][]. Default: undef.
 - `expires_by_type`: Describes a set of [MIME `content-type`][] and their expiration times. Valid options: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content-type` (i.e. 'text/json') and its value following valid [interval syntax][]. Default: undef.
 
@@ -1415,14 +1431,14 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 
 Installs and configures [`mod_ext_filter`][].
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::ext_filter':
   ext_filter_define => {
     'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
     'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
   },
 }
-~~~
+```
 
 **Parameters within `apache::mod::ext_filter`**:
 
@@ -1434,7 +1450,7 @@ Installs and configures [`mod_fcgid`][].
 
 The class makes no effort to individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [hash][]. For example:
 
-~~~ puppet
+``` puppet
 class { 'apache::mod::fcgid':
   options => {
     'FcgidIPCDir'  => '/var/run/fcgidsock',
@@ -1442,13 +1458,13 @@ class { 'apache::mod::fcgid':
     'AddHandler'   => 'fcgid-script .fcgi',
   },
 }
-~~~
+```
 
 For a full list of options, see the [official `mod_fcgid` documentation][`mod_fcgid`].
 
 If you include `apache::mod::fcgid`, you can set the [`FcgidWrapper`][] per directory, per virtual host. The module must be loaded first; Puppet will not automatically enable it if you set the `fcgiwrapper` parameter in `apache::vhost`.
 
-~~~ puppet
+``` puppet
 include apache::mod::fcgid
 
 apache::vhost { 'example.org':
@@ -1460,7 +1476,7 @@ apache::vhost { 'example.org':
     }
   },
 }
-~~~
+```
 
 ##### Class: `apache::mod::geoip`
 
@@ -1469,13 +1485,13 @@ Installs and manages [`mod_geoip`][].
 **Parameters within `apache::mod::geoip`**:
 
 - `db_file`: Sets the path to your GeoIP database file. Valid options: a path, or an [array][] paths for multiple GeoIP database files. Default: `/usr/share/GeoIP/GeoIP.dat`.
-- `enable`: Determines whether to globally enable [`mod_geoip`][]. Valid options: Boolean. Default: 'false'.
+- `enable`: Determines whether to globally enable [`mod_geoip`][]. Valid options: Boolean. Default: false.
 - `flag`: Sets the GeoIP flag. Valid options: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'. Default: 'Standard'.
 - `output`: Defines which output variables to use. Valid options: 'All', 'Env', 'Request', 'Notes'. Default: 'All'.
-- `enable_utf8`: Changes the output from ISO-8859-1 (Latin-1) to UTF-8. Valid options: Boolean. Default: 'undef'.
-- `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option. Valid options: Boolean. Default: 'undef'.
-- `scan_proxy_header_field`: Specifies which header [`mod_geoip`][] should look at to determine the client's IP address. Default: 'undef'.
-- `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP if a comma-separated list of IP addresses is found. Valid options: Boolean. Default: 'undef'.
+- `enable_utf8`: Changes the output from ISO-8859-1 (Latin-1) to UTF-8. Valid options: Boolean. Default: undef.
+- `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option. Valid options: Boolean. Default: undef.
+- `scan_proxy_header_field`: Specifies which header [`mod_geoip`][] should look at to determine the client's IP address. Default: undef.
+- `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP if a comma-separated list of IP addresses is found. Valid options: Boolean. Default: undef.
 
 ##### Class: `apache::mod::info`
 
@@ -1483,38 +1499,38 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 
 **Parameters within `apache::mod::info`**:
 
-- `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server-info`. Valid options: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either. Default: ['127.0.0.1','::1']
-- `apache_version`: Default: `$::apache::apache_version`,
-- `restrict_access`: Determines whether to enable access restrictions. If 'false', the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: 'true'.
+- `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server-info`. Valid options: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either. Default: ['127.0.0.1','::1'].
+- `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. Default: the value of [`$::apache::apache_version`][`apache_version`].
+- `restrict_access`: Determines whether to enable access restrictions. If false, the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: true.
 
 ##### Class: `apache::mod::passenger`
 
 Installs and manages [`mod_passenger`][].
 
 **Parameters within `apache::mod::passenger`**:
-- `passenger_high_performance` Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). Valid options: on, off. Default: undef.
-- `passenger_pool_idle_time` Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime). Default: undef
+
+- `passenger_high_performance` Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). Valid options: 'on', 'off'. Default: undef.
+- `passenger_pool_idle_time` Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime). Default: undef.
 - `passenger_max_pool_size` Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize). Default: undef.
 - `passenger_max_request_queue_size` Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize). Default: undef.
 - `passenger_max_requests` Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests). Default: undef.
-- ...
 
 ##### Class: `apache::mod::ldap`
 
-Installs and configures [`mod_ldap`][]. Allows you to modify the
-[`LDAPTrustedGlobalCert`](https://httpd.apache.org/docs/2.2/mod/mod_ldap.html#ldaptrustedglobalcert) Directive:
+Installs and configures [`mod_ldap`][], and allows you to modify the
+[`LDAPTrustedGlobalCert`](https://httpd.apache.org/docs/current/mod/mod_ldap.html#ldaptrustedglobalcert) Directive:
 
-~~~puppet
+``` puppet
 class { 'apache::mod::ldap':
-  ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt'
+  ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
   ldap_trusted_global_cert_type => 'CA_DER',
 }
-~~~
+```
 
 **Parameters within `apache::mod::ldap`:**
 
 - `ldap_trusted_global_cert_file`: Path and file name of the trusted CA certificates to use when establishing SSL or TLS connections to an LDAP server.
-- `ldap_trusted_global_cert_type`: The global trust certificate format. Defaults to 'CA_BASE64'.
+- `ldap_trusted_global_cert_type`: The global trust certificate format. Default: 'CA_BASE64'.
 
 ##### Class: `apache::mod::negotiation`
 
@@ -1527,7 +1543,7 @@ Installs and configures [`mod_negotiation`][].
 
 ##### Class: `apache::mod::pagespeed`
 
-Installs and manages [`mod_pagespeed`], a Google module that rewrites web pages to reduce latency and bandwidth.
+Installs and manages [`mod_pagespeed`][], a Google module that rewrites web pages to reduce latency and bandwidth.
 
 While this Apache module requires the `mod-pagespeed-stable` package, Puppet **doesn't** manage the software repositories required to automatically install the package. If you declare this class when the package is either not installed or not available to your package manager, your Puppet run will fail.
 
@@ -1565,7 +1581,7 @@ While this Apache module requires the `mod-pagespeed-stable` package, Puppet **d
 - `allow_pagespeed_console`: Default: [].
 - `allow_pagespeed_message`: Default: [].
 - `message_buffer_size`: Default: 100000.
-- `additional_configuration`: Default: { }. A hash of directive/value pairs or an array of lines to insert at the end of the pagespeed configuration.
+- `additional_configuration`: A hash of directive-value pairs or an array of lines to insert at the end of the pagespeed configuration. Default: '{ }'.
 
 The class's parameters correspond to the module's directives. See the [module's documentation][`mod_pagespeed`] for details.
 
@@ -1579,7 +1595,7 @@ Default values depend on your operating system.
 
 > **Note**: This list is incomplete. Most of this class's parameters correspond to `mod_php` directives; see the [module's documentation][`mod_php`] for details.
 
-- `package_name`: Names the package that installs `php_mod`.
+- `package_name`: Names the package that installs `mod_php`.
 - `path`: Defines the path to the `mod_php` shared object (`.so`) file.
 - `source`: Defines the path to the default configuration. Valid options include a `puppet:///` path.
 - `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
@@ -1606,17 +1622,17 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 **Parameters within `apache::mod::ssl`**:
 
 - `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
-- `ssl_compression`: Default: 'false'.
+- `ssl_compression`: Default: false.
 - `ssl_cryptodevice`: Default: 'builtin'.
 - `ssl_honorcipherorder`: Default: 'On'.
-- `ssl_openssl_conf_cmd`: Default: 'undef'.
+- `ssl_openssl_conf_cmd`: Default: undef.
 - `ssl_options`: Default: [ 'StdEnvVars' ]
 - `ssl_pass_phrase_dialog`: Default: 'builtin'.
 - `ssl_protocol`: Default: [ 'all', '-SSLv2', '-SSLv3' ].
-- `ssl_random_seed_bytes`: Default: '512'.
-- `ssl_sessioncachetimeout`: Default: '300'.
+- `ssl_random_seed_bytes`: Valid options: A string. Default: '512'.
+- `ssl_sessioncachetimeout`: Valid options: A string. Default: '300'.
 
-To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to 'true' **o**r the [`ssl`][] parameter in [`apache::vhost`][] to 'true'.
+To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to true **or** the [`ssl`][] parameter in [`apache::vhost`][] to true.
 
 ##### Class: `apache::mod::status`
 
@@ -1696,13 +1712,13 @@ Manages the Apache daemon.
 
 Attempts to automatically detect the Apache version based on the operating system.
 
-### Public Defines
+### Public defined types
 
-#### Define: `apache::balancer`
+#### Defined type: `apache::balancer`
 
 Creates an Apache load balancing group, also known as a balancer cluster, using [`mod_proxy`][]. Each load balancing group needs one or more balancer members, which you can declare in Puppet with the  [`apache::balancermember`][] define.
 
-Declare one `apache::balancer` define for each Apache load balancing group. You can export `apache::balancermember` defines for all balancer members and collect them on a single Apache load balancer server using [exported resources][].
+Declare one `apache::balancer` define for each Apache load balancing group. You can export `apache::balancermember` defined types for all balancer members and collect them on a single Apache load balancer server using [exported resources][].
 
 **Parameters within `apache::balancer`**:
 
@@ -1712,19 +1728,19 @@ Sets the title of the balancer cluster and name of the `conf.d` file containing
 
 ##### `proxy_set`
 
-Configures key-value pairs as [`ProxySet`][] lines. Valid options: [Hash][]. Default: '{}'.
+Configures key-value pairs as [`ProxySet`][] lines. Valid options: a [hash][]. Default: '{}'.
 
 ##### `collect_exported`
 
-Determines whether to use [exported resources][]. Valid options: Boolean. Default: 'true'.
+Determines whether to use [exported resources][]. Valid options: Boolean. Default: true.
 
-If you statically declare all of your backend servers, set this parameter to 'false' to rely on existing, declared balancer member resources. Also, use `apache::balancermember` with [array][] arguments.
+If you statically declare all of your backend servers, set this parameter to false to rely on existing, declared balancer member resources. Also, use `apache::balancermember` with [array][] arguments.
 
-To dynamically declare backend servers via exported resources collected on a central node, set this parameter to 'true' to collect the balancer member resources exported by the balancer member nodes.
+To dynamically declare backend servers via exported resources collected on a central node, set this parameter to true to collect the balancer member resources exported by the balancer member nodes.
 
 If you don't use exported resources, a single Puppet run configures all balancer members. If you use exported resources, Puppet has to run on the balanced nodes first, then run on the balancer.
 
-#### Define: `apache::balancermember`
+#### Defined type: `apache::balancermember`
 
 Defines members of [`mod_proxy_balancer`][], which sets up a balancer member inside a listening service configuration block in the load balancer's `apache.cfg`.
 
@@ -1740,11 +1756,11 @@ Specifies the URL used to contact the balancer member server. Default:  'http://
 
 ##### `options`
 
-Specifies an [array][] of [options](http://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the URL, and accepts any key-value pairs available to [`ProxyPass`][]. Default: an empty array.
+Specifies an [array][] of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the URL, and accepts any key-value pairs available to [`ProxyPass`][]. Default: an empty array.
 
-#### Define: `apache::custom_config`
+#### Defined type: `apache::custom_config`
 
-Adds a custom configuration file to the Apache server's `conf.d` directory. If the file is invalid and this define's `$verify_config` parameter is 'true', Puppet throws an error during a Puppet run.
+Adds a custom configuration file to the Apache server's `conf.d` directory. If the file is invalid and this defined type's [`verify_config`][] parameter's value is true, Puppet throws an error during a Puppet run.
 
 **Parameters within `apache::custom_config`**:
 
@@ -1754,7 +1770,7 @@ Specifies whether the configuration file should be present. Valid options: 'abse
 
 ##### `confdir`
 
-Sets the directory in which Puppet places configuration files. Default: '$::apache::confd_dir'.
+Sets the directory in which Puppet places configuration files. Default: the value of [`$::apache::confd_dir`][`confd_dir`].
 
 ##### `content`
 
@@ -1762,13 +1778,13 @@ Sets the configuration file's content. The `content` and [`source`][] parameters
 
 ##### `filename`
 
-Sets the name of the file under `confdir` in which Puppet stores the configuration.  The default behavior is to generate the file name from the `priority` parameter and the resource name.
+Sets the name of the file under `confdir` in which Puppet stores the configuration. The default behavior is to generate the filename from the `priority` parameter and the resource name.
 
 ##### `priority`
 
-Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. The default value is `25`.
+Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. Default: '25'.
 
-To omit the priority prefix in the configuration file's name, set this parameter to `false`.
+To omit the priority prefix in the configuration file's name, set this parameter to false.
 
 ##### `source`
 
@@ -1782,11 +1798,11 @@ This parameter is only used if the [`verify_config`][] parameter's value is 'tru
 
 ##### `verify_config`
 
-Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: `true`.
+Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: true.
 
-#### Define: `apache::fastcgi::server`
+#### Defined type: `apache::fastcgi::server`
 
-Defines one or more external FastCGI servers to handle specific file types. Use this define with [`mod_fastcgi`][FastCGI].
+Defines one or more external FastCGI servers to handle specific file types. Use this defined type with [`mod_fastcgi`][FastCGI].
 
 **Parameters within `apache::fastcgi::server`:**
 
@@ -1814,11 +1830,11 @@ Internally links actions with the FastCGI server. This alias must be unique.
 
 Sets the [MIME `content-type`][] of the file to be processed by the FastCGI server.
 
-#### Define: `apache::listen`
+#### Defined type: `apache::listen`
 
-Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this define, and titles take the form '<PORT>', '<IPV4>:<PORT>', or '<IPV6>:<PORT>'.
+Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this defined type, and titles take the form '<PORT>', '<IPV4>:<PORT>', or '<IPV6>:<PORT>'.
 
-#### Define: `apache::mod`
+#### Defined type: `apache::mod`
 
 Installs packages for an Apache module that doesn't have a corresponding [`apache::mod::<MODULE NAME>`][] class, and checks for or places the module's default configuration files in the Apache server's `module` and `enable` directories. The default locations depend on your operating system.
 
@@ -1844,39 +1860,41 @@ Don't manually set this parameter without special reason. The [`path`][] paramet
 
 ##### `loadfile_name`
 
-Sets the filename for the module's [`LoadFile`][] directive, which can also set the module load order as Apache processes them in alphanumeric order. Valid options: filenames formatted `\*.load`. Default: `$name.load`.
+Sets the filename for the module's [`LoadFile`][] directive, which can also set the module load order as Apache processes them in alphanumeric order. Valid options: filenames formatted `\*.load`. Default: the resource's name followed by 'load', as in '$name.load'.
 
 ##### `loadfiles`
 
-Specifies an [array][] of [`LoadFile`][] directives.
+Specifies an array of [`LoadFile`][] directives. Default: undef.
 
 ##### `path`
 
-Specifies a path to the module. Default: [`lib_path`][]/[`lib`][]. Don't manually set this parameter without special reason.
+Specifies a path to the module. Default: [`lib_path`][]/[`lib`][].
 
-#### Define: `apache::namevirtualhost`
+> **Note:** Don't manually set this parameter without a specific reason.
+
+#### Defined type: `apache::namevirtualhost`
 
 Enables [name-based virtual hosts][] and adds all related directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles can take the forms '\*', '*:<PORT>', '\_default_:<PORT>, '<IP>', or '<IP>:<PORT>'.
 
-#### Define: `apache::vhost`
+#### 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` being a defined resource type, which allows Apache to evaluate it multiple times with different parameters.
 
-The `apache::vhost` define allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default virtual host within the base `::apache` class, as well as set a customized virtual host as the default. Customized virtual hosts have a lower numeric [`priority`][] than the base class's, causing Apache to process the customized virtual host first.
+The `apache::vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default virtual host within the base `::apache` class, as well as set a customized virtual host as the default. Customized virtual hosts have a lower numeric [`priority`][] than the base class's, causing Apache to process the customized virtual host first.
 
-The `apache::vhost` define uses `concat::fragment` to build the configuration file. To inject custom fragments for pieces of the configuration that the define doesn't inherently support, add a custom fragment.
+The `apache::vhost` defined type uses `concat::fragment` to build the configuration file. To inject custom fragments for pieces of the configuration that the defined type doesn't inherently support, add a custom fragment.
 
-For the custom fragment's `order` parameter, the `apache::vhost` define uses multiples of 10, so any `order` that isn't a multiple of 10 should work.
+For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples of 10, so any `order` that isn't a multiple of 10 should work.
 
 **Parameters within `apache::vhost`**:
 
 ##### `access_log`
 
-Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). Valid options: Boolean. Default: 'true'.
+Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). Valid options: Boolean. Default: true.
 
 ##### `access_log_env_var`
 
-Specifies that only requests with particular environment variables be logged. Defaults to 'undef'.
+Specifies that only requests with particular environment variables be logged. Default: undef.
 
 ##### `access_log_file`
 
@@ -1888,11 +1906,11 @@ Specifies the use of either a [`LogFormat`][] nickname or a custom-formatted str
 
 ##### `access_log_pipe`
 
-Specifies a pipe where Apache sends access log messages. Default: 'undef'.
+Specifies a pipe where Apache sends access log messages. Default: undef.
 
 ##### `access_log_syslog`
 
-Sends all access log messages to syslog. Default: 'undef'.
+Sends all access log messages to syslog. Default: undef.
 
 ##### `add_default_charset`
 
@@ -1900,13 +1918,13 @@ Sets a default media charset value for the [`AddDefaultCharset`][] directive, wh
 
 ##### `add_listen`
 
-Determines whether the virtual host creates a [`Listen`][] statement. Valid options: Boolean. Default: 'true'.
+Determines whether the virtual host creates a [`Listen`][] statement. Valid options: Boolean. Default: true.
 
-Setting `add_listen` to 'false' prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are.
+Setting `add_listen` to false prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are.
 
 ##### `use_optional_includes`
 
-Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer. Valid options: Boolean. Default: 'false'.
+Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer. Valid options: Boolean. Default: false.
 
 ##### `additional_includes`
 
@@ -1914,11 +1932,11 @@ Specifies paths to additional static, virtual host-specific Apache configuration
 
 ##### `aliases`
 
-Passes a list of [Hashes][Hash] to the virtual host to create [`Alias`][], [`AliasMatch`][], [`ScriptAlias`][] or [`ScriptAliasMatch`][] directives as per the [`mod_alias`][] documentation.
+Passes a list of [hashes][hash] to the virtual host to create [`Alias`][], [`AliasMatch`][], [`ScriptAlias`][] or [`ScriptAliasMatch`][] directives as per the [`mod_alias`][] documentation.
 
 For example:
 
-~~~ puppet
+``` puppet
 aliases => [
   { aliasmatch       => '^/image/(.*)\.jpg$',
     path             => '/files/jpg.images/$1.jpg',
@@ -1936,11 +1954,11 @@ aliases => [
     path             => '/usr/share/nagios/html',
   },
 ],
-~~~
+```
 
 For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs a corresponding context, such as `<Directory /path/to/directory>` or `<Location /some/location/here>`. Puppet creates the directives in the order specified in the `aliases` parameter. As described in the [`mod_alias`][] documentation, add more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more general ones to avoid shadowing.
 
-**Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because you can precisely control the various alias directives' order. Defining `ScriptAliases` using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` directives. This often causes problems, for example with Nagios.
+> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because you can precisely control the various alias directives' order. Defining `ScriptAliases` using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` directives. This often causes problems, for example with Nagios.
 
 If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is 'true', the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
@@ -1954,11 +1972,11 @@ Specifies the list of things to which Apache blocks access. Valid option: 'scm',
 
 ##### `custom_fragment`
 
-Passes a string of custom configuration directives to place at the end of the virtual host configuration. Default: 'undef'.
+Passes a string of custom configuration directives to place at the end of the virtual host configuration. Default: undef.
 
 ##### `default_vhost`
 
-Sets a given `apache::vhost` define as the default to serve requests that do not match any other `apache::vhost` defines. Default: 'false'.
+Sets a given `apache::vhost` defined type as the default to serve requests that do not match any other `apache::vhost` defined types. Default: false.
 
 ##### `directories`
 
@@ -1966,97 +1984,105 @@ See the [`directories`](#parameter-directories-for-apachevhost) section.
 
 ##### `directoryindex`
 
-Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details. Default: 'undef'.
+Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details. Default: undef.
 
 ##### `docroot`
 
 **Required**. Sets the [`DocumentRoot`][] location, from which Apache serves files.
 
-If `docroot` and [`manage_docroot`][] are both set to `false`, no [`DocumentRoot`][] will be set and the accompanying `<Directory /path/to/directory>` block will not be created.
+If `docroot` and [`manage_docroot`][] are both set to false, no [`DocumentRoot`][] will be set and the accompanying `<Directory /path/to/directory>` block will not be created.
 
 ##### `docroot_group`
 
-Sets group access to the [`docroot`][] directory. Defaults to 'root'.
+Sets group access to the [`docroot`][] directory. Valid options: A string representing a system group. Default: 'root'.
 
 ##### `docroot_owner`
 
-Sets individual user access to the docroot directory. Defaults to 'root'.
+Sets individual user access to the [`docroot`][] directory. Valid options: A string representing a user account. Default: 'root'.
 
 ##### `docroot_mode`
 
-Sets access permissions of the docroot directory. Defaults to 'undef'.
+Sets access permissions for the [`docroot`][] directory, in numeric notation. Valid options: A string. Default: undef.
 
 ##### `manage_docroot`
 
-Whether to manage to docroot directory at all. Defaults to 'true'.
+Determines whether Puppet manages the [`docroot`][] directory. Valid options: Boolean. Default: true.
 
 ##### `error_log`
 
-Specifies whether `*_error.log` directives should be configured. Defaults to 'true'.
+Specifies whether `*_error.log` directives should be configured. Valid options: Boolean. Default: true.
 
 ##### `error_log_file`
 
-Points to the `*_error.log` file. Given a vhost, example.com, it defaults to 'example.com_ssl_error.log' for SSL vhosts and 'example.com_access_error.log' for non-SSL vhosts.
+Points the virtual host's error logs to a `*_error.log` file. If this parameter is undefined, Puppet checks for values in [`error_log_pipe`][], then [`error_log_syslog`][].
+
+If none of these parameters is set, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts.
 
 ##### `error_log_pipe`
 
-Specifies a pipe to send error log messages to. Defaults to 'undef'.
+Specifies a pipe to send error log messages to. Default: undef.
+
+This parameter has no effect if the [`error_log_file`][] parameter has a value. If neither this parameter nor `error_log_file` has a value, Puppet then checks [`error_log_syslog`][].
 
 ##### `error_log_syslog`
 
-Sends all error log messages to syslog. Defaults to 'undef'.
+Determines whether to send all error log messages to syslog. Valid options: Boolean. Default: undef.
+
+This parameter has no effect if either of the [`error_log_file`][] or [`error_log_pipe`][] parameters has a value. If none of these parameters has a value, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts.
 
 ##### `error_documents`
 
-A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this vhost. Defaults to '[]'. Example:
+A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this virtual host. Default: '[]'.
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      error_documents => [
-        { 'error_code' => '503', 'document' => '/service-unavail' },
-        { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
-      ],
-    }
-~~~
+An example:
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  error_documents => [
+    { 'error_code' => '503', 'document' => '/service-unavail' },
+    { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
+  ],
+}
+```
 
 ##### `ensure`
 
-Specifies if the vhost file is present or absent. Defaults to 'present'.
+Specifies if the virtual host is present or absent. Valid options: 'absent', 'present'. Default: 'present'.
 
 ##### `fallbackresource`
 
-Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid values must either begin with a / or be 'disabled'. Defaults to 'undef'.
+Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid options must either begin with a '/' or be 'disabled'. Default: undef.
 
 ##### `filters`
 
-[Filters](http://httpd.apache.org/docs/2.2/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
+[Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
 
-~~~ puppet
-    apache::vhost { "$::fqdn":
-      filters => [
-        'FilterDeclare   COMPRESS',
-        'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
-        'FilterChain     COMPRESS',
-        'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
-      ],
-    }
-~~~
+``` puppet
+apache::vhost { "$::fqdn":
+  filters => [
+    'FilterDeclare   COMPRESS',
+    'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
+    'FilterChain     COMPRESS',
+    'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
+  ],
+}
+```
 
 ##### `force_type`
 
-Sets the [`ForceType`][] directive, which forces Apache to serve all matching files with the specified [MIME `content-type`][].
+Sets the [`ForceType`][] directive, which forces Apache to serve all matching files with a [MIME `content-type`][] matching this parameter's value.
 
 ##### `headers`
 
-Adds lines to replace, merge, or remove response headers. See [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Can be an array. Defaults to 'undef'.
+Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Valid options: A string, an array of strings, or undef. Default: undef.
 
 ##### `ip`
 
-Sets the IP address the vhost listens on. Defaults to listen on all IPs.
+Sets the IP address the virtual host listens on. Valid options: Strings. Default: undef, which uses Apache's default behavior of listening on all IPs.
 
 ##### `ip_based`
 
-Enables an [IP-based](http://httpd.apache.org/docs/current/vhosts/ip-based.html) vhost. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based vhosts. Defaults to 'false'.
+Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual host. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based virtual hosts. Default: false.
 
 ##### `itk`
 
@@ -2072,7 +2098,7 @@ Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys can be:
 
 Usage typically looks like:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot => '/path/to/directory',
   itk     => {
@@ -2080,15 +2106,15 @@ apache::vhost { 'sample.example.net':
     group => 'somegroup',
   },
 }
-~~~
+```
 
 ##### `auth_kerb`
 
-Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid values are 'true' or 'false'. Defaults to 'false'.
+Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid options: Boolean. Default: false.
 
 Usage typically looks like:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   auth_kerb              => true,
   krb_method_negotiate   => 'on',
@@ -2101,24 +2127,24 @@ apache::vhost { 'sample.example.net':
     auth_require => 'valid-user',
   },
 }
-~~~
+```
 
 Related parameters follow the names of `mod_auth_kerb` directives:
 
 - `krb_method_negotiate`: Determines whether to use the Negotiate method. Default: 'on'.
 - `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'.
 - `krb_authoritative`: If set to 'off', authentication controls can be passed on to another module. Default: 'on'.
-- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: `[]`.
+- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: '[]'.
 - `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: undef.
 - `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: undef.
 
 ##### `krb_verify_kdc`
 
-This option can be used to disable the verification tickets against local keytab to prevent KDC spoofing attacks. Default is 'on'
+This option can be used to disable the verification tickets against local keytab to prevent KDC spoofing attacks. Default: 'on'.
 
 ##### `krb_servicename`
 
-Specifies the service name that will be used by Apache for authentication. Corresponding key of this name must be stored in the keytab. Default is 'HTTP'
+Specifies the service name that will be used by Apache for authentication. Corresponding key of this name must be stored in the keytab. Default: 'HTTP'.
 
 ##### `krb_save_credentials`
 
@@ -2126,20 +2152,19 @@ This option enables credential saving functionality. Default is 'off'
 
 ##### `logroot`
 
-Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
+Specifies the location of the virtual host's logfiles. Default: '/var/log/<apache log location>/'.
 
 ##### `$logroot_ensure`
 
-Determines whether or not to remove the logroot directory for a virtual host. Valid values are 'directory', or 'absent'.
+Determines whether or not to remove the logroot directory for a virtual host. Valid options: 'directory',  'absent'.
 
 ##### `logroot_mode`
 
-Overrides the mode the logroot directory is set to. Defaults to undef. Do NOT give people write access to the directory the logs are stored
-in without being aware of the consequences; see http://httpd.apache.org/docs/2.4/logs.html#security for details.
+Overrides the mode the logroot directory is set to. Default: undef. Do *not* grant write access to the directory the logs are stored in without being aware of the consequences; for more information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
 
 ##### `log_level`
 
-Specifies the verbosity of the error log. Defaults to 'warn' for the global server configuration and can be overridden on a per-vhost basis. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
+Specifies the verbosity of the error log. Valid options: 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'. Default: 'warn' for the global server configuration, which can be overridden on a per-virtual host basis.
 
 ###### `modsec_body_limit`
 
@@ -2147,27 +2172,27 @@ Configures the maximum request body size (in bytes) ModSecurity will accept for
 
 ###### `modsec_disable_vhost`
 
-Boolean.  Only valid if apache::mod::security is included.  Used to disable mod_security on an individual vhost.  Only relevant if apache::mod::security is included.
+Disables [`mod_security`][] on a virtual host. Only valid if [`apache::mod::security`][] is included. Valid options: Boolean. Default: undef.
 
 ###### `modsec_disable_ids`
 
-Array of mod_security IDs to remove from the vhost.  Also takes a hash allowing removal of an ID from a specific location.
+Array of mod_security IDs to remove from the virtual host. Also takes a hash allowing removal of an ID from a specific location.
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      modsec_disable_ids => [ 90015, 90016 ],
-    }
-~~~
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_ids => [ 90015, 90016 ],
+}
+```
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
-    }
-~~~
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
+}
+```
 
 ###### `modsec_disable_ips`
 
-Array of IPs to exclude from mod_security rule matching
+Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching. Default: undef.
 
 ##### `no_proxy_uris`
 
@@ -2175,34 +2200,34 @@ Specifies URLs you do not want to proxy. This parameter is meant to be used in c
 
 ##### `no_proxy_uris_match`
 
-This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
+This directive is equivalent to [`no_proxy_uris`][], but takes regular expressions.
 
 ##### `proxy_preserve_host`
 
-Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). Valid options: Boolean. Default: 'false'.
+Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). Valid options: Boolean. Default: false.
 
-Setting this parameter to 'true' enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. 'false' sets this option to 'Off'.
+Setting this parameter to true enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. Setting it to false sets this directive to 'Off'.
 
 ##### `proxy_error_override`
 
-Sets the [ProxyErrorOverride Directive](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether apache should override error pages for proxied content. This option is off by default.
+Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content. Default: false.
 
 ##### `options`
 
 Sets the [`Options`][] for the specified virtual host. Default: ['Indexes','FollowSymLinks','MultiViews'], as demonstrated below:
 
-~~~ puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      options => ['Indexes','FollowSymLinks','MultiViews'],
-    }
-~~~
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  options => ['Indexes','FollowSymLinks','MultiViews'],
+}
+```
 
-**Note**: If you use the [`directories`][] parameter of [`apache::vhost`][], 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
+> **Note**: If you use the [`directories`][] parameter of [`apache::vhost`][], 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
 ##### `override`
 
-Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. Defaults to '[none]'.
+Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. Default: '[none]'.
 
 ##### `passenger_app_root`
 
@@ -2214,11 +2239,11 @@ Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/re
 
 ##### `passenger_log_file`
 
-By default Passenger log messages are written to the Apache global error log. With [PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile), you can have those messages logged to a different file instead. n.b.: This option is only available since Passenger 5.0.5
+By default, Passenger log messages are written to the Apache global error log. With [PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile), you can configure those messages to be logged to a different file. This option is only available since Passenger 5.0.5.
 
 ##### `passenger_ruby`
 
-Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby) on this virtual host, the Ruby interpreter to use for the application.
+Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby), the Ruby interpreter to use for the application, on this virtual host.
 
 ##### `passenger_min_instances`
 
@@ -2234,35 +2259,35 @@ Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/
 
 ##### `php_flags & values`
 
-Allows per-vhost setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Defaults to '{}'.
+Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Default: '{}'.
 
 ##### `php_admin_flags & values`
 
-Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '{}'.
+Allows per-virtual host setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Default: '{}'.
 
 ##### `port`
 
-Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host only listens on the port set in this parameter.
+Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only listens on the port set in this parameter.
 
 ##### `priority`
 
-Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Defaults to '25'.
+Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Default: '25'.
 
-If nothing matches the priority, the first name-based vhost is used. Likewise, passing a higher priority causes the alphabetically first name-based vhost to be used if no other names match.
+If nothing matches the priority, the first name-based virtual host is used. Likewise, passing a higher priority causes the alphabetically first name-based virtual host to be used if no other names match.
 
-*Note:* You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
+> **Note:** You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
 
-Pass priority `false` to omit the priority prefix in file names.
+To omit the priority prefix in file names, pass a priority of false.
 
 ##### `proxy_dest`
 
-Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
+Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Default: undef.
 
 ##### `proxy_pass`
 
-Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters and location options can be added as an array.
+Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Default: undef. Parameters and location options can optionally be added as an array.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   proxy_pass => [
@@ -2283,78 +2308,78 @@ apache::vhost { 'site.name.fdqn':
       'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
   ],
 }
-~~~
+```
 
-`reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
-`reverse_cookies` is optional and is used to set ProxyPassReverseCookiePath and/or ProxyPassReverseCookieDomain.
-`params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
-`setenv` is optional and is an array to set environment variables for the proxy directive, for details see http://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings
+* `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Valid options: an array or string.
+* `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
+* `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
+* `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Valid options: array.
 
 ##### `proxy_dest_match`
 
-This directive is equivalent to proxy_dest, but takes regular expressions, see [ProxyPassMatch](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
+This directive is equivalent to [`proxy_dest`][], but takes regular expressions, see [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
 
 ##### `proxy_dest_reverse_match`
 
-Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See [ProxyPassReverse](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) for details.
+Allows you to pass a ProxyPassReverse if [`proxy_dest_match`][] is specified. See [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) for details.
 
 ##### `proxy_pass_match`
 
-This directive is equivalent to proxy_pass, but takes regular expressions, see [ProxyPassMatch](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
+This directive is equivalent to [`proxy_pass`][], but takes regular expressions, see [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
 
 ##### `rack_base_uris`
 
-Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
+Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Default: undef.
 
 #####`passenger_base_uris`
 
-Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. Defaults to 'undef'.
+Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. Default: undef.
 
 ##### `redirect_dest`
 
-Specifies the address to redirect to. Defaults to 'undef'.
+Specifies the address to redirect to. Default: undef.
 
 ##### `redirect_source`
 
 Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   redirect_source => ['/images','/downloads'],
   redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
 }
-~~~
+```
 
 ##### `redirect_status`
 
-Specifies the status to append to the redirect. Defaults to 'undef'.
+Specifies the status to append to the redirect. Default: undef.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   redirect_status => ['temp','permanent'],
 }
-~~~
+```
 
 ##### `redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
 
-Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Defaults to 'undef'.
+Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Default: undef.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   redirectmatch_status => ['404','404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
 }
-~~~
+```
 
 ##### `request_headers`
 
-Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Defaults to 'undef'.
+Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Default: undef.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   request_headers => [
@@ -2362,23 +2387,23 @@ apache::vhost { 'site.name.fdqn':
     'unset MirrorID',
   ],
 }
-~~~
+```
 ##### `rewrites`
 
-Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Defaults to 'undef'.
+Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Default: undef.
 
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
 }
-~~~
+```
 
 The parameter allows rewrite conditions that, when true, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   rewrites => [
@@ -2389,11 +2414,11 @@ apache::vhost { 'site.name.fdqn':
     },
   ],
 }
-~~~
+```
 
 You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   rewrites => [
@@ -2404,11 +2429,11 @@ apache::vhost { 'site.name.fdqn':
     },
   ],
 }
-~~~
+```
 
 Multiple rewrites and conditions are also possible
 
-~~~ puppet
+``` puppet
 apache::vhost { 'site.name.fdqn':
   …
   rewrites => [
@@ -2433,21 +2458,21 @@ apache::vhost { 'site.name.fdqn':
     },
   ],
 }
-~~~
+```
 
-Refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions.
+Refer to the [`mod_rewrite` documentation][`mod_rewrite`] for more details on what is possible with rewrite rules and conditions.
 
 ##### `scriptalias`
 
-Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for example: '/usr/scripts'. Defaults to 'undef'.
+Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as '/usr/scripts'. Default: undef.
 
 ##### `scriptaliases`
 
-**Note**: This parameter is deprecated in favor of the `aliases` parameter.
+> **Note**: This parameter is deprecated in favor of the `aliases` parameter.
 
-Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html).
+Passes an array of hashes to the virtual host to create either ScriptAlias or ScriptAliasMatch statements per the [`mod_alias` documentation][`mod_alias`].
 
-~~~ puppet
+``` puppet
 scriptaliases => [
   {
     alias => '/myscript',
@@ -2466,100 +2491,93 @@ scriptaliases => [
     path  => '/usr/share/neatscript',
   },
 ]
-~~~
+```
 
 The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases before more general ones to avoid shadowing.
 
 ##### `serveradmin`
 
-Specifies the email address Apache displays when it renders one of its error pages. Defaults to 'undef'.
+Specifies the email address Apache displays when it renders one of its error pages. Default: undef.
 
 ##### `serveraliases`
 
-Sets the [ServerAliases](http://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site. Defaults to '[]'.
+Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site. Default: '[]'.
 
 ##### `servername`
 
-Sets the servername corresponding to the hostname you connect to the virtual host at. Defaults to the title of the resource.
+Sets the servername corresponding to the hostname you connect to the virtual host at. Default: the title of the resource.
 
 ##### `setenv`
 
-Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
+Used by HTTPD to set environment variables for virtual hosts. Default: '[]'.
 
 Example:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'setenv.example.com':
   setenv => ['SPECIAL_PATH /foo/bin'],
 }
-~~~
+```
 
 ##### `setenvif`
 
-Used by HTTPD to conditionally set environment variables for vhosts. Defaults to '[]'.
+Used by HTTPD to conditionally set environment variables for virtual hosts. Default: '[]'.
 
 ##### `suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
 
-Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
-
-`suphp_addhandler` defaults to 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian and Gentoo.
+Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
 
-`suphp_configpath` defaults to 'undef' on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian and Gentoo.
+* `suphp_addhandler`. Default: 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian and Gentoo.
+* `suphp_configpath`. Default: undef on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian and Gentoo.
+* `suphp_engine`. Valid options: 'on' or 'off'. Default: 'off'.
 
-`suphp_engine` allows values 'on' or 'off'. Defaults to 'off'
+An example virtual host configuration with suPHP:
 
-To set up a virtual host with suPHP
-
-~~~ puppet
+``` puppet
 apache::vhost { 'suphp.example.com':
-  port                => '80',
-  docroot             => '/home/appuser/myphpapp',
-  suphp_addhandler    => 'x-httpd-php',
-  suphp_engine        => 'on',
-  suphp_configpath    => '/etc/php5/apache2',
-  directories         => { path => '/home/appuser/myphpapp',
-    'suphp'           => { user => 'myappuser', group => 'myappgroup' },
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => { path => '/home/appuser/myphpapp',
+    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
   }
 }
-~~~
+```
 
 ##### `vhost_name`
 
-Enables name-based virtual hosting. If no IP is passed to the virtual host, but the vhost is assigned a port, then the vhost name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name is set to the title of the resource. Defaults to '*'.
+Enables name-based virtual hosting. If no IP is passed to the virtual host, but the virtual host is assigned a port, then the virtual host name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the virtual host name is set to the title of the resource. Default: '*'.
 
 ##### `virtual_docroot`
 
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'.
+Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Default: false.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'subdomain.loc':
-  vhost_name       => '*',
-  port             => '80',
-  virtual_docroot' => '/var/www/%-2+',
-  docroot          => '/var/www',
-  serveraliases    => ['*.loc',],
+  vhost_name      => '*',
+  port            => '80',
+  virtual_docroot => '/var/www/%-2+',
+  docroot         => '/var/www',
+  serveraliases   => ['*.loc',],
 }
-~~~
+```
 
 ##### `wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
 
-Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi).
 
-`wsgi_daemon_process` sets the name of the WSGI daemon. It is a hash, accepting [these keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html), and it defaults to 'undef'.
+* `wsgi_daemon_process`: A hash that sets the name of the WSGI daemon, accepting [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html). Default: undef.
+* `wsgi_daemon_process_options`. _Optional._ Default: undef.
+* `wsgi_process_group`: Sets the group ID that the virtual host runs under. Default: undef.
+* `wsgi_script_aliases`: Requires a hash of web paths to filesystem .wsgi paths. Default: undef.
+* `wsgi_pass_authorization`: Uses the WSGI application to handle authorization instead of Apache when set to 'On'. For more information, see [mod_wsgi's WSGIPassAuthorization documentation] (https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html). Default: undef, leading Apache to use its default value of 'Off'.
+* `wsgi_chunked_request`: Enables support for chunked requests. Default: undef.
 
-`wsgi_daemon_process_options` is optional and defaults to 'undef'.
+An example virtual host configuration with WSGI:
 
-`wsgi_process_group` sets the group ID the virtual host runs under. Defaults to 'undef'.
-
-`wsgi_script_aliases` requires a hash of web paths to filesystem .wsgi paths. Defaults to 'undef'.
-
-`wsgi_pass_authorization` the WSGI application handles authorisation instead of Apache when set to 'On'. For more information see [here] (http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).  Defaults to 'undef' where apache sets the defaults setting to 'Off'.
-
-`wsgi_chunked_request` enables support for chunked requests. Defaults to 'undef'.
-
-To set up a virtual host with WSGI
-
-~~~ puppet
+``` puppet
 apache::vhost { 'wsgi.example.com':
   port                        => '80',
   docroot                     => '/var/www/pythonapp',
@@ -2573,19 +2591,19 @@ apache::vhost { 'wsgi.example.com':
   wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
   wsgi_chunked_request        => 'On',
 }
-~~~
+```
 
 #### Parameter `directories` for `apache::vhost`
 
-The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
+The `directories` parameter within the `apache::vhost` class passes an array of hashes to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory), [File](https://httpd.apache.org/docs/current/mod/core.html#files), and [Location](https://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
 
 The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys.
 
-The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'proxy', 'location', 'directorymatch', 'filesmatch', 'proxymatch' or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
+The `provider` key is optional. If missing, this key defaults to 'directory'. Valid options: 'directory', 'files', 'proxy', 'location', 'directorymatch', 'filesmatch', 'proxymatch' or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
 
-General `directories` usage looks something like
+An example use of `directories`:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'files.example.net':
   docroot     => '/var/www/files',
   directories => [
@@ -2595,26 +2613,28 @@ apache::vhost { 'files.example.net':
      },
   ],
 }
-~~~
+```
 
-*Note:* At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
+> **Note:** At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
 
-Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes.  This looks like
+Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes. This looks like
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [ { path => '/path/to/directory', handler => value } ],
 }
-~~~
+```
 
 Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are:
 
 ###### `addhandlers`
 
-Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`.
+Sets [AddHandler](https://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension'] }`.
+
+An example:
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2623,13 +2643,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `allow`
 
-Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
+Sets an [Allow](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2638,13 +2658,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `allow_override`
 
-Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
+Sets the types of directives allowed in [.htaccess](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot      => '/path/to/directory',
   directories  => [
@@ -2653,7 +2673,7 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `auth_basic_authoritative`
 
@@ -2661,35 +2681,35 @@ Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/curren
 
 ###### `auth_basic_fake`
 
-Sets the value for [AuthBasicFake](http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
+Sets the value for [AuthBasicFake](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
 
 ###### `auth_basic_provider`
 
-Sets the value for [AuthBasicProvider] (http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
+Sets the value for [AuthBasicProvider](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
 
 ###### `auth_digest_algorithm`
 
-Sets the value for [AuthDigestAlgorithm](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
+Sets the value for [AuthDigestAlgorithm](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
 
 ###### `auth_digest_domain`
 
-Sets the value for [AuthDigestDomain](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
+Sets the value for [AuthDigestDomain](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
 
 ###### `auth_digest_nonce_lifetime`
 
-Sets the value for [AuthDigestNonceLifetime](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
+Sets the value for [AuthDigestNonceLifetime](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
 
 ###### `auth_digest_provider`
 
-Sets the value for [AuthDigestProvider](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
+Sets the value for [AuthDigestProvider](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
 
 ###### `auth_digest_qop`
 
-Sets the value for [AuthDigestQop](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
+Sets the value for [AuthDigestQop](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
 
 ###### `auth_digest_shmem_size`
 
-Sets the value for [AuthAuthDigestShmemSize](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
+Sets the value for [AuthAuthDigestShmemSize](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
 
 ###### `auth_group_file`
 
@@ -2697,67 +2717,67 @@ Sets the value for [AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod
 
 ###### `auth_name`
 
-Sets the value for [AuthName](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm.
+Sets the value for [AuthName](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm.
 
 ###### `auth_require`
 
-Sets the entity name you're requiring to allow access. Read more about [Require](http://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives).
+Sets the entity name you're requiring to allow access. Read more about [Require](https://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives).
 
 ###### `auth_type`
 
-Sets the value for [AuthType](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
+Sets the value for [AuthType](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
 
 ###### `auth_user_file`
 
-Sets the value for [AuthUserFile](http://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
+Sets the value for [AuthUserFile](https://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
 
 ###### `custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the directory configuration.
 
-~~~ puppet
-  apache::vhost { 'monitor':
-    …
-    directories => [
-      {
-        path => '/path/to/directory',
-        custom_fragment => '
-  <Location /balancer-manager>
-    SetHandler balancer-manager
-    Order allow,deny
-    Allow from all
-  </Location>
-  <Location /server-status>
-    SetHandler server-status
-    Order allow,deny
-    Allow from all
-  </Location>
-  ProxyStatus On',
-      },
-    ]
-  }
-~~~
+``` puppet
+apache::vhost { 'monitor':
+  …
+  directories => [
+    {
+      path => '/path/to/directory',
+      custom_fragment => '
+<Location /balancer-manager>
+  SetHandler balancer-manager
+  Order allow,deny
+  Allow from all
+</Location>
+<Location /server-status>
+  SetHandler server-status
+  Order allow,deny
+  Allow from all
+</Location>
+ProxyStatus On',
+    },
+  ]
+}
+```
 
 ###### `deny`
 
-Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
+Sets a [Deny](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path => '/path/to/directory',
-          deny => 'from example.org',
-        },
-      ],
-    }
-~~~
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path => '/path/to/directory',
+      deny => 'from example.org',
+    },
+  ],
+}
+```
 
 ###### `error_documents`
 
 An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   directories => [
     { path            => '/srv/www',
@@ -2769,14 +2789,14 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `ext_filter_options`
 
 Sets the [ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
 Note that you must declare `class { 'apache::mod::ext_filter': }` before using this directive.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'filter.example.org':
   docroot     => '/var/www/filter',
   directories => [
@@ -2785,14 +2805,14 @@ apache::vhost { 'filter.example.org':
     },
   ],
 }
-~~~
+```
 
 ###### `geoip_enable`
 
 Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive.
 Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'first.example.com':
   docroot     => '/var/www/first',
   directories => [
@@ -2801,13 +2821,13 @@ apache::vhost { 'first.example.com':
     },
   ],
 }
-~~~
+```
 
 ###### `headers`
 
-Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
+Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => {
@@ -2815,13 +2835,13 @@ apache::vhost { 'sample.example.net':
     headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
   },
 }
-~~~
+```
 
 ###### `index_options`
 
-Allows configuration settings for [directory indexing](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
+Allows configuration settings for [directory indexing](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2832,13 +2852,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `index_order_default`
 
 Sets the [default ordering](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2848,13 +2868,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `index_style_sheet`
 
 Sets the [IndexStyleSheet](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet), which adds a CSS stylesheet to the directory index.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2865,13 +2885,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `mellon_enable`
 
-Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_melon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.
+Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_mellon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2893,25 +2913,25 @@ apache::vhost { 'sample.example.net':
     },
   ]
 }
-~~~
+```
 
-Related parameters follow the names of `mod_auth_melon` directives:
+Related parameters follow the names of `mod_auth_mellon` directives:
 
-- `mellon_cond`: Takes an array of mellon conditions that must be met to grant access, and creates a [MellonCond][`mod_auth_melon`] directive for each item in the array.
-- `mellon_endpoint_path`: Sets the [MellonEndpointPath][`mod_auth_melon`] to set the mellon endpoint path.
-- `mellon_idp_metadata_file`: Sets the [MellonIDPMetadataFile][`mod_auth_melon`] location of the IDP metadata file.
-- `mellon_saml_rsponse_dump`: Sets the [MellonSamlResponseDump][`mod_auth_melon`] directive to enable debug of SAML.
-- `mellon_set_env_no_prefix`: Sets the [MellonSetEnvNoPrefix][`mod_auth_melon`] directive to a hash of attribute names to map
+- `mellon_cond`: Takes an array of mellon conditions that must be met to grant access, and creates a [MellonCond][`mod_auth_mellon`] directive for each item in the array.
+- `mellon_endpoint_path`: Sets the [MellonEndpointPath][`mod_auth_mellon`] to set the mellon endpoint path.
+- `mellon_idp_metadata_file`: Sets the [MellonIDPMetadataFile][`mod_auth_mellon`] location of the IDP metadata file.
+- `mellon_saml_rsponse_dump`: Sets the [MellonSamlResponseDump][`mod_auth_mellon`] directive to enable debug of SAML.
+- `mellon_set_env_no_prefix`: Sets the [MellonSetEnvNoPrefix][`mod_auth_mellon`] directive to a hash of attribute names to map
 to environment variables.
-- `mellon_sp_private_key_file`: Sets the [MellonSPPrivateKeyFile][`mod_auth_melon`] directive for the private key location of the service provider.
-- `mellon_sp_cert_file`: Sets the [MellonSPCertFile][`mod_auth_melon`] directive for the public key location of the service provider.
-- `mellon_user`: Sets the [MellonUser][`mod_auth_melon`] attribute to use for the username.
+- `mellon_sp_private_key_file`: Sets the [MellonSPPrivateKeyFile][`mod_auth_mellon`] directive for the private key location of the service provider.
+- `mellon_sp_cert_file`: Sets the [MellonSPCertFile][`mod_auth_mellon`] directive for the public key location of the service provider.
+- `mellon_user`: Sets the [MellonUser][`mod_auth_mellon`] attribute to use for the username.
 
 ###### `options`
 
 Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2920,13 +2940,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `order`
 
-Sets the order of processing Allow and Deny statements as per [Apache core documentation](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
+Sets the order of processing Allow and Deny statements as per [Apache core documentation](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2935,13 +2955,13 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `passenger_enabled`
 
 Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directive to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -2950,9 +2970,9 @@ apache::vhost { 'sample.example.net':
     },
   ],
 }
-~~~
+```
 
-**Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
+> **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
 ###### `php_value` and `php_flag`
 
@@ -2966,37 +2986,37 @@ apache::vhost { 'sample.example.net':
 ###### `require`
 
 
-Sets a `Require` directive as per the [Apache Authz documentation](http://httpd.apache.org/docs/current/mod/mod_authz_core.html#require). If no `require` is set, it will default to `Require all granted`.
+Sets a `Require` directive as per the [Apache Authz documentation](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#require). If no `require` is set, it will default to `Require all granted`.
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path    => '/path/to/directory',
-          require => 'IP 10.17.42.23',
-        }
-      ],
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      require => 'IP 10.17.42.23',
     }
-~~~
+  ],
+}
+```
 
 If `require` is set to `unmanaged` it will not be set at all. This is useful for complex authentication/authorization requirements which are handled in a custom fragment.
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path    => '/path/to/directory',
-          require => 'unmanaged',
-        }
-      ],
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      require => 'unmanaged',
     }
-~~~
+  ],
+}
+```
 
 ###### `satisfy`
 
-Sets a `Satisfy` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
+Sets a `Satisfy` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3005,13 +3025,13 @@ apache::vhost { 'sample.example.net':
     }
   ],
 }
-~~~
+```
 
 ###### `sethandler`
 
-Sets a `SetHandler` directive per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler).
+Sets a `SetHandler` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#sethandler).
 
-~~~ puppet
+``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3020,13 +3040,13 @@ apache::vhost { 'sample.example.net':
     }
   ],
 }
-~~~
+```
 
 ###### `set_output_filter`
 
-Sets a `SetOutputFilter` directive per the [Apache Core documentation](http://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
+Sets a `SetOutputFilter` directive per the [Apache Core documentation](https://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
 
-~~~ puppet
+``` puppet
 apache::vhost{ 'filter.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3035,13 +3055,13 @@ apache::vhost{ 'filter.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `rewrites`
 
-Creates URL [`rewrites`](#rewrites) rules in vhost directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
+Creates URL [`rewrites`](#rewrites) rules in virtual host directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'secure.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3060,15 +3080,15 @@ apache::vhost { 'secure.example.net':
     },
   ],
 }
-~~~
+```
 
-***Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the vhost directories.
+> **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the virtual host's directories.
 
 ###### `shib_request_setting`
 
 Allows a valid content setting to be set or altered for the application request. This command takes two parameters: the name of the content setting, and the value to set it to. Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'secure.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3078,17 +3098,17 @@ apache::vhost { 'secure.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `shib_use_headers`
 
-When set to 'On', this turns on the use of request headers to publish attributes to applications. Valid values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
+When set to 'On', this turns on the use of request headers to publish attributes to applications. Valid options for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
 ###### `ssl_options`
 
-String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
+String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the virtual host.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'secure.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3100,13 +3120,13 @@ apache::vhost { 'secure.example.net':
     },
   ],
 }
-~~~
+```
 
 ###### `suphp`
 
-A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and can only be passed within `directories`.
+A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the virtual host declaration, and can only be passed within `directories`.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'secure.example.net':
   docroot     => '/path/to/directory',
   directories => [
@@ -3118,19 +3138,19 @@ apache::vhost { 'secure.example.net':
     },
   ],
 }
-~~~
+```
 
 #### SSL parameters for `apache::vhost`
 
-All of the SSL parameters for `::vhost` default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
+All of the SSL parameters for `::vhost` default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific virtual hosts.
 
 ##### `ssl`
 
-Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'.
+Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Valid options: Boolean. Default: false.
 
 ##### `ssl_ca`
 
-Specifies the SSL certificate authority. Defaults to 'undef'.
+Specifies the SSL certificate authority. Default: undef.
 
 ##### `ssl_cert`
 
@@ -3138,35 +3158,40 @@ Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/ce
 
 ##### `ssl_protocol`
 
-Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array or space separated string of accepted protocols. Defaults to 'all', '-SSLv2', '-SSLv3'.
+Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array or space separated string of accepted protocols. Defaults: 'all', '-SSLv2', '-SSLv3'.
 
 ##### `ssl_cipher`
 
-Specifies [SSLCipherSuite](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Defaults to 'HIGH:MEDIUM:!aNULL:!MD5'.
+Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Default: 'HIGH:MEDIUM:!aNULL:!MD5'.
 
 ##### `ssl_honorcipherorder`
 
-Sets [SSLHonorCipherOrder](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), which is used to prefer the server's cipher preference order. Defaults to 'On' in the base `apache` config.
+Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), which is used to prefer the server's cipher preference order. Default: 'On' in the base `apache` config.
 
 ##### `ssl_certs_dir`
 
-Specifies the location of the SSL certification directory. Defaults to '/etc/ssl/certs' on Debian, '/etc/pki/tls/certs' on RedHat, '/usr/local/etc/apache22' on FreeBSD, and '/etc/ssl/apache2' on Gentoo.
+Specifies the location of the SSL certification directory. Default: Depends on the operating system.
+
+- **Debian:** '/etc/ssl/certs'
+- **Red Hat:** '/etc/pki/tls/certs'
+- **FreeBSD:** '/usr/local/etc/apache22'
+- **Gentoo:** '/etc/ssl/apache2'
 
 ##### `ssl_chain`
 
-Specifies the SSL chain. Defaults to 'undef'. (This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the SSL chain. Default: undef. This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.
 
 ##### `ssl_crl`
 
-Specifies the certificate revocation list to use. Defaults to 'undef'. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the certificate revocation list to use. Default: undef. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 ##### `ssl_crl_path`
 
-Specifies the location of the certificate revocation list. Defaults to 'undef'. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the location of the certificate revocation list. Default: undef. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 ##### `ssl_crl_check`
 
-Sets the certificate revocation check level via the [SSLCARevocationCheck directive](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck), defaults to 'undef'. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck). Default: undef. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
 
 ##### `ssl_key`
 
@@ -3174,81 +3199,80 @@ Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tl
 
 ##### `ssl_verify_client`
 
-Sets the [SSLVerifyClient](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid values are: 'none', 'optional', 'require', and 'optional_no_ca'. Defaults to 'undef'.
+Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid options are: 'none', 'optional', 'require', and 'optional_no_ca'. Default: undef.
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_verify_client => 'optional',
-    }
-~~~
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_verify_client => 'optional',
+}
+```
 
 ##### `ssl_verify_depth`
 
-Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Defaults to 'undef'.
+Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Default: undef.
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_verify_depth => 1,
-    }
-~~~
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_verify_depth => 1,
+}
+```
 
 ##### `ssl_proxy_verify`
 
-Sets the [SSLProxyVerify](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server.  Defaults to 'undef'.
+Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server. Default: undef.
 
 ##### `ssl_proxy_machine_cert`
 
-Sets the [SSLProxyMachineCertificateFile](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers.  This file should be a concatenation of the PEM-encoded certificate files in order of preference.  Defaults to 'undef'.
+Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference. Default: undef.
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
-    }
-~~~
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
+}
+```
 
 ##### `ssl_proxy_check_peer_cn`
 
-Sets the [SSLProxyMachinePeerCN](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specified whether the remote server certificate's CN field is compared against the hostname of the request URL .  Defaults to 'undef'.
-
+Sets the [SSLProxyMachinePeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
 
 ##### `ssl_proxy_check_peer_name`
 
-Sets the [SSLProxyMachinePeerName](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specified whether the remote server certificate's CN field is compared against the hostname of the request URL .  Defaults to 'undef'.
+Sets the [SSLProxyMachinePeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
 
 ##### `ssl_options`
 
-Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'.
+Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given virtual host and can be a string or an array. Default: undef.
 
 A string:
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_options => '+ExportCertData',
-    }
-~~~
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_options => '+ExportCertData',
+}
+```
 
 An array:
 
-~~~ puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_options => [ '+StrictRequire', '+ExportCertData' ],
-    }
-~~~
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_options => [ '+StrictRequire', '+ExportCertData' ],
+}
+```
 
 ##### `ssl_openssl_conf_cmd`
 
-Sets the [SSLOpenSSLConfCmd](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. Defaults to 'undef'.
+Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. Default: undef.
 
 ##### `ssl_proxyengine`
 
-Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid values are 'true' and 'false'. Defaults to 'false'.
+Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid options: Boolean. Default: true.
 
-####Define: FastCGI Server
+#### Defined type: FastCGI Server
 
 This type is intended for use with mod_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
 
@@ -3256,7 +3280,7 @@ This type is intended for use with mod_fastcgi. It allows you to define one or m
 
 Ex:
 
-~~~ puppet
+``` puppet
 apache::fastcgi::server { 'php':
   host       => '127.0.0.1:9000',
   timeout    => 15,
@@ -3265,17 +3289,17 @@ apache::fastcgi::server { 'php':
   fcgi_alias => '/php.fcgi',
   file_type  => 'application/x-httpd-php'
 }
-~~~
+```
 
 Within your virtual host, you can then configure the specified file type to be handled by the fastcgi server specified above.
 
-~~~ puppet
+``` puppet
 apache::vhost { 'www':
   ...
   custom_fragment => 'AddType application/x-httpd-php .php'
   ...
 }
-~~~
+```
 
 ##### `host`
 
@@ -3301,11 +3325,9 @@ A unique alias. This is used internally to link the action with the FastCGI serv
 
 The MIME-type of the file to be processed by the FastCGI server.
 
-#### Define: `apache::vhost::custom`
+#### Defined type: `apache::vhost::custom`
 
-The `apache::vhost::custom` is a thin wrapper to the `apache::custom_config``
-define. We are simply overriding some of the default settings specifc to the
-vhost directory in Apache.
+The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specifc to the virtual host directory in Apache.
 
 **Parameters within `apache::vhost::custom`**:
 
@@ -3315,33 +3337,33 @@ Sets the configuration file's content.
 
 ##### `ensure`
 
-Specifies if the vhost file is present or absent. Defaults to 'present'.
+Specifies if the virtual host file is present or absent. Valid options: 'absent', 'present'. Default: 'present'.
 
 ##### `priority`
 
-Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Defaults to '25'.
+Sets the relative load order for Apache HTTPD VirtualHost configuration files. Default: '25'.
 
-### Private Defines
+### Private defined types
 
-#### Define: `apache::peruser::multiplexer`
+#### Defined type: `apache::peruser::multiplexer`
 
-This define checks if an Apache module has a class. If it does, it includes that class. If it does not, it passes the module name to the [`apache::mod`][] define.
+This defined type checks if an Apache module has a class. If it does, it includes that class. If it does not, it passes the module name to the [`apache::mod`][] defined type.
 
-#### Define: `apache::peruser::multiplexer`
+#### Defined type: `apache::peruser::multiplexer`
 
 Enables the [`Peruser`][] module for FreeBSD only.
 
-#### Define: `apache::peruser::processor`
+#### Defined type: `apache::peruser::processor`
 
 Enables the [`Peruser`][] module for FreeBSD only.
 
-#### Define: `apache::security::file_link`
+#### Defined type: `apache::security::file_link`
 
 Links the `activated_rules` from [`apache::mod::security`][] to the respective CRS rules on disk.
 
 ### Templates
 
-The Apache module relies heavily on templates to enable the [`apache::vhost`][] and [`apache::mod`][] defines. These templates are built based on [Facter][] facts specific to your operating system. Unless explicitly called out, most templates are not meant for configuration.
+The Apache module relies heavily on templates to enable the [`apache::vhost`][] and [`apache::mod`][] defined types. These templates are built based on [Facter][] facts specific to your operating system. Unless explicitly called out, most templates are not meant for configuration.
 
 ## Limitations
 
@@ -3359,7 +3381,7 @@ The [`apache::mod::passenger`][] class is not installing as the the EL6 reposito
 
 ### RHEL/CentOS 7
 
-The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] define's [`rack_base_uris`][] parameter.
+The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uris`][] parameter.
 
 ### General
 
@@ -3378,7 +3400,7 @@ If [SELinux][] is in [enforcing mode][] and you want to use custom paths for `lo
 
 You can do this with Puppet:
 
-~~~ puppet
+``` puppet
 exec { 'set_apache_defaults':
   command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"',
   path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
@@ -3415,7 +3437,7 @@ apache::vhost { 'test.server':
   docroot             => '/custom/path',
   additional_includes => '/custom/path/include',
 }
-~~~
+```
 
 You need to set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
@@ -3439,18 +3461,18 @@ This project contains tests for both [rspec-puppet][] and [beaker-rspec][] to ve
 
 #### Testing quickstart: Ruby > 1.8.7
 
-~~~
+```
 gem install bundler
 bundle install
 bundle exec rake spec
 bundle exec rspec spec/acceptance
 RS_DEBUG=yes bundle exec rspec spec/acceptance
-~~~
+```
 
 #### Testing quickstart: Ruby = 1.8.7
 
-~~~
+```
 gem install bundler
 bundle install --without system_tests
 bundle exec rake spec
-~~~
+```

From 0806e59a0ddc08f444ac2f073964023dfef871d0 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Fri, 5 Feb 2016 15:23:33 -0700
Subject: [PATCH 0830/2267] Release Prep for 1.8.1

---
 CHANGELOG.md  | 9 +++++++++
 metadata.json | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e787047623..58cd91ae62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## Supported Release 1.8.1
+### Summary
+This release includes bug fixes and a documentation update.
+
+#### Bugfixes
+- Fixes a bug that occurs when using the module in combination with puppetlabs-concat 2.x.
+- Fixes a bug where passenger.conf was vulnerable to purging.
+- Removes the pin of the concat module dependency.
+
 ## 2016-01-26 - Supported Release 1.8.0
 ### Summary
 This release includes a lot of bug fixes and feature updates, including support for Debian 8, as well as many test improvements.
diff --git a/metadata.json b/metadata.json
index 460502a181..9ef58c8c96 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -11,6 +11,7 @@
     {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
   ],
+  "data_provider": null,
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",

From 6c0579d36644859ac4566600c87a5295c1a394a8 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 15 Jan 2016 15:15:47 +0100
Subject: [PATCH 0831/2267] Fix fcgid.conf load on Debian family

Fix the regression from 1bf0aba (see #879).
---
 manifests/mod/fcgid.pp                         | 15 +++++++++++----
 spec/classes/mod/fcgid_spec.rb                 | 18 +++++++++---------
 .../{unixd_fcgid.conf.erb => fcgid.conf.erb}   |  0
 3 files changed, 20 insertions(+), 13 deletions(-)
 rename templates/mod/{unixd_fcgid.conf.erb => fcgid.conf.erb} (100%)

diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 4c0f919388..69e3112d4f 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,18 +1,25 @@
 class apache::mod::fcgid(
   $options = {},
 ) {
+  if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7') or $::osfamily == 'FreeBSD' {
+    $loadfile_name = 'unixd_fcgid.load'
+    $conf_name = 'unixd_fcgid.conf'
+  } else {
+    $loadfile_name = undef
+    $conf_name = 'fcgid.conf'
+  }
 
   ::apache::mod { 'fcgid':
-    loadfile_name => 'unixd_fcgid.load',
+    loadfile_name => $loadfile_name,
   }
 
   # Template uses:
   # - $options
-  file { 'unixd_fcgid.conf':
+  file { $conf_name:
     ensure  => file,
-    path    => "${::apache::mod_dir}/unixd_fcgid.conf",
+    path    => "${::apache::mod_dir}/${conf_name}",
     mode    => $::apache::file_mode,
-    content => template('apache/mod/unixd_fcgid.conf.erb'),
+    content => template('apache/mod/fcgid.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 98953625ac..b86cc0e6b3 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -17,17 +17,17 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        :is_pe                     => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.to contain_apache__mod('fcgid').with({
-      'loadfile_name' => 'unixd_fcgid.load'
+      'loadfile_name' => nil
     }) }
     it { is_expected.to contain_package("libapache2-mod-fcgid") }
   end
 
-  context "on a RedHat OS" do
+  context "on a RHEL6" do
     let :facts do
       {
         :osfamily                  => 'RedHat',
@@ -45,7 +45,7 @@
     describe 'without parameters' do
       it { is_expected.to contain_class("apache::params") }
       it { is_expected.to contain_apache__mod('fcgid').with({
-        'loadfile_name' => 'unixd_fcgid.load'
+        'loadfile_name' => nil
       }) }
       it { is_expected.to contain_package("mod_fcgid") }
     end
@@ -61,7 +61,7 @@
       } end
 
       it 'should contain the correct config' do
-        content = catalogue.resource('file', 'unixd_fcgid.conf').send(:parameters)[:content]
+        content = catalogue.resource('file', 'fcgid.conf').send(:parameters)[:content]
         expect(content.split("\n").reject { |c| c =~ /(^#|^$)/ }).to eq([
           '<IfModule mod_fcgid.c>',
           '  AddHandler fcgid-script .fcgi',
@@ -85,7 +85,7 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        :is_pe                     => false,
       }
     end
 
@@ -109,7 +109,7 @@
         :id                        => 'root',
         :kernel                    => 'FreeBSD',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        :is_pe                     => false,
       }
     end
 
@@ -130,13 +130,13 @@
         :id                        => 'root',
         :kernel                    => 'Linux',
         :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        :is_pe                     => false,
       }
     end
 
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.to contain_apache__mod('fcgid').with({
-      'loadfile_name' => 'unixd_fcgid.load'
+      'loadfile_name' => nil,
     }) }
     it { is_expected.to contain_package("www-apache/mod_fcgid") }
   end
diff --git a/templates/mod/unixd_fcgid.conf.erb b/templates/mod/fcgid.conf.erb
similarity index 100%
rename from templates/mod/unixd_fcgid.conf.erb
rename to templates/mod/fcgid.conf.erb

From c37677622f8bc11b3ad8620f28d4cbb9bc1325ce Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Sun, 7 Feb 2016 00:38:49 +0100
Subject: [PATCH 0832/2267] support Ubuntu xenial (16.04)

---
 manifests/params.pp | 5 +++++
 metadata.json       | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 0c6f9a34fd..7b6e93cc01 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -320,6 +320,11 @@
             $passenger_ruby         = undef
             $passenger_default_ruby = '/usr/bin/ruby'
           }
+          '16.04': {
+            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+            $passenger_ruby         = undef
+            $passenger_default_ruby = '/usr/bin/ruby'
+          }
           default: {
             # The following settings may or may not work on Ubuntu releases not
             # supported by this module.
diff --git a/metadata.json b/metadata.json
index 85e6889497..4bdd2f9a85 100644
--- a/metadata.json
+++ b/metadata.json
@@ -61,7 +61,8 @@
       "operatingsystemrelease": [
         "10.04",
         "12.04",
-        "14.04"
+        "14.04",
+        "16.04"
       ]
     }
   ],

From 72cb702921953b1e372d773e0c58b8be972ba70a Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 11 Feb 2016 17:00:51 -0800
Subject: [PATCH 0833/2267] Disable passenger tests on redhatish 6

RedHat 6 platforms need either their kernel updated (which we can't do
in testing) or selinux disabled and rebooted (which is silly) so lets
just disable the test.
---
 README.md                     | 2 +-
 spec/acceptance/vhost_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 464d2bc365..48b8cb3d48 100644
--- a/README.md
+++ b/README.md
@@ -1493,7 +1493,7 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 
 ##### Class: `apache::mod::passenger`
 
-Installs and manages [`mod_passenger`][].
+Installs and manages [`mod_passenger`][]. For RedHat based systems, please ensure that you meet the minimum requirements as described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux)
 
 **Parameters within `apache::mod::passenger`**:
 - `passenger_high_performance` Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). Valid options: on, off. Default: undef.
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 90b42e0e6e..2b40af4560 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1106,8 +1106,8 @@ class { 'apache': service_ensure => stopped, }
     end
   end
 
-  # Passenger isn't even in EPEL on el-5
-  if (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5')
+  # Passenger isn't even in EPEL on el-5 and needs a kernel update on el-6
+  if (fact('osfamily') == 'RedHat' and ! ['6','5'].include?(fact('operatingsystemmajrelease')))
     describe 'rack_base_uris' do
       before :all do
         pp = "if $::osfamily == 'RedHat' { include epel }"

From cbdd1871b9db73692f4fbe89cfcbe7f308ebc6be Mon Sep 17 00:00:00 2001
From: Sebastian Gerhards <sebastian.gerhards@aktion-mensch.de>
Date: Fri, 12 Feb 2016 13:05:08 +0100
Subject: [PATCH 0834/2267] Fix broken internal link for virtual hosts
 configuration

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6b8562bddb..c9deb5adc6 100644
--- a/README.md
+++ b/README.md
@@ -314,7 +314,7 @@ class { 'apache':
 
 ## Usage
 
-### Configuring a virtual host
+### Configuring virtual hosts
 
 The default [`apache`][] class sets up a virtual host on port 80, listening on all interfaces and serving the [`docroot`][] parameter's default directory of `/var/www`.
 

From 4cd7472478eadc4b93f7490e2dff3202e8c125aa Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Fri, 12 Feb 2016 14:23:29 +0100
Subject: [PATCH 0835/2267] support pass-header option in
 apache::fastcgi::server

---
 manifests/fastcgi/server.pp         | 3 ++-
 spec/defines/fastcgi_server_spec.rb | 5 +++--
 templates/fastcgi/server.erb        | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index ec89bf7785..8805484066 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -4,7 +4,8 @@
   $flush         = false,
   $faux_path     = "/var/www/${name}.fcgi",
   $fcgi_alias    = "/${name}.fcgi",
-  $file_type     = 'application/x-httpd-php'
+  $file_type     = 'application/x-httpd-php',
+  $pass_header   = undef,
 ) {
   include apache::mod::fastcgi
 
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 1a6d3199c4..fdcf2dbca3 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -116,11 +116,12 @@
           :flush      => true,
           :faux_path  => '/var/www/php-www.fcgi',
           :fcgi_alias => '/php-www.fcgi',
-          :file_type  => 'application/x-httpd-php'
+          :file_type  => 'application/x-httpd-php',
+          :pass_header => 'Authorization'
         }
       end
       let :expected do
-'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -host 127.0.0.1:9001
+'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -host 127.0.0.1:9001 -pass-header Authorization
 Alias /php-www.fcgi /var/www/php-www.fcgi
 Action application/x-httpd-php /php-www.fcgi
 '
diff --git a/templates/fastcgi/server.erb b/templates/fastcgi/server.erb
index 9cb25b76eb..61169413d1 100644
--- a/templates/fastcgi/server.erb
+++ b/templates/fastcgi/server.erb
@@ -1,3 +1,4 @@
-FastCGIExternalServer <%= @faux_path %> -idle-timeout <%= @timeout %> <%= if @flush then '-flush' end %> -host <%= @host %>
+FastCGIExternalServer <%= @faux_path %> -idle-timeout <%= @timeout %> <%= if @flush then '-flush' end %> -host <%= @host -%>
+<%- if @pass_header -%> -pass-header <%= @pass_header %><% end %>
 Alias <%= @fcgi_alias %> <%= @faux_path %>
 Action <%= @file_type %> <%= @fcgi_alias %>

From fc9ca123e3e3c80010e8373e3f67d30b069f7a5d Mon Sep 17 00:00:00 2001
From: David Schmitt <david@dasz.at>
Date: Tue, 16 Feb 2016 15:59:52 +0000
Subject: [PATCH 0836/2267] (FM-4046) Update to current msync configs [006831f]

This moves all copyright statements to the NOTICE file in accordance with the ASFs guidelines on applying the Apache-2.0 license.
---
 .gitattributes |   5 ++
 .gitignore     |   1 +
 .travis.yml    |   1 +
 Gemfile        |  39 ++++-----
 LICENSE        | 209 ++++++++++++++++++++++++++++++++++++++++++++++---
 NOTICE         |  17 ++++
 Rakefile       |  31 ++++++++
 7 files changed, 268 insertions(+), 35 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 NOTICE

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..900ea0cbb5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+#This file is generated by ModuleSync, do not edit.
+*.rb  eol=lf
+*.erb eol=lf
+*.pp  eol=lf
+*.sh  eol=lf
diff --git a/.gitignore b/.gitignore
index 3190277498..dd126f2fb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+#This file is generated by ModuleSync, do not edit.
 pkg/
 Gemfile.lock
 vendor/
diff --git a/.travis.yml b/.travis.yml
index e6314a4700..588fb5b002 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+#This file is generated by ModuleSync, do not edit.
 ---
 sudo: false
 language: ruby
diff --git a/Gemfile b/Gemfile
index ced190e770..e490bc9b98 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,14 @@
+#This file is generated by ModuleSync, do not edit.
+
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-def location_for(place, fake_version = nil)
+def location_for(place, version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+    [version, { :git => $1, :branch => $2, :require => false}].compact
   elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
+    ['>= 0', { :path => File.expand_path($1), :require => false}]
   else
-    [place, { :require => false }]
+    [place, version, { :require => false}].compact
   end
 end
 
@@ -20,29 +22,18 @@ group :development, :unit_tests do
   gem 'simplecov',                 :require => false
 end
 group :system_tests do
+  gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
+  gem 'beaker',                        *location_for(ENV['BEAKER_VERSION'])
+  gem 'serverspec',                    :require => false
   gem 'beaker-puppet_install_helper',  :require => false
-  if beaker_version = ENV['BEAKER_VERSION']
-    gem 'beaker', *location_for(beaker_version)
-  end
-  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
-    gem 'beaker-rspec', *location_for(beaker_rspec_version)
-  else
-    gem 'beaker-rspec',  :require => false
-  end
   gem 'master_manipulator',            :require => false
-  gem 'serverspec',                    :require => false
+  gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
 end
 
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
+gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
+gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
 
-# vim:ft=ruby
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end
diff --git a/LICENSE b/LICENSE
index 8961ce8a6d..d645695673 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,15 +1,202 @@
-Copyright (C) 2012 Puppet Labs Inc
 
-Puppet Labs can be contacted at: info@puppetlabs.com
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000000..c07b29dc8e
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,17 @@
+apache puppet module
+
+Copyright (C) 2012-2016 Puppet Labs, Inc.
+
+Puppet Labs can be contacted at: info@puppetlabs.com
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/Rakefile b/Rakefile
index 636508b00e..1e2be6663c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,3 +10,34 @@ PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.send('disable_only_variable_string')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+
+desc 'Generate pooler nodesets'
+task :gen_nodeset do
+  require 'beaker-hostgenerator'
+  require 'securerandom'
+  require 'fileutils'
+
+  agent_target = ENV['TEST_TARGET']
+  if ! agent_target
+    STDERR.puts 'TEST_TARGET environment variable is not set'
+    STDERR.puts 'setting to default value of "redhat-64default."'
+    agent_target = 'redhat-64default.'
+  end
+
+  master_target = ENV['MASTER_TEST_TARGET']
+  if ! master_target
+    STDERR.puts 'MASTER_TEST_TARGET environment variable is not set'
+    STDERR.puts 'setting to default value of "redhat7-64mdcl"'
+    master_target = 'redhat7-64mdcl'
+  end
+
+  targets = "#{master_target}-#{agent_target}"
+  cli = BeakerHostGenerator::CLI.new([targets])
+  nodeset_dir = "tmp/nodesets"
+  nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml"
+  FileUtils.mkdir_p(nodeset_dir)
+  File.open(nodeset, 'w') do |fh|
+    fh.print(cli.execute)
+  end
+  puts nodeset
+end

From e4272b38d741d7bade2d34ebbc1ec22befa43aba Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 16 Feb 2016 09:03:17 -0800
Subject: [PATCH 0837/2267] Disable passenger testing on el7 due to outdated
 packages

---
 spec/acceptance/vhost_spec.rb | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2b40af4560..47a403f00e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1106,8 +1106,6 @@ class { 'apache': service_ensure => stopped, }
     end
   end
 
-  # Passenger isn't even in EPEL on el-5 and needs a kernel update on el-6
-  if (fact('osfamily') == 'RedHat' and ! ['6','5'].include?(fact('operatingsystemmajrelease')))
     describe 'rack_base_uris' do
       before :all do
         pp = "if $::osfamily == 'RedHat' { include epel }"
@@ -1115,6 +1113,9 @@ class { 'apache': service_ensure => stopped, }
       end
 
       it 'applies cleanly' do
+        if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
+          pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
+        end
         pp = <<-EOS
           class { 'apache': }
           host { 'test.server': ip => '127.0.0.1' }
@@ -1127,8 +1128,18 @@ class { 'apache': }
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { is_expected.to be_file }
-        it { is_expected.to contain 'RackBaseURI /test' }
+        it do
+          if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
+            pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
+          end
+          is_expected.to be_file
+        end
+        it do
+          if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
+            pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
+          end
+          is_expected.to contain 'RackBaseURI /test'
+        end
       end
     end
   end

From da16e92d3d8b5167c26b82b9e75e8d86ee108d5e Mon Sep 17 00:00:00 2001
From: Daniele Sluijters <daenney@users.noreply.github.com>
Date: Tue, 16 Feb 2016 23:32:05 +0100
Subject: [PATCH 0838/2267] mod/ssl: Add option to configure SSL mutex This
 allows the end user to explicitly define or override what the `SSLMutex` or
 `Mutex` configuration for Apache will be as the platform default might not
 always be desirable.

Supersedes #1346
Closes #1346
---
 README.md                    |  5 ++++
 manifests/mod/ssl.pp         | 51 ++++++++++++++++++++----------------
 spec/classes/mod/ssl_spec.rb |  9 +++++++
 templates/mod/ssl.conf.erb   |  4 +--
 4 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index c9deb5adc6..f7997e6cea 100644
--- a/README.md
+++ b/README.md
@@ -1665,6 +1665,11 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 - `ssl_protocol`: Default: [ 'all', '-SSLv2', '-SSLv3' ].
 - `ssl_random_seed_bytes`: Valid options: A string. Default: '512'.
 - `ssl_sessioncachetimeout`: Valid options: A string. Default: '300'.
+- `ssl_mutex`: Default: Determined based on the OS. Valid options: See [mod_ssl][mod_ssl] documentation.
+  - RedHat/FreeBSD/Suse/Gentoo: 'default'
+  - Debian/Ubuntu + Apache >= 2.4: 'default'
+  - Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'
+  - Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'
 
 To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to true **or** the [`ssl`][] parameter in [`apache::vhost`][] to true.
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index dcc31ce8f3..399131314a 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -9,34 +9,39 @@
   $ssl_pass_phrase_dialog  = 'builtin',
   $ssl_random_seed_bytes   = '512',
   $ssl_sessioncachetimeout = '300',
+  $ssl_mutex               = undef,
   $apache_version          = $::apache::apache_version,
   $package_name            = undef,
 ) {
 
-  case $::osfamily {
-    'debian': {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        $ssl_mutex = 'default'
-      } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
-        $ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
-      } else {
-        $ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex"
+  if $ssl_mutex {
+    $_ssl_mutex = $ssl_mutex
+  } else {
+    case $::osfamily {
+      'debian': {
+        if versioncmp($apache_version, '2.4') >= 0 {
+          $_ssl_mutex = 'default'
+        } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
+          $_ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
+        } else {
+          $_ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex"
+        }
+      }
+      'redhat': {
+        $_ssl_mutex = 'default'
+      }
+      'freebsd': {
+        $_ssl_mutex = 'default'
+      }
+      'gentoo': {
+        $_ssl_mutex = 'default'
+      }
+      'Suse': {
+        $_ssl_mutex = 'default'
+      }
+      default: {
+        fail("Unsupported osfamily ${::osfamily}, please explicitly pass in \$ssl_mutex")
       }
-    }
-    'redhat': {
-      $ssl_mutex = 'default'
-    }
-    'freebsd': {
-      $ssl_mutex = 'default'
-    }
-    'gentoo': {
-      $ssl_mutex = 'default'
-    }
-    'Suse': {
-      $ssl_mutex = 'default'
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
     }
   }
 
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 0fd813d7e1..a738ab0a21 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -161,5 +161,14 @@
       end
       it { is_expected.to contain_file('ssl.conf').with_content(/^\s+SSLOpenSSLConfCmd DHParameters "foo.pem"$/)}
     end
+
+    context 'setting ssl_mutex' do
+      let :params do
+        {
+          :ssl_mutex => 'posixsem',
+        }
+      end
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLMutex posixsem$})}
+    end
   end
 end
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 96b80b0036..d5120500a9 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -14,9 +14,9 @@
   SSLCompression On
 <% end -%>
   <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  Mutex <%= @ssl_mutex %>
+  Mutex <%= @_ssl_mutex %>
   <%- else -%>
-  SSLMutex <%= @ssl_mutex %>
+  SSLMutex <%= @_ssl_mutex %>
   <%- end -%>
   SSLCryptoDevice <%= @ssl_cryptodevice %>
   SSLHonorCipherOrder <%= @ssl_honorcipherorder %>

From 984e0d5655bb5eccea09c6178af53d404aa12788 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 16 Feb 2016 21:12:49 -0800
Subject: [PATCH 0839/2267] Missed an end

---
 spec/acceptance/vhost_spec.rb | 53 +++++++++++++++++------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 47a403f00e..4e4ddd5e99 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1106,40 +1106,39 @@ class { 'apache': service_ensure => stopped, }
     end
   end
 
-    describe 'rack_base_uris' do
-      before :all do
-        pp = "if $::osfamily == 'RedHat' { include epel }"
-        apply_manifest(pp, :catch_failures => true)
+  describe 'rack_base_uris' do
+    before :all do
+      pp = "if $::osfamily == 'RedHat' { include epel }"
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    it 'applies cleanly' do
+      if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
+        pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
       end
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+          rack_base_uris  => ['/test'],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
 
-      it 'applies cleanly' do
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it do
         if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
           pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
         end
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot          => '/tmp',
-            rack_base_uris  => ['/test'],
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+        is_expected.to be_file
       end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it do
-          if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
-            pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
-          end
-          is_expected.to be_file
-        end
-        it do
-          if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
-            pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
-          end
-          is_expected.to contain 'RackBaseURI /test'
+      it do
+        if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
+          pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
         end
+        is_expected.to contain 'RackBaseURI /test'
       end
     end
   end

From dd3b4cf1815524b998ab3b15ccee74fc683df800 Mon Sep 17 00:00:00 2001
From: Henri Salo <henri.salo@nixu.com>
Date: Wed, 17 Feb 2016 19:38:50 +0200
Subject: [PATCH 0840/2267] Fix syntax typo in documentation.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f7997e6cea..d188f12c70 100644
--- a/README.md
+++ b/README.md
@@ -2947,7 +2947,7 @@ apache::vhost { 'sample.example.net':
     { path                       => '/',
       provider                   => 'directory',
       mellon_enable              => 'info',
-      mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key,
+      mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key',
       mellon_endpoint_path       => '/mellon',
       mellon_set_env_no_prefix   => { 'ADFS_GROUP' => 'http://schemas.xmlsoap.org/claims/Group',
                                       'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress', },

From 4da066490f45b44dd5b9c05e8e21a1d25ba07519 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 18 Feb 2016 14:25:48 -0800
Subject: [PATCH 0841/2267] Move rack test to pending block

The pending calls didn't have blocks before, so the tests continued to
run as usual. They have to be inside a pending block to work correctly
---
 spec/acceptance/vhost_spec.rb | 42 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 4e4ddd5e99..d65e397849 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1113,32 +1113,30 @@ class { 'apache': service_ensure => stopped, }
     end
 
     it 'applies cleanly' do
+      test = lambda do
+        pp = <<-EOS
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot          => '/tmp',
+            rack_base_uris  => ['/test'],
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
       if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
-        pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
+        pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos") do
+          test.call
+        end
+      else
+        test.call
       end
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          rack_base_uris  => ['/test'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it do
-        if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
-          pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
-        end
-        is_expected.to be_file
-      end
-      it do
-        if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
-          pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos")
-        end
-        is_expected.to contain 'RackBaseURI /test'
+    if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
+      describe file("#{$vhost_dir}/25-test.server.conf") do
+        it { is_expected.to be_file }
+        it { is_expected.to contain 'RackBaseURI /test' }
       end
     end
   end

From 1fef317de1b0d0d26b3ec8af4007750e02af347f Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Fri, 19 Feb 2016 14:22:59 +0000
Subject: [PATCH 0842/2267] include apache, so parsing works.

---
 manifests/mod/alias.pp               |   8 +-
 manifests/mod/auth_cas.pp            |   3 +-
 manifests/mod/auth_kerb.pp           |   1 +
 manifests/mod/auth_mellon.pp         |   3 +-
 manifests/mod/authnz_ldap.pp         |   1 +
 manifests/mod/dav_svn.pp             |   1 +
 manifests/mod/dir.pp                 |   1 +
 manifests/mod/status.pp              |   6 +-
 spec/classes/mod/alias_spec.rb       | 173 ++++++++++---------
 spec/classes/mod/auth_cas_spec.rb    |  94 +++++-----
 spec/classes/mod/auth_kerb_spec.rb   | 135 ++++++++-------
 spec/classes/mod/auth_mellon_spec.rb | 155 ++++++++---------
 spec/classes/mod/authnz_ldap_spec.rb | 126 +++++++-------
 spec/classes/mod/dav_svn_spec.rb     | 141 +++++++--------
 spec/classes/mod/deflate_spec.rb     | 181 +++++++++----------
 spec/classes/mod/dev_spec.rb         |   5 +-
 spec/classes/mod/dir_spec.rb         | 249 +++++++++++++--------------
 spec/classes/mod/status_spec.rb      | 247 +++++++++++++-------------
 spec/spec_helper.rb                  |  17 ++
 templates/mod/alias.conf.erb         |   2 +-
 templates/mod/status.conf.erb        |   2 +-
 21 files changed, 794 insertions(+), 757 deletions(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index eac21ba661..91f68b2dc2 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,11 +1,13 @@
 class apache::mod::alias(
-  $apache_version = $apache::apache_version,
+  $apache_version = undef,
   $icons_options  = 'Indexes MultiViews',
   # set icons_path to false to disable the alias
   $icons_path     = $::apache::params::alias_icons_path,
-
-) {
+) inherits ::apache::params {
+  include ::apache
+  $real_apache_version = pick($apache_version, $apache::apache_version)
   apache::mod { 'alias': }
+
   # Template uses $icons_path
   if $icons_path {
     file { 'alias.conf':
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 0d1b9111ab..2b5338d1e6 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -16,7 +16,7 @@
   $cas_cookie_http_only     = undef,
   $cas_authoritative        = undef,
   $suppress_warning         = false,
-) {
+) inherits ::apache::params {
 
   validate_string($cas_login_url, $cas_validate_url, $cas_cookie_path)
 
@@ -24,6 +24,7 @@
     warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')
   }
 
+  include ::apache
   ::apache::mod { 'auth_cas': }
 
   file { $cas_cookie_path:
diff --git a/manifests/mod/auth_kerb.pp b/manifests/mod/auth_kerb.pp
index 6b53262a1b..fe63d22d7b 100644
--- a/manifests/mod/auth_kerb.pp
+++ b/manifests/mod/auth_kerb.pp
@@ -1,4 +1,5 @@
 class apache::mod::auth_kerb {
+  include ::apache
   ::apache::mod { 'auth_kerb': }
 }
 
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index 129441bf41..5dbb6b5771 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -6,8 +6,9 @@
   $mellon_post_ttl = undef,
   $mellon_post_size = undef,
   $mellon_post_count = undef
-) {
+) inherits ::apache::params {
 
+  include ::apache
   ::apache::mod { 'auth_mellon': }
 
   # Template uses
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 70d0a63630..14a60494b0 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,6 +1,7 @@
 class apache::mod::authnz_ldap (
   $verifyServerCert = true,
 ) {
+  include ::apache
   include '::apache::mod::ldap'
   ::apache::mod { 'authnz_ldap': }
 
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 6e70598d0a..6d2912155b 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -2,6 +2,7 @@
   $authz_svn_enabled = false,
 ) {
   Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
+  include ::apache
   include ::apache::mod::dav
   ::apache::mod { 'dav_svn': }
 
diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index bce05e0a44..e41aa86ad6 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -6,6 +6,7 @@
   $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
 ) {
   validate_array($indexes)
+  include ::apache
   ::apache::mod { 'dir': }
 
   # Template uses
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index d11a464d79..364505f7b0 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -28,9 +28,11 @@
 class apache::mod::status (
   $allow_from      = ['127.0.0.1','::1'],
   $extended_status = 'On',
-  $apache_version = $::apache::apache_version,
+  $apache_version  = undef,
   $status_path     = '/server-status',
-){
+) inherits ::apache::params {
+  include ::apache
+  $real_apache_version = pick($apache_version, $apache::apache_version)
   validate_array($allow_from)
   validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
   ::apache::mod { 'status': }
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 9bb28b3aa2..99854e8182 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -1,96 +1,97 @@
 require 'spec_helper'
 
 describe 'apache::mod::alias', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
-    end
-    it { is_expected.to contain_apache__mod("alias") }
-    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"/) }
-  end
-  context "on a RedHat 6-based OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
-    end
-    it { is_expected.to contain_apache__mod("alias") }
-    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/var\/www\/icons\/"/) }
-  end
-  context "on a RedHat 7-based OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '7',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with parameters" do
+    context "on a Debian OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :lsbdistcodename        => 'squeeze',
+          :osfamily               => 'Debian',
+          :operatingsystem        => 'Debian',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_apache__mod("alias") }
+      it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"/) }
     end
-    it { is_expected.to contain_apache__mod("alias") }
-    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"/) }
-  end
-  context "with icons options", :compile do
-    let :pre_condition do
-      'class { apache: default_mods => false }'
+    context "on a RedHat 6-based OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_apache__mod("alias") }
+      it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/var\/www\/icons\/"/) }
     end
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '7',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+    context "on a RedHat 7-based OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '7',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_apache__mod("alias") }
+      it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"/) }
     end
-    let :params do
-      {
-        'icons_options' => 'foo'
-      }
+    context "with icons options", :compile do
+      let :pre_condition do
+        'class { apache: default_mods => false }'
+      end
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '7',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      let :params do
+        {
+          'icons_options' => 'foo'
+        }
+      end
+      it { is_expected.to contain_apache__mod("alias") }
+      it { is_expected.to contain_file("alias.conf").with(:content => /Options foo/) }
     end
-    it { is_expected.to contain_apache__mod("alias") }
-    it { is_expected.to contain_file("alias.conf").with(:content => /Options foo/) }
-  end
-  context "on a FreeBSD OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '10',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+    context "on a FreeBSD OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'FreeBSD',
+          :osfamily               => 'FreeBSD',
+          :operatingsystem        => 'FreeBSD',
+          :operatingsystemrelease => '10',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_apache__mod("alias") }
+      it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/local\/www\/apache24\/icons\/"/) }
     end
-    it { is_expected.to contain_apache__mod("alias") }
-    it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/local\/www\/apache24\/icons\/"/) }
   end
 end
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index 53c13c5a12..aee3f8c298 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -1,54 +1,64 @@
 require 'spec_helper'
 
 describe 'apache::mod::auth_cas', :type => :class do
-  let :params do
-    {
-      :cas_login_url    => 'https://cas.example.com/login',
-      :cas_validate_url => 'https://cas.example.com/validate',
-    }
-  end
-
-  let :pre_condition do
-    'include ::apache'
-  end
-
-  context "on a Debian OS", :compile do
-    let :facts do
+  context "default params" do
+    let :params do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        :cas_login_url    => 'https://cas.example.com/login',
+        :cas_validate_url => 'https://cas.example.com/validate',
+        :cas_cookie_path  => '/var/cache/apache2/mod_auth_cas/'
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("auth_cas") }
-    it { is_expected.to contain_package("libapache2-mod-auth-cas") }
-    it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/apache2/mods-available/auth_cas.conf') }
-    it { is_expected.to contain_file("/var/cache/apache2/mod_auth_cas/").with_owner('www-data') }
+
+    it_behaves_like "a mod class, without including apache"
   end
-  context "on a RedHat OS", :compile do
-    let :facts do
+
+  context "default configuration with parameters" do
+    let :params do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        :cas_login_url    => 'https://cas.example.com/login',
+        :cas_validate_url => 'https://cas.example.com/validate',
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("auth_cas") }
-    it { is_expected.to contain_package("mod_auth_cas") }
-    it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/httpd/conf.d/auth_cas.conf') }
-    it { is_expected.to contain_file("/var/cache/mod_auth_cas/").with_owner('apache') }
+
+    context "on a Debian OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :lsbdistcodename        => 'squeeze',
+          :osfamily               => 'Debian',
+          :operatingsystem        => 'Debian',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod("auth_cas") }
+      it { is_expected.to contain_package("libapache2-mod-auth-cas") }
+      it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/apache2/mods-available/auth_cas.conf') }
+      it { is_expected.to contain_file("/var/cache/apache2/mod_auth_cas/").with_owner('www-data') }
+    end
+    context "on a RedHat OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod("auth_cas") }
+      it { is_expected.to contain_package("mod_auth_cas") }
+      it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/httpd/conf.d/auth_cas.conf') }
+      it { is_expected.to contain_file("/var/cache/mod_auth_cas/").with_owner('apache') }
+    end
   end
 end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index beba378a9d..74b6827d0f 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -1,76 +1,77 @@
 require 'spec_helper'
 
 describe 'apache::mod::auth_kerb', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with parameters" do
+    context "on a Debian OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :lsbdistcodename        => 'squeeze',
+          :osfamily               => 'Debian',
+          :operatingsystem        => 'Debian',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod("auth_kerb") }
+      it { is_expected.to contain_package("libapache2-mod-auth-kerb") }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("auth_kerb") }
-    it { is_expected.to contain_package("libapache2-mod-auth-kerb") }
-  end
-  context "on a RedHat OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+    context "on a RedHat OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod("auth_kerb") }
+      it { is_expected.to contain_package("mod_auth_kerb") }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("auth_kerb") }
-    it { is_expected.to contain_package("mod_auth_kerb") }
-  end
-  context "on a FreeBSD OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+    context "on a FreeBSD OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'FreeBSD',
+          :osfamily               => 'FreeBSD',
+          :operatingsystem        => 'FreeBSD',
+          :operatingsystemrelease => '9',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod("auth_kerb") }
+      it { is_expected.to contain_package("www/mod_auth_kerb2") }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("auth_kerb") }
-    it { is_expected.to contain_package("www/mod_auth_kerb2") }
-  end
-  context "on a Gentoo OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+    context "on a Gentoo OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'Gentoo',
+          :operatingsystem        => 'Gentoo',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          :operatingsystemrelease => '3.16.1-gentoo',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod("auth_kerb") }
+      it { is_expected.to contain_package("www-apache/mod_auth_kerb") }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("auth_kerb") }
-    it { is_expected.to contain_package("www-apache/mod_auth_kerb") }
   end
 end
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index 4fac1c3e86..7d0826ff72 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -1,89 +1,90 @@
 require 'spec_helper'
 
 describe 'apache::mod::auth_mellon', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :fqdn                   => 'test.example.com',
-        :is_pe                  => false,
-      }
-    end
-    describe 'with no parameters' do
-      it { should contain_apache__mod('auth_mellon') }
-      it { should contain_package('libapache2-mod-auth-mellon') }
-      it { should contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
-      it { should contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") }
-    end
-    describe 'with parameters' do
-      let :params do
-        { :mellon_cache_size => '200',
-          :mellon_cache_entry_size => '2010',
-          :mellon_lock_file => '/tmp/junk',
-          :mellon_post_directory => '/tmp/post',
-          :mellon_post_ttl => '5',
-          :mellon_post_size => '8',
-          :mellon_post_count => '10'
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with parameters" do
+    context "on a Debian OS" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :lsbdistcodename        => 'squeeze',
+          :operatingsystem        => 'Debian',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :fqdn                   => 'test.example.com',
+          :is_pe                  => false,
         }
       end
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) }
-    end
+      describe 'with no parameters' do
+        it { should contain_apache__mod('auth_mellon') }
+        it { should contain_package('libapache2-mod-auth-mellon') }
+        it { should contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
+        it { should contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") }
+      end
+      describe 'with parameters' do
+        let :params do
+          { :mellon_cache_size => '200',
+            :mellon_cache_entry_size => '2010',
+            :mellon_lock_file => '/tmp/junk',
+            :mellon_post_directory => '/tmp/post',
+            :mellon_post_ttl => '5',
+            :mellon_post_size => '8',
+            :mellon_post_count => '10'
+          }
+        end
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) }
+      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',
-        :fqdn                   => 'test.example.com',
-        :is_pe                  => false,
-      }
-    end
-    describe 'with no parameters' do
-      it { should contain_apache__mod('auth_mellon') }
-      it { should contain_package('mod_auth_mellon') }
-      it { should contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') }
-      it { should contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") }
     end
-    describe 'with parameters' do
-      let :params do
-        { :mellon_cache_size => '200',
-          :mellon_cache_entry_size => '2010',
-          :mellon_lock_file => '/tmp/junk',
-          :mellon_post_directory => '/tmp/post',
-          :mellon_post_ttl => '5',
-          :mellon_post_size => '8',
-          :mellon_post_count => '10'
+    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',
+          :fqdn                   => 'test.example.com',
+          :is_pe                  => false,
         }
       end
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) }
-      it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) }
+      describe 'with no parameters' do
+        it { should contain_apache__mod('auth_mellon') }
+        it { should contain_package('mod_auth_mellon') }
+        it { should contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') }
+        it { should contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") }
+      end
+      describe 'with parameters' do
+        let :params do
+          { :mellon_cache_size => '200',
+            :mellon_cache_entry_size => '2010',
+            :mellon_lock_file => '/tmp/junk',
+            :mellon_post_directory => '/tmp/post',
+            :mellon_post_ttl => '5',
+            :mellon_post_size => '8',
+            :mellon_post_count => '10'
+          }
+        end
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) }
+        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) }
+      end
     end
   end
 end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index f897833996..d433bc5337 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -1,78 +1,76 @@
 require 'spec_helper'
 
 describe 'apache::mod::authnz_ldap', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :operatingsystem        => 'Debian',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-      }
-    end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class("apache::mod::ldap") }
-    it { is_expected.to contain_apache__mod('authnz_ldap') }
+  it_behaves_like "a mod class, without including apache"
 
-    context 'default verifyServerCert' do
-      it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
-    end
+  context "default configuration with parameters" do
+    context "on a Debian OS" do
+      let :facts do
+        {
+          :lsbdistcodename        => 'squeeze',
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'Debian',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::mod::ldap") }
+      it { is_expected.to contain_apache__mod('authnz_ldap') }
 
-    context 'verifyServerCert = false' do
-      let(:params) { { :verifyServerCert => false } }
-      it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
-    end
+      context 'default verifyServerCert' do
+        it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
+      end
 
-    context 'verifyServerCert = wrong' do
-      let(:params) { { :verifyServerCert => 'wrong' } }
-      it 'should raise an error' do
-        expect { is_expected.to raise_error Puppet::Error }
+      context 'verifyServerCert = false' do
+        let(:params) { { :verifyServerCert => false } }
+        it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
       end
-    end
-  end #Debian
 
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :operatingsystem        => 'RedHat',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-      }
-    end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class("apache::mod::ldap") }
-    it { is_expected.to contain_apache__mod('authnz_ldap') }
+      context 'verifyServerCert = wrong' do
+        let(:params) { { :verifyServerCert => 'wrong' } }
+        it 'should raise an error' do
+          expect { is_expected.to raise_error Puppet::Error }
+        end
+      end
+    end #Debian
 
-    context 'default verifyServerCert' do
-      it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
-    end
+    context "on a RedHat OS" do
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'RedHat',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class("apache::mod::ldap") }
+      it { is_expected.to contain_apache__mod('authnz_ldap') }
 
-    context 'verifyServerCert = false' do
-      let(:params) { { :verifyServerCert => false } }
-      it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
-    end
+      context 'default verifyServerCert' do
+        it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
+      end
 
-    context 'verifyServerCert = wrong' do
-      let(:params) { { :verifyServerCert => 'wrong' } }
-      it 'should raise an error' do
-        expect { is_expected.to raise_error Puppet::Error }
+      context 'verifyServerCert = false' do
+        let(:params) { { :verifyServerCert => false } }
+        it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
       end
-    end
-  end # Redhat
 
+      context 'verifyServerCert = wrong' do
+        let(:params) { { :verifyServerCert => 'wrong' } }
+        it 'should raise an error' do
+          expect { is_expected.to raise_error Puppet::Error }
+        end
+      end
+    end # Redhat
+  end
 end
-
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 06c6b870f2..1f60e730b1 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -1,79 +1,80 @@
 require 'spec_helper'
 
 describe 'apache::mod::dav_svn', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename           => 'squeeze',
-        :osfamily                  => 'Debian',
-        :operatingsystemrelease    => '6',
-        :operatingsystemmajrelease => '6',
-        :concat_basedir            => '/dne',
-        :operatingsystem           => 'Debian',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-      }
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with parameters" do
+    context "on a Debian OS" do
+      let :facts do
+        {
+          :lsbdistcodename           => 'squeeze',
+          :osfamily                  => 'Debian',
+          :operatingsystemrelease    => '6',
+          :operatingsystemmajrelease => '6',
+          :concat_basedir            => '/dne',
+          :operatingsystem           => 'Debian',
+          :id                        => 'root',
+          :kernel                    => 'Linux',
+          :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('dav_svn') }
+      it { is_expected.to contain_package("libapache2-svn") }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('dav_svn') }
-    it { is_expected.to contain_package("libapache2-svn") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily                  => 'RedHat',
-        :operatingsystemrelease    => '6',
-        :operatingsystemmajrelease => '6',
-        :concat_basedir            => '/dne',
-        :operatingsystem           => 'RedHat',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-      }
+    context "on a RedHat OS" do
+      let :facts do
+        {
+          :osfamily                  => 'RedHat',
+          :operatingsystemrelease    => '6',
+          :operatingsystemmajrelease => '6',
+          :concat_basedir            => '/dne',
+          :operatingsystem           => 'RedHat',
+          :id                        => 'root',
+          :kernel                    => 'Linux',
+          :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('dav_svn') }
+      it { is_expected.to contain_package("mod_dav_svn") }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('dav_svn') }
-    it { is_expected.to contain_package("mod_dav_svn") }
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily                  => 'FreeBSD',
-        :operatingsystemrelease    => '9',
-        :operatingsystemmajrelease => '9',
-        :concat_basedir            => '/dne',
-        :operatingsystem           => 'FreeBSD',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-      }
+    context "on a FreeBSD OS" do
+      let :facts do
+        {
+          :osfamily                  => 'FreeBSD',
+          :operatingsystemrelease    => '9',
+          :operatingsystemmajrelease => '9',
+          :concat_basedir            => '/dne',
+          :operatingsystem           => 'FreeBSD',
+          :id                        => 'root',
+          :kernel                    => 'Linux',
+          :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('dav_svn') }
+      it { is_expected.to contain_package("devel/subversion") }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('dav_svn') }
-    it { is_expected.to contain_package("devel/subversion") }
-  end
-  context "on a Gentoo OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :kernel                 => 'Linux',
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
-      }
+    context "on a Gentoo OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :operatingsystemrelease => '3.16.1-gentoo',
+          :concat_basedir         => '/dne',
+          :kernel                 => 'Linux',
+          :osfamily               => 'Gentoo',
+          :operatingsystem        => 'Gentoo',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('dav_svn') }
+      it { is_expected.to contain_package("dev-vcs/subversion") }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('dav_svn') }
-    it { is_expected.to contain_package("dev-vcs/subversion") }
   end
 end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index d0d8fedc21..264c70f362 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -16,111 +16,112 @@ def general_deflate_specs
 end
 
 describe 'apache::mod::deflate', :type => :class do
-  let :pre_condition do
-    'class { "apache":
-      default_mods => false,
-    }
-    class { "apache::mod::deflate":
-      types => [ "text/html", "text/css" ],
-      notes => {
-        "Input" => "instream",
-        "Ratio" => "ratio",
-      }
-    }
-    '
-  end
+  it_behaves_like "a mod class, without including apache"
 
-  context "On a Debian OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :lsbdistcodename        => 'squeeze',
-        :kernel                 => 'Linux',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+  context "default configuration with parameters" do
+    let :pre_condition do
+      'class { "apache::mod::deflate":
+        types => [ "text/html", "text/css" ],
+        notes => {
+          "Input" => "instream",
+          "Ratio" => "ratio",
+        }
       }
+      '
     end
 
-    # Load the more generic tests for this context
-    general_deflate_specs()
-
-    it { is_expected.to contain_file("deflate.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/deflate.conf',
-    } ) }
-    it { is_expected.to contain_file("deflate.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/deflate.conf',
-    } ) }
-  end
+    context "On a Debian OS with default params" do
+      let :facts do
+        {
+          :id                     => 'root',
+          :lsbdistcodename        => 'squeeze',
+          :kernel                 => 'Linux',
+          :osfamily               => 'Debian',
+          :operatingsystem        => 'Debian',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
 
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+      # Load the more generic tests for this context
+      general_deflate_specs()
+
+      it { is_expected.to contain_file("deflate.conf").with({
+        :ensure => 'file',
+        :path   => '/etc/apache2/mods-available/deflate.conf',
+      } ) }
+      it { is_expected.to contain_file("deflate.conf symlink").with({
+        :ensure => 'link',
+        :path   => '/etc/apache2/mods-enabled/deflate.conf',
+      } ) }
     end
 
-    # Load the more generic tests for this context
-    general_deflate_specs()
+    context "on a RedHat OS with default params" do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
 
-    it { is_expected.to contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") }
-  end
+      # Load the more generic tests for this context
+      general_deflate_specs()
 
-  context "On a FreeBSD OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+      it { is_expected.to contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") }
     end
 
-    # Load the more generic tests for this context
-    general_deflate_specs()
+    context "On a FreeBSD OS with default params" do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'FreeBSD',
+          :osfamily               => 'FreeBSD',
+          :operatingsystem        => 'FreeBSD',
+          :operatingsystemrelease => '9',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
 
-    it { is_expected.to contain_file("deflate.conf").with({
-      :ensure => 'file',
-      :path   => '/usr/local/etc/apache24/Modules/deflate.conf',
-    } ) }
-  end
+      # Load the more generic tests for this context
+      general_deflate_specs()
 
-  context "On a Gentoo OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+      it { is_expected.to contain_file("deflate.conf").with({
+        :ensure => 'file',
+        :path   => '/usr/local/etc/apache24/Modules/deflate.conf',
+      } ) }
     end
 
-    # Load the more generic tests for this context
-    general_deflate_specs()
+    context "On a Gentoo OS with default params" do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'Gentoo',
+          :operatingsystem        => 'Gentoo',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          :operatingsystemrelease => '3.16.1-gentoo',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
 
-    it { is_expected.to contain_file("deflate.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/modules.d/deflate.conf',
-    } ) }
+      # Load the more generic tests for this context
+      general_deflate_specs()
+
+      it { is_expected.to contain_file("deflate.conf").with({
+        :ensure => 'file',
+        :path   => '/etc/apache2/modules.d/deflate.conf',
+      } ) }
+    end
   end
 end
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 1686a02755..29589f99f2 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -1,9 +1,8 @@
 require 'spec_helper'
 
 describe 'apache::mod::dev', :type => :class do
-  let(:pre_condition) {[
-    'include apache'
-  ]}
+  it_behaves_like "a mod class, without including apache"
+
   [
     ['RedHat',  '6', 'Santiago', 'Linux'],
     ['Debian',  '6', 'squeeze', 'Linux'],
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 11622a41cb..9aad0d3ff5 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -1,138 +1,137 @@
 require 'spec_helper'
 
 describe 'apache::mod::dir', :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',
-        :is_pe                  => false,
-      }
-    end
-    context "passing no parameters" do
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod('dir') }
-      it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with parameters" do
+    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',
+          :is_pe                  => false,
+        }
       end
-      it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-    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',
-        :is_pe                  => false,
-      }
-    end
-    context "passing no parameters" do
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod('dir') }
-      it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
+      context "passing no parameters" do
+        it { is_expected.to contain_class("apache::params") }
+        it { is_expected.to contain_apache__mod('dir') }
+        it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
       end
-      it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-    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',
-        :is_pe                  => false,
-      }
-    end
-    context "passing no parameters" do
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod('dir') }
-      it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
+      context "passing indexes => ['example.txt','fearsome.aspx']" do
+        let :params do
+          {:indexes => ['example.txt','fearsome.aspx']}
+        end
+        it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
       end
-      it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
     end
-  end
-  context "on a Gentoo OS" do
-    let :facts do
-      {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
-      }
+    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',
+          :is_pe                  => false,
+        }
+      end
+      context "passing no parameters" do
+        it { is_expected.to contain_class("apache::params") }
+        it { is_expected.to contain_apache__mod('dir') }
+        it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+      end
+      context "passing indexes => ['example.txt','fearsome.aspx']" do
+        let :params do
+          {:indexes => ['example.txt','fearsome.aspx']}
+        end
+        it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+      end
     end
-    context "passing no parameters" do
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod('dir') }
-      it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+    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',
+          :is_pe                  => false,
+        }
+      end
+      context "passing no parameters" do
+        it { is_expected.to contain_class("apache::params") }
+        it { is_expected.to contain_apache__mod('dir') }
+        it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+      end
+      context "passing indexes => ['example.txt','fearsome.aspx']" do
+        let :params do
+          {:indexes => ['example.txt','fearsome.aspx']}
+        end
+        it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+      end
     end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
+    context "on a Gentoo OS" do
+      let :facts do
+        {
+          :osfamily               => 'Gentoo',
+          :operatingsystem        => 'Gentoo',
+          :operatingsystemrelease => '3.16.1-gentoo',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          :is_pe                  => false,
+        }
+      end
+      context "passing no parameters" do
+        it { is_expected.to contain_class("apache::params") }
+        it { is_expected.to contain_apache__mod('dir') }
+        it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+      end
+      context "passing indexes => ['example.txt','fearsome.aspx']" do
+        let :params do
+          {:indexes => ['example.txt','fearsome.aspx']}
+        end
+        it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
+        it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
       end
-      it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
     end
   end
 end
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index e3b3d24428..7bc7831fba 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -21,139 +21,89 @@ def status_conf_spec(allow_from, extended_status, status_path)
 end
 
 describe 'apache::mod::status', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "on a Debian OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-      }
-    end
-
-    it { is_expected.to contain_apache__mod("status") }
+  it_behaves_like "a mod class, without including apache"
+  
+  context "default configuration with parameters" do
+    context "on a Debian OS with default params" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :lsbdistcodename        => 'squeeze',
+          :operatingsystem        => 'Debian',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
 
-    status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status")
+      it { is_expected.to contain_apache__mod("status") }
 
-    it { is_expected.to contain_file("status.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/status.conf',
-    } ) }
+      status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status")
 
-    it { is_expected.to contain_file("status.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/status.conf',
-    } ) }
+      it { is_expected.to contain_file("status.conf").with({
+        :ensure => 'file',
+        :path   => '/etc/apache2/mods-available/status.conf',
+      } ) }
 
-  end
+      it { is_expected.to contain_file("status.conf symlink").with({
+        :ensure => 'link',
+        :path   => '/etc/apache2/mods-enabled/status.conf',
+      } ) }
 
-  context "on a RedHat OS with default params" 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',
-        :is_pe                  => false,
-      }
     end
 
-    it { is_expected.to contain_apache__mod("status") }
+    context "on a RedHat OS with default params" 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',
+          :is_pe                  => false,
+        }
+      end
 
-    status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status")
+      it { is_expected.to contain_apache__mod("status") }
 
-    it { is_expected.to contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
+      status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status")
 
-  end
+      it { is_expected.to contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
 
-  context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-      }
-    end
-    let :params do
-      {
-        :allow_from => ['10.10.10.10','11.11.11.11'],
-        :extended_status => 'Off',
-        :status_path => '/custom-status',
-      }
     end
 
-    status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off", "/custom-status")
-
-  end
+    context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :lsbdistcodename        => 'squeeze',
+          :operatingsystem        => 'Debian',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :params do
+        {
+          :allow_from => ['10.10.10.10','11.11.11.11'],
+          :extended_status => 'Off',
+          :status_path => '/custom-status',
+        }
+      end
 
-  context "with valid parameter type $allow_from => ['10.10.10.10']" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-      }
-    end
-    let :params do
-      { :allow_from => ['10.10.10.10'] }
-    end
-    it 'should expect to succeed array validation' do
-      expect {
-        is_expected.to contain_file("status.conf")
-      }.not_to raise_error()
-    end
-  end
+      status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off", "/custom-status")
 
-  context "with invalid parameter type $allow_from => '10.10.10.10'" 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',
-        :is_pe                  => false,
-      }
-    end
-    let :params do
-      { :allow_from => '10.10.10.10' }
     end
-    it 'should expect to fail array validation' do
-      expect {
-        is_expected.to contain_file("status.conf")
-      }.to raise_error(Puppet::Error)
-    end
-  end
 
-  # Only On or Off are valid options
-  ['On', 'Off'].each do |valid_param|
-    context "with valid value $extended_status => '#{valid_param}'" do
+    context "with valid parameter type $allow_from => ['10.10.10.10']" do
       let :facts do
         {
           :osfamily               => 'Debian',
@@ -168,18 +118,16 @@ def status_conf_spec(allow_from, extended_status, status_path)
         }
       end
       let :params do
-        { :extended_status => valid_param }
+        { :allow_from => ['10.10.10.10'] }
       end
-      it 'should expect to succeed regular expression validation' do
+      it 'should expect to succeed array validation' do
         expect {
           is_expected.to contain_file("status.conf")
         }.not_to raise_error()
       end
     end
-  end
 
-  ['Yes', 'No'].each do |invalid_param|
-    context "with invalid value $extended_status => '#{invalid_param}'" do
+    context "with invalid parameter type $allow_from => '10.10.10.10'" do
       let :facts do
         {
           :osfamily               => 'Debian',
@@ -193,14 +141,65 @@ def status_conf_spec(allow_from, extended_status, status_path)
         }
       end
       let :params do
-        { :extended_status => invalid_param }
+        { :allow_from => '10.10.10.10' }
       end
-      it 'should expect to fail regular expression validation' do
+      it 'should expect to fail array validation' do
         expect {
           is_expected.to contain_file("status.conf")
         }.to raise_error(Puppet::Error)
       end
     end
-  end
 
+    # Only On or Off are valid options
+    ['On', 'Off'].each do |valid_param|
+      context "with valid value $extended_status => '#{valid_param}'" do
+        let :facts do
+          {
+            :osfamily               => 'Debian',
+            :operatingsystemrelease => '6',
+            :concat_basedir         => '/dne',
+            :lsbdistcodename        => 'squeeze',
+            :operatingsystem        => 'Debian',
+            :id                     => 'root',
+            :kernel                 => 'Linux',
+            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            :is_pe                  => false,
+          }
+        end
+        let :params do
+          { :extended_status => valid_param }
+        end
+        it 'should expect to succeed regular expression validation' do
+          expect {
+            is_expected.to contain_file("status.conf")
+          }.not_to raise_error()
+        end
+      end
+    end
+
+    ['Yes', 'No'].each do |invalid_param|
+      context "with invalid value $extended_status => '#{invalid_param}'" 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',
+            :is_pe                  => false,
+          }
+        end
+        let :params do
+          { :extended_status => invalid_param }
+        end
+        it 'should expect to fail regular expression validation' do
+          expect {
+            is_expected.to contain_file("status.conf")
+          }.to raise_error(Puppet::Error)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 475b72c07b..c48f49b1bf 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -21,3 +21,20 @@
 shared_examples :compile, :compile => true do
   it { should compile.with_all_deps }
 end
+
+shared_examples 'a mod class, without including apache' do
+   let :facts do
+    {
+      :id                     => 'root',
+      :lsbdistcodename        => 'squeeze',
+      :kernel                 => 'Linux',
+      :osfamily               => 'Debian',
+      :operatingsystem        => 'Debian',
+      :operatingsystemrelease => '6',
+      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      :concat_basedir         => '/dne',
+      :is_pe                  => false,
+    }
+  end
+  it { should compile.with_all_deps }
+end
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
index 2056476e82..799b2e666b 100644
--- a/templates/mod/alias.conf.erb
+++ b/templates/mod/alias.conf.erb
@@ -3,7 +3,7 @@ Alias /icons/ "<%= @icons_path %>/"
 <Directory "<%= @icons_path %>">
     Options <%= @icons_options %>
     AllowOverride None
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+<%- if scope.function_versioncmp([@real_apache_version, '2.4']) >= 0 -%>
     Require all granted
 <%- else -%>
      Order allow,deny
diff --git a/templates/mod/status.conf.erb b/templates/mod/status.conf.erb
index f02ed156ff..895bf0c665 100644
--- a/templates/mod/status.conf.erb
+++ b/templates/mod/status.conf.erb
@@ -1,6 +1,6 @@
 <Location <%= @status_path %>>
     SetHandler server-status
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    <%- if scope.function_versioncmp([@real_apache_version, '2.4']) >= 0 -%>
     Require ip <%= Array(@allow_from).join(" ") %>
     <%- else -%>
     Order deny,allow

From 328cb96780d40142c74261137b508daa8aefe98d Mon Sep 17 00:00:00 2001
From: Jason Hancock <jason.b.hancock@jpl.nasa.gov>
Date: Fri, 19 Feb 2016 14:27:34 -0800
Subject: [PATCH 0843/2267] Ensure module packages are installed before
 evaluating conf.d dir

The problem I'm running into on EL7 is that when the ssl module is
enabled, the mod_ssl package gets installed and drops
`/etc/httpd/conf.d/ssl.conf`. We want to remove that file, but the purge
for `/etc/httpd/conf.d` is being evaluated before the mod_ssl package is
being installed. On the second client run the `ssl.conf` file will be
removed.

This change ensures that the `mod_ssl` package gets installed prior to
the purge on `/etc/httpd/conf.d` being evaluated so that the ssl.conf
file gets removed on the first client run.
---
 manifests/mod.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 33b4de1ab3..014aa274ae 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -64,7 +64,10 @@
         File[$_loadfile_name],
         File["${::apache::conf_dir}/${::apache::params::conf_file}"]
       ],
-      default => File[$_loadfile_name],
+      default => [
+        File[$_loadfile_name],
+        File[$::apache::confd_dir],
+      ],
     }
     # if there are any packages, they should be installed before the associated conf file
     Package[$_package] -> File<| title == "${mod}.conf" |>

From 15950ea9d3e3edbbed1533958a7d00205a95bcc8 Mon Sep 17 00:00:00 2001
From: kaihowl <kai@hoewelmeyer.eu>
Date: Tue, 23 Feb 2016 08:21:45 +0100
Subject: [PATCH 0844/2267] [MODULES-1628] Fix mod rewrite typo in examples

There is no HTTPS_HOST variable in mod_rewrite
---
 examples/vhost.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/vhost.pp b/examples/vhost.pp
index 0cf8da75c4..79ac994019 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -151,7 +151,7 @@
     {
       comment      => 'redirect non-SSL traffic to SSL site',
       rewrite_cond => ['%{HTTPS} off'],
-      rewrite_rule => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}'],
+      rewrite_rule => ['(.*) https://%{HTTP_HOST}%{REQUEST_URI}'],
     }
   ]
 }
@@ -183,7 +183,7 @@
   port         => '80',
   docroot      => '/var/www/sixteenth',
   rewrite_cond => '%{HTTPS} off',
-  rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
+  rewrite_rule => '(.*) https://%{HTTP_HOST}%{REQUEST_URI}',
 }
 apache::vhost { 'sixteenth.example.com ssl old rewrite':
   servername => 'sixteenth.example.com',

From 779e040e71e15377f8531118096850668717b309 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Wed, 24 Feb 2016 16:27:22 +0000
Subject: [PATCH 0845/2267] only run the passenger tests on non redhat

---
 spec/acceptance/vhost_spec.rb | 40 +++++++++++------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index d65e397849..5a978c4356 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1107,38 +1107,22 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'rack_base_uris' do
-    before :all do
-      pp = "if $::osfamily == 'RedHat' { include epel }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'applies cleanly' do
-      test = lambda do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot          => '/tmp',
-            rack_base_uris  => ['/test'],
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-      if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
-        pending("Passenger isn't even in EPEL on el-5, needs a kernel update on el-6, and needs selinux-policy >= 3.13.1-60 on el7 which is not available in official repos") do
-          test.call
+    if (fact('osfamily') != 'RedHat')
+      it 'applies cleanly' do
+        test = lambda do
+          pp = <<-EOS
+            class { 'apache': }
+            host { 'test.server': ip => '127.0.0.1' }
+            apache::vhost { 'test.server':
+              docroot          => '/tmp',
+              rack_base_uris  => ['/test'],
+            }
+          EOS
+          apply_manifest(pp, :catch_failures => true)
         end
-      else
         test.call
       end
     end
-
-    if (fact('osfamily') == 'RedHat' and ! ['7','6','5'].include?(fact('operatingsystemmajrelease')))
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { is_expected.to be_file }
-        it { is_expected.to contain 'RackBaseURI /test' }
-      end
-    end
   end
 
   describe 'no_proxy_uris' do

From 20440e515f1bacb3780bf386c46a8c85ab3205b2 Mon Sep 17 00:00:00 2001
From: Chris Reeves <chris.reeves@york.ac.uk>
Date: Wed, 24 Feb 2016 18:48:02 +0000
Subject: [PATCH 0846/2267] Fix typo in README for shib_request_settings vhost
 param

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d188f12c70..dd89b37b58 100644
--- a/README.md
+++ b/README.md
@@ -3133,7 +3133,7 @@ apache::vhost { 'secure.example.net':
 
 > **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the virtual host's directories.
 
-###### `shib_request_setting`
+###### `shib_request_settings`
 
 Allows a valid content setting to be set or altered for the application request. This command takes two parameters: the name of the content setting, and the value to set it to. Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 

From 8150ee15e1f6dcde500a5d092914596ecabc25b4 Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Thu, 25 Feb 2016 10:36:26 +0100
Subject: [PATCH 0847/2267] better readable template

---
 templates/fastcgi/server.erb | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/templates/fastcgi/server.erb b/templates/fastcgi/server.erb
index 61169413d1..7a3837b1b3 100644
--- a/templates/fastcgi/server.erb
+++ b/templates/fastcgi/server.erb
@@ -1,4 +1,17 @@
-FastCGIExternalServer <%= @faux_path %> -idle-timeout <%= @timeout %> <%= if @flush then '-flush' end %> -host <%= @host -%>
-<%- if @pass_header -%> -pass-header <%= @pass_header %><% end %>
+<%
+  timeout = " -idle-timeout #{@timeout}"
+  flush = ""
+  if @flush
+    flush = " -flush"
+  end
+  host = " -host #{@host}"
+  pass_header = ""
+  if @pass_header and ! @pass_header.empty?
+    pass_header = " -pass-header #{@pass_header}"
+  end
+
+  options = timeout + flush + host + pass_header
+-%>
+FastCGIExternalServer <%= @faux_path %><%= options %>
 Alias <%= @fcgi_alias %> <%= @faux_path %>
 Action <%= @file_type %> <%= @fcgi_alias %>

From 7450d813465e51d3e467322ef2a48fe2d471b54d Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppetlabs.com>
Date: Wed, 24 Feb 2016 14:58:15 +0000
Subject: [PATCH 0848/2267] include apache, so parsing works

---
 manifests/mod/alias.pp                 |  4 ++--
 manifests/mod/expires.pp               |  1 +
 manifests/mod/ext_filter.pp            |  2 +-
 manifests/mod/fastcgi.pp               |  1 +
 manifests/mod/fcgid.pp                 |  1 +
 manifests/mod/info.pp                  |  8 ++++----
 manifests/mod/ldap.pp                  |  6 ++++--
 manifests/mod/mime.pp                  |  8 +++++---
 manifests/mod/mime_magic.pp            |  4 +++-
 manifests/mod/negotiation.pp           |  1 +
 manifests/mod/pagespeed.pp             |  8 +++++---
 manifests/mod/passenger.pp             |  4 ++--
 manifests/mod/perl.pp                  |  1 +
 manifests/mod/proxy.pp                 |  6 ++++--
 manifests/mod/proxy_connect.pp         |  6 ++++--
 manifests/mod/proxy_html.pp            |  1 +
 manifests/mod/python.pp                |  1 +
 manifests/mod/remoteip.pp              |  6 ++++--
 manifests/mod/reqtimeout.pp            |  1 +
 manifests/mod/rpaf.pp                  |  1 +
 manifests/mod/security.pp              |  3 ++-
 manifests/mod/shib.pp                  |  4 ++--
 manifests/mod/speling.pp               |  1 +
 manifests/mod/ssl.pp                   | 12 ++++++------
 manifests/mod/status.pp                |  4 ++--
 manifests/mod/suphp.pp                 |  1 +
 manifests/mod/wsgi.pp                  |  4 ++--
 spec/classes/mod/expires_spec.rb       |  5 ++---
 spec/classes/mod/ext_filter_spec.rb    |  6 +-----
 spec/classes/mod/fastcgi_spec.rb       |  4 +---
 spec/classes/mod/fcgid_spec.rb         |  4 +---
 spec/classes/mod/info_spec.rb          |  4 +---
 spec/classes/mod/ldap_spec.rb          |  4 +---
 spec/classes/mod/mime_magic_spec.rb    |  4 +---
 spec/classes/mod/mime_spec.rb          |  4 +---
 spec/classes/mod/negotiation_spec.rb   | 11 +----------
 spec/classes/mod/pagespeed_spec.rb     |  3 ---
 spec/classes/mod/passenger_spec.rb     |  4 +---
 spec/classes/mod/perl_spec.rb          |  4 +---
 spec/classes/mod/proxy_connect_spec.rb |  2 +-
 spec/classes/mod/proxy_html_spec.rb    |  2 +-
 spec/classes/mod/python_spec.rb        |  5 ++---
 spec/classes/mod/remoteip_spec.rb      |  5 -----
 spec/classes/mod/reqtimeout_spec.rb    |  6 +-----
 spec/classes/mod/rpaf_spec.rb          |  6 +-----
 spec/classes/mod/security_spec.rb      |  5 +----
 spec/classes/mod/shib_spec.rb          |  4 +---
 spec/classes/mod/speling_spec.rb       |  4 +---
 spec/classes/mod/ssl_spec.rb           |  4 +---
 spec/classes/mod/suphp_spec.rb         |  4 +---
 spec/classes/mod/wsgi_spec.rb          |  4 +---
 templates/mod/alias.conf.erb           |  2 +-
 templates/mod/info.conf.erb            |  2 +-
 templates/mod/ldap.conf.erb            |  2 +-
 templates/mod/mime.conf.erb            |  2 +-
 templates/mod/mime_magic.conf.erb      |  2 +-
 templates/mod/pagespeed.conf.erb       |  6 +++---
 templates/mod/proxy.conf.erb           |  2 +-
 templates/mod/ssl.conf.erb             |  2 +-
 templates/mod/status.conf.erb          |  2 +-
 60 files changed, 98 insertions(+), 132 deletions(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 91f68b2dc2..4eb42ac974 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -5,10 +5,10 @@
   $icons_path     = $::apache::params::alias_icons_path,
 ) inherits ::apache::params {
   include ::apache
-  $real_apache_version = pick($apache_version, $apache::apache_version)
+  $_apache_version = pick($apache_version, $apache::apache_version)
   apache::mod { 'alias': }
 
-  # Template uses $icons_path
+  # Template uses $icons_path, $_apache_version
   if $icons_path {
     file { 'alias.conf':
       ensure  => file,
diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index 1531fc54d9..07ec82e276 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -3,6 +3,7 @@
   $expires_default = undef,
   $expires_by_type = undef,
 ) {
+  include ::apache
   ::apache::mod { 'expires': }
 
   # Template uses
diff --git a/manifests/mod/ext_filter.pp b/manifests/mod/ext_filter.pp
index 244c2b1da1..aa14c10259 100644
--- a/manifests/mod/ext_filter.pp
+++ b/manifests/mod/ext_filter.pp
@@ -1,7 +1,7 @@
 class apache::mod::ext_filter(
   $ext_filter_define = undef
 ) {
-
+  include ::apache
   if $ext_filter_define {
     validate_hash($ext_filter_define)
   }
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index c4da5b1e63..543a322336 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -1,4 +1,5 @@
 class apache::mod::fastcgi {
+  include ::apache
 
   # Debian specifies it's fastcgi lib path, but RedHat uses the default value
   # with no config file
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 69e3112d4f..0e99a9b799 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,6 +1,7 @@
 class apache::mod::fcgid(
   $options = {},
 ) {
+  include ::apache
   if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7') or $::osfamily == 'FreeBSD' {
     $loadfile_name = 'unixd_fcgid.load'
     $conf_name = 'unixd_fcgid.conf'
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index bed35af3a1..2c477c748f 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -1,12 +1,12 @@
 class apache::mod::info (
   $allow_from      = ['127.0.0.1','::1'],
-  $apache_version  = $::apache::apache_version,
+  $apache_version  = undef,
   $restrict_access = true,
 ){
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
   apache::mod { 'info': }
-  # Template uses
-  # $allow_from
-  # $apache_version
+  # Template uses $allow_from, $_apache_version
   file { 'info.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/info.conf",
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index fe9f6b80a7..d842668361 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -1,5 +1,5 @@
 class apache::mod::ldap (
-  $apache_version                = $::apache::apache_version,
+  $apache_version                = undef,
   $ldap_trusted_global_cert_file = undef,
   $ldap_trusted_global_cert_type = 'CA_BASE64',
   $ldap_shared_cache_size        = undef,
@@ -8,11 +8,13 @@
   $ldap_opcache_entries          = undef,
   $ldap_opcache_ttl              = undef,
 ){
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
   if ($ldap_trusted_global_cert_file) {
     validate_string($ldap_trusted_global_cert_type)
   }
   ::apache::mod { 'ldap': }
-  # Template uses $apache_version
+  # Template uses $_apache_version
   file { 'ldap.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/ldap.conf",
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index 0665eb639c..f686930932 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -1,10 +1,12 @@
 class apache::mod::mime (
   $mime_support_package = $::apache::params::mime_support_package,
   $mime_types_config    = $::apache::params::mime_types_config,
-  $mime_types_additional = $::apache::mime_types_additional,
-) {
+  $mime_types_additional = undef,
+) inherits ::apache::params {
+  include ::apache
+  $_mime_types_additional = pick($mime_types_additional, $apache::mime_types_additional)
   apache::mod { 'mime': }
-  # Template uses $mime_types_config
+  # Template uses $_mime_types_config
   file { 'mime.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/mime.conf",
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index 722b0df402..ecc74cfddc 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -1,6 +1,8 @@
 class apache::mod::mime_magic (
-  $magic_file = "${::apache::conf_dir}/magic"
+  $magic_file = undef,
 ) {
+  include ::apache
+  $_magic_file = pick($magic_file, "${::apache::conf_dir}/magic")
   apache::mod { 'mime_magic': }
   # Template uses $magic_file
   file { 'mime_magic.conf':
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index b9aec3673f..c7c34b81fe 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -5,6 +5,7 @@
                         'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
                         'zh-TW' ],
 ) {
+  include ::apache
   if !is_array($force_language_priority) and !is_string($force_language_priority) {
     fail('force_languague_priority must be a string or array of strings')
   }
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index e787d88ef5..a6506007bb 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -32,10 +32,11 @@
   $allow_pagespeed_message       = [],
   $message_buffer_size           = 100000,
   $additional_configuration      = {},
-  $apache_version                = $::apache::apache_version,
+  $apache_version                = undef,
 ){
-
-  $_lib = $::apache::apache_version ? {
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
+  $_lib = $_apache_version ? {
     '2.4'   => 'mod_pagespeed_ap24.so',
     default => undef
   }
@@ -44,6 +45,7 @@
     lib => $_lib,
   }
 
+  # Template uses $_apache_version
   file { 'pagespeed.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/pagespeed.conf",
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 7ed7563eb4..e97577d98f 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -24,8 +24,8 @@
   $mod_lib_path                     = undef,
   $mod_id                           = undef,
   $mod_path                         = undef,
-) {
-
+) inherits ::apache::params {
+  include ::apache
   if $passenger_spawn_method {
     validate_re($passenger_spawn_method, '(^smart$|^direct$|^smart-lv2$|^conservative$)', "${passenger_spawn_method} is not permitted for passenger_spawn_method. Allowed values are 'smart', 'direct', 'smart-lv2', or 'conservative'.")
   }
diff --git a/manifests/mod/perl.pp b/manifests/mod/perl.pp
index b57f25fd5f..3bfeac9770 100644
--- a/manifests/mod/perl.pp
+++ b/manifests/mod/perl.pp
@@ -1,3 +1,4 @@
 class apache::mod::perl {
+  include ::apache
   ::apache::mod { 'perl': }
 }
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 73b054ab36..1f70938921 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -1,10 +1,12 @@
 class apache::mod::proxy (
   $proxy_requests = 'Off',
   $allow_from = undef,
-  $apache_version = $::apache::apache_version,
+  $apache_version = undef,
 ) {
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'proxy': }
-  # Template uses $proxy_requests, $apache_version
+  # Template uses $proxy_requests, $_apache_version
   file { 'proxy.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/proxy.conf",
diff --git a/manifests/mod/proxy_connect.pp b/manifests/mod/proxy_connect.pp
index 7adef1f899..cda5b89dc6 100644
--- a/manifests/mod/proxy_connect.pp
+++ b/manifests/mod/proxy_connect.pp
@@ -1,7 +1,9 @@
 class apache::mod::proxy_connect (
-  $apache_version  = $::apache::apache_version,
+  $apache_version  = undef,
 ) {
-  if versioncmp($apache_version, '2.2') >= 0 {
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
+  if versioncmp($_apache_version, '2.2') >= 0 {
     Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_connect']
     ::apache::mod { 'proxy_connect': }
   }
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 24f332334a..cceaf0b755 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -1,4 +1,5 @@
 class apache::mod::proxy_html {
+  include ::apache
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
   Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
 
diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp
index e326c8d757..75af350114 100644
--- a/manifests/mod/python.pp
+++ b/manifests/mod/python.pp
@@ -1,4 +1,5 @@
 class apache::mod::python {
+  include ::apache
   ::apache::mod { 'python': }
 }
 
diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index abceb08c7d..92010cf960 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -3,9 +3,11 @@
   $proxy_ips         = [ '127.0.0.1' ],
   $proxies_header    = undef,
   $trusted_proxy_ips = undef,
-  $apache_version    = $::apache::apache_version
+  $apache_version    = undef,
 ) {
-  if versioncmp($apache_version, '2.4') < 0 {
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
+  if versioncmp($_apache_version, '2.4') < 0 {
     fail('mod_remoteip is only available in Apache 2.4')
   }
 
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index 34c96a6784..f166f6d6f6 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -1,6 +1,7 @@
 class apache::mod::reqtimeout (
   $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
 ){
+  include ::apache
   ::apache::mod { 'reqtimeout': }
   # Template uses no variables
   file { 'reqtimeout.conf':
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index f21c43ebda..cb65483605 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -3,6 +3,7 @@
   $proxy_ips   = [ '127.0.0.1' ],
   $header      = 'X-Forwarded-For'
 ) {
+  include ::apache
   ::apache::mod { 'rpaf': }
 
   # Template uses:
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 95018a6809..10145d7f3b 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -9,7 +9,8 @@
   $content_types         = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
   $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
   $restricted_headers    = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
-){
+) inherits ::apache::params {
+  include ::apache
 
   if $::osfamily == 'FreeBSD' {
     fail('FreeBSD is not currently supported')
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 8ec4c6dd11..4b00889260 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -1,7 +1,7 @@
 class apache::mod::shib (
   $suppress_warning = false,
 ) {
-
+  include ::apache
   if $::osfamily == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_shib in their default package repositories.')
   }
@@ -12,4 +12,4 @@
     id => 'mod_shib',
   }
 
-}
\ No newline at end of file
+}
diff --git a/manifests/mod/speling.pp b/manifests/mod/speling.pp
index eb46d78f04..fbd19d373c 100644
--- a/manifests/mod/speling.pp
+++ b/manifests/mod/speling.pp
@@ -1,3 +1,4 @@
 class apache::mod::speling {
+  include ::apache
   ::apache::mod { 'speling': }
 }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 399131314a..c0dd1f61bf 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -10,16 +10,17 @@
   $ssl_random_seed_bytes   = '512',
   $ssl_sessioncachetimeout = '300',
   $ssl_mutex               = undef,
-  $apache_version          = $::apache::apache_version,
+  $apache_version          = undef,
   $package_name            = undef,
 ) {
-
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
   if $ssl_mutex {
     $_ssl_mutex = $ssl_mutex
   } else {
     case $::osfamily {
       'debian': {
-        if versioncmp($apache_version, '2.4') >= 0 {
+        if versioncmp($_apache_version, '2.4') >= 0 {
           $_ssl_mutex = 'default'
         } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
           $_ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
@@ -57,7 +58,7 @@
     package => $package_name,
   }
 
-  if versioncmp($apache_version, '2.4') >= 0 {
+  if versioncmp($_apache_version, '2.4') >= 0 {
     ::apache::mod { 'socache_shmcb': }
   }
 
@@ -73,8 +74,7 @@
   # $ssl_mutex
   # $ssl_random_seed_bytes
   # $ssl_sessioncachetimeout
-  # $apache_version
-  #
+  # $_apache_version
   file { 'ssl.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/ssl.conf",
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 364505f7b0..d30a690de8 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -32,11 +32,11 @@
   $status_path     = '/server-status',
 ) inherits ::apache::params {
   include ::apache
-  $real_apache_version = pick($apache_version, $apache::apache_version)
+  $_apache_version = pick($apache_version, $apache::apache_version)
   validate_array($allow_from)
   validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
   ::apache::mod { 'status': }
-  # Template uses $allow_from, $extended_status, $apache_version, $status_path
+  # Template uses $allow_from, $extended_status, $_apache_version, $status_path
   file { 'status.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/status.conf",
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index 5d426d7948..955bba302c 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -1,5 +1,6 @@
 class apache::mod::suphp (
 ){
+  include ::apache
   ::apache::mod { 'suphp': }
 
   file {'suphp.conf':
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index d1b8214753..e726bcfaa4 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -4,8 +4,8 @@
   $wsgi_python_home   = undef,
   $package_name       = undef,
   $mod_path           = undef,
-){
-
+) inherits ::apache::params {
+  include ::apache
   if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) {
     fail('apache::mod::wsgi - both package_name and mod_path must be specified!')
   }
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index e6eab7c48d..397fee0243 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -1,9 +1,8 @@
 require 'spec_helper'
 
 describe 'apache::mod::expires', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
+
   context "with expires active", :compile do
     let :facts do
       {
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index ed61db9f20..a0cf37cec5 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -1,11 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::ext_filter', :type => :class do
-  let :pre_condition do
-    'class { "apache":
-      default_mods => false,
-    }'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index e204bb7460..778d27cffb 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::fastcgi', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index b86cc0e6b3..f08596be6b 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::fcgid', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
 
   context "on a Debian OS" do
     let :facts do
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 8ecbcdd2a3..766a9e4fdb 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -121,9 +121,7 @@ def general_info_specs_24
 end
 
 describe 'apache::mod::info', :type => :class do
-  let :pre_condition do
-    "class { 'apache': default_mods => false, }"
-  end
+  it_behaves_like "a mod class, without including apache"
 
   context 'On a Debian OS' do
     let :facts do
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index f51cafd4f7..73c51adf28 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::ldap', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
 
   context "on a Debian OS" do
     let :facts do
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index f846ce386b..cf8f898aa5 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -6,9 +6,7 @@ def general_mime_magic_specs
 end
 
 describe 'apache::mod::mime_magic', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
 
   context "On a Debian OS with default params" do
     let :facts do
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 3c7ad88d18..b0675a3c0a 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -6,9 +6,7 @@ def general_mime_specs
 end
 
 describe 'apache::mod::mime', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
 
   context "On a Debian OS with default params", :compile do
     let :facts do
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 813e76def0..9dadb7651e 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe 'apache::mod::negotiation', :type => :class do
+  it_behaves_like "a mod class, without including apache"
   describe "OS independent tests" do
-
     let :facts do
       {
         :osfamily               => 'Debian',
@@ -18,9 +18,6 @@
     end
 
     context "default params" do
-      let :pre_condition do
-        'class {"::apache": }'
-      end
       it { should contain_class("apache") }
       it do
         should contain_file('negotiation.conf').with( {
@@ -33,9 +30,6 @@
     end
 
     context 'with force_language_priority parameter' do
-      let :pre_condition do
-        'class {"::apache": default_mods => ["negotiation"]}'
-      end
       let :params do
         { :force_language_priority => 'Prefer' }
       end
@@ -48,9 +42,6 @@
     end
 
     context 'with language_priority parameter' do
-      let :pre_condition do
-        'class {"::apache": default_mods => ["negotiation"]}'
-      end
       let :params do
         { :language_priority => [ 'en', 'es' ] }
       end
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index 44c60053e0..2cbc3d170e 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -1,9 +1,6 @@
 require 'spec_helper'
 
 describe 'apache::mod::pagespeed', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index d7e9ce9ed0..70ce4ea60d 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::passenger', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 17ee1b366b..f5b61fe0ce 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::perl', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index dbb314c2bf..33059c07b2 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -3,10 +3,10 @@
 describe 'apache::mod::proxy_connect', :type => :class do
   let :pre_condition do
     [
-      'include apache',
       'include apache::mod::proxy',
     ]
   end
+  it_behaves_like "a mod class, without including apache"
   context 'on a Debian OS' do
     let :facts do
       {
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 80106931e0..ffdaa243ed 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -3,11 +3,11 @@
 describe 'apache::mod::proxy_html', :type => :class do
   let :pre_condition do
     [
-      'include apache',
       'include apache::mod::proxy',
       'include apache::mod::proxy_http',
     ]
   end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     shared_examples "debian" do |loadfiles|
       it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 46c4cde3a2..1393293a97 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -1,9 +1,8 @@
 require 'spec_helper'
 
 describe 'apache::mod::python', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
+
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index c9f5b4e831..d75ea56031 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe 'apache::mod::remoteip', :type => :class do
-  let :pre_condition do
-    [
-      'include apache',
-    ]
-  end
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index 1869eb68dc..c3a09777cc 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -1,11 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::reqtimeout', :type => :class do
-  let :pre_condition do
-    'class { "apache":
-      default_mods => false,
-    }'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 6b2ddd92f3..ef41fcd350 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -1,11 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::rpaf', :type => :class do
-  let :pre_condition do
-    [
-      'include apache',
-    ]
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index ba0bb2f711..2b6d16ecb7 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -1,10 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::security', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
+  it_behaves_like "a mod class, without including apache"
   context "on RedHat based systems" do
     let :facts do
       {
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index 11193b2766..a651c280a2 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::shib', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index b07af25897..b4844ec748 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::speling', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index a738ab0a21..f76377e859 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::ssl', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
   context 'on an unsupported OS' do
     let :facts do
       {
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index 9b20000f30..71dbab30e4 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::suphp', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 5fe313acf4..1d54c54081 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::wsgi', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
+  it_behaves_like "a mod class, without including apache"
   context "on a Debian OS" do
     let :facts do
       {
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
index 799b2e666b..8580f707c1 100644
--- a/templates/mod/alias.conf.erb
+++ b/templates/mod/alias.conf.erb
@@ -3,7 +3,7 @@ Alias /icons/ "<%= @icons_path %>/"
 <Directory "<%= @icons_path %>">
     Options <%= @icons_options %>
     AllowOverride None
-<%- if scope.function_versioncmp([@real_apache_version, '2.4']) >= 0 -%>
+<%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require all granted
 <%- else -%>
      Order allow,deny
diff --git a/templates/mod/info.conf.erb b/templates/mod/info.conf.erb
index 1a025b7a6e..dd79ecea8d 100644
--- a/templates/mod/info.conf.erb
+++ b/templates/mod/info.conf.erb
@@ -1,7 +1,7 @@
 <Location /server-info>
     SetHandler server-info
 <%- if @restrict_access -%>
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip <%= Array(@allow_from).join(" ") %>
   <%- else -%>
     Order deny,allow
diff --git a/templates/mod/ldap.conf.erb b/templates/mod/ldap.conf.erb
index 424fbe8ee7..5ac0c1c546 100644
--- a/templates/mod/ldap.conf.erb
+++ b/templates/mod/ldap.conf.erb
@@ -1,6 +1,6 @@
 <Location /ldap-status>
     SetHandler ldap-status
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1
     <%- else -%>
     Order deny,allow
diff --git a/templates/mod/mime.conf.erb b/templates/mod/mime.conf.erb
index 8101cf031f..46d021c217 100644
--- a/templates/mod/mime.conf.erb
+++ b/templates/mod/mime.conf.erb
@@ -31,7 +31,7 @@ AddLanguage sv .sv
 AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
 
-<%- @mime_types_additional.sort.each do |add_mime, config| -%>
+<%- @_mime_types_additional.sort.each do |add_mime, config| -%>
         <%- config.each do |type, extension| %>
 <%= add_mime %> <%= type %> <%= extension%>
         <%- end -%>
diff --git a/templates/mod/mime_magic.conf.erb b/templates/mod/mime_magic.conf.erb
index 1ce1bc3c16..cbc173debc 100644
--- a/templates/mod/mime_magic.conf.erb
+++ b/templates/mod/mime_magic.conf.erb
@@ -1 +1 @@
-MIMEMagicFile "<%= @magic_file %>"
+MIMEMagicFile "<%= @_magic_file %>"
diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
index 051cf5bedb..d1ce642976 100644
--- a/templates/mod/pagespeed.conf.erb
+++ b/templates/mod/pagespeed.conf.erb
@@ -61,7 +61,7 @@ ModPagespeedStatistics <%= @collect_statistics %>
     # statistics.  This might be appropriate in an experimental setup or
     # if the Apache server is protected by a reverse proxy that will
     # filter URLs in some fashion.
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
     <%- else -%>
     Order allow,deny
@@ -72,7 +72,7 @@ ModPagespeedStatistics <%= @collect_statistics %>
 
 ModPagespeedStatisticsLogging <%= @statistics_logging %>
 <Location /pagespeed_console>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
     <%- else -%>
     Order allow,deny
@@ -84,7 +84,7 @@ ModPagespeedStatisticsLogging <%= @statistics_logging %>
 ModPagespeedMessageBufferSize <%= @message_buffer_size %>
 
 <Location /mod_pagespeed_message>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
     <%- else -%>
     Order allow,deny
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index 5ea829eeb3..06fe547140 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -10,7 +10,7 @@
 
   <% if @proxy_requests != 'Off' or ( @allow_from and ! @allow_from.empty? ) -%>
   <Proxy *>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip <%= Array(@allow_from).join(" ") %>
     <%- else -%>
     Order deny,allow
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index d5120500a9..4ae29e40a0 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -13,7 +13,7 @@
 <% if @ssl_compression -%>
   SSLCompression On
 <% end -%>
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   Mutex <%= @_ssl_mutex %>
   <%- else -%>
   SSLMutex <%= @_ssl_mutex %>
diff --git a/templates/mod/status.conf.erb b/templates/mod/status.conf.erb
index 895bf0c665..6a6b3daa2d 100644
--- a/templates/mod/status.conf.erb
+++ b/templates/mod/status.conf.erb
@@ -1,6 +1,6 @@
 <Location <%= @status_path %>>
     SetHandler server-status
-    <%- if scope.function_versioncmp([@real_apache_version, '2.4']) >= 0 -%>
+    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip <%= Array(@allow_from).join(" ") %>
     <%- else -%>
     Order deny,allow

From b07c049d8d09e0b49d3c122f0761987d405c7804 Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Fri, 26 Feb 2016 10:31:35 +0100
Subject: [PATCH 0849/2267] add documentation

---
 README.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6b8562bddb..5cb0cd3ee9 100644
--- a/README.md
+++ b/README.md
@@ -3326,12 +3326,13 @@ Ex:
 
 ``` puppet
 apache::fastcgi::server { 'php':
-  host       => '127.0.0.1:9000',
-  timeout    => 15,
-  flush      => false,
-  faux_path  => '/var/www/php.fcgi',
-  fcgi_alias => '/php.fcgi',
-  file_type  => 'application/x-httpd-php'
+  host        => '127.0.0.1:9000',
+  timeout     => 15,
+  flush       => false,
+  faux_path   => '/var/www/php.fcgi',
+  fcgi_alias  => '/php.fcgi',
+  file_type   => 'application/x-httpd-php',
+  pass_header => ''
 }
 ```
 
@@ -3369,6 +3370,10 @@ A unique alias. This is used internally to link the action with the FastCGI serv
 
 The MIME-type of the file to be processed by the FastCGI server.
 
+##### `pass_header`
+
+The name of an HTTP Request Header to be passed in the request environment. This option makes available the contents of headers which are normally not available (e.g. Authorization) to a CGI environment.
+
 #### Defined type: `apache::vhost::custom`
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specifc to the virtual host directory in Apache.

From d3d1929a297d754d9beb83b073666afc0e1972c6 Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Fri, 12 Feb 2016 11:20:45 +0100
Subject: [PATCH 0850/2267] added test

---
 spec/defines/fastcgi_server_spec.rb | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index fdcf2dbca3..89016f03a3 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -108,7 +108,7 @@
         :is_pe                  => false,
       }
     end
-    describe ".conf content" do
+    describe ".conf content using TCP communication" do
       let :params do
         {
           :host       => '127.0.0.1:9001',
@@ -130,5 +130,28 @@
         should contain_file("fastcgi-pool-www.conf").with_content(expected)
       end
     end
+    describe ".conf content using socket communication" do
+      let :params do
+        {
+          :host       => :undef,
+          :socket     => '/var/run/fcgi.sock',
+          :timeout    => 30,
+          :flush      => true,
+          :faux_path  => '/var/www/php-www.fcgi',
+          :fcgi_alias => '/php-www.fcgi',
+          :file_type  => 'application/x-httpd-php'
+        }
+      end
+      let :expected do
+        'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -socket /var/run/fcgi.sock
+Alias /php-www.fcgi /var/www/php-www.fcgi
+Action application/x-httpd-php /php-www.fcgi
+'
+      end
+      it do
+        should contain_file("fastcgi-pool-www.conf").with_content(expected)
+      end
+    end
+
   end
 end

From 42a591a8d158909079fb6d9f9ce0821e3b96d50a Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Fri, 12 Feb 2016 11:29:04 +0100
Subject: [PATCH 0851/2267] support socket communication

a socket path can now be passed to apache::fastcgi::server::host to support socket communication
---
 README.md                           | 8 ++++++++
 manifests/fastcgi/server.pp         | 4 ++++
 spec/defines/fastcgi_server_spec.rb | 5 ++---
 templates/fastcgi/server.erb        | 9 +++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5b88e2958d..915ff06f19 100644
--- a/README.md
+++ b/README.md
@@ -3355,6 +3355,14 @@ apache::vhost { 'www':
 
 The hostname or IP address and TCP port number (1-65535) of the FastCGI server.
 
+It is also possible to pass a unix socket:
+
+``` puppet
+apache::fastcgi::server { 'php':
+  host        => '/var/run/fcgi.sock',
+}
+```
+
 ##### `timeout`
 
 The number of seconds of FastCGI application inactivity allowed before the request is aborted and the event is logged (at the error LogLevel). The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond (by writing and flushing) within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index 8805484066..3493194917 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -11,6 +11,10 @@
 
   Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server[$title]
 
+  if is_absolute_path($host) {
+    $socket = $host
+  }
+
   file { "fastcgi-pool-${name}.conf":
     ensure  => present,
     path    => "${::apache::confd_dir}/fastcgi-pool-${name}.conf",
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 89016f03a3..e415461cca 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -133,8 +133,7 @@
     describe ".conf content using socket communication" do
       let :params do
         {
-          :host       => :undef,
-          :socket     => '/var/run/fcgi.sock',
+          :host       => '/var/run/fcgi.sock',
           :timeout    => 30,
           :flush      => true,
           :faux_path  => '/var/www/php-www.fcgi',
@@ -143,7 +142,7 @@
         }
       end
       let :expected do
-        'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -socket /var/run/fcgi.sock
+'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -socket /var/run/fcgi.sock
 Alias /php-www.fcgi /var/www/php-www.fcgi
 Action application/x-httpd-php /php-www.fcgi
 '
diff --git a/templates/fastcgi/server.erb b/templates/fastcgi/server.erb
index 7a3837b1b3..bae56d48ef 100644
--- a/templates/fastcgi/server.erb
+++ b/templates/fastcgi/server.erb
@@ -4,13 +4,18 @@
   if @flush
     flush = " -flush"
   end
-  host = " -host #{@host}"
+  if @socket
+    host_or_socket = " -socket #{@socket}"
+  else
+    host_or_socket = " -host #{@host}"
+  end
+
   pass_header = ""
   if @pass_header and ! @pass_header.empty?
     pass_header = " -pass-header #{@pass_header}"
   end
 
-  options = timeout + flush + host + pass_header
+  options = timeout + flush + host_or_socket + pass_header
 -%>
 FastCGIExternalServer <%= @faux_path %><%= options %>
 Alias <%= @fcgi_alias %> <%= @faux_path %>

From 811e63c9a7ca76d7d13924a5654dece9e7224a68 Mon Sep 17 00:00:00 2001
From: Garrett Honeycutt <code@garretthoneycutt.com>
Date: Wed, 2 Mar 2016 13:25:13 +0100
Subject: [PATCH 0852/2267] Remove SSLv3 from the example as we do not want to
 encourage its usage.

---
 examples/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/vhost.pp b/examples/vhost.pp
index 79ac994019..486570f815 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -239,7 +239,7 @@
         ssl_cert             => '/etc/ssl/securedomain.cert',
         ssl_key              => '/etc/ssl/securedomain.key',
         ssl_chain            => '/etc/ssl/securedomain.crt',
-        ssl_protocol         => '-ALL +SSLv3 +TLSv1',
+        ssl_protocol         => '-ALL +TLSv1',
         ssl_cipher           => 'ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM',
         ssl_honorcipherorder => 'On',
         add_listen           => false,

From bef16174075faa1a39d372cc3284f0feb5de6342 Mon Sep 17 00:00:00 2001
From: Garrett Honeycutt <code@garretthoneycutt.com>
Date: Wed, 2 Mar 2016 13:25:56 +0100
Subject: [PATCH 0853/2267] Remove insecure SSLv3 from mod_nss

---
 templates/mod/nss.conf.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/mod/nss.conf.erb b/templates/mod/nss.conf.erb
index b6ea504877..36f83d865b 100644
--- a/templates/mod/nss.conf.erb
+++ b/templates/mod/nss.conf.erb
@@ -121,9 +121,9 @@ NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa
 #   with the maximum specified protocol and downgrading as necessary to the
 #   minimum specified protocol that can be used between two processes.
 #   Since all protocol ranges are completely inclusive, and no protocol in the
-#   middle of a range may be excluded, the entry "NSSProtocol SSLv3,TLSv1.1"
-#   is identical to the entry "NSSProtocol SSLv3,TLSv1.0,TLSv1.1".
-NSSProtocol SSLv3,TLSv1.0,TLSv1.1
+#   middle of a range may be excluded, the entry "NSSProtocol TLSv1.0,TLSv1.2"
+#   is identical to the entry "NSSProtocol TLSv1.0,TLSv1.1,TLSv1.2".
+NSSProtocol TLSv1.0,TLSv1.1
 
 #   SSL Certificate Nickname:
 #   The nickname of the RSA server certificate you are going to use.

From e6a1775ce2019998ea34bd36f4e27a9d790d41d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Mo=CC=88ding?= <stm@kill-9.net>
Date: Wed, 2 Mar 2016 18:07:16 +0100
Subject: [PATCH 0854/2267] Add JkMount/JkUnmount directives to vhost

'mod_jk' is one of the possibilities to use Apache as a frontend to
Tomcat. The module understands 'JkMount' and 'JkUnMount' directives to
configure whether an URL should be handled by Apache or by Tomcat. This
patch enhances 'apache::vhost' to allow configuration of these two
directives for a virtual host.
---
 README.md                      | 17 +++++++++++++++++
 manifests/vhost.pp             | 11 +++++++++++
 spec/defines/vhost_spec.rb     |  8 ++++++++
 templates/vhost/_jk_mounts.erb | 12 ++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 templates/vhost/_jk_mounts.erb

diff --git a/README.md b/README.md
index 915ff06f19..029d47b544 100644
--- a/README.md
+++ b/README.md
@@ -2149,6 +2149,23 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+##### `jk_mounts`
+
+Sets up a virtual host with 'JkMount' and 'JkUnMount' directives to handle the paths for URL mapping between Tomcat and Apache. Default: undef.
+
+The parameter must be an array of hashes where each hash must contain the 'worker' and either the 'mount' or 'unmount' keys.
+
+Usage typically looks like:
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  jk_mounts => [
+    { mount   => '/*',     worker => 'tcnode1', },
+    { unmount => '/*.jpg', worker => 'tcnode1', },
+  ],
+}
+```
+
 ##### `auth_kerb`
 
 Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid options: Boolean. Default: false.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e909788dfe..b6b47fd560 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -129,6 +129,7 @@
   $modsec_disable_ids          = undef,
   $modsec_disable_ips          = undef,
   $modsec_body_limit           = undef,
+  $jk_mounts                   = undef,
   $auth_kerb                   = false,
   $krb_method_negotiate        = 'on',
   $krb_method_k5passwd         = 'on',
@@ -994,6 +995,16 @@
     }
   }
 
+  # Template uses:
+  # - $jk_mounts
+  if $jk_mounts and ! empty($jk_mounts) {
+    concat::fragment { "${name}-jk_mounts":
+      target  => "${priority_real}${filename}.conf",
+      order   => 340,
+      content => template('apache/vhost/_jk_mounts.erb'),
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8bcd3cfd59..5ae37bc519 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -338,6 +338,10 @@
           'passenger_start_timeout'     => '600',
           'passenger_pre_start'         => 'http://localhost/myapp',
           'add_default_charset'         => 'UTF-8',
+          'jk_mounts'                   => [
+            { 'mount'   => '/*',     'worker' => 'tcnode1', },
+            { 'unmount' => '/*.jpg', 'worker' => 'tcnode1', },
+          ],
           'auth_kerb'                   => true,
           'krb_method_negotiate'        => 'off',
           'krb_method_k5passwd'         => 'off',
@@ -484,6 +488,10 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
+        :content => /^\s+JkMount\s+\/\*\s+tcnode1$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
+        :content => /^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
         :content => /^\s+KrbMethodNegotiate\soff$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
diff --git a/templates/vhost/_jk_mounts.erb b/templates/vhost/_jk_mounts.erb
new file mode 100644
index 0000000000..8cb1d116bb
--- /dev/null
+++ b/templates/vhost/_jk_mounts.erb
@@ -0,0 +1,12 @@
+<% if @jk_mounts and not @jk_mounts.empty? -%>
+
+  <%- @jk_mounts.each do |jk| -%>
+    <%- if jk.is_a?(Hash) -%>
+      <%- if jk.has_key?('mount') and jk.has_key?('worker') -%>
+  JkMount   <%= jk['mount'] %> <%= jk['worker'] %>
+      <%- elsif jk.has_key?('unmount') and jk.has_key?('worker') -%>
+  JkUnMount <%= jk['unmount'] %> <%= jk['worker'] %>
+      <%- end -%>
+    <%- end -%>
+  <%- end -%>
+<% end -%>

From 7022328bcad17476dd315b198882f4896fc0f6cc Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Thu, 3 Mar 2016 13:03:33 +0100
Subject: [PATCH 0855/2267] (doc) Fix a typo: specifc -> specific

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 915ff06f19..5f1e77f89b 100644
--- a/README.md
+++ b/README.md
@@ -3389,7 +3389,7 @@ The name of an HTTP Request Header to be passed in the request environment. This
 
 #### Defined type: `apache::vhost::custom`
 
-The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specifc to the virtual host directory in Apache.
+The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
 
 **Parameters within `apache::vhost::custom`**:
 

From b2bc76f63045bdb4ad8df91a835873fbb1eec025 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Thu, 3 Mar 2016 22:18:06 +0100
Subject: [PATCH 0856/2267] apache::balancer: Add a target parameter to write
 to a custom path

Thit commits implements a target parameter to the apache::balancer
definition to specify a different configuration path if needed (e.g with
a different suffix or in a different location).
---
 manifests/balancer.pp               | 20 ++++++++---
 manifests/balancermember.pp         |  2 +-
 spec/defines/balancer_spec.rb       | 33 ++++++++++++++++++
 spec/defines/balancermember_spec.rb | 52 ++++++++++++++++++++---------
 4 files changed, 86 insertions(+), 21 deletions(-)
 create mode 100644 spec/defines/balancer_spec.rb

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 9b7511a032..a3534ded8c 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -23,6 +23,10 @@
 # Hash, default empty. If given, each key-value pair will be used as a ProxySet
 # line in the configuration.
 #
+# [*target*]
+# String, default undef. If given, path to the file the balancer definition will
+# be written.
+#
 # [*collect_exported*]
 # Boolean, default 'true'. True means 'collect exported @@balancermember
 # resources' (for the case when every balancermember node exports itself),
@@ -41,21 +45,27 @@
 define apache::balancer (
   $proxy_set = {},
   $collect_exported = true,
+  $target = undef,
 ) {
   include ::apache::mod::proxy_balancer
 
-  $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
+  if $target {
+    $_target = $target
+  } else {
+    $_target = "${::apache::params::confd_dir}/balancer_${name}.conf"
+  }
 
-  concat { $target:
+  concat { "apache_balancer_${name}":
     owner  => '0',
     group  => '0',
+    path   => $_target,
     mode   => $::apache::file_mode,
     notify => Class['Apache::Service'],
   }
 
   concat::fragment { "00-${name}-header":
     ensure  => present,
-    target  => $target,
+    target  => "apache_balancer_${name}",
     order   => '01',
     content => "<Proxy balancer://${name}>\n",
   }
@@ -68,14 +78,14 @@
 
   concat::fragment { "01-${name}-proxyset":
     ensure  => present,
-    target  => $target,
+    target  => "apache_balancer_${name}",
     order   => '19',
     content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"),
   }
 
   concat::fragment { "01-${name}-footer":
     ensure  => present,
-    target  => $target,
+    target  => "apache_balancer_${name}",
     order   => '20',
     content => "</Proxy>\n",
   }
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 459081a716..78723043bc 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -47,7 +47,7 @@
 
   concat::fragment { "BalancerMember ${name}":
     ensure  => present,
-    target  => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
+    target  => "apache_balancer_${balancer_cluster}",
     content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
   }
 }
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
new file mode 100644
index 0000000000..4a1477b13d
--- /dev/null
+++ b/spec/defines/balancer_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'apache::balancer', :type => :define do
+  let :pre_condition do
+    'include apache'
+  end
+  let :facts do
+    {
+      :osfamily               => 'Debian',
+      :operatingsystem        => 'Debian',
+      :operatingsystemrelease => '6',
+      :lsbdistcodename        => 'squeeze',
+      :id                     => 'root',
+      :concat_basedir         => '/dne',
+      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      :kernel                 => 'Linux',
+      :is_pe                  => false,
+    }
+  end
+  describe "accept a target parameter and use it" do
+    let :title do
+      'myapp'
+    end
+    let :params do
+      {
+        :target => '/tmp/myapp.conf'
+      }
+    end
+    it { should contain_concat('apache_balancer_myapp').with({
+      :path => "/tmp/myapp.conf",
+    })}
+  end
+end
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 0322d308eb..d99f99686e 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -2,21 +2,7 @@
 
 describe 'apache::balancermember', :type => :define do
   let :pre_condition do
-    'include apache
-    apache::balancer {"balancer":}
-    apache::balancer {"balancer-external":}
-    apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancer-external"}
-    '
-  end
-  let :title do
-    'http://127.0.0.1:8080/'
-  end
-  let :params do
-    {
-      :options          => [],
-      :url              => 'http://127.0.0.1:8080/',
-      :balancer_cluster => 'balancer-internal'
-    }
+    'include apache'
   end
   let :facts do
     {
@@ -32,6 +18,42 @@
     }
   end
   describe "allows multiple balancermembers with the same url" do
+    let :pre_condition do
+      'apache::balancer {"balancer":}
+      apache::balancer {"balancer-external":}
+      apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancer-external"}
+      '
+    end
+    let :title do
+      'http://127.0.0.1:8080/'
+    end
+    let :params do
+      {
+        :options          => [],
+        :url              => 'http://127.0.0.1:8080/',
+        :balancer_cluster => 'balancer-internal'
+      }
+    end
     it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/') }
   end
+  describe "allows balancermember with a different target" do
+    let :pre_condition do
+      'apache::balancer {"balancername": target => "/etc/apache/balancer.conf"}
+      apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancername"}
+      '
+    end
+    let :title do
+      'http://127.0.0.1:8080/'
+    end
+    let :params do
+      {
+        :options          => [],
+        :url              => 'http://127.0.0.1:8080/',
+        :balancer_cluster => 'balancername'
+      }
+    end
+    it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/').with({
+      :target => "apache_balancer_balancername",
+    })}
+  end
 end

From 68362b54108e907ef674be3e3c23c17650ea877b Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Fri, 4 Mar 2016 10:33:37 -0800
Subject: [PATCH 0857/2267] Manage mod dir before things that depend on mods

On Ubuntu Trusty, the default mpm module is "event". In
puppetlabs-apache, the default mpm module is "worker". These can't both
be loaded at once. The apache puppet module takes care of this by
purging the mods-enabled directory. However, if we try to run a syntax
check before the directory is purged, it fails. The
apache::custom_config defined type contains an "syntax verification for
${name}" exec that can potentially run before the event mod is unloaded.

This patch ensures that the module purging occurs before syntax check
happens so that the puppet run is successful.
---
 manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 41a879c5ec..e8f6e6f9ba 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -189,6 +189,7 @@
       purge   => $purge_mod_dir,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
+      before  => Anchor['::apache::modules_set_up'],
     }
   }
 

From d26c4bbb6f12f90039a370dc1270d90029ff25a7 Mon Sep 17 00:00:00 2001
From: jokajak <jokajak@gmail.com>
Date: Sat, 5 Mar 2016 12:12:59 -0500
Subject: [PATCH 0858/2267] Add mellon_sp_metadata_file parameter for directory
 entries

This allows specifying the mellon_sp_metadata_file parameter
---
 README.md                        | 1 +
 templates/vhost/_directories.erb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 5f1e77f89b..026fb67e05 100644
--- a/README.md
+++ b/README.md
@@ -2968,6 +2968,7 @@ Related parameters follow the names of `mod_auth_mellon` directives:
 
 - `mellon_cond`: Takes an array of mellon conditions that must be met to grant access, and creates a [MellonCond][`mod_auth_mellon`] directive for each item in the array.
 - `mellon_endpoint_path`: Sets the [MellonEndpointPath][`mod_auth_mellon`] to set the mellon endpoint path.
+- `mellon_sp_metadata_file`: Sets the [MellonSPMetadataFile][`mod_auth_mellon`] location of the SP metadata file.
 - `mellon_idp_metadata_file`: Sets the [MellonIDPMetadataFile][`mod_auth_mellon`] location of the IDP metadata file.
 - `mellon_saml_rsponse_dump`: Sets the [MellonSamlResponseDump][`mod_auth_mellon`] directive to enable debug of SAML.
 - `mellon_set_env_no_prefix`: Sets the [MellonSetEnvNoPrefix][`mod_auth_mellon`] directive to a hash of attribute names to map
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 49a9bd9011..9beb89865f 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -270,6 +270,9 @@
       <%- end -%>
       <%- if directory['mellon_sp_cert_file'] -%>
     MellonSPCertFile "<%= directory['mellon_sp_cert_file'] %>"
+      <%- end -%>
+      <%- if directory['mellon_sp_metadata_file'] -%>
+    MellonSPMetadataFile "<%= directory['mellon_sp_metadata_file'] %>"
       <%- end -%>
       <%- if directory['mellon_idp_metadata_file'] -%>
     MellonIDPMetadataFile "<%= directory['mellon_idp_metadata_file'] %>"

From d1e9d46cc26f68d5ac941e8478cee383f00fcef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20S=C3=A9hier?= <simon.sehier@camptocamp.com>
Date: Mon, 7 Mar 2016 14:41:41 +0100
Subject: [PATCH 0859/2267] add support for SSLProxyProtocol directive

---
 manifests/vhost.pp            | 2 ++
 templates/vhost/_sslproxy.erb | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e909788dfe..561364bead 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -29,6 +29,7 @@
   $ssl_proxy_check_peer_cn     = undef,
   $ssl_proxy_check_peer_name   = undef,
   $ssl_proxy_machine_cert      = undef,
+  $ssl_proxy_protocol          = undef,
   $ssl_options                 = undef,
   $ssl_openssl_conf_cmd        = undef,
   $ssl_proxyengine             = false,
@@ -838,6 +839,7 @@
   # - $ssl_proxy_check_peer_cn
   # - $ssl_proxy_check_peer_name
   # - $ssl_proxy_machine_cert
+  # - $ssl_proxy_protocol
   if $ssl_proxyengine {
     concat::fragment { "${name}-sslproxy":
       target  => "${priority_real}${filename}.conf",
diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
index 568d9d1d0d..393126e439 100644
--- a/templates/vhost/_sslproxy.erb
+++ b/templates/vhost/_sslproxy.erb
@@ -14,4 +14,7 @@
   <%- if @ssl_proxy_machine_cert -%>
   SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
   <%- end -%>
+  <%- if @ssl_proxy_protocol -%>
+  SSLProxyProtocol  "<%= @ssl_proxy_protocol %>"
+  <%- end -%>
 <% end -%>

From fcc9bc541d2ddc5ae1f600147755c2dae9c6e71a Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Tue, 8 Mar 2016 15:40:19 +0100
Subject: [PATCH 0860/2267] (#3139) Add support for PassengerUser

---
 README.md                      | 4 ++++
 manifests/vhost.pp             | 6 ++++--
 spec/defines/vhost_spec.rb     | 1 +
 templates/vhost/_passenger.erb | 3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5f1e77f89b..6cd5729786 100644
--- a/README.md
+++ b/README.md
@@ -2306,6 +2306,10 @@ Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apa
 
 Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart), the URL of the application if pre-starting is required.
 
+##### `passenger_user`
+
+Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser), the running user for sandboxing applications.
+
 ##### `php_flags & values`
 
 Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Default: '{}'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e909788dfe..2430272b9b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -124,6 +124,7 @@
   $passenger_min_instances     = undef,
   $passenger_start_timeout     = undef,
   $passenger_pre_start         = undef,
+  $passenger_user              = undef,
   $add_default_charset         = undef,
   $modsec_disable_vhost        = undef,
   $modsec_disable_ids          = undef,
@@ -274,7 +275,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user {
     include ::apache::mod::passenger
   }
 
@@ -953,7 +954,8 @@
   # - $passenger_min_instances
   # - $passenger_start_timeout
   # - $passenger_pre_start
-  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
+  # - $passenger_user
+  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user {
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8bcd3cfd59..b565eaa874 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -337,6 +337,7 @@
           'passenger_min_instances'     => '1',
           'passenger_start_timeout'     => '600',
           'passenger_pre_start'         => 'http://localhost/myapp',
+          'passenger_user'              => 'sandbox',
           'add_default_charset'         => 'UTF-8',
           'auth_kerb'                   => true,
           'krb_method_negotiate'        => 'off',
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index 130e769353..91820d3634 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -16,3 +16,6 @@
 <% if @passenger_pre_start -%>
   PassengerPreStart <%= @passenger_pre_start %>
 <% end -%>
+<% if @passenger_user -%>
+  PassengerUser <%= @passenger_user %>
+<% end -%>

From 7212175803ea2fab60f5f49df699f9b3216be265 Mon Sep 17 00:00:00 2001
From: Stig Brautaset <sbrautaset@laterpay.net>
Date: Tue, 8 Mar 2016 17:07:09 +0000
Subject: [PATCH 0861/2267] Allow configuring mod_security's SecAuditLogParts

The default configuration for this includes "I" which is not always
always suitable, e.g. if you cannot tolerate POST parameters appearing
in your modsec_audit.log

You may want to omit `I` if mod_security is protecting a hypothetical
web service that accepts credit card data in a POST request, for
example.
---
 manifests/mod/security.pp         | 2 ++
 manifests/params.pp               | 1 +
 spec/classes/mod/security_spec.rb | 8 ++++++++
 templates/mod/security.conf.erb   | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 10145d7f3b..7cd7114c4e 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -3,6 +3,7 @@
   $activated_rules       = $::apache::params::modsec_default_rules,
   $modsec_dir            = $::apache::params::modsec_dir,
   $modsec_secruleengine  = $::apache::params::modsec_secruleengine,
+  $audit_log_parts       = $::apache::params::modsec_audit_log_parts,
   $secpcrematchlimit = $::apache::params::secpcrematchlimit,
   $secpcrematchlimitrecursion = $::apache::params::secpcrematchlimitrecursion,
   $allowed_methods       = 'GET HEAD POST OPTIONS',
@@ -35,6 +36,7 @@
 
   # Template uses:
   # - $modsec_dir
+  # - $audit_log_parts
   # - secpcrematchlimit
   # - secpcrematchlimitrecursion
   file { 'security.conf':
diff --git a/manifests/params.pp b/manifests/params.pp
index 7b6e93cc01..6a40f4d9bf 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -159,6 +159,7 @@
     $mellon_lock_file     = '/run/mod_auth_mellon/lock'
     $mellon_cache_size    = 100
     $mellon_post_directory = undef
+    $modsec_audit_log_parts = 'ABIJDEFHZ'
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 2b6d16ecb7..1dd2e9571b 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -27,6 +27,7 @@
     it { should contain_file('security.conf').with(
       :path => '/etc/httpd/conf.modules.d/security.conf'
     ) }
+    it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ABJDEFHZ$") }
     it { should contain_file('/etc/httpd/modsecurity.d').with(
       :ensure => 'directory',
       :path => '/etc/httpd/modsecurity.d',
@@ -43,6 +44,13 @@
       :path => '/etc/httpd/modsecurity.d/security_crs.conf'
     ) }
     it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+
+    describe 'with parameters' do
+      let :params do
+        { :modsec_audit_log_parts => "ABCDZ"
+        }
+      end
+      it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ABCDZ$") }
   end
 
   context "on Debian based systems" do
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index a71f5887d1..1ffd30bb9c 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -50,7 +50,7 @@
     SecDebugLogLevel 0
     SecAuditEngine RelevantOnly
     SecAuditLogRelevantStatus "^(?:5|4(?!04))"
-    SecAuditLogParts ABIJDEFHZ
+    SecAuditLogParts <%= @audit_log_parts %>
     SecAuditLogType Serial
     SecArgumentSeparator &
     SecCookieFormat 0

From d2699d18e5856ff8841373b3ebc9adc8c321564f Mon Sep 17 00:00:00 2001
From: Stig Brautaset <sbrautaset@laterpay.net>
Date: Tue, 8 Mar 2016 17:27:38 +0000
Subject: [PATCH 0862/2267] Add SecAuditLogParts tests for Debian-based systems

---
 spec/classes/mod/security_spec.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 1dd2e9571b..0590b21c1c 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -51,6 +51,7 @@
         }
       end
       it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ABCDZ$") }
+    end
   end
 
   context "on Debian based systems" do
@@ -79,6 +80,7 @@
     it { should contain_file('security.conf').with(
       :path => '/etc/apache2/mods-available/security.conf'
     ) }
+    it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ABJDEFHZ$") }
     it { should contain_file('/etc/modsecurity').with(
       :ensure => 'directory',
       :path => '/etc/modsecurity',
@@ -95,6 +97,14 @@
       :path => '/etc/modsecurity/security_crs.conf'
     ) }
     it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+
+    describe 'with parameters' do
+      let :params do
+        { :modsec_audit_log_parts => "ACEZ"
+        }
+      end
+      it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ACEZ$") }
+    end
   end
 
 end

From 78ee594d71921e86a80ccdfe84952b2cea0097f5 Mon Sep 17 00:00:00 2001
From: Stig Brautaset <sbrautaset@laterpay.net>
Date: Wed, 9 Mar 2016 10:36:19 +0000
Subject: [PATCH 0863/2267] Fix parameter name

---
 spec/classes/mod/security_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 0590b21c1c..2730861f06 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -47,7 +47,7 @@
 
     describe 'with parameters' do
       let :params do
-        { :modsec_audit_log_parts => "ABCDZ"
+        { :audit_log_parts => "ABCDZ"
         }
       end
       it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ABCDZ$") }
@@ -100,7 +100,7 @@
 
     describe 'with parameters' do
       let :params do
-        { :modsec_audit_log_parts => "ACEZ"
+        { :audit_log_parts => "ACEZ"
         }
       end
       it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ACEZ$") }

From 388ab4b53de683039c120d138132eebf7c0fbee5 Mon Sep 17 00:00:00 2001
From: Stig Brautaset <sbrautaset@laterpay.net>
Date: Wed, 9 Mar 2016 15:04:22 +0000
Subject: [PATCH 0864/2267] Use regular expression rather than exact string
 match

---
 spec/classes/mod/security_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 2730861f06..7a0ba8f299 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -27,7 +27,7 @@
     it { should contain_file('security.conf').with(
       :path => '/etc/httpd/conf.modules.d/security.conf'
     ) }
-    it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ABJDEFHZ$") }
+    it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABIJDEFHZ$} }
     it { should contain_file('/etc/httpd/modsecurity.d').with(
       :ensure => 'directory',
       :path => '/etc/httpd/modsecurity.d',
@@ -50,7 +50,7 @@
         { :audit_log_parts => "ABCDZ"
         }
       end
-      it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ABCDZ$") }
+      it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
     end
   end
 
@@ -80,7 +80,7 @@
     it { should contain_file('security.conf').with(
       :path => '/etc/apache2/mods-available/security.conf'
     ) }
-    it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ABJDEFHZ$") }
+    it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABIJDEFHZ$} }
     it { should contain_file('/etc/modsecurity').with(
       :ensure => 'directory',
       :path => '/etc/modsecurity',
@@ -103,7 +103,7 @@
         { :audit_log_parts => "ACEZ"
         }
       end
-      it { should contain_file('security.conf').with_content("^\s*SecAuditLogParts ACEZ$") }
+      it { should contain_file('security.conf').with_content  %r{^\s+SecAuditLogParts ACEZ$} }
     end
   end
 

From 3d5aa16b3fe927920599566ffda12da483d80124 Mon Sep 17 00:00:00 2001
From: Stig Brautaset <sbrautaset@laterpay.net>
Date: Wed, 9 Mar 2016 15:04:56 +0000
Subject: [PATCH 0865/2267] Move default value outside the redhat-specific
 section

So it is valid for Debian-based systems also.
---
 manifests/params.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 6a40f4d9bf..19b3d2a460 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -47,6 +47,8 @@
 
   $vhost_include_pattern = '*'
 
+  $modsec_audit_log_parts = 'ABIJDEFHZ'
+
   if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } else {
@@ -159,7 +161,6 @@
     $mellon_lock_file     = '/run/mod_auth_mellon/lock'
     $mellon_cache_size    = 100
     $mellon_post_directory = undef
-    $modsec_audit_log_parts = 'ABIJDEFHZ'
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'

From 946be7ea59d65735bb4d50deef516fe0a4ab6e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20S=C3=A9hier?= <simon.sehier@camptocamp.com>
Date: Thu, 10 Mar 2016 11:12:05 +0100
Subject: [PATCH 0866/2267] add doc for ssl_proxy_protocol

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 5f1e77f89b..ad1415a812 100644
--- a/README.md
+++ b/README.md
@@ -3267,6 +3267,10 @@ apache::vhost { 'sample.example.net':
   ssl_verify_depth => 1,
 }
 ```
+##### `ssl_proxy_protocol`
+
+Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) directive, which controls the SSL protocol flavors mod_ssl should use when establishing its server environment for proxy. It will only connect to servers using one of the provided protocols. Default: undef.
+
 
 ##### `ssl_proxy_verify`
 

From e252bd08aed9b66a80677c9c742de29e1e6965fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20S=C3=A9hier?= <simon.sehier@camptocamp.com>
Date: Thu, 10 Mar 2016 14:14:41 +0100
Subject: [PATCH 0867/2267] make ssl_proxy_protocol consistent with
 ssl_protocol usage

---
 templates/vhost/_sslproxy.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
index 393126e439..0bc0a244a1 100644
--- a/templates/vhost/_sslproxy.erb
+++ b/templates/vhost/_sslproxy.erb
@@ -15,6 +15,6 @@
   SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
   <%- end -%>
   <%- if @ssl_proxy_protocol -%>
-  SSLProxyProtocol  "<%= @ssl_proxy_protocol %>"
+  SSLProxyProtocol  <%= [@ssl_proxy_protocol].flatten.compact.join(' ') %>
   <%- end -%>
 <% end -%>

From 50d7795cb75c69baa3bf248ee53d1c2845e9667b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20S=C3=A9hier?= <simon.sehier@camptocamp.com>
Date: Thu, 10 Mar 2016 14:21:32 +0100
Subject: [PATCH 0868/2267] add tests for SSLProxyProtocol

---
 spec/acceptance/apache_ssl_spec.rb |  1 +
 spec/defines/vhost_spec.rb         | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 254a3c35a2..5df551a414 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -62,6 +62,7 @@ class { 'apache':
           ssl_verify_depth     => 'test',
           ssl_options          => ['test', 'test1'],
           ssl_proxyengine      => true,
+          ssl_proxy_protocol   => 'TLSv1.2',
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8bcd3cfd59..c8d54dd3b7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -158,6 +158,7 @@
           'ssl_proxy_check_peer_cn'     => 'on',
           'ssl_proxy_check_peer_name'   => 'on',
           'ssl_proxyengine'             => true,
+          'ssl_proxy_protocol'          => 'TLSv1.2',
 
           'priority'                    => '30',
           'default_vhost'               => true,
@@ -470,6 +471,8 @@
         :content => /^\s+SSLProxyCheckPeerCN\s+on$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
         :content => /^\s+SSLProxyCheckPeerName\s+on$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+        :content => /^\s+SSLProxyProtocol\s+TLSv1.2$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
@@ -778,6 +781,19 @@
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
     end
+    context 'ssl_proxy_protocol without ssl_proxyengine' do
+      let :params do
+        {
+          'docroot'            => '/rspec/docroot',
+          'ssl'                => true,
+          'ssl_proxyengine'    => false,
+          'ssl_proxy_protocol' => 'TLSv1.2',
+        }
+      end
+      it { is_expected.to compile }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
+    end
   end
   describe 'access logs' do
     let :facts do

From 9ac6064f58a304392184b10729993a5024641548 Mon Sep 17 00:00:00 2001
From: Stig Brautaset <sbrautaset@laterpay.net>
Date: Thu, 10 Mar 2016 14:33:12 +0000
Subject: [PATCH 0869/2267] Document mod_security's audit_log_parts parameter
 in README

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 5f1e77f89b..76c174cc56 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,8 @@
 [Apache modules]: https://httpd.apache.org/docs/current/mod/
 [array]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_array.html
 
+[audit log]: https://github.com/SpiderLabs/ModSecurity/wiki/ModSecurity-2-Data-Formats#audit-log
+
 [beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
 
 [certificate revocation list]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationfile
@@ -1706,6 +1708,7 @@ ${modsec\_dir}/activated\_rules.
 - `restricted_headers`: A list of restricted headers separated by slashes and spaces. Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
 - `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. Default: '1500'
 - `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
+- `audit_log_parts`: Sets the sections to be put in the [audit log][]. Default: 'ABIJDEFHZ'
 
 ##### Class: `apache::mod::wsgi`
 

From d2f64a788e7f88326ab18c53ce0d6c002dd68191 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 10 Mar 2016 11:03:15 -0800
Subject: [PATCH 0870/2267] Enable multiverse on all Ubuntu hosts

multiverse is needed for libapache2-mod-fastcgi but is not enabled by
default on any Ubuntu release.
---
 spec/acceptance/vhost_spec.rb | 68 +++++++++++++++++------------------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 5a978c4356..36d4f42c59 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1396,44 +1396,42 @@ class { 'apache': }
     describe 'fastcgi' do
       it 'applies cleanly' do
         pp = <<-EOS
-          unless $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '12.04') >= 0 {
-            $_os = $::operatingsystem
-
-            if $_os == 'Ubuntu' {
-              $_location = "http://archive.ubuntu.com/"
-              $_security_location = "http://archive.ubuntu.com/"
-              $_release = $::lsbdistcodename
-              $_release_security = "${_release}-security"
-              $_repos = "main universe multiverse"
-            } else {
-              $_location = "http://httpredir.debian.org/debian/"
-              $_security_location = "http://security.debian.org/"
-              $_release = $::lsbdistcodename
-              $_release_security = "${_release}/updates"
-              $_repos = "main contrib non-free"
-            }
+          $_os = $::operatingsystem
+
+          if $_os == 'Ubuntu' {
+            $_location = "http://archive.ubuntu.com/ubuntu/"
+            $_security_location = "http://archive.ubuntu.com/ubuntu/"
+            $_release = $::lsbdistcodename
+            $_release_security = "${_release}-security"
+            $_repos = "main universe multiverse"
+          } else {
+            $_location = "http://httpredir.debian.org/debian/"
+            $_security_location = "http://security.debian.org/"
+            $_release = $::lsbdistcodename
+            $_release_security = "${_release}/updates"
+            $_repos = "main contrib non-free"
+          }
 
-            include ::apt
-            apt::source { "${_os}_${_release}":
-              location    => $_location,
-              release     => $_release,
-              repos       => $_repos,
-              include_src => false,
-            }
+          include ::apt
+          apt::source { "${_os}_${_release}":
+            location    => $_location,
+            release     => $_release,
+            repos       => $_repos,
+            include_src => false,
+          }
 
-            apt::source { "${_os}_${_release}-updates":
-              location    => $_location,
-              release     => "${_release}-updates",
-              repos       => $_repos,
-              include_src => false,
-            }
+          apt::source { "${_os}_${_release}-updates":
+            location    => $_location,
+            release     => "${_release}-updates",
+            repos       => $_repos,
+            include_src => false,
+          }
 
-            apt::source { "${_os}_${_release}-security":
-              location    => $_security_location,
-              release     => $_release_security,
-              repos       => $_repos,
-              include_src => false,
-            }
+          apt::source { "${_os}_${_release}-security":
+            location    => $_security_location,
+            release     => $_release_security,
+            repos       => $_repos,
+            include_src => false,
           }
         EOS
 

From 06498f221a8cab2afa2a8a1e7a4d21b463d680df Mon Sep 17 00:00:00 2001
From: Martin Hagstrom <martin.hagstrom@ericsson.com>
Date: Fri, 11 Mar 2016 12:30:38 +0100
Subject: [PATCH 0871/2267] Use valid parameter name

According to this document, uppercase letters are not allowed:
https://docs.puppetlabs.com/puppet/latest/reference/lang_reserved.html#parameters
---
 manifests/mod/authnz_ldap.pp         | 14 +++++++++++---
 spec/classes/mod/authnz_ldap_spec.rb | 20 ++++++++++----------
 templates/mod/authnz_ldap.conf.erb   |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 14a60494b0..45fcc997f5 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,14 +1,22 @@
 class apache::mod::authnz_ldap (
-  $verifyServerCert = true,
+  $verify_server_cert = true,
+  $verifyServerCert   = undef,
 ) {
   include ::apache
   include '::apache::mod::ldap'
   ::apache::mod { 'authnz_ldap': }
 
-  validate_bool($verifyServerCert)
+  if $verifyServerCert {
+    warning('Class[\'apache::mod::authnz_ldap\'] parameter verifyServerCert is deprecated in favor of verify_server_cert')
+    $_verify_server_cert = $verifyServerCert
+  } else {
+    $_verify_server_cert = $verify_server_cert
+  }
+
+  validate_bool($_verify_server_cert)
 
   # Template uses:
-  # - $verifyServerCert
+  # - $_verify_server_cert
   file { 'authnz_ldap.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/authnz_ldap.conf",
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index d433bc5337..7469d165e3 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -22,17 +22,17 @@
       it { is_expected.to contain_class("apache::mod::ldap") }
       it { is_expected.to contain_apache__mod('authnz_ldap') }
 
-      context 'default verifyServerCert' do
+      context 'default verify_server_cert' do
         it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
       end
 
-      context 'verifyServerCert = false' do
-        let(:params) { { :verifyServerCert => false } }
+      context 'verify_server_cert = false' do
+        let(:params) { { :verify_server_cert => false } }
         it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
       end
 
-      context 'verifyServerCert = wrong' do
-        let(:params) { { :verifyServerCert => 'wrong' } }
+      context 'verify_server_cert = wrong' do
+        let(:params) { { :verify_server_cert => 'wrong' } }
         it 'should raise an error' do
           expect { is_expected.to raise_error Puppet::Error }
         end
@@ -56,17 +56,17 @@
       it { is_expected.to contain_class("apache::mod::ldap") }
       it { is_expected.to contain_apache__mod('authnz_ldap') }
 
-      context 'default verifyServerCert' do
+      context 'default verify_server_cert' do
         it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
       end
 
-      context 'verifyServerCert = false' do
-        let(:params) { { :verifyServerCert => false } }
+      context 'verify_server_cert = false' do
+        let(:params) { { :verify_server_cert => false } }
         it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
       end
 
-      context 'verifyServerCert = wrong' do
-        let(:params) { { :verifyServerCert => 'wrong' } }
+      context 'verify_server_cert = wrong' do
+        let(:params) { { :verify_server_cert => 'wrong' } }
         it 'should raise an error' do
           expect { is_expected.to raise_error Puppet::Error }
         end
diff --git a/templates/mod/authnz_ldap.conf.erb b/templates/mod/authnz_ldap.conf.erb
index 565fcf0df9..8d73b239d5 100644
--- a/templates/mod/authnz_ldap.conf.erb
+++ b/templates/mod/authnz_ldap.conf.erb
@@ -1,4 +1,4 @@
-<% if @verifyServerCert == true -%>
+<% if @_verify_server_cert == true -%>
 LDAPVerifyServerCert On
 <% else -%>
 LDAPVerifyServerCert Off

From fc8fee7ef3d91e8c4ec2fcc2e19e6ad4cb46028e Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Wed, 16 Mar 2016 17:17:11 +0100
Subject: [PATCH 0872/2267] mod_ssl requires mod_mime for AddType directives

---
 manifests/mod/ssl.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index c0dd1f61bf..4cbddcbd66 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -14,6 +14,7 @@
   $package_name            = undef,
 ) {
   include ::apache
+  include ::apache::mod::mime
   $_apache_version = pick($apache_version, $apache::apache_version)
   if $ssl_mutex {
     $_ssl_mutex = $ssl_mutex

From a2f636235623c0b024fdbf6b3afc451544511750 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Wed, 20 May 2015 18:55:41 +0100
Subject: [PATCH 0873/2267] Move all ensure parameters from concat::fragment to
 concat

Deprecated in 1.1.x and has no effect in 2.x.  From commit 1919eb3, but
was reverted when temporarily removing 2.x support in f54393e.
---
 manifests/balancer.pp        | 3 ---
 manifests/balancermember.pp  | 1 -
 manifests/init.pp            | 2 +-
 manifests/listen.pp          | 1 -
 manifests/namevirtualhost.pp | 1 -
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index a3534ded8c..65f6352a32 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -64,7 +64,6 @@
   }
 
   concat::fragment { "00-${name}-header":
-    ensure  => present,
     target  => "apache_balancer_${name}",
     order   => '01',
     content => "<Proxy balancer://${name}>\n",
@@ -77,14 +76,12 @@
   # concat fragments. We don't have to do anything about them.
 
   concat::fragment { "01-${name}-proxyset":
-    ensure  => present,
     target  => "apache_balancer_${name}",
     order   => '19',
     content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"),
   }
 
   concat::fragment { "01-${name}-footer":
-    ensure  => present,
     target  => "apache_balancer_${name}",
     order   => '20',
     content => "</Proxy>\n",
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 78723043bc..6e8b29f13f 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -46,7 +46,6 @@
 ) {
 
   concat::fragment { "BalancerMember ${name}":
-    ensure  => present,
     target  => "apache_balancer_${balancer_cluster}",
     content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index e8f6e6f9ba..194c1741e9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -242,6 +242,7 @@
   }
 
   concat { $ports_file:
+    ensure  => present,
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => $::apache::file_mode,
@@ -249,7 +250,6 @@
     require => Package['httpd'],
   }
   concat::fragment { 'Apache ports header':
-    ensure  => present,
     target  => $ports_file,
     content => template('apache/ports_header.erb')
   }
diff --git a/manifests/listen.pp b/manifests/listen.pp
index e6a8a3c767..503ee8860b 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -3,7 +3,6 @@
 
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
-    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/listen.erb'),
   }
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index f8c3a80d85..4fa8795185 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -3,7 +3,6 @@
 
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
-    ensure  => present,
     target  => $::apache::ports_file,
     content => template('apache/namevirtualhost.erb'),
   }

From 281da58df7a710b99ae4c61e05a3e29bd06bf1c0 Mon Sep 17 00:00:00 2001
From: Tom Downes <thomas.downes@ligo.org>
Date: Thu, 17 Mar 2016 10:14:49 -0700
Subject: [PATCH 0874/2267] 1. Fix MODULES-3158 (any string interpreted as
 SSLCompression on) 2. Convert ssl_honorcipherorder to boolean, backport
 strings 'on' or 'off' 3. Update documentation accordingly

---
 README.md                  |  4 ++--
 manifests/mod/ssl.pp       | 14 +++++++++++++-
 templates/mod/ssl.conf.erb |  6 +++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cd2ac7c9a4..198a540e6c 100644
--- a/README.md
+++ b/README.md
@@ -1660,7 +1660,7 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 - `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
 - `ssl_compression`: Default: false.
 - `ssl_cryptodevice`: Default: 'builtin'.
-- `ssl_honorcipherorder`: Default: 'On'.
+- `ssl_honorcipherorder`: Default: true.
 - `ssl_openssl_conf_cmd`: Default: undef.
 - `ssl_options`: Default: [ 'StdEnvVars' ]
 - `ssl_pass_phrase_dialog`: Default: 'builtin'.
@@ -3240,7 +3240,7 @@ Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.htm
 
 ##### `ssl_honorcipherorder`
 
-Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), which is used to prefer the server's cipher preference order. Default: 'On' in the base `apache` config.
+Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), to cause Apache to use the server's preferred order of ciphers rather than the client's preferred order. Default: true. In addition to true/false Boolean values, will also accept case-insensitive Strings 'on' or 'off'.
 
 ##### `ssl_certs_dir`
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 4cbddcbd66..7a220e8345 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -4,7 +4,7 @@
   $ssl_options             = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd    = undef,
   $ssl_cipher              = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4',
-  $ssl_honorcipherorder    = 'On',
+  $ssl_honorcipherorder    = true,
   $ssl_protocol            = [ 'all', '-SSLv2', '-SSLv3' ],
   $ssl_pass_phrase_dialog  = 'builtin',
   $ssl_random_seed_bytes   = '512',
@@ -47,6 +47,18 @@
     }
   }
 
+  validate_bool($ssl_compression)
+
+  if is_bool($ssl_honorcipherorder) {
+    $_ssl_honorcipherorder = $ssl_honorcipherorder
+  } else {
+    $_ssl_honorcipherorder = $ssl_honorcipherorder ? {
+      'on'    => true,
+      'off'   => false,
+      default => true,
+    }
+  }
+
   $session_cache = $::osfamily ? {
     'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
     'redhat'  => '/var/cache/mod_ssl/scache(512000)',
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 4ae29e40a0..686c62a0e0 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -19,7 +19,11 @@
   SSLMutex <%= @_ssl_mutex %>
   <%- end -%>
   SSLCryptoDevice <%= @ssl_cryptodevice %>
-  SSLHonorCipherOrder <%= @ssl_honorcipherorder %>
+<% if @_ssl_honorcipherorder -%>
+  SSLHonorCipherOrder On
+<% else -%>
+  SSLHonorCipherOrder Off
+<% end -%>
   SSLCipherSuite <%= @ssl_cipher %>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
 <% if @ssl_options -%>

From 3ccd3294dcd866bdc1cf3a3901bcc0b5d21a7c25 Mon Sep 17 00:00:00 2001
From: Tom Downes <thomas.downes@ligo.org>
Date: Fri, 25 Mar 2016 09:15:00 -0500
Subject: [PATCH 0875/2267] Take igalic's suggestion to use bool2httpd

---
 templates/mod/ssl.conf.erb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 686c62a0e0..a66d73312b 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -10,20 +10,14 @@
   SSLPassPhraseDialog <%= @ssl_pass_phrase_dialog %>
   SSLSessionCache "shmcb:<%= @session_cache %>"
   SSLSessionCacheTimeout <%= @ssl_sessioncachetimeout %>
-<% if @ssl_compression -%>
-  SSLCompression On
-<% end -%>
+  SSLCompression <%= scope.function_bool2httpd([@ssl_compression]) %>
   <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   Mutex <%= @_ssl_mutex %>
   <%- else -%>
   SSLMutex <%= @_ssl_mutex %>
   <%- end -%>
   SSLCryptoDevice <%= @ssl_cryptodevice %>
-<% if @_ssl_honorcipherorder -%>
-  SSLHonorCipherOrder On
-<% else -%>
-  SSLHonorCipherOrder Off
-<% end -%>
+  SSLHonorCipherOrder <%= scope.function_bool2httpd([@_ssl_honorcipherorder]) %>
   SSLCipherSuite <%= @ssl_cipher %>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
 <% if @ssl_options -%>

From 44495362bd94a7b9c600487b6ced63870d30b9dd Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 28 Mar 2016 09:36:26 -0600
Subject: [PATCH 0876/2267] MODULES-3211: fix broken strict_variable tests

---
 manifests/dev.pp                    |  6 +++++-
 manifests/params.pp                 |  1 +
 manifests/vhost.pp                  |  2 ++
 spec/classes/mod/dav_svn_spec.rb    |  4 ++--
 spec/classes/mod/dev_spec.rb        | 28 ----------------------------
 spec/classes/mod/proxy_html_spec.rb |  2 +-
 spec/spec_helper.rb                 | 25 ++++++++++++++++---------
 7 files changed, 27 insertions(+), 41 deletions(-)
 delete mode 100644 spec/classes/mod/dev_spec.rb

diff --git a/manifests/dev.pp b/manifests/dev.pp
index fdebf59f55..d4a25a7e44 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -1,5 +1,9 @@
 class apache::dev {
-  include ::apache::params
+
+  if ! defined(Class['apache']) {
+    fail('You must include the apache base class before using any apache defined resources')
+  }
+
   $packages = $::apache::dev_packages
   if $packages { # FreeBSD doesn't have dev packages to install
     package { $packages:
diff --git a/manifests/params.pp b/manifests/params.pp
index 19b3d2a460..1cb2f40f5e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -488,6 +488,7 @@
     $docroot              = '/var/www/localhost/htdocs'
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
+    $pidfile              = '/var/run/apache2.pid'
   } elsif $::osfamily == 'Suse' {
     $user                = 'wwwrun'
     $group               = 'wwwrun'
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a02e25f144..90e99d1101 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -493,6 +493,8 @@
     }
 
     $_directories = [ merge($_directory, $_directory_version) ]
+  } else {
+    $_directories = undef
   }
 
   ## Create a global LocationMatch if locations aren't defined
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 1f60e730b1..1eb06b22c5 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -34,7 +34,7 @@
           :id                        => 'root',
           :kernel                    => 'Linux',
           :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          :is_pe                     => false,
         }
       end
       it { is_expected.to contain_class("apache::params") }
@@ -52,7 +52,7 @@
           :id                        => 'root',
           :kernel                    => 'Linux',
           :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          :is_pe                     => false,
         }
       end
       it { is_expected.to contain_class("apache::params") }
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
deleted file mode 100644
index 29589f99f2..0000000000
--- a/spec/classes/mod/dev_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::dev', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-
-  [
-    ['RedHat',  '6', 'Santiago', 'Linux'],
-    ['Debian',  '6', 'squeeze', 'Linux'],
-    ['FreeBSD', '9', 'FreeBSD', 'FreeBSD'],
-  ].each do |osfamily, operatingsystemrelease, lsbdistcodename, kernel|
-    context "on a #{osfamily} OS" do
-      let :facts do
-        {
-          :lsbdistcodename        => lsbdistcodename,
-          :osfamily               => osfamily,
-          :operatingsystem        => osfamily,
-          :operatingsystemrelease => operatingsystemrelease,
-          :is_pe                  => false,
-          :concat_basedir         => '/foo',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-          :kernel                 => kernel
-        }
-      end
-      it { is_expected.to contain_class('apache::dev') }
-    end
-  end
-end
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index ffdaa243ed..066ae239a0 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -25,7 +25,7 @@
         :kernel          => 'Linux',
         :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :hardwaremodel   => 'i386',
-        :is_pe                  => false,
+        :is_pe           => false,
       }
     end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c48f49b1bf..561f633026 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -25,16 +25,23 @@
 shared_examples 'a mod class, without including apache' do
    let :facts do
     {
-      :id                     => 'root',
-      :lsbdistcodename        => 'squeeze',
-      :kernel                 => 'Linux',
-      :osfamily               => 'Debian',
-      :operatingsystem        => 'Debian',
-      :operatingsystemrelease => '6',
-      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      :concat_basedir         => '/dne',
-      :is_pe                  => false,
+      :id                        => 'root',
+      :lsbdistcodename           => 'squeeze',
+      :kernel                    => 'Linux',
+      :osfamily                  => 'Debian',
+      :operatingsystem           => 'Debian',
+      :operatingsystemrelease    => '6',
+      :operatingsystemmajrelease => nil,
+      :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      :concat_basedir            => '/dne',
+      :is_pe                     => false,
+      :hardwaremodel             => 'x86_64',
     }
   end
   it { should compile.with_all_deps }
 end
+
+RSpec.configure do |config|
+    config.filter_run focus: true
+    config.run_all_when_everything_filtered = true
+end

From 0cbb9c789d45c95620f0c75f15a5e8798515fb2f Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Fri, 25 Mar 2016 13:17:36 -0600
Subject: [PATCH 0877/2267] MODULES-2179: Implement SetEnvIfNoCase

---
 README.md                   | 4 ++++
 manifests/vhost.pp          | 9 +++++++--
 spec/defines/vhost_spec.rb  | 8 +++++++-
 spec/spec_helper.rb         | 5 +++++
 templates/vhost/_setenv.erb | 5 +++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 198a540e6c..f123c9a901 100644
--- a/README.md
+++ b/README.md
@@ -2596,6 +2596,10 @@ apache::vhost { 'setenv.example.com':
 
 Used by HTTPD to conditionally set environment variables for virtual hosts. Default: '[]'.
 
+##### `setenvifnocase`
+
+Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching). Default: '[]'.
+
 ##### `suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
 
 Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 90e99d1101..69aee69e7c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -97,6 +97,7 @@
   $rewrite_cond                = undef,
   $setenv                      = [],
   $setenvif                    = [],
+  $setenvifnocase              = [],
   $block                       = [],
   $ensure                      = 'present',
   $wsgi_application_group      = undef,
@@ -460,7 +461,11 @@
     }
   }
 
-  if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
+  # Check if mod_setenvif is required and not yet loaded.
+  # create an expression to simplify the conditional check
+  $use_setenv_mod = ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) or ($setenvifnocase and ! empty($setenvifnocase))
+
+  if ($use_setenv_mod) {
     if ! defined(Class['apache::mod::setenvif']) {
       include ::apache::mod::setenvif
     }
@@ -803,7 +808,7 @@
   # Template uses:
   # - $setenv
   # - $setenvif
-  if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
+  if ($use_setenv_mod) {
     concat::fragment { "${name}-setenv":
       target  => "${priority_real}${filename}.conf",
       order   => 220,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 405c2a21e8..e99e2a6ccd 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -299,6 +299,7 @@
           'rewrite_cond'                => '%{HTTP_USER_AGENT} ^MSIE',
           'setenv'                      => ['FOO=/bin/true'],
           'setenvif'                    => 'Request_URI "\.gif$" object_is_image=gif',
+          'setenvifnocase'              => 'REMOTE_ADDR ^127.0.0.1 localhost=true',
           'block'                       => 'scm',
           'wsgi_application_group'      => '%{GLOBAL}',
           'wsgi_daemon_process'         => 'wsgi',
@@ -465,7 +466,12 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-setenv') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+              %r{SetEnv FOO=/bin/true}) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+              %r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif}) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+              %r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true}) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
         :content => /^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$/ ) }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 561f633026..e61b185c1a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -18,6 +18,11 @@
   end
 end
 
+RSpec.configure do |config|
+    config.filter_run focus: true
+    config.run_all_when_everything_filtered = true
+end
+
 shared_examples :compile, :compile => true do
   it { should compile.with_all_deps }
 end
diff --git a/templates/vhost/_setenv.erb b/templates/vhost/_setenv.erb
index ce1fa955ef..476a6b19ca 100644
--- a/templates/vhost/_setenv.erb
+++ b/templates/vhost/_setenv.erb
@@ -10,3 +10,8 @@
   SetEnvIf <%= envifvar %>
   <%- end -%>
 <% end -%>
+<% if @setenvifnocase and ! @setenvifnocase.empty? -%>
+  <%- Array(@setenvifnocase).each do |envifncvar| -%>
+  SetEnvIfNoCase <%= envifncvar %>
+  <%- end -%>
+<% end -%>

From 3d864609aca8eae82c337eb3b538f701102206c1 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 28 Mar 2016 09:36:26 -0600
Subject: [PATCH 0878/2267] MODULES-3211: fix broken strict_variable tests

---
 spec/classes/mod/dev_spec.rb | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 spec/classes/mod/dev_spec.rb

diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
new file mode 100644
index 0000000000..4c9f324b38
--- /dev/null
+++ b/spec/classes/mod/dev_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'apache::mod::dev', :type => :class do
+  let(:pre_condition) {[
+    'include apache'
+  ]}
+
+  it_behaves_like "a mod class, without including apache"
+
+  [
+    ['RedHat',  '6', 'Santiago', 'Linux'],
+    ['Debian',  '6', 'squeeze', 'Linux'],
+    ['FreeBSD', '9', 'FreeBSD', 'FreeBSD'],
+  ].each do |osfamily, operatingsystemrelease, lsbdistcodename, kernel|
+    context "on a #{osfamily} OS" do
+      let :facts do
+        {
+          :lsbdistcodename        => lsbdistcodename,
+          :osfamily               => osfamily,
+          :operatingsystem        => osfamily,
+          :operatingsystemrelease => operatingsystemrelease,
+          :is_pe                  => false,
+          :concat_basedir         => '/foo',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+          :kernel                 => kernel
+        }
+      end
+      it { is_expected.to contain_class('apache::dev') }
+    end
+  end
+end

From 6b662e430db8387d8c192cb60005b49d4b043bda Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Mon, 28 Mar 2016 10:58:56 -0600
Subject: [PATCH 0879/2267] MODULES-3212: add parallel_spec option

---
 .travis.yml    | 2 +-
 Gemfile        | 1 +
 Rakefile       | 9 +++++++++
 spec/spec.opts | 6 ------
 4 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 spec/spec.opts

diff --git a/.travis.yml b/.travis.yml
index 588fb5b002..e366e0ee2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 language: ruby
 cache: bundler
 bundler_args: --without system_tests
-script: "bundle exec rake validate lint spec"
+script: "bundle exec rake validate lint parallel_spec"
 matrix:
   fast_finish: true
   include:
diff --git a/Gemfile b/Gemfile
index e490bc9b98..21c2dbc3ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ group :development, :unit_tests do
   gem 'puppetlabs_spec_helper',    :require => false
   gem 'rspec-puppet', '>= 2.3.2',  :require => false
   gem 'simplecov',                 :require => false
+  gem 'parallel_tests',            :require => false
 end
 group :system_tests do
   gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
diff --git a/Rakefile b/Rakefile
index 1e2be6663c..7ef974b94c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,8 @@
 require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'parallel_tests'
+require 'parallel_tests/cli'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
@@ -41,3 +43,10 @@ task :gen_nodeset do
   end
   puts nodeset
 end
+
+desc "Parallel spec tests"
+task :parallel_spec do
+  Rake::Task[:spec_prep].invoke
+  ParallelTests::CLI.new.run('--type test -t rspec spec/classes spec/defines spec/unit'.split)
+  Rake::Task[:spec_clean].invoke
+end
diff --git a/spec/spec.opts b/spec/spec.opts
deleted file mode 100644
index 91cd6427ed..0000000000
--- a/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace

From 95e6dcd5217e73c94b27aca66f3b3189c1e3b82d Mon Sep 17 00:00:00 2001
From: Johan De Wit <johan@koewacht.net>
Date: Mon, 28 Mar 2016 15:11:47 +0200
Subject: [PATCH 0880/2267] MODULES-1352: adding support for apache 2.4 require
 directives. Includes doc and rspec

---
 README.md                        | 19 ++++++++++++
 spec/defines/vhost_spec.rb       | 51 ++++++++++++++++++++++++++++++++
 templates/vhost/_directories.erb | 15 +++++++++-
 3 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 198a540e6c..b22bf0168b 100644
--- a/README.md
+++ b/README.md
@@ -3073,6 +3073,23 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+When more complex sets of requirement are needed, apache >= 2.4 provides the use of [RequireAll](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireall), [RequireNone](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requirenone) or [RequireAny](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireany) directives.
+Using the 'enforce' key, which only supports 'any','none','all' (other values are silently ignored), this could be established like:
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      require => { 
+        enforce => 'all',
+        require => ['group', 'not host host.example.com'],
+      },
+    },
+  ],
+}
+```
+
 If `require` is set to `unmanaged` it will not be set at all. This is useful for complex authentication/authorization requirements which are handled in a custom fragment.
 
 ``` puppet
@@ -3086,6 +3103,8 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+
+
 ###### `satisfy`
 
 Sets a `Satisfy` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 405c2a21e8..f0bead76ec 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -191,6 +191,33 @@
               'provider' => 'files',
               'require'  => 'all granted',
             },
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'require'  =>
+              { 
+                'enforce'  => 'all',
+                'requires' => ['all-valid1', 'all-valid2'],
+              },
+            },
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'require'  =>
+              { 
+                'enforce'  => 'none',
+                'requires' => ['none-valid1', 'none-valid2'],
+              },
+            },
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'require'  =>
+              { 
+                'enforce'  => 'any',
+                'requires' => ['any-valid1', 'any-valid2'],
+              },
+            },
             {
               'path'     => '*',
               'provider' => 'proxy',
@@ -422,6 +449,30 @@
         :content => /^\s+Require all denied$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Require all granted$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<RequireAll>$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<\/RequireAll>$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require all-valid1$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require all-valid2$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<RequireNone>$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<\/RequireNone>$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require none-valid1$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require none-valid2$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<RequireAny>$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<\/RequireAny>$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require any-valid1$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require any-valid2$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 9beb89865f..7ef40edd2d 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -58,8 +58,21 @@
     <%- end -%>
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       <%- if directory['require'] && directory['require'] != '' && directory['require'] !~ /unmanaged/i -%>
-        <%- Array(directory['require']).each do |req| -%>
+        <%- if directory['require'].is_a?(Hash) -%>
+          <%- case directory['require']['enforce'].downcase -%>
+          <%- when 'all','none','any' then -%>
+    <Require<%= directory['require']['enforce'].capitalize %>>
+            <%- Array(directory['require']['requires']).each do |req| -%>
+      Require <%= req.strip %>
+            <%- end -%>
+    </Require<%= directory['require']['enforce'].capitalize %>>
+          <%- else -%>
+            <%- scope.function_warning(["Apache::Vhost: Require can only overwritten with all, none or any."]) -%>
+          <%- end -%>
+        <%- else -%>
+          <%- Array(directory['require']).each do |req| -%>
     Require <%= req %>
+          <%- end -%>
         <%- end -%>
       <%- end -%>
       <%- if directory['auth_require'] -%>

From 837a0885f3e9e00b417e39d44ed11032ca6da1a4 Mon Sep 17 00:00:00 2001
From: FlatKey <FlatKey@users.noreply.github.com>
Date: Sat, 26 Mar 2016 01:57:20 +0100
Subject: [PATCH 0881/2267] Configurability of SecDefaultAction for OWASP Core
 Rule Set

---
 README.md                           | 1 +
 manifests/mod/security.pp           | 1 +
 templates/mod/security_crs.conf.erb | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 198a540e6c..0e29fcb6df 100644
--- a/README.md
+++ b/README.md
@@ -1706,6 +1706,7 @@ ${modsec\_dir}/activated\_rules.
 - `modsec_secruleengine`: Configures the modsec rules engine. Valid options: 'On', 'Off', and 'DetectionOnly'. Default: `modsec_secruleengine` in [`apache::params`][].
 - `restricted_extensions`: A space-separated list of prohibited file extensions. Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
 - `restricted_headers`: A list of restricted headers separated by slashes and spaces. Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
+- `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') vs. Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set. Default: 'deny'.
 - `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. Default: '1500'
 - `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
 - `audit_log_parts`: Sets the sections to be put in the [audit log][]. Default: 'ABIJDEFHZ'
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 7cd7114c4e..36f726b0ac 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -10,6 +10,7 @@
   $content_types         = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
   $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
   $restricted_headers    = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
+  $secdefaultaction      = 'deny',
 ) inherits ::apache::params {
   include ::apache
 
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 016efc797e..8c5a83710c 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -63,8 +63,8 @@ SecComponentSignature "OWASP_CRS/2.2.6"
 # Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html
 # Ref: https://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Reference_Manual#SecDefaultAction
 #
-SecDefaultAction "phase:1,deny,log"
-
+SecDefaultAction "phase:1,<%= @secdefaultaction -%>,log"
+SecDefaultAction "phase:2,<%= @secdefaultaction -%>,log"
 
 #
 # -- [[ Collaborative Detection Severity Levels ]] ----------------------------------------

From d26761c2c990b023ff2e08693335fe8d08dcd5b2 Mon Sep 17 00:00:00 2001
From: FlatKey <FlatKey@users.noreply.github.com>
Date: Sat, 26 Mar 2016 05:57:36 +0100
Subject: [PATCH 0882/2267] aligned hash rocket within widest attribute of the
 parameter block ( remaining parameters aligned in #1404 )

---
 manifests/mod/security.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 36f726b0ac..dc06786f33 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -10,7 +10,7 @@
   $content_types         = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
   $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
   $restricted_headers    = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
-  $secdefaultaction      = 'deny',
+  $secdefaultaction           = 'deny',
 ) inherits ::apache::params {
   include ::apache
 

From 8082d2aa6beafdc90edd768a271ef629b703c41c Mon Sep 17 00:00:00 2001
From: FlatKey <FlatKey@users.noreply.github.com>
Date: Sat, 26 Mar 2016 16:40:17 +0100
Subject: [PATCH 0883/2267] Added vhost option SecRuleRemoveByTag

---
 README.md                            | 16 ++++++++
 manifests/vhost.pp                   | 14 ++++++-
 spec/acceptance/mod_security_spec.rb | 60 ++++++++++++++++++++++++++++
 templates/vhost/_security.erb        |  9 +++++
 4 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 198a540e6c..f597284396 100644
--- a/README.md
+++ b/README.md
@@ -2263,6 +2263,22 @@ apache::vhost { 'sample.example.net':
 
 Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching. Default: undef.
 
+###### `modsec_disable_tags`
+
+Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing removal of an Tag from a specific location. Default: undef.
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ],
+}
+```
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_tags => { '/location1' => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ] },
+}
+```
+
 ##### `no_proxy_uris`
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 90e99d1101..bf1654fad4 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -130,6 +130,7 @@
   $modsec_disable_vhost        = undef,
   $modsec_disable_ids          = undef,
   $modsec_disable_ips          = undef,
+  $modsec_disable_tags         = undef,
   $modsec_body_limit           = undef,
   $jk_mounts                   = undef,
   $auth_kerb                   = false,
@@ -508,6 +509,16 @@
     }
   }
 
+  if $modsec_disable_tags {
+    if is_hash($modsec_disable_tags) {
+      $_modsec_disable_tags = $modsec_disable_tags
+    } elsif is_array($modsec_disable_tags) {
+      $_modsec_disable_tags = { '.*' => $modsec_disable_tags }
+    } else {
+      fail("Apache::Vhost[${name}]: 'modsec_disable_tags' must be either a Hash of location/Tags or an Array of Tags")
+    }
+  }
+
   concat { "${priority_real}${filename}.conf":
     ensure  => $ensure,
     path    => "${::apache::vhost_dir}/${priority_real}${filename}.conf",
@@ -982,8 +993,9 @@
   # - $modsec_disable_vhost
   # - $modsec_disable_ids
   # - $modsec_disable_ips
+  # - $modsec_disable_tags
   # - $modsec_body_limit
-  if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips {
+  if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips or $modsec_disable_tags {
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
       order   => 320,
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index d6f2987df6..b1d1f5dd12 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -249,5 +249,65 @@ class { 'apache::mod::security': }
 
   end #mod_security should allow disabling by id
 
+  context "mod_security should allow disabling by tag" do
+    it 'succeeds in puppeting mod_security' do
+      pp= <<-EOS
+        host { 'modsec.example.com': ip => '127.0.0.1', }
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port    => '80',
+          docroot => '/var/www/html',
+        }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => 'Index page',
+        }
+        file { '/var/www/html/index2.html':
+          ensure  => file,
+          content => 'Page 2',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service($service_name) do
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{$mod_dir}/security.conf") do
+      it { is_expected.to contain "mod_security2.c" }
+    end
+
+    it 'should block query with SQL' do
+      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    end
+
+    it 'should disable mod_security per vhost' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port                => '80',
+          docroot             => '/var/www/html',
+          modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION' ],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    it 'should return index page' do
+      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+        expect(r.stdout).to match(/Index page/)
+        expect(r.exit_code).to eq(0)
+      end
+    end
+
+  end #mod_security should allow disabling by tag
 
 end #apache::mod::security class
diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
index 5ab0a5b5da..ca09d4944f 100644
--- a/templates/vhost/_security.erb
+++ b/templates/vhost/_security.erb
@@ -15,6 +15,15 @@
   SecRule REMOTE_ADDR "<%= ips %>" "nolog,allow,id:1234123455"
   SecAction  "phase:2,pass,nolog,id:1234123456"
 <% end -%>
+<% if @_modsec_disable_tags.is_a?(Hash) -%>
+<%   @_modsec_disable_tags.each do |location,rules| -%>
+  <LocationMatch <%= location %>>
+<%     Array(rules).each do |rule| -%>
+    SecRuleRemoveByTag "<%= rule %>"
+<%     end -%>
+  </LocationMatch>
+<%   end -%>
+<% end -%>
 <% if @modsec_body_limit -%>
   SecRequestBodyLimit <%= @modsec_body_limit %>
 <% end -%>

From 800c7ce7ba739df2c07d4b4b6d3bb2787ec6d950 Mon Sep 17 00:00:00 2001
From: FlatKey <FlatKey@users.noreply.github.com>
Date: Wed, 30 Mar 2016 21:20:53 +0200
Subject: [PATCH 0884/2267] Added vhost option SecRuleRemoveByMsg

---
 README.md                            | 16 ++++++++
 manifests/vhost.pp                   | 14 ++++++-
 spec/acceptance/mod_security_spec.rb | 61 ++++++++++++++++++++++++++++
 templates/vhost/_security.erb        |  9 ++++
 4 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f597284396..d4cc0a3a24 100644
--- a/README.md
+++ b/README.md
@@ -2263,6 +2263,22 @@ apache::vhost { 'sample.example.net':
 
 Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching. Default: undef.
 
+###### `modsec_disable_msgs`
+
+Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing removal of an Msg from a specific location. Default: undef.
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_msgs => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ],
+}
+```
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_msgs => { '/location1' => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ] },
+}
+```
+
 ###### `modsec_disable_tags`
 
 Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing removal of an Tag from a specific location. Default: undef.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bf1654fad4..bef9d31fae 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -130,6 +130,7 @@
   $modsec_disable_vhost        = undef,
   $modsec_disable_ids          = undef,
   $modsec_disable_ips          = undef,
+  $modsec_disable_msgs         = undef,
   $modsec_disable_tags         = undef,
   $modsec_body_limit           = undef,
   $jk_mounts                   = undef,
@@ -509,6 +510,16 @@
     }
   }
 
+  if $modsec_disable_msgs {
+    if is_hash($modsec_disable_msgs) {
+      $_modsec_disable_msgs = $modsec_disable_msgs
+    } elsif is_array($modsec_disable_msgs) {
+      $_modsec_disable_msgs = { '.*' => $modsec_disable_msgs }
+    } else {
+      fail("Apache::Vhost[${name}]: 'modsec_disable_msgs' must be either a Hash of location/Msgs or an Array of Msgs")
+    }
+  }
+
   if $modsec_disable_tags {
     if is_hash($modsec_disable_tags) {
       $_modsec_disable_tags = $modsec_disable_tags
@@ -993,9 +1004,10 @@
   # - $modsec_disable_vhost
   # - $modsec_disable_ids
   # - $modsec_disable_ips
+  # - $modsec_disable_msgs
   # - $modsec_disable_tags
   # - $modsec_body_limit
-  if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips or $modsec_disable_tags {
+  if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips or $modsec_disable_msgs or $modsec_disable_tags {
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
       order   => 320,
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index b1d1f5dd12..8a12296079 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -249,6 +249,67 @@ class { 'apache::mod::security': }
 
   end #mod_security should allow disabling by id
 
+  context "mod_security should allow disabling by msg" do
+    it 'succeeds in puppeting mod_security' do
+      pp= <<-EOS
+        host { 'modsec.example.com': ip => '127.0.0.1', }
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port    => '80',
+          docroot => '/var/www/html',
+        }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => 'Index page',
+        }
+        file { '/var/www/html/index2.html':
+          ensure  => file,
+          content => 'Page 2',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service($service_name) do
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{$mod_dir}/security.conf") do
+      it { is_expected.to contain "mod_security2.c" }
+    end
+
+    it 'should block query with SQL' do
+      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    end
+
+    it 'should disable mod_security per vhost' do
+      pp= <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsec.example.com':
+          port               => '80',
+          docroot            => '/var/www/html',
+          modsec_disable_msgs => [ 'Blind SQL Injection Attack' ],
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    it 'should return index page' do
+      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+        expect(r.stdout).to match(/Index page/)
+        expect(r.exit_code).to eq(0)
+      end
+    end
+
+  end #mod_security should allow disabling by msg
+
   context "mod_security should allow disabling by tag" do
     it 'succeeds in puppeting mod_security' do
       pp= <<-EOS
diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
index ca09d4944f..7f61da2eb2 100644
--- a/templates/vhost/_security.erb
+++ b/templates/vhost/_security.erb
@@ -15,6 +15,15 @@
   SecRule REMOTE_ADDR "<%= ips %>" "nolog,allow,id:1234123455"
   SecAction  "phase:2,pass,nolog,id:1234123456"
 <% end -%>
+<% if @_modsec_disable_msgs.is_a?(Hash) -%>
+<%   @_modsec_disable_msgs.each do |location,rules| -%>
+  <LocationMatch <%= location %>>
+<%     Array(rules).each do |rule| -%>
+    SecRuleRemoveByMsg "<%= rule %>"
+<%     end -%>
+  </LocationMatch>
+<%   end -%>
+<% end -%>
 <% if @_modsec_disable_tags.is_a?(Hash) -%>
 <%   @_modsec_disable_tags.each do |location,rules| -%>
   <LocationMatch <%= location %>>

From 1d2fe55b19f4e4316fe7c8e7e7842607b08da832 Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Thu, 31 Mar 2016 11:23:56 +0200
Subject: [PATCH 0885/2267] SSLCompression only available with apache 2.4.3

http://httpd.apache.org/docs/2.4/mod/mod_ssl.html#sslcompression
---
 templates/mod/ssl.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index a66d73312b..15aab10d78 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -10,9 +10,9 @@
   SSLPassPhraseDialog <%= @ssl_pass_phrase_dialog %>
   SSLSessionCache "shmcb:<%= @session_cache %>"
   SSLSessionCacheTimeout <%= @ssl_sessioncachetimeout %>
-  SSLCompression <%= scope.function_bool2httpd([@ssl_compression]) %>
   <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   Mutex <%= @_ssl_mutex %>
+  SSLCompression <%= scope.function_bool2httpd([@ssl_compression]) %>
   <%- else -%>
   SSLMutex <%= @_ssl_mutex %>
   <%- end -%>

From 5739a20b70c33583ee9743f5417eacb08dacf082 Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Thu, 31 Mar 2016 11:31:06 +0200
Subject: [PATCH 0886/2267] Fix in custom fact "apache_version" for
 OracleLinux.

The custom fact defined by lib/facter/apache_version.rb runs
"apachectl -v" and applies the following regular expression:

  ^Server version: Apache\/([\w\.]+) \(([\w ]+)\)

On OracleLinux 7.2, running apachectl -v produces the following output:

  Server version: Apache/2.4.6 ()
  Server built:   Nov 21 2015 05:34:59


The regex fails to match the output because it does not allow
for nothing inside the parentheses.  The following modified
regex matches properly:

  ^Server version: Apache\/([\w\.]+) \(([\w ]*)\)
---
 lib/facter/apache_version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index b84d776150..2790627307 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -2,7 +2,7 @@
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
-      %r{^Server version: Apache\/([\w\.]+) \(([\w ]+)\)}.match(apache_version)[1]
+      %r{^Server version: Apache\/([\w\.]+) \(([\w ]*)\)}.match(apache_version)[1]
     end
   end
 end

From 10632d8d40e4c18d6ddcd5e4587a7f94d2d5d1bd Mon Sep 17 00:00:00 2001
From: Matthew Gyurgyik <gyurgyikms@ornl.gov>
Date: Tue, 29 Mar 2016 08:11:03 -0400
Subject: [PATCH 0887/2267] (MODULES-3218) add auth_merging for directory
 enteries

---
 README.md                        | 4 ++++
 templates/vhost/_directories.erb | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 198a540e6c..4abe075d83 100644
--- a/README.md
+++ b/README.md
@@ -2804,6 +2804,10 @@ Sets the value for [AuthType](https://httpd.apache.org/docs/current/mod/mod_auth
 
 Sets the value for [AuthUserFile](https://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
 
+###### `auth_merging`
+
+Sets the value for [AuthMerging](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#authmerging), which determines if authorization logic should be combined
+
 ###### `custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the directory configuration.
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 9beb89865f..193955dccc 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -186,6 +186,9 @@
     <%- if directory['auth_group_file'] -%>
     AuthGroupFile <%= directory['auth_group_file'] %>
     <%- end -%>
+    <%- if directory['auth_merging'] -%>
+    AuthMerging <%= directory['auth_merging'] %>
+    <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>
     <%- end -%>

From 0b568a98b53b19672c00950cac900f180c19d21b Mon Sep 17 00:00:00 2001
From: Jason Hancock <jason.b.hancock@jpl.nasa.gov>
Date: Thu, 31 Mar 2016 11:28:33 -0700
Subject: [PATCH 0888/2267] Adding SSLProxyCheckPeerExpire support

---
 README.md                     | 4 ++++
 manifests/vhost.pp            | 6 ++++++
 spec/defines/vhost_spec.rb    | 3 +++
 templates/vhost/_sslproxy.erb | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 198a540e6c..19d9dcfb60 100644
--- a/README.md
+++ b/README.md
@@ -3320,6 +3320,10 @@ Sets the [SSLProxyMachinePeerCN](https://httpd.apache.org/docs/current/mod/mod_s
 
 Sets the [SSLProxyMachinePeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
 
+##### `ssl_proxy_check_peer_expire`
+
+Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not. Valid options: 'on', 'off'. Default: undef.
+
 ##### `ssl_options`
 
 Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given virtual host and can be a string or an array. Default: undef.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 90e99d1101..6843fc886d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -28,6 +28,7 @@
   $ssl_proxy_verify            = undef,
   $ssl_proxy_check_peer_cn     = undef,
   $ssl_proxy_check_peer_name   = undef,
+  $ssl_proxy_check_peer_expire = undef,
   $ssl_proxy_machine_cert      = undef,
   $ssl_proxy_protocol          = undef,
   $ssl_options                 = undef,
@@ -253,6 +254,10 @@
     validate_re($ssl_proxy_check_peer_name,'(^on$|^off$)',"${ssl_proxy_check_peer_name} is not permitted for ssl_proxy_check_peer_name. Allowed values are 'on' or 'off'.")
   }
 
+  if $ssl_proxy_check_peer_expire {
+    validate_re($ssl_proxy_check_peer_expire,'(^on$|^off$)',"${ssl_proxy_check_peer_expire} is not permitted for ssl_proxy_check_peer_expire. Allowed values are 'on' or 'off'.")
+  }
+
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -842,6 +847,7 @@
   # - $ssl_proxy_verify
   # - $ssl_proxy_check_peer_cn
   # - $ssl_proxy_check_peer_name
+  # - $ssl_proxy_check_peer_expire
   # - $ssl_proxy_machine_cert
   # - $ssl_proxy_protocol
   if $ssl_proxyengine {
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 405c2a21e8..8c069dd3c7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -157,6 +157,7 @@
           'ssl_proxy_verify'            => 'require',
           'ssl_proxy_check_peer_cn'     => 'on',
           'ssl_proxy_check_peer_name'   => 'on',
+          'ssl_proxy_check_peer_expire' => 'on',
           'ssl_proxyengine'             => true,
           'ssl_proxy_protocol'          => 'TLSv1.2',
 
@@ -476,6 +477,8 @@
         :content => /^\s+SSLProxyCheckPeerCN\s+on$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
         :content => /^\s+SSLProxyCheckPeerName\s+on$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+        :content => /^\s+SSLProxyCheckPeerExpire\s+on$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
         :content => /^\s+SSLProxyProtocol\s+TLSv1.2$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
index 0bc0a244a1..a92bab5524 100644
--- a/templates/vhost/_sslproxy.erb
+++ b/templates/vhost/_sslproxy.erb
@@ -11,6 +11,9 @@
   <%- if @ssl_proxy_check_peer_name -%>
   SSLProxyCheckPeerName   <%= @ssl_proxy_check_peer_name %>
   <%- end -%>
+  <%- if @ssl_proxy_check_peer_expire -%>
+  SSLProxyCheckPeerExpire   <%= @ssl_proxy_check_peer_expire %>
+  <%- end -%>
   <%- if @ssl_proxy_machine_cert -%>
   SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
   <%- end -%>

From b93680bb04e3047a558b134021f48dc9bcf27019 Mon Sep 17 00:00:00 2001
From: Jason Hancock <jason.b.hancock@jpl.nasa.gov>
Date: Thu, 31 Mar 2016 11:38:54 -0700
Subject: [PATCH 0889/2267] Fixing copy/paste errors in README for sslproxy
 directives

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 19d9dcfb60..4ca149d9f8 100644
--- a/README.md
+++ b/README.md
@@ -3314,11 +3314,11 @@ apache::vhost { 'sample.example.net':
 
 ##### `ssl_proxy_check_peer_cn`
 
-Sets the [SSLProxyMachinePeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
+Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
 
 ##### `ssl_proxy_check_peer_name`
 
-Sets the [SSLProxyMachinePeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
+Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
 
 ##### `ssl_proxy_check_peer_expire`
 

From 6a5df0637afd4d2e9c29ab3152f588d5b711aac7 Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Fri, 1 Apr 2016 11:40:03 +0200
Subject: [PATCH 0890/2267] add passenger_high_performance on the vhost level

---
 README.md                      | 4 ++++
 manifests/vhost.pp             | 3 ++-
 spec/defines/vhost_spec.rb     | 1 +
 templates/vhost/_passenger.erb | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4abe075d83..b436ad53f5 100644
--- a/README.md
+++ b/README.md
@@ -2330,6 +2330,10 @@ Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/
 
 Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser), the running user for sandboxing applications.
 
+##### `passenger_high_performance`
+
+Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter. Valid options: 'true', 'false'. Default: undef.
+
 ##### `php_flags & values`
 
 Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Default: '{}'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 90e99d1101..35fe6eacc2 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -126,6 +126,7 @@
   $passenger_start_timeout     = undef,
   $passenger_pre_start         = undef,
   $passenger_user              = undef,
+  $passenger_high_performance  = undef,
   $add_default_charset         = undef,
   $modsec_disable_vhost        = undef,
   $modsec_disable_ids          = undef,
@@ -277,7 +278,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user {
+  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance {
     include ::apache::mod::passenger
   }
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 405c2a21e8..3a809de9db 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -338,6 +338,7 @@
           'passenger_min_instances'     => '1',
           'passenger_start_timeout'     => '600',
           'passenger_pre_start'         => 'http://localhost/myapp',
+          'passenger_high_performance'  => true,
           'passenger_user'              => 'sandbox',
           'add_default_charset'         => 'UTF-8',
           'jk_mounts'                   => [
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index 91820d3634..becea9c4d0 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -19,3 +19,6 @@
 <% if @passenger_user -%>
   PassengerUser <%= @passenger_user %>
 <% end -%>
+<% if @passenger_high_performance -%>
+  PassengerHighPerformance <%= scope.function_bool2httpd([@passenger_high_performance]) %>
+<% end -%>

From 323b601ea53717e806e3685d6639aaea299d49e6 Mon Sep 17 00:00:00 2001
From: Samuel Barabas <samuel@owee.de>
Date: Fri, 1 Apr 2016 18:43:01 +0200
Subject: [PATCH 0891/2267] Add parameter passanger_log_level

---
 README.md                          | 4 ++++
 manifests/mod/passenger.pp         | 2 ++
 spec/classes/mod/passenger_spec.rb | 6 ++++++
 templates/mod/passenger.conf.erb   | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 2b7f3da501..f1875481ce 100644
--- a/README.md
+++ b/README.md
@@ -2311,6 +2311,10 @@ Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/re
 
 By default, Passenger log messages are written to the Apache global error log. With [PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile), you can configure those messages to be logged to a different file. This option is only available since Passenger 5.0.5.
 
+##### `passenger_log_level`
+
+This option allows to specify how much information should be written to the log file. If not set, [PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel) will not show up in the configuration file and the defaults are used. For Passenger > 3.0.0 the default is '0', since 5.0.0 it's '3'.
+
 ##### `passenger_ruby`
 
 Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby), the Ruby interpreter to use for the application, on this virtual host.
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index e97577d98f..e127d78267 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -17,6 +17,7 @@
   $passenger_use_global_queue       = undef,
   $passenger_app_env                = undef,
   $passenger_log_file               = undef,
+  $passenger_log_level              = undef,
   $manage_repo                      = true,
   $mod_package                      = undef,
   $mod_package_ensure               = undef,
@@ -92,6 +93,7 @@
   # - $passenger_stat_throttle_rate
   # - $passenger_use_global_queue
   # - $passenger_log_file
+  # - $passenger_log_level
   # - $passenger_app_env
   # - $rack_autodetect
   # - $rails_autodetect
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 70ce4ea60d..e9e754202c 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -128,6 +128,12 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogFile /var/log/apache2/passenger.log$}) }
     end
+    describe "with passenger_log_level => 3" do
+      let :params do
+        { :passenger_log_level => 3 }
+      end
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogLevel 3$}) }
+    end
     describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
       let :params do
         { :mod_path => '/usr/lib/foo/mod_foo.so' }
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 8a3e9d4f37..6eac6fe649 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -49,4 +49,7 @@
   <%- if @passenger_log_file -%>
   PassengerLogFile <%= @passenger_log_file %>
   <%- end -%>
+  <%- if @passenger_log_level -%>
+  PassengerLogLevel <%= @passenger_log_level %>
+  <%- end -%>
 </IfModule>

From 71958f2b922cdfaff8f3f2d9fae05386475d7a3f Mon Sep 17 00:00:00 2001
From: Micha Krause <micha@noris.net>
Date: Wed, 23 Mar 2016 11:03:01 +0100
Subject: [PATCH 0892/2267] Added vhost option fastcgi_idle_timeout

---
 README.md                    | 4 ++++
 manifests/vhost.pp           | 2 ++
 spec/defines/vhost_spec.rb   | 1 +
 templates/vhost/_fastcgi.erb | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2b7f3da501..551287462f 100644
--- a/README.md
+++ b/README.md
@@ -2098,6 +2098,10 @@ Specifies if the virtual host is present or absent. Valid options: 'absent', 'pr
 
 Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid options must either begin with a '/' or be 'disabled'. Default: undef.
 
+#####`fastcgi_idle_timeout`
+
+If using fastcgi, this option sets the timeout for the server to respond.
+
 ##### `filters`
 
 [Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 90e99d1101..abe60a18eb 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -114,6 +114,7 @@
   $fastcgi_server              = undef,
   $fastcgi_socket              = undef,
   $fastcgi_dir                 = undef,
+  $fastcgi_idle_timeout        = undef,
   $additional_includes         = [],
   $use_optional_includes       = $::apache::use_optional_includes,
   $apache_version              = $::apache::apache_version,
@@ -933,6 +934,7 @@
   # - $fastcgi_server
   # - $fastcgi_socket
   # - $fastcgi_dir
+  # - $fastcgi_idle_timeout
   # - $apache_version
   if $fastcgi_server or $fastcgi_dir {
     concat::fragment { "${name}-fastcgi":
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 405c2a21e8..6ecee9a4cf 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -327,6 +327,7 @@
           'fastcgi_server'              => 'localhost',
           'fastcgi_socket'              => '/tmp/fastcgi.socket',
           'fastcgi_dir'                 => '/tmp',
+          'fastcgi_idle_timeout'        => '120',
           'additional_includes'         => '/custom/path/includes',
           'apache_version'              => '2.4',
           'use_optional_includes'       => true,
diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
index 3a2baa5596..b4718391b7 100644
--- a/templates/vhost/_fastcgi.erb
+++ b/templates/vhost/_fastcgi.erb
@@ -1,6 +1,7 @@
 <% if @fastcgi_server -%>
 
-  FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket %>
+  FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket -%>
+<%   unless @fastcgi_idle_timeout.nil? %> -idle-timeout <%= @fastcgi_idle_timeout %><% end %>
 <% end -%>
 <% if @fastcgi_dir -%>
 

From b97be96e49582943bd64cebd3038f8e8a683d7ee Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Mon, 4 Apr 2016 12:12:48 +0200
Subject: [PATCH 0893/2267] Add spec test for apache_version with an empty OS

---
 spec/unit/apache_version_spec.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/apache_version_spec.rb
index 30f6ef9914..c62339da41 100644
--- a/spec/unit/apache_version_spec.rb
+++ b/spec/unit/apache_version_spec.rb
@@ -17,4 +17,17 @@
       end
     end
   end
+
+  describe 'apache_version with empty OS' do
+    context 'with value' do
+      before :each do
+        Facter::Util::Resolution.stubs(:which).with('apachectl').returns(true)
+        Facter::Util::Resolution.stubs(:exec).with('apachectl -v 2>&1').returns('Server version: Apache/2.4.6 ()
+                                                                                  Server built:   Nov 21 2015 05:34:59')
+      end
+      it do
+        expect(Facter.fact(:apache_version).value).to eq('2.4.6')
+      end
+    end
+  end
 end

From 1f174bcfd8ac6809ad02aaebe5497ad9ddd7ba3d Mon Sep 17 00:00:00 2001
From: FlatKey <FlatKey@users.noreply.github.com>
Date: Mon, 28 Mar 2016 00:28:20 +0200
Subject: [PATCH 0894/2267] Configurability of Collaborative Detection Blocking
 for OWASP Core Rule Set

---
 README.md                           | 1 +
 manifests/mod/security.pp           | 1 +
 templates/mod/security_crs.conf.erb | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 328c98ca21..6863383d08 100644
--- a/README.md
+++ b/README.md
@@ -1710,6 +1710,7 @@ ${modsec\_dir}/activated\_rules.
 - `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. Default: '1500'
 - `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
 - `audit_log_parts`: Sets the sections to be put in the [audit log][]. Default: 'ABIJDEFHZ'
+- `anomaly_score_blocking`: De-/Activates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set. Default: off.
 
 ##### Class: `apache::mod::wsgi`
 
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index dc06786f33..5a6aa3227f 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -11,6 +11,7 @@
   $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
   $restricted_headers    = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
   $secdefaultaction           = 'deny',
+  $anomaly_score_blocking     = 'off',
 ) inherits ::apache::params {
   include ::apache
 
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 8c5a83710c..6b4bb6f50c 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -143,11 +143,11 @@ SecAction \
 #
 # If you want to use anomaly scoring mode, then uncomment this line.
 #
-#SecAction \
+SecAction \
   "id:'900004', \
   phase:1, \
   t:none, \
-  setvar:tx.anomaly_score_blocking=on, \
+  setvar:tx.anomaly_score_blocking=<%= @anomaly_score_blocking -%>, \
   nolog, \
   pass"
 

From a43cd35a675f3258bbdc15d0110c466ba71c0a1a Mon Sep 17 00:00:00 2001
From: Zarne <hans.moulron@francetv.fr>
Date: Thu, 7 Apr 2016 20:17:58 +0200
Subject: [PATCH 0895/2267] allow include in vhost directory (#1366)

* allow include in vhost directory

* update include in vhost directory

* add some test for include in directory

* add some documentation for additional include in vhost directory
---
 README.md                        | 14 ++++++++++++++
 spec/defines/vhost_spec.rb       |  9 +++++++++
 templates/vhost/_directories.erb |  5 +++++
 3 files changed, 28 insertions(+)

diff --git a/README.md b/README.md
index 328c98ca21..1e6c57d7b7 100644
--- a/README.md
+++ b/README.md
@@ -3226,6 +3226,20 @@ apache::vhost { 'secure.example.net':
   ],
 }
 ```
+###### `additional_includes`
+
+Specifies paths to additional static, specific Apache configuration files in virtual host directories. Valid options: a array of string path.
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/different/dir',
+      additional_includes => [ '/custom/path/includes', '/custom/path/another_includes', ],
+    },
+  ],
+}
+```
 
 #### SSL parameters for `apache::vhost`
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8d50a2ab76..8fc9250143 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -187,6 +187,11 @@
               'provider' => 'files',
               'require'  => [ 'valid-user', 'all denied', ],
             },
+            {
+                'path'     => '/var/www/files',
+                'provider' => 'files',
+                'additional_includes'  => [ '/custom/path/includes', '/custom/path/another_includes', ],
+            },
             {
               'path'     => '/var/www/files',
               'provider' => 'files',
@@ -418,6 +423,10 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+<Proxy "\*">$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Include\s'\/custom\/path\/includes'$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          :content => /^\s+Include\s'\/custom\/path\/another_includes'$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Require valid-user$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 193955dccc..7bd3377e76 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -142,6 +142,11 @@
     <%- if directory['directoryindex'] and directory['directoryindex'] != '' -%>
     DirectoryIndex <%= directory['directoryindex'] %>
     <%- end -%>
+    <%- if directory['additional_includes'] and ! directory['additional_includes'].empty? -%>
+      <%- directory['additional_includes'].each do |include| -%>
+    Include '<%= "#{include}" %>'
+      <%- end -%>
+    <%- end -%>
     <%- if directory['error_documents'] and ! directory['error_documents'].empty? -%>
       <%- [directory['error_documents']].flatten.compact.each do |error_document| -%>
     ErrorDocument <%= error_document['error_code'] %> <%= error_document['document'] %>

From 8e74af7a53f56cf85eedcaee310aefe581313979 Mon Sep 17 00:00:00 2001
From: Michael Ly <lymichaels@gmail.com>
Date: Fri, 8 Apr 2016 04:24:30 -0500
Subject: [PATCH 0896/2267] Allow for pagespeed mod to automatically be updated
 to the latest version (#1422)

* Allow for optionally ensuring to have the lastest pagespeed package, Restart apache if there is a package update
---
 manifests/mod.pp           | 1 +
 manifests/mod/pagespeed.pp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 014aa274ae..347179d40b 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -76,6 +76,7 @@
       ensure  => $package_ensure,
       require => Package['httpd'],
       before  => $package_before,
+      notify  => Class['apache::service'],
     }
   }
 
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index a6506007bb..052dad0b17 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -33,6 +33,7 @@
   $message_buffer_size           = 100000,
   $additional_configuration      = {},
   $apache_version                = undef,
+  $package_ensure                = undef,
 ){
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
@@ -42,7 +43,8 @@
   }
 
   apache::mod { 'pagespeed':
-    lib => $_lib,
+    lib            => $_lib,
+    package_ensure => $package_ensure,
   }
 
   # Template uses $_apache_version

From cbd2c265ddbe9b7f4f6eb4443ded15f69af72f92 Mon Sep 17 00:00:00 2001
From: FlatKey <FlatKey@users.noreply.github.com>
Date: Sat, 26 Mar 2016 05:42:09 +0100
Subject: [PATCH 0897/2267] Configurability of Collaborative Detection
 Threshold Levels for OWASP Core Rule Set

---
 README.md                           | 2 ++
 manifests/mod/security.pp           | 2 ++
 templates/mod/security_crs.conf.erb | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 97e0f6b7b9..1a4efd591c 100644
--- a/README.md
+++ b/README.md
@@ -1711,6 +1711,8 @@ ${modsec\_dir}/activated\_rules.
 - `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
 - `audit_log_parts`: Sets the sections to be put in the [audit log][]. Default: 'ABIJDEFHZ'
 - `anomaly_score_blocking`: De-/Activates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set. Default: off.
+- `inbound_anomaly_threshold`: Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '5'.
+- `outbound_anomaly_threshold`: Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '4'.
 
 ##### Class: `apache::mod::wsgi`
 
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 5a6aa3227f..745957fc26 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -12,6 +12,8 @@
   $restricted_headers    = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
   $secdefaultaction           = 'deny',
   $anomaly_score_blocking     = 'off',
+  $inbound_anomaly_threshold  = '5',
+  $outbound_anomaly_threshold = '4',
 ) inherits ::apache::params {
   include ::apache
 
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 6b4bb6f50c..d5e25e182c 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -118,7 +118,7 @@ SecAction \
   "id:'900002', \
   phase:1, \
   t:none, \
-  setvar:tx.inbound_anomaly_score_level=5, \
+  setvar:tx.inbound_anomaly_score_level=<%= @inbound_anomaly_threshold -%>, \
   nolog, \
   pass"
 
@@ -127,7 +127,7 @@ SecAction \
   "id:'900003', \
   phase:1, \
   t:none, \
-  setvar:tx.outbound_anomaly_score_level=4, \
+  setvar:tx.outbound_anomaly_score_level=<%= @outbound_anomaly_threshold -%>, \
   nolog, \
   pass"
 

From b9926431a65722138a64370cef8fdffee365e4b7 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 25 Mar 2016 16:40:59 +0100
Subject: [PATCH 0898/2267] Load mod_xml2enc on Apache >= 2.4 on Debian

With improved testsuite.
---
 manifests/mod/proxy_html.pp         |  3 +++
 spec/classes/mod/proxy_html_spec.rb | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index cceaf0b755..f4f4b44111 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -19,6 +19,9 @@
         '10'    => ['/usr/lib/libxml2.so.2'],
         default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
       }
+      if versioncmp($::apache::apache_version, '2.4') >= 0 {
+        ::apache::mod { 'xml2enc': }
+      }
     }
   }
 
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 066ae239a0..0d70276c26 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -32,9 +32,29 @@
     context "on squeeze" do
       let(:facts) { super().merge({ :operatingsystemrelease => '6' }) }
       it_behaves_like "debian", ['/usr/lib/libxml2.so.2']
+      it { is_expected.to_not contain_apache__mod('xml2enc') }
     end
     context "on wheezy" do
       let(:facts) { super().merge({ :operatingsystemrelease => '7' }) }
+      it { is_expected.to_not contain_apache__mod('xml2enc') }
+      context "i386" do
+        let(:facts) { super().merge({
+          :hardwaremodel => 'i686',
+          :architecture  => 'i386'
+        })}
+        it_behaves_like "debian", ["/usr/lib/i386-linux-gnu/libxml2.so.2"]
+      end
+      context "x64" do
+        let(:facts) { super().merge({
+          :hardwaremodel => 'x86_64',
+          :architecture  => 'amd64'
+        })}
+        it_behaves_like "debian", ["/usr/lib/x86_64-linux-gnu/libxml2.so.2"]
+      end
+    end
+    context "on jessie" do
+      let(:facts) { super().merge({ :operatingsystemrelease => '8' }) }
+      it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) }
       context "i386" do
         let(:facts) { super().merge({
           :hardwaremodel => 'i686',
@@ -67,6 +87,7 @@
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
     it { is_expected.to contain_package("mod_proxy_html") }
+    it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) }
   end
   context "on a FreeBSD OS", :compile do
     let :facts do
@@ -83,6 +104,7 @@
     end
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
+    it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) }
     it { is_expected.to contain_package("www/mod_proxy_html") }
   end
   context "on a Gentoo OS", :compile do
@@ -100,6 +122,7 @@
     end
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
+    it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) }
     it { is_expected.to contain_package("www-apache/mod_proxy_html") }
   end
 end

From ccd49ca5e802a963902baf47291561391ae007f9 Mon Sep 17 00:00:00 2001
From: Matt Peter <mpeter@gmail.com>
Date: Wed, 13 Apr 2016 02:31:08 -0400
Subject: [PATCH 0899/2267] fix incorrect use of .join() with newlines (#1425)

---
 templates/mod/pagespeed.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
index d1ce642976..56e72fe29d 100644
--- a/templates/mod/pagespeed.conf.erb
+++ b/templates/mod/pagespeed.conf.erb
@@ -94,7 +94,7 @@ ModPagespeedMessageBufferSize <%= @message_buffer_size %>
 </Location>
 
 <% if @additional_configuration.is_a? Array -%>
-<%= @additional_configuration.join('\n') %>
+<%= @additional_configuration.join("\n") %>
 <% else -%>
 <% @additional_configuration.each_pair do |key, value| -%>
 <%= key %> <%= value %>

From 71cb7302f2d83d5a293dc22f22bb0b955b66684c Mon Sep 17 00:00:00 2001
From: Michael Hess <mlhess@umich.edu>
Date: Wed, 13 Apr 2016 02:54:31 -0400
Subject: [PATCH 0900/2267] add support for fcgi (#1387)

* add support for fcgi
* Update README.md
---
 README.md                   | 1 +
 manifests/mod/proxy_fcgi.pp | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 manifests/mod/proxy_fcgi.pp

diff --git a/README.md b/README.md
index f77e22055e..4f0112eda2 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,7 @@
 [`apache::mod::passenger`]: #class-apachemodpassenger
 [`apache::mod::peruser`]: #class-apachemodperuser
 [`apache::mod::prefork`]: #class-apachemodprefork
+[`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi
 [`apache::mod::proxy_html`]: #class-apachemodproxy_html
 [`apache::mod::security`]: #class-apachemodsecurity
 [`apache::mod::shib`]: #class-apachemodshib
diff --git a/manifests/mod/proxy_fcgi.pp b/manifests/mod/proxy_fcgi.pp
new file mode 100644
index 0000000000..21473eb762
--- /dev/null
+++ b/manifests/mod/proxy_fcgi.pp
@@ -0,0 +1,4 @@
+class apache::mod::proxy_fcgi {
+  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_fcgi']
+  ::apache::mod { 'proxy_fcgi': }
+}

From 410fc358d48e43a8df0dfa93880bd868ec03ca8c Mon Sep 17 00:00:00 2001
From: Simon Beirnaert <simon.beirnaert@gmail.com>
Date: Mon, 4 Apr 2016 18:01:16 +0200
Subject: [PATCH 0901/2267] Allow package names to be specified for mod_proxy,
 mod_ldap, and mod_authnz_ldap

---
 manifests/mod/authnz_ldap.pp | 5 ++++-
 manifests/mod/ldap.pp        | 5 ++++-
 manifests/mod/proxy.pp       | 7 +++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 45fcc997f5..0bcd1b887c 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,10 +1,13 @@
 class apache::mod::authnz_ldap (
   $verify_server_cert = true,
   $verifyServerCert   = undef,
+  $package_name       = undef,
 ) {
   include ::apache
   include '::apache::mod::ldap'
-  ::apache::mod { 'authnz_ldap': }
+  ::apache::mod { 'authnz_ldap':
+    package => $package_name,
+  }
 
   if $verifyServerCert {
     warning('Class[\'apache::mod::authnz_ldap\'] parameter verifyServerCert is deprecated in favor of verify_server_cert')
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index d842668361..c3fbb2611c 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -1,5 +1,6 @@
 class apache::mod::ldap (
   $apache_version                = undef,
+  $package_name                  = undef,
   $ldap_trusted_global_cert_file = undef,
   $ldap_trusted_global_cert_type = 'CA_BASE64',
   $ldap_shared_cache_size        = undef,
@@ -13,7 +14,9 @@
   if ($ldap_trusted_global_cert_file) {
     validate_string($ldap_trusted_global_cert_type)
   }
-  ::apache::mod { 'ldap': }
+  ::apache::mod { 'ldap':
+    package => $package_name,
+  }
   # Template uses $_apache_version
   file { 'ldap.conf':
     ensure  => file,
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 1f70938921..b69a17e9d9 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -1,11 +1,14 @@
 class apache::mod::proxy (
   $proxy_requests = 'Off',
-  $allow_from = undef,
+  $allow_from     = undef,
   $apache_version = undef,
+  $package_name   = undef,
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
-  ::apache::mod { 'proxy': }
+  ::apache::mod { 'proxy':
+    package => $package_name,
+  }
   # Template uses $proxy_requests, $_apache_version
   file { 'proxy.conf':
     ensure  => file,

From 138c5dba0c6c066f5da3c8ca23da1b1d5e25be68 Mon Sep 17 00:00:00 2001
From: Simon Beirnaert <simon.beirnaert@gmail.com>
Date: Thu, 14 Apr 2016 15:01:29 +0200
Subject: [PATCH 0902/2267] Add/improve documentation for mod_proxy, mod_ldap,
 mod_authnz_ldap

---
 README.md | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 68e9793874..51fbe5291d 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@
 [`apache::mod::alias`]: #class-apachemodalias
 [`apache::mod::auth_cas`]: #class-apachemodauth_cas
 [`apache::mod::auth_mellon`]: #class-apachemodauth_mellon
+[`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap
 [`apache::mod::disk_cache`]: #class-apachemoddisk_cache
 [`apache::mod::event`]: #class-apachemodevent
 [`apache::mod::ext_filter`]: #class-apachemodext_filter
@@ -55,6 +56,7 @@
 [`apache::mod::passenger`]: #class-apachemodpassenger
 [`apache::mod::peruser`]: #class-apachemodperuser
 [`apache::mod::prefork`]: #class-apachemodprefork
+[`apache::mod::proxy`]: #class-apachemodproxy
 [`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi
 [`apache::mod::proxy_html`]: #class-apachemodproxy_html
 [`apache::mod::security`]: #class-apachemodsecurity
@@ -1264,7 +1266,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `auth_kerb`
 * `authn_core`
 * `authn_file`
-* `authnz_ldap`\*
+* `authnz_ldap`\* (see [`apache::mod::authnz_ldap`][])
 * `authz_default`
 * `authz_user`
 * `autoindex`
@@ -1289,7 +1291,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `include`
 * `info`\*
 * `itk`
-* `ldap`
+* `ldap` (see [`apache::mod::ldap`][])
 * `mime`
 * `mime_magic`\*
 * `negotiation`
@@ -1300,7 +1302,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `peruser`
 * `php` (requires [`mpm_module`][] set to `prefork`)
 * `prefork`\*
-* `proxy`\*
+* `proxy`\* (see [`apache::mod::proxy`][])
 * `proxy_ajp`
 * `proxy_balancer`
 * `proxy_html` (see [`apache::mod::proxy_html`][])
@@ -1417,6 +1419,15 @@ class{ 'apache::mod::auth_mellon':
 - `mellon_post_size`: Maximum size of post requests. Default: undef.
 - `mellon_post_count`: Maximum number of post requests. Default: undef.
 
+##### Class: `apache::mod::authnz_ldap`
+
+Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to generate its configuration.
+
+**Parameters within `apache::mod::authnz_ldap`**:
+
+- `package_name`: Default: `undef`.
+- `verify_server_cert`: Default: `undef`.
+
 ##### Class: `apache::mod::deflate`
 
 Installs and configures [`mod_deflate`][].
@@ -1543,6 +1554,7 @@ class { 'apache::mod::ldap':
 
 **Parameters within `apache::mod::ldap`:**
 
+- `apache_version`: The installed Apache version. Defaults to `undef`.
 - `ldap_trusted_global_cert_file`: Path and file name of the trusted CA certificates to use when establishing SSL or TLS connections to an LDAP server.
 - `ldap_trusted_global_cert_type`: The global trust certificate format. Default: 'CA_BASE64'.
 - `ldap_shared_cache_size`: Size in bytes of the shared-memory cache.
@@ -1550,6 +1562,7 @@ class { 'apache::mod::ldap':
 - `ldap_cache_ttl`: Time that cached items remain valid.
 - `ldap_opcache_entries`: Number of entries used to cache LDAP compare operations.
 - `ldap_opcache_ttl`: Time that entries in the operation cache remain valid.
+- `package_name`: Custom package name. Defaults to `undef`.
 
 ##### Class: `apache::mod::negotiation`
 
@@ -1616,6 +1629,17 @@ TODO: The parameters section is incomplete.
 
 **Note**: The passenger module isn't available on RH/CentOS without providing dependency packages provided by EPEL and mod\_passengers own custom repository. See the `manage_repo` parameter above and [https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()
 
+##### Class: `apache::mod::proxy`
+
+Installs `mod_proxy` and uses the `proxy.conf.erb` template to generate its configuration.
+
+**Parameters within `apache::mod::proxy`**:
+
+- `allow_from`: Default: `undef`.
+- `apache_version`: Default: `undef`.
+- `package_name`: Default: `undef`.
+- `proxy_requests`: Default: 'Off'.
+
 ##### Class: `apache::mod::php`
 
 Installs and configures [`mod_php`][].

From 20c85511a47fd389970c53e2c7e9f59e150ef780 Mon Sep 17 00:00:00 2001
From: FlatKey <FlatKey@users.noreply.github.com>
Date: Sat, 26 Mar 2016 04:16:22 +0100
Subject: [PATCH 0903/2267] Configurability of Collaborative Detection Severity
 Levels for OWASP Core Rule Set

---
 README.md                           |  4 ++++
 manifests/mod/security.pp           | 24 ++++++++++++++----------
 templates/mod/security_crs.conf.erb |  8 ++++----
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 51fbe5291d..ded6f75d19 100644
--- a/README.md
+++ b/README.md
@@ -1738,6 +1738,10 @@ ${modsec\_dir}/activated\_rules.
 - `anomaly_score_blocking`: De-/Activates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set. Default: off.
 - `inbound_anomaly_threshold`: Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '5'.
 - `outbound_anomaly_threshold`: Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '4'.
+- `critical_anomaly_score`: Sets the scoring points of the critical severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '5'.
+- `error_anomaly_score`: Sets the scoring points of the error severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '4'.
+- `warning_anomaly_score`: Sets the scoring points of the warning severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '3'.
+- `notice_anomaly_score`: Sets the scoring points of the notice severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '2'.
 
 ##### Class: `apache::mod::wsgi`
 
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 745957fc26..a4fe57f89a 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -1,19 +1,23 @@
 class apache::mod::security (
-  $crs_package           = $::apache::params::modsec_crs_package,
-  $activated_rules       = $::apache::params::modsec_default_rules,
-  $modsec_dir            = $::apache::params::modsec_dir,
-  $modsec_secruleengine  = $::apache::params::modsec_secruleengine,
-  $audit_log_parts       = $::apache::params::modsec_audit_log_parts,
-  $secpcrematchlimit = $::apache::params::secpcrematchlimit,
+  $crs_package                = $::apache::params::modsec_crs_package,
+  $activated_rules            = $::apache::params::modsec_default_rules,
+  $modsec_dir                 = $::apache::params::modsec_dir,
+  $modsec_secruleengine       = $::apache::params::modsec_secruleengine,
+  $audit_log_parts            = $::apache::params::modsec_audit_log_parts,
+  $secpcrematchlimit          = $::apache::params::secpcrematchlimit,
   $secpcrematchlimitrecursion = $::apache::params::secpcrematchlimitrecursion,
-  $allowed_methods       = 'GET HEAD POST OPTIONS',
-  $content_types         = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
-  $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
-  $restricted_headers    = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
+  $allowed_methods            = 'GET HEAD POST OPTIONS',
+  $content_types              = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
+  $restricted_extensions      = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
+  $restricted_headers         = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
   $secdefaultaction           = 'deny',
   $anomaly_score_blocking     = 'off',
   $inbound_anomaly_threshold  = '5',
   $outbound_anomaly_threshold = '4',
+  $critical_anomaly_score     = '5',
+  $error_anomaly_score        = '4',
+  $warning_anomaly_score      = '3',
+  $notice_anomaly_score       = '2',
 ) inherits ::apache::params {
   include ::apache
 
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index d5e25e182c..d5eb70a249 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -89,10 +89,10 @@ SecAction \
   "id:'900001', \
   phase:1, \
   t:none, \
-  setvar:tx.critical_anomaly_score=5, \
-  setvar:tx.error_anomaly_score=4, \
-  setvar:tx.warning_anomaly_score=3, \
-  setvar:tx.notice_anomaly_score=2, \
+  setvar:tx.critical_anomaly_score=<%= @critical_anomaly_score -%>, \
+  setvar:tx.error_anomaly_score=<%= @error_anomaly_score -%>, \
+  setvar:tx.warning_anomaly_score=<%= @warning_anomaly_score -%>, \
+  setvar:tx.notice_anomaly_score=<%= @notice_anomaly_score -%>, \
   nolog, \
   pass"
 

From 1329e0e61aff45d6cff5f18e6ba33c2a33687b67 Mon Sep 17 00:00:00 2001
From: pingtux <pingtux@users.noreply.github.com>
Date: Fri, 15 Apr 2016 11:42:10 +0200
Subject: [PATCH 0904/2267] Fixed trailing slash in lib_path on Suse

---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 1cb2f40f5e..bed1a953f2 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -508,7 +508,7 @@
     $pidfile             = '/var/run/httpd2.pid'
     $logroot             = '/var/log/apache2'
     $logroot_mode        = undef
-    $lib_path            = '/usr/lib64/apache2-prefork/'
+    $lib_path            = '/usr/lib64/apache2-prefork'
     $mpm_module          = 'prefork'
     $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'

From 111247c8d4004c68c0a39be376283a65ec107dbb Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 13 Apr 2016 20:49:34 +0100
Subject: [PATCH 0905/2267] Update to newest modulesync_configs [9ca280f]

---
 .travis.yml                                   | 19 +++++++++++++++++--
 Gemfile                                       |  1 -
 Rakefile                                      |  9 ---------
 spec/acceptance/nodesets/centos-59-x64.yml    | 10 ----------
 spec/acceptance/nodesets/centos-64-x64-pe.yml | 12 ------------
 spec/acceptance/nodesets/centos-65-x64.yml    | 10 ----------
 spec/acceptance/nodesets/centos-7-x64.yml     | 10 ++++++++++
 spec/acceptance/nodesets/centos-70-x64.yml    | 11 -----------
 spec/acceptance/nodesets/debian-607-x64.yml   | 11 -----------
 spec/acceptance/nodesets/debian-70rc1-x64.yml | 11 -----------
 spec/acceptance/nodesets/debian-73-i386.yml   | 11 -----------
 spec/acceptance/nodesets/debian-73-x64.yml    | 11 -----------
 .../{debian-82-x64.yml => debian-8-x64.yml}   | 10 +++++-----
 spec/acceptance/nodesets/default.yml          | 14 +++++++-------
 spec/acceptance/nodesets/docker/centos-7.yml  | 12 ++++++++++++
 spec/acceptance/nodesets/docker/debian-8.yml  | 11 +++++++++++
 .../nodesets/docker/ubuntu-14.04.yml          | 12 ++++++++++++
 spec/acceptance/nodesets/fedora-18-x64.yml    | 11 -----------
 .../nodesets/ubuntu-server-10044-x64.yml      | 10 ----------
 .../nodesets/ubuntu-server-12042-x64.yml      | 10 ----------
 .../nodesets/ubuntu-server-1310-x64.yml       | 11 -----------
 .../nodesets/ubuntu-server-1404-x64.yml       | 11 -----------
 22 files changed, 74 insertions(+), 164 deletions(-)
 delete mode 100644 spec/acceptance/nodesets/centos-59-x64.yml
 delete mode 100644 spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 spec/acceptance/nodesets/centos-65-x64.yml
 create mode 100644 spec/acceptance/nodesets/centos-7-x64.yml
 delete mode 100644 spec/acceptance/nodesets/centos-70-x64.yml
 delete mode 100644 spec/acceptance/nodesets/debian-607-x64.yml
 delete mode 100644 spec/acceptance/nodesets/debian-70rc1-x64.yml
 delete mode 100644 spec/acceptance/nodesets/debian-73-i386.yml
 delete mode 100644 spec/acceptance/nodesets/debian-73-x64.yml
 rename spec/acceptance/nodesets/{debian-82-x64.yml => debian-8-x64.yml} (66%)
 create mode 100644 spec/acceptance/nodesets/docker/centos-7.yml
 create mode 100644 spec/acceptance/nodesets/docker/debian-8.yml
 create mode 100644 spec/acceptance/nodesets/docker/ubuntu-14.04.yml
 delete mode 100644 spec/acceptance/nodesets/fedora-18-x64.yml
 delete mode 100644 spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
 delete mode 100644 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

diff --git a/.travis.yml b/.travis.yml
index e366e0ee2e..4e2c66df32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,18 +3,33 @@
 sudo: false
 language: ruby
 cache: bundler
-bundler_args: --without system_tests
-script: "bundle exec rake validate lint parallel_spec"
+script: "bundle exec rake validate lint spec"
 matrix:
   fast_finish: true
   include:
   - rvm: 2.1.6
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+    script: bundle exec rake beaker
+    services: docker
+    sudo: required
+  - rvm: 2.1.6
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+    script: bundle exec rake beaker
+    services: docker
+    sudo: required
+  - rvm: 2.1.6
+    bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
   - rvm: 2.1.5
+    bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
+    bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
+    bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index 21c2dbc3ea..e490bc9b98 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,6 @@ group :development, :unit_tests do
   gem 'puppetlabs_spec_helper',    :require => false
   gem 'rspec-puppet', '>= 2.3.2',  :require => false
   gem 'simplecov',                 :require => false
-  gem 'parallel_tests',            :require => false
 end
 group :system_tests do
   gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
diff --git a/Rakefile b/Rakefile
index 7ef974b94c..1e2be6663c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,8 +1,6 @@
 require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'parallel_tests'
-require 'parallel_tests/cli'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
@@ -43,10 +41,3 @@ task :gen_nodeset do
   end
   puts nodeset
 end
-
-desc "Parallel spec tests"
-task :parallel_spec do
-  Rake::Task[:spec_prep].invoke
-  ParallelTests::CLI.new.run('--type test -t rspec spec/classes spec/defines spec/unit'.split)
-  Rake::Task[:spec_clean].invoke
-end
diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index 2ad90b86aa..0000000000
--- a/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b9..0000000000
--- a/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
deleted file mode 100644
index 4e2cb809e8..0000000000
--- a/spec/acceptance/nodesets/centos-65-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml
new file mode 100644
index 0000000000..1a40c8950f
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-7-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  centos-7-x64:
+    roles:
+      - agent
+      - default
+    platform: redhat-7-x86_64
+    hypervisor: vagrant
+    box: puppetlabs/centos-7.2-64-nocm
+CONFIG:
+  type: foss
diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml
deleted file mode 100644
index 2ab0052043..0000000000
--- a/spec/acceptance/nodesets/centos-70-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-70-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    box : puppetlabs/centos-7.0-64-nocm
-    box_url : https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  log_level: verbose
-  type: foss
diff --git a/spec/acceptance/nodesets/debian-607-x64.yml b/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index e642e09925..0000000000
--- a/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/spec/acceptance/nodesets/debian-70rc1-x64.yml b/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index cbbbfb2cc6..0000000000
--- a/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/spec/acceptance/nodesets/debian-73-i386.yml b/spec/acceptance/nodesets/debian-73-i386.yml
deleted file mode 100644
index a38902d897..0000000000
--- a/spec/acceptance/nodesets/debian-73-i386.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-73-i386:
-    roles:
-      - master
-    platform: debian-7-i386
-    box : debian-73-i386-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-i386-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/spec/acceptance/nodesets/debian-73-x64.yml b/spec/acceptance/nodesets/debian-73-x64.yml
deleted file mode 100644
index f9cf0c9b8a..0000000000
--- a/spec/acceptance/nodesets/debian-73-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-73-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/spec/acceptance/nodesets/debian-82-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml
similarity index 66%
rename from spec/acceptance/nodesets/debian-82-x64.yml
rename to spec/acceptance/nodesets/debian-8-x64.yml
index 800c49aaa4..fef6e63ca5 100644
--- a/spec/acceptance/nodesets/debian-82-x64.yml
+++ b/spec/acceptance/nodesets/debian-8-x64.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  debian-82:
+  debian-8-x64:
     roles:
-      - master
+      - agent
+      - default
     platform: debian-8-amd64
-    box: puppetlabs/debian-8.2-64-nocm
     hypervisor: vagrant
+    box: puppetlabs/debian-8.2-64-nocm
 CONFIG:
-  log_level: debug
-  type: git
+  type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index 00e141d092..dba339c46a 100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  centos-66-x64:
+  ubuntu-1404-x64:
     roles:
-      - master
-    platform: el-6-x86_64
-    box : puppetlabs/centos-6.6-64-nocm
-    hypervisor : vagrant
+      - agent
+      - default
+    platform: ubuntu-14.04-amd64
+    hypervisor: vagrant
+    box: puppetlabs/ubuntu-14.04-64-nocm
 CONFIG:
-  log_level: debug
-  type: git
+  type: foss
diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml
new file mode 100644
index 0000000000..a3333aac53
--- /dev/null
+++ b/spec/acceptance/nodesets/docker/centos-7.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  centos-7-x64:
+    platform: el-7-x86_64
+    hypervisor: docker
+    image: centos:7
+    docker_preserve_image: true
+    docker_cmd: '["/usr/sbin/init"]'
+    # install various tools required to get the image up to usable levels
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
+CONFIG:
+  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml
new file mode 100644
index 0000000000..df5c31944f
--- /dev/null
+++ b/spec/acceptance/nodesets/docker/debian-8.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  debian-8-x64:
+    platform: debian-8-amd64
+    hypervisor: docker
+    image: debian:8
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
+CONFIG:
+  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
new file mode 100644
index 0000000000..b1efa58390
--- /dev/null
+++ b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  ubuntu-1404-x64:
+    platform: ubuntu-14.04-amd64
+    hypervisor: docker
+    image: ubuntu:14.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      # ensure that upstart is booting correctly in the container
+      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
+CONFIG:
+  trace_limit: 200
diff --git a/spec/acceptance/nodesets/fedora-18-x64.yml b/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 086cae995c..0000000000
--- a/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e40..0000000000
--- a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f8..0000000000
--- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
deleted file mode 100644
index f4b2366f3b..0000000000
--- a/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1310-x64:
-    roles:
-      - master
-    platform: ubuntu-13.10-amd64
-    box : ubuntu-server-1310-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-1310-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index cba1cd04c2..0000000000
--- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box : puppetlabs/ubuntu-14.04-64-nocm
-    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git

From 4b9f6d312190ca9b25bc9f18b7b369e7460f39e7 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 19 Apr 2016 10:20:11 +0100
Subject: [PATCH 0906/2267] (MODULES-3274) mod-info: specify the info_path

Changes lifted from Eric Young's feture request.
---
 manifests/mod/info.pp       | 1 +
 templates/mod/info.conf.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 2c477c748f..5f4ffa7c95 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -2,6 +2,7 @@
   $allow_from      = ['127.0.0.1','::1'],
   $apache_version  = undef,
   $restrict_access = true,
+  $info_path       = '/server-info',
 ){
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/templates/mod/info.conf.erb b/templates/mod/info.conf.erb
index dd79ecea8d..c661a23ab5 100644
--- a/templates/mod/info.conf.erb
+++ b/templates/mod/info.conf.erb
@@ -1,4 +1,4 @@
-<Location /server-info>
+<Location <%= @info_path %>>
     SetHandler server-info
 <%- if @restrict_access -%>
   <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>

From 9aedb0446e6b7a77f41494c98bb187bb972b1732 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 19 Apr 2016 15:29:10 +0100
Subject: [PATCH 0907/2267] (MODULES-3140) explicitly rely on hasrestart if no
 restart command is passed

Apache always had a restart option for the init script and in some cases
does require special handling of the daemon when restarting, so this
prefers the init scripts' restart action over just stopping/starting it.
---
 manifests/service.pp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/manifests/service.pp b/manifests/service.pp
index 708027921c..f90097d0bb 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -38,12 +38,16 @@
       $_service_ensure = undef
     }
   }
+
+  $service_hasrestart = $service_restart == undef
+
   if $service_manage {
     service { 'httpd':
-      ensure  => $_service_ensure,
-      name    => $service_name,
-      enable  => $service_enable,
-      restart => $service_restart
+      ensure     => $_service_ensure,
+      name       => $service_name,
+      enable     => $service_enable,
+      restart    => $service_restart,
+      hasrestart => $service_hasrestart,
     }
   }
 }

From 6df5d4160268d21a058847fac8e53d878988dfe6 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Tue, 19 Apr 2016 09:23:27 -0700
Subject: [PATCH 0908/2267] Expose verify_config in apache::vhost::custom

In many cases verify_config confuses more than it helps and users would
like to be able to turn it off. Expose the
$apache::custom_config::verify_config parameter in
apache::vhost::custom so custom vhost users can also turn this off.
---
 README.md                 |  5 +++++
 manifests/vhost/custom.pp | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ded6f75d19..74b5183152 100644
--- a/README.md
+++ b/README.md
@@ -3556,6 +3556,11 @@ Specifies if the virtual host file is present or absent. Valid options: 'absent'
 
 Sets the relative load order for Apache HTTPD VirtualHost configuration files. Default: '25'.
 
+##### `verify_config`
+
+Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: true.
+
+
 ### Private defined types
 
 #### Defined type: `apache::peruser::multiplexer`
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index 12567f5dbd..e46b4c4d81 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -3,6 +3,7 @@
   $content,
   $ensure = 'present',
   $priority = '25',
+  $verify_config = true,
 ) {
   include ::apache
 
@@ -10,10 +11,11 @@
   $filename = regsubst($name, ' ', '_', 'G')
 
   ::apache::custom_config { $filename:
-    ensure   => $ensure,
-    confdir  => $::apache::vhost_dir,
-    content  => $content,
-    priority => $priority,
+    ensure        => $ensure,
+    confdir       => $::apache::vhost_dir,
+    content       => $content,
+    priority      => $priority,
+    verify_config => $verify_config,
   }
 
   # NOTE(pabelanger): This code is duplicated in ::apache::vhost and needs to

From e051bbfd87c7bc6b5a1e8a09a7cbd60daf153928 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Sun, 17 Apr 2016 05:38:28 +0200
Subject: [PATCH 0909/2267] MODULES-2890: Allow php_version != 5

---
 manifests/mod/php.pp                          | 38 ++++++++++++++-----
 manifests/params.pp                           | 19 +++++-----
 spec/classes/mod/php_spec.rb                  |  2 +-
 templates/mod/{php5.conf.erb => php.conf.erb} |  0
 4 files changed, 40 insertions(+), 19 deletions(-)
 rename templates/mod/{php5.conf.erb => php.conf.erb} (100%)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 3d45f87a8a..340549ccb1 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -4,25 +4,28 @@
   $path           = undef,
   $extensions     = ['.php'],
   $content        = undef,
-  $template       = 'apache/mod/php5.conf.erb',
+  $template       = 'apache/mod/php.conf.erb',
   $source         = undef,
   $root_group     = $::apache::params::root_group,
+  $php_version    = $::apache::params::php_version,
 ) inherits apache::params {
 
+  $mod = "php${php_version}"
+
   if defined(Class['::apache::mod::prefork']) {
-    Class['::apache::mod::prefork']->File['php5.conf']
+    Class['::apache::mod::prefork']->File["${mod}.conf"]
   }
   elsif defined(Class['::apache::mod::itk']) {
-    Class['::apache::mod::itk']->File['php5.conf']
+    Class['::apache::mod::itk']->File["${mod}.conf"]
   }
   else {
     fail('apache::mod::php requires apache::mod::prefork or apache::mod::itk; please enable mpm_module => \'prefork\' or mpm_module => \'itk\' on Class[\'apache\']')
   }
   validate_array($extensions)
 
-  if $source and ($content or $template != 'apache/mod/php5.conf.erb') {
+  if $source and ($content or $template != 'apache/mod/php.conf.erb') {
     warning('source and content or template parameters are provided. source parameter will be used')
-  } elsif $content and $template != 'apache/mod/php5.conf.erb' {
+  } elsif $content and $template != 'apache/mod/php.conf.erb' {
     warning('content and template parameters are provided. content parameter will be used')
   }
 
@@ -34,9 +37,26 @@
     default => undef,
   }
 
-  ::apache::mod { 'php5':
-    package        => $package_name,
+  # Determine if we have a package
+  $mod_packages = $::apache::params::mod_packages
+  if $package_name {
+    $_package_name = $package_name
+  } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
+    $_package_name = $mod_packages[$mod]
+  } elsif has_key($mod_packages, 'phpXXX') { # 2.6 compatibility hack
+    $_package_name = regsubst($mod_packages['phpXXX'], 'XXX', $php_version)
+  } else {
+    $_package_name = undef
+  }
+
+  $_lib = "libphp${php_version}.so"
+  $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
+
+  ::apache::mod { $mod:
+    package        => $_package_name,
     package_ensure => $package_ensure,
+    lib            => $_lib,
+    id             => "php${_php_major}_module",
     path           => $path,
   }
 
@@ -45,9 +65,9 @@
   Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
 
   # Template uses $extensions
-  file { 'php5.conf':
+  file { "${mod}.conf":
     ensure  => file,
-    path    => "${::apache::mod_dir}/php5.conf",
+    path    => "${::apache::mod_dir}/${mod}.conf",
     owner   => 'root',
     group   => $root_group,
     mode    => $::apache::file_mode,
diff --git a/manifests/params.pp b/manifests/params.pp
index 1cb2f40f5e..d067ac848d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -90,6 +90,7 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
+    $php_version          = '5'
     $mod_packages         = {
       # NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
       'auth_cas'    => 'mod_auth_cas',
@@ -117,6 +118,7 @@
         '5'     => 'php53',
         default => 'php',
       },
+      'phpXXX'      => 'php',
       'proxy_html'  => 'mod_proxy_html',
       'python'      => 'mod_python',
       'security'    => 'mod_security',
@@ -133,8 +135,7 @@
       'shib2'       => 'shibboleth',
     }
     $mod_libs             = {
-      'php5' => 'libphp5.so',
-      'nss'  => 'libmodnss.so',
+      'nss' => 'libmodnss.so',
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $keepalive            = 'Off'
@@ -217,6 +218,7 @@
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
+    $php_version         = '5'
     $mod_packages        = {
       'auth_cas'    => 'libapache2-mod-auth-cas',
       'auth_kerb'   => 'libapache2-mod-auth-kerb',
@@ -229,7 +231,7 @@
       'pagespeed'   => 'mod-pagespeed-stable',
       'passenger'   => 'libapache2-mod-passenger',
       'perl'        => 'libapache2-mod-perl2',
-      'php5'        => 'libapache2-mod-php5',
+      'phpXXX'      => 'libapache2-mod-phpXXX',
       'proxy_html'  => 'libapache2-mod-proxy-html',
       'python'      => 'libapache2-mod-python',
       'rpaf'        => 'libapache2-mod-rpaf',
@@ -246,7 +248,6 @@
       $shib2_lib = 'mod_shib2.so'
     }
     $mod_libs             = {
-      'php5'  => 'libphp5.so',
       'shib2' => $shib2_lib
     }
     $conf_template          = 'apache/httpd.conf.erb'
@@ -392,6 +393,7 @@
     $suphp_addhandler = 'php5-script'
     $suphp_engine     = 'off'
     $suphp_configpath = undef
+    $php_version      = '5'
     $mod_packages     = {
       # NOTE: I list here only modules that are not included in www/apache24
       # NOTE: 'passenger' needs to enable APACHE_SUPPORT in make config
@@ -402,7 +404,7 @@
       'fcgid'      => 'www/mod_fcgid',
       'passenger'  => 'www/rubygem-passenger',
       'perl'       => 'www/mod_perl2',
-      'php5'       => 'www/mod_php5',
+      'phpXXX'     => 'www/mod_phpXXX',
       'proxy_html' => 'www/mod_proxy_html',
       'python'     => 'www/mod_python3',
       'wsgi'       => 'www/mod_wsgi',
@@ -412,7 +414,6 @@
       'shib2'      => 'security/shibboleth2-sp',
     }
     $mod_libs         = {
-      'php5' => 'libphp5.so',
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $keepalive            = 'Off'
@@ -457,6 +458,7 @@
     $suphp_addhandler = 'x-httpd-php'
     $suphp_engine     = 'off'
     $suphp_configpath = '/etc/php5/apache2'
+    $php_version      = '5'
     $mod_packages     = {
       # NOTE: I list here only modules that are not included in www-servers/apache
       'auth_kerb'       => 'www-apache/mod_auth_kerb',
@@ -464,7 +466,7 @@
       'fcgid'           => 'www-apache/mod_fcgid',
       'passenger'       => 'www-apache/passenger',
       'perl'            => 'www-apache/mod_perl',
-      'php5'            => 'dev-lang/php',
+      'phpXXX'          => 'dev-lang/php',
       'proxy_html'      => 'www-apache/mod_proxy_html',
       'proxy_fcgi'      => 'www-apache/mod_proxy_fcgi',
       'python'          => 'www-apache/mod_python',
@@ -475,7 +477,6 @@
       'xml2enc'         => 'www-apache/mod_xml2enc',
     }
     $mod_libs         = {
-      'php5' => 'libphp5.so',
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $keepalive            = 'Off'
@@ -516,6 +517,7 @@
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
+    $php_version         = '5'
     $mod_packages        = {
       'auth_kerb'   => 'apache2-mod_auth_kerb',
       'fcgid'       => 'apache2-mod_fcgid',
@@ -524,7 +526,6 @@
       'python'      => 'apache2-mod_python',
     }
     $mod_libs             = {
-      'php5' => 'libphp5.so',
     }
     $conf_template          = 'apache/httpd.conf.erb'
     $keepalive              = 'Off'
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 3aaa3d329b..3908655295 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -222,7 +222,7 @@
         'class { "apache": mpm_module => prefork, }'
       end
       let :params do
-        { :template => 'apache/mod/php5.conf.erb' }
+        { :template => 'apache/mod/php.conf.erb' }
       end
       it { should contain_file('php5.conf').with(
         :content => /^# PHP is an HTML-embedded scripting language which attempts to make it/
diff --git a/templates/mod/php5.conf.erb b/templates/mod/php.conf.erb
similarity index 100%
rename from templates/mod/php5.conf.erb
rename to templates/mod/php.conf.erb

From 9121dffd852f236b64532bc35138d21d099db42b Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Sun, 17 Apr 2016 04:28:00 +0200
Subject: [PATCH 0910/2267] MODULES-2890: mod::php: Explicit test on jessie

---
 spec/classes/mod/php_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 3908655295..e5d3befbc3 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -39,6 +39,18 @@
         :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
       ) }
     end
+    context "on jessie" do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let(:facts) { super().merge({
+        :operatingsystemrelease => '8',
+        :lsbdistcodename        => 'jessie',
+      }) }
+      it { is_expected.to contain_file("php5.load").with(
+        :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
+      ) }
+    end
   end
   describe "on a RedHat OS" do
     let :facts do

From f7f519c61b1ec276b80d5e4cc68b9cf8eae6a51a Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Sun, 17 Apr 2016 04:30:31 +0200
Subject: [PATCH 0911/2267] MODULES-2890: Fix PHP on Debian stretch and Ubuntu
 Xenial

---
 manifests/params.pp          |  8 +++++++-
 spec/classes/mod/php_spec.rb | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index d067ac848d..60e184a962 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -218,7 +218,13 @@
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
-    $php_version         = '5'
+    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') < 0) {
+      # Only the major version is used here
+      $php_version = '5'
+    } else {
+      # major.minor version used since Debian stretch and Ubuntu Xenial
+      $php_version = '7.0'
+    }
     $mod_packages        = {
       'auth_cas'    => 'libapache2-mod-auth-cas',
       'auth_kerb'   => 'libapache2-mod-auth-kerb',
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index e5d3befbc3..ad61e897b5 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -51,6 +51,20 @@
         :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
       ) }
     end
+    context "on stretch" do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let(:facts) { super().merge({
+        :operatingsystemrelease => '9',
+        :lsbdistcodename        => 'stretch',
+      }) }
+      it { is_expected.to contain_apache__mod('php7.0') }
+      it { is_expected.to contain_package("libapache2-mod-php7.0") }
+      it { is_expected.to contain_file("php7.0.load").with(
+        :content => "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n"
+      ) }
+    end
   end
   describe "on a RedHat OS" do
     let :facts do

From c0c3e4ab88447e995a40c1f3a0126c518e25a4dc Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Sun, 17 Apr 2016 05:36:59 +0200
Subject: [PATCH 0912/2267] MODULES-2890: Fix mod_php SetHandler and cleanup

---
 templates/mod/php.conf.erb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/templates/mod/php.conf.erb b/templates/mod/php.conf.erb
index 3fd1000390..9e684fe6d0 100644
--- a/templates/mod/php.conf.erb
+++ b/templates/mod/php.conf.erb
@@ -2,20 +2,12 @@
 # PHP is an HTML-embedded scripting language which attempts to make it
 # easy for developers to write dynamically generated webpages.
 #
-#<IfModule prefork.c>
-#  LoadModule php5_module modules/libphp5.so
-#</IfModule>
-#<IfModule worker.c>
-#  # Use of the "ZTS" build with worker is experimental, and no shared
-#  # modules are supported.
-#  LoadModule php5_module modules/libphp5-zts.so
-#</IfModule>
 
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
 <FilesMatch ".+(<%= @extensions.flatten.compact.collect { |s| Regexp.escape(s) }.join('|') %>)$">
-    SetHandler php5-script
+    SetHandler application/x-httpd-php
 </FilesMatch>
 
 #

From d90bfbd3e074465c1b074618e8bdff23d2de9ded Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Wed, 20 Apr 2016 09:38:48 +0200
Subject: [PATCH 0913/2267] Set default keepalive to On

According to docs "In some cases this has been shown to result in an almost 50% speedup in latency times for HTML documents with many images."

Ref: http://httpd.apache.org/docs/2.4/mod/core.html#keepalive
---
 README.md                                 | 2 +-
 manifests/params.pp                       | 2 +-
 spec/acceptance/apache_parameters_spec.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 74b5183152..e8a1a67d83 100644
--- a/README.md
+++ b/README.md
@@ -973,7 +973,7 @@ Sets the Apache server's base configuration directory. This is useful for specia
 
 ##### `keepalive`
 
-Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. Valid options: 'Off', 'On'. Default: 'Off'.
+Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
 
 If 'On', use the [`keepalive_timeout`][] and [`max_keepalive_requests`][] parameters to set relevant options.
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 1cb2f40f5e..c72d6b927d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -137,7 +137,7 @@
       'nss'  => 'libmodnss.so',
     }
     $conf_template        = 'apache/httpd.conf.erb'
-    $keepalive            = 'Off'
+    $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
     $fastcgi_lib_path     = undef
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 923df6666c..fdf3d8561a 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -353,14 +353,14 @@ class { 'apache':
   describe 'keepalive' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': keepalive => 'On', keepalive_timeout => '30', max_keepalive_requests => '200' }"
+        pp = "class { 'apache': keepalive => 'Off', keepalive_timeout => '30', max_keepalive_requests => '200' }"
         apply_manifest(pp, :catch_failures => true)
       end
     end
 
     describe file($conf_file) do
       it { is_expected.to be_file }
-      it { is_expected.to contain 'KeepAlive On' }
+      it { is_expected.to contain 'KeepAlive Off' }
       it { is_expected.to contain 'KeepAliveTimeout 30' }
       it { is_expected.to contain 'MaxKeepAliveRequests 200' }
     end

From d67afdec30ae7a9b51617fb918b167bce05245e5 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 20 Apr 2016 14:12:08 +0100
Subject: [PATCH 0914/2267] (maint) update apache::default_mods tests to work
 on debian 7

Debian 7 and Ubuntu 12.04's init scripts will refuse to restart the service
if the configuration is broken. So this commit adds an explicit
configuration step to shutdown the apache before the test.
---
 spec/acceptance/default_mods_spec.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 3f28526966..1c10d02b5e 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -20,6 +20,13 @@ class { 'apache':
   end
 
   describe 'no default mods and failing' do
+    before :all do
+      pp = <<-PP
+      include apache::params
+      class { 'apache': default_mods => false, service_ensure => stopped, }
+      PP
+      apply_manifest(pp)
+    end
     # Using puppet_apply as a helper
     it 'should apply with errors' do
       pp = <<-EOS
@@ -39,15 +46,9 @@ class { 'apache':
       apply_manifest(pp, { :expect_failures => true })
     end
 
-    # Are these the same?
     describe service($service_name) do
       it { is_expected.not_to be_running }
     end
-    describe "service #{$service_name}" do
-      it 'should not be running' do
-        shell("pidof #{$service_name}", {:acceptable_exit_codes => 1})
-      end
-    end
   end
 
   describe 'alternative default mods' do

From b0bd3ed1c37835cbdbb4e8f101f1eb03bdbb8d26 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 14 Apr 2016 15:24:48 -0700
Subject: [PATCH 0915/2267] Release prep 1.9.0

---
 CHANGELOG.md  | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++
 metadata.json |  2 +-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58cd91ae62..40d313a278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,78 @@
+## Supported Release 1.9.0
+### Summary
+
+
+#### Features
+- Added `apache_version` fact
+- Added `apache::balancer::target` attribute
+- Added `apache::fastcgi::server::pass_header` attribute
+- Added ability for `apache::fastcgi::server::host` using sockets
+- Added `apache::root_directory_options` attribute
+- Added for `apache::mod::ldap`:
+  - `ldap_shared_cache_size`
+  - `ldap_cache_entries`
+  - `ldap_cache_ttl`
+  - `ldap_opcache_entries`
+  - `ldap_opcache_ttl`
+- Added `apache::mod::pagespeed::package_ensure` attribute
+- Added `apache::mod::passenger` attributes:
+  - `passenger_log_level`
+  - `manage_repo`
+- Added upstream repo for `apache::mod::passenger`
+- Added `apache::mod::proxy_fcgi` class
+- Added `apache::mod::security` attributes:
+  - `audit_log_parts`
+  - `secpcrematchlimit`
+  - `secpcrematchlimitrecursion`
+  - `secdefaultaction`
+  - `anomaly_score_blocking`
+  - `inbound_anomaly_threshold`
+  - `outbound_anomaly_threshold`
+- Added `apache::mod::ssl` attributes:
+  - `ssl_mutex`
+  - `apache_version`
+- Added ubuntu 16.04 support
+- Added `apache::mod::authnz_ldap::package_name` attribute
+- Added `apache::mod::ldap::package_name` attribute
+- Added `apache::mod::proxy::package_name` attribute
+- Added `apache::vhost` attributes:
+  - `ssl_proxy_check_peen_expire`
+  - `ssl_proxy_protocol`
+  - `logroot_owner`
+  - `logroot_group`
+  - `setenvifnocase`
+  - `passenger_user`
+  - `passenger_high_performance`
+  - `jk_mounts`
+  - `fastcgi_idle_timeout`
+  - `modsec_disable_msgs`
+  - `modsec_disable_tags`
+- Added ability for 2.4-style `RequireAll|RequireNone|RequireAny` directory permissions
+- Added ability for includes in vhost directory
+- Added directory values:
+  - `AuthMerging`
+  - `MellonSPMetadataFile`
+
+#### Bugfixes
+- Fixed apache mod setup for event/worker failing syntax
+- Fixed concat deprecation warnings
+- Fixed pagespeed mod
+- Fixed service restart on mod update
+- Fixed mod dir purging to happen after package installs
+- Fixed various `apache::mod::*` file modes
+- Fixed `apache::mod::authnz_ldap` parameter `verifyServerCert` to be `verify_server_cert`
+- Fixed loadfile name in `apache::mod::fcgid`
+- Fixed `apache::mod::remoteip` to fail on apache < 2.4 (because it is not available)
+- Fixed `apache::mod::ssl::ssl_honorcipherorder` interpolation
+- Lint fixes
+- Strict variable fixes
+- Fixed `apache::vhost` attribute `redirectmatch_status` to be optional
+- Fixed SSLv3 on by default in mod\_nss
+- Fixed mod\_rpaf directive names in template
+- Fixed mod\_worker needing MaxClients with ThreadLimit
+- Fixed quoting on vhost php\_value
+- Fixed xml2enc for proxy\_html on debian
+
 ## Supported Release 1.8.1
 ### Summary
 This release includes bug fixes and a documentation update.
diff --git a/metadata.json b/metadata.json
index dde60f9115..972f456d07 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 0a75a48a271e9cb1b42d4c032a60901702173f15 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 20 Apr 2016 19:34:18 -0700
Subject: [PATCH 0916/2267] Updates CHANGELOG with newly added features and
 bugfix

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40d313a278..4b1da63b53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,13 @@
 - Added directory values:
   - `AuthMerging`
   - `MellonSPMetadataFile`
+- Adds Configurability of Collaborative Detection Severity Levels for OWASP Core Rule Set to `apache::mod::security` class
+  - `critical_anomaly_score`
+  - `error_anomaly_score`
+  - `warning_anomaly_score`
+  - `notice_anomaly_score`
+- Adds ability to configure `info_path` in `apache::mod::info` class
+- Adds ability to configure `verify_config` in `apache::vhost::custom`
 
 #### Bugfixes
 - Fixed apache mod setup for event/worker failing syntax
@@ -72,6 +79,7 @@
 - Fixed mod\_worker needing MaxClients with ThreadLimit
 - Fixed quoting on vhost php\_value
 - Fixed xml2enc for proxy\_html on debian
+- Fixed a problem where the apache service restarts too fast
 
 ## Supported Release 1.8.1
 ### Summary

From 2e0bad61051a78d174c78d91ca19e9a1f885ffb0 Mon Sep 17 00:00:00 2001
From: jostmart <jostmart@users.noreply.github.com>
Date: Sun, 24 Apr 2016 10:49:48 +0200
Subject: [PATCH 0917/2267] Update _block.erb

Deny access to .ht and .hg, which are created by mercurial hg.
---
 templates/vhost/_block.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_block.erb b/templates/vhost/_block.erb
index d0776829da..b07f685e42 100644
--- a/templates/vhost/_block.erb
+++ b/templates/vhost/_block.erb
@@ -3,7 +3,7 @@
   ## Block access statements
 <% if @block.include? 'scm' -%>
   # Block access to SCM directories.
-  <DirectoryMatch .*\.(svn|git|bzr)/.*>
+  <DirectoryMatch .*\.(svn|git|bzr|hg|ht)/.*>
   <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require all denied
   <%- else -%>

From b27225e1a080a0f8d99e1f6a5368129c94d4e44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20R=C3=BCssel?= <ruessel@synyx.de>
Date: Mon, 25 Apr 2016 12:16:01 +0200
Subject: [PATCH 0918/2267] dont fail if mpm_module is itk, apache_version >=
 2.4  and class apache::mod::prefork is not defined

include apache::mod::prefork in apache::mod::itk instead
because cant include apache::mod::prefork before class apache
"Warning: Scope(Class[Apache::Mod::Prefork]): Could not look up qualified variable '::apache::apache_version'; class ::apache has not been evaluated"
"Error: Could not find dependency Exec[mkdir ] for File[/prefork.conf] at apache/manifests/mod/prefork.pp:44"
---
 manifests/mod/itk.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 2d5bf04c1c..56edf7e68e 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -25,7 +25,7 @@
       }
     } else {
       if ! defined(Class['apache::mod::prefork']) {
-        fail('apache::mod::prefork is a prerequisite for apache::mod::itk, please arrange for it to be included.')
+        include ::apache::mod::prefork
       }
     }
   }

From 4cd01b321150fa3626925df3f70f98084f319c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20R=C3=BCssel?= <ruessel@synyx.de>
Date: Tue, 26 Apr 2016 12:34:56 +0200
Subject: [PATCH 0919/2267] Revert "MODULES-2956: Enable options within
 location block on proxy_match"

this commit removes the location directive in _proxy.erb
proxy: remove workaround for old broken clients
99add117df452d2c513a3a7c36d9fd0416e696b9

this commit sets options in the location directive in _proxy.erb
MODULES-2956: Enable options within location block on proxy_match
db5b0bfb09959622ea1c6cc299b58057b94c588f

setting options-hash in proxy_pass or proxy_match now leads to syntax errors
in Apache like "AuthBasicProvider not allowed here"
---
 README.md                  |  4 +---
 spec/defines/vhost_spec.rb | 12 ------------
 templates/vhost/_proxy.erb |  5 -----
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 74b5183152..b077251b55 100644
--- a/README.md
+++ b/README.md
@@ -2435,7 +2435,7 @@ Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs
 
 ##### `proxy_pass`
 
-Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Default: undef. Parameters and location options can optionally be added as an array.
+Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters can be added as an array.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -2444,8 +2444,6 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
     { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
-    { 'path' => '/c', 'url' => 'http://backend-a/c',
-      'options' => {'Require'=>'valid-user', 'AuthType'=>'Kerberos', 'AuthName'=>'Kerberos Login'}},
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
     { 'path' => '/d', 'url' => 'http://backend-a/d',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 89113bb0b5..40ebcc7872 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -274,11 +274,6 @@
                       'retry'   => '0',
                       'timeout' => '5'
               },
-              'options'         => {
-                'Require'  =>'valid-user',
-                'AuthType' =>'Kerberos',
-                'AuthName' =>'"Kerberos Login"'
-              },
               'setenv'   => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'],
             }
           ],
@@ -517,13 +512,6 @@
               /ProxyPassReverseCookiePath\s+\/a\s+http:\/\//) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
               /ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /Require valid-user/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /AuthType Kerberos/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /AuthName "Kerberos Login"/) }
-
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 4e36361ca1..96004d1175 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -41,11 +41,6 @@
   SetEnv <%= setenv_var %>
     <%- end -%>
   <%- end -%>
-  <%- if proxy['options'] -%>
-    <%- proxy['options'].keys.sort.each do |key| -%>
-    <%= key %> <%= proxy['options'][key] %>
-    <%- end -%>
-  <%- end -%>
 <% end -%>
 <% [@proxy_pass_match].flatten.compact.each do |proxy| %>
   ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] -%>

From ee14e6f94be34431ef43c4b345517c6c6b3adde1 Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Thu, 28 Apr 2016 12:08:47 +0200
Subject: [PATCH 0920/2267] mod_event: do not set parameters twice

---
 README.md                      |  2 +-
 manifests/mod/event.pp         |  4 ++--
 spec/classes/mod/event_spec.rb | 36 +++++++++++++++++++++++++++++++---
 templates/mod/event.conf.erb   | 10 ++++++++--
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 74b5183152..dc7b9754ad 100644
--- a/README.md
+++ b/README.md
@@ -1366,7 +1366,7 @@ Installs and manages [`mod_mpm_event`][]. You can't include both `apache::mod::e
 **Parameters within `apache::mod::event`**:
 
 - `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive. Default: '511'.
-- `maxclients` (_Apache 2.3.12 or older_: `maxrequestworkers`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Default: '150'.
+- `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Default: '150'.
 - `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Default: '0'.
 - `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Default: '75' and '25', respectively.
 - `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Default: '25'.
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 6c70589a35..d423073e78 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -1,16 +1,16 @@
 class apache::mod::event (
   $startservers           = '2',
   $maxclients             = '150',
+  $maxrequestworkers      = undef,
   $minsparethreads        = '25',
   $maxsparethreads        = '75',
   $threadsperchild        = '25',
   $maxrequestsperchild    = '0',
+  $maxconnectionsperchild = undef,
   $serverlimit            = '25',
   $apache_version         = $::apache::apache_version,
   $threadlimit            = '64',
   $listenbacklog          = '511',
-  $maxrequestworkers      = '250',
-  $maxconnectionsperchild = '0',
 ) {
   if defined(Class['apache::mod::itk']) {
     fail('May not include both apache::mod::event and apache::mod::itk on the same node')
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index dd0a427eaf..00291a5f98 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -59,7 +59,7 @@
     it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') }
     it { is_expected.to contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') }
 
-    context "Test mpm_event params" do
+    context "Test mpm_event new params" do
       let :params do
         {
           :serverlimit            => '0',
@@ -78,17 +78,47 @@
 
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxClients\s*2/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxClients\s*2/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MinSpareThreads\s*3/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxSpareThreads\s*4/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadsPerChild\s*5/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestsPerChild\s*6/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestsPerChild\s*6/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestWorkers\s*9/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxConnectionsPerChild\s*10/) }
     end
 
+    context "Test mpm_event old style params" do
+      let :params do
+        {
+          :serverlimit            => '0',
+          :startservers           => '1',
+          :maxclients             => '2',
+          :minsparethreads        => '3',
+          :maxsparethreads        => '4',
+          :threadsperchild        => '5',
+          :maxrequestsperchild    => '6',
+          :threadlimit            => '7',
+          :listenbacklog          => '8',
+          :maxrequestworkers      => :undef,
+          :maxconnectionsperchild => :undef,
+        }
+      end
+
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxClients\s*2/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MinSpareThreads\s*3/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxSpareThreads\s*4/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadsPerChild\s*5/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestsPerChild\s*6/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestWorkers\s*9/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxConnectionsPerChild\s*10/) }
+    end
+
     context "with Apache version < 2.4" do
       let :params do
         {
diff --git a/templates/mod/event.conf.erb b/templates/mod/event.conf.erb
index 970ce088ce..da7682fb4d 100644
--- a/templates/mod/event.conf.erb
+++ b/templates/mod/event.conf.erb
@@ -1,13 +1,19 @@
 <IfModule mpm_event_module>
   ServerLimit            <%= @serverlimit %>
   StartServers           <%= @startservers %>
+  <%- if @maxrequestworkers -%>
+  MaxRequestWorkers      <%= @maxrequestworkers %>
+  <%- else -%>
   MaxClients             <%= @maxclients %>
+  <%- end -%>
   MinSpareThreads        <%= @minsparethreads %>
   MaxSpareThreads        <%= @maxsparethreads %>
   ThreadsPerChild        <%= @threadsperchild %>
+  <%- if @maxconnectionsperchild -%>
+  MaxConnectionsPerChild <%= @maxconnectionsperchild %>
+  <%- else -%>
   MaxRequestsPerChild    <%= @maxrequestsperchild %>
+  <%- end -%>
   ThreadLimit            <%= @threadlimit %>
   ListenBacklog          <%= @listenbacklog %>
-  MaxRequestWorkers      <%= @maxrequestworkers %>
-  MaxConnectionsPerChild <%= @maxconnectionsperchild %>
 </IfModule>

From 9f3c2a003c4be242d591960741d01ac4b6f1d587 Mon Sep 17 00:00:00 2001
From: Leo Antunes <leo@costela.net>
Date: Thu, 28 Apr 2016 19:24:14 +0200
Subject: [PATCH 0921/2267] Add simple <Limit> support + ProxyAddHeaders
 (#1427)

* vhost: add support for <Limit> block in directories

In order to allow "require" statements inside the <Limit> blocks without
introducing code duplication, the template for "require" handling has
beenrefactored into a subtemplate of its own. This subtemplate accesses
the current block being processed (be it a <Directory> or <Limit>)
(ab)using a scope variable _template_scope, which is in turn a hash with
a single variable :item, to workaround puppet's "thou shall not reset
variables".

* vhost: add support for ProxyAddHeaders directive

* vhost: add documentation for Limit directive
---
 README.md                        | 26 ++++++++++++
 manifests/vhost.pp               |  2 +
 spec/acceptance/vhost_spec.rb    |  2 +
 spec/defines/vhost_spec.rb       | 17 ++++++++
 templates/vhost/_directories.erb | 68 +++++---------------------------
 templates/vhost/_proxy.erb       |  7 ++++
 templates/vhost/_require.erb     | 62 +++++++++++++++++++++++++++++
 7 files changed, 125 insertions(+), 59 deletions(-)
 create mode 100644 templates/vhost/_require.erb

diff --git a/README.md b/README.md
index 74b5183152..54a4084999 100644
--- a/README.md
+++ b/README.md
@@ -2346,6 +2346,12 @@ Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod
 
 Setting this parameter to true enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. Setting it to false sets this directive to 'Off'.
 
+##### `proxy_add_headers`
+
+Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders). Valid Options: Boolean. Default: false.
+
+This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
+
 ##### `proxy_error_override`
 
 Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content. Default: false.
@@ -3045,6 +3051,26 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+###### `limit`
+
+Creates a [Limit](https://httpd.apache.org/docs/current/mod/core.html#limit) block inside the Directory block, which can also contain `require` directives.
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/docroot',
+  directories => [
+    { path     => '/',
+      provider => 'location',
+      limit    => [
+        { methods => 'GET HEAD'
+          require => ['valid-user']
+        },
+      ],
+    },
+  ],
+}
+```
+
 ###### `mellon_enable`
 
 Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_mellon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d4b1e8677c..3845075c12 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -80,6 +80,7 @@
   $no_proxy_uris               = [],
   $no_proxy_uris_match         = [],
   $proxy_preserve_host         = false,
+  $proxy_add_headers           = undef,
   $proxy_error_override        = false,
   $redirect_source             = '/',
   $redirect_dest               = undef,
@@ -749,6 +750,7 @@
   # - $proxy_pass
   # - $proxy_pass_match
   # - $proxy_preserve_host
+  # - $proxy_add_headers
   # - $no_proxy_uris
   if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match {
     concat::fragment { "${name}-proxy":
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 36d4f42c59..f8b01c570c 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -115,6 +115,7 @@ class { 'apache': }
       it { is_expected.to contain "ProxyPass" }
       it { is_expected.to contain "ProxyPreserveHost On" }
       it { is_expected.to contain "ProxyErrorOverride On" }
+      it { is_expected.not_to contain "ProxyAddHeaders" }
       it { is_expected.not_to contain "<Proxy \*>" }
     end
   end
@@ -142,6 +143,7 @@ class { 'apache': }
       it { is_expected.to contain "ProxyPassMatch /foo http://backend-foo/" }
       it { is_expected.to contain "ProxyPreserveHost On" }
       it { is_expected.to contain "ProxyErrorOverride On" }
+      it { is_expected.not_to contain "ProxyAddHeaders" }
       it { is_expected.not_to contain "<Proxy \*>" }
     end
   end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 89113bb0b5..6df7c8e311 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -237,6 +237,14 @@
             { 'path'              => '/var/www/files/output_filtered',
               'set_output_filter' => 'output_filter',
             },
+            { 'path'     => '/var/www/files',
+              'provider' => 'location',
+              'limit'    => [
+                { 'methods' => 'GET HEAD',
+                  'require' => ['valid-user']
+                },
+              ],
+            },
           ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
@@ -302,6 +310,7 @@
           'no_proxy_uris'               => '/foo',
           'no_proxy_uris_match'         => '/foomatch',
           'proxy_preserve_host'         => true,
+          'proxy_add_headers'           => true,
           'proxy_error_override'        => true,
           'redirect_source'             => '/bar',
           'redirect_dest'               => '/',
@@ -496,6 +505,10 @@
         :content => /^\s+DirectoryIndex\sdisabled$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+SetOutputFilter\soutput_filter$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<Limit GET HEAD>$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>/m ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
@@ -513,6 +526,10 @@
               /SetEnv proxy-nokeepalive 1/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
               /noquery interpolate/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /ProxyPreserveHost On/) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              /ProxyAddHeaders On/) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
               /ProxyPassReverseCookiePath\s+\/a\s+http:\/\//) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 789ade537c..50561e863f 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -1,5 +1,6 @@
 <% if @_directories and ! @_directories.empty? -%>
 
+  <%- scope.setvar('_template_scope', {}) -%>
   ## Directories, there should at least be a declaration for <%= @docroot %>
   <%- [@_directories].flatten.compact.each do |directory| -%>
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
@@ -56,65 +57,14 @@
     AllowOverride None
       <%- end -%>
     <%- end -%>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      <%- if directory['require'] && directory['require'] != '' && directory['require'] !~ /unmanaged/i -%>
-        <%- if directory['require'].is_a?(Hash) -%>
-          <%- case directory['require']['enforce'].downcase -%>
-          <%- when 'all','none','any' then -%>
-    <Require<%= directory['require']['enforce'].capitalize %>>
-            <%- Array(directory['require']['requires']).each do |req| -%>
-      Require <%= req.strip %>
-            <%- end -%>
-    </Require<%= directory['require']['enforce'].capitalize %>>
-          <%- else -%>
-            <%- scope.function_warning(["Apache::Vhost: Require can only overwritten with all, none or any."]) -%>
-          <%- end -%>
-        <%- else -%>
-          <%- Array(directory['require']).each do |req| -%>
-    Require <%= req %>
-          <%- end -%>
-        <%- end -%>
-      <%- end -%>
-      <%- if directory['auth_require'] -%>
-    Require <%= directory['auth_require'] %>
-      <%- end -%>
-      <%- if !(directory['require'] && directory['require'] != '') && directory['require'] !~ /unmanaged/i && !(directory['auth_require']) -%>
-    Require all granted
-      <%- end -%>
-    <%- else -%>
-      <%- if directory['auth_require'] -%>
-    Require <%= directory['auth_require'] %>
-      <%- end -%>
-      <%- if directory['order'] and directory['order'] != '' -%>
-    Order <%= Array(directory['order']).join(',') %>
-      <%- else -%>
-    Order allow,deny
-      <%- end -%>
-      <%- if directory['deny'] and ! [ false, 'false', '' ].include?(directory['deny']) -%>
-        <%- if directory['deny'].kind_of?(Array) -%>
-          <%- Array(directory['deny']).each do |restrict| -%>
-    Deny <%=  restrict %>
-          <%- end -%>
-        <%- else -%>
-    Deny <%= directory['deny'] %>
-        <%- end -%>
-      <%- end -%>
-      <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
-        <%- if directory['allow'].kind_of?(Array) -%>
-          <%- Array(directory['allow']).each do |access| -%>
-    Allow <%=  access %>
-        <%- end -%>
-      <%- else -%>
-    Allow <%= directory['allow'] %>
-      <%- end -%>
-      <%- elsif [ 'from all', 'from All' ].include?(directory['deny']) -%>
-      <%- elsif ! directory['deny'] and [ false, 'false', '' ].include?(directory['allow']) -%>
-    Deny from all
-      <%- else -%>
-    Allow from all
-      <%- end -%>
-      <%- if directory['satisfy'] and directory['satisfy'] != '' -%>
-    Satisfy <%= directory['satisfy'] %>
+    <%- scope.lookupvar('_template_scope')[:item] = directory -%>
+<%= scope.function_template(["apache/vhost/_require.erb"]) -%>
+    <%- if directory['limit'] && directory['limit'] != '' -%>
+      <%- Array(directory['limit']).each do |lim| -%>
+    <Limit <%= lim['methods'] %>>
+    <%- scope.lookupvar('_template_scope')[:item] = lim -%>
+    <%= scope.function_template(["apache/vhost/_require.erb"]) -%>
+    </Limit>
       <%- end -%>
     <%- end -%>
     <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 4e36361ca1..bd151c6a71 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -8,6 +8,13 @@
 <% else -%>
   ProxyPreserveHost Off
 <%- end -%>
+<%- if defined?(@proxy_add_headers) -%>
+  <%- if @proxy_add_headers -%>
+  ProxyAddHeaders On
+  <%- else -%>
+  ProxyAddHeaders Off
+  <%- end -%>
+<%- end -%>
 <% if @proxy_error_override -%>
   ProxyErrorOverride On
 <%- end -%>
diff --git a/templates/vhost/_require.erb b/templates/vhost/_require.erb
new file mode 100644
index 0000000000..d6252deeb2
--- /dev/null
+++ b/templates/vhost/_require.erb
@@ -0,0 +1,62 @@
+<%- _item = scope.lookupvar('_template_scope')[:item] -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- if _item['require'] && _item['require'] != '' && _item['require'] !~ /unmanaged/i -%>
+    <%- if _item['require'].is_a?(Hash) -%>
+      <%- case _item['require']['enforce'].downcase -%>
+      <%- when 'all','none','any' then -%>
+    <Require<%= _item['require']['enforce'].capitalize %>>
+        <%- Array(_item['require']['requires']).each do |req| -%>
+      Require <%= req.strip %>
+        <%- end -%>
+    </Require<%= _item['require']['enforce'].capitalize %>>
+      <%- else -%>
+        <%- scope.function_warning(["Apache::Vhost: Require can only overwritten with all, none or any."]) -%>
+      <%- end -%>
+    <%- else -%>
+      <%- Array(_item['require']).each do |req| -%>
+    Require <%= req %>
+      <%- end -%>
+    <%- end -%>
+  <%- end -%>
+  <%- if _item['auth_require'] -%>
+    Require <%= _item['auth_require'] %>
+  <%- end -%>
+  <%- if !(_item['require'] && _item['require'] != '') && _item['require'] !~ /unmanaged/i && !(_item['auth_require']) -%>
+    Require all granted
+  <%- end -%>
+<%- else -%>
+  <%- if _item['auth_require'] -%>
+    Require <%= _item['auth_require'] %>
+  <%- end -%>
+  <%- if _item['order'] and _item['order'] != '' -%>
+    Order <%= Array(_item['order']).join(',') %>
+  <%- else -%>
+    Order allow,deny
+  <%- end -%>
+  <%- if _item['deny'] and ! [ false, 'false', '' ].include?(_item['deny']) -%>
+    <%- if _item['deny'].kind_of?(Array) -%>
+      <%- Array(_item['deny']).each do |restrict| -%>
+    Deny <%=  restrict %>
+      <%- end -%>
+    <%- else -%>
+    Deny <%= _item['deny'] %>
+    <%- end -%>
+  <%- end -%>
+  <%- if _item['allow'] and ! [ false, 'false', '' ].include?(_item['allow']) -%>
+    <%- if _item['allow'].kind_of?(Array) -%>
+      <%- Array(_item['allow']).each do |access| -%>
+    Allow <%=  access %>
+    <%- end -%>
+  <%- else -%>
+    Allow <%= _item['allow'] %>
+  <%- end -%>
+  <%- elsif [ 'from all', 'from All' ].include?(_item['deny']) -%>
+  <%- elsif ! _item['deny'] and [ false, 'false', '' ].include?(_item['allow']) -%>
+    Deny from all
+  <%- else -%>
+    Allow from all
+  <%- end -%>
+  <%- if _item['satisfy'] and _item['satisfy'] != '' -%>
+    Satisfy <%= _item['satisfy'] %>
+  <%- end -%>
+<%- end -%>

From 9f779b43f569185bca89469444c6cfd21d6dcb83 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Sat, 30 Apr 2016 00:29:52 +0200
Subject: [PATCH 0922/2267] Revert "changed rpaf Configuration Directives: RPAF
 -> RPAF_"

This reverts commit 8ca7a6697ab907803789b2aa63e304f19e3497d3.

These changes are completely incompatible with mod_rpaf as provided in
Ubuntu 12.04 and Debian Jessie and Wheezy, and break the Apache
configuration and consequently the Puppet agent run.

I suspect these changes were made to be compatible with one of the
mod_rpaf forks (https://github.com/gnif/mod_rpaf) but I don't see how a
"random" fork should have precedence over, and break modules distributed
on the official channels.
---
 spec/classes/mod/rpaf_spec.rb | 24 ++++++++++++------------
 templates/mod/rpaf.conf.erb   | 14 +++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index ef41fcd350..13f0e6c8c0 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -22,25 +22,25 @@
     it { is_expected.to contain_file('rpaf.conf').with({
       'path' => '/etc/apache2/mods-available/rpaf.conf',
     }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_enable On$/) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
 
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_sethostname On$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
     end
     describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
       let :params do
         { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_proxyIPs 10.42.17.8 10.42.18.99$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
     end
     describe "with header => X-Real-IP" do
       let :params do
         { :header => 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_header X-Real-IP$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
     end
   end
   context "on a FreeBSD OS" do
@@ -62,25 +62,25 @@
     it { is_expected.to contain_file('rpaf.conf').with({
       'path' => '/usr/local/etc/apache24/Modules/rpaf.conf',
     }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_enable On$/) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
 
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_sethostname On$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
     end
     describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
       let :params do
         { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_proxyIPs 10.42.17.8 10.42.18.99$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
     end
     describe "with header => X-Real-IP" do
       let :params do
         { :header => 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_header X-Real-IP$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
     end
   end
   context "on a Gentoo OS" do
@@ -102,25 +102,25 @@
     it { is_expected.to contain_file('rpaf.conf').with({
       'path' => '/etc/apache2/modules.d/rpaf.conf',
     }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_enable On$/) }
+    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
 
     describe "with sethostname => true" do
       let :params do
         { :sethostname => 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_sethostname On$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
     end
     describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
       let :params do
         { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_proxyIPs 10.42.17.8 10.42.18.99$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
     end
     describe "with header => X-Real-IP" do
       let :params do
         { :header => 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAF_header X-Real-IP$/) }
+      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
     end
   end
 end
diff --git a/templates/mod/rpaf.conf.erb b/templates/mod/rpaf.conf.erb
index e0ed8dce8d..56e2398b55 100644
--- a/templates/mod/rpaf.conf.erb
+++ b/templates/mod/rpaf.conf.erb
@@ -1,15 +1,15 @@
 # Enable reverse proxy add forward
-RPAF_enable On
-# RPAF_sethostname will, when enabled, take the incoming X-Host header and
+RPAFenable On
+# RPAFsethostname will, when enabled, take the incoming X-Host header and
 # update the virtual host settings accordingly. This allows to have the same
 # hostnames as in the "real" configuration for the forwarding proxy.
 <% if @sethostname -%>
-RPAF_sethostname On
+RPAFsethostname On
 <% else -%>
-RPAF_sethostname Off
+RPAFsethostname Off
 <% end -%>
 # Which IPs are forwarding requests to us
-RPAF_proxyIPs <%= Array(@proxy_ips).join(" ") %>
-# Setting RPAF_header allows you to change the header name to parse from the
+RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %>
+# Setting RPAFheader allows you to change the header name to parse from the
 # default X-Forwarded-For to something of your choice.
-RPAF_header <%= @header %>
+RPAFheader <%= @header %>

From 192d89427ade170a9c76fc0df0bcda0786c0cb53 Mon Sep 17 00:00:00 2001
From: Andreas Ntaflos <daff@pseudoterminal.org>
Date: Sat, 30 Apr 2016 00:46:20 +0200
Subject: [PATCH 0923/2267] Allow setting KeepAlive related options per vhost

Introduce the parameters vhost::keepalive, vhost::keepalive_timeout and
vhost::max_keepalive_requests, which are all undef by default, meaning
the server-wide KeepAlive options will be in effect. This way the
KeepAlive settings can be changed on a per-vhost basis.

Includes updated documentation and basic spec tests.
---
 README.md                              | 20 +++++++++++++++++++-
 manifests/vhost.pp                     | 19 +++++++++++++++++++
 spec/defines/vhost_spec.rb             | 17 +++++++++++++----
 templates/vhost/_keepalive_options.erb |  9 +++++++++
 4 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 templates/vhost/_keepalive_options.erb

diff --git a/README.md b/README.md
index 54a4084999..819a1eb72c 100644
--- a/README.md
+++ b/README.md
@@ -2206,6 +2206,24 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+##### `keepalive`
+
+Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive for the virtual host. Valid options: 'Off', 'On' and `undef`. Default: `undef`, meaning the global, server-wide [`KeepAlive`][] setting is in effect.
+
+Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options for the virtual host.
+
+##### `keepalive_timeout`
+
+Sets the [`KeepAliveTimeout`] directive for the virtual host, which determines the amount of time to wait for subsequent requests on a persistent HTTP connection. Default: `undef`, meaning the global, server-wide [`KeepAlive`][] setting is in effect.
+
+This parameter is only relevant if either the global, server-wide [`keepalive` parameter][] or the per-vhost `keepalive` parameter is enabled.
+
+##### `max_keepalive_requests`
+
+Limits the number of requests allowed per connection to the virtual host. Default: `undef`, meaning the global, server-wide [`KeepAlive`][] setting is in effect.
+
+This parameter is only relevant if either the global, server-wide [`keepalive` parameter][] or the per-vhost `keepalive` parameter is enabled.
+
 ##### `auth_kerb`
 
 Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid options: Boolean. Default: false.
@@ -3192,7 +3210,7 @@ apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
     { path    => '/path/to/directory',
-      require => { 
+      require => {
         enforce => 'all',
         require => ['group', 'not host host.example.com'],
       },
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 3845075c12..88e9c1b071 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -149,6 +149,9 @@
   $krb_verify_kdc              = 'on',
   $krb_servicename             = 'HTTP',
   $krb_save_credentials        = 'off',
+  $keepalive                   = undef,
+  $keepalive_timeout           = undef,
+  $max_keepalive_requests      = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -264,6 +267,10 @@
     validate_re($ssl_proxy_check_peer_expire,'(^on$|^off$)',"${ssl_proxy_check_peer_expire} is not permitted for ssl_proxy_check_peer_expire. Allowed values are 'on' or 'off'.")
   }
 
+  if $keepalive {
+    validate_re($keepalive,'(^on$|^off$)',"${keepalive} is not permitted for keepalive. Allowed values are 'on' or 'off'.")
+  }
+
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -1051,6 +1058,18 @@
     }
   }
 
+  # Template uses:
+  # - $keepalive
+  # - $keepalive_timeout
+  # - $max_keepalive_requests
+  if $keepalive or $keepalive_timeout or $max_keepalive_requests {
+    concat::fragment { "${name}-keepalive_options":
+      target  => "${priority_real}${filename}.conf",
+      order   => 350,
+      content => template('apache/vhost/_keepalive_options.erb'),
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 6df7c8e311..6e72b00081 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -201,7 +201,7 @@
               'path'     => '/var/www/files',
               'provider' => 'files',
               'require'  =>
-              { 
+              {
                 'enforce'  => 'all',
                 'requires' => ['all-valid1', 'all-valid2'],
               },
@@ -210,7 +210,7 @@
               'path'     => '/var/www/files',
               'provider' => 'files',
               'require'  =>
-              { 
+              {
                 'enforce'  => 'none',
                 'requires' => ['none-valid1', 'none-valid2'],
               },
@@ -219,7 +219,7 @@
               'path'     => '/var/www/files',
               'provider' => 'files',
               'require'  =>
-              { 
+              {
                 'enforce'  => 'any',
                 'requires' => ['any-valid1', 'any-valid2'],
               },
@@ -395,7 +395,10 @@
           'krb_authoritative'           => 'off',
           'krb_auth_realms'             => ['EXAMPLE.ORG','EXAMPLE.NET'],
           'krb_5keytab'                 => '/tmp/keytab5',
-          'krb_local_user_mapping'      => 'off'
+          'krb_local_user_mapping'      => 'off',
+          'keepalive'                   => 'on',
+          'keepalive_timeout'           => '100',
+          'max_keepalive_requests'      => '1000',
         }
       end
       let :facts do
@@ -600,6 +603,12 @@
         :content => /^\s+KrbSaveCredentials\soff$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
         :content => /^\s+KrbVerifyKDC\son$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+        :content => /^\s+KeepAlive\son$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+        :content => /^\s+KeepAliveTimeout\s100$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+        :content => /^\s+MaxKeepAliveRequests\s1000$/)}
     end
     context 'vhost with multiple ip addresses' do
       let :params do
diff --git a/templates/vhost/_keepalive_options.erb b/templates/vhost/_keepalive_options.erb
new file mode 100644
index 0000000000..d14f5ed155
--- /dev/null
+++ b/templates/vhost/_keepalive_options.erb
@@ -0,0 +1,9 @@
+<%- if @keepalive -%>
+  KeepAlive <%= @keepalive %>
+<%- end -%>
+<%- if @keepalive_timeout -%>
+  KeepAliveTimeout <%= @keepalive_timeout %>
+<%- end -%>
+<%- if @max_keepalive_requests -%>
+  MaxKeepAliveRequests <%= @max_keepalive_requests %>
+<%- end -%>

From 510562e572cc78c0fdcf7a7241c34e5870dd229f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sat, 30 Apr 2016 10:34:44 +0200
Subject: [PATCH 0924/2267] Set actual path to apachectl on FreeBSD.

This unbreaks snippets verification.
---
 manifests/params.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index 60e184a962..0a6f547199 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -51,6 +51,8 @@
 
   if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
     $verify_command = '/usr/sbin/apache2ctl -t'
+  } elsif $::operatingsystem == 'FreeBSD' {
+    $verify_command = '/usr/local/sbin/apachectl -t'
   } else {
     $verify_command = '/usr/sbin/apachectl -t'
   }

From 3f4e1cf0929c1d9f2271ed9e96f6ed7f14d6d393 Mon Sep 17 00:00:00 2001
From: Jairo Junior <junior.jairo1@gmail.com>
Date: Wed, 20 Apr 2016 17:10:11 -0300
Subject: [PATCH 0925/2267] Add support for mod_cluster, an httpd-based load
 balancer.

---
 README.md                        |  27 ++++++++
 manifests/mod/cluster.pp         |  38 +++++++++++
 spec/classes/mod/cluster_spec.rb | 105 +++++++++++++++++++++++++++++++
 templates/mod/cluster.conf.erb   |  23 +++++++
 4 files changed, 193 insertions(+)
 create mode 100644 manifests/mod/cluster.pp
 create mode 100644 spec/classes/mod/cluster_spec.rb
 create mode 100644 templates/mod/cluster.conf.erb

diff --git a/README.md b/README.md
index 1b861f56a4..cc806b248e 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@
 [`apache::mod::auth_cas`]: #class-apachemodauth_cas
 [`apache::mod::auth_mellon`]: #class-apachemodauth_mellon
 [`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap
+[`apache::mod::cluster`]: #class-apachemodcluster
 [`apache::mod::disk_cache`]: #class-apachemoddisk_cache
 [`apache::mod::event`]: #class-apachemodevent
 [`apache::mod::ext_filter`]: #class-apachemodext_filter
@@ -1273,6 +1274,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `cache`
 * `cgi`
 * `cgid`
+* `cluster` (see [`apache::mod::cluster`][])
 * `dav`
 * `dav_fs`
 * `dav_svn`\*
@@ -1428,6 +1430,31 @@ Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to gener
 - `package_name`: Default: `undef`.
 - `verify_server_cert`: Default: `undef`.
 
+##### Class: `apache::mod::cluster`
+
+**Note**: There is no official package available for mod\_cluster and thus it must be made available by means outside of the control of the apache module. Binaries can be found at http://mod-cluster.jboss.org/
+
+``` puppet
+class { '::apache::mod::cluster':
+  ip                      => '172.17.0.1',
+  allowed_network         => '172.17.0.',
+  balancer_name           => 'mycluster',
+  version                 => '1.3.1'
+}
+```
+
+**Parameters within `apache::mod::cluster`**:
+
+- `port`: mod_cluster listen port. Default: '6666'.
+- `server_advertise`: Whether the server should advertise. Default: true.
+- `manager_allowed_network`: Network allowed to access the mod_cluster_manager. Default: '127.0.0.1'.
+- `keep_alive_timeout`: Keep-alive timeout. Default: 60.
+- `max_keep_alive_requests`: Max number of requests kept alive. Default: 0
+- `enable_mcpm_receive`: Whether MCPM should be enabled: Default: true.
+- `ip`: Listen ip address..
+- `allowed_network`: Balanced members network.
+- `version`: mod_cluster version. >= 1.3.0 is required for httpd 2.4.
+
 ##### Class: `apache::mod::deflate`
 
 Installs and configures [`mod_deflate`][].
diff --git a/manifests/mod/cluster.pp b/manifests/mod/cluster.pp
new file mode 100644
index 0000000000..a3a9f6c631
--- /dev/null
+++ b/manifests/mod/cluster.pp
@@ -0,0 +1,38 @@
+class apache::mod::cluster (
+  $allowed_network,
+  $balancer_name,
+  $ip,
+  $version,
+  $enable_mcpm_receive = true,
+  $port = '6666',
+  $keep_alive_timeout = 60,
+  $manager_allowed_network = '127.0.0.1',
+  $max_keep_alive_requests = 0,
+  $server_advertise = true,
+) {
+
+  include ::apache
+
+  ::apache::mod { 'proxy': }
+  ::apache::mod { 'proxy_ajp': }
+  ::apache::mod { 'manager': }
+  ::apache::mod { 'proxy_cluster': }
+  ::apache::mod { 'advertise': }
+
+  if (versioncmp($version, '1.3.0') >= 0 ) {
+    ::apache::mod { 'cluster_slotmem': }
+  } else {
+    ::apache::mod { 'slotmem': }
+  }
+
+  file {'cluster.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/cluster.conf",
+    mode    => $::apache::file_mode,
+    content => template('apache/mod/cluster.conf.erb'),
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
+
+}
diff --git a/spec/classes/mod/cluster_spec.rb b/spec/classes/mod/cluster_spec.rb
new file mode 100644
index 0000000000..b5f74bac7d
--- /dev/null
+++ b/spec/classes/mod/cluster_spec.rb
@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe 'apache::mod::cluster', :type => :class do
+  context 'on a RedHat OS Release 7 with mod version = 1.3.0' do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7',
+        :concat_basedir         => '/dne',
+        :operatingsystem        => 'RedHat',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
+      }
+    end
+
+    let(:params) {
+      {
+        :allowed_network         => '172.17.0',
+        :balancer_name           => 'mycluster',
+        :ip                      => '172.17.0.1',
+        :version                 => '1.3.0'
+      }
+    }
+
+    it { is_expected.to contain_class("apache") }
+    it { is_expected.to contain_apache__mod('proxy') }
+    it { is_expected.to contain_apache__mod('proxy_ajp') }
+    it { is_expected.to contain_apache__mod('manager') }
+    it { is_expected.to contain_apache__mod('proxy_cluster') }
+    it { is_expected.to contain_apache__mod('advertise') }
+    it { is_expected.to contain_apache__mod('cluster_slotmem') }
+
+    it { is_expected.to contain_file('cluster.conf') }
+  end
+
+  context 'on a RedHat OS Release 7 with mod version > 1.3.0' do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7',
+        :concat_basedir         => '/dne',
+        :operatingsystem        => 'RedHat',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
+      }
+    end
+
+    let(:params) {
+      {
+        :allowed_network         => '172.17.0',
+        :balancer_name           => 'mycluster',
+        :ip                      => '172.17.0.1',
+        :version                 => '1.3.1'
+      }
+    }
+
+    it { is_expected.to contain_class('apache') }
+    it { is_expected.to contain_apache__mod('proxy') }
+    it { is_expected.to contain_apache__mod('proxy_ajp') }
+    it { is_expected.to contain_apache__mod('manager') }
+    it { is_expected.to contain_apache__mod('proxy_cluster') }
+    it { is_expected.to contain_apache__mod('advertise') }
+    it { is_expected.to contain_apache__mod('cluster_slotmem') }
+
+    it { is_expected.to contain_file('cluster.conf') }
+  end
+
+  context 'on a RedHat OS Release 6 with mod version < 1.3.0' 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',
+        :is_pe                  => false,
+      }
+    end
+
+    let(:params) {
+      {
+        :allowed_network         => '172.17.0',
+        :balancer_name           => 'mycluster',
+        :ip                      => '172.17.0.1',
+        :version                 => '1.2.0'
+      }
+    }
+
+    it { is_expected.to contain_class('apache') }
+    it { is_expected.to contain_apache__mod('proxy') }
+    it { is_expected.to contain_apache__mod('proxy_ajp') }
+    it { is_expected.to contain_apache__mod('manager') }
+    it { is_expected.to contain_apache__mod('proxy_cluster') }
+    it { is_expected.to contain_apache__mod('advertise') }
+    it { is_expected.to contain_apache__mod('slotmem') }
+
+    it { is_expected.to contain_file('cluster.conf') }
+  end
+end
diff --git a/templates/mod/cluster.conf.erb b/templates/mod/cluster.conf.erb
new file mode 100644
index 0000000000..6a998a0e96
--- /dev/null
+++ b/templates/mod/cluster.conf.erb
@@ -0,0 +1,23 @@
+Listen <%= @ip %>:<%= @port %>
+<VirtualHost <%= @ip %>:<%= @port %>>
+  <Location />
+    Order deny,allow
+    Deny from all
+    Allow from <%= @allowed_network %>
+  </Location>
+
+  KeepAliveTimeout <%= @keep_alive_timeout %>
+  MaxKeepAliveRequests <%= @max_keep_alive_requests %>
+  EnableMCPMReceive <%= scope.function_bool2httpd([@enable_mcpm_receive]) %>
+
+  ManagerBalancerName <%= @balancer_name %>
+  ServerAdvertise <%= scope.function_bool2httpd([@server_advertise]) %>
+
+  <Location /mod_cluster_manager>
+    SetHandler mod_cluster-manager
+    Order deny,allow
+    Deny from all
+    Allow from <%= @manager_allowed_network %>
+  </Location>
+
+</VirtualHost>

From 9995c24db29f09070aaebf4bb86dcd26caa56a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Mo=CC=88ding?= <stm@kill-9.net>
Date: Fri, 22 Apr 2016 20:56:31 +0200
Subject: [PATCH 0926/2267] Set DAV parameters in a directory block

---
 README.md                        | 12 ++++++++++++
 spec/defines/vhost_spec.rb       | 11 +++++++++++
 templates/vhost/_directories.erb |  9 +++++++++
 3 files changed, 32 insertions(+)

diff --git a/README.md b/README.md
index 1b861f56a4..abbe15542f 100644
--- a/README.md
+++ b/README.md
@@ -2938,6 +2938,18 @@ ProxyStatus On',
 }
 ```
 
+###### `dav`
+
+Sets the value for [Dav](http://httpd.apache.org/docs/current/mod/mod_dav.html#dav), which determines if the WebDAV HTTP methods should be enabled. The value can be either `On`, `Off` or the name of the provider. A value of `On` enables the default filesystem provider implemented by the `mod_dav_fs` module.
+
+###### `dav_depth_infinity`
+
+Sets the value for [DavDepthInfinity](http://httpd.apache.org/docs/current/mod/mod_dav.html#davdepthinfinity), which is used to enable the processing of `PROPFIND` requests having a `Depth: Infinity` header.
+
+###### `dav_min_timeout`
+
+Sets the value for [DavMinTimeout](http://httpd.apache.org/docs/current/mod/mod_dav.html#davmintimeout), which sets the time the server holds a lock on a DAV resource. The value should be the number of seconds to set.
+
 ###### `deny`
 
 Sets a [Deny](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 06b1d5a10d..95b1f32b8b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -245,6 +245,11 @@
                 },
               ],
             },
+            { 'path'               => '/var/www/dav',
+              'dav'                => 'filesystem',
+              'dav_depth_infinity' => true,
+              'dav_min_timeout'    => '600',
+            },
           ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
@@ -507,6 +512,12 @@
         :content => /^\s+<Limit GET HEAD>$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>/m ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Dav\sfilesystem$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+DavDepthInfinity\sOn$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+DavMinTimeout\s600$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 50561e863f..df2690c431 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -115,6 +115,15 @@
     ErrorDocument <%= error_document['error_code'] %> <%= error_document['document'] %>
       <%- end -%>
     <%- end -%>
+    <%- if directory['dav'] -%>
+    Dav <%= directory['dav'] %>
+    <%- if directory['dav_depth_infinity'] -%>
+    DavDepthInfinity <%= scope.function_bool2httpd([directory['dav_depth_infinity']]) %>
+    <%- end -%>
+    <%- if directory['dav_min_timeout'] -%>
+    DavMinTimeout <%= directory['dav_min_timeout'] %>
+    <%- end -%>
+    <%- end -%>
     <%- if directory['auth_type'] -%>
     AuthType <%= directory['auth_type'] %>
     <%- end -%>

From 00db1f929d952dcf6569e3b5ce69a559f69218c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20R=C3=BCssel?= <ruessel@synyx.de>
Date: Mon, 25 Apr 2016 14:27:46 +0200
Subject: [PATCH 0927/2267] add additional directories options for LDAP Auth

* AuthLDAPURL as auth_ldap_url
* AUTHLDAPBindDN as auth_ldap_bind_dn
* AuthLDAPBindPassword as auth_ldap_bind_password
* AuthLDAPGroupAttribute as auth_ldap_group_attribute
* AuthLDAPGroupAttributeIsDN as auth_ldap_group_attribute_is_dn

add documentation in README for additional directories options LDAP Auth
---
 README.md                        | 20 ++++++++++++++++++++
 templates/vhost/_directories.erb | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/README.md b/README.md
index 74b5183152..87f4a84cf8 100644
--- a/README.md
+++ b/README.md
@@ -2889,6 +2889,26 @@ Sets the value for [AuthUserFile](https://httpd.apache.org/docs/current/mod/mod_
 
 Sets the value for [AuthMerging](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#authmerging), which determines if authorization logic should be combined
 
+###### `auth_ldap_url`
+
+Sets the value for [AuthLDAPURL](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapurl), which determines URL of LDAP-server(s) if AuthBasicProvider 'ldap' is used
+
+###### `auth_ldap_bind_dn`
+
+Sets the value for [AuthLDAPBindDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbinddn), which allows use of an optional DN used to bind to the LDAP-server when searching for entries if AuthBasicProvider 'ldap' is used
+
+###### `auth_ldap_bind_password`
+
+Sets the value for [AuthLDAPBindPassword](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbindpassword), which allows use of an optional bind password to use in conjunction with the bind DN if AuthBasicProvider 'ldap' is used
+
+###### `auth_ldap_group_attribute`
+
+Array of values for [AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute), specifies which LDAP attributes are used to check for user members within ldap-groups. defaults are: "member" and "uniquemember"
+
+###### `auth_ldap_group_attribute_is_dn`
+
+Sets value for [AuthLDAPGroupAttributeIsDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattributeisdn), specifies if member of a ldapgroup is a dn or simple username. When set on, this directive says to use the distinguished name of the client username when checking for group membership. Otherwise, the username will be used. valid values are: "on" or "off"
+
 ###### `custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the directory configuration.
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 789ade537c..9d9381f83a 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -207,6 +207,26 @@
     <%- if directory['auth_merging'] -%>
     AuthMerging <%= directory['auth_merging'] %>
     <%- end -%>
+    <%- if directory['auth_ldap_url'] -%>
+    AuthLDAPURL <%= directory['auth_ldap_url'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_bind_dn'] -%>
+    AuthLDAPBindDN <%= directory['auth_ldap_bind_dn'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_bind_password'] -%>
+    AuthLDAPBindPassword <%= directory['auth_ldap_bind_password'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_group_attribute'] -%>
+      <%- Array(directory['auth_ldap_group_attribute']).each do |groupattr| -%>
+    AuthLDAPGroupAttribute <%= groupattr %>
+      <%- end -%>
+    <%- end -%>
+    <%- if directory['auth_ldap_group_attribute_is_dn'] == 'off' -%>
+    AuthLDAPGroupAttributeIsDN Off
+    <%- end -%>
+    <%- if directory['auth_ldap_group_attribute_is_dn'] == 'on' -%>
+    AuthLDAPGroupAttributeIsDN On
+    <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>
     <%- end -%>

From b044e5905269f4c37ac337277d43cd98204ed589 Mon Sep 17 00:00:00 2001
From: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
Date: Sat, 7 May 2016 23:18:55 +0200
Subject: [PATCH 0928/2267] Only set SSLCompression when it is set to true.

The default for SSLCompression in Apache is 'Off' anyways, see:
https://httpd.apache.org/docs/2.4/mod/mod_ssl.html#sslcompression
therefore there is no real need to add that into the config file.

This will prevent problems on Apache versions that have
linked against SSL libraries that do not have SSLCompression
enabled. There, even SSLCompression Off will lead to:

H00526: Syntax error on line 14 of /etc/apache2/modules/ssl.conf:
Setting Compression mode unsupported; not implemented by the SSL library

and prevents Apache startup

Add some spec tests for that behaviour, depending on whether Apache
version >= 2.4 or not, since the template also differentiates.
---
 spec/classes/mod/ssl_spec.rb | 40 ++++++++++++++++++++++++++++++++++++
 templates/mod/ssl.conf.erb   |  2 ++
 2 files changed, 42 insertions(+)

diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index f76377e859..6b0d8def3e 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -133,6 +133,46 @@
       it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog builtin$/)}
     end
 
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => '2.2',
+        }
+      end
+      context 'ssl_compression with default value' do
+        it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLCompression Off$/)}
+      end
+
+      context 'setting ssl_compression to true' do
+        let :params do
+          {
+            :ssl_compression => true,
+          }
+        end
+        it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLCompression On$/)}
+      end
+    end
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => '2.4',
+        }
+      end
+      context 'ssl_compression with default value' do
+        it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLCompression Off$/)}
+      end
+
+      context 'setting ssl_compression to true' do
+        let :params do
+          {
+            :apache_version => '2.4',
+            :ssl_compression => true,
+          }
+        end
+        it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLCompression On$/)}
+      end
+    end
+
     context 'setting ssl_pass_phrase_dialog' do
       let :params do
         {
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 15aab10d78..68ad179a72 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -12,7 +12,9 @@
   SSLSessionCacheTimeout <%= @ssl_sessioncachetimeout %>
   <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   Mutex <%= @_ssl_mutex %>
+    <%- if @ssl_compression -%>
   SSLCompression <%= scope.function_bool2httpd([@ssl_compression]) %>
+    <%- end -%>
   <%- else -%>
   SSLMutex <%= @_ssl_mutex %>
   <%- end -%>

From cd3ff1394bc59a09c914dc522a2dc71d3bd5e492 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Wed, 11 May 2016 10:36:25 -0700
Subject: [PATCH 0929/2267] Release Prep for 1.10.0

---
 CHANGELOG.md  | 22 ++++++++++++++++++++--
 metadata.json |  6 +-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b1da63b53..4025bdba7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,25 @@
-## Supported Release 1.9.0
-### Summary
+## Supported Release 1.10.0
+#### Summary
+This release fixes backwards compatibilty bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature.
 
+#### Features
+- Allow setting KeepAlive related options per vhost
+  - `apache::vhost::keepalive`
+  - `apache::vhost::keepalive_timeout`
+  - `apache::vhost::max_keepalive_requests`
+- Adds new class `apache::mod::cluster`
 
+#### Bugfixes
+- MODULES-2890: Allow php_version != 5
+- MODULES-2890: mod::php: Explicit test on jessie
+- MODULES-2890: Fix PHP on Debian stretch and Ubuntu Xenial
+- MODULES-2890: Fix mod_php SetHandler and cleanup
+- Fixed trailing slash in lib_path on Suse
+- Revert "MODULES-2956: Enable options within location block on proxy_match". Bug introduced in release 1.9.0.
+- Revert "changed rpaf Configuration Directives: RPAF -> RPAF_". Bug introduced in release 1.9.0.
+- Set actual path to apachectl on FreeBSD. Fixes snippets verification.
+
+## Supported Release 1.9.0 [DELETED]
 #### Features
 - Added `apache_version` fact
 - Added `apache::balancer::target` attribute
diff --git a/metadata.json b/metadata.json
index 972f456d07..a82bccc323 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -69,10 +69,6 @@
     }
   ],
   "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": ">= 3.7.0 < 2015.4.0"
-    },
     {
       "name": "puppet",
       "version_requirement": ">= 3.0.0 < 5.0.0"

From 8190e96122ee6cc789b7e85fa1c17b3dbad6fea7 Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Tue, 10 May 2016 09:08:07 +0200
Subject: [PATCH 0930/2267] mod_event: parameters can be unset

---
 README.md                      | 16 +++++++-------
 spec/classes/mod/event_spec.rb | 38 ++++++++++++++++++++++++++++++----
 templates/mod/event.conf.erb   | 18 ++++++++++++++--
 3 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c35cee3d04..2f2fd50d53 100644
--- a/README.md
+++ b/README.md
@@ -1367,14 +1367,14 @@ Installs and manages [`mod_mpm_event`][]. You can't include both `apache::mod::e
 
 **Parameters within `apache::mod::event`**:
 
-- `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive. Default: '511'.
-- `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Default: '150'.
-- `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Default: '0'.
-- `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Default: '75' and '25', respectively.
-- `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Default: '25'.
-- `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Default: '2'.
-- `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Default: '64'.
-- `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. Default: '25'.
+- `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive. Default: '511'. Setting this to 'false' removes the parameter.
+- `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Default: '150'. Setting these to 'false' removes the parameters.
+- `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Default: '0'. Setting these to 'false' removes the parameters.
+- `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Default: '75' and '25', respectively. Setting these to 'false' removes the parameters.
+- `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Default: '25'. Setting this to 'false' removes the parameter.
+- `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Default: '2'. Setting this to 'false' removes the parameter.
+- `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Default: '64'. Setting this to 'false' removes the parameter.
+- `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. Default: '25'. Setting this to 'false' removes the parameter.
 
 ##### Class: `apache::mod::auth_cas`
 
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 00291a5f98..b010d4c024 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -78,11 +78,11 @@
 
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxClients\s*2/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxClients/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MinSpareThreads\s*3/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxSpareThreads\s*4/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadsPerChild\s*5/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestsPerChild\s*6/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestsPerChild/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestWorkers\s*9/) }
@@ -115,8 +115,38 @@
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestsPerChild\s*6/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) }
       it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestWorkers\s*9/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxConnectionsPerChild\s*10/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestWorkers/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxConnectionsPerChild/) }
+    end
+
+    context "Test mpm_event false params" do
+      let :params do
+        {
+          :serverlimit            => false,
+          :startservers           => false,
+          :maxclients             => false,
+          :minsparethreads        => false,
+          :maxsparethreads        => false,
+          :threadsperchild        => false,
+          :maxrequestsperchild    => false,
+          :threadlimit            => false,
+          :listenbacklog          => false,
+          :maxrequestworkers      => false,
+          :maxconnectionsperchild => false,
+        }
+      end
+
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ServerLimit/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*StartServers/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxClients/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MinSpareThreads/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxSpareThreads/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ThreadsPerChild/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestsPerChild/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ThreadLimit/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ListenBacklog/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestWorkers/) }
+      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxConnectionsPerChild/) }
     end
 
     context "with Apache version < 2.4" do
diff --git a/templates/mod/event.conf.erb b/templates/mod/event.conf.erb
index da7682fb4d..bca707c932 100644
--- a/templates/mod/event.conf.erb
+++ b/templates/mod/event.conf.erb
@@ -1,19 +1,33 @@
 <IfModule mpm_event_module>
+  <%- if @serverlimit -%>
   ServerLimit            <%= @serverlimit %>
+  <%- end -%>
+  <%- if @startservers -%>
   StartServers           <%= @startservers %>
+  <%- end -%>
   <%- if @maxrequestworkers -%>
   MaxRequestWorkers      <%= @maxrequestworkers %>
-  <%- else -%>
+  <%- elsif @maxclients -%>
   MaxClients             <%= @maxclients %>
   <%- end -%>
+  <%- if @minsparethreads -%>
   MinSpareThreads        <%= @minsparethreads %>
+  <%- end -%>
+  <%- if @maxsparethreads -%>
   MaxSpareThreads        <%= @maxsparethreads %>
+  <%- end -%>
+  <%- if @threadsperchild -%>
   ThreadsPerChild        <%= @threadsperchild %>
+  <%- end -%>
   <%- if @maxconnectionsperchild -%>
   MaxConnectionsPerChild <%= @maxconnectionsperchild %>
-  <%- else -%>
+  <%- elsif @maxrequestsperchild -%>
   MaxRequestsPerChild    <%= @maxrequestsperchild %>
   <%- end -%>
+  <%- if @threadlimit -%>
   ThreadLimit            <%= @threadlimit %>
+  <%- end -%>
+  <%- if @listenbacklog -%>
   ListenBacklog          <%= @listenbacklog %>
+  <%- end -%>
 </IfModule>

From 3209a5e90d4f0664f558999a48277fdd86fe7c7e Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Fri, 13 May 2016 12:34:12 -0700
Subject: [PATCH 0931/2267] (maint) Disables mod_pagespeed tests for Debian 7

Because libc6 package on Debian Wheezy repo is old, and Pagespeed needs newer.
---
 spec/acceptance/mod_pagespeed_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 009df6a101..6d3a8c8823 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -1,7 +1,8 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::pagespeed class' do
+# Don't run this test on Debian < 8, because Debian doesn't like updating packages and Pagespeed doesn't like old packages.
+describe 'apache::mod::pagespeed class', :unless => (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') < '8') do
   context "default pagespeed config" do
     it 'succeeds in puppeting pagespeed' do
       pp= <<-EOS

From ece000357b5ac30ae50f355b9f09605826df4c5d Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Mon, 16 May 2016 09:16:50 +0100
Subject: [PATCH 0932/2267] Remove duplicate shib2 hash element

Prevents warning under Puppet 4:

     The key 'shib2' is declared more than once at modules/apache/manifests/params.pp:241:21
---
 manifests/params.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 55682f3bb6..6a9f14919d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -248,7 +248,6 @@
       'suphp'       => 'libapache2-mod-suphp',
       'wsgi'        => 'libapache2-mod-wsgi',
       'xsendfile'   => 'libapache2-mod-xsendfile',
-      'shib2'       => 'libapache2-mod-shib2',
     }
     if $::osfamily == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0 {
       $shib2_lib = 'mod_shib_22.so'

From cf95d5179325889348931cd1d6fcea400ee85ce0 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Mon, 16 May 2016 09:58:27 -0700
Subject: [PATCH 0933/2267] (maint) Skip pagespeed tests on Ubuntu lucid too

---
 spec/acceptance/mod_pagespeed_spec.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 6d3a8c8823..602c78c2f0 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -1,8 +1,11 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-# Don't run this test on Debian < 8, because Debian doesn't like updating packages and Pagespeed doesn't like old packages.
-describe 'apache::mod::pagespeed class', :unless => (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') < '8') do
+# Don't run this test on Debian < 8 or Ubuntu < 12, because Debian doesn't like
+# updating packages and Pagespeed doesn't like old packages.
+describe 'apache::mod::pagespeed class', :unless =>
+  ((fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') < '8') or
+   (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') < '12')) do
   context "default pagespeed config" do
     it 'succeeds in puppeting pagespeed' do
       pp= <<-EOS

From 18a76027c7f23f94c37ed2f27944b789f14e5a44 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Mon, 16 May 2016 10:06:50 -0700
Subject: [PATCH 0934/2267] (maint) Update README to warn about Pagespeed's
 evolving reqs

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c35cee3d04..8f5f8d59cc 100644
--- a/README.md
+++ b/README.md
@@ -1606,6 +1606,8 @@ Installs and manages [`mod_pagespeed`][], a Google module that rewrites web page
 
 While this Apache module requires the `mod-pagespeed-stable` package, Puppet **doesn't** manage the software repositories required to automatically install the package. If you declare this class when the package is either not installed or not available to your package manager, your Puppet run will fail.
 
+**Note:** Verify that your system is compatible with the latest Google Pagespeed requirements.
+
 **Parameters within `apache::mod::pagespeed`**:
 
 - `inherit_vhost_config`: Default: 'on'.

From 1eb9f9e429db852b5a43c8c1123688142cbddb06 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Tue, 17 May 2016 13:13:08 -0700
Subject: [PATCH 0935/2267] (maint) Skip proxy_html tests due to missing pkgs

---
 README.md                              | 2 +-
 spec/acceptance/mod_proxy_html_spec.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8f5f8d59cc..479b20aa1e 100644
--- a/README.md
+++ b/README.md
@@ -3682,7 +3682,7 @@ The [`apache::mod::passenger`][] class is not installing as the the EL6 reposito
 
 ### RHEL/CentOS 7
 
-The [`apache::mod::passenger`][] class is untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uris`][] parameter.
+The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uris`][] parameter.
 
 ### General
 
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index f87d825837..ce8aad6f3d 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -1,7 +1,8 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::proxy_html class' do
+# Don't run proxy_html tests on RHEL7 because the yum repos are missing packages required by it.
+describe 'apache::mod::proxy_html class', :unless => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7') do
   context "default proxy_html config" do
     if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
       it 'adds epel' do

From f6049966734886b6d160420322c269a47a7357da Mon Sep 17 00:00:00 2001
From: Sebastian Gerhards <sebastian.gerhards@aktion-mensch.de>
Date: Fri, 6 May 2016 12:29:55 +0200
Subject: [PATCH 0936/2267] Add class apache::vhosts to create apache::vhost
 resources

---
 README.md                      | 24 +++++++++++++++++++++++
 manifests/vhosts.pp            |  6 ++++++
 spec/acceptance/vhosts_spec.rb | 32 +++++++++++++++++++++++++++++++
 spec/classes/vhosts_spec.rb    | 35 ++++++++++++++++++++++++++++++++++
 4 files changed, 97 insertions(+)
 create mode 100644 manifests/vhosts.pp
 create mode 100644 spec/acceptance/vhosts_spec.rb
 create mode 100644 spec/classes/vhosts_spec.rb

diff --git a/README.md b/README.md
index 2f2fd50d53..b65cc6a920 100644
--- a/README.md
+++ b/README.md
@@ -741,6 +741,7 @@ apache::balancer { 'puppet01':
 - [**Public classes**](#public-classes)
     - [Class: apache](#class-apache)
     - [Class: apache::dev](#class-apachedev)
+    - [Class: apache::vhosts](#class-apachevhosts)
     - [Classes: apache::mod::\*](#classes-apachemodname)
 - [**Private classes**](#private-classes)
     - [Class: apache::confd::no_accf](#class-apacheconfdno_accf)
@@ -1247,6 +1248,29 @@ The default value is determined by your operating system:
 
 > **Note**: On FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
 
+#### Class: `apache::vhosts`
+
+Creates [`apache::vhost`][] defined types.
+
+**Parameters within `apache::vhosts`**:
+
+- `vhosts`: A [hash][] where the key represents the name and the value represents a [hash][] of [`apache::vhost`][] defined type's parameters. Default: '{}'
+
+> **Note**: See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters or [Configuring virtual hosts].
+
+For example, to create a [name-based virtual host][name-based virtual hosts] 'custom_vhost_1, you can declare the class with the `vhosts` parameter set to '{ "custom_vhost_1" => { "docroot" => "/var/www/custom_vhost_1", "port" => "81" }':
+
+``` puppet
+class { 'apache::vhosts':
+  vhosts => {
+    'custom_vhost_1' => {
+      'docroot' => '/var/www/custom_vhost_1',
+      'port'    => '81',
+    },
+  },
+}
+```
+
 #### Classes: `apache::mod::<MODULE NAME>`
 
 Enables specific [Apache modules][]. You can enable and configure an Apache module by declaring its class. For example, to install and enable [`mod_alias`][] with no icons, you can declare the [`apache::mod::alias`][] class with the `icons_options` parameter set to 'None':
diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp
new file mode 100644
index 0000000000..cf212c4b12
--- /dev/null
+++ b/manifests/vhosts.pp
@@ -0,0 +1,6 @@
+class apache::vhosts (
+  $vhosts = {},
+) {
+  include ::apache
+  create_resources('apache::vhost', $vhosts)
+}
diff --git a/spec/acceptance/vhosts_spec.rb b/spec/acceptance/vhosts_spec.rb
new file mode 100644
index 0000000000..d8fb062f9d
--- /dev/null
+++ b/spec/acceptance/vhosts_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper_acceptance'
+require_relative './version.rb'
+
+describe 'apache::vhosts class' do
+  context 'custom vhosts defined via class apache::vhosts' do
+    it 'should create custom vhost config files' do
+      pp = <<-EOS
+        class { 'apache::vhosts':
+          vhosts => {
+            'custom_vhost_1' => {
+                'docroot' => '/var/www/custom_vhost_1',
+                'port' => '81',
+            },
+            'custom_vhost_2' => {
+                'docroot' => '/var/www/custom_vhost_2',
+                'port' => '82',
+            },
+          },
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-custom_vhost_1.conf") do
+      it { is_expected.to contain '<VirtualHost \*:81>' }
+    end
+
+    describe file("#{$vhost_dir}/25-custom_vhost_2.conf") do
+      it { is_expected.to contain '<VirtualHost \*:82>' }
+    end
+  end
+end
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
new file mode 100644
index 0000000000..3220079405
--- /dev/null
+++ b/spec/classes/vhosts_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'apache::vhosts', :type => :class do
+  context 'on all OSes' do
+    let :facts do
+      {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+      }
+    end
+    context 'with custom vhosts parameter' do
+      let :params do {
+          :vhosts => {
+              'custom_vhost_1' => {
+                  'docroot' => '/var/www/custom_vhost_1',
+                  'port' => '81',
+              },
+              'custom_vhost_2' => {
+                  'docroot' => '/var/www/custom_vhost_2',
+                  'port' => '82',
+              },
+          },
+      }
+      end
+      it { is_expected.to contain_apache__vhost('custom_vhost_1') }
+      it { is_expected.to contain_apache__vhost('custom_vhost_2') }
+    end
+  end
+end

From f5a20d78027132301510e59749be4710049bc092 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu, 19 May 2016 10:32:53 +0200
Subject: [PATCH 0937/2267] Add apache::mod::proxy_wstunnel

---
 manifests/mod/proxy_wstunnel.pp | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 manifests/mod/proxy_wstunnel.pp

diff --git a/manifests/mod/proxy_wstunnel.pp b/manifests/mod/proxy_wstunnel.pp
new file mode 100644
index 0000000000..57e6f1e801
--- /dev/null
+++ b/manifests/mod/proxy_wstunnel.pp
@@ -0,0 +1,4 @@
+class apache::mod::proxy_wstunnel {
+  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_wstunnel']
+  ::apache::mod { 'proxy_wstunnel': }
+}

From cc7bda1faa7b444b1a833d628873a6113297abc3 Mon Sep 17 00:00:00 2001
From: Chris Throup <chris.throup@mind-click.com>
Date: Thu, 19 May 2016 10:14:22 +0100
Subject: [PATCH 0938/2267] (MODULES-3388) Include mpm_module classes instead
 of class declaration

Change the use of an empty class declaration to an include statement.
This enables the relevant mpm_module to be safely declared elsewhere with custom parameters.
---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 194c1741e9..4c04aeac21 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -366,7 +366,7 @@
       all => $default_confd_files
     }
     if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans
-      class { "::apache::mod::${mpm_module}": }
+      include "::apache::mod::${mpm_module}"
     }
 
     $default_vhost_ensure = $default_vhost ? {

From 7fb558f1f04741e97dd38330539bbac0abb550a9 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Fri, 20 May 2016 14:00:29 +0100
Subject: [PATCH 0939/2267] Add minimal testing for proxy_wstunnel

---
 manifests/mod/proxy_wstunnel.pp    | 1 +
 spec/classes/mod/proxy_wstunnel.rb | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 spec/classes/mod/proxy_wstunnel.rb

diff --git a/manifests/mod/proxy_wstunnel.pp b/manifests/mod/proxy_wstunnel.pp
index 57e6f1e801..290954b742 100644
--- a/manifests/mod/proxy_wstunnel.pp
+++ b/manifests/mod/proxy_wstunnel.pp
@@ -1,4 +1,5 @@
 class apache::mod::proxy_wstunnel {
+  include ::apache, ::apache::mod::proxy
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_wstunnel']
   ::apache::mod { 'proxy_wstunnel': }
 }
diff --git a/spec/classes/mod/proxy_wstunnel.rb b/spec/classes/mod/proxy_wstunnel.rb
new file mode 100644
index 0000000000..5af217a05f
--- /dev/null
+++ b/spec/classes/mod/proxy_wstunnel.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'apache::mod::proxy_wstunnel', :type => :class do
+  it_behaves_like "a mod class, without including apache"
+end

From 06b5cf21741e2b758fff45d8cc3cf11185ed4952 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Fri, 20 May 2016 15:26:48 +0200
Subject: [PATCH 0940/2267] mod_dumpio configuration

New module class for dumpio with parameters for enabling input and/or
output dumping.

```puppet
class{'apache':
  default_mods => false,
  log_level    => 'dumpio:trace7',
}
class{'apache::mod::diskio':
  disk_io_input  => 'On',
  disk_io_output => 'Off',
}
```

* https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
---
 README.md                       | 24 +++++++++++++++-
 manifests/mod/dumpio.pp         | 20 +++++++++++++
 spec/classes/mod/dumpio_spec.rb | 51 +++++++++++++++++++++++++++++++++
 templates/mod/dumpio.conf.erb   |  3 ++
 4 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 manifests/mod/dumpio.pp
 create mode 100644 spec/classes/mod/dumpio_spec.rb
 create mode 100644 templates/mod/dumpio.conf.erb

diff --git a/README.md b/README.md
index ba7553dfc9..633d1f2d1b 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@
 [`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap
 [`apache::mod::cluster`]: #class-apachemodcluster
 [`apache::mod::disk_cache`]: #class-apachemoddisk_cache
+[`apache::mod::dumpio`]: #class-apachemoddumpio
 [`apache::mod::event`]: #class-apachemodevent
 [`apache::mod::ext_filter`]: #class-apachemodext_filter
 [`apache::mod::geoip`]: #class-apachemodgeoip
@@ -160,7 +161,7 @@
 [`mod_authnz_external`]: https://github.com/phokz/mod-auth-external
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
 [`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
-[`mod_cache_disk`]: https://httpd.apache.org/docs/current/mod/mod_cache_disk.html
+[`mod_dumpio`]: https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
 [`mod_expires`]: https://httpd.apache.org/docs/current/mod/mod_expires.html
 [`mod_ext_filter`]: https://httpd.apache.org/docs/current/mod/mod_ext_filter.html
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
@@ -1306,6 +1307,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `dev`
 * `dir`\*
 * `disk_cache` (see [`apache::mod::disk_cache`][])
+* `dumpio` (see [`apache::mod::dumpio`][])
 * `event` (see [`apache::mod::event`][])
 * `expires`
 * `ext_filter` (see [`apache::mod::ext_filter`][])
@@ -1384,6 +1386,26 @@ class {'::apache::mod::disk_cache':
   cache_root => '/path/to/cache',
 }
 ```
+##### Class: `apache::mod::diskio`
+
+Installs and configures [`mod_diskio`][].
+
+```puppet
+class{'apache':
+  default_mods => false,
+  log_level    => 'dumpio:trace7',
+}
+class{'apache::mod::diskio':
+  disk_io_input  => 'On',
+  disk_io_output => 'Off',
+}
+```
+
+
+**Parameters withing `apache::mod::diskio`**:
+
+- `dump_io_input`: Dump all input data to the error log. Must be `On` or `Off`, defaults to `Off`
+- `dump_io_output`: Dump all output data to the error log. Must be `On` or `Off`, defaults to `Off`
 
 ##### Class: `apache::mod::event`
 
diff --git a/manifests/mod/dumpio.pp b/manifests/mod/dumpio.pp
new file mode 100644
index 0000000000..4886666255
--- /dev/null
+++ b/manifests/mod/dumpio.pp
@@ -0,0 +1,20 @@
+class apache::mod::dumpio(
+  $dump_io_input  = 'Off',
+  $dump_io_output = 'Off',
+) {
+
+  validate_re(downcase($dump_io_input), '^(on|off)$', "${dump_io_input} is not supported for dump_io_input.  Allowed values are 'On' and 'Off'.")
+  validate_re(downcase($dump_io_output), '^(on|off)$', "${dump_io_output} is not supported for dump_io_output.  Allowed values are 'On' and 'Off'.")
+
+  ::apache::mod { 'dumpio': }
+  file{'dumpio.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/dumpio.conf",
+    mode    => $::apache::file_mode,
+    content => template('apache/mod/dumpio.conf.erb'),
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
+
+}
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
new file mode 100644
index 0000000000..106b23af0c
--- /dev/null
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe 'apache::mod::dumpio', :type => :class do
+  context "on a Debian OS" do
+    let :pre_condition do
+      'class{"apache":
+         default_mods => false,
+         mod_dir    => "/tmp/junk",
+       }'
+    end
+    let :facts do
+      {
+        :lsbdistcodename           => 'squeeze',
+        :osfamily                  => 'Debian',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'Debian',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
+      }
+    end
+    context "default configuration fore parameters" do
+      it { should compile }
+      it { should contain_class('apache::mod::dumpio') }
+      it { should contain_file("dumpio.conf").with_path("/tmp/junk/dumpio.conf") }
+      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"Off"$/)}
+      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"Off"$/)}
+    end
+    context "with dumpio_input set to On" do
+      let :params do
+        {
+          :dump_io_input => 'On',
+        }
+      end
+      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"On"$/)}
+      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"Off"$/)}
+    end
+    context "with dumpio_ouput set to On" do
+      let :params do
+        {
+          :dump_io_output => 'On',
+        }
+      end
+      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"Off"$/)}
+      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"On"$/)}
+    end
+  end
+end
diff --git a/templates/mod/dumpio.conf.erb b/templates/mod/dumpio.conf.erb
new file mode 100644
index 0000000000..29c34e2a5c
--- /dev/null
+++ b/templates/mod/dumpio.conf.erb
@@ -0,0 +1,3 @@
+# https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
+DumpIOInput "<%= @dump_io_input %>"
+DumpIOOutput "<%= @dump_io_output %>"

From 7fd334bfbb4606173cb7ea33dad61b8ec0f9c999 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Thu, 19 May 2016 16:01:33 +0200
Subject: [PATCH 0941/2267] apache::balancer now respects apache::confd_dir

Previously with a configuration of

```
class{'apache':
  confd_dir => '/my/directory':
}
balancer{'myb':}
```

balencer would create a file incorrectly in the default location
*/etc/apache2/conf.d/balancer_myb.conf*

balencer now uses the value *apache::confd_dir*.

A test case has been added for this bug.
---
 manifests/balancer.pp         |  2 +-
 spec/defines/balancer_spec.rb | 32 ++++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 65f6352a32..0d2439bfe2 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -52,7 +52,7 @@
   if $target {
     $_target = $target
   } else {
-    $_target = "${::apache::params::confd_dir}/balancer_${name}.conf"
+    $_target = "${::apache::confd_dir}/balancer_${name}.conf"
   }
 
   concat { "apache_balancer_${name}":
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index 4a1477b13d..65df6d3730 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe 'apache::balancer', :type => :define do
-  let :pre_condition do
-    'include apache'
+  let :title do
+    'myapp'
   end
   let :facts do
     {
@@ -17,17 +17,29 @@
       :is_pe                  => false,
     }
   end
-  describe "accept a target parameter and use it" do
-    let :title do
-      'myapp'
+  describe 'apache pre_condition with defaults' do
+    let :pre_condition do
+      'include apache'
     end
-    let :params do
-      {
-        :target => '/tmp/myapp.conf'
-      }
+    describe "accept a target parameter and use it" do
+      let :params do
+        {
+          :target => '/tmp/myapp.conf'
+        }
+      end
+      it { should contain_concat('apache_balancer_myapp').with({
+        :path => "/tmp/myapp.conf",
+      })}
+    end
+  end
+  describe 'apache pre_condition with conf_dir set' do 
+    let :pre_condition do
+      'class{"apache":
+          confd_dir => "/junk/path"
+       }'
     end
     it { should contain_concat('apache_balancer_myapp').with({
-      :path => "/tmp/myapp.conf",
+      :path => "/junk/path/balancer_myapp.conf",
     })}
   end
 end

From 7deaad212cd77dca887229b46fe92df08908d082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=B6rner?= <martin.moerner@aperto.de>
Date: Fri, 20 May 2016 17:35:59 +0200
Subject: [PATCH 0942/2267] fix and make 2.4 require docu more readable

When using the new Apache 2.4 Require(Any|All|None) syntax in puppet the hash value for this is named requires in the code and not require. Further more the array with require examples was not really easy readable.
---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ba7553dfc9..2e62b18723 100644
--- a/README.md
+++ b/README.md
@@ -3274,8 +3274,12 @@ apache::vhost { 'sample.example.net':
   directories => [
     { path    => '/path/to/directory',
       require => {
-        enforce => 'all',
-        require => ['group', 'not host host.example.com'],
+        enforce  => 'any',
+        requires => [
+          'ip 1.2.3.4',
+          'not host host.example.com',
+          'user xyz',
+        ],
       },
     },
   ],

From 338f777e47d774b9c50f76a3f512dab1fb305d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Mo=CC=88ding?= <stm@kill-9.net>
Date: Tue, 24 May 2016 06:16:28 +0200
Subject: [PATCH 0943/2267] Manage default root directory access rights

---
 README.md                   |  4 ++++
 manifests/init.pp           |  3 +++
 spec/classes/apache_spec.rb | 16 ++++++++++++++++
 templates/httpd.conf.erb    |  8 ++++++++
 4 files changed, 31 insertions(+)

diff --git a/README.md b/README.md
index ba7553dfc9..9a91a1c8a7 100644
--- a/README.md
+++ b/README.md
@@ -1193,6 +1193,10 @@ Sets the desired permissions mode for config files, in symbolic or numeric notat
 
 Array of the desired options for the / directory in httpd.conf. Defaults to 'FollowSymLinks'.
 
+##### `root_directory_secured`
+
+Sets the default access policy for the / directory in httpd.conf. A value of 'false' allows access to all resources that are missing a more specific access policy. A value of 'true' denies access to all resources by default. In this case more specific rules must be used to allow access to these resources (e.g. in a directory block using the [`directories`](#parameter-directories-for-apachevhost) parameter). Valid options: Boolean. Default: false.
+
 ##### `vhost_dir`
 
 Changes your virtual host configuration files' location. Default: determined by your operating system.
diff --git a/manifests/init.pp b/manifests/init.pp
index 4c04aeac21..005479f068 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -81,6 +81,7 @@
   $mime_types_additional  = $::apache::params::mime_types_additional,
   $file_mode              = $::apache::params::file_mode,
   $root_directory_options = $::apache::params::root_directory_options,
+  $root_directory_secured = false,
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
@@ -89,6 +90,7 @@
   validate_bool($service_enable)
   validate_bool($service_manage)
   validate_bool($use_optional_includes)
+  validate_bool($root_directory_secured)
 
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
@@ -343,6 +345,7 @@
     # - $server_signature
     # - $trace_enable
     # - $rewrite_lock
+    # - $root_directory_secured
     file { "${::apache::conf_dir}/${::apache::params::conf_file}":
       ensure  => file,
       content => template($conf_template),
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 2fe53f409c..6eef4ba249 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -852,6 +852,22 @@
       end
       it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options -Indexes -FollowSymLinks} }
     end
+    context 'with a custom root_directory_secured parameter and Apache < 2.4' do
+      let :params do {
+        :apache_version => '2.2',
+        :root_directory_secured => true
+      }
+      end
+      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Order deny,allow\n\s+Deny from all} }
+    end
+    context 'with a custom root_directory_secured parameter and Apache >= 2.4' do
+      let :params do {
+        :apache_version => '2.4',
+        :root_directory_secured => true
+      }
+      end
+      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Require all denied} }
+    end
     context 'default vhost defaults' do
       it { is_expected.to contain_apache__vhost('default').with_ensure('present') }
       it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('absent') }
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 448d1fec55..21184179ff 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -33,6 +33,14 @@ AccessFileName .htaccess
 <Directory />
   Options <%= Array(@root_directory_options).join(' ') %>
   AllowOverride None
+<%- if @root_directory_secured -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  Require all denied
+<%- else -%>
+  Order deny,allow
+  Deny from all
+<%- end -%>
+<%- end -%>
 </Directory>
 
 <% if @default_charset -%>

From 6842f5c46e893dd88f5e3c654bc5f2408b0cd07f Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 25 May 2016 19:24:59 +0100
Subject: [PATCH 0944/2267] Update tests to pass with puppet 4.5 and test
 properly

---
 spec/classes/params_spec.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index d02209497b..32ccd313c9 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -15,10 +15,8 @@
         :is_pe                  => false,
       }
     end
-    it { is_expected.to contain_apache__params }
 
-    it "Should not contain any resources" do
-      should have_resource_count(0)
-    end
+    it { is_expected.to compile.with_all_deps }
+    it { is_expected.to have_resource_count(0) }
   end
 end

From 2bfffdd1d3b537e9998ede122f6a42e2d6ceaf40 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Tue, 7 Jun 2016 00:17:23 +0200
Subject: [PATCH 0945/2267] Add apache::mod::socache_shmcb so it can be
 included multiple times

---
 manifests/mod/socache_shmcb.pp | 3 +++
 manifests/mod/ssl.pp           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 manifests/mod/socache_shmcb.pp

diff --git a/manifests/mod/socache_shmcb.pp b/manifests/mod/socache_shmcb.pp
new file mode 100644
index 0000000000..7bfb4c6b57
--- /dev/null
+++ b/manifests/mod/socache_shmcb.pp
@@ -0,0 +1,3 @@
+class apache::mod::socache_shmcb {
+    ::apache::mod { 'socache_shmcb': }
+}
\ No newline at end of file
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 7a220e8345..a2d9c9055d 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -72,7 +72,7 @@
   }
 
   if versioncmp($_apache_version, '2.4') >= 0 {
-    ::apache::mod { 'socache_shmcb': }
+    include ::apache::mod::socache_shmcb
   }
 
   # Template uses

From a74bdea8f648a79fc05568badac084269e151d91 Mon Sep 17 00:00:00 2001
From: Lotte-Sara Laan <github@winnipeg.nl>
Date: Tue, 7 Jun 2016 22:41:21 +0200
Subject: [PATCH 0946/2267] Added support for apache 2.4 on Amazon Linux

It's now possible to use the default_mods parameter in combination with apache_version 2.4 on an Amazon Linux system
---
 manifests/mod.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 347179d40b..8958d1276f 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -50,7 +50,12 @@
   if $package {
     $_package = $package
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
-    $_package = $mod_packages[$mod]
+    if ($::apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/) {
+      # On amazon linux we need to prefix our package name with mod24 instead of mod to support apache 2.4
+      $_package = regsubst($mod_packages[$mod],'^(mod_)?(.*)','mod24_\2')
+    } else {
+      $_package = $mod_packages[$mod]
+    }
   } else {
     $_package = undef
   }

From 4b9f9a03de0c2ab7cd558b1092e11b0f6e4f652c Mon Sep 17 00:00:00 2001
From: Kimo Rosenbaum <kimor79@yahoo.com>
Date: Thu, 7 Apr 2016 15:10:50 -0700
Subject: [PATCH 0947/2267] Wrap mod_security directives in an IfModule

---
 templates/vhost/_security.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
index 7f61da2eb2..9e9492f183 100644
--- a/templates/vhost/_security.erb
+++ b/templates/vhost/_security.erb
@@ -1,3 +1,4 @@
+<IfModule mod_security2.c>
 <% if @modsec_disable_vhost -%>
   SecRuleEngine Off
 <% end -%>
@@ -36,3 +37,4 @@
 <% if @modsec_body_limit -%>
   SecRequestBodyLimit <%= @modsec_body_limit %>
 <% end -%>
+</IfModule>

From 08bdf034d4ec68cea9b54c247917b0a3ee5166f7 Mon Sep 17 00:00:00 2001
From: cd <tp@puppetlabs.com>
Date: Mon, 13 Jun 2016 13:29:58 +0100
Subject: [PATCH 0948/2267] variety of xenial fixes

---
 README.md                             |  3 +++
 manifests/mod/dav_svn.pp              |  2 +-
 manifests/mpm.pp                      | 10 +++++++--
 spec/acceptance/mod_dav_svn_spec.rb   |  2 +-
 spec/acceptance/mod_passenger_spec.rb |  9 ++++++++
 spec/acceptance/mod_php_spec.rb       | 31 +++++++++++++++++++++------
 spec/acceptance/mod_suphp_spec.rb     |  2 +-
 spec/acceptance/vhost_spec.rb         |  2 +-
 8 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 419ca939f7..cd9f2e513f 100644
--- a/README.md
+++ b/README.md
@@ -3704,6 +3704,9 @@ The Apache module relies heavily on templates to enable the [`apache::vhost`][]
 
 The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
 
+### Ubuntu 16.04
+The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
+
 ### RHEL/CentOS 5
 
 The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested since repositories are missing compatible packages.
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 6d2912155b..071535c11c 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -6,7 +6,7 @@
   include ::apache::mod::dav
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04') {
+  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04' and $::operatingsystemmajrelease != '16.04') {
     $loadfile_name = undef
   } else {
     $loadfile_name = 'dav_svn_authz_svn.load'
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 1535409101..b5a009610e 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -66,12 +66,18 @@
         }
       }
 
+      if $mpm == 'itk' and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '16.04' {
+        $packagename = 'libapache2-mpm-itk'
+      } else {
+        $packagename = "apache2-mpm-${mpm}"
+      }
+
       if versioncmp($apache_version, '2.4') < 0 or $mpm == 'itk' {
-        package { "apache2-mpm-${mpm}":
+        package { $packagename:
           ensure => present,
         }
         if $::apache::mod_enable_dir {
-          Package["apache2-mpm-${mpm}"] {
+          Package[$packagename] {
             before => File[$::apache::mod_enable_dir],
           }
         }
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 9abd12aed2..9a030c54f5 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -4,7 +4,7 @@
 describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') do
   case fact('osfamily')
   when 'Debian'
-    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04'
+    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04' or fact('operatingsystemmajrelease') == '16.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 5798545ea2..4761d2c5bf 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -23,6 +23,10 @@
         passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
         passenger_ruby         = '/usr/bin/ruby'
         passenger_default_ruby = '/usr/bin/ruby'
+      when '16.04'
+        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+        passenger_ruby         = '/usr/bin/ruby'
+        passenger_default_ruby = '/usr/bin/ruby'
       else
         # This may or may not work on Ubuntu releases other than the above
         passenger_root = '/usr'
@@ -118,6 +122,9 @@ class { 'apache::mod::passenger': }
           when '14.04'
             it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
             it { is_expected.not_to contain "/PassengerRuby/" }
+          when '16.04'
+            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerRuby/" }
           else
             # This may or may not work on Ubuntu releases other than the above
             it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
@@ -152,6 +159,7 @@ class { 'apache::mod::passenger': }
           # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
           # these two lines
           unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or
+                 (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
                  (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'))
             expect(r.stdout).to match(/### Processes: [0-9]+/)
             expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
@@ -170,6 +178,7 @@ class { 'apache::mod::passenger': }
             # spacing may vary
             expect(r.stdout).to match(/[\-]+ General information [\-]+/)
             if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' or
+               (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
                fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
               expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/)
               expect(r.stdout).to match(/Processes[ ]+: [0-9]+/)
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index f9919646f0..96de640404 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -31,8 +31,14 @@ class { 'apache::mod::php': }
       it { is_expected.to be_running }
     end
 
-    describe file("#{$mod_dir}/php5.conf") do
-      it { is_expected.to contain "DirectoryIndex index.php" }
+    if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+      describe file("#{$mod_dir}/php7.0.conf") do
+        it { is_expected.to contain "DirectoryIndex index.php" }
+      end
+    else
+      describe file("#{$mod_dir}/php5.conf") do
+        it { is_expected.to contain "DirectoryIndex index.php" }
+      end
     end
 
     it 'should answer to php.example.com' do
@@ -105,9 +111,14 @@ class {'apache::mod::php':
       EOS
       apply_manifest(pp, :catch_failures => true)
     end
-
-    describe file("#{$mod_dir}/php5.conf") do
-      it { should contain "# somecontent" }
+    if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+      describe file("#{$mod_dir}/php7.0.conf") do
+        it { should contain "# somecontent" }
+      end
+    else
+      describe file("#{$mod_dir}/php5.conf") do
+        it { should contain "# somecontent" }
+      end
     end
   end
 
@@ -125,8 +136,14 @@ class {'apache::mod::php':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$mod_dir}/php5.conf") do
-      it { should contain "# somecontent" }
+    if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+      describe file("#{$mod_dir}/php7.0.conf") do
+        it { should contain "# somecontent" }
+      end
+    else
+      describe file("#{$mod_dir}/php5.conf") do
+        it { should contain "# somecontent" }
+      end
     end
   end
 
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index fb23b504d5..07486677f1 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::suphp class', :if => fact('operatingsystem') == 'Ubuntu' do
+describe 'apache::mod::suphp class', :if => (fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemmajrelease') != '16.04') do
   context "default suphp config" do
     it 'succeeds in puppeting suphp' do
       pp = <<-EOS
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index f8b01c570c..2bb7d1e027 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -794,7 +794,7 @@ class { 'apache': }
       it { is_expected.to be_file }
       if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
-      elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10)/
+      elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10|16\.04)/
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       elsif fact('operatingsystem') == 'Debian' and fact('operatingsystemmajrelease') == '8'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }

From 86b2df3ebfc894184f4f0b206c3905d182037d23 Mon Sep 17 00:00:00 2001
From: Phil Fenstermacher <pcfens@wm.edu>
Date: Wed, 20 Apr 2016 15:11:01 -0400
Subject: [PATCH 0949/2267] Support the newer mod_auth_cas config options

mod_auth_cas supports a number of per-directory options
https://github.com/Jasig/mod_auth_cas/blob/master/README#L333-384

A number of the options aren't supported in directory stanzas
despite what the documentation suggests. The options are
supported globally and in vhost configurations, so they're
supported there accordingly.
https://github.com/Jasig/mod_auth_cas/blob/master/README#L386-413
---
 README.md                        | 41 +++++++++++++++++++
 manifests/mod/auth_cas.pp        | 35 ++++++++++-------
 manifests/vhost.pp               | 20 ++++++++++
 templates/mod/auth_cas.conf.erb  | 15 +++++++
 templates/vhost/_auth_cas.erb    | 67 ++++++++++++++++++++++++++++++++
 templates/vhost/_directories.erb | 23 +++++++++++
 6 files changed, 186 insertions(+), 15 deletions(-)
 create mode 100644 templates/vhost/_auth_cas.erb

diff --git a/README.md b/README.md
index cd9f2e513f..1ad6caa667 100644
--- a/README.md
+++ b/README.md
@@ -1414,6 +1414,10 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
 **Parameters within `apache::mod::auth_cas`**:
 
+- `cas_attribute_prefix`: Adds a header with the value of this header being the attribute values when SAML
+  validation is enabled. Default: CAS_
+- `cas_attribute_delimiter`: The delimiter between attribute values in the header created by `cas_attribute_prefix`.
+  Default: ,
 - `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. Default: undef.
 - `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`. Default: undef.
 - `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings. Default: undef.
@@ -1424,8 +1428,11 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 - `cas_idle_timeout`: Default: undef.
 - `cas_login_url`: **Required**. Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and don't have an active session.
 - `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. Default: undef.
+- `cas_scrub_request_headers`: Remove inbound request headers that may have special meaning within mod_auth_cas.
+- `cas_sso_enabled`: Enables experimental support for single sign out (may mangle POST data). Default: off
 - `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. Default: undef.
 - `cas_validate_depth`: Limits the depth for chained certificate validation. Default: undef.
+- `cas_validate_saml`: Parse response from CAS server for SAML. Default: Off
 - `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 - `cas_version`: The CAS protocol version to adhere to. Valid options: '1', '2'. Default: '2'.
 
@@ -2104,6 +2111,40 @@ Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding
 
 Specifies the list of things to which Apache blocks access. Valid option: 'scm', which blocks web access to `.svn`, `.git`, and `.bzr` directories. Default: an empty [array][].
 
+##### `cas_attribute_prefix`
+
+Adds a header with the value of this header being the attribute values when SAML validation is enabled. Defaults to
+the value set by [`apache::mod::auth_cas`][]
+
+##### `cas_attribute_delimiter`
+
+The delimiter between attribute values in the header created by `cas_attribute_prefix`.  Defaults to the value
+set by [`apache::mod::auth_cas`][]
+
+##### `cas_login_url`
+
+Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and
+don't have an active session. Defaults to the value set by [`apache::mod::auth_cas`][]
+
+##### `cas_scrub_request_headers`
+
+Remove inbound request headers that may have special meaning within mod_auth_cas. Defaults to the value
+set by [`apache::mod::auth_cas`][]
+
+##### `cas_sso_enabled`
+
+Enables experimental support for single sign out (may mangle POST data). Defaults to the value
+set by [`apache::mod::auth_cas`][]
+
+##### `cas_validate_saml`
+
+Parse response from CAS server for SAML. Defaults to the value set by [`apache::mod::auth_cas`][]
+
+##### `cas_validate_url`
+
+Sets the URL to use when validating a client-presented ticket in an HTTP query string. Defaults to the value set by
+[`apache::mod::auth_cas`][]
+
 ##### `custom_fragment`
 
 Passes a string of custom configuration directives to place at the end of the virtual host configuration. Default: undef.
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 2b5338d1e6..3bba643a08 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -1,21 +1,26 @@
 class apache::mod::auth_cas (
   $cas_login_url,
   $cas_validate_url,
-  $cas_cookie_path          = $::apache::params::cas_cookie_path,
-  $cas_version              = 2,
-  $cas_debug                = 'Off',
-  $cas_validate_depth       = undef,
-  $cas_certificate_path     = undef,
-  $cas_proxy_validate_url   = undef,
-  $cas_root_proxied_as      = undef,
-  $cas_cookie_entropy       = undef,
-  $cas_timeout              = undef,
-  $cas_idle_timeout         = undef,
-  $cas_cache_clean_interval = undef,
-  $cas_cookie_domain        = undef,
-  $cas_cookie_http_only     = undef,
-  $cas_authoritative        = undef,
-  $suppress_warning         = false,
+  $cas_cookie_path           = $::apache::params::cas_cookie_path,
+  $cas_version               = 2,
+  $cas_debug                 = 'Off',
+  $cas_validate_depth        = undef,
+  $cas_certificate_path      = undef,
+  $cas_proxy_validate_url    = undef,
+  $cas_root_proxied_as       = undef,
+  $cas_cookie_entropy        = undef,
+  $cas_timeout               = undef,
+  $cas_idle_timeout          = undef,
+  $cas_cache_clean_interval  = undef,
+  $cas_cookie_domain         = undef,
+  $cas_cookie_http_only      = undef,
+  $cas_authoritative         = undef,
+  $cas_validate_saml         = undef,
+  $cas_sso_enabled           = undef,
+  $cas_attribute_prefix      = undef,
+  $cas_attribute_delimiter   = undef,
+  $cas_scrub_request_headers = undef,
+  $suppress_warning          = false,
 ) inherits ::apache::params {
 
   validate_string($cas_login_url, $cas_validate_url, $cas_cookie_path)
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 88e9c1b071..4d74706ce2 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -152,6 +152,13 @@
   $keepalive                   = undef,
   $keepalive_timeout           = undef,
   $max_keepalive_requests      = undef,
+  $cas_attribute_prefix        = undef,
+  $cas_attribute_delimiter     = undef,
+  $cas_scrub_request_headers   = undef,
+  $cas_sso_enabled             = undef,
+  $cas_login_url               = undef,
+  $cas_validate_url            = undef,
+  $cas_validate_saml           = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -345,6 +352,9 @@
   # Is apache::mod::shib enabled (or apache::mod['shib2'])
   $shibboleth_enabled = defined(Apache::Mod['shib2'])
 
+  # Is apache::mod::cas enabled (or apache::mod['cas'])
+  $cas_enabled = defined(Apache::Mod['auth_cas'])
+
   if $access_log and !$access_logs {
     if $access_log_file {
       $_logs_dest = "${logroot}/${access_log_file}"
@@ -1070,6 +1080,16 @@
     }
   }
 
+  # Template uses:
+  # - $cas_*
+  if $cas_enabled {
+    concat::fragment { "${name}-auth_cas":
+      target  => "${priority_real}${filename}.conf",
+      order   => 350,
+      content => template('apache/vhost/_auth_cas.erb'),
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
diff --git a/templates/mod/auth_cas.conf.erb b/templates/mod/auth_cas.conf.erb
index 926bd65f52..8fd696f18a 100644
--- a/templates/mod/auth_cas.conf.erb
+++ b/templates/mod/auth_cas.conf.erb
@@ -38,3 +38,18 @@ CASCookieHttpOnly <%= @cas_cookie_http_only %>
 <% if @cas_authoritative -%>
 CASAuthoritative <%= @cas_authoritative %>
 <% end -%>
+<%- if @cas_sso_enabled -%>
+CASSSOEnabled On
+<%- end -%>
+<%- if @cas_validate_saml -%>
+CASValidateSAML On
+<%- end -%>
+<%- if @cas_attribute_prefix -%>
+CASAttributePrefix <%= @cas_attribute_prefix %>
+<%- end -%>
+<%- if @cas_attribute_delimiter -%>
+CASAttributeDelimiter <%= @cas_attribute_delimiter %>
+<%- end -%>
+<%- if @cas_scrub_request_headers -%>
+CASAttributeDelimiter On
+<%- end -%>
diff --git a/templates/vhost/_auth_cas.erb b/templates/vhost/_auth_cas.erb
new file mode 100644
index 0000000000..fa26c00626
--- /dev/null
+++ b/templates/vhost/_auth_cas.erb
@@ -0,0 +1,67 @@
+<% if @cas_enabled -%>
+
+  # mod_auth_cas configuration
+  <%- if @cas_cookie_path -%>
+  CASCookiePath <%= @cas_cookie_path %>
+  <%- end -%>
+  <%- if @cas_login_url -%>
+  CASLoginURL <%= @cas_login_url %>
+  <%- end -%>
+  <%- if @cas_validate_url -%>
+  CASValidateURL <%= @cas_validate_url %>
+  <%- end -%>
+  <%- if @cas_version -%>
+  CASVersion <%= @cas_version %>
+  <%- end -%>
+  <%- if @cas_debug -%>
+  CASDebug <%= @cas_debug %>
+  <%- end -%>
+  <%- if @cas_certificate_path -%>
+  CASCertificatePath <%= @cas_certificate_path %>
+  <%- end -%>
+  <%- if @cas_proxy_validate_url -%>
+  CASProxyValidateURL <%= @cas_proxy_validate_url %>
+  <%- end -%>
+  <%- if @cas_validate_depth -%>
+  CASValidateDepth <%= @cas_validate_depth %>
+  <%- end -%>
+  <%- if @cas_root_proxied_as -%>
+  CASRootProxiedAs <%= @cas_root_proxied_as %>
+  <%- end -%>
+  <%- if @cas_cookie_entropy -%>
+  CASCookieEntropy <%= @cas_cookie_entropy %>
+  <%- end -%>
+  <%- if @cas_timeout -%>
+  CASTimeout <%= @cas_timeout %>
+  <%- end -%>
+  <%- if @cas_idle_timeout -%>
+  CASIdleTimeout <%= @cas_idle_timeout %>
+  <%- end -%>
+  <%- if @cas_cache_clean_interval -%>
+  CASCacheCleanInterval <%= @cas_cache_clean_interval %>
+  <%- end -%>
+  <%- if @cas_cookie_domain -%>
+  CASCookieDomain <%= @cas_cookie_domain %>
+  <%- end -%>
+  <%- if @cas_cookie_http_only -%>
+  CASCookieHttpOnly <%= @cas_cookie_http_only %>
+  <%- end -%>
+  <%- if @cas_authoritative -%>
+  CASAuthoritative <%= @cas_authoritative %>
+  <%- end -%>
+  <%- if @cas_sso_enabled -%>
+  CASSSOEnabled On
+  <%- end -%>
+  <%- if @cas_validate_saml -%>
+  CASValidateSAML On
+  <%- end -%>
+  <%- if @cas_attribute_prefix -%>
+  CASAttributePrefix <%= @cas_attribute_prefix %>
+  <%- end -%>
+  <%- if @cas_attribute_delimiter -%>
+  CASAttributeDelimiter <%= @cas_attribute_delimiter %>
+  <%- end -%>
+  <%- if @cas_scrub_request_headers -%>
+  CASAttributeDelimiter On
+  <%- end -%>
+<%- end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index df2690c431..416cf16fc8 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -240,6 +240,29 @@
     ShibUseHeaders <%= directory['shib_use_headers'] %>
       <%- end -%>
     <%- end -%>
+    <%- if @cas_enabled -%>
+      <%- if directory['cas_scope'] -%>
+    CASScope <%= directory['cas_scope'] %>
+      <%- end -%>
+      <%- if directory['cas_renew'] -%>
+    CASRenew <%= directory['cas_renew'] %>
+      <%- end -%>
+      <%- if directory['cas_gateway'] -%>
+    CASGateway <%= directory['cas_gateway'] %>
+      <%- end -%>
+      <%- if directory['cas_cookie'] -%>
+    CASCookie <%= directory['cas_cookie'] %>
+      <%- end -%>
+      <%- if directory['cas_secure_cookie'] -%>
+    CASSecureCookie <%= directory['cas_secure_cookie'] %>
+      <%- end -%>
+      <%- if directory['cas_gateway_cookie'] -%>
+    CASGatewayCookie <%= directory['cas_gateway_cookie'] %>
+      <%- end -%>
+      <%- if directory['cas_authn_header'] -%>
+    CASAuthNHeader <%= directory['cas_authn_header'] %>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['mellon_enable'] -%>
     MellonEnable "<%= directory['mellon_enable'] %>"
       <%- if directory['mellon_endpoint_path'] -%>

From 816d32292424df890a613e71e89c84a530b36f8e Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 17 Jun 2016 11:18:19 +0200
Subject: [PATCH 0950/2267] Fix /etc/modsecurity perms to match package

---
 manifests/mod/security.pp         |  6 +++---
 spec/classes/mod/security_spec.rb | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index a4fe57f89a..f502729f6c 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -61,9 +61,9 @@
 
   file { $modsec_dir:
     ensure  => directory,
-    owner   => $::apache::params::user,
-    group   => $::apache::params::group,
-    mode    => '0555',
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
     purge   => true,
     force   => true,
     recurse => true,
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 7a0ba8f299..a10aa5c2c4 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -30,9 +30,10 @@
     it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABIJDEFHZ$} }
     it { should contain_file('/etc/httpd/modsecurity.d').with(
       :ensure => 'directory',
-      :path => '/etc/httpd/modsecurity.d',
-      :owner => 'apache',
-      :group => 'apache'
+      :path   => '/etc/httpd/modsecurity.d',
+      :owner  => 'root',
+      :group  => 'root',
+      :mode   => '0755',
     ) }
     it { should contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
       :ensure => 'directory',
@@ -83,9 +84,10 @@
     it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABIJDEFHZ$} }
     it { should contain_file('/etc/modsecurity').with(
       :ensure => 'directory',
-      :path => '/etc/modsecurity',
-      :owner => 'www-data',
-      :group => 'www-data'
+      :path   => '/etc/modsecurity',
+      :owner  => 'root',
+      :group  => 'root',
+      :mode   => '0755',
     ) }
     it { should contain_file('/etc/modsecurity/activated_rules').with(
       :ensure => 'directory',

From e9852b125260191ef15b8b6fcb5b0735b7045c64 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Fri, 17 Jun 2016 12:56:46 +0200
Subject: [PATCH 0951/2267] Fix PassengerRoot under Debian stretch (#1478)

---
 manifests/params.pp | 56 +++++++--------------------------------------
 1 file changed, 8 insertions(+), 48 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 6a9f14919d..d67246c868 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -317,54 +317,14 @@
     $passenger_conf_file         = 'passenger.conf'
     $passenger_conf_package_file = undef
 
-    case $::operatingsystem {
-      'Ubuntu': {
-        case $::lsbdistrelease {
-          '12.04': {
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-          '14.04': {
-            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-            $passenger_ruby         = undef
-            $passenger_default_ruby = '/usr/bin/ruby'
-          }
-          '16.04': {
-            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-            $passenger_ruby         = undef
-            $passenger_default_ruby = '/usr/bin/ruby'
-          }
-          default: {
-            # The following settings may or may not work on Ubuntu releases not
-            # supported by this module.
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-        }
-      }
-      'Debian': {
-        case $::lsbdistcodename {
-          'wheezy': {
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-          'jessie': {
-            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-            $passenger_ruby         = undef
-            $passenger_default_ruby = '/usr/bin/ruby'
-          }
-          default: {
-            # The following settings may or may not work on Debian releases not
-            # supported by this module.
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-        }
-      }
+    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '14.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0) {
+      $passenger_root         = '/usr'
+      $passenger_ruby         = '/usr/bin/ruby'
+      $passenger_default_ruby = undef
+    } else {
+      $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+      $passenger_ruby         = undef
+      $passenger_default_ruby = '/usr/bin/ruby'
     }
     $wsgi_socket_prefix = undef
   } elsif $::osfamily == 'FreeBSD' {

From 03ddd21f2c078dbd44eefc47990914eef15b84f5 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Fri, 17 Jun 2016 13:00:44 +0200
Subject: [PATCH 0952/2267] (maint) Fix a typo in CHANGELOG formatting

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4025bdba7f..c87e4b1793 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -324,7 +324,7 @@ This release has many new features and bugfixes, including the ability to option
   - Add `root_group` to `apache::mod::php`
   - Add `apache::mod::proxy_connect` class
   - Add `apache::mod::security` class
-  - Add `ssl_pass_phrase_dialog` and `ssl_random_seed_bytes parameters to `apache::mod::ssl` (MODULES-1719)
+  - Add `ssl_pass_phrase_dialog` and `ssl_random_seed_bytes` parameters to `apache::mod::ssl` (MODULES-1719)
   - Add `status_path` parameter to `apache::mod::status`
   - Add `apache_version` parameter to `apache::mod::version`
   - Add `package_name` and `mod_path` parameters to `apache::mod::wsgi` (MODULES-1458)

From a0da0296365396537e651728291237fbce260905 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Fri, 17 Jun 2016 13:12:55 +0200
Subject: [PATCH 0953/2267] (maint) Fix a typo in CHANGELOG: compatibilty

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c87e4b1793..1897558375 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Supported Release 1.10.0
 #### Summary
-This release fixes backwards compatibilty bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature.
+This release fixes backwards compatibility bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature.
 
 #### Features
 - Allow setting KeepAlive related options per vhost

From dbd04c0e11703ab57e8f8e743997da386d07ddf7 Mon Sep 17 00:00:00 2001
From: cd <tp@puppetlabs.com>
Date: Fri, 17 Jun 2016 13:02:04 +0100
Subject: [PATCH 0954/2267] Update _block.erb

---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 36d4f42c59..8b95c429bb 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1292,7 +1292,7 @@ class { 'apache': }
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
+      it { is_expected.to contain '<DirectoryMatch .*\.(svn|git|bzr|hg|ht)/.*>' }
     end
   end
 

From 6cebe98fe92f0894425ad4289939a32ffedeaf51 Mon Sep 17 00:00:00 2001
From: TP Honey <tphoney@users.noreply.github.com>
Date: Fri, 17 Jun 2016 14:58:49 +0100
Subject: [PATCH 0955/2267] Add wsgi script aliases match (#1485)

Add WSGIScriptAliasesMatch support and associated documentation
---
 README.md                     | 1 +
 manifests/vhost.pp            | 4 ++++
 spec/acceptance/vhost_spec.rb | 2 ++
 spec/defines/vhost_spec.rb    | 3 +++
 templates/vhost/_wsgi.erb     | 7 +++++++
 5 files changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 250149a688..6fa55c6e8b 100644
--- a/README.md
+++ b/README.md
@@ -2846,6 +2846,7 @@ Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi).
 * `wsgi_daemon_process_options`. _Optional._ Default: undef.
 * `wsgi_process_group`: Sets the group ID that the virtual host runs under. Default: undef.
 * `wsgi_script_aliases`: Requires a hash of web paths to filesystem .wsgi paths. Default: undef.
+* `wsgi_script_aliases_match`: Requires a hash of web path regexes to filesystem .wsgi paths. Default: undef
 * `wsgi_pass_authorization`: Uses the WSGI application to handle authorization instead of Apache when set to 'On'. For more information, see [mod_wsgi's WSGIPassAuthorization documentation] (https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html). Default: undef, leading Apache to use its default value of 'Off'.
 * `wsgi_chunked_request`: Enables support for chunked requests. Default: undef.
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4d74706ce2..319fdd143f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -108,6 +108,7 @@
   $wsgi_import_script          = undef,
   $wsgi_import_script_options  = undef,
   $wsgi_process_group          = undef,
+  $wsgi_script_aliases_match   = undef,
   $wsgi_script_aliases         = undef,
   $wsgi_pass_authorization     = undef,
   $wsgi_chunked_request        = undef,
@@ -213,6 +214,9 @@
   if $wsgi_script_aliases {
     validate_hash($wsgi_script_aliases)
   }
+  if $wsgi_script_aliases_match {
+    validate_hash($wsgi_script_aliases_match)
+  }
   if $wsgi_daemon_process_options {
     validate_hash($wsgi_daemon_process_options)
   }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 9e52c82063..bb4b83c2be 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1312,6 +1312,7 @@ class { 'apache::mod::wsgi': }
             wsgi_daemon_process_options => {processes => '2'},
             wsgi_process_group          => 'nobody',
             wsgi_script_aliases         => { '/test' => '/test1' },
+            wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
             wsgi_pass_authorization     => 'On',
           }
         EOS
@@ -1334,6 +1335,7 @@ class { 'apache::mod::wsgi': }
             wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
             wsgi_process_group          => 'nobody',
             wsgi_script_aliases         => { '/test' => '/test1' },
+            wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
             wsgi_pass_authorization     => 'On',
             wsgi_chunked_request        => 'On',
           }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 95b1f32b8b..aa40798a25 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -359,6 +359,9 @@
           'wsgi_script_aliases'         => {
             '/' => '/var/www/demo.wsgi'
           },
+          'wsgi_script_aliases_match'   => {
+            '^/test/(^[/*)' => '/var/www/demo.wsgi'
+          },
           'wsgi_pass_authorization'     => 'On',
           'custom_fragment'             => '#custom string',
           'itk'                         => {
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index 9f01d40910..a49828fdc9 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -12,6 +12,13 @@
 <% if @wsgi_process_group -%>
   WSGIProcessGroup <%= @wsgi_process_group %>
 <% end -%>
+<% if @wsgi_script_aliases_match and ! @wsgi_script_aliases_match.empty? -%>
+  <%- @wsgi_script_aliases_match.keys.sort.each do |key| -%>
+    <%- if key != '' and @wsgi_script_aliases_match[key] != ''-%>
+  WSGIScriptAliasMatch <%= key %> "<%= @wsgi_script_aliases_match[key] %>"
+    <%- end -%>
+  <%- end -%>
+<% end -%>
 <% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
   <%- @wsgi_script_aliases.keys.sort.each do |key| -%>
     <%- if key != '' and @wsgi_script_aliases[key] != ''-%>

From a38324b005035079869c42e4484dbe682e5d856a Mon Sep 17 00:00:00 2001
From: Jonathan Tripathy <jt@puppetlabs.com>
Date: Fri, 17 Jun 2016 17:01:44 +0100
Subject: [PATCH 0956/2267] MODULES-3476 - Updated regex in apache_version
 custom fact to work with EL5.

---
 lib/facter/apache_version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index 2790627307..2e211c9873 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -2,7 +2,7 @@
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
-      %r{^Server version: Apache\/([\w\.]+) \(([\w ]*)\)}.match(apache_version)[1]
+      %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)[1]
     end
   end
 end

From c9f81660be2e73e031571187a34e974448a3fe79 Mon Sep 17 00:00:00 2001
From: Jeoffrey Bauvin <jeoffrey.bauvin.ext@boursorama.fr>
Date: Tue, 21 Jun 2016 08:52:34 +0200
Subject: [PATCH 0957/2267] Fix non breaking space

---
 templates/mod/remoteip.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/remoteip.conf.erb b/templates/mod/remoteip.conf.erb
index b4518f9b04..e10ebb51c8 100644
--- a/templates/mod/remoteip.conf.erb
+++ b/templates/mod/remoteip.conf.erb
@@ -3,7 +3,7 @@ RemoteIPHeader <%= @header %>
 
 <%- if @proxy_ips -%>
 # Declare client intranet IP addresses trusted to present
-# the RemoteIPHeader value
+# the RemoteIPHeader value
 <%-   [@proxy_ips].flatten.each do |proxy| -%>
 RemoteIPInternalProxy <%= proxy %>
 <%-   end -%>

From cb6c2847f3fc2ffa686af031a8a865bdb10fd8d1 Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Wed, 8 Jun 2016 15:53:00 -0400
Subject: [PATCH 0958/2267] Add mod/auth_cas params

cas_cookie_path_mode
cas_validate_server
---
 README.md                       | 5 +++++
 manifests/mod/auth_cas.pp       | 4 +++-
 templates/mod/auth_cas.conf.erb | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6fa55c6e8b..7faaf07f56 100644
--- a/README.md
+++ b/README.md
@@ -1424,17 +1424,22 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 - `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header. Default: undef.
 - `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. Default: undef.
 - `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies. Default: undef.
+- `cas_cookie_path`: Where cas cookie session data is stored. Should be writable by web server user. Default: OS dependent.
+- `cas_cookie_path_mode`: The mode of `cas_cookie_path`. Default: '0750'.
 - `cas_debug`: Determines whether to enable the module's debugging mode. Default: 'Off'.
 - `cas_idle_timeout`: Default: undef.
 - `cas_login_url`: **Required**. Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and don't have an active session.
+- `cas_proxy_validate_url`: The URL to use when performing a proxy validation. Default: undef.
 - `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. Default: undef.
 - `cas_scrub_request_headers`: Remove inbound request headers that may have special meaning within mod_auth_cas.
 - `cas_sso_enabled`: Enables experimental support for single sign out (may mangle POST data). Default: off
 - `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. Default: undef.
 - `cas_validate_depth`: Limits the depth for chained certificate validation. Default: undef.
 - `cas_validate_saml`: Parse response from CAS server for SAML. Default: Off
+- `cas_validate_server`: Should we validate the cert of the CAS server (depreciated in 1.1 - RedHat 7). Default: undef.
 - `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 - `cas_version`: The CAS protocol version to adhere to. Valid options: '1', '2'. Default: '2'.
+- `suppress_warning`: Don't wine about being on RedHat (Hint: mod_auth_cas package is now available in epel-testing repo). Default: false.
 
 ##### Class: `apache::mod::auth_mellon`
 
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 3bba643a08..673cfb103d 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -2,8 +2,10 @@
   $cas_login_url,
   $cas_validate_url,
   $cas_cookie_path           = $::apache::params::cas_cookie_path,
+  $cas_cookie_path_mode      = '0750',
   $cas_version               = 2,
   $cas_debug                 = 'Off',
+  $cas_validate_server       = undef,
   $cas_validate_depth        = undef,
   $cas_certificate_path      = undef,
   $cas_proxy_validate_url    = undef,
@@ -35,7 +37,7 @@
   file { $cas_cookie_path:
     ensure => directory,
     before => File['auth_cas.conf'],
-    mode   => '0750',
+    mode   => $cas_cookie_path_mode,
     owner  => $apache::user,
     group  => $apache::group,
   }
diff --git a/templates/mod/auth_cas.conf.erb b/templates/mod/auth_cas.conf.erb
index 8fd696f18a..b59c5357fe 100644
--- a/templates/mod/auth_cas.conf.erb
+++ b/templates/mod/auth_cas.conf.erb
@@ -11,6 +11,9 @@ CASCertificatePath <%= @cas_certificate_path %>
 <% if @cas_proxy_validate_url -%>
 CASProxyValidateURL <%= @cas_proxy_validate_url %>
 <% end -%>
+<% if @cas_validate_server -%>
+CASValidateServer <%= @cas_validate_server %>
+<% end -%>
 <% if @cas_validate_depth -%>
 CASValidateDepth <%= @cas_validate_depth %>
 <% end -%>

From 5e39c890f4673bc3b0837f5953acb644188e65db Mon Sep 17 00:00:00 2001
From: TP Honey <tphoney@users.noreply.github.com>
Date: Wed, 29 Jun 2016 11:44:52 +0100
Subject: [PATCH 0959/2267] {maint} modulesync 0794b2c (#1493)

---
 .puppet-lint.rc | 5 -----
 CONTRIBUTING.md | 6 ++----
 Rakefile        | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 .puppet-lint.rc

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
deleted file mode 100644
index 0b3cfad25d..0000000000
--- a/.puppet-lint.rc
+++ /dev/null
@@ -1,5 +0,0 @@
---relative
---no-single_quote_string_with_variables-check
---no-80chars-check
---no-class_inherits_from_params_class-check
---no-documentation-check
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bfeaa701ca..3c3f1e7999 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -208,11 +208,9 @@ review.
 Additional Resources
 ====================
 
-* [Getting additional help](http://puppetlabs.com/community/get-help)
+* [Getting additional help](http://puppet.com/community/get-help)
 
-* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
-
-* [Patchwork](https://patchwork.puppetlabs.com)
+* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
 
 * [General GitHub documentation](http://help.github.com/)
 
diff --git a/Rakefile b/Rakefile
index 1e2be6663c..af59fcf5c0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,12 +4,12 @@ require 'puppetlabs_spec_helper/rake_tasks'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.send('disable_only_variable_string')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "bundle/**/*", "vendor/**/*"]
 
 desc 'Generate pooler nodesets'
 task :gen_nodeset do

From 933c7b0a3a203949029e1cdb2a28ea7986179ed4 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 17 Jun 2016 15:26:15 +0200
Subject: [PATCH 0960/2267] Allow to override all SecDefaultAction attributes

---
 README.md                           |  2 +-
 manifests/mod/security.pp           | 18 ++++++++++++++++++
 spec/classes/mod/security_spec.rb   | 12 +++++++++---
 templates/mod/security_crs.conf.erb |  4 ++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 83adb68230..e88585126e 100644
--- a/README.md
+++ b/README.md
@@ -1817,7 +1817,7 @@ ${modsec\_dir}/activated\_rules.
 - `modsec_secruleengine`: Configures the modsec rules engine. Valid options: 'On', 'Off', and 'DetectionOnly'. Default: `modsec_secruleengine` in [`apache::params`][].
 - `restricted_extensions`: A space-separated list of prohibited file extensions. Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
 - `restricted_headers`: A list of restricted headers separated by slashes and spaces. Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
-- `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') vs. Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set. Default: 'deny'.
+- `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') vs. Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set. Default: 'deny'. Fuller values can be set too like "log,auditlog,deny,status:406,tag:'SLA 24/7'"
 - `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. Default: '1500'
 - `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
 - `audit_log_parts`: Sets the sections to be put in the [audit log][]. Default: 'ABIJDEFHZ'
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index a4fe57f89a..70955e941e 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -21,6 +21,11 @@
 ) inherits ::apache::params {
   include ::apache
 
+  $_secdefaultaction = $secdefaultaction ? {
+    /log/   => $secdefaultaction, # it has log or nolog,auditlog or log,noauditlog
+    default => "${secdefaultaction},log",
+  }
+
   if $::osfamily == 'FreeBSD' {
     fail('FreeBSD is not currently supported')
   }
@@ -80,6 +85,19 @@
     notify  => Class['apache::service'],
   }
 
+  # Template uses:
+  # - $_secdefaultaction
+  # - $critical_anomaly_score
+  # - $error_anomaly_score
+  # - $warning_anomaly_score
+  # - $notice_anomaly_score
+  # - $inbound_anomaly_threshold
+  # - $outbound_anomaly_threshold
+  # - $anomaly_score_blocking
+  # - $allowed_methods
+  # - $content_types
+  # - $restricted_extensions
+  # - $restricted_headers
   file { "${modsec_dir}/security_crs.conf":
     ensure  => file,
     content => template('apache/mod/security_crs.conf.erb'),
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 7a0ba8f299..bc26130bb7 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -47,10 +47,13 @@
 
     describe 'with parameters' do
       let :params do
-        { :audit_log_parts => "ABCDZ"
+        {
+          :audit_log_parts  => "ABCDZ",
+          :secdefaultaction => "deny,status:406,nolog,auditlog"
         }
       end
       it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
+      it { should contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
     end
   end
 
@@ -100,10 +103,13 @@
 
     describe 'with parameters' do
       let :params do
-        { :audit_log_parts => "ACEZ"
+        {
+          :audit_log_parts  => "ABCDZ",
+          :secdefaultaction => "deny,status:406,nolog,auditlog"
         }
       end
-      it { should contain_file('security.conf').with_content  %r{^\s+SecAuditLogParts ACEZ$} }
+      it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
+      it { should contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
     end
   end
 
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index d5eb70a249..ff55effb3c 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -63,8 +63,8 @@ SecComponentSignature "OWASP_CRS/2.2.6"
 # Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html
 # Ref: https://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Reference_Manual#SecDefaultAction
 #
-SecDefaultAction "phase:1,<%= @secdefaultaction -%>,log"
-SecDefaultAction "phase:2,<%= @secdefaultaction -%>,log"
+SecDefaultAction "phase:1,<%= @_secdefaultaction -%>"
+SecDefaultAction "phase:2,<%= @_secdefaultaction -%>"
 
 #
 # -- [[ Collaborative Detection Severity Levels ]] ----------------------------------------

From d249ff4ca4e444e32eab0b8eb11ed4feda672afd Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 17 Jun 2016 16:27:29 +0200
Subject: [PATCH 0961/2267] Add audit_log_relevant_status parameter to
 apache::mod::security

---
 README.md                         |  1 +
 manifests/mod/security.pp         |  1 +
 spec/classes/mod/security_spec.rb | 14 ++++++++++----
 templates/mod/security.conf.erb   |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e88585126e..519e23453b 100644
--- a/README.md
+++ b/README.md
@@ -1820,6 +1820,7 @@ ${modsec\_dir}/activated\_rules.
 - `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') vs. Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set. Default: 'deny'. Fuller values can be set too like "log,auditlog,deny,status:406,tag:'SLA 24/7'"
 - `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. Default: '1500'
 - `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
+- `audit_log_releavant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging. Defaults: '^(?:5|4(?!04))'.
 - `audit_log_parts`: Sets the sections to be put in the [audit log][]. Default: 'ABIJDEFHZ'
 - `anomaly_score_blocking`: De-/Activates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set. Default: off.
 - `inbound_anomaly_threshold`: Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '5'.
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 70955e941e..c5d9f0b5a2 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -3,6 +3,7 @@
   $activated_rules            = $::apache::params::modsec_default_rules,
   $modsec_dir                 = $::apache::params::modsec_dir,
   $modsec_secruleengine       = $::apache::params::modsec_secruleengine,
+  $audit_log_relevant_status  = '^(?:5|4(?!04))',
   $audit_log_parts            = $::apache::params::modsec_audit_log_parts,
   $secpcrematchlimit          = $::apache::params::secpcrematchlimit,
   $secpcrematchlimitrecursion = $::apache::params::secpcrematchlimitrecursion,
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index bc26130bb7..c117959e25 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -27,6 +27,7 @@
     it { should contain_file('security.conf').with(
       :path => '/etc/httpd/conf.modules.d/security.conf'
     ) }
+    it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$} }
     it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABIJDEFHZ$} }
     it { should contain_file('/etc/httpd/modsecurity.d').with(
       :ensure => 'directory',
@@ -48,10 +49,12 @@
     describe 'with parameters' do
       let :params do
         {
-          :audit_log_parts  => "ABCDZ",
-          :secdefaultaction => "deny,status:406,nolog,auditlog"
+          :audit_log_relevant_status => "^(?:5|4(?!01|04))",
+          :audit_log_parts           => "ABCDZ",
+          :secdefaultaction          => "deny,status:406,nolog,auditlog",
         }
       end
+      it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
       it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
       it { should contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
     end
@@ -83,6 +86,7 @@
     it { should contain_file('security.conf').with(
       :path => '/etc/apache2/mods-available/security.conf'
     ) }
+    it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$} }
     it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABIJDEFHZ$} }
     it { should contain_file('/etc/modsecurity').with(
       :ensure => 'directory',
@@ -104,10 +108,12 @@
     describe 'with parameters' do
       let :params do
         {
-          :audit_log_parts  => "ABCDZ",
-          :secdefaultaction => "deny,status:406,nolog,auditlog"
+          :audit_log_relevant_status => "^(?:5|4(?!01|04))",
+          :audit_log_parts           => "ABCDZ",
+          :secdefaultaction          => "deny,status:406,nolog,auditlog",
         }
       end
+      it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
       it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
       it { should contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
     end
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 1ffd30bb9c..5df57dffed 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -49,7 +49,7 @@
     SecResponseBodyLimitAction ProcessPartial
     SecDebugLogLevel 0
     SecAuditEngine RelevantOnly
-    SecAuditLogRelevantStatus "^(?:5|4(?!04))"
+    SecAuditLogRelevantStatus "<%= @audit_log_relevant_status %>"
     SecAuditLogParts <%= @audit_log_parts %>
     SecAuditLogType Serial
     SecArgumentSeparator &

From c14800cc5857be868fa1e0d02f79862a7b863fa8 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Tue, 21 Jun 2016 15:32:42 +0200
Subject: [PATCH 0962/2267] Allow absolute path to
 $apache::mod::security::activated_rules

---
 README.md                         |  2 +-
 manifests/security/rule_link.pp   |  7 ++++++-
 spec/classes/mod/security_spec.rb | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 519e23453b..9ee2778fc0 100644
--- a/README.md
+++ b/README.md
@@ -1808,7 +1808,7 @@ Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs b
 
 **Parameters within `apache::mod::security`**:
 
-- `activated_rules`: An [array][] of rules from the `modsec_crs_path` to activate via symlinks. Default: `modsec_default_rules` in [`apache::params`][].
+- `activated_rules`: An [array][] of rules from the `modsec_crs_path` or absolute to activate via symlinks. Default: `modsec_default_rules` in [`apache::params`][].
 - `allowed_methods`: A space-separated list of allowed HTTP methods. Default: 'GET HEAD POST OPTIONS'.
 - `content_types`: A list of one or more allowed [MIME types][MIME `content-type`]. Default: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'
 - `crs_package`: Names the package that installs CRS rules. Default: `modsec_crs_package` in [`apache::params`][].
diff --git a/manifests/security/rule_link.pp b/manifests/security/rule_link.pp
index a56a2d97f0..7edb1f442e 100644
--- a/manifests/security/rule_link.pp
+++ b/manifests/security/rule_link.pp
@@ -3,10 +3,15 @@
   $parts = split($title, '/')
   $filename = $parts[-1]
 
+  $target = $title ? {
+    /^\//   => $title,
+    default => "${::apache::params::modsec_crs_path}/${title}",
+  }
+
   file { $filename:
     ensure  => 'link',
     path    => "${::apache::mod::security::modsec_dir}/activated_rules/${filename}",
-    target  => "${::apache::params::modsec_crs_path}/${title}",
+    target  => $target ,
     require => File["${::apache::mod::security::modsec_dir}/activated_rules"],
     notify  => Class['apache::service'],
   }
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index c117959e25..b37ebad470 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -45,10 +45,17 @@
       :path => '/etc/httpd/modsecurity.d/security_crs.conf'
     ) }
     it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+    it { should contain_file('modsecurity_35_bad_robots.data').with(
+      :path   => '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+      :target => '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
+    ) }
 
     describe 'with parameters' do
       let :params do
         {
+          :activated_rules           => [
+            '/tmp/foo/bar.conf',
+          ],
           :audit_log_relevant_status => "^(?:5|4(?!01|04))",
           :audit_log_parts           => "ABCDZ",
           :secdefaultaction          => "deny,status:406,nolog,auditlog",
@@ -57,6 +64,10 @@
       it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
       it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
       it { should contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
+      it { should contain_file('bar.conf').with(
+        :path   => '/etc/httpd/modsecurity.d/activated_rules/bar.conf',
+        :target => '/tmp/foo/bar.conf',
+      ) }
     end
   end
 
@@ -104,10 +115,17 @@
       :path => '/etc/modsecurity/security_crs.conf'
     ) }
     it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+    it { should contain_file('modsecurity_35_bad_robots.data').with(
+      :path   => '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
+      :target => '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
+    ) }
 
     describe 'with parameters' do
       let :params do
         {
+          :activated_rules           => [
+            '/tmp/foo/bar.conf',
+          ],
           :audit_log_relevant_status => "^(?:5|4(?!01|04))",
           :audit_log_parts           => "ABCDZ",
           :secdefaultaction          => "deny,status:406,nolog,auditlog",
@@ -116,6 +134,10 @@
       it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
       it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
       it { should contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
+      it { should contain_file('bar.conf').with(
+        :path   => '/etc/modsecurity/activated_rules/bar.conf',
+        :target => '/tmp/foo/bar.conf',
+      ) }
     end
   end
 

From 4b83ad211d6aa439ec4e2b1f8124275285665641 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Tue, 21 Jun 2016 11:22:44 +0200
Subject: [PATCH 0963/2267] Allow to set SecAuditLog

---
 README.md                         | 12 ++++++++++++
 manifests/vhost.pp                | 30 +++++++++++++++++++++++++++++-
 spec/classes/mod/security_spec.rb |  1 +
 spec/defines/vhost_spec.rb        | 23 +++++++++++++++++++++++
 templates/vhost/_security.erb     |  3 +++
 5 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83adb68230..a6179b1a22 100644
--- a/README.md
+++ b/README.md
@@ -2470,6 +2470,18 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+##### `modsec_audit_log` & `modsec_audit_log_file` & `modsec_audit_log_pipe`
+
+Determines how to send mod_security audit log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
+
+If `modsec_audit_log_file` is set, it is relative to [`logroot`][]. Default: undef.
+
+If `modsec_audit_log_pipe` is set, it should start with a pipe. Example '|/path/to/mlogc /path/to/mlogc.conf'. Default: undef.
+
+If `modsec_audit_log` is true, given a virtual host---for instance, example.com---it defaults to 'example.com\_security\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_security.log' for unencrypted virtual hosts. Default: false.
+
+When none of those parameters is set, the global audit log is used (i.e. ''/var/log/apache2/modsec\_audit.log'' on Debian and derivatives, ''/var/log/httpd/modsec\_audit.log'' on others).
+
 ##### `no_proxy_uris`
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 319fdd143f..15286b6941 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -61,6 +61,9 @@
   $error_log_file              = undef,
   $error_log_pipe              = undef,
   $error_log_syslog            = undef,
+  $modsec_audit_log            = undef,
+  $modsec_audit_log_file       = undef,
+  $modsec_audit_log_pipe       = undef,
   $error_documents             = [],
   $fallbackresource            = undef,
   $scriptalias                 = undef,
@@ -177,6 +180,9 @@
   validate_bool($ip_based)
   validate_bool($access_log)
   validate_bool($error_log)
+  if $modsec_audit_log != undef {
+    validate_bool($modsec_audit_log)
+  }
   validate_bool($ssl)
   validate_bool($default_vhost)
   validate_bool($ssl_proxyengine)
@@ -243,6 +249,10 @@
     fail("Apache::Vhost[${name}]: 'error_log_file' and 'error_log_pipe' cannot be defined at the same time")
   }
 
+  if $modsec_audit_log_file and $modsec_audit_log_pipe {
+    fail("Apache::Vhost[${name}]: 'modsec_audit_log_file' and 'modsec_audit_log_pipe' cannot be defined at the same time")
+  }
+
   if $fallbackresource {
     validate_re($fallbackresource, '^/|disabled', 'Please make sure fallbackresource starts with a / (or is "disabled")')
   }
@@ -397,6 +407,23 @@
     }
   }
 
+  if $modsec_audit_log == false {
+    $modsec_audit_log_destination = undef
+  } elsif $modsec_audit_log_file {
+    $modsec_audit_log_destination = "${logroot}/${modsec_audit_log_file}"
+  } elsif $modsec_audit_log_pipe {
+    $modsec_audit_log_destination = $modsec_audit_log_pipe
+  } elsif $modsec_audit_log {
+    if $ssl {
+      $modsec_audit_log_destination = "${logroot}/${name}_security_ssl.log"
+    } else {
+      $modsec_audit_log_destination = "${logroot}/${name}_security.log"
+    }
+  } else {
+    $modsec_audit_log_destination = undef
+  }
+
+
   if $ip {
     $_ip = enclose_ipv6($ip)
     if $port {
@@ -1044,7 +1071,8 @@
   # - $modsec_disable_msgs
   # - $modsec_disable_tags
   # - $modsec_body_limit
-  if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips or $modsec_disable_msgs or $modsec_disable_tags {
+  # - $modsec_audit_log_destination
+  if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination {
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
       order   => 320,
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index a10aa5c2c4..6752d61fdf 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -1,3 +1,4 @@
+
 require 'spec_helper'
 
 describe 'apache::mod::security', :type => :class do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index aa40798a25..6f85b622b3 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -584,6 +584,7 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-security') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
         :content => /^\s+JkMount\s+\/\*\s+tcnode1$/)}
@@ -713,6 +714,28 @@
       it { is_expected.to_not contain_concat__fragment('NameVirtualHost *:80') }
     end
 
+    context 'modsec_audit_log' do
+      let :params do
+        {
+          'docroot'          => '/rspec/docroot',
+          'modsec_audit_log' => true,
+        }
+      end
+      it { is_expected.to compile }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+        :content => /^\s*SecAuditLog "\/var\/log\/apache2\/rspec\.example\.com_security\.log"$/ ) }
+    end
+    context 'modsec_audit_log_file' do
+      let :params do
+        {
+          'docroot'               => '/rspec/docroot',
+          'modsec_audit_log_file' => 'foo.log',
+        }
+      end
+      it { is_expected.to compile }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+        :content => /\s*SecAuditLog "\/var\/log\/apache2\/foo.log"$/ ) }
+    end
     context 'set only aliases' do
       let :params do
         {
diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
index 9e9492f183..dc35c78af1 100644
--- a/templates/vhost/_security.erb
+++ b/templates/vhost/_security.erb
@@ -2,6 +2,9 @@
 <% if @modsec_disable_vhost -%>
   SecRuleEngine Off
 <% end -%>
+<% if @modsec_audit_log_destination -%>
+  SecAuditLog "<%= @modsec_audit_log_destination %>"
+<% end -%>
 <% if @_modsec_disable_ids.is_a?(Hash) -%>
 <%   @_modsec_disable_ids.each do |location,rules| -%>
   <LocationMatch <%= location %>>

From bbb4b14440f5f30e225782ad11bae32d8e60ee28 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Tue, 5 Jul 2016 15:40:59 +0200
Subject: [PATCH 0964/2267] Don't sql_injection_attacks.data, done since 2012

---
 manifests/params.pp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index d67246c868..e443acef4a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -174,7 +174,6 @@
       'base_rules/modsecurity_35_bad_robots.data',
       'base_rules/modsecurity_35_scanners.data',
       'base_rules/modsecurity_40_generic_attacks.data',
-      'base_rules/modsecurity_41_sql_injection_attacks.data',
       'base_rules/modsecurity_50_outbound.data',
       'base_rules/modsecurity_50_outbound_malware.data',
       'base_rules/modsecurity_crs_20_protocol_violations.conf',
@@ -283,7 +282,6 @@
       'base_rules/modsecurity_35_bad_robots.data',
       'base_rules/modsecurity_35_scanners.data',
       'base_rules/modsecurity_40_generic_attacks.data',
-      'base_rules/modsecurity_41_sql_injection_attacks.data',
       'base_rules/modsecurity_50_outbound.data',
       'base_rules/modsecurity_50_outbound_malware.data',
       'base_rules/modsecurity_crs_20_protocol_violations.conf',

From 2d3420f48841b8f3c026c3dbddb443245d0a5f64 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@black.co.at>
Date: Fri, 8 Jul 2016 13:33:58 +0100
Subject: [PATCH 0965/2267] (MODULES-3581) modulesync [067d08a]

---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index e490bc9b98..9b5b2146b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,10 +16,11 @@ group :development, :unit_tests do
   gem 'json',                      :require => false
   gem 'metadata-json-lint',        :require => false
   gem 'puppet_facts',              :require => false
-  gem 'puppet-blacksmith',         :require => false
   gem 'puppetlabs_spec_helper',    :require => false
   gem 'rspec-puppet', '>= 2.3.2',  :require => false
   gem 'simplecov',                 :require => false
+  gem 'puppet-blacksmith',         :require => false
+  gem 'rest-client', '~> 1.8.0',   :require => false
 end
 group :system_tests do
   gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')

From 5e8dd7a4bcec6b846ba01f0f77ecebd0c1a81da7 Mon Sep 17 00:00:00 2001
From: Martin Pfeifer <martin.pfeifer@dm.de>
Date: Thu, 2 Jun 2016 14:45:43 +0200
Subject: [PATCH 0966/2267] add force option to confd file resource

---
 manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 194c1741e9..50f208cf84 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -172,6 +172,7 @@
     ensure  => directory,
     recurse => true,
     purge   => $purge_confd,
+    force   => $purge_confd,
     notify  => Class['Apache::Service'],
     require => Package['httpd'],
   }

From d370c7b666df77bc572d02f610aa0d276a57df47 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 8 Jul 2016 11:18:17 +0200
Subject: [PATCH 0967/2267] Sync security_crs.conf with latest upstream

This effectively add some variables:
- real_ip, dos_burst_time_slice, dos_counter_threshold,
  dos_block_timeout: DOS protection
- anomaly_score, sql_injection_score, xss_score,
  inbound_anomaly_score, outbound_anomaly_score: Initial scores
---
 templates/mod/security_crs.conf.erb | 60 ++++++++++++++++-------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index ff55effb3c..cae4519156 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -1,20 +1,20 @@
 # ---------------------------------------------------------------
-# Core ModSecurity Rule Set ver.2.2.6
+# Core ModSecurity Rule Set ver.2.2.9
 # Copyright (C) 2006-2012 Trustwave All rights reserved.
 #
-# The OWASP ModSecurity Core Rule Set is distributed under
+# The OWASP ModSecurity Core Rule Set is distributed under 
 # Apache Software License (ASL) version 2
 # Please see the enclosed LICENCE file for full details.
 # ---------------------------------------------------------------
 
 
 #
-# -- [[ Recommended Base Configuration ]] -------------------------------------------------
+# -- [[ Recommended Base Configuration ]] ------------------------------------------------- 
 #
 # The configuration directives/settings in this file are used to control
 # the OWASP ModSecurity CRS. These settings do **NOT** configure the main
 # ModSecurity settings such as:
-#
+# 
 # - SecRuleEngine
 # - SecRequestBodyAccess
 # - SecAuditEngine
@@ -23,7 +23,7 @@
 # You should use the modsecurity.conf-recommended file that comes with the
 # ModSecurity source code archive.
 #
-# Ref: http://mod-security.svn.sourceforge.net/viewvc/mod-security/m2/trunk/modsecurity.conf-recommended
+# Ref: https://github.com/SpiderLabs/ModSecurity/blob/master/modsecurity.conf-recommended 
 #
 
 
@@ -34,9 +34,9 @@
 #
 # - Producer: ModSecurity for Apache/2.7.0-rc1 (http://www.modsecurity.org/); OWASP_CRS/2.2.4.
 #
-# Ref: https://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Reference_Manual#SecComponentSignature
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecComponentSignature 
 #
-SecComponentSignature "OWASP_CRS/2.2.6"
+SecComponentSignature "OWASP_CRS/2.2.9"
 
 
 #
@@ -51,7 +51,7 @@ SecComponentSignature "OWASP_CRS/2.2.6"
 # -- [[ Collaborative Detection Mode ]] --
 # This is a "delayed blocking" mode of operation where each matching rule will inherit
 # the "pass" action and will only contribute to anomaly scores.  Transactional blocking
-# can be applied
+# can be applied 
 #
 # -- [[ Alert Logging Control ]] --
 # You have three options -
@@ -61,7 +61,7 @@ SecComponentSignature "OWASP_CRS/2.2.6"
 # - To log *only* to the Apache error_log file use: "log,noauditlog"
 #
 # Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html
-# Ref: https://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Reference_Manual#SecDefaultAction
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecDefaultAction 
 #
 SecDefaultAction "phase:1,<%= @_secdefaultaction -%>"
 SecDefaultAction "phase:2,<%= @_secdefaultaction -%>"
@@ -98,7 +98,7 @@ SecAction \
 
 
 #
-# -- [[ Collaborative Detection Scoring Threshold Levels ]] ------------------------------
+# -- [[ Collaborative Detection Scoring Initialization and Threshold Levels ]] ------------------------------
 #
 # These variables are used in macro expansion in the 49 inbound blocking and 59
 # outbound blocking files.
@@ -107,18 +107,23 @@ SecAction \
 # operators.  If you have an earlier version, edit the 49/59 files directly to
 # set the appropriate anomaly score levels.
 #
-# You should set the score to the proper threshold you would prefer. If set to "5"
-# it will work similarly to previous Mod CRS rules and will create an event in the error_log
-# file if there are any rules that match.  If you would like to lessen the number of events
-# generated in the error_log file, you should increase the anomaly score threshold to
-# something like "20".  This would only generate an event in the error_log file if
-# there are multiple lower severity rule matches or if any 1 higher severity item matches.
+# You should set the score level (rule 900003) to the proper threshold you 
+# would prefer.  If set to "5" it will work similarly to previous Mod CRS rules
+# and will create an event in the error_log file if there are any rules that
+# match.  If you would like to lessen the number of events generated in the 
+# error_log file, you should increase the anomaly score threshold to something 
+# like "20".  This would only generate an event in the error_log file if there
+# are multiple lower severity rule matches or if any 1 higher severity item matches.
 #
 SecAction \
   "id:'900002', \
   phase:1, \
   t:none, \
-  setvar:tx.inbound_anomaly_score_level=<%= @inbound_anomaly_threshold -%>, \
+  setvar:tx.anomaly_score=0, \
+  setvar:tx.sql_injection_score=0, \
+  setvar:tx.xss_score=0, \
+  setvar:tx.inbound_anomaly_score=0, \
+  setvar:tx.outbound_anomaly_score=0, \
   nolog, \
   pass"
 
@@ -127,12 +132,13 @@ SecAction \
   "id:'900003', \
   phase:1, \
   t:none, \
+  setvar:tx.inbound_anomaly_score_level=<%= @inbound_anomaly_threshold -%>, \
   setvar:tx.outbound_anomaly_score_level=<%= @outbound_anomaly_threshold -%>, \
   nolog, \
   pass"
 
 
-#
+# 
 # -- [[ Collaborative Detection Blocking ]] -----------------------------------------------
 #
 # This is a collaborative detection mode where each rule will increment an overall
@@ -156,7 +162,7 @@ SecAction \
 # -- [[ GeoIP Database ]] -----------------------------------------------------------------
 #
 # There are some rulesets that need to inspect the GEO data of the REMOTE_ADDR data.
-#
+# 
 # You must first download the MaxMind GeoIP Lite City DB -
 #
 #       http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
@@ -193,12 +199,12 @@ SecAction \
 # -- [[ HTTP Policy Settings ]] ----------------------------------------------------------
 #
 # Set the following policy settings here and they will be propagated to the 23 rules
-# file (modsecurity_common_23_request_limits.conf) by using macro expansion.
+# file (modsecurity_common_23_request_limits.conf) by using macro expansion.  
 # If you run into false positives, you can adjust the settings here.
 #
 # Only the max number of args is uncommented by default as there are a high rate
 # of false positives.  Uncomment the items you wish to set.
-#
+# 
 #
 # -- Maximum number of arguments in request limited
 SecAction \
@@ -262,7 +268,7 @@ SecAction \
 
 #
 # Set the following policy settings here and they will be propagated to the 30 rules
-# file (modsecurity_crs_30_http_policy.conf) by using macro expansion.
+# file (modsecurity_crs_30_http_policy.conf) by using macro expansion.  
 # If you run into false positves, you can adjust the settings here.
 #
 SecAction \
@@ -284,7 +290,7 @@ SecAction \
 # The purpose of these settings is to send CSP response headers to
 # Mozilla FireFox users so that you can enforce how dynamic content
 # is used. CSP usage helps to prevent XSS attacks against your users.
-#
+#  
 # Reference Link:
 #
 #	https://developer.mozilla.org/en/Security/CSP
@@ -292,7 +298,7 @@ SecAction \
 # Uncomment this SecAction line if you want use CSP enforcement.
 # You need to set the appropriate directives and settings for your site/domain and
 # and activate the CSP file in the experimental_rules directory.
-#
+# 
 # Ref: http://blog.spiderlabs.com/2011/04/modsecurity-advanced-topic-of-the-week-integrating-content-security-policy-csp.html
 #
 #SecAction \
@@ -320,7 +326,7 @@ SecAction \
   "id:'900014', \
   phase:1, \
   t:none, \
-  setvar:'tx.brute_force_protected_urls=/login.jsp /partner_login.php', \
+  setvar:'tx.brute_force_protected_urls=#/login.jsp# #/partner_login.php#', \
   setvar:'tx.brute_force_burst_time_slice=60', \
   setvar:'tx.brute_force_counter_threshold=10', \
   setvar:'tx.brute_force_block_timeout=300', \
@@ -337,7 +343,7 @@ SecAction \
 # - Request Threshold: request # threshold to trigger a burst
 # - Block Period: temporary block timeout
 #
-#SecAction \
+SecAction \
   "id:'900015', \
   phase:1, \
   t:none, \
@@ -424,5 +430,7 @@ SecRule &TX:REAL_IP "@eq 0" \
   t:none, \
   initcol:global=global, \
   initcol:ip=%{remote_addr}_%{tx.ua_hash}, \
+  setvar:tx.real_ip=%{remote_addr}, \
   nolog, \
   pass"
+

From 9c456473d1e42858186a8ad4bd5385a7afb6aca3 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 15 Jul 2016 14:21:58 +0200
Subject: [PATCH 0968/2267] Remove CAS comment

The CAS directives are explicit (they start with CAS), and the comment was seen even without any CAS option set
---
 templates/vhost/_auth_cas.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/vhost/_auth_cas.erb b/templates/vhost/_auth_cas.erb
index fa26c00626..2f4787b73a 100644
--- a/templates/vhost/_auth_cas.erb
+++ b/templates/vhost/_auth_cas.erb
@@ -1,6 +1,4 @@
 <% if @cas_enabled -%>
-
-  # mod_auth_cas configuration
   <%- if @cas_cookie_path -%>
   CASCookiePath <%= @cas_cookie_path %>
   <%- end -%>

From 0c7bd6daa6382bea79edf1598b879c23a6eebaed Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 15 Jul 2016 15:44:14 +0200
Subject: [PATCH 0969/2267] Fix typo in README about limit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2eb4fb0d28..5a9f400c54 100644
--- a/README.md
+++ b/README.md
@@ -3237,7 +3237,7 @@ apache::vhost { 'sample.example.net':
     { path     => '/',
       provider => 'location',
       limit    => [
-        { methods => 'GET HEAD'
+        { methods => 'GET HEAD',
           require => ['valid-user']
         },
       ],

From e58d6cacab53da679f3aa5b8d6ab1888cc916b48 Mon Sep 17 00:00:00 2001
From: Simon Rondelez <simonrondelez@users.noreply.github.com>
Date: Wed, 20 Jul 2016 19:09:44 +0200
Subject: [PATCH 0970/2267] Patch httpoxy thry mod_security (#1506)

---
 templates/mod/security.conf.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 5df57dffed..5505f2140a 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -34,6 +34,9 @@
       IH %{MULTIPART_INVALID_HEADER_FOLDING}, \
       FL %{MULTIPART_FILE_LIMIT_EXCEEDED}'"
 
+    SecRule &REQUEST_HEADERS:Proxy "@gt 0" "id:1000005,log,deny,msg:'httpoxy denied'"
+
+
     SecRule MULTIPART_UNMATCHED_BOUNDARY "!@eq 0" \
       "id:'200003',phase:2,t:none,log,deny,status:44,msg:'Multipart parser detected a possible unmatched boundary.'"
 

From f5d2f9ab2b0353d04b42584bec49c88f39570b9e Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 27 Jul 2016 15:43:44 +0100
Subject: [PATCH 0971/2267] (MAINT) Update for modulesync_config 72d19f184

---
 .gitignore  |  3 ++-
 .travis.yml |  2 +-
 Gemfile     | 19 ++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd126f2fb2..0cd25de9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
 pkg/
 Gemfile.lock
 vendor/
-spec/fixtures/
+spec/fixtures/manifests/
+spec/fixtures/modules/
 .vagrant/
 .bundle/
 coverage/
diff --git a/.travis.yml b/.travis.yml
index 4e2c66df32..f631db04fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.1.6
+  - rvm: 2.1.9
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
   - rvm: 2.1.5
diff --git a/Gemfile b/Gemfile
index 9b5b2146b3..c7da908d9f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,14 +13,12 @@ def location_for(place, version = nil)
 end
 
 group :development, :unit_tests do
-  gem 'json',                      :require => false
-  gem 'metadata-json-lint',        :require => false
-  gem 'puppet_facts',              :require => false
-  gem 'puppetlabs_spec_helper',    :require => false
-  gem 'rspec-puppet', '>= 2.3.2',  :require => false
-  gem 'simplecov',                 :require => false
-  gem 'puppet-blacksmith',         :require => false
-  gem 'rest-client', '~> 1.8.0',   :require => false
+  gem 'metadata-json-lint',             :require => false
+  gem 'puppet_facts',                   :require => false
+  gem 'puppet-blacksmith', '>= 3.4.0',  :require => false
+  gem 'puppetlabs_spec_helper',         :require => false
+  gem 'rspec-puppet', '>= 2.3.2',       :require => false
+  gem 'simplecov',                      :require => false
 end
 group :system_tests do
   gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
@@ -31,10 +29,13 @@ group :system_tests do
   gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
 end
 
+# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
+# if using ruby 1.x
+gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
+
 gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 
-
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

From de601567515abc50bc5f02474e8da8ac64e3b5da Mon Sep 17 00:00:00 2001
From: John Dixon <jdixon@amientertainment.com>
Date: Fri, 29 Jul 2016 16:48:45 -0400
Subject: [PATCH 0972/2267] permit config of auth_dbd, include dbd, allow
 AuthnProviderAlias

There was previously no facility to configure dbd for use with
authn_dbd.  I want to keep the apache config I required within the scope
of this module.
---
 README.md                          | 28 ++++++++++++++
 manifests/mod/authn_dbd.pp         | 30 +++++++++++++++
 manifests/mod/dbd.pp               |  3 ++
 spec/classes/mod/authn_dbd_spec.rb | 62 ++++++++++++++++++++++++++++++
 templates/mod/authn_dbd.conf.erb   | 17 ++++++++
 5 files changed, 140 insertions(+)
 create mode 100644 manifests/mod/authn_dbd.pp
 create mode 100644 manifests/mod/dbd.pp
 create mode 100644 spec/classes/mod/authn_dbd_spec.rb
 create mode 100644 templates/mod/authn_dbd.conf.erb

diff --git a/README.md b/README.md
index 5a9f400c54..15e9eda5cd 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@
 [`apache::mod::alias`]: #class-apachemodalias
 [`apache::mod::auth_cas`]: #class-apachemodauth_cas
 [`apache::mod::auth_mellon`]: #class-apachemodauth_mellon
+[`apache::mod::authn_dbd`]: #class-apachemodauthn_dbd
 [`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap
 [`apache::mod::cluster`]: #class-apachemodcluster
 [`apache::mod::disk_cache`]: #class-apachemoddisk_cache
@@ -159,7 +160,9 @@
 [`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
 [`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html
 [`mod_authnz_external`]: https://github.com/phokz/mod-auth-external
+[`mod_auth_dbd`]: http://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
+[`mod_dbd`]: http://httpd.apache.org/docs/current/mod/mod_dbd.html
 [`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
 [`mod_dumpio`]: https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
 [`mod_expires`]: https://httpd.apache.org/docs/current/mod/mod_expires.html
@@ -1295,6 +1298,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `auth_mellon`\* (see [`apache::mod::auth_mellon`][])
 * `auth_kerb`
 * `authn_core`
+* `authn_dbd`\* (see [`apache::mod::authn_dbd`][])
 * `authn_file`
 * `authnz_ldap`\* (see [`apache::mod::authnz_ldap`][])
 * `authz_default`
@@ -1307,6 +1311,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `dav`
 * `dav_fs`
 * `dav_svn`\*
+* `dbd`
 * `deflate\`
 * `dev`
 * `dir`\*
@@ -1483,6 +1488,29 @@ class{ 'apache::mod::auth_mellon':
 - `mellon_post_size`: Maximum size of post requests. Default: undef.
 - `mellon_post_count`: Maximum number of post requests. Default: undef.
 
+##### Class: `apache::mod::authn_dbd`
+
+Installs `mod_authn_dbd` and uses `authn_dbd.conf.erb` template to generate its configuration.  Optionally creates AuthnProviderAlias.
+
+``` puppet
+class { 'apache::mod::authn_dbd':
+  $authn_dbd_params =>
+    'host=db01 port=3306 user=apache password=xxxxxx dbname=apacheauth',
+  $authn_dbd_query  => 'SELECT password FROM authn WHERE user = %s',
+  $authn_dbd_alias  => 'db_auth',
+}
+```
+
+** Parameters within `apache::mod::authn_dbd`
+- `authn_dbd_alias`: Name for the AuthnProviderAlias.
+- `authn_dbd_dbdriver`: Which db driver to use.  Default: mysql.
+- `authn_dbd_exptime`: corresponds to DBDExptime.  Default: 300.
+- `authn_dbd_keep`: corresponds to DBDKeep.  Default: 8.
+- `authn_dbd_max`: corresponds to DBDMax.  Default: 20.
+- `authn_dbd_min`: corresponds to DBDMin.  Default: 4.
+- `authn_dbd_params`: **Required**. Corresponds to DBDParams for the connection string.
+- `authn_dbd_query`: is the query used to test a user and password for authentication.
+
 ##### Class: `apache::mod::authnz_ldap`
 
 Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to generate its configuration.
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
new file mode 100644
index 0000000000..be6ff3e55f
--- /dev/null
+++ b/manifests/mod/authn_dbd.pp
@@ -0,0 +1,30 @@
+class apache::mod::authn_dbd (
+  $authn_dbd_params,
+  $authn_dbd_dbdriver    = 'mysql',
+  $authn_dbd_query       = undef,
+  $authn_dbd_min         = '4',
+  $authn_dbd_max         = '20',
+  $authn_dbd_keep        = '8',
+  $authn_dbd_exptime     = '300',
+  $authn_dbd_alias       = undef,
+) inherits ::apache::params {
+  include ::apache
+  include ::apache::mod::dbd
+  ::apache::mod { 'authn_dbd': }
+
+  if $authn_dbd_alias {
+  include ::apache::mod::authn_core
+  }
+
+  # Template uses
+  # - All variables beginning with authn_dbd
+  file { 'authn_dbd.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/authn_dbd.conf",
+    mode    => $::apache::file_mode,
+    content => template('apache/mod/authn_dbd.conf.erb'),
+    require => [ Exec["mkdir ${::apache::mod_dir}"], ],
+    before  => File[$::apache::mod_dir],
+    notify  => Class['Apache::Service'],
+  }
+}
diff --git a/manifests/mod/dbd.pp b/manifests/mod/dbd.pp
new file mode 100644
index 0000000000..547acc77df
--- /dev/null
+++ b/manifests/mod/dbd.pp
@@ -0,0 +1,3 @@
+class apache::mod::dbd {
+  ::apache::mod { 'dbd': }
+}
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
new file mode 100644
index 0000000000..4e101d1b5d
--- /dev/null
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe 'apache::mod::authn_dbd', :type => :class do
+  context "default params" do
+    let :params do
+      {
+        :authn_dbd_params => 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
+      }
+    end
+
+    it_behaves_like "a mod class, without including apache"
+  end
+
+  context "default configuration with parameters" do
+    let :params do
+      {
+        :authn_dbd_params => 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
+        :authn_dbd_alias  => 'db_authn',
+        :authn_dbd_query  => 'SELECT password FROM authn WHERE username = %s'
+      }
+    end
+
+    context "on a Debian OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :lsbdistcodename        => 'squeeze',
+          :osfamily               => 'Debian',
+          :operatingsystem        => 'Debian',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod("authn_dbd") }
+      it { is_expected.to contain_apache__mod("dbd") }
+      it { is_expected.to contain_file("authn_dbd.conf").with_path('/etc/apache2/mods-available/authn_dbd.conf') }
+    end
+
+    context "on a RedHat OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod("authn_dbd") }
+      it { is_expected.to contain_apache__mod("dbd") }
+      it { is_expected.to contain_file("authn_dbd.conf").with_path('/etc/httpd/conf.d/authn_dbd.conf') }
+    end
+  end
+end
diff --git a/templates/mod/authn_dbd.conf.erb b/templates/mod/authn_dbd.conf.erb
new file mode 100644
index 0000000000..e04fb3ec43
--- /dev/null
+++ b/templates/mod/authn_dbd.conf.erb
@@ -0,0 +1,17 @@
+#Database Management
+DBDriver <%= @authn_dbd_dbdriver %>
+
+#Connection string: database name and login credentials
+DBDParams "<%= @authn_dbd_params %>"
+
+#Parameters for Connection Pool Management
+DBDMin     <%= @authn_dbd_min %>
+DBDMax     <%= @authn_dbd_max %>
+DBDKeep    <%= @authn_dbd_keep %>
+DBDExptime <%= @authn_dbd_exptime %>
+
+<%- if @authn_dbd_alias -%>
+<AuthnProviderAlias dbd <%= @authn_dbd_alias %>>
+  AuthDBDUserPWQuery "<%= @authn_dbd_query %>"
+</AuthnProviderAlias>
+<%- end -%>

From d7b3e44e5d892a715bb8a321c95fe0c551d33576 Mon Sep 17 00:00:00 2001
From: James Glenn <thedonkdonk@gmail.com>
Date: Thu, 4 Aug 2016 17:28:09 -0500
Subject: [PATCH 0973/2267] MODULES-3689 - change case

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5a9f400c54..73977901a9 100644
--- a/README.md
+++ b/README.md
@@ -3353,7 +3353,7 @@ apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
     { path    => '/path/to/directory',
-      require => 'IP 10.17.42.23',
+      require => 'ip 10.17.42.23',
     }
   ],
 }

From 913e94b7cc994f605becebebfe0f5109f847437d Mon Sep 17 00:00:00 2001
From: Christoph Maser <christoph.maser@1und1.de>
Date: Fri, 12 Aug 2016 13:54:41 +0200
Subject: [PATCH 0974/2267] MODULES-1556

move $error_log, $scriptalias, $access_log_file to params pp and
make them class parameters.
Change templates/httpd.conf.erb to allow paths pipes or syslog for error log
---
 README.md                | 38 ++++++++++++++++++++++
 manifests/init.pp        | 69 +++++++++++++---------------------------
 manifests/params.pp      | 15 +++++++++
 templates/httpd.conf.erb |  4 +++
 4 files changed, 79 insertions(+), 47 deletions(-)

diff --git a/README.md b/README.md
index 73977901a9..6c9a2ae3f8 100644
--- a/README.md
+++ b/README.md
@@ -1240,6 +1240,44 @@ The default value is determined by your operating system:
 
 You might need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.
 
+##### `error_log`
+
+The name of the error log file for the main server instance
+
+The default value is determined by your operating system:
+
+- **Debian**: 'error.log'
+- **FreeBSD**: 'httpd-error.log'
+- **Gentoo**: 'error.log'
+- **Red Hat**: 'error_log'
+- **Suse**: 'error.log'
+
+If the string starts with / or | or syslog: the full path will be set. Otherwise the filename will be prefixed with $logroot
+
+##### `scriptalias`
+
+Directory to use for global script alias 
+
+The default value is determined by your operating system:
+
+- **Debian**: '/usr/lib/cgi-bin'
+- **FreeBSD**: '/usr/local/www/apache24/cgi-bin'
+- **Gentoo**: 'var/www/localhost/cgi-bin'
+- **Red Hat**: '/var/www/cgi-bin'
+- **Suse**: '/usr/lib/cgi-bin'
+
+##### `access_log_file`
+
+The name of the access log file for the main server instance
+
+The default value is determined by your operating system:
+
+- **Debian**: 'error.log'
+- **FreeBSD**: 'httpd-access.log'
+- **Gentoo**: 'access.log'
+- **Red Hat**: 'access_log'
+- **Suse**: 'access.log'
+
 #### Class: `apache::dev`
 
 Installs Apache development libraries. By default, the package name is defined by the [`dev_packages`][] parameter of the [`apache::params`][] class based on your operating system:
diff --git a/manifests/init.pp b/manifests/init.pp
index e3894cfffe..5293da0d17 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -82,6 +82,9 @@
   $file_mode              = $::apache::params::file_mode,
   $root_directory_options = $::apache::params::root_directory_options,
   $root_directory_secured = false,
+  $error_log              = $::apache::params::error_log,
+  $scriptalias            = $::apache::params::scriptalias,
+  $access_log_file        = $::apache::params::access_log_file,
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)
@@ -258,60 +261,32 @@
   }
 
   if $::apache::conf_dir and $::apache::params::conf_file {
-    case $::osfamily {
-      'debian': {
-        $error_log            = 'error.log'
-        $scriptalias          = '/usr/lib/cgi-bin'
-        $access_log_file      = 'access.log'
-      }
-      'redhat': {
-        $error_log            = 'error_log'
-        $scriptalias          = '/var/www/cgi-bin'
-        $access_log_file      = 'access_log'
-      }
-      'freebsd': {
-        $error_log            = 'httpd-error.log'
-        $scriptalias          = '/usr/local/www/apache24/cgi-bin'
-        $access_log_file      = 'httpd-access.log'
-      } 'gentoo': {
-        $error_log            = 'error.log'
-        $error_documents_path = '/usr/share/apache2/error'
-        $scriptalias          = '/var/www/localhost/cgi-bin'
-        $access_log_file      = 'access.log'
-
-        if is_array($default_mods) {
-          if versioncmp($apache_version, '2.4') >= 0 {
-            if defined('apache::mod::ssl') {
-              ::portage::makeconf { 'apache2_modules':
-                content => concat($default_mods, [ 'authz_core', 'socache_shmcb' ]),
-              }
-            } else {
-              ::portage::makeconf { 'apache2_modules':
-                content => concat($default_mods, 'authz_core'),
-              }
+    if $::osfamily == 'gentoo' {
+      $error_documents_path = '/usr/share/apache2/error'
+      if is_array($default_mods) {
+        if versioncmp($apache_version, '2.4') >= 0 {
+          if defined('apache::mod::ssl') {
+            ::portage::makeconf { 'apache2_modules':
+              content => concat($default_mods, [ 'authz_core', 'socache_shmcb' ]),
             }
           } else {
             ::portage::makeconf { 'apache2_modules':
-              content => $default_mods,
+              content => concat($default_mods, 'authz_core'),
             }
           }
-        }
-
-        file { [
-          '/etc/apache2/modules.d/.keep_www-servers_apache-2',
-          '/etc/apache2/vhosts.d/.keep_www-servers_apache-2'
-        ]:
-          ensure  => absent,
-          require => Package['httpd'],
+        } else {
+          ::portage::makeconf { 'apache2_modules':
+            content => $default_mods,
+          }
         }
       }
-      'Suse': {
-        $error_log            = 'error.log'
-        $scriptalias          = '/usr/lib/cgi-bin'
-        $access_log_file      = 'access.log'
-      }
-      default: {
-        fail("Unsupported osfamily ${::osfamily}")
+
+      file { [
+        '/etc/apache2/modules.d/.keep_www-servers_apache-2',
+        '/etc/apache2/vhosts.d/.keep_www-servers_apache-2'
+      ]:
+        ensure  => absent,
+        require => Package['httpd'],
       }
     }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index d67246c868..9ef16de83d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -193,6 +193,9 @@
       'base_rules/modsecurity_crs_59_outbound_blocking.conf',
       'base_rules/modsecurity_crs_60_correlation.conf',
     ]
+    $error_log           = 'error_log'
+    $scriptalias         = '/var/www/cgi-bin'
+    $access_log_file     = 'access_log'
   } elsif $::osfamily == 'Debian' {
     $user                = 'www-data'
     $group               = 'www-data'
@@ -249,6 +252,9 @@
       'wsgi'        => 'libapache2-mod-wsgi',
       'xsendfile'   => 'libapache2-mod-xsendfile',
     }
+    $error_log           = 'error.log'
+    $scriptalias         = '/usr/lib/cgi-bin'
+    $access_log_file     = 'access.log'
     if $::osfamily == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0 {
       $shib2_lib = 'mod_shib_22.so'
     } else {
@@ -393,6 +399,9 @@
     $docroot              = '/usr/local/www/apache24/data'
     $alias_icons_path     = '/usr/local/www/apache24/icons'
     $error_documents_path = '/usr/local/www/apache24/error'
+    $error_log            = 'httpd-error.log'
+    $scriptalias          = '/usr/local/www/apache24/cgi-bin'
+    $access_log_file      = 'httpd-access.log'
   } elsif $::osfamily == 'Gentoo' {
     $user             = 'apache'
     $group            = 'apache'
@@ -457,6 +466,9 @@
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     $pidfile              = '/var/run/apache2.pid'
+    $error_log            = 'error.log'
+    $scriptalias          = '/var/www/localhost/cgi-bin'
+    $access_log_file      = 'access.log'
   } elsif $::osfamily == 'Suse' {
     $user                = 'wwwrun'
     $group               = 'wwwrun'
@@ -509,6 +521,9 @@
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     $dev_packages        = ['libapr-util1-devel', 'libapr1-devel']
+    $error_log           = 'error.log'
+    $scriptalias         = '/usr/lib/cgi-bin'
+    $access_log_file     = 'access.log'
 
     #
     # Passenger-specific settings
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 21184179ff..4445d75ff8 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -51,7 +51,11 @@ AddDefaultCharset <%= @default_charset %>
 DefaultType <%= @default_type %>
 <%- end -%>
 HostnameLookups Off
+<%- if /^[|\/]/.match(@error_log) || /^syslog:/.match(@error_log) -%>
+ErrorLog "<%= @error_log %>"
+<%- else -%>
 ErrorLog "<%= @logroot %>/<%= @error_log %>"
+<%- end -%>
 LogLevel <%= @log_level %>
 EnableSendfile <%= @sendfile %>
 <%- if @allow_encoded_slashes -%>

From d14e1a83e7e778fc6a000f8b28124fdb36834c43 Mon Sep 17 00:00:00 2001
From: ygt-davidstirling <david.stirling@yourgolftravel.com>
Date: Thu, 18 Aug 2016 18:59:09 +0100
Subject: [PATCH 0975/2267] mod_passenger: PassengerMaxInstancesPerApp option
 (#1503)

* mod_passenger: allow PassengerMaxInstancesPerApp being set

* Readme: passenger_max_instances_per_app parameter description.
---
 README.md                          | 4 ++++
 manifests/mod/passenger.pp         | 2 ++
 spec/classes/mod/passenger_spec.rb | 6 ++++++
 templates/mod/passenger.conf.erb   | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 2c6e6851b1..fd2faa00ae 100644
--- a/README.md
+++ b/README.md
@@ -2553,6 +2553,10 @@ Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/refe
 
 Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances), the minimum number of application processes to run.
 
+##### `passenger_max_instances_per_app`
+
+Sets [PassengerMaxInstancesPerApp](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstancesperapp), the maximum number of application processes that may simultaneously exist for a single application.
+
 ##### `passenger_start_timeout`
 
 Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout), the timeout for the application startup.
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index e127d78267..1df3126ef0 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -14,6 +14,7 @@
   $passenger_default_ruby           = $::apache::params::passenger_default_ruby,
   $passenger_max_pool_size          = undef,
   $passenger_min_instances          = undef,
+  $passenger_max_instances_per_app  = undef,
   $passenger_use_global_queue       = undef,
   $passenger_app_env                = undef,
   $passenger_log_file               = undef,
@@ -87,6 +88,7 @@
   # - $passenger_default_ruby
   # - $passenger_max_pool_size
   # - $passenger_min_instances
+  # - $passenger_max_instances_per_app
   # - $passenger_high_performance
   # - $passenger_max_requests
   # - $passenger_spawn_method
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index e9e754202c..3f485b42ab 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -98,6 +98,12 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMinInstances 5$/) }
     end
+    describe "with passenger_max_instances_per_app => 8" do
+      let :params do
+        { :passenger_max_instances_per_app => 8 }
+      end
+      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxInstancesPerApp 8$/) }
+    end
     describe "with rack_autodetect => on" do
       let :params do
         { :rack_autodetect => 'on' }
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 6eac6fe649..770cb34e0c 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -19,6 +19,9 @@
   <%- if @passenger_min_instances -%>
   PassengerMinInstances <%= @passenger_min_instances %>
   <%- end -%>
+  <%- if @passenger_max_instances_per_app -%>
+  PassengerMaxInstancesPerApp <%= @passenger_max_instances_per_app %>
+  <%- end -%>
   <%- if @passenger_pool_idle_time -%>
   PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
   <%- end -%>

From 484f8565d579f732689a06a1011d3e1c3eb9322c Mon Sep 17 00:00:00 2001
From: Richard Pijnenburg <richard.pijnenburg@timgroup.com>
Date: Mon, 15 Aug 2016 11:21:20 +0100
Subject: [PATCH 0976/2267] Allow the proxy_via setting to be configured

Previously it was hardcoded, this patch makes it configurable.
---
 README.md                    | 1 +
 manifests/mod/proxy.pp       | 1 +
 templates/mod/proxy.conf.erb | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 73977901a9..fbd5f97ad6 100644
--- a/README.md
+++ b/README.md
@@ -1730,6 +1730,7 @@ Installs `mod_proxy` and uses the `proxy.conf.erb` template to generate its conf
 - `apache_version`: Default: `undef`.
 - `package_name`: Default: `undef`.
 - `proxy_requests`: Default: 'Off'.
+- `proxy_via`: Default: 'On'.
 
 ##### Class: `apache::mod::php`
 
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index b69a17e9d9..ce82cb3a89 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -3,6 +3,7 @@
   $allow_from     = undef,
   $apache_version = undef,
   $package_name   = undef,
+  $proxy_via      = 'On',
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index 06fe547140..d023c14e53 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -23,5 +23,5 @@
   # Enable/disable the handling of HTTP/1.1 "Via:" headers.
   # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
   # Set to one of: Off | On | Full | Block
-  ProxyVia On
+  ProxyVia <%= @proxy_via %>
 </IfModule>

From 0a5f98b449c0210a3ac8a50df4387b600f2b3614 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Thu, 25 Aug 2016 16:13:15 +0200
Subject: [PATCH 0977/2267] Update modulesync_config [0d59329]

---
 .rubocop.yml                              | 508 ++++++++++++++++++++++
 .travis.yml                               |   5 +-
 Gemfile                                   |  23 +-
 Rakefile                                  |   4 -
 spec/acceptance/nodesets/centos-7-x64.yml |   2 +-
 5 files changed, 527 insertions(+), 15 deletions(-)
 create mode 100644 .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000000..5aadd1b64f
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,508 @@
+require: rubocop-rspec
+AllCops:
+  TargetRubyVersion: 1.9
+  Include:
+    - ./**/*.rb
+  Exclude:
+    - vendor/**/*
+    - .vendor/**/*
+    - pkg/**/*
+    - spec/fixtures/**/*
+Lint/ConditionPosition:
+  Enabled: True
+
+Lint/ElseLayout:
+  Enabled: True
+
+Lint/UnreachableCode:
+  Enabled: True
+
+Lint/UselessComparison:
+  Enabled: True
+
+Lint/EnsureReturn:
+  Enabled: True
+
+Lint/HandleExceptions:
+  Enabled: True
+
+Lint/LiteralInCondition:
+  Enabled: True
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: True
+
+Lint/LiteralInInterpolation:
+  Enabled: True
+
+Style/HashSyntax:
+  Enabled: True
+
+Style/RedundantReturn:
+  Enabled: True
+
+Lint/AmbiguousOperator:
+  Enabled: True
+
+Lint/AssignmentInCondition:
+  Enabled: True
+
+Style/SpaceBeforeComment:
+  Enabled: True
+
+Style/AndOr:
+  Enabled: True
+
+Style/RedundantSelf:
+  Enabled: True
+
+# Method length is not necessarily an indicator of code quality
+Metrics/MethodLength:
+  Enabled: False
+
+# Module length is not necessarily an indicator of code quality
+Metrics/ModuleLength:
+  Enabled: False
+
+Style/WhileUntilModifier:
+  Enabled: True
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: True
+
+Lint/Eval:
+  Enabled: True
+
+Lint/BlockAlignment:
+  Enabled: True
+
+Lint/DefEndAlignment:
+  Enabled: True
+
+Lint/EndAlignment:
+  Enabled: True
+
+Lint/DeprecatedClassMethods:
+  Enabled: True
+
+Lint/Loop:
+  Enabled: True
+
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: True
+
+Lint/RescueException:
+  Enabled: True
+
+Lint/StringConversionInInterpolation:
+  Enabled: True
+
+Lint/UnusedBlockArgument:
+  Enabled: True
+
+Lint/UnusedMethodArgument:
+  Enabled: True
+
+Lint/UselessAccessModifier:
+  Enabled: True
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Lint/Void:
+  Enabled: True
+
+Style/AccessModifierIndentation:
+  Enabled: True
+
+Style/AccessorMethodName:
+  Enabled: True
+
+Style/Alias:
+  Enabled: True
+
+Style/AlignArray:
+  Enabled: True
+
+Style/AlignHash:
+  Enabled: True
+
+Style/AlignParameters:
+  Enabled: True
+
+Metrics/BlockNesting:
+  Enabled: True
+
+Style/AsciiComments:
+  Enabled: True
+
+Style/Attr:
+  Enabled: True
+
+Style/BracesAroundHashParameters:
+  Enabled: True
+
+Style/CaseEquality:
+  Enabled: True
+
+Style/CaseIndentation:
+  Enabled: True
+
+Style/CharacterLiteral:
+  Enabled: True
+
+Style/ClassAndModuleCamelCase:
+  Enabled: True
+
+Style/ClassAndModuleChildren:
+  Enabled: False
+
+Style/ClassCheck:
+  Enabled: True
+
+# Class length is not necessarily an indicator of code quality
+Metrics/ClassLength:
+  Enabled: False
+
+Style/ClassMethods:
+  Enabled: True
+
+Style/ClassVars:
+  Enabled: True
+
+Style/WhenThen:
+  Enabled: True
+
+Style/WordArray:
+  Enabled: True
+
+Style/UnneededPercentQ:
+  Enabled: True
+
+Style/Tab:
+  Enabled: True
+
+Style/SpaceBeforeSemicolon:
+  Enabled: True
+
+Style/TrailingBlankLines:
+  Enabled: True
+
+Style/SpaceInsideBlockBraces:
+  Enabled: True
+
+Style/SpaceInsideBrackets:
+  Enabled: True
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: True
+
+Style/SpaceInsideParens:
+  Enabled: True
+
+Style/LeadingCommentSpace:
+  Enabled: True
+
+Style/SpaceBeforeFirstArg:
+  Enabled: True
+
+Style/SpaceAfterColon:
+  Enabled: True
+
+Style/SpaceAfterComma:
+  Enabled: True
+
+Style/SpaceAfterMethodName:
+  Enabled: True
+
+Style/SpaceAfterNot:
+  Enabled: True
+
+Style/SpaceAfterSemicolon:
+  Enabled: True
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: True
+
+Style/SpaceAroundOperators:
+  Enabled: True
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: True
+
+Style/SpaceBeforeComma:
+  Enabled: True
+
+Style/CollectionMethods:
+  Enabled: True
+
+Style/CommentIndentation:
+  Enabled: True
+
+Style/ColonMethodCall:
+  Enabled: True
+
+Style/CommentAnnotation:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/CyclomaticComplexity:
+  Enabled: False
+
+Style/ConstantName:
+  Enabled: True
+
+Style/Documentation:
+  Enabled: False
+
+Style/DefWithParentheses:
+  Enabled: True
+
+Style/PreferredHashMethods:
+  Enabled: True
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/DoubleNegation:
+  Enabled: True
+
+Style/EachWithObject:
+  Enabled: True
+
+Style/EmptyLineBetweenDefs:
+  Enabled: True
+
+Style/IndentArray:
+  Enabled: True
+
+Style/IndentHash:
+  Enabled: True
+
+Style/IndentationConsistency:
+  Enabled: True
+
+Style/IndentationWidth:
+  Enabled: True
+
+Style/EmptyLines:
+  Enabled: True
+
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: True
+
+Style/EmptyLiteral:
+  Enabled: True
+
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Enabled: False
+
+Style/MethodCallParentheses:
+  Enabled: True
+
+Style/MethodDefParentheses:
+  Enabled: True
+
+Style/LineEndConcatenation:
+  Enabled: True
+
+Style/TrailingWhitespace:
+  Enabled: True
+
+Style/StringLiterals:
+  Enabled: True
+
+Style/TrailingCommaInArguments:
+  Enabled: True
+
+Style/TrailingCommaInLiteral:
+  Enabled: True
+
+Style/GlobalVars:
+  Enabled: True
+
+Style/GuardClause:
+  Enabled: True
+
+Style/IfUnlessModifier:
+  Enabled: True
+
+Style/MultilineIfThen:
+  Enabled: True
+
+Style/NegatedIf:
+  Enabled: True
+
+Style/NegatedWhile:
+  Enabled: True
+
+Style/Next:
+  Enabled: True
+
+Style/SingleLineBlockParams:
+  Enabled: True
+
+Style/SingleLineMethods:
+  Enabled: True
+
+Style/SpecialGlobalVars:
+  Enabled: True
+
+Style/TrivialAccessors:
+  Enabled: True
+
+Style/UnlessElse:
+  Enabled: True
+
+Style/VariableInterpolation:
+  Enabled: True
+
+Style/VariableName:
+  Enabled: True
+
+Style/WhileUntilDo:
+  Enabled: True
+
+Style/EvenOdd:
+  Enabled: True
+
+Style/FileName:
+  Enabled: True
+
+Style/For:
+  Enabled: True
+
+Style/Lambda:
+  Enabled: True
+
+Style/MethodName:
+  Enabled: True
+
+Style/MultilineTernaryOperator:
+  Enabled: True
+
+Style/NestedTernaryOperator:
+  Enabled: True
+
+Style/NilComparison:
+  Enabled: True
+
+Style/FormatString:
+  Enabled: True
+
+Style/MultilineBlockChain:
+  Enabled: True
+
+Style/Semicolon:
+  Enabled: True
+
+Style/SignalException:
+  Enabled: True
+
+Style/NonNilCheck:
+  Enabled: True
+
+Style/Not:
+  Enabled: True
+
+Style/NumericLiterals:
+  Enabled: True
+
+Style/OneLineConditional:
+  Enabled: True
+
+Style/OpMethod:
+  Enabled: True
+
+Style/ParenthesesAroundCondition:
+  Enabled: True
+
+Style/PercentLiteralDelimiters:
+  Enabled: True
+
+Style/PerlBackrefs:
+  Enabled: True
+
+Style/PredicateName:
+  Enabled: True
+
+Style/RedundantException:
+  Enabled: True
+
+Style/SelfAssignment:
+  Enabled: True
+
+Style/Proc:
+  Enabled: True
+
+Style/RaiseArgs:
+  Enabled: True
+
+Style/RedundantBegin:
+  Enabled: True
+
+Style/RescueModifier:
+  Enabled: True
+
+# based on https://github.com/voxpupuli/modulesync_config/issues/168
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r
+  Enabled: True
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: True
+
+Metrics/ParameterLists:
+  Enabled: False
+
+Lint/RequireParentheses:
+  Enabled: True
+
+Style/SpaceBeforeFirstArg:
+  Enabled: True
+
+Style/ModuleFunction:
+  Enabled: True
+
+Lint/Debugger:
+  Enabled: True
+
+Style/IfWithSemicolon:
+  Enabled: True
+
+Style/Encoding:
+  Enabled: True
+
+Style/BlockDelimiters:
+  Enabled: True
+
+Style/MultilineBlockLayout:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/AbcSize:
+  Enabled: False
+
+# 'Complexity' is very relative
+Metrics/PerceivedComplexity:
+  Enabled: False
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Style/ClosingParenthesisIndentation:
+  Enabled: False
+
+# RSpec
+
+# We don't use rspec in this way
+RSpec/DescribeClass:
+  Enabled: False
+
+# Example length is not necessarily an indicator of code quality
+RSpec/ExampleLength:
+  Enabled: False
+
+RSpec/NamedSubject:
+  Enabled: False
diff --git a/.travis.yml b/.travis.yml
index f631db04fb..e313d879d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,12 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
+  - rvm: 2.3.1
+    bundler_args: --without system_tests
+    env: PUPPET_GEM_VERSION="~> 4.0"
   - rvm: 2.1.9
     bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    env: PUPPET_GEM_VERSION="~> 4.0"
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
diff --git a/Gemfile b/Gemfile
index c7da908d9f..ff29118928 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,21 +4,23 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
-    [version, { :git => $1, :branch => $2, :require => false}].compact
+    [version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false}]
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
   else
-    [place, version, { :require => false}].compact
+    [place, version, { :require => false }].compact
   end
 end
 
 group :development, :unit_tests do
-  gem 'metadata-json-lint',             :require => false
-  gem 'puppet_facts',                   :require => false
-  gem 'puppet-blacksmith', '>= 3.4.0',  :require => false
-  gem 'puppetlabs_spec_helper',         :require => false
-  gem 'rspec-puppet', '>= 2.3.2',       :require => false
-  gem 'simplecov',                      :require => false
+  gem 'metadata-json-lint',                  :require => false
+  gem 'puppet_facts',                        :require => false
+  gem 'puppet-blacksmith', '>= 3.4.0',       :require => false
+  gem 'puppetlabs_spec_helper', '>= 1.2.1',  :require => false
+  gem 'rspec-puppet', '>= 2.3.2',            :require => false
+  gem 'rspec-puppet-facts',                  :require => false
+  gem 'simplecov',                           :require => false
+  gem 'parallel_tests',                      :require => false
 end
 group :system_tests do
   gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
@@ -32,6 +34,9 @@ end
 # json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
 # if using ruby 1.x
 gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
+# rubocop 0.42.0 requires ruby >=2
+gem 'rubocop', '0.41.2', :require => false if RUBY_VERSION =~ /^1\./
+gem 'rubocop-rspec', '~> 1.6', :require => false if RUBY_VERSION >= '2.3.0'
 
 gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
diff --git a/Rakefile b/Rakefile
index af59fcf5c0..f4c70b8d35 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,14 +2,10 @@ require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppetlabs_spec_helper/rake_tasks'
 
-PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_140chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.send('disable_only_variable_string')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "bundle/**/*", "vendor/**/*"]
 
 desc 'Generate pooler nodesets'
 task :gen_nodeset do
diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml
index 1a40c8950f..5eebdefbfa 100644
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ b/spec/acceptance/nodesets/centos-7-x64.yml
@@ -3,7 +3,7 @@ HOSTS:
     roles:
       - agent
       - default
-    platform: redhat-7-x86_64
+    platform: el-7-x86_64
     hypervisor: vagrant
     box: puppetlabs/centos-7.2-64-nocm
 CONFIG:

From 728af498ba62a1829f64047b399fa4ad034e995b Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Thu, 25 Aug 2016 17:27:04 +0200
Subject: [PATCH 0978/2267] Override lint warning on compatibility requirement

---
 manifests/mod/authnz_ldap.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 0bcd1b887c..033c1be514 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,3 +1,4 @@
+# lint:ignore:variable_is_lowercase required for compatibility
 class apache::mod::authnz_ldap (
   $verify_server_cert = true,
   $verifyServerCert   = undef,
@@ -30,3 +31,4 @@
     notify  => Class['apache::service'],
   }
 }
+# lint:endignore

From ad7a237c0ba0d2d4f53ada81e75b0161a33f3153 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Fri, 26 Aug 2016 09:28:58 +0200
Subject: [PATCH 0979/2267] Update modulesync_config [a3fe424]

---
 .travis.yml      |   4 +-
 Gemfile          |  60 ++++----
 Gemfile.lock.bak | 362 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 395 insertions(+), 31 deletions(-)
 create mode 100644 Gemfile.lock.bak

diff --git a/.travis.yml b/.travis.yml
index e313d879d3..4e549bf77a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,13 @@ script: "bundle exec rake validate lint spec"
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.1.6
+  - rvm: 2.3.1
     dist: trusty
     env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.1.6
+  - rvm: 2.3.1
     dist: trusty
     env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
     script: bundle exec rake beaker
diff --git a/Gemfile b/Gemfile
index ff29118928..c97275bd82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,44 +2,46 @@
 
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-def location_for(place, version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
-    [version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
+def location_from_env(env, default_location = [])
+  if location = ENV[env]
+    if location =~ /^((?:git|https?)[:@][^#]*)#(.*)/
+      [{ :git => $1, :branch => $2, :require => false }]
+    elsif location =~ /^file:\/\/(.*)/
+      ['>= 0', { :path => File.expand_path($1), :require => false }]
+    else
+      [location, { :require => false }]
+    end
   else
-    [place, version, { :require => false }].compact
+    default_location
   end
 end
 
 group :development, :unit_tests do
-  gem 'metadata-json-lint',                  :require => false
-  gem 'puppet_facts',                        :require => false
-  gem 'puppet-blacksmith', '>= 3.4.0',       :require => false
-  gem 'puppetlabs_spec_helper', '>= 1.2.1',  :require => false
-  gem 'rspec-puppet', '>= 2.3.2',            :require => false
-  gem 'rspec-puppet-facts',                  :require => false
-  gem 'simplecov',                           :require => false
-  gem 'parallel_tests',                      :require => false
+  gem 'metadata-json-lint'
+  gem 'puppet_facts'
+  gem 'puppet-blacksmith', '>= 3.4.0'
+  gem 'puppetlabs_spec_helper', '>= 1.2.1'
+  gem 'rspec-puppet', '>= 2.3.2'
+  gem 'rspec-puppet-facts'
+  gem 'simplecov'
+  gem 'parallel_tests'
+  gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
+  gem 'rubocop' if RUBY_VERSION >= '2.0.0'
+  gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'
+  gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
 end
 group :system_tests do
-  gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
-  gem 'beaker',                        *location_for(ENV['BEAKER_VERSION'])
-  gem 'serverspec',                    :require => false
-  gem 'beaker-puppet_install_helper',  :require => false
-  gem 'master_manipulator',            :require => false
-  gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+  gem 'beaker', *location_from_env('BEAKER_VERSION', []) if RUBY_VERSION >= '2.3.0'
+  gem 'beaker', *location_from_env('BEAKER_VERSION', ['< 3']) if RUBY_VERSION < '2.3.0'
+  gem 'beaker-rspec', *location_from_env('BEAKER_RSPEC_VERSION', ['>= 3.4'])
+  gem 'serverspec'
+  gem 'beaker-puppet_install_helper'
+  gem 'master_manipulator'
+  gem 'beaker-hostgenerator', *location_from_env('BEAKER_HOSTGENERATOR_VERSION', [])
 end
 
-# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
-# if using ruby 1.x
-gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
-# rubocop 0.42.0 requires ruby >=2
-gem 'rubocop', '0.41.2', :require => false if RUBY_VERSION =~ /^1\./
-gem 'rubocop-rspec', '~> 1.6', :require => false if RUBY_VERSION >= '2.3.0'
-
-gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
-gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
+gem 'facter', *location_from_env('FACTER_GEM_VERSION')
+gem 'puppet', *location_from_env('PUPPET_GEM_VERSION')
 
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
diff --git a/Gemfile.lock.bak b/Gemfile.lock.bak
new file mode 100644
index 0000000000..a070814e8d
--- /dev/null
+++ b/Gemfile.lock.bak
@@ -0,0 +1,362 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.2.8)
+    addressable (2.4.0)
+    ast (2.3.0)
+    aws-sdk-v1 (1.66.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+    beaker (2.50.0)
+      aws-sdk-v1 (~> 1.57)
+      beaker-answers (~> 0.0)
+      beaker-hiera (~> 0.0)
+      beaker-hostgenerator
+      beaker-pe (~> 0.0)
+      docker-api
+      fission (~> 0.4)
+      fog (~> 1.25, < 1.35.0)
+      fog-google (~> 0.0.9)
+      google-api-client (~> 0.8, < 0.9.5)
+      hocon (~> 1.0)
+      in-parallel (~> 0.1)
+      inifile (~> 2.0)
+      json (~> 1.8)
+      mime-types (~> 2.99)
+      minitest (~> 5.4)
+      net-scp (~> 1.2)
+      net-ssh (~> 2.9)
+      open_uri_redirections (~> 0.2.1)
+      rbvmomi (~> 1.8, < 1.9.0)
+      rsync (~> 1.0.9)
+      stringify-hash (~> 0.0)
+      unf (~> 0.1)
+    beaker-answers (0.11.0)
+      hocon (~> 1.0)
+      require_all (~> 1.3.2)
+      stringify-hash (~> 0.0.0)
+    beaker-hiera (0.1.1)
+      stringify-hash (~> 0.0.0)
+    beaker-hostgenerator (0.7.3)
+      deep_merge (~> 1.0)
+      stringify-hash (~> 0.0.0)
+    beaker-pe (0.9.0)
+      stringify-hash (~> 0.0.0)
+    beaker-puppet_install_helper (0.4.4)
+      beaker (~> 2.0)
+    beaker-rspec (5.6.0)
+      beaker (~> 2.0)
+      rspec
+      serverspec (~> 2)
+      specinfra (~> 2)
+    builder (3.2.2)
+    deep_merge (1.1.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    docker-api (1.31.0)
+      excon (>= 0.38.0)
+      json
+    domain_name (0.5.20160615)
+      unf (>= 0.0.5, < 1.0.0)
+    excon (0.52.0)
+    facter (2.4.6)
+      CFPropertyList (~> 2.2.6)
+    facterdb (0.3.6)
+      facter
+      jgrep
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.34.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.32)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (>= 0.0.2)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.11.0)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.11.0)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.42.0)
+      builder
+      excon (~> 0.49)
+      formatador (~> 0.2)
+    fog-dynect (0.0.3)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.0.9)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.3.0)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.5)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.5)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.7.5)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.1.3)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xml (0.1.2)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
+    google-api-client (0.9.4)
+      addressable (~> 2.3)
+      googleauth (~> 0.5)
+      httpclient (~> 2.7)
+      hurley (~> 0.1)
+      memoist (~> 0.11)
+      mime-types (>= 1.6)
+      representable (~> 2.3.0)
+      retriable (~> 2.0)
+      thor (~> 0.19)
+    googleauth (0.5.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    hiera (3.2.1)
+    hocon (1.1.2)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    httpclient (2.8.2.2)
+    hurley (0.2)
+    in-parallel (0.1.15)
+    inflecto (0.0.2)
+    inifile (2.0.2)
+    ipaddress (0.8.3)
+    jgrep (1.4.1)
+      json
+    json (1.8.3)
+    json_pure (2.0.2)
+    jwt (1.5.4)
+    little-plugger (1.1.4)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    master_manipulator (1.2.3)
+      beaker (~> 2.7, >= 2.7.0)
+      multi_json
+    mcollective-client (2.9.0)
+      json
+      stomp
+      systemu
+    memoist (0.15.0)
+    metaclass (0.0.4)
+    metadata-json-lint (0.0.11)
+      json
+      spdx-licenses (~> 1.0)
+    mime-types (2.99.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.12.1)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.4)
+    net-telnet (0.1.1)
+    netrc (0.11.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    open_uri_redirections (0.2.1)
+    os (0.9.6)
+    parallel (1.9.0)
+    parallel_tests (2.7.1)
+      parallel
+    parser (2.3.1.2)
+      ast (~> 2.2)
+    pkg-config (1.1.7)
+    powerpack (0.1.1)
+    puppet (4.5.3)
+      CFPropertyList (~> 2.2.6)
+      facter (> 2.0, < 4)
+      hiera (>= 2.0, < 4)
+      json_pure
+    puppet-blacksmith (3.4.0)
+      puppet (>= 2.7.16)
+      rest-client (~> 1.8.0)
+    puppet-lint (2.0.2)
+    puppet-syntax (2.1.0)
+      rake
+    puppet_facts (0.2.1)
+    puppetlabs_spec_helper (1.2.1)
+      mocha (~> 1.0)
+      puppet-lint (~> 2.0)
+      puppet-syntax (~> 2.0)
+      rspec-puppet (~> 2.0)
+    rainbow (2.1.0)
+    rake (11.2.2)
+    rbvmomi (1.8.2)
+      builder
+      nokogiri (>= 1.4.1)
+      trollop
+    representable (2.3.0)
+      uber (~> 0.0.7)
+    require_all (1.3.3)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    retriable (2.1.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-puppet (2.4.0)
+      rspec
+    rspec-puppet-facts (1.6.1)
+      facter
+      facterdb (>= 0.3.0)
+      json
+      mcollective-client
+      puppet
+    rspec-support (3.5.0)
+    rsync (1.0.9)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.6.0)
+      rubocop (>= 0.42.0)
+    ruby-progressbar (1.8.1)
+    serverspec (2.36.0)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.53)
+    sfl (2.2)
+    signet (0.7.3)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    spdx-licenses (1.1.0)
+    specinfra (2.61.1)
+      net-scp
+      net-ssh (>= 2.7, < 4.0)
+      net-telnet
+      sfl
+    stomp (1.4.3)
+    stringify-hash (0.0.2)
+    systemu (2.6.5)
+    thor (0.19.1)
+    trollop (2.1.2)
+    uber (0.0.15)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  beaker
+  beaker-hostgenerator
+  beaker-puppet_install_helper
+  beaker-rspec (>= 3.4)
+  facter
+  master_manipulator
+  metadata-json-lint
+  parallel_tests
+  puppet
+  puppet-blacksmith (>= 3.4.0)
+  puppet_facts
+  puppetlabs_spec_helper (>= 1.2.1)
+  rspec-puppet (>= 2.3.2)
+  rspec-puppet-facts
+  rubocop-rspec (~> 1.6)
+  serverspec
+  simplecov
+
+BUNDLED WITH
+   1.12.5

From c8eb3b079a583a638763995b027b74b15521eed7 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Fri, 26 Aug 2016 10:05:41 -0700
Subject: [PATCH 0980/2267] removes Gemfile.lock.bak

---
 Gemfile.lock.bak | 362 -----------------------------------------------
 1 file changed, 362 deletions(-)
 delete mode 100644 Gemfile.lock.bak

diff --git a/Gemfile.lock.bak b/Gemfile.lock.bak
deleted file mode 100644
index a070814e8d..0000000000
--- a/Gemfile.lock.bak
+++ /dev/null
@@ -1,362 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.2.8)
-    addressable (2.4.0)
-    ast (2.3.0)
-    aws-sdk-v1 (1.66.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-    beaker (2.50.0)
-      aws-sdk-v1 (~> 1.57)
-      beaker-answers (~> 0.0)
-      beaker-hiera (~> 0.0)
-      beaker-hostgenerator
-      beaker-pe (~> 0.0)
-      docker-api
-      fission (~> 0.4)
-      fog (~> 1.25, < 1.35.0)
-      fog-google (~> 0.0.9)
-      google-api-client (~> 0.8, < 0.9.5)
-      hocon (~> 1.0)
-      in-parallel (~> 0.1)
-      inifile (~> 2.0)
-      json (~> 1.8)
-      mime-types (~> 2.99)
-      minitest (~> 5.4)
-      net-scp (~> 1.2)
-      net-ssh (~> 2.9)
-      open_uri_redirections (~> 0.2.1)
-      rbvmomi (~> 1.8, < 1.9.0)
-      rsync (~> 1.0.9)
-      stringify-hash (~> 0.0)
-      unf (~> 0.1)
-    beaker-answers (0.11.0)
-      hocon (~> 1.0)
-      require_all (~> 1.3.2)
-      stringify-hash (~> 0.0.0)
-    beaker-hiera (0.1.1)
-      stringify-hash (~> 0.0.0)
-    beaker-hostgenerator (0.7.3)
-      deep_merge (~> 1.0)
-      stringify-hash (~> 0.0.0)
-    beaker-pe (0.9.0)
-      stringify-hash (~> 0.0.0)
-    beaker-puppet_install_helper (0.4.4)
-      beaker (~> 2.0)
-    beaker-rspec (5.6.0)
-      beaker (~> 2.0)
-      rspec
-      serverspec (~> 2)
-      specinfra (~> 2)
-    builder (3.2.2)
-    deep_merge (1.1.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    docker-api (1.31.0)
-      excon (>= 0.38.0)
-      json
-    domain_name (0.5.20160615)
-      unf (>= 0.0.5, < 1.0.0)
-    excon (0.52.0)
-    facter (2.4.6)
-      CFPropertyList (~> 2.2.6)
-    facterdb (0.3.6)
-      facter
-      jgrep
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.34.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.32)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (>= 0.0.2)
-      fog-json
-      fog-local
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.11.0)
-      fog-core (~> 1.38)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.11.0)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.42.0)
-      builder
-      excon (~> 0.49)
-      formatador (~> 0.2)
-    fog-dynect (0.0.3)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.0.9)
-      fog-core
-      fog-json
-      fog-xml
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-local (0.3.0)
-      fog-core (~> 1.27)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.5)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.7.5)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.1.3)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-xml (0.1.2)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
-    google-api-client (0.9.4)
-      addressable (~> 2.3)
-      googleauth (~> 0.5)
-      httpclient (~> 2.7)
-      hurley (~> 0.1)
-      memoist (~> 0.11)
-      mime-types (>= 1.6)
-      representable (~> 2.3.0)
-      retriable (~> 2.0)
-      thor (~> 0.19)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
-    hiera (3.2.1)
-    hocon (1.1.2)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    httpclient (2.8.2.2)
-    hurley (0.2)
-    in-parallel (0.1.15)
-    inflecto (0.0.2)
-    inifile (2.0.2)
-    ipaddress (0.8.3)
-    jgrep (1.4.1)
-      json
-    json (1.8.3)
-    json_pure (2.0.2)
-    jwt (1.5.4)
-    little-plugger (1.1.4)
-    logging (2.1.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    master_manipulator (1.2.3)
-      beaker (~> 2.7, >= 2.7.0)
-      multi_json
-    mcollective-client (2.9.0)
-      json
-      stomp
-      systemu
-    memoist (0.15.0)
-    metaclass (0.0.4)
-    metadata-json-lint (0.0.11)
-      json
-      spdx-licenses (~> 1.0)
-    mime-types (2.99.2)
-    mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.12.1)
-    multipart-post (2.0.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.4)
-    net-telnet (0.1.1)
-    netrc (0.11.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    open_uri_redirections (0.2.1)
-    os (0.9.6)
-    parallel (1.9.0)
-    parallel_tests (2.7.1)
-      parallel
-    parser (2.3.1.2)
-      ast (~> 2.2)
-    pkg-config (1.1.7)
-    powerpack (0.1.1)
-    puppet (4.5.3)
-      CFPropertyList (~> 2.2.6)
-      facter (> 2.0, < 4)
-      hiera (>= 2.0, < 4)
-      json_pure
-    puppet-blacksmith (3.4.0)
-      puppet (>= 2.7.16)
-      rest-client (~> 1.8.0)
-    puppet-lint (2.0.2)
-    puppet-syntax (2.1.0)
-      rake
-    puppet_facts (0.2.1)
-    puppetlabs_spec_helper (1.2.1)
-      mocha (~> 1.0)
-      puppet-lint (~> 2.0)
-      puppet-syntax (~> 2.0)
-      rspec-puppet (~> 2.0)
-    rainbow (2.1.0)
-    rake (11.2.2)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
-    representable (2.3.0)
-      uber (~> 0.0.7)
-    require_all (1.3.3)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    retriable (2.1.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-puppet (2.4.0)
-      rspec
-    rspec-puppet-facts (1.6.1)
-      facter
-      facterdb (>= 0.3.0)
-      json
-      mcollective-client
-      puppet
-    rspec-support (3.5.0)
-    rsync (1.0.9)
-    rubocop (0.42.0)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.6.0)
-      rubocop (>= 0.42.0)
-    ruby-progressbar (1.8.1)
-    serverspec (2.36.0)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.53)
-    sfl (2.2)
-    signet (0.7.3)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (~> 1.5)
-      multi_json (~> 1.10)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    spdx-licenses (1.1.0)
-    specinfra (2.61.1)
-      net-scp
-      net-ssh (>= 2.7, < 4.0)
-      net-telnet
-      sfl
-    stomp (1.4.3)
-    stringify-hash (0.0.2)
-    systemu (2.6.5)
-    thor (0.19.1)
-    trollop (2.1.2)
-    uber (0.0.15)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
-    unicode-display_width (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  beaker
-  beaker-hostgenerator
-  beaker-puppet_install_helper
-  beaker-rspec (>= 3.4)
-  facter
-  master_manipulator
-  metadata-json-lint
-  parallel_tests
-  puppet
-  puppet-blacksmith (>= 3.4.0)
-  puppet_facts
-  puppetlabs_spec_helper (>= 1.2.1)
-  rspec-puppet (>= 2.3.2)
-  rspec-puppet-facts
-  rubocop-rspec (~> 1.6)
-  serverspec
-  simplecov
-
-BUNDLED WITH
-   1.12.5

From 416d759e28dd0cde565c2ada5fc835bbe609dcb8 Mon Sep 17 00:00:00 2001
From: Matthew Gyurgyik <gyurgyikms@ornl.gov>
Date: Fri, 19 Aug 2016 13:24:58 -0400
Subject: [PATCH 0981/2267] move IncludeOptional to bottom of configuration

---
 templates/mod/security.conf.erb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 5505f2140a..abb629febb 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -1,13 +1,4 @@
 <IfModule mod_security2.c>
-    # ModSecurity Core Rules Set configuration
-<%- if scope.function_versioncmp([scope.lookupvar('::apache::apache_version'), '2.4']) >= 0 -%>
-    IncludeOptional <%= @modsec_dir %>/*.conf
-    IncludeOptional <%= @modsec_dir %>/activated_rules/*.conf
-<%- else -%>
-    Include <%= @modsec_dir %>/*.conf
-    Include <%= @modsec_dir %>/activated_rules/*.conf
-<%- end -%>
-
     # Default recommended configuration
     SecRuleEngine <%= @modsec_secruleengine %>
     SecRequestBodyAccess On
@@ -71,4 +62,13 @@
     SecUploadDir /var/lib/mod_security
 <% end -%>
     SecUploadKeepFiles Off
+
+    # ModSecurity Core Rules Set configuration
+<%- if scope.function_versioncmp([scope.lookupvar('::apache::apache_version'), '2.4']) >= 0 -%>
+    IncludeOptional <%= @modsec_dir %>/*.conf
+    IncludeOptional <%= @modsec_dir %>/activated_rules/*.conf
+<%- else -%>
+    Include <%= @modsec_dir %>/*.conf
+    Include <%= @modsec_dir %>/activated_rules/*.conf
+<%- end -%>
 </IfModule>

From e26b1a6f3bd011b14186a2d10a3c66c9c197956c Mon Sep 17 00:00:00 2001
From: Christoph Berg <christoph.berg@credativ.de>
Date: Thu, 15 Sep 2016 15:24:45 +0200
Subject: [PATCH 0982/2267] Allow no_proxy_uris to be used within proxy_pass

Previously, proxy_pass and proxy_pass_match configuration blocks did not
support using no_proxy_uris and no_proxy_uris_match. These parameters
required the use of proxy_dest, but mixing proxy_pass and proxy_dest
results in undesired duplication of ProxyPass config lines.

Fix by allowing no_proxy_uris and no_proxy_uris_match to be used within
proxy_pass and proxy_pass_match configuration blocks.
---
 README.md                  |  2 ++
 spec/defines/vhost_spec.rb |  4 ++++
 templates/vhost/_proxy.erb | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/README.md b/README.md
index fd2faa00ae..37afea3c43 100644
--- a/README.md
+++ b/README.md
@@ -2620,6 +2620,8 @@ apache::vhost { 'site.name.fdqn':
       'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
     { 'path' => '/g', 'url' => 'http://backend-g/',
       'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
+    { 'path' => '/h', 'url' => 'http://backend-h/h',
+      'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
   ],
 }
 ```
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 6f85b622b3..a8d7c9287e 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -273,6 +273,8 @@
               'path'            => '/a',
               'url'             => 'http://backend-a/',
               'keywords'        => ['noquery', 'interpolate'],
+              'no_proxy_uris'       => ['/a/foo', '/a/bar'],
+              'no_proxy_uris_match' => ['/a/foomatch'],
               'reverse_cookies' => [
 								{
                   'path'          => '/a',
@@ -295,6 +297,8 @@
               'path'     => '/a',
               'url'      => 'http://backend-a/',
               'keywords' => ['noquery', 'interpolate'],
+              'no_proxy_uris'       => ['/a/foo', '/a/bar'],
+              'no_proxy_uris_match' => ['/a/foomatch'],
               'params'   => {
                       'retry'   => '0',
                       'timeout' => '5'
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 5e20f9f0f5..79f36cf047 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -19,6 +19,12 @@
   ProxyErrorOverride On
 <%- end -%>
 <%- [@proxy_pass].flatten.compact.each do |proxy| -%>
+  <%- Array(proxy['no_proxy_uris']).each do |uri| -%>
+  ProxyPass <%= uri %> !
+  <%- end -%>
+  <%- Array(proxy['no_proxy_uris_match']).each do |uri| -%>
+  ProxyPassMatch <%= uri %> !
+  <%- end -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
     <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
@@ -50,6 +56,12 @@
   <%- end -%>
 <% end -%>
 <% [@proxy_pass_match].flatten.compact.each do |proxy| %>
+  <%- Array(proxy['no_proxy_uris']).each do |uri| -%>
+  ProxyPass <%= uri %> !
+  <%- end -%>
+  <%- Array(proxy['no_proxy_uris_match']).each do |uri| -%>
+  ProxyPassMatch <%= uri %> !
+  <%- end -%>
   ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
     <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>

From 112cd4ea2b4ac21188cb726b89859dc9601afd81 Mon Sep 17 00:00:00 2001
From: Michael Watters <michael.watters@dart.biz>
Date: Thu, 15 Sep 2016 15:44:04 -0400
Subject: [PATCH 0983/2267] Bug - Port numbers must be quoted

The default port numbers for apache must be quoted to avoid errors
when running a catalog in the puppet agent.
---
 manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index e3894cfffe..47d2dbcb8b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -384,7 +384,7 @@
 
     ::apache::vhost { 'default':
       ensure          => $default_vhost_ensure,
-      port            => 80,
+      port            => '80',
       docroot         => $docroot,
       scriptalias     => $scriptalias,
       serveradmin     => $serveradmin,
@@ -400,7 +400,7 @@
     }
     ::apache::vhost { 'default-ssl':
       ensure          => $default_ssl_vhost_ensure,
-      port            => 443,
+      port            => '443',
       ssl             => true,
       docroot         => $docroot,
       scriptalias     => $scriptalias,

From 6f0209ad4ba2d5c81f2f5d04c66fefae95080d68 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 21 Sep 2016 10:39:37 +0300
Subject: [PATCH 0984/2267] Don't write empty servername for vhost to template

If an empty servername is given to a vhost, it shouldn't be written
to the configuration file. Else we'll end up with an invalid
configuration and httpd will fail to start. It is actually valid not
to have a Servername, and in this case, httpd will route only based
on the IP.
---
 spec/acceptance/vhost_spec.rb    | 28 ++++++++++++++++++++++++++++
 templates/vhost/_file_header.erb |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index bb4b83c2be..715b1a80ac 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -727,6 +727,34 @@ class { 'apache': }
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'NameVirtualHost test.server' }
     end
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain "ServerName test.server" }
+    end
+  end
+
+  describe 'ip_based and no servername' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          ip_based   => true,
+          servername => '',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file($ports_file) do
+      it { is_expected.to be_file }
+      it { is_expected.not_to contain 'NameVirtualHost test.server' }
+    end
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.not_to contain "ServerName" }
+    end
   end
 
   describe 'add_listen' do
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index 5fd636a1e9..4cf7629ebf 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -4,7 +4,7 @@
 # ************************************
 
 <VirtualHost <%= [@nvh_addr_port].flatten.compact.join(' ') %>>
-<% if @servername -%>
+<% if @servername and not @servername.empty? -%>
   ServerName <%= @servername %>
 <% end -%>
 <% if @serveradmin -%>

From bd6812fa8ec213396d9068837b28e6f3a8a6d3f7 Mon Sep 17 00:00:00 2001
From: Alex De Castro Araujo <alex.araujo@dataprev.gov.br>
Date: Wed, 21 Sep 2016 17:52:56 -0300
Subject: [PATCH 0985/2267] Settings to control modcluster request size

---
 README.md                           |  4 +++
 manifests/mod/security.pp           | 48 +++++++++++++++++------------
 templates/mod/security.conf.erb     |  6 ++--
 templates/mod/security_crs.conf.erb |  2 +-
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index fd2faa00ae..58f953b911 100644
--- a/README.md
+++ b/README.md
@@ -1834,6 +1834,10 @@ ${modsec\_dir}/activated\_rules.
 - `error_anomaly_score`: Sets the scoring points of the error severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '4'.
 - `warning_anomaly_score`: Sets the scoring points of the warning severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '3'.
 - `notice_anomaly_score`: Sets the scoring points of the notice severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '2'.
+- `secrequestmaxnumargs`: Sets the Maximum number of arguments in the request. Default: '255'.
+- `secrequestbodylimit`:  Sets the maximum request body size ModSecurity will accept for buffering.. Default: '13107200'.
+- `secrequestbodynofileslimit`: Sets the maximum request body size ModSecurity will accept for buffering, excluding the size of any files being transported in the request. Default: '131072'.
+- `secrequestbodyinmemorylimit`: Sets the maximum request body size that ModSecurity will store in memory. Default: '131072'
 
 ##### Class: `apache::mod::wsgi`
 
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 95596dd538..d1effa9cff 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -1,24 +1,28 @@
 class apache::mod::security (
-  $crs_package                = $::apache::params::modsec_crs_package,
-  $activated_rules            = $::apache::params::modsec_default_rules,
-  $modsec_dir                 = $::apache::params::modsec_dir,
-  $modsec_secruleengine       = $::apache::params::modsec_secruleengine,
-  $audit_log_relevant_status  = '^(?:5|4(?!04))',
-  $audit_log_parts            = $::apache::params::modsec_audit_log_parts,
-  $secpcrematchlimit          = $::apache::params::secpcrematchlimit,
-  $secpcrematchlimitrecursion = $::apache::params::secpcrematchlimitrecursion,
-  $allowed_methods            = 'GET HEAD POST OPTIONS',
-  $content_types              = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
-  $restricted_extensions      = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
-  $restricted_headers         = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
-  $secdefaultaction           = 'deny',
-  $anomaly_score_blocking     = 'off',
-  $inbound_anomaly_threshold  = '5',
-  $outbound_anomaly_threshold = '4',
-  $critical_anomaly_score     = '5',
-  $error_anomaly_score        = '4',
-  $warning_anomaly_score      = '3',
-  $notice_anomaly_score       = '2',
+  $crs_package                 = $::apache::params::modsec_crs_package,
+  $activated_rules             = $::apache::params::modsec_default_rules,
+  $modsec_dir                  = $::apache::params::modsec_dir,
+  $modsec_secruleengine        = $::apache::params::modsec_secruleengine,
+  $audit_log_relevant_status   = '^(?:5|4(?!04))',
+  $audit_log_parts             = $::apache::params::modsec_audit_log_parts,
+  $secpcrematchlimit           = $::apache::params::secpcrematchlimit,
+  $secpcrematchlimitrecursion  = $::apache::params::secpcrematchlimitrecursion,
+  $allowed_methods             = 'GET HEAD POST OPTIONS',
+  $content_types               = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
+  $restricted_extensions       = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
+  $restricted_headers          = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
+  $secdefaultaction            = 'deny',
+  $anomaly_score_blocking      = 'off',
+  $inbound_anomaly_threshold   = '5',
+  $outbound_anomaly_threshold  = '4',
+  $critical_anomaly_score      = '5',
+  $error_anomaly_score         = '4',
+  $warning_anomaly_score       = '3',
+  $notice_anomaly_score        = '2',
+  $secrequestmaxnumargs        = '255',
+  $secrequestbodylimit         = '13107200',
+  $secrequestbodynofileslimit  = '131072',
+  $secrequestbodyinmemorylimit = '131072',
 ) inherits ::apache::params {
   include ::apache
 
@@ -53,6 +57,9 @@
   # - $audit_log_parts
   # - secpcrematchlimit
   # - secpcrematchlimitrecursion
+  # - secrequestbodylimit
+  # - secrequestbodynofileslimit
+  # - secrequestbodyinmemorylimit
   file { 'security.conf':
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
@@ -99,6 +106,7 @@
   # - $content_types
   # - $restricted_extensions
   # - $restricted_headers
+  # - $secrequestmaxnumargs
   file { "${modsec_dir}/security_crs.conf":
     ensure  => file,
     content => template('apache/mod/security_crs.conf.erb'),
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 5505f2140a..c422e0ef51 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -13,9 +13,9 @@
     SecRequestBodyAccess On
     SecRule REQUEST_HEADERS:Content-Type "text/xml" \
       "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML"
-    SecRequestBodyLimit 13107200
-    SecRequestBodyNoFilesLimit 131072
-    SecRequestBodyInMemoryLimit 131072
+    SecRequestBodyLimit <%= @secrequestbodylimit %>
+    SecRequestBodyNoFilesLimit <%= @secrequestbodynofileslimit %>
+    SecRequestBodyInMemoryLimit <%= @secrequestbodyinmemorylimit %>
     SecRequestBodyLimitAction Reject
     SecRule REQBODY_ERROR "!@eq 0" \
       "id:'200001', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2"
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index cae4519156..641daac3ed 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -211,7 +211,7 @@ SecAction \
   "id:'900006', \
   phase:1, \
   t:none, \
-  setvar:tx.max_num_args=255, \
+  setvar:tx.max_num_args=<%= @secrequestmaxnumargs %>, \
   nolog, \
   pass"
 

From 7c11de24390dfa4e045b980929aed1dd73ce6219 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 10 Aug 2016 09:41:51 +0100
Subject: [PATCH 0986/2267] SuSE 11 test improvements

---
 lib/facter/apache_version.rb      |  5 +++++
 manifests/params.pp               |  2 +-
 spec/acceptance/class_spec.rb     | 23 +++++++++++++++++------
 spec/acceptance/nodesets/suse.yml | 25 +++++++++++++++++++++++++
 spec/acceptance/version.rb        | 14 +++++++++++++-
 5 files changed, 61 insertions(+), 8 deletions(-)
 create mode 100644 spec/acceptance/nodesets/suse.yml

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index 2e211c9873..bb0b4ac9ff 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -2,6 +2,11 @@
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
+      puts "Matching apachectl '#{apache_version}'"
+      %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)[1]
+    elsif Facter::Util::Resolution.which('apache2ctl')
+      apache_version = Facter::Util::Resolution.exec('apache2ctl -v 2>&1')
+      puts "Matching apache2ctl '#{apache_version}'"
       %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)[1]
     end
   end
diff --git a/manifests/params.pp b/manifests/params.pp
index e443acef4a..3b51fb0352 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -49,7 +49,7 @@
 
   $modsec_audit_log_parts = 'ABIJDEFHZ'
 
-  if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
+  if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::osfamily == 'Suse') {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } elsif $::operatingsystem == 'FreeBSD' {
     $verify_command = '/usr/local/sbin/apachectl -t'
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index aff79eb082..3908cce84e 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -3,14 +3,25 @@
 
 describe 'apache class' do
   context 'default parameters' do
-    let(:pp) do
-      <<-EOS
-        class { 'apache': }
-      EOS
-    end
-    # Run it twice and test for idempotency
+    let(:pp) { "class { 'apache': }" }
+
     it_behaves_like "a idempotent resource"
 
+    describe 'apache_version fact' do
+      before :all do
+        apply_manifest("include apache", :catch_failures => true)
+        version_check_pp = <<-EOS
+        notice("apache_version = >${apache_version}<")
+        EOS
+        @result = apply_manifest(version_check_pp, :catch_failures => true)
+      end
+
+      fit {
+        expect(@result.output).to match(/"apache_version = >#{$apache_version}<"/)
+      }
+    end
+
+
     describe package($package_name) do
       it { is_expected.to be_installed }
     end
diff --git a/spec/acceptance/nodesets/suse.yml b/spec/acceptance/nodesets/suse.yml
new file mode 100644
index 0000000000..b6c14b92c6
--- /dev/null
+++ b/spec/acceptance/nodesets/suse.yml
@@ -0,0 +1,25 @@
+---
+HOSTS:
+  sles-11-x86_64-agent:
+    roles:
+    - agent
+    - default
+    platform: sles-11-x86_64
+    template: sles-11-x86_64
+    hypervisor: vcloud
+  redhat-7-x86_64-master:
+    roles:
+    - master
+    - dashboard
+    - database
+    - agent
+    platform: el-7-x86_64
+    template: redhat-7-x86_64
+    hypervisor: vcloud
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index 88cf509b7b..f2e19a694f 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -69,8 +69,20 @@
   $package_name     = 'www-servers/apache'
   $error_log        = 'http-error.log'
 
+  $apache_version = '2.4'
+when 'Suse'
+  $confd_dir        = '/etc/apache2/conf.d'
+  $mod_dir          = '/etc/apache2/mods-available'
+  $conf_file        = '/etc/apache2/httpd.conf'
+  $ports_file       = '/etc/apache2/ports.conf'
+  $vhost            = '/etc/apache2/sites-available/15-default.conf'
+  $vhost_dir        = '/etc/apache2/sites-available'
+  $run_dir          = '/var/run/apache2'
+  $service_name     = 'apache2'
+  $package_name     = 'apache2'
+  $error_log        = 'http-error.log'
+
   $apache_version = '2.4'
 else
   $apache_version = '0'
 end
-

From f942dc8abc02e3ae79e63ec49b3aeabb33626c08 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 7 Sep 2016 17:24:40 -0700
Subject: [PATCH 0987/2267] adds cond for apache versions on suse

---
 spec/acceptance/version.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index f2e19a694f..24461b2377 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -81,8 +81,11 @@
   $service_name     = 'apache2'
   $package_name     = 'apache2'
   $error_log        = 'http-error.log'
-
-  $apache_version = '2.4'
+  if _operatingsystemrelease <= 11
+    $apache_version = '2.2'
+  else
+    $apache_version = '2.4'
+  end
 else
   $apache_version = '0'
 end

From 6f4d00816dab36abd007f6abaf8021ec5f84cddf Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 28 Sep 2016 07:32:13 -0700
Subject: [PATCH 0988/2267] in which failures for sles 11 are zero

---
 .gitignore                            |  2 +
 manifests/mod/cgid.pp                 |  9 ++-
 manifests/mod/dav_svn.pp              | 29 ++++++++--
 manifests/mod/passenger.pp            | 73 +++++++++++++++++++----
 manifests/mod/php.pp                  | 27 ++++++---
 manifests/mod/security.pp             | 20 +++++--
 manifests/params.pp                   | 23 ++++++--
 spec/acceptance/class_spec.rb         |  4 +-
 spec/acceptance/default_mods_spec.rb  |  8 +--
 spec/acceptance/mod_dav_svn_spec.rb   |  2 +
 spec/acceptance/mod_pagespeed_spec.rb |  7 ++-
 spec/acceptance/mod_passenger_spec.rb |  2 +
 spec/acceptance/mod_php_spec.rb       |  8 +--
 spec/acceptance/mod_security_spec.rb  | 83 ++++++++++++++++-----------
 spec/acceptance/nodesets/suse.yml     |  4 +-
 spec/acceptance/version.rb            | 14 +++--
 spec/acceptance/vhost_spec.rb         | 14 ++---
 spec/spec_helper_acceptance.rb        |  2 +
 templates/mod/security.conf.erb       |  6 ++
 19 files changed, 245 insertions(+), 92 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0cd25de9af..a319988ddc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ Gemfile.lock
 vendor/
 spec/fixtures/manifests/
 spec/fixtures/modules/
+spec/acceptance/nodesets/
+tmp/
 .vagrant/
 .bundle/
 coverage/
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 891cdd75b4..9b9788f24b 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -17,7 +17,14 @@
     'freebsd' => 'cgisock',
     default   => undef,
   }
-  ::apache::mod { 'cgid': }
+
+  if $::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12' {
+    ::apache::mod { 'cgid':
+      lib_path => '/usr/lib64/apache2-worker',
+    }
+    } else {
+      ::apache::mod { 'cgid': }
+    }
   if $cgisock_path {
     # Template uses $cgisock_path
     file { 'cgid.conf':
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 071535c11c..338285aac5 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -1,10 +1,21 @@
 class apache::mod::dav_svn (
   $authz_svn_enabled = false,
+  $suse_lib_path = $::apache::params::suse_lib_path
 ) {
   Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
   include ::apache
   include ::apache::mod::dav
-  ::apache::mod { 'dav_svn': }
+  if($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){
+    package { 'subversion-server':
+      provider => 'zypper',
+      ensure => 'installed',
+    }
+    ::apache::mod {'dav_svn':
+      lib_path => $suse_lib_path
+    }
+    } else {
+      ::apache::mod { 'dav_svn': }
+    }
 
   if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04' and $::operatingsystemmajrelease != '16.04') {
     $loadfile_name = undef
@@ -13,9 +24,17 @@
   }
 
   if $authz_svn_enabled {
-    ::apache::mod { 'authz_svn':
-      loadfile_name => $loadfile_name,
-      require       => Apache::Mod['dav_svn'],
-    }
+    if ($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){
+      ::apache::mod { 'authz_svn':
+        loadfile_name => $loadfile_name,
+        lib_path => $suse_lib_path,
+        require       => Apache::Mod['dav_svn'],
+      }
+      } else {
+        ::apache::mod { 'authz_svn':
+          loadfile_name => $loadfile_name,
+          require       => Apache::Mod['dav_svn'],
+        }
+      }
   }
 }
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 1df3126ef0..967b60e13c 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -55,6 +55,57 @@
     $_lib_path = $mod_lib_path
   }
 
+  if $::osfamily == 'Suse' {
+    package {'rack':
+      provider => 'gem',
+      ensure => "1.6.4",
+      before => Exec['passenger']
+    }
+    package {'rake':
+      provider => 'gem',
+      ensure => '10.5.0',
+      before => Exec['passenger']
+    }
+    package {'passenger':
+      provider => 'gem',
+      ensure => 'installed',
+      before => Exec['passenger']
+    }
+    package {'gcc':
+      provider => 'zypper',
+      before => Package['gcc-c++']
+    }
+    package {'gcc43-c++':
+      provider => 'zypper',
+      before => Package['gcc-c++']
+    }
+    package {'gcc-c++':
+      provider => 'rpm',
+      source => 'http://download.opensuse.org/repositories/home:/zhy20120210:/SLES-11-SP1-x86-64/SLE_11/x86_64/gcc-c++-4.3-62.8.x86_64.rpm',
+      before => Exec['passenger'],
+    }
+    package {'apache2-devel':
+      provider => 'zypper',
+      before => Exec['passenger'],
+    }
+    package {'libcurl-devel':
+      provider => 'zypper',
+      before => Exec['passenger'],
+    }
+    exec {'passenger':
+      command => '/usr/bin/passenger-install-apache2-module -a',
+    }
+    file {'/etc/apache2/mods-available/passenger.load':
+      ensure => present,
+      content => 'LoadModule passenger_module /usr/lib64/apache2/mod_passenger.so'
+    }
+    file {'/usr/lib64/apache2/mod_passenger.so':
+      target => "/usr/lib64/ruby/gems/1.8/gems/passenger-5.0.30/buildout/apache2/mod_passenger.so"
+
+    }
+
+  }
+
   if $::osfamily == 'RedHat' and $manage_repo {
     yumrepo { 'passenger':
       ensure        => 'present',
@@ -70,16 +121,18 @@
     }
   }
 
-  $_id = $mod_id
-  $_path = $mod_path
-  ::apache::mod { 'passenger':
-    package        => $_package,
-    package_ensure => $_package_ensure,
-    lib            => $_lib,
-    lib_path       => $_lib_path,
-    id             => $_id,
-    path           => $_path,
-    loadfile_name  => 'zpassenger.load',
+  unless ($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12') {
+    $_id = $mod_id
+    $_path = $mod_path
+    ::apache::mod { 'passenger':
+      package        => $_package,
+      package_ensure => $_package_ensure,
+      lib            => $_lib,
+      lib_path       => $_lib_path,
+      id             => $_id,
+      path           => $_path,
+      loadfile_name  => 'zpassenger.load',
+    }
   }
 
   # Template uses:
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 340549ccb1..47d88abd33 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -52,13 +52,26 @@
   $_lib = "libphp${php_version}.so"
   $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
 
-  ::apache::mod { $mod:
-    package        => $_package_name,
-    package_ensure => $package_ensure,
-    lib            => $_lib,
-    id             => "php${_php_major}_module",
-    path           => $path,
-  }
+  if $::osfamily == 'Suse' {
+    $suse_lib_path = $::apache::params::suse_lib_path
+      ::apache::mod { $mod:
+        package        => $_package_name,
+        package_ensure => $package_ensure,
+        lib            => 'mod_php5.so',
+        id             => "php${_php_major}_module",
+        path           => "${suse_lib_path}/mod_php5.so",
+      }
+    } else {
+      ::apache::mod { $mod:
+        package        => $_package_name,
+        package_ensure => $package_ensure,
+        lib            => $_lib,
+        id             => "php${_php_major}_module",
+        path           => $path,
+      }
+
+    }
+
 
   include ::apache::mod::mime
   include ::apache::mod::dir
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 95596dd538..b2890d4b78 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -19,6 +19,7 @@
   $error_anomaly_score        = '4',
   $warning_anomaly_score      = '3',
   $notice_anomaly_score       = '2',
+  $suse_lib_path              = $::apache::params::suse_lib_path,
 ) inherits ::apache::params {
   include ::apache
 
@@ -31,10 +32,19 @@
     fail('FreeBSD is not currently supported')
   }
 
-  ::apache::mod { 'security':
-    id  => 'security2_module',
-    lib => 'mod_security2.so',
-  }
+  if $::osfamily == 'Suse' {
+      ::apache::mod { 'security':
+        id  => 'security2_module',
+        lib_path => $suse_lib_path,
+        lib => 'mod_security2.so',
+      }
+    } else {
+      ::apache::mod { 'security':
+        id  => 'security2_module',
+        lib => 'mod_security2.so',
+      }
+    }
+
 
   ::apache::mod { 'unique_id_module':
     id  => 'unique_id_module',
@@ -106,6 +116,6 @@
     notify  => Class['apache::service'],
   }
 
-  apache::security::rule_link { $activated_rules: }
+  unless $::osfamily == "Suse" { apache::security::rule_link { $activated_rules: } }
 
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 3b51fb0352..841f2bcb66 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -475,9 +475,10 @@
     $logroot             = '/var/log/apache2'
     $logroot_mode        = undef
     $lib_path            = '/usr/lib64/apache2-prefork'
+    $suse_lib_path       = '/usr/lib64/apache2'
     $mpm_module          = 'prefork'
-    $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-    $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
+    $default_ssl_cert    = '/etc/ssl/servercerts/servercert.pem'
+    $default_ssl_key     = '/etc/ssl/servercerts/serverkey.pem'
     $ssl_certs_dir       = '/etc/ssl/certs'
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
@@ -485,12 +486,15 @@
     $php_version         = '5'
     $mod_packages        = {
       'auth_kerb'   => 'apache2-mod_auth_kerb',
-      'fcgid'       => 'apache2-mod_fcgid',
       'perl'        => 'apache2-mod_perl',
       'php5'        => 'apache2-mod_php53',
       'python'      => 'apache2-mod_python',
+      'passenger'   => 'apache2-mod_passenger',
+      'security'    => 'apache2-mod_security2',
     }
     $mod_libs             = {
+      'security'       => '/usr/lib64/apache2/mod_security2.so',
+      'php53'          => '/usr/lib64/apache2/mod_php5.so',
     }
     $conf_template          = 'apache/httpd.conf.erb'
     $keepalive              = 'Off'
@@ -506,7 +510,14 @@
     $mellon_post_directory = undef
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
-    $dev_packages        = ['libapr-util1-devel', 'libapr1-devel']
+    $dev_packages        = ['libapr-util1-devel', 'libapr1-devel', 'libcurl-devel']
+    $modsec_crs_package   = undef
+    $modsec_crs_path      = undef
+    $modsec_default_rules = undef
+    $modsec_dir           = '/etc/apache2/modsecurity'
+    $secpcrematchlimit = 1500
+    $secpcrematchlimitrecursion = 1500
+    $modsec_secruleengine = 'On'
 
     #
     # Passenger-specific settings
@@ -515,9 +526,9 @@
     $passenger_conf_file          = 'passenger.conf'
     $passenger_conf_package_file  = undef
 
-    $passenger_root               = '/usr'
+    $passenger_root               = '/usr/lib64/ruby/gems/1.8/gems/passenger-5.0.30'
     $passenger_ruby               = '/usr/bin/ruby'
-    $passenger_default_ruby       = undef
+    $passenger_default_ruby       = '/usr/bin/ruby'
     $wsgi_socket_prefix           = undef
 
   } else {
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 3908cce84e..a640e54895 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -16,8 +16,8 @@
         @result = apply_manifest(version_check_pp, :catch_failures => true)
       end
 
-      fit {
-        expect(@result.output).to match(/"apache_version = >#{$apache_version}<"/)
+      it {
+        expect(@result.output).to match(/apache_version = >#{$apache_version}.*</)
       }
     end
 
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 1c10d02b5e..6fb21b907b 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -34,10 +34,10 @@ class { 'apache':
           default_mods => false,
         }
         apache::vhost { 'defaults.example.com':
-          docroot => '/var/www/defaults',
+          docroot => '#{$docroot}/defaults',
           aliases => {
             alias => '/css',
-            path  => '/var/www/css',
+            path  => '#{$docroot}/css',
           },
           setenv  => 'TEST1 one',
         }
@@ -65,10 +65,10 @@ class { 'apache':
           ],
         }
         apache::vhost { 'defaults.example.com':
-          docroot => '/var/www/defaults',
+          docroot => '#{$docroot}/defaults',
           aliases => {
             alias => '/css',
-            path  => '/var/www/css',
+            path  => '#{$docroot}/css',
           },
           setenv  => 'TEST1 one',
         }
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 9a030c54f5..a3473f3cab 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -13,6 +13,8 @@
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   when 'FreeBSD'
     authz_svn_load_file = 'dav_svn_authz_svn.load'
+  when 'Suse'
+    authz_svn_load_file = 'dav_svn_authz_svn.load'
   end
 
   context "default dav_svn config" do
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 602c78c2f0..ea92ab5b83 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -5,7 +5,8 @@
 # updating packages and Pagespeed doesn't like old packages.
 describe 'apache::mod::pagespeed class', :unless =>
   ((fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') < '8') or
-   (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') < '12')) do
+   (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') < '12') or
+   (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') < '12')) do
   context "default pagespeed config" do
     it 'succeeds in puppeting pagespeed' do
       pp= <<-EOS
@@ -41,10 +42,10 @@ class { 'apache::mod::pagespeed':
         }
         apache::vhost { 'pagespeed.example.com':
           port    => '80',
-          docroot => '/var/www/pagespeed',
+          docroot => '#{$docroot}/pagespeed',
         }
         host { 'pagespeed.example.com': ip => '127.0.0.1', }
-        file { '/var/www/pagespeed/index.html':
+        file { '#{$docroot}/pagespeed/index.html':
           ensure  => file,
           content => "<html>\n<!-- comment -->\n<body>\n<p>Hello World!</p>\n</body>\n</html>",
         }
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 4761d2c5bf..533d71533d 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -60,6 +60,8 @@
     passenger_module_path = 'modules/mod_passenger.so'
     rackapp_user = 'apache'
     rackapp_group = 'apache'
+  when 'SLES'
+    conf_file = "#{$mod_dir}/passenger.conf"
   end
 
   pp_rackapp = <<-EOS
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 96de640404..02a1954eaa 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -11,10 +11,10 @@ class { 'apache':
         class { 'apache::mod::php': }
         apache::vhost { 'php.example.com':
           port    => '80',
-          docroot => '/var/www/php',
+          docroot => '#{$docroot}/php',
         }
         host { 'php.example.com': ip => '127.0.0.1', }
-        file { '/var/www/php/index.php':
+        file { '#{$docroot}/php/index.php':
           ensure  => file,
           content => "<?php phpinfo(); ?>\\n",
         }
@@ -60,14 +60,14 @@ class { 'apache::mod::php':
         }
         apache::vhost { 'php.example.com':
           port             => '80',
-          docroot          => '/var/www/php',
+          docroot          => '#{$docroot}/php',
           php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
           php_flags        => { 'display_errors' => 'on', },
           php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
           php_admin_flags  => { 'engine' => 'on', },
         }
         host { 'php.example.com': ip => '127.0.0.1', }
-        file { '/var/www/php/index.php5':
+        file { '#{$docroot}/php/index.php5':
           ensure  => file,
           content => "<?php phpinfo(); ?>\\n",
         }
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 8a12296079..0f1b5c4bb2 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -2,6 +2,13 @@
 require_relative './version.rb'
 
 describe 'apache::mod::security class', :unless => (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy')) do
+
+  if fact('osfamily') == 'Suse'
+    $docroot = "/srv/www"
+  else
+    $docroot = "/var/www"
+  end
+
   context "default mod_security config" do
     if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
       it 'adds epel' do
@@ -29,9 +36,9 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '/var/www/html',
+          docroot => '#{$docroot}/html',
         }
-        file { '/var/www/html/index.html':
+        file { '#{$docroot}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
@@ -69,8 +76,10 @@ class { 'apache::mod::security': }
         end
       end
 
-      it 'should block query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      unless fact('osfamily') == 'Suse'
+        it 'should block query with SQL' do
+          shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+        end
       end
     end
 
@@ -84,9 +93,9 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '/var/www/html',
+          docroot => '#{$docroot}/html',
         }
-        file { '/var/www/html/index.html':
+        file { '#{$docroot}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
@@ -107,8 +116,10 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    it 'should block query with SQL' do
-      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    unless fact('osfamily') == 'Suse'
+      it 'should block query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      end
     end
 
     it 'should disable mod_security per vhost' do
@@ -117,7 +128,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port                 => '80',
-          docroot              => '/var/www/html',
+          docroot              => '#{$docroot}/html',
           modsec_disable_vhost => true,
         }
       EOS
@@ -140,9 +151,9 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '/var/www/html',
+          docroot => '#{$docroot}/html',
         }
-        file { '/var/www/html/index.html':
+        file { '#{$docroot}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
@@ -163,8 +174,10 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    it 'should block query with SQL' do
-      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    unless fact('osfamily') == 'Suse'
+      it 'should block query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      end
     end
 
     it 'should disable mod_security per vhost' do
@@ -173,7 +186,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port               => '80',
-          docroot            => '/var/www/html',
+          docroot            => '#{$docroot}/html',
           modsec_disable_ips => [ '127.0.0.1' ],
         }
       EOS
@@ -196,13 +209,13 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '/var/www/html',
+          docroot => '#{$docroot}/html',
         }
-        file { '/var/www/html/index.html':
+        file { '#{$docroot}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
-        file { '/var/www/html/index2.html':
+        file { '#{$docroot}/html/index2.html':
           ensure  => file,
           content => 'Page 2',
         }
@@ -223,8 +236,10 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    it 'should block query with SQL' do
-      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    unless fact('osfamily') == 'Suse'
+      it 'should block query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      end
     end
 
     it 'should disable mod_security per vhost' do
@@ -233,7 +248,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port               => '80',
-          docroot            => '/var/www/html',
+          docroot            => '#{$docroot}/html',
           modsec_disable_ids => [ '950007' ],
         }
       EOS
@@ -257,13 +272,13 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '/var/www/html',
+          docroot => '#{$docroot}/html',
         }
-        file { '/var/www/html/index.html':
+        file { '#{$docroot}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
-        file { '/var/www/html/index2.html':
+        file { '#{$docroot}/html/index2.html':
           ensure  => file,
           content => 'Page 2',
         }
@@ -284,8 +299,10 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    it 'should block query with SQL' do
-      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    unless fact('osfamily') == 'Suse'
+      it 'should block query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      end
     end
 
     it 'should disable mod_security per vhost' do
@@ -294,7 +311,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port               => '80',
-          docroot            => '/var/www/html',
+          docroot            => '#{$docroot}/html',
           modsec_disable_msgs => [ 'Blind SQL Injection Attack' ],
         }
       EOS
@@ -318,13 +335,13 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '/var/www/html',
+          docroot => '#{$docroot}/html',
         }
-        file { '/var/www/html/index.html':
+        file { '#{$docroot}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
-        file { '/var/www/html/index2.html':
+        file { '#{$docroot}/html/index2.html':
           ensure  => file,
           content => 'Page 2',
         }
@@ -345,8 +362,10 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    it 'should block query with SQL' do
-      shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+    unless fact('osfamily') == 'Suse'
+      it 'should block query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      end
     end
 
     it 'should disable mod_security per vhost' do
@@ -355,7 +374,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port                => '80',
-          docroot             => '/var/www/html',
+          docroot             => '#{$docroot}/html',
           modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION' ],
         }
       EOS
diff --git a/spec/acceptance/nodesets/suse.yml b/spec/acceptance/nodesets/suse.yml
index b6c14b92c6..ac04926992 100644
--- a/spec/acceptance/nodesets/suse.yml
+++ b/spec/acceptance/nodesets/suse.yml
@@ -6,7 +6,7 @@ HOSTS:
     - default
     platform: sles-11-x86_64
     template: sles-11-x86_64
-    hypervisor: vcloud
+    hypervisor: virtualbox
   redhat-7-x86_64-master:
     roles:
     - master
@@ -15,7 +15,7 @@ HOSTS:
     - agent
     platform: el-7-x86_64
     template: redhat-7-x86_64
-    hypervisor: vcloud
+    hypervisor: virtualbox
 CONFIG:
   nfs_server: none
   consoleport: 443
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index 24461b2377..f69b56cc52 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -10,6 +10,7 @@
   $vhost_dir        = '/etc/httpd/conf.d'
   $vhost            = '/etc/httpd/conf.d/15-default.conf'
   $run_dir          = '/var/run/httpd'
+  $docroot          = '/var/www'
   $service_name     = 'httpd'
   $package_name     = 'httpd'
   $error_log        = 'error_log'
@@ -31,6 +32,7 @@
   $vhost            = '/etc/apache2/sites-available/15-default.conf'
   $vhost_dir        = '/etc/apache2/sites-enabled'
   $run_dir          = '/var/run/apache2'
+  $docroot          = '/var/www'
   $service_name     = 'apache2'
   $package_name     = 'apache2'
   $error_log        = 'error.log'
@@ -52,6 +54,7 @@
   $vhost            = '/usr/local/etc/apache24/Vhosts/15-default.conf'
   $vhost_dir        = '/usr/local/etc/apache24/Vhosts'
   $run_dir          = '/var/run/apache24'
+  $docroot          = '/var/www'
   $service_name     = 'apache24'
   $package_name     = 'apache24'
   $error_log        = 'http-error.log'
@@ -65,6 +68,7 @@
   $vhost            = '/etc/apache2/vhosts.d/15-default.conf'
   $vhost_dir        = '/etc/apache2/vhosts.d'
   $run_dir          = '/var/run/apache2'
+  $docroot          = '/var/www'
   $service_name     = 'apache2'
   $package_name     = 'www-servers/apache'
   $error_log        = 'http-error.log'
@@ -78,13 +82,15 @@
   $vhost            = '/etc/apache2/sites-available/15-default.conf'
   $vhost_dir        = '/etc/apache2/sites-available'
   $run_dir          = '/var/run/apache2'
+  $docroot          = '/srv/www'
   $service_name     = 'apache2'
   $package_name     = 'apache2'
-  $error_log        = 'http-error.log'
-  if _operatingsystemrelease <= 11
-    $apache_version = '2.2'
+  if _operatingsystemrelease < 12
+    $apache_version   = '2.2'
+    $error_log        = 'error.log'
   else
-    $apache_version = '2.4'
+    $apache_version   = '2.4'
+    $error_log        = 'http-error.log'
   end
 else
   $apache_version = '0'
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index bb4b83c2be..db3be92402 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -45,14 +45,14 @@ class { 'apache': }
   context 'default vhost with ssl' do
     it 'should create default vhost configs' do
       pp = <<-EOS
-        file { '#{$run_dir}':
+        file { '#{$vhost_dir}':
           ensure  => 'directory',
           recurse => true,
         }
 
         class { 'apache':
           default_ssl_vhost => true,
-          require => File['#{$run_dir}'],
+          require => File['#{$vhost_dir}'],
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -72,7 +72,7 @@ class { 'apache':
     it 'should configure an apache vhost' do
       pp = <<-EOS
         class { 'apache': }
-        file { '#{$run_dir}':
+        file { '/var/www':
           ensure  => 'directory',
           recurse => true,
         }
@@ -80,7 +80,7 @@ class { 'apache': }
         apache::vhost { 'first.example.com':
           port    => '80',
           docroot => '/var/www/first',
-          require => File['#{$run_dir}'],
+          require => File['/var/www'],
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -1075,7 +1075,7 @@ class { 'apache': }
           action  => 'php-fastcgi',
         }
       EOS
-      pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian'
+      pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian' || fact('osfamily') == 'Suse'
       apply_manifest(pp, :catch_failures => true)
     end
 
@@ -1109,7 +1109,7 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'rack_base_uris' do
-    if (fact('osfamily') != 'RedHat')
+    unless fact('osfamily') == 'RedHat' or (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') < '12')
       it 'applies cleanly' do
         test = lambda do
           pp = <<-EOS
@@ -1320,7 +1320,7 @@ class { 'apache::mod::wsgi': }
       end
     end
 
-    context 'on everything but lucid', :unless => fact('lsbdistcodename') == 'lucid' do
+    context 'on everything but lucid', :unless => (fact('lsbdistcodename') == 'lucid' or (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') < '12')) do
       it 'import_script applies cleanly' do
         pp = <<-EOS
           class { 'apache': }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index b6ec0b5856..5d93612afc 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -5,6 +5,8 @@
 run_puppet_install_helper
 
 RSpec.configure do |c|
+  c.filter_run :focus => true
+  c.run_all_when_everything_filtered = true
   # apache on Ubuntu 10.04 and 12.04 doesn't like IPv6 VirtualHosts, so we skip ipv6 tests on those systems
   if fact('operatingsystem') == 'Ubuntu' and (fact('operatingsystemrelease') == '10.04' or fact('operatingsystemrelease') == '12.04')
     c.filter_run_excluding :ipv6 => true
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 5505f2140a..298e27e78b 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -63,6 +63,12 @@
     SecTmpDir /var/cache/modsecurity
     SecDataDir /var/cache/modsecurity
     SecUploadDir /var/cache/modsecurity
+<%- elsif scope.lookupvar('::osfamily') == 'Suse' -%>
+    SecDebugLog /var/log/apache2/modsec_debug.log
+    SecAuditLog /var/log/apache2/modsec_audit.log
+    SecTmpDir /var/lib/mod_security
+    SecDataDir /var/lib/mod_security
+    SecUploadDir /var/lib/mod_security
 <% else -%>
     SecDebugLog /var/log/httpd/modsec_debug.log
     SecAuditLog /var/log/httpd/modsec_audit.log

From a776e2f5aa2c8cf7dc38ea708e8a1f746b575efe Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 28 Sep 2016 10:08:42 -0700
Subject: [PATCH 0989/2267] in which final touches are added

---
 manifests/mod/passenger.pp            | 51 -----------------------
 manifests/mod/php.pp                  |  2 +-
 manifests/mod/security.pp             |  4 +-
 manifests/params.pp                   |  3 +-
 spec/acceptance/class_spec.rb         |  1 -
 spec/acceptance/default_mods_spec.rb  |  8 ++--
 spec/acceptance/mod_dav_svn_spec.rb   |  6 +--
 spec/acceptance/mod_pagespeed_spec.rb |  4 +-
 spec/acceptance/mod_passenger_spec.rb |  2 -
 spec/acceptance/mod_php_spec.rb       |  8 ++--
 spec/acceptance/mod_security_spec.rb  | 59 ++++++++++++---------------
 spec/acceptance/version.rb            | 13 +++---
 spec/acceptance/vhost_spec.rb         |  4 +-
 13 files changed, 49 insertions(+), 116 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 967b60e13c..9c8fb14cf3 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -55,57 +55,6 @@
     $_lib_path = $mod_lib_path
   }
 
-  if $::osfamily == 'Suse' {
-    package {'rack':
-      provider => 'gem',
-      ensure => "1.6.4",
-      before => Exec['passenger']
-    }
-    package {'rake':
-      provider => 'gem',
-      ensure => '10.5.0',
-      before => Exec['passenger']
-    }
-    package {'passenger':
-      provider => 'gem',
-      ensure => 'installed',
-      before => Exec['passenger']
-    }
-    package {'gcc':
-      provider => 'zypper',
-      before => Package['gcc-c++']
-    }
-    package {'gcc43-c++':
-      provider => 'zypper',
-      before => Package['gcc-c++']
-    }
-    package {'gcc-c++':
-      provider => 'rpm',
-      source => 'http://download.opensuse.org/repositories/home:/zhy20120210:/SLES-11-SP1-x86-64/SLE_11/x86_64/gcc-c++-4.3-62.8.x86_64.rpm',
-      before => Exec['passenger'],
-    }
-    package {'apache2-devel':
-      provider => 'zypper',
-      before => Exec['passenger'],
-    }
-    package {'libcurl-devel':
-      provider => 'zypper',
-      before => Exec['passenger'],
-    }
-    exec {'passenger':
-      command => '/usr/bin/passenger-install-apache2-module -a',
-    }
-    file {'/etc/apache2/mods-available/passenger.load':
-      ensure => present,
-      content => 'LoadModule passenger_module /usr/lib64/apache2/mod_passenger.so'
-    }
-    file {'/usr/lib64/apache2/mod_passenger.so':
-      target => "/usr/lib64/ruby/gems/1.8/gems/passenger-5.0.30/buildout/apache2/mod_passenger.so"
-
-    }
-
-  }
-
   if $::osfamily == 'RedHat' and $manage_repo {
     yumrepo { 'passenger':
       ensure        => 'present',
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 47d88abd33..16c39873f7 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -52,7 +52,7 @@
   $_lib = "libphp${php_version}.so"
   $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
 
-  if $::osfamily == 'Suse' {
+  if $::operatingsystem == 'SLES' {
     $suse_lib_path = $::apache::params::suse_lib_path
       ::apache::mod { $mod:
         package        => $_package_name,
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index b2890d4b78..e8431684b0 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -32,7 +32,7 @@
     fail('FreeBSD is not currently supported')
   }
 
-  if $::osfamily == 'Suse' {
+  if $::operatingsystem == 'SLES' {
       ::apache::mod { 'security':
         id  => 'security2_module',
         lib_path => $suse_lib_path,
@@ -116,6 +116,6 @@
     notify  => Class['apache::service'],
   }
 
-  unless $::osfamily == "Suse" { apache::security::rule_link { $activated_rules: } }
+  unless $::operatingsystem == "SLES" { apache::security::rule_link { $activated_rules: } }
 
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 841f2bcb66..2c0edf2e4c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -49,7 +49,7 @@
 
   $modsec_audit_log_parts = 'ABIJDEFHZ'
 
-  if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::osfamily == 'Suse') {
+  if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::operatingsystem == 'SLES') {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } elsif $::operatingsystem == 'FreeBSD' {
     $verify_command = '/usr/local/sbin/apachectl -t'
@@ -489,7 +489,6 @@
       'perl'        => 'apache2-mod_perl',
       'php5'        => 'apache2-mod_php53',
       'python'      => 'apache2-mod_python',
-      'passenger'   => 'apache2-mod_passenger',
       'security'    => 'apache2-mod_security2',
     }
     $mod_libs             = {
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index a640e54895..d67b1a878c 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -21,7 +21,6 @@
       }
     end
 
-
     describe package($package_name) do
       it { is_expected.to be_installed }
     end
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 6fb21b907b..66790d2ffd 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -34,10 +34,10 @@ class { 'apache':
           default_mods => false,
         }
         apache::vhost { 'defaults.example.com':
-          docroot => '#{$docroot}/defaults',
+          docroot => '#{$doc_root}/defaults',
           aliases => {
             alias => '/css',
-            path  => '#{$docroot}/css',
+            path  => '#{$doc_root}/css',
           },
           setenv  => 'TEST1 one',
         }
@@ -65,10 +65,10 @@ class { 'apache':
           ],
         }
         apache::vhost { 'defaults.example.com':
-          docroot => '#{$docroot}/defaults',
+          docroot => '#{$doc_root}/defaults',
           aliases => {
             alias => '/css',
-            path  => '#{$docroot}/css',
+            path  => '#{$doc_root}/css',
           },
           setenv  => 'TEST1 one',
         }
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index a3473f3cab..8b26a6b99f 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -9,11 +9,7 @@
     else
       authz_svn_load_file = 'authz_svn.load'
     end
-  when 'RedHat'
-    authz_svn_load_file = 'dav_svn_authz_svn.load'
-  when 'FreeBSD'
-    authz_svn_load_file = 'dav_svn_authz_svn.load'
-  when 'Suse'
+  else
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   end
 
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index ea92ab5b83..74d507745b 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -42,10 +42,10 @@ class { 'apache::mod::pagespeed':
         }
         apache::vhost { 'pagespeed.example.com':
           port    => '80',
-          docroot => '#{$docroot}/pagespeed',
+          docroot => '#{$doc_root}/pagespeed',
         }
         host { 'pagespeed.example.com': ip => '127.0.0.1', }
-        file { '#{$docroot}/pagespeed/index.html':
+        file { '#{$doc_root}/pagespeed/index.html':
           ensure  => file,
           content => "<html>\n<!-- comment -->\n<body>\n<p>Hello World!</p>\n</body>\n</html>",
         }
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 533d71533d..4761d2c5bf 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -60,8 +60,6 @@
     passenger_module_path = 'modules/mod_passenger.so'
     rackapp_user = 'apache'
     rackapp_group = 'apache'
-  when 'SLES'
-    conf_file = "#{$mod_dir}/passenger.conf"
   end
 
   pp_rackapp = <<-EOS
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 02a1954eaa..cff4a4dbad 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -11,10 +11,10 @@ class { 'apache':
         class { 'apache::mod::php': }
         apache::vhost { 'php.example.com':
           port    => '80',
-          docroot => '#{$docroot}/php',
+          docroot => '#{$doc_root}/php',
         }
         host { 'php.example.com': ip => '127.0.0.1', }
-        file { '#{$docroot}/php/index.php':
+        file { '#{$doc_root}/php/index.php':
           ensure  => file,
           content => "<?php phpinfo(); ?>\\n",
         }
@@ -60,14 +60,14 @@ class { 'apache::mod::php':
         }
         apache::vhost { 'php.example.com':
           port             => '80',
-          docroot          => '#{$docroot}/php',
+          docroot          => '#{$doc_root}/php',
           php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
           php_flags        => { 'display_errors' => 'on', },
           php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
           php_admin_flags  => { 'engine' => 'on', },
         }
         host { 'php.example.com': ip => '127.0.0.1', }
-        file { '#{$docroot}/php/index.php5':
+        file { '#{$doc_root}/php/index.php5':
           ensure  => file,
           content => "<?php phpinfo(); ?>\\n",
         }
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 0f1b5c4bb2..c6fa220898 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -2,13 +2,6 @@
 require_relative './version.rb'
 
 describe 'apache::mod::security class', :unless => (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy')) do
-
-  if fact('osfamily') == 'Suse'
-    $docroot = "/srv/www"
-  else
-    $docroot = "/var/www"
-  end
-
   context "default mod_security config" do
     if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
       it 'adds epel' do
@@ -36,9 +29,9 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '#{$docroot}/html',
+          docroot => '#{$doc_root}/html',
         }
-        file { '#{$docroot}/html/index.html':
+        file { '#{$doc_root}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
@@ -76,7 +69,7 @@ class { 'apache::mod::security': }
         end
       end
 
-      unless fact('osfamily') == 'Suse'
+      unless fact('operatingsystem') == 'SLES'
         it 'should block query with SQL' do
           shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
         end
@@ -93,9 +86,9 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '#{$docroot}/html',
+          docroot => '#{$doc_root}/html',
         }
-        file { '#{$docroot}/html/index.html':
+        file { '#{$doc_root}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
@@ -116,7 +109,7 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    unless fact('osfamily') == 'Suse'
+    unless fact('operatingsystem') == 'SLES'
       it 'should block query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
       end
@@ -128,7 +121,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port                 => '80',
-          docroot              => '#{$docroot}/html',
+          docroot              => '#{$doc_root}/html',
           modsec_disable_vhost => true,
         }
       EOS
@@ -151,9 +144,9 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '#{$docroot}/html',
+          docroot => '#{$doc_root}/html',
         }
-        file { '#{$docroot}/html/index.html':
+        file { '#{$doc_root}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
@@ -174,7 +167,7 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    unless fact('osfamily') == 'Suse'
+    unless fact('operatingsystem') == 'SLES'
       it 'should block query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
       end
@@ -186,7 +179,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port               => '80',
-          docroot            => '#{$docroot}/html',
+          docroot            => '#{$doc_root}/html',
           modsec_disable_ips => [ '127.0.0.1' ],
         }
       EOS
@@ -209,13 +202,13 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '#{$docroot}/html',
+          docroot => '#{$doc_root}/html',
         }
-        file { '#{$docroot}/html/index.html':
+        file { '#{$doc_root}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
-        file { '#{$docroot}/html/index2.html':
+        file { '#{$doc_root}/html/index2.html':
           ensure  => file,
           content => 'Page 2',
         }
@@ -236,7 +229,7 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    unless fact('osfamily') == 'Suse'
+    unless fact('operatingsystem') == 'SLES'
       it 'should block query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
       end
@@ -248,7 +241,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port               => '80',
-          docroot            => '#{$docroot}/html',
+          docroot            => '#{$doc_root}/html',
           modsec_disable_ids => [ '950007' ],
         }
       EOS
@@ -272,13 +265,13 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '#{$docroot}/html',
+          docroot => '#{$doc_root}/html',
         }
-        file { '#{$docroot}/html/index.html':
+        file { '#{$doc_root}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
-        file { '#{$docroot}/html/index2.html':
+        file { '#{$doc_root}/html/index2.html':
           ensure  => file,
           content => 'Page 2',
         }
@@ -299,7 +292,7 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    unless fact('osfamily') == 'Suse'
+    unless fact('operatingsystem') == 'SLES'
       it 'should block query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
       end
@@ -311,7 +304,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port               => '80',
-          docroot            => '#{$docroot}/html',
+          docroot            => '#{$doc_root}/html',
           modsec_disable_msgs => [ 'Blind SQL Injection Attack' ],
         }
       EOS
@@ -335,13 +328,13 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port    => '80',
-          docroot => '#{$docroot}/html',
+          docroot => '#{$doc_root}/html',
         }
-        file { '#{$docroot}/html/index.html':
+        file { '#{$doc_root}/html/index.html':
           ensure  => file,
           content => 'Index page',
         }
-        file { '#{$docroot}/html/index2.html':
+        file { '#{$doc_root}/html/index2.html':
           ensure  => file,
           content => 'Page 2',
         }
@@ -362,7 +355,7 @@ class { 'apache::mod::security': }
       it { is_expected.to contain "mod_security2.c" }
     end
 
-    unless fact('osfamily') == 'Suse'
+    unless fact('operatingsystem') == 'SLES'
       it 'should block query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
       end
@@ -374,7 +367,7 @@ class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
           port                => '80',
-          docroot             => '#{$docroot}/html',
+          docroot             => '#{$doc_root}/html',
           modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION' ],
         }
       EOS
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index f69b56cc52..fac4071e60 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -10,7 +10,7 @@
   $vhost_dir        = '/etc/httpd/conf.d'
   $vhost            = '/etc/httpd/conf.d/15-default.conf'
   $run_dir          = '/var/run/httpd'
-  $docroot          = '/var/www'
+  $doc_root          = '/var/www'
   $service_name     = 'httpd'
   $package_name     = 'httpd'
   $error_log        = 'error_log'
@@ -32,7 +32,7 @@
   $vhost            = '/etc/apache2/sites-available/15-default.conf'
   $vhost_dir        = '/etc/apache2/sites-enabled'
   $run_dir          = '/var/run/apache2'
-  $docroot          = '/var/www'
+  $doc_root          = '/var/www'
   $service_name     = 'apache2'
   $package_name     = 'apache2'
   $error_log        = 'error.log'
@@ -54,7 +54,7 @@
   $vhost            = '/usr/local/etc/apache24/Vhosts/15-default.conf'
   $vhost_dir        = '/usr/local/etc/apache24/Vhosts'
   $run_dir          = '/var/run/apache24'
-  $docroot          = '/var/www'
+  $doc_root          = '/var/www'
   $service_name     = 'apache24'
   $package_name     = 'apache24'
   $error_log        = 'http-error.log'
@@ -68,7 +68,7 @@
   $vhost            = '/etc/apache2/vhosts.d/15-default.conf'
   $vhost_dir        = '/etc/apache2/vhosts.d'
   $run_dir          = '/var/run/apache2'
-  $docroot          = '/var/www'
+  $doc_root          = '/var/www'
   $service_name     = 'apache2'
   $package_name     = 'www-servers/apache'
   $error_log        = 'http-error.log'
@@ -82,15 +82,14 @@
   $vhost            = '/etc/apache2/sites-available/15-default.conf'
   $vhost_dir        = '/etc/apache2/sites-available'
   $run_dir          = '/var/run/apache2'
-  $docroot          = '/srv/www'
+  $doc_root         = '/srv/www'
   $service_name     = 'apache2'
   $package_name     = 'apache2'
+  $error_log        = 'error.log'
   if _operatingsystemrelease < 12
     $apache_version   = '2.2'
-    $error_log        = 'error.log'
   else
     $apache_version   = '2.4'
-    $error_log        = 'http-error.log'
   end
 else
   $apache_version = '0'
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index db3be92402..d4b2e3edf1 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -45,14 +45,14 @@ class { 'apache': }
   context 'default vhost with ssl' do
     it 'should create default vhost configs' do
       pp = <<-EOS
-        file { '#{$vhost_dir}':
+        file { '#{$run_dir}':
           ensure  => 'directory',
           recurse => true,
         }
 
         class { 'apache':
           default_ssl_vhost => true,
-          require => File['#{$vhost_dir}'],
+          require => File['#{$run_dir}'],
         }
       EOS
       apply_manifest(pp, :catch_failures => true)

From f8bc69b3db9f3c70426d2828eb2cc7d48271f08c Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Thu, 29 Sep 2016 08:06:44 -0700
Subject: [PATCH 0990/2267] in which lint errors are fixed

---
 manifests/mod/dav_svn.pp         | 6 +++---
 manifests/mod/security.pp        | 8 ++++----
 spec/classes/mod/dav_svn_spec.rb | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 338285aac5..b7d4d81a07 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -1,14 +1,14 @@
 class apache::mod::dav_svn (
   $authz_svn_enabled = false,
-  $suse_lib_path = $::apache::params::suse_lib_path
 ) {
   Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
   include ::apache
   include ::apache::mod::dav
   if($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){
+    $suse_lib_path = $::apache::params::suse_lib_path
     package { 'subversion-server':
+      ensure   => 'installed',
       provider => 'zypper',
-      ensure => 'installed',
     }
     ::apache::mod {'dav_svn':
       lib_path => $suse_lib_path
@@ -27,7 +27,7 @@
     if ($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){
       ::apache::mod { 'authz_svn':
         loadfile_name => $loadfile_name,
-        lib_path => $suse_lib_path,
+        lib_path      => $suse_lib_path,
         require       => Apache::Mod['dav_svn'],
       }
       } else {
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index e8431684b0..77a3c85906 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -19,7 +19,6 @@
   $error_anomaly_score        = '4',
   $warning_anomaly_score      = '3',
   $notice_anomaly_score       = '2',
-  $suse_lib_path              = $::apache::params::suse_lib_path,
 ) inherits ::apache::params {
   include ::apache
 
@@ -33,10 +32,11 @@
   }
 
   if $::operatingsystem == 'SLES' {
+    $suse_lib_path  = $::apache::params::suse_lib_path
       ::apache::mod { 'security':
-        id  => 'security2_module',
+        id       => 'security2_module',
         lib_path => $suse_lib_path,
-        lib => 'mod_security2.so',
+        lib      => 'mod_security2.so',
       }
     } else {
       ::apache::mod { 'security':
@@ -116,6 +116,6 @@
     notify  => Class['apache::service'],
   }
 
-  unless $::operatingsystem == "SLES" { apache::security::rule_link { $activated_rules: } }
+  unless $::operatingsystem == 'SLES' { apache::security::rule_link { $activated_rules: } }
 
 }
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 1eb06b22c5..426b547f2a 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -16,7 +16,7 @@
           :id                        => 'root',
           :kernel                    => 'Linux',
           :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          :is_pe                     => false,
         }
       end
       it { is_expected.to contain_class("apache::params") }

From 571bc4e627f3cb905f06beda25e8fe82eccbba3f Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Thu, 4 Aug 2016 15:02:22 +0200
Subject: [PATCH 0991/2267] Add passenger_nodejs + passenger_sticky_sessions +
 passenger_startup_file

---
 README.md                      | 12 ++++++++++++
 manifests/vhost.pp             | 14 ++++++++++++--
 spec/defines/vhost_spec.rb     |  3 +++
 templates/vhost/_passenger.erb |  9 +++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fd2faa00ae..e705695520 100644
--- a/README.md
+++ b/README.md
@@ -2573,6 +2573,18 @@ Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/refe
 
 Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter. Valid options: 'true', 'false'. Default: undef.
 
+##### `passenger_nodejs`
+
+Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs), the NodeJS interpreter to use for the application, on this virtual host.
+
+##### `passenger_sticky_sessions`
+
+Sets the [`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions) parameter. Valid options: 'true', 'false'. Default: undef.
+
+##### `passenger_startup_file`
+
+Sets the [`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile) path. This path is relative to the application root.
+
 ##### `php_flags & values`
 
 Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Default: '{}'.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 15286b6941..5644ba82ca 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -135,6 +135,9 @@
   $passenger_pre_start         = undef,
   $passenger_user              = undef,
   $passenger_high_performance  = undef,
+  $passenger_nodejs            = undef,
+  $passenger_sticky_sessions   = undef,
+  $passenger_startup_file      = undef,
   $add_default_charset         = undef,
   $modsec_disable_vhost        = undef,
   $modsec_disable_ids          = undef,
@@ -292,6 +295,10 @@
     validate_re($keepalive,'(^on$|^off$)',"${keepalive} is not permitted for keepalive. Allowed values are 'on' or 'off'.")
   }
 
+  if $passenger_sticky_sessions {
+    validate_bool($passenger_sticky_sessions)
+  }
+
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -316,7 +323,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance {
+  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file {
     include ::apache::mod::passenger
   }
 
@@ -1046,7 +1053,10 @@
   # - $passenger_start_timeout
   # - $passenger_pre_start
   # - $passenger_user
-  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user {
+  # - $passenger_nodejs
+  # - $passenger_sticky_sessions
+  # - $passenger_startup_file
+  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 6f85b622b3..48cff58e38 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -387,6 +387,9 @@
           'passenger_pre_start'         => 'http://localhost/myapp',
           'passenger_high_performance'  => true,
           'passenger_user'              => 'sandbox',
+          'passenger_nodejs'            => '/usr/bin/node',
+          'passenger_sticky_sessions'   => true,
+          'passenger_startup_file'      => 'bin/www',
           'add_default_charset'         => 'UTF-8',
           'jk_mounts'                   => [
             { 'mount'   => '/*',     'worker' => 'tcnode1', },
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index becea9c4d0..a380016b3b 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -22,3 +22,12 @@
 <% if @passenger_high_performance -%>
   PassengerHighPerformance <%= scope.function_bool2httpd([@passenger_high_performance]) %>
 <% end -%>
+<% if @passenger_nodejs -%>
+  PassengerNodejs <%= @passenger_nodejs -%>
+<% end -%>
+<% if @passenger_sticky_sessions -%>
+  PassengerStickySessions <%= scope.function_bool2httpd([@passenger_sticky_sessions]) %>
+<% end -%>
+<% if @passenger_startup_file -%>
+  PassengerStartupFile <%= @passenger_startup_file -%>
+<% end -%>

From 9aca087be157ed16ab15212e7d1e086f149075fb Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu, 7 Jul 2016 17:05:54 +0200
Subject: [PATCH 0992/2267] Auto load Apache::Mod[slotmem_shm] and
 Apache::Mod[lbmethod_byrequests] with proxy_balancer on 2.4

---
 README.md                           | 14 ++++++++++++++
 manifests/balancer.pp               |  8 ++++++++
 manifests/mod/proxy_balancer.pp     |  7 ++++++-
 spec/defines/balancer_spec.rb       | 27 +++++++++++++++++++++++++++
 spec/defines/balancermember_spec.rb |  6 ++++--
 5 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fd2faa00ae..f38610ad7d 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@
 [`apache::mod::peruser`]: #class-apachemodperuser
 [`apache::mod::prefork`]: #class-apachemodprefork
 [`apache::mod::proxy`]: #class-apachemodproxy
+[`apache::mod::proxy_balancer`]: #class-apachemodproxybalancer
 [`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi
 [`apache::mod::proxy_html`]: #class-apachemodproxy_html
 [`apache::mod::security`]: #class-apachemodsecurity
@@ -733,10 +734,13 @@ If you need to use the [ProxySet](https://httpd.apache.org/docs/current/mod/mod_
 apache::balancer { 'puppet01':
   proxy_set => {
     'stickysession' => 'JSESSIONID',
+    'lbmethod'      => 'bytraffic',
   },
 }
 ```
 
+Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balancer documentation](https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html).
+
 ## Reference
 
 - [**Public classes**](#public-classes)
@@ -1336,6 +1340,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `prefork`\*
 * `proxy`\* (see [`apache::mod::proxy`][])
 * `proxy_ajp`
+* `proxy_balancer`\* (see [`apache::mod::proxy_balancer`][])
 * `proxy_balancer`
 * `proxy_html` (see [`apache::mod::proxy_html`][])
 * `proxy_http`
@@ -1731,6 +1736,15 @@ Installs `mod_proxy` and uses the `proxy.conf.erb` template to generate its conf
 - `package_name`: Default: `undef`.
 - `proxy_requests`: Default: 'Off'.
 
+##### Class: `apache::mod::proxy_balancer`
+
+Installs and manages [`mod_proxy_balancer`][], which provides load balancing.
+
+**Parameters within `apache::mod::proxy_balancer`**:
+
+- `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. Default: the value of [`$::apache::apache_version`][`apache_version`].
+   - On Apache >= 2.4, `mod_slotmem_shm` is loaded.
+
 ##### Class: `apache::mod::php`
 
 Installs and configures [`mod_php`][].
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 0d2439bfe2..41db8a8dc8 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -49,6 +49,14 @@
 ) {
   include ::apache::mod::proxy_balancer
 
+  if versioncmp($apache::mod::proxy_balancer::apache_version, '2.4') >= 0 {
+    $lbmethod = $proxy_set['lbmethod'] ? {
+      undef   => 'byrequests',
+      default => $proxy_set['lbmethod'],
+    }
+    ensure_resource('apache::mod', "lbmethod_${lbmethod}")
+  }
+
   if $target {
     $_target = $target
   } else {
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 5a0768d8d0..a225ce3396 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -1,7 +1,12 @@
-class apache::mod::proxy_balancer {
+class apache::mod::proxy_balancer(
+  $apache_version = $::apache::apache_version,
+) {
 
   include ::apache::mod::proxy
   include ::apache::mod::proxy_http
+  if versioncmp($apache_version, '2.4') >= 0 {
+    ::apache::mod { 'slotmem_shm': }
+  }
 
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_balancer']
   Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_balancer']
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index 65df6d3730..3b43e3fd7a 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -30,6 +30,16 @@
       it { should contain_concat('apache_balancer_myapp').with({
         :path => "/tmp/myapp.conf",
       })}
+      it { should_not contain_apache__mod('slotmem_shm') }
+      it { should_not contain_apache__mod('lbmethod_byrequests') }
+    end
+    context "on jessie" do
+      let(:facts) { super().merge({
+        :operatingsystemrelease => '8',
+        :lsbdistcodename        => 'jessie',
+      }) }
+      it { should contain_apache__mod('slotmem_shm') }
+      it { should contain_apache__mod('lbmethod_byrequests') }
     end
   end
   describe 'apache pre_condition with conf_dir set' do 
@@ -42,4 +52,21 @@
       :path => "/junk/path/balancer_myapp.conf",
     })}
   end
+
+  describe 'with lbmethod and with apache::mod::proxy_balancer::apache_version set' do
+    let :pre_condition do
+      'class{"apache::mod::proxy_balancer":
+          apache_version => "2.4"
+       }'
+    end
+    let :params do
+      {
+        :proxy_set => {
+          'lbmethod' => 'bytraffic',
+        },
+      }
+    end
+    it { should contain_apache__mod('slotmem_shm') }
+    it { should contain_apache__mod('lbmethod_bytraffic') }
+  end
 end
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index d99f99686e..6221290a28 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -19,7 +19,8 @@
   end
   describe "allows multiple balancermembers with the same url" do
     let :pre_condition do
-      'apache::balancer {"balancer":}
+      'include apache
+      apache::balancer {"balancer":}
       apache::balancer {"balancer-external":}
       apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancer-external"}
       '
@@ -38,7 +39,8 @@
   end
   describe "allows balancermember with a different target" do
     let :pre_condition do
-      'apache::balancer {"balancername": target => "/etc/apache/balancer.conf"}
+      'include apache
+      apache::balancer {"balancername": target => "/etc/apache/balancer.conf"}
       apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancername"}
       '
     end

From 49f8bf579ee2211da4a36bd9c93b4ce7c2a14a09 Mon Sep 17 00:00:00 2001
From: Guy Vandenbergh <gvdb1967@gmail.com>
Date: Thu, 6 Oct 2016 14:38:37 +0200
Subject: [PATCH 0993/2267] Add rpaf.conf template parameter

Enable usage of different rpaf.conf file (e.g. rpaf forks 0.6.1
https://github.com/gnif/mod_rpaf)
---
 manifests/mod/rpaf.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index cb65483605..b9afa149f2 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -1,7 +1,8 @@
 class apache::mod::rpaf (
   $sethostname = true,
   $proxy_ips   = [ '127.0.0.1' ],
-  $header      = 'X-Forwarded-For'
+  $header      = 'X-Forwarded-For',
+  $template    = 'apache/mod/rpaf.conf.erb'
 ) {
   include ::apache
   ::apache::mod { 'rpaf': }
@@ -14,7 +15,7 @@
     ensure  => file,
     path    => "${::apache::mod_dir}/rpaf.conf",
     mode    => $::apache::file_mode,
-    content => template('apache/mod/rpaf.conf.erb'),
+    content => template($template),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
     notify  => Class['apache::service'],

From 964317d5df86d655912b1a65afca97606c9ae739 Mon Sep 17 00:00:00 2001
From: Guy Vandenbergh <gvdb1967@gmail.com>
Date: Thu, 6 Oct 2016 16:17:40 +0200
Subject: [PATCH 0994/2267] Add path to shibboleth lib

Shibboleth can be installed in very different location using different
names depending on the version, os... We add a parameter to specify the
location of the current shibboleth library path.
---
 manifests/mod/shib.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 4b00889260..c1fda9324f 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -1,5 +1,6 @@
 class apache::mod::shib (
   $suppress_warning = false,
+  $mod_full_path = undef,
 ) {
   include ::apache
   if $::osfamily == 'RedHat' and ! $suppress_warning {
@@ -9,7 +10,7 @@
   $mod_shib = 'shib2'
 
   apache::mod {$mod_shib:
-    id => 'mod_shib',
+    id   => 'mod_shib',
+    path => $mod_full_path,
   }
-
 }

From 35096a6d8fd17edea599eeaa60bc4ca2a4f06b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 6 Oct 2016 19:16:41 +0200
Subject: [PATCH 0995/2267] Simplify MPM setup on FreeBSD (#1497)

* MPM backend are dynamic on FreeBSD since 2015.

This makes it easy to switch MPM.
https://svnweb.freebsd.org/ports?view=revision&revision=378215

* Get rid of now useless variable.

* No more true.
---
 README.md            |  2 --
 manifests/package.pp | 30 +-----------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/README.md b/README.md
index fd2faa00ae..a6a0456868 100644
--- a/README.md
+++ b/README.md
@@ -1081,8 +1081,6 @@ You must set this to false to explicitly declare the following classes with cust
 - [`apache::mod::prefork`][]
 - [`apache::mod::worker`][]
 
-> **Note**: Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `mpm_module`, you must uninstall all packages that depend on your installed Apache server.
-
 ##### `package_ensure`
 
 Controls the `package` resource's [`ensure`][] attribute. Valid options: 'absent', 'installed' (or the equivalent 'present'), or a version string. Default: 'installed'.
diff --git a/manifests/package.pp b/manifests/package.pp
index 5c59f2546d..7c95f99800 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -12,54 +12,26 @@
     'FreeBSD': {
       case $mpm_module {
         'prefork': {
-          $set = 'MPM_PREFORK'
-          $unset = 'MPM_WORKER MPM_EVENT'
         }
         'worker': {
-          $set = 'MPM_WORKER'
-          $unset = 'MPM_PREFORK MPM_EVENT'
         }
         'event': {
-          $set = 'MPM_EVENT'
-          $unset = 'MPM_PREFORK MPM_WORKER'
         }
         'itk': {
-          $set = undef
-          $unset = undef
           package { 'www/mod_mpm_itk':
             ensure => installed,
           }
         }
         default: { fail("MPM module ${mpm_module} not supported on FreeBSD") }
       }
-
-      # Configure ports to have apache build options set correctly
-      if $set {
-        file_line { 'apache SET options in /etc/make.conf':
-          ensure => $ensure,
-          path   => '/etc/make.conf',
-          line   => "apache24_SET_FORCE=${set}",
-          match  => '^apache24_SET_FORCE=.*',
-          before => Package['httpd'],
-        }
-        file_line { 'apache UNSET options in /etc/make.conf':
-          ensure => $ensure,
-          path   => '/etc/make.conf',
-          line   => "apache24_UNSET_FORCE=${unset}",
-          match  => '^apache24_UNSET_FORCE=.*',
-          before => Package['httpd'],
-        }
-      }
-      $apache_package = $::apache::apache_name
     }
     default: {
-      $apache_package = $::apache::apache_name
     }
   }
 
   package { 'httpd':
     ensure => $ensure,
-    name   => $apache_package,
+    name   => $::apache::apache_name,
     notify => Class['Apache::Service'],
   }
 }

From 022ce44e15682b6bc3d7ba7f2aaf9ef2f4471d8d Mon Sep 17 00:00:00 2001
From: gerhardsam <sebastian.gerhards@aktion-mensch.de>
Date: Thu, 6 Oct 2016 19:34:50 +0200
Subject: [PATCH 0996/2267] Rename spec for apache::mod::disk_cache (#1509)

Fixes spec tests for apache::mod::disk_cache
---
 .../mod/{disk_cache.rb => disk_cache_spec.rb} | 98 +++++++++++--------
 1 file changed, 56 insertions(+), 42 deletions(-)
 rename spec/classes/mod/{disk_cache.rb => disk_cache_spec.rb} (50%)

diff --git a/spec/classes/mod/disk_cache.rb b/spec/classes/mod/disk_cache_spec.rb
similarity index 50%
rename from spec/classes/mod/disk_cache.rb
rename to spec/classes/mod/disk_cache_spec.rb
index 263b4cac64..ebb5ef6a97 100644
--- a/spec/classes/mod/disk_cache.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -1,10 +1,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::disk_cache', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS", :compile do
+  context "on a Debian OS" do
     let :facts do
       {
         :id                     => 'root',
@@ -19,28 +16,35 @@
       }
     end
     context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.2",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
       end
-
+      it { should compile }
+      it { should contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1/) }
     end
     context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
       end
-
+      it { should compile }
+      it { should contain_class('apache::mod::disk_cache') }
+      it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
     end
   end
 
-  context "on a RedHat 6-based OS", :compile do
+  context "on a RedHat 6-based OS" do
     let :facts do
       {
         :id                     => 'root',
@@ -54,27 +58,29 @@
       }
     end
     context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.2",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
       end
-
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) }
     end
     context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
       end
-
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) }
     end
   end
-  context "on a FreeBSD OS", :compile do
+  context "on a FreeBSD OS" do
     let :facts do
       {
         :id                     => 'root',
@@ -88,24 +94,32 @@
       }
     end
     context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.2",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
       end
-
+      it { should compile }
+      it { should contain_class('apache::mod::disk_cache') }
+      it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1/) }
     end
     context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
       end
-
+      it { should compile }
+      it { should contain_class('apache::mod::disk_cache') }
+      it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk /\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
     end
   end
 end

From 9aac67edc655418359d4a5a5741c8734bfe75774 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 10 Oct 2016 14:17:33 +0100
Subject: [PATCH 0997/2267] Update modulesync_config [51f469d]

Additionally this finally cleanes up the spec_helper.rb
---
 .gitignore                |  2 --
 .sync.yml                 | 18 ++++++++++++-
 .travis.yml               |  4 +--
 spec/spec_helper.rb       | 54 ++++-----------------------------------
 spec/spec_helper_local.rb | 37 +++++++++++++++++++++++++++
 5 files changed, 61 insertions(+), 54 deletions(-)
 create mode 100644 spec/spec_helper_local.rb

diff --git a/.gitignore b/.gitignore
index a319988ddc..0cd25de9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,6 @@ Gemfile.lock
 vendor/
 spec/fixtures/manifests/
 spec/fixtures/modules/
-spec/acceptance/nodesets/
-tmp/
 .vagrant/
 .bundle/
 coverage/
diff --git a/.sync.yml b/.sync.yml
index e5f5f79bae..29a1aafa7b 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,7 +1,23 @@
 ---
 .travis.yml:
+  includes:
+  - rvm: 2.3.1
+    env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
+    bundler_args: --without system_tests
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
+    bundler_args: --without system_tests
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    bundler_args: --without system_tests
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0"
+    bundler_args: --without system_tests
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0"
+    bundler_args: --without system_tests
 Rakefile:
   extra_disabled_lint_checks:
   - 'disable_only_variable_string'
 spec/spec_helper.rb:
-  unmanaged: true
+  allow_deprecations: true
diff --git a/.travis.yml b/.travis.yml
index 4e549bf77a..6b0a0975f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,10 @@ matrix:
     sudo: required
   - rvm: 2.3.1
     bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0"
+    env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
   - rvm: 2.1.9
     bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0"
+    env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e61b185c1a..22d5d689f4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,52 +1,8 @@
+#This file is generated by ModuleSync, do not edit.
 require 'puppetlabs_spec_helper/module_spec_helper'
 
-RSpec.configure do |c|
-  c.before :each do
-    # Ensure that we don't accidentally cache facts and environment
-    # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
-
-    # Store any environment variables away to be restored later
-    @old_env = {}
-    ENV.each_key {|k| @old_env[k] = ENV[k]}
-
-    if ENV['STRICT_VARIABLES'] == 'yes'
-      Puppet.settings[:strict_variables]=true
-    end
-  end
-end
-
-RSpec.configure do |config|
-    config.filter_run focus: true
-    config.run_all_when_everything_filtered = true
-end
-
-shared_examples :compile, :compile => true do
-  it { should compile.with_all_deps }
-end
-
-shared_examples 'a mod class, without including apache' do
-   let :facts do
-    {
-      :id                        => 'root',
-      :lsbdistcodename           => 'squeeze',
-      :kernel                    => 'Linux',
-      :osfamily                  => 'Debian',
-      :operatingsystem           => 'Debian',
-      :operatingsystemrelease    => '6',
-      :operatingsystemmajrelease => nil,
-      :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      :concat_basedir            => '/dne',
-      :is_pe                     => false,
-      :hardwaremodel             => 'x86_64',
-    }
-  end
-  it { should compile.with_all_deps }
-end
-
-RSpec.configure do |config|
-    config.filter_run focus: true
-    config.run_all_when_everything_filtered = true
+# put local configuration and setup into spec_helper_local
+begin
+  require 'spec_helper_local'
+rescue LoadError
 end
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
new file mode 100644
index 0000000000..113ab7f6f4
--- /dev/null
+++ b/spec/spec_helper_local.rb
@@ -0,0 +1,37 @@
+RSpec.configure do |c|
+  c.before :each do
+    # Ensure that we don't accidentally cache facts and environment
+    # between test cases.
+    Facter::Util::Loader.any_instance.stubs(:load_all)
+    Facter.clear
+    Facter.clear_messages
+  end
+end
+
+RSpec.configure do |config|
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+end
+
+shared_examples :compile, :compile => true do
+  it { should compile.with_all_deps }
+end
+
+shared_examples 'a mod class, without including apache' do
+   let :facts do
+    {
+      :id                        => 'root',
+      :lsbdistcodename           => 'squeeze',
+      :kernel                    => 'Linux',
+      :osfamily                  => 'Debian',
+      :operatingsystem           => 'Debian',
+      :operatingsystemrelease    => '6',
+      :operatingsystemmajrelease => nil,
+      :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      :concat_basedir            => '/dne',
+      :is_pe                     => false,
+      :hardwaremodel             => 'x86_64',
+    }
+  end
+  it { should compile.with_all_deps }
+end

From 29c4f2bc58fca274447081dbdf9c66237d0acb78 Mon Sep 17 00:00:00 2001
From: Niels Laukens <niels@dest-unreach.be>
Date: Fri, 14 Oct 2016 14:11:16 +0200
Subject: [PATCH 0998/2267] Notify Apache of new symlink

The notify was present in the regular vhost.pp manifest, but not in the
vhost/custom.pp manifest
---
 manifests/vhost/custom.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index e46b4c4d81..cfb06c273e 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -34,6 +34,7 @@
       group   => $::apache::params::root_group,
       mode    => $::apache::file_mode,
       require => Apache::Custom_config[$filename],
+      notify  => Class['apache::service'],
     }
   }
 }

From 378fd4b7f30406dc4e2efc8d008005febc8caf82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 18 Oct 2016 17:05:09 +0200
Subject: [PATCH 0999/2267] Do not set ssl_certs_dir on FreeBSD

The previous directory does NOT contain certificates by default,
resulting in an error when starting apache if certificates are
elsewhere:

~~~
[Tue Oct 18 16:34:17.074516 2016] [ssl:emerg] [pid 57102:tid 34397585408] AH01896: Unable to determine list of acceptable CA certificates for client authentication
~~~

While here, sync the README which was outdated.
---
 README.md           | 2 +-
 manifests/params.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3e36448770..10d6081c7f 100644
--- a/README.md
+++ b/README.md
@@ -3678,7 +3678,7 @@ Specifies the location of the SSL certification directory. Default: Depends on t
 
 - **Debian:** '/etc/ssl/certs'
 - **Red Hat:** '/etc/pki/tls/certs'
-- **FreeBSD:** '/usr/local/etc/apache22'
+- **FreeBSD:** undef
 - **Gentoo:** '/etc/ssl/apache2'
 
 ##### `ssl_chain`
diff --git a/manifests/params.pp b/manifests/params.pp
index 613cb8c8c0..1f9f60a806 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -355,7 +355,7 @@
     $dev_packages     = undef
     $default_ssl_cert = '/usr/local/etc/apache24/server.crt'
     $default_ssl_key  = '/usr/local/etc/apache24/server.key'
-    $ssl_certs_dir    = '/usr/local/etc/apache24'
+    $ssl_certs_dir    = undef
     $passenger_conf_file = 'passenger.conf'
     $passenger_conf_package_file = undef
     $passenger_root   = '/usr/local/lib/ruby/gems/2.0/gems/passenger-4.0.58'

From b253993decdceb16a6d54cb3b83acbec5dd86129 Mon Sep 17 00:00:00 2001
From: Jon-Paul Lindquist <jonpaul@lindquist.me>
Date: Tue, 18 Oct 2016 13:41:00 -0700
Subject: [PATCH 1000/2267] Adding requirement for httpd package

Adding requirement for httpd package to $modsec_dir file resource to fix bug MODULES-3985
---
 manifests/mod/security.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 77a3c85906..80c92d755f 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -83,6 +83,7 @@
     purge   => true,
     force   => true,
     recurse => true,
+    require => Package['httpd'],
   }
 
   file { "${modsec_dir}/activated_rules":

From 3333e7f9dc6432e960e9b60542f7629ad7906dc7 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Tue, 18 Oct 2016 13:44:42 -0700
Subject: [PATCH 1001/2267] (FM-5739) removes mocha stubbing

---
 spec/spec_helper_local.rb               |   2 +
 spec/unit/apache_version_spec.rb        |  12 +--
 spec/unit/provider/a2mod/gentoo_spec.rb | 108 ++++++++++++------------
 3 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 113ab7f6f4..d861a1c49a 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -11,6 +11,8 @@
 RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
+  #as soon as psh is updated, the following line can be removed
+  config.mock_with :rspec
 end
 
 shared_examples :compile, :compile => true do
diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/apache_version_spec.rb
index c62339da41..2036449fd9 100644
--- a/spec/unit/apache_version_spec.rb
+++ b/spec/unit/apache_version_spec.rb
@@ -8,9 +8,9 @@
   describe 'apache_version' do
     context 'with value' do
       before :each do
-        Facter::Util::Resolution.stubs(:which).with('apachectl').returns(true)
-        Facter::Util::Resolution.stubs(:exec).with('apachectl -v 2>&1').returns('Server version: Apache/2.4.16 (Unix)
-                                                                                  Server built:   Jul 31 2015 15:53:26')
+        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
+        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {'Server version: Apache/2.4.16 (Unix)
+                                                                                  Server built:   Jul 31 2015 15:53:26'}
       end
       it do
         expect(Facter.fact(:apache_version).value).to eq('2.4.16')
@@ -21,9 +21,9 @@
   describe 'apache_version with empty OS' do
     context 'with value' do
       before :each do
-        Facter::Util::Resolution.stubs(:which).with('apachectl').returns(true)
-        Facter::Util::Resolution.stubs(:exec).with('apachectl -v 2>&1').returns('Server version: Apache/2.4.6 ()
-                                                                                  Server built:   Nov 21 2015 05:34:59')
+        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
+        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {'Server version: Apache/2.4.6 ()
+                                                                                  Server built:   Nov 21 2015 05:34:59' }
       end
       it do
         expect(Facter.fact(:apache_version).value).to eq('2.4.6')
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index e472745e92..1bccc94d17 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -15,19 +15,19 @@
 
   describe "when fetching modules" do
     before do
-      @filetype = mock()
+      @filetype = double()
     end
 
     it "should return a sorted array of the defined parameters" do
-      @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
-      provider_class.expects(:filetype).returns(@filetype)
+      expect(@filetype).to receive(:read) { %Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n} }
+      expect(provider_class).to receive(:filetype) { @filetype }
 
       expect(provider_class.modules).to eq(%w{bar baz foo})
     end
 
     it "should cache the module list" do
-      @filetype.expects(:read).once.returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
-      provider_class.expects(:filetype).once.returns(@filetype)
+      expect(@filetype).to receive(:read).once { %Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n} }
+      expect(provider_class).to receive(:filetype).once { @filetype }
 
       2.times { expect(provider_class.modules).to eq(%w{bar baz foo}) }
     end
@@ -42,121 +42,121 @@
 
   describe "when prefetching" do
     it "should match providers to resources" do
-      provider = mock("ssl_provider", :name => "ssl")
-      resource = mock("ssl_resource")
+      provider = double("ssl_provider", :name => "ssl")
+      resource = double("ssl_resource")
       resource.expects(:provider=).with(provider)
 
-      provider_class.expects(:instances).returns([provider])
+      expect(provider_class).to receive(:instances) { [provider] }
       provider_class.prefetch("ssl" => resource)
     end
   end
 
   describe "when flushing" do
     before :each do
-      @filetype = mock()
-      @filetype.stubs(:backup)
-      provider_class.expects(:filetype).at_least_once.returns(@filetype)
+      @filetype = double()
+      allow(@filetype).to receive(:backup)
+      allow(provider_class).to receive(:filetype).at_least(:once) { @filetype }
 
-      @info = mock()
-      @info.stubs(:[]).with(:name).returns("info")
-      @info.stubs(:provider=)
+      @info = double()
+      allow(@info).to receive(:[]).with(:name) { "info" }
+      allow(@info).to receive(:provider=)
 
-      @mpm = mock()
-      @mpm.stubs(:[]).with(:name).returns("mpm")
-      @mpm.stubs(:provider=)
+      @mpm = double()
+      allow(@mpm).to receive(:[]).with(:name) { "mpm" }
+      allow(@mpm).to receive(:provider=)
 
-      @ssl = mock()
-      @ssl.stubs(:[]).with(:name).returns("ssl")
-      @ssl.stubs(:provider=)
+      @ssl = double()
+      allow(@ssl).to receive(:[]).with(:name) { "ssl" }
+      allow(@ssl).to receive(:provider=)
     end
 
     it "should add modules whose ensure is present" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D INFO"})
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} }
+      expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D INFO"})
 
-      @info.stubs(:should).with(:ensure).returns(:present)
+      allow(@info).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("info" => @info)
 
       provider_class.flush
     end
 
     it "should remove modules whose ensure is present" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-D INFO"})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS=""})
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-D INFO"} }
+      expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS=""})
 
-      @info.stubs(:should).with(:ensure).returns(:absent)
-      @info.stubs(:provider=)
+      allow(@info).to receive(:should).with(:ensure) { :absent }
+      allow(@info).to receive(:provider=)
       provider_class.prefetch("info" => @info)
 
       provider_class.flush
     end
 
     it "should not modify providers without resources" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-D INFO -D MPM"})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D MPM -D SSL"})
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-D INFO -D MPM"} }
+      expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D MPM -D SSL"})
 
-      @info.stubs(:should).with(:ensure).returns(:absent)
+      allow(@info).to receive(:should).with(:ensure) { :absent }
       provider_class.prefetch("info" => @info)
 
-      @ssl.stubs(:should).with(:ensure).returns(:present)
+      allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("ssl" => @ssl)
 
       provider_class.flush
     end
 
     it "should write the modules in sorted order" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D INFO -D MPM -D SSL"})
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} }
+      expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D INFO -D MPM -D SSL"})
 
-      @mpm.stubs(:should).with(:ensure).returns(:present)
+      allow(@mpm).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("mpm" => @mpm)
-      @info.stubs(:should).with(:ensure).returns(:present)
+      allow(@info).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("info" => @info)
-      @ssl.stubs(:should).with(:ensure).returns(:present)
+      allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("ssl" => @ssl)
 
       provider_class.flush
     end
 
     it "should write the records back once" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} }
+      expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
 
-      @info.stubs(:should).with(:ensure).returns(:present)
+      allow(@info).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("info" => @info)
 
-      @ssl.stubs(:should).with(:ensure).returns(:present)
+      allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("ssl" => @ssl)
 
       provider_class.flush
     end
 
     it "should only modify the line containing APACHE2_OPTS" do
-      @filetype.expects(:read).at_least_once.returns(%Q{# Comment\nAPACHE2_OPTS=""\n# Another comment})
-      @filetype.expects(:write).once.with(%Q{# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment})
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{# Comment\nAPACHE2_OPTS=""\n# Another comment} }
+      expect(@filetype).to receive(:write).once.with(%Q{# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment})
 
-      @info.stubs(:should).with(:ensure).returns(:present)
+      allow(@info).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("info" => @info)
       provider_class.flush
     end
 
     it "should restore any arbitrary arguments" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-Y -D MPM -X"})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-Y -X -D INFO -D MPM"})
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-Y -D MPM -X"} }
+      expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-Y -X -D INFO -D MPM"})
 
-      @info.stubs(:should).with(:ensure).returns(:present)
+      allow(@info).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("info" => @info)
       provider_class.flush
     end
 
     it "should backup the file once if changes were made" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} }
+      expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
 
-      @info.stubs(:should).with(:ensure).returns(:present)
+      allow(@info).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("info" => @info)
 
-      @ssl.stubs(:should).with(:ensure).returns(:present)
+      allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("ssl" => @ssl)
 
       @filetype.unstub(:backup)
@@ -165,13 +165,13 @@
     end
 
     it "should not write the file or run backups if no changes were made" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-X -D INFO -D SSL -Y"})
-      @filetype.expects(:write).never
+      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-X -D INFO -D SSL -Y"} }
+      expect(@filetype).to receive(:write).never
 
-      @info.stubs(:should).with(:ensure).returns(:present)
+      allow(@info).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("info" => @info)
 
-      @ssl.stubs(:should).with(:ensure).returns(:present)
+      allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch("ssl" => @ssl)
 
       @filetype.unstub(:backup)

From 4342ae5895188cd72ca58dac36893ce145afd251 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Wed, 19 Oct 2016 18:06:38 +0100
Subject: [PATCH 1002/2267] (MODULES-3983) Update parallel_tests for ruby 2.0.0

---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index c97275bd82..8222ef0a7a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,8 @@ group :development, :unit_tests do
   gem 'rspec-puppet', '>= 2.3.2'
   gem 'rspec-puppet-facts'
   gem 'simplecov'
-  gem 'parallel_tests'
+  gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
+  gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
   gem 'rubocop' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'

From bf9f0d04bb48649c3f5b32a1a7da0ecf89960999 Mon Sep 17 00:00:00 2001
From: Stephen Benjamin <stephen@redhat.com>
Date: Thu, 20 Oct 2016 08:27:14 -0400
Subject: [PATCH 1003/2267] Move ssl.conf to main conf directory on EL7

This is solving a problem with the SSL configuration on a Red Hat-based
OS that results in a duplicate 'Listen 443' statement after a package
update, causing Apache to no longer start.

The mod_ssl packaging ships a default ssl.conf in apache's main conf
dir, that among other things, contains 'Listen 443'.

However, this module puts all the Listen statements in ports.conf
centralized.

Generally this is no problem, because the module would purge the conf
directory.  Apache hums along happily -- until the apache package gets
an update and it restores the default ssl.conf into
/etc/httpd/conf.d/ssl.conf as no such file exists by the name on EL7
(the module's ssl.conf goes into conf.modules.d).

Apache will then fail to start with this error until puppet runs again:

        Address already in use: AH00072: make_sock: could not bind to address 0.0.0.0:443

The RPM won't overwrite the file if it's changed, but it does put it
back when removed.  So to avoid this problem, this change moves the
ssl.conf to the Apache conf dir on EL7. That replaces the one created by
the RPM.

When the package is updated, it won't touch the ssl.conf and apache
will continue to work.
---
 manifests/init.pp    | 1 +
 manifests/mod/ssl.pp | 2 +-
 manifests/params.pp  | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 5293da0d17..a2782507da 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -68,6 +68,7 @@
   $logroot_mode           = $::apache::params::logroot_mode,
   $log_level              = $::apache::params::log_level,
   $log_formats            = {},
+  $ssl_file               = $::apache::params::ssl_file,
   $ports_file             = $::apache::params::ports_file,
   $docroot                = $::apache::params::docroot,
   $apache_version         = $::apache::version::default,
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index a2d9c9055d..2e5a2edf49 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -90,7 +90,7 @@
   # $_apache_version
   file { 'ssl.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/ssl.conf",
+    path    => $::apache::ssl_file,
     mode    => $::apache::file_mode,
     content => template('apache/mod/ssl.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
diff --git a/manifests/params.pp b/manifests/params.pp
index 1f9f60a806..85958d2996 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -74,6 +74,7 @@
     $vhost_dir            = "${httpd_dir}/conf.d"
     $vhost_enable_dir     = undef
     $conf_file            = 'httpd.conf'
+    $ssl_file             = "${confd_dir}/ssl.conf"
     $ports_file           = "${conf_dir}/ports.conf"
     $pidfile              = 'run/httpd.pid'
     $logroot              = '/var/log/httpd'
@@ -210,6 +211,7 @@
     $vhost_dir           = "${httpd_dir}/sites-available"
     $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
     $conf_file           = 'apache2.conf'
+    $ssl_file             = "${mod_dir}/ssl.conf"
     $ports_file          = "${conf_dir}/ports.conf"
     $pidfile             = "\${APACHE_PID_FILE}"
     $logroot             = '/var/log/apache2'
@@ -346,6 +348,7 @@
     $vhost_dir        = "${httpd_dir}/Vhosts"
     $vhost_enable_dir = undef
     $conf_file        = 'httpd.conf'
+    $ssl_file         = "${mod_dir}/ssl.conf"
     $ports_file       = "${conf_dir}/ports.conf"
     $pidfile          = '/var/run/httpd.pid'
     $logroot          = '/var/log/apache24'
@@ -415,6 +418,7 @@
     $vhost_dir        = "${httpd_dir}/vhosts.d"
     $vhost_enable_dir = undef
     $conf_file        = 'httpd.conf'
+    $ssl_file         = "${mod_dir}/ssl.conf"
     $ports_file       = "${conf_dir}/ports.conf"
     $logroot          = '/var/log/apache2'
     $logroot_mode     = undef
@@ -482,6 +486,7 @@
     $vhost_dir           = "${httpd_dir}/sites-available"
     $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
     $conf_file           = 'httpd.conf'
+    $ssl_file            = "${mod_dir}/ssl.conf"
     $ports_file          = "${conf_dir}/ports.conf"
     $pidfile             = '/var/run/httpd2.pid'
     $logroot             = '/var/log/apache2'

From 70d0e06caa8a23d588d855edb1e2d32b09950865 Mon Sep 17 00:00:00 2001
From: floek <mail@floek.net>
Date: Mon, 4 Jul 2016 09:56:31 +0200
Subject: [PATCH 1004/2267] Support Apache 2.4 on SLES 12

---
 manifests/version.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index 527dc6d38d..17092ac6bf 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -36,7 +36,12 @@
       $default = '2.4'
     }
     'Suse': {
-      $default = '2.2'
+      if ($::operatingsystemmajrelease == '12') {
+        $default = '2.4'
+      } else {
+        $default = '2.2'
+      }
+
     }
     default: {
       fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")

From 17db8f6b1550f9ee12e8e77e1c6d199b7bac3e8f Mon Sep 17 00:00:00 2001
From: floek <mail@floek.net>
Date: Thu, 7 Jul 2016 15:31:21 +0200
Subject: [PATCH 1005/2267] Suse has prefork per default

---
 manifests/mod/cgi.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index 91352e8c8d..018d5acbfd 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -1,6 +1,7 @@
 class apache::mod::cgi {
   case $::osfamily {
     'FreeBSD': {}
+    'Suse': {}
     default: {
       Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
     }

From 1729c0e8a89e38756b37260519c4d4d1f46df153 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Thu, 27 Oct 2016 12:04:37 +0100
Subject: [PATCH 1006/2267] Additional SLES fix for version fact

---
 manifests/version.pp         | 3 +--
 spec/classes/mod/ssl_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index 17092ac6bf..dbe67f7dc7 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -36,12 +36,11 @@
       $default = '2.4'
     }
     'Suse': {
-      if ($::operatingsystemmajrelease == '12') {
+      if $::operatingsystem == 'SLES' and $::operatingsystemrelease == '12' {
         $default = '2.4'
       } else {
         $default = '2.2'
       }
-
     }
     default: {
       fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 6b0d8def3e..f787496313 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -103,7 +103,7 @@
       {
         :osfamily               => 'Suse',
         :operatingsystem        => 'SLES',
-        :operatingsystemrelease => '11.2',
+        :operatingsystemrelease => '12',
         :concat_basedir         => '/dne',
         :id                     => 'root',
         :kernel                 => 'Linux',

From 2b543e83252b9676fe9ff255e7c0bb2b19909b7b Mon Sep 17 00:00:00 2001
From: Tom Downes <thomas.downes@ligo.org>
Date: Fri, 28 Oct 2016 16:49:30 -0500
Subject: [PATCH 1007/2267] 1. Allow user to specify alternative package and
 library names from the default. If left undef, they remain the values set in
 params.pp. 2. Fix parameter alignment.

---
 manifests/mod/shib.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index c1fda9324f..318a3a3407 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -1,6 +1,8 @@
 class apache::mod::shib (
   $suppress_warning = false,
-  $mod_full_path = undef,
+  $mod_full_path    = undef,
+  $package_name     = undef,
+  $mod_lib          = undef,
 ) {
   include ::apache
   if $::osfamily == 'RedHat' and ! $suppress_warning {
@@ -10,7 +12,9 @@
   $mod_shib = 'shib2'
 
   apache::mod {$mod_shib:
-    id   => 'mod_shib',
-    path => $mod_full_path,
+    id      => 'mod_shib',
+    path    => $mod_full_path,
+    package => $package_name,
+    lib     => $mod_lib,
   }
 }

From 81f1c12ae9c912615183a3a5592deeff7b50187d Mon Sep 17 00:00:00 2001
From: Ira Abramov <ira.abramov@ownbackup.com>
Date: Tue, 1 Nov 2016 17:11:17 +0200
Subject: [PATCH 1008/2267] Adding support for the PassengerDataBufferDir
 parameter

---
 manifests/mod/passenger.pp       | 1 +
 templates/mod/passenger.conf.erb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 9c8fb14cf3..f40901c1ae 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -19,6 +19,7 @@
   $passenger_app_env                = undef,
   $passenger_log_file               = undef,
   $passenger_log_level              = undef,
+  $passenger_data_buffer_dir        = undef,
   $manage_repo                      = true,
   $mod_package                      = undef,
   $mod_package_ensure               = undef,
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 770cb34e0c..03ff534d25 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -55,4 +55,7 @@
   <%- if @passenger_log_level -%>
   PassengerLogLevel <%= @passenger_log_level %>
   <%- end -%>
+  <%- if @passenger_data_buffer_dir -%>
+  PassengerDataBufferDir <%= @passenger_data_buffer_dir %>
+  <%- end -%>
 </IfModule>

From d810408dcfc3d10f05ac0d2d8b565d9c2f7eb67f Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 2 Nov 2016 16:00:38 -0700
Subject: [PATCH 1009/2267] mocha version update for test hanging issue

---
 .travis.yml | 3 +++
 Gemfile     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6b0a0975f2..e279ee3cb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake validate lint spec"
+#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
+before_install:
+  - gem update bundler
 matrix:
   fast_finish: true
   include:
diff --git a/Gemfile b/Gemfile
index 8222ef0a7a..3abe8bf456 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ group :development, :unit_tests do
   gem 'puppetlabs_spec_helper', '>= 1.2.1'
   gem 'rspec-puppet', '>= 2.3.2'
   gem 'rspec-puppet-facts'
+  gem 'mocha', '< 1.2.0'
   gem 'simplecov'
   gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
   gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
@@ -34,6 +35,7 @@ end
 group :system_tests do
   gem 'beaker', *location_from_env('BEAKER_VERSION', []) if RUBY_VERSION >= '2.3.0'
   gem 'beaker', *location_from_env('BEAKER_VERSION', ['< 3']) if RUBY_VERSION < '2.3.0'
+  gem 'beaker-pe' if RUBY_VERSION >= '2.3.0'
   gem 'beaker-rspec', *location_from_env('BEAKER_RSPEC_VERSION', ['>= 3.4'])
   gem 'serverspec'
   gem 'beaker-puppet_install_helper'

From 8085a9f8efb0feff7cc5374eb617e1bd4a1563df Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Mon, 7 Nov 2016 15:42:45 -0800
Subject: [PATCH 1010/2267] excludes dav_svn tests

---
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 8b26a6b99f..2b15225094 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') do
+describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') || (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') < '11') do
   case fact('osfamily')
   when 'Debian'
     if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04' or fact('operatingsystemmajrelease') == '16.04'

From b71aba6c44e7c4eb996c7a77b1ed388e6651f206 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Mon, 7 Nov 2016 16:08:18 -0800
Subject: [PATCH 1011/2267] adjusts mod package name for SLES 10

---
 manifests/params.pp | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 1f9f60a806..1f9776ee70 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -496,13 +496,23 @@
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
     $php_version         = '5'
-    $mod_packages        = {
-      'auth_kerb'   => 'apache2-mod_auth_kerb',
-      'perl'        => 'apache2-mod_perl',
-      'php5'        => 'apache2-mod_php53',
-      'python'      => 'apache2-mod_python',
-      'security'    => 'apache2-mod_security2',
-    }
+    if $::operatingsystemrelease < '11' {
+      $mod_packages      = {
+        'auth_kerb'   => 'apache2-mod_auth_kerb',
+        'perl'        => 'apache2-mod_perl',
+        'php5'        => 'apache2-mod_php5',
+        'python'      => 'apache2-mod_python',
+        'security'    => 'apache2-mod_security2',
+        }
+      } else {
+          $mod_packages        = {
+            'auth_kerb'   => 'apache2-mod_auth_kerb',
+            'perl'        => 'apache2-mod_perl',
+            'php5'        => 'apache2-mod_php53',
+            'python'      => 'apache2-mod_python',
+            'security'    => 'apache2-mod_security2',
+          }
+      }
     $mod_libs             = {
       'security'       => '/usr/lib64/apache2/mod_security2.so',
       'php53'          => '/usr/lib64/apache2/mod_php5.so',

From 5ed1b42c23b3a85110100f02ca353aa35eff37b0 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Mon, 7 Nov 2016 16:21:18 -0800
Subject: [PATCH 1012/2267] remove mod_security tests for sles 10

---
 spec/acceptance/mod_security_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index c6fa220898..095cce9da0 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::security class', :unless => (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy')) do
+describe 'apache::mod::security class', :unless => (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy')) || (fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') < '11') do
   context "default mod_security config" do
     if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
       it 'adds epel' do

From b8d8967cf14438fe553c764f070af03aa7fee06c Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Tue, 8 Nov 2016 15:08:08 -0800
Subject: [PATCH 1013/2267] (MODULES-3704) Update gemfile template to be
 identical

---
 Gemfile | 103 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 68 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3abe8bf456..8871c66381 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,50 +2,83 @@
 
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-def location_from_env(env, default_location = [])
-  if location = ENV[env]
-    if location =~ /^((?:git|https?)[:@][^#]*)#(.*)/
-      [{ :git => $1, :branch => $2, :require => false }]
-    elsif location =~ /^file:\/\/(.*)/
-      ['>= 0', { :path => File.expand_path($1), :require => false }]
-    else
-      [location, { :require => false }]
-    end
+# Determines what type of gem is requested based on place_or_version.
+def gem_type(place_or_version)
+  if place_or_version =~ /^git:/
+    :git
+  elsif place_or_version =~ /^file:/
+    :file
   else
-    default_location
+    :gem
   end
 end
 
-group :development, :unit_tests do
-  gem 'metadata-json-lint'
-  gem 'puppet_facts'
-  gem 'puppet-blacksmith', '>= 3.4.0'
-  gem 'puppetlabs_spec_helper', '>= 1.2.1'
-  gem 'rspec-puppet', '>= 2.3.2'
-  gem 'rspec-puppet-facts'
-  gem 'mocha', '< 1.2.0'
-  gem 'simplecov'
-  gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
-  gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
-  gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
-  gem 'rubocop' if RUBY_VERSION >= '2.0.0'
-  gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'
-  gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
+# Find a location or specific version for a gem. place_or_version can be a
+# version, which is most often used. It can also be git, which is specified as
+# `git://somewhere.git#branch`. You can also use a file source location, which
+# is specified as `file://some/location/on/disk`.
+def location_for(place_or_version, fake_version = nil)
+  if place_or_version =~ /^(git[:@][^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place_or_version =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place_or_version, { :require => false }]
+  end
+end
+
+# Used for gem conditionals
+supports_windows = false
+
+group :development do
+  gem 'puppet-lint',                        :require => false
+  gem 'metadata-json-lint',                 :require => false
+  gem 'puppet_facts',                       :require => false
+  gem 'puppet-blacksmith', '>= 3.4.0',      :require => false, :platforms => 'ruby'
+  gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
+  gem 'rspec-puppet', '>= 2.3.2',           :require => false
+  gem 'rspec-puppet-facts',                 :require => false
+  gem 'mocha', '< 1.2.0',                   :require => false
+  gem 'simplecov',                          :require => false
+  gem 'parallel_tests', '< 2.10.0',         :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+  gem 'parallel_tests',                     :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
+  gem 'rubocop', '0.41.2',                  :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+  gem 'rubocop',                            :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
+  gem 'rubocop-rspec', '~> 1.6',            :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
+  gem 'pry',                                :require => false
+  gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
 end
+
 group :system_tests do
-  gem 'beaker', *location_from_env('BEAKER_VERSION', []) if RUBY_VERSION >= '2.3.0'
-  gem 'beaker', *location_from_env('BEAKER_VERSION', ['< 3']) if RUBY_VERSION < '2.3.0'
-  gem 'beaker-pe' if RUBY_VERSION >= '2.3.0'
-  gem 'beaker-rspec', *location_from_env('BEAKER_RSPEC_VERSION', ['>= 3.4'])
-  gem 'serverspec'
-  gem 'beaker-puppet_install_helper'
-  gem 'master_manipulator'
-  gem 'beaker-hostgenerator', *location_from_env('BEAKER_HOSTGENERATOR_VERSION', [])
+  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20')                if supports_windows
+  gem 'beaker', *location_for(ENV['BEAKER_VERSION'])                             if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0') and ! supports_windows
+  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '< 3')                    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') and ! supports_windows
+  gem 'beaker-pe',                                                               :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
+  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')     if ! supports_windows
+  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')     if supports_windows
+  gem 'beaker-puppet_install_helper',                                            :require => false
+  gem 'master_manipulator',                                                      :require => false
+  gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
 end
 
-gem 'facter', *location_from_env('FACTER_GEM_VERSION')
-gem 'puppet', *location_from_env('PUPPET_GEM_VERSION')
+gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 
+# Only explicitly specify Facter/Hiera if a version has been specified.
+# Otherwise it can lead to strange bundler behavior. If you are seeing weird
+# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable
+# to `1` and then run bundle install.
+gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
+gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
+
+
+# Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
+
+# Evaluate ~/.gemfile if it exists
+if File.exists?(File.join(Dir.home, '.gemfile'))
+  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
+end
+
+# vim:ft=ruby

From bbc35cc01be5abfaa077f9c9debfe15abefecdb6 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 9 Nov 2016 11:39:49 -0800
Subject: [PATCH 1014/2267] proxypassmatch not supported on sles 10 apache

---
 manifests/params.pp           |  10 ++-
 spec/acceptance/vhost_spec.rb | 130 ++++++++++++++++++----------------
 2 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 1f9776ee70..a16b7ef08a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -489,8 +489,13 @@
     $lib_path            = '/usr/lib64/apache2-prefork'
     $suse_lib_path       = '/usr/lib64/apache2'
     $mpm_module          = 'prefork'
-    $default_ssl_cert    = '/etc/ssl/servercerts/servercert.pem'
-    $default_ssl_key     = '/etc/ssl/servercerts/serverkey.pem'
+    if $::operatingsystemrelease < '11' {
+      $default_ssl_cert    = '/etc/apache2/ssl.crt/snakeoil-rsa.crt'
+      $default_ssl_key     = '/etc/apache2/ssl.key/snakeoil-rsa.key'
+      } else {
+        $default_ssl_cert    = '/etc/ssl/servercerts/servercert.pem'
+        $default_ssl_key     = '/etc/ssl/servercerts/serverkey.pem'
+      }
     $ssl_certs_dir       = '/etc/ssl/certs'
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
@@ -502,7 +507,6 @@
         'perl'        => 'apache2-mod_perl',
         'php5'        => 'apache2-mod_php5',
         'python'      => 'apache2-mod_python',
-        'security'    => 'apache2-mod_security2',
         }
       } else {
           $mod_packages        = {
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 8adbde53bf..89f1af27d8 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -120,31 +120,33 @@ class { 'apache': }
     end
   end
 
-  context 'new proxy vhost on port 80' do
-    it 'should configure an apache proxy vhost' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'proxy.example.com':
-          port    => '80',
-          docroot => '/var/www/proxy',
-          proxy_pass_match => [
-            { 'path' => '/foo', 'url' => 'http://backend-foo/'},
-          ],
-        proxy_preserve_host   => true,
-        proxy_error_override  => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
+  unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') <= '10')
+    context 'new proxy vhost on port 80' do
+      it 'should configure an apache proxy vhost' do
+        pp = <<-EOS
+          class { 'apache': }
+          apache::vhost { 'proxy.example.com':
+            port    => '80',
+            docroot => '#{$docroot}/proxy',
+            proxy_pass_match => [
+              { 'path' => '/foo', 'url' => 'http://backend-foo/'},
+            ],
+          proxy_preserve_host   => true,
+          proxy_error_override  => true,
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
 
-    describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
-      it { is_expected.to contain '<VirtualHost \*:80>' }
-      it { is_expected.to contain "ServerName proxy.example.com" }
-      it { is_expected.to contain "ProxyPassMatch /foo http://backend-foo/" }
-      it { is_expected.to contain "ProxyPreserveHost On" }
-      it { is_expected.to contain "ProxyErrorOverride On" }
-      it { is_expected.not_to contain "ProxyAddHeaders" }
-      it { is_expected.not_to contain "<Proxy \*>" }
+      describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
+        it { is_expected.to contain '<VirtualHost \*:80>' }
+        it { is_expected.to contain "ServerName proxy.example.com" }
+        it { is_expected.to contain "ProxyPassMatch /foo http://backend-foo/" }
+        it { is_expected.to contain "ProxyPreserveHost On" }
+        it { is_expected.to contain "ProxyErrorOverride On" }
+        it { is_expected.not_to contain "ProxyAddHeaders" }
+        it { is_expected.not_to contain "<Proxy \*>" }
+      end
     end
   end
 
@@ -664,47 +666,49 @@ class { 'apache': default_vhost => false, }
     end
   end
 
-  context 'proxy_pass_match for alternative vhost' do
-    it 'should configure a local vhost and a proxy vhost' do
-      apply_manifest(%{
-        class { 'apache': default_vhost => false, }
-        apache::vhost { 'localhost':
-          docroot => '/var/www/local',
-          ip      => '127.0.0.1',
-          port    => '8888',
-        }
-        apache::listen { '*:80': }
-        apache::vhost { 'proxy.example.com':
-          docroot    => '/var/www',
-          port       => '80',
-          add_listen => false,
-          proxy_pass_match => {
-            'path' => '/',
-            'url'  => 'http://localhost:8888/subdir/',
-          },
-        }
-        host { 'proxy.example.com': ip => '127.0.0.1', }
-        file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
-        file { '/var/www/local/subdir/index.html':
-          ensure  => file,
-          content => "Hello from localhost\\n",
-        }
-                     }, :catch_failures => true)
-    end
+  unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') <= '10')
+    context 'proxy_pass_match for alternative vhost' do
+      it 'should configure a local vhost and a proxy vhost' do
+        apply_manifest(%{
+          class { 'apache': default_vhost => false, }
+          apache::vhost { 'localhost':
+            docroot => '/var/www/local',
+            ip      => '127.0.0.1',
+            port    => '8888',
+          }
+          apache::listen { '*:80': }
+          apache::vhost { 'proxy.example.com':
+            docroot    => '/var/www',
+            port       => '80',
+            add_listen => false,
+            proxy_pass_match => {
+              'path' => '/',
+              'url'  => 'http://localhost:8888/subdir/',
+            },
+          }
+          host { 'proxy.example.com': ip => '127.0.0.1', }
+          file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
+          file { '/var/www/local/subdir/index.html':
+            ensure  => file,
+            content => "Hello from localhost\\n",
+          }
+                      }, :catch_failures => true)
+      end
 
-    describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      else
-        it { should be_enabled }
+      describe service($service_name) do
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
+        it { is_expected.to be_running }
       end
-      it { is_expected.to be_running }
-    end
 
-    it 'should get a response from the back end' do
-      shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
-        expect(r.stdout).to eq("Hello from localhost\n")
-        expect(r.exit_code).to eq(0)
+      it 'should get a response from the back end' do
+        shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
+          expect(r.stdout).to eq("Hello from localhost\n")
+          expect(r.exit_code).to eq(0)
+        end
       end
     end
   end
@@ -1348,7 +1352,7 @@ class { 'apache::mod::wsgi': }
       end
     end
 
-    context 'on everything but lucid', :unless => (fact('lsbdistcodename') == 'lucid' or (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') < '12')) do
+    context 'on everything but lucid', :unless => (fact('lsbdistcodename') == 'lucid' or fact('operatingsystem') == 'SLES') do
       it 'import_script applies cleanly' do
         pp = <<-EOS
           class { 'apache': }

From fbba758d89520eabe6787c69a549563af90e3c65 Mon Sep 17 00:00:00 2001
From: Ira Abramov <ira.abramov@ownbackup.com>
Date: Mon, 14 Nov 2016 14:30:17 +0200
Subject: [PATCH 1015/2267] Add documentation for the new option as well.

---
 README.md                  | 1 +
 manifests/mod/passenger.pp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 10d6081c7f..9cc2625b23 100644
--- a/README.md
+++ b/README.md
@@ -1692,6 +1692,7 @@ Installs and manages [`mod_passenger`][]. For RedHat based systems, please ensur
 - `passenger_max_pool_size` Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize). Default: undef.
 - `passenger_max_request_queue_size` Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize). Default: undef.
 - `passenger_max_requests` Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests). Default: undef.
+- `passenger_data_buffer_dir` Sets the [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir). Default: undef.
 
 ##### Class: `apache::mod::ldap`
 
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index f40901c1ae..ead0700afa 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -100,6 +100,7 @@
   # - $passenger_log_file
   # - $passenger_log_level
   # - $passenger_app_env
+  # - $passenger_data_buffer_dir
   # - $rack_autodetect
   # - $rails_autodetect
   file { 'passenger.conf':

From b3ebce2b902c2aa62da8336cd816172fde5837b3 Mon Sep 17 00:00:00 2001
From: iamspido <spido_spido@t-online.de>
Date: Wed, 16 Nov 2016 12:15:35 +0100
Subject: [PATCH 1016/2267] Fix vhost template

fix vhost template file causing unexpected tIDENTIFIER
---
 templates/vhost/_require.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_require.erb b/templates/vhost/_require.erb
index d6252deeb2..9ad7805393 100644
--- a/templates/vhost/_require.erb
+++ b/templates/vhost/_require.erb
@@ -2,8 +2,8 @@
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   <%- if _item['require'] && _item['require'] != '' && _item['require'] !~ /unmanaged/i -%>
     <%- if _item['require'].is_a?(Hash) -%>
-      <%- case _item['require']['enforce'].downcase -%>
-      <%- when 'all','none','any' then -%>
+      <%- case _item['require']['enforce'].downcase
+          when 'all','none','any' then -%>
     <Require<%= _item['require']['enforce'].capitalize %>>
         <%- Array(_item['require']['requires']).each do |req| -%>
       Require <%= req.strip %>

From 3cb0be0c8cca59f9c44334f1d5d4da62098d96b5 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 17 Nov 2016 10:29:36 +0200
Subject: [PATCH 1017/2267] Validate wsgi_chunked_request parameter for vhost

Same as with wsgi_pass_authorization, it only accepts on and off as
values (ignoring the case). So this introduces a similar validation
for wsgi_chunked_request.
---
 manifests/vhost.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5644ba82ca..1a97823834 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -209,6 +209,12 @@
     Allowed values are 'on' and 'off'.")
   }
 
+  if $wsgi_chunked_request {
+    validate_re(downcase($wsgi_chunked_request), '^(on|off)$',
+    "${wsgi_chunked_request} is not supported for wsgi_chunked_request.
+    Allowed values are 'on' and 'off'.")
+  }
+
   # Deprecated backwards-compatibility
   if $rewrite_base {
     warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')

From a3f4d1519dca042e56d3c8310b702a3516db7d66 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Mon, 14 Nov 2016 22:01:04 -0800
Subject: [PATCH 1018/2267] sles 12 support

---
 .gitignore                            |   1 +
 manifests/mod/cgi.pp                  |  10 +-
 manifests/mod/cgid.pp                 |  11 +-
 manifests/mod/dav_svn.pp              |  26 +--
 manifests/mod/info.pp                 |  15 +-
 manifests/mod/passenger.pp            |   2 +-
 manifests/mod/php.pp                  |   3 +-
 manifests/mod/prefork.pp              |   8 +-
 manifests/mod/security.pp             |  21 +--
 manifests/mod/ssl.pp                  |  16 +-
 manifests/mod/worker.pp               |  13 +-
 manifests/mpm.pp                      |  47 +++--
 manifests/params.pp                   |  32 ++--
 manifests/version.pp                  |   2 +-
 spec/acceptance/mod_pagespeed_spec.rb |   2 +-
 spec/acceptance/mod_php_spec.rb       | 248 +++++++++++++-------------
 spec/acceptance/vhost_spec.rb         |   7 +-
 17 files changed, 255 insertions(+), 209 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0cd25de9af..25cb3cc50f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ coverage/
 log/
 .idea/
 *.iml
+tmp/
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index 018d5acbfd..b03e8f05d5 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -1,11 +1,17 @@
 class apache::mod::cgi {
   case $::osfamily {
     'FreeBSD': {}
-    'Suse': {}
     default: {
       Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
     }
   }
 
-  ::apache::mod { 'cgi': }
+  if $::osfamily == 'Suse' {
+    ::apache::mod { 'cgi':
+      lib_path => '/usr/lib64/apache2-prefork'
+    }
+  } else {
+    ::apache::mod { 'cgi': }
+  }
+
 }
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 9b9788f24b..7d38197132 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -18,13 +18,14 @@
     default   => undef,
   }
 
-  if $::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12' {
+  if $::osfamily == 'Suse' {
     ::apache::mod { 'cgid':
-      lib_path => '/usr/lib64/apache2-worker',
-    }
-    } else {
-      ::apache::mod { 'cgid': }
+      lib_path => '/usr/lib64/apache2-worker'
     }
+  } else {
+    ::apache::mod { 'cgid': }
+  }
+
   if $cgisock_path {
     # Template uses $cgisock_path
     file { 'cgid.conf':
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index b7d4d81a07..35d5417b52 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -5,17 +5,13 @@
   include ::apache
   include ::apache::mod::dav
   if($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){
-    $suse_lib_path = $::apache::params::suse_lib_path
     package { 'subversion-server':
       ensure   => 'installed',
       provider => 'zypper',
     }
-    ::apache::mod {'dav_svn':
-      lib_path => $suse_lib_path
-    }
-    } else {
-      ::apache::mod { 'dav_svn': }
-    }
+  }
+
+  ::apache::mod { 'dav_svn': }
 
   if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04' and $::operatingsystemmajrelease != '16.04') {
     $loadfile_name = undef
@@ -24,17 +20,9 @@
   }
 
   if $authz_svn_enabled {
-    if ($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){
-      ::apache::mod { 'authz_svn':
-        loadfile_name => $loadfile_name,
-        lib_path      => $suse_lib_path,
-        require       => Apache::Mod['dav_svn'],
-      }
-      } else {
-        ::apache::mod { 'authz_svn':
-          loadfile_name => $loadfile_name,
-          require       => Apache::Mod['dav_svn'],
-        }
-      }
+    ::apache::mod { 'authz_svn':
+      loadfile_name => $loadfile_name,
+      require       => Apache::Mod['dav_svn'],
+    }
   }
 }
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 5f4ffa7c95..5af7b8d96b 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -6,7 +6,20 @@
 ){
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
-  apache::mod { 'info': }
+
+  if $::osfamily == 'Suse' {
+    if defined(Class['::apache::mod::worker']){
+      $suse_path = '/usr/lib64/apache2-worker'
+    } else {
+      $suse_path = '/usr/lib64/apache2-prefork'
+    }
+    ::apache::mod { 'info':
+      lib_path => $suse_path
+    }
+  } else {
+    ::apache::mod { 'info': }
+  }
+
   # Template uses $allow_from, $_apache_version
   file { 'info.conf':
     ensure  => file,
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 9c8fb14cf3..a5febd69d1 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -70,7 +70,7 @@
     }
   }
 
-  unless ($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12') {
+  unless ($::operatingsystem == 'SLES') {
     $_id = $mod_id
     $_path = $mod_path
     ::apache::mod { 'passenger':
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 16c39873f7..7743b083e0 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -53,13 +53,12 @@
   $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
 
   if $::operatingsystem == 'SLES' {
-    $suse_lib_path = $::apache::params::suse_lib_path
       ::apache::mod { $mod:
         package        => $_package_name,
         package_ensure => $package_ensure,
         lib            => 'mod_php5.so',
         id             => "php${_php_major}_module",
-        path           => "${suse_lib_path}/mod_php5.so",
+        path           => "${::apache::lib_path}/mod_php5.so",
       }
     } else {
       ::apache::mod { $mod:
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 85d8b84d4c..c09ede4de6 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -60,11 +60,17 @@
         }
       }
     }
-    'debian', 'freebsd', 'Suse' : {
+    'debian', 'freebsd': {
       ::apache::mpm{ 'prefork':
         apache_version => $apache_version,
       }
     }
+    'Suse': {
+      ::apache::mpm{ 'prefork':
+        apache_version => $apache_version,
+        lib_path       => '/usr/lib64/apache2-prefork',
+      }
+    }
     'gentoo': {
       ::portage::makeconf { 'apache2_mpms':
         content => 'prefork',
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 80c92d755f..d4f67c1f11 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -31,19 +31,14 @@
     fail('FreeBSD is not currently supported')
   }
 
-  if $::operatingsystem == 'SLES' {
-    $suse_lib_path  = $::apache::params::suse_lib_path
-      ::apache::mod { 'security':
-        id       => 'security2_module',
-        lib_path => $suse_lib_path,
-        lib      => 'mod_security2.so',
-      }
-    } else {
-      ::apache::mod { 'security':
-        id  => 'security2_module',
-        lib => 'mod_security2.so',
-      }
-    }
+  if ($::osfamily == 'Suse' and $::operatingsystemrelease < '11') {
+    fail('SLES 10 is not currently supported.')
+  }
+
+  ::apache::mod { 'security':
+    id  => 'security2_module',
+    lib => 'mod_security2.so',
+  }
 
 
   ::apache::mod { 'unique_id_module':
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index a2d9c9055d..1d827e48ed 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -67,8 +67,20 @@
     'Suse'    => '/var/lib/apache2/ssl_scache(512000)'
   }
 
-  ::apache::mod { 'ssl':
-    package => $package_name,
+  if $::osfamily == 'Suse' {
+    if defined(Class['::apache::mod::worker']){
+      $suse_path = '/usr/lib64/apache2-worker'
+    } else {
+      $suse_path = '/usr/lib64/apache2-worker'
+    }
+    ::apache::mod { 'ssl':
+      package  => $package_name,
+      lib_path => $suse_path
+    }
+  } else {
+    ::apache::mod { 'ssl':
+      package => $package_name,
+    }
   }
 
   if versioncmp($_apache_version, '2.4') >= 0 {
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 9e417e0c41..c9e01600ee 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -103,7 +103,7 @@
   case $::osfamily {
     'redhat': {
       if versioncmp($apache_version, '2.4') >= 0 {
-        ::apache::mpm{ 'worker':
+        ::apache::mpm { 'worker':
           apache_version => $apache_version,
         }
       }
@@ -118,11 +118,18 @@
         }
       }
     }
-    'debian', 'freebsd', 'Suse': {
-      ::apache::mpm{ 'worker':
+    'debian', 'freebsd': {
+      ::apache::mpm { 'worker':
         apache_version => $apache_version,
       }
     }
+    'Suse': {
+      ::apache::mpm { 'worker':
+        apache_version => $apache_version,
+        lib_path       => '/usr/lib64/apache2-worker',
+      }
+    }
+
     'gentoo': {
       ::portage::makeconf { 'apache2_mpms':
         content => 'worker',
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index b5a009610e..1fe9684e77 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -13,19 +13,36 @@
   $_path = "${lib_path}/${_lib}"
   $_id   = "mpm_${mpm}_module"
 
-  if versioncmp($apache_version, '2.4') >= 0 {
-    file { "${mod_dir}/${mpm}.load":
-      ensure  => file,
-      path    => "${mod_dir}/${mpm}.load",
-      content => "LoadModule ${_id} ${_path}\n",
-      require => [
-        Package['httpd'],
-        Exec["mkdir ${mod_dir}"],
-      ],
-      before  => File[$mod_dir],
-      notify  => Class['apache::service'],
+  if $::osfamily == 'Suse' {
+    #mpms on Suse 12 don't use .so libraries so create a placeholder load file
+    if versioncmp($apache_version, '2.4') >= 0 {
+      file { "${mod_dir}/${mpm}.load":
+        ensure  => file,
+        path    => "${mod_dir}/${mpm}.load",
+        content => '',
+        require => [
+          Package['httpd'],
+          Exec["mkdir ${mod_dir}"],
+        ],
+        before  => File[$mod_dir],
+        notify  => Class['apache::service'],
+      }
+    }
+  } else {
+      if versioncmp($apache_version, '2.4') >= 0 {
+        file { "${mod_dir}/${mpm}.load":
+          ensure  => file,
+          path    => "${mod_dir}/${mpm}.load",
+          content => "LoadModule ${_id} ${_path}\n",
+          require => [
+            Package['httpd'],
+            Exec["mkdir ${mod_dir}"],
+          ],
+          before  => File[$mod_dir],
+          notify  => Class['apache::service'],
+        }
+      }
     }
-  }
 
   case $::osfamily {
     'debian': {
@@ -120,10 +137,8 @@
         }
       }
 
-      if versioncmp($apache_version, '2.4') < 0 {
-        package { "apache2-${mpm}":
-          ensure => present,
-        }
+      package { "apache2-${mpm}":
+        ensure => present,
       }
     }
     default: {
diff --git a/manifests/params.pp b/manifests/params.pp
index a16b7ef08a..36e3afa41c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -486,37 +486,33 @@
     $pidfile             = '/var/run/httpd2.pid'
     $logroot             = '/var/log/apache2'
     $logroot_mode        = undef
-    $lib_path            = '/usr/lib64/apache2-prefork'
-    $suse_lib_path       = '/usr/lib64/apache2'
+    $lib_path            = '/usr/lib64/apache2' #changes for some modules based on mpm
     $mpm_module          = 'prefork'
-    if $::operatingsystemrelease < '11' {
-      $default_ssl_cert    = '/etc/apache2/ssl.crt/snakeoil-rsa.crt'
-      $default_ssl_key     = '/etc/apache2/ssl.key/snakeoil-rsa.key'
-      } else {
-        $default_ssl_cert    = '/etc/ssl/servercerts/servercert.pem'
-        $default_ssl_key     = '/etc/ssl/servercerts/serverkey.pem'
-      }
+    $default_ssl_cert    = '/etc/apache2/ssl.crt/server.crt'
+    $default_ssl_key     = '/etc/apache2/ssl.key/server.key'
     $ssl_certs_dir       = '/etc/ssl/certs'
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
     $php_version         = '5'
-    if $::operatingsystemrelease < '11' {
+    if $::operatingsystemrelease < '11' or $::operatingsystemrelease >= '12' {
       $mod_packages      = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
         'perl'        => 'apache2-mod_perl',
         'php5'        => 'apache2-mod_php5',
         'python'      => 'apache2-mod_python',
+        'security'    => 'apache2-mod_security2',
+        'worker'      => 'apache2-worker'
         }
-      } else {
-          $mod_packages        = {
-            'auth_kerb'   => 'apache2-mod_auth_kerb',
-            'perl'        => 'apache2-mod_perl',
-            'php5'        => 'apache2-mod_php53',
-            'python'      => 'apache2-mod_python',
-            'security'    => 'apache2-mod_security2',
-          }
+    } else {
+      $mod_packages        = {
+        'auth_kerb'   => 'apache2-mod_auth_kerb',
+        'perl'        => 'apache2-mod_perl',
+        'php5'        => 'apache2-mod_php53',
+        'python'      => 'apache2-mod_python',
+        'security'    => 'apache2-mod_security2',
       }
+    }
     $mod_libs             = {
       'security'       => '/usr/lib64/apache2/mod_security2.so',
       'php53'          => '/usr/lib64/apache2/mod_php5.so',
diff --git a/manifests/version.pp b/manifests/version.pp
index dbe67f7dc7..2d33a5f4fb 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -36,7 +36,7 @@
       $default = '2.4'
     }
     'Suse': {
-      if $::operatingsystem == 'SLES' and $::operatingsystemrelease == '12' {
+      if $::operatingsystem == 'SLES' and $::operatingsystemrelease >= '12' {
         $default = '2.4'
       } else {
         $default = '2.2'
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 74d507745b..c88d594484 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -6,7 +6,7 @@
 describe 'apache::mod::pagespeed class', :unless =>
   ((fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') < '8') or
    (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') < '12') or
-   (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') < '12')) do
+   (fact('operatingsystem') == 'SLES' )) do
   context "default pagespeed config" do
     it 'succeeds in puppeting pagespeed' do
       pp= <<-EOS
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index cff4a4dbad..45b901fae9 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,150 +1,152 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::php class' do
-  context "default php config" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::php': }
-        apache::vhost { 'php.example.com':
-          port    => '80',
-          docroot => '#{$doc_root}/php',
-        }
-        host { 'php.example.com': ip => '127.0.0.1', }
-        file { '#{$doc_root}/php/index.php':
-          ensure  => file,
-          content => "<?php phpinfo(); ?>\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      else
-        it { should be_enabled }
+unless (fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') == '12.0')
+  describe 'apache::mod::php class' do
+    context "default php config" do
+      it 'succeeds in puppeting php' do
+        pp= <<-EOS
+          class { 'apache':
+            mpm_module => 'prefork',
+          }
+          class { 'apache::mod::php': }
+          apache::vhost { 'php.example.com':
+            port    => '80',
+            docroot => '#{$doc_root}/php',
+          }
+          host { 'php.example.com': ip => '127.0.0.1', }
+          file { '#{$doc_root}/php/index.php':
+            ensure  => file,
+            content => "<?php phpinfo(); ?>\\n",
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
       end
-      it { is_expected.to be_running }
-    end
 
-    if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
-      describe file("#{$mod_dir}/php7.0.conf") do
-        it { is_expected.to contain "DirectoryIndex index.php" }
+      describe service($service_name) do
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
+        it { is_expected.to be_running }
       end
-    else
-      describe file("#{$mod_dir}/php5.conf") do
-        it { is_expected.to contain "DirectoryIndex index.php" }
+
+      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+        describe file("#{$mod_dir}/php7.0.conf") do
+          it { is_expected.to contain "DirectoryIndex index.php" }
+        end
+      else
+        describe file("#{$mod_dir}/php5.conf") do
+          it { is_expected.to contain "DirectoryIndex index.php" }
+        end
       end
-    end
 
-    it 'should answer to php.example.com' do
-      shell("/usr/bin/curl php.example.com:80") do |r|
-        expect(r.stdout).to match(/PHP Version/)
-        expect(r.exit_code).to eq(0)
+      it 'should answer to php.example.com' do
+        shell("/usr/bin/curl php.example.com:80") do |r|
+          expect(r.stdout).to match(/PHP Version/)
+          expect(r.exit_code).to eq(0)
+        end
       end
     end
-  end
 
-  context "custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::php':
-          extensions => ['.php','.php5'],
-        }
-        apache::vhost { 'php.example.com':
-          port             => '80',
-          docroot          => '#{$doc_root}/php',
-          php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
-          php_flags        => { 'display_errors' => 'on', },
-          php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
-          php_admin_flags  => { 'engine' => 'on', },
-        }
-        host { 'php.example.com': ip => '127.0.0.1', }
-        file { '#{$doc_root}/php/index.php5':
-          ensure  => file,
-          content => "<?php phpinfo(); ?>\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
+    context "custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value" do
+      it 'succeeds in puppeting php' do
+        pp= <<-EOS
+          class { 'apache':
+            mpm_module => 'prefork',
+          }
+          class { 'apache::mod::php':
+            extensions => ['.php','.php5'],
+          }
+          apache::vhost { 'php.example.com':
+            port             => '80',
+            docroot          => '#{$doc_root}/php',
+            php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
+            php_flags        => { 'display_errors' => 'on', },
+            php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
+            php_admin_flags  => { 'engine' => 'on', },
+          }
+          host { 'php.example.com': ip => '127.0.0.1', }
+          file { '#{$doc_root}/php/index.php5':
+            ensure  => file,
+            content => "<?php phpinfo(); ?>\\n",
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
 
-    describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      else
-        it { should be_enabled }
+      describe service($service_name) do
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
+        end
+        it { is_expected.to be_running }
       end
-      it { is_expected.to be_running }
-    end
 
-    describe file("#{$vhost_dir}/25-php.example.com.conf") do
-      it { is_expected.to contain "  php_flag display_errors on" }
-      it { is_expected.to contain "  php_value include_path \".:/usr/share/pear:/usr/bin/php\"" }
-      it { is_expected.to contain "  php_admin_flag engine on" }
-      it { is_expected.to contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
-    end
+      describe file("#{$vhost_dir}/25-php.example.com.conf") do
+        it { is_expected.to contain "  php_flag display_errors on" }
+        it { is_expected.to contain "  php_value include_path \".:/usr/share/pear:/usr/bin/php\"" }
+        it { is_expected.to contain "  php_admin_flag engine on" }
+        it { is_expected.to contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
+      end
 
-    it 'should answer to php.example.com' do
-      shell("/usr/bin/curl php.example.com:80") do |r|
-        expect(r.stdout).to match(/\/usr\/share\/pear\//)
-        expect(r.exit_code).to eq(0)
+      it 'should answer to php.example.com' do
+        shell("/usr/bin/curl php.example.com:80") do |r|
+          expect(r.stdout).to match(/\/usr\/share\/pear\//)
+          expect(r.exit_code).to eq(0)
+        end
       end
     end
-  end
 
-  context "provide custom config file" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content => '# somecontent',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-    if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
-      describe file("#{$mod_dir}/php7.0.conf") do
-        it { should contain "# somecontent" }
+    context "provide custom config file" do
+      it 'succeeds in puppeting php' do
+        pp= <<-EOS
+          class {'apache':
+            mpm_module => 'prefork',
+          }
+          class {'apache::mod::php':
+            content => '# somecontent',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
       end
-    else
-      describe file("#{$mod_dir}/php5.conf") do
-        it { should contain "# somecontent" }
+      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+        describe file("#{$mod_dir}/php7.0.conf") do
+          it { should contain "# somecontent" }
+        end
+      else
+        describe file("#{$mod_dir}/php5.conf") do
+          it { should contain "# somecontent" }
+        end
       end
     end
-  end
-
-  context "provide content and template config file" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content  => '# somecontent',
-          template => 'apache/mod/php5.conf.erb',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
 
-    if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
-      describe file("#{$mod_dir}/php7.0.conf") do
-        it { should contain "# somecontent" }
+    context "provide content and template config file" do
+      it 'succeeds in puppeting php' do
+        pp= <<-EOS
+          class {'apache':
+            mpm_module => 'prefork',
+          }
+          class {'apache::mod::php':
+            content  => '# somecontent',
+            template => 'apache/mod/php5.conf.erb',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
       end
-    else
-      describe file("#{$mod_dir}/php5.conf") do
-        it { should contain "# somecontent" }
+
+      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+        describe file("#{$mod_dir}/php7.0.conf") do
+          it { should contain "# somecontent" }
+        end
+      else
+        describe file("#{$mod_dir}/php5.conf") do
+          it { should contain "# somecontent" }
+        end
       end
     end
-  end
 
+  end
 end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 89f1af27d8..bf90df19e3 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -10,6 +10,9 @@ class { 'apache':
           default_ssl_vhost => false,
           service_ensure => stopped
         }
+        if ($::osfamily == 'Suse') {
+          exec { '/usr/bin/gensslcert': }
+         }
       EOS
 
       apply_manifest(pp, :catch_failures => true)
@@ -830,6 +833,8 @@ class { 'apache': }
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       elsif fact('operatingsystem') == 'Debian' and fact('operatingsystemmajrelease') == '8'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
+      elsif fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') >= '12'
+        it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
         it { is_expected.to contain 'NameVirtualHost test.server' }
       end
@@ -1141,7 +1146,7 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'rack_base_uris' do
-    unless fact('osfamily') == 'RedHat' or (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') < '12')
+    unless fact('osfamily') == 'RedHat' or fact('operatingsystem') == 'SLES'
       it 'applies cleanly' do
         test = lambda do
           pp = <<-EOS

From e77d58bb7f032dffa8fc4da40c08d22ee81e5068 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Tue, 22 Nov 2016 11:45:01 -0800
Subject: [PATCH 1019/2267] fixes version errors and small fix for suse ssl

---
 spec/acceptance/vhost_spec.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index bf90df19e3..200a83d22e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -8,10 +8,12 @@
         class { 'apache':
           default_vhost => false,
           default_ssl_vhost => false,
-          service_ensure => stopped
+          service_ensure => stopped,
         }
         if ($::osfamily == 'Suse') {
-          exec { '/usr/bin/gensslcert': }
+          exec { '/usr/bin/gensslcert':
+            require => Class['apache'],
+          }
          }
       EOS
 
@@ -312,7 +314,7 @@ class { 'apache':
         pp = <<-EOS
           class { 'apache': }
 
-          if versioncmp($apache::apache_version, '2.4') >= 0 {
+          if versioncmp($apache_version, '2.4') >= 0 {
             $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
           } else {
             $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
@@ -360,7 +362,7 @@ class { 'apache': }
         pp = <<-EOS
           class { 'apache': }
 
-          if versioncmp($apache::apache_version, '2.4') >= 0 {
+          if versioncmp($apache_version, '2.4') >= 0 {
             $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
           } else {
             $_files_match_directory = [

From 54ee3e30be0bfd7187191aed39e5a426163912be Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 23 Nov 2016 13:11:26 -0800
Subject: [PATCH 1020/2267] adds to conditional to allow for empty servername

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5644ba82ca..6d8dbc1d7d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -450,7 +450,7 @@
     } else {
       $listen_addr_port = undef
       $nvh_addr_port = $name
-      if ! $servername {
+      if ! $servername and $servername != '' {
         fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters, and/or 'servername' parameter")
       }
     }

From ff121fd6c3f102d9cadd43bb6dc80bd3f186f000 Mon Sep 17 00:00:00 2001
From: Stephen Benjamin <stephen@redhat.com>
Date: Mon, 28 Nov 2016 14:56:50 -0500
Subject: [PATCH 1021/2267] README update to account for location of ssl.conf
 on Red Hat OS's

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9cc2625b23..0d45ee9c23 100644
--- a/README.md
+++ b/README.md
@@ -1849,7 +1849,7 @@ Defining this class enables Shibboleth-specific parameters in `apache::vhost` in
 
 ##### Class: `apache::mod::ssl`
 
-Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration.
+Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration.  On most operating systems, this ssl.conf is placed in the module configuration directory, however on Red Hat-based operating systems it is placed in the confd directory (/etc/httpd/conf.d), the same location the RPM stores the configuration.
 
 **Parameters within `apache::mod::ssl`**:
 

From e33c956a59523cdd1b5e2b47c6925e0d6d5322f1 Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <shoentjen@antagonist.nl>
Date: Wed, 22 Oct 2014 21:39:59 +1300
Subject: [PATCH 1022/2267] Add SSL stapling

It is possible to set a global default stapling on/off
Per vhost this can be overridden.

Based on initial pull request by David Teirney <david.teirney@orionhealth.com>
---
 README.md                    | 24 ++++++++++++++++++++++++
 manifests/mod/ssl.pp         | 12 ++++++++++++
 manifests/vhost.pp           |  7 +++++++
 spec/classes/mod/ssl_spec.rb | 17 +++++++++++++++++
 templates/mod/ssl.conf.erb   |  4 ++++
 templates/vhost/_ssl.erb     |  9 +++++++++
 6 files changed, 73 insertions(+)

diff --git a/README.md b/README.md
index 9cc2625b23..f5393d9979 100644
--- a/README.md
+++ b/README.md
@@ -1179,6 +1179,12 @@ Determines whether Puppet manages the HTTPD service's state. Valid options: Bool
 
 Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. Default: undef, which uses the [default Puppet behavior][Service attribute restart].
 
+##### `ssl_stapling`
+
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean. Default: false. It is possible to override this on a vhost level.
+
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
 ##### `timeout`
 
 Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request. Default: 120.
@@ -3785,6 +3791,24 @@ Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.h
 
 Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid options: Boolean. Default: true.
 
+##### `ssl_stapling`
+
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean or undef. Default: undef, meaning use what is set globally.
+
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
+##### `ssl_stapling_timeout`
+
+Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive. No default.
+
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
+##### `ssl_stapling_return_errors`
+
+Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive. No default.
+
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
 #### Defined type: FastCGI Server
 
 This type is intended for use with mod\_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index cd67431996..c89c894568 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -9,6 +9,7 @@
   $ssl_pass_phrase_dialog  = 'builtin',
   $ssl_random_seed_bytes   = '512',
   $ssl_sessioncachetimeout = '300',
+  $ssl_stapling            = false,
   $ssl_mutex               = undef,
   $apache_version          = undef,
   $package_name            = undef,
@@ -67,6 +68,16 @@
     'Suse'    => '/var/lib/apache2/ssl_scache(512000)'
   }
 
+  validate_bool($ssl_stapling)
+
+  $stapling_cache = $::osfamily ? {
+    'debian'  => "\${APACHE_RUN_DIR}/ocsp(32768)",
+    'redhat'  => '/run/httpd/ssl_stapling(32768)',
+    'freebsd' => '/var/run/ssl_stapling(32768)',
+    'gentoo'  => '/var/run/ssl_stapling(32768)',
+    'Suse'    => '/var/lib/apache2/ssl_stapling(32768)',
+  }
+
   if $::osfamily == 'Suse' {
     if defined(Class['::apache::mod::worker']){
       $suse_path = '/usr/lib64/apache2-worker'
@@ -96,6 +107,7 @@
   # $ssl_options
   # $ssl_openssl_conf_cmd
   # $session_cache
+  # $stapling_cache
   # $ssl_mutex
   # $ssl_random_seed_bytes
   # $ssl_sessioncachetimeout
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 6d8dbc1d7d..c5b0fc729c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -34,6 +34,9 @@
   $ssl_options                 = undef,
   $ssl_openssl_conf_cmd        = undef,
   $ssl_proxyengine             = false,
+  $ssl_stapling                = undef,
+  $ssl_stapling_timeout        = undef,
+  $ssl_stapling_return_errors  = undef,
   $priority                    = undef,
   $default_vhost               = false,
   $servername                  = $name,
@@ -189,6 +192,9 @@
   validate_bool($ssl)
   validate_bool($default_vhost)
   validate_bool($ssl_proxyengine)
+  if $ssl_stapling != undef {
+    validate_bool($ssl_stapling)
+  }
   if $rewrites {
     validate_array($rewrites)
     unless empty($rewrites) {
@@ -919,6 +925,7 @@
   # - $ssl_verify_depth
   # - $ssl_options
   # - $ssl_openssl_conf_cmd
+  # - $ssl_stapling
   # - $apache_version
   if $ssl {
     concat::fragment { "${name}-ssl":
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index f787496313..07c7f680d7 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -151,6 +151,14 @@
         end
         it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLCompression On$/)}
       end
+      context 'setting ssl_stapling to true' do
+        let :params do
+          {
+            :ssl_stapling => true,
+          }
+        end
+        it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLUseStapling/)}
+      end
     end
     context "with Apache version >= 2.4" do
       let :params do
@@ -171,6 +179,15 @@
         end
         it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLCompression On$/)}
       end
+      context 'setting ssl_stapling to true' do
+        let :params do
+          {
+            :apache_version => '2.4',
+            :ssl_stapling => true,
+          }
+        end
+        it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLUseStapling On$/)}
+      end
     end
 
     context 'setting ssl_pass_phrase_dialog' do
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 68ad179a72..c7b4cd9177 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -20,6 +20,10 @@
   <%- end -%>
   SSLCryptoDevice <%= @ssl_cryptodevice %>
   SSLHonorCipherOrder <%= scope.function_bool2httpd([@_ssl_honorcipherorder]) %>
+<% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
+  SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %>
+  SSLStaplingCache "shmcb:<%= @stapling_cache %>"
+<% end -%>
   SSLCipherSuite <%= @ssl_cipher %>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
 <% if @ssl_options -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 797435cc19..baf18a8970 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -43,4 +43,13 @@
   <%- if @ssl_openssl_conf_cmd -%>
   SSLOpenSSLConfCmd       <%= @ssl_openssl_conf_cmd %>
   <%- end -%>
+  <%- if not @ssl_stapling.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %>
+  <%- end -%>
+  <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
+  <%- end -%>
+  <%- if @ssl_stapling_return_errors && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  SSLStaplingReturnResponderErrors <%= @ssl_stapling_return_errors %>
+  <%- end -%>
 <% end -%>

From 8606dac52c80415f67f65b1d28d3b39c7dc57159 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Wed, 30 Nov 2016 13:40:43 +0100
Subject: [PATCH 1023/2267] mod_proxy_balancer manager

---
 README.md                               |  4 ++
 manifests/mod/proxy_balancer.pp         | 19 ++++-
 spec/classes/mod/proxy_balancer_spec.rb | 95 +++++++++++++++++++++++++
 templates/mod/proxy_balancer.conf.erb   | 10 +++
 4 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 spec/classes/mod/proxy_balancer_spec.rb
 create mode 100644 templates/mod/proxy_balancer.conf.erb

diff --git a/README.md b/README.md
index 9cc2625b23..529e98edbd 100644
--- a/README.md
+++ b/README.md
@@ -1808,9 +1808,13 @@ Installs and manages [`mod_proxy_balancer`][], which provides load balancing.
 
 **Parameters within `apache::mod::proxy_balancer`**:
 
+- `manager`: Determines whether to enable balancer manager support. Default: `false`.
+- `manager_path`: The server location of the balancer manager. Default: '/balancer-manager'.
+- `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/balancer-manager`. Default: ['127.0.0.1','::1'].
 - `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. Default: the value of [`$::apache::apache_version`][`apache_version`].
    - On Apache >= 2.4, `mod_slotmem_shm` is loaded.
 
+
 ##### Class: `apache::mod::php`
 
 Installs and configures [`mod_php`][].
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index a225ce3396..fdb4b831ad 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -1,6 +1,12 @@
 class apache::mod::proxy_balancer(
+  $manager        = false,
+  $manager_path   = '/balancer-manager',
+  $allow_from     = ['127.0.0.1','::1'],
   $apache_version = $::apache::apache_version,
 ) {
+  validate_bool($manager)
+  validate_string($manager_path)
+  validate_array($allow_from)
 
   include ::apache::mod::proxy
   include ::apache::mod::proxy_http
@@ -11,5 +17,16 @@
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_balancer']
   Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_balancer']
   ::apache::mod { 'proxy_balancer': }
-
+  if $manager {
+    include ::apache::mod::status
+    file { 'proxy_balancer.conf':
+      ensure  => file,
+      path    => "${::apache::mod_dir}/proxy_balancer.conf",
+      mode    => $::apache::file_mode,
+      content => template('apache/mod/proxy_balancer.conf.erb'),
+      require => Exec["mkdir ${::apache::mod_dir}"],
+      before  => File[$::apache::mod_dir],
+      notify  => Class['apache::service'],
+    }
+  }
 }
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
new file mode 100644
index 0000000000..d646ba7500
--- /dev/null
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+# Helper function for testing the contents of `proxy_balancer.conf`
+def balancer_manager_conf_spec(allow_from, manager_path)
+  it do
+    is_expected.to contain_file("proxy_balancer.conf").with_content(
+      "<Location #{manager_path}>\n"\
+      "    SetHandler balancer-manager\n"\
+      "    Require ip #{Array(allow_from).join(' ')}\n"\
+      "</Location>\n"
+    )
+  end
+end
+
+describe 'apache::mod::proxy_balancer', :type => :class do
+  let :pre_condition do
+    [
+      'include apache::mod::proxy',
+    ]
+  end
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with default parameters" do
+    context "on a Debian OS" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '8',
+          :concat_basedir         => '/dne',
+          :lsbdistcodename        => 'jessie',
+          :operatingsystem        => 'Debian',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to contain_apache__mod("proxy_balancer") }
+
+      it { is_expected.to_not contain_file("proxy_balancer.conf") }
+      it { is_expected.to_not contain_file("proxy_balancer.conf symlink") }
+
+    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',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to contain_apache__mod("proxy_balancer") }
+
+      it { is_expected.to_not contain_file("proxy_balancer.conf") }
+      it { is_expected.to_not contain_file("proxy_balancer.conf symlink") }
+
+    end
+  end
+
+  context "default configuration with custom parameters $manager => true, $allow_from => ['10.10.10.10','11.11.11.11'], $status_path => '/custom-manager'" do
+    context "on a Debian OS" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '8',
+          :concat_basedir         => '/dne',
+          :lsbdistcodename        => 'jessie',
+          :operatingsystem        => 'Debian',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :params do
+        {
+          :manager      => true,
+          :allow_from   => ['10.10.10.10','11.11.11.11'],
+          :manager_path => '/custom-manager',
+        }
+      end
+
+      balancer_manager_conf_spec(["10.10.10.10", "11.11.11.11"], "/custom-manager")
+
+    end
+  end
+end
diff --git a/templates/mod/proxy_balancer.conf.erb b/templates/mod/proxy_balancer.conf.erb
new file mode 100644
index 0000000000..c1f37be8e4
--- /dev/null
+++ b/templates/mod/proxy_balancer.conf.erb
@@ -0,0 +1,10 @@
+<Location <%= @manager_path %>>
+    SetHandler balancer-manager
+    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    Require ip <%= Array(@allow_from).join(" ") %>
+    <%- else -%>
+    Order deny,allow
+    Deny from all
+    Allow from <%= Array(@allow_from).join(" ") %>
+    <%- end -%>
+</Location>

From 77b79919d189650df5e48599aea86caae6c9c32c Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 1 Dec 2016 11:36:44 -0800
Subject: [PATCH 1024/2267] (MODULES-3631) msync Gemfile for 1.9 frozen strings

---
 .gitignore |  1 -
 Gemfile    | 25 +++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25cb3cc50f..0cd25de9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@ coverage/
 log/
 .idea/
 *.iml
-tmp/
diff --git a/Gemfile b/Gemfile
index 8871c66381..8a568f6a5a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,33 +32,34 @@ supports_windows = false
 
 group :development do
   gem 'puppet-lint',                        :require => false
-  gem 'metadata-json-lint',                 :require => false
+  gem 'metadata-json-lint',                 :require => false, :platforms => 'ruby'
   gem 'puppet_facts',                       :require => false
   gem 'puppet-blacksmith', '>= 3.4.0',      :require => false, :platforms => 'ruby'
   gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
   gem 'rspec-puppet', '>= 2.3.2',           :require => false
-  gem 'rspec-puppet-facts',                 :require => false
+  gem 'rspec-puppet-facts',                 :require => false, :platforms => 'ruby'
   gem 'mocha', '< 1.2.0',                   :require => false
-  gem 'simplecov',                          :require => false
-  gem 'parallel_tests', '< 2.10.0',         :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-  gem 'parallel_tests',                     :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
-  gem 'rubocop', '0.41.2',                  :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-  gem 'rubocop',                            :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
-  gem 'rubocop-rspec', '~> 1.6',            :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
+  gem 'simplecov',                          :require => false, :platforms => 'ruby'
+  gem 'parallel_tests', '< 2.10.0',         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem 'parallel_tests',                     :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
+  gem 'rubocop', '0.41.2',                  :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem 'rubocop',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
+  gem 'rubocop-rspec', '~> 1.6',            :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
   gem 'pry',                                :require => false
-  gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+  gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
 end
 
 group :system_tests do
   gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20')                if supports_windows
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'])                             if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0') and ! supports_windows
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '< 3')                    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') and ! supports_windows
-  gem 'beaker-pe',                                                               :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
+  gem 'beaker', *location_for(ENV['BEAKER_VERSION'])                             if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0') and ! supports_windows
+  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '< 3')                    if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0') and ! supports_windows
+  gem 'beaker-pe',                                                               :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
   gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')     if ! supports_windows
   gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')     if supports_windows
   gem 'beaker-puppet_install_helper',                                            :require => false
   gem 'master_manipulator',                                                      :require => false
   gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+  gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

From f6cfa03d5bcd3d184841c614b1bfb8046a0c7d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Fri, 2 Dec 2016 14:23:59 +0100
Subject: [PATCH 1025/2267] custom facts shouldn't break structured facts

Change the `puts` output to `Facter.debug` so that our structured facts remain side-effect free in normal runs, and can just be piped into tools like `jq`
---
 lib/facter/apache_version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index bb0b4ac9ff..63e4e1c2b5 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -2,11 +2,11 @@
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
-      puts "Matching apachectl '#{apache_version}'"
+      Facter.debug "Matching apachectl '#{apache_version}'"
       %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)[1]
     elsif Facter::Util::Resolution.which('apache2ctl')
       apache_version = Facter::Util::Resolution.exec('apache2ctl -v 2>&1')
-      puts "Matching apache2ctl '#{apache_version}'"
+      Facter.debug "Matching apache2ctl '#{apache_version}'"
       %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)[1]
     end
   end

From b16618649e72617e41faab423a0c40510a5ea47d Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Sat, 3 Dec 2016 07:07:29 +0100
Subject: [PATCH 1026/2267] Avoid relative classname inclusion

Including a class by a relative name might lead to unexpected results;
in addition to that there is also a small performance penalty.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
---
 examples/apache.pp                | 12 ++++++------
 examples/dev.pp                   |  2 +-
 examples/init.pp                  |  2 +-
 examples/mod_load_params.pp       |  2 +-
 examples/mods.pp                  |  2 +-
 examples/mods_custom.pp           |  2 +-
 examples/php.pp                   |  4 ++--
 examples/vhost.pp                 |  2 +-
 examples/vhost_directories.pp     |  2 +-
 examples/vhost_filter.pp          |  2 +-
 examples/vhost_ip_based.pp        |  2 +-
 examples/vhost_proxypass.pp       |  2 +-
 examples/vhost_ssl.pp             |  2 +-
 examples/vhosts_without_listen.pp |  2 +-
 manifests/fastcgi/server.pp       |  2 +-
 15 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/examples/apache.pp b/examples/apache.pp
index 0d4543564c..18ec55311b 100644
--- a/examples/apache.pp
+++ b/examples/apache.pp
@@ -1,6 +1,6 @@
-include apache
-include apache::mod::php
-include apache::mod::cgi
-include apache::mod::userdir
-include apache::mod::disk_cache
-include apache::mod::proxy_http
+include ::apache
+include ::apache::mod::php
+include ::apache::mod::cgi
+include ::apache::mod::userdir
+include ::apache::mod::disk_cache
+include ::apache::mod::proxy_http
diff --git a/examples/dev.pp b/examples/dev.pp
index 6c4f95571d..5616e32bad 100644
--- a/examples/dev.pp
+++ b/examples/dev.pp
@@ -1 +1 @@
-include apache::mod::dev
+include ::apache::mod::dev
diff --git a/examples/init.pp b/examples/init.pp
index b3f9f13aac..33911073b0 100644
--- a/examples/init.pp
+++ b/examples/init.pp
@@ -1 +1 @@
-include apache
+include ::apache
diff --git a/examples/mod_load_params.pp b/examples/mod_load_params.pp
index 0e84c5efbf..fa43132b73 100644
--- a/examples/mod_load_params.pp
+++ b/examples/mod_load_params.pp
@@ -1,7 +1,7 @@
 # Tests the path and identifier parameters for the apache::mod class
 
 # Base class for clarity:
-class { 'apache': }
+class { '::apache': }
 
 
 # Exaple parameter usage:
diff --git a/examples/mods.pp b/examples/mods.pp
index 59362bd9a0..699638248d 100644
--- a/examples/mods.pp
+++ b/examples/mods.pp
@@ -3,7 +3,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot, and declaring our default set of modules.
-class { 'apache':
+class { '::apache':
   default_mods => true,
 }
 
diff --git a/examples/mods_custom.pp b/examples/mods_custom.pp
index 0ae699c73d..4098c83aae 100644
--- a/examples/mods_custom.pp
+++ b/examples/mods_custom.pp
@@ -3,7 +3,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot, and declaring a custom set of modules.
-class { 'apache':
+class { '::apache':
   default_mods => [
     'info',
     'alias',
diff --git a/examples/php.pp b/examples/php.pp
index 1d926bfb46..ee187717e7 100644
--- a/examples/php.pp
+++ b/examples/php.pp
@@ -1,4 +1,4 @@
-class { 'apache':
+class { '::apache':
   mpm_module => 'prefork',
 }
-include apache::mod::php
+include ::apache::mod::php
diff --git a/examples/vhost.pp b/examples/vhost.pp
index 486570f815..1b9b08e127 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -5,7 +5,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { 'apache': }
+class { '::apache': }
 
 # Most basic vhost
 apache::vhost { 'first.example.com':
diff --git a/examples/vhost_directories.pp b/examples/vhost_directories.pp
index b8953ee321..df5a2d52a1 100644
--- a/examples/vhost_directories.pp
+++ b/examples/vhost_directories.pp
@@ -1,7 +1,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { 'apache': }
+class { '::apache': }
 
 # Example from README adapted.
 apache::vhost { 'readme.example.net':
diff --git a/examples/vhost_filter.pp b/examples/vhost_filter.pp
index ca1a8bbe03..1a66b856b7 100644
--- a/examples/vhost_filter.pp
+++ b/examples/vhost_filter.pp
@@ -1,5 +1,5 @@
 # Base class. Declares default vhost on port 80 with filters.
-class { 'apache': }
+class { '::apache': }
 
 # Example from README adapted.
 apache::vhost { 'readme.example.net':
diff --git a/examples/vhost_ip_based.pp b/examples/vhost_ip_based.pp
index dc0fa4f33b..249c4199c0 100644
--- a/examples/vhost_ip_based.pp
+++ b/examples/vhost_ip_based.pp
@@ -3,7 +3,7 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { 'apache':
+class { '::apache':
   default_vhost => false,
 }
 
diff --git a/examples/vhost_proxypass.pp b/examples/vhost_proxypass.pp
index e911f85f9d..458dbd4092 100644
--- a/examples/vhost_proxypass.pp
+++ b/examples/vhost_proxypass.pp
@@ -5,7 +5,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { 'apache': }
+class { '::apache': }
 
 # Most basic vhost with proxy_pass
 apache::vhost { 'first.example.com':
diff --git a/examples/vhost_ssl.pp b/examples/vhost_ssl.pp
index 8e7a2b279e..53989ff1b6 100644
--- a/examples/vhost_ssl.pp
+++ b/examples/vhost_ssl.pp
@@ -3,7 +3,7 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { 'apache':
+class { '::apache':
   default_vhost => false,
 }
 
diff --git a/examples/vhosts_without_listen.pp b/examples/vhosts_without_listen.pp
index e7d6cc036c..0e97a0221f 100644
--- a/examples/vhosts_without_listen.pp
+++ b/examples/vhosts_without_listen.pp
@@ -4,7 +4,7 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { 'apache':
+class { '::apache':
   default_vhost => false,
 }
 
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index 3493194917..78363062ba 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -7,7 +7,7 @@
   $file_type     = 'application/x-httpd-php',
   $pass_header   = undef,
 ) {
-  include apache::mod::fastcgi
+  include ::apache::mod::fastcgi
 
   Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server[$title]
 

From a99981246daa1bf6ac14d0d64dea4d238a55d280 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Sat, 3 Dec 2016 07:11:50 +0100
Subject: [PATCH 1027/2267] Add missing trailing commas

As per style guide v2.0, there must be trailing commas after all
resource attributes and parameter definitions.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
---
 examples/vhost.pp           | 4 ++--
 examples/vhost_proxypass.pp | 4 ++--
 manifests/custom_config.pp  | 2 +-
 manifests/init.pp           | 8 ++++----
 manifests/mod/cgi.pp        | 2 +-
 manifests/mod/cgid.pp       | 2 +-
 manifests/mod/deflate.pp    | 4 ++--
 manifests/mod/info.pp       | 2 +-
 manifests/mod/ssl.pp        | 2 +-
 manifests/mpm.pp            | 4 ++--
 manifests/params.pp         | 4 ++--
 manifests/vhost.pp          | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/examples/vhost.pp b/examples/vhost.pp
index 486570f815..5ac1b22c42 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -153,7 +153,7 @@
       rewrite_cond => ['%{HTTPS} off'],
       rewrite_rule => ['(.*) https://%{HTTP_HOST}%{REQUEST_URI}'],
     }
-  ]
+  ],
 }
 
 # Rewrite a URL to lower case
@@ -167,7 +167,7 @@
       rewrite_map  => ['lc int:tolower'],
       rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
     }
-  ]
+  ],
 }
 
 apache::vhost { 'sixteenth.example.com ssl':
diff --git a/examples/vhost_proxypass.pp b/examples/vhost_proxypass.pp
index e911f85f9d..7df718387d 100644
--- a/examples/vhost_proxypass.pp
+++ b/examples/vhost_proxypass.pp
@@ -29,7 +29,7 @@
       'url'    => 'http://localhost:8080/second',
       'params' => {
         'retry'   => '0',
-        'timeout' => '5'
+        'timeout' => '5',
         }
     },
   ],
@@ -58,7 +58,7 @@
       'url'      => 'http://localhost:8080/fourth',
       'params'   => {
         'retry'   => '0',
-        'timeout' => '5'
+        'timeout' => '5',
         },
       'keywords' => ['noquery', 'interpolate']
     },
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index d93c468920..188f3ba820 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -60,7 +60,7 @@
       refreshonly => true,
       notify      => Class['Apache::Service'],
       before      => Exec["remove ${name} if invalid"],
-      require     => Anchor['::apache::modules_set_up']
+      require     => Anchor['::apache::modules_set_up'],
     }
 
     exec { "remove ${name} if invalid":
diff --git a/manifests/init.pp b/manifests/init.pp
index a2782507da..1410989879 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -137,7 +137,7 @@
   if $manage_group {
     group { $group:
       ensure  => present,
-      require => Package['httpd']
+      require => Package['httpd'],
     }
   }
 
@@ -258,7 +258,7 @@
   }
   concat::fragment { 'Apache ports header':
     target  => $ports_file,
-    content => template('apache/ports_header.erb')
+    content => template('apache/ports_header.erb'),
   }
 
   if $::apache::conf_dir and $::apache::params::conf_file {
@@ -284,7 +284,7 @@
 
       file { [
         '/etc/apache2/modules.d/.keep_www-servers_apache-2',
-        '/etc/apache2/vhosts.d/.keep_www-servers_apache-2'
+        '/etc/apache2/vhosts.d/.keep_www-servers_apache-2',
       ]:
         ensure  => absent,
         require => Package['httpd'],
@@ -343,7 +343,7 @@
       }
     }
     class { '::apache::default_confd_files':
-      all => $default_confd_files
+      all => $default_confd_files,
     }
     if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans
       include "::apache::mod::${mpm_module}"
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index b03e8f05d5..a41bb6debd 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -8,7 +8,7 @@
 
   if $::osfamily == 'Suse' {
     ::apache::mod { 'cgi':
-      lib_path => '/usr/lib64/apache2-prefork'
+      lib_path => '/usr/lib64/apache2-prefork',
     }
   } else {
     ::apache::mod { 'cgi': }
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 7d38197132..23b32dad4b 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -20,7 +20,7 @@
 
   if $::osfamily == 'Suse' {
     ::apache::mod { 'cgid':
-      lib_path => '/usr/lib64/apache2-worker'
+      lib_path => '/usr/lib64/apache2-worker',
     }
   } else {
     ::apache::mod { 'cgid': }
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 21031c7150..70ac5be121 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -4,12 +4,12 @@
     'text/css',
     'application/x-javascript application/javascript application/ecmascript',
     'application/rss+xml',
-    'application/json'
+    'application/json',
   ],
   $notes = {
     'Input'  => 'instream',
     'Output' => 'outstream',
-    'Ratio'  => 'ratio'
+    'Ratio'  => 'ratio',
   }
 ) {
   include ::apache
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 5af7b8d96b..c6f1355e59 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -14,7 +14,7 @@
       $suse_path = '/usr/lib64/apache2-prefork'
     }
     ::apache::mod { 'info':
-      lib_path => $suse_path
+      lib_path => $suse_path,
     }
   } else {
     ::apache::mod { 'info': }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index cd67431996..ff62bc5e9e 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -75,7 +75,7 @@
     }
     ::apache::mod { 'ssl':
       package  => $package_name,
-      lib_path => $suse_path
+      lib_path => $suse_path,
     }
   } else {
     ::apache::mod { 'ssl':
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 1fe9684e77..119fedf577 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -102,7 +102,7 @@
     }
     'freebsd': {
       class { '::apache::package':
-        mpm_module => $mpm
+        mpm_module => $mpm,
       }
     }
     'gentoo': {
@@ -132,7 +132,7 @@
         if $mpm == 'itk' {
           file { "${lib_path}/mod_mpm_itk.so":
             ensure => link,
-            target => "${lib_path}/mpm_itk.so"
+            target => "${lib_path}/mpm_itk.so",
           }
         }
       }
diff --git a/manifests/params.pp b/manifests/params.pp
index 7089c7e921..e1ca7b3c20 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -262,7 +262,7 @@
       $shib2_lib = 'mod_shib2.so'
     }
     $mod_libs             = {
-      'shib2' => $shib2_lib
+      'shib2' => $shib2_lib,
     }
     $conf_template          = 'apache/httpd.conf.erb'
     $keepalive              = 'Off'
@@ -507,7 +507,7 @@
         'php5'        => 'apache2-mod_php5',
         'python'      => 'apache2-mod_python',
         'security'    => 'apache2-mod_security2',
-        'worker'      => 'apache2-worker'
+        'worker'      => 'apache2-worker',
         }
     } else {
       $mod_packages        = {
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 6d8dbc1d7d..f5da800c21 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1086,7 +1086,7 @@
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
       order   => 320,
-      content => template('apache/vhost/_security.erb')
+      content => template('apache/vhost/_security.erb'),
     }
   }
 

From e8b9a506fcb0e8325e5eceb7e40584fdb09490c3 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu, 22 Sep 2016 15:56:26 +0200
Subject: [PATCH 1028/2267] Don't fail if first element of  is not an hash
 before flattening

The template is using [@rewrites].flatten.compact which maps to Puppet's delete_undef_values(flatten([]))

Bump stdlib version to the one introducing `delete_undef_values'.
---
 manifests/vhost.pp | 3 ++-
 metadata.json      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5644ba82ca..266ad7fc30 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -192,7 +192,8 @@
   if $rewrites {
     validate_array($rewrites)
     unless empty($rewrites) {
-      validate_hash($rewrites[0])
+      $rewrites_flattened = delete_undef_values(flatten([$rewrites]))
+      validate_hash($rewrites_flattened[0])
     }
   }
 
diff --git a/metadata.json b/metadata.json
index a82bccc323..961c34a9d4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -8,7 +8,7 @@
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.2.0 < 5.0.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
   ],
   "data_provider": null,

From b910c23c29cf1c2eb102bf91bee2b976451d8d67 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Fri, 9 Dec 2016 11:27:30 +0100
Subject: [PATCH 1029/2267] apache::mod::auth_kerb requires
 apache::mod::authn_core (on >=2.4)

---
 manifests/mod/auth_kerb.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/auth_kerb.pp b/manifests/mod/auth_kerb.pp
index fe63d22d7b..4b4887fe8c 100644
--- a/manifests/mod/auth_kerb.pp
+++ b/manifests/mod/auth_kerb.pp
@@ -1,5 +1,6 @@
 class apache::mod::auth_kerb {
   include ::apache
+  include ::apache::mod::authn_core
   ::apache::mod { 'auth_kerb': }
 }
 

From 46b148b709f4394135ac535fb200b3d71672ef25 Mon Sep 17 00:00:00 2001
From: Ira <seefood@users.noreply.github.com>
Date: Tue, 13 Dec 2016 01:22:49 +0200
Subject: [PATCH 1030/2267] Support Passenger repo on Amazon Linux (#1549)

* Adding Amazon Linux support

* A slightly nicer looking fix for the base URL issue for Amazon Linux.

* Let's not annoy Travis
---
 manifests/mod/passenger.pp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 85f004dc5f..35b4eff22d 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -57,9 +57,15 @@
   }
 
   if $::osfamily == 'RedHat' and $manage_repo {
+    if $::operatingsystem == 'Amazon' {
+      $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch'
+    } else {
+      $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch'
+    }
+
     yumrepo { 'passenger':
       ensure        => 'present',
-      baseurl       => 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch',
+      baseurl       => $baseurl,
       descr         => 'passenger',
       enabled       => '1',
       gpgcheck      => '0',

From 458946744c91bab6207dd3e9c0941e94eced5cf0 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado.eng@gmail.com>
Date: Mon, 12 Dec 2016 21:49:12 -0200
Subject: [PATCH 1031/2267] (#MODULES-3744) Process $crs_package before
 $modsec_dir (#1563)

Class apache::mod::security created 2 files with conflicting configs:
/etc/httpd/modsecurity.d/modsecurity_crs_10_config.conf
/etc/httpd/modsecurity.d/security_crs.conf

File[$modsec_dir] purges this directory and creates latter file
but Package[$crs_package] creates former file in the same directory

This change makes the package be managed before the directory,
so the former file is guaranteed to be purged
---
 manifests/mod/security.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 6e90af2573..ae3d847299 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -53,7 +53,10 @@
   if $crs_package  {
     package { $crs_package:
       ensure => 'latest',
-      before => File[$::apache::confd_dir],
+      before => [
+        File[$::apache::confd_dir],
+        File[$modsec_dir],
+      ],
     }
   }
 

From a8441912b687bfa8739fd532845dd9c06905bd20 Mon Sep 17 00:00:00 2001
From: intelradoux <intelradoux@users.noreply.github.com>
Date: Tue, 13 Dec 2016 01:08:28 +0100
Subject: [PATCH 1032/2267] [MODULES-1491] mod_dir is empty when instanciating
 apache::mod::... (#1541)

Add "include ::apache" on class that needed that.

Apache version also need to be "pick" so that version resolution is correct.
---
 manifests/mod/autoindex.pp     |  1 +
 manifests/mod/cgid.pp          |  1 +
 manifests/mod/dav_fs.pp        |  1 +
 manifests/mod/disk_cache.pp    |  1 +
 manifests/mod/dumpio.pp        |  2 +-
 manifests/mod/event.pp         | 12 ++++++++----
 manifests/mod/geoip.pp         |  1 +
 manifests/mod/itk.pp           | 14 +++++++++-----
 manifests/mod/nss.pp           |  1 +
 manifests/mod/peruser.pp       |  2 +-
 manifests/mod/php.pp           |  2 +-
 manifests/mod/prefork.pp       | 12 +++++++-----
 manifests/mod/setenvif.pp      |  1 +
 manifests/mod/userdir.pp       |  7 +++++--
 manifests/mod/worker.pp        | 17 +++++++++++------
 templates/mod/userdir.conf.erb |  4 ++--
 16 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index c8cd0658d8..67c7580e31 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -1,4 +1,5 @@
 class apache::mod::autoindex {
+  include ::apache
   ::apache::mod { 'autoindex': }
   # Template uses no variables
   file { 'autoindex.conf':
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 23b32dad4b..b2cb016557 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -1,4 +1,5 @@
 class apache::mod::cgid {
+  include ::apache
   case $::osfamily {
     'FreeBSD': {}
     default: {
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index f652d4c216..60127e3f6d 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -1,4 +1,5 @@
 class apache::mod::dav_fs {
+  include ::apache
   $dav_lock = $::osfamily ? {
     'debian'  => "\${APACHE_LOCK_DIR}/DAVLock",
     'freebsd' => '/usr/local/var/DavLock',
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 051d69894c..7cd72701e4 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -1,6 +1,7 @@
 class apache::mod::disk_cache (
   $cache_root = undef,
 ) {
+  include ::apache
   if $cache_root {
     $_cache_root = $cache_root
   }
diff --git a/manifests/mod/dumpio.pp b/manifests/mod/dumpio.pp
index 4886666255..62276162d3 100644
--- a/manifests/mod/dumpio.pp
+++ b/manifests/mod/dumpio.pp
@@ -2,7 +2,7 @@
   $dump_io_input  = 'Off',
   $dump_io_output = 'Off',
 ) {
-
+  include ::apache
   validate_re(downcase($dump_io_input), '^(on|off)$', "${dump_io_input} is not supported for dump_io_input.  Allowed values are 'On' and 'Off'.")
   validate_re(downcase($dump_io_output), '^(on|off)$', "${dump_io_output} is not supported for dump_io_output.  Allowed values are 'On' and 'Off'.")
 
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index d423073e78..a873959165 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -8,10 +8,14 @@
   $maxrequestsperchild    = '0',
   $maxconnectionsperchild = undef,
   $serverlimit            = '25',
-  $apache_version         = $::apache::apache_version,
+  $apache_version         = undef,
   $threadlimit            = '64',
   $listenbacklog          = '511',
 ) {
+  include ::apache
+
+  $_apache_version = pick($apache_version, $apache::apache_version)
+
   if defined(Class['apache::mod::itk']) {
     fail('May not include both apache::mod::event and apache::mod::itk on the same node')
   }
@@ -49,15 +53,15 @@
 
   case $::osfamily {
     'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
+      if versioncmp($_apache_version, '2.4') >= 0 {
         apache::mpm{ 'event':
-          apache_version => $apache_version,
+          apache_version => $_apache_version,
         }
       }
     }
     'debian','freebsd' : {
       apache::mpm{ 'event':
-        apache_version => $apache_version,
+        apache_version => $_apache_version,
       }
     }
     'gentoo': {
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index 2ff5d21918..66ae887dea 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -8,6 +8,7 @@
   $scan_proxy_header_field    = undef,
   $use_last_xforwarededfor_ip = undef,
 ) {
+  include ::apache
   ::apache::mod { 'geoip': }
 
   # Template uses:
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 56edf7e68e..8ceb56d2ba 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -5,15 +5,19 @@
   $serverlimit         = '256',
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
-  $apache_version      = $::apache::apache_version,
+  $apache_version      = undef,
 ) {
+  include ::apache
+
+  $_apache_version = pick($apache_version, $apache::apache_version)
+
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::itk and apache::mod::event on the same node')
   }
   if defined(Class['apache::mod::peruser']) {
     fail('May not include both apache::mod::itk and apache::mod::peruser on the same node')
   }
-  if versioncmp($apache_version, '2.4') < 0 {
+  if versioncmp($_apache_version, '2.4') < 0 {
     if defined(Class['apache::mod::prefork']) {
       fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
     }
@@ -59,9 +63,9 @@
       package { 'httpd-itk':
         ensure => present,
       }
-      if versioncmp($apache_version, '2.4') >= 0 {
+      if versioncmp($_apache_version, '2.4') >= 0 {
         ::apache::mpm{ 'itk':
-          apache_version => $apache_version,
+          apache_version => $_apache_version,
         }
       }
       else {
@@ -77,7 +81,7 @@
     }
     'debian', 'freebsd': {
       apache::mpm{ 'itk':
-        apache_version => $apache_version,
+        apache_version => $_apache_version,
       }
     }
     'gentoo': {
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index 16c285e939..8814c9366f 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -4,6 +4,7 @@
   $passwd_file  = undef,
   $port     = 8443,
 ) {
+  include ::apache
   include ::apache::mod::mime
 
   apache::mod { 'nss': }
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index e875a5afcc..5683dd66ce 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -8,7 +8,7 @@
   $expiretimeout = '120',
   $keepalive = 'Off',
 ) {
-
+  include ::apache
   case $::osfamily {
     'freebsd' : {
       fail("Unsupported osfamily ${::osfamily}")
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 7743b083e0..9b3b5b8b6c 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -9,7 +9,7 @@
   $root_group     = $::apache::params::root_group,
   $php_version    = $::apache::params::php_version,
 ) inherits apache::params {
-
+  include ::apache
   $mod = "php${php_version}"
 
   if defined(Class['::apache::mod::prefork']) {
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index c09ede4de6..f35551ce6a 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -5,12 +5,14 @@
   $serverlimit         = '256',
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
-  $apache_version      = $::apache::apache_version,
+  $apache_version      = undef,
 ) {
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
   }
-  if versioncmp($apache_version, '2.4') < 0 {
+  if versioncmp($_apache_version, '2.4') < 0 {
     if defined(Class['apache::mod::itk']) {
       fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
     }
@@ -44,9 +46,9 @@
 
   case $::osfamily {
     'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
+      if versioncmp($_apache_version, '2.4') >= 0 {
         ::apache::mpm{ 'prefork':
-          apache_version => $apache_version,
+          apache_version => $_apache_version,
         }
       }
       else {
@@ -62,7 +64,7 @@
     }
     'debian', 'freebsd': {
       ::apache::mpm{ 'prefork':
-        apache_version => $apache_version,
+        apache_version => $_apache_version,
       }
     }
     'Suse': {
diff --git a/manifests/mod/setenvif.pp b/manifests/mod/setenvif.pp
index 63d3e321b4..d7baf582e3 100644
--- a/manifests/mod/setenvif.pp
+++ b/manifests/mod/setenvif.pp
@@ -1,4 +1,5 @@
 class apache::mod::setenvif {
+  include ::apache
   ::apache::mod { 'setenvif': }
   # Template uses no variables
   file { 'setenvif.conf':
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 516bb11654..11e7cd5bec 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -2,12 +2,15 @@
   $home = '/home',
   $dir = 'public_html',
   $disable_root = true,
-  $apache_version = $::apache::apache_version,
+  $apache_version = undef,
   $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ],
 ) {
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
+
   ::apache::mod { 'userdir': }
 
-  # Template uses $home, $dir, $disable_root, $apache_version
+  # Template uses $home, $dir, $disable_root, $_apache_version
   file { 'userdir.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/userdir.conf",
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index c9e01600ee..00a9439b31 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -62,8 +62,11 @@
   $serverlimit         = '25',
   $threadlimit         = '64',
   $listenbacklog       = '511',
-  $apache_version      = $::apache::apache_version,
+  $apache_version      = undef,
 ) {
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
+
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::worker and apache::mod::event on the same node')
   }
@@ -102,9 +105,10 @@
 
   case $::osfamily {
     'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        ::apache::mpm { 'worker':
-          apache_version => $apache_version,
+
+      if versioncmp($_apache_version, '2.4') >= 0 {
+        ::apache::mpm{ 'worker':
+          apache_version => $_apache_version,
         }
       }
       else {
@@ -118,9 +122,10 @@
         }
       }
     }
+
     'debian', 'freebsd': {
-      ::apache::mpm { 'worker':
-        apache_version => $apache_version,
+      ::apache::mpm{ 'worker':
+        apache_version => $_apache_version,
       }
     }
     'Suse': {
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index 83263c3d02..d52583bec9 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -8,7 +8,7 @@
     AllowOverride FileInfo AuthConfig Limit Indexes
     Options <%= @options.join(' ') %>
     <Limit GET POST OPTIONS>
-      <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+      <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
       Require all granted
       <%- else -%>
       Order allow,deny
@@ -16,7 +16,7 @@
       <%- end -%>
     </Limit>
     <LimitExcept GET POST OPTIONS>
-      <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+      <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
       Require all granted
       <%- else -%>
       Order allow,deny

From 59e59e8b0f19fac0ad243cf25da5f23aaee9b3b1 Mon Sep 17 00:00:00 2001
From: scottmullaly <scott.mullaly@orionhealth.com>
Date: Tue, 13 Dec 2016 13:13:29 +1300
Subject: [PATCH 1033/2267] ModSec debug logs to use apache logroot parameter
 (#1560)

---
 README.md                         |  1 +
 manifests/mod/security.pp         |  2 ++
 spec/classes/mod/security_spec.rb | 16 ++++++++++++----
 templates/mod/security.conf.erb   |  8 ++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 510f34d5db..cf29eeb9fb 100644
--- a/README.md
+++ b/README.md
@@ -1915,6 +1915,7 @@ ${modsec\_dir}/activated\_rules.
 - `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') vs. Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set. Default: 'deny'. Fuller values can be set too like "log,auditlog,deny,status:406,tag:'SLA 24/7'"
 - `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. Default: '1500'
 - `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
+- `logroot`: Configures the location of audit and debug logs.  Defaults to apache log directory (Redhat: /var/log/httpd Debian: /var/log/apache2)
 - `audit_log_releavant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging. Defaults: '^(?:5|4(?!04))'.
 - `audit_log_parts`: Sets the sections to be put in the [audit log][]. Default: 'ABIJDEFHZ'
 - `anomaly_score_blocking`: De-/Activates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set. Default: off.
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index ae3d847299..4fab446500 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -1,4 +1,5 @@
 class apache::mod::security (
+  $logroot                    = $::apache::params::logroot,
   $crs_package                 = $::apache::params::modsec_crs_package,
   $activated_rules             = $::apache::params::modsec_default_rules,
   $modsec_dir                  = $::apache::params::modsec_dir,
@@ -61,6 +62,7 @@
   }
 
   # Template uses:
+  # - logroot
   # - $modsec_dir
   # - $audit_log_parts
   # - secpcrematchlimit
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index fe2f7e78bf..28b5e2642a 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -28,8 +28,12 @@
     it { should contain_file('security.conf').with(
       :path => '/etc/httpd/conf.modules.d/security.conf'
     ) }
-    it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$} }
-    it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABIJDEFHZ$} }
+    it { should contain_file('security.conf')
+      .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
+      .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
+      .with_content(%r{^\s+SecDebugLog /var/log/httpd/modsec_debug.log$})
+      .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$})
+    }
     it { should contain_file('/etc/httpd/modsecurity.d').with(
       :ensure => 'directory',
       :path   => '/etc/httpd/modsecurity.d',
@@ -99,8 +103,12 @@
     it { should contain_file('security.conf').with(
       :path => '/etc/apache2/mods-available/security.conf'
     ) }
-    it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$} }
-    it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABIJDEFHZ$} }
+    it { should contain_file('security.conf')
+      .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
+      .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
+      .with_content(%r{^\s+SecDebugLog /var/log/apache2/modsec_debug.log$})
+      .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$})
+    }
     it { should contain_file('/etc/modsecurity').with(
       :ensure => 'directory',
       :path   => '/etc/modsecurity',
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 96a325e62a..638332e52e 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -49,8 +49,8 @@
     SecArgumentSeparator &
     SecCookieFormat 0
 <%- if scope.lookupvar('::osfamily') == 'Debian' -%>
-    SecDebugLog /var/log/apache2/modsec_debug.log
-    SecAuditLog /var/log/apache2/modsec_audit.log
+    SecDebugLog <%= @logroot %>/modsec_debug.log
+    SecAuditLog <%= @logroot %>/modsec_audit.log
     SecTmpDir /var/cache/modsecurity
     SecDataDir /var/cache/modsecurity
     SecUploadDir /var/cache/modsecurity
@@ -61,8 +61,8 @@
     SecDataDir /var/lib/mod_security
     SecUploadDir /var/lib/mod_security
 <% else -%>
-    SecDebugLog /var/log/httpd/modsec_debug.log
-    SecAuditLog /var/log/httpd/modsec_audit.log
+    SecDebugLog <%= @logroot %>/modsec_debug.log
+    SecAuditLog <%= @logroot %>/modsec_audit.log
     SecTmpDir /var/lib/mod_security
     SecDataDir /var/lib/mod_security
     SecUploadDir /var/lib/mod_security

From cc9a7a5b91a74e57bc466fa25f2c5542c0814fcf Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <shoentjen@antagonist.nl>
Date: Tue, 13 Dec 2016 15:20:16 +0100
Subject: [PATCH 1034/2267] Add ability to set SSLStaplingReturnResponderErrors
 on server level

---
 README.md                    |  6 ++++++
 manifests/mod/ssl.pp         | 33 +++++++++++++++++++--------------
 spec/classes/mod/ssl_spec.rb |  9 +++++++++
 templates/mod/ssl.conf.erb   |  3 +++
 templates/vhost/_ssl.erb     |  4 ++--
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index cf29eeb9fb..dde2120a45 100644
--- a/README.md
+++ b/README.md
@@ -1185,6 +1185,12 @@ Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/cu
 
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
+##### `ssl_stapling_return_errors`
+
+Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive. No default. It is possible to override this on a vhost level.
+
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
 ##### `timeout`
 
 Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request. Default: 120.
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index dadb40edec..92c456360b 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,18 +1,19 @@
 class apache::mod::ssl (
-  $ssl_compression         = false,
-  $ssl_cryptodevice        = 'builtin',
-  $ssl_options             = [ 'StdEnvVars' ],
-  $ssl_openssl_conf_cmd    = undef,
-  $ssl_cipher              = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4',
-  $ssl_honorcipherorder    = true,
-  $ssl_protocol            = [ 'all', '-SSLv2', '-SSLv3' ],
-  $ssl_pass_phrase_dialog  = 'builtin',
-  $ssl_random_seed_bytes   = '512',
-  $ssl_sessioncachetimeout = '300',
-  $ssl_stapling            = false,
-  $ssl_mutex               = undef,
-  $apache_version          = undef,
-  $package_name            = undef,
+  $ssl_compression            = false,
+  $ssl_cryptodevice           = 'builtin',
+  $ssl_options                = [ 'StdEnvVars' ],
+  $ssl_openssl_conf_cmd       = undef,
+  $ssl_cipher                 = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4',
+  $ssl_honorcipherorder       = true,
+  $ssl_protocol               = [ 'all', '-SSLv2', '-SSLv3' ],
+  $ssl_pass_phrase_dialog     = 'builtin',
+  $ssl_random_seed_bytes      = '512',
+  $ssl_sessioncachetimeout    = '300',
+  $ssl_stapling               = false,
+  $ssl_stapling_return_errors = undef,
+  $ssl_mutex                  = undef,
+  $apache_version             = undef,
+  $package_name               = undef,
 ) {
   include ::apache
   include ::apache::mod::mime
@@ -70,6 +71,10 @@
 
   validate_bool($ssl_stapling)
 
+  if $ssl_stapling_return_errors != undef {
+    validate_bool($ssl_stapling_return_errors)
+  }
+
   $stapling_cache = $::osfamily ? {
     'debian'  => "\${APACHE_RUN_DIR}/ocsp(32768)",
     'redhat'  => '/run/httpd/ssl_stapling(32768)',
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 07c7f680d7..10badfa033 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -188,6 +188,15 @@
         end
         it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLUseStapling On$/)}
       end
+      context 'setting ssl_stapling_return_errors to true' do
+        let :params do
+          {
+            :apache_version => '2.4',
+            :ssl_stapling_return_errors => true,
+          }
+        end
+        it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLStaplingReturnResponderErrors On$/)}
+      end
     end
 
     context 'setting ssl_pass_phrase_dialog' do
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index c7b4cd9177..c4475cbe8d 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -22,6 +22,9 @@
   SSLHonorCipherOrder <%= scope.function_bool2httpd([@_ssl_honorcipherorder]) %>
 <% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %>
+  <%- if not @ssl_stapling_return_errors.nil? -%>
+  SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %>
+  <%- end -%>
   SSLStaplingCache "shmcb:<%= @stapling_cache %>"
 <% end -%>
   SSLCipherSuite <%= @ssl_cipher %>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index baf18a8970..ff82bc5bdc 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -49,7 +49,7 @@
   <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
   <%- end -%>
-  <%- if @ssl_stapling_return_errors && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  SSLStaplingReturnResponderErrors <%= @ssl_stapling_return_errors %>
+  <%- if not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %>
   <%- end -%>
 <% end -%>

From f34f900cdae41119e392942c6796b20523ba472a Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Tue, 13 Dec 2016 09:30:12 -0500
Subject: [PATCH 1035/2267] MODULES-2872 - clarified the use of "default_vhost
 => false"

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index cf29eeb9fb..9891d3b08c 100644
--- a/README.md
+++ b/README.md
@@ -323,6 +323,8 @@ class { 'apache':
 }
 ```
 
+> **Note**: When `default_vhost` is set to `false` you have to add at least one `apache::vhost` resource or Apache will not start.
+
 ## Usage
 
 ### Configuring virtual hosts
@@ -931,6 +933,8 @@ Configures a default virtual host when the class is declared. Valid options: Boo
 
 To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to false.
 
+> **Note**: Apache will not start without at least one virtual host. If you set this to false be sure to configure one elsewhere.
+
 ##### `dev_packages`
 
 Configures a specific dev package to use. Valid options: A string or array of strings. Default: Depends on the operating system.

From 97da04e94c929b8f136e941f7fefac8d1eae59f9 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Tue, 13 Dec 2016 12:10:25 -0800
Subject: [PATCH 1036/2267] (MODULES-4156) adds RequestHeader directive

---
 templates/vhost/_directories.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index addd03bc87..265a593550 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -317,6 +317,14 @@
          <%- end -%>
       <%- end -%>
     <%- end -%>
+    <% if directory['request_headers'] and ! directory['request_headers'].empty? -%>
+      ## Request Header rules
+      <%- Array(directory['request_headers']).each do |request_statement| -%>
+        <%- if request_statement != '' -%>
+            RequestHeader <%= request_statement %>
+        <%- end -%>
+      <%- end -%>
+    <% end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>

From 1a8a57fa0719291525b9fef42138bc86087185b0 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado.eng@gmail.com>
Date: Tue, 13 Dec 2016 21:08:18 -0200
Subject: [PATCH 1037/2267] (MODULES-4213) Allow global rewrite rules
 inheritance in vhosts (#1569)

* Allow global rewrite rules inheritance in vhosts

Apache module rewrite allows virtual hosts to inherit global rules
if their conf files contain the directive "RewriteOptions Inherit"
among rewrite rules

This change includes this directive depending on a boolean parameter
in apache::vhost class - rewrite_inherit - which defaults to false

* Include apache::vhost::rewrite_inherit parameter info in README

Parameter included in same issue and branch

* Add spec test for apache::vhost::rewrite_inherit parameter

* Add missing closing bracket in vhost_spec.rb

* Correct alignment in vhost_spec.rb

* Correct rewrite inherit content test in vhost_spec.rb

* Remove spec test for apache::vhost::rewrite_inherit parameter

Found no way of making spec test work with file content included by
Puppet template
---
 README.md                    | 29 +++++++++++++++++++++++++++++
 manifests/vhost.pp           |  1 +
 templates/vhost/_rewrite.erb |  3 +++
 3 files changed, 33 insertions(+)

diff --git a/README.md b/README.md
index 9891d3b08c..a9bf306f74 100644
--- a/README.md
+++ b/README.md
@@ -2889,6 +2889,35 @@ apache::vhost { 'site.name.fdqn':
 
 Refer to the [`mod_rewrite` documentation][`mod_rewrite`] for more details on what is possible with rewrite rules and conditions.
 
+##### `rewrite_inherit`
+
+Determines whether the virtual host inherits global rewrite rules. Default: false.
+
+Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or inside the virtual host `.conf` file. By default, virtual hosts do not inherit global settings. To activate inheritance, specify the `rewrites` parameter and set `rewrite_inherit` parameter to `true`:
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    <rules>,
+  ],
+  rewrite_inherit => true,
+}
+```
+
+> **Note**: The `rewrites` parameter is **required** for this to have effect
+
+###### Some background
+
+Apache activates global `Rewrite` rules inheritance if the virtual host files contains the following directives:
+
+``` ApacheConf
+RewriteEngine On
+RewriteOptions Inherit
+```
+
+Refer to the [official `mod_rewrite` documentation](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html), section "Rewriting in Virtual Hosts".
+
 ##### `scriptalias`
 
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as '/usr/scripts'. Default: undef.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 78a6191d90..b84081c925 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -103,6 +103,7 @@
   $rewrite_base                = undef,
   $rewrite_rule                = undef,
   $rewrite_cond                = undef,
+  $rewrite_inherit             = false,
   $setenv                      = [],
   $setenvif                    = [],
   $setenvifnocase              = [],
diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index 81e3bc4679..282733757c 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -1,6 +1,9 @@
 <%- if @rewrites -%>
   ## Rewrite rules
   RewriteEngine On
+  <%- if @rewrite_inherit -%>
+  RewriteOptions Inherit
+  <%- end -%>
   <%- if @rewrite_base -%>
   RewriteBase <%= @rewrite_base %>
   <%- end -%>

From 03f93e5b0706fa3f47068e33f8ba80c58bab81f8 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Tue, 13 Dec 2016 16:54:29 -0700
Subject: [PATCH 1038/2267] (maint) pin fast_gettext gem for rubies < 2.1.0

---
 Gemfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index 8a568f6a5a..3d46720d2f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,6 +47,8 @@ group :development do
   gem 'rubocop-rspec', '~> 1.6',            :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
   gem 'pry',                                :require => false
   gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem 'fast_gettext', '1.1.0',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem 'fast_gettext',                       :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
 end
 
 group :system_tests do

From 3ba1c4b0d7321410724b1276fcca4567610f6ea9 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Tue, 13 Dec 2016 23:31:30 +0000
Subject: [PATCH 1039/2267] (MODULES-4213) Adds spec test for rewrite_inherit

---
 spec/defines/vhost_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index af282575a5..1209946e2a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -343,6 +343,7 @@
           'rewrite_base'                => '/',
           'rewrite_rule'                => '^index\.html$ welcome.html',
           'rewrite_cond'                => '%{HTTP_USER_AGENT} ^MSIE',
+          'rewrite_inherit'             => true,
           'setenv'                      => ['FOO=/bin/true'],
           'setenvif'                    => 'Request_URI "\.gif$" object_is_image=gif',
           'setenvifnocase'              => 'REMOTE_ADDR ^127.0.0.1 localhost=true',
@@ -556,6 +557,8 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
+        :content => /^\s+RewriteOptions Inherit$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(

From 39f0b8e434ddb1fb094e6732c74372361b38571a Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Tue, 13 Dec 2016 22:35:49 +0000
Subject: [PATCH 1040/2267] (maint) fix a faulty conditional in vhost ssl
 template

---
 templates/vhost/_ssl.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index baf18a8970..8e1fe93794 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -43,7 +43,7 @@
   <%- if @ssl_openssl_conf_cmd -%>
   SSLOpenSSLConfCmd       <%= @ssl_openssl_conf_cmd %>
   <%- end -%>
-  <%- if not @ssl_stapling.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- if (not @ssl_stapling.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
   SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %>
   <%- end -%>
   <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>

From fbe126aa55419837cf887f73cc0cd275e974316c Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Tue, 22 Nov 2016 11:06:39 +0100
Subject: [PATCH 1041/2267] Move mod_env in its own class and load it when
 required

---
 README.md                            |  2 ++
 manifests/default_mods.pp            |  2 +-
 manifests/mod/env.pp                 |  3 +++
 manifests/vhost.pp                   | 14 +++++++++++---
 spec/acceptance/default_mods_spec.rb | 12 +++++++++---
 spec/defines/vhost_spec.rb           |  1 +
 6 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 manifests/mod/env.pp

diff --git a/README.md b/README.md
index cf29eeb9fb..e88278257c 100644
--- a/README.md
+++ b/README.md
@@ -166,6 +166,7 @@
 [`mod_dbd`]: http://httpd.apache.org/docs/current/mod/mod_dbd.html
 [`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
 [`mod_dumpio`]: https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
+[`mod_env`]: http://httpd.apache.org/docs/current/mod/mod_env.html
 [`mod_expires`]: https://httpd.apache.org/docs/current/mod/mod_expires.html
 [`mod_ext_filter`]: https://httpd.apache.org/docs/current/mod/mod_ext_filter.html
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
@@ -1363,6 +1364,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `dir`\*
 * `disk_cache` (see [`apache::mod::disk_cache`][])
 * `dumpio` (see [`apache::mod::dumpio`][])
+* `env`
 * `event` (see [`apache::mod::event`][])
 * `expires`
 * `ext_filter` (see [`apache::mod::ext_filter`][])
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index fd057d113f..879df595c1 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -152,7 +152,7 @@
     include ::apache::mod::authz_user
 
     ::apache::mod { 'authz_groupfile': }
-    ::apache::mod { 'env': }
+    include ::apache::mod::env
   } elsif $mods {
     ::apache::default_mods::load { $mods: }
 
diff --git a/manifests/mod/env.pp b/manifests/mod/env.pp
new file mode 100644
index 0000000000..b973005f4c
--- /dev/null
+++ b/manifests/mod/env.pp
@@ -0,0 +1,3 @@
+class apache::mod::env {
+  ::apache::mod { 'env': }
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 78a6191d90..3b7ea10a98 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -539,11 +539,19 @@
     }
   }
 
+  # Check if mod_env is required and not yet loaded.
+  # create an expression to simplify the conditional check
+  $use_env_mod = $setenv and ! empty($setenv)
+  if ($use_env_mod) {
+    if ! defined(Class['apache::mod::env']) {
+      include ::apache::mod::env
+    }
+  }
   # Check if mod_setenvif is required and not yet loaded.
   # create an expression to simplify the conditional check
-  $use_setenv_mod = ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) or ($setenvifnocase and ! empty($setenvifnocase))
+  $use_setenvif_mod = ($setenvif and ! empty($setenvif)) or ($setenvifnocase and ! empty($setenvifnocase))
 
-  if ($use_setenv_mod) {
+  if ($use_setenvif_mod) {
     if ! defined(Class['apache::mod::setenvif']) {
       include ::apache::mod::setenvif
     }
@@ -907,7 +915,7 @@
   # Template uses:
   # - $setenv
   # - $setenvif
-  if ($use_setenv_mod) {
+  if ($use_env_mod or $use_setenvif_mod) {
     concat::fragment { "${name}-setenv":
       target  => "${priority_real}${filename}.conf",
       order   => 220,
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 66790d2ffd..ab241e4551 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -34,12 +34,18 @@ class { 'apache':
           default_mods => false,
         }
         apache::vhost { 'defaults.example.com':
-          docroot => '#{$doc_root}/defaults',
-          aliases => {
+          docroot     => '#{$doc_root}/defaults',
+          aliases     => {
             alias => '/css',
             path  => '#{$doc_root}/css',
           },
-          setenv  => 'TEST1 one',
+          directories => [
+	        {
+              'path'            => "#{$doc_root}/admin",
+              'auth_basic_fake' => 'demo demopass',
+            }
+          ],
+          setenv      => 'TEST1 one',
         }
       EOS
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index af282575a5..9664816ab4 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -453,6 +453,7 @@
       it { is_expected.to contain_class('apache::mod::fastcgi') }
       it { is_expected.to contain_class('apache::mod::headers') }
       it { is_expected.to contain_class('apache::mod::filter') }
+      it { is_expected.to contain_class('apache::mod::env') }
       it { is_expected.to contain_class('apache::mod::setenvif') }
       it { is_expected.to contain_concat('30-rspec.example.com.conf').with({
         'owner'   => 'root',

From e9ca0ac0e5cc03c926b9a742a1df68671fd2978f Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Mon, 12 Dec 2016 20:08:51 -0700
Subject: [PATCH 1042/2267] Release 1.11.0 Prep

---
 CHANGELOG.md  | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
 metadata.json |  5 ++--
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1897558375..e921ccc215 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,73 @@
+## Supported Release 1.11.0
+#### Summary
+This release adds SLES12 Support and many more features and bugfixes.
+
+#### Features
+- (MODULES-4049) Adds SLES 12 Support
+- Adds additional directories options for LDAP Auth
+  - `auth_ldap_url`
+  - `auth_ldap_bind_dn`
+  - `auth_ldap_bind_password`
+  - `auth_ldap_group_attribute`
+  - `auth_ldap_group_attribute_is_dn`
+- Allows `mod_event` parameters to be unset
+- Allows management of default root directory access rights
+- Adds class `apache::vhosts` to create apache::vhost resources
+- Adds class `apache::mod::proxy_wstunnel`
+- Adds class `apache::mod::dumpio`
+- Adds class `apache::mod::socache_shmcb`
+- Adds class `apache::mod::authn_dbd`
+- Adds support for apache 2.4 on Amazon Linux
+- Support the newer `mod_auth_cas` config options
+- Adds `wsgi_script_aliases_match` parameter to `apache::vhost`
+- Allow to override all SecDefaultAction attributes
+- Add audit_log_relevant_status parameter to apache::mod::security
+- Allow absolute path to $apache::mod::security::activated_rules
+- Allow setting SecAuditLog
+- Adds `passenger_max_instances_per_app` to `mod::passenger`
+- Allow the proxy_via setting to be configured
+- Allow no_proxy_uris to be used within proxy_pass
+- Add rpaf.conf template parameter to `mod::rpaf`
+- Allow user to specify alternative package and library names for shibboleth module
+- Allows configuration of shibboleth lib path
+- Adds parameter `passenger_data_buffer_dir` to `mod::passenger`
+- Adds SSL stapling 
+- Allows use of `balance_manager` with `mod_proxy_balancer`
+- Raises lower bound of `stdlib` dependency to version 4.2
+- Adds support for Passenger repo on Amazon Linux
+- Add ability to set SSLStaplingReturnResponderErrors on server level 
+- (MODULES-4213) Allow global rewrite rules inheritance in vhosts
+- Moves `mod_env` to its own class and load it when required
+
+#### Bugfixes
+- Deny access to .ht and .hg, which are created by mercurial hg.
+- Instead of failing, include apache::mod::prefork in manifests/mod/itk.pp instead.
+- Only set SSLCompression when it is set to true.
+- Remove duplicate shib2 hash element
+- (MODULES-3388) Include mpm_module classes instead of class declaration
+- Updates `apache::balancer` to respect `apache::confd_dir`
+- Wrap mod_security directives in an IfModule
+- Fixes to various mods for Ubuntu Xenial
+- Fix /etc/modsecurity perms to match package
+- Fix PassengerRoot under Debian stretch
+- (MODULES-3476) Updates regex in apache_version custom fact to work with EL5
+- Dont sql_injection_attacks.data
+- Add force option to confd file resource to purge directory without warnings
+- Patch httpoxy through mod_security
+- Fixes config ordering of IncludeOptional
+- Fixes bug where port numbers were unquoted
+- Fixes bug where empty servername for vhost were written to template
+- Auto-load `slotmem_shm` and `lbmethod_byrequests` with `proxy_balancer` on 2.4
+- Simplify MPM setup on FreeBSD
+- Adds requirement for httpd package
+- Do not set ssl_certs_dir on FreeBSD
+- Fixes bug that produces a duplicate `Listen 443` after a package update on EL7
+- Fixes bug where custom facts break structured facts
+- Avoid relative classname inclusion
+- Fixes a failure in `vhost` if the first element of `$rewrites` is not a hash
+- (MODULES-3744) Process $crs_package before $modsec_dir
+- (MODULES-1491) Adds `::apache` include to mods that need it
+
 ## Supported Release 1.10.0
 #### Summary
 This release fixes backwards compatibility bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature.
diff --git a/metadata.json b/metadata.json
index 961c34a9d4..7bb2f12dbc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -55,7 +55,8 @@
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "11 SP1"
+        "11 SP1",
+        "12"
       ]
     },
     {

From aa11baed37639d37adfbb18f5431f597a6cedee8 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Thu, 15 Dec 2016 23:22:53 +0000
Subject: [PATCH 1043/2267] (maint) Fix conditional in vhost ssl template

---
 templates/vhost/_ssl.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 1ca7cbfbb0..c92f70c87b 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -49,7 +49,7 @@
   <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
   <%- end -%>
-  <%- if not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- if (not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
   SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %>
   <%- end -%>
 <% end -%>

From 90e50eedd7c8ba0d1e1c17ba678525630bb7e023 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Fri, 16 Dec 2016 15:57:46 +0000
Subject: [PATCH 1044/2267] (maint) Fix the vhost ssl template correctly this
 time

---
 templates/vhost/_ssl.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index c92f70c87b..e70efebda5 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -49,7 +49,7 @@
   <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
   <%- end -%>
-  <%- if (not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
+  <%- if (not @ssl_stapling_return_errors.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
   SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %>
   <%- end -%>
 <% end -%>

From 4d8608c32c6b2311237786d65b1009064714c968 Mon Sep 17 00:00:00 2001
From: kuchosauronad0 <andre.schmelzer@publicispixelpark.de>
Date: Thu, 22 Dec 2016 09:52:00 +0100
Subject: [PATCH 1045/2267] Add FileETag

---
 manifests/init.pp                         |  1 +
 spec/acceptance/apache_parameters_spec.rb | 16 ++++++++++++++++
 spec/classes/apache_spec.rb               |  8 ++++++++
 templates/httpd.conf.erb                  |  3 +++
 4 files changed, 28 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3ad7b293d3..692dc5afea 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -76,6 +76,7 @@
   $server_signature       = 'On',
   $trace_enable           = 'On',
   $allow_encoded_slashes  = undef,
+  $file_e_tag             = undef,
   $package_ensure         = 'installed',
   $use_optional_includes  = $::apache::params::use_optional_includes,
   $use_systemd            = $::apache::params::use_systemd,
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 923df6666c..bda99c5017 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -483,6 +483,22 @@ class { 'apache':
     end
   end
 
+  describe 'file_e_tag' do
+    it 'applys cleanly' do
+      pp = <<-EOS
+        class { 'apache':
+          file_e_tag  => 'None',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file($conf_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'FileETag None' }
+    end
+  end
+
   describe 'package_ensure' do
     it 'applys cleanly' do
       pp = <<-EOS
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 6eef4ba249..321b5e4152 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -110,6 +110,14 @@
       it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AllowEncodedSlashes nodecode$} }
     end
 
+    context "when specifying fileETag behaviour" do
+      let :params do
+        { :file_e_tag => 'None' }
+      end
+
+      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^FileETag None$} }
+    end
+
     context "when specifying default character set" do
       let :params do
         { :default_charset => 'none' }
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 4445d75ff8..4c22b17d77 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -61,6 +61,9 @@ EnableSendfile <%= @sendfile %>
 <%- if @allow_encoded_slashes -%>
 AllowEncodedSlashes <%= @allow_encoded_slashes %>
 <%- end -%>
+<%- if @file_e_tag -%>
+FileETag <%= @file_e_tag %>
+<%- end -%>
 
 #Listen 80
 

From 6ff47c4e5a5fe84439e116820db2d34a96e125e7 Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <shoentjen@antagonist.nl>
Date: Tue, 27 Dec 2016 15:30:39 +0100
Subject: [PATCH 1046/2267] Allow multiple ports per vhost

---
 README.md                     |  10 +++
 manifests/vhost.pp            |   9 +--
 spec/acceptance/vhost_spec.rb | 129 ++++++++++++++++++++++++++++++++++
 spec/defines/vhost_spec.rb    |  74 +++++++++++++++++++
 4 files changed, 218 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ae4a81b4a9..d68ec6786e 100644
--- a/README.md
+++ b/README.md
@@ -440,6 +440,16 @@ apache::vhost { 'ip.example.com':
 }
 ```
 
+You can configure multiple ports per virtual host by using an array of ports for the [`port`][] parameter:
+
+``` puppet
+apache::vhost { 'ip.example.com':
+  ip      => ['127.0.0.1'],
+  port    => ['80','8080']
+  docroot => '/var/www/ip',
+}
+```
+
 To configure a virtual host with [aliased servers][], refer to the aliases using the [`serveraliases`][] parameter:
 
 ``` puppet
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index fbd297f250..e28dff266d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -446,10 +446,11 @@
 
 
   if $ip {
-    $_ip = enclose_ipv6($ip)
+    $_ip = any2array(enclose_ipv6($ip))
     if $port {
-      $listen_addr_port = suffix(any2array($_ip),":${port}")
-      $nvh_addr_port = suffix(any2array($_ip),":${port}")
+      $_port = any2array($port)
+      $listen_addr_port = split(inline_template("<%= @_ip.product(@_port).map {|x| x.join(':')  }.join(',')%>"), ',')
+      $nvh_addr_port = split(inline_template("<%= @_ip.product(@_port).map {|x| x.join(':')  }.join(',')%>"), ',')
     } else {
       $listen_addr_port = undef
       $nvh_addr_port = $_ip
@@ -460,7 +461,7 @@
   } else {
     if $port {
       $listen_addr_port = $port
-      $nvh_addr_port = "${vhost_name}:${port}"
+      $nvh_addr_port = prefix(any2array($port),"${vhost_name}:")
     } else {
       $listen_addr_port = undef
       $nvh_addr_port = $name
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 200a83d22e..515465b9d0 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -260,6 +260,135 @@ class { 'apache':
     end
   end
 
+  context 'new vhost with multiple ports on 1 IP address' do
+    it 'should configure one apache vhost with 2 ports' do
+      pp = <<-EOS
+        class { 'apache':
+          default_vhost => false,
+        }
+        apache::vhost { 'example.com':
+          port     => ['80','8080'],
+          ip       => '127.0.0.1',
+          ip_based => true,
+          docroot  => '/var/www/html',
+        }
+        host { 'host1.example.com': ip => '127.0.0.1', }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => "Hello from vhost\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service($service_name) do
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{$vhost_dir}/25-example.com.conf") do
+      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080>' }
+      it { is_expected.to contain "ServerName example.com" }
+    end
+
+    describe file($ports_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Listen 127.0.0.1:80' }
+      it { is_expected.to contain 'Listen 127.0.0.1:8080' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:8080' }
+    end
+
+    it 'should answer to host1.example.com port 80' do
+      shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+
+    it 'should answer to host1.example.com port 8080' do
+      shell("/usr/bin/curl host1.example.com:8080", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+  end
+
+  context 'new vhost with multiple IP addresses on multiple ports' do
+    it 'should configure one apache vhost with 2 ip addresses and 2 ports' do
+      pp = <<-EOS
+        class { 'apache':
+          default_vhost => false,
+        }
+        apache::vhost { 'example.com':
+          port     => ['80', '8080'],
+          ip       => ['127.0.0.1','127.0.0.2'],
+          ip_based => true,
+          docroot  => '/var/www/html',
+        }
+        host { 'host1.example.com': ip => '127.0.0.1', }
+        host { 'host2.example.com': ip => '127.0.0.2', }
+        file { '/var/www/html/index.html':
+          ensure  => file,
+          content => "Hello from vhost\\n",
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe service($service_name) do
+      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { should be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
+    describe file("#{$vhost_dir}/25-example.com.conf") do
+      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080 127.0.0.2:80 127.0.0.2:8080>' }
+      it { is_expected.to contain "ServerName example.com" }
+    end
+
+    describe file($ports_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Listen 127.0.0.1:80' }
+      it { is_expected.to contain 'Listen 127.0.0.1:8080' }
+      it { is_expected.to contain 'Listen 127.0.0.2:80' }
+      it { is_expected.to contain 'Listen 127.0.0.2:8080' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:8080' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:80' }
+      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:8080' }
+    end
+
+    it 'should answer to host1.example.com port 80' do
+      shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+
+    it 'should answer to host1.example.com port 8080' do
+      shell("/usr/bin/curl host1.example.com:8080", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+
+    it 'should answer to host2.example.com port 80' do
+      shell("/usr/bin/curl host2.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+
+    it 'should answer to host2.example.com port 8080' do
+      shell("/usr/bin/curl host2.example.com:8080", {:acceptable_exit_codes => 0}) do |r|
+        expect(r.stdout).to eq("Hello from vhost\n")
+      end
+    end
+  end
+
   context 'new vhost with IPv6 address on port 80', :ipv6 do
     it 'should configure one apache vhost with an ipv6 address' do
       pp = <<-EOS
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3fd94bdefc..4796f0bf2a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -659,6 +659,80 @@
       it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') }
     end
 
+    context 'vhost with multiple ports' do
+      let :params do
+        {
+          'port'                        => ['80', '8080'],
+          'ip'                          => '127.0.0.1',
+          'ip_based'                    => true,
+          'servername'                  => 'example.com',
+          'docroot'                     => '/var/www/html',
+          'add_listen'                  => true,
+          'ensure'                      => 'present'
+        }
+      end
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :kernelversion          => '3.6.2',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+        :content => /[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[.\/m]*$/ ) }
+      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
+      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
+    end
+
+    context 'vhost with multiple ip addresses, multiple ports' do
+      let :params do
+        {
+          'port'                        => ['80', '8080'],
+          'ip'                          => ['127.0.0.1','::1'],
+          'ip_based'                    => true,
+          'servername'                  => 'example.com',
+          'docroot'                     => '/var/www/html',
+          'add_listen'                  => true,
+          'ensure'                      => 'present'
+        }
+      end
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :kernelversion          => '3.6.2',
+          :is_pe                  => false,
+        }
+      end
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+        :content => /[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[.\/m]*$/ ) }
+      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
+      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
+      it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
+      it { is_expected.to contain_concat__fragment('Listen [::1]:8080') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') }
+      it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:8080') }
+    end
+
     context 'vhost with ipv6 address' do
       let :params do
         {

From 0dcfa2a0109fc98a5fae76fb55cc9f4dbbb1c48c Mon Sep 17 00:00:00 2001
From: Florian Krupicka <krupicka@synyx.de>
Date: Mon, 2 Jan 2017 20:25:53 +0100
Subject: [PATCH 1047/2267] [apache::mod::cgi] Fix: ordering constraint for
 mod_cgi

`mod_cgi` is used on other MPM implementations than just `prefork`,
so we have to enforce resource ordering against these too.
---
 manifests/mod/cgi.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index a41bb6debd..272f0ccd05 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -2,7 +2,9 @@
   case $::osfamily {
     'FreeBSD': {}
     default: {
-      Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
+      if $::apache::mpm_module =~ /^(itk|peruser|prefork)$/ {
+        Class["::apache::mod::${::apache::mpm_module}"] -> Class['::apache::mod::cgi']
+      }
     }
   }
 

From 22a02ce039678bc64cf951b6c9cff6b7abc8766a Mon Sep 17 00:00:00 2001
From: Andre Schmelzer <andre.schmelzer@publicispixelpark.de>
Date: Tue, 3 Jan 2017 10:47:16 +0100
Subject: [PATCH 1048/2267] Add documentation for FileETag

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index d68ec6786e..4d1d2bedf7 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,7 @@
 [FastCGI]: http://www.fastcgi.com/
 [FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
 [`fallbackresource`]: #fallbackresource
+[`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag
 [filter rules]: https://httpd.apache.org/docs/current/filter.html
 [`filters`]: #filters
 [`ForceType`]: https://httpd.apache.org/docs/current/mod/core.html#forcetype
@@ -2377,6 +2378,12 @@ Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.ht
 
 If using fastcgi, this option sets the timeout for the server to respond.
 
+##### `file_e_tag`
+
+Sets the server default for the [`FileETag`][] declaration, which modifies the response header field for static files.
+Valid options: 'INode', 'MTime', 'Size', 'All', 'None'. 
+Default: undef, which uses Apache's default setting of 'MTime Size'.
+
 ##### `filters`
 
 [Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.

From 63ced3e69a1ec94c0160d2e854faf914bb220ea9 Mon Sep 17 00:00:00 2001
From: Wilson McCoubrey <wilson@puppet.com>
Date: Tue, 10 Jan 2017 10:53:26 +0000
Subject: [PATCH 1049/2267] [MODULES-4224] Implement
 beaker-module_install_helper

Gemfile updated by modulesync PR: puppetlabs/modulesync_configs#122
---
 Gemfile                        |  1 +
 spec/spec_helper_acceptance.rb | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3d46720d2f..5820775a36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,6 +59,7 @@ group :system_tests do
   gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')     if ! supports_windows
   gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')     if supports_windows
   gem 'beaker-puppet_install_helper',                                            :require => false
+  gem 'beaker-module_install_helper',                                            :require => false
   gem 'master_manipulator',                                                      :require => false
   gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 5d93612afc..c652104c25 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,8 +1,11 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
+require 'beaker/module_install_helper'
 
 run_puppet_install_helper
+install_module_on(hosts)
+install_module_dependencies_on(hosts)
 
 RSpec.configure do |c|
   c.filter_run :focus => true
@@ -12,9 +15,6 @@
     c.filter_run_excluding :ipv6 => true
   end
 
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
   # Readable test descriptions
   c.formatter = :documentation
 
@@ -42,11 +42,6 @@
 
     # Install module and dependencies
     hosts.each do |host|
-      copy_module_to(host, :source => proj_root, :module_name => 'apache')
-
-      on host, puppet('module','install','puppetlabs-stdlib')
-      on host, puppet('module','install','puppetlabs-concat')
-
       # Required for mod_passenger tests.
       if fact('osfamily') == 'RedHat'
         on host, puppet('module','install','stahnma/epel')

From 9c857600f166591fe41f33778b846a6569ecc801 Mon Sep 17 00:00:00 2001
From: Tom Kerremans <tom.kerremans@vrt.be>
Date: Tue, 27 Dec 2016 14:26:22 +0100
Subject: [PATCH 1050/2267] Add option AddCharset for Directory

---
 templates/vhost/_directories.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index addd03bc87..37865e7679 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -206,6 +206,9 @@
     <%- if directory['force_type'] -%>
     ForceType <%= directory['force_type'] %>
     <%- end -%>
+    <%- if directory['add_charset'] -%>
+    AddCharset <%= directory['add_charset'] %>
+    <%- end -%>
     <%- if directory['ssl_options'] -%>
     SSLOptions <%= Array(directory['ssl_options']).join(' ') %>
     <%- end -%>

From 4d9dde9e0a61cabe77767469804e9ed58004cbec Mon Sep 17 00:00:00 2001
From: Tom Kerremans <tom.kerremans@vrt.be>
Date: Tue, 27 Dec 2016 15:11:20 +0100
Subject: [PATCH 1051/2267] (MODULES-4248) Added documentation for add_charset

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index d68ec6786e..e2f208cf9a 100644
--- a/README.md
+++ b/README.md
@@ -2396,6 +2396,11 @@ apache::vhost { "$::fqdn":
 
 Sets the [`ForceType`][] directive, which forces Apache to serve all matching files with a [MIME `content-type`][] matching this parameter's value.
 
+#### `add_charset`
+
+Lets Apache set custom content character sets per directory and/or file extension
+
+
 ##### `headers`
 
 Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Valid options: A string, an array of strings, or undef. Default: undef.

From 02d001d4f0ccdbf95cd6441632588f3ff689813d Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 5 Jan 2017 15:30:53 -0800
Subject: [PATCH 1052/2267] (MODULES-4097) Sync travis.yml

---
 .fixtures.yml                                   |  1 +
 .gitignore                                      |  3 +++
 .sync.yml                                       | 17 -----------------
 .travis.yml                                     | 17 ++++-------------
 Gemfile                                         |  9 +++------
 .../site_apache/templates/fake.conf.erb         |  0
 6 files changed, 11 insertions(+), 36 deletions(-)
 rename spec/fixtures/{modules => }/site_apache/templates/fake.conf.erb (100%)

diff --git a/.fixtures.yml b/.fixtures.yml
index 6eddf260f6..66ad3e5370 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -5,3 +5,4 @@ fixtures:
     portage: "git://github.com/gentoo/puppet-portage.git"
   symlinks:
     apache: "#{source_dir}"
+    site_apache: "#{source_dir}/spec/fixtures/site_apache"
diff --git a/.gitignore b/.gitignore
index 0cd25de9af..3b6ff4e363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ coverage/
 log/
 .idea/
 *.iml
+.yardoc
+.yardwarns
+doc/
diff --git a/.sync.yml b/.sync.yml
index 29a1aafa7b..a397135701 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,21 +1,4 @@
 ---
-.travis.yml:
-  includes:
-  - rvm: 2.3.1
-    env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
-    bundler_args: --without system_tests
-  - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
-    bundler_args: --without system_tests
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-    bundler_args: --without system_tests
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
-    bundler_args: --without system_tests
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-    bundler_args: --without system_tests
 Rakefile:
   extra_disabled_lint_checks:
   - 'disable_only_variable_string'
diff --git a/.travis.yml b/.travis.yml
index e279ee3cb8..4981b25921 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 sudo: false
 language: ruby
 cache: bundler
-script: "bundle exec rake validate lint spec"
+script: "bundle exec rake release_checks"
 #Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
 before_install:
   - gem update bundler
@@ -24,18 +24,9 @@ matrix:
     sudo: required
   - rvm: 2.3.1
     bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
-  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.1.7
     bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
-  - rvm: 2.1.5
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index 5820775a36..c8c6cd996d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,12 +52,9 @@ group :development do
 end
 
 group :system_tests do
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20')                if supports_windows
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'])                             if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0') and ! supports_windows
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '< 3')                    if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0') and ! supports_windows
-  gem 'beaker-pe',                                                               :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
-  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')     if ! supports_windows
-  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')     if supports_windows
+  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
+  gem 'beaker-pe',                                                               :require => false
+  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])                
   gem 'beaker-puppet_install_helper',                                            :require => false
   gem 'beaker-module_install_helper',                                            :require => false
   gem 'master_manipulator',                                                      :require => false
diff --git a/spec/fixtures/modules/site_apache/templates/fake.conf.erb b/spec/fixtures/site_apache/templates/fake.conf.erb
similarity index 100%
rename from spec/fixtures/modules/site_apache/templates/fake.conf.erb
rename to spec/fixtures/site_apache/templates/fake.conf.erb

From 1c92e7a3fa91a9293ee2ea867a6bcd1be6298e17 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 19 Jan 2017 16:10:17 -0800
Subject: [PATCH 1053/2267] (MODULES-4098) Sync the rest of the files

---
 .gitignore      |  9 +++++++++
 .project        | 23 +++++++++++++++++++++++
 .sync.yml       |  2 ++
 CONTRIBUTING.md |  3 +--
 Gemfile         |  1 +
 MAINTAINERS.md  |  6 ++++++
 NOTICE          |  8 +++-----
 Rakefile        |  7 +++----
 8 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 .project
 create mode 100644 MAINTAINERS.md

diff --git a/.gitignore b/.gitignore
index 3b6ff4e363..f6e8b46c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,24 @@
 #This file is generated by ModuleSync, do not edit.
 pkg/
 Gemfile.lock
+Gemfile.local
 vendor/
 spec/fixtures/manifests/
 spec/fixtures/modules/
+log/
+junit/
 .vagrant/
 .bundle/
 coverage/
 log/
 .idea/
+.metadata
 *.iml
+.*.sw[op]
 .yardoc
 .yardwarns
+.DS_Store
+tmp/
+vendor/
 doc/
+
diff --git a/.project b/.project
new file mode 100644
index 0000000000..51770ab1ca
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>puppetlabs-apache</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.sync.yml b/.sync.yml
index a397135701..3a20deb37b 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,4 +1,6 @@
 ---
+appveyor.yml:
+  delete: true
 Rakefile:
   extra_disabled_lint_checks:
   - 'disable_only_variable_string'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3c3f1e7999..990edba7e7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ Checklist (and a short version for the impatient)
 
       - Make sure you have a [GitHub account](https://github.com/join)
 
-      - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
+      - [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
 
     * Preferred method:
 
@@ -215,4 +215,3 @@ Additional Resources
 * [General GitHub documentation](http://help.github.com/)
 
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-
diff --git a/Gemfile b/Gemfile
index c8c6cd996d..5d863251d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,7 @@ group :development do
   gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   gem 'fast_gettext', '1.1.0',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
   gem 'fast_gettext',                       :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem 'rainbow', '< 2.2.0',                 :require => false
 end
 
 group :system_tests do
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
index 0000000000..18a33881e0
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,6 @@
+## Maintenance
+
+Maintainers:
+  - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
+
+Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `apache`.
diff --git a/NOTICE b/NOTICE
index c07b29dc8e..77c13089ac 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,6 @@
-apache puppet module
+Puppet Module - puppetlabs-apache
 
-Copyright (C) 2012-2016 Puppet Labs, Inc.
-
-Puppet Labs can be contacted at: info@puppetlabs.com
+Copyright 2017 Puppet, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,4 +12,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index f4c70b8d35..3994519d9d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,9 @@
-require 'puppet_blacksmith/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 
+PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.send('disable_only_variable_string')
 
 desc 'Generate pooler nodesets'

From 1147eb8d8c72050b41f2cb7837e74f391cec4759 Mon Sep 17 00:00:00 2001
From: Pedro Adame <pedro@signlab.es>
Date: Mon, 30 Jan 2017 13:01:35 +0100
Subject: [PATCH 1054/2267] Document mod_rewrite with the rest of modules

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index d68ec6786e..dbc3abdca7 100644
--- a/README.md
+++ b/README.md
@@ -1871,6 +1871,10 @@ Installs and configures [`mod_reqtimeout`][].
 
 - `timeouts`: A string or [array][] that sets the [`RequestReadTimeout`][] option. Default: ['header=20-40,MinRate=500', 'body=20,MinRate=500'].
 
+##### Class: `apache::mod::rewrite`
+
+Installs and enables the Apache module `mod_rewrite`.
+
 ##### Class: `apache::mod::shib`
 
 Installs the [Shibboleth](http://shibboleth.net/) Apache module `mod_shib`, which enables SAML2 single sign-on (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. This class only installs and configures the Apache components of a web application that consumes Shibboleth SSO identities, also known as a Shibboleth Service Provider. You can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).

From 2e16cef6b1461c8b9b54f0c5114ac94b093c74b4 Mon Sep 17 00:00:00 2001
From: hex2a <root@localhost>
Date: Tue, 7 Feb 2017 14:58:58 +0100
Subject: [PATCH 1055/2267] (MODULES-4391) add SSLProxyVerifyDepth and
 SSLProxyCACertificateFile directive

---
 README.md                     | 8 ++++++++
 manifests/vhost.pp            | 8 ++++++++
 templates/vhost/_sslproxy.erb | 6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/README.md b/README.md
index d68ec6786e..97c67e242e 100644
--- a/README.md
+++ b/README.md
@@ -3800,6 +3800,14 @@ Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.ht
 
 Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server. Default: undef.
 
+##### `ssl_proxy_verify_depth`
+
+Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth) directive, which configures how deeply mod_ssl should verify before deciding that the remote server does not have a valid certificate. (A depth of 0 means that self-signed remote server certificates are accepted only, the default depth of 1 means the remote server certificate can be self-signed or has to be signed by a CA which is directly known to the server) Default: undef.
+
+##### `ssl_proxy_ca_cert`
+
+Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile) directive, which specifies an all-in-one file where you can assemble the Certificates of Certification Authorities (CA) whose remote servers you deal with. These are used for Remote Server Authentication. This file should be a concatenation of the PEM-encoded certificate files in order of preference. Default: undef.
+
 ##### `ssl_proxy_machine_cert`
 
 Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference. Default: undef.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e28dff266d..0a6ab0cfa1 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -26,6 +26,8 @@
   $ssl_verify_client           = undef,
   $ssl_verify_depth            = undef,
   $ssl_proxy_verify            = undef,
+  $ssl_proxy_verify_depth      = undef,
+  $ssl_proxy_ca_cert           = undef,
   $ssl_proxy_check_peer_cn     = undef,
   $ssl_proxy_check_peer_name   = undef,
   $ssl_proxy_check_peer_expire = undef,
@@ -294,6 +296,10 @@
     validate_re($ssl_proxy_verify,'^(none|optional|require|optional_no_ca)$',"${ssl_proxy_verify} is not permitted for ssl_proxy_verify. Allowed values are 'none', 'optional', 'require' or 'optional_no_ca'.")
   }
 
+  if $ssl_proxy_verify_depth {
+    validate_integer($ssl_proxy_verify_depth)
+  }
+
   if $ssl_proxy_check_peer_cn {
     validate_re($ssl_proxy_check_peer_cn,'(^on$|^off$)',"${ssl_proxy_check_peer_cn} is not permitted for ssl_proxy_check_peer_cn. Allowed values are 'on' or 'off'.")
   }
@@ -955,6 +961,8 @@
   # Template uses:
   # - $ssl_proxyengine
   # - $ssl_proxy_verify
+  # - $ssl_proxy_verify_depth
+  # - $ssl_proxy_ca_cert
   # - $ssl_proxy_check_peer_cn
   # - $ssl_proxy_check_peer_name
   # - $ssl_proxy_check_peer_expire
diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
index a92bab5524..6cb9216d40 100644
--- a/templates/vhost/_sslproxy.erb
+++ b/templates/vhost/_sslproxy.erb
@@ -5,6 +5,12 @@
   <%- if @ssl_proxy_verify -%>
   SSLProxyVerify <%= @ssl_proxy_verify %>
   <%- end -%>
+  <%- if @ssl_proxy_verify_depth -%>
+  SSLProxyVerifyDepth <%= @ssl_proxy_verify_depth %>
+  <%- end -%>
+  <%- if @ssl_proxy_ca_cert -%>
+  SSLProxyCACertificateFile "<%= @ssl_proxy_ca_cert %>"
+  <%- end -%>
   <%- if @ssl_proxy_check_peer_cn -%>
   SSLProxyCheckPeerCN     <%= @ssl_proxy_check_peer_cn %>
   <%- end -%>

From 340931b4c9a407c1e4090d0363e0412e12a3d571 Mon Sep 17 00:00:00 2001
From: Tobias Brox <tobias@redpill-linpro.com>
Date: Fri, 3 Mar 2017 14:01:36 +0100
Subject: [PATCH 1056/2267] The base tag also needs link rewriting,
 particularly in reverse proxy situations.  base tag is defined at
 https://www.w3schools.com/tags/tag_base.asp.  Including this ProxyHTMLLinks
 line is recommended i.e. at
 http://httpd.apache.org/docs/current/mod/mod_proxy_html.html#proxyhtmllinks
 and other places.

---
 templates/mod/proxy_html.conf.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/mod/proxy_html.conf.erb b/templates/mod/proxy_html.conf.erb
index fea15f393f..f2f0bc0ce7 100644
--- a/templates/mod/proxy_html.conf.erb
+++ b/templates/mod/proxy_html.conf.erb
@@ -11,6 +11,7 @@ ProxyHTMLLinks  form            action
 ProxyHTMLLinks  input           src usemap
 ProxyHTMLLinks  head            profileProxyHTMLLinks  base            href
 ProxyHTMLLinks  script          src for
+ProxyHTMLLinks  base            href
 
 ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \
                 onmouseover onmousemove onmouseout onkeypress \

From 813abee0046932d4b83dae290cb4c2f275fdf1cb Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 7 Mar 2017 14:47:11 +0000
Subject: [PATCH 1057/2267] reduce tests to mod_pagespeed to centos 7

---
 spec/acceptance/mod_pagespeed_spec.rb | 43 ++++++++-------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index c88d594484..1455d5630b 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -1,35 +1,20 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-# Don't run this test on Debian < 8 or Ubuntu < 12, because Debian doesn't like
-# updating packages and Pagespeed doesn't like old packages.
-describe 'apache::mod::pagespeed class', :unless =>
-  ((fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') < '8') or
-   (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') < '12') or
-   (fact('operatingsystem') == 'SLES' )) do
+# Only run the test on centos 7, this is to cut down on the different types of setup
+# required. Installing the dependancies are highly prone to failure.
+describe 'apache::mod::pagespeed class', :if =>
+  ((fact('operatingsystem') == 'CentOS' ) and
+   (fact('operatingsystemmajrelease') == '7' )) do
   context "default pagespeed config" do
     it 'succeeds in puppeting pagespeed' do
       pp= <<-EOS
-        if $::osfamily == 'Debian' {
-          class { 'apt': }
-
-          apt::source { 'mod-pagespeed':
-            key         => '7FAC5991',
-            key_server  => 'pgp.mit.edu',
-            location    => 'http://dl.google.com/linux/mod-pagespeed/deb/',
-            release     => 'stable',
-            repos       => 'main',
-            include_src => false,
-            before      => Class['apache'],
-          }
-        } elsif $::osfamily == 'RedHat' {
-         yumrepo { 'mod-pagespeed':
-          baseurl  => "http://dl.google.com/linux/mod-pagespeed/rpm/stable/$::architecture",
-            enabled  => 1,
-            gpgcheck => 1,
-            gpgkey   => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',
-            before   => Class['apache'],
-          }
+       yumrepo { 'mod-pagespeed':
+        baseurl  => "http://dl.google.com/linux/mod-pagespeed/rpm/stable/$::architecture",
+          enabled  => 1,
+          gpgcheck => 1,
+          gpgkey   => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',
+          before   => Class['apache'],
         }
 
         class { 'apache':
@@ -54,11 +39,7 @@ class { 'apache::mod::pagespeed':
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      else
-        it { should be_enabled }
-      end
+      it { should be_enabled }
       it { is_expected.to be_running }
     end
 

From 4b9d2caf149c286c7d99c05a79c69ad6ed75160b Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 7 Mar 2017 16:52:52 -0300
Subject: [PATCH 1058/2267] Include AdvertiseFrequency directive in
 cluster.conf template

---
 templates/mod/cluster.conf.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/mod/cluster.conf.erb b/templates/mod/cluster.conf.erb
index 6a998a0e96..831cce6c76 100644
--- a/templates/mod/cluster.conf.erb
+++ b/templates/mod/cluster.conf.erb
@@ -12,6 +12,9 @@ Listen <%= @ip %>:<%= @port %>
 
   ManagerBalancerName <%= @balancer_name %>
   ServerAdvertise <%= scope.function_bool2httpd([@server_advertise]) %>
+  <%- if @server_advertise == true and @advertise_frequency != nil -%>
+  AdvertiseFrequency <%= advertise_frequency %>
+  <%- end -%>
 
   <Location /mod_cluster_manager>
     SetHandler mod_cluster-manager

From 874c153f502ccdda9857f03594cbb0b59d1d98fc Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 7 Mar 2017 16:53:43 -0300
Subject: [PATCH 1059/2267] Add parameter for AdvertiseFrequency in class
 apache::mod::cluster

---
 manifests/mod/cluster.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/cluster.pp b/manifests/mod/cluster.pp
index a3a9f6c631..442b583525 100644
--- a/manifests/mod/cluster.pp
+++ b/manifests/mod/cluster.pp
@@ -9,6 +9,7 @@
   $manager_allowed_network = '127.0.0.1',
   $max_keep_alive_requests = 0,
   $server_advertise = true,
+  $advertise_frequency = undef,
 ) {
 
   include ::apache

From 1e87cd723cc7f898c64b70f0c9c7da55aa47daf5 Mon Sep 17 00:00:00 2001
From: Dirk Tepe <tepeds@miamioh.edu>
Date: Wed, 8 Mar 2017 14:16:55 -0500
Subject: [PATCH 1060/2267] Add param to allow management of values for
 AllowOverride in the userdir.conf template

This replaces the hardcoded list with an array join, similar to the existing Options line. The previously hardcoded values are used as the default for the overrides param.
---
 manifests/mod/userdir.pp       | 1 +
 templates/mod/userdir.conf.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 11e7cd5bec..ea6ee193dd 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -3,6 +3,7 @@
   $dir = 'public_html',
   $disable_root = true,
   $apache_version = undef,
+  $overrides = [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ],
   $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ],
 ) {
   include ::apache
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index d52583bec9..c02a9188d6 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -5,7 +5,7 @@
   UserDir <%= @home %>/*/<%= @dir %>
 
   <Directory "<%= @home %>/*/<%= @dir %>">
-    AllowOverride FileInfo AuthConfig Limit Indexes
+    AllowOverride <%= @overrides.join(' ') %>
     Options <%= @options.join(' ') %>
     <Limit GET POST OPTIONS>
       <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>

From abcf22893cb0bf8d1e201d5257258fc353af6834 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Thu, 9 Mar 2017 12:28:14 -0300
Subject: [PATCH 1061/2267] Include apache::mod::cluster::advertise_frequency
 in README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index dbc3abdca7..631abb88af 100644
--- a/README.md
+++ b/README.md
@@ -1606,6 +1606,7 @@ class { '::apache::mod::cluster':
 
 - `port`: mod_cluster listen port. Default: '6666'.
 - `server_advertise`: Whether the server should advertise. Default: true.
+- `advertise_frequency`: Interval between advertise messages in seconds[.miliseconds]. Default: 10.
 - `manager_allowed_network`: Network allowed to access the mod_cluster_manager. Default: '127.0.0.1'.
 - `keep_alive_timeout`: Keep-alive timeout. Default: 60.
 - `max_keep_alive_requests`: Max number of requests kept alive. Default: 0

From d23eb25d48bbac4b02718fc63b7b72ebea8b5d7f Mon Sep 17 00:00:00 2001
From: Wilson McCoubrey <wilson@puppet.com>
Date: Wed, 22 Mar 2017 15:06:21 +0000
Subject: [PATCH 1062/2267] [MODULES-4528] Replace Puppet.version.to_f version
 comparison from spec_helper.rb

---
 .gitattributes      |  6 +++---
 locales/config.yaml | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 locales/config.yaml

diff --git a/.gitattributes b/.gitattributes
index 900ea0cbb5..02d4646b9b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 #This file is generated by ModuleSync, do not edit.
-*.rb  eol=lf
+*.rb eol=lf
 *.erb eol=lf
-*.pp  eol=lf
-*.sh  eol=lf
+*.pp eol=lf
+*.sh eol=lf
diff --git a/locales/config.yaml b/locales/config.yaml
new file mode 100644
index 0000000000..ab8ed8ba30
--- /dev/null
+++ b/locales/config.yaml
@@ -0,0 +1,26 @@
+---
+# This is the project-specific configuration file for setting up
+# fast_gettext for your project.
+gettext:
+  # This is used for the name of the .pot and .po files; they will be
+  # called <project_name>.pot?
+  project_name: puppetlabs-apache
+  # This is used in comments in the .pot and .po files to indicate what
+  # project the files belong to and should bea little more desctiptive than
+  # <project_name>
+  package_name: puppetlabs-apache
+  # The locale that the default messages in the .pot file are in
+  default_locale: en
+  # The email used for sending bug reports.
+  bugs_address: docs@puppet.com
+  # The holder of the copyright.
+  copyright_holder: Puppet, Inc.
+  # This determines which comments in code should be eligible for translation.
+  # Any comments that start with this string will be externalized. (Leave
+  # empty to include all.)
+  comments_tag: TRANSLATOR
+  # Patterns for +Dir.glob+ used to find all files that might contain
+  # translatable content, relative to the project root directory
+  source_files:
+      - 'metadata.json'
+  
\ No newline at end of file

From 8f1a7ca1bd8687922eec500922e5210ab5e0a6e4 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Thu, 23 Mar 2017 12:11:58 +0000
Subject: [PATCH 1063/2267] (FM-6116) - Adding POT file for metadata.json

---
 locales/puppetlabs-apache.pot | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 locales/puppetlabs-apache.pot

diff --git a/locales/puppetlabs-apache.pot b/locales/puppetlabs-apache.pot
new file mode 100644
index 0000000000..7602dd885a
--- /dev/null
+++ b/locales/puppetlabs-apache.pot
@@ -0,0 +1,25 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-21 14:19+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.0.0\n"
+
+#. metadata.json
+#: .summary
+msgid ""
+"Installs, configures, and manages Apache virtual hosts, web services, and "
+"modules."
+msgstr ""
+
+#. metadata.json
+#: .description
+msgid "Module for Apache configuration"
+msgstr ""

From 0132c1705c1609c15861b293971d97bf4a56fd30 Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppet.com>
Date: Tue, 7 Feb 2017 15:54:21 -0800
Subject: [PATCH 1064/2267] (MODULES-4319) wip: edit apache module for loc

---
 README.md | 539 +++++++++++++++++++++++++++---------------------------
 1 file changed, 271 insertions(+), 268 deletions(-)

diff --git a/README.md b/README.md
index e9ff691082..870bc1e6c4 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
 [Installing specific modules]: #installing-specific-modules
 [Configuring FastCGI servers]: #configuring-fastcgi-servers-to-handle-php-files
 [Load balancing examples]: #load-balancing-examples
+[apache affects]: #what-the-apache-module-affects
 
 [Reference]: #reference
 [Public classes]: #public-classes
@@ -28,7 +29,7 @@
 
 [Development]: #development
 [Contributing]: #contributing
-[Running tests]: #running-tests
+[Testing]: #testing
 
 [`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
 [`add_listen`]: #add_listen
@@ -76,7 +77,7 @@
 [`apache::vhost::WSGIImportScript`]: #wsgiimportscript
 [Apache HTTP Server]: https://httpd.apache.org
 [Apache modules]: https://httpd.apache.org/docs/current/mod/
-[array]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_array.html
+[array]: https://docs.puppet.com/puppet/latest/reference/lang_data_array.html
 
 [audit log]: https://github.com/SpiderLabs/ModSecurity/wiki/ModSecurity-2-Data-Formats#audit-log
 
@@ -105,15 +106,15 @@
 
 [`EnableSendfile`]: https://httpd.apache.org/docs/current/mod/core.html#enablesendfile
 [enforcing mode]: http://selinuxproject.org/page/Guide/Mode
-[`ensure`]: https://docs.puppetlabs.com/references/latest/type.html#package-attribute-ensure
+[`ensure`]: https://docs.puppet.com/latest/type.html#package-attribute-ensure
 [`error_log_file`]: #error_log_file
 [`error_log_syslog`]: #error_log_syslog
 [`error_log_pipe`]: #error_log_pipe
 [`ExpiresByType`]: https://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype
-[exported resources]: http://docs.puppetlabs.com/latest/reference/lang_exported.md
+[exported resources]: http://docs.puppet.com/latest/reference/lang_exported.md
 [`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus
 
-[Facter]: http://docs.puppetlabs.com/facter/
+[Facter]: http://docs.puppet.com/facter/
 [FastCGI]: http://www.fastcgi.com/
 [FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
 [`fallbackresource`]: #fallbackresource
@@ -125,7 +126,7 @@
 [GeoIPScanProxyHeaders]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives
 [`gentoo/puppet-portage`]: https://github.com/gentoo/puppet-portage
 
-[Hash]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_hash.html
+[Hash]: https://docs.puppet.com/puppet/latest/reference/lang_data_hash.html
 
 [`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional
 [`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include
@@ -188,14 +189,14 @@
 [`mod_status`]: https://httpd.apache.org/docs/current/mod/mod_status.html
 [`mod_version`]: https://httpd.apache.org/docs/current/mod/mod_version.html
 [`mod_wsgi`]: https://modwsgi.readthedocs.org/en/latest/
-[module contribution guide]: https://docs.puppetlabs.com/forge/contributing.html
+[module contribution guide]: https://docs.puppet.com/forge/contributing.html
 [`mpm_module`]: #mpm_module
 [multi-processing module]: https://httpd.apache.org/docs/current/mpm.html
 
 [name-based virtual hosts]: https://httpd.apache.org/docs/current/vhosts/name-based.html
 [`no_proxy_uris`]: #no_proxy_uris
 
-[open source Puppet]: https://docs.puppetlabs.com/puppet/
+[open source Puppet]: https://docs.puppet.com/puppet/
 [`Options`]: https://httpd.apache.org/docs/current/mod/core.html#options
 
 [`path`]: #path
@@ -207,10 +208,10 @@
 [`proxy_pass`]: #proxy_pass
 [`ProxyPass`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass
 [`ProxySet`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset
-[Puppet Enterprise]: https://docs.puppetlabs.com/pe/
-[Puppet Forge]: https://forge.puppetlabs.com
-[Puppet Labs]: https://puppetlabs.com
-[Puppet module]: https://docs.puppetlabs.com/puppet/latest/reference/modules_fundamentals.html
+[Puppet Enterprise]: https://docs.puppet.com/pe/
+[Puppet Forge]: https://forge.puppet.com
+[Puppet]: https://puppet.com
+[Puppet module]: https://docs.puppet.com/puppet/latest/reference/modules_fundamentals.html
 [Puppet module's code]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp
 [`purge_configs`]: #purge_configs
 [`purge_vhost_dir`]: #purge_vhost_dir
@@ -233,7 +234,7 @@
 [`ServerRoot`]: https://httpd.apache.org/docs/current/mod/core.html#serverroot
 [`ServerTokens`]: https://httpd.apache.org/docs/current/mod/core.html#servertokens
 [`ServerSignature`]: https://httpd.apache.org/docs/current/mod/core.html#serversignature
-[Service attribute restart]: http://docs.puppetlabs.com/references/latest/type.html#service-attribute-restart
+[Service attribute restart]: http://docs.puppet.com/latest/type.html#service-attribute-restart
 [`source`]: #source
 [`SSLCARevocationCheck`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck
 [SSL certificate key file]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile
@@ -248,12 +249,12 @@
 [`suphp_addhandler`]: #suphp_addhandler
 [`suphp_configpath`]: #suphp_configpath
 [`suphp_engine`]: #suphp_engine
-[supported operating system]: https://forge.puppetlabs.com/supported#puppet-supported-modules-compatibility-matrix
+[supported operating system]: https://forge.puppet.com/supported#puppet-supported-modules-compatibility-matrix
 
 [`ThreadLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit
 [`ThreadsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadsperchild
 [`TimeOut`]: https://httpd.apache.org/docs/current/mod/core.html#timeout
-[template]: http://docs.puppetlabs.com/puppet/latest/reference/lang_template.html
+[template]: http://docs.puppet.com/puppet/latest/reference/lang_template.html
 [`TraceEnable`]: https://httpd.apache.org/docs/current/mod/core.html#traceenable
 
 [`verify_config`]: #verify_config
@@ -269,6 +270,7 @@
 
 1. [Module description - What is the apache module, and what does it do?][Module description]
 2. [Setup - The basics of getting started with apache][Setup]
+    - [What the apache module affects][apache affects]
     - [Beginning with Apache - Installation][Beginning with Apache]
 3. [Usage - The classes and defined types available for configuration][Usage]
     - [Configuring virtual hosts - Examples to help get started][Configuring virtual hosts]
@@ -291,7 +293,7 @@
 
 ## Setup
 
-**What the apache Puppet module affects:**
+### What the apache module affects:
 
 - Configuration files and directories (created and written to)
   - **WARNING**: Configurations *not* managed by Puppet will be purged.
@@ -301,11 +303,9 @@
 - Listened-to ports
 - `/etc/make.conf` on FreeBSD and Gentoo
 
-On Gentoo, this module depends on the [`gentoo/puppet-portage`][] Puppet module. Note that while several options apply or enable certain features and settings for Gentoo, it is not a [supported operating system][] for this module.
-
-> **Note**: This module modifies Apache configuration files and directories and purges any configuration not managed by Puppet. Apache configuration should be managed by Puppet, as unmanaged configuration files can cause unexpected failures.
-
-To temporarily disable full Puppet management, set the [`purge_configs`][] parameter in the [`apache`][] class declaration to false. We recommend using this only as a temporary means of saving and relocating customized configurations.
+> **Warning**: This module modifies Apache configuration files and directories and purges any configuration not managed by Puppet. Apache configuration should be managed by Puppet, as unmanaged configuration files can cause unexpected failures.
+>
+>To temporarily disable full Puppet management, set the [`purge_configs`][] parameter in the [`apache`][] class declaration to false. We recommend this only as a temporary means of saving and relocating customized configurations.
 
 ### Beginning with Apache
 
@@ -315,9 +315,17 @@ To have Puppet install Apache with the default parameters, declare the [`apache`
 class { 'apache': }
 ```
 
-The Puppet module applies a default configuration based on your operating system; Debian, Red Hat, FreeBSD, and Gentoo systems each have unique default configurations. These defaults work in testing environments but are not suggested for production, and Puppet recommends customizing the class's parameters to suit your site. Use the [Reference](#reference) section to find information about the class's parameters and their default values.
+When you declare this class with the default options, the module:
+
+- Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
+- Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system.
+- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
+- Creates a document root directory determined by your operating system, typically `/var/www`.
+- Starts the Apache service.
 
-You can customize parameters when declaring the `apache` class. For instance, this declaration installs Apache without the apache module's [default virtual host configuration][Configuring virtual hosts], allowing you to customize all Apache virtual hosts:
+Apache defaults depend on your operating system. These defaults work in testing environments but are not suggested for production. We recommend customizing the class's parameters to suit your site.
+
+For instance, this declaration installs Apache without the apache module's [default virtual host configuration][Configuring virtual hosts], allowing you to customize all Apache virtual hosts:
 
 ``` puppet
 class { 'apache':
@@ -325,7 +333,7 @@ class { 'apache':
 }
 ```
 
-> **Note**: When `default_vhost` is set to `false` you have to add at least one `apache::vhost` resource or Apache will not start.
+> **Note**: When `default_vhost` is set to `false`, you have to add at least one `apache::vhost` resource or Apache will not start. To establish a default virtual host, either set the `default_vhost` in the `apache` class or use the [`apache::vhost`][] defined type. You can also configure additional specific virtual hosts with the [`apache::vhost`][] defined type.
 
 ## Usage
 
@@ -333,7 +341,6 @@ class { 'apache':
 
 The default [`apache`][] class sets up a virtual host on port 80, listening on all interfaces and serving the [`docroot`][] parameter's default directory of `/var/www`.
 
-> **Note**: See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters.
 
 To configure basic [name-based virtual hosts][], specify the [`port`][] and [`docroot`][] parameters in the [`apache::vhost`][] defined type:
 
@@ -344,6 +351,8 @@ apache::vhost { 'vhost.example.com':
 }
 ```
 
+See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters.
+
 > **Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] defined type applies a default [`priority`][] of 15, which Puppet interprets by prefixing the virtual host's file name with `15-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to false, Apache still processes virtual hosts in alphabetical order.
 
 To configure user and group ownership for `docroot`, use the [`docroot_owner`][] and [`docroot_group`][] parameters:
@@ -431,7 +440,7 @@ apache::vhost { 'ip.example.com':
 }
 ```
 
-It is also possible to configure more than one IP address per virtual host by using an array of IP addresses for the [`ip`][] parameter:
+You can also configure more than one IP address per virtual host by using an array of IP addresses for the [`ip`][] parameter:
 
 ``` puppet
 apache::vhost { 'ip.example.com':
@@ -464,7 +473,7 @@ apache::vhost { 'aliases.example.com':
 }
 ```
 
-To set up a virtual host with a wildcard alias for the subdomain mapped to a same-named directory, such as 'http://example.com.loc' mapped to `/var/www/example.com`, define the wildcard alias using the [`serveraliases`][] parameter and the document root with the [`virtual_docroot`][] parameter:
+To set up a virtual host with a wildcard alias for the subdomain mapped to a directory of the same name, such as 'http://example.com.loc' mapped to `/var/www/example.com`, define the wildcard alias using the [`serveraliases`][] parameter and the document root with the [`virtual_docroot`][] parameter:
 
 ``` puppet
 apache::vhost { 'subdomain.loc':
@@ -493,7 +502,14 @@ apache::vhost { 'subdomain.loc':
 
 #### Configuring virtual hosts for apps and processors
 
-To set up a virtual host with [suPHP][], use the [`suphp_engine`][] parameter to enable the suPHP engine, [`suphp_addhandler`][] parameter to define a MIME type, [`suphp_configpath`][] to set which path suPHP passes to the PHP interpreter, and the [`directory`][] parameter to configure Directory, File, and Location directive blocks:
+To set up a virtual host with [suPHP][], use the following parameters:
+
+* [`suphp_engine`][], to enable the suPHP engine.
+* [`suphp_addhandler`][], to define a MIME type.
+* [`suphp_configpath`][], to set which path suPHP passes to the PHP interpreter.
+* [`directory`][], to configure Directory, File, and Location directive blocks.
+
+For example:
 
 ``` puppet
 apache::vhost { 'suphp.example.com':
@@ -513,7 +529,7 @@ apache::vhost { 'suphp.example.com':
 }
 ```
 
-You can use a set of parameters to configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) for [Python][] applications:
+To configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) for [Python][] applications, use the `wsgi` set of parameters:
 
 ``` puppet
 apache::vhost { 'wsgi.example.com':
@@ -536,7 +552,7 @@ apache::vhost { 'wsgi.example.com':
 }
 ```
 
-Starting in Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement for common RewriteRules. You can set a FallbackResource using the [`fallbackresource`][] parameter:
+As of Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement for common RewriteRules. You can set a FallbackResource using the [`fallbackresource`][] parameter:
 
 ``` puppet
 apache::vhost { 'wordpress.example.com':
@@ -570,7 +586,7 @@ apache::vhost { 'rack.example.com':
 
 #### Configuring IP-based virtual hosts
 
-You can configure [IP-based virtual hosts][] to listen on any port and have them respond to requests on specific IP addresses. In this example, we set the server to listen on ports 80 and 81 because the example virtual hosts are _not_ declared with a [`port`][] parameter:
+You can configure [IP-based virtual hosts][] to listen on any port and have them respond to requests on specific IP addresses. In this example, the server listens on ports 80 and 81, because the example virtual hosts are _not_ declared with a [`port`][] parameter:
 
 ``` puppet
 apache::listen { '80': }
@@ -578,7 +594,7 @@ apache::listen { '80': }
 apache::listen { '81': }
 ```
 
-Then we configure the IP-based virtual hosts with the [`ip_based`][] parameter:
+Configure the IP-based virtual hosts with the [`ip_based`][] parameter:
 
 ``` puppet
 apache::vhost { 'first.example.com':
@@ -594,7 +610,9 @@ apache::vhost { 'second.example.com':
 }
 ```
 
-You can also configure a mix of IP- and [name-based virtual hosts][], and in any combination of [SSL][SSL encryption] and unencrypted configurations. First, we add two IP-based virtual hosts on an IP address (in this example, 10.0.0.10). One uses SSL and the other is unencrypted:
+You can also configure a mix of IP- and [name-based virtual hosts][] in any combination of [SSL][SSL encryption] and unencrypted configurations. 
+
+In this example, we add two IP-based virtual hosts on an IP address (in this example, 10.0.0.10). One uses SSL and the other is unencrypted:
 
 ``` puppet
 apache::vhost { 'The first IP-based virtual host, non-ssl':
@@ -631,7 +649,7 @@ apache::vhost { 'third.example.com':
 }
 ```
 
-To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, you **must** set the [`add_listen`][] parameter to false to disable the default Apache setting of `Listen 80`, as it conflicts with the preceding IP-based virtual hosts.
+To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, you **must** disable the Apache default `Listen 80`, as it conflicts with the preceding IP-based virtual hosts. To do this, set the [`add_listen`][] parameter to `false`:
 
 ``` puppet
 apache::vhost { 'fourth.example.com':
@@ -796,23 +814,7 @@ Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balanc
 
 Guides the basic setup and installation of Apache on your system.
 
-When this class is declared with the default options, Puppet:
-
-- Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
-- Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system.
-- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
-- Creates a document root directory determined by your operating system, typically `/var/www`.
-- Starts the Apache service.
-
-You can simply declare the default `apache` class:
-
-``` puppet
-class { 'apache': }
-```
-
-You can establish a default virtual host in this class, by using the [`apache::vhost`][] defined type, or both. You can also configure additional specific virtual hosts with the [`apache::vhost`][] defined type. Puppet recommends customizing the `apache` class's declaration with the following parameters, as its default settings are not optimized for production.
-
-**Parameters within `apache`:**
+**`apache` class parameters:**
 
 ##### `allow_encoded_slashes`
 
@@ -850,15 +852,15 @@ Used as the [`AddDefaultCharset`][] directive in the main configuration file. De
 
 ##### `default_confd_files`
 
-Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system. Valid options: Boolean. Default: true.
+Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system. Valid options: Boolean. Default: `true`.
 
 ##### `default_mods`
 
-Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: true, false, or an array of Apache module names. Default: true.
+Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: `true`, `false`, or an array of Apache module names. Default: `true`.
 
-If this parameter's value is false, Puppet includes only the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] defined type.
+If this parameter's value is `false`, Puppet includes only the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] defined type.
 
-If true, Puppet installs additional modules, the list of which depends on the operating system as well as the [`apache_version`][] and [`mpm_module`][] parameters' values. As these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
+If `true`, Puppet installs additional modules, the list of which depends on the operating system as well as the [`apache_version`][] and [`mpm_module`][] parameters' values. As these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
 
 If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
@@ -918,9 +920,9 @@ While these default values result in a functioning Apache server, you **must** u
 
 ##### `default_ssl_vhost`
 
-Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean. Default: false.
+Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean. Default: `false`.
 
-If true, Puppet automatically configures the following virtual host using the [`apache::vhost`][] defined type:
+If `true`, Puppet automatically configures the following virtual host using the [`apache::vhost`][] defined type:
 
 ``` puppet
 apache::vhost { 'default-ssl':
@@ -937,15 +939,15 @@ apache::vhost { 'default-ssl':
 
 ##### `default_type`
 
-_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer and only exists for backwards compatibility in configuration files. Default: undef.
+_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer and only exists for backwards compatibility in configuration files. Default: `undef`.
 
 ##### `default_vhost`
 
-Configures a default virtual host when the class is declared. Valid options: Boolean. Default: true.
+Configures a default virtual host when the class is declared. Valid options: Boolean. Default: `true`.
 
-To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to false.
+To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to `false`.
 
-> **Note**: Apache will not start without at least one virtual host. If you set this to false be sure to configure one elsewhere.
+> **Note**: Apache will not start without at least one virtual host. If you set this to `false` be sure to configure one elsewhere.
 
 ##### `dev_packages`
 
@@ -954,7 +956,7 @@ Configures a specific dev package to use. Valid options: A string or array of st
 - **Red Hat:** 'httpd-devel'
 - **Debian 8/Ubuntu 13.10 or newer:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
 - **Older Debian/Ubuntu versions:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
-- **FreeBSD, Gentoo:** undef
+- **FreeBSD, Gentoo:** `undef`
 - **Suse:** ['libapr-util1-devel', 'libapr1-devel']
 
 Example for using httpd 2.4 from the IUS yum repo:
@@ -978,13 +980,13 @@ Sets the default [`DocumentRoot`][] location. Default: Determined by your operat
 
 ##### `error_documents`
 
-Determines whether to enable [custom error documents][] on the Apache server. Valid options: Boolean. Default: false.
+Determines whether to enable [custom error documents][] on the Apache server. Valid options: Boolean. Default: `false`.
 
 ##### `group`
 
 Sets the group ID that owns any Apache processes spawned to answer requests.
 
-By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To to prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to false.
+By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To to prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to `false`.
 
 > **Note**: Modifying this parameter only changes the group ID that Apache uses to spawn child processes to access resources. It does not change the user that owns the parent server process.
 
@@ -1064,19 +1066,19 @@ Changes the directory of Apache log files for the virtual host. Default: Determi
 
 ##### `logroot_mode`
 
-Overrides the default [`logroot`][] directory's mode. Default: undef.
+Overrides the default [`logroot`][] directory's mode. Default: `undef`.
 
 > **Note**: Do _not_ grant write access to the directory where the logs are stored without being aware of the consequences. See the [Apache documentation][Log security] for details.
 
 ##### `manage_group`
 
-When false, stops Puppet from creating the group resource. Valid options: Boolean. Default: true.
+When `false`, stops Puppet from creating the group resource. Valid options: Boolean. Default: `true`.
 
-If you have a group created from another Puppet module that you want to use to run Apache, set this to false. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
+If you have a group created from another Puppet module that you want to use to run Apache, set this to `false`. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
 
 ##### `manage_user`
 
-When false, stops Puppet from creating the user resource. Valid options: Boolean. Default: true.
+When `false`, stops Puppet from creating the user resource. Valid options: Boolean. Default: `true`.
 
 This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
 
@@ -1091,12 +1093,12 @@ Sets where Puppet places configuration files for your [Apache modules][]. Defaul
 
 ##### `mpm_module`
 
-Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Valid options: 'event', 'itk', 'peruser', 'prefork', 'worker', or false. Default: Determined by your operating system.
+Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Valid options: 'event', 'itk', 'peruser', 'prefork', 'worker', or `false`. Default: Determined by your operating system.
 
 - **Debian**: 'worker'
 - **FreeBSD, Gentoo, and Red Hat**: 'prefork'
 
-You must set this to false to explicitly declare the following classes with custom parameters:
+You must set this to `false` to explicitly declare the following classes with custom parameters:
 
 - [`apache::mod::event`][]
 - [`apache::mod::itk`][]
@@ -1122,19 +1124,19 @@ Sets the path to the file containing Apache ports configuration. Default: '{$con
 
 ##### `purge_configs`
 
-Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: true.
+Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: `true`.
 
-Setting this to false is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
+Setting this to `false` is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
 
 ##### `purge_vhost_dir`
 
 If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, the Boolean parameter `purge_vhost_dir` determines whether Puppet removes any configurations inside `vhost_dir` _not_ managed by Puppet. Valid options: Boolean. Default: same as [`purge_configs`][].
 
-Setting `purge_vhost_dir` to false is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
+Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
 ##### `rewrite_lock`
 
-Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your virtual host. Default: undef.
+Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your virtual host. Default: `undef`.
 
 This parameter only applies to Apache version 2.2 or lower and is ignored on newer versions.
 
@@ -1150,7 +1152,7 @@ Sets the Apache server administrator's contact information via Apache's [`Server
 
 Sets the Apache server name via Apache's [`ServerName`][] directive. Default: the 'fqdn' fact reported by [Facter][].
 
-Setting to false will not set ServerName at all.
+Setting to `false` will not set ServerName at all.
 
 ##### `server_root`
 
@@ -1171,13 +1173,13 @@ Controls how much information Apache sends to the browser about itself and the o
 
 ##### `service_enable`
 
-Determines whether Puppet enables the Apache HTTPD service when the system is booted. Valid options: Boolean. Default: true.
+Determines whether Puppet enables the Apache HTTPD service when the system is booted. Valid options: Boolean. Default: `true`.
 
 ##### `service_ensure`
 
-Determines whether Puppet should make sure the service is running. Valid options: 'true' (equivalent to 'running'), 'false' (equivalent to 'stopped'). Default: 'running'.
+Determines whether Puppet should make sure the service is running. Valid options: '`true`' (equivalent to 'running'), '`false`' (equivalent to 'stopped'). Default: 'running'.
 
-The 'false' or 'stopped' values set the 'httpd' service resource's `ensure` parameter to 'false', which is useful when you want to let the service be managed by another application, such as Pacemaker.
+The '`false`' or 'stopped' values set the 'httpd' service resource's `ensure` parameter to '`false`', which is useful when you want to let the service be managed by another application, such as Pacemaker.
 
 ##### `service_name`
 
@@ -1189,15 +1191,15 @@ Sets the name of the Apache service. Default: determined by your operating syste
 
 ##### `service_manage`
 
-Determines whether Puppet manages the HTTPD service's state. Valid options: Boolean. Default: true.
+Determines whether Puppet manages the HTTPD service's state. Valid options: Boolean. Default: `true`.
 
 ##### `service_restart`
 
-Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. Default: undef, which uses the [default Puppet behavior][Service attribute restart].
+Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. Default: `undef`, which uses the [default Puppet behavior][Service attribute restart].
 
 ##### `ssl_stapling`
 
-Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean. Default: false. It is possible to override this on a vhost level.
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean. Default: `false`. It is possible to override this on a vhost level.
 
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
@@ -1217,7 +1219,7 @@ Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceE
 
 ##### `use_systemd`
 
-Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs. Valid options: Boolean. Default: true.
+Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs. Valid options: Boolean. Default: `true`.
 
 ##### `file_mode`
 
@@ -1229,7 +1231,7 @@ Array of the desired options for the / directory in httpd.conf. Defaults to 'Fol
 
 ##### `root_directory_secured`
 
-Sets the default access policy for the / directory in httpd.conf. A value of 'false' allows access to all resources that are missing a more specific access policy. A value of 'true' denies access to all resources by default. In this case more specific rules must be used to allow access to these resources (e.g. in a directory block using the [`directories`](#parameter-directories-for-apachevhost) parameter). Valid options: Boolean. Default: false.
+Sets the default access policy for the / directory in httpd.conf. A value of '`false`' allows access to all resources that are missing a more specific access policy. A value of '`true`' denies access to all resources by default. In this case more specific rules must be used to allow access to these resources (e.g. in a directory block using the [`directories`](#parameter-directories-for-apachevhost) parameter). Valid options: Boolean. Default: `false`.
 
 ##### `vhost_dir`
 
@@ -1258,7 +1260,7 @@ Default: Puppet sets the default value via the [`apache::params`][] class, which
 - **FreeBSD**: 'www'
 - **Gentoo** and **Red Hat**: 'apache'
 
-To prevent Puppet from managing the user, set the [`manage_user`][] parameter to false.
+To prevent Puppet from managing the user, set the [`manage_user`][] parameter to `false`.
 
 ##### `apache_name`
 
@@ -1318,8 +1320,8 @@ Installs Apache development libraries. By default, the package name is defined b
 The default value is determined by your operating system:
 
 - **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions
-- **FreeBSD**: 'undef'; see note below
-- **Gentoo**: 'undef'
+- **FreeBSD**: '`undef`'; see note below
+- **Gentoo**: '`undef`'
 - **Red Hat**: 'httpd-devel'
 
 > **Note**: On FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
@@ -1471,7 +1473,7 @@ Installs and configures [`mod_diskio`][].
 
 ```puppet
 class{'apache':
-  default_mods => false,
+  default_mods => `false`,
   log_level    => 'dumpio:trace7',
 }
 class{'apache::mod::diskio':
@@ -1492,20 +1494,20 @@ Installs and manages [`mod_mpm_event`][]. You can't include both `apache::mod::e
 
 **Parameters within `apache::mod::event`**:
 
-- `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive. Default: '511'. Setting this to 'false' removes the parameter.
-- `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Default: '150'. Setting these to 'false' removes the parameters.
-- `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Default: '0'. Setting these to 'false' removes the parameters.
-- `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Default: '75' and '25', respectively. Setting these to 'false' removes the parameters.
-- `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Default: '25'. Setting this to 'false' removes the parameter.
-- `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Default: '2'. Setting this to 'false' removes the parameter.
-- `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Default: '64'. Setting this to 'false' removes the parameter.
-- `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. Default: '25'. Setting this to 'false' removes the parameter.
+- `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive. Default: '511'. Setting this to '`false`' removes the parameter.
+- `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Default: '150'. Setting these to '`false`' removes the parameters.
+- `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Default: '0'. Setting these to '`false`' removes the parameters.
+- `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Default: '75' and '25', respectively. Setting these to '`false`' removes the parameters.
+- `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Default: '25'. Setting this to '`false`' removes the parameter.
+- `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Default: '2'. Setting this to '`false`' removes the parameter.
+- `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Default: '64'. Setting this to '`false`' removes the parameter.
+- `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. Default: '25'. Setting this to '`false`' removes the parameter.
 
 ##### Class: `apache::mod::auth_cas`
 
 Installs and manages [`mod_auth_cas`][]. Its parameters share names with the Apache module's directives.
 
-The `cas_login_url` and `cas_validate_url` parameters are required; several other parameters have 'undef' default values.
+The `cas_login_url` and `cas_validate_url` parameters are required; several other parameters have '`undef`' default values.
 
 **Note**: The auth\_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL. See [https://github.com/Jasig/mod_auth_cas]()
 
@@ -1515,28 +1517,28 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
   validation is enabled. Default: CAS_
 - `cas_attribute_delimiter`: The delimiter between attribute values in the header created by `cas_attribute_prefix`.
   Default: ,
-- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. Default: undef.
-- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`. Default: undef.
-- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings. Default: undef.
-- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header. Default: undef.
-- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. Default: undef.
-- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies. Default: undef.
+- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. Default: `undef`.
+- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`. Default: `undef`.
+- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings. Default: `undef`.
+- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header. Default: `undef`.
+- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. Default: `undef`.
+- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies. Default: `undef`.
 - `cas_cookie_path`: Where cas cookie session data is stored. Should be writable by web server user. Default: OS dependent.
 - `cas_cookie_path_mode`: The mode of `cas_cookie_path`. Default: '0750'.
 - `cas_debug`: Determines whether to enable the module's debugging mode. Default: 'Off'.
-- `cas_idle_timeout`: Default: undef.
+- `cas_idle_timeout`: Default: `undef`.
 - `cas_login_url`: **Required**. Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and don't have an active session.
-- `cas_proxy_validate_url`: The URL to use when performing a proxy validation. Default: undef.
-- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. Default: undef.
+- `cas_proxy_validate_url`: The URL to use when performing a proxy validation. Default: `undef`.
+- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. Default: `undef`.
 - `cas_scrub_request_headers`: Remove inbound request headers that may have special meaning within mod_auth_cas.
 - `cas_sso_enabled`: Enables experimental support for single sign out (may mangle POST data). Default: off
-- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. Default: undef.
-- `cas_validate_depth`: Limits the depth for chained certificate validation. Default: undef.
+- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. Default: `undef`.
+- `cas_validate_depth`: Limits the depth for chained certificate validation. Default: `undef`.
 - `cas_validate_saml`: Parse response from CAS server for SAML. Default: Off
-- `cas_validate_server`: Should we validate the cert of the CAS server (depreciated in 1.1 - RedHat 7). Default: undef.
+- `cas_validate_server`: Should we validate the cert of the CAS server (depreciated in 1.1 - RedHat 7). Default: `undef`.
 - `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 - `cas_version`: The CAS protocol version to adhere to. Valid options: '1', '2'. Default: '2'.
-- `suppress_warning`: Don't wine about being on RedHat (Hint: mod_auth_cas package is now available in epel-testing repo). Default: false.
+- `suppress_warning`: Don't wine about being on RedHat (Hint: mod_auth_cas package is now available in epel-testing repo). Default: `false`.
 
 ##### Class: `apache::mod::auth_mellon`
 
@@ -1550,13 +1552,13 @@ class{ 'apache::mod::auth_mellon':
 
 **Parameters within `apache::mod::auth_mellon`**:
 
-- `mellon_cache_entry_size`: Maximum size for a single session. Default: undef.
+- `mellon_cache_entry_size`: Maximum size for a single session. Default: `undef`.
 - `mellon_cache_size`: Size in megabytes of the mellon cache. Default: 100.
 - `mellon_lock_file`: Location of lock file. Default: '`/run/mod_auth_mellon/lock`'.
 - `mellon_post_directory`: Full path where post requests are saved. Default: '`/var/cache/apache2/mod_auth_mellon/`'
-- `mellon_post_ttl`: Time to keep post requests. Default: undef.
-- `mellon_post_size`: Maximum size of post requests. Default: undef.
-- `mellon_post_count`: Maximum number of post requests. Default: undef.
+- `mellon_post_ttl`: Time to keep post requests. Default: `undef`.
+- `mellon_post_size`: Maximum size of post requests. Default: `undef`.
+- `mellon_post_count`: Maximum number of post requests. Default: `undef`.
 
 ##### Class: `apache::mod::authn_dbd`
 
@@ -1606,12 +1608,12 @@ class { '::apache::mod::cluster':
 **Parameters within `apache::mod::cluster`**:
 
 - `port`: mod_cluster listen port. Default: '6666'.
-- `server_advertise`: Whether the server should advertise. Default: true.
+- `server_advertise`: Whether the server should advertise. Default: `true`.
 - `advertise_frequency`: Interval between advertise messages in seconds[.miliseconds]. Default: 10.
 - `manager_allowed_network`: Network allowed to access the mod_cluster_manager. Default: '127.0.0.1'.
 - `keep_alive_timeout`: Keep-alive timeout. Default: 60.
 - `max_keep_alive_requests`: Max number of requests kept alive. Default: 0
-- `enable_mcpm_receive`: Whether MCPM should be enabled: Default: true.
+- `enable_mcpm_receive`: Whether MCPM should be enabled: Default: `true`.
 - `ip`: Listen ip address..
 - `allowed_network`: Balanced members network.
 - `version`: mod_cluster version. >= 1.3.0 is required for httpd 2.4.
@@ -1631,9 +1633,9 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 
 **Parameters within `apache::mod::expires`**:
 
-- `expires_active`: Enables generation of `Expires` headers for a document realm. Valid options: Boolean. Default: true.
-- `expires_default`: Default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][]. Default: undef.
-- `expires_by_type`: Describes a set of [MIME `content-type`][] and their expiration times. Valid options: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content-type` (i.e. 'text/json') and its value following valid [interval syntax][]. Default: undef.
+- `expires_active`: Enables generation of `Expires` headers for a document realm. Valid options: Boolean. Default: `true`.
+- `expires_default`: Default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][]. Default: `undef`.
+- `expires_by_type`: Describes a set of [MIME `content-type`][] and their expiration times. Valid options: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content-type` (i.e. 'text/json') and its value following valid [interval syntax][]. Default: `undef`.
 
 ##### Class: `apache::mod::ext_filter`
 
@@ -1650,7 +1652,7 @@ class { 'apache::mod::ext_filter':
 
 **Parameters within `apache::mod::ext_filter`**:
 
-- `ext_filter_define`: A hash of filter names and their parameters. Default: undef.
+- `ext_filter_define`: A hash of filter names and their parameters. Default: `undef`.
 
 ##### Class: `apache::mod::fcgid`
 
@@ -1693,13 +1695,13 @@ Installs and manages [`mod_geoip`][].
 **Parameters within `apache::mod::geoip`**:
 
 - `db_file`: Sets the path to your GeoIP database file. Valid options: a path, or an [array][] paths for multiple GeoIP database files. Default: `/usr/share/GeoIP/GeoIP.dat`.
-- `enable`: Determines whether to globally enable [`mod_geoip`][]. Valid options: Boolean. Default: false.
+- `enable`: Determines whether to globally enable [`mod_geoip`][]. Valid options: Boolean. Default: `false`.
 - `flag`: Sets the GeoIP flag. Valid options: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'. Default: 'Standard'.
 - `output`: Defines which output variables to use. Valid options: 'All', 'Env', 'Request', 'Notes'. Default: 'All'.
-- `enable_utf8`: Changes the output from ISO-8859-1 (Latin-1) to UTF-8. Valid options: Boolean. Default: undef.
-- `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option. Valid options: Boolean. Default: undef.
-- `scan_proxy_header_field`: Specifies which header [`mod_geoip`][] should look at to determine the client's IP address. Default: undef.
-- `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP if a comma-separated list of IP addresses is found. Valid options: Boolean. Default: undef.
+- `enable_utf8`: Changes the output from ISO-8859-1 (Latin-1) to UTF-8. Valid options: Boolean. Default: `undef`.
+- `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option. Valid options: Boolean. Default: `undef`.
+- `scan_proxy_header_field`: Specifies which header [`mod_geoip`][] should look at to determine the client's IP address. Default: `undef`.
+- `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP if a comma-separated list of IP addresses is found. Valid options: Boolean. Default: `undef`.
 
 ##### Class: `apache::mod::info`
 
@@ -1709,7 +1711,7 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 
 - `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server-info`. Valid options: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either. Default: ['127.0.0.1','::1'].
 - `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. Default: the value of [`$::apache::apache_version`][`apache_version`].
-- `restrict_access`: Determines whether to enable access restrictions. If false, the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: true.
+- `restrict_access`: Determines whether to enable access restrictions. If `false`, the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: `true`.
 
 ##### Class: `apache::mod::passenger`
 
@@ -1717,12 +1719,12 @@ Installs and manages [`mod_passenger`][]. For RedHat based systems, please ensur
 
 **Parameters within `apache::mod::passenger`**:
 
-- `passenger_high_performance` Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). Valid options: 'on', 'off'. Default: undef.
-- `passenger_pool_idle_time` Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime). Default: undef.
-- `passenger_max_pool_size` Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize). Default: undef.
-- `passenger_max_request_queue_size` Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize). Default: undef.
-- `passenger_max_requests` Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests). Default: undef.
-- `passenger_data_buffer_dir` Sets the [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir). Default: undef.
+- `passenger_high_performance` Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). Valid options: 'on', 'off'. Default: `undef`.
+- `passenger_pool_idle_time` Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime). Default: `undef`.
+- `passenger_max_pool_size` Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize). Default: `undef`.
+- `passenger_max_request_queue_size` Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize). Default: `undef`.
+- `passenger_max_requests` Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests). Default: `undef`.
+- `passenger_data_buffer_dir` Sets the [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir). Default: `undef`.
 
 ##### Class: `apache::mod::ldap`
 
@@ -1773,7 +1775,7 @@ While this Apache module requires the `mod-pagespeed-stable` package, Puppet **d
 **Parameters within `apache::mod::pagespeed`**:
 
 - `inherit_vhost_config`: Default: 'on'.
-- `filter_xhtml`: Default: false.
+- `filter_xhtml`: Default: `false`.
 - `cache_path`: Default: '/var/cache/mod\_pagespeed/'.
 - `log_dir`: Default: '/var/log/pagespeed'.
 - `memcache_servers`: Default: [].
@@ -1782,7 +1784,7 @@ While this Apache module requires the `mod-pagespeed-stable` package, Puppet **d
 - `enable_filters`: Default: [].
 - `forbid_filters`: Default: [].
 - `rewrite_deadline_per_flush_ms`: Default: 10.
-- `additional_domains`: Default: undef.
+- `additional_domains`: Default: `undef`.
 - `file_cache_size_kb`: Default: 102400.
 - `file_cache_clean_interval_ms`: Default: 3600000.
 - `lru_cache_per_process`: Default: 1024.
@@ -1814,7 +1816,7 @@ Installs and configures mod\_passenger
 
 **Parameters within `apache::mod::passenger`**:
 
-- `manage_repo`: Manage phusionpassenger.com repository. Default: true.
+- `manage_repo`: Manage phusionpassenger.com repository. Default: `true`.
 
 TODO: The parameters section is incomplete.
 
@@ -1892,10 +1894,10 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 **Parameters within `apache::mod::ssl`**:
 
 - `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
-- `ssl_compression`: Default: false.
+- `ssl_compression`: Default: `false`.
 - `ssl_cryptodevice`: Default: 'builtin'.
-- `ssl_honorcipherorder`: Default: true.
-- `ssl_openssl_conf_cmd`: Default: undef.
+- `ssl_honorcipherorder`: Default: `true`.
+- `ssl_openssl_conf_cmd`: Default: `undef`.
 - `ssl_options`: Default: [ 'StdEnvVars' ]
 - `ssl_pass_phrase_dialog`: Default: 'builtin'.
 - `ssl_protocol`: Default: [ 'all', '-SSLv2', '-SSLv3' ].
@@ -1907,7 +1909,7 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
   - Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'
   - Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'
 
-To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to true **or** the [`ssl`][] parameter in [`apache::vhost`][] to true.
+To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to `true` **or** the [`ssl`][] parameter in [`apache::vhost`][] to `true`.
 
 ##### Class: `apache::mod::status`
 
@@ -1964,12 +1966,12 @@ Enables Python support via [`mod_wsgi`][].
 
 **Parameters within `apache::mod::wsgi`**:
 
-- `mod_path`: Defines the path to the `mod_wsgi` shared object (`.so`) file. Default: undef.
+- `mod_path`: Defines the path to the `mod_wsgi` shared object (`.so`) file. Default: `undef`.
   - If the `mod_path` parameter doesn't contain `/`, Puppet prefixes it with your operating system's default module path.
 Otherwise, Puppet follows it literally.
-- `package_name`: Names the package that installs `mod_wsgi`. Default: undef.
-- `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. Valid options: path. Default: undef.
-- `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site-packages'. Valid options: path. Default: undef.
+- `package_name`: Names the package that installs `mod_wsgi`. Default: `undef`.
+- `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. Valid options: path. Default: `undef`.
+- `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site-packages'. Valid options: path. Default: `undef`.
 - `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE\_RUN\_DIR}WSGI". Default: `wsgi_socket_prefix` in [`apache::params`][].
 
 The class's parameters correspond to the module's directives. See the [module's documentation][`mod_wsgi`] for details.
@@ -2008,9 +2010,9 @@ Attempts to automatically detect the Apache version based on the operating syste
 
 #### Defined type: `apache::balancer`
 
-Creates an Apache load balancing group, also known as a balancer cluster, using [`mod_proxy`][]. Each load balancing group needs one or more balancer members, which you can declare in Puppet with the  [`apache::balancermember`][] define.
+Creates an Apache load balancing group, also known as a balancer cluster, using [`mod_proxy`][]. Each load balancing group needs one or more balancer members, which you can declare in Puppet with the  [`apache::balancermember`][] defined type.
 
-Declare one `apache::balancer` define for each Apache load balancing group. You can export `apache::balancermember` defined types for all balancer members and collect them on a single Apache load balancer server using [exported resources][].
+Declare one `apache::balancer` defined type for each Apache load balancing group. You can export `apache::balancermember` defined types for all balancer members and collect them on a single Apache load balancer server using [exported resources][].
 
 **Parameters within `apache::balancer`**:
 
@@ -2024,11 +2026,11 @@ Configures key-value pairs as [`ProxySet`][] lines. Valid options: a [hash][]. D
 
 ##### `collect_exported`
 
-Determines whether to use [exported resources][]. Valid options: Boolean. Default: true.
+Determines whether to use [exported resources][]. Valid options: Boolean. Default: `true`.
 
-If you statically declare all of your backend servers, set this parameter to false to rely on existing, declared balancer member resources. Also, use `apache::balancermember` with [array][] arguments.
+If you statically declare all of your backend servers, set this parameter to `false` to rely on existing, declared balancer member resources. Also, use `apache::balancermember` with [array][] arguments.
 
-To dynamically declare backend servers via exported resources collected on a central node, set this parameter to true to collect the balancer member resources exported by the balancer member nodes.
+To dynamically declare backend servers via exported resources collected on a central node, set this parameter to `true` to collect the balancer member resources exported by the balancer member nodes.
 
 If you don't use exported resources, a single Puppet run configures all balancer members. If you use exported resources, Puppet has to run on the balanced nodes first, then run on the balancer.
 
@@ -2052,7 +2054,7 @@ Specifies an [array][] of [options](https://httpd.apache.org/docs/current/mod/mo
 
 #### Defined type: `apache::custom_config`
 
-Adds a custom configuration file to the Apache server's `conf.d` directory. If the file is invalid and this defined type's [`verify_config`][] parameter's value is true, Puppet throws an error during a Puppet run.
+Adds a custom configuration file to the Apache server's `conf.d` directory. If the file is invalid and this defined type's [`verify_config`][] parameter's value is `true`, Puppet throws an error during a Puppet run.
 
 **Parameters within `apache::custom_config`**:
 
@@ -2076,7 +2078,7 @@ Sets the name of the file under `confdir` in which Puppet stores the configurati
 
 Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. Default: '25'.
 
-To omit the priority prefix in the configuration file's name, set this parameter to false.
+To omit the priority prefix in the configuration file's name, set this parameter to `false`.
 
 ##### `source`
 
@@ -2086,11 +2088,11 @@ Points to the configuration file's source. The [`content`][] and `source` parame
 
 Specifies the command Puppet uses to verify the configuration file. Use a fully qualified command. Default: `/usr/sbin/apachectl -t`.
 
-This parameter is only used if the [`verify_config`][] parameter's value is 'true'. If the `verify_command` fails, the Puppet run deletes the configuration file, does not notify the Apache service, and raises an error.
+This parameter is only used if the [`verify_config`][] parameter's value is '`true`'. If the `verify_command` fails, the Puppet run deletes the configuration file, does not notify the Apache service, and raises an error.
 
 ##### `verify_config`
 
-Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: true.
+Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: `true`.
 
 #### Defined type: `apache::fastcgi::server`
 
@@ -2156,7 +2158,7 @@ Sets the filename for the module's [`LoadFile`][] directive, which can also set
 
 ##### `loadfiles`
 
-Specifies an array of [`LoadFile`][] directives. Default: undef.
+Specifies an array of [`LoadFile`][] directives. Default: `undef`.
 
 ##### `path`
 
@@ -2182,11 +2184,11 @@ For the custom fragment's `order` parameter, the `apache::vhost` defined type us
 
 ##### `access_log`
 
-Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). Valid options: Boolean. Default: true.
+Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). Valid options: Boolean. Default: `true`.
 
 ##### `access_log_env_var`
 
-Specifies that only requests with particular environment variables be logged. Default: undef.
+Specifies that only requests with particular environment variables be logged. Default: `undef`.
 
 ##### `access_log_file`
 
@@ -2198,11 +2200,11 @@ Specifies the use of either a [`LogFormat`][] nickname or a custom-formatted str
 
 ##### `access_log_pipe`
 
-Specifies a pipe where Apache sends access log messages. Default: undef.
+Specifies a pipe where Apache sends access log messages. Default: `undef`.
 
 ##### `access_log_syslog`
 
-Sends all access log messages to syslog. Default: undef.
+Sends all access log messages to syslog. Default: `undef`.
 
 ##### `add_default_charset`
 
@@ -2210,13 +2212,13 @@ Sets a default media charset value for the [`AddDefaultCharset`][] directive, wh
 
 ##### `add_listen`
 
-Determines whether the virtual host creates a [`Listen`][] statement. Valid options: Boolean. Default: true.
+Determines whether the virtual host creates a [`Listen`][] statement. Valid options: Boolean. Default: `true`.
 
-Setting `add_listen` to false prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are.
+Setting `add_listen` to `false` prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are.
 
 ##### `use_optional_includes`
 
-Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer. Valid options: Boolean. Default: false.
+Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer. Valid options: Boolean. Default: `false`.
 
 ##### `additional_includes`
 
@@ -2252,11 +2254,11 @@ For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work
 
 > **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because you can precisely control the various alias directives' order. Defining `ScriptAliases` using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` directives. This often causes problems, for example with Nagios.
 
-If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is 'true', the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
+If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is '`true`', the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
 ##### `allow_encoded_slashes`
 
-Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Valid options: 'nodecode', 'off', 'on'. Default: undef, which omits the declaration from the server configuration and selects the Apache default setting of `Off`.
+Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Valid options: 'nodecode', 'off', 'on'. Default: `undef`, which omits the declaration from the server configuration and selects the Apache default setting of `Off`.
 
 ##### `block`
 
@@ -2298,11 +2300,11 @@ Sets the URL to use when validating a client-presented ticket in an HTTP query s
 
 ##### `custom_fragment`
 
-Passes a string of custom configuration directives to place at the end of the virtual host configuration. Default: undef.
+Passes a string of custom configuration directives to place at the end of the virtual host configuration. Default: `undef`.
 
 ##### `default_vhost`
 
-Sets a given `apache::vhost` defined type as the default to serve requests that do not match any other `apache::vhost` defined types. Default: false.
+Sets a given `apache::vhost` defined type as the default to serve requests that do not match any other `apache::vhost` defined types. Default: `false`.
 
 ##### `directories`
 
@@ -2310,13 +2312,13 @@ See the [`directories`](#parameter-directories-for-apachevhost) section.
 
 ##### `directoryindex`
 
-Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details. Default: undef.
+Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details. Default: `undef`.
 
 ##### `docroot`
 
 **Required**. Sets the [`DocumentRoot`][] location, from which Apache serves files.
 
-If `docroot` and [`manage_docroot`][] are both set to false, no [`DocumentRoot`][] will be set and the accompanying `<Directory /path/to/directory>` block will not be created.
+If `docroot` and [`manage_docroot`][] are both set to `false`, no [`DocumentRoot`][] will be set and the accompanying `<Directory /path/to/directory>` block will not be created.
 
 ##### `docroot_group`
 
@@ -2328,15 +2330,15 @@ Sets individual user access to the [`docroot`][] directory. Valid options: A str
 
 ##### `docroot_mode`
 
-Sets access permissions for the [`docroot`][] directory, in numeric notation. Valid options: A string. Default: undef.
+Sets access permissions for the [`docroot`][] directory, in numeric notation. Valid options: A string. Default: `undef`.
 
 ##### `manage_docroot`
 
-Determines whether Puppet manages the [`docroot`][] directory. Valid options: Boolean. Default: true.
+Determines whether Puppet manages the [`docroot`][] directory. Valid options: Boolean. Default: `true`.
 
 ##### `error_log`
 
-Specifies whether `*_error.log` directives should be configured. Valid options: Boolean. Default: true.
+Specifies whether `*_error.log` directives should be configured. Valid options: Boolean. Default: `true`.
 
 ##### `error_log_file`
 
@@ -2346,13 +2348,13 @@ If none of these parameters is set, given a virtual host `example.com`, Puppet d
 
 ##### `error_log_pipe`
 
-Specifies a pipe to send error log messages to. Default: undef.
+Specifies a pipe to send error log messages to. Default: `undef`.
 
 This parameter has no effect if the [`error_log_file`][] parameter has a value. If neither this parameter nor `error_log_file` has a value, Puppet then checks [`error_log_syslog`][].
 
 ##### `error_log_syslog`
 
-Determines whether to send all error log messages to syslog. Valid options: Boolean. Default: undef.
+Determines whether to send all error log messages to syslog. Valid options: Boolean. Default: `undef`.
 
 This parameter has no effect if either of the [`error_log_file`][] or [`error_log_pipe`][] parameters has a value. If none of these parameters has a value, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts.
 
@@ -2377,7 +2379,7 @@ Specifies if the virtual host is present or absent. Valid options: 'absent', 'pr
 
 ##### `fallbackresource`
 
-Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid options must either begin with a '/' or be 'disabled'. Default: undef.
+Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid options must either begin with a '/' or be 'disabled'. Default: `undef`.
 
 #####`fastcgi_idle_timeout`
 
@@ -2410,15 +2412,15 @@ Sets the [`ForceType`][] directive, which forces Apache to serve all matching fi
 
 ##### `headers`
 
-Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Valid options: A string, an array of strings, or undef. Default: undef.
+Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Valid options: A string, an array of strings, or `undef`. Default: `undef`.
 
 ##### `ip`
 
-Sets the IP address the virtual host listens on. Valid options: Strings. Default: undef, which uses Apache's default behavior of listening on all IPs.
+Sets the IP address the virtual host listens on. Valid options: Strings. Default: `undef`, which uses Apache's default behavior of listening on all IPs.
 
 ##### `ip_based`
 
-Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual host. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based virtual hosts. Default: false.
+Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual host. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based virtual hosts. Default: `false`.
 
 ##### `itk`
 
@@ -2446,7 +2448,7 @@ apache::vhost { 'sample.example.net':
 
 ##### `jk_mounts`
 
-Sets up a virtual host with 'JkMount' and 'JkUnMount' directives to handle the paths for URL mapping between Tomcat and Apache. Default: undef.
+Sets up a virtual host with 'JkMount' and 'JkUnMount' directives to handle the paths for URL mapping between Tomcat and Apache. Default: `undef`.
 
 The parameter must be an array of hashes where each hash must contain the 'worker' and either the 'mount' or 'unmount' keys.
 
@@ -2481,13 +2483,13 @@ This parameter is only relevant if either the global, server-wide [`keepalive` p
 
 ##### `auth_kerb`
 
-Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid options: Boolean. Default: false.
+Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid options: Boolean. Default: `false`.
 
 Usage typically looks like:
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  auth_kerb              => true,
+  auth_kerb              => `true`,
   krb_method_negotiate   => 'on',
   krb_auth_realms        => ['EXAMPLE.ORG'],
   krb_local_user_mapping => 'on',
@@ -2506,8 +2508,8 @@ Related parameters follow the names of `mod_auth_kerb` directives:
 - `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'.
 - `krb_authoritative`: If set to 'off', authentication controls can be passed on to another module. Default: 'on'.
 - `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: '[]'.
-- `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: undef.
-- `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: undef.
+- `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: `undef`.
+- `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: `undef`.
 
 ##### `krb_verify_kdc`
 
@@ -2531,15 +2533,15 @@ Determines whether or not to remove the logroot directory for a virtual host. Va
 
 ##### `logroot_mode`
 
-Overrides the mode the logroot directory is set to. Default: undef. Do *not* grant write access to the directory the logs are stored in without being aware of the consequences; for more information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
+Overrides the mode the logroot directory is set to. Default: `undef`. Do *not* grant write access to the directory the logs are stored in without being aware of the consequences; for more information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
 
 ##### `logroot_owner`
 
-Sets individual user access to the logroot directory. Defaults to 'undef'.
+Sets individual user access to the logroot directory. Defaults to '`undef`'.
 
 ##### `logroot_group`
 
-Sets group access to the [`logroot`][] directory. Defaults to 'undef'.
+Sets group access to the [`logroot`][] directory. Defaults to '`undef`'.
 
 ##### `log_level`
 
@@ -2551,7 +2553,7 @@ Configures the maximum request body size (in bytes) ModSecurity will accept for
 
 ###### `modsec_disable_vhost`
 
-Disables [`mod_security`][] on a virtual host. Only valid if [`apache::mod::security`][] is included. Valid options: Boolean. Default: undef.
+Disables [`mod_security`][] on a virtual host. Only valid if [`apache::mod::security`][] is included. Valid options: Boolean. Default: `undef`.
 
 ###### `modsec_disable_ids`
 
@@ -2571,11 +2573,11 @@ apache::vhost { 'sample.example.net':
 
 ###### `modsec_disable_ips`
 
-Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching. Default: undef.
+Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching. Default: `undef`.
 
 ###### `modsec_disable_msgs`
 
-Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing removal of an Msg from a specific location. Default: undef.
+Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing removal of an Msg from a specific location. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -2591,7 +2593,7 @@ apache::vhost { 'sample.example.net':
 
 ###### `modsec_disable_tags`
 
-Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing removal of an Tag from a specific location. Default: undef.
+Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing removal of an Tag from a specific location. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -2609,11 +2611,11 @@ apache::vhost { 'sample.example.net':
 
 Determines how to send mod_security audit log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
 
-If `modsec_audit_log_file` is set, it is relative to [`logroot`][]. Default: undef.
+If `modsec_audit_log_file` is set, it is relative to [`logroot`][]. Default: `undef`.
 
-If `modsec_audit_log_pipe` is set, it should start with a pipe. Example '|/path/to/mlogc /path/to/mlogc.conf'. Default: undef.
+If `modsec_audit_log_pipe` is set, it should start with a pipe. Example '|/path/to/mlogc /path/to/mlogc.conf'. Default: `undef`.
 
-If `modsec_audit_log` is true, given a virtual host---for instance, example.com---it defaults to 'example.com\_security\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_security.log' for unencrypted virtual hosts. Default: false.
+If `modsec_audit_log` is `true`, given a virtual host---for instance, example.com---it defaults to 'example.com\_security\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_security.log' for unencrypted virtual hosts. Default: `false`.
 
 When none of those parameters is set, the global audit log is used (i.e. ''/var/log/apache2/modsec\_audit.log'' on Debian and derivatives, ''/var/log/httpd/modsec\_audit.log'' on others).
 
@@ -2627,19 +2629,19 @@ This directive is equivalent to [`no_proxy_uris`][], but takes regular expressio
 
 ##### `proxy_preserve_host`
 
-Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). Valid options: Boolean. Default: false.
+Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). Valid options: Boolean. Default: `false`.
 
-Setting this parameter to true enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. Setting it to false sets this directive to 'Off'.
+Setting this parameter to `true` enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
 ##### `proxy_add_headers`
 
-Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders). Valid Options: Boolean. Default: false.
+Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders). Valid Options: Boolean. Default: `false`.
 
 This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
 ##### `proxy_error_override`
 
-Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content. Default: false.
+Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content. Default: `false`.
 
 ##### `options`
 
@@ -2700,7 +2702,7 @@ Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/refe
 
 ##### `passenger_high_performance`
 
-Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter. Valid options: 'true', 'false'. Default: undef.
+Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter. Valid options: '`true`', '`false`'. Default: `undef`.
 
 ##### `passenger_nodejs`
 
@@ -2708,7 +2710,7 @@ Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apa
 
 ##### `passenger_sticky_sessions`
 
-Sets the [`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions) parameter. Valid options: 'true', 'false'. Default: undef.
+Sets the [`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions) parameter. Valid options: '`true`', '`false`'. Default: `undef`.
 
 ##### `passenger_startup_file`
 
@@ -2734,15 +2736,15 @@ If nothing matches the priority, the first name-based virtual host is used. Like
 
 > **Note:** You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
 
-To omit the priority prefix in file names, pass a priority of false.
+To omit the priority prefix in file names, pass a priority of `false`.
 
 ##### `proxy_dest`
 
-Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Default: undef.
+Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Default: `undef`.
 
 ##### `proxy_pass`
 
-Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'. Optionally parameters can be added as an array.
+Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to '`undef`'. Optionally parameters can be added as an array.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -2786,15 +2788,15 @@ This directive is equivalent to [`proxy_pass`][], but takes regular expressions,
 
 ##### `rack_base_uris`
 
-Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Default: undef.
+Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Default: `undef`.
 
 #####`passenger_base_uris`
 
-Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. Default: undef.
+Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. Default: `undef`.
 
 ##### `redirect_dest`
 
-Specifies the address to redirect to. Default: undef.
+Specifies the address to redirect to. Default: `undef`.
 
 ##### `redirect_source`
 
@@ -2810,7 +2812,7 @@ apache::vhost { 'site.name.fdqn':
 
 ##### `redirect_status`
 
-Specifies the status to append to the redirect. Default: undef.
+Specifies the status to append to the redirect. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -2821,7 +2823,7 @@ apache::vhost { 'site.name.fdqn':
 
 ##### `redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
 
-Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Default: undef.
+Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -2834,7 +2836,7 @@ apache::vhost { 'site.name.fdqn':
 
 ##### `request_headers`
 
-Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Default: undef.
+Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -2847,7 +2849,7 @@ apache::vhost { 'site.name.fdqn':
 ```
 ##### `rewrites`
 
-Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Default: undef.
+Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Default: `undef`.
 
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
@@ -2858,7 +2860,7 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-The parameter allows rewrite conditions that, when true, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
+The parameter allows rewrite conditions that, when `true`, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -2921,7 +2923,7 @@ Refer to the [`mod_rewrite` documentation][`mod_rewrite`] for more details on wh
 
 ##### `rewrite_inherit`
 
-Determines whether the virtual host inherits global rewrite rules. Default: false.
+Determines whether the virtual host inherits global rewrite rules. Default: `false`.
 
 Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or inside the virtual host `.conf` file. By default, virtual hosts do not inherit global settings. To activate inheritance, specify the `rewrites` parameter and set `rewrite_inherit` parameter to `true`:
 
@@ -2931,7 +2933,7 @@ apache::vhost { 'site.name.fdqn':
   rewrites => [
     <rules>,
   ],
-  rewrite_inherit => true,
+  rewrite_inherit => `true`,
 }
 ```
 
@@ -2950,7 +2952,7 @@ Refer to the [official `mod_rewrite` documentation](https://httpd.apache.org/doc
 
 ##### `scriptalias`
 
-Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as '/usr/scripts'. Default: undef.
+Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as '/usr/scripts'. Default: `undef`.
 
 ##### `scriptaliases`
 
@@ -2983,7 +2985,7 @@ The ScriptAlias and ScriptAliasMatch directives are created in the order specifi
 
 ##### `serveradmin`
 
-Specifies the email address Apache displays when it renders one of its error pages. Default: undef.
+Specifies the email address Apache displays when it renders one of its error pages. Default: `undef`.
 
 ##### `serveraliases`
 
@@ -3018,7 +3020,7 @@ Used by HTTPD to conditionally set environment variables for virtual hosts (case
 Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
 
 * `suphp_addhandler`. Default: 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian and Gentoo.
-* `suphp_configpath`. Default: undef on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian and Gentoo.
+* `suphp_configpath`. Default: `undef` on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian and Gentoo.
 * `suphp_engine`. Valid options: 'on' or 'off'. Default: 'off'.
 
 An example virtual host configuration with suPHP:
@@ -3042,7 +3044,7 @@ Enables name-based virtual hosting. If no IP is passed to the virtual host, but
 
 ##### `virtual_docroot`
 
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Default: false.
+Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Default: `false`.
 
 ``` puppet
 apache::vhost { 'subdomain.loc':
@@ -3058,13 +3060,13 @@ apache::vhost { 'subdomain.loc':
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi).
 
-* `wsgi_daemon_process`: A hash that sets the name of the WSGI daemon, accepting [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html). Default: undef.
-* `wsgi_daemon_process_options`. _Optional._ Default: undef.
-* `wsgi_process_group`: Sets the group ID that the virtual host runs under. Default: undef.
-* `wsgi_script_aliases`: Requires a hash of web paths to filesystem .wsgi paths. Default: undef.
-* `wsgi_script_aliases_match`: Requires a hash of web path regexes to filesystem .wsgi paths. Default: undef
-* `wsgi_pass_authorization`: Uses the WSGI application to handle authorization instead of Apache when set to 'On'. For more information, see [mod_wsgi's WSGIPassAuthorization documentation] (https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html). Default: undef, leading Apache to use its default value of 'Off'.
-* `wsgi_chunked_request`: Enables support for chunked requests. Default: undef.
+* `wsgi_daemon_process`: A hash that sets the name of the WSGI daemon, accepting [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html). Default: `undef`.
+* `wsgi_daemon_process_options`. _Optional._ Default: `undef`.
+* `wsgi_process_group`: Sets the group ID that the virtual host runs under. Default: `undef`.
+* `wsgi_script_aliases`: Requires a hash of web paths to filesystem .wsgi paths. Default: `undef`.
+* `wsgi_script_aliases_match`: Requires a hash of web path regexes to filesystem .wsgi paths. Default: `undef`
+* `wsgi_pass_authorization`: Uses the WSGI application to handle authorization instead of Apache when set to 'On'. For more information, see [mod_wsgi's WSGIPassAuthorization documentation] (https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html). Default: `undef`, leading Apache to use its default value of 'Off'.
+* `wsgi_chunked_request`: Enables support for chunked requests. Default: `undef`.
 
 An example virtual host configuration with WSGI:
 
@@ -3344,7 +3346,7 @@ apache::vhost { 'first.example.com':
   docroot     => '/var/www/first',
   directories => [
     { path         => '/var/www/first',
-      geoip_enable => true,
+      geoip_enable => `true`,
     },
   ],
 }
@@ -3731,11 +3733,11 @@ All of the SSL parameters for `::vhost` default to whatever is set in the base `
 
 ##### `ssl`
 
-Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Valid options: Boolean. Default: false.
+Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Valid options: Boolean. Default: `false`.
 
 ##### `ssl_ca`
 
-Specifies the SSL certificate authority. Default: undef.
+Specifies the SSL certificate authority. Default: `undef`.
 
 ##### `ssl_cert`
 
@@ -3751,7 +3753,7 @@ Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.htm
 
 ##### `ssl_honorcipherorder`
 
-Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), to cause Apache to use the server's preferred order of ciphers rather than the client's preferred order. Default: true. In addition to true/false Boolean values, will also accept case-insensitive Strings 'on' or 'off'.
+Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), to cause Apache to use the server's preferred order of ciphers rather than the client's preferred order. Default: `true`. In addition to `true`/`false` Boolean values, will also accept case-insensitive Strings 'on' or 'off'.
 
 ##### `ssl_certs_dir`
 
@@ -3759,24 +3761,24 @@ Specifies the location of the SSL certification directory. Default: Depends on t
 
 - **Debian:** '/etc/ssl/certs'
 - **Red Hat:** '/etc/pki/tls/certs'
-- **FreeBSD:** undef
+- **FreeBSD:** `undef`
 - **Gentoo:** '/etc/ssl/apache2'
 
 ##### `ssl_chain`
 
-Specifies the SSL chain. Default: undef. This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.
+Specifies the SSL chain. Default: `undef`. This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.
 
 ##### `ssl_crl`
 
-Specifies the certificate revocation list to use. Default: undef. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the certificate revocation list to use. Default: `undef`. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 ##### `ssl_crl_path`
 
-Specifies the location of the certificate revocation list. Default: undef. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the location of the certificate revocation list. Default: `undef`. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 ##### `ssl_crl_check`
 
-Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck). Default: undef. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck). Default: `undef`. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
 
 ##### `ssl_key`
 
@@ -3784,7 +3786,7 @@ Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tl
 
 ##### `ssl_verify_client`
 
-Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid options are: 'none', 'optional', 'require', and 'optional_no_ca'. Default: undef.
+Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid options are: 'none', 'optional', 'require', and 'optional_no_ca'. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -3795,7 +3797,7 @@ apache::vhost { 'sample.example.net':
 
 ##### `ssl_verify_depth`
 
-Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Default: undef.
+Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -3805,16 +3807,16 @@ apache::vhost { 'sample.example.net':
 ```
 ##### `ssl_proxy_protocol`
 
-Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) directive, which controls the SSL protocol flavors mod_ssl should use when establishing its server environment for proxy. It will only connect to servers using one of the provided protocols. Default: undef.
+Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) directive, which controls the SSL protocol flavors mod_ssl should use when establishing its server environment for proxy. It will only connect to servers using one of the provided protocols. Default: `undef`.
 
 
 ##### `ssl_proxy_verify`
 
-Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server. Default: undef.
+Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server. Default: `undef`.
 
 ##### `ssl_proxy_machine_cert`
 
-Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference. Default: undef.
+Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -3825,19 +3827,19 @@ apache::vhost { 'sample.example.net':
 
 ##### `ssl_proxy_check_peer_cn`
 
-Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
+Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: `undef`.
 
 ##### `ssl_proxy_check_peer_name`
 
-Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: undef.
+Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: `undef`.
 
 ##### `ssl_proxy_check_peer_expire`
 
-Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not. Valid options: 'on', 'off'. Default: undef.
+Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not. Valid options: 'on', 'off'. Default: `undef`.
 
 ##### `ssl_options`
 
-Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given virtual host and can be a string or an array. Default: undef.
+Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given virtual host and can be a string or an array. Default: `undef`.
 
 A string:
 
@@ -3859,15 +3861,15 @@ apache::vhost { 'sample.example.net':
 
 ##### `ssl_openssl_conf_cmd`
 
-Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. Default: undef.
+Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. Default: `undef`.
 
 ##### `ssl_proxyengine`
 
-Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid options: Boolean. Default: true.
+Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid options: Boolean. Default: `true`.
 
 ##### `ssl_stapling`
 
-Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean or undef. Default: undef, meaning use what is set globally.
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean or `undef`. Default: `undef`, meaning use what is set globally.
 
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
@@ -3895,7 +3897,7 @@ Ex:
 apache::fastcgi::server { 'php':
   host        => '127.0.0.1:9000',
   timeout     => 15,
-  flush       => false,
+  flush       => `false`,
   faux_path   => '/var/www/php.fcgi',
   fcgi_alias  => '/php.fcgi',
   file_type   => 'application/x-httpd-php',
@@ -3969,7 +3971,7 @@ Sets the relative load order for Apache HTTPD VirtualHost configuration files. D
 
 ##### `verify_config`
 
-Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: true.
+Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: `true`.
 
 
 ### Private defined types
@@ -3996,25 +3998,6 @@ The Apache module relies heavily on templates to enable the [`apache::vhost`][]
 
 ## Limitations
 
-### Ubuntu 10.04
-
-The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
-
-### Ubuntu 16.04
-The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
-
-### RHEL/CentOS 5
-
-The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested since repositories are missing compatible packages.
-
-### RHEL/CentOS 6
-
-The [`apache::mod::passenger`][] class is not installing as the the EL6 repository is missing compatible packages.
-
-### RHEL/CentOS 7
-
-The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested as the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uris`][] parameter.
-
 ### General
 
 This module is CI tested against both [open source Puppet][] and [Puppet Enterprise][] on:
@@ -4026,14 +4009,31 @@ This module is CI tested against both [open source Puppet][] and [Puppet Enterpr
 
 This module also provides functions for other distributions and operating systems, such as FreeBSD, Gentoo, and Amazon Linux, but is not formally tested on them and are subject to regressions.
 
-### Ubuntu 10.04
+### FreeBSD
+
+In order to use this module on FreeBSD, you _must_ use apache24-2.4.12 (www/apache24) or newer.
+
+### Gentoo
 
-The [`apache::vhost::wsgi_import_script`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
+On Gentoo, this module depends on the [`gentoo/puppet-portage`][] Puppet module. Although several options apply or enable certain features and settings for Gentoo, it is not a [supported operating system][] for this module.
 
 ### RHEL/CentOS
 The [`apache::mod::auth_cas`][], [`apache::mod::passenger`][], [`apache::mod::proxy_html`][] and [`apache::mod::shib`][] classes are not functional on RH/CentOS without providing dependency packages from extra repositories.
 
-See their respective documentation above for related repositories and packages.
+See their respective documentation below for related repositories and packages.
+
+#### RHEL/CentOS 5
+
+The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested because repositories are missing compatible packages.
+
+#### RHEL/CentOS 6
+
+The [`apache::mod::passenger`][] class is not installing, because the the EL6 repository is missing compatible packages.
+
+#### RHEL/CentOS 7
+
+The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested because the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uris`][] parameter.
+
 
 ### SELinux and custom paths
 
@@ -4082,21 +4082,24 @@ apache::vhost { 'test.server':
 
 You need to set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
-### FreeBSD
+### Ubuntu 10.04
 
-In order to use this module on FreeBSD, you _must_ use apache24-2.4.12 (www/apache24) or newer.
+The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
+
+### Ubuntu 16.04
+The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
 
 ## Development
 
 ### Contributing
 
-[Puppet Labs][] modules on the [Puppet Forge][] are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve.
+[Puppet][] modules on the [Puppet Forge][] are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve.
 
 We want to make it as easy as possible to contribute changes so our modules work in your environment, but we also need contributors to follow a few guidelines to help us maintain and improve the modules' quality.
 
 For more information, please read the complete [module contribution guide][].
 
-### Running tests
+### Testing
 
 This project contains tests for both [rspec-puppet][] and [beaker-rspec][] to verify functionality. For detailed information on using these tools, please see their respective documentation.
 

From a85e983a7aaaaf45fb120b3762df1e38bf7f9409 Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppet.com>
Date: Fri, 24 Mar 2017 11:18:57 -0700
Subject: [PATCH 1065/2267] wip loc edit README

---
 README.md | 267 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 181 insertions(+), 86 deletions(-)

diff --git a/README.md b/README.md
index 870bc1e6c4..2e484279f6 100644
--- a/README.md
+++ b/README.md
@@ -318,9 +318,9 @@ class { 'apache': }
 When you declare this class with the default options, the module:
 
 - Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
-- Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system.
+- Places the required configuration files in a directory, with the [default location](#conf_dir) Depends on operating system.
 - Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
-- Creates a document root directory determined by your operating system, typically `/var/www`.
+- Creates a document root directory Depends on operating system, typically `/var/www`.
 - Starts the Apache service.
 
 Apache defaults depend on your operating system. These defaults work in testing environments but are not suggested for production. We recommend customizing the class's parameters to suit your site.
@@ -818,15 +818,21 @@ Guides the basic setup and installation of Apache on your system.
 
 ##### `allow_encoded_slashes`
 
-Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. Valid options: 'on', 'off', 'nodecode'. Default: undef, which omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
+Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. Valid options: 'on', 'off', 'nodecode'. If not specified, omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
+
+Default: `undef`.
 
 ##### `apache_version`
 
-Configures module template behavior, package names, and default Apache modules by defining the version of Apache to use. Default: Determined by your operating system family and release via the [`apache::version`][] class. Puppet recommends against manually configuring this parameter without reason.
+Configures module template behavior, package names, and default Apache modules by defining the version of Apache to use. We do not recommend manually configuring this parameter without reason.
+
+Default: Depends on operating system and release via the [`apache::version`][] class. 
 
 ##### `conf_dir`
 
-Sets the directory where the Apache server's main configuration file is located. Default: Depends on your operating system.
+Sets the directory where the Apache server's main configuration file is located.
+
+Default: Depends on operating system.
 
 - **Debian**: `/etc/apache2`
 - **FreeBSD**: `/usr/local/etc/apache22`
@@ -835,11 +841,15 @@ Sets the directory where the Apache server's main configuration file is located.
 
 ##### `conf_template`
 
-Defines the [template][] used for the main Apache configuration file. Default: `apache/httpd.conf.erb`. Modifying this parameter is potentially risky, as the apache Puppet module is designed to use a minimal configuration file customized by `conf.d` entries.
+Defines the [template][] used for the main Apache configuration file. Modifying this parameter is potentially risky, as the apache module is designed to use a minimal configuration file customized by `conf.d` entries.
+
+Default: `apache/httpd.conf.erb`.
 
 ##### `confd_dir`
 
-Sets the location of the Apache server's custom configuration directory. Default: Depends on your operating system.
+Sets the location of the Apache server's custom configuration directory. 
+
+Default: Depends on operating system.
 
 - **Debian**: `/etc/apache2/conf.d`
 - **FreeBSD**: `/usr/local/etc/apache22`
@@ -848,83 +858,102 @@ Sets the location of the Apache server's custom configuration directory. Default
 
 ##### `default_charset`
 
-Used as the [`AddDefaultCharset`][] directive in the main configuration file. Default: undef.
+Used as the [`AddDefaultCharset`][] directive in the main configuration file.
+
+Default: `undef`.
 
 ##### `default_confd_files`
 
-Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system. Valid options: Boolean. Default: `true`.
+Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system.
+
+Boolean. Default: `true`.
 
 ##### `default_mods`
 
-Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: `true`, `false`, or an array of Apache module names. Default: `true`.
+Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: Boolean or an array of Apache module names. 
 
-If this parameter's value is `false`, Puppet includes only the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] defined type.
+If `false`, Puppet includes only the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] defined type.
 
 If `true`, Puppet installs additional modules, the list of which depends on the operating system as well as the [`apache_version`][] and [`mpm_module`][] parameters' values. As these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
 
 If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
+Default: `true`.
+
 ##### `default_ssl_ca`
 
-Sets the default certificate authority for the Apache server. Default: undef.
+Sets the default certificate authority for the Apache server.
 
-While this default value results in a functioning Apache server, you **must** update this parameter with your certificate authority information before deploying this server in a production environment.
+Although this default value results in a functioning Apache server, you **must** update this parameter with your certificate authority information before deploying this server in a production environment.
+
+Boolean. Default: `undef`.
 
 ##### `default_ssl_cert`
 
-Sets the [SSL encryption][] certificate location. Default: Determined by your operating system.
+Sets the [SSL encryption][] certificate location.
+
+While the default value results in a functioning Apache server, you **must** update this parameter with your certificate location before deploying this server in a production environment.
+
+Default: Depends on operating system.
 
 - **Debian**: `/etc/ssl/certs/ssl-cert-snakeoil.pem`
 - **FreeBSD**: `/usr/local/etc/apache22/server.crt`
 - **Gentoo**: `/etc/ssl/apache2/server.crt`
 - **Red Hat**: `/etc/pki/tls/certs/localhost.crt`
 
-While the default value results in a functioning Apache server, you **must** update this parameter with your certificate location before deploying this server in a production environment.
-
 ##### `default_ssl_chain`
 
-Sets the default [SSL chain][] location. Default: undef.
+Sets the default [SSL chain][] location.
+
+Although this default value results in a functioning Apache server, you **must** update this parameter with your SSL chain before deploying this server in a production environment.
 
-While this default value results in a functioning Apache server, you **must** update this parameter with your SSL chain before deploying this server in a production environment.
+Default: `undef`.
 
 ##### `default_ssl_crl`
 
-Sets the path of the default [certificate revocation list][] (CRL) file to use. Default: undef.
+Sets the path of the default [certificate revocation list][] (CRL) file to use.
 
-While this default value results in a functioning Apache server, you **must** update this parameter with your CRL file's path before deploying this server in a production environment. You can use this parameter with or in place of the [`default_ssl_crl_path`][].
+Although this default value results in a functioning Apache server, you **must** update this parameter with your CRL file's path before deploying this server in a production environment. You can use this parameter with or in place of the [`default_ssl_crl_path`][].
+
+Default: `undef`.
 
 ##### `default_ssl_crl_path`
 
-Sets the server's [certificate revocation list path][], which contains your CRLs. Default: undef.
+Sets the server's [certificate revocation list path][], which contains your CRLs.
+
+Although this default value results in a functioning Apache server, you **must** update this parameter with the CRL path before deploying this server in a production environment.
 
-While this default value results in a functioning Apache server, you **must** update this parameter with the CRL path before deploying this server in a production environment.
+Default: `undef`.
 
 ##### `default_ssl_crl_check`
 
-Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. Default: undef.
+Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-While this default value results in a functioning Apache server, you **must** specify this parameter when using certificate revocation lists in a production environment.
+Although this default value results in a functioning Apache server, you **must** specify this parameter when using certificate revocation lists in a production environment.
 
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+Default: `undef`.
 
 ##### `default_ssl_key`
 
-Sets the [SSL certificate key file][] location. Default: Determined by your operating system.
+Sets the [SSL certificate key file][] location.
+
+Although the default values result in a functioning Apache server, you **must** update this parameter with your SSL key's location before deploying this server in a production environment.
+
+Default: Depends on operating system.
 
 - **Debian**: `/etc/ssl/private/ssl-cert-snakeoil.key`
 - **FreeBSD**: `/usr/local/etc/apache22/server.key`
 - **Gentoo**: `/etc/ssl/apache2/server.key`
 - **Red Hat**: `/etc/pki/tls/private/localhost.key`
 
-While these default values result in a functioning Apache server, you **must** update this parameter with your SSL key's location before deploying this server in a production environment.
 
 ##### `default_ssl_vhost`
 
-Configures a default [SSL][SSL encryption] virtual host. Valid options: Boolean. Default: `false`.
+Configures a default [SSL][SSL encryption] virtual host. 
 
 If `true`, Puppet automatically configures the following virtual host using the [`apache::vhost`][] defined type:
 
-``` puppet
+```puppet
 apache::vhost { 'default-ssl':
   port            => 443,
   ssl             => true,
@@ -937,27 +966,29 @@ apache::vhost { 'default-ssl':
 
 > **Note**: SSL virtual hosts only respond to HTTPS queries.
 
+
+Boolean. Default: `false`.
+
 ##### `default_type`
 
-_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer and only exists for backwards compatibility in configuration files. Default: `undef`.
+_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer and only exists for backwards compatibility in configuration files.
+
+Default: `undef`.
 
 ##### `default_vhost`
 
-Configures a default virtual host when the class is declared. Valid options: Boolean. Default: `true`.
+Configures a default virtual host when the class is declared. 
+
 
 To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to `false`.
 
 > **Note**: Apache will not start without at least one virtual host. If you set this to `false` be sure to configure one elsewhere.
 
-##### `dev_packages`
+Boolean. Default: `true`.
 
-Configures a specific dev package to use. Valid options: A string or array of strings. Default: Depends on the operating system.
+##### `dev_packages`
 
-- **Red Hat:** 'httpd-devel'
-- **Debian 8/Ubuntu 13.10 or newer:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
-- **Older Debian/Ubuntu versions:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
-- **FreeBSD, Gentoo:** `undef`
-- **Suse:** ['libapr-util1-devel', 'libapr1-devel']
+Configures a specific dev package to use. Valid options: A string or array of strings.
 
 Example for using httpd 2.4 from the IUS yum repo:
 
@@ -969,9 +1000,19 @@ class { 'apache':
 }
 ```
 
+Default: Depends on operating system.
+
+- **Red Hat:** 'httpd-devel'
+- **Debian 8/Ubuntu 13.10 or newer:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
+- **Older Debian/Ubuntu versions:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
+- **FreeBSD, Gentoo:** `undef`
+- **Suse:** ['libapr-util1-devel', 'libapr1-devel']
+
 ##### `docroot`
 
-Sets the default [`DocumentRoot`][] location. Default: Determined by your operating system.
+Sets the default [`DocumentRoot`][] location.
+
+Default: Depends on operating system.
 
 - **Debian**: `/var/www/html`
 - **FreeBSD**: `/usr/local/www/apache22/data`
@@ -980,7 +1021,9 @@ Sets the default [`DocumentRoot`][] location. Default: Determined by your operat
 
 ##### `error_documents`
 
-Determines whether to enable [custom error documents][] on the Apache server. Valid options: Boolean. Default: `false`.
+Determines whether to enable [custom error documents][] on the Apache server.
+
+Boolean. Default: `false`.
 
 ##### `group`
 
@@ -992,7 +1035,9 @@ By default, Puppet attempts to manage this group as a resource under the `apache
 
 ##### `httpd_dir`
 
-Sets the Apache server's base configuration directory. This is useful for specially repackaged Apache server builds but might have unintended consequences when combined with the default distribution packages. Default: Determined by your operating system.
+Sets the Apache server's base configuration directory. This is useful for specially repackaged Apache server builds but might have unintended consequences when combined with the default distribution packages.
+
+Default: Depends on operating system.
 
 - **Debian**: `/etc/apache2`
 - **FreeBSD**: `/usr/local/etc/apache22`
@@ -1001,23 +1046,27 @@ Sets the Apache server's base configuration directory. This is useful for specia
 
 ##### `keepalive`
 
-Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. Valid options: 'Off', 'On'. Default: 'Off'.
+Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. Valid options: 'Off', 'On'.
 
 If 'On', use the [`keepalive_timeout`][] and [`max_keepalive_requests`][] parameters to set relevant options.
 
+Default: 'Off'.
+
 ##### `keepalive_timeout`
 
-Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. Default: '15'.
+Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. This parameter is only relevant if the [`keepalive` parameter][] is enabled.
 
-This parameter is only relevant if the [`keepalive` parameter][] is enabled.
+Default: '15'.
 
 ##### `max_keepalive_requests`
 
-Limits the number of requests allowed per connection when the [`keepalive` parameter][] is enabled. Default: '100'.
+Limits the number of requests allowed per connection when the [`keepalive` parameter][] is enabled.
+
+Default: '100'.
 
 ##### `lib_path`
 
-Specifies the location where [Apache module][Apache modules] files are stored. Default: Depends on the operating system.
+Specifies the location where [Apache module][Apache modules] files are stored. Default: Depends on operating system.
 
 - **Debian** and **Gentoo**: `/usr/lib/apache2/modules`
 - **FreeBSD**: `/usr/local/libexec/apache24`
@@ -1033,7 +1082,9 @@ This can be used to set the module load order.
 
 ##### `log_level`
 
-Changes the error log's verbosity. Valid options: 'alert', 'crit', 'debug', 'emerg', 'error', 'info', 'notice', 'warn'. Default: 'warn'.
+Changes the error log's verbosity. Valid options: 'alert', 'crit', 'debug', 'emerg', 'error', 'info', 'notice', 'warn'.
+
+Default: 'warn'.
 
 ##### `log_formats`
 
@@ -1057,7 +1108,9 @@ If your `log_formats` parameter contains one of those, it will be overwritten wi
 
 ##### `logroot`
 
-Changes the directory of Apache log files for the virtual host. Default: Determined by your operating system.
+Changes the directory of Apache log files for the virtual host.
+
+Default: Depends on operating system.
 
 - **Debian**: `/var/log/apache2`
 - **FreeBSD**: `/var/log/apache22`
@@ -1066,25 +1119,33 @@ Changes the directory of Apache log files for the virtual host. Default: Determi
 
 ##### `logroot_mode`
 
-Overrides the default [`logroot`][] directory's mode. Default: `undef`.
+Overrides the default [`logroot`][] directory's mode.
 
 > **Note**: Do _not_ grant write access to the directory where the logs are stored without being aware of the consequences. See the [Apache documentation][Log security] for details.
 
+Default: `undef`.
+
 ##### `manage_group`
 
-When `false`, stops Puppet from creating the group resource. Valid options: Boolean. Default: `true`.
+When `false`, stops Puppet from creating the group resource.
 
 If you have a group created from another Puppet module that you want to use to run Apache, set this to `false`. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
 
+Boolean. Default: `true`.
+
 ##### `manage_user`
 
-When `false`, stops Puppet from creating the user resource. Valid options: Boolean. Default: `true`.
+When `false`, stops Puppet from creating the user resource.
 
 This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
 
+Boolean. Default: `true`.
+
 ##### `mod_dir`
 
-Sets where Puppet places configuration files for your [Apache modules][]. Default: Determined by your operating system.
+Sets where Puppet places configuration files for your [Apache modules][].
+
+Default: Depends on operating system.
 
 - **Debian**: `/etc/apache2/mods-available`
 - **FreeBSD**: `/usr/local/etc/apache22/Modules`
@@ -1093,10 +1154,7 @@ Sets where Puppet places configuration files for your [Apache modules][]. Defaul
 
 ##### `mpm_module`
 
-Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Valid options: 'event', 'itk', 'peruser', 'prefork', 'worker', or `false`. Default: Determined by your operating system.
-
-- **Debian**: 'worker'
-- **FreeBSD, Gentoo, and Red Hat**: 'prefork'
+Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Valid options: 'event', 'itk', 'peruser', 'prefork', 'worker', or `false`.
 
 You must set this to `false` to explicitly declare the following classes with custom parameters:
 
@@ -1106,13 +1164,22 @@ You must set this to `false` to explicitly declare the following classes with cu
 - [`apache::mod::prefork`][]
 - [`apache::mod::worker`][]
 
+Default: Depends on operating system.
+
+- **Debian**: 'worker'
+- **FreeBSD, Gentoo, and Red Hat**: 'prefork'
+
 ##### `package_ensure`
 
-Controls the `package` resource's [`ensure`][] attribute. Valid options: 'absent', 'installed' (or the equivalent 'present'), or a version string. Default: 'installed'.
+Controls the `package` resource's [`ensure`][] attribute. Valid options: 'absent', 'installed' (or equivalent 'present'), or a version string.
 
+Default: 'installed'.
+ 
 ##### `pidfile`
 
-Allows settting a custom location for the pid file - useful if using a custom built Apache rpm. Default: Depends on operating system.
+Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm.
+
+Default: Depends on operating system.
 
 - **Debian:** '\${APACHE_PID_FILE}'
 - **FreeBSD:** '/var/run/httpd.pid'
@@ -1120,43 +1187,57 @@ Allows settting a custom location for the pid file - useful if using a custom bu
 
 ##### `ports_file`
 
-Sets the path to the file containing Apache ports configuration. Default: '{$conf_dir}/ports.conf'.
+Sets the path to the file containing Apache ports configuration.
+
+Default: '{$conf_dir}/ports.conf'.
 
 ##### `purge_configs`
 
-Removes all other Apache configs and virtual hosts. Valid options: Boolean. Default: `true`.
+Removes all other Apache configs and virtual hosts.
+
+Setting this to `false` is a stopgap measure to allow the apache module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
 
-Setting this to `false` is a stopgap measure to allow the apache Puppet module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
+Boolean. Default: `true`.
 
 ##### `purge_vhost_dir`
 
-If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, the Boolean parameter `purge_vhost_dir` determines whether Puppet removes any configurations inside `vhost_dir` _not_ managed by Puppet. Valid options: Boolean. Default: same as [`purge_configs`][].
+If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, this parameter determines whether Puppet removes any configurations inside `vhost_dir` that are _not_ managed by Puppet.
 
-Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache Puppet module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
+Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
+
+Boolean. Default: same as [`purge_configs`][].
 
 ##### `rewrite_lock`
 
-Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your virtual host. Default: `undef`.
+Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your virtual host. This parameter only applies to Apache version 2.2 or lower and is ignored on newer versions.
 
-This parameter only applies to Apache version 2.2 or lower and is ignored on newer versions.
+Default: `undef`.
 
 ##### `sendfile`
 
-Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the [`EnableSendfile`][] directive. Valid options: 'On', 'Off'. Default: 'On'.
+Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the [`EnableSendfile`][] directive. Valid options: 'On', 'Off'.
+
+Default: 'On'.
 
 ##### `serveradmin`
 
-Sets the Apache server administrator's contact information via Apache's [`ServerAdmin`][] directive. Default: 'root@localhost'.
+Sets the Apache server administrator's contact information via Apache's [`ServerAdmin`][] directive.
+
+Default: 'root@localhost'.
 
 ##### `servername`
 
-Sets the Apache server name via Apache's [`ServerName`][] directive. Default: the 'fqdn' fact reported by [Facter][].
+Sets the Apache server name via Apache's [`ServerName`][] directive. 
 
 Setting to `false` will not set ServerName at all.
 
+Default: the 'fqdn' fact reported by [Facter][].
+
 ##### `server_root`
 
-Sets the Apache server's root directory via Apache's [`ServerRoot`][] directive. Default: determined by your operating system.
+Sets the Apache server's root directory via Apache's [`ServerRoot`][] directive.
+
+Default: Depends on operating system.
 
 - **Debian**: `/etc/apache2`
 - **FreeBSD**: `/usr/local`
@@ -1165,25 +1246,35 @@ Sets the Apache server's root directory via Apache's [`ServerRoot`][] directive.
 
 ##### `server_signature`
 
-Configures a trailing footer line to display at the bottom of server-generated documents, such as error documents and output of certain [Apache modules][], via Apache's [`ServerSignature`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
+Configures a trailing footer line to display at the bottom of server-generated documents, such as error documents and output of certain [Apache modules][], via Apache's [`ServerSignature`][] directive. Valid options: 'Off', 'On'.
+
+Default: 'On'.
 
 ##### `server_tokens`
 
-Controls how much information Apache sends to the browser about itself and the operating system, via Apache's [`ServerTokens`][] directive. Default: 'OS'.
+Controls how much information Apache sends to the browser about itself and the operating system, via Apache's [`ServerTokens`][] directive.
+
+Default: 'OS'.
 
 ##### `service_enable`
 
-Determines whether Puppet enables the Apache HTTPD service when the system is booted. Valid options: Boolean. Default: `true`.
+Determines whether Puppet enables the Apache HTTPD service when the system is booted.
+
+Boolean. Default: `true`.
 
 ##### `service_ensure`
 
-Determines whether Puppet should make sure the service is running. Valid options: '`true`' (equivalent to 'running'), '`false`' (equivalent to 'stopped'). Default: 'running'.
+Determines whether Puppet should make sure the service is running. Valid options: '`true`' (or 'running'), '`false`' (or 'stopped'). 
 
 The '`false`' or 'stopped' values set the 'httpd' service resource's `ensure` parameter to '`false`', which is useful when you want to let the service be managed by another application, such as Pacemaker.
 
+Default: 'running'.
+
 ##### `service_name`
 
-Sets the name of the Apache service. Default: determined by your operating system.
+Sets the name of the Apache service.
+
+Default: Depends on operating system.
 
 - **Debian and Gentoo**: 'apache2'
 - **FreeBSD**: 'apache22'
@@ -1191,17 +1282,21 @@ Sets the name of the Apache service. Default: determined by your operating syste
 
 ##### `service_manage`
 
-Determines whether Puppet manages the HTTPD service's state. Valid options: Boolean. Default: `true`.
+Determines whether Puppet manages the HTTPD service's state.
+
+Boolean. Default: `true`.
 
 ##### `service_restart`
 
-Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. Default: `undef`, which uses the [default Puppet behavior][Service attribute restart].
+Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. The default setting uses the [default Puppet behavior][Service attribute restart].
+
+Default: `undef`.
 
 ##### `ssl_stapling`
 
-Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean. Default: `false`. It is possible to override this on a vhost level.
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). This parameter only applies to Apache 2.4 or higher and is ignored on older versions. It is possible to override the default setting on a vhost level.
 
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+Boolean. Default: `false`.
 
 ##### `ssl_stapling_return_errors`
 
@@ -1235,7 +1330,7 @@ Sets the default access policy for the / directory in httpd.conf. A value of '`f
 
 ##### `vhost_dir`
 
-Changes your virtual host configuration files' location. Default: determined by your operating system.
+Changes your virtual host configuration files' location. Default: Depends on operating system.
 
 - **Debian**: `/etc/apache2/sites-available`
 - **FreeBSD**: `/usr/local/etc/apache22/Vhosts`
@@ -1266,7 +1361,7 @@ To prevent Puppet from managing the user, set the [`manage_user`][] parameter to
 
 The name of the Apache package to install. Default: Puppet sets the default value via the [`apache::params`][] class, which manages the user based on your operating system:
 
-The default value is determined by your operating system:
+The default value is Depends on operating system:
 
 - **Debian**: 'apache2'
 - **FreeBSD**: 'apache24'
@@ -1279,7 +1374,7 @@ You might need to override this if you are using a non-standard Apache package,
 
 The name of the error log file for the main server instance
 
-The default value is determined by your operating system:
+The default value is Depends on operating system:
 
 - **Debian**: 'error.log'
 - **FreeBSD**: 'httpd-error.log'
@@ -1293,7 +1388,7 @@ If the string starts with / or | or syslog: the full path will be set. Otherwise
 
 Directory to use for global script alias 
 
-The default value is determined by your operating system:
+The default value is Depends on operating system:
 
 - **Debian**: '/usr/lib/cgi-bin'
 - **FreeBSD**: '/usr/local/www/apache24/cgi-bin'
@@ -1305,7 +1400,7 @@ The default value is determined by your operating system:
 
 The name of the access log file for the main server instance
 
-The default value is determined by your operating system:
+The default value is Depends on operating system:
 
 - **Debian**: 'error.log'
 - **FreeBSD**: 'httpd-access.log'
@@ -1317,7 +1412,7 @@ The default value is determined by your operating system:
 
 Installs Apache development libraries. By default, the package name is defined by the [`dev_packages`][] parameter of the [`apache::params`][] class based on your operating system:
 
-The default value is determined by your operating system:
+The default value is Depends on operating system:
 
 - **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions
 - **FreeBSD**: '`undef`'; see note below
@@ -1444,7 +1539,7 @@ Installs and manages [`mod_alias`][].
 **Parameters within `apache::mod::alias`**:
 
 * `icons_options`: Disables directory listings for the icons directory, via Apache [`Options`] directive. Default: 'Indexes MultiViews'.
-* `icons_path`: Sets the local path for an `/icons/` Alias. Default: depends on your operating system.
+* `icons_path`: Sets the local path for an `/icons/` Alias. Default: Depends on operating system.
 
 - **Debian**: `/usr/share/apache2/icons`
 - **FreeBSD**: `/usr/local/www/apache24/icons`
@@ -3757,7 +3852,7 @@ Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.htm
 
 ##### `ssl_certs_dir`
 
-Specifies the location of the SSL certification directory. Default: Depends on the operating system.
+Specifies the location of the SSL certification directory. Default: Depends on operating system.
 
 - **Debian:** '/etc/ssl/certs'
 - **Red Hat:** '/etc/pki/tls/certs'

From a2d2371a3dc00f1ca644e152c029694e4e5a5040 Mon Sep 17 00:00:00 2001
From: Federico Fapitalle <federico.fapitalle@gmail.com>
Date: Tue, 28 Mar 2017 15:09:15 -0300
Subject: [PATCH 1066/2267] add support for LimitExcept directive

---
 templates/vhost/_directories.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 265a593550..49b5f32673 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -67,6 +67,14 @@
     </Limit>
       <%- end -%>
     <%- end -%>
+    <%- if directory['limit_except'] && directory['limit_except'] != '' -%>
+      <%- Array(directory['limit_except']).each do |lim| -%>
+    <LimitExcept <%= lim['methods'] %>>
+    <%- scope.lookupvar('_template_scope')[:item] = lim -%>
+    <%= scope.function_template(["apache/vhost/_require.erb"]) -%>
+    </LimitExcept>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>
       <%- [directory['addhandlers']].flatten.compact.each do |addhandler| -%>
     <FilesMatch ".+(<%= Array(addhandler['extensions']).collect { |s| Regexp.escape(s) }.join('|') %>)$">

From 9cae523d3d4a6ff946a00978e14182358fbbd500 Mon Sep 17 00:00:00 2001
From: Federico Fapitalle <federico.fapitalle@gmail.com>
Date: Tue, 28 Mar 2017 15:09:34 -0300
Subject: [PATCH 1067/2267] add tests

---
 spec/defines/vhost_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 4796f0bf2a..eefb428dfb 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -245,6 +245,14 @@
                 },
               ],
             },
+            { 'path'         => '/var/www/files',
+              'provider'     => 'location',
+              'limit_except' => [
+                { 'methods' => 'GET HEAD',
+                  'require' => ['valid-user']
+                },
+              ],
+            },
             { 'path'               => '/var/www/dav',
               'dav'                => 'filesystem',
               'dav_depth_infinity' => true,
@@ -524,6 +532,10 @@
         :content => /^\s+<Limit GET HEAD>$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>/m ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+<LimitExcept GET HEAD>$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/Limit>/m ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Dav\sfilesystem$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(

From 6ea08cadfa2cc83f2062d7be7816780b4005ac05 Mon Sep 17 00:00:00 2001
From: Federico Fapitalle <federico.fapitalle@gmail.com>
Date: Tue, 28 Mar 2017 15:09:45 -0300
Subject: [PATCH 1068/2267] add documentation

---
 README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/README.md b/README.md
index e9ff691082..846d5b24bd 100644
--- a/README.md
+++ b/README.md
@@ -3434,6 +3434,26 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+###### `limit_except`
+
+Creates a [LimitExcept](https://httpd.apache.org/docs/current/mod/core.html#limitexcept) block inside the Directory block, which can also contain `require` directives.
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/docroot',
+  directories => [
+    { path         => '/',
+      provider     => 'location',
+      limit_except => [
+        { methods => 'GET HEAD',
+          require => ['valid-user']
+        },
+      ],
+    },
+  ],
+}
+```
+
 ###### `mellon_enable`
 
 Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_mellon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.

From b9500ae7c63dcfd9fd5bad5104e2578ec75ede35 Mon Sep 17 00:00:00 2001
From: Federico Fapitalle <federico.fapitalle@gmail.com>
Date: Tue, 28 Mar 2017 15:34:55 -0300
Subject: [PATCH 1069/2267] fix closing tag

---
 spec/defines/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index eefb428dfb..79692ca630 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -535,7 +535,7 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+<LimitExcept GET HEAD>$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/Limit>/m ) }
+        :content => /\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/LimitExcept>/m ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
         :content => /^\s+Dav\sfilesystem$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(

From ab466563c1b2f7663163d079c5ed57841bed4ba5 Mon Sep 17 00:00:00 2001
From: Wilson McCoubrey <wilson@puppet.com>
Date: Wed, 29 Mar 2017 11:46:34 +0100
Subject: [PATCH 1070/2267] [msync] 786266 Implement puppet-module-gems, a45803
 Remove metadata.json from locales config

---
 Gemfile             | 43 ++++++++++++++++---------------------------
 locales/config.yaml |  3 +--
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5d863251d6..46cb2eacec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,38 +29,27 @@ end
 
 # Used for gem conditionals
 supports_windows = false
+ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
+minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
 
 group :development do
-  gem 'puppet-lint',                        :require => false
-  gem 'metadata-json-lint',                 :require => false, :platforms => 'ruby'
-  gem 'puppet_facts',                       :require => false
-  gem 'puppet-blacksmith', '>= 3.4.0',      :require => false, :platforms => 'ruby'
-  gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
-  gem 'rspec-puppet', '>= 2.3.2',           :require => false
-  gem 'rspec-puppet-facts',                 :require => false, :platforms => 'ruby'
-  gem 'mocha', '< 1.2.0',                   :require => false
-  gem 'simplecov',                          :require => false, :platforms => 'ruby'
-  gem 'parallel_tests', '< 2.10.0',         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem 'parallel_tests',                     :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
-  gem 'rubocop', '0.41.2',                  :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem 'rubocop',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
-  gem 'rubocop-rspec', '~> 1.6',            :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
-  gem 'pry',                                :require => false
-  gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem 'fast_gettext', '1.1.0',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem 'fast_gettext',                       :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem 'rainbow', '< 2.2.0',                 :require => false
+  gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
+  gem "puppet-module-win-default-r#{minor_version}",   :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "puppet-module-posix-dev-r#{minor_version}",     :require => false, :platforms => "ruby"
+  gem "puppet-module-win-dev-r#{minor_version}",       :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "json_pure", '<= 2.0.1',                         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "fast_gettext", '1.1.0',                         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                  :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
 end
 
 group :system_tests do
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
-  gem 'beaker-pe',                                                               :require => false
-  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])                
-  gem 'beaker-puppet_install_helper',                                            :require => false
-  gem 'beaker-module_install_helper',                                            :require => false
-  gem 'master_manipulator',                                                      :require => false
-  gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
-  gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
+  gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
+  gem "puppet-module-win-system-r#{minor_version}",                              :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
+  gem "beaker-pe",                                                               :require => false
+  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
+  gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
diff --git a/locales/config.yaml b/locales/config.yaml
index ab8ed8ba30..0ec10ba977 100644
--- a/locales/config.yaml
+++ b/locales/config.yaml
@@ -22,5 +22,4 @@ gettext:
   # Patterns for +Dir.glob+ used to find all files that might contain
   # translatable content, relative to the project root directory
   source_files:
-      - 'metadata.json'
-  
\ No newline at end of file
+  

From aa9057a0c50b7cd61cef20aa76000a793958581b Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Wed, 5 Apr 2017 15:39:50 +0200
Subject: [PATCH 1071/2267] Fix alignement in vhost.conf

Regression from 86b2df3ebfc894184f4f0b206c3905d182037d23
---
 templates/vhost/_directories.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 265a593550..9c273a01d2 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -317,18 +317,18 @@
          <%- end -%>
       <%- end -%>
     <%- end -%>
-    <% if directory['request_headers'] and ! directory['request_headers'].empty? -%>
+    <%- if directory['request_headers'] and ! directory['request_headers'].empty? -%>
       ## Request Header rules
       <%- Array(directory['request_headers']).each do |request_statement| -%>
         <%- if request_statement != '' -%>
             RequestHeader <%= request_statement %>
         <%- end -%>
       <%- end -%>
-    <% end -%>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>
   </<%= provider %>>
     <%- end -%>
   <%- end -%>
-<% end -%>
+<%- end -%>

From 7e80e006628378a43bf623af107a0dad453f1a72 Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppet.com>
Date: Mon, 10 Apr 2017 22:52:22 -0700
Subject: [PATCH 1072/2267] WIP loc edit

---
 README.md | 1643 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 1187 insertions(+), 456 deletions(-)

diff --git a/README.md b/README.md
index 2e484279f6..c7a02213af 100644
--- a/README.md
+++ b/README.md
@@ -763,7 +763,7 @@ apache::balancermember { "${::fqdn}-puppet00":
 
 Then declare the `apache::balancer` and `apache::balancermember` defined types on the proxy server.
 
-If you need to use the [ProxySet](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) directive on the balancer, use the [`proxy_set`](#proxy_set) parameter of `apache::balancer`:
+To use the [ProxySet](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) directive on the balancer, use the [`proxy_set`](#proxy_set) parameter of `apache::balancer`:
 
 ``` puppet
 apache::balancer { 'puppet01':
@@ -814,11 +814,13 @@ Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balanc
 
 Guides the basic setup and installation of Apache on your system.
 
-**`apache` class parameters:**
+**Parameters:**
 
 ##### `allow_encoded_slashes`
 
-Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. Valid options: 'on', 'off', 'nodecode'. If not specified, omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
+Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. If not specified, this parameter omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
+
+Values: 'on', 'off', 'nodecode'. 
 
 Default: `undef`.
 
@@ -826,7 +828,7 @@ Default: `undef`.
 
 Configures module template behavior, package names, and default Apache modules by defining the version of Apache to use. We do not recommend manually configuring this parameter without reason.
 
-Default: Depends on operating system and release via the [`apache::version`][] class. 
+Default: Depends on operating system and release version detected by the [`apache::version`][] class. 
 
 ##### `conf_dir`
 
@@ -870,14 +872,16 @@ Boolean. Default: `true`.
 
 ##### `default_mods`
 
-Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. Valid options: Boolean or an array of Apache module names. 
+Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system.
 
 If `false`, Puppet includes only the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] defined type.
 
-If `true`, Puppet installs additional modules, the list of which depends on the operating system as well as the [`apache_version`][] and [`mpm_module`][] parameters' values. As these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
+If `true`, Puppet installs additional modules, depending on the operating system and the values of [`apache_version`][] and [`mpm_module`][] parameters. Because these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
 
 If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
+Values: Boolean or an array of Apache module names.
+
 Default: `true`.
 
 ##### `default_ssl_ca`
@@ -913,7 +917,7 @@ Default: `undef`.
 
 Sets the path of the default [certificate revocation list][] (CRL) file to use.
 
-Although this default value results in a functioning Apache server, you **must** update this parameter with your CRL file's path before deploying this server in a production environment. You can use this parameter with or in place of the [`default_ssl_crl_path`][].
+Although this default value results in a functioning Apache server, you **must** update this parameter with the CRL file path before deploying this server in a production environment. You can use this parameter with or in place of the [`default_ssl_crl_path`][].
 
 Default: `undef`.
 
@@ -921,13 +925,13 @@ Default: `undef`.
 
 Sets the server's [certificate revocation list path][], which contains your CRLs.
 
-Although this default value results in a functioning Apache server, you **must** update this parameter with the CRL path before deploying this server in a production environment.
+Although this default value results in a functioning Apache server, you **must** update this parameter with the CRL file path before deploying this server in a production environment.
 
 Default: `undef`.
 
 ##### `default_ssl_crl_check`
 
-Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. This parameter applies only to Apache 2.4 or higher and is ignored on older versions.
 
 Although this default value results in a functioning Apache server, you **must** specify this parameter when using certificate revocation lists in a production environment.
 
@@ -971,7 +975,7 @@ Boolean. Default: `false`.
 
 ##### `default_type`
 
-_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer and only exists for backwards compatibility in configuration files.
+_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer, and is only for backwards compatibility in configuration files.
 
 Default: `undef`.
 
@@ -979,16 +983,17 @@ Default: `undef`.
 
 Configures a default virtual host when the class is declared. 
 
-
 To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to `false`.
 
-> **Note**: Apache will not start without at least one virtual host. If you set this to `false` be sure to configure one elsewhere.
+> **Note**: Apache will not start without at least one virtual host. If you set this to `false` you must configure a virtual host elsewhere.
 
 Boolean. Default: `true`.
 
 ##### `dev_packages`
 
-Configures a specific dev package to use. Valid options: A string or array of strings.
+Configures a specific dev package to use. 
+
+Values: A string or array of strings.
 
 Example for using httpd 2.4 from the IUS yum repo:
 
@@ -1046,15 +1051,15 @@ Default: Depends on operating system.
 
 ##### `keepalive`
 
-Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. Valid options: 'Off', 'On'.
+Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. If you set this to 'On', use the [`keepalive_timeout`][] and [`max_keepalive_requests`][] parameters to set relevant options.
 
-If 'On', use the [`keepalive_timeout`][] and [`max_keepalive_requests`][] parameters to set relevant options.
+Values: 'Off', 'On'.
 
 Default: 'Off'.
 
 ##### `keepalive_timeout`
 
-Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. This parameter is only relevant if the [`keepalive` parameter][] is enabled.
+Sets the [`KeepAliveTimeout`] directive, which determines the [TODO: number of seconds?] amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. This parameter is only relevant if the [`keepalive` parameter][] is enabled.
 
 Default: '15'.
 
@@ -1076,19 +1081,19 @@ Specifies the location where [Apache module][Apache modules] files are stored. D
 
 ##### `loadfile_name`
 
-Sets the [`LoadFile`] directive's filename. Valid options: Filenames in the format `\*.load`.
+Sets the [`LoadFile`] directive's filename. Values: Filenames in the format `\*.load`.
 
 This can be used to set the module load order.
 
 ##### `log_level`
 
-Changes the error log's verbosity. Valid options: 'alert', 'crit', 'debug', 'emerg', 'error', 'info', 'notice', 'warn'.
+Changes the error log's verbosity. Values: 'alert', 'crit', 'debug', 'emerg', 'error', 'info', 'notice', 'warn'.
 
 Default: 'warn'.
 
 ##### `log_formats`
 
-Define additional [`LogFormat`][] directives. Valid options: A [hash][], such as:
+Define additional [`LogFormat`][] directives. Values: A [hash][], such as:
 
 ``` puppet
 $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
@@ -1154,7 +1159,7 @@ Default: Depends on operating system.
 
 ##### `mpm_module`
 
-Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Valid options: 'event', 'itk', 'peruser', 'prefork', 'worker', or `false`.
+Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Values: 'event', 'itk', 'peruser', 'prefork', 'worker', or `false`.
 
 You must set this to `false` to explicitly declare the following classes with custom parameters:
 
@@ -1171,7 +1176,7 @@ Default: Depends on operating system.
 
 ##### `package_ensure`
 
-Controls the `package` resource's [`ensure`][] attribute. Valid options: 'absent', 'installed' (or equivalent 'present'), or a version string.
+Controls the `package` resource's [`ensure`][] attribute. Values: 'absent', 'installed' (or equivalent 'present'), or a version string.
 
 Default: 'installed'.
  
@@ -1215,7 +1220,7 @@ Default: `undef`.
 
 ##### `sendfile`
 
-Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the [`EnableSendfile`][] directive. Valid options: 'On', 'Off'.
+Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the [`EnableSendfile`][] directive. Values: 'On', 'Off'.
 
 Default: 'On'.
 
@@ -1246,7 +1251,7 @@ Default: Depends on operating system.
 
 ##### `server_signature`
 
-Configures a trailing footer line to display at the bottom of server-generated documents, such as error documents and output of certain [Apache modules][], via Apache's [`ServerSignature`][] directive. Valid options: 'Off', 'On'.
+Configures a trailing footer line to display at the bottom of server-generated documents, such as error documents and output of certain [Apache modules][], via Apache's [`ServerSignature`][] directive. Values: 'Off', 'On'.
 
 Default: 'On'.
 
@@ -1264,9 +1269,9 @@ Boolean. Default: `true`.
 
 ##### `service_ensure`
 
-Determines whether Puppet should make sure the service is running. Valid options: '`true`' (or 'running'), '`false`' (or 'stopped'). 
+Determines whether Puppet should make sure the service is running. Values: `true` (or 'running'), `false` (or 'stopped'). 
 
-The '`false`' or 'stopped' values set the 'httpd' service resource's `ensure` parameter to '`false`', which is useful when you want to let the service be managed by another application, such as Pacemaker.
+The `false` or 'stopped' values set the 'httpd' service resource's `ensure` parameter to `false`, which is useful when you want to let the service be managed by another application, such as Pacemaker.
 
 Default: 'running'.
 
@@ -1288,7 +1293,9 @@ Boolean. Default: `true`.
 
 ##### `service_restart`
 
-Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. The default setting uses the [default Puppet behavior][Service attribute restart].
+Determines whether Puppet should use a specific command to restart the HTTPD service.
+
+Values: a command to restart the Apache service. The default setting uses the [default Puppet behavior][Service attribute restart].
 
 Default: `undef`.
 
@@ -1300,25 +1307,40 @@ Boolean. Default: `false`.
 
 ##### `ssl_stapling_return_errors`
 
-Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive. No default. It is possible to override this on a vhost level.
+Sets the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive. It is possible to override this on a vhost level. This parameter applies only to Apache 2.4 or higher and is ignored on older versions.
+
+Values: 'On', 'Off'. 
+
+Default: 'Off'.
 
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
 ##### `timeout`
 
-Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request. Default: 120.
+Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request.
+
+Default: 120.
 
 ##### `trace_enable`
 
-Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceEnable`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
+Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceEnable`][] directive.
+
+Values: 'Off', 'On'.
+
+Default: 'On'.
 
 ##### `use_systemd`
 
-Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs. Valid options: Boolean. Default: `true`.
+Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs.
+
+Boolean. Default: `true`.
 
 ##### `file_mode`
 
-Sets the desired permissions mode for config files, in symbolic or numeric notation. Valid options: A string. Default: '0644'.
+Sets the desired permissions mode for config files.
+
+Values: A string, with permissions mode in symbolic or numeric notation.
+
+Default: '0644'.
 
 ##### `root_directory_options`
 
@@ -1326,11 +1348,15 @@ Array of the desired options for the / directory in httpd.conf. Defaults to 'Fol
 
 ##### `root_directory_secured`
 
-Sets the default access policy for the / directory in httpd.conf. A value of '`false`' allows access to all resources that are missing a more specific access policy. A value of '`true`' denies access to all resources by default. In this case more specific rules must be used to allow access to these resources (e.g. in a directory block using the [`directories`](#parameter-directories-for-apachevhost) parameter). Valid options: Boolean. Default: `false`.
+Sets the default access policy for the / directory in httpd.conf. A value of `false` allows access to all resources that are missing a more specific access policy. A value of `true` denies access to all resources by default. If `true`, more specific rules must be used to allow access to these resources (for example, in a directory block using the [`directories`](#parameter-directories-for-apachevhost) parameter).
+
+Boolean. Default: `false`.
 
 ##### `vhost_dir`
 
-Changes your virtual host configuration files' location. Default: Depends on operating system.
+Changes your virtual host configuration files' location.
+
+Default: Depends on operating system:
 
 - **Debian**: `/etc/apache2/sites-available`
 - **FreeBSD**: `/usr/local/etc/apache22/Vhosts`
@@ -1339,42 +1365,40 @@ Changes your virtual host configuration files' location. Default: Depends on ope
 
 ##### `vhost_include_pattern`
 
-Defines the pattern for files included from the `vhost_dir`. Default: '*', also for BC with previous versions of this module.
+Defines the pattern for files included from the `vhost_dir`.
 
-However, you might want to set this to a value like '[^.#]\*.conf[^~]' to make sure files accidentally created in this directory (such as files created by version control systems or editor backups) are *not* included in your server configuration.
+If set to a value like `[^.#]\*.conf[^~]` to make sure that files accidentally created in this directory (such as files created by version control systems or editor backups) are *not* included in your server configuration.
 
-Some operating systems ship with a value of '*.conf'. Also note that this module will, by default, create configuration files ending in '.conf'.
+Default: '*', also for BC with previous versions of this module. TODO: what does "also for BC" mean?
+ 
+Some operating systems use a value of `*.conf`. By default, this module creates configuration files ending in `.conf`.
 
 ##### `user`
 
-Changes the user Apache uses to answer requests. Apache's parent process will continue to be run as root, but child processes will access resources as the user defined by this parameter.
+Changes the user that Apache uses to answer requests. Apache's parent process continues to run as root, but child processes access resources as the user defined by this parameter. To prevent Puppet from managing the user, set the [`manage_user`][] parameter to `false`.
 
-Default: Puppet sets the default value via the [`apache::params`][] class, which manages the user based on your operating system:
+Default: Depends on the user set by [`apache::params`][] class, based on your operating system:
 
 - **Debian**: 'www-data'
 - **FreeBSD**: 'www'
 - **Gentoo** and **Red Hat**: 'apache'
 
-To prevent Puppet from managing the user, set the [`manage_user`][] parameter to `false`.
-
 ##### `apache_name`
 
-The name of the Apache package to install. Default: Puppet sets the default value via the [`apache::params`][] class, which manages the user based on your operating system:
+The name of the Apache package to install. If you are using a non-standard Apache package, such as those from Red Hat's software collections, you might need to override the default setting.
 
-The default value is Depends on operating system:
+Default: Depends on the user set by [`apache::params`][] class, based on your operating system:
 
 - **Debian**: 'apache2'
 - **FreeBSD**: 'apache24'
 - **Gentoo**: 'www-servers/apache'
 - **Red Hat**: 'httpd'
 
-You might need to override this if you are using a non-standard Apache package, such as those from Red Hat's software collections.
-
 ##### `error_log`
 
-The name of the error log file for the main server instance
+The name of the error log file for the main server instance. If the string starts with `/`, `|`, or `syslog`: the full path is set. Otherwise, the filename  is prefixed with `$logroot`.
 
-The default value is Depends on operating system:
+Default: Depends on operating system:
 
 - **Debian**: 'error.log'
 - **FreeBSD**: 'httpd-error.log'
@@ -1382,13 +1406,11 @@ The default value is Depends on operating system:
 - **Red Hat**: 'error_log'
 - **Suse**: 'error.log'
 
-If the string starts with / or | or syslog: the full path will be set. Otherwise the filename will be prefixed with $logroot
-
 ##### `scriptalias`
 
 Directory to use for global script alias 
 
-The default value is Depends on operating system:
+Default: Depends on operating system:
 
 - **Debian**: '/usr/lib/cgi-bin'
 - **FreeBSD**: '/usr/local/www/apache24/cgi-bin'
@@ -1398,9 +1420,9 @@ The default value is Depends on operating system:
 
 ##### `access_log_file`
 
-The name of the access log file for the main server instance
+The name of the access log file for the main server instance.
 
-The default value is Depends on operating system:
+Default: Depends on operating system:
 
 - **Debian**: 'error.log'
 - **FreeBSD**: 'httpd-access.log'
@@ -1410,28 +1432,28 @@ The default value is Depends on operating system:
 
 #### Class: `apache::dev`
 
-Installs Apache development libraries. By default, the package name is defined by the [`dev_packages`][] parameter of the [`apache::params`][] class based on your operating system:
-
-The default value is Depends on operating system:
+Installs Apache development libraries. Default: Depends on the operating system:[`dev_packages`][] parameter of the [`apache::params`][] class, based on your operating system:
 
-- **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions
-- **FreeBSD**: '`undef`'; see note below
-- **Gentoo**: '`undef`'
-- **Red Hat**: 'httpd-devel'
-
-> **Note**: On FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
+- **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions.
+- **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
+- **Gentoo**: `undef`.
+- **Red Hat**: 'httpd-devel'.
 
 #### Class: `apache::vhosts`
 
 Creates [`apache::vhost`][] defined types.
 
-**Parameters within `apache::vhosts`**:
+**Parameters**:
+
+* `vhosts`: Specifies the [`apache::vhost`][] defined type's parameters. 
+
+  Values: A [hash][], where the key represents the name and the value represents a [hash][] of [`apache::vhost`][] defined type's parameters.
 
-- `vhosts`: A [hash][] where the key represents the name and the value represents a [hash][] of [`apache::vhost`][] defined type's parameters. Default: '{}'
+  Default: '{}'
 
-> **Note**: See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters or [Configuring virtual hosts].
+  > **Note**: See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters or [Configuring virtual hosts].
 
-For example, to create a [name-based virtual host][name-based virtual hosts] 'custom_vhost_1, you can declare the class with the `vhosts` parameter set to '{ "custom_vhost_1" => { "docroot" => "/var/www/custom_vhost_1", "port" => "81" }':
+  For example, to create a [name-based virtual host][name-based virtual hosts] 'custom_vhost_1, declare this class with the `vhosts` parameter set to '{ "custom_vhost_1" => { "docroot" => "/var/www/custom_vhost_1", "port" => "81" }':
 
 ``` puppet
 class { 'apache::vhosts':
@@ -1446,7 +1468,9 @@ class { 'apache::vhosts':
 
 #### Classes: `apache::mod::<MODULE NAME>`
 
-Enables specific [Apache modules][]. You can enable and configure an Apache module by declaring its class. For example, to install and enable [`mod_alias`][] with no icons, you can declare the [`apache::mod::alias`][] class with the `icons_options` parameter set to 'None':
+Enables specific [Apache modules][]. Enable and configure an Apache module by declaring its class.
+
+For example, to install and enable [`mod_alias`][] with no icons, declare the [`apache::mod::alias`][] class with the `icons_options` parameter set to 'None':
 
 ``` puppet
 class { 'apache::mod::alias':
@@ -1536,32 +1560,39 @@ Modules noted with a * indicate that the module has settings and a template that
 
 Installs and manages [`mod_alias`][].
 
-**Parameters within `apache::mod::alias`**:
+**Parameters**:
+
+* `icons_options`: Disables directory listings for the icons directory, via Apache [`Options`] directive.
 
-* `icons_options`: Disables directory listings for the icons directory, via Apache [`Options`] directive. Default: 'Indexes MultiViews'.
-* `icons_path`: Sets the local path for an `/icons/` Alias. Default: Depends on operating system.
+  Default: 'Indexes MultiViews'.
+* `icons_path`: Sets the local path for an `/icons/` Alias.
 
-- **Debian**: `/usr/share/apache2/icons`
-- **FreeBSD**: `/usr/local/www/apache24/icons`
-- **Gentoo**: `/var/www/icons`
-- **Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
+  Default: Depends on operating system.
+
+    * **Debian**: `/usr/share/apache2/icons`
+    * **FreeBSD**: `/usr/local/www/apache24/icons`
+    * **Gentoo**: `/var/www/icons`
+    * *Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
 
 #### Class: `apache::mod::disk_cache`
 
-Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4. The default cache root depends on the Apache version and operating system:
+Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4.
+
+Default: Depends on the Apache version and operating system:
 
 - **Debian**: `/var/cache/apache2/mod_cache_disk`
 - **FreeBSD**: `/var/cache/mod_cache_disk`
 - **Red Hat, Apache 2.4**: `/var/cache/httpd/proxy`
 - **Red Hat, Apache 2.2**: `/var/cache/mod_proxy`
 
-You can specify the cache root by passing a path as a string to the `cache_root` parameter.
+To specify the cache root, pass a path as a string to the `cache_root` parameter.
 
 ``` puppet
 class {'::apache::mod::disk_cache':
   cache_root => '/path/to/cache',
 }
 ```
+
 ##### Class: `apache::mod::diskio`
 
 Installs and configures [`mod_diskio`][].
@@ -1577,67 +1608,159 @@ class{'apache::mod::diskio':
 }
 ```
 
+**Parameters**:
+
+* `dump_io_input`: Dump all input data to the error log.
+
+  Values: 'On', 'Off'.
+  
+  Default: 'Off'.
+  
+* `dump_io_output`: Dump all output data to the error log.
 
-**Parameters withing `apache::mod::diskio`**:
+  Values: 'On', 'Off'.
 
-- `dump_io_input`: Dump all input data to the error log. Must be `On` or `Off`, defaults to `Off`
-- `dump_io_output`: Dump all output data to the error log. Must be `On` or `Off`, defaults to `Off`
+  Defaults to 'Off'.
 
 ##### Class: `apache::mod::event`
 
-Installs and manages [`mod_mpm_event`][]. You can't include both `apache::mod::event` and [`apache::mod::itk`][], [`apache::mod::peruser`][], [`apache::mod::prefork`][], or [`apache::mod::worker`][] on the same server.
+Installs and manages [`mod_mpm_event`][]. You cannot include `apache::mod::event` with [`apache::mod::itk`][], [`apache::mod::peruser`][], [`apache::mod::prefork`][], or [`apache::mod::worker`][] on the same server.
+
+**Parameters**:
+
+* `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive.  Setting this to `false` removes the parameter.
+
+  Default: '511'.
+  
+* `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive.  Setting these to `false` removes the parameters.
+
+  Default: '150'.
+  
+* `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Setting these to `false` removes the parameters.
+
+  Default: '0'.
+  
+* `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Setting these to `false` removes the parameters.
+
+  Default: '75' and '25', respectively.
+  
+* `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Setting this to `false` removes the parameter.
+
+  Default: '25'.
+  
+* `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Setting this to `false` removes the parameter.
 
-**Parameters within `apache::mod::event`**:
+  Default: '2'.
+  
+* `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Setting this to `false` removes the parameter.
 
-- `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive. Default: '511'. Setting this to '`false`' removes the parameter.
-- `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Default: '150'. Setting these to '`false`' removes the parameters.
-- `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Default: '0'. Setting these to '`false`' removes the parameters.
-- `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Default: '75' and '25', respectively. Setting these to '`false`' removes the parameters.
-- `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Default: '25'. Setting this to '`false`' removes the parameter.
-- `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Default: '2'. Setting this to '`false`' removes the parameter.
-- `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Default: '64'. Setting this to '`false`' removes the parameter.
-- `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. Default: '25'. Setting this to '`false`' removes the parameter.
+  Default: '64'.
+  
+* `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. Default: '25'. Setting this to `false` removes the parameter.
 
 ##### Class: `apache::mod::auth_cas`
 
-Installs and manages [`mod_auth_cas`][]. Its parameters share names with the Apache module's directives.
+Installs and manages [`mod_auth_cas`][]. Parameters share names with the Apache module's directives.
 
-The `cas_login_url` and `cas_validate_url` parameters are required; several other parameters have '`undef`' default values.
+The `cas_login_url` and `cas_validate_url` parameters are required; several other parameters have `undef` default values.
 
-**Note**: The auth\_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL. See [https://github.com/Jasig/mod_auth_cas]()
+> **Note**: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL. See [https://github.com/Jasig/mod_auth_cas]()
 
-**Parameters within `apache::mod::auth_cas`**:
+**Parameters**:
 
-- `cas_attribute_prefix`: Adds a header with the value of this header being the attribute values when SAML
-  validation is enabled. Default: CAS_
+- `cas_attribute_prefix`: Adds a header with the value of this header being the attribute values when SAML validation is enabled.
+
+  Default: CAS_.
+  
 - `cas_attribute_delimiter`: The delimiter between attribute values in the header created by `cas_attribute_prefix`.
+  
   Default: ,
-- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. Default: `undef`.
-- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`. Default: `undef`.
-- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings. Default: `undef`.
-- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header. Default: `undef`.
-- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. Default: `undef`.
-- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies. Default: `undef`.
-- `cas_cookie_path`: Where cas cookie session data is stored. Should be writable by web server user. Default: OS dependent.
-- `cas_cookie_path_mode`: The mode of `cas_cookie_path`. Default: '0750'.
-- `cas_debug`: Determines whether to enable the module's debugging mode. Default: 'Off'.
-- `cas_idle_timeout`: Default: `undef`.
+
+- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding.
+
+  Default: `undef`.
+
+- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`.
+
+  Default: `undef`.
+
+- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings.
+
+  Default: `undef`.
+
+- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header.
+
+  Default: `undef`.
+
+- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. 
+
+  Default: `undef`.
+
+- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies.
+
+  Default: `undef`.
+
+- `cas_cookie_path`: Where cas cookie session data is stored. Should be writable by web server user.
+
+  Default: OS dependent.
+
+- `cas_cookie_path_mode`: The mode of `cas_cookie_path`.
+
+  Default: '0750'.
+
+- `cas_debug`: Determines whether to enable the module's debugging mode.
+  
+  Default: 'Off'.
+
+- `cas_idle_timeout`: Sets the idle timeout limit, in seconds. TODO: is this correct?
+
+  Default: `undef`.
+
 - `cas_login_url`: **Required**. Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and don't have an active session.
-- `cas_proxy_validate_url`: The URL to use when performing a proxy validation. Default: `undef`.
-- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. Default: `undef`.
+
+- `cas_proxy_validate_url`: The URL to use when performing a proxy validation.
+
+  Default: `undef`.
+
+- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied.
+
+  Default: `undef`.
+
 - `cas_scrub_request_headers`: Remove inbound request headers that may have special meaning within mod_auth_cas.
-- `cas_sso_enabled`: Enables experimental support for single sign out (may mangle POST data). Default: off
-- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. Default: `undef`.
-- `cas_validate_depth`: Limits the depth for chained certificate validation. Default: `undef`.
-- `cas_validate_saml`: Parse response from CAS server for SAML. Default: Off
-- `cas_validate_server`: Should we validate the cert of the CAS server (depreciated in 1.1 - RedHat 7). Default: `undef`.
+
+- `cas_sso_enabled`: Enables experimental support for single sign out (may mangle POST data).
+
+  Default: 'Off'.
+  
+- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. 
+
+  Default: `undef`.
+
+- `cas_validate_depth`: Limits the depth for chained certificate validation.
+
+  Default: `undef`.
+
+- `cas_validate_saml`: Parse response from CAS server for SAML.
+
+  Default: 'Off'.
+
+- `cas_validate_server`: Whether to validate the cert of the CAS server (deprecated in 1.1 - RedHat 7).
+
+  Default: `undef`.
+
 - `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string.
-- `cas_version`: The CAS protocol version to adhere to. Valid options: '1', '2'. Default: '2'.
-- `suppress_warning`: Don't wine about being on RedHat (Hint: mod_auth_cas package is now available in epel-testing repo). Default: `false`.
+
+- `cas_version`: The CAS protocol version to adhere to. Values: '1', '2'.
+
+  Default: '2'.
+
+- `suppress_warning`: Suppress warning about being on RedHat (Hint: mod_auth_cas package is now available in epel-testing repo). TODO: how does this hint relate to this warning? 
+
+  Default: `false`.
 
 ##### Class: `apache::mod::auth_mellon`
 
-Installs and manages [`mod_auth_mellon`][]. Its parameters share names with the Apache module's directives.
+Installs and manages [`mod_auth_mellon`][]. Parameters share names with the Apache module's directives.
 
 ``` puppet
 class{ 'apache::mod::auth_mellon':
@@ -1645,19 +1768,39 @@ class{ 'apache::mod::auth_mellon':
 }
 ```
 
-**Parameters within `apache::mod::auth_mellon`**:
+**Parameters**:
+
+* `mellon_cache_entry_size`: Maximum size for a single session.
+
+  Default: `undef`.
 
-- `mellon_cache_entry_size`: Maximum size for a single session. Default: `undef`.
-- `mellon_cache_size`: Size in megabytes of the mellon cache. Default: 100.
-- `mellon_lock_file`: Location of lock file. Default: '`/run/mod_auth_mellon/lock`'.
-- `mellon_post_directory`: Full path where post requests are saved. Default: '`/var/cache/apache2/mod_auth_mellon/`'
-- `mellon_post_ttl`: Time to keep post requests. Default: `undef`.
-- `mellon_post_size`: Maximum size of post requests. Default: `undef`.
-- `mellon_post_count`: Maximum number of post requests. Default: `undef`.
+* `mellon_cache_size`: Size in megabytes of the mellon cache.
+
+  Default: 100.
+
+* `mellon_lock_file`: Location of lock file.
+
+  Default: '`/run/mod_auth_mellon/lock`'.
+
+* `mellon_post_directory`: Full path where post requests are saved.
+
+  Default: '`/var/cache/apache2/mod_auth_mellon/`'
+
+* `mellon_post_ttl`: Time to keep post requests.
+
+  Default: `undef`.
+
+* `mellon_post_size`: Maximum size of post requests.
+
+  Default: `undef`.
+
+* `mellon_post_count`: Maximum number of post requests.
+
+ Default: `undef`.
 
 ##### Class: `apache::mod::authn_dbd`
 
-Installs `mod_authn_dbd` and uses `authn_dbd.conf.erb` template to generate its configuration.  Optionally creates AuthnProviderAlias.
+Installs `mod_authn_dbd` and uses `authn_dbd.conf.erb` template to generate its configuration. Optionally, creates AuthnProviderAlias.
 
 ``` puppet
 class { 'apache::mod::authn_dbd':
@@ -1668,28 +1811,51 @@ class { 'apache::mod::authn_dbd':
 }
 ```
 
-** Parameters within `apache::mod::authn_dbd`
-- `authn_dbd_alias`: Name for the AuthnProviderAlias.
-- `authn_dbd_dbdriver`: Which db driver to use.  Default: mysql.
-- `authn_dbd_exptime`: corresponds to DBDExptime.  Default: 300.
-- `authn_dbd_keep`: corresponds to DBDKeep.  Default: 8.
-- `authn_dbd_max`: corresponds to DBDMax.  Default: 20.
-- `authn_dbd_min`: corresponds to DBDMin.  Default: 4.
-- `authn_dbd_params`: **Required**. Corresponds to DBDParams for the connection string.
-- `authn_dbd_query`: is the query used to test a user and password for authentication.
+**Parameters**:
+
+* `authn_dbd_alias`: Name for the 'AuthnProviderAlias'.
+
+* `authn_dbd_dbdriver`: Specifies the database driver to use.
+  
+  Default: 'mysql'.
+  
+* `authn_dbd_exptime`: corresponds to DBDExptime.
+
+  Default: 300.
+
+* `authn_dbd_keep`: Corresponds to DBDKeep.
+
+  Default: 8.
+  
+* `authn_dbd_max`: Corresponds to DBDMax.
+
+  Default: 20.
+
+* `authn_dbd_min`: Corresponds to DBDMin.
+
+  Default: 4.
+
+* `authn_dbd_params`: **Required**. Corresponds to DBDParams for the connection string.
+
+* `authn_dbd_query`: Whether to query the user and password for authentication.
 
 ##### Class: `apache::mod::authnz_ldap`
 
 Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to generate its configuration.
 
-**Parameters within `apache::mod::authnz_ldap`**:
+**Parameters**:
 
-- `package_name`: Default: `undef`.
-- `verify_server_cert`: Default: `undef`.
+* `package_name`: The name of the package.
+
+  Default: `undef`.
+  
+* `verify_server_cert`: Whether to verify the server certificate. TODO: this didn't say anything, so I'm guessing? is this true, false, undef?
+  
+  Default: `undef`.
 
 ##### Class: `apache::mod::cluster`
 
-**Note**: There is no official package available for mod\_cluster and thus it must be made available by means outside of the control of the apache module. Binaries can be found at http://mod-cluster.jboss.org/
+**Note**: There is no official package available for `mod_cluster`, so you must make it available outside of the apache module. Binaries can be found at http://mod-cluster.jboss.org/
 
 ``` puppet
 class { '::apache::mod::cluster':
@@ -1700,37 +1866,75 @@ class { '::apache::mod::cluster':
 }
 ```
 
-**Parameters within `apache::mod::cluster`**:
+**Parameters**:
+
+* `port`: mod_cluster listen port.
+
+  Default: '6666'.
+  
+* `server_advertise`: Whether the server should advertise. TODO: what does advertise mean?
+
+  Default: `true`.
+  
+* `advertise_frequency`: Sets the interval between advertise messages in seconds[.miliseconds]. 
+
+  Default: 10.
 
-- `port`: mod_cluster listen port. Default: '6666'.
-- `server_advertise`: Whether the server should advertise. Default: `true`.
-- `advertise_frequency`: Interval between advertise messages in seconds[.miliseconds]. Default: 10.
-- `manager_allowed_network`: Network allowed to access the mod_cluster_manager. Default: '127.0.0.1'.
-- `keep_alive_timeout`: Keep-alive timeout. Default: 60.
-- `max_keep_alive_requests`: Max number of requests kept alive. Default: 0
-- `enable_mcpm_receive`: Whether MCPM should be enabled: Default: `true`.
-- `ip`: Listen ip address..
-- `allowed_network`: Balanced members network.
-- `version`: mod_cluster version. >= 1.3.0 is required for httpd 2.4.
+* `manager_allowed_network`: Whether to allow the network to access the mod_cluster_manager.
+
+  Default: '127.0.0.1'.
+
+* `keep_alive_timeout`: Specifies how long Apache should wait for a request, in seconds. 
+  
+  Default: 60.
+
+* `max_keep_alive_requests`: Maximum number of requests kept alive.
+
+  Default: 0.
+
+* `enable_mcpm_receive`: Whether MCPM should be enabled.
+
+  Default: `true`.
+
+* `ip`: Specifies the IP address to listen to. TODO: is this required or does it have a default?
+
+* `allowed_network`: Balanced members network. TODO: What does this do? Is there a default?
+
+* `version`: Specifies the `mod_cluster` version. Version 1.3.0 or greater is required for httpd 2.4.
 
 ##### Class: `apache::mod::deflate`
 
 Installs and configures [`mod_deflate`][].
 
-**Parameters within `apache::mod::deflate`**:
+**Parameters**:
+
+* `types`: An [array][] of [MIME types][MIME `content*type`] to be deflated.
+
+  Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x*javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json' ].
+  
+* `notes`: A [Hash][] where the key represents the type and the value represents the note name.
 
-- `types`: An [array][] of [MIME types][MIME `content-type`] to be deflated. Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json' ].
-- `notes`: A [Hash][] where the key represents the type and the value represents the note name. Default: { 'Input'  => 'instream', 'Output' => 'outstream', 'Ratio'  => 'ratio' }
+  Default: { 'Input'  => 'instream', 'Output' => 'outstream', 'Ratio'  => 'ratio' }.
 
 ##### Class: `apache::mod::expires`
 
 Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate its configuration.
 
-**Parameters within `apache::mod::expires`**:
+**Parameters**:
+
+* `expires_active`: Enables generation of `Expires` headers for a document realm.
+
+  Boolean. Default: `true`.
+
+* `expires_default`: Specifies the default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][].
 
-- `expires_active`: Enables generation of `Expires` headers for a document realm. Valid options: Boolean. Default: `true`.
-- `expires_default`: Default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][]. Default: `undef`.
-- `expires_by_type`: Describes a set of [MIME `content-type`][] and their expiration times. Valid options: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content-type` (i.e. 'text/json') and its value following valid [interval syntax][]. Default: `undef`.
+  Default: `undef`.
+  
+* `expires_by_type`: Describes a set of [MIME `content*type`][] and their expiration times.
+
+  Values: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content*type` (i.e. 'text/json') and its value following valid [interval syntax][].
+  
+  Default: `undef`.
 
 ##### Class: `apache::mod::ext_filter`
 
@@ -1745,15 +1949,17 @@ class { 'apache::mod::ext_filter':
 }
 ```
 
-**Parameters within `apache::mod::ext_filter`**:
+**Parameters**:
+
+* `ext_filter_define`: A hash of filter names and their parameters.
 
-- `ext_filter_define`: A hash of filter names and their parameters. Default: `undef`.
+  Default: `undef`.
 
 ##### Class: `apache::mod::fcgid`
 
 Installs and configures [`mod_fcgid`][].
 
-The class makes no effort to individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [hash][]. For example:
+The class does not individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [hash][]. For example:
 
 ``` puppet
 class { 'apache::mod::fcgid':
@@ -1787,39 +1993,98 @@ apache::vhost { 'example.org':
 
 Installs and manages [`mod_geoip`][].
 
-**Parameters within `apache::mod::geoip`**:
+**Parameters**:
+
+* `db_file`: Sets the path to your GeoIP database file.
+
+  Values: a path, or an [array][] paths for multiple GeoIP database files.
+
+  Default: `/usr/share/GeoIP/GeoIP.dat`.
+
+* `enable`: Determines whether to globally enable [`mod_geoip`][].
+
+  Boolean. Default: `false`.
+  
+* `flag`: Sets the GeoIP flag.
+
+  Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'.
+  
+  Default: 'Standard'.
+  
+* `output`: Defines which output variables to use.
+
+  Values: 'All', 'Env', 'Request', 'Notes'.
+  
+  Default: 'All'.
+
+* `enable_utf8`: Changes the output from ISO*8859*1 (Latin*1) to UTF*8.
+
+  Boolean. Default: `undef`.
+
+* `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option.
+
+  Boolean. Default: `undef`.
+
+* `scan_proxy_header_field`: Specifies the header [`mod_geoip`][] uses to determine the client's IP address.
 
-- `db_file`: Sets the path to your GeoIP database file. Valid options: a path, or an [array][] paths for multiple GeoIP database files. Default: `/usr/share/GeoIP/GeoIP.dat`.
-- `enable`: Determines whether to globally enable [`mod_geoip`][]. Valid options: Boolean. Default: `false`.
-- `flag`: Sets the GeoIP flag. Valid options: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'. Default: 'Standard'.
-- `output`: Defines which output variables to use. Valid options: 'All', 'Env', 'Request', 'Notes'. Default: 'All'.
-- `enable_utf8`: Changes the output from ISO-8859-1 (Latin-1) to UTF-8. Valid options: Boolean. Default: `undef`.
-- `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option. Valid options: Boolean. Default: `undef`.
-- `scan_proxy_header_field`: Specifies which header [`mod_geoip`][] should look at to determine the client's IP address. Default: `undef`.
-- `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP if a comma-separated list of IP addresses is found. Valid options: Boolean. Default: `undef`.
+  Default: `undef`.
+
+* `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
+
+  Boolean. Default: `undef`.
 
 ##### Class: `apache::mod::info`
 
 Installs and manages [`mod_info`][], which provides a comprehensive overview of the server configuration.
 
-**Parameters within `apache::mod::info`**:
+**Parameters**:
+
+* `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server*info`.
+
+  Values: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either.
+  
+  Default: ['127.0.0.1','::1'].
+
+* `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'.
+
+  Default: The value of [`$::apache::apache_version`][`apache_version`].
+
 
-- `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server-info`. Valid options: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either. Default: ['127.0.0.1','::1'].
-- `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. Default: the value of [`$::apache::apache_version`][`apache_version`].
-- `restrict_access`: Determines whether to enable access restrictions. If `false`, the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: `true`.
+* `restrict_access`: Determines whether to enable access restrictions. If `false`, the `allow_from` whitelist is ignored and any IP address can access `/server*info`.
+
+  Boolean. Default: `true`.
 
 ##### Class: `apache::mod::passenger`
 
-Installs and manages [`mod_passenger`][]. For RedHat based systems, please ensure that you meet the minimum requirements as described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux)
+Installs and manages [`mod_passenger`][]. For Red Hat-based systems, ensure that you meet the minimum requirements described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux).
+
+**Parameters**:
+
+* `passenger_high_performance`: Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance).
+
+  Values: 'On', 'Off'.
+  
+  Default: `undef`.
+  
+* `passenger_pool_idle_time`: Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime).
+
+  Default: `undef`.
+
+* `passenger_max_pool_size`: Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize).
+
+  Default: `undef`.
 
-**Parameters within `apache::mod::passenger`**:
+* `passenger_max_request_queue_size`: Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize).
 
-- `passenger_high_performance` Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). Valid options: 'on', 'off'. Default: `undef`.
-- `passenger_pool_idle_time` Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime). Default: `undef`.
-- `passenger_max_pool_size` Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize). Default: `undef`.
-- `passenger_max_request_queue_size` Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize). Default: `undef`.
-- `passenger_max_requests` Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests). Default: `undef`.
-- `passenger_data_buffer_dir` Sets the [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir). Default: `undef`.
+  Default: `undef`.
+
+* `passenger_max_requests`: Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests).
+
+  Default: `undef`.
+
+* `passenger_data_buffer_dir`: Sets the [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir).
+
+  Default: `undef`.
 
 ##### Class: `apache::mod::ldap`
 
@@ -1838,84 +2103,130 @@ class { 'apache::mod::ldap':
 }
 ```
 
-**Parameters within `apache::mod::ldap`:**
+**Parameters**
+
+* `apache_version`: Specifies the installed Apache version.
+
+  Default: `undef`.
+
+* `ldap_trusted_global_cert_file`: Specifies the path and file name of the trusted CA certificates to use when establishing SSL or TLS connections to an LDAP server.
+
+* `ldap_trusted_global_cert_type`: Specifies the global trust certificate format.
+
+  Default: 'CA_BASE64'.
+
+* `ldap_shared_cache_size`: Specifies the size, in bytes, of the shared memory cache.
+
+* `ldap_cache_entries`: Specifies the maximum number of entries in the primary LDAP cache.
+
+* `ldap_cache_ttl`: Specifies the time, in seconds, that cached items remain valid.
+
+* `ldap_opcache_entries`: Specifies the number of entries used to cache LDAP compare operations.
 
-- `apache_version`: The installed Apache version. Defaults to `undef`.
-- `ldap_trusted_global_cert_file`: Path and file name of the trusted CA certificates to use when establishing SSL or TLS connections to an LDAP server.
-- `ldap_trusted_global_cert_type`: The global trust certificate format. Default: 'CA_BASE64'.
-- `ldap_shared_cache_size`: Size in bytes of the shared-memory cache.
-- `ldap_cache_entries`: Maximum number of entries in the primary LDAP cache.
-- `ldap_cache_ttl`: Time that cached items remain valid.
-- `ldap_opcache_entries`: Number of entries used to cache LDAP compare operations.
-- `ldap_opcache_ttl`: Time that entries in the operation cache remain valid.
-- `package_name`: Custom package name. Defaults to `undef`.
+* `ldap_opcache_ttl`: Specifies the time, in seconds, that entries in the operation cache remain valid.
+
+* `package_name`: Specifies the custom package name.
+
+  Default: `undef`.
 
 ##### Class: `apache::mod::negotiation`
 
 Installs and configures [`mod_negotiation`][].
 
-**Parameters within `apache::mod::negotiation`:**
+**Parameters**:
+
+* `force_language_priority`: Sets the `ForceLanguagePriority` option.
+
+  Values: A string. TODO: What are options for the string?
+  
+  Default: `Prefer Fallback`.
+  
+* `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module.
 
-- `force_language_priority`: Sets the `ForceLanguagePriority` option. Valid option: String. Default: `Prefer Fallback`.
-- `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module. Default: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN', 'zh-TW' ]
+  Default: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt*BR', 'ru', 'sv', 'zh*CN', 'zh*TW' ]
 
 ##### Class: `apache::mod::pagespeed`
 
 Installs and manages [`mod_pagespeed`][], a Google module that rewrites web pages to reduce latency and bandwidth.
 
-While this Apache module requires the `mod-pagespeed-stable` package, Puppet **doesn't** manage the software repositories required to automatically install the package. If you declare this class when the package is either not installed or not available to your package manager, your Puppet run will fail.
-
-**Note:** Verify that your system is compatible with the latest Google Pagespeed requirements.
-
-**Parameters within `apache::mod::pagespeed`**:
-
-- `inherit_vhost_config`: Default: 'on'.
-- `filter_xhtml`: Default: `false`.
-- `cache_path`: Default: '/var/cache/mod\_pagespeed/'.
-- `log_dir`: Default: '/var/log/pagespeed'.
-- `memcache_servers`: Default: [].
-- `rewrite_level`: Default: 'CoreFilters'.
-- `disable_filters`: Default: [].
-- `enable_filters`: Default: [].
-- `forbid_filters`: Default: [].
-- `rewrite_deadline_per_flush_ms`: Default: 10.
-- `additional_domains`: Default: `undef`.
-- `file_cache_size_kb`: Default: 102400.
-- `file_cache_clean_interval_ms`: Default: 3600000.
-- `lru_cache_per_process`: Default: 1024.
-- `lru_cache_byte_limit`: Default: 16384.
-- `css_flatten_max_bytes`: Default: 2048.
-- `css_inline_max_bytes`: Default: 2048.
-- `css_image_inline_max_bytes`: Default: 2048.
-- `image_inline_max_bytes`: Default: 2048.
-- `js_inline_max_bytes`: Default: 2048.
-- `css_outline_min_bytes`: Default: 3000.
-- `js_outline_min_bytes`: Default: 3000.
-- `inode_limit`: Default: 500000.
-- `image_max_rewrites_at_once`: Default: 8.
-- `num_rewrite_threads`: Default: 4.
-- `num_expensive_rewrite_threads`: Default: 4.
-- `collect_statistics`: Default: 'on'.
-- `statistics_logging`: Default: 'on'.
-- `allow_view_stats`: Default: [].
-- `allow_pagespeed_console`: Default: [].
-- `allow_pagespeed_message`: Default: [].
-- `message_buffer_size`: Default: 100000.
-- `additional_configuration`: A hash of directive-value pairs or an array of lines to insert at the end of the pagespeed configuration. Default: '{ }'.
-
-The class's parameters correspond to the module's directives. See the [module's documentation][`mod_pagespeed`] for details.
+Although this apache module requires the `mod-pagespeed-stable` package, Puppet **does not** manage the software repositories required to automatically install the package. If you declare this class when the package is either not installed or not available to your package manager, your Puppet run will fail.
+
+> **Note:** Verify that your system is compatible with the latest Google Pagespeed requirements.
+
+**Parameters**:
+
+These parameters correspond to the module's directives. See the [module's documentation][`mod_pagespeed`] for details.
+
+* `inherit_vhost_config`: Default: 'on'.
+* `filter_xhtml`: Default: `false`.
+* `cache_path`: Default: '/var/cache/mod_pagespeed/'.
+* `log_dir`: Default: '/var/log/pagespeed'.
+* `memcache_servers`: Default: [].
+* `rewrite_level`: Default: 'CoreFilters'.
+* `disable_filters`: Default: [].
+* `enable_filters`: Default: [].
+* `forbid_filters`: Default: [].
+* `rewrite_deadline_per_flush_ms`: Default: 10.
+* `additional_domains`: Default: `undef`.
+* `file_cache_size_kb`: Default: 102400.
+* `file_cache_clean_interval_ms`: Default: 3600000.
+* `lru_cache_per_process`: Default: 1024.
+* `lru_cache_byte_limit`: Default: 16384.
+* `css_flatten_max_bytes`: Default: 2048.
+* `css_inline_max_bytes`: Default: 2048.
+* `css_image_inline_max_bytes`: Default: 2048.
+* `image_inline_max_bytes`: Default: 2048.
+* `js_inline_max_bytes`: Default: 2048.
+* `css_outline_min_bytes`: Default: 3000.
+* `js_outline_min_bytes`: Default: 3000.
+* `inode_limit`: Default: 500000.
+* `image_max_rewrites_at_once`: Default: 8.
+* `num_rewrite_threads`: Default: 4.
+* `num_expensive_rewrite_threads`: Default: 4.
+* `collect_statistics`: Default: 'on'.
+* `statistics_logging`: Default: 'on'.
+* `allow_view_stats`: Default: [].
+* `allow_pagespeed_console`: Default: [].
+* `allow_pagespeed_message`: Default: [].
+* `message_buffer_size`: Default: 100000.
+* `additional_configuration`: A hash of directive value pairs, or an array of lines to insert at the end of the pagespeed configuration. Default: '{ }'.
 
 ##### Class: `apache::mod::passenger`
 
-Installs and configures mod\_passenger
-
-**Parameters within `apache::mod::passenger`**:
-
-- `manage_repo`: Manage phusionpassenger.com repository. Default: `true`.
-
-TODO: The parameters section is incomplete.
-
-**Note**: The passenger module isn't available on RH/CentOS without providing dependency packages provided by EPEL and mod\_passengers own custom repository. See the `manage_repo` parameter above and [https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()
+Installs and configures `mod_passenger`.
+
+>**Note**: The passenger module isn't available on RH/CentOS without providing the dependency packages provided by EPEL and the `mod_passengers` custom repository. See the `manage_repo` parameter above and [https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()
+
+**Parameters**: [TODO: parameters were not listed (except `manage_repo`), so I pulled them out of the manifest. I need to know what these parameters do and what their values can be OR a link that points external documentation for the parameter mapping (as with mod_pagespeed above)]
+
+* `passenger_conf_file`: `$::apache::params::passenger_conf_file`
+* `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file`
+* `passenger_high_performance`: Default: `undef`
+* `passenger_pool_idle_time`: Default: `undef`
+* `passenger_max_request_queue_size`: Default: `undef`
+* `passenger_max_requests`: Default: `undef`
+* `passenger_spawn_method`: Default: `undef`
+* `passenger_stat_throttle_rate`: Default: `undef`
+* `rack_autodetect`: Default: `undef`
+* `rails_autodetect`: Default: `undef`
+* `passenger_root` : `$::apache::params::passenger_root`
+* `passenger_ruby` : `$::apache::params::passenger_ruby`
+* `passenger_default_ruby`: `$::apache::params::passenger_default_ruby`
+* `passenger_max_pool_size`: Default: `undef`
+* `passenger_min_instances`: Default: `undef`
+* `passenger_max_instances_per_app`: Default: `undef`
+* `passenger_use_global_queue`: Default: `undef`
+* `passenger_app_env`: Default: `undef`
+* `passenger_log_file`: Default: `undef`
+* `passenger_log_level`: Default: `undef`
+* `passenger_data_buffer_dir`: Default: `undef`
+* `manage_repo`: Whether to manage the phusionpassenger.com repository. Default: `true`.
+* `mod_package`: Default: `undef`.
+* `mod_package_ensure`: Default: `undef`.
+* `mod_lib`: Default: `undef`.
+* `mod_lib_path`: Default: `undef`.
+* `mod_id`: Default: `undef`.
+* `mod_path`: Default: `undef`.
 
 ##### Class: `apache::mod::proxy`
 
@@ -1923,6 +2234,8 @@ Installs `mod_proxy` and uses the `proxy.conf.erb` template to generate its conf
 
 **Parameters within `apache::mod::proxy`**:
 
+TODO: What do these parameters do?
+
 - `allow_from`: Default: `undef`.
 - `apache_version`: Default: `undef`.
 - `package_name`: Default: `undef`.
@@ -1933,42 +2246,53 @@ Installs `mod_proxy` and uses the `proxy.conf.erb` template to generate its conf
 
 Installs and manages [`mod_proxy_balancer`][], which provides load balancing.
 
-**Parameters within `apache::mod::proxy_balancer`**:
+**Parameters**:
+
+* `manager`: Determines whether to enable balancer manager support.
+
+  Default: `false`.
+  
+* `manager_path`: The server location of the balancer manager.
 
-- `manager`: Determines whether to enable balancer manager support. Default: `false`.
-- `manager_path`: The server location of the balancer manager. Default: '/balancer-manager'.
-- `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/balancer-manager`. Default: ['127.0.0.1','::1'].
-- `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. Default: the value of [`$::apache::apache_version`][`apache_version`].
-   - On Apache >= 2.4, `mod_slotmem_shm` is loaded.
+  Default: '/balancer*manager'.
+  
+* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/balancer*manager`.
 
+  Default: ['127.0.0.1','::1'].
+  
+* `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'.
+
+  Default: the value of [`$::apache::apache_version`][`apache_version`]. On Apache 2.4 or greater, `mod_slotmem_shm` is loaded.
 
 ##### Class: `apache::mod::php`
 
 Installs and configures [`mod_php`][].
 
-**Parameters within `apache::mod::php`**:
-
-Default values depend on your operating system.
+**Parameters**:
 
-> **Note**: This list is incomplete. Most of this class's parameters correspond to `mod_php` directives; see the [module's documentation][`mod_php`] for details.
+Default values for these parameters depend on your operating system. Most of this class's parameters correspond to `mod_php` directives; see the [module's documentation][`mod_php`] for details.
 
-- `package_name`: Names the package that installs `mod_php`.
-- `path`: Defines the path to the `mod_php` shared object (`.so`) file.
-- `source`: Defines the path to the default configuration. Valid options include a `puppet:///` path.
-- `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
-- `content`: Adds arbitrary content to `php.conf`.
+* `package_name`: Names the package that installs `mod_php`.
+* `path`: Defines the path to the `mod_php` shared object (`.so`) file.
+* `source`: Defines the path to the default configuration. Values include a `puppet:///` path.
+* `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
+* `content`: Adds arbitrary content to `php.conf`.
 
 ##### Class: `apache::mod::proxy_html`
 
-**Note**: There is no official package available for mod\_proxy\_html and thus it must be made available by means outside of the control of the apache module.
+**Note**: There is no official package available for `mod_proxy_html`, so you must make it available outside of the apache module. 
 
 ##### Class: `apache::mod::reqtimeout`
 
 Installs and configures [`mod_reqtimeout`][].
 
-**Parameters within `apache::mod::reqtimeout`**:
+**Parameters**
+
+* `timeouts`: Sets the [`RequestReadTimeout`][] option. 
 
-- `timeouts`: A string or [array][] that sets the [`RequestReadTimeout`][] option. Default: ['header=20-40,MinRate=500', 'body=20,MinRate=500'].
+  Values:  A string or [array][].
+  
+  Default: ['header=20-40,MinRate=500', 'body=20,MinRate=500'].
 
 ##### Class: `apache::mod::rewrite`
 
@@ -1976,45 +2300,94 @@ Installs and enables the Apache module `mod_rewrite`.
 
 ##### Class: `apache::mod::shib`
 
-Installs the [Shibboleth](http://shibboleth.net/) Apache module `mod_shib`, which enables SAML2 single sign-on (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. This class only installs and configures the Apache components of a web application that consumes Shibboleth SSO identities, also known as a Shibboleth Service Provider. You can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
+Installs the [Shibboleth](http://shibboleth.net/) Apache module `mod_shib`, which enables SAML2 single sign-on (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. Defining this class enables Shibboleth-specific parameters in `apache::vhost` instances.
 
-Defining this class enables Shibboleth-specific parameters in `apache::vhost` instances.
+This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
 
 **Note**: The shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories. See [http://wiki.aaf.edu.au/tech-info/sp-install-guide]()
 
 ##### Class: `apache::mod::ssl`
 
-Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration.  On most operating systems, this ssl.conf is placed in the module configuration directory, however on Red Hat-based operating systems it is placed in the confd directory (/etc/httpd/conf.d), the same location the RPM stores the configuration.
-
-**Parameters within `apache::mod::ssl`**:
-
-- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
-- `ssl_compression`: Default: `false`.
-- `ssl_cryptodevice`: Default: 'builtin'.
-- `ssl_honorcipherorder`: Default: `true`.
-- `ssl_openssl_conf_cmd`: Default: `undef`.
-- `ssl_options`: Default: [ 'StdEnvVars' ]
-- `ssl_pass_phrase_dialog`: Default: 'builtin'.
-- `ssl_protocol`: Default: [ 'all', '-SSLv2', '-SSLv3' ].
-- `ssl_random_seed_bytes`: Valid options: A string. Default: '512'.
-- `ssl_sessioncachetimeout`: Valid options: A string. Default: '300'.
-- `ssl_mutex`: Default: Determined based on the OS. Valid options: See [mod_ssl][mod_ssl] documentation.
-  - RedHat/FreeBSD/Suse/Gentoo: 'default'
-  - Debian/Ubuntu + Apache >= 2.4: 'default'
-  - Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'
-  - Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'
+Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration. On most operating systems, this `ssl.conf` is placed in the module configuration directory. On Red Hat-based operating systems, this file is placed in `/etc/httpd/conf.d`, the same location in which the RPM stores the configuration.
 
 To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to `true` **or** the [`ssl`][] parameter in [`apache::vhost`][] to `true`.
 
+**Parameters:
+
+* `ssl_cipher`
+
+  Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
+
+* `ssl_compression`
+
+  Default: `false`.
+
+* `ssl_cryptodevice`
+
+  Default: 'builtin'.
+
+* `ssl_honorcipherorder`
+
+  Default: `true`.
+  
+* `ssl_openssl_conf_cmd`
+
+  Default: `undef`.
+
+* `ssl_options`
+
+  Default: [ 'StdEnvVars' ]
+
+* `ssl_pass_phrase_dialog`
+
+  Default: 'builtin'.
+
+* `ssl_protocol`
+
+  Default: [ 'all', '*SSLv2', '*SSLv3' ].
+  
+* `ssl_random_seed_bytes`
+
+  Values: A string.
+  
+  Default: '512'.
+  
+* `ssl_sessioncachetimeout`
+
+  Values: A string.
+  
+  Default: '300'.
+  
+* `ssl_mutex`:
+
+  Values: See [mod_ssl][mod_ssl] documentation.
+
+  Default: Based on the OS:
+ 
+  * RedHat/FreeBSD/Suse/Gentoo: 'default'.
+  * Debian/Ubuntu + Apache >= 2.4: 'default'.
+  * Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'.
+  * Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
+
+
 ##### Class: `apache::mod::status`
 
 Installs [`mod_status`][] and uses the `status.conf.erb` template to generate its configuration.
 
-**Parameters within `apache::mod::status`**:
+**Parameters**:
+
+* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/server-status`. 
+
+  Default: ['127.0.0.1','::1'].
+* `extended_status`: Determines whether to track extended status information for each request, via the [`ExtendedStatus`][] directive.
+
+  Values: 'Off', 'On'.
+  
+  Default: 'On'.
+  
+* `status_path`: The server location of the status page.
 
-- `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/server-status`. Default: ['127.0.0.1','::1'].
-- `extended_status`: Determines whether to track extended status information for each request, via the [`ExtendedStatus`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
-- `status_path`: The server location of the status page. Default: '/server-status'.
+  Default: '/server-status'.
 
 ##### Class: `apache::mod::version`
 
@@ -2026,48 +2399,140 @@ If Debian and Ubuntu systems with Apache 2.4 are classified with `apache::mod::v
 
 Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs by default on all virtual hosts.
 
-**Parameters within `apache::mod::security`**:
+**Parameters**:
+
+* `activated_rules`: An [array][] of rules from the `modsec_crs_path` or absolute to activate via symlinks.
+
+  Default: `modsec_default_rules` in [`apache::params`][].
+
+* `allowed_methods`: A space*separated list of allowed HTTP methods.
 
-- `activated_rules`: An [array][] of rules from the `modsec_crs_path` or absolute to activate via symlinks. Default: `modsec_default_rules` in [`apache::params`][].
-- `allowed_methods`: A space-separated list of allowed HTTP methods. Default: 'GET HEAD POST OPTIONS'.
-- `content_types`: A list of one or more allowed [MIME types][MIME `content-type`]. Default: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'
-- `crs_package`: Names the package that installs CRS rules. Default: `modsec_crs_package` in [`apache::params`][].
-- `modsec_dir`: Defines the path where Puppet installs the modsec configuration and activated rules links. Default: 'On', set by `modsec_dir` in [`apache::params`][].
+  Default: 'GET HEAD POST OPTIONS'.
+
+* `content_types`: A list of one or more allowed [MIME types][MIME `content*type`]. 
+
+  Default: 'application/x*www*form*urlencoded|multipart/form*data|text/xml|application/xml|application/x*amf'.
+
+* `crs_package`: Names the package that installs CRS rules.
+
+  Default: `modsec_crs_package` in [`apache::params`][].
+  
+* `modsec_dir`: Defines the path where Puppet installs the modsec configuration and activated rules links.
+
+  Default: 'On', set by `modsec_dir` in [`apache::params`][].
 ${modsec\_dir}/activated\_rules.
-- `modsec_secruleengine`: Configures the modsec rules engine. Valid options: 'On', 'Off', and 'DetectionOnly'. Default: `modsec_secruleengine` in [`apache::params`][].
-- `restricted_extensions`: A space-separated list of prohibited file extensions. Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
-- `restricted_headers`: A list of restricted headers separated by slashes and spaces. Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
-- `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') vs. Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set. Default: 'deny'. Fuller values can be set too like "log,auditlog,deny,status:406,tag:'SLA 24/7'"
-- `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. Default: '1500'
-- `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. Default: '1500'
-- `logroot`: Configures the location of audit and debug logs.  Defaults to apache log directory (Redhat: /var/log/httpd Debian: /var/log/apache2)
-- `audit_log_releavant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging. Defaults: '^(?:5|4(?!04))'.
-- `audit_log_parts`: Sets the sections to be put in the [audit log][]. Default: 'ABIJDEFHZ'
-- `anomaly_score_blocking`: De-/Activates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set. Default: off.
-- `inbound_anomaly_threshold`: Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '5'.
-- `outbound_anomaly_threshold`: Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '4'.
-- `critical_anomaly_score`: Sets the scoring points of the critical severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '5'.
-- `error_anomaly_score`: Sets the scoring points of the error severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '4'.
-- `warning_anomaly_score`: Sets the scoring points of the warning severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '3'.
-- `notice_anomaly_score`: Sets the scoring points of the notice severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. Default: '2'.
-- `secrequestmaxnumargs`: Sets the Maximum number of arguments in the request. Default: '255'.
-- `secrequestbodylimit`:  Sets the maximum request body size ModSecurity will accept for buffering.. Default: '13107200'.
-- `secrequestbodynofileslimit`: Sets the maximum request body size ModSecurity will accept for buffering, excluding the size of any files being transported in the request. Default: '131072'.
-- `secrequestbodyinmemorylimit`: Sets the maximum request body size that ModSecurity will store in memory. Default: '131072'
+
+* `modsec_secruleengine`: Configures the modsec rules engine. Values: 'On', 'Off', and 'DetectionOnly'.
+
+  Default: `modsec_secruleengine` in [`apache::params`][].
+
+* `restricted_extensions`: A space*separated list of prohibited file extensions.
+
+  Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
+
+* `restricted_headers`: A list of restricted headers separated by slashes and spaces. 
+
+  Default: 'Proxy*Connection/ /Lock*Token/ /Content*Range/ /Translate/ /via/ /if/'.
+
+* `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') or Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set.
+
+  Default: 'deny'. You can also set full values, such as "log,auditlog,deny,status:406,tag:'SLA 24/7'".
+
+* `secpcrematchlimit`: Sets the number for the match limit in the PCRE library.
+
+  Default: 1500.
+
+* `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library.
+
+  Default: 1500.
+
+* `logroot`: Configures the location of audit and debug logs.
+
+ Defaults to the Apache log directory (Redhat: `/var/log/httpd`,  Debian: `/var/log/apache2`).
+
+* `audit_log_releavant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging.
+
+  Default: '^(?:5|4(?!04))'.
+
+* `audit_log_parts`: Sets the sections to be put in the [audit log][].
+
+  Default: 'ABIJDEFHZ'.
+  
+* `anomaly_score_blocking`: Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set.
+
+  Default: 'off'.
+  
+* `inbound_anomaly_threshold`: Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+
+  Default: 5.
+  
+* `outbound_anomaly_threshold`: Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+
+  Default: 4.
+  
+* `critical_anomaly_score`: Sets the scoring points of the critical severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+
+  Default: 5.
+  
+* `error_anomaly_score`: Sets the scoring points of the error severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+
+  Default: 4.
+  
+* `warning_anomaly_score`: Sets the scoring points of the warning severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+
+  Default: 3.
+
+* `notice_anomaly_score`: Sets the scoring points of the notice severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+
+Default: 2.
+
+* `secrequestmaxnumargs`: Sets the Maximum number of arguments in the request.
+
+  Default: 255.
+
+* `secrequestbodylimit`:  Sets the maximum request body size ModSecurity accepts for buffering.
+
+  Default: '13107200'.
+  
+* `secrequestbodynofileslimit`: Sets the maximum request body size ModSecurity accepts for buffering, excluding the size of any files being transported in the request.
+
+  Default: '131072'.
+  
+* `secrequestbodyinmemorylimit`: Sets the maximum request body size that ModSecurity stores in memory.
+
+  Default: '131072'
 
 ##### Class: `apache::mod::wsgi`
 
 Enables Python support via [`mod_wsgi`][].
 
-**Parameters within `apache::mod::wsgi`**:
+**Parameters**:
+
+* `mod_path`: Defines the path to the `mod_wsgi` shared object (`.so`) file.
+
+  Default: `undef`.
+  
+  * If the `mod_path` parameter doesn't contain `/`, Puppet prefixes it with your operating system's default module path. Otherwise, Puppet follows it literally.
+  
+* `package_name`: Names the package that installs `mod_wsgi`.
+
+  Default: `undef`.
+
+* `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. 
 
-- `mod_path`: Defines the path to the `mod_wsgi` shared object (`.so`) file. Default: `undef`.
-  - If the `mod_path` parameter doesn't contain `/`, Puppet prefixes it with your operating system's default module path.
-Otherwise, Puppet follows it literally.
-- `package_name`: Names the package that installs `mod_wsgi`. Default: `undef`.
-- `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. Valid options: path. Default: `undef`.
-- `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site-packages'. Valid options: path. Default: `undef`.
-- `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE\_RUN\_DIR}WSGI". Default: `wsgi_socket_prefix` in [`apache::params`][].
+  Values: A string specifying a path.
+
+  Default: `undef`.
+  
+* `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site*packages'.
+
+  Values: A string specifying a path.
+  
+  Default: `undef`.
+  
+* `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE\_RUN\_DIR}WSGI".
+
+  Default: `wsgi_socket_prefix` in [`apache::params`][].
 
 The class's parameters correspond to the module's directives. See the [module's documentation][`mod_wsgi`] for details.
 
@@ -2109,19 +2574,19 @@ Creates an Apache load balancing group, also known as a balancer cluster, using
 
 Declare one `apache::balancer` defined type for each Apache load balancing group. You can export `apache::balancermember` defined types for all balancer members and collect them on a single Apache load balancer server using [exported resources][].
 
-**Parameters within `apache::balancer`**:
+**Parameters**:
 
 ##### `name`
 
-Sets the title of the balancer cluster and name of the `conf.d` file containing its configuration.
+Sets the title of the balancer cluster and name of the `conf.d` file containing its configuration. TODO: isn't the default for this generated from something?
 
 ##### `proxy_set`
 
-Configures key-value pairs as [`ProxySet`][] lines. Valid options: a [hash][]. Default: '{}'.
+Configures key-value pairs as [`ProxySet`][] lines. Values: a [hash][]. Default: '{}'.
 
 ##### `collect_exported`
 
-Determines whether to use [exported resources][]. Valid options: Boolean. Default: `true`.
+Determines whether to use [exported resources][].
 
 If you statically declare all of your backend servers, set this parameter to `false` to rely on existing, declared balancer member resources. Also, use `apache::balancermember` with [array][] arguments.
 
@@ -2129,145 +2594,200 @@ To dynamically declare backend servers via exported resources collected on a cen
 
 If you don't use exported resources, a single Puppet run configures all balancer members. If you use exported resources, Puppet has to run on the balanced nodes first, then run on the balancer.
 
+Boolean. Default: `true`.
+
 #### Defined type: `apache::balancermember`
 
 Defines members of [`mod_proxy_balancer`][], which sets up a balancer member inside a listening service configuration block in the load balancer's `apache.cfg`.
 
-**Parameters within `apache::balancermember`**:
+**Parameters**:
 
 ##### `balancer_cluster`
 
-**Required**. Sets the Apache service's instance name, and must match the name of a declared [`apache::balancer`][] resource.
+**Required**.
+
+Sets the Apache service's instance name, and must match the name of a declared [`apache::balancer`][] resource.
 
 ##### `url`
 
-Specifies the URL used to contact the balancer member server. Default:  'http://${::fqdn}/'.
+Specifies the URL used to contact the balancer member server.
+
+Default: 'http://${::fqdn}/'.
 
 ##### `options`
 
-Specifies an [array][] of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the URL, and accepts any key-value pairs available to [`ProxyPass`][]. Default: an empty array.
+Specifies an [array][] of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the URL, and accepts any key-value pairs available to [`ProxyPass`][].
+
+Default: an empty array.
 
 #### Defined type: `apache::custom_config`
 
 Adds a custom configuration file to the Apache server's `conf.d` directory. If the file is invalid and this defined type's [`verify_config`][] parameter's value is `true`, Puppet throws an error during a Puppet run.
 
-**Parameters within `apache::custom_config`**:
+**Parameters**:
 
 ##### `ensure`
 
-Specifies whether the configuration file should be present. Valid options: 'absent', 'present'. Default: 'present'.
+Specifies whether the configuration file should be present.
+
+Values: 'absent', 'present'.
+
+Default: 'present'.
 
 ##### `confdir`
 
-Sets the directory in which Puppet places configuration files. Default: the value of [`$::apache::confd_dir`][`confd_dir`].
+Sets the directory in which Puppet places configuration files.
+
+Default: the value of [`$::apache::confd_dir`][`confd_dir`].
 
 ##### `content`
 
 Sets the configuration file's content. The `content` and [`source`][] parameters are exclusive of each other.
 
+Default: `undef`
+
 ##### `filename`
 
-Sets the name of the file under `confdir` in which Puppet stores the configuration. The default behavior is to generate the filename from the `priority` parameter and the resource name.
+Sets the name of the file under `confdir` in which Puppet stores the configuration.
+
+Default: Filename generated from the `priority` parameter and the resource name.
 
 ##### `priority`
 
-Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. Default: '25'.
+Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order.
 
 To omit the priority prefix in the configuration file's name, set this parameter to `false`.
 
+Default: '25'.
+
 ##### `source`
 
-Points to the configuration file's source. The [`content`][] and `source` parameters are exclusive of each other.
+Points to the configuration file's source. The [`content`][] and `source` parameters are exclusive of each other. TODO: is this required or does it have a default value?
+
+Default: `undef`
 
 ##### `verify_command`
 
-Specifies the command Puppet uses to verify the configuration file. Use a fully qualified command. Default: `/usr/sbin/apachectl -t`.
+Specifies the command Puppet uses to verify the configuration file. Use a fully qualified command.
+
+This parameter is used only if the [`verify_config`][] parameter's value is `true`. If the `verify_command` fails, the Puppet run deletes the configuration file and raises an error, but does not notify the Apache service.
 
-This parameter is only used if the [`verify_config`][] parameter's value is '`true`'. If the `verify_command` fails, the Puppet run deletes the configuration file, does not notify the Apache service, and raises an error.
+Default: '/usr/sbin/apachectl -t'.
 
 ##### `verify_config`
 
-Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: `true`.
+Specifies whether to validate the configuration file before notifying the Apache service.
+
+Boolean. Default: `true`.
 
 #### Defined type: `apache::fastcgi::server`
 
 Defines one or more external FastCGI servers to handle specific file types. Use this defined type with [`mod_fastcgi`][FastCGI].
 
-**Parameters within `apache::fastcgi::server`:**
+**Parameters**
 
 ##### `host`
 
 Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
 
+Default: '127.0.0.1:9000'.
+
 ##### `timeout`
 
 Sets the number of seconds a [FastCGI][] application can be inactive before aborting the request and logging the event at the error LogLevel. The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond by writing and flushing within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
 
+Default: 15.
+
 ##### `flush`
 
 Forces [`mod_fastcgi`][FastCGI] to write to the client as data is received from the application. By default, `mod_fastcgi` buffers data in order to free the application as quickly as possible.
 
+Default: `false`.
+
 ##### `faux_path`
 
 Apache has [FastCGI][] handle URIs that resolve to this filename. The path set in this parameter does not have to exist in the local filesystem.
 
+Default: "/var/www/${name}.fcgi".
+
 ##### `alias`
 
 Internally links actions with the FastCGI server. This alias must be unique.
 
+Default: "/${name}.fcgi".
+
 ##### `file_type`
 
 Sets the [MIME `content-type`][] of the file to be processed by the FastCGI server.
 
+Default: 'application/x-httpd-php'.
+
 #### Defined type: `apache::listen`
 
-Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this defined type, and titles take the form '<PORT>', '<IPV4>:<PORT>', or '<IPV6>:<PORT>'.
+Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this defined type, and titles take the form `<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
 
 #### Defined type: `apache::mod`
 
 Installs packages for an Apache module that doesn't have a corresponding [`apache::mod::<MODULE NAME>`][] class, and checks for or places the module's default configuration files in the Apache server's `module` and `enable` directories. The default locations depend on your operating system.
 
-**Parameters within `apache::mod`**:
+**Parameters**:
 
 ##### `package`
 
-**Required**. Names the package Puppet uses to install the Apache module.
+**Required**.
+
+Names the package Puppet uses to install the Apache module.
+
+Default: `undef`.
 
 ##### `package_ensure`
 
-Determines whether Puppet ensures the Apache module should be installed. Valid options: 'absent', 'present'. Default: 'present'.
+Determines whether Puppet ensures the Apache module should be installed.
+
+Values: 'absent', 'present'.
+
+Default: 'present'.
 
 ##### `lib`
 
-Defines the module's shared object name. Its default value is `mod_$name.so`, and it should not be configured manually without special reason.
+Defines the module's shared object name. Do not configure manually without special reason.
+
+Default: `mod_$name.so`.
 
 ##### `lib_path`
 
-Specifies a path to the module's libraries. Default: the `apache` class's [`lib_path`][] parameter.
+Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The [`path`][] parameter overrides this value.
+
+Default: The `apache` class's [`lib_path`][] parameter.
 
-Don't manually set this parameter without special reason. The [`path`][] parameter overrides this value.
 
 ##### `loadfile_name`
 
-Sets the filename for the module's [`LoadFile`][] directive, which can also set the module load order as Apache processes them in alphanumeric order. Valid options: filenames formatted `\*.load`. Default: the resource's name followed by 'load', as in '$name.load'.
+Sets the filename for the module's [`LoadFile`][] directive, which can also set the module load order as Apache processes them in alphanumeric order.
+
+Values: Filenames formatted `\*.load`.
+
+Default: the resource's name followed by 'load', as in '$name.load'.
 
 ##### `loadfiles`
 
-Specifies an array of [`LoadFile`][] directives. Default: `undef`.
+Specifies an array of [`LoadFile`][] directives.
+
+Default: `undef`.
 
 ##### `path`
 
-Specifies a path to the module. Default: [`lib_path`][]/[`lib`][].
+Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-> **Note:** Don't manually set this parameter without a specific reason.
+Default: [`lib_path`][]/[`lib`][].
 
 #### Defined type: `apache::namevirtualhost`
-Enables [name-based virtual hosts][] and adds all related directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles can take the forms '\*', '\*:\<PORT\>', '\_default\_:\<PORT\>, '\<IP\>', or '\<IP\>:\<PORT\>'.
 
+Enables [name-based virtual hosts][] and adds all related directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles can take the forms '\*', '\*:\<PORT\>', '\_default\_:\<PORT\>, '\<IP\>', or '\<IP\>:\<PORT\>'.
 
 #### 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` being a defined resource type, which allows Apache to evaluate it multiple times with different parameters.
+The apache module allows a lot of flexibility in the setup and configuration of virtual hosts. This flexibility is due, in part, to `vhost` being a defined resource type, which allows Apache to evaluate it multiple times with different parameters.
 
 The `apache::vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default virtual host within the base `::apache` class, as well as set a customized virtual host as the default. Customized virtual hosts have a lower numeric [`priority`][] than the base class's, causing Apache to process the customized virtual host first.
 
@@ -2275,49 +2795,71 @@ The `apache::vhost` defined type uses `concat::fragment` to build the configurat
 
 For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples of 10, so any `order` that isn't a multiple of 10 should work.
 
-**Parameters within `apache::vhost`**:
+**Parameters**:
 
 ##### `access_log`
 
-Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). Valid options: Boolean. Default: `true`.
+Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). 
+
+Boolean. Default: `true`.
 
 ##### `access_log_env_var`
 
-Specifies that only requests with particular environment variables be logged. Default: `undef`.
+Specifies that only requests with particular environment variables be logged.
+
+Default: `undef`.
 
 ##### `access_log_file`
 
-Sets the filename of the `*_access.log` placed in [`logroot`][]. Given a virtual host---for instance, example.com---it defaults to 'example.com\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_access.log' for unencrypted virtual hosts.
+Sets the filename of the `*_access.log` placed in [`logroot`][]. Given a virtual host---for instance, example.com---it defaults to 'example.com_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com_access.log' for unencrypted virtual hosts.
+
+Default: `false`.
 
 ##### `access_log_format`
 
-Specifies the use of either a [`LogFormat`][] nickname or a custom-formatted string for the access log. Default: 'combined'.
+Specifies the use of either a [`LogFormat`][] nickname or a custom-formatted string for the access log.
+
+Default: 'combined'.
 
 ##### `access_log_pipe`
 
-Specifies a pipe where Apache sends access log messages. Default: `undef`.
+Specifies a pipe where Apache sends access log messages.
+
+Default: `undef`.
 
 ##### `access_log_syslog`
 
-Sends all access log messages to syslog. Default: `undef`.
+Sends all access log messages to syslog.
+
+Default: `undef`.
 
 ##### `add_default_charset`
 
 Sets a default media charset value for the [`AddDefaultCharset`][] directive, which is added to `text/plain` and `text/html` responses.
 
+Default: `undef`.
+
 ##### `add_listen`
 
-Determines whether the virtual host creates a [`Listen`][] statement. Valid options: Boolean. Default: `true`.
+Determines whether the virtual host creates a [`Listen`][] statement.
 
 Setting `add_listen` to `false` prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are.
 
+Boolean. Default: `true`.
+
 ##### `use_optional_includes`
 
-Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer. Valid options: Boolean. Default: `false`.
+Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer.
+
+Boolean. Default: `false`.
 
 ##### `additional_includes`
 
-Specifies paths to additional static, virtual host-specific Apache configuration files. You can use this parameter to implement a unique, custom configuration not supported by this module. Valid options: a string path or [array][] of them. Default: an empty array.
+Specifies paths to additional static, virtual host-specific Apache configuration files. You can use this parameter to implement a unique, custom configuration not supported by this module.
+
+Values: a string or [array][] of strings specifying paths.
+
+Default: an empty array.
 
 ##### `aliases`
 
@@ -2347,59 +2889,74 @@ aliases => [
 
 For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs a corresponding context, such as `<Directory /path/to/directory>` or `<Location /some/location/here>`. Puppet creates the directives in the order specified in the `aliases` parameter. As described in the [`mod_alias`][] documentation, add more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more general ones to avoid shadowing.
 
-> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because you can precisely control the various alias directives' order. Defining `ScriptAliases` using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` directives. This often causes problems, for example with Nagios.
+> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because you can precisely control the order of various alias directives. Defining `ScriptAliases` using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` directives. This often causes problems; for example, this could cause problems with Nagios.
 
-If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is '`true`', the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
+If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is `true`, the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
 ##### `allow_encoded_slashes`
 
-Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Valid options: 'nodecode', 'off', 'on'. Default: `undef`, which omits the declaration from the server configuration and selects the Apache default setting of `Off`.
+Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Values: 'nodecode', 'off', 'on'. The default setting omits the declaration from the server configuration and selects the Apache default setting of 'Off'.
+
+Default: `undef`
 
 ##### `block`
 
-Specifies the list of things to which Apache blocks access. Valid option: 'scm', which blocks web access to `.svn`, `.git`, and `.bzr` directories. Default: an empty [array][].
+Specifies the list of things to which Apache blocks access. Valid option: 'scm', which blocks web access to `.svn`, `.git`, and `.bzr` directories.
+
+Default: an empty [array][].
 
 ##### `cas_attribute_prefix`
 
-Adds a header with the value of this header being the attribute values when SAML validation is enabled. Defaults to
-the value set by [`apache::mod::auth_cas`][]
+Adds a header with the value of this header being the attribute values when SAML validation is enabled.
+
+Defaults: The value set by [`apache::mod::auth_cas`][].
 
 ##### `cas_attribute_delimiter`
 
-The delimiter between attribute values in the header created by `cas_attribute_prefix`.  Defaults to the value
-set by [`apache::mod::auth_cas`][]
+Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
+
+Default: The value set by [`apache::mod::auth_cas`][].
 
 ##### `cas_login_url`
 
 Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and
-don't have an active session. Defaults to the value set by [`apache::mod::auth_cas`][]
+don't have an active session.
+
+Default: The value set by [`apache::mod::auth_cas`][].
 
 ##### `cas_scrub_request_headers`
 
-Remove inbound request headers that may have special meaning within mod_auth_cas. Defaults to the value
-set by [`apache::mod::auth_cas`][]
+Remove inbound request headers that may have special meaning within mod_auth_cas.
+
+Default: The value set by [`apache::mod::auth_cas`][].
 
 ##### `cas_sso_enabled`
 
-Enables experimental support for single sign out (may mangle POST data). Defaults to the value
-set by [`apache::mod::auth_cas`][]
+Enables experimental support for single sign out (may mangle POST data).
+
+Default: The value set by [`apache::mod::auth_cas`][].
 
 ##### `cas_validate_saml`
 
-Parse response from CAS server for SAML. Defaults to the value set by [`apache::mod::auth_cas`][]
+Parse response from CAS server for SAML. Default: The value set by [`apache::mod::auth_cas`][].
 
 ##### `cas_validate_url`
 
-Sets the URL to use when validating a client-presented ticket in an HTTP query string. Defaults to the value set by
-[`apache::mod::auth_cas`][]
+Sets the URL to use when validating a client-presented ticket in an HTTP query string. 
+
+Defaults to the value set by [`apache::mod::auth_cas`][].
 
 ##### `custom_fragment`
 
-Passes a string of custom configuration directives to place at the end of the virtual host configuration. Default: `undef`.
+Passes a string of custom configuration directives to place at the end of the virtual host configuration.
+
+Default: `undef`.
 
 ##### `default_vhost`
 
-Sets a given `apache::vhost` defined type as the default to serve requests that do not match any other `apache::vhost` defined types. Default: `false`.
+Sets a given `apache::vhost` defined type as the default to serve requests that do not match any other `apache::vhost` defined types.
+
+Default: `false`.
 
 ##### `directories`
 
@@ -2407,33 +2964,55 @@ See the [`directories`](#parameter-directories-for-apachevhost) section.
 
 ##### `directoryindex`
 
-Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details. Default: `undef`.
+Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details.
+
+Default: `undef`.
 
 ##### `docroot`
 
-**Required**. Sets the [`DocumentRoot`][] location, from which Apache serves files.
+**Required**.
+
+Sets the [`DocumentRoot`][] location, from which Apache serves files.
 
 If `docroot` and [`manage_docroot`][] are both set to `false`, no [`DocumentRoot`][] will be set and the accompanying `<Directory /path/to/directory>` block will not be created.
 
+Values: A string specifying a directory path.
+
 ##### `docroot_group`
 
-Sets group access to the [`docroot`][] directory. Valid options: A string representing a system group. Default: 'root'.
+Sets group access to the [`docroot`][] directory.
+
+Values: A string specifying a system group.
+
+Default: 'root'.
 
 ##### `docroot_owner`
 
-Sets individual user access to the [`docroot`][] directory. Valid options: A string representing a user account. Default: 'root'.
+Sets individual user access to the [`docroot`][] directory.
+
+Values: A string specifying a user account.
+
+Default: 'root'.
 
 ##### `docroot_mode`
 
-Sets access permissions for the [`docroot`][] directory, in numeric notation. Valid options: A string. Default: `undef`.
+Sets access permissions for the [`docroot`][] directory, in numeric notation.
+
+Values: A string.
+
+Default: `undef`.
 
 ##### `manage_docroot`
 
-Determines whether Puppet manages the [`docroot`][] directory. Valid options: Boolean. Default: `true`.
+Determines whether Puppet manages the [`docroot`][] directory.
+
+Boolean. Default: `true`.
 
 ##### `error_log`
 
-Specifies whether `*_error.log` directives should be configured. Valid options: Boolean. Default: `true`.
+Specifies whether `*_error.log` directives should be configured.
+
+Boolean. Default: `true`.
 
 ##### `error_log_file`
 
@@ -2441,23 +3020,29 @@ Points the virtual host's error logs to a `*_error.log` file. If this parameter
 
 If none of these parameters is set, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts.
 
+Default: `undef`.
+
 ##### `error_log_pipe`
 
-Specifies a pipe to send error log messages to. Default: `undef`.
+Specifies a pipe to send error log messages to.
 
 This parameter has no effect if the [`error_log_file`][] parameter has a value. If neither this parameter nor `error_log_file` has a value, Puppet then checks [`error_log_syslog`][].
 
+Default: `undef`.
+
 ##### `error_log_syslog`
 
-Determines whether to send all error log messages to syslog. Valid options: Boolean. Default: `undef`.
+Determines whether to send all error log messages to syslog.
 
 This parameter has no effect if either of the [`error_log_file`][] or [`error_log_pipe`][] parameters has a value. If none of these parameters has a value, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts.
 
+Boolean. Default: `undef`.
+
 ##### `error_documents`
 
-A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this virtual host. Default: '[]'.
+A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this virtual host.
 
-An example:
+For example:
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -2468,23 +3053,35 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+Default: '[]'.
+
 ##### `ensure`
 
-Specifies if the virtual host is present or absent. Valid options: 'absent', 'present'. Default: 'present'.
+Specifies if the virtual host is present or absent.
+
+Values: 'absent', 'present'.
+
+Default: 'present'.
 
 ##### `fallbackresource`
 
-Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid options must either begin with a '/' or be 'disabled'. Default: `undef`.
+Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin with a '/' or be 'disabled'.
+
+Default: `undef`.
 
 #####`fastcgi_idle_timeout`
 
 If using fastcgi, this option sets the timeout for the server to respond.
 
+Default: `undef`.
+
 ##### `file_e_tag`
 
 Sets the server default for the [`FileETag`][] declaration, which modifies the response header field for static files.
-Valid options: 'INode', 'MTime', 'Size', 'All', 'None'. 
-Default: undef, which uses Apache's default setting of 'MTime Size'.
+
+Values: 'INode', 'MTime', 'Size', 'All', 'None'. 
+
+Default: `undef`, which uses Apache's default setting of 'MTime Size'.
 
 ##### `filters`
 
@@ -2505,21 +3102,47 @@ apache::vhost { "$::fqdn":
 
 Sets the [`ForceType`][] directive, which forces Apache to serve all matching files with a [MIME `content-type`][] matching this parameter's value.
 
+TODO: is there a default for this? Valid values?
+
 ##### `headers`
 
-Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Valid options: A string, an array of strings, or `undef`. Default: `undef`.
+Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
+
+Values: A string or an array of strings.
+
+Default: `undef`.
 
 ##### `ip`
 
-Sets the IP address the virtual host listens on. Valid options: Strings. Default: `undef`, which uses Apache's default behavior of listening on all IPs.
+Sets the IP address the virtual host listens on. By default, uses Apache's default behavior of listening on all IPs.
+
+Values: A string or an array of strings.
+
+Default: `undef`. 
 
 ##### `ip_based`
 
-Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual host. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based virtual hosts. Default: `false`.
+Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual host. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based virtual hosts.
+
+Default: `false`.
 
 ##### `itk`
 
-Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys can be:
+Configures [ITK](http://mpm-itk.sesse.net/) in a hash.
+
+Usage typically looks something like:
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot => '/path/to/directory',
+  itk     => {
+    user  => 'someuser',
+    group => 'somegroup',
+  },
+}
+```
+
+Values: a hash, which can include the keys:
 
 * user + group
 * `assignuseridexpr`
@@ -2541,9 +3164,11 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+Default: `undef`.
+
 ##### `jk_mounts`
 
-Sets up a virtual host with 'JkMount' and 'JkUnMount' directives to handle the paths for URL mapping between Tomcat and Apache. Default: `undef`.
+Sets up a virtual host with 'JkMount' and 'JkUnMount' directives to handle the paths for URL mapping between Tomcat and Apache.
 
 The parameter must be an array of hashes where each hash must contain the 'worker' and either the 'mount' or 'unmount' keys.
 
@@ -2557,28 +3182,37 @@ apache::vhost { 'sample.example.net':
   ],
 }
 ```
-
+Default: `undef`.
+ 
 ##### `keepalive`
 
-Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive for the virtual host. Valid options: 'Off', 'On' and `undef`. Default: `undef`, meaning the global, server-wide [`KeepAlive`][] setting is in effect.
+Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive for the virtual host. By default, the global, server-wide [`KeepAlive`][] setting is in effect.
 
 Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options for the virtual host.
 
+Values: 'Off', 'On'.
+
+Default: `undef`
+
 ##### `keepalive_timeout`
 
-Sets the [`KeepAliveTimeout`] directive for the virtual host, which determines the amount of time to wait for subsequent requests on a persistent HTTP connection. Default: `undef`, meaning the global, server-wide [`KeepAlive`][] setting is in effect.
+Sets the [`KeepAliveTimeout`] directive for the virtual host, which determines the amount of time to wait for subsequent requests on a persistent HTTP connection. By default, the global, server-wide [`KeepAlive`][] setting is in effect.
 
 This parameter is only relevant if either the global, server-wide [`keepalive` parameter][] or the per-vhost `keepalive` parameter is enabled.
 
+Default: `undef`
+
 ##### `max_keepalive_requests`
 
-Limits the number of requests allowed per connection to the virtual host. Default: `undef`, meaning the global, server-wide [`KeepAlive`][] setting is in effect.
+Limits the number of requests allowed per connection to the virtual host. By default,  the global, server-wide [`KeepAlive`][] setting is in effect.
 
 This parameter is only relevant if either the global, server-wide [`keepalive` parameter][] or the per-vhost `keepalive` parameter is enabled.
 
+Default: `undef`.
+
 ##### `auth_kerb`
 
-Enable [`mod_auth_kerb`][] parameters for a virtual host. Valid options: Boolean. Default: `false`.
+Enable [`mod_auth_kerb`][] parameters for a virtual host. 
 
 Usage typically looks like:
 
@@ -2606,53 +3240,91 @@ Related parameters follow the names of `mod_auth_kerb` directives:
 - `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: `undef`.
 - `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: `undef`.
 
+Boolean. Default: `false`.
+
 ##### `krb_verify_kdc`
 
-This option can be used to disable the verification tickets against local keytab to prevent KDC spoofing attacks. Default: 'on'.
+This option can be used to disable the verification tickets against local keytab to prevent KDC spoofing attacks.
+
+Default: 'on'.
 
 ##### `krb_servicename`
 
-Specifies the service name that will be used by Apache for authentication. Corresponding key of this name must be stored in the keytab. Default: 'HTTP'.
+Specifies the service name that will be used by Apache for authentication. Corresponding key of this name must be stored in the keytab.
+
+Default: 'HTTP'.
 
 ##### `krb_save_credentials`
 
-This option enables credential saving functionality. Default is 'off'
+This option enables credential saving functionality.
+
+Default is 'off'
 
 ##### `logroot`
 
-Specifies the location of the virtual host's logfiles. Default: '/var/log/<apache log location>/'.
+Specifies the location of the virtual host's logfiles.
+
+Default: '/var/log/<apache log location>/'.
 
 ##### `$logroot_ensure`
 
-Determines whether or not to remove the logroot directory for a virtual host. Valid options: 'directory',  'absent'.
+Determines whether or not to remove the logroot directory for a virtual host.
+
+Values: 'directory', 'absent'.
+
+Default: 'directory'.
 
 ##### `logroot_mode`
 
-Overrides the mode the logroot directory is set to. Default: `undef`. Do *not* grant write access to the directory the logs are stored in without being aware of the consequences; for more information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
+Overrides the mode the logroot directory is set to. Do *not* grant write access to the directory the logs are stored in without being aware of the consequences; for more information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
+
+Values: TODO what values
+
+Default: `undef`.
 
 ##### `logroot_owner`
 
-Sets individual user access to the logroot directory. Defaults to '`undef`'.
+Sets individual user access to the logroot directory.
+
+Values: TODO what values
+
+Defaults to `undef`.
 
 ##### `logroot_group`
 
-Sets group access to the [`logroot`][] directory. Defaults to '`undef`'.
+Sets group access to the [`logroot`][] directory.
+
+Values: TODO what values
+
+Defaults to `undef`.
 
 ##### `log_level`
 
-Specifies the verbosity of the error log. Valid options: 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'. Default: 'warn' for the global server configuration, which can be overridden on a per-virtual host basis.
+Specifies the verbosity of the error log.
+
+Values: 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
+
+Default: 'warn' for the global server configuration, which can be overridden on a per-virtual host basis.
 
 ###### `modsec_body_limit`
 
-Configures the maximum request body size (in bytes) ModSecurity will accept for buffering
+Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
+
+Values: An integer.
+
+Default: `undef`.
 
 ###### `modsec_disable_vhost`
 
-Disables [`mod_security`][] on a virtual host. Only valid if [`apache::mod::security`][] is included. Valid options: Boolean. Default: `undef`.
+Disables [`mod_security`][] on a virtual host. Only valid if [`apache::mod::security`][] is included.
+
+Boolean. Default: `undef`.
 
 ###### `modsec_disable_ids`
 
-Array of mod_security IDs to remove from the virtual host. Also takes a hash allowing removal of an ID from a specific location.
+Removes `mod_security` IDs from the virtual host.
+
+Values: An array of `mod_security` IDs to remove from the virtual host. Also takes a hash allowing removal of an ID from a specific location.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -2666,13 +3338,17 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+Default: `undef`.
+
 ###### `modsec_disable_ips`
 
-Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching. Default: `undef`.
+Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching.
+
+Default: `undef`.
 
 ###### `modsec_disable_msgs`
 
-Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing removal of an Msg from a specific location. Default: `undef`.
+Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing removal of an Msg from a specific location.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -2686,9 +3362,11 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+Default: `undef`.
+
 ###### `modsec_disable_tags`
 
-Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing removal of an Tag from a specific location. Default: `undef`.
+Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing removal of an Tag from a specific location.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -2701,46 +3379,67 @@ apache::vhost { 'sample.example.net':
   modsec_disable_tags => { '/location1' => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ] },
 }
 ```
+Default: `undef`.
+
+##### `modsec_audit*`
+
+* `modsec_audit_log`
+* `modsec_audit_log_file`
+* `modsec_audit_log_pipe`
 
-##### `modsec_audit_log` & `modsec_audit_log_file` & `modsec_audit_log_pipe`
+These three parameters together determine how to send `mod_security` audit log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
 
-Determines how to send mod_security audit log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
+* If `modsec_audit_log_file` is set, it is relative to [`logroot`][].
 
-If `modsec_audit_log_file` is set, it is relative to [`logroot`][]. Default: `undef`.
+  Default: `undef`.
 
-If `modsec_audit_log_pipe` is set, it should start with a pipe. Example '|/path/to/mlogc /path/to/mlogc.conf'. Default: `undef`.
+* If `modsec_audit_log_pipe` is set, it should start with a pipe. Example '|/path/to/mlogc /path/to/mlogc.conf'.
 
-If `modsec_audit_log` is `true`, given a virtual host---for instance, example.com---it defaults to 'example.com\_security\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_security.log' for unencrypted virtual hosts. Default: `false`.
+  Default: `undef`.
 
-When none of those parameters is set, the global audit log is used (i.e. ''/var/log/apache2/modsec\_audit.log'' on Debian and derivatives, ''/var/log/httpd/modsec\_audit.log'' on others).
+* If `modsec_audit_log` is `true`, given a virtual host---for instance, example.com---it defaults to 'example.com\_security\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_security.log' for unencrypted virtual hosts.
+
+  Default: `false`.
+
+If none of those parameters are set, the global audit log is used (''/var/log/httpd/modsec\_audit.log''; Debian and derivatives: ''/var/log/apache2/modsec\_audit.log''; others: ).
 
 ##### `no_proxy_uris`
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
 
+Default: [].
+
 ##### `no_proxy_uris_match`
 
 This directive is equivalent to [`no_proxy_uris`][], but takes regular expressions.
 
+Default: [].
+
 ##### `proxy_preserve_host`
 
-Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). Valid options: Boolean. Default: `false`.
+Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). 
 
 Setting this parameter to `true` enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
+Boolean. Default: `false`.
+
 ##### `proxy_add_headers`
 
-Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders). Valid Options: Boolean. Default: `false`.
+Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders). 
 
 This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
+Boolean. Default: `false`.
+
 ##### `proxy_error_override`
 
-Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content. Default: `false`.
+Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content. 
+
+Boolean. Default: `false`.
 
 ##### `options`
 
-Sets the [`Options`][] for the specified virtual host. Default: ['Indexes','FollowSymLinks','MultiViews'], as demonstrated below:
+Sets the [`Options`][] for the specified virtual host. For example:
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -2751,38 +3450,62 @@ apache::vhost { 'site.name.fdqn':
 
 > **Note**: If you use the [`directories`][] parameter of [`apache::vhost`][], 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
+Default: ['Indexes','FollowSymLinks','MultiViews'],
+
 ##### `override`
 
-Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. Default: '[none]'.
+Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
+
+Default: '[none]'.
 
 ##### `passenger_app_root`
 
 Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot), the location of the Passenger application root if different from the DocumentRoot.
 
+Values: A string specifying a path.
+
+Default: `undef`.
+
 ##### `passenger_app_env`
 
-Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv), the environment for the Passenger application. If not specifies, defaults to the global setting or 'production'.
+Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv), the environment for the Passenger application. If not specified, defaults to the global setting or 'production'.
+
+Values: A string specifying the name of the environment.
+
+Default: `undef`.
 
 ##### `passenger_log_file`
 
 By default, Passenger log messages are written to the Apache global error log. With [PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile), you can configure those messages to be logged to a different file. This option is only available since Passenger 5.0.5.
 
+Values: A string specifying a path.
+
+Default: `undef`.
+
 ##### `passenger_log_level`
 
-This option allows to specify how much information should be written to the log file. If not set, [PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel) will not show up in the configuration file and the defaults are used. For Passenger > 3.0.0 the default is '0', since 5.0.0 it's '3'.
+This option allows to specify how much information should be written to the log file. If not set, [PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel) will not show up in the configuration file and the defaults are used. 
+
+Default: Passenger versions less than 3.0.0: '0'; 5.0.0 and later: '3'.
 
 ##### `passenger_ruby`
 
 Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby), the Ruby interpreter to use for the application, on this virtual host.
 
+Default: `undef`.
+
 ##### `passenger_min_instances`
 
 Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances), the minimum number of application processes to run.
 
+Default: `undef`.
+
 ##### `passenger_max_instances_per_app`
 
 Sets [PassengerMaxInstancesPerApp](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstancesperapp), the maximum number of application processes that may simultaneously exist for a single application.
 
+Default: `undef`. TODO: bookmark
+
 ##### `passenger_start_timeout`
 
 Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout), the timeout for the application startup.
@@ -2797,7 +3520,7 @@ Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/refe
 
 ##### `passenger_high_performance`
 
-Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter. Valid options: '`true`', '`false`'. Default: `undef`.
+Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter. Values: `true`, `false`. Default: `undef`.
 
 ##### `passenger_nodejs`
 
@@ -2805,7 +3528,9 @@ Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apa
 
 ##### `passenger_sticky_sessions`
 
-Sets the [`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions) parameter. Valid options: '`true`', '`false`'. Default: `undef`.
+Sets the [`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions) parameter.
+
+Boolean. Default: `undef`.
 
 ##### `passenger_startup_file`
 
@@ -2839,7 +3564,7 @@ Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs
 
 ##### `proxy_pass`
 
-Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to '`undef`'. Optionally parameters can be added as an array.
+Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to `undef`. Optionally parameters can be added as an array.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -2864,10 +3589,10 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-* `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Valid options: an array or string.
+* `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string.
 * `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
 * `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
-* `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Valid options: array.
+* `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
 
 ##### `proxy_dest_match`
 
@@ -3116,7 +3841,7 @@ Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file
 
 * `suphp_addhandler`. Default: 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian and Gentoo.
 * `suphp_configpath`. Default: `undef` on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian and Gentoo.
-* `suphp_engine`. Valid options: 'on' or 'off'. Default: 'off'.
+* `suphp_engine`. Values: 'on' or 'off'. Default: 'off'.
 
 An example virtual host configuration with suPHP:
 
@@ -3187,7 +3912,7 @@ The `directories` parameter within the `apache::vhost` class passes an array of
 
 The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys.
 
-The `provider` key is optional. If missing, this key defaults to 'directory'. Valid options: 'directory', 'files', 'proxy', 'location', 'directorymatch', 'filesmatch', 'proxymatch' or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
+The `provider` key is optional. If missing, this key defaults to 'directory'. Values: 'directory', 'files', 'proxy', 'location', 'directorymatch', 'filesmatch', 'proxymatch' or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
 
 An example use of `directories`:
 
@@ -3329,15 +4054,15 @@ Sets the value for [AuthLDAPURL](https://httpd.apache.org/docs/current/mod/mod_a
 
 ###### `auth_ldap_bind_dn`
 
-Sets the value for [AuthLDAPBindDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbinddn), which allows use of an optional DN used to bind to the LDAP-server when searching for entries if AuthBasicProvider 'ldap' is used
+Sets the value for [AuthLDAPBindDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbinddn), which allows use of an optional DN used to bind to the LDAP-server when searching for entries if AuthBasicProvider 'ldap' is used.
 
 ###### `auth_ldap_bind_password`
 
-Sets the value for [AuthLDAPBindPassword](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbindpassword), which allows use of an optional bind password to use in conjunction with the bind DN if AuthBasicProvider 'ldap' is used
+Sets the value for [AuthLDAPBindPassword](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbindpassword), which allows use of an optional bind password to use in conjunction with the bind DN if AuthBasicProvider 'ldap' is used.
 
 ###### `auth_ldap_group_attribute`
 
-Array of values for [AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute), specifies which LDAP attributes are used to check for user members within ldap-groups. defaults are: "member" and "uniquemember"
+Array of values for [AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute), specifies which LDAP attributes are used to check for user members within ldap-groups. Defaults are: "member" and "uniquemember".
 
 ###### `auth_ldap_group_attribute_is_dn`
 
@@ -3372,7 +4097,7 @@ ProxyStatus On',
 
 ###### `dav`
 
-Sets the value for [Dav](http://httpd.apache.org/docs/current/mod/mod_dav.html#dav), which determines if the WebDAV HTTP methods should be enabled. The value can be either `On`, `Off` or the name of the provider. A value of `On` enables the default filesystem provider implemented by the `mod_dav_fs` module.
+Sets the value for [Dav](http://httpd.apache.org/docs/current/mod/mod_dav.html#dav), which determines if the WebDAV HTTP methods should be enabled. The value can be either 'On', 'Off' or the name of the provider. A value of 'On' enables the default filesystem provider implemented by the `mod_dav_fs` module.
 
 ###### `dav_depth_infinity`
 
@@ -3770,7 +4495,7 @@ apache::vhost { 'secure.example.net':
 
 ###### `shib_use_headers`
 
-When set to 'On', this turns on the use of request headers to publish attributes to applications. Valid options for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
+When set to 'On', this turns on the use of request headers to publish attributes to applications. Values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
 ###### `ssl_options`
 
@@ -3809,7 +4534,7 @@ apache::vhost { 'secure.example.net':
 ```
 ###### `additional_includes`
 
-Specifies paths to additional static, specific Apache configuration files in virtual host directories. Valid options: a array of string path.
+Specifies paths to additional static, specific Apache configuration files in virtual host directories. Values: a array of string path.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -3828,7 +4553,7 @@ All of the SSL parameters for `::vhost` default to whatever is set in the base `
 
 ##### `ssl`
 
-Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Valid options: Boolean. Default: `false`.
+Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Values: Boolean. Default: `false`.
 
 ##### `ssl_ca`
 
@@ -3881,7 +4606,7 @@ Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tl
 
 ##### `ssl_verify_client`
 
-Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid options are: 'none', 'optional', 'require', and 'optional_no_ca'. Default: `undef`.
+Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Values are: 'none', 'optional', 'require', and 'optional_no_ca'. Default: `undef`.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -3922,15 +4647,15 @@ apache::vhost { 'sample.example.net':
 
 ##### `ssl_proxy_check_peer_cn`
 
-Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: `undef`.
+Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Values: 'on', 'off'. Default: `undef`.
 
 ##### `ssl_proxy_check_peer_name`
 
-Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Valid options: 'on', 'off'. Default: `undef`.
+Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Values: 'on', 'off'. Default: `undef`.
 
 ##### `ssl_proxy_check_peer_expire`
 
-Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not. Valid options: 'on', 'off'. Default: `undef`.
+Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not. Values: 'on', 'off'. Default: `undef`.
 
 ##### `ssl_options`
 
@@ -3960,11 +4685,11 @@ Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.h
 
 ##### `ssl_proxyengine`
 
-Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid options: Boolean. Default: `true`.
+Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Values: Boolean. Default: `true`.
 
 ##### `ssl_stapling`
 
-Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean or `undef`. Default: `undef`, meaning use what is set globally.
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Values: Boolean or `undef`. Default: `undef`, meaning use what is set globally.
 
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
@@ -4028,7 +4753,7 @@ The number of seconds of FastCGI application inactivity allowed before the reque
 
 ##### `flush`
 
-Force a write to the client as data is received from the application. By default, mod\_fastcgi buffers data in order to free the application as quickly as possible.
+Force a write to the client as data is received from the application. By default, `mod_fastcgi` buffers data in order to free the application as quickly as possible.
 
 ##### `faux_path`
 
@@ -4058,16 +4783,23 @@ Sets the configuration file's content.
 
 ##### `ensure`
 
-Specifies if the virtual host file is present or absent. Valid options: 'absent', 'present'. Default: 'present'.
+Specifies if the virtual host file is present or absent.
+
+Values: 'absent', 'present'.
+
+Default: 'present'.
 
 ##### `priority`
 
-Sets the relative load order for Apache HTTPD VirtualHost configuration files. Default: '25'.
+Sets the relative load order for Apache HTTPD VirtualHost configuration files.
+
+Default: '25'.
 
 ##### `verify_config`
 
-Specifies whether to validate the configuration file before notifying the Apache service. Valid options: Boolean. Default: `true`.
+Specifies whether to validate the configuration file before notifying the Apache service. 
 
+Boolean. Default: `true`.
 
 ### Private defined types
 
@@ -4129,7 +4861,6 @@ The [`apache::mod::passenger`][] class is not installing, because the the EL6 re
 
 The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested because the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uris`][] parameter.
 
-
 ### SELinux and custom paths
 
 If [SELinux][] is in [enforcing mode][] and you want to use custom paths for `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you need to manage the files' context yourself.
@@ -4175,7 +4906,7 @@ apache::vhost { 'test.server':
 }
 ```
 
-You need to set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
+You must set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
 ### Ubuntu 10.04
 

From e0ef55bcbae31a84510b2d98c187a09918553a4b Mon Sep 17 00:00:00 2001
From: chgarling <christian.garling@cg-networks.de>
Date: Wed, 12 Apr 2017 12:34:38 +0200
Subject: [PATCH 1073/2267] Added supplementary_groups to the user resource
 (#1608)

* Added supplementary_groups to the user resource
* Added supplementary_groups section to README
---
 README.md         | 7 +++++++
 manifests/init.pp | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/README.md b/README.md
index e9ff691082..693c1ee331 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@
 [`manage_docroot`]: #manage_docroot
 [`manage_user`]: #manage_user
 [`manage_group`]: #manage_group
+[`supplementary_groups`]: #supplementary_groups
 [`MaxConnectionsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild
 [`max_keepalive_requests`]: #max_keepalive_requests
 [`MaxRequestWorkers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxrequestworkers
@@ -1074,6 +1075,12 @@ When false, stops Puppet from creating the group resource. Valid options: Boolea
 
 If you have a group created from another Puppet module that you want to use to run Apache, set this to false. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
 
+##### `supplementary_groups`
+
+A list of groups to which the user belongs. These groups are in addition to the primary group. Default: No additional groups.
+
+Notice: This option only has an effect when `manage_user` is set to true.
+
 ##### `manage_user`
 
 When false, stops Puppet from creating the user resource. Valid options: Boolean. Default: true.
diff --git a/manifests/init.pp b/manifests/init.pp
index 692dc5afea..a6d4e41fce 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -60,6 +60,7 @@
   $manage_group           = true,
   $user                   = $::apache::params::user,
   $group                  = $::apache::params::group,
+  $supplementary_groups   = [],
   $keepalive              = $::apache::params::keepalive,
   $keepalive_timeout      = $::apache::params::keepalive_timeout,
   $max_keepalive_requests = $::apache::params::max_keepalive_requests,
@@ -131,6 +132,7 @@
     user { $user:
       ensure  => present,
       gid     => $group,
+      groups  => $supplementary_groups,
       require => Package['httpd'],
     }
   }

From 9cc360a08762e5d6f126b0f0d5b0d50ee7276ecd Mon Sep 17 00:00:00 2001
From: Daehyung Lee <daehyung.lee@cdnetworks.com>
Date: Fri, 14 Apr 2017 17:31:26 +0900
Subject: [PATCH 1074/2267] support array type of value

---
 templates/vhost/_wsgi.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index a49828fdc9..12c7826371 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -22,7 +22,11 @@
 <% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
   <%- @wsgi_script_aliases.keys.sort.each do |key| -%>
     <%- if key != '' and @wsgi_script_aliases[key] != ''-%>
+      <%- if @wsgi_script_aliases[key].is_a? Array -%>
+  WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key].join(' ') %>
+      <%- else -%>
   WSGIScriptAlias <%= key %> "<%= @wsgi_script_aliases[key] %>"
+      <%- end -%>
     <%- end -%>
   <%- end -%>
 <% end -%>

From 76c56f3065f916d9083bdcbb48fc8542b9f1de30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Defortis?= <cedric.defortis@lyra-network.com>
Date: Thu, 20 Apr 2017 11:56:14 +0200
Subject: [PATCH 1075/2267] MODULES-4737 - Additional class params for mod ssl

- ssl_sessioncache which defaults to OS specific value in params.pp
- ssl_proxy_protocol which defaults to an empty array which means using
  Apache defaults (see Apache doc [1] for more details)

[1] https://httpd.apache.org/docs/current/en/mod/mod_ssl.html#sslproxyprotocol
---
 README.md                    |  2 ++
 manifests/mod/ssl.pp         | 17 +++++++----------
 manifests/params.pp          |  5 +++++
 spec/classes/mod/ssl_spec.rb | 19 +++++++++++++++++++
 templates/mod/ssl.conf.erb   |  5 ++++-
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 693c1ee331..35aff6d144 100644
--- a/README.md
+++ b/README.md
@@ -1906,7 +1906,9 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 - `ssl_options`: Default: [ 'StdEnvVars' ]
 - `ssl_pass_phrase_dialog`: Default: 'builtin'.
 - `ssl_protocol`: Default: [ 'all', '-SSLv2', '-SSLv3' ].
+- `ssl_proxy_protocol`: Default: [].
 - `ssl_random_seed_bytes`: Valid options: A string. Default: '512'.
+- `ssl_sessioncache`: Valid options: A string. Default: '300'.
 - `ssl_sessioncachetimeout`: Valid options: A string. Default: '300'.
 - `ssl_mutex`: Default: Determined based on the OS. Valid options: See [mod_ssl][mod_ssl] documentation.
   - RedHat/FreeBSD/Suse/Gentoo: 'default'
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 92c456360b..cee15ef178 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -6,15 +6,17 @@
   $ssl_cipher                 = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4',
   $ssl_honorcipherorder       = true,
   $ssl_protocol               = [ 'all', '-SSLv2', '-SSLv3' ],
+  $ssl_proxy_protocol         = [],
   $ssl_pass_phrase_dialog     = 'builtin',
   $ssl_random_seed_bytes      = '512',
+  $ssl_sessioncache           = $::apache::params::ssl_sessioncache,
   $ssl_sessioncachetimeout    = '300',
   $ssl_stapling               = false,
   $ssl_stapling_return_errors = undef,
   $ssl_mutex                  = undef,
   $apache_version             = undef,
   $package_name               = undef,
-) {
+) inherits ::apache::params {
   include ::apache
   include ::apache::mod::mime
   $_apache_version = pick($apache_version, $apache::apache_version)
@@ -51,6 +53,9 @@
 
   validate_bool($ssl_compression)
 
+  validate_array($ssl_proxy_protocol)
+  validate_string($ssl_sessioncache)
+
   if is_bool($ssl_honorcipherorder) {
     $_ssl_honorcipherorder = $ssl_honorcipherorder
   } else {
@@ -61,14 +66,6 @@
     }
   }
 
-  $session_cache = $::osfamily ? {
-    'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
-    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
-    'freebsd' => '/var/run/ssl_scache(512000)',
-    'gentoo'  => '/var/run/ssl_scache(512000)',
-    'Suse'    => '/var/lib/apache2/ssl_scache(512000)'
-  }
-
   validate_bool($ssl_stapling)
 
   if $ssl_stapling_return_errors != undef {
@@ -111,7 +108,7 @@
   # $ssl_honorcipherorder
   # $ssl_options
   # $ssl_openssl_conf_cmd
-  # $session_cache
+  # $ssl_sessioncache
   # $stapling_cache
   # $ssl_mutex
   # $ssl_random_seed_bytes
diff --git a/manifests/params.pp b/manifests/params.pp
index e1ca7b3c20..4fdb834910 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -85,6 +85,7 @@
     $default_ssl_cert     = '/etc/pki/tls/certs/localhost.crt'
     $default_ssl_key      = '/etc/pki/tls/private/localhost.key'
     $ssl_certs_dir        = '/etc/pki/tls/certs'
+    $ssl_sessioncache     = '/var/cache/mod_ssl/scache(512000)'
     $passenger_conf_file  = 'passenger_extra.conf'
     $passenger_conf_package_file = 'passenger.conf'
     $passenger_root       = undef
@@ -221,6 +222,7 @@
     $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
     $ssl_certs_dir       = '/etc/ssl/certs'
+    $ssl_sessioncache    = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
@@ -359,6 +361,7 @@
     $default_ssl_cert = '/usr/local/etc/apache24/server.crt'
     $default_ssl_key  = '/usr/local/etc/apache24/server.key'
     $ssl_certs_dir    = undef
+    $ssl_sessioncache  = '/var/run/ssl_scache(512000)'
     $passenger_conf_file = 'passenger.conf'
     $passenger_conf_package_file = undef
     $passenger_root   = '/usr/local/lib/ruby/gems/2.0/gems/passenger-4.0.58'
@@ -428,6 +431,7 @@
     $default_ssl_cert = '/etc/ssl/apache2/server.crt'
     $default_ssl_key  = '/etc/ssl/apache2/server.key'
     $ssl_certs_dir    = '/etc/ssl/apache2'
+    $ssl_sessioncache  = '/var/run/ssl_scache(512000)'
     $passenger_root   = '/usr'
     $passenger_ruby   = '/usr/bin/ruby'
     $passenger_conf_file = 'passenger.conf'
@@ -496,6 +500,7 @@
     $default_ssl_cert    = '/etc/apache2/ssl.crt/server.crt'
     $default_ssl_key     = '/etc/apache2/ssl.key/server.key'
     $ssl_certs_dir       = '/etc/ssl/certs'
+    $ssl_sessioncache    = '/var/lib/apache2/ssl_scache(512000)'
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 10badfa033..4d1566627d 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -42,6 +42,7 @@
       it { is_expected.to contain_apache__mod('ssl') }
       it { is_expected.to contain_package('httpd24-mod_ssl') }
       it { is_expected.not_to contain_package('mod_ssl') }
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/cache/mod_ssl/scache\(512000\)"$})}
     end
   end
 
@@ -96,6 +97,7 @@
     end
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
+    it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/run/ssl_scache\(512000\)"$})}
   end
 
   context 'on a Suse OS' do
@@ -113,6 +115,7 @@
     end
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
+    it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/lib/apache2/ssl_scache\(512000\)"$})}
   end
   # Template config doesn't vary by distro
   context "on all distros" do
@@ -234,5 +237,21 @@
       end
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLMutex posixsem$})}
     end
+    context 'setting ssl_sessioncache' do
+      let :params do
+        {
+          :ssl_sessioncache => '/tmp/customsessioncache(51200)',
+        }
+      end
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/tmp/customsessioncache\(51200\)"$})}
+    end
+    context 'setting ssl_proxy_protocol' do
+      let :params do
+        {
+          :ssl_proxy_protocol => [ '-ALL', '+TLSv1'],
+        }
+      end
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLProxyProtocol -ALL \+TLSv1$})}
+    end
   end
 end
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index c4475cbe8d..0da9dc63d6 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -8,7 +8,7 @@
   AddType application/x-pkcs7-crl    .crl
 
   SSLPassPhraseDialog <%= @ssl_pass_phrase_dialog %>
-  SSLSessionCache "shmcb:<%= @session_cache %>"
+  SSLSessionCache "shmcb:<%= @ssl_sessioncache %>"
   SSLSessionCacheTimeout <%= @ssl_sessioncachetimeout %>
   <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   Mutex <%= @_ssl_mutex %>
@@ -29,6 +29,9 @@
 <% end -%>
   SSLCipherSuite <%= @ssl_cipher %>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
+<% if not @ssl_proxy_protocol.empty? -%>
+  SSLProxyProtocol <%= @ssl_proxy_protocol.compact.join(' ') %>
+<% end -%>
 <% if @ssl_options -%>
   SSLOptions <%= @ssl_options.compact.join(' ') %>
 <% end -%>

From ad5c81a84c00a296fa90a89a64e0d017d084b3b2 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 26 Apr 2017 13:17:16 +0300
Subject: [PATCH 1076/2267] Enable configuring CA file in ssl.conf

Instead of having to specify a CA file for each vhost, it's possible to
just specify it globally.
---
 README.md                    | 4 ++++
 manifests/mod/ssl.pp         | 2 ++
 spec/classes/mod/ssl_spec.rb | 8 ++++++++
 templates/mod/ssl.conf.erb   | 3 +++
 4 files changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 35aff6d144..16bb64883f 100644
--- a/README.md
+++ b/README.md
@@ -1202,6 +1202,10 @@ Determines whether Puppet manages the HTTPD service's state. Valid options: Bool
 
 Determines whether Puppet should use a specific command to restart the HTTPD service. Valid options: a command to restart the Apache service. Default: undef, which uses the [default Puppet behavior][Service attribute restart].
 
+##### `ssl_ca`
+
+Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile). Default: undef. It is possible to override this on a vhost level.
+
 ##### `ssl_stapling`
 
 Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean. Default: false. It is possible to override this on a vhost level.
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index cee15ef178..219d5474bf 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -3,6 +3,7 @@
   $ssl_cryptodevice           = 'builtin',
   $ssl_options                = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd       = undef,
+  $ssl_ca                     = undef,
   $ssl_cipher                 = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4',
   $ssl_honorcipherorder       = true,
   $ssl_protocol               = [ 'all', '-SSLv2', '-SSLv3' ],
@@ -104,6 +105,7 @@
   #
   # $ssl_compression
   # $ssl_cryptodevice
+  # $ssl_ca
   # $ssl_cipher
   # $ssl_honorcipherorder
   # $ssl_options
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 4d1566627d..5b6f8abe4a 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -136,6 +136,14 @@
       it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog builtin$/)}
     end
 
+    context 'setting ssl_ca to a path' do
+      let :params do
+        {
+            :ssl_ca => '/etc/pki/some/path/ca.crt',
+        }
+      end
+      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLCACertificateFile/)}
+    end
     context "with Apache version < 2.4" do
       let :params do
         {
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 0da9dc63d6..5fa7bb9ba6 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -20,6 +20,9 @@
   <%- end -%>
   SSLCryptoDevice <%= @ssl_cryptodevice %>
   SSLHonorCipherOrder <%= scope.function_bool2httpd([@_ssl_honorcipherorder]) %>
+  <%- if @ssl_ca -%>
+  SSLCACertificateFile    "<%= @ssl_ca %>"
+  <%- end -%>
 <% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %>
   <%- if not @ssl_stapling_return_errors.nil? -%>

From e26cf353b55cd7350d4c2c0511325f47e13e15da Mon Sep 17 00:00:00 2001
From: Philipp Seiler <p.seiler@linuxmail.org>
Date: Tue, 2 May 2017 16:10:49 +0200
Subject: [PATCH 1077/2267] fixed apache group for SUSE/SLES Systems (checked
 for SLES11/12)

---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 4fdb834910..cc56c8599f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -477,7 +477,7 @@
     $access_log_file      = 'access.log'
   } elsif $::osfamily == 'Suse' {
     $user                = 'wwwrun'
-    $group               = 'wwwrun'
+    $group               = 'www'
     $root_group          = 'root'
     $apache_name         = 'apache2'
     $service_name        = 'apache2'

From 1afa3add7aa0a3c976caaf845f970c82adecbc0d Mon Sep 17 00:00:00 2001
From: Vasili Syrakis <cetanu@gmail.com>
Date: Wed, 3 May 2017 13:05:36 +1000
Subject: [PATCH 1078/2267] Account for Suse osfamily for proxy_html module

---
 manifests/mod/proxy_html.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index f4f4b44111..94259bd77e 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -5,7 +5,7 @@
 
   # Add libxml2
   case $::osfamily {
-    /RedHat|FreeBSD|Gentoo/: {
+    /RedHat|FreeBSD|Gentoo|Suse/: {
       ::apache::mod { 'xml2enc': }
       $loadfiles = undef
     }

From b874dd361abbc60fee846e876c593df74b5b531f Mon Sep 17 00:00:00 2001
From: Eric Putnam <eric.putnam@eric.putnam-C02L5064FFT1>
Date: Wed, 3 May 2017 14:19:23 -0700
Subject: [PATCH 1079/2267] (MODULES-4819) remove include_src parameter from
 vhost_spec

include_src is no longer a parameter in apt::source, which is used in vhost_spec as part of the fastcgi test. Instead, include has replaced include_src as a hash with keys 'deb' and 'src'. 'src' defaults to false as of apt 4.0.0 so I removed include_src altogether with no replacement
---
 spec/acceptance/vhost_spec.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 515465b9d0..dae411538d 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1589,21 +1589,18 @@ class { 'apache': }
             location    => $_location,
             release     => $_release,
             repos       => $_repos,
-            include_src => false,
           }
 
           apt::source { "${_os}_${_release}-updates":
             location    => $_location,
             release     => "${_release}-updates",
             repos       => $_repos,
-            include_src => false,
           }
 
           apt::source { "${_os}_${_release}-security":
             location    => $_security_location,
             release     => $_release_security,
             repos       => $_repos,
-            include_src => false,
           }
         EOS
 

From a381d1f1e8a776734b86f9ce02ff85840cb8d08f Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppet.com>
Date: Fri, 5 May 2017 12:01:40 -0700
Subject: [PATCH 1080/2267] WIP loc edit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c7a02213af..812e3ce279 100644
--- a/README.md
+++ b/README.md
@@ -2197,7 +2197,7 @@ Installs and configures `mod_passenger`.
 
 >**Note**: The passenger module isn't available on RH/CentOS without providing the dependency packages provided by EPEL and the `mod_passengers` custom repository. See the `manage_repo` parameter above and [https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()
 
-**Parameters**: [TODO: parameters were not listed (except `manage_repo`), so I pulled them out of the manifest. I need to know what these parameters do and what their values can be OR a link that points external documentation for the parameter mapping (as with mod_pagespeed above)]
+**Parameters**: [TODO: parameters were not listed (except `manage_repo`), so I pulled them out of the manifest. I need to know what these parameters do and what their values can be OR a link that points external documentation for the parameter mapping (as with mod_pagespeed above) <!--see also MODULES-4745-->]
 
 * `passenger_conf_file`: `$::apache::params::passenger_conf_file`
 * `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file`
@@ -3504,7 +3504,7 @@ Default: `undef`.
 
 Sets [PassengerMaxInstancesPerApp](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstancesperapp), the maximum number of application processes that may simultaneously exist for a single application.
 
-Default: `undef`. TODO: bookmark
+Default: `undef`.
 
 ##### `passenger_start_timeout`
 

From 44d45f46167377e032dd52ae13a6e70ad48b03c7 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 9 May 2017 16:24:38 -0300
Subject: [PATCH 1081/2267] Include missing "@" in template
 mod/cluster.conf.erb

---
 templates/mod/cluster.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/cluster.conf.erb b/templates/mod/cluster.conf.erb
index 831cce6c76..58229a88ad 100644
--- a/templates/mod/cluster.conf.erb
+++ b/templates/mod/cluster.conf.erb
@@ -13,7 +13,7 @@ Listen <%= @ip %>:<%= @port %>
   ManagerBalancerName <%= @balancer_name %>
   ServerAdvertise <%= scope.function_bool2httpd([@server_advertise]) %>
   <%- if @server_advertise == true and @advertise_frequency != nil -%>
-  AdvertiseFrequency <%= advertise_frequency %>
+  AdvertiseFrequency <%= @advertise_frequency %>
   <%- end -%>
 
   <Location /mod_cluster_manager>

From cc2426f486902b51dbac813ad9c482d198006626 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 1 May 2017 16:49:56 -0400
Subject: [PATCH 1082/2267] Add WSGIRestrictEmbedded to apache::mod::wsgi

Because this option is not available on all platform, it's not set in
the wsgi mod configuration by default.
---
 README.md                     |  2 ++
 manifests/mod/wsgi.pp         | 12 +++++++-----
 spec/classes/mod/wsgi_spec.rb |  6 ++++++
 templates/mod/wsgi.conf.erb   |  3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 2186c5027f..32e192e10b 100644
--- a/README.md
+++ b/README.md
@@ -263,6 +263,7 @@
 [`virtual_docroot`]: #virtual_docroot
 
 [Web Server Gateway Interface]: https://www.python.org/dev/peps/pep-3333/#abstract
+[`WSGIRestrictEmbedded`]: http://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIRestrictEmbedded.html
 [`WSGIPythonPath`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonPath.html
 [`WSGIPythonHome`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonHome.html
 
@@ -1981,6 +1982,7 @@ Enables Python support via [`mod_wsgi`][].
   - If the `mod_path` parameter doesn't contain `/`, Puppet prefixes it with your operating system's default module path.
 Otherwise, Puppet follows it literally.
 - `package_name`: Names the package that installs `mod_wsgi`. Default: undef.
+- `wsgi_restrict_embedded`: Defines the [`WSGIRestrictEmbedded`][] directive, such as 'On'. Valid options: On|Off|undef. Default: undef.
 - `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. Valid options: path. Default: undef.
 - `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site-packages'. Valid options: path. Default: undef.
 - `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE\_RUN\_DIR}WSGI". Default: `wsgi_socket_prefix` in [`apache::params`][].
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index e726bcfaa4..6f9d4379a7 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -1,9 +1,10 @@
 class apache::mod::wsgi (
-  $wsgi_socket_prefix = $::apache::params::wsgi_socket_prefix,
-  $wsgi_python_path   = undef,
-  $wsgi_python_home   = undef,
-  $package_name       = undef,
-  $mod_path           = undef,
+  $wsgi_restrict_embedded = undef,
+  $wsgi_socket_prefix     = $::apache::params::wsgi_socket_prefix,
+  $wsgi_python_path       = undef,
+  $wsgi_python_home       = undef,
+  $package_name           = undef,
+  $mod_path               = undef,
 ) inherits ::apache::params {
   include ::apache
   if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) {
@@ -26,6 +27,7 @@
   }
 
   # Template uses:
+  # - $wsgi_restrict_embedded
   # - $wsgi_socket_prefix
   # - $wsgi_python_path
   # - $wsgi_python_home
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 1d54c54081..6261a95902 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -43,6 +43,12 @@
     }
     it { is_expected.to contain_package("mod_wsgi") }
 
+    describe "with WSGIRestrictEmbedded enabled" do
+      let :params do
+        { :wsgi_restrict_embedded => 'On' }
+      end
+      it {is_expected.to contain_file('wsgi.conf').with_content(/^  WSGIRestrictEmbedded On$/)}
+    end
     describe "with custom WSGISocketPrefix" do
       let :params do
         { :wsgi_socket_prefix => 'run/wsgi' }
diff --git a/templates/mod/wsgi.conf.erb b/templates/mod/wsgi.conf.erb
index 18752d2c4a..1d83e5a842 100644
--- a/templates/mod/wsgi.conf.erb
+++ b/templates/mod/wsgi.conf.erb
@@ -1,6 +1,9 @@
 # The WSGI Apache module configuration file is being
 # managed by Puppet an changes will be overwritten.
 <IfModule mod_wsgi.c>
+  <%- if @wsgi_restrict_embedded -%>
+  WSGIRestrictEmbedded <%= scope.function_bool2httpd([@wsgi_restrict_embedded]) %>
+  <%- end -%>
   <%- if @wsgi_socket_prefix -%>
   WSGISocketPrefix <%= @wsgi_socket_prefix %>
   <%- end -%>

From 50597391f49ae28d1e071377c53b6df17c1d5c30 Mon Sep 17 00:00:00 2001
From: Chris Baldwin <chbaldwi@cisco.com>
Date: Wed, 10 May 2017 16:47:15 -0400
Subject: [PATCH 1083/2267] Explicitly disabled 3DES due to Sweet32 attack. DES
 is not enabled by default.

---
 manifests/mod/ssl.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 219d5474bf..e48c2d40a3 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -4,7 +4,7 @@
   $ssl_options                = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd       = undef,
   $ssl_ca                     = undef,
-  $ssl_cipher                 = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4',
+  $ssl_cipher                 = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   $ssl_honorcipherorder       = true,
   $ssl_protocol               = [ 'all', '-SSLv2', '-SSLv3' ],
   $ssl_proxy_protocol         = [],

From da6e2e99b4e3f8b8a15d78daa783096f2969aec9 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 6 Jan 2017 22:06:29 +0100
Subject: [PATCH 1084/2267] Add mod_authnz_pam

---
 README.md                           |  1 +
 manifests/mod/authnz_pam.pp         |  4 +++
 manifests/params.pp                 |  2 ++
 spec/classes/mod/authnz_pam_spec.rb | 44 +++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+)
 create mode 100644 manifests/mod/authnz_pam.pp
 create mode 100644 spec/classes/mod/authnz_pam_spec.rb

diff --git a/README.md b/README.md
index 2186c5027f..b2a33d5399 100644
--- a/README.md
+++ b/README.md
@@ -1380,6 +1380,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `authn_dbd`\* (see [`apache::mod::authn_dbd`][])
 * `authn_file`
 * `authnz_ldap`\* (see [`apache::mod::authnz_ldap`][])
+* `authnz_pam`
 * `authz_default`
 * `authz_user`
 * `autoindex`
diff --git a/manifests/mod/authnz_pam.pp b/manifests/mod/authnz_pam.pp
new file mode 100644
index 0000000000..c2672126d2
--- /dev/null
+++ b/manifests/mod/authnz_pam.pp
@@ -0,0 +1,4 @@
+class apache::mod::authnz_pam {
+  include ::apache
+  ::apache::mod { 'authnz_pam': }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 2468d78615..7203b124e1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -104,6 +104,7 @@
         '7'     => 'mod_ldap',
         default => 'mod_authz_ldap',
       },
+      'authnz_pam'  => 'mod_authnz_pam',
       'fastcgi'     => 'mod_fastcgi',
       'fcgid'       => 'mod_fcgid',
       'geoip'       => 'mod_geoip',
@@ -237,6 +238,7 @@
       'auth_cas'    => 'libapache2-mod-auth-cas',
       'auth_kerb'   => 'libapache2-mod-auth-kerb',
       'auth_mellon' => 'libapache2-mod-auth-mellon',
+      'authnz_pam'  => 'libapache2-mod-authnz-pam',
       'dav_svn'     => 'libapache2-svn',
       'fastcgi'     => 'libapache2-mod-fastcgi',
       'fcgid'       => 'libapache2-mod-fcgid',
diff --git a/spec/classes/mod/authnz_pam_spec.rb b/spec/classes/mod/authnz_pam_spec.rb
new file mode 100644
index 0000000000..4bceeab854
--- /dev/null
+++ b/spec/classes/mod/authnz_pam_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'apache::mod::authnz_pam', :type => :class do
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with parameters" do
+    context "on a Debian OS" do
+      let :facts do
+        {
+          :lsbdistcodename        => 'squeeze',
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'Debian',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_package("libapache2-mod-authnz-pam") }
+      it { is_expected.to contain_apache__mod('authnz_pam') }
+    end #Debian
+
+    context "on a RedHat OS" do
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'RedHat',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_package("mod_authnz_pam") }
+      it { is_expected.to contain_apache__mod('authnz_pam') }
+    end # Redhat
+  end
+end

From f12349cd1a52fa432660e524fa27f2de859cbdac Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 6 Jan 2017 22:14:01 +0100
Subject: [PATCH 1085/2267] Add mod_intercept_form_submit

---
 README.md                                     |  1 +
 manifests/mod/intercept_form_submit.pp        |  4 +
 manifests/params.pp                           | 94 ++++++++++---------
 .../classes/mod/intercept_form_submit_spec.rb | 44 +++++++++
 4 files changed, 97 insertions(+), 46 deletions(-)
 create mode 100644 manifests/mod/intercept_form_submit.pp
 create mode 100644 spec/classes/mod/intercept_form_submit_spec.rb

diff --git a/README.md b/README.md
index b2a33d5399..17a17da7d0 100644
--- a/README.md
+++ b/README.md
@@ -1408,6 +1408,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `headers`
 * `include`
 * `info`\*
+* `intercept_form_submit`
 * `itk`
 * `ldap` (see [`apache::mod::ldap`][])
 * `mime`
diff --git a/manifests/mod/intercept_form_submit.pp b/manifests/mod/intercept_form_submit.pp
new file mode 100644
index 0000000000..39f1f5e07b
--- /dev/null
+++ b/manifests/mod/intercept_form_submit.pp
@@ -0,0 +1,4 @@
+class apache::mod::intercept_form_submit {
+  include ::apache
+  ::apache::mod { 'intercept_form_submit': }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 7203b124e1..fbf1f5637d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -97,47 +97,48 @@
     $php_version          = '5'
     $mod_packages         = {
       # NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
-      'auth_cas'    => 'mod_auth_cas',
-      'auth_kerb'   => 'mod_auth_kerb',
-      'auth_mellon' => 'mod_auth_mellon',
-      'authnz_ldap' => $::apache::version::distrelease ? {
+      'auth_cas'              => 'mod_auth_cas',
+      'auth_kerb'             => 'mod_auth_kerb',
+      'auth_mellon'           => 'mod_auth_mellon',
+      'authnz_ldap'           => $::apache::version::distrelease ? {
         '7'     => 'mod_ldap',
         default => 'mod_authz_ldap',
       },
-      'authnz_pam'  => 'mod_authnz_pam',
-      'fastcgi'     => 'mod_fastcgi',
-      'fcgid'       => 'mod_fcgid',
-      'geoip'       => 'mod_geoip',
-      'ldap'        => $::apache::version::distrelease ? {
+      'authnz_pam'            => 'mod_authnz_pam',
+      'fastcgi'               => 'mod_fastcgi',
+      'fcgid'                 => 'mod_fcgid',
+      'geoip'                 => 'mod_geoip',
+      'intercept_form_submit' => 'mod_intercept_form_submit',
+      'ldap'                  => $::apache::version::distrelease ? {
         '7'     => 'mod_ldap',
         default => undef,
       },
-      'pagespeed'   => 'mod-pagespeed-stable',
+      'pagespeed'             => 'mod-pagespeed-stable',
       # NOTE: The passenger module isn't available on RH/CentOS without
       # providing dependency packages provided by EPEL and passenger
       # repositories. See
       # https://www.phusionpassenger.com/library/install/apache/install/oss/el7/
-      'passenger'   => 'mod_passenger',
-      'perl'        => 'mod_perl',
-      'php5'        => $::apache::version::distrelease ? {
+      'passenger'             => 'mod_passenger',
+      'perl'                  => 'mod_perl',
+      'php5'                  => $::apache::version::distrelease ? {
         '5'     => 'php53',
         default => 'php',
       },
-      'phpXXX'      => 'php',
-      'proxy_html'  => 'mod_proxy_html',
-      'python'      => 'mod_python',
-      'security'    => 'mod_security',
+      'phpXXX'                => 'php',
+      'proxy_html'            => 'mod_proxy_html',
+      'python'                => 'mod_python',
+      'security'              => 'mod_security',
       # NOTE: The module for Shibboleth is not available on RH/CentOS without
       # providing dependency packages provided by Shibboleth's repositories.
       # See http://wiki.aaf.edu.au/tech-info/sp-install-guide
-      'shibboleth'  => 'shibboleth',
-      'ssl'         => 'mod_ssl',
-      'wsgi'        => 'mod_wsgi',
-      'dav_svn'     => 'mod_dav_svn',
-      'suphp'       => 'mod_suphp',
-      'xsendfile'   => 'mod_xsendfile',
-      'nss'         => 'mod_nss',
-      'shib2'       => 'shibboleth',
+      'shibboleth'            => 'shibboleth',
+      'ssl'                   => 'mod_ssl',
+      'wsgi'                  => 'mod_wsgi',
+      'dav_svn'               => 'mod_dav_svn',
+      'suphp'                 => 'mod_suphp',
+      'xsendfile'             => 'mod_xsendfile',
+      'nss'                   => 'mod_nss',
+      'shib2'                 => 'shibboleth',
     }
     $mod_libs             = {
       'nss' => 'libmodnss.so',
@@ -235,27 +236,28 @@
       $php_version = '7.0'
     }
     $mod_packages        = {
-      'auth_cas'    => 'libapache2-mod-auth-cas',
-      'auth_kerb'   => 'libapache2-mod-auth-kerb',
-      'auth_mellon' => 'libapache2-mod-auth-mellon',
-      'authnz_pam'  => 'libapache2-mod-authnz-pam',
-      'dav_svn'     => 'libapache2-svn',
-      'fastcgi'     => 'libapache2-mod-fastcgi',
-      'fcgid'       => 'libapache2-mod-fcgid',
-      'geoip'       => 'libapache2-mod-geoip',
-      'nss'         => 'libapache2-mod-nss',
-      'pagespeed'   => 'mod-pagespeed-stable',
-      'passenger'   => 'libapache2-mod-passenger',
-      'perl'        => 'libapache2-mod-perl2',
-      'phpXXX'      => 'libapache2-mod-phpXXX',
-      'proxy_html'  => 'libapache2-mod-proxy-html',
-      'python'      => 'libapache2-mod-python',
-      'rpaf'        => 'libapache2-mod-rpaf',
-      'security'    => 'libapache2-modsecurity',
-      'shib2'       => 'libapache2-mod-shib2',
-      'suphp'       => 'libapache2-mod-suphp',
-      'wsgi'        => 'libapache2-mod-wsgi',
-      'xsendfile'   => 'libapache2-mod-xsendfile',
+      'auth_cas'              => 'libapache2-mod-auth-cas',
+      'auth_kerb'             => 'libapache2-mod-auth-kerb',
+      'auth_mellon'           => 'libapache2-mod-auth-mellon',
+      'authnz_pam'            => 'libapache2-mod-authnz-pam',
+      'dav_svn'               => 'libapache2-svn',
+      'fastcgi'               => 'libapache2-mod-fastcgi',
+      'fcgid'                 => 'libapache2-mod-fcgid',
+      'geoip'                 => 'libapache2-mod-geoip',
+      'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+      'nss'                   => 'libapache2-mod-nss',
+      'pagespeed'             => 'mod-pagespeed-stable',
+      'passenger'             => 'libapache2-mod-passenger',
+      'perl'                  => 'libapache2-mod-perl2',
+      'phpXXX'                => 'libapache2-mod-phpXXX',
+      'proxy_html'            => 'libapache2-mod-proxy-html',
+      'python'                => 'libapache2-mod-python',
+      'rpaf'                  => 'libapache2-mod-rpaf',
+      'security'              => 'libapache2-modsecurity',
+      'shib2'                 => 'libapache2-mod-shib2',
+      'suphp'                 => 'libapache2-mod-suphp',
+      'wsgi'                  => 'libapache2-mod-wsgi',
+      'xsendfile'             => 'libapache2-mod-xsendfile',
     }
     $error_log           = 'error.log'
     $scriptalias         = '/usr/lib/cgi-bin'
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
new file mode 100644
index 0000000000..14a91fceef
--- /dev/null
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'apache::mod::intercept_form_submit', :type => :class do
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with parameters" do
+    context "on a Debian OS" do
+      let :facts do
+        {
+          :lsbdistcodename        => 'squeeze',
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'Debian',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_package("libapache2-mod-intercept-form-submit") }
+      it { is_expected.to contain_apache__mod('intercept_form_submit') }
+    end #Debian
+
+    context "on a RedHat OS" do
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'RedHat',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_package("mod_intercept_form_submit") }
+      it { is_expected.to contain_apache__mod('intercept_form_submit') }
+    end # Redhat
+  end
+end

From ccd9d191ef73079b427695e6442b0589f51b3273 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 6 Jan 2017 22:18:00 +0100
Subject: [PATCH 1086/2267] Add mod_lookup_identity

---
 README.md                           |  1 +
 manifests/mod/lookup_identity.pp    |  4 +++
 manifests/params.pp                 |  2 ++
 spec/classes/mod/lookup_identity.rb | 44 +++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+)
 create mode 100644 manifests/mod/lookup_identity.pp
 create mode 100644 spec/classes/mod/lookup_identity.rb

diff --git a/README.md b/README.md
index 17a17da7d0..0cae55acf0 100644
--- a/README.md
+++ b/README.md
@@ -1411,6 +1411,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `intercept_form_submit`
 * `itk`
 * `ldap` (see [`apache::mod::ldap`][])
+* `lookup_identity`
 * `mime`
 * `mime_magic`\*
 * `negotiation`
diff --git a/manifests/mod/lookup_identity.pp b/manifests/mod/lookup_identity.pp
new file mode 100644
index 0000000000..445c60ef21
--- /dev/null
+++ b/manifests/mod/lookup_identity.pp
@@ -0,0 +1,4 @@
+class apache::mod::lookup_identity {
+  include ::apache
+  ::apache::mod { 'lookup_identity': }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index fbf1f5637d..5864477a37 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -113,6 +113,7 @@
         '7'     => 'mod_ldap',
         default => undef,
       },
+      'lookup_identity'       => 'mod_lookup_identity',
       'pagespeed'             => 'mod-pagespeed-stable',
       # NOTE: The passenger module isn't available on RH/CentOS without
       # providing dependency packages provided by EPEL and passenger
@@ -245,6 +246,7 @@
       'fcgid'                 => 'libapache2-mod-fcgid',
       'geoip'                 => 'libapache2-mod-geoip',
       'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+      'lookup_identity'       => 'libapache2-mod-lookup-identity',
       'nss'                   => 'libapache2-mod-nss',
       'pagespeed'             => 'mod-pagespeed-stable',
       'passenger'             => 'libapache2-mod-passenger',
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
new file mode 100644
index 0000000000..a04e2e88eb
--- /dev/null
+++ b/spec/classes/mod/lookup_identity.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'apache::mod::lookup_identity', :type => :class do
+  it_behaves_like "a mod class, without including apache"
+
+  context "default configuration with parameters" do
+    context "on a Debian OS" do
+      let :facts do
+        {
+          :lsbdistcodename        => 'squeeze',
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'Debian',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_package("libapache2-mod-lookup-identity") }
+      it { is_expected.to contain_apache__mod('lookup_identity') }
+    end #Debian
+
+    context "on a RedHat OS" do
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '6',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'RedHat',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      it { is_expected.to contain_class("apache") }
+      it { is_expected.to contain_package("mod_lookup_identity") }
+      it { is_expected.to contain_apache__mod('lookup_identity') }
+    end # Redhat
+  end
+end

From 5f6b86861bb9dd6ef32106a2a27b2917dc273cd7 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <a.loibl@traviangames.com>
Date: Mon, 15 May 2017 18:43:41 +0200
Subject: [PATCH 1087/2267] Use enclose_ipv6 function from stdlib

puppetlabs-stdlib >= 4.12.0 merged the function `enclose_ipv6` of this module
into their codebase. As this module includes `stdlib` it can be removed here.
---
 lib/puppet/parser/functions/enclose_ipv6.rb   | 45 ------------
 metadata.json                                 |  2 +-
 .../parser/functions/enclose_ipv6_spec.rb     | 69 -------------------
 3 files changed, 1 insertion(+), 115 deletions(-)
 delete mode 100644 lib/puppet/parser/functions/enclose_ipv6.rb
 delete mode 100644 spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb

diff --git a/lib/puppet/parser/functions/enclose_ipv6.rb b/lib/puppet/parser/functions/enclose_ipv6.rb
deleted file mode 100644
index 80ffc3acae..0000000000
--- a/lib/puppet/parser/functions/enclose_ipv6.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# enclose_ipv6.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:enclose_ipv6, :type => :rvalue, :doc => <<-EOS
-Takes an array of ip addresses and encloses the ipv6 addresses with square brackets.
-    EOS
-  ) do |arguments|
-
-    require 'ipaddr'
-
-    rescuable_exceptions = [ ArgumentError ]
-    if defined?(IPAddr::InvalidAddressError)
-	    rescuable_exceptions << IPAddr::InvalidAddressError
-    end
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "enclose_ipv6(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-    unless arguments[0].is_a?(String) or arguments[0].is_a?(Array) then
-      raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument type "+
-        "given #{arguments[0].class} expected String or Array")
-    end
-
-    input = [arguments[0]].flatten.compact
-    result = []
-
-    input.each do |val|
-      unless val == '*'
-        begin
-          ip = IPAddr.new(val)
-        rescue *rescuable_exceptions
-          raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument "+
-                "given #{val} is not an ip address.")
-        end
-        val = "[#{ip.to_s}]" if ip.ipv6?
-      end
-      result << val
-    end
-
-    return result.uniq
-  end
-end
diff --git a/metadata.json b/metadata.json
index 7bb2f12dbc..57f4ca08fc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -8,7 +8,7 @@
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.2.0 < 5.0.0"},
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.12.0 < 5.0.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
   ],
   "data_provider": null,
diff --git a/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb b/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
deleted file mode 100644
index b162127d06..0000000000
--- a/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the enclose_ipv6 function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("enclose_ipv6")).to eq("function_enclose_ipv6")
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_enclose_ipv6([]) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should raise a ParseError if there is more than 1 arguments" do
-    expect { scope.function_enclose_ipv6(['argument1','argument2']) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should raise a ParseError when given garbage" do
-    expect { scope.function_enclose_ipv6(['garbage']) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should raise a ParseError when given something else than a string or an array" do
-    expect { scope.function_enclose_ipv6([['1' => '127.0.0.1']]) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should not raise a ParseError when given a single ip string" do
-    expect { scope.function_enclose_ipv6(['127.0.0.1']) }.to_not raise_error
-  end
-
-  it "should not raise a ParseError when given * as ip string" do
-    expect { scope.function_enclose_ipv6(['*']) }.to_not raise_error
-  end
-
-  it "should not raise a ParseError when given an array of ip strings" do
-    expect { scope.function_enclose_ipv6([['127.0.0.1','fe80::1']]) }.to_not raise_error
-  end
-
-  it "should not raise a ParseError when given differently notations of ip addresses" do
-    expect { scope.function_enclose_ipv6([['127.0.0.1','fe80::1','[fe80::1]']]) }.to_not raise_error
-  end
-
-  it "should raise a ParseError when given a wrong ipv4 address" do
-    expect { scope.function_enclose_ipv6(['127..0.0.1']) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should raise a ParseError when given a ipv4 address with square brackets" do
-    expect { scope.function_enclose_ipv6(['[127.0.0.1]']) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should raise a ParseError when given a wrong ipv6 address" do
-    expect { scope.function_enclose_ipv6(['fe80:::1']) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should embrace ipv6 adresses within an array of ip addresses" do
-    result = scope.function_enclose_ipv6([['127.0.0.1','fe80::1','[fe80::2]']])
-    expect(result).to(eq(['127.0.0.1','[fe80::1]','[fe80::2]']))
-  end
-
-  it "should embrace a single ipv6 adresse" do
-    result = scope.function_enclose_ipv6(['fe80::1'])
-    expect(result).to(eq(['[fe80::1]']))
-  end
-
-  it "should not embrace a single ipv4 adresse" do
-    result = scope.function_enclose_ipv6(['127.0.0.1'])
-    expect(result).to(eq(['127.0.0.1']))
-  end
-end

From a405c1637fdc2165692be7d3d54672fab61d51dc Mon Sep 17 00:00:00 2001
From: Martin Zehetmayer <angrox@idle.at>
Date: Tue, 23 May 2017 14:52:50 -0700
Subject: [PATCH 1088/2267] Update the version compatibility to >= 4.7.0 <
 5.0.0

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 7bb2f12dbc..549ddb2469 100644
--- a/metadata.json
+++ b/metadata.json
@@ -72,7 +72,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
+      "version_requirement": ">= 4.7.0 < 5.0.0"
     }
   ],
   "description": "Module for Apache configuration"

From 16eabda0c972868cf4300e72bfceed33320a0917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Defortis?= <cedric.defortis@lyra-network.com>
Date: Wed, 3 May 2017 17:30:33 +0200
Subject: [PATCH 1089/2267] MODULES-4816 - new param for mod::security class

- New param $manage_security_crs set to true by default so the default
  behaviour is unchanged.
- new spec example so that the parameter is spec-tested
- Add an entry in the doc about this new param
---
 README.md                         |  1 +
 manifests/mod/security.pp         | 41 +++++++++++++++++--------------
 spec/classes/mod/security_spec.rb |  9 ++++++-
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 16bb64883f..f52824e553 100644
--- a/README.md
+++ b/README.md
@@ -1948,6 +1948,7 @@ Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs b
 - `allowed_methods`: A space-separated list of allowed HTTP methods. Default: 'GET HEAD POST OPTIONS'.
 - `content_types`: A list of one or more allowed [MIME types][MIME `content-type`]. Default: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'
 - `crs_package`: Names the package that installs CRS rules. Default: `modsec_crs_package` in [`apache::params`][].
+- `manage_security_crs` : Manage security_crs.conf rules file. Default: `true`.
 - `modsec_dir`: Defines the path where Puppet installs the modsec configuration and activated rules links. Default: 'On', set by `modsec_dir` in [`apache::params`][].
 ${modsec\_dir}/activated\_rules.
 - `modsec_secruleengine`: Configures the modsec rules engine. Valid options: 'On', 'Off', and 'DetectionOnly'. Default: `modsec_secruleengine` in [`apache::params`][].
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 4fab446500..dfe4da2101 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -24,6 +24,7 @@
   $secrequestbodylimit         = '13107200',
   $secrequestbodynofileslimit  = '131072',
   $secrequestbodyinmemorylimit = '131072',
+  $manage_security_crs         = true,
 ) inherits ::apache::params {
   include ::apache
 
@@ -104,25 +105,27 @@
     notify  => Class['apache::service'],
   }
 
-  # Template uses:
-  # - $_secdefaultaction
-  # - $critical_anomaly_score
-  # - $error_anomaly_score
-  # - $warning_anomaly_score
-  # - $notice_anomaly_score
-  # - $inbound_anomaly_threshold
-  # - $outbound_anomaly_threshold
-  # - $anomaly_score_blocking
-  # - $allowed_methods
-  # - $content_types
-  # - $restricted_extensions
-  # - $restricted_headers
-  # - $secrequestmaxnumargs
-  file { "${modsec_dir}/security_crs.conf":
-    ensure  => file,
-    content => template('apache/mod/security_crs.conf.erb'),
-    require => File[$modsec_dir],
-    notify  => Class['apache::service'],
+  if $manage_security_crs {
+    # Template uses:
+    # - $_secdefaultaction
+    # - $critical_anomaly_score
+    # - $error_anomaly_score
+    # - $warning_anomaly_score
+    # - $notice_anomaly_score
+    # - $inbound_anomaly_threshold
+    # - $outbound_anomaly_threshold
+    # - $anomaly_score_blocking
+    # - $allowed_methods
+    # - $content_types
+    # - $restricted_extensions
+    # - $restricted_headers
+    # - $secrequestmaxnumargs
+    file { "${modsec_dir}/security_crs.conf":
+      ensure  => file,
+      content => template('apache/mod/security_crs.conf.erb'),
+      require => File[$modsec_dir],
+      notify  => Class['apache::service'],
+    }
   }
 
   unless $::operatingsystem == 'SLES' { apache::security::rule_link { $activated_rules: } }
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 28b5e2642a..e30f7214fd 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -75,8 +75,15 @@
         :target => '/tmp/foo/bar.conf',
       ) }
     end
+    describe 'with other modsec parameters' do
+      let :params do
+        {
+          :manage_security_crs => false
+        }
+      end
+      it { should_not contain_file('/etc/httpd/modsecurity.d/security_crs.conf') }
+    end
   end
-
   context "on Debian based systems" do
     let :facts do
       {

From 405c2b7ab7d12fb6042d2db7123d67592e11029c Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 12 May 2017 15:55:36 -0300
Subject: [PATCH 1090/2267] Include very minimal apache::mod::jk class

---
 manifests/mod/jk.pp | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 manifests/mod/jk.pp

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
new file mode 100644
index 0000000000..36f9be910c
--- /dev/null
+++ b/manifests/mod/jk.pp
@@ -0,0 +1,7 @@
+class apache::mod::jk {
+
+  include ::apache
+
+  ::apache::mod { 'jk': }
+
+}

From 7b93d44180ff19539020faf8c8d995849a142f77 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 12 May 2017 15:58:51 -0300
Subject: [PATCH 1091/2267] Include dummy jk.conf template

---
 templates/mod/jk.conf.erb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 templates/mod/jk.conf.erb

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
new file mode 100644
index 0000000000..352df6c6e9
--- /dev/null
+++ b/templates/mod/jk.conf.erb
@@ -0,0 +1,2 @@
+# This file is generated automatically by Puppet - DO NOT EDIT
+# Any manual changes will be overwritten

From e3957dd71d644153185aecd7fac6f97f02a1913c Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 12 May 2017 15:59:19 -0300
Subject: [PATCH 1092/2267] Include jk.conf file resource in class ...mod::jk

---
 manifests/mod/jk.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 36f9be910c..a77d0fc367 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -4,4 +4,16 @@
 
   ::apache::mod { 'jk': }
 
+  file {'jk.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/jk.conf",
+    mode    => $::apache::file_mode,
+    content => template('apache/mod/jk.conf.erb'),
+    require => [
+      Exec["mkdir ${::apache::mod_dir}"],
+      File[$::apache::mod_dir],
+    ],
+    notify  => Class['apache::service'],
+  }
+
 }

From e27f5a5b31935607d2032d831697e301938349de Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 5 Jun 2017 18:01:50 -0300
Subject: [PATCH 1093/2267] Include workers file in mod_jk config template

---
 templates/mod/jk.conf.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 352df6c6e9..6ca5c61bf3 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -1,2 +1,4 @@
 # This file is generated automatically by Puppet - DO NOT EDIT
 # Any manual changes will be overwritten
+
+JkWorkersFile <%= @workers_file %>

From 6048ecf0e91031a9c32e5e3c858ee4bdbed90f0d Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 5 Jun 2017 18:02:13 -0300
Subject: [PATCH 1094/2267] Include log properties in mod_jk config template

---
 templates/mod/jk.conf.erb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 6ca5c61bf3..f06f1e82be 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -2,3 +2,13 @@
 # Any manual changes will be overwritten
 
 JkWorkersFile <%= @workers_file %>
+
+<% if @log_file -%>
+JkLogFile <%= @log_file %>
+<% end -%>
+<% if @log_level -%>
+JkLogLevel <%= @log_level %>
+<% end -%>
+<% if @log_stamp_format -%>
+JkLogStampFormat <%= @log_stamp_format %>
+<% end -%>

From 0295390f700b55c35676d6870d7f326c6dd35672 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 5 Jun 2017 18:03:01 -0300
Subject: [PATCH 1095/2267] Include workers map file in mod_jk config template

---
 templates/mod/jk.conf.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index f06f1e82be..55a373e7b2 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -2,6 +2,11 @@
 # Any manual changes will be overwritten
 
 JkWorkersFile <%= @workers_file %>
+<%# Define jk_mount_file if workers map should be global -%>
+<%# Otherwise, include JkMount directives in your vhosts -%>
+<% if @jk_mount_file -%>
+JkMountFile <%= @jk_mount_file %>
+<% end -%>
 
 <% if @log_file -%>
 JkLogFile <%= @log_file %>

From 28b08f09fba172c19f0582ba73994d772bdc01ed Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 5 Jun 2017 18:04:09 -0300
Subject: [PATCH 1096/2267] Include config parameters in class ...mod::jk

---
 manifests/mod/jk.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index a77d0fc367..8b80949363 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -1,4 +1,11 @@
-class apache::mod::jk {
+class apache::mod::jk (
+  $workers_file,
+  $jk_mount = undef,
+  $jk_mount_file = undef,
+  $log_file = undef,
+  $log_level = undef,
+  $log_stamp_format = undef,
+){
 
   include ::apache
 

From ca7abf1673b82811cb5a1cb02b0c6b1a34cc8c7f Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 6 Jun 2017 14:07:55 -0300
Subject: [PATCH 1097/2267] Include remaining parameters in class ...mod::jk
 and template

---
 manifests/mod/jk.pp       |  52 ++++++++++++++++---
 templates/mod/jk.conf.erb | 102 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 143 insertions(+), 11 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 8b80949363..d08b02b2c3 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -1,10 +1,50 @@
+# Class apache::mod::jk
+#
+# Manages mod_jk connector
+#
+# All parameters are optional. When undefined, some receive default values,
+# while others cause an optional directive to be absent
+#
+# For help on parameters, pls see official reference at:
+# https://tomcat.apache.org/connectors-doc/reference/apache.html
+#
 class apache::mod::jk (
-  $workers_file,
-  $jk_mount = undef,
-  $jk_mount_file = undef,
-  $log_file = undef,
-  $log_level = undef,
-  $log_stamp_format = undef,
+  $workers_file          = undef,
+  $worker_property       = undef,
+  $shm_file              = undef,
+  $shm_size              = undef,
+  $mount_file            = undef,
+  $mount_file_reload     = undef,
+  $mount                 = undef,
+  $un_mount              = undef,
+  $auto_alias            = undef,
+  $mount_copy            = undef,
+  $worker_indicator      = undef,
+  $watchdog_interval     = undef,
+  $log_file              = undef,
+  $log_level             = undef,
+  $log_stamp_format      = undef,
+  $request_log_format    = undef,
+  $extract_ssl           = undef,
+  $https_indicator       = undef,
+  $sslprotocol_indicator = undef,
+  $certs_indicator       = undef,
+  $cipher_indicator      = undef,
+  $certchain_prefix      = undef,
+  $session_indicator     = undef,
+  $keysize_indicator     = undef,
+  $local_name_indicator  = undef,
+  $ignore_cl_indicator   = undef,
+  $local_addr_indicator  = undef,
+  $local_port_indicator  = undef,
+  $remote_host_indicator = undef,
+  $remote_addr_indicator = undef,
+  $remote_port_indicator = undef,
+  $remote_user_indicator = undef,
+  $auth_type_indicator   = undef,
+  $options               = undef,
+  $env_var               = undef,
+  $strip_session         = undef,
 ){
 
   include ::apache
diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 55a373e7b2..40b1d3e4ed 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -1,13 +1,42 @@
 # This file is generated automatically by Puppet - DO NOT EDIT
 # Any manual changes will be overwritten
 
+<% if @workers_file -%>
 JkWorkersFile <%= @workers_file %>
-<%# Define jk_mount_file if workers map should be global -%>
-<%# Otherwise, include JkMount directives in your vhosts -%>
-<% if @jk_mount_file -%>
-JkMountFile <%= @jk_mount_file %>
 <% end -%>
-
+<% if @worker_property -%>
+JkWorkerProperty <%= @worker_property %>
+<% end -%>
+<% if @shm_file -%>
+JkShmFile <%= @shm_file %>
+<% end -%>
+<% if @shm_size -%>
+JkShmSize <%= @shm_size %>
+<% end -%>
+<% if @mount_file -%>
+JkMountFile <%= @mount_file %>
+<% end -%>
+<% if @mount_file_reload -%>
+JkMountFileReload <%= @mount_file_reload %>
+<% end -%>
+<% if @mount -%>
+JkMount <%= @mount %>
+<% end -%>
+<% if @un_mount -%>
+JkUnMount <%= @un_mount %>
+<% end -%>
+<% if @auto_alias -%>
+JkAutoAlias <%= @auto_alias %>
+<% end -%>
+<% if @mount_copy -%>
+JkMountCopy <%= @mount_copy %>
+<% end -%>
+<% if @worker_indicator -%>
+JkWorkerIndicator <%= @worker_indicator %>
+<% end -%>
+<% if @watchdog_interval -%>
+JkWatchdogInterval <%= @watchdog_interval %>
+<% end -%>
 <% if @log_file -%>
 JkLogFile <%= @log_file %>
 <% end -%>
@@ -17,3 +46,66 @@ JkLogLevel <%= @log_level %>
 <% if @log_stamp_format -%>
 JkLogStampFormat <%= @log_stamp_format %>
 <% end -%>
+<% if @request_log_format -%>
+JkRequestLogFormat <%= @request_log_format %>
+<% end -%>
+<% if @extract_ssl -%>
+JkExtractSSL <%= @extract_ssl %>
+<% end -%>
+<% if @https_indicator -%>
+JkHTTPSIndicator <%= @https_indicator %>
+<% end -%>
+<% if @sslprotocol_indicator -%>
+JkSSLPROTOCOLIndicator <%= @sslprotocol_indicator %>
+<% end -%>
+<% if @certs_indicator -%>
+JkCERTSIndicator <%= @certs_indicator %>
+<% end -%>
+<% if @cipher_indicator -%>
+JkCIPHERIndicator <%= @cipher_indicator %>
+<% end -%>
+<% if @certchain_prefix -%>
+JkCERTCHAINPrefix <%= @certchain_prefix %>
+<% end -%>
+<% if @session_indicator -%>
+JkSESSIONIndicator <%= @session_indicator %>
+<% end -%>
+<% if @keysize_indicator -%>
+JkKEYSIZEIndicator <%= @keysize_indicator %>
+<% end -%>
+<% if @local_name_indicator -%>
+JkLocalNameIndicator <%= @local_name_indicator %>
+<% end -%>
+<% if @ignore_cl_indicator -%>
+JkIgnoreCLIndicator <%= @ignore_cl_indicator %>
+<% end -%>
+<% if @local_addr_indicator -%>
+JkLocalAddrIndicator <%= @local_addr_indicator %>
+<% end -%>
+<% if @local_port_indicator -%>
+JkLocalPortIndicator <%= @local_port_indicator %>
+<% end -%>
+<% if @remote_host_indicator -%>
+JkRemoteHostIndicator <%= @remote_host_indicator %>
+<% end -%>
+<% if @remote_addr_indicator -%>
+JkRemoteAddrIndicator <%= @remote_addr_indicator %>
+<% end -%>
+<% if @remote_port_indicator -%>
+JkRemotePortIndicator <%= @remote_port_indicator %>
+<% end -%>
+<% if @remote_user_indicator -%>
+JkRemoteUserIndicator <%= @remote_user_indicator %>
+<% end -%>
+<% if @auth_type_indicator -%>
+JkAuthTypeIndicator <%= @auth_type_indicator %>
+<% end -%>
+<% if @options -%>
+JkOptions <%= @options %>
+<% end -%>
+<% if @env_var -%>
+JkEnvVar <%= @env_var %>
+<% end -%>
+<% if @strip_session -%>
+JkStripSession <%= @strip_session %>
+<% end -%>

From 68fce0d2652f73efb0584542ae2210d6c4965953 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 6 Jun 2017 14:39:35 -0300
Subject: [PATCH 1098/2267] Correct hash parsing in template mod/jk.conf.erb

---
 templates/mod/jk.conf.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 40b1d3e4ed..e6b3274d98 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -5,7 +5,9 @@
 JkWorkersFile <%= @workers_file %>
 <% end -%>
 <% if @worker_property -%>
-JkWorkerProperty <%= @worker_property %>
+<% @worker_property.sort.each do |property,value| -%>
+JkWorkerProperty <%= @property %>=<%= @value %>
+<% end -%>
 <% end -%>
 <% if @shm_file -%>
 JkShmFile <%= @shm_file %>

From d3833612a50e7d3b09a1225eb8b2636403c84f2f Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 6 Jun 2017 14:40:26 -0300
Subject: [PATCH 1099/2267] Add comments in class ...mod::jk

---
 manifests/mod/jk.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index d08b02b2c3..a8cf49b7f6 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -49,8 +49,12 @@
 
   include ::apache
 
+  # Provides important variables
+  include ::apache
+  # Manages basic module config
   ::apache::mod { 'jk': }
 
+  # Main config file
   file {'jk.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/jk.conf",

From fc90643dc42c0ff1ac3faefe818ec9da87a97ed8 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 6 Jun 2017 15:37:44 -0300
Subject: [PATCH 1100/2267] Correct remaining hash parsings in template
 mod/jk.conf.erb

---
 templates/mod/jk.conf.erb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index e6b3274d98..b4a3489ee7 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -22,10 +22,14 @@ JkMountFile <%= @mount_file %>
 JkMountFileReload <%= @mount_file_reload %>
 <% end -%>
 <% if @mount -%>
-JkMount <%= @mount %>
+<% @mount.sort.each do |url_prefix,worker_name| -%>
+JkMount <%= @url_prefix %> <%= @worker_name %>
+<% end -%>
 <% end -%>
 <% if @un_mount -%>
-JkUnMount <%= @un_mount %>
+<% @un_mount.sort.each do |url_prefix,worker_name| -%>
+JkUnMount <%= @url_prefix %> <%= @worker_name %>
+<% end -%>
 <% end -%>
 <% if @auto_alias -%>
 JkAutoAlias <%= @auto_alias %>
@@ -103,10 +107,14 @@ JkRemoteUserIndicator <%= @remote_user_indicator %>
 JkAuthTypeIndicator <%= @auth_type_indicator %>
 <% end -%>
 <% if @options -%>
-JkOptions <%= @options %>
+<% @options.sort.each do |fwd_option| -%>
+JkOptions <%= @fwd_option %>
+<% end -%>
 <% end -%>
 <% if @env_var -%>
-JkEnvVar <%= @env_var %>
+<% @env_var.sort.each do |variable,value| -%>
+JkEnvVar <%= @variable %><% if not @value.empty? -%> @value<% end -%>
+<% end -%>
 <% end -%>
 <% if @strip_session -%>
 JkStripSession <%= @strip_session %>

From a79630ce14522ef05580d8031238273061f60aa3 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 6 Jun 2017 17:52:55 -0300
Subject: [PATCH 1101/2267] Use empty hashes/arrays as defaults in class
 ...mod::jk

---
 manifests/mod/jk.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index a8cf49b7f6..367e927f22 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -10,13 +10,13 @@
 #
 class apache::mod::jk (
   $workers_file          = undef,
-  $worker_property       = undef,
+  $worker_property       = {},
   $shm_file              = undef,
   $shm_size              = undef,
   $mount_file            = undef,
   $mount_file_reload     = undef,
-  $mount                 = undef,
-  $un_mount              = undef,
+  $mount                 = {},
+  $un_mount              = {},
   $auto_alias            = undef,
   $mount_copy            = undef,
   $worker_indicator      = undef,
@@ -42,8 +42,8 @@
   $remote_port_indicator = undef,
   $remote_user_indicator = undef,
   $auth_type_indicator   = undef,
-  $options               = undef,
-  $env_var               = undef,
+  $options               = [],
+  $env_var               = {},
   $strip_session         = undef,
 ){
 

From 0422b8f637d86e636883163a5acb34934fdb84eb Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 12:22:59 -0300
Subject: [PATCH 1102/2267] Include default file parameters in class
 apache::mod::jk

---
 manifests/mod/jk.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 367e927f22..5a865caef1 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -54,17 +54,21 @@
   # Manages basic module config
   ::apache::mod { 'jk': }
 
+  # File resource common parameters
+  File {
+    ensure  => file,
+    mode    => $::apache::file_mode,
+    notify  => Class['apache::service'],
+  }
+
   # Main config file
   file {'jk.conf':
-    ensure  => file,
     path    => "${::apache::mod_dir}/jk.conf",
-    mode    => $::apache::file_mode,
     content => template('apache/mod/jk.conf.erb'),
     require => [
       Exec["mkdir ${::apache::mod_dir}"],
       File[$::apache::mod_dir],
     ],
-    notify  => Class['apache::service'],
   }
 
 }

From 6dd989ea704bd6d372db78d2cd56bb661df52221 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 12:23:56 -0300
Subject: [PATCH 1103/2267] Include workers file management in class
 apache::mod::jk

---
 manifests/mod/jk.pp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 5a865caef1..b77aad58d1 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -45,6 +45,8 @@
   $options               = [],
   $env_var               = {},
   $strip_session         = undef,
+  # Workers file content
+  $workers_file_content  = [],
 ){
 
   include ::apache
@@ -71,4 +73,16 @@
     ],
   }
 
+  # Workers file
+  if $workers_file != undef {
+    $workers_path = $workers_file ? {
+      /^\//   => $workers_file,
+      default => "${apache::httpd_dir}/${workers_file}",
+    }
+    file { $workers_path:
+      content => template('apache/mod/jk/workers.properties.erb'),
+      require => Package['httpd'],
+    }
+  }
+
 }

From 0098e7cc678713ee1777ce7e74547e4ad93d23ba Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 13:09:15 -0300
Subject: [PATCH 1104/2267] Include template for mod_jk workers file

---
 templates/mod/jk/workers.properties.erb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 templates/mod/jk/workers.properties.erb

diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.erb
new file mode 100644
index 0000000000..dec1369b33
--- /dev/null
+++ b/templates/mod/jk/workers.properties.erb
@@ -0,0 +1,8 @@
+# This file is generated automatically by Puppet - DO NOT EDIT
+# Any manual changes will be overwritten
+<% @workers_file_content.sort.each do |worker,directives| -%>
+
+<% directives.sort.each do |property,value| -%>
+worker.<%= worker %>.<%= property %>=<%= value %>
+<% end -%>
+<% end -%>

From abe7ab7e3d72cd0bb3823a60c22c9f5291e13a87 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 13:10:18 -0300
Subject: [PATCH 1105/2267] Manages comments in mod_jk workers file

---
 templates/mod/jk/workers.properties.erb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.erb
index dec1369b33..bca48c2ab5 100644
--- a/templates/mod/jk/workers.properties.erb
+++ b/templates/mod/jk/workers.properties.erb
@@ -2,7 +2,13 @@
 # Any manual changes will be overwritten
 <% @workers_file_content.sort.each do |worker,directives| -%>
 
+<%# Places comment before worker directives -%>
+<% if directives.has_key?('comment') -%>
+# <%= directives['comment'] %>
+<% end -%>
 <% directives.sort.each do |property,value| -%>
+<% if property != 'comment' -%>
 worker.<%= worker %>.<%= property %>=<%= value %>
 <% end -%>
 <% end -%>
+<% end -%>

From 92453af0d13ec8c04b2049e020cd579e0b263f1f Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 13:11:25 -0300
Subject: [PATCH 1106/2267] Document parameters in mod_jk workers file

---
 templates/mod/jk/workers.properties.erb | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.erb
index bca48c2ab5..4444032b24 100644
--- a/templates/mod/jk/workers.properties.erb
+++ b/templates/mod/jk/workers.properties.erb
@@ -1,5 +1,31 @@
 # This file is generated automatically by Puppet - DO NOT EDIT
 # Any manual changes will be overwritten
+<%# -%>
+<%# workers_file_content should be a hash which keys are workers names -%>
+<%# and values are new hashes with properties and values -%>
+<%# -%>
+<%# Example: -%>
+<%# # Optional comment -%>
+<%# worker.some_name.type=ajp13 -%>
+<%# worker.some_name.socket_keepalive=true -%>
+<%# # I just like comments -%>
+<%# worker.other_name.type=ajp12 (why would you?) -%>
+<%# worker.other_name.socket_keepalive=false -%>
+<%# should be parameterized as: -%>
+<%# -%>
+<%# $workers_file_content = { -%>
+<%#   some_name => { -%>
+<%#     type             => 'ajp13', -%>
+<%#     socket_keepalive => 'true', -%>
+<%#     comment          => 'Optional comment', -%>
+<%#   }, -%>
+<%#   other_name => { -%>
+<%#     type             => 'ajp12', -%>
+<%#     socket_keepalive => 'false', -%>
+<%#     comment          => 'I just like comments', -%>
+<%#   }, -%>
+<%# }, -%>
+<%# -%>
 <% @workers_file_content.sort.each do |worker,directives| -%>
 
 <%# Places comment before worker directives -%>

From d08baa0f8bf2142bdf490a809dc67c617b4d8305 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 13:43:40 -0300
Subject: [PATCH 1107/2267] Include class apache::mod::jk section in README

---
 README.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0cae55acf0..8329ffb5ef 100644
--- a/README.md
+++ b/README.md
@@ -1300,7 +1300,7 @@ If the string starts with / or | or syslog: the full path will be set. Otherwise
 
 ##### `scriptalias`
 
-Directory to use for global script alias 
+Directory to use for global script alias
 
 The default value is determined by your operating system:
 
@@ -1410,6 +1410,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `info`\*
 * `intercept_form_submit`
 * `itk`
+* `jk` (see [`apache::mod::jk`][])
 * `ldap` (see [`apache::mod::ldap`][])
 * `lookup_identity`
 * `mime`
@@ -1725,6 +1726,58 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 - `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. Default: the value of [`$::apache::apache_version`][`apache_version`].
 - `restrict_access`: Determines whether to enable access restrictions. If false, the `allow_from` whitelist is ignored and any IP address can access `/server-info`. Valid options: Boolean. Default: true.
 
+##### Class: `apache::mod::jk`
+
+Installs and manages `mod_jk`, a connector for Apache httpd redirection to old versions of TomCat and JBoss
+
+**Note**: There is no official package available for mod\_jk and thus it must be made available by means outside of the control of the apache module. Binaries can be found at [Apache Tomcat Connectors download page](https://tomcat.apache.org/download-connectors.cgi)
+
+``` puppet
+class { '::apache::mod::jk':
+  workers_file = 'conf/workers.properties',
+  mount_file   = 'conf/uriworkermap.properties',
+  shm_file     = 'run/jk.shm',
+  shm_size     = '50M',
+  $workers_file_content = {
+    <Content>
+  },
+}
+```
+
+**Parameters within `apache::mod::jk`**:
+
+The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for \*file_content:
+
+**`workers_file_content`**
+
+Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values. For example, the workers file below:
+
+```
+# Optional comment
+worker.some_name.type=ajp13
+worker.some_name.socket_keepalive=true
+# I just like comments
+worker.other_name.type=ajp12 (why would you?)
+worker.other_name.socket_keepalive=false
+```
+
+Should be parameterized as:
+
+```
+$workers_file_content = {
+  some_name  => {
+    comment          => 'Optional comment',
+    type             => 'ajp13',
+    socket_keepalive => 'true',
+  },
+  other_name => {
+    comment          => 'I just like comments',
+    type             => 'ajp12',
+    socket_keepalive => 'false',
+  },
+}
+```
+
 ##### Class: `apache::mod::passenger`
 
 Installs and manages [`mod_passenger`][]. For RedHat based systems, please ensure that you meet the minimum requirements as described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux)

From 6f9e447a32525b41fe1aa8090b86a1d7f262d01b Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 13:49:47 -0300
Subject: [PATCH 1108/2267] Correct link to class apache::mod::jk section in
 README

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8329ffb5ef..4085f286da 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,7 @@
 [`apache::mod::ext_filter`]: #class-apachemodext_filter
 [`apache::mod::geoip`]: #class-apachemodgeoip
 [`apache::mod::itk`]: #class-apachemoditk
+[`apache::mod::jk`]: #class-apachemodjk
 [`apache::mod::ldap`]: #class-apachemodldap
 [`apache::mod::passenger`]: #class-apachemodpassenger
 [`apache::mod::peruser`]: #class-apachemodperuser
@@ -1410,7 +1411,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `info`\*
 * `intercept_form_submit`
 * `itk`
-* `jk` (see [`apache::mod::jk`][])
+* `jk` (see [`apache::mod::jk`])
 * `ldap` (see [`apache::mod::ldap`][])
 * `lookup_identity`
 * `mime`

From 54f6d7391562b5117f08200d3b4d9708b85ec6c6 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 13:53:38 -0300
Subject: [PATCH 1109/2267] Include comment on workers file content in classe
 apache::mod::jk

---
 manifests/mod/jk.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index b77aad58d1..ff62dd68b8 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -46,6 +46,7 @@
   $env_var               = {},
   $strip_session         = undef,
   # Workers file content
+  # See comments in template mod/jk/workers.properties.erb
   $workers_file_content  = [],
 ){
 

From 11c0482fe189efb87efc2faa35bba4f7e4dce4db Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 17:35:21 -0300
Subject: [PATCH 1110/2267] Include missing directives in template
 mod/jk/workers.properties.erb

---
 templates/mod/jk/workers.properties.erb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.erb
index 4444032b24..c440415ec0 100644
--- a/templates/mod/jk/workers.properties.erb
+++ b/templates/mod/jk/workers.properties.erb
@@ -26,6 +26,16 @@
 <%#   }, -%>
 <%# }, -%>
 <%# -%>
+<% if @workers_file_content.has_key?('worker_lists') -%>
+
+<% @workers_file_content['worker_lists'].sort.each do |list| -%>
+worker.list = <%= list %>
+<% end -%>
+<% end -%>
+<% if @workers_file_content.has_key?('worker_mantain') -%>
+
+worker.maintain = <%= @workers_file_content['worker_mantain'] %>
+<% end -%>
 <% @workers_file_content.sort.each do |worker,directives| -%>
 
 <%# Places comment before worker directives -%>

From 12f71cf210e559b11f47c9b9cfaeda481620df5e Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 17:36:52 -0300
Subject: [PATCH 1111/2267] Deal with reserved keys in template
 mod/jk/workers.properties.erb

---
 templates/mod/jk/workers.properties.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.erb
index c440415ec0..8018dcc3db 100644
--- a/templates/mod/jk/workers.properties.erb
+++ b/templates/mod/jk/workers.properties.erb
@@ -36,7 +36,9 @@ worker.list = <%= list %>
 
 worker.maintain = <%= @workers_file_content['worker_mantain'] %>
 <% end -%>
-<% @workers_file_content.sort.each do |worker,directives| -%>
+<% @workers_file_content.sort.each do |name,directives| -%>
+<%# Skip hash items with the reserved keys -%>
+<% if not ['worker_lists', 'worker_mantain'].include?(name) -%>
 
 <%# Places comment before worker directives -%>
 <% if directives.has_key?('comment') -%>
@@ -44,7 +46,8 @@ worker.maintain = <%= @workers_file_content['worker_mantain'] %>
 <% end -%>
 <% directives.sort.each do |property,value| -%>
 <% if property != 'comment' -%>
-worker.<%= worker %>.<%= property %>=<%= value %>
+worker.<%= name %>.<%= property %>=<%= value %>
+<% end -%>
 <% end -%>
 <% end -%>
 <% end -%>

From 0977585b2b385d777b593cef95253c41bb887298 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 17:37:42 -0300
Subject: [PATCH 1112/2267] Document included directives in template
 mod/jk/workers.properties.erb

---
 templates/mod/jk/workers.properties.erb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.erb
index 8018dcc3db..2822178a98 100644
--- a/templates/mod/jk/workers.properties.erb
+++ b/templates/mod/jk/workers.properties.erb
@@ -3,17 +3,26 @@
 <%# -%>
 <%# workers_file_content should be a hash which keys are workers names -%>
 <%# and values are new hashes with properties and values -%>
+<%# Two keys are special (and reserved!): -%>
+<%# worker_lists - Array of comma-separated worker names lists -%>
+<%# Each list is an item of the array and will be placed in one line -%>
+<%# worker_mantain - Numeric string -%>
 <%# -%>
 <%# Example: -%>
+<%# worker.list = status -%>
+<%# worker.list = some_name,other_name -%>
+<%# worker_mantain = 60 -%>
 <%# # Optional comment -%>
 <%# worker.some_name.type=ajp13 -%>
 <%# worker.some_name.socket_keepalive=true -%>
 <%# # I just like comments -%>
 <%# worker.other_name.type=ajp12 (why would you?) -%>
 <%# worker.other_name.socket_keepalive=false -%>
-<%# should be parameterized as: -%>
 <%# -%>
+<%# should be parameterized as: -%>
 <%# $workers_file_content = { -%>
+<%#   worker_lists => ['status', 'some_name,other_name'],
+<%#   worker_mantain => '60',
 <%#   some_name => { -%>
 <%#     type             => 'ajp13', -%>
 <%#     socket_keepalive => 'true', -%>

From dc20448c7f949ccc7ca25f3c9d35b43df8a68b05 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 17:39:45 -0300
Subject: [PATCH 1113/2267] Create URI-worker mappings template for mod_jk

---
 templates/mod/jk/uriworkermap.properties.erb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 templates/mod/jk/uriworkermap.properties.erb

diff --git a/templates/mod/jk/uriworkermap.properties.erb b/templates/mod/jk/uriworkermap.properties.erb
new file mode 100644
index 0000000000..a36ff0d638
--- /dev/null
+++ b/templates/mod/jk/uriworkermap.properties.erb
@@ -0,0 +1,12 @@
+# This file is generated automatically by Puppet - DO NOT EDIT
+# Any manual changes will be overwritten
+<% @mount_file_content.sort.each do |worker,directives| -%>
+
+<%# Places comment before worker mappings -%>
+<% if directives.has_key?('comment') -%>
+# <%= directives['comment'] %>
+<% end -%>
+<% directives['uri_list'].sort.each do |uri| -%>
+<%= uri %> = <%= worker %>
+<% end -%>
+<% end -%>

From 1ec060425d4ccdac14e772d2e00bfbf0b80a6b8a Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 17:40:55 -0300
Subject: [PATCH 1114/2267] Include mappings file management in class
 apache::mod::jk

---
 manifests/mod/jk.pp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index ff62dd68b8..3cc732a4df 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -48,6 +48,9 @@
   # Workers file content
   # See comments in template mod/jk/workers.properties.erb
   $workers_file_content  = [],
+  # Mount file content
+  # See comments in template mod/jk/uriworkermap.properties.erb
+  $mount_file_content  = [],
 ){
 
   include ::apache
@@ -86,4 +89,16 @@
     }
   }
 
+  # Mount file
+  if $mount_file != undef {
+    $mount_path = $mount_file ? {
+      /^\//   => $mount_file,
+      default => "${apache::httpd_dir}/${mount_file}",
+    }
+    file { $mount_path:
+      content => template('apache/mod/jk/uriworkermap.properties.erb'),
+      require => Package['httpd'],
+    }
+  }
+
 }

From 5d6e6d01e7ef3e1f95622f9b00e7dac0fe92063a Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 17:42:39 -0300
Subject: [PATCH 1115/2267] Document URI-worker mappings template for mod_jk

---
 templates/mod/jk/uriworkermap.properties.erb | 28 ++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/templates/mod/jk/uriworkermap.properties.erb b/templates/mod/jk/uriworkermap.properties.erb
index a36ff0d638..4d9eac03f9 100644
--- a/templates/mod/jk/uriworkermap.properties.erb
+++ b/templates/mod/jk/uriworkermap.properties.erb
@@ -1,5 +1,33 @@
 # This file is generated automatically by Puppet - DO NOT EDIT
 # Any manual changes will be overwritten
+<%# -%>
+<%# mount_file_content should be a hash which keys are workers names -%>
+<%# and values are new hashes with two items: -%>
+<%# uri_list - Array with URIs to be mapped to worker -%>
+<%# comment - Optional comment line -%>
+<%# -%>
+<%# Example: -%>
+<%# # Worker 1 -%>
+<%# /context_1/ = worker_1 -%>
+<%# /context_1/* = worker_1 -%>
+<%# -%>
+<%# # Worker 2 -%>
+<%# / = worker_2 -%>
+<%# /context_2/ = worker_2 -%>
+<%# /context_2/* = worker_2 -%>
+<%# -%>
+<%# should be parameterized as: -%>
+<%# $mount_file_content = { -%>
+<%#   worker_1 => { -%>
+<%#     uri_list => ['/context_1/', '/context_1/*'], -%>
+<%#     comment  => 'Worker 1', -%>
+<%#   }, -%>
+<%#   worker_2 => { -%>
+<%#     uri_list => ['/context_2/', '/context_2/*'], -%>
+<%#     comment  => 'Worker 2', -%>
+<%#   }, -%>
+<%# }, -%>
+<%# -%>
 <% @mount_file_content.sort.each do |worker,directives| -%>
 
 <%# Places comment before worker mappings -%>

From c8adc1721a29715375cf8b76e5aea3024c415454 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 17:46:48 -0300
Subject: [PATCH 1116/2267] Include missing tags in template
 mod/jk/workers.properties.erb

---
 templates/mod/jk/workers.properties.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.erb
index 2822178a98..ed3eb6190f 100644
--- a/templates/mod/jk/workers.properties.erb
+++ b/templates/mod/jk/workers.properties.erb
@@ -11,7 +11,7 @@
 <%# Example: -%>
 <%# worker.list = status -%>
 <%# worker.list = some_name,other_name -%>
-<%# worker_mantain = 60 -%>
+<%# worker.mantain = 60 -%>
 <%# # Optional comment -%>
 <%# worker.some_name.type=ajp13 -%>
 <%# worker.some_name.socket_keepalive=true -%>
@@ -21,8 +21,8 @@
 <%# -%>
 <%# should be parameterized as: -%>
 <%# $workers_file_content = { -%>
-<%#   worker_lists => ['status', 'some_name,other_name'],
-<%#   worker_mantain => '60',
+<%#   worker_lists => ['status', 'some_name,other_name'], -%>
+<%#   worker_mantain => '60', -%>
 <%#   some_name => { -%>
 <%#     type             => 'ajp13', -%>
 <%#     socket_keepalive => 'true', -%>

From 895dcca15e6a9377bda01922028f43c910fc751c Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 17:59:31 -0300
Subject: [PATCH 1117/2267] Update README with missing directives for mod_jk
 workers file

---
 README.md | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4085f286da..73b82b98a9 100644
--- a/README.md
+++ b/README.md
@@ -1749,14 +1749,22 @@ class { '::apache::mod::jk':
 
 The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for \*file_content:
 
-**`workers_file_content`**
+**workers\_file\_content**
 
-Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values. For example, the workers file below:
+Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values.  
+Plus, there are two global directives, 'worker.list' and 'worker.mantain'  
+For example, the workers file below:
 
 ```
+worker.list = status
+worker.list = some_name,other_name
+
+worker.mantain = 60
+
 # Optional comment
 worker.some_name.type=ajp13
 worker.some_name.socket_keepalive=true
+
 # I just like comments
 worker.other_name.type=ajp12 (why would you?)
 worker.other_name.socket_keepalive=false
@@ -1766,12 +1774,14 @@ Should be parameterized as:
 
 ```
 $workers_file_content = {
-  some_name  => {
+  worker_lists   => ['status', 'some_name,other_name'],
+  worker_mantain => '60',
+  some_name      => {
     comment          => 'Optional comment',
     type             => 'ajp13',
     socket_keepalive => 'true',
   },
-  other_name => {
+  other_name     => {
     comment          => 'I just like comments',
     type             => 'ajp12',
     socket_keepalive => 'false',

From 8ef78529bae035f112a6dba6d482d20e3c8eed73 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 18:04:26 -0300
Subject: [PATCH 1118/2267] Document in README mod_jk mount file

---
 README.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/README.md b/README.md
index 73b82b98a9..89bc5f07a9 100644
--- a/README.md
+++ b/README.md
@@ -1789,6 +1789,37 @@ $workers_file_content = {
 }
 ```
 
+**mount\_file\_content**
+
+Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an Array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker.  
+For example, the mount file below:
+
+```
+# Worker 1
+/context_1/ = worker_1
+/context_1/* = worker_1
+
+# Worker 2
+/ = worker_2
+/context_2/ = worker_2
+/context_2/* = worker_2
+```
+
+Should be parameterized as:
+
+```
+$mount_file_content = {
+  worker_1 => {
+    uri_list => ['/context_1/', '/context_1/*'],
+    comment  => 'Worker 1',
+  },
+  worker_2 => {
+    uri_list => ['/context_2/', '/context_2/*'],
+    comment  => 'Worker 2',
+  },
+},
+```
+
 ##### Class: `apache::mod::passenger`
 
 Installs and manages [`mod_passenger`][]. For RedHat based systems, please ensure that you meet the minimum requirements as described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux)

From 1e3a889f99ad30ac456bfc73d4e13f49dc29b672 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Wed, 7 Jun 2017 18:08:32 -0300
Subject: [PATCH 1119/2267] Correct typo in apache::mod::jk section of README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 89bc5f07a9..534eaca0a7 100644
--- a/README.md
+++ b/README.md
@@ -1791,7 +1791,7 @@ $workers_file_content = {
 
 **mount\_file\_content**
 
-Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an Array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker.  
+Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker.  
 For example, the mount file below:
 
 ```

From 4ee344df22e49d455675770fe50fd083d2635797 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 12 Jun 2017 16:37:36 -0300
Subject: [PATCH 1120/2267] Correct local variables references in template
 mod/jk.conf.erb

---
 templates/mod/jk.conf.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index b4a3489ee7..37695035fc 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -6,7 +6,7 @@ JkWorkersFile <%= @workers_file %>
 <% end -%>
 <% if @worker_property -%>
 <% @worker_property.sort.each do |property,value| -%>
-JkWorkerProperty <%= @property %>=<%= @value %>
+JkWorkerProperty <%= property %>=<%= value %>
 <% end -%>
 <% end -%>
 <% if @shm_file -%>
@@ -23,12 +23,12 @@ JkMountFileReload <%= @mount_file_reload %>
 <% end -%>
 <% if @mount -%>
 <% @mount.sort.each do |url_prefix,worker_name| -%>
-JkMount <%= @url_prefix %> <%= @worker_name %>
+JkMount <%= url_prefix %> <%= worker_name %>
 <% end -%>
 <% end -%>
 <% if @un_mount -%>
 <% @un_mount.sort.each do |url_prefix,worker_name| -%>
-JkUnMount <%= @url_prefix %> <%= @worker_name %>
+JkUnMount <%= url_prefix %> <%= worker_name %>
 <% end -%>
 <% end -%>
 <% if @auto_alias -%>
@@ -108,12 +108,12 @@ JkAuthTypeIndicator <%= @auth_type_indicator %>
 <% end -%>
 <% if @options -%>
 <% @options.sort.each do |fwd_option| -%>
-JkOptions <%= @fwd_option %>
+JkOptions <%= fwd_option %>
 <% end -%>
 <% end -%>
 <% if @env_var -%>
 <% @env_var.sort.each do |variable,value| -%>
-JkEnvVar <%= @variable %><% if not @value.empty? -%> @value<% end -%>
+JkEnvVar <%= variable %><% if not value.empty? -%> value<% end -%>
 <% end -%>
 <% end -%>
 <% if @strip_session -%>

From ce0ae0d9ca3e913b51f4f5fa86f0c95de46d9ba0 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 12 Jun 2017 16:49:56 -0300
Subject: [PATCH 1121/2267] Remove unwanted indentations in template
 mod/jk.conf.erb

---
 templates/mod/jk.conf.erb | 238 +++++++++++++++++++-------------------
 1 file changed, 120 insertions(+), 118 deletions(-)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 37695035fc..35f37f6023 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -1,121 +1,123 @@
 # This file is generated automatically by Puppet - DO NOT EDIT
 # Any manual changes will be overwritten
 
-<% if @workers_file -%>
-JkWorkersFile <%= @workers_file %>
-<% end -%>
-<% if @worker_property -%>
-<% @worker_property.sort.each do |property,value| -%>
-JkWorkerProperty <%= property %>=<%= value %>
-<% end -%>
-<% end -%>
-<% if @shm_file -%>
-JkShmFile <%= @shm_file %>
-<% end -%>
-<% if @shm_size -%>
-JkShmSize <%= @shm_size %>
-<% end -%>
-<% if @mount_file -%>
-JkMountFile <%= @mount_file %>
-<% end -%>
-<% if @mount_file_reload -%>
-JkMountFileReload <%= @mount_file_reload %>
-<% end -%>
-<% if @mount -%>
-<% @mount.sort.each do |url_prefix,worker_name| -%>
-JkMount <%= url_prefix %> <%= worker_name %>
-<% end -%>
-<% end -%>
-<% if @un_mount -%>
-<% @un_mount.sort.each do |url_prefix,worker_name| -%>
-JkUnMount <%= url_prefix %> <%= worker_name %>
-<% end -%>
-<% end -%>
-<% if @auto_alias -%>
-JkAutoAlias <%= @auto_alias %>
-<% end -%>
-<% if @mount_copy -%>
-JkMountCopy <%= @mount_copy %>
-<% end -%>
-<% if @worker_indicator -%>
-JkWorkerIndicator <%= @worker_indicator %>
-<% end -%>
-<% if @watchdog_interval -%>
-JkWatchdogInterval <%= @watchdog_interval %>
-<% end -%>
-<% if @log_file -%>
-JkLogFile <%= @log_file %>
-<% end -%>
-<% if @log_level -%>
-JkLogLevel <%= @log_level %>
-<% end -%>
-<% if @log_stamp_format -%>
-JkLogStampFormat <%= @log_stamp_format %>
-<% end -%>
-<% if @request_log_format -%>
-JkRequestLogFormat <%= @request_log_format %>
-<% end -%>
-<% if @extract_ssl -%>
-JkExtractSSL <%= @extract_ssl %>
-<% end -%>
-<% if @https_indicator -%>
-JkHTTPSIndicator <%= @https_indicator %>
-<% end -%>
-<% if @sslprotocol_indicator -%>
-JkSSLPROTOCOLIndicator <%= @sslprotocol_indicator %>
-<% end -%>
-<% if @certs_indicator -%>
-JkCERTSIndicator <%= @certs_indicator %>
-<% end -%>
-<% if @cipher_indicator -%>
-JkCIPHERIndicator <%= @cipher_indicator %>
-<% end -%>
-<% if @certchain_prefix -%>
-JkCERTCHAINPrefix <%= @certchain_prefix %>
-<% end -%>
-<% if @session_indicator -%>
-JkSESSIONIndicator <%= @session_indicator %>
-<% end -%>
-<% if @keysize_indicator -%>
-JkKEYSIZEIndicator <%= @keysize_indicator %>
-<% end -%>
-<% if @local_name_indicator -%>
-JkLocalNameIndicator <%= @local_name_indicator %>
-<% end -%>
-<% if @ignore_cl_indicator -%>
-JkIgnoreCLIndicator <%= @ignore_cl_indicator %>
-<% end -%>
-<% if @local_addr_indicator -%>
-JkLocalAddrIndicator <%= @local_addr_indicator %>
-<% end -%>
-<% if @local_port_indicator -%>
-JkLocalPortIndicator <%= @local_port_indicator %>
-<% end -%>
-<% if @remote_host_indicator -%>
-JkRemoteHostIndicator <%= @remote_host_indicator %>
-<% end -%>
-<% if @remote_addr_indicator -%>
-JkRemoteAddrIndicator <%= @remote_addr_indicator %>
-<% end -%>
-<% if @remote_port_indicator -%>
-JkRemotePortIndicator <%= @remote_port_indicator %>
-<% end -%>
-<% if @remote_user_indicator -%>
-JkRemoteUserIndicator <%= @remote_user_indicator %>
-<% end -%>
-<% if @auth_type_indicator -%>
-JkAuthTypeIndicator <%= @auth_type_indicator %>
-<% end -%>
-<% if @options -%>
-<% @options.sort.each do |fwd_option| -%>
-JkOptions <%= fwd_option %>
-<% end -%>
-<% end -%>
-<% if @env_var -%>
-<% @env_var.sort.each do |variable,value| -%>
-JkEnvVar <%= variable %><% if not value.empty? -%> value<% end -%>
-<% end -%>
-<% end -%>
-<% if @strip_session -%>
-JkStripSession <%= @strip_session %>
-<% end -%>
+<IfModule jk_module>
+  <%- if @workers_file -%>
+  JkWorkersFile <%= @workers_file %>
+  <%- end -%>
+  <%- if @worker_property -%>
+  <%- @worker_property.sort.each do |property,value| -%>
+  JkWorkerProperty <%= property %>=<%= value %>
+  <%- end -%>
+  <%- end -%>
+  <%- if @shm_file -%>
+  JkShmFile <%= @shm_file %>
+  <%- end -%>
+  <%- if @shm_size -%>
+  JkShmSize <%= @shm_size %>
+  <%- end -%>
+  <%- if @mount_file -%>
+  JkMountFile <%= @mount_file %>
+  <%- end -%>
+  <%- if @mount_file_reload -%>
+  JkMountFileReload <%= @mount_file_reload %>
+  <%- end -%>
+  <%- if @mount -%>
+  <%- @mount.sort.each do |url_prefix,worker_name| -%>
+  JkMount <%= url_prefix %> <%= worker_name %>
+  <%- end -%>
+  <%- end -%>
+  <%- if @un_mount -%>
+  <%- @un_mount.sort.each do |url_prefix,worker_name| -%>
+  JkUnMount <%= url_prefix %> <%= worker_name %>
+  <%- end -%>
+  <%- end -%>
+  <%- if @auto_alias -%>
+  JkAutoAlias <%= @auto_alias %>
+  <%- end -%>
+  <%- if @mount_copy -%>
+  JkMountCopy <%= @mount_copy %>
+  <%- end -%>
+  <%- if @worker_indicator -%>
+  JkWorkerIndicator <%= @worker_indicator %>
+  <%- end -%>
+  <%- if @watchdog_interval -%>
+  JkWatchdogInterval <%= @watchdog_interval %>
+  <%- end -%>
+  <%- if @log_file -%>
+  JkLogFile <%= @log_file %>
+  <%- end -%>
+  <%- if @log_level -%>
+  JkLogLevel <%= @log_level %>
+  <%- end -%>
+  <%- if @log_stamp_format -%>
+  JkLogStampFormat <%= @log_stamp_format %>
+  <%- end -%>
+  <%- if @request_log_format -%>
+  JkRequestLogFormat <%= @request_log_format %>
+  <%- end -%>
+  <%- if @extract_ssl -%>
+  JkExtractSSL <%= @extract_ssl %>
+  <%- end -%>
+  <%- if @https_indicator -%>
+  JkHTTPSIndicator <%= @https_indicator %>
+  <%- end -%>
+  <%- if @sslprotocol_indicator -%>
+  JkSSLPROTOCOLIndicator <%= @sslprotocol_indicator %>
+  <%- end -%>
+  <%- if @certs_indicator -%>
+  JkCERTSIndicator <%= @certs_indicator %>
+  <%- end -%>
+  <%- if @cipher_indicator -%>
+  JkCIPHERIndicator <%= @cipher_indicator %>
+  <%- end -%>
+  <%- if @certchain_prefix -%>
+  JkCERTCHAINPrefix <%= @certchain_prefix %>
+  <%- end -%>
+  <%- if @session_indicator -%>
+  JkSESSIONIndicator <%= @session_indicator %>
+  <%- end -%>
+  <%- if @keysize_indicator -%>
+  JkKEYSIZEIndicator <%= @keysize_indicator %>
+  <%- end -%>
+  <%- if @local_name_indicator -%>
+  JkLocalNameIndicator <%= @local_name_indicator %>
+  <%- end -%>
+  <%- if @ignore_cl_indicator -%>
+  JkIgnoreCLIndicator <%= @ignore_cl_indicator %>
+  <%- end -%>
+  <%- if @local_addr_indicator -%>
+  JkLocalAddrIndicator <%= @local_addr_indicator %>
+  <%- end -%>
+  <%- if @local_port_indicator -%>
+  JkLocalPortIndicator <%= @local_port_indicator %>
+  <%- end -%>
+  <%- if @remote_host_indicator -%>
+  JkRemoteHostIndicator <%= @remote_host_indicator %>
+  <%- end -%>
+  <%- if @remote_addr_indicator -%>
+  JkRemoteAddrIndicator <%= @remote_addr_indicator %>
+  <%- end -%>
+  <%- if @remote_port_indicator -%>
+  JkRemotePortIndicator <%= @remote_port_indicator %>
+  <%- end -%>
+  <%- if @remote_user_indicator -%>
+  JkRemoteUserIndicator <%= @remote_user_indicator %>
+  <%- end -%>
+  <%- if @auth_type_indicator -%>
+  JkAuthTypeIndicator <%= @auth_type_indicator %>
+  <%- end -%>
+  <%- if @options -%>
+  <%- @options.sort.each do |fwd_option| -%>
+  JkOptions <%= fwd_option %>
+  <%- end -%>
+  <%- end -%>
+  <%- if @env_var -%>
+  <%- @env_var.sort.each do |variable,value| -%>
+  JkEnvVar <%= variable %><% if not value.empty? -%> value<% end -%>
+  <%- end -%>
+  <%- end -%>
+  <%- if @strip_session -%>
+  JkStripSession <%= @strip_session %>
+  <%- end -%>
+</IfModule>

From e4cb3b836d18c7c6d9c3c61bd898502e5dd6f7dc Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 12 Jun 2017 17:55:44 -0300
Subject: [PATCH 1122/2267] Add "Location" tags in template mod/jk.conf.erb

---
 templates/mod/jk.conf.erb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 35f37f6023..5df4915ba9 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -120,4 +120,19 @@
   <%- if @strip_session -%>
   JkStripSession <%= @strip_session %>
   <%- end -%>
+  <%- if @location_list -%>
+  <%- @location_list.each do |location_tag| -%>
+
+  <Location <%= location_tag['Location'] %>>
+    <%- if location_tag.has_key?('Comment') -%>
+    # <%= location_tag['Comment'] %>
+    <%- end -%>
+    <%- location_tag.each do |property,value| -%>
+    <%- if property != 'Comment' and property != 'Location' -%>
+    <%= property %> <%= value %>
+    <%- end -%>
+    <%- end -%>
+  </Location>
+  <%- end -%>
+  <%- end -%>
 </IfModule>

From 658c74d58fab21449381503545e8ab73fa3a6272 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 12 Jun 2017 17:56:09 -0300
Subject: [PATCH 1123/2267] Add comments on "Location" in template
 mod/jk.conf.erb

---
 templates/mod/jk.conf.erb | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 5df4915ba9..155552b85d 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -120,6 +120,35 @@
   <%- if @strip_session -%>
   JkStripSession <%= @strip_session %>
   <%- end -%>
+  <%# -%>
+  <%# Global locations for mod_jk are defined in array location_list -%>
+  <%# Each array item is a hash with quoted* property name as key -%>
+  <%# and value as value itself -%>
+  <%# You can define a comment in a special 'comment' key -%>
+  <%# -%>
+  <%# Example: -%>
+  <%# <Location /jkstatus/> -%>
+  <%#   # Configures jkstatus -%>
+  <%#   JkMount status -%>
+  <%#   Order deny,allow -%>
+  <%#   Deny from all -%>
+  <%#   Allow from 127.0.0.1 -%>
+  <%# </Location> -%>
+  <%# -%>
+  <%# Is defined as: -%>
+  <%# location_list = [ -%>
+  <%#   { -%>
+  <%#     'Location'   => '/jkstatus/', -%>
+  <%#     'Comment'    => 'Configures jkstatus', -%>
+  <%#     'JkMount'    => 'status', -%>
+  <%#     'Order'      => 'deny,allow', -%>
+  <%#     'Deny from'  => 'all', -%>
+  <%#     'Allow from' => '127.0.0.1', -%>
+  <%#   }, -%>
+  <%# ] -%>
+  <%# * Keys must be quoted to alow arbitrary case and/or multi-word keys -%>
+  <%# (BTW, note the case of 'Location' and 'Comment' keys) -%>
+  <%# -%>
   <%- if @location_list -%>
   <%- @location_list.each do |location_tag| -%>
 

From 9348a159c769140690addab80b6374bd5dbe136b Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 12 Jun 2017 17:56:54 -0300
Subject: [PATCH 1124/2267] Include location tags list in class apache::mod::jk

---
 manifests/mod/jk.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 3cc732a4df..6e86772f94 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -45,6 +45,9 @@
   $options               = [],
   $env_var               = {},
   $strip_session         = undef,
+  # Location list
+  # See comments in template mod/jk.conf.erb
+  $location_list         = [],
   # Workers file content
   # See comments in template mod/jk/workers.properties.erb
   $workers_file_content  = [],

From cf231f191c9ccd312cca2ab073d6e74d83e181f9 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 12 Jun 2017 17:57:07 -0300
Subject: [PATCH 1125/2267] Correct indentation in class apache::mod::jk

---
 manifests/mod/jk.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 6e86772f94..30dbbe7522 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -53,7 +53,7 @@
   $workers_file_content  = [],
   # Mount file content
   # See comments in template mod/jk/uriworkermap.properties.erb
-  $mount_file_content  = [],
+  $mount_file_content    = [],
 ){
 
   include ::apache

From 598271e24264797dbe643924a3d4095406324e5f Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 13 Jun 2017 16:19:34 -0300
Subject: [PATCH 1126/2267] Correct empty parameters in class apache::mod::jk

---
 manifests/mod/jk.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 30dbbe7522..e25a339fa3 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -50,10 +50,10 @@
   $location_list         = [],
   # Workers file content
   # See comments in template mod/jk/workers.properties.erb
-  $workers_file_content  = [],
+  $workers_file_content  = {},
   # Mount file content
   # See comments in template mod/jk/uriworkermap.properties.erb
-  $mount_file_content    = [],
+  $mount_file_content    = {},
 ){
 
   include ::apache

From 1837d885025e9f66e6bc3a1cc00333693735059b Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 22 Jun 2017 11:14:21 -0700
Subject: [PATCH 1127/2267] (MODULES-5121) Allow ssl.conf to have better
 defaults

ssl.conf location must be maintained to avoid duplicate ssl.confs being
created in both mod_dir and confd_dir on rhel7 package updates, and must
also be based on the parameter values passed into the base apache class
for custom directories.
---
 manifests/init.pp            | 18 ++++++++-
 manifests/mod/ssl.pp         |  2 +-
 manifests/params.pp          |  5 ---
 spec/classes/mod/ssl_spec.rb | 72 +++++++++++++++++++++++++-----------
 4 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a6d4e41fce..298c0526c8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -69,7 +69,7 @@
   $logroot_mode           = $::apache::params::logroot_mode,
   $log_level              = $::apache::params::log_level,
   $log_formats            = {},
-  $ssl_file               = $::apache::params::ssl_file,
+  $ssl_file               = undef,
   $ports_file             = $::apache::params::ports_file,
   $docroot                = $::apache::params::docroot,
   $apache_version         = $::apache::version::default,
@@ -103,6 +103,22 @@
     default => '(event|itk|prefork|worker)'
   }
 
+  if $::osfamily == 'RedHat' and $::apache::version::distrelease == '7' {
+    # On redhat 7 the ssl.conf lives in /etc/httpd/conf.d (the confd_dir)
+    # when all other module configs live in /etc/httpd/conf.modules.d (the
+    # mod_dir). On all other platforms and versions, ssl.conf lives in the
+    # mod_dir. This should maintain the expected location of ssl.conf
+    $_ssl_file = $ssl_file ? {
+      undef   => "${apache::confd_dir}/ssl.conf",
+      default =>  $ssl_file
+    }
+  } else {
+    $_ssl_file = $ssl_file ? {
+      undef   => "${apache::mod_dir}/ssl.conf",
+      default =>  $ssl_file
+    }
+  }
+
   if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans
     validate_re($mpm_module, $valid_mpms_re)
   }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index e48c2d40a3..341e7bf1de 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -118,7 +118,7 @@
   # $_apache_version
   file { 'ssl.conf':
     ensure  => file,
-    path    => $::apache::ssl_file,
+    path    => $::apache::_ssl_file,
     mode    => $::apache::file_mode,
     content => template('apache/mod/ssl.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
diff --git a/manifests/params.pp b/manifests/params.pp
index 5864477a37..5fbc95e6ab 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -74,7 +74,6 @@
     $vhost_dir            = "${httpd_dir}/conf.d"
     $vhost_enable_dir     = undef
     $conf_file            = 'httpd.conf'
-    $ssl_file             = "${confd_dir}/ssl.conf"
     $ports_file           = "${conf_dir}/ports.conf"
     $pidfile              = 'run/httpd.pid'
     $logroot              = '/var/log/httpd'
@@ -215,7 +214,6 @@
     $vhost_dir           = "${httpd_dir}/sites-available"
     $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
     $conf_file           = 'apache2.conf'
-    $ssl_file             = "${mod_dir}/ssl.conf"
     $ports_file          = "${conf_dir}/ports.conf"
     $pidfile             = "\${APACHE_PID_FILE}"
     $logroot             = '/var/log/apache2'
@@ -356,7 +354,6 @@
     $vhost_dir        = "${httpd_dir}/Vhosts"
     $vhost_enable_dir = undef
     $conf_file        = 'httpd.conf'
-    $ssl_file         = "${mod_dir}/ssl.conf"
     $ports_file       = "${conf_dir}/ports.conf"
     $pidfile          = '/var/run/httpd.pid'
     $logroot          = '/var/log/apache24'
@@ -427,7 +424,6 @@
     $vhost_dir        = "${httpd_dir}/vhosts.d"
     $vhost_enable_dir = undef
     $conf_file        = 'httpd.conf'
-    $ssl_file         = "${mod_dir}/ssl.conf"
     $ports_file       = "${conf_dir}/ports.conf"
     $logroot          = '/var/log/apache2'
     $logroot_mode     = undef
@@ -496,7 +492,6 @@
     $vhost_dir           = "${httpd_dir}/sites-available"
     $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
     $conf_file           = 'httpd.conf'
-    $ssl_file            = "${mod_dir}/ssl.conf"
     $ports_file          = "${conf_dir}/ports.conf"
     $pidfile             = '/var/run/httpd2.pid'
     $logroot             = '/var/log/apache2'
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 5b6f8abe4a..18816bbd9f 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -18,31 +18,59 @@
     it { expect { catalogue }.to raise_error(Puppet::Error, /Unsupported osfamily:/) }
   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',
-        :is_pe                  => false,
-      }
-    end
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_apache__mod('ssl') }
-    it { is_expected.to contain_package('mod_ssl') }
-    context 'with a custom package_name parameter' do
-      let :params do
-        { :package_name => 'httpd24-mod_ssl' }
+  context 'on a RedHat' do
+    context '6 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',
+          :is_pe                  => false,
+        }
       end
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('ssl') }
-      it { is_expected.to contain_package('httpd24-mod_ssl') }
-      it { is_expected.not_to contain_package('mod_ssl') }
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/cache/mod_ssl/scache\(512000\)"$})}
+      it { is_expected.to contain_package('mod_ssl') }
+      it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.d/ssl.conf') }
+      context 'with a custom package_name parameter' do
+        let :params do
+          { :package_name => 'httpd24-mod_ssl' }
+        end
+        it { is_expected.to contain_class('apache::params') }
+        it { is_expected.to contain_apache__mod('ssl') }
+        it { is_expected.to contain_package('httpd24-mod_ssl') }
+        it { is_expected.not_to contain_package('mod_ssl') }
+        it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/cache/mod_ssl/scache\(512000\)"$})}
+      end
+    end
+    context '7 OS with custom directories for PR#1635' do
+      let :facts do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+        }
+      end
+      let :pre_condition do
+        "class { 'apache':
+          confd_dir           => '/etc/httpd/conf.puppet.d',
+          default_mods        => false,
+          default_vhost       => false,
+          mod_dir             => '/etc/httpd/conf.modules.puppet.d',
+          vhost_dir           => '/etc/httpd/conf.puppet.d',
+        }"
+      end
+      it { is_expected.to contain_package('mod_ssl') }
+      it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.puppet.d/ssl.conf') }
     end
   end
 

From 95ed3396e6e2a0ae7c8e0213234e28819ff2c038 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Mon, 26 Jun 2017 13:56:13 -0700
Subject: [PATCH 1128/2267] (MODULES-5144) Prep for puppet 5

---
 metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index fa59827e98..ab052dcc89 100644
--- a/metadata.json
+++ b/metadata.json
@@ -9,7 +9,7 @@
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.12.0 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 5.0.0"}
   ],
   "data_provider": null,
   "operatingsystem_support": [
@@ -72,7 +72,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.7.0 < 5.0.0"
+      "version_requirement": ">= 4.7.0 < 6.0.0"
     }
   ],
   "description": "Module for Apache configuration"

From 0d94a2db0bb2042ab86b883b9800ce53e2440e25 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 30 Jun 2017 17:44:49 -0300
Subject: [PATCH 1129/2267] Remove duplicated include from apache::mod::jk

---
 manifests/mod/jk.pp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index e25a339fa3..89a3388555 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -56,8 +56,6 @@
   $mount_file_content    = {},
 ){
 
-  include ::apache
-
   # Provides important variables
   include ::apache
   # Manages basic module config

From f1c0f2b1bc81fa8a0e74d67a96725c5c405088a5 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 30 Jun 2017 17:45:24 -0300
Subject: [PATCH 1130/2267] Include basic test spec for apache::mod::jk

---
 spec/classes/mod/jk_spec.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 spec/classes/mod/jk_spec.rb

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
new file mode 100644
index 0000000000..49d124cf21
--- /dev/null
+++ b/spec/classes/mod/jk_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'apache::mod::jk', :type => :class do
+  it_behaves_like 'a mod class, without including apache'
+
+  it { is_expected.to compile }
+  it { is_expected.to create_class('apache::mod::jk') }
+  it { is_expected.to contain_class('apache') }
+  it { is_expected.to contain_apache__mod('jk') }
+  it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
+    :ensure  => file,
+    :content => /<IfModule jk_module>/),
+    :content => /<\/IfModule>/),
+  }
+
+end

From fd88a5121f26b062611a12e819d2b88504e09577 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 30 Jun 2017 17:56:07 -0300
Subject: [PATCH 1131/2267] Correct typo in spec test for apache::mod::jk

---
 spec/classes/mod/jk_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 49d124cf21..39fa501b2b 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -9,8 +9,8 @@
   it { is_expected.to contain_apache__mod('jk') }
   it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
     :ensure  => file,
-    :content => /<IfModule jk_module>/),
-    :content => /<\/IfModule>/),
-  }
+    :content => /<IfModule jk_module>/,
+    :content => /<\/IfModule>/,
+  )}
 
 end

From 7f8bf4167ca6619b56ece832053fc4f84fed4b88 Mon Sep 17 00:00:00 2001
From: Richard Anderson <lordbink@users.noreply.github.com>
Date: Mon, 3 Jul 2017 04:59:19 -0500
Subject: [PATCH 1132/2267] Fix single quoted string (#1623)

single_quote_string_with_variables:ERROR:single quoted string containing a variable found
---
 examples/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/vhost.pp b/examples/vhost.pp
index 28edf25cf0..440a56d4b0 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -165,7 +165,7 @@
     { comment      => 'Rewrite to lower case',
       rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
       rewrite_map  => ['lc int:tolower'],
-      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+      rewrite_rule => ["(.*) \${lc:\$1} [R=301,L]"],
     }
   ],
 }

From 56a7d6dcbc919797fdd2ba187973f431bc156375 Mon Sep 17 00:00:00 2001
From: Diomidis Spinellis <dds@aueb.gr>
Date: Mon, 3 Jul 2017 13:10:20 +0300
Subject: [PATCH 1133/2267] MODULES-4946 Add HttpProtocolOptions support
 (#1629)

---
 README.md                                  |  5 +++++
 manifests/init.pp                          |  2 ++
 manifests/params.pp                        |  5 +++++
 manifests/vhost.pp                         | 18 ++++++++++++++++++
 spec/acceptance/apache_parameters_spec.rb  | 17 +++++++++++++++++
 spec/defines/vhost_spec.rb                 |  3 +++
 templates/httpd.conf.erb                   |  4 ++++
 templates/vhost/_http_protocol_options.erb |  1 +
 8 files changed, 55 insertions(+)
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 manifests/init.pp
 mode change 100644 => 100755 spec/acceptance/apache_parameters_spec.rb
 mode change 100644 => 100755 templates/httpd.conf.erb
 create mode 100644 templates/vhost/_http_protocol_options.erb

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 0cae55acf0..c36821b5a2
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@
 [`gentoo/puppet-portage`]: https://github.com/gentoo/puppet-portage
 
 [Hash]: https://docs.puppetlabs.com/puppet/latest/reference/lang_data_hash.html
+[`HttpProtocolOptions`]: http://httpd.apache.org/docs/current/mod/core.html#httpprotocoloptions
 
 [`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional
 [`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include
@@ -998,6 +999,10 @@ Sets the Apache server's base configuration directory. This is useful for specia
 - **Gentoo**: `/etc/apache2`
 - **Red Hat**: `/etc/httpd`
 
+##### http_protocol_options`
+
+Specifies the strictness of HTTP protocol checks. Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`, `RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`. Default '`Strict LenientMethods Allow0.9`'.
+
 ##### `keepalive`
 
 Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. Valid options: 'Off', 'On'. Default: 'On'.
diff --git a/manifests/init.pp b/manifests/init.pp
old mode 100644
new mode 100755
index 298c0526c8..b07760b373
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -60,6 +60,7 @@
   $manage_group           = true,
   $user                   = $::apache::params::user,
   $group                  = $::apache::params::group,
+  $http_protocol_options  = $::apache::params::http_protocol_options,
   $supplementary_groups   = [],
   $keepalive              = $::apache::params::keepalive,
   $keepalive_timeout      = $::apache::params::keepalive_timeout,
@@ -333,6 +334,7 @@
     # - $error_documents
     # - $error_documents_path
     # - $apxs_workaround
+    # - $http_protocol_options
     # - $keepalive
     # - $keepalive_timeout
     # - $max_keepalive_requests
diff --git a/manifests/params.pp b/manifests/params.pp
index 5fbc95e6ab..7bda90b8aa 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -144,6 +144,7 @@
       'nss' => 'libmodnss.so',
     }
     $conf_template        = 'apache/httpd.conf.erb'
+    $http_protocol_options  = undef
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
@@ -271,6 +272,7 @@
       'shib2' => $shib2_lib,
     }
     $conf_template          = 'apache/httpd.conf.erb'
+    $http_protocol_options  = undef
     $keepalive              = 'Off'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
@@ -396,6 +398,7 @@
     $mod_libs         = {
     }
     $conf_template        = 'apache/httpd.conf.erb'
+    $http_protocol_options = undef
     $keepalive            = 'Off'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
@@ -463,6 +466,7 @@
     $mod_libs         = {
     }
     $conf_template        = 'apache/httpd.conf.erb'
+    $http_protocol_options = undef
     $keepalive            = 'Off'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
@@ -529,6 +533,7 @@
       'php53'          => '/usr/lib64/apache2/mod_php5.so',
     }
     $conf_template          = 'apache/httpd.conf.erb'
+    $http_protocol_options  = undef
     $keepalive              = 'Off'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e28dff266d..4c143c0d1e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -64,6 +64,7 @@
   $error_log_file              = undef,
   $error_log_pipe              = undef,
   $error_log_syslog            = undef,
+  $http_protocol_options       = undef,
   $modsec_audit_log            = undef,
   $modsec_audit_log_file       = undef,
   $modsec_audit_log_pipe       = undef,
@@ -187,6 +188,13 @@
   validate_bool($ip_based)
   validate_bool($access_log)
   validate_bool($error_log)
+  if $http_protocol_options != undef {
+    validate_re($http_protocol_options, '^((Strict|Unsafe)?\s*(\b(RegisteredMethods|LenientMethods))?\s*(\b(Allow0\.9|Require1\.0))?)$',
+    "${http_protocol_options} is not supported for http_protocol_options.
+    Allowed value is any sequence of the following alternative values:
+    'Strict' or Unsafe, 'RegisteredMethods' or 'LenientMethods', and
+    'Allow0.9' or 'Require1.0'.")
+  }
   if $modsec_audit_log != undef {
     validate_bool($modsec_audit_log)
   }
@@ -1156,6 +1164,16 @@
     }
   }
 
+  # Template uses:
+  # - $http_protocol_options
+  if $http_protocol_options {
+    concat::fragment { "${name}-http_protocol_options":
+      target  => "${priority_real}${filename}.conf",
+      order   => 350,
+      content => template('apache/vhost/_http_protocol_options.erb'),
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
old mode 100644
new mode 100755
index aa7a5c8b55..cc600f1cdd
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -237,6 +237,23 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     end
   end
 
+  describe 'http_protocol_options' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    # Actually >= 2.4.24, but the minor version is not provided
+    if $apache_version >= '2.4'
+      describe file($conf_file) do
+	it { is_expected.to be_file }
+	it { is_expected.to contain 'HttpProtocolOptions Unsafe RegisteredMethods Require1.0' }
+      end
+    end
+  end
+
   describe 'server_root' do
     describe 'setup' do
       it 'applies cleanly' do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 4796f0bf2a..3fcca3a6f3 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -407,6 +407,7 @@
           'krb_auth_realms'             => ['EXAMPLE.ORG','EXAMPLE.NET'],
           'krb_5keytab'                 => '/tmp/keytab5',
           'krb_local_user_mapping'      => 'off',
+	  'http_protocol_options'       => 'Strict LenientMethods Allow0.9',
           'keepalive'                   => 'on',
           'keepalive_timeout'           => '100',
           'max_keepalive_requests'      => '1000',
@@ -617,6 +618,8 @@
         :content => /^\s+KrbSaveCredentials\soff$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
         :content => /^\s+KrbVerifyKDC\son$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
+        :content => /^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
         :content => /^\s+KeepAlive\son$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
old mode 100644
new mode 100755
index 4c22b17d77..c01859adeb
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -11,6 +11,10 @@ KeepAlive <%= @keepalive %>
 MaxKeepAliveRequests <%= @max_keepalive_requests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
 LimitRequestFieldSize <%= @limitreqfieldsize %>
+# Actually >= 2.4.24, but the minor version is not provided
+<%- if @http_protocol_options and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+HttpProtocolOptions <%= @http_protocol_options %>
+<%- end -%>
 
 <%- if @rewrite_lock and scope.function_versioncmp([@apache_version, '2.2']) <= 0 -%>
 RewriteLock <%= @rewrite_lock %>
diff --git a/templates/vhost/_http_protocol_options.erb b/templates/vhost/_http_protocol_options.erb
new file mode 100644
index 0000000000..efad7e6d85
--- /dev/null
+++ b/templates/vhost/_http_protocol_options.erb
@@ -0,0 +1 @@
+HttpProtocolOptions <%= @http_protocol_options %>

From d619dd71375e16da785811f32fa78b3b38232075 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 3 Jul 2017 15:50:06 -0300
Subject: [PATCH 1134/2267] Include RHEL 6 context and facts required by
 included classes

---
 spec/classes/mod/jk_spec.rb | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 39fa501b2b..fcd439b4a9 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -3,14 +3,26 @@
 describe 'apache::mod::jk', :type => :class do
   it_behaves_like 'a mod class, without including apache'
 
-  it { is_expected.to compile }
-  it { is_expected.to create_class('apache::mod::jk') }
-  it { is_expected.to contain_class('apache') }
-  it { is_expected.to contain_apache__mod('jk') }
-  it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
-    :ensure  => file,
-    :content => /<IfModule jk_module>/,
-    :content => /<\/IfModule>/,
-  )}
+  context "with only required facts and no parameters" do
+
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '6',
+      }
+    end
+
+    it { is_expected.to compile }
+    it { is_expected.to create_class('apache::mod::jk') }
+    it { is_expected.to contain_class('apache') }
+    it { is_expected.to contain_apache__mod('jk') }
+    it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
+      :ensure  => file,
+      :content => /<IfModule jk_module>/,
+      :content => /<\/IfModule>/,
+    )}
+
+  end
 
 end

From 1c2a3d84b9cdec7c254d8cc23b456c22bd42877b Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 3 Jul 2017 16:13:15 -0300
Subject: [PATCH 1135/2267] Remove parameters from jk.conf file in mod::jk spec
 test

---
 spec/classes/mod/jk_spec.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index fcd439b4a9..e4e3dafdc6 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -17,11 +17,7 @@
     it { is_expected.to create_class('apache::mod::jk') }
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('jk') }
-    it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
-      :ensure  => file,
-      :content => /<IfModule jk_module>/,
-      :content => /<\/IfModule>/,
-    )}
+    it { is_expected.to contain_file('jk.conf') }
 
   end
 

From 156a087ef4d82295f909cb1d4141d32c5ec64a39 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 3 Jul 2017 16:15:36 -0300
Subject: [PATCH 1136/2267] Revert "Remove parameters from jk.conf file in
 mod::jk spec test"

This reverts commit 1c2a3d84b9cdec7c254d8cc23b456c22bd42877b.
---
 spec/classes/mod/jk_spec.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index e4e3dafdc6..fcd439b4a9 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -17,7 +17,11 @@
     it { is_expected.to create_class('apache::mod::jk') }
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('jk') }
-    it { is_expected.to contain_file('jk.conf') }
+    it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
+      :ensure  => file,
+      :content => /<IfModule jk_module>/,
+      :content => /<\/IfModule>/,
+    )}
 
   end
 

From 4b0b1c0f05f9c6a93c5d7bc5b9c37f921b7e6524 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 3 Jul 2017 16:59:34 -0300
Subject: [PATCH 1137/2267] Add correctly quoted parameters for jk.conf file in
 mod::jk spec test

---
 spec/classes/mod/jk_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index fcd439b4a9..16d691a4c5 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -18,7 +18,7 @@
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('jk') }
     it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
-      :ensure  => file,
+      :ensure  => 'file',
       :content => /<IfModule jk_module>/,
       :content => /<\/IfModule>/,
     )}

From 725b54cad64c847ef7027ce5310273d1b275a0bf Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 3 Jul 2017 17:52:04 -0300
Subject: [PATCH 1138/2267] Include shared context in apache::mod::jk spec test

---
 spec/classes/mod/jk_spec.rb | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 16d691a4c5..7b59fc8349 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -3,6 +3,18 @@
 describe 'apache::mod::jk', :type => :class do
   it_behaves_like 'a mod class, without including apache'
 
+  shared_examples 'minimal resources' do
+    it { is_expected.to compile }
+    it { is_expected.to create_class('apache::mod::jk') }
+    it { is_expected.to contain_class('apache') }
+    it { is_expected.to contain_apache__mod('jk') }
+    it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
+      :ensure  => 'file',
+      :content => /<IfModule jk_module>/,
+      :content => /<\/IfModule>/,
+    )}
+  end
+
   context "with only required facts and no parameters" do
 
     let :facts do
@@ -13,15 +25,7 @@
       }
     end
 
-    it { is_expected.to compile }
-    it { is_expected.to create_class('apache::mod::jk') }
-    it { is_expected.to contain_class('apache') }
-    it { is_expected.to contain_apache__mod('jk') }
-    it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
-      :ensure  => 'file',
-      :content => /<IfModule jk_module>/,
-      :content => /<\/IfModule>/,
-    )}
+    it_behaves_like 'minimal resources'
 
   end
 

From 7b246f954f041ec9b6ec5914669ddb6244292aa8 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 3 Jul 2017 17:52:31 -0300
Subject: [PATCH 1139/2267] Include compile deps test in apache::mod::jk spec
 test

---
 spec/classes/mod/jk_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 7b59fc8349..e8ef1ef21e 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -5,6 +5,7 @@
 
   shared_examples 'minimal resources' do
     it { is_expected.to compile }
+    it { is_expected.to compile.with_all_deps }
     it { is_expected.to create_class('apache::mod::jk') }
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('jk') }

From cd3af621fb2124efa82942e0ba2537af2c75ea7e Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 4 Jul 2017 13:51:27 +0100
Subject: [PATCH 1140/2267] (MODULES-4946) no tests HttpProtocolOptions ubuntu

---
 spec/acceptance/apache_parameters_spec.rb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index cc600f1cdd..eb4eb27b4e 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -238,18 +238,20 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
   end
 
   describe 'http_protocol_options' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"
-        apply_manifest(pp, :catch_failures => true)
+    # Actually >= 2.4.24, but the minor version is not provided
+    # https://bugs.launchpad.net/ubuntu/+source/apache2/2.4.7-1ubuntu4.15
+    # basically older versions of the ubuntu package cause issues
+    if $apache_version >= '2.4' and fact('operatingsystem') != 'Ubuntu'
+      describe 'setup' do
+        it 'applies cleanly' do
+          pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"
+          apply_manifest(pp, :catch_failures => true)
+        end
       end
-    end
 
-    # Actually >= 2.4.24, but the minor version is not provided
-    if $apache_version >= '2.4'
       describe file($conf_file) do
-	it { is_expected.to be_file }
-	it { is_expected.to contain 'HttpProtocolOptions Unsafe RegisteredMethods Require1.0' }
+        it { is_expected.to be_file }
+        it { is_expected.to contain 'HttpProtocolOptions Unsafe RegisteredMethods Require1.0' }
       end
     end
   end

From 310f694a0c6d7aef9cab56948c10276dc3f22031 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 4 Jul 2017 13:25:27 -0300
Subject: [PATCH 1141/2267] Include multiple file lines check in
 apache::mod::jk spec test

---
 spec/classes/mod/jk_spec.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index e8ef1ef21e..8c04ec8d54 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -9,11 +9,8 @@
     it { is_expected.to create_class('apache::mod::jk') }
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('jk') }
-    it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]').with(
-      :ensure  => 'file',
-      :content => /<IfModule jk_module>/,
-      :content => /<\/IfModule>/,
-    )}
+    it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]') }
+    verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
   end
 
   context "with only required facts and no parameters" do

From 11b47a0500bf023f18ded5435283ed4c04f4e3e8 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 4 Jul 2017 13:48:27 -0300
Subject: [PATCH 1142/2267] Move catalogue check from shared example in
 apache::mod::jk spec test

---
 spec/classes/mod/jk_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 8c04ec8d54..8d9f299b3f 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -10,7 +10,6 @@
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('jk') }
     it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]') }
-    verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
   end
 
   context "with only required facts and no parameters" do
@@ -24,6 +23,7 @@
     end
 
     it_behaves_like 'minimal resources'
+    verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
 
   end
 

From 3903714b8e449b92b7f4b2535a55f14c6a409c34 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Tue, 4 Jul 2017 14:05:45 -0300
Subject: [PATCH 1143/2267] Move "verify_contents" to "it" block in mod::jk
 spec test

---
 spec/classes/mod/jk_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 8d9f299b3f..af17f45be7 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -23,7 +23,9 @@
     end
 
     it_behaves_like 'minimal resources'
-    verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
+    it {
+      verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
+    }
 
   end
 

From a9247596c1444193f6a09b3f1eab60e8db1fca08 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Wed, 5 Jul 2017 09:54:44 +0100
Subject: [PATCH 1144/2267] (MODULES-4883) pairing down tests for sles

---
 spec/acceptance/apache_parameters_spec.rb |  4 +-
 spec/acceptance/default_mods_spec.rb      | 64 ++++++++++++-----------
 spec/acceptance/mod_php_spec.rb           |  2 +-
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index eb4eb27b4e..3a52bb3934 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -240,8 +240,8 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
   describe 'http_protocol_options' do
     # Actually >= 2.4.24, but the minor version is not provided
     # https://bugs.launchpad.net/ubuntu/+source/apache2/2.4.7-1ubuntu4.15
-    # basically older versions of the ubuntu package cause issues
-    if $apache_version >= '2.4' and fact('operatingsystem') != 'Ubuntu'
+    # basically versions of the ubuntu or sles  apache package cause issue
+    if $apache_version >= '2.4' && (fact('operatingsystem') != 'Ubuntu' || fact('operatingsystem') != 'SLES')
       describe 'setup' do
         it 'applies cleanly' do
           pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index ab241e4551..35706c9a28 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -19,38 +19,40 @@ class { 'apache':
     end
   end
 
-  describe 'no default mods and failing' do
-    before :all do
-      pp = <<-PP
-      include apache::params
-      class { 'apache': default_mods => false, service_ensure => stopped, }
-      PP
-      apply_manifest(pp)
-    end
-    # Using puppet_apply as a helper
-    it 'should apply with errors' do
-      pp = <<-EOS
-        class { 'apache':
-          default_mods => false,
-        }
-        apache::vhost { 'defaults.example.com':
-          docroot     => '#{$doc_root}/defaults',
-          aliases     => {
-            alias => '/css',
-            path  => '#{$doc_root}/css',
-          },
-          directories => [
-	        {
-              'path'            => "#{$doc_root}/admin",
-              'auth_basic_fake' => 'demo demopass',
-            }
-          ],
-          setenv      => 'TEST1 one',
-        }
-      EOS
+  unless (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12')
+    describe 'no default mods and failing' do
+      before :all do
+        pp = <<-PP
+        include apache::params
+        class { 'apache': default_mods => false, service_ensure => stopped, }
+        PP
+        apply_manifest(pp)
+      end
+      # Using puppet_apply as a helper
+      it 'should apply with errors' do
+        pp = <<-EOS
+          class { 'apache':
+            default_mods => false,
+          }
+          apache::vhost { 'defaults.example.com':
+            docroot     => '#{$doc_root}/defaults',
+            aliases     => {
+              alias => '/css',
+              path  => '#{$doc_root}/css',
+            },
+            directories => [
+            {
+                'path'            => "#{$doc_root}/admin",
+                'auth_basic_fake' => 'demo demopass',
+              }
+            ],
+            setenv      => 'TEST1 one',
+          }
+        EOS
 
-      apply_manifest(pp, { :expect_failures => true })
-    end
+        apply_manifest(pp, { :expect_failures => true })
+      end
+  end
 
     describe service($service_name) do
       it { is_expected.not_to be_running }
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 45b901fae9..59be2baaa3 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-unless (fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') == '12.0')
+unless (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12')
   describe 'apache::mod::php class' do
     context "default php config" do
       it 'succeeds in puppeting php' do

From f7870c0117ccd8591725aecdd60ddae401cdf40d Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Thu, 6 Jul 2017 09:51:47 +0100
Subject: [PATCH 1145/2267] (MODULES-4883) clean os logic around test

---
 spec/acceptance/apache_parameters_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 3a52bb3934..2ba1a44529 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -241,7 +241,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     # Actually >= 2.4.24, but the minor version is not provided
     # https://bugs.launchpad.net/ubuntu/+source/apache2/2.4.7-1ubuntu4.15
     # basically versions of the ubuntu or sles  apache package cause issue
-    if $apache_version >= '2.4' && (fact('operatingsystem') != 'Ubuntu' || fact('operatingsystem') != 'SLES')
+    if $apache_version >= '2.4' && fact('operatingsystem') !~ /Ubuntu|SLES/
       describe 'setup' do
         it 'applies cleanly' do
           pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"

From 39f9d4ec418139b6b9c933794fef6e238d96c1e5 Mon Sep 17 00:00:00 2001
From: "Angel L. Mateo" <amateo@um.es>
Date: Thu, 6 Jul 2017 13:08:49 +0200
Subject: [PATCH 1146/2267] Don't install proxy_html package in ubuntu xenial

In Ubuntu Xenial, proxy_html module is include in apache standard
packages, so don't try to install it
---
 manifests/params.pp | 74 ++++++++++++++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 25 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 7bda90b8aa..0682173415 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -231,34 +231,58 @@
     if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') < 0) {
       # Only the major version is used here
       $php_version = '5'
+      $mod_packages = {
+        'auth_cas'              => 'libapache2-mod-auth-cas',
+        'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_mellon'           => 'libapache2-mod-auth-mellon',
+        'authnz_pam'            => 'libapache2-mod-authnz-pam',
+        'dav_svn'               => 'libapache2-svn',
+        'fastcgi'               => 'libapache2-mod-fastcgi',
+        'fcgid'                 => 'libapache2-mod-fcgid',
+        'geoip'                 => 'libapache2-mod-geoip',
+        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+        'lookup_identity'       => 'libapache2-mod-lookup-identity',
+        'nss'                   => 'libapache2-mod-nss',
+        'pagespeed'             => 'mod-pagespeed-stable',
+        'passenger'             => 'libapache2-mod-passenger',
+        'perl'                  => 'libapache2-mod-perl2',
+        'phpXXX'                => 'libapache2-mod-phpXXX',
+        'proxy_html'            => 'libapache2-mod-proxy-html',
+        'python'                => 'libapache2-mod-python',
+        'rpaf'                  => 'libapache2-mod-rpaf',
+        'security'              => 'libapache2-modsecurity',
+        'shib2'                 => 'libapache2-mod-shib2',
+        'suphp'                 => 'libapache2-mod-suphp',
+        'wsgi'                  => 'libapache2-mod-wsgi',
+        'xsendfile'             => 'libapache2-mod-xsendfile',
+      }
     } else {
       # major.minor version used since Debian stretch and Ubuntu Xenial
       $php_version = '7.0'
-    }
-    $mod_packages        = {
-      'auth_cas'              => 'libapache2-mod-auth-cas',
-      'auth_kerb'             => 'libapache2-mod-auth-kerb',
-      'auth_mellon'           => 'libapache2-mod-auth-mellon',
-      'authnz_pam'            => 'libapache2-mod-authnz-pam',
-      'dav_svn'               => 'libapache2-svn',
-      'fastcgi'               => 'libapache2-mod-fastcgi',
-      'fcgid'                 => 'libapache2-mod-fcgid',
-      'geoip'                 => 'libapache2-mod-geoip',
-      'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
-      'lookup_identity'       => 'libapache2-mod-lookup-identity',
-      'nss'                   => 'libapache2-mod-nss',
-      'pagespeed'             => 'mod-pagespeed-stable',
-      'passenger'             => 'libapache2-mod-passenger',
-      'perl'                  => 'libapache2-mod-perl2',
-      'phpXXX'                => 'libapache2-mod-phpXXX',
-      'proxy_html'            => 'libapache2-mod-proxy-html',
-      'python'                => 'libapache2-mod-python',
-      'rpaf'                  => 'libapache2-mod-rpaf',
-      'security'              => 'libapache2-modsecurity',
-      'shib2'                 => 'libapache2-mod-shib2',
-      'suphp'                 => 'libapache2-mod-suphp',
-      'wsgi'                  => 'libapache2-mod-wsgi',
-      'xsendfile'             => 'libapache2-mod-xsendfile',
+      $mod_packages = {
+        'auth_cas'              => 'libapache2-mod-auth-cas',
+        'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_mellon'           => 'libapache2-mod-auth-mellon',
+        'authnz_pam'            => 'libapache2-mod-authnz-pam',
+        'dav_svn'               => 'libapache2-svn',
+        'fastcgi'               => 'libapache2-mod-fastcgi',
+        'fcgid'                 => 'libapache2-mod-fcgid',
+        'geoip'                 => 'libapache2-mod-geoip',
+        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+        'lookup_identity'       => 'libapache2-mod-lookup-identity',
+        'nss'                   => 'libapache2-mod-nss',
+        'pagespeed'             => 'mod-pagespeed-stable',
+        'passenger'             => 'libapache2-mod-passenger',
+        'perl'                  => 'libapache2-mod-perl2',
+        'phpXXX'                => 'libapache2-mod-phpXXX',
+        'python'                => 'libapache2-mod-python',
+        'rpaf'                  => 'libapache2-mod-rpaf',
+        'security'              => 'libapache2-modsecurity',
+        'shib2'                 => 'libapache2-mod-shib2',
+        'suphp'                 => 'libapache2-mod-suphp',
+        'wsgi'                  => 'libapache2-mod-wsgi',
+        'xsendfile'             => 'libapache2-mod-xsendfile',
+      }
     }
     $error_log           = 'error.log'
     $scriptalias         = '/usr/lib/cgi-bin'

From ce8224a706e388bc62f05efdc47279d5e08831a9 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Thu, 6 Jul 2017 14:40:34 -0700
Subject: [PATCH 1147/2267] (MODULES-5187) mysnc puppet 5 and ruby 2.4

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4981b25921..0c6f904c32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,10 +22,10 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.3.1
+  - rvm: 2.4.0
     bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0"
-  - rvm: 2.1.7
+    env: PUPPET_GEM_VERSION="~> 5.0"
+  - rvm: 2.1.9
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:

From c8328c3518877abaa5d821724ce2e6ecef5179ac Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 7 Jul 2017 16:56:13 -0300
Subject: [PATCH 1148/2267] Remove template mod/jk.conf.erb comment
 indentations from target file

---
 templates/mod/jk.conf.erb | 58 +++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 155552b85d..8a8a102706 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -120,35 +120,35 @@
   <%- if @strip_session -%>
   JkStripSession <%= @strip_session %>
   <%- end -%>
-  <%# -%>
-  <%# Global locations for mod_jk are defined in array location_list -%>
-  <%# Each array item is a hash with quoted* property name as key -%>
-  <%# and value as value itself -%>
-  <%# You can define a comment in a special 'comment' key -%>
-  <%# -%>
-  <%# Example: -%>
-  <%# <Location /jkstatus/> -%>
-  <%#   # Configures jkstatus -%>
-  <%#   JkMount status -%>
-  <%#   Order deny,allow -%>
-  <%#   Deny from all -%>
-  <%#   Allow from 127.0.0.1 -%>
-  <%# </Location> -%>
-  <%# -%>
-  <%# Is defined as: -%>
-  <%# location_list = [ -%>
-  <%#   { -%>
-  <%#     'Location'   => '/jkstatus/', -%>
-  <%#     'Comment'    => 'Configures jkstatus', -%>
-  <%#     'JkMount'    => 'status', -%>
-  <%#     'Order'      => 'deny,allow', -%>
-  <%#     'Deny from'  => 'all', -%>
-  <%#     'Allow from' => '127.0.0.1', -%>
-  <%#   }, -%>
-  <%# ] -%>
-  <%# * Keys must be quoted to alow arbitrary case and/or multi-word keys -%>
-  <%# (BTW, note the case of 'Location' and 'Comment' keys) -%>
-  <%# -%>
+  <%-# -%>
+  <%-# Global locations for mod_jk are defined in array location_list -%>
+  <%-# Each array item is a hash with quoted* property name as key -%>
+  <%-# and value as value itself -%>
+  <%-# You can define a comment in a special 'comment' key -%>
+  <%-# -%>
+  <%-# Example: -%>
+  <%-# <Location /jkstatus/> -%>
+  <%-#   # Configures jkstatus -%>
+  <%-#   JkMount status -%>
+  <%-#   Order deny,allow -%>
+  <%-#   Deny from all -%>
+  <%-#   Allow from 127.0.0.1 -%>
+  <%-# </Location> -%>
+  <%-# -%>
+  <%-# Is defined as: -%>
+  <%-# location_list = [ -%>
+  <%-#   { -%>
+  <%-#     'Location'   => '/jkstatus/', -%>
+  <%-#     'Comment'    => 'Configures jkstatus', -%>
+  <%-#     'JkMount'    => 'status', -%>
+  <%-#     'Order'      => 'deny,allow', -%>
+  <%-#     'Deny from'  => 'all', -%>
+  <%-#     'Allow from' => '127.0.0.1', -%>
+  <%-#   }, -%>
+  <%-# ] -%>
+  <%-# * Keys must be quoted to allow arbitrary case and/or multi-word keys -%>
+  <%-# (BTW, note the case of 'Location' and 'Comment' keys) -%>
+  <%-# -%>
   <%- if @location_list -%>
   <%- @location_list.each do |location_tag| -%>
 

From 0703f0c710368708e0d2a60fd7bd75fcfbf892a9 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 7 Jul 2017 16:56:52 -0300
Subject: [PATCH 1149/2267] Include necessary defaults for log and shared RAM
 files

---
 manifests/mod/jk.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 89a3388555..a1b29568be 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -11,7 +11,7 @@
 class apache::mod::jk (
   $workers_file          = undef,
   $worker_property       = {},
-  $shm_file              = undef,
+  $shm_file              = "${::apache::logroot}/jk-runtime-status",
   $shm_size              = undef,
   $mount_file            = undef,
   $mount_file_reload     = undef,
@@ -21,7 +21,7 @@
   $mount_copy            = undef,
   $worker_indicator      = undef,
   $watchdog_interval     = undef,
-  $log_file              = undef,
+  $log_file              = "${::apache::logroot}/mod_jk.log",
   $log_level             = undef,
   $log_stamp_format      = undef,
   $request_log_format    = undef,

From bf7f6028b04fafc0e8e4be0a705c9a44a3350340 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 7 Jul 2017 17:36:41 -0300
Subject: [PATCH 1150/2267] Mock inherited parameters in spec test for mod::jk

---
 spec/classes/mod/jk_spec.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index af17f45be7..45874eb321 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -22,6 +22,13 @@
       }
     end
 
+    let :params do
+      {
+        :log_file => '/var/log/httpd/mod_jk.log',
+        :shm_file => '/var/log/httpd/jk-runtime-status',
+      }
+    end
+
     it_behaves_like 'minimal resources'
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])

From cc0c87c000ddb0fbfc2d57716551ec546b9c89e3 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Fri, 7 Jul 2017 17:48:55 -0300
Subject: [PATCH 1151/2267] Use precondition to inherit params in spec test for
 mod::jk

---
 spec/classes/mod/jk_spec.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 45874eb321..5a67345ef3 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -22,11 +22,8 @@
       }
     end
 
-    let :params do
-      {
-        :log_file => '/var/log/httpd/mod_jk.log',
-        :shm_file => '/var/log/httpd/jk-runtime-status',
-      }
+    let(:pre_condition) do
+      'include apache'
     end
 
     it_behaves_like 'minimal resources'

From 26bf77e9fbab2d3d8b177eab2a01bf82495e182f Mon Sep 17 00:00:00 2001
From: TP Honey <tphoney@users.noreply.github.com>
Date: Mon, 10 Jul 2017 16:29:32 +0100
Subject: [PATCH 1152/2267] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index e2f208cf9a..6ea11d0a42 100644
--- a/README.md
+++ b/README.md
@@ -2400,7 +2400,6 @@ Sets the [`ForceType`][] directive, which forces Apache to serve all matching fi
 
 Lets Apache set custom content character sets per directory and/or file extension
 
-
 ##### `headers`
 
 Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Valid options: A string, an array of strings, or undef. Default: undef.

From f1d08ac4cea76e8288ffd0a706f91410df9b7e36 Mon Sep 17 00:00:00 2001
From: CA App Synthetic Monitor <sedpe03@ca.com>
Date: Mon, 10 Jul 2017 17:34:19 +0200
Subject: [PATCH 1153/2267] When absolute path is specified for
 access_log_file/error_log_file, don't prepend logbase (#1633)

* When absolute path is specified for access_log_file/error_log_file, don't prepend logbase
---
 manifests/vhost.pp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4c143c0d1e..9e925ca800 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -400,7 +400,12 @@
 
   if $access_log and !$access_logs {
     if $access_log_file {
-      $_logs_dest = "${logroot}/${access_log_file}"
+      if $access_log_file =~ /^\// {
+        # Absolute path provided - don't prepend $logroot
+        $_logs_dest = $access_log_file
+      } else {
+        $_logs_dest = "${logroot}/${access_log_file}"
+      }
     } elsif $access_log_pipe {
       $_logs_dest = $access_log_pipe
     } elsif $access_log_syslog {
@@ -423,7 +428,12 @@
   }
 
   if $error_log_file {
-    $error_log_destination = "${logroot}/${error_log_file}"
+    if $error_log_file =~ /^\// {
+      # Absolute path provided - don't prepend $logroot
+      $error_log_destination = $error_log_file
+    } else {
+      $error_log_destination = "${logroot}/${error_log_file}"
+    }
   } elsif $error_log_pipe {
     $error_log_destination = $error_log_pipe
   } elsif $error_log_syslog {

From a5f3bf2477ddfb391447c55e5e0b3cd4f87540d9 Mon Sep 17 00:00:00 2001
From: Matthew Gyurgyik <matthew@pyther.net>
Date: Mon, 10 Jul 2017 11:41:58 -0400
Subject: [PATCH 1154/2267] ensure installed for package mod_security_crs
 (#1594)

---
 manifests/mod/security.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 4fab446500..ce057a554f 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -53,7 +53,7 @@
 
   if $crs_package  {
     package { $crs_package:
-      ensure => 'latest',
+      ensure => 'installed',
       before => [
         File[$::apache::confd_dir],
         File[$modsec_dir],

From c5cb0f841a3dde1a7b8644b6771a4d23874aaf98 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 12 Jul 2017 13:37:42 -0700
Subject: [PATCH 1155/2267] (MODULES-4404) remove params from apache class doc

parameters loadfile_name, ssl_stapling, and ssl_stapling_return_errors are all valid parameters but none of them are in the apache class as is claimed in the README. this commit removes them.
---
 README.md | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/README.md b/README.md
index 297c758c20..7402de419a 100755
--- a/README.md
+++ b/README.md
@@ -1029,12 +1029,6 @@ Specifies the location where [Apache module][Apache modules] files are stored. D
 
 > **Note**: Do not configure this parameter manually without special reason.
 
-##### `loadfile_name`
-
-Sets the [`LoadFile`] directive's filename. Valid options: Filenames in the format `\*.load`.
-
-This can be used to set the module load order.
-
 ##### `log_level`
 
 Changes the error log's verbosity. Valid options: 'alert', 'crit', 'debug', 'emerg', 'error', 'info', 'notice', 'warn'. Default: 'warn'.
@@ -1211,18 +1205,6 @@ Determines whether Puppet should use a specific command to restart the HTTPD ser
 
 Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile). Default: undef. It is possible to override this on a vhost level.
 
-##### `ssl_stapling`
-
-Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Valid options: Boolean. Default: false. It is possible to override this on a vhost level.
-
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
-
-##### `ssl_stapling_return_errors`
-
-Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive. No default. It is possible to override this on a vhost level.
-
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
-
 ##### `timeout`
 
 Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request. Default: 120.

From cc59a4bf56a6dd303320efebd3da6903ccab1d5f Mon Sep 17 00:00:00 2001
From: Jennifer Solman <jennifer.solman@jennifer.solman-C02N923VG3QR>
Date: Wed, 12 Jul 2017 16:26:52 -0700
Subject: [PATCH 1156/2267] (MODULES-2808) documented mod_nss

added entry in README for mod_nss module
---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 297c758c20..6e413e4fac 100755
--- a/README.md
+++ b/README.md
@@ -1781,6 +1781,17 @@ Installs and configures [`mod_negotiation`][].
 - `force_language_priority`: Sets the `ForceLanguagePriority` option. Valid option: String. Default: `Prefer Fallback`.
 - `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module. Default: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN', 'zh-TW' ]
 
+##### Class: `apache::mod::nss`
+
+An SSL provider for Apache using the NSS crypto libraries
+
+**Parameters within `apache::mod::nss`:**
+
+- `transfer_log`: path to access.log
+- `error_log`: path to error.log
+- `passwd_file`: path to file used for NSSPassPhraseDialog directive 
+- `port`: SSL port. Defaults to 8443
+
 ##### Class: `apache::mod::pagespeed`
 
 Installs and manages [`mod_pagespeed`][], a Google module that rewrites web pages to reduce latency and bandwidth.

From 7df1777bd9797e73c769c3a37591d626cbe61569 Mon Sep 17 00:00:00 2001
From: Jennifer Solman <Jen.Solman@gmail.com>
Date: Thu, 13 Jul 2017 15:14:59 -0700
Subject: [PATCH 1157/2267] (MODULES-2808) documentation

added "(see [`apache::mod::nss`][])" note to entry in modules list
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e413e4fac..951e978f4f 100755
--- a/README.md
+++ b/README.md
@@ -1420,7 +1420,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `mime`
 * `mime_magic`\*
 * `negotiation`
-* `nss`\*
+* `nss`\* (see [`apache::mod::nss`][])
 * `pagespeed` (see [`apache::mod::pagespeed`][])
 * `passenger`\* (see [`apache::mod::passenger`][])
 * `perl`

From 83d51d8e9d6d7706bd27e5a95a07205efdc87960 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:57:25 +0200
Subject: [PATCH 1158/2267] bump stdlib to 4.13.1 to get datatypes

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index ab052dcc89..12d26bf58e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -8,7 +8,7 @@
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.12.0 < 5.0.0"},
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.13.1 < 5.0.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 5.0.0"}
   ],
   "data_provider": null,

From 109731afb92cbe54ac62ee92bc4a0ce8423c0db2 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:58:19 +0200
Subject: [PATCH 1159/2267] bump to minimal recommended concat version

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 12d26bf58e..2cc613e014 100644
--- a/metadata.json
+++ b/metadata.json
@@ -9,7 +9,7 @@
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.13.1 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 5.0.0"}
+    {"name":"puppetlabs/concat","version_requirement":">= 2.2.1 < 5.0.0"}
   ],
   "data_provider": null,
   "operatingsystem_support": [

From 3c8d106e1f9c08b990f8a1b0d4ce25d4ed6fdab7 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 22:13:10 +0200
Subject: [PATCH 1160/2267] replace validate_* with datatypes in service.pp

---
 manifests/service.pp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/manifests/service.pp b/manifests/service.pp
index f90097d0bb..ff082dccbf 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -17,19 +17,17 @@
 #
 #
 class apache::service (
-  $service_name   = $::apache::params::service_name,
-  $service_enable = true,
-  $service_ensure = 'running',
-  $service_manage = true,
-  $service_restart = undef
+  $service_name           = $::apache::params::service_name,
+  Boolean $service_enable = true,
+  $service_ensure         = 'running',
+  Boolean $service_manage = true,
+  $service_restart        = undef
 ) {
+
   # The base class must be included first because parameter defaults depend on it
   if ! defined(Class['apache::params']) {
     fail('You must include the apache::params class before using any apache defined resources')
   }
-  validate_bool($service_enable)
-  validate_bool($service_manage)
-
   case $service_ensure {
     true, false, 'running', 'stopped': {
       $_service_ensure = $service_ensure

From 2f299ecca96b9714f2fbb94722e0baa6c1708205 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 22:14:45 +0200
Subject: [PATCH 1161/2267] replace validate_* with datatypes in ldap.pp

---
 manifests/mod/authnz_ldap.pp |  7 ++++---
 manifests/mod/ldap.pp        | 22 ++++++++++------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 033c1be514..0451a7150c 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,9 +1,10 @@
 # lint:ignore:variable_is_lowercase required for compatibility
 class apache::mod::authnz_ldap (
-  $verify_server_cert = true,
-  $verifyServerCert   = undef,
-  $package_name       = undef,
+  Boolean $verify_server_cert = true,
+  $verifyServerCert           = undef,
+  $package_name               = undef,
 ) {
+
   include ::apache
   include '::apache::mod::ldap'
   ::apache::mod { 'authnz_ldap':
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index c3fbb2611c..3e51592227 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -1,19 +1,17 @@
 class apache::mod::ldap (
-  $apache_version                = undef,
-  $package_name                  = undef,
-  $ldap_trusted_global_cert_file = undef,
-  $ldap_trusted_global_cert_type = 'CA_BASE64',
-  $ldap_shared_cache_size        = undef,
-  $ldap_cache_entries            = undef,
-  $ldap_cache_ttl                = undef,
-  $ldap_opcache_entries          = undef,
-  $ldap_opcache_ttl              = undef,
+  $apache_version                                  = undef,
+  $package_name                                    = undef,
+  $ldap_trusted_global_cert_file                   = undef,
+  Optional[String] $ldap_trusted_global_cert_type  = 'CA_BASE64',
+  $ldap_shared_cache_size                          = undef,
+  $ldap_cache_entries                              = undef,
+  $ldap_cache_ttl                                  = undef,
+  $ldap_opcache_entries                            = undef,
+  $ldap_opcache_ttl                                = undef,
 ){
+
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
-  if ($ldap_trusted_global_cert_file) {
-    validate_string($ldap_trusted_global_cert_type)
-  }
   ::apache::mod { 'ldap':
     package => $package_name,
   }

From edcb5ebc1e202054319c942a985c25060b25415c Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 22:15:37 +0200
Subject: [PATCH 1162/2267] replace validate_* with datatypes in passenger.pp

---
 manifests/mod/passenger.pp | 60 ++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 35b4eff22d..e8a0d999b4 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -1,40 +1,38 @@
 class apache::mod::passenger (
-  $passenger_conf_file              = $::apache::params::passenger_conf_file,
-  $passenger_conf_package_file      = $::apache::params::passenger_conf_package_file,
-  $passenger_high_performance       = undef,
-  $passenger_pool_idle_time         = undef,
-  $passenger_max_request_queue_size = undef,
-  $passenger_max_requests           = undef,
-  $passenger_spawn_method           = undef,
-  $passenger_stat_throttle_rate     = undef,
-  $rack_autodetect                  = undef,
-  $rails_autodetect                 = undef,
-  $passenger_root                   = $::apache::params::passenger_root,
-  $passenger_ruby                   = $::apache::params::passenger_ruby,
-  $passenger_default_ruby           = $::apache::params::passenger_default_ruby,
-  $passenger_max_pool_size          = undef,
-  $passenger_min_instances          = undef,
-  $passenger_max_instances_per_app  = undef,
-  $passenger_use_global_queue       = undef,
-  $passenger_app_env                = undef,
-  $passenger_log_file               = undef,
-  $passenger_log_level              = undef,
-  $passenger_data_buffer_dir        = undef,
-  $manage_repo                      = true,
-  $mod_package                      = undef,
-  $mod_package_ensure               = undef,
-  $mod_lib                          = undef,
-  $mod_lib_path                     = undef,
-  $mod_id                           = undef,
-  $mod_path                         = undef,
+  $passenger_conf_file                                                                   = $::apache::params::passenger_conf_file,
+  $passenger_conf_package_file                                                           = $::apache::params::passenger_conf_package_file,
+  $passenger_high_performance                                                            = undef,
+  $passenger_pool_idle_time                                                              = undef,
+  $passenger_max_request_queue_size                                                      = undef,
+  $passenger_max_requests                                                                = undef,
+  Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method = undef,
+  $passenger_stat_throttle_rate                                                          = undef,
+  $rack_autodetect                                                                       = undef,
+  $rails_autodetect                                                                      = undef,
+  $passenger_root                                                                        = $::apache::params::passenger_root,
+  $passenger_ruby                                                                        = $::apache::params::passenger_ruby,
+  $passenger_default_ruby                                                                = $::apache::params::passenger_default_ruby,
+  $passenger_max_pool_size                                                               = undef,
+  $passenger_min_instances                                                               = undef,
+  $passenger_max_instances_per_app                                                       = undef,
+  $passenger_use_global_queue                                                            = undef,
+  $passenger_app_env                                                                     = undef,
+  Optional[Stdlib::Absoluteppath] $passenger_log_file                                    = undef,
+  $passenger_log_level                                                                   = undef,
+  $passenger_data_buffer_dir                                                             = undef,
+  $manage_repo                                                                           = true,
+  $mod_package                                                                           = undef,
+  $mod_package_ensure                                                                    = undef,
+  $mod_lib                                                                               = undef,
+  $mod_lib_path                                                                          = undef,
+  $mod_id                                                                                = undef,
+  $mod_path                                                                              = undef,
 ) inherits ::apache::params {
+
   include ::apache
   if $passenger_spawn_method {
     validate_re($passenger_spawn_method, '(^smart$|^direct$|^smart-lv2$|^conservative$)', "${passenger_spawn_method} is not permitted for passenger_spawn_method. Allowed values are 'smart', 'direct', 'smart-lv2', or 'conservative'.")
   }
-  if $passenger_log_file {
-    validate_absolute_path($passenger_log_file)
-  }
 
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {

From 10b326c79d5f6386a939efebedaf37456dee60be Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 22:18:04 +0200
Subject: [PATCH 1163/2267] replace validate_* with datatypes in status.pp

---
 manifests/mod/status.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index d30a690de8..c1f92d8e94 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -26,14 +26,14 @@
 #  }
 #
 class apache::mod::status (
-  $allow_from      = ['127.0.0.1','::1'],
-  $extended_status = 'On',
-  $apache_version  = undef,
-  $status_path     = '/server-status',
+  Array $allow_from = ['127.0.0.1','::1'],
+  $extended_status  = 'On',
+  $apache_version   = undef,
+  $status_path      = '/server-status',
 ) inherits ::apache::params {
+
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
-  validate_array($allow_from)
   validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
   ::apache::mod { 'status': }
   # Template uses $allow_from, $extended_status, $_apache_version, $status_path

From 8f995e6076e946a23c27f4740a017c0c85fe8cea Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:40:05 +0200
Subject: [PATCH 1164/2267] replace validate_* with datatypes in php.pp

---
 manifests/mod/php.pp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 9b3b5b8b6c..e087e4b3e5 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -1,14 +1,15 @@
 class apache::mod::php (
-  $package_name   = undef,
-  $package_ensure = 'present',
-  $path           = undef,
-  $extensions     = ['.php'],
-  $content        = undef,
-  $template       = 'apache/mod/php.conf.erb',
-  $source         = undef,
-  $root_group     = $::apache::params::root_group,
-  $php_version    = $::apache::params::php_version,
+  $package_name     = undef,
+  $package_ensure   = 'present',
+  $path             = undef,
+  Array $extensions = ['.php'],
+  $content          = undef,
+  $template         = 'apache/mod/php.conf.erb',
+  $source           = undef,
+  $root_group       = $::apache::params::root_group,
+  $php_version      = $::apache::params::php_version,
 ) inherits apache::params {
+
   include ::apache
   $mod = "php${php_version}"
 
@@ -21,7 +22,6 @@
   else {
     fail('apache::mod::php requires apache::mod::prefork or apache::mod::itk; please enable mpm_module => \'prefork\' or mpm_module => \'itk\' on Class[\'apache\']')
   }
-  validate_array($extensions)
 
   if $source and ($content or $template != 'apache/mod/php.conf.erb') {
     warning('source and content or template parameters are provided. source parameter will be used')

From bb2320d2f2da58c0d1cef3f63df66d134d171dcb Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:41:03 +0200
Subject: [PATCH 1165/2267] replace validate_* with datatypes in
 custom_config.pp

---
 manifests/custom_config.pp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 188f3ba820..6bffa05c7f 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -1,13 +1,13 @@
 # See README.md for usage information
 define apache::custom_config (
-  $ensure         = 'present',
-  $confdir        = $::apache::confd_dir,
-  $content        = undef,
-  $priority       = '25',
-  $source         = undef,
-  $verify_command = $::apache::params::verify_command,
-  $verify_config  = true,
-  $filename       = undef,
+  Enum['absent', 'present'] $ensure = 'present',
+  $confdir                          = $::apache::confd_dir,
+  $content                          = undef,
+  $priority                         = '25',
+  $source                           = undef,
+  $verify_command                   = $::apache::params::verify_command,
+  Boolean $verify_config            = true,
+  $filename                         = undef,
 ) {
 
   if $content and $source {
@@ -18,12 +18,6 @@
     fail('One of $content and $source must be specified.')
   }
 
-  validate_re($ensure, '^(present|absent)$',
-  "${ensure} is not supported for ensure.
-  Allowed values are 'present' and 'absent'.")
-
-  validate_bool($verify_config)
-
   if $filename {
     $_filename = $filename
   } else {

From 4ea09787bb34ea40f7e8b1f86e7b8c3beb6fb5f6 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:44:01 +0200
Subject: [PATCH 1166/2267] replace validate_* with datatypes in ext_filter.pp

---
 manifests/mod/ext_filter.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/mod/ext_filter.pp b/manifests/mod/ext_filter.pp
index aa14c10259..11550320c2 100644
--- a/manifests/mod/ext_filter.pp
+++ b/manifests/mod/ext_filter.pp
@@ -1,10 +1,7 @@
 class apache::mod::ext_filter(
-  $ext_filter_define = undef
+  Optional[Hash] $ext_filter_define = undef
 ) {
   include ::apache
-  if $ext_filter_define {
-    validate_hash($ext_filter_define)
-  }
 
   ::apache::mod { 'ext_filter': }
 

From a70b40025c18aa2d35044c04fe82ef3b6aa0776f Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:44:48 +0200
Subject: [PATCH 1167/2267] replace validate_* with datatypes in authnz_ldap.pp

---
 manifests/mod/authnz_ldap.pp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 0451a7150c..d18de0e30e 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -18,8 +18,6 @@
     $_verify_server_cert = $verify_server_cert
   }
 
-  validate_bool($_verify_server_cert)
-
   # Template uses:
   # - $_verify_server_cert
   file { 'authnz_ldap.conf':

From 5fdf7ea91456a2e5167c91ce806fe297dd13ef19 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:45:35 +0200
Subject: [PATCH 1168/2267] replace validate_* with datatypes in dir.pp

---
 manifests/mod/dir.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index e41aa86ad6..3c994d3e13 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -2,10 +2,10 @@
 # Parameters:
 # - $indexes provides a string for the DirectoryIndex directive http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
 class apache::mod::dir (
-  $dir     = 'public_html',
-  $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
+  $dir                   = 'public_html',
+  Array[String] $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
 ) {
-  validate_array($indexes)
+
   include ::apache
   ::apache::mod { 'dir': }
 

From 22cef0d29476c8afd0cb844fb19aeca50f3585df Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:48:18 +0200
Subject: [PATCH 1169/2267] replace validate_* with datatypes in
 proxy_balancer.pp

---
 manifests/mod/proxy_balancer.pp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index fdb4b831ad..dbc86df427 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -1,12 +1,9 @@
 class apache::mod::proxy_balancer(
-  $manager        = false,
-  $manager_path   = '/balancer-manager',
-  $allow_from     = ['127.0.0.1','::1'],
-  $apache_version = $::apache::apache_version,
+  Boolean $manager                   = false,
+  Stdlib::Absolutepath $manager_path = '/balancer-manager',
+  Array $allow_from                  = ['127.0.0.1','::1'],
+  $apache_version                    = $::apache::apache_version,
 ) {
-  validate_bool($manager)
-  validate_string($manager_path)
-  validate_array($allow_from)
 
   include ::apache::mod::proxy
   include ::apache::mod::proxy_http

From 2de8fc77c4ece09db197624762088dcdd0cef8d5 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:50:45 +0200
Subject: [PATCH 1170/2267] replace validate_* with datatypes in ssl.pp

---
 manifests/mod/ssl.pp | 48 ++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 341e7bf1de..d27b6b8eeb 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,23 +1,24 @@
 class apache::mod::ssl (
-  $ssl_compression            = false,
-  $ssl_cryptodevice           = 'builtin',
-  $ssl_options                = [ 'StdEnvVars' ],
-  $ssl_openssl_conf_cmd       = undef,
-  $ssl_ca                     = undef,
-  $ssl_cipher                 = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
-  $ssl_honorcipherorder       = true,
-  $ssl_protocol               = [ 'all', '-SSLv2', '-SSLv3' ],
-  $ssl_proxy_protocol         = [],
-  $ssl_pass_phrase_dialog     = 'builtin',
-  $ssl_random_seed_bytes      = '512',
-  $ssl_sessioncache           = $::apache::params::ssl_sessioncache,
-  $ssl_sessioncachetimeout    = '300',
-  $ssl_stapling               = false,
-  $ssl_stapling_return_errors = undef,
-  $ssl_mutex                  = undef,
-  $apache_version             = undef,
-  $package_name               = undef,
+  Boolean $ssl_compression                                  = false,
+  $ssl_cryptodevice                                         = 'builtin',
+  $ssl_options                                              = [ 'StdEnvVars' ],
+  $ssl_openssl_conf_cmd                                     = undef,
+  $ssl_ca                                                   = undef,
+  $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
+  Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
+  $ssl_protocol                                             = [ 'all', '-SSLv2', '-SSLv3' ],
+  Array $ssl_proxy_protocol                                 = [],
+  $ssl_pass_phrase_dialog                                   = 'builtin',
+  $ssl_random_seed_bytes                                    = '512',
+  String $ssl_sessioncache                                  = $::apache::params::ssl_sessioncache,
+  $ssl_sessioncachetimeout                                  = '300',
+  Boolean $ssl_stapling                                     = false,
+  Optional[Boolean] $ssl_stapling_return_errors             = undef,
+  $ssl_mutex                                                = undef,
+  $apache_version                                           = undef,
+  $package_name                                             = undef,
 ) inherits ::apache::params {
+
   include ::apache
   include ::apache::mod::mime
   $_apache_version = pick($apache_version, $apache::apache_version)
@@ -52,11 +53,6 @@
     }
   }
 
-  validate_bool($ssl_compression)
-
-  validate_array($ssl_proxy_protocol)
-  validate_string($ssl_sessioncache)
-
   if is_bool($ssl_honorcipherorder) {
     $_ssl_honorcipherorder = $ssl_honorcipherorder
   } else {
@@ -67,12 +63,6 @@
     }
   }
 
-  validate_bool($ssl_stapling)
-
-  if $ssl_stapling_return_errors != undef {
-    validate_bool($ssl_stapling_return_errors)
-  }
-
   $stapling_cache = $::osfamily ? {
     'debian'  => "\${APACHE_RUN_DIR}/ocsp(32768)",
     'redhat'  => '/run/httpd/ssl_stapling(32768)',

From 5384437ee4c46778fc9e7cbc32780e362ad66459 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:51:49 +0200
Subject: [PATCH 1171/2267] replace validate_* with datatypes in auth_cas.pp

---
 manifests/mod/auth_cas.pp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 673cfb103d..00de62242a 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -1,7 +1,7 @@
 class apache::mod::auth_cas (
-  $cas_login_url,
-  $cas_validate_url,
-  $cas_cookie_path           = $::apache::params::cas_cookie_path,
+  String $cas_login_url,
+  String $cas_validate_url,
+  String $cas_cookie_path    = $::apache::params::cas_cookie_path,
   $cas_cookie_path_mode      = '0750',
   $cas_version               = 2,
   $cas_debug                 = 'Off',
@@ -25,8 +25,6 @@
   $suppress_warning          = false,
 ) inherits ::apache::params {
 
-  validate_string($cas_login_url, $cas_validate_url, $cas_cookie_path)
-
   if $::osfamily == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')
   }

From 77182ad43df79e01bcb4e6934d0e1f131aa30f3e Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:53:15 +0200
Subject: [PATCH 1172/2267] replace validate_* with datatypes in dumpio.pp

---
 manifests/mod/dumpio.pp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/dumpio.pp b/manifests/mod/dumpio.pp
index 62276162d3..c79f6da38c 100644
--- a/manifests/mod/dumpio.pp
+++ b/manifests/mod/dumpio.pp
@@ -1,10 +1,8 @@
 class apache::mod::dumpio(
-  $dump_io_input  = 'Off',
-  $dump_io_output = 'Off',
+  Enum['Off', 'On', 'off', 'on'] $dump_io_input  = 'Off',
+  Enum['Off', 'On', 'off', 'on'] $dump_io_output = 'Off',
 ) {
   include ::apache
-  validate_re(downcase($dump_io_input), '^(on|off)$', "${dump_io_input} is not supported for dump_io_input.  Allowed values are 'On' and 'Off'.")
-  validate_re(downcase($dump_io_output), '^(on|off)$', "${dump_io_output} is not supported for dump_io_output.  Allowed values are 'On' and 'Off'.")
 
   ::apache::mod { 'dumpio': }
   file{'dumpio.conf':

From 70fcc3d70a2c07059293b3c61481fd76707b8fed Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:54:07 +0200
Subject: [PATCH 1173/2267] replace validate_* with datatypes in status.pp

---
 manifests/mod/status.pp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index c1f92d8e94..54d0d88871 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -26,15 +26,14 @@
 #  }
 #
 class apache::mod::status (
-  Array $allow_from = ['127.0.0.1','::1'],
-  $extended_status  = 'On',
-  $apache_version   = undef,
-  $status_path      = '/server-status',
+  Array $allow_from                               = ['127.0.0.1','::1'],
+  Enum['On', 'Off', 'on', 'off'] $extended_status = 'On',
+  $apache_version                                 = undef,
+  $status_path                                    = '/server-status',
 ) inherits ::apache::params {
 
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
-  validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
   ::apache::mod { 'status': }
   # Template uses $allow_from, $extended_status, $_apache_version, $status_path
   file { 'status.conf':

From 9fb5f79bbe03379b291e35c660ef1cc5ad9f3b54 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 11 May 2017 23:55:52 +0200
Subject: [PATCH 1174/2267] replace validate_* with datatypes in passenger.pp

---
 manifests/mod/passenger.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index e8a0d999b4..3b17d3db3e 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -17,7 +17,7 @@
   $passenger_max_instances_per_app                                                       = undef,
   $passenger_use_global_queue                                                            = undef,
   $passenger_app_env                                                                     = undef,
-  Optional[Stdlib::Absoluteppath] $passenger_log_file                                    = undef,
+  Optional[Stdlib::Absolutepath] $passenger_log_file                                     = undef,
   $passenger_log_level                                                                   = undef,
   $passenger_data_buffer_dir                                                             = undef,
   $manage_repo                                                                           = true,
@@ -30,9 +30,6 @@
 ) inherits ::apache::params {
 
   include ::apache
-  if $passenger_spawn_method {
-    validate_re($passenger_spawn_method, '(^smart$|^direct$|^smart-lv2$|^conservative$)', "${passenger_spawn_method} is not permitted for passenger_spawn_method. Allowed values are 'smart', 'direct', 'smart-lv2', or 'conservative'.")
-  }
 
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {

From 0e5af25d81cb60bc0311eadcc3c9d42b47036907 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 12 May 2017 00:27:50 +0200
Subject: [PATCH 1175/2267] replace validate_* with datatypes in init.pp

---
 manifests/init.pp | 170 +++++++++++++++++++++-------------------------
 1 file changed, 76 insertions(+), 94 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index b07760b373..94f4cd5a09 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,91 +13,83 @@
 # Sample Usage:
 #
 class apache (
-  $apache_name            = $::apache::params::apache_name,
-  $service_name           = $::apache::params::service_name,
-  $default_mods           = true,
-  $default_vhost          = true,
-  $default_charset        = undef,
-  $default_confd_files    = true,
-  $default_ssl_vhost      = false,
-  $default_ssl_cert       = $::apache::params::default_ssl_cert,
-  $default_ssl_key        = $::apache::params::default_ssl_key,
-  $default_ssl_chain      = undef,
-  $default_ssl_ca         = undef,
-  $default_ssl_crl_path   = undef,
-  $default_ssl_crl        = undef,
-  $default_ssl_crl_check  = undef,
-  $default_type           = 'none',
-  $dev_packages           = $::apache::params::dev_packages,
-  $ip                     = undef,
-  $service_enable         = true,
-  $service_manage         = true,
-  $service_ensure         = 'running',
-  $service_restart        = undef,
-  $purge_configs          = true,
-  $purge_vhost_dir        = undef,
-  $purge_vdir             = false,
-  $serveradmin            = 'root@localhost',
-  $sendfile               = 'On',
-  $error_documents        = false,
-  $timeout                = '120',
-  $httpd_dir              = $::apache::params::httpd_dir,
-  $server_root            = $::apache::params::server_root,
-  $conf_dir               = $::apache::params::conf_dir,
-  $confd_dir              = $::apache::params::confd_dir,
-  $vhost_dir              = $::apache::params::vhost_dir,
-  $vhost_enable_dir       = $::apache::params::vhost_enable_dir,
-  $vhost_include_pattern  = $::apache::params::vhost_include_pattern,
-  $mod_dir                = $::apache::params::mod_dir,
-  $mod_enable_dir         = $::apache::params::mod_enable_dir,
-  $mpm_module             = $::apache::params::mpm_module,
-  $lib_path               = $::apache::params::lib_path,
-  $conf_template          = $::apache::params::conf_template,
-  $servername             = $::apache::params::servername,
-  $pidfile                = $::apache::params::pidfile,
-  $rewrite_lock           = undef,
-  $manage_user            = true,
-  $manage_group           = true,
-  $user                   = $::apache::params::user,
-  $group                  = $::apache::params::group,
-  $http_protocol_options  = $::apache::params::http_protocol_options,
-  $supplementary_groups   = [],
-  $keepalive              = $::apache::params::keepalive,
-  $keepalive_timeout      = $::apache::params::keepalive_timeout,
-  $max_keepalive_requests = $::apache::params::max_keepalive_requests,
-  $limitreqfieldsize      = '8190',
-  $logroot                = $::apache::params::logroot,
-  $logroot_mode           = $::apache::params::logroot_mode,
-  $log_level              = $::apache::params::log_level,
-  $log_formats            = {},
-  $ssl_file               = undef,
-  $ports_file             = $::apache::params::ports_file,
-  $docroot                = $::apache::params::docroot,
-  $apache_version         = $::apache::version::default,
-  $server_tokens          = 'OS',
-  $server_signature       = 'On',
-  $trace_enable           = 'On',
-  $allow_encoded_slashes  = undef,
-  $file_e_tag             = undef,
-  $package_ensure         = 'installed',
-  $use_optional_includes  = $::apache::params::use_optional_includes,
-  $use_systemd            = $::apache::params::use_systemd,
-  $mime_types_additional  = $::apache::params::mime_types_additional,
-  $file_mode              = $::apache::params::file_mode,
-  $root_directory_options = $::apache::params::root_directory_options,
-  $root_directory_secured = false,
-  $error_log              = $::apache::params::error_log,
-  $scriptalias            = $::apache::params::scriptalias,
-  $access_log_file        = $::apache::params::access_log_file,
+  $apache_name                                                   = $::apache::params::apache_name,
+  $service_name                                                  = $::apache::params::service_name,
+  $default_mods                                                  = true,
+  Boolean $default_vhost                                         = true,
+  $default_charset                                               = undef,
+  Boolean $default_confd_files                                   = true,
+  Boolean $default_ssl_vhost                                     = false,
+  $default_ssl_cert                                              = $::apache::params::default_ssl_cert,
+  $default_ssl_key                                               = $::apache::params::default_ssl_key,
+  $default_ssl_chain                                             = undef,
+  $default_ssl_ca                                                = undef,
+  $default_ssl_crl_path                                          = undef,
+  $default_ssl_crl                                               = undef,
+  $default_ssl_crl_check                                         = undef,
+  $default_type                                                  = 'none',
+  $dev_packages                                                  = $::apache::params::dev_packages,
+  $ip                                                            = undef,
+  Boolean $service_enable                                        = true,
+  Boolean $service_manage                                        = true,
+  $service_ensure                                                = 'running',
+  $service_restart                                               = undef,
+  $purge_configs                                                 = true,
+  $purge_vhost_dir                                               = undef,
+  $purge_vdir                                                    = false,
+  $serveradmin                                                   = 'root@localhost',
+  $sendfile                                                      = 'On',
+  $error_documents                                               = false,
+  $timeout                                                       = '120',
+  $httpd_dir                                                     = $::apache::params::httpd_dir,
+  $server_root                                                   = $::apache::params::server_root,
+  $conf_dir                                                      = $::apache::params::conf_dir,
+  $confd_dir                                                     = $::apache::params::confd_dir,
+  $vhost_dir                                                     = $::apache::params::vhost_dir,
+  $vhost_enable_dir                                              = $::apache::params::vhost_enable_dir,
+  $vhost_include_pattern                                         = $::apache::params::vhost_include_pattern,
+  $mod_dir                                                       = $::apache::params::mod_dir,
+  $mod_enable_dir                                                = $::apache::params::mod_enable_dir,
+  $mpm_module                                                    = $::apache::params::mpm_module,
+  $lib_path                                                      = $::apache::params::lib_path,
+  $conf_template                                                 = $::apache::params::conf_template,
+  $servername                                                    = $::apache::params::servername,
+  $pidfile                                                       = $::apache::params::pidfile,
+  Optional[Stdlib::Absolutepath] $rewrite_lock                   = undef,
+  Boolean $manage_user                                           = true,
+  Boolean $manage_group                                          = true,
+  $user                                                          = $::apache::params::user,
+  $group                                                         = $::apache::params::group,
+  $http_protocol_options                                         = $::apache::params::http_protocol_options,
+  $supplementary_groups                                          = [],
+  $keepalive                                                     = $::apache::params::keepalive,
+  $keepalive_timeout                                             = $::apache::params::keepalive_timeout,
+  $max_keepalive_requests                                        = $::apache::params::max_keepalive_requests,
+  $limitreqfieldsize                                             = '8190',
+  $logroot                                                       = $::apache::params::logroot,
+  $logroot_mode                                                  = $::apache::params::logroot_mode,
+  $log_level                                                     = $::apache::params::log_level,
+  $log_formats                                                   = {},
+  $ssl_file                                                      = undef,
+  $ports_file                                                    = $::apache::params::ports_file,
+  $docroot                                                       = $::apache::params::docroot,
+  $apache_version                                                = $::apache::version::default,
+  $server_tokens                                                 = 'OS',
+  $server_signature                                              = 'On',
+  $trace_enable                                                  = 'On',
+  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef,
+  $file_e_tag                                                    = undef,
+  $package_ensure                                                = 'installed',
+  Boolean $use_optional_includes                                 = $::apache::params::use_optional_includes,
+  $use_systemd                                                   = $::apache::params::use_systemd,
+  $mime_types_additional                                         = $::apache::params::mime_types_additional,
+  $file_mode                                                     = $::apache::params::file_mode,
+  $root_directory_options                                        = $::apache::params::root_directory_options,
+  Boolean $root_directory_secured                                = false,
+  $error_log                                                     = $::apache::params::error_log,
+  $scriptalias                                                   = $::apache::params::scriptalias,
+  $access_log_file                                               = $::apache::params::access_log_file,
 ) inherits ::apache::params {
-  validate_bool($default_vhost)
-  validate_bool($default_ssl_vhost)
-  validate_bool($default_confd_files)
-  # true/false is sufficient for both ensure and enable
-  validate_bool($service_enable)
-  validate_bool($service_manage)
-  validate_bool($use_optional_includes)
-  validate_bool($root_directory_secured)
 
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
@@ -124,10 +116,6 @@
     validate_re($mpm_module, $valid_mpms_re)
   }
 
-  if $allow_encoded_slashes {
-    validate_re($allow_encoded_slashes, '(^on$|^off$|^nodecode$)', "${allow_encoded_slashes} is not permitted for allow_encoded_slashes. Allowed values are 'on', 'off' or 'nodecode'.")
-  }
-
   # NOTE: on FreeBSD it's mpm module's responsibility to install httpd package.
   # NOTE: the same strategy may be introduced for other OSes. For this, you
   # should delete the 'if' block below and modify all MPM modules' manifests
@@ -144,7 +132,6 @@
 
   # declare the web server user and group
   # Note: requiring the package means the package ought to create them and not puppet
-  validate_bool($manage_user)
   if $manage_user {
     user { $user:
       ensure  => present,
@@ -153,7 +140,6 @@
       require => Package['httpd'],
     }
   }
-  validate_bool($manage_group)
   if $manage_group {
     group { $group:
       ensure  => present,
@@ -316,10 +302,6 @@
       default   => false
     }
 
-    if $rewrite_lock {
-      validate_absolute_path($rewrite_lock)
-    }
-
     # Template uses:
     # - $pidfile
     # - $user

From d6952b21ec66d7ce8b69dd0c2f2a0debca54e18f Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 12 May 2017 01:04:37 +0200
Subject: [PATCH 1176/2267] replace validate_* with datatypes in vhost.pp

---
 manifests/vhost.pp                 | 439 +++++++++++------------------
 spec/defines/custom_config_spec.rb |  13 -
 2 files changed, 172 insertions(+), 280 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4aa27c6eb5..9e5d1f607e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1,179 +1,178 @@
 # See README.md for usage information
 define apache::vhost(
-  $docroot,
-  $manage_docroot              = true,
-  $virtual_docroot             = false,
-  $port                        = undef,
-  $ip                          = undef,
-  $ip_based                    = false,
-  $add_listen                  = true,
-  $docroot_owner               = 'root',
-  $docroot_group               = $::apache::params::root_group,
-  $docroot_mode                = undef,
-  $serveradmin                 = undef,
-  $ssl                         = false,
-  $ssl_cert                    = $::apache::default_ssl_cert,
-  $ssl_key                     = $::apache::default_ssl_key,
-  $ssl_chain                   = $::apache::default_ssl_chain,
-  $ssl_ca                      = $::apache::default_ssl_ca,
-  $ssl_crl_path                = $::apache::default_ssl_crl_path,
-  $ssl_crl                     = $::apache::default_ssl_crl,
-  $ssl_crl_check               = $::apache::default_ssl_crl_check,
-  $ssl_certs_dir               = $::apache::params::ssl_certs_dir,
-  $ssl_protocol                = undef,
-  $ssl_cipher                  = undef,
-  $ssl_honorcipherorder        = undef,
-  $ssl_verify_client           = undef,
-  $ssl_verify_depth            = undef,
-  $ssl_proxy_verify            = undef,
-  $ssl_proxy_verify_depth      = undef,
-  $ssl_proxy_ca_cert           = undef,
-  $ssl_proxy_check_peer_cn     = undef,
-  $ssl_proxy_check_peer_name   = undef,
-  $ssl_proxy_check_peer_expire = undef,
-  $ssl_proxy_machine_cert      = undef,
-  $ssl_proxy_protocol          = undef,
-  $ssl_options                 = undef,
-  $ssl_openssl_conf_cmd        = undef,
-  $ssl_proxyengine             = false,
-  $ssl_stapling                = undef,
-  $ssl_stapling_timeout        = undef,
-  $ssl_stapling_return_errors  = undef,
-  $priority                    = undef,
-  $default_vhost               = false,
-  $servername                  = $name,
-  $serveraliases               = [],
-  $options                     = ['Indexes','FollowSymLinks','MultiViews'],
-  $override                    = ['None'],
-  $directoryindex              = '',
-  $vhost_name                  = '*',
-  $logroot                     = $::apache::logroot,
-  $logroot_ensure              = 'directory',
-  $logroot_mode                = undef,
-  $logroot_owner               = undef,
-  $logroot_group               = undef,
-  $log_level                   = undef,
-  $access_log                  = true,
-  $access_log_file             = false,
-  $access_log_pipe             = false,
-  $access_log_syslog           = false,
-  $access_log_format           = false,
-  $access_log_env_var          = false,
-  $access_logs                 = undef,
-  $aliases                     = undef,
-  $directories                 = undef,
-  $error_log                   = true,
-  $error_log_file              = undef,
-  $error_log_pipe              = undef,
-  $error_log_syslog            = undef,
-  $http_protocol_options       = undef,
-  $modsec_audit_log            = undef,
-  $modsec_audit_log_file       = undef,
-  $modsec_audit_log_pipe       = undef,
-  $error_documents             = [],
-  $fallbackresource            = undef,
-  $scriptalias                 = undef,
-  $scriptaliases               = [],
-  $proxy_dest                  = undef,
-  $proxy_dest_match            = undef,
-  $proxy_dest_reverse_match    = undef,
-  $proxy_pass                  = undef,
-  $proxy_pass_match            = undef,
-  $suphp_addhandler            = $::apache::params::suphp_addhandler,
-  $suphp_engine                = $::apache::params::suphp_engine,
-  $suphp_configpath            = $::apache::params::suphp_configpath,
-  $php_flags                   = {},
-  $php_values                  = {},
-  $php_admin_flags             = {},
-  $php_admin_values            = {},
-  $no_proxy_uris               = [],
-  $no_proxy_uris_match         = [],
-  $proxy_preserve_host         = false,
-  $proxy_add_headers           = undef,
-  $proxy_error_override        = false,
-  $redirect_source             = '/',
-  $redirect_dest               = undef,
-  $redirect_status             = undef,
-  $redirectmatch_status        = undef,
-  $redirectmatch_regexp        = undef,
-  $redirectmatch_dest          = undef,
-  $rack_base_uris              = undef,
-  $passenger_base_uris         = undef,
-  $headers                     = undef,
-  $request_headers             = undef,
-  $filters                     = undef,
-  $rewrites                    = undef,
-  $rewrite_base                = undef,
-  $rewrite_rule                = undef,
-  $rewrite_cond                = undef,
-  $rewrite_inherit             = false,
-  $setenv                      = [],
-  $setenvif                    = [],
-  $setenvifnocase              = [],
-  $block                       = [],
-  $ensure                      = 'present',
-  $wsgi_application_group      = undef,
-  $wsgi_daemon_process         = undef,
-  $wsgi_daemon_process_options = undef,
-  $wsgi_import_script          = undef,
-  $wsgi_import_script_options  = undef,
-  $wsgi_process_group          = undef,
-  $wsgi_script_aliases_match   = undef,
-  $wsgi_script_aliases         = undef,
-  $wsgi_pass_authorization     = undef,
-  $wsgi_chunked_request        = undef,
-  $custom_fragment             = undef,
-  $itk                         = undef,
-  $action                      = undef,
-  $fastcgi_server              = undef,
-  $fastcgi_socket              = undef,
-  $fastcgi_dir                 = undef,
-  $fastcgi_idle_timeout        = undef,
-  $additional_includes         = [],
-  $use_optional_includes       = $::apache::use_optional_includes,
-  $apache_version              = $::apache::apache_version,
-  $allow_encoded_slashes       = undef,
-  $suexec_user_group           = undef,
-  $passenger_app_root          = undef,
-  $passenger_app_env           = undef,
-  $passenger_ruby              = undef,
-  $passenger_min_instances     = undef,
-  $passenger_start_timeout     = undef,
-  $passenger_pre_start         = undef,
-  $passenger_user              = undef,
-  $passenger_high_performance  = undef,
-  $passenger_nodejs            = undef,
-  $passenger_sticky_sessions   = undef,
-  $passenger_startup_file      = undef,
-  $add_default_charset         = undef,
-  $modsec_disable_vhost        = undef,
-  $modsec_disable_ids          = undef,
-  $modsec_disable_ips          = undef,
-  $modsec_disable_msgs         = undef,
-  $modsec_disable_tags         = undef,
-  $modsec_body_limit           = undef,
-  $jk_mounts                   = undef,
-  $auth_kerb                   = false,
-  $krb_method_negotiate        = 'on',
-  $krb_method_k5passwd         = 'on',
-  $krb_authoritative           = 'on',
-  $krb_auth_realms             = [],
-  $krb_5keytab                 = undef,
-  $krb_local_user_mapping      = undef,
-  $krb_verify_kdc              = 'on',
-  $krb_servicename             = 'HTTP',
-  $krb_save_credentials        = 'off',
-  $keepalive                   = undef,
-  $keepalive_timeout           = undef,
-  $max_keepalive_requests      = undef,
-  $cas_attribute_prefix        = undef,
-  $cas_attribute_delimiter     = undef,
-  $cas_scrub_request_headers   = undef,
-  $cas_sso_enabled             = undef,
-  $cas_login_url               = undef,
-  $cas_validate_url            = undef,
-  $cas_validate_saml           = undef,
+  Variant[Boolean,String] $docroot,
+  $manage_docroot                                                                   = true,
+  $virtual_docroot                                                                  = false,
+  $port                                                                             = undef,
+  $ip                                                                               = undef,
+  Boolean $ip_based                                                                 = false,
+  $add_listen                                                                       = true,
+  $docroot_owner                                                                    = 'root',
+  $docroot_group                                                                    = $::apache::params::root_group,
+  $docroot_mode                                                                     = undef,
+  $serveradmin                                                                      = undef,
+  Boolean $ssl                                                                      = false,
+  $ssl_cert                                                                         = $::apache::default_ssl_cert,
+  $ssl_key                                                                          = $::apache::default_ssl_key,
+  $ssl_chain                                                                        = $::apache::default_ssl_chain,
+  $ssl_ca                                                                           = $::apache::default_ssl_ca,
+  $ssl_crl_path                                                                     = $::apache::default_ssl_crl_path,
+  $ssl_crl                                                                          = $::apache::default_ssl_crl,
+  $ssl_crl_check                                                                    = $::apache::default_ssl_crl_check,
+  $ssl_certs_dir                                                                    = $::apache::params::ssl_certs_dir,
+  $ssl_protocol                                                                     = undef,
+  $ssl_cipher                                                                       = undef,
+  $ssl_honorcipherorder                                                             = undef,
+  $ssl_verify_client                                                                = undef,
+  $ssl_verify_depth                                                                 = undef,
+  Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef,
+  $ssl_proxy_verify_depth                                                           = undef,
+  $ssl_proxy_ca_cert                                                                = undef,
+  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                          = undef,
+  $ssl_proxy_machine_cert                                                           = undef,
+  $ssl_proxy_protocol                                                               = undef,
+  $ssl_options                                                                      = undef,
+  $ssl_openssl_conf_cmd                                                             = undef,
+  Boolean $ssl_proxyengine                                                          = false,
+  Optional[Boolean] $ssl_stapling                                                   = undef,
+  $ssl_stapling_timeout                                                             = undef,
+  $ssl_stapling_return_errors                                                       = undef,
+  $priority                                                                         = undef,
+  Boolean $default_vhost                                                            = false,
+  $servername                                                                       = $name,
+  $serveraliases                                                                    = [],
+  $options                                                                          = ['Indexes','FollowSymLinks','MultiViews'],
+  $override                                                                         = ['None'],
+  $directoryindex                                                                   = '',
+  $vhost_name                                                                       = '*',
+  $logroot                                                                          = $::apache::logroot,
+  Enum['directory', 'absent'] $logroot_ensure                                       = 'directory',
+  $logroot_mode                                                                     = undef,
+  $logroot_owner                                                                    = undef,
+  $logroot_group                                                                    = undef,
+  $log_level                                                                        = undef,
+  Boolean $access_log                                                               = true,
+  $access_log_file                                                                  = false,
+  $access_log_pipe                                                                  = false,
+  $access_log_syslog                                                                = false,
+  $access_log_format                                                                = false,
+  $access_log_env_var                                                               = false,
+  $access_logs                                                                      = undef,
+  $aliases                                                                          = undef,
+  $directories                                                                      = undef,
+  Boolean $error_log                                                                = true,
+  $error_log_file                                                                   = undef,
+  $error_log_pipe                                                                   = undef,
+  $error_log_syslog                                                                 = undef,
+  $http_protocol_options                                                            = undef,
+  $modsec_audit_log                                                                 = undef,
+  $modsec_audit_log_file                                                            = undef,
+  $modsec_audit_log_pipe                                                            = undef,
+  $error_documents                                                                  = [],
+  Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource       = undef,
+  $scriptalias                                                                      = undef,
+  $scriptaliases                                                                    = [],
+  $proxy_dest                                                                       = undef,
+  $proxy_dest_match                                                                 = undef,
+  $proxy_dest_reverse_match                                                         = undef,
+  $proxy_pass                                                                       = undef,
+  $proxy_pass_match                                                                 = undef,
+  $suphp_addhandler                                                                 = $::apache::params::suphp_addhandler,
+  Enum['on', 'off'] $suphp_engine                                                   = $::apache::params::suphp_engine,
+  $suphp_configpath                                                                 = $::apache::params::suphp_configpath,
+  $php_flags                                                                        = {},
+  $php_values                                                                       = {},
+  $php_admin_flags                                                                  = {},
+  $php_admin_values                                                                 = {},
+  $no_proxy_uris                                                                    = [],
+  $no_proxy_uris_match                                                              = [],
+  $proxy_preserve_host                                                              = false,
+  $proxy_add_headers                                                                = undef,
+  $proxy_error_override                                                             = false,
+  $redirect_source                                                                  = '/',
+  $redirect_dest                                                                    = undef,
+  $redirect_status                                                                  = undef,
+  $redirectmatch_status                                                             = undef,
+  $redirectmatch_regexp                                                             = undef,
+  $redirectmatch_dest                                                               = undef,
+  $rack_base_uris                                                                   = undef,
+  $passenger_base_uris                                                              = undef,
+  $headers                                                                          = undef,
+  $request_headers                                                                  = undef,
+  $filters                                                                          = undef,
+  Optional[Array] $rewrites                                                         = undef,
+  $rewrite_base                                                                     = undef,
+  $rewrite_rule                                                                     = undef,
+  $rewrite_cond                                                                     = undef,
+  $rewrite_inherit                                                                  = false,
+  $setenv                                                                           = [],
+  $setenvif                                                                         = [],
+  $setenvifnocase                                                                   = [],
+  $block                                                                            = [],
+  Enum['absent', 'present'] $ensure                                                 = 'present',
+  $wsgi_application_group                                                           = undef,
+  $wsgi_daemon_process                                                              = undef,
+  Optional[Hash] $wsgi_daemon_process_options                                       = undef,
+  $wsgi_import_script                                                               = undef,
+  Optional[Hash] $wsgi_import_script_options                                        = undef,
+  $wsgi_process_group                                                               = undef,
+  Optional[Hash] $wsgi_script_aliases_match                                         = undef,
+  Optional[Hash] $wsgi_script_aliases                                               = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $wsgi_pass_authorization                 = undef,
+  $wsgi_chunked_request                                                             = undef,
+  Optional[String] $custom_fragment                                                 = undef,
+  Optional[Hash] $itk                                                               = undef,
+  $action                                                                           = undef,
+  $fastcgi_server                                                                   = undef,
+  $fastcgi_socket                                                                   = undef,
+  $fastcgi_dir                                                                      = undef,
+  $fastcgi_idle_timeout                                                             = undef,
+  $additional_includes                                                              = [],
+  $use_optional_includes                                                            = $::apache::use_optional_includes,
+  $apache_version                                                                   = $::apache::apache_version,
+  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
+  $suexec_user_group                                                                = undef,
+  $passenger_app_root                                                               = undef,
+  $passenger_app_env                                                                = undef,
+  $passenger_ruby                                                                   = undef,
+  $passenger_min_instances                                                          = undef,
+  $passenger_start_timeout                                                          = undef,
+  $passenger_pre_start                                                              = undef,
+  $passenger_user                                                                   = undef,
+  $passenger_high_performance                                                       = undef,
+  $passenger_nodejs                                                                 = undef,
+  Optional[Boolean] $passenger_sticky_sessions                                      = undef,
+  $passenger_startup_file                                                           = undef,
+  $add_default_charset                                                              = undef,
+  $modsec_disable_vhost                                                             = undef,
+  $modsec_disable_ids                                                               = undef,
+  $modsec_disable_ips                                                               = undef,
+  $modsec_disable_msgs                                                              = undef,
+  $modsec_disable_tags                                                              = undef,
+  $modsec_body_limit                                                                = undef,
+  $jk_mounts                                                                        = undef,
+  Boolean $auth_kerb                                                                = false,
+  $krb_method_negotiate                                                             = 'on',
+  $krb_method_k5passwd                                                              = 'on',
+  $krb_authoritative                                                                = 'on',
+  $krb_auth_realms                                                                  = [],
+  $krb_5keytab                                                                      = undef,
+  $krb_local_user_mapping                                                           = undef,
+  $krb_verify_kdc                                                                   = 'on',
+  $krb_servicename                                                                  = 'HTTP',
+  $krb_save_credentials                                                             = 'off',
+  Optional[Enum['on', 'off']] $keepalive                                            = undef,
+  $keepalive_timeout                                                                = undef,
+  $max_keepalive_requests                                                           = undef,
+  $cas_attribute_prefix                                                             = undef,
+  $cas_attribute_delimiter                                                          = undef,
+  $cas_scrub_request_headers                                                        = undef,
+  $cas_sso_enabled                                                                  = undef,
+  $cas_login_url                                                                    = undef,
+  $cas_validate_url                                                                 = undef,
+  $cas_validate_saml                                                                = undef,
 ) {
+
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
@@ -181,15 +180,6 @@
 
   $apache_name = $::apache::apache_name
 
-  validate_re($ensure, '^(present|absent)$',
-  "${ensure} is not supported for ensure.
-  Allowed values are 'present' and 'absent'.")
-  validate_re($suphp_engine, '^(on|off)$',
-  "${suphp_engine} is not supported for suphp_engine.
-  Allowed values are 'on' and 'off'.")
-  validate_bool($ip_based)
-  validate_bool($access_log)
-  validate_bool($error_log)
   if $http_protocol_options != undef {
     validate_re($http_protocol_options, '^((Strict|Unsafe)?\s*(\b(RegisteredMethods|LenientMethods))?\s*(\b(Allow0\.9|Require1\.0))?)$',
     "${http_protocol_options} is not supported for http_protocol_options.
@@ -197,17 +187,7 @@
     'Strict' or Unsafe, 'RegisteredMethods' or 'LenientMethods', and
     'Allow0.9' or 'Require1.0'.")
   }
-  if $modsec_audit_log != undef {
-    validate_bool($modsec_audit_log)
-  }
-  validate_bool($ssl)
-  validate_bool($default_vhost)
-  validate_bool($ssl_proxyengine)
-  if $ssl_stapling != undef {
-    validate_bool($ssl_stapling)
-  }
   if $rewrites {
-    validate_array($rewrites)
     unless empty($rewrites) {
       $rewrites_flattened = delete_undef_values(flatten([$rewrites]))
       validate_hash($rewrites_flattened[0])
@@ -221,18 +201,6 @@
     "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
   }
 
-  if $wsgi_pass_authorization {
-    validate_re(downcase($wsgi_pass_authorization), '^(on|off)$',
-    "${wsgi_pass_authorization} is not supported for wsgi_pass_authorization.
-    Allowed values are 'on' and 'off'.")
-  }
-
-  if $wsgi_chunked_request {
-    validate_re(downcase($wsgi_chunked_request), '^(on|off)$',
-    "${wsgi_chunked_request} is not supported for wsgi_chunked_request.
-    Allowed values are 'on' and 'off'.")
-  }
-
   # Deprecated backwards-compatibility
   if $rewrite_base {
     warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')
@@ -244,26 +212,6 @@
     warning('Apache::Vhost parameter rewrite_cond is deprecated in favor of rewrites')
   }
 
-  if $wsgi_script_aliases {
-    validate_hash($wsgi_script_aliases)
-  }
-  if $wsgi_script_aliases_match {
-    validate_hash($wsgi_script_aliases_match)
-  }
-  if $wsgi_daemon_process_options {
-    validate_hash($wsgi_daemon_process_options)
-  }
-  if $wsgi_import_script_options {
-    validate_hash($wsgi_import_script_options)
-  }
-  if $itk {
-    validate_hash($itk)
-  }
-
-  validate_re($logroot_ensure, '^(directory|absent)$',
-  "${logroot_ensure} is not supported for logroot_ensure.
-  Allowed values are 'directory' and 'absent'.")
-
   if $log_level {
     validate_apache_log_level($log_level)
   }
@@ -280,53 +228,10 @@
     fail("Apache::Vhost[${name}]: 'modsec_audit_log_file' and 'modsec_audit_log_pipe' cannot be defined at the same time")
   }
 
-  if $fallbackresource {
-    validate_re($fallbackresource, '^/|disabled', 'Please make sure fallbackresource starts with a / (or is "disabled")')
-  }
-
-  if $custom_fragment {
-    validate_string($custom_fragment)
-  }
-
-  if $allow_encoded_slashes {
-    validate_re($allow_encoded_slashes, '(^on$|^off$|^nodecode$)', "${allow_encoded_slashes} is not permitted for allow_encoded_slashes. Allowed values are 'on', 'off' or 'nodecode'.")
-  }
-
-  validate_bool($auth_kerb)
-
-  # Validate the docroot as a string if:
-  # - $manage_docroot is true
-  if $manage_docroot {
-    validate_string($docroot)
-  }
-
-  if $ssl_proxy_verify {
-    validate_re($ssl_proxy_verify,'^(none|optional|require|optional_no_ca)$',"${ssl_proxy_verify} is not permitted for ssl_proxy_verify. Allowed values are 'none', 'optional', 'require' or 'optional_no_ca'.")
-  }
-
   if $ssl_proxy_verify_depth {
     validate_integer($ssl_proxy_verify_depth)
   }
 
-  if $ssl_proxy_check_peer_cn {
-    validate_re($ssl_proxy_check_peer_cn,'(^on$|^off$)',"${ssl_proxy_check_peer_cn} is not permitted for ssl_proxy_check_peer_cn. Allowed values are 'on' or 'off'.")
-  }
-  if $ssl_proxy_check_peer_name {
-    validate_re($ssl_proxy_check_peer_name,'(^on$|^off$)',"${ssl_proxy_check_peer_name} is not permitted for ssl_proxy_check_peer_name. Allowed values are 'on' or 'off'.")
-  }
-
-  if $ssl_proxy_check_peer_expire {
-    validate_re($ssl_proxy_check_peer_expire,'(^on$|^off$)',"${ssl_proxy_check_peer_expire} is not permitted for ssl_proxy_check_peer_expire. Allowed values are 'on' or 'off'.")
-  }
-
-  if $keepalive {
-    validate_re($keepalive,'(^on$|^off$)',"${keepalive} is not permitted for keepalive. Allowed values are 'on' or 'off'.")
-  }
-
-  if $passenger_sticky_sessions {
-    validate_bool($passenger_sticky_sessions)
-  }
-
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 7d566b0716..5f996fd6db 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -121,18 +121,5 @@
         }.to raise_error(Puppet::Error, /One of \$content and \$source must be specified\./)
       end
     end
-    context 'bad ensure' do
-      let :params do
-        {
-          'content' => 'foo',
-          'ensure'  => 'foo',
-        }
-      end
-      it do
-        expect {
-          catalogue
-        }.to raise_error(Puppet::Error, /is not supported for ensure/)
-      end
-    end
   end
 end

From 149cf31ea65fbadbd6c48701bf5d3123f66b5b87 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 12 May 2017 01:05:31 +0200
Subject: [PATCH 1177/2267] drop legacy warnings

---
 manifests/vhost.pp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9e5d1f607e..780947c2a7 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -201,17 +201,6 @@
     "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
   }
 
-  # Deprecated backwards-compatibility
-  if $rewrite_base {
-    warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')
-  }
-  if $rewrite_rule {
-    warning('Apache::Vhost: parameter rewrite_rule is deprecated in favor of rewrites')
-  }
-  if $rewrite_cond {
-    warning('Apache::Vhost parameter rewrite_cond is deprecated in favor of rewrites')
-  }
-
   if $log_level {
     validate_apache_log_level($log_level)
   }

From 444b4e7bcab718cbb04875106fe589fbb3201f72 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 12 May 2017 16:50:24 +0200
Subject: [PATCH 1178/2267] replace validate_re with assert_type

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 94f4cd5a09..4d91f2602f 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -113,7 +113,7 @@
   }
 
   if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans
-    validate_re($mpm_module, $valid_mpms_re)
+    assert_type(Pattern[$valid_mpms_re], $mpm_module)
   }
 
   # NOTE: on FreeBSD it's mpm module's responsibility to install httpd package.

From 62ac72b8faf403bca233af391bae3a2c90b4d2fc Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 16 May 2017 00:51:44 +0200
Subject: [PATCH 1179/2267] drop legacy tests

---
 spec/classes/apache_spec.rb        |  6 ------
 spec/classes/mod/passenger_spec.rb |  6 ------
 spec/classes/service_spec.rb       | 16 ----------------
 3 files changed, 28 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 321b5e4152..715ed41244 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -563,12 +563,6 @@
         it { is_expected.not_to contain_class('apache::mod::peruser') }
         it { is_expected.not_to contain_class('apache::mod::prefork') }
       end
-      context "when declaring mpm_module => breakme" do
-        let :params do
-          { :mpm_module => 'breakme' }
-        end
-        it { expect { catalogue }.to raise_error Puppet::Error, /does not match/ }
-      end
     end
 
     describe "different templates for httpd.conf" do
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 3f485b42ab..200d45706f 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -68,12 +68,6 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxRequests 20$/) }
     end
-    describe "with passenger_spawn_method => bogus" do
-      let :params do
-        { :passenger_spawn_method => 'bogus' }
-      end
-      it { is_expected.to raise_error(Puppet::Error, /not permitted for passenger_spawn_method/) }
-    end
     describe "with passenger_spawn_method => direct" do
       let :params do
         { :passenger_spawn_method => 'direct' }
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index f53937a7ff..a065abc2fc 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -53,22 +53,6 @@
       }
     end
 
-    context "$service_enable must be a bool" do
-      let (:params) {{ :service_enable => 'not-a-boolean' }}
-
-      it 'should fail' do
-        expect { catalogue }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-
-    context "$service_manage must be a bool" do
-      let (:params) {{ :service_manage => 'not-a-boolean' }}
-
-      it 'should fail' do
-        expect { catalogue }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-
     context "with $service_ensure => 'running'" do
       let (:params) {{ :service_ensure => 'running', }}
       it { is_expected.to contain_service("httpd").with(

From 93f00fefea4f5bd42a63465dd23d29b0b851c425 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Fri, 14 Jul 2017 12:46:34 -0700
Subject: [PATCH 1180/2267] re-add missing vhost parameters

---
 manifests/vhost.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 780947c2a7..e34c334c01 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -28,6 +28,8 @@
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef,
   $ssl_proxy_verify_depth                                                           = undef,
   $ssl_proxy_ca_cert                                                                = undef,
+  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn                              = undef,
+  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                            = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                          = undef,
   $ssl_proxy_machine_cert                                                           = undef,
   $ssl_proxy_protocol                                                               = undef,

From 25ca934cdf269c1662ea847af58d888641abca61 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 12 Jul 2017 13:49:17 -0700
Subject: [PATCH 1181/2267] (MODULES-4445) remove deprecated parameter in
 authnz_ldap

the $verifyServerCert parameter in the authnz_ldap module class is
deprecated and this removes it and updates the template for the upcoming major release.
---
 manifests/mod/authnz_ldap.pp       | 10 +---------
 templates/mod/authnz_ldap.conf.erb |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index d18de0e30e..cc9ab67f02 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,7 +1,6 @@
 # lint:ignore:variable_is_lowercase required for compatibility
 class apache::mod::authnz_ldap (
   Boolean $verify_server_cert = true,
-  $verifyServerCert           = undef,
   $package_name               = undef,
 ) {
 
@@ -11,15 +10,8 @@
     package => $package_name,
   }
 
-  if $verifyServerCert {
-    warning('Class[\'apache::mod::authnz_ldap\'] parameter verifyServerCert is deprecated in favor of verify_server_cert')
-    $_verify_server_cert = $verifyServerCert
-  } else {
-    $_verify_server_cert = $verify_server_cert
-  }
-
   # Template uses:
-  # - $_verify_server_cert
+  # - $verify_server_cert
   file { 'authnz_ldap.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/authnz_ldap.conf",
diff --git a/templates/mod/authnz_ldap.conf.erb b/templates/mod/authnz_ldap.conf.erb
index 8d73b239d5..ed1334ec27 100644
--- a/templates/mod/authnz_ldap.conf.erb
+++ b/templates/mod/authnz_ldap.conf.erb
@@ -1,4 +1,4 @@
-<% if @_verify_server_cert == true -%>
+<% if @verify_server_cert == true -%>
 LDAPVerifyServerCert On
 <% else -%>
 LDAPVerifyServerCert Off

From f1c37edd5f60dcd80542bfd4c5df09fc4e9bc91d Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Wed, 19 Jul 2017 11:06:09 -0700
Subject: [PATCH 1182/2267] (MODULES-4933) Allow custom UserDir string

---
 manifests/mod/userdir.pp         | 20 ++++++++++--
 spec/classes/mod/userdir_spec.rb | 53 ++++++++++++++++++++++++++++++++
 templates/mod/userdir.conf.erb   |  2 +-
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 spec/classes/mod/userdir_spec.rb

diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index ea6ee193dd..203b93dd11 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -1,14 +1,30 @@
 class apache::mod::userdir (
-  $home = '/home',
-  $dir = 'public_html',
+  $home = undef,
+  $dir = undef,
   $disable_root = true,
   $apache_version = undef,
+  $path = '/home/*/public_html',
   $overrides = [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ],
   $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ],
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
 
+  if $home or $dir {
+    $_home = $home ? {
+      undef   => '/home',
+      default =>  $home,
+    }
+    $_dir = $dir ? {
+      undef   => 'public_html',
+      default =>  $dir,
+    }
+    warning('home and dir are deprecated; use path instead')
+    $_path = "${_home}/*/${_dir}"
+  } else {
+    $_path = $path
+  }
+
   ::apache::mod { 'userdir': }
 
   # Template uses $home, $dir, $disable_root, $_apache_version
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
new file mode 100644
index 0000000000..9f23ba274b
--- /dev/null
+++ b/spec/classes/mod/userdir_spec.rb
@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe 'apache::mod::userdir', :type => :class do
+  context "on a Debian OS" do
+    let :pre_condition do
+      'class { "apache":
+         default_mods => false,
+         mod_dir      => "/tmp/junk",
+       }'
+    end
+    let :facts do
+      {
+        :lsbdistcodename           => 'squeeze',
+        :osfamily                  => 'Debian',
+        :operatingsystemrelease    => '6',
+        :operatingsystemmajrelease => '6',
+        :concat_basedir            => '/dne',
+        :operatingsystem           => 'Debian',
+        :id                        => 'root',
+        :kernel                    => 'Linux',
+        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
+      }
+    end
+    context "default parameters" do
+      it { should compile }
+    end
+    context "with dir set to something" do
+      let :params do
+        {
+          :dir => 'hi',
+        }
+      end
+      it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+/home/\*/hi$})}
+    end
+    context "with home set to something" do
+      let :params do
+        {
+          :home => '/u',
+        }
+      end
+      it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+/u/\*/public_html$})}
+    end
+    context "with path set to something" do
+      let :params do
+        {
+          :path => 'public_html /usr/web http://www.example.com/',
+        }
+      end
+      it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+public_html /usr/web http://www\.example\.com/$})}
+    end
+  end
+end
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index c02a9188d6..323a1af1da 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -2,7 +2,7 @@
 <% if @disable_root -%>
   UserDir disabled root
 <% end -%>
-  UserDir <%= @home %>/*/<%= @dir %>
+  UserDir <%= @_path %>
 
   <Directory "<%= @home %>/*/<%= @dir %>">
     AllowOverride <%= @overrides.join(' ') %>

From 56e580082c0cc56e99c7807daad2d0c973e808e9 Mon Sep 17 00:00:00 2001
From: Tom Downes <thomas.downes@ligo.org>
Date: Mon, 3 Jul 2017 10:15:59 -0500
Subject: [PATCH 1183/2267] Ensure that ProxyPreserveHost is set even when
 ProxyPass (etc) are not. Proxying can be enabled with the when the [P] flag
 is given to a RewriteRule, not only when ProxyPass is used.

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e34c334c01..f0e228c452 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -750,7 +750,7 @@
   # - $proxy_preserve_host
   # - $proxy_add_headers
   # - $no_proxy_uris
-  if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match {
+  if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host {
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}${filename}.conf",
       order   => 160,

From 50fa55e2962de530349198cd2ae0d73af7eddcb9 Mon Sep 17 00:00:00 2001
From: Pavel Pulec <kayn@inuits.eu>
Date: Thu, 20 Jul 2017 11:02:58 +0200
Subject: [PATCH 1184/2267] add passenger_max_requests option per vhost

---
 README.md                      | 5 +++++
 manifests/vhost.pp             | 4 +++-
 spec/defines/vhost_spec.rb     | 1 +
 templates/vhost/_passenger.erb | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a637628171..5c61ac39fe 100755
--- a/README.md
+++ b/README.md
@@ -2703,6 +2703,11 @@ Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/refe
 
 Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances), the minimum number of application processes to run.
 
+##### `passenger_max_requests`
+
+Sets [PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#pas
+sengermaxrequests), the maximum number of requests an application process will process.
+
 ##### `passenger_max_instances_per_app`
 
 Sets [PassengerMaxInstancesPerApp](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstancesperapp), the maximum number of application processes that may simultaneously exist for a single application.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f0e228c452..98bbfcb571 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -138,6 +138,7 @@
   $passenger_app_env                                                                = undef,
   $passenger_ruby                                                                   = undef,
   $passenger_min_instances                                                          = undef,
+  $passenger_max_requests                                                           = undef,
   $passenger_start_timeout                                                          = undef,
   $passenger_pre_start                                                              = undef,
   $passenger_user                                                                   = undef,
@@ -247,7 +248,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file {
+  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_max_requests or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file {
     include ::apache::mod::passenger
   }
 
@@ -996,6 +997,7 @@
   # - $passenger_app_env
   # - $passenger_ruby
   # - $passenger_min_instances
+  # - $passenger_max_requests
   # - $passenger_start_timeout
   # - $passenger_pre_start
   # - $passenger_user
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 422a993d55..bb447247b2 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -396,6 +396,7 @@
           'passenger_app_env'           => 'test',
           'passenger_ruby'              => '/usr/bin/ruby1.9.1',
           'passenger_min_instances'     => '1',
+          'passenger_max_requests'      => '1000',
           'passenger_start_timeout'     => '600',
           'passenger_pre_start'         => 'http://localhost/myapp',
           'passenger_high_performance'  => true,
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index a380016b3b..f0401a9492 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -10,6 +10,9 @@
 <% if @passenger_min_instances -%>
   PassengerMinInstances <%= @passenger_min_instances %>
 <% end -%>
+<% if @passenger_max_requests -%>
+  PassengerMaxRequests <%= @passenger_max_requests %>
+<% end -%>
 <% if @passenger_start_timeout -%>
   PassengerStartTimeout <%= @passenger_start_timeout %>
 <% end -%>

From 5510c261c7c453151cc7d401a7fbee72e6d6a07d Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppet.com>
Date: Thu, 20 Jul 2017 13:16:58 -0700
Subject: [PATCH 1185/2267] README formatting cleanup

---
 README.md | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 812e3ce279..0fb94463ea 100644
--- a/README.md
+++ b/README.md
@@ -1059,7 +1059,7 @@ Default: 'Off'.
 
 ##### `keepalive_timeout`
 
-Sets the [`KeepAliveTimeout`] directive, which determines the [TODO: number of seconds?] amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. This parameter is only relevant if the [`keepalive` parameter][] is enabled.
+Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. This parameter is only relevant if the [`keepalive` parameter][] is enabled.
 
 Default: '15'.
 
@@ -1712,7 +1712,7 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
   
   Default: 'Off'.
 
-- `cas_idle_timeout`: Sets the idle timeout limit, in seconds. TODO: is this correct?
+- `cas_idle_timeout`: Sets the idle timeout limit, in seconds.
 
   Default: `undef`.
 
@@ -1754,7 +1754,7 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
   Default: '2'.
 
-- `suppress_warning`: Suppress warning about being on RedHat (Hint: mod_auth_cas package is now available in epel-testing repo). TODO: how does this hint relate to this warning? 
+- `suppress_warning`: Suppress warning about being on RedHat (`mod_auth_cas` package is now available in epel-testing repo).
 
   Default: `false`.
 
@@ -1849,7 +1849,7 @@ Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to gener
 
   Default: `undef`.
   
-* `verify_server_cert`: Whether to verify the server certificate. TODO: this didn't say anything, so I'm guessing? is this true, false, undef?
+* `verify_server_cert`: Whether to verify the server certificate.
   
   Default: `undef`.
 
@@ -1872,7 +1872,7 @@ class { '::apache::mod::cluster':
 
   Default: '6666'.
   
-* `server_advertise`: Whether the server should advertise. TODO: what does advertise mean?
+* `server_advertise`: Whether the server should advertise.
 
   Default: `true`.
   
@@ -1896,9 +1896,9 @@ class { '::apache::mod::cluster':
 
   Default: `true`.
 
-* `ip`: Specifies the IP address to listen to. TODO: is this required or does it have a default?
+* `ip`: Specifies the IP address to listen to.
 
-* `allowed_network`: Balanced members network. TODO: What does this do? Is there a default?
+* `allowed_network`: Balanced members network.
 
 * `version`: Specifies the `mod_cluster` version. Version 1.3.0 or greater is required for httpd 2.4.
 
@@ -2137,7 +2137,7 @@ Installs and configures [`mod_negotiation`][].
 
 * `force_language_priority`: Sets the `ForceLanguagePriority` option.
 
-  Values: A string. TODO: What are options for the string?
+  Values: A string.
   
   Default: `Prefer Fallback`.
   
@@ -2578,7 +2578,7 @@ Declare one `apache::balancer` defined type for each Apache load balancing group
 
 ##### `name`
 
-Sets the title of the balancer cluster and name of the `conf.d` file containing its configuration. TODO: isn't the default for this generated from something?
+Sets the title of the balancer cluster and name of the `conf.d` file containing its configuration.
 
 ##### `proxy_set`
 
@@ -3278,24 +3278,18 @@ Default: 'directory'.
 
 Overrides the mode the logroot directory is set to. Do *not* grant write access to the directory the logs are stored in without being aware of the consequences; for more information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
 
-Values: TODO what values
-
 Default: `undef`.
 
 ##### `logroot_owner`
 
 Sets individual user access to the logroot directory.
 
-Values: TODO what values
-
 Defaults to `undef`.
 
 ##### `logroot_group`
 
 Sets group access to the [`logroot`][] directory.
 
-Values: TODO what values
-
 Defaults to `undef`.
 
 ##### `log_level`
@@ -3304,7 +3298,7 @@ Specifies the verbosity of the error log.
 
 Values: 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
 
-Default: 'warn' for the global server configuration, which can be overridden on a per-virtual host basis.
+Default: 'warn' for the global server configuration. Can be overridden on a per-virtual host basis.
 
 ###### `modsec_body_limit`
 
@@ -3379,6 +3373,7 @@ apache::vhost { 'sample.example.net':
   modsec_disable_tags => { '/location1' => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ] },
 }
 ```
+
 Default: `undef`.
 
 ##### `modsec_audit*`
@@ -3536,6 +3531,8 @@ Boolean. Default: `undef`.
 
 Sets the [`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile) path. This path is relative to the application root.
 
+TODO: BOOKMARK
+
 ##### `php_flags & values`
 
 Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Default: '{}'.
@@ -4625,6 +4622,7 @@ apache::vhost { 'sample.example.net':
   ssl_verify_depth => 1,
 }
 ```
+
 ##### `ssl_proxy_protocol`
 
 Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) directive, which controls the SSL protocol flavors mod_ssl should use when establishing its server environment for proxy. It will only connect to servers using one of the provided protocols. Default: `undef`.

From facd9fce3d579b81217421a3eb60b8480ce5566a Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppet.com>
Date: Thu, 20 Jul 2017 15:41:57 -0700
Subject: [PATCH 1186/2267] more loc edit formatting

---
 README.md | 363 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 249 insertions(+), 114 deletions(-)

diff --git a/README.md b/README.md
index f9513190eb..37ea07c394 100755
--- a/README.md
+++ b/README.md
@@ -2505,7 +2505,7 @@ ${modsec\_dir}/activated\_rules.
 
 * `logroot`: Configures the location of audit and debug logs.
 
- Defaults to the Apache log directory (Redhat: `/var/log/httpd`,  Debian: `/var/log/apache2`).
+  Defaults to the Apache log directory (Redhat: `/var/log/httpd`,  Debian: `/var/log/apache2`).
 
 * `audit_log_releavant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging.
 
@@ -3599,15 +3599,17 @@ Boolean. Default: `undef`.
 
 Sets the [`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile) path. This path is relative to the application root.
 
-TODO: BOOKMARK
-
 ##### `php_flags & values`
 
-Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Default: '{}'.
+Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application.
+
+Default: '{}'.
 
 ##### `php_admin_flags & values`
 
-Allows per-virtual host setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Default: '{}'.
+Allows per-virtual host setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application.
+
+Default: '{}'.
 
 ##### `port`
 
@@ -3615,7 +3617,7 @@ Sets the port the host is configured on. The module's defaults ensure the host l
 
 ##### `priority`
 
-Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Default: '25'.
+Sets the relative load-order for Apache HTTPD VirtualHost configuration files.
 
 If nothing matches the priority, the first name-based virtual host is used. Likewise, passing a higher priority causes the alphabetically first name-based virtual host to be used if no other names match.
 
@@ -3623,13 +3625,19 @@ If nothing matches the priority, the first name-based virtual host is used. Like
 
 To omit the priority prefix in file names, pass a priority of `false`.
 
+Default: '25'.
+
 ##### `proxy_dest`
 
-Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Default: `undef`.
+Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
+
+Default: `undef`.
 
 ##### `proxy_pass`
 
-Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to `undef`. Optionally parameters can be added as an array.
+Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Optionally, parameters can be added as an array.
+
+Default: `undef`.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -3673,15 +3681,21 @@ This directive is equivalent to [`proxy_pass`][], but takes regular expressions,
 
 ##### `rack_base_uris`
 
-Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Default: `undef`.
+Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template.
+
+Default: `undef`.
 
 #####`passenger_base_uris`
 
-Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. Default: `undef`.
+Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template.
+
+Default: `undef`.
 
 ##### `redirect_dest`
 
-Specifies the address to redirect to. Default: `undef`.
+Specifies the address to redirect to.
+
+Default: `undef`.
 
 ##### `redirect_source`
 
@@ -3697,7 +3711,9 @@ apache::vhost { 'site.name.fdqn':
 
 ##### `redirect_status`
 
-Specifies the status to append to the redirect. Default: `undef`.
+Specifies the status to append to the redirect.
+
+Default: `undef`.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -3706,9 +3722,15 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-##### `redirectmatch_regexp` & `redirectmatch_status` & `redirectmatch_dest`
+##### `redirectmatch_*`
 
-Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. Default: `undef`.
+* `redirectmatch_regexp`
+* `redirectmatch_status`
+* `redirectmatch_dest`
+
+Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays.
+
+Default: `undef`.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -3721,7 +3743,9 @@ apache::vhost { 'site.name.fdqn':
 
 ##### `request_headers`
 
-Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Default: `undef`.
+Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, and so on. 
+
+Default: `undef`.
 
 ``` puppet
 apache::vhost { 'site.name.fdqn':
@@ -3732,9 +3756,14 @@ apache::vhost { 'site.name.fdqn':
   ],
 }
 ```
+
 ##### `rewrites`
 
-Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. Default: `undef`.
+Creates URL rewrite rules. Expects an array of hashes. 
+
+Values: Hash keys that are any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'.
+
+Default: `undef`.
 
 For example, you can specify that anyone trying to access index.html is served welcome.html
 
@@ -3808,7 +3837,9 @@ Refer to the [`mod_rewrite` documentation][`mod_rewrite`] for more details on wh
 
 ##### `rewrite_inherit`
 
-Determines whether the virtual host inherits global rewrite rules. Default: `false`.
+Determines whether the virtual host inherits global rewrite rules.
+
+Default: `false`.
 
 Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or inside the virtual host `.conf` file. By default, virtual hosts do not inherit global settings. To activate inheritance, specify the `rewrites` parameter and set `rewrite_inherit` parameter to `true`:
 
@@ -3824,8 +3855,6 @@ apache::vhost { 'site.name.fdqn':
 
 > **Note**: The `rewrites` parameter is **required** for this to have effect
 
-###### Some background
-
 Apache activates global `Rewrite` rules inheritance if the virtual host files contains the following directives:
 
 ``` ApacheConf
@@ -3837,7 +3866,9 @@ Refer to the [official `mod_rewrite` documentation](https://httpd.apache.org/doc
 
 ##### `scriptalias`
 
-Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as '/usr/scripts'. Default: `undef`.
+Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as '/usr/scripts'.
+
+Default: `undef`.
 
 ##### `scriptaliases`
 
@@ -3870,19 +3901,27 @@ The ScriptAlias and ScriptAliasMatch directives are created in the order specifi
 
 ##### `serveradmin`
 
-Specifies the email address Apache displays when it renders one of its error pages. Default: `undef`.
+Specifies the email address Apache displays when it renders one of its error pages. 
+
+Default: `undef`.
 
 ##### `serveraliases`
 
-Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site. Default: '[]'.
+Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site.
+
+Default: '[]'.
 
 ##### `servername`
 
-Sets the servername corresponding to the hostname you connect to the virtual host at. Default: the title of the resource.
+Sets the servername corresponding to the hostname you connect to the virtual host at. 
+
+Default: the title of the resource.
 
 ##### `setenv`
 
-Used by HTTPD to set environment variables for virtual hosts. Default: '[]'.
+Used by HTTPD to set environment variables for virtual hosts.
+
+Default: '[]'.
 
 Example:
 
@@ -3894,13 +3933,21 @@ apache::vhost { 'setenv.example.com':
 
 ##### `setenvif`
 
-Used by HTTPD to conditionally set environment variables for virtual hosts. Default: '[]'.
+Used by HTTPD to conditionally set environment variables for virtual hosts.
+
+Default: '[]'.
 
 ##### `setenvifnocase`
 
-Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching). Default: '[]'.
+Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
+
+Default: '[]'.
+
+##### `suphp_*`
 
-##### `suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
+* `suphp_addhandler`
+* `suphp_configpath`
+* `suphp_engine`
 
 Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
 
@@ -3925,11 +3972,15 @@ apache::vhost { 'suphp.example.com':
 
 ##### `vhost_name`
 
-Enables name-based virtual hosting. If no IP is passed to the virtual host, but the virtual host is assigned a port, then the virtual host name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the virtual host name is set to the title of the resource. Default: '*'.
+Enables name-based virtual hosting. If no IP is passed to the virtual host, but the virtual host is assigned a port, then the virtual host name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the virtual host name is set to the title of the resource.
+
+Default: '*'.
 
 ##### `virtual_docroot`
 
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Default: `false`.
+Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'.
+
+Default: `false`.
 
 ``` puppet
 apache::vhost { 'subdomain.loc':
@@ -3941,7 +3992,13 @@ apache::vhost { 'subdomain.loc':
 }
 ```
 
-##### `wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
+##### `wsgi*`
+
+* `wsgi_daemon_process`
+* `wsgi_daemon_process_options`
+* `wsgi_process_group`
+* `wsgi_script_aliases`
+* `wsgi_pass_authorization`
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi).
 
@@ -4006,7 +4063,7 @@ apache::vhost { 'sample.example.net':
 
 Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are:
 
-###### `addhandlers`
+##### `addhandlers`
 
 Sets [AddHandler](https://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension'] }`.
 
@@ -4023,7 +4080,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `allow`
+##### `allow`
 
 Sets an [Allow](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
@@ -4038,7 +4095,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `allow_override`
+##### `allow_override`
 
 Sets the types of directives allowed in [.htaccess](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
 
@@ -4053,19 +4110,19 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `auth_basic_authoritative`
+##### `auth_basic_authoritative`
 
 Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative), which determines whether authorization and authentication are passed to lower level Apache modules.
 
-###### `auth_basic_fake`
+##### `auth_basic_fake`
 
 Sets the value for [AuthBasicFake](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
 
-###### `auth_basic_provider`
+##### `auth_basic_provider`
 
 Sets the value for [AuthBasicProvider](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
 
-###### `auth_digest_algorithm`
+##### `auth_digest_algorithm`
 
 Sets the value for [AuthDigestAlgorithm](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
 
@@ -4073,67 +4130,67 @@ Sets the value for [AuthDigestAlgorithm](https://httpd.apache.org/docs/current/m
 
 Sets the value for [AuthDigestDomain](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
 
-###### `auth_digest_nonce_lifetime`
+##### `auth_digest_nonce_lifetime`
 
 Sets the value for [AuthDigestNonceLifetime](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
 
-###### `auth_digest_provider`
+##### `auth_digest_provider`
 
 Sets the value for [AuthDigestProvider](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
 
-###### `auth_digest_qop`
+##### `auth_digest_qop`
 
 Sets the value for [AuthDigestQop](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
 
-###### `auth_digest_shmem_size`
+##### `auth_digest_shmem_size`
 
 Sets the value for [AuthAuthDigestShmemSize](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
 
-###### `auth_group_file`
+##### `auth_group_file`
 
 Sets the value for [AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile), which sets the name of the text file containing the list of user groups for authorization.
 
-###### `auth_name`
+##### `auth_name`
 
 Sets the value for [AuthName](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm.
 
-###### `auth_require`
+##### `auth_require`
 
 Sets the entity name you're requiring to allow access. Read more about [Require](https://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives).
 
-###### `auth_type`
+##### `auth_type`
 
 Sets the value for [AuthType](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
 
-###### `auth_user_file`
+##### `auth_user_file`
 
 Sets the value for [AuthUserFile](https://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
 
-###### `auth_merging`
+##### `auth_merging`
 
 Sets the value for [AuthMerging](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#authmerging), which determines if authorization logic should be combined
 
-###### `auth_ldap_url`
+##### `auth_ldap_url`
 
 Sets the value for [AuthLDAPURL](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapurl), which determines URL of LDAP-server(s) if AuthBasicProvider 'ldap' is used
 
-###### `auth_ldap_bind_dn`
+##### `auth_ldap_bind_dn`
 
 Sets the value for [AuthLDAPBindDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbinddn), which allows use of an optional DN used to bind to the LDAP-server when searching for entries if AuthBasicProvider 'ldap' is used.
 
-###### `auth_ldap_bind_password`
+##### `auth_ldap_bind_password`
 
 Sets the value for [AuthLDAPBindPassword](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbindpassword), which allows use of an optional bind password to use in conjunction with the bind DN if AuthBasicProvider 'ldap' is used.
 
-###### `auth_ldap_group_attribute`
+##### `auth_ldap_group_attribute`
 
 Array of values for [AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute), specifies which LDAP attributes are used to check for user members within ldap-groups. Defaults are: "member" and "uniquemember".
 
-###### `auth_ldap_group_attribute_is_dn`
+##### `auth_ldap_group_attribute_is_dn`
 
 Sets value for [AuthLDAPGroupAttributeIsDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattributeisdn), specifies if member of a ldapgroup is a dn or simple username. When set on, this directive says to use the distinguished name of the client username when checking for group membership. Otherwise, the username will be used. valid values are: "on" or "off"
 
-###### `custom_fragment`
+##### `custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the directory configuration.
 
@@ -4160,19 +4217,19 @@ ProxyStatus On',
 }
 ```
 
-###### `dav`
+##### `dav`
 
 Sets the value for [Dav](http://httpd.apache.org/docs/current/mod/mod_dav.html#dav), which determines if the WebDAV HTTP methods should be enabled. The value can be either 'On', 'Off' or the name of the provider. A value of 'On' enables the default filesystem provider implemented by the `mod_dav_fs` module.
 
-###### `dav_depth_infinity`
+##### `dav_depth_infinity`
 
 Sets the value for [DavDepthInfinity](http://httpd.apache.org/docs/current/mod/mod_dav.html#davdepthinfinity), which is used to enable the processing of `PROPFIND` requests having a `Depth: Infinity` header.
 
-###### `dav_min_timeout`
+##### `dav_min_timeout`
 
 Sets the value for [DavMinTimeout](http://httpd.apache.org/docs/current/mod/mod_dav.html#davmintimeout), which sets the time the server holds a lock on a DAV resource. The value should be the number of seconds to set.
 
-###### `deny`
+##### `deny`
 
 Sets a [Deny](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
 
@@ -4187,7 +4244,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `error_documents`
+##### `error_documents`
 
 An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
 
@@ -4205,7 +4262,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `ext_filter_options`
+##### `ext_filter_options`
 
 Sets the [ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
 Note that you must declare `class { 'apache::mod::ext_filter': }` before using this directive.
@@ -4221,7 +4278,7 @@ apache::vhost { 'filter.example.org':
 }
 ```
 
-###### `geoip_enable`
+##### `geoip_enable`
 
 Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive.
 Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
@@ -4237,7 +4294,7 @@ apache::vhost { 'first.example.com':
 }
 ```
 
-###### `headers`
+##### `headers`
 
 Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 
@@ -4251,7 +4308,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `index_options`
+##### `index_options`
 
 Allows configuration settings for [directory indexing](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
 
@@ -4268,7 +4325,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `index_order_default`
+##### `index_order_default`
 
 Sets the [default ordering](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
 
@@ -4301,7 +4358,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `limit`
+##### `limit`
 
 Creates a [Limit](https://httpd.apache.org/docs/current/mod/core.html#limit) block inside the Directory block, which can also contain `require` directives.
 
@@ -4321,7 +4378,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `limit_except`
+##### `limit_except`
 
 Creates a [LimitExcept](https://httpd.apache.org/docs/current/mod/core.html#limitexcept) block inside the Directory block, which can also contain `require` directives.
 
@@ -4341,7 +4398,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `mellon_enable`
+##### `mellon_enable`
 
 Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_mellon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.
 
@@ -4382,7 +4439,7 @@ to environment variables.
 - `mellon_sp_cert_file`: Sets the [MellonSPCertFile][`mod_auth_mellon`] directive for the public key location of the service provider.
 - `mellon_user`: Sets the [MellonUser][`mod_auth_mellon`] attribute to use for the username.
 
-###### `options`
+##### `options`
 
 Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
 
@@ -4397,7 +4454,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `order`
+##### `order`
 
 Sets the order of processing Allow and Deny statements as per [Apache core documentation](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
 
@@ -4412,7 +4469,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `passenger_enabled`
+##### `passenger_enabled`
 
 Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directive to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
 
@@ -4429,16 +4486,16 @@ apache::vhost { 'sample.example.net':
 
 > **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
-###### `php_value` and `php_flag`
+##### `php_value` and `php_flag`
 
 `php_value` sets the value of the directory, and `php_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
 
-###### `php_admin_value` and `php_admin_flag`
+##### `php_admin_value` and `php_admin_flag`
 
 `php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
 
 
-###### `require`
+##### `require`
 
 
 Sets a `Require` directive as per the [Apache Authz documentation](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#require). If no `require` is set, it will default to `Require all granted`.
@@ -4490,7 +4547,7 @@ apache::vhost { 'sample.example.net':
 
 
 
-###### `satisfy`
+##### `satisfy`
 
 Sets a `Satisfy` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
 
@@ -4505,7 +4562,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `sethandler`
+##### `sethandler`
 
 Sets a `SetHandler` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#sethandler).
 
@@ -4520,7 +4577,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-###### `set_output_filter`
+##### `set_output_filter`
 
 Sets a `SetOutputFilter` directive per the [Apache Core documentation](https://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
 
@@ -4535,7 +4592,7 @@ apache::vhost{ 'filter.example.net':
 }
 ```
 
-###### `rewrites`
+##### `rewrites`
 
 Creates URL [`rewrites`](#rewrites) rules in virtual host directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
 
@@ -4562,7 +4619,7 @@ apache::vhost { 'secure.example.net':
 
 > **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the virtual host's directories.
 
-###### `shib_request_settings`
+##### `shib_request_settings`
 
 Allows a valid content setting to be set or altered for the application request. This command takes two parameters: the name of the content setting, and the value to set it to. Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
@@ -4578,11 +4635,11 @@ apache::vhost { 'secure.example.net':
 }
 ```
 
-###### `shib_use_headers`
+##### `shib_use_headers`
 
 When set to 'On', this turns on the use of request headers to publish attributes to applications. Values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
-###### `ssl_options`
+##### `ssl_options`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the virtual host.
 
@@ -4600,7 +4657,7 @@ apache::vhost { 'secure.example.net':
 }
 ```
 
-###### `suphp`
+##### `suphp`
 
 A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the virtual host declaration, and can only be passed within `directories`.
 
@@ -4617,7 +4674,7 @@ apache::vhost { 'secure.example.net':
   ],
 }
 ```
-###### `additional_includes`
+##### `additional_includes`
 
 Specifies paths to additional static, specific Apache configuration files in virtual host directories. Values: a array of string path.
 
@@ -4638,60 +4695,90 @@ All of the SSL parameters for `::vhost` default to whatever is set in the base `
 
 ##### `ssl`
 
-Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Values: Boolean. Default: `false`.
+Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Values: Boolean.
+
+Default: `false`.
 
 ##### `ssl_ca`
 
-Specifies the SSL certificate authority. Default: `undef`.
+Specifies the SSL certificate authority.
+
+Default: `undef`.
 
 ##### `ssl_cert`
 
-Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, '/usr/local/etc/apache22/server.crt' for FreeBSD, and '/etc/ssl/apache2/server.crt' on Gentoo.
+Specifies the SSL certification. Defaults are based on your OS.
+
+* RedHat: '/etc/pki/tls/certs/localhost.crt'
+* Debian: '/etc/ssl/certs/ssl-cert-snakeoil.pem'
+* FreeBSD: '/usr/local/etc/apache22/server.crt'
+* Gentoo: '/etc/ssl/apache2/server.crt'
 
 ##### `ssl_protocol`
 
-Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array or space separated string of accepted protocols. Defaults: 'all', '-SSLv2', '-SSLv3'.
+Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array or space separated string of accepted protocols.
+
+Defaults: 'all', '-SSLv2', '-SSLv3'.
 
 ##### `ssl_cipher`
 
-Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Default: 'HIGH:MEDIUM:!aNULL:!MD5'.
+Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). 
+
+Default: 'HIGH:MEDIUM:!aNULL:!MD5'.
 
 ##### `ssl_honorcipherorder`
 
-Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), to cause Apache to use the server's preferred order of ciphers rather than the client's preferred order. Default: `true`. In addition to `true`/`false` Boolean values, will also accept case-insensitive Strings 'on' or 'off'.
+Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), to cause Apache to use the server's preferred order of ciphers rather than the client's preferred order. Values:
+
+Values: Boolean, 'on', 'off'.
+
+Default: `true`.
 
 ##### `ssl_certs_dir`
 
 Specifies the location of the SSL certification directory. Default: Depends on operating system.
 
-- **Debian:** '/etc/ssl/certs'
-- **Red Hat:** '/etc/pki/tls/certs'
-- **FreeBSD:** `undef`
-- **Gentoo:** '/etc/ssl/apache2'
+- Debian: '/etc/ssl/certs'
+- Red Hat: '/etc/pki/tls/certs'
+- FreeBSD: `undef`
+- Gentoo: '/etc/ssl/apache2'
 
 ##### `ssl_chain`
 
-Specifies the SSL chain. Default: `undef`. This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.
+Specifies the SSL chain. This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.
+
+Default: `undef`. 
 
 ##### `ssl_crl`
 
-Specifies the certificate revocation list to use. Default: `undef`. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the certificate revocation list to use. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+
+Default: `undef`.
 
 ##### `ssl_crl_path`
 
-Specifies the location of the certificate revocation list. Default: `undef`. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the location of the certificate revocation list. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+
+Default: `undef`. 
 
 ##### `ssl_crl_check`
 
-Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck). Default: `undef`. This default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck). The default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
+
+Default: `undef`.
 
 ##### `ssl_key`
 
-Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, '/usr/local/etc/apache22/server.key' for FreeBSD, and '/etc/ssl/apache2/server.key' on Gentoo. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the SSL key. Defaults are based on your operating system. Default work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.
+
+* RedHat: '/etc/pki/tls/private/localhost.key'
+* Debian: '/etc/ssl/private/ssl-cert-snakeoil.key'
+* FreeBSD: '/usr/local/etc/apache22/server.key'
+* Gentoo: '/etc/ssl/apache2/server.key'
 
 ##### `ssl_verify_client`
 
-Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Values are: 'none', 'optional', 'require', and 'optional_no_ca'. Default: `undef`.
+Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -4700,9 +4787,14 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+Values: 'none', 'optional', 'require', and 'optional_no_ca'.
+
+Default: `undef`.
+
+
 ##### `ssl_verify_depth`
 
-Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Default: `undef`.
+Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -4711,26 +4803,37 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+Default: `undef`.
+
 ##### `ssl_proxy_protocol`
 
-Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) directive, which controls the SSL protocol flavors mod_ssl should use when establishing its server environment for proxy. It will only connect to servers using one of the provided protocols. Default: `undef`.
+Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) directive, which controls which SSL protocol flavors `mod_ssl` should use when establishing its server environment for proxy. It connects to servers using only one of the provided protocols.
 
+Default: `undef`.
 
 ##### `ssl_proxy_verify`
 
-Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server. Default: `undef`.
+Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server.
+
+Default: `undef`.
 
 ##### `ssl_proxy_verify_depth`
 
-Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth) directive, which configures how deeply mod_ssl should verify before deciding that the remote server does not have a valid certificate. (A depth of 0 means that self-signed remote server certificates are accepted only, the default depth of 1 means the remote server certificate can be self-signed or has to be signed by a CA which is directly known to the server) Default: undef.
+Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth) directive, which configures how deeply mod_ssl should verify before deciding that the remote server does not have a valid certificate.
+
+A depth of 0 means that only self-signed remote server certificates are accepted, the default depth of 1 means the remote server certificate can be self-signed or signed by a CA that is directly known to the server.
+
+Default: `undef`
 
 ##### `ssl_proxy_ca_cert`
 
-Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile) directive, which specifies an all-in-one file where you can assemble the Certificates of Certification Authorities (CA) whose remote servers you deal with. These are used for Remote Server Authentication. This file should be a concatenation of the PEM-encoded certificate files in order of preference. Default: undef.
+Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile) directive, which specifies an all-in-one file where you can assemble the Certificates of Certification Authorities (CA) whose remote servers you deal with. These are used for Remote Server Authentication. This file should be a concatenation of the PEM-encoded certificate files in order of preference.
+
+Default: `undef`
 
 ##### `ssl_proxy_machine_cert`
 
-Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference. Default: `undef`.
+Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -4739,21 +4842,35 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+Default: `undef`
+
 ##### `ssl_proxy_check_peer_cn`
 
-Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Values: 'on', 'off'. Default: `undef`.
+Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL.
+
+Values: 'on', 'off'.
+
+Default: `undef`
 
 ##### `ssl_proxy_check_peer_name`
 
-Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. Values: 'on', 'off'. Default: `undef`.
+Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL.
+
+Values: 'on', 'off'.
+
+Default: `undef`
 
 ##### `ssl_proxy_check_peer_expire`
 
-Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not. Values: 'on', 'off'. Default: `undef`.
+Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not.
+
+Values: 'on', 'off'.
+
+Default: `undef`
 
 ##### `ssl_options`
 
-Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given virtual host and can be a string or an array. Default: `undef`.
+Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given virtual host and can be a string or an array.
 
 A string:
 
@@ -4773,32 +4890,48 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
+Default: `undef`.
+
 ##### `ssl_openssl_conf_cmd`
 
-Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. Default: `undef`.
+Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. 
+
+Default: `undef`
 
 ##### `ssl_proxyengine`
 
-Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Values: Boolean. Default: `true`.
+Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). 
+
+Boolean.
+
+Default: `true`.
 
 ##### `ssl_stapling`
 
-Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). Values: Boolean or `undef`. Default: `undef`, meaning use what is set globally.
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). By default, uses what is set globally.
 
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
+Boolean or `undef`.
+
+Default: `undef`
+
 ##### `ssl_stapling_timeout`
 
-Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive. No default.
+Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.
 
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
+Default: none.
+
 ##### `ssl_stapling_return_errors`
 
-Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive. No default.
+Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.
 
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
+Default: none.
+
 #### Defined type: FastCGI Server
 
 This type is intended for use with mod\_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
@@ -4851,7 +4984,7 @@ Force a write to the client as data is received from the application. By default
 
 ##### `faux_path`
 
-`faux_path` does not have to exist in the local filesystem. URIs that Apache resolves to this filename are handled by this external FastCGI application.
+Does not have to exist in the local filesystem. URIs that Apache resolves to this filename are handled by this external FastCGI application.
 
 ##### `alias`
 
@@ -4893,7 +5026,9 @@ Default: '25'.
 
 Specifies whether to validate the configuration file before notifying the Apache service. 
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ### Private defined types
 

From b7e251a175958e6b863b4c40e7b3ba7d9adf5819 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben.roberts@gsacapital.com>
Date: Thu, 8 Jun 2017 10:22:11 +0100
Subject: [PATCH 1187/2267] MODULES-3838 Pass mod_packages through init.pp to
 allow end user overrides

---
 manifests/init.pp    | 1 +
 manifests/mod.pp     | 2 +-
 manifests/mod/php.pp | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4d91f2602f..516c966ad2 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -47,6 +47,7 @@
   $confd_dir                                                     = $::apache::params::confd_dir,
   $vhost_dir                                                     = $::apache::params::vhost_dir,
   $vhost_enable_dir                                              = $::apache::params::vhost_enable_dir,
+  $mod_packages                                                  = $::apache::params::mod_packages,
   $vhost_include_pattern                                         = $::apache::params::vhost_include_pattern,
   $mod_dir                                                       = $::apache::params::mod_dir,
   $mod_enable_dir                                                = $::apache::params::mod_enable_dir,
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 8958d1276f..ddef130c8e 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -46,7 +46,7 @@
   }
 
   # Determine if we have a package
-  $mod_packages = $::apache::params::mod_packages
+  $mod_packages = $::apache::mod_packages
   if $package {
     $_package = $package
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index e087e4b3e5..c7c0048884 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -38,7 +38,7 @@
   }
 
   # Determine if we have a package
-  $mod_packages = $::apache::params::mod_packages
+  $mod_packages = $::apache::mod_packages
   if $package_name {
     $_package_name = $package_name
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack

From 040bd1fa0455658b4ad260966f58654063988f49 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Fri, 21 Jul 2017 13:49:56 -0700
Subject: [PATCH 1188/2267] (maint) adds docs and some specs for mod_packages

adds an entry in the README and a usage example as well as a couple of unit tests in apache_spec
---
 README.md                   | 14 ++++++++++++++
 spec/classes/apache_spec.rb | 29 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/README.md b/README.md
index 37ea07c394..65489705da 100755
--- a/README.md
+++ b/README.md
@@ -1178,6 +1178,20 @@ Default: Depends on operating system.
 - **Gentoo**: `/etc/apache2/modules.d`
 - **Red Hat**: `/etc/httpd/conf.d`
 
+##### `mod_packages`
+
+Allows the user to override default module package names.
+
+```puppet
+class { '::apache':
+  mod_packages => merge($::apache::mod_params {
+    'auth_kerb' => 'httpd24-mod_auth_kerb',
+  }
+}
+```
+
+Hash. Default: `$apache::params::mod_packages`
+
 ##### `mpm_module`
 
 Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Values: 'event', 'itk', 'peruser', 'prefork', 'worker', or `false`.
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 715ed41244..56025ab3ff 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -10,6 +10,7 @@
         :osfamily               => 'Debian',
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
+        :operatingsystemmajrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
         :is_pe                  => false,
@@ -126,6 +127,20 @@
       it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AddDefaultCharset none$} }
     end
 
+    context "when overriding with mod_packages" do
+      let :params do
+        { :mod_packages => { 'dav_svn' => 'foobarbaz' } }
+      end
+      let :pre_condition do
+        "apache::mod { 'dav_svn': }"
+      end
+
+      it { is_expected.to contain_file("dav_svn.load") }
+      it { is_expected.to contain_package('foobarbaz') }
+      it { is_expected.to_not contain_file("fcgid.load") }
+      it { is_expected.to_not contain_package('libapache2-svn') }
+    end
+
     # Assert that both load files and conf files are placed and symlinked for these mods
     [
       'alias',
@@ -451,6 +466,20 @@
         it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^RewriteLock [.]*$} }
       end
 
+      context "when overriding with mod_packages" do
+        let :params do
+          { :mod_packages => { 'dav_svn' => 'foobarbaz' } }
+        end
+        let :pre_condition do
+          "apache::mod { 'dav_svn': }"
+        end
+
+        it { is_expected.to contain_file("dav_svn.load") }
+        it { is_expected.to contain_package('foobarbaz') }
+        it { is_expected.to_not contain_file("fcgid.load") }
+        it { is_expected.to_not contain_package('mod_dav_svn') }
+      end
+
       context "when specifying slash encoding behaviour" do
         let :params do
           { :allow_encoded_slashes => 'nodecode' }

From 36da2f69209049f4baff0f8edc405946e320bd83 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Fri, 21 Jul 2017 15:54:32 -0700
Subject: [PATCH 1189/2267] (MODULES-3838) Add spec test for mod_package
 override and update readme

---
 README.md                          |  7 ++++---
 spec/classes/apache_spec.rb        | 29 -----------------------------
 spec/classes/mod/auth_kerb_spec.rb | 29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 65489705da..90f4a7094d 100755
--- a/README.md
+++ b/README.md
@@ -1183,10 +1183,11 @@ Default: Depends on operating system.
 Allows the user to override default module package names.
 
 ```puppet
-class { '::apache':
-  mod_packages => merge($::apache::mod_params {
+include apache::params
+class { 'apache':
+  mod_packages => merge($::apache::params::mod_packages, {
     'auth_kerb' => 'httpd24-mod_auth_kerb',
-  }
+  })
 }
 ```
 
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 56025ab3ff..715ed41244 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -10,7 +10,6 @@
         :osfamily               => 'Debian',
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '6',
-        :operatingsystemmajrelease => '6',
         :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :concat_basedir         => '/dne',
         :is_pe                  => false,
@@ -127,20 +126,6 @@
       it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AddDefaultCharset none$} }
     end
 
-    context "when overriding with mod_packages" do
-      let :params do
-        { :mod_packages => { 'dav_svn' => 'foobarbaz' } }
-      end
-      let :pre_condition do
-        "apache::mod { 'dav_svn': }"
-      end
-
-      it { is_expected.to contain_file("dav_svn.load") }
-      it { is_expected.to contain_package('foobarbaz') }
-      it { is_expected.to_not contain_file("fcgid.load") }
-      it { is_expected.to_not contain_package('libapache2-svn') }
-    end
-
     # Assert that both load files and conf files are placed and symlinked for these mods
     [
       'alias',
@@ -466,20 +451,6 @@
         it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^RewriteLock [.]*$} }
       end
 
-      context "when overriding with mod_packages" do
-        let :params do
-          { :mod_packages => { 'dav_svn' => 'foobarbaz' } }
-        end
-        let :pre_condition do
-          "apache::mod { 'dav_svn': }"
-        end
-
-        it { is_expected.to contain_file("dav_svn.load") }
-        it { is_expected.to contain_package('foobarbaz') }
-        it { is_expected.to_not contain_file("fcgid.load") }
-        it { is_expected.to_not contain_package('mod_dav_svn') }
-      end
-
       context "when specifying slash encoding behaviour" do
         let :params do
           { :allow_encoded_slashes => 'nodecode' }
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 74b6827d0f..0f77a627ef 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -74,4 +74,33 @@
       it { is_expected.to contain_package("www-apache/mod_auth_kerb") }
     end
   end
+  context "overriding mod_packages" do
+    context "on a RedHat OS", :compile do
+      let :facts do
+        {
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '6',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :concat_basedir         => '/dne',
+          :is_pe                  => false,
+        }
+      end
+      let :pre_condition do
+        <<-EOS
+        include apache::params
+        class { 'apache':
+          mod_packages => merge($::apache::params::mod_packages, {
+            'auth_kerb' => 'httpd24-mod_auth_kerb',
+          })
+        }
+        EOS
+      end
+      it { is_expected.to contain_apache__mod("auth_kerb") }
+      it { is_expected.to contain_package("httpd24-mod_auth_kerb") }
+      it { is_expected.to_not contain_package("mod_auth_kerb") }
+    end
+  end
 end

From ccbddecf7bc7f77cc0af269bf53a261674f2a01c Mon Sep 17 00:00:00 2001
From: Patrick Schoenfeld <patrick.schoenfeld@credativ.de>
Date: Tue, 17 Jan 2017 16:26:03 +0100
Subject: [PATCH 1190/2267] add parser function apache_pw_hash

This commit adds a new parser function apache_pw_hash, which
allows generating password hashes to be used in htpasswd files.
---
 README.md                                     |  7 ++++
 lib/puppet/parser/functions/apache_pw_hash.rb | 14 ++++++++
 .../parser/functions/apache_pw_hash_spec.rb   | 32 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 lib/puppet/parser/functions/apache_pw_hash.rb
 create mode 100644 spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb

diff --git a/README.md b/README.md
index 90f4a7094d..75c416b123 100755
--- a/README.md
+++ b/README.md
@@ -5067,6 +5067,13 @@ Links the `activated_rules` from [`apache::mod::security`][] to the respective C
 
 The Apache module relies heavily on templates to enable the [`apache::vhost`][] and [`apache::mod`][] defined types. These templates are built based on [Facter][] facts specific to your operating system. Unless explicitly called out, most templates are not meant for configuration.
 
+### Functions
+#### apache_pw_hash
+Hashes a password in a format suitable for htpasswd files read by apache.
+
+Currently uses SHA-hashes, because although this format is considered insecure, its the
+most secure format supported by the most platforms.
+
 ## Limitations
 
 ### General
diff --git a/lib/puppet/parser/functions/apache_pw_hash.rb b/lib/puppet/parser/functions/apache_pw_hash.rb
new file mode 100644
index 0000000000..7f187f3377
--- /dev/null
+++ b/lib/puppet/parser/functions/apache_pw_hash.rb
@@ -0,0 +1,14 @@
+Puppet::Parser::Functions::newfunction(:apache_pw_hash, :type => :rvalue, :doc => <<-EOS
+Hashes a password in a format suitable for htpasswd files read by apache.
+
+Currently uses SHA-hashes, because although this format is considered insecure, its the
+most secure format supported by the most platforms.
+EOS
+) do |args|
+  raise(Puppet::ParseError, "apache_pw_hash() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
+  raise(Puppet::ParseError, "apache_pw_hash(): first argument must be a string") unless args[0].is_a? String
+  raise(Puppet::ParseError, "apache_pw_hash(): first argument must not be empty") if args[0].empty?
+
+  password = args[0]
+  return '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
+end
diff --git a/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb b/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb
new file mode 100644
index 0000000000..3e2f75cbae
--- /dev/null
+++ b/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "the apache_pw_hash function" do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  it "should exist" do
+    expect(Puppet::Parser::Functions.function("apache_pw_hash")).to eq("function_apache_pw_hash")
+  end
+
+  it "should raise a ParseError if there is less than 1 arguments" do
+    expect { scope.function_apache_pw_hash([]) }.to( raise_error(Puppet::ParseError))
+  end
+
+  it "should raise an Puppet::ParseError if argument is an empty string" do
+    expect { scope.function_apache_pw_hash(['']) }.to( raise_error(Puppet::ParseError))
+  end
+
+  context "when argument is not a string" do
+    it { expect { scope.function_apache_pw_hash([1]) }.to( raise_error(Puppet::ParseError)) }
+    it { expect { scope.function_apache_pw_hash([true]) }.to( raise_error(Puppet::ParseError)) }
+    it { expect { scope.function_apache_pw_hash([{}]) }.to( raise_error(Puppet::ParseError)) }
+    it { expect { scope.function_apache_pw_hash([[]]) }.to( raise_error(Puppet::ParseError)) }
+  end
+
+  it "should raise an Puppet::ParseError if argument is not a string" do
+    expect { scope.function_apache_pw_hash([1]) }.to( raise_error(Puppet::ParseError))
+  end
+
+  it "should return proper hash" do
+    expect(scope.function_apache_pw_hash(['test'])).to(eq('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M='))
+  end
+end

From 594d115bb2c0c25e69499b9fdc2033c191fcd9b0 Mon Sep 17 00:00:00 2001
From: Zhechka Toteva <Zhechka.Toteva@cern.ch>
Date: Thu, 6 Jul 2017 14:52:34 +0200
Subject: [PATCH 1191/2267] Add proxy_pass in directory template for location
 directive

---
 templates/vhost/_directories.erb | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 8a17064323..e4a7d7791b 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -336,6 +336,39 @@
         <%- end -%>
       <%- end -%>
     <%- end -%>
+    <%- if directory['proxy_pass'] and directory['provider'] and directory['provider'].match('location') -%>
+      <%- directory['proxy_pass'].flatten.compact.each do |proxy| -%>
+    ProxyPass <%= proxy['url'] %>
+        <%- if proxy['params'] -%>
+          <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
+          <%- end -%>
+        <%- end -%>
+        <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
+        <%- end %>
+        <%- if not proxy['reverse_cookies'].nil? -%>
+          <%- Array(proxy['reverse_cookies']).each do |reverse_cookies| -%>
+            <%- if reverse_cookies['path'] -%>
+    ProxyPassReverseCookiePath <%= reverse_cookies['path'] %> <%= reverse_cookies['url'] %>
+            <%- end -%>
+            <%- if reverse_cookies['domain'] -%>
+    ProxyPassReverseCookieDomain <%= reverse_cookies['domain'] %> <%= reverse_cookies['url'] %>
+            <%- end -%>
+          <%- end -%>
+        <%- end -%>
+        <%- if proxy['reverse_urls'].nil? -%>
+    ProxyPassReverse <%= proxy['url'] %>
+        <%- else -%>
+          <%- Array(proxy['reverse_urls']).each do |reverse_url| -%>
+    ProxyPassReverse <%= reverse_url %>
+          <%- end -%>
+        <%- end -%>
+        <%- if proxy['setenv'] -%>
+          <%- Array(proxy['setenv']).each do |setenv_var| -%>
+    SetEnv <%= setenv_var %>
+          <%- end -%>
+        <%- end -%>
+      <% end -%>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>

From 3128d55d0ea82d3ff99aed971a1587f91193a053 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 24 Jul 2017 19:14:42 +0200
Subject: [PATCH 1192/2267] Use puppet 4 types to avoid deprecation warnings

---
 manifests/init.pp            |  4 ++--
 manifests/mod/negotiation.pp | 10 ++--------
 manifests/mod/ssl.pp         |  2 +-
 manifests/vhost.pp           |  5 +----
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 516c966ad2..7f9c2b99e2 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -271,7 +271,7 @@
   if $::apache::conf_dir and $::apache::params::conf_file {
     if $::osfamily == 'gentoo' {
       $error_documents_path = '/usr/share/apache2/error'
-      if is_array($default_mods) {
+      if $default_mods =~ Array {
         if versioncmp($apache_version, '2.4') >= 0 {
           if defined('apache::mod::ssl') {
             ::portage::makeconf { 'apache2_modules':
@@ -336,7 +336,7 @@
 
     # preserve back-wards compatibility to the times when default_mods was
     # only a boolean value. Now it can be an array (too)
-    if is_array($default_mods) {
+    if $default_mods =~ Array {
       class { '::apache::default_mods':
         all  => false,
         mods => $default_mods,
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index c7c34b81fe..1bdea6bbb3 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -1,17 +1,11 @@
 class apache::mod::negotiation (
-  $force_language_priority = 'Prefer Fallback',
-  $language_priority = [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+  Variant[Array[String], String] $force_language_priority = 'Prefer Fallback',
+  Variant[Array[String], String] $language_priority = [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
                         'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
                         'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
                         'zh-TW' ],
 ) {
   include ::apache
-  if !is_array($force_language_priority) and !is_string($force_language_priority) {
-    fail('force_languague_priority must be a string or array of strings')
-  }
-  if !is_array($language_priority) and !is_string($language_priority) {
-    fail('force_languague_priority must be a string or array of strings')
-  }
 
   ::apache::mod { 'negotiation': }
   # Template uses no variables
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index d27b6b8eeb..76726b8e56 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -53,7 +53,7 @@
     }
   }
 
-  if is_bool($ssl_honorcipherorder) {
+  if $ssl_honorcipherorder =~ Boolean {
     $_ssl_honorcipherorder = $ssl_honorcipherorder
   } else {
     $_ssl_honorcipherorder = $ssl_honorcipherorder ? {
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 98bbfcb571..18217deebe 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -59,7 +59,7 @@
   $access_log_syslog                                                                = false,
   $access_log_format                                                                = false,
   $access_log_env_var                                                               = false,
-  $access_logs                                                                      = undef,
+  Optional[Array] $access_logs                                                      = undef,
   $aliases                                                                          = undef,
   $directories                                                                      = undef,
   Boolean $error_log                                                                = true,
@@ -324,9 +324,6 @@
       'env'         => $access_log_env_var
     }]
   } elsif $access_logs {
-    if !is_array($access_logs) {
-      fail("Apache::Vhost[${name}]: access_logs must be an array of hashes")
-    }
     $_access_logs = $access_logs
   }
 

From 6a9dcbb3358fa2a074198010bf255a7110f003a5 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 24 Jul 2017 15:55:44 -0300
Subject: [PATCH 1193/2267] Add missing parens in mod/jk spec test

---
 spec/classes/mod/jk_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 5a67345ef3..5a26ecc280 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -14,7 +14,7 @@
 
   context "with only required facts and no parameters" do
 
-    let :facts do
+    let (:facts) do
       {
         :osfamily               => 'RedHat',
         :operatingsystem        => 'RedHat',

From e09e690f447e2d6da9453baeb8e22494894234bd Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Mon, 24 Jul 2017 13:06:29 -0700
Subject: [PATCH 1194/2267] (MODULES-5197) release 2.0.0 prep

---
 CHANGELOG.md  | 132 +++++++++++++++++++++++++++++++++++++++-----------
 metadata.json |   4 +-
 2 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e921ccc215..7c8fa2b838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,54 @@
-## Supported Release 1.11.0
-#### Summary
+# Change log
+
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org).
+
+## Supported Release [2.0.0]
+### Summary
+Major release **removing Puppet 3 support** and other backwards-incompatible changes.
+
+#### Added
+- support for FileETag directive configurable with the `file_e_tag` parameter
+- ability to configure multiple ports per vhost
+- RequestHeader directive to vhost template ([MODULES-4156](https://tickets.puppet.com/browse/MODULES-4156))
+- customizability for AllowOverride directive in userdir.conf ([MODULES-4516](https://tickets.puppet.com/browse/MODULES-4516))
+- AdvertiseFrequency directive for cluster.conf ([MODULES-4500](https://tickets.puppet.com/browse/MODULES-4500))
+- `ssl_proxy_protocol` and `ssl_sessioncache` parameters for mod::ssl ([MODULES-4737](https://tickets.puppet.com/browse/MODULES-4737))
+- SSLCACertificateFile directive in ssl.conf configurable with `ssl_ca` parameter
+- mod::authnz_pam 
+- mod::intercept_form_submit 
+- mod::lookup_identity
+- Suse compatibility for mod::proxy_html
+- support for AddCharset directive configurable with `add_charset` parameter
+- support for SSLProxyVerifyDepth and SSLProxyCACertificateFile directives configurable with `ssl_proxy_verify_depth` and `ssl_proxy_ca_cert` respectively
+- `manage_security_crs` parameter for mod::security
+- support for LimitExcept directive configurable with `limit_except` parameter
+- support for WSGIRestrictEmbedded directive configurable with `wsgi_restrict_embedded` parameter
+- support for custom UserDir path ([MODULES-4933](https://tickets.puppet.com/browse/MODULES-4933))
+- support for PassengerMaxRequests directive configurable with `passenger_max_requests`
+- option to override module package names with `mod_packages` parameter ([MODULES-3838](https://tickets.puppet.com/browse/MODULES-3838))
+
+#### Removed
+- enclose_ipv6 as it was added to puppetlabs-stdlib
+- deprecated `$verifyServerCert` parameter from the `apache::mod::authnz_ldap` class ([MODULES-4445](https://tickets.puppet.com/browse/MODULES-4445))
+
+#### Changed
+- `keepalive` default to 'On' from 'Off'
+- Puppet version compatibility to ">= 4.7.0 < 6.0.0"
+- puppetlabs-stdlib dependency to ">= 4.12.0 < 5.0.0"
+- `ssl_cipher` to explicitly disable 3DES because of Sweet32
+
+#### Fixed
+- various issues in the vhost template
+- use of deprecated `include_src` parameter in vhost_spec
+- management of ssl.conf on RedHat systems
+- various SLES/Suse params
+- mod::cgi ordering for FreeBSD
+- issue where ProxyPreserveHost could not be set without other Proxy* directives
+- the module attempting to install proxy_html on Ubuntu Xenial and Debian Stretch
+
+## Supported Release [1.11.0]
+### Summary
 This release adds SLES12 Support and many more features and bugfixes.
 
 #### Features
@@ -68,7 +117,7 @@ This release adds SLES12 Support and many more features and bugfixes.
 - (MODULES-3744) Process $crs_package before $modsec_dir
 - (MODULES-1491) Adds `::apache` include to mods that need it
 
-## Supported Release 1.10.0
+## Supported Release [1.10.0]
 #### Summary
 This release fixes backwards compatibility bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature.
 
@@ -89,7 +138,7 @@ This release fixes backwards compatibility bugs introduced in 1.9.0. Also includ
 - Revert "changed rpaf Configuration Directives: RPAF -> RPAF_". Bug introduced in release 1.9.0.
 - Set actual path to apachectl on FreeBSD. Fixes snippets verification.
 
-## Supported Release 1.9.0 [DELETED]
+## Supported Release [1.9.0] [DELETED]
 #### Features
 - Added `apache_version` fact
 - Added `apache::balancer::target` attribute
@@ -169,7 +218,7 @@ This release fixes backwards compatibility bugs introduced in 1.9.0. Also includ
 - Fixed xml2enc for proxy\_html on debian
 - Fixed a problem where the apache service restarts too fast
 
-## Supported Release 1.8.1
+## Supported Release [1.8.1]
 ### Summary
 This release includes bug fixes and a documentation update.
 
@@ -178,7 +227,7 @@ This release includes bug fixes and a documentation update.
 - Fixes a bug where passenger.conf was vulnerable to purging.
 - Removes the pin of the concat module dependency.
 
-## 2016-01-26 - Supported Release 1.8.0
+## Supported Release [1.8.0]
 ### Summary
 This release includes a lot of bug fixes and feature updates, including support for Debian 8, as well as many test improvements.
 
@@ -219,12 +268,12 @@ This release includes a lot of bug fixes and feature updates, including support
 - Added X-Forwarded-For into log_formats defaults.
 - (MODULES-2703) Allow mod pagespeed to take an array of lines as additional_configuration.
 
-## Supported Release 1.7.1
+## Supported Release [1.7.1]
 ###Summary
 
 Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
 
-## 2015-11-17 - Supported Release 1.7.0
+## Supported Release [1.7.0]
 ### Summary
 This release includes many new features and bugfixes. There are test, documentation and misc improvements.
 
@@ -272,7 +321,7 @@ This release includes many new features and bugfixes. There are test, documentat
 - allow multiple IP addresses per vhost
 - default document root update for Ubuntu 14.04 and Debian 8 
 
-## 2015-07-28 - Supported Release 1.6.0
+## Supported Release [1.6.0]
 ### Summary
 This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds.
 
@@ -286,7 +335,7 @@ This release includes a couple of new features, along with test and documentatio
 - Do not use systemd on Amazon Linux
 - Add missing docs for `timeout` parameter (MODULES-2148)
 
-## 2015-06-11 - Supported Release 1.5.0
+## Supported Release [1.5.0]
 ### Summary
 This release primarily adds Suse compatibility. It also adds a handful of other
 parameters for greater configuration control.
@@ -318,11 +367,11 @@ parameters for greater configuration control.
 - Fix userdir access permissions
 - Fix issue where the module was trying to use systemd on Amazon Linux.
 
-## 2015-04-28 - Supported Release 1.4.1
+## Supported Release [1.4.1]
 
 This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module.
 
-## 2015-03-17 - Supported Release 1.4.0
+## Supported Release [1.4.0]
 ###Summary
 
 This release fixes the issue where the docroot was still managed even if the default vhosts were disabled and has many other features and bugfixes including improved support for 'deny' and 'require' as arrays in the 'directories' parameter under `apache::vhost`
@@ -365,7 +414,7 @@ This release fixes the issue where the docroot was still managed even if the def
 - Change the loadfile name for `mod_passenger` so `mod_proxy` will load by default before `mod_passenger`
 - Remove old Debian work-around that removed `passenger_extra.conf`
 
-## 2015-02-17 - Supported Release 1.3.0
+## Supported Release [1.3.0]
 ### Summary
 
 This release has many new features and bugfixes, including the ability to optionally not trigger service restarts on config changes.
@@ -424,7 +473,7 @@ This release has many new features and bugfixes, including the ability to option
 - Fix indentation in `vhost/_directories.erb` template (MODULES-1688)
 - Create symlinks on all distros if `vhost_enable_dir` is specified
 
-## 2014-09-30 - Supported Release 1.2.0
+## Supported Release [1.2.0]
 ### Summary
 
 This release features many improvements and bugfixes, including several new defines, a reworking of apache::vhost for more extensibility, and many new parameters for more customization. This release also includes improved support for strict variables and the future parser.
@@ -527,13 +576,13 @@ This release features many improvements and bugfixes, including several new defi
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
 * SLES is unsupported.
 
-## 2014-07-15 - Supported Release 1.1.1
+## Supported Release [1.1.1]
 ### Summary
 
 This release merely updates metadata.json so the module can be uninstalled and
 upgraded via the puppet module command.
 
-## 2014-04-14 Supported Release 1.1.0
+## Supported Release [1.1.0]
 
 ### Summary
 
@@ -568,7 +617,7 @@ through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
 * SLES is unsupported.
 
-## 2014-03-04 Supported Release 1.0.1
+## Supported Release [1.0.1]
 ### Summary
 
 This is a supported release.  This release removes a testing symlink that can
@@ -581,7 +630,7 @@ modulepath.
 * By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
 * SLES is unsupported.
  
-## 2014-03-04 Supported Release 1.0.0
+## Supported Release [1.0.0]
 ### Summary
 
 This is a supported release. This release introduces Apache 2.4 support for
@@ -605,7 +654,7 @@ Debian and RHEL based osfamilies.
 
 ---
 
-## 2014-01-31 Release 0.11.0
+## Supported Release [0.11.0]
 ### Summary:
 
 This release adds preliminary support for Windows compatibility and multiple rewrite support.
@@ -642,7 +691,7 @@ This release adds preliminary support for Windows compatibility and multiple rew
 - Fix $ports_file reference in Namevirtualhost.
 
 
-## 2013-12-05 Release 0.10.0
+## Supported Release [0.10.0]
 ### Summary:
 
 This release adds FreeBSD osfamily support and various other improvements to some mods.
@@ -681,7 +730,7 @@ This release adds FreeBSD osfamily support and various other improvements to som
 - only apply Directory defaults when provider is a directory
 - Working mod_authnz_ldap support on Debian/Ubuntu
 
-## 2013-09-06 Release 0.9.0
+## Supported Release [0.9.0]
 ### Summary:
 This release adds more parameters to the base apache class and apache defined
 resource to make the module more flexible. It also adds or enhances SuPHP,
@@ -739,13 +788,13 @@ Class['apache::service']`
 - Made `aliases` able to take a single alias hash instead of requiring an
 array.
 
-## 2013-07-26 Release 0.8.1
+## Supported Release [0.8.1]
 #### Bugfixes:
 - Update `apache::mpm_module` detection for worker/prefork
 - Update `apache::mod::cgi` and `apache::mod::cgid` detection for
 worker/prefork
 
-## 2013-07-16 Release 0.8.0
+## Supported Release [0.8.0]
 #### Features:
 - Add `servername` parameter to `apache` class
 - Add `proxy_set` parameter to `apache::balancer` define
@@ -757,7 +806,7 @@ worker/prefork
 - Fix `apache::mod::*` to notify the service on config change
 - Documentation updates
 
-## 2013-07-09 Release 0.7.0
+## Supported Release [0.7.0]
 #### Changes:
 - Essentially rewrite the module -- too many to list
 - `apache::vhost` has many abilities -- see README.md for details
@@ -767,12 +816,12 @@ worker/prefork
 #### Bugfixes:
 - Many. And many more to come
 
-## 2013-03-2 Release 0.6.0
+## Supported Release [0.6.0]
 - update travis tests (add more supported versions)
 - add access log_parameter
 - make purging of vhost dir configurable
 
-## 2012-08-24 Release 0.4.0
+## Supported Release [0.4.0]
 #### Changes:
 - `include apache` is now required when using `apache::mod::*`
 
@@ -781,7 +830,7 @@ worker/prefork
 - Fix formatting in vhost template
 - Fix spec tests such that they pass
 
-## 2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
+## Supported Release [0.0.4]
 * e62e362 Fix broken tests for ssl, vhost, vhost::*
 * 42c6363 Changes to match style guide and pass puppet-lint without error
 * 42bc8ba changed name => path for file resources in order to name namevar by it's name
@@ -814,3 +863,32 @@ worker/prefork
 * 6a5b11a Ensure installed
 * f672e46 a2mod fix
 * 8a56ee9 add pthon support to apache
+
+[2.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0
+[1.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...1.11.0
+[1.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...1.10.0
+[1.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...1.9.0
+[1.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.0...1.8.1
+[1.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.1...1.8.0
+[1.7.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.0...1.7.1
+[1.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.6.0...1.7.0
+[1.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.5.0...1.6.0
+[1.5.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.1...1.5.0
+[1.4.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.0...1.4.1
+[1.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.3.0...1.4.0
+[1.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.2.0...1.3.0
+[1.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.1...1.2.0
+[1.1.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.0...1.1.1
+[1.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.1...1.1.0
+[1.0.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.0...1.0.1
+[1.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.11.0...1.0.0
+[0.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...0.11.0
+[0.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...0.10.0
+[0.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...0.9.0
+[0.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.8.0...0.8.1
+[0.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.7.0...0.8.0
+[0.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.6.0...0.7.0
+[0.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.5.0-rc1...0.6.0
+[0.5.0-rc1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.4.0...0.5.0-rc1
+[0.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.3.0...0.4.0
+[0.0.4]:https://github.com/puppetlabs/puppetlabs-apache/commits/0.0.4
diff --git a/metadata.json b/metadata.json
index 2cc613e014..710223ff62 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,7 +1,7 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.11.0",
-  "author": "puppetlabs",
+  "version": "2.0.0",
+  "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-apache.git",

From 47e0176afb893b54872d735b642be294abbea901 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 24 Jul 2017 19:14:57 +0200
Subject: [PATCH 1195/2267] Remove lint ignore that's no longer needed

---
 manifests/mod/authnz_ldap.pp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index cc9ab67f02..560909f871 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,4 +1,3 @@
-# lint:ignore:variable_is_lowercase required for compatibility
 class apache::mod::authnz_ldap (
   Boolean $verify_server_cert = true,
   $package_name               = undef,
@@ -22,4 +21,3 @@
     notify  => Class['apache::service'],
   }
 }
-# lint:endignore

From 44255069783d75dfe0307ba810c89fb363d4de52 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 24 Jul 2017 17:52:27 -0300
Subject: [PATCH 1196/2267] Change parameters in mod::jk to try to fix spec
 test

---
 manifests/mod/jk.pp         | 16 ++++++++++++++--
 spec/classes/mod/jk_spec.rb |  6 +++++-
 templates/mod/jk.conf.erb   |  8 ++++----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index a1b29568be..cf2e4b6699 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -11,7 +11,8 @@
 class apache::mod::jk (
   $workers_file          = undef,
   $worker_property       = {},
-  $shm_file              = "${::apache::logroot}/jk-runtime-status",
+  $logroot               = undef,
+  $shm_file              = 'jk-runtime-status',
   $shm_size              = undef,
   $mount_file            = undef,
   $mount_file_reload     = undef,
@@ -21,7 +22,7 @@
   $mount_copy            = undef,
   $worker_indicator      = undef,
   $watchdog_interval     = undef,
-  $log_file              = "${::apache::logroot}/mod_jk.log",
+  $log_file              = 'mod_jk.log',
   $log_level             = undef,
   $log_stamp_format      = undef,
   $request_log_format    = undef,
@@ -68,6 +69,16 @@
     notify  => Class['apache::service'],
   }
 
+  # Shared memory and log paths
+  if $logroot == undef {
+    $shm_path = ${::apache::logroot}/${shm_file}
+    $log_path = ${::apache::logroot}/${log_file}
+  }
+  else {
+    $shm_path = ${logroot}/${shm_file}
+    $log_path = ${logroot}/${log_file}
+  }
+
   # Main config file
   file {'jk.conf':
     path    => "${::apache::mod_dir}/jk.conf",
@@ -78,6 +89,7 @@
     ],
   }
 
+  }
   # Workers file
   if $workers_file != undef {
     $workers_path = $workers_file ? {
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 5a26ecc280..f7a9f70c86 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -22,10 +22,14 @@
       }
     end
 
-    let(:pre_condition) do
+    let (:pre_condition) do
       'include apache'
     end
 
+    let (:params) do
+      :logroot => '/var/log/httpd'
+    end
+
     it_behaves_like 'minimal resources'
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
index 8a8a102706..c0d5bc2fff 100644
--- a/templates/mod/jk.conf.erb
+++ b/templates/mod/jk.conf.erb
@@ -10,8 +10,8 @@
   JkWorkerProperty <%= property %>=<%= value %>
   <%- end -%>
   <%- end -%>
-  <%- if @shm_file -%>
-  JkShmFile <%= @shm_file %>
+  <%- if @shm_path -%>
+  JkShmFile <%= @shm_path %>
   <%- end -%>
   <%- if @shm_size -%>
   JkShmSize <%= @shm_size %>
@@ -44,8 +44,8 @@
   <%- if @watchdog_interval -%>
   JkWatchdogInterval <%= @watchdog_interval %>
   <%- end -%>
-  <%- if @log_file -%>
-  JkLogFile <%= @log_file %>
+  <%- if @log_path -%>
+  JkLogFile <%= @log_path %>
   <%- end -%>
   <%- if @log_level -%>
   JkLogLevel <%= @log_level %>

From c563532a0446caa81568697cb45f2def9101cebd Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 24 Jul 2017 17:58:09 -0300
Subject: [PATCH 1197/2267] Fix quoting in mod::jk

---
 manifests/mod/jk.pp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index cf2e4b6699..1e66ce5781 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -71,12 +71,12 @@
 
   # Shared memory and log paths
   if $logroot == undef {
-    $shm_path = ${::apache::logroot}/${shm_file}
-    $log_path = ${::apache::logroot}/${log_file}
+    $shm_path = "${::apache::logroot}/${shm_file}"
+    $log_path = "${::apache::logroot}/${log_file}"
   }
   else {
-    $shm_path = ${logroot}/${shm_file}
-    $log_path = ${logroot}/${log_file}
+    $shm_path = "${logroot}/${shm_file}"
+    $log_path = "${logroot}/${log_file}"
   }
 
   # Main config file
@@ -89,7 +89,6 @@
     ],
   }
 
-  }
   # Workers file
   if $workers_file != undef {
     $workers_path = $workers_file ? {

From 5819cb65a058bb36e5755f3b76e404fa0ddb58d4 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Tue, 25 Jul 2017 12:52:20 +0100
Subject: [PATCH 1198/2267] (maint) - Updating format of Doc

Putting default and boolean on seperate lines.
---
 README.md | 410 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 249 insertions(+), 161 deletions(-)

diff --git a/README.md b/README.md
index 75c416b123..d3c4c806bc 100755
--- a/README.md
+++ b/README.md
@@ -615,7 +615,7 @@ apache::vhost { 'second.example.com':
 }
 ```
 
-You can also configure a mix of IP- and [name-based virtual hosts][] in any combination of [SSL][SSL encryption] and unencrypted configurations. 
+You can also configure a mix of IP- and [name-based virtual hosts][] in any combination of [SSL][SSL encryption] and unencrypted configurations.
 
 In this example, we add two IP-based virtual hosts on an IP address (in this example, 10.0.0.10). One uses SSL and the other is unencrypted:
 
@@ -837,7 +837,7 @@ class { 'apache': }
 
 Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. If not specified, this parameter omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
 
-Values: 'on', 'off', 'nodecode'. 
+Values: 'on', 'off', 'nodecode'.
 
 Default: `undef`.
 
@@ -845,7 +845,7 @@ Default: `undef`.
 
 Configures module template behavior, package names, and default Apache modules by defining the version of Apache to use. We do not recommend manually configuring this parameter without reason.
 
-Default: Depends on operating system and release version detected by the [`apache::version`][] class. 
+Default: Depends on operating system and release version detected by the [`apache::version`][] class.
 
 ##### `conf_dir`
 
@@ -866,7 +866,7 @@ Default: `apache/httpd.conf.erb`.
 
 ##### `confd_dir`
 
-Sets the location of the Apache server's custom configuration directory. 
+Sets the location of the Apache server's custom configuration directory.
 
 Default: Depends on operating system.
 
@@ -885,7 +885,9 @@ Default: `undef`.
 
 Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `default_mods`
 
@@ -907,7 +909,9 @@ Sets the default certificate authority for the Apache server.
 
 Although the default value results in a functioning Apache server, you **must** update this parameter with your certificate authority information before deploying this server in a production environment.
 
-Boolean. Default: `undef`.
+Boolean.
+
+Default: `undef`.
 
 ##### `default_ssl_cert`
 
@@ -970,7 +974,7 @@ Default: Depends on operating system.
 
 ##### `default_ssl_vhost`
 
-Configures a default [SSL][SSL encryption] virtual host. 
+Configures a default [SSL][SSL encryption] virtual host.
 
 If `true`, Puppet automatically configures the following virtual host using the [`apache::vhost`][] defined type:
 
@@ -988,7 +992,9 @@ apache::vhost { 'default-ssl':
 > **Note**: SSL virtual hosts only respond to HTTPS queries.
 
 
-Boolean. Default: `false`.
+Boolean.
+
+Default: `false`.
 
 ##### `default_type`
 
@@ -998,17 +1004,19 @@ Default: `undef`.
 
 ##### `default_vhost`
 
-Configures a default virtual host when the class is declared. 
+Configures a default virtual host when the class is declared.
 
 To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to `false`.
 
 > **Note**: Apache will not start without at least one virtual host. If you set this to `false` you must configure a virtual host elsewhere.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `dev_packages`
 
-Configures a specific dev package to use. 
+Configures a specific dev package to use.
 
 Values: A string or array of strings.
 
@@ -1045,7 +1053,9 @@ Default: Depends on operating system.
 
 Determines whether to enable [custom error documents][] on the Apache server.
 
-Boolean. Default: `false`.
+Boolean.
+
+Default: `false`.
 
 ##### `group`
 
@@ -1068,7 +1078,11 @@ Default: Depends on operating system.
 
 ##### http_protocol_options`
 
-Specifies the strictness of HTTP protocol checks. Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`, `RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`. Default '`Strict LenientMethods Allow0.9`'.
+Specifies the strictness of HTTP protocol checks.
+
+Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`, `RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`.
+
+Default '`Strict LenientMethods Allow0.9`'.
 
 ##### `keepalive`
 
@@ -1092,7 +1106,9 @@ Default: '100'.
 
 ##### `lib_path`
 
-Specifies the location where [Apache module][Apache modules] files are stored. Default: Depends on operating system.
+Specifies the location where [Apache module][Apache modules] files are stored.
+
+Default: Depends on operating system.
 
 - **Debian** and **Gentoo**: `/usr/lib/apache2/modules`
 - **FreeBSD**: `/usr/local/libexec/apache24`
@@ -1151,11 +1167,15 @@ When `false`, stops Puppet from creating the group resource.
 
 If you have a group created from another Puppet module that you want to use to run Apache, set this to `false`. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `supplementary_groups`
 
-A list of groups to which the user belongs. These groups are in addition to the primary group. Default: No additional groups.
+A list of groups to which the user belongs. These groups are in addition to the primary group.
+
+Default: No additional groups.
 
 Notice: This option only has an effect when `manage_user` is set to true.
 
@@ -1165,7 +1185,9 @@ When `false`, stops Puppet from creating the user resource.
 
 This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `mod_dir`
 
@@ -1215,7 +1237,7 @@ Default: Depends on operating system.
 Controls the `package` resource's [`ensure`][] attribute. Values: 'absent', 'installed' (or equivalent 'present'), or a version string.
 
 Default: 'installed'.
- 
+
 ##### `pidfile`
 
 Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm.
@@ -1238,7 +1260,9 @@ Removes all other Apache configs and virtual hosts.
 
 Setting this to `false` is a stopgap measure to allow the apache module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `purge_vhost_dir`
 
@@ -1246,7 +1270,9 @@ If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parame
 
 Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
-Boolean. Default: same as [`purge_configs`][].
+Boolean.
+
+Default: same as [`purge_configs`][].
 
 ##### `rewrite_lock`
 
@@ -1268,7 +1294,7 @@ Default: 'root@localhost'.
 
 ##### `servername`
 
-Sets the Apache server name via Apache's [`ServerName`][] directive. 
+Sets the Apache server name via Apache's [`ServerName`][] directive.
 
 Setting to `false` will not set ServerName at all.
 
@@ -1301,11 +1327,13 @@ Default: 'OS'.
 
 Determines whether Puppet enables the Apache HTTPD service when the system is booted.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `service_ensure`
 
-Determines whether Puppet should make sure the service is running. Values: `true` (or 'running'), `false` (or 'stopped'). 
+Determines whether Puppet should make sure the service is running. Values: `true` (or 'running'), `false` (or 'stopped').
 
 The `false` or 'stopped' values set the 'httpd' service resource's `ensure` parameter to `false`, which is useful when you want to let the service be managed by another application, such as Pacemaker.
 
@@ -1325,7 +1353,9 @@ Default: Depends on operating system.
 
 Determines whether Puppet manages the HTTPD service's state.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `service_restart`
 
@@ -1337,19 +1367,11 @@ Default: `undef`.
 
 ##### `ssl_ca`
 
-Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile). Default: undef. It is possible to override this on a vhost level.
-
-
-
-
-
-
-
-
-
-
+Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile).
 
+It is possible to override this on a vhost level.
 
+Default: `undef`.
 
 
 ##### `timeout`
@@ -1370,7 +1392,9 @@ Default: 'On'.
 
 Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `file_mode`
 
@@ -1382,13 +1406,17 @@ Default: '0644'.
 
 ##### `root_directory_options`
 
-Array of the desired options for the / directory in httpd.conf. Defaults to 'FollowSymLinks'.
+Array of the desired options for the / directory in httpd.conf.
+
+Defaults: 'FollowSymLinks'.
 
 ##### `root_directory_secured`
 
 Sets the default access policy for the / directory in httpd.conf. A value of `false` allows access to all resources that are missing a more specific access policy. A value of `true` denies access to all resources by default. If `true`, more specific rules must be used to allow access to these resources (for example, in a directory block using the [`directories`](#parameter-directories-for-apachevhost) parameter).
 
-Boolean. Default: `false`.
+Boolean.
+
+Default: `false`.
 
 ##### `vhost_dir`
 
@@ -1408,7 +1436,7 @@ Defines the pattern for files included from the `vhost_dir`.
 If set to a value like `[^.#]\*.conf[^~]` to make sure that files accidentally created in this directory (such as files created by version control systems or editor backups) are *not* included in your server configuration.
 
 Default: '*', also for BC with previous versions of this module. TODO: what does "also for BC" mean?
- 
+
 Some operating systems use a value of `*.conf`. By default, this module creates configuration files ending in `.conf`.
 
 ##### `user`
@@ -1448,7 +1476,7 @@ Default: Depends on operating system:
 
 ##### `scriptalias`
 
-Directory to use for global script alias 
+Directory to use for global script alias
 
 Default: Depends on operating system:
 
@@ -1472,7 +1500,9 @@ Default: Depends on operating system:
 
 #### Class: `apache::dev`
 
-Installs Apache development libraries. Default: Depends on the operating system:[`dev_packages`][] parameter of the [`apache::params`][] class, based on your operating system:
+Installs Apache development libraries.
+
+Default: Depends on the operating system:[`dev_packages`][] parameter of the [`apache::params`][] class, based on your operating system:
 
 - **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions.
 - **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
@@ -1485,7 +1515,7 @@ Creates [`apache::vhost`][] defined types.
 
 **Parameters**:
 
-* `vhosts`: Specifies the [`apache::vhost`][] defined type's parameters. 
+* `vhosts`: Specifies the [`apache::vhost`][] defined type's parameters.
 
   Values: A [hash][], where the key represents the name and the value represents a [hash][] of [`apache::vhost`][] defined type's parameters.
 
@@ -1657,9 +1687,9 @@ class{'apache::mod::diskio':
 * `dump_io_input`: Dump all input data to the error log.
 
   Values: 'On', 'Off'.
-  
+
   Default: 'Off'.
-  
+
 * `dump_io_output`: Dump all output data to the error log.
 
   Values: 'On', 'Off'.
@@ -1675,32 +1705,34 @@ Installs and manages [`mod_mpm_event`][]. You cannot include `apache::mod::event
 * `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive.  Setting this to `false` removes the parameter.
 
   Default: '511'.
-  
+
 * `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive.  Setting these to `false` removes the parameters.
 
   Default: '150'.
-  
+
 * `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Setting these to `false` removes the parameters.
 
   Default: '0'.
-  
+
 * `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Setting these to `false` removes the parameters.
 
   Default: '75' and '25', respectively.
-  
+
 * `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Setting this to `false` removes the parameter.
 
   Default: '25'.
-  
+
 * `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Setting this to `false` removes the parameter.
 
   Default: '2'.
-  
+
 * `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Setting this to `false` removes the parameter.
 
   Default: '64'.
-  
-* `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. Default: '25'. Setting this to `false` removes the parameter.
+
+* `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive.
+
+  Default: '25'. Setting this to `false` removes the parameter.
 
 ##### Class: `apache::mod::auth_cas`
 
@@ -1715,9 +1747,9 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 - `cas_attribute_prefix`: Adds a header with the value of this header being the attribute values when SAML validation is enabled.
 
   Default: CAS_.
-  
+
 - `cas_attribute_delimiter`: The delimiter between attribute values in the header created by `cas_attribute_prefix`.
-  
+
   Default: ,
 
 - `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding.
@@ -1736,7 +1768,7 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
   Default: `undef`.
 
-- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. 
+- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers.
 
   Default: `undef`.
 
@@ -1753,7 +1785,7 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
   Default: '0750'.
 
 - `cas_debug`: Determines whether to enable the module's debugging mode.
-  
+
   Default: 'Off'.
 
 - `cas_idle_timeout`: Sets the idle timeout limit, in seconds.
@@ -1775,8 +1807,8 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 - `cas_sso_enabled`: Enables experimental support for single sign out (may mangle POST data).
 
   Default: 'Off'.
-  
-- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. 
+
+- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active.
 
   Default: `undef`.
 
@@ -1860,9 +1892,9 @@ class { 'apache::mod::authn_dbd':
 * `authn_dbd_alias`: Name for the 'AuthnProviderAlias'.
 
 * `authn_dbd_dbdriver`: Specifies the database driver to use.
-  
+
   Default: 'mysql'.
-  
+
 * `authn_dbd_exptime`: corresponds to DBDExptime.
 
   Default: 300.
@@ -1870,7 +1902,7 @@ class { 'apache::mod::authn_dbd':
 * `authn_dbd_keep`: Corresponds to DBDKeep.
 
   Default: 8.
-  
+
 * `authn_dbd_max`: Corresponds to DBDMax.
 
   Default: 20.
@@ -1892,9 +1924,9 @@ Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to gener
 * `package_name`: The name of the package.
 
   Default: `undef`.
-  
+
 * `verify_server_cert`: Whether to verify the server certificate.
-  
+
   Default: `undef`.
 
 ##### Class: `apache::mod::cluster`
@@ -1915,12 +1947,12 @@ class { '::apache::mod::cluster':
 * `port`: mod_cluster listen port.
 
   Default: '6666'.
-  
+
 * `server_advertise`: Whether the server should advertise.
 
   Default: `true`.
-  
-* `advertise_frequency`: Sets the interval between advertise messages in seconds[.miliseconds]. 
+
+* `advertise_frequency`: Sets the interval between advertise messages in seconds[.miliseconds].
 
   Default: 10.
 
@@ -1928,8 +1960,8 @@ class { '::apache::mod::cluster':
 
   Default: '127.0.0.1'.
 
-* `keep_alive_timeout`: Specifies how long Apache should wait for a request, in seconds. 
-  
+* `keep_alive_timeout`: Specifies how long Apache should wait for a request, in seconds.
+
   Default: 60.
 
 * `max_keep_alive_requests`: Maximum number of requests kept alive.
@@ -1955,7 +1987,7 @@ Installs and configures [`mod_deflate`][].
 * `types`: An [array][] of [MIME types][MIME `content*type`] to be deflated.
 
   Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x*javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json' ].
-  
+
 * `notes`: A [Hash][] where the key represents the type and the value represents the note name.
 
   Default: { 'Input'  => 'instream', 'Output' => 'outstream', 'Ratio'  => 'ratio' }.
@@ -1968,16 +2000,18 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 
 * `expires_active`: Enables generation of `Expires` headers for a document realm.
 
-  Boolean. Default: `true`.
+  Boolean.
+
+  Default: `true`.
 
 * `expires_default`: Specifies the default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][].
 
   Default: `undef`.
-  
+
 * `expires_by_type`: Describes a set of [MIME `content*type`][] and their expiration times.
 
   Values: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content*type` (i.e. 'text/json') and its value following valid [interval syntax][].
-  
+
   Default: `undef`.
 
 ##### Class: `apache::mod::ext_filter`
@@ -2047,27 +2081,33 @@ Installs and manages [`mod_geoip`][].
 
 * `enable`: Determines whether to globally enable [`mod_geoip`][].
 
-  Boolean. Default: `false`.
-  
+  Boolean.
+
+  Default: `false`.
+
 * `flag`: Sets the GeoIP flag.
 
   Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'.
-  
+
   Default: 'Standard'.
-  
+
 * `output`: Defines which output variables to use.
 
   Values: 'All', 'Env', 'Request', 'Notes'.
-  
+
   Default: 'All'.
 
 * `enable_utf8`: Changes the output from ISO*8859*1 (Latin*1) to UTF*8.
 
-  Boolean. Default: `undef`.
+  Boolean.
+
+  Default: `undef`.
 
 * `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option.
 
-  Boolean. Default: `undef`.
+  Boolean.
+
+  Default: `undef`.
 
 * `scan_proxy_header_field`: Specifies the header [`mod_geoip`][] uses to determine the client's IP address.
 
@@ -2075,7 +2115,9 @@ Installs and manages [`mod_geoip`][].
 
 * `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
 
-  Boolean. Default: `undef`.
+  Boolean.
+
+  Default: `undef`.
 
 ##### Class: `apache::mod::info`
 
@@ -2086,7 +2128,7 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 * `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server*info`.
 
   Values: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either.
-  
+
   Default: ['127.0.0.1','::1'].
 
 * `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'.
@@ -2096,7 +2138,9 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 
 * `restrict_access`: Determines whether to enable access restrictions. If `false`, the `allow_from` whitelist is ignored and any IP address can access `/server*info`.
 
-  Boolean. Default: `true`.
+  Boolean.
+
+  Default: `true`.
 
 ##### Class: `apache::mod::passenger`
 
@@ -2107,9 +2151,9 @@ Installs and manages [`mod_passenger`][]. For Red Hat-based systems, ensure that
 * `passenger_high_performance`: Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance).
 
   Values: 'On', 'Off'.
-  
+
   Default: `undef`.
-  
+
 * `passenger_pool_idle_time`: Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime).
 
   Default: `undef`.
@@ -2182,9 +2226,9 @@ Installs and configures [`mod_negotiation`][].
 * `force_language_priority`: Sets the `ForceLanguagePriority` option.
 
   Values: A string.
-  
+
   Default: `Prefer Fallback`.
-  
+
 * `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module.
 
   Default: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt*BR', 'ru', 'sv', 'zh*CN', 'zh*TW' ]
@@ -2197,7 +2241,7 @@ An SSL provider for Apache using the NSS crypto libraries.
 
 - `transfer_log`: path to access.log
 - `error_log`: path to error.log
-- `passwd_file`: path to file used for NSSPassPhraseDialog directive 
+- `passwd_file`: path to file used for NSSPassPhraseDialog directive
 - `port`: SSL port. Defaults to 8443
 
 ##### Class: `apache::mod::pagespeed`
@@ -2306,15 +2350,15 @@ Installs and manages [`mod_proxy_balancer`][], which provides load balancing.
 * `manager`: Determines whether to enable balancer manager support.
 
   Default: `false`.
-  
+
 * `manager_path`: The server location of the balancer manager.
 
   Default: '/balancer*manager'.
-  
+
 * `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/balancer*manager`.
 
   Default: ['127.0.0.1','::1'].
-  
+
 * `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'.
 
   Default: the value of [`$::apache::apache_version`][`apache_version`]. On Apache 2.4 or greater, `mod_slotmem_shm` is loaded.
@@ -2335,7 +2379,7 @@ Default values for these parameters depend on your operating system. Most of thi
 
 ##### Class: `apache::mod::proxy_html`
 
-**Note**: There is no official package available for `mod_proxy_html`, so you must make it available outside of the apache module. 
+**Note**: There is no official package available for `mod_proxy_html`, so you must make it available outside of the apache module.
 
 ##### Class: `apache::mod::reqtimeout`
 
@@ -2343,10 +2387,10 @@ Installs and configures [`mod_reqtimeout`][].
 
 **Parameters**
 
-* `timeouts`: Sets the [`RequestReadTimeout`][] option. 
+* `timeouts`: Sets the [`RequestReadTimeout`][] option.
 
   Values:  A string or [array][].
-  
+
   Default: ['header=20-40,MinRate=500', 'body=20,MinRate=500'].
 
 ##### Class: `apache::mod::rewrite`
@@ -2400,7 +2444,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 * `ssl_honorcipherorder`
 
   Default: `true`.
-  
+
 * `ssl_openssl_conf_cmd`
 
   Default: `undef`.
@@ -2416,25 +2460,25 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 * `ssl_protocol`
 
   Default: [ 'all', '*SSLv2', '*SSLv3' ].
-  
+
 * `ssl_random_seed_bytes`
 
   Values: A string.
-  
+
   Default: '512'.
-  
+
 * `ssl_sessioncachetimeout`
 
   Values: A string.
-  
+
   Default: '300'.
-  
+
 * `ssl_mutex`:
 
   Values: See [mod_ssl][mod_ssl] documentation.
 
   Default: Based on the OS:
- 
+
   * RedHat/FreeBSD/Suse/Gentoo: 'default'.
   * Debian/Ubuntu + Apache >= 2.4: 'default'.
   * Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'.
@@ -2447,15 +2491,15 @@ Installs [`mod_status`][] and uses the `status.conf.erb` template to generate it
 
 **Parameters**:
 
-* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/server-status`. 
+* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/server-status`.
 
   Default: ['127.0.0.1','::1'].
 * `extended_status`: Determines whether to track extended status information for each request, via the [`ExtendedStatus`][] directive.
 
   Values: 'Off', 'On'.
-  
+
   Default: 'On'.
-  
+
 * `status_path`: The server location of the status page.
 
   Default: '/server-status'.
@@ -2477,7 +2521,7 @@ Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs b
 
   Default: 'GET HEAD POST OPTIONS'.
 
-* `content_types`: A list of one or more allowed [MIME types][MIME `content*type`]. 
+* `content_types`: A list of one or more allowed [MIME types][MIME `content*type`].
 
   Default: 'application/x*www*form*urlencoded|multipart/form*data|text/xml|application/xml|application/x*amf'.
 
@@ -2488,7 +2532,7 @@ Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs b
 * `manage_security_crs`: Manage security_crs.conf rules file.
 
   Default: `true`.
-  
+
 * `modsec_dir`: Defines the path where Puppet installs the modsec configuration and activated rules links.
 
   Default: 'On', set by `modsec_dir` in [`apache::params`][].
@@ -2502,7 +2546,7 @@ ${modsec\_dir}/activated\_rules.
 
   Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
 
-* `restricted_headers`: A list of restricted headers separated by slashes and spaces. 
+* `restricted_headers`: A list of restricted headers separated by slashes and spaces.
 
   Default: 'Proxy*Connection/ /Lock*Token/ /Content*Range/ /Translate/ /via/ /if/'.
 
@@ -2529,27 +2573,27 @@ ${modsec\_dir}/activated\_rules.
 * `audit_log_parts`: Sets the sections to be put in the [audit log][].
 
   Default: 'ABIJDEFHZ'.
-  
+
 * `anomaly_score_blocking`: Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set.
 
   Default: 'off'.
-  
+
 * `inbound_anomaly_threshold`: Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
   Default: 5.
-  
+
 * `outbound_anomaly_threshold`: Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
   Default: 4.
-  
+
 * `critical_anomaly_score`: Sets the scoring points of the critical severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
   Default: 5.
-  
+
 * `error_anomaly_score`: Sets the scoring points of the error severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
   Default: 4.
-  
+
 * `warning_anomaly_score`: Sets the scoring points of the warning severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
   Default: 3.
@@ -2565,11 +2609,11 @@ Default: 2.
 * `secrequestbodylimit`:  Sets the maximum request body size ModSecurity accepts for buffering.
 
   Default: '13107200'.
-  
+
 * `secrequestbodynofileslimit`: Sets the maximum request body size ModSecurity accepts for buffering, excluding the size of any files being transported in the request.
 
   Default: '131072'.
-  
+
 * `secrequestbodyinmemorylimit`: Sets the maximum request body size that ModSecurity stores in memory.
 
   Default: '131072'
@@ -2583,26 +2627,26 @@ Enables Python support via [`mod_wsgi`][].
 * `mod_path`: Defines the path to the `mod_wsgi` shared object (`.so`) file.
 
   Default: `undef`.
-  
+
   * If the `mod_path` parameter doesn't contain `/`, Puppet prefixes it with your operating system's default module path. Otherwise, Puppet follows it literally.
-  
+
 * `package_name`: Names the package that installs `mod_wsgi`.
 
   Default: `undef`.
 
-* `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. 
+* `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'.
 
   Values: A string specifying a path.
 
   Default: `undef`.
-  
+
 * `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site*packages'.
 
   Values: A string specifying a path.
-  
+
   Default: `undef`.
 
-* `wsgi_restrict_embedded`: Defines the [`WSGIRestrictEmbedded`][] directive, such as 'On'. 
+* `wsgi_restrict_embedded`: Defines the [`WSGIRestrictEmbedded`][] directive, such as 'On'.
 
 Values: On|Off|undef.
 
@@ -2660,7 +2704,9 @@ Sets the title of the balancer cluster and name of the `conf.d` file containing
 
 ##### `proxy_set`
 
-Configures key-value pairs as [`ProxySet`][] lines. Values: a [hash][]. Default: '{}'.
+Configures key-value pairs as [`ProxySet`][] lines. Values: a [hash][].
+
+Default: '{}'.
 
 ##### `collect_exported`
 
@@ -2672,7 +2718,9 @@ To dynamically declare backend servers via exported resources collected on a cen
 
 If you don't use exported resources, a single Puppet run configures all balancer members. If you use exported resources, Puppet has to run on the balanced nodes first, then run on the balancer.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 #### Defined type: `apache::balancermember`
 
@@ -2756,7 +2804,9 @@ Default: '/usr/sbin/apachectl -t'.
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 #### Defined type: `apache::fastcgi::server`
 
@@ -2877,9 +2927,11 @@ For the custom fragment's `order` parameter, the `apache::vhost` defined type us
 
 ##### `access_log`
 
-Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). 
+Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
+
+Boolean.
 
-Boolean. Default: `true`.
+Default: `true`.
 
 ##### `access_log_env_var`
 
@@ -2923,13 +2975,17 @@ Determines whether the virtual host creates a [`Listen`][] statement.
 
 Setting `add_listen` to `false` prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `use_optional_includes`
 
 Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer.
 
-Boolean. Default: `false`.
+Boolean.
+
+Default: `false`.
 
 ##### `additional_includes`
 
@@ -3016,11 +3072,13 @@ Default: The value set by [`apache::mod::auth_cas`][].
 
 ##### `cas_validate_saml`
 
-Parse response from CAS server for SAML. Default: The value set by [`apache::mod::auth_cas`][].
+Parse response from CAS server for SAML.
+
+Default: The value set by [`apache::mod::auth_cas`][].
 
 ##### `cas_validate_url`
 
-Sets the URL to use when validating a client-presented ticket in an HTTP query string. 
+Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
 Defaults to the value set by [`apache::mod::auth_cas`][].
 
@@ -3084,13 +3142,17 @@ Default: `undef`.
 
 Determines whether Puppet manages the [`docroot`][] directory.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `error_log`
 
 Specifies whether `*_error.log` directives should be configured.
 
-Boolean. Default: `true`.
+Boolean.
+
+Default: `true`.
 
 ##### `error_log_file`
 
@@ -3114,7 +3176,9 @@ Determines whether to send all error log messages to syslog.
 
 This parameter has no effect if either of the [`error_log_file`][] or [`error_log_pipe`][] parameters has a value. If none of these parameters has a value, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts.
 
-Boolean. Default: `undef`.
+Boolean.
+
+Default: `undef`.
 
 ##### `error_documents`
 
@@ -3157,7 +3221,7 @@ Default: `undef`.
 
 Sets the server default for the [`FileETag`][] declaration, which modifies the response header field for static files.
 
-Values: 'INode', 'MTime', 'Size', 'All', 'None'. 
+Values: 'INode', 'MTime', 'Size', 'All', 'None'.
 
 Default: `undef`, which uses Apache's default setting of 'MTime Size'.
 
@@ -3198,7 +3262,7 @@ Sets the IP address the virtual host listens on. By default, uses Apache's defau
 
 Values: A string or an array of strings.
 
-Default: `undef`. 
+Default: `undef`.
 
 ##### `ip_based`
 
@@ -3263,7 +3327,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 Default: `undef`.
- 
+
 ##### `keepalive`
 
 Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive for the virtual host. By default, the global, server-wide [`KeepAlive`][] setting is in effect.
@@ -3292,7 +3356,7 @@ Default: `undef`.
 
 ##### `auth_kerb`
 
-Enable [`mod_auth_kerb`][] parameters for a virtual host. 
+Enable [`mod_auth_kerb`][] parameters for a virtual host.
 
 Usage typically looks like:
 
@@ -3320,7 +3384,9 @@ Related parameters follow the names of `mod_auth_kerb` directives:
 - `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: `undef`.
 - `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: `undef`.
 
-Boolean. Default: `false`.
+Boolean.
+
+Default: `false`.
 
 ##### `krb_verify_kdc`
 
@@ -3392,7 +3458,9 @@ Default: `undef`.
 
 Disables [`mod_security`][] on a virtual host. Only valid if [`apache::mod::security`][] is included.
 
-Boolean. Default: `undef`.
+Boolean.
+
+Default: `undef`.
 
 ###### `modsec_disable_ids`
 
@@ -3492,25 +3560,31 @@ Default: [].
 
 ##### `proxy_preserve_host`
 
-Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). 
+Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost).
 
 Setting this parameter to `true` enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
-Boolean. Default: `false`.
+Boolean.
+
+Default: `false`.
 
 ##### `proxy_add_headers`
 
-Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders). 
+Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders).
 
 This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
-Boolean. Default: `false`.
+Boolean.
+
+Default: `false`.
 
 ##### `proxy_error_override`
 
-Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content. 
+Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content.
+
+Boolean.
 
-Boolean. Default: `false`.
+Default: `false`.
 
 ##### `options`
 
@@ -3559,7 +3633,7 @@ Default: `undef`.
 
 ##### `passenger_log_level`
 
-This option allows to specify how much information should be written to the log file. If not set, [PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel) will not show up in the configuration file and the defaults are used. 
+This option allows to specify how much information should be written to the log file. If not set, [PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel) will not show up in the configuration file and the defaults are used.
 
 Default: Passenger versions less than 3.0.0: '0'; 5.0.0 and later: '3'.
 
@@ -3598,7 +3672,11 @@ Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/refe
 
 ##### `passenger_high_performance`
 
-Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter. Values: `true`, `false`. Default: `undef`.
+Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter.
+
+Values: `true`, `false`.
+
+Default: `undef`.
 
 ##### `passenger_nodejs`
 
@@ -3608,7 +3686,9 @@ Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apa
 
 Sets the [`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions) parameter.
 
-Boolean. Default: `undef`.
+Boolean.
+
+Default: `undef`.
 
 ##### `passenger_startup_file`
 
@@ -3758,7 +3838,7 @@ apache::vhost { 'site.name.fdqn':
 
 ##### `request_headers`
 
-Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, and so on. 
+Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, and so on.
 
 Default: `undef`.
 
@@ -3774,7 +3854,7 @@ apache::vhost { 'site.name.fdqn':
 
 ##### `rewrites`
 
-Creates URL rewrite rules. Expects an array of hashes. 
+Creates URL rewrite rules. Expects an array of hashes.
 
 Values: Hash keys that are any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'.
 
@@ -3916,7 +3996,7 @@ The ScriptAlias and ScriptAliasMatch directives are created in the order specifi
 
 ##### `serveradmin`
 
-Specifies the email address Apache displays when it renders one of its error pages. 
+Specifies the email address Apache displays when it renders one of its error pages.
 
 Default: `undef`.
 
@@ -3928,7 +4008,7 @@ Default: '[]'.
 
 ##### `servername`
 
-Sets the servername corresponding to the hostname you connect to the virtual host at. 
+Sets the servername corresponding to the hostname you connect to the virtual host at.
 
 Default: the title of the resource.
 
@@ -4199,7 +4279,9 @@ Sets the value for [AuthLDAPBindPassword](https://httpd.apache.org/docs/current/
 
 ##### `auth_ldap_group_attribute`
 
-Array of values for [AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute), specifies which LDAP attributes are used to check for user members within ldap-groups. Defaults are: "member" and "uniquemember".
+Array of values for [AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute), specifies which LDAP attributes are used to check for user members within ldap-groups.
+
+Default: "member" and "uniquemember".
 
 ##### `auth_ldap_group_attribute_is_dn`
 
@@ -4722,7 +4804,9 @@ Default: `undef`.
 
 ##### `ssl_cert`
 
-Specifies the SSL certification. Defaults are based on your OS.
+Specifies the SSL certification.
+
+Default: Depends on operating system.
 
 * RedHat: '/etc/pki/tls/certs/localhost.crt'
 * Debian: '/etc/ssl/certs/ssl-cert-snakeoil.pem'
@@ -4737,7 +4821,7 @@ Defaults: 'all', '-SSLv2', '-SSLv3'.
 
 ##### `ssl_cipher`
 
-Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). 
+Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
 
 Default: 'HIGH:MEDIUM:!aNULL:!MD5'.
 
@@ -4751,7 +4835,9 @@ Default: `true`.
 
 ##### `ssl_certs_dir`
 
-Specifies the location of the SSL certification directory. Default: Depends on operating system.
+Specifies the location of the SSL certification directory.
+
+Default: Depends on operating system.
 
 - Debian: '/etc/ssl/certs'
 - Red Hat: '/etc/pki/tls/certs'
@@ -4762,7 +4848,7 @@ Specifies the location of the SSL certification directory. Default: Depends on o
 
 Specifies the SSL chain. This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.
 
-Default: `undef`. 
+Default: `undef`.
 
 ##### `ssl_crl`
 
@@ -4774,7 +4860,7 @@ Default: `undef`.
 
 Specifies the location of the certificate revocation list. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
-Default: `undef`. 
+Default: `undef`.
 
 ##### `ssl_crl_check`
 
@@ -4784,7 +4870,9 @@ Default: `undef`.
 
 ##### `ssl_key`
 
-Specifies the SSL key. Defaults are based on your operating system. Default work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.
+Specifies the SSL key.
+
+Defaults are based on your operating system. Default work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.
 
 * RedHat: '/etc/pki/tls/private/localhost.key'
 * Debian: '/etc/ssl/private/ssl-cert-snakeoil.key'
@@ -4909,13 +4997,13 @@ Default: `undef`.
 
 ##### `ssl_openssl_conf_cmd`
 
-Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. 
+Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters.
 
 Default: `undef`
 
 ##### `ssl_proxyengine`
 
-Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). 
+Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
 
 Boolean.
 
@@ -5039,7 +5127,7 @@ Default: '25'.
 
 ##### `verify_config`
 
-Specifies whether to validate the configuration file before notifying the Apache service. 
+Specifies whether to validate the configuration file before notifying the Apache service.
 
 Boolean.
 

From 5996386cf96f1a9a761fab23f761e6be5e99ce76 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Tue, 25 Jul 2017 09:25:33 -0700
Subject: [PATCH 1199/2267] (maint) require base64

the apache_pw_hash function tests fail on puppet 4.7.1 because of 'uninitialized constant Base64'. Base64 is ruby stdlib, not core, so this requires it defensively.
---
 lib/puppet/parser/functions/apache_pw_hash.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/puppet/parser/functions/apache_pw_hash.rb b/lib/puppet/parser/functions/apache_pw_hash.rb
index 7f187f3377..29d4b5eeb8 100644
--- a/lib/puppet/parser/functions/apache_pw_hash.rb
+++ b/lib/puppet/parser/functions/apache_pw_hash.rb
@@ -1,3 +1,5 @@
+require 'base64'
+
 Puppet::Parser::Functions::newfunction(:apache_pw_hash, :type => :rvalue, :doc => <<-EOS
 Hashes a password in a format suitable for htpasswd files read by apache.
 

From 2de5f94ec74e97d56610363cbdf95c013c60c9b4 Mon Sep 17 00:00:00 2001
From: Mark Dechiaro <mdechiaro@users.noreply.github.com>
Date: Tue, 25 Jul 2017 15:11:35 -0500
Subject: [PATCH 1200/2267] Add ShibCompatValidUser option to vhost config

---
 README.md                 |  5 +++++
 manifests/vhost.pp        | 11 +++++++++++
 templates/vhost/_shib.erb |  4 ++++
 3 files changed, 20 insertions(+)
 create mode 100644 templates/vhost/_shib.erb

diff --git a/README.md b/README.md
index 75c416b123..aa41b1eefd 100755
--- a/README.md
+++ b/README.md
@@ -4654,6 +4654,11 @@ apache::vhost { 'secure.example.net':
 
 When set to 'On', this turns on the use of request headers to publish attributes to applications. Values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
 
+##### `shib_compat_valid_user`
+
+Default is Off, matching the behavior prior to this command's existence. Addresses a conflict when using Shibboleth in conjunction with other auth/auth modules by restoring "standard" Apache behavior when proces
+sing the "valid-user" and "user" Require rules. See the [`mod_shib`documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions), and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess) topic for more details.
+
 ##### `ssl_options`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the virtual host.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 18217deebe..d8bb70a08d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -174,6 +174,7 @@
   $cas_login_url                                                                    = undef,
   $cas_validate_url                                                                 = undef,
   $cas_validate_saml                                                                = undef,
+  Optional[String] $shib_compat_valid_user                                          = undef,
 ) {
 
   # The base class must be included first because it is used by parameter defaults
@@ -1087,6 +1088,16 @@
     }
   }
 
+  # Template uses:
+  # - $shibboleth_enabled
+  if $shibboleth_enabled {
+    concat::fragment { "${name}-shibboleth":
+      target  => "${priority_real}${filename}.conf",
+      order   => 350,
+      content => template('apache/vhost/_shib.erb'),
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
diff --git a/templates/vhost/_shib.erb b/templates/vhost/_shib.erb
new file mode 100644
index 0000000000..610e4a439b
--- /dev/null
+++ b/templates/vhost/_shib.erb
@@ -0,0 +1,4 @@
+  ## Shibboleth
+<% if @shib_compat_valid_user -%>
+  ShibCompatValidUser <%= @shib_compat_valid_user %>
+<% end -%>

From d1428488d159470aa1e99ef8eddc7a1de8f92a9f Mon Sep 17 00:00:00 2001
From: Mark Dechiaro <mdechiaro@users.noreply.github.com>
Date: Tue, 25 Jul 2017 15:48:52 -0500
Subject: [PATCH 1201/2267] Add better doc for shib_compat_valid_user

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index aa41b1eefd..1e4e3ed57d 100755
--- a/README.md
+++ b/README.md
@@ -4656,8 +4656,7 @@ When set to 'On', this turns on the use of request headers to publish attributes
 
 ##### `shib_compat_valid_user`
 
-Default is Off, matching the behavior prior to this command's existence. Addresses a conflict when using Shibboleth in conjunction with other auth/auth modules by restoring "standard" Apache behavior when proces
-sing the "valid-user" and "user" Require rules. See the [`mod_shib`documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions), and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess) topic for more details.
+Default is Off, matching the behavior prior to this command's existence. Addresses a conflict when using Shibboleth in conjunction with other auth/auth modules by restoring "standard" Apache behavior when processing the "valid-user" and "user" Require rules. See the [`mod_shib`documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions), and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess) topic for more details. This key is disabled if `apache::mod::shib` is not defined.
 
 ##### `ssl_options`
 

From a40b46feb7c706b9ca7ae8632bc6bf9c67455089 Mon Sep 17 00:00:00 2001
From: Glenn Sarti <glennsarti@users.noreply.github.com>
Date: Thu, 27 Jul 2017 14:52:35 -0700
Subject: [PATCH 1202/2267] (maint) modulesync 915cde70e20

---
 Gemfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 46cb2eacec..a9f0161c79 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,13 +33,13 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
 
 group :development do
-  gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
-  gem "puppet-module-win-default-r#{minor_version}",   :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "puppet-module-posix-dev-r#{minor_version}",     :require => false, :platforms => "ruby"
-  gem "puppet-module-win-dev-r#{minor_version}",       :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "json_pure", '<= 2.0.1',                         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "fast_gettext", '1.1.0',                         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                  :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
+  gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "puppet-module-posix-dev-r#{minor_version}",        :require => false, :platforms => "ruby"
+  gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "json_pure", '<= 2.0.1',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "fast_gettext", '1.1.0',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                     :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
 end
 
 group :system_tests do
@@ -50,6 +50,7 @@ group :system_tests do
   gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
+  gem "puppet-blacksmith", '~> 3.4',                                             :require => false
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

From c706e090ff332e42b4ef5d38ade99b72cf62b5b9 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Fri, 28 Jul 2017 16:06:28 +0100
Subject: [PATCH 1203/2267] (MODULES-5324) Adding documentation for overrides

Adding documentation for the overrides param for apache::mod::userdir.
Also removing ' to solve a formatting issue.
---
 README.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d3c4c806bc..cf8abd9af0 100755
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@
 [`apache::mod::shib`]: #class-apachemodshib
 [`apache::mod::ssl`]: #class-apachemodssl
 [`apache::mod::status`]: #class-apachemodstatus
+[`apache::mod::userdir`]: #class-apachemoduserdir
 [`apache::mod::worker`]: #class-apachemodworker
 [`apache::mod::wsgi`]: #class-apachemodwsgi
 [`apache::params`]: #class-apacheparams
@@ -1076,7 +1077,7 @@ Default: Depends on operating system.
 - **Gentoo**: `/etc/apache2`
 - **Red Hat**: `/etc/httpd`
 
-##### http_protocol_options`
+##### `http_protocol_options`
 
 Specifies the strictness of HTTP protocol checks.
 
@@ -1620,7 +1621,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `ssl`\* (see [`apache::mod::ssl`][])
 * `status`\* (see [`apache::mod::status`][])
 * `suphp`
-* `userdir`\*
+* `userdir`\* (see [`apache::mod::userdir`][])
 * `version`
 * `vhost_alias`
 * `worker`\*
@@ -2504,6 +2505,16 @@ Installs [`mod_status`][] and uses the `status.conf.erb` template to generate it
 
   Default: '/server-status'.
 
+##### Class: `apache::mod::userdir`
+
+Allows user-specific directories to be accessed using the `http://example.com/~user/` syntax. All parameters can be found in in the [official Apache documentation](https://httpd.apache.org/docs/2.4/mod/mod_userdir.html).
+
+**Parameters**:
+
+* `overrides`: An [array][] of directive-types.
+
+  Default: '[ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]'.
+
 ##### Class: `apache::mod::version`
 
 Installs [`mod_version`][] on many operating systems and Apache configurations.

From b61986063bcded7b28344c1783e95758ede2314a Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Fri, 28 Jul 2017 23:10:35 +0200
Subject: [PATCH 1204/2267] use ERB comment to keep it out of the generated
 file

---
 templates/httpd.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index c01859adeb..ddb40b57e2 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -11,7 +11,7 @@ KeepAlive <%= @keepalive %>
 MaxKeepAliveRequests <%= @max_keepalive_requests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
 LimitRequestFieldSize <%= @limitreqfieldsize %>
-# Actually >= 2.4.24, but the minor version is not provided
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
 <%- if @http_protocol_options and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 HttpProtocolOptions <%= @http_protocol_options %>
 <%- end -%>

From 3600c1081a6abdaeffa25820befc1fe6c4ab9ea4 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 31 Jul 2017 12:47:01 -0300
Subject: [PATCH 1205/2267] Correct params reference in mod/jk spec test

---
 spec/classes/mod/jk_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index f7a9f70c86..dfc213b2a9 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -27,7 +27,7 @@
     end
 
     let (:params) do
-      :logroot => '/var/log/httpd'
+      { :logroot => '/var/log/httpd' }
     end
 
     it_behaves_like 'minimal resources'

From cea6bbfa64f4a78bf6253ac45503b5f6374a2cbd Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 31 Jul 2017 12:47:51 -0300
Subject: [PATCH 1206/2267] Remove unnecessary check for parameter
 ...mod::jk::logroot

---
 manifests/mod/jk.pp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 1e66ce5781..0aa12daf4f 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -11,7 +11,7 @@
 class apache::mod::jk (
   $workers_file          = undef,
   $worker_property       = {},
-  $logroot               = undef,
+  $logroot               = $::apache::logroot,
   $shm_file              = 'jk-runtime-status',
   $shm_size              = undef,
   $mount_file            = undef,
@@ -70,14 +70,8 @@
   }
 
   # Shared memory and log paths
-  if $logroot == undef {
-    $shm_path = "${::apache::logroot}/${shm_file}"
-    $log_path = "${::apache::logroot}/${log_file}"
-  }
-  else {
-    $shm_path = "${logroot}/${shm_file}"
-    $log_path = "${logroot}/${log_file}"
-  }
+  $shm_path = "${logroot}/${shm_file}"
+  $log_path = "${logroot}/${log_file}"
 
   # Main config file
   file {'jk.conf':

From 100eb5253829a1e668d568b1cdba1dd8d23c47e8 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 31 Jul 2017 13:00:07 -0300
Subject: [PATCH 1207/2267] Revert "Remove unnecessary check for parameter
 ...mod::jk::logroot"

This reverts commit cea6bbfa64f4a78bf6253ac45503b5f6374a2cbd.

Setting default value from other class (::apache) breaks spec test,
which does not parse the other class
---
 manifests/mod/jk.pp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 0aa12daf4f..1e66ce5781 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -11,7 +11,7 @@
 class apache::mod::jk (
   $workers_file          = undef,
   $worker_property       = {},
-  $logroot               = $::apache::logroot,
+  $logroot               = undef,
   $shm_file              = 'jk-runtime-status',
   $shm_size              = undef,
   $mount_file            = undef,
@@ -70,8 +70,14 @@
   }
 
   # Shared memory and log paths
-  $shm_path = "${logroot}/${shm_file}"
-  $log_path = "${logroot}/${log_file}"
+  if $logroot == undef {
+    $shm_path = "${::apache::logroot}/${shm_file}"
+    $log_path = "${::apache::logroot}/${log_file}"
+  }
+  else {
+    $shm_path = "${logroot}/${shm_file}"
+    $log_path = "${logroot}/${log_file}"
+  }
 
   # Main config file
   file {'jk.conf':

From eb232b9774756c8cf73190109ff91279523a01e1 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 31 Jul 2017 13:40:36 -0300
Subject: [PATCH 1208/2267] Include Debian 8 context in mod/jk spec test

---
 spec/classes/mod/jk_spec.rb | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index dfc213b2a9..ba35c438dd 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -12,7 +12,7 @@
     it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]') }
   end
 
-  context "with only required facts and no parameters" do
+  context "RHEL 6 with only required facts and no parameters" do
 
     let (:facts) do
       {
@@ -37,4 +37,29 @@
 
   end
 
+  context "Debian 8 with only required facts and no parameters" do
+
+    let (:facts) do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '8',
+      }
+    end
+
+    let (:pre_condition) do
+      'include apache'
+    end
+
+    let (:params) do
+      { :logroot => '/var/log/apache2' }
+    end
+
+    it_behaves_like 'minimal resources'
+    it {
+      verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
+    }
+
+  end
+
 end

From 7b1397fb2a15e7ec54a913c7c059b71929a7c97f Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Tue, 1 Aug 2017 12:10:28 +0200
Subject: [PATCH 1209/2267] Expose loadfile_name option to mod::python class

This is a work around to a particular clash between these
two lines.

```puppet
class{'apache::mod::python':}
class{'collectd::plugin::python':}
```

Both classes create a file resource `file{'python.load':}`

This patch allows the resource name to be configured for
`apache::mod::python` setup.

There is an altenative more perfect solution to use a better
more unique name space by default e.g `file{"apache_${_loadfile_name}:` but this
would touch so many test files....

This change is fully backwards compatible.

* [collectd::plugin::python](https://github.com/voxpupuli/puppet-collectd/blob/master/manifests/plugin.pp#L16)
---
 README.md                       | 12 +++++++++++-
 manifests/mod/python.pp         |  8 ++++++--
 spec/classes/mod/python_spec.rb |  8 ++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 13da71ce33..e48386ecfd 100755
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@
 [`apache::mod::proxy_balancer`]: #class-apachemodproxybalancer
 [`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi
 [`apache::mod::proxy_html`]: #class-apachemodproxy_html
+[`apache::mod::python`]: #class-apachemodpython
 [`apache::mod::security`]: #class-apachemodsecurity
 [`apache::mod::shib`]: #class-apachemodshib
 [`apache::mod::ssl`]: #class-apachemodssl
@@ -187,6 +188,7 @@
 [`mod_proxy`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html
 [`mod_proxy_balancer`]: https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
 [`mod_reqtimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
+[`mod_python`]: http://modpython.org/
 [`mod_rewrite`]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html
 [`mod_security`]: https://www.modsecurity.org/
 [`mod_ssl`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html
@@ -1611,7 +1613,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `proxy_balancer`
 * `proxy_html` (see [`apache::mod::proxy_html`][])
 * `proxy_http`
-* `python`
+* `python` (see [`apache::mod::python`][])
 * `reqtimeout`
 * `remoteip`\*
 * `rewrite`
@@ -2477,6 +2479,14 @@ Default values for these parameters depend on your operating system. Most of thi
 
 **Note**: There is no official package available for `mod_proxy_html`, so you must make it available outside of the apache module.
 
+##### Class: `apache::mod::python`
+
+Installs and configures [`mod_python`][].
+
+**Parameters**
+
+* `loadfile_name`: Sets the name of the configuration file that is used to load the python module.
+
 ##### Class: `apache::mod::reqtimeout`
 
 Installs and configures [`mod_reqtimeout`][].
diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp
index 75af350114..67f578d419 100644
--- a/manifests/mod/python.pp
+++ b/manifests/mod/python.pp
@@ -1,6 +1,10 @@
-class apache::mod::python {
+class apache::mod::python (
+  Optional[String] $loadfile_name = undef,
+) {
   include ::apache
-  ::apache::mod { 'python': }
+  ::apache::mod { 'python':
+    loadfile_name => $loadfile_name,
+  }
 }
 
 
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 1393293a97..622a558c37 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -37,6 +37,14 @@
     it { is_expected.to contain_class("apache::params") }
     it { is_expected.to contain_apache__mod("python") }
     it { is_expected.to contain_package("mod_python") }
+    it { is_expected.to contain_file("python.load").with_path('/etc/httpd/conf.d/python.load') }
+
+    describe "with loadfile_name specified" do
+      let :params do
+        { :loadfile_name => 'FooBar' }
+      end
+      it { is_expected.to contain_file("FooBar").with_path('/etc/httpd/conf.d/FooBar') }
+    end
   end
   context "on a FreeBSD OS" do
     let :facts do

From 1c73f6d96c64f3f7efe0412319e0e8edb4499668 Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Sat, 5 Aug 2017 18:38:26 -0500
Subject: [PATCH 1210/2267] Adds all documented mod_passenger options to
 apache::mod::passenger

* Parsed https://www.phusionpassenger.com/library/config/apache/reference for all options
* Took care of maintaining older options
* Add specs for all options
* added warnings a failures if passenger_installed_version is set
---
 manifests/mod/passenger.pp         | 695 +++++++++++++++++++++++++++--
 spec/classes/mod/passenger_spec.rb | 323 +++++++++++---
 templates/mod/passenger.conf.erb   | 246 +++++++++-
 3 files changed, 1126 insertions(+), 138 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 3b17d3db3e..c809a997a4 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -1,35 +1,568 @@
 class apache::mod::passenger (
-  $passenger_conf_file                                                                   = $::apache::params::passenger_conf_file,
-  $passenger_conf_package_file                                                           = $::apache::params::passenger_conf_package_file,
-  $passenger_high_performance                                                            = undef,
-  $passenger_pool_idle_time                                                              = undef,
-  $passenger_max_request_queue_size                                                      = undef,
-  $passenger_max_requests                                                                = undef,
-  Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method = undef,
-  $passenger_stat_throttle_rate                                                          = undef,
-  $rack_autodetect                                                                       = undef,
-  $rails_autodetect                                                                      = undef,
-  $passenger_root                                                                        = $::apache::params::passenger_root,
-  $passenger_ruby                                                                        = $::apache::params::passenger_ruby,
-  $passenger_default_ruby                                                                = $::apache::params::passenger_default_ruby,
-  $passenger_max_pool_size                                                               = undef,
-  $passenger_min_instances                                                               = undef,
-  $passenger_max_instances_per_app                                                       = undef,
-  $passenger_use_global_queue                                                            = undef,
-  $passenger_app_env                                                                     = undef,
-  Optional[Stdlib::Absolutepath] $passenger_log_file                                     = undef,
-  $passenger_log_level                                                                   = undef,
-  $passenger_data_buffer_dir                                                             = undef,
-  $manage_repo                                                                           = true,
-  $mod_package                                                                           = undef,
-  $mod_package_ensure                                                                    = undef,
-  $mod_lib                                                                               = undef,
-  $mod_lib_path                                                                          = undef,
-  $mod_id                                                                                = undef,
-  $mod_path                                                                              = undef,
+  $manage_repo                                                                               = true,
+  $mod_id                                                                                    = undef,
+  $mod_lib                                                                                   = undef,
+  $mod_lib_path                                                                              = undef,
+  $mod_package                                                                               = undef,
+  $mod_package_ensure                                                                        = undef,
+  $mod_path                                                                                  = undef,
+  $passenger_allow_encoded_slashes                                                           = undef,
+  $passenger_app_env                                                                         = undef,
+  $passenger_app_group_name                                                                  = undef,
+  $passenger_app_root                                                                        = undef,
+  $passenger_app_type                                                                        = undef,
+  $passenger_base_uri                                                                        = undef,
+  $passenger_buffer_response                                                                 = undef,
+  $passenger_buffer_upload                                                                   = undef,
+  $passenger_concurrency_model                                                               = undef,
+  $passenger_conf_file                                                                       = $::apache::params::passenger_conf_file,
+  $passenger_conf_package_file                                                               = $::apache::params::passenger_conf_package_file,
+  $passenger_data_buffer_dir                                                                 = undef,
+  $passenger_debug_log_file                                                                  = undef,
+  $passenger_debugger                                                                        = undef,
+  $passenger_default_group                                                                   = undef,
+  $passenger_default_ruby                                                                    = $::apache::params::passenger_default_ruby,
+  $passenger_default_user                                                                    = undef,
+  $passenger_disable_security_update_check                                                   = undef,
+  $passenger_enabled                                                                         = undef,
+  $passenger_error_override                                                                  = undef,
+  $passenger_file_descriptor_log_file                                                        = undef,
+  $passenger_fly_with                                                                        = undef,
+  $passenger_force_max_concurrent_requests_per_process                                       = undef,
+  $passenger_friendly_error_pages                                                            = undef,
+  $passenger_group                                                                           = undef,
+  $passenger_high_performance                                                                = undef,
+  $passenger_installed_version                                                               = undef,
+  $passenger_instance_registry_dir                                                           = undef,
+  $passenger_load_shell_envvars                                                              = undef,
+  Optional[Stdlib::Absolutepath] $passenger_log_file                                         = undef,
+  $passenger_log_level                                                                       = undef,
+  $passenger_lve_min_uid                                                                     = undef,
+  $passenger_max_instances                                                                   = undef,
+  $passenger_max_instances_per_app                                                           = undef,
+  $passenger_max_pool_size                                                                   = undef,
+  $passenger_max_preloader_idle_time                                                         = undef,
+  $passenger_max_request_queue_size                                                          = undef,
+  $passenger_max_request_time                                                                = undef,
+  $passenger_max_requests                                                                    = undef,
+  $passenger_memory_limit                                                                    = undef,
+  $passenger_meteor_app_settings                                                             = undef,
+  $passenger_min_instances                                                                   = undef,
+  $passenger_nodejs                                                                          = undef,
+  $passenger_pool_idle_time                                                                  = undef,
+  $passenger_pre_start                                                                       = undef,
+  $passenger_python                                                                          = undef,
+  $passenger_resist_deployment_errors                                                        = undef,
+  $passenger_resolve_symlinks_in_document_root                                               = undef,
+  $passenger_response_buffer_high_watermark                                                  = undef,
+  $passenger_restart_dir                                                                     = undef,
+  $passenger_rolling_restarts                                                                = undef,
+  $passenger_root                                                                            = $::apache::params::passenger_root,
+  $passenger_ruby                                                                            = $::apache::params::passenger_ruby,
+  $passenger_security_update_check_proxy                                                     = undef,
+  $passenger_show_version_in_header                                                          = undef,
+  $passenger_socket_backlog                                                                  = undef,
+  Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method     = undef,
+  $passenger_start_timeout                                                                   = undef,
+  $passenger_startup_file                                                                    = undef,
+  $passenger_stat_throttle_rate                                                              = undef,
+  $passenger_sticky_sessions                                                                 = undef,
+  $passenger_sticky_sessions_cookie_name                                                     = undef,
+  $passenger_thread_count                                                                    = undef,
+  $passenger_use_global_queue                                                                = undef,
+  $passenger_user                                                                            = undef,
+  $passenger_user_switching                                                                  = undef,
+  $rack_auto_detect                                                                          = undef,
+  $rack_autodectect                                                                          = undef,
+  $rack_autodetect                                                                           = undef,
+  $rack_base_uri                                                                             = undef,
+  $rack_env                                                                                  = undef,
+  $rails_allow_mod_rewrite                                                                   = undef,
+  $rails_app_spawner_idle_time                                                               = undef,
+  $rails_auto_detect                                                                         = undef,
+  $rails_autodetect                                                                          = undef,
+  $rails_base_uri                                                                            = undef,
+  $rails_default_user                                                                        = undef,
+  $rails_env                                                                                 = undef,
+  $rails_framework_spawner_idle_time                                                         = undef,
+  $rails_ruby                                                                                = undef,
+  $rails_spawn_method                                                                        = undef,
+  $rails_user_switching                                                                      = undef,
+  $union_station_filter                                                                      = undef,
+  $union_station_gateway_address                                                             = undef,
+  $union_station_gateway_cert                                                                = undef,
+  $union_station_gateway_port                                                                = undef,
+  $union_station_key                                                                         = undef,
+  $union_station_proxy_address                                                               = undef,
+  $union_station_support                                                                     = undef,
+  $wsgi_auto_detect                                                                          = undef,
 ) inherits ::apache::params {
-
   include ::apache
+  # Checking version support
+  if $passenger_installed_version {
+    if $passenger_allow_encoded_slashes {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_allow_encoded_slashes is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_app_env {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_app_env is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_app_group_name {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_app_group_name is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_app_root {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_app_root is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_app_type {
+      if (versioncmp($passenger_installed_version, '4.0.25') < 0) {
+        fail("Passenger config option :: passenger_app_type is not introduced until version 4.0.25 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_base_uri {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_base_uri is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_buffer_response {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_buffer_response is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_buffer_upload {
+      if (versioncmp($passenger_installed_version, '4.0.26') < 0) {
+        fail("Passenger config option :: passenger_buffer_upload is not introduced until version 4.0.26 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_concurrency_model {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_concurrency_model is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_data_buffer_dir {
+      if (versioncmp($passenger_installed_version, '5.0.0') < 0) {
+        fail("Passenger config option :: passenger_data_buffer_dir is not introduced until version 5.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_debug_log_file {
+      if (versioncmp($passenger_installed_version, '5.0.5') > 0) {
+        warning("DEPRECATED PASSENGER OPTION :: passenger_debug_log_file :: This option has been renamed in version 5.0.5 to PassengerLogFile.")
+      }
+      if (versioncmp($passenger_installed_version, '5.0.5') < 0) {
+        fail("Passenger config option :: passenger_debug_log_file is not introduced until version 5.0.5 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_debugger {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_debugger is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_default_group {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_default_group is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_default_ruby {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_default_ruby is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_default_user {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_default_user is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_disable_security_update_check {
+      if (versioncmp($passenger_installed_version, '5.1.0') < 0) {
+        fail("Passenger config option :: passenger_disable_security_update_check is not introduced until version 5.1.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_enabled {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_enabled is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_error_override {
+      if (versioncmp($passenger_installed_version, '4.0.24') < 0) {
+        fail("Passenger config option :: passenger_error_override is not introduced until version 4.0.24 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_file_descriptor_log_file {
+      if (versioncmp($passenger_installed_version, '5.0.5') < 0) {
+        fail("Passenger config option :: passenger_file_descriptor_log_file is not introduced until version 5.0.5 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_fly_with {
+      if (versioncmp($passenger_installed_version, '4.0.45') < 0) {
+        fail("Passenger config option :: passenger_fly_with is not introduced until version 4.0.45 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_force_max_concurrent_requests_per_process {
+      if (versioncmp($passenger_installed_version, '5.0.22') < 0) {
+        fail("Passenger config option :: passenger_force_max_concurrent_requests_per_process is not introduced until version 5.0.22 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_friendly_error_pages {
+      if (versioncmp($passenger_installed_version, '4.0.42') < 0) {
+        fail("Passenger config option :: passenger_friendly_error_pages is not introduced until version 4.0.42 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_group {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_group is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_high_performance {
+      if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
+        fail("Passenger config option :: passenger_high_performance is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_instance_registry_dir {
+      if (versioncmp($passenger_installed_version, '5.0.0') < 0) {
+        fail("Passenger config option :: passenger_instance_registry_dir is not introduced until version 5.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_load_shell_envvars {
+      if (versioncmp($passenger_installed_version, '4.0.20') < 0) {
+        fail("Passenger config option :: passenger_load_shell_envvars is not introduced until version 4.0.20 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_log_file {
+      if (versioncmp($passenger_installed_version, '5.0.5') < 0) {
+        fail("Passenger config option :: passenger_log_file is not introduced until version 5.0.5 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_log_level {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_log_level is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_lve_min_uid {
+      if (versioncmp($passenger_installed_version, '5.0.28') < 0) {
+        fail("Passenger config option :: passenger_lve_min_uid is not introduced until version 5.0.28 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_max_instances {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_max_instances is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_max_instances_per_app {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_max_instances_per_app is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_max_pool_size {
+      if (versioncmp($passenger_installed_version, '1.0.0') < 0) {
+        fail("Passenger config option :: passenger_max_pool_size is not introduced until version 1.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_max_preloader_idle_time {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_max_preloader_idle_time is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_max_request_queue_size {
+      if (versioncmp($passenger_installed_version, '4.0.15') < 0) {
+        fail("Passenger config option :: passenger_max_request_queue_size is not introduced until version 4.0.15 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_max_request_time {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_max_request_time is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_max_requests {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_max_requests is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_memory_limit {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_memory_limit is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_meteor_app_settings {
+      if (versioncmp($passenger_installed_version, '5.0.7') < 0) {
+        fail("Passenger config option :: passenger_meteor_app_settings is not introduced until version 5.0.7 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_min_instances {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_min_instances is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_nodejs {
+      if (versioncmp($passenger_installed_version, '4.0.24') < 0) {
+        fail("Passenger config option :: passenger_nodejs is not introduced until version 4.0.24 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_pool_idle_time {
+      if (versioncmp($passenger_installed_version, '1.0.0') < 0) {
+        fail("Passenger config option :: passenger_pool_idle_time is not introduced until version 1.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_pre_start {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_pre_start is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_python {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_python is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_resist_deployment_errors {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_resist_deployment_errors is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_resolve_symlinks_in_document_root {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_resolve_symlinks_in_document_root is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_response_buffer_high_watermark {
+      if (versioncmp($passenger_installed_version, '5.0.0') < 0) {
+        fail("Passenger config option :: passenger_response_buffer_high_watermark is not introduced until version 5.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_restart_dir {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_restart_dir is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_rolling_restarts {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_rolling_restarts is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_root {
+      if (versioncmp($passenger_installed_version, '1.0.0') < 0) {
+        fail("Passenger config option :: passenger_root is not introduced until version 1.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_ruby {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_ruby is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_security_update_check_proxy {
+      if (versioncmp($passenger_installed_version, '5.1.0') < 0) {
+        fail("Passenger config option :: passenger_security_update_check_proxy is not introduced until version 5.1.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_show_version_in_header {
+      if (versioncmp($passenger_installed_version, '5.1.0') < 0) {
+        fail("Passenger config option :: passenger_show_version_in_header is not introduced until version 5.1.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_socket_backlog {
+      if (versioncmp($passenger_installed_version, '5.0.24') < 0) {
+        fail("Passenger config option :: passenger_socket_backlog is not introduced until version 5.0.24 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_spawn_method {
+      if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
+        fail("Passenger config option :: passenger_spawn_method is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_start_timeout {
+      if (versioncmp($passenger_installed_version, '4.0.15') < 0) {
+        fail("Passenger config option :: passenger_start_timeout is not introduced until version 4.0.15 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_startup_file {
+      if (versioncmp($passenger_installed_version, '4.0.25') < 0) {
+        fail("Passenger config option :: passenger_startup_file is not introduced until version 4.0.25 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_stat_throttle_rate {
+      if (versioncmp($passenger_installed_version, '2.2.0') < 0) {
+        fail("Passenger config option :: passenger_stat_throttle_rate is not introduced until version 2.2.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_sticky_sessions {
+      if (versioncmp($passenger_installed_version, '4.0.45') < 0) {
+        fail("Passenger config option :: passenger_sticky_sessions is not introduced until version 4.0.45 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_sticky_sessions_cookie_name {
+      if (versioncmp($passenger_installed_version, '4.0.45') < 0) {
+        fail("Passenger config option :: passenger_sticky_sessions_cookie_name is not introduced until version 4.0.45 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_thread_count {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_thread_count is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_use_global_queue {
+      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
+        fail("REMOVED PASSENGER OPTION :: passenger_use_global_queue ::  ")
+      }
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_use_global_queue is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_user {
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: passenger_user is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_user_switching {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: passenger_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rack_auto_detect {
+      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
+        fail("REMOVED PASSENGER OPTION :: rack_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.")
+      }
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: rack_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rack_base_uri {
+      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
+        warning("DEPRECATED PASSENGER OPTION :: rack_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.")
+      }
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: rack_base_uri is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rack_env {
+      if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
+        fail("Passenger config option :: rack_env is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_allow_mod_rewrite {
+      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
+        warning("DEPRECATED PASSENGER OPTION :: rails_allow_mod_rewrite :: This option doesn't do anything anymore in since version 4.0.0.")
+      }
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: rails_allow_mod_rewrite is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_app_spawner_idle_time {
+      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
+        fail("REMOVED PASSENGER OPTION :: rails_app_spawner_idle_time ::  This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.")
+      }
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: rails_app_spawner_idle_time is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_auto_detect {
+      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
+        fail("REMOVED PASSENGER OPTION :: rails_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.")
+      }
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: rails_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_base_uri {
+      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
+        warning("DEPRECATED PASSENGER OPTION :: rails_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.")
+      }
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: rails_base_uri is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_default_user {
+      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
+        warning("DEPRECATED PASSENGER OPTION :: rails_default_user :: Deprecated in 3.0.0 in favor of PassengerDefaultUser.")
+      }
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: rails_default_user is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_env {
+      if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
+        fail("Passenger config option :: rails_env is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_framework_spawner_idle_time {
+      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
+        fail("REMOVED PASSENGER OPTION :: rails_framework_spawner_idle_time ::  This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.")
+      }
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: rails_framework_spawner_idle_time is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_ruby {
+      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
+        warning("DEPRECATED PASSENGER OPTION :: rails_ruby :: Deprecated in 3.0.0 in favor of PassengerRuby.")
+      }
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: rails_ruby is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_spawn_method {
+      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
+        warning("DEPRECATED PASSENGER OPTION :: rails_spawn_method :: Deprecated in 3.0.0 in favor of PassengerSpawnMethod.")
+      }
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: rails_spawn_method is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $rails_user_switching {
+      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
+        warning("DEPRECATED PASSENGER OPTION :: rails_user_switching :: Deprecated in 3.0.0 in favor of PassengerUserSwitching.")
+      }
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: rails_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $union_station_filter {
+      if (versioncmp($passenger_installed_version, '3.0.5') < 0) {
+        fail("Passenger config option :: union_station_filter is not introduced until version 3.0.5 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $union_station_gateway_address {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: union_station_gateway_address is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $union_station_gateway_cert {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: union_station_gateway_cert is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $union_station_gateway_port {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: union_station_gateway_port is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $union_station_key {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: union_station_key is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $union_station_proxy_address {
+      if (versioncmp($passenger_installed_version, '3.0.11') < 0) {
+        fail("Passenger config option :: union_station_proxy_address is not introduced until version 3.0.11 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $union_station_support {
+      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
+        fail("Passenger config option :: union_station_support is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $wsgi_auto_detect {
+      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
+        fail("REMOVED PASSENGER OPTION :: wsgi_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.")
+      }
+      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+        fail("Passenger config option :: wsgi_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+  }
 
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
@@ -85,25 +618,93 @@
       loadfile_name  => 'zpassenger.load',
     }
   }
-
   # Template uses:
-  # - $passenger_root
-  # - $passenger_ruby
-  # - $passenger_default_ruby
-  # - $passenger_max_pool_size
-  # - $passenger_min_instances
-  # - $passenger_max_instances_per_app
-  # - $passenger_high_performance
-  # - $passenger_max_requests
-  # - $passenger_spawn_method
-  # - $passenger_stat_throttle_rate
-  # - $passenger_use_global_queue
-  # - $passenger_log_file
-  # - $passenger_log_level
-  # - $passenger_app_env
-  # - $passenger_data_buffer_dir
-  # - $rack_autodetect
-  # - $rails_autodetect
+  # - $passenger_allow_encoded_slashes : since 4.0.0
+  # - $passenger_app_env : since 4.0.0
+  # - $passenger_app_group_name : since 4.0.0
+  # - $passenger_app_root : since 4.0.0
+  # - $passenger_app_type : since 4.0.25
+  # - $passenger_base_uri : since 4.0.0
+  # - $passenger_buffer_response : since 4.0.0
+  # - $passenger_buffer_upload : since 4.0.26
+  # - $passenger_concurrency_model : since 4.0.0
+  # - $passenger_data_buffer_dir : since 5.0.0
+  # - $passenger_debug_log_file : since 5.0.5
+  # - $passenger_debugger : since 3.0.0
+  # - $passenger_default_group : since 3.0.0
+  # - $passenger_default_ruby : since 4.0.0
+  # - $passenger_default_user : since 3.0.0
+  # - $passenger_disable_security_update_check : since 5.1.0
+  # - $passenger_enabled : since 4.0.0
+  # - $passenger_error_override : since 4.0.24
+  # - $passenger_file_descriptor_log_file : since 5.0.5
+  # - $passenger_fly_with : since 4.0.45
+  # - $passenger_force_max_concurrent_requests_per_process : since 5.0.22
+  # - $passenger_friendly_error_pages : since 4.0.42
+  # - $passenger_group : since 4.0.0
+  # - $passenger_high_performance : since 2.0.0
+  # - $passenger_instance_registry_dir : since 5.0.0
+  # - $passenger_load_shell_envvars : since 4.0.20
+  # - $passenger_log_file : since 5.0.5
+  # - $passenger_log_level : since 3.0.0
+  # - $passenger_lve_min_uid : since 5.0.28
+  # - $passenger_max_instances : since 3.0.0
+  # - $passenger_max_instances_per_app : since 3.0.0
+  # - $passenger_max_pool_size : since 1.0.0
+  # - $passenger_max_preloader_idle_time : since 4.0.0
+  # - $passenger_max_request_queue_size : since 4.0.15
+  # - $passenger_max_request_time : since 3.0.0
+  # - $passenger_max_requests : since 3.0.0
+  # - $passenger_memory_limit : since 3.0.0
+  # - $passenger_meteor_app_settings : since 5.0.7
+  # - $passenger_min_instances : since 3.0.0
+  # - $passenger_nodejs : since 4.0.24
+  # - $passenger_pool_idle_time : since 1.0.0
+  # - $passenger_pre_start : since 3.0.0
+  # - $passenger_python : since 4.0.0
+  # - $passenger_resist_deployment_errors : since 3.0.0
+  # - $passenger_resolve_symlinks_in_document_root : since 3.0.0
+  # - $passenger_response_buffer_high_watermark : since 5.0.0
+  # - $passenger_restart_dir : since 3.0.0
+  # - $passenger_rolling_restarts : since 3.0.0
+  # - $passenger_root : since 1.0.0
+  # - $passenger_ruby : since 4.0.0
+  # - $passenger_security_update_check_proxy : since 5.1.0
+  # - $passenger_show_version_in_header : since 5.1.0
+  # - $passenger_socket_backlog : since 5.0.24
+  # - $passenger_spawn_method : since 2.0.0
+  # - $passenger_start_timeout : since 4.0.15
+  # - $passenger_startup_file : since 4.0.25
+  # - $passenger_stat_throttle_rate : since 2.2.0
+  # - $passenger_sticky_sessions : since 4.0.45
+  # - $passenger_sticky_sessions_cookie_name : since 4.0.45
+  # - $passenger_thread_count : since 4.0.0
+  # - $passenger_use_global_queue : since 4.0.0
+  # - $passenger_user : since 4.0.0
+  # - $passenger_user_switching : since 3.0.0
+  # - $rack_auto_detect : since 4.0.0
+  # - $rack_base_uri : since 3.0.0
+  # - $rack_env : since 2.0.0
+  # - $rails_allow_mod_rewrite : since 4.0.0
+  # - $rails_app_spawner_idle_time : since 4.0.0
+  # - $rails_auto_detect : since 4.0.0
+  # - $rails_base_uri : since 3.0.0
+  # - $rails_default_user : since 3.0.0
+  # - $rails_env : since 2.0.0
+  # - $rails_framework_spawner_idle_time : since 4.0.0
+  # - $rails_ruby : since 3.0.0
+  # - $rails_spawn_method : since 3.0.0
+  # - $rails_user_switching : since 3.0.0
+  # - $union_station_filter : since 3.0.5
+  # - $union_station_gateway_address : since 3.0.0
+  # - $union_station_gateway_cert : since 3.0.0
+  # - $union_station_gateway_port : since 3.0.0
+  # - $union_station_key : since 3.0.0
+  # - $union_station_proxy_address : since 3.0.11
+  # - $union_station_support : since 3.0.0
+  # - $wsgi_auto_detect : since 4.0.0
+  # - $rails_autodetect : this options is only for backward compatiblity with older versions of this class
+  # - $rack_autodectect : this options is only for backward compatiblity with older versions of this class
   file { 'passenger.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/${passenger_conf_file}",
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 200d45706f..5c3c115239 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -2,6 +2,185 @@
 
 describe 'apache::mod::passenger', :type => :class do
   it_behaves_like "a mod class, without including apache"
+  context "validating all passenger params - using Debian" do
+    let :facts do
+      {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '6',
+          :kernel                 => 'Linux',
+          :concat_basedir         => '/dne',
+          :lsbdistcodename        => 'squeeze',
+          :operatingsystem        => 'Debian',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
+      }
+    end
+    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_apache__mod('passenger') }
+    it { is_expected.to contain_package("libapache2-mod-passenger") }
+    it { is_expected.to contain_file('zpassenger.load').with({
+                                                                 'path' => '/etc/apache2/mods-available/zpassenger.load',
+                                                             }) }
+    it { is_expected.to contain_file('passenger.conf').with({
+                                                                'path' => '/etc/apache2/mods-available/passenger.conf',
+                                                            }) }
+
+    passenger_config_options = {
+        'passenger_allow_encoded_slashes' => {Type: 'OnOff', PassOpt: :PassengerAllowEncodedSlashes},
+        'passenger_app_env' => {Type: 'String', PassOpt: :PassengerAppEnv},
+        'passenger_app_group_name' => {Type: 'String', PassOpt: :PassengerAppGroupName},
+        'passenger_app_root' => {Type: 'FullPath', PassOpt: :PassengerAppRoot},
+        'passenger_app_type' => {Type: 'String', PassOpt: :PassengerAppType},
+        'passenger_base_uri' => {Type: 'URI', PassOpt: :PassengerBaseURI},
+        'passenger_buffer_response' => {Type: 'OnOff', PassOpt: :PassengerBufferResponse},
+        'passenger_buffer_upload' => {Type: 'OnOff', PassOpt: :PassengerBufferUpload},
+        'passenger_concurrency_model' => {Type: ["process", "thread"], PassOpt: :PassengerConcurrencyModel},
+        'passenger_data_buffer_dir' => {Type: 'FullPath', PassOpt: :PassengerDataBufferDir},
+        'passenger_debug_log_file' => {Type: 'String', PassOpt: :PassengerDebugLogFile},
+        'passenger_debugger' => {Type: 'OnOff', PassOpt: :PassengerDebugger},
+        'passenger_default_group' => {Type: 'String', PassOpt: :PassengerDefaultGroup},
+        'passenger_default_ruby' => {Type: 'FullPath', PassOpt: :PassengerDefaultRuby},
+        'passenger_default_user' => {Type: 'String', PassOpt: :PassengerDefaultUser},
+        'passenger_disable_security_update_check' => {Type: 'OnOff', PassOpt: :PassengerDisableSecurityUpdateCheck},
+        'passenger_enabled' => {Type: 'OnOff', PassOpt: :PassengerEnabled},
+        'passenger_error_override' => {Type: 'OnOff', PassOpt: :PassengerErrorOverride},
+        'passenger_file_descriptor_log_file' => {Type: 'FullPath', PassOpt: :PassengerFileDescriptorLogFile},
+        'passenger_fly_with' => {Type: 'FullPath', PassOpt: :PassengerFlyWith},
+        'passenger_force_max_concurrent_requests_per_process' => {Type: 'Integer', PassOpt: :PassengerForceMaxConcurrentRequestsPerProcess},
+        'passenger_friendly_error_pages' => {Type: 'OnOff', PassOpt: :PassengerFriendlyErrorPages},
+        'passenger_group' => {Type: 'String', PassOpt: :PassengerGroup},
+        'passenger_high_performance' => {Type: 'OnOff', PassOpt: :PassengerHighPerformance},
+        'passenger_instance_registry_dir' => {Type: 'FullPath', PassOpt: :PassengerInstanceRegistryDir},
+        'passenger_load_shell_envvars' => {Type: 'OnOff', PassOpt: :PassengerLoadShellEnvvars},
+        'passenger_log_file' => {Type: 'FullPath', PassOpt: :PassengerLogFile},
+        'passenger_log_level' => {Type: 'Integer', PassOpt: :PassengerLogLevel},
+        'passenger_lve_min_uid' => {Type: 'Integer', PassOpt: :PassengerLveMinUid},
+        'passenger_max_instances' => {Type: 'Integer', PassOpt: :PassengerMaxInstances},
+        'passenger_max_instances_per_app' => {Type: 'Integer', PassOpt: :PassengerMaxInstancesPerApp},
+        'passenger_max_pool_size' => {Type: 'Integer', PassOpt: :PassengerMaxPoolSize},
+        'passenger_max_preloader_idle_time' => {Type: 'Integer', PassOpt: :PassengerMaxPreloaderIdleTime},
+        'passenger_max_request_queue_size' => {Type: 'Integer', PassOpt: :PassengerMaxRequestQueueSize},
+        'passenger_max_request_time' => {Type: 'Integer', PassOpt: :PassengerMaxRequestTime},
+        'passenger_max_requests' => {Type: 'Integer', PassOpt: :PassengerMaxRequests},
+        'passenger_memory_limit' => {Type: 'Integer', PassOpt: :PassengerMemoryLimit},
+        'passenger_meteor_app_settings' => {Type: 'FullPath', PassOpt: :PassengerMeteorAppSettings},
+        'passenger_min_instances' => {Type: 'Integer', PassOpt: :PassengerMinInstances},
+        'passenger_nodejs' => {Type: 'FullPath', PassOpt: :PassengerNodejs},
+        'passenger_pool_idle_time' => {Type: 'Integer', PassOpt: :PassengerPoolIdleTime},
+        'passenger_pre_start' => {Type: 'URI', PassOpt: :PassengerPreStart},
+        'passenger_python' => {Type: 'FullPath', PassOpt: :PassengerPython},
+        'passenger_resist_deployment_errors' => {Type: 'OnOff', PassOpt: :PassengerResistDeploymentErrors},
+        'passenger_resolve_symlinks_in_document_root' => {Type: 'OnOff', PassOpt: :PassengerResolveSymlinksInDocumentRoot},
+        'passenger_response_buffer_high_watermark' => {Type: 'Integer', PassOpt: :PassengerResponseBufferHighWatermark},
+        'passenger_restart_dir' => {Type: 'Path', PassOpt: :PassengerRestartDir},
+        'passenger_rolling_restarts' => {Type: 'OnOff', PassOpt: :PassengerRollingRestarts},
+        'passenger_root' => {Type: 'FullPath', PassOpt: :PassengerRoot},
+        'passenger_ruby' => {Type: 'FullPath', PassOpt: :PassengerRuby},
+        'passenger_security_update_check_proxy' => {Type: 'URI', PassOpt: :PassengerSecurityUpdateCheckProxy},
+        'passenger_show_version_in_header' => {Type: 'OnOff', PassOpt: :PassengerShowVersionInHeader},
+        'passenger_socket_backlog' => {Type: 'Integer', PassOpt: :PassengerSocketBacklog},
+        'passenger_spawn_method' => {Type: ["smart", "direct"], PassOpt: :PassengerSpawnMethod},
+        'passenger_start_timeout' => {Type: 'Integer', PassOpt: :PassengerStartTimeout},
+        'passenger_startup_file' => {Type: 'RelPath', PassOpt: :PassengerStartupFile},
+        'passenger_stat_throttle_rate' => {Type: 'Integer', PassOpt: :PassengerStatThrottleRate},
+        'passenger_sticky_sessions' => {Type: 'OnOff', PassOpt: :PassengerStickySessions},
+        'passenger_sticky_sessions_cookie_name' => {Type: 'String', PassOpt: :PassengerStickySessionsCookieName},
+        'passenger_thread_count' => {Type: 'Integer', PassOpt: :PassengerThreadCount},
+        'passenger_use_global_queue' => {Type: 'String', PassOpt: :PassengerUseGlobalQueue},
+        'passenger_user' => {Type: 'String', PassOpt: :PassengerUser},
+        'passenger_user_switching' => {Type: 'OnOff', PassOpt: :PassengerUserSwitching},
+        'rack_auto_detect' => {Type: 'String', PassOpt: :RackAutoDetect},
+        'rack_base_uri' => {Type: 'String', PassOpt: :RackBaseURI},
+        'rack_env' => {Type: 'String', PassOpt: :RackEnv},
+        'rails_allow_mod_rewrite' => {Type: 'String', PassOpt: :RailsAllowModRewrite},
+        'rails_app_spawner_idle_time' => {Type: 'String', PassOpt: :RailsAppSpawnerIdleTime},
+        'rails_auto_detect' => {Type: 'String', PassOpt: :RailsAutoDetect},
+        'rails_base_uri' => {Type: 'String', PassOpt: :RailsBaseURI},
+        'rails_default_user' => {Type: 'String', PassOpt: :RailsDefaultUser},
+        'rails_env' => {Type: 'String', PassOpt: :RailsEnv},
+        'rails_framework_spawner_idle_time' => {Type: 'String', PassOpt: :RailsFrameworkSpawnerIdleTime},
+        'rails_ruby' => {Type: 'String', PassOpt: :RailsRuby},
+        'rails_spawn_method' => {Type: 'String', PassOpt: :RailsSpawnMethod},
+        'rails_user_switching' => {Type: 'String', PassOpt: :RailsUserSwitching},
+        'union_station_filter' => {Type: 'QuotedString', PassOpt: :UnionStationFilter},
+        'union_station_gateway_address' => {Type: 'URI', PassOpt: :UnionStationGatewayAddress},
+        'union_station_gateway_cert' => {Type: 'FullPath', PassOpt: :UnionStationGatewayCert},
+        'union_station_gateway_port' => {Type: 'Integer', PassOpt: :UnionStationGatewayPort},
+        'union_station_key' => {Type: 'String', PassOpt: :UnionStationKey},
+        'union_station_proxy_address' => {Type: 'URI', PassOpt: :UnionStationProxyAddress},
+        'union_station_support' => {Type: 'OnOff', PassOpt: :UnionStationSupport},
+        'wsgi_auto_detect' => {Type: 'String', PassOpt: :WsgiAutoDetect},
+        'rails_autodetect' => {Type: 'OnOff', PassOpt: :RailsAutoDetect},
+        'rack_autodetect' => {Type: 'OnOff', PassOpt: :RackAutoDetect},
+    }
+    passenger_config_options.each do |config_option, config_hash|
+      puppetized_config_option = config_option
+      valid_config_values = []
+      case config_hash[:Type]
+        when 'QuotedString'
+          valid_config_values = ['"a quoted string"']
+          valid_config_values.each do |valid_value|
+            describe "with #{puppetized_config_option} => '#{valid_value.gsub(/\"/, '')}'" do
+              let :params do
+                { puppetized_config_option.to_sym => valid_value }
+              end
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} "#{valid_value}"$/) }
+            end
+          end
+        when 'FullPath', 'RelPath', 'Path'
+          valid_config_values = ['/some/path/to/somewhere']
+          valid_config_values.each do |valid_value|
+            describe "with #{puppetized_config_option} => #{valid_value}" do
+              let :params do
+                { puppetized_config_option.to_sym => valid_value }
+              end
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} "#{valid_value}"$/) }
+            end
+          end
+        when 'URI', 'String'
+          valid_config_values = ['some_string_for_you']
+          valid_config_values.each do |valid_value|
+            describe "with #{puppetized_config_option} => #{valid_value}" do
+              let :params do
+                { puppetized_config_option.to_sym => valid_value }
+              end
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} #{valid_value}$/) }
+            end
+          end
+        when 'Integer'
+          valid_config_values = [100]
+          valid_config_values.each do |valid_value|
+            describe "with #{puppetized_config_option} => #{valid_value}" do
+              let :params do
+                { puppetized_config_option.to_sym => valid_value }
+              end
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} #{valid_value}$/) }
+            end
+          end
+        when 'OnOff'
+          valid_config_values = ['on', 'off']
+          valid_config_values.each do |valid_value|
+            describe "with #{puppetized_config_option} => '#{valid_value}'" do
+              let :params do
+                { puppetized_config_option.to_sym => valid_value }
+              end
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} #{valid_value}$/) }
+            end
+          end
+        else
+          valid_config_values = config_hash[:Type]
+          valid_config_values.each do |valid_value|
+            describe "with #{puppetized_config_option} => '#{valid_value}'" do
+              let :params do
+                { puppetized_config_option.to_sym => valid_value }
+              end
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} #{valid_value}$/) }
+            end
+          end
+      end
+    end
+  end
   context "on a Debian OS" do
     let :facts do
       {
@@ -25,7 +204,7 @@
     it { is_expected.to contain_file('passenger.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
-    describe "with passenger_root => '/usr/lib/example'" do
+     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }
       end
@@ -122,11 +301,17 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerAppEnv foo$/) }
     end
+    describe "with passenger_instance_registry_dir => '/var/run/passenger-instreg'" do
+      let :params do
+        { :passenger_instance_registry_dir => '/var/run/passenger-instreg' }
+      end
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerInstanceRegistryDir "/var/run/passenger-instreg"$}) }
+    end
     describe "with passenger_log_file => '/var/log/apache2/passenger.log'" do
       let :params do
         { :passenger_log_file => '/var/log/apache2/passenger.log' }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogFile /var/log/apache2/passenger.log$}) }
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogFile "/var/log/apache2/passenger.log"$}) }
     end
     describe "with passenger_log_level => 3" do
       let :params do
@@ -162,15 +347,15 @@
     context "with Ubuntu 12.04 defaults" do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '12.04',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'Ubuntu',
-          :lsbdistrelease         => '12.04',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+            :osfamily               => 'Debian',
+            :operatingsystemrelease => '12.04',
+            :kernel                 => 'Linux',
+            :operatingsystem        => 'Ubuntu',
+            :lsbdistrelease         => '12.04',
+            :concat_basedir         => '/dne',
+            :id                     => 'root',
+            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            :is_pe                  => false,
         }
       end
 
@@ -182,15 +367,15 @@
     context "with Ubuntu 14.04 defaults" do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '14.04',
-          :operatingsystem        => 'Ubuntu',
-          :kernel                 => 'Linux',
-          :lsbdistrelease         => '14.04',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+            :osfamily               => 'Debian',
+            :operatingsystemrelease => '14.04',
+            :operatingsystem        => 'Ubuntu',
+            :kernel                 => 'Linux',
+            :lsbdistrelease         => '14.04',
+            :concat_basedir         => '/dne',
+            :id                     => 'root',
+            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            :is_pe                  => false,
         }
       end
 
@@ -202,15 +387,15 @@
     context "with Debian 7 defaults" do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '7.3',
-          :operatingsystem        => 'Debian',
-          :kernel                 => 'Linux',
-          :lsbdistcodename        => 'wheezy',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+            :osfamily               => 'Debian',
+            :operatingsystemrelease => '7.3',
+            :operatingsystem        => 'Debian',
+            :kernel                 => 'Linux',
+            :lsbdistcodename        => 'wheezy',
+            :concat_basedir         => '/dne',
+            :id                     => 'root',
+            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            :is_pe                  => false,
         }
       end
 
@@ -222,15 +407,15 @@
     context "with Debian 8 defaults" do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '8.0',
-          :operatingsystem        => 'Debian',
-          :kernel                 => 'Linux',
-          :lsbdistcodename        => 'jessie',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+            :osfamily               => 'Debian',
+            :operatingsystemrelease => '8.0',
+            :operatingsystem        => 'Debian',
+            :kernel                 => 'Linux',
+            :lsbdistcodename        => 'jessie',
+            :concat_basedir         => '/dne',
+            :id                     => 'root',
+            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            :is_pe                  => false,
         }
       end
 
@@ -243,13 +428,13 @@
   context "on a RedHat OS" do
     let :rh_facts do
       {
-        :osfamily               => 'RedHat',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+          :osfamily               => 'RedHat',
+          :concat_basedir         => '/dne',
+          :operatingsystem        => 'RedHat',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
       }
     end
 
@@ -260,13 +445,13 @@
       it { is_expected.to contain_apache__mod('passenger') }
       it { is_expected.to contain_package("mod_passenger") }
       it { is_expected.to contain_file('passenger_package.conf').with({
-        'path' => '/etc/httpd/conf.d/passenger.conf',
-      }) }
+                                                                          'path' => '/etc/httpd/conf.d/passenger.conf',
+                                                                      }) }
       it { is_expected.to contain_file('passenger_package.conf').without_content }
       it { is_expected.to contain_file('passenger_package.conf').without_source }
       it { is_expected.to contain_file('zpassenger.load').with({
-        'path' => '/etc/httpd/conf.d/zpassenger.load',
-      }) }
+                                                                   'path' => '/etc/httpd/conf.d/zpassenger.load',
+                                                               }) }
       it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) }
       it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
       describe "with passenger_root => '/usr/lib/example'" do
@@ -287,24 +472,24 @@
       let(:facts) { rh_facts.merge(:operatingsystemrelease => '7') }
 
       it { is_expected.to contain_file('passenger_package.conf').with({
-        'path' => '/etc/httpd/conf.d/passenger.conf',
-      }) }
+                                                                          'path' => '/etc/httpd/conf.d/passenger.conf',
+                                                                      }) }
       it { is_expected.to contain_file('zpassenger.load').with({
-        'path' => '/etc/httpd/conf.modules.d/zpassenger.load',
-      }) }
+                                                                   'path' => '/etc/httpd/conf.modules.d/zpassenger.load',
+                                                               }) }
     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',
-        :is_pe                  => false,
+          :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',
+          :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -314,14 +499,14 @@
   context "on a Gentoo OS" do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+          :osfamily               => 'Gentoo',
+          :operatingsystem        => 'Gentoo',
+          :operatingsystemrelease => '3.16.1-gentoo',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :kernel                 => 'Linux',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 03ff534d25..17b13f9dc6 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -1,61 +1,263 @@
+<!--@formatter:off-->
 # The Passenger Apache module configuration file is being
 # managed by Puppet and changes will be overwritten.
 <IfModule mod_passenger.c>
-  <%- if @passenger_root -%>
-  PassengerRoot "<%= @passenger_root %>"
+  <%- if @passenger_allow_encoded_slashes -%>
+  PassengerAllowEncodedSlashes <%= @passenger_allow_encoded_slashes %>
   <%- end -%>
-  <%- if @passenger_ruby -%>
-  PassengerRuby "<%= @passenger_ruby %>"
+  <%- if @passenger_app_env -%>
+  PassengerAppEnv <%= @passenger_app_env %>
+  <%- end -%>
+  <%- if @passenger_app_group_name -%>
+  PassengerAppGroupName <%= @passenger_app_group_name %>
+  <%- end -%>
+  <%- if @passenger_app_root -%>
+  PassengerAppRoot "<%= @passenger_app_root %>"
+  <%- end -%>
+  <%- if @passenger_app_type -%>
+  PassengerAppType <%= @passenger_app_type %>
+  <%- end -%>
+  <%- if @passenger_base_uri -%>
+  PassengerBaseURI <%= @passenger_base_uri %>
+  <%- end -%>
+  <%- if @passenger_buffer_response -%>
+  PassengerBufferResponse <%= @passenger_buffer_response %>
+  <%- end -%>
+  <%- if @passenger_buffer_upload -%>
+  PassengerBufferUpload <%= @passenger_buffer_upload %>
+  <%- end -%>
+  <%- if @passenger_concurrency_model -%>
+  PassengerConcurrencyModel <%= @passenger_concurrency_model %>
+  <%- end -%>
+  <%- if @passenger_data_buffer_dir -%>
+  PassengerDataBufferDir "<%= @passenger_data_buffer_dir %>"
+  <%- end -%>
+  <%- if @passenger_debug_log_file -%>
+  PassengerDebugLogFile <%= @passenger_debug_log_file %>
+  <%- end -%>
+  <%- if @passenger_debugger -%>
+  PassengerDebugger <%= @passenger_debugger %>
+  <%- end -%>
+  <%- if @passenger_default_group -%>
+  PassengerDefaultGroup <%= @passenger_default_group %>
   <%- end -%>
   <%- if @passenger_default_ruby -%>
   PassengerDefaultRuby "<%= @passenger_default_ruby %>"
   <%- end -%>
+  <%- if @passenger_default_user -%>
+  PassengerDefaultUser <%= @passenger_default_user %>
+  <%- end -%>
+  <%- if @passenger_disable_security_update_check -%>
+  PassengerDisableSecurityUpdateCheck <%= @passenger_disable_security_update_check %>
+  <%- end -%>
+  <%- if @passenger_enabled -%>
+  PassengerEnabled <%= @passenger_enabled %>
+  <%- end -%>
+  <%- if @passenger_error_override -%>
+  PassengerErrorOverride <%= @passenger_error_override %>
+  <%- end -%>
+  <%- if @passenger_file_descriptor_log_file -%>
+  PassengerFileDescriptorLogFile "<%= @passenger_file_descriptor_log_file %>"
+  <%- end -%>
+  <%- if @passenger_fly_with -%>
+  PassengerFlyWith "<%= @passenger_fly_with %>"
+  <%- end -%>
+  <%- if @passenger_force_max_concurrent_requests_per_process -%>
+  PassengerForceMaxConcurrentRequestsPerProcess <%= @passenger_force_max_concurrent_requests_per_process %>
+  <%- end -%>
+  <%- if @passenger_friendly_error_pages -%>
+  PassengerFriendlyErrorPages <%= @passenger_friendly_error_pages %>
+  <%- end -%>
+  <%- if @passenger_group -%>
+  PassengerGroup <%= @passenger_group %>
+  <%- end -%>
   <%- if @passenger_high_performance -%>
   PassengerHighPerformance <%= @passenger_high_performance %>
   <%- end -%>
-  <%- if @passenger_max_pool_size -%>
-  PassengerMaxPoolSize <%= @passenger_max_pool_size %>
+  <%- if @passenger_instance_registry_dir -%>
+  PassengerInstanceRegistryDir "<%= @passenger_instance_registry_dir %>"
   <%- end -%>
-  <%- if @passenger_min_instances -%>
-  PassengerMinInstances <%= @passenger_min_instances %>
+  <%- if @passenger_load_shell_envvars -%>
+  PassengerLoadShellEnvvars <%= @passenger_load_shell_envvars %>
+  <%- end -%>
+  <%- if @passenger_log_file -%>
+  PassengerLogFile "<%= @passenger_log_file %>"
+  <%- end -%>
+  <%- if @passenger_log_level -%>
+  PassengerLogLevel <%= @passenger_log_level %>
+  <%- end -%>
+  <%- if @passenger_lve_min_uid -%>
+  PassengerLveMinUid <%= @passenger_lve_min_uid %>
+  <%- end -%>
+  <%- if @passenger_max_instances -%>
+  PassengerMaxInstances <%= @passenger_max_instances %>
   <%- end -%>
   <%- if @passenger_max_instances_per_app -%>
   PassengerMaxInstancesPerApp <%= @passenger_max_instances_per_app %>
   <%- end -%>
-  <%- if @passenger_pool_idle_time -%>
-  PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
+  <%- if @passenger_max_pool_size -%>
+  PassengerMaxPoolSize <%= @passenger_max_pool_size %>
+  <%- end -%>
+  <%- if @passenger_max_preloader_idle_time -%>
+  PassengerMaxPreloaderIdleTime <%= @passenger_max_preloader_idle_time %>
   <%- end -%>
   <%- if @passenger_max_request_queue_size -%>
   PassengerMaxRequestQueueSize <%= @passenger_max_request_queue_size %>
   <%- end -%>
+  <%- if @passenger_max_request_time -%>
+  PassengerMaxRequestTime <%= @passenger_max_request_time %>
+  <%- end -%>
   <%- if @passenger_max_requests -%>
   PassengerMaxRequests <%= @passenger_max_requests %>
   <%- end -%>
+  <%- if @passenger_memory_limit -%>
+  PassengerMemoryLimit <%= @passenger_memory_limit %>
+  <%- end -%>
+  <%- if @passenger_meteor_app_settings -%>
+  PassengerMeteorAppSettings "<%= @passenger_meteor_app_settings %>"
+  <%- end -%>
+  <%- if @passenger_min_instances -%>
+  PassengerMinInstances <%= @passenger_min_instances %>
+  <%- end -%>
+  <%- if @passenger_nodejs -%>
+  PassengerNodejs "<%= @passenger_nodejs %>"
+  <%- end -%>
+  <%- if @passenger_pool_idle_time -%>
+  PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
+  <%- end -%>
+  <%- if @passenger_pre_start -%>
+  PassengerPreStart <%= @passenger_pre_start %>
+  <%- end -%>
+  <%- if @passenger_python -%>
+  PassengerPython "<%= @passenger_python %>"
+  <%- end -%>
+  <%- if @passenger_resist_deployment_errors -%>
+  PassengerResistDeploymentErrors <%= @passenger_resist_deployment_errors %>
+  <%- end -%>
+  <%- if @passenger_resolve_symlinks_in_document_root -%>
+  PassengerResolveSymlinksInDocumentRoot <%= @passenger_resolve_symlinks_in_document_root %>
+  <%- end -%>
+  <%- if @passenger_response_buffer_high_watermark -%>
+  PassengerResponseBufferHighWatermark <%= @passenger_response_buffer_high_watermark %>
+  <%- end -%>
+  <%- if @passenger_restart_dir -%>
+  PassengerRestartDir "<%= @passenger_restart_dir %>"
+  <%- end -%>
+  <%- if @passenger_rolling_restarts -%>
+  PassengerRollingRestarts <%= @passenger_rolling_restarts %>
+  <%- end -%>
+  <%- if @passenger_root -%>
+  PassengerRoot "<%= @passenger_root %>"
+  <%- end -%>
+  <%- if @passenger_ruby -%>
+  PassengerRuby "<%= @passenger_ruby %>"
+  <%- end -%>
+  <%- if @passenger_security_update_check_proxy -%>
+  PassengerSecurityUpdateCheckProxy <%= @passenger_security_update_check_proxy %>
+  <%- end -%>
+  <%- if @passenger_show_version_in_header -%>
+  PassengerShowVersionInHeader <%= @passenger_show_version_in_header %>
+  <%- end -%>
+  <%- if @passenger_socket_backlog -%>
+  PassengerSocketBacklog <%= @passenger_socket_backlog %>
+  <%- end -%>
   <%- if @passenger_spawn_method -%>
   PassengerSpawnMethod <%= @passenger_spawn_method %>
   <%- end -%>
+  <%- if @passenger_start_timeout -%>
+  PassengerStartTimeout <%= @passenger_start_timeout %>
+  <%- end -%>
+  <%- if @passenger_startup_file -%>
+  PassengerStartupFile "<%= @passenger_startup_file %>"
+  <%- end -%>
   <%- if @passenger_stat_throttle_rate -%>
   PassengerStatThrottleRate <%= @passenger_stat_throttle_rate %>
   <%- end -%>
-  <%- if @rack_autodetect -%>
-  RackAutoDetect <%= @rack_autodetect %>
+  <%- if @passenger_sticky_sessions -%>
+  PassengerStickySessions <%= @passenger_sticky_sessions %>
   <%- end -%>
-  <%- if @rails_autodetect -%>
-  RailsAutoDetect <%= @rails_autodetect %>
+  <%- if @passenger_sticky_sessions_cookie_name -%>
+  PassengerStickySessionsCookieName <%= @passenger_sticky_sessions_cookie_name %>
+  <%- end -%>
+  <%- if @passenger_thread_count -%>
+  PassengerThreadCount <%= @passenger_thread_count %>
   <%- end -%>
   <%- if @passenger_use_global_queue -%>
   PassengerUseGlobalQueue <%= @passenger_use_global_queue %>
   <%- end -%>
-  <%- if @passenger_app_env -%>
-  PassengerAppEnv <%= @passenger_app_env %>
+  <%- if @passenger_user -%>
+  PassengerUser <%= @passenger_user %>
   <%- end -%>
-  <%- if @passenger_log_file -%>
-  PassengerLogFile <%= @passenger_log_file %>
+  <%- if @passenger_user_switching -%>
+  PassengerUserSwitching <%= @passenger_user_switching %>
   <%- end -%>
-  <%- if @passenger_log_level -%>
-  PassengerLogLevel <%= @passenger_log_level %>
+  <%- if @rack_auto_detect -%>
+  RackAutoDetect <%= @rack_auto_detect %>
   <%- end -%>
-  <%- if @passenger_data_buffer_dir -%>
-  PassengerDataBufferDir <%= @passenger_data_buffer_dir %>
+  <%- if @rack_base_uri -%>
+  RackBaseURI <%= @rack_base_uri %>
+  <%- end -%>
+  <%- if @rack_env -%>
+  RackEnv <%= @rack_env %>
+  <%- end -%>
+  <%- if @rails_allow_mod_rewrite -%>
+  RailsAllowModRewrite <%= @rails_allow_mod_rewrite %>
+  <%- end -%>
+  <%- if @rails_app_spawner_idle_time -%>
+  RailsAppSpawnerIdleTime <%= @rails_app_spawner_idle_time %>
+  <%- end -%>
+  <%- if @rails_auto_detect -%>
+  RailsAutoDetect <%= @rails_auto_detect %>
+  <%- end -%>
+  <%- if @rails_base_uri -%>
+  RailsBaseURI <%= @rails_base_uri %>
+  <%- end -%>
+  <%- if @rails_default_user -%>
+  RailsDefaultUser <%= @rails_default_user %>
+  <%- end -%>
+  <%- if @rails_env -%>
+  RailsEnv <%= @rails_env %>
+  <%- end -%>
+  <%- if @rails_framework_spawner_idle_time -%>
+  RailsFrameworkSpawnerIdleTime <%= @rails_framework_spawner_idle_time %>
+  <%- end -%>
+  <%- if @rails_ruby -%>
+  RailsRuby <%= @rails_ruby %>
+  <%- end -%>
+  <%- if @rails_spawn_method -%>
+  RailsSpawnMethod <%= @rails_spawn_method %>
+  <%- end -%>
+  <%- if @rails_user_switching -%>
+  RailsUserSwitching <%= @rails_user_switching %>
+  <%- end -%>
+  <%- if @union_station_filter -%>
+  UnionStationFilter "<%= @union_station_filter %>"
+  <%- end -%>
+  <%- if @union_station_gateway_address -%>
+  UnionStationGatewayAddress <%= @union_station_gateway_address %>
+  <%- end -%>
+  <%- if @union_station_gateway_cert -%>
+  UnionStationGatewayCert "<%= @union_station_gateway_cert %>"
+  <%- end -%>
+  <%- if @union_station_gateway_port -%>
+  UnionStationGatewayPort <%= @union_station_gateway_port %>
+  <%- end -%>
+  <%- if @union_station_key -%>
+  UnionStationKey <%= @union_station_key %>
+  <%- end -%>
+  <%- if @union_station_proxy_address -%>
+  UnionStationProxyAddress <%= @union_station_proxy_address %>
+  <%- end -%>
+  <%- if @union_station_support -%>
+  UnionStationSupport <%= @union_station_support %>
+  <%- end -%>
+  <%- if @wsgi_auto_detect -%>
+  WsgiAutoDetect <%= @wsgi_auto_detect %>
+  <%- end -%>
+  <%- if @rails_autodetect -%>
+  RailsAutoDetect <%= @rails_autodetect %>
+  <%- end -%>
+  <%- if @rack_autodetect -%>
+  RackAutoDetect <%= @rack_autodetect %>
   <%- end -%>
 </IfModule>

From 5a9717f3883541b33e2d7578136bafe90235bc7f Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Sat, 5 Aug 2017 21:13:50 -0500
Subject: [PATCH 1211/2267] Fix accpetance test error for mod_passenger

* Remove the RubyMine formatter configuration from the ERB template
* Remove pending message from spec/acceptance/mod_passenger_spec
  The message is not needed any more because puppet manages the
  passenger.conf file now
---
 spec/acceptance/mod_passenger_spec.rb | 3 ---
 templates/mod/passenger.conf.erb      | 1 -
 2 files changed, 4 deletions(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 4761d2c5bf..9243335dcc 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -2,9 +2,6 @@
 require_relative './version.rb'
 
 describe 'apache::mod::passenger class' do
-  pending 'This cannot run in the same test run as apache::vhost with passenger
-  as the passenger.conf file is not yet managed by puppet and will be wiped out
-  between tests and not replaced'
   case fact('osfamily')
   when 'Debian'
     conf_file = "#{$mod_dir}/passenger.conf"
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 17b13f9dc6..8373307767 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -1,4 +1,3 @@
-<!--@formatter:off-->
 # The Passenger Apache module configuration file is being
 # managed by Puppet and changes will be overwritten.
 <IfModule mod_passenger.c>

From bc13cb08963c32d1f41f01ef43a05e672852302f Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Sun, 6 Aug 2017 00:31:47 -0500
Subject: [PATCH 1212/2267] Add acceptance test for mod_passenger options

* validates the passenger_installed_version options fires the
  version checking for each option
* Fix a few linting errors
---
 manifests/mod/passenger.pp            |  33 ++--
 spec/acceptance/mod_passenger_spec.rb | 230 +++++++++++++++-----------
 2 files changed, 150 insertions(+), 113 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index c809a997a4..777e10d937 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -73,7 +73,6 @@
   $passenger_user                                                                            = undef,
   $passenger_user_switching                                                                  = undef,
   $rack_auto_detect                                                                          = undef,
-  $rack_autodectect                                                                          = undef,
   $rack_autodetect                                                                           = undef,
   $rack_base_uri                                                                             = undef,
   $rack_env                                                                                  = undef,
@@ -152,7 +151,7 @@
     }
     if $passenger_debug_log_file {
       if (versioncmp($passenger_installed_version, '5.0.5') > 0) {
-        warning("DEPRECATED PASSENGER OPTION :: passenger_debug_log_file :: This option has been renamed in version 5.0.5 to PassengerLogFile.")
+        warning('DEPRECATED PASSENGER OPTION :: passenger_debug_log_file :: This option has been renamed in version 5.0.5 to PassengerLogFile.')
       }
       if (versioncmp($passenger_installed_version, '5.0.5') < 0) {
         fail("Passenger config option :: passenger_debug_log_file is not introduced until version 5.0.5 :: ${passenger_installed_version} is the version reported")
@@ -405,9 +404,9 @@
     }
     if $passenger_use_global_queue {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail("REMOVED PASSENGER OPTION :: passenger_use_global_queue ::  ")
+        fail('REMOVED PASSENGER OPTION :: passenger_use_global_queue :: no longer used after version 4.0.0 and is on by default')
       }
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
+      if (versioncmp($passenger_installed_version, '2.0.4') < 0) {
         fail("Passenger config option :: passenger_use_global_queue is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
@@ -421,9 +420,9 @@
         fail("Passenger config option :: passenger_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $rack_auto_detect {
+    if ($rack_auto_detect or $rack_autodetect) {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail("REMOVED PASSENGER OPTION :: rack_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.")
+        fail('REMOVED PASSENGER OPTION :: rack_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
       }
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
         fail("Passenger config option :: rack_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
@@ -431,7 +430,7 @@
     }
     if $rack_base_uri {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning("DEPRECATED PASSENGER OPTION :: rack_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.")
+        warning('DEPRECATED PASSENGER OPTION :: rack_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.')
       }
       if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
         fail("Passenger config option :: rack_base_uri is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
@@ -452,15 +451,15 @@
     }
     if $rails_app_spawner_idle_time {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail("REMOVED PASSENGER OPTION :: rails_app_spawner_idle_time ::  This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.")
+        fail('REMOVED PASSENGER OPTION :: rails_app_spawner_idle_time ::  This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.')
       }
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
         fail("Passenger config option :: rails_app_spawner_idle_time is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $rails_auto_detect {
+    if ($rails_auto_detect or $rails_autodetect) {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail("REMOVED PASSENGER OPTION :: rails_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.")
+        fail('REMOVED PASSENGER OPTION :: rails_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
       }
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
         fail("Passenger config option :: rails_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
@@ -468,7 +467,7 @@
     }
     if $rails_base_uri {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning("DEPRECATED PASSENGER OPTION :: rails_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.")
+        warning('DEPRECATED PASSENGER OPTION :: rails_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.')
       }
       if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
         fail("Passenger config option :: rails_base_uri is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
@@ -476,7 +475,7 @@
     }
     if $rails_default_user {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning("DEPRECATED PASSENGER OPTION :: rails_default_user :: Deprecated in 3.0.0 in favor of PassengerDefaultUser.")
+        warning('DEPRECATED PASSENGER OPTION :: rails_default_user :: Deprecated in 3.0.0 in favor of PassengerDefaultUser.')
       }
       if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
         fail("Passenger config option :: rails_default_user is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
@@ -489,7 +488,7 @@
     }
     if $rails_framework_spawner_idle_time {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail("REMOVED PASSENGER OPTION :: rails_framework_spawner_idle_time ::  This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.")
+        fail('REMOVED PASSENGER OPTION :: rails_framework_spawner_idle_time ::  This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.')
       }
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
         fail("Passenger config option :: rails_framework_spawner_idle_time is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
@@ -497,7 +496,7 @@
     }
     if $rails_ruby {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning("DEPRECATED PASSENGER OPTION :: rails_ruby :: Deprecated in 3.0.0 in favor of PassengerRuby.")
+        warning('DEPRECATED PASSENGER OPTION :: rails_ruby :: Deprecated in 3.0.0 in favor of PassengerRuby.')
       }
       if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
         fail("Passenger config option :: rails_ruby is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
@@ -505,7 +504,7 @@
     }
     if $rails_spawn_method {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning("DEPRECATED PASSENGER OPTION :: rails_spawn_method :: Deprecated in 3.0.0 in favor of PassengerSpawnMethod.")
+        warning('DEPRECATED PASSENGER OPTION :: rails_spawn_method :: Deprecated in 3.0.0 in favor of PassengerSpawnMethod.')
       }
       if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
         fail("Passenger config option :: rails_spawn_method is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
@@ -513,7 +512,7 @@
     }
     if $rails_user_switching {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning("DEPRECATED PASSENGER OPTION :: rails_user_switching :: Deprecated in 3.0.0 in favor of PassengerUserSwitching.")
+        warning('DEPRECATED PASSENGER OPTION :: rails_user_switching :: Deprecated in 3.0.0 in favor of PassengerUserSwitching.')
       }
       if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
         fail("Passenger config option :: rails_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
@@ -556,7 +555,7 @@
     }
     if $wsgi_auto_detect {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail("REMOVED PASSENGER OPTION :: wsgi_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.")
+        fail('REMOVED PASSENGER OPTION :: wsgi_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
       }
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
         fail("Passenger config option :: wsgi_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 9243335dcc..4a28c46287 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -83,123 +83,161 @@
   EOS
 
   case fact('osfamily')
-  when 'Debian'
-    context "default passenger config" do
-      it 'succeeds in puppeting passenger' do
-        pp = <<-EOS
+    when 'Debian'
+      context 'passenger config with passenger_installed_version set' do
+        it 'should fail when an option is not valid for $passenger_installed_version' do
+          pp = <<-EOS
+          class { 'apache': }
+          class { 'apache::mod::passenger':
+            passenger_installed_version     => '4.0.0',
+            passenger_instance_registry_dir => '/some/path/to/nowhere'
+          }
+          EOS
+          apply_manifest(pp, :expect_failures => true) do |r|
+            expect(r.stderr).to match(/passenger_instance_registry_dir is not introduced until version 5.0.0/)
+          end
+        end
+        it 'should fail when an option is removed' do
+          pp = <<-EOS
+          class { 'apache': }
+          class { 'apache::mod::passenger':
+            passenger_installed_version => '5.0.0',
+            rails_autodetect            => 'on'
+          }
+          EOS
+          apply_manifest(pp, :expect_failures => true) do |r|
+            expect(r.stderr).to match(/REMOVED PASSENGER OPTION/)
+          end
+        end
+        it 'should warn when an option is deprecated' do
+          pp = <<-EOS
+          class { 'apache': }
+          class { 'apache::mod::passenger':
+            passenger_installed_version => '5.0.0',
+            rails_ruby                  => '/some/path/to/ruby'
+          }
+          EOS
+          apply_manifest(pp, :catch_failures => true) do |r|
+            expect(r.stderr).to match(/DEPRECATED PASSENGER OPTION/)
+          end
+        end
+      end
+      context "default passenger config" do
+        it 'succeeds in puppeting passenger' do
+          pp = <<-EOS
           /* stock apache and mod_passenger */
           class { 'apache': }
           class { 'apache::mod::passenger': }
           #{pp_rackapp}
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        else
-          it { should be_enabled }
+          EOS
+          apply_manifest(pp, :catch_failures => true)
         end
-        it { is_expected.to be_running }
-      end
 
-      describe file(conf_file) do
-        it { is_expected.to contain "PassengerRoot \"#{passenger_root}\"" }
-
-        case fact('operatingsystem')
-        when 'Ubuntu'
-          case fact('lsbdistrelease')
-          when '10.04'
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-          when '12.04'
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-          when '14.04'
-            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerRuby/" }
-          when '16.04'
-            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerRuby/" }
-          else
-            # This may or may not work on Ubuntu releases other than the above
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-          end
-        when 'Debian'
-          case fact('lsbdistcodename')
-          when 'wheezy'
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-          when 'jessie'
-            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerRuby/" }
+        describe service($service_name) do
+          if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+            pending 'Should be enabled - Bug 760616 on Debian 8'
           else
-            # This may or may not work on Debian releases other than the above
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+            it { should be_enabled }
           end
+          it { is_expected.to be_running }
         end
-      end
-
-      describe file(load_file) do
-        it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
-      end
 
-      it 'should output status via passenger-memory-stats' do
-        shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats") do |r|
-          expect(r.stdout).to match(/Apache processes/)
-          expect(r.stdout).to match(/Nginx processes/)
-          expect(r.stdout).to match(/Passenger processes/)
-
-          # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
-          # these two lines
-          unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or
-                 (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
-                 (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'))
-            expect(r.stdout).to match(/### Processes: [0-9]+/)
-            expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
+        describe file(conf_file) do
+          it { is_expected.to contain "PassengerRoot \"#{passenger_root}\"" }
+
+          case fact('operatingsystem')
+            when 'Ubuntu'
+              case fact('lsbdistrelease')
+                when '10.04'
+                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+                when '12.04'
+                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+                when '14.04'
+                  it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+                  it { is_expected.not_to contain "/PassengerRuby/" }
+                when '16.04'
+                  it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+                  it { is_expected.not_to contain "/PassengerRuby/" }
+                else
+                  # This may or may not work on Ubuntu releases other than the above
+                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+              end
+            when 'Debian'
+              case fact('lsbdistcodename')
+                when 'wheezy'
+                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+                when 'jessie'
+                  it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+                  it { is_expected.not_to contain "/PassengerRuby/" }
+                else
+                  # This may or may not work on Debian releases other than the above
+                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+              end
           end
+        end
 
-          expect(r.exit_code).to eq(0)
+        describe file(load_file) do
+          it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
         end
-      end
 
-      # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
-      # even when the passenger process is successfully installed and running
-      unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
-        it 'should output status via passenger-status' do
-          # xml output not available on ubunutu <= 10.04, so sticking with default pool output
-          shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r|
-            # spacing may vary
-            expect(r.stdout).to match(/[\-]+ General information [\-]+/)
-            if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' or
-               (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
-               fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-              expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/)
-              expect(r.stdout).to match(/Processes[ ]+: [0-9]+/)
-              expect(r.stdout).to match(/Requests in top-level queue[ ]+: [0-9]+/)
-            else
-              expect(r.stdout).to match(/max[ ]+= [0-9]+/)
-              expect(r.stdout).to match(/count[ ]+= [0-9]+/)
-              expect(r.stdout).to match(/active[ ]+= [0-9]+/)
-              expect(r.stdout).to match(/inactive[ ]+= [0-9]+/)
-              expect(r.stdout).to match(/Waiting on global queue: [0-9]+/)
+        it 'should output status via passenger-memory-stats' do
+          shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats") do |r|
+            expect(r.stdout).to match(/Apache processes/)
+            expect(r.stdout).to match(/Nginx processes/)
+            expect(r.stdout).to match(/Passenger processes/)
+
+            # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
+            # these two lines
+            unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or
+                (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
+                (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'))
+              expect(r.stdout).to match(/### Processes: [0-9]+/)
+              expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
             end
 
             expect(r.exit_code).to eq(0)
           end
         end
-      end
 
-      it 'should answer to passenger.example.com' do
-        shell("/usr/bin/curl passenger.example.com:80") do |r|
-          expect(r.stdout).to match(/^hello <b>world<\/b>$/)
-          expect(r.exit_code).to eq(0)
+        # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
+        # even when the passenger process is successfully installed and running
+        unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
+          it 'should output status via passenger-status' do
+            # xml output not available on ubunutu <= 10.04, so sticking with default pool output
+            shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r|
+              # spacing may vary
+              expect(r.stdout).to match(/[\-]+ General information [\-]+/)
+              if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' or
+                  (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
+                  fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+                expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/)
+                expect(r.stdout).to match(/Processes[ ]+: [0-9]+/)
+                expect(r.stdout).to match(/Requests in top-level queue[ ]+: [0-9]+/)
+              else
+                expect(r.stdout).to match(/max[ ]+= [0-9]+/)
+                expect(r.stdout).to match(/count[ ]+= [0-9]+/)
+                expect(r.stdout).to match(/active[ ]+= [0-9]+/)
+                expect(r.stdout).to match(/inactive[ ]+= [0-9]+/)
+                expect(r.stdout).to match(/Waiting on global queue: [0-9]+/)
+              end
+
+              expect(r.exit_code).to eq(0)
+            end
+          end
+        end
+
+        it 'should answer to passenger.example.com' do
+          shell("/usr/bin/curl passenger.example.com:80") do |r|
+            expect(r.stdout).to match(/^hello <b>world<\/b>$/)
+            expect(r.exit_code).to eq(0)
+          end
         end
-      end
 
-    end
+      end
   end
 end

From 267e0a8d523f76ffbe7758212facbba0017d29e2 Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Sun, 6 Aug 2017 15:40:04 -0500
Subject: [PATCH 1213/2267] MODULES-5426 : Fix bug for REMOVED options

The code generator was using the introduction version number as the removed verison number.
---
 manifests/mod/passenger.pp | 49 ++++----------------------------------
 1 file changed, 4 insertions(+), 45 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 777e10d937..23a21f522f 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -97,7 +97,6 @@
   $wsgi_auto_detect                                                                          = undef,
 ) inherits ::apache::params {
   include ::apache
-  # Checking version support
   if $passenger_installed_version {
     if $passenger_allow_encoded_slashes {
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
@@ -153,9 +152,6 @@
       if (versioncmp($passenger_installed_version, '5.0.5') > 0) {
         warning('DEPRECATED PASSENGER OPTION :: passenger_debug_log_file :: This option has been renamed in version 5.0.5 to PassengerLogFile.')
       }
-      if (versioncmp($passenger_installed_version, '5.0.5') < 0) {
-        fail("Passenger config option :: passenger_debug_log_file is not introduced until version 5.0.5 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $passenger_debugger {
       if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
@@ -404,10 +400,10 @@
     }
     if $passenger_use_global_queue {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail('REMOVED PASSENGER OPTION :: passenger_use_global_queue :: no longer used after version 4.0.0 and is on by default')
+        fail('REMOVED PASSENGER OPTION :: passenger_use_global_queue :: -- no message on the current passenger reference webpage -- ')
       }
       if (versioncmp($passenger_installed_version, '2.0.4') < 0) {
-        fail("Passenger config option :: passenger_use_global_queue is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
+        fail('Passenger config option :: passenger_use_global_queue is not introduced until version 2.0.4 :: ${passenger_installed_version} is the version reported')
       }
     }
     if $passenger_user {
@@ -420,21 +416,15 @@
         fail("Passenger config option :: passenger_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if ($rack_auto_detect or $rack_autodetect) {
+    if $rack_auto_detect {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         fail('REMOVED PASSENGER OPTION :: rack_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
       }
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: rack_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rack_base_uri {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
         warning('DEPRECATED PASSENGER OPTION :: rack_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.')
       }
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: rack_base_uri is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rack_env {
       if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
@@ -445,41 +435,26 @@
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         warning("DEPRECATED PASSENGER OPTION :: rails_allow_mod_rewrite :: This option doesn't do anything anymore in since version 4.0.0.")
       }
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: rails_allow_mod_rewrite is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rails_app_spawner_idle_time {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         fail('REMOVED PASSENGER OPTION :: rails_app_spawner_idle_time ::  This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.')
       }
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: rails_app_spawner_idle_time is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
-    if ($rails_auto_detect or $rails_autodetect) {
+    if $rails_auto_detect {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         fail('REMOVED PASSENGER OPTION :: rails_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
       }
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: rails_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rails_base_uri {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
         warning('DEPRECATED PASSENGER OPTION :: rails_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.')
       }
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: rails_base_uri is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rails_default_user {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
         warning('DEPRECATED PASSENGER OPTION :: rails_default_user :: Deprecated in 3.0.0 in favor of PassengerDefaultUser.')
       }
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: rails_default_user is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rails_env {
       if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
@@ -490,33 +465,21 @@
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         fail('REMOVED PASSENGER OPTION :: rails_framework_spawner_idle_time ::  This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.')
       }
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: rails_framework_spawner_idle_time is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rails_ruby {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
         warning('DEPRECATED PASSENGER OPTION :: rails_ruby :: Deprecated in 3.0.0 in favor of PassengerRuby.')
       }
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: rails_ruby is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rails_spawn_method {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
         warning('DEPRECATED PASSENGER OPTION :: rails_spawn_method :: Deprecated in 3.0.0 in favor of PassengerSpawnMethod.')
       }
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: rails_spawn_method is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $rails_user_switching {
       if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
         warning('DEPRECATED PASSENGER OPTION :: rails_user_switching :: Deprecated in 3.0.0 in favor of PassengerUserSwitching.')
       }
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: rails_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
     if $union_station_filter {
       if (versioncmp($passenger_installed_version, '3.0.5') < 0) {
@@ -557,12 +520,8 @@
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         fail('REMOVED PASSENGER OPTION :: wsgi_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
       }
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: wsgi_auto_detect is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
     }
   }
-
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
     file { 'passenger_package.conf':

From 015263ab1f9d1beea88ad5d76af2791c7b18f44d Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Sun, 6 Aug 2017 15:47:56 -0500
Subject: [PATCH 1214/2267] MODULES-5426 : Update comments in the list of
 template vars

---
 manifests/mod/passenger.pp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 23a21f522f..1feea3e165 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -587,7 +587,7 @@
   # - $passenger_buffer_upload : since 4.0.26
   # - $passenger_concurrency_model : since 4.0.0
   # - $passenger_data_buffer_dir : since 5.0.0
-  # - $passenger_debug_log_file : since 5.0.5
+  # - $passenger_debug_log_file : since unkown, probably deprecated
   # - $passenger_debugger : since 3.0.0
   # - $passenger_default_group : since 3.0.0
   # - $passenger_default_ruby : since 4.0.0
@@ -637,22 +637,22 @@
   # - $passenger_sticky_sessions : since 4.0.45
   # - $passenger_sticky_sessions_cookie_name : since 4.0.45
   # - $passenger_thread_count : since 4.0.0
-  # - $passenger_use_global_queue : since 4.0.0
+  # - $passenger_use_global_queue : since 2.0.4
   # - $passenger_user : since 4.0.0
   # - $passenger_user_switching : since 3.0.0
-  # - $rack_auto_detect : since 4.0.0
-  # - $rack_base_uri : since 3.0.0
+  # - $rack_auto_detect : since unkown, probably deprecated
+  # - $rack_base_uri : since unkown, probably deprecated
   # - $rack_env : since 2.0.0
-  # - $rails_allow_mod_rewrite : since 4.0.0
-  # - $rails_app_spawner_idle_time : since 4.0.0
-  # - $rails_auto_detect : since 4.0.0
-  # - $rails_base_uri : since 3.0.0
-  # - $rails_default_user : since 3.0.0
+  # - $rails_allow_mod_rewrite : since unkown, probably deprecated
+  # - $rails_app_spawner_idle_time : since unkown, probably deprecated
+  # - $rails_auto_detect : since unkown, probably deprecated
+  # - $rails_base_uri : since unkown, probably deprecated
+  # - $rails_default_user : since unkown, probably deprecated
   # - $rails_env : since 2.0.0
-  # - $rails_framework_spawner_idle_time : since 4.0.0
-  # - $rails_ruby : since 3.0.0
-  # - $rails_spawn_method : since 3.0.0
-  # - $rails_user_switching : since 3.0.0
+  # - $rails_framework_spawner_idle_time : since unkown, probably deprecated
+  # - $rails_ruby : since unkown, probably deprecated
+  # - $rails_spawn_method : since unkown, probably deprecated
+  # - $rails_user_switching : since unkown, probably deprecated
   # - $union_station_filter : since 3.0.5
   # - $union_station_gateway_address : since 3.0.0
   # - $union_station_gateway_cert : since 3.0.0
@@ -660,9 +660,9 @@
   # - $union_station_key : since 3.0.0
   # - $union_station_proxy_address : since 3.0.11
   # - $union_station_support : since 3.0.0
-  # - $wsgi_auto_detect : since 4.0.0
+  # - $wsgi_auto_detect : since unkown, probably deprecated
   # - $rails_autodetect : this options is only for backward compatiblity with older versions of this class
-  # - $rack_autodectect : this options is only for backward compatiblity with older versions of this class
+  # - $rack_autodetect : this options is only for backward compatiblity with older versions of this class
   file { 'passenger.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/${passenger_conf_file}",

From 39952b123f9a584eeea0253db77b0b4bb3d5f20b Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Sun, 6 Aug 2017 16:42:56 -0500
Subject: [PATCH 1215/2267] MODULES-5426 : Update the README.md mod_passenger
 documentation

---
 README.md | 125 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 101 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 13da71ce33..08b2d3aa25 100755
--- a/README.md
+++ b/README.md
@@ -2242,33 +2242,110 @@ $mount_file_content = {
 
 Installs and manages [`mod_passenger`][]. For Red Hat-based systems, ensure that you meet the minimum requirements described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux).
 
-**Parameters**:
-
-* `passenger_high_performance`: Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance).
-
-  Values: 'On', 'Off'.
-
-  Default: `undef`.
-
-* `passenger_pool_idle_time`: Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime).
-
-  Default: `undef`.
-
-* `passenger_max_pool_size`: Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize).
+The current set of server configurations settings were taking directly from the [`Passenger Reference`](https://www.phusionpassenger.com/library/config/apache/reference/). Deprecation warning and removal failure messages can be enabled by setting the passenger_installed_version to
+the version number installed on the server.
 
-  Default: `undef`.
-
-* `passenger_max_request_queue_size`: Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize).
-
-  Default: `undef`.
-
-* `passenger_max_requests`: Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests).
-
-  Default: `undef`.
+**Parameters**:
 
-* `passenger_data_buffer_dir`: Sets the [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir).
+|parameter|default value|passenger config setting|notes|
+|---------|-------------|------------------------|-----|
+|manage_repo|true|n/a||
+|mod_id|undef|n/a||
+|mod_lib|undef|n/a||
+|mod_lib_path|undef|n/a||
+|mod_package|undef|n/a||
+|mod_package_ensure|undef|n/a||
+|mod_path|undef|n/a||
+|passenger_allow_encoded_slashes|undef|[`PassengerAllowEncodedSlashes`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAllowEncodedSlashes)||
+|passenger_app_env|undef|[`PassengerAppEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppEnv)||
+|passenger_app_group_name|undef|[`PassengerAppGroupName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppGroupName)||
+|passenger_app_root|undef|[`PassengerAppRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppRoot)||
+|passenger_app_type|undef|[`PassengerAppType`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppType)||
+|passenger_base_uri|undef|[`PassengerBaseURI`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBaseURI)||
+|passenger_buffer_response|undef|[`PassengerBufferResponse`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferResponse)||
+|passenger_buffer_upload|undef|[`PassengerBufferUpload`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferUpload)||
+|passenger_concurrency_model|undef|[`PassengerConcurrencyModel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerConcurrencyModel)||
+|passenger_conf_file|$::apache::params::passenger_conf_file|n/a||
+|passenger_conf_package_file|$::apache::params::passenger_conf_package_file|n/a||
+|passenger_data_buffer_dir|undef|[`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDataBufferDir)||
+|passenger_debug_log_file|undef|PassengerDebugLogFile|This option has been renamed in version 5.0.5 to PassengerLogFile.|
+|passenger_debugger|undef|[`PassengerDebugger`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDebugger)||
+|passenger_default_group|undef|[`PassengerDefaultGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultGroup)||
+|passenger_default_ruby|$::apache::params::passenger_default_ruby|[`PassengerDefaultRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultRuby)||
+|passenger_default_user|undef|[`PassengerDefaultUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultUser)||
+|passenger_disable_security_update_check|undef|[`PassengerDisableSecurityUpdateCheck`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDisableSecurityUpdateCheck)||
+|passenger_enabled|undef|[`PassengerEnabled`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerEnabled)||
+|passenger_error_override|undef|[`PassengerErrorOverride`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerErrorOverride)||
+|passenger_file_descriptor_log_file|undef|[`PassengerFileDescriptorLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFileDescriptorLogFile)||
+|passenger_fly_with|undef|[`PassengerFlyWith`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFlyWith)||
+|passenger_force_max_concurrent_requests_per_process|undef|[`PassengerForceMaxConcurrentRequestsPerProcess`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerForceMaxConcurrentRequestsPerProcess)||
+|passenger_friendly_error_pages|undef|[`PassengerFriendlyErrorPages`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFriendlyErrorPages)||
+|passenger_group|undef|[`PassengerGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerGroup)||
+|passenger_high_performance|undef|[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerHighPerformance)||
+|passenger_installed_version|undef|n/a|When set, puppet will issue warnings and failures for deprecated and removed passenger configuration options|
+|passenger_instance_registry_dir|undef|[`PassengerInstanceRegistryDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerInstanceRegistryDir)||
+|passenger_load_shell_envvars|undef|[`PassengerLoadShellEnvvars`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLoadShellEnvvars)||
+|passenger_log_file|undef|[`PassengerLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogFile)||
+|passenger_log_level|undef|[`PassengerLogLevel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogLevel)||
+|passenger_lve_min_uid|undef|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)||
+|passenger_max_instances|undef|[`PassengerMaxInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstances)||
+|passenger_max_instances_per_app|undef|[`PassengerMaxInstancesPerApp`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstancesPerApp)||
+|passenger_max_pool_size|undef|[`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPoolSize)||
+|passenger_max_preloader_idle_time|undef|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)||
+|passenger_max_request_queue_size|undef|[`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestQueueSize)||
+|passenger_max_request_time|undef|[`PassengerMaxRequestTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestTime)||
+|passenger_max_requests|undef|[`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequests)||
+|passenger_memory_limit|undef|[`PassengerMemoryLimit`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMemoryLimit)||
+|passenger_meteor_app_settings|undef|[`PassengerMeteorAppSettings`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMeteorAppSettings)||
+|passenger_min_instances|undef|[`PassengerMinInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMinInstances)||
+|passenger_nodejs|undef|[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerNodejs)||
+|passenger_pool_idle_time|undef|[`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPoolIdleTime)||
+|passenger_pre_start|undef|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)||
+|passenger_python|undef|[`PassengerPython`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPython)||
+|passenger_resist_deployment_errors|undef|[`PassengerResistDeploymentErrors`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResistDeploymentErrors)||
+|passenger_resolve_symlinks_in_document_root|undef|[`PassengerResolveSymlinksInDocumentRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResolveSymlinksInDocumentRoot)||
+|passenger_response_buffer_high_watermark|undef|[`PassengerResponseBufferHighWatermark`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResponseBufferHighWatermark)||
+|passenger_restart_dir|undef|[`PassengerRestartDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRestartDir)||
+|passenger_rolling_restarts|undef|[`PassengerRollingRestarts`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRollingRestarts)||
+|passenger_root|$::apache::params::passenger_root|[`PassengerRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRoot)||
+|passenger_ruby|$::apache::params::passenger_ruby|[`PassengerRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRuby)||
+|passenger_security_update_check_proxy|undef|[`PassengerSecurityUpdateCheckProxy`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSecurityUpdateCheckProxy)||
+|passenger_show_version_in_header|undef|[`PassengerShowVersionInHeader`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerShowVersionInHeader)||
+|passenger_socket_backlog|undef|[`PassengerSocketBacklog`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSocketBacklog)||
+|passenger_spawn_method|undef|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)||
+|passenger_start_timeout|undef|[`PassengerStartTimeout`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartTimeout)||
+|passenger_startup_file|undef|[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartupFile)||
+|passenger_stat_throttle_rate|undef|[`PassengerStatThrottleRate`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStatThrottleRate)||
+|passenger_sticky_sessions|undef|[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessions)||
+|passenger_sticky_sessions_cookie_name|undef|[`PassengerStickySessionsCookieName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessionsCookieName)||
+|passenger_thread_count|undef|[`PassengerThreadCount`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerThreadCount)||
+|passenger_use_global_queue|undef|PassengerUseGlobalQueue||
+|passenger_user|undef|[`PassengerUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUser)||
+|passenger_user_switching|undef|[`PassengerUserSwitching`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUserSwitching)||
+|rack_auto_detect|undef|RackAutoDetect|These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
+|rack_autodetect|undef|n/a|see rack_auto_detect|
+|rack_base_uri|undef|RackBaseURI|Deprecated in 3.0.0 in favor of PassengerBaseURI.|
+|rack_env|undef|[`RackEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RackEnv)||
+|rails_allow_mod_rewrite|undef|RailsAllowModRewrite|This option doesn't do anything anymore in since version 4.0.0.|
+|rails_app_spawner_idle_time|undef|RailsAppSpawnerIdleTime|This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.|
+|rails_auto_detect|undef|RailsAutoDetect|These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
+|rails_autodetect|undef|n/a|see rails_auto_detect|
+|rails_base_uri|undef|RailsBaseURI|Deprecated in 3.0.0 in favor of PassengerBaseURI.|
+|rails_default_user|undef|RailsDefaultUser|Deprecated in 3.0.0 in favor of PassengerDefaultUser.|
+|rails_env|undef|[`RailsEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RailsEnv)||
+|rails_framework_spawner_idle_time|undef|RailsFrameworkSpawnerIdleTime|This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.|
+|rails_ruby|undef|RailsRuby|Deprecated in 3.0.0 in favor of PassengerRuby.|
+|rails_spawn_method|undef|RailsSpawnMethod|Deprecated in 3.0.0 in favor of PassengerSpawnMethod.|
+|rails_user_switching|undef|RailsUserSwitching|Deprecated in 3.0.0 in favor of PassengerUserSwitching.|
+|union_station_filter|undef|[`UnionStationFilter`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationFilter)||
+|union_station_gateway_address|undef|[`UnionStationGatewayAddress`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationGatewayAddress)||
+|union_station_gateway_cert|undef|[`UnionStationGatewayCert`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationGatewayCert)||
+|union_station_gateway_port|undef|[`UnionStationGatewayPort`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationGatewayPort)||
+|union_station_key|undef|[`UnionStationKey`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationKey)||
+|union_station_proxy_address|undef|[`UnionStationProxyAddress`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationProxyAddress)||
+|union_station_support|undef|[`UnionStationSupport`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationSupport)||
+|wsgi_auto_detect|undef|WsgiAutoDetect|These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
 
-  Default: `undef`.
 
 ##### Class: `apache::mod::ldap`
 

From a902627e901d44b00127bff9dd280b525bf483bf Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Sun, 6 Aug 2017 17:15:18 -0500
Subject: [PATCH 1216/2267] MODULES-5426 : Fix error introduced during refactor

---
 manifests/mod/passenger.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 1feea3e165..18fbe54670 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -416,7 +416,7 @@
         fail("Passenger config option :: passenger_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $rack_auto_detect {
+    if ($rack_auto_detect or $rack_autodetect) {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         fail('REMOVED PASSENGER OPTION :: rack_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
       }
@@ -441,7 +441,7 @@
         fail('REMOVED PASSENGER OPTION :: rails_app_spawner_idle_time ::  This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.')
       }
     }
-    if $rails_auto_detect {
+    if ($rails_auto_detect or $rails_autodetect) {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         fail('REMOVED PASSENGER OPTION :: rails_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
       }

From ebe8f47fb5450be51d8e60bad9a1e6a9b1f56370 Mon Sep 17 00:00:00 2001
From: Kyle Decot <decot.7@osu.edu>
Date: Tue, 10 Jan 2017 11:16:25 -0500
Subject: [PATCH 1217/2267] Adds apache::mod::macro

---
 README.md              | 1 +
 manifests/mod/macro.pp | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 manifests/mod/macro.pp

diff --git a/README.md b/README.md
index 13da71ce33..c985ac908d 100755
--- a/README.md
+++ b/README.md
@@ -1595,6 +1595,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `jk` (see [`apache::mod::jk`])
 * `ldap` (see [`apache::mod::ldap`][])
 * `lookup_identity`
+* `macro` (see [`apache:mod:macro`][])
 * `mime`
 * `mime_magic`\*
 * `negotiation`
diff --git a/manifests/mod/macro.pp b/manifests/mod/macro.pp
new file mode 100644
index 0000000000..2a1218bad4
--- /dev/null
+++ b/manifests/mod/macro.pp
@@ -0,0 +1,4 @@
+class apache::mod::macro {
+  include ::apache
+  ::apache::mod { 'macro': }
+}

From d0ced7885b0e1d0ac38b8cf5c14001399bebd09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Defortis?= <cedric.defortis@lyra-network.com>
Date: Thu, 10 Aug 2017 18:10:50 +0200
Subject: [PATCH 1218/2267] MODULES-5452 - add $options to `balancer` type

- New param `$options` to `apache::balancer` defined type so that it is
  possible to create Proxy block such as:

  ```puppet
  # Note the additional options 'timeout=4' and 'nonce=none':
  <Proxy balancer://foobar timeout=4 nonce=none>
      BalancerMember ajp://spam:8009 retry=30
      ...
  </Proxy>
  ```
---
 README.md                     |  6 ++++++
 manifests/balancer.pp         | 12 +++++++++++-
 spec/defines/balancer_spec.rb | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 13da71ce33..5e0d7d9291 100755
--- a/README.md
+++ b/README.md
@@ -2814,6 +2814,12 @@ Configures key-value pairs as [`ProxySet`][] lines. Values: a [hash][].
 
 Default: '{}'.
 
+##### `options`
+
+Specifies an [array][] of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the balancer URL, and accepts any key-value pairs available to [`ProxyPass`][].
+
+Default: [].
+
 ##### `collect_exported`
 
 Determines whether to use [exported resources][].
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 41db8a8dc8..9f824d2d82 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -35,6 +35,9 @@
 # apache::balancermember with array arguments, which allows you to deploy
 # everything in 1 run)
 #
+# [*options*]
+# Array, default empty. If given, additional directives may be added to the
+# <Proxy balancer://xyz OPTIONS> block.
 #
 # === Examples
 #
@@ -46,6 +49,7 @@
   $proxy_set = {},
   $collect_exported = true,
   $target = undef,
+  $options = [],
 ) {
   include ::apache::mod::proxy_balancer
 
@@ -63,6 +67,12 @@
     $_target = "${::apache::confd_dir}/balancer_${name}.conf"
   }
 
+  if !empty($options) {
+    $_options = " ${join($options, ' ')}"
+  } else {
+    $_options = ''
+  }
+
   concat { "apache_balancer_${name}":
     owner  => '0',
     group  => '0',
@@ -74,7 +84,7 @@
   concat::fragment { "00-${name}-header":
     target  => "apache_balancer_${name}",
     order   => '01',
-    content => "<Proxy balancer://${name}>\n",
+    content => "<Proxy balancer://${name}${_options}>\n",
   }
 
   if $collect_exported {
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index 3b43e3fd7a..e2452e395d 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -21,6 +21,12 @@
     let :pre_condition do
       'include apache'
     end
+    describe "works when only declaring resource title" do
+      it { should contain_concat('apache_balancer_myapp') }
+      it { should_not contain_apache__mod('slotmem_shm') }
+      it { should_not contain_apache__mod('lbmethod_byrequests') }
+      it { should contain_concat__fragment('00-myapp-header').with_content(%r{^<Proxy balancer://myapp>$}) }
+    end
     describe "accept a target parameter and use it" do
       let :params do
         {
@@ -33,6 +39,16 @@
       it { should_not contain_apache__mod('slotmem_shm') }
       it { should_not contain_apache__mod('lbmethod_byrequests') }
     end
+    describe "accept an options parameter and use it" do
+      let :params do
+        {
+          :options => ['timeout=0', 'nonce=none'],
+        }
+      end
+      it { should contain_concat__fragment('00-myapp-header').with_content(
+        %r{^<Proxy balancer://myapp timeout=0 nonce=none>$}
+      )}
+    end
     context "on jessie" do
       let(:facts) { super().merge({
         :operatingsystemrelease => '8',

From ecdee22556c78f0319e69b48253c8f691469b285 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 16 Aug 2017 16:54:55 +0200
Subject: [PATCH 1219/2267] Replace deprecated type checking with Puppet 4
 types

---
 manifests/fastcgi/server.pp         |  4 +--
 manifests/vhost.pp                  | 53 ++++++++---------------------
 spec/defines/fastcgi_server_spec.rb |  8 ++---
 3 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index 78363062ba..df53556af1 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -11,12 +11,12 @@
 
   Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server[$title]
 
-  if is_absolute_path($host) {
+  if $host =~ Stdlib::Absolutepath {
     $socket = $host
   }
 
   file { "fastcgi-pool-${name}.conf":
-    ensure  => present,
+    ensure  => file,
     path    => "${::apache::confd_dir}/fastcgi-pool-${name}.conf",
     owner   => 'root',
     group   => $::apache::params::root_group,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 18217deebe..3b9a2e69e2 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -26,7 +26,7 @@
   $ssl_verify_client                                                                = undef,
   $ssl_verify_depth                                                                 = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef,
-  $ssl_proxy_verify_depth                                                           = undef,
+  Optional[Integer[0]] $ssl_proxy_verify_depth                                      = undef,
   $ssl_proxy_ca_cert                                                                = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn                              = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                            = undef,
@@ -61,12 +61,12 @@
   $access_log_env_var                                                               = false,
   Optional[Array] $access_logs                                                      = undef,
   $aliases                                                                          = undef,
-  $directories                                                                      = undef,
+  Optional[Variant[Hash, Array[Hash]]] $directories                                 = undef,
   Boolean $error_log                                                                = true,
   $error_log_file                                                                   = undef,
   $error_log_pipe                                                                   = undef,
   $error_log_syslog                                                                 = undef,
-  $http_protocol_options                                                            = undef,
+  Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]] $http_protocol_options = undef,
   $modsec_audit_log                                                                 = undef,
   $modsec_audit_log_file                                                            = undef,
   $modsec_audit_log_pipe                                                            = undef,
@@ -133,7 +133,7 @@
   $use_optional_includes                                                            = $::apache::use_optional_includes,
   $apache_version                                                                   = $::apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
-  $suexec_user_group                                                                = undef,
+  Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                           = undef,
   $passenger_app_root                                                               = undef,
   $passenger_app_env                                                                = undef,
   $passenger_ruby                                                                   = undef,
@@ -148,10 +148,10 @@
   $passenger_startup_file                                                           = undef,
   $add_default_charset                                                              = undef,
   $modsec_disable_vhost                                                             = undef,
-  $modsec_disable_ids                                                               = undef,
+  Optional[Variant[Hash, Array]] $modsec_disable_ids                                = undef,
   $modsec_disable_ips                                                               = undef,
-  $modsec_disable_msgs                                                              = undef,
-  $modsec_disable_tags                                                              = undef,
+  Optional[Variant[Hash, Array]] $modsec_disable_msgs                               = undef,
+  Optional[Variant[Hash, Array]] $modsec_disable_tags                               = undef,
   $modsec_body_limit                                                                = undef,
   $jk_mounts                                                                        = undef,
   Boolean $auth_kerb                                                                = false,
@@ -183,27 +183,15 @@
 
   $apache_name = $::apache::apache_name
 
-  if $http_protocol_options != undef {
-    validate_re($http_protocol_options, '^((Strict|Unsafe)?\s*(\b(RegisteredMethods|LenientMethods))?\s*(\b(Allow0\.9|Require1\.0))?)$',
-    "${http_protocol_options} is not supported for http_protocol_options.
-    Allowed value is any sequence of the following alternative values:
-    'Strict' or Unsafe, 'RegisteredMethods' or 'LenientMethods', and
-    'Allow0.9' or 'Require1.0'.")
-  }
   if $rewrites {
     unless empty($rewrites) {
       $rewrites_flattened = delete_undef_values(flatten([$rewrites]))
-      validate_hash($rewrites_flattened[0])
+      assert_type(Array[Hash], $rewrites_flattened)
     }
   }
 
   # Input validation begins
 
-  if $suexec_user_group {
-    validate_re($suexec_user_group, '^[\w-]+ [\w-]+$',
-    "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
-  }
-
   if $log_level {
     validate_apache_log_level($log_level)
   }
@@ -220,10 +208,6 @@
     fail("Apache::Vhost[${name}]: 'modsec_audit_log_file' and 'modsec_audit_log_pipe' cannot be defined at the same time")
   }
 
-  if $ssl_proxy_verify_depth {
-    validate_integer($ssl_proxy_verify_depth)
-  }
-
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -479,9 +463,6 @@
 
   ## Create a default directory list if none defined
   if $directories {
-    if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {
-      fail("Apache::Vhost[${name}]: 'directories' must be either a Hash or an Array of Hashes")
-    }
     $_directories = $directories
   } elsif $docroot {
     $_directory = {
@@ -510,32 +491,26 @@
 
   ## Create a global LocationMatch if locations aren't defined
   if $modsec_disable_ids {
-    if is_hash($modsec_disable_ids) {
-      $_modsec_disable_ids = $modsec_disable_ids
-    } elsif is_array($modsec_disable_ids) {
+    if $modsec_disable_ids =~ Array {
       $_modsec_disable_ids = { '.*' => $modsec_disable_ids }
     } else {
-      fail("Apache::Vhost[${name}]: 'modsec_disable_ids' must be either a Hash of location/IDs or an Array of IDs")
+      $_modsec_disable_ids = $modsec_disable_ids
     }
   }
 
   if $modsec_disable_msgs {
-    if is_hash($modsec_disable_msgs) {
-      $_modsec_disable_msgs = $modsec_disable_msgs
-    } elsif is_array($modsec_disable_msgs) {
+    if $modsec_disable_msgs =~ Array {
       $_modsec_disable_msgs = { '.*' => $modsec_disable_msgs }
     } else {
-      fail("Apache::Vhost[${name}]: 'modsec_disable_msgs' must be either a Hash of location/Msgs or an Array of Msgs")
+      $_modsec_disable_msgs = $modsec_disable_msgs
     }
   }
 
   if $modsec_disable_tags {
-    if is_hash($modsec_disable_tags) {
-      $_modsec_disable_tags = $modsec_disable_tags
-    } elsif is_array($modsec_disable_tags) {
+    if $modsec_disable_tags =~ Array {
       $_modsec_disable_tags = { '.*' => $modsec_disable_tags }
     } else {
-      fail("Apache::Vhost[${name}]: 'modsec_disable_tags' must be either a Hash of location/Tags or an Array of Tags")
+      $_modsec_disable_tags = $modsec_disable_tags
     }
   }
 
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index e415461cca..b147349aed 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -25,7 +25,7 @@
       it { should contain_class("apache") }
       it { should contain_class("apache::mod::fastcgi") }
       it { should contain_file("fastcgi-pool-#{title}.conf").with(
-        :ensure => 'present',
+        :ensure => 'file',
         :path => "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf"
       ) }
     end
@@ -47,7 +47,7 @@
       it { should contain_class("apache") }
       it { should contain_class("apache::mod::fastcgi") }
       it { should contain_file("fastcgi-pool-#{title}.conf").with(
-        :ensure => 'present',
+        :ensure => 'file',
         :path   => "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf"
       ) }
     end
@@ -68,7 +68,7 @@
       it { should contain_class("apache") }
       it { should contain_class("apache::mod::fastcgi") }
       it { should contain_file("fastcgi-pool-#{title}.conf").with(
-        :ensure => 'present',
+        :ensure => 'file',
         :path   => "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf"
       ) }
     end
@@ -89,7 +89,7 @@
       it { should contain_class("apache") }
       it { should contain_class("apache::mod::fastcgi") }
       it { should contain_file("fastcgi-pool-#{title}.conf").with(
-        :ensure => 'present',
+        :ensure => 'file',
         :path   => "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf"
       ) }
     end

From 30783e7ca0bc12d65af682210c0e425b3cd48a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 17 Aug 2017 11:38:32 +0200
Subject: [PATCH 1220/2267] (maint) Improve version matching fact

* '/' not being a special char, there is no need to escape it (removed preceding '\');
* '.' matching any char, escaping it is required so that it matches a dot char (added preceding '\').
---
 lib/facter/apache_version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index 63e4e1c2b5..4bd7337f4d 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -3,11 +3,11 @@
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
       Facter.debug "Matching apachectl '#{apache_version}'"
-      %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)[1]
+      %r{^Server version: Apache/(\d+\.\d+(\.\d+)?)}.match(apache_version)[1]
     elsif Facter::Util::Resolution.which('apache2ctl')
       apache_version = Facter::Util::Resolution.exec('apache2ctl -v 2>&1')
       Facter.debug "Matching apache2ctl '#{apache_version}'"
-      %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)[1]
+      %r{^Server version: Apache/(\d+\.\d+(\.\d+)?)}.match(apache_version)[1]
     end
   end
 end

From 711d00f53faecf150aabc9809c796fb5829c6d74 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Thu, 17 Aug 2017 13:46:07 +0100
Subject: [PATCH 1221/2267] (MODULES-5501) - Remove unsupported Ubbuntu

Removing older version of Ubuntu that are not supported by the module.
---
 metadata.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index 710223ff62..88a87b6ea1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -62,8 +62,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "10.04",
-        "12.04",
         "14.04",
         "16.04"
       ]

From 7be697fb42413ccd955612620a7dce4904e0877b Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Thu, 17 Aug 2017 11:54:37 -0700
Subject: [PATCH 1222/2267] (MODULES-2765) removes testing section

Removes the testing section and any references to it
Adds a link to the CONTRIBUTING.md file
---
 README.md | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 13da71ce33..284a355a45 100755
--- a/README.md
+++ b/README.md
@@ -29,7 +29,6 @@
 
 [Development]: #development
 [Contributing]: #contributing
-[Testing]: #testing
 
 [`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
 [`add_listen`]: #add_listen
@@ -90,6 +89,7 @@
 [common gateway interface]: https://httpd.apache.org/docs/current/howto/cgi.html
 [`confd_dir`]: #confd_dir
 [`content`]: #content
+[CONTRIBUTING.md]: CONTRIBUTING.md
 [custom error documents]: https://httpd.apache.org/docs/current/custom-error.html
 [`custom_fragment`]: #custom_fragment
 
@@ -5368,26 +5368,4 @@ The [`apache::mod::suphp`][] class is untested since repositories are missing co
 
 We want to make it as easy as possible to contribute changes so our modules work in your environment, but we also need contributors to follow a few guidelines to help us maintain and improve the modules' quality.
 
-For more information, please read the complete [module contribution guide][].
-
-### Testing
-
-This project contains tests for both [rspec-puppet][] and [beaker-rspec][] to verify functionality. For detailed information on using these tools, please see their respective documentation.
-
-#### Testing quickstart: Ruby > 1.8.7
-
-```
-gem install bundler
-bundle install
-bundle exec rake spec
-bundle exec rspec spec/acceptance
-RS_DEBUG=yes bundle exec rspec spec/acceptance
-```
-
-#### Testing quickstart: Ruby = 1.8.7
-
-```
-gem install bundler
-bundle install --without system_tests
-bundle exec rake spec
-```
+For more information, please read the complete [module contribution guide][] and check out [CONTRIBUTING.md][].

From c689e70f0834d0a222d6516814be6cb2f71bb9c5 Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Sun, 6 Aug 2017 14:07:56 +0200
Subject: [PATCH 1223/2267] use Enum instead of validate_re for $sendfile

---
 manifests/init.pp           | 3 +--
 spec/classes/apache_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 7f9c2b99e2..39dc593334 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,7 +38,7 @@
   $purge_vhost_dir                                               = undef,
   $purge_vdir                                                    = false,
   $serveradmin                                                   = 'root@localhost',
-  $sendfile                                                      = 'On',
+  Enum['On', 'Off', 'on', 'off'] $sendfile                       = 'On',
   $error_documents                                               = false,
   $timeout                                                       = '120',
   $httpd_dir                                                     = $::apache::params::httpd_dir,
@@ -129,7 +129,6 @@
       notify => Class['Apache::Service'],
     }
   }
-  validate_re($sendfile, [ '^[oO]n$' , '^[oO]ff$' ])
 
   # declare the web server user and group
   # Note: requiring the package means the package ought to create them and not puppet
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 715ed41244..938c08cece 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -636,7 +636,7 @@
         it "should fail" do
           expect do
             catalogue
-          end.to raise_error(Puppet::Error, /"foo" does not match/)
+          end.to raise_error(Puppet::PreformattedError, /Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\], got 'foo'/)
         end
       end
       context "On" do

From e38d5154e525feb5ad1cf4afa55646016b6c143a Mon Sep 17 00:00:00 2001
From: Hailee Kenney <hailee@puppetlabs.com>
Date: Fri, 18 Aug 2017 14:33:38 -0700
Subject: [PATCH 1224/2267] (MODULES-5458) Add docs for default vhost
 workaround

Since there has repeatedly been some confusion with respect to
overriding the `default` and `default_ssl` vhosts in apache, add
some documentation explaining what is and isn't possible and a
potential workaround. See MODULES-5193 for more details.
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 13da71ce33..269e4e831c 100755
--- a/README.md
+++ b/README.md
@@ -3029,6 +3029,15 @@ The `apache::vhost` defined type uses `concat::fragment` to build the configurat
 
 For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples of 10, so any `order` that isn't a multiple of 10 should work.
 
+> **Note:** When creating an `apache::vhost`, it cannot be named `default` or `default-ssl`, because vhosts with these titles are always managed by the module. This means that you cannot override `Apache::Vhost['default']`  or `Apache::Vhost['default-ssl]` resources. An optional workaround is to create a vhost named something else, such as `my default`, and ensure that the `default` and `default_ssl` vhosts are set to `false`:
+
+```
+class { 'apache':
+  default_vhost     => false
+  default_ssl_vhost => false,
+}
+```
+
 **Parameters**:
 
 ##### `access_log`

From a0362c26bc72f8800fa4a2b810fbe98099de283c Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Mon, 21 Aug 2017 16:44:30 -0500
Subject: [PATCH 1225/2267] MODULES-5426 : Update module from pull request
 comments

* Remove whitespace added by auto-formatter
* Make hash keys more canonical
* Remove UnionStation options
  - UnionStation is no longer supported/offered by phusion.
  - All options are being removed from the passenger source
* Add white space at the end of the the passenger.conf.erb
  template
* Update the README to remove UnionStation as well as to
  add the context column.
---
 README.md                             | 191 +++++++--------
 manifests/mod/passenger.pp            | 218 +++++++----------
 spec/acceptance/mod_passenger_spec.rb | 224 ++++++++---------
 spec/classes/mod/passenger_spec.rb    | 338 ++++++++++++--------------
 templates/mod/passenger.conf.erb      |  22 +-
 5 files changed, 455 insertions(+), 538 deletions(-)

diff --git a/README.md b/README.md
index 08b2d3aa25..d4d606200e 100755
--- a/README.md
+++ b/README.md
@@ -2242,109 +2242,102 @@ $mount_file_content = {
 
 Installs and manages [`mod_passenger`][]. For Red Hat-based systems, ensure that you meet the minimum requirements described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux).
 
-The current set of server configurations settings were taking directly from the [`Passenger Reference`](https://www.phusionpassenger.com/library/config/apache/reference/). Deprecation warning and removal failure messages can be enabled by setting the passenger_installed_version to
+The current set of server configurations settings were taking directly from the [Passenger Reference](https://www.phusionpassenger.com/library/config/apache/reference/). Deprecation warning and removal failure messages can be enabled by setting the `passenger_installed_version` to
 the version number installed on the server.
 
 **Parameters**:
 
-|parameter|default value|passenger config setting|notes|
-|---------|-------------|------------------------|-----|
-|manage_repo|true|n/a||
-|mod_id|undef|n/a||
-|mod_lib|undef|n/a||
-|mod_lib_path|undef|n/a||
-|mod_package|undef|n/a||
-|mod_package_ensure|undef|n/a||
-|mod_path|undef|n/a||
-|passenger_allow_encoded_slashes|undef|[`PassengerAllowEncodedSlashes`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAllowEncodedSlashes)||
-|passenger_app_env|undef|[`PassengerAppEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppEnv)||
-|passenger_app_group_name|undef|[`PassengerAppGroupName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppGroupName)||
-|passenger_app_root|undef|[`PassengerAppRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppRoot)||
-|passenger_app_type|undef|[`PassengerAppType`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppType)||
-|passenger_base_uri|undef|[`PassengerBaseURI`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBaseURI)||
-|passenger_buffer_response|undef|[`PassengerBufferResponse`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferResponse)||
-|passenger_buffer_upload|undef|[`PassengerBufferUpload`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferUpload)||
-|passenger_concurrency_model|undef|[`PassengerConcurrencyModel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerConcurrencyModel)||
-|passenger_conf_file|$::apache::params::passenger_conf_file|n/a||
-|passenger_conf_package_file|$::apache::params::passenger_conf_package_file|n/a||
-|passenger_data_buffer_dir|undef|[`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDataBufferDir)||
-|passenger_debug_log_file|undef|PassengerDebugLogFile|This option has been renamed in version 5.0.5 to PassengerLogFile.|
-|passenger_debugger|undef|[`PassengerDebugger`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDebugger)||
-|passenger_default_group|undef|[`PassengerDefaultGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultGroup)||
-|passenger_default_ruby|$::apache::params::passenger_default_ruby|[`PassengerDefaultRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultRuby)||
-|passenger_default_user|undef|[`PassengerDefaultUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultUser)||
-|passenger_disable_security_update_check|undef|[`PassengerDisableSecurityUpdateCheck`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDisableSecurityUpdateCheck)||
-|passenger_enabled|undef|[`PassengerEnabled`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerEnabled)||
-|passenger_error_override|undef|[`PassengerErrorOverride`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerErrorOverride)||
-|passenger_file_descriptor_log_file|undef|[`PassengerFileDescriptorLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFileDescriptorLogFile)||
-|passenger_fly_with|undef|[`PassengerFlyWith`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFlyWith)||
-|passenger_force_max_concurrent_requests_per_process|undef|[`PassengerForceMaxConcurrentRequestsPerProcess`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerForceMaxConcurrentRequestsPerProcess)||
-|passenger_friendly_error_pages|undef|[`PassengerFriendlyErrorPages`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFriendlyErrorPages)||
-|passenger_group|undef|[`PassengerGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerGroup)||
-|passenger_high_performance|undef|[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerHighPerformance)||
-|passenger_installed_version|undef|n/a|When set, puppet will issue warnings and failures for deprecated and removed passenger configuration options|
-|passenger_instance_registry_dir|undef|[`PassengerInstanceRegistryDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerInstanceRegistryDir)||
-|passenger_load_shell_envvars|undef|[`PassengerLoadShellEnvvars`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLoadShellEnvvars)||
-|passenger_log_file|undef|[`PassengerLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogFile)||
-|passenger_log_level|undef|[`PassengerLogLevel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogLevel)||
-|passenger_lve_min_uid|undef|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)||
-|passenger_max_instances|undef|[`PassengerMaxInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstances)||
-|passenger_max_instances_per_app|undef|[`PassengerMaxInstancesPerApp`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstancesPerApp)||
-|passenger_max_pool_size|undef|[`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPoolSize)||
-|passenger_max_preloader_idle_time|undef|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)||
-|passenger_max_request_queue_size|undef|[`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestQueueSize)||
-|passenger_max_request_time|undef|[`PassengerMaxRequestTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestTime)||
-|passenger_max_requests|undef|[`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequests)||
-|passenger_memory_limit|undef|[`PassengerMemoryLimit`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMemoryLimit)||
-|passenger_meteor_app_settings|undef|[`PassengerMeteorAppSettings`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMeteorAppSettings)||
-|passenger_min_instances|undef|[`PassengerMinInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMinInstances)||
-|passenger_nodejs|undef|[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerNodejs)||
-|passenger_pool_idle_time|undef|[`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPoolIdleTime)||
-|passenger_pre_start|undef|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)||
-|passenger_python|undef|[`PassengerPython`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPython)||
-|passenger_resist_deployment_errors|undef|[`PassengerResistDeploymentErrors`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResistDeploymentErrors)||
-|passenger_resolve_symlinks_in_document_root|undef|[`PassengerResolveSymlinksInDocumentRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResolveSymlinksInDocumentRoot)||
-|passenger_response_buffer_high_watermark|undef|[`PassengerResponseBufferHighWatermark`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResponseBufferHighWatermark)||
-|passenger_restart_dir|undef|[`PassengerRestartDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRestartDir)||
-|passenger_rolling_restarts|undef|[`PassengerRollingRestarts`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRollingRestarts)||
-|passenger_root|$::apache::params::passenger_root|[`PassengerRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRoot)||
-|passenger_ruby|$::apache::params::passenger_ruby|[`PassengerRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRuby)||
-|passenger_security_update_check_proxy|undef|[`PassengerSecurityUpdateCheckProxy`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSecurityUpdateCheckProxy)||
-|passenger_show_version_in_header|undef|[`PassengerShowVersionInHeader`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerShowVersionInHeader)||
-|passenger_socket_backlog|undef|[`PassengerSocketBacklog`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSocketBacklog)||
-|passenger_spawn_method|undef|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)||
-|passenger_start_timeout|undef|[`PassengerStartTimeout`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartTimeout)||
-|passenger_startup_file|undef|[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartupFile)||
-|passenger_stat_throttle_rate|undef|[`PassengerStatThrottleRate`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStatThrottleRate)||
-|passenger_sticky_sessions|undef|[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessions)||
-|passenger_sticky_sessions_cookie_name|undef|[`PassengerStickySessionsCookieName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessionsCookieName)||
-|passenger_thread_count|undef|[`PassengerThreadCount`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerThreadCount)||
-|passenger_use_global_queue|undef|PassengerUseGlobalQueue||
-|passenger_user|undef|[`PassengerUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUser)||
-|passenger_user_switching|undef|[`PassengerUserSwitching`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUserSwitching)||
-|rack_auto_detect|undef|RackAutoDetect|These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
-|rack_autodetect|undef|n/a|see rack_auto_detect|
-|rack_base_uri|undef|RackBaseURI|Deprecated in 3.0.0 in favor of PassengerBaseURI.|
-|rack_env|undef|[`RackEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RackEnv)||
-|rails_allow_mod_rewrite|undef|RailsAllowModRewrite|This option doesn't do anything anymore in since version 4.0.0.|
-|rails_app_spawner_idle_time|undef|RailsAppSpawnerIdleTime|This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.|
-|rails_auto_detect|undef|RailsAutoDetect|These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
-|rails_autodetect|undef|n/a|see rails_auto_detect|
-|rails_base_uri|undef|RailsBaseURI|Deprecated in 3.0.0 in favor of PassengerBaseURI.|
-|rails_default_user|undef|RailsDefaultUser|Deprecated in 3.0.0 in favor of PassengerDefaultUser.|
-|rails_env|undef|[`RailsEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RailsEnv)||
-|rails_framework_spawner_idle_time|undef|RailsFrameworkSpawnerIdleTime|This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.|
-|rails_ruby|undef|RailsRuby|Deprecated in 3.0.0 in favor of PassengerRuby.|
-|rails_spawn_method|undef|RailsSpawnMethod|Deprecated in 3.0.0 in favor of PassengerSpawnMethod.|
-|rails_user_switching|undef|RailsUserSwitching|Deprecated in 3.0.0 in favor of PassengerUserSwitching.|
-|union_station_filter|undef|[`UnionStationFilter`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationFilter)||
-|union_station_gateway_address|undef|[`UnionStationGatewayAddress`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationGatewayAddress)||
-|union_station_gateway_cert|undef|[`UnionStationGatewayCert`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationGatewayCert)||
-|union_station_gateway_port|undef|[`UnionStationGatewayPort`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationGatewayPort)||
-|union_station_key|undef|[`UnionStationKey`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationKey)||
-|union_station_proxy_address|undef|[`UnionStationProxyAddress`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationProxyAddress)||
-|union_station_support|undef|[`UnionStationSupport`](https://www.phusionpassenger.com/library/config/apache/reference/#UnionStationSupport)||
-|wsgi_auto_detect|undef|WsgiAutoDetect|These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
+|parameter|default value|passenger config setting|context|notes|
+|---------|-------------|------------------------|-------|-----|
+|manage_repo|true|n/a|||
+|mod_id|undef|n/a|||
+|mod_lib|undef|n/a|||
+|mod_lib_path|undef|n/a|||
+|mod_package|undef|n/a|||
+|mod_package_ensure|undef|n/a|||
+|mod_path|undef|n/a|||
+|passenger_allow_encoded_slashes|undef|[`PassengerAllowEncodedSlashes`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAllowEncodedSlashes)|server-config virutal-host htaccess directory ||
+|passenger_app_env|undef|[`PassengerAppEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppEnv)|server-config virutal-host htaccess directory ||
+|passenger_app_group_name|undef|[`PassengerAppGroupName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppGroupName)|server-config virutal-host htaccess directory ||
+|passenger_app_root|undef|[`PassengerAppRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppRoot)|server-config virutal-host htaccess directory ||
+|passenger_app_type|undef|[`PassengerAppType`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppType)|server-config virutal-host htaccess directory ||
+|passenger_base_uri|undef|[`PassengerBaseURI`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBaseURI)|server-config virutal-host htaccess directory ||
+|passenger_buffer_response|undef|[`PassengerBufferResponse`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferResponse)|server-config virutal-host htaccess directory ||
+|passenger_buffer_upload|undef|[`PassengerBufferUpload`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferUpload)|server-config virutal-host htaccess directory ||
+|passenger_concurrency_model|undef|[`PassengerConcurrencyModel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerConcurrencyModel)|server-config virutal-host htaccess directory ||
+|passenger_conf_file|$::apache::params::passenger_conf_file|n/a|||
+|passenger_conf_package_file|$::apache::params::passenger_conf_package_file|n/a|||
+|passenger_data_buffer_dir|undef|[`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDataBufferDir)|server-config ||
+|passenger_debug_log_file|undef|PassengerDebugLogFile|server-config |This option has been renamed in version 5.0.5 to PassengerLogFile.|
+|passenger_debugger|undef|[`PassengerDebugger`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDebugger)|server-config virutal-host htaccess directory ||
+|passenger_default_group|undef|[`PassengerDefaultGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultGroup)|server-config ||
+|passenger_default_ruby|$::apache::params::passenger_default_ruby|[`PassengerDefaultRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultRuby)|server-config ||
+|passenger_default_user|undef|[`PassengerDefaultUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultUser)|server-config ||
+|passenger_disable_security_update_check|undef|[`PassengerDisableSecurityUpdateCheck`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDisableSecurityUpdateCheck)|server-config ||
+|passenger_enabled|undef|[`PassengerEnabled`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerEnabled)|server-config virutal-host htaccess directory ||
+|passenger_error_override|undef|[`PassengerErrorOverride`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerErrorOverride)|server-config virutal-host htaccess directory ||
+|passenger_file_descriptor_log_file|undef|[`PassengerFileDescriptorLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFileDescriptorLogFile)|server-config ||
+|passenger_fly_with|undef|[`PassengerFlyWith`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFlyWith)|server-config ||
+|passenger_force_max_concurrent_requests_per_process|undef|[`PassengerForceMaxConcurrentRequestsPerProcess`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerForceMaxConcurrentRequestsPerProcess)|server-config virutal-host htaccess directory ||
+|passenger_friendly_error_pages|undef|[`PassengerFriendlyErrorPages`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFriendlyErrorPages)|server-config virutal-host htaccess directory ||
+|passenger_group|undef|[`PassengerGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerGroup)|server-config virutal-host directory ||
+|passenger_high_performance|undef|[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerHighPerformance)|server-config virutal-host htaccess directory ||
+|passenger_installed_version|undef|n/a| |If set, will enable version checking of the passenger options against the value set.|
+|passenger_instance_registry_dir|undef|[`PassengerInstanceRegistryDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerInstanceRegistryDir)|server-config ||
+|passenger_load_shell_envvars|undef|[`PassengerLoadShellEnvvars`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLoadShellEnvvars)|server-config virutal-host htaccess directory ||
+|passenger_log_file|undef|[`PassengerLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogFile)|server-config ||
+|passenger_log_level|undef|[`PassengerLogLevel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogLevel)|server-config ||
+|passenger_lve_min_uid|undef|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)|server-config virutal-host ||
+|passenger_max_instances|undef|[`PassengerMaxInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstances)|server-config virutal-host htaccess directory ||
+|passenger_max_instances_per_app|undef|[`PassengerMaxInstancesPerApp`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstancesPerApp)|server-config ||
+|passenger_max_pool_size|undef|[`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPoolSize)|server-config ||
+|passenger_max_preloader_idle_time|undef|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)|server-config virutal-host ||
+|passenger_max_request_queue_size|undef|[`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestQueueSize)|server-config virutal-host htaccess directory ||
+|passenger_max_request_time|undef|[`PassengerMaxRequestTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestTime)|server-config virutal-host htaccess directory ||
+|passenger_max_requests|undef|[`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequests)|server-config virutal-host htaccess directory ||
+|passenger_memory_limit|undef|[`PassengerMemoryLimit`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMemoryLimit)|server-config virutal-host htaccess directory ||
+|passenger_meteor_app_settings|undef|[`PassengerMeteorAppSettings`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMeteorAppSettings)|server-config virutal-host htaccess directory ||
+|passenger_min_instances|undef|[`PassengerMinInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMinInstances)|server-config virutal-host htaccess directory ||
+|passenger_nodejs|undef|[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerNodejs)|server-config virutal-host htaccess directory ||
+|passenger_pool_idle_time|undef|[`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPoolIdleTime)|server-config ||
+|passenger_pre_start|undef|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)|server-config virutal-host ||
+|passenger_python|undef|[`PassengerPython`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPython)|server-config virutal-host htaccess directory ||
+|passenger_resist_deployment_errors|undef|[`PassengerResistDeploymentErrors`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResistDeploymentErrors)|server-config virutal-host htaccess directory ||
+|passenger_resolve_symlinks_in_document_root|undef|[`PassengerResolveSymlinksInDocumentRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResolveSymlinksInDocumentRoot)|server-config virutal-host htaccess directory ||
+|passenger_response_buffer_high_watermark|undef|[`PassengerResponseBufferHighWatermark`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResponseBufferHighWatermark)|server-config ||
+|passenger_restart_dir|undef|[`PassengerRestartDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRestartDir)|server-config virutal-host htaccess directory ||
+|passenger_rolling_restarts|undef|[`PassengerRollingRestarts`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRollingRestarts)|server-config virutal-host htaccess directory ||
+|passenger_root|$::apache::params::passenger_root|[`PassengerRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRoot)|server-config ||
+|passenger_ruby|$::apache::params::passenger_ruby|[`PassengerRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRuby)|server-config virutal-host htaccess directory ||
+|passenger_security_update_check_proxy|undef|[`PassengerSecurityUpdateCheckProxy`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSecurityUpdateCheckProxy)|server-config ||
+|passenger_show_version_in_header|undef|[`PassengerShowVersionInHeader`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerShowVersionInHeader)|server-config ||
+|passenger_socket_backlog|undef|[`PassengerSocketBacklog`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSocketBacklog)|server-config ||
+|passenger_spawn_method|undef|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)|server-config virutal-host ||
+|passenger_start_timeout|undef|[`PassengerStartTimeout`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartTimeout)|server-config virutal-host htaccess directory ||
+|passenger_startup_file|undef|[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartupFile)|server-config virutal-host htaccess directory ||
+|passenger_stat_throttle_rate|undef|[`PassengerStatThrottleRate`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStatThrottleRate)|server-config ||
+|passenger_sticky_sessions|undef|[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessions)|server-config virutal-host htaccess directory ||
+|passenger_sticky_sessions_cookie_name|undef|[`PassengerStickySessionsCookieName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessionsCookieName)|server-config virutal-host htaccess directory ||
+|passenger_thread_count|undef|[`PassengerThreadCount`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerThreadCount)|server-config virutal-host htaccess directory ||
+|passenger_use_global_queue|undef|PassengerUseGlobalQueue|server-config ||
+|passenger_user|undef|[`PassengerUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUser)|server-config virutal-host directory ||
+|passenger_user_switching|undef|[`PassengerUserSwitching`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUserSwitching)|server-config ||
+|rack_auto_detect|undef|RackAutoDetect|server-config |These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
+|rack_autodetect|undef|n/a|||
+|rack_base_uri|undef|RackBaseURI|server-config |Deprecated in 3.0.0 in favor of PassengerBaseURI.|
+|rack_env|undef|[`RackEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RackEnv)|server-config virutal-host htaccess directory ||
+|rails_allow_mod_rewrite|undef|RailsAllowModRewrite|server-config |This option doesn't do anything anymore in since version 4.0.0.|
+|rails_app_spawner_idle_time|undef|RailsAppSpawnerIdleTime|server-config |This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.|
+|rails_auto_detect|undef|RailsAutoDetect|server-config |These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
+|rails_autodetect|undef|n/a|||
+|rails_base_uri|undef|RailsBaseURI|server-config |Deprecated in 3.0.0 in favor of PassengerBaseURI.|
+|rails_default_user|undef|RailsDefaultUser|server-config |Deprecated in 3.0.0 in favor of PassengerDefaultUser.|
+|rails_env|undef|[`RailsEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RailsEnv)|server-config virutal-host htaccess directory ||
+|rails_framework_spawner_idle_time|undef|RailsFrameworkSpawnerIdleTime|server-config |This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.|
+|rails_ruby|undef|RailsRuby|server-config |Deprecated in 3.0.0 in favor of PassengerRuby.|
+|rails_spawn_method|undef|RailsSpawnMethod|server-config |Deprecated in 3.0.0 in favor of PassengerSpawnMethod.|
+|rails_user_switching|undef|RailsUserSwitching|server-config |Deprecated in 3.0.0 in favor of PassengerUserSwitching.|
+|wsgi_auto_detect|undef|WsgiAutoDetect|server-config |These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
 
 
 ##### Class: `apache::mod::ldap`
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 18fbe54670..96bdeafd50 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -1,3 +1,17 @@
+# Manages the settings for the mod_passenger
+# The result is the /etc/mods-available/mod_passenger.conf file
+#
+# Where do we get these settings?
+#   Settings are dervied from https://www.phusionpassenger.com/library/config/apache/reference
+#   Also in passenger source code you can strip out what are all the available options by looking in
+#     * src/apache2_module/Configuration.cpp
+#     * src/apache2_module/ConfigurationCommands.cpp
+#   Note: in the src there are several undocumented settings.
+#
+# Change Log:
+#   * As of 08/13/2017 there are 84 available/deprecated/removed settings.
+#   * Around 08/20/2017 UnionStation was discontinued options were removed.
+#   * As of 08/20/2017 there are 77 available/deprecated/removed settings.
 class apache::mod::passenger (
   $manage_repo                                                                               = true,
   $mod_id                                                                                    = undef,
@@ -87,13 +101,6 @@
   $rails_ruby                                                                                = undef,
   $rails_spawn_method                                                                        = undef,
   $rails_user_switching                                                                      = undef,
-  $union_station_filter                                                                      = undef,
-  $union_station_gateway_address                                                             = undef,
-  $union_station_gateway_cert                                                                = undef,
-  $union_station_gateway_port                                                                = undef,
-  $union_station_key                                                                         = undef,
-  $union_station_proxy_address                                                               = undef,
-  $union_station_support                                                                     = undef,
   $wsgi_auto_detect                                                                          = undef,
 ) inherits ::apache::params {
   include ::apache
@@ -481,41 +488,6 @@
         warning('DEPRECATED PASSENGER OPTION :: rails_user_switching :: Deprecated in 3.0.0 in favor of PassengerUserSwitching.')
       }
     }
-    if $union_station_filter {
-      if (versioncmp($passenger_installed_version, '3.0.5') < 0) {
-        fail("Passenger config option :: union_station_filter is not introduced until version 3.0.5 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $union_station_gateway_address {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: union_station_gateway_address is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $union_station_gateway_cert {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: union_station_gateway_cert is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $union_station_gateway_port {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: union_station_gateway_port is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $union_station_key {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: union_station_key is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $union_station_proxy_address {
-      if (versioncmp($passenger_installed_version, '3.0.11') < 0) {
-        fail("Passenger config option :: union_station_proxy_address is not introduced until version 3.0.11 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $union_station_support {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: union_station_support is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $wsgi_auto_detect {
       if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
         fail('REMOVED PASSENGER OPTION :: wsgi_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
@@ -576,91 +548,85 @@
       loadfile_name  => 'zpassenger.load',
     }
   }
+
   # Template uses:
-  # - $passenger_allow_encoded_slashes : since 4.0.0
-  # - $passenger_app_env : since 4.0.0
-  # - $passenger_app_group_name : since 4.0.0
-  # - $passenger_app_root : since 4.0.0
-  # - $passenger_app_type : since 4.0.25
-  # - $passenger_base_uri : since 4.0.0
-  # - $passenger_buffer_response : since 4.0.0
-  # - $passenger_buffer_upload : since 4.0.26
-  # - $passenger_concurrency_model : since 4.0.0
-  # - $passenger_data_buffer_dir : since 5.0.0
-  # - $passenger_debug_log_file : since unkown, probably deprecated
-  # - $passenger_debugger : since 3.0.0
-  # - $passenger_default_group : since 3.0.0
-  # - $passenger_default_ruby : since 4.0.0
-  # - $passenger_default_user : since 3.0.0
-  # - $passenger_disable_security_update_check : since 5.1.0
-  # - $passenger_enabled : since 4.0.0
-  # - $passenger_error_override : since 4.0.24
-  # - $passenger_file_descriptor_log_file : since 5.0.5
-  # - $passenger_fly_with : since 4.0.45
-  # - $passenger_force_max_concurrent_requests_per_process : since 5.0.22
-  # - $passenger_friendly_error_pages : since 4.0.42
-  # - $passenger_group : since 4.0.0
-  # - $passenger_high_performance : since 2.0.0
-  # - $passenger_instance_registry_dir : since 5.0.0
-  # - $passenger_load_shell_envvars : since 4.0.20
-  # - $passenger_log_file : since 5.0.5
-  # - $passenger_log_level : since 3.0.0
-  # - $passenger_lve_min_uid : since 5.0.28
-  # - $passenger_max_instances : since 3.0.0
-  # - $passenger_max_instances_per_app : since 3.0.0
-  # - $passenger_max_pool_size : since 1.0.0
-  # - $passenger_max_preloader_idle_time : since 4.0.0
-  # - $passenger_max_request_queue_size : since 4.0.15
-  # - $passenger_max_request_time : since 3.0.0
-  # - $passenger_max_requests : since 3.0.0
-  # - $passenger_memory_limit : since 3.0.0
-  # - $passenger_meteor_app_settings : since 5.0.7
-  # - $passenger_min_instances : since 3.0.0
-  # - $passenger_nodejs : since 4.0.24
-  # - $passenger_pool_idle_time : since 1.0.0
-  # - $passenger_pre_start : since 3.0.0
-  # - $passenger_python : since 4.0.0
-  # - $passenger_resist_deployment_errors : since 3.0.0
-  # - $passenger_resolve_symlinks_in_document_root : since 3.0.0
-  # - $passenger_response_buffer_high_watermark : since 5.0.0
-  # - $passenger_restart_dir : since 3.0.0
-  # - $passenger_rolling_restarts : since 3.0.0
-  # - $passenger_root : since 1.0.0
-  # - $passenger_ruby : since 4.0.0
-  # - $passenger_security_update_check_proxy : since 5.1.0
-  # - $passenger_show_version_in_header : since 5.1.0
-  # - $passenger_socket_backlog : since 5.0.24
-  # - $passenger_spawn_method : since 2.0.0
-  # - $passenger_start_timeout : since 4.0.15
-  # - $passenger_startup_file : since 4.0.25
-  # - $passenger_stat_throttle_rate : since 2.2.0
-  # - $passenger_sticky_sessions : since 4.0.45
-  # - $passenger_sticky_sessions_cookie_name : since 4.0.45
-  # - $passenger_thread_count : since 4.0.0
-  # - $passenger_use_global_queue : since 2.0.4
-  # - $passenger_user : since 4.0.0
-  # - $passenger_user_switching : since 3.0.0
-  # - $rack_auto_detect : since unkown, probably deprecated
-  # - $rack_base_uri : since unkown, probably deprecated
-  # - $rack_env : since 2.0.0
-  # - $rails_allow_mod_rewrite : since unkown, probably deprecated
-  # - $rails_app_spawner_idle_time : since unkown, probably deprecated
-  # - $rails_auto_detect : since unkown, probably deprecated
-  # - $rails_base_uri : since unkown, probably deprecated
-  # - $rails_default_user : since unkown, probably deprecated
-  # - $rails_env : since 2.0.0
-  # - $rails_framework_spawner_idle_time : since unkown, probably deprecated
-  # - $rails_ruby : since unkown, probably deprecated
-  # - $rails_spawn_method : since unkown, probably deprecated
-  # - $rails_user_switching : since unkown, probably deprecated
-  # - $union_station_filter : since 3.0.5
-  # - $union_station_gateway_address : since 3.0.0
-  # - $union_station_gateway_cert : since 3.0.0
-  # - $union_station_gateway_port : since 3.0.0
-  # - $union_station_key : since 3.0.0
-  # - $union_station_proxy_address : since 3.0.11
-  # - $union_station_support : since 3.0.0
-  # - $wsgi_auto_detect : since unkown, probably deprecated
+  # - $passenger_allow_encoded_slashes : since 4.0.0.
+  # - $passenger_app_env : since 4.0.0.
+  # - $passenger_app_group_name : since 4.0.0.
+  # - $passenger_app_root : since 4.0.0.
+  # - $passenger_app_type : since 4.0.25.
+  # - $passenger_base_uri : since 4.0.0.
+  # - $passenger_buffer_response : since 4.0.0.
+  # - $passenger_buffer_upload : since 4.0.26.
+  # - $passenger_concurrency_model : since 4.0.0.
+  # - $passenger_data_buffer_dir : since 5.0.0.
+  # - $passenger_debug_log_file : since unkown. Deprecated in 5.0.5.
+  # - $passenger_debugger : since 3.0.0.
+  # - $passenger_default_group : since 3.0.0.
+  # - $passenger_default_ruby : since 4.0.0.
+  # - $passenger_default_user : since 3.0.0.
+  # - $passenger_disable_security_update_check : since 5.1.0.
+  # - $passenger_enabled : since 4.0.0.
+  # - $passenger_error_override : since 4.0.24.
+  # - $passenger_file_descriptor_log_file : since 5.0.5.
+  # - $passenger_fly_with : since 4.0.45.
+  # - $passenger_force_max_concurrent_requests_per_process : since 5.0.22.
+  # - $passenger_friendly_error_pages : since 4.0.42.
+  # - $passenger_group : since 4.0.0.
+  # - $passenger_high_performance : since 2.0.0.
+  # - $passenger_instance_registry_dir : since 5.0.0.
+  # - $passenger_load_shell_envvars : since 4.0.20.
+  # - $passenger_log_file : since 5.0.5.
+  # - $passenger_log_level : since 3.0.0.
+  # - $passenger_lve_min_uid : since 5.0.28.
+  # - $passenger_max_instances : since 3.0.0.
+  # - $passenger_max_instances_per_app : since 3.0.0.
+  # - $passenger_max_pool_size : since 1.0.0.
+  # - $passenger_max_preloader_idle_time : since 4.0.0.
+  # - $passenger_max_request_queue_size : since 4.0.15.
+  # - $passenger_max_request_time : since 3.0.0.
+  # - $passenger_max_requests : since 3.0.0.
+  # - $passenger_memory_limit : since 3.0.0.
+  # - $passenger_meteor_app_settings : since 5.0.7.
+  # - $passenger_min_instances : since 3.0.0.
+  # - $passenger_nodejs : since 4.0.24.
+  # - $passenger_pool_idle_time : since 1.0.0.
+  # - $passenger_pre_start : since 3.0.0.
+  # - $passenger_python : since 4.0.0.
+  # - $passenger_resist_deployment_errors : since 3.0.0.
+  # - $passenger_resolve_symlinks_in_document_root : since 3.0.0.
+  # - $passenger_response_buffer_high_watermark : since 5.0.0.
+  # - $passenger_restart_dir : since 3.0.0.
+  # - $passenger_rolling_restarts : since 3.0.0.
+  # - $passenger_root : since 1.0.0.
+  # - $passenger_ruby : since 4.0.0.
+  # - $passenger_security_update_check_proxy : since 5.1.0.
+  # - $passenger_show_version_in_header : since 5.1.0.
+  # - $passenger_socket_backlog : since 5.0.24.
+  # - $passenger_spawn_method : since 2.0.0.
+  # - $passenger_start_timeout : since 4.0.15.
+  # - $passenger_startup_file : since 4.0.25.
+  # - $passenger_stat_throttle_rate : since 2.2.0.
+  # - $passenger_sticky_sessions : since 4.0.45.
+  # - $passenger_sticky_sessions_cookie_name : since 4.0.45.
+  # - $passenger_thread_count : since 4.0.0.
+  # - $passenger_use_global_queue : since 2.0.4.Deprecated in 4.0.0.
+  # - $passenger_user : since 4.0.0.
+  # - $passenger_user_switching : since 3.0.0.
+  # - $rack_auto_detect : since unkown. Deprecated in 4.0.0.
+  # - $rack_base_uri : since unkown. Deprecated in 3.0.0.
+  # - $rack_env : since 2.0.0.
+  # - $rails_allow_mod_rewrite : since unkown. Deprecated in 4.0.0.
+  # - $rails_app_spawner_idle_time : since unkown. Deprecated in 4.0.0.
+  # - $rails_auto_detect : since unkown. Deprecated in 4.0.0.
+  # - $rails_base_uri : since unkown. Deprecated in 3.0.0.
+  # - $rails_default_user : since unkown. Deprecated in 3.0.0.
+  # - $rails_env : since 2.0.0.
+  # - $rails_framework_spawner_idle_time : since unkown. Deprecated in 4.0.0.
+  # - $rails_ruby : since unkown. Deprecated in 3.0.0.
+  # - $rails_spawn_method : since unkown. Deprecated in 3.0.0.
+  # - $rails_user_switching : since unkown. Deprecated in 3.0.0.
+  # - $wsgi_auto_detect : since unkown. Deprecated in 4.0.0.
   # - $rails_autodetect : this options is only for backward compatiblity with older versions of this class
   # - $rack_autodetect : this options is only for backward compatiblity with older versions of this class
   file { 'passenger.conf':
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 4a28c46287..8a38920966 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -83,45 +83,45 @@
   EOS
 
   case fact('osfamily')
-    when 'Debian'
-      context 'passenger config with passenger_installed_version set' do
-        it 'should fail when an option is not valid for $passenger_installed_version' do
-          pp = <<-EOS
+  when 'Debian'
+    context 'passenger config with passenger_installed_version set' do
+      it 'should fail when an option is not valid for $passenger_installed_version' do
+        pp = <<-EOS
           class { 'apache': }
           class { 'apache::mod::passenger':
             passenger_installed_version     => '4.0.0',
             passenger_instance_registry_dir => '/some/path/to/nowhere'
           }
-          EOS
-          apply_manifest(pp, :expect_failures => true) do |r|
-            expect(r.stderr).to match(/passenger_instance_registry_dir is not introduced until version 5.0.0/)
-          end
+        EOS
+        apply_manifest(pp, :expect_failures => true) do |r|
+          expect(r.stderr).to match(/passenger_instance_registry_dir is not introduced until version 5.0.0/)
         end
-        it 'should fail when an option is removed' do
-          pp = <<-EOS
+      end
+      it 'should fail when an option is removed' do
+        pp = <<-EOS
           class { 'apache': }
           class { 'apache::mod::passenger':
             passenger_installed_version => '5.0.0',
             rails_autodetect            => 'on'
           }
-          EOS
-          apply_manifest(pp, :expect_failures => true) do |r|
-            expect(r.stderr).to match(/REMOVED PASSENGER OPTION/)
-          end
+        EOS
+        apply_manifest(pp, :expect_failures => true) do |r|
+          expect(r.stderr).to match(/REMOVED PASSENGER OPTION/)
         end
-        it 'should warn when an option is deprecated' do
-          pp = <<-EOS
+      end
+      it 'should warn when an option is deprecated' do
+        pp = <<-EOS
           class { 'apache': }
           class { 'apache::mod::passenger':
             passenger_installed_version => '5.0.0',
             rails_ruby                  => '/some/path/to/ruby'
           }
-          EOS
-          apply_manifest(pp, :catch_failures => true) do |r|
-            expect(r.stderr).to match(/DEPRECATED PASSENGER OPTION/)
-          end
+        EOS
+        apply_manifest(pp, :catch_failures => true) do |r|
+          expect(r.stderr).to match(/DEPRECATED PASSENGER OPTION/)
         end
       end
+    end
       context "default passenger config" do
         it 'succeeds in puppeting passenger' do
           pp = <<-EOS
@@ -129,115 +129,115 @@ class { 'apache::mod::passenger':
           class { 'apache': }
           class { 'apache::mod::passenger': }
           #{pp_rackapp}
-          EOS
-          apply_manifest(pp, :catch_failures => true)
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
+
+      describe service($service_name) do
+        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { should be_enabled }
         end
+        it { is_expected.to be_running }
+      end
 
-        describe service($service_name) do
-          if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-            pending 'Should be enabled - Bug 760616 on Debian 8'
+      describe file(conf_file) do
+        it { is_expected.to contain "PassengerRoot \"#{passenger_root}\"" }
+
+        case fact('operatingsystem')
+        when 'Ubuntu'
+          case fact('lsbdistrelease')
+          when '10.04'
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+          when '12.04'
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+          when '14.04'
+            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerRuby/" }
+          when '16.04'
+            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerRuby/" }
           else
-            it { should be_enabled }
+            # This may or may not work on Ubuntu releases other than the above
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           end
-          it { is_expected.to be_running }
-        end
-
-        describe file(conf_file) do
-          it { is_expected.to contain "PassengerRoot \"#{passenger_root}\"" }
-
-          case fact('operatingsystem')
-            when 'Ubuntu'
-              case fact('lsbdistrelease')
-                when '10.04'
-                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-                when '12.04'
-                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-                when '14.04'
-                  it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-                  it { is_expected.not_to contain "/PassengerRuby/" }
-                when '16.04'
-                  it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-                  it { is_expected.not_to contain "/PassengerRuby/" }
-                else
-                  # This may or may not work on Ubuntu releases other than the above
-                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-              end
-            when 'Debian'
-              case fact('lsbdistcodename')
-                when 'wheezy'
-                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-                when 'jessie'
-                  it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-                  it { is_expected.not_to contain "/PassengerRuby/" }
-                else
-                  # This may or may not work on Debian releases other than the above
-                  it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-                  it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-              end
+        when 'Debian'
+          case fact('lsbdistcodename')
+          when 'wheezy'
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+          when 'jessie'
+            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerRuby/" }
+          else
+            # This may or may not work on Debian releases other than the above
+            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           end
         end
+      end
 
-        describe file(load_file) do
-          it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
-        end
-
-        it 'should output status via passenger-memory-stats' do
-          shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats") do |r|
-            expect(r.stdout).to match(/Apache processes/)
-            expect(r.stdout).to match(/Nginx processes/)
-            expect(r.stdout).to match(/Passenger processes/)
-
-            # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
-            # these two lines
-            unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or
-                (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
-                (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'))
-              expect(r.stdout).to match(/### Processes: [0-9]+/)
-              expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
-            end
+      describe file(load_file) do
+        it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
+      end
 
-            expect(r.exit_code).to eq(0)
+      it 'should output status via passenger-memory-stats' do
+        shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats") do |r|
+          expect(r.stdout).to match(/Apache processes/)
+          expect(r.stdout).to match(/Nginx processes/)
+          expect(r.stdout).to match(/Passenger processes/)
+
+          # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
+          # these two lines
+          unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or
+                 (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
+                 (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'))
+            expect(r.stdout).to match(/### Processes: [0-9]+/)
+            expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
           end
+
+          expect(r.exit_code).to eq(0)
         end
+      end
 
-        # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
-        # even when the passenger process is successfully installed and running
-        unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
-          it 'should output status via passenger-status' do
-            # xml output not available on ubunutu <= 10.04, so sticking with default pool output
-            shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r|
-              # spacing may vary
-              expect(r.stdout).to match(/[\-]+ General information [\-]+/)
-              if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' or
-                  (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
-                  fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-                expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/)
-                expect(r.stdout).to match(/Processes[ ]+: [0-9]+/)
-                expect(r.stdout).to match(/Requests in top-level queue[ ]+: [0-9]+/)
-              else
-                expect(r.stdout).to match(/max[ ]+= [0-9]+/)
-                expect(r.stdout).to match(/count[ ]+= [0-9]+/)
-                expect(r.stdout).to match(/active[ ]+= [0-9]+/)
-                expect(r.stdout).to match(/inactive[ ]+= [0-9]+/)
-                expect(r.stdout).to match(/Waiting on global queue: [0-9]+/)
-              end
-
-              expect(r.exit_code).to eq(0)
+      # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
+      # even when the passenger process is successfully installed and running
+      unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
+        it 'should output status via passenger-status' do
+          # xml output not available on ubunutu <= 10.04, so sticking with default pool output
+          shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r|
+            # spacing may vary
+            expect(r.stdout).to match(/[\-]+ General information [\-]+/)
+            if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' or
+               (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
+               fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+              expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/)
+              expect(r.stdout).to match(/Processes[ ]+: [0-9]+/)
+              expect(r.stdout).to match(/Requests in top-level queue[ ]+: [0-9]+/)
+            else
+              expect(r.stdout).to match(/max[ ]+= [0-9]+/)
+              expect(r.stdout).to match(/count[ ]+= [0-9]+/)
+              expect(r.stdout).to match(/active[ ]+= [0-9]+/)
+              expect(r.stdout).to match(/inactive[ ]+= [0-9]+/)
+              expect(r.stdout).to match(/Waiting on global queue: [0-9]+/)
             end
-          end
-        end
 
-        it 'should answer to passenger.example.com' do
-          shell("/usr/bin/curl passenger.example.com:80") do |r|
-            expect(r.stdout).to match(/^hello <b>world<\/b>$/)
             expect(r.exit_code).to eq(0)
           end
         end
+      end
 
+      it 'should answer to passenger.example.com' do
+        shell("/usr/bin/curl passenger.example.com:80") do |r|
+          expect(r.stdout).to match(/^hello <b>world<\/b>$/)
+          expect(r.exit_code).to eq(0)
+        end
       end
+
+    end
   end
 end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 5c3c115239..078003a769 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -27,97 +27,91 @@
                                                             }) }
 
     passenger_config_options = {
-        'passenger_allow_encoded_slashes' => {Type: 'OnOff', PassOpt: :PassengerAllowEncodedSlashes},
-        'passenger_app_env' => {Type: 'String', PassOpt: :PassengerAppEnv},
-        'passenger_app_group_name' => {Type: 'String', PassOpt: :PassengerAppGroupName},
-        'passenger_app_root' => {Type: 'FullPath', PassOpt: :PassengerAppRoot},
-        'passenger_app_type' => {Type: 'String', PassOpt: :PassengerAppType},
-        'passenger_base_uri' => {Type: 'URI', PassOpt: :PassengerBaseURI},
-        'passenger_buffer_response' => {Type: 'OnOff', PassOpt: :PassengerBufferResponse},
-        'passenger_buffer_upload' => {Type: 'OnOff', PassOpt: :PassengerBufferUpload},
-        'passenger_concurrency_model' => {Type: ["process", "thread"], PassOpt: :PassengerConcurrencyModel},
-        'passenger_data_buffer_dir' => {Type: 'FullPath', PassOpt: :PassengerDataBufferDir},
-        'passenger_debug_log_file' => {Type: 'String', PassOpt: :PassengerDebugLogFile},
-        'passenger_debugger' => {Type: 'OnOff', PassOpt: :PassengerDebugger},
-        'passenger_default_group' => {Type: 'String', PassOpt: :PassengerDefaultGroup},
-        'passenger_default_ruby' => {Type: 'FullPath', PassOpt: :PassengerDefaultRuby},
-        'passenger_default_user' => {Type: 'String', PassOpt: :PassengerDefaultUser},
-        'passenger_disable_security_update_check' => {Type: 'OnOff', PassOpt: :PassengerDisableSecurityUpdateCheck},
-        'passenger_enabled' => {Type: 'OnOff', PassOpt: :PassengerEnabled},
-        'passenger_error_override' => {Type: 'OnOff', PassOpt: :PassengerErrorOverride},
-        'passenger_file_descriptor_log_file' => {Type: 'FullPath', PassOpt: :PassengerFileDescriptorLogFile},
-        'passenger_fly_with' => {Type: 'FullPath', PassOpt: :PassengerFlyWith},
-        'passenger_force_max_concurrent_requests_per_process' => {Type: 'Integer', PassOpt: :PassengerForceMaxConcurrentRequestsPerProcess},
-        'passenger_friendly_error_pages' => {Type: 'OnOff', PassOpt: :PassengerFriendlyErrorPages},
-        'passenger_group' => {Type: 'String', PassOpt: :PassengerGroup},
-        'passenger_high_performance' => {Type: 'OnOff', PassOpt: :PassengerHighPerformance},
-        'passenger_instance_registry_dir' => {Type: 'FullPath', PassOpt: :PassengerInstanceRegistryDir},
-        'passenger_load_shell_envvars' => {Type: 'OnOff', PassOpt: :PassengerLoadShellEnvvars},
-        'passenger_log_file' => {Type: 'FullPath', PassOpt: :PassengerLogFile},
-        'passenger_log_level' => {Type: 'Integer', PassOpt: :PassengerLogLevel},
-        'passenger_lve_min_uid' => {Type: 'Integer', PassOpt: :PassengerLveMinUid},
-        'passenger_max_instances' => {Type: 'Integer', PassOpt: :PassengerMaxInstances},
-        'passenger_max_instances_per_app' => {Type: 'Integer', PassOpt: :PassengerMaxInstancesPerApp},
-        'passenger_max_pool_size' => {Type: 'Integer', PassOpt: :PassengerMaxPoolSize},
-        'passenger_max_preloader_idle_time' => {Type: 'Integer', PassOpt: :PassengerMaxPreloaderIdleTime},
-        'passenger_max_request_queue_size' => {Type: 'Integer', PassOpt: :PassengerMaxRequestQueueSize},
-        'passenger_max_request_time' => {Type: 'Integer', PassOpt: :PassengerMaxRequestTime},
-        'passenger_max_requests' => {Type: 'Integer', PassOpt: :PassengerMaxRequests},
-        'passenger_memory_limit' => {Type: 'Integer', PassOpt: :PassengerMemoryLimit},
-        'passenger_meteor_app_settings' => {Type: 'FullPath', PassOpt: :PassengerMeteorAppSettings},
-        'passenger_min_instances' => {Type: 'Integer', PassOpt: :PassengerMinInstances},
-        'passenger_nodejs' => {Type: 'FullPath', PassOpt: :PassengerNodejs},
-        'passenger_pool_idle_time' => {Type: 'Integer', PassOpt: :PassengerPoolIdleTime},
-        'passenger_pre_start' => {Type: 'URI', PassOpt: :PassengerPreStart},
-        'passenger_python' => {Type: 'FullPath', PassOpt: :PassengerPython},
-        'passenger_resist_deployment_errors' => {Type: 'OnOff', PassOpt: :PassengerResistDeploymentErrors},
-        'passenger_resolve_symlinks_in_document_root' => {Type: 'OnOff', PassOpt: :PassengerResolveSymlinksInDocumentRoot},
-        'passenger_response_buffer_high_watermark' => {Type: 'Integer', PassOpt: :PassengerResponseBufferHighWatermark},
-        'passenger_restart_dir' => {Type: 'Path', PassOpt: :PassengerRestartDir},
-        'passenger_rolling_restarts' => {Type: 'OnOff', PassOpt: :PassengerRollingRestarts},
-        'passenger_root' => {Type: 'FullPath', PassOpt: :PassengerRoot},
-        'passenger_ruby' => {Type: 'FullPath', PassOpt: :PassengerRuby},
-        'passenger_security_update_check_proxy' => {Type: 'URI', PassOpt: :PassengerSecurityUpdateCheckProxy},
-        'passenger_show_version_in_header' => {Type: 'OnOff', PassOpt: :PassengerShowVersionInHeader},
-        'passenger_socket_backlog' => {Type: 'Integer', PassOpt: :PassengerSocketBacklog},
-        'passenger_spawn_method' => {Type: ["smart", "direct"], PassOpt: :PassengerSpawnMethod},
-        'passenger_start_timeout' => {Type: 'Integer', PassOpt: :PassengerStartTimeout},
-        'passenger_startup_file' => {Type: 'RelPath', PassOpt: :PassengerStartupFile},
-        'passenger_stat_throttle_rate' => {Type: 'Integer', PassOpt: :PassengerStatThrottleRate},
-        'passenger_sticky_sessions' => {Type: 'OnOff', PassOpt: :PassengerStickySessions},
-        'passenger_sticky_sessions_cookie_name' => {Type: 'String', PassOpt: :PassengerStickySessionsCookieName},
-        'passenger_thread_count' => {Type: 'Integer', PassOpt: :PassengerThreadCount},
-        'passenger_use_global_queue' => {Type: 'String', PassOpt: :PassengerUseGlobalQueue},
-        'passenger_user' => {Type: 'String', PassOpt: :PassengerUser},
-        'passenger_user_switching' => {Type: 'OnOff', PassOpt: :PassengerUserSwitching},
-        'rack_auto_detect' => {Type: 'String', PassOpt: :RackAutoDetect},
-        'rack_base_uri' => {Type: 'String', PassOpt: :RackBaseURI},
-        'rack_env' => {Type: 'String', PassOpt: :RackEnv},
-        'rails_allow_mod_rewrite' => {Type: 'String', PassOpt: :RailsAllowModRewrite},
-        'rails_app_spawner_idle_time' => {Type: 'String', PassOpt: :RailsAppSpawnerIdleTime},
-        'rails_auto_detect' => {Type: 'String', PassOpt: :RailsAutoDetect},
-        'rails_base_uri' => {Type: 'String', PassOpt: :RailsBaseURI},
-        'rails_default_user' => {Type: 'String', PassOpt: :RailsDefaultUser},
-        'rails_env' => {Type: 'String', PassOpt: :RailsEnv},
-        'rails_framework_spawner_idle_time' => {Type: 'String', PassOpt: :RailsFrameworkSpawnerIdleTime},
-        'rails_ruby' => {Type: 'String', PassOpt: :RailsRuby},
-        'rails_spawn_method' => {Type: 'String', PassOpt: :RailsSpawnMethod},
-        'rails_user_switching' => {Type: 'String', PassOpt: :RailsUserSwitching},
-        'union_station_filter' => {Type: 'QuotedString', PassOpt: :UnionStationFilter},
-        'union_station_gateway_address' => {Type: 'URI', PassOpt: :UnionStationGatewayAddress},
-        'union_station_gateway_cert' => {Type: 'FullPath', PassOpt: :UnionStationGatewayCert},
-        'union_station_gateway_port' => {Type: 'Integer', PassOpt: :UnionStationGatewayPort},
-        'union_station_key' => {Type: 'String', PassOpt: :UnionStationKey},
-        'union_station_proxy_address' => {Type: 'URI', PassOpt: :UnionStationProxyAddress},
-        'union_station_support' => {Type: 'OnOff', PassOpt: :UnionStationSupport},
-        'wsgi_auto_detect' => {Type: 'String', PassOpt: :WsgiAutoDetect},
-        'rails_autodetect' => {Type: 'OnOff', PassOpt: :RailsAutoDetect},
-        'rack_autodetect' => {Type: 'OnOff', PassOpt: :RackAutoDetect},
+        'passenger_allow_encoded_slashes' => {type: 'OnOff', pass_opt: :PassengerAllowEncodedSlashes},
+        'passenger_app_env' => {type: 'String', pass_opt: :PassengerAppEnv},
+        'passenger_app_group_name' => {type: 'String', pass_opt: :PassengerAppGroupName},
+        'passenger_app_root' => {type: 'FullPath', pass_opt: :PassengerAppRoot},
+        'passenger_app_type' => {type: 'String', pass_opt: :PassengerAppType},
+        'passenger_base_uri' => {type: 'URI', pass_opt: :PassengerBaseURI},
+        'passenger_buffer_response' => {type: 'OnOff', pass_opt: :PassengerBufferResponse},
+        'passenger_buffer_upload' => {type: 'OnOff', pass_opt: :PassengerBufferUpload},
+        'passenger_concurrency_model' => {type: ["process", "thread"], pass_opt: :PassengerConcurrencyModel},
+        'passenger_data_buffer_dir' => {type: 'FullPath', pass_opt: :PassengerDataBufferDir},
+        'passenger_debug_log_file' => {type: 'String', pass_opt: :PassengerDebugLogFile},
+        'passenger_debugger' => {type: 'OnOff', pass_opt: :PassengerDebugger},
+        'passenger_default_group' => {type: 'String', pass_opt: :PassengerDefaultGroup},
+        'passenger_default_ruby' => {type: 'FullPath', pass_opt: :PassengerDefaultRuby},
+        'passenger_default_user' => {type: 'String', pass_opt: :PassengerDefaultUser},
+        'passenger_disable_security_update_check' => {type: 'OnOff', pass_opt: :PassengerDisableSecurityUpdateCheck},
+        'passenger_enabled' => {type: 'OnOff', pass_opt: :PassengerEnabled},
+        'passenger_error_override' => {type: 'OnOff', pass_opt: :PassengerErrorOverride},
+        'passenger_file_descriptor_log_file' => {type: 'FullPath', pass_opt: :PassengerFileDescriptorLogFile},
+        'passenger_fly_with' => {type: 'FullPath', pass_opt: :PassengerFlyWith},
+        'passenger_force_max_concurrent_requests_per_process' => {type: 'Integer', pass_opt: :PassengerForceMaxConcurrentRequestsPerProcess},
+        'passenger_friendly_error_pages' => {type: 'OnOff', pass_opt: :PassengerFriendlyErrorPages},
+        'passenger_group' => {type: 'String', pass_opt: :PassengerGroup},
+        'passenger_high_performance' => {type: 'OnOff', pass_opt: :PassengerHighPerformance},
+        'passenger_instance_registry_dir' => {type: 'FullPath', pass_opt: :PassengerInstanceRegistryDir},
+        'passenger_load_shell_envvars' => {type: 'OnOff', pass_opt: :PassengerLoadShellEnvvars},
+        'passenger_log_file' => {type: 'FullPath', pass_opt: :PassengerLogFile},
+        'passenger_log_level' => {type: 'Integer', pass_opt: :PassengerLogLevel},
+        'passenger_lve_min_uid' => {type: 'Integer', pass_opt: :PassengerLveMinUid},
+        'passenger_max_instances' => {type: 'Integer', pass_opt: :PassengerMaxInstances},
+        'passenger_max_instances_per_app' => {type: 'Integer', pass_opt: :PassengerMaxInstancesPerApp},
+        'passenger_max_pool_size' => {type: 'Integer', pass_opt: :PassengerMaxPoolSize},
+        'passenger_max_preloader_idle_time' => {type: 'Integer', pass_opt: :PassengerMaxPreloaderIdleTime},
+        'passenger_max_request_queue_size' => {type: 'Integer', pass_opt: :PassengerMaxRequestQueueSize},
+        'passenger_max_request_time' => {type: 'Integer', pass_opt: :PassengerMaxRequestTime},
+        'passenger_max_requests' => {type: 'Integer', pass_opt: :PassengerMaxRequests},
+        'passenger_memory_limit' => {type: 'Integer', pass_opt: :PassengerMemoryLimit},
+        'passenger_meteor_app_settings' => {type: 'FullPath', pass_opt: :PassengerMeteorAppSettings},
+        'passenger_min_instances' => {type: 'Integer', pass_opt: :PassengerMinInstances},
+        'passenger_nodejs' => {type: 'FullPath', pass_opt: :PassengerNodejs},
+        'passenger_pool_idle_time' => {type: 'Integer', pass_opt: :PassengerPoolIdleTime},
+        'passenger_pre_start' => {type: 'URI', pass_opt: :PassengerPreStart},
+        'passenger_python' => {type: 'FullPath', pass_opt: :PassengerPython},
+        'passenger_resist_deployment_errors' => {type: 'OnOff', pass_opt: :PassengerResistDeploymentErrors},
+        'passenger_resolve_symlinks_in_document_root' => {type: 'OnOff', pass_opt: :PassengerResolveSymlinksInDocumentRoot},
+        'passenger_response_buffer_high_watermark' => {type: 'Integer', pass_opt: :PassengerResponseBufferHighWatermark},
+        'passenger_restart_dir' => {type: 'Path', pass_opt: :PassengerRestartDir},
+        'passenger_rolling_restarts' => {type: 'OnOff', pass_opt: :PassengerRollingRestarts},
+        'passenger_root' => {type: 'FullPath', pass_opt: :PassengerRoot},
+        'passenger_ruby' => {type: 'FullPath', pass_opt: :PassengerRuby},
+        'passenger_security_update_check_proxy' => {type: 'URI', pass_opt: :PassengerSecurityUpdateCheckProxy},
+        'passenger_show_version_in_header' => {type: 'OnOff', pass_opt: :PassengerShowVersionInHeader},
+        'passenger_socket_backlog' => {type: 'Integer', pass_opt: :PassengerSocketBacklog},
+        'passenger_spawn_method' => {type: ["smart", "direct"], pass_opt: :PassengerSpawnMethod},
+        'passenger_start_timeout' => {type: 'Integer', pass_opt: :PassengerStartTimeout},
+        'passenger_startup_file' => {type: 'RelPath', pass_opt: :PassengerStartupFile},
+        'passenger_stat_throttle_rate' => {type: 'Integer', pass_opt: :PassengerStatThrottleRate},
+        'passenger_sticky_sessions' => {type: 'OnOff', pass_opt: :PassengerStickySessions},
+        'passenger_sticky_sessions_cookie_name' => {type: 'String', pass_opt: :PassengerStickySessionsCookieName},
+        'passenger_thread_count' => {type: 'Integer', pass_opt: :PassengerThreadCount},
+        'passenger_use_global_queue' => {type: 'String', pass_opt: :PassengerUseGlobalQueue},
+        'passenger_user' => {type: 'String', pass_opt: :PassengerUser},
+        'passenger_user_switching' => {type: 'OnOff', pass_opt: :PassengerUserSwitching},
+        'rack_auto_detect' => {type: 'String', pass_opt: :RackAutoDetect},
+        'rack_autodetect' => {type: 'String', pass_opt: :RackAutoDetect},
+        'rack_base_uri' => {type: 'String', pass_opt: :RackBaseURI},
+        'rack_env' => {type: 'String', pass_opt: :RackEnv},
+        'rails_allow_mod_rewrite' => {type: 'String', pass_opt: :RailsAllowModRewrite},
+        'rails_app_spawner_idle_time' => {type: 'String', pass_opt: :RailsAppSpawnerIdleTime},
+        'rails_auto_detect' => {type: 'String', pass_opt: :RailsAutoDetect},
+        'rails_autodetect' => {type: 'String', pass_opt: :RailsAutoDetect},
+        'rails_base_uri' => {type: 'String', pass_opt: :RailsBaseURI},
+        'rails_default_user' => {type: 'String', pass_opt: :RailsDefaultUser},
+        'rails_env' => {type: 'String', pass_opt: :RailsEnv},
+        'rails_framework_spawner_idle_time' => {type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime},
+        'rails_ruby' => {type: 'String', pass_opt: :RailsRuby},
+        'rails_spawn_method' => {type: 'String', pass_opt: :RailsSpawnMethod},
+        'rails_user_switching' => {type: 'String', pass_opt: :RailsUserSwitching},
+        'wsgi_auto_detect' => {type: 'String', pass_opt: :WsgiAutoDetect},
     }
     passenger_config_options.each do |config_option, config_hash|
       puppetized_config_option = config_option
       valid_config_values = []
-      case config_hash[:Type]
+      case config_hash[:type]
+        # UnionStationFilter values are quoted strings
         when 'QuotedString'
           valid_config_values = ['"a quoted string"']
           valid_config_values.each do |valid_value|
@@ -125,7 +119,7 @@
               let :params do
                 { puppetized_config_option.to_sym => valid_value }
               end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} "#{valid_value}"$/) }
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} "#{valid_value}"$/) }
             end
           end
         when 'FullPath', 'RelPath', 'Path'
@@ -135,47 +129,37 @@
               let :params do
                 { puppetized_config_option.to_sym => valid_value }
               end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} "#{valid_value}"$/) }
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} "#{valid_value}"$/) }
             end
           end
-        when 'URI', 'String'
-          valid_config_values = ['some_string_for_you']
+        when 'URI', 'String', 'Integer'
+          valid_config_values = ['some_value_for_you']
           valid_config_values.each do |valid_value|
             describe "with #{puppetized_config_option} => #{valid_value}" do
               let :params do
                 { puppetized_config_option.to_sym => valid_value }
               end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} #{valid_value}$/) }
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} #{valid_value}$/) }
             end
           end
-        when 'Integer'
-          valid_config_values = [100]
-          valid_config_values.each do |valid_value|
-            describe "with #{puppetized_config_option} => #{valid_value}" do
-              let :params do
-                { puppetized_config_option.to_sym => valid_value }
-              end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} #{valid_value}$/) }
-            end
-          end
-        when 'OnOff'
+       when 'OnOff'
           valid_config_values = ['on', 'off']
           valid_config_values.each do |valid_value|
             describe "with #{puppetized_config_option} => '#{valid_value}'" do
               let :params do
                 { puppetized_config_option.to_sym => valid_value }
               end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} #{valid_value}$/) }
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} #{valid_value}$/) }
             end
           end
         else
-          valid_config_values = config_hash[:Type]
+          valid_config_values = config_hash[:type]
           valid_config_values.each do |valid_value|
             describe "with #{puppetized_config_option} => '#{valid_value}'" do
               let :params do
                 { puppetized_config_option.to_sym => valid_value }
               end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:PassOpt]} #{valid_value}$/) }
+              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} #{valid_value}$/) }
             end
           end
       end
@@ -204,7 +188,7 @@
     it { is_expected.to contain_file('passenger.conf').with({
       'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
-     describe "with passenger_root => '/usr/lib/example'" do
+    describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }
       end
@@ -301,12 +285,6 @@
       end
       it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerAppEnv foo$/) }
     end
-    describe "with passenger_instance_registry_dir => '/var/run/passenger-instreg'" do
-      let :params do
-        { :passenger_instance_registry_dir => '/var/run/passenger-instreg' }
-      end
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerInstanceRegistryDir "/var/run/passenger-instreg"$}) }
-    end
     describe "with passenger_log_file => '/var/log/apache2/passenger.log'" do
       let :params do
         { :passenger_log_file => '/var/log/apache2/passenger.log' }
@@ -347,15 +325,15 @@
     context "with Ubuntu 12.04 defaults" do
       let :facts do
         {
-            :osfamily               => 'Debian',
-            :operatingsystemrelease => '12.04',
-            :kernel                 => 'Linux',
-            :operatingsystem        => 'Ubuntu',
-            :lsbdistrelease         => '12.04',
-            :concat_basedir         => '/dne',
-            :id                     => 'root',
-            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            :is_pe                  => false,
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '12.04',
+          :kernel                 => 'Linux',
+          :operatingsystem        => 'Ubuntu',
+          :lsbdistrelease         => '12.04',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
 
@@ -367,15 +345,15 @@
     context "with Ubuntu 14.04 defaults" do
       let :facts do
         {
-            :osfamily               => 'Debian',
-            :operatingsystemrelease => '14.04',
-            :operatingsystem        => 'Ubuntu',
-            :kernel                 => 'Linux',
-            :lsbdistrelease         => '14.04',
-            :concat_basedir         => '/dne',
-            :id                     => 'root',
-            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            :is_pe                  => false,
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '14.04',
+          :operatingsystem        => 'Ubuntu',
+          :kernel                 => 'Linux',
+          :lsbdistrelease         => '14.04',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
 
@@ -387,15 +365,15 @@
     context "with Debian 7 defaults" do
       let :facts do
         {
-            :osfamily               => 'Debian',
-            :operatingsystemrelease => '7.3',
-            :operatingsystem        => 'Debian',
-            :kernel                 => 'Linux',
-            :lsbdistcodename        => 'wheezy',
-            :concat_basedir         => '/dne',
-            :id                     => 'root',
-            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            :is_pe                  => false,
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '7.3',
+          :operatingsystem        => 'Debian',
+          :kernel                 => 'Linux',
+          :lsbdistcodename        => 'wheezy',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
 
@@ -407,15 +385,15 @@
     context "with Debian 8 defaults" do
       let :facts do
         {
-            :osfamily               => 'Debian',
-            :operatingsystemrelease => '8.0',
-            :operatingsystem        => 'Debian',
-            :kernel                 => 'Linux',
-            :lsbdistcodename        => 'jessie',
-            :concat_basedir         => '/dne',
-            :id                     => 'root',
-            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            :is_pe                  => false,
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '8.0',
+          :operatingsystem        => 'Debian',
+          :kernel                 => 'Linux',
+          :lsbdistcodename        => 'jessie',
+          :concat_basedir         => '/dne',
+          :id                     => 'root',
+          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          :is_pe                  => false,
         }
       end
 
@@ -428,13 +406,13 @@
   context "on a RedHat OS" do
     let :rh_facts do
       {
-          :osfamily               => 'RedHat',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+        :osfamily               => 'RedHat',
+        :concat_basedir         => '/dne',
+        :operatingsystem        => 'RedHat',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe                  => false,
       }
     end
 
@@ -445,13 +423,13 @@
       it { is_expected.to contain_apache__mod('passenger') }
       it { is_expected.to contain_package("mod_passenger") }
       it { is_expected.to contain_file('passenger_package.conf').with({
-                                                                          'path' => '/etc/httpd/conf.d/passenger.conf',
-                                                                      }) }
+        'path' => '/etc/httpd/conf.d/passenger.conf',
+      }) }
       it { is_expected.to contain_file('passenger_package.conf').without_content }
       it { is_expected.to contain_file('passenger_package.conf').without_source }
       it { is_expected.to contain_file('zpassenger.load').with({
-                                                                   'path' => '/etc/httpd/conf.d/zpassenger.load',
-                                                               }) }
+        'path' => '/etc/httpd/conf.d/zpassenger.load',
+      }) }
       it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) }
       it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
       describe "with passenger_root => '/usr/lib/example'" do
@@ -472,24 +450,24 @@
       let(:facts) { rh_facts.merge(:operatingsystemrelease => '7') }
 
       it { is_expected.to contain_file('passenger_package.conf').with({
-                                                                          'path' => '/etc/httpd/conf.d/passenger.conf',
-                                                                      }) }
+        'path' => '/etc/httpd/conf.d/passenger.conf',
+      }) }
       it { is_expected.to contain_file('zpassenger.load').with({
-                                                                   'path' => '/etc/httpd/conf.modules.d/zpassenger.load',
-                                                               }) }
+        'path' => '/etc/httpd/conf.modules.d/zpassenger.load',
+      }) }
     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',
-          :is_pe                  => false,
+        :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',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
@@ -499,14 +477,14 @@
   context "on a Gentoo OS" do
     let :facts do
       {
-          :osfamily               => 'Gentoo',
-          :operatingsystem        => 'Gentoo',
-          :operatingsystemrelease => '3.16.1-gentoo',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          :is_pe                  => false,
+        :osfamily               => 'Gentoo',
+        :operatingsystem        => 'Gentoo',
+        :operatingsystemrelease => '3.16.1-gentoo',
+        :concat_basedir         => '/dne',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        :is_pe                  => false,
       }
     end
     it { is_expected.to contain_class("apache::params") }
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 8373307767..7d79207ce0 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -229,27 +229,6 @@
   <%- if @rails_user_switching -%>
   RailsUserSwitching <%= @rails_user_switching %>
   <%- end -%>
-  <%- if @union_station_filter -%>
-  UnionStationFilter "<%= @union_station_filter %>"
-  <%- end -%>
-  <%- if @union_station_gateway_address -%>
-  UnionStationGatewayAddress <%= @union_station_gateway_address %>
-  <%- end -%>
-  <%- if @union_station_gateway_cert -%>
-  UnionStationGatewayCert "<%= @union_station_gateway_cert %>"
-  <%- end -%>
-  <%- if @union_station_gateway_port -%>
-  UnionStationGatewayPort <%= @union_station_gateway_port %>
-  <%- end -%>
-  <%- if @union_station_key -%>
-  UnionStationKey <%= @union_station_key %>
-  <%- end -%>
-  <%- if @union_station_proxy_address -%>
-  UnionStationProxyAddress <%= @union_station_proxy_address %>
-  <%- end -%>
-  <%- if @union_station_support -%>
-  UnionStationSupport <%= @union_station_support %>
-  <%- end -%>
   <%- if @wsgi_auto_detect -%>
   WsgiAutoDetect <%= @wsgi_auto_detect %>
   <%- end -%>
@@ -259,4 +238,5 @@
   <%- if @rack_autodetect -%>
   RackAutoDetect <%= @rack_autodetect %>
   <%- end -%>
+
 </IfModule>

From e7bb53091f02ff142e151ac343f56dbbef204bb2 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Thu, 17 Aug 2017 13:33:56 -0700
Subject: [PATCH 1226/2267] (MODULES-3942) make sure mod_alias is loaded with
 redirectmatch

previously, when redirectmatch_* parameters were included, the RedirectMatch directive would be added to the vhost without mod_alias loaded. Since RedirectMatch is part of mod_alias, mod_alias is required. This change makes sure this happens whenever any of the three parameters are used.
---
 manifests/vhost.pp         |  5 ++++-
 spec/defines/vhost_spec.rb | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 18217deebe..e5e3b6c251 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -410,7 +410,10 @@
   }
 
   # Load mod_alias if needed and not yet loaded
-  if ($scriptalias or $scriptaliases != []) or ($aliases and $aliases != []) or ($redirect_source and $redirect_dest) {
+  if ($scriptalias or $scriptaliases != [])
+    or ($aliases and $aliases != [])
+    or ($redirect_source and $redirect_dest)
+    or ($redirectmatch_regexp or $redirectmatch_status or $redirectmatch_dest){
     if ! defined(Class['apache::mod::alias'])  and ($ensure == 'present') {
       include ::apache::mod::alias
     }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index bb447247b2..737d2275c9 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1397,5 +1397,41 @@
         :content => /^\s+Require all granted$/ )
       }
     end
+    describe "redirectmatch_*" 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',
+          :is_pe                  => false,
+        }
+      end
+      let :dparams do
+        {
+          :docroot => '/rspec/docroot',
+          :port    => '84',
+        }
+      end
+      context "status" do
+        let (:params) { dparams.merge({:redirectmatch_status => "404"}) }
+        it { is_expected.to contain_class("apache::mod::alias")}
+      end
+      context "dest" do
+        let (:params) { dparams.merge({:redirectmatch_dest => "http://other.example.com$1.jpg"}) }
+        it { is_expected.to contain_class("apache::mod::alias")}
+      end
+      context "regexp" do
+        let (:params) { dparams.merge({:redirectmatch_regexp => "(.*)\.gif$"}) }
+        it { is_expected.to contain_class("apache::mod::alias")}
+      end
+      context "none" do
+        let (:params) { dparams }
+        it { is_expected.to_not contain_class("apache::mod::alias") }
+      end
+    end
   end
 end

From 3ef9a56ed99cdacb82d50addd704bea2895a8bad Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Fri, 25 Aug 2017 11:55:02 -0700
Subject: [PATCH 1227/2267] (maint) allow arrays of arrays for $directories

recently, $directories in vhost.pp was puppet4-ized. because we still support Apache 2.2, we need to continue to allow $directories to have nested arrays so that users can pass arrays of allow/deny rules for each directory.
---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9b8dade0dc..382771297c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -61,7 +61,7 @@
   $access_log_env_var                                                               = false,
   Optional[Array] $access_logs                                                      = undef,
   $aliases                                                                          = undef,
-  Optional[Variant[Hash, Array[Hash]]] $directories                                 = undef,
+  Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                  = undef,
   Boolean $error_log                                                                = true,
   $error_log_file                                                                   = undef,
   $error_log_pipe                                                                   = undef,

From 8ebc42a8ec6c5347be4434e9a8df394467f1680b Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado.eng@gmail.com>
Date: Fri, 25 Aug 2017 20:06:14 -0300
Subject: [PATCH 1228/2267] [Modules 5492] - Include treatment for absolute,
 relative and pipe paths for JkLogFile and JkShmFile for class mod::jk (#1671)

* Move logroot treatment away from files treatment in mod::jk

* Treat Log/Shm files with absolute paths in mod::jk

* Add default case for Log/Shm files in mod::jk

* Include in README subsection on ...mod::jk::logroot parameter

* Include in README subsection on ...mod::jk::(shm|log)_file parameters

* Include in README examples on ...mod::jk::(shm|log)_file parameters

* Include context loop with one item in mod::jk spec test

* Include conf file check for new contexts in mod::jk spec test

* Include relative paths context in mod::jk spec test

* Include absolute paths context in mod::jk spec test

* Include pipe paths context in mod::jk spec test

* Remove content check for jk.conf in mod::jk spec test

* Create mod_dir variable in mod::jk class to ease spec test

* Set mod_dir variable in mod::jk spec test

* Try using symbol to test conf file in mod::jk spec test

* Reverts all failed attempts to spec test jk.conf

Revert "Try using symbol to test conf file in mod::jk spec test"

This reverts commit b02c31d0fcfa252a6e66e552db94a8e4bb62f5d7.

Revert "Set mod_dir variable in mod::jk spec test"

This reverts commit 9f7e94199d3086c90137766dad6377d700a66514.

Revert "Create mod_dir variable in mod::jk class to ease spec test"

This reverts commit 39986b8b7f1fe57a85c6a2f93fa4500da5a40714.

Revert "Remove content check for jk.conf in mod::jk spec test"

This reverts commit d85e8a2ef5939f1e85e8219a4f311baf17fff337.

Revert "Include pipe paths context in mod::jk spec test"

This reverts commit 95dd58bc9f7840c35db43d3ba519ccebe3139277.

Revert "Include absolute paths context in mod::jk spec test"

This reverts commit 70e36e2b3a274983304ca0526b59b279d7260657.

Revert "Include relative paths context in mod::jk spec test"

This reverts commit 68c15aeb1cf06904e675b8bcd03a11fca9f04a65.

Revert "Include conf file check for new contexts in mod::jk spec test"

This reverts commit 45d040ce0e4a66ca3bed7699baf4f97947e04e44.

Revert "Include context loop with one item in mod::jk spec test"

This reverts commit f6bb97f4dcc01e652928d0af1f28ef7b6046f3d3.

* Add mod_dir variable in mod::apache class to allow spec tests

* Add mod_dir variable in mod::apache spec test

* Correct mod_dir variable reference in class mod::jk

* Add parameter in shared example of mod::jk spec test

* Include path check for jk.conf in mod::jk spec test

* Correct Debian path for jk.conf in mod::jk spec test

* Compound matchers for same resource in mod::jk spec test

* Include "and" in additional matcher for jk.conf in mod::jk spec test

* Try to correct compound matchers syntax in mod::jk spec test

* Remove compound matchers in mod::jk spec test

* Move simple matcher to single line in mod::jk spec test

* Include jk.conf check via "with_content" in mod::jk spec test

* Correct jk.conf contents in mod::jk spec test

* Correct line endings in jk.conf contents in mod::jk spec test

* Create hash for (shm|log)_file parameters in mod::jk spec test

* Add context iterated for (shm|log)_file in mod::jk spec test

* Include iterated file content check in mod::jk spec test

* Remove redundant jk.conf content check in mod::jk spec test

* Add relative paths for (shm|log)_file in mod::jk spec test

* Remove remaining redundant jk.conf content check in mod::jk spec test

* Add absolute paths for (shm|log)_file in mod::jk spec test

* Add pipe paths for (shm|log)_file in mod::jk spec test

* Correct log_file pipe parameter in mod::jk spec test

* Use "let" to set local variable in mod::jk spec test

* Change symbol to var name in assignment in mod::jk spec test

* Quote var name in assignment in mod::jk spec test

* Correct symbol reference in mod::jk spec test

* Change unecessary var for direct hash iteration in mod::jk spec test
---
 README.md                   | 32 +++++++++++++++++
 manifests/mod/jk.pp         | 33 +++++++++++------
 spec/classes/mod/jk_spec.rb | 72 +++++++++++++++++++++++++++++++++++--
 3 files changed, 123 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 9b5baedb2f..636e45a599 100755
--- a/README.md
+++ b/README.md
@@ -2238,6 +2238,38 @@ $mount_file_content = {
 },
 ```
 
+**shm\_file and log\_file**
+
+Depending on how these files are specified, the class creates their final path differently:
+- Relative path: prepends supplied path with `logroot` (see below)
+- Absolute path or pipe: uses supplied path as-is
+
+Examples (RHEL 6):
+
+```
+shm_file => 'shm_file'
+# Ends up in
+$shm_path = '/var/log/httpd/shm_file'
+```
+```
+shm_file => '/run/shm_file'
+# Ends up in
+$shm_path = '/run/shm_file'
+```
+```
+shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+# Ends up in
+$shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+```
+
+> The default logroot is sane enough. Therefore, it is not recommended to specify absolute paths.
+
+**logroot**
+
+The base directory for `shm_file` and `log_file` is determined by the `logroot` parameter. If unspecified, defaults to `apache::params::logroot`.
+
+> The default logroot is sane enough. Therefore, it is not recommended to override it.
+
 ##### Class: `apache::mod::passenger`
 
 Installs and manages [`mod_passenger`][]. For Red Hat-based systems, ensure that you meet the minimum requirements described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux).
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 1e66ce5781..5fa0f73cc4 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -12,7 +12,7 @@
   $workers_file          = undef,
   $worker_property       = {},
   $logroot               = undef,
-  $shm_file              = 'jk-runtime-status',
+  $shm_file              = undef,
   $shm_size              = undef,
   $mount_file            = undef,
   $mount_file_reload     = undef,
@@ -22,7 +22,7 @@
   $mount_copy            = undef,
   $worker_indicator      = undef,
   $watchdog_interval     = undef,
-  $log_file              = 'mod_jk.log',
+  $log_file              = undef,
   $log_level             = undef,
   $log_stamp_format      = undef,
   $request_log_format    = undef,
@@ -70,22 +70,33 @@
   }
 
   # Shared memory and log paths
-  if $logroot == undef {
-    $shm_path = "${::apache::logroot}/${shm_file}"
-    $log_path = "${::apache::logroot}/${log_file}"
+  # If logroot unspecified, use default
+  $log_dir = $logroot ? {
+    undef   => $::apache::logroot,
+    default => $logroot,
   }
-  else {
-    $shm_path = "${logroot}/${shm_file}"
-    $log_path = "${logroot}/${log_file}"
+  # If absolute path or pipe, use as-is
+  # If relative path, prepend with log directory
+  # If unspecified, use default
+  $shm_path = $shm_file ? {
+    undef       => "${log_dir}/jk-runtime-status",
+    /^\"?[|\/]/ => $shm_file,
+    default     => "${log_dir}/${shm_file}",
+  }
+  $log_path = $log_file ? {
+    undef       => "${log_dir}/mod_jk.log",
+    /^\"?[|\/]/ => $log_file,
+    default     => "${log_dir}/${log_file}",
   }
 
   # Main config file
+  $mod_dir = $::apache::mod_dir
   file {'jk.conf':
-    path    => "${::apache::mod_dir}/jk.conf",
+    path    => "${mod_dir}/jk.conf",
     content => template('apache/mod/jk.conf.erb'),
     require => [
-      Exec["mkdir ${::apache::mod_dir}"],
-      File[$::apache::mod_dir],
+      Exec["mkdir ${mod_dir}"],
+      File[$mod_dir],
     ],
   }
 
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index ba35c438dd..68e5692677 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -3,13 +3,14 @@
 describe 'apache::mod::jk', :type => :class do
   it_behaves_like 'a mod class, without including apache'
 
-  shared_examples 'minimal resources' do
+  shared_examples 'minimal resources' do |mod_dir|
     it { is_expected.to compile }
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to create_class('apache::mod::jk') }
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('jk') }
     it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]') }
+    it { is_expected.to contain_file('jk.conf').with({ :path => "#{mod_dir}/jk.conf" }) }
   end
 
   context "RHEL 6 with only required facts and no parameters" do
@@ -30,7 +31,10 @@
       { :logroot => '/var/log/httpd' }
     end
 
-    it_behaves_like 'minimal resources'
+    mod_dir = '/etc/httpd/conf.d'
+    let (:mod_dir) { mod_dir }
+
+    it_behaves_like 'minimal resources', mod_dir
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
     }
@@ -55,11 +59,73 @@
       { :logroot => '/var/log/apache2' }
     end
 
-    it_behaves_like 'minimal resources'
+    mod_dir = '/etc/apache2/mods-available'
+    let (:mod_dir) { mod_dir }
+
+    it_behaves_like 'minimal resources', mod_dir
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
     }
 
   end
 
+  {
+    :default => {
+      :shm_file => :undef,
+      :log_file => :undef,
+      :shm_path => '/var/log/httpd/jk-runtime-status',
+      :log_path => '/var/log/httpd/mod_jk.log',
+    },
+    :relative => {
+      :shm_file => 'shm_file',
+      :log_file => 'log_file',
+      :shm_path => '/var/log/httpd/shm_file',
+      :log_path => '/var/log/httpd/log_file',
+    },
+    :absolute => {
+      :shm_file => '/run/shm_file',
+      :log_file => '/tmp/log_file',
+      :shm_path => '/run/shm_file',
+      :log_path => '/tmp/log_file',
+    },
+    :pipe => {
+      :shm_file => :undef,
+      :log_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
+      :shm_path => '/var/log/httpd/jk-runtime-status',
+      :log_path => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
+    },
+  }.each do |option, paths|
+    context "RHEL 6 with #{option} shm_file and log_file paths" do
+
+      let (:facts) do
+        {
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemrelease => '6',
+        }
+      end
+
+      let (:pre_condition) do
+        'include apache'
+      end
+
+      let (:params) do {
+        :logroot => '/var/log/httpd',
+        :shm_file => paths[:shm_file],
+        :log_file => paths[:log_file],
+      } end
+
+      it { is_expected.to contain_file('jk.conf').with_content(
+        "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
+        "# Any manual changes will be overwritten\n"\
+        "\n"\
+        "<IfModule jk_module>\n"\
+        "  JkShmFile #{paths[:shm_path]}\n"\
+        "  JkLogFile #{paths[:log_path]}\n"\
+        "</IfModule>\n"
+      ) }
+
+    end
+  end
+
 end

From 0b083c0d9bbe4089b3cec21760826098b79f3472 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Mon, 28 Aug 2017 14:14:39 -0700
Subject: [PATCH 1229/2267] (maint) update userdir template

Some changes were made to the userdir.pp to allow for custom paths in #1650. This updates the template to use the custom string not only for the UserDir directive but also the Directory path.
---
 spec/classes/mod/userdir_spec.rb | 3 +++
 templates/mod/userdir.conf.erb   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 9f23ba274b..ae9863f5a8 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -32,6 +32,7 @@
         }
       end
       it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+/home/\*/hi$})}
+      it { should contain_file("userdir.conf").with_content(%r{^\s*\<Directory\s+\"/home/\*/hi\"\>$})}
     end
     context "with home set to something" do
       let :params do
@@ -40,6 +41,7 @@
         }
       end
       it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+/u/\*/public_html$})}
+      it { should contain_file("userdir.conf").with_content(%r{^\s*\<Directory\s+\"/u/\*/public_html"\>$})}
     end
     context "with path set to something" do
       let :params do
@@ -48,6 +50,7 @@
         }
       end
       it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+public_html /usr/web http://www\.example\.com/$})}
+      it { should contain_file("userdir.conf").with_content(%r{^\s*\<Directory\s+\"public_html /usr/web http://www\.example\.com/\"\>$})}
     end
   end
 end
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index 323a1af1da..edf994c502 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -4,7 +4,7 @@
 <% end -%>
   UserDir <%= @_path %>
 
-  <Directory "<%= @home %>/*/<%= @dir %>">
+  <Directory "<%= @_path %>">
     AllowOverride <%= @overrides.join(' ') %>
     Options <%= @options.join(' ') %>
     <Limit GET POST OPTIONS>

From a441ce32fca224ed60d5c355e17deec9145bcebb Mon Sep 17 00:00:00 2001
From: Sergii Kipot <skipot@sipwise.com>
Date: Wed, 30 Aug 2017 19:37:32 +0200
Subject: [PATCH 1230/2267] remoteip: Notify apache::service instead of
 service['httpd']

Otherwise service is restarted even if service_manage=false

Signed-off-by: Sergii Kipot <kipot.sergey@gmail.com>
---
 manifests/mod/remoteip.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index 92010cf960..21ad57f3e0 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -25,6 +25,6 @@
     content => template('apache/mod/remoteip.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

From c716a0031e3b7a9d0d8cb87fbdfa63ecf05d9394 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Thu, 31 Aug 2017 16:15:42 -0700
Subject: [PATCH 1231/2267] (maint) apache unit test failure

I'm making an educated guess that the error log message for puppet 4.7.1 is formatted in a different way from 4.10.4. the end part of the message, "got 'foo'", may not be present in 4.7.1 or is in a different location. this change still captures the important part of the message while allowing tests to pass.
---
 spec/classes/apache_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 938c08cece..355f9f108d 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -636,7 +636,7 @@
         it "should fail" do
           expect do
             catalogue
-          end.to raise_error(Puppet::PreformattedError, /Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\], got 'foo'/)
+          end.to raise_error(Puppet::PreformattedError, /Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\]/)
         end
       end
       context "On" do

From dc85ed27cd0e9ab40e83f1a2e5cf7f615811b5b5 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado.eng@gmail.com>
Date: Thu, 31 Aug 2017 21:03:01 -0300
Subject: [PATCH 1232/2267] [Modules 5519] Add port parameter in class mod::jk
 (#1679)

* Add ip and port parameters to class apache::mod::jk

* Add parameter to make binding conditional in class apache::mod::jk

* Add binding parameters validation in apache::mod::jk

* Add default binding params in mod::jk spec test

* Add context with alternative binding port in mod::jk spec test

* Add context without binding in mod::jk spec test

* Add in README binding parameters info for class mod::jk

* Add in README use cases for apache::mod::jk binding params

* Change default param treatment in mod::jk to allow spec test

* Correct parameters in mod::jk spec test

* Use variable $facts for ip param default

* Use facts for param defaults in mod::jk spec test

* Correct facts hash reference in class mod::jk

* Change param default treatment to allow spec test in class mod::jk

* Add resource count in all contexts in mod::jk spec test

* Change resource count for specific resource checks in mod::jk spec test

* Add context for supplied IP param in mod::jk spec test

* Align parameter values in class mod::jk

* Change param apache::mod::jk::port type to integer

* Change param apache::mod::jk::port type to integer in spec test
---
 README.md                   | 27 +++++++++-
 manifests/mod/jk.pp         | 94 ++++++++++++++++++++---------------
 spec/classes/mod/jk_spec.rb | 99 +++++++++++++++++++++++++++++++++++--
 3 files changed, 175 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index f1a8e50b9f..711386d66c 100755
--- a/README.md
+++ b/README.md
@@ -2154,6 +2154,7 @@ Installs and manages `mod_jk`, a connector for Apache httpd redirection to old v
 
 ``` puppet
 class { '::apache::mod::jk':
+  ip           = '192.168.2.15',
   workers_file = 'conf/workers.properties',
   mount_file   = 'conf/uriworkermap.properties',
   shm_file     = 'run/jk.shm',
@@ -2166,7 +2167,31 @@ class { '::apache::mod::jk':
 
 **Parameters within `apache::mod::jk`**:
 
-The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for \*file_content:
+The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for:
+
+**add_listen**
+
+Defines if a `Listen` directive according to parameters `ip` and `port` (see below), so that Apache listens to the IP/port combination and redirect to `mod_jk`.
+Useful when another `Listen` directive, like `Listen *:<Port>` or `Listen <Port>`, can conflict with the one necessary for `mod_jk` binding.
+
+Type: Boolean
+Default: true
+
+**ip**
+
+IP for binding to `mod_jk`.
+Useful when the binding address is not the primary network interface IP.
+
+Type: String
+Default: `$facts['ipaddress']`
+
+**port**
+
+Port for binding to `mod_jk`.
+Useful when something else, like a reverse proxy or cache, is receiving requests at port 80, then needs to forward them to Apache at a different port.
+
+Type: String (numerical)
+Default: '80'
 
 **workers\_file\_content**
 
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 5fa0f73cc4..eebfd2c2cf 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -9,52 +9,57 @@
 # https://tomcat.apache.org/connectors-doc/reference/apache.html
 #
 class apache::mod::jk (
-  $workers_file          = undef,
-  $worker_property       = {},
-  $logroot               = undef,
-  $shm_file              = undef,
-  $shm_size              = undef,
-  $mount_file            = undef,
-  $mount_file_reload     = undef,
-  $mount                 = {},
-  $un_mount              = {},
-  $auto_alias            = undef,
-  $mount_copy            = undef,
-  $worker_indicator      = undef,
-  $watchdog_interval     = undef,
-  $log_file              = undef,
-  $log_level             = undef,
-  $log_stamp_format      = undef,
-  $request_log_format    = undef,
-  $extract_ssl           = undef,
-  $https_indicator       = undef,
-  $sslprotocol_indicator = undef,
-  $certs_indicator       = undef,
-  $cipher_indicator      = undef,
-  $certchain_prefix      = undef,
-  $session_indicator     = undef,
-  $keysize_indicator     = undef,
-  $local_name_indicator  = undef,
-  $ignore_cl_indicator   = undef,
-  $local_addr_indicator  = undef,
-  $local_port_indicator  = undef,
-  $remote_host_indicator = undef,
-  $remote_addr_indicator = undef,
-  $remote_port_indicator = undef,
-  $remote_user_indicator = undef,
-  $auth_type_indicator   = undef,
-  $options               = [],
-  $env_var               = {},
-  $strip_session         = undef,
+  # Binding to mod_jk
+  Optional[String] $ip         = undef,
+  Integer          $port       = 80,
+  Boolean          $add_listen = true,
+  # Conf file content
+  $workers_file                = undef,
+  $worker_property             = {},
+  $logroot                     = undef,
+  $shm_file                    = 'jk-runtime-status',
+  $shm_size                    = undef,
+  $mount_file                  = undef,
+  $mount_file_reload           = undef,
+  $mount                       = {},
+  $un_mount                    = {},
+  $auto_alias                  = undef,
+  $mount_copy                  = undef,
+  $worker_indicator            = undef,
+  $watchdog_interval           = undef,
+  $log_file                    = 'mod_jk.log',
+  $log_level                   = undef,
+  $log_stamp_format            = undef,
+  $request_log_format          = undef,
+  $extract_ssl                 = undef,
+  $https_indicator             = undef,
+  $sslprotocol_indicator       = undef,
+  $certs_indicator             = undef,
+  $cipher_indicator            = undef,
+  $certchain_prefix            = undef,
+  $session_indicator           = undef,
+  $keysize_indicator           = undef,
+  $local_name_indicator        = undef,
+  $ignore_cl_indicator         = undef,
+  $local_addr_indicator        = undef,
+  $local_port_indicator        = undef,
+  $remote_host_indicator       = undef,
+  $remote_addr_indicator       = undef,
+  $remote_port_indicator       = undef,
+  $remote_user_indicator       = undef,
+  $auth_type_indicator         = undef,
+  $options                     = [],
+  $env_var                     = {},
+  $strip_session               = undef,
   # Location list
   # See comments in template mod/jk.conf.erb
-  $location_list         = [],
+  $location_list               = [],
   # Workers file content
   # See comments in template mod/jk/workers.properties.erb
-  $workers_file_content  = {},
+  $workers_file_content        = {},
   # Mount file content
   # See comments in template mod/jk/uriworkermap.properties.erb
-  $mount_file_content    = {},
+  $mount_file_content          = {},
 ){
 
   # Provides important variables
@@ -62,6 +67,15 @@
   # Manages basic module config
   ::apache::mod { 'jk': }
 
+  # Binding to mod_jk
+  if $add_listen {
+    $_ip = $ip ? {
+      undef   => $facts['ipaddress'],
+      default => $ip,
+    }
+    ensure_resource('apache::listen', "${_ip}:${port}", {})
+  }
+
   # File resource common parameters
   File {
     ensure  => file,
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 68e5692677..57305c1233 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -13,13 +13,19 @@
     it { is_expected.to contain_file('jk.conf').with({ :path => "#{mod_dir}/jk.conf" }) }
   end
 
-  context "RHEL 6 with only required facts and no parameters" do
+  default_ip = '192.168.1.1'
+  altern8_ip = '10.1.2.3'
+  default_port = 80
+  altern8_port = 8008
+
+  context "RHEL 6 with only required facts and default parameters" do
 
     let (:facts) do
       {
         :osfamily               => 'RedHat',
         :operatingsystem        => 'RedHat',
         :operatingsystemrelease => '6',
+        :ipaddress              => default_ip,
       }
     end
 
@@ -28,26 +34,30 @@
     end
 
     let (:params) do
-      { :logroot => '/var/log/httpd' }
+      {
+        :logroot => '/var/log/httpd',
+      }
     end
 
     mod_dir = '/etc/httpd/conf.d'
     let (:mod_dir) { mod_dir }
 
     it_behaves_like 'minimal resources', mod_dir
+    it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
     }
 
   end
 
-  context "Debian 8 with only required facts and no parameters" do
+  context "Debian 8 with only required facts and default parameters" do
 
     let (:facts) do
       {
         :osfamily               => 'Debian',
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '8',
+        :ipaddress              => default_ip,
       }
     end
 
@@ -56,19 +66,100 @@
     end
 
     let (:params) do
-      { :logroot => '/var/log/apache2' }
+      {
+        :logroot => '/var/log/apache2',
+      }
     end
 
     mod_dir = '/etc/apache2/mods-available'
     let (:mod_dir) { mod_dir }
 
     it_behaves_like 'minimal resources', mod_dir
+    it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
     }
 
   end
 
+  context "RHEL 6 with required facts and alternative IP" do
+
+    let (:facts) do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '6',
+        :ipaddress              => default_ip,
+      }
+    end
+
+    let (:pre_condition) do
+      'include apache'
+    end
+
+    let (:params) do
+      {
+        :ip      => altern8_ip,
+        :logroot => '/var/log/httpd',
+      }
+    end
+
+    it { is_expected.to contain_apache__listen("#{altern8_ip}:#{default_port}") }
+
+  end
+
+  context "RHEL 6 with required facts and alternative port" do
+
+    let (:facts) do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '6',
+        :ipaddress              => default_ip,
+      }
+    end
+
+    let (:pre_condition) do
+      'include apache'
+    end
+
+    let (:params) do
+      {
+        :port    => altern8_port,
+        :logroot => '/var/log/httpd',
+      }
+    end
+
+    it { is_expected.to contain_apache__listen("#{default_ip}:#{altern8_port}") }
+
+  end
+
+  context "RHEL 6 with required facts and no binding" do
+
+    let (:facts) do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
+        :operatingsystemrelease => '6',
+        :ipaddress              => default_ip,
+      }
+    end
+
+    let (:pre_condition) do
+      'include apache'
+    end
+
+    let (:params) do
+      {
+        :add_listen => false,
+        :logroot    => '/var/log/httpd',
+      }
+    end
+
+    it { is_expected.not_to contain_apache__listen("#{default_ip}:#{default_port}") }
+
+  end
+
   {
     :default => {
       :shm_file => :undef,

From 5cbd310ab0a0c80b1342bccc35d59dbc3ddf8218 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Fri, 1 Sep 2017 13:08:59 -0700
Subject: [PATCH 1233/2267] (MODULES-2062) updates prefork.conf params for
 apache 2.4

MaxClients is now MaxRequestWorkers and MaxRequestsPerChild is now MaxConnectionsPerChild. This updates the manifest, template, and adds a couple unit tests. Unit tests for every OS did not seem necessary since all that is being tested is an if block.
---
 manifests/mod/prefork.pp         | 27 ++++++++++++++++++++-------
 spec/classes/mod/prefork_spec.rb |  8 +++++++-
 templates/mod/prefork.conf.erb   | 12 ++++++++++--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index f35551ce6a..989de6e5b0 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -1,11 +1,13 @@
 class apache::mod::prefork (
-  $startservers        = '8',
-  $minspareservers     = '5',
-  $maxspareservers     = '20',
-  $serverlimit         = '256',
-  $maxclients          = '256',
-  $maxrequestsperchild = '4000',
-  $apache_version      = undef,
+  $startservers           = '8',
+  $minspareservers        = '5',
+  $maxspareservers        = '20',
+  $serverlimit            = '256',
+  $maxclients             = '256',
+  $maxrequestworkers      = undef,
+  $maxrequestsperchild    = '4000',
+  $maxconnectionsperchild = undef,
+  $apache_version         = undef,
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
@@ -23,6 +25,15 @@
   if defined(Class['apache::mod::worker']) {
     fail('May not include both apache::mod::prefork and apache::mod::worker on the same node')
   }
+
+  if versioncmp($_apache_version, '2.3.13') < 0 {
+    if $maxrequestworkers == undef {
+      warning("For newer versions of Apache, \$maxclients is deprecated, please use \$maxrequestworkers.")
+    } elsif $maxconnectionsperchild == undef {
+      warning("For newer versions of Apache, \$maxrequestsperchild is deprecated, please use \$maxconnectionsperchild.")
+    }
+  }
+
   File {
     owner => 'root',
     group => $::apache::params::root_group,
@@ -35,7 +46,9 @@
   # - $maxspareservers
   # - $serverlimit
   # - $maxclients
+  # - $maxrequestworkers
   # - $maxrequestsperchild
+  # - $maxconnectionsperchild
   file { "${::apache::mod_dir}/prefork.conf":
     ensure  => file,
     content => template('apache/mod/prefork.conf.erb'),
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 3e2954fc71..cbbca2ed4f 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -79,12 +79,16 @@
         'require' => 'Package[httpd]',
         })
       }
+      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxRequestWorkers/ }) }
+      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxConnectionsPerChild/ }) }
     end
 
     context "with Apache version >= 2.4" do
       let :params do
         {
-          :apache_version => '2.4',
+          :apache_version         => '2.4',
+          :maxrequestworkers      => '512',
+          :maxconnectionsperchild => '4000'
         }
       end
 
@@ -95,6 +99,8 @@
         'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n",
         })
       }
+      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxClients/ }) }
+      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxRequestsPerChild/ }) }
     end
   end
   context "on a FreeBSD OS" do
diff --git a/templates/mod/prefork.conf.erb b/templates/mod/prefork.conf.erb
index aabfdf7b22..ab4a871c6e 100644
--- a/templates/mod/prefork.conf.erb
+++ b/templates/mod/prefork.conf.erb
@@ -3,6 +3,14 @@
   MinSpareServers     <%= @minspareservers %>
   MaxSpareServers     <%= @maxspareservers %>
   ServerLimit         <%= @serverlimit %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
+  <%- if @maxrequestworkers -%>
+  MaxRequestWorkers      <%= @maxrequestworkers %>
+  <%- elsif @maxclients -%>
+  MaxClients             <%= @maxclients %>
+  <%- end -%>
+  <%- if @maxconnectionsperchild -%>
+  MaxConnectionsPerChild <%= @maxconnectionsperchild %>
+  <%- elsif @maxrequestsperchild -%>
+  MaxRequestsPerChild    <%= @maxrequestsperchild %>
+  <%- end -%>
 </IfModule>

From 9a8c62e45adc62ca60dd8a8132bb2c5d702a2880 Mon Sep 17 00:00:00 2001
From: tenajsystems <31551697+tenajsystems@users.noreply.github.com>
Date: Fri, 1 Sep 2017 16:54:48 -0400
Subject: [PATCH 1234/2267] updated log formats to include client ip

This change will ensure that apache logs the correct client ip instead of the loadbalancer ip when the apache server is behind a load balancer
---
 templates/httpd.conf.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index ddb40b57e2..e0a36eb7f8 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -85,10 +85,10 @@ Include "<%= @mod_load_dir %>/*.conf"
 Include "<%= @ports_file %>"
 
 <% unless @log_formats.has_key?('combined') -%>
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 <% end -%>
 <% unless @log_formats.has_key?('common') -%>
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%a %l %u %t \"%r\" %>s %b" common
 <% end -%>
 <% unless @log_formats.has_key?('referer') -%>
 LogFormat "%{Referer}i -> %U" referer

From 8115523ae70fefb967d955ab6e55fc2ce5dc5f07 Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Thu, 15 Jun 2017 17:00:02 -0400
Subject: [PATCH 1235/2267] Add PassengerSpawnMethod to vhost

---
 manifests/vhost.pp             | 6 ++++--
 templates/vhost/_passenger.erb | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 382771297c..8d2edde44a 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -134,6 +134,7 @@
   $apache_version                                                                   = $::apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
   Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                           = undef,
+  $passenger_spawn_method                                                           = undef,
   $passenger_app_root                                                               = undef,
   $passenger_app_env                                                                = undef,
   $passenger_ruby                                                                   = undef,
@@ -232,7 +233,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_max_requests or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file {
+  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_max_requests or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file {
     include ::apache::mod::passenger
   }
 
@@ -968,6 +969,7 @@
   }
 
   # Template uses:
+  # - $passenger_spawn_method
   # - $passenger_app_root
   # - $passenger_app_env
   # - $passenger_ruby
@@ -979,7 +981,7 @@
   # - $passenger_nodejs
   # - $passenger_sticky_sessions
   # - $passenger_startup_file
-  if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{
+  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index f0401a9492..46e53764d7 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -1,3 +1,6 @@
+<% if @passenger_spawn_method -%>
+  PassengerSpawnMethod <%= @passenger_spawn_method %>
+<% end -%>
 <% if @passenger_app_root -%>
   PassengerAppRoot <%= @passenger_app_root %>
 <% end -%>

From d44f1dee24433aef78eb48a8e96933c460b9b819 Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Thu, 15 Jun 2017 17:26:38 -0400
Subject: [PATCH 1236/2267] Add Doc for passenger_spawn_method

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 711386d66c..52947d7c67 100755
--- a/README.md
+++ b/README.md
@@ -3780,6 +3780,10 @@ Sets the overrides for the specified virtual host. Accepts an array of [AllowOve
 
 Default: '[none]'.
 
+##### `passenger_spawn_method`
+
+Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod), whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
+
 ##### `passenger_app_root`
 
 Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot), the location of the Passenger application root if different from the DocumentRoot.

From eb23c7086b457690d7d0ba523077224f515e4438 Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Tue, 5 Sep 2017 08:33:38 -0500
Subject: [PATCH 1237/2267] Add passenger_spawn_method to spec tests

---
 spec/defines/vhost_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 737d2275c9..85dc72e37b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -392,6 +392,7 @@
           'use_optional_includes'       => true,
           'suexec_user_group'           => 'root root',
           'allow_encoded_slashes'       => 'nodecode',
+          'passenger_spawn_method'      => 'direct',
           'passenger_app_root'          => '/usr/share/myapp',
           'passenger_app_env'           => 'test',
           'passenger_ruby'              => '/usr/bin/ruby1.9.1',

From 7bb35c2293c12ce52329a4391fe1f20389efef06 Mon Sep 17 00:00:00 2001
From: epackorigan <epackorigan@users.noreply.github.com>
Date: Fri, 25 Aug 2017 10:45:36 -0700
Subject: [PATCH 1238/2267] (MODULES-5471) ssl/tls client auth fix

If $ssl_certs_dir defaults to a location that contains certificates, apache will trust implicitly all the certificates presented by the client for auth that were issues by *any* certificates in that location.

Note:
 * In Gentoo, $ssl_certs_dir was pointing to /etc/apache2/ssl, which may have been safe, or used for storing CA certs to check client auth. Gentoo users may need to set that value explicitly after upgrade.

fix extra space

Only include directives when needed.

Do not include directives that have no effect.
SSLCA* directives are only meaningful when 'ssl_verify_client' is set (when you want to handle client cert authentication, and how to verify those certs being presented to the server by the client).

missed one of the directives for client auth

missed one directive that doesn't need to be included unless you are doing ssl client authentication.

Update README.md

test for ssl_certs_dir and ssl_ca

There should probably be tests for each variation (`ssl_verify_client` + any of the client authentication directives.

Updated to simpler/clearer tests

hopefully this will make more sense.

Run tests on different files.

not quite sure how that works.

rename vhost for each additional test

rename the apache::vhost for each test.

(maint) remove extra space on line 146

adding idempotent verifications to each test.

making sure that the resources are idempotent.

changes reflected in the changelog

mention in the changelog
 * the fix for auth
 * the defaults being changed
 * the directives no longer being included unless needed.

reverting changes to changelog.
---
 README.md                          | 20 ++++-----
 manifests/params.pp                |  8 ++--
 spec/acceptance/apache_ssl_spec.rb | 70 ++++++++++++++++++++++++++++--
 templates/vhost/_ssl.erb           | 28 ++++++------
 4 files changed, 91 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 9b5baedb2f..1aa7d05b67 100755
--- a/README.md
+++ b/README.md
@@ -1369,7 +1369,7 @@ Default: `undef`.
 
 ##### `ssl_ca`
 
-Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile).
+Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile) to use to verify certificate used in ssl client authentication.
 
 It is possible to override this on a vhost level.
 
@@ -4913,7 +4913,7 @@ Default: `false`.
 
 ##### `ssl_ca`
 
-Specifies the SSL certificate authority.
+Specifies the SSL certificate authority to be used to verify client certificates used for authentication. You must also set `ssl_verify_client` to use this.
 
 Default: `undef`.
 
@@ -4950,14 +4950,9 @@ Default: `true`.
 
 ##### `ssl_certs_dir`
 
-Specifies the location of the SSL certification directory.
+Specifies the location of the SSL certification directory to verify client certs. Will not be used unless `ssl_verify_client` is also set (see below).
 
-Default: Depends on operating system.
-
-- Debian: '/etc/ssl/certs'
-- Red Hat: '/etc/pki/tls/certs'
-- FreeBSD: `undef`
-- Gentoo: '/etc/ssl/apache2'
+Default: undef
 
 ##### `ssl_chain`
 
@@ -4973,13 +4968,13 @@ Default: `undef`.
 
 ##### `ssl_crl_path`
 
-Specifies the location of the certificate revocation list. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
+Specifies the location of the certificate revocation list to verify certificates for client authentication with. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
 
 Default: `undef`.
 
 ##### `ssl_crl_check`
 
-Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck). The default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive] for ssl client authentication (https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck). The default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
 
 Default: `undef`.
 
@@ -5012,11 +5007,12 @@ Default: `undef`.
 
 ##### `ssl_verify_depth`
 
-Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification.
+Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. You must set `ssl_verify_client` for it to take effect.
 
 ``` puppet
 apache::vhost { 'sample.example.net':
   …
+  ssl_verify_client => 'require',
   ssl_verify_depth => 1,
 }
 ```
diff --git a/manifests/params.pp b/manifests/params.pp
index a74bbaf48e..666fd224f3 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -49,6 +49,9 @@
 
   $modsec_audit_log_parts = 'ABIJDEFHZ'
 
+  # no client certs should be trusted for auth by default.
+  $ssl_certs_dir          = undef
+
   if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::operatingsystem == 'SLES') {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } elsif $::operatingsystem == 'FreeBSD' {
@@ -83,7 +86,6 @@
     $dev_packages         = 'httpd-devel'
     $default_ssl_cert     = '/etc/pki/tls/certs/localhost.crt'
     $default_ssl_key      = '/etc/pki/tls/private/localhost.key'
-    $ssl_certs_dir        = '/etc/pki/tls/certs'
     $ssl_sessioncache     = '/var/cache/mod_ssl/scache(512000)'
     $passenger_conf_file  = 'passenger_extra.conf'
     $passenger_conf_package_file = 'passenger.conf'
@@ -223,7 +225,6 @@
     $mpm_module          = 'worker'
     $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
-    $ssl_certs_dir       = '/etc/ssl/certs'
     $ssl_sessioncache    = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
@@ -389,7 +390,6 @@
     $dev_packages     = undef
     $default_ssl_cert = '/usr/local/etc/apache24/server.crt'
     $default_ssl_key  = '/usr/local/etc/apache24/server.key'
-    $ssl_certs_dir    = undef
     $ssl_sessioncache  = '/var/run/ssl_scache(512000)'
     $passenger_conf_file = 'passenger.conf'
     $passenger_conf_package_file = undef
@@ -459,7 +459,6 @@
     $dev_packages     = undef
     $default_ssl_cert = '/etc/ssl/apache2/server.crt'
     $default_ssl_key  = '/etc/ssl/apache2/server.key'
-    $ssl_certs_dir    = '/etc/ssl/apache2'
     $ssl_sessioncache  = '/var/run/ssl_scache(512000)'
     $passenger_root   = '/usr'
     $passenger_ruby   = '/usr/bin/ruby'
@@ -528,7 +527,6 @@
     $mpm_module          = 'prefork'
     $default_ssl_cert    = '/etc/apache2/ssl.crt/server.crt'
     $default_ssl_key     = '/etc/apache2/ssl.key/server.key'
-    $ssl_certs_dir       = '/etc/ssl/certs'
     $ssl_sessioncache    = '/var/lib/apache2/ssl_scache(512000)'
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 5df551a414..0eab1de107 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -19,6 +19,7 @@ class { 'apache':
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{$vhost_dir}/15-default-ssl.conf") do
@@ -26,11 +27,11 @@ class { 'apache':
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
       it { is_expected.to contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
-      it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
-      it { is_expected.to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
-      it { is_expected.to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
+      it { is_expected.not_to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { is_expected.not_to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
+      it { is_expected.not_to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
       if $apache_version == '2.4'
-        it { is_expected.to contain 'SSLCARevocationCheck    "chain"' }
+        it { is_expected.not_to contain 'SSLCARevocationCheck    "chain"' }
       else
         it { is_expected.not_to contain 'SSLCARevocationCheck' }
       end
@@ -66,6 +67,7 @@ class { 'apache':
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{$vhost_dir}/25-test_ssl.conf") do
@@ -74,6 +76,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
       it { is_expected.to contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
       it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { is_expected.to contain 'SSLCACertificatePath    "/tmp"' }
       it { is_expected.to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
       it { is_expected.to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
       it { is_expected.to contain 'SSLProxyEngine On' }
@@ -91,4 +94,63 @@ class { 'apache':
     end
   end
 
+  describe 'vhost ssl ssl_ca only' do
+    it 'runs without error' do
+      pp = <<-EOS
+        class { 'apache':
+          service_ensure       => stopped,
+        }
+
+        apache::vhost { 'test_ssl_ca_only':
+          docroot              => '/tmp/test',
+          ssl                  => true,
+          ssl_cert             => '/tmp/ssl_cert',
+          ssl_key              => '/tmp/ssl_key',
+          ssl_ca               => '/tmp/ssl_ca',
+          ssl_verify_client    => 'test',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+
+    describe file("#{$vhost_dir}/25-test_ssl_ca_only.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
+      it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
+      it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { is_expected.not_to contain 'SSLCACertificatePath' }
+    end
+  end
+
+  describe 'vhost ssl ssl_certs_dir' do
+    it 'runs without error' do
+      pp = <<-EOS
+        class { 'apache':
+          service_ensure       => stopped,
+        }
+
+        apache::vhost { 'test_ssl_certs_dir_only':
+          docroot              => '/tmp/test',
+          ssl                  => true,
+          ssl_cert             => '/tmp/ssl_cert',
+          ssl_key              => '/tmp/ssl_key',
+          ssl_certs_dir        => '/tmp',
+          ssl_verify_client    => 'test',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+
+    describe file("#{$vhost_dir}/25-test_ssl_certs_dir_only.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
+      it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
+      it { is_expected.to contain 'SSLCACertificatePath    "/tmp"' }
+      it { is_expected.to contain 'SSLVerifyClient         test' }
+      it { is_expected.not_to contain 'SSLCACertificateFile' }
+    end
+  end
+
 end
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index e70efebda5..826a99bd58 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -7,6 +7,17 @@
   <%- if @ssl_chain -%>
   SSLCertificateChainFile "<%= @ssl_chain %>"
   <%- end -%>
+  <%- if @ssl_protocol -%>
+  SSLProtocol             <%= [@ssl_protocol].flatten.compact.join(' ') %>
+  <%- end -%>
+  <%- if @ssl_cipher -%>
+  SSLCipherSuite          <%= @ssl_cipher %>
+  <%- end -%>
+  <%- if @ssl_honorcipherorder -%>
+  SSLHonorCipherOrder     <%= @ssl_honorcipherorder %>
+  <%- end -%>
+  <%- if @ssl_verify_client -%>
+  SSLVerifyClient         <%= @ssl_verify_client %>
   <%- if @ssl_certs_dir && @ssl_certs_dir != '' -%>
   SSLCACertificatePath    "<%= @ssl_certs_dir %>"
   <%- end -%>
@@ -19,23 +30,12 @@
   <%- if @ssl_crl -%>
   SSLCARevocationFile     "<%= @ssl_crl %>"
   <%- end -%>
+  <%- if @ssl_verify_depth -%>
+  SSLVerifyDepth          <%= @ssl_verify_depth %>
+  <%- end -%>
   <%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   SSLCARevocationCheck    "<%= @ssl_crl_check %>"
   <%- end -%>
-  <%- if @ssl_protocol -%>
-  SSLProtocol             <%= [@ssl_protocol].flatten.compact.join(' ') %>
-  <%- end -%>
-  <%- if @ssl_cipher -%>
-  SSLCipherSuite          <%= @ssl_cipher %>
-  <%- end -%>
-  <%- if @ssl_honorcipherorder -%>
-  SSLHonorCipherOrder     <%= @ssl_honorcipherorder %>
-  <%- end -%>
-  <%- if @ssl_verify_client -%>
-  SSLVerifyClient         <%= @ssl_verify_client %>
-  <%- end -%>
-  <%- if @ssl_verify_depth -%>
-  SSLVerifyDepth          <%= @ssl_verify_depth %>
   <%- end -%>
   <%- if @ssl_options -%>
   SSLOptions <%= Array(@ssl_options).join(' ') %>

From 8aceb3a190533e220df795f23198097174596b65 Mon Sep 17 00:00:00 2001
From: jbondpdx <jean@puppet.com>
Date: Wed, 6 Sep 2017 15:23:15 -0700
Subject: [PATCH 1239/2267] remove TODOs from README

---
 README.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 90f4a7094d..ad5c0f97b6 100755
--- a/README.md
+++ b/README.md
@@ -1407,7 +1407,7 @@ Defines the pattern for files included from the `vhost_dir`.
 
 If set to a value like `[^.#]\*.conf[^~]` to make sure that files accidentally created in this directory (such as files created by version control systems or editor backups) are *not* included in your server configuration.
 
-Default: '*', also for BC with previous versions of this module. TODO: what does "also for BC" mean?
+Default: '*'.
  
 Some operating systems use a value of `*.conf`. By default, this module creates configuration files ending in `.conf`.
 
@@ -2252,7 +2252,7 @@ Installs and configures `mod_passenger`.
 
 >**Note**: The passenger module isn't available on RH/CentOS without providing the dependency packages provided by EPEL and the `mod_passengers` custom repository. See the `manage_repo` parameter above and [https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()
 
-**Parameters**: [TODO: parameters were not listed (except `manage_repo`), so I pulled them out of the manifest. I need to know what these parameters do and what their values can be OR a link that points external documentation for the parameter mapping (as with mod_pagespeed above) <!--see also MODULES-4745-->]
+**Parameters**:
 
 * `passenger_conf_file`: `$::apache::params::passenger_conf_file`
 * `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file`
@@ -2289,8 +2289,6 @@ Installs `mod_proxy` and uses the `proxy.conf.erb` template to generate its conf
 
 **Parameters within `apache::mod::proxy`**:
 
-TODO: What do these parameters do?
-
 - `allow_from`: Default: `undef`.
 - `apache_version`: Default: `undef`.
 - `package_name`: Default: `undef`.
@@ -2740,7 +2738,7 @@ Default: '25'.
 
 ##### `source`
 
-Points to the configuration file's source. The [`content`][] and `source` parameters are exclusive of each other. TODO: is this required or does it have a default value?
+Points to the configuration file's source. The [`content`][] and `source` parameters are exclusive of each other.
 
 Default: `undef`
 

From 47cfc913f5edbd949294aa2934160fe9b5daaf9a Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Mon, 24 Jul 2017 13:06:29 -0700
Subject: [PATCH 1240/2267] (MODULES-5514) release 2.1.0 prep

---
 CHANGELOG.md  | 37 +++++++++++++++++++++++++++++++++++++
 metadata.json |  3 +--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c8fa2b838..7efa9b8753 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
+## Supported Release [2.1.0]
+### Summary
+This is a feature release including a security patch (CVE-2017-2299)
+
+#### Added
+- `apache::mod::jk` class for managing the mod_jk connector
+- `apache_pw_hash` function
+- the ProxyPass directive in location contexts
+- more Puppet 4 type validation
+- `apache::mod::macro` class for managing mod_macro
+
+#### Changed
+- $ssl_certs_dir default to `undef` for all platorms
+- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check`
+
+#### Fixed
+- issue where mod_alias was not being loaded when RedirectMatch* directives were being used ([MODULES-3942](https://tickets.puppet.com/browse/MODULES-3942))
+- issue with `$directories` parameter in `apache::vhost`
+- issue in UserDir template where the UserDir path did not match the Directory path
+- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory**
+
+#### Removed
+- support for EOL platforms: Ubuntu 10.04, 12.04 and Debian 6 (Squeeze)
+
 ## Supported Release [2.0.0]
 ### Summary
 Major release **removing Puppet 3 support** and other backwards-incompatible changes.
@@ -47,6 +71,17 @@ Major release **removing Puppet 3 support** and other backwards-incompatible cha
 - issue where ProxyPreserveHost could not be set without other Proxy* directives
 - the module attempting to install proxy_html on Ubuntu Xenial and Debian Stretch
 
+## Supported Release [1.11.1]
+#### Summary
+This is a security patch release (CVE-2017-2299). These changes are also in version 2.1.0 and higher.
+
+#### Changed
+- $ssl_certs_dir default to `undef` for all platorms
+- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check`
+
+#### Fixed
+- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory** ([MODULES-5471](https://tickets.puppet.com/browse/MODULES-5471))
+
 ## Supported Release [1.11.0]
 ### Summary
 This release adds SLES12 Support and many more features and bugfixes.
@@ -864,7 +899,9 @@ worker/prefork
 * f672e46 a2mod fix
 * 8a56ee9 add pthon support to apache
 
+[2.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...2.1.0
 [2.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0
+[1.11.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...1.11.1
 [1.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...1.11.0
 [1.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...1.10.0
 [1.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...1.9.0
diff --git a/metadata.json b/metadata.json
index 88a87b6ea1..a4410508ba 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -47,7 +47,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]

From 7376d7e6765e72c7c650b0d91fb0abe1d0d7afb4 Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Tue, 5 Sep 2017 10:08:26 -0500
Subject: [PATCH 1241/2267] Add EnableCapabilities for itk

---
 manifests/mod/itk.pp       | 1 +
 templates/mod/itk.conf.erb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 8ceb56d2ba..38dad00713 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -5,6 +5,7 @@
   $serverlimit         = '256',
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
+  $enablecapabilities  = undef,
   $apache_version      = undef,
 ) {
   include ::apache
diff --git a/templates/mod/itk.conf.erb b/templates/mod/itk.conf.erb
index f45f2b35dd..fe6ef19be4 100644
--- a/templates/mod/itk.conf.erb
+++ b/templates/mod/itk.conf.erb
@@ -5,4 +5,7 @@
   ServerLimit         <%= @serverlimit %>
   MaxClients          <%= @maxclients %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
+  <%- if (not @enablecapabilities.nil?) && (scope.function_versioncmp([@_apache_version, '2.4']) >= 0) -%>
+  EnableCapabilities  <%= scope.function_bool2httpd([@enablecapabilities]) %>
+  <%- end -%>
 </IfModule>

From 48039ac75c745851db5110983d8805bd423b92e7 Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Tue, 5 Sep 2017 11:03:05 -0500
Subject: [PATCH 1242/2267] spec tests for itk EnableCapabilities

---
 spec/classes/mod/itk_spec.rb | 62 ++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 27369f1443..2b55f35566 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -34,6 +34,15 @@
       it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/itk.load") }
 
       it { is_expected.to contain_package("apache2-mpm-itk") }
+
+      context "with enablecapabilities set" do
+        let :params do
+          super().merge({:enablecapabilities => true})
+        end
+
+        it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.conf').with_content(
+                /EnableCapabilities/) }
+      end
     end
 
     context "with Apache version >= 2.4" do
@@ -53,6 +62,11 @@
         })
       }
       it { is_expected.to contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') }
+
+      context "with enablecapabilities not set" do
+        it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.conf').with_content(
+                /EnableCapabilities/) }
+      end
     end
   end
   context "on a RedHat OS" do
@@ -84,6 +98,15 @@
         'require' => 'Package[httpd]',
         })
       }
+
+      context "with enablecapabilities set" do
+        let :params do
+          super().merge({:enablecapabilities => 'On'})
+        end
+
+        it { is_expected.not_to contain_file('/etc/httpd/conf.d/itk.conf').with_content(
+                /EnableCapabilities/) }
+      end
     end
 
     context "with Apache version >= 2.4" do
@@ -102,6 +125,15 @@
         'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n"
         })
       }
+
+      context "with enablecapabilities set" do
+        let :params do
+          super().merge({:enablecapabilities => false})
+        end
+
+        it { is_expected.to contain_file('/etc/httpd/conf.d/itk.conf').with_content(
+                /EnableCapabilities  Off/) }
+      end
     end
   end
   context "on a FreeBSD OS" do
@@ -126,5 +158,35 @@
     it { is_expected.not_to contain_apache__mod('itk') }
     it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/itk.conf").with_ensure('file') }
     it { is_expected.to contain_package("www/mod_mpm_itk") }
+
+    context "with Apache version < 2.4" do
+      let :params do
+        {
+          :apache_version => '2.2',
+        }
+      end
+
+      context "with enablecapabilities not set" do
+        it { is_expected.not_to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_content(
+                /EnableCapabilities/) }
+      end
+    end
+
+    context "with Apache version >= 2.4" do
+      let :params do
+        {
+          :apache_version => '2.4',
+        }
+      end
+
+      context "with enablecapabilities set" do
+        let :params do
+          super().merge({:enablecapabilities => true})
+        end
+
+        it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_content(
+                /EnableCapabilities  On/) }
+      end
+    end
   end
 end

From ee705af4cf911b0515714f1ea09b95b51944d921 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Wed, 13 Sep 2017 22:54:44 +1000
Subject: [PATCH 1243/2267] Updating translations for
 locales/ja/puppetlabs-apache.po

---
 locales/ja/puppetlabs-apache.po | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 locales/ja/puppetlabs-apache.po

diff --git a/locales/ja/puppetlabs-apache.po b/locales/ja/puppetlabs-apache.po
new file mode 100644
index 0000000000..1d61c897c9
--- /dev/null
+++ b/locales/ja/puppetlabs-apache.po
@@ -0,0 +1,28 @@
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-21 14:19+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: 梅田智世 <c-umeda@nifty.com>, 2017\n"
+"Language-Team: Japanese (Japan) (https://www.transifex.com/puppet/teams/29089/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Translate Toolkit 2.0.0\n"
+
+#. metadata.json
+#: .summary
+msgid ""
+"Installs, configures, and manages Apache virtual hosts, web services, and "
+"modules."
+msgstr "Apacheバーチャルホスト、Webサービス、モジュールのインストール、設定、管理。"
+
+#. metadata.json
+#: .description
+msgid "Module for Apache configuration"
+msgstr "Apache設定用のモジュール。"

From f0deadbb88cc180cbb24bccd12b88764fc059ddc Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Wed, 13 Sep 2017 23:00:54 +1000
Subject: [PATCH 1244/2267] Updating translations for readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 5389 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 5389 insertions(+)
 create mode 100644 readmes/README_ja_JP.md

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
new file mode 100644
index 0000000000..fdb38df172
--- /dev/null
+++ b/readmes/README_ja_JP.md
@@ -0,0 +1,5389 @@
+# apache
+
+[モジュールの概要]: #module-description
+
+[セットアップ]: #setup
+[Apacheの使用を始める]: #beginning-with-apache
+
+[使用方法]: #usage
+[バーチャルホストの設定]: #configuring-virtual-hosts
+[SSLを使ったバーチャルホストの設定]: #configuring-virtual-hosts-with-ssl
+[バーチャルホストのポートおよびアドレスのバインディング設定]: #configuring-virtual-host-port-and-address-bindings
+[アプリおよびプロセッサのバーチャルホストの設定]: #configuring-virtual-hosts-for-apps-and-processors
+[IPベースのバーチャルホストの設定]: #configuring-ip-based-virtual-hosts
+[Apacheモジュールのインストール]: #installing-apache-modules
+[任意モジュールのインストール]: #installing-arbitrary-modules
+[固有モジュールのインストール]: #installing-specific-modules
+[FastCGIサーバの設定]: #configuring-fastcgi-servers-to-handle-php-files
+[ロードバランシングの例]: #load-balancing-examples
+[apacheの影響]: #what-the-apache-module-affects
+
+[リファレンス]: #reference
+[パブリッククラス]: #public-classes
+[プライベートクラス]: #private-classes
+[パブリック定義タイプ]: #public-defined-types
+[プライベート定義タイプ]: #private-defined-types
+[テンプレート]: #templates
+
+[制約事項]: #limitations
+
+[開発]: #development
+[貢献]: #contributing
+[テスト]: #testing
+
+[`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
+[`add_listen`]: #add_listen
+[`Alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#alias
+[`AliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#aliasmatch
+[エイリアスサーバ]: https://httpd.apache.org/docs/current/urlmapping.html
+[`AllowEncodedSlashes`]: https://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes
+[`apache`]: #class-apache
+[`apache_version`]: #apache_version
+[`apache::balancer`]: #defined-type-apachebalancer
+[`apache::balancermember`]: #defined-type-apachebalancermember
+[`apache::fastcgi::server`]: #defined-type-apachefastcgiserver
+[`apache::mod`]: #defined-type-apachemod
+[`apache::mod::<MODULE NAME>`]: #classes-apachemodmodule-name
+[`apache::mod::alias`]: #class-apachemodalias
+[`apache::mod::auth_cas`]: #class-apachemodauth_cas
+[`apache::mod::auth_mellon`]: #class-apachemodauth_mellon
+[`apache::mod::authn_dbd`]: #class-apachemodauthn_dbd
+[`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap
+[`apache::mod::cluster`]: #class-apachemodcluster
+[`apache::mod::disk_cache`]: #class-apachemoddisk_cache
+[`apache::mod::dumpio`]: #class-apachemoddumpio
+[`apache::mod::event`]: #class-apachemodevent
+[`apache::mod::ext_filter`]: #class-apachemodext_filter
+[`apache::mod::geoip`]: #class-apachemodgeoip
+[`apache::mod::itk`]: #class-apachemoditk
+[`apache::mod::jk`]: #class-apachemodjk
+[`apache::mod::ldap`]: #class-apachemodldap
+[`apache::mod::passenger`]: #class-apachemodpassenger
+[`apache::mod::peruser`]: #class-apachemodperuser
+[`apache::mod::prefork`]: #class-apachemodprefork
+[`apache::mod::proxy`]: #class-apachemodproxy
+[`apache::mod::proxy_balancer`]: #class-apachemodproxybalancer
+[`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi
+[`apache::mod::proxy_html`]: #class-apachemodproxy_html
+[`apache::mod::security`]: #class-apachemodsecurity
+[`apache::mod::shib`]: #class-apachemodshib
+[`apache::mod::ssl`]: #class-apachemodssl
+[`apache::mod::status`]: #class-apachemodstatus
+[`apache::mod::userdir`]: #class-apachemoduserdir
+[`apache::mod::worker`]: #class-apachemodworker
+[`apache::mod::wsgi`]: #class-apachemodwsgi
+[`apache::params`]: #class-apacheparams
+[`apache::version`]: #class-apacheversion
+[`apache::vhost`]: #defined-type-apachevhost
+[`apache::vhost::custom`]: #defined-type-apachevhostcustom
+[`apache::vhost::WSGIImportScript`]: #wsgiimportscript
+[Apache HTTPサーバ]: https://httpd.apache.org
+[Apacheモジュール]: https://httpd.apache.org/docs/current/mod/
+[配列]: https://docs.puppet.com/puppet/latest/reference/lang_data_array.html
+
+[オーディットログ]: https://github.com/SpiderLabs/ModSecurity/wiki/ModSecurity-2-Data-Formats#audit-log
+
+[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
+
+[証明書失効リスト]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationfile
+[証明書失効リストパス]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationpath
+[コモンゲートウェイインターフェース]: https://httpd.apache.org/docs/current/howto/cgi.html
+[`confd_dir`]: #confd_dir
+[`content`]: #content
+[カスタムエラードキュメント]: https://httpd.apache.org/docs/current/custom-error.html
+[`custom_fragment`]: #custom_fragment
+
+[`default_mods`]: #default_mods
+[`default_ssl_crl`]: #default_ssl_crl
+[`default_ssl_crl_path`]: #default_ssl_crl_path
+[`default_ssl_vhost`]: #default_ssl_vhost
+[`dev_packages`]: #dev_packages
+[`directory`]: #directory
+[`directories`]: #parameter-directories-for-apachevhost
+[`DirectoryIndex`]: https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+[`docroot`]: #docroot
+[`docroot_owner`]: #docroot_owner
+[`docroot_group`]: #docroot_group
+[`DocumentRoot`]: https://httpd.apache.org/docs/current/mod/core.html#documentroot
+
+[`EnableSendfile`]: https://httpd.apache.org/docs/current/mod/core.html#enablesendfile
+[適用モード]: http://selinuxproject.org/page/Guide/Mode
+[`ensure`]: https://docs.puppet.com/latest/type.html#package-attribute-ensure
+[`error_log_file`]: #error_log_file
+[`error_log_syslog`]: #error_log_syslog
+[`error_log_pipe`]: #error_log_pipe
+[`ExpiresByType`]: https://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype
+[エクスポートリソース]: http://docs.puppet.com/latest/reference/lang_exported.md
+[`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus
+
+[Facter]: http://docs.puppet.com/facter/
+[FastCGI]: http://www.fastcgi.com/
+[FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
+[`fallbackresource`]: #fallbackresource
+[`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag
+[フィルタルール]: https://httpd.apache.org/docs/current/filter.html
+[`filters`]: #filters
+[`ForceType`]: https://httpd.apache.org/docs/current/mod/core.html#forcetype
+
+[GeoIPScanProxyHeaders]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives
+[`gentoo/puppet-portage`]: https://github.com/gentoo/puppet-portage
+
+[ハッシュ]: https://docs.puppet.com/puppet/latest/reference/lang_data_hash.html
+[`HttpProtocolOptions`]: http://httpd.apache.org/docs/current/mod/core.html#httpprotocoloptions
+
+[`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional
+[`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include
+[インターバル構文]: https://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn
+[`ip`]: #ip
+[`ip_based`]: #ip_based
+[IPベースのバーチャルホスト]: https://httpd.apache.org/docs/current/vhosts/ip-based.html
+
+[`KeepAlive`]: https://httpd.apache.org/docs/current/mod/core.html#keepalive
+[`KeepAliveTimeout`]: https://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout
+[`keepalive`パラメータ]: #keepalive
+[`keepalive_timeout`]: #keepalive_timeout
+[`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize
+
+[`lib`]: #lib
+[`lib_path`]: #lib_path
+[`Listen`]: https://httpd.apache.org/docs/current/bind.html
+[`ListenBackLog`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#listenbacklog
+[`LoadFile`]: https://httpd.apache.org/docs/current/mod/mod_so.html#loadfile
+[`LogFormat`]: https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat
+[`logroot`]: #logroot
+[ログセキュリティ]: https://httpd.apache.org/docs/current/logs.html#security
+
+[`manage_docroot`]: #manage_docroot
+[`manage_user`]: #manage_user
+[`manage_group`]: #manage_group
+[`supplementary_groups`]: #supplementary_groups
+[`MaxConnectionsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild
+[`max_keepalive_requests`]: #max_keepalive_requests
+[`MaxRequestWorkers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxrequestworkers
+[`MaxSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxsparethreads
+[MIME `content-type`]: https://www.iana.org/assignments/media-types/media-types.xhtml
+[`MinSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#minsparethreads
+[`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html
+[`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
+[`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html
+[`mod_authnz_external`]: https://github.com/phokz/mod-auth-external
+[`mod_auth_dbd`]: http://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
+[`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
+[`mod_dbd`]: http://httpd.apache.org/docs/current/mod/mod_dbd.html
+[`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
+[`mod_dumpio`]: https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
+[`mod_env`]: http://httpd.apache.org/docs/current/mod/mod_env.html
+[`mod_expires`]: https://httpd.apache.org/docs/current/mod/mod_expires.html
+[`mod_ext_filter`]: https://httpd.apache.org/docs/current/mod/mod_ext_filter.html
+[`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
+[`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/
+[`mod_info`]: https://httpd.apache.org/docs/current/mod/mod_info.html
+[`mod_ldap`]: https://httpd.apache.org/docs/2.2/mod/mod_ldap.html
+[`mod_mpm_event`]: https://httpd.apache.org/docs/current/mod/event.html
+[`mod_negotiation`]: https://httpd.apache.org/docs/current/mod/mod_negotiation.html
+[`mod_pagespeed`]: https://developers.google.com/speed/pagespeed/module/?hl=en
+[`mod_passenger`]: https://www.phusionpassenger.com/library/config/apache/reference/
+[`mod_php`]: http://php.net/manual/en/book.apache.php
+[`mod_proxy`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html
+[`mod_proxy_balancer`]: https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
+[`mod_reqtimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
+[`mod_rewrite`]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html
+[`mod_security`]: https://www.modsecurity.org/
+[`mod_ssl`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html
+[`mod_status`]: https://httpd.apache.org/docs/current/mod/mod_status.html
+[`mod_version`]: https://httpd.apache.org/docs/current/mod/mod_version.html
+[`mod_wsgi`]: https://modwsgi.readthedocs.org/en/latest/
+[モジュール貢献ガイド]: https://docs.puppet.com/forge/contributing.html
+[`mpm_module`]: #mpm_module
+[マルチプロセッシングモジュール]: https://httpd.apache.org/docs/current/mpm.html
+
+[名前ベースのバーチャルホスト]: https://httpd.apache.org/docs/current/vhosts/name-based.html
+[`no_proxy_uris`]: #no_proxy_uris
+
+[オープンソース版Puppet]: https://docs.puppet.com/puppet/
+[`Options`]: https://httpd.apache.org/docs/current/mod/core.html#options
+
+[`path`]: #path
+[`Peruser`]: https://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr
+[`port`]: #port
+[`priority`]: #defined-types-apachevhost
+[`proxy_dest`]: #proxy_dest
+[`proxy_dest_match`]: #proxy_dest_match
+[`proxy_pass`]: #proxy_pass
+[`ProxyPass`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass
+[`ProxySet`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset
+[Puppet Enterprise]: https://docs.puppet.com/pe/
+[Puppet Forge]: https://forge.puppet.com
+[Puppet]: https://puppet.com
+[Puppetモジュール]: https://docs.puppet.com/puppet/latest/reference/modules_fundamentals.html
+[Puppetモジュールのコード]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp
+[`purge_configs`]: #purge_configs
+[`purge_vhost_dir`]: #purge_vhost_dir
+[Python]: https://www.python.org/
+
+[Rack]: http://rack.github.io/
+[`rack_base_uris`]: #rack_base_uris
+[RFC 2616]: https://www.ietf.org/rfc/rfc2616.txt
+[`RequestReadTimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html#requestreadtimeout
+[rspec-puppet]: http://rspec-puppet.com/
+
+[`ScriptAlias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptalias
+[`ScriptAliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptaliasmatch
+[`scriptalias`]: #scriptalias
+[SELinux]: http://selinuxproject.org/
+[`ServerAdmin`]: https://httpd.apache.org/docs/current/mod/core.html#serveradmin
+[`serveraliases`]: #serveraliases
+[`ServerLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#serverlimit
+[`ServerName`]: https://httpd.apache.org/docs/current/mod/core.html#servername
+[`ServerRoot`]: https://httpd.apache.org/docs/current/mod/core.html#serverroot
+[`ServerTokens`]: https://httpd.apache.org/docs/current/mod/core.html#servertokens
+[`ServerSignature`]: https://httpd.apache.org/docs/current/mod/core.html#serversignature
+[サービス属性リスタート]: http://docs.puppet.com/latest/type.html#service-attribute-restart
+[`source`]: #source
+[`SSLCARevocationCheck`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck
+[SSL証明書のキーファイル]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile
+[SSLチェーン]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatechainfile
+[SSL暗号化]: https://httpd.apache.org/docs/current/ssl/index.html
+[`ssl`]: #ssl
+[`ssl_cert`]: #ssl_cert
+[`ssl_compression`]: #ssl_compression
+[`ssl_key`]: #ssl_key
+[`StartServers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#startservers
+[suPHP]: http://www.suphp.org/Home.html
+[`suphp_addhandler`]: #suphp_addhandler
+[`suphp_configpath`]: #suphp_configpath
+[`suphp_engine`]: #suphp_engine
+[対応するオペレーティングシステム]: https://forge.puppet.com/supported#puppet-supported-modules-compatibility-matrix
+
+[`ThreadLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit
+[`ThreadsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadsperchild
+[`TimeOut`]: https://httpd.apache.org/docs/current/mod/core.html#timeout
+[テンプレート]: http://docs.puppet.com/puppet/latest/reference/lang_template.html
+[`TraceEnable`]: https://httpd.apache.org/docs/current/mod/core.html#traceenable
+
+[`verify_config`]: #verify_config
+[`vhost`]: #defined-type-apachevhost
+[`vhost_dir`]: #vhost_dir
+[`virtual_docroot`]: #virtual_docroot
+
+[Webサーバゲートウェイインターフェース ]: https://www.python.org/dev/peps/pep-3333/#abstract
+[`WSGIRestrictEmbedded`]: http://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIRestrictEmbedded.html
+[`WSGIPythonPath`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonPath.html
+[`WSGIPythonHome`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonHome.html
+
+#### 目次
+
+1. [モジュールの概要 - apacheモジュールとは？　何をするためのもの？][モジュールの概要]
+2. [セットアップ - apacheの使用を開始するにあたっての基礎][セットアップ]
+    - [apacheモジュールが影響を与えるもの][apacheの影響]
+    - [Apacheの使用を始める - インストール][Apacheの使用を始める]
+3. [使用方法 - 設定に使用できるクラスと定義タイプ][使用方法]
+    - [バーチャルホストの設定 - 使用開始に役立つ例][バーチャルホストの設定]
+    - [PHPファイルを処理するFastCGIサーバの設定][FastCGIサーバの設定]
+    - [エクスポートおよび非エクスポートリソースのロードバランシング][ロードバランシングの例]
+4. [リファレンス - モジュールの機能と動作について][リファレンス]
+    - [パブリッククラス][]
+    - [プライベートクラス][]
+    - [パブリック定義タイプ][]
+    - [プライベート定義タイプ][]
+    - [テンプレート][]
+5. [制約事項 - OSの互換性など][制約事項]
+6. [開発 - モジュールへの貢献方法][開発]
+    - [apacheモジュールへの貢献][貢献]
+    - [テストの実施 - クイックガイド][テストの実施]
+
+## モジュールの概要
+
+[Apache HTTPサーバ][] (Apache HTTPD、あるいは単にApacheとも呼ばれます)は、広く使用されているWebサーバです。この[Puppetモジュール][]によって、インフラ内でApacheを管理するための設定がシンプルなものになります。幅広いバーチャルホストセットアップを設定および管理し、[Apacheモジュール][]を効率的にインストールして設定することができます。
+
+## セットアップ
+
+### apacheモジュールが影響を与えるもの:
+
+- (作成し、書き込みを行う)設定ファイルおよびディレクトリ
+  - **警告**: Puppetにより管理*されていない*設定はパージされます。
+- Apacheのパッケージ/サービス/設定ファイル
+- Apacheモジュール
+- バーチャルホスト
+- リッスンするポート
+- FreeBSDおよびGentooの`/etc/make.conf` 
+
+Gentooでは、このモジュールは [`gentoo/puppet-portage`][] Puppetモジュールに依存します。Gentooについては、いくつかのオプションが適用され、一部の機能や設定が有効になりますが、このモジュールに[対応するオペレーティングシステム][]ではない点に留意してください。
+
+> **警告**: このモジュールにより、Apache設定ファイルおよびディレクトリが修正され、Puppetで管理されていない設定がパージされます。Apache設定はPuppetで管理する必要があります。これは、管理されていない設定ファイルにより、予期せぬ不具合が生じる可能性があるためです。
+>
+>全面的なPuppet管理を一時的に無効にするには、[`apache`][]クラス宣言の[`purge_configs`][]パラメータをfalseに設定します。この手順は、カスタマイズした設定を保存し、リロケーションするための一時的な対策としてのみ推奨されます。
+
+### Apacheの使用を始める
+
+デフォルトパラメータを用いてPuppetでApacheをインストールするには、[`apache`][]クラスを宣言します。
+
+``` puppet
+class { 'apache': }
+```
+
+デフォルトオプションを用いてこのクラスを宣言すると、モジュールでは以下のことが実行されます。
+
+- オペレーティングシステムに適したApacheソフトウェアパッケージおよび[必要なApacheモジュール](#default_mods)をインストールします。
+- オペレーティングシステムに応じた[デフォルトロケーション](#conf_dir)を用いて、ディレクトリ内に必要な設定ファイルを配置します。
+- デフォルトのバーチャルホストおよび標準的なポート('80')とアドレス('\*')のバインディングを用いてサーバを設定します。
+- ドキュメントルートディレクトリを作成します。オペレーティングシステムによって異なりますが、通常は`/var/www`です。
+- Apacheサービスを開始します。
+
+Apacheのデフォルト設定は、オペレーティングシステムによって異なります。これらのデフォルトは、テスト環境では機能しますが、本稼働環境には推奨されません。実際のサイトに応じてクラスのパラメータをカスタマイズすることを推奨します。
+
+例えば、以下の宣言では、apacheモジュールの[デフォルトのバーチャルホスト設定][バーチャルホストの設定]を使わずにApacheがインストールされるので、すべてのApacheバーチャルホストをカスタマイズすることができます。
+
+``` puppet
+class { 'apache':
+  default_vhost => false,
+}
+```
+
+> **注意**: `default_vhost`を`false`に設定する場合、少なくとも1つの`apache::vhost`リソースを追加する必要があります。追加しなければ、Apacheは起動しません。デフォルトのバーチャルホストを設定するには、`apache`クラスで`default_vhost`を設定するか、[`apache::vhost`][]定義タイプを使用します。[`apache::vhost`][]定義タイプを用いて、追加の固有バーチャルホストを設定することもできます。
+
+## 使用方法
+
+### バーチャルホストの設定
+
+デフォルトの[`apache`][]クラスは、ポート80にバーチャルホストを設定します。すべてのインターフェースをリッスンし、[`docroot`][]パラメータのデフォルトディレクトリ`/var/www`をサーブします。
+
+
+基本の[名前ベースのバーチャルホスト][]を設定するには、[`apache::vhost`][]定義タイプで[`port`][]および[`docroot`][]パラメータを指定します。
+
+``` puppet
+apache::vhost { 'vhost.example.com':
+  port    => '80',
+  docroot => '/var/www/vhost',
+}
+```
+
+すべてのバーチャルホストパラメータのリストについては、[`apache::vhost`][]定義タイプのリファレンスを参照してください。
+
+> **注意**: Apacheはバーチャルホストをアルファベット順に処理します。サーバ管理者は、バーチャルホスト設定ファイル名の先頭に数字を付けることで、 Apacheバーチャルホスト処理の優先順位を設定できます。[`apache::vhost`][]定義タイプは、デフォルトの [`priority`][]である15を適用します。これはPuppetではバーチャルホストのファイル名の先頭に`15-`が付いていると解釈されます。そのため、優先順位が同じサイトが複数ある場合や、`priority`パラメータの値をfalseに設定して優先順位番号を無効にした場合でも、Apacheはバーチャルホストをアルファベット順に処理します。
+
+`docroot`のユーザおよびグループのオーナーシップを設定するには、[`docroot_owner`][]および[`docroot_group`][]パラメータを使用します。
+
+``` puppet
+apache::vhost { 'user.example.com':
+  port          => '80',
+  docroot       => '/var/www/user',
+  docroot_owner => 'www-data',
+  docroot_group => 'www-data',
+}
+```
+
+#### SSLを使ったバーチャルホストの設定
+
+[SSL encryption][]およびデフォルトのSSL証明書を使うようにバーチャルホストを設定するには、[`ssl`][]パラメータを設定します。また、[`port`][]パラメータを指定する必要もあります。通常は、'443'という値がHTTPSリクエストに対応します。
+
+``` puppet
+apache::vhost { 'ssl.example.com':
+  port    => '443',
+  docroot => '/var/www/ssl',
+  ssl     => true,
+}
+```
+
+SSLおよび固有SSL証明書を使うようにバーチャルホストを設定するには、[`ssl_cert`][]および[`ssl_key`][]パラメータで証明書およびキーへのパスを使用します。
+
+``` puppet
+apache::vhost { 'cert.example.com':
+  port     => '443',
+  docroot  => '/var/www/cert',
+  ssl      => true,
+  ssl_cert => '/etc/ssl/fourth.example.com.cert',
+  ssl_key  => '/etc/ssl/fourth.example.com.key',
+}
+```
+
+同じドメインでSSLと暗号化されていないバーチャルホストを混ぜて設定するには、それぞれを個別の[`apache::vhost`][]定義タイプで宣言します。
+
+``` puppet
+# The non-ssl virtual host
+apache::vhost { 'mix.example.com non-ssl':
+  servername => 'mix.example.com',
+  port       => '80',
+  docroot    => '/var/www/mix',
+}
+
+# The SSL virtual host at the same domain
+apache::vhost { 'mix.example.com ssl':
+  servername => 'mix.example.com',
+  port       => '443',
+  docroot    => '/var/www/mix',
+  ssl        => true,
+}
+```
+
+暗号化されていない接続をSSLにリダイレクトするようにバーチャルホストを設定するには、それぞれを個別の[`apache::vhost`][]定義タイプで宣言し、SSLが有効化されているバーチャルホストに、暗号化されていないリクエストをリダイレクトします。
+
+``` puppet
+apache::vhost { 'redirect.example.com non-ssl':
+  servername      => 'redirect.example.com',
+  port            => '80',
+  docroot         => '/var/www/redirect',
+  redirect_status => 'permanent',
+  redirect_dest   => 'https://redirect.example.com/'
+}
+
+apache::vhost { 'redirect.example.com ssl':
+  servername => 'redirect.example.com',
+  port       => '443',
+  docroot    => '/var/www/redirect',
+  ssl        => true,
+}
+```
+
+#### バーチャルホストのポートおよびアドレスのバインディング設定　
+
+バーチャルホストはデフォルトですべてのIPアドレス('\*')をリッスンします。特定のIPアドレスをリッスンするようにバーチャルホストを設定するには、[`ip`][]パラメータを使用します。
+
+``` puppet
+apache::vhost { 'ip.example.com':
+  ip      => '127.0.0.1',
+  port    => '80',
+  docroot => '/var/www/ip',
+}
+```
+
+[`ip`][]パラメータにIPアドレスの配列を使えば、1つのバーチャルホストに複数のIPアドレスを設定することもできます。
+
+``` puppet
+apache::vhost { 'ip.example.com':
+  ip      => ['127.0.0.1','169.254.1.1'],
+  port    => '80',
+  docroot => '/var/www/ip',
+}
+```
+
+[`port`][]パラメータにポートの配列を使えば、1つのバーチャルホストに複数のポートを設定することができます。
+
+``` puppet
+apache::vhost { 'ip.example.com':
+  ip      => ['127.0.0.1'],
+  port    => ['80','8080']
+  docroot => '/var/www/ip',
+}
+```
+
+[エイリアスサーバ][]を使ってバーチャルホストを設定するには、[`serveraliases`][]パラメータを使ってエイリアスを指定します。
+
+``` puppet
+apache::vhost { 'aliases.example.com':
+  serveraliases => [
+    'aliases.example.org',
+    'aliases.example.net',
+  ],
+  port          => '80',
+  docroot       => '/var/www/aliases',
+}
+```
+
+`/var/www/example.com`に'http://example.com.loc'をマッピングするケースのように、 同じ名前のディレクトリにマッピングされたサブドメイン用にワイルドカードエイリアスを使ってバーチャルホストを設定するには、[`serveraliases`][]パラメータを使ってワイルドカードエイリアスを、[`virtual_docroot`][]パラメータを使ってドキュメントルートを定義します。
+
+``` puppet
+apache::vhost { 'subdomain.loc':
+  vhost_name      => '*',
+  port            => '80',
+  virtual_docroot => '/var/www/%-2+',
+  docroot         => '/var/www',
+  serveraliases   => ['*.loc',],
+}
+```
+
+[フィルタルール][]を使ってバーチャルホストを設定するには、[`filters`][]パラメータを使って、フィルタディレクティブを[array][]として渡します。
+
+``` puppet
+apache::vhost { 'subdomain.loc':
+  port    => '80',
+  filters => [
+    'FilterDeclare  COMPRESS',
+    'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html',
+    'FilterChain    COMPRESS',
+    'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no',
+  ],
+  docroot => '/var/www/html',
+}
+```
+
+#### アプリおよびプロセッサのバーチャルホストの設定　
+
+[suPHP][]を使ってバーチャルホストを設定するには、以下のパラメータを使用します。
+
+* [`suphp_engine`][]、suPHPエンジンを有効にします。
+* [`suphp_addhandler`][]、MIMEタイプを定義します。
+* [`suphp_configpath`][]、suPHPがPHPインタープリタに渡すパスを設定します。 
+* [`directory`][]、ディレクトリ、ファイル、ロケーションの各ディレクティブブロックを設定します。
+
+例:　
+
+``` puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => [
+    { 'path'  => '/home/appuser/myphpapp',
+      'suphp' => {
+        user  => 'myappuser',
+        group => 'myappgroup',
+      },
+    },
+  ],
+}
+```
+
+[Python][]アプリケーション用の[Webサーバゲートウェイインターフェース][] (WSGI)を使ってバーチャルホストを設定するには、`wsgi`パラメータセットを使用します。
+
+``` puppet
+apache::vhost { 'wsgi.example.com':
+  port                        => '80',
+  docroot                     => '/var/www/pythonapp',
+  wsgi_application_group      => '%{GLOBAL}',
+  wsgi_daemon_process         => 'wsgi',
+  wsgi_daemon_process_options => {
+    processes    => '2',
+    threads      => '15',
+    display-name => '%{GROUP}',
+  },
+  wsgi_import_script          => '/var/www/demo.wsgi',
+  wsgi_import_script_options  => {
+    process-group     => 'wsgi',
+    application-group => '%{GLOBAL}',
+  },
+  wsgi_process_group          => 'wsgi',
+  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+}
+```
+
+Apache 2.2.16の時点では、Apacheは[FallbackResource][]をサポートしています。これは、一般的なRewriteRulesに代わるシンプルなディレクティブです。[`fallbackresource`][]パラメータを使えば、FallbackResourceを設定できます。
+
+``` puppet
+apache::vhost { 'wordpress.example.com':
+  port             => '80',
+  docroot          => '/var/www/wordpress',
+  fallbackresource => '/index.php',
+}
+```
+
+> **注意**: Apache 2.2.24以降では、`fallbackresource`パラメータがサポートするのは'disabled'値のみです。
+
+[コモンゲートウェイインターフェース][] (CGI)ファイル用の指定ディレクトリを使ってバーチャルホストを設定するには、[`scriptalias`][]パラメータを使って`cgi-bin`パスを定義します。
+
+``` puppet
+apache::vhost { 'cgi.example.com':
+  port        => '80',
+  docroot     => '/var/www/cgi',
+  scriptalias => '/usr/lib/cgi-bin',
+}
+```
+
+[Rack][]用のバーチャルホストを設定するには、[`rack_base_uris`][]パラメータを使用します。
+
+``` puppet
+apache::vhost { 'rack.example.com':
+  port           => '80',
+  docroot        => '/var/www/rack',
+  rack_base_uris => ['/rackapp1', '/rackapp2'],
+}
+```
+
+#### IPベースのバーチャルホストの設定　
+
+任意のポートをリッスンし、固有IPアドレスのリクエストに応答する[IPベースのバーチャルホスト][]を設定することができます。この例では、サーバはポート80および81をリッスンします。これは、この例のバーチャルホストが[`port`][]パラメータにより宣言されて_いない_ ためです。
+
+``` puppet
+apache::listen { '80': }
+
+apache::listen { '81': }
+```
+
+[`ip_based`][]パラメータを使ってIPベースのバーチャルホストを設定します。
+
+``` puppet
+apache::vhost { 'first.example.com':
+  ip       => '10.0.0.10',
+  docroot  => '/var/www/first',
+  ip_based => true,
+}
+
+apache::vhost { 'second.example.com':
+  ip       => '10.0.0.11',
+  docroot  => '/var/www/second',
+  ip_based => true,
+}
+```
+
+任意の[SSL][SSL暗号化]構成と暗号化されていない構成を組み合わせ、IPベースと[名前ベースのバーチャルホスト][]を混ぜて設定することもできます。
+
+この例では、1つのIPアドレス(この例では、10.0.0.10)に2つのIPベースのバーチャルホストを追加します。一方はSSLを使用するもの、もう一方は暗号化されていないものです。
+
+``` puppet
+apache::vhost { 'The first IP-based virtual host, non-ssl':
+  servername => 'first.example.com',
+  ip         => '10.0.0.10',
+  port       => '80',
+  ip_based   => true,
+  docroot    => '/var/www/first',
+}
+
+apache::vhost { 'The first IP-based vhost, ssl':
+  servername => 'first.example.com',
+  ip         => '10.0.0.10',
+  port       => '443',
+  ip_based   => true,
+  docroot    => '/var/www/first-ssl',
+  ssl        => true,
+}
+```
+
+次に、第2のIPアドレス(10.0.0.20)に2つの名前ベースのバーチャルホストを追加します。
+
+``` puppet
+apache::vhost { 'second.example.com':
+  ip      => '10.0.0.20',
+  port    => '80',
+  docroot => '/var/www/second',
+}
+
+apache::vhost { 'third.example.com':
+  ip      => '10.0.0.20',
+  port    => '80',
+  docroot => '/var/www/third',
+}
+```
+
+10.0.0.10または10.0.0.20のいずれかで応答する名前ベースのバーチャルホストを追加するには、Apacheのデフォルトの`Listen 80`を無効にする**必要があります**。これは、前述のIPベースのバーチャルホストとコンフリクトするためです。無効にするには、[`add_listen`][]パラメータを`false`に設定します。
+
+``` puppet
+apache::vhost { 'fourth.example.com':
+  port       => '80',
+  docroot    => '/var/www/fourth',
+  add_listen => false,
+}
+
+apache::vhost { 'fifth.example.com':
+  port       => '80',
+  docroot    => '/var/www/fifth',
+  add_listen => false,
+}
+```
+
+### Apacheモジュールのインストール　
+
+Puppet apacheモジュールを使って[Apacheモジュール][]をインストールするには、2つの方法があります。
+
+- [`apache::mod::<MODULE NAME>`][] クラスを使って、[パラメータを伴う固有のApacheモジュールをインストール][固有モジュールのインストール]する方法
+- [`apache::mod`][]定義タイプを使って、[任意のApacheモジュールをインストール][任意モジュールのインストール]する方法
+
+#### 固有モジュールのインストール
+
+Puppet apacheモジュールは、多くの一般的な[Apacheモジュール][]のインストールをサポートしており、多くの場合、パラメータ化された設定オプションがあります。サポートされるApacheモジュールのリストについては、[`apache::mod::<MODULE NAME>`][]クラスリファレンスを参照してください。
+
+例えば、[`apache::mod::ssl`][]クラスを宣言すれば、デフォルト設定で`mod_ssl` Apacheモジュールをインストールすることができます。
+
+``` puppet
+class { 'apache::mod::ssl': }
+```
+
+[`apache::mod::ssl`][]には複数のパラメータ化されたオプションがあり、宣言する際に設定することができます。たとえば、圧縮を有効にして`mod_ssl`を有効化するには、[`ssl_compression`][]パラメータをtrueに設定します。
+
+``` puppet
+class { 'apache::mod::ssl':
+  ssl_compression => true,
+}
+```
+
+一部のモジュールには必須条件があります。[`apache::mod::<MODULE NAME>`][]のリファレンスを参照してください。
+
+#### 任意モジュールのインストール
+
+オペレーティングシステムのパッケージマネージャでインストール可能な任意のモジュールの名前を[`apache::mod`][]定義タイプに渡し、それをインストールすることができます。固有モジュールクラスとは異なり、 [`apache::mod`][]定義タイプでは、インストールされている他のモジュールや固有のパラメータに基づいてインストールが調整されることはありません。Puppetはモジュールのパッケージを取得し、インストールするだけです。詳細な設定はユーザが必要に応じて行います。
+
+例えば、[`mod_authnz_external`][] Apacheモジュールをインストールするには、'mod_authnz_external'の名前を使って定義タイプを宣言します。
+
+``` puppet
+apache::mod { 'mod_authnz_external': }
+```
+
+この方法でApacheモジュールを定義する際には、いくつかのオプションパラメータを指定できます。詳細については、[定義タイプのリファレンス][`apache::mod`]を参照してください。
+
+### PHPファイルを処理するFastCGIサーバの設定
+
+[`apache::fastcgi::server`][]定義タイプを追加すれば、 [FastCGI][]サーバで特定のファイルに関するリクエストを処理することができます。以下の例では、PHPリクエストを処理するFastCGIサーバをポート9000の127.0.0.1 (ローカルホスト)で定義しています。
+
+``` puppet
+apache::fastcgi::server { 'php':
+  host       => '127.0.0.1:9000',
+  timeout    => 15,
+  flush      => false,
+  faux_path  => '/var/www/php.fcgi',
+  fcgi_alias => '/php.fcgi',
+  file_type  => 'application/x-httpd-php'
+}
+```
+
+[`custom_fragment`][]パラメータを使えば、指定したファイルタイプがFastCGIサーバで処理されるように、バーチャルホストを設定することができます。
+
+``` puppet
+apache::vhost { 'www':
+  ...
+  custom_fragment => 'AddType application/x-httpd-php .php'
+  ...
+}
+```
+
+### ロードバランシングの例
+
+Apacheは、[`mod_proxy`][] Apacheモジュールを通じて、複数のグループのサーバにわたるロードバランシングをサポートしています。Puppetでは、[`apache::balancer`][]および[`apache::balancermember`][]定義タイプにより、Apacheロードバランシンググループ(バランサクラスタとも呼ばれます)をサポートしています。
+
+[エクスポートリソース][]でロードバランシングを有効にするには、[`apache::balancermember`][]定義タイプをロードバランサメンバーサーバからエクスポートします。
+
+``` puppet
+@@apache::balancermember { "${::fqdn}-puppet00":
+  balancer_cluster => 'puppet00',
+  url              => "ajp://${::fqdn}:8009",
+  options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
+}
+```
+
+次に、プロキシサーバでロードバランシンググループを作成します。
+
+``` puppet
+apache::balancer { 'puppet00': }
+```
+
+リソースをエクスポートせずにロードバランシングを有効にするには、プロキシサーバで以下を宣言します。
+
+``` puppet
+apache::balancer { 'puppet00': }
+
+apache::balancermember { "${::fqdn}-puppet00":
+  balancer_cluster => 'puppet00',
+  url              => "ajp://${::fqdn}:8009",
+  options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
+}
+```
+
+次に、プロキシサーバで`apache::balancer`および`apache::balancermember`定義タイプを宣言します。
+
+バランサで[ProxySet](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset)ディレクティブを使うには、`apache::balancer`の[`proxy_set`](#proxy_set)パラメータを使用します。
+
+``` puppet
+apache::balancer { 'puppet01':
+  proxy_set => {
+    'stickysession' => 'JSESSIONID',
+    'lbmethod'      => 'bytraffic',
+  },
+}
+```
+
+ロードバランシングのスケジューラのアルゴリズム(`lbmethod`)は、[mod_proxy_balancerドキュメント](https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html)に記載されています。
+
+## リファレンス
+
+- [**パブリッククラス**](#public-classes)
+    - [クラス: apache](#class-apache)
+    - [クラス: apache::dev](#class-apachedev)
+    - [クラス: apache::vhosts](#class-apachevhosts)
+    - [クラス: apache::mod::\*](#classes-apachemodname)
+- [**プライベートクラス**](#private-classes)
+    - [クラス: apache::confd::no_accf](#class-apacheconfdno_accf)
+    - [クラス: apache::default_confd_files](#class-apachedefault_confd_files)
+    - [クラス: apache::default_mods](#class-apachedefault_mods)
+    - [クラス: apache::package](#class-apachepackage)
+    - [クラス: apache::params](#class-apacheparams)
+    - [クラス: apache::service](#class-apacheservice)
+    - [クラス: apache::version](#class-apacheversion)
+- [**パブリック定義タイプ**](#public-defined-types)
+    - [定義タイプ: apache::balancer](#defined-type-apachebalancer)
+    - [定義タイプ: apache::balancermember](#defined-type-apachebalancermember)
+    - [定義タイプ: apache::custom_config](#defined-type-apachecustom_config)
+    - [定義タイプ: apache::fastcgi::server](#defined-type-fastcgi-server)
+    - [定義タイプ: apache::listen](#defined-type-apachelisten)
+    - [定義タイプ: apache::mod](#defined-type-apachemod)
+    - [定義タイプ: apache::namevirtualhost](#defined-type-apachenamevirtualhost)
+    - [定義タイプ: apache::vhost](#defined-type-apachevhost)
+    - [定義タイプ: apache::vhost::custom](#defined-type-apachevhostcustom)
+- [**プライベート定義タイプ**](#private-defined-types)
+    - [定義タイプ: apache::default_mods::load](#defined-type-default_mods-load)
+    - [定義タイプ: apache::peruser::multiplexer](#defined-type-apacheperusermultiplexer)
+    - [定義タイプ: apache::peruser::processor](#defined-type-apacheperuserprocessor)
+    - [定義タイプ: apache::security::file_link](#defined-type-apachesecurityfile_link)
+- [**テンプレート**](#templates)
+
+### パブリッククラス
+
+#### クラス: `apache`
+
+システムでのApacheの基本的な設定とインストールをガイドします。
+
+デフォルトオプションを用いてこのクラスを宣言すると、Puppetでは以下が実行されます。
+
+- オペレーティングシステムに適したApacheソフトウェアパッケージおよび[必要なApacheモジュール](#default_mods)をインストールします。
+- [デフォルトロケーション](#conf_dir)を用いて、ディレクトリ内に必要な設定ファイルを配置します。デフォルトロケーションは、オペレーティングシステムによって異なります。
+- デフォルトのバーチャルホストおよび標準的なポート('80')とアドレス('\*')のバインディングを用いてサーバを設定します。
+- ドキュメントルートディレクトリを作成します。オペレーティングシステムによって異なりますが、通常は`/var/www`です。
+- Apacheサービスを開始します。
+
+ここでは、デフォルトの`apache`クラスを宣言するだけです。
+
+``` puppet
+class { 'apache': }
+```
+
+##### `allow_encoded_slashes`
+
+[`AllowEncodedSlashes`][]宣言のサーバデフォルトを設定します。これにより、'\'および'/'を含むURLに対する応答が変更されます。このパラメータを指定しない場合、サーバの設定でこの宣言が省かれ、Apacheのデフォルト設定'off'が使用されます。
+
+値: 'on'、'off'、'nodecode'。
+
+デフォルト値: `undef`。
+
+##### `apache_version`
+
+使用するApacheのバージョンを定義し、モジュールテンプレートの挙動、パッケージ名、デフォルトのApacheモジュールを設定します。このパラメータを理由なく手動で設定することは、推奨していません。
+
+デフォルト値: [`apache::version`][]クラスにより検出されたオペレーティングシステムとリリースバージョンによって異なります。
+
+##### `conf_dir`
+
+Apacheサーバのメイン設定ファイルを置くディレクトリを設定します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/etc/apache2`
+- **FreeBSD**: `/usr/local/etc/apache22`
+- **Gentoo**: `/etc/apache2`
+- **Red Hat**: `/etc/httpd/conf`
+
+##### `conf_template`
+
+メインのApache設定ファイルで使用される[テンプレート][]を定義します。apacheモジュールは、`conf.d`エントリによりカスタマイズされた最小限の設定ファイルを使用するように設計されているため、このパラメータの変更には潜在的なリスクが伴います。
+
+デフォルト値: `apache/httpd.conf.erb`。
+
+##### `confd_dir`
+
+Apacheサーバのカスタム設定ディレクトリの場所を設定します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/etc/apache2/conf.d`
+- **FreeBSD**: `/usr/local/etc/apache22`
+- **Gentoo**: `/etc/apache2/conf.d`
+- **Red Hat**: `/etc/httpd/conf.d`
+
+##### `default_charset`
+
+メイン設定ファイルで[`AddDefaultCharset`][]ディレクティブとして使用されます。
+
+デフォルト値: `undef`。
+
+##### `default_confd_files`
+
+[`confd_dir`][]パラメータにより定義されるディレクトリに、インクルード可能なApache設定ファイルのデフォルトセットを生成するかどうかを決定します。この設定ファイルは、サーバのオペレーティングシステムにApacheパッケージとともに通常インストールされるものに相当します。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `default_mods`
+
+オペレーティングシステムに応じたデフォルトの[Apacheモジュール][]のセットを設定して有効にするかどうかを決定します。
+
+`false`の場合、Puppetはオペレーティングシステム上でHTTPデーモンを機能させるのに必要なApacheモジュールのみを含めます。[`apache::mod::<MODULE NAME>`][]クラスまたは[`apache::mod`][]定義タイプを使えば、他のモジュールを個別に宣言することができます。
+
+`true`の場合、Puppetはオペレーティングシステムと [`apache_version`][]および[`mpm_module`][]パラメータの値に応じて、その他のモジュールもインストールします。このモジュールリストは頻繁に変更されるので、最新のリストについては[Puppetモジュールのコード][]を参照してください。
+
+このパラメータに配列が含まれる場合、Puppetは渡されたすべてのApacheモジュールを有効にします。
+
+値: ブーリアンまたはApacheモジュール名の配列。
+
+デフォルト値: `true`。
+
+##### `default_ssl_ca`
+
+Apacheサーバのデフォルトの証明書認証局を設定します。
+
+デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、各自の認証局情報を用いてこのパラメータを更新する**必要があります**。
+
+ブーリアン。
+
+デフォルト値: `undef`。
+
+##### `default_ssl_cert`
+
+[SSL暗号化][]証明書の保存場所を設定します。
+
+デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、各自の証明書ロケーション情報を用いてこのパラメータを更新する**必要があります**。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/etc/ssl/certs/ssl-cert-snakeoil.pem`
+- **FreeBSD**: `/usr/local/etc/apache22/server.crt`
+- **Gentoo**: `/etc/ssl/apache2/server.crt`
+- **Red Hat**: `/etc/pki/tls/certs/localhost.crt`
+
+##### `default_ssl_chain`
+
+デフォルトの[SSLチェーン][]の保存場所を設定します。 
+
+デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、各自のSSLチェーンを用いてこのパラメータを更新する**必要があります**。
+
+デフォルト値: `undef`。
+
+##### `default_ssl_crl`
+
+使用するデフォルトの[証明書失効リスト][] (CRL)ファイルのパスを設定します。
+
+デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、CRLファイルパスを用いてこのパラメータを更新する**必要があります**。このパラメータは、[`default_ssl_crl_path`][]とともに使用することも、その代わりに使用することもできます。
+
+デフォルト値: `undef`。
+
+##### `default_ssl_crl_path`
+
+サーバの[証明書失効リストパス][]を設定します。これにはCRLが含まれます。
+
+デフォルト値を使えばApacheサーバは機能しますが、本稼働環境でこのサーバをデプロイする前に、CRLファイルパスを用いてこのパラメータを更新する**必要があります**。
+
+デフォルト値: `undef`。
+
+##### `default_ssl_crl_check`
+
+[`SSLCARevocationCheck`][]ディレクティブを通じてデフォルトの証明書失効チェックレベルを設定します。このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。
+
+デフォルト値を使えばApacheサーバは機能しますが、本稼働環境で証明書失効リストを使用する際には、このパラメータを指定する**必要があります**。
+
+デフォルト値: `undef`。
+
+##### `default_ssl_key`
+
+[SSL証明書キーファイル][]の保存場所を設定します。
+
+デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、各自のSSLキーのロケーションを用いてこのパラメータを更新する**必要があります**。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/etc/ssl/private/ssl-cert-snakeoil.key`
+- **FreeBSD**: `/usr/local/etc/apache22/server.key`
+- **Gentoo**: `/etc/ssl/apache2/server.key`
+- **Red Hat**: `/etc/pki/tls/private/localhost.key`
+
+
+##### `default_ssl_vhost`
+
+デフォルトの[SSL][SSL暗号化]バーチャルホストを設定します。
+
+`true`の場合、Puppetは [`apache::vhost`][]定義タイプを用いて、以下のバーチャルホストを自動的に設定します。
+
+```puppet
+apache::vhost { 'default-ssl':
+  port            => 443,
+  ssl             => true,
+  docroot         => $docroot,
+  scriptalias     => $scriptalias,
+  serveradmin     => $serveradmin,
+  access_log_file => "ssl_${access_log_file}",
+  }
+```
+
+> **注意**: SSLバーチャルホストはHTTPSクエリにのみ応答します。
+
+
+ブーリアン。
+
+デフォルト値: `false`。
+
+##### `default_type`
+
+_Apache 2.2のみ_。サーバが他の方法で適切な`content-type`を決定できない場合に送信される[MIME `content-type`][]を設定します。このディレクティブはApache 2.4以降では廃止予定になっており、設定ファイルの下位互換性確保の目的でのみ使われます。 
+
+デフォルト値: `undef`。
+
+##### `default_vhost`
+
+クラスが宣言された際にデフォルトのバーチャルホストを設定します。
+
+[カスタマイズしたバーチャルホスト][バーチャルホストの設定]を設定するには、このパラメータの値を`false`に設定します。
+
+> **注意**: 少なくとも1つのバーチャルホストがなければ、Apacheは起動しません。このパラメータを`false`に設定する場合は、別の場所でバーチャルホストを設定する必要があります。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `dev_packages`
+
+使用する固有devパッケージを設定します。
+
+値: 文字列または文字列の配列。
+
+IUS yumリポジトリからhttpd 2.4を使用する例:
+
+``` puppet
+include ::apache::dev
+class { 'apache':
+ apache_name => 'httpd24u',
+ dev_packages => 'httpd24u-devel',
+}
+```
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Red Hat:** 'httpd-devel'
+- **Debian 8/Ubuntu 13.10以降:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
+- **それ以前のDebian/Ubuntuバージョン:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
+- **FreeBSD, Gentoo:** `undef`
+- **Suse:** ['libapr-util1-devel', 'libapr1-devel']
+
+##### `docroot`
+
+デフォルトの[`DocumentRoot`][]の場所を設定します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/var/www/html`
+- **FreeBSD**: `/usr/local/www/apache22/data`
+- **Gentoo**: `/var/www/localhost/htdocs`
+- **Red Hat**: `/var/www/html`
+
+##### `error_documents`
+
+Apacheサーバの[カスタムエラードキュメント][]を有効にするかどうかを決定します。
+
+ブーリアン。
+
+デフォルト値: `false`。
+
+##### `group`
+
+リクエストに応答するために生成されるApacheプロセスを所有するグループIDを設定します。
+
+デフォルトでは、Puppetはこのグループを`apache`クラスの下のリソースとして管理するよう試み、[`apache::params`][]クラスにより検出されたオペレーティングシステムに基づいてグループを決定します。このグループリソースを作成せずに、別のPuppetモジュールで作成されたグループを使用するには、[`manage_group`][]パラメータの値を`false`に設定します。
+
+> **注意**: このパラメータを修正すると、Apacheが子プロセスを生成してリソースにアクセスする際に使用するグループIDのみが変更されます。親サーバプロセスを所有するユーザは変更されません。
+
+##### `httpd_dir`
+
+Apacheサーバの基本設定ディレクトリを設定します。これは、特別に再パッケージされたApacheサーバビルドにおいて、デフォルトのディストリビューションパッケージと組み合わせると意図せぬ結果が生じる可能性がある場合に役立ちます。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/etc/apache2`
+- **FreeBSD**: `/usr/local/etc/apache22`
+- **Gentoo**: `/etc/apache2`
+- **Red Hat**: `/etc/httpd`
+
+##### `http_protocol_options`
+
+HTTPプロトコルチェックの厳密さを指定します。
+
+有効なオプション: 以下の値の選択肢のシーケンス: `Strict`または`Unsafe`、`RegisteredMethods`または`LenientMethods`、`Allow0.9`または`Require1.0`。
+
+デフォルト '`Strict LenientMethods Allow0.9`'。
+
+##### `keepalive`
+
+[`KeepAlive`][]ディレクティブによってHTTPの持続的接続を有効にするかどうかを決定します。 'On'に設定する場合は、[`keepalive_timeout`][]および[`max_keepalive_requests`][]パラメータを使って関連オプションを設定してください。 
+
+値: 'Off', 'On'。
+
+デフォルト値: 'Off'。
+
+##### `keepalive_timeout`
+
+[`KeepAliveTimeout`]ディレクティブによって、HTTPの持続的接続でApacheサーバが後続のリクエストを行うまでの待機時間を設定します。このパラメータが意味を持つのは、[`keepalive` parameter][]を有効にしている場合のみです。
+
+デフォルト値: '15'。
+
+##### `max_keepalive_requests`
+
+[`keepalive` parameter][]が有効の場合に、1回の接続で許可されるリクエストの数を制限します。
+
+デフォルト値: '100'。
+
+##### `lib_path`
+
+[Apacheモジュール][Apacheモジュール]ファイルの保存場所を指定します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**および**Gentoo**: `/usr/lib/apache2/modules`
+- **FreeBSD**: `/usr/local/libexec/apache24`
+- **Red Hat**: `modules`
+
+> **注意**: このパラメータは、特別な理由がない限り手動で設定しないでください。
+
+##### `log_level`
+
+エラーログの詳細レベルを変更します。値: 'alert'、'crit'、'debug'、'emerg'、'error'、'info'、'notice'、'warn'。
+
+デフォルト値: 'warn'。
+
+##### `log_formats`
+
+追加の[`LogFormat`][]ディレクティブを定義します。値: [ハッシュ][]、例:
+
+``` puppet
+$log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
+```
+
+Puppetの作成する`httpd.conf`には、以下のような複数の`LogFormats`が事前定義されています。
+
+``` httpd
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
+```
+
+定義した`log_formats`パラメータに上記のいずれかが含まれる場合は、**ユーザの**定義により上書きされます。
+
+##### `logroot`
+
+バーチャルホストのApacheログファイルのディレクトリを変更します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/var/log/apache2`
+- **FreeBSD**: `/var/log/apache22`
+- **Gentoo**: `/var/log/apache2`
+- **Red Hat**: `/var/log/httpd`
+
+##### `logroot_mode`
+
+デフォルトの[`logroot`][]ディレクトリをオーバーライドします。
+
+> **注意**: 影響を把握できない場合は、ログが保存されているディレクトリへの書き込みアクセス権限を付与_しないで_ください。詳細については、[Apacheドキュメント][ログセキュリティ]を参照してください。
+
+デフォルト値: `undef`。
+
+##### `manage_group`
+
+`false`の場合、Puppetではグループリソースは作成されません。
+
+別のPuppetモジュールで作成されたグループをApacheの実行に使用する場合は、この値を`false`に設定してください。このパラメータを設定せずに過去に作成されたグループを使用しようとすると、重複リソースエラーが生じます。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `supplementary_groups`
+
+ユーザの所属するグループのリスト。主要グループに加えて設定する場合に使用します。
+
+デフォルト値: 追加グループなし。
+
+注意: このオプションは、`manage_user`がtrueに設定されている場合のみ有効です。
+
+##### `manage_user`
+
+`false`の場合、Puppetではユーザリソースが作成されません。
+
+このパラメータは、別のPuppetモジュールで作成されたユーザをApache実行に使用する場合などに使用します。このパラメータを設定せずに過去に作成されたユーザを使用しようとすると、重複リソースエラーが生じます。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `mod_dir`
+
+Puppetが[Apacheモジュール][]の設定ファイルを置く場所を設定します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/etc/apache2/mods-available`
+- **FreeBSD**: `/usr/local/etc/apache22/Modules`
+- **Gentoo**: `/etc/apache2/modules.d`
+- **Red Hat**: `/etc/httpd/conf.d`
+
+##### `mod_packages`
+
+デフォルトのモジュールパッケージ名をユーザがオーバーライドすることを許可します。
+
+```puppet
+include apache::params
+class { 'apache':
+ mod_packages => merge($::apache::params::mod_packages, {
+ 'auth_kerb' => 'httpd24-mod_auth_kerb',
+ })
+}
+```
+
+ハッシュ。デフォルト値: `$apache::params::mod_packages`。
+
+##### `mpm_module`
+
+HTTPDプロセスに関してロードおよび設定する[マルチプロセッシングモジュール][] (MPM)を決定します。値: 'event'、'itk'、'peruser'、'prefork'、'worker'、`false`。
+
+カスタムパラメータを用いて以下のクラスを明示的に宣言するためには、このパラメータを`false`に設定する必要があります。 
+
+- [`apache::mod::event`][]
+- [`apache::mod::itk`][]
+- [`apache::mod::peruser`][]
+- [`apache::mod::prefork`][]
+- [`apache::mod::worker`][]
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: 'worker'
+- **FreeBSD、Gentoo、Red Hat**: 'prefork'
+
+##### `package_ensure`
+
+`package`リソースの[`ensure`][]属性を制御します。値: 'absent'、'installed' (またはそれに相当する'present')、またはバージョン文字列。
+
+デフォルト値: 'installed'。
+
+##### `pidfile`
+
+pidファイルのカスタムロケーションの設定を許可します。カスタムビルトのApache rpmを使用する場合に役立ちます。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian:** '\${APACHE_PID_FILE}'
+- **FreeBSD:** '/var/run/httpd.pid'
+- **Red Hat:** 'run/httpd.pid'
+
+##### `ports_file`
+
+Apacheポート設定を含むファイルのパスを設定します。
+
+デフォルト値: '{$conf_dir}/ports.conf'。
+
+##### `purge_configs`
+
+他のすべてのApache設定およびバーチャルホストを削除します。
+
+このパラメータを`false`に設定すると、一時的な対策として、既存の設定や管理されていない設定をApacheモジュールと共存させることができます。この場合、設定をこのモジュール内のリソースに移すことを推奨します。バーチャルホストの設定については、[`purge_vhost_dir`][]を参照してください。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `purge_vhost_dir`
+
+[`vhost_dir`][]パラメータの値が[`confd_dir`][]パラメータの値と異なる場合は、このパラメータにより、Puppetにより管理されて_いない_`vhost_dir`内の設定を削除するかどうかが決定されます。
+
+`purge_vhost_dir`を`false`に設定すると、一時的な対策として、`vhost_dir`内の既存の設定や管理されていない設定をapacheモジュールと共存させることができます。
+
+ブーリアン。
+
+デフォルト値: [`purge_configs`][]と同じ。
+
+##### `rewrite_lock`
+
+リライトロックのカスタムロケーションの設定を可能にします。これは、バーチャルホストの[`rewrites`][]パラメータでタイプprgのRewriteMapを使用している場合のベストプラクティスとされています。このパラメータは、Apacheバージョン2.2以前のみに適用され、それよりも新しいバージョンでは無視されます。
+
+デフォルト値: `undef`。
+
+##### `sendfile`
+
+[`EnableSendfile`][]ディレクティブで静的ファイルをサーブする際に、ApacheがLinuxカーネルの`sendfile`サポートを使用するようにします。値: 'On'、'Off'。
+
+デフォルト値: 'On'。
+
+##### `serveradmin`
+
+Apacheの[`ServerAdmin`][]ディレクティブでApacheサーバ管理者の連絡先情報を設定します。
+
+デフォルト値: 'root@localhost'。
+
+##### `servername`
+
+Apacheの[`ServerName`][]ディレクティブでApacheサーバ名を設定します。
+
+`false`に設定すると、ServerNameは設定されません。
+
+デフォルト値:  [Facter][]により報告された'fqdn' fact。
+
+##### `server_root`
+
+Apacheの[`ServerRoot`][]ディレクティブでApacheサーバのルートを設定します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/etc/apache2`
+- **FreeBSD**: `/usr/local`
+- **Gentoo**: `/var/www`
+- **Red Hat**: `/etc/httpd`
+
+##### `server_signature`
+
+Apacheの[`ServerSignature`][]ディレクティブで、エラードキュメントや一部の[Apacheモジュール][]のアウトプットなどの、サーバ生成ドキュメントの下部に表示される末尾のフッタの行を設定します。値: 'Off'、'On'。
+
+デフォルト値: 'On'。
+
+##### `server_tokens`
+
+Apacheの[`ServerTokens`][]ディレクティブで、Apacheからブラウザに送信される、Apacheやオペレーティングシステムに関する情報の量を制御します。
+
+デフォルト値: 'OS'。
+
+##### `service_enable`
+
+システムの起動時にPuppetがApache HTTPDサービスを有効にするかどうかを決定します。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `service_ensure`
+
+サービスが稼働していることをPuppetが確認するかどうかを決定します。値: `true` (または'running')、`false` (または'stopped')。
+
+値を`false`または'stopped'にすると、'httpd'サービスリソースの`ensure`パラメータが`false`に設定されます。この設定は、Pacemakerなどの別のアプリケーションでサービスを管理する場合に役立ちます。
+
+デフォルト値: 'running'。
+
+##### `service_name`
+
+Apacheサービスの名前を設定します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **DebianおよびGentoo**: 'apache2'
+- **FreeBSD**: 'apache22'
+- **Red Hat**: 'httpd'
+
+##### `service_manage`
+
+PuppetでHTTPDサービスの状態を管理するかどうかを決定します。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `service_restart`
+
+HTTPDサービスの再起動にあたり、Puppetが特定のコマンドを使用するかどうかを決定します。
+
+値: Apacheサービスを再起動するためのコマンド。デフォルト設定では、 [デフォルトのPuppet挙動][サービス属性リスタート]が使われます。
+
+デフォルト値: `undef`。
+
+##### `ssl_ca`
+
+SSL証明書認証局を指定します。 [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile)。
+
+これはバーチャルホストレベルでオーバーライドすることが可能です。
+
+デフォルト値: `undef`。
+
+
+##### `timeout`
+
+Apacheの[`TimeOut`][]ディレクティブを設定します。このディレクティブは、一部のイベントに関してリクエスト履行を止めるまでの Apacheの待機秒数を定義します。
+
+デフォルト値: 120。
+
+##### `trace_enable`
+
+[`TraceEnable`][]ディレクティブで、Apacheが`TRACE`リクエスト([RFC 2616][]ごと)をどのように処理するかを制御します。
+
+値: 'Off', 'On'。
+
+デフォルト値: 'On'。
+
+##### `use_systemd`
+
+systemdモジュールをCentos 7サーバにインストールするかどうかを制御します。これは、カスタムビルトのRPMを使用している場合は特に役立ちます。 
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `file_mode`
+
+設定ファイルの許可モードを設定します。
+
+値: 文字列、記号表記法または数字表記法での許可モード。
+
+デフォルト値: '0644'。
+
+##### `root_directory_options`
+
+httpd.confの/ディレクトリで指定するオプションの配列。
+
+デフォルト値: 'FollowSymLinks'。
+
+##### `root_directory_secured`
+
+httpd.confの/ディレクトリについて、デフォルトのアクセスポリシーを設定します。`false`にすると、特定のアクセスポリシーがないすべてのリソースへのアクセスが許可されます。 `true`にするとデフォルトですべてのリソースへのアクセスが拒否されます。`true`の場合、リソースへのアクセスを許可するには、具体的なルールを使用する必要があります([`directories`](#parameter-directories-for-apachevhost)パラメータを用いたディレクトリブロックなどで)。
+
+ブーリアン。
+
+デフォルト値: `false`。
+
+##### `vhost_dir`
+
+バーチャルホストの設定ファイルの保存場所を変更します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: `/etc/apache2/sites-available`
+- **FreeBSD**: `/usr/local/etc/apache22/Vhosts`
+- **Gentoo**: `/etc/apache2/vhosts.d`
+- **Red Hat**: `/etc/httpd/conf.d`
+
+##### `vhost_include_pattern`
+
+`vhost_dir`に含まれるファイルのパターンを定義します。
+
+`[^.#]\*.conf[^~]`などの値に設定すると、このディレクトリで偶発的に作成されたファイル(バージョン管理システムやエディタのバックアップにより作成されたファイルなど)がサーバ設定に*含まれなく*なります。
+
+デフォルト: '*'、また、このモジュールの過去のバージョンのBC。
+
+一部のオペレーティングシステムでは、`*.conf`の値が使用されます。デフォルトでは、このモジュールは`.conf`で終わる設定ファイルを作成します。
+
+##### `user`
+
+Apacheがリクエストの応答に使用するユーザを変更します。Apacheの親プロセスは引き続きルートとして稼働しますが、子プロセスはこのパラメータで定義されたユーザとしてリソースにアクセスします。Puppetがこのユーザを管理しないようにするには、[`manage_user`][]パラメータを`false`に設定します。
+
+デフォルト値: [`apache::params`][]クラスにより設定されたユーザに依存します。これはオペレーティングシステムによって異なります。
+
+- **Debian**: 'www-data'
+- **FreeBSD**: 'www'
+- **Gentoo**および**Red Hat**: 'apache'
+
+Puppetがこのユーザを管理しないようにするには、[`manage_user`][]パラメータをfalseに設定します。
+
+##### `apache_name`
+
+インストールするApacheパッケージの名前。Red Hatのソフトウェアコレクションのパッケージなど、標準的ではないApacheパッケージを使用している場合は、デフォルト設定をオーバーライドする必要があるかもしれません。
+
+デフォルト値: [`apache::params`][]クラスにより設定されたユーザに依存します。これはオペレーティングシステムによって異なります。
+
+- **Debian**: 'apache2'
+- **FreeBSD**: 'apache24'
+- **Gentoo**: 'www-servers/apache'
+- **Red Hat**: 'httpd'
+
+##### `error_log`
+
+メインサーバインスタンスのエラーログファイルの名前。`/`、`|`、または`syslog`で始まる文字列の場合、フルパスが設定されます。それ以外の場合は、ファイル名の先頭に`$logroot`がつきます。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: 'error.log'
+- **FreeBSD**: 'httpd-error.log'
+- **Gentoo**: 'error.log'
+- **Red Hat**: 'error_log'
+- **Suse**: 'error.log'
+
+##### `scriptalias`
+
+グローバルスクリプトエイリアスに使用するディレクトリ。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: '/usr/lib/cgi-bin'
+- **FreeBSD**: '/usr/local/www/apache24/cgi-bin'
+- **Gentoo**: 'var/www/localhost/cgi-bin'
+- **Red Hat**: '/var/www/cgi-bin'
+- **Suse**: '/usr/lib/cgi-bin'
+
+##### `access_log_file`
+
+メインサーバインスタンスのアクセスログファイルの名前。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- **Debian**: 'error.log'
+- **FreeBSD**: 'httpd-access.log'
+- **Gentoo**: 'access.log'
+- **Red Hat**: 'access_log'
+- **Suse**: 'access.log'
+
+#### クラス: `apache::dev`
+
+Apache開発ライブラリをインストールします。
+
+デフォルト値: オペレーティングシステムによって異なります。使用するオペレーティングシステムに基づく、[`apache::params`][]クラスの[`dev_packages`][]パラメータ。
+
+- **Debian**: Ubuntu 13.10およびDebian 8では'libaprutil1-dev'、'libapr1-dev'、'apache2-dev'。その他のバージョンでは'apache2-prefork-dev'。
+- **FreeBSD**: `undef`; FreeBSDでは、`apache::dev`を宣言する前に`apache::package`または`apache`クラスを宣言する必要があります。
+- **Gentoo**: `undef`
+- **Red Hat**: 'httpd-devel'
+
+#### クラス: `apache::vhosts`
+
+[`apache::vhost`][]定義タイプを作成します。
+
+**パラメータ**:
+
+* `vhosts`: [`apache::vhost`][]定義タイプのパラメータを指定します。
+
+  値: [ハッシュ][]、キーは名前を表し、値は[`apache::vhost`][]定義タイプのパラメータの[ハッシュ][]を表します。
+
+  デフォルト値: '{}'。
+
+  > **注意**: すべてのバーチャルホストのパラメータのリストや[バーチャルホストの設定]については、[`apache::vhost`][]定義タイプのリファレンスを参照してください。
+
+  例えば、[名前ベースのバーチャルホスト][名前ベースのバーチャルホスト]のcustom_vhost_1を作成するには、`vhosts`パラメータを'{ "custom_vhost_1" => { "docroot" => "/var/www/custom_vhost_1", "port" => "81" }'に設定し、このクラスを宣言します。
+
+``` puppet
+class { 'apache::vhosts':
+  vhosts => {
+    'custom_vhost_1' => {
+      'docroot' => '/var/www/custom_vhost_1',
+      'port'    => '81',
+    },
+  },
+}
+```
+
+#### クラス: `apache::mod::<MODULE NAME>`
+
+指定した[Apacheモジュール][]を有効にします。Apacheモジュールを有効にして設定するには、このクラスを宣言します。
+
+例えば、アイコンなしで[`mod_alias`][]をインストールして有効にするには、`icons_options`パラメータをNone'に設定して[`apache::mod::alias`][]クラスを宣言します。
+
+``` puppet
+class { 'apache::mod::alias':
+  icons_options => 'None',
+}
+```
+
+以下のApacheモジュールにはサポートするクラスがあり、その多くは、パラメータ化された設定が可能です。[`apache::mod`][]定義タイプを使えば、他のApacheモジュールをインストールできます。
+
+* `actions`
+* `alias` ([`apache::mod::alias`][]参照)
+* `auth_basic`
+* `auth_cas`\* ([`apache::mod::auth_cas`][]参照)
+* `auth_mellon`\* ([`apache::mod::auth_mellon`][]参照)
+* `auth_kerb`
+* `authn_core`
+* `authn_dbd`\* ([`apache::mod::authn_dbd`][]参照)
+* `authn_file`
+* `authnz_ldap`\* ([`apache::mod::authnz_ldap`][]参照)
+* `authnz_pam`
+* `authz_default`
+* `authz_user`
+* `autoindex`
+* `cache`
+* `cgi`
+* `cgid`
+* `cluster` ([`apache::mod::cluster`][]参照)
+* `dav`
+* `dav_fs`
+* `dav_svn`\*
+* `dbd`
+* `deflate\`
+* `dev`
+* `dir`\*
+* `disk_cache` ([`apache::mod::disk_cache`][]参照)
+* `dumpio` ([`apache::mod::dumpio`][]参照)
+* `env`
+* `event` ([`apache::mod::event`][]参照)
+* `expires`
+* `ext_filter` ([`apache::mod::ext_filter`][]参照)
+* `fastcgi`
+* `fcgid`
+* `filter`
+* `geoip` ([`apache::mod::geoip`][]参照)
+* `headers`
+* `include`
+* `info`\*
+* `intercept_form_submit`
+* `itk`
+* `jk` ([`apache::mod::jk`]参照)
+* `ldap` ([`apache::mod::ldap`][]参照)
+* `lookup_identity`
+* `mime`
+* `mime_magic`\*
+* `negotiation`
+* `nss`\* ([`apache::mod::nss`][]参照)
+* `pagespeed` ([`apache::mod::pagespeed`][]参照)
+* `passenger`\* ([`apache::mod::passenger`][]参照)
+* `perl`
+* `peruser`
+* `php` ([`mpm_module`][]を`prefork`に設定する必要があります)
+* `prefork`\*
+* `proxy`\* ([`apache::mod::proxy`][]参照)
+* `proxy_ajp`
+* `proxy_balancer`\* ([`apache::mod::proxy_balancer`][]参照)
+* `proxy_balancer`
+* `proxy_html` ([`apache::mod::proxy_html`][]参照)
+* `proxy_http`
+* `python`
+* `reqtimeout`
+* `remoteip`\*
+* `rewrite`
+* `rpaf`\*
+* `setenvif`
+* `security`
+* `shib`\* ([`apache::mod::shib`]参照)
+* `speling`
+* `ssl`\* ([`apache::mod::ssl`][]参照)
+* `status`\* ([`apache::mod::status`][]参照)
+* `suphp`
+* `userdir`\* ([`apache::mod::userdir`][]参照)
+* `version`
+* `vhost_alias`
+* `worker`\*
+* `wsgi` ([`apache::mod::wsgi`][]参照)
+* `xsendfile`
+
+モジュールに付いている*のマークは、設定やモジュールを設定するためのパラメータが含まれるテンプレートがあることを示しています。ほとんどのApacheモジュールクラスパラメータにはデフォルト値があり、設定は必要ありません。 テンプレートのあるモジュールについては、Puppetでモジュールとともにテンプレートファイルがインストールされます。これらのテンプレートファイルは、モジュールが機能するために必要です。
+
+##### クラス: `apache::mod::alias`
+
+[`mod_alias`][]をインストールして管理します。
+
+**パラメータ**:
+
+* `icons_options`: Apache [`Options`]ディレクティブにより、アイコンディレクトリのディレクトリリスティングを無効にします。
+
+  デフォルト値: 'Indexes MultiViews'。
+
+* `icons_path`: `/icons/`エイリアスのローカルパスを設定します。
+
+  デフォルト値: オペレーティングシステムによって異なります。
+
+    * **Debian**: `/usr/share/apache2/icons`
+    * **FreeBSD**: `/usr/local/www/apache24/icons`
+    * **Gentoo**: `/var/www/icons`
+    * *Red Hat**: `/var/www/icons`、ただし、Apache 2.4は`/usr/share/httpd/icons`
+
+#### クラス: `apache::mod::disk_cache`
+
+Apache 2.2に[`mod_disk_cache`][]、またはApache 2.4に[`mod_cache_disk`][]をインストールして設定します。
+
+デフォルト値: Apacheバージョンとオペレーティングシステムによって異なります。
+
+- **Debian**: `/var/cache/apache2/mod_cache_disk`
+- **FreeBSD**: `/var/cache/mod_cache_disk`
+- **Red Hat、Apache 2.4**: `/var/cache/httpd/proxy`
+- **Red Hat、Apache 2.2**: `/var/cache/mod_proxy`
+
+キャッシュルートを指定するには、パスを文字列として`cache_root`パラメータに渡します。
+
+``` puppet
+class {'::apache::mod::disk_cache':
+  cache_root => '/path/to/cache',
+}
+```
+
+##### クラス: `apache::mod::diskio`
+
+[`mod_diskio`][]をインストールして設定します。
+
+```puppet
+class{'apache':
+  default_mods => `false`,
+  log_level    => 'dumpio:trace7',
+}
+class{'apache::mod::diskio':
+  disk_io_input  => 'On',
+  disk_io_output => 'Off',
+}
+```
+
+**パラメータ**:
+
+* `dump_io_input`: すべての入力データをエラーログにダンプします。
+
+  値: 'On'、'Off'。
+
+  デフォルト値: 'Off'。
+
+* `dump_io_output`: すべての出力データをエラーログにダンプします。
+
+  値: 'On'、'Off'。
+
+  デフォルト値: 'Off'。
+
+##### クラス: `apache::mod::event`
+
+[`mod_mpm_event`][]をインストールして管理します。同じサーバ上に、`apache::mod::event`と一緒に[`apache::mod::itk`][]、[`apache::mod::peruser`][]、[`apache::mod::prefork`][]、[`apache::mod::worker`][]を含めることはできません。
+
+**パラメータ**:
+
+* `listenbacklog`: モジュールの[`ListenBackLog`][]ディレクティブでペンディング接続キューの最大長を設定します。`false`に設定すると、このパラメータが削除されます。
+
+  デフォルト値: '511'。
+
+* `maxrequestworkers` (_Apache 2.3.12以前_: `maxclients`): モジュールの[`MaxRequestWorkers`][]ディレクティブで、Apacheが同時に処理できる接続の最大数を設定します。`false`に設定すると、このパラメータが削除されます。
+
+  デフォルト値: '150'。
+
+* `maxconnectionsperchild` (_Apache 2.3.8以前_: `maxrequestsperchild`): モジュールの[`MaxConnectionsPerChild`][]ディレクティブで、子サーバが稼働中に処理する接続の数を制限します。`false`に設定すると、このパラメータが削除されます。 
+
+  デフォルト値: '0'。
+
+* `maxsparethreads` and `minsparethreads`: [`MaxSpareThreads`][]および[`MinSpareThreads`][]ディレクティブで、待機スレッドの最大数と最小数を設定します。`false`に設定すると、このパラメータが削除されます。
+
+  デフォルト値: それぞれ'75'および'25'。
+
+* `serverlimit`: [`ServerLimit`][]ディレクティブで、プロセスの設定数を制限します。`false`に設定すると、このパラメータが削除されます。
+
+  デフォルト値: '25'。
+
+* `startservers`: モジュールの[`StartServers`][]ディレクティブで、起動時に作成される子サーバプロセスの数を設定します。`false`に設定すると、このパラメータが削除されます。
+
+  デフォルト値: '2'。
+
+* `threadlimit`: モジュールの[`ThreadLimit`][]ディレクティブで、イベントスレッドの数を制限します。`false`に設定すると、このパラメータが削除されます。 
+
+  デフォルト値: '64'。
+
+* `threadsperchild`: [`ThreadsPerChild`][]ディレクティブで、各子サーバにより作成されるスレッドの数を設定します。
+
+  デフォルト値: '25'。`false`に設定すると、このパラメータが削除されます。
+
+##### クラス: `apache::mod::auth_cas`
+
+[`mod_auth_cas`][]をインストールして管理します。パラメータの名前はApacheモジュールのディレクティブと共通です。
+
+`cas_login_url`および`cas_validate_url`パラメータは必須です。 その他のいくつかのパラメータのデフォルト値は`undef`です。
+
+> **注意**: auth_casモジュールは、EPELにより提供される依存関係パッケージがなければ、RH/CentOSで使用できません。 [https://github.com/Jasig/mod_auth_cas]()を参照してください。
+
+**パラメータ**:
+
+- `cas_attribute_prefix`: ヘッダを追加します。SAMLバリデーションが有効になっている場合には、このヘッダの値が属性値になります。
+
+  デフォルト値: CAS_。
+
+- `cas_attribute_delimiter`:`cas_attribute_prefix`により作成されたヘッダの属性値の区切り文字。
+
+  デフォルト値: ,。
+
+- `cas_authoritative`: オプションの認証ディレクティブを承認してバインドするかどうかを決定します。
+
+  デフォルト値: `undef`。
+
+- `cas_certificate_path`: `cas_login_url`および`cas_validate_url`のサーバについて、証明書認証局のX509証明書へのパスを設定します。
+
+  デフォルト値: `undef`。
+
+- `cas_cache_clean_interval`: キャッシュクリーニング時間の最小秒数を設定します。
+
+  デフォルト値: `undef`。
+
+- `cas_cookie_domain`: `Set-Cookie` HTTPヘッダの`Domain=`パラメータの値を設定します。 
+
+  デフォルト値: `undef`。
+
+- `cas_cookie_entropy`: セッション識別子を作成する際に使用するバイト数を設定します。
+
+  デフォルト値: `undef`。
+
+- `cas_cookie_http_only`: `mod_auth_cas`がクッキーを発行する際のオプションの`HttpOnly`フラグを設定します。
+
+  デフォルト値: `undef`。
+
+- `cas_cookie_path`: casクッキーセッションデータの保存場所。Webサーバユーザによる書き込みを可能にする必要があります。
+
+  デフォルト値: OSによって異なります。
+
+- `cas_cookie_path_mode`: `cas_cookie_path`のモード。
+
+  デフォルト値: '0750'。
+
+- `cas_debug`: モジュールのデバッギングモードを有効にするかどうかを決定します。
+
+  デフォルト値: 'Off'。
+
+- `cas_idle_timeout`: 待機タイムアウトの制限を秒数で設定します。
+
+  デフォルト値: `undef`。
+
+- `cas_login_url`: **必須**。ユーザがCASで保護されたリソースへのアクセスを試み、かつアクティブなセッションがない場合に、モジュールがユーザをリダイレクトする先のURLを設定します。
+
+- `cas_proxy_validate_url`: プロキシバリデーションを実施する際に使用するURL。
+
+  デフォルト値: `undef`。
+
+- `cas_root_proxied_as`: このApacheサーバへのアクセスがプロキシされた場合に、エンドユーザに表示されるURLを設定します。
+
+  デフォルト値: `undef`。
+
+- `cas_scrub_request_headers`: mod_auth_cas内で特別な意味を持つ可能性のあるインバウンドリクエストヘッダを削除します。
+
+- `cas_sso_enabled`: シングルサインアウトの実験的サポートを有効にします(POSTデータが壊れる可能性があります)。
+
+  デフォルト値: 'Off'。
+
+- `cas_timeout`: `mod_auth_cas`セッションのアクティブ状態を維持する時間(秒数)を制限します。
+
+  デフォルト値: `undef`。
+
+- `cas_validate_depth`: チェーンされた証明書バリデーションの深さを制限します。
+
+  デフォルト値: `undef`。
+
+- `cas_validate_saml`: SAMLに関するCASサーバからの解析応答。
+
+  デフォルト値: 'Off'。
+
+- `cas_validate_server`: CASサーバの証明書をバリデーションするかどうか(1.1 - RedHat 7では廃止予定)。
+
+  デフォルト値: `undef`。
+
+- `cas_validate_url`: **必須**。HTTPクエリ文字列でクライアントの提示するチケットをバリデーションする際に使用するURL。
+
+- `cas_version`: 従うべきCASプロトコルバージョン。値: '1'、'2'。
+
+  デフォルト値: '2'。
+
+- `suppress_warning`: RedHat上にいることを示す警告を表示しないようにします(`mod_auth_cas`パッケージは、現在はepel-testingレポジトリで使用できます)。
+
+  デフォルト値: `false`。
+
+##### クラス: `apache::mod::auth_mellon`
+
+[`mod_auth_mellon`][]をインストールして管理します。パラメータの名前はApacheモジュールのディレクティブと共通です。
+
+``` puppet
+class{ 'apache::mod::auth_mellon':
+  mellon_cache_size => 101,
+}
+```
+
+**パラメータ**:　
+
+* `mellon_cache_entry_size`: 1回のセッションの最大サイズ。
+
+  デフォルト値: `undef`。
+
+* `mellon_cache_size`: mellonキャッシュのサイズ、単位はメガバイト。
+
+  デフォルト値: 100。
+
+* `mellon_lock_file`: ロックファイルの場所。
+
+  デフォルト値: '`/run/mod_auth_mellon/lock`'。
+
+* `mellon_post_directory`: ポストリクエストが保存される場所のフルパス。
+
+  デフォルト値: '`/var/cache/apache2/mod_auth_mellon/`'。
+
+* `mellon_post_ttl`: ポストリクエストの維持時間。
+
+  デフォルト値: `undef`。
+
+* `mellon_post_size`: ポストリクエストの最大サイズ。
+
+  デフォルト値: `undef`。
+
+* `mellon_post_count`: ポストリクエストの最大数。
+
+ デフォルト値: `undef`。
+
+##### クラス: `apache::mod::authn_dbd`
+
+`mod_authn_dbd`をインストールし、`authn_dbd.conf.erb`テンプレートを使用して設定を生成します。オプションで、AuthnProviderAliasを作成します。
+
+``` puppet
+class { 'apache::mod::authn_dbd':
+  $authn_dbd_params =>
+    'host=db01 port=3306 user=apache password=xxxxxx dbname=apacheauth',
+  $authn_dbd_query  => 'SELECT password FROM authn WHERE user = %s',
+  $authn_dbd_alias  => 'db_auth',
+}
+```
+
+**パラメータ**:　
+
+* `authn_dbd_alias`: AuthnProviderAlias'の名前。
+
+* `authn_dbd_dbdriver`: 使用するデータベースドライブを指定します。
+
+  デフォルト値: 'mysql'。
+
+* `authn_dbd_exptime`: DBDExptimeに相当します。
+
+  デフォルト値: 300。
+
+* `authn_dbd_keep`: DBDKeepに相当します。
+
+  デフォルト値: 8。
+
+* `authn_dbd_max`: DBDMaxに相当します。
+
+  デフォルト値: 20。
+
+* `authn_dbd_min`: DBDMinに相当します。
+
+  デフォルト値: 4。
+
+* `authn_dbd_params`: **必須**。接続文字列に関して、DBDParamsに相当します。
+
+* `authn_dbd_query`: 認証に関してユーザとパスワードを問い合わせるかどうか。
+
+##### クラス: `apache::mod::authnz_ldap`
+
+`mod_authnz_ldap`をインストールし、`authnz_ldap.conf.erb`テンプレートを使用して設定を生成します。
+
+**パラメータ**:　
+
+* `package_name`: パッケージの名前。
+
+  デフォルト値: `undef`。
+
+* `verify_server_cert`: サーバの証明書を確認するかどうか。
+
+  デフォルト値: `undef`。
+
+##### クラス: `apache::mod::cluster`
+
+**注意**: `mod_cluster`に関して提供されている公式なパッケージはありません。そのため、Apacheモジュールの外部から使用できるようにする必要があります。バイナリはhttp://mod-cluster.jboss.org/にあります。
+
+``` puppet
+class { '::apache::mod::cluster':
+  ip                      => '172.17.0.1',
+  allowed_network         => '172.17.0.',
+  balancer_name           => 'mycluster',
+  version                 => '1.3.1'
+}
+```
+
+**パラメータ**:　
+
+* `port`: mod_clusterのリッスンポート。
+
+  デフォルト値: '6666'。
+
+* `server_advertise`: サーバをアドバタイズするかどうか。
+
+  デフォルト値: `true`。
+
+* `advertise_frequency`: アドバタイズメッセージ間のインターバルを秒数[.ミリ秒]で設定します。
+
+  デフォルト値: 10。
+
+* `manager_allowed_network`: ネットワークにmod_cluster_managerへのアクセスを許可するかどうか。
+
+  デフォルト値: '127.0.0.1'。
+
+* `keep_alive_timeout`: Apacheがリクエストを待機する長さを秒数で指定します。
+
+  デフォルト値: 60。
+
+* `max_keep_alive_requests`: 維持されるリクエストの最大数。
+
+  デフォルト値: 0。
+
+* `enable_mcpm_receive`: MCPMを有効にするかどうか。 
+
+  デフォルト値: `true`。
+
+* `ip`: リッスンするIPアドレスを指定します。
+
+* `allowed_network`: バランスドメンバーネットワーク。
+
+* `version`: `mod_cluster`バージョンを指定します。httpd 2.4ではバージョン1.3.0以上が必要です。
+
+##### クラス: `apache::mod::deflate`
+
+[`mod_deflate`][]をインストールして設定します。
+
+**パラメータ**:　
+
+* `types`: デフレートする[MIMEタイプ][MIME `content*type`]の[配列][]。 
+
+  デフォルト値: [ 'text/html text/plain text/xml'、'text/css'、'application/x*javascript application/javascript application/ecmascript'、'application/rss+xml'、'application/json' ]。
+
+* `notes`: [ハッシュ][]、キーはタイプを表し、値はノート名を表します。
+
+  デフォルト値: { 'Input'  => 'instream'、'Output' => 'outstream'、'Ratio'  => 'ratio' }。
+
+##### クラス: `apache::mod::expires`
+
+[`mod_expires`][]をインストールし、`expires.conf.erb`を使用して設定を生成します。
+
+**パラメータ**:　
+
+* `expires_active`: ドキュメント領域に関して`Expires`ヘッダの生成を有効にします。
+
+  ブーリアン。
+
+  デフォルト値: `true`。
+
+* `expires_default`: [`ExpiresByType`][]構文または[インターバル構文][]を用いた有効期限計算のためのデフォルトアルゴリズムを指定します。
+
+  デフォルト値: `undef`。
+
+* `expires_by_type`: [MIME `content*type`][]とその有効時間のセットを記述します。
+
+  値: [ハッシュ][ハッシュ]の[配列][]、各ハッシュのキーは有効なMIME `content*type` ('text/json'など)、値は以下の有効な [インターバル構文][]。
+
+  デフォルト値: `undef`。
+
+##### クラス: `apache::mod::ext_filter`
+
+[`mod_ext_filter`][]をインストールして設定します。
+
+``` puppet
+class { 'apache::mod::ext_filter':
+  ext_filter_define => {
+    'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
+    'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
+  },
+}
+```
+
+**パラメータ**:　
+
+* `ext_filter_define`: フィルタ名とそのパラメータのハッシュ。
+
+  デフォルト値: `undef`。
+
+##### クラス: `apache::mod::fcgid`
+
+[`mod_fcgid`][]をインストールして設定します。
+
+このクラスでは、使用可能なすべてのオプションを個別にパラメータ化するのではなく、`options` [ハッシュ][]を使って`mod_fcgid`を設定します。例:
+
+``` puppet
+class { 'apache::mod::fcgid':
+  options => {
+    'FcgidIPCDir'  => '/var/run/fcgidsock',
+    'SharememPath' => '/var/run/fcgid_shm',
+    'AddHandler'   => 'fcgid-script .fcgi',
+  },
+}
+```
+
+すべてのオプションのリストについては、[公式`mod_fcgid`ドキュメント][`mod_fcgid`]を参照してください。
+
+`apache::mod::fcgid`を含める場合は、ディレクトリごと、バーチャルホストごとに[`FcgidWrapper`][]を設定できます。最初にモジュールをロードする必要があります。`apache::vhost`で`fcgiwrapper`パラメータを設定している場合、Puppetは自動的にはモジュールを有効化しません。
+
+``` puppet
+include apache::mod::fcgid
+
+apache::vhost { 'example.org':
+  docroot     => '/var/www/html',
+  directories => {
+    path        => '/var/www/html',
+    fcgiwrapper => {
+      command => '/usr/local/bin/fcgiwrapper',
+    }
+  },
+}
+```
+
+##### クラス: `apache::mod::geoip`
+
+[`mod_geoip`][]をインストールして管理します。
+
+**パラメータ**:　
+
+* `db_file`: GeoIPデータベースファイルのパスを設定します。
+
+  値: パス、または複数のGeoIPデータベースファイルの[配列][]パス。
+
+  デフォルト値: `/usr/share/GeoIP/GeoIP.dat`。
+
+* `enable`: [`mod_geoip`][]を全体で有効にするかどうかを決定します。
+
+  ブーリアン。
+
+  デフォルト値: `false`。　
+
+* `flag`: GeoIPフラグを設定します。
+
+  値: 'CheckCache'、'IndexCache'、'MemoryCache'、'Standard'。
+
+  デフォルト値: 'Standard'。
+
+* `output`: 使用するアウトプット変数を定義します。
+
+  値: 'All'、'Env'、'Request'、'Notes'。
+
+  デフォルト値: 'All'。
+
+* `enable_utf8`: アウトプットをISO*8859*1 (ラテン*1)からUTF*8に変更します。
+
+  ブーリアン。
+
+  デフォルト値: `undef`。
+
+* `scan_proxy_headers`: [GeoIPScanProxyHeaders][]オプションを有効にします。
+
+  ブーリアン。
+
+  デフォルト値: `undef`。
+
+* `scan_proxy_header_field`: クライアントのIPアドレスの決定に使用するヘッダの[`mod_geoip`][]を指定します。
+
+  デフォルト値: `undef`。
+
+* `use_last_xforwarededfor_ip` (sic): IPアドレスのカンマ区切りリストで見つかったクライアントのIPの最初または最後のIPアドレスを使うかどうかを決定します。
+
+  ブーリアン。
+
+  デフォルト値: `undef`。
+
+##### クラス: `apache::mod::info`
+
+サーバ設定の全体的な概要を提供する[`mod_info`][]をインストールして管理します。
+
+**パラメータ**:　
+
+* `allow_from`: IPv4またはIPv6アドレスのホワイトリスト、または`/server*info`にアクセスできる範囲。
+
+  値: IPv4アドレス、IPv6アドレス、または範囲の1つまたは複数のオクテット、またはいずれかの配列。
+
+  デフォルト値: ['127.0.0.1','::1']。
+
+* `apache_version`: 文字列で表されるApacheのバージョン番号、'2.2'や'2.4'など。
+
+  デフォルト値: [`$::apache::apache_version`][`apache_version`]の値。
+
+
+* `restrict_access`: アクセス制限を有効にするかどうかを決定します。`false`の場合、`allow_from`ホワイトリストは無視され、すべてのIPアドレスが `/server*info`にアクセスできるようになります。
+
+  ブーリアン。
+
+  デフォルト値: `true`。
+
+##### クラス: `apache::mod::jk`
+
+`mod_jk`をインストールして管理します。これは、Apache httpdリダイレクションと古いバージョンのTomCatおよびJBossを結ぶコネクタです。
+
+**注意**: mod\_jkに関して提供されている公式のパッケージはありません。そのため、apacheモジュールの制御以外の手段で使用できるようにする必要があります。バイナリは[Apache Tomcatコネクタダウンロードページ](https://tomcat.apache.org/download-connectors.cgi)にあります。
+
+``` puppet
+class { '::apache::mod::jk':
+  workers_file = 'conf/workers.properties',
+  mount_file   = 'conf/uriworkermap.properties',
+  shm_file     = 'run/jk.shm',
+  shm_size     = '50M',
+  $workers_file_content = {
+    <Content>
+  },
+}
+```
+
+**`apache::mod::jk`**内のパラメータ:
+
+`mod_jk`パラメータを理解するための情報源としては、[公式ドキュメント](https://tomcat.apache.org/connectors-doc/reference/apache.html)が最適です。ただし、\*file_contentはこれに含まれません。
+
+**workers\_file\_content**
+
+各ディレクティブにはフォーマット`worker.<Worker name>.<Property>=<Value>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは各ワーカーのプロパティと値を指定します。
+また、2つのグローバルディレクティブ 'worker.list'および'worker.mantain'もあります。  
+例えば、ワーカーファイルは以下のようになります。
+
+```
+worker.list = status
+worker.list = some_name,other_name
+
+worker.mantain = 60
+
+# Optional comment
+worker.some_name.type=ajp13
+worker.some_name.socket_keepalive=true
+
+# I just like comments
+worker.other_name.type=ajp12 (why would you?)
+worker.other_name.socket_keepalive=false
+```
+
+以下のようにパラメータ化する必要があります。
+
+```
+$workers_file_content = {
+  worker_lists   => ['status', 'some_name,other_name'],
+  worker_mantain => '60',
+  some_name      => {
+    comment          => 'Optional comment',
+    type             => 'ajp13',
+    socket_keepalive => 'true',
+  },
+  other_name     => {
+    comment          => 'I just like comments',
+    type             => 'ajp12',
+    socket_keepalive => 'false',
+  },
+}
+```
+
+**mount\_file\_content**
+
+各ディレクティブにはフォーマット`<URI> = <Worker name>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは次の2つのアイテムを含みます: uri_list - ワーカーにマップするURIを用いた配列 - およびコメント - ワーカーに関するコメントを記したオプションの文字列。 
+例えば、マウントファイルは以下のようになります。
+
+```
+# Worker 1
+/context_1/ = worker_1
+/context_1/* = worker_1
+
+# Worker 2
+/ = worker_2
+/context_2/ = worker_2
+/context_2/* = worker_2
+```
+
+以下のようにパラメータ化する必要があります。　
+
+```
+$mount_file_content = {
+  worker_1 => {
+    uri_list => ['/context_1/', '/context_1/*'],
+    comment  => 'Worker 1',
+  },
+  worker_2 => {
+    uri_list => ['/context_2/', '/context_2/*'],
+    comment  => 'Worker 2',
+  },
+},
+```
+
+##### クラス: `apache::mod::passenger`
+
+[`mod_passenger`][]をインストールして管理します。Red Hatベースのシステムの場合は、[passengerドキュメント](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux)に記載された最小要件を満たしていることを確認してください。
+
+**パラメータ**:　
+
+* `passenger_high_performance`: [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance)を設定します。
+
+  値: 'On'、'Off'。　
+
+  デフォルト値: `undef`。
+
+* `passenger_pool_idle_time`: [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime)を設定します。
+
+  デフォルト値: `undef`。
+
+* `passenger_max_pool_size`: [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize)を設定します。
+
+  デフォルト値: `undef`。
+
+* `passenger_max_request_queue_size`: [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize)を設定します。
+
+  デフォルト値: `undef`。
+
+* `passenger_max_requests`: [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests)を設定します。
+
+  デフォルト値: `undef`。
+
+* `passenger_data_buffer_dir`: [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir)を設定します。
+
+  デフォルト値: `undef`。
+
+##### クラス: `apache::mod::ldap`
+
+[`mod_ldap`][]をインストールして設定し、[`LDAPTrustedGlobalCert`](https://httpd.apache.org/docs/current/mod/mod_ldap.html#ldaptrustedglobalcert)ディレクティブの修正を可能にします。
+
+``` puppet
+class { 'apache::mod::ldap':
+  ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
+  ldap_trusted_global_cert_type => 'CA_DER',
+  ldap_shared_cache_size        => '500000',
+  ldap_cache_entries            => '1024',
+  ldap_cache_ttl                => '600',
+  ldap_opcache_entries          => '1024',
+  ldap_opcache_ttl              => '600',
+}
+```
+
+**パラメータ**　
+
+* `apache_version`: インストールされたApacheバージョンを指定します。
+
+  デフォルト値: `undef`。
+
+* `ldap_trusted_global_cert_file`: LDAPサーバ上でSSLまたはTLS接続を確立する際に使用する、信頼できるCA証明書のパスとファイル名を指定します。
+
+* `ldap_trusted_global_cert_type`:グローバルな信頼できる証明書フォーマットを指定します。
+
+  デフォルト値: 'CA_BASE64'。
+
+* `ldap_shared_cache_size`: 共有されたメモリのキャッシュのサイズをバイトで指定します。
+
+* `ldap_cache_entries`: 一次LDAPキャッシュのエントリの最大数を指定します。
+
+* `ldap_cache_ttl`: キャッシュされたアイテムが有効に保たれる時間を秒数で指定します。
+
+* `ldap_opcache_entries`: LDAP比較演算のキャッシュに用いるエントリ数を指定します。
+
+* `ldap_opcache_ttl`: 演算キャッシュのエントリが有効に保たれる時間を秒数で指定します。
+
+* `package_name`: カスタムパッケージ名を指定します。
+
+  デフォルト値: `undef`。
+
+##### クラス: `apache::mod::negotiation`
+
+[`mod_negotiation`][]をインストールして設定します。
+
+**パラメータ**:　
+
+* `force_language_priority`: `ForceLanguagePriority`オプションを設定します。
+
+  値: 文字列。
+
+  デフォルト値: `Prefer Fallback`。
+
+* `language_priority`: モジュールの`LanguagePriority`オプションを設定するための言語の[配列][]。
+
+  デフォルト値: [ 'en'、'ca'、'cs'、'da'、'de'、'el'、'eo'、'es'、'et'、'fr'、'he'、'hr'、'it'、'ja'、'ko'、'ltz'、'nl'、'nn'、'no'、'pl'、'pt'、'pt*BR'、'ru'、'sv'、'zh*CN'、'zh*TW' ]。
+
+##### クラス: `apache::mod::nss`
+
+NSS暗号化ライブラリを使用するApacheのSSLプロバイダ。
+
+**パラメータ:**
+
+- `transfer_log`: access.logのパス。
+- `error_log`: error.logのパス。
+- `passwd_file`: NSSPassPhraseDialogディレクティブに使用するファイルのパス。
+- `port`: SSLポート。デフォルト値8443。
+
+##### クラス: `apache::mod::pagespeed`
+
+[`mod_pagespeed`][]をインストールして管理します。これは、Webページをリライトして冗長性と帯域を軽減するためのGoogleモジュールです。
+
+このapacheモジュールには`mod-pagespeed-stable`が必要ですが、Puppetはパッケージを自動的にインストールするために必要なソフトウェアを管理**しません**。パッケージがインストールされていないか、お使いのパッケージマネージャで使用できない場合にこのクラスを宣言すると、Puppet実行は失敗します。
+
+> **注意:** お使いのシステムが最新のGoogle Pagespeed要件を満たしていることを確認してください。
+
+**パラメータ**:　
+
+以下のパラメータはモジュールのディレクティブに相当します。詳細については、[モジュールのドキュメント][`mod_pagespeed`]を参照してください。
+
+* `inherit_vhost_config`: デフォルト値: 'on'。
+* `filter_xhtml`: デフォルト値: `false`。
+* `cache_path`: デフォルト値: '/var/cache/mod_pagespeed/'。
+* `log_dir`: デフォルト値: '/var/log/pagespeed'。
+* `memcache_servers`: デフォルト値: []。
+* `rewrite_level`: デフォルト値: 'CoreFilters'。
+* `disable_filters`: デフォルト値: []。
+* `enable_filters`: デフォルト値: []。
+* `forbid_filters`: デフォルト値: []。
+* `rewrite_deadline_per_flush_ms`: デフォルト値: 10。
+* `additional_domains`: デフォルト値: `undef`。
+* `file_cache_size_kb`: デフォルト値: 102400。
+* `file_cache_clean_interval_ms`: デフォルト値: 3600000。
+* `lru_cache_per_process`: デフォルト値: 1024。
+* `lru_cache_byte_limit`: デフォルト値: 16384。
+* `css_flatten_max_bytes`: デフォルト値: 2048。
+* `css_inline_max_bytes`: デフォルト値: 2048。
+* `css_image_inline_max_bytes`: デフォルト値: 2048。
+* `image_inline_max_bytes`: デフォルト値: 2048。
+* `js_inline_max_bytes`: デフォルト値: 2048。
+* `css_outline_min_bytes`: デフォルト値: 3000。
+* `js_outline_min_bytes`: デフォルト値: 3000。
+* `inode_limit`: デフォルト値: 500000。
+* `image_max_rewrites_at_once`: デフォルト値: 8。
+* `num_rewrite_threads`: デフォルト値: 4。
+* `num_expensive_rewrite_threads`: デフォルト値: 4。
+* `collect_statistics`: デフォルト値: 'on'。
+* `statistics_logging`: デフォルト値: 'on'。
+* `allow_view_stats`: デフォルト値: []。
+* `allow_pagespeed_console`: デフォルト値: []。
+* `allow_pagespeed_message`: デフォルト値: []。
+* `message_buffer_size`: デフォルト値: 100000。
+* `additional_configuration`: ディレクティブ値ペアのハッシュ、またはpagespeed設定の最後に挿入する行の配列。デフォルト値: '{ }'。
+
+##### クラス: `apache::mod::passenger`　
+
+`mod_passenger`をインストールして設定します。
+
+>**注意**: passengerモジュールは、EPELにより提供される依存関係パッケージと`mod_passengers`カスタムリポジトリがなければ、RH/CentOSでは使用できません。前述の`manage_repo`パラメータと[https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()を参照してください。
+
+**パラメータ**: [TODO: パラメータがリスト化されていなかったため(`manage_repo`は除く)、マニフェストから引き出しました。これらのパラメータの機能と可能な値、または(前述のmod_pagespeedによる)パラメータマッピングに関する外部ドキュメントを示すリンクを知る必要があります。<!--MODULES-4745も参照-->]
+
+* `passenger_conf_file`: `$::apache::params::passenger_conf_file`
+* `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file`
+* `passenger_high_performance`: デフォルト値: `undef`
+* `passenger_pool_idle_time`: デフォルト値: `undef`
+* `passenger_max_request_queue_size`: デフォルト値: `undef`
+* `passenger_max_requests`: デフォルト値: `undef`
+* `passenger_spawn_method`: デフォルト値: `undef`
+* `passenger_stat_throttle_rate`: デフォルト値: `undef`
+* `rack_autodetect`: デフォルト値: `undef`
+* `rails_autodetect`: デフォルト値: `undef`
+* `passenger_root` : `$::apache::params::passenger_root`
+* `passenger_ruby` : `$::apache::params::passenger_ruby`
+* `passenger_default_ruby`: `$::apache::params::passenger_default_ruby`
+* `passenger_max_pool_size`: デフォルト値: `undef`
+* `passenger_min_instances`: デフォルト値: `undef`
+* `passenger_max_instances_per_app`: デフォルト値: `undef`
+* `passenger_use_global_queue`: デフォルト値: `undef`
+* `passenger_app_env`: デフォルト値: `undef`
+* `passenger_log_file`: デフォルト値: `undef`
+* `passenger_log_level`: デフォルト値: `undef`
+* `passenger_data_buffer_dir`: デフォルト値: `undef`
+* `manage_repo`: phusionpassenger.comリポジトリを管理するかどうか。デフォルト値: `true`
+* `mod_package`: デフォルト値: `undef`
+* `mod_package_ensure`: デフォルト値: `undef`
+* `mod_lib`: デフォルト値: `undef`
+* `mod_lib_path`: デフォルト値: `undef`
+* `mod_id`: デフォルト値: `undef`
+* `mod_path`: デフォルト値: `undef`
+
+##### クラス: `apache::mod::proxy`
+
+I`mod_proxy`をインストールし、`proxy.conf.erb`テンプレートを使用して設定を生成します。
+
+**`apache::mod::proxy`内のパラメータ**:
+
+.
+
+- `allow_from`: デフォルト値: `undef`
+- `apache_version`: デフォルト値: `undef`
+- `package_name`: デフォルト値: `undef`
+- `proxy_requests`: デフォルト値: 'Off'
+- `proxy_via`: デフォルト値: 'On'
+
+##### クラス: `apache::mod::proxy_balancer`
+
+ロードバランシングを提供する[`mod_proxy_balancer`][]をインストールして管理します。
+
+**パラメータ**:　
+
+* `manager`: バランサマネージャのサポートを有効にするかどうかを決定します。
+
+  デフォルト値: `false`。
+
+* `manager_path`: バランサマネージャのサーバロケーション。
+
+  デフォルト値: '/balancer*manager'。
+
+* `allow_from`: `/balancer*manager`にアクセスできるIPv4またはIPv6アドレスの[配列][]。
+
+  デフォルト値: ['127.0.0.1','::1']。　
+
+* `apache_version`: 文字列で表されるApacheのバージョン番号、'2.2'や'2.4'など。　
+
+  デフォルト値: [`$::apache::apache_version`][`apache_version`]の値。Apache 2.4以上では、`mod_slotmem_shm`がロードされます。
+
+##### クラス: `apache::mod::php`
+
+[`mod_php`][]をインストールして設定します。
+
+**パラメータ**:　
+
+以下のパラメータのデフォルト値は、オペレーティングシステムによって異なります。このクラスのパラメータのほとんどは、`mod_php`ディレクティブに相当します。詳細については、[モジュールのドキュメント][`mod_php`]を参照してください。
+
+* `package_name`: `mod_php`をインストールするパッケージの名前。
+* `path`: `mod_php`共有オブジェクト(`.so`)ファイルのパスを定義します。
+* `source`: デフォルト設定のパスを定義します。値には`puppet:///`パスが含まれます。
+* `template`: Puppetが設定ファイルの生成に使用する`php.conf`テンプレートのパスを定義します。
+* `content`: `php.conf`に任意のコンテンツを追加します。
+
+##### クラス: `apache::mod::proxy_html`
+
+**注意**: `mod_proxy_html`に関して提供されている公式なパッケージはありません。そのため、apacheモジュールの外部から使用できるようにする必要があります。
+
+##### クラス: `apache::mod::reqtimeout`
+
+[`mod_reqtimeout`][]をインストールして設定します。
+
+**パラメータ**　
+
+* `timeouts`: [`RequestReadTimeout`][]オプションを設定します。
+
+  値:  文字列または[配列][]。
+
+  デフォルト値: ['header=20-40,MinRate=500', 'body=20,MinRate=500']。
+
+##### クラス: `apache::mod::rewrite`
+
+Apacheモジュール`mod_rewrite`をインストールして有効にします。
+
+##### クラス: `apache::mod::shib`
+
+[Shibboleth](http://shibboleth.net/) Apacheモジュール`mod_shib`をインストールします。このモジュールは、Shibboleth認証プロバイダおよびShibboleth FederationsによるSAML2シングルサインオン(SSO)認証を有効にするものです。このクラスを定義すると、`apache::vhost`インスタンス内でShibboleth固有のパラメータが有効になります。
+
+このクラスでインストールおよび設定されるのは、Shibboleth SSO認証をコンシュームするWebアプリケーションのApacheコンポーネントのみです。PuppetでShibboleth設定を手動で管理することも、[Shibboleth Puppetモジュール](https://github.com/aethylred/puppet-shibboleth)を使用することもできます。
+
+**注意**: shibbolethモジュールは、Shibbolethのリポジトリにより提供される依存関係パッケージがなければ、RH/CentOSでは使用できません。[http://wiki.aaf.edu.au/tech-info/sp-install-guide]()を参照してください。
+
+##### クラス: `apache::mod::ssl`
+
+[Apache SSL機能][`mod_ssl`]をインストールし、`ssl.conf.erb`テンプレートを使用して設定を生成します。ほとんどのオペレーティングシステムでは、この`ssl.conf`はモジュール設定ディレクトリに置かれています。Red Hatベースのオペレーティングシステムでは、このファイルは`/etc/httpd/conf.d`にあります。これは、RPMが設定を保存するのと同じロケーションです。
+
+バーチャルホストでSSLを使用するには、`::apache`の[`default_ssl_vhost`][]パラメータを`true`に設定する**か**、[`apache::vhost`][]の[`ssl`][]パラメータを`true`に設定する必要があります。
+
+- `ssl_cipher`: デフォルト値: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'
+- `ssl_compression`: デフォルト値: false
+- `ssl_cryptodevice`: デフォルト値: 'builtin'
+- `ssl_honorcipherorder`: デフォルト値: true
+- `ssl_openssl_conf_cmd`: デフォルト値: undef
+- `ssl_options`: デフォルト値: [ 'StdEnvVars' ]
+- `ssl_pass_phrase_dialog`: デフォルト値: 'builtin'
+- `ssl_protocol`: デフォルト値: [ 'all', '-SSLv2', '-SSLv3' ]
+- `ssl_proxy_protocol`: デフォルト値: []
+- `ssl_random_seed_bytes`: 有効なオプション: 文字列、デフォルト値: '512'
+- `ssl_sessioncache`: 有効なオプション: 文字列。デフォルト値: '300'
+- `ssl_sessioncachetimeout`: 有効なオプション: 文字列。デフォルト値: '300'
+- `ssl_mutex`: デフォルト値: OSによって異なります。有効なオプション: [mod_ssl][mod_ssl]ドキュメントを参照
+  - RedHat/FreeBSD/Suse/Gentoo: 'default'
+  - Debian/Ubuntu + Apache >= 2.4: 'default'
+  - Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'
+**パラメータ:
+
+* `ssl_cipher`
+
+  デフォルト値: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'
+
+* `ssl_compression`
+
+  デフォルト値: `false`
+
+* `ssl_cryptodevice`
+
+  デフォルト値: 'builtin'
+
+* `ssl_honorcipherorder`
+
+  デフォルト値: `true`
+
+* `ssl_openssl_conf_cmd`
+
+  デフォルト値: `undef`
+
+* `ssl_options`
+
+  デフォルト値: [ 'StdEnvVars' ]
+
+* `ssl_pass_phrase_dialog`
+
+  デフォルト値: 'builtin'　
+
+* `ssl_protocol`
+
+  デフォルト値: [ 'all', '*SSLv2', '*SSLv3' ]
+
+* `ssl_random_seed_bytes`
+
+  値: 文字列。
+
+  デフォルト値: '512'
+
+* `ssl_sessioncachetimeout`
+
+  値: 文字列。
+
+  デフォルト値: '300'
+
+* `ssl_mutex`:
+
+  値: [mod_ssl][mod_ssl]ドキュメントを参照。
+
+  デフォルト値: OSによって異なります:
+
+  * RedHat/FreeBSD/Suse/Gentoo: 'default'.
+  * Debian/Ubuntu + Apache >= 2.4: 'default'.
+  * Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'.
+  * Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
+
+
+##### クラス: `apache::mod::status`
+
+[`mod_status`][]をインストールし、`status.conf.erb`テンプレートを使用して設定を生成します。
+
+**パラメータ**:　
+
+* `allow_from`: `/server-status`にアクセスできるIPv4またはIPv6アドレスの[配列][]。
+
+  デフォルト値: ['127.0.0.1','::1']。
+* `extended_status`: [`ExtendedStatus`][]ディレクティブをつうじて、各リクエストに関する拡張ステータス情報を追跡するかどうかを決定します。
+
+  値: 'Off'、'On'。
+
+  デフォルト値: 'On'。
+
+* `status_path`: ステータスページのサーバロケーション。
+
+  デフォルト値: '/server-status'。
+
+##### クラス: `apache::mod::userdir`
+
+`http://example.com/~user/`構文を用いて、ユーザ指定のディレクトリにアクセスできるようにします。すべてのパラメータは、[公式のApacheドキュメント](https://httpd.apache.org/docs/2.4/mod/mod_userdir.html)で見られます。
+
+**パラメータ**:　
+
+* `overrides`: ディレクティブタイプの[配列][]。
+
+  デフォルト値: '[ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]'。
+
+##### クラス: `apache::mod::version`
+
+多くのオペレーティングシステムおよびApache構成上で[`mod_version`][]をインストールします。
+
+Apache 2.4を使用するDebianおよびUbuntuが`apache::mod::version`で分類された場合は、`mod_version`がビルトインされているためロードできない旨の警告をPuppetが表示します。
+
+##### クラス: `apache::mod::security`
+
+Trustwaveの[`mod_security`][]をインストールして設定します。これはすべてのバーチャルホストでデフォルトで有効化され、実行されます。
+
+**パラメータ**:　
+
+* `activated_rules`: `modsec_crs_path`のルールの[配列][]またはsymlinkを使用してアクティベートする絶対値。 
+* `allowed_methods`: 許可されるHTTPメソッドのスペース*区切りリスト。
+
+  デフォルト値: 'GET HEAD POST OPTIONS'。
+
+* `content_types`: 1つまたは複数の許可される[MIMEタイプ][MIME `content*type`]のリスト。
+
+  デフォルト値: 'application/x*www*form*urlencoded|multipart/form*data|text/xml|application/xml|application/x*amf'。
+
+* `crs_package`: CRSルールをインストールするパッケージの名前。
+
+  デフォルト値: [`apache::params`][]内の`modsec_crs_package`。
+
+* `manage_security_crs`: security_crs.confルールファイルを管理します。
+
+  デフォルト値: `true`。
+
+* `modsec_dir`: Puppetがmodsec設定およびアクティベートされたルールリンクをインストールする場所のパスを定義します。 
+
+  デフォルト値: 'On'、[`apache::params`][]の`modsec_dir`により設定。
+${modsec\_dir}/activated\_rules。
+
+* `modsec_secruleengine`: modsecルールエンジンを設定します。値: 'On'、'Off'、'DetectionOnly'。
+
+  デフォルト値: [`apache::params`][]の`modsec_secruleengine`。
+
+* `restricted_extensions`: 禁止されるファイル拡張子のスペース*区切りリスト。
+
+  デフォルト値: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'。
+
+* `restricted_headers`: 禁止されるヘッダのスラッシュおよびスペースで区切ったリスト。
+
+  デフォルト値: 'Proxy*Connection/ /Lock*Token/ /Content*Range/ /Translate/ /via/ /if/'。
+
+* `secdefaultaction`: OWASP ModSecurityコアルールセットに関して、動作モード、自己完結('deny')、コラボレーティブ検出('pass')を設定します。
+
+  デフォルト値: 'deny'。"log,auditlog,deny,status:406,tag:'SLA 24/7'"などの完全な値を設定することもできます。
+
+* `secpcrematchlimit`: PCREライブラリのマッチ限度数を設定します。
+
+  デフォルト値: 1500。
+
+* `secpcrematchlimitrecursion`: PCREライブラリのマッチ再帰制限数を設定します。
+
+  デフォルト値: 1500。　
+
+* `logroot`: オーディットおよびデバッグログの場所を設定します。
+
+  デフォルト値はApacheのログディレクトリ(Redhat: `/var/log/httpd`、Debian: `/var/log/apache2`)。
+
+* `audit_log_releavant_status`: オーディットロギングの目的に関して、考慮すべき応答ステータスコードを設定します。
+
+  デフォルト値: '^(?:5|4(?!04))'。
+
+* `audit_log_parts`: [オーディットログ][]に入れるべきセクションを設定します。
+
+  デフォルト値: 'ABIJDEFHZ'。
+
+* `anomaly_score_blocking`: OWASP ModSecurityコアルールセットのコラボレーティブ検出ブロッキングをアクティベートまたはディアクティベートします。
+
+  デフォルト値: 'off'。
+
+* `inbound_anomaly_threshold`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、インバウンドブロッキングルールのスコアリング閾値レベルを設定します。
+
+  デフォルト値: 5。
+
+* `outbound_anomaly_threshold`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、アウトバウンドブロッキングルールのスコアリング閾値レベルを設定します。
+
+  デフォルト値: 4。　
+
+* `critical_anomaly_score`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、重要なセキュリティレベルのスコアリングポイントを設定します。
+
+  デフォルト値: 5。　
+
+* `error_anomaly_score`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、エラー深刻度レベルのスコアリングポイントを設定します。
+
+  デフォルト値: 4。　
+
+* `warning_anomaly_score`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、警告深刻度レベルのスコアリングポイントを設定します。
+
+  デフォルト値: 3。
+
+* `notice_anomaly_score`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、通知深刻度レベルのスコアリングポイントを設定します。 
+
+デフォルト値: 2。
+
+* `secrequestmaxnumargs`: リクエストの引数の最大数を設定します。
+
+  デフォルト値: 255。
+
+* `secrequestbodylimit`:  バッファリングに関してModSecurityが受け入れる最大リクエストボディサイズを設定します。
+
+  デフォルト値: '13107200'。
+
+* `secrequestbodynofileslimit`: バッファリングに関してModSecurityが受け入れる最大リクエストボディサイズを設定します。リクエスト内でトランスポートされたファイルのサイズは除外されます。 
+
+  デフォルト値: '131072'。
+
+* `secrequestbodyinmemorylimit`: ModSecurityがメモリに保存する最大リクエストボディサイズを設定します。
+
+  デフォルト値: '131072'。
+
+##### クラス: `apache::mod::wsgi`
+
+[`mod_wsgi`][]を使用したPythonサポートを有効にします。
+
+**パラメータ**:　
+
+* `mod_path`: `mod_wsgi`共有オブジェクト(`.so`)ファイルのパスを定義します。
+
+  デフォルト値: `undef`。　
+
+  * `mod_path`パラメータに`/`が含まれていない場合、Puppetではオペレーティングシステムのデフォルトのモジュールパスの先頭にこれを付加します。含まれている場合は、そのとおりに扱われます。
+
+* `package_name`: `mod_wsgi`をインストールするパッケージの名前。
+
+  デフォルト値: `undef`。　
+
+* `wsgi_python_home`: '/path/to/venv'などの[`WSGIPythonHome`][]ディレクティブを定義します。
+
+  値: パスを指定する文字列。
+
+  デフォルト値: `undef`。
+
+* `wsgi_python_path`: '/path/to/venv/site*packages'などの[`WSGIPythonPath`][]ディレクティブを定義します。
+
+  値: パスを指定する文字列。　
+
+  デフォルト値: `undef`。
+
+* `wsgi_restrict_embedded`: 'On'などの[`WSGIRestrictEmbedded`][]ディレクティブを定義します。
+
+値: On|Off|undef。
+
+デフォルト値: undef。
+
+* `wsgi_socket_prefix`: "\${APACHE\_RUN\_DIR}WSGI"などの[`WSGISocketPrefix`][]ディレクティブを定義します。
+
+  デフォルト値: [`apache::params`][]の`wsgi_socket_prefix`。
+
+このクラスのパラメータはモジュールのディレクティブに相当します。詳細については、[モジュールのドキュメント][`mod_wsgi`]を参照してください。
+
+### プライベートクラス
+
+#### クラス: `apache::confd::no_accf`
+
+FreeBSDの Apache 2.4で必要とされる`no-accf.conf`設定ファイルを`conf.d`内に作成します。
+
+#### クラス: `apache::default_confd_files`
+
+FreeBSDに`conf.d`を含めます。
+
+#### クラス: `apache::default_mods`
+
+デフォルト設定の実行に必要なApacheモジュールをインストールします。詳細については、`apache`クラスの[`default_mods`][]パラメータを参照してください。
+
+#### クラス: `apache::package`
+
+基本のApacheパッケージをインストールして設定します。
+
+#### クラス: `apache::params`
+
+各種のオペレーティングシステムのApacheパラメータを管理します。 
+
+#### クラス: `apache::service`
+
+Apacheデーモンを管理します。
+
+#### クラス: `apache::version`
+
+オペレーティングシステムに基づき、Apacheバージョンの自動検出を試みます。 
+
+### パブリック定義タイプ　
+
+#### 定義タイプ: `apache::balancer`
+
+[`mod_proxy`][]を用いて、Apacheロードバランシンググループ(バランサクラスタとも呼ばれます)を作成します。各ロードバランシンググループには、1つ以上のバランサメンバーが必要です。これは、 [`apache::balancermember`][]定義タイプによりPuppet内で宣言することができます。
+
+各Apacheロードバランシンググループにつき、1つの`apache::balancer`定義タイプを宣言します。すべてのバランサメンバーについて`apache::balancermember`定義タイプをエクスポートし、[エクスポートリソース][]を用いて単一のApacheロードバランササーバで収集することもできます。
+
+**パラメータ**:　
+
+##### `name`
+
+バランサクラスタのタイトルと、その設定を含む`conf.d`の名前を設定します。
+
+##### `proxy_set`
+
+キー‐値ペアを[`ProxySet`][]行として設定します。値: [ハッシュ][]。
+
+デフォルト値: '{}'。
+
+##### `collect_exported`
+
+[エクスポートリソース][]を使用するかどうかを決定します。
+
+すべてのバックエンドサーバを静的に宣言する場合は、このパラメータを`false`に設定し、宣言済みの既存のバランサメンバーリソースに依存するようにします。また、[配列][]引数とともに`apache::balancermember`を使用します。
+
+中央ノードで収集したエクスポートリソースを使用してバックエンドサーバを動的に宣言するには、このパラメータを`true`に設定し、バランサメンバーノードによりエクスポートされたバランサメンバーリソースを収集します。
+
+エクスポートリソースを使用しない場合は、1回のPuppet実行ですべてのバランサメンバーが設定されます。エクスポートリソースを使用する場合は、まずバランシングしたノードについてPuppetを実行し、次にバランサで実行する必要があります。
+
+ブーリアン。
+
+デフォルト値: `true`。　
+
+#### 定義タイプ: `apache::balancermember`
+
+[`mod_proxy_balancer`][]のメンバーを定義します。これにより、ロードバランサの`apache.cfg`内でリッスンするサービス設定ブロック内のバランサメンバーが設定されます。
+
+**パラメータ**:　
+
+##### `balancer_cluster`
+
+**必須**。
+
+Apacheサービスのインスタンス名を設定します。宣言された[`apache::balancer`][]リソースの名前と一致する必要があります。
+
+##### `url`
+
+バランサメンバーサーバとの連絡に使用するURLを指定します。
+
+デフォルト値: 'http://${::fqdn}/'。
+
+##### `options`
+
+URL後に[オプション](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)の[配列][]を指定します。[`ProxyPass`][]で使用可能な任意のキー-値ペアを使用できます。
+
+デフォルト値: 空配列。
+
+#### 定義タイプ: `apache::custom_config`
+
+Apacheサーバの`conf.d`ディレクトリにカスタム設定ファイルを追加します。このファイルが無効で、この定義タイプの[`verify_config`][]パラメータの値が`true`になっている場合は、Puppet実行時にエラーが生じます。
+
+**パラメータ**:　
+
+##### `ensure`
+
+設定ファイルが存在するべきかどうかを指定します。
+
+値: 'absent'、'present'。
+
+デフォルト値: 'present'。　
+
+##### `confdir`　
+
+Puppetが設定ファイルを置くディレクトリを設定します。 
+
+デフォルト値: [`$::apache::confd_dir`][`confd_dir`]の値。
+
+##### `content`
+
+設定ファイルのコンテンツを設定します。`content`および[`source`][]パラメータは、相互排他的な関係にあります。
+
+デフォルト値: `undef`。
+
+##### `filename`
+
+Puppetが設定を保存する`confdir`下のファイル名を設定します。
+
+デフォルト値: `priority`パラメータから生成したファイル名およびリソース名。
+
+##### `priority`
+
+Apacheでは設定ファイルがアルファベット順に処理されるため、ファイル名の先頭にこのパラメータの数値を付加することで、設定ファイルの優先順位を設定します。
+
+設定ファイル名の優先順位の接頭値を無視するには、このパラメータを`false`に設定します。
+
+デフォルト値: '25'。　
+
+##### `source`
+
+設定ファイルのソースを指し示します。[`content`][]および`source`パラメータは、相互排他的な関係にあります。
+
+デフォルト値: `undef`。　
+
+##### `verify_command`
+
+Puppetが設定ファイルの確認に用いるコマンドを指定します。完全修飾コマンドを使用してください。
+
+このパラメータは、[`verify_config`][]パラメータの値が`true`になっている場合にのみ使用されます。`verify_command`が失敗すると、Puppet実行により設定ファイルが削除されてエラーが生じますが、Apacheサービスには通知されません。
+
+デフォルト値: '/usr/sbin/apachectl -t'。
+
+##### `verify_config`
+
+Apacheサービスに通知する前に設定ファイルのバリデーションを行うかどうかを指定します。
+
+ブーリアン。
+
+デフォルト値: `true`。　
+
+#### 定義タイプ: `apache::fastcgi::server`
+
+特定のファイルタイプを処理する1つまたは複数の外部FastCGIサーバを定義します。この定義タイプは、[`mod_fastcgi`][FastCGI]とともに使用します。
+
+**パラメータ**　
+
+##### `host`
+
+FastCGIのホスト名またはIPアドレスおよびTCPポート番号(1-65535)を決定します。
+
+デフォルト値: '127.0.0.1:9000'。
+
+##### `timeout`
+
+リクエストが中止され、エラーLogLevelにイベントが記録されるまでに、[FastCGI][]アプリケーションが非アクティブの状態で待機する秒数を設定します。この非アクティブタイマーは、FastCGIアプリケーションとの接続が待機中の場合のみ適用されます。アプリケーションの待ち行列に入ったリクエストに対して時間内に記述やフラッシュによる応答がないと、リクエストは中止されます。アプリケーションとの通信は完了したものの、クライアントとの通信が完了しなかった(応答がバッファリングされた)場合は、タイムアウトは適用されません。
+
+デフォルト値: 15。
+
+##### `flush`
+
+アプリケーションから受信したデータを、強制的に[`mod_fastcgi`][FastCGI]がクライアントに書き込みます。デフォルトでは、アプリケーションをできるだけ早くフリーな状態にするために、`mod_fastcgi`はデータをバッファリングします。 
+
+デフォルト値: `false`。　
+
+##### `faux_path`
+
+Apacheには、このファイル名を決定するURIを処理する[FastCGI][]があります。このパラメータで設定されたパスは、ローカルのファイルシステムに存在する必要はありません。
+
+デフォルト値: "/var/www/${name}.fcgi"。
+
+##### `alias`
+
+FastCGIサーバとアクションを内部でリンクします。このエイリアスは一意である必要があります。
+
+デフォルト値: "/${name}.fcgi"。
+
+##### `file_type`
+
+FastCGIサーバにより処理するファイルの[MIME `content-type`][]を設定します。
+
+デフォルト値: 'application/x-httpd-php'。
+
+#### 定義タイプ: `apache::listen`
+
+Apacheサーバまたはバーチャルホストのリッスンするアドレスとポートを定義する、Apache設定ディレクトリの`ports.conf`に、[`Listen`][]ディレクティブを追加します。[`apache::vhost`][]クラスはこの定義タイプを使用します。タイトルは `<PORT>`、`<IPV4>:<PORT>`、または`<IPV6>:<PORT>`の形式をとります。
+
+#### 定義タイプ: `apache::mod`
+
+対応する[`apache::mod::<MODULE NAME>`][]クラスを持たないApacheモジュール用のパッケージをインストールし、Apacheサーバの`module`および`enable`ディレクトリ内で、モジュールのデフォルト設定ファイルを確認または配置します。デフォルトのロケーションは、オペレーティングシステムによって異なります。
+
+**パラメータ**:　
+
+##### `package`
+
+**必須**。　
+
+PuppetがApacheモジュールのインストールに使用するパッケージの名前。
+
+デフォルト値: `undef`。　
+
+##### `package_ensure`
+
+Apacheモジュールをインストールの必要性をPuppetが確認するかどうかを決定します。
+
+値: 'absent'、'present'。　
+
+デフォルト値: 'present'。　
+
+##### `lib`
+
+モジュールの共有オブジェクト名を定義します。特別な理由がない限り、手動で設定しないでください。
+
+デフォルト値: `mod_$name.so`。
+
+##### `lib_path`
+
+モジュールのライブラリのパスを指定します。特別な理由がない限り、手動で設定しないでください。[`path`][]パラメータは、この値をオーバーライドします。
+
+デフォルト値: `apache`クラスの[`lib_path`][]パラメータ。
+
+
+##### `loadfile_name`
+
+モジュールの[`LoadFile`][]ディレクティブのファイル名を設定します。Apacheの処理はアルファベット順に行われるため、ファイル名によってモジュールのロード順序も設定できます。
+
+値: `\*.load`の形式のファイル名。
+
+デフォルト値: '$name.load'のように、リソース名の後に'load'をつけた値。
+
+##### `loadfiles`
+
+[`LoadFile`][]ディレクティブの配列を指定します。
+
+デフォルト値: `undef`。　
+
+##### `path`
+
+モジュールのパスを指定します。特別な理由がない限り、このパラメータは手動で設定しないでください。
+
+デフォルト値: [`lib_path`][]/[`lib`][]。
+
+#### 定義タイプ: `apache::namevirtualhost`
+
+[名前ベースのバーチャルホスト][]を有効にし、Apache HTTPD設定ディレクトリの `ports.conf`ファイルに関連するすべてのディレクティブを追加します。タイトルは、'\*'、'\*:\<PORT\>'、'\_default\_:\<PORT\>、'\<IP\>'、または'\<IP\>:\<PORT\>'の形式をとることができます。
+
+#### 定義タイプ: `apache::vhost`
+
+apacheモジュールでは、バーチャルホストのセットアップと設定に関して、かなりの柔軟性が認められています。この柔軟性の一部は、定義リソースタイプの`vhost`によるものです。これを使えば、さまざまなパラメータを用いて、Apacheを何度も検証することができます。
+
+`apache::vhost`定義タイプを使えば、デフォルトの範囲外の要件を持つバーチャルホストについて、特別な設定をすることができます。基本の`::apache`クラス内でデフォルトのバーチャルホストを設定することも、カスタマイズしたバーチャルホストをデフォルトとして設定することもできます。カスタマイズしたバーチャルホストの[`priority`][]の数値は基本のクラスよりも小さくなるため、Apacheはカスタマイズしたバーチャルホストを先に処理します。
+
+`apache::vhost`定義タイプでは、`concat::fragment`を使用して設定ファイルを構築します。定義タイプがもともとサポートしていない設定の要素についてカスタムフラグメントを挿入するには、カスタムフラグメントをひとつずつ追加します。
+
+`apache::vhost`定義タイプでは、カスタムフラグメントの`order`パラメータについては10の倍数が使用されるため、10の倍数ではない`order`が機能します。
+
+**パラメータ**:　
+
+##### `access_log`
+
+`*_access.log`ディレクティブ(`*_file`,`*_pipe`または`*_syslog`)を設定するかどうかを決定します。
+
+ブーリアン。
+
+デフォルト値: `true`。　
+
+##### `access_log_env_var`
+
+特定の環境変数を持つリクエストのみをロギングするように指定します。
+
+デフォルト値: `undef`。　
+
+##### `access_log_file`
+
+[`logroot`][]に置く`*_access.log`のファイル名を設定します。バーチャルホスト---例えばexample.comなど---を与えると、[SSL暗号化][SSL暗号化]バーチャルホストの場合はデフォルト値が'example.com_ssl.log'、暗号化されていないバーチャルホストの場合は'example.com_access.log'になります。
+
+デフォルト値: `false`。　
+
+##### `access_log_format`
+
+アクセスログに、[`LogFormat`][]のニックネームかカスタムフォーマットの文字列のいずれを使うかを指定します。 
+
+デフォルト値: 'combined'。
+
+##### `access_log_pipe`
+
+Apacheがアクセスログメッセージを送信するパイプを指定します。
+
+デフォルト値: `undef`。　
+
+##### `access_log_syslog`
+
+すべてのアクセスログメッセージをsyslogに送ります。
+
+デフォルト値: `undef`。　
+
+##### `add_default_charset`
+
+[`AddDefaultCharset`][]ディレクティブのデフォルトのメディア文字セット値を設定します。これは`text/plain`および`text/html`応答に追加されます。
+
+デフォルト値: `undef`。　
+
+##### `add_listen`
+
+バーチャルホストが[`Listen`][]ステートメントを作成するかどうかを決定します。
+
+`add_listen`を`false`に設定すると、バーチャルホストは`Listen`ステートメントを作成しません。これは、`ip`パラメータを渡されていないバーチャルホストと渡されているバーチャルホストを組み合わせる場合に重要となります。 
+
+ブーリアン。
+
+デフォルト値: `true`。　
+
+##### `use_optional_includes`
+
+Apache 2.4以降の`additional_includes`について、Apacheが[`Include`][]の代わりに[`IncludeOptional`][]ディレクティブを使うかどうかを指定します。
+
+ブーリアン。
+
+デフォルト値: `false`。　
+
+##### `additional_includes`
+
+追加の静的なバーチャルホスト固有のApache設定ファイルのパスを指定します。このパラメータを使えば、このモジュールでサポートされていない固有のカスタム設定を実装することができます。
+
+値: パスを指定する文字列また文字列の[配列][]。
+
+デフォルト値: 空配列。　
+
+##### `aliases`
+
+[ハッシュ][ハッシュ]のリストをバーチャルホストに渡し、[`mod_alias`][]ドキュメントに従って[`Alias`][]、[`AliasMatch`][]、[`ScriptAlias`][]、または[`ScriptAliasMatch`][]ディレクティブを作成します。
+
+例:
+
+``` puppet
+aliases => [
+  { aliasmatch       => '^/image/(.*)\.jpg$',
+    path             => '/files/jpg.images/$1.jpg',
+  },
+  { alias            => '/image',
+    path             => '/ftp/pub/image',
+  },
+  { scriptaliasmatch => '^/cgi-bin(.*)',
+    path             => '/usr/local/share/cgi-bin$1',
+  },
+  { scriptalias      => '/nagios/cgi-bin/',
+    path             => '/usr/lib/nagios/cgi-bin/',
+  },
+  { alias            => '/nagios',
+    path             => '/usr/share/nagios/html',
+  },
+],
+```
+
+`alias`、`aliasmatch`、`scriptalias`、`scriptaliasmatch`キーを機能させるには、`<Directory /path/to/directory>`、`<Location /some/location/here>`などの、それぞれに対応するコンテキストが必要です。Puppetは`aliases`パラメータで指定された順序でディレクティブを作成します。[`mod_alias`][]ドキュメントにもあるように、シャドーイングを避けるため、まず具体性の高い`alias`、`aliasmatch`、`scriptalias`、`scriptaliasmatch`パラメータを追加してから、全般的なパラメータを追加してください。
+
+> **注意**: `scriptaliases`パラメータの代わりに`aliases`パラメータを使用すれば、各種のエイリアスディレクティブの順序を正確に制御できます。`scriptaliases`パラメータを使って`ScriptAliases`を定義すると、すべての*`Alias`ディレクティブの後に*すべての*`ScriptAlias`ディレクティブが*処理されます。これは`Alias`ディレクティブによる`ScriptAlias`ディレクティブのシャドーイングにつながり、多くの場合、問題が生じます。例えば、Nagiosに関する問題が生じる可能性があります。
+
+I[`apache::mod::passenger`][]がロードされ、`PassengerHighPerformance`が`true`になっている場合、`Alias`ディレクティブが`PassengerEnabled => off`ステートメントを履行できない可能性があります。詳細については、[この記事](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)を参照してください。
+
+##### `allow_encoded_slashes`
+
+バーチャルホストの[`AllowEncodedSlashes`][]宣言を設定し、サーバのデフォルトをオーバーライドします。これにより、`\`および`/`文字を含むURLに対するバーチャルホストの応答が変更されます。値: 'nodecode'、'off'、'on'。デフォルト設定では、サーバ設定からこの宣言が省かれ、Apacheのデフォルト設定'Off'が選択されます。
+
+デフォルト値: `undef`。　
+
+##### `block`
+
+Apacheがアクセスをブロックする対象のリストを指定します。有効なオプション: 'scm'、これにより、`.svn`、`.git`、`.bzr`ディレクティブへのWebアクセスがブロックされます。
+
+デフォルト値: 空[配列][]。
+
+##### `cas_attribute_prefix`
+
+SAMLバリデーションが有効になっている場合に、このヘッダの値を属性値としてヘッダを追加します。
+
+デフォルト値: [`apache::mod::auth_cas`][]により設定された値。
+
+##### `cas_attribute_delimiter`
+
+`cas_attribute_prefix`により作成されたヘッダの属性値の区切り文字を設定します。
+
+デフォルト値: [`apache::mod::auth_cas`][]により設定された値。
+
+##### `cas_login_url`
+
+ユーザがCASで保護されたリソースへのアクセスを試み、かつアクティブなセッションがない場合に、モジュールがユーザをリダイレクトする先のURLを設定します。
+
+デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　
+
+##### `cas_scrub_request_headers`
+
+mod_auth_cas内で特別な意味を持つ可能性のあるインバウンドリクエストヘッダを削除します。
+
+デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　
+
+##### `cas_sso_enabled`
+
+`cas_sso_enabled`: シングルサインアウトの実験的サポートを有効にします(POSTデータが壊れる可能性があります)。
+
+デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　
+
+##### `cas_validate_saml`
+
+SAMLに関するCASサーバからの解析応答。
+
+デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　
+
+##### `cas_validate_url`
+
+HTTPクエリ文字列でクライアントの提示するチケットをバリデーションする際に使用するURL。
+
+デフォルト値: [`apache::mod::auth_cas`][]により設定された値。
+
+##### `custom_fragment`
+
+カスタム設定ディレクティブの文字列を渡し、バーチャルホスト設定の最後に配置します。
+
+デフォルト値: `undef`。　
+
+##### `default_vhost`
+
+任意の`apache::vhost`定義タイプを、他の`apache::vhost`定義タイプと一致しないリクエストをサーブするためのデフォルトとして設定します。 
+
+デフォルト値: `false`。　
+
+##### `directories`
+
+[`directories`](#parameter-directories-for-apachevhost)セクションを参照してください。
+
+##### `directoryindex`
+
+ディレクトリ名の最後で'/'を指定することで、クライアントがディレクトリのインデックスをリクエストした際に探すべきリソースのリストを設定します。詳細については、[`DirectoryIndex`][]ディレクティブドキュメントを参照してください。
+
+デフォルト値: `undef`。　
+
+##### `docroot`
+
+**必須**。　
+
+[`DocumentRoot`][]ロケーションを設定します。Apacheはここからファイルをサーブします。
+
+`docroot`と[`manage_docroot`][]がともに`false`に設定されている場合、[`DocumentRoot`][]は設定されず、それに付随する`<Directory /path/to/directory>`ブロックは作成されません。
+
+値: ディレクトリパスを指定する文字列。
+
+##### `docroot_group`
+
+[`docroot`][]ディレクトリへのグループアクセスを設定します。
+
+値: システムグループを指定する文字列。
+
+デフォルト値: 'root'。
+
+##### `docroot_owner`
+
+[`docroot`][]ディレクトリへの個々のユーザのアクセスを設定します。
+
+値: ユーザアカウントを指定する文字列。
+
+デフォルト値: 'root'。　
+
+##### `docroot_mode`
+
+[`docroot`][]ディレクトリへのアクセス許可を数字表記法で設定します。
+
+値: 文字列。　
+
+デフォルト値: `undef`。　
+
+##### `manage_docroot`
+
+Puppetが[`docroot`][]ディレクトリを管理するかどうかを決定します。
+
+ブーリアン。
+
+デフォルト値: `true`。　
+
+##### `error_log`
+
+`*_error.log`ディレクティブを設定するかどうかを指定します。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `error_log_file`
+
+バーチャルホストのエラーログについて、`*_error.log`ファイルを優先します。このパラメータが定義されていない場合、Puppetはまず[`error_log_pipe`][]で、次に[`error_log_syslog`][]で値を確認します。
+
+これらのパラメータをいずれも設定しない場合は、例えばバーチャルホストが`example.com`なら、PuppetはSSLバーチャルホストのデフォルトを'$logroot/example.com_error_ssl.log'、非SSLバーチャルホストのデフォルトを'$logroot/example.com_error.log'とします。
+
+デフォルト値: `undef`。
+
+##### `error_log_pipe`
+
+エラーログメッセージを送るパイプを指定します。
+
+[`error_log_file`][]パラメータに値がある場合は、このパラメータに効力は生じません。このパラメータにも`error_log_file`にも値がない場合、Puppetは[`error_log_syslog`][]をチェックします。
+
+デフォルト値: `undef`。
+
+##### `error_log_syslog`
+
+すべてのエラーログメッセージをsyslogに送るかどうかを決定します。
+
+[`error_log_file`][]パラメータまたは[`error_log_pipe`][]パラメータのいずれかに値がある場合、このパラメータの効力は生じません。これらのパラメータのいずれにも値がない場合は、例えばバーチャルホスト`example.com`では、PuppetはSSLバーチャルホストのデフォルトを'$logroot/example.com_error_ssl.log'、非SSLバーチャルホストのデフォルトを '$logroot/example.com_error.log'とします。
+
+ブーリアン。
+
+デフォルト値: `undef`。
+
+##### `error_documents`
+
+このバーチャルホストの[エラードキュメント](https://httpd.apache.org/docs/current/mod/core.html#errordocument)設定のオーバーライドに使用できるハッシュのリスト。
+
+例:
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  error_documents => [
+    { 'error_code' => '503', 'document' => '/service-unavail' },
+    { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
+  ],
+}
+```
+
+デフォルト値: '[]'。
+
+##### `ensure`
+
+バーチャルホストが存在するかどうかを指定します。
+
+値: 'absent'、'present'。　
+
+デフォルト値: 'present'。
+
+##### `fallbackresource`
+
+[FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource)ディレクティブを設定します。このディレクティブは、ファイルシステム内のどこにもマッピングされていないURLに対してどのようなアクションをとるか指定します。指定されていない場合は'HTTP 404 (Not Found)'が返されます。値は'/'で始めるか、'disabled'とする必要があります。
+
+デフォルト値: `undef`。
+
+#####`fastcgi_idle_timeout`
+
+fastcgiを使用する場合に、このオプションにより、サーバ応答のタイムアウトを設定します。
+
+デフォルト値: `undef`。
+
+##### `file_e_tag`
+
+[`FileETag`][]宣言のサーバデフォルトを設定します。これにより、静的ファイルの応答ヘッダフィールドが変更されます。
+
+値: 'INode'、'MTime'、'Size'、'All'、'None'。
+
+デフォルト値: `undef`、この場合、Apacheのデフォルト設定'MTime Size'が使用されます。
+
+##### `filters`
+
+[フィルタ](https://httpd.apache.org/docs/current/mod/mod_filter.html)により、アウトプットコンテンツフィルタのスマートな文脈依存設定が有効になります。
+
+``` puppet
+apache::vhost { "$::fqdn":
+  filters => [
+    'FilterDeclare   COMPRESS',
+    'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
+    'FilterChain     COMPRESS',
+    'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
+  ],
+}
+```
+
+##### `force_type`
+
+[`ForceType`][]ディレクティブを設定します。このディレクティブは、[MIME `content-type`][]がこのパラメータの値に一致するすべてのマッチングファイルをApacheに強制的にサーブさせます。
+
+#### `add_charset`
+
+ディレクトリおよびファイル拡張子ごとに、Apacheにカスタムコンテンツ文字セットを設定させます。
+
+##### `headers`
+
+レスポンスヘッダを置換、結合、または削除するための行を追加します。詳細については、[Apacheのmod_headersドキュメント](https://httpd.apache.org/docs/current/mod/mod_headers.html#header)を参照してください。
+
+値: 文字列または文字列の配列。
+
+デフォルト値: `undef`。
+
+##### `ip`
+
+バーチャルホストがリッスンするIPアドレスを設定します。デフォルトでは、Apacheのデフォルト挙動が使用され、すべてのIPをリッスンします。
+
+値: 文字列または文字列の配列。　
+
+デフォルト値: `undef`。
+
+##### `ip_based`
+
+[IPベースの](https://httpd.apache.org/docs/current/vhosts/ip-based.html)バーチャルホストを有効にします。このパラメータにより、NameVirtualHostディレクティブの作成が禁止されます。これは、このディレクティブが名前ベースのバーチャルホストにリクエストを送る際に使用されるためです。
+
+デフォルト値: `false`。
+
+##### `itk`
+
+ハッシュで[ITK](http://mpm-itk.sesse.net/)を設定します。
+
+通常は、以下のように使用します。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot => '/path/to/directory',
+  itk     => {
+    user  => 'someuser',
+    group => 'somegroup',
+  },
+}
+```
+
+値: ハッシュ。キーを含めることもできます。
+
+* ユーザ + グループ
+* `assignuseridexpr`
+* `assigngroupidexpr`
+* `maxclientvhost`
+* `nice`
+* `limituidrange` (Linux 3.5.0以降)
+* `limitgidrange` (Linux 3.5.0以降)
+
+通常は、以下のように使用します。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot => '/path/to/directory',
+  itk     => {
+    user  => 'someuser',
+    group => 'somegroup',
+  },
+}
+```　
+
+デフォルト値: `undef`。
+
+##### `jk_mounts`
+
+'JkMount'および'JkUnMount'ディレクティブによりバーチャルホストを設定し、TomcatとApacheの間をマッピングするURLのパスを処理します。
+
+このパラメータは、ハッシュの配列にする必要があります。各ハッシュには、'worker'と、'mount'または'unmount'キーのいずれかが含まれている必要があります。
+
+通常は、以下のように使用します。　
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  jk_mounts => [
+    { mount   => '/*',     worker => 'tcnode1', },
+    { unmount => '/*.jpg', worker => 'tcnode1', },
+  ],
+}
+```
+デフォルト値: `undef`。
+
+##### `keepalive`
+
+バーチャルホストで[`KeepAlive`][]ディレクティブによるHTTPの持続的接続を有効にするかどうかを決定します。デフォルトでは、グローバルなサーバ全体の[`KeepAlive`][]設定が有効になります。
+
+バーチャルホストの関連オプションを設定するには、`keepalive_timeout`および`max_keepalive_requests`パラメータを使用します。
+
+値: 'Off', 'On'。
+
+デフォルト値: `undef`。　
+
+##### `keepalive_timeout`
+
+バーチャルホストの[`KeepAliveTimeout`]ディレクティブを設定します。これにより、HTTPの持続的接続で後続のリクエストを実行するまでの待機時間が決まります。デフォルトでは、グローバルなサーバ全体の[`KeepAlive`][]設定が有効になります。
+
+このパラメータが意味を持つのは、グローバルなサーバ全体の[`keepalive`パラメータ][]またはバーチャルホストごとの`keepalive`パラメータのいずれかが有効になっている場合のみです。
+
+デフォルト値: `undef`。　
+
+##### `max_keepalive_requests`
+
+接続1回につき許可されるバーチャルホストへのリクエスト数を制限します。デフォルトでは、グローバルなサーバ全体の[`KeepAlive`][]設定が有効になります。
+
+このパラメータが意味を持つのは、グローバルなサーバ全体の[`keepalive`パラメータ][]またはバーチャルホストごとの`keepalive`パラメータのいずれかが有効になっている場合のみです。　
+
+デフォルト値: `undef`。　
+
+##### `auth_kerb`
+
+バーチャルホストの[`mod_auth_kerb`][]パラメータを有効にします。
+
+通常は、以下のように使用します。　
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  auth_kerb              => `true`,
+  krb_method_negotiate   => 'on',
+  krb_auth_realms        => ['EXAMPLE.ORG'],
+  krb_local_user_mapping => 'on',
+  directories            => {
+    path         => '/var/www/html',
+    auth_name    => 'Kerberos Login',
+    auth_type    => 'Kerberos',
+    auth_require => 'valid-user',
+  },
+}
+```
+
+関連するパラメータは、`mod_auth_kerb`ディレクティブの名前に従います。
+
+- `krb_method_negotiate`: Negotiateメソッドを使用するかどうかを決定します。デフォルト値: 'on'。
+- `krb_method_k5passwd`: Kerberos v5に関してパスワードベースの認証を使用するかどうかを決定します。デフォルト値: 'on'。
+- `krb_authoritative`: 'off'に設定すると、認証コントロールを別のモジュールに渡すことができます。デフォルト値: 'on'。
+- `krb_auth_realms`: 認証に使用するKerberos領域の配列を指定します。デフォルト値: '[]'。
+- `krb_5keytab`: Kerberos v5キータブファイルのロケーションを指定します。デフォルト値: `undef`。
+- `krb_local_user_mapping`: 今後の使用のために、ユーザ名から@REALMを取り除きます。デフォルト値: `undef`。
+
+ブーリアン。
+
+デフォルト値: `false`。
+
+##### `krb_verify_kdc`
+
+このオプションを使えば、ローカルなキータブに対する認証チケットを無効にし、KDCスプーフィング攻撃を防ぐことができます。
+
+デフォルト値: 'on'。
+
+##### `krb_servicename`
+
+Apacheが認証に使用するサービス名を指定します。この名前に対応するキーをキータブに保存する必要があります。
+
+デフォルト値: 'HTTP'。
+
+##### `krb_save_credentials`
+
+このオプションにより、認証情報の保存機能が有効になります。
+
+デフォルト値: 'off'。
+
+##### `logroot`
+
+バーチャルホストのログファイルの保存場所を指定します。
+
+デフォルト値: '/var/log/<apache log location>/'。
+
+##### `$logroot_ensure`
+
+バーチャルホストのlogrootディレクトリを削除するかどうかを決定します。
+
+値: 'directory'、'absent'。
+
+デフォルト値: 'directory'。
+
+##### `logroot_mode`
+
+logrootディレクトリで設定されたモードをオーバーライドします。影響を把握できない場合は、ログが保存されているディレクトリへの書き込みアクセス権限を付与*しないで*ください。詳細については、[Apacheのログセキュリティドキュメント](https://httpd.apache.org/docs/2.4/logs.html#security)を参照してください。
+
+デフォルト値: `undef`。
+
+##### `logroot_owner`
+
+logrootディレクトリへの個々のユーザのアクセスを設定します。
+
+デフォルト値：`undef`。
+
+##### `logroot_group`
+
+[`logroot`][]ディレクトリへのグループアクセスを設定します。
+
+デフォルト値：`undef`。
+
+##### `log_level`
+
+エラーログの詳細レベルを指定します。
+
+値: 'emerg'、'alert'、'crit'、'error'、'warn'、'notice'、'info'、'debug'。
+
+デフォルト値: グローバルサーバ設定については'warn'。バーチャルホストごとにオーバーライドできます。
+
+###### `modsec_body_limit`
+
+バッファリングに関してModSecurityが受け入れる最大リクエストボディサイズをバイト数で設定します。
+
+値: 整数。
+
+デフォルト値: `undef`。
+
+###### `modsec_disable_vhost`
+
+バーチャルホストで[`mod_security`][]を無効にします。[`apache::mod::security`][]が含まれている場合にのみ有効です。
+
+ブーリアン。
+
+デフォルト値: `undef`。
+
+###### `modsec_disable_ids`
+
+バーチャルホストから`mod_security` IDを削除します。
+
+値: バーチャルホストから削除する`mod_security` IDの配列。ハッシュも使用できます。この場合、特定のロケーションからのIDの削除が可能です。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_ids => [ 90015, 90016 ],
+}
+```
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
+}
+```
+
+デフォルト値: `undef`。
+
+###### `modsec_disable_ips`
+
+[`mod_security`][]ルールマッチングから除外するIPアドレスの配列を指定します。
+
+デフォルト値: `undef`。
+
+###### `modsec_disable_msgs`
+
+バーチャルホストから削除するmod_security Msgの配列。ハッシュも使用できます。この場合、特定のロケーションからのMsgの削除が可能です。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_msgs => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ],
+}
+```
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_msgs => { '/location1' => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ] },
+}
+```
+
+デフォルト値: `undef`。
+
+###### `modsec_disable_tags`
+
+ バーチャルホストから削除するmod_securityタグの配列。ハッシュも使用できます。この場合、特定のロケーションからのタグの削除が可能です。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ],
+}
+```
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_tags => { '/location1' => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ] },
+}
+```
+
+デフォルト値: `undef`。
+
+##### `modsec_audit*`
+
+* `modsec_audit_log`
+* `modsec_audit_log_file`
+* `modsec_audit_log_pipe`
+
+この3つのパラメータは、いずれも`mod_security`オーディットログの送信方法を決定します([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog))。
+
+* `modsec_audit_log_file`が設定されている場合は、[`logroot`][]と比較されます。
+
+  デフォルト値: `undef`。
+
+* `modsec_audit_log_pipe`を設定する場合は、パイプで始める必要があります。例えば、'|/path/to/mlogc /path/to/mlogc.conf'のようになります。
+
+  デフォルト値: `undef`。
+
+* `modsec_audit_log`が`true`になっている場合、バーチャルホスト---example.comなど---を与えると、[SSL暗号化][SSL encryption]バーチャルホストの場合はデフォルト値が'example.com\_security\_ssl.log'、暗号化されていないバーチャルホストの場合は'example.com\_security.log'になります。
+
+  デフォルト値: `false`。
+
+上述のパラメータがいずれも設定されていない場合、グローバルオーディットログが使用されます(''/var/log/httpd/modsec\_audit.log''; Debianおよびデリバティブ: ''/var/log/apache2/modsec\_audit.log''; その他: )。
+
+##### `no_proxy_uris`
+
+プロキシを使用しないURLを指定します。このパラメータは、[`proxy_dest`](#proxy_dest)と組み合わせて使用することはできません。
+
+デフォルト値: []。
+
+##### `no_proxy_uris_match`
+
+このディレクティブは[`no_proxy_uris`][]と同じですが、正規表現をとります。
+
+デフォルト値: []。　
+
+##### `proxy_preserve_host`
+
+[ProxyPreserveHostディレクティブ](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost)を設定します。
+
+このパラメータを`true`に設定すると、受信リクエストの`Host:`行が有効になり、ホスト名ではなくホストにプロキシされます。`false`に設定すると、このディレクティブが'Off'になります。
+
+ブーリアン。
+
+デフォルト値: `false`。
+
+##### `proxy_add_headers`
+
+[ProxyAddHeadersディレクティブ](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders)を設定します。
+
+このパラメータは、プロキシ関連のHTTPヘッダ(X-Forwarded-For、X-Forwarded-Host、X-Forwarded-Server)をバックエンドサーバに送信するかどうかを制御します。
+
+ブーリアン。
+
+デフォルト値: `false`。
+
+##### `proxy_error_override`
+
+[ProxyErrorOverrideディレクティブ](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride)を設定します。このディレクティブは、プロキシされたコンテンツに関するエラーページをApacheによりオーバーライドすべきかどうかを制御します。
+
+ブーリアン。
+
+デフォルト値: `false`。
+
+##### `options`
+
+指定されたバーチャルホストの[`Options`][]を設定します。例:
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  options => ['Indexes','FollowSymLinks','MultiViews'],
+}
+```
+
+> **注意**: [`apache::vhost`][]の[`directories`][]パラメータを使うと、'Options'、'Override'、'DirectoryIndex'は`directories`内のパラメータであるため、無視されます。
+
+デフォルト値: ['Indexes','FollowSymLinks','MultiViews']。
+
+##### `override`
+
+指定されたバーチャルホストのオーバーライドを設定します。[AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride)引数の配列を使用できます。
+
+デフォルト値: '[none]'。
+
+##### `passenger_app_root`
+
+[PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot)を設定します。これは、DocumentRootと異なる場合のPassengerアプリケーションルートのロケーションです。
+
+値: パスを指定する文字列。
+
+デフォルト値: `undef`。
+
+##### `passenger_app_env`
+
+[PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv)を設定します。これは、Passengerアプリケーションに関する環境です。指定されていない場合は、グローバル設定の'production'がデフォルトになります。
+
+値: 環境名を指定する文字列。
+
+デフォルト値: `undef`。
+
+##### `passenger_log_file`
+
+デフォルトでは、PassengerログメッセージはApacheグローバルエラーログに書き込まれます。[PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile)を使えば、そのメッセージを別のファイルに書き込むように設定することができます。このオプションは、Passenger 5.0.5以降でのみ使用できます。
+
+値: パスを指定する文字列。
+
+デフォルト値: `undef`。
+
+##### `passenger_log_level`
+
+このオプションを使えば、ログファイルに書き込む情報の量を指定できます。設定されていない場合は、[PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel)は設定ファイルに表示されず、デフォルト値が使用されます。
+
+デフォルト値: 3.0.0以前のPassengerバージョン: '0'; 5.0.0以降: '3'。
+
+##### `passenger_ruby`
+
+[PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby)を設定します。これは、バーチャルホスト上でこのアプリケーションに関して使用するRubyインタープリタです。
+
+デフォルト値: `undef`。
+
+##### `passenger_min_instances`
+
+[PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances)を設定します。これは、実行するアプリケーションプロセスの最小数です。
+
+##### `passenger_max_requests`
+
+[PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#pas
+sengermaxrequests)を設定します。これは、アプリケーションプロセスが処理するリクエストの最大数です。
+
+##### `passenger_max_instances_per_app`
+
+[PassengerMaxInstancesPerApp](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstancesperapp)を設定します。これは、単一のアプリケーションに関して同時に存在できるアプリケーションプロセスの最大数です。
+
+デフォルト値: `undef`。
+
+##### `passenger_start_timeout`
+
+[PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout)を設定します。これは、アプリケーション起動のタイムアウトです。
+
+##### `passenger_pre_start`
+
+[PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart)を設定します。これは、プレ起動が必要とされる場合のアプリケーションのURLです。 
+
+##### `passenger_user`
+
+[PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser)を設定します。これは、サンドボックスアプリケーションの実行ユーザです。
+
+##### `passenger_high_performance`
+
+[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance)パラメータを設定します。
+
+値: `true`、`false`。
+
+デフォルト値: `undef`。
+
+##### `passenger_nodejs`
+
+[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs)を設定します。これは、バーチャルホスト上でこのアプリケーションに関して使用するNodeJSインタープリタです。
+
+##### `passenger_sticky_sessions`
+
+[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions)パラメータを設定します。
+
+ブーリアン。
+
+デフォルト値: `undef`。
+
+##### `passenger_startup_file`
+
+[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile)パスを設定します。このパスは、アプリケーションルートに関連しています。
+
+##### `php_flags & values`
+
+バーチャルホストごとの設定[`php_value`または`php_flag`](http://php.net/manual/en/configuration.changes.php)を許可します。これらのフラグや値は、ユーザまたはアプリケーションにより上書きすることができます。
+
+デフォルト値: '{}'。
+
+##### `php_admin_flags & values`
+
+バーチャルホストごとの設定[`php_admin_value`または`php_admin_flag`](http://php.net/manual/en/configuration.changes.php)を許可します。これらのフラグや値は、ユーザまたはアプリケーションにより上書きすることができます。
+
+デフォルト値: '{}'。
+
+##### `port`
+
+ホストを設定するポートを設定します。モジュールのデフォルトでは、ホストがリッスンするのは、非SSLバーチャルホストではポート80、SSLバーチャルホストではポート443です。ホストはこのパラメータで設定されたポートのみをリッスンします。
+
+##### `priority`
+
+Apache HTTPD VirtualHost設定ファイルに関連するロード順序を設定します。 
+
+優先順位に一致するものがない場合は、アルファベット順で最初の名前ベースのバーチャルホストが使用されます。同様に、高い優先順位を渡すと、他に一致する名前がなければ、アルファベット順で最初の名前ベースのバーチャルホストが使用されます。
+
+> **注意:** このパラメータを使用する必要はありません。ただし、使用する場合は、`apache::vhost`の`default_vhost`パラメータの優先順位は'15'になる点に留意してください。
+
+ファイル名の優先順位の接頭値を無視するには、優先順位として`false`を渡します。
+
+デフォルト値: '25'。
+
+##### `proxy_dest`
+
+[ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)設定の宛先アドレスを指定します。
+
+デフォルト値: `undef`。
+
+##### `proxy_pass`
+
+[ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)設定の`path => URI`値の配列を指定します。オプションで、配列としてパラメータを追加できます。
+
+デフォルト値: `undef`。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  proxy_pass => [
+    { 'path' => '/a', 'url' => 'http://backend-a/' },
+    { 'path' => '/b', 'url' => 'http://backend-b/' },
+    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
+    { 'path' => '/l', 'url' => 'http://backend-xy',
+      'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
+    { 'path' => '/d', 'url' => 'http://backend-a/d',
+      'params' => { 'retry' => '0', 'timeout' => '5' }, },
+    { 'path' => '/e', 'url' => 'http://backend-a/e',
+      'keywords' => ['nocanon', 'interpolate'] },
+    { 'path' => '/f', 'url' => 'http://backend-f/',
+      'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+    { 'path' => '/g', 'url' => 'http://backend-g/',
+      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
+    { 'path' => '/h', 'url' => 'http://backend-h/h',
+      'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
+  ],
+}
+```
+
+* `reverse_urls`。*オプション。*この設定は、`mod_proxy_balancer`とともに使用する場合に役立ちます。値: 配列または文字列。
+* `reverse_cookies`。*オプション。*`ProxyPassReverseCookiePath`および`ProxyPassReverseCookieDomain`を設定します。
+* `params`。*オプション。*接続設定などのProxyPassキー-値パラメータを許可します。
+* `setenv`。*オプション。*プロキシディレクティブの[環境変数](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings)を設定します。値: 配列。
+
+##### `proxy_dest_match`
+
+このディレクティブは[`proxy_dest`][]と同じですが、正規表現をとります。詳細については、[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)を参照してください。
+
+##### `proxy_dest_reverse_match`
+
+[`proxy_dest_match`][]が指定されている場合に、ProxyPassReverseを渡せるようにします。詳細については、[ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)を参照してください。
+
+##### `proxy_pass_match`
+
+このディレクティブは[`proxy_pass`][]と同じですが、正規表現をとります。詳細については、[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)を参照してください。
+
+##### `rack_base_uris`
+
+rack設定のリソース識別子を設定します。指定されたファイルパスは、_rack.erbテンプレート内の[Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri)のrackアプリケーションルートとしてリストされます。
+
+デフォルト値: `undef`。
+
+#####`passenger_base_uris`
+
+任意のURIをPhusion Passengerのサーブするアプリケーションとして指定するのに使用します。指定されたファイルパスは、_passenger_base_uris.erbテンプレート内の[Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI)のpassengerアプリケーションルートとしてリストされます。
+
+デフォルト値: `undef`。
+
+##### `redirect_dest`
+
+リダイレクト先のアドレスを指定します。
+
+デフォルト値: `undef`。
+
+##### `redirect_source`
+
+`redirect_dest`で指定された宛先にリダイレクトするソースURIを指定します。リダイレクトするアイテムが複数提供されている場合は、ソースと宛先の長さを一致させる必要があります。また、アイテムは順序に依存します。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  redirect_source => ['/images','/downloads'],
+  redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+}
+```
+
+##### `redirect_status`
+
+リダイレクトに追加するステータスを指定します。
+
+デフォルト値: `undef`。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  redirect_status => ['temp','permanent'],
+}
+```
+
+##### `redirectmatch_*`
+
+* `redirectmatch_regexp`
+* `redirectmatch_status`
+* `redirectmatch_dest`
+
+任意の正規表現について呼び出すサーバステータスとユーザの転送先を決定します。配列として入力します。
+
+デフォルト値: `undef`。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
+}
+```
+
+##### `request_headers`
+
+他のリクエストヘッダの追加、リクエストヘッダの削除など、収集した[リクエストヘッダ](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader)をさまざまな形で修正します。
+
+デフォルト値: `undef`。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  request_headers => [
+    'append MirrorID "mirror 12"',
+    'unset MirrorID',
+  ],
+}
+```
+
+##### `rewrites`
+
+URLリライトルールを作成します。ハッシュの配列が求められます。
+
+値: 'comment'、'rewrite_base'、'rewrite_cond'、'rewrite_rule'、'rewrite_map'のいずれかのハッシュキー。
+
+デフォルト値: `undef`。
+
+誰かがindex.htmlにアクセスした場合、welcome.htmlを表示するように指定できます。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
+}
+```
+
+このパラメータにより条件をリライトし、`true`の場合に関連ルールを実行させることが可能です。例えば、ビジターがIEを使っている場合のみURLをリライトするには、以下のように設定します。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'redirect IE',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
+```
+
+複数の条件を適用することもできます。たとえば、ブラウザがLynxかMozilla(バージョン1または2)の場合にのみ、index.htmlをwelcome.htmlにリライトする場合は、以下のようになります。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
+```
+
+複数のリライトと条件を設定することも可能です。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+    {
+      comment      => 'Internet Explorer',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+    },
+    {
+      rewrite_base => /apps/,
+      rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
+    },
+    { comment      => 'Rewrite to lower case',
+      rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
+      rewrite_map  => ['lc int:tolower'],
+      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+    },
+  ],
+}
+```
+
+リライトのルールおよび条件については、[`mod_rewrite`ドキュメント][`mod_rewrite`]を参照してください。
+
+##### `rewrite_inherit`
+
+バーチャルホストが全体のリライトルールを継承するかどうかを決定します。
+
+デフォルト値: `false`。
+
+リライトルールは、全体(`$conf_file`または`$confd_dir`で)またはバーチャルホストの`.conf`ファイル内で指定することができます。デフォルトでは、バーチャルホストは全体の設定を継承しません。継承を有効にするには、`rewrites`パラメータを指定し、`rewrite_inherit`パラメータを`true`に設定します。
+
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    <rules>,
+  ],
+  rewrite_inherit => `true`,
+}
+```
+
+> **注意**: この設定を有効にするには、`rewrites`パラメータが**必須**です。
+
+バーチャルホストに以下のディレクティブが含まれている場合は、Apacheが全体の`Rewrite`ルールを有効にします。
+
+``` ApacheConf
+RewriteEngine On
+RewriteOptions Inherit
+```
+
+[公式`mod_rewrite`ドキュメント](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)のセクション"Rewriting in Virtual Hosts"を参照してください。
+
+##### `scriptalias`
+
+'/usr/scripts'などの、パス'/cgi-bin'のエイリアスとするCGIスクリプトのディレクトリを定義します。
+
+デフォルト値: `undef`。
+
+##### `scriptaliases`
+
+> **注意**: このパラメータは廃止予定であり、`aliases`パラメータに置き換えられます。
+
+ハッシュの配列をバーチャルホストに渡し、[`mod_alias`ドキュメント][`mod_alias`]に従ってScriptAliasまたはScriptAliasMatchステートメントのいずれかを作成します。
+
+``` puppet
+scriptaliases => [
+  {
+    alias => '/myscript',
+    path  => '/usr/share/myscript',
+  },
+  {
+    aliasmatch => '^/foo(.*)',
+    path       => '/usr/share/fooscripts$1',
+  },
+  {
+    aliasmatch => '^/bar/(.*)',
+    path       => '/usr/share/bar/wrapper.sh/$1',
+  },
+  {
+    alias => '/neatscript',
+    path  => '/usr/share/neatscript',
+  },
+]
+```
+
+ScriptAliasおよびScriptAliasMatchディレクティブは、指定した順に作成されます。 [AliasおよびAliasMatch](#aliases)ディレクティブと同様、シャドーイングを避けるため、まず具体的なエイリアスを指定してから、全般的なものを指定してください。
+
+##### `serveradmin`
+
+エラーページの表示時にApacheが表示するEメールアドレスを指定します。 
+
+デフォルト値: `undef`。
+
+##### `serveraliases`
+
+サイトの[ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias)を設定します。
+
+デフォルト値: '[]'。
+
+##### `servername`
+
+バーチャルホストに接続するホスト名に対応するサーバ名を設定します。
+
+デフォルト値: リソースのタイトル。
+
+##### `setenv`
+
+HTTPDにより使用し、バーチャルホストの環境変数を設定します。
+
+デフォルト値: '[]'。
+
+例:
+
+``` puppet
+apache::vhost { 'setenv.example.com':
+  setenv => ['SPECIAL_PATH /foo/bin'],
+}
+```
+
+##### `setenvif`
+
+HTTPDにより使用し、条件を用いてバーチャルホストの環境変数を設定します。
+
+デフォルト値: '[]'。
+
+##### `setenvifnocase`
+
+HTTPDにより使用し、条件を用いてバーチャルホストの環境変数を設定します(大文字小文字を区別しないマッチング)。
+
+デフォルト値: '[]'。
+
+##### `suphp_*`
+
+* `suphp_addhandler`
+* `suphp_configpath`
+* `suphp_engine`
+
+[suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)によりバーチャルホストを設定します。
+
+* `suphp_addhandler`。デフォルト値: RedHatおよびFreeBSDでは'php5-script'、DebianおよびGentooでは'x-httpd-php'。
+* `suphp_configpath`。デフォルト値: RedHatおよびFreeBSDでは`undef`、DebianおよびGentooでは'/etc/php5/apache2'。
+* `suphp_engine`。値: 'on'または'off'。デフォルト値: 'off'。
+
+suPHPによるバーチャルホスト設定の例:
+
+``` puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => { path => '/home/appuser/myphpapp',
+    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
+```
+
+##### `vhost_name`
+
+名前ベースのバーチャルホストを有効にします。バーチャルホストにIPではなくポートが割り当てられている場合は、バーチャルホスト名は'vhost_name:port'になります。バーチャルホストにIPもポートも割り当てられていない場合は、バーチャルホスト名はリソースのタイトルに設定されます。
+
+デフォルト値: '*'。
+
+##### `virtual_docroot`
+
+同じ名前を持つディレクトリにマッピングされたワイルドカードエイリアスサブドメインにより、バーチャルホストを設定します。例えば、'http://example.com' would map to '/var/www/example.com'のようになります。
+
+デフォルト値: `false`。
+
+``` puppet
+apache::vhost { 'subdomain.loc':
+  vhost_name      => '*',
+  port            => '80',
+  virtual_docroot => '/var/www/%-2+',
+  docroot         => '/var/www',
+  serveraliases   => ['*.loc',],
+}
+```
+
+##### `wsgi*`
+
+* `wsgi_daemon_process`
+* `wsgi_daemon_process_options`
+* `wsgi_process_group`
+* `wsgi_script_aliases`
+* `wsgi_pass_authorization`
+
+[WSGI](https://github.com/GrahamDumpleton/mod_wsgi)によりバーチャルホストを設定します。
+
+* `wsgi_daemon_process`: WSGIデーモンの名前を設定するハッシュ。[特定のキー](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html)を使用できます。デフォルト値: `undef`。
+* `wsgi_daemon_process_options`。_オプション。_ デフォルト値: `undef`。
+* `wsgi_process_group`: バーチャルホストが実行されるグループIDを設定します。デフォルト値: `undef`。
+* `wsgi_script_aliases`: ファイルシステム.wsgiパスへのWebパスのハッシュにする必要があります。デフォルト値: `undef`。
+* `wsgi_script_aliases_match`: ファイルシステム.wsgiパスへのWebパスの正規表現のハッシュにする必要があります。デフォルト値: `undef`。
+* `wsgi_pass_authorization`: 'On'に設定すると、Apacheの代わりにWSGIアプリケーションを使って認証を処理します。詳細については、[mod_wsgi's WSGIPassAuthorizationドキュメント] (https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html)を参照してください。デフォルト値: `undef`、これにより、Apacheのデフォルト値である'Off'が使われます。
+* `wsgi_chunked_request`: チャンク形式のリクエストのサポートを有効にします。デフォルト値: `undef`。
+
+WSGIによるバーチャルホスト設定の例:
+
+``` puppet
+apache::vhost { 'wsgi.example.com':
+  port                        => '80',
+  docroot                     => '/var/www/pythonapp',
+  wsgi_daemon_process         => 'wsgi',
+  wsgi_daemon_process_options =>
+    { processes    => '2',
+      threads      => '15',
+      display-name => '%{GROUP}',
+     },
+  wsgi_process_group          => 'wsgi',
+  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+  wsgi_chunked_request        => 'On',
+}
+```
+
+#### `apache::vhost`のパラメータ`directories`
+
+`apache::vhost`クラスの`directories`パラメータは、バーチャルホストにハッシュの配列を渡し、[Directory](https://httpd.apache.org/docs/current/mod/core.html#directory)、[File](https://httpd.apache.org/docs/current/mod/core.html#files)、[Location](https://httpd.apache.org/docs/current/mod/core.html#location)ディレクティブブロックを作成します。これらのブロックは、'< Directory /path/to/directory>...< /Directory>'の形式をとります。
+
+`path`キーは、ディレクトリ、ファイル、ロケーションブロックのパスを設定します。この値は、'directory'、'files'、または'location'プロバイダのパスか、'directorymatch'、'filesmatch'、または 'locationmatch'プロバイダの正規表現でなければなりません。`directories`に渡される各ハッシュには、キーのひとつとして`path`が含まれていなければ**なりません**。
+
+`provider`キーはオプションです。設定されていない場合、このキーのデフォルトは'directory'になります。値: 'directory'、'files'、'proxy'、'location'、'directorymatch'、'filesmatch'、'proxymatch'、'locationmatch'。`provider`を'directorymatch'に設定すると、 Apache設定ファイルでキーワード'DirectoryMatch'が使用されます。
+
+`directories`の使用例:
+
+``` puppet
+apache::vhost { 'files.example.net':
+  docroot     => '/var/www/files',
+  directories => [
+    { 'path'     => '/var/www/files',
+      'provider' => 'files',
+      'deny'     => 'from all',
+     },
+  ],
+}
+```
+
+> **注意:** 少なくとも1つのディレクトリが`docroot`パラメータとマッチする必要があります。ディレクトリの宣言を開始すると、`apache::vhost`は必要なすべてのディレクトリブロックが宣言されるものと見なします。定義されない場合、`docroot`パラメータにマッチする1つのデフォルトディレクトリブロックが作成されます。
+
+`directory`、`files`、または`location`ハッシュ内に、使用可能なハンドラを配置し、キーとして表す必要があります。以下のようになります。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [ { path => '/path/to/directory', handler => value } ],
+}
+```
+
+これらのハッシュで設定していないハンドラは、Puppet内で'undefined'と見なされ、バーチャルホストに追加されず、モジュールではデフォルト値が使われます。サポートされているハンドラは、次のとおりです。
+
+##### `addhandlers`
+
+[AddHandler](https://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler)ディレクティブを設定します。これは、ファイル名の拡張子を指定されたハンドラにマッピングするものです。ハッシュのリストを使用し、`extensions`はハンドラによりマッピングされた拡張子を記述するために使用されます。`{ handler => 'handler-name', extensions => ['extension'] }`の形式をとります。
+
+例:
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
+    },
+  ],
+}
+```
+
+##### `allow`
+
+[Allow](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow)ディレクティブを設定します。これは、ホスト名またはIPに基づく認証をグループ化するものです。**廃止予定:**このパラメータは、Apacheが変更されたため、廃止予定になっています。Apache 2.2以下でのみ機能します。1つのルールに対する単一の文字列としても、複数のルールに対する配列としても使用できます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      allow => 'from example.org',
+    },
+  ],
+}
+```
+
+##### `allow_override`
+
+[.htaccess](https://httpd.apache.org/docs/current/mod/core.html#allowoverride)ファイルで許可されるディレクティブのタイプを設定します。配列を使用できます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot      => '/path/to/directory',
+  directories  => [
+    { path           => '/path/to/directory',
+      allow_override => ['AuthConfig', 'Indexes'],
+    },
+  ],
+}
+```
+
+##### `auth_basic_authoritative`
+
+[AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative)の値を設定します。これにより、下位のApacheモジュールに権限と認証を渡すかどうかが決定されます。
+
+##### `auth_basic_fake`
+
+[AuthBasicFake](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake)の値を設定します。これにより、任意のディレクティブブロックに関する認証情報が静的に設定されます。
+
+##### `auth_basic_provider`
+
+[AuthBasicProvider](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider)の値を設定します。これにより、任意のロケーションの認証プロバイダが設定されます。
+
+##### `auth_digest_algorithm`
+
+[AuthDigestAlgorithm](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm)の値を設定します。これにより、チャレンジおよびレスポンスハッシュの計算に用いるアルゴリズムを選択します。
+
+###### `auth_digest_domain`
+
+[AuthDigestDomain](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain)の値を設定します。これにより、ダイジェスト認証に関して、同じ保護スペースで1つまたは複数のURIを指定できます。
+
+##### `auth_digest_nonce_lifetime`
+
+[AuthDigestNonceLifetime](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime)の値を設定します。これにより、サーバのノンスが有効になる長さを制御します。
+
+##### `auth_digest_provider`
+
+[AuthDigestProvider](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider)の値を設定します。これにより、任意のロケーションに関する認証プロバイダを設定します。
+
+##### `auth_digest_qop`
+
+[AuthDigestQop](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop)の値を設定します。これにより、ダイジェスト認証で用いる保護品質を決定します。
+
+##### `auth_digest_shmem_size`
+
+[AuthAuthDigestShmemSize](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize)の値を設定します。これにより、クライアントの追跡に関して、サーバに割り当てられる共通メモリの量を定義します。
+
+##### `auth_group_file`
+
+[AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile)の値を設定します。これにより、認証に関して、ユーザグループのリストを含むテキストファイルの名前を設定します。
+
+##### `auth_name`
+
+[AuthName](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname)の値を設定します。これにより、認証領域の名前を設定します。
+
+##### `auth_require`
+
+アクセスを許可するのに必要なエンティティ名を設定します。詳細については、[Require](https://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives)を参照してください。
+
+##### `auth_type`
+
+[AuthType](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype)の値を設定します。これにより、ユーザ認証のタイプをガイドします。
+
+##### `auth_user_file`
+
+[AuthUserFile](https://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile)の値を設定します。これにより、認証に関するユーザ/パスワードを含むテキストファイルの名前を設定します。
+
+##### `auth_merging`
+
+[AuthMerging](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#authmerging)の値を設定します。これにより、認証ロジックを組み合わせるかどうかを決定します。
+
+##### `auth_ldap_url`
+
+[AuthLDAPURL](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapurl)の値を設定します。これにより、AuthBasicProvider 'ldap'を使用する場合のLDAPサーバのURLを決定します。
+
+##### `auth_ldap_bind_dn`
+
+[AuthLDAPBindDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbinddn)の値を設定します。これにより、AuthBasicProvider 'ldap'を使用する場合に、エントリの検索時にLDAPサーバにバインドするオプションのDNを使用できるようになります。
+
+##### `auth_ldap_bind_password`
+
+[AuthLDAPBindPassword](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbindpassword)の値を設定します。これにより、AuthBasicProvider 'ldap'を使用する場合に、バインドDNとともに用いるオプションのバインドパスワードを使用できるようになります。
+
+##### `auth_ldap_group_attribute`
+
+[AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute)の値の配列。ldapグループ内のユーザメンバーの確認に使用するLDAP属性を指定します。
+
+デフォルト値: "member"および "uniquemember"。
+
+##### `auth_ldap_group_attribute_is_dn`
+
+[AuthLDAPGroupAttributeIsDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattributeisdn)の値を設定し、ldapグループのメンバーにDNかシンプルなユーザ名のどちらを使用するかを指定します。onに設定すると、グループメンバーシップの確認時に、クライアントユーザ名の識別名が使用されます。そうでない場合は、ユーザ名が使われます。有効な値は"on"か"off"です。
+
+##### `custom_fragment`
+
+カスタム設定ディレクティブの文字列を渡し、ディレクトリ設定の最後に配置します。
+
+``` puppet
+apache::vhost { 'monitor':
+  …
+  directories => [
+    {
+      path => '/path/to/directory',
+      custom_fragment => '
+<Location /balancer-manager>
+  SetHandler balancer-manager
+  Order allow,deny
+  Allow from all
+</Location>
+<Location /server-status>
+  SetHandler server-status
+  Order allow,deny
+  Allow from all
+</Location>
+ProxyStatus On',
+    },
+  ]
+}
+```
+
+##### `dav`
+
+[Dav](http://httpd.apache.org/docs/current/mod/mod_dav.html#dav)の値を設定します。これにより、WebDAV HTTPメソッドを有効にするかどうかを決定します。値としては、'On'、'Off'、またはプロバイダの名前を使用できます。'On'に設定すると、`mod_dav_fs`モジュールにより実装されているデフォルトのファイルシステムプロバイダが有効になります。 
+
+##### `dav_depth_infinity`
+
+[DavDepthInfinity](http://httpd.apache.org/docs/current/mod/mod_dav.html#davdepthinfinity)の値を設定します。これは、`Depth: Infinity`ヘッダを持つ`PROPFIND`リクエストの処理を有効にするのに使用されます。
+
+##### `dav_min_timeout`
+
+[DavMinTimeout](http://httpd.apache.org/docs/current/mod/mod_dav.html#davmintimeout)の値を設定します。DAVリソースでサーバがロック状態を維持する時間(秒数)を指定します。
+
+##### `deny`
+
+[Deny](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny)ディレクティブを設定し、サーバへのアクセスを否定するホストを指定します。**廃止予定:** このパラメータは、Apacheが変更されたため、廃止予定になっています。Apache 2.2以下でのみ機能します。1つのルールに対する単一の文字列としても、複数のルールに対する配列としても使用できます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path => '/path/to/directory',
+      deny => 'from example.org',
+    },
+  ],
+}
+```
+
+##### `error_documents`
+
+ディレクトリの[ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)設定をオーバーライドするハッシュの配列。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  directories => [
+    { path            => '/srv/www',
+      error_documents => [
+        { 'error_code' => '503',
+          'document'   => '/service-unavail',
+        },
+      ],
+    },
+  ],
+}
+```
+
+##### `ext_filter_options`
+
+[ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html)ディレクティブを設定します。
+このディレクティブを使用する前に、`class { 'apache::mod::ext_filter': }`を宣言する必要があります。
+
+``` puppet
+apache::vhost { 'filter.example.org':
+  docroot     => '/var/www/filter',
+  directories => [
+    { path               => '/var/www/filter',
+      ext_filter_options => 'LogStderr Onfail=abort',
+    },
+  ],
+}
+```
+
+##### `geoip_enable`
+
+[GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration)ディレクティブを設定します。
+このディレクティブを使用する前に、`class {'apache::mod::geoip': }`を宣言する必要があります。
+
+``` puppet
+apache::vhost { 'first.example.com':
+  docroot     => '/var/www/first',
+  directories => [
+    { path         => '/var/www/first',
+      geoip_enable => `true`,
+    },
+  ],
+}
+```
+
+##### `headers`
+
+[Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header)ディレクティブの行を追加します。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => {
+    path    => '/path/to/directory',
+    headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+  },
+}
+```
+
+##### `index_options`
+
+[ディレクトリインデキシング](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions)の設定を可能にします。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path           => '/path/to/directory',
+      directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work
+      options        => ['Indexes','FollowSymLinks','MultiViews'],
+      index_options  => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
+    },
+  ],
+}
+```
+
+##### `index_order_default`
+
+ディレクトリインデックスの[デフォルトの順序付け](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault)を設定します。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path                => '/path/to/directory',
+      order               => 'Allow,Deny',
+      index_order_default => ['Descending', 'Date'],
+    },
+  ],
+}
+```
+
+###### `index_style_sheet`
+
+[IndexStyleSheet](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet)を設定します。これにより、ディレクトリインデックスにCSSスタイルシートが追加されます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      options           => ['Indexes','FollowSymLinks','MultiViews'],
+      index_options     => ['FancyIndexing'],
+      index_style_sheet => '/styles/style.css',
+    },
+  ],
+}
+```
+
+##### `limit`
+
+ディレクトリブロック内に[Limit](https://httpd.apache.org/docs/current/mod/core.html#limit)ブロックを作成します。`require`ディレクティブを含めることもできます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/docroot',
+  directories => [
+    { path     => '/',
+      provider => 'location',
+      limit    => [
+        { methods => 'GET HEAD',
+          require => ['valid-user']
+        },
+      ],
+    },
+  ],
+}
+```
+
+##### `limit_except`
+
+ディレクトリブロック内に[LimitExcept](https://httpd.apache.org/docs/current/mod/core.html#limitexcept)ブロックを作成します。`require`ディレクティブを含めることもできます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/docroot',
+  directories => [
+    { path         => '/',
+      provider     => 'location',
+      limit_except => [
+        { methods => 'GET HEAD',
+          require => ['valid-user']
+        },
+      ],
+    },
+  ],
+}
+```
+
+##### `mellon_enable`
+
+[MellonEnable][`mod_auth_mellon`]ディレクトリを設定し、 [`mod_auth_mellon`][]を有効にします。[`apache::mod::auth_mellon`][]を使って`mod_auth_mellon`をインストールできます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path                       => '/',
+      provider                   => 'directory',
+      mellon_enable              => 'info',
+      mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key',
+      mellon_endpoint_path       => '/mellon',
+      mellon_set_env_no_prefix   => { 'ADFS_GROUP' => 'http://schemas.xmlsoap.org/claims/Group',
+                                      'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress', },
+      mellon_user => 'ADFS_LOGIN',
+    },
+    { path          => '/protected',
+      provider      => 'location',
+      mellon_enable => 'auth',
+      auth_type     => 'Mellon',
+      auth_require  => 'valid-user',
+      mellon_cond   => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]'],
+    },
+  ]
+}
+```
+
+関連するパラメータは、`mod_auth_mellon`ディレクティブの名前に従います。
+
+- `mellon_cond`: アクセスを許可するために満たす必要のあるmellon条件の配列をとり、配列内の各アイテムについて [MellonCond][`mod_auth_mellon`]ディレクティブを作成します。
+- `mellon_endpoint_path`: [MellonEndpointPath][`mod_auth_mellon`]を設定し、mellonエンドポイントパスを設定します。
+- `mellon_sp_metadata_file`: SPメタデータファイルの[MellonSPMetadataFile][`mod_auth_mellon`]ロケーションを設定します。
+- `mellon_idp_metadata_file`: IDPメタデータファイルの[MellonIDPMetadataFile][`mod_auth_mellon`]ロケーションを設定します。
+- `mellon_saml_rsponse_dump`: [MellonSamlResponseDump][`mod_auth_mellon`]ディレクティブを設定し、SAMLのデバッグを有効にします。
+- `mellon_set_env_no_prefix`:環境変数にマッピングする属性名のハッシュに関する [MellonSetEnvNoPrefix][`mod_auth_mellon`]ディレクティブを
+設定します。
+- `mellon_sp_private_key_file`: サービスプロバイダのプライベートキー保存場所に関する[MellonSPPrivateKeyFile][`mod_auth_mellon`]ディレクティブを設定します。
+- `mellon_sp_cert_file`: サービスプロバイダの公開キー保存場所に関する[MellonSPCertFile][`mod_auth_mellon`]ディレクティブを設定します。
+- `mellon_user`: ユーザ名に関して使用する[MellonUser][`mod_auth_mellon`]属性を設定します。
+
+##### `options`
+
+任意のディレクトリブロックに関する[オプション](https://httpd.apache.org/docs/current/mod/core.html#options)をリスト化します。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      options => ['Indexes','FollowSymLinks','MultiViews'],
+    },
+  ],
+}
+```
+
+##### `order`
+
+[Apacheコアドキュメント](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order)に従い、AllowおよびDenyステートメントの処理順序を設定します。**廃止予定:** このパラメータは、Apacheが変更されたため、廃止予定になっています。Apache 2.2以下でのみ機能します。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      order => 'Allow,Deny',
+    },
+  ],
+}
+```
+
+##### `passenger_enabled`
+
+[PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled)ディレクティブの値を'on'または'off'に設定します。`apache::mod::passenger`を含める必要があります。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      passenger_enabled => 'on',
+    },
+  ],
+}
+```
+
+> **注意:** PassengerEnabledディレクティブをPassengerHighPerformanceディレクティブとともに使用すると、[問題](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)が生じます。
+
+##### `php_value`および`php_flag`
+
+`php_value`はディレクトリの値を設定し、`php_flag`はブーリアンを用いてディレクトリを設定します。詳細は[こちら](http://php.net/manual/en/configuration.changes.php)で確認できます。
+
+##### `php_admin_value`および`php_admin_flag`
+
+`php_admin_value`はディレクトリの値を設定し、`php_admin_flag`はブーリアンを用いてディレクトリを設定します。詳細は[こちら](http://php.net/manual/en/configuration.changes.php)で確認できます。
+
+
+##### `require`
+
+
+[Apache Authzドキュメント](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#require)に従い、`Require`ディレクティブを設定します。`require`が設定されていない場合、`Require all granted`がデフォルトになります。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      require => 'ip 10.17.42.23',
+    }
+  ],
+}
+```
+
+より複雑な要件設定が必要な場合、apache >= 2.4では[RequireAll](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireall)、[RequireNone](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requirenone)または[RequireAny](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireany)ディレクティブを使用できます。'any'、'none'、'all'のみをサポートする(その他の値は無視されます)'enforce'キーを使うと、以下のように設定できます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      require => {
+        enforce  => 'any',
+        requires => [
+          'ip 1.2.3.4',
+          'not host host.example.com',
+          'user xyz',
+        ],
+      },
+    },
+  ],
+}
+```
+
+`require`を`unmanaged`に設定すると、何も設定されません。これは、カスタムフラグメントで扱われる複雑な認証/権限要件に役立ちます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      require => 'unmanaged',
+    }
+  ],
+}
+```
+
+
+
+##### `satisfy`
+
+[Apacheコアドキュメント](https://httpd.apache.org/docs/2.2/mod/core.html#satisfy)に従い、`Satisfy`ディレクティブを設定します。**廃止予定:** このパラメータは、Apacheが変更されたため、廃止予定になっています。Apache 2.2以下でのみ機能します。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      satisfy => 'Any',
+    }
+  ],
+}
+```
+
+##### `sethandler`
+
+[Apache Coreドキュメント](https://httpd.apache.org/docs/2.2/mod/core.html#sethandler)に従い、`SetHandler`ディレクティブを設定します。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path       => '/path/to/directory',
+      sethandler => 'None',
+    }
+  ],
+}
+```
+
+##### `set_output_filter`
+
+[Apache Coreドキュメント](https://httpd.apache.org/docs/current/mod/core.html#setoutputfilter)に従い、`SetOutputFilter`ディレクティブを設定します。
+
+``` puppet
+apache::vhost{ 'filter.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      set_output_filter => puppetdb-strip-resource-params,
+    },
+  ],
+}
+```
+
+##### `rewrites`
+
+バーチャルホストディレクトリ内でURL [`rewrites`](#rewrites)ルールを作成します。ハッシュの配列が求められます。ハッシュキーは'comment'、'rewrite_base'、'rewrite_cond'または'rewrite_rule'のいずれかにすることができます。
+
+``` puppet
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      rewrites => [ { comment      => 'Permalink Rewrites',
+                      rewrite_base => '/'
+                    },
+                    { rewrite_rule => [ '^index\.php$ - [L]' ]
+                    },
+                    { rewrite_cond => [ '%{REQUEST_FILENAME} !-f',
+                                        '%{REQUEST_FILENAME} !-d',
+                                      ],
+                      rewrite_rule => [ '. /index.php [L]' ],
+                    }
+                  ],
+    },
+  ],
+}
+```
+
+> **注意**: ディレクトリにリライトを含める場合は、`apache::mod::rewrite`も含めてください。また、バーチャルホストのディレクトリのリライト設定ではなく、`apache::vhost`の`rewrites`パラメータを用いたリライトの設定を考慮してください。
+
+##### `shib_request_settings`
+
+アプリケーションリクエストに関して、有効なコンテンツ設定の設定または変更を可能にします。このコマンドは、次の2つのパラメータをとります: コンテンツ設定の名前、およびそれについて設定する値。有効な設定については、Shibboleth [コンテンツ設定ドキュメント](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings)を参照してください。このキーは、`apache::mod::shib`が定義されていない場合は無効になります。詳細については、[`mod_shib`ドキュメント](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions)を参照してください。
+
+``` puppet
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path                  => '/path/to/directory',
+      shib_request_settings => { 'requiresession' => 'On' },
+      shib_use_headers      => 'On',
+    },
+  ],
+}
+```
+
+##### `shib_use_headers`
+
+'On'に設定すると、アプリケーションに属性を公開するリクエストヘッダの使用がオンになります。このキーの値は'On'または'Off'です。デフォルト値は'Off'です。このキーは、`apache::mod::shib`が定義されていない場合は無効になります。詳細については、[`mod_shib`ドキュメント](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions)を参照してください。
+
+##### `ssl_options`
+
+[SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)の文字列またはリスト。これにより、SSLエンジンのランタイムオプションが設定されます。このハンドラは、バーチャルホストの親ブロック内のSSLOptionsセットよりも優先されます。
+
+``` puppet
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      ssl_options => '+ExportCertData',
+    },
+    { path        => '/path/to/different/dir',
+      ssl_options => [ '-StdEnvVars', '+ExportCertData'],
+    },
+  ],
+}
+```
+
+##### `suphp`
+
+[suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG)設定に関する'user'および'group'キーを含むハッシュ。バーチャルホスト宣言で`suphp_engine => on`とともに使用する必要があり、`directories`内でのみ渡すことができます。
+
+``` puppet
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/directory',
+      suphp => {
+        user  => 'myappuser',
+        group => 'myappgroup',
+      },
+    },
+  ],
+}
+```
+##### `additional_includes`
+
+バーチャルホストディレクトリ内にある追加の静的な固有のApache設定ファイルのパスを指定します。値: 文字列パスの配列。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/different/dir',
+      additional_includes => [ '/custom/path/includes', '/custom/path/another_includes', ],
+    },
+  ],
+}
+```
+
+#### `apache::vhost`のSSLパラメータ
+
+`::vhost`のすべてのSSLパラメータは、基本の`apache`クラスで設定された値がデフォルトになります。以下のパラメータを使えば、特定のバーチャルホストに関する個別のSSL設定を調整できます。
+
+##### `ssl`
+
+バーチャルホストのSSLを有効にします。SSLバーチャルホストはHTTPSクエリにのみ応答します。値: ブーリアン。
+
+デフォルト値: `false`。
+
+##### `ssl_ca`
+
+SSL証明書認証局を指定します。
+
+デフォルト値: `undef`。
+
+##### `ssl_cert`
+
+SSL証明書を指定します。
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+* RedHat: '/etc/pki/tls/certs/localhost.crt'
+* Debian: '/etc/ssl/certs/ssl-cert-snakeoil.pem'
+* FreeBSD: '/usr/local/etc/apache22/server.crt'
+* Gentoo: '/etc/ssl/apache2/server.crt'
+
+##### `ssl_protocol`
+
+[SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol)を指定します。許可されるプロトコルの配列またはスペースで区切った文字列が求められます。
+
+デフォルト値: 'all'、'-SSLv2'、'-SSLv3'。
+
+##### `ssl_cipher`
+
+[SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite)を指定します。
+
+デフォルト値: 'HIGH:MEDIUM:!aNULL:!MD5'。
+
+##### `ssl_honorcipherorder`
+
+[SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder)を指定し、クライアントの優先順ではなくサーバの優先順をApacheに使用させます。値:
+
+値: ブーリアン、'on'、'off'。
+
+デフォルト値: `true`。
+
+##### `ssl_certs_dir`
+
+SSL証明書ディレクトリのロケーションを指定します。 
+
+デフォルト値: オペレーティングシステムによって異なります。
+
+- Debian: '/etc/ssl/certs'
+- Red Hat: '/etc/pki/tls/certs'
+- FreeBSD: `undef`
+- Gentoo: '/etc/ssl/apache2'
+
+##### `ssl_chain`
+
+SSLチェーンを指定します。このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります。
+
+デフォルト値: `undef`。
+
+##### `ssl_crl`
+
+使用する証明書失効リストを指定します。(このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります。)
+
+デフォルト値: `undef`。
+
+##### `ssl_crl_path`
+
+証明書失効リストの保存場所を指定します。(このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります。)
+
+デフォルト値: `undef`。
+
+##### `ssl_crl_check`
+
+[SSLCARevocationCheckディレクティブ](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck)により、証明書失効チェックレベルを設定します。このデフォルト値は設定しなくても機能しますが、本稼働環境でCRLを使用する際に指定する必要があります。Apache 2.4以上にのみ適用されます。それ以前のバージョンでは、この値は無視されます。
+
+デフォルト値: `undef`。
+
+##### `ssl_key`
+
+SSLキーを指定します。
+
+デフォルト値はオペレーティングシステムによって異なります。このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります。
+
+* RedHat: '/etc/pki/tls/private/localhost.key'
+* Debian: '/etc/ssl/private/ssl-cert-snakeoil.key'
+* FreeBSD: '/usr/local/etc/apache22/server.key'
+* Gentoo: '/etc/ssl/apache2/server.key'
+
+##### `ssl_verify_client`
+
+[SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient)ディレクティブを設定します。これにより、クライアント認証に関する証明書確認レベルが設定されます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_verify_client => 'optional',
+}
+```
+
+値: 'none'、'optional'、'require'、'optional_no_ca'。
+
+デフォルト値: `undef`。
+
+
+##### `ssl_verify_depth`
+
+[SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth)ディレクティブを設定します。これにより、クライアント認証確認におけるCA証明書の最大深さが指定されます。
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_verify_depth => 1,
+}
+```
+
+デフォルト値: `undef`。
+
+##### `ssl_proxy_protocol`
+
+[SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol)ディレクティブを設定します。これにより、プロキシに関するサーバ環境を確立する際に`mod_ssl`が使用すべきSSLプロトコルフレーバーを制御します。提示されたプロトコルのうちの1つのみを使用しているサーバに接続します。
+
+デフォルト値: `undef`。
+
+##### `ssl_proxy_verify`
+
+[SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify)ディレクティブを設定します。これにより、リクエストをリモートSSLサーバに転送するようにプロキシが設定されている場合のリモートサーバの証明書確認を設定します。
+
+デフォルト値: `undef`。
+
+##### `ssl_proxy_verify_depth`
+
+[SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth)ディレクティブを設定します。これにより、リモートサーバに有効な証明書がないと判断するにあたり、mod_sslが行う確認の深さを設定します。
+
+深さ0では、自己署名リモートサーバ証明書のみが許可されます。デフォルトの深さ 1では、リモートサーバ証明書を自己署名にすることも、サーバが直接知っているCAにより署名することもできます。
+
+デフォルト値: `undef`。
+
+##### `ssl_proxy_ca_cert`
+
+[SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile)ディレクティブを設定します。これにより、やりとりするリモートサーバに関する認証局(CA)の証明書を集められるオールインワンファイルを指定します。これはリモートサーバ認証に用いられます。このファイルは、PEMエンコード証明書ファイルを優先順に連結したものにする必要があります。
+
+デフォルト値: `undef`。
+
+##### `ssl_proxy_machine_cert`
+
+[SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile)ディレクティブを設定します。これにより、このサーバがリモートサーバの認証に用いる証明書とキーを保存するオールインワンファイルを指定します。このファイルは、PEMエンコード証明書ファイルを優先順に連結したものにする必要があります。 
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
+}
+```
+
+デフォルト値: `undef`。
+
+##### `ssl_proxy_check_peer_cn`
+
+[SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn)ディレクティブを設定します。これにより、リモートサーバの証明書のCNフィールドをリクエストURLのホスト名と比較するかどうかを指定します。 
+
+値: 'on'、'off'。
+
+デフォルト値: `undef`。
+
+##### `ssl_proxy_check_peer_name`
+
+[SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername)ディレクティブを設定します。これにより、リモートサーバの証明書のCNフィールドをリクエストURLのホスト名と比較するかどうかを決定します。
+
+値: 'on'、'off'。　
+
+デフォルト値: `undef`。
+
+##### `ssl_proxy_check_peer_expire`
+
+[SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire)ディレクティブを設定します。これにより、リモートサーバの証明書の有効期限をチェックするかどうかを指定します。
+
+値: 'on'、'off'。　
+
+デフォルト値: `undef`。
+
+##### `ssl_options`
+
+[SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)ディレクティブを設定します。これにより、各種のSSLエンジンのランタイムオプションを設定します。これは任意のバーチャルホスト全体の設定で、文字列にすることも配列にすることもできます。
+
+文字列:
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_options => '+ExportCertData',
+}
+```
+
+配列:
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_options => [ '+StrictRequire', '+ExportCertData' ],
+}
+```
+
+デフォルト値: `undef`。
+
+##### `ssl_openssl_conf_cmd`
+
+[SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)ディレクティブを設定します。これにより、OpenSSLパラメータを直接設定できます。
+
+デフォルト値: `undef`。
+
+##### `ssl_proxyengine`
+
+[SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine)を使用するかどうかを指定します。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+##### `ssl_stapling`
+
+[SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling)を使用するかどうかを指定します。デフォルトでは、全体で設定されているものを使用します。
+
+このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。
+
+ブーリアンまたは`undef`。
+
+デフォルト値: `undef`。
+
+##### `ssl_stapling_timeout`
+
+[SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout)ディレクティブの設定に使用できます。
+
+このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。　
+
+デフォルト値: なし。
+
+##### `ssl_stapling_return_errors`
+
+[SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors)ディレクティブの設定に使用できます。
+
+このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。　
+
+デフォルト値: なし。　
+
+#### 定義タイプ: FastCGIサーバ
+
+このタイプは、mod\_fastcgiとともに使用します。特定のファイルタイプを扱う1つまたは複数の外部FastCGIサーバを定義することができます。
+
+** 注意 ** Ubuntu 10.04+では、マルチバースリポジトリを手動で有効にする必要があります。
+
+例:
+
+``` puppet
+apache::fastcgi::server { 'php':
+  host        => '127.0.0.1:9000',
+  timeout     => 15,
+  flush       => `false`,
+  faux_path   => '/var/www/php.fcgi',
+  fcgi_alias  => '/php.fcgi',
+  file_type   => 'application/x-httpd-php',
+  pass_header => ''
+}
+```
+
+その後、バーチャルホスト内で、上で指定したfastcgiサーバで扱う特定のファイルタイプを設定することができます。
+
+``` puppet
+apache::vhost { 'www':
+  ...
+  custom_fragment => 'AddType application/x-httpd-php .php'
+  ...
+}
+```
+
+##### `host`
+
+FastCGIサーバのホスト名またはIPアドレスおよびTCPポート番号(1-65535)。
+
+unixソケットを渡すこともできます。
+
+``` puppet
+apache::fastcgi::server { 'php':
+  host        => '/var/run/fcgi.sock',
+}
+```
+
+##### `timeout`
+
+リクエストが中止され、(エラーLogLevel)にイベントが記録されるまでに、FastCGIアプリケーションが非アクティブの状態で待機する秒数。この非アクティブタイマーは、FastCGIアプリケーションとの接続が待機中の場合のみ適用されます。アプリケーションの待ち行列に入ったリクエストに対して、時間内に記述やフラッシュによる応答がないと、リクエストは中止されます。アプリケーションとの通信が完了したものの、クライアントとの通信が完了しなかった(応答がバッファリングされた)場合は、タイムアウトは適用されません。
+
+##### `flush`
+
+アプリケーションから受信したデータを、強制的にクライアントに書き込みます。デフォルトでは、アプリケーションをできるだけ早くフリーな状態にするために、`mod_fastcgi`はデータをバッファリングします。 
+
+##### `faux_path`
+
+ローカルファイルシステムに存在する必要はありません。Apacheがこのファイル名に解読するURIは、この外部FastCGIアプリケーションにより処理されます。
+
+##### `alias`
+
+一意のエイリアス。 アクションとFastCGIサーバをリンクさせるために内部で用いられます。
+
+##### `file_type`
+
+FastCGIサーバにより処理するファイルのMIMEタイプ。
+
+##### `pass_header`
+
+リクエスト環境で渡されるHTTPリクエストヘッダの名前。このオプションにより、通常はCGI環境で利用できないヘッダコンテンツ(認証など)が利用できるようになります。
+
+#### 定義タイプ: `apache::vhost::custom`
+
+`apache::vhost::custom`定義タイプは、 `apache::custom_config`定義タイプのシンラッパーで、Apacheにおいてバーチャルホストディレクトリに固有のデフォルト設定の一部をオーバーライドします。 
+
+**`apache::vhost::custom`内のパラメータ**:
+
+##### `content`
+
+設定ファイルのコンテンツを設定します。
+
+##### `ensure`
+
+バーチャルホストファイルが存在するかどうかを指定します。
+
+値: 'absent'、'present'。
+
+デフォルト値: 'present'。
+
+##### `priority`
+
+Apache HTTPD VirtualHost設定ファイルに関する相対的なロード順序を設定します。
+
+デフォルト値: '25'。
+
+##### `verify_config`
+
+Apacheサービスに通知する前に設定ファイルのバリデーションを行うかどうかを指定します。
+
+ブーリアン。
+
+デフォルト値: `true`。
+
+### プライベート定義タイプ
+
+#### 定義タイプ: `apache::peruser::multiplexer`
+
+この定義タイプは、Apacheモジュールにクラスがあるかどうかを確認します。クラスがある場合は、そのクラスを含めます。ない場合は、モジュール名を[`apache::mod`][]定義タイプに渡します。
+
+#### 定義タイプ: `apache::peruser::multiplexer`　
+
+FreeBSDに関してのみ、[`Peruser`][]モジュールを有効にします。
+
+#### 定義タイプ: `apache::peruser::processor`
+
+FreeBSDに関してのみ、[`Peruser`][]モジュールを有効にします。　
+
+#### 定義タイプ: `apache::security::file_link`
+
+[`apache::mod::security`][]の`activated_rules`をディスク上のそれぞれのCRSルールにリンクします。
+
+### テンプレート
+
+Apacheモジュールは、[`apache::vhost`][]および[`apache::mod`][]定義タイプを有効にするにあたり、テンプレートに大きく依存しています。このテンプレートは、オペレーティングシステムに固有の[Facter][] factsをベースに構築されています。明示的にコールアウトされない限り、ほとんどのテンプレートは設定には使われません。
+
+### 関数
+#### apache_pw_hash
+Apacheが読みこむhtpasswdファイルに適したフォーマットでパスワードをハッシュします。
+
+現在はSHAハッシュを使用しています。これは、このフォーマットは安全ではないとされているものの、ほとんどのプラットフォームでサポートされているもっとも安全なフォーマットであるためです。
+
+## 制約事項
+
+### 全般
+
+このモジュールは、以下に関して、[オープンソースPuppet][]および[Puppet Enterprise][]の両方でCIテストが実施されています。
+
+- CentOS 5および6
+- Ubuntu 12.04および14.04
+- Debian 7
+- RHEL 5、6、7
+
+このモジュールでは、FreeBSD、Gentoo、Amazon Linuxなどの、他のディストリビューションおよびオペレーティングシステムで使用できる機能も提供されていますが、そうしたシステムについては公式なテストは実施されておらず、新たに不具合が生じる可能性があります。
+
+### FreeBSD
+
+FreeBSDでこのモジュールを使用するには、apache24-2.4.12 (www/apache24)以降を使用する_必要があります_。 
+
+### Gentoo
+
+Gentooでは、このモジュールは[`gentoo/puppet-portage`][] Puppetモジュールに依存します。Gentooに関しては、一部の機能や設定が適用または有効化されますが、このモジュールに[対応するオペレーティングシステム][]ではありません。
+
+### RHEL/CentOS
+[`apache::mod::auth_cas`][]、[`apache::mod::passenger`][]、[`apache::mod::proxy_html`][]、[`apache::mod::shib`][]クラスは、追加のリポジトリから依存関係パッケージが提供されていなければ、RH/CentOSでは機能しません。
+
+関連するリポジトリとパッケージについては、以下の各ドキュメントを参照してください。
+
+#### RHEL/CentOS 5
+
+[`apache::mod::passenger`][]および[`apache::mod::proxy_html`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。
+
+#### RHEL/CentOS 6
+
+[`apache::mod::passenger`][]クラスは、EL6リポジトリに適合するパッケージがないため、インストールされません。
+
+#### RHEL/CentOS 7
+
+[`apache::mod::passenger`][]および[`apache::mod::proxy_html`][]クラスは、EL7リポジトリに適合するパッケージがないため、テストされていません。また、[`apache::vhost`][]定義タイプの[`rack_base_uris`][]パラメータも、同様の理由でテストされていません。
+
+### SELinuxおよびカスタムパス
+
+[SELinux][]が[適用モード][]になっていて、`logroot`、`mod_dir`、`vhost_dir`、`docroot`に関してカスタムパスを使用したい場合は、ファイルのコンテキストを各自で管理する必要があります。
+
+これにはPuppetを使用できます。
+
+``` puppet
+exec { 'set_apache_defaults':
+  command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"',
+  path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+  require => Package['policycoreutils-python'],
+}
+
+package { 'policycoreutils-python':
+  ensure => installed,
+}
+
+exec { 'restorecon_apache':
+  command => 'restorecon -Rv /apache_spec',
+  path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+  before  => Class['Apache::Service'],
+  require => Class['apache'],
+}
+
+class { 'apache': }
+
+host { 'test.server':
+  ip => '127.0.0.1',
+}
+
+file { '/custom/path':
+  ensure => directory,
+}
+
+file { '/custom/path/include':
+  ensure  => present,
+  content => '#additional_includes',
+}
+
+apache::vhost { 'test.server':
+  docroot             => '/custom/path',
+  additional_includes => '/custom/path/include',
+}
+```
+
+`chcon`ではなく、`semanage fcontext`を用いてコンテキストを設定する必要があります。これは、Puppetの`file`リソースでは、リソースにより指定されていない場合、その値のコンテキストがリセットされるためです。
+
+### Ubuntu 10.04
+
+[`apache::vhost::WSGIImportScript`][]パラメータにより、Apacheの古いバージョンではサポートされていないバーチャルホスト内のステートメントが作成され、不具合が生じます。これは今後のリファクタリングで修正される予定です。
+
+### Ubuntu 16.04
+[`apache::mod::suphp`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。
+
+## 開発
+
+### 貢献
+
+[Puppet Forge][]上の[Puppet][]モジュールはオープンプロジェクトであり、その価値を維持するにはコミュニティからの貢献が欠かせません。Puppetが提供する膨大な数のプラットフォームや、無数のハードウェア、ソフトウェア、デプロイ設定に弊社がアクセスすることは不可能です。
+
+できるだけ変更に簡単に貢献していただき、お使いの環境でモジュールが動作するようにしたいと考えています。モジュールの品質の維持と改善のため、Puppetは貢献者に守っていただくガイドラインを設けています。
+
+詳細については、[モジュールコントリビューションガイド][]を参照してください。
+
+### テスト
+
+このプロジェクトには、機能検証のための[rspec-puppet][]および[beaker-rspec][]に関するテストが含まれています。このツールの詳しい使い方については、それぞれのドキュメントを参照してください。
+
+#### テストのクイックスタート: Ruby > 1.8.7
+
+```
+gem install bundler
+bundle install
+bundle exec rake spec
+bundle exec rspec spec/acceptance
+RS_DEBUG=yes bundle exec rspec spec/acceptance
+```
+
+#### テストのクイックスタート: Ruby = 1.8.7
+
+```
+gem install bundler
+bundle install --without system_tests
+bundle exec rake spec
+```

From 04e489989408e20966552214ec2e547cb3fdd6df Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Wed, 13 Sep 2017 23:04:27 +1000
Subject: [PATCH 1245/2267] Updating translations for readmes/README_ja_JP.md


From 497a318489432bbe8aa73c0e45164728f3777f78 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Wed, 13 Sep 2017 23:06:58 +1000
Subject: [PATCH 1246/2267] Updating translations for readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index fdb38df172..6b14af7341 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -2391,7 +2391,7 @@ NSS暗号化ライブラリを使用するApacheのSSLプロバイダ。
 
 >**注意**: passengerモジュールは、EPELにより提供される依存関係パッケージと`mod_passengers`カスタムリポジトリがなければ、RH/CentOSでは使用できません。前述の`manage_repo`パラメータと[https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()を参照してください。
 
-**パラメータ**: [TODO: パラメータがリスト化されていなかったため(`manage_repo`は除く)、マニフェストから引き出しました。これらのパラメータの機能と可能な値、または(前述のmod_pagespeedによる)パラメータマッピングに関する外部ドキュメントを示すリンクを知る必要があります。<!--MODULES-4745も参照-->]
+**パラメータ**:__``<>
 
 * `passenger_conf_file`: `$::apache::params::passenger_conf_file`
 * `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file`

From 2dcba163935eee9013af9241fed4d877b1dfd393 Mon Sep 17 00:00:00 2001
From: Eric Putnam <putnam.eric@gmail.com>
Date: Wed, 13 Sep 2017 10:55:14 -0700
Subject: [PATCH 1247/2267] readme link fix [skip ci]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d75eb1fd8d..b191e53c45 100755
--- a/README.md
+++ b/README.md
@@ -5030,7 +5030,7 @@ Default: `undef`.
 
 ##### `ssl_crl_check`
 
-Sets the certificate revocation check level via the [SSLCARevocationCheck directive] for ssl client authentication (https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck). The default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck) for ssl client authentication. The default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
 
 Default: `undef`.
 

From 2b5a8b487c992b83a7316a3e4bd18566d69a9a95 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Thu, 14 Sep 2017 11:04:05 +0100
Subject: [PATCH 1248/2267] (maint) - Removing Debian 6 Support

Removing Debian 6 from metadata. According to
https://docs.puppet.com/pe/latest/sys_req_os.html Debian 6 is no longer
supported.
---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 88a87b6ea1..237edfdd57 100644
--- a/metadata.json
+++ b/metadata.json
@@ -47,7 +47,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]

From c837e1c264ae4bb654e8809f614edd0f7c0975d7 Mon Sep 17 00:00:00 2001
From: Hailee Kenney <hailee@puppetlabs.com>
Date: Mon, 18 Sep 2017 14:55:08 -0700
Subject: [PATCH 1249/2267] (maint) modulesync 892c4cf

---
 CONTRIBUTING.md     | 222 +++++++++++++++++++++++++++-----------------
 locales/config.yaml |   1 +
 2 files changed, 139 insertions(+), 84 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 990edba7e7..1a9fb3a5cd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,63 +1,75 @@
-Checklist (and a short version for the impatient)
-=================================================
+# Contributing to Puppet modules
 
-  * Commits:
+So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing
+that very thing while setting expectations around code quality as well as a few tips for making the
+process as easy as possible. 
 
-    - Make commits of logical units.
+### Table of Contents
 
-    - Check for unnecessary whitespace with "git diff --check" before
-      committing.
+1. [Getting Started](#getting-started)
+1. [Commit Checklist](#commit-checklist)
+1. [Submission](#submission)
+1. [More about commits](#more-about-commits)
+1. [Testing](#testing)
+    - [Running Tests](#running-tests)
+    - [Writing Tests](#writing-tests)
+1. [Get Help](#get-help)
 
-    - Commit using Unix line endings (check the settings around "crlf" in
-      git-config(1)).
+## Getting Started
 
-    - Do not check in commented out code or unneeded files.
+- Fork the module repository on GitHub and clone to your workspace
 
-    - The first line of the commit message should be a short
-      description (50 characters is the soft limit, excluding ticket
-      number(s)), and should skip the full stop.
+- Make your changes!
 
-    - Associate the issue in the message. The first line should include
-      the issue number in the form "(#XXXX) Rest of message".
+## Commit Checklist
 
-    - The body should provide a meaningful commit message, which:
+### The Basics
 
-      - uses the imperative, present tense: "change", not "changed" or
-        "changes".
+- [x] my commit is a single logical unit of work
 
-      - includes motivation for the change, and contrasts its
-        implementation with the previous behavior.
+- [x] I have checked for unnecessary whitespace with "git diff --check" 
 
-    - Make sure that you have tests for the bug you are fixing, or
-      feature you are adding.
+- [x] my commit does not include commented out code or unneeded files
 
-    - Make sure the test suites passes after your commit:
-      `bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
+### The Content
 
-    - When introducing a new feature, make sure it is properly
-      documented in the README.md
+- [x] my commit includes tests for the bug I fixed or feature I added
 
-  * Submission:
+- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality
+    
+- [x] my code passes existing test suites
 
-    * Pre-requisites:
+### The Commit Message
 
-      - Make sure you have a [GitHub account](https://github.com/join)
+- [x] the first line of my commit message includes:
 
-      - [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
+  - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" 
+  
+  - [x] a short description (50 characters is the soft limit, excluding ticket number(s))
 
-    * Preferred method:
+- [x] the body of my commit message:
 
-      - Fork the repository on GitHub.
+  - [x] is meaningful
 
-      - Push your changes to a topic branch in your fork of the
-        repository. (the format ticket/1234-short_description_of_change is
-        usually preferred for this project).
+  - [x] uses the imperative, present tense: "change", not "changed" or "changes"
 
-      - Submit a pull request to the repository in the puppetlabs
-        organization.
+  - [x] includes motivation for the change, and contrasts its implementation with the previous behavior
 
-The long version
-================
+## Submission
+
+### Pre-requisites
+
+- Make sure you have a [GitHub account](https://github.com/join)
+
+- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
+
+### Push and PR
+
+- Push your changes to your fork
+
+- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization
+
+## More about commits 
 
   1.  Make separate commits for logically separate changes.
 
@@ -104,37 +116,32 @@ The long version
       GitHub has some pretty good
       [general documentation](http://help.github.com/) on using
       their site.  They also have documentation on
-      [creating pull requests](http://help.github.com/send-pull-requests/).
+      [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).
 
       In general, after pushing your topic branch up to your
       repository on GitHub, you can switch to the branch in the
       GitHub UI and click "Pull Request" towards the top of the page
       in order to open a pull request.
 
+  3.  Update the related JIRA issue.
 
-  3.  Update the related GitHub issue.
-
-      If there is a GitHub issue associated with the change you
+      If there is a JIRA issue associated with the change you
       submitted, then you should update the ticket to include the
       location of your branch, along with any other commentary you
       may wish to make.
 
-Testing
-=======
+# Testing
 
-Getting Started
----------------
+## Getting Started
 
-Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
-package manager such as [bundler](http://bundler.io/) what Ruby packages,
+Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages,
 or Gems, are required to build, develop, and test this software.
 
-Please make sure you have [bundler installed](http://bundler.io/#getting-started)
-on your system, then use it to install all dependencies needed for this project,
-by running
+Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to 
+install all dependencies needed for this project in the project root by running
 
 ```shell
-% bundle install
+% bundle install --path .bundle/gems
 Fetching gem metadata from https://rubygems.org/........
 Fetching gem metadata from https://rubygems.org/..
 Using rake (10.1.0)
@@ -148,7 +155,7 @@ Your bundle is complete!
 Use `bundle show [gemname]` to see where a bundled gem is installed.
 ```
 
-NOTE some systems may require you to run this command with sudo.
+NOTE: some systems may require you to run this command with sudo.
 
 If you already have those gems installed, make sure they are up-to-date:
 
@@ -156,26 +163,27 @@ If you already have those gems installed, make sure they are up-to-date:
 % bundle update
 ```
 
-With all dependencies in place and up-to-date we can now run the tests:
+## Running Tests
+
+With all dependencies in place and up-to-date, run the tests:
+
+### Unit Tests
 
 ```shell
 % bundle exec rake spec
 ```
 
-This will execute all the [rspec tests](http://rspec-puppet.com/) tests
-under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
-and so on. rspec tests may have the same kind of dependencies as the
-module they are testing. While the module defines in its [Modulefile](./Modulefile),
+This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. 
+rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json),
 rspec tests define them in [.fixtures.yml](./fixtures.yml).
 
-Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
-tests. These tests spin up a virtual machine under
-[VirtualBox](https://www.virtualbox.org/)) with, controlling it with
-[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
-scenarios. In order to run these, you will need both of those tools
-installed on your system.
+### Acceptance Tests
+
+Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under
+[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test
+scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system.
 
-You can run them by issuing the following command
+Run the tests by issuing the following command
 
 ```shell
 % bundle exec rake spec_clean
@@ -183,35 +191,81 @@ You can run them by issuing the following command
 ```
 
 This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
-install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
+install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
 and then run all the tests under [spec/acceptance](./spec/acceptance).
 
-Writing Tests
--------------
+## Writing Tests
+
+### Unit Tests
 
-XXX getting started writing tests.
+When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a 
+catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] 
+but here's a tiny sample:
 
-If you have commit access to the repository
-===========================================
+Sample manifest:
 
-Even if you have commit access to the repository, you will still need to
-go through the process above, and have someone else review and merge
-in your changes.  The rule is that all changes must be reviewed by a
-developer on the project (that did not write the code) to ensure that
-all changes go through a code review process.
+```puppet
+file { "a test file":
+  ensure => present,
+  path   => "/etc/sample",
+}
+```
+
+Sample test:
 
-Having someone other than the author of the topic branch recorded as
-performing the merge is the record that they performed the code
-review.
+```ruby
+it 'does a thing' do
+  expect(subject).to contain_file("a test file").with({:path => "/etc/sample"})
+end
+```
 
+### Acceptance Tests
+
+Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it
+twice to check for idempotency or errors, then run expectations.
+
+```ruby
+it 'does an end-to-end thing' do
+  pp = <<-EOF
+    file { 'a test file': 
+      ensure  => present,
+      path    => "/etc/sample",
+      content => "test string",
+    }
+    
+  apply_manifest(pp, :catch_failures => true)
+  apply_manifest(pp, :catch_changes => true)
+  
+end
+
+describe file("/etc/sample") do
+  it { is_expected.to contain "test string" }
+end
 
-Additional Resources
-====================
+```
 
-* [Getting additional help](http://puppet.com/community/get-help)
+# If you have commit access to the repository
 
-* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
+Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge
+in your changes.  The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that
+all changes go through a code review process.**
 
-* [General GitHub documentation](http://help.github.com/)
+The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch.
 
+# Get Help
+
+### On the web
+* [Puppet help messageboard](http://puppet.com/community/get-help)
+* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
+* [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+
+### On chat
+* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli
+* IRC (freenode) #puppet-dev, #voxpupuli
+
+
+[rspec-puppet]: http://rspec-puppet.com/
+[rspec-puppet_docs]: http://rspec-puppet.com/documentation/
+[beaker]: https://github.com/puppetlabs/beaker
+[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
diff --git a/locales/config.yaml b/locales/config.yaml
index 0ec10ba977..c837de7d08 100644
--- a/locales/config.yaml
+++ b/locales/config.yaml
@@ -22,4 +22,5 @@ gettext:
   # Patterns for +Dir.glob+ used to find all files that might contain
   # translatable content, relative to the project root directory
   source_files:
+      - './lib/**/*.rb'
   

From 2b8cb376586aebf2d9014ba96b945520ad5bfaa9 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Wed, 27 Sep 2017 10:49:43 +0100
Subject: [PATCH 1250/2267] Updated docs for passenger_spawn_method

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 8af33ddcfd..d02c6b1f98 100755
--- a/README.md
+++ b/README.md
@@ -3782,6 +3782,10 @@ Default: '[none]'.
 
 Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod), whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
+Valid options: `smart` or `direct`.
+
+Default: `undef`.
+
 ##### `passenger_app_root`
 
 Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot), the location of the Passenger application root if different from the DocumentRoot.

From eea8ecf63ee5ee56d9dc0af2664f834b7a79deb7 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 8 Sep 2017 12:38:35 +0200
Subject: [PATCH 1251/2267] Include mod_wsgi when using wsgi options

This copies the if statement around the wsgi concat fragment so mod_wsgi
is loaded if any option is used.
---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8d2edde44a..8d423bb7da 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -225,7 +225,7 @@
     include ::apache::mod::vhost_alias
   }
 
-  if $wsgi_daemon_process {
+  if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
     include ::apache::mod::wsgi
   }
 

From 057f49dbf4ab318e7312af588b34ff7c490ec4d4 Mon Sep 17 00:00:00 2001
From: Will Meek <william.meek@puppet.com>
Date: Wed, 27 Sep 2017 14:51:59 +0100
Subject: [PATCH 1252/2267] Add unit tests to test Apache wsgi logic changes.

This commit will add unit tests to test the logic around
code changes which include the Apache wsgi module if a
number of options are set.
---
 spec/defines/vhost_spec.rb | 90 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 85dc72e37b..c1d1417925 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -992,6 +992,96 @@
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-limits') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
+    context 'wsgi_application_group should set apache::mod::wsgi' do
+      let :params do
+        {
+            'docroot'                    => '/rspec/docroot',
+            'wsgi_application_group'     => '%{GLOBAL}',
+        }
+      end
+      it { is_expected.to contain_class("apache::mod::wsgi") }
+    end
+    context 'wsgi_daemon_process should set apache::mod::wsgi' do
+      let :params do
+        {
+           'docroot'                    => '/rspec/docroot',
+           'wsgi_daemon_process'        => 'wsgi',
+        }
+      end
+      it { is_expected.to contain_class("apache::mod::wsgi") }
+    end
+    context 'wsgi_import_script on its own should not set apache::mod::wsgi' do
+      let :params do
+        {
+            'docroot'                    => '/rspec/docroot',
+            'wsgi_import_script'         => '/var/www/demo.wsgi',
+        }
+      end
+      it { is_expected.not_to contain_class("apache::mod::wsgi") }
+    end
+    context 'wsgi_import_script_options on its own should not set apache::mod::wsgi' do
+      let :params do
+        {
+            'docroot'                     => '/rspec/docroot',
+            'wsgi_import_script_options'  => {
+                'process-group'           => 'wsgi',
+                'application-group'       => '%{GLOBAL}'
+            },
+        }
+      end
+      it { is_expected.not_to contain_class("apache::mod::wsgi") }
+    end
+    context 'wsgi_import_script and wsgi_import_script_options should set apache::mod::wsgi' do
+      let :params do
+        {
+            'docroot'                     => '/rspec/docroot',
+            'wsgi_import_script'          => '/var/www/demo.wsgi',
+            'wsgi_import_script_options'  => {
+                'process-group'           => 'wsgi',
+                'application-group'       => '%{GLOBAL}'
+            },
+        }
+      end
+      it { is_expected.to contain_class("apache::mod::wsgi") }
+    end
+    context 'wsgi_process_group should set apache::mod::wsgi' do
+      let :params do
+        {
+            'docroot'                    => '/rspec/docroot',
+            'wsgi_daemon_process'        => 'wsgi',
+        }
+      end
+      it { is_expected.to contain_class("apache::mod::wsgi") }
+    end
+    context 'wsgi_script_aliases with non-empty aliases should set apache::mod::wsgi' do
+      let :params do
+        {
+            'docroot'                    => '/rspec/docroot',
+            'wsgi_script_aliases'        => {
+                '/' => '/var/www/demo.wsgi'
+            },
+        }
+      end
+      it { is_expected.to contain_class("apache::mod::wsgi") }
+    end
+    context 'wsgi_script_aliases with empty aliases should set apache::mod::wsgi' do
+      let :params do
+        {
+            'docroot'                    => '/rspec/docroot',
+            'wsgi_script_aliases'        => { },
+        }
+      end
+      it { is_expected.not_to contain_class("apache::mod::wsgi") }
+    end
+    context 'wsgi_pass_authorization should set apache::mod::wsgi' do
+      let :params do
+        {
+            'docroot'                    => '/rspec/docroot',
+            'wsgi_pass_authorization'    => 'On',
+        }
+      end
+      it { is_expected.to contain_class("apache::mod::wsgi") }
+    end
     context 'when not setting nor managing the docroot' do
       let :params do
         {

From 6c1ed75df6988dee291041c1bc4251f0f9525be9 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Wed, 27 Sep 2017 13:58:44 +0100
Subject: [PATCH 1253/2267] MODULES-5649 Do not install mod_fastcgi on el7

---
 manifests/mod/fastcgi.pp | 4 +++-
 manifests/params.pp      | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index 543a322336..399d93aa7c 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -1,6 +1,8 @@
 class apache::mod::fastcgi {
   include ::apache
-
+  if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemrelease, '7.0') >= 0) {
+    fail('mod_fastcgi is no longer supported on el7 and above.')
+  }
   # Debian specifies it's fastcgi lib path, but RedHat uses the default value
   # with no config file
   $fastcgi_lib_path = $::apache::params::fastcgi_lib_path
diff --git a/manifests/params.pp b/manifests/params.pp
index 666fd224f3..bca827d44e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -106,7 +106,11 @@
         default => 'mod_authz_ldap',
       },
       'authnz_pam'            => 'mod_authnz_pam',
-      'fastcgi'               => 'mod_fastcgi',
+      'fastcgi'               => $::apache::version::distrelease ? {
+        '5'     => 'mod_fastcgi',
+        '6'     => 'mod_fastcgi',
+        default => undef,
+      },
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',

From 39f95b858e048c66cb8b920ff84fca46bf3d63e5 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Wed, 27 Sep 2017 10:27:20 +0100
Subject: [PATCH 1254/2267] 2.2.0 - Release Prep

---
 CHANGELOG.md  | 15 +++++++++++++++
 metadata.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7efa9b8753..100cfee6e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
+## Supported Release [2.2.0]
+### Summary
+This is a maintainence and feature release. It will include updates to translations in Japanese, some maintainence and adding `PassengerSpawnMethod` to vhost.
+
+#### Added
+- `PassengerSpawnMethod` added to `vhost`.
+
+#### Changed
+- Improve version match fact for `apache_version`
+- Update to prefork.conf params for Apache 2.4
+- Updates to `CONTRIBUTING.md`
+- Do not install mod_fastcgi on el7
+- Include mod_wsgi when using wsgi options
+
 ## Supported Release [2.1.0]
 ### Summary
 This is a feature release including a security patch (CVE-2017-2299)
@@ -899,6 +913,7 @@ worker/prefork
 * f672e46 a2mod fix
 * 8a56ee9 add pthon support to apache
 
+[2.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.1.0...2.2.0
 [2.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...2.1.0
 [2.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0
 [1.11.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...1.11.1
diff --git a/metadata.json b/metadata.json
index a4410508ba..2d7606852f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 530ed87474eaca01a81c3e78e0b94e436ace089d Mon Sep 17 00:00:00 2001
From: Emmanuel Gelati <emmanuel.mesa@lastminute.com>
Date: Fri, 29 Sep 2017 16:17:49 +0200
Subject: [PATCH 1255/2267] Added listenbacklog to prefork module

---
 manifests/mod/prefork.pp       | 1 +
 templates/mod/prefork.conf.erb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 989de6e5b0..63e3a294f5 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -8,6 +8,7 @@
   $maxrequestsperchild    = '4000',
   $maxconnectionsperchild = undef,
   $apache_version         = undef,
+  $listenbacklog          = '511'
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/templates/mod/prefork.conf.erb b/templates/mod/prefork.conf.erb
index ab4a871c6e..01f0b84f87 100644
--- a/templates/mod/prefork.conf.erb
+++ b/templates/mod/prefork.conf.erb
@@ -13,4 +13,5 @@
   <%- elsif @maxrequestsperchild -%>
   MaxRequestsPerChild    <%= @maxrequestsperchild %>
   <%- end -%>
+  ListenBacklog       <%= @listenbacklog %>
 </IfModule>

From 26be410012af3614cd7eb0a0ccf43618f147b8aa Mon Sep 17 00:00:00 2001
From: Felix Dominguez <felix@sanityuntethered.com>
Date: Fri, 29 Sep 2017 10:13:49 -0500
Subject: [PATCH 1256/2267] MODULES-5426 : Minor changes to the readme

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d4d606200e..a38e9716c6 100755
--- a/README.md
+++ b/README.md
@@ -2242,8 +2242,7 @@ $mount_file_content = {
 
 Installs and manages [`mod_passenger`][]. For Red Hat-based systems, ensure that you meet the minimum requirements described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux).
 
-The current set of server configurations settings were taking directly from the [Passenger Reference](https://www.phusionpassenger.com/library/config/apache/reference/). Deprecation warning and removal failure messages can be enabled by setting the `passenger_installed_version` to
-the version number installed on the server.
+The current set of server configurations settings were taken directly from the [Passenger Reference](https://www.phusionpassenger.com/library/config/apache/reference/). To enable deprecation warnings and removal failure messages, set the `passenger_installed_version` to the version number installed on the server.
 
 **Parameters**:
 

From 447870be97270c9b55c6516fd4885c86ddc161ae Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames.mctigue@northwestern.edu>
Date: Thu, 5 Oct 2017 14:29:16 +0300
Subject: [PATCH 1257/2267] Added specific
 RSpec::Expectations::ExpectationNotMetError execeptions to supress test
 warnings.

---
 spec/defines/vhost_spec.rb | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index c1d1417925..4dea0c75bc 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1197,7 +1197,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad suphp_engine' do
       let :params do
@@ -1207,7 +1207,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad ip_based' do
       let :params do
@@ -1217,7 +1217,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad access_log' do
       let :params do
@@ -1227,7 +1227,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad error_log' do
       let :params do
@@ -1237,7 +1237,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad_ssl' do
       let :params do
@@ -1247,7 +1247,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad default_vhost' do
       let :params do
@@ -1257,7 +1257,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad ssl_proxyengine' do
       let :params do
@@ -1267,7 +1267,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad rewrites' do
       let :params do
@@ -1277,7 +1277,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad rewrites 2' do
       let :params do
@@ -1287,7 +1287,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'empty rewrites' do
       let :params do
@@ -1307,7 +1307,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad wsgi_script_alias' do
       let :params do
@@ -1317,7 +1317,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad wsgi_daemon_process_options' do
       let :params do
@@ -1327,7 +1327,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad wsgi_import_script_alias' do
       let :params do
@@ -1337,7 +1337,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad itk' do
       let :params do
@@ -1347,7 +1347,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad logroot_ensure' do
       let :params do
@@ -1357,7 +1357,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad log_level' do
       let :params do
@@ -1367,7 +1367,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'access_log_file and access_log_pipe' do
       let :params do
@@ -1378,7 +1378,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'error_log_file and error_log_pipe' do
       let :params do
@@ -1389,7 +1389,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad fallbackresource' do
       let :params do
@@ -1399,7 +1399,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad custom_fragment' do
       let :params do
@@ -1409,7 +1409,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'bad access_logs' do
       let :params do
@@ -1419,7 +1419,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error }
+      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
     end
     context 'default of require all granted' do
       let :params do

From 4480250bfe643fd8d47827d376b462b510e6146c Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames.mctigue@northwestern.edu>
Date: Thu, 5 Oct 2017 15:22:37 +0300
Subject: [PATCH 1258/2267] Change to each test to use Puppet::Error

---
 spec/defines/vhost_spec.rb | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 4dea0c75bc..9a1427b999 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1197,7 +1197,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad suphp_engine' do
       let :params do
@@ -1207,7 +1207,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad ip_based' do
       let :params do
@@ -1217,7 +1217,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad access_log' do
       let :params do
@@ -1227,7 +1227,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad error_log' do
       let :params do
@@ -1237,7 +1237,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad_ssl' do
       let :params do
@@ -1247,7 +1247,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad default_vhost' do
       let :params do
@@ -1257,7 +1257,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad ssl_proxyengine' do
       let :params do
@@ -1267,7 +1267,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad rewrites' do
       let :params do
@@ -1277,7 +1277,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad rewrites 2' do
       let :params do
@@ -1287,7 +1287,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'empty rewrites' do
       let :params do
@@ -1307,7 +1307,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad wsgi_script_alias' do
       let :params do
@@ -1317,7 +1317,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad wsgi_daemon_process_options' do
       let :params do
@@ -1327,7 +1327,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad wsgi_import_script_alias' do
       let :params do
@@ -1337,7 +1337,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad itk' do
       let :params do
@@ -1347,7 +1347,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad logroot_ensure' do
       let :params do
@@ -1357,7 +1357,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad log_level' do
       let :params do
@@ -1367,7 +1367,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'access_log_file and access_log_pipe' do
       let :params do
@@ -1378,7 +1378,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'error_log_file and error_log_pipe' do
       let :params do
@@ -1389,7 +1389,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad fallbackresource' do
       let :params do
@@ -1399,7 +1399,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad custom_fragment' do
       let :params do
@@ -1409,7 +1409,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad access_logs' do
       let :params do
@@ -1419,7 +1419,7 @@
         }
       end
       let :facts do default_facts end
-      it { expect { is_expected.to compile }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'default of require all granted' do
       let :params do

From 89c5adec7ae70dea37d1a3a3b03fb873de1264db Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames.mctigue@northwestern.edu>
Date: Thu, 5 Oct 2017 17:18:42 +0300
Subject: [PATCH 1259/2267] Adding ldap_trusted_mode parameter to mod_ldap
 module

---
 README.md                     | 3 +++
 manifests/mod/ldap.pp         | 1 +
 spec/classes/mod/ldap_spec.rb | 2 ++
 templates/mod/ldap.conf.erb   | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/README.md b/README.md
index d02c6b1f98..7f255c63c5 100755
--- a/README.md
+++ b/README.md
@@ -2337,6 +2337,7 @@ Installs and configures [`mod_ldap`][], and allows you to modify the
 class { 'apache::mod::ldap':
   ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
   ldap_trusted_global_cert_type => 'CA_DER',
+  ldap_trusted_mode             => 'TLS',
   ldap_shared_cache_size        => '500000',
   ldap_cache_entries            => '1024',
   ldap_cache_ttl                => '600',
@@ -2357,6 +2358,8 @@ class { 'apache::mod::ldap':
 
   Default: 'CA_BASE64'.
 
+* `ldap_trusted_mode`: Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
+
 * `ldap_shared_cache_size`: Specifies the size, in bytes, of the shared memory cache.
 
 * `ldap_cache_entries`: Specifies the maximum number of entries in the primary LDAP cache.
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 3e51592227..e80114dde4 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -8,6 +8,7 @@
   $ldap_cache_ttl                                  = undef,
   $ldap_opcache_entries                            = undef,
   $ldap_opcache_ttl                                = undef,
+  $ldap_trusted_mode                               = undef,
 ){
 
   include ::apache
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 73c51adf28..0f49f0b02d 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -34,6 +34,7 @@
       let(:params) {{
         :ldap_trusted_global_cert_file => 'ca.pem',
         :ldap_trusted_global_cert_type => 'CA_DER',
+        :ldap_trusted_mode             => 'TLS',
         :ldap_shared_cache_size        => '500000',
         :ldap_cache_entries            => '1024',
         :ldap_cache_ttl                => '600',
@@ -41,6 +42,7 @@
         :ldap_opcache_ttl              => '600'
       }}
       it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
+      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedMode TLS$/) }
       it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPSharedCacheSize 500000$/) }
       it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPCacheEntries 1024$/) }
       it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPCacheTTL 600$/) }
diff --git a/templates/mod/ldap.conf.erb b/templates/mod/ldap.conf.erb
index 5ac0c1c546..d0a11b6957 100644
--- a/templates/mod/ldap.conf.erb
+++ b/templates/mod/ldap.conf.erb
@@ -12,6 +12,9 @@
 <% if @ldap_trusted_global_cert_file -%>
 LDAPTrustedGlobalCert <%= @ldap_trusted_global_cert_type %> <%= @ldap_trusted_global_cert_file %>
 <% end -%>
+<% if @ldap_trusted_mode -%>
+LDAPTrustedMode <%= @ldap_trusted_mode %>
+<% end -%>
 <%- if @ldap_shared_cache_size -%>
 LDAPSharedCacheSize <%= @ldap_shared_cache_size %>
 <%- end -%>

From a12a1a0794bf0321365ce51e798628e1f511ef92 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Fri, 6 Oct 2017 04:51:55 +1100
Subject: [PATCH 1260/2267] Updating translations for readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 283 +++++++++++++++++++++++-----------------
 1 file changed, 165 insertions(+), 118 deletions(-)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 6b14af7341..c8293c684d 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -29,7 +29,6 @@
 
 [開発]: #development
 [貢献]: #contributing
-[テスト]: #testing
 
 [`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
 [`add_listen`]: #add_listen
@@ -90,6 +89,7 @@
 [コモンゲートウェイインターフェース]: https://httpd.apache.org/docs/current/howto/cgi.html
 [`confd_dir`]: #confd_dir
 [`content`]: #content
+[CONTRIBUTING.md]: CONTRIBUTING.md
 [カスタムエラードキュメント]: https://httpd.apache.org/docs/current/custom-error.html
 [`custom_fragment`]: #custom_fragment
 
@@ -1369,7 +1369,7 @@ HTTPDサービスの再起動にあたり、Puppetが特定のコマンドを使
 
 ##### `ssl_ca`
 
-SSL証明書認証局を指定します。 [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile)。
+SSL証明書認証局を指定します。[SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile)を使用してSSLクライアント認証で使用する証明書を確認します。
 
 これはバーチャルホストレベルでオーバーライドすることが可能です。
 
@@ -1437,7 +1437,7 @@ httpd.confの/ディレクトリについて、デフォルトのアクセスポ
 
 `[^.#]\*.conf[^~]`などの値に設定すると、このディレクトリで偶発的に作成されたファイル(バージョン管理システムやエディタのバックアップにより作成されたファイルなど)がサーバ設定に*含まれなく*なります。
 
-デフォルト: '*'、また、このモジュールの過去のバージョンのBC。
+デフォルト値: '*'。
 
 一部のオペレーティングシステムでは、`*.conf`の値が使用されます。デフォルトでは、このモジュールは`.conf`で終わる設定ファイルを作成します。
 
@@ -1595,6 +1595,7 @@ class { 'apache::mod::alias':
 * `jk` ([`apache::mod::jk`]参照)
 * `ldap` ([`apache::mod::ldap`][]参照)
 * `lookup_identity`
+* `macro` ([`apache:mod:macro`][]参照)
 * `mime`
 * `mime_magic`\*
 * `negotiation`
@@ -1636,7 +1637,7 @@ class { 'apache::mod::alias':
 
 [`mod_alias`][]をインストールして管理します。
 
-**パラメータ**:
+**パラメータ**:　
 
 * `icons_options`: Apache [`Options`]ディレクティブにより、アイコンディレクトリのディレクトリリスティングを無効にします。
 
@@ -1685,17 +1686,17 @@ class{'apache::mod::diskio':
 }
 ```
 
-**パラメータ**:
+**パラメータ**:　
 
 * `dump_io_input`: すべての入力データをエラーログにダンプします。
 
-  値: 'On'、'Off'。
+  値: 'On'、'Off'。　
 
   デフォルト値: 'Off'。
 
 * `dump_io_output`: すべての出力データをエラーログにダンプします。
 
-  値: 'On'、'Off'。
+  値: 'On'、'Off'。　
 
   デフォルト値: 'Off'。
 
@@ -1703,7 +1704,7 @@ class{'apache::mod::diskio':
 
 [`mod_mpm_event`][]をインストールして管理します。同じサーバ上に、`apache::mod::event`と一緒に[`apache::mod::itk`][]、[`apache::mod::peruser`][]、[`apache::mod::prefork`][]、[`apache::mod::worker`][]を含めることはできません。
 
-**パラメータ**:
+**パラメータ**:　
 
 * `listenbacklog`: モジュールの[`ListenBackLog`][]ディレクティブでペンディング接続キューの最大長を設定します。`false`に設定すると、このパラメータが削除されます。
 
@@ -1745,7 +1746,7 @@ class{'apache::mod::diskio':
 
 > **注意**: auth_casモジュールは、EPELにより提供される依存関係パッケージがなければ、RH/CentOSで使用できません。 [https://github.com/Jasig/mod_auth_cas]()を参照してください。
 
-**パラメータ**:
+**パラメータ**:　
 
 - `cas_attribute_prefix`: ヘッダを追加します。SAMLバリデーションが有効になっている場合には、このヘッダの値が属性値になります。
 
@@ -1912,7 +1913,7 @@ class { 'apache::mod::authn_dbd':
 
 * `authn_dbd_min`: DBDMinに相当します。
 
-  デフォルト値: 4。
+  デフォルト値: 4。　
 
 * `authn_dbd_params`: **必須**。接続文字列に関して、DBDParamsに相当します。
 
@@ -2086,7 +2087,7 @@ apache::vhost { 'example.org':
 
   ブーリアン。
 
-  デフォルト値: `false`。　
+  デフォルト値: `false`。
 
 * `flag`: GeoIPフラグを設定します。
 
@@ -2132,9 +2133,9 @@ apache::vhost { 'example.org':
 
   値: IPv4アドレス、IPv6アドレス、または範囲の1つまたは複数のオクテット、またはいずれかの配列。
 
-  デフォルト値: ['127.0.0.1','::1']。
+  デフォルト値: ['127.0.0.1','::1']。　
 
-* `apache_version`: 文字列で表されるApacheのバージョン番号、'2.2'や'2.4'など。
+* `apache_version`: 文字列で表されるApacheのバージョン番号、'2.2'や'2.4'など。　
 
   デフォルト値: [`$::apache::apache_version`][`apache_version`]の値。
 
@@ -2153,6 +2154,7 @@ apache::vhost { 'example.org':
 
 ``` puppet
 class { '::apache::mod::jk':
+  ip           = '192.168.2.15',
   workers_file = 'conf/workers.properties',
   mount_file   = 'conf/uriworkermap.properties',
   shm_file     = 'run/jk.shm',
@@ -2165,7 +2167,31 @@ class { '::apache::mod::jk':
 
 **`apache::mod::jk`**内のパラメータ:
 
-`mod_jk`パラメータを理解するための情報源としては、[公式ドキュメント](https://tomcat.apache.org/connectors-doc/reference/apache.html)が最適です。ただし、\*file_contentはこれに含まれません。
+`mod_jk`パラメータを理解するための情報源としては、[公式ドキュメント](https://tomcat.apache.org/connectors-doc/reference/apache.html)が最適です。ただし、次はこれに含まれません:
+
+**add_listen**
+
+パラメータ`ip`および `port`に従って`Listen`ディレクティブを定義して(下記参照)、ApacheがIP/portの組合せをリッスンし`mod_jk`にリダイレクトするようにします。
+`Listen *:<Port>`または`Listen <Port>`のように、別の`Listen`ディレクティブが`mod_jk`バインディングで必要なものと競合するときに役立ちます。
+
+タイプ: ブール値
+デフォルト: true
+
+**ip**
+
+`mod_jk`にバインディングするIP。
+バインディングアドレスがプライマリのネットワークインターフェースIPではないときに役立ちます。
+
+タイプ: 文字列
+デフォルト: `$facts['ipaddress']`
+
+**port**
+
+`mod_jk`にバインディングするポート。
+リバースプロキシまたはキャッシュのような、別のものがポート80でリクエストを受信して、異なるポートのApacheに転送する必要があるときに役立ちます。
+
+タイプ: 文字列(数値)
+デフォルト: '80'
 
 **workers\_file\_content**
 
@@ -2188,7 +2214,7 @@ worker.other_name.type=ajp12 (why would you?)
 worker.other_name.socket_keepalive=false
 ```
 
-以下のようにパラメータ化する必要があります。
+以下のようにパラメータ化する必要があります。　
 
 ```
 $workers_file_content = {
@@ -2238,7 +2264,39 @@ $mount_file_content = {
 },
 ```
 
-##### クラス: `apache::mod::passenger`
+**shm\_file and log\_file**
+
+これらのファイルがどのように定義されているかによって、クラスはそれらの最終パスを別々に作成します。
+- 相対パス: `logroot`で提供されたパスを追加します (下記参照)
+- 絶対パスまたはパイプ: 提供されたパスをそのまま使用します
+
+例 (RHEL 6):
+
+```
+shm_file => 'shm_file'
+# Ends up in
+$shm_path = '/var/log/httpd/shm_file'
+```
+```
+shm_file => '/run/shm_file'
+# Ends up in
+$shm_path = '/run/shm_file'
+```
+```
+shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+# Ends up in
+$shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+```
+
+> デフォルトのlogrootは十分健全です。このため、絶対パスを指定することは推奨しません。
+
+**logroot**
+
+`shm_file`および`log_file`のベースディレクトリは`logroot`パラメータで決定されます。指定されない場合、デフォルトは`apache::params::logroot`です。
+
+> デフォルトのlogrootは十分健全です。このため、上書きすることは推奨しません。
+
+##### クラス: `apache::mod::passenger`　
 
 [`mod_passenger`][]をインストールして管理します。Red Hatベースのシステムの場合は、[passengerドキュメント](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux)に記載された最小要件を満たしていることを確認してください。
 
@@ -2320,7 +2378,7 @@ class { 'apache::mod::ldap':
 
 * `force_language_priority`: `ForceLanguagePriority`オプションを設定します。
 
-  値: 文字列。
+  値: 文字列。　
 
   デフォルト値: `Prefer Fallback`。
 
@@ -2391,7 +2449,7 @@ NSS暗号化ライブラリを使用するApacheのSSLプロバイダ。
 
 >**注意**: passengerモジュールは、EPELにより提供される依存関係パッケージと`mod_passengers`カスタムリポジトリがなければ、RH/CentOSでは使用できません。前述の`manage_repo`パラメータと[https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()を参照してください。
 
-**パラメータ**:__``<>
+**パラメータ**:　
 
 * `passenger_conf_file`: `$::apache::params::passenger_conf_file`
 * `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file`
@@ -2428,8 +2486,6 @@ I`mod_proxy`をインストールし、`proxy.conf.erb`テンプレートを使
 
 **`apache::mod::proxy`内のパラメータ**:
 
-.
-
 - `allow_from`: デフォルト値: `undef`
 - `apache_version`: デフォルト値: `undef`
 - `package_name`: デフォルト値: `undef`
@@ -2530,19 +2586,19 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 * `ssl_compression`
 
-  デフォルト値: `false`
+  デフォルト値: `false`。
 
 * `ssl_cryptodevice`
 
-  デフォルト値: 'builtin'
+  デフォルト値: 'builtin'　
 
 * `ssl_honorcipherorder`
 
-  デフォルト値: `true`
+  デフォルト値: `true`。
 
 * `ssl_openssl_conf_cmd`
 
-  デフォルト値: `undef`
+  デフォルト値: `undef`。
 
 * `ssl_options`
 
@@ -2558,13 +2614,13 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 * `ssl_random_seed_bytes`
 
-  値: 文字列。
+  値: 文字列。　
 
   デフォルト値: '512'
 
 * `ssl_sessioncachetimeout`
 
-  値: 文字列。
+  値: 文字列。　
 
   デフォルト値: '300'
 
@@ -2588,7 +2644,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 * `allow_from`: `/server-status`にアクセスできるIPv4またはIPv6アドレスの[配列][]。
 
-  デフォルト値: ['127.0.0.1','::1']。
+  デフォルト値: ['127.0.0.1','::1']。　
 * `extended_status`: [`ExtendedStatus`][]ディレクティブをつうじて、各リクエストに関する拡張ステータス情報を追跡するかどうかを決定します。
 
   値: 'Off'、'On'。
@@ -2661,7 +2717,7 @@ ${modsec\_dir}/activated\_rules。
 
 * `secpcrematchlimit`: PCREライブラリのマッチ限度数を設定します。
 
-  デフォルト値: 1500。
+  デフォルト値: 1500。　
 
 * `secpcrematchlimitrecursion`: PCREライブラリのマッチ再帰制限数を設定します。
 
@@ -2685,7 +2741,7 @@ ${modsec\_dir}/activated\_rules。
 
 * `inbound_anomaly_threshold`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、インバウンドブロッキングルールのスコアリング閾値レベルを設定します。
 
-  デフォルト値: 5。
+  デフォルト値: 5。　
 
 * `outbound_anomaly_threshold`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、アウトバウンドブロッキングルールのスコアリング閾値レベルを設定します。
 
@@ -2731,17 +2787,17 @@ ${modsec\_dir}/activated\_rules。
 
 * `mod_path`: `mod_wsgi`共有オブジェクト(`.so`)ファイルのパスを定義します。
 
-  デフォルト値: `undef`。　
+  デフォルト値: `undef`。
 
   * `mod_path`パラメータに`/`が含まれていない場合、Puppetではオペレーティングシステムのデフォルトのモジュールパスの先頭にこれを付加します。含まれている場合は、そのとおりに扱われます。
 
 * `package_name`: `mod_wsgi`をインストールするパッケージの名前。
 
-  デフォルト値: `undef`。　
+  デフォルト値: `undef`。
 
 * `wsgi_python_home`: '/path/to/venv'などの[`WSGIPythonHome`][]ディレクティブを定義します。
 
-  値: パスを指定する文字列。
+  値: パスを指定する文字列。　
 
   デフォルト値: `undef`。
 
@@ -2825,7 +2881,7 @@ Apacheデーモンを管理します。
 
 ブーリアン。
 
-デフォルト値: `true`。　
+デフォルト値: `true`。
 
 #### 定義タイプ: `apache::balancermember`
 
@@ -2835,7 +2891,7 @@ Apacheデーモンを管理します。
 
 ##### `balancer_cluster`
 
-**必須**。
+**必須**。　
 
 Apacheサービスのインスタンス名を設定します。宣言された[`apache::balancer`][]リソースの名前と一致する必要があります。
 
@@ -2849,7 +2905,7 @@ Apacheサービスのインスタンス名を設定します。宣言された[`
 
 URL後に[オプション](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)の[配列][]を指定します。[`ProxyPass`][]で使用可能な任意のキー-値ペアを使用できます。
 
-デフォルト値: 空配列。
+デフォルト値: 空配列。　
 
 #### 定義タイプ: `apache::custom_config`
 
@@ -2861,7 +2917,7 @@ Apacheサーバの`conf.d`ディレクトリにカスタム設定ファイルを
 
 設定ファイルが存在するべきかどうかを指定します。
 
-値: 'absent'、'present'。
+値: 'absent'、'present'。　
 
 デフォルト値: 'present'。　
 
@@ -2875,7 +2931,7 @@ Puppetが設定ファイルを置くディレクトリを設定します。
 
 設定ファイルのコンテンツを設定します。`content`および[`source`][]パラメータは、相互排他的な関係にあります。
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `filename`
 
@@ -2889,11 +2945,11 @@ Apacheでは設定ファイルがアルファベット順に処理されるた
 
 設定ファイル名の優先順位の接頭値を無視するには、このパラメータを`false`に設定します。
 
-デフォルト値: '25'。　
+デフォルト値: '25'。
 
 ##### `source`
 
-設定ファイルのソースを指し示します。[`content`][]および`source`パラメータは、相互排他的な関係にあります。
+設定ファイルのソースを指します。[`content`][]および`source`パラメータは互いに排他的です。
 
 デフォルト値: `undef`。　
 
@@ -2911,7 +2967,7 @@ Apacheサービスに通知する前に設定ファイルのバリデーショ
 
 ブーリアン。
 
-デフォルト値: `true`。　
+デフォルト値: `true`。
 
 #### 定義タイプ: `apache::fastcgi::server`
 
@@ -2935,7 +2991,7 @@ FastCGIのホスト名またはIPアドレスおよびTCPポート番号(1-65535
 
 アプリケーションから受信したデータを、強制的に[`mod_fastcgi`][FastCGI]がクライアントに書き込みます。デフォルトでは、アプリケーションをできるだけ早くフリーな状態にするために、`mod_fastcgi`はデータをバッファリングします。 
 
-デフォルト値: `false`。　
+デフォルト値: `false`。
 
 ##### `faux_path`
 
@@ -2971,7 +3027,7 @@ Apacheサーバまたはバーチャルホストのリッスンするアドレ
 
 PuppetがApacheモジュールのインストールに使用するパッケージの名前。
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `package_ensure`
 
@@ -3006,7 +3062,7 @@ Apacheモジュールをインストールの必要性をPuppetが確認する
 
 [`LoadFile`][]ディレクティブの配列を指定します。
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `path`
 
@@ -3028,6 +3084,15 @@ apacheモジュールでは、バーチャルホストのセットアップと
 
 `apache::vhost`定義タイプでは、カスタムフラグメントの`order`パラメータについては10の倍数が使用されるため、10の倍数ではない`order`が機能します。
 
+> **Note:** `apache::vhost`を作成するとき、`default`または`default-ssl`を指定することはできません。これはこの属性を持つvhostsが常にモジュールによって管理されるためです。これは`Apache::Vhost['default']`または`Apache::Vhost['default-ssl]`リソースを上書きできないことを意味します。 オプションの回避策として、`my default`などの別の名前のvhostを作成して、`default`および`default_ssl`が`false`に設定されていることを確認します。
+
+```
+class { 'apache':
+  default_vhost     => false
+  default_ssl_vhost => false,
+}
+```
+
 **パラメータ**:　
 
 ##### `access_log`
@@ -3042,13 +3107,13 @@ apacheモジュールでは、バーチャルホストのセットアップと
 
 特定の環境変数を持つリクエストのみをロギングするように指定します。
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `access_log_file`
 
 [`logroot`][]に置く`*_access.log`のファイル名を設定します。バーチャルホスト---例えばexample.comなど---を与えると、[SSL暗号化][SSL暗号化]バーチャルホストの場合はデフォルト値が'example.com_ssl.log'、暗号化されていないバーチャルホストの場合は'example.com_access.log'になります。
 
-デフォルト値: `false`。　
+デフォルト値: `false`。
 
 ##### `access_log_format`
 
@@ -3060,19 +3125,19 @@ apacheモジュールでは、バーチャルホストのセットアップと
 
 Apacheがアクセスログメッセージを送信するパイプを指定します。
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `access_log_syslog`
 
 すべてのアクセスログメッセージをsyslogに送ります。
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `add_default_charset`
 
 [`AddDefaultCharset`][]ディレクティブのデフォルトのメディア文字セット値を設定します。これは`text/plain`および`text/html`応答に追加されます。
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `add_listen`
 
@@ -3082,7 +3147,7 @@ Apacheがアクセスログメッセージを送信するパイプを指定し
 
 ブーリアン。
 
-デフォルト値: `true`。　
+デフォルト値: `true`。
 
 ##### `use_optional_includes`
 
@@ -3090,7 +3155,7 @@ Apache 2.4以降の`additional_includes`について、Apacheが[`Include`][]の
 
 ブーリアン。
 
-デフォルト値: `false`。　
+デフォルト値: `false`。
 
 ##### `additional_includes`
 
@@ -3104,7 +3169,7 @@ Apache 2.4以降の`additional_includes`について、Apacheが[`Include`][]の
 
 [ハッシュ][ハッシュ]のリストをバーチャルホストに渡し、[`mod_alias`][]ドキュメントに従って[`Alias`][]、[`AliasMatch`][]、[`ScriptAlias`][]、または[`ScriptAliasMatch`][]ディレクティブを作成します。
 
-例:
+例:　
 
 ``` puppet
 aliases => [
@@ -3154,7 +3219,7 @@ SAMLバリデーションが有効になっている場合に、このヘッダ
 
 `cas_attribute_prefix`により作成されたヘッダの属性値の区切り文字を設定します。
 
-デフォルト値: [`apache::mod::auth_cas`][]により設定された値。
+デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　
 
 ##### `cas_login_url`
 
@@ -3190,13 +3255,13 @@ HTTPクエリ文字列でクライアントの提示するチケットをバリ
 
 カスタム設定ディレクティブの文字列を渡し、バーチャルホスト設定の最後に配置します。
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `default_vhost`
 
 任意の`apache::vhost`定義タイプを、他の`apache::vhost`定義タイプと一致しないリクエストをサーブするためのデフォルトとして設定します。 
 
-デフォルト値: `false`。　
+デフォルト値: `false`。
 
 ##### `directories`
 
@@ -3206,7 +3271,7 @@ HTTPクエリ文字列でクライアントの提示するチケットをバリ
 
 ディレクトリ名の最後で'/'を指定することで、クライアントがディレクトリのインデックスをリクエストした際に探すべきリソースのリストを設定します。詳細については、[`DirectoryIndex`][]ディレクティブドキュメントを参照してください。
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `docroot`
 
@@ -3224,7 +3289,7 @@ HTTPクエリ文字列でクライアントの提示するチケットをバリ
 
 値: システムグループを指定する文字列。
 
-デフォルト値: 'root'。
+デフォルト値: 'root'。　
 
 ##### `docroot_owner`
 
@@ -3240,7 +3305,7 @@ HTTPクエリ文字列でクライアントの提示するチケットをバリ
 
 値: 文字列。　
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `manage_docroot`
 
@@ -3248,7 +3313,7 @@ Puppetが[`docroot`][]ディレクトリを管理するかどうかを決定し
 
 ブーリアン。
 
-デフォルト値: `true`。　
+デフォルト値: `true`。
 
 ##### `error_log`
 
@@ -3288,7 +3353,7 @@ Puppetが[`docroot`][]ディレクトリを管理するかどうかを決定し
 
 このバーチャルホストの[エラードキュメント](https://httpd.apache.org/docs/current/mod/core.html#errordocument)設定のオーバーライドに使用できるハッシュのリスト。
 
-例:
+例:　
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -3307,7 +3372,7 @@ apache::vhost { 'sample.example.net':
 
 値: 'absent'、'present'。　
 
-デフォルト値: 'present'。
+デフォルト値: 'present'。　
 
 ##### `fallbackresource`
 
@@ -3356,7 +3421,7 @@ apache::vhost { "$::fqdn":
 
 レスポンスヘッダを置換、結合、または削除するための行を追加します。詳細については、[Apacheのmod_headersドキュメント](https://httpd.apache.org/docs/current/mod/mod_headers.html#header)を参照してください。
 
-値: 文字列または文字列の配列。
+値: 文字列または文字列の配列。　
 
 デフォルト値: `undef`。
 
@@ -3388,7 +3453,7 @@ apache::vhost { 'sample.example.net':
     group => 'somegroup',
   },
 }
-```
+```　
 
 値: ハッシュ。キーを含めることもできます。
 
@@ -3400,7 +3465,7 @@ apache::vhost { 'sample.example.net':
 * `limituidrange` (Linux 3.5.0以降)
 * `limitgidrange` (Linux 3.5.0以降)
 
-通常は、以下のように使用します。
+通常は、以下のように使用します。　
 
 ``` puppet
 apache::vhost { 'sample.example.net':
@@ -3438,7 +3503,7 @@ apache::vhost { 'sample.example.net':
 
 バーチャルホストの関連オプションを設定するには、`keepalive_timeout`および`max_keepalive_requests`パラメータを使用します。
 
-値: 'Off', 'On'。
+値: 'Off'、'On'。
 
 デフォルト値: `undef`。　
 
@@ -3446,7 +3511,7 @@ apache::vhost { 'sample.example.net':
 
 バーチャルホストの[`KeepAliveTimeout`]ディレクティブを設定します。これにより、HTTPの持続的接続で後続のリクエストを実行するまでの待機時間が決まります。デフォルトでは、グローバルなサーバ全体の[`KeepAlive`][]設定が有効になります。
 
-このパラメータが意味を持つのは、グローバルなサーバ全体の[`keepalive`パラメータ][]またはバーチャルホストごとの`keepalive`パラメータのいずれかが有効になっている場合のみです。
+このパラメータが意味を持つのは、グローバルなサーバ全体の[`keepalive`パラメータ][]またはバーチャルホストごとの`keepalive`パラメータのいずれかが有効になっている場合のみです。　
 
 デフォルト値: `undef`。　
 
@@ -3456,7 +3521,7 @@ apache::vhost { 'sample.example.net':
 
 このパラメータが意味を持つのは、グローバルなサーバ全体の[`keepalive`パラメータ][]またはバーチャルホストごとの`keepalive`パラメータのいずれかが有効になっている場合のみです。　
 
-デフォルト値: `undef`。　
+デフォルト値: `undef`。
 
 ##### `auth_kerb`
 
@@ -3654,7 +3719,7 @@ apache::vhost { 'sample.example.net':
 
 プロキシを使用しないURLを指定します。このパラメータは、[`proxy_dest`](#proxy_dest)と組み合わせて使用することはできません。
 
-デフォルト値: []。
+デフォルト値: []。　
 
 ##### `no_proxy_uris_match`
 
@@ -3711,11 +3776,19 @@ apache::vhost { 'site.name.fdqn':
 
 デフォルト値: '[none]'。
 
+##### `passenger_spawn_method`
+
+[PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod)を設定します。Passengerが引き起こしたアプリケーションに直接か、preforkのcopy-on-writeメカニズムを使用します。
+
+有効なオプション: `smart`または`direct`。
+
+デフォルト値: `undef`。
+
 ##### `passenger_app_root`
 
 [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot)を設定します。これは、DocumentRootと異なる場合のPassengerアプリケーションルートのロケーションです。
 
-値: パスを指定する文字列。
+値: パスを指定する文字列。　
 
 デフォルト値: `undef`。
 
@@ -3731,7 +3804,7 @@ apache::vhost { 'site.name.fdqn':
 
 デフォルトでは、PassengerログメッセージはApacheグローバルエラーログに書き込まれます。[PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile)を使えば、そのメッセージを別のファイルに書き込むように設定することができます。このオプションは、Passenger 5.0.5以降でのみ使用できます。
 
-値: パスを指定する文字列。
+値: パスを指定する文字列。　
 
 デフォルト値: `undef`。
 
@@ -4901,7 +4974,7 @@ apache::vhost { 'sample.example.net':
 
 ##### `ssl_ca`
 
-SSL証明書認証局を指定します。
+使用するSSL認証局を指定して、認証に使用するクライアントの証明書を検証します。これを使用するには、`ssl_verify_client`も設定する必要があります。
 
 デフォルト値: `undef`。
 
@@ -4938,14 +5011,9 @@ SSL証明書を指定します。
 
 ##### `ssl_certs_dir`
 
-SSL証明書ディレクトリのロケーションを指定します。 
-
-デフォルト値: オペレーティングシステムによって異なります。
+SSL認証ディレクトリの場所を指定してクライアントの証明書を検証します。`ssl_verify_client`も設定されていない限り使用されません(下記参照)。
 
-- Debian: '/etc/ssl/certs'
-- Red Hat: '/etc/pki/tls/certs'
-- FreeBSD: `undef`
-- Gentoo: '/etc/ssl/apache2'
+デフォルト: undef
 
 ##### `ssl_chain`
 
@@ -4961,13 +5029,13 @@ SSLチェーンを指定します。このデフォルト値は設定しなく
 
 ##### `ssl_crl_path`
 
-証明書失効リストの保存場所を指定します。(このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります。)
+証明書失効リストの保存場所を指定して、クライアント認証の証明書を検証します(このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります)。
 
 デフォルト値: `undef`。
 
 ##### `ssl_crl_check`
 
-[SSLCARevocationCheckディレクティブ](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck)により、証明書失効チェックレベルを設定します。このデフォルト値は設定しなくても機能しますが、本稼働環境でCRLを使用する際に指定する必要があります。Apache 2.4以上にのみ適用されます。それ以前のバージョンでは、この値は無視されます。
+[SSLCARevocationCheckディレクティブ](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck)により、SSLクライアント認証の証明書失効チェックレベルを設定します。このデフォルト値は設定しなくても機能しますが、本稼働環境でCRLを使用する際に指定する必要があります。Apache 2.4以上にのみ適用され、それ以前のバージョンではこの値は無視されます。
 
 デフォルト値: `undef`。
 
@@ -5000,11 +5068,12 @@ apache::vhost { 'sample.example.net':
 
 ##### `ssl_verify_depth`
 
-[SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth)ディレクティブを設定します。これにより、クライアント認証確認におけるCA証明書の最大深さが指定されます。
+[SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth)ディレクティブを設定します。これにより、クライアント認証確認におけるCA証明書の最大深さが指定されます。これを有効にするには、`ssl_verify_client`を設定する必要があります。
 
 ``` puppet
 apache::vhost { 'sample.example.net':
   …
+  ssl_verify_client => 'require',
   ssl_verify_depth => 1,
 }
 ```
@@ -5029,13 +5098,13 @@ apache::vhost { 'sample.example.net':
 
 深さ0では、自己署名リモートサーバ証明書のみが許可されます。デフォルトの深さ 1では、リモートサーバ証明書を自己署名にすることも、サーバが直接知っているCAにより署名することもできます。
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `ssl_proxy_ca_cert`
 
 [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile)ディレクティブを設定します。これにより、やりとりするリモートサーバに関する認証局(CA)の証明書を集められるオールインワンファイルを指定します。これはリモートサーバ認証に用いられます。このファイルは、PEMエンコード証明書ファイルを優先順に連結したものにする必要があります。
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `ssl_proxy_machine_cert`
 
@@ -5048,15 +5117,15 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `ssl_proxy_check_peer_cn`
 
 [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn)ディレクティブを設定します。これにより、リモートサーバの証明書のCNフィールドをリクエストURLのホスト名と比較するかどうかを指定します。 
 
-値: 'on'、'off'。
+値: 'on'、'off'。　
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `ssl_proxy_check_peer_name`
 
@@ -5064,7 +5133,7 @@ apache::vhost { 'sample.example.net':
 
 値: 'on'、'off'。　
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `ssl_proxy_check_peer_expire`
 
@@ -5072,7 +5141,7 @@ apache::vhost { 'sample.example.net':
 
 値: 'on'、'off'。　
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `ssl_options`
 
@@ -5102,7 +5171,7 @@ apache::vhost { 'sample.example.net':
 
 [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)ディレクティブを設定します。これにより、OpenSSLパラメータを直接設定できます。
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `ssl_proxyengine`
 
@@ -5116,11 +5185,11 @@ apache::vhost { 'sample.example.net':
 
 [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling)を使用するかどうかを指定します。デフォルトでは、全体で設定されているものを使用します。
 
-このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。
+このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。　
 
 ブーリアンまたは`undef`。
 
-デフォルト値: `undef`。
+デフォルト値: `undef`。　
 
 ##### `ssl_stapling_timeout`
 
@@ -5128,7 +5197,7 @@ apache::vhost { 'sample.example.net':
 
 このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。　
 
-デフォルト値: なし。
+デフォルト値: なし。　
 
 ##### `ssl_stapling_return_errors`
 
@@ -5218,9 +5287,9 @@ FastCGIサーバにより処理するファイルのMIMEタイプ。
 
 バーチャルホストファイルが存在するかどうかを指定します。
 
-値: 'absent'、'present'。
+値: 'absent'、'present'。　
 
-デフォルト値: 'present'。
+デフォルト値: 'present'。　
 
 ##### `priority`
 
@@ -5238,13 +5307,13 @@ Apacheサービスに通知する前に設定ファイルのバリデーショ
 
 ### プライベート定義タイプ
 
-#### 定義タイプ: `apache::peruser::multiplexer`
+#### 定義タイプ: `apache::peruser::multiplexer`　
 
 この定義タイプは、Apacheモジュールにクラスがあるかどうかを確認します。クラスがある場合は、そのクラスを含めます。ない場合は、モジュール名を[`apache::mod`][]定義タイプに渡します。
 
 #### 定義タイプ: `apache::peruser::multiplexer`　
 
-FreeBSDに関してのみ、[`Peruser`][]モジュールを有効にします。
+FreeBSDに関してのみ、[`Peruser`][]モジュールを有効にします。　
 
 #### 定義タイプ: `apache::peruser::processor`
 
@@ -5364,26 +5433,4 @@ apache::vhost { 'test.server':
 
 できるだけ変更に簡単に貢献していただき、お使いの環境でモジュールが動作するようにしたいと考えています。モジュールの品質の維持と改善のため、Puppetは貢献者に守っていただくガイドラインを設けています。
 
-詳細については、[モジュールコントリビューションガイド][]を参照してください。
-
-### テスト
-
-このプロジェクトには、機能検証のための[rspec-puppet][]および[beaker-rspec][]に関するテストが含まれています。このツールの詳しい使い方については、それぞれのドキュメントを参照してください。
-
-#### テストのクイックスタート: Ruby > 1.8.7
-
-```
-gem install bundler
-bundle install
-bundle exec rake spec
-bundle exec rspec spec/acceptance
-RS_DEBUG=yes bundle exec rspec spec/acceptance
-```
-
-#### テストのクイックスタート: Ruby = 1.8.7
-
-```
-gem install bundler
-bundle install --without system_tests
-bundle exec rake spec
-```
+詳細については、[モジュールコントリビューションガイド][]および[CONTRIBUTING.md][]を参照してください。

From e085ab413bf6de16c9f155da27f6623840f4bbaa Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Wed, 4 Oct 2017 14:06:27 +0100
Subject: [PATCH 1261/2267] FM-6469 new feature

---
 README.md                         |  7 +++++
 spec/acceptance/init_task_spec.rb | 20 ++++++++++++++
 spec/spec_helper_acceptance.rb    | 46 +++++++++++++++++++++++++++++++
 tasks/init.json                   | 12 ++++++++
 tasks/init.rb                     | 23 ++++++++++++++++
 5 files changed, 108 insertions(+)
 create mode 100644 spec/acceptance/init_task_spec.rb
 create mode 100644 tasks/init.json
 create mode 100755 tasks/init.rb

diff --git a/README.md b/README.md
index d02c6b1f98..0272e31c6c 100755
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
 [Public defined types]: #public-defined-types
 [Private defined types]: #private-defined-types
 [Templates]: #templates
+[Tasks]: #tasks
 
 [Limitations]: #limitations
 
@@ -287,6 +288,7 @@
     - [Public defined types][]
     - [Private defined types][]
     - [Templates][]
+    - [Tasks][]
 5. [Limitations - OS compatibility, etc.][Limitations]
 6. [Development - Guide for contributing to the module][Development]
     - [Contributing to the apache module][Contributing]
@@ -814,6 +816,7 @@ Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balanc
     - [Defined type: apache::peruser::processor](#defined-type-apacheperuserprocessor)
     - [Defined type: apache::security::file_link](#defined-type-apachesecurityfile_link)
 - [**Templates**](#templates)
+- [**Tasks**](#tasks)
 
 ### Public Classes
 
@@ -5330,6 +5333,10 @@ Links the `activated_rules` from [`apache::mod::security`][] to the respective C
 
 The Apache module relies heavily on templates to enable the [`apache::vhost`][] and [`apache::mod`][] defined types. These templates are built based on [Facter][] facts specific to your operating system. Unless explicitly called out, most templates are not meant for configuration.
 
+### Tasks
+
+The Apache module has an example task that allows a user to reload the Apache config without restarting the service. Please refer to to the PE documentation or Bolt documentation on how to execute a task.
+
 ### Functions
 #### apache_pw_hash
 Hashes a password in a format suitable for htpasswd files read by apache.
diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
new file mode 100644
index 0000000000..923188cb14
--- /dev/null
+++ b/spec/acceptance/init_task_spec.rb
@@ -0,0 +1,20 @@
+# run a test task
+require 'spec_helper_acceptance'
+
+describe 'apache tasks', if: pe_install? && puppet_version =~ %r{(5\.\d\.\d)} do
+  describe 'reload' do
+    pp = <<-EOS
+    class { 'apache':
+      default_vhost => false,
+    }
+    apache::listen { '9090':}
+    EOS
+
+    apply_manifest(pp, :catch_failures => true)
+
+    it 'execute reload' do
+      result = run_task(task_name: 'apache', params: 'action=reload')
+      expect_multiple_regexes(result: result, regexes: [%r{reload successful}, %r{Job completed. 1/1 nodes succeeded}])
+    end
+  end
+end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index c652104c25..39e47a849f 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -3,10 +3,55 @@
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
 
+def install_bolt_on(hosts)
+  on(hosts, "/opt/puppetlabs/puppet/bin/gem install --source http://rubygems.delivery.puppetlabs.net bolt -v '> 0.0.1'", acceptable_exit_codes: [0, 1]).stdout
+end
+
+def pe_install?
+  ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i
+end
+
+def puppet_version
+  (on default, puppet('--version')).output.chomp
+end
+
 run_puppet_install_helper
+install_bolt_on(hosts) unless pe_install?
 install_module_on(hosts)
 install_module_dependencies_on(hosts)
 
+DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant'
+                     'vagrant'
+                   elsif default[:hypervisor] == 'vcloud'
+                     'Qu@lity!'
+                   end
+
+def run_puppet_access_login(user:, password: '~!@#$%^*-/ aZ', lifetime: '5y')
+  on(master, puppet('access', 'login', '--username', user, '--lifetime', lifetime), stdin: password)
+end
+
+def run_task(task_name:, params: nil, password: DEFAULT_PASSWORD)
+  if pe_install?
+    run_puppet_task(task_name: task_name, params: params)
+  else
+    run_bolt_task(task_name: task_name, params: params, password: password)
+  end
+end
+
+def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD)
+  on(master, "/opt/puppetlabs/puppet/bin/bolt task run #{task_name} --modules /etc/puppetlabs/code/modules/service --nodes localhost --password #{password} #{params}", acceptable_exit_codes: [0, 1]).stdout # rubocop:disable Metrics/LineLength
+end
+
+def run_puppet_task(task_name:, params: nil)
+  on(master, puppet('task', 'run', task_name, '--nodes', fact_on(master, 'fqdn'), params.to_s), acceptable_exit_codes: [0, 1]).stdout
+end
+
+def expect_multiple_regexes(result:, regexes:)
+  regexes.each do |regex|
+    expect(result).to match(regex)
+  end
+end
+
 RSpec.configure do |c|
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
@@ -26,6 +71,7 @@
 
   # Configure all nodes in nodeset
   c.before :suite do
+    run_puppet_access_login(user: 'admin') if pe_install?
     # net-tools required for netstat utility being used by be_listening
     if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
       pp = <<-EOS
diff --git a/tasks/init.json b/tasks/init.json
new file mode 100644
index 0000000000..4030a621db
--- /dev/null
+++ b/tasks/init.json
@@ -0,0 +1,12 @@
+{
+  "summary": "Allows you to perform apache functions",
+  "description": "Allows you to perform apache functions",
+  "supports_noop": false,
+  "input_method": "stdin",
+  "parameters": {
+    "action": {
+      "description": "Action to perform ",
+      "type": "Enum[reload]"
+    }
+  }
+}
diff --git a/tasks/init.rb b/tasks/init.rb
new file mode 100755
index 0000000000..a6a474d080
--- /dev/null
+++ b/tasks/init.rb
@@ -0,0 +1,23 @@
+#!/opt/puppetlabs/puppet/bin/ruby
+require 'json'
+require 'open3'
+require 'puppet'
+
+def service(action)
+  cmd_string = "service apache2 #{action}"
+  stdout, stderr, status = Open3.capture3(cmd_string)
+  raise Puppet::Error, stderr if status != 0
+  { status: "#{action} successful" }
+end
+
+params = JSON.parse(STDIN.read)
+action = params['action']
+
+begin
+  result = service(action)
+  puts result.to_json
+  exit 0
+rescue Puppet::Error => e
+  puts({ status: 'failure', error: e.message }.to_json)
+  exit 1
+end

From 626d7e4058c8604393bb6dbe202365c52984af01 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Fri, 6 Oct 2017 16:20:16 -0700
Subject: [PATCH 1262/2267] Add pe/bolt docs links, remove word 'example'

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0272e31c6c..fdbf933ddc 100755
--- a/README.md
+++ b/README.md
@@ -5335,7 +5335,7 @@ The Apache module relies heavily on templates to enable the [`apache::vhost`][]
 
 ### Tasks
 
-The Apache module has an example task that allows a user to reload the Apache config without restarting the service. Please refer to to the PE documentation or Bolt documentation on how to execute a task.
+The Apache module has a task that allows a user to reload the Apache config without restarting the service. Please refer to to the [PE documentation](https://puppet.com/docs/pe/2017.3/orchestrator/running_tasks.html) or [Bolt documentation](https://puppet.com/docs/bolt/latest/bolt.html) on how to execute a task.
 
 ### Functions
 #### apache_pw_hash

From f660d5450c4846461213540a944103c524e056e4 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Fri, 6 Oct 2017 16:55:52 -0700
Subject: [PATCH 1263/2267] Move apply_manifest into rspec 'it'

---
 spec/acceptance/init_task_spec.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index 923188cb14..78bdaa05e6 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -3,16 +3,16 @@
 
 describe 'apache tasks', if: pe_install? && puppet_version =~ %r{(5\.\d\.\d)} do
   describe 'reload' do
-    pp = <<-EOS
-    class { 'apache':
-      default_vhost => false,
-    }
-    apache::listen { '9090':}
-    EOS
+    it 'execute reload' do
+      pp = <<-EOS
+      class { 'apache':
+        default_vhost => false,
+      }
+      apache::listen { '9090':}
+      EOS
 
-    apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_failures => true)
 
-    it 'execute reload' do
       result = run_task(task_name: 'apache', params: 'action=reload')
       expect_multiple_regexes(result: result, regexes: [%r{reload successful}, %r{Job completed. 1/1 nodes succeeded}])
     end

From 5f4d5689fa831bcb32e00772f6c0fddab088b80e Mon Sep 17 00:00:00 2001
From: TP Honey <tphoney@users.noreply.github.com>
Date: Mon, 9 Oct 2017 12:18:29 +0100
Subject: [PATCH 1264/2267] Update init.json

---
 tasks/init.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tasks/init.json b/tasks/init.json
index 4030a621db..0d0ceaeb40 100644
--- a/tasks/init.json
+++ b/tasks/init.json
@@ -1,7 +1,5 @@
 {
-  "summary": "Allows you to perform apache functions",
-  "description": "Allows you to perform apache functions",
-  "supports_noop": false,
+  "description": "Allows you to perform apache service functions",
   "input_method": "stdin",
   "parameters": {
     "action": {

From 6102db86bd38f608db2776ca159013566714ee83 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 10 Oct 2017 11:50:56 +0100
Subject: [PATCH 1265/2267] Release prep

---
 CHANGELOG.md  | 7 +++++++
 metadata.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 100cfee6e0..46ee4e92fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
+## Supported Release [2.3.0]
+### Summary
+This is a feature release. It includes a task that will reload the apache service.
+
+#### Added
+- Add a task that allows the reloading of the Apache service.
+
 ## Supported Release [2.2.0]
 ### Summary
 This is a maintainence and feature release. It will include updates to translations in Japanese, some maintainence and adding `PassengerSpawnMethod` to vhost.
diff --git a/metadata.json b/metadata.json
index 2d7606852f..0f9f5e8275 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From e1034ecae2554d2bc459ee06387c605204618458 Mon Sep 17 00:00:00 2001
From: Paul Barton <bartonp@uchicago.edu>
Date: Wed, 2 Aug 2017 14:08:04 -0500
Subject: [PATCH 1266/2267] Support for UseCanonicalName On | on | Off | off |
 DNS | dns

apache and apache::vhost support for UseCanonicalName. This directive
controls how Apache uses self-referential URLs.
---
 README.md                               | 10 ++++++++++
 manifests/init.pp                       |  2 ++
 manifests/vhost.pp                      | 11 +++++++++++
 spec/classes/apache_spec.rb             |  8 ++++++++
 spec/defines/vhost_spec.rb              |  1 +
 templates/httpd.conf.erb                |  3 +++
 templates/vhost/_use_canonical_name.erb |  4 ++++
 7 files changed, 39 insertions(+)
 create mode 100644 templates/vhost/_use_canonical_name.erb

diff --git a/README.md b/README.md
index c73053143f..a521e98b8b 100755
--- a/README.md
+++ b/README.md
@@ -261,6 +261,8 @@
 [template]: http://docs.puppet.com/puppet/latest/reference/lang_template.html
 [`TraceEnable`]: https://httpd.apache.org/docs/current/mod/core.html#traceenable
 
+[`UseCanonicalName`]: https://httpd.apache.org/docs/current/mod/core.html#usecanonicalname
+
 [`verify_config`]: #verify_config
 [`vhost`]: #defined-type-apachevhost
 [`vhost_dir`]: #vhost_dir
@@ -1390,6 +1392,14 @@ Values: 'Off', 'On'.
 
 Default: 'On'.
 
+##### `use_canonical_name`
+
+Controls Apache's [`UseCanonicalName`][] directive which controls how Apache handles self-referential URLs. If not specified, this parameter omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
+
+Values: 'On', 'on', 'Off', 'off', 'DNS', 'dns'.
+
+Default: `undef`.
+
 ##### `use_systemd`
 
 Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs.
diff --git a/manifests/init.pp b/manifests/init.pp
index 39dc593334..c05df90123 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -80,6 +80,8 @@
   $trace_enable                                                  = 'On',
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef,
   $file_e_tag                                                    = undef,
+  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]
+    $use_canonical_name                                          = undef,
   $package_ensure                                                = 'installed',
   Boolean $use_optional_includes                                 = $::apache::params::use_optional_includes,
   $use_systemd                                                   = $::apache::params::use_systemd,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8d423bb7da..5d9a535c01 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -175,6 +175,7 @@
   $cas_login_url                                                                    = undef,
   $cas_validate_url                                                                 = undef,
   $cas_validate_saml                                                                = undef,
+  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name        = undef,
 ) {
 
   # The base class must be included first because it is used by parameter defaults
@@ -1067,6 +1068,16 @@
     }
   }
 
+  # Template uses:
+  # - $use_canonical_name
+  if $use_canonical_name {
+    concat::fragment { "${name}-use_canonical_name":
+      target  => "${priority_real}${filename}.conf",
+      order   => 360,
+      content => template('apache/vhost/_use_canonical_name.erb'),
+    }
+  }
+
   # Template uses no variables
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 355f9f108d..025b99b46b 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -118,6 +118,14 @@
       it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^FileETag None$} }
     end
 
+    context "when specifying canonical name behaviour" do
+      let :params do
+        { :use_canonical_name => 'dns' }
+      end
+
+      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^UseCanonicalName dns$} }
+    end
+
     context "when specifying default character set" do
       let :params do
         { :default_charset => 'none' }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index c1d1417925..097eb970d4 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -392,6 +392,7 @@
           'use_optional_includes'       => true,
           'suexec_user_group'           => 'root root',
           'allow_encoded_slashes'       => 'nodecode',
+          'use_canonical_name'          => 'dns',
           'passenger_spawn_method'      => 'direct',
           'passenger_app_root'          => '/usr/share/myapp',
           'passenger_app_env'           => 'test',
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index ddb40b57e2..d3dd2c30bb 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -68,6 +68,9 @@ AllowEncodedSlashes <%= @allow_encoded_slashes %>
 <%- if @file_e_tag -%>
 FileETag <%= @file_e_tag %>
 <%- end -%>
+<%- if @use_canonical_name -%>
+UseCanonicalName <%= @use_canonical_name %>
+<%- end -%>
 
 #Listen 80
 
diff --git a/templates/vhost/_use_canonical_name.erb b/templates/vhost/_use_canonical_name.erb
new file mode 100644
index 0000000000..4f2e3ee224
--- /dev/null
+++ b/templates/vhost/_use_canonical_name.erb
@@ -0,0 +1,4 @@
+<%- if @use_canonical_name -%>
+
+  UseCanonicalName <%= @use_canonical_name %>
+<%- end -%>

From 27806dc8eff708920f589cf92221f446867689c6 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Wed, 11 Oct 2017 14:47:10 +0100
Subject: [PATCH 1267/2267] Update link to Release in CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46ee4e92fd..c7fb17fc90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -920,6 +920,7 @@ worker/prefork
 * f672e46 a2mod fix
 * 8a56ee9 add pthon support to apache
 
+[2.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.2.0...2.3.0
 [2.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.1.0...2.2.0
 [2.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...2.1.0
 [2.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0

From 9343f20018f00558767a2a6358729b48d7e3bb29 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <github@kohlvanwijngaarden.nl>
Date: Wed, 11 Oct 2017 18:58:51 +0200
Subject: [PATCH 1268/2267] Fix markdown syntax

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 96977880ef..a1cdb9eb96 100755
--- a/README.md
+++ b/README.md
@@ -3454,7 +3454,7 @@ Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.ht
 
 Default: `undef`.
 
-#####`fastcgi_idle_timeout`
+##### `fastcgi_idle_timeout`
 
 If using fastcgi, this option sets the timeout for the server to respond.
 
@@ -4031,7 +4031,7 @@ Specifies the resource identifiers for a rack configuration. The file paths spec
 
 Default: `undef`.
 
-#####`passenger_base_uris`
+##### `passenger_base_uris`
 
 Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template.
 

From 9a61477dbd72e7139a6599bf51462ef876b31745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Oct 2017 10:33:34 +0200
Subject: [PATCH 1269/2267] (doc) Do not quote arrays

The README mixed quoted arrays and non-quoted arrays.  Consistently use
non-quoted arrays which prevalents.
---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a1cdb9eb96..4e6a65ae4d 100755
--- a/README.md
+++ b/README.md
@@ -2736,7 +2736,7 @@ Allows user-specific directories to be accessed using the `http://example.com/~u
 
 * `overrides`: An [array][] of directive-types.
 
-  Default: '[ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]'.
+  Default: [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ].
 
 ##### Class: `apache::mod::version`
 
@@ -3438,7 +3438,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default: '[]'.
+Default: [].
 
 ##### `ensure`
 
@@ -3623,7 +3623,7 @@ Related parameters follow the names of `mod_auth_kerb` directives:
 - `krb_method_negotiate`: Determines whether to use the Negotiate method. Default: 'on'.
 - `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'.
 - `krb_authoritative`: If set to 'off', authentication controls can be passed on to another module. Default: 'on'.
-- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: '[]'.
+- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: [].
 - `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: `undef`.
 - `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: `undef`.
 
@@ -3848,7 +3848,7 @@ Default: ['Indexes','FollowSymLinks','MultiViews'],
 
 Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
 
-Default: '[none]'.
+Default: ['None'].
 
 ##### `passenger_spawn_method`
 
@@ -4255,7 +4255,7 @@ Default: `undef`.
 
 Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site.
 
-Default: '[]'.
+Default: [].
 
 ##### `servername`
 
@@ -4267,7 +4267,7 @@ Default: the title of the resource.
 
 Used by HTTPD to set environment variables for virtual hosts.
 
-Default: '[]'.
+Default: [].
 
 Example:
 
@@ -4281,13 +4281,13 @@ apache::vhost { 'setenv.example.com':
 
 Used by HTTPD to conditionally set environment variables for virtual hosts.
 
-Default: '[]'.
+Default: [].
 
 ##### `setenvifnocase`
 
 Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
 
-Default: '[]'.
+Default: [].
 
 ##### `suphp_*`
 

From 803140700d36fb6845aa81cf2bec8dd8697b3081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Oct 2017 10:38:21 +0200
Subject: [PATCH 1270/2267] (doc) Do not use space in angle brackets

The README mixed use of spaces in angle brackets.  Consistently remove
these spaces since it's prevalent.
---
 README.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 4e6a65ae4d..0a208af5da 100755
--- a/README.md
+++ b/README.md
@@ -1993,7 +1993,7 @@ Installs and configures [`mod_deflate`][].
 
 * `types`: An [array][] of [MIME types][MIME `content*type`] to be deflated.
 
-  Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x*javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json' ].
+  Default: ['text/html text/plain text/xml', 'text/css', 'application/x*javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json'].
 
 * `notes`: A [Hash][] where the key represents the type and the value represents the note name.
 
@@ -2457,7 +2457,7 @@ Installs and configures [`mod_negotiation`][].
 
 * `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module.
 
-  Default: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt*BR', 'ru', 'sv', 'zh*CN', 'zh*TW' ]
+  Default: ['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt*BR', 'ru', 'sv', 'zh*CN', 'zh*TW']
 
 ##### Class: `apache::mod::nss`
 
@@ -2640,9 +2640,9 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 - `ssl_cryptodevice`: Default: 'builtin'.
 - `ssl_honorcipherorder`: Default: true.
 - `ssl_openssl_conf_cmd`: Default: undef.
-- `ssl_options`: Default: [ 'StdEnvVars' ]
+- `ssl_options`: Default: ['StdEnvVars']
 - `ssl_pass_phrase_dialog`: Default: 'builtin'.
-- `ssl_protocol`: Default: [ 'all', '-SSLv2', '-SSLv3' ].
+- `ssl_protocol`: Default: ['all', '-SSLv2', '-SSLv3'].
 - `ssl_proxy_protocol`: Default: [].
 - `ssl_random_seed_bytes`: Valid options: A string. Default: '512'.
 - `ssl_sessioncache`: Valid options: A string. Default: '300'.
@@ -2675,7 +2675,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 
 * `ssl_options`
 
-  Default: [ 'StdEnvVars' ]
+  Default: ['StdEnvVars']
 
 * `ssl_pass_phrase_dialog`
 
@@ -2683,7 +2683,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 
 * `ssl_protocol`
 
-  Default: [ 'all', '*SSLv2', '*SSLv3' ].
+  Default: ['all', '*SSLv2', '*SSLv3'].
 
 * `ssl_random_seed_bytes`
 
@@ -2736,7 +2736,7 @@ Allows user-specific directories to be accessed using the `http://example.com/~u
 
 * `overrides`: An [array][] of directive-types.
 
-  Default: [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ].
+  Default: ['FileInfo', 'AuthConfig', 'Limit', 'Indexes'].
 
 ##### Class: `apache::mod::version`
 
@@ -3737,13 +3737,13 @@ Array of mod_security Msgs to remove from the virtual host. Also takes a hash al
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  modsec_disable_msgs => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ],
+  modsec_disable_msgs => ['Blind SQL Injection Attack', 'Session Fixation Attack'],
 }
 ```
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  modsec_disable_msgs => { '/location1' => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ] },
+  modsec_disable_msgs => { '/location1' => ['Blind SQL Injection Attack', 'Session Fixation Attack'] },
 }
 ```
 
@@ -3755,13 +3755,13 @@ Array of mod_security Tags to remove from the virtual host. Also takes a hash al
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ],
+  modsec_disable_tags => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'],
 }
 ```
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  modsec_disable_tags => { '/location1' => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ] },
+  modsec_disable_tags => { '/location1' => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'] },
 }
 ```
 
@@ -4952,12 +4952,12 @@ apache::vhost { 'secure.example.net':
       rewrites => [ { comment      => 'Permalink Rewrites',
                       rewrite_base => '/'
                     },
-                    { rewrite_rule => [ '^index\.php$ - [L]' ]
+                    { rewrite_rule => ['^index\.php$ - [L]']
                     },
-                    { rewrite_cond => [ '%{REQUEST_FILENAME} !-f',
-                                        '%{REQUEST_FILENAME} !-d',
+                    { rewrite_cond => ['%{REQUEST_FILENAME} !-f',
+                                       '%{REQUEST_FILENAME} !-d',
                                       ],
-                      rewrite_rule => [ '. /index.php [L]' ],
+                      rewrite_rule => ['. /index.php [L]'],
                     }
                   ],
     },
@@ -4999,7 +4999,7 @@ apache::vhost { 'secure.example.net':
       ssl_options => '+ExportCertData',
     },
     { path        => '/path/to/different/dir',
-      ssl_options => [ '-StdEnvVars', '+ExportCertData'],
+      ssl_options => ['-StdEnvVars', '+ExportCertData'],
     },
   ],
 }
@@ -5031,7 +5031,7 @@ apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
     { path  => '/path/to/different/dir',
-      additional_includes => [ '/custom/path/includes', '/custom/path/another_includes', ],
+      additional_includes => ['/custom/path/includes', '/custom/path/another_includes',],
     },
   ],
 }
@@ -5236,7 +5236,7 @@ An array:
 ``` puppet
 apache::vhost { 'sample.example.net':
   …
-  ssl_options => [ '+StrictRequire', '+ExportCertData' ],
+  ssl_options => ['+StrictRequire', '+ExportCertData'],
 }
 ```
 

From 38010145918bf439c58aa3f1988fbfe820bebbdc Mon Sep 17 00:00:00 2001
From: Johnson Earls <johnson.earls@gmail.com>
Date: Sun, 22 Oct 2017 17:43:47 +0000
Subject: [PATCH 1271/2267] Reduce Travis test parallelism

Set the maximum parallel test processors to 16, to reduce the load
on the Travis servers and prevent tests from being killed.
---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0c6f904c32..fcb1693670 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ script: "bundle exec rake release_checks"
 #Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
 before_install:
   - gem update bundler
+# Reduce load on Travis servers to prevent tests from being killed
+env:
+  global:
+  - PARALLEL_TEST_PROCESSORS=16
 matrix:
   fast_finish: true
   include:

From 9589f82a6dd237f8819bba1f302140e8d84c422c Mon Sep 17 00:00:00 2001
From: Kent Lee <754650@la-c02tq1u2htd7.bnznag.nz.thenational.com>
Date: Wed, 25 Oct 2017 16:22:12 +1300
Subject: [PATCH 1272/2267] added option to include CacheIgnoreHeaders for
 disk_cache module

---
 manifests/mod/disk_cache.pp       | 3 ++-
 templates/mod/disk_cache.conf.erb | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 7cd72701e4..25f864b75d 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -1,5 +1,6 @@
 class apache::mod::disk_cache (
-  $cache_root = undef,
+  $cache_root           = undef,
+  $cache_ignore_headers = undef,
 ) {
   include ::apache
   if $cache_root {
diff --git a/templates/mod/disk_cache.conf.erb b/templates/mod/disk_cache.conf.erb
index b1b460e522..f0721628e3 100644
--- a/templates/mod/disk_cache.conf.erb
+++ b/templates/mod/disk_cache.conf.erb
@@ -2,3 +2,6 @@ CacheEnable disk /
 CacheRoot "<%= @_cache_root %>"
 CacheDirLevels 2
 CacheDirLength 1
+<% if scope['cache_ignore_headers'] != :undef -%>
+CacheIgnoreHeaders <%= @cache_ignore_headers %>
+<% end -%>
\ No newline at end of file

From d8dcbefaa4cb804b79874ffab451062d2c9e12ac Mon Sep 17 00:00:00 2001
From: Kent Lee <754650@la-c02tq1u2htd7.bnznag.nz.thenational.com>
Date: Fri, 27 Oct 2017 09:21:48 +1300
Subject: [PATCH 1273/2267] removed possible new line at the end of file

---
 templates/mod/disk_cache.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/disk_cache.conf.erb b/templates/mod/disk_cache.conf.erb
index f0721628e3..57295ef513 100644
--- a/templates/mod/disk_cache.conf.erb
+++ b/templates/mod/disk_cache.conf.erb
@@ -3,5 +3,5 @@ CacheRoot "<%= @_cache_root %>"
 CacheDirLevels 2
 CacheDirLength 1
 <% if scope['cache_ignore_headers'] != :undef -%>
-CacheIgnoreHeaders <%= @cache_ignore_headers %>
+CacheIgnoreHeaders <%= @cache_ignore_headers -%>
 <% end -%>
\ No newline at end of file

From 808b2f12544e679c51fceb73bcdae8d0036ce4fd Mon Sep 17 00:00:00 2001
From: Kent Lee <754650@la-c02tq1u2htd7.bnznag.nz.thenational.com>
Date: Mon, 30 Oct 2017 11:24:39 +1300
Subject: [PATCH 1274/2267] modified variable lookup.

---
 templates/mod/disk_cache.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/disk_cache.conf.erb b/templates/mod/disk_cache.conf.erb
index 57295ef513..44d4fd2bca 100644
--- a/templates/mod/disk_cache.conf.erb
+++ b/templates/mod/disk_cache.conf.erb
@@ -2,6 +2,6 @@ CacheEnable disk /
 CacheRoot "<%= @_cache_root %>"
 CacheDirLevels 2
 CacheDirLength 1
-<% if scope['cache_ignore_headers'] != :undef -%>
+<% if @cache_ignore_headers -%>
 CacheIgnoreHeaders <%= @cache_ignore_headers -%>
 <% end -%>
\ No newline at end of file

From b612885cc97055076624846db97630841bd88f36 Mon Sep 17 00:00:00 2001
From: Chris Warren <cwarren@kayak.com>
Date: Wed, 1 Nov 2017 08:19:20 -0400
Subject: [PATCH 1275/2267] Add ability to specify
 MellonSessionLength/mellon_session_length

---
 README.md                        | 7 ++++---
 templates/vhost/_directories.erb | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a1cdb9eb96..30a8baaf73 100755
--- a/README.md
+++ b/README.md
@@ -2198,8 +2198,8 @@ Default: '80'
 
 **workers\_file\_content**
 
-Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values.  
-Plus, there are two global directives, 'worker.list' and 'worker.mantain'  
+Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values.
+Plus, there are two global directives, 'worker.list' and 'worker.mantain'
 For example, the workers file below:
 
 ```
@@ -2238,7 +2238,7 @@ $workers_file_content = {
 
 **mount\_file\_content**
 
-Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker.  
+Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker.
 For example, the mount file below:
 
 ```
@@ -4786,6 +4786,7 @@ to environment variables.
 - `mellon_sp_private_key_file`: Sets the [MellonSPPrivateKeyFile][`mod_auth_mellon`] directive for the private key location of the service provider.
 - `mellon_sp_cert_file`: Sets the [MellonSPCertFile][`mod_auth_mellon`] directive for the public key location of the service provider.
 - `mellon_user`: Sets the [MellonUser][`mod_auth_mellon`] attribute to use for the username.
+- `mellon_session_length`: Sets the [MellonSessionLength][`mod_auth_mellon`] attribute.
 
 ##### `options`
 
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index e4a7d7791b..ed80b36bb3 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -327,6 +327,9 @@
     MellonCond <%= cond %>
          <%- end -%>
       <%- end -%>
+      <%- if directory['mellon_session_length'] -%>
+    MellonSessionLength "<%= directory['mellon_session_length'] %>"
+      <%- end -%>
     <%- end -%>
     <%- if directory['request_headers'] and ! directory['request_headers'].empty? -%>
       ## Request Header rules

From 7d43453293a54b0479efd753b3b6950d48d5890e Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Tue, 14 Nov 2017 11:33:12 -0500
Subject: [PATCH 1276/2267] Fix case of setting apache::mpm_module to false and
 declaring the mpm class yourself b/c you need to set params.

---
 manifests/mod/cgi.pp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index 272f0ccd05..e4a80239af 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -1,9 +1,14 @@
 class apache::mod::cgi {
+  include ::apache
   case $::osfamily {
     'FreeBSD': {}
     default: {
-      if $::apache::mpm_module =~ /^(itk|peruser|prefork)$/ {
-        Class["::apache::mod::${::apache::mpm_module}"] -> Class['::apache::mod::cgi']
+      if defined(Class['::apache::mod::itk']) {
+        Class['::apache::mod::itk'] -> Class['::apache::mod::cgi']
+      } elsif defined(Class['::apache::mod::peruser']) {
+        Class['::apache::mod::peruser'] -> Class['::apache::mod::cgi']
+      } else {
+        Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
       }
     }
   }

From 0d3a193f79db2238e31418c65beafe36d0b31161 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Thu, 16 Nov 2017 16:01:23 +0000
Subject: [PATCH 1277/2267] (FM-6583) - Update test

---
 spec/acceptance/custom_config_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index c8e254e858..e3668c0165 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -15,7 +15,7 @@ class { 'apache': }
     end
 
     describe file("#{$confd_dir}/25-acceptance_test.conf") do
-      it { is_expected.not_to be_file }
+      it { expect(file).not_to exist }
     end
   end
 

From 91010808425dbad02ab0140f406ce5d82d65bec3 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Fri, 17 Nov 2017 10:49:25 +0000
Subject: [PATCH 1278/2267] Update modules to modulepath

---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 39e47a849f..1fb5ab24f7 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -39,7 +39,7 @@ def run_task(task_name:, params: nil, password: DEFAULT_PASSWORD)
 end
 
 def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD)
-  on(master, "/opt/puppetlabs/puppet/bin/bolt task run #{task_name} --modules /etc/puppetlabs/code/modules/service --nodes localhost --password #{password} #{params}", acceptable_exit_codes: [0, 1]).stdout # rubocop:disable Metrics/LineLength
+  on(master, "/opt/puppetlabs/puppet/bin/bolt task run #{task_name} --modulepath /etc/puppetlabs/code/modules/service --nodes localhost --password #{password} #{params}", acceptable_exit_codes: [0, 1]).stdout # rubocop:disable Metrics/LineLength
 end
 
 def run_puppet_task(task_name:, params: nil)

From 3aeeb79439086e8c8140e82a00ea06e659309595 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Fri, 17 Nov 2017 12:15:44 +0000
Subject: [PATCH 1279/2267] Module sync 1d81b6a

---
 .travis.yml         | 6 +-----
 spec/spec_helper.rb | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fcb1693670..38d226395a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,6 @@ script: "bundle exec rake release_checks"
 #Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
 before_install:
   - gem update bundler
-# Reduce load on Travis servers to prevent tests from being killed
-env:
-  global:
-  - PARALLEL_TEST_PROCESSORS=16
 matrix:
   fast_finish: true
   include:
@@ -26,7 +22,7 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.4.0
+  - rvm: 2.4.1
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 5.0"
   - rvm: 2.1.9
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 22d5d689f4..01912b60c4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,9 @@
-#This file is generated by ModuleSync, do not edit.
+# This file is generated by ModuleSync, do not edit.
 require 'puppetlabs_spec_helper/module_spec_helper'
 
 # put local configuration and setup into spec_helper_local
 begin
   require 'spec_helper_local'
-rescue LoadError
+rescue LoadError => loaderror
+  puts "Could not require spec_helper_local: #{loaderror.message}"
 end

From 8e7dd0dc7f5d0ef4c69655a735dd4b3526e92419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCssel=2C=20Sascha?= <ruessel@synyx.de>
Date: Fri, 17 Nov 2017 15:00:10 +0100
Subject: [PATCH 1280/2267] [MODULES-5644] Package name is libapache2-mpm-itk
 for Debian 9

---
 manifests/mpm.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 119fedf577..2c4dd13335 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -83,7 +83,7 @@
         }
       }
 
-      if $mpm == 'itk' and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '16.04' {
+      if $mpm == 'itk' and ( ( $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '16.04' ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9.0.0') >= 0 ) ) {
         $packagename = 'libapache2-mpm-itk'
       } else {
         $packagename = "apache2-mpm-${mpm}"

From 3ff209a98283f57e0bfd20b85be02b7a84ae8454 Mon Sep 17 00:00:00 2001
From: TP Honey <tphoney@users.noreply.github.com>
Date: Mon, 20 Nov 2017 18:06:22 +0000
Subject: [PATCH 1281/2267] Remove whitespace at the end of a line.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0a208af5da..3d218d88d9 100755
--- a/README.md
+++ b/README.md
@@ -2198,8 +2198,8 @@ Default: '80'
 
 **workers\_file\_content**
 
-Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values.  
-Plus, there are two global directives, 'worker.list' and 'worker.mantain'  
+Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values.
+Plus, there are two global directives, 'worker.list' and 'worker.mantain'
 For example, the workers file below:
 
 ```
@@ -2238,7 +2238,7 @@ $workers_file_content = {
 
 **mount\_file\_content**
 
-Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker.  
+Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker.
 For example, the mount file below:
 
 ```

From 5f0f28e080694a7368c85ab98d260109d649fab2 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Mon, 20 Nov 2017 17:46:59 +0000
Subject: [PATCH 1282/2267] MODULES-6070 Improvements for tasks and testing

---
 Gemfile                           |  1 +
 spec/acceptance/init_task_spec.rb |  4 +--
 spec/spec_helper_acceptance.rb    | 45 +------------------------------
 tasks/init.json                   |  4 +++
 tasks/init.rb                     | 19 ++++++++++---
 5 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/Gemfile b/Gemfile
index a9f0161c79..8bd07c79b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,6 +51,7 @@ group :system_tests do
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
   gem "puppet-blacksmith", '~> 3.4',                                             :require => false
+  gem "beaker-task_helper"
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index 78bdaa05e6..ef87c948bf 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -1,7 +1,7 @@
 # run a test task
 require 'spec_helper_acceptance'
 
-describe 'apache tasks', if: pe_install? && puppet_version =~ %r{(5\.\d\.\d)} do
+describe 'apache tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && fact('operatingsystem') != 'SLES' do
   describe 'reload' do
     it 'execute reload' do
       pp = <<-EOS
@@ -14,7 +14,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
 
       result = run_task(task_name: 'apache', params: 'action=reload')
-      expect_multiple_regexes(result: result, regexes: [%r{reload successful}, %r{Job completed. 1/1 nodes succeeded}])
+      expect_multiple_regexes(result: result, regexes: [%r{reload successful}, %r{Job completed. 1/1 nodes succeeded|Ran on 1 node}])
     end
   end
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 1fb5ab24f7..eca266ce03 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -2,56 +2,13 @@
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
-
-def install_bolt_on(hosts)
-  on(hosts, "/opt/puppetlabs/puppet/bin/gem install --source http://rubygems.delivery.puppetlabs.net bolt -v '> 0.0.1'", acceptable_exit_codes: [0, 1]).stdout
-end
-
-def pe_install?
-  ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i
-end
-
-def puppet_version
-  (on default, puppet('--version')).output.chomp
-end
+require 'beaker/task_helper'
 
 run_puppet_install_helper
 install_bolt_on(hosts) unless pe_install?
 install_module_on(hosts)
 install_module_dependencies_on(hosts)
 
-DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant'
-                     'vagrant'
-                   elsif default[:hypervisor] == 'vcloud'
-                     'Qu@lity!'
-                   end
-
-def run_puppet_access_login(user:, password: '~!@#$%^*-/ aZ', lifetime: '5y')
-  on(master, puppet('access', 'login', '--username', user, '--lifetime', lifetime), stdin: password)
-end
-
-def run_task(task_name:, params: nil, password: DEFAULT_PASSWORD)
-  if pe_install?
-    run_puppet_task(task_name: task_name, params: params)
-  else
-    run_bolt_task(task_name: task_name, params: params, password: password)
-  end
-end
-
-def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD)
-  on(master, "/opt/puppetlabs/puppet/bin/bolt task run #{task_name} --modulepath /etc/puppetlabs/code/modules/service --nodes localhost --password #{password} #{params}", acceptable_exit_codes: [0, 1]).stdout # rubocop:disable Metrics/LineLength
-end
-
-def run_puppet_task(task_name:, params: nil)
-  on(master, puppet('task', 'run', task_name, '--nodes', fact_on(master, 'fqdn'), params.to_s), acceptable_exit_codes: [0, 1]).stdout
-end
-
-def expect_multiple_regexes(result:, regexes:)
-  regexes.each do |regex|
-    expect(result).to match(regex)
-  end
-end
-
 RSpec.configure do |c|
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
diff --git a/tasks/init.json b/tasks/init.json
index 0d0ceaeb40..3822ed643c 100644
--- a/tasks/init.json
+++ b/tasks/init.json
@@ -5,6 +5,10 @@
     "action": {
       "description": "Action to perform ",
       "type": "Enum[reload]"
+    },
+    "service_name": {
+      "description": "The name of the apache service ",
+      "type": "Optional[String[1]]"
     }
   }
 }
diff --git a/tasks/init.rb b/tasks/init.rb
index a6a474d080..38ecd463be 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -3,8 +3,20 @@
 require 'open3'
 require 'puppet'
 
-def service(action)
-  cmd_string = "service apache2 #{action}"
+def service(action, service_name)
+  if service_name.nil?
+    cmd_string = "facter -p osfamily"
+    stdout, stderr, status = Open3.capture3(cmd_string)
+    osfamily = stdout.strip
+    if osfamily == 'RedHat'
+      service_name = 'httpd'
+    elsif osfamily == 'FreeBSD'
+      service_name = 'apache24'
+    else
+      service_name = 'apache2'
+    end
+  end
+  cmd_string = "service #{service_name} #{action}"
   stdout, stderr, status = Open3.capture3(cmd_string)
   raise Puppet::Error, stderr if status != 0
   { status: "#{action} successful" }
@@ -12,9 +24,10 @@ def service(action)
 
 params = JSON.parse(STDIN.read)
 action = params['action']
+service_name = params['service_name']
 
 begin
-  result = service(action)
+  result = service(action, service_name)
   puts result.to_json
   exit 0
 rescue Puppet::Error => e

From 90ef4ceb007b8a40eeb33e63ef7a0b0220b96ba3 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Thu, 23 Nov 2017 09:20:36 +0000
Subject: [PATCH 1283/2267] Dont run task tests on LTS

Tasks only work on builds with a puppet agent version of 5 or greater.
Adding logic to skip the task setup.
---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index eca266ce03..d59c7f8ab8 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -28,7 +28,7 @@
 
   # Configure all nodes in nodeset
   c.before :suite do
-    run_puppet_access_login(user: 'admin') if pe_install?
+    run_puppet_access_login(user: 'admin') if pe_install? && puppet_version =~ %r{(5\.\d\.\d)}
     # net-tools required for netstat utility being used by be_listening
     if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
       pp = <<-EOS

From 5bcdedfee60cbd134509ac23852a476cdfd1aba7 Mon Sep 17 00:00:00 2001
From: OKUMURA Takahiro <hfm.garden@gmail.com>
Date: Sat, 25 Nov 2017 22:36:43 +0900
Subject: [PATCH 1284/2267] fix typo: false is boolean

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3d218d88d9..c2f0f80d48 100755
--- a/README.md
+++ b/README.md
@@ -1680,7 +1680,7 @@ Installs and configures [`mod_diskio`][].
 
 ```puppet
 class{'apache':
-  default_mods => `false`,
+  default_mods => false,
   log_level    => 'dumpio:trace7',
 }
 class{'apache::mod::diskio':

From cd5aaed85f6452eb38625daaaff7f5e94e5c4fb0 Mon Sep 17 00:00:00 2001
From: OKUMURA Takahiro <hfm.garden@gmail.com>
Date: Sat, 25 Nov 2017 22:37:03 +0900
Subject: [PATCH 1285/2267] fix typo: add missing asterisk

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c2f0f80d48..6fbcaa8f77 100755
--- a/README.md
+++ b/README.md
@@ -1653,7 +1653,7 @@ Installs and manages [`mod_alias`][].
     * **Debian**: `/usr/share/apache2/icons`
     * **FreeBSD**: `/usr/local/www/apache24/icons`
     * **Gentoo**: `/var/www/icons`
-    * *Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
+    * **Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
 
 #### Class: `apache::mod::disk_cache`
 

From ff0ae2feba36f8b31411cbe0ee98f9a41a626271 Mon Sep 17 00:00:00 2001
From: OKUMURA Takahiro <hfm.garden@gmail.com>
Date: Sat, 25 Nov 2017 22:56:28 +0900
Subject: [PATCH 1286/2267] Set default keepalive to off in RedHat and Amazon

According to README, $keepalive is off by default but only RedHat and Amazon are set to on.
---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index bca827d44e..b3759e334c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -151,7 +151,7 @@
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $http_protocol_options  = undef
-    $keepalive            = 'On'
+    $keepalive            = 'Off'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
     $fastcgi_lib_path     = undef

From 2900d78aac83fee409ea98d4862b017007ada2b6 Mon Sep 17 00:00:00 2001
From: Johnson Earls <johnson.earls@gmail.com>
Date: Sat, 25 Nov 2017 20:59:55 +0000
Subject: [PATCH 1287/2267] Actually create CASScrubRequestHeaders setting in
 _auth_cas.erb

Fix `templates/vhost/_auth_cas.erb` to create the proper
`CASScrubRequestHeaders` setting when passed
`@cas_scrub_request_headers`, rather than (re-)creating
`CASAttributeDelimiter`.
---
 templates/vhost/_auth_cas.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_auth_cas.erb b/templates/vhost/_auth_cas.erb
index 2f4787b73a..39912a80ce 100644
--- a/templates/vhost/_auth_cas.erb
+++ b/templates/vhost/_auth_cas.erb
@@ -60,6 +60,6 @@
   CASAttributeDelimiter <%= @cas_attribute_delimiter %>
   <%- end -%>
   <%- if @cas_scrub_request_headers -%>
-  CASAttributeDelimiter On
+  CASScrubRequestHeaders On
   <%- end -%>
 <%- end -%>

From fe67b8e80f3591e6bf0db083d306f06671ae3789 Mon Sep 17 00:00:00 2001
From: OKUMURA Takahiro <hfm.garden@gmail.com>
Date: Mon, 27 Nov 2017 15:16:30 +0900
Subject: [PATCH 1288/2267] Revert "Set default keepalive to off in RedHat and
 Amazon"

This reverts commit ff0ae2feba36f8b31411cbe0ee98f9a41a626271.
---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index b3759e334c..bca827d44e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -151,7 +151,7 @@
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $http_protocol_options  = undef
-    $keepalive            = 'Off'
+    $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
     $fastcgi_lib_path     = undef

From ffd92826ddcf5d19d8eee9978012cfb259d98eff Mon Sep 17 00:00:00 2001
From: OKUMURA Takahiro <hfm.garden@gmail.com>
Date: Mon, 27 Nov 2017 15:28:43 +0900
Subject: [PATCH 1289/2267] Set default keepalive to on in all distros

default params of $keepalive in Redhat and Amazon was set to "On" in d90bfbd, but the other distros was not.
---
 README.md           | 2 +-
 manifests/params.pp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3d218d88d9..5f9d732b15 100755
--- a/README.md
+++ b/README.md
@@ -1095,7 +1095,7 @@ Determines whether to enable persistent HTTP connections with the [`KeepAlive`][
 
 Values: 'Off', 'On'.
 
-Default: 'Off'.
+Default: 'On'.
 
 ##### `keepalive_timeout`
 
diff --git a/manifests/params.pp b/manifests/params.pp
index bca827d44e..750144fe6c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -302,7 +302,7 @@
     }
     $conf_template          = 'apache/httpd.conf.erb'
     $http_protocol_options  = undef
-    $keepalive              = 'Off'
+    $keepalive              = 'On'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
     $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
@@ -427,7 +427,7 @@
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $http_protocol_options = undef
-    $keepalive            = 'Off'
+    $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
     $fastcgi_lib_path     = undef # TODO: revisit
@@ -494,7 +494,7 @@
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $http_protocol_options = undef
-    $keepalive            = 'Off'
+    $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
     $fastcgi_lib_path     = undef # TODO: revisit
@@ -560,7 +560,7 @@
     }
     $conf_template          = 'apache/httpd.conf.erb'
     $http_protocol_options  = undef
-    $keepalive              = 'Off'
+    $keepalive              = 'On'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
     $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'

From 200a14e68d6ee3bbb3d2a3e09e8e33b351a5c633 Mon Sep 17 00:00:00 2001
From: OKUMURA Takahiro <hfm.garden@gmail.com>
Date: Thu, 30 Nov 2017 19:00:54 +0900
Subject: [PATCH 1290/2267] Support mod_data

ref: https://httpd.apache.org/docs/2.4/mod/mod_data.html
---
 README.md                     |  2 ++
 manifests/mod/data.pp         |  7 +++++++
 spec/classes/mod/data_spec.rb | 31 +++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 manifests/mod/data.pp
 create mode 100644 spec/classes/mod/data_spec.rb

diff --git a/README.md b/README.md
index 6fbcaa8f77..e5e099e67f 100755
--- a/README.md
+++ b/README.md
@@ -50,6 +50,7 @@
 [`apache::mod::authn_dbd`]: #class-apachemodauthn_dbd
 [`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap
 [`apache::mod::cluster`]: #class-apachemodcluster
+[`apache::mod::data]: #class-apachemoddata
 [`apache::mod::disk_cache`]: #class-apachemoddisk_cache
 [`apache::mod::dumpio`]: #class-apachemoddumpio
 [`apache::mod::event`]: #class-apachemodevent
@@ -1573,6 +1574,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `cgi`
 * `cgid`
 * `cluster` (see [`apache::mod::cluster`][])
+* `data`
 * `dav`
 * `dav_fs`
 * `dav_svn`\*
diff --git a/manifests/mod/data.pp b/manifests/mod/data.pp
new file mode 100644
index 0000000000..d35554a6d2
--- /dev/null
+++ b/manifests/mod/data.pp
@@ -0,0 +1,7 @@
+class apache::mod::data {
+  $_apache_version = pick($apache_version, $apache::apache_version)
+  if versioncmp($_apache_version, '2.3') < 0 {
+    fail('mod_data is only available in Apache 2.3 and later')
+  }
+  ::apache::mod { 'data': }
+}
diff --git a/spec/classes/mod/data_spec.rb b/spec/classes/mod/data_spec.rb
new file mode 100644
index 0000000000..9e2ffe44e6
--- /dev/null
+++ b/spec/classes/mod/data_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe 'apache::mod::data', :type => :class do
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '8',
+        :concat_basedir         => '/dne',
+        :lsbdistcodename        => 'jessie',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    let :params do
+      { :apache_version => '2.4' }
+    end
+    it { is_expected.to contain_apache__mod('data') }
+
+    describe "with Apache version < 2.3" do
+      let :params do
+        { :apache_version => '2.2' }
+      end
+      it 'should fail' do
+        expect { catalogue }.to raise_error(Puppet::Error, /mod_data is only available in Apache 2.3 and later/)
+      end
+    end
+  end
+end

From c2ce016c37fd1540355eec90320ea7f204dbe249 Mon Sep 17 00:00:00 2001
From: OKUMURA Takahiro <hfm.garden@gmail.com>
Date: Sun, 3 Dec 2017 23:39:36 +0900
Subject: [PATCH 1291/2267] Define $apache_version param

---
 manifests/mod/data.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/data.pp b/manifests/mod/data.pp
index d35554a6d2..00807e948a 100644
--- a/manifests/mod/data.pp
+++ b/manifests/mod/data.pp
@@ -1,4 +1,7 @@
-class apache::mod::data {
+class apache::mod::data (
+  $apache_version = undef,
+) {
+  include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   if versioncmp($_apache_version, '2.3') < 0 {
     fail('mod_data is only available in Apache 2.3 and later')

From 2d1b218e4c4471336f76666554d1d76f941b95f5 Mon Sep 17 00:00:00 2001
From: Johnson Earls <johnson.earls@gmail.com>
Date: Mon, 27 Nov 2017 05:10:10 +0000
Subject: [PATCH 1292/2267] Reduce Travis test parallelism, take 2

Set the environment variable PARALLEL_TEST_PROCESSOR
in the global `env` section to avoid overloading the
Travis testing containers and killing the tests.
Also add this to `.sync.yml` so it will be permanent
(unlike my previous attempt at this).
---
 .sync.yml   | 4 ++++
 .travis.yml | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index 3a20deb37b..dcbd6f0d53 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -6,3 +6,7 @@ Rakefile:
   - 'disable_only_variable_string'
 spec/spec_helper.rb:
   allow_deprecations: true
+.travis.yml:
+  env:
+    global:
+      - "PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers"
diff --git a/.travis.yml b/.travis.yml
index 38d226395a..d1846a6712 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,9 @@ script: "bundle exec rake release_checks"
 #Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
 before_install:
   - gem update bundler
+env:
+  global:
+    - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
 matrix:
   fast_finish: true
   include:

From b9719ba6218f039cf29c6fe46a5a05de3e1d5aca Mon Sep 17 00:00:00 2001
From: OKUMURA Takahiro <hfm.garden@gmail.com>
Date: Thu, 7 Dec 2017 19:13:20 +0900
Subject: [PATCH 1293/2267] Remove unused variable $_logs_dest

---
 manifests/vhost.pp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8d423bb7da..3d69a422dd 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -287,20 +287,6 @@
   $cas_enabled = defined(Apache::Mod['auth_cas'])
 
   if $access_log and !$access_logs {
-    if $access_log_file {
-      if $access_log_file =~ /^\// {
-        # Absolute path provided - don't prepend $logroot
-        $_logs_dest = $access_log_file
-      } else {
-        $_logs_dest = "${logroot}/${access_log_file}"
-      }
-    } elsif $access_log_pipe {
-      $_logs_dest = $access_log_pipe
-    } elsif $access_log_syslog {
-      $_logs_dest = $access_log_syslog
-    } else {
-      $_logs_dest = undef
-    }
     $_access_logs = [{
       'file'        => $access_log_file,
       'pipe'        => $access_log_pipe,

From 783729a5f2e348a4728f3ce29f0b58c7e0a425dd Mon Sep 17 00:00:00 2001
From: nkern0 <nicholas.kernohan@puppet.com>
Date: Thu, 7 Dec 2017 14:47:33 +0000
Subject: [PATCH 1294/2267] #puppethack Confined to Linux only

Was causing an error on Facter using AIX 6.1
https://puppetlabs.zendesk.com/agent/tickets/28413
---
 lib/facter/apache_version.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index 4bd7337f4d..852e5f0440 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -1,4 +1,5 @@
 Facter.add(:apache_version) do
+  confine :kernel => 'Linux'
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')

From 8e94eee53281aedeea821c6ad989d1a07a81e129 Mon Sep 17 00:00:00 2001
From: Robert Giles <rgtx@users.noreply.github.com>
Date: Thu, 7 Dec 2017 11:07:26 -0600
Subject: [PATCH 1295/2267] Adjust php_values section to make a little more
 sense, and also provide example usage.

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6fbcaa8f77..7204839036 100755
--- a/README.md
+++ b/README.md
@@ -3945,12 +3945,17 @@ Default: `undef`.
 
 Sets the [`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile) path. This path is relative to the application root.
 
-##### `php_flags & values`
+##### `php_values & php_flags`
 
 Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application.
 
 Default: '{}'.
 
+Within a vhost declaration:
+``` puppet
+  php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
+```
+
 ##### `php_admin_flags & values`
 
 Allows per-virtual host setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application.

From a52f43b49e3da813a632c4571a00664f9b53ab22 Mon Sep 17 00:00:00 2001
From: Okumura Takahiro <hfm.garden@gmail.com>
Date: Mon, 11 Dec 2017 20:58:02 +0900
Subject: [PATCH 1296/2267] Fix typos of README.md (#1732)

* Fix defaults of language_priority
* Fix typos of apache::mod::proxy_balancer class in README.md.
* Fix typos of asterisks to hyphens.
---
 README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index ecd5631925..b6be873034 100755
--- a/README.md
+++ b/README.md
@@ -1991,9 +1991,9 @@ Installs and configures [`mod_deflate`][].
 
 **Parameters**:
 
-* `types`: An [array][] of [MIME types][MIME `content*type`] to be deflated.
+* `types`: An [array][] of [MIME types][MIME `content-type`] to be deflated.
 
-  Default: ['text/html text/plain text/xml', 'text/css', 'application/x*javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json'].
+  Default: ['text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json'].
 
 * `notes`: A [Hash][] where the key represents the type and the value represents the note name.
 
@@ -2015,9 +2015,9 @@ Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate
 
   Default: `undef`.
 
-* `expires_by_type`: Describes a set of [MIME `content*type`][] and their expiration times.
+* `expires_by_type`: Describes a set of [MIME `content-type`][] and their expiration times.
 
-  Values: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content*type` (i.e. 'text/json') and its value following valid [interval syntax][].
+  Values: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content-type` (i.e. 'text/json') and its value following valid [interval syntax][].
 
   Default: `undef`.
 
@@ -2457,7 +2457,7 @@ Installs and configures [`mod_negotiation`][].
 
 * `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module.
 
-  Default: ['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt*BR', 'ru', 'sv', 'zh*CN', 'zh*TW']
+  Default: ['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN', 'zh-TW']
 
 ##### Class: `apache::mod::nss`
 
@@ -2577,9 +2577,9 @@ Installs and manages [`mod_proxy_balancer`][], which provides load balancing.
 
 * `manager_path`: The server location of the balancer manager.
 
-  Default: '/balancer*manager'.
+  Default: '/balancer-manager'.
 
-* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/balancer*manager`.
+* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/balancer-manager`.
 
   Default: ['127.0.0.1','::1'].
 
@@ -2751,13 +2751,13 @@ Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs b
 **Parameters**:
 
 * `activated_rules`: An [array][] of rules from the `modsec_crs_path` or absolute to activate via symlinks.
-* `allowed_methods`: A space*separated list of allowed HTTP methods.
+* `allowed_methods`: A space-separated list of allowed HTTP methods.
 
   Default: 'GET HEAD POST OPTIONS'.
 
-* `content_types`: A list of one or more allowed [MIME types][MIME `content*type`].
+* `content_types`: A list of one or more allowed [MIME types][MIME `content-type`].
 
-  Default: 'application/x*www*form*urlencoded|multipart/form*data|text/xml|application/xml|application/x*amf'.
+  Default: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'.
 
 * `crs_package`: Names the package that installs CRS rules.
 
@@ -2776,13 +2776,13 @@ ${modsec\_dir}/activated\_rules.
 
   Default: `modsec_secruleengine` in [`apache::params`][].
 
-* `restricted_extensions`: A space*separated list of prohibited file extensions.
+* `restricted_extensions`: A space-sparated list of prohibited file extensions.
 
   Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
 
 * `restricted_headers`: A list of restricted headers separated by slashes and spaces.
 
-  Default: 'Proxy*Connection/ /Lock*Token/ /Content*Range/ /Translate/ /via/ /if/'.
+  Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
 
 * `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') or Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set.
 
@@ -2874,7 +2874,7 @@ Enables Python support via [`mod_wsgi`][].
 
   Default: `undef`.
 
-* `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site*packages'.
+* `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site-packages'.
 
   Values: A string specifying a path.
 

From fb6e4111f77d3794dd84377d6255f642019a30a9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 10 Dec 2017 11:12:41 +0000
Subject: [PATCH 1297/2267] MODULES-6297: allow SSLProxyCipherSuite for vhosts

---
 manifests/vhost.pp            | 1 +
 spec/defines/vhost_spec.rb    | 3 +++
 templates/vhost/_sslproxy.erb | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8d423bb7da..326c05c597 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -32,6 +32,7 @@
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                            = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                          = undef,
   $ssl_proxy_machine_cert                                                           = undef,
+  $ssl_proxy_cipher_suite                                                           = undef,
   $ssl_proxy_protocol                                                               = undef,
   $ssl_options                                                                      = undef,
   $ssl_openssl_conf_cmd                                                             = undef,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9a1427b999..ad3a9b95f6 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -159,6 +159,7 @@
           'ssl_proxy_check_peer_name'   => 'on',
           'ssl_proxy_check_peer_expire' => 'on',
           'ssl_proxyengine'             => true,
+          'ssl_proxy_cipher_suite'      => 'HIGH',
           'ssl_proxy_protocol'          => 'TLSv1.2',
 
           'priority'                    => '30',
@@ -595,6 +596,8 @@
         :content => /^\s+SSLProxyCheckPeerName\s+on$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
         :content => /^\s+SSLProxyCheckPeerExpire\s+on$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+        :content => /^\s+SSLProxyCipherSuite\s+HIGH$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
         :content => /^\s+SSLProxyProtocol\s+TLSv1.2$/ ) }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
index 6cb9216d40..2db394ab0e 100644
--- a/templates/vhost/_sslproxy.erb
+++ b/templates/vhost/_sslproxy.erb
@@ -23,6 +23,9 @@
   <%- if @ssl_proxy_machine_cert -%>
   SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
   <%- end -%>
+  <%- if @ssl_proxy_cipher_suite -%>
+  SSLProxyCipherSuite <%= @ssl_proxy_cipher_suite %>
+  <%- end -%>
   <%- if @ssl_proxy_protocol -%>
   SSLProxyProtocol  <%= [@ssl_proxy_protocol].flatten.compact.join(' ') %>
   <%- end -%>

From d6e59c40ec61be47873e3a60ea00fea8da725e4b Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Wed, 13 Dec 2017 10:48:47 +0000
Subject: [PATCH 1298/2267] (maint) - modulesync 384f4c1

---
 .gitignore        |  31 ++-
 .rubocop.yml      | 586 +++++++---------------------------------------
 .rubocop_todo.yml |   0
 Gemfile           |  13 +-
 4 files changed, 113 insertions(+), 517 deletions(-)
 create mode 100644 .rubocop_todo.yml

diff --git a/.gitignore b/.gitignore
index f6e8b46c29..e5e6f9e8af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,23 @@
-#This file is generated by ModuleSync, do not edit.
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-log/
-junit/
-.vagrant/
+#This file is generated by ModuleSync, do not edit.Z
+*.iml
+.*.sw[op]
+.DS_Store
 .bundle/
-coverage/
-log/
 .idea/
 .metadata
-*.iml
-.*.sw[op]
+.vagrant/
 .yardoc
 .yardwarns
-.DS_Store
+Gemfile.local
+Gemfile.lock
+bin/
+coverage/
+doc/
+junit/
+log/
+pkg/
+spec/fixtures/manifests/
+spec/fixtures/modules/
 tmp/
 vendor/
-doc/
 
diff --git a/.rubocop.yml b/.rubocop.yml
index 5aadd1b64f..515ef6314c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,508 +1,98 @@
-require: rubocop-rspec
+---
+require:
+ - rubocop-rspec
 AllCops:
-  TargetRubyVersion: 1.9
+  TargetRubyVersion: '2.1'
   Include:
-    - ./**/*.rb
+  - "./**/*.rb"
   Exclude:
-    - vendor/**/*
-    - .vendor/**/*
-    - pkg/**/*
-    - spec/fixtures/**/*
-Lint/ConditionPosition:
-  Enabled: True
-
-Lint/ElseLayout:
-  Enabled: True
-
-Lint/UnreachableCode:
-  Enabled: True
-
-Lint/UselessComparison:
-  Enabled: True
-
-Lint/EnsureReturn:
-  Enabled: True
-
-Lint/HandleExceptions:
-  Enabled: True
-
-Lint/LiteralInCondition:
-  Enabled: True
-
-Lint/ShadowingOuterLocalVariable:
-  Enabled: True
-
-Lint/LiteralInInterpolation:
-  Enabled: True
-
-Style/HashSyntax:
-  Enabled: True
-
-Style/RedundantReturn:
-  Enabled: True
-
-Lint/AmbiguousOperator:
-  Enabled: True
-
-Lint/AssignmentInCondition:
-  Enabled: True
-
-Style/SpaceBeforeComment:
-  Enabled: True
-
-Style/AndOr:
-  Enabled: True
-
-Style/RedundantSelf:
-  Enabled: True
-
-# Method length is not necessarily an indicator of code quality
-Metrics/MethodLength:
-  Enabled: False
-
-# Module length is not necessarily an indicator of code quality
-Metrics/ModuleLength:
-  Enabled: False
-
-Style/WhileUntilModifier:
-  Enabled: True
-
-Lint/AmbiguousRegexpLiteral:
-  Enabled: True
-
-Lint/Eval:
-  Enabled: True
-
-Lint/BlockAlignment:
-  Enabled: True
-
-Lint/DefEndAlignment:
-  Enabled: True
-
-Lint/EndAlignment:
-  Enabled: True
-
-Lint/DeprecatedClassMethods:
-  Enabled: True
-
-Lint/Loop:
-  Enabled: True
-
-Lint/ParenthesesAsGroupedExpression:
-  Enabled: True
-
-Lint/RescueException:
-  Enabled: True
-
-Lint/StringConversionInInterpolation:
-  Enabled: True
-
-Lint/UnusedBlockArgument:
-  Enabled: True
-
-Lint/UnusedMethodArgument:
-  Enabled: True
-
-Lint/UselessAccessModifier:
-  Enabled: True
-
-Lint/UselessAssignment:
-  Enabled: True
-
-Lint/Void:
-  Enabled: True
-
-Style/AccessModifierIndentation:
-  Enabled: True
-
-Style/AccessorMethodName:
-  Enabled: True
-
-Style/Alias:
-  Enabled: True
-
-Style/AlignArray:
-  Enabled: True
-
-Style/AlignHash:
-  Enabled: True
-
-Style/AlignParameters:
-  Enabled: True
-
-Metrics/BlockNesting:
-  Enabled: True
-
-Style/AsciiComments:
-  Enabled: True
-
-Style/Attr:
-  Enabled: True
-
-Style/BracesAroundHashParameters:
-  Enabled: True
-
-Style/CaseEquality:
-  Enabled: True
-
-Style/CaseIndentation:
-  Enabled: True
-
-Style/CharacterLiteral:
-  Enabled: True
-
-Style/ClassAndModuleCamelCase:
-  Enabled: True
-
-Style/ClassAndModuleChildren:
-  Enabled: False
-
-Style/ClassCheck:
-  Enabled: True
-
-# Class length is not necessarily an indicator of code quality
-Metrics/ClassLength:
-  Enabled: False
-
-Style/ClassMethods:
-  Enabled: True
-
-Style/ClassVars:
-  Enabled: True
-
-Style/WhenThen:
-  Enabled: True
-
-Style/WordArray:
-  Enabled: True
-
-Style/UnneededPercentQ:
-  Enabled: True
-
-Style/Tab:
-  Enabled: True
-
-Style/SpaceBeforeSemicolon:
-  Enabled: True
-
-Style/TrailingBlankLines:
-  Enabled: True
-
-Style/SpaceInsideBlockBraces:
-  Enabled: True
-
-Style/SpaceInsideBrackets:
-  Enabled: True
-
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: True
-
-Style/SpaceInsideParens:
-  Enabled: True
-
-Style/LeadingCommentSpace:
-  Enabled: True
-
-Style/SpaceBeforeFirstArg:
-  Enabled: True
-
-Style/SpaceAfterColon:
-  Enabled: True
-
-Style/SpaceAfterComma:
-  Enabled: True
-
-Style/SpaceAfterMethodName:
-  Enabled: True
-
-Style/SpaceAfterNot:
-  Enabled: True
-
-Style/SpaceAfterSemicolon:
-  Enabled: True
-
-Style/SpaceAroundEqualsInParameterDefault:
-  Enabled: True
-
-Style/SpaceAroundOperators:
-  Enabled: True
-
-Style/SpaceBeforeBlockBraces:
-  Enabled: True
-
-Style/SpaceBeforeComma:
-  Enabled: True
-
-Style/CollectionMethods:
-  Enabled: True
-
-Style/CommentIndentation:
-  Enabled: True
-
-Style/ColonMethodCall:
-  Enabled: True
-
-Style/CommentAnnotation:
-  Enabled: True
-
-# 'Complexity' is very relative
-Metrics/CyclomaticComplexity:
-  Enabled: False
-
-Style/ConstantName:
-  Enabled: True
-
-Style/Documentation:
-  Enabled: False
-
-Style/DefWithParentheses:
-  Enabled: True
-
-Style/PreferredHashMethods:
-  Enabled: True
-
-Style/DotPosition:
-  EnforcedStyle: trailing
-
-Style/DoubleNegation:
-  Enabled: True
-
-Style/EachWithObject:
-  Enabled: True
-
-Style/EmptyLineBetweenDefs:
-  Enabled: True
-
-Style/IndentArray:
-  Enabled: True
-
-Style/IndentHash:
-  Enabled: True
-
-Style/IndentationConsistency:
-  Enabled: True
-
-Style/IndentationWidth:
-  Enabled: True
-
-Style/EmptyLines:
-  Enabled: True
-
-Style/EmptyLinesAroundAccessModifier:
-  Enabled: True
-
-Style/EmptyLiteral:
-  Enabled: True
-
-# Configuration parameters: AllowURI, URISchemes.
+  - bin/*
+  - ".vendor/**/*"
+  - Gemfile
+  - Rakefile
+  - pkg/**/*
+  - spec/fixtures/**/*
+  - vendor/**/*
+inherit_from: .rubocop_todo.yml
 Metrics/LineLength:
-  Enabled: False
-
-Style/MethodCallParentheses:
-  Enabled: True
-
-Style/MethodDefParentheses:
-  Enabled: True
-
-Style/LineEndConcatenation:
-  Enabled: True
-
-Style/TrailingWhitespace:
-  Enabled: True
-
-Style/StringLiterals:
-  Enabled: True
-
-Style/TrailingCommaInArguments:
-  Enabled: True
-
-Style/TrailingCommaInLiteral:
-  Enabled: True
-
-Style/GlobalVars:
-  Enabled: True
-
-Style/GuardClause:
-  Enabled: True
-
-Style/IfUnlessModifier:
-  Enabled: True
-
-Style/MultilineIfThen:
-  Enabled: True
-
-Style/NegatedIf:
-  Enabled: True
-
-Style/NegatedWhile:
-  Enabled: True
-
-Style/Next:
-  Enabled: True
-
-Style/SingleLineBlockParams:
-  Enabled: True
-
-Style/SingleLineMethods:
-  Enabled: True
-
-Style/SpecialGlobalVars:
-  Enabled: True
-
-Style/TrivialAccessors:
-  Enabled: True
-
-Style/UnlessElse:
-  Enabled: True
-
-Style/VariableInterpolation:
-  Enabled: True
-
-Style/VariableName:
-  Enabled: True
-
-Style/WhileUntilDo:
-  Enabled: True
-
-Style/EvenOdd:
-  Enabled: True
-
-Style/FileName:
-  Enabled: True
-
-Style/For:
-  Enabled: True
-
-Style/Lambda:
-  Enabled: True
-
-Style/MethodName:
-  Enabled: True
-
-Style/MultilineTernaryOperator:
-  Enabled: True
-
-Style/NestedTernaryOperator:
-  Enabled: True
-
-Style/NilComparison:
-  Enabled: True
-
+  Description: People have wide screens, use them.
+  Max: 200
+RSpec/BeforeAfterAll:
+  Description: Beware of using after(:all) as it may cause state to leak between tests.
+    A necessary evil in acceptance testing.
+  Exclude:
+  - spec/acceptance/**/*.rb
+RSpec/HookArgument:
+  Description: Prefer explicit :each argument, matching existing module's style
+  EnforcedStyle: each
+Style/BlockDelimiters:
+  Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
+    be consistent then.
+  EnforcedStyle: braces_for_chaining
+Style/ClassAndModuleChildren:
+  Description: Compact style reduces the required amount of indentation.
+  EnforcedStyle: compact
+Style/EmptyElse:
+  Description: Enforce against empty else clauses, but allow `nil` for clarity.
+  EnforcedStyle: empty
 Style/FormatString:
-  Enabled: True
-
-Style/MultilineBlockChain:
-  Enabled: True
-
-Style/Semicolon:
-  Enabled: True
-
-Style/SignalException:
-  Enabled: True
-
-Style/NonNilCheck:
-  Enabled: True
-
-Style/Not:
-  Enabled: True
-
-Style/NumericLiterals:
-  Enabled: True
-
-Style/OneLineConditional:
-  Enabled: True
-
-Style/OpMethod:
-  Enabled: True
-
-Style/ParenthesesAroundCondition:
-  Enabled: True
-
-Style/PercentLiteralDelimiters:
-  Enabled: True
-
-Style/PerlBackrefs:
-  Enabled: True
-
-Style/PredicateName:
-  Enabled: True
-
-Style/RedundantException:
-  Enabled: True
-
-Style/SelfAssignment:
-  Enabled: True
-
-Style/Proc:
-  Enabled: True
-
-Style/RaiseArgs:
-  Enabled: True
-
-Style/RedundantBegin:
-  Enabled: True
-
-Style/RescueModifier:
-  Enabled: True
-
-# based on https://github.com/voxpupuli/modulesync_config/issues/168
+  Description: Following the main puppet project's style, prefer the % format format.
+  EnforcedStyle: percent
+Style/FormatStringToken:
+  Description: Following the main puppet project's style, prefer the simpler template
+    tokens over annotated ones.
+  EnforcedStyle: template
+Style/Lambda:
+  Description: Prefer the keyword for easier discoverability.
+  EnforcedStyle: literal
 Style/RegexpLiteral:
+  Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
   EnforcedStyle: percent_r
-  Enabled: True
-
-Lint/UnderscorePrefixedVariableName:
-  Enabled: True
-
-Metrics/ParameterLists:
-  Enabled: False
-
-Lint/RequireParentheses:
-  Enabled: True
-
-Style/SpaceBeforeFirstArg:
-  Enabled: True
-
-Style/ModuleFunction:
-  Enabled: True
-
-Lint/Debugger:
-  Enabled: True
-
-Style/IfWithSemicolon:
-  Enabled: True
-
-Style/Encoding:
-  Enabled: True
-
-Style/BlockDelimiters:
-  Enabled: True
-
-Style/MultilineBlockLayout:
-  Enabled: True
-
-# 'Complexity' is very relative
+Style/TernaryParentheses:
+  Description: Checks for use of parentheses around ternary conditions. Enforce parentheses
+    on complex expressions for better readability, but seriously consider breaking
+    it up.
+  EnforcedStyle: require_parentheses_when_complex
+Style/TrailingCommaInArguments:
+  Description: Prefer always trailing comma on multiline argument lists. This makes
+    diffs, and re-ordering nicer.
+  EnforcedStyleForMultiline: comma
+Style/TrailingCommaInLiteral:
+  Description: Prefer always trailing comma on multiline literals. This makes diffs,
+    and re-ordering nicer.
+  EnforcedStyleForMultiline: comma
+Style/SymbolArray:
+  Description: Using percent style obscures symbolic intent of array's contents.
+  EnforcedStyle: brackets
+Style/CollectionMethods:
+  Enabled: true
+Style/MethodCalledOnDoEndBlock:
+  Enabled: true
+Style/StringMethods:
+  Enabled: true
 Metrics/AbcSize:
-  Enabled: False
-
-# 'Complexity' is very relative
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
+Metrics/ParameterLists:
+  Enabled: false
 Metrics/PerceivedComplexity:
-  Enabled: False
-
-Lint/UselessAssignment:
-  Enabled: True
-
-Style/ClosingParenthesisIndentation:
-  Enabled: False
-
-# RSpec
-
-# We don't use rspec in this way
+  Enabled: false
 RSpec/DescribeClass:
-  Enabled: False
-
-# Example length is not necessarily an indicator of code quality
-RSpec/ExampleLength:
-  Enabled: False
-
-RSpec/NamedSubject:
-  Enabled: False
+  Enabled: false
+RSpec/MessageExpectation:
+  Enabled: false
+Style/AsciiComments:
+  Enabled: false
+Style/IfUnlessModifier:
+  Enabled: false
+Style/SymbolProc:
+  Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Gemfile b/Gemfile
index 8bd07c79b0..84b23f2b4e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,10 +28,19 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 # Used for gem conditionals
-supports_windows = false
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
 
+# The following gems are not included by default as they require DevKit on Windows.
+# You should probably include them in a Gemfile.local or a ~/.gemfile
+#gem 'pry' #this may already be included in the gemfile
+#gem 'pry-stack_explorer', :require => false
+#if RUBY_VERSION =~ /^2/
+#  gem 'pry-byebug'
+#else
+#  gem 'pry-debugger'
+#end
+
 group :development do
   gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
   gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
@@ -51,7 +60,6 @@ group :system_tests do
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
   gem "puppet-blacksmith", '~> 3.4',                                             :require => false
-  gem "beaker-task_helper"
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
@@ -63,7 +71,6 @@ gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
 gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
 
-
 # Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)

From c274ae59d3b803cc126cf76b9622b129cf94f221 Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Mon, 18 Dec 2017 10:41:24 -0500
Subject: [PATCH 1299/2267] Add doc for apache::mod::itk

---
 README.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/README.md b/README.md
index c48635f0bd..511b75489f 100755
--- a/README.md
+++ b/README.md
@@ -2146,6 +2146,54 @@ Installs and manages [`mod_info`][], which provides a comprehensive overview of
 
   Default: `true`.
 
+##### Class: `apache::mod::itk`
+
+Installs and manages [`mod_itk`][], which is an (MPM) that is loaded and configured for the HTTPD process. [official documentation](http://mpm-itk.sesse.net/)
+
+**Parameters**:
+
+* `startservers`: The number of child server processes created on startup.
+
+  Values: Integer.
+
+  Default: `8`.
+
+* `minspareservers`: The desired minimum number of idle child server processes.
+
+  Values: Integer.
+
+  Default: `5`.
+
+* `maxspareservers`: The desired maximum number of idle child server processes.
+
+  Values: Integer.
+
+  Default: `20`.
+
+* `serverlimit`: The maximum configured value for MaxRequestWorkers for the lifetime of the Apache httpd process.
+
+  Values: Integer.
+
+  Default: `256`.
+
+* `maxclients`: The limit on the number of simultaneous requests that will be served.
+
+  Values: Integer.
+
+  Default: `256`.
+
+* `maxrequestsperchild`: The limit on the number of connections that an individual child server process will handle.
+
+  Values: Integer.
+
+  Default: `4000`.
+
+* `enablecapabilities`: Drop most root capabilities in the parent process, and instead run as the user given by the User/Group directives with some extra capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor capabilities, such as NFS.
+
+  Values: Boolean.
+
+  Default: `undef`.
+
 ##### Class: `apache::mod::jk`
 
 Installs and manages `mod_jk`, a connector for Apache httpd redirection to old versions of TomCat and JBoss

From 31cdb8e18129c67ef157ce5446072502fc7b224e Mon Sep 17 00:00:00 2001
From: Damien ELLUL <damien.ellul@boursorama.fr>
Date: Tue, 19 Dec 2017 08:26:37 +0100
Subject: [PATCH 1300/2267] manifest/init.pp: add limitreqfields default param

---
 manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index c05df90123..c81b004dc9 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -67,6 +67,7 @@
   $keepalive_timeout                                             = $::apache::params::keepalive_timeout,
   $max_keepalive_requests                                        = $::apache::params::max_keepalive_requests,
   $limitreqfieldsize                                             = '8190',
+  $limitreqfields                                                = '100',
   $logroot                                                       = $::apache::params::logroot,
   $logroot_mode                                                  = $::apache::params::logroot_mode,
   $log_level                                                     = $::apache::params::log_level,

From cace155f58f5f75a09a0f1c3fc72a06b2e56e902 Mon Sep 17 00:00:00 2001
From: Damien ELLUL <damien.ellul@boursorama.fr>
Date: Tue, 19 Dec 2017 08:30:55 +0100
Subject: [PATCH 1301/2267] templates/httpd.conf.erb: add limitreqfields param

---
 templates/httpd.conf.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 24c989f530..8e2a23f07f 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -11,6 +11,7 @@ KeepAlive <%= @keepalive %>
 MaxKeepAliveRequests <%= @max_keepalive_requests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
 LimitRequestFieldSize <%= @limitreqfieldsize %>
+LimitRequestFields <%= @limitreqfields %>
 <%# Actually >= 2.4.24, but the minor version is not provided -%>
 <%- if @http_protocol_options and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 HttpProtocolOptions <%= @http_protocol_options %>

From 338136807b6f73a7a234e3a873d8285be81d3728 Mon Sep 17 00:00:00 2001
From: Damien ELLUL <damien.ellul@boursorama.fr>
Date: Wed, 20 Dec 2017 16:16:07 +0100
Subject: [PATCH 1302/2267] README.md: Add documentation for limitreqfieldsize
 parameter

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index fd420ab7a9..eda6d63bf2 100755
--- a/README.md
+++ b/README.md
@@ -145,6 +145,7 @@
 [`keepalive` parameter]: #keepalive
 [`keepalive_timeout`]: #keepalive_timeout
 [`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize
+[`limitreqfields`]: http://httpd.apache.org/docs/current/mod/core.html#limitrequestfields
 
 [`lib`]: #lib
 [`lib_path`]: #lib_path
@@ -1514,6 +1515,12 @@ Default: Depends on operating system:
 - **Red Hat**: 'access_log'
 - **Suse**: 'access.log'
 
+##### `limitreqfields`
+
+The [limitreqfieldsize][] parameter sets the maximum number of request header fields in an HTTP request. This directive gives the server administrator greater control over abnormal client request behavior, which may be useful for avoiding some forms of denial-of-service attacks. The value should be increased if normal clients see an error response from the server that indicates too many fields were sent in the request.
+
+Default: '100'
+
 #### Class: `apache::dev`
 
 Installs Apache development libraries.

From 6164b1d29e02d87f5c77eb9c5d3a55c01f0dc97a Mon Sep 17 00:00:00 2001
From: Damien ELLUL <damien.ellul@boursorama.fr>
Date: Wed, 20 Dec 2017 16:16:07 +0100
Subject: [PATCH 1303/2267] README.md: Add documentation for limitreqfields
 parameter

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index fd420ab7a9..eda6d63bf2 100755
--- a/README.md
+++ b/README.md
@@ -145,6 +145,7 @@
 [`keepalive` parameter]: #keepalive
 [`keepalive_timeout`]: #keepalive_timeout
 [`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize
+[`limitreqfields`]: http://httpd.apache.org/docs/current/mod/core.html#limitrequestfields
 
 [`lib`]: #lib
 [`lib_path`]: #lib_path
@@ -1514,6 +1515,12 @@ Default: Depends on operating system:
 - **Red Hat**: 'access_log'
 - **Suse**: 'access.log'
 
+##### `limitreqfields`
+
+The [limitreqfieldsize][] parameter sets the maximum number of request header fields in an HTTP request. This directive gives the server administrator greater control over abnormal client request behavior, which may be useful for avoiding some forms of denial-of-service attacks. The value should be increased if normal clients see an error response from the server that indicates too many fields were sent in the request.
+
+Default: '100'
+
 #### Class: `apache::dev`
 
 Installs Apache development libraries.

From 9a7d27e128fc4e8ef0a68f3cb28df99bbad2d0b8 Mon Sep 17 00:00:00 2001
From: Damien ELLUL <damien.ellul@boursorama.fr>
Date: Wed, 20 Dec 2017 16:25:55 +0100
Subject: [PATCH 1304/2267] README.md: correct limitreqfieldsize =>
 limitreqfields

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eda6d63bf2..33f0010ae4 100755
--- a/README.md
+++ b/README.md
@@ -1517,7 +1517,7 @@ Default: Depends on operating system:
 
 ##### `limitreqfields`
 
-The [limitreqfieldsize][] parameter sets the maximum number of request header fields in an HTTP request. This directive gives the server administrator greater control over abnormal client request behavior, which may be useful for avoiding some forms of denial-of-service attacks. The value should be increased if normal clients see an error response from the server that indicates too many fields were sent in the request.
+The [limitreqfields][] parameter sets the maximum number of request header fields in an HTTP request. This directive gives the server administrator greater control over abnormal client request behavior, which may be useful for avoiding some forms of denial-of-service attacks. The value should be increased if normal clients see an error response from the server that indicates too many fields were sent in the request.
 
 Default: '100'
 

From 0edd80481c257a28267920009cca24d0be1663fc Mon Sep 17 00:00:00 2001
From: Damien ELLUL <damien.ellul@boursorama.fr>
Date: Wed, 20 Dec 2017 16:28:50 +0100
Subject: [PATCH 1305/2267] README.md: correct documentation link syntax for
 limitreqfields

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 33f0010ae4..2a610b6c28 100755
--- a/README.md
+++ b/README.md
@@ -1517,7 +1517,7 @@ Default: Depends on operating system:
 
 ##### `limitreqfields`
 
-The [limitreqfields][] parameter sets the maximum number of request header fields in an HTTP request. This directive gives the server administrator greater control over abnormal client request behavior, which may be useful for avoiding some forms of denial-of-service attacks. The value should be increased if normal clients see an error response from the server that indicates too many fields were sent in the request.
+The [`limitreqfields`][] parameter sets the maximum number of request header fields in an HTTP request. This directive gives the server administrator greater control over abnormal client request behavior, which may be useful for avoiding some forms of denial-of-service attacks. The value should be increased if normal clients see an error response from the server that indicates too many fields were sent in the request.
 
 Default: '100'
 

From ea5348d7c6a634aac32421a5ecf8ead0ba26742e Mon Sep 17 00:00:00 2001
From: Cedric DEFORTIS <cedric.defortis@cassio.pe>
Date: Tue, 5 Dec 2017 21:08:31 +0100
Subject: [PATCH 1306/2267] Closes MODULES-6224: rename apache mod ldap file

I consider config file for apache mod ldap `file` resource to have an
"out of scope" name `ldap.conf` which may collide with the client-side
config file ldap.conf (i.e. located in `/etc/ldap.conf` or
`/etc/openldap/ldap.conf`).

My suggestion: renaming this file resource into `apache-mod-ldap.conf`
in `manifests/mod/ldap.pp` and into the related
`spec/classes/mod/ldap_spec.rb` file.
---
 manifests/mod/ldap.pp         |  2 +-
 spec/classes/mod/ldap_spec.rb | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index e80114dde4..98dd4624d5 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -17,7 +17,7 @@
     package => $package_name,
   }
   # Template uses $_apache_version
-  file { 'ldap.conf':
+  file { 'apache-mod-ldap.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/ldap.conf",
     mode    => $::apache::file_mode,
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 0f49f0b02d..08272783fe 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -22,12 +22,12 @@
     it { is_expected.to contain_apache__mod('ldap') }
 
     context 'default ldap_trusted_global_cert_file' do
-      it { is_expected.to contain_file('ldap.conf').without_content(/^LDAPTrustedGlobalCert/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').without_content(/^LDAPTrustedGlobalCert/) }
     end
 
     context 'ldap_trusted_global_cert_file param' do
       let(:params) { { :ldap_trusted_global_cert_file => 'ca.pem' } }
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
     end
 
     context 'set multiple ldap params' do
@@ -41,13 +41,13 @@
         :ldap_opcache_entries          => '1024',
         :ldap_opcache_ttl              => '600'
       }}
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedMode TLS$/) }
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPSharedCacheSize 500000$/) }
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPCacheEntries 1024$/) }
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPCacheTTL 600$/) }
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPOpCacheEntries 1024$/) }
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPOpCacheTTL 600$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedMode TLS$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPSharedCacheSize 500000$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPCacheEntries 1024$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPCacheTTL 600$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPOpCacheEntries 1024$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPOpCacheTTL 600$/) }
     end
   end #Debian
 
@@ -69,12 +69,12 @@
     it { is_expected.to contain_apache__mod('ldap') }
 
     context 'default ldap_trusted_global_cert_file' do
-      it { is_expected.to contain_file('ldap.conf').without_content(/^LDAPTrustedGlobalCert/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').without_content(/^LDAPTrustedGlobalCert/) }
     end
 
     context 'ldap_trusted_global_cert_file param' do
       let(:params) { { :ldap_trusted_global_cert_file => 'ca.pem' } }
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
     end
 
     context 'ldap_trusted_global_cert_file and ldap_trusted_global_cert_type params' do
@@ -82,7 +82,7 @@
         :ldap_trusted_global_cert_file => 'ca.pem',
         :ldap_trusted_global_cert_type => 'CA_DER'
       }}
-      it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
     end
   end # Redhat
 end

From 662ff56b126aeaf0c192c1d9a0896c14b8978497 Mon Sep 17 00:00:00 2001
From: Kent Lee <754650@la-c02tq1u2htd7.bnznag.nz.thenational.com>
Date: Thu, 21 Dec 2017 14:18:50 +1300
Subject: [PATCH 1307/2267] updated docs and added tests.

---
 README.md                           |  8 ++++++++
 spec/classes/mod/disk_cache_spec.rb | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a1cdb9eb96..12124a135e 100755
--- a/README.md
+++ b/README.md
@@ -1674,6 +1674,14 @@ class {'::apache::mod::disk_cache':
 }
 ```
 
+To specify cache ignore headers, pass a string to the `cache_ignore_headers` parameter.
+
+``` puppet
+class {'::apache::mod::disk_cache':
+  cache_ignore_headers => 'Set-Cookie',
+}
+```
+
 ##### Class: `apache::mod::diskio`
 
 Installs and configures [`mod_diskio`][].
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index ebb5ef6a97..15ca0d935d 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -26,7 +26,7 @@
       it { should compile }
       it { should contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
     end
     context "with Apache version >= 2.4" do
       let :pre_condition do
@@ -40,7 +40,7 @@
       it { should contain_class('apache::mod::disk_cache') }
       it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
     end
   end
 
@@ -66,7 +66,7 @@
          }'
       end
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
     end
     context "with Apache version >= 2.4" do
       let :pre_condition do
@@ -77,7 +77,7 @@
          }'
       end
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
     end
   end
   context "on a FreeBSD OS" do
@@ -105,7 +105,7 @@
       it { should contain_class('apache::mod::disk_cache') }
       it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
     end
     context "with Apache version >= 2.4" do
       let :pre_condition do
@@ -119,7 +119,7 @@
       it { should contain_class('apache::mod::disk_cache') }
       it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
     end
   end
 end

From 449d90fbe4ad0f8ebab7825e17d42bcf5e12f11e Mon Sep 17 00:00:00 2001
From: Kent Lee <754650@la-c02tq1u2htd7.bnznag.nz.thenational.com>
Date: Thu, 21 Dec 2017 15:18:10 +1300
Subject: [PATCH 1308/2267] set params for testing.

---
 spec/classes/mod/disk_cache_spec.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 15ca0d935d..29442c528f 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -15,6 +15,13 @@
         :is_pe                  => false,
       }
     end
+
+    let(:params) {
+      {
+        :cache_ignore_headers   => "Set-Cookie",
+      }
+    }
+
     context "with Apache version < 2.4" do
       let :pre_condition do
         'class{ "apache":
@@ -57,6 +64,13 @@
         :is_pe                  => false,
       }
     end
+
+    let(:params) {
+      {
+        :cache_ignore_headers   => "Set-Cookie",
+      }
+    }
+
     context "with Apache version < 2.4" do
       let :pre_condition do
         'class{ "apache":
@@ -93,6 +107,13 @@
         :is_pe                  => false,
       }
     end
+
+    let(:params) {
+      {
+        :cache_ignore_headers   => "Set-Cookie",
+      }
+    }
+
     context "with Apache version < 2.4" do
       let :pre_condition do
         'class{ "apache":

From 840a0375f06f6892c19b4f21ebe8c65ea5ad6eaa Mon Sep 17 00:00:00 2001
From: Paul Tompsett <ptompsett@tyro.com>
Date: Thu, 21 Dec 2017 05:04:34 +0000
Subject: [PATCH 1309/2267] MODULES-6297: updated doco to include
 SSLProxyCipherSuite option for vhosts

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 6fbcaa8f77..bfa09e3391 100755
--- a/README.md
+++ b/README.md
@@ -5175,6 +5175,12 @@ A depth of 0 means that only self-signed remote server certificates are accepted
 
 Default: `undef`
 
+##### `ssl_proxy_cipher_suite`
+
+Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite) directive, which controls cipher suites supported for ssl proxy traffic.
+
+Default: `undef`
+
 ##### `ssl_proxy_ca_cert`
 
 Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile) directive, which specifies an all-in-one file where you can assemble the Certificates of Certification Authorities (CA) whose remote servers you deal with. These are used for Remote Server Authentication. This file should be a concatenation of the PEM-encoded certificate files in order of preference.

From 1d72b85158cdb69a478293be12669dd38cb00b03 Mon Sep 17 00:00:00 2001
From: Kent Lee <754650@la-c02tq1u2htd7.bnznag.nz.thenational.com>
Date: Thu, 21 Dec 2017 21:50:37 +1300
Subject: [PATCH 1310/2267] removed quote for tests

---
 README.md                           |  2 +-
 spec/classes/mod/disk_cache_spec.rb | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 12124a135e..c1627312d9 100755
--- a/README.md
+++ b/README.md
@@ -1678,7 +1678,7 @@ To specify cache ignore headers, pass a string to the `cache_ignore_headers` par
 
 ``` puppet
 class {'::apache::mod::disk_cache':
-  cache_ignore_headers => 'Set-Cookie',
+  cache_ignore_headers => "Set-Cookie",
 }
 ```
 
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 29442c528f..d6e7bf29d8 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -33,7 +33,7 @@
       it { should compile }
       it { should contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
     end
     context "with Apache version >= 2.4" do
       let :pre_condition do
@@ -47,7 +47,7 @@
       it { should contain_class('apache::mod::disk_cache') }
       it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
     end
   end
 
@@ -80,7 +80,7 @@
          }'
       end
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
     end
     context "with Apache version >= 2.4" do
       let :pre_condition do
@@ -91,7 +91,7 @@
          }'
       end
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
     end
   end
   context "on a FreeBSD OS" do
@@ -126,7 +126,7 @@
       it { should contain_class('apache::mod::disk_cache') }
       it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
     end
     context "with Apache version >= 2.4" do
       let :pre_condition do
@@ -140,7 +140,7 @@
       it { should contain_class('apache::mod::disk_cache') }
       it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
       it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders \"Set-Cookie\"/) }
+      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
     end
   end
 end

From ee02e963ff92f8c804ec901b21876786718b8d19 Mon Sep 17 00:00:00 2001
From: Emerson Prado <emerson.prado@dataprev.gov.br>
Date: Mon, 7 Aug 2017 16:14:08 -0300
Subject: [PATCH 1311/2267] Include auxilliary template for "Require"
 directives for mod::*

Use "Allow" defaults for "Require" directives for mod::*

Include auxilliary template for "Allow" directives for mod::*

Use helper templates in mod/status.conf.erb / add "requires" parameter

Conflicts:
	manifests/mod/status.pp

Include defaults for "Allow" and "Require" directives in mod::status

Conflicts:
	manifests/mod/status.pp

Add comment for Puppet 4.2 in template mod/status.conf.erb

Include in template mod/_require.erb parsing of "requires" as string

Include in template mod/_require.erb parsing of "requires" as array

Include in template mod/_require.erb parsing of "requires" as hash

Include in template mod/_require.erb section "Require(Any|All|None)"

Allows undef for parameter apache::mod::status::allow_from

Add Require <String> context for Apache >= 2.4 in mod::status spec

Add missing parameter for Apache 2.4 contexts in mod::status spec test

Add function for "Require" directive in mod::status spec test

Iterate Require params in Apache 2.4 contexts in mod::status spec test

Include empty and "unmanaged" requires param in mod::status spec test

Include default case for requires param in mod::status spec test

Remove class variable reference in mod::status spec test

Change assignment to nil in mod::status spec test

Change undef test in mod::status spec test

Revert "Change undef test in mod::status spec test"

This reverts commit 57ac710a5b5aa03b1915a582b6b952839a072958.

Only change undef test in mod::status spec test

Change quoting of control char in mod::status spec test

Include in template mod/_require.erb parsing of "requires" as array

Include in template mod/_require.erb parsing of "requires" as hash

Include in template mod/_require.erb parsing of "requires" with enforce

Use each for array parsing in mod::status spec test

Correct hash references in mod::status spec test

Remove "prints" from "each" iterations in mod::status spec test

Split "each" one-liners in mod::status spec test

Use symbols in hash keys in mod::status spec test

Include "print" again in function returns in mod::status spec test

Use map+join to parse arrays in mod::status spec test

Correct indentations in helper template for apache 2.4

Include type validation for ...mod::status::requires

Align parameter indentation in ...mod::status

Document parameter "requires" in ...mod::status

Correct parameter description in mod::status class

Include in README parameter mod::status::requires

Add code tags in parameter mod::status::requires description in README

Include array/hash doc refs in mod::status::requires description in README
---
 README.md                       |  18 +++++
 manifests/mod/status.pp         |  28 ++++++-
 spec/classes/mod/status_spec.rb | 137 +++++++++++++++++++++++++++++++-
 templates/mod/_allow.erb        |   7 ++
 templates/mod/_require.erb      |  44 ++++++++++
 templates/mod/status.conf.erb   |  10 ++-
 6 files changed, 233 insertions(+), 11 deletions(-)
 create mode 100644 templates/mod/_allow.erb
 create mode 100644 templates/mod/_require.erb

diff --git a/README.md b/README.md
index 27a8a7ea23..741d711192 100755
--- a/README.md
+++ b/README.md
@@ -2791,6 +2791,24 @@ Installs [`mod_status`][] and uses the `status.conf.erb` template to generate it
 * `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/server-status`.
 
   Default: ['127.0.0.1','::1'].
+
+* `requires`: A string, an [array][] or a [hash][], of IPs and/or names that can/can't access `/server-status`, using Apache v. >= 2.4 `mod_authz_host` directives (`require ip`, `require host`, etc.). This parameter should follow one of the structures below:
+
+  > Only used if Apache version >= 2.4
+
+  - `undef` - Uses `allow_from` and old directive syntax (`Allow from <List of IPs and/or names>`). Issues deprecation warning.
+  - String
+    - `''` or `'unmanaged'` - No auth directives (access controlled elsewhere)
+    - `'ip <List of IPs>'` - IPs/ranges allowed to access `/server-status`
+    - `'host <List of names>'` - Names/domains allowed to access `/server-status`
+    - `'all [granted|denied]'` - Allow / block everyone
+  - Array - Each item should be a string from those described above. Results in one directive per array item.
+  - Hash with structure below (shown as key => value, where keys are strings):
+    - `'requires'` => Array as above - Same effect as the array
+    - `'enforce'`  => String `'Any'`, `'All'` or `'None'` (optional) - Encloses all directives from `'requires'` key in a `<Require(Any|All|None)>` block
+
+  Default: 'ip 127.0.0.1 ::1'
+
 * `extended_status`: Determines whether to track extended status information for each request, via the [`ExtendedStatus`][] directive.
 
   Values: 'Off', 'On'.
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 54d0d88871..988e13b3cc 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -7,6 +7,20 @@
 # - $allow_from is an array of hosts, ip addresses, partial network numbers
 #   or networks in CIDR notation specifying what hosts can view the special
 #   /server-status URL.  Defaults to ['127.0.0.1', '::1'].
+#   > Creates Apache < 2.4 directive "Allow from"
+# - $requires is either a:
+#   - String with:
+#     - '' or 'unmanaged' - Host auth control done elsewhere
+#     - 'ip <List of IPs>' - Allowed IPs/ranges
+#     - 'host <List of names>' - Allowed names/domains
+#     - 'all [granted|denied]'
+#   - Array of strings with ip or host as above
+#   - Hash with following keys:
+#     - 'requires' - Value => Array as above
+#     - 'enforce' - Value => String 'Any', 'All' or 'None'
+#       This encloses "Require" directives in "<Require(Any|All|None)>" block
+#       Optional - If unspecified, "Require" directives follow current flow
+#   > Creates Apache >= 2.4 directives "Require"
 # - $extended_status track and display extended status information. Valid
 #   values are 'On' or 'Off'.  Defaults to 'On'.
 # - $status_path is the path assigned to the Location directive which
@@ -26,15 +40,21 @@
 #  }
 #
 class apache::mod::status (
-  Array $allow_from                               = ['127.0.0.1','::1'],
-  Enum['On', 'Off', 'on', 'off'] $extended_status = 'On',
-  $apache_version                                 = undef,
-  $status_path                                    = '/server-status',
+  Optional[Array] $allow_from                      = undef,
+  Optional[Variant[String, Array, Hash]] $requires = undef,
+  Enum['On', 'Off', 'on', 'off'] $extended_status  = 'On',
+  $apache_version                                  = undef,
+  $status_path                                     = '/server-status',
 ) inherits ::apache::params {
 
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'status': }
+
+  # Defaults for "Allow from" or "Require" directives
+  $allow_defaults = ['127.0.0.1','::1']
+  $requires_defaults = 'ip 127.0.0.1 ::1'
+
   # Template uses $allow_from, $extended_status, $_apache_version, $status_path
   file { 'status.conf':
     ensure  => file,
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 7bc7831fba..0a6305638b 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 # Helper function for testing the contents of `status.conf`
+# Apache < 2.4
 def status_conf_spec(allow_from, extended_status, status_path)
   it do
     is_expected.to contain_file("status.conf").with_content(
@@ -19,12 +20,51 @@ def status_conf_spec(allow_from, extended_status, status_path)
     )
   end
 end
+# Apache >= 2.4
+def require_directives(requires)
+  if requires == :undef
+    return "    Require ip 127.0.0.1 ::1\n"
+  elsif requires.is_a?(String)
+    if ['','unmanaged'].include?requires.downcase
+      return ''
+    else
+      return "    Require #{requires}\n"
+    end
+  elsif requires.is_a?(Array)
+    return requires.map { |req| "    Require #{req}\n" }.join('')
+  elsif requires.is_a?(Hash)
+    unless requires.has_key?(:enforce)
+      return requires[:requires].map { |req| "    Require #{req}\n" }.join('')
+    else
+      return \
+        "    <Require#{requires[:enforce].capitalize}>\n" + \
+        requires[:requires].map { |req| "        Require #{req}\n" }.join('') + \
+        "    </Require#{requires[:enforce].capitalize}>\n"
+    end
+  end
+end
+def status_conf_spec_require(requires, extended_status, status_path)
+  it do
+    is_expected.to contain_file("status.conf").with_content(
+      "<Location #{status_path}>\n"\
+      "    SetHandler server-status\n"\
+      "#{require_directives(requires)}"\
+      "</Location>\n"\
+      "ExtendedStatus #{extended_status}\n"\
+      "\n"\
+      "<IfModule mod_proxy.c>\n"\
+      "    # Show Proxy LoadBalancer status in mod_status\n"\
+      "    ProxyStatus On\n"\
+      "</IfModule>\n"
+    )
+  end
+end
 
 describe 'apache::mod::status', :type => :class do
   it_behaves_like "a mod class, without including apache"
-  
+
   context "default configuration with parameters" do
-    context "on a Debian OS with default params" do
+    context "on a Debian 6 OS with default params" do
       let :facts do
         {
           :osfamily               => 'Debian',
@@ -55,7 +95,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
 
     end
 
-    context "on a RedHat OS with default params" do
+    context "on a RedHat 6 OS with default params" do
       let :facts do
         {
           :osfamily               => 'RedHat',
@@ -77,6 +117,97 @@ def status_conf_spec(allow_from, extended_status, status_path)
 
     end
 
+    valid_requires = {
+      :undef     => :undef,
+      :empty     => '',
+      :unmanaged => 'unmanaged',
+      :string    => 'ip 127.0.0.1 192.168',
+      :array     => [
+        'ip 127.0.0.1',
+        'ip ::1',
+        'host localhost',
+      ],
+      :hash      => {
+        :requires => [
+          'ip 10.1',
+          'host somehost',
+        ],
+      },
+      :enforce   => {
+        :enforce => 'all',
+        :requires => [
+          'ip 127.0.0.1',
+          'host localhost',
+        ],
+      },
+    }
+    valid_requires.each do |req_key, req_value|
+      context "on a Debian 8 OS with default params and #{req_key} requires" do
+        let :facts do
+          {
+            :osfamily               => 'Debian',
+            :operatingsystemrelease => '8',
+            :concat_basedir         => '/dne',
+            :lsbdistcodename        => 'squeeze',
+            :operatingsystem        => 'Debian',
+            :id                     => 'root',
+            :kernel                 => 'Linux',
+            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            :is_pe                  => false,
+          }
+        end
+
+        let :params do
+          {
+            :requires => req_value,
+          }
+        end
+
+        it { is_expected.to contain_apache__mod("status") }
+
+        status_conf_spec_require(req_value, "On", "/server-status")
+
+        it { is_expected.to contain_file("status.conf").with({
+          :ensure => 'file',
+          :path   => '/etc/apache2/mods-available/status.conf',
+        } ) }
+
+        it { is_expected.to contain_file("status.conf symlink").with({
+          :ensure => 'link',
+          :path   => '/etc/apache2/mods-enabled/status.conf',
+        } ) }
+
+      end
+
+      context "on a RedHat 7 OS with default params and #{req_key} requires" do
+        let :facts do
+          {
+            :osfamily               => 'RedHat',
+            :operatingsystemrelease => '7',
+            :concat_basedir         => '/dne',
+            :operatingsystem        => 'RedHat',
+            :id                     => 'root',
+            :kernel                 => 'Linux',
+            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            :is_pe                  => false,
+          }
+        end
+
+        let :params do
+          {
+            :requires => req_value,
+          }
+        end
+
+        it { is_expected.to contain_apache__mod("status") }
+
+        status_conf_spec_require(req_value, "On", "/server-status")
+
+        it { is_expected.to contain_file("status.conf").with_path("/etc/httpd/conf.modules.d/status.conf") }
+
+      end
+    end
+
     context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
       let :facts do
         {
diff --git a/templates/mod/_allow.erb b/templates/mod/_allow.erb
new file mode 100644
index 0000000000..0542e49a62
--- /dev/null
+++ b/templates/mod/_allow.erb
@@ -0,0 +1,7 @@
+    Order deny,allow
+    Deny from all
+<% if @allow_from != nil and ! @allow_from.empty? -%>
+    Allow from <%= Array(@allow_from).join(" ") %>
+<% else -%>
+    Allow from <%= Array(@allow_defaults).join(" ") %>
+<% end -%>
diff --git a/templates/mod/_require.erb b/templates/mod/_require.erb
new file mode 100644
index 0000000000..6a06d68da8
--- /dev/null
+++ b/templates/mod/_require.erb
@@ -0,0 +1,44 @@
+<% if @requires != nil -%>
+  <%- _requires = @requires -%>
+<% elsif @allow_from != nil and ! @allow_from.empty? -%>
+  <%- scope.function_warning(["Class #{@title}: Using Allow"]) -%>
+  <%- scope.function_warning(["is deprecated in Apache #{@_apache_version}"]) -%>
+  <%- _requires = 'ip ' + Array(@allow_from).join(" ") -%>
+<% else -%>
+  <%- _requires = @requires_defaults -%>
+<% end -%>
+<%-# -%>
+<% if _requires.is_a?(String) -%>
+  <%- if ! ['', 'unmanaged'].include?_requires.downcase -%>
+    Require <%= _requires %>
+  <%- end -%>
+<% elsif _requires.is_a?(Array) -%>
+  <%- _requires.each do |req| -%>
+    Require <%= req %>
+  <%- end -%>
+<% elsif _requires.is_a?(Hash) -%>
+  <%- if _requires.has_key?('enforce') and ['all', 'none', 'any'].include?_requires['enforce'].downcase -%>
+    <%- enforce_str = "Require#{_requires['enforce'].capitalize}>\n" -%>
+    <%- enforce_open = "    <#{enforce_str}" -%>
+    <%- enforce_close = "    </#{enforce_str}" -%>
+    <%- indentation = '    ' -%>
+  <%- else -%>
+    <%- if _requires.has_key?('enforce') -%>
+      <%- scope.function_warning(["Class #{@title}: Require can only"]) -%>
+      <%- scope.function_warning(["be overwritten with all, none or any."]) -%>
+    <%- end -%>
+    <%- enforce_open = '' -%>
+    <%- enforce_close = '' -%>
+    <%- indentation = '' -%>
+  <%- end -%>
+  <%- if _requires.has_key?('requires') and _requires['requires'].is_a?(Array) -%>
+<%# %><%= enforce_open -%>
+      <%- _requires['requires'].each do |req| -%>
+<%# %>    <%= indentation -%>Require <%= req %>
+      <%- end -%>
+<%# %><%= enforce_close -%>
+  <%- else -%>
+    <%- scope.function_warning(["Class #{@title}: Require hash must have"]) -%>
+    <%- scope.function_warning(["a key named \"requires\" with array value"]) -%>
+  <%- end -%>
+<% end -%>
diff --git a/templates/mod/status.conf.erb b/templates/mod/status.conf.erb
index 6a6b3daa2d..28cc55b4f7 100644
--- a/templates/mod/status.conf.erb
+++ b/templates/mod/status.conf.erb
@@ -1,11 +1,13 @@
 <Location <%= @status_path %>>
     SetHandler server-status
+    <%-# From Puppet 4.2 up, replace: -%>
+    <%-# "scope.function_template(["apache/mod/<Template>"])" -%>
+    <%-# with: -%>
+    <%-# "scope.call_function('template', ["apache/mod/<Template>"])" -%>
     <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
+<%= scope.function_template(["apache/mod/_require.erb"]) -%>
     <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
+<%= scope.function_template(["apache/mod/_allow.erb"]) -%>
     <%- end -%>
 </Location>
 ExtendedStatus <%= @extended_status %>

From 6835a1dd3a681859ecb87f905db3cd3393492107 Mon Sep 17 00:00:00 2001
From: Damien ELLUL <damien.ellul@boursorama.fr>
Date: Tue, 2 Jan 2018 14:10:25 +0100
Subject: [PATCH 1312/2267] Add acceptance test for param LimitRequestFields

---
 spec/acceptance/apache_parameters_spec.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 2ba1a44529..f83f11ae30 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -399,6 +399,20 @@ class { 'apache':
     end
   end
 
+  describe 'limitrequestfields' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': limitreqfields => '120' }"
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+
+    describe file($conf_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'LimitRequestFields 120' }
+    end
+  end
+
   describe 'logging' do
     describe 'setup' do
       it 'applies cleanly' do

From 80142c72e8d62b60c0e4a17c3b806b5fffad23e0 Mon Sep 17 00:00:00 2001
From: Michael T Lombardi <michael.t.lombardi@outlook.com>
Date: Wed, 3 Jan 2018 16:10:17 -0600
Subject: [PATCH 1313/2267] (maint) modulesync 65530a4 Update Travis

Related: https://github.com/puppetlabs/modulesync_configs/pull/177
---
 .gitignore  | 2 +-
 .travis.yml | 3 ---
 NOTICE      | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e5e6f9e8af..a1022772e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-#This file is generated by ModuleSync, do not edit.Z
+# This file is generated by ModuleSync, do not edit.
 *.iml
 .*.sw[op]
 .DS_Store
diff --git a/.travis.yml b/.travis.yml
index d1846a6712..224af285ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,6 @@ sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake release_checks"
-#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
-before_install:
-  - gem update bundler
 env:
   global:
     - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
diff --git a/NOTICE b/NOTICE
index 77c13089ac..0bd06041e4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
 Puppet Module - puppetlabs-apache
 
-Copyright 2017 Puppet, Inc.
+Copyright 2018 Puppet, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 1536a4a5416fdc63ecf9bf5d6cfd10c4351ffdf1 Mon Sep 17 00:00:00 2001
From: Julian Todt <julian.todt@dm.de>
Date: Tue, 9 Jan 2018 16:38:27 +0100
Subject: [PATCH 1314/2267] use of puppet4 functions-api

---
 lib/puppet/functions/apache/apache_pw_hash.rb | 15 +++++++++++
 lib/puppet/functions/apache/bool2httpd.rb     | 25 +++++++++++++++++++
 .../apache/validate_apache_log_level.rb       | 22 ++++++++++++++++
 manifests/init.pp                             |  2 +-
 manifests/vhost.pp                            |  2 +-
 spec/functions/apache_pw_hash_spec.rb         | 13 ++++++++++
 spec/functions/bool2httpd_spec.rb             | 20 +++++++++++++++
 .../validate_apache_log_level_spec.rb         | 13 ++++++++++
 templates/httpd.conf.erb                      |  4 +--
 templates/mod/cluster.conf.erb                |  4 +--
 templates/mod/expires.conf.erb                |  2 +-
 templates/mod/geoip.conf.erb                  |  4 +--
 templates/mod/ssl.conf.erb                    |  8 +++---
 templates/mod/wsgi.conf.erb                   |  2 +-
 templates/vhost/_directories.erb              |  4 +--
 templates/vhost/_passenger.erb                |  4 +--
 templates/vhost/_ssl.erb                      |  4 +--
 17 files changed, 128 insertions(+), 20 deletions(-)
 create mode 100644 lib/puppet/functions/apache/apache_pw_hash.rb
 create mode 100644 lib/puppet/functions/apache/bool2httpd.rb
 create mode 100644 lib/puppet/functions/apache/validate_apache_log_level.rb
 create mode 100644 spec/functions/apache_pw_hash_spec.rb
 create mode 100644 spec/functions/bool2httpd_spec.rb
 create mode 100644 spec/functions/validate_apache_log_level_spec.rb

diff --git a/lib/puppet/functions/apache/apache_pw_hash.rb b/lib/puppet/functions/apache/apache_pw_hash.rb
new file mode 100644
index 0000000000..ace0817ff2
--- /dev/null
+++ b/lib/puppet/functions/apache/apache_pw_hash.rb
@@ -0,0 +1,15 @@
+# Hashes a password in a format suitable for htpasswd files read by apache.
+#
+# Currently uses SHA-hashes, because although this format is considered insecure, its the
+# most secure format supported by the most platforms.
+Puppet::Functions.create_function(:'apache::apache_pw_hash') do
+  dispatch :apache_pw_hash do
+    required_param 'String[1]', :password
+    return_type 'String'
+  end
+
+  def apache_pw_hash(password)
+    require 'base64'
+    return '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
+  end
+end
diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
new file mode 100644
index 0000000000..8009010798
--- /dev/null
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -0,0 +1,25 @@
+# Transform a supposed boolean to On or Off. Pass all other values through.
+# Given a nil value (undef), bool2httpd will return 'Off'
+#
+# Example:
+#
+#    $trace_enable     = false
+#    $server_signature = 'mail'
+#
+#    bool2httpd($trace_enable)
+#    # => 'Off'
+#    bool2httpd($server_signature)
+#    # => 'mail'
+#    bool2httpd(undef)
+#    # => 'Off'
+Puppet::Functions.create_function(:'apache::bool2httpd') do
+  def bool2httpd(arg)
+    if arg.nil? or arg == false or arg =~ /false/i or arg == :undef
+      return 'Off'
+    elsif arg == true or arg =~ /true/i
+      return 'On'
+    end
+
+    return arg.to_s
+  end
+end
diff --git a/lib/puppet/functions/apache/validate_apache_log_level.rb b/lib/puppet/functions/apache/validate_apache_log_level.rb
new file mode 100644
index 0000000000..14409e44b6
--- /dev/null
+++ b/lib/puppet/functions/apache/validate_apache_log_level.rb
@@ -0,0 +1,22 @@
+#    Perform simple validation of a string against the list of known log
+#    levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel
+#        validate_apache_loglevel('info')
+#
+#    Modules maybe specified with their own levels like these:
+#        validate_apache_loglevel('warn ssl:info')
+#        validate_apache_loglevel('warn mod_ssl.c:info')
+#        validate_apache_loglevel('warn ssl_module:info')
+#
+#    Expected to be used from the main or vhost.
+#    
+#    Might be used from directory too later as apache supports that
+Puppet::Functions.create_function(:'apache::validate_apache_log_level') do
+  dispatch :validate_apache_log_level do
+    required_param 'String', :log_level
+  end
+
+  def validate_apache_log_level (log_level)
+    msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."
+    raise Puppet::ParseError, (msg) unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
+  end
+end
diff --git a/manifests/init.pp b/manifests/init.pp
index 39dc593334..9a871c3792 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -147,7 +147,7 @@
     }
   }
 
-  validate_apache_log_level($log_level)
+  apache::validate_apache_log_level($log_level)
 
   class { '::apache::service':
     service_name    => $service_name,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 8d423bb7da..f466c450cf 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -194,7 +194,7 @@
   # Input validation begins
 
   if $log_level {
-    validate_apache_log_level($log_level)
+    apache::validate_apache_log_level($log_level)
   }
 
   if $access_log_file and $access_log_pipe {
diff --git a/spec/functions/apache_pw_hash_spec.rb b/spec/functions/apache_pw_hash_spec.rb
new file mode 100644
index 0000000000..5329ca95ef
--- /dev/null
+++ b/spec/functions/apache_pw_hash_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'apache::apache_pw_hash' do
+
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params("").and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params(1).and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params(true).and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params({}).and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params([]).and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params("test").and_return('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=') }
+end
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
new file mode 100644
index 0000000000..f0376a2019
--- /dev/null
+++ b/spec/functions/bool2httpd_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'apache::bool2httpd' do
+
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params(true).and_return('On') }
+  it 'should return a string "On"' do
+    expect(subject.execute(true)).to be_an_instance_of(String)
+  end
+  it { is_expected.to run.with_params(false).and_return('Off') }
+  it 'should return a string "Off"' do
+    expect(subject.execute(false)).to be_an_instance_of(String)
+  end
+  it { is_expected.to run.with_params('mail').and_return('mail') }
+  it { is_expected.to run.with_params(nil).and_return('Off') }
+  it { is_expected.to run.with_params(:undef).and_return('Off') }
+  it { is_expected.to run.with_params('foo').and_return('foo') }
+end
diff --git a/spec/functions/validate_apache_log_level_spec.rb b/spec/functions/validate_apache_log_level_spec.rb
new file mode 100644
index 0000000000..e57a9e287e
--- /dev/null
+++ b/spec/functions/validate_apache_log_level_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'apache::validate_apache_log_level' do
+
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params('garbage').and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params('info') }
+  it { is_expected.to run.with_params('warn ssl:info') }
+  it { is_expected.to run.with_params('warn mod_ssl.c:info') }
+  it { is_expected.to run.with_params('warn ssl_module:info') }
+  it { is_expected.to run.with_params('trace4') }
+end
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index e0a36eb7f8..ec3e3f915a 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -1,7 +1,7 @@
 # Security
 ServerTokens <%= @server_tokens %>
-ServerSignature <%= scope.function_bool2httpd([@server_signature]) %>
-TraceEnable <%= scope.function_bool2httpd([@trace_enable]) %>
+ServerSignature <%= scope.call_function('apache::bool2httpd', [@server_signature]) %>
+TraceEnable <%= scope.call_function('apache::bool2httpd', [@trace_enable]) %>
 
 ServerName "<%= @servername %>"
 ServerRoot "<%= @server_root %>"
diff --git a/templates/mod/cluster.conf.erb b/templates/mod/cluster.conf.erb
index 58229a88ad..d2f9d52e47 100644
--- a/templates/mod/cluster.conf.erb
+++ b/templates/mod/cluster.conf.erb
@@ -8,10 +8,10 @@ Listen <%= @ip %>:<%= @port %>
 
   KeepAliveTimeout <%= @keep_alive_timeout %>
   MaxKeepAliveRequests <%= @max_keep_alive_requests %>
-  EnableMCPMReceive <%= scope.function_bool2httpd([@enable_mcpm_receive]) %>
+  EnableMCPMReceive <%= scope.call_function('apache::bool2httpd', [@enable_mcpm_receive]) %>
 
   ManagerBalancerName <%= @balancer_name %>
-  ServerAdvertise <%= scope.function_bool2httpd([@server_advertise]) %>
+  ServerAdvertise <%= scope.call_function('apache::bool2httpd', [@server_advertise]) %>
   <%- if @server_advertise == true and @advertise_frequency != nil -%>
   AdvertiseFrequency <%= @advertise_frequency %>
   <%- end -%>
diff --git a/templates/mod/expires.conf.erb b/templates/mod/expires.conf.erb
index 7660cfcd05..a864c6ca10 100644
--- a/templates/mod/expires.conf.erb
+++ b/templates/mod/expires.conf.erb
@@ -1,4 +1,4 @@
-ExpiresActive <%= scope.function_bool2httpd([@expires_active]) %>
+ExpiresActive <%= scope.call_function('apache::bool2httpd', [@expires_active]) %>
 <%- if ! @expires_default.nil? and ! @expires_default.empty? -%>
 ExpiresDefault "<%= @expires_default %>"
 <%- end -%>
diff --git a/templates/mod/geoip.conf.erb b/templates/mod/geoip.conf.erb
index 00e61d98b4..8cedc79ebb 100644
--- a/templates/mod/geoip.conf.erb
+++ b/templates/mod/geoip.conf.erb
@@ -1,4 +1,4 @@
-GeoIPEnable <%= scope.function_bool2httpd([@enable]) %>
+GeoIPEnable <%= scope.call_function('apache::bool2httpd', [@enable]) %>
 
 <%- if @db_file and ! [ false, 'false', '' ].include?(@db_file) -%>
     <%- if @db_file.kind_of?(Array) -%>
@@ -11,7 +11,7 @@ GeoIPDBFile <%= @db_file %> <%= @flag %>
 <%- end -%>
 GeoIPOutput <%= @output %>
 <% if ! @enable_utf8.nil? -%>
-GeoIPEnableUTF8 <%= scope.function_bool2httpd([@enable_utf8]) %>
+GeoIPEnableUTF8 <%= scope.call_function('apache::bool2httpd', [@enable_utf8]) %>
 <% end -%>
 <% if ! @scan_proxy_headers.nil? -%>
 GeoIPScanProxyHeaders <%= scope.function_bool2httpd([@scan_proxy_headers]) %>
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 5fa7bb9ba6..e041342c2c 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -13,20 +13,20 @@
   <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   Mutex <%= @_ssl_mutex %>
     <%- if @ssl_compression -%>
-  SSLCompression <%= scope.function_bool2httpd([@ssl_compression]) %>
+  SSLCompression <%= scope.call_function('apache::bool2httpd', [@ssl_compression]) %>
     <%- end -%>
   <%- else -%>
   SSLMutex <%= @_ssl_mutex %>
   <%- end -%>
   SSLCryptoDevice <%= @ssl_cryptodevice %>
-  SSLHonorCipherOrder <%= scope.function_bool2httpd([@_ssl_honorcipherorder]) %>
+  SSLHonorCipherOrder <%= scope.call_function('apache::bool2httpd', [@_ssl_honorcipherorder]) %>
   <%- if @ssl_ca -%>
   SSLCACertificateFile    "<%= @ssl_ca %>"
   <%- end -%>
 <% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
-  SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %>
+  SSLUseStapling <%= scope.call_function('apache::bool2httpd', [@ssl_stapling]) %>
   <%- if not @ssl_stapling_return_errors.nil? -%>
-  SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %>
+  SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
   SSLStaplingCache "shmcb:<%= @stapling_cache %>"
 <% end -%>
diff --git a/templates/mod/wsgi.conf.erb b/templates/mod/wsgi.conf.erb
index 1d83e5a842..084a4fc53a 100644
--- a/templates/mod/wsgi.conf.erb
+++ b/templates/mod/wsgi.conf.erb
@@ -2,7 +2,7 @@
 # managed by Puppet an changes will be overwritten.
 <IfModule mod_wsgi.c>
   <%- if @wsgi_restrict_embedded -%>
-  WSGIRestrictEmbedded <%= scope.function_bool2httpd([@wsgi_restrict_embedded]) %>
+  WSGIRestrictEmbedded <%= scope.call_function('apache::bool2httpd', [@wsgi_restrict_embedded]) %>
   <%- end -%>
   <%- if @wsgi_socket_prefix -%>
   WSGISocketPrefix <%= @wsgi_socket_prefix %>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index e4a7d7791b..30c8555046 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -36,7 +36,7 @@
       <%- end -%>
     <%- end -%>
     <%- if ! directory['geoip_enable'].nil? -%>
-    GeoIPEnable <%= scope.function_bool2httpd([directory['geoip_enable']]) %>
+    GeoIPEnable <%= scope.call_function('apache::bool2httpd', [directory['geoip_enable']]) %>
     <%- end -%>
     <%- if directory['options'] -%>
     Options <%= Array(directory['options']).join(' ') %>
@@ -126,7 +126,7 @@
     <%- if directory['dav'] -%>
     Dav <%= directory['dav'] %>
     <%- if directory['dav_depth_infinity'] -%>
-    DavDepthInfinity <%= scope.function_bool2httpd([directory['dav_depth_infinity']]) %>
+    DavDepthInfinity <%= scope.call_function('apache::bool2httpd', [directory['dav_depth_infinity']]) %>
     <%- end -%>
     <%- if directory['dav_min_timeout'] -%>
     DavMinTimeout <%= directory['dav_min_timeout'] %>
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index 46e53764d7..e53165b6a9 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -26,13 +26,13 @@
   PassengerUser <%= @passenger_user %>
 <% end -%>
 <% if @passenger_high_performance -%>
-  PassengerHighPerformance <%= scope.function_bool2httpd([@passenger_high_performance]) %>
+  PassengerHighPerformance <%= scope.call_function('apache::bool2httpd', [@passenger_high_performance]) %>
 <% end -%>
 <% if @passenger_nodejs -%>
   PassengerNodejs <%= @passenger_nodejs -%>
 <% end -%>
 <% if @passenger_sticky_sessions -%>
-  PassengerStickySessions <%= scope.function_bool2httpd([@passenger_sticky_sessions]) %>
+  PassengerStickySessions <%= scope.call_function('apache::bool2httpd', [@passenger_sticky_sessions]) %>
 <% end -%>
 <% if @passenger_startup_file -%>
   PassengerStartupFile <%= @passenger_startup_file -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 826a99bd58..7f5767c4cb 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -44,12 +44,12 @@
   SSLOpenSSLConfCmd       <%= @ssl_openssl_conf_cmd %>
   <%- end -%>
   <%- if (not @ssl_stapling.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
-  SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %>
+  SSLUseStapling <%= scope.call_function('apache::bool2httpd', [@ssl_stapling]) %>
   <%- end -%>
   <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
   <%- end -%>
   <%- if (not @ssl_stapling_return_errors.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
-  SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %>
+  SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
 <% end -%>

From ea136fb512515862335b6a5d67cfe49376123d4a Mon Sep 17 00:00:00 2001
From: Mark Dechiaro <mdechiaro@users.noreply.github.com>
Date: Wed, 10 Jan 2018 10:11:40 -0600
Subject: [PATCH 1315/2267] Add spec acceptance test for shib_compat_valid_user

Also update the order of the concat::fragment and fix syntax errors.
---
 manifests/vhost.pp            |  4 +++-
 spec/acceptance/vhost_spec.rb | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b916e00aa9..eacebd91cc 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1061,8 +1061,10 @@
   if $shibboleth_enabled {
     concat::fragment { "${name}-shibboleth":
       target  => "${priority_real}${filename}.conf",
-      order   => 350,
+      order   => 370,
       content => template('apache/vhost/_shib.erb'),
+    }
+  }
 
   # - $use_canonical_name
   if $use_canonical_name {
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index dae411538d..2ee3d1e76f 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1713,4 +1713,23 @@ class { 'apache': }
       it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
     end
   end
+
+  describe 'shibboleth parameters' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        class { 'apache::mod::shib': }
+        apache::vhost { 'test.server':
+          port    => '80',
+          docroot => '/var/www/html',
+          shib_compat_valid_user => 'On'
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ShibCompatValidUser On' }
+    end
+  end
 end

From a9cb063bfcd29aaedc56ab9484d3aab9d18a025c Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 11 Jan 2018 16:03:28 -0800
Subject: [PATCH 1316/2267] (maint) Disable shibb testing on redhats and ipv6
 testing without ipv6

The shibb package is not in the default repos; broken by #1657

On Dec 12th 2017 travis-ci updated their trusty environment and disabled
ipv6. This causes ipv6 tests to fail.
---
 spec/acceptance/vhost_spec.rb  | 2 +-
 spec/spec_helper_acceptance.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2ee3d1e76f..54d5a79bd9 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1714,7 +1714,7 @@ class { 'apache': }
     end
   end
 
-  describe 'shibboleth parameters' do
+  describe 'shibboleth parameters', :unless => fact('osfamily') == 'RedHat' do
     it 'applies cleanly' do
       pp = <<-EOS
         class { 'apache': }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index d59c7f8ab8..c1017222ca 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -16,6 +16,10 @@
   if fact('operatingsystem') == 'Ubuntu' and (fact('operatingsystemrelease') == '10.04' or fact('operatingsystemrelease') == '12.04')
     c.filter_run_excluding :ipv6 => true
   end
+  # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
+  if fact('network6_lo') != '::1'
+    c.filter_run_excluding :ipv6 => true
+  end
 
   # Readable test descriptions
   c.formatter = :documentation

From 80d61dcc15b9ce534ba53aadb751479c521f17a8 Mon Sep 17 00:00:00 2001
From: juju4 <juju4@users.noreply.github.com>
Date: Sat, 9 Dec 2017 17:39:36 -0500
Subject: [PATCH 1317/2267] default server_tokens to prod - more secure default

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 92deb56414..48d0b8fbac 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -76,7 +76,7 @@
   $ports_file                                                    = $::apache::params::ports_file,
   $docroot                                                       = $::apache::params::docroot,
   $apache_version                                                = $::apache::version::default,
-  $server_tokens                                                 = 'OS',
+  $server_tokens                                                 = 'Prod',
   $server_signature                                              = 'On',
   $trace_enable                                                  = 'On',
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef,

From 8f052e1d4334758543ebcf3d66071cf49a6e46e2 Mon Sep 17 00:00:00 2001
From: juju4 <juju4@users.noreply.github.com>
Date: Sat, 18 Nov 2017 21:33:42 -0500
Subject: [PATCH 1318/2267] enforce modern crypto ciphers and protocol

---
 manifests/mod/ssl.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 76726b8e56..d0c0845db0 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -4,9 +4,9 @@
   $ssl_options                                              = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd                                     = undef,
   $ssl_ca                                                   = undef,
-  $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
+  $ssl_cipher                                               = 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
-  $ssl_protocol                                             = [ 'all', '-SSLv2', '-SSLv3' ],
+  $ssl_protocol                                             = [ 'all', '-SSLv2', '-SSLv3', '-TLSv1', '-TLSv1.1' ],
   Array $ssl_proxy_protocol                                 = [],
   $ssl_pass_phrase_dialog                                   = 'builtin',
   $ssl_random_seed_bytes                                    = '512',

From 78be212f34fc176ef60bcb68ae7c418af2b9c6a1 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Tue, 16 Jan 2018 15:41:09 -0800
Subject: [PATCH 1319/2267] Don't test shib on Debian 7; fix incorrect facts

---
 manifests/vhost.pp                  | 2 +-
 spec/acceptance/mod_dav_svn_spec.rb | 2 +-
 spec/acceptance/vhost_spec.rb       | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bf0e1f364d..86fa06e63a 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1057,7 +1057,7 @@
   }
 
   # Template uses:
-  # - $shibboleth_enabled
+  # - $shib_compat_valid_user
   if $shibboleth_enabled {
     concat::fragment { "${name}-shibboleth":
       target  => "${priority_real}${filename}.conf",
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 2b15225094..73c80e622c 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') || (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') < '11') do
+describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') || (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajrelease') < '11') do
   case fact('osfamily')
   when 'Debian'
     if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04' or fact('operatingsystemmajrelease') == '16.04'
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 54d5a79bd9..7b21b87006 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -125,7 +125,7 @@ class { 'apache': }
     end
   end
 
-  unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') <= '10')
+  unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajrelease') <= '10')
     context 'new proxy vhost on port 80' do
       it 'should configure an apache proxy vhost' do
         pp = <<-EOS
@@ -800,7 +800,7 @@ class { 'apache': default_vhost => false, }
     end
   end
 
-  unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') <= '10')
+  unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajrelease') <= '10')
     context 'proxy_pass_match for alternative vhost' do
       it 'should configure a local vhost and a proxy vhost' do
         apply_manifest(%{
@@ -1714,7 +1714,8 @@ class { 'apache': }
     end
   end
 
-  describe 'shibboleth parameters', :unless => fact('osfamily') == 'RedHat' do
+  describe 'shibboleth parameters', :if => (fact('osfamily') == 'Debian' and fact('operatingsystemmajrelease') != '7') do
+    # Debian 7 is too old for ShibCompatValidUser
     it 'applies cleanly' do
       pp = <<-EOS
         class { 'apache': }

From 0cc0bfb7b914c4f46a577e177fb2576dd4405f16 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Tue, 23 Jan 2018 10:29:33 -0800
Subject: [PATCH 1320/2267] (maint) Add dav_svn packages for sles

subversion-server          | Apache server module for Subversion server
---
 manifests/params.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index 750144fe6c..9a87cf72fb 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -539,6 +539,7 @@
     if $::operatingsystemrelease < '11' or $::operatingsystemrelease >= '12' {
       $mod_packages      = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
+        'dav_svn'     => 'subversion-server',
         'perl'        => 'apache2-mod_perl',
         'php5'        => 'apache2-mod_php5',
         'python'      => 'apache2-mod_python',
@@ -548,6 +549,7 @@
     } else {
       $mod_packages        = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
+        'dav_svn'     => 'subversion-server',
         'perl'        => 'apache2-mod_perl',
         'php5'        => 'apache2-mod_php53',
         'python'      => 'apache2-mod_python',

From 33fd2cfc84219763941d220030eac92afbf0efbd Mon Sep 17 00:00:00 2001
From: juju4 <juju4@users.noreply.github.com>
Date: Wed, 24 Jan 2018 19:40:40 -0500
Subject: [PATCH 1321/2267] update README with new default

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7049434ffc..db088da93b 100755
--- a/README.md
+++ b/README.md
@@ -1332,7 +1332,7 @@ Default: 'On'.
 
 Controls how much information Apache sends to the browser about itself and the operating system, via Apache's [`ServerTokens`][] directive.
 
-Default: 'OS'.
+Default: 'Prod'.
 
 ##### `service_enable`
 

From 6a0268211aec41b81c856e22a5561870b828caa0 Mon Sep 17 00:00:00 2001
From: juju4 <juju4@users.noreply.github.com>
Date: Wed, 24 Jan 2018 19:43:55 -0500
Subject: [PATCH 1322/2267] update README with new defaults

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7049434ffc..0349dc4ad1 100755
--- a/README.md
+++ b/README.md
@@ -2723,14 +2723,14 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 
 To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to `true` **or** the [`ssl`][] parameter in [`apache::vhost`][] to `true`.
 
-- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
+- `ssl_cipher`: Default: 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'.
 - `ssl_compression`: Default: false.
 - `ssl_cryptodevice`: Default: 'builtin'.
 - `ssl_honorcipherorder`: Default: true.
 - `ssl_openssl_conf_cmd`: Default: undef.
 - `ssl_options`: Default: ['StdEnvVars']
 - `ssl_pass_phrase_dialog`: Default: 'builtin'.
-- `ssl_protocol`: Default: ['all', '-SSLv2', '-SSLv3'].
+- `ssl_protocol`: Default: ['all', '-SSLv2', '-SSLv3', '-TLSv1', '-TLSv1.1'].
 - `ssl_proxy_protocol`: Default: [].
 - `ssl_random_seed_bytes`: Valid options: A string. Default: '512'.
 - `ssl_sessioncache`: Valid options: A string. Default: '300'.
@@ -2743,7 +2743,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 
 * `ssl_cipher`
 
-  Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
+  Default: 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'.
 
 * `ssl_compression`
 
@@ -2771,7 +2771,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 
 * `ssl_protocol`
 
-  Default: ['all', '*SSLv2', '*SSLv3'].
+  Default: ['all', '-SSLv2', '-SSLv3', '-TLSv1', '-TLSv1.1'].
 
 * `ssl_random_seed_bytes`
 

From 5c9fdf838046212cfe0edad755e8f3b6a58e3b3d Mon Sep 17 00:00:00 2001
From: Cedric DEFORTIS <cedric.defortis@cassio.pe>
Date: Tue, 5 Dec 2017 22:04:35 +0100
Subject: [PATCH 1323/2267] modJK:Spec tests worker_mantain erroneous param

Here are advanced spec tests against the workers.properties generated
file from `workers_file_content` hash parameter for `apache::mod::jk`
class.
---
 spec/classes/mod/jk_spec.rb | 48 +++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 57305c1233..7a8854b5f5 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -13,6 +13,52 @@
     it { is_expected.to contain_file('jk.conf').with({ :path => "#{mod_dir}/jk.conf" }) }
   end
 
+  shared_examples 'specific workers_file' do |mod_dir|
+    #let (:pre_condition) do
+    #  'include apache'
+    #end
+    let (:params) do
+      {
+        :workers_file => "#{mod_dir}/workers.properties",
+        :workers_file_content => {
+          'worker_a' => {
+            'type' => 'ajp13',
+            'socket_keepalive' => 'true',
+            'comment'          => 'This is worker A',
+          },
+          'worker_b' => {
+            'type' => 'ajp13',
+            'socket_keepalive' => 'true',
+            'comment'          => 'This is worker B',
+          },
+          'worker_mantain' => 40,
+          'worker_lists' => ['worker_a,worker_b'],
+        },
+      }
+    end
+    it { is_expected.to compile }
+    it { is_expected.to compile.with_all_deps }
+    it do
+      is_expected.to contain_file("#{mod_dir}/workers.properties")
+        .with_content(
+          "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
+          "# Any manual changes will be overwritten\n"\
+          "\n"\
+          "worker.list = worker_a,worker_b\n"\
+          "\n"\
+          "worker.maintain = 40\n"\
+          "\n"\
+          "# This is worker A\n"\
+          "worker.worker_a.socket_keepalive=true\n"\
+          "worker.worker_a.type=ajp13\n"\
+          "\n"\
+          "# This is worker B\n"\
+          "worker.worker_b.socket_keepalive=true\n"\
+          "worker.worker_b.type=ajp13\n"
+        )
+    end
+  end
+
   default_ip = '192.168.1.1'
   altern8_ip = '10.1.2.3'
   default_port = 80
@@ -43,6 +89,7 @@
     let (:mod_dir) { mod_dir }
 
     it_behaves_like 'minimal resources', mod_dir
+    it_behaves_like 'specific workers_file', mod_dir
     it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
@@ -75,6 +122,7 @@
     let (:mod_dir) { mod_dir }
 
     it_behaves_like 'minimal resources', mod_dir
+    it_behaves_like 'specific workers_file', mod_dir
     it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])

From a531d0006002d71a623ba6a0e1f97d2d1c1e66b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Defortis?= <cedric.defortis@lyra-network.com>
Date: Tue, 30 Jan 2018 09:19:57 +0100
Subject: [PATCH 1324/2267] Fix key 'worker_mantain' in $workers_file_content

- Add spec tests for advanced mod_jk configuration
- Fix *worker_mantain* typo (see below)
- Call `fail()` function when using the deprecated *worker_mantain* key

Original comment in worker.properties.erb reference a key
*worker_mantain* in the `$workers_file_content` hash.

From the original Apache's mod_jk documentation [1], the parameter name is
`worker.maintain` and has been mistyped as `worker.mantain` (note the
missing *i* letter).

[1] https://tomcat.apache.org/connectors-doc/reference/workers.html
---
 README.md                               | 12 ++++++------
 manifests/mod/jk.pp                     |  7 +++++++
 readmes/README_ja_JP.md                 | 12 ++++++------
 spec/classes/mod/jk_spec.rb             |  2 +-
 templates/mod/jk/workers.properties.erb | 18 +++++++++---------
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 7049434ffc..e7ad0a67de 100755
--- a/README.md
+++ b/README.md
@@ -2276,14 +2276,14 @@ Default: '80'
 **workers\_file\_content**
 
 Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values.
-Plus, there are two global directives, 'worker.list' and 'worker.mantain'
+Plus, there are two global directives, 'worker.list' and 'worker.maintain'
 For example, the workers file below:
 
 ```
 worker.list = status
 worker.list = some_name,other_name
 
-worker.mantain = 60
+worker.maintain = 60
 
 # Optional comment
 worker.some_name.type=ajp13
@@ -2298,14 +2298,14 @@ Should be parameterized as:
 
 ```
 $workers_file_content = {
-  worker_lists   => ['status', 'some_name,other_name'],
-  worker_mantain => '60',
-  some_name      => {
+  worker_lists    => ['status', 'some_name,other_name'],
+  worker_maintain => '60',
+  some_name       => {
     comment          => 'Optional comment',
     type             => 'ajp13',
     socket_keepalive => 'true',
   },
-  other_name     => {
+  other_name      => {
     comment          => 'I just like comments',
     type             => 'ajp12',
     socket_keepalive => 'false',
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index eebfd2c2cf..fc459b1fee 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -67,6 +67,13 @@
   # Manages basic module config
   ::apache::mod { 'jk': }
 
+  # Ensure that we are not using variables with the typo fixed by MODULES-6225
+  # anymore:
+  if !empty($workers_file_content) and has_key($workers_file_content, 'worker_mantain') {
+    fail('Please replace $workers_file_content[\'worker_mantain\'] by $workers_file_content[\'worker_maintain\']. See MODULES-6225 for details.')
+  }
+
+
   # Binding to mod_jk
   if $add_listen {
     $_ip = $ip ? {
diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index c8293c684d..33f261e9fc 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -2196,14 +2196,14 @@ class { '::apache::mod::jk':
 **workers\_file\_content**
 
 各ディレクティブにはフォーマット`worker.<Worker name>.<Property>=<Value>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは各ワーカーのプロパティと値を指定します。
-また、2つのグローバルディレクティブ 'worker.list'および'worker.mantain'もあります。  
+また、2つのグローバルディレクティブ 'worker.list'および'worker.maintain'もあります。  
 例えば、ワーカーファイルは以下のようになります。
 
 ```
 worker.list = status
 worker.list = some_name,other_name
 
-worker.mantain = 60
+worker.maintain = 60
 
 # Optional comment
 worker.some_name.type=ajp13
@@ -2218,14 +2218,14 @@ worker.other_name.socket_keepalive=false
 
 ```
 $workers_file_content = {
-  worker_lists   => ['status', 'some_name,other_name'],
-  worker_mantain => '60',
-  some_name      => {
+  worker_lists    => ['status', 'some_name,other_name'],
+  worker_maintain => '60',
+  some_name       => {
     comment          => 'Optional comment',
     type             => 'ajp13',
     socket_keepalive => 'true',
   },
-  other_name     => {
+  other_name      => {
     comment          => 'I just like comments',
     type             => 'ajp12',
     socket_keepalive => 'false',
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 7a8854b5f5..ce26c2a455 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -31,7 +31,7 @@
             'socket_keepalive' => 'true',
             'comment'          => 'This is worker B',
           },
-          'worker_mantain' => 40,
+          'worker_maintain' => 40,
           'worker_lists' => ['worker_a,worker_b'],
         },
       }
diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.erb
index ed3eb6190f..8292f3d37a 100644
--- a/templates/mod/jk/workers.properties.erb
+++ b/templates/mod/jk/workers.properties.erb
@@ -6,12 +6,12 @@
 <%# Two keys are special (and reserved!): -%>
 <%# worker_lists - Array of comma-separated worker names lists -%>
 <%# Each list is an item of the array and will be placed in one line -%>
-<%# worker_mantain - Numeric string -%>
+<%# worker_maintain - Numeric string -%>
 <%# -%>
 <%# Example: -%>
 <%# worker.list = status -%>
 <%# worker.list = some_name,other_name -%>
-<%# worker.mantain = 60 -%>
+<%# worker.maintain = 60 -%>
 <%# # Optional comment -%>
 <%# worker.some_name.type=ajp13 -%>
 <%# worker.some_name.socket_keepalive=true -%>
@@ -21,14 +21,14 @@
 <%# -%>
 <%# should be parameterized as: -%>
 <%# $workers_file_content = { -%>
-<%#   worker_lists => ['status', 'some_name,other_name'], -%>
-<%#   worker_mantain => '60', -%>
-<%#   some_name => { -%>
+<%#   worker_lists    => ['status', 'some_name,other_name'], -%>
+<%#   worker_maintain => '60', -%>
+<%#   some_name       => { -%>
 <%#     type             => 'ajp13', -%>
 <%#     socket_keepalive => 'true', -%>
 <%#     comment          => 'Optional comment', -%>
 <%#   }, -%>
-<%#   other_name => { -%>
+<%#   other_name      => { -%>
 <%#     type             => 'ajp12', -%>
 <%#     socket_keepalive => 'false', -%>
 <%#     comment          => 'I just like comments', -%>
@@ -41,13 +41,13 @@
 worker.list = <%= list %>
 <% end -%>
 <% end -%>
-<% if @workers_file_content.has_key?('worker_mantain') -%>
+<% if @workers_file_content.has_key?('worker_maintain') -%>
 
-worker.maintain = <%= @workers_file_content['worker_mantain'] %>
+worker.maintain = <%= @workers_file_content['worker_maintain'] %>
 <% end -%>
 <% @workers_file_content.sort.each do |name,directives| -%>
 <%# Skip hash items with the reserved keys -%>
-<% if not ['worker_lists', 'worker_mantain'].include?(name) -%>
+<% if not ['worker_lists', 'worker_maintain'].include?(name) -%>
 
 <%# Places comment before worker directives -%>
 <% if directives.has_key?('comment') -%>

From 02919a8295b31931efda728654ab1d69ac4771e7 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Thu, 11 Jan 2018 16:53:34 +0000
Subject: [PATCH 1325/2267] Rubocop Finished

---
 .rubocop.yml                                  |    3 +
 .sync.yml                                     |    4 +
 .travis.yml                                   |    2 +
 lib/facter/apache_version.rb                  |    2 +-
 lib/puppet/functions/apache/apache_pw_hash.rb |    2 +-
 lib/puppet/functions/apache/bool2httpd.rb     |   10 +-
 .../apache/validate_apache_log_level.rb       |    5 +-
 lib/puppet/parser/functions/apache_pw_hash.rb |   16 +-
 lib/puppet/parser/functions/bool2httpd.rb     |   38 +-
 .../functions/validate_apache_log_level.rb    |   16 +-
 lib/puppet/provider/a2mod.rb                  |    8 +-
 lib/puppet/provider/a2mod/a2mod.rb            |   50 +-
 lib/puppet/provider/a2mod/gentoo.rb           |   72 +-
 lib/puppet/provider/a2mod/modfix.rb           |   18 +-
 lib/puppet/provider/a2mod/redhat.rb           |   30 +-
 lib/puppet/type/a2mod.rb                      |   36 +-
 spec/acceptance/apache_parameters_spec.rb     |  163 +-
 spec/acceptance/apache_ssl_spec.rb            |   42 +-
 spec/acceptance/class_spec.rb                 |   30 +-
 spec/acceptance/custom_config_spec.rb         |   43 +-
 spec/acceptance/default_mods_spec.rb          |   33 +-
 spec/acceptance/init_task_spec.rb             |    9 +-
 spec/acceptance/itk_spec.rb                   |   45 +-
 spec/acceptance/mod_dav_svn_spec.rb           |   37 +-
 spec/acceptance/mod_deflate_spec.rb           |   28 +-
 spec/acceptance/mod_fcgid_spec.rb             |   21 +-
 spec/acceptance/mod_mime_spec.rb              |   16 +-
 spec/acceptance/mod_negotiation_spec.rb       |   58 +-
 spec/acceptance/mod_pagespeed_spec.rb         |   33 +-
 spec/acceptance/mod_passenger_spec.rb         |  181 +-
 spec/acceptance/mod_php_spec.rb               |   97 +-
 spec/acceptance/mod_proxy_html_spec.rb        |   20 +-
 spec/acceptance/mod_security_spec.rb          |  251 ++-
 spec/acceptance/mod_suphp_spec.rb             |   38 +-
 spec/acceptance/prefork_worker_spec.rb        |  114 +-
 spec/acceptance/service_spec.rb               |    6 +-
 spec/acceptance/version.rb                    |   51 +-
 spec/acceptance/vhost_spec.rb                 | 1871 +++++++++--------
 spec/acceptance/vhosts_spec.rb                |    8 +-
 spec/classes/apache_spec.rb                   | 1404 +++++++------
 spec/classes/dev_spec.rb                      |  130 +-
 spec/classes/mod/alias_spec.rb                |  125 +-
 spec/classes/mod/auth_cas_spec.rb             |   78 +-
 spec/classes/mod/auth_kerb_spec.rb            |  139 +-
 spec/classes/mod/auth_mellon_spec.rb          |  159 +-
 spec/classes/mod/authn_dbd_spec.rb            |   72 +-
 spec/classes/mod/authnz_ldap_spec.rb          |  130 +-
 spec/classes/mod/authnz_pam_spec.rb           |   56 +-
 spec/classes/mod/cluster_spec.rb              |   88 +-
 spec/classes/mod/data_spec.rb                 |   32 +-
 spec/classes/mod/dav_svn_spec.rb              |  106 +-
 spec/classes/mod/deflate_spec.rb              |  140 +-
 spec/classes/mod/dev_spec.rb                  |   37 +-
 spec/classes/mod/dir_spec.rb                  |  254 +--
 spec/classes/mod/disk_cache_spec.rb           |  158 +-
 spec/classes/mod/dumpio_spec.rb               |   55 +-
 spec/classes/mod/event_spec.rb                |  270 +--
 spec/classes/mod/expires_spec.rb              |   85 +-
 spec/classes/mod/ext_filter_spec.rb           |   69 +-
 spec/classes/mod/fastcgi_spec.rb              |   52 +-
 spec/classes/mod/fcgid_spec.rb                |  190 +-
 spec/classes/mod/info_spec.rb                 |  220 +-
 .../classes/mod/intercept_form_submit_spec.rb |   56 +-
 spec/classes/mod/itk_spec.rb                  |  217 +-
 spec/classes/mod/jk_spec.rb                   |  208 +-
 spec/classes/mod/ldap_spec.rb                 |  118 +-
 spec/classes/mod/lookup_identity.rb           |   56 +-
 spec/classes/mod/mime_magic_spec.rb           |  112 +-
 spec/classes/mod/mime_spec.rb                 |   55 +-
 spec/classes/mod/negotiation_spec.rb          |   54 +-
 spec/classes/mod/pagespeed_spec.rb            |   68 +-
 spec/classes/mod/passenger_spec.rb            |  656 +++---
 spec/classes/mod/perl_spec.rb                 |   98 +-
 spec/classes/mod/peruser_spec.rb              |   47 +-
 spec/classes/mod/php_spec.rb                  |  365 ++--
 spec/classes/mod/prefork_spec.rb              |  154 +-
 spec/classes/mod/proxy_balancer_spec.rb       |  118 +-
 spec/classes/mod/proxy_connect_spec.rb        |   47 +-
 spec/classes/mod/proxy_html_spec.rb           |  192 +-
 spec/classes/mod/proxy_wstunnel.rb            |    4 +-
 spec/classes/mod/python_spec.rb               |  115 +-
 spec/classes/mod/remoteip_spec.rb             |   56 +-
 spec/classes/mod/reqtimeout_spec.rb           |  162 +-
 spec/classes/mod/rpaf_spec.rb                 |  162 +-
 spec/classes/mod/security_spec.rb             |  276 +--
 spec/classes/mod/shib_spec.rb                 |   52 +-
 spec/classes/mod/speling_spec.rb              |   44 +-
 spec/classes/mod/ssl_spec.rb                  |  319 +--
 spec/classes/mod/status_spec.rb               |  365 ++--
 spec/classes/mod/suphp_spec.rb                |   52 +-
 spec/classes/mod/userdir_spec.rb              |   56 +-
 spec/classes/mod/worker_spec.rb               |  219 +-
 spec/classes/mod/wsgi_spec.rb                 |  188 +-
 spec/classes/params_spec.rb                   |   22 +-
 spec/classes/service_spec.rb                  |  188 +-
 spec/classes/vhosts_spec.rb                   |   43 +-
 spec/defines/balancer_spec.rb                 |   91 +-
 spec/defines/balancermember_spec.rb           |   47 +-
 spec/defines/custom_config_spec.rb            |  104 +-
 spec/defines/fastcgi_server_spec.rb           |  205 +-
 spec/defines/mod_spec.rb                      |  182 +-
 spec/defines/modsec_link_spec.rb              |   63 +-
 spec/defines/vhost_custom_spec.rb             |  146 +-
 spec/defines/vhost_spec.rb                    | 1520 +++++++------
 spec/functions/apache_pw_hash_spec.rb         |    5 +-
 spec/functions/bool2httpd_spec.rb             |    9 +-
 .../validate_apache_log_level_spec.rb         |    1 -
 spec/spec_helper_acceptance.rb                |   36 +-
 spec/spec_helper_local.rb                     |   35 +-
 spec/unit/apache_version_spec.rb              |   21 +-
 spec/unit/provider/a2mod/gentoo_spec.rb       |  146 +-
 .../parser/functions/apache_pw_hash_spec.rb   |   30 +-
 .../parser/functions/bool2httpd_spec.rb       |   28 +-
 .../functions/validate_apache_log_level.rb    |   37 +-
 tasks/init.rb                                 |   20 +-
 115 files changed, 8000 insertions(+), 7226 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 515ef6314c..12e5637c4d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -96,3 +96,6 @@ Style/IfUnlessModifier:
   Enabled: false
 Style/SymbolProc:
   Enabled: false
+#TODO: Additional value added to resolve error's
+Style/GlobalVars:
+  Enabled: false
\ No newline at end of file
diff --git a/.sync.yml b/.sync.yml
index dcbd6f0d53..8ea87b0d2d 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -10,3 +10,7 @@ spec/spec_helper.rb:
   env:
     global:
       - "PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers"
+  extras:
+    - rvm: 2.1.9
+      script: bundle exec rake rubocop
+
diff --git a/.travis.yml b/.travis.yml
index 224af285ff..1f04fd1d1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,5 +28,7 @@ matrix:
   - rvm: 2.1.9
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.1.9
+    script: bundle exec rake rubocop
 notifications:
   email: false
diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index 852e5f0440..3dc17ae058 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -1,5 +1,5 @@
 Facter.add(:apache_version) do
-  confine :kernel => 'Linux'
+  confine kernel: 'Linux'
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
diff --git a/lib/puppet/functions/apache/apache_pw_hash.rb b/lib/puppet/functions/apache/apache_pw_hash.rb
index ace0817ff2..dc73bfd81c 100644
--- a/lib/puppet/functions/apache/apache_pw_hash.rb
+++ b/lib/puppet/functions/apache/apache_pw_hash.rb
@@ -10,6 +10,6 @@
 
   def apache_pw_hash(password)
     require 'base64'
-    return '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
+    '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
   end
 end
diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
index 8009010798..a173c8b3e6 100644
--- a/lib/puppet/functions/apache/bool2httpd.rb
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -14,12 +14,8 @@
 #    # => 'Off'
 Puppet::Functions.create_function(:'apache::bool2httpd') do
   def bool2httpd(arg)
-    if arg.nil? or arg == false or arg =~ /false/i or arg == :undef
-      return 'Off'
-    elsif arg == true or arg =~ /true/i
-      return 'On'
-    end
-
-    return arg.to_s
+    return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
+    return 'On' if arg == true || arg =~ %r{true}i
+    arg.to_s
   end
 end
diff --git a/lib/puppet/functions/apache/validate_apache_log_level.rb b/lib/puppet/functions/apache/validate_apache_log_level.rb
index 14409e44b6..1ae906cfd5 100644
--- a/lib/puppet/functions/apache/validate_apache_log_level.rb
+++ b/lib/puppet/functions/apache/validate_apache_log_level.rb
@@ -8,15 +8,14 @@
 #        validate_apache_loglevel('warn ssl_module:info')
 #
 #    Expected to be used from the main or vhost.
-#    
 #    Might be used from directory too later as apache supports that
 Puppet::Functions.create_function(:'apache::validate_apache_log_level') do
   dispatch :validate_apache_log_level do
     required_param 'String', :log_level
   end
 
-  def validate_apache_log_level (log_level)
+  def validate_apache_log_level(log_level)
     msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."
-    raise Puppet::ParseError, (msg) unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
+    raise Puppet::ParseError, msg unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
   end
 end
diff --git a/lib/puppet/parser/functions/apache_pw_hash.rb b/lib/puppet/parser/functions/apache_pw_hash.rb
index 29d4b5eeb8..3ff8dee86e 100644
--- a/lib/puppet/parser/functions/apache_pw_hash.rb
+++ b/lib/puppet/parser/functions/apache_pw_hash.rb
@@ -1,15 +1,15 @@
 require 'base64'
 
-Puppet::Parser::Functions::newfunction(:apache_pw_hash, :type => :rvalue, :doc => <<-EOS
-Hashes a password in a format suitable for htpasswd files read by apache.
+Puppet::Parser::Functions.newfunction(:apache_pw_hash, type: :rvalue, doc: <<-DOC
+  Hashes a password in a format suitable for htpasswd files read by apache.
 
-Currently uses SHA-hashes, because although this format is considered insecure, its the
-most secure format supported by the most platforms.
-EOS
-) do |args|
+  Currently uses SHA-hashes, because although this format is considered insecure, its the
+  most secure format supported by the most platforms.
+DOC
+                                     ) do |args|
   raise(Puppet::ParseError, "apache_pw_hash() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
-  raise(Puppet::ParseError, "apache_pw_hash(): first argument must be a string") unless args[0].is_a? String
-  raise(Puppet::ParseError, "apache_pw_hash(): first argument must not be empty") if args[0].empty?
+  raise(Puppet::ParseError, 'apache_pw_hash(): first argument must be a string') unless args[0].is_a? String
+  raise(Puppet::ParseError, 'apache_pw_hash(): first argument must not be empty') if args[0].empty?
 
   password = args[0]
   return '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
diff --git a/lib/puppet/parser/functions/bool2httpd.rb b/lib/puppet/parser/functions/bool2httpd.rb
index 5fb79f6f58..71516b970b 100644
--- a/lib/puppet/parser/functions/bool2httpd.rb
+++ b/lib/puppet/parser/functions/bool2httpd.rb
@@ -1,30 +1,24 @@
-Puppet::Parser::Functions::newfunction(:bool2httpd, :type => :rvalue, :doc => <<-EOS
-Transform a supposed boolean to On or Off. Pass all other values through.
-Given a nil value (undef), bool2httpd will return 'Off'
+Puppet::Parser::Functions.newfunction(:bool2httpd, type: :rvalue, doc: <<-DOC
+  Transform a supposed boolean to On or Off. Pass all other values through.
+  Given a nil value (undef), bool2httpd will return 'Off'
 
-Example:
+  Example:
 
-    $trace_enable     = false
-    $server_signature = 'mail'
+      $trace_enable     = false
+      $server_signature = 'mail'
 
-    bool2httpd($trace_enable)
-    # => 'Off'
-    bool2httpd($server_signature)
-    # => 'mail'
-    bool2httpd(undef)
-    # => 'Off'
-
-EOS
-) do |args|
+      bool2httpd($trace_enable)
+      # => 'Off'
+      bool2httpd($server_signature)
+      # => 'mail'
+      bool2httpd(undef)
+      # => 'Off'
+DOC
+                                     ) do |args|
   raise(Puppet::ParseError, "bool2httpd() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
 
   arg = args[0]
-
-  if arg.nil? or arg == false or arg =~ /false/i or arg == :undef
-    return 'Off'
-  elsif arg == true or arg =~ /true/i
-    return 'On'
-  end
-
+  return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
+  return 'On' if arg == true || arg =~ %r{true}i
   return arg.to_s
 end
diff --git a/lib/puppet/parser/functions/validate_apache_log_level.rb b/lib/puppet/parser/functions/validate_apache_log_level.rb
index 8a1ade0bed..1e9b3c2fef 100644
--- a/lib/puppet/parser/functions/validate_apache_log_level.rb
+++ b/lib/puppet/parser/functions/validate_apache_log_level.rb
@@ -1,5 +1,6 @@
+# validate_apache_log_level.rb
 module Puppet::Parser::Functions
-  newfunction(:validate_apache_log_level, :doc => <<-'ENDHEREDOC') do |args|
+  newfunction(:validate_apache_log_level, doc: <<-DOC
     Perform simple validation of a string against the list of known log
     levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel
         validate_apache_loglevel('info')
@@ -10,18 +11,17 @@ module Puppet::Parser::Functions
         validate_apache_loglevel('warn ssl_module:info')
 
     Expected to be used from the main or vhost.
-    
+
     Might be used from directory too later as apaceh supports that
 
-    ENDHEREDOC
-    if (args.size != 1) then
-      raise Puppet::ParseError, ("validate_apache_loglevel(): wrong number of arguments (#{args.length}; must be 1)")
+DOC
+             ) do |args|
+    if args.size != 1
+      raise Puppet::ParseError, "validate_apache_loglevel(): wrong number of arguments (#{args.length}; must be 1)"
     end
 
     log_level = args[0]
     msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."
-
-    raise Puppet::ParseError, (msg) unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
-
+    raise Puppet::ParseError, msg unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
   end
 end
diff --git a/lib/puppet/provider/a2mod.rb b/lib/puppet/provider/a2mod.rb
index 670aca3d03..af704b6014 100644
--- a/lib/puppet/provider/a2mod.rb
+++ b/lib/puppet/provider/a2mod.rb
@@ -1,7 +1,9 @@
+# a2mod.rb
 class Puppet::Provider::A2mod < Puppet::Provider
   def self.prefetch(mods)
     instances.each do |prov|
-      if mod = mods[prov.name]
+      mod = mods[prov.name]
+      if mod
         mod.provider = prov
       end
     end
@@ -13,7 +15,7 @@ def flush
 
   def properties
     if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
+      @property_hash = query || { ensure: :absent }
       @property_hash[:ensure] = :absent if @property_hash.empty?
     end
     @property_hash.dup
@@ -21,7 +23,7 @@ def properties
 
   def query
     self.class.instances.each do |mod|
-      if mod.name == self.name or mod.name.downcase == self.name
+      if mod.name == name || mod.name.downcase == name
         return mod.properties
       end
     end
diff --git a/lib/puppet/provider/a2mod/a2mod.rb b/lib/puppet/provider/a2mod/a2mod.rb
index e257a579e8..8b18686f8e 100644
--- a/lib/puppet/provider/a2mod/a2mod.rb
+++ b/lib/puppet/provider/a2mod/a2mod.rb
@@ -1,35 +1,35 @@
 require 'puppet/provider/a2mod'
 
-Puppet::Type.type(:a2mod).provide(:a2mod, :parent => Puppet::Provider::A2mod) do
-    desc "Manage Apache 2 modules on Debian and Ubuntu"
+Puppet::Type.type(:a2mod).provide(:a2mod, parent: Puppet::Provider::A2mod) do
+  desc 'Manage Apache 2 modules on Debian and Ubuntu'
 
-    optional_commands :encmd => "a2enmod"
-    optional_commands :discmd => "a2dismod"
-    commands :apache2ctl => "apache2ctl"
+  optional_commands encmd: 'a2enmod'
+  optional_commands discmd: 'a2dismod'
+  commands apache2ctl: 'apache2ctl'
 
-    confine :osfamily => :debian
-    defaultfor :operatingsystem => [:debian, :ubuntu]
+  confine osfamily: :debian
+  defaultfor operatingsystem: [:debian, :ubuntu]
 
-    def self.instances
-      modules = apache2ctl("-M").lines.collect { |line|
-        m = line.match(/(\w+)_module \(shared\)$/)
-        m[1] if m
-      }.compact
+  def self.instances
+    modules = apache2ctl('-M').lines.map { |line|
+      m = line.match(%r{(\w+)_module \(shared\)$})
+      m[1] if m
+    }.compact
 
-      modules.map do |mod|
-        new(
-          :name     => mod,
-          :ensure   => :present,
-          :provider => :a2mod
-        )
-      end
+    modules.map do |mod|
+      new(
+        name: mod,
+        ensure: :present,
+        provider: :a2mod,
+      )
     end
+  end
 
-    def create
-        encmd resource[:name]
-    end
+  def create
+    encmd resource[:name]
+  end
 
-    def destroy
-        discmd resource[:name]
-    end
+  def destroy
+    discmd resource[:name]
+  end
 end
diff --git a/lib/puppet/provider/a2mod/gentoo.rb b/lib/puppet/provider/a2mod/gentoo.rb
index 07319dfdc8..4edc3d9d35 100644
--- a/lib/puppet/provider/a2mod/gentoo.rb
+++ b/lib/puppet/provider/a2mod/gentoo.rb
@@ -1,9 +1,9 @@
 require 'puppet/util/filetype'
-Puppet::Type.type(:a2mod).provide(:gentoo, :parent => Puppet::Provider) do
-  desc "Manage Apache 2 modules on Gentoo"
+Puppet::Type.type(:a2mod).provide(:gentoo, parent: Puppet::Provider) do
+  desc 'Manage Apache 2 modules on Gentoo'
 
-  confine :operatingsystem => :gentoo
-  defaultfor :operatingsystem => :gentoo
+  confine operatingsystem: :gentoo
+  defaultfor operatingsystem: :gentoo
 
   attr_accessor :property_hash
 
@@ -12,7 +12,7 @@ def create
   end
 
   def exists?
-    (!(@property_hash[:ensure].nil?) and @property_hash[:ensure] == :present)
+    (!@property_hash[:ensure].nil? && @property_hash[:ensure] == :present)
   end
 
   def destroy
@@ -30,34 +30,34 @@ class << self
   def self.clear
     @mod_resources = []
     @modules       = []
-    @other_args    = ""
+    @other_args    = ''
   end
 
   def self.initvars
-    @conf_file     = "/etc/conf.d/apache2"
+    @conf_file     = '/etc/conf.d/apache2'
     @filetype      = Puppet::Util::FileType.filetype(:flat).new(conf_file)
     @mod_resources = []
     @modules       = []
-    @other_args    = ""
+    @other_args    = ''
   end
 
-  self.initvars
+  initvars
 
   # Retrieve an array of all existing modules
   def self.modules
     if @modules.length <= 0
       # Locate the APACHE_OPTS variable
-      records = filetype.read.split(/\n/)
-      apache2_opts = records.grep(/^\s*APACHE2_OPTS=/).first
+      records = filetype.read.split(%r{\n})
+      apache2_opts = records.grep(%r{^\s*APACHE2_OPTS=}).first
 
       # Extract all defines
-      while apache2_opts.sub!(/-D\s+(\w+)/, '')
-        @modules << $1.downcase
+      while apache2_opts.sub!(%r{-D\s+(\w+)}, '')
+        @modules << Regexp.last_match(1).downcase
       end
 
       # Hang on to any remaining options.
-      if apache2_opts.match(/APACHE2_OPTS="(.+)"/)
-        @other_args = $1.strip
+      if apache2_opts =~ %r{APACHE2_OPTS="(.+)"}
+        @other_args = Regexp.last_match(1).strip
       end
 
       @modules.sort!.uniq!
@@ -66,51 +66,51 @@ def self.modules
     @modules
   end
 
-  def self.prefetch(resources={})
+  def self.prefetch(resources = {})
     # Match resources with existing providers
     instances.each do |provider|
-      if resource = resources[provider.name]
+      resource = resources[provider.name]
+      if resource
         resource.provider = provider
       end
     end
 
     # Store all resources using this provider for flushing
-    resources.each do |name, resource|
+    resources.each do |_name, resource|
       @mod_resources << resource
     end
   end
 
   def self.instances
-    modules.map {|mod| new(:name => mod, :provider => :gentoo, :ensure => :present)}
+    modules.map { |mod| new(name: mod, provider: :gentoo, ensure: :present) }
   end
 
   def self.flush
-
     mod_list       = modules
-    mods_to_remove = @mod_resources.select {|mod| mod.should(:ensure) == :absent}.map {|mod| mod[:name]}
-    mods_to_add    = @mod_resources.select {|mod| mod.should(:ensure) == :present}.map {|mod| mod[:name]}
+    mods_to_remove = @mod_resources.select { |mod| mod.should(:ensure) == :absent }.map { |mod| mod[:name] }
+    mods_to_add    = @mod_resources.select { |mod| mod.should(:ensure) == :present }.map { |mod| mod[:name] }
 
     mod_list -= mods_to_remove
     mod_list += mods_to_add
     mod_list.sort!.uniq!
 
-    if modules != mod_list
-      opts = @other_args + " "
-      opts << mod_list.map {|mod| "-D #{mod.upcase}"}.join(" ")
-      opts.strip!
-      opts.gsub!(/\s+/, ' ')
+    return unless modules != mod_list
 
-      apache2_opts = %Q{APACHE2_OPTS="#{opts}"}
-      Puppet.debug("Writing back \"#{apache2_opts}\" to #{conf_file}")
+    opts = @other_args + ' '
+    opts << mod_list.map { |mod| "-D #{mod.upcase}" }.join(' ')
+    opts.strip!
+    opts.gsub!(%r{\s+}, ' ')
 
-      records = filetype.read.split(/\n/)
+    apache2_opts = %(APACHE2_OPTS="#{opts}")
+    Puppet.debug("Writing back \"#{apache2_opts}\" to #{conf_file}")
 
-      opts_index = records.find_index {|i| i.match(/^\s*APACHE2_OPTS/)}
-      records[opts_index] = apache2_opts
+    records = filetype.read.split(%r{\n})
 
-      filetype.backup
-      filetype.write(records.join("\n"))
-      @modules = mod_list
-    end
+    opts_index = records.find_index { |i| i.match(%r{^\s*APACHE2_OPTS}) }
+    records[opts_index] = apache2_opts
+
+    filetype.backup
+    filetype.write(records.join("\n"))
+    @modules = mod_list
   end
 end
diff --git a/lib/puppet/provider/a2mod/modfix.rb b/lib/puppet/provider/a2mod/modfix.rb
index 8f35b2e4a1..e5f6009532 100644
--- a/lib/puppet/provider/a2mod/modfix.rb
+++ b/lib/puppet/provider/a2mod/modfix.rb
@@ -1,12 +1,12 @@
 Puppet::Type.type(:a2mod).provide :modfix do
-    desc "Dummy provider for A2mod.
+  desc "Dummy provider for A2mod.
 
-    Fake nil resources when there is no crontab binary available. Allows
-    puppetd to run on a bootstrapped machine before a Cron package has been
-    installed. Workaround for: http://projects.puppetlabs.com/issues/2384
-    "
+  Fake nil resources when there is no crontab binary available. Allows
+  puppetd to run on a bootstrapped machine before a Cron package has been
+  installed. Workaround for: http://projects.puppetlabs.com/issues/2384
+  "
 
-    def self.instances
-        []
-    end
-end
\ No newline at end of file
+  def self.instances
+    []
+  end
+end
diff --git a/lib/puppet/provider/a2mod/redhat.rb b/lib/puppet/provider/a2mod/redhat.rb
index ea5494cb48..6b063779b7 100644
--- a/lib/puppet/provider/a2mod/redhat.rb
+++ b/lib/puppet/provider/a2mod/redhat.rb
@@ -1,12 +1,12 @@
 require 'puppet/provider/a2mod'
 
-Puppet::Type.type(:a2mod).provide(:redhat, :parent => Puppet::Provider::A2mod) do
-  desc "Manage Apache 2 modules on RedHat family OSs"
+Puppet::Type.type(:a2mod).provide(:redhat, parent: Puppet::Provider::A2mod) do
+  desc 'Manage Apache 2 modules on RedHat family OSs'
 
-  commands :apachectl => "apachectl"
+  commands apachectl: 'apachectl'
 
-  confine :osfamily => :redhat
-  defaultfor :osfamily => :redhat
+  confine osfamily: :redhat
+  defaultfor osfamily: :redhat
 
   require 'pathname'
 
@@ -18,14 +18,14 @@
   class << self
     attr_accessor :modpath
     def preinit
-      @modpath = "/etc/httpd/mod.d"
+      @modpath = '/etc/httpd/mod.d'
     end
   end
 
-  self.preinit
+  preinit
 
   def create
-    File.open(modfile,'w') do |f|
+    File.open(modfile, 'w') do |f|
       f.puts "LoadModule #{resource[:identifier]} #{libfile}"
     end
   end
@@ -35,26 +35,26 @@ def destroy
   end
 
   def self.instances
-    modules = apachectl("-M").lines.collect { |line|
-      m = line.match(/(\w+)_module \(shared\)$/)
+    modules = apachectl('-M').lines.map { |line|
+      m = line.match(%r{(\w+)_module \(shared\)$})
       m[1] if m
     }.compact
 
     modules.map do |mod|
       new(
-        :name     => mod,
-        :ensure   => :present,
-        :provider => :redhat
+        name: mod,
+        ensure: :present,
+        provider: :redhat,
       )
     end
   end
 
   def modfile
-    modfile ||= "#{self.class.modpath}/#{resource[:name]}.load"
+    "#{self.class.modpath}/#{resource[:name]}.load"
   end
 
   # Set libfile path: If absolute path is passed, then maintain it. Else, make it default from 'modules' dir.
   def libfile
-    libfile = Pathname.new(resource[:lib]).absolute? ? resource[:lib] : "modules/#{resource[:lib]}"
+    Pathname.new(resource[:lib]).absolute? ? resource[:lib] : "modules/#{resource[:lib]}"
   end
 end
diff --git a/lib/puppet/type/a2mod.rb b/lib/puppet/type/a2mod.rb
index 07a911e5ee..0251698964 100644
--- a/lib/puppet/type/a2mod.rb
+++ b/lib/puppet/type/a2mod.rb
@@ -1,30 +1,28 @@
 Puppet::Type.newtype(:a2mod) do
-    @doc = "Manage Apache 2 modules"
+  @doc = 'Manage Apache 2 modules'
 
-    ensurable
+  ensurable
 
-    newparam(:name) do
-       Puppet.warning "The a2mod provider is deprecated, please use apache::mod instead"
-       desc "The name of the module to be managed"
+  newparam(:name) do
+    Puppet.warning 'The a2mod provider is deprecated, please use apache::mod instead'
+    desc 'The name of the module to be managed'
 
-       isnamevar
+    isnamevar
+  end
 
-    end
+  newparam(:lib) do
+    desc 'The name of the .so library to be loaded'
 
-    newparam(:lib) do
-      desc "The name of the .so library to be loaded"
+    defaultto { "mod_#{@resource[:name]}.so" }
+  end
 
-      defaultto { "mod_#{@resource[:name]}.so" }
-    end
- 
-    newparam(:identifier) do
-      desc "Module identifier string used by LoadModule. Default: module-name_module"
+  newparam(:identifier) do
+    desc 'Module identifier string used by LoadModule. Default: module-name_module'
 
-      # http://httpd.apache.org/docs/2.2/mod/module-dict.html#ModuleIdentifier
+    # http://httpd.apache.org/docs/2.2/mod/module-dict.html#ModuleIdentifier
 
-      defaultto { "#{resource[:name]}_module" }
-    end
-
-    autorequire(:package) { catalog.resource(:package, 'httpd')}
+    defaultto { "#{resource[:name]}_module" }
+  end
 
+  autorequire(:package) { catalog.resource(:package, 'httpd') }
 end
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index f83f11ae30..0720be560f 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -2,12 +2,11 @@
 require_relative './version.rb'
 
 describe 'apache parameters' do
-
   # Currently this test only does something on FreeBSD.
   describe 'default_confd_files => false' do
     it 'doesnt do anything' do
       pp = "class { 'apache': default_confd_files => false }"
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     if fact('osfamily') == 'FreeBSD'
@@ -19,7 +18,7 @@
   describe 'default_confd_files => true' do
     it 'copies conf.d files' do
       pp = "class { 'apache': default_confd_files => true }"
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     if fact('osfamily') == 'FreeBSD'
@@ -32,7 +31,7 @@
   describe 'when set adds a listen statement' do
     it 'applys cleanly' do
       pp = "class { 'apache': ip => '10.1.1.1', service_ensure => stopped }"
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($ports_file) do
@@ -42,20 +41,20 @@
   end
 
   describe 'service tests => true' do
-    it 'starts the service' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           service_enable => true,
           service_manage => true,
           service_ensure => running,
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'starts the service' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
       it { is_expected.to be_running }
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
         it { is_expected.to be_enabled }
@@ -64,19 +63,19 @@ class { 'apache':
   end
 
   describe 'service tests => false' do
-    it 'stops the service' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           service_enable => false,
           service_ensure => stopped,
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'stops the service' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
       it { is_expected.not_to be_running }
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
         it { is_expected.not_to be_enabled }
@@ -85,20 +84,20 @@ class { 'apache':
   end
 
   describe 'service manage => false' do
-    it 'we dont manage the service, so it shouldnt start the service' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           service_enable => true,
           service_manage => false,
           service_ensure => true,
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'we dont manage the service, so it shouldnt start the service' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
       it { is_expected.not_to be_running }
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
         it { is_expected.not_to be_enabled }
@@ -107,17 +106,17 @@ class { 'apache':
   end
 
   describe 'purge parameters => false' do
-    it 'applies cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           purge_configs   => false,
           purge_vhost_dir => false,
           vhost_dir       => "#{$confd_dir}.vhosts"
         }
-      EOS
+    MANIFEST
+    it 'applies cleanly' do
       shell("touch #{$confd_dir}/test.conf")
       shell("mkdir -p #{$confd_dir}.vhosts && touch #{$confd_dir}.vhosts/test.conf")
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     # Ensure the files didn't disappear.
@@ -131,17 +130,17 @@ class { 'apache':
 
   if fact('osfamily') != 'Debian'
     describe 'purge parameters => true' do
-      it 'applies cleanly' do
-        pp = <<-EOS
+      pp = <<-MANIFEST
           class { 'apache':
             purge_configs   => true,
             purge_vhost_dir => true,
             vhost_dir       => "#{$confd_dir}.vhosts"
           }
-        EOS
+      MANIFEST
+      it 'applies cleanly' do
         shell("touch #{$confd_dir}/test.conf")
         shell("mkdir -p #{$confd_dir}.vhosts && touch #{$confd_dir}.vhosts/test.conf")
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
 
       # File should be gone
@@ -157,7 +156,7 @@ class { 'apache':
   describe 'serveradmin' do
     it 'applies cleanly' do
       pp = "class { 'apache': serveradmin => 'test@example.com' }"
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($vhost) do
@@ -170,7 +169,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': sendfile => 'On' }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -182,7 +181,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': sendfile => 'Off' }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -196,7 +195,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': error_documents => true }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -210,7 +209,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': timeout => '1234' }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -222,12 +221,12 @@ class { 'apache':
 
   describe 'httpd_dir' do
     describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
+      pp = <<-MANIFEST
           class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
           include 'apache::mod::mime'
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'applies cleanly' do
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -241,11 +240,11 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     # Actually >= 2.4.24, but the minor version is not provided
     # https://bugs.launchpad.net/ubuntu/+source/apache2/2.4.7-1ubuntu4.15
     # basically versions of the ubuntu or sles  apache package cause issue
-    if $apache_version >= '2.4' && fact('operatingsystem') !~ /Ubuntu|SLES/
+    if $apache_version >= '2.4' && fact('operatingsystem') !~ %r{Ubuntu|SLES}
       describe 'setup' do
         it 'applies cleanly' do
           pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"
-          apply_manifest(pp, :catch_failures => true)
+          apply_manifest(pp, catch_failures: true)
         end
       end
 
@@ -260,7 +259,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': server_root => '/tmp/root', service_ensure => stopped }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -274,7 +273,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': confd_dir => '/tmp/root', service_ensure => stopped, use_optional_includes => true }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -297,7 +296,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
         pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }"
         shell("mkdir -p #{default['distmoduledir']}/another/templates")
         shell("echo 'testcontent' >> #{default['distmoduledir']}/another/templates/test.conf.erb")
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -311,7 +310,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': servername => 'test.server', service_ensure => stopped }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -323,16 +322,16 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
 
   describe 'user' do
     describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
+      pp = <<-MANIFEST
           class { 'apache':
             manage_user  => true,
             manage_group => true,
             user         => 'testweb',
             group        => 'testweb',
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'applies cleanly' do
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -348,16 +347,16 @@ class { 'apache':
 
   describe 'logformats' do
     describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
+      pp = <<-MANIFEST
           class { 'apache':
             log_formats => {
               'vhost_common'   => '%v %h %l %u %t \\\"%r\\\" %>s %b',
               'vhost_combined' => '%v %h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\"',
             }
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'applies cleanly' do
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -368,12 +367,11 @@ class { 'apache':
     end
   end
 
-
   describe 'keepalive' do
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': keepalive => 'Off', keepalive_timeout => '30', max_keepalive_requests => '200' }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -389,7 +387,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': limitreqfieldsize => '16830' }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -403,7 +401,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': limitreqfields => '120' }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -415,8 +413,7 @@ class { 'apache':
 
   describe 'logging' do
     describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
+      pp = <<-MANIFEST
           if $::osfamily == 'RedHat' and "$::selinux" == "true" {
             $semanage_package = $::operatingsystemmajrelease ? {
               '5'     => 'policycoreutils',
@@ -438,8 +435,9 @@ class { 'apache':
           }
           file { '/apache_spec': ensure => directory, }
           class { 'apache': logroot => '/apache_spec' }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'applies cleanly' do
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
@@ -449,16 +447,16 @@ class { 'apache': logroot => '/apache_spec' }
   end
 
   describe 'ports_file' do
-    it 'applys cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         file { '/apache_spec': ensure => directory, }
         class { 'apache':
           ports_file     => '/apache_spec/ports_file',
           ip             => '10.1.1.1',
           service_ensure => stopped
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file('/apache_spec/ports_file') do
@@ -468,13 +466,13 @@ class { 'apache':
   end
 
   describe 'server_tokens' do
-    it 'applys cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           server_tokens  => 'Minor',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($conf_file) do
@@ -484,14 +482,14 @@ class { 'apache':
   end
 
   describe 'server_signature' do
-    it 'applys cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           server_signature  => 'testsig',
           service_ensure    => stopped,
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($conf_file) do
@@ -501,13 +499,13 @@ class { 'apache':
   end
 
   describe 'trace_enable' do
-    it 'applys cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           trace_enable  => 'Off',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($conf_file) do
@@ -517,13 +515,13 @@ class { 'apache':
   end
 
   describe 'file_e_tag' do
-    it 'applys cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           file_e_tag  => 'None',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($conf_file) do
@@ -533,18 +531,17 @@ class { 'apache':
   end
 
   describe 'package_ensure' do
-    it 'applys cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           package_ensure  => present,
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe package($package_name) do
       it { is_expected.to be_installed }
     end
   end
-
 end
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 0eab1de107..63a44e7ea8 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -2,10 +2,8 @@
 require_relative './version.rb'
 
 describe 'apache ssl' do
-
   describe 'ssl parameters' do
-    it 'runs without error' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           service_ensure        => stopped,
           default_ssl_vhost     => true,
@@ -17,9 +15,10 @@ class { 'apache':
           default_ssl_crl       => '/tmp/ssl_crl',
           default_ssl_crl_check => 'chain',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
+    MANIFEST
+    it 'runs without error' do
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
     end
 
     describe file("#{$vhost_dir}/15-default-ssl.conf") do
@@ -39,8 +38,7 @@ class { 'apache':
   end
 
   describe 'vhost ssl parameters' do
-    it 'runs without error' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           service_ensure       => stopped,
         }
@@ -65,9 +63,10 @@ class { 'apache':
           ssl_proxyengine      => true,
           ssl_proxy_protocol   => 'TLSv1.2',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
+    MANIFEST
+    it 'runs without error' do
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
     end
 
     describe file("#{$vhost_dir}/25-test_ssl.conf") do
@@ -95,8 +94,7 @@ class { 'apache':
   end
 
   describe 'vhost ssl ssl_ca only' do
-    it 'runs without error' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           service_ensure       => stopped,
         }
@@ -109,9 +107,10 @@ class { 'apache':
           ssl_ca               => '/tmp/ssl_ca',
           ssl_verify_client    => 'test',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
+    MANIFEST
+    it 'runs without error' do
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
     end
 
     describe file("#{$vhost_dir}/25-test_ssl_ca_only.conf") do
@@ -124,8 +123,7 @@ class { 'apache':
   end
 
   describe 'vhost ssl ssl_certs_dir' do
-    it 'runs without error' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache':
           service_ensure       => stopped,
         }
@@ -138,9 +136,10 @@ class { 'apache':
           ssl_certs_dir        => '/tmp',
           ssl_verify_client    => 'test',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
+    MANIFEST
+    it 'runs without error' do
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
     end
 
     describe file("#{$vhost_dir}/25-test_ssl_certs_dir_only.conf") do
@@ -152,5 +151,4 @@ class { 'apache':
       it { is_expected.not_to contain 'SSLCACertificateFile' }
     end
   end
-
 end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index d67b1a878c..f085896dbd 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -5,19 +5,19 @@
   context 'default parameters' do
     let(:pp) { "class { 'apache': }" }
 
-    it_behaves_like "a idempotent resource"
+    it_behaves_like 'a idempotent resource'
 
     describe 'apache_version fact' do
-      before :all do
-        apply_manifest("include apache", :catch_failures => true)
-        version_check_pp = <<-EOS
+      let(:result) do
+        apply_manifest('include apache', catch_failures: true)
+        version_check_pp = <<-MANIFEST
         notice("apache_version = >${apache_version}<")
-        EOS
-        @result = apply_manifest(version_check_pp, :catch_failures => true)
+        MANIFEST
+        apply_manifest(version_check_pp, catch_failures: true)
       end
 
       it {
-        expect(@result.output).to match(/apache_version = >#{$apache_version}.*</)
+        expect(result.output).to match(%r{apache_version = >#{$apache_version}.*<})
       }
     end
 
@@ -26,23 +26,23 @@
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe port(80) do
-      it { should be_listening }
+      it { is_expected.to be_listening }
     end
   end
 
   context 'custom site/mod dir parameters' do
     # Using puppet_apply as a helper
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
         if $::osfamily == 'RedHat' and "$::selinux" == "true" {
           $semanage_package = $::operatingsystemmajrelease ? {
             '5'     => 'policycoreutils',
@@ -71,17 +71,17 @@ class { 'apache':
           mod_dir   => '/apache_spec/apache_custom/mods',
           vhost_dir => '/apache_spec/apache_custom/vhosts',
         }
-      EOS
+      MANIFEST
     end
 
     # Run it twice and test for idempotency
-    it_behaves_like "a idempotent resource"
+    it_behaves_like 'a idempotent resource'
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index e3668c0165..799fdc1646 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -3,15 +3,14 @@
 
 describe 'apache::custom_config define' do
   context 'invalid config' do
-    it 'should not add the config' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache': }
         apache::custom_config { 'acceptance_test':
           content => 'INVALID',
         }
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
+    MANIFEST
+    it 'does not add the config' do
+      apply_manifest(pp, expect_failures: true)
     end
 
     describe file("#{$confd_dir}/25-acceptance_test.conf") do
@@ -20,15 +19,14 @@ class { 'apache': }
   end
 
   context 'valid config' do
-    it 'should add the config' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache': }
         apache::custom_config { 'acceptance_test':
           content => '# just a comment',
         }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'adds the config' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$confd_dir}/25-acceptance_test.conf") do
@@ -37,16 +35,15 @@ class { 'apache': }
   end
 
   context 'with a custom filename' do
-    it 'should store content in the described file' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache': }
         apache::custom_config { 'filename_test':
           filename => 'custom_filename',
           content  => '# just another comment',
         }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'stores content in the described file' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$confd_dir}/custom_filename") do
@@ -55,15 +52,15 @@ class { 'apache': }
   end
 
   describe 'custom_config without priority prefix' do
-    it 'applies cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache': }
         apache::custom_config { 'prefix_test':
           priority => false,
           content => '# just a comment',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'applies cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$confd_dir}/prefix_test.conf") do
@@ -72,8 +69,7 @@ class { 'apache': }
   end
 
   describe 'custom_config only applied after configs are written' do
-    it 'applies in the right order' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache': }
 
         apache::custom_config { 'ordering_test':
@@ -83,8 +79,9 @@ class { 'apache': }
         # Try to wedge the apache::custom_config call between when httpd.conf is written and
         # ports.conf is written. This should trigger a dependency cycle
         File["#{$conf_file}"] -> Apache::Custom_config['ordering_test'] -> Concat["#{$ports_file}"]
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Found 1 dependency cycle/i)
+    MANIFEST
+    it 'applies in the right order' do
+      expect(apply_manifest(pp, expect_failures: true).stderr).to match(%r{Found 1 dependency cycle}i)
     end
 
     describe file("#{$confd_dir}/25-ordering_test.conf") do
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 35706c9a28..b6a52fb6e8 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -5,21 +5,21 @@
   describe 'no default mods' do
     # Using puppet_apply as a helper
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
         class { 'apache':
           default_mods => false,
         }
-      EOS
+      MANIFEST
     end
 
     # Run it twice and test for idempotency
-    it_behaves_like "a idempotent resource"
+    it_behaves_like 'a idempotent resource'
     describe service($service_name) do
       it { is_expected.to be_running }
     end
   end
 
-  unless (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12')
+  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12'
     describe 'no default mods and failing' do
       before :all do
         pp = <<-PP
@@ -29,8 +29,7 @@ class { 'apache': default_mods => false, service_ensure => stopped, }
         apply_manifest(pp)
       end
       # Using puppet_apply as a helper
-      it 'should apply with errors' do
-        pp = <<-EOS
+      pp = <<-MANIFEST
           class { 'apache':
             default_mods => false,
           }
@@ -48,11 +47,11 @@ class { 'apache':
             ],
             setenv      => 'TEST1 one',
           }
-        EOS
-
-        apply_manifest(pp, { :expect_failures => true })
+      MANIFEST
+      it 'applies with errors' do
+        apply_manifest(pp, expect_failures: true)
       end
-  end
+    end
 
     describe service($service_name) do
       it { is_expected.not_to be_running }
@@ -62,7 +61,7 @@ class { 'apache':
   describe 'alternative default mods' do
     # Using puppet_apply as a helper
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
         class { 'apache':
           default_mods => [
             'info',
@@ -80,9 +79,10 @@ class { 'apache':
           },
           setenv  => 'TEST1 one',
         }
-      EOS
+      MANIFEST
     end
-    it_behaves_like "a idempotent resource"
+
+    it_behaves_like 'a idempotent resource'
 
     describe service($service_name) do
       it { is_expected.to be_running }
@@ -91,15 +91,16 @@ class { 'apache':
 
   describe 'change loadfile name' do
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
         class { 'apache': default_mods => false }
         ::apache::mod { 'auth_basic':
           loadfile_name => 'zz_auth_basic.load',
         }
-      EOS
+      MANIFEST
     end
+
     # Run it twice and test for idempotency
-    it_behaves_like "a idempotent resource"
+    it_behaves_like 'a idempotent resource'
     describe service($service_name) do
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index ef87c948bf..0086d1fc60 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -3,15 +3,14 @@
 
 describe 'apache tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && fact('operatingsystem') != 'SLES' do
   describe 'reload' do
-    it 'execute reload' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
       class { 'apache':
         default_vhost => false,
       }
       apache::listen { '9090':}
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'execute reload' do
+      apply_manifest(pp, catch_failures: true)
 
       result = run_task(task_name: 'apache', params: 'action=reload')
       expect_multiple_regexes(result: result, regexes: [%r{reload successful}, %r{Job completed. 1/1 nodes succeeded|Ran on 1 node}])
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 059589a3f0..1f698fd9c4 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -4,57 +4,58 @@
 when 'Debian'
   service_name = 'apache2'
   majrelease = fact('operatingsystemmajrelease')
-  if ['6', '7', '10.04', '12.04'].include?(majrelease)
-    variant = :itk_only
-  else
-    variant = :prefork
-  end
+  variant = if ['6', '7', '10.04', '12.04'].include?(majrelease)
+              :itk_only
+            else
+              :prefork
+            end
 when 'RedHat'
   unless fact('operatingsystemmajrelease') == '5'
     service_name = 'httpd'
     majrelease = fact('operatingsystemmajrelease')
-    if ['6'].include?(majrelease)
-      variant = :itk_only
-    else
-      variant = :prefork
-    end
+    variant = if ['6'].include?(majrelease)
+                :itk_only
+              else
+                :prefork
+              end
   end
 when 'FreeBSD'
   service_name = 'apache24'
-  majrelease = fact('operatingsystemmajrelease')
+  # majrelease = fact('operatingsystemmajrelease')
   variant = :prefork
 end
 
-describe 'apache::mod::itk class', :if => service_name do
+describe 'apache::mod::itk class', if: service_name do
   describe 'running puppet code' do
     # Using puppet_apply as a helper
     let(:pp) do
       case variant
-        when :prefork
-          <<-EOS
+      when :prefork
+        <<-MANIFEST
             class { 'apache':
               mpm_module => 'prefork',
             }
             class { 'apache::mod::itk': }
-          EOS
-        when :itk_only
-          <<-EOS
+          MANIFEST
+      when :itk_only
+        <<-MANIFEST
             class { 'apache':
               mpm_module => 'itk',
             }
-          EOS
-        end
+          MANIFEST
+      end
     end
+
     # Run it twice and test for idempotency
-    it_behaves_like "a idempotent resource"
+    it_behaves_like 'a idempotent resource'
   end
 
   describe service(service_name) do
     it { is_expected.to be_running }
-    if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+    if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
       pending 'Should be enabled - Bug 760616 on Debian 8'
     else
-      it { should be_enabled }
+      it { is_expected.to be_enabled }
     end
   end
 end
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 73c80e622c..3d5976607c 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -1,10 +1,11 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') || (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajrelease') < '11') do
+describe 'apache::mod::dav_svn class', unless: (fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7') ||
+                                               (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajorrelease') < '11') do
   case fact('osfamily')
   when 'Debian'
-    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04' or fact('operatingsystemmajrelease') == '16.04'
+    if fact('operatingsystemmajrelease') == '6' || fact('operatingsystemmajrelease') == '10.04' || fact('operatingsystemrelease') == '10.04' || fact('operatingsystemmajrelease') == '16.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'
@@ -13,51 +14,51 @@
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   end
 
-  context "default dav_svn config" do
-    it 'succeeds in puppeting dav_svn' do
-      pp= <<-EOS
+  context 'default dav_svn config' do
+    pp = <<-MANIFEST
         class { 'apache': }
         include apache::mod::dav_svn
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting dav_svn' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/dav_svn.load") do
-      it { is_expected.to contain "LoadModule dav_svn_module" }
+      it { is_expected.to contain 'LoadModule dav_svn_module' }
     end
   end
 
-  context "dav_svn with enabled authz_svn config" do
-    it 'succeeds in puppeting dav_svn' do
-      pp= <<-EOS
+  context 'dav_svn with enabled authz_svn config' do
+    pp = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::dav_svn':
             authz_svn_enabled => true,
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting dav_svn' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/#{authz_svn_load_file}") do
-      it { is_expected.to contain "LoadModule authz_svn_module" }
+      it { is_expected.to contain 'LoadModule authz_svn_module' }
     end
   end
 end
diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
index 1b55e087a1..52e04bee19 100644
--- a/spec/acceptance/mod_deflate_spec.rb
+++ b/spec/acceptance/mod_deflate_spec.rb
@@ -2,32 +2,32 @@
 require_relative './version.rb'
 
 describe 'apache::mod::deflate class' do
-  context "default deflate config" do
-    it 'succeeds in puppeting deflate' do
-      pp= <<-EOS
+  context 'default deflate config' do
+    pp = <<-MANIFEST
         class { 'apache': }
         include apache::mod::deflate
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting deflate' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/deflate.conf") do
-      it { is_expected.to contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" }
-      it { is_expected.to contain "AddOutputFilterByType DEFLATE text/css" }
-      it { is_expected.to contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" }
-      it { is_expected.to contain "AddOutputFilterByType DEFLATE application/rss+xml" }
-      it { is_expected.to contain "DeflateFilterNote Input instream" }
-      it { is_expected.to contain "DeflateFilterNote Output outstream" }
-      it { is_expected.to contain "DeflateFilterNote Ratio ratio" }
+      it { is_expected.to contain 'AddOutputFilterByType DEFLATE text/html text/plain text/xml' }
+      it { is_expected.to contain 'AddOutputFilterByType DEFLATE text/css' }
+      it { is_expected.to contain 'AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript' }
+      it { is_expected.to contain 'AddOutputFilterByType DEFLATE application/rss+xml' }
+      it { is_expected.to contain 'DeflateFilterNote Input instream' }
+      it { is_expected.to contain 'DeflateFilterNote Output outstream' }
+      it { is_expected.to contain 'DeflateFilterNote Ratio ratio' }
     end
   end
 end
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index ce3b5b5b27..751628bb8b 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::fcgid class', :if => ((fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') and !(fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7')) do
-  context "default fcgid config" do
-    it 'succeeds in puppeting fcgid' do
-      pp = <<-EOS
+describe 'apache::mod::fcgid class', if: ((fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') != '5') &&
+                                         !(fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7')) do
+  context 'default fcgid config' do
+    pp = <<-MANIFEST
         class { 'epel': } # mod_fcgid lives in epel
         class { 'apache': }
         class { 'apache::mod::php': } # For /usr/bin/php-cgi
@@ -34,8 +34,9 @@ class { 'apache::mod::fcgid':
           group   => 'root',
           content => "<?php echo 'Hello world'; ?>\\n",
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting fcgid' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service('httpd') do
@@ -43,15 +44,15 @@ class { 'apache::mod::fcgid':
       it { is_expected.to be_running }
     end
 
-    it 'should answer to fcgid.example.com' do
+    it 'answers to fcgid.example.com' do # rubocop:disable RSpec/MultipleExpectations
       shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
-        expect(r.stdout).to match(/^Hello world$/)
+        expect(r.stdout).to match(%r{^Hello world$})
         expect(r.exit_code).to eq(0)
       end
     end
 
-    it 'should run a php-cgi process' do
-      shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0])
+    it 'runs a php-cgi process' do
+      shell('pgrep -u apache php-cgi', acceptable_exit_codes: [0])
     end
   end
 end
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index f8bc7c15c0..fd74b3d6a9 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -2,26 +2,26 @@
 require_relative './version.rb'
 
 describe 'apache::mod::mime class' do
-  context "default mime config" do
-    it 'succeeds in puppeting mime' do
-      pp= <<-EOS
+  context 'default mime config' do
+    pp = <<-MANIFEST
         class { 'apache': }
         include apache::mod::mime
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting mime' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/mime.conf") do
-      it { is_expected.to contain "AddType application/x-compress .Z" }
+      it { is_expected.to contain 'AddType application/x-compress .Z' }
       it { is_expected.to contain "AddHandler type-map var\n" }
       it { is_expected.to contain "AddType text/html .shtml\n" }
       it { is_expected.to contain "AddOutputFilter INCLUDES .shtml\n" }
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
index 56c29e3187..e8e793f874 100644
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -2,77 +2,79 @@
 require_relative './version.rb'
 
 describe 'apache::mod::negotiation class' do
-  context "default negotiation config" do
-    it 'succeeds in puppeting negotiation' do
-      pp= <<-EOS
+  context 'default negotiation config' do
+    pp = <<-MANIFEST
         class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation': }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting negotiation' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$mod_dir}/negotiation.conf") do
-      it { should contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
-ForceLanguagePriority Prefer Fallback" }
+      it {
+        is_expected.to contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+ForceLanguagePriority Prefer Fallback"
+      }
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
-      it { should be_running }
+      it { is_expected.to be_running }
     end
   end
 
-  context "with alternative force_language_priority" do
-    it 'succeeds in puppeting negotiation' do
-      pp= <<-EOS
+  context 'with alternative force_language_priority' do
+    pp = <<-MANIFEST
         class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation':
           force_language_priority => 'Prefer',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting negotiation' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$mod_dir}/negotiation.conf") do
-      it { should contain "ForceLanguagePriority Prefer" }
+      it { is_expected.to contain 'ForceLanguagePriority Prefer' }
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
-      it { should be_running }
+      it { is_expected.to be_running }
     end
   end
 
-  context "with alternative language_priority" do
-    it 'succeeds in puppeting negotiation' do
-      pp= <<-EOS
+  context 'with alternative language_priority' do
+    pp = <<-MANIFEST
         class { '::apache': default_mods => false }
         class { '::apache::mod::negotiation':
           language_priority => [ 'en', 'es' ],
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting negotiation' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$mod_dir}/negotiation.conf") do
-      it { should contain "LanguagePriority en es" }
+      it { is_expected.to contain 'LanguagePriority en es' }
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
-      it { should be_running }
+      it { is_expected.to be_running }
     end
   end
 end
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 1455d5630b..a33d42c227 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -3,12 +3,10 @@
 
 # Only run the test on centos 7, this is to cut down on the different types of setup
 # required. Installing the dependancies are highly prone to failure.
-describe 'apache::mod::pagespeed class', :if =>
-  ((fact('operatingsystem') == 'CentOS' ) and
-   (fact('operatingsystemmajrelease') == '7' )) do
-  context "default pagespeed config" do
-    it 'succeeds in puppeting pagespeed' do
-      pp= <<-EOS
+describe 'apache::mod::pagespeed class', if:   ((fact('operatingsystem') == 'CentOS') &&
+   (fact('operatingsystemmajrelease') == '7')) do
+  context 'default pagespeed config' do
+    pp = <<-MANIFEST
        yumrepo { 'mod-pagespeed':
         baseurl  => "http://dl.google.com/linux/mod-pagespeed/rpm/stable/$::architecture",
           enabled  => 1,
@@ -34,26 +32,27 @@ class { 'apache::mod::pagespeed':
           ensure  => file,
           content => "<html>\n<!-- comment -->\n<body>\n<p>Hello World!</p>\n</body>\n</html>",
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting pagespeed' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      it { should be_enabled }
+      it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/pagespeed.conf") do
-      it { is_expected.to contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" }
-      it { is_expected.to contain "ModPagespeedEnableFilters remove_comments" }
-      it { is_expected.to contain "ModPagespeedDisableFilters extend_cache" }
-      it { is_expected.to contain "ModPagespeedForbidFilters rewrite_javascript" }
+      it { is_expected.to contain 'AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html' }
+      it { is_expected.to contain 'ModPagespeedEnableFilters remove_comments' }
+      it { is_expected.to contain 'ModPagespeedDisableFilters extend_cache' }
+      it { is_expected.to contain 'ModPagespeedForbidFilters rewrite_javascript' }
     end
 
-    it 'should answer to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
-      shell("/usr/bin/curl pagespeed.example.com:80") do |r|
-        expect(r.stdout).to match(/<head\/>/)
-        expect(r.stdout).not_to match(/<!-- comment -->/)
+    it 'answers to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do # rubocop:disable RSpec/MultipleExpectations
+      shell('/usr/bin/curl pagespeed.example.com:80') do |r|
+        expect(r.stdout).to match(%r{head\/})
+        expect(r.stdout).not_to match(%r{<!-- comment -->})
         expect(r.exit_code).to eq(0)
       end
     end
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 8a38920966..1f89477b57 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -10,35 +10,25 @@
     case fact('operatingsystem')
     when 'Ubuntu'
       case fact('lsbdistrelease')
-      when '10.04'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      when '12.04'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
       when '14.04'
-        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_ruby         = '/usr/bin/ruby'
+        passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
         passenger_default_ruby = '/usr/bin/ruby'
       when '16.04'
-        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_ruby         = '/usr/bin/ruby'
+        passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
         passenger_default_ruby = '/usr/bin/ruby'
       else
+        # Includes 10.04 and 12.04
         # This may or may not work on Ubuntu releases other than the above
         passenger_root = '/usr'
         passenger_ruby = '/usr/bin/ruby'
       end
     when 'Debian'
       case fact('lsbdistcodename')
-      when 'wheezy'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
       when 'jessie'
-        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_ruby         = '/usr/bin/ruby'
+        passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
         passenger_default_ruby = '/usr/bin/ruby'
       else
+        # Includes wheezy
         # This may or may not work on Debian releases other than the above
         passenger_root = '/usr'
         passenger_ruby = '/usr/bin/ruby'
@@ -59,7 +49,7 @@
     rackapp_group = 'apache'
   end
 
-  pp_rackapp = <<-EOS
+  pp_rackapp = <<-MANIFEST
     /* a simple ruby rack 'hello world' app */
     file { '/var/www/passenger':
       ensure => directory,
@@ -80,126 +70,123 @@
       require       => File['/var/www/passenger/config.ru'],
     }
     host { 'passenger.example.com': ip => '127.0.0.1', }
-  EOS
+  MANIFEST
 
   case fact('osfamily')
   when 'Debian'
     context 'passenger config with passenger_installed_version set' do
-      it 'should fail when an option is not valid for $passenger_installed_version' do
-        pp = <<-EOS
+      pp_one = <<-MANIFEST
           class { 'apache': }
           class { 'apache::mod::passenger':
             passenger_installed_version     => '4.0.0',
             passenger_instance_registry_dir => '/some/path/to/nowhere'
           }
-        EOS
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/passenger_instance_registry_dir is not introduced until version 5.0.0/)
+      MANIFEST
+      it 'fails when an option is not valid for $passenger_installed_version' do
+        apply_manifest(pp_one, expect_failures: true) do |r|
+          expect(r.stderr).to match(%r{passenger_instance_registry_dir is not introduced until version 5.0.0})
         end
       end
-      it 'should fail when an option is removed' do
-        pp = <<-EOS
+      pp_two = <<-MANIFEST
           class { 'apache': }
           class { 'apache::mod::passenger':
             passenger_installed_version => '5.0.0',
             rails_autodetect            => 'on'
           }
-        EOS
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/REMOVED PASSENGER OPTION/)
+      MANIFEST
+      it 'fails when an option is removed' do
+        apply_manifest(pp_two, expect_failures: true) do |r|
+          expect(r.stderr).to match(%r{REMOVED PASSENGER OPTION})
         end
       end
-      it 'should warn when an option is deprecated' do
-        pp = <<-EOS
+      pp_three = <<-MANIFEST
           class { 'apache': }
           class { 'apache::mod::passenger':
             passenger_installed_version => '5.0.0',
             rails_ruby                  => '/some/path/to/ruby'
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stderr).to match(/DEPRECATED PASSENGER OPTION/)
+      MANIFEST
+      it 'warns when an option is deprecated' do
+        apply_manifest(pp_three, catch_failures: true) do |r|
+          expect(r.stderr).to match(%r{DEPRECATED PASSENGER OPTION})
         end
       end
     end
-      context "default passenger config" do
-        it 'succeeds in puppeting passenger' do
-          pp = <<-EOS
+    context 'default passenger config' do
+      pp = <<-MANIFEST
           /* stock apache and mod_passenger */
           class { 'apache': }
           class { 'apache::mod::passenger': }
           #{pp_rackapp}
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'succeeds in puppeting passenger' do
+        apply_manifest(pp, catch_failures: true)
       end
 
       describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
         it { is_expected.to be_running }
       end
 
       describe file(conf_file) do
-        it { is_expected.to contain "PassengerRoot \"#{passenger_root}\"" }
+        it { is_expected.to contain %(PassengerRoot "#{passenger_root}") }
 
+        # rubocop:disable RSpec/RepeatedExample
         case fact('operatingsystem')
         when 'Ubuntu'
           case fact('lsbdistrelease')
-          when '10.04'
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
-          when '12.04'
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           when '14.04'
-            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerRuby/" }
+            it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
+            it { is_expected.not_to contain '/PassengerRuby/' }
           when '16.04'
-            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerRuby/" }
+            it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
+            it { is_expected.not_to contain '/PassengerRuby/' }
           else
+            # Includes 10.04 and 12.04
             # This may or may not work on Ubuntu releases other than the above
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+            it { is_expected.to contain %(PassengerRuby "#{passenger_ruby}) }
+            it { is_expected.not_to contain '/PassengerDefaultRuby/' }
           end
         when 'Debian'
           case fact('lsbdistcodename')
-          when 'wheezy'
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
           when 'jessie'
-            it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerRuby/" }
+            it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
+            it { is_expected.not_to contain '/PassengerRuby/' }
           else
+            # Includes wheezy
             # This may or may not work on Debian releases other than the above
-            it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { is_expected.not_to contain "/PassengerDefaultRuby/" }
+            it { is_expected.to contain %(PassengerRuby "#{passenger_ruby}) }
+            it { is_expected.not_to contain '/PassengerDefaultRuby/' }
           end
         end
       end
+      # rubocop:enable RSpec/RepeatedExample
 
       describe file(load_file) do
         it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
       end
 
-      it 'should output status via passenger-memory-stats' do
-        shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats") do |r|
-          expect(r.stdout).to match(/Apache processes/)
-          expect(r.stdout).to match(/Nginx processes/)
-          expect(r.stdout).to match(/Passenger processes/)
-
-          # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
-          # these two lines
-          unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or
-                 (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
-                 (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'))
-            expect(r.stdout).to match(/### Processes: [0-9]+/)
-            expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/)
+      expected_one = [%r{Apache processes}, %r{Nginx processes}, %r{Passenger processes}]
+      # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
+      # these two lines
+      unless (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') ||
+             (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
+             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        expected_one < [%r{### Processes: [0-9]+}, %r{### Total private dirty RSS: [0-9\.]+ MB}]
+      end
+      it 'outputs status via passenger-memory-stats #stdout' do
+        expected_one.each do |expect|
+          shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats') do |r|
+            expect(r.stdout).to match(expect)
           end
-
+        end
+      end
+      it 'outputs status via passenger-memory-stats #exit_code' do
+        shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats') do |r|
           expect(r.exit_code).to eq(0)
         end
       end
@@ -207,37 +194,43 @@ class { 'apache::mod::passenger': }
       # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
       # even when the passenger process is successfully installed and running
       unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
-        it 'should output status via passenger-status' do
-          # xml output not available on ubunutu <= 10.04, so sticking with default pool output
-          shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r|
+        it 'outputs status via passenger-status #General information' do
+          shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-status') do |r|
             # spacing may vary
-            expect(r.stdout).to match(/[\-]+ General information [\-]+/)
-            if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' or
-               (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or
-               fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-              expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/)
-              expect(r.stdout).to match(/Processes[ ]+: [0-9]+/)
-              expect(r.stdout).to match(/Requests in top-level queue[ ]+: [0-9]+/)
-            else
-              expect(r.stdout).to match(/max[ ]+= [0-9]+/)
-              expect(r.stdout).to match(/count[ ]+= [0-9]+/)
-              expect(r.stdout).to match(/active[ ]+= [0-9]+/)
-              expect(r.stdout).to match(/inactive[ ]+= [0-9]+/)
-              expect(r.stdout).to match(/Waiting on global queue: [0-9]+/)
+            expect(r.stdout).to match(%r{[\-]+ General information [\-]+})
+          end
+        end
+        expected_two = if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' ||
+                          (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
+                          fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+                         [%r{Max pool size[ ]+: [0-9]+}, %r{Processes[ ]+: [0-9]+}, %r{Requests in top-level queue[ ]+: [0-9]+}]
+                       else
+                         [%r{max[ ]+= [0-9]+}, %r{count[ ]+= [0-9]+}, %r{active[ ]+= [0-9]+}, %r{inactive[ ]+= [0-9]+}, %r{Waiting on global queue: [0-9]+}]
+                       end
+        it 'outputs status via passenger-status #stdout' do
+          shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-status') do |r|
+            expected_two.each do |expect|
+              expect(r.stdout).to match(expect)
             end
-
+          end
+        end
+        it 'outputs status via passenger-status #exit_code' do
+          shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-status') do |r|
             expect(r.exit_code).to eq(0)
           end
         end
       end
 
-      it 'should answer to passenger.example.com' do
-        shell("/usr/bin/curl passenger.example.com:80") do |r|
-          expect(r.stdout).to match(/^hello <b>world<\/b>$/)
+      it 'answers to passenger.example.com #stdout' do
+        shell('/usr/bin/curl passenger.example.com:80') do |r|
+          expect(r.stdout).to match(%r{^hello <b>world<\/b>$})
+        end
+      end
+      it 'answers to passenger.example.com #exit_code' do
+        shell('/usr/bin/curl passenger.example.com:80') do |r|
           expect(r.exit_code).to eq(0)
         end
       end
-
     end
   end
 end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 59be2baaa3..f6f8fcdbd4 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,11 +1,10 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-unless (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12')
+unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12'
   describe 'apache::mod::php class' do
-    context "default php config" do
-      it 'succeeds in puppeting php' do
-        pp= <<-EOS
+    context 'default php config' do
+      pp = <<-MANIFEST
           class { 'apache':
             mpm_module => 'prefork',
           }
@@ -19,40 +18,44 @@ class { 'apache::mod::php': }
             ensure  => file,
             content => "<?php phpinfo(); ?>\\n",
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'succeeds in puppeting php' do
+        apply_manifest(pp, catch_failures: true)
       end
 
       describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
         it { is_expected.to be_running }
       end
 
-      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+      if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04'
         describe file("#{$mod_dir}/php7.0.conf") do
-          it { is_expected.to contain "DirectoryIndex index.php" }
+          it { is_expected.to contain 'DirectoryIndex index.php' }
         end
       else
         describe file("#{$mod_dir}/php5.conf") do
-          it { is_expected.to contain "DirectoryIndex index.php" }
+          it { is_expected.to contain 'DirectoryIndex index.php' }
         end
       end
 
-      it 'should answer to php.example.com' do
-        shell("/usr/bin/curl php.example.com:80") do |r|
-          expect(r.stdout).to match(/PHP Version/)
+      it 'answers to php.example.com #stdout' do
+        shell('/usr/bin/curl php.example.com:80') do |r|
+          expect(r.stdout).to match(%r{PHP Version})
+        end
+      end
+      it 'answers to php.example.com #exit_code' do
+        shell('/usr/bin/curl php.example.com:80') do |r|
           expect(r.exit_code).to eq(0)
         end
       end
     end
 
-    context "custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value" do
-      it 'succeeds in puppeting php' do
-        pp= <<-EOS
+    context 'custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value' do
+      pp = <<-MANIFEST
           class { 'apache':
             mpm_module => 'prefork',
           }
@@ -72,60 +75,64 @@ class { 'apache::mod::php':
             ensure  => file,
             content => "<?php phpinfo(); ?>\\n",
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'succeeds in puppeting php' do
+        apply_manifest(pp, catch_failures: true)
       end
 
       describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
         it { is_expected.to be_running }
       end
 
       describe file("#{$vhost_dir}/25-php.example.com.conf") do
-        it { is_expected.to contain "  php_flag display_errors on" }
-        it { is_expected.to contain "  php_value include_path \".:/usr/share/pear:/usr/bin/php\"" }
-        it { is_expected.to contain "  php_admin_flag engine on" }
-        it { is_expected.to contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
+        it { is_expected.to contain '  php_flag display_errors on' }
+        it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
+        it { is_expected.to contain '  php_admin_flag engine on' }
+        it { is_expected.to contain '  php_admin_value open_basedir /var/www/php/:/usr/share/pear/' }
       end
 
-      it 'should answer to php.example.com' do
-        shell("/usr/bin/curl php.example.com:80") do |r|
-          expect(r.stdout).to match(/\/usr\/share\/pear\//)
+      it 'answers to php.example.com #stdout' do
+        shell('/usr/bin/curl php.example.com:80') do |r|
+          expect(r.stdout).to match(%r{\/usr\/share\/pear\/})
+        end
+      end
+      it 'answers to php.example.com #exit_code' do
+        shell('/usr/bin/curl php.example.com:80') do |r|
           expect(r.exit_code).to eq(0)
         end
       end
     end
 
-    context "provide custom config file" do
-      it 'succeeds in puppeting php' do
-        pp= <<-EOS
+    context 'provide custom config file' do
+      pp = <<-MANIFEST
           class {'apache':
             mpm_module => 'prefork',
           }
           class {'apache::mod::php':
             content => '# somecontent',
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'succeeds in puppeting php' do
+        apply_manifest(pp, catch_failures: true)
       end
-      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+      if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04'
         describe file("#{$mod_dir}/php7.0.conf") do
-          it { should contain "# somecontent" }
+          it { is_expected.to contain '# somecontent' }
         end
       else
         describe file("#{$mod_dir}/php5.conf") do
-          it { should contain "# somecontent" }
+          it { is_expected.to contain '# somecontent' }
         end
       end
     end
 
-    context "provide content and template config file" do
-      it 'succeeds in puppeting php' do
-        pp= <<-EOS
+    context 'provide content and template config file' do
+      pp = <<-MANIFEST
           class {'apache':
             mpm_module => 'prefork',
           }
@@ -133,20 +140,20 @@ class {'apache::mod::php':
             content  => '# somecontent',
             template => 'apache/mod/php5.conf.erb',
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'succeeds in puppeting php' do
+        apply_manifest(pp, catch_failures: true)
       end
 
-      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04')
+      if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04'
         describe file("#{$mod_dir}/php7.0.conf") do
-          it { should contain "# somecontent" }
+          it { is_expected.to contain '# somecontent' }
         end
       else
         describe file("#{$mod_dir}/php5.conf") do
-          it { should contain "# somecontent" }
+          it { is_expected.to contain '# somecontent' }
         end
       end
     end
-
   end
 end
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index ce8aad6f3d..6659893a0d 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -2,17 +2,16 @@
 require_relative './version.rb'
 
 # Don't run proxy_html tests on RHEL7 because the yum repos are missing packages required by it.
-describe 'apache::mod::proxy_html class', :unless => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7') do
-  context "default proxy_html config" do
-    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
+describe 'apache::mod::proxy_html class', unless: (fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7') do
+  context 'default proxy_html config' do
+    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') =~ %r{(5|6)}
       it 'adds epel' do
         pp = "class { 'epel': }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
-    it 'succeeds in puppeting proxy_html' do
-      pp= <<-EOS
+    pp = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::proxy': }
         class { 'apache::mod::proxy_http': }
@@ -20,15 +19,16 @@ class { 'apache::mod::proxy_http': }
         if $::osfamily == 'RedHat' and $::operatingsystemmajrelease != '5' {
           class { 'apache::mod::proxy_html': }
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting proxy_html' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 095cce9da0..e14694e7da 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -1,29 +1,30 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::security class', :unless => (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy')) || (fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') < '11') do
-  context "default mod_security config" do
-    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
+describe 'apache::mod::security class', unless: (fact('osfamily') == 'Debian' && (fact('lsbdistcodename') == 'squeeze' ||
+                                                fact('lsbdistcodename') == 'lucid' || fact('lsbdistcodename') == 'precise' ||
+                                                fact('lsbdistcodename') == 'wheezy')) || (fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') < '11') do
+  context 'default mod_security config' do
+    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') =~ %r{(5|6)}
+      pp_one = "class { 'epel': }"
       it 'adds epel' do
-        pp = "class { 'epel': }"
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp_one, catch_failures: true)
       end
-    elsif fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-      it 'changes obsoletes, per PUP-4497' do
-        pp = <<-EOS
+    elsif fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
+      pp_two = <<-MANIFEST
           ini_setting { 'obsoletes':
             path    => '/etc/yum.conf',
             section => 'main',
             setting => 'obsoletes',
             value   => '0',
           }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'changes obsoletes, per PUP-4497' do
+        apply_manifest(pp_two, catch_failures: true)
       end
     end
 
-    it 'succeeds in puppeting mod_security' do
-      pp= <<-EOS
+    pp_three = <<-MANIFEST
         host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
@@ -35,20 +36,21 @@ class { 'apache::mod::security': }
           ensure  => file,
           content => 'Index page',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting mod_security' do
+      apply_manifest(pp_three, catch_failures: true)
 
-      #Need to add a short sleep here because on RHEL6 the service takes a bit longer to init
-      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
+      # Need to add a short sleep here because on RHEL6 the service takes a bit longer to init
+      if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') =~ %r{(5|6)}
         sleep 5
       end
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
@@ -58,29 +60,31 @@ class { 'apache::mod::security': }
     end
 
     describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain "mod_security2.c" }
+      it { is_expected.to contain 'mod_security2.c' }
     end
 
     describe 'should be listening on port 80' do
-      it 'should return index page' do
+      it 'returns index page #stdout' do
+        shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
+          expect(r.stdout).to match(%r{Index page})
+        end
+      end
+      it 'returns index page #exit_code' do
         shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
-          expect(r.stdout).to match(/Index page/)
           expect(r.exit_code).to eq(0)
         end
       end
 
       unless fact('operatingsystem') == 'SLES'
-        it 'should block query with SQL' do
-          shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+        it 'blocks query with SQL' do
+          shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
         end
       end
     end
+  end # default mod_security config
 
-  end #default mod_security config
-
-  context "mod_security should allow disabling by vhost" do
-    it 'succeeds in puppeting mod_security' do
-      pp= <<-EOS
+  context 'mod_security should allow disabling by vhost' do
+    pp_one = <<-MANIFEST
         host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
@@ -92,31 +96,31 @@ class { 'apache::mod::security': }
           ensure  => file,
           content => 'Index page',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting mod_security' do
+      apply_manifest(pp_one, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain "mod_security2.c" }
+      it { is_expected.to contain 'mod_security2.c' }
     end
 
     unless fact('operatingsystem') == 'SLES'
-      it 'should block query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      it 'blocks query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
     end
 
-    it 'should disable mod_security per vhost' do
-      pp= <<-EOS
+    pp_two = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
@@ -124,21 +128,25 @@ class { 'apache::mod::security': }
           docroot              => '#{$doc_root}/html',
           modsec_disable_vhost => true,
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'disables mod_security per vhost' do
+      apply_manifest(pp_two, catch_failures: true)
     end
 
-    it 'should return index page' do
+    it 'returns index page #stdout' do
+      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+        expect(r.stdout).to match(%r{Index page})
+      end
+    end
+    it 'returns index page #exit_code' do
       shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
     end
-  end #mod_security should allow disabling by vhost
+  end # mod_security should allow disabling by vhost
 
-  context "mod_security should allow disabling by ip" do
-    it 'succeeds in puppeting mod_security' do
-      pp= <<-EOS
+  context 'mod_security should allow disabling by ip' do
+    pp_one = <<-MANIFEST
         host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
@@ -150,31 +158,31 @@ class { 'apache::mod::security': }
           ensure  => file,
           content => 'Index page',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting mod_security' do
+      apply_manifest(pp_one, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain "mod_security2.c" }
+      it { is_expected.to contain 'mod_security2.c' }
     end
 
     unless fact('operatingsystem') == 'SLES'
-      it 'should block query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      it 'blocks query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
     end
 
-    it 'should disable mod_security per vhost' do
-      pp= <<-EOS
+    pp_two = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
@@ -182,21 +190,25 @@ class { 'apache::mod::security': }
           docroot            => '#{$doc_root}/html',
           modsec_disable_ips => [ '127.0.0.1' ],
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'disables mod_security per vhost' do
+      apply_manifest(pp_two, catch_failures: true)
     end
 
-    it 'should return index page' do
+    it 'returns index page #stdout' do
+      shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
+        expect(r.stdout).to match(%r{Index page})
+      end
+    end
+    it 'returns index page #exit_code' do
       shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
-        expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
     end
-  end #mod_security should allow disabling by ip
+  end # mod_security should allow disabling by ip
 
-  context "mod_security should allow disabling by id" do
-    it 'succeeds in puppeting mod_security' do
-      pp= <<-EOS
+  context 'mod_security should allow disabling by id' do
+    pp_one = <<-MANIFEST
         host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
@@ -212,31 +224,31 @@ class { 'apache::mod::security': }
           ensure  => file,
           content => 'Page 2',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting mod_security' do
+      apply_manifest(pp_one, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain "mod_security2.c" }
+      it { is_expected.to contain 'mod_security2.c' }
     end
 
     unless fact('operatingsystem') == 'SLES'
-      it 'should block query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      it 'blocks query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
     end
 
-    it 'should disable mod_security per vhost' do
-      pp= <<-EOS
+    pp_two = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
@@ -244,22 +256,25 @@ class { 'apache::mod::security': }
           docroot            => '#{$doc_root}/html',
           modsec_disable_ids => [ '950007' ],
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'disables mod_security per vhost' do
+      apply_manifest(pp_two, catch_failures: true)
     end
 
-    it 'should return index page' do
+    it 'returns index page #stdout' do
+      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+        expect(r.stdout).to match(%r{Index page})
+      end
+    end
+    it 'returns index page #exit_code' do
       shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
     end
+  end # mod_security should allow disabling by id
 
-  end #mod_security should allow disabling by id
-
-  context "mod_security should allow disabling by msg" do
-    it 'succeeds in puppeting mod_security' do
-      pp= <<-EOS
+  context 'mod_security should allow disabling by msg' do
+    pp_one = <<-MANIFEST
         host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
@@ -275,31 +290,31 @@ class { 'apache::mod::security': }
           ensure  => file,
           content => 'Page 2',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting mod_security' do
+      apply_manifest(pp_one, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain "mod_security2.c" }
+      it { is_expected.to contain 'mod_security2.c' }
     end
 
     unless fact('operatingsystem') == 'SLES'
-      it 'should block query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      it 'blocks query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
     end
 
-    it 'should disable mod_security per vhost' do
-      pp= <<-EOS
+    pp_two = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
@@ -307,22 +322,25 @@ class { 'apache::mod::security': }
           docroot            => '#{$doc_root}/html',
           modsec_disable_msgs => [ 'Blind SQL Injection Attack' ],
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'disables mod_security per vhost' do
+      apply_manifest(pp_two, catch_failures: true)
     end
 
-    it 'should return index page' do
+    it 'returns index page #stdout' do
+      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+        expect(r.stdout).to match(%r{Index page})
+      end
+    end
+    it 'returns index page #exit_code' do
       shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
     end
+  end # mod_security should allow disabling by msg
 
-  end #mod_security should allow disabling by msg
-
-  context "mod_security should allow disabling by tag" do
-    it 'succeeds in puppeting mod_security' do
-      pp= <<-EOS
+  context 'mod_security should allow disabling by tag' do
+    pp_one = <<-MANIFEST
         host { 'modsec.example.com': ip => '127.0.0.1', }
         class { 'apache': }
         class { 'apache::mod::security': }
@@ -338,31 +356,31 @@ class { 'apache::mod::security': }
           ensure  => file,
           content => 'Page 2',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'succeeds in puppeting mod_security' do
+      apply_manifest(pp_one, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain "mod_security2.c" }
+      it { is_expected.to contain 'mod_security2.c' }
     end
 
     unless fact('operatingsystem') == 'SLES'
-      it 'should block query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22]
+      it 'blocks query with SQL' do
+        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
     end
 
-    it 'should disable mod_security per vhost' do
-      pp= <<-EOS
+    pp_two = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::security': }
         apache::vhost { 'modsec.example.com':
@@ -370,17 +388,20 @@ class { 'apache::mod::security': }
           docroot             => '#{$doc_root}/html',
           modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION' ],
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'disables mod_security per vhost' do
+      apply_manifest(pp_two, catch_failures: true)
     end
 
-    it 'should return index page' do
+    it 'returns index page #stdout' do
+      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
+        expect(r.stdout).to match(%r{Index page})
+      end
+    end
+    it 'returns index page #exit_code' do
       shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.stdout).to match(/Index page/)
         expect(r.exit_code).to eq(0)
       end
     end
-
-  end #mod_security should allow disabling by tag
-
-end #apache::mod::security class
+  end # mod_security should allow disabling by tag
+end # apache::mod::security class
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index 07486677f1..dc156a55d4 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::suphp class', :if => (fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemmajrelease') != '16.04') do
-  context "default suphp config" do
-    it 'succeeds in puppeting suphp' do
-      pp = <<-EOS
+describe 'apache::mod::suphp class', if: (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') != '16.04') do
+  context 'default suphp config' do
+    # rubocop:disable Layout/IndentHeredoc : Manifest must have zero base indents
+    pp = <<-MANIFEST
 class { 'apache':
   mpm_module => 'prefork',
 }
@@ -22,36 +22,40 @@ class { 'apache':
 }
 class { 'apache::mod::php': }
 class { 'apache::mod::suphp': }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    # rubocop:enable Layout/IndentHeredoc
+    it 'succeeds in puppeting suphp' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service('apache2') do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
-    it 'should answer to suphp.example.com' do
+    it 'answers to suphp.example.com #timeout' do # rubocop:disable RSpec/ExampleLength
       timeout = 0
       loop do
         r = shell('curl suphp.example.com:80')
         timeout += 1
-        break if r.stdout =~ /^daemon$/
-        if timeout > 40
-          expect(timeout < 40).to be true
-          break
-        end
+        break if r.stdout =~ %r{^daemon$}
+        break expect(timeout < 40).to be true if timeout > 40
         sleep(1)
       end
-      shell("/usr/bin/curl suphp.example.com:80") do |r|
-        expect(r.stdout).to match(/^daemon$/)
+    end
+    it 'answers to suphp.example.com #stdout' do
+      shell('/usr/bin/curl suphp.example.com:80') do |r|
+        expect(r.stdout).to match(%r{^daemon$})
+      end
+    end
+    it 'answers to suphp.example.com #exit_code' do
+      shell('/usr/bin/curl suphp.example.com:80') do |r|
         expect(r.exit_code).to eq(0)
       end
     end
-
   end
 end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 6687161440..6939edfc8c 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -1,80 +1,82 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-case fact('osfamily')
-when 'FreeBSD'
-  describe 'apache::mod::event class' do
+describe 'prefork_worker_spec.rb' do
+  case fact('osfamily')
+  when 'FreeBSD'
+    describe 'apache::mod::event class' do
+      describe 'running puppet code' do
+        # Using puppet_apply as a helper
+        pp = <<-MANIFEEST
+            class { 'apache':
+              mpm_module => 'event',
+            }
+        MANIFEEST
+        it 'works with no errors' do
+          # Run it twice and test for idempotency
+          apply_manifest(pp, catch_failures: true)
+          expect(apply_manifest(pp, catch_failures: true).exit_code).to be_zero
+        end
+      end
+
+      describe service($service_name) do
+        it { is_expected.to be_running }
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        else
+          it { is_expected.to be_enabled }
+        end
+      end
+    end
+  end
+
+  describe 'apache::mod::worker class' do
     describe 'running puppet code' do
       # Using puppet_apply as a helper
-      it 'should work with no errors' do
-        pp = <<-EOS
+      let(:pp) do
+        <<-MANIFEEST
           class { 'apache':
-            mpm_module => 'event',
+            mpm_module => 'worker',
           }
-        EOS
-
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+        MANIFEEST
       end
+
+      # Run it twice and test for idempotency
+      it_behaves_like 'a idempotent resource'
     end
 
     describe service($service_name) do
       it { is_expected.to be_running }
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
     end
   end
-end
-
-describe 'apache::mod::worker class' do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    let(:pp) do
-      <<-EOS
-        class { 'apache':
-          mpm_module => 'worker',
-        }
-      EOS
-    end
 
-    # Run it twice and test for idempotency
-    it_behaves_like "a idempotent resource"
-  end
-
-  describe service($service_name) do
-    it { is_expected.to be_running }
-    if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-      pending 'Should be enabled - Bug 760616 on Debian 8'
-    else
-      it { should be_enabled }
-    end
-  end
-end
+  describe 'apache::mod::prefork class' do
+    describe 'running puppet code' do
+      # Using puppet_apply as a helper
+      let(:pp) do
+        <<-MANIFEEST
+          class { 'apache':
+            mpm_module => 'prefork',
+          }
+        MANIFEEST
+      end
 
-describe 'apache::mod::prefork class' do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    let(:pp) do
-      <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-      EOS
+      # Run it twice and test for idempotency
+      it_behaves_like 'a idempotent resource'
     end
-    # Run it twice and test for idempotency
-    it_behaves_like "a idempotent resource"
-  end
 
-  describe service($service_name) do
-    it { is_expected.to be_running }
-    if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-      pending 'Should be enabled - Bug 760616 on Debian 8'
-    else
-      it { should be_enabled }
+    describe service($service_name) do
+      it { is_expected.to be_running }
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { is_expected.to be_enabled }
+      end
     end
   end
 end
diff --git a/spec/acceptance/service_spec.rb b/spec/acceptance/service_spec.rb
index c62a34973a..ee6aa0b2a1 100644
--- a/spec/acceptance/service_spec.rb
+++ b/spec/acceptance/service_spec.rb
@@ -3,16 +3,16 @@
 describe 'apache::service class' do
   describe 'adding dependencies in between the base class and service class' do
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
         class { 'apache': }
         file { '/tmp/test':
           require => Class['apache'],
           notify  => Class['apache::service'],
         }
-      EOS
+      MANIFEST
     end
 
     # Run it twice and test for idempotency
-    it_behaves_like "a idempotent resource"
+    it_behaves_like 'a idempotent resource'
   end
 end
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index fac4071e60..6aefcec6e2 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -1,8 +1,8 @@
-_osfamily               = fact('osfamily')
-_operatingsystem        = fact('operatingsystem')
-_operatingsystemrelease = fact('operatingsystemrelease').to_f
+@osfamily               = fact('osfamily')
+@operatingsystem        = fact('operatingsystem')
+@operatingsystemrelease = fact('operatingsystemrelease').to_f
 
-case _osfamily
+case @osfamily
 when 'RedHat'
   $confd_dir        = '/etc/httpd/conf.d'
   $conf_file        = '/etc/httpd/conf/httpd.conf'
@@ -10,14 +10,14 @@
   $vhost_dir        = '/etc/httpd/conf.d'
   $vhost            = '/etc/httpd/conf.d/15-default.conf'
   $run_dir          = '/var/run/httpd'
-  $doc_root          = '/var/www'
+  $doc_root         = '/var/www'
   $service_name     = 'httpd'
   $package_name     = 'httpd'
   $error_log        = 'error_log'
   $suphp_handler    = 'php5-script'
   $suphp_configpath = 'undef'
 
-  if (_operatingsystem == 'Fedora' and _operatingsystemrelease >= 18) or (_operatingsystem != 'Fedora' and _operatingsystemrelease >= 7)
+  if (@operatingsystem == 'Fedora' && @operatingsystemrelease >= 18) || (@operatingsystem != 'Fedora' && @operatingsystemrelease >= 7)
     $apache_version = '2.4'
     $mod_dir        = '/etc/httpd/conf.modules.d'
   else
@@ -32,20 +32,19 @@
   $vhost            = '/etc/apache2/sites-available/15-default.conf'
   $vhost_dir        = '/etc/apache2/sites-enabled'
   $run_dir          = '/var/run/apache2'
-  $doc_root          = '/var/www'
+  $doc_root         = '/var/www'
   $service_name     = 'apache2'
   $package_name     = 'apache2'
   $error_log        = 'error.log'
   $suphp_handler    = 'x-httpd-php'
   $suphp_configpath = '/etc/php5/apache2'
-
-  if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10
-    $apache_version = '2.4'
-  elsif _operatingsystem == 'Debian' and _operatingsystemrelease >= 8.0
-    $apache_version = '2.4'
-  else
-    $apache_version = '2.2'
-  end
+  $apache_version = if @operatingsystem == 'Ubuntu' && @operatingsystemrelease >= 13.10
+                      '2.4'
+                    elsif @operatingsystem == 'Debian' && @operatingsystemrelease >= 8.0
+                      '2.4'
+                    else
+                      '2.2'
+                    end
 when 'FreeBSD'
   $confd_dir        = '/usr/local/etc/apache24/Includes'
   $mod_dir          = '/usr/local/etc/apache24/Modules'
@@ -54,12 +53,11 @@
   $vhost            = '/usr/local/etc/apache24/Vhosts/15-default.conf'
   $vhost_dir        = '/usr/local/etc/apache24/Vhosts'
   $run_dir          = '/var/run/apache24'
-  $doc_root          = '/var/www'
+  $doc_root         = '/var/www'
   $service_name     = 'apache24'
   $package_name     = 'apache24'
   $error_log        = 'http-error.log'
-
-  $apache_version = '2.2'
+  $apache_version   = '2.2'
 when 'Gentoo'
   $confd_dir        = '/etc/apache2/conf.d'
   $mod_dir          = '/etc/apache2/modules.d'
@@ -68,12 +66,11 @@
   $vhost            = '/etc/apache2/vhosts.d/15-default.conf'
   $vhost_dir        = '/etc/apache2/vhosts.d'
   $run_dir          = '/var/run/apache2'
-  $doc_root          = '/var/www'
+  $doc_root         = '/var/www'
   $service_name     = 'apache2'
   $package_name     = 'www-servers/apache'
   $error_log        = 'http-error.log'
-
-  $apache_version = '2.4'
+  $apache_version   = '2.4'
 when 'Suse'
   $confd_dir        = '/etc/apache2/conf.d'
   $mod_dir          = '/etc/apache2/mods-available'
@@ -86,11 +83,11 @@
   $service_name     = 'apache2'
   $package_name     = 'apache2'
   $error_log        = 'error.log'
-  if _operatingsystemrelease < 12
-    $apache_version   = '2.2'
-  else
-    $apache_version   = '2.4'
-  end
+  $apache_version   = if @operatingsystemrelease < 12
+                        '2.2'
+                      else
+                        '2.4'
+                      end
 else
-  $apache_version = '0'
+  $apache_version   = '0'
 end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 7b21b87006..555a6ece63 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -3,21 +3,20 @@
 
 describe 'apache::vhost define' do
   context 'no default vhosts' do
-    it 'should create no default vhosts' do
-      pp = <<-EOS
-        class { 'apache':
-          default_vhost => false,
-          default_ssl_vhost => false,
-          service_ensure => stopped,
+    pp = <<-MANIFEST
+      class { 'apache':
+        default_vhost => false,
+        default_ssl_vhost => false,
+        service_ensure => stopped,
+      }
+      if ($::osfamily == 'Suse') {
+        exec { '/usr/bin/gensslcert':
+          require => Class['apache'],
         }
-        if ($::osfamily == 'Suse') {
-          exec { '/usr/bin/gensslcert':
-            require => Class['apache'],
-          }
-         }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+      }
+    MANIFEST
+    it 'creates no default vhosts' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/15-default.conf") do
@@ -29,13 +28,12 @@ class { 'apache':
     end
   end
 
-  context "default vhost without ssl" do
-    it 'should create a default vhost config' do
-      pp = <<-EOS
-        class { 'apache': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+  context 'default vhost without ssl' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+    MANIFEST
+    it 'creates a default vhost config' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/15-default.conf") do
@@ -48,19 +46,19 @@ class { 'apache': }
   end
 
   context 'default vhost with ssl' do
-    it 'should create default vhost configs' do
-      pp = <<-EOS
-        file { '#{$run_dir}':
-          ensure  => 'directory',
-          recurse => true,
-        }
+    pp = <<-MANIFEST
+      file { '#{$run_dir}':
+        ensure  => 'directory',
+        recurse => true,
+      }
 
-        class { 'apache':
-          default_ssl_vhost => true,
-          require => File['#{$run_dir}'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      class { 'apache':
+        default_ssl_vhost => true,
+        require => File['#{$run_dir}'],
+      }
+    MANIFEST
+    it 'creates default vhost configs' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/15-default.conf") do
@@ -69,174 +67,174 @@ class { 'apache':
 
     describe file("#{$vhost_dir}/15-default-ssl.conf") do
       it { is_expected.to contain '<VirtualHost \*:443>' }
-      it { is_expected.to contain "SSLEngine on" }
+      it { is_expected.to contain 'SSLEngine on' }
     end
   end
 
   context 'new vhost on port 80' do
-    it 'should configure an apache vhost' do
-      pp = <<-EOS
-        class { 'apache': }
-        file { '/var/www':
-          ensure  => 'directory',
-          recurse => true,
-        }
-
-        apache::vhost { 'first.example.com':
-          port    => '80',
-          docroot => '/var/www/first',
-          require => File['/var/www'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    pp = <<-MANIFEST
+      class { 'apache': }
+      file { '/var/www':
+        ensure  => 'directory',
+        recurse => true,
+      }
+
+      apache::vhost { 'first.example.com':
+        port    => '80',
+        docroot => '/var/www/first',
+        require => File['/var/www'],
+      }
+    MANIFEST
+    it 'configures an apache vhost' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-first.example.com.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
-      it { is_expected.to contain "ServerName first.example.com" }
+      it { is_expected.to contain 'ServerName first.example.com' }
     end
   end
 
   context 'new proxy vhost on port 80' do
-    it 'should configure an apache proxy vhost' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'proxy.example.com':
-          port    => '80',
-          docroot => '/var/www/proxy',
-          proxy_pass => [
-            { 'path' => '/foo', 'url' => 'http://backend-foo/'},
-          ],
-        proxy_preserve_host   => true,
-        proxy_error_override  => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    pp = <<-MANIFEST
+      class { 'apache': }
+      apache::vhost { 'proxy.example.com':
+        port    => '80',
+        docroot => '/var/www/proxy',
+        proxy_pass => [
+          { 'path' => '/foo', 'url' => 'http://backend-foo/'},
+        ],
+      proxy_preserve_host   => true,
+      proxy_error_override  => true,
+      }
+    MANIFEST
+    it 'configures an apache proxy vhost' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
-      it { is_expected.to contain "ServerName proxy.example.com" }
-      it { is_expected.to contain "ProxyPass" }
-      it { is_expected.to contain "ProxyPreserveHost On" }
-      it { is_expected.to contain "ProxyErrorOverride On" }
-      it { is_expected.not_to contain "ProxyAddHeaders" }
+      it { is_expected.to contain 'ServerName proxy.example.com' }
+      it { is_expected.to contain 'ProxyPass' }
+      it { is_expected.to contain 'ProxyPreserveHost On' }
+      it { is_expected.to contain 'ProxyErrorOverride On' }
+      it { is_expected.not_to contain 'ProxyAddHeaders' }
       it { is_expected.not_to contain "<Proxy \*>" }
     end
   end
 
-  unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajrelease') <= '10')
+  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajorrelease') <= '10'
     context 'new proxy vhost on port 80' do
-      it 'should configure an apache proxy vhost' do
-        pp = <<-EOS
-          class { 'apache': }
-          apache::vhost { 'proxy.example.com':
-            port    => '80',
-            docroot => '#{$docroot}/proxy',
-            proxy_pass_match => [
-              { 'path' => '/foo', 'url' => 'http://backend-foo/'},
-            ],
-          proxy_preserve_host   => true,
-          proxy_error_override  => true,
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      pp = <<-MANIFEST
+        class { 'apache': }
+        apache::vhost { 'proxy.example.com':
+          port    => '80',
+          docroot => '#{$docroot}/proxy',
+          proxy_pass_match => [
+            { 'path' => '/foo', 'url' => 'http://backend-foo/'},
+          ],
+        proxy_preserve_host   => true,
+        proxy_error_override  => true,
+        }
+      MANIFEST
+      it 'configures an apache proxy vhost' do
+        apply_manifest(pp, catch_failures: true)
       end
 
       describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
         it { is_expected.to contain '<VirtualHost \*:80>' }
-        it { is_expected.to contain "ServerName proxy.example.com" }
-        it { is_expected.to contain "ProxyPassMatch /foo http://backend-foo/" }
-        it { is_expected.to contain "ProxyPreserveHost On" }
-        it { is_expected.to contain "ProxyErrorOverride On" }
-        it { is_expected.not_to contain "ProxyAddHeaders" }
+        it { is_expected.to contain 'ServerName proxy.example.com' }
+        it { is_expected.to contain 'ProxyPassMatch /foo http://backend-foo/' }
+        it { is_expected.to contain 'ProxyPreserveHost On' }
+        it { is_expected.to contain 'ProxyErrorOverride On' }
+        it { is_expected.not_to contain 'ProxyAddHeaders' }
         it { is_expected.not_to contain "<Proxy \*>" }
       end
     end
   end
 
   context 'new vhost on port 80' do
-    it 'should configure two apache vhosts' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'first.example.com':
-          port    => '80',
-          docroot => '/var/www/first',
-        }
-        host { 'first.example.com': ip => '127.0.0.1', }
-        file { '/var/www/first/index.html':
-          ensure  => file,
-          content => "Hello from first\\n",
-        }
-        apache::vhost { 'second.example.com':
-          port    => '80',
-          docroot => '/var/www/second',
-        }
-        host { 'second.example.com': ip => '127.0.0.1', }
-        file { '/var/www/second/index.html':
-          ensure  => file,
-          content => "Hello from second\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    pp = <<-MANIFEST
+      class { 'apache': }
+      apache::vhost { 'first.example.com':
+        port    => '80',
+        docroot => '/var/www/first',
+      }
+      host { 'first.example.com': ip => '127.0.0.1', }
+      file { '/var/www/first/index.html':
+        ensure  => file,
+        content => "Hello from first\\n",
+      }
+      apache::vhost { 'second.example.com':
+        port    => '80',
+        docroot => '/var/www/second',
+      }
+      host { 'second.example.com': ip => '127.0.0.1', }
+      file { '/var/www/second/index.html':
+        ensure  => file,
+        content => "Hello from second\\n",
+      }
+    MANIFEST
+    it 'configures two apache vhosts' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
-    it 'should answer to first.example.com' do
-      shell("/usr/bin/curl first.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to first.example.com' do
+      shell('/usr/bin/curl first.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from first\n")
       end
     end
 
-    it 'should answer to second.example.com' do
-      shell("/usr/bin/curl second.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to second.example.com' do
+      shell('/usr/bin/curl second.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from second\n")
       end
     end
   end
 
   context 'new vhost with multiple IP addresses on port 80' do
-    it 'should configure one apache vhost with 2 ip addresses' do
-      pp = <<-EOS
-        class { 'apache':
-          default_vhost => false,
-        }
-        apache::vhost { 'example.com':
-          port     => '80',
-          ip       => ['127.0.0.1','127.0.0.2'],
-          ip_based => true,
-          docroot  => '/var/www/html',
-        }
-        host { 'host1.example.com': ip => '127.0.0.1', }
-        host { 'host2.example.com': ip => '127.0.0.2', }
-        file { '/var/www/html/index.html':
-          ensure  => file,
-          content => "Hello from vhost\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    pp = <<-MANIFEST
+      class { 'apache':
+        default_vhost => false,
+      }
+      apache::vhost { 'example.com':
+        port     => '80',
+        ip       => ['127.0.0.1','127.0.0.2'],
+        ip_based => true,
+        docroot  => '/var/www/html',
+      }
+      host { 'host1.example.com': ip => '127.0.0.1', }
+      host { 'host2.example.com': ip => '127.0.0.2', }
+      file { '/var/www/html/index.html':
+        ensure  => file,
+        content => "Hello from vhost\\n",
+      }
+    MANIFEST
+    it 'configures one apache vhost with 2 ip addresses' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.2:80>' }
-      it { is_expected.to contain "ServerName example.com" }
+      it { is_expected.to contain 'ServerName example.com' }
     end
 
     describe file($ports_file) do
@@ -247,52 +245,52 @@ class { 'apache':
       it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:80' }
     end
 
-    it 'should answer to host1.example.com' do
-      shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to host1.example.com' do
+      shell('/usr/bin/curl host1.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
-    it 'should answer to host2.example.com' do
-      shell("/usr/bin/curl host2.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to host2.example.com' do
+      shell('/usr/bin/curl host2.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
   end
 
   context 'new vhost with multiple ports on 1 IP address' do
-    it 'should configure one apache vhost with 2 ports' do
-      pp = <<-EOS
-        class { 'apache':
-          default_vhost => false,
-        }
-        apache::vhost { 'example.com':
-          port     => ['80','8080'],
-          ip       => '127.0.0.1',
-          ip_based => true,
-          docroot  => '/var/www/html',
-        }
-        host { 'host1.example.com': ip => '127.0.0.1', }
-        file { '/var/www/html/index.html':
-          ensure  => file,
-          content => "Hello from vhost\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    pp = <<-MANIFEST
+      class { 'apache':
+        default_vhost => false,
+      }
+      apache::vhost { 'example.com':
+        port     => ['80','8080'],
+        ip       => '127.0.0.1',
+        ip_based => true,
+        docroot  => '/var/www/html',
+      }
+      host { 'host1.example.com': ip => '127.0.0.1', }
+      file { '/var/www/html/index.html':
+        ensure  => file,
+        content => "Hello from vhost\\n",
+      }
+    MANIFEST
+    it 'configures one apache vhost with 2 ports' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080>' }
-      it { is_expected.to contain "ServerName example.com" }
+      it { is_expected.to contain 'ServerName example.com' }
     end
 
     describe file($ports_file) do
@@ -303,53 +301,53 @@ class { 'apache':
       it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:8080' }
     end
 
-    it 'should answer to host1.example.com port 80' do
-      shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to host1.example.com port 80' do
+      shell('/usr/bin/curl host1.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
-    it 'should answer to host1.example.com port 8080' do
-      shell("/usr/bin/curl host1.example.com:8080", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to host1.example.com port 8080' do
+      shell('/usr/bin/curl host1.example.com:8080', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
   end
 
   context 'new vhost with multiple IP addresses on multiple ports' do
-    it 'should configure one apache vhost with 2 ip addresses and 2 ports' do
-      pp = <<-EOS
-        class { 'apache':
-          default_vhost => false,
-        }
-        apache::vhost { 'example.com':
-          port     => ['80', '8080'],
-          ip       => ['127.0.0.1','127.0.0.2'],
-          ip_based => true,
-          docroot  => '/var/www/html',
-        }
-        host { 'host1.example.com': ip => '127.0.0.1', }
-        host { 'host2.example.com': ip => '127.0.0.2', }
-        file { '/var/www/html/index.html':
-          ensure  => file,
-          content => "Hello from vhost\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    pp = <<-MANIFEST
+      class { 'apache':
+        default_vhost => false,
+      }
+      apache::vhost { 'example.com':
+        port     => ['80', '8080'],
+        ip       => ['127.0.0.1','127.0.0.2'],
+        ip_based => true,
+        docroot  => '/var/www/html',
+      }
+      host { 'host1.example.com': ip => '127.0.0.1', }
+      host { 'host2.example.com': ip => '127.0.0.2', }
+      file { '/var/www/html/index.html':
+        ensure  => file,
+        content => "Hello from vhost\\n",
+      }
+    MANIFEST
+    it 'configures one apache vhost with 2 ip addresses and 2 ports' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080 127.0.0.2:80 127.0.0.2:8080>' }
-      it { is_expected.to contain "ServerName example.com" }
+      it { is_expected.to contain 'ServerName example.com' }
     end
 
     describe file($ports_file) do
@@ -364,64 +362,64 @@ class { 'apache':
       it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:8080' }
     end
 
-    it 'should answer to host1.example.com port 80' do
-      shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to host1.example.com port 80' do
+      shell('/usr/bin/curl host1.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
-    it 'should answer to host1.example.com port 8080' do
-      shell("/usr/bin/curl host1.example.com:8080", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to host1.example.com port 8080' do
+      shell('/usr/bin/curl host1.example.com:8080', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
-    it 'should answer to host2.example.com port 80' do
-      shell("/usr/bin/curl host2.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to host2.example.com port 80' do
+      shell('/usr/bin/curl host2.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
-    it 'should answer to host2.example.com port 8080' do
-      shell("/usr/bin/curl host2.example.com:8080", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to host2.example.com port 8080' do
+      shell('/usr/bin/curl host2.example.com:8080', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
   end
 
   context 'new vhost with IPv6 address on port 80', :ipv6 do
-    it 'should configure one apache vhost with an ipv6 address' do
-      pp = <<-EOS
-        class { 'apache':
-          default_vhost  => false,
-        }
-        apache::vhost { 'example.com':
-          port           => '80',
-          ip             => '::1',
-          ip_based       => true,
-          docroot        => '/var/www/html',
-        }
-        host { 'ipv6.example.com': ip => '::1', }
-        file { '/var/www/html/index.html':
-          ensure  => file,
-          content => "Hello from vhost\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    pp = <<-MANIFEST
+      class { 'apache':
+        default_vhost  => false,
+      }
+      apache::vhost { 'example.com':
+        port           => '80',
+        ip             => '::1',
+        ip_based       => true,
+        docroot        => '/var/www/html',
+      }
+      host { 'ipv6.example.com': ip => '::1', }
+      file { '/var/www/html/index.html':
+        ensure  => file,
+        content => "Hello from vhost\\n",
+      }
+    MANIFEST
+    it 'configures one apache vhost with an ipv6 address' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost [::1]:80>' }
-      it { is_expected.to contain "ServerName example.com" }
+      it { is_expected.to contain 'ServerName example.com' }
     end
 
     describe file($ports_file) do
@@ -430,8 +428,8 @@ class { 'apache':
       it { is_expected.not_to contain 'NameVirtualHost [::1]:80' }
     end
 
-    it 'should answer to ipv6.example.com' do
-      shell("/usr/bin/curl ipv6.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to ipv6.example.com' do
+      shell('/usr/bin/curl ipv6.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
@@ -439,232 +437,242 @@ class { 'apache':
 
   context 'apache_directories' do
     describe 'readme example, adapted' do
-      it 'should configure a vhost with Files' do
-        pp = <<-EOS
-          class { 'apache': }
+      pp = <<-MANIFEST
+        class { 'apache': }
 
-          if versioncmp($apache_version, '2.4') >= 0 {
-            $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
-          } else {
-            $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
-          }
+        if versioncmp($apache_version, '2.4') >= 0 {
+          $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
+        } else {
+          $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
+        }
 
-          $_directories = [
-            { 'path' => '/var/www/files', },
-            $_files_match_directory,
-          ]
+        $_directories = [
+          { 'path' => '/var/www/files', },
+          $_files_match_directory,
+        ]
 
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => $_directories,
-          }
-          file { '/var/www/files/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/files/index.html.bak':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          host { 'files.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+        apache::vhost { 'files.example.net':
+          docroot     => '/var/www/files',
+          directories => $_directories,
+        }
+        file { '/var/www/files/index.html':
+          ensure  => file,
+          content => "Hello World\\n",
+        }
+        file { '/var/www/files/index.html.bak':
+          ensure  => file,
+          content => "Hello World\\n",
+        }
+        host { 'files.example.net': ip => '127.0.0.1', }
+      MANIFEST
+      it 'configures a vhost with Files' do
+        apply_manifest(pp, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      describe service($service_name) do # rubocop:disable RSpec/NestedGroups
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
         it { is_expected.to be_running }
       end
 
-      it 'should answer to files.example.net' do
-        expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout).to eq("Hello World\n")
-        expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr).to match(/curl: \(22\) The requested URL returned error: 403/)
+      it 'answers to files.example.net #stdout' do
+        expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
+      end
+      it 'answers to files.example.net #stderr' do
+        expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html.bak', acceptable_exit_codes: 22).stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
       end
     end
 
     describe 'other Directory options' do
-      it 'should configure a vhost with multiple Directory sections' do
-        pp = <<-EOS
-          class { 'apache': }
-
-          if versioncmp($apache_version, '2.4') >= 0 {
-            $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
-          } else {
-            $_files_match_directory = [
-              { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' },
-              { 'path' => '/bar/bar.html', 'provider' => 'location', allow => [ 'from 127.0.0.1', ] },
-            ]
-          }
+      pp_one = <<-MANIFEST
+        class { 'apache': }
 
-          $_directories = [
-            { 'path' => '/var/www/files', },
-            { 'path' => '/foo/', 'provider' => 'location', 'directoryindex' => 'notindex.html', },
-            $_files_match_directory,
+        if versioncmp($apache_version, '2.4') >= 0 {
+          $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
+        } else {
+          $_files_match_directory = [
+            { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' },
+            { 'path' => '/bar/bar.html', 'provider' => 'location', allow => [ 'from 127.0.0.1', ] },
           ]
+        }
 
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => $_directories,
-          }
-          file { '/var/www/files/foo':
-            ensure => directory,
-          }
-          file { '/var/www/files/foo/notindex.html':
-            ensure  => file,
-            content => "Hello Foo\\n",
-          }
-          file { '/var/www/files/private.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/files/bar':
-            ensure => directory,
-          }
-          file { '/var/www/files/bar/bar.html':
-            ensure  => file,
-            content => "Hello Bar\\n",
-          }
-          host { 'files.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+        $_directories = [
+          { 'path' => '/var/www/files', },
+          { 'path' => '/foo/', 'provider' => 'location', 'directoryindex' => 'notindex.html', },
+          $_files_match_directory,
+        ]
+
+        apache::vhost { 'files.example.net':
+          docroot     => '/var/www/files',
+          directories => $_directories,
+        }
+        file { '/var/www/files/foo':
+          ensure => directory,
+        }
+        file { '/var/www/files/foo/notindex.html':
+          ensure  => file,
+          content => "Hello Foo\\n",
+        }
+        file { '/var/www/files/private.html':
+          ensure  => file,
+          content => "Hello World\\n",
+        }
+        file { '/var/www/files/bar':
+          ensure => directory,
+        }
+        file { '/var/www/files/bar/bar.html':
+          ensure  => file,
+          content => "Hello Bar\\n",
+        }
+        host { 'files.example.net': ip => '127.0.0.1', }
+      MANIFEST
+      it 'configures a vhost with multiple Directory sections' do
+        apply_manifest(pp_one, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      describe service($service_name) do # rubocop:disable RSpec/NestedGroups
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
         it { is_expected.to be_running }
       end
 
-      it 'should answer to files.example.net' do
-        expect(shell("/usr/bin/curl -sSf files.example.net:80/").stdout).to eq("Hello World\n")
-        expect(shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout).to eq("Hello Foo\n")
-        expect(shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr).to match(/curl: \(22\) The requested URL returned error: 403/)
-        expect(shell("/usr/bin/curl -sSf files.example.net:80/bar/bar.html").stdout).to eq("Hello Bar\n")
+      it 'answers to files.example.net #stdout' do
+        expect(shell('/usr/bin/curl -sSf files.example.net:80/').stdout).to eq("Hello World\n")
+      end
+      it 'answers to files.example.net #stdout foo' do
+        expect(shell('/usr/bin/curl -sSf files.example.net:80/foo/').stdout).to eq("Hello Foo\n")
+      end
+      it 'answers to files.example.net #stderr' do
+        expect(shell('/usr/bin/curl -sSf files.example.net:80/private.html', acceptable_exit_codes: 22).stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
+      end
+      it 'answers to files.example.net #stdout bar' do
+        expect(shell('/usr/bin/curl -sSf files.example.net:80/bar/bar.html').stdout).to eq("Hello Bar\n")
       end
     end
 
     describe 'SetHandler directive' do
-      it 'should configure a vhost with a SetHandler directive' do
-        pp = <<-EOS
-          class { 'apache': }
-          apache::mod { 'status': }
-          host { 'files.example.net': ip => '127.0.0.1', }
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => [
-              { path => '/var/www/files', },
-              { path => '/server-status', provider => 'location', sethandler => 'server-status', },
-            ],
-          }
-          file { '/var/www/files/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      pp_two = <<-MANIFEST
+        class { 'apache': }
+        apache::mod { 'status': }
+        host { 'files.example.net': ip => '127.0.0.1', }
+        apache::vhost { 'files.example.net':
+          docroot     => '/var/www/files',
+          directories => [
+            { path => '/var/www/files', },
+            { path => '/server-status', provider => 'location', sethandler => 'server-status', },
+          ],
+        }
+        file { '/var/www/files/index.html':
+          ensure  => file,
+          content => "Hello World\\n",
+        }
+      MANIFEST
+      it 'configures a vhost with a SetHandler directive' do
+        apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      describe service($service_name) do # rubocop:disable RSpec/NestedGroups
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
         it { is_expected.to be_running }
       end
 
-      it 'should answer to files.example.net' do
-        expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout).to eq("Hello World\n")
-        expect(shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout).to match(/Scoreboard: /)
+      it 'answers to files.example.net #stdout' do
+        expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
+      end
+      it 'answers to files.example.net #stdout regex' do
+        expect(shell('/usr/bin/curl -sSf files.example.net:80/server-status?auto').stdout).to match(%r{Scoreboard: })
       end
     end
 
-    describe 'Satisfy and Auth directive', :unless => $apache_version == '2.4' do
-      it 'should configure a vhost with Satisfy and Auth directive' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'files.example.net': ip => '127.0.0.1', }
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => [
-              {
-                path => '/var/www/files/foo',
-                auth_type => 'Basic',
-                auth_name => 'Basic Auth',
-                auth_user_file => '/var/www/htpasswd',
-                auth_require => "valid-user",
-              },
-              {
-                path => '/var/www/files/bar',
-                auth_type => 'Basic',
-                auth_name => 'Basic Auth',
-                auth_user_file => '/var/www/htpasswd',
-                auth_require => 'valid-user',
-                satisfy => 'Any',
-              },
-              {
-                path => '/var/www/files/baz',
-                allow => 'from 10.10.10.10',
-                auth_type => 'Basic',
-                auth_name => 'Basic Auth',
-                auth_user_file => '/var/www/htpasswd',
-                auth_require => 'valid-user',
-                satisfy => 'Any',
-              },
-            ],
-          }
-          file { '/var/www/files/foo':
-            ensure => directory,
-          }
-          file { '/var/www/files/bar':
-            ensure => directory,
-          }
-          file { '/var/www/files/baz':
-            ensure => directory,
-          }
-          file { '/var/www/files/foo/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/files/bar/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/files/baz/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/htpasswd':
-            ensure  => file,
-            content => "login:IZ7jMcLSx0oQk", # "password" as password
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+    describe 'Satisfy and Auth directive', unless: $apache_version == '2.4' do
+      pp_two = <<-MANIFEST
+        class { 'apache': }
+        host { 'files.example.net': ip => '127.0.0.1', }
+        apache::vhost { 'files.example.net':
+          docroot     => '/var/www/files',
+          directories => [
+            {
+              path => '/var/www/files/foo',
+              auth_type => 'Basic',
+              auth_name => 'Basic Auth',
+              auth_user_file => '/var/www/htpasswd',
+              auth_require => "valid-user",
+            },
+            {
+              path => '/var/www/files/bar',
+              auth_type => 'Basic',
+              auth_name => 'Basic Auth',
+              auth_user_file => '/var/www/htpasswd',
+              auth_require => 'valid-user',
+              satisfy => 'Any',
+            },
+            {
+              path => '/var/www/files/baz',
+              allow => 'from 10.10.10.10',
+              auth_type => 'Basic',
+              auth_name => 'Basic Auth',
+              auth_user_file => '/var/www/htpasswd',
+              auth_require => 'valid-user',
+              satisfy => 'Any',
+            },
+          ],
+        }
+        file { '/var/www/files/foo':
+          ensure => directory,
+        }
+        file { '/var/www/files/bar':
+          ensure => directory,
+        }
+        file { '/var/www/files/baz':
+          ensure => directory,
+        }
+        file { '/var/www/files/foo/index.html':
+          ensure  => file,
+          content => "Hello World\\n",
+        }
+        file { '/var/www/files/bar/index.html':
+          ensure  => file,
+          content => "Hello World\\n",
+        }
+        file { '/var/www/files/baz/index.html':
+          ensure  => file,
+          content => "Hello World\\n",
+        }
+        file { '/var/www/htpasswd':
+          ensure  => file,
+          content => "login:IZ7jMcLSx0oQk", # "password" as password
+        }
+      MANIFEST
+      it 'configures a vhost with Satisfy and Auth directive' do
+        apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      describe service($service_name) do # rubocop:disable RSpec/NestedGroups
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
-        it { should be_running }
-      end
+        it { is_expected.to be_running }
 
-      it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/foo/index.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 401/)
-        shell("/usr/bin/curl -sSf -u login:password files.example.net:80/foo/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/bar/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf -u login:password files.example.net:80/bar/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/baz/index.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 401/)
-        shell("/usr/bin/curl -sSf -u login:password files.example.net:80/baz/index.html").stdout.should eq("Hello World\n")
+        it 'answers to files.example.net' do # rubocop:disable RSpec/ExampleLength
+          shell('/usr/bin/curl -sSf files.example.net:80/foo/index.html', acceptable_exit_codes: 22).stderr.should match(%r{curl: \(22\) The requested URL returned error: 401})
+          shell('/usr/bin/curl -sSf -u login:password files.example.net:80/foo/index.html').stdout.should eq("Hello World\n")
+          shell('/usr/bin/curl -sSf files.example.net:80/bar/index.html').stdout.should eq("Hello World\n")
+          shell('/usr/bin/curl -sSf -u login:password files.example.net:80/bar/index.html').stdout.should eq("Hello World\n")
+          shell('/usr/bin/curl -sSf files.example.net:80/baz/index.html', acceptable_exit_codes: 22).stderr.should match(%r{curl: \(22\) The requested URL returned error: 401})
+          shell('/usr/bin/curl -sSf -u login:password files.example.net:80/baz/index.html').stdout.should eq("Hello World\n")
+        end
       end
     end
   end
@@ -672,8 +680,7 @@ class { 'apache': }
   case fact('lsbdistcodename')
   when 'precise', 'wheezy'
     context 'vhost FallbackResource example' do
-      it 'should configure a vhost with FallbackResource' do
-        pp = <<-EOS
+      pp = <<-MANIFEST
         class { 'apache': }
         apache::vhost { 'fallback.example.net':
           docroot         => '/var/www/fallback',
@@ -684,80 +691,74 @@ class { 'apache': }
           content => "Hello World\\n",
         }
         host { 'fallback.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+      MANIFEST
+      it 'configures a vhost with FallbackResource' do
+        apply_manifest(pp, catch_failures: true)
       end
 
       describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
         it { is_expected.to be_running }
       end
 
-      it 'should answer to fallback.example.net' do
-        shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist") do |r|
+      it 'answers to fallback.example.net' do
+        shell('/usr/bin/curl fallback.example.net:80/Does/Not/Exist') do |r|
           expect(r.stdout).to eq("Hello World\n")
         end
       end
-
     end
-  else
-    # The current stable RHEL release (6.4) comes with Apache httpd 2.2.15
-    # That was released March 6, 2010.
-    # FallbackResource was backported to 2.2.16, and released July 25, 2010.
-    # Ubuntu Lucid (10.04) comes with apache2 2.2.14, released October 3, 2009.
-    # https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/STATUS
   end
 
   context 'virtual_docroot hosting separate sites' do
-    it 'should configure a vhost with VirtualDocumentRoot' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'virt.example.com':
-          vhost_name      => '*',
-          serveraliases   => '*virt.example.com',
-          port            => '80',
-          docroot         => '/var/www/virt',
-          virtual_docroot => '/var/www/virt/%1',
-        }
-        host { 'virt.example.com': ip => '127.0.0.1', }
-        host { 'a.virt.example.com': ip => '127.0.0.1', }
-        host { 'b.virt.example.com': ip => '127.0.0.1', }
-        file { [ '/var/www/virt/a', '/var/www/virt/b', ]: ensure => directory, }
-        file { '/var/www/virt/a/index.html': ensure  => file, content => "Hello from a.virt\\n", }
-        file { '/var/www/virt/b/index.html': ensure  => file, content => "Hello from b.virt\\n", }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    pp = <<-MANIFEST
+      class { 'apache': }
+      apache::vhost { 'virt.example.com':
+        vhost_name      => '*',
+        serveraliases   => '*virt.example.com',
+        port            => '80',
+        docroot         => '/var/www/virt',
+        virtual_docroot => '/var/www/virt/%1',
+      }
+      host { 'virt.example.com': ip => '127.0.0.1', }
+      host { 'a.virt.example.com': ip => '127.0.0.1', }
+      host { 'b.virt.example.com': ip => '127.0.0.1', }
+      file { [ '/var/www/virt/a', '/var/www/virt/b', ]: ensure => directory, }
+      file { '/var/www/virt/a/index.html': ensure  => file, content => "Hello from a.virt\\n", }
+      file { '/var/www/virt/b/index.html': ensure  => file, content => "Hello from b.virt\\n", }
+    MANIFEST
+    it 'configures a vhost with VirtualDocumentRoot' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
-    it 'should answer to a.virt.example.com' do
-      shell("/usr/bin/curl a.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to a.virt.example.com' do
+      shell('/usr/bin/curl a.virt.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from a.virt\n")
       end
     end
 
-    it 'should answer to b.virt.example.com' do
-      shell("/usr/bin/curl b.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
+    it 'answers to b.virt.example.com' do
+      shell('/usr/bin/curl b.virt.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from b.virt\n")
       end
     end
   end
 
   context 'proxy_pass for alternative vhost' do
-    it 'should configure a local vhost and a proxy vhost' do
-      apply_manifest(%{
+    it 'configures a local vhost and a proxy vhost' do # rubocop:disable RSpec/ExampleLength
+      apply_manifest(%(
         class { 'apache': default_vhost => false, }
         apache::vhost { 'localhost':
           docroot => '/var/www/local',
@@ -780,30 +781,34 @@ class { 'apache': default_vhost => false, }
           ensure  => file,
           content => "Hello from localhost\\n",
         }
-                     }, :catch_failures => true)
+                     ), catch_failures: true)
     end
 
     describe service($service_name) do
-      if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
       else
-        it { should be_enabled }
+        it { is_expected.to be_enabled }
       end
       it { is_expected.to be_running }
     end
 
-    it 'should get a response from the back end' do
-      shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
+    it 'gets a response from the back end #stdout' do
+      shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.stdout).to eq("Hello from localhost\n")
+      end
+    end
+    it 'gets a response from the back end #exit_code' do
+      shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.exit_code).to eq(0)
       end
     end
   end
 
-  unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajrelease') <= '10')
+  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajorrelease') <= '10'
     context 'proxy_pass_match for alternative vhost' do
-      it 'should configure a local vhost and a proxy vhost' do
-        apply_manifest(%{
+      it 'configures a local vhost and a proxy vhost' do # rubocop:disable RSpec/ExampleLength
+        apply_manifest(%(
           class { 'apache': default_vhost => false, }
           apache::vhost { 'localhost':
             docroot => '/var/www/local',
@@ -826,21 +831,25 @@ class { 'apache': default_vhost => false, }
             ensure  => file,
             content => "Hello from localhost\\n",
           }
-                      }, :catch_failures => true)
+                      ), catch_failures: true)
       end
 
       describe service($service_name) do
-        if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
-          it { should be_enabled }
+          it { is_expected.to be_enabled }
         end
         it { is_expected.to be_running }
       end
 
-      it 'should get a response from the back end' do
-        shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
+      it 'gets a response from the back end #stdout' do
+        shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
           expect(r.stdout).to eq("Hello from localhost\n")
+        end
+      end
+      it 'gets a response from the back end #exit_code' do
+        shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
           expect(r.exit_code).to eq(0)
         end
       end
@@ -848,17 +857,17 @@ class { 'apache': default_vhost => false, }
   end
 
   describe 'ip_based' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        ip_based   => true,
+        servername => 'test.server',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          ip_based   => true,
-          servername => 'test.server',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($ports_file) do
@@ -867,22 +876,22 @@ class { 'apache': }
     end
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain "ServerName test.server" }
+      it { is_expected.to contain 'ServerName test.server' }
     end
   end
 
   describe 'ip_based and no servername' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        ip_based   => true,
+        servername => '',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          ip_based   => true,
-          servername => '',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($ports_file) do
@@ -891,24 +900,24 @@ class { 'apache': }
     end
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.not_to contain "ServerName" }
+      it { is_expected.not_to contain 'ServerName' }
     end
   end
 
   describe 'add_listen' do
+    pp = <<-MANIFEST
+      class { 'apache': default_vhost => false }
+      host { 'testlisten.server': ip => '127.0.0.1' }
+      apache::listen { '81': }
+      apache::vhost { 'testlisten.server':
+        docroot    => '/tmp',
+        port       => '80',
+        add_listen => false,
+        servername => 'testlisten.server',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': default_vhost => false }
-        host { 'testlisten.server': ip => '127.0.0.1' }
-        apache::listen { '81': }
-        apache::vhost { 'testlisten.server':
-          docroot    => '/tmp',
-          port       => '80',
-          add_listen => false,
-          servername => 'testlisten.server',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($ports_file) do
@@ -919,20 +928,20 @@ class { 'apache': default_vhost => false }
   end
 
   describe 'docroot' do
+    pp = <<-MANIFEST
+      user { 'test_owner': ensure => present, }
+      group { 'test_group': ensure => present, }
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot       => '/tmp/test',
+        docroot_owner => 'test_owner',
+        docroot_group => 'test_group',
+        docroot_mode  => '0750',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        user { 'test_owner': ensure => present, }
-        group { 'test_group': ensure => present, }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot       => '/tmp/test',
-          docroot_owner => 'test_owner',
-          docroot_group => 'test_group',
-          docroot_mode  => '0750',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file('/tmp/test') do
@@ -944,27 +953,24 @@ class { 'apache': }
   end
 
   describe 'default_vhost' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        default_vhost => true,
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          default_vhost => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file($ports_file) do
       it { is_expected.to be_file }
-      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-        it { is_expected.not_to contain 'NameVirtualHost test.server' }
-      elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10|16\.04)/
-        it { is_expected.not_to contain 'NameVirtualHost test.server' }
-      elsif fact('operatingsystem') == 'Debian' and fact('operatingsystemmajrelease') == '8'
-        it { is_expected.not_to contain 'NameVirtualHost test.server' }
-      elsif fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') >= '12'
+      if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
+         fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') =~ %r{(14\.04|13\.10|16\.04)} ||
+         fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8' ||
+         fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
         it { is_expected.to contain 'NameVirtualHost test.server' }
@@ -977,16 +983,16 @@ class { 'apache': }
   end
 
   describe 'options' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        options    => ['Indexes','FollowSymLinks', 'ExecCGI'],
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          options    => ['Indexes','FollowSymLinks', 'ExecCGI'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -996,16 +1002,16 @@ class { 'apache': }
   end
 
   describe 'override' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        override   => ['All'],
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          override   => ['All'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1015,16 +1021,16 @@ class { 'apache': }
   end
 
   describe 'logroot' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        logroot    => '/tmp',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          logroot    => '/tmp',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1033,7 +1039,7 @@ class { 'apache': }
     end
   end
 
-  ['access', 'error'].each do |logtype|
+  %w[access error].each do |logtype|
     case logtype
     when 'access'
       logname = 'CustomLog'
@@ -1042,17 +1048,17 @@ class { 'apache': }
     end
 
     describe "#{logtype}_log" do
+      pp = <<-MANIFEST
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          logroot    => '/tmp',
+          #{logtype}_log => false,
+        }
+      MANIFEST
       it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-        #{logtype}_log => false,
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1062,17 +1068,17 @@ class { 'apache': }
     end
 
     describe "#{logtype}_log_pipe" do
+      pp = <<-MANIFEST
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          logroot    => '/tmp',
+          #{logtype}_log_pipe => '|/bin/sh',
+        }
+      MANIFEST
       it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-        #{logtype}_log_pipe => '|/bin/sh',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1082,17 +1088,17 @@ class { 'apache': }
     end
 
     describe "#{logtype}_log_syslog" do
+      pp = <<-MANIFEST
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot    => '/tmp',
+          logroot    => '/tmp',
+          #{logtype}_log_syslog => 'syslog',
+        }
+      MANIFEST
       it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-        #{logtype}_log_syslog => 'syslog',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1103,18 +1109,18 @@ class { 'apache': }
   end
 
   describe 'access_log_format' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        logroot    => '/tmp',
+        access_log_syslog => 'syslog',
+        access_log_format => '%h %l',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          logroot    => '/tmp',
-          access_log_syslog => 'syslog',
-          access_log_format => '%h %l',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1124,18 +1130,18 @@ class { 'apache': }
   end
 
   describe 'access_log_env_var' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot            => '/tmp',
+        logroot            => '/tmp',
+        access_log_syslog  => 'syslog',
+        access_log_env_var => 'admin',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot            => '/tmp',
-          logroot            => '/tmp',
-          access_log_syslog  => 'syslog',
-          access_log_env_var => 'admin',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1145,22 +1151,22 @@ class { 'apache': }
   end
 
   describe 'multiple access_logs' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot            => '/tmp',
+        logroot            => '/tmp',
+        access_logs => [
+          {'file' => 'log1'},
+          {'file' => 'log2', 'env' => 'admin' },
+          {'file' => '/var/tmp/log3', 'format' => '%h %l'},
+          {'syslog' => 'syslog' }
+        ]
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot            => '/tmp',
-          logroot            => '/tmp',
-          access_logs => [
-            {'file' => 'log1'},
-            {'file' => 'log2', 'env' => 'admin' },
-            {'file' => '/var/tmp/log3', 'format' => '%h %l'},
-            {'syslog' => 'syslog' }
-          ]
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1173,19 +1179,19 @@ class { 'apache': }
   end
 
   describe 'aliases' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        aliases => [
+          { alias       => '/image'    , path => '/ftp/pub/image' }   ,
+          { scriptalias => '/myscript' , path => '/usr/share/myscript' }
+        ],
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          aliases => [
-            { alias       => '/image'    , path => '/ftp/pub/image' }   ,
-            { scriptalias => '/myscript' , path => '/usr/share/myscript' }
-          ],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1196,16 +1202,16 @@ class { 'apache': }
   end
 
   describe 'scriptaliases' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
+      }
+  MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1215,16 +1221,16 @@ class { 'apache': }
   end
 
   describe 'proxy' do
+    pp = <<-MANIFEST
+      class { 'apache': service_ensure => stopped, }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot    => '/tmp',
+        proxy_dest => 'test2',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          proxy_dest => 'test2',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1234,17 +1240,17 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'actions' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot => '/tmp',
+        action  => 'php-fastcgi',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot => '/tmp',
-          action  => 'php-fastcgi',
-        }
-      EOS
-      pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian' || fact('osfamily') == 'Suse'
-      apply_manifest(pp, :catch_failures => true)
+      pp += "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian' || fact('osfamily') == 'Suse'
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1254,18 +1260,18 @@ class { 'apache': }
   end
 
   describe 'suphp' do
+    pp = <<-MANIFEST
+      class { 'apache': service_ensure => stopped, }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot          => '/tmp',
+        suphp_addhandler => '#{$suphp_handler}',
+        suphp_engine     => 'on',
+        suphp_configpath => '#{$suphp_configpath}',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          suphp_addhandler => '#{$suphp_handler}',
-          suphp_engine     => 'on',
-          suphp_configpath => '#{$suphp_configpath}',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1277,18 +1283,18 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'rack_base_uris' do
-    unless fact('osfamily') == 'RedHat' or fact('operatingsystem') == 'SLES'
-      it 'applies cleanly' do
-        test = lambda do
-          pp = <<-EOS
-            class { 'apache': }
-            host { 'test.server': ip => '127.0.0.1' }
-            apache::vhost { 'test.server':
-              docroot          => '/tmp',
-              rack_base_uris  => ['/test'],
-            }
-          EOS
-          apply_manifest(pp, :catch_failures => true)
+    unless fact('osfamily') == 'RedHat' || fact('operatingsystem') == 'SLES'
+      test = -> do
+        pp = <<-MANIFEST
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot          => '/tmp',
+            rack_base_uris  => ['/test'],
+          }
+        MANIFEST
+        it 'applies cleanly' do
+          apply_manifest(pp, catch_failures: true)
         end
         test.call
       end
@@ -1296,17 +1302,17 @@ class { 'apache': }
   end
 
   describe 'no_proxy_uris' do
+    pp = <<-MANIFEST
+      class { 'apache': service_ensure => stopped, }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot          => '/tmp',
+        proxy_dest       => 'http://test2',
+        no_proxy_uris    => [ 'http://test2/test' ],
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          proxy_dest       => 'http://test2',
-          no_proxy_uris    => [ 'http://test2/test' ],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1317,18 +1323,18 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'redirect' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot          => '/tmp',
+        redirect_source  => ['/images'],
+        redirect_dest    => ['http://test.server/'],
+        redirect_status  => ['permanent'],
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          redirect_source  => ['/images'],
-          redirect_dest    => ['http://test.server/'],
-          redirect_status  => ['permanent'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1338,16 +1344,16 @@ class { 'apache': }
   end
 
   describe 'request_headers' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot          => '/tmp',
+        request_headers  => ['append MirrorID "mirror 12"'],
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          request_headers  => ['append MirrorID "mirror 12"'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1357,22 +1363,22 @@ class { 'apache': }
   end
 
   describe 'rewrite rules' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot          => '/tmp',
+        rewrites => [
+          { comment => 'test',
+            rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
+            rewrite_rule => ['^index\.html$ welcome.html'],
+            rewrite_map  => ['lc int:tolower'],
+          }
+        ],
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          rewrites => [
-            { comment => 'test',
-              rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
-              rewrite_rule => ['^index\.html$ welcome.html'],
-              rewrite_map  => ['lc int:tolower'],
-            }
-          ],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1385,59 +1391,59 @@ class { 'apache': }
   end
 
   describe 'directory rewrite rules' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        if ! defined(Class['apache::mod::rewrite']) {
-          include ::apache::mod::rewrite
-        }
-        apache::vhost { 'test.server':
-          docroot      => '/tmp',
-          directories  => [
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      if ! defined(Class['apache::mod::rewrite']) {
+        include ::apache::mod::rewrite
+      }
+      apache::vhost { 'test.server':
+        docroot      => '/tmp',
+        directories  => [
+          {
+          path => '/tmp',
+          rewrites => [
             {
-            path => '/tmp',
-            rewrites => [
-              {
-              comment => 'Permalink Rewrites',
-              rewrite_base => '/',
-              },
-              { rewrite_rule => [ '^index\\.php$ - [L]' ] },
-              { rewrite_cond => [
-                '%{REQUEST_FILENAME} !-f',
-                '%{REQUEST_FILENAME} !-d',                                                                                             ],                                                                                                                     rewrite_rule => [ '. /index.php [L]' ],                                                                              }
-              ],
+            comment => 'Permalink Rewrites',
+            rewrite_base => '/',
             },
+            { rewrite_rule => [ '^index\\.php$ - [L]' ] },
+            { rewrite_cond => [
+              '%{REQUEST_FILENAME} !-f',
+              '%{REQUEST_FILENAME} !-d',                                                                                             ],                                                                                                                     rewrite_rule => [ '. /index.php [L]' ],                                                                              }
             ],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+          },
+          ],
+      }
+    MANIFEST
+    it 'applies cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '#Permalink Rewrites' }
-      it { should contain 'RewriteEngine On' }
-      it { should contain 'RewriteBase /' }
-      it { should contain 'RewriteRule ^index\.php$ - [L]' }
-      it { should contain 'RewriteCond %{REQUEST_FILENAME} !-f' }
-      it { should contain 'RewriteCond %{REQUEST_FILENAME} !-d' }
-      it { should contain 'RewriteRule . /index.php [L]' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain '#Permalink Rewrites' }
+      it { is_expected.to contain 'RewriteEngine On' }
+      it { is_expected.to contain 'RewriteBase /' }
+      it { is_expected.to contain 'RewriteRule ^index\.php$ - [L]' }
+      it { is_expected.to contain 'RewriteCond %{REQUEST_FILENAME} !-f' }
+      it { is_expected.to contain 'RewriteCond %{REQUEST_FILENAME} !-d' }
+      it { is_expected.to contain 'RewriteRule . /index.php [L]' }
     end
   end
 
   describe 'setenv/setenvif' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot  => '/tmp',
+        setenv   => ['TEST /test'],
+        setenvif => ['Request_URI "\.gif$" object_is_image=gif']
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          setenv   => ['TEST /test'],
-          setenvif => ['Request_URI "\.gif$" object_is_image=gif']
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1448,16 +1454,16 @@ class { 'apache': }
   end
 
   describe 'block' do
-    it 'applies cleanly' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
           docroot  => '/tmp',
           block    => 'scm',
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'applies cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1467,51 +1473,51 @@ class { 'apache': }
   end
 
   describe 'wsgi' do
-    context 'on lucid', :if => fact('lsbdistcodename') == 'lucid' do
+    context 'on lucid', if: fact('lsbdistcodename') == 'lucid' do
+      pp = <<-MANIFEST
+        class { 'apache': }
+        class { 'apache::mod::wsgi': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot                     => '/tmp',
+          wsgi_application_group      => '%{GLOBAL}',
+          wsgi_daemon_process         => 'wsgi',
+          wsgi_daemon_process_options => {processes => '2'},
+          wsgi_process_group          => 'nobody',
+          wsgi_script_aliases         => { '/test' => '/test1' },
+          wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
+          wsgi_pass_authorization     => 'On',
+        }
+      MANIFEST
       it 'import_script applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          class { 'apache::mod::wsgi': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot                     => '/tmp',
-            wsgi_application_group      => '%{GLOBAL}',
-            wsgi_daemon_process         => 'wsgi',
-            wsgi_daemon_process_options => {processes => '2'},
-            wsgi_process_group          => 'nobody',
-            wsgi_script_aliases         => { '/test' => '/test1' },
-            wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
-            wsgi_pass_authorization     => 'On',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
     end
 
-    context 'on everything but lucid', :unless => (fact('lsbdistcodename') == 'lucid' or fact('operatingsystem') == 'SLES') do
+    context 'on everything but lucid', unless: (fact('lsbdistcodename') == 'lucid' || fact('operatingsystem') == 'SLES') do
+      pp = <<-MANIFEST
+        class { 'apache': }
+        class { 'apache::mod::wsgi': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot                     => '/tmp',
+          wsgi_application_group      => '%{GLOBAL}',
+          wsgi_daemon_process         => 'wsgi',
+          wsgi_daemon_process_options => {processes => '2'},
+          wsgi_import_script          => '/test1',
+          wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
+          wsgi_process_group          => 'nobody',
+          wsgi_script_aliases         => { '/test' => '/test1' },
+          wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
+          wsgi_pass_authorization     => 'On',
+          wsgi_chunked_request        => 'On',
+        }
+      MANIFEST
       it 'import_script applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          class { 'apache::mod::wsgi': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot                     => '/tmp',
-            wsgi_application_group      => '%{GLOBAL}',
-            wsgi_daemon_process         => 'wsgi',
-            wsgi_daemon_process_options => {processes => '2'},
-            wsgi_import_script          => '/test1',
-            wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
-            wsgi_process_group          => 'nobody',
-            wsgi_script_aliases         => { '/test' => '/test1' },
-            wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
-            wsgi_pass_authorization     => 'On',
-            wsgi_chunked_request        => 'On',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
 
-      describe file("#{$vhost_dir}/25-test.server.conf") do
+      describe file("#{$vhost_dir}/25-test.server.conf") do # rubocop:disable RSpec/NestedGroups
         it { is_expected.to be_file }
         it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
         it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
@@ -1525,16 +1531,16 @@ class { 'apache::mod::wsgi': }
   end
 
   describe 'custom_fragment' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot  => '/tmp',
+        custom_fragment => inline_template('#weird test string'),
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          custom_fragment => inline_template('#weird test string'),
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1544,16 +1550,16 @@ class { 'apache': }
   end
 
   describe 'itk' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot  => '/tmp',
+        itk      => { user => 'nobody', group => 'nobody' }
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          itk      => { user => 'nobody', group => 'nobody' }
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1566,59 +1572,58 @@ class { 'apache': }
   case fact('osfamily')
   when 'Debian'
     describe 'fastcgi' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          $_os = $::operatingsystem
-
-          if $_os == 'Ubuntu' {
-            $_location = "http://archive.ubuntu.com/ubuntu/"
-            $_security_location = "http://archive.ubuntu.com/ubuntu/"
-            $_release = $::lsbdistcodename
-            $_release_security = "${_release}-security"
-            $_repos = "main universe multiverse"
-          } else {
-            $_location = "http://httpredir.debian.org/debian/"
-            $_security_location = "http://security.debian.org/"
-            $_release = $::lsbdistcodename
-            $_release_security = "${_release}/updates"
-            $_repos = "main contrib non-free"
-          }
-
-          include ::apt
-          apt::source { "${_os}_${_release}":
-            location    => $_location,
-            release     => $_release,
-            repos       => $_repos,
-          }
+      pp_one = <<-MANIFEST
+        $_os = $::operatingsystem
+
+        if $_os == 'Ubuntu' {
+          $_location = "http://archive.ubuntu.com/ubuntu/"
+          $_security_location = "http://archive.ubuntu.com/ubuntu/"
+          $_release = $::lsbdistcodename
+          $_release_security = "${_release}-security"
+          $_repos = "main universe multiverse"
+        } else {
+          $_location = "http://httpredir.debian.org/debian/"
+          $_security_location = "http://security.debian.org/"
+          $_release = $::lsbdistcodename
+          $_release_security = "${_release}/updates"
+          $_repos = "main contrib non-free"
+        }
 
-          apt::source { "${_os}_${_release}-updates":
-            location    => $_location,
-            release     => "${_release}-updates",
-            repos       => $_repos,
-          }
+        include ::apt
+        apt::source { "${_os}_${_release}":
+          location    => $_location,
+          release     => $_release,
+          repos       => $_repos,
+        }
 
-          apt::source { "${_os}_${_release}-security":
-            location    => $_security_location,
-            release     => $_release_security,
-            repos       => $_repos,
-          }
-        EOS
+        apt::source { "${_os}_${_release}-updates":
+          location    => $_location,
+          release     => "${_release}-updates",
+          repos       => $_repos,
+        }
 
-        #apt-get update may not run clean here. Should be OK.
-        apply_manifest(pp, :catch_failures => false)
+        apt::source { "${_os}_${_release}-security":
+          location    => $_security_location,
+          release     => $_release_security,
+          repos       => $_repos,
+        }
+      MANIFEST
+      pp_two = <<-MANIFEST
+        class { 'apache': }
+        class { 'apache::mod::fastcgi': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot        => '/tmp',
+          fastcgi_server => 'localhost',
+          fastcgi_socket => '/tmp/fast/1234',
+          fastcgi_dir    => '/tmp/fast',
+        }
+      MANIFEST
+      it 'applies cleanly' do
+        # apt-get update may not run clean here. Should be OK.
+        apply_manifest(pp_one, catch_failures: false)
 
-        pp2 = <<-EOS
-          class { 'apache': }
-          class { 'apache::mod::fastcgi': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot        => '/tmp',
-            fastcgi_server => 'localhost',
-            fastcgi_socket => '/tmp/fast/1234',
-            fastcgi_dir    => '/tmp/fast',
-          }
-        EOS
-        apply_manifest(pp2, :catch_failures => true, :acceptable_exit_codes => [0, 2])
+        apply_manifest(pp_two, catch_failures: true, acceptable_exit_codes: [0, 2])
       end
 
       describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1630,36 +1635,36 @@ class { 'apache::mod::fastcgi': }
   end
 
   describe 'additional_includes' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        if $::osfamily == 'RedHat' and "$::selinux" == "true" {
-          $semanage_package = $::operatingsystemmajrelease ? {
-            '5'     => 'policycoreutils',
-            default => 'policycoreutils-python',
-          }
-          exec { 'set_apache_defaults':
-            command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-            require => Package[$semanage_package],
-          }
-          package { $semanage_package: ensure => installed }
-          exec { 'restorecon_apache':
-            command => 'restorecon -Rv /apache_spec',
-            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-            before  => Service['httpd'],
-            require => Class['apache'],
-          }
+    pp = <<-MANIFEST
+      if $::osfamily == 'RedHat' and "$::selinux" == "true" {
+        $semanage_package = $::operatingsystemmajrelease ? {
+          '5'     => 'policycoreutils',
+          default => 'policycoreutils-python',
         }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        file { '/apache_spec': ensure => directory, }
-        file { '/apache_spec/include': ensure => present, content => '#additional_includes' }
-        apache::vhost { 'test.server':
-          docroot             => '/apache_spec',
-          additional_includes => '/apache_spec/include',
+        exec { 'set_apache_defaults':
+          command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
+          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          require => Package[$semanage_package],
+        }
+        package { $semanage_package: ensure => installed }
+        exec { 'restorecon_apache':
+          command => 'restorecon -Rv /apache_spec',
+          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          before  => Service['httpd'],
+          require => Class['apache'],
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      }
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      file { '/apache_spec': ensure => directory, }
+      file { '/apache_spec/include': ensure => present, content => '#additional_includes' }
+      apache::vhost { 'test.server':
+        docroot             => '/apache_spec',
+        additional_includes => '/apache_spec/include',
+      }
+    MANIFEST
+    it 'applies cleanly' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1669,15 +1674,15 @@ class { 'apache': }
   end
 
   describe 'virtualhost without priority prefix' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      apache::vhost { 'test.server':
+        priority => false,
+        docroot => '/tmp'
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'test.server':
-          priority => false,
-          docroot => '/tmp'
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/test.server.conf") do
@@ -1686,21 +1691,21 @@ class { 'apache': }
   end
 
   describe 'SSLProtocol directive' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      apache::vhost { 'test.server':
+        docroot      => '/tmp',
+        ssl          => true,
+        ssl_protocol => ['All', '-SSLv2'],
+      }
+      apache::vhost { 'test2.server':
+        docroot      => '/tmp',
+        ssl          => true,
+        ssl_protocol => 'All -SSLv2',
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'test.server':
-          docroot      => '/tmp',
-          ssl          => true,
-          ssl_protocol => ['All', '-SSLv2'],
-        }
-        apache::vhost { 'test2.server':
-          docroot      => '/tmp',
-          ssl          => true,
-          ssl_protocol => 'All -SSLv2',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-test.server.conf") do
@@ -1714,19 +1719,19 @@ class { 'apache': }
     end
   end
 
-  describe 'shibboleth parameters', :if => (fact('osfamily') == 'Debian' and fact('operatingsystemmajrelease') != '7') do
+  describe 'shibboleth parameters', if: (fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') != '7') do
     # Debian 7 is too old for ShibCompatValidUser
+    pp = <<-MANIFEST
+      class { 'apache': }
+      class { 'apache::mod::shib': }
+      apache::vhost { 'test.server':
+        port    => '80',
+        docroot => '/var/www/html',
+        shib_compat_valid_user => 'On'
+      }
+    MANIFEST
     it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::shib': }
-        apache::vhost { 'test.server':
-          port    => '80',
-          docroot => '/var/www/html',
-          shib_compat_valid_user => 'On'
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
     describe file("#{$vhost_dir}/25-test.server.conf") do
       it { is_expected.to be_file }
diff --git a/spec/acceptance/vhosts_spec.rb b/spec/acceptance/vhosts_spec.rb
index d8fb062f9d..9c49c5b173 100644
--- a/spec/acceptance/vhosts_spec.rb
+++ b/spec/acceptance/vhosts_spec.rb
@@ -3,8 +3,7 @@
 
 describe 'apache::vhosts class' do
   context 'custom vhosts defined via class apache::vhosts' do
-    it 'should create custom vhost config files' do
-      pp = <<-EOS
+    pp = <<-MANIFEST
         class { 'apache::vhosts':
           vhosts => {
             'custom_vhost_1' => {
@@ -17,8 +16,9 @@ class { 'apache::vhosts':
             },
           },
         }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
+    MANIFEST
+    it 'creates custom vhost config files' do
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file("#{$vhost_dir}/25-custom_vhost_1.conf") do
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 025b99b46b..5c341f8541 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -1,918 +1,976 @@
 require 'spec_helper'
 
-describe 'apache', :type => :class do
-  context "on a Debian OS" do
+describe 'apache', type: :class do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        lsbdistcodename: 'squeeze',
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '6',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        concat_basedir: '/dne',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_package("httpd").with(
-      'notify' => 'Class[Apache::Service]',
-      'ensure' => 'installed'
+
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_package('httpd').with(
+        'notify' => 'Class[Apache::Service]',
+        'ensure' => 'installed',
       )
     }
-    it { is_expected.to contain_user("www-data") }
-    it { is_expected.to contain_group("www-data") }
-    it { is_expected.to contain_class("apache::service") }
-    it { is_expected.to contain_file("/var/www").with(
-      'ensure'  => 'directory'
+    it { is_expected.to contain_user('www-data') }
+    it { is_expected.to contain_group('www-data') }
+    it { is_expected.to contain_class('apache::service') }
+    it {
+      is_expected.to contain_file('/var/www').with(
+        'ensure' => 'directory',
       )
     }
-    it { is_expected.to contain_file("/etc/apache2/sites-enabled").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
+    it {
+      is_expected.to contain_file('/etc/apache2/sites-enabled').with(
+        'ensure' => 'directory', 'recurse' => 'true',
+        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
       )
     }
-    it { is_expected.to contain_file("/etc/apache2/mods-enabled").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
+    it {
+      is_expected.to contain_file('/etc/apache2/mods-enabled').with(
+        'ensure' => 'directory', 'recurse' => 'true',
+        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
       )
     }
-    it { is_expected.to contain_file("/etc/apache2/mods-available").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'false',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
+    it {
+      is_expected.to contain_file('/etc/apache2/mods-available').with(
+        'ensure' => 'directory', 'recurse' => 'true',
+        'purge' => 'false', 'notify' => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
       )
     }
-    it { is_expected.to contain_concat("/etc/apache2/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'root',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
+    it {
+      is_expected.to contain_concat('/etc/apache2/ports.conf').with(
+        'owner' => 'root', 'group' => 'root',
+        'mode' => '0644', 'notify' => 'Class[Apache::Service]'
       )
     }
     # Assert that load files are placed and symlinked for these mods, but no conf file.
-    [
-      'auth_basic',
-      'authn_file',
-      'authz_default',
-      'authz_groupfile',
-      'authz_host',
-      'authz_user',
-      'dav',
-      'env'
+    %w[
+      auth_basic
+      authn_file
+      authz_default
+      authz_groupfile
+      authz_host
+      authz_user
+      dav
+      env
     ].each do |modname|
-      it { is_expected.to contain_file("#{modname}.load").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { is_expected.to contain_file("#{modname}.load symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.load"
-      ) }
+      it { # rubocop:disable RSpec/RepeatedExample
+        is_expected.to contain_file("#{modname}.load").with(
+          'path'   => "/etc/apache2/mods-available/#{modname}.load",
+          'ensure' => 'file',
+        )
+      }
+      it { # rubocop:disable RSpec/RepeatedExample
+        is_expected.to contain_file("#{modname}.load symlink").with(
+          'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
+          'ensure' => 'link',
+          'target' => "/etc/apache2/mods-available/#{modname}.load",
+        )
+      }
       it { is_expected.not_to contain_file("#{modname}.conf") }
       it { is_expected.not_to contain_file("#{modname}.conf symlink") }
     end
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :params do
-        { :apache_version => '2.2' }
+        { apache_version: '2.2' }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :params do
         {
-          :apache_version => '2.4',
-          :use_optional_includes => true
+          apache_version: '2.4',
+          use_optional_includes: true,
         }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
     end
 
-    context "when specifying slash encoding behaviour" do
+    context 'when specifying slash encoding behaviour' do
       let :params do
-        { :allow_encoded_slashes => 'nodecode' }
+        { allow_encoded_slashes: 'nodecode' }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AllowEncodedSlashes nodecode$} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^AllowEncodedSlashes nodecode$} }
     end
 
-    context "when specifying fileETag behaviour" do
+    context 'when specifying fileETag behaviour' do
       let :params do
-        { :file_e_tag => 'None' }
+        { file_e_tag: 'None' }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^FileETag None$} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^FileETag None$} }
     end
 
-    context "when specifying canonical name behaviour" do
+    context 'when specifying canonical name behaviour' do
       let :params do
-        { :use_canonical_name => 'dns' }
+        { use_canonical_name: 'dns' }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^UseCanonicalName dns$} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^UseCanonicalName dns$} }
     end
 
-    context "when specifying default character set" do
+    context 'when specifying default character set' do
       let :params do
-        { :default_charset => 'none' }
+        { default_charset: 'none' }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AddDefaultCharset none$} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^AddDefaultCharset none$} }
     end
 
     # Assert that both load files and conf files are placed and symlinked for these mods
-    [
-      'alias',
-      'autoindex',
-      'dav_fs',
-      'deflate',
-      'dir',
-      'mime',
-      'negotiation',
-      'setenvif',
+    %w[
+      alias
+      autoindex
+      dav_fs
+      deflate
+      dir
+      mime
+      negotiation
+      setenvif
     ].each do |modname|
-      it { is_expected.to contain_file("#{modname}.load").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { is_expected.to contain_file("#{modname}.load symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.load"
-      ) }
-      it { is_expected.to contain_file("#{modname}.conf").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.conf",
-        'ensure' => 'file'
-      ) }
-      it { is_expected.to contain_file("#{modname}.conf symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.conf",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.conf"
-      ) }
-    end
-
-    describe "Check default type" do
-      context "with Apache version < 2.4" do
-        let :params do
-          {
-            :apache_version => '2.2',
-          }
-        end
-
-       context "when default_type => 'none'" do
-          let :params do
-            { :default_type => 'none' }
-          end
-
-          it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^DefaultType none$} }
-        end
-        context "when default_type => 'text/plain'" do
-          let :params do
-            { :default_type => 'text/plain' }
-          end
+      it { # rubocop:disable RSpec/RepeatedExample
+        is_expected.to contain_file("#{modname}.load").with(
+          'path'   => "/etc/apache2/mods-available/#{modname}.load",
+          'ensure' => 'file',
+        )
+      }
+      it { # rubocop:disable RSpec/RepeatedExample
+        is_expected.to contain_file("#{modname}.load symlink").with(
+          'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
+          'ensure' => 'link',
+          'target' => "/etc/apache2/mods-available/#{modname}.load",
+        )
+      }
+      it {
+        is_expected.to contain_file("#{modname}.conf").with(
+          'path'   => "/etc/apache2/mods-available/#{modname}.conf",
+          'ensure' => 'file',
+        )
+      }
+      it {
+        is_expected.to contain_file("#{modname}.conf symlink").with(
+          'path'   => "/etc/apache2/mods-enabled/#{modname}.conf",
+          'ensure' => 'link',
+          'target' => "/etc/apache2/mods-available/#{modname}.conf",
+        )
+      }
+    end
 
-          it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^DefaultType text/plain$} }
-        end
+    describe "Check default type with Apache version < 2.2 when default_type => 'none'" do
+      let :params do
+        {
+          apache_version: '2.2',
+          default_type: 'none',
+        }
       end
 
-      context "with Apache version >= 2.4" do
-        let :params do
-          {
-            :apache_version => '2.4',
-          }
-        end
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^DefaultType [.]*$} }
-      end
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^DefaultType none$} }
     end
+    describe "Check default type with Apache version < 2.2 when default_type => 'text/plain'" do
+      let :params do
+        {
+          apache_version: '2.2',
+          default_type: 'text/plain',
+        }
+      end
 
-    describe "Don't create user resource" do
-      context "when parameter manage_user is false" do
-        let :params do
-          { :manage_user => false }
-        end
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^DefaultType text/plain$} }
+    end
 
-        it { is_expected.not_to contain_user('www-data') }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^User www-data\n} }
+    describe 'Check default type with Apache version >= 2.4' do
+      let :params do
+        { apache_version: '2.4' }
       end
+
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').without_content %r{^DefaultType [.]*$} }
     end
-    describe "Don't create group resource" do
-      context "when parameter manage_group is false" do
-        let :params do
-          { :manage_group => false }
-        end
 
-        it { is_expected.not_to contain_group('www-data') }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^Group www-data\n} }
+    describe "Don't create user resource when parameter manage_user is false" do
+      let :params do
+        { manage_user: false }
       end
+
+      it { is_expected.not_to contain_user('www-data') }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^User www-data\n} }
     end
+    describe "Don't create group resource when parameter manage_group is false" do
+      let :params do
+        { manage_group: false }
+      end
 
-    describe "Add extra LogFormats" do
-      context "When parameter log_formats is a hash" do
-        let :params do
-          { :log_formats => {
-            'vhost_common'   => "%v %h %l %u %t \"%r\" %>s %b",
-            'vhost_combined' => "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
-          } }
-        end
+      it { is_expected.not_to contain_group('www-data') }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^Group www-data\n} }
+    end
 
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" vhost_combined\n} }
+    describe 'Add extra LogFormats When parameter log_formats is a hash' do
+      let :params do
+        { log_formats: {
+          'vhost_common'   => '%v %h %l %u %t "%r" %>s %b',
+          'vhost_combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
+        } }
       end
+
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" vhost_combined\n} }
     end
 
-    describe "Override existing LogFormats" do
-      context "When parameter log_formats is a hash" do
-        let :params do
-          { :log_formats => {
-            'common'   => "%v %h %l %u %t \"%r\" %>s %b",
-            'combined' => "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
-          } }
-        end
+    describe 'Override existing LogFormats When parameter log_formats is a hash' do
+      let :params do
+        { log_formats: {
+          'common'   => '%v %h %l %u %t "%r" %>s %b',
+          'combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
+        } }
+      end
 
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n} }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n} }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} }
-        it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} }
+      expected = [
+        %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n},
+        %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n},
+        %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n},
+      ]
+      unexpected = [
+        %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n},
+        %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n},
+      ]
+      it 'Expected to contain' do
+        expected.each do |reg|
+          is_expected.to contain_file('/etc/apache2/apache2.conf').with_content reg
+        end
+      end
+      it 'Not expected to contain' do
+        unexpected.each do |reg|
+          is_expected.to contain_file('/etc/apache2/apache2.conf').without_content reg
+        end
       end
     end
 
-    context "8" do
+    context '8' do
       let :facts do
-        super().merge({
-          :lsbdistcodename        => 'jessie',
-          :operatingsystemrelease => '8'
-        })
-      end
-      it { is_expected.to contain_file("/var/www/html").with(
-        'ensure'  => 'directory'
-         )
-        }
+        super().merge(lsbdistcodename: 'jessie',
+                      operatingsystemrelease: '8')
       end
-    context "on Ubuntu" do
+
+      it {
+        is_expected.to contain_file('/var/www/html').with(
+          'ensure' => 'directory',
+        )
+      }
+    end
+    context 'on Ubuntu 14.04' do
       let :facts do
-        super().merge({
-          :operatingsystem => 'Ubuntu'
-        })
+        super().merge(operatingsystem: 'Ubuntu',
+                      lsbdistrelease: '14.04',
+                      operatingsystemrelease: '14.04')
       end
 
-      context "14.04" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '14.04',
-            :operatingsystemrelease => '14.04'
-          })
-        end
-        it { is_expected.to contain_file("/var/www/html").with(
-          'ensure'  => 'directory'
-          )
-        }
+      it {
+        is_expected.to contain_file('/var/www/html').with(
+          'ensure' => 'directory',
+        )
+      }
+    end
+    context 'on Ubuntu 13.10' do
+      let :facts do
+        super().merge(operatingsystem: 'Ubuntu',
+                      lsbdistrelease: '13.10',
+                      operatingsystemrelease: '13.10')
       end
-      context "13.10" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '13.10',
-            :operatingsystemrelease => '13.10'
-          })
-        end
-        it { is_expected.to contain_class('apache').with_apache_version('2.4') }
-      end
-      context "12.04" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '12.04',
-            :operatingsystemrelease => '12.04'
-          })
-        end
-        it { is_expected.to contain_class('apache').with_apache_version('2.2') }
-      end
-      context "13.04" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '13.04',
-            :operatingsystemrelease => '13.04'
-          })
-        end
-        it { is_expected.to contain_class('apache').with_apache_version('2.2') }
+
+      it { is_expected.to contain_class('apache').with_apache_version('2.4') }
+    end
+    context 'on Ubuntu 12.04' do
+      let :facts do
+        super().merge(operatingsystem: 'Ubuntu',
+                      lsbdistrelease: '12.04',
+                      operatingsystemrelease: '12.04')
       end
+
+      it { is_expected.to contain_class('apache').with_apache_version('2.2') }
+    end
+    context 'on Ubuntu 13.04' do
+      let :facts do
+        super().merge(operatingsystem: 'Ubuntu',
+                      lsbdistrelease: '13.04',
+                      operatingsystemrelease: '13.04')
+      end
+
+      it { is_expected.to contain_class('apache').with_apache_version('2.2') }
     end
   end
-  context "on a RedHat 5 OS" do
+
+  context 'on a RedHat 5 OS' do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '5',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '5',
+        concat_basedir: '/dne',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_package("httpd").with(
-      'notify' => 'Class[Apache::Service]',
-      'ensure' => 'installed'
+
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_package('httpd').with(
+        'notify' => 'Class[Apache::Service]',
+        'ensure' => 'installed',
       )
     }
-    it { is_expected.to contain_user("apache") }
-    it { is_expected.to contain_group("apache") }
-    it { is_expected.to contain_class("apache::service") }
-    it { is_expected.to contain_file("/var/www/html").with(
-      'ensure'  => 'directory'
+    it { is_expected.to contain_user('apache') }
+    it { is_expected.to contain_group('apache') }
+    it { is_expected.to contain_class('apache::service') }
+    it {
+      is_expected.to contain_file('/var/www/html').with(
+        'ensure' => 'directory',
       )
     }
-    it { is_expected.to contain_file("/etc/httpd/conf.d").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
+    it {
+      is_expected.to contain_file('/etc/httpd/conf.d').with(
+        'ensure' => 'directory', 'recurse' => 'true',
+        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
       )
     }
-    it { is_expected.to contain_concat("/etc/httpd/conf/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'root',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
+    it {
+      is_expected.to contain_concat('/etc/httpd/conf/ports.conf').with(
+        'owner' => 'root', 'group' => 'root',
+        'mode' => '0644', 'notify' => 'Class[Apache::Service]'
       )
     }
-    describe "Alternate confd/mod/vhosts directory" do
+    describe 'Alternate confd/mod/vhosts directory' do
       let :params do
         {
-          :vhost_dir => '/etc/httpd/site.d',
-          :confd_dir => '/etc/httpd/conf.d',
-          :mod_dir   => '/etc/httpd/mod.d',
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
         }
       end
 
-      ['mod.d','site.d','conf.d'].each do |dir|
-        it { is_expected.to contain_file("/etc/httpd/#{dir}").with(
-          'ensure'  => 'directory',
-          'recurse' => 'true',
-          'purge'   => 'true',
-          'notify'  => 'Class[Apache::Service]',
-          'require' => 'Package[httpd]'
-        ) }
+      ['mod.d', 'site.d', 'conf.d'].each do |dir|
+        it {
+          is_expected.to contain_file("/etc/httpd/#{dir}").with(
+            'ensure' => 'directory', 'recurse' => 'true',
+            'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+            'require' => 'Package[httpd]'
+          )
+        }
       end
 
       # Assert that load files are placed for these mods, but no conf file.
-      [
-        'auth_basic',
-        'authn_file',
-        'authz_default',
-        'authz_groupfile',
-        'authz_host',
-        'authz_user',
-        'dav',
-        'env',
+      %w[
+        auth_basic
+        authn_file
+        authz_default
+        authz_groupfile
+        authz_host
+        authz_user
+        dav
+        env
       ].each do |modname|
-        it { is_expected.to contain_file("#{modname}.load").with_path(
-          "/etc/httpd/mod.d/#{modname}.load"
-        ) }
-        it { is_expected.not_to contain_file("#{modname}.conf").with_path(
-          "/etc/httpd/mod.d/#{modname}.conf"
-        ) }
+        it { # rubocop:disable RSpec/RepeatedExample
+          is_expected.to contain_file("#{modname}.load").with_path(
+            "/etc/httpd/mod.d/#{modname}.load",
+          )
+        }
+        it {
+          is_expected.not_to contain_file("#{modname}.conf").with_path(
+            "/etc/httpd/mod.d/#{modname}.conf",
+          )
+        }
       end
 
       # Assert that both load files and conf files are placed for these mods
-      [
-        'alias',
-        'autoindex',
-        'dav_fs',
-        'deflate',
-        'dir',
-        'mime',
-        'negotiation',
-        'setenvif',
+      %w[
+        alias
+        autoindex
+        dav_fs
+        deflate
+        dir
+        mime
+        negotiation
+        setenvif
       ].each do |modname|
-        it { is_expected.to contain_file("#{modname}.load").with_path(
-          "/etc/httpd/mod.d/#{modname}.load"
-        ) }
-        it { is_expected.to contain_file("#{modname}.conf").with_path(
-          "/etc/httpd/mod.d/#{modname}.conf"
-        ) }
+        it { # rubocop:disable RSpec/RepeatedExample
+          is_expected.to contain_file("#{modname}.load").with_path(
+            "/etc/httpd/mod.d/#{modname}.load",
+          )
+        }
+        it {
+          is_expected.to contain_file("#{modname}.conf").with_path(
+            "/etc/httpd/mod.d/#{modname}.conf",
+          )
+        }
       end
 
-      context "with Apache version < 2.4" do
-        let :params do
-          { :apache_version => '2.2' }
-        end
-
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
+    end
+    describe 'Alternate confd/mod/vhosts directory with Apache version < 2.4' do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          apache_version: '2.2',
+        }
       end
 
-      context "with Apache version >= 2.4" do
-        let :params do
-          {
-            :apache_version => '2.4',
-            :use_optional_includes => true
-          }
-        end
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
+    end
+    describe 'Alternate confd/mod/vhosts directory with Apache version >= 2.4' do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          apache_version: '2.4',
+          use_optional_includes: true,
+        }
+      end
 
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
+    end
+    describe 'Alternate confd/mod/vhosts directory with Apache version < 2.4' do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          apache_version: '2.2',
+          rewrite_lock: '/var/lock/subsys/rewrite-lock',
+        }
       end
 
-      context "with Apache version < 2.4" do
-        let :params do
-          {
-            :apache_version => '2.2',
-            :rewrite_lock => '/var/lock/subsys/rewrite-lock'
-          }
-        end
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^RewriteLock /var/lock/subsys/rewrite-lock$} }
+    end
+    describe 'Alternate confd/mod/vhosts directory with Apache version < 2.4' do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          apache_version: '2.2',
+        }
+      end
 
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^RewriteLock /var/lock/subsys/rewrite-lock$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').without_content %r{^RewriteLock [.]*$} }
+    end
+    describe 'Alternate confd/mod/vhosts directory with Apache version >= 2.4' do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          apache_version: '2.4',
+          rewrite_lock: '/var/lock/subsys/rewrite-lock',
+        }
       end
 
-      context "with Apache version < 2.4" do
-        let :params do
-          {
-            :apache_version => '2.2'
-          }
-        end
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').without_content %r{^RewriteLock [.]*$} }
+    end
+    describe 'Alternate confd/mod/vhosts directory when specifying slash encoding behaviour' do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          allow_encoded_slashes: 'nodecode',
+        }
+      end
 
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^RewriteLock [.]*$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^AllowEncodedSlashes nodecode$} }
+    end
+    describe 'Alternate confd/mod/vhosts directory when specifying default character set' do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          default_charset: 'none',
+        }
       end
 
-      context "with Apache version >= 2.4" do
-        let :params do
-          {
-            :apache_version => '2.4',
-            :rewrite_lock => '/var/lock/subsys/rewrite-lock'
-          }
-        end
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^RewriteLock [.]*$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^AddDefaultCharset none$} }
+    end
+    describe "Alternate confd/mod/vhosts directory with Apache version < 2.4 when default_type => 'none'" do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          apache_version: '2.2',
+          default_type: 'none',
+        }
       end
 
-      context "when specifying slash encoding behaviour" do
-        let :params do
-          { :allow_encoded_slashes => 'nodecode' }
-        end
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^DefaultType none$} }
+    end
+    describe "Alternate confd/mod/vhosts directory with Apache version < 2.4 when default_type => 'text/plain'" do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          apache_version: '2.2',
+          default_type: 'text/plain',
+        }
+      end
 
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^AllowEncodedSlashes nodecode$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^DefaultType text/plain$} }
+    end
+    describe 'Alternate confd/mod/vhosts directory with Apache version >= 2.4' do
+      let :params do
+        {
+          vhost_dir: '/etc/httpd/site.d',
+          confd_dir: '/etc/httpd/conf.d',
+          mod_dir: '/etc/httpd/mod.d',
+          apache_version: '2.4',
+        }
       end
 
-      context "when specifying default character set" do
-        let :params do
-          { :default_charset => 'none' }
-        end
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').without_content %r{^DefaultType [.]*$} }
+    end
 
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^AddDefaultCharset none$} }
+    describe 'Alternate conf directory' do
+      let :params do
+        { conf_dir: '/opt/rh/root/etc/httpd/conf' }
       end
 
-      context "with Apache version < 2.4" do
-        let :params do
-          {
-            :apache_version => '2.2',
-          }
-        end
+      it {
+        is_expected.to contain_file('/opt/rh/root/etc/httpd/conf/httpd.conf').with(
+          'ensure'  => 'file',
+          'notify'  => 'Class[Apache::Service]',
+          'require' => ['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'],
+        )
+      }
+    end
 
-       context "when default_type => 'none'" do
-          let :params do
-            { :default_type => 'none' }
-          end
+    describe 'Alternate conf.d directory' do
+      let :params do
+        { confd_dir: '/etc/httpd/special_conf.d' }
+      end
 
-          it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^DefaultType none$} }
-        end
-        context "when default_type => 'text/plain'" do
-          let :params do
-            { :default_type => 'text/plain' }
-          end
+      it {
+        is_expected.to contain_file('/etc/httpd/special_conf.d').with(
+          'ensure' => 'directory', 'recurse' => 'true',
+          'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+          'require' => 'Package[httpd]'
+        )
+      }
+    end
 
-          it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^DefaultType text/plain$} }
-        end
+    describe 'Alternate mpm_modules when declaring mpm_module is false' do
+      let :params do
+        { mpm_module: false }
       end
 
-      context "with Apache version >= 2.4" do
-        let :params do
-          {
-            :apache_version => '2.4',
-          }
+      unexpected = ['apache::mod::event', 'apache::mod::itk', 'apache::mod::peruser', 'apache::mod::prefork', 'apache::mod::worker']
+      it 'does not declare mpm modules' do
+        unexpected.each do |not_expect|
+          is_expected.not_to contain_class(not_expect)
         end
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^DefaultType [.]*$} }
       end
-
-      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
-      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
-      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end
-
-    describe "Alternate conf directory" do
+    describe 'Alternate mpm_modules when declaring mpm_module => prefork' do
       let :params do
-        { :conf_dir => '/opt/rh/root/etc/httpd/conf' }
+        { mpm_module: 'prefork' }
       end
 
-      it { is_expected.to contain_file("/opt/rh/root/etc/httpd/conf/httpd.conf").with(
-        'ensure'  => 'file',
-        'notify'  => 'Class[Apache::Service]',
-        'require' => ['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'],
-      ) }
+      it { is_expected.to contain_class('apache::mod::prefork') }
+      it { is_expected.not_to contain_class('apache::mod::event') }
+      it { is_expected.not_to contain_class('apache::mod::itk') }
+      it { is_expected.not_to contain_class('apache::mod::peruser') }
+      it { is_expected.not_to contain_class('apache::mod::worker') }
     end
-
-    describe "Alternate conf.d directory" do
+    describe 'Alternate mpm_modules when declaring mpm_module => worker' do
       let :params do
-        { :confd_dir => '/etc/httpd/special_conf.d' }
+        { mpm_module: 'worker' }
       end
 
-      it { is_expected.to contain_file("/etc/httpd/special_conf.d").with(
-        'ensure'  => 'directory',
-        'recurse' => 'true',
-        'purge'   => 'true',
-        'notify'  => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      ) }
+      it { is_expected.to contain_class('apache::mod::worker') }
+      it { is_expected.not_to contain_class('apache::mod::event') }
+      it { is_expected.not_to contain_class('apache::mod::itk') }
+      it { is_expected.not_to contain_class('apache::mod::peruser') }
+      it { is_expected.not_to contain_class('apache::mod::prefork') }
     end
 
-    describe "Alternate mpm_modules" do
-      context "when declaring mpm_module is false" do
-        let :params do
-          { :mpm_module => false }
-        end
-        it 'should not declare mpm modules' do
-          is_expected.not_to contain_class('apache::mod::event')
-          is_expected.not_to contain_class('apache::mod::itk')
-          is_expected.not_to contain_class('apache::mod::peruser')
-          is_expected.not_to contain_class('apache::mod::prefork')
-          is_expected.not_to contain_class('apache::mod::worker')
-        end
+    describe 'different templates for httpd.conf with default' do
+      let :params do
+        { conf_template: 'apache/httpd.conf.erb' }
       end
-      context "when declaring mpm_module => prefork" do
-        let :params do
-          { :mpm_module => 'prefork' }
-        end
-        it { is_expected.to contain_class('apache::mod::prefork') }
-        it { is_expected.not_to contain_class('apache::mod::event') }
-        it { is_expected.not_to contain_class('apache::mod::itk') }
-        it { is_expected.not_to contain_class('apache::mod::peruser') }
-        it { is_expected.not_to contain_class('apache::mod::worker') }
-      end
-      context "when declaring mpm_module => worker" do
-        let :params do
-          { :mpm_module => 'worker' }
-        end
-        it { is_expected.to contain_class('apache::mod::worker') }
-        it { is_expected.not_to contain_class('apache::mod::event') }
-        it { is_expected.not_to contain_class('apache::mod::itk') }
-        it { is_expected.not_to contain_class('apache::mod::peruser') }
-        it { is_expected.not_to contain_class('apache::mod::prefork') }
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^# Security\n} }
+    end
+    describe 'different templates for httpd.conf with non-default' do
+      let :params do
+        { conf_template: 'site_apache/fake.conf.erb' }
       end
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Fake template for rspec.$} }
     end
 
-    describe "different templates for httpd.conf" do
-      context "with default" do
-        let :params do
-          { :conf_template => 'apache/httpd.conf.erb' }
-        end
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^# Security\n} }
+    describe 'default mods without' do
+      let :params do
+        { default_mods: false }
       end
-      context "with non-default" do
-        let :params do
-          { :conf_template => 'site_apache/fake.conf.erb' }
-        end
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Fake template for rspec.$} }
+
+      it { is_expected.to contain_apache__mod('authz_host') }
+      it { is_expected.not_to contain_apache__mod('env') }
+    end
+    describe 'default mods custom' do
+      let :params do
+        { default_mods: %w[
+          info
+          alias
+          mime
+          env
+          setenv
+          expires
+        ] }
+      end
+
+      it { is_expected.to contain_apache__mod('authz_host') }
+      it { is_expected.to contain_apache__mod('env') }
+      it { is_expected.to contain_class('apache::mod::info') }
+      it { is_expected.to contain_class('apache::mod::mime') }
+    end
+    describe "Don't create user resource when parameter manage_user is false" do
+      let :params do
+        { manage_user: false }
       end
+
+      it { is_expected.not_to contain_user('apache') }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^User apache\n} }
     end
+    describe "Don't create group resource when parameter manage_group is false" do
+      let :params do
+        { manage_group: false }
+      end
 
-    describe "default mods" do
-      context "without" do
-        let :params do
-          { :default_mods => false }
-        end
+      it { is_expected.not_to contain_group('apache') }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Group apache\n} }
+    end
 
-        it { is_expected.to contain_apache__mod('authz_host') }
-        it { is_expected.not_to contain_apache__mod('env') }
-      end
-      context "custom" do
-        let :params do
-          { :default_mods => [
-            'info',
-            'alias',
-            'mime',
-            'env',
-            'setenv',
-            'expires',
-          ]}
-        end
+    describe 'sendfile with invalid value' do
+      let :params do
+        { sendfile: 'foo' }
+      end
 
-        it { is_expected.to contain_apache__mod('authz_host') }
-        it { is_expected.to contain_apache__mod('env') }
-        it { is_expected.to contain_class('apache::mod::info') }
-        it { is_expected.to contain_class('apache::mod::mime') }
+      it 'fails' do
+        expect {
+          catalogue
+        }.to raise_error(Puppet::PreformattedError, %r{Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\]}) # rubocop:disable Metrics/LineLength
       end
     end
-    describe "Don't create user resource" do
-      context "when parameter manage_user is false" do
-        let :params do
-          { :manage_user => false }
-        end
-
-        it { is_expected.not_to contain_user('apache') }
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^User apache\n} }
+    describe 'sendfile On' do
+      let :params do
+        { sendfile: 'On' }
       end
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^EnableSendfile On\n} }
     end
-    describe "Don't create group resource" do
-      context "when parameter manage_group is false" do
-        let :params do
-          { :manage_group => false }
-        end
+    describe 'sendfile Off' do
+      let :params do
+        { sendfile: 'Off' }
+      end
 
-        it { is_expected.not_to contain_group('apache') }
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Group apache\n} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^EnableSendfile Off\n} }
+    end
 
+    context 'on Fedora 21' do
+      let :facts do
+        super().merge(operatingsystem: 'Fedora',
+                      lsbdistrelease: '21',
+                      operatingsystemrelease: '21')
       end
+
+      it { is_expected.to contain_class('apache').with_apache_version('2.4') }
     end
-    describe "sendfile" do
-      context "with invalid value" do
-        let :params do
-          { :sendfile => 'foo' }
-        end
-        it "should fail" do
-          expect do
-            catalogue
-          end.to raise_error(Puppet::PreformattedError, /Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\]/)
-        end
-      end
-      context "On" do
-        let :params do
-          { :sendfile => 'On' }
-        end
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile On\n} }
-      end
-      context "Off" do
-        let :params do
-          { :sendfile => 'Off' }
-        end
-        it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile Off\n} }
+    context 'on Fedora Rawhide' do
+      let :facts do
+        super().merge(operatingsystem: 'Fedora',
+                      lsbdistrelease: 'Rawhide',
+                      operatingsystemrelease: 'Rawhide')
       end
+
+      it { is_expected.to contain_class('apache').with_apache_version('2.4') }
     end
-    context "on Fedora" do
+    # kinda obsolete
+    context 'on Fedora 17' do
       let :facts do
-        super().merge({
-          :operatingsystem => 'Fedora'
-        })
+        super().merge(operatingsystem: 'Fedora',
+                      lsbdistrelease: '17',
+                      operatingsystemrelease: '17')
       end
 
-      context "21" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '21',
-            :operatingsystemrelease => '21'
-          })
-        end
-        it { is_expected.to contain_class('apache').with_apache_version('2.4') }
-      end
-      context "Rawhide" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => 'Rawhide',
-            :operatingsystemrelease => 'Rawhide'
-          })
-        end
-        it { is_expected.to contain_class('apache').with_apache_version('2.4') }
-      end
-      # kinda obsolete
-      context "17" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '17',
-            :operatingsystemrelease => '17'
-          })
-        end
-        it { is_expected.to contain_class('apache').with_apache_version('2.2') }
-      end
+      it { is_expected.to contain_class('apache').with_apache_version('2.2') }
     end
   end
-  context "on a FreeBSD OS" do
+  context 'on a FreeBSD OS' do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '10',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'FreeBSD',
+        osfamily: 'FreeBSD',
+        operatingsystem: 'FreeBSD',
+        operatingsystemrelease: '10',
+        concat_basedir: '/dne',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class("apache::package").with({'ensure' => 'present'}) }
-    it { is_expected.to contain_user("www") }
-    it { is_expected.to contain_group("www") }
-    it { is_expected.to contain_class("apache::service") }
-    it { is_expected.to contain_file("/usr/local/www/apache24/data").with(
-      'ensure'  => 'directory'
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_class('apache::package').with('ensure' => 'present') }
+    it { is_expected.to contain_user('www') }
+    it { is_expected.to contain_group('www') }
+    it { is_expected.to contain_class('apache::service') }
+    it {
+      is_expected.to contain_file('/usr/local/www/apache24/data').with(
+        'ensure' => 'directory',
+      )
+    }
+    it {
+      is_expected.to contain_file('/usr/local/etc/apache24/Vhosts').with(
+        'ensure' => 'directory', 'recurse' => 'true',
+        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
+      )
+    }
+    it {
+      is_expected.to contain_file('/usr/local/etc/apache24/Modules').with(
+        'ensure' => 'directory', 'recurse' => 'true',
+        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
+      )
+    }
+    it {
+      is_expected.to contain_concat('/usr/local/etc/apache24/ports.conf').with(
+        'owner' => 'root', 'group' => 'wheel',
+        'mode' => '0644', 'notify' => 'Class[Apache::Service]'
       )
     }
-    it { is_expected.to contain_file("/usr/local/etc/apache24/Vhosts").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-    ) }
-    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-    ) }
-    it { is_expected.to contain_concat("/usr/local/etc/apache24/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'wheel',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
-    ) }
     # Assert that load files are placed for these mods, but no conf file.
-    [
-      'auth_basic',
-      'authn_core',
-      'authn_file',
-      'authz_groupfile',
-      'authz_host',
-      'authz_user',
-      'dav',
-      'env'
+    %w[
+      auth_basic
+      authn_core
+      authn_file
+      authz_groupfile
+      authz_host
+      authz_user
+      dav
+      env
     ].each do |modname|
-      it { is_expected.to contain_file("#{modname}.load").with(
-        'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
-        'ensure' => 'file'
-      ) }
+      it { # rubocop:disable RSpec/RepeatedExample
+        is_expected.to contain_file("#{modname}.load").with(
+          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
+          'ensure' => 'file',
+        )
+      }
       it { is_expected.not_to contain_file("#{modname}.conf") }
     end
 
     # Assert that both load files and conf files are placed for these mods
-    [
-      'alias',
-      'autoindex',
-      'dav_fs',
-      'deflate',
-      'dir',
-      'mime',
-      'negotiation',
-      'setenvif',
+    %w[
+      alias
+      autoindex
+      dav_fs
+      deflate
+      dir
+      mime
+      negotiation
+      setenvif
     ].each do |modname|
-      it { is_expected.to contain_file("#{modname}.load").with(
-        'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { is_expected.to contain_file("#{modname}.conf").with(
-        'path'   => "/usr/local/etc/apache24/Modules/#{modname}.conf",
-        'ensure' => 'file'
-      ) }
+      it { # rubocop:disable RSpec/RepeatedExample
+        is_expected.to contain_file("#{modname}.load").with(
+          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
+          'ensure' => 'file',
+        )
+      }
+      it {
+        is_expected.to contain_file("#{modname}.conf").with(
+          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.conf",
+          'ensure' => 'file',
+        )
+      }
     end
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_user("apache") }
-    it { is_expected.to contain_group("apache") }
-    it { is_expected.to contain_class("apache::service") }
-    it { is_expected.to contain_file("/var/www/localhost/htdocs").with(
-      'ensure'  => 'directory'
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_user('apache') }
+    it { is_expected.to contain_group('apache') }
+    it { is_expected.to contain_class('apache::service') }
+    it {
+      is_expected.to contain_file('/var/www/localhost/htdocs').with(
+        'ensure' => 'directory',
+      )
+    }
+    it {
+      is_expected.to contain_file('/etc/apache2/vhosts.d').with(
+        'ensure' => 'directory', 'recurse' => 'true',
+        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
+      )
+    }
+    it {
+      is_expected.to contain_file('/etc/apache2/modules.d').with(
+        'ensure' => 'directory', 'recurse' => 'true',
+        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
+        'require' => 'Package[httpd]'
+      )
+    }
+    it {
+      is_expected.to contain_concat('/etc/apache2/ports.conf').with(
+        'owner' => 'root', 'group' => 'wheel',
+        'mode' => '0644', 'notify' => 'Class[Apache::Service]'
       )
     }
-    it { is_expected.to contain_file("/etc/apache2/vhosts.d").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-    ) }
-    it { is_expected.to contain_file("/etc/apache2/modules.d").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-    ) }
-    it { is_expected.to contain_concat("/etc/apache2/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'wheel',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
-    ) }
   end
   context 'on all OSes' do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
+
     context 'with a custom apache_name parameter' do
-      let :params do {
-        :apache_name => 'httpd24-httpd'
-      }
+      let :params do
+        {
+          apache_name: 'httpd24-httpd',
+        }
       end
-      it { is_expected.to contain_package("httpd").with(
-        'notify' => 'Class[Apache::Service]',
-        'ensure' => 'installed',
-        'name'   => 'httpd24-httpd'
+
+      it {
+        is_expected.to contain_package('httpd').with(
+          'notify' => 'Class[Apache::Service]',
+          'ensure' => 'installed',
+          'name'   => 'httpd24-httpd',
         )
       }
     end
     context 'with a custom file_mode parameter' do
-      let :params do {
-        :file_mode => '0640'
-      }
+      let :params do
+        {
+          file_mode: '0640',
+        }
       end
-      it { is_expected.to contain_concat("/etc/httpd/conf/ports.conf").with(
-        'mode' => '0640',
-      )
+
+      it {
+        is_expected.to contain_concat('/etc/httpd/conf/ports.conf').with(
+          'mode' => '0640',
+        )
       }
     end
     context 'with a custom root_directory_options parameter' do
-      let :params do {
-        :root_directory_options => ['-Indexes', '-FollowSymLinks']
-      }
+      let :params do
+        {
+          root_directory_options: ['-Indexes', '-FollowSymLinks'],
+        }
       end
-      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options -Indexes -FollowSymLinks} }
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options -Indexes -FollowSymLinks} }
     end
     context 'with a custom root_directory_secured parameter and Apache < 2.4' do
-      let :params do {
-        :apache_version => '2.2',
-        :root_directory_secured => true
-      }
+      let :params do
+        {
+          apache_version: '2.2',
+          root_directory_secured: true,
+        }
       end
-      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Order deny,allow\n\s+Deny from all} }
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Order deny,allow\n\s+Deny from all} }
     end
     context 'with a custom root_directory_secured parameter and Apache >= 2.4' do
-      let :params do {
-        :apache_version => '2.4',
-        :root_directory_secured => true
-      }
+      let :params do
+        {
+          apache_version: '2.4',
+          root_directory_secured: true,
+        }
       end
-      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Require all denied} }
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Require all denied} }
     end
     context 'default vhost defaults' do
       it { is_expected.to contain_apache__vhost('default').with_ensure('present') }
       it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('absent') }
-      it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options FollowSymLinks} }
     end
     context 'without default non-ssl vhost' do
-      let :params do {
-        :default_vhost  => false
-      }
+      let :params do
+        {
+          default_vhost: false,
+        }
       end
+
       it { is_expected.to contain_apache__vhost('default').with_ensure('absent') }
       it { is_expected.not_to contain_file('/var/www/html') }
     end
     context 'with default ssl vhost' do
-      let :params do {
-          :default_ssl_vhost  => true
+      let :params do
+        {
+          default_ssl_vhost: true,
         }
       end
+
       it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('present') }
       it { is_expected.to contain_file('/var/www/html') }
     end
   end
   context 'with unsupported osfamily' do
     let :facts do
-      { :osfamily        => 'Darwin',
-        :operatingsystemrelease => '13.1.0',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
-      }
+      { osfamily: 'Darwin',
+        operatingsystemrelease: '13.1.0',
+        concat_basedir: '/dne',
+        is_pe: false }
     end
 
     it do
       expect {
-       catalogue
-      }.to raise_error(Puppet::Error, /Unsupported osfamily/)
+        catalogue
+      }.to raise_error(Puppet::Error, %r{Unsupported osfamily})
     end
   end
 end
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 933d677031..6040eaa5c3 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -1,89 +1,97 @@
 require 'spec_helper'
 
-describe 'apache::dev', :type => :class do
-  let(:pre_condition) {[
-    'include apache'
-  ]}
-  context "on a Debian OS" do
+describe 'apache::dev', type: :class do
+  let(:pre_condition) do
+    [
+      'include apache',
+    ]
+  end
+
+  context 'on a Debian OS' do
     let :facts do
       {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :is_pe                  => false,
-        :concat_basedir         => '/foo',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        :kernel                 => 'Linux'
+        lsbdistcodename: 'squeeze',
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '6',
+        is_pe: false,
+        concat_basedir: '/foo',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        kernel: 'Linux',
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_package("libaprutil1-dev") }
-    it { is_expected.to contain_package("libapr1-dev") }
-    it { is_expected.to contain_package("apache2-prefork-dev") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_package('libaprutil1-dev') }
+    it { is_expected.to contain_package('libapr1-dev') }
+    it { is_expected.to contain_package('apache2-prefork-dev') }
   end
-  context "on an Ubuntu 14 OS" do
+  context 'on an Ubuntu 14 OS' do
     let :facts do
       {
-        :lsbdistrelease         => '14.04',
-        :lsbdistcodename        => 'trusty',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Ubuntu',
-        :operatingsystemrelease => '14.04',
-        :is_pe                  => false,
-        :concat_basedir         => '/foo',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        :kernel                 => 'Linux'
+        lsbdistrelease: '14.04',
+        lsbdistcodename: 'trusty',
+        osfamily: 'Debian',
+        operatingsystem: 'Ubuntu',
+        operatingsystemrelease: '14.04',
+        is_pe: false,
+        concat_basedir: '/foo',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        kernel: 'Linux',
       }
     end
-    it { is_expected.to contain_package("apache2-dev") }
+
+    it { is_expected.to contain_package('apache2-dev') }
   end
-  context "on a RedHat OS" do
+  context 'on a RedHat OS' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :is_pe                  => false,
-        :concat_basedir         => '/foo',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        :kernel                 => 'Linux'
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '6',
+        is_pe: false,
+        concat_basedir: '/foo',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        kernel: 'Linux',
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_package("httpd-devel") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_package('httpd-devel') }
   end
-  context "on a FreeBSD OS" do
+  context 'on a FreeBSD OS' do
     let :facts do
       {
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :is_pe                  => false,
-        :concat_basedir         => '/foo',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        :kernel                 => 'FreeBSD'
+        osfamily: 'FreeBSD',
+        operatingsystem: 'FreeBSD',
+        operatingsystemrelease: '9',
+        is_pe: false,
+        concat_basedir: '/foo',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        kernel: 'FreeBSD',
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :is_pe                  => false,
-        :concat_basedir         => '/foo',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        :kernel                 => 'Linux'
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        is_pe: false,
+        concat_basedir: '/foo',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+        kernel: 'Linux',
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
   end
 end
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 99854e8182..076b0d4bc6 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -1,97 +1,102 @@
 require 'spec_helper'
 
-describe 'apache::mod::alias', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::alias', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian OS", :compile do
+  context 'default configuration with parameters' do
+    context 'on a Debian OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :lsbdistcodename        => 'squeeze',
-          :osfamily               => 'Debian',
-          :operatingsystem        => 'Debian',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystem: 'Debian',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_apache__mod("alias") }
-      it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"/) }
+
+      it { is_expected.to contain_apache__mod('alias') }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
     end
-    context "on a RedHat 6-based OS", :compile do
+    context 'on a RedHat 6-based OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_apache__mod("alias") }
-      it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/var\/www\/icons\/"/) }
+
+      it { is_expected.to contain_apache__mod('alias') }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/var\/www\/icons\/"}) }
     end
-    context "on a RedHat 7-based OS", :compile do
+    context 'on a RedHat 7-based OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '7',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '7',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_apache__mod("alias") }
-      it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"/) }
+
+      it { is_expected.to contain_apache__mod('alias') }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
     end
-    context "with icons options", :compile do
+    context 'with icons options', :compile do
       let :pre_condition do
         'class { apache: default_mods => false }'
       end
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '7',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '7',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
       let :params do
         {
-          'icons_options' => 'foo'
+          'icons_options' => 'foo',
         }
       end
-      it { is_expected.to contain_apache__mod("alias") }
-      it { is_expected.to contain_file("alias.conf").with(:content => /Options foo/) }
+
+      it { is_expected.to contain_apache__mod('alias') }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Options foo}) }
     end
-    context "on a FreeBSD OS", :compile do
+    context 'on a FreeBSD OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'FreeBSD',
-          :osfamily               => 'FreeBSD',
-          :operatingsystem        => 'FreeBSD',
-          :operatingsystemrelease => '10',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'FreeBSD',
+          osfamily: 'FreeBSD',
+          operatingsystem: 'FreeBSD',
+          operatingsystemrelease: '10',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_apache__mod("alias") }
-      it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/local\/www\/apache24\/icons\/"/) }
+
+      it { is_expected.to contain_apache__mod('alias') }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/local\/www\/apache24\/icons\/"}) }
     end
   end
 end
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index aee3f8c298..bfe8f58020 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -1,64 +1,66 @@
 require 'spec_helper'
 
-describe 'apache::mod::auth_cas', :type => :class do
-  context "default params" do
+describe 'apache::mod::auth_cas', type: :class do
+  context 'default params' do
     let :params do
       {
-        :cas_login_url    => 'https://cas.example.com/login',
-        :cas_validate_url => 'https://cas.example.com/validate',
-        :cas_cookie_path  => '/var/cache/apache2/mod_auth_cas/'
+        cas_login_url: 'https://cas.example.com/login',
+        cas_validate_url: 'https://cas.example.com/validate',
+        cas_cookie_path: '/var/cache/apache2/mod_auth_cas/',
       }
     end
 
-    it_behaves_like "a mod class, without including apache"
+    it_behaves_like 'a mod class, without including apache'
   end
 
-  context "default configuration with parameters" do
+  context 'default configuration with parameters' do
     let :params do
       {
-        :cas_login_url    => 'https://cas.example.com/login',
-        :cas_validate_url => 'https://cas.example.com/validate',
+        cas_login_url: 'https://cas.example.com/login',
+        cas_validate_url: 'https://cas.example.com/validate',
       }
     end
 
-    context "on a Debian OS", :compile do
+    context 'on a Debian OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :lsbdistcodename        => 'squeeze',
-          :osfamily               => 'Debian',
-          :operatingsystem        => 'Debian',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystem: 'Debian',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod("auth_cas") }
-      it { is_expected.to contain_package("libapache2-mod-auth-cas") }
-      it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/apache2/mods-available/auth_cas.conf') }
-      it { is_expected.to contain_file("/var/cache/apache2/mod_auth_cas/").with_owner('www-data') }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_cas') }
+      it { is_expected.to contain_package('libapache2-mod-auth-cas') }
+      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/apache2/mods-available/auth_cas.conf') }
+      it { is_expected.to contain_file('/var/cache/apache2/mod_auth_cas/').with_owner('www-data') }
     end
-    context "on a RedHat OS", :compile do
+    context 'on a RedHat OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod("auth_cas") }
-      it { is_expected.to contain_package("mod_auth_cas") }
-      it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/httpd/conf.d/auth_cas.conf') }
-      it { is_expected.to contain_file("/var/cache/mod_auth_cas/").with_owner('apache') }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_cas') }
+      it { is_expected.to contain_package('mod_auth_cas') }
+      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
+      it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
     end
   end
 end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 0f77a627ef..c663a51462 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -1,106 +1,111 @@
 require 'spec_helper'
 
-describe 'apache::mod::auth_kerb', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::auth_kerb', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian OS", :compile do
+  context 'default configuration with parameters' do
+    context 'on a Debian OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :lsbdistcodename        => 'squeeze',
-          :osfamily               => 'Debian',
-          :operatingsystem        => 'Debian',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystem: 'Debian',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod("auth_kerb") }
-      it { is_expected.to contain_package("libapache2-mod-auth-kerb") }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_kerb') }
+      it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
     end
-    context "on a RedHat OS", :compile do
+    context 'on a RedHat OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod("auth_kerb") }
-      it { is_expected.to contain_package("mod_auth_kerb") }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_kerb') }
+      it { is_expected.to contain_package('mod_auth_kerb') }
     end
-    context "on a FreeBSD OS", :compile do
+    context 'on a FreeBSD OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'FreeBSD',
-          :osfamily               => 'FreeBSD',
-          :operatingsystem        => 'FreeBSD',
-          :operatingsystemrelease => '9',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'FreeBSD',
+          osfamily: 'FreeBSD',
+          operatingsystem: 'FreeBSD',
+          operatingsystemrelease: '9',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod("auth_kerb") }
-      it { is_expected.to contain_package("www/mod_auth_kerb2") }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_kerb') }
+      it { is_expected.to contain_package('www/mod_auth_kerb2') }
     end
-    context "on a Gentoo OS", :compile do
+    context 'on a Gentoo OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'Gentoo',
-          :operatingsystem        => 'Gentoo',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          :operatingsystemrelease => '3.16.1-gentoo',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'Gentoo',
+          operatingsystem: 'Gentoo',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          operatingsystemrelease: '3.16.1-gentoo',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod("auth_kerb") }
-      it { is_expected.to contain_package("www-apache/mod_auth_kerb") }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_kerb') }
+      it { is_expected.to contain_package('www-apache/mod_auth_kerb') }
     end
   end
-  context "overriding mod_packages" do
-    context "on a RedHat OS", :compile do
+  context 'overriding mod_packages' do
+    context 'on a RedHat OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
       let :pre_condition do
-        <<-EOS
+        <<-MANIFEST
         include apache::params
         class { 'apache':
           mod_packages => merge($::apache::params::mod_packages, {
             'auth_kerb' => 'httpd24-mod_auth_kerb',
           })
         }
-        EOS
+        MANIFEST
       end
-      it { is_expected.to contain_apache__mod("auth_kerb") }
-      it { is_expected.to contain_package("httpd24-mod_auth_kerb") }
-      it { is_expected.to_not contain_package("mod_auth_kerb") }
+
+      it { is_expected.to contain_apache__mod('auth_kerb') }
+      it { is_expected.to contain_package('httpd24-mod_auth_kerb') }
+      it { is_expected.not_to contain_package('mod_auth_kerb') }
     end
   end
 end
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index 7d0826ff72..89548e2c92 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -1,90 +1,89 @@
 require 'spec_helper'
 
-describe 'apache::mod::auth_mellon', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::auth_mellon', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian OS" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :fqdn                   => 'test.example.com',
-          :is_pe                  => false,
-        }
-      end
-      describe 'with no parameters' do
-        it { should contain_apache__mod('auth_mellon') }
-        it { should contain_package('libapache2-mod-auth-mellon') }
-        it { should contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
-        it { should contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") }
-      end
-      describe 'with parameters' do
-        let :params do
-          { :mellon_cache_size => '200',
-            :mellon_cache_entry_size => '2010',
-            :mellon_lock_file => '/tmp/junk',
-            :mellon_post_directory => '/tmp/post',
-            :mellon_post_ttl => '5',
-            :mellon_post_size => '8',
-            :mellon_post_count => '10'
-          }
-        end
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) }
-      end
+  context 'default configuration with parameters on a Debian OS' do
+    let :facts do
+      {
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        fqdn: 'test.example.com',
+        is_pe: false,
+      }
+    end
 
+    describe 'with no parameters' do
+      it { is_expected.to contain_apache__mod('auth_mellon') }
+      it { is_expected.to contain_package('libapache2-mod-auth-mellon') }
+      it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") }
     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',
-          :fqdn                   => 'test.example.com',
-          :is_pe                  => false,
-        }
-      end
-      describe 'with no parameters' do
-        it { should contain_apache__mod('auth_mellon') }
-        it { should contain_package('mod_auth_mellon') }
-        it { should contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') }
-        it { should contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") }
+    describe 'with parameters' do
+      let :params do
+        { mellon_cache_size: '200',
+          mellon_cache_entry_size: '2010',
+          mellon_lock_file: '/tmp/junk',
+          mellon_post_directory: '/tmp/post',
+          mellon_post_ttl: '5',
+          mellon_post_size: '8',
+          mellon_post_count: '10' }
       end
-      describe 'with parameters' do
-        let :params do
-          { :mellon_cache_size => '200',
-            :mellon_cache_entry_size => '2010',
-            :mellon_lock_file => '/tmp/junk',
-            :mellon_post_directory => '/tmp/post',
-            :mellon_post_ttl => '5',
-            :mellon_post_size => '8',
-            :mellon_post_count => '10'
-          }
-        end
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) }
-        it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) }
+
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheSize\s+200$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheEntrySize\s+2010$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonLockFile\s+"\/tmp\/junk"$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostDirectory\s+"\/tmp\/post"$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostTTL\s+5$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostSize\s+8$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostCount\s+10$}) }
+    end
+  end
+  context 'default configuration with parameters 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',
+        fqdn: 'test.example.com',
+        is_pe: false,
+      }
+    end
+
+    describe 'with no parameters' do
+      it { is_expected.to contain_apache__mod('auth_mellon') }
+      it { is_expected.to contain_package('mod_auth_mellon') }
+      it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") }
+    end
+    describe 'with parameters' do
+      let :params do
+        { mellon_cache_size: '200',
+          mellon_cache_entry_size: '2010',
+          mellon_lock_file: '/tmp/junk',
+          mellon_post_directory: '/tmp/post',
+          mellon_post_ttl: '5',
+          mellon_post_size: '8',
+          mellon_post_count: '10' }
       end
+
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheSize\s+200$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheEntrySize\s+2010$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonLockFile\s+"\/tmp\/junk"$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostDirectory\s+"\/tmp\/post"$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostTTL\s+5$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostSize\s+8$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostCount\s+10$}) }
     end
   end
 end
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
index 4e101d1b5d..c5adad496a 100644
--- a/spec/classes/mod/authn_dbd_spec.rb
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -1,62 +1,64 @@
 require 'spec_helper'
 
-describe 'apache::mod::authn_dbd', :type => :class do
-  context "default params" do
+describe 'apache::mod::authn_dbd', type: :class do
+  context 'default params' do
     let :params do
       {
-        :authn_dbd_params => 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
+        authn_dbd_params: 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
       }
     end
 
-    it_behaves_like "a mod class, without including apache"
+    it_behaves_like 'a mod class, without including apache'
   end
 
-  context "default configuration with parameters" do
+  context 'default configuration with parameters' do
     let :params do
       {
-        :authn_dbd_params => 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
-        :authn_dbd_alias  => 'db_authn',
-        :authn_dbd_query  => 'SELECT password FROM authn WHERE username = %s'
+        authn_dbd_params: 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
+        authn_dbd_alias: 'db_authn',
+        authn_dbd_query: 'SELECT password FROM authn WHERE username = %s',
       }
     end
 
-    context "on a Debian OS", :compile do
+    context 'on a Debian OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :lsbdistcodename        => 'squeeze',
-          :osfamily               => 'Debian',
-          :operatingsystem        => 'Debian',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystem: 'Debian',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod("authn_dbd") }
-      it { is_expected.to contain_apache__mod("dbd") }
-      it { is_expected.to contain_file("authn_dbd.conf").with_path('/etc/apache2/mods-available/authn_dbd.conf') }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('authn_dbd') }
+      it { is_expected.to contain_apache__mod('dbd') }
+      it { is_expected.to contain_file('authn_dbd.conf').with_path('/etc/apache2/mods-available/authn_dbd.conf') }
     end
 
-    context "on a RedHat OS", :compile do
+    context 'on a RedHat OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod("authn_dbd") }
-      it { is_expected.to contain_apache__mod("dbd") }
-      it { is_expected.to contain_file("authn_dbd.conf").with_path('/etc/httpd/conf.d/authn_dbd.conf') }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('authn_dbd') }
+      it { is_expected.to contain_apache__mod('dbd') }
+      it { is_expected.to contain_file('authn_dbd.conf').with_path('/etc/httpd/conf.d/authn_dbd.conf') }
     end
   end
 end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index 7469d165e3..22dfce0d15 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -1,76 +1,80 @@
 require 'spec_helper'
 
-describe 'apache::mod::authnz_ldap', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::authnz_ldap', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian OS" do
-      let :facts do
-        {
-          :lsbdistcodename        => 'squeeze',
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'Debian',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
-        }
-      end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_class("apache::mod::ldap") }
-      it { is_expected.to contain_apache__mod('authnz_ldap') }
+  context 'default configuration with parameters on a Debian OS' do
+    let :facts do
+      {
+        lsbdistcodename: 'squeeze',
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        operatingsystem: 'Debian',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
+      }
+    end
 
-      context 'default verify_server_cert' do
-        it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
-      end
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_class('apache::mod::ldap') }
+    it { is_expected.to contain_apache__mod('authnz_ldap') }
 
-      context 'verify_server_cert = false' do
-        let(:params) { { :verify_server_cert => false } }
-        it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
-      end
+    context 'default verify_server_cert' do
+      it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert On$}) }
+    end
 
-      context 'verify_server_cert = wrong' do
-        let(:params) { { :verify_server_cert => 'wrong' } }
-        it 'should raise an error' do
-          expect { is_expected.to raise_error Puppet::Error }
-        end
-      end
-    end #Debian
+    context 'verify_server_cert = false' do
+      let(:params) { { verify_server_cert: false } }
 
-    context "on a RedHat OS" do
-      let :facts do
-        {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'RedHat',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
-        }
-      end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_class("apache::mod::ldap") }
-      it { is_expected.to contain_apache__mod('authnz_ldap') }
+      it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert Off$}) }
+    end
 
-      context 'default verify_server_cert' do
-        it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
-      end
+    context 'verify_server_cert = wrong' do
+      let(:params) { { verify_server_cert: 'wrong' } }
 
-      context 'verify_server_cert = false' do
-        let(:params) { { :verify_server_cert => false } }
-        it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
+      it 'raises an error' do # rubocop:disable RSpec/MultipleExpectations
+        expect { is_expected.to raise_error Puppet::Error } # rubocop:disable RSpec/VoidExpect
       end
+    end
+  end # Debian
+
+  context 'default configuration with parameters on a RedHat OS' do
+    let :facts do
+      {
+        osfamily: 'RedHat',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        operatingsystem: 'RedHat',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
+      }
+    end
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_class('apache::mod::ldap') }
+    it { is_expected.to contain_apache__mod('authnz_ldap') }
+
+    context 'default verify_server_cert' do
+      it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert On$}) }
+    end
+
+    context 'verify_server_cert = false' do
+      let(:params) { { verify_server_cert: false } }
+
+      it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert Off$}) }
+    end
+
+    context 'verify_server_cert = wrong' do
+      let(:params) { { verify_server_cert: 'wrong' } }
 
-      context 'verify_server_cert = wrong' do
-        let(:params) { { :verify_server_cert => 'wrong' } }
-        it 'should raise an error' do
-          expect { is_expected.to raise_error Puppet::Error }
-        end
+      it 'raises an error' do # rubocop:disable RSpec/MultipleExpectations
+        expect { is_expected.to raise_error Puppet::Error } # rubocop:disable RSpec/VoidExpect
       end
-    end # Redhat
-  end
+    end
+  end # Redhat
 end
diff --git a/spec/classes/mod/authnz_pam_spec.rb b/spec/classes/mod/authnz_pam_spec.rb
index 4bceeab854..f3df7b4af5 100644
--- a/spec/classes/mod/authnz_pam_spec.rb
+++ b/spec/classes/mod/authnz_pam_spec.rb
@@ -1,43 +1,45 @@
 require 'spec_helper'
 
-describe 'apache::mod::authnz_pam', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::authnz_pam', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian OS" do
+  context 'default configuration with parameters' do
+    context 'on a Debian OS' do
       let :facts do
         {
-          :lsbdistcodename        => 'squeeze',
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'Debian',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          operatingsystem: 'Debian',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_package("libapache2-mod-authnz-pam") }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_package('libapache2-mod-authnz-pam') }
       it { is_expected.to contain_apache__mod('authnz_pam') }
-    end #Debian
+    end # Debian
 
-    context "on a RedHat OS" do
+    context 'on a RedHat OS' do
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'RedHat',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          operatingsystem: 'RedHat',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_package("mod_authnz_pam") }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_package('mod_authnz_pam') }
       it { is_expected.to contain_apache__mod('authnz_pam') }
     end # Redhat
   end
diff --git a/spec/classes/mod/cluster_spec.rb b/spec/classes/mod/cluster_spec.rb
index b5f74bac7d..793012dd52 100644
--- a/spec/classes/mod/cluster_spec.rb
+++ b/spec/classes/mod/cluster_spec.rb
@@ -1,30 +1,30 @@
 require 'spec_helper'
 
-describe 'apache::mod::cluster', :type => :class do
+describe 'apache::mod::cluster', type: :class do
   context 'on a RedHat OS Release 7 with mod version = 1.3.0' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        operatingsystemrelease: '7',
+        concat_basedir: '/dne',
+        operatingsystem: 'RedHat',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
-    let(:params) {
+    let(:params) do
       {
-        :allowed_network         => '172.17.0',
-        :balancer_name           => 'mycluster',
-        :ip                      => '172.17.0.1',
-        :version                 => '1.3.0'
+        allowed_network: '172.17.0',
+        balancer_name: 'mycluster',
+        ip: '172.17.0.1',
+        version: '1.3.0',
       }
-    }
+    end
 
-    it { is_expected.to contain_class("apache") }
+    it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('proxy') }
     it { is_expected.to contain_apache__mod('proxy_ajp') }
     it { is_expected.to contain_apache__mod('manager') }
@@ -38,25 +38,25 @@
   context 'on a RedHat OS Release 7 with mod version > 1.3.0' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        operatingsystemrelease: '7',
+        concat_basedir: '/dne',
+        operatingsystem: 'RedHat',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
-    let(:params) {
+    let(:params) do
       {
-        :allowed_network         => '172.17.0',
-        :balancer_name           => 'mycluster',
-        :ip                      => '172.17.0.1',
-        :version                 => '1.3.1'
+        allowed_network: '172.17.0',
+        balancer_name: 'mycluster',
+        ip: '172.17.0.1',
+        version: '1.3.1',
       }
-    }
+    end
 
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('proxy') }
@@ -72,25 +72,25 @@
   context 'on a RedHat OS Release 6 with mod version < 1.3.0' 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
 
-    let(:params) {
+    let(:params) do
       {
-        :allowed_network         => '172.17.0',
-        :balancer_name           => 'mycluster',
-        :ip                      => '172.17.0.1',
-        :version                 => '1.2.0'
+        allowed_network: '172.17.0',
+        balancer_name: 'mycluster',
+        ip: '172.17.0.1',
+        version: '1.2.0',
       }
-    }
+    end
 
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('proxy') }
diff --git a/spec/classes/mod/data_spec.rb b/spec/classes/mod/data_spec.rb
index 9e2ffe44e6..511abda130 100644
--- a/spec/classes/mod/data_spec.rb
+++ b/spec/classes/mod/data_spec.rb
@@ -1,30 +1,32 @@
 require 'spec_helper'
 
-describe 'apache::mod::data', :type => :class do
-  context "on a Debian OS" do
+describe 'apache::mod::data', type: :class do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '8',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'jessie',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        osfamily: 'Debian',
+        operatingsystemrelease: '8',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'jessie',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     let :params do
-      { :apache_version => '2.4' }
+      { apache_version: '2.4' }
     end
+
     it { is_expected.to contain_apache__mod('data') }
 
-    describe "with Apache version < 2.3" do
+    describe 'with Apache version < 2.3' do
       let :params do
-        { :apache_version => '2.2' }
+        { apache_version: '2.2' }
       end
-      it 'should fail' do
-        expect { catalogue }.to raise_error(Puppet::Error, /mod_data is only available in Apache 2.3 and later/)
+
+      it 'fails' do
+        expect { catalogue }.to raise_error(Puppet::Error, %r{mod_data is only available in Apache 2.3 and later})
       end
     end
   end
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 426b547f2a..f2e61c48a1 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -1,80 +1,84 @@
 require 'spec_helper'
 
-describe 'apache::mod::dav_svn', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::dav_svn', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian OS" do
+  context 'default configuration with parameters' do
+    context 'on a Debian OS' do
       let :facts do
         {
-          :lsbdistcodename           => 'squeeze',
-          :osfamily                  => 'Debian',
-          :operatingsystemrelease    => '6',
-          :operatingsystemmajrelease => '6',
-          :concat_basedir            => '/dne',
-          :operatingsystem           => 'Debian',
-          :id                        => 'root',
-          :kernel                    => 'Linux',
-          :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                     => false,
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          operatingsystemmajrelease: '6',
+          concat_basedir: '/dne',
+          operatingsystem: 'Debian',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
-      it { is_expected.to contain_package("libapache2-svn") }
+      it { is_expected.to contain_package('libapache2-svn') }
     end
-    context "on a RedHat OS" do
+    context 'on a RedHat OS' do
       let :facts do
         {
-          :osfamily                  => 'RedHat',
-          :operatingsystemrelease    => '6',
-          :operatingsystemmajrelease => '6',
-          :concat_basedir            => '/dne',
-          :operatingsystem           => 'RedHat',
-          :id                        => 'root',
-          :kernel                    => 'Linux',
-          :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                     => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '6',
+          operatingsystemmajrelease: '6',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
-      it { is_expected.to contain_package("mod_dav_svn") }
+      it { is_expected.to contain_package('mod_dav_svn') }
     end
-    context "on a FreeBSD OS" do
+    context 'on a FreeBSD OS' do
       let :facts do
         {
-          :osfamily                  => 'FreeBSD',
-          :operatingsystemrelease    => '9',
-          :operatingsystemmajrelease => '9',
-          :concat_basedir            => '/dne',
-          :operatingsystem           => 'FreeBSD',
-          :id                        => 'root',
-          :kernel                    => 'Linux',
-          :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                     => false,
+          osfamily: 'FreeBSD',
+          operatingsystemrelease: '9',
+          operatingsystemmajrelease: '9',
+          concat_basedir: '/dne',
+          operatingsystem: 'FreeBSD',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
-      it { is_expected.to contain_package("devel/subversion") }
+      it { is_expected.to contain_package('devel/subversion') }
     end
-    context "on a Gentoo OS", :compile do
+    context 'on a Gentoo OS', :compile do
       let :facts do
         {
-          :id                     => 'root',
-          :operatingsystemrelease => '3.16.1-gentoo',
-          :concat_basedir         => '/dne',
-          :kernel                 => 'Linux',
-          :osfamily               => 'Gentoo',
-          :operatingsystem        => 'Gentoo',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          :is_pe                  => false,
+          id: 'root',
+          operatingsystemrelease: '3.16.1-gentoo',
+          concat_basedir: '/dne',
+          kernel: 'Linux',
+          osfamily: 'Gentoo',
+          operatingsystem: 'Gentoo',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
-      it { is_expected.to contain_package("dev-vcs/subversion") }
+      it { is_expected.to contain_package('dev-vcs/subversion') }
     end
   end
 end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 264c70f362..5db10cf2ad 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -2,23 +2,23 @@
 
 # This function is called inside the OS specific contexts
 def general_deflate_specs
-  it { is_expected.to contain_apache__mod("deflate") }
+  it { is_expected.to contain_apache__mod('deflate') }
+
+  expected = "AddOutputFilterByType DEFLATE text/css\n"\
+             "AddOutputFilterByType DEFLATE text/html\n"\
+             "\n"\
+             "DeflateFilterNote Input instream\n"\
+             "DeflateFilterNote Ratio ratio\n"
 
   it do
-    is_expected.to contain_file("deflate.conf").with_content(
-      "AddOutputFilterByType DEFLATE text/css\n"\
-      "AddOutputFilterByType DEFLATE text/html\n"\
-      "\n"\
-      "DeflateFilterNote Input instream\n"\
-      "DeflateFilterNote Ratio ratio\n"
-    )
+    is_expected.to contain_file('deflate.conf').with_content(expected)
   end
 end
 
-describe 'apache::mod::deflate', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::deflate', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
+  context 'default configuration with parameters' do
     let :pre_condition do
       'class { "apache::mod::deflate":
         types => [ "text/html", "text/css" ],
@@ -30,98 +30,98 @@ def general_deflate_specs
       '
     end
 
-    context "On a Debian OS with default params" do
+    context 'On a Debian OS with default params' do
       let :facts do
         {
-          :id                     => 'root',
-          :lsbdistcodename        => 'squeeze',
-          :kernel                 => 'Linux',
-          :osfamily               => 'Debian',
-          :operatingsystem        => 'Debian',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          lsbdistcodename: 'squeeze',
+          kernel: 'Linux',
+          osfamily: 'Debian',
+          operatingsystem: 'Debian',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
 
       # Load the more generic tests for this context
-      general_deflate_specs()
-
-      it { is_expected.to contain_file("deflate.conf").with({
-        :ensure => 'file',
-        :path   => '/etc/apache2/mods-available/deflate.conf',
-      } ) }
-      it { is_expected.to contain_file("deflate.conf symlink").with({
-        :ensure => 'link',
-        :path   => '/etc/apache2/mods-enabled/deflate.conf',
-      } ) }
+      general_deflate_specs
+
+      it {
+        is_expected.to contain_file('deflate.conf').with(ensure: 'file',
+                                                         path: '/etc/apache2/mods-available/deflate.conf')
+      }
+      it {
+        is_expected.to contain_file('deflate.conf symlink').with(ensure: 'link',
+                                                                 path: '/etc/apache2/mods-enabled/deflate.conf')
+      }
     end
 
-    context "on a RedHat OS with default params" do
+    context 'on a RedHat OS with default params' do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '6',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
 
       # Load the more generic tests for this context
-      general_deflate_specs()
+      general_deflate_specs
 
-      it { is_expected.to contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") }
+      it { is_expected.to contain_file('deflate.conf').with_path('/etc/httpd/conf.d/deflate.conf') }
     end
 
-    context "On a FreeBSD OS with default params" do
+    context 'On a FreeBSD OS with default params' do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'FreeBSD',
-          :osfamily               => 'FreeBSD',
-          :operatingsystem        => 'FreeBSD',
-          :operatingsystemrelease => '9',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'FreeBSD',
+          osfamily: 'FreeBSD',
+          operatingsystem: 'FreeBSD',
+          operatingsystemrelease: '9',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
 
       # Load the more generic tests for this context
-      general_deflate_specs()
+      general_deflate_specs
 
-      it { is_expected.to contain_file("deflate.conf").with({
-        :ensure => 'file',
-        :path   => '/usr/local/etc/apache24/Modules/deflate.conf',
-      } ) }
+      it {
+        is_expected.to contain_file('deflate.conf').with(ensure: 'file',
+                                                         path: '/usr/local/etc/apache24/Modules/deflate.conf')
+      }
     end
 
-    context "On a Gentoo OS with default params" do
+    context 'On a Gentoo OS with default params' do
       let :facts do
         {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'Gentoo',
-          :operatingsystem        => 'Gentoo',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          :operatingsystemrelease => '3.16.1-gentoo',
-          :concat_basedir         => '/dne',
-          :is_pe                  => false,
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'Gentoo',
+          operatingsystem: 'Gentoo',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          operatingsystemrelease: '3.16.1-gentoo',
+          concat_basedir: '/dne',
+          is_pe: false,
         }
       end
 
       # Load the more generic tests for this context
-      general_deflate_specs()
+      general_deflate_specs
 
-      it { is_expected.to contain_file("deflate.conf").with({
-        :ensure => 'file',
-        :path   => '/etc/apache2/modules.d/deflate.conf',
-      } ) }
+      it {
+        is_expected.to contain_file('deflate.conf').with(ensure: 'file',
+                                                         path: '/etc/apache2/modules.d/deflate.conf')
+      }
     end
   end
 end
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 4c9f324b38..d74450bb32 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -1,31 +1,34 @@
 require 'spec_helper'
 
-describe 'apache::mod::dev', :type => :class do
-  let(:pre_condition) {[
-    'include apache'
-  ]}
+describe 'apache::mod::dev', type: :class do
+  let(:pre_condition) do
+    [
+      'include apache',
+    ]
+  end
 
-  it_behaves_like "a mod class, without including apache"
+  it_behaves_like 'a mod class, without including apache'
 
   [
-    ['RedHat',  '6', 'Santiago', 'Linux'],
-    ['Debian',  '6', 'squeeze', 'Linux'],
-    ['FreeBSD', '9', 'FreeBSD', 'FreeBSD'],
+    %w[RedHat 6 Santiago Linux],
+    %w[Debian 6 squeeze Linux],
+    %w[FreeBSD 9 FreeBSD FreeBSD],
   ].each do |osfamily, operatingsystemrelease, lsbdistcodename, kernel|
     context "on a #{osfamily} OS" do
       let :facts do
         {
-          :lsbdistcodename        => lsbdistcodename,
-          :osfamily               => osfamily,
-          :operatingsystem        => osfamily,
-          :operatingsystemrelease => operatingsystemrelease,
-          :is_pe                  => false,
-          :concat_basedir         => '/foo',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-          :kernel                 => kernel
+          lsbdistcodename: lsbdistcodename,
+          osfamily: osfamily,
+          operatingsystem: osfamily,
+          operatingsystemrelease: operatingsystemrelease,
+          is_pe: false,
+          concat_basedir: '/foo',
+          id: 'root',
+          path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+          kernel: kernel,
         }
       end
+
       it { is_expected.to contain_class('apache::dev') }
     end
   end
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 9aad0d3ff5..b56cca4889 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -1,137 +1,143 @@
 require 'spec_helper'
 
-describe 'apache::mod::dir', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::dir', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    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',
-          :is_pe                  => false,
-        }
-      end
-      context "passing no parameters" do
-        it { is_expected.to contain_class("apache::params") }
-        it { is_expected.to contain_apache__mod('dir') }
-        it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-      end
-      context "passing indexes => ['example.txt','fearsome.aspx']" do
-        let :params do
-          {:indexes => ['example.txt','fearsome.aspx']}
-        end
-        it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-      end
+  context 'default configuration with parameters 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',
+        is_pe: false,
+      }
     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',
-          :is_pe                  => false,
-        }
-      end
-      context "passing no parameters" do
-        it { is_expected.to contain_class("apache::params") }
-        it { is_expected.to contain_apache__mod('dir') }
-        it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-      end
-      context "passing indexes => ['example.txt','fearsome.aspx']" do
-        let :params do
-          {:indexes => ['example.txt','fearsome.aspx']}
-        end
-        it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-      end
+
+    context 'passing no parameters' do
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('dir') }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{^DirectoryIndex }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html\.var }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.cgi }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.pl }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.php }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.xhtml$}) }
     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',
-          :is_pe                  => false,
-        }
-      end
-      context "passing no parameters" do
-        it { is_expected.to contain_class("apache::params") }
-        it { is_expected.to contain_apache__mod('dir') }
-        it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-      end
-      context "passing indexes => ['example.txt','fearsome.aspx']" do
-        let :params do
-          {:indexes => ['example.txt','fearsome.aspx']}
-        end
-        it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+    context "passing indexes => ['example.txt','fearsome.aspx']" do
+      let :params do
+        { indexes: ['example.txt', 'fearsome.aspx'] }
       end
+
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ fearsome\.aspx$}) }
+    end
+  end
+  context 'default configuration with parameters 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',
+        is_pe: false,
+      }
+    end
+
+    context 'passing no parameters' do
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('dir') }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{^DirectoryIndex }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html\.var }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.cgi }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.pl }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.php }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.xhtml$}) }
     end
-    context "on a Gentoo OS" do
-      let :facts do
-        {
-          :osfamily               => 'Gentoo',
-          :operatingsystem        => 'Gentoo',
-          :operatingsystemrelease => '3.16.1-gentoo',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          :is_pe                  => false,
-        }
+    context "passing indexes => ['example.txt','fearsome.aspx']" do
+      let :params do
+        { indexes: ['example.txt', 'fearsome.aspx'] }
       end
-      context "passing no parameters" do
-        it { is_expected.to contain_class("apache::params") }
-        it { is_expected.to contain_apache__mod('dir') }
-        it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) }
+
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ fearsome\.aspx$}) }
+    end
+  end
+  context 'default configuration with parameters 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',
+        is_pe: false,
+      }
+    end
+
+    context 'passing no parameters' do
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('dir') }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{^DirectoryIndex }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html\.var }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.cgi }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.pl }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.php }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.xhtml$}) }
+    end
+    context "passing indexes => ['example.txt','fearsome.aspx']" do
+      let :params do
+        { indexes: ['example.txt', 'fearsome.aspx'] }
       end
-      context "passing indexes => ['example.txt','fearsome.aspx']" do
-        let :params do
-          {:indexes => ['example.txt','fearsome.aspx']}
-        end
-        it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) }
-        it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
+
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ fearsome\.aspx$}) }
+    end
+  end
+  context 'default configuration with parameters on a Gentoo OS' do
+    let :facts do
+      {
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
+      }
+    end
+
+    context 'passing no parameters' do
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('dir') }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{^DirectoryIndex }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html\.var }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.cgi }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.pl }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.php }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.xhtml$}) }
+    end
+    context "passing indexes => ['example.txt','fearsome.aspx']" do
+      let :params do
+        { indexes: ['example.txt', 'fearsome.aspx'] }
       end
+
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ fearsome\.aspx$}) }
     end
   end
 end
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index d6e7bf29d8..ec33433e5b 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -1,28 +1,28 @@
 require 'spec_helper'
 
-describe 'apache::mod::disk_cache', :type => :class do
-  context "on a Debian OS" do
+describe 'apache::mod::disk_cache', type: :class do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        lsbdistcodename: 'squeeze',
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '6',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        concat_basedir: '/dne',
+        is_pe: false,
       }
     end
 
-    let(:params) {
+    let(:params) do
       {
-        :cache_ignore_headers   => "Set-Cookie",
+        cache_ignore_headers: 'Set-Cookie',
       }
-    }
+    end
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :pre_condition do
         'class{ "apache":
           apache_version => "2.2",
@@ -30,12 +30,16 @@
           mod_dir        => "/tmp/junk",
          }'
       end
-      it { should compile }
-      it { should contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_apache__mod('disk_cache') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
     end
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :pre_condition do
         'class{ "apache":
           apache_version => "2.4",
@@ -43,35 +47,39 @@
           mod_dir        => "/tmp/junk",
          }'
       end
-      it { should compile }
-      it { should contain_class('apache::mod::disk_cache') }
-      it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
-      it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache__mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
     end
   end
 
-  context "on a RedHat 6-based OS" do
+  context 'on a RedHat 6-based OS' do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '6',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        concat_basedir: '/dne',
+        is_pe: false,
       }
     end
 
-    let(:params) {
+    let(:params) do
       {
-        :cache_ignore_headers   => "Set-Cookie",
+        cache_ignore_headers: 'Set-Cookie',
       }
-    }
+    end
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :pre_condition do
         'class{ "apache":
           apache_version => "2.2",
@@ -79,10 +87,14 @@
           mod_dir        => "/tmp/junk",
          }'
       end
-      it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
+
+      it { is_expected.to contain_apache__mod('disk_cache') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
     end
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :pre_condition do
         'class{ "apache":
           apache_version => "2.4",
@@ -90,31 +102,35 @@
           mod_dir        => "/tmp/junk",
          }'
       end
-      it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
+
+      it { is_expected.to contain_apache__mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
     end
   end
-  context "on a FreeBSD OS" do
+  context 'on a FreeBSD OS' do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '10',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'FreeBSD',
+        osfamily: 'FreeBSD',
+        operatingsystem: 'FreeBSD',
+        operatingsystemrelease: '10',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        concat_basedir: '/dne',
+        is_pe: false,
       }
     end
 
-    let(:params) {
+    let(:params) do
       {
-        :cache_ignore_headers   => "Set-Cookie",
+        cache_ignore_headers: 'Set-Cookie',
       }
-    }
+    end
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :pre_condition do
         'class{ "apache":
           apache_version => "2.2",
@@ -122,13 +138,17 @@
           mod_dir        => "/tmp/junk",
          }'
       end
-      it { should compile }
-      it { should contain_class('apache::mod::disk_cache') }
-      it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
-      it { is_expected.to contain_apache__mod("disk_cache") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache__mod('disk_cache') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
     end
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :pre_condition do
         'class{ "apache":
           apache_version => "2.4",
@@ -136,11 +156,15 @@
           mod_dir        => "/tmp/junk",
          }'
       end
-      it { should compile }
-      it { should contain_class('apache::mod::disk_cache') }
-      it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]')  }
-      it { is_expected.to contain_apache__mod("cache_disk") }
-      it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie/) }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache__mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
     end
   end
 end
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
index 106b23af0c..5e16d12c90 100644
--- a/spec/classes/mod/dumpio_spec.rb
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'apache::mod::dumpio', :type => :class do
-  context "on a Debian OS" do
+describe 'apache::mod::dumpio', type: :class do
+  context 'on a Debian OS' do
     let :pre_condition do
       'class{"apache":
          default_mods => false,
@@ -10,42 +10,45 @@
     end
     let :facts do
       {
-        :lsbdistcodename           => 'squeeze',
-        :osfamily                  => 'Debian',
-        :operatingsystemrelease    => '6',
-        :operatingsystemmajrelease => '6',
-        :concat_basedir            => '/dne',
-        :operatingsystem           => 'Debian',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        lsbdistcodename: 'squeeze',
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        operatingsystemmajrelease: '6',
+        concat_basedir: '/dne',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    context "default configuration fore parameters" do
-      it { should compile }
-      it { should contain_class('apache::mod::dumpio') }
-      it { should contain_file("dumpio.conf").with_path("/tmp/junk/dumpio.conf") }
-      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"Off"$/)}
-      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"Off"$/)}
+
+    context 'default configuration fore parameters' do
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::dumpio') }
+      it { is_expected.to contain_file('dumpio.conf').with_path('/tmp/junk/dumpio.conf') }
+      it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOInput\s+"Off"$}) }
+      it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOOutput\s+"Off"$}) }
     end
-    context "with dumpio_input set to On" do
+    context 'with dumpio_input set to On' do
       let :params do
         {
-          :dump_io_input => 'On',
+          dump_io_input: 'On',
         }
       end
-      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"On"$/)}
-      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"Off"$/)}
+
+      it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOInput\s+"On"$}) }
+      it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOOutput\s+"Off"$}) }
     end
-    context "with dumpio_ouput set to On" do
+    context 'with dumpio_ouput set to On' do
       let :params do
         {
-          :dump_io_output => 'On',
+          dump_io_output: 'On',
         }
       end
-      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"Off"$/)}
-      it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"On"$/)}
+
+      it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOInput\s+"Off"$}) }
+      it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOOutput\s+"On"$}) }
     end
   end
 end
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index b010d4c024..02dfe944b8 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -1,213 +1,213 @@
 require 'spec_helper'
 
-describe 'apache::mod::event', :type => :class do
+describe 'apache::mod::event', type: :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
   end
-  context "on a FreeBSD OS" do
+
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('event') }
-    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/event.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/event.conf').with_ensure('file') }
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('event') }
-    it { is_expected.to contain_file("/etc/apache2/modules.d/event.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/etc/apache2/modules.d/event.conf').with_ensure('file') }
   end
-  context "on a Debian OS" do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :lsbdistcodename        => 'squeeze',
-        :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',
-        :is_pe                  => false,
+        lsbdistcodename: 'squeeze',
+        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',
+        is_pe: false,
       }
     end
 
-
-    it { is_expected.to contain_class("apache::params") }
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('event') }
-    it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') }
-    it { is_expected.to contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') }
+    it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file') }
+    it { is_expected.to contain_file('/etc/apache2/mods-enabled/event.conf').with_ensure('link') }
 
-    context "Test mpm_event new params" do
+    context 'Test mpm_event new params' do
       let :params do
         {
-          :serverlimit            => '0',
-          :startservers           => '1',
-          :maxclients             => '2',
-          :minsparethreads        => '3',
-          :maxsparethreads        => '4',
-          :threadsperchild        => '5',
-          :maxrequestsperchild    => '6',
-          :threadlimit            => '7',
-          :listenbacklog          => '8',
-          :maxrequestworkers      => '9',
-          :maxconnectionsperchild => '10',
+          serverlimit: '0',
+          startservers: '1',
+          maxclients: '2',
+          minsparethreads: '3',
+          maxsparethreads: '4',
+          threadsperchild: '5',
+          maxrequestsperchild: '6',
+          threadlimit: '7',
+          listenbacklog: '8',
+          maxrequestworkers: '9',
+          maxconnectionsperchild: '10',
         }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxClients/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MinSpareThreads\s*3/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxSpareThreads\s*4/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadsPerChild\s*5/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestsPerChild/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestWorkers\s*9/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxConnectionsPerChild\s*10/) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ServerLimit\s*0}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*StartServers\s*1}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxClients}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MinSpareThreads\s*3}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxSpareThreads\s*4}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ThreadsPerChild\s*5}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxRequestsPerChild}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ThreadLimit\s*7}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ListenBacklog\s*8}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxRequestWorkers\s*9}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxConnectionsPerChild\s*10}) }
     end
 
-    context "Test mpm_event old style params" do
+    context 'Test mpm_event old style params' do
       let :params do
         {
-          :serverlimit            => '0',
-          :startservers           => '1',
-          :maxclients             => '2',
-          :minsparethreads        => '3',
-          :maxsparethreads        => '4',
-          :threadsperchild        => '5',
-          :maxrequestsperchild    => '6',
-          :threadlimit            => '7',
-          :listenbacklog          => '8',
-          :maxrequestworkers      => :undef,
-          :maxconnectionsperchild => :undef,
+          serverlimit: '0',
+          startservers: '1',
+          maxclients: '2',
+          minsparethreads: '3',
+          maxsparethreads: '4',
+          threadsperchild: '5',
+          maxrequestsperchild: '6',
+          threadlimit: '7',
+          listenbacklog: '8',
+          maxrequestworkers: :undef,
+          maxconnectionsperchild: :undef,
         }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxClients\s*2/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MinSpareThreads\s*3/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxSpareThreads\s*4/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadsPerChild\s*5/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestsPerChild\s*6/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestWorkers/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxConnectionsPerChild/) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ServerLimit\s*0}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*StartServers\s*1}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxClients\s*2}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MinSpareThreads\s*3}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxSpareThreads\s*4}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ThreadsPerChild\s*5}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxRequestsPerChild\s*6}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ThreadLimit\s*7}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ListenBacklog\s*8}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxRequestWorkers}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxConnectionsPerChild}) }
     end
 
-    context "Test mpm_event false params" do
+    context 'Test mpm_event false params' do
       let :params do
         {
-          :serverlimit            => false,
-          :startservers           => false,
-          :maxclients             => false,
-          :minsparethreads        => false,
-          :maxsparethreads        => false,
-          :threadsperchild        => false,
-          :maxrequestsperchild    => false,
-          :threadlimit            => false,
-          :listenbacklog          => false,
-          :maxrequestworkers      => false,
-          :maxconnectionsperchild => false,
+          serverlimit: false,
+          startservers: false,
+          maxclients: false,
+          minsparethreads: false,
+          maxsparethreads: false,
+          threadsperchild: false,
+          maxrequestsperchild: false,
+          threadlimit: false,
+          listenbacklog: false,
+          maxrequestworkers: false,
+          maxconnectionsperchild: false,
         }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ServerLimit/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*StartServers/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxClients/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MinSpareThreads/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxSpareThreads/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ThreadsPerChild/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestsPerChild/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ThreadLimit/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ListenBacklog/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestWorkers/) }
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxConnectionsPerChild/) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*ServerLimit}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*StartServers}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxClients}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MinSpareThreads}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxSpareThreads}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*ThreadsPerChild}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxRequestsPerChild}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*ThreadLimit}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*ListenBacklog}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxRequestWorkers}) }
+      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxConnectionsPerChild}) }
     end
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
 
-      it { is_expected.not_to contain_file("/etc/apache2/mods-available/event.load") }
-      it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/event.load") }
+      it { is_expected.not_to contain_file('/etc/apache2/mods-available/event.load') }
+      it { is_expected.not_to contain_file('/etc/apache2/mods-enabled/event.load') }
 
-      it { is_expected.to contain_package("apache2-mpm-event") }
+      it { is_expected.to contain_package('apache2-mpm-event') }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
         }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/mods-available/event.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n"
-        })
+      it {
+        is_expected.to contain_file('/etc/apache2/mods-available/event.load').with('ensure' => 'file',
+                                                                                   'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n")
       }
-      it { is_expected.to contain_file("/etc/apache2/mods-enabled/event.load").with_ensure('link') }
+      it { is_expected.to contain_file('/etc/apache2/mods-enabled/event.load').with_ensure('link') }
     end
   end
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
         }
       end
 
-      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.not_to contain_apache__mod('worker') }
       it { is_expected.not_to contain_apache__mod('prefork') }
 
-      it { is_expected.to contain_file("/etc/httpd/conf.d/event.conf").with_ensure('file') }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/event.conf').with_ensure('file') }
 
-      it { is_expected.to contain_file("/etc/httpd/conf.d/event.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n",
-        })
+      it {
+        is_expected.to contain_file('/etc/httpd/conf.d/event.load').with('ensure' => 'file',
+                                                                         'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index 397fee0243..0c398ef855 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -1,67 +1,70 @@
 require 'spec_helper'
 
-describe 'apache::mod::expires', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::expires', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "with expires active", :compile do
+  context 'with expires active', :compile do
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        lsbdistcodename: 'squeeze',
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '6',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        concat_basedir: '/dne',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_apache__mod("expires") }
-    it { is_expected.to contain_file("expires.conf").with(:content => /ExpiresActive On\n/) }
+
+    it { is_expected.to contain_apache__mod('expires') }
+    it { is_expected.to contain_file('expires.conf').with(content: %r{ExpiresActive On\n}) }
   end
-  context "with expires default", :compile do
+  context 'with expires default', :compile do
     let :pre_condition do
       'class { apache: default_mods => false }'
     end
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '7',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '7',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        concat_basedir: '/dne',
+        is_pe: false,
       }
     end
     let :params do
       {
-        'expires_default' => 'access plus 1 month'
+        'expires_default' => 'access plus 1 month',
       }
     end
-    it { is_expected.to contain_apache__mod("expires") }
-    it { is_expected.to contain_file("expires.conf").with_content(
+
+    it { is_expected.to contain_apache__mod('expires') }
+    it {
+      is_expected.to contain_file('expires.conf').with_content(
         "ExpiresActive On\n" \
-        "ExpiresDefault \"access plus 1 month\"\n"
+        "ExpiresDefault \"access plus 1 month\"\n",
       )
     }
   end
-  context "with expires by type", :compile do
+  context 'with expires by type', :compile do
     let :pre_condition do
       'class { apache: default_mods => false }'
     end
     let :facts do
       {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '7',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-        :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '7',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        concat_basedir: '/dne',
+        is_pe: false,
       }
     end
     let :params do
@@ -69,14 +72,16 @@
         'expires_by_type' => [
           { 'text/json' => 'mod plus 1 day' },
           { 'text/html' => 'access plus 1 year' },
-        ]
+        ],
       }
     end
-    it { is_expected.to contain_apache__mod("expires") }
-    it { is_expected.to contain_file("expires.conf").with_content(
+
+    it { is_expected.to contain_apache__mod('expires') }
+    it {
+      is_expected.to contain_file('expires.conf').with_content(
         "ExpiresActive On\n" \
         "ExpiresByType text/json \"mod plus 1 day\"\n" \
-        "ExpiresByType text/html \"access plus 1 year\"\n"
+        "ExpiresByType text/html \"access plus 1 year\"\n",
       )
     }
   end
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index a0cf37cec5..d9a5db3ac7 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -1,64 +1,65 @@
 require 'spec_helper'
 
-describe 'apache::mod::ext_filter', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::ext_filter', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :fqdn                   => 'test.example.com',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        fqdn: 'test.example.com',
+        is_pe: false,
       }
     end
+
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('ext_filter') }
       it { is_expected.not_to contain_file('ext_filter.conf') }
     end
     describe 'with parameters' do
       let :params do
-        { :ext_filter_define =>  {'filtA' => 'input=A output=B',
-                                  'filtB' => 'input=C cmd="C"' },
-        }
+        { ext_filter_define: { 'filtA' => 'input=A output=B',
+                               'filtB' => 'input=C cmd="C"' }  }
       end
-      it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtA\s+input=A output=B$/) }
-      it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtB\s+input=C cmd="C"$/) }
-    end
 
+      it { is_expected.to contain_file('ext_filter.conf').with_content(%r{^ExtFilterDefine\s+filtA\s+input=A output=B$}) }
+      it { is_expected.to contain_file('ext_filter.conf').with_content(%r{^ExtFilterDefine\s+filtB\s+input=C cmd="C"$}) }
+    end
   end
-  context "on a RedHat OS" do
+  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',
-        :fqdn                   => 'test.example.com',
-        :is_pe                  => false,
+        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',
+        fqdn: 'test.example.com',
+        is_pe: false,
       }
     end
+
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('ext_filter') }
       it { is_expected.not_to contain_file('ext_filter.conf') }
     end
     describe 'with parameters' do
       let :params do
-        { :ext_filter_define =>  {'filtA' => 'input=A output=B',
-                                  'filtB' => 'input=C cmd="C"' },
-        }
+        { ext_filter_define: { 'filtA' => 'input=A output=B',
+                               'filtB' => 'input=C cmd="C"' }  }
       end
+
       it { is_expected.to contain_file('ext_filter.conf').with_path('/etc/httpd/conf.d/ext_filter.conf') }
-      it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtA\s+input=A output=B$/) }
-      it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtB\s+input=C cmd="C"$/) }
+      it { is_expected.to contain_file('ext_filter.conf').with_content(%r{^ExtFilterDefine\s+filtA\s+input=A output=B$}) }
+      it { is_expected.to contain_file('ext_filter.conf').with_content(%r{^ExtFilterDefine\s+filtB\s+input=C cmd="C"$}) }
     end
   end
 end
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 778d27cffb..d0153e0b5a 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -1,43 +1,45 @@
 require 'spec_helper'
 
-describe 'apache::mod::fastcgi', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::fastcgi', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('fastcgi') }
-    it { is_expected.to contain_package("libapache2-mod-fastcgi") }
+    it { is_expected.to contain_package('libapache2-mod-fastcgi') }
     it { is_expected.to contain_file('fastcgi.conf') }
   end
 
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('fastcgi') }
-    it { is_expected.to contain_package("mod_fastcgi") }
+    it { is_expected.to contain_package('mod_fastcgi') }
     it { is_expected.not_to contain_file('fastcgi.conf') }
   end
 end
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index f08596be6b..666c29a8e2 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -1,141 +1,145 @@
 require 'spec_helper'
 
-describe 'apache::mod::fcgid', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::fcgid', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "on a Debian OS" do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily                  => 'Debian',
-        :operatingsystemrelease    => '6',
-        :operatingsystemmajrelease => '6',
-        :concat_basedir            => '/dne',
-        :lsbdistcodename           => 'squeeze',
-        :operatingsystem           => 'Debian',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                     => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        operatingsystemmajrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('fcgid').with({
-      'loadfile_name' => nil
-    }) }
-    it { is_expected.to contain_package("libapache2-mod-fcgid") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
+    }
+    it { is_expected.to contain_package('libapache2-mod-fcgid') }
   end
 
-  context "on a RHEL6" do
+  context 'on a RHEL6' do
     let :facts do
       {
-        :osfamily                  => 'RedHat',
-        :operatingsystemrelease    => '6',
-        :operatingsystemmajrelease => '6',
-        :concat_basedir            => '/dne',
-        :operatingsystem           => 'RedHat',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                     => false,
+        osfamily: 'RedHat',
+        operatingsystemrelease: '6',
+        operatingsystemmajrelease: '6',
+        concat_basedir: '/dne',
+        operatingsystem: 'RedHat',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
     describe 'without parameters' do
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod('fcgid').with({
-        'loadfile_name' => nil
-      }) }
-      it { is_expected.to contain_package("mod_fcgid") }
+      it { is_expected.to contain_class('apache::params') }
+      it {
+        is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
+      }
+      it { is_expected.to contain_package('mod_fcgid') }
     end
 
     describe 'with parameters' do
-      let :params do {
-        :options                     => {
-          'FcgidIPCDir'               => '/var/run/fcgidsock',
-          'SharememPath'              => '/var/run/fcgid_shm',
-          'FcgidMinProcessesPerClass' => '0',
-          'AddHandler'                => 'fcgid-script .fcgi',
+      let :params do
+        {
+          options: {
+            'FcgidIPCDir'               => '/var/run/fcgidsock',
+            'SharememPath'              => '/var/run/fcgid_shm',
+            'FcgidMinProcessesPerClass' => '0',
+            'AddHandler'                => 'fcgid-script .fcgi',
+          },
         }
-      } end
+      end
 
-      it 'should contain the correct config' do
+      expected = [
+        '<IfModule mod_fcgid.c>',
+        '  AddHandler fcgid-script .fcgi',
+        '  FcgidIPCDir /var/run/fcgidsock',
+        '  FcgidMinProcessesPerClass 0',
+        '  SharememPath /var/run/fcgid_shm',
+        '</IfModule>',
+      ]
+      it 'contains the correct config' do
         content = catalogue.resource('file', 'fcgid.conf').send(:parameters)[:content]
-        expect(content.split("\n").reject { |c| c =~ /(^#|^$)/ }).to eq([
-          '<IfModule mod_fcgid.c>',
-          '  AddHandler fcgid-script .fcgi',
-          '  FcgidIPCDir /var/run/fcgidsock',
-          '  FcgidMinProcessesPerClass 0',
-          '  SharememPath /var/run/fcgid_shm',
-          '</IfModule>',
-        ])
+        expect(content.split("\n").reject { |c| c =~ %r{(^#|^$)} }).to eq(expected)
       end
     end
   end
 
-  context "on RHEL7" do
+  context 'on RHEL7' do
     let :facts do
       {
-        :osfamily                  => 'RedHat',
-        :operatingsystemrelease    => '7',
-        :operatingsystemmajrelease => '7',
-        :concat_basedir            => '/dne',
-        :operatingsystem           => 'RedHat',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                     => false,
+        osfamily: 'RedHat',
+        operatingsystemrelease: '7',
+        operatingsystemmajrelease: '7',
+        concat_basedir: '/dne',
+        operatingsystem: 'RedHat',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
     describe 'without parameters' do
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod('fcgid').with({
-        'loadfile_name' => 'unixd_fcgid.load'
-      }) }
-      it { is_expected.to contain_package("mod_fcgid") }
+      it { is_expected.to contain_class('apache::params') }
+      it {
+        is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => 'unixd_fcgid.load')
+      }
+      it { is_expected.to contain_package('mod_fcgid') }
     end
   end
 
-  context "on a FreeBSD OS" do
+  context 'on a FreeBSD OS' do
     let :facts do
       {
-        :osfamily                  => 'FreeBSD',
-        :operatingsystemrelease    => '10',
-        :operatingsystemmajrelease => '10',
-        :concat_basedir            => '/dne',
-        :operatingsystem           => 'FreeBSD',
-        :id                        => 'root',
-        :kernel                    => 'FreeBSD',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                     => false,
+        osfamily: 'FreeBSD',
+        operatingsystemrelease: '10',
+        operatingsystemmajrelease: '10',
+        concat_basedir: '/dne',
+        operatingsystem: 'FreeBSD',
+        id: 'root',
+        kernel: 'FreeBSD',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('fcgid').with({
-      'loadfile_name' => 'unixd_fcgid.load'
-    }) }
-    it { is_expected.to contain_package("www/mod_fcgid") }
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => 'unixd_fcgid.load')
+    }
+    it { is_expected.to contain_package('www/mod_fcgid') }
   end
 
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily                  => 'Gentoo',
-        :operatingsystem           => 'Gentoo',
-        :operatingsystemrelease    => '3.16.1-gentoo',
-        :concat_basedir            => '/dne',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                     => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
 
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('fcgid').with({
-      'loadfile_name' => nil,
-    }) }
-    it { is_expected.to contain_package("www-apache/mod_fcgid") }
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
+    }
+    it { is_expected.to contain_package('www-apache/mod_fcgid') }
   end
 end
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 766a9e4fdb..c24e5eb686 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -5,60 +5,58 @@ def general_info_specs_22
   it { is_expected.to contain_apache__mod('info') }
 
   context 'passing no parameters' do
-    it {
-      is_expected.to contain_file('info.conf').with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "    Order deny,allow\n"\
-        "    Deny from all\n"\
-        "    Allow from 127.0.0.1\n"\
-        "    Allow from ::1\n"\
-        "</Location>\n"
-      )
-    }
+    expected = "<Location /server-info>\n"\
+               "    SetHandler server-info\n"\
+               "    Order deny,allow\n"\
+               "    Deny from all\n"\
+               "    Allow from 127.0.0.1\n"\
+               "    Allow from ::1\n"\
+               "</Location>\n"
+    it { is_expected.to contain_file('info.conf').with_content(expected) }
   end
   context 'passing restrict_access => false' do
-    let :params do {
-      :restrict_access => false
-    }
+    let :params do
+      {
+        restrict_access: false,
+      }
     end
+
     it {
       is_expected.to contain_file('info.conf').with_content(
         "<Location /server-info>\n"\
         "    SetHandler server-info\n"\
-        "</Location>\n"
+        "</Location>\n",
       )
     }
   end
   context "passing allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']" do
     let :params do
-      {:allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']}
+      { allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'] }
     end
-    it {
-      is_expected.to contain_file('info.conf').with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "    Order deny,allow\n"\
-        "    Deny from all\n"\
-        "    Allow from 10.10.1.2\n"\
-        "    Allow from 192.168.1.2\n"\
-        "    Allow from 127.0.0.1\n"\
-        "</Location>\n"
-      )
-    }
+
+    expected = "<Location /server-info>\n"\
+               "    SetHandler server-info\n"\
+               "    Order deny,allow\n"\
+               "    Deny from all\n"\
+               "    Allow from 10.10.1.2\n"\
+               "    Allow from 192.168.1.2\n"\
+               "    Allow from 127.0.0.1\n"\
+               "</Location>\n"
+    it { is_expected.to contain_file('info.conf').with_content(expected) }
   end
   context 'passing both restrict_access and allow_from' do
     let :params do
       {
-        :restrict_access => false,
-        :allow_from      => ['10.10.1.2', '192.168.1.2', '127.0.0.1']
+        restrict_access: false,
+        allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'],
       }
     end
+
     it {
       is_expected.to contain_file('info.conf').with_content(
         "<Location /server-info>\n"\
         "    SetHandler server-info\n"\
-        "</Location>\n"
+        "</Location>\n",
       )
     }
   end
@@ -68,155 +66,155 @@ def general_info_specs_24
   it { is_expected.to contain_apache__mod('info') }
 
   context 'passing no parameters' do
-    it {
-      is_expected.to contain_file('info.conf').with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "    Require ip 127.0.0.1 ::1\n"\
-        "</Location>\n"
-      )
-    }
+    expected = "<Location /server-info>\n"\
+               "    SetHandler server-info\n"\
+               "    Require ip 127.0.0.1 ::1\n"\
+               "</Location>\n"
+    it { is_expected.to contain_file('info.conf').with_content(expected) }
   end
   context 'passing restrict_access => false' do
-    let :params do {
-      :restrict_access => false
-    }
+    let :params do
+      {
+        restrict_access: false,
+      }
     end
+
     it {
       is_expected.to contain_file('info.conf').with_content(
         "<Location /server-info>\n"\
         "    SetHandler server-info\n"\
-        "</Location>\n"
+        "</Location>\n",
       )
     }
   end
   context "passing allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']" do
     let :params do
-      {:allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']}
+      { allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'] }
     end
-    it {
-      is_expected.to contain_file('info.conf').with_content(
-        "<Location /server-info>\n"\
+
+    expected = "<Location /server-info>\n"\
         "    SetHandler server-info\n"\
         "    Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n"\
         "</Location>\n"
-      )
+    it {
+      is_expected.to contain_file('info.conf').with_content(expected)
     }
   end
   context 'passing both restrict_access and allow_from' do
     let :params do
       {
-        :restrict_access => false,
-        :allow_from      => ['10.10.1.2', '192.168.1.2', '127.0.0.1']
+        restrict_access: false,
+        allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'],
       }
     end
+
     it {
       is_expected.to contain_file('info.conf').with_content(
         "<Location /server-info>\n"\
         "    SetHandler server-info\n"\
-        "</Location>\n"
+        "</Location>\n",
       )
     }
   end
 end
 
-describe 'apache::mod::info', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::info', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
     # Load the more generic tests for this context
-    general_info_specs_22()
-
-    it { is_expected.to contain_file('info.conf').with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/info.conf',
-    } ) }
-    it { is_expected.to contain_file('info.conf symlink').with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/info.conf',
-    } ) }
+    general_info_specs_22
+
+    it {
+      is_expected.to contain_file('info.conf').with(ensure: 'file',
+                                                    path: '/etc/apache2/mods-available/info.conf')
+    }
+    it {
+      is_expected.to contain_file('info.conf symlink').with(ensure: 'link',
+                                                            path: '/etc/apache2/mods-enabled/info.conf')
+    }
   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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
 
     # Load the more generic tests for this context
-    general_info_specs_22()
+    general_info_specs_22
 
-    it { is_expected.to contain_file('info.conf').with({
-      :ensure => 'file',
-      :path   => '/etc/httpd/conf.d/info.conf',
-      } ) }
+    it {
+      is_expected.to contain_file('info.conf').with(ensure: 'file',
+                                                    path: '/etc/httpd/conf.d/info.conf')
+    }
   end
 
   context 'on a FreeBSD OS' do
     let :facts do
       {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '10',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'FreeBSD',
+        operatingsystemrelease: '10',
+        concat_basedir: '/dne',
+        operatingsystem: 'FreeBSD',
+        id: 'root',
+        kernel: 'FreeBSD',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
     # Load the more generic tests for this context
-    general_info_specs_24()
+    general_info_specs_24
 
-    it { is_expected.to contain_file('info.conf').with({
-      :ensure => 'file',
-      :path   => '/usr/local/etc/apache24/Modules/info.conf',
-    } ) }
+    it {
+      is_expected.to contain_file('info.conf').with(ensure: 'file',
+                                                    path: '/usr/local/etc/apache24/Modules/info.conf')
+    }
   end
 
   context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
 
     # Load the more generic tests for this context
-    general_info_specs_24()
+    general_info_specs_24
 
-    it { is_expected.to contain_file('info.conf').with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/modules.d/info.conf',
-    } ) }
+    it {
+      is_expected.to contain_file('info.conf').with(ensure: 'file',
+                                                    path: '/etc/apache2/modules.d/info.conf')
+    }
   end
 end
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
index 14a91fceef..5e26257ac2 100644
--- a/spec/classes/mod/intercept_form_submit_spec.rb
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -1,43 +1,45 @@
 require 'spec_helper'
 
-describe 'apache::mod::intercept_form_submit', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::intercept_form_submit', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian OS" do
+  context 'default configuration with parameters' do
+    context 'on a Debian OS' do
       let :facts do
         {
-          :lsbdistcodename        => 'squeeze',
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'Debian',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          operatingsystem: 'Debian',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_package("libapache2-mod-intercept-form-submit") }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_package('libapache2-mod-intercept-form-submit') }
       it { is_expected.to contain_apache__mod('intercept_form_submit') }
-    end #Debian
+    end # Debian
 
-    context "on a RedHat OS" do
+    context 'on a RedHat OS' do
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'RedHat',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          operatingsystem: 'RedHat',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_package("mod_intercept_form_submit") }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_package('mod_intercept_form_submit') }
       it { is_expected.to contain_apache__mod('intercept_form_submit') }
     end # Redhat
   end
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 2b55f35566..1c331fd025 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -1,192 +1,199 @@
 require 'spec_helper'
 
-describe 'apache::mod::itk', :type => :class do
+describe 'apache::mod::itk', type: :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
   end
-  context "on a Debian OS" do
+
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
-    it { is_expected.to contain_file("/etc/apache2/mods-available/itk.conf").with_ensure('file') }
-    it { is_expected.to contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') }
+    it { is_expected.to contain_file('/etc/apache2/mods-available/itk.conf').with_ensure('file') }
+    it { is_expected.to contain_file('/etc/apache2/mods-enabled/itk.conf').with_ensure('link') }
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
 
-      it { is_expected.not_to contain_file("/etc/apache2/mods-available/itk.load") }
-      it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/itk.load") }
-
-      it { is_expected.to contain_package("apache2-mpm-itk") }
+      it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.load') }
+      it { is_expected.not_to contain_file('/etc/apache2/mods-enabled/itk.load') }
 
-      context "with enablecapabilities set" do
-        let :params do
-          super().merge({:enablecapabilities => true})
-        end
-
-        it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.conf').with_content(
-                /EnableCapabilities/) }
+      it { is_expected.to contain_package('apache2-mpm-itk') }
+    end
+    context 'with Apache version < 2.4 with enablecapabilities set' do
+      let :params do
+        {
+          apache_version: '2.2',
+          enablecapabilities: true,
+        }
       end
+
+      it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.conf').with_content(%r{EnableCapabilities}) }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
 
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
         }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/mods-available/itk.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n"
-        })
+      it {
+        is_expected.to contain_file('/etc/apache2/mods-available/itk.load').with('ensure' => 'file',
+                                                                                 'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n")
       }
-      it { is_expected.to contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') }
-
-      context "with enablecapabilities not set" do
-        it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.conf').with_content(
-                /EnableCapabilities/) }
+      it { is_expected.to contain_file('/etc/apache2/mods-enabled/itk.load').with_ensure('link') }
+    end
+    context 'with Apache version >= 2.4 with enablecapabilities not set' do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
+      let :params do
+        {
+          apache_version: '2.4',
+        }
       end
+
+      it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.conf').with_content(%r{EnableCapabilities}) }
     end
   end
-  context "on a RedHat OS" do
+
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
-    it { is_expected.to contain_file("/etc/httpd/conf.d/itk.conf").with_ensure('file') }
-    it { is_expected.to contain_package("httpd-itk") }
+    it { is_expected.to contain_file('/etc/httpd/conf.d/itk.conf').with_ensure('file') }
+    it { is_expected.to contain_package('httpd-itk') }
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
 
-      it { is_expected.to contain_file_line("/etc/sysconfig/httpd itk enable").with({
-        'require' => 'Package[httpd]',
-        })
+      it {
+        is_expected.to contain_file_line('/etc/sysconfig/httpd itk enable').with('require' => 'Package[httpd]')
       }
-
-      context "with enablecapabilities set" do
-        let :params do
-          super().merge({:enablecapabilities => 'On'})
-        end
-
-        it { is_expected.not_to contain_file('/etc/httpd/conf.d/itk.conf').with_content(
-                /EnableCapabilities/) }
+    end
+    context 'with Apache version < 2.4 with enablecapabilities set' do
+      let :params do
+        {
+          apache_version: '2.2',
+          enablecapabilities: 'On',
+        }
       end
+
+      it { is_expected.not_to contain_file('/etc/httpd/conf.d/itk.conf').with_content(%r{EnableCapabilities}) }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
 
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
         }
       end
 
-      it { is_expected.to contain_file("/etc/httpd/conf.d/itk.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n"
-        })
+      it {
+        is_expected.to contain_file('/etc/httpd/conf.d/itk.load').with('ensure' => 'file',
+                                                                       'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
       }
+    end
+    context 'with Apache version >= 2.4 with enablecapabilities set' do
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
 
-      context "with enablecapabilities set" do
-        let :params do
-          super().merge({:enablecapabilities => false})
-        end
-
-        it { is_expected.to contain_file('/etc/httpd/conf.d/itk.conf').with_content(
-                /EnableCapabilities  Off/) }
+      let :params do
+        {
+          apache_version: '2.4',
+          enablecapabilities: false,
+        }
       end
+
+      it { is_expected.to contain_file('/etc/httpd/conf.d/itk.conf').with_content(%r{EnableCapabilities  Off}) }
     end
   end
-  context "on a FreeBSD OS" do
+  context 'on a FreeBSD OS' do
     let :pre_condition do
       'class { "apache": mpm_module => false, }'
     end
 
     let :facts do
       {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '10',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
-        :mpm_module             => 'itk',
+        osfamily: 'FreeBSD',
+        operatingsystemrelease: '10',
+        concat_basedir: '/dne',
+        operatingsystem: 'FreeBSD',
+        id: 'root',
+        kernel: 'FreeBSD',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
+        mpm_module: 'itk',
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
-    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/itk.conf").with_ensure('file') }
-    it { is_expected.to contain_package("www/mod_mpm_itk") }
+    it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_ensure('file') }
+    it { is_expected.to contain_package('www/mod_mpm_itk') }
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4 with enablecapabilities not set' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
 
-      context "with enablecapabilities not set" do
-        it { is_expected.not_to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_content(
-                /EnableCapabilities/) }
-      end
+      it { is_expected.not_to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_content(%r{EnableCapabilities}) }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4 with enablecapabilities set' do
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
+          enablecapabilities: true,
         }
       end
 
-      context "with enablecapabilities set" do
-        let :params do
-          super().merge({:enablecapabilities => true})
-        end
-
-        it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_content(
-                /EnableCapabilities  On/) }
-      end
+      it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_content(%r{EnableCapabilities  On}) }
     end
   end
 end
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 57305c1233..3beb07e826 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'apache::mod::jk', :type => :class do
+describe 'apache::mod::jk', type: :class do
   it_behaves_like 'a mod class, without including apache'
 
   shared_examples 'minimal resources' do |mod_dir|
@@ -10,7 +10,7 @@
     it { is_expected.to contain_class('apache') }
     it { is_expected.to contain_apache__mod('jk') }
     it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]') }
-    it { is_expected.to contain_file('jk.conf').with({ :path => "#{mod_dir}/jk.conf" }) }
+    it { is_expected.to contain_file('jk.conf').with(path: "#{mod_dir}/jk.conf") }
   end
 
   default_ip = '192.168.1.1'
@@ -18,205 +18,181 @@
   default_port = 80
   altern8_port = 8008
 
-  context "RHEL 6 with only required facts and default parameters" do
-
-    let (:facts) do
+  context 'RHEL 6 with only required facts and default parameters' do
+    let(:facts) do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :ipaddress              => default_ip,
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '6',
+        ipaddress: default_ip,
       }
     end
-
-    let (:pre_condition) do
+    let(:pre_condition) do
       'include apache'
     end
-
-    let (:params) do
+    let(:params) do
       {
-        :logroot => '/var/log/httpd',
+        logroot: '/var/log/httpd',
       }
     end
+    let(:mod_dir) { mod_dir }
 
     mod_dir = '/etc/httpd/conf.d'
-    let (:mod_dir) { mod_dir }
 
     it_behaves_like 'minimal resources', mod_dir
     it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
     }
-
   end
 
-  context "Debian 8 with only required facts and default parameters" do
-
-    let (:facts) do
+  context 'Debian 8 with only required facts and default parameters' do
+    let(:facts) do
       {
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '8',
-        :ipaddress              => default_ip,
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '8',
+        ipaddress: default_ip,
       }
     end
-
-    let (:pre_condition) do
+    let(:pre_condition) do
       'include apache'
     end
-
-    let (:params) do
+    let(:params) do
       {
-        :logroot => '/var/log/apache2',
+        logroot: '/var/log/apache2',
       }
     end
+    let(:mod_dir) { mod_dir }
 
     mod_dir = '/etc/apache2/mods-available'
-    let (:mod_dir) { mod_dir }
 
     it_behaves_like 'minimal resources', mod_dir
     it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
     }
-
   end
 
-  context "RHEL 6 with required facts and alternative IP" do
-
-    let (:facts) do
+  context 'RHEL 6 with required facts and alternative IP' do
+    let(:facts) do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :ipaddress              => default_ip,
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '6',
+        ipaddress: default_ip,
       }
     end
-
-    let (:pre_condition) do
+    let(:pre_condition) do
       'include apache'
     end
-
-    let (:params) do
+    let(:params) do
       {
-        :ip      => altern8_ip,
-        :logroot => '/var/log/httpd',
+        ip: altern8_ip,
+        logroot: '/var/log/httpd',
       }
     end
 
     it { is_expected.to contain_apache__listen("#{altern8_ip}:#{default_port}") }
-
   end
 
-  context "RHEL 6 with required facts and alternative port" do
-
-    let (:facts) do
+  context 'RHEL 6 with required facts and alternative port' do
+    let(:facts) do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :ipaddress              => default_ip,
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '6',
+        ipaddress: default_ip,
       }
     end
-
-    let (:pre_condition) do
+    let(:pre_condition) do
       'include apache'
     end
-
-    let (:params) do
+    let(:params) do
       {
-        :port    => altern8_port,
-        :logroot => '/var/log/httpd',
+        port: altern8_port,
+        logroot: '/var/log/httpd',
       }
     end
 
     it { is_expected.to contain_apache__listen("#{default_ip}:#{altern8_port}") }
-
   end
 
-  context "RHEL 6 with required facts and no binding" do
-
-    let (:facts) do
+  context 'RHEL 6 with required facts and no binding' do
+    let(:facts) do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :ipaddress              => default_ip,
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '6',
+        ipaddress: default_ip,
       }
     end
-
-    let (:pre_condition) do
+    let(:pre_condition) do
       'include apache'
     end
-
-    let (:params) do
+    let(:params) do
       {
-        :add_listen => false,
-        :logroot    => '/var/log/httpd',
+        add_listen: false,
+        logroot: '/var/log/httpd',
       }
     end
 
     it { is_expected.not_to contain_apache__listen("#{default_ip}:#{default_port}") }
-
   end
 
   {
-    :default => {
-      :shm_file => :undef,
-      :log_file => :undef,
-      :shm_path => '/var/log/httpd/jk-runtime-status',
-      :log_path => '/var/log/httpd/mod_jk.log',
+    default: {
+      shm_file: :undef,
+      log_file: :undef,
+      shm_path: '/var/log/httpd/jk-runtime-status',
+      log_path: '/var/log/httpd/mod_jk.log',
     },
-    :relative => {
-      :shm_file => 'shm_file',
-      :log_file => 'log_file',
-      :shm_path => '/var/log/httpd/shm_file',
-      :log_path => '/var/log/httpd/log_file',
+    relative: {
+      shm_file: 'shm_file',
+      log_file: 'log_file',
+      shm_path: '/var/log/httpd/shm_file',
+      log_path: '/var/log/httpd/log_file',
     },
-    :absolute => {
-      :shm_file => '/run/shm_file',
-      :log_file => '/tmp/log_file',
-      :shm_path => '/run/shm_file',
-      :log_path => '/tmp/log_file',
+    absolute: {
+      shm_file: '/run/shm_file',
+      log_file: '/tmp/log_file',
+      shm_path: '/run/shm_file',
+      log_path: '/tmp/log_file',
     },
-    :pipe => {
-      :shm_file => :undef,
-      :log_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
-      :shm_path => '/var/log/httpd/jk-runtime-status',
-      :log_path => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
+    pipe: {
+      shm_file: :undef,
+      log_file: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
+      shm_path: '/var/log/httpd/jk-runtime-status',
+      log_path: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
     },
   }.each do |option, paths|
     context "RHEL 6 with #{option} shm_file and log_file paths" do
-
-      let (:facts) do
+      let(:facts) do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '6',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
         }
       end
-
-      let (:pre_condition) do
+      let(:pre_condition) do
         'include apache'
       end
+      let(:params) do
+        {
+          logroot: '/var/log/httpd',
+          shm_file: paths[:shm_file],
+          log_file: paths[:log_file],
+        }
+      end
 
-      let (:params) do {
-        :logroot => '/var/log/httpd',
-        :shm_file => paths[:shm_file],
-        :log_file => paths[:log_file],
-      } end
-
-      it { is_expected.to contain_file('jk.conf').with_content(
-        "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
-        "# Any manual changes will be overwritten\n"\
-        "\n"\
-        "<IfModule jk_module>\n"\
-        "  JkShmFile #{paths[:shm_path]}\n"\
-        "  JkLogFile #{paths[:log_path]}\n"\
-        "</IfModule>\n"
-      ) }
-
+      expected = "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
+                 "# Any manual changes will be overwritten\n"\
+                 "\n"\
+                 "<IfModule jk_module>\n"\
+                 "  JkShmFile #{paths[:shm_path]}\n"\
+                 "  JkLogFile #{paths[:log_path]}\n"\
+                 "</IfModule>\n"
+      it { is_expected.to contain_file('jk.conf').with_content(expected) }
     end
   end
-
 end
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 08272783fe..d0c3cb6286 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -1,88 +1,98 @@
 require 'spec_helper'
 
-describe 'apache::mod::ldap', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::ldap', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "on a Debian OS" do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :operatingsystem        => 'Debian',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        lsbdistcodename: 'squeeze',
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        operatingsystem: 'Debian',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class("apache::mod::ldap") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_class('apache::mod::ldap') }
     it { is_expected.to contain_apache__mod('ldap') }
 
     context 'default ldap_trusted_global_cert_file' do
-      it { is_expected.to contain_file('apache-mod-ldap.conf').without_content(/^LDAPTrustedGlobalCert/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').without_content(%r{^LDAPTrustedGlobalCert}) }
     end
 
     context 'ldap_trusted_global_cert_file param' do
-      let(:params) { { :ldap_trusted_global_cert_file => 'ca.pem' } }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
+      let(:params) { { ldap_trusted_global_cert_file: 'ca.pem' } }
+
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$}) }
     end
 
     context 'set multiple ldap params' do
-      let(:params) {{
-        :ldap_trusted_global_cert_file => 'ca.pem',
-        :ldap_trusted_global_cert_type => 'CA_DER',
-        :ldap_trusted_mode             => 'TLS',
-        :ldap_shared_cache_size        => '500000',
-        :ldap_cache_entries            => '1024',
-        :ldap_cache_ttl                => '600',
-        :ldap_opcache_entries          => '1024',
-        :ldap_opcache_ttl              => '600'
-      }}
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedMode TLS$/) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPSharedCacheSize 500000$/) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPCacheEntries 1024$/) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPCacheTTL 600$/) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPOpCacheEntries 1024$/) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPOpCacheTTL 600$/) }
+      let(:params) do
+        {
+          ldap_trusted_global_cert_file: 'ca.pem',
+          ldap_trusted_global_cert_type: 'CA_DER',
+          ldap_trusted_mode: 'TLS',
+          ldap_shared_cache_size: '500000',
+          ldap_cache_entries: '1024',
+          ldap_cache_ttl: '600',
+          ldap_opcache_entries: '1024',
+          ldap_opcache_ttl: '600',
+        }
+      end
+
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_DER ca\.pem$}) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedMode TLS$}) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPSharedCacheSize 500000$}) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPCacheEntries 1024$}) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPCacheTTL 600$}) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPOpCacheEntries 1024$}) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPOpCacheTTL 600$}) }
     end
-  end #Debian
+  end # Debian
 
-  context "on a RedHat OS" do
+  context 'on a RedHat OS' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :operatingsystem        => 'RedHat',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        operatingsystem: 'RedHat',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class("apache::mod::ldap") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_class('apache::mod::ldap') }
     it { is_expected.to contain_apache__mod('ldap') }
 
     context 'default ldap_trusted_global_cert_file' do
-      it { is_expected.to contain_file('apache-mod-ldap.conf').without_content(/^LDAPTrustedGlobalCert/) }
+      it { is_expected.to contain_file('apache-mod-ldap.conf').without_content(%r{^LDAPTrustedGlobalCert}) }
     end
 
     context 'ldap_trusted_global_cert_file param' do
-      let(:params) { { :ldap_trusted_global_cert_file => 'ca.pem' } }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) }
+      let(:params) { { ldap_trusted_global_cert_file: 'ca.pem' } }
+
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$}) }
     end
 
     context 'ldap_trusted_global_cert_file and ldap_trusted_global_cert_type params' do
-      let(:params) {{
-        :ldap_trusted_global_cert_file => 'ca.pem',
-        :ldap_trusted_global_cert_type => 'CA_DER'
-      }}
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) }
+      let(:params) do
+        {
+          ldap_trusted_global_cert_file: 'ca.pem',
+          ldap_trusted_global_cert_type: 'CA_DER',
+        }
+      end
+
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_DER ca\.pem$}) }
     end
   end # Redhat
 end
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
index a04e2e88eb..d7074ecf64 100644
--- a/spec/classes/mod/lookup_identity.rb
+++ b/spec/classes/mod/lookup_identity.rb
@@ -1,43 +1,45 @@
 require 'spec_helper'
 
-describe 'apache::mod::lookup_identity', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::lookup_identity', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian OS" do
+  context 'default configuration with parameters' do
+    context 'on a Debian OS' do
       let :facts do
         {
-          :lsbdistcodename        => 'squeeze',
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'Debian',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          operatingsystem: 'Debian',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_package("libapache2-mod-lookup-identity") }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_package('libapache2-mod-lookup-identity') }
       it { is_expected.to contain_apache__mod('lookup_identity') }
-    end #Debian
+    end # Debian
 
-    context "on a RedHat OS" do
+    context 'on a RedHat OS' do
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'RedHat',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          operatingsystem: 'RedHat',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_package("mod_lookup_identity") }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_package('mod_lookup_identity') }
       it { is_expected.to contain_apache__mod('lookup_identity') }
     end # Redhat
   end
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index cf8f898aa5..037722f56a 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -2,109 +2,105 @@
 
 # This function is called inside the OS specific contexts
 def general_mime_magic_specs
-  it { is_expected.to contain_apache__mod("mime_magic") }
+  it { is_expected.to contain_apache__mod('mime_magic') }
 end
 
-describe 'apache::mod::mime_magic', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::mime_magic', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "On a Debian OS with default params" do
+  context 'On a Debian OS with default params' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
-    general_mime_magic_specs()
+    general_mime_magic_specs
 
     it do
-      is_expected.to contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/etc/apache2/magic\"\n"
+      is_expected.to contain_file('mime_magic.conf').with_content(
+        "MIMEMagicFile \"/etc/apache2/magic\"\n",
       )
     end
 
-    it { is_expected.to contain_file("mime_magic.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/mime_magic.conf',
-    } ) }
-    it { is_expected.to contain_file("mime_magic.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/mime_magic.conf',
-    } ) }
+    it {
+      is_expected.to contain_file('mime_magic.conf').with(ensure: 'file',
+                                                          path: '/etc/apache2/mods-available/mime_magic.conf')
+    }
+    it {
+      is_expected.to contain_file('mime_magic.conf symlink').with(ensure: 'link',
+                                                                  path: '/etc/apache2/mods-enabled/mime_magic.conf')
+    }
 
-    context "with magic_file => /tmp/Debian_magic" do
+    context 'with magic_file => /tmp/Debian_magic' do
       let :params do
-        { :magic_file => "/tmp/Debian_magic" }
+        { magic_file: '/tmp/Debian_magic' }
       end
 
       it do
-        is_expected.to contain_file("mime_magic.conf").with_content(
-          "MIMEMagicFile \"/tmp/Debian_magic\"\n"
+        is_expected.to contain_file('mime_magic.conf').with_content(
+          "MIMEMagicFile \"/tmp/Debian_magic\"\n",
         )
       end
     end
-
   end
 
-  context "on a RedHat OS with default params" do
+  context 'on a RedHat OS with default params' 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
 
-    general_mime_magic_specs()
+    general_mime_magic_specs
 
     it do
-      is_expected.to contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/etc/httpd/conf/magic\"\n"
+      is_expected.to contain_file('mime_magic.conf').with_content(
+        "MIMEMagicFile \"/etc/httpd/conf/magic\"\n",
       )
     end
 
-    it { is_expected.to contain_file("mime_magic.conf").with_path("/etc/httpd/conf.d/mime_magic.conf") }
-
+    it { is_expected.to contain_file('mime_magic.conf').with_path('/etc/httpd/conf.d/mime_magic.conf') }
   end
 
-  context "with magic_file => /tmp/magic" do
+  context 'with magic_file => /tmp/magic' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
     let :params do
-      { :magic_file => "/tmp/magic" }
+      { magic_file: '/tmp/magic' }
     end
 
     it do
-      is_expected.to contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/tmp/magic\"\n"
+      is_expected.to contain_file('mime_magic.conf').with_content(
+        "MIMEMagicFile \"/tmp/magic\"\n",
       )
     end
   end
-
-
 end
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index b0675a3c0a..a2c315fea9 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -2,51 +2,48 @@
 
 # This function is called inside the OS specific conte, :compilexts
 def general_mime_specs
-  it { is_expected.to contain_apache__mod("mime") }
+  it { is_expected.to contain_apache__mod('mime') }
 end
 
-describe 'apache::mod::mime', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::mime', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "On a Debian OS with default params", :compile do
+  context 'On a Debian OS with default params', :compile do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
-    general_mime_specs()
-
-    it { is_expected.to contain_file("mime.conf").with_path('/etc/apache2/mods-available/mime.conf') }
+    general_mime_specs
 
+    it { is_expected.to contain_file('mime.conf').with_path('/etc/apache2/mods-available/mime.conf') }
   end
 
-  context "on a RedHat OS with default params", :compile do
+  context 'on a RedHat OS with default params', :compile 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
 
-    general_mime_specs()
-
-    it { is_expected.to contain_file("mime.conf").with_path("/etc/httpd/conf.d/mime.conf") }
+    general_mime_specs
 
+    it { is_expected.to contain_file('mime.conf').with_path('/etc/httpd/conf.d/mime.conf') }
   end
-
 end
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 9dadb7651e..47e34996e0 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -1,55 +1,51 @@
 require 'spec_helper'
 
-describe 'apache::mod::negotiation', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  describe "OS independent tests" do
+describe 'apache::mod::negotiation', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  describe 'OS independent tests' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        kernel: 'Linux',
+        lsbdistcodename: 'squeeze',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
-    context "default params" do
-      it { should contain_class("apache") }
+    context 'default params' do
+      it { is_expected.to contain_class('apache') }
       it do
-        should contain_file('negotiation.conf').with( {
-          :ensure  => 'file',
-          :content => 'LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+        is_expected.to contain_file('negotiation.conf').with(ensure: 'file',
+                                                             content: 'LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
 ForceLanguagePriority Prefer Fallback
-',
-        } )
+')
       end
     end
 
     context 'with force_language_priority parameter' do
       let :params do
-        { :force_language_priority => 'Prefer' }
+        { force_language_priority: 'Prefer' }
       end
+
       it do
-        should contain_file('negotiation.conf').with( {
-          :ensure  => 'file',
-          :content => /^ForceLanguagePriority Prefer$/,
-        } )
+        is_expected.to contain_file('negotiation.conf').with(ensure: 'file',
+                                                             content: %r{^ForceLanguagePriority Prefer$})
       end
     end
 
     context 'with language_priority parameter' do
       let :params do
-        { :language_priority => [ 'en', 'es' ] }
+        { language_priority: %w[en es] }
       end
+
       it do
-        should contain_file('negotiation.conf').with( {
-          :ensure  => 'file',
-          :content => /^LanguagePriority en es$/,
-        } )
+        is_expected.to contain_file('negotiation.conf').with(ensure: 'file',
+                                                             content: %r{^LanguagePriority en es$})
       end
     end
   end
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index 2cbc3d170e..d45a4d8ad2 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -1,51 +1,59 @@
 require 'spec_helper'
 
-describe 'apache::mod::pagespeed', :type => :class do
-  context "on a Debian OS" do
+describe 'apache::mod::pagespeed', type: :class do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('pagespeed') }
-    it { is_expected.to contain_package("mod-pagespeed-stable") }
+    it { is_expected.to contain_package('mod-pagespeed-stable') }
+
+    context 'when setting additional_configuration to a Hash' do
+      let :params do
+        { additional_configuration: { 'Key' => 'Value' } }
+      end
 
-    context "when setting additional_configuration to a Hash" do
-      let :params do { :additional_configuration => { 'Key' => 'Value' } } end
-      it { is_expected.to contain_file('pagespeed.conf').with_content /Key Value/ }
+      it { is_expected.to contain_file('pagespeed.conf').with_content %r{Key Value} }
     end
 
-    context "when setting additional_configuration to an Array" do
-      let :params do { :additional_configuration => [ 'Key Value' ] } end
-      it { is_expected.to contain_file('pagespeed.conf').with_content /Key Value/ }
+    context 'when setting additional_configuration to an Array' do
+      let :params do
+        { additional_configuration: ['Key Value'] }
+      end
+
+      it { is_expected.to contain_file('pagespeed.conf').with_content %r{Key Value} }
     end
   end
 
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('pagespeed') }
-    it { is_expected.to contain_package("mod-pagespeed-stable") }
+    it { is_expected.to contain_package('mod-pagespeed-stable') }
     it { is_expected.to contain_file('pagespeed.conf') }
   end
 end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 078003a769..a666b1aadd 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -1,494 +1,526 @@
 require 'spec_helper'
 
-describe 'apache::mod::passenger', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "validating all passenger params - using Debian" do
+describe 'apache::mod::passenger', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'validating all passenger params - using Debian' do
     let :facts do
       {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :kernel                 => 'Linux',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        kernel: 'Linux',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package("libapache2-mod-passenger") }
-    it { is_expected.to contain_file('zpassenger.load').with({
-                                                                 'path' => '/etc/apache2/mods-available/zpassenger.load',
-                                                             }) }
-    it { is_expected.to contain_file('passenger.conf').with({
-                                                                'path' => '/etc/apache2/mods-available/passenger.conf',
-                                                            }) }
+    it { is_expected.to contain_package('libapache2-mod-passenger') }
+    it {
+      is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
+    }
+    it {
+      is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
+    }
 
     passenger_config_options = {
-        'passenger_allow_encoded_slashes' => {type: 'OnOff', pass_opt: :PassengerAllowEncodedSlashes},
-        'passenger_app_env' => {type: 'String', pass_opt: :PassengerAppEnv},
-        'passenger_app_group_name' => {type: 'String', pass_opt: :PassengerAppGroupName},
-        'passenger_app_root' => {type: 'FullPath', pass_opt: :PassengerAppRoot},
-        'passenger_app_type' => {type: 'String', pass_opt: :PassengerAppType},
-        'passenger_base_uri' => {type: 'URI', pass_opt: :PassengerBaseURI},
-        'passenger_buffer_response' => {type: 'OnOff', pass_opt: :PassengerBufferResponse},
-        'passenger_buffer_upload' => {type: 'OnOff', pass_opt: :PassengerBufferUpload},
-        'passenger_concurrency_model' => {type: ["process", "thread"], pass_opt: :PassengerConcurrencyModel},
-        'passenger_data_buffer_dir' => {type: 'FullPath', pass_opt: :PassengerDataBufferDir},
-        'passenger_debug_log_file' => {type: 'String', pass_opt: :PassengerDebugLogFile},
-        'passenger_debugger' => {type: 'OnOff', pass_opt: :PassengerDebugger},
-        'passenger_default_group' => {type: 'String', pass_opt: :PassengerDefaultGroup},
-        'passenger_default_ruby' => {type: 'FullPath', pass_opt: :PassengerDefaultRuby},
-        'passenger_default_user' => {type: 'String', pass_opt: :PassengerDefaultUser},
-        'passenger_disable_security_update_check' => {type: 'OnOff', pass_opt: :PassengerDisableSecurityUpdateCheck},
-        'passenger_enabled' => {type: 'OnOff', pass_opt: :PassengerEnabled},
-        'passenger_error_override' => {type: 'OnOff', pass_opt: :PassengerErrorOverride},
-        'passenger_file_descriptor_log_file' => {type: 'FullPath', pass_opt: :PassengerFileDescriptorLogFile},
-        'passenger_fly_with' => {type: 'FullPath', pass_opt: :PassengerFlyWith},
-        'passenger_force_max_concurrent_requests_per_process' => {type: 'Integer', pass_opt: :PassengerForceMaxConcurrentRequestsPerProcess},
-        'passenger_friendly_error_pages' => {type: 'OnOff', pass_opt: :PassengerFriendlyErrorPages},
-        'passenger_group' => {type: 'String', pass_opt: :PassengerGroup},
-        'passenger_high_performance' => {type: 'OnOff', pass_opt: :PassengerHighPerformance},
-        'passenger_instance_registry_dir' => {type: 'FullPath', pass_opt: :PassengerInstanceRegistryDir},
-        'passenger_load_shell_envvars' => {type: 'OnOff', pass_opt: :PassengerLoadShellEnvvars},
-        'passenger_log_file' => {type: 'FullPath', pass_opt: :PassengerLogFile},
-        'passenger_log_level' => {type: 'Integer', pass_opt: :PassengerLogLevel},
-        'passenger_lve_min_uid' => {type: 'Integer', pass_opt: :PassengerLveMinUid},
-        'passenger_max_instances' => {type: 'Integer', pass_opt: :PassengerMaxInstances},
-        'passenger_max_instances_per_app' => {type: 'Integer', pass_opt: :PassengerMaxInstancesPerApp},
-        'passenger_max_pool_size' => {type: 'Integer', pass_opt: :PassengerMaxPoolSize},
-        'passenger_max_preloader_idle_time' => {type: 'Integer', pass_opt: :PassengerMaxPreloaderIdleTime},
-        'passenger_max_request_queue_size' => {type: 'Integer', pass_opt: :PassengerMaxRequestQueueSize},
-        'passenger_max_request_time' => {type: 'Integer', pass_opt: :PassengerMaxRequestTime},
-        'passenger_max_requests' => {type: 'Integer', pass_opt: :PassengerMaxRequests},
-        'passenger_memory_limit' => {type: 'Integer', pass_opt: :PassengerMemoryLimit},
-        'passenger_meteor_app_settings' => {type: 'FullPath', pass_opt: :PassengerMeteorAppSettings},
-        'passenger_min_instances' => {type: 'Integer', pass_opt: :PassengerMinInstances},
-        'passenger_nodejs' => {type: 'FullPath', pass_opt: :PassengerNodejs},
-        'passenger_pool_idle_time' => {type: 'Integer', pass_opt: :PassengerPoolIdleTime},
-        'passenger_pre_start' => {type: 'URI', pass_opt: :PassengerPreStart},
-        'passenger_python' => {type: 'FullPath', pass_opt: :PassengerPython},
-        'passenger_resist_deployment_errors' => {type: 'OnOff', pass_opt: :PassengerResistDeploymentErrors},
-        'passenger_resolve_symlinks_in_document_root' => {type: 'OnOff', pass_opt: :PassengerResolveSymlinksInDocumentRoot},
-        'passenger_response_buffer_high_watermark' => {type: 'Integer', pass_opt: :PassengerResponseBufferHighWatermark},
-        'passenger_restart_dir' => {type: 'Path', pass_opt: :PassengerRestartDir},
-        'passenger_rolling_restarts' => {type: 'OnOff', pass_opt: :PassengerRollingRestarts},
-        'passenger_root' => {type: 'FullPath', pass_opt: :PassengerRoot},
-        'passenger_ruby' => {type: 'FullPath', pass_opt: :PassengerRuby},
-        'passenger_security_update_check_proxy' => {type: 'URI', pass_opt: :PassengerSecurityUpdateCheckProxy},
-        'passenger_show_version_in_header' => {type: 'OnOff', pass_opt: :PassengerShowVersionInHeader},
-        'passenger_socket_backlog' => {type: 'Integer', pass_opt: :PassengerSocketBacklog},
-        'passenger_spawn_method' => {type: ["smart", "direct"], pass_opt: :PassengerSpawnMethod},
-        'passenger_start_timeout' => {type: 'Integer', pass_opt: :PassengerStartTimeout},
-        'passenger_startup_file' => {type: 'RelPath', pass_opt: :PassengerStartupFile},
-        'passenger_stat_throttle_rate' => {type: 'Integer', pass_opt: :PassengerStatThrottleRate},
-        'passenger_sticky_sessions' => {type: 'OnOff', pass_opt: :PassengerStickySessions},
-        'passenger_sticky_sessions_cookie_name' => {type: 'String', pass_opt: :PassengerStickySessionsCookieName},
-        'passenger_thread_count' => {type: 'Integer', pass_opt: :PassengerThreadCount},
-        'passenger_use_global_queue' => {type: 'String', pass_opt: :PassengerUseGlobalQueue},
-        'passenger_user' => {type: 'String', pass_opt: :PassengerUser},
-        'passenger_user_switching' => {type: 'OnOff', pass_opt: :PassengerUserSwitching},
-        'rack_auto_detect' => {type: 'String', pass_opt: :RackAutoDetect},
-        'rack_autodetect' => {type: 'String', pass_opt: :RackAutoDetect},
-        'rack_base_uri' => {type: 'String', pass_opt: :RackBaseURI},
-        'rack_env' => {type: 'String', pass_opt: :RackEnv},
-        'rails_allow_mod_rewrite' => {type: 'String', pass_opt: :RailsAllowModRewrite},
-        'rails_app_spawner_idle_time' => {type: 'String', pass_opt: :RailsAppSpawnerIdleTime},
-        'rails_auto_detect' => {type: 'String', pass_opt: :RailsAutoDetect},
-        'rails_autodetect' => {type: 'String', pass_opt: :RailsAutoDetect},
-        'rails_base_uri' => {type: 'String', pass_opt: :RailsBaseURI},
-        'rails_default_user' => {type: 'String', pass_opt: :RailsDefaultUser},
-        'rails_env' => {type: 'String', pass_opt: :RailsEnv},
-        'rails_framework_spawner_idle_time' => {type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime},
-        'rails_ruby' => {type: 'String', pass_opt: :RailsRuby},
-        'rails_spawn_method' => {type: 'String', pass_opt: :RailsSpawnMethod},
-        'rails_user_switching' => {type: 'String', pass_opt: :RailsUserSwitching},
-        'wsgi_auto_detect' => {type: 'String', pass_opt: :WsgiAutoDetect},
+      'passenger_allow_encoded_slashes' => { type: 'OnOff', pass_opt: :PassengerAllowEncodedSlashes },
+      'passenger_app_env' => { type: 'String', pass_opt: :PassengerAppEnv },
+      'passenger_app_group_name' => { type: 'String', pass_opt: :PassengerAppGroupName },
+      'passenger_app_root' => { type: 'FullPath', pass_opt: :PassengerAppRoot },
+      'passenger_app_type' => { type: 'String', pass_opt: :PassengerAppType },
+      'passenger_base_uri' => { type: 'URI', pass_opt: :PassengerBaseURI },
+      'passenger_buffer_response' => { type: 'OnOff', pass_opt: :PassengerBufferResponse },
+      'passenger_buffer_upload' => { type: 'OnOff', pass_opt: :PassengerBufferUpload },
+      'passenger_concurrency_model' => { type: %w[process thread], pass_opt: :PassengerConcurrencyModel },
+      'passenger_data_buffer_dir' => { type: 'FullPath', pass_opt: :PassengerDataBufferDir },
+      'passenger_debug_log_file' => { type: 'String', pass_opt: :PassengerDebugLogFile },
+      'passenger_debugger' => { type: 'OnOff', pass_opt: :PassengerDebugger },
+      'passenger_default_group' => { type: 'String', pass_opt: :PassengerDefaultGroup },
+      'passenger_default_ruby' => { type: 'FullPath', pass_opt: :PassengerDefaultRuby },
+      'passenger_default_user' => { type: 'String', pass_opt: :PassengerDefaultUser },
+      'passenger_disable_security_update_check' => { type: 'OnOff', pass_opt: :PassengerDisableSecurityUpdateCheck },
+      'passenger_enabled' => { type: 'OnOff', pass_opt: :PassengerEnabled },
+      'passenger_error_override' => { type: 'OnOff', pass_opt: :PassengerErrorOverride },
+      'passenger_file_descriptor_log_file' => { type: 'FullPath', pass_opt: :PassengerFileDescriptorLogFile },
+      'passenger_fly_with' => { type: 'FullPath', pass_opt: :PassengerFlyWith },
+      'passenger_force_max_concurrent_requests_per_process' => { type: 'Integer', pass_opt: :PassengerForceMaxConcurrentRequestsPerProcess },
+      'passenger_friendly_error_pages' => { type: 'OnOff', pass_opt: :PassengerFriendlyErrorPages },
+      'passenger_group' => { type: 'String', pass_opt: :PassengerGroup },
+      'passenger_high_performance' => { type: 'OnOff', pass_opt: :PassengerHighPerformance },
+      'passenger_instance_registry_dir' => { type: 'FullPath', pass_opt: :PassengerInstanceRegistryDir },
+      'passenger_load_shell_envvars' => { type: 'OnOff', pass_opt: :PassengerLoadShellEnvvars },
+      'passenger_log_file' => { type: 'FullPath', pass_opt: :PassengerLogFile },
+      'passenger_log_level' => { type: 'Integer', pass_opt: :PassengerLogLevel },
+      'passenger_lve_min_uid' => { type: 'Integer', pass_opt: :PassengerLveMinUid },
+      'passenger_max_instances' => { type: 'Integer', pass_opt: :PassengerMaxInstances },
+      'passenger_max_instances_per_app' => { type: 'Integer', pass_opt: :PassengerMaxInstancesPerApp },
+      'passenger_max_pool_size' => { type: 'Integer', pass_opt: :PassengerMaxPoolSize },
+      'passenger_max_preloader_idle_time' => { type: 'Integer', pass_opt: :PassengerMaxPreloaderIdleTime },
+      'passenger_max_request_queue_size' => { type: 'Integer', pass_opt: :PassengerMaxRequestQueueSize },
+      'passenger_max_request_time' => { type: 'Integer', pass_opt: :PassengerMaxRequestTime },
+      'passenger_max_requests' => { type: 'Integer', pass_opt: :PassengerMaxRequests },
+      'passenger_memory_limit' => { type: 'Integer', pass_opt: :PassengerMemoryLimit },
+      'passenger_meteor_app_settings' => { type: 'FullPath', pass_opt: :PassengerMeteorAppSettings },
+      'passenger_min_instances' => { type: 'Integer', pass_opt: :PassengerMinInstances },
+      'passenger_nodejs' => { type: 'FullPath', pass_opt: :PassengerNodejs },
+      'passenger_pool_idle_time' => { type: 'Integer', pass_opt: :PassengerPoolIdleTime },
+      'passenger_pre_start' => { type: 'URI', pass_opt: :PassengerPreStart },
+      'passenger_python' => { type: 'FullPath', pass_opt: :PassengerPython },
+      'passenger_resist_deployment_errors' => { type: 'OnOff', pass_opt: :PassengerResistDeploymentErrors },
+      'passenger_resolve_symlinks_in_document_root' => { type: 'OnOff', pass_opt: :PassengerResolveSymlinksInDocumentRoot },
+      'passenger_response_buffer_high_watermark' => { type: 'Integer', pass_opt: :PassengerResponseBufferHighWatermark },
+      'passenger_restart_dir' => { type: 'Path', pass_opt: :PassengerRestartDir },
+      'passenger_rolling_restarts' => { type: 'OnOff', pass_opt: :PassengerRollingRestarts },
+      'passenger_root' => { type: 'FullPath', pass_opt: :PassengerRoot },
+      'passenger_ruby' => { type: 'FullPath', pass_opt: :PassengerRuby },
+      'passenger_security_update_check_proxy' => { type: 'URI', pass_opt: :PassengerSecurityUpdateCheckProxy },
+      'passenger_show_version_in_header' => { type: 'OnOff', pass_opt: :PassengerShowVersionInHeader },
+      'passenger_socket_backlog' => { type: 'Integer', pass_opt: :PassengerSocketBacklog },
+      'passenger_spawn_method' => { type: %w[smart direct], pass_opt: :PassengerSpawnMethod },
+      'passenger_start_timeout' => { type: 'Integer', pass_opt: :PassengerStartTimeout },
+      'passenger_startup_file' => { type: 'RelPath', pass_opt: :PassengerStartupFile },
+      'passenger_stat_throttle_rate' => { type: 'Integer', pass_opt: :PassengerStatThrottleRate },
+      'passenger_sticky_sessions' => { type: 'OnOff', pass_opt: :PassengerStickySessions },
+      'passenger_sticky_sessions_cookie_name' => { type: 'String', pass_opt: :PassengerStickySessionsCookieName },
+      'passenger_thread_count' => { type: 'Integer', pass_opt: :PassengerThreadCount },
+      'passenger_use_global_queue' => { type: 'String', pass_opt: :PassengerUseGlobalQueue },
+      'passenger_user' => { type: 'String', pass_opt: :PassengerUser },
+      'passenger_user_switching' => { type: 'OnOff', pass_opt: :PassengerUserSwitching },
+      'rack_auto_detect' => { type: 'String', pass_opt: :RackAutoDetect },
+      'rack_autodetect' => { type: 'String', pass_opt: :RackAutoDetect },
+      'rack_base_uri' => { type: 'String', pass_opt: :RackBaseURI },
+      'rack_env' => { type: 'String', pass_opt: :RackEnv },
+      'rails_allow_mod_rewrite' => { type: 'String', pass_opt: :RailsAllowModRewrite },
+      'rails_app_spawner_idle_time' => { type: 'String', pass_opt: :RailsAppSpawnerIdleTime },
+      'rails_auto_detect' => { type: 'String', pass_opt: :RailsAutoDetect },
+      'rails_autodetect' => { type: 'String', pass_opt: :RailsAutoDetect },
+      'rails_base_uri' => { type: 'String', pass_opt: :RailsBaseURI },
+      'rails_default_user' => { type: 'String', pass_opt: :RailsDefaultUser },
+      'rails_env' => { type: 'String', pass_opt: :RailsEnv },
+      'rails_framework_spawner_idle_time' => { type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime },
+      'rails_ruby' => { type: 'String', pass_opt: :RailsRuby },
+      'rails_spawn_method' => { type: 'String', pass_opt: :RailsSpawnMethod },
+      'rails_user_switching' => { type: 'String', pass_opt: :RailsUserSwitching },
+      'wsgi_auto_detect' => { type: 'String', pass_opt: :WsgiAutoDetect },
     }
     passenger_config_options.each do |config_option, config_hash|
       puppetized_config_option = config_option
-      valid_config_values = []
       case config_hash[:type]
         # UnionStationFilter values are quoted strings
-        when 'QuotedString'
-          valid_config_values = ['"a quoted string"']
-          valid_config_values.each do |valid_value|
-            describe "with #{puppetized_config_option} => '#{valid_value.gsub(/\"/, '')}'" do
-              let :params do
-                { puppetized_config_option.to_sym => valid_value }
-              end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} "#{valid_value}"$/) }
+      when 'QuotedString'
+        valid_config_values = ['"a quoted string"']
+        valid_config_values.each do |valid_value|
+          describe "with #{puppetized_config_option} => '#{valid_value.delete('"')}'" do
+            let :params do
+              { puppetized_config_option.to_sym => valid_value }
             end
+
+            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} "#{valid_value}"$}) }
           end
-        when 'FullPath', 'RelPath', 'Path'
-          valid_config_values = ['/some/path/to/somewhere']
-          valid_config_values.each do |valid_value|
-            describe "with #{puppetized_config_option} => #{valid_value}" do
-              let :params do
-                { puppetized_config_option.to_sym => valid_value }
-              end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} "#{valid_value}"$/) }
+        end
+      when 'FullPath', 'RelPath', 'Path'
+        valid_config_values = ['/some/path/to/somewhere']
+        valid_config_values.each do |valid_value|
+          describe "with #{puppetized_config_option} => #{valid_value}" do
+            let :params do
+              { puppetized_config_option.to_sym => valid_value }
             end
+
+            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} "#{valid_value}"$}) }
           end
-        when 'URI', 'String', 'Integer'
-          valid_config_values = ['some_value_for_you']
-          valid_config_values.each do |valid_value|
-            describe "with #{puppetized_config_option} => #{valid_value}" do
-              let :params do
-                { puppetized_config_option.to_sym => valid_value }
-              end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} #{valid_value}$/) }
+        end
+      when 'URI', 'String', 'Integer'
+        valid_config_values = ['some_value_for_you']
+        valid_config_values.each do |valid_value|
+          describe "with #{puppetized_config_option} => #{valid_value}" do
+            let :params do
+              { puppetized_config_option.to_sym => valid_value }
             end
+
+            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
           end
-       when 'OnOff'
-          valid_config_values = ['on', 'off']
-          valid_config_values.each do |valid_value|
-            describe "with #{puppetized_config_option} => '#{valid_value}'" do
-              let :params do
-                { puppetized_config_option.to_sym => valid_value }
-              end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} #{valid_value}$/) }
+        end
+      when 'OnOff'
+        valid_config_values = %w[on off]
+        valid_config_values.each do |valid_value|
+          describe "with #{puppetized_config_option} => '#{valid_value}'" do
+            let :params do
+              { puppetized_config_option.to_sym => valid_value }
             end
+
+            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
           end
-        else
-          valid_config_values = config_hash[:type]
-          valid_config_values.each do |valid_value|
-            describe "with #{puppetized_config_option} => '#{valid_value}'" do
-              let :params do
-                { puppetized_config_option.to_sym => valid_value }
-              end
-              it { is_expected.to contain_file('passenger.conf').with_content(/^  #{config_hash[:pass_opt]} #{valid_value}$/) }
+        end
+      else
+        valid_config_values = config_hash[:type]
+        valid_config_values.each do |valid_value|
+          describe "with #{puppetized_config_option} => '#{valid_value}'" do
+            let :params do
+              { puppetized_config_option.to_sym => valid_value }
             end
+
+            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
           end
+        end
       end
     end
   end
-  context "on a Debian OS" do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :kernel                 => 'Linux',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        kernel: 'Linux',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package("libapache2-mod-passenger") }
-    it { is_expected.to contain_file('zpassenger.load').with({
-      'path' => '/etc/apache2/mods-available/zpassenger.load',
-    }) }
-    it { is_expected.to contain_file('passenger.conf').with({
-      'path' => '/etc/apache2/mods-available/passenger.conf',
-    }) }
+    it { is_expected.to contain_package('libapache2-mod-passenger') }
+    it {
+      is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
+    }
+    it {
+      is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
+    }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
-        { :passenger_root => '/usr/lib/example' }
+        { passenger_root: '/usr/lib/example' }
       end
+
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
     end
-    describe "with passenger_ruby => /usr/lib/example/ruby" do
+    describe 'with passenger_ruby => /usr/lib/example/ruby' do
       let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby' }
+        { passenger_ruby: '/usr/lib/example/ruby' }
       end
+
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
     end
-    describe "with passenger_default_ruby => /usr/lib/example/ruby1.9.3" do
+    describe 'with passenger_default_ruby => /usr/lib/example/ruby1.9.3' do
       let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby1.9.3' }
+        { passenger_ruby: '/usr/lib/example/ruby1.9.3' }
       end
+
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
     end
-    describe "with passenger_high_performance => on" do
+    describe 'with passenger_high_performance => on' do
       let :params do
-        { :passenger_high_performance => 'on' }
+        { passenger_high_performance: 'on' }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerHighPerformance on$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerHighPerformance on$}) }
     end
-    describe "with passenger_pool_idle_time => 1200" do
+    describe 'with passenger_pool_idle_time => 1200' do
       let :params do
-        { :passenger_pool_idle_time => 1200 }
+        { passenger_pool_idle_time: 1200 }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerPoolIdleTime 1200$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerPoolIdleTime 1200$}) }
     end
-    describe "with passenger_max_request_queue_size => 100" do
+    describe 'with passenger_max_request_queue_size => 100' do
       let :params do
-        { :passenger_max_request_queue_size => 100 }
+        { passenger_max_request_queue_size: 100 }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxRequestQueueSize 100$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxRequestQueueSize 100$}) }
     end
 
-    describe "with passenger_max_requests => 20" do
+    describe 'with passenger_max_requests => 20' do
       let :params do
-        { :passenger_max_requests => 20 }
+        { passenger_max_requests: 20 }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxRequests 20$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxRequests 20$}) }
     end
-    describe "with passenger_spawn_method => direct" do
+    describe 'with passenger_spawn_method => direct' do
       let :params do
-        { :passenger_spawn_method => 'direct' }
+        { passenger_spawn_method: 'direct' }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerSpawnMethod direct$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerSpawnMethod direct$}) }
     end
-    describe "with passenger_stat_throttle_rate => 10" do
+    describe 'with passenger_stat_throttle_rate => 10' do
       let :params do
-        { :passenger_stat_throttle_rate => 10 }
+        { passenger_stat_throttle_rate: 10 }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerStatThrottleRate 10$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerStatThrottleRate 10$}) }
     end
-    describe "with passenger_max_pool_size => 16" do
+    describe 'with passenger_max_pool_size => 16' do
       let :params do
-        { :passenger_max_pool_size => 16 }
+        { passenger_max_pool_size: 16 }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxPoolSize 16$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxPoolSize 16$}) }
     end
-    describe "with passenger_min_instances => 5" do
+    describe 'with passenger_min_instances => 5' do
       let :params do
-        { :passenger_min_instances => 5 }
+        { passenger_min_instances: 5 }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMinInstances 5$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMinInstances 5$}) }
     end
-    describe "with passenger_max_instances_per_app => 8" do
+    describe 'with passenger_max_instances_per_app => 8' do
       let :params do
-        { :passenger_max_instances_per_app => 8 }
+        { passenger_max_instances_per_app: 8 }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerMaxInstancesPerApp 8$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxInstancesPerApp 8$}) }
     end
-    describe "with rack_autodetect => on" do
+    describe 'with rack_autodetect => on' do
       let :params do
-        { :rack_autodetect => 'on' }
+        { rack_autodetect: 'on' }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  RackAutoDetect on$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RackAutoDetect on$}) }
     end
-    describe "with rails_autodetect => on" do
+    describe 'with rails_autodetect => on' do
       let :params do
-        { :rails_autodetect => 'on' }
+        { rails_autodetect: 'on' }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  RailsAutoDetect on$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RailsAutoDetect on$}) }
     end
-    describe "with passenger_use_global_queue => on" do
+    describe 'with passenger_use_global_queue => on' do
       let :params do
-        { :passenger_use_global_queue => 'on' }
+        { passenger_use_global_queue: 'on' }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue on$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerUseGlobalQueue on$}) }
     end
     describe "with passenger_app_env => 'foo'" do
       let :params do
-        { :passenger_app_env => 'foo' }
+        { passenger_app_env: 'foo' }
       end
-      it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerAppEnv foo$/) }
+
+      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerAppEnv foo$}) }
     end
     describe "with passenger_log_file => '/var/log/apache2/passenger.log'" do
       let :params do
-        { :passenger_log_file => '/var/log/apache2/passenger.log' }
+        { passenger_log_file: '/var/log/apache2/passenger.log' }
       end
+
       it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogFile "/var/log/apache2/passenger.log"$}) }
     end
-    describe "with passenger_log_level => 3" do
+    describe 'with passenger_log_level => 3' do
       let :params do
-        { :passenger_log_level => 3 }
+        { passenger_log_level: 3 }
       end
+
       it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogLevel 3$}) }
     end
     describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
       let :params do
-        { :mod_path => '/usr/lib/foo/mod_foo.so' }
+        { mod_path: '/usr/lib/foo/mod_foo.so' }
       end
-      it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
+
+      it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$}) }
     end
     describe "with mod_lib_path => '/usr/lib/foo'" do
       let :params do
-        { :mod_lib_path => '/usr/lib/foo' }
+        { mod_lib_path: '/usr/lib/foo' }
       end
-      it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
+
+      it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$}) }
     end
     describe "with mod_lib => 'mod_foo.so'" do
       let :params do
-        { :mod_lib => 'mod_foo.so' }
+        { mod_lib: 'mod_foo.so' }
       end
-      it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
+
+      it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$}) }
     end
     describe "with mod_id => 'mod_foo'" do
       let :params do
-        { :mod_id => 'mod_foo' }
+        { mod_id: 'mod_foo' }
       end
-      it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
+
+      it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$}) }
     end
 
-    context "with Ubuntu 12.04 defaults" do
+    context 'with Ubuntu 12.04 defaults' do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '12.04',
-          :kernel                 => 'Linux',
-          :operatingsystem        => 'Ubuntu',
-          :lsbdistrelease         => '12.04',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '12.04',
+          kernel: 'Linux',
+          operatingsystem: 'Ubuntu',
+          lsbdistrelease: '12.04',
+          concat_basedir: '/dne',
+          id: 'root',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
 
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
+      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerDefaultRuby}) }
     end
 
-    context "with Ubuntu 14.04 defaults" do
+    context 'with Ubuntu 14.04 defaults' do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '14.04',
-          :operatingsystem        => 'Ubuntu',
-          :kernel                 => 'Linux',
-          :lsbdistrelease         => '14.04',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '14.04',
+          operatingsystem: 'Ubuntu',
+          kernel: 'Linux',
+          lsbdistrelease: '14.04',
+          concat_basedir: '/dne',
+          id: 'root',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
 
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
+      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
     end
 
-    context "with Debian 7 defaults" do
+    context 'with Debian 7 defaults' do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '7.3',
-          :operatingsystem        => 'Debian',
-          :kernel                 => 'Linux',
-          :lsbdistcodename        => 'wheezy',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '7.3',
+          operatingsystem: 'Debian',
+          kernel: 'Linux',
+          lsbdistcodename: 'wheezy',
+          concat_basedir: '/dne',
+          id: 'root',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
 
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
+      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerDefaultRuby}) }
     end
 
-    context "with Debian 8 defaults" do
+    context 'with Debian 8 defaults' do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '8.0',
-          :operatingsystem        => 'Debian',
-          :kernel                 => 'Linux',
-          :lsbdistcodename        => 'jessie',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '8.0',
+          operatingsystem: 'Debian',
+          kernel: 'Linux',
+          lsbdistcodename: 'jessie',
+          concat_basedir: '/dne',
+          id: 'root',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
 
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
+      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
     end
   end
 
-  context "on a RedHat OS" do
+  context 'on a RedHat OS' do
     let :rh_facts do
       {
-        :osfamily               => 'RedHat',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        concat_basedir: '/dne',
+        operatingsystem: 'RedHat',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
-    context "on EL6" do
-      let(:facts) { rh_facts.merge(:operatingsystemrelease => '6') }
+    context 'on EL6' do
+      let(:facts) { rh_facts.merge(operatingsystemrelease: '6') }
 
-      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('passenger') }
-      it { is_expected.to contain_package("mod_passenger") }
-      it { is_expected.to contain_file('passenger_package.conf').with({
-        'path' => '/etc/httpd/conf.d/passenger.conf',
-      }) }
+      it { is_expected.to contain_package('mod_passenger') }
+      it {
+        is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
+      }
       it { is_expected.to contain_file('passenger_package.conf').without_content }
       it { is_expected.to contain_file('passenger_package.conf').without_source }
-      it { is_expected.to contain_file('zpassenger.load').with({
-        'path' => '/etc/httpd/conf.d/zpassenger.load',
-      }) }
-      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) }
-      it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
-      describe "with passenger_root => '/usr/lib/example'" do
+      it {
+        is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
+      }
+      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRoot}) }
+      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
+      describe "with passenger_root => '/usr/lib/example'" do # rubocop:disable RSpec/NestedGroups
         let :params do
-          { :passenger_root => '/usr/lib/example' }
+          { passenger_root: '/usr/lib/example' }
         end
-        it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
+
+        it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRoot "\/usr\/lib\/example"$}) }
       end
-      describe "with passenger_ruby => /usr/lib/example/ruby" do
+      describe 'with passenger_ruby => /usr/lib/example/ruby' do # rubocop:disable RSpec/NestedGroups
         let :params do
-          { :passenger_ruby => '/usr/lib/example/ruby' }
+          { passenger_ruby: '/usr/lib/example/ruby' }
         end
-        it { is_expected.to contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
+
+        it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRuby "\/usr\/lib\/example\/ruby"$}) }
       end
     end
 
-    context "on EL7" do
-      let(:facts) { rh_facts.merge(:operatingsystemrelease => '7') }
+    context 'on EL7' do
+      let(:facts) { rh_facts.merge(operatingsystemrelease: '7') }
 
-      it { is_expected.to contain_file('passenger_package.conf').with({
-        'path' => '/etc/httpd/conf.d/passenger.conf',
-      }) }
-      it { is_expected.to contain_file('zpassenger.load').with({
-        'path' => '/etc/httpd/conf.modules.d/zpassenger.load',
-      }) }
+      it {
+        is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
+      }
+      it {
+        is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
+      }
     end
   end
-  context "on a FreeBSD OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package("www/rubygem-passenger") }
+    it { is_expected.to contain_package('www/rubygem-passenger') }
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package("www-apache/passenger") }
+    it { is_expected.to contain_package('www-apache/passenger') }
   end
 end
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index f5b61fe0ce..732363a275 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -1,74 +1,78 @@
 require 'spec_helper'
 
-describe 'apache::mod::perl', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::perl', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
-    it { is_expected.to contain_package("libapache2-mod-perl2") }
+    it { is_expected.to contain_package('libapache2-mod-perl2') }
   end
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
-    it { is_expected.to contain_package("mod_perl") }
+    it { is_expected.to contain_package('mod_perl') }
   end
-  context "on a FreeBSD OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
-    it { is_expected.to contain_package("www/mod_perl2") }
+    it { is_expected.to contain_package('www/mod_perl2') }
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Gentoo',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        operatingsystem: 'Gentoo',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
-    it { is_expected.to contain_package("www-apache/mod_perl") }
+    it { is_expected.to contain_package('www-apache/mod_perl') }
   end
 end
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index 097a36fff1..89cbc118ed 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -1,43 +1,46 @@
 require 'spec_helper'
 
-describe 'apache::mod::peruser', :type => :class do
+describe 'apache::mod::peruser', type: :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
   end
-  context "on a FreeBSD OS" do
+
+  context 'on a FreeBSD OS' do
     let :facts do
       {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '10',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'FreeBSD',
+        operatingsystemrelease: '10',
+        concat_basedir: '/dne',
+        operatingsystem: 'FreeBSD',
+        id: 'root',
+        kernel: 'FreeBSD',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
+
     it do
       expect {
         catalogue
-      }.to raise_error(Puppet::Error, /Unsupported osfamily FreeBSD/)
+      }.to raise_error(Puppet::Error, %r{Unsupported osfamily FreeBSD})
     end
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('peruser') }
-    it { is_expected.to contain_file("/etc/apache2/modules.d/peruser.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/etc/apache2/modules.d/peruser.conf').with_ensure('file') }
   end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index ad61e897b5..704d51c501 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -1,269 +1,319 @@
 require 'spec_helper'
 
-describe 'apache::mod::php', :type => :class do
-  describe "on a Debian OS" do
+describe 'apache::mod::php', type: :class do
+  describe 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    context "with mpm_module => prefork" do
+
+    context 'with mpm_module => prefork' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_class("apache::mod::prefork") }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::prefork') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("libapache2-mod-php5") }
-      it { is_expected.to contain_file("php5.load").with(
-        :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
-      ) }
+      it { is_expected.to contain_package('libapache2-mod-php5') }
+      it {
+        is_expected.to contain_file('php5.load').with(
+          content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
+        )
+      }
     end
-    context "with mpm_module => itk" do
+    context 'with mpm_module => itk' do
       let :pre_condition do
         'class { "apache": mpm_module => itk, }'
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_class("apache::mod::itk") }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::itk') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("libapache2-mod-php5") }
-      it { is_expected.to contain_file("php5.load").with(
-        :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
-      ) }
+      it { is_expected.to contain_package('libapache2-mod-php5') }
+      it {
+        is_expected.to contain_file('php5.load').with(
+          content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
+        )
+      }
     end
-    context "on jessie" do
+    context 'on jessie' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      let(:facts) { super().merge({
-        :operatingsystemrelease => '8',
-        :lsbdistcodename        => 'jessie',
-      }) }
-      it { is_expected.to contain_file("php5.load").with(
-        :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
-      ) }
+      let(:facts) do
+        super().merge(operatingsystemrelease: '8',
+                      lsbdistcodename: 'jessie')
+      end
+
+      it {
+        is_expected.to contain_file('php5.load').with(
+          content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
+        )
+      }
     end
-    context "on stretch" do
+    context 'on stretch' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      let(:facts) { super().merge({
-        :operatingsystemrelease => '9',
-        :lsbdistcodename        => 'stretch',
-      }) }
+      let(:facts) do
+        super().merge(operatingsystemrelease: '9',
+                      lsbdistcodename: 'stretch')
+      end
+
       it { is_expected.to contain_apache__mod('php7.0') }
-      it { is_expected.to contain_package("libapache2-mod-php7.0") }
-      it { is_expected.to contain_file("php7.0.load").with(
-        :content => "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n"
-      ) }
+      it { is_expected.to contain_package('libapache2-mod-php7.0') }
+      it {
+        is_expected.to contain_file('php7.0.load').with(
+          content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n",
+        )
+      }
     end
   end
-  describe "on a RedHat OS" do
+  describe '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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    context "with default params" do
+
+    context 'with default params' do
       let :pre_condition do
         'class { "apache": }'
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("php") }
-      it { is_expected.to contain_file("php5.load").with(
-        :content => "LoadModule php5_module modules/libphp5.so\n"
-      ) }
+      it { is_expected.to contain_package('php') }
+      it {
+        is_expected.to contain_file('php5.load').with(
+          content: "LoadModule php5_module modules/libphp5.so\n",
+        )
+      }
     end
-    context "with alternative package name" do let :pre_condition do
+    context 'with alternative package name' do
+      let :pre_condition do
         'class { "apache": }'
       end
       let :params do
-        { :package_name => 'php54'}
+        { package_name: 'php54' }
       end
-      it { is_expected.to contain_package("php54") }
+
+      it { is_expected.to contain_package('php54') }
     end
-    context "with alternative path" do let :pre_condition do
+    context 'with alternative path' do
+      let :pre_condition do
         'class { "apache": }'
       end
       let :params do
-        { :path => 'alternative-path'}
+        { path: 'alternative-path' }
       end
-      it { is_expected.to contain_file("php5.load").with(
-        :content => "LoadModule php5_module alternative-path\n"
-      ) }
+
+      it {
+        is_expected.to contain_file('php5.load').with(
+          content: "LoadModule php5_module alternative-path\n",
+        )
+      }
     end
-    context "with alternative extensions" do let :pre_condition do
+    context 'with alternative extensions' do
+      let :pre_condition do
         'class { "apache": }'
       end
       let :params do
-        { :extensions => ['.php','.php5']}
+        { extensions: ['.php', '.php5'] }
       end
-      it { is_expected.to contain_file("php5.conf").with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) }
+
+      it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) }
     end
-    context "with specific version" do
+    context 'with specific version' do
       let :pre_condition do
         'class { "apache": }'
       end
       let :params do
-        { :package_ensure => '5.3.13'}
+        { package_ensure: '5.3.13' }
       end
-      it { is_expected.to contain_package("php").with(
-        :ensure => '5.3.13'
-      ) }
+
+      it {
+        is_expected.to contain_package('php').with(
+          ensure: '5.3.13',
+        )
+      }
     end
-    context "with mpm_module => prefork" do
+    context 'with mpm_module => prefork' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_class("apache::mod::prefork") }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::prefork') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("php") }
-      it { is_expected.to contain_file("php5.load").with(
-        :content => "LoadModule php5_module modules/libphp5.so\n"
-      ) }
+      it { is_expected.to contain_package('php') }
+      it {
+        is_expected.to contain_file('php5.load').with(
+          content: "LoadModule php5_module modules/libphp5.so\n",
+        )
+      }
     end
-    context "with mpm_module => itk" do
+    context 'with mpm_module => itk' do
       let :pre_condition do
         'class { "apache": mpm_module => itk, }'
       end
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_class("apache::mod::itk") }
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::itk') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("php") }
-      it { is_expected.to contain_file("php5.load").with(
-        :content => "LoadModule php5_module modules/libphp5.so\n"
-      ) }
+      it { is_expected.to contain_package('php') }
+      it {
+        is_expected.to contain_file('php5.load').with(
+          content: "LoadModule php5_module modules/libphp5.so\n",
+        )
+      }
     end
   end
-  describe "on a FreeBSD OS" do
+  describe 'on a FreeBSD OS' do
     let :facts do
       {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '10',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'FreeBSD',
+        operatingsystemrelease: '10',
+        concat_basedir: '/dne',
+        operatingsystem: 'FreeBSD',
+        id: 'root',
+        kernel: 'FreeBSD',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    context "with mpm_module => prefork" do
+
+    context 'with mpm_module => prefork' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
+
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("www/mod_php5") }
+      it { is_expected.to contain_package('www/mod_php5') }
       it { is_expected.to contain_file('php5.load') }
     end
-    context "with mpm_module => itk" do
+    context 'with mpm_module => itk' do
       let :pre_condition do
         'class { "apache": mpm_module => itk, }'
       end
+
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::itk') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("www/mod_php5") }
+      it { is_expected.to contain_package('www/mod_php5') }
       it { is_expected.to contain_file('php5.load') }
     end
   end
-  describe "on a Gentoo OS" do
+  describe 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    context "with mpm_module => prefork" do
+
+    context 'with mpm_module => prefork' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
+
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("dev-lang/php") }
+      it { is_expected.to contain_package('dev-lang/php') }
       it { is_expected.to contain_file('php5.load') }
     end
-    context "with mpm_module => itk" do
+    context 'with mpm_module => itk' do
       let :pre_condition do
         'class { "apache": mpm_module => itk, }'
       end
+
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::itk') }
       it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package("dev-lang/php") }
+      it { is_expected.to contain_package('dev-lang/php') }
       it { is_expected.to contain_file('php5.load') }
     end
   end
-  describe "OS independent tests" do
+  describe 'OS independent tests' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '6',
+        kernel: 'Linux',
+        lsbdistcodename: 'squeeze',
+        concat_basedir: '/dne',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
+
     context 'with content param' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
       let :params do
-        { :content => 'somecontent' }
+        { content: 'somecontent' }
       end
-      it { should contain_file('php5.conf').with(
-        :content => 'somecontent'
-      ) }
+
+      it {
+        is_expected.to contain_file('php5.conf').with(
+          content: 'somecontent',
+        )
+      }
     end
     context 'with template param' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
       let :params do
-        { :template => 'apache/mod/php.conf.erb' }
+        { template: 'apache/mod/php.conf.erb' }
       end
-      it { should contain_file('php5.conf').with(
-        :content => /^# PHP is an HTML-embedded scripting language which attempts to make it/
-      ) }
+
+      it {
+        is_expected.to contain_file('php5.conf').with(
+          content: %r{^# PHP is an HTML-embedded scripting language which attempts to make it},
+        )
+      }
     end
     context 'with source param' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
       let :params do
-        { :source => 'some-path' }
+        { source: 'some-path' }
       end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
+
+      it {
+        is_expected.to contain_file('php5.conf').with(
+          source: 'some-path',
+        )
+      }
     end
     context 'content has priority over template' do
       let :pre_condition do
@@ -271,13 +321,16 @@
       end
       let :params do
         {
-          :template => 'apache/mod/php5.conf.erb',
-          :content  => 'somecontent'
+          template: 'apache/mod/php5.conf.erb',
+          content: 'somecontent',
         }
       end
-      it { should contain_file('php5.conf').with(
-        :content => 'somecontent'
-      ) }
+
+      it {
+        is_expected.to contain_file('php5.conf').with(
+          content: 'somecontent',
+        )
+      }
     end
     context 'source has priority over template' do
       let :pre_condition do
@@ -285,13 +338,16 @@
       end
       let :params do
         {
-          :template => 'apache/mod/php5.conf.erb',
-          :source   => 'some-path'
+          template: 'apache/mod/php5.conf.erb',
+          source: 'some-path',
         }
       end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
+
+      it {
+        is_expected.to contain_file('php5.conf').with(
+          source: 'some-path',
+        )
+      }
     end
     context 'source has priority over content' do
       let :pre_condition do
@@ -299,20 +355,25 @@
       end
       let :params do
         {
-          :content => 'somecontent',
-          :source  => 'some-path'
+          content: 'somecontent',
+          source: 'some-path',
         }
       end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
+
+      it {
+        is_expected.to contain_file('php5.conf').with(
+          source: 'some-path',
+        )
+      }
     end
     context 'with mpm_module => worker' do
       let :pre_condition do
         'class { "apache": mpm_module => worker, }'
       end
-      it 'should raise an error' do
-        expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork' or mpm_module => 'itk'/
+
+      it 'raises an error' do # rubocop:disable RSpec/MultipleExpectations
+        # rubocop:disable RSpec/NamedSubject
+        expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, %r{mpm_module => 'prefork' or mpm_module => 'itk'}
       end
     end
   end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index cbbca2ed4f..d498abbb2d 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -1,140 +1,142 @@
 require 'spec_helper'
 
-describe 'apache::mod::prefork', :type => :class do
+describe 'apache::mod::prefork', type: :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
   end
-  context "on a Debian OS" do
+
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
-    it { is_expected.to contain_file("/etc/apache2/mods-available/prefork.conf").with_ensure('file') }
-    it { is_expected.to contain_file("/etc/apache2/mods-enabled/prefork.conf").with_ensure('link') }
+    it { is_expected.to contain_file('/etc/apache2/mods-available/prefork.conf').with_ensure('file') }
+    it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.conf').with_ensure('link') }
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
 
-      it { is_expected.not_to contain_file("/etc/apache2/mods-available/prefork.load") }
-      it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/prefork.load") }
+      it { is_expected.not_to contain_file('/etc/apache2/mods-available/prefork.load') }
+      it { is_expected.not_to contain_file('/etc/apache2/mods-enabled/prefork.load') }
 
-      it { is_expected.to contain_package("apache2-mpm-prefork") }
+      it { is_expected.to contain_package('apache2-mpm-prefork') }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
         }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/mods-available/prefork.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n"
-        })
+      it {
+        is_expected.to contain_file('/etc/apache2/mods-available/prefork.load').with('ensure' => 'file',
+                                                                                     'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n")
       }
-      it { is_expected.to contain_file("/etc/apache2/mods-enabled/prefork.load").with_ensure('link') }
+      it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.load').with_ensure('link') }
     end
   end
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
-    it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').with_ensure('file') }
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
 
-      it { is_expected.to contain_file_line("/etc/sysconfig/httpd prefork enable").with({
-        'require' => 'Package[httpd]',
-        })
+      it {
+        is_expected.to contain_file_line('/etc/sysconfig/httpd prefork enable').with('require' => 'Package[httpd]')
       }
-      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxRequestWorkers/ }) }
-      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxConnectionsPerChild/ }) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').without('content' => %r{MaxRequestWorkers}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').without('content' => %r{MaxConnectionsPerChild}) }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :params do
         {
-          :apache_version         => '2.4',
-          :maxrequestworkers      => '512',
-          :maxconnectionsperchild => '4000'
+          apache_version: '2.4',
+          maxrequestworkers: '512',
+          maxconnectionsperchild: '4000',
         }
       end
 
       it { is_expected.not_to contain_apache__mod('event') }
 
-      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n",
-        })
+      it {
+        is_expected.to contain_file('/etc/httpd/conf.d/prefork.load').with('ensure' => 'file',
+                                                                           'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
       }
-      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxClients/ }) }
-      it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxRequestsPerChild/ }) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').without('content' => %r{MaxClients}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').without('content' => %r{MaxRequestsPerChild}) }
     end
   end
-  context "on a FreeBSD OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
-    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/prefork.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/prefork.conf').with_ensure('file') }
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
-    it { is_expected.to contain_file("/etc/apache2/modules.d/prefork.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/etc/apache2/modules.d/prefork.conf').with_ensure('file') }
   end
 end
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index d646ba7500..19568ffedd 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -2,94 +2,90 @@
 
 # Helper function for testing the contents of `proxy_balancer.conf`
 def balancer_manager_conf_spec(allow_from, manager_path)
+  expected = "<Location #{manager_path}>\n"\
+             "    SetHandler balancer-manager\n"\
+             "    Require ip #{Array(allow_from).join(' ')}\n"\
+             "</Location>\n"
   it do
-    is_expected.to contain_file("proxy_balancer.conf").with_content(
-      "<Location #{manager_path}>\n"\
-      "    SetHandler balancer-manager\n"\
-      "    Require ip #{Array(allow_from).join(' ')}\n"\
-      "</Location>\n"
-    )
+    is_expected.to contain_file('proxy_balancer.conf').with_content(expected)
   end
 end
 
-describe 'apache::mod::proxy_balancer', :type => :class do
+describe 'apache::mod::proxy_balancer', type: :class do
   let :pre_condition do
     [
       'include apache::mod::proxy',
     ]
   end
-  it_behaves_like "a mod class, without including apache"
 
-  context "default configuration with default parameters" do
-    context "on a Debian OS" do
+  it_behaves_like 'a mod class, without including apache'
+
+  context 'default configuration with default parameters' do
+    context 'on a Debian OS' do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '8',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'jessie',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '8',
+          concat_basedir: '/dne',
+          lsbdistcodename: 'jessie',
+          operatingsystem: 'Debian',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
 
-      it { is_expected.to contain_apache__mod("proxy_balancer") }
-
-      it { is_expected.to_not contain_file("proxy_balancer.conf") }
-      it { is_expected.to_not contain_file("proxy_balancer.conf symlink") }
+      it { is_expected.to contain_apache__mod('proxy_balancer') }
 
+      it { is_expected.not_to contain_file('proxy_balancer.conf') }
+      it { is_expected.not_to contain_file('proxy_balancer.conf symlink') }
     end
 
-    context "on a RedHat OS" do
+    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',
-          :is_pe                  => false,
+          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',
+          is_pe: false,
         }
       end
 
-      it { is_expected.to contain_apache__mod("proxy_balancer") }
-
-      it { is_expected.to_not contain_file("proxy_balancer.conf") }
-      it { is_expected.to_not contain_file("proxy_balancer.conf symlink") }
+      it { is_expected.to contain_apache__mod('proxy_balancer') }
 
+      it { is_expected.not_to contain_file('proxy_balancer.conf') }
+      it { is_expected.not_to contain_file('proxy_balancer.conf symlink') }
     end
   end
 
-  context "default configuration with custom parameters $manager => true, $allow_from => ['10.10.10.10','11.11.11.11'], $status_path => '/custom-manager'" do
-    context "on a Debian OS" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '8',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'jessie',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
-        }
-      end
-      let :params do
-        {
-          :manager      => true,
-          :allow_from   => ['10.10.10.10','11.11.11.11'],
-          :manager_path => '/custom-manager',
-        }
-      end
-
-      balancer_manager_conf_spec(["10.10.10.10", "11.11.11.11"], "/custom-manager")
-
+  # rubocop:disable RSpec/EmptyExampleGroup
+  context "default configuration with custom parameters $manager => true, $allow_from => ['10.10.10.10','11.11.11.11'], $status_path => '/custom-manager' on a Debian OS" do
+    let :facts do
+      {
+        osfamily: 'Debian',
+        operatingsystemrelease: '8',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'jessie',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
+      }
+    end
+    let :params do
+      {
+        manager: true,
+        allow_from: ['10.10.10.10', '11.11.11.11'],
+        manager_path: '/custom-manager',
+      }
     end
+
+    balancer_manager_conf_spec(['10.10.10.10', '11.11.11.11'], '/custom-manager')
   end
 end
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index 33059c07b2..40356ed6a0 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -1,64 +1,63 @@
 require 'spec_helper'
 
-describe 'apache::mod::proxy_connect', :type => :class do
+describe 'apache::mod::proxy_connect', type: :class do
   let :pre_condition do
     [
       'include apache::mod::proxy',
     ]
   end
-  it_behaves_like "a mod class, without including apache"
+
+  it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily        => 'Debian',
-        :concat_basedir  => '/dne',
-        :operatingsystem => 'Debian',
-        :id              => 'root',
-        :kernel          => 'Linux',
-        :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        concat_basedir: '/dne',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
+
     context 'with Apache version < 2.2' do
       let :facts do
-        super().merge({
-          :operatingsystemrelease => '7.0',
-          :lsbdistcodename        => 'wheezy',
-        })
+        super().merge(operatingsystemrelease: '7.0',
+                      lsbdistcodename: 'wheezy')
       end
       let :params do
         {
-          :apache_version => '2.1',
+          apache_version: '2.1',
         }
       end
+
       it { is_expected.not_to contain_apache__mod('proxy_connect') }
     end
     context 'with Apache version = 2.2' do
       let :facts do
-        super().merge({
-          :operatingsystemrelease => '7.0',
-          :lsbdistcodename        => 'wheezy',
-        })
+        super().merge(operatingsystemrelease: '7.0',
+                      lsbdistcodename: 'wheezy')
       end
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
+
       it { is_expected.to contain_apache__mod('proxy_connect') }
     end
     context 'with Apache version >= 2.4' do
       let :facts do
-        super().merge({
-          :operatingsystemrelease => '8.0',
-          :lsbdistcodename        => 'jessie',
-        })
+        super().merge(operatingsystemrelease: '8.0',
+                      lsbdistcodename: 'jessie')
       end
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
         }
       end
+
       it { is_expected.to contain_apache__mod('proxy_connect') }
     end
   end
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 0d70276c26..38cbcdeb4e 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -1,128 +1,140 @@
 require 'spec_helper'
 
-describe 'apache::mod::proxy_html', :type => :class do
+describe 'apache::mod::proxy_html', type: :class do
   let :pre_condition do
     [
       'include apache::mod::proxy',
       'include apache::mod::proxy_http',
     ]
   end
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
-    shared_examples "debian" do |loadfiles|
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => loadfiles) }
-      it { is_expected.to contain_package("libapache2-mod-proxy-html") }
+
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
+    shared_examples 'debian' do |loadfiles|
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: loadfiles) }
+      it { is_expected.to contain_package('libapache2-mod-proxy-html') }
     end
     let :facts do
       {
-        :osfamily        => 'Debian',
-        :concat_basedir  => '/dne',
-        :architecture    => 'i386',
-        :lsbdistcodename => 'squeeze',
-        :operatingsystem => 'Debian',
-        :id              => 'root',
-        :kernel          => 'Linux',
-        :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :hardwaremodel   => 'i386',
-        :is_pe           => false,
+        osfamily: 'Debian',
+        concat_basedir: '/dne',
+        architecture: 'i386',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        hardwaremodel: 'i386',
+        is_pe: false,
       }
     end
 
-    context "on squeeze" do
-      let(:facts) { super().merge({ :operatingsystemrelease => '6' }) }
-      it_behaves_like "debian", ['/usr/lib/libxml2.so.2']
-      it { is_expected.to_not contain_apache__mod('xml2enc') }
+    context 'on squeeze' do
+      let(:facts) { super().merge(operatingsystemrelease: '6') }
+
+      it_behaves_like 'debian', ['/usr/lib/libxml2.so.2']
+      it { is_expected.not_to contain_apache__mod('xml2enc') }
     end
-    context "on wheezy" do
-      let(:facts) { super().merge({ :operatingsystemrelease => '7' }) }
-      it { is_expected.to_not contain_apache__mod('xml2enc') }
-      context "i386" do
-        let(:facts) { super().merge({
-          :hardwaremodel => 'i686',
-          :architecture  => 'i386'
-        })}
-        it_behaves_like "debian", ["/usr/lib/i386-linux-gnu/libxml2.so.2"]
+
+    context 'on wheezy i386' do
+      let(:facts) do
+        super().merge(operatingsystemrelease: '7',
+                      hardwaremodel: 'i686',
+                      architecture: 'i386')
       end
-      context "x64" do
-        let(:facts) { super().merge({
-          :hardwaremodel => 'x86_64',
-          :architecture  => 'amd64'
-        })}
-        it_behaves_like "debian", ["/usr/lib/x86_64-linux-gnu/libxml2.so.2"]
+
+      it { is_expected.not_to contain_apache__mod('xml2enc') }
+      it_behaves_like 'debian', ['/usr/lib/i386-linux-gnu/libxml2.so.2']
+    end
+    context 'on wheezy x64' do
+      let(:facts) do
+        super().merge(operatingsystemrelease: '7',
+                      hardwaremodel: 'x86_64',
+                      architecture: 'amd64')
       end
+
+      it { is_expected.not_to contain_apache__mod('xml2enc') }
+      it_behaves_like 'debian', ['/usr/lib/x86_64-linux-gnu/libxml2.so.2']
     end
-    context "on jessie" do
-      let(:facts) { super().merge({ :operatingsystemrelease => '8' }) }
-      it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) }
-      context "i386" do
-        let(:facts) { super().merge({
-          :hardwaremodel => 'i686',
-          :architecture  => 'i386'
-        })}
-        it_behaves_like "debian", ["/usr/lib/i386-linux-gnu/libxml2.so.2"]
+
+    context 'on jessie i386' do
+      let(:facts) do
+        super().merge(operatingsystemrelease: '8',
+                      hardwaremodel: 'i686',
+                      architecture: 'i386')
       end
-      context "x64" do
-        let(:facts) { super().merge({
-          :hardwaremodel => 'x86_64',
-          :architecture  => 'amd64'
-        })}
-        it_behaves_like "debian", ["/usr/lib/x86_64-linux-gnu/libxml2.so.2"]
+
+      it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
+      it_behaves_like 'debian', ['/usr/lib/i386-linux-gnu/libxml2.so.2']
+    end
+    context 'on jessie x64' do
+      let(:facts) do
+        super().merge(operatingsystemrelease: '8',
+                      hardwaremodel: 'x86_64',
+                      architecture: 'amd64')
       end
+
+      it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
+      it_behaves_like 'debian', ['/usr/lib/x86_64-linux-gnu/libxml2.so.2']
     end
   end
-  context "on a RedHat OS", :compile do
+
+  context 'on a RedHat OS', :compile 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { is_expected.to contain_package("mod_proxy_html") }
-    it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
+    it { is_expected.to contain_package('mod_proxy_html') }
+    it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
   end
-  context "on a FreeBSD OS", :compile do
+  context 'on a FreeBSD OS', :compile 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) }
-    it { is_expected.to contain_package("www/mod_proxy_html") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
+    it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
+    it { is_expected.to contain_package('www/mod_proxy_html') }
   end
-  context "on a Gentoo OS", :compile do
+  context 'on a Gentoo OS', :compile do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) }
-    it { is_expected.to contain_package("www-apache/mod_proxy_html") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
+    it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
+    it { is_expected.to contain_package('www-apache/mod_proxy_html') }
   end
 end
diff --git a/spec/classes/mod/proxy_wstunnel.rb b/spec/classes/mod/proxy_wstunnel.rb
index 5af217a05f..e332d94f80 100644
--- a/spec/classes/mod/proxy_wstunnel.rb
+++ b/spec/classes/mod/proxy_wstunnel.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe 'apache::mod::proxy_wstunnel', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::proxy_wstunnel', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 end
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 622a558c37..aac87784e0 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -1,83 +1,88 @@
 require 'spec_helper'
 
-describe 'apache::mod::python', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::python', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "on a Debian OS" do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("python") }
-    it { is_expected.to contain_package("libapache2-mod-python") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('python') }
+    it { is_expected.to contain_package('libapache2-mod-python') }
   end
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("python") }
-    it { is_expected.to contain_package("mod_python") }
-    it { is_expected.to contain_file("python.load").with_path('/etc/httpd/conf.d/python.load') }
 
-    describe "with loadfile_name specified" do
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('python') }
+    it { is_expected.to contain_package('mod_python') }
+    it { is_expected.to contain_file('python.load').with_path('/etc/httpd/conf.d/python.load') }
+
+    describe 'with loadfile_name specified' do
       let :params do
-        { :loadfile_name => 'FooBar' }
+        { loadfile_name: 'FooBar' }
       end
-      it { is_expected.to contain_file("FooBar").with_path('/etc/httpd/conf.d/FooBar') }
+
+      it { is_expected.to contain_file('FooBar').with_path('/etc/httpd/conf.d/FooBar') }
     end
   end
-  context "on a FreeBSD OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("python") }
-    it { is_expected.to contain_package("www/mod_python3") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('python') }
+    it { is_expected.to contain_package('www/mod_python3') }
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod("python") }
-    it { is_expected.to contain_package("www-apache/mod_python") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_apache__mod('python') }
+    it { is_expected.to contain_package('www-apache/mod_python') }
   end
 end
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index d75ea56031..bfccb5a60f 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -1,47 +1,51 @@
 require 'spec_helper'
 
-describe 'apache::mod::remoteip', :type => :class do
-  context "on a Debian OS" do
+describe 'apache::mod::remoteip', type: :class do
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '8',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'jessie',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        osfamily: 'Debian',
+        operatingsystemrelease: '8',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'jessie',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
     let :params do
-      { :apache_version => '2.4' }
+      { apache_version: '2.4' }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('remoteip') }
-    it { is_expected.to contain_file('remoteip.conf').with({
-      'path' => '/etc/apache2/mods-available/remoteip.conf',
-    }) }
+    it {
+      is_expected.to contain_file('remoteip.conf').with('path' => '/etc/apache2/mods-available/remoteip.conf')
+    }
 
-    describe "with header X-Forwarded-For" do
+    describe 'with header X-Forwarded-For' do
       let :params do
-        { :header => 'X-Forwarded-For' }
+        { header: 'X-Forwarded-For' }
       end
-      it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPHeader X-Forwarded-For$/) }
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPHeader X-Forwarded-For$}) }
     end
-    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
+    describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
-        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
+        { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
       end
-      it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPInternalProxy 10.42.17.8$/) }
-      it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPInternalProxy 10.42.18.99$/) }
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.17.8$}) }
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.18.99$}) }
     end
-    describe "with Apache version < 2.4" do
+    describe 'with Apache version < 2.4' do
       let :params do
-        { :apache_version => '2.2' }
+        { apache_version: '2.2' }
       end
-      it 'should fail' do
-        expect { catalogue }.to raise_error(Puppet::Error, /mod_remoteip is only available in Apache 2.4/)
+
+      it 'fails' do
+        expect { catalogue }.to raise_error(Puppet::Error, %r{mod_remoteip is only available in Apache 2.4})
       end
     end
   end
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index c3a09777cc..390130bbb4 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -1,146 +1,158 @@
 require 'spec_helper'
 
-describe 'apache::mod::reqtimeout', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::reqtimeout', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    context "passing no parameters" do
-      it { is_expected.to contain_class("apache::params") }
+
+    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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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']}
+        { timeouts: ['header=20-60,minrate=600', 'body=60,minrate=600'] }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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'}
+        { timeouts: 'header=20-60,minrate=600' }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^RequestReadTimeout header=20-60,minrate=600$}) }
     end
   end
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    context "passing no parameters" do
-      it { is_expected.to contain_class("apache::params") }
+
+    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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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']}
+        { timeouts: ['header=20-60,minrate=600', 'body=60,minrate=600'] }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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'}
+        { timeouts: 'header=20-60,minrate=600' }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^RequestReadTimeout header=20-60,minrate=600$}) }
     end
   end
-  context "on a FreeBSD OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    context "passing no parameters" do
-      it { is_expected.to contain_class("apache::params") }
+
+    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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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']}
+        { timeouts: ['header=20-60,minrate=600', 'body=60,minrate=600'] }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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'}
+        { timeouts: 'header=20-60,minrate=600' }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^RequestReadTimeout header=20-60,minrate=600$}) }
     end
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    context "passing no parameters" do
-      it { is_expected.to contain_class("apache::params") }
+
+    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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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']}
+        { timeouts: ['header=20-60,minrate=600', 'body=60,minrate=600'] }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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'}
+        { timeouts: 'header=20-60,minrate=600' }
       end
-      it { is_expected.to contain_class("apache::params") }
+
+      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$/) }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^RequestReadTimeout header=20-60,minrate=600$}) }
     end
   end
 end
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 13f0e6c8c0..8110d4010a 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -1,126 +1,138 @@
 require 'spec_helper'
 
-describe 'apache::mod::rpaf', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::rpaf', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
-    it { is_expected.to contain_package("libapache2-mod-rpaf") }
-    it { is_expected.to contain_file('rpaf.conf').with({
-      'path' => '/etc/apache2/mods-available/rpaf.conf',
-    }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+    it { is_expected.to contain_package('libapache2-mod-rpaf') }
+    it {
+      is_expected.to contain_file('rpaf.conf').with('path' => '/etc/apache2/mods-available/rpaf.conf')
+    }
+    it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
 
-    describe "with sethostname => true" do
+    describe 'with sethostname => true' do
       let :params do
-        { :sethostname => 'true' }
+        { sethostname: 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFsethostname On$}) }
     end
-    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
+    describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
-        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
+        { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFproxy_ips 10.42.17.8 10.42.18.99$}) }
     end
-    describe "with header => X-Real-IP" do
+    describe 'with header => X-Real-IP' do
       let :params do
-        { :header => 'X-Real-IP' }
+        { header: 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFheader X-Real-IP$}) }
     end
   end
-  context "on a FreeBSD OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
-    it { is_expected.to contain_package("www/mod_rpaf2") }
-    it { is_expected.to contain_file('rpaf.conf').with({
-      'path' => '/usr/local/etc/apache24/Modules/rpaf.conf',
-    }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+    it { is_expected.to contain_package('www/mod_rpaf2') }
+    it {
+      is_expected.to contain_file('rpaf.conf').with('path' => '/usr/local/etc/apache24/Modules/rpaf.conf')
+    }
+    it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
 
-    describe "with sethostname => true" do
+    describe 'with sethostname => true' do
       let :params do
-        { :sethostname => 'true' }
+        { sethostname: 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFsethostname On$}) }
     end
-    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
+    describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
-        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
+        { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFproxy_ips 10.42.17.8 10.42.18.99$}) }
     end
-    describe "with header => X-Real-IP" do
+    describe 'with header => X-Real-IP' do
       let :params do
-        { :header => 'X-Real-IP' }
+        { header: 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFheader X-Real-IP$}) }
     end
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
-    it { is_expected.to contain_package("www-apache/mod_rpaf") }
-    it { is_expected.to contain_file('rpaf.conf').with({
-      'path' => '/etc/apache2/modules.d/rpaf.conf',
-    }) }
-    it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
+    it { is_expected.to contain_package('www-apache/mod_rpaf') }
+    it {
+      is_expected.to contain_file('rpaf.conf').with('path' => '/etc/apache2/modules.d/rpaf.conf')
+    }
+    it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
 
-    describe "with sethostname => true" do
+    describe 'with sethostname => true' do
       let :params do
-        { :sethostname => 'true' }
+        { sethostname: 'true' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFsethostname On$}) }
     end
-    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
+    describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
-        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
+        { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFproxy_ips 10.42.17.8 10.42.18.99$}) }
     end
-    describe "with header => X-Real-IP" do
+    describe 'with header => X-Real-IP' do
       let :params do
-        { :header => 'X-Real-IP' }
+        { header: 'X-Real-IP' }
       end
-      it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
+
+      it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFheader X-Real-IP$}) }
     end
   end
 end
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index e30f7214fd..10c2b302eb 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -1,162 +1,190 @@
 
 require 'spec_helper'
 
-describe 'apache::mod::security', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on RedHat based systems" do
+describe 'apache::mod::security', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on RedHat based systems' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'CentOS',
-        :operatingsystemrelease => '7',
-        :kernel                 => 'Linux',
-        :id                     => 'root',
-        :concat_basedir         => '/',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        operatingsystem: 'CentOS',
+        operatingsystemrelease: '7',
+        kernel: 'Linux',
+        id: 'root',
+        concat_basedir: '/',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { should contain_apache__mod('security').with(
-      :id => 'security2_module',
-      :lib => 'mod_security2.so'
-    ) }
-    it { should contain_apache__mod('unique_id_module').with(
-      :id => 'unique_id_module',
-      :lib => 'mod_unique_id.so'
-    ) }
-    it { should contain_package('mod_security_crs') }
-    it { should contain_file('security.conf').with(
-      :path => '/etc/httpd/conf.modules.d/security.conf'
-    ) }
-    it { should contain_file('security.conf')
-      .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
-      .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
-      .with_content(%r{^\s+SecDebugLog /var/log/httpd/modsec_debug.log$})
-      .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$})
-    }
-    it { should contain_file('/etc/httpd/modsecurity.d').with(
-      :ensure => 'directory',
-      :path   => '/etc/httpd/modsecurity.d',
-      :owner  => 'root',
-      :group  => 'root',
-      :mode   => '0755',
-    ) }
-    it { should contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
-      :ensure => 'directory',
-      :path => '/etc/httpd/modsecurity.d/activated_rules',
-      :owner => 'apache',
-      :group => 'apache'
-    ) }
-    it { should contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with(
-      :path => '/etc/httpd/modsecurity.d/security_crs.conf'
-    ) }
-    it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
-    it { should contain_file('modsecurity_35_bad_robots.data').with(
-      :path   => '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
-      :target => '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
-    ) }
+
+    it {
+      is_expected.to contain_apache__mod('security').with(
+        id: 'security2_module',
+        lib: 'mod_security2.so',
+      )
+    }
+    it {
+      is_expected.to contain_apache__mod('unique_id_module').with(
+        id: 'unique_id_module',
+        lib: 'mod_unique_id.so',
+      )
+    }
+    it { is_expected.to contain_package('mod_security_crs') }
+    it {
+      is_expected.to contain_file('security.conf').with(
+        path: '/etc/httpd/conf.modules.d/security.conf',
+      )
+    }
+    it {
+      is_expected.to contain_file('security.conf')
+        .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
+        .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
+        .with_content(%r{^\s+SecDebugLog /var/log/httpd/modsec_debug.log$})
+        .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$})
+    }
+    it {
+      is_expected.to contain_file('/etc/httpd/modsecurity.d').with(
+        ensure: 'directory', path: '/etc/httpd/modsecurity.d',
+        owner: 'root', group: 'root', mode: '0755'
+      )
+    }
+    it {
+      is_expected.to contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
+        ensure: 'directory', path: '/etc/httpd/modsecurity.d/activated_rules',
+        owner: 'apache', group: 'apache'
+      )
+    }
+    it {
+      is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with(
+        path: '/etc/httpd/modsecurity.d/security_crs.conf',
+      )
+    }
+    it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+    it {
+      is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+        path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+        target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
+      )
+    }
 
     describe 'with parameters' do
       let :params do
         {
-          :activated_rules           => [
+          activated_rules: [
             '/tmp/foo/bar.conf',
           ],
-          :audit_log_relevant_status => "^(?:5|4(?!01|04))",
-          :audit_log_parts           => "ABCDZ",
-          :secdefaultaction          => "deny,status:406,nolog,auditlog",
+          audit_log_relevant_status: '^(?:5|4(?!01|04))',
+          audit_log_parts: 'ABCDZ',
+          secdefaultaction: 'deny,status:406,nolog,auditlog',
         }
       end
-      it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
-      it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
-      it { should contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
-      it { should contain_file('bar.conf').with(
-        :path   => '/etc/httpd/modsecurity.d/activated_rules/bar.conf',
-        :target => '/tmp/foo/bar.conf',
-      ) }
+
+      it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
+      it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
+      it { is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
+      it {
+        is_expected.to contain_file('bar.conf').with(
+          path: '/etc/httpd/modsecurity.d/activated_rules/bar.conf',
+          target: '/tmp/foo/bar.conf',
+        )
+      }
     end
     describe 'with other modsec parameters' do
       let :params do
         {
-          :manage_security_crs => false
+          manage_security_crs: false,
         }
       end
-      it { should_not contain_file('/etc/httpd/modsecurity.d/security_crs.conf') }
+
+      it { is_expected.not_to contain_file('/etc/httpd/modsecurity.d/security_crs.conf') }
     end
   end
-  context "on Debian based systems" do
+  context 'on Debian based systems' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/',
-        :lsbdistcodename        => 'squeeze',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :kernel                 => 'Linux',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/',
+        lsbdistcodename: 'squeeze',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        kernel: 'Linux',
+        is_pe: false,
       }
     end
-    it { should contain_apache__mod('security').with(
-      :id => 'security2_module',
-      :lib => 'mod_security2.so'
-    ) }
-    it { should contain_apache__mod('unique_id_module').with(
-      :id => 'unique_id_module',
-      :lib => 'mod_unique_id.so'
-    ) }
-    it { should contain_package('modsecurity-crs') }
-    it { should contain_file('security.conf').with(
-      :path => '/etc/apache2/mods-available/security.conf'
-    ) }
-    it { should contain_file('security.conf')
-      .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
-      .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
-      .with_content(%r{^\s+SecDebugLog /var/log/apache2/modsec_debug.log$})
-      .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$})
-    }
-    it { should contain_file('/etc/modsecurity').with(
-      :ensure => 'directory',
-      :path   => '/etc/modsecurity',
-      :owner  => 'root',
-      :group  => 'root',
-      :mode   => '0755',
-    ) }
-    it { should contain_file('/etc/modsecurity/activated_rules').with(
-      :ensure => 'directory',
-      :path => '/etc/modsecurity/activated_rules',
-      :owner => 'www-data',
-      :group => 'www-data'
-    ) }
-    it { should contain_file('/etc/modsecurity/security_crs.conf').with(
-      :path => '/etc/modsecurity/security_crs.conf'
-    ) }
-    it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
-    it { should contain_file('modsecurity_35_bad_robots.data').with(
-      :path   => '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
-      :target => '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
-    ) }
+
+    it {
+      is_expected.to contain_apache__mod('security').with(
+        id: 'security2_module',
+        lib: 'mod_security2.so',
+      )
+    }
+    it {
+      is_expected.to contain_apache__mod('unique_id_module').with(
+        id: 'unique_id_module',
+        lib: 'mod_unique_id.so',
+      )
+    }
+    it { is_expected.to contain_package('modsecurity-crs') }
+    it {
+      is_expected.to contain_file('security.conf').with(
+        path: '/etc/apache2/mods-available/security.conf',
+      )
+    }
+    it {
+      is_expected.to contain_file('security.conf')
+        .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
+        .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
+        .with_content(%r{^\s+SecDebugLog /var/log/apache2/modsec_debug.log$})
+        .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$})
+    }
+    it {
+      is_expected.to contain_file('/etc/modsecurity').with(
+        ensure: 'directory', path: '/etc/modsecurity',
+        owner: 'root', group: 'root', mode: '0755'
+      )
+    }
+    it {
+      is_expected.to contain_file('/etc/modsecurity/activated_rules').with(
+        ensure: 'directory', path: '/etc/modsecurity/activated_rules',
+        owner: 'www-data', group: 'www-data'
+      )
+    }
+    it {
+      is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with(
+        path: '/etc/modsecurity/security_crs.conf',
+      )
+    }
+    it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+    it {
+      is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+        path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
+        target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
+      )
+    }
 
     describe 'with parameters' do
       let :params do
         {
-          :activated_rules           => [
+          activated_rules: [
             '/tmp/foo/bar.conf',
           ],
-          :audit_log_relevant_status => "^(?:5|4(?!01|04))",
-          :audit_log_parts           => "ABCDZ",
-          :secdefaultaction          => "deny,status:406,nolog,auditlog",
+          audit_log_relevant_status: '^(?:5|4(?!01|04))',
+          audit_log_parts: 'ABCDZ',
+          secdefaultaction: 'deny,status:406,nolog,auditlog',
         }
       end
-      it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
-      it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
-      it { should contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
-      it { should contain_file('bar.conf').with(
-        :path   => '/etc/modsecurity/activated_rules/bar.conf',
-        :target => '/tmp/foo/bar.conf',
-      ) }
+
+      it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
+      it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
+      it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
+      it {
+        is_expected.to contain_file('bar.conf').with(
+          path: '/etc/modsecurity/activated_rules/bar.conf',
+          target: '/tmp/foo/bar.conf',
+        )
+      }
     end
   end
-
 end
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index a651c280a2..115086bcc1 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -1,42 +1,44 @@
 require 'spec_helper'
 
-describe 'apache::mod::shib', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::shib', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :fqdn                   => 'test.example.com',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        fqdn: 'test.example.com',
+        is_pe: false,
       }
     end
+
     describe 'with no parameters' do
-      it { should contain_apache__mod('shib2').with_id('mod_shib') }
+      it { is_expected.to contain_apache__mod('shib2').with_id('mod_shib') }
     end
   end
-  context "on a RedHat OS" do
+  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',
-        :fqdn                   => 'test.example.com',
-        :is_pe                  => false,
+        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',
+        fqdn: 'test.example.com',
+        is_pe: false,
       }
     end
+
     describe 'with no parameters' do
-      it { should contain_apache__mod('shib2').with_id('mod_shib') }
+      it { is_expected.to contain_apache__mod('shib2').with_id('mod_shib') }
     end
   end
 end
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index b4844ec748..bb3cd66947 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -1,37 +1,39 @@
 require 'spec_helper'
 
-describe 'apache::mod::speling', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::speling', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
+
     it { is_expected.to contain_apache__mod('speling') }
   end
 
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
+
     it { is_expected.to contain_apache__mod('speling') }
   end
 end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 18816bbd9f..463e17ee33 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -1,63 +1,79 @@
 require 'spec_helper'
 
-describe 'apache::mod::ssl', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::ssl', type: :class do
+  it_behaves_like 'a mod class, without including apache'
   context 'on an unsupported OS' do
     let :facts do
       {
-        :osfamily               => 'Magic',
-        :operatingsystemrelease => '0',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Magic',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Magic',
+        operatingsystemrelease: '0',
+        concat_basedir: '/dne',
+        operatingsystem: 'Magic',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { expect { catalogue }.to raise_error(Puppet::Error, /Unsupported osfamily:/) }
+
+    it { expect { catalogue }.to raise_error(Puppet::Error, %r{Unsupported osfamily:}) }
   end
 
   context 'on a RedHat' do
     context '6 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',
-          :is_pe                  => false,
+          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',
+          is_pe: false,
         }
       end
+
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('ssl') }
       it { is_expected.to contain_package('mod_ssl') }
       it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.d/ssl.conf') }
-      context 'with a custom package_name parameter' do
-        let :params do
-          { :package_name => 'httpd24-mod_ssl' }
-        end
-        it { is_expected.to contain_class('apache::params') }
-        it { is_expected.to contain_apache__mod('ssl') }
-        it { is_expected.to contain_package('httpd24-mod_ssl') }
-        it { is_expected.not_to contain_package('mod_ssl') }
-        it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/cache/mod_ssl/scache\(512000\)"$})}
+    end
+    context '6 OS with a custom package_name parameter' 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',
+          is_pe: false,
+        }
+      end
+      let :params do
+        { package_name: 'httpd24-mod_ssl' }
       end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('ssl') }
+      it { is_expected.to contain_package('httpd24-mod_ssl') }
+      it { is_expected.not_to contain_package('mod_ssl') }
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/cache/mod_ssl/scache\(512000\)"$}) }
     end
+
     context '7 OS with custom directories for PR#1635' do
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
       let :pre_condition do
@@ -69,6 +85,7 @@
           vhost_dir           => '/etc/httpd/conf.puppet.d',
         }"
       end
+
       it { is_expected.to contain_package('mod_ssl') }
       it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.puppet.d/ssl.conf') }
     end
@@ -77,17 +94,18 @@
   context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
+
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
     it { is_expected.not_to contain_package('libapache2-mod-ssl') }
@@ -96,16 +114,17 @@
   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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
+
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
   end
@@ -113,181 +132,195 @@
   context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
+
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
-    it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/run/ssl_scache\(512000\)"$})}
+    it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/run/ssl_scache\(512000\)"$}) }
   end
 
   context 'on a Suse OS' do
     let :facts do
       {
-        :osfamily               => 'Suse',
-        :operatingsystem        => 'SLES',
-        :operatingsystemrelease => '12',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Suse',
+        operatingsystem: 'SLES',
+        operatingsystemrelease: '12',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
+
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
-    it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/lib/apache2/ssl_scache\(512000\)"$})}
+    it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/lib/apache2/ssl_scache\(512000\)"$}) }
   end
   # Template config doesn't vary by distro
-  context "on all distros" do
+  context 'on all distros' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'CentOS',
-        :operatingsystemrelease => '6',
-        :kernel                 => 'Linux',
-        :id                     => 'root',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        operatingsystem: 'CentOS',
+        operatingsystemrelease: '6',
+        kernel: 'Linux',
+        id: 'root',
+        concat_basedir: '/dne',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
     context 'not setting ssl_pass_phrase_dialog' do
-      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog builtin$/)}
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLPassPhraseDialog builtin$}) }
     end
 
     context 'setting ssl_ca to a path' do
       let :params do
         {
-            :ssl_ca => '/etc/pki/some/path/ca.crt',
+          ssl_ca: '/etc/pki/some/path/ca.crt',
         }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLCACertificateFile/)}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLCACertificateFile}) }
     end
-    context "with Apache version < 2.4" do
+
+    context 'with Apache version < 2.4 - ssl_compression with default value' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
-      context 'ssl_compression with default value' do
-        it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLCompression Off$/)}
-      end
 
-      context 'setting ssl_compression to true' do
-        let :params do
-          {
-            :ssl_compression => true,
-          }
-        end
-        it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLCompression On$/)}
-      end
-      context 'setting ssl_stapling to true' do
-        let :params do
-          {
-            :ssl_stapling => true,
-          }
-        end
-        it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLUseStapling/)}
+      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLCompression Off$}) }
+    end
+    context 'with Apache version < 2.4 - setting ssl_compression to true' do
+      let :params do
+        {
+          apache_version: '2.2',
+          ssl_compression: true,
+        }
       end
+
+      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLCompression On$}) }
     end
-    context "with Apache version >= 2.4" do
+    context 'with Apache version < 2.4 - setting ssl_stapling to true' do
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.2',
+          ssl_stapling: true,
         }
       end
-      context 'ssl_compression with default value' do
-        it { is_expected.not_to contain_file('ssl.conf').with_content(/^  SSLCompression Off$/)}
+
+      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLUseStapling}) }
+    end
+
+    context 'with Apache version >= 2.4 - ssl_compression with default value' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
       end
 
-      context 'setting ssl_compression to true' do
-        let :params do
-          {
-            :apache_version => '2.4',
-            :ssl_compression => true,
-          }
-        end
-        it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLCompression On$/)}
+      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLCompression Off$}) }
+    end
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+          ssl_compression: true,
+        }
       end
-      context 'setting ssl_stapling to true' do
-        let :params do
-          {
-            :apache_version => '2.4',
-            :ssl_stapling => true,
-          }
-        end
-        it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLUseStapling On$/)}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLCompression On$}) }
+    end
+    context 'with Apache version >= 2.4 - setting ssl_stapling to true' do
+      let :params do
+        {
+          apache_version: '2.4',
+          ssl_stapling: true,
+        }
       end
-      context 'setting ssl_stapling_return_errors to true' do
-        let :params do
-          {
-            :apache_version => '2.4',
-            :ssl_stapling_return_errors => true,
-          }
-        end
-        it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLStaplingReturnResponderErrors On$/)}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLUseStapling On$}) }
+    end
+    context 'with Apache version >= 2.4 - setting ssl_stapling_return_errors to true' do
+      let :params do
+        {
+          apache_version: '2.4',
+          ssl_stapling_return_errors: true,
+        }
       end
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLStaplingReturnResponderErrors On$}) }
     end
 
     context 'setting ssl_pass_phrase_dialog' do
       let :params do
         {
-          :ssl_pass_phrase_dialog => 'exec:/path/to/program',
+          ssl_pass_phrase_dialog: 'exec:/path/to/program',
         }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(/^  SSLPassPhraseDialog exec:\/path\/to\/program$/)}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLPassPhraseDialog exec:\/path\/to\/program$}) }
     end
 
     context 'setting ssl_random_seed_bytes' do
       let :params do
         {
-          :ssl_random_seed_bytes => '1024',
+          ssl_random_seed_bytes: '1024',
         }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLRandomSeed startup file:/dev/urandom 1024$})}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLRandomSeed startup file:/dev/urandom 1024$}) }
     end
 
     context 'setting ssl_openssl_conf_cmd' do
       let :params do
         {
-          :ssl_openssl_conf_cmd => 'DHParameters "foo.pem"',
+          ssl_openssl_conf_cmd: 'DHParameters "foo.pem"',
         }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(/^\s+SSLOpenSSLConfCmd DHParameters "foo.pem"$/)}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^\s+SSLOpenSSLConfCmd DHParameters "foo.pem"$}) }
     end
 
     context 'setting ssl_mutex' do
       let :params do
         {
-          :ssl_mutex => 'posixsem',
+          ssl_mutex: 'posixsem',
         }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLMutex posixsem$})}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLMutex posixsem$}) }
     end
     context 'setting ssl_sessioncache' do
       let :params do
         {
-          :ssl_sessioncache => '/tmp/customsessioncache(51200)',
+          ssl_sessioncache: '/tmp/customsessioncache(51200)',
         }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/tmp/customsessioncache\(51200\)"$})}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/tmp/customsessioncache\(51200\)"$}) }
     end
     context 'setting ssl_proxy_protocol' do
       let :params do
         {
-          :ssl_proxy_protocol => [ '-ALL', '+TLSv1'],
+          ssl_proxy_protocol: ['-ALL', '+TLSv1'],
         }
       end
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLProxyProtocol -ALL \+TLSv1$})}
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLProxyProtocol -ALL \+TLSv1$}) }
     end
   end
 end
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 0a6305638b..05b081e82a 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -3,139 +3,139 @@
 # Helper function for testing the contents of `status.conf`
 # Apache < 2.4
 def status_conf_spec(allow_from, extended_status, status_path)
+  expected =
+    "<Location #{status_path}>\n"\
+    "    SetHandler server-status\n"\
+    "    Order deny,allow\n"\
+    "    Deny from all\n"\
+    "    Allow from #{Array(allow_from).join(' ')}\n"\
+    "</Location>\n"\
+    "ExtendedStatus #{extended_status}\n"\
+    "\n"\
+    "<IfModule mod_proxy.c>\n"\
+    "    # Show Proxy LoadBalancer status in mod_status\n"\
+    "    ProxyStatus On\n"\
+    "</IfModule>\n"
   it do
-    is_expected.to contain_file("status.conf").with_content(
-      "<Location #{status_path}>\n"\
-      "    SetHandler server-status\n"\
-      "    Order deny,allow\n"\
-      "    Deny from all\n"\
-      "    Allow from #{Array(allow_from).join(' ')}\n"\
-      "</Location>\n"\
-      "ExtendedStatus #{extended_status}\n"\
-      "\n"\
-      "<IfModule mod_proxy.c>\n"\
-      "    # Show Proxy LoadBalancer status in mod_status\n"\
-      "    ProxyStatus On\n"\
-      "</IfModule>\n"
-    )
+    is_expected.to contain_file('status.conf').with_content(expected)
   end
 end
+
 # Apache >= 2.4
 def require_directives(requires)
   if requires == :undef
-    return "    Require ip 127.0.0.1 ::1\n"
+    "    Require ip 127.0.0.1 ::1\n"
   elsif requires.is_a?(String)
-    if ['','unmanaged'].include?requires.downcase
-      return ''
+    if ['', 'unmanaged'].include? requires.downcase
+      ''
     else
-      return "    Require #{requires}\n"
+      "    Require #{requires}\n"
     end
   elsif requires.is_a?(Array)
-    return requires.map { |req| "    Require #{req}\n" }.join('')
+    requires.map { |req| "    Require #{req}\n" }.join('')
   elsif requires.is_a?(Hash)
-    unless requires.has_key?(:enforce)
-      return requires[:requires].map { |req| "    Require #{req}\n" }.join('')
-    else
-      return \
-        "    <Require#{requires[:enforce].capitalize}>\n" + \
+    if requires.key?(:enforce)
+      \
+      "    <Require#{requires[:enforce].capitalize}>\n" + \
         requires[:requires].map { |req| "        Require #{req}\n" }.join('') + \
         "    </Require#{requires[:enforce].capitalize}>\n"
+    else
+      requires[:requires].map { |req| "    Require #{req}\n" }.join('')
     end
   end
 end
+
 def status_conf_spec_require(requires, extended_status, status_path)
+  expected =
+    "<Location #{status_path}>\n"\
+    "    SetHandler server-status\n"\
+    "#{require_directives(requires)}"\
+    "</Location>\n"\
+    "ExtendedStatus #{extended_status}\n"\
+    "\n"\
+    "<IfModule mod_proxy.c>\n"\
+    "    # Show Proxy LoadBalancer status in mod_status\n"\
+    "    ProxyStatus On\n"\
+    "</IfModule>\n"
   it do
-    is_expected.to contain_file("status.conf").with_content(
-      "<Location #{status_path}>\n"\
-      "    SetHandler server-status\n"\
-      "#{require_directives(requires)}"\
-      "</Location>\n"\
-      "ExtendedStatus #{extended_status}\n"\
-      "\n"\
-      "<IfModule mod_proxy.c>\n"\
-      "    # Show Proxy LoadBalancer status in mod_status\n"\
-      "    ProxyStatus On\n"\
-      "</IfModule>\n"
-    )
+    is_expected.to contain_file('status.conf').with_content(expected)
   end
 end
 
-describe 'apache::mod::status', :type => :class do
-  it_behaves_like "a mod class, without including apache"
+describe 'apache::mod::status', type: :class do
+  it_behaves_like 'a mod class, without including apache'
 
-  context "default configuration with parameters" do
-    context "on a Debian 6 OS with default params" do
+  context 'default configuration with parameters' do
+    context 'on a Debian 6 OS with default params' do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          lsbdistcodename: 'squeeze',
+          operatingsystem: 'Debian',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
 
-      it { is_expected.to contain_apache__mod("status") }
+      it { is_expected.to contain_apache__mod('status') }
 
-      status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status")
+      status_conf_spec(['127.0.0.1', '::1'], 'On', '/server-status')
 
-      it { is_expected.to contain_file("status.conf").with({
-        :ensure => 'file',
-        :path   => '/etc/apache2/mods-available/status.conf',
-      } ) }
-
-      it { is_expected.to contain_file("status.conf symlink").with({
-        :ensure => 'link',
-        :path   => '/etc/apache2/mods-enabled/status.conf',
-      } ) }
+      it {
+        is_expected.to contain_file('status.conf').with(ensure: 'file',
+                                                        path: '/etc/apache2/mods-available/status.conf')
+      }
 
+      it {
+        is_expected.to contain_file('status.conf symlink').with(ensure: 'link',
+                                                                path: '/etc/apache2/mods-enabled/status.conf')
+      }
     end
 
-    context "on a RedHat 6 OS with default params" do
+    context 'on a RedHat 6 OS with default params' 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',
-          :is_pe                  => false,
+          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',
+          is_pe: false,
         }
       end
 
-      it { is_expected.to contain_apache__mod("status") }
-
-      status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status")
+      it { is_expected.to contain_apache__mod('status') }
 
-      it { is_expected.to contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
+      status_conf_spec(['127.0.0.1', '::1'], 'On', '/server-status')
 
+      it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.d/status.conf') }
     end
 
     valid_requires = {
-      :undef     => :undef,
-      :empty     => '',
-      :unmanaged => 'unmanaged',
-      :string    => 'ip 127.0.0.1 192.168',
-      :array     => [
+      undef: :undef,
+      empty: '',
+      unmanaged: 'unmanaged',
+      string: 'ip 127.0.0.1 192.168',
+      array: [
         'ip 127.0.0.1',
         'ip ::1',
         'host localhost',
       ],
-      :hash      => {
-        :requires => [
+      hash: {
+        requires: [
           'ip 10.1',
           'host somehost',
         ],
       },
-      :enforce   => {
-        :enforce => 'all',
-        :requires => [
+      enforce: {
+        enforce: 'all',
+        requires: [
           'ip 127.0.0.1',
           'host localhost',
         ],
@@ -145,189 +145,190 @@ def status_conf_spec_require(requires, extended_status, status_path)
       context "on a Debian 8 OS with default params and #{req_key} requires" do
         let :facts do
           {
-            :osfamily               => 'Debian',
-            :operatingsystemrelease => '8',
-            :concat_basedir         => '/dne',
-            :lsbdistcodename        => 'squeeze',
-            :operatingsystem        => 'Debian',
-            :id                     => 'root',
-            :kernel                 => 'Linux',
-            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            :is_pe                  => false,
+            osfamily: 'Debian',
+            operatingsystemrelease: '8',
+            concat_basedir: '/dne',
+            lsbdistcodename: 'squeeze',
+            operatingsystem: 'Debian',
+            id: 'root',
+            kernel: 'Linux',
+            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            is_pe: false,
           }
         end
 
         let :params do
           {
-            :requires => req_value,
+            requires: req_value,
           }
         end
 
-        it { is_expected.to contain_apache__mod("status") }
+        it { is_expected.to contain_apache__mod('status') }
 
-        status_conf_spec_require(req_value, "On", "/server-status")
+        status_conf_spec_require(req_value, 'On', '/server-status')
 
-        it { is_expected.to contain_file("status.conf").with({
-          :ensure => 'file',
-          :path   => '/etc/apache2/mods-available/status.conf',
-        } ) }
-
-        it { is_expected.to contain_file("status.conf symlink").with({
-          :ensure => 'link',
-          :path   => '/etc/apache2/mods-enabled/status.conf',
-        } ) }
+        it {
+          is_expected.to contain_file('status.conf').with(ensure: 'file',
+                                                          path: '/etc/apache2/mods-available/status.conf')
+        }
 
+        it {
+          is_expected.to contain_file('status.conf symlink').with(ensure: 'link',
+                                                                  path: '/etc/apache2/mods-enabled/status.conf')
+        }
       end
 
       context "on a RedHat 7 OS with default params and #{req_key} requires" do
         let :facts do
           {
-            :osfamily               => 'RedHat',
-            :operatingsystemrelease => '7',
-            :concat_basedir         => '/dne',
-            :operatingsystem        => 'RedHat',
-            :id                     => 'root',
-            :kernel                 => 'Linux',
-            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            :is_pe                  => false,
+            osfamily: 'RedHat',
+            operatingsystemrelease: '7',
+            concat_basedir: '/dne',
+            operatingsystem: 'RedHat',
+            id: 'root',
+            kernel: 'Linux',
+            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            is_pe: false,
           }
         end
 
         let :params do
           {
-            :requires => req_value,
+            requires: req_value,
           }
         end
 
-        it { is_expected.to contain_apache__mod("status") }
-
-        status_conf_spec_require(req_value, "On", "/server-status")
+        it { is_expected.to contain_apache__mod('status') }
 
-        it { is_expected.to contain_file("status.conf").with_path("/etc/httpd/conf.modules.d/status.conf") }
+        status_conf_spec_require(req_value, 'On', '/server-status')
 
+        it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
       end
     end
 
-    context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
+    context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do # rubocop:disable RSpec/EmptyExampleGroup
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          lsbdistcodename: 'squeeze',
+          operatingsystem: 'Debian',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
       let :params do
         {
-          :allow_from => ['10.10.10.10','11.11.11.11'],
-          :extended_status => 'Off',
-          :status_path => '/custom-status',
+          allow_from: ['10.10.10.10', '11.11.11.11'],
+          extended_status: 'Off',
+          status_path: '/custom-status',
         }
       end
 
-      status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off", "/custom-status")
-
+      status_conf_spec(['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status')
     end
 
     context "with valid parameter type $allow_from => ['10.10.10.10']" do
       let :facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          lsbdistcodename: 'squeeze',
+          operatingsystem: 'Debian',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
       let :params do
-        { :allow_from => ['10.10.10.10'] }
+        { allow_from: ['10.10.10.10'] }
       end
-      it 'should expect to succeed array validation' do
+
+      it 'expects to succeed array validation' do # rubocop:disable RSpec/MultipleExpectations
         expect {
-          is_expected.to contain_file("status.conf")
-        }.not_to raise_error()
+          is_expected.to contain_file('status.conf')
+        }.not_to raise_error
       end
     end
 
     context "with invalid parameter type $allow_from => '10.10.10.10'" 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',
-          :is_pe                  => false,
+          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',
+          is_pe: false,
         }
       end
       let :params do
-        { :allow_from => '10.10.10.10' }
+        { allow_from: '10.10.10.10' }
       end
-      it 'should expect to fail array validation' do
+
+      it 'expects to fail array validation' do # rubocop:disable RSpec/MultipleExpectations
         expect {
-          is_expected.to contain_file("status.conf")
+          is_expected.to contain_file('status.conf')
         }.to raise_error(Puppet::Error)
       end
     end
 
     # Only On or Off are valid options
-    ['On', 'Off'].each do |valid_param|
+    %w[On Off].each do |valid_param|
       context "with valid value $extended_status => '#{valid_param}'" do
         let :facts do
           {
-            :osfamily               => 'Debian',
-            :operatingsystemrelease => '6',
-            :concat_basedir         => '/dne',
-            :lsbdistcodename        => 'squeeze',
-            :operatingsystem        => 'Debian',
-            :id                     => 'root',
-            :kernel                 => 'Linux',
-            :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            :is_pe                  => false,
+            osfamily: 'Debian',
+            operatingsystemrelease: '6',
+            concat_basedir: '/dne',
+            lsbdistcodename: 'squeeze',
+            operatingsystem: 'Debian',
+            id: 'root',
+            kernel: 'Linux',
+            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            is_pe: false,
           }
         end
         let :params do
-          { :extended_status => valid_param }
+          { extended_status: valid_param }
         end
-        it 'should expect to succeed regular expression validation' do
+
+        it 'expects to succeed regular expression validation' do # rubocop:disable RSpec/MultipleExpectations
           expect {
-            is_expected.to contain_file("status.conf")
-          }.not_to raise_error()
+            is_expected.to contain_file('status.conf')
+          }.not_to raise_error
         end
       end
     end
 
-    ['Yes', 'No'].each do |invalid_param|
+    %w[Yes No].each do |invalid_param|
       context "with invalid value $extended_status => '#{invalid_param}'" 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',
-            :is_pe                  => false,
+            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',
+            is_pe: false,
           }
         end
         let :params do
-          { :extended_status => invalid_param }
+          { extended_status: invalid_param }
         end
-        it 'should expect to fail regular expression validation' do
+
+        it 'expects to fail regular expression validation' do # rubocop:disable RSpec/MultipleExpectations
           expect {
-            is_expected.to contain_file("status.conf")
+            is_expected.to contain_file('status.conf')
           }.to raise_error(Puppet::Error)
         end
       end
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index 71dbab30e4..51d20d30bd 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -1,38 +1,40 @@
 require 'spec_helper'
 
-describe 'apache::mod::suphp', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::suphp', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_package("libapache2-mod-suphp") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_package('libapache2-mod-suphp') }
   end
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_package("mod_suphp") }
+
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.to contain_package('mod_suphp') }
   end
 end
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index ae9863f5a8..3867912602 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'apache::mod::userdir', :type => :class do
-  context "on a Debian OS" do
+describe 'apache::mod::userdir', type: :class do
+  context 'on a Debian OS' do
     let :pre_condition do
       'class { "apache":
          default_mods => false,
@@ -10,47 +10,51 @@
     end
     let :facts do
       {
-        :lsbdistcodename           => 'squeeze',
-        :osfamily                  => 'Debian',
-        :operatingsystemrelease    => '6',
-        :operatingsystemmajrelease => '6',
-        :concat_basedir            => '/dne',
-        :operatingsystem           => 'Debian',
-        :id                        => 'root',
-        :kernel                    => 'Linux',
-        :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        lsbdistcodename: 'squeeze',
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        operatingsystemmajrelease: '6',
+        concat_basedir: '/dne',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    context "default parameters" do
-      it { should compile }
+
+    context 'default parameters' do
+      it { is_expected.to compile }
     end
-    context "with dir set to something" do
+    context 'with dir set to something' do
       let :params do
         {
-          :dir => 'hi',
+          dir: 'hi',
         }
       end
-      it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+/home/\*/hi$})}
-      it { should contain_file("userdir.conf").with_content(%r{^\s*\<Directory\s+\"/home/\*/hi\"\>$})}
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/hi$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/hi\"\>$}) }
     end
-    context "with home set to something" do
+    context 'with home set to something' do
       let :params do
         {
-          :home => '/u',
+          home: '/u',
         }
       end
-      it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+/u/\*/public_html$})}
-      it { should contain_file("userdir.conf").with_content(%r{^\s*\<Directory\s+\"/u/\*/public_html"\>$})}
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/u/\*/public_html$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/u/\*/public_html"\>$}) }
     end
-    context "with path set to something" do
+    context 'with path set to something' do
       let :params do
         {
-          :path => 'public_html /usr/web http://www.example.com/',
+          path: 'public_html /usr/web http://www.example.com/',
         }
       end
-      it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+public_html /usr/web http://www\.example\.com/$})}
-      it { should contain_file("userdir.conf").with_content(%r{^\s*\<Directory\s+\"public_html /usr/web http://www\.example\.com/\"\>$})}
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+public_html /usr/web http://www\.example\.com/$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"public_html /usr/web http://www\.example\.com/\"\>$}) }
     end
   end
 end
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 9d0d8e5e01..3e384646ae 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -1,189 +1,192 @@
 require 'spec_helper'
 
-describe 'apache::mod::worker', :type => :class do
+describe 'apache::mod::worker', type: :class do
   let :pre_condition do
     'class { "apache": mpm_module => false, }'
   end
-  context "on a Debian OS" do
+
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
-    it { is_expected.to contain_file("/etc/apache2/mods-available/worker.conf").with_ensure('file') }
-    it { is_expected.to contain_file("/etc/apache2/mods-enabled/worker.conf").with_ensure('link') }
+    it { is_expected.to contain_file('/etc/apache2/mods-available/worker.conf').with_ensure('file') }
+    it { is_expected.to contain_file('/etc/apache2/mods-enabled/worker.conf').with_ensure('link') }
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
 
-      it { is_expected.not_to contain_file("/etc/apache2/mods-available/worker.load") }
-      it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/worker.load") }
+      it { is_expected.not_to contain_file('/etc/apache2/mods-available/worker.load') }
+      it { is_expected.not_to contain_file('/etc/apache2/mods-enabled/worker.load') }
 
-      it { is_expected.to contain_package("apache2-mpm-worker") }
+      it { is_expected.to contain_package('apache2-mpm-worker') }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
         }
       end
 
-      it { is_expected.to contain_file("/etc/apache2/mods-available/worker.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n"
-        })
+      it {
+        is_expected.to contain_file('/etc/apache2/mods-available/worker.load').with('ensure' => 'file',
+                                                                                    'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n")
       }
-      it { is_expected.to contain_file("/etc/apache2/mods-enabled/worker.load").with_ensure('link') }
+      it { is_expected.to contain_file('/etc/apache2/mods-enabled/worker.load').with_ensure('link') }
     end
   end
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
-    it { is_expected.to contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with_ensure('file') }
 
-    context "with Apache version < 2.4" do
+    context 'with Apache version < 2.4' do
       let :params do
         {
-          :apache_version => '2.2',
+          apache_version: '2.2',
         }
       end
 
-      it { is_expected.to contain_file_line("/etc/sysconfig/httpd worker enable").with({
-        'require' => 'Package[httpd]',
-        })
+      it {
+        is_expected.to contain_file_line('/etc/sysconfig/httpd worker enable').with('require' => 'Package[httpd]')
       }
     end
 
-    context "with Apache version >= 2.4" do
+    context 'with Apache version >= 2.4' do
       let :params do
         {
-          :apache_version => '2.4',
+          apache_version: '2.4',
         }
       end
 
       it { is_expected.not_to contain_apache__mod('event') }
 
-      it { is_expected.to contain_file("/etc/httpd/conf.d/worker.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n",
-        })
+      it {
+        is_expected.to contain_file('/etc/httpd/conf.d/worker.load').with('ensure' => 'file',
+                                                                          'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
       }
     end
   end
-  context "on a FreeBSD OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
-    it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/worker.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/worker.conf').with_ensure('file') }
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
+
+    it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
-    it { is_expected.to contain_file("/etc/apache2/modules.d/worker.conf").with_ensure('file') }
+    it { is_expected.to contain_file('/etc/apache2/modules.d/worker.conf').with_ensure('file') }
   end
 
   # Template config doesn't vary by distro
-  context "on all distros" do
+  context 'on all distros' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'CentOS',
-        :operatingsystemrelease => '6',
-        :kernel                 => 'Linux',
-        :id                     => 'root',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        operatingsystem: 'CentOS',
+        operatingsystemrelease: '6',
+        kernel: 'Linux',
+        id: 'root',
+        concat_basedir: '/dne',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
     context 'defaults' do
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+2$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+150$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+75$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+0$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+64$/) }
-      it { should contain_file("/etc/httpd/conf.d/worker.conf").with(:content => /^\s*ListenBacklog\s*511/) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ServerLimit\s+25$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+StartServers\s+2$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxClients\s+150$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+25$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+75$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ThreadsPerChild\s+25$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxRequestsPerChild\s+0$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ThreadLimit\s+64$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s*ListenBacklog\s*511}) }
     end
 
     context 'setting params' do
       let :params do
         {
-          :serverlimit          => 10,
-          :startservers         => 11,
-          :maxclients           => 12,
-          :minsparethreads      => 13,
-          :maxsparethreads      => 14,
-          :threadsperchild      => 15,
-          :maxrequestsperchild  => 16,
-          :threadlimit          => 17,
-          :listenbacklog        => 8,
+          serverlimit: 10,
+          startservers: 11,
+          maxclients: 12,
+          minsparethreads: 13,
+          maxsparethreads: 14,
+          threadsperchild: 15,
+          maxrequestsperchild: 16,
+          threadlimit: 17,
+          listenbacklog: 8,
         }
       end
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+10$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+11$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+12$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+13$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+14$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+15$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+16$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+17$/) }
-      it { should contain_file("/etc/httpd/conf.d/worker.conf").with(:content => /^\s*ListenBacklog\s*8/) }
+
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ServerLimit\s+10$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+StartServers\s+11$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxClients\s+12$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+13$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+14$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ThreadsPerChild\s+15$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxRequestsPerChild\s+16$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ThreadLimit\s+17$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s*ListenBacklog\s*8}) }
     end
   end
 end
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 6261a95902..85adc79e11 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -1,151 +1,163 @@
 require 'spec_helper'
 
-describe 'apache::mod::wsgi', :type => :class do
-  it_behaves_like "a mod class, without including apache"
-  context "on a Debian OS" do
+describe 'apache::mod::wsgi', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class('apache::mod::wsgi').with(
-        'wsgi_socket_prefix' => nil
+
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => nil,
       )
     }
-    it { is_expected.to contain_package("libapache2-mod-wsgi") }
+    it { is_expected.to contain_package('libapache2-mod-wsgi') }
   end
-  context "on a RedHat OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class('apache::mod::wsgi').with(
-        'wsgi_socket_prefix' => '/var/run/wsgi'
+
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => '/var/run/wsgi',
       )
     }
-    it { is_expected.to contain_package("mod_wsgi") }
+    it { is_expected.to contain_package('mod_wsgi') }
 
-    describe "with WSGIRestrictEmbedded enabled" do
+    describe 'with WSGIRestrictEmbedded enabled' do
       let :params do
-        { :wsgi_restrict_embedded => 'On' }
+        { wsgi_restrict_embedded: 'On' }
       end
-      it {is_expected.to contain_file('wsgi.conf').with_content(/^  WSGIRestrictEmbedded On$/)}
+
+      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIRestrictEmbedded On$}) }
     end
-    describe "with custom WSGISocketPrefix" do
+    describe 'with custom WSGISocketPrefix' do
       let :params do
-        { :wsgi_socket_prefix => 'run/wsgi' }
+        { wsgi_socket_prefix: 'run/wsgi' }
       end
-      it {is_expected.to contain_file('wsgi.conf').with_content(/^  WSGISocketPrefix run\/wsgi$/)}
+
+      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGISocketPrefix run\/wsgi$}) }
     end
-    describe "with custom WSGIPythonHome" do
+    describe 'with custom WSGIPythonHome' do
       let :params do
-        { :wsgi_python_home => '/path/to/virtenv' }
+        { wsgi_python_home: '/path/to/virtenv' }
       end
-      it {is_expected.to contain_file('wsgi.conf').with_content(/^  WSGIPythonHome "\/path\/to\/virtenv"$/)}
+
+      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIPythonHome "\/path\/to\/virtenv"$}) }
     end
-    describe "with custom package_name and mod_path" do
+    describe 'with custom package_name and mod_path' do
       let :params do
         {
-          :package_name => 'mod_wsgi_package',
-          :mod_path     => '/foo/bar/baz',
+          package_name: 'mod_wsgi_package',
+          mod_path: '/foo/bar/baz',
         }
       end
-      it { is_expected.to contain_apache__mod('wsgi').with({
-          'package' => 'mod_wsgi_package',
-          'path'    => '/foo/bar/baz',
-        })
+
+      it {
+        is_expected.to contain_apache__mod('wsgi').with('package' => 'mod_wsgi_package',
+                                                        'path' => '/foo/bar/baz')
       }
-      it { is_expected.to contain_package("mod_wsgi_package") }
-      it { is_expected.to contain_file('wsgi.load').with_content(%r"LoadModule wsgi_module /foo/bar/baz") }
+      it { is_expected.to contain_package('mod_wsgi_package') }
+      it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module /foo/bar/baz}) }
     end
-    describe "with custom mod_path not containing /" do
+    describe 'with custom mod_path not containing /' do
       let :params do
         {
-          :package_name => 'mod_wsgi_package',
-          :mod_path     => 'wsgi_mod_name.so',
+          package_name: 'mod_wsgi_package',
+          mod_path: 'wsgi_mod_name.so',
         }
       end
-      it { is_expected.to contain_apache__mod('wsgi').with({
-          'path'     => 'modules/wsgi_mod_name.so',
-          'package'  => 'mod_wsgi_package',
-        })
-      }
-      it { is_expected.to contain_file('wsgi.load').with_content(%r"LoadModule wsgi_module modules/wsgi_mod_name.so") }
 
+      it {
+        is_expected.to contain_apache__mod('wsgi').with('path' => 'modules/wsgi_mod_name.so',
+                                                        'package' => 'mod_wsgi_package')
+      }
+      it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module modules/wsgi_mod_name.so}) }
     end
-    describe "with package_name but no mod_path" do
+    describe 'with package_name but no mod_path' do
       let :params do
         {
-          :mod_path => '/foo/bar/baz',
+          mod_path: '/foo/bar/baz',
         }
       end
-      it { expect { catalogue }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ }
+
+      it { expect { catalogue }.to raise_error Puppet::Error, %r{apache::mod::wsgi - both package_name and mod_path must be specified!} }
     end
-    describe "with mod_path but no package_name" do
+    describe 'with mod_path but no package_name' do
       let :params do
         {
-          :package_name => '/foo/bar/baz',
+          package_name: '/foo/bar/baz',
         }
       end
-      it { expect { catalogue }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ }
+
+      it { expect { catalogue }.to raise_error Puppet::Error, %r{apache::mod::wsgi - both package_name and mod_path must be specified!} }
     end
   end
-  context "on a FreeBSD OS" do
+  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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class('apache::mod::wsgi').with(
-        'wsgi_socket_prefix' => nil
+
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => nil,
       )
     }
-    it { is_expected.to contain_package("www/mod_wsgi") }
+    it { is_expected.to contain_package('www/mod_wsgi') }
   end
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_class('apache::mod::wsgi').with(
-        'wsgi_socket_prefix' => nil
+
+    it { is_expected.to contain_class('apache::params') }
+    it {
+      is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => nil,
       )
     }
-    it { is_expected.to contain_package("www-apache/mod_wsgi") }
+    it { is_expected.to contain_package('www-apache/mod_wsgi') }
   end
 end
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index 32ccd313c9..04dea1278c 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe 'apache::params', :type => :class do
-  context "On a Debian OS" do
+describe 'apache::params', type: :class do
+  context 'On a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index a065abc2fc..7c73ccc457 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -1,156 +1,176 @@
 require 'spec_helper'
 
-describe 'apache::service', :type => :class do
+describe 'apache::service', type: :class do
   let :pre_condition do
     'include apache::params'
   end
-  context "on a Debian OS" do
+
+  context 'on a Debian OS' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_service("httpd").with(
-      'name'      => 'apache2',
-      'ensure'    => 'running',
-      'enable'    => 'true'
+
+    it {
+      is_expected.to contain_service('httpd').with(
+        'name'      => 'apache2',
+        'ensure'    => 'running',
+        'enable'    => 'true',
       )
     }
 
     context "with $service_name => 'foo'" do
-      let (:params) {{ :service_name => 'foo' }}
-      it { is_expected.to contain_service("httpd").with(
-        'name'      => 'foo'
+      let(:params) { { service_name: 'foo' } }
+
+      it {
+        is_expected.to contain_service('httpd').with(
+          'name' => 'foo',
         )
       }
     end
 
-    context "with $service_enable => true" do
-      let (:params) {{ :service_enable => true }}
-      it { is_expected.to contain_service("httpd").with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'true'
+    context 'with $service_enable => true' do
+      let(:params) { { service_enable: true } }
+
+      it {
+        is_expected.to contain_service('httpd').with(
+          'name'      => 'apache2',
+          'ensure'    => 'running',
+          'enable'    => 'true',
         )
       }
     end
 
-    context "with $service_enable => false" do
-      let (:params) {{ :service_enable => false }}
-      it { is_expected.to contain_service("httpd").with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'false'
+    context 'with $service_enable => false' do
+      let(:params) { { service_enable: false } }
+
+      it {
+        is_expected.to contain_service('httpd').with(
+          'name'      => 'apache2',
+          'ensure'    => 'running',
+          'enable'    => 'false',
         )
       }
     end
 
     context "with $service_ensure => 'running'" do
-      let (:params) {{ :service_ensure => 'running', }}
-      it { is_expected.to contain_service("httpd").with(
-        'ensure'    => 'running',
-        'enable'    => 'true'
+      let(:params) { { service_ensure: 'running' } }
+
+      it {
+        is_expected.to contain_service('httpd').with(
+          'ensure'    => 'running',
+          'enable'    => 'true',
         )
       }
     end
 
     context "with $service_ensure => 'stopped'" do
-      let (:params) {{ :service_ensure => 'stopped', }}
-      it { is_expected.to contain_service("httpd").with(
-        'ensure'    => 'stopped',
-        'enable'    => 'true'
+      let(:params) { { service_ensure: 'stopped' } }
+
+      it {
+        is_expected.to contain_service('httpd').with(
+          'ensure'    => 'stopped',
+          'enable'    => 'true',
         )
       }
     end
 
     context "with $service_ensure => 'UNDEF'" do
-      let (:params) {{ :service_ensure => 'UNDEF' }}
-      it { is_expected.to contain_service("httpd").without_ensure }
+      let(:params) { { service_ensure: 'UNDEF' } }
+
+      it { is_expected.to contain_service('httpd').without_ensure }
     end
 
-    context "with $service_restart unset" do
-      it { is_expected.to contain_service("httpd").without_restart }
+    context 'with $service_restart unset' do
+      it { is_expected.to contain_service('httpd').without_restart }
     end
 
     context "with $service_restart => '/usr/sbin/apachectl graceful'" do
-     let (:params) {{ :service_restart => '/usr/sbin/apachectl graceful' }}
-     it { is_expected.to contain_service("httpd").with(
-        'restart' => '/usr/sbin/apachectl graceful'
-      )
-     }
+      let(:params) { { service_restart: '/usr/sbin/apachectl graceful' } }
+
+      it {
+        is_expected.to contain_service('httpd').with(
+          'restart' => '/usr/sbin/apachectl graceful',
+        )
+      }
     end
   end
 
-
-  context "on a RedHat 5 OS, do not manage service" do
+  context 'on a RedHat 5 OS, do not manage service' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '5',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        operatingsystemrelease: '5',
+        concat_basedir: '/dne',
+        operatingsystem: 'RedHat',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
     let(:params) do
       {
         'service_ensure' => 'running',
         'service_name'   => 'httpd',
-        'service_manage' => false
+        'service_manage' => false,
       }
     end
+
     it { is_expected.not_to contain_service('httpd') }
   end
 
-  context "on a FreeBSD 5 OS" do
+  context 'on a FreeBSD 5 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_service("httpd").with(
-      'name'      => 'apache24',
-      'ensure'    => 'running',
-      'enable'    => 'true'
+
+    it {
+      is_expected.to contain_service('httpd').with(
+        'name'      => 'apache24',
+        'ensure'    => 'running',
+        'enable'    => 'true',
       )
     }
   end
 
-  context "on a Gentoo OS" do
+  context 'on a Gentoo OS' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
-    it { is_expected.to contain_service("httpd").with(
-      'name'      => 'apache2',
-      'ensure'    => 'running',
-      'enable'    => 'true'
+
+    it {
+      is_expected.to contain_service('httpd').with(
+        'name'      => 'apache2',
+        'ensure'    => 'running',
+        'enable'    => 'true',
       )
     }
   end
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
index 3220079405..2f2f914158 100644
--- a/spec/classes/vhosts_spec.rb
+++ b/spec/classes/vhosts_spec.rb
@@ -1,33 +1,36 @@
 require 'spec_helper'
 
-describe 'apache::vhosts', :type => :class do
+describe 'apache::vhosts', type: :class do
   context 'on all OSes' do
     let :facts do
       {
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'RedHat',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+        id: 'root',
+        kernel: 'Linux',
+        osfamily: 'RedHat',
+        operatingsystem: 'RedHat',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
+
     context 'with custom vhosts parameter' do
-      let :params do {
-          :vhosts => {
-              'custom_vhost_1' => {
-                  'docroot' => '/var/www/custom_vhost_1',
-                  'port' => '81',
-              },
-              'custom_vhost_2' => {
-                  'docroot' => '/var/www/custom_vhost_2',
-                  'port' => '82',
-              },
+      let :params do
+        {
+          vhosts: {
+            'custom_vhost_1' => {
+              'docroot' => '/var/www/custom_vhost_1',
+              'port' => '81',
+            },
+            'custom_vhost_2' => {
+              'docroot' => '/var/www/custom_vhost_2',
+              'port' => '82',
+            },
           },
-      }
+        }
       end
+
       it { is_expected.to contain_apache__vhost('custom_vhost_1') }
       it { is_expected.to contain_apache__vhost('custom_vhost_2') }
     end
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index e2452e395d..89dac156d8 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -1,72 +1,80 @@
 require 'spec_helper'
 
-describe 'apache::balancer', :type => :define do
+describe 'apache::balancer', type: :define do
   let :title do
     'myapp'
   end
   let :facts do
     {
-      :osfamily               => 'Debian',
-      :operatingsystem        => 'Debian',
-      :operatingsystemrelease => '6',
-      :lsbdistcodename        => 'squeeze',
-      :id                     => 'root',
-      :concat_basedir         => '/dne',
-      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      :kernel                 => 'Linux',
-      :is_pe                  => false,
+      osfamily: 'Debian',
+      operatingsystem: 'Debian',
+      operatingsystemrelease: '6',
+      lsbdistcodename: 'squeeze',
+      id: 'root',
+      concat_basedir: '/dne',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      kernel: 'Linux',
+      is_pe: false,
     }
   end
+
   describe 'apache pre_condition with defaults' do
     let :pre_condition do
       'include apache'
     end
-    describe "works when only declaring resource title" do
-      it { should contain_concat('apache_balancer_myapp') }
-      it { should_not contain_apache__mod('slotmem_shm') }
-      it { should_not contain_apache__mod('lbmethod_byrequests') }
-      it { should contain_concat__fragment('00-myapp-header').with_content(%r{^<Proxy balancer://myapp>$}) }
+
+    describe 'works when only declaring resource title' do
+      it { is_expected.to contain_concat('apache_balancer_myapp') }
+      it { is_expected.not_to contain_apache__mod('slotmem_shm') }
+      it { is_expected.not_to contain_apache__mod('lbmethod_byrequests') }
+      it { is_expected.to contain_concat__fragment('00-myapp-header').with_content(%r{^<Proxy balancer://myapp>$}) }
     end
-    describe "accept a target parameter and use it" do
+    describe 'accept a target parameter and use it' do
       let :params do
         {
-          :target => '/tmp/myapp.conf'
+          target: '/tmp/myapp.conf',
         }
       end
-      it { should contain_concat('apache_balancer_myapp').with({
-        :path => "/tmp/myapp.conf",
-      })}
-      it { should_not contain_apache__mod('slotmem_shm') }
-      it { should_not contain_apache__mod('lbmethod_byrequests') }
+
+      it {
+        is_expected.to contain_concat('apache_balancer_myapp').with(path: '/tmp/myapp.conf')
+      }
+      it { is_expected.not_to contain_apache__mod('slotmem_shm') }
+      it { is_expected.not_to contain_apache__mod('lbmethod_byrequests') }
     end
-    describe "accept an options parameter and use it" do
+    describe 'accept an options parameter and use it' do
       let :params do
         {
-          :options => ['timeout=0', 'nonce=none'],
+          options: ['timeout=0', 'nonce=none'],
         }
       end
-      it { should contain_concat__fragment('00-myapp-header').with_content(
-        %r{^<Proxy balancer://myapp timeout=0 nonce=none>$}
-      )}
+
+      it {
+        is_expected.to contain_concat__fragment('00-myapp-header').with_content(
+          %r{^<Proxy balancer://myapp timeout=0 nonce=none>$},
+        )
+      }
     end
-    context "on jessie" do
-      let(:facts) { super().merge({
-        :operatingsystemrelease => '8',
-        :lsbdistcodename        => 'jessie',
-      }) }
-      it { should contain_apache__mod('slotmem_shm') }
-      it { should contain_apache__mod('lbmethod_byrequests') }
+    context 'on jessie' do
+      let(:facts) do
+        super().merge(operatingsystemrelease: '8',
+                      lsbdistcodename: 'jessie')
+      end
+
+      it { is_expected.to contain_apache__mod('slotmem_shm') }
+      it { is_expected.to contain_apache__mod('lbmethod_byrequests') }
     end
   end
-  describe 'apache pre_condition with conf_dir set' do 
+  describe 'apache pre_condition with conf_dir set' do
     let :pre_condition do
       'class{"apache":
           confd_dir => "/junk/path"
        }'
     end
-    it { should contain_concat('apache_balancer_myapp').with({
-      :path => "/junk/path/balancer_myapp.conf",
-    })}
+
+    it {
+      is_expected.to contain_concat('apache_balancer_myapp').with(path: '/junk/path/balancer_myapp.conf')
+    }
   end
 
   describe 'with lbmethod and with apache::mod::proxy_balancer::apache_version set' do
@@ -77,12 +85,13 @@
     end
     let :params do
       {
-        :proxy_set => {
+        proxy_set: {
           'lbmethod' => 'bytraffic',
         },
       }
     end
-    it { should contain_apache__mod('slotmem_shm') }
-    it { should contain_apache__mod('lbmethod_bytraffic') }
+
+    it { is_expected.to contain_apache__mod('slotmem_shm') }
+    it { is_expected.to contain_apache__mod('lbmethod_bytraffic') }
   end
 end
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 6221290a28..3005dc854a 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -1,23 +1,24 @@
 require 'spec_helper'
 
-describe 'apache::balancermember', :type => :define do
+describe 'apache::balancermember', type: :define do
   let :pre_condition do
     'include apache'
   end
   let :facts do
     {
-      :osfamily               => 'Debian',
-      :operatingsystem        => 'Debian',
-      :operatingsystemrelease => '6',
-      :lsbdistcodename        => 'squeeze',
-      :id                     => 'root',
-      :concat_basedir         => '/dne',
-      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      :kernel                 => 'Linux',
-      :is_pe                  => false,
+      osfamily: 'Debian',
+      operatingsystem: 'Debian',
+      operatingsystemrelease: '6',
+      lsbdistcodename: 'squeeze',
+      id: 'root',
+      concat_basedir: '/dne',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      kernel: 'Linux',
+      is_pe: false,
     }
   end
-  describe "allows multiple balancermembers with the same url" do
+
+  describe 'allows multiple balancermembers with the same url' do
     let :pre_condition do
       'include apache
       apache::balancer {"balancer":}
@@ -30,14 +31,15 @@
     end
     let :params do
       {
-        :options          => [],
-        :url              => 'http://127.0.0.1:8080/',
-        :balancer_cluster => 'balancer-internal'
+        options: [],
+        url: 'http://127.0.0.1:8080/',
+        balancer_cluster: 'balancer-internal',
       }
     end
-    it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/') }
+
+    it { is_expected.to contain_concat__fragment('BalancerMember http://127.0.0.1:8080/') }
   end
-  describe "allows balancermember with a different target" do
+  describe 'allows balancermember with a different target' do
     let :pre_condition do
       'include apache
       apache::balancer {"balancername": target => "/etc/apache/balancer.conf"}
@@ -49,13 +51,14 @@
     end
     let :params do
       {
-        :options          => [],
-        :url              => 'http://127.0.0.1:8080/',
-        :balancer_cluster => 'balancername'
+        options: [],
+        url: 'http://127.0.0.1:8080/',
+        balancer_cluster: 'balancername',
       }
     end
-    it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/').with({
-      :target => "apache_balancer_balancername",
-    })}
+
+    it {
+      is_expected.to contain_concat__fragment('BalancerMember http://127.0.0.1:8080/').with(target: 'apache_balancer_balancername')
+    }
   end
 end
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 5f996fd6db..78922a6fd1 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'apache::custom_config', :type => :define do
+describe 'apache::custom_config', type: :define do
   let :pre_condition do
     'class { "apache": }'
   end
@@ -9,42 +9,41 @@
   end
   let :facts do
     {
-      :osfamily               => 'Debian',
-      :operatingsystemrelease => '6',
-      :concat_basedir         => '/',
-      :lsbdistcodename        => 'squeeze',
-      :operatingsystem        => 'Debian',
-      :id                     => 'root',
-      :kernel                 => 'Linux',
-      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      :is_pe                  => false,
+      osfamily: 'Debian',
+      operatingsystemrelease: '6',
+      concat_basedir: '/',
+      lsbdistcodename: 'squeeze',
+      operatingsystem: 'Debian',
+      id: 'root',
+      kernel: 'Linux',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      is_pe: false,
     }
   end
+
   context 'defaults with content' do
     let :params do
       {
         'content' => '# Test',
       }
     end
-    it { is_expected.to contain_exec("syntax verification for rspec").with({
-      'refreshonly' => 'true',
-      'subscribe'   => 'File[apache_rspec]',
-      'command'     => '/usr/sbin/apachectl -t',
-      'notify'      => 'Class[Apache::Service]',
-      'before'      => 'Exec[remove rspec if invalid]',
-    })
+
+    it {
+      is_expected.to contain_exec('syntax verification for rspec').with('refreshonly' => 'true',
+                                                                        'subscribe'   => 'File[apache_rspec]',
+                                                                        'command'     => '/usr/sbin/apachectl -t',
+                                                                        'notify'      => 'Class[Apache::Service]',
+                                                                        'before'      => 'Exec[remove rspec if invalid]')
     }
-    it { is_expected.to contain_exec("remove rspec if invalid").with({
-      'unless'      => '/usr/sbin/apachectl -t',
-      'subscribe'   => 'File[apache_rspec]',
-      'refreshonly' => 'true',
-    })
+    it {
+      is_expected.to contain_exec('remove rspec if invalid').with('unless' => '/usr/sbin/apachectl -t',
+                                                                  'subscribe'   => 'File[apache_rspec]',
+                                                                  'refreshonly' => 'true')
     }
-    it { is_expected.to contain_file("apache_rspec").with({
-      'ensure'  => 'present',
-      'content' => '# Test',
-      'require' => 'Package[httpd]',
-    })
+    it {
+      is_expected.to contain_file('apache_rspec').with('ensure' => 'present',
+                                                       'content' => '# Test',
+                                                       'require' => 'Package[httpd]')
     }
   end
   context 'set everything with source' do
@@ -56,21 +55,19 @@
         'verify_command' => '/bin/true',
       }
     end
-    it { is_expected.to contain_exec("syntax verification for rspec").with({
-      'command'     => '/bin/true',
-    })
+
+    it {
+      is_expected.to contain_exec('syntax verification for rspec').with('command' => '/bin/true')
     }
-    it { is_expected.to contain_exec("remove rspec if invalid").with({
-      'command'     => '/bin/rm /dne/30-rspec.conf',
-      'unless'      => '/bin/true',
-    })
+    it {
+      is_expected.to contain_exec('remove rspec if invalid').with('command' => '/bin/rm /dne/30-rspec.conf',
+                                                                  'unless' => '/bin/true')
     }
-    it { is_expected.to contain_file("apache_rspec").with({
-      'path'   => '/dne/30-rspec.conf',
-      'ensure'  => 'present',
-      'source' => 'puppet:///modules/apache/test',
-      'require' => 'Package[httpd]',
-    })
+    it {
+      is_expected.to contain_file('apache_rspec').with('path' => '/dne/30-rspec.conf',
+                                                       'ensure' => 'present',
+                                                       'source' => 'puppet:///modules/apache/test',
+                                                       'require' => 'Package[httpd]')
     }
   end
   context 'verify_config => false' do
@@ -80,24 +77,24 @@
         'verify_config' => false,
       }
     end
-    it { is_expected.to_not contain_exec('syntax verification for rspec') }
-    it { is_expected.to_not contain_exec('remove rspec if invalid') }
-    it { is_expected.to contain_file('apache_rspec').with({
-      'notify' => 'Class[Apache::Service]'
-    })
+
+    it { is_expected.not_to contain_exec('syntax verification for rspec') }
+    it { is_expected.not_to contain_exec('remove rspec if invalid') }
+    it {
+      is_expected.to contain_file('apache_rspec').with('notify' => 'Class[Apache::Service]')
     }
   end
   context 'ensure => absent' do
     let :params do
       {
-        'ensure' => 'absent'
+        'ensure' => 'absent',
       }
     end
-    it { is_expected.to_not contain_exec('syntax verification for rspec') }
-    it { is_expected.to_not contain_exec('remove rspec if invalid') }
-    it { is_expected.to contain_file('apache_rspec').with({
-      'ensure' => 'absent',
-    })
+
+    it { is_expected.not_to contain_exec('syntax verification for rspec') }
+    it { is_expected.not_to contain_exec('remove rspec if invalid') }
+    it {
+      is_expected.to contain_file('apache_rspec').with('ensure' => 'absent')
     }
   end
   describe 'validation' do
@@ -108,17 +105,18 @@
           'source'  => 'bar',
         }
       end
+
       it do
         expect {
           catalogue
-        }.to raise_error(Puppet::Error, /Only one of \$content and \$source can be specified\./)
+        }.to raise_error(Puppet::Error, %r{Only one of \$content and \$source can be specified\.})
       end
     end
     context 'neither content nor source' do
       it do
         expect {
           catalogue
-        }.to raise_error(Puppet::Error, /One of \$content and \$source must be specified\./)
+        }.to raise_error(Puppet::Error, %r{One of \$content and \$source must be specified\.})
       end
     end
   end
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index b147349aed..6fc3e267fe 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -1,156 +1,175 @@
 require 'spec_helper'
 
-describe 'apache::fastcgi::server', :type => :define do
+describe 'apache::fastcgi::server', type: :define do
   let :pre_condition do
     'include apache'
   end
   let :title do
     'www'
   end
+
   describe 'os-dependent items' do
-    context "on RedHat based systems" do
+    context 'on RedHat based systems' do
       let :default_facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystem        => 'CentOS',
-          :operatingsystemrelease => '6',
-          :kernel                 => 'Linux',
-          :id                     => 'root',
-          :concat_basedir         => '/dne',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystem: 'CentOS',
+          operatingsystemrelease: '6',
+          kernel: 'Linux',
+          id: 'root',
+          concat_basedir: '/dne',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::mod::fastcgi") }
-      it { should contain_file("fastcgi-pool-#{title}.conf").with(
-        :ensure => 'file',
-        :path => "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf"
-      ) }
+      let(:facts) { default_facts }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::mod::fastcgi') }
+      it {
+        is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
+          ensure: 'file',
+          path: "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf",
+        )
+      }
     end
-    context "on Debian based systems" do
+    context 'on Debian based systems' do
       let :default_facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystem        => 'Debian',
-          :operatingsystemrelease => '6',
-          :lsbdistcodename        => 'squeeze',
-          :kernel                 => 'Linux',
-          :id                     => 'root',
-          :concat_basedir         => '/dne',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystem: 'Debian',
+          operatingsystemrelease: '6',
+          lsbdistcodename: 'squeeze',
+          kernel: 'Linux',
+          id: 'root',
+          concat_basedir: '/dne',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::mod::fastcgi") }
-      it { should contain_file("fastcgi-pool-#{title}.conf").with(
-        :ensure => 'file',
-        :path   => "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf"
-      ) }
+      let(:facts) { default_facts }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::mod::fastcgi') }
+      it {
+        is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
+          ensure: 'file',
+          path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
+        )
+      }
     end
-    context "on FreeBSD systems" do
+    context 'on FreeBSD systems' do
       let :default_facts do
         {
-          :osfamily               => 'FreeBSD',
-          :operatingsystem        => 'FreeBSD',
-          :operatingsystemrelease => '9',
-          :kernel                 => 'FreeBSD',
-          :id                     => 'root',
-          :concat_basedir         => '/dne',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'FreeBSD',
+          operatingsystem: 'FreeBSD',
+          operatingsystemrelease: '9',
+          kernel: 'FreeBSD',
+          id: 'root',
+          concat_basedir: '/dne',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::mod::fastcgi") }
-      it { should contain_file("fastcgi-pool-#{title}.conf").with(
-        :ensure => 'file',
-        :path   => "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf"
-      ) }
+      let(:facts) { default_facts }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::mod::fastcgi') }
+      it {
+        is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
+          ensure: 'file',
+          path: "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf",
+        )
+      }
     end
-    context "on Gentoo systems" do
+    context 'on Gentoo systems' do
       let :default_facts do
         {
-          :osfamily               => 'Gentoo',
-          :operatingsystem        => 'Gentoo',
-          :operatingsystemrelease => '3.16.1-gentoo',
-          :concat_basedir         => '/dne',
-          :kernel                 => 'Linux',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          :is_pe                  => false,
+          osfamily: 'Gentoo',
+          operatingsystem: 'Gentoo',
+          operatingsystemrelease: '3.16.1-gentoo',
+          concat_basedir: '/dne',
+          kernel: 'Linux',
+          id: 'root',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          is_pe: false,
         }
       end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::mod::fastcgi") }
-      it { should contain_file("fastcgi-pool-#{title}.conf").with(
-        :ensure => 'file',
-        :path   => "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf"
-      ) }
+      let(:facts) { default_facts }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::mod::fastcgi') }
+      it {
+        is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
+          ensure: 'file',
+          path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
+        )
+      }
     end
   end
   describe 'os-independent items' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :lsbdistcodename        => 'squeeze',
-        :kernel                 => 'Linux',
-        :id                     => 'root',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '6',
+        lsbdistcodename: 'squeeze',
+        kernel: 'Linux',
+        id: 'root',
+        concat_basedir: '/dne',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    describe ".conf content using TCP communication" do
+
+    describe '.conf content using TCP communication' do
       let :params do
         {
-          :host       => '127.0.0.1:9001',
-          :timeout    => 30,
-          :flush      => true,
-          :faux_path  => '/var/www/php-www.fcgi',
-          :fcgi_alias => '/php-www.fcgi',
-          :file_type  => 'application/x-httpd-php',
-          :pass_header => 'Authorization'
+          host: '127.0.0.1:9001',
+          timeout: 30,
+          flush: true,
+          faux_path: '/var/www/php-www.fcgi',
+          fcgi_alias: '/php-www.fcgi',
+          file_type: 'application/x-httpd-php',
+          pass_header: 'Authorization',
         }
       end
       let :expected do
+# rubocop:disable Layout/IndentationWidth : Changes to the indent causes test failures.
 'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -host 127.0.0.1:9001 -pass-header Authorization
 Alias /php-www.fcgi /var/www/php-www.fcgi
 Action application/x-httpd-php /php-www.fcgi
 '
+        # rubocop:enable Layout/IndentationWidth
       end
+
       it do
-        should contain_file("fastcgi-pool-www.conf").with_content(expected)
+        is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
       end
     end
-    describe ".conf content using socket communication" do
+    describe '.conf content using socket communication' do
       let :params do
         {
-          :host       => '/var/run/fcgi.sock',
-          :timeout    => 30,
-          :flush      => true,
-          :faux_path  => '/var/www/php-www.fcgi',
-          :fcgi_alias => '/php-www.fcgi',
-          :file_type  => 'application/x-httpd-php'
+          host: '/var/run/fcgi.sock',
+          timeout: 30,
+          flush: true,
+          faux_path: '/var/www/php-www.fcgi',
+          fcgi_alias: '/php-www.fcgi',
+          file_type: 'application/x-httpd-php',
         }
       end
       let :expected do
+# rubocop:disable Layout/IndentationWidth : Changes to the indent causes test failures.
 'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -socket /var/run/fcgi.sock
 Alias /php-www.fcgi /var/www/php-www.fcgi
 Action application/x-httpd-php /php-www.fcgi
 '
+        # rubocop:enable Layout/IndentationWidth
       end
+
       it do
-        should contain_file("fastcgi-pool-www.conf").with_content(expected)
+        is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
       end
     end
-
   end
 end
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index 1697190a32..c519e5d120 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -1,165 +1,159 @@
 require 'spec_helper'
 
-describe 'apache::mod', :type => :define do
+describe 'apache::mod', type: :define do
   let :pre_condition do
     'include apache'
   end
-  context "on a RedHat osfamily" do
+
+  context 'on a RedHat osfamily' 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
 
-    describe "for non-special modules" do
+    describe 'for non-special modules' do
       let :title do
         'spec_m'
       end
-      it { is_expected.to contain_class("apache::params") }
-      it "should manage the module load file" do
-        is_expected.to contain_file('spec_m.load').with({
-          :path    => '/etc/httpd/conf.d/spec_m.load',
-          :content => "LoadModule spec_m_module modules/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
+
+      it { is_expected.to contain_class('apache::params') }
+      it 'manages the module load file' do
+        is_expected.to contain_file('spec_m.load').with(path: '/etc/httpd/conf.d/spec_m.load',
+                                                        content: "LoadModule spec_m_module modules/mod_spec_m.so\n",
+                                                        owner: 'root',
+                                                        group: 'root',
+                                                        mode: '0644')
       end
     end
 
-    describe "with file_mode set" do
+    describe 'with file_mode set' do
       let :pre_condition do
         "class {'::apache': file_mode => '0640'}"
       end
       let :title do
         'spec_m'
       end
-      it "should manage the module load file" do
-        is_expected.to contain_file('spec_m.load').with({
-          :mode    => '0640',
-        } )
+
+      it 'manages the module load file' do
+        is_expected.to contain_file('spec_m.load').with(mode: '0640')
       end
     end
 
-    describe "with shibboleth module and package param passed" do
+    describe 'with shibboleth module and package param passed' do
       # name/title for the apache::mod define
       let :title do
         'xsendfile'
       end
       # parameters
-      let(:params) { {:package => 'mod_xsendfile'} }
+      let(:params) { { package: 'mod_xsendfile' } }
 
-      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_package('mod_xsendfile') }
     end
   end
 
-  context "on a Debian osfamily" do
+  context 'on a Debian osfamily' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
 
-    describe "for non-special modules" do
+    describe 'for non-special modules' do
       let :title do
         'spec_m'
       end
-      it { is_expected.to contain_class("apache::params") }
-      it "should manage the module load file" do
-        is_expected.to contain_file('spec_m.load').with({
-          :path    => '/etc/apache2/mods-available/spec_m.load',
-          :content => "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
+
+      it { is_expected.to contain_class('apache::params') }
+      it 'manages the module load file' do
+        is_expected.to contain_file('spec_m.load').with(path: '/etc/apache2/mods-available/spec_m.load',
+                                                        content: "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
+                                                        owner: 'root',
+                                                        group: 'root',
+                                                        mode: '0644')
       end
-      it "should link the module load file" do
-        is_expected.to contain_file('spec_m.load symlink').with({
-          :path   => '/etc/apache2/mods-enabled/spec_m.load',
-          :target => '/etc/apache2/mods-available/spec_m.load',
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
+      it 'links the module load file' do
+        is_expected.to contain_file('spec_m.load symlink').with(path: '/etc/apache2/mods-enabled/spec_m.load',
+                                                                target: '/etc/apache2/mods-available/spec_m.load',
+                                                                owner: 'root',
+                                                                group: 'root',
+                                                                mode: '0644')
       end
     end
   end
 
-  context "on a FreeBSD osfamily" do
+  context 'on a FreeBSD osfamily' 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
 
-    describe "for non-special modules" do
+    describe 'for non-special modules' do
       let :title do
         'spec_m'
       end
-      it { is_expected.to contain_class("apache::params") }
-      it "should manage the module load file" do
-        is_expected.to contain_file('spec_m.load').with({
-          :path    => '/usr/local/etc/apache24/Modules/spec_m.load',
-          :content => "LoadModule spec_m_module /usr/local/libexec/apache24/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'wheel',
-          :mode    => '0644',
-        } )
+
+      it { is_expected.to contain_class('apache::params') }
+      it 'manages the module load file' do
+        is_expected.to contain_file('spec_m.load').with(path: '/usr/local/etc/apache24/Modules/spec_m.load',
+                                                        content: "LoadModule spec_m_module /usr/local/libexec/apache24/mod_spec_m.so\n",
+                                                        owner: 'root',
+                                                        group: 'wheel',
+                                                        mode: '0644')
       end
     end
   end
 
-  context "on a Gentoo osfamily" do
+  context 'on a Gentoo osfamily' do
     let :facts do
       {
-        :osfamily               => 'Gentoo',
-        :operatingsystem        => 'Gentoo',
-        :operatingsystemrelease => '3.16.1-gentoo',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        :is_pe                  => false,
+        osfamily: 'Gentoo',
+        operatingsystem: 'Gentoo',
+        operatingsystemrelease: '3.16.1-gentoo',
+        concat_basedir: '/dne',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+        is_pe: false,
       }
     end
 
-    describe "for non-special modules" do
+    describe 'for non-special modules' do
       let :title do
         'spec_m'
       end
-      it { is_expected.to contain_class("apache::params") }
-      it "should manage the module load file" do
-        is_expected.to contain_file('spec_m.load').with({
-          :path    => '/etc/apache2/modules.d/spec_m.load',
-          :content => "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'wheel',
-          :mode    => '0644',
-        } )
+
+      it { is_expected.to contain_class('apache::params') }
+      it 'manages the module load file' do
+        is_expected.to contain_file('spec_m.load').with(path: '/etc/apache2/modules.d/spec_m.load',
+                                                        content: "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
+                                                        owner: 'root',
+                                                        group: 'wheel',
+                                                        mode: '0644')
       end
     end
   end
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index a5b4c5390c..19d5c155cc 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'apache::security::rule_link', :type => :define do
+describe 'apache::security::rule_link', type: :define do
   let :pre_condition do
     'class { "apache": }
     class { "apache::mod::security": activated_rules => [] }
@@ -11,43 +11,48 @@ class { "apache::mod::security": activated_rules => [] }
     'base_rules/modsecurity_35_bad_robots.data'
   end
 
-  context "on RedHat based systems" do
+  context 'on RedHat based systems' do
     let :facts do
       {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'CentOS',
-        :operatingsystemrelease => '7',
-        :kernel                 => 'Linux',
-        :id                     => 'root',
-        :concat_basedir         => '/',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'RedHat',
+        operatingsystem: 'CentOS',
+        operatingsystemrelease: '7',
+        kernel: 'Linux',
+        id: 'root',
+        concat_basedir: '/',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
-    it { should contain_file('modsecurity_35_bad_robots.data').with(
-      :path => '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
-      :target => '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data'
-    ) }
+
+    it {
+      is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+        path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+        target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
+      )
+    }
   end
 
-  context "on Debian based systems" do
+  context 'on Debian based systems' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/',
-        :lsbdistcodename        => 'squeeze',
-        :id                     => 'root',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :kernel                 => 'Linux',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystem: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/',
+        lsbdistcodename: 'squeeze',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        kernel: 'Linux',
+        is_pe: false,
       }
     end
-    it { should contain_file('modsecurity_35_bad_robots.data').with(
-      :path => '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
-      :target => '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data'
-    ) }
-  end
 
+    it {
+      is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+        path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
+        target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
+      )
+    }
+  end
 end
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 804be86b80..5da38f600b 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -1,99 +1,111 @@
 require 'spec_helper'
 
-describe 'apache::vhost::custom', :type => :define do
+describe 'apache::vhost::custom', type: :define do
   let :title do
     'rspec.example.com'
   end
   let :default_params do
     {
-      :content => 'foobar'
+      content: 'foobar',
     }
   end
+
   describe 'os-dependent items' do
-    context "on RedHat based systems" do
+    context 'on RedHat based systems' do # rubocop:disable RSpec/EmptyExampleGroup
       let :default_facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
-          :operatingsystem        => 'RedHat',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '6',
+          operatingsystem: 'RedHat',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      let :params do default_params end
-      let :facts do default_facts end
+      let(:params) { default_params }
+      let(:facts) { default_facts }
     end
-    context "on Debian based systems" do
+    context 'on Debian based systems' do
       let :default_facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          lsbdistcodename: 'squeeze',
+          operatingsystem: 'Debian',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { is_expected.to contain_file("apache_rspec.example.com").with(
-        :ensure  => 'present',
-        :content => 'foobar',
-        :path    => '/etc/apache2/sites-available/25-rspec.example.com.conf',
-      ) }
-      it { is_expected.to contain_file("25-rspec.example.com.conf symlink").with(
-        :ensure => 'link',
-        :path   => '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
-        :target => '/etc/apache2/sites-available/25-rspec.example.com.conf'
-      ) }
+      let(:params) { default_params }
+      let(:facts) { default_facts }
+
+      it {
+        is_expected.to contain_file('apache_rspec.example.com').with(
+          ensure: 'present',
+          content: 'foobar',
+          path: '/etc/apache2/sites-available/25-rspec.example.com.conf',
+        )
+      }
+      it {
+        is_expected.to contain_file('25-rspec.example.com.conf symlink').with(
+          ensure: 'link',
+          path: '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
+          target: '/etc/apache2/sites-available/25-rspec.example.com.conf',
+        )
+      }
     end
-    context "on FreeBSD systems" do
+    context 'on FreeBSD systems' do
       let :default_facts do
         {
-          :osfamily               => 'FreeBSD',
-          :operatingsystemrelease => '9',
-          :operatingsystem        => 'FreeBSD',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'FreeBSD',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          osfamily: 'FreeBSD',
+          operatingsystemrelease: '9',
+          operatingsystem: 'FreeBSD',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'FreeBSD',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
         }
       end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { is_expected.to contain_file("apache_rspec.example.com").with(
-        :ensure  => 'present',
-        :content => 'foobar',
-        :path    => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf',
-      ) }
+      let(:params) { default_params }
+      let(:facts) { default_facts }
+
+      it {
+        is_expected.to contain_file('apache_rspec.example.com').with(
+          ensure: 'present',
+          content: 'foobar',
+          path: '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf',
+        )
+      }
     end
-    context "on Gentoo systems" do
+    context 'on Gentoo systems' do
       let :default_facts do
         {
-          :osfamily               => 'Gentoo',
-          :operatingsystem        => 'Gentoo',
-          :operatingsystemrelease => '3.16.1-gentoo',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          :is_pe                  => false,
+          osfamily: 'Gentoo',
+          operatingsystem: 'Gentoo',
+          operatingsystemrelease: '3.16.1-gentoo',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          is_pe: false,
         }
       end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { is_expected.to contain_file("apache_rspec.example.com").with(
-        :ensure  => 'present',
-        :content => 'foobar',
-        :path    => '/etc/apache2/vhosts.d/25-rspec.example.com.conf',
-      ) }
+      let(:params) { default_params }
+      let(:facts) { default_facts }
+
+      it {
+        is_expected.to contain_file('apache_rspec.example.com').with(
+          ensure: 'present',
+          content: 'foobar',
+          path: '/etc/apache2/vhosts.d/25-rspec.example.com.conf',
+        )
+      }
     end
   end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 24ef712304..8edc95eece 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'apache::vhost', :type => :define do
+describe 'apache::vhost', type: :define do
   let :pre_condition do
     'class { "apache": default_vhost => false, default_mods => false, vhost_enable_dir => "/etc/apache2/sites-enabled"}'
   end
@@ -9,120 +9,135 @@
   end
   let :default_params do
     {
-      :docroot => '/rspec/docroot',
-      :port    => '84',
+      docroot: '/rspec/docroot',
+      port: '84',
     }
   end
+
   describe 'os-dependent items' do
-    context "on RedHat based systems" do
+    context 'on RedHat based systems' do
       let :default_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',
-          :is_pe                  => false,
+          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',
+          is_pe: false,
         }
       end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_class("apache::params") }
+      let(:params) { default_params }
+      let(:facts) { default_facts }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::params') }
     end
-    context "on Debian based systems" do
+    context 'on Debian based systems' do
       let :default_facts do
         {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
-        :ensure => 'present',
-        :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
-      ) }
-      it { is_expected.to contain_file("25-rspec.example.com.conf symlink").with(
-        :ensure => 'link',
-        :path   => '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
-        :target => '/etc/apache2/sites-available/25-rspec.example.com.conf'
-      ) }
+          osfamily: 'Debian',
+          operatingsystemrelease: '6',
+          concat_basedir: '/dne',
+          lsbdistcodename: 'squeeze',
+          operatingsystem: 'Debian',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+      let(:params) { default_params }
+      let(:facts) { default_facts }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::params') }
+      it {
+        is_expected.to contain_concat('25-rspec.example.com.conf').with(
+          ensure: 'present',
+          path: '/etc/apache2/sites-available/25-rspec.example.com.conf',
+        )
+      }
+      it {
+        is_expected.to contain_file('25-rspec.example.com.conf symlink').with(
+          ensure: 'link',
+          path: '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
+          target: '/etc/apache2/sites-available/25-rspec.example.com.conf',
+        )
+      }
     end
-    context "on FreeBSD systems" do
+    context 'on FreeBSD systems' do
       let :default_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',
-          :is_pe                  => false,
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
-        :ensure => 'present',
-        :path   => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf'
-      ) }
+          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',
+          is_pe: false,
+        }
+      end
+      let(:params) { default_params }
+      let(:facts) { default_facts }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::params') }
+      it {
+        is_expected.to contain_concat('25-rspec.example.com.conf').with(
+          ensure: 'present',
+          path: '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf',
+        )
+      }
     end
-    context "on Gentoo systems" do
+    context 'on Gentoo systems' do
       let :default_facts do
         {
-          :osfamily               => 'Gentoo',
-          :operatingsystem        => 'Gentoo',
-          :operatingsystemrelease => '3.16.1-gentoo',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          :is_pe                  => false,
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_class("apache::params") }
-      it { is_expected.to contain_concat("25-rspec.example.com.conf").with(
-        :ensure => 'present',
-        :path   => '/etc/apache2/vhosts.d/25-rspec.example.com.conf'
-      ) }
+          osfamily: 'Gentoo',
+          operatingsystem: 'Gentoo',
+          operatingsystemrelease: '3.16.1-gentoo',
+          concat_basedir: '/dne',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          is_pe: false,
+        }
+      end
+      let(:params) { default_params }
+      let(:facts) { default_facts }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::params') }
+      it {
+        is_expected.to contain_concat('25-rspec.example.com.conf').with(
+          ensure: 'present',
+          path: '/etc/apache2/vhosts.d/25-rspec.example.com.conf',
+        )
+      }
     end
   end
   describe 'os-independent items' do
     let :facts do
       {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :is_pe                  => false,
+        osfamily: 'Debian',
+        operatingsystemrelease: '6',
+        concat_basedir: '/dne',
+        lsbdistcodename: 'squeeze',
+        operatingsystem: 'Debian',
+        id: 'root',
+        kernel: 'Linux',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
       }
     end
+
     describe 'basic assumptions' do
-      let :params do default_params end
-      it { is_expected.to contain_class("apache") }
-      it { is_expected.to contain_class("apache::params") }
+      let(:params) { default_params }
+
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__listen(params[:port]) }
       it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
     end
@@ -186,12 +201,12 @@
             {
               'path'     => '/var/www/files',
               'provider' => 'files',
-              'require'  => [ 'valid-user', 'all denied', ],
+              'require'  => ['valid-user', 'all denied'],
             },
             {
-                'path'     => '/var/www/files',
-                'provider' => 'files',
-                'additional_includes'  => [ '/custom/path/includes', '/custom/path/another_includes', ],
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'additional_includes' => ['/custom/path/includes', '/custom/path/another_includes'],
             },
             {
               'path'     => '/var/www/files',
@@ -231,34 +246,27 @@
             },
             { 'path'              => '/var/www/files/indexed_directory',
               'directoryindex'    => 'disabled',
-              'options'           => ['Indexes','FollowSymLinks','MultiViews'],
+              'options'           => %w[Indexes FollowSymLinks MultiViews],
               'index_options'     => ['FancyIndexing'],
-              'index_style_sheet' => '/styles/style.css',
-            },
+              'index_style_sheet' => '/styles/style.css' },
             { 'path'              => '/var/www/files/output_filtered',
-              'set_output_filter' => 'output_filter',
-            },
+              'set_output_filter' => 'output_filter' },
             { 'path'     => '/var/www/files',
               'provider' => 'location',
               'limit'    => [
                 { 'methods' => 'GET HEAD',
-                  'require' => ['valid-user']
-                },
-              ],
-            },
+                  'require' => ['valid-user'] },
+              ] },
             { 'path'         => '/var/www/files',
               'provider'     => 'location',
               'limit_except' => [
                 { 'methods' => 'GET HEAD',
-                  'require' => ['valid-user']
-                },
-              ],
-            },
+                  'require' => ['valid-user'] },
+              ] },
             { 'path'               => '/var/www/dav',
               'dav'                => 'filesystem',
               'dav_depth_infinity' => true,
-              'dav_min_timeout'    => '600',
-            },
+              'dav_min_timeout'    => '600' },
           ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
@@ -281,45 +289,45 @@
             {
               'path'            => '/a',
               'url'             => 'http://backend-a/',
-              'keywords'        => ['noquery', 'interpolate'],
+              'keywords'        => %w[noquery interpolate],
               'no_proxy_uris'       => ['/a/foo', '/a/bar'],
               'no_proxy_uris_match' => ['/a/foomatch'],
               'reverse_cookies' => [
-								{
-                  'path'          => '/a',
-                  'url'           => 'http://backend-a/',
+                {
+                  'path' => '/a',
+                  'url' => 'http://backend-a/',
                 },
                 {
                   'domain' => 'foo',
                   'url'    => 'http://foo',
-                }
+                },
               ],
-              'params'          => {
-                      'retry'   => '0',
-                      'timeout' => '5'
+              'params' => {
+                'retry'   => '0',
+                'timeout' => '5',
               },
-              'setenv'   => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'],
-            }
+              'setenv'   => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
+            },
           ],
-          'proxy_pass_match'            => [
+          'proxy_pass_match' => [
             {
               'path'     => '/a',
               'url'      => 'http://backend-a/',
-              'keywords' => ['noquery', 'interpolate'],
+              'keywords' => %w[noquery interpolate],
               'no_proxy_uris'       => ['/a/foo', '/a/bar'],
               'no_proxy_uris_match' => ['/a/foomatch'],
-              'params'   => {
-                      'retry'   => '0',
-                      'timeout' => '5'
+              'params' => {
+                'retry'   => '0',
+                'timeout' => '5',
               },
-              'setenv'   => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'],
-            }
+              'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
+            },
           ],
           'suphp_addhandler'            => 'foo',
           'suphp_engine'                => 'on',
           'suphp_configpath'            => '/var/www/html',
-          'php_admin_flags'             => ['foo', 'bar'],
-          'php_admin_values'            => ['true', 'false'],
+          'php_admin_flags'             => %w[foo bar],
+          'php_admin_values'            => %w[true false],
           'no_proxy_uris'               => '/foo',
           'no_proxy_uris_match'         => '/foomatch',
           'proxy_preserve_host'         => true,
@@ -337,10 +345,10 @@
           'request_headers'             => ['append MirrorID "mirror 12"'],
           'rewrites'                    => [
             {
-              'rewrite_rule' => ['^index\.html$ welcome.html']
-            }
+              'rewrite_rule' => ['^index\.html$ welcome.html'],
+            },
           ],
-          'filters'                     => [
+          'filters' => [
             'FilterDeclare COMPRESS',
             'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/html',
             'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/css',
@@ -367,20 +375,20 @@
           'wsgi_import_script'          => '/var/www/demo.wsgi',
           'wsgi_import_script_options'  => {
             'process-group'     => 'wsgi',
-            'application-group' => '%{GLOBAL}'
+            'application-group' => '%{GLOBAL}',
           },
           'wsgi_process_group'          => 'wsgi',
           'wsgi_script_aliases'         => {
-            '/' => '/var/www/demo.wsgi'
+            '/' => '/var/www/demo.wsgi',
           },
-          'wsgi_script_aliases_match'   => {
-            '^/test/(^[/*)' => '/var/www/demo.wsgi'
+          'wsgi_script_aliases_match' => {
+            '^/test/(^[/*)' => '/var/www/demo.wsgi',
           },
           'wsgi_pass_authorization'     => 'On',
           'custom_fragment'             => '#custom string',
           'itk'                         => {
             'user'  => 'someuser',
-            'group' => 'somegroup'
+            'group' => 'somegroup',
           },
           'wsgi_chunked_request'        => 'On',
           'action'                      => 'foo',
@@ -409,17 +417,17 @@
           'passenger_startup_file'      => 'bin/www',
           'add_default_charset'         => 'UTF-8',
           'jk_mounts'                   => [
-            { 'mount'   => '/*',     'worker' => 'tcnode1', },
-            { 'unmount' => '/*.jpg', 'worker' => 'tcnode1', },
+            { 'mount'   => '/*',     'worker' => 'tcnode1' },
+            { 'unmount' => '/*.jpg', 'worker' => 'tcnode1' },
           ],
           'auth_kerb'                   => true,
           'krb_method_negotiate'        => 'off',
           'krb_method_k5passwd'         => 'off',
           'krb_authoritative'           => 'off',
-          'krb_auth_realms'             => ['EXAMPLE.ORG','EXAMPLE.NET'],
+          'krb_auth_realms'             => ['EXAMPLE.ORG', 'EXAMPLE.NET'],
           'krb_5keytab'                 => '/tmp/keytab5',
           'krb_local_user_mapping'      => 'off',
-	  'http_protocol_options'       => 'Strict LenientMethods Allow0.9',
+          'http_protocol_options' => 'Strict LenientMethods Allow0.9',
           'keepalive'                   => 'on',
           'keepalive_timeout'           => '100',
           'max_keepalive_requests'      => '1000',
@@ -427,59 +435,63 @@
       end
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :kernelversion          => '3.6.2',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          kernelversion: '3.6.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
-      it { is_expected.to_not contain_file('/var/www/foo') }
+      it { is_expected.not_to contain_file('/var/www/foo') }
       it { is_expected.to contain_class('apache::mod::ssl') }
-      it { is_expected.to contain_file('ssl.conf').with(
-        :content => /^\s+SSLHonorCipherOrder On$/ ) }
-      it { is_expected.to contain_file('ssl.conf').with(
-        :content => /^\s+SSLPassPhraseDialog builtin$/ ) }
-      it { is_expected.to contain_file('ssl.conf').with(
-        :content => /^\s+SSLSessionCacheTimeout 300$/ ) }
+      it {
+        is_expected.to contain_file('ssl.conf').with(
+          content: %r{^\s+SSLHonorCipherOrder On$},
+        )
+      }
+      it {
+        is_expected.to contain_file('ssl.conf').with(
+          content: %r{^\s+SSLPassPhraseDialog builtin$},
+        )
+      }
+      it {
+        is_expected.to contain_file('ssl.conf').with(
+          content: %r{^\s+SSLSessionCacheTimeout 300$},
+        )
+      }
       it { is_expected.to contain_class('apache::mod::mime') }
       it { is_expected.to contain_class('apache::mod::vhost_alias') }
       it { is_expected.to contain_class('apache::mod::wsgi') }
       it { is_expected.to contain_class('apache::mod::suexec') }
       it { is_expected.to contain_class('apache::mod::passenger') }
-      it { is_expected.to contain_file('/var/www/logs').with({
-        'ensure' => 'directory',
-        'mode'   => '0600',
-      })
+      it {
+        is_expected.to contain_file('/var/www/logs').with('ensure' => 'directory',
+                                                          'mode' => '0600')
       }
       it { is_expected.to contain_class('apache::mod::rewrite') }
       it { is_expected.to contain_class('apache::mod::alias') }
       it { is_expected.to contain_class('apache::mod::proxy') }
       it { is_expected.to contain_class('apache::mod::proxy_http') }
-      it { is_expected.to contain_class('apache::mod::passenger') }
-      it { is_expected.to contain_class('apache::mod::passenger') }
       it { is_expected.to contain_class('apache::mod::fastcgi') }
       it { is_expected.to contain_class('apache::mod::headers') }
       it { is_expected.to contain_class('apache::mod::filter') }
       it { is_expected.to contain_class('apache::mod::env') }
       it { is_expected.to contain_class('apache::mod::setenvif') }
-      it { is_expected.to contain_concat('30-rspec.example.com.conf').with({
-        'owner'   => 'root',
-        'mode'    => '0644',
-        'require' => 'Package[httpd]',
-        'notify'  => 'Class[Apache::Service]',
-      })
-      }
-      it { is_expected.to contain_file('30-rspec.example.com.conf symlink').with({
-        'ensure' => 'link',
-        'path'   => '/etc/apache2/sites-enabled/30-rspec.example.com.conf',
-      })
+      it {
+        is_expected.to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
+                                                                        'mode'    => '0644',
+                                                                        'require' => 'Package[httpd]',
+                                                                        'notify'  => 'Class[Apache::Service]')
+      }
+      it {
+        is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
+                                                                              'path' => '/etc/apache2/sites-enabled/30-rspec.example.com.conf')
       }
       it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
@@ -487,125 +499,278 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<Proxy "\*">$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Include\s'\/custom\/path\/includes'$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          :content => /^\s+Include\s'\/custom\/path\/another_includes'$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require valid-user$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require all denied$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require all granted$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<RequireAll>$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<\/RequireAll>$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require all-valid1$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require all-valid2$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<RequireNone>$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<\/RequireNone>$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require none-valid1$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require none-valid2$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<RequireAny>$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<\/RequireAny>$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require any-valid1$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require any-valid2$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+IndexOptions\sFancyIndexing$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+IndexStyleSheet\s'\/styles\/style\.css'$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+DirectoryIndex\sdisabled$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+SetOutputFilter\soutput_filter$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<Limit GET HEAD>$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>/m ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+<LimitExcept GET HEAD>$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/LimitExcept>/m ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Dav\sfilesystem$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+DavDepthInfinity\sOn$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+DavMinTimeout\s600$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<Proxy "\*">$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Include\s'\/custom\/path\/includes'$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Include\s'\/custom\/path\/another_includes'$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require valid-user$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require all denied$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require all granted$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<RequireAll>$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<\/RequireAll>$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require all-valid1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require all-valid2$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<RequireNone>$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<\/RequireNone>$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require none-valid1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require none-valid2$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<RequireAny>$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<\/RequireAny>$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require any-valid1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require any-valid2$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+IndexOptions\sFancyIndexing$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+IndexStyleSheet\s'\/styles\/style\.css'$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+DirectoryIndex\sdisabled$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+SetOutputFilter\soutput_filter$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<Limit GET HEAD>$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>}m,
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+<LimitExcept GET HEAD>$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/LimitExcept>}m,
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Dav\sfilesystem$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+DavDepthInfinity\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+DavMinTimeout\s600$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-access_log') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-access_log') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /retry=0/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /timeout=5/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /SetEnv force-proxy-request-1.0 1/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /SetEnv proxy-nokeepalive 1/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /noquery interpolate/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /ProxyPreserveHost On/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /ProxyAddHeaders On/) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /ProxyPassReverseCookiePath\s+\/a\s+http:\/\//) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo/) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{retry=0},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{timeout=5},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{SetEnv force-proxy-request-1.0 1},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{SetEnv proxy-nokeepalive 1},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{noquery interpolate},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{ProxyPreserveHost On},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{ProxyAddHeaders On},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{ProxyPassReverseCookiePath\s+\/a\s+http:\/\/},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
-        :content => /^\s+RewriteOptions Inherit$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
+          content: %r{^\s+RewriteOptions Inherit$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-              %r{SetEnv FOO=/bin/true}) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-              %r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif}) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-              %r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true}) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+          %r{SetEnv FOO=/bin/true},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+          %r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+          %r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
-        :content => /^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+          content: %r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-        :content => /^\s+SSLProxyEngine On$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-        :content => /^\s+SSLProxyCheckPeerCN\s+on$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-        :content => /^\s+SSLProxyCheckPeerName\s+on$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-        :content => /^\s+SSLProxyCheckPeerExpire\s+on$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-        :content => /^\s+SSLProxyCipherSuite\s+HIGH$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-        :content => /^\s+SSLProxyProtocol\s+TLSv1.2$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+          content: %r{^\s+SSLProxyEngine On$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+          content: %r{^\s+SSLProxyCheckPeerCN\s+on$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+          content: %r{^\s+SSLProxyCheckPeerName\s+on$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+          content: %r{^\s+SSLProxyCheckPeerExpire\s+on$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+          content: %r{^\s+SSLProxyCipherSuite\s+HIGH$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+          content: %r{^\s+SSLProxyProtocol\s+TLSv1.2$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
-        :content => /^\s+FilterDeclare COMPRESS$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
+          content: %r{^\s+FilterDeclare COMPRESS$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
@@ -614,144 +779,195 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-security') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-security') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
-        :content => /^\s+JkMount\s+\/\*\s+tcnode1$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
-        :content => /^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-        :content => /^\s+KrbMethodNegotiate\soff$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-        :content => /^\s+KrbAuthoritative\soff$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-        :content => /^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-        :content => /^\s+Krb5Keytab\s\/tmp\/keytab5$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-        :content => /^\s+KrbLocalUserMapping\soff$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-        :content => /^\s+KrbServiceName\sHTTP$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-        :content => /^\s+KrbSaveCredentials\soff$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-        :content => /^\s+KrbVerifyKDC\son$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
-        :content => /^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-        :content => /^\s+KeepAlive\son$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-        :content => /^\s+KeepAliveTimeout\s100$/)}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-        :content => /^\s+MaxKeepAliveRequests\s1000$/)}
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
+          content: %r{^\s+JkMount\s+\/\*\s+tcnode1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
+          content: %r{^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+          content: %r{^\s+KrbMethodNegotiate\soff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+          content: %r{^\s+KrbAuthoritative\soff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+          content: %r{^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+          content: %r{^\s+Krb5Keytab\s\/tmp\/keytab5$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+          content: %r{^\s+KrbLocalUserMapping\soff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+          content: %r{^\s+KrbServiceName\sHTTP$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+          content: %r{^\s+KrbSaveCredentials\soff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+          content: %r{^\s+KrbVerifyKDC\son$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
+          content: %r{^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+          content: %r{^\s+KeepAlive\son$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+          content: %r{^\s+KeepAliveTimeout\s100$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+          content: %r{^\s+MaxKeepAliveRequests\s1000$},
+        )
+      }
     end
     context 'vhost with multiple ip addresses' do
       let :params do
         {
           'port'                        => '80',
-          'ip'                          => ['127.0.0.1','::1'],
+          'ip'                          => ['127.0.0.1', '::1'],
           'ip_based'                    => true,
           'servername'                  => 'example.com',
           'docroot'                     => '/var/www/html',
           'add_listen'                  => true,
-          'ensure'                      => 'present'
+          'ensure'                      => 'present',
         }
       end
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :kernelversion          => '3.6.2',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          kernelversion: '3.6.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-        :content => /[.\/m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[.\/m]*$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+          content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[.\/m]*$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
       it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
     end
 
     context 'vhost with multiple ports' do
       let :params do
         {
-          'port'                        => ['80', '8080'],
+          'port'                        => %w[80 8080],
           'ip'                          => '127.0.0.1',
           'ip_based'                    => true,
           'servername'                  => 'example.com',
           'docroot'                     => '/var/www/html',
           'add_listen'                  => true,
-          'ensure'                      => 'present'
+          'ensure'                      => 'present',
         }
       end
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :kernelversion          => '3.6.2',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          kernelversion: '3.6.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-        :content => /[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[.\/m]*$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+          content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[.\/m]*$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
       it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
     end
 
     context 'vhost with multiple ip addresses, multiple ports' do
       let :params do
         {
-          'port'                        => ['80', '8080'],
-          'ip'                          => ['127.0.0.1','::1'],
+          'port'                        => %w[80 8080],
+          'ip'                          => ['127.0.0.1', '::1'],
           'ip_based'                    => true,
           'servername'                  => 'example.com',
           'docroot'                     => '/var/www/html',
           'add_listen'                  => true,
-          'ensure'                      => 'present'
+          'ensure'                      => 'present',
         }
       end
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :kernelversion          => '3.6.2',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          kernelversion: '3.6.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-        :content => /[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[.\/m]*$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+          content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[.\/m]*$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
       it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
       it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
       it { is_expected.to contain_concat__fragment('Listen [::1]:8080') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:8080') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:8080') }
     end
 
     context 'vhost with ipv6 address' do
@@ -763,28 +979,31 @@
           'servername'                  => 'example.com',
           'docroot'                     => '/var/www/html',
           'add_listen'                  => true,
-          'ensure'                      => 'present'
+          'ensure'                      => 'present',
         }
       end
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :kernelversion          => '3.6.2',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          kernelversion: '3.6.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-        :content => /[.\/m]*<VirtualHost \[::1\]:80>[.\/m]*$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+          content: %r{[.\/m]*<VirtualHost \[::1\]:80>[.\/m]*$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
     end
 
     context 'vhost with wildcard ip address' do
@@ -796,28 +1015,31 @@
           'servername'                  => 'example.com',
           'docroot'                     => '/var/www/html',
           'add_listen'                  => true,
-          'ensure'                      => 'present'
+          'ensure'                      => 'present',
         }
       end
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :kernelversion          => '3.6.2',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          kernelversion: '3.6.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-        :content => /[.\/m]*<VirtualHost \*:80>[.\/m]*$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+          content: %r{[.\/m]*<VirtualHost \*:80>[.\/m]*$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('Listen *:80') }
-      it { is_expected.to_not contain_concat__fragment('NameVirtualHost *:80') }
+      it { is_expected.not_to contain_concat__fragment('NameVirtualHost *:80') }
     end
 
     context 'modsec_audit_log' do
@@ -827,9 +1049,13 @@
           'modsec_audit_log' => true,
         }
       end
+
       it { is_expected.to compile }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-security').with(
-        :content => /^\s*SecAuditLog "\/var\/log\/apache2\/rspec\.example\.com_security\.log"$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+          content: %r{^\s*SecAuditLog "\/var\/log\/apache2\/rspec\.example\.com_security\.log"$},
+        )
+      }
     end
     context 'modsec_audit_log_file' do
       let :params do
@@ -838,9 +1064,13 @@
           'modsec_audit_log_file' => 'foo.log',
         }
       end
+
       it { is_expected.to compile }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-security').with(
-        :content => /\s*SecAuditLog "\/var\/log\/apache2\/foo.log"$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+          content: %r{\s*SecAuditLog "\/var\/log\/apache2\/foo.log"$},
+        )
+      }
     end
     context 'set only aliases' do
       let :params do
@@ -851,35 +1081,41 @@
               'alias' => '/alias',
               'path'  => '/rspec/docroot',
             },
-          ]
+          ],
         }
       end
-      it { is_expected.to contain_class('apache::mod::alias')}
+
+      it { is_expected.to contain_class('apache::mod::alias') }
     end
     context 'proxy_pass_match' do
       let :params do
         {
-          'docroot'          => '/rspec/docroot',
-          'proxy_pass_match'            => [
+          'docroot' => '/rspec/docroot',
+          'proxy_pass_match' => [
             {
               'path'     => '.*',
               'url'      => 'http://backend-a/',
               'params'   => { 'timeout' => 300 },
-            }
+            },
           ],
         }
       end
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              /ProxyPassMatch .* http:\/\/backend-a\/ timeout=300/).with_content(/## Proxy rules/) }
+
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+          %r{ProxyPassMatch .* http:\/\/backend-a\/ timeout=300},
+        ).with_content(%r{## Proxy rules})
+      }
     end
     context 'proxy_dest_match' do
       let :params do
         {
           'docroot'          => '/rspec/docroot',
-          'proxy_dest_match' => '/'
+          'proxy_dest_match' => '/',
         }
       end
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(/## Proxy rules/) }
+
+      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{## Proxy rules}) }
     end
     context 'not everything can be set together...' do
       let :params do
@@ -895,8 +1131,8 @@
             {
               'path'     => '/var/www/files',
               'provider' => 'files',
-              'allow'    => [ 'from 127.0.0.1', 'from 127.0.0.2', ],
-              'deny'     => [ 'from 127.0.0.3', 'from 127.0.0.4', ],
+              'allow'    => ['from 127.0.0.1', 'from 127.0.0.2'],
+              'deny'     => ['from 127.0.0.3', 'from 127.0.0.4'],
               'satisfy'  => 'any',
             },
             {
@@ -912,179 +1148,209 @@
       end
       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',
-          :kernelversion          => '3.6.2',
-          :is_pe                  => false,
+          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',
+          kernelversion: '3.6.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
-      it { is_expected.to_not contain_class('apache::mod::ssl') }
-      it { is_expected.to_not contain_class('apache::mod::mime') }
-      it { is_expected.to_not contain_class('apache::mod::vhost_alias') }
-      it { is_expected.to_not contain_class('apache::mod::wsgi') }
-      it { is_expected.to_not contain_class('apache::mod::passenger') }
-      it { is_expected.to_not contain_class('apache::mod::suexec') }
-      it { is_expected.to_not contain_class('apache::mod::rewrite') }
-      it { is_expected.to_not contain_class('apache::mod::alias') }
-      it { is_expected.to_not contain_class('apache::mod::proxy') }
-      it { is_expected.to_not contain_class('apache::mod::proxy_http') }
-      it { is_expected.to_not contain_class('apache::mod::passenger') }
-      it { is_expected.to_not contain_class('apache::mod::headers') }
+      it { is_expected.not_to contain_class('apache::mod::ssl') }
+      it { is_expected.not_to contain_class('apache::mod::mime') }
+      it { is_expected.not_to contain_class('apache::mod::vhost_alias') }
+      it { is_expected.not_to contain_class('apache::mod::wsgi') }
+      it { is_expected.not_to contain_class('apache::mod::passenger') }
+      it { is_expected.not_to contain_class('apache::mod::suexec') }
+      it { is_expected.not_to contain_class('apache::mod::rewrite') }
+      it { is_expected.not_to contain_class('apache::mod::alias') }
+      it { is_expected.not_to contain_class('apache::mod::proxy') }
+      it { is_expected.not_to contain_class('apache::mod::proxy_http') }
+      it { is_expected.not_to contain_class('apache::mod::headers') }
       it { is_expected.to contain_file('/var/www/foo') }
-      it { is_expected.to contain_file('/tmp/logroot').with({
-        'ensure' => 'absent',
-      })
+      it {
+        is_expected.to contain_file('/tmp/logroot').with('ensure' => 'absent')
       }
-      it { is_expected.to contain_concat('25-rspec.example.com.conf').with({
-        'ensure' => 'absent',
-      })
+      it {
+        is_expected.to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
       }
       it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-aliases') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-itk') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-fallbackresource') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-aliases') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-itk') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-fallbackresource') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Allow from 127\.0\.0\.1$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Allow from 127\.0\.0\.2$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Allow from 127\.0\.0\.5$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Deny from 127\.0\.0\.3$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Deny from 127\.0\.0\.4$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Deny from all$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Satisfy any$/ ) }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Order deny,allow$/ ) }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-additional_includes') }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Allow from 127\.0\.0\.1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Allow from 127\.0\.0\.2$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Allow from 127\.0\.0\.5$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Deny from 127\.0\.0\.3$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Deny from 127\.0\.0\.4$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Deny from all$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Satisfy any$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Order deny,allow$},
+        )
+      }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-access_log') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-action') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-block') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-error_document') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-proxy') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-rack') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-redirect') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-rewrite') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-scriptalias') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-serveralias') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-setenv') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-ssl') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-sslproxy') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-suphp') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-php_admin') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-header') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-requestheader') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-wsgi') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-custom_fragment') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-fastcgi') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-suexec') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-charsets') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-limits') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-action') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-block') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-error_document') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-proxy') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-rack') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-redirect') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-scriptalias') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-serveralias') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-setenv') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-suphp') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-php_admin') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-header') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-requestheader') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-wsgi') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-custom_fragment') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-fastcgi') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-suexec') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-charsets') }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-limits') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
     context 'wsgi_application_group should set apache::mod::wsgi' do
       let :params do
         {
-            'docroot'                    => '/rspec/docroot',
-            'wsgi_application_group'     => '%{GLOBAL}',
+          'docroot'                    => '/rspec/docroot',
+          'wsgi_application_group'     => '%{GLOBAL}',
         }
       end
-      it { is_expected.to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.to contain_class('apache::mod::wsgi') }
     end
     context 'wsgi_daemon_process should set apache::mod::wsgi' do
       let :params do
         {
-           'docroot'                    => '/rspec/docroot',
-           'wsgi_daemon_process'        => 'wsgi',
+          'docroot'                    => '/rspec/docroot',
+          'wsgi_daemon_process' => 'wsgi',
         }
       end
-      it { is_expected.to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.to contain_class('apache::mod::wsgi') }
     end
     context 'wsgi_import_script on its own should not set apache::mod::wsgi' do
       let :params do
         {
-            'docroot'                    => '/rspec/docroot',
-            'wsgi_import_script'         => '/var/www/demo.wsgi',
+          'docroot'                    => '/rspec/docroot',
+          'wsgi_import_script'         => '/var/www/demo.wsgi',
         }
       end
-      it { is_expected.not_to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.not_to contain_class('apache::mod::wsgi') }
     end
     context 'wsgi_import_script_options on its own should not set apache::mod::wsgi' do
       let :params do
         {
-            'docroot'                     => '/rspec/docroot',
-            'wsgi_import_script_options'  => {
-                'process-group'           => 'wsgi',
-                'application-group'       => '%{GLOBAL}'
-            },
+          'docroot' => '/rspec/docroot',
+          'wsgi_import_script_options' => {
+            'process-group'           => 'wsgi',
+            'application-group'       => '%{GLOBAL}',
+          },
         }
       end
-      it { is_expected.not_to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.not_to contain_class('apache::mod::wsgi') }
     end
     context 'wsgi_import_script and wsgi_import_script_options should set apache::mod::wsgi' do
       let :params do
         {
-            'docroot'                     => '/rspec/docroot',
-            'wsgi_import_script'          => '/var/www/demo.wsgi',
-            'wsgi_import_script_options'  => {
-                'process-group'           => 'wsgi',
-                'application-group'       => '%{GLOBAL}'
-            },
+          'docroot'                     => '/rspec/docroot',
+          'wsgi_import_script'          => '/var/www/demo.wsgi',
+          'wsgi_import_script_options'  => {
+            'process-group'           => 'wsgi',
+            'application-group'       => '%{GLOBAL}',
+          },
         }
       end
-      it { is_expected.to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.to contain_class('apache::mod::wsgi') }
     end
     context 'wsgi_process_group should set apache::mod::wsgi' do
       let :params do
         {
-            'docroot'                    => '/rspec/docroot',
-            'wsgi_daemon_process'        => 'wsgi',
+          'docroot'                    => '/rspec/docroot',
+          'wsgi_daemon_process'        => 'wsgi',
         }
       end
-      it { is_expected.to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.to contain_class('apache::mod::wsgi') }
     end
     context 'wsgi_script_aliases with non-empty aliases should set apache::mod::wsgi' do
       let :params do
         {
-            'docroot'                    => '/rspec/docroot',
-            'wsgi_script_aliases'        => {
-                '/' => '/var/www/demo.wsgi'
-            },
+          'docroot'                    => '/rspec/docroot',
+          'wsgi_script_aliases'        => {
+            '/' => '/var/www/demo.wsgi',
+          },
         }
       end
-      it { is_expected.to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.to contain_class('apache::mod::wsgi') }
     end
     context 'wsgi_script_aliases with empty aliases should set apache::mod::wsgi' do
       let :params do
         {
-            'docroot'                    => '/rspec/docroot',
-            'wsgi_script_aliases'        => { },
+          'docroot'                    => '/rspec/docroot',
+          'wsgi_script_aliases'        => {},
         }
       end
-      it { is_expected.not_to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.not_to contain_class('apache::mod::wsgi') }
     end
     context 'wsgi_pass_authorization should set apache::mod::wsgi' do
       let :params do
         {
-            'docroot'                    => '/rspec/docroot',
-            'wsgi_pass_authorization'    => 'On',
+          'docroot'                    => '/rspec/docroot',
+          'wsgi_pass_authorization'    => 'On',
         }
       end
-      it { is_expected.to contain_class("apache::mod::wsgi") }
+
+      it { is_expected.to contain_class('apache::mod::wsgi') }
     end
     context 'when not setting nor managing the docroot' do
       let :params do
@@ -1093,6 +1359,7 @@
           'manage_docroot'              => false,
         }
       end
+
       it { is_expected.to compile }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
     end
@@ -1104,6 +1371,7 @@
           'ssl_proxyengine' => true,
         }
       end
+
       it { is_expected.to compile }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
@@ -1117,6 +1385,7 @@
           'ssl_proxy_protocol' => 'TLSv1.2',
         }
       end
+
       it { is_expected.to compile }
       it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
@@ -1125,16 +1394,17 @@
   describe 'access logs' 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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
+
     context 'single log file' do
       let(:params) do
         {
@@ -1142,21 +1412,27 @@
           'access_log_file' => 'my_log_file',
         }
       end
-      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-        :content => /^\s+CustomLog.*my_log_file" combined\s*$/
-      )}
+
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+          content: %r{^\s+CustomLog.*my_log_file" combined\s*$},
+        )
+      }
     end
     context 'single log file with environment' do
       let(:params) do
         {
           'docroot'            => '/rspec/docroot',
           'access_log_file'    => 'my_log_file',
-          'access_log_env_var' => 'prod'
+          'access_log_env_var' => 'prod',
         }
       end
-      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-        :content => /^\s+CustomLog.*my_log_file" combined\s+env=prod$/
-      )}
+
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+          content: %r{^\s+CustomLog.*my_log_file" combined\s+env=prod$},
+        )
+      }
     end
     context 'multiple log files' do
       let(:params) do
@@ -1165,34 +1441,42 @@
           'access_logs' => [
             { 'file' => '/tmp/log1', 'env' => 'dev' },
             { 'file' => 'log2' },
-            { 'syslog' => 'syslog', 'format' => '%h %l' }
+            { 'syslog' => 'syslog', 'format' => '%h %l' },
           ],
         }
       end
-      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-        :content => /^\s+CustomLog "\/tmp\/log1"\s+combined\s+env=dev$/
-      )}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-        :content => /^\s+CustomLog "\/var\/log\/httpd\/log2"\s+combined\s*$/
-      )}
-      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-        :content => /^\s+CustomLog "syslog" "%h %l"\s*$/
-      )}
+
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+          content: %r{^\s+CustomLog "\/tmp\/log1"\s+combined\s+env=dev$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+          content: %r{^\s+CustomLog "\/var\/log\/httpd\/log2"\s+combined\s*$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+          content: %r{^\s+CustomLog "syslog" "%h %l"\s*$},
+        )
+      }
     end
   end # access logs
   describe 'validation' do
     let :default_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',
-        :is_pe                  => false,
+        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',
+        is_pe: false,
       }
     end
+
     context 'bad ensure' do
       let :params do
         {
@@ -1200,7 +1484,8 @@
           'ensure'  => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad suphp_engine' do
@@ -1210,7 +1495,8 @@
           'suphp_engine' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad ip_based' do
@@ -1220,7 +1506,8 @@
           'ip_based' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad access_log' do
@@ -1230,7 +1517,8 @@
           'access_log' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad error_log' do
@@ -1240,7 +1528,8 @@
           'error_log' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad_ssl' do
@@ -1250,7 +1539,8 @@
           'ssl'     => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad default_vhost' do
@@ -1260,7 +1550,8 @@
           'default_vhost' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad ssl_proxyengine' do
@@ -1270,7 +1561,8 @@
           'ssl_proxyengine' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad rewrites' do
@@ -1280,7 +1572,8 @@
           'rewrites' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad rewrites 2' do
@@ -1290,7 +1583,8 @@
           'rewrites' => ['bogus'],
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'empty rewrites' do
@@ -1300,7 +1594,8 @@
           'rewrites' => [],
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to compile }
     end
     context 'bad suexec_user_group' do
@@ -1310,7 +1605,8 @@
           'suexec_user_group' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad wsgi_script_alias' do
@@ -1320,7 +1616,8 @@
           'wsgi_script_alias' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad wsgi_daemon_process_options' do
@@ -1330,7 +1627,8 @@
           'wsgi_daemon_process_options' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad wsgi_import_script_alias' do
@@ -1340,7 +1638,8 @@
           'wsgi_import_script_alias' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad itk' do
@@ -1350,7 +1649,8 @@
           'itk'     => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad logroot_ensure' do
@@ -1360,7 +1660,8 @@
           'log_level' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad log_level' do
@@ -1370,7 +1671,8 @@
           'log_level' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'access_log_file and access_log_pipe' do
@@ -1381,7 +1683,8 @@
           'access_log_pipe' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'error_log_file and error_log_pipe' do
@@ -1392,7 +1695,8 @@
           'error_log_pipe' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad fallbackresource' do
@@ -1402,7 +1706,8 @@
           'fallbackresource' => 'bogus',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad custom_fragment' do
@@ -1412,7 +1717,8 @@
           'custom_fragment' => true,
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'bad access_logs' do
@@ -1422,7 +1728,8 @@
           'access_logs' => '/var/log/somewhere',
         }
       end
-      let :facts do default_facts end
+      let(:facts) { default_facts }
+
       it { is_expected.to raise_error(Puppet::Error) }
     end
     context 'default of require all granted' do
@@ -1440,23 +1747,26 @@
       end
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :kernelversion          => '3.19.2',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          kernelversion: '3.19.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
       it { is_expected.to contain_concat('25-rspec.example.com.conf') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require all granted$/ ) }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require all granted$},
+        )
+      }
     end
     context 'require unmanaged' do
       let :params do
@@ -1473,59 +1783,67 @@
       end
       let :facts do
         {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :kernelversion          => '3.19.2',
-          :is_pe                  => false,
+          osfamily: 'RedHat',
+          operatingsystemrelease: '7',
+          concat_basedir: '/dne',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          kernelversion: '3.19.2',
+          is_pe: false,
         }
       end
 
       it { is_expected.to compile }
       it { is_expected.to contain_concat('25-rspec.example.com.conf') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-      it { is_expected.to_not contain_concat__fragment('rspec.example.com-directories').with(
-        :content => /^\s+Require all granted$/ )
+      it {
+        is_expected.not_to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+Require all granted$},
+        )
       }
     end
-    describe "redirectmatch_*" do
+    describe 'redirectmatch_*' 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',
-          :is_pe                  => false,
+          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',
+          is_pe: false,
         }
       end
       let :dparams do
         {
-          :docroot => '/rspec/docroot',
-          :port    => '84',
+          docroot: '/rspec/docroot',
+          port: '84',
         }
       end
-      context "status" do
-        let (:params) { dparams.merge({:redirectmatch_status => "404"}) }
-        it { is_expected.to contain_class("apache::mod::alias")}
+
+      # rubocop:disable RSpec/NestedGroups
+      context 'status' do
+        let(:params) { dparams.merge(redirectmatch_status: '404') }
+
+        it { is_expected.to contain_class('apache::mod::alias') }
       end
-      context "dest" do
-        let (:params) { dparams.merge({:redirectmatch_dest => "http://other.example.com$1.jpg"}) }
-        it { is_expected.to contain_class("apache::mod::alias")}
+      context 'dest' do
+        let(:params) { dparams.merge(redirectmatch_dest: 'http://other.example.com$1.jpg') }
+
+        it { is_expected.to contain_class('apache::mod::alias') }
       end
-      context "regexp" do
-        let (:params) { dparams.merge({:redirectmatch_regexp => "(.*)\.gif$"}) }
-        it { is_expected.to contain_class("apache::mod::alias")}
+      context 'regexp' do
+        let(:params) { dparams.merge(redirectmatch_regexp: "(.*)\.gif$") }
+
+        it { is_expected.to contain_class('apache::mod::alias') }
       end
-      context "none" do
-        let (:params) { dparams }
-        it { is_expected.to_not contain_class("apache::mod::alias") }
+      context 'none' do
+        let(:params) { dparams }
+
+        it { is_expected.not_to contain_class('apache::mod::alias') }
       end
     end
   end
diff --git a/spec/functions/apache_pw_hash_spec.rb b/spec/functions/apache_pw_hash_spec.rb
index 5329ca95ef..b8b6812347 100644
--- a/spec/functions/apache_pw_hash_spec.rb
+++ b/spec/functions/apache_pw_hash_spec.rb
@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe 'apache::apache_pw_hash' do
-
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
-  it { is_expected.to run.with_params("").and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params('').and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params(1).and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params(true).and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params({}).and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params([]).and_raise_error(ArgumentError) }
-  it { is_expected.to run.with_params("test").and_return('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=') }
+  it { is_expected.to run.with_params('test').and_return('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=') }
 end
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
index f0376a2019..a0a2b728f9 100644
--- a/spec/functions/bool2httpd_spec.rb
+++ b/spec/functions/bool2httpd_spec.rb
@@ -1,17 +1,16 @@
 require 'spec_helper'
 
 describe 'apache::bool2httpd' do
-
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params(true).and_return('On') }
-  it 'should return a string "On"' do
-    expect(subject.execute(true)).to be_an_instance_of(String)
+  it 'expected to return a string "On"' do
+    expect(subject.execute(true)).to be_an_instance_of(String) # rubocop:disable RSpec/NamedSubject
   end
   it { is_expected.to run.with_params(false).and_return('Off') }
-  it 'should return a string "Off"' do
-    expect(subject.execute(false)).to be_an_instance_of(String)
+  it 'expected to return a string "Off"' do
+    expect(subject.execute(false)).to be_an_instance_of(String) # rubocop:disable RSpec/NamedSubject
   end
   it { is_expected.to run.with_params('mail').and_return('mail') }
   it { is_expected.to run.with_params(nil).and_return('Off') }
diff --git a/spec/functions/validate_apache_log_level_spec.rb b/spec/functions/validate_apache_log_level_spec.rb
index e57a9e287e..be69d0c5dd 100644
--- a/spec/functions/validate_apache_log_level_spec.rb
+++ b/spec/functions/validate_apache_log_level_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'apache::validate_apache_log_level' do
-
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('garbage').and_raise_error(Puppet::ParseError) }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index c1017222ca..045b20c9e9 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -10,15 +10,15 @@
 install_module_dependencies_on(hosts)
 
 RSpec.configure do |c|
-  c.filter_run :focus => true
+  c.filter_run focus: true
   c.run_all_when_everything_filtered = true
   # apache on Ubuntu 10.04 and 12.04 doesn't like IPv6 VirtualHosts, so we skip ipv6 tests on those systems
-  if fact('operatingsystem') == 'Ubuntu' and (fact('operatingsystemrelease') == '10.04' or fact('operatingsystemrelease') == '12.04')
-    c.filter_run_excluding :ipv6 => true
+  if fact('operatingsystem') == 'Ubuntu' && (fact('operatingsystemrelease') == '10.04' || fact('operatingsystemrelease') == '12.04')
+    c.filter_run_excluding ipv6: true
   end
   # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
   if fact('network6_lo') != '::1'
-    c.filter_run_excluding :ipv6 => true
+    c.filter_run_excluding ipv6: true
   end
 
   # Readable test descriptions
@@ -26,8 +26,8 @@
 
   # detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case
   # also note how fact('puppetversion') is not available because of PUP-4359
-  if fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '8' && shell('puppet --version').stdout =~ /^4\.2/
-    c.filter_run_excluding :skip_pup_5016 => true
+  if fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '8' && shell('puppet --version').stdout =~ %r{^4\.2}
+    c.filter_run_excluding skip_pup_5016: true
   end
 
   # Configure all nodes in nodeset
@@ -39,7 +39,7 @@
         package { 'net-tools': ensure => installed }
       EOS
 
-      apply_manifest_on(agents, pp, :catch_failures => false)
+      apply_manifest_on(agents, pp, catch_failures: false)
     end
 
     if fact('osfamily') == 'Debian'
@@ -51,34 +51,34 @@
     hosts.each do |host|
       # Required for mod_passenger tests.
       if fact('osfamily') == 'RedHat'
-        on host, puppet('module','install','stahnma/epel')
-        on host, puppet('module','install','puppetlabs/inifile')
-        #we need epel installed, so we can get plugins, wsgi, mime ...
+        on host, puppet('module', 'install', 'stahnma/epel')
+        on host, puppet('module', 'install', 'puppetlabs/inifile')
+        # we need epel installed, so we can get plugins, wsgi, mime ...
         pp = <<-EOS
           class { 'epel': }
         EOS
 
-        apply_manifest_on(host, pp, :catch_failures => true)
+        apply_manifest_on(host, pp, catch_failures: true)
       end
 
       # Required for manifest to make mod_pagespeed repository available
       if fact('osfamily') == 'Debian'
-        on host, puppet('module','install','puppetlabs-apt')
+        on host, puppet('module', 'install', 'puppetlabs-apt')
       end
 
       # Make sure selinux is disabled so the tests work.
       on host, puppet('apply', '-e',
-                        %{"exec { 'setenforce 0': path   => '/bin:/sbin:/usr/bin:/usr/sbin', onlyif => 'which setenforce && getenforce | grep Enforcing', }"})
+                      %("exec { 'setenforce 0': path   => '/bin:/sbin:/usr/bin:/usr/sbin', onlyif => 'which setenforce && getenforce | grep Enforcing', }"))
     end
   end
 end
 
-shared_examples "a idempotent resource" do
-  it 'should apply with no errors' do
-    apply_manifest(pp, :catch_failures => true)
+shared_examples 'a idempotent resource' do
+  it 'applies with no errors' do
+    apply_manifest(pp, catch_failures: true)
   end
 
-  it 'should apply a second time without changes', :skip_pup_5016 do
-    apply_manifest(pp, :catch_changes => true)
+  it 'applies a second time without changes', :skip_pup_5016 do
+    apply_manifest(pp, catch_changes: true)
   end
 end
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index d861a1c49a..cac4ff779a 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -2,7 +2,7 @@
   c.before :each do
     # Ensure that we don't accidentally cache facts and environment
     # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all)
+    Facter::Util::Loader.any_instance.stubs(:load_all) # rubocop:disable RSpec/AnyInstance
     Facter.clear
     Facter.clear_messages
   end
@@ -11,29 +11,30 @@
 RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
-  #as soon as psh is updated, the following line can be removed
+  # as soon as psh is updated, the following line can be removed
   config.mock_with :rspec
 end
 
-shared_examples :compile, :compile => true do
-  it { should compile.with_all_deps }
+shared_examples :compile, compile: true do
+  it { is_expected.to compile.with_all_deps }
 end
 
 shared_examples 'a mod class, without including apache' do
-   let :facts do
+  let :facts do
     {
-      :id                        => 'root',
-      :lsbdistcodename           => 'squeeze',
-      :kernel                    => 'Linux',
-      :osfamily                  => 'Debian',
-      :operatingsystem           => 'Debian',
-      :operatingsystemrelease    => '6',
-      :operatingsystemmajrelease => nil,
-      :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      :concat_basedir            => '/dne',
-      :is_pe                     => false,
-      :hardwaremodel             => 'x86_64',
+      id: 'root',
+      lsbdistcodename: 'squeeze',
+      kernel: 'Linux',
+      osfamily: 'Debian',
+      operatingsystem: 'Debian',
+      operatingsystemrelease: '6',
+      operatingsystemmajrelease: nil,
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      concat_basedir: '/dne',
+      is_pe: false,
+      hardwaremodel: 'x86_64',
     }
   end
-  it { should compile.with_all_deps }
+
+  it { is_expected.to compile.with_all_deps }
 end
diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/apache_version_spec.rb
index 2036449fd9..1f348fd8a0 100644
--- a/spec/unit/apache_version_spec.rb
+++ b/spec/unit/apache_version_spec.rb
@@ -1,16 +1,19 @@
 require 'spec_helper'
 
-describe Facter::Util::Fact do
-  before do
+describe Facter::Util::Fact do # rubocop:disable RSpec/FilePath
+  before(:each) do
     Facter.clear
   end
 
+  # rubocop:disable RSpec/MessageSpies
   describe 'apache_version' do
     context 'with value' do
       before :each do
-        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
-        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {'Server version: Apache/2.4.16 (Unix)
-                                                                                  Server built:   Jul 31 2015 15:53:26'}
+        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true } # rubocop:disable RSpec/ExpectInHook
+        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') { # rubocop:disable RSpec/ExpectInHook
+          'Server version: Apache/2.4.16 (Unix)
+           Server built:   Jul 31 2015 15:53:26'
+        }
       end
       it do
         expect(Facter.fact(:apache_version).value).to eq('2.4.16')
@@ -21,9 +24,11 @@
   describe 'apache_version with empty OS' do
     context 'with value' do
       before :each do
-        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
-        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {'Server version: Apache/2.4.6 ()
-                                                                                  Server built:   Nov 21 2015 05:34:59' }
+        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true } # rubocop:disable RSpec/ExpectInHook
+        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') { # rubocop:disable RSpec/ExpectInHook
+          'Server version: Apache/2.4.6 ()
+           Server built:   Nov 21 2015 05:34:59'
+        }
       end
       it do
         expect(Facter.fact(:apache_version).value).to eq('2.4.6')
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index 1bccc94d17..96fbcae484 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -13,170 +13,178 @@
     end
   end
 
-  describe "when fetching modules" do
-    before do
-      @filetype = double()
+  # rubocop:disable RSpec/MessageSpies
+  describe 'when fetching modules' do
+    let(:filetype) do
+      double
     end
 
-    it "should return a sorted array of the defined parameters" do
-      expect(@filetype).to receive(:read) { %Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n} }
-      expect(provider_class).to receive(:filetype) { @filetype }
+    it 'returns a sorted array of the defined parameters' do # rubocop:disable RSpec/MultipleExpectations
+      expect(filetype).to receive(:read).and_return(%(APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n))
+      expect(provider_class).to receive(:filetype) { filetype }
 
-      expect(provider_class.modules).to eq(%w{bar baz foo})
+      expect(provider_class.modules).to eq(%w[bar baz foo])
     end
 
-    it "should cache the module list" do
-      expect(@filetype).to receive(:read).once { %Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n} }
-      expect(provider_class).to receive(:filetype).once { @filetype }
+    it 'caches the module list' do # rubocop:disable RSpec/MultipleExpectations
+      expect(filetype).to receive(:read).once { %(APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n) } # rubocop:disable Lint/AmbiguousBlockAssociation
+      expect(provider_class).to receive(:filetype).once { filetype } # rubocop:disable Lint/AmbiguousBlockAssociation
 
-      2.times { expect(provider_class.modules).to eq(%w{bar baz foo}) }
+      2.times { expect(provider_class.modules).to eq(%w[bar baz foo]) }
     end
 
-    it "should normalize parameters" do
-      @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAR"\n})
-      provider_class.expects(:filetype).returns(@filetype)
+    it 'normalizes parameters' do
+      filetype.expects(:read).returns(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
+      provider_class.expects(:filetype).returns(filetype)
 
-      expect(provider_class.modules).to eq(%w{bar foo})
+      expect(provider_class.modules).to eq(%w[bar foo])
     end
   end
 
-  describe "when prefetching" do
-    it "should match providers to resources" do
-      provider = double("ssl_provider", :name => "ssl")
-      resource = double("ssl_resource")
+  describe 'when prefetching' do
+    it 'matches providers to resources' do
+      provider = instance_double('ssl_provider', name: 'ssl')
+      resource = instance_double('ssl_resource')
       resource.expects(:provider=).with(provider)
 
       expect(provider_class).to receive(:instances) { [provider] }
-      provider_class.prefetch("ssl" => resource)
+      provider_class.prefetch('ssl' => resource)
     end
   end
 
-  describe "when flushing" do
+  # rubocop:disable RSpec/InstanceVariable
+  describe 'when flushing' do
     before :each do
-      @filetype = double()
+      @filetype = double
       allow(@filetype).to receive(:backup)
       allow(provider_class).to receive(:filetype).at_least(:once) { @filetype }
 
-      @info = double()
-      allow(@info).to receive(:[]).with(:name) { "info" }
+      @info = double
+      allow(@info).to receive(:[]).with(:name) { 'info' }
       allow(@info).to receive(:provider=)
 
-      @mpm = double()
-      allow(@mpm).to receive(:[]).with(:name) { "mpm" }
+      @mpm = double
+      allow(@mpm).to receive(:[]).with(:name) { 'mpm' }
       allow(@mpm).to receive(:provider=)
 
-      @ssl = double()
-      allow(@ssl).to receive(:[]).with(:name) { "ssl" }
+      @ssl = double
+      allow(@ssl).to receive(:[]).with(:name) { 'ssl' }
       allow(@ssl).to receive(:provider=)
     end
 
-    it "should add modules whose ensure is present" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} }
-      expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D INFO"})
+    # rubocop:disable RSpec/MultipleExpectations
+    it 'adds modules whose ensure is present' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
+      expect(@filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO"))
 
       allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
 
       provider_class.flush
     end
 
-    it "should remove modules whose ensure is present" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-D INFO"} }
-      expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS=""})
+    # rubocop:disable RSpec/ExampleLength
+    it 'removes modules whose ensure is present' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO") }
+      expect(@filetype).to receive(:write).with(%(APACHE2_OPTS=""))
 
       allow(@info).to receive(:should).with(:ensure) { :absent }
       allow(@info).to receive(:provider=)
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
 
       provider_class.flush
     end
 
-    it "should not modify providers without resources" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-D INFO -D MPM"} }
-      expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D MPM -D SSL"})
+    it 'does not modify providers without resources' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO -D MPM") }
+      expect(@filetype).to receive(:write).with(%(APACHE2_OPTS="-D MPM -D SSL"))
 
       allow(@info).to receive(:should).with(:ensure) { :absent }
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
 
       allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("ssl" => @ssl)
+      provider_class.prefetch('ssl' => @ssl)
 
       provider_class.flush
     end
 
-    it "should write the modules in sorted order" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} }
-      expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D INFO -D MPM -D SSL"})
+    it 'writes the modules in sorted order' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
+      expect(@filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO -D MPM -D SSL"))
 
       allow(@mpm).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("mpm" => @mpm)
+      provider_class.prefetch('mpm' => @mpm)
       allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
       allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("ssl" => @ssl)
+      provider_class.prefetch('ssl' => @ssl)
 
       provider_class.flush
     end
 
-    it "should write the records back once" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} }
-      expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
+    it 'writes the records back once' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
+      expect(@filetype).to receive(:write).once.with(%(APACHE2_OPTS="-D INFO -D SSL"))
 
       allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
 
       allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("ssl" => @ssl)
+      provider_class.prefetch('ssl' => @ssl)
 
       provider_class.flush
     end
 
-    it "should only modify the line containing APACHE2_OPTS" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{# Comment\nAPACHE2_OPTS=""\n# Another comment} }
-      expect(@filetype).to receive(:write).once.with(%Q{# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment})
+    it 'onlies modify the line containing APACHE2_OPTS' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(# Comment\nAPACHE2_OPTS=""\n# Another comment) }
+      expect(@filetype).to receive(:write).once.with(%(# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment))
 
       allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
       provider_class.flush
     end
 
-    it "should restore any arbitrary arguments" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-Y -D MPM -X"} }
-      expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-Y -X -D INFO -D MPM"})
+    it 'restores any arbitrary arguments' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-Y -D MPM -X") }
+      expect(@filetype).to receive(:write).once.with(%(APACHE2_OPTS="-Y -X -D INFO -D MPM"))
 
       allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
       provider_class.flush
     end
 
-    it "should backup the file once if changes were made" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} }
-      expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
+    it 'backups the file once if changes were made' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
+      expect(@filetype).to receive(:write).once.with(%(APACHE2_OPTS="-D INFO -D SSL"))
 
       allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
 
       allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("ssl" => @ssl)
+      provider_class.prefetch('ssl' => @ssl)
 
       @filetype.unstub(:backup)
       @filetype.expects(:backup)
       provider_class.flush
     end
 
-    it "should not write the file or run backups if no changes were made" do
-      expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-X -D INFO -D SSL -Y"} }
+    it 'does not write the file or run backups if no changes were made' do
+      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-X -D INFO -D SSL -Y") }
       expect(@filetype).to receive(:write).never
 
       allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("info" => @info)
+      provider_class.prefetch('info' => @info)
 
       allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch("ssl" => @ssl)
+      provider_class.prefetch('ssl' => @ssl)
 
       @filetype.unstub(:backup)
       @filetype.expects(:backup).never
       provider_class.flush
     end
+    # rubocop:enable RSpec/ExampleLength
+    # rubocop:enable RSpec/MultipleExpectations
   end
+  # rubocop:enable RSpec/InstanceVariable
+  # rubocop:enable RSpec/MessageSpies
 end
diff --git a/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb b/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb
index 3e2f75cbae..13f733788a 100644
--- a/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb
+++ b/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb
@@ -1,32 +1,32 @@
 require 'spec_helper'
 
-describe "the apache_pw_hash function" do
+describe 'the apache_pw_hash function' do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("apache_pw_hash")).to eq("function_apache_pw_hash")
+  it 'exists' do
+    expect(Puppet::Parser::Functions.function('apache_pw_hash')).to eq('function_apache_pw_hash')
   end
 
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_apache_pw_hash([]) }.to( raise_error(Puppet::ParseError))
+  it 'raises a ParseError if there is less than 1 arguments' do
+    expect { scope.function_apache_pw_hash([]) }.to(raise_error(Puppet::ParseError))
   end
 
-  it "should raise an Puppet::ParseError if argument is an empty string" do
-    expect { scope.function_apache_pw_hash(['']) }.to( raise_error(Puppet::ParseError))
+  it 'raises an Puppet::ParseError if argument is an empty string' do
+    expect { scope.function_apache_pw_hash(['']) }.to(raise_error(Puppet::ParseError))
   end
 
-  context "when argument is not a string" do
-    it { expect { scope.function_apache_pw_hash([1]) }.to( raise_error(Puppet::ParseError)) }
-    it { expect { scope.function_apache_pw_hash([true]) }.to( raise_error(Puppet::ParseError)) }
-    it { expect { scope.function_apache_pw_hash([{}]) }.to( raise_error(Puppet::ParseError)) }
-    it { expect { scope.function_apache_pw_hash([[]]) }.to( raise_error(Puppet::ParseError)) }
+  context 'when argument is not a string' do
+    it { expect { scope.function_apache_pw_hash([1]) }.to(raise_error(Puppet::ParseError)) }
+    it { expect { scope.function_apache_pw_hash([true]) }.to(raise_error(Puppet::ParseError)) }
+    it { expect { scope.function_apache_pw_hash([{}]) }.to(raise_error(Puppet::ParseError)) }
+    it { expect { scope.function_apache_pw_hash([[]]) }.to(raise_error(Puppet::ParseError)) }
   end
 
-  it "should raise an Puppet::ParseError if argument is not a string" do
-    expect { scope.function_apache_pw_hash([1]) }.to( raise_error(Puppet::ParseError))
+  it 'raises an Puppet::ParseError if argument is not a string' do
+    expect { scope.function_apache_pw_hash([1]) }.to(raise_error(Puppet::ParseError))
   end
 
-  it "should return proper hash" do
+  it 'returns proper hash' do
     expect(scope.function_apache_pw_hash(['test'])).to(eq('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M='))
   end
 end
diff --git a/spec/unit/puppet/parser/functions/bool2httpd_spec.rb b/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
index 19d35e5922..1b73fa242a 100644
--- a/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
+++ b/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
@@ -1,52 +1,52 @@
 require 'spec_helper'
 
-describe "the bool2httpd function" do
+describe 'the bool2httpd function' do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("bool2httpd")).to eq("function_bool2httpd")
+  it 'exists' do
+    expect(Puppet::Parser::Functions.function('bool2httpd')).to eq('function_bool2httpd')
   end
 
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_bool2httpd([]) }.to( raise_error(Puppet::ParseError))
+  it 'raises a ParseError if there is less than 1 arguments' do
+    expect { scope.function_bool2httpd([]) }.to(raise_error(Puppet::ParseError))
   end
 
-  it "should convert true to 'On'" do
+  it "converts true to 'On'" do
     result = scope.function_bool2httpd([true])
     expect(result).to(eq('On'))
   end
 
-  it "should convert true to a string" do
+  it 'converts true to a string' do
     result = scope.function_bool2httpd([true])
     expect(result.class).to(eq(String))
   end
 
-  it "should convert false to 'Off'" do
+  it "converts false to 'Off'" do
     result = scope.function_bool2httpd([false])
     expect(result).to(eq('Off'))
   end
 
-  it "should convert false to a string" do
+  it 'converts false to a string' do
     result = scope.function_bool2httpd([false])
     expect(result.class).to(eq(String))
   end
 
-  it "should accept (and return) any string" do
-    result = scope.function_bool2httpd(["mail"])
+  it 'accepts (and return) any string' do
+    result = scope.function_bool2httpd(['mail'])
     expect(result).to(eq('mail'))
   end
 
-  it "should accept a nil value (and return Off)" do
+  it 'accepts a nil value (and return Off)' do
     result = scope.function_bool2httpd([nil])
     expect(result).to(eq('Off'))
   end
 
-  it "should accept an undef value (and return 'Off')" do
+  it "accepts an undef value (and return 'Off')" do
     result = scope.function_bool2httpd([:undef])
     expect(result).to(eq('Off'))
   end
 
-  it "should return a default value on non-matches" do
+  it 'returns a default value on non-matches' do
     result = scope.function_bool2httpd(['foo'])
     expect(result).to(eq('foo'))
   end
diff --git a/spec/unit/puppet/parser/functions/validate_apache_log_level.rb b/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
index dfef66eeab..9647815ca1 100644
--- a/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
+++ b/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
@@ -1,39 +1,38 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby -S rspec # rubocop:disable Lint/ScriptPermission
 require 'spec_helper'
 
-describe "the validate_apache_log_level function" do
+describe 'the validate_apache_log_level function' do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("validate_apache_log_level")).to eq("function_validate_apache_log_level")
+  it 'exists' do
+    expect(Puppet::Parser::Functions.function('validate_apache_log_level')).to eq('function_validate_apache_log_level')
   end
 
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_validate_apache_log_level([]) }.to( raise_error(Puppet::ParseError) )
+  it 'raises a ParseError if there is less than 1 arguments' do
+    expect { scope.function_validate_apache_log_level([]) }.to(raise_error(Puppet::ParseError))
   end
 
-  it "should raise a ParseError when given garbage" do
-    expect { scope.function_validate_apache_log_level(['garbage']) }.to( raise_error(Puppet::ParseError) )
+  it 'raises a ParseError when given garbage' do
+    expect { scope.function_validate_apache_log_level(['garbage']) }.to(raise_error(Puppet::ParseError))
   end
 
-  it "should not raise a ParseError when given a plain log level" do
-    expect { scope.function_validate_apache_log_level(['info']) }.to_not raise_error 
+  it 'does not raise a ParseError when given a plain log level' do
+    expect { scope.function_validate_apache_log_level(['info']) }.not_to raise_error
   end
 
-  it "should not raise a ParseError when given a log level and module log level" do
-    expect { scope.function_validate_apache_log_level(['warn ssl:info']) }.to_not raise_error 
+  it 'does not raise a ParseError when given a log level and module log level #ssl' do
+    expect { scope.function_validate_apache_log_level(['warn ssl:info']) }.not_to raise_error
   end
 
-  it "should not raise a ParseError when given a log level and module log level" do
-    expect { scope.function_validate_apache_log_level(['warn mod_ssl.c:info']) }.to_not raise_error 
+  it 'does not raise a ParseError when given a log level and module log level #mod_ssl.c' do
+    expect { scope.function_validate_apache_log_level(['warn mod_ssl.c:info']) }.not_to raise_error
   end
 
-  it "should not raise a ParseError when given a log level and module log level" do
-    expect { scope.function_validate_apache_log_level(['warn ssl_module:info']) }.to_not raise_error 
+  it 'does not raise a ParseError when given a log level and module log level #ssl_module' do
+    expect { scope.function_validate_apache_log_level(['warn ssl_module:info']) }.not_to raise_error
   end
 
-  it "should not raise a ParseError when given a trace level" do
-    expect { scope.function_validate_apache_log_level(['trace4']) }.to_not raise_error 
+  it 'does not raise a ParseError when given a trace level' do
+    expect { scope.function_validate_apache_log_level(['trace4']) }.not_to raise_error
   end
-
 end
diff --git a/tasks/init.rb b/tasks/init.rb
index 38ecd463be..7ea0af8be6 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -5,19 +5,19 @@
 
 def service(action, service_name)
   if service_name.nil?
-    cmd_string = "facter -p osfamily"
-    stdout, stderr, status = Open3.capture3(cmd_string)
+    cmd_string = 'facter -p osfamily'
+    stdout, _stderr, _status = Open3.capture3(cmd_string)
     osfamily = stdout.strip
-    if osfamily == 'RedHat'
-      service_name = 'httpd'
-    elsif osfamily == 'FreeBSD'
-      service_name = 'apache24'
-    else
-      service_name = 'apache2'
-    end
+    service_name = if osfamily == 'RedHat'
+                     'httpd'
+                   elsif osfamily == 'FreeBSD'
+                     'apache24'
+                   else
+                     'apache2'
+                   end
   end
   cmd_string = "service #{service_name} #{action}"
-  stdout, stderr, status = Open3.capture3(cmd_string)
+  _stdout, stderr, status = Open3.capture3(cmd_string)
   raise Puppet::Error, stderr if status != 0
   { status: "#{action} successful" }
 end

From 32d7836fb2d23a8838290b8a1d8f7dfb04ede261 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppet.com>
Date: Fri, 2 Feb 2018 16:04:26 +0000
Subject: [PATCH 1326/2267] Add Debian 7 to exclude list on passenger test

---
 spec/acceptance/mod_passenger_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 1f89477b57..e3ecd28b36 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -175,7 +175,8 @@ class { 'apache::mod::passenger': }
       # these two lines
       unless (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') ||
              (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
-             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') ||
+             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '7')
         expected_one < [%r{### Processes: [0-9]+}, %r{### Total private dirty RSS: [0-9\.]+ MB}]
       end
       it 'outputs status via passenger-memory-stats #stdout' do

From 02e100a192ee6e485edc811b5bd7fee981f661fb Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Mon, 20 Nov 2017 17:46:59 +0000
Subject: [PATCH 1327/2267] MODULES-6070 Improvements for tasks and testing

---
 Gemfile       |  1 +
 tasks/init.rb | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 84b23f2b4e..4ed22771fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,6 +60,7 @@ group :system_tests do
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
   gem "puppet-blacksmith", '~> 3.4',                                             :require => false
+  gem "beaker-task_helper"
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
diff --git a/tasks/init.rb b/tasks/init.rb
index 7ea0af8be6..3a4f873a6c 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -5,19 +5,18 @@
 
 def service(action, service_name)
   if service_name.nil?
-    cmd_string = 'facter -p osfamily'
-    stdout, _stderr, _status = Open3.capture3(cmd_string)
+    cmd_string = "facter -p osfamily"
+    stdout, stderr, status = Open3.capture3(cmd_string)
     osfamily = stdout.strip
-    service_name = if osfamily == 'RedHat'
-                     'httpd'
-                   elsif osfamily == 'FreeBSD'
-                     'apache24'
-                   else
-                     'apache2'
-                   end
+    if osfamily == 'RedHat'
+      service_name = 'httpd'
+    elsif osfamily == 'FreeBSD'
+      service_name = 'apache24'
+    else
+      service_name = 'apache2'
+    end
   end
-  cmd_string = "service #{service_name} #{action}"
-  _stdout, stderr, status = Open3.capture3(cmd_string)
+  stdout, stderr, status = Open3.capture3('service', service_name, action)
   raise Puppet::Error, stderr if status != 0
   { status: "#{action} successful" }
 end

From 81bc5119ceced1faa4bf261efa4b7cd3731ef3ef Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Wed, 31 Jan 2018 16:50:40 -0800
Subject: [PATCH 1328/2267] (RE-10220) Fix CVE-2018-6508

---
 CHANGELOG.md  |  7 +++++++
 metadata.json |  2 +-
 tasks/init.rb | 19 +++++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7fb17fc90..46de1bacbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
+## Supported Release [2.3.1]
+### Summary
+This release fixes CVE-2018-6508 which is a potential arbitrary code execution via tasks.
+
+### Fixed
+- Fix init task for arbitrary remote code
+
 ## Supported Release [2.3.0]
 ### Summary
 This is a feature release. It includes a task that will reload the apache service.
diff --git a/metadata.json b/metadata.json
index 0f9f5e8275..5734f55110 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
diff --git a/tasks/init.rb b/tasks/init.rb
index 3a4f873a6c..1df27bda26 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -5,18 +5,17 @@
 
 def service(action, service_name)
   if service_name.nil?
-    cmd_string = "facter -p osfamily"
-    stdout, stderr, status = Open3.capture3(cmd_string)
+    stdout, _stderr, _status = Open3.capture3('facter', '-p', 'osfamily')
     osfamily = stdout.strip
-    if osfamily == 'RedHat'
-      service_name = 'httpd'
-    elsif osfamily == 'FreeBSD'
-      service_name = 'apache24'
-    else
-      service_name = 'apache2'
-    end
+    service_name = if osfamily == 'RedHat'
+                     'httpd'
+                   elsif osfamily == 'FreeBSD'
+                     'apache24'
+                   else
+                     'apache2'
+                   end
   end
-  stdout, stderr, status = Open3.capture3('service', service_name, action)
+  _stdout, stderr, status = Open3.capture3('service', service_name, action)
   raise Puppet::Error, stderr if status != 0
   { status: "#{action} successful" }
 end

From 31f6abe2a01347696c39cf6e77b727b521134912 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Mon, 12 Feb 2018 14:32:23 +0000
Subject: [PATCH 1329/2267] (MODULES-6608) - Adding puppet requirement for
 tasks versioncmp in beaker-task_helper

A change in the new beaker-task_helper uses versioncmp. Therefore adding
a puppet requirement in the spec_helper_acceptance to access versioncmp.
---
 spec/spec_helper_acceptance.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index c1017222ca..9317fd75ac 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,3 +1,4 @@
+require 'puppet'
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'

From 14d5b984ddf3d00984599a4a09da891c96e9588c Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Wed, 14 Feb 2018 10:08:41 +0000
Subject: [PATCH 1330/2267] 3.0.0 Pre Release

---
 CHANGELOG.md                | 40 +++++++++++++++++++++++++++++++++
 metadata.json               |  2 +-
 spec/classes/mod/jk_spec.rb | 45 +++++++++++++++++--------------------
 3 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46de1bacbd..e441808b2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
+## Supported Release [3.0.0]
+### Summary
+This release updates the code to match the set Rubocop standards in additiont to adding several minor features. AS this release includes Puppet 4 updates it is thus backwards incompatible.
+
+### Fixed
+- Fixes made to mod_passenger test's.
+- REMOVED options bug fix.
+- Fix case of setting apache::mpm_module to false and declaring the mpm class yourself b/c you need to set params.
+- Various small fixes.
+
+#### Added
+- ShibCompatValidUser option added to vhost config.
+- loadfile_name option exposed to mod::python class.
+- $options added to 'balancer' type.
+- log formats updated to include client ip.
+- EnableCapabilities added for itk.
+- Support added for UseCanonicalName.
+- Option added to include CacheIgnorHEaders for disk_cache module.
+- Added ability to specify MellonSessionLength.
+- CASSscrubRequestHeaders now created in _auth_cas.erb.
+- $apache_version param now defined.
+- Auxiliary template included for 'Require' directives for mod::*.
+- Acceptance test added for param LimitRequestFields.
+- Acceptance test added for param shib_compat_valid_user.
+- Updated to use puppet 4 functions-api.
+
+#### Changed
+- remoteip: apacher::service notified instead of service['httpd'].
+- Travis test parellelism reduced.
+- Modulesync updates.
+- Default keepalive set to on in all distros.
+- php_values section adjusted.
+- Various doc changes made.
+- Code updated to match the set Rubocop standards.
+
+#### Removed
+- Unused variable $_logs_dest removed.
+
 ## Supported Release [2.3.1]
 ### Summary
 This release fixes CVE-2018-6508 which is a potential arbitrary code execution via tasks.
@@ -927,6 +965,8 @@ worker/prefork
 * f672e46 a2mod fix
 * 8a56ee9 add pthon support to apache
 
+[3.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.1...3.0.0
+[2.3.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.0...2.3.1
 [2.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.2.0...2.3.0
 [2.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.1.0...2.2.0
 [2.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...2.1.0
diff --git a/metadata.json b/metadata.json
index 5734f55110..09e61ad663 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "2.3.1",
+  "version": "3.0.0",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 5f674a8f2d..d253c2f984 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -14,13 +14,13 @@
   end
 
   shared_examples 'specific workers_file' do |mod_dir|
-    #let (:pre_condition) do
+    # let(:pre_condition) do
     #  'include apache'
-    #end
-    let (:params) do
+    # end
+    let(:params) do
       {
-        :workers_file => "#{mod_dir}/workers.properties",
-        :workers_file_content => {
+        workers_file: "#{mod_dir}/workers.properties",
+        workers_file_content: {
           'worker_a' => {
             'type' => 'ajp13',
             'socket_keepalive' => 'true',
@@ -36,27 +36,24 @@
         },
       }
     end
+
     it { is_expected.to compile }
     it { is_expected.to compile.with_all_deps }
-    it do
-      is_expected.to contain_file("#{mod_dir}/workers.properties")
-        .with_content(
-          "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
-          "# Any manual changes will be overwritten\n"\
-          "\n"\
-          "worker.list = worker_a,worker_b\n"\
-          "\n"\
-          "worker.maintain = 40\n"\
-          "\n"\
-          "# This is worker A\n"\
-          "worker.worker_a.socket_keepalive=true\n"\
-          "worker.worker_a.type=ajp13\n"\
-          "\n"\
-          "# This is worker B\n"\
-          "worker.worker_b.socket_keepalive=true\n"\
-          "worker.worker_b.type=ajp13\n"
-        )
-    end
+    expected_content = "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
+                       "# Any manual changes will be overwritten\n"\
+                       "\n"\
+                       "worker.list = worker_a,worker_b\n"\
+                       "\n"\
+                       "worker.maintain = 40\n"\
+                       "\n"\
+                       "# This is worker A\n"\
+                       "worker.worker_a.socket_keepalive=true\n"\
+                       "worker.worker_a.type=ajp13\n"\
+                       "\n"\
+                       "# This is worker B\n"\
+                       "worker.worker_b.socket_keepalive=true\n"\
+                       "worker.worker_b.type=ajp13\n"
+    it { is_expected.to contain_file("#{mod_dir}/workers.properties").with_content(expected_content) }
   end
 
   default_ip = '192.168.1.1'

From 44a425c2b429b9513244092d0caeaaf5fcbfeb3a Mon Sep 17 00:00:00 2001
From: Ryan Hall <ryan_hall@glic.com>
Date: Tue, 20 Feb 2018 09:51:37 -0500
Subject: [PATCH 1331/2267] add option to pass SSLCertificateFile and
 SSLCertificateKey to ssl.conf

---
 manifests/mod/ssl.pp         |  2 ++
 spec/classes/mod/ssl_spec.rb | 20 ++++++++++++++++++++
 templates/mod/ssl.conf.erb   |  6 ++++++
 3 files changed, 28 insertions(+)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 76726b8e56..f9fc8b6f65 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -3,6 +3,8 @@
   $ssl_cryptodevice                                         = 'builtin',
   $ssl_options                                              = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd                                     = undef,
+  $ssl_cert                                                 = undef,
+  $ssl_key                                                  = undef,
   $ssl_ca                                                   = undef,
   $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 463e17ee33..2d638dcb8b 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -185,6 +185,26 @@
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLPassPhraseDialog builtin$}) }
     end
 
+    context 'setting ssl_cert' do
+      let :params do
+        {
+          ssl_cert: '/etc/pki/some/path/localhost.crt',
+        }
+      end
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLCertificateFile}) }
+    end
+
+    context 'setting ssl_key' do
+      let :params do
+        {
+          ssl_key: '/etc/pki/some/path/localhost.key',
+        }
+      end
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLCertificateKeyFile}) }
+    end
+
     context 'setting ssl_ca to a path' do
       let :params do
         {
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index e041342c2c..a3cf61868f 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -20,6 +20,12 @@
   <%- end -%>
   SSLCryptoDevice <%= @ssl_cryptodevice %>
   SSLHonorCipherOrder <%= scope.call_function('apache::bool2httpd', [@_ssl_honorcipherorder]) %>
+  <%- if @ssl_cert -%>
+  SSLCertificateFile      "<%= @ssl_cert %>"
+  <%- end -%>
+  <%- if @ssl_key -%>
+  SSLCertificateKeyFile   "<%= @ssl_key %>"
+  <%- end -%>
   <%- if @ssl_ca -%>
   SSLCACertificateFile    "<%= @ssl_ca %>"
   <%- end -%>

From 5fa382165e3cb00826ba5998579005c45f64a7ac Mon Sep 17 00:00:00 2001
From: Ryan Hall <ryan_hall@glic.com>
Date: Tue, 20 Feb 2018 09:58:06 -0500
Subject: [PATCH 1332/2267] add optional

---
 manifests/mod/ssl.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index f9fc8b6f65..3064bf815e 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -3,8 +3,8 @@
   $ssl_cryptodevice                                         = 'builtin',
   $ssl_options                                              = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd                                     = undef,
-  $ssl_cert                                                 = undef,
-  $ssl_key                                                  = undef,
+  Optional[String] $ssl_cert                                = undef,
+  Optional[String] $ssl_key                                 = undef,
   $ssl_ca                                                   = undef,
   $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,

From 802e7d202ac748d65d5464b8ca92a2808c6839bc Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Tue, 20 Feb 2018 15:51:08 +0000
Subject: [PATCH 1333/2267] Updating docs

---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.md b/README.md
index e7ad0a67de..05b076a361 100755
--- a/README.md
+++ b/README.md
@@ -1376,6 +1376,22 @@ Values: a command to restart the Apache service. The default setting uses the [d
 
 Default: `undef`.
 
+##### `ssl_cert`
+
+This enables the user to specify a specific SSLCertificateFile.
+
+For more information see: [SSLCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#SSLCertificateFile)
+
+Default: `undef.`
+
+##### `ssl_key`
+This enables the user to specify a specific SSLCertificateKey.
+
+For more information see: [SSLCertificateKey](https://httpd.apache.org/docs/current/mod/mod_ssl.html#SSLCertificateKeyFile)
+
+Default: `undef`.
+
+
 ##### `ssl_ca`
 
 Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile) to use to verify certificate used in ssl client authentication.
@@ -2728,6 +2744,8 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 - `ssl_cryptodevice`: Default: 'builtin'.
 - `ssl_honorcipherorder`: Default: true.
 - `ssl_openssl_conf_cmd`: Default: undef.
+- `ssl_cert`: Default: undef.
+- `ssl_key`: Default: undef.
 - `ssl_options`: Default: ['StdEnvVars']
 - `ssl_pass_phrase_dialog`: Default: 'builtin'.
 - `ssl_protocol`: Default: ['all', '-SSLv2', '-SSLv3'].
@@ -2761,6 +2779,14 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 
   Default: `undef`.
 
+* `ssl_cert`
+
+  Default: `undef`.
+
+* `ssl_key`
+
+  Default: `undef`.
+
 * `ssl_options`
 
   Default: ['StdEnvVars']

From 0b5792560517038a932989ad3b5690342caab1c5 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Fri, 23 Feb 2018 10:52:48 -0800
Subject: [PATCH 1334/2267] Updating translations for readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 346 +++++++++++++++++++++++++++++++---------
 1 file changed, 275 insertions(+), 71 deletions(-)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 33f261e9fc..81a119259f 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -24,6 +24,7 @@
 [パブリック定義タイプ]: #public-defined-types
 [プライベート定義タイプ]: #private-defined-types
 [テンプレート]: #templates
+[タスク]: #tasks
 
 [制約事項]: #limitations
 
@@ -49,6 +50,7 @@
 [`apache::mod::authn_dbd`]: #class-apachemodauthn_dbd
 [`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap
 [`apache::mod::cluster`]: #class-apachemodcluster
+[`apache::mod::data]: #class-apachemoddata
 [`apache::mod::disk_cache`]: #class-apachemoddisk_cache
 [`apache::mod::dumpio`]: #class-apachemoddumpio
 [`apache::mod::event`]: #class-apachemodevent
@@ -64,6 +66,7 @@
 [`apache::mod::proxy_balancer`]: #class-apachemodproxybalancer
 [`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi
 [`apache::mod::proxy_html`]: #class-apachemodproxy_html
+[`apache::mod::python`]: #class-apachemodpython
 [`apache::mod::security`]: #class-apachemodsecurity
 [`apache::mod::shib`]: #class-apachemodshib
 [`apache::mod::ssl`]: #class-apachemodssl
@@ -143,6 +146,7 @@
 [`keepalive`パラメータ]: #keepalive
 [`keepalive_timeout`]: #keepalive_timeout
 [`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize
+[`limitreqfields`]: http://httpd.apache.org/docs/current/mod/core.html#limitrequestfields
 
 [`lib`]: #lib
 [`lib_path`]: #lib_path
@@ -187,6 +191,7 @@
 [`mod_proxy`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html
 [`mod_proxy_balancer`]: https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
 [`mod_reqtimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
+[`mod_python`]: http://modpython.org/
 [`mod_rewrite`]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html
 [`mod_security`]: https://www.modsecurity.org/
 [`mod_ssl`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html
@@ -261,6 +266,8 @@
 [テンプレート]: http://docs.puppet.com/puppet/latest/reference/lang_template.html
 [`TraceEnable`]: https://httpd.apache.org/docs/current/mod/core.html#traceenable
 
+[`UseCanonicalName`]: https://httpd.apache.org/docs/current/mod/core.html#usecanonicalname
+
 [`verify_config`]: #verify_config
 [`vhost`]: #defined-type-apachevhost
 [`vhost_dir`]: #vhost_dir
@@ -287,6 +294,7 @@
     - [パブリック定義タイプ][]
     - [プライベート定義タイプ][]
     - [テンプレート][]
+    - [タスク][]
 5. [制約事項 - OSの互換性など][制約事項]
 6. [開発 - モジュールへの貢献方法][開発]
     - [apacheモジュールへの貢献][貢献]
@@ -814,6 +822,7 @@ apache::balancer { 'puppet01':
     - [定義タイプ: apache::peruser::processor](#defined-type-apacheperuserprocessor)
     - [定義タイプ: apache::security::file_link](#defined-type-apachesecurityfile_link)
 - [**テンプレート**](#templates)
+- [**タスク**](#tasks)
 
 ### パブリッククラス
 
@@ -1090,9 +1099,9 @@ HTTPプロトコルチェックの厳密さを指定します。
 
 [`KeepAlive`][]ディレクティブによってHTTPの持続的接続を有効にするかどうかを決定します。 'On'に設定する場合は、[`keepalive_timeout`][]および[`max_keepalive_requests`][]パラメータを使って関連オプションを設定してください。 
 
-値: 'Off', 'On'。
+値: 'Off'、'On'。
 
-デフォルト値: 'Off'。
+デフォルト値: 'On'。
 
 ##### `keepalive_timeout`
 
@@ -1386,10 +1395,18 @@ Apacheの[`TimeOut`][]ディレクティブを設定します。このディレ
 
 [`TraceEnable`][]ディレクティブで、Apacheが`TRACE`リクエスト([RFC 2616][]ごと)をどのように処理するかを制御します。
 
-値: 'Off', 'On'。
+値: 'Off'、'On'。
 
 デフォルト値: 'On'。
 
+##### `use_canonical_name`
+
+Apacheの [`UseCanonicalName`][]ディレクティブを制御します。このディレクティブは、Apacheが自己参照URLをどのように処理するかを制御します。指定しない場合、このパラメータの宣言がサーバの設定から除外され、Apacheのデフォルト設定'off'が使用されます。
+
+値: 'On', 'on', 'Off', 'off', 'DNS', 'dns'。
+
+デフォルト値: `undef`。
+
 ##### `use_systemd`
 
 systemdモジュールをCentos 7サーバにインストールするかどうかを制御します。これは、カスタムビルトのRPMを使用している場合は特に役立ちます。 
@@ -1500,6 +1517,12 @@ Puppetがこのユーザを管理しないようにするには、[`manage_user`
 - **Red Hat**: 'access_log'
 - **Suse**: 'access.log'
 
+##### `limitreqfields`
+
+[`limitreqfields`][]パラメータは、HTTPリクエスト内のリクエストヘッダフィールドの最大数を設定します。このディレクティブを使用すると、サーバ管理者は異常なクライアントリクエスト動作の制御を強化できるので、ある種のDoS攻撃の防止に役立てることができます。送信リクエスト内のフィールドが多過ぎることを示すエラー応答が、通常のクライアントに対して表示される場合、この値を増やす必要があります。
+
+デフォルト値: '100'。
+
 #### クラス: `apache::dev`
 
 Apache開発ライブラリをインストールします。
@@ -1515,7 +1538,7 @@ Apache開発ライブラリをインストールします。
 
 [`apache::vhost`][]定義タイプを作成します。
 
-**パラメータ**:
+**パラメータ**:　
 
 * `vhosts`: [`apache::vhost`][]定義タイプのパラメータを指定します。
 
@@ -1570,6 +1593,7 @@ class { 'apache::mod::alias':
 * `cgi`
 * `cgid`
 * `cluster` ([`apache::mod::cluster`][]参照)
+* `data`
 * `dav`
 * `dav_fs`
 * `dav_svn`\*
@@ -1612,7 +1636,7 @@ class { 'apache::mod::alias':
 * `proxy_balancer`
 * `proxy_html` ([`apache::mod::proxy_html`][]参照)
 * `proxy_http`
-* `python`
+* `python` ([`apache::mod::python`][]参照)
 * `reqtimeout`
 * `remoteip`\*
 * `rewrite`
@@ -1650,7 +1674,7 @@ class { 'apache::mod::alias':
     * **Debian**: `/usr/share/apache2/icons`
     * **FreeBSD**: `/usr/local/www/apache24/icons`
     * **Gentoo**: `/var/www/icons`
-    * *Red Hat**: `/var/www/icons`、ただし、Apache 2.4は`/usr/share/httpd/icons`
+    * **Red Hat**: `/var/www/icons`、Apache 2.4の場合のみ、`/usr/share/httpd/icons`
 
 #### クラス: `apache::mod::disk_cache`
 
@@ -1671,13 +1695,21 @@ class {'::apache::mod::disk_cache':
 }
 ```
 
+キャッシュ無視ヘッダを指定するには、文字列を`cache_ignore_headers`パラメータに渡します。
+
+``` puppet
+class {'::apache::mod::disk_cache':
+  cache_ignore_headers => "Set-Cookie",
+}
+```
+
 ##### クラス: `apache::mod::diskio`
 
 [`mod_diskio`][]をインストールして設定します。
 
 ```puppet
 class{'apache':
-  default_mods => `false`,
+  default_mods => false,
   log_level    => 'dumpio:trace7',
 }
 class{'apache::mod::diskio':
@@ -1988,9 +2020,9 @@ class { '::apache::mod::cluster':
 
 **パラメータ**:　
 
-* `types`: デフレートする[MIMEタイプ][MIME `content*type`]の[配列][]。 
+* `types`: デフレートする[配列][]または[MIMEタイプ][MIME `content-type`]。
 
-  デフォルト値: [ 'text/html text/plain text/xml'、'text/css'、'application/x*javascript application/javascript application/ecmascript'、'application/rss+xml'、'application/json' ]。
+  デフォルト値: ['text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json']。
 
 * `notes`: [ハッシュ][]、キーはタイプを表し、値はノート名を表します。
 
@@ -2012,9 +2044,9 @@ class { '::apache::mod::cluster':
 
   デフォルト値: `undef`。
 
-* `expires_by_type`: [MIME `content*type`][]とその有効時間のセットを記述します。
+* `expires_by_type`: 一連の[MIME `content-type`][]とその有効期限を表します。
 
-  値: [ハッシュ][ハッシュ]の[配列][]、各ハッシュのキーは有効なMIME `content*type` ('text/json'など)、値は以下の有効な [インターバル構文][]。
+  値: [ハッシュ][ハッシュ]の[配列][]、各ハッシュのキーは有効なMIME `content-type` ('text/json'など)、値は以下の有効な [インターバル構文][]。
 
   デフォルト値: `undef`。
 
@@ -2146,6 +2178,54 @@ apache::vhost { 'example.org':
 
   デフォルト値: `true`。
 
+##### クラス: `apache::mod::itk`
+
+[`mod_itk`][]をインストールして管理します。これはHTTPDプロセス向けにロードおよび設定されるMPMです。[公式ドキュメント](http://mpm-itk.sesse.net/)。
+
+**パラメータ**:　
+
+* `startservers`: 起動時に作成される子サーバプロセスの数。
+
+  値: 整数。
+
+  デフォルト値: `8`。
+
+* `minspareservers`: 待機する子サーバプロセスに望ましい最小数。
+
+  値: 整数。
+
+  デフォルト値: `5`。
+
+* `maxspareservers`: 待機する子サーバプロセスに望ましい最大数。
+
+  値: 整数。
+
+  デフォルト値: `20`。
+
+* `serverlimit`: Apache httpdプロセスの継続期間に対して設定されるMaxRequestWorkersの最大数。
+
+  値: 整数。
+
+  デフォルト値: `256`。
+
+* `maxclients`: 処理される同時リクエストの最大数。
+
+  値: 整数。
+
+  デフォルト値: `256`。
+
+* `maxrequestsperchild`: 個々の子サーバプロセスが処理する接続の最大数。
+
+  値: 整数。
+
+  デフォルト値: `4000`。
+
+* `enablecapabilities`: 親プロセスのルート機能をほぼすべて削除し、User/Groupディレクティブで指定されたユーザとして、いくつかの追加機能(特にsetuid)付きで実行します。 セキュリティはある程度強化されますが、NFSなどの機能に対応しないファイルシステムによる処理では問題が生じるおそれがあります。
+
+  値: ブール値。
+
+  デフォルト値: `undef`。
+
 ##### クラス: `apache::mod::jk`
 
 `mod_jk`をインストールして管理します。これは、Apache httpdリダイレクションと古いバージョンのTomCatおよびJBossを結ぶコネクタです。
@@ -2300,33 +2380,102 @@ $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 
 [`mod_passenger`][]をインストールして管理します。Red Hatベースのシステムの場合は、[passengerドキュメント](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux)に記載された最小要件を満たしていることを確認してください。
 
-**パラメータ**:　
-
-* `passenger_high_performance`: [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance)を設定します。
-
-  値: 'On'、'Off'。　
-
-  デフォルト値: `undef`。
-
-* `passenger_pool_idle_time`: [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime)を設定します。
-
-  デフォルト値: `undef`。
-
-* `passenger_max_pool_size`: [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize)を設定します。
-
-  デフォルト値: `undef`。
-
-* `passenger_max_request_queue_size`: [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize)を設定します。
-
-  デフォルト値: `undef`。
-
-* `passenger_max_requests`: [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests)を設定します。
+現在のサーバ設定は、[Passengerリファレンス](https://www.phusionpassenger.com/library/config/apache/reference/)から直接取得されています。廃止予定の警告と削除失敗メッセージを有効にするには、 サーバにインストールされているバージョン番号を`passenger_installed_version`に設定します。
 
-  デフォルト値: `undef`。
+**パラメータ**:　
 
-* `passenger_data_buffer_dir`: [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir)を設定します。
+|パラメータ|デフォルト値|passengerの設定|コンテキスト|注記|
+|---------|-------------|------------------------|-------|-----|
+|manage_repo|true|n/a|||
+|mod_id|未定義|n/a|||
+|mod_lib|未定義|n/a|||
+|mod_lib_path|未定義|n/a|||
+|mod_package|未定義|n/a|||
+|mod_package_ensure|未定義|n/a|||
+|mod_path|未定義|n/a|||
+|passenger_allow_encoded_slashes|未定義|[`PassengerAllowEncodedSlashes`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAllowEncodedSlashes)|server-config virutal-host htaccess directory ||
+|passenger_app_env|未定義|[`PassengerAppEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppEnv)|server-config virutal-host htaccess directory ||
+|passenger_app_group_name|未定義|[`PassengerAppGroupName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppGroupName)|server-config virutal-host htaccess directory ||
+|passenger_app_root|未定義|[`PassengerAppRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppRoot)|server-config virutal-host htaccess directory ||
+|passenger_app_type|未定義|[`PassengerAppType`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppType)|server-config virutal-host htaccess directory ||
+|passenger_base_uri|未定義|[`PassengerBaseURI`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBaseURI)|server-config virutal-host htaccess directory ||
+|passenger_buffer_response|未定義|[`PassengerBufferResponse`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferResponse)|server-config virutal-host htaccess directory ||
+|passenger_buffer_upload|未定義|[`PassengerBufferUpload`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferUpload)|server-config virutal-host htaccess directory ||
+|passenger_concurrency_model|未定義|[`PassengerConcurrencyModel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerConcurrencyModel)|server-config virutal-host htaccess directory ||
+|passenger_conf_file|$::apache::params::passenger_conf_file|n/a|||
+|passenger_conf_package_file|$::apache::params::passenger_conf_package_file|n/a|||
+|passenger_data_buffer_dir|未定義|[`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDataBufferDir)|server-config ||
+|passenger_debug_log_file|未定義|PassengerDebugLogFile|server-config |このオプションの名前は、バージョン5.0.5でPassengerLogFileに変更されています。|
+|passenger_debugger|未定義|[`PassengerDebugger`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDebugger)|server-config virutal-host htaccess directory ||
+|passenger_default_group|未定義|[`PassengerDefaultGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultGroup)|server-config ||
+|passenger_default_ruby|$::apache::params::passenger_default_ruby|[`PassengerDefaultRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultRuby)|server-config ||
+|passenger_default_user|未定義|[`PassengerDefaultUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultUser)|server-config ||
+|passenger_disable_security_update_check|未定義|[`PassengerDisableSecurityUpdateCheck`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDisableSecurityUpdateCheck)|server-config ||
+|passenger_enabled|未定義|[`PassengerEnabled`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerEnabled)|server-config virutal-host htaccess directory ||
+|passenger_error_override|未定義|[`PassengerErrorOverride`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerErrorOverride)|server-config virutal-host htaccess directory ||
+|passenger_file_descriptor_log_file|未定義|[`PassengerFileDescriptorLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFileDescriptorLogFile)|server-config ||
+|passenger_fly_with|未定義|[`PassengerFlyWith`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFlyWith)|server-config ||
+|passenger_force_max_concurrent_requests_per_process|未定義|[`PassengerForceMaxConcurrentRequestsPerProcess`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerForceMaxConcurrentRequestsPerProcess)|server-config virutal-host htaccess directory ||
+|passenger_friendly_error_pages|未定義|[`PassengerFriendlyErrorPages`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFriendlyErrorPages)|server-config virutal-host htaccess directory ||
+|passenger_group|未定義|[`PassengerGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerGroup)|server-config virutal-host directory ||
+|passenger_high_performance|未定義|[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerHighPerformance)|server-config virutal-host htaccess directory ||
+|passenger_installed_version|未定義|n/a| |このオプションを設定すると、指定した値に対するpassengerオプションのバージョンチェックが有効になります。|
+|passenger_instance_registry_dir|未定義|[`PassengerInstanceRegistryDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerInstanceRegistryDir)|server-config ||
+|passenger_load_shell_envvars|未定義|[`PassengerLoadShellEnvvars`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLoadShellEnvvars)|server-config virutal-host htaccess directory ||
+|passenger_log_file|未定義|[`PassengerLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogFile)|server-config ||
+|passenger_log_level|未定義|[`PassengerLogLevel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogLevel)|server-config ||
+|passenger_lve_min_uid|未定義|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)|server-config virutal-host ||
+|passenger_max_instances|未定義|[`PassengerMaxInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstances)|server-config virutal-host htaccess directory ||
+|passenger_max_instances_per_app|未定義|[`PassengerMaxInstancesPerApp`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstancesPerApp)|server-config ||
+|passenger_max_pool_size|未定義|[`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPoolSize)|server-config ||
+|passenger_max_preloader_idle_time|未定義|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)|server-config virutal-host ||
+|passenger_max_request_queue_size|未定義|[`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestQueueSize)|server-config virutal-host htaccess directory ||
+|passenger_max_request_time|未定義|[`PassengerMaxRequestTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestTime)|server-config virutal-host htaccess directory ||
+|passenger_max_requests|未定義|[`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequests)|server-config virutal-host htaccess directory ||
+|passenger_memory_limit|未定義|[`PassengerMemoryLimit`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMemoryLimit)|server-config virutal-host htaccess directory ||
+|passenger_meteor_app_settings|未定義|[`PassengerMeteorAppSettings`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMeteorAppSettings)|server-config virutal-host htaccess directory ||
+|passenger_min_instances|未定義|[`PassengerMinInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMinInstances)|server-config virutal-host htaccess directory ||
+|passenger_nodejs|未定義|[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerNodejs)|server-config virutal-host htaccess directory ||
+|passenger_pool_idle_time|未定義|[`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPoolIdleTime)|server-config ||
+|passenger_pre_start|未定義|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)|server-config virutal-host ||
+|passenger_python|未定義|[`PassengerPython`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPython)|server-config virutal-host htaccess directory ||
+|passenger_resist_deployment_errors|未定義|[`PassengerResistDeploymentErrors`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResistDeploymentErrors)|server-config virutal-host htaccess directory ||
+|passenger_resolve_symlinks_in_document_root|未定義|[`PassengerResolveSymlinksInDocumentRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResolveSymlinksInDocumentRoot)|server-config virutal-host htaccess directory ||
+|passenger_response_buffer_high_watermark|未定義|[`PassengerResponseBufferHighWatermark`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResponseBufferHighWatermark)|server-config ||
+|passenger_restart_dir|未定義|[`PassengerRestartDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRestartDir)|server-config virutal-host htaccess directory ||
+|passenger_rolling_restarts|未定義|[`PassengerRollingRestarts`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRollingRestarts)|server-config virutal-host htaccess directory ||
+|passenger_root|$::apache::params::passenger_root|[`PassengerRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRoot)|server-config ||
+|passenger_ruby|$::apache::params::passenger_ruby|[`PassengerRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRuby)|server-config virutal-host htaccess directory ||
+|passenger_security_update_check_proxy|未定義|[`PassengerSecurityUpdateCheckProxy`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSecurityUpdateCheckProxy)|server-config ||
+|passenger_show_version_in_header|未定義|[`PassengerShowVersionInHeader`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerShowVersionInHeader)|server-config ||
+|passenger_socket_backlog|未定義|[`PassengerSocketBacklog`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSocketBacklog)|server-config ||
+|passenger_spawn_method|未定義|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)|server-config virutal-host ||
+|passenger_start_timeout|未定義|[`PassengerStartTimeout`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartTimeout)|server-config virutal-host htaccess directory ||
+|passenger_startup_file|未定義|[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartupFile)|server-config virutal-host htaccess directory ||
+|passenger_stat_throttle_rate|未定義|[`PassengerStatThrottleRate`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStatThrottleRate)|server-config ||
+|passenger_sticky_sessions|未定義|[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessions)|server-config virutal-host htaccess directory ||
+|passenger_sticky_sessions_cookie_name|未定義|[`PassengerStickySessionsCookieName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessionsCookieName)|server-config virutal-host htaccess directory ||
+|passenger_thread_count|未定義|[`PassengerThreadCount`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerThreadCount)|server-config virutal-host htaccess directory ||
+|passenger_use_global_queue|未定義|PassengerUseGlobalQueue|server-config ||
+|passenger_user|未定義|[`PassengerUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUser)|server-config virutal-host directory ||
+|passenger_user_switching|未定義|[`PassengerUserSwitching`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUserSwitching)|server-config ||
+|rack_auto_detect|未定義|RackAutoDetect|server-config |これらのオプションは、バージョン4.0.0で最適化の一環として削除されました。代わりにPassengerEnabledを使用してください。|
+|rack_autodetect|未定義|n/a|||
+|rack_base_uri|未定義|RackBaseURI|server-config |3.0.0で廃止され、PassengerBaseURIが採用されました。|
+|rack_env|未定義|[`RackEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RackEnv)|server-config virutal-host htaccess directory ||
+|rails_allow_mod_rewrite|未定義|RailsAllowModRewrite|server-config |このオプションは、バージョン4.0.0以降では何の影響も与えません。|
+|rails_app_spawner_idle_time|未定義|RailsAppSpawnerIdleTime|server-config |このオプションはバージョン4.0.0で削除され、PassengerMaxPreloaderIdleTimeに置き換えられました。|
+|rails_auto_detect|未定義|RailsAutoDetect|server-config |これらのオプションは、バージョン4.0.0で最適化の一環として削除されました。代わりにPassengerEnabledを使用してください。|
+|rails_autodetect|未定義|n/a|||
+|rails_base_uri|未定義|RailsBaseURI|server-config |3.0.0で廃止され、PassengerBaseURIが採用されました。|
+|rails_default_user|未定義|RailsDefaultUser|server-config |3.0.0で廃止され、PassengerDefaultUserが採用されました。|
+|rails_env|未定義|[`RailsEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RailsEnv)|server-config virutal-host htaccess directory ||
+|rails_framework_spawner_idle_time|未定義|RailsFrameworkSpawnerIdleTime|server-config |このオプションはバージョン4.0.0では使用できません。フレームワークスポーンも同時に削除されたので、代わりのオプションはありません。スマートスポーンを使用してください。|
+|rails_ruby|未定義|RailsRuby|server-config |3.0.0で廃止され、PassengerRubyが採用されました。|
+|rails_spawn_method|未定義|RailsSpawnMethod|server-config |3.0.0で廃止され、PassengerSpawnMethodが採用されました。|
+|rails_user_switching|未定義|RailsUserSwitching|server-config |3.0.0で廃止され、PassengerUserSwitchingが採用されました。|
+|wsgi_auto_detect|未定義|WsgiAutoDetect|server-config |これらのオプションは、バージョン4.0.0で最適化の一環として削除されました。代わりにPassengerEnabledを使用してください。|
 
-  デフォルト値: `undef`。
 
 ##### クラス: `apache::mod::ldap`
 
@@ -2336,6 +2485,7 @@ $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 class { 'apache::mod::ldap':
   ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
   ldap_trusted_global_cert_type => 'CA_DER',
+  ldap_trusted_mode             => 'TLS',
   ldap_shared_cache_size        => '500000',
   ldap_cache_entries            => '1024',
   ldap_cache_ttl                => '600',
@@ -2356,6 +2506,8 @@ class { 'apache::mod::ldap':
 
   デフォルト値: 'CA_BASE64'。
 
+* `ldap_trusted_mode`: LDAPサーバ接続時に使用されるSSL/TLSモードを指定します。
+
 * `ldap_shared_cache_size`: 共有されたメモリのキャッシュのサイズをバイトで指定します。
 
 * `ldap_cache_entries`: 一次LDAPキャッシュのエントリの最大数を指定します。
@@ -2384,7 +2536,7 @@ class { 'apache::mod::ldap':
 
 * `language_priority`: モジュールの`LanguagePriority`オプションを設定するための言語の[配列][]。
 
-  デフォルト値: [ 'en'、'ca'、'cs'、'da'、'de'、'el'、'eo'、'es'、'et'、'fr'、'he'、'hr'、'it'、'ja'、'ko'、'ltz'、'nl'、'nn'、'no'、'pl'、'pt'、'pt*BR'、'ru'、'sv'、'zh*CN'、'zh*TW' ]。
+  デフォルト値: ['en'、'ca'、cs'、'da'、'de'、'el'、'eo'、'es'、'et'、'fr'、'he'、'hr'、'it'、'ja'、'ko'、'ltz'、'nl'、'nn'、'no'、'pl'、'pt'、'pt-BR'、'ru'、'sv'、'zh-CN'、'zh-TW']。
 
 ##### クラス: `apache::mod::nss`
 
@@ -2504,9 +2656,9 @@ I`mod_proxy`をインストールし、`proxy.conf.erb`テンプレートを使
 
 * `manager_path`: バランサマネージャのサーバロケーション。
 
-  デフォルト値: '/balancer*manager'。
+  デフォルト値: '/balancer-manager'。
 
-* `allow_from`: `/balancer*manager`にアクセスできるIPv4またはIPv6アドレスの[配列][]。
+* `allow_from`: `/balancer-manager`にアクセスできるIPv4またはIPv6アドレスの[配列][]。
 
   デフォルト値: ['127.0.0.1','::1']。　
 
@@ -2532,6 +2684,14 @@ I`mod_proxy`をインストールし、`proxy.conf.erb`テンプレートを使
 
 **注意**: `mod_proxy_html`に関して提供されている公式なパッケージはありません。そのため、apacheモジュールの外部から使用できるようにする必要があります。
 
+##### クラス: `apache::mod::python`
+
+[`mod_python`][]をインストールして設定します。
+
+**パラメータ**　
+
+* `loadfile_name`: pythonモジュールのロードに使用される設定ファイルの名前を指定します。
+
 ##### クラス: `apache::mod::reqtimeout`
 
 [`mod_reqtimeout`][]をインストールして設定します。
@@ -2567,9 +2727,9 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 - `ssl_cryptodevice`: デフォルト値: 'builtin'
 - `ssl_honorcipherorder`: デフォルト値: true
 - `ssl_openssl_conf_cmd`: デフォルト値: undef
-- `ssl_options`: デフォルト値: [ 'StdEnvVars' ]
+- `ssl_options`: デフォルト値: ['StdEnvVars']
 - `ssl_pass_phrase_dialog`: デフォルト値: 'builtin'
-- `ssl_protocol`: デフォルト値: [ 'all', '-SSLv2', '-SSLv3' ]
+- `ssl_protocol`: デフォルト値: ['all', '-SSLv2', '-SSLv3']。
 - `ssl_proxy_protocol`: デフォルト値: []
 - `ssl_random_seed_bytes`: 有効なオプション: 文字列、デフォルト値: '512'
 - `ssl_sessioncache`: 有効なオプション: 文字列。デフォルト値: '300'
@@ -2602,7 +2762,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 * `ssl_options`
 
-  デフォルト値: [ 'StdEnvVars' ]
+  デフォルト値: ['StdEnvVars']
 
 * `ssl_pass_phrase_dialog`
 
@@ -2610,7 +2770,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 * `ssl_protocol`
 
-  デフォルト値: [ 'all', '*SSLv2', '*SSLv3' ]
+  デフォルト値: ['all', '*SSLv2', '*SSLv3']。
 
 * `ssl_random_seed_bytes`
 
@@ -2645,6 +2805,24 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 * `allow_from`: `/server-status`にアクセスできるIPv4またはIPv6アドレスの[配列][]。
 
   デフォルト値: ['127.0.0.1','::1']。　
+
+* Apacheバージョン2.4以降の`mod_authz_host` ディレクティブ(`require ip`、`require host`など)を使用して、アクセスできる/できないIPまたは名前の文字列、[配列][]、または[ハッシュ][]。このパラメータは、以下のいずれかの構成で指定します。
+
+  > Apacheバージョンが2.4以降の場合のみ使用
+
+  - `undef` - `allow_from` および古いディレクティブ構文(`Allow from <List of IPs and/or names>`)を使用し、廃止予定の警告を通知します。
+  - 文字列
+    - `''`または`'unmanaged'` - authディレクティブなし(アクセス制御は別の方法で実施)
+    - `'ip <List of IPs>'` - `/server-status`にアクセスできるIP/範囲
+    - `'host <List of names>'` - `/server-status`にアクセスできる名前/ドメイン
+    - `'all [granted|denied]'` - すべてのユーザを許可/ブロック
+  - 配列 - 各要素には上記のいずれかの文字列が入ります。配列要素ごとに1つのディレクティブになります。
+  - 以下の構造を持つハッシュ(キー => 値の形式で表示、キーは文字列)
+    - `'requires'` => 上記に従った配列 - 配列と同じ作用
+    - `'enforce'`  => `'Any'`、`'All'`、`'None'`のいずれかの文字列(任意指定) - `'requires'`キーで指定されたすべてのディレクティブを`<Require(Any|All|None)>`ブロックで囲みます。
+
+  デフォルト値: 'ip 127.0.0.1 ::1'
+
 * `extended_status`: [`ExtendedStatus`][]ディレクティブをつうじて、各リクエストに関する拡張ステータス情報を追跡するかどうかを決定します。
 
   値: 'Off'、'On'。
@@ -2663,7 +2841,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 * `overrides`: ディレクティブタイプの[配列][]。
 
-  デフォルト値: '[ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]'。
+  デフォルト値: ['FileInfo', 'AuthConfig', 'Limit', 'Indexes']。
 
 ##### クラス: `apache::mod::version`
 
@@ -2678,13 +2856,13 @@ Trustwaveの[`mod_security`][]をインストールして設定します。こ
 **パラメータ**:　
 
 * `activated_rules`: `modsec_crs_path`のルールの[配列][]またはsymlinkを使用してアクティベートする絶対値。 
-* `allowed_methods`: 許可されるHTTPメソッドのスペース*区切りリスト。
+* `allowed_methods`: 許可されるHTTPメソッドのスペース区切りリスト。
 
   デフォルト値: 'GET HEAD POST OPTIONS'。
 
-* `content_types`: 1つまたは複数の許可される[MIMEタイプ][MIME `content*type`]のリスト。
+* `content_types`: 1つまたは複数の許可される[MIMEタイプ][MIME `content-type`]のリスト。
 
-  デフォルト値: 'application/x*www*form*urlencoded|multipart/form*data|text/xml|application/xml|application/x*amf'。
+  デフォルト値: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'。
 
 * `crs_package`: CRSルールをインストールするパッケージの名前。
 
@@ -2703,13 +2881,13 @@ ${modsec\_dir}/activated\_rules。
 
   デフォルト値: [`apache::params`][]の`modsec_secruleengine`。
 
-* `restricted_extensions`: 禁止されるファイル拡張子のスペース*区切りリスト。
+* `restricted_extensions`: 禁止されるファイル拡張子のスペース区切りリスト。
 
   デフォルト値: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'。
 
 * `restricted_headers`: 禁止されるヘッダのスラッシュおよびスペースで区切ったリスト。
 
-  デフォルト値: 'Proxy*Connection/ /Lock*Token/ /Content*Range/ /Translate/ /via/ /if/'。
+  デフォルト値: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'。
 
 * `secdefaultaction`: OWASP ModSecurityコアルールセットに関して、動作モード、自己完結('deny')、コラボレーティブ検出('pass')を設定します。
 
@@ -2801,7 +2979,7 @@ ${modsec\_dir}/activated\_rules。
 
   デフォルト値: `undef`。
 
-* `wsgi_python_path`: '/path/to/venv/site*packages'などの[`WSGIPythonPath`][]ディレクティブを定義します。
+* `wsgi_python_path`: '/path/to/venv/site-packages'などの[`WSGIPythonPath`][]ディレクティブを定義します。
 
   値: パスを指定する文字列。　
 
@@ -2869,6 +3047,12 @@ Apacheデーモンを管理します。
 
 デフォルト値: '{}'。
 
+##### `options`
+
+バランサURLの後に[オプション](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)の[配列][]を指定します。[`ProxyPass`][]で使用可能な任意のキー-値ペアを使用できます。
+
+デフォルト値: []。　
+
 ##### `collect_exported`
 
 [エクスポートリソース][]を使用するかどうかを決定します。
@@ -3101,7 +3285,7 @@ class { 'apache':
 
 ブーリアン。
 
-デフォルト値: `true`。　
+デフォルト値: `true`。
 
 ##### `access_log_env_var`
 
@@ -3364,7 +3548,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-デフォルト値: '[]'。
+デフォルト値: []。　
 
 ##### `ensure`
 
@@ -3380,7 +3564,7 @@ apache::vhost { 'sample.example.net':
 
 デフォルト値: `undef`。
 
-#####`fastcgi_idle_timeout`
+##### `fastcgi_idle_timeout`
 
 fastcgiを使用する場合に、このオプションにより、サーバ応答のタイムアウトを設定します。
 
@@ -3549,7 +3733,7 @@ apache::vhost { 'sample.example.net':
 - `krb_method_negotiate`: Negotiateメソッドを使用するかどうかを決定します。デフォルト値: 'on'。
 - `krb_method_k5passwd`: Kerberos v5に関してパスワードベースの認証を使用するかどうかを決定します。デフォルト値: 'on'。
 - `krb_authoritative`: 'off'に設定すると、認証コントロールを別のモジュールに渡すことができます。デフォルト値: 'on'。
-- `krb_auth_realms`: 認証に使用するKerberos領域の配列を指定します。デフォルト値: '[]'。
+- `krb_auth_realms`: 認証に使用するKerberos領域の配列を指定します。デフォルト値: []。
 - `krb_5keytab`: Kerberos v5キータブファイルのロケーションを指定します。デフォルト値: `undef`。
 - `krb_local_user_mapping`: 今後の使用のために、ユーザ名から@REALMを取り除きます。デフォルト値: `undef`。
 
@@ -3663,13 +3847,13 @@ apache::vhost { 'sample.example.net':
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  modsec_disable_msgs => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ],
+  modsec_disable_msgs => ['Blind SQL Injection Attack', 'Session Fixation Attack'],
 }
 ```
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  modsec_disable_msgs => { '/location1' => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ] },
+  modsec_disable_msgs => { '/location1' => ['Blind SQL Injection Attack', 'Session Fixation Attack'] },
 }
 ```
 
@@ -3681,13 +3865,13 @@ apache::vhost { 'sample.example.net':
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ],
+  modsec_disable_tags => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'],
 }
 ```
 
 ``` puppet
 apache::vhost { 'sample.example.net':
-  modsec_disable_tags => { '/location1' => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ] },
+  modsec_disable_tags => { '/location1' => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'] },
 }
 ```
 
@@ -3774,7 +3958,7 @@ apache::vhost { 'site.name.fdqn':
 
 指定されたバーチャルホストのオーバーライドを設定します。[AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride)引数の配列を使用できます。
 
-デフォルト値: '[none]'。
+デフォルト値: ['None']。
 
 ##### `passenger_spawn_method`
 
@@ -3871,12 +4055,17 @@ sengermaxrequests)を設定します。これは、アプリケーションプ
 
 [`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile)パスを設定します。このパスは、アプリケーションルートに関連しています。
 
-##### `php_flags & values`
+##### `php_values & php_flags`
 
 バーチャルホストごとの設定[`php_value`または`php_flag`](http://php.net/manual/en/configuration.changes.php)を許可します。これらのフラグや値は、ユーザまたはアプリケーションにより上書きすることができます。
 
 デフォルト値: '{}'。
 
+vhostの宣言内
+``` puppet
+  php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
+```
+
 ##### `php_admin_flags & values`
 
 バーチャルホストごとの設定[`php_admin_value`または`php_admin_flag`](http://php.net/manual/en/configuration.changes.php)を許可します。これらのフラグや値は、ユーザまたはアプリケーションにより上書きすることができます。
@@ -3957,7 +4146,7 @@ rack設定のリソース識別子を設定します。指定されたファイ
 
 デフォルト値: `undef`。
 
-#####`passenger_base_uris`
+##### `passenger_base_uris`
 
 任意のURIをPhusion Passengerのサーブするアプリケーションとして指定するのに使用します。指定されたファイルパスは、_passenger_base_uris.erbテンプレート内の[Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI)のpassengerアプリケーションルートとしてリストされます。
 
@@ -4181,7 +4370,7 @@ ScriptAliasおよびScriptAliasMatchディレクティブは、指定した順
 
 サイトの[ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias)を設定します。
 
-デフォルト値: '[]'。
+デフォルト値: []。　
 
 ##### `servername`
 
@@ -4193,7 +4382,7 @@ ScriptAliasおよびScriptAliasMatchディレクティブは、指定した順
 
 HTTPDにより使用し、バーチャルホストの環境変数を設定します。
 
-デフォルト値: '[]'。
+デフォルト値: []。　
 
 例:
 
@@ -4207,13 +4396,13 @@ apache::vhost { 'setenv.example.com':
 
 HTTPDにより使用し、条件を用いてバーチャルホストの環境変数を設定します。
 
-デフォルト値: '[]'。
+デフォルト値: []。　
 
 ##### `setenvifnocase`
 
 HTTPDにより使用し、条件を用いてバーチャルホストの環境変数を設定します(大文字小文字を区別しないマッチング)。
 
-デフォルト値: '[]'。
+デフォルト値: []。　
 
 ##### `suphp_*`
 
@@ -4712,6 +4901,7 @@ apache::vhost { 'sample.example.net':
 - `mellon_sp_private_key_file`: サービスプロバイダのプライベートキー保存場所に関する[MellonSPPrivateKeyFile][`mod_auth_mellon`]ディレクティブを設定します。
 - `mellon_sp_cert_file`: サービスプロバイダの公開キー保存場所に関する[MellonSPCertFile][`mod_auth_mellon`]ディレクティブを設定します。
 - `mellon_user`: ユーザ名に関して使用する[MellonUser][`mod_auth_mellon`]属性を設定します。
+- `mellon_session_length`: [MellonSessionLength][`mod_auth_mellon`]属性を設定します。
 
 ##### `options`
 
@@ -4877,12 +5067,12 @@ apache::vhost { 'secure.example.net':
       rewrites => [ { comment      => 'Permalink Rewrites',
                       rewrite_base => '/'
                     },
-                    { rewrite_rule => [ '^index\.php$ - [L]' ]
+                    { rewrite_rule => ['^index\.php$ - [L]']
                     },
-                    { rewrite_cond => [ '%{REQUEST_FILENAME} !-f',
-                                        '%{REQUEST_FILENAME} !-d',
+                    { rewrite_cond => ['%{REQUEST_FILENAME} !-f',
+                                       '%{REQUEST_FILENAME} !-d',
                                       ],
-                      rewrite_rule => [ '. /index.php [L]' ],
+                      rewrite_rule => ['. /index.php [L]'],
                     }
                   ],
     },
@@ -4912,6 +5102,10 @@ apache::vhost { 'secure.example.net':
 
 'On'に設定すると、アプリケーションに属性を公開するリクエストヘッダの使用がオンになります。このキーの値は'On'または'Off'です。デフォルト値は'Off'です。このキーは、`apache::mod::shib`が定義されていない場合は無効になります。詳細については、[`mod_shib`ドキュメント](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions)を参照してください。
 
+##### `shib_compat_valid_user`
+
+このコマンドが存在しなかったときの動作と合わせるため、デフォルト値はOffです。 "valid-user"および"user"のRequireルールの処理で、「標準」Apacheの動作を復元して、Shibbolethをその他のauth/authモジュールと組み合わせて使用する場合の競合を解消します。詳細については、[`mod_shib`ドキュメント](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions)、および[NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess)を参照してください。`apache::mod::shib`が定義されていない場合、このキーは無効です。
+
 ##### `ssl_options`
 
 [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)の文字列またはリスト。これにより、SSLエンジンのランタイムオプションが設定されます。このハンドラは、バーチャルホストの親ブロック内のSSLOptionsセットよりも優先されます。
@@ -4924,7 +5118,7 @@ apache::vhost { 'secure.example.net':
       ssl_options => '+ExportCertData',
     },
     { path        => '/path/to/different/dir',
-      ssl_options => [ '-StdEnvVars', '+ExportCertData'],
+      ssl_options => ['-StdEnvVars', '+ExportCertData'],
     },
   ],
 }
@@ -4956,7 +5150,7 @@ apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
     { path  => '/path/to/different/dir',
-      additional_includes => [ '/custom/path/includes', '/custom/path/another_includes', ],
+      additional_includes => ['/custom/path/includes', '/custom/path/another_includes',],
     },
   ],
 }
@@ -5100,6 +5294,12 @@ apache::vhost { 'sample.example.net':
 
 デフォルト値: `undef`。　
 
+##### `ssl_proxy_cipher_suite`
+
+[SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)ディレクティブを設定します。このディレクティブは、sslプロキシトラフィックに対してサポートされる暗号化スイートを制御します。
+
+デフォルト値: `undef`。　
+
 ##### `ssl_proxy_ca_cert`
 
 [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile)ディレクティブを設定します。これにより、やりとりするリモートサーバに関する認証局(CA)の証明書を集められるオールインワンファイルを指定します。これはリモートサーバ認証に用いられます。このファイルは、PEMエンコード証明書ファイルを優先順に連結したものにする必要があります。
@@ -5161,7 +5361,7 @@ apache::vhost { 'sample.example.net':
 ``` puppet
 apache::vhost { 'sample.example.net':
   …
-  ssl_options => [ '+StrictRequire', '+ExportCertData' ],
+  ssl_options => ['+StrictRequire', '+ExportCertData'],
 }
 ```
 
@@ -5327,6 +5527,10 @@ FreeBSDに関してのみ、[`Peruser`][]モジュールを有効にします。
 
 Apacheモジュールは、[`apache::vhost`][]および[`apache::mod`][]定義タイプを有効にするにあたり、テンプレートに大きく依存しています。このテンプレートは、オペレーティングシステムに固有の[Facter][] factsをベースに構築されています。明示的にコールアウトされない限り、ほとんどのテンプレートは設定には使われません。
 
+### タスク
+
+Apacheモジュールには、サービスの再起動なしでApache設定を再ロードできるタスクがあります。タスクの実行方法については、[Puppet Enterpriseマニュアル](https://puppet.com/docs/pe/2017.3/orchestrator/running_tasks.html)または[Boltマニュアル](https://puppet.com/docs/bolt/latest/bolt.html)を参照してください。
+
 ### 関数
 #### apache_pw_hash
 Apacheが読みこむhtpasswdファイルに適したフォーマットでパスワードをハッシュします。

From 3383b7d7721796af4200f314caa1210f262275c9 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Tue, 6 Mar 2018 16:14:05 -0800
Subject: [PATCH 1335/2267] Update changelog to reflect
 http://keepachangelog.com/

This should also reflect our internal documentation style.
- Document all parameters, classes, defines, facts, & functions as API.
- The three changelog sections are "Changed" for breaking changes,
"Added" for features, and "Fixed" for bugfixes, in that order.
- Changes irrelevant to end users (such as .gitignore changes or
.travis.yml changes) need not be mentioned.
- Changelogs should follow README style and convention where code
formatting is concerned.
---
 CHANGELOG.md | 124 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 93 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e441808b2a..f1f29b4da8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,41 +5,103 @@ and this project adheres to [Semantic Versioning](http://semver.org).
 
 ## Supported Release [3.0.0]
 ### Summary
-This release updates the code to match the set Rubocop standards in additiont to adding several minor features. AS this release includes Puppet 4 updates it is thus backwards incompatible.
+This major release changes the default value of `keepalive` to `On`. It also includes many other features and bugfixes.
 
-### Fixed
-- Fixes made to mod_passenger test's.
-- REMOVED options bug fix.
-- Fix case of setting apache::mpm_module to false and declaring the mpm class yourself b/c you need to set params.
-- Various small fixes.
+#### Changed
+- Default `apache::keepalive` from `Off` to `On`.
 
 #### Added
-- ShibCompatValidUser option added to vhost config.
-- loadfile_name option exposed to mod::python class.
-- $options added to 'balancer' type.
-- log formats updated to include client ip.
-- EnableCapabilities added for itk.
-- Support added for UseCanonicalName.
-- Option added to include CacheIgnorHEaders for disk_cache module.
-- Added ability to specify MellonSessionLength.
-- CASSscrubRequestHeaders now created in _auth_cas.erb.
-- $apache_version param now defined.
-- Auxiliary template included for 'Require' directives for mod::*.
-- Acceptance test added for param LimitRequestFields.
-- Acceptance test added for param shib_compat_valid_user.
-- Updated to use puppet 4 functions-api.
-
-#### Changed
-- remoteip: apacher::service notified instead of service['httpd'].
-- Travis test parellelism reduced.
-- Modulesync updates.
-- Default keepalive set to on in all distros.
-- php_values section adjusted.
-- Various doc changes made.
-- Code updated to match the set Rubocop standards.
+- Class `apache::mod::data`
+- Function `apache::apache_pw_hash` function (puppet 4 port of `apache_pw_hash()`)
+- Function `apache::bool2httpd` function (puppet 4 port of `bool2httpd()`)
+- Function `apache::validate_apache_log_level` function (puppet 4 port of `validate_apache_log_level()`)
+- Parameter `apache::balancer::options` for additional directives.
+- Parameter `apache::limitreqfields` setting the LimitRequestFields directive to 100.
+- Parameter `apache::use_canonical_name` to control how httpd uses self-referential URLs.
+- Parameter `apache::mod::disk_cache::cache_ignore_headers` to ignore cache headers.
+- Parameter `apache::mod::itk::enablecapabilities` to manage ITK capabilities.
+- Parameter `apache::mod::ldap::ldap_trusted_mode` to manage trusted mode.
+- Parameters for `apache::mod::passenger`:
+  - `passenger_allow_encoded_slashes`
+  - `passenger_app_group_name`
+  - `passenger_app_root`
+  - `passenger_app_type`
+  - `passenger_base_uri`
+  - `passenger_buffer_response`
+  - `passenger_buffer_upload`
+  - `passenger_concurrency_model`
+  - `passenger_debug_log_file`
+  - `passenger_debugger`
+  - `passenger_default_group`
+  - `passenger_default_user`
+  - `passenger_disable_security_update_check`
+  - `passenger_enabled`
+  - `passenger_error_override`
+  - `passenger_file_descriptor_log_file`
+  - `passenger_fly_with`
+  - `passenger_force_max_concurrent_requests_per_process`
+  - `passenger_friendly_error_pages`
+  - `passenger_group`
+  - `passenger_installed_version`
+  - `passenger_instance_registry_dir`
+  - `passenger_load_shell_envvars`
+  - `passenger_lve_min_uid`
+  - `passenger_max_instances`
+  - `passenger_max_preloader_idle_time`
+  - `passenger_max_request_time`
+  - `passenger_memory_limit`
+  - `passenger_meteor_app_settings`
+  - `passenger_nodejs`
+  - `passenger_pre_start`
+  - `passenger_python`
+  - `passenger_resist_deployment_errors`
+  - `passenger_resolve_symlinks_in_document_root`
+  - `passenger_response_buffer_high_watermark`
+  - `passenger_restart_dir`
+  - `passenger_rolling_restarts`
+  - `passenger_security_update_check_proxy`
+  - `passenger_show_version_in_header`
+  - `passenger_socket_backlog`
+  - `passenger_start_timeout`
+  - `passenger_startup_file`
+  - `passenger_sticky_sessions`
+  - `passenger_sticky_sessions_cookie_name`
+  - `passenger_thread_count`
+  - `passenger_user`
+  - `passenger_user_switching`
+  - `rack_auto_detect`
+  - `rack_base_uri`
+  - `rack_env`
+  - `rails_allow_mod_rewrite`
+  - `rails_app_spawner_idle_time`
+  - `rails_auto_detect`
+  - `rails_base_uri`
+  - `rails_default_user`
+  - `rails_env`
+  - `rails_framework_spawner_idle_time`
+  - `rails_ruby`
+  - `rails_spawn_method`
+  - `rails_user_switching`
+  - `wsgi_auto_detect`
+- Parameter `apache::mod::prefork::listenbacklog` to set the listen backlog to 511.
+- Parameter `apache::mod::python::loadfile_name` to workaround python.load filename conflicts.
+- Parameter `apache::mod::ssl::ssl_cert` to manage the client auth cert.
+- Parameter `apache::mod::ssl::ssl_key` to manage the client auth key.
+- Parameter `apache::mod::status::requires` as an alternative to `apache::mod::status::allow_from`
+- Parameter `apache::vhost::ssl_proxy_cipher_suite` to manage that directive.
+- Parameter `apache::vhost::shib_compat_valid_user` to manage that directive.
+- Parameter `apache::vhost::use_canonical_name` to manage that directive.
+- Parameter value `mellon_session_length` for `apache::vhost::directories`
 
-#### Removed
-- Unused variable $_logs_dest removed.
+### Fixed
+- `apache_version` is confined to just Linux to avoid erroring on AIX.
+- Parameter `apache::mod::jk::workers_file_content` docs typo of "mantain" instead of maintain.
+- Deduplicate `apache::mod::ldap` managing `File['ldap.conf']` to avoid resource conflicts.
+- ITK package name on Debian 9
+- Dav_svn package for SLES
+- Log client IP instead of loadbalancer IP when behind a loadbalancer.
+- `apache::mod::remoteip` now notifies the `Class['apache::service']` class instead of `Service['httpd']` to avoid restarting the service when `apache::service_manage` is false.
+- `apache::vhost::cas_scrub_request_headers` actually manages the directive.
 
 ## Supported Release [2.3.1]
 ### Summary

From b882cf1a44af985aaa87739a14a4dd8057175bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 5 Mar 2018 19:50:08 +0100
Subject: [PATCH 1336/2267] Allow overriding passenger_group in apache::vhost

Just like we can use passenger_user in a VHost, allow setting
passenger_group.
---
 README.md                      | 4 ++++
 manifests/vhost.pp             | 6 ++++--
 spec/defines/vhost_spec.rb     | 6 ++++++
 templates/vhost/_passenger.erb | 3 +++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 05b076a361..3038354a69 100755
--- a/README.md
+++ b/README.md
@@ -4059,6 +4059,10 @@ Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/
 
 Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser), the running user for sandboxing applications.
 
+##### `passenger_group`
+
+Sets [PassengerGroup](https://www.phusionpassenger.com/library/config/apache/reference/#passengergroup), the running group for sandboxing applications.
+
 ##### `passenger_high_performance`
 
 Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 86fa06e63a..13b6df77b6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -144,6 +144,7 @@
   $passenger_start_timeout                                                          = undef,
   $passenger_pre_start                                                              = undef,
   $passenger_user                                                                   = undef,
+  $passenger_group                                                                  = undef,
   $passenger_high_performance                                                       = undef,
   $passenger_nodejs                                                                 = undef,
   Optional[Boolean] $passenger_sticky_sessions                                      = undef,
@@ -236,7 +237,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_max_requests or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file {
+  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_max_requests or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_group or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file {
     include ::apache::mod::passenger
   }
 
@@ -967,10 +968,11 @@
   # - $passenger_start_timeout
   # - $passenger_pre_start
   # - $passenger_user
+  # - $passenger_group
   # - $passenger_nodejs
   # - $passenger_sticky_sessions
   # - $passenger_startup_file
-  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{
+  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_group or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8edc95eece..25daf2e31b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -412,6 +412,7 @@
           'passenger_pre_start'         => 'http://localhost/myapp',
           'passenger_high_performance'  => true,
           'passenger_user'              => 'sandbox',
+          'passenger_group'             => 'sandbox',
           'passenger_nodejs'            => '/usr/bin/node',
           'passenger_sticky_sessions'   => true,
           'passenger_startup_file'      => 'bin/www',
@@ -851,6 +852,11 @@
           content: %r{^\s+MaxKeepAliveRequests\s1000$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerGroup\ssandbox$},
+        )
+      }
     end
     context 'vhost with multiple ip addresses' do
       let :params do
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index e53165b6a9..f3c3d80b46 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -25,6 +25,9 @@
 <% if @passenger_user -%>
   PassengerUser <%= @passenger_user %>
 <% end -%>
+<% if @passenger_group -%>
+  PassengerGroup <%= @passenger_group %>
+<% end -%>
 <% if @passenger_high_performance -%>
   PassengerHighPerformance <%= scope.call_function('apache::bool2httpd', [@passenger_high_performance]) %>
 <% end -%>

From 3d28646ed608c94096f90c9e19078005ec383f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Wed, 7 Mar 2018 12:56:21 +0100
Subject: [PATCH 1337/2267] Add missing passenger tests

---
 spec/defines/vhost_spec.rb | 65 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 25daf2e31b..5e140b6f31 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -852,11 +852,76 @@
           content: %r{^\s+MaxKeepAliveRequests\s1000$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerSpawnMethod\sdirect$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerAppRoot\s/usr/share/myapp$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerAppEnv\stest$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMinInstances\s1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMaxRequests\s1000$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerStartTimeout\s600$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerPreStart\shttp://localhost/myapp$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerHighPerformance\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerUser\ssandbox$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerGroup\ssandbox$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerNodejs\s/usr/bin/node$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerStickySessions\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerStartupFile\sbin/www$},
+        )
+      }
     end
     context 'vhost with multiple ip addresses' do
       let :params do

From 25a1c3ab3755e781c4b8086d1d7321beb4e07af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Wed, 7 Mar 2018 12:57:47 +0100
Subject: [PATCH 1338/2267] Unbreak test suite

There is no reason to remove the trailing newline here.
---
 templates/vhost/_passenger.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index f3c3d80b46..df5ea0f398 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -32,7 +32,7 @@
   PassengerHighPerformance <%= scope.call_function('apache::bool2httpd', [@passenger_high_performance]) %>
 <% end -%>
 <% if @passenger_nodejs -%>
-  PassengerNodejs <%= @passenger_nodejs -%>
+  PassengerNodejs <%= @passenger_nodejs %>
 <% end -%>
 <% if @passenger_sticky_sessions -%>
   PassengerStickySessions <%= scope.call_function('apache::bool2httpd', [@passenger_sticky_sessions]) %>

From 0853260b47433a5044f457c85431ff76908a0250 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppet.com>
Date: Wed, 7 Mar 2018 11:52:04 +0000
Subject: [PATCH 1339/2267] PDK Convert 1.4.1

---
 .gitignore          |  37 +++++-----
 .rubocop.yml        |  19 +++--
 .rubocop_todo.yml   |   2 +
 .sync.yml           |  58 ++++++++++++---
 .travis.yml         |  85 +++++++++++++++------
 Gemfile             | 175 ++++++++++++++++++++++++++++----------------
 Rakefile            |  38 +---------
 metadata.json       |  16 +++-
 spec/spec_helper.rb |  29 +++++++-
 9 files changed, 292 insertions(+), 167 deletions(-)

diff --git a/.gitignore b/.gitignore
index a1022772e0..56efb9ca14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,22 @@
-# This file is generated by ModuleSync, do not edit.
-*.iml
 .*.sw[op]
-.DS_Store
-.bundle/
-.idea/
 .metadata
-.vagrant/
 .yardoc
 .yardwarns
-Gemfile.local
-Gemfile.lock
-bin/
-coverage/
-doc/
-junit/
-log/
-pkg/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-tmp/
-vendor/
-
+*.iml
+/.bundle/
+/.idea/
+/.vagrant/
+/coverage/
+/bin/
+/doc/
+/Gemfile.local
+/Gemfile.lock
+/junit/
+/log/
+/pkg/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/tmp/
+/vendor/
+/convert_report.txt
+.DS_Store
diff --git a/.rubocop.yml b/.rubocop.yml
index 12e5637c4d..50220b4bce 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,7 @@
 ---
-require:
- - rubocop-rspec
+require: rubocop-rspec
 AllCops:
+  DisplayCopNames: true
   TargetRubyVersion: '2.1'
   Include:
   - "./**/*.rb"
@@ -13,7 +13,6 @@ AllCops:
   - pkg/**/*
   - spec/fixtures/**/*
   - vendor/**/*
-inherit_from: .rubocop_todo.yml
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
@@ -64,12 +63,17 @@ Style/TrailingCommaInLiteral:
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets
+inherit_from: ".rubocop_todo.yml"
+RSpec/MessageSpies:
+  EnforcedStyle: receive
 Style/CollectionMethods:
   Enabled: true
 Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+Layout/EndOfLine:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
@@ -88,14 +92,17 @@ Metrics/PerceivedComplexity:
   Enabled: false
 RSpec/DescribeClass:
   Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
 RSpec/MessageExpectation:
   Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/NestedGroups:
+  Enabled: false
 Style/AsciiComments:
   Enabled: false
 Style/IfUnlessModifier:
   Enabled: false
 Style/SymbolProc:
   Enabled: false
-#TODO: Additional value added to resolve error's
-Style/GlobalVars:
-  Enabled: false
\ No newline at end of file
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e69de29bb2..91ec5a148a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -0,0 +1,2 @@
+Style/GlobalVars:
+  Enabled: false
diff --git a/.sync.yml b/.sync.yml
index 8ea87b0d2d..01082093d3 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,16 +1,50 @@
 ---
-appveyor.yml:
-  delete: true
-Rakefile:
-  extra_disabled_lint_checks:
-  - 'disable_only_variable_string'
-spec/spec_helper.rb:
-  allow_deprecations: true
 .travis.yml:
-  env:
-    global:
-      - "PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers"
+  bundle_args: --without system_tests
+  docker_sets:
+    - set: docker/centos-7
+      options:
+    - set: docker/ubuntu-14.04
+      options:
+  docker_defaults:
+    bundler_args: ""
+  secure: ""
+  branches:
+    - release
   extras:
-    - rvm: 2.1.9
-      script: bundle exec rake rubocop
+    - env: CHECK=release_checks
+      rvm: 2.1.9
+
+Gemfile:
+  required:
+    ':system_tests':
+      - gem: 'puppet-module-posix-system-r#{minor_version}'
+        platforms: ruby
+      - gem: 'puppet-module-win-system-r#{minor_version}'
+        platforms:
+          - mswin
+          - mingw
+          - x64_mingw
+      - gem: beaker
+        version: '~> 3.13'
+        from_env: BEAKER_VERSION
+      - gem: beaker-abs
+        from_env: BEAKER_ABS_VERSION
+        version: '~> 0.1'
+      - gem: beaker-pe
+      - gem: beaker-hostgenerator
+        from_env: BEAKER_HOSTGENERATOR_VERSION
+      - gem: beaker-rspec
+        from_env: BEAKER_RSPEC_VERSION
+    ':development':
+      - gem: puppet-blacksmith
+        version: '~> 3.4'
+
+Rakefile:
+  requires:
+    - puppet_blacksmith/rake_tasks
+    - puppet-lint/tasks/puppet-lint
 
+.rubocop.yml:
+   default_configs:
+    inherit_from: .rubocop_todo.yml
diff --git a/.travis.yml b/.travis.yml
index 1f04fd1d1d..05049515b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,71 @@
-#This file is generated by ModuleSync, do not edit.
 ---
+env:
+  global:
+    - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
 sudo: false
+dist: trusty
 language: ruby
 cache: bundler
-script: "bundle exec rake release_checks"
+before_install:
+  - bundle -v
+  - rm Gemfile.lock || true
+  - gem update --system
+  - gem update bundler
+  - gem --version
+  - bundle -v
+script:
+  - 'bundle exec rake $CHECK'
+bundler_args: --without system_tests
+rvm:
+  - 2.4.1
 env:
-  global:
-    - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
+  - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.3.1
-    dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
-    script: bundle exec rake beaker
-    services: docker
-    sudo: required
-  - rvm: 2.3.1
-    dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
-    script: bundle exec rake beaker
-    services: docker
-    sudo: required
-  - rvm: 2.4.1
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 5.0"
-  - rvm: 2.1.9
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0"
-  - rvm: 2.1.9
-    script: bundle exec rake rubocop
+    -
+      bundler_args: 
+      dist: trusty
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+      rvm: 2.4.1
+      script: bundle exec rake beaker
+      services: docker
+      sudo: required
+    -
+      bundler_args: 
+      dist: trusty
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+      rvm: 2.4.1
+      script: bundle exec rake beaker
+      services: docker
+      sudo: required
+    -
+      env: CHECK=rubocop
+    -
+      env: CHECK="syntax lint"
+    -
+      env: CHECK=metadata_lint
+    -
+      env: CHECK=spec
+    -
+      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
+      rvm: 2.1.9
+    -
+      env: CHECK=release_checks
+      rvm: 2.1.9
+branches:
+  only:
+    - master
+    - /^v\d/
+    - release
 notifications:
   email: false
+deploy:
+  provider: puppetforge
+  user: puppet
+  password:
+    secure: ""
+  on:
+    tags: true
+    all_branches: true
+    condition: "$DEPLOY_TO_FORGE = yes"
diff --git a/Gemfile b/Gemfile
index 4ed22771fd..37597a3035 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,85 +1,136 @@
-#This file is generated by ModuleSync, do not edit.
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+def location_for(place_or_version, fake_version = nil)
+  if place_or_version =~ %r{\A(git[:@][^#]*)#(.*)}
+    [fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact
+  elsif place_or_version =~ %r{\Afile:\/\/(.*)}
+    ['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }]
+  else
+    [place_or_version, { require: false }]
+  end
+end
 
-# Determines what type of gem is requested based on place_or_version.
 def gem_type(place_or_version)
-  if place_or_version =~ /^git:/
+  if place_or_version =~ %r{\Agit[:@]}
     :git
-  elsif place_or_version =~ /^file:/
+  elsif !place_or_version.nil? && place_or_version.start_with?('file:')
     :file
   else
     :gem
   end
 end
 
-# Find a location or specific version for a gem. place_or_version can be a
-# version, which is most often used. It can also be git, which is specified as
-# `git://somewhere.git#branch`. You can also use a file source location, which
-# is specified as `file://some/location/on/disk`.
-def location_for(place_or_version, fake_version = nil)
-  if place_or_version =~ /^(git[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place_or_version =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place_or_version, { :require => false }]
-  end
-end
-
-# Used for gem conditionals
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
-minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
-
-# The following gems are not included by default as they require DevKit on Windows.
-# You should probably include them in a Gemfile.local or a ~/.gemfile
-#gem 'pry' #this may already be included in the gemfile
-#gem 'pry-stack_explorer', :require => false
-#if RUBY_VERSION =~ /^2/
-#  gem 'pry-byebug'
-#else
-#  gem 'pry-debugger'
-#end
+minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
-  gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "puppet-module-posix-dev-r#{minor_version}",        :require => false, :platforms => "ruby"
-  gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "json_pure", '<= 2.0.1',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "fast_gettext", '1.1.0',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                     :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem "fast_gettext", '1.1.0',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
+  gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-blacksmith", '~> 3.4',                   require: false
 end
-
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
-  gem "puppet-module-win-system-r#{minor_version}",                              :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
-  gem "beaker-pe",                                                               :require => false
-  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
-  gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
-  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
-  gem "puppet-blacksmith", '~> 3.4',                                             :require => false
-  gem "beaker-task_helper"
+  gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}",                              require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.13')
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
+  gem "beaker-pe",                                                               require: false
+  gem "beaker-hostgenerator"
+  gem "beaker-rspec"
+end
+
+puppet_version = ENV['PUPPET_GEM_VERSION']
+puppet_type = gem_type(puppet_version)
+facter_version = ENV['FACTER_GEM_VERSION']
+hiera_version = ENV['HIERA_GEM_VERSION']
+
+def puppet_older_than?(version)
+  puppet_version = ENV['PUPPET_GEM_VERSION']
+  !puppet_version.nil? &&
+    Gem::Version.correct?(puppet_version) &&
+    Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup))
 end
 
-gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
+gems = {}
 
-# Only explicitly specify Facter/Hiera if a version has been specified.
-# Otherwise it can lead to strange bundler behavior. If you are seeing weird
-# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable
-# to `1` and then run bundle install.
-gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
-gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
+gems['puppet'] = location_for(puppet_version)
 
-# Evaluate Gemfile.local if it exists
-if File.exists? "#{__FILE__}.local"
-  eval(File.read("#{__FILE__}.local"), binding)
+# If facter or hiera versions have been specified via the environment
+# variables, use those versions. If not, and if the puppet version is < 3.5.0,
+# use known good versions of both for puppet < 3.5.0.
+if facter_version
+  gems['facter'] = location_for(facter_version)
+elsif puppet_type == :gem && puppet_older_than?('3.5.0')
+  gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false]
 end
 
-# Evaluate ~/.gemfile if it exists
-if File.exists?(File.join(Dir.home, '.gemfile'))
-  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
+if hiera_version
+  gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION'])
+elsif puppet_type == :gem && puppet_older_than?('3.5.0')
+  gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false]
 end
 
-# vim:ft=ruby
+if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0'))
+  # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows
+  if puppet_type == :gem
+    gems['ffi'] =            ['1.9.0',                require: false]
+    gems['minitar'] =        ['0.5.4',                require: false]
+    gems['win32-eventlog'] = ['0.5.3',    '<= 0.6.5', require: false]
+    gems['win32-process'] =  ['0.6.5',    '<= 0.7.5', require: false]
+    gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false]
+    gems['win32-service'] =  ['0.7.2',    '<= 0.8.8', require: false]
+  else
+    gems['ffi'] =            ['~> 1.9.0',             require: false]
+    gems['minitar'] =        ['~> 0.5.4',             require: false]
+    gems['win32-eventlog'] = ['~> 0.5',   '<= 0.6.5', require: false]
+    gems['win32-process'] =  ['~> 0.6',   '<= 0.7.5', require: false]
+    gems['win32-security'] = ['~> 0.1',   '<= 0.2.5', require: false]
+    gems['win32-service'] =  ['~> 0.7',   '<= 0.8.8', require: false]
+  end
+
+  gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false]
+
+  if RUBY_VERSION.start_with?('1.')
+    gems['win32console'] = ['1.3.2', require: false]
+    # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x
+    gems['sys-admin'] =    ['1.5.6', require: false]
+  end
+
+  # Puppet < 3.7.0 requires these.
+  # Puppet >= 3.5.0 gem includes these as requirements.
+  # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0.
+  gems['win32-api'] =           ['1.4.8', require: false]
+  gems['win32-taskscheduler'] = ['0.2.2', require: false]
+  gems['windows-api'] =         ['0.4.3', require: false]
+  gems['windows-pr'] =          ['1.2.3', require: false]
+elsif Gem.win_platform?
+  # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
+  # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
+  gems['win32-dir'] =      ['<= 0.4.9', require: false]
+  gems['win32-eventlog'] = ['<= 0.6.5', require: false]
+  gems['win32-process'] =  ['<= 0.7.5', require: false]
+  gems['win32-security'] = ['<= 0.2.5', require: false]
+  gems['win32-service'] =  ['<= 0.8.8', require: false]
+end
+
+gems.each do |gem_name, gem_params|
+  gem gem_name, *gem_params
+end
+
+# Evaluate Gemfile.local and ~/.gemfile if they exist
+extra_gemfiles = [
+  "#{__FILE__}.local",
+  File.join(Dir.home, '.gemfile'),
+]
+
+extra_gemfiles.each do |gemfile|
+  if File.file?(gemfile) && File.readable?(gemfile)
+    eval(File.read(gemfile), binding)
+  end
+end
+# vim: syntax=ruby
diff --git a/Rakefile b/Rakefile
index 3994519d9d..a39cae2f03 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,38 +1,4 @@
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-syntax/tasks/puppet-syntax'
+require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
-
-PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_only_variable_string')
-
-desc 'Generate pooler nodesets'
-task :gen_nodeset do
-  require 'beaker-hostgenerator'
-  require 'securerandom'
-  require 'fileutils'
-
-  agent_target = ENV['TEST_TARGET']
-  if ! agent_target
-    STDERR.puts 'TEST_TARGET environment variable is not set'
-    STDERR.puts 'setting to default value of "redhat-64default."'
-    agent_target = 'redhat-64default.'
-  end
-
-  master_target = ENV['MASTER_TEST_TARGET']
-  if ! master_target
-    STDERR.puts 'MASTER_TEST_TARGET environment variable is not set'
-    STDERR.puts 'setting to default value of "redhat7-64mdcl"'
-    master_target = 'redhat7-64mdcl'
-  end
-
-  targets = "#{master_target}-#{agent_target}"
-  cli = BeakerHostGenerator::CLI.new([targets])
-  nodeset_dir = "tmp/nodesets"
-  nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml"
-  FileUtils.mkdir_p(nodeset_dir)
-  File.open(nodeset, 'w') do |fh|
-    fh.print(cli.execute)
-  end
-  puts nodeset
-end
diff --git a/metadata.json b/metadata.json
index 09e61ad663..c28f081c90 100644
--- a/metadata.json
+++ b/metadata.json
@@ -8,10 +8,15 @@
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.13.1 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 2.2.1 < 5.0.0"}
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 5.0.0"
+    },
+    {
+      "name": "puppetlabs/concat",
+      "version_requirement": ">= 2.2.1 < 5.0.0"
+    }
   ],
-  "data_provider": null,
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -72,5 +77,8 @@
       "version_requirement": ">= 4.7.0 < 6.0.0"
     }
   ],
-  "description": "Module for Apache configuration"
+  "description": "Module for Apache configuration",
+  "pdk-version": "1.4.1",
+  "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
+  "template-ref": "1.4.1-0-g52adbbb"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 01912b60c4..efd225b540 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,30 @@
-# This file is generated by ModuleSync, do not edit.
 require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet-facts'
 
-# put local configuration and setup into spec_helper_local
 begin
-  require 'spec_helper_local'
+  require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 rescue LoadError => loaderror
-  puts "Could not require spec_helper_local: #{loaderror.message}"
+  warn "Could not require spec_helper_local: #{loaderror.message}"
+end
+
+include RspecPuppetFacts
+
+default_facts = {
+  puppetversion: Puppet.version,
+  facterversion: Facter.version,
+}
+
+default_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml'))
+default_module_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml'))
+
+if File.exist?(default_facts_path) && File.readable?(default_facts_path)
+  default_facts.merge!(YAML.safe_load(File.read(default_facts_path)))
+end
+
+if File.exist?(default_module_facts_path) && File.readable?(default_module_facts_path)
+  default_facts.merge!(YAML.safe_load(File.read(default_module_facts_path)))
+end
+
+RSpec.configure do |c|
+  c.default_facts = default_facts
 end

From 60e60d44817dce086b73bff578a465240a1102d8 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppet.com>
Date: Wed, 7 Mar 2018 14:23:03 +0000
Subject: [PATCH 1340/2267] Rubocop Fixes for conversion

---
 .rubocop_todo.yml                              | 18 ++++++++++++++++++
 lib/puppet/parser/functions/apache_pw_hash.rb  |  1 -
 lib/puppet/parser/functions/bool2httpd.rb      |  3 ---
 .../functions/validate_apache_log_level.rb     |  4 ----
 lib/puppet/provider/a2mod/gentoo.rb            |  4 +---
 lib/puppet/provider/a2mod/modfix.rb            |  1 -
 manifests/mod/passenger.pp                     |  2 +-
 manifests/vhost.pp                             |  3 ++-
 spec/acceptance/mod_fcgid_spec.rb              |  2 +-
 spec/acceptance/mod_pagespeed_spec.rb          |  2 +-
 spec/acceptance/mod_passenger_spec.rb          |  2 --
 spec/acceptance/mod_suphp_spec.rb              |  2 +-
 spec/acceptance/vhost_spec.rb                  | 16 ++++++++--------
 spec/classes/apache_spec.rb                    | 16 ++++++++--------
 spec/classes/mod/authnz_ldap_spec.rb           |  8 ++++----
 spec/classes/mod/passenger_spec.rb             |  4 ++--
 spec/classes/mod/php_spec.rb                   |  3 +--
 spec/classes/mod/proxy_balancer_spec.rb        |  2 --
 spec/classes/mod/status_spec.rb                | 10 +++++-----
 spec/defines/vhost_custom_spec.rb              |  2 +-
 spec/defines/vhost_spec.rb                     |  1 -
 spec/functions/bool2httpd_spec.rb              |  4 ++--
 spec/spec_helper_local.rb                      |  2 +-
 spec/unit/apache_version_spec.rb               | 12 +++++-------
 spec/unit/provider/a2mod/gentoo_spec.rb        | 12 ++----------
 25 files changed, 64 insertions(+), 72 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 91ec5a148a..7e74cd50e3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,2 +1,20 @@
 Style/GlobalVars:
   Enabled: false
+RSpec/InstanceVariable:
+  Enabled: false
+RSpec/RepeatedExample:
+  Enabled: false
+RSpec/ExpectInHook:
+  Enabled: false
+Style/CommentedKeyword:
+  Enabled: false
+RSpec/NamedSubject:
+  Enabled: false
+RSpec/VoidExpect:
+  Enabled: false
+RSpec/AnyInstance:
+  Enabled: false
+RSpec/FilePath:
+  Enabled: false
+RSpec/EmptyExampleGroup:
+   Enabled: false
diff --git a/lib/puppet/parser/functions/apache_pw_hash.rb b/lib/puppet/parser/functions/apache_pw_hash.rb
index 3ff8dee86e..eda0875e59 100644
--- a/lib/puppet/parser/functions/apache_pw_hash.rb
+++ b/lib/puppet/parser/functions/apache_pw_hash.rb
@@ -2,7 +2,6 @@
 
 Puppet::Parser::Functions.newfunction(:apache_pw_hash, type: :rvalue, doc: <<-DOC
   Hashes a password in a format suitable for htpasswd files read by apache.
-
   Currently uses SHA-hashes, because although this format is considered insecure, its the
   most secure format supported by the most platforms.
 DOC
diff --git a/lib/puppet/parser/functions/bool2httpd.rb b/lib/puppet/parser/functions/bool2httpd.rb
index 71516b970b..00e4993853 100644
--- a/lib/puppet/parser/functions/bool2httpd.rb
+++ b/lib/puppet/parser/functions/bool2httpd.rb
@@ -1,12 +1,9 @@
 Puppet::Parser::Functions.newfunction(:bool2httpd, type: :rvalue, doc: <<-DOC
   Transform a supposed boolean to On or Off. Pass all other values through.
   Given a nil value (undef), bool2httpd will return 'Off'
-
   Example:
-
       $trace_enable     = false
       $server_signature = 'mail'
-
       bool2httpd($trace_enable)
       # => 'Off'
       bool2httpd($server_signature)
diff --git a/lib/puppet/parser/functions/validate_apache_log_level.rb b/lib/puppet/parser/functions/validate_apache_log_level.rb
index 1e9b3c2fef..bcbf8e7c7e 100644
--- a/lib/puppet/parser/functions/validate_apache_log_level.rb
+++ b/lib/puppet/parser/functions/validate_apache_log_level.rb
@@ -4,16 +4,12 @@ module Puppet::Parser::Functions
     Perform simple validation of a string against the list of known log
     levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel
         validate_apache_loglevel('info')
-
     Modules maybe specified with their own levels like these:
         validate_apache_loglevel('warn ssl:info')
         validate_apache_loglevel('warn mod_ssl.c:info')
         validate_apache_loglevel('warn ssl_module:info')
-
     Expected to be used from the main or vhost.
-
     Might be used from directory too later as apaceh supports that
-
 DOC
              ) do |args|
     if args.size != 1
diff --git a/lib/puppet/provider/a2mod/gentoo.rb b/lib/puppet/provider/a2mod/gentoo.rb
index 4edc3d9d35..d4c0b6d612 100644
--- a/lib/puppet/provider/a2mod/gentoo.rb
+++ b/lib/puppet/provider/a2mod/gentoo.rb
@@ -51,9 +51,7 @@ def self.modules
       apache2_opts = records.grep(%r{^\s*APACHE2_OPTS=}).first
 
       # Extract all defines
-      while apache2_opts.sub!(%r{-D\s+(\w+)}, '')
-        @modules << Regexp.last_match(1).downcase
-      end
+      @modules << Regexp.last_match(1).downcase while apache2_opts.sub!(%r{-D\s+(\w+)}, '')
 
       # Hang on to any remaining options.
       if apache2_opts =~ %r{APACHE2_OPTS="(.+)"}
diff --git a/lib/puppet/provider/a2mod/modfix.rb b/lib/puppet/provider/a2mod/modfix.rb
index e5f6009532..59fdc9296a 100644
--- a/lib/puppet/provider/a2mod/modfix.rb
+++ b/lib/puppet/provider/a2mod/modfix.rb
@@ -1,6 +1,5 @@
 Puppet::Type.type(:a2mod).provide :modfix do
   desc "Dummy provider for A2mod.
-
   Fake nil resources when there is no crontab binary available. Allows
   puppetd to run on a bootstrapped machine before a Cron package has been
   installed. Workaround for: http://projects.puppetlabs.com/issues/2384
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 96bdeafd50..84f216983e 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -410,7 +410,7 @@
         fail('REMOVED PASSENGER OPTION :: passenger_use_global_queue :: -- no message on the current passenger reference webpage -- ')
       }
       if (versioncmp($passenger_installed_version, '2.0.4') < 0) {
-        fail('Passenger config option :: passenger_use_global_queue is not introduced until version 2.0.4 :: ${passenger_installed_version} is the version reported')
+        fail("Passenger config option :: passenger_use_global_queue is not introduced until version 2.0.4 :: ${passenger_installed_version} is the version reported")
       }
     }
     if $passenger_user {
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 86fa06e63a..fecc097947 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -362,8 +362,9 @@
       }
     }
   }
+
   if $add_listen {
-    if $ip and defined(Apache::Listen["${port}"]) {
+    if $ip and defined(Apache::Listen[String($port)]) {
       fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
     }
     if $listen_addr_port and $ensure == 'present' {
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 751628bb8b..7924add854 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -44,7 +44,7 @@ class { 'apache::mod::fcgid':
       it { is_expected.to be_running }
     end
 
-    it 'answers to fcgid.example.com' do # rubocop:disable RSpec/MultipleExpectations
+    it 'answers to fcgid.example.com' do
       shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
         expect(r.stdout).to match(%r{^Hello world$})
         expect(r.exit_code).to eq(0)
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index a33d42c227..3b3cea3b70 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -49,7 +49,7 @@ class { 'apache::mod::pagespeed':
       it { is_expected.to contain 'ModPagespeedForbidFilters rewrite_javascript' }
     end
 
-    it 'answers to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do # rubocop:disable RSpec/MultipleExpectations
+    it 'answers to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
       shell('/usr/bin/curl pagespeed.example.com:80') do |r|
         expect(r.stdout).to match(%r{head\/})
         expect(r.stdout).not_to match(%r{<!-- comment -->})
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index e3ecd28b36..5321454ccc 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -134,8 +134,6 @@ class { 'apache::mod::passenger': }
 
       describe file(conf_file) do
         it { is_expected.to contain %(PassengerRoot "#{passenger_root}") }
-
-        # rubocop:disable RSpec/RepeatedExample
         case fact('operatingsystem')
         when 'Ubuntu'
           case fact('lsbdistrelease')
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index dc156a55d4..a2dd791f5a 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -37,7 +37,7 @@ class { 'apache::mod::suphp': }
       it { is_expected.to be_running }
     end
 
-    it 'answers to suphp.example.com #timeout' do # rubocop:disable RSpec/ExampleLength
+    it 'answers to suphp.example.com #timeout' do
       timeout = 0
       loop do
         r = shell('curl suphp.example.com:80')
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 555a6ece63..e8e520072b 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -469,7 +469,7 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service($service_name) do # rubocop:disable RSpec/NestedGroups
+      describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
@@ -533,7 +533,7 @@ class { 'apache': }
         apply_manifest(pp_one, catch_failures: true)
       end
 
-      describe service($service_name) do # rubocop:disable RSpec/NestedGroups
+      describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
@@ -577,7 +577,7 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service($service_name) do # rubocop:disable RSpec/NestedGroups
+      describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
@@ -657,7 +657,7 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service($service_name) do # rubocop:disable RSpec/NestedGroups
+      describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
         else
@@ -665,7 +665,7 @@ class { 'apache': }
         end
         it { is_expected.to be_running }
 
-        it 'answers to files.example.net' do # rubocop:disable RSpec/ExampleLength
+        it 'answers to files.example.net' do
           shell('/usr/bin/curl -sSf files.example.net:80/foo/index.html', acceptable_exit_codes: 22).stderr.should match(%r{curl: \(22\) The requested URL returned error: 401})
           shell('/usr/bin/curl -sSf -u login:password files.example.net:80/foo/index.html').stdout.should eq("Hello World\n")
           shell('/usr/bin/curl -sSf files.example.net:80/bar/index.html').stdout.should eq("Hello World\n")
@@ -757,7 +757,7 @@ class { 'apache': }
   end
 
   context 'proxy_pass for alternative vhost' do
-    it 'configures a local vhost and a proxy vhost' do # rubocop:disable RSpec/ExampleLength
+    it 'configures a local vhost and a proxy vhost' do
       apply_manifest(%(
         class { 'apache': default_vhost => false, }
         apache::vhost { 'localhost':
@@ -807,7 +807,7 @@ class { 'apache': default_vhost => false, }
 
   unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajorrelease') <= '10'
     context 'proxy_pass_match for alternative vhost' do
-      it 'configures a local vhost and a proxy vhost' do # rubocop:disable RSpec/ExampleLength
+      it 'configures a local vhost and a proxy vhost' do
         apply_manifest(%(
           class { 'apache': default_vhost => false, }
           apache::vhost { 'localhost':
@@ -1517,7 +1517,7 @@ class { 'apache::mod::wsgi': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe file("#{$vhost_dir}/25-test.server.conf") do # rubocop:disable RSpec/NestedGroups
+      describe file("#{$vhost_dir}/25-test.server.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
         it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 5c341f8541..a0091554dc 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -69,13 +69,13 @@
       dav
       env
     ].each do |modname|
-      it { # rubocop:disable RSpec/RepeatedExample
+      it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/etc/apache2/mods-available/#{modname}.load",
           'ensure' => 'file',
         )
       }
-      it { # rubocop:disable RSpec/RepeatedExample
+      it {
         is_expected.to contain_file("#{modname}.load symlink").with(
           'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
@@ -148,13 +148,13 @@
       negotiation
       setenvif
     ].each do |modname|
-      it { # rubocop:disable RSpec/RepeatedExample
+      it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/etc/apache2/mods-available/#{modname}.load",
           'ensure' => 'file',
         )
       }
-      it { # rubocop:disable RSpec/RepeatedExample
+      it {
         is_expected.to contain_file("#{modname}.load symlink").with(
           'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
@@ -389,7 +389,7 @@
         dav
         env
       ].each do |modname|
-        it { # rubocop:disable RSpec/RepeatedExample
+        it {
           is_expected.to contain_file("#{modname}.load").with_path(
             "/etc/httpd/mod.d/#{modname}.load",
           )
@@ -412,7 +412,7 @@
         negotiation
         setenvif
       ].each do |modname|
-        it { # rubocop:disable RSpec/RepeatedExample
+        it {
           is_expected.to contain_file("#{modname}.load").with_path(
             "/etc/httpd/mod.d/#{modname}.load",
           )
@@ -784,7 +784,7 @@
       dav
       env
     ].each do |modname|
-      it { # rubocop:disable RSpec/RepeatedExample
+      it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
           'ensure' => 'file',
@@ -804,7 +804,7 @@
       negotiation
       setenvif
     ].each do |modname|
-      it { # rubocop:disable RSpec/RepeatedExample
+      it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
           'ensure' => 'file',
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index 22dfce0d15..9ca8cbef42 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -35,8 +35,8 @@
     context 'verify_server_cert = wrong' do
       let(:params) { { verify_server_cert: 'wrong' } }
 
-      it 'raises an error' do # rubocop:disable RSpec/MultipleExpectations
-        expect { is_expected.to raise_error Puppet::Error } # rubocop:disable RSpec/VoidExpect
+      it 'raises an error' do
+        expect { is_expected.to raise_error Puppet::Error }
       end
     end
   end # Debian
@@ -72,8 +72,8 @@
     context 'verify_server_cert = wrong' do
       let(:params) { { verify_server_cert: 'wrong' } }
 
-      it 'raises an error' do # rubocop:disable RSpec/MultipleExpectations
-        expect { is_expected.to raise_error Puppet::Error } # rubocop:disable RSpec/VoidExpect
+      it 'raises an error' do
+        expect { is_expected.to raise_error Puppet::Error }
       end
     end
   end # Redhat
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index a666b1aadd..30d993eb08 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -460,14 +460,14 @@
       }
       it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRoot}) }
       it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
-      describe "with passenger_root => '/usr/lib/example'" do # rubocop:disable RSpec/NestedGroups
+      describe "with passenger_root => '/usr/lib/example'" do
         let :params do
           { passenger_root: '/usr/lib/example' }
         end
 
         it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRoot "\/usr\/lib\/example"$}) }
       end
-      describe 'with passenger_ruby => /usr/lib/example/ruby' do # rubocop:disable RSpec/NestedGroups
+      describe 'with passenger_ruby => /usr/lib/example/ruby' do
         let :params do
           { passenger_ruby: '/usr/lib/example/ruby' }
         end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 704d51c501..f0eb3f1bd2 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -371,8 +371,7 @@
         'class { "apache": mpm_module => worker, }'
       end
 
-      it 'raises an error' do # rubocop:disable RSpec/MultipleExpectations
-        # rubocop:disable RSpec/NamedSubject
+      it 'raises an error' do
         expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, %r{mpm_module => 'prefork' or mpm_module => 'itk'}
       end
     end
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index 19568ffedd..88d8cf5ea7 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -62,8 +62,6 @@ def balancer_manager_conf_spec(allow_from, manager_path)
       it { is_expected.not_to contain_file('proxy_balancer.conf symlink') }
     end
   end
-
-  # rubocop:disable RSpec/EmptyExampleGroup
   context "default configuration with custom parameters $manager => true, $allow_from => ['10.10.10.10','11.11.11.11'], $status_path => '/custom-manager' on a Debian OS" do
     let :facts do
       {
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 05b081e82a..7f906b6e73 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -206,7 +206,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
       end
     end
 
-    context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do # rubocop:disable RSpec/EmptyExampleGroup
+    context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
       let :facts do
         {
           osfamily: 'Debian',
@@ -249,7 +249,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
         { allow_from: ['10.10.10.10'] }
       end
 
-      it 'expects to succeed array validation' do # rubocop:disable RSpec/MultipleExpectations
+      it 'expects to succeed array validation' do
         expect {
           is_expected.to contain_file('status.conf')
         }.not_to raise_error
@@ -273,7 +273,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
         { allow_from: '10.10.10.10' }
       end
 
-      it 'expects to fail array validation' do # rubocop:disable RSpec/MultipleExpectations
+      it 'expects to fail array validation' do
         expect {
           is_expected.to contain_file('status.conf')
         }.to raise_error(Puppet::Error)
@@ -300,7 +300,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
           { extended_status: valid_param }
         end
 
-        it 'expects to succeed regular expression validation' do # rubocop:disable RSpec/MultipleExpectations
+        it 'expects to succeed regular expression validation' do
           expect {
             is_expected.to contain_file('status.conf')
           }.not_to raise_error
@@ -326,7 +326,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
           { extended_status: invalid_param }
         end
 
-        it 'expects to fail regular expression validation' do # rubocop:disable RSpec/MultipleExpectations
+        it 'expects to fail regular expression validation' do
           expect {
             is_expected.to contain_file('status.conf')
           }.to raise_error(Puppet::Error)
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 5da38f600b..9f7296a813 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -11,7 +11,7 @@
   end
 
   describe 'os-dependent items' do
-    context 'on RedHat based systems' do # rubocop:disable RSpec/EmptyExampleGroup
+    context 'on RedHat based systems' do
       let :default_facts do
         {
           osfamily: 'RedHat',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 8edc95eece..ffc9773eb8 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1824,7 +1824,6 @@
         }
       end
 
-      # rubocop:disable RSpec/NestedGroups
       context 'status' do
         let(:params) { dparams.merge(redirectmatch_status: '404') }
 
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
index a0a2b728f9..9d37d6b74d 100644
--- a/spec/functions/bool2httpd_spec.rb
+++ b/spec/functions/bool2httpd_spec.rb
@@ -6,11 +6,11 @@
   it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params(true).and_return('On') }
   it 'expected to return a string "On"' do
-    expect(subject.execute(true)).to be_an_instance_of(String) # rubocop:disable RSpec/NamedSubject
+    expect(subject.execute(true)).to be_an_instance_of(String)
   end
   it { is_expected.to run.with_params(false).and_return('Off') }
   it 'expected to return a string "Off"' do
-    expect(subject.execute(false)).to be_an_instance_of(String) # rubocop:disable RSpec/NamedSubject
+    expect(subject.execute(false)).to be_an_instance_of(String)
   end
   it { is_expected.to run.with_params('mail').and_return('mail') }
   it { is_expected.to run.with_params(nil).and_return('Off') }
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index cac4ff779a..9c9cca461f 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -2,7 +2,7 @@
   c.before :each do
     # Ensure that we don't accidentally cache facts and environment
     # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all) # rubocop:disable RSpec/AnyInstance
+    Facter::Util::Loader.any_instance.stubs(:load_all)
     Facter.clear
     Facter.clear_messages
   end
diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/apache_version_spec.rb
index 1f348fd8a0..c2db7a2217 100644
--- a/spec/unit/apache_version_spec.rb
+++ b/spec/unit/apache_version_spec.rb
@@ -1,16 +1,14 @@
 require 'spec_helper'
 
-describe Facter::Util::Fact do # rubocop:disable RSpec/FilePath
+describe Facter::Util::Fact do
   before(:each) do
     Facter.clear
   end
-
-  # rubocop:disable RSpec/MessageSpies
   describe 'apache_version' do
     context 'with value' do
       before :each do
-        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true } # rubocop:disable RSpec/ExpectInHook
-        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') { # rubocop:disable RSpec/ExpectInHook
+        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
+        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {
           'Server version: Apache/2.4.16 (Unix)
            Server built:   Jul 31 2015 15:53:26'
         }
@@ -24,8 +22,8 @@
   describe 'apache_version with empty OS' do
     context 'with value' do
       before :each do
-        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true } # rubocop:disable RSpec/ExpectInHook
-        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') { # rubocop:disable RSpec/ExpectInHook
+        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
+        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {
           'Server version: Apache/2.4.6 ()
            Server built:   Nov 21 2015 05:34:59'
         }
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index 96fbcae484..b157fa020c 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -12,21 +12,19 @@
       expect(provider_class).to respond_to(method)
     end
   end
-
-  # rubocop:disable RSpec/MessageSpies
   describe 'when fetching modules' do
     let(:filetype) do
       double
     end
 
-    it 'returns a sorted array of the defined parameters' do # rubocop:disable RSpec/MultipleExpectations
+    it 'returns a sorted array of the defined parameters' do
       expect(filetype).to receive(:read).and_return(%(APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n))
       expect(provider_class).to receive(:filetype) { filetype }
 
       expect(provider_class.modules).to eq(%w[bar baz foo])
     end
 
-    it 'caches the module list' do # rubocop:disable RSpec/MultipleExpectations
+    it 'caches the module list' do
       expect(filetype).to receive(:read).once { %(APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n) } # rubocop:disable Lint/AmbiguousBlockAssociation
       expect(provider_class).to receive(:filetype).once { filetype } # rubocop:disable Lint/AmbiguousBlockAssociation
 
@@ -51,8 +49,6 @@
       provider_class.prefetch('ssl' => resource)
     end
   end
-
-  # rubocop:disable RSpec/InstanceVariable
   describe 'when flushing' do
     before :each do
       @filetype = double
@@ -71,8 +67,6 @@
       allow(@ssl).to receive(:[]).with(:name) { 'ssl' }
       allow(@ssl).to receive(:provider=)
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'adds modules whose ensure is present' do
       expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
       expect(@filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO"))
@@ -82,8 +76,6 @@
 
       provider_class.flush
     end
-
-    # rubocop:disable RSpec/ExampleLength
     it 'removes modules whose ensure is present' do
       expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO") }
       expect(@filetype).to receive(:write).with(%(APACHE2_OPTS=""))

From 3c4f123b2f8a467e99469425d38d74b9cbea221b Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppet.com>
Date: Fri, 9 Mar 2018 16:56:51 +0000
Subject: [PATCH 1341/2267] Release Prep 3.1.0

---
 CHANGELOG.md  | 13 +++++++++++++
 metadata.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1f29b4da8..e2ff16ed7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
+## Supported Release [3.1.0]
+### Summary
+This release includes the module being converted using version 1.4.1 of the PDK. It also includes a couple of additional parameters added.
+
+#### Added
+- Module has been pdk converted with version 1.4.1 ([MODULES-6331](https://tickets.puppet.com/browse/MODULES-6331))
+- Parameter `ssl_cert` to provide a SSLCertificateFile option for use with SSL, optional of type String.
+- Parameter `ssl_key` to provide a SSLCertificateKey option for use with SSL, optional of type String.
+
+#### Fixed
+- Documentation updates.
+- Updates to the Japanese translation based on documentation update.
+
 ## Supported Release [3.0.0]
 ### Summary
 This major release changes the default value of `keepalive` to `On`. It also includes many other features and bugfixes.
diff --git a/metadata.json b/metadata.json
index c28f081c90..00f41e9117 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From de290646f97e04b4b8e42c70f6e01e860c394ce7 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Mon, 19 Mar 2018 11:00:40 -0700
Subject: [PATCH 1342/2267] Updating translations for readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 81a119259f..b8ac3f5913 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -1376,6 +1376,22 @@ HTTPDサービスの再起動にあたり、Puppetが特定のコマンドを使
 
 デフォルト値: `undef`。
 
+##### `ssl_cert`
+
+特定の SSLCertificateFile を指定できるようになります。
+
+詳細については、[SSLCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#SSLCertificateFile)を参照してください。
+
+デフォルト値: `undef`。
+
+##### `ssl_key`
+特定の  SSLCertificateKey を指定できるようになります。
+
+詳細については、[SSLCertificateKey](https://httpd.apache.org/docs/current/mod/mod_ssl.html#SSLCertificateKeyFile)を参照してください。
+
+デフォルト値: `undef`。
+
+
 ##### `ssl_ca`
 
 SSL証明書認証局を指定します。[SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile)を使用してSSLクライアント認証で使用する証明書を確認します。
@@ -2727,6 +2743,8 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 - `ssl_cryptodevice`: デフォルト値: 'builtin'
 - `ssl_honorcipherorder`: デフォルト値: true
 - `ssl_openssl_conf_cmd`: デフォルト値: undef
+- `ssl_cert`: デフォルト値: undef。
+- `ssl_key`: デフォルト値: undef。
 - `ssl_options`: デフォルト値: ['StdEnvVars']
 - `ssl_pass_phrase_dialog`: デフォルト値: 'builtin'
 - `ssl_protocol`: デフォルト値: ['all', '-SSLv2', '-SSLv3']。
@@ -2760,6 +2778,14 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
   デフォルト値: `undef`。
 
+* `ssl_cert`
+
+  デフォルト値: `undef`。
+
+* `ssl_key`
+
+  デフォルト値: `undef`。
+
 * `ssl_options`
 
   デフォルト値: ['StdEnvVars']

From 026f8f82966f5a5f3218cb6dac154c9b50658bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Wed, 28 Mar 2018 09:45:09 +0200
Subject: [PATCH 1343/2267] Move PassengerPreStart outside of <VirtualHost>

This fix this passenger warning:
WARNING: PassengerPreStart cannot occur within <VirtualHost> section

https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart
---
 manifests/vhost.pp               | 3 +--
 spec/defines/vhost_spec.rb       | 4 ++--
 templates/vhost/_file_footer.erb | 3 +++
 templates/vhost/_passenger.erb   | 3 ---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 898715dce4..08f2122868 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -967,13 +967,12 @@
   # - $passenger_min_instances
   # - $passenger_max_requests
   # - $passenger_start_timeout
-  # - $passenger_pre_start
   # - $passenger_user
   # - $passenger_group
   # - $passenger_nodejs
   # - $passenger_sticky_sessions
   # - $passenger_startup_file
-  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_group or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{
+  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_user or $passenger_group or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 1b1377d56c..74c2e8e771 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -888,8 +888,8 @@
         )
       }
       it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerPreStart\shttp://localhost/myapp$},
+        is_expected.to contain_concat__fragment('rspec.example.com-file_footer').with(
+          content: %r{^PassengerPreStart\shttp://localhost/myapp$},
         )
       }
       it {
diff --git a/templates/vhost/_file_footer.erb b/templates/vhost/_file_footer.erb
index 84035efa47..2dd9ff26cd 100644
--- a/templates/vhost/_file_footer.erb
+++ b/templates/vhost/_file_footer.erb
@@ -1 +1,4 @@
 </VirtualHost>
+<% if @passenger_pre_start -%>
+PassengerPreStart <%= @passenger_pre_start %>
+<% end -%>
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index df5ea0f398..5eb8b5bc9d 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -19,9 +19,6 @@
 <% if @passenger_start_timeout -%>
   PassengerStartTimeout <%= @passenger_start_timeout %>
 <% end -%>
-<% if @passenger_pre_start -%>
-  PassengerPreStart <%= @passenger_pre_start %>
-<% end -%>
 <% if @passenger_user -%>
   PassengerUser <%= @passenger_user %>
 <% end -%>

From ca2d7d5756b877f63b2d8dabd1df87f17ac2defc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Wed, 28 Mar 2018 09:55:33 +0200
Subject: [PATCH 1344/2267] Allow setting multiple PassengerPreStart URIs

A single VirtualHost may serve more than one application (using
PassengerBaseURI [1]).  In such a situation, it makes sense to preload
each application by using multiple PassengerPreStart [2]

1. https://www.phusionpassenger.com/library/config/apache/reference/#passengerbaseuri
2. https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart
---
 manifests/mod/passenger.pp       | 2 +-
 manifests/vhost.pp               | 2 +-
 templates/mod/passenger.conf.erb | 4 +++-
 templates/vhost/_file_footer.erb | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 84f216983e..4a97312b71 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -64,7 +64,7 @@
   $passenger_min_instances                                                                   = undef,
   $passenger_nodejs                                                                          = undef,
   $passenger_pool_idle_time                                                                  = undef,
-  $passenger_pre_start                                                                       = undef,
+  Optional[Variant[String,Array[String]]] $passenger_pre_start                               = undef,
   $passenger_python                                                                          = undef,
   $passenger_resist_deployment_errors                                                        = undef,
   $passenger_resolve_symlinks_in_document_root                                               = undef,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 08f2122868..1dd7b29140 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -142,7 +142,7 @@
   $passenger_min_instances                                                          = undef,
   $passenger_max_requests                                                           = undef,
   $passenger_start_timeout                                                          = undef,
-  $passenger_pre_start                                                              = undef,
+  Optional[Variant[String,Array[String]]] $passenger_pre_start                      = undef,
   $passenger_user                                                                   = undef,
   $passenger_group                                                                  = undef,
   $passenger_high_performance                                                       = undef,
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 7d79207ce0..11da3309ca 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -125,7 +125,9 @@
   PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
   <%- end -%>
   <%- if @passenger_pre_start -%>
-  PassengerPreStart <%= @passenger_pre_start %>
+    <%- [@passenger_pre_start].flatten.compact.each do |passenger_pre_start| -%>
+  PassengerPreStart <%= passenger_pre_start %>
+    <%- end -%>
   <%- end -%>
   <%- if @passenger_python -%>
   PassengerPython "<%= @passenger_python %>"
diff --git a/templates/vhost/_file_footer.erb b/templates/vhost/_file_footer.erb
index 2dd9ff26cd..f8108e5c3f 100644
--- a/templates/vhost/_file_footer.erb
+++ b/templates/vhost/_file_footer.erb
@@ -1,4 +1,6 @@
 </VirtualHost>
 <% if @passenger_pre_start -%>
-PassengerPreStart <%= @passenger_pre_start %>
+  <%- [@passenger_pre_start].flatten.compact.each do |passenger_pre_start| -%>
+PassengerPreStart <%= passenger_pre_start %>
+  <%- end -%>
 <% end -%>

From 21eee494490567b3900a554b7bce72f373c7fb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 16:35:53 +0200
Subject: [PATCH 1345/2267] Enable the apache_version fact on FreeBSD

The fact was confined in 783729a5f2e348a4728f3ce29f0b58c7e0a425dd but
running the test suite on FreeBSD will fail because the fact is confined
to Linux.

Instead of simulating Linux when testing on FreeBSD, enable the fact on
FreeBSD so that the apache version is available in Puppet manifests on
this platform.
---
 lib/facter/apache_version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index 3dc17ae058..de4c4c1a4f 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -1,5 +1,5 @@
 Facter.add(:apache_version) do
-  confine kernel: 'Linux'
+  confine kernel: %w[FreeBSD Linux]
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')

From e7c682eff5a04e28d5eacdc9da893f1742ca4197 Mon Sep 17 00:00:00 2001
From: Vincent Brillault <vincent.brillault@cern.ch>
Date: Mon, 23 Apr 2018 09:20:27 +0200
Subject: [PATCH 1346/2267] Remove insecure/bad SSL example

These SSL settings are worse than the default one...
---
 examples/vhost.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/vhost.pp b/examples/vhost.pp
index 440a56d4b0..6c5bfac9a8 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -229,7 +229,7 @@
   serveraliases   => ['*.loc',],
 }
 
-# Vhost with SSLProtocol,SSLCipherSuite, SSLHonorCipherOrder
+# Vhost with SSL (SSLProtocol, SSLCipherSuite & SSLHonorCipherOrder from default)
 apache::vhost { 'securedomain.com':
         priority             => '10',
         vhost_name           => 'www.securedomain.com',
@@ -239,9 +239,6 @@
         ssl_cert             => '/etc/ssl/securedomain.cert',
         ssl_key              => '/etc/ssl/securedomain.key',
         ssl_chain            => '/etc/ssl/securedomain.crt',
-        ssl_protocol         => '-ALL +TLSv1',
-        ssl_cipher           => 'ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM',
-        ssl_honorcipherorder => 'On',
         add_listen           => false,
 }
 

From 7d5e7811eab6bfacac57d54dd5bbd8c3f918deb3 Mon Sep 17 00:00:00 2001
From: Vincent Brillault <vincent.brillault@cern.ch>
Date: Mon, 23 Apr 2018 10:14:29 +0200
Subject: [PATCH 1347/2267] Fix aligment/whitespace

---
 examples/vhost.pp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/vhost.pp b/examples/vhost.pp
index 6c5bfac9a8..60acda5cb4 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -231,15 +231,15 @@
 
 # Vhost with SSL (SSLProtocol, SSLCipherSuite & SSLHonorCipherOrder from default)
 apache::vhost { 'securedomain.com':
-        priority             => '10',
-        vhost_name           => 'www.securedomain.com',
-        port                 => '443',
-        docroot              => '/var/www/secure',
-        ssl                  => true,
-        ssl_cert             => '/etc/ssl/securedomain.cert',
-        ssl_key              => '/etc/ssl/securedomain.key',
-        ssl_chain            => '/etc/ssl/securedomain.crt',
-        add_listen           => false,
+  priority   => '10',
+  vhost_name => 'www.securedomain.com',
+  port       => '443',
+  docroot    => '/var/www/secure',
+  ssl        => true,
+  ssl_cert   => '/etc/ssl/securedomain.cert',
+  ssl_key    => '/etc/ssl/securedomain.key',
+  ssl_chain  => '/etc/ssl/securedomain.crt',
+  add_listen => false,
 }
 
 # Vhost with access log environment variables writing control

From f85157fcc5eaa14c7f85f52e2a14180bf00222c1 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Thu, 26 Apr 2018 14:11:25 +0100
Subject: [PATCH 1348/2267] (MODULES-7023) - Removing duplication in .sync.yml

---
 .sync.yml   | 15 ++++-----------
 .travis.yml | 10 +++-------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 01082093d3..aa256ac07e 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,19 +1,13 @@
 ---
 .travis.yml:
-  bundle_args: --without system_tests
   docker_sets:
     - set: docker/centos-7
-      options:
     - set: docker/ubuntu-14.04
-      options:
   docker_defaults:
     bundler_args: ""
   secure: ""
   branches:
     - release
-  extras:
-    - env: CHECK=release_checks
-      rvm: 2.1.9
 
 Gemfile:
   required:
@@ -36,15 +30,14 @@ Gemfile:
         from_env: BEAKER_HOSTGENERATOR_VERSION
       - gem: beaker-rspec
         from_env: BEAKER_RSPEC_VERSION
-    ':development':
-      - gem: puppet-blacksmith
-        version: '~> 3.4'
 
 Rakefile:
   requires:
-    - puppet_blacksmith/rake_tasks
     - puppet-lint/tasks/puppet-lint
 
+appveyor.yml:
+  delete: true
+
 .rubocop.yml:
-   default_configs:
+  default_configs:
     inherit_from: .rubocop_todo.yml
diff --git a/.travis.yml b/.travis.yml
index 05049515b6..14288376fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,11 @@
 ---
-env:
-  global:
-    - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
 sudo: false
 dist: trusty
 language: ruby
 cache: bundler
 before_install:
   - bundle -v
-  - rm Gemfile.lock || true
+  - rm -f Gemfile.lock
   - gem update --system
   - gem update bundler
   - gem --version
@@ -45,14 +42,13 @@ matrix:
       env: CHECK="syntax lint"
     -
       env: CHECK=metadata_lint
+    -
+      env: CHECK=release_checks
     -
       env: CHECK=spec
     -
       env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
       rvm: 2.1.9
-    -
-      env: CHECK=release_checks
-      rvm: 2.1.9
 branches:
   only:
     - master

From 4335d803b7b454420b2323b1c5de616782db73d9 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Tue, 1 May 2018 12:00:15 +0100
Subject: [PATCH 1349/2267] (maint) - Readding PARALLEL_TEST_PROCESSORS

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 14288376fd..7cbb7181ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 ---
+env:
+  global:
+    - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
 sudo: false
 dist: trusty
 language: ruby

From 61c52f4764d400596df367fb8054d5c53cf58dca Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@example42.com>
Date: Thu, 3 May 2018 12:39:26 +0200
Subject: [PATCH 1350/2267] fixes for OpenSUSE ans SLES

implements #1773
---
 manifests/mod/php.pp | 4 ++--
 manifests/version.pp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index c7c0048884..722d198239 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -56,9 +56,9 @@
       ::apache::mod { $mod:
         package        => $_package_name,
         package_ensure => $package_ensure,
-        lib            => 'mod_php5.so',
+        lib            => "mod_${mod}.so",
         id             => "php${_php_major}_module",
-        path           => "${::apache::lib_path}/mod_php5.so",
+        path           => "${::apache::lib_path}/mod_${mod}.so",
       }
     } else {
       ::apache::mod { $mod:
diff --git a/manifests/version.pp b/manifests/version.pp
index 2d33a5f4fb..8950b668a1 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -36,7 +36,7 @@
       $default = '2.4'
     }
     'Suse': {
-      if $::operatingsystem == 'SLES' and $::operatingsystemrelease >= '12' {
+      if ($::operatingsystem == 'SLES' and $::operatingsystemrelease >= '12') or ($::operatingsystem == 'OpenSuSE' and $::operatingsystemrelease >= '42') {
         $default = '2.4'
       } else {
         $default = '2.2'

From 3a7af9d23f79c89a259d71260a925d03f30229b4 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Fri, 11 May 2018 11:35:22 +0100
Subject: [PATCH 1351/2267] (MODULES-7153) - Unmanage gitlab-ci.yml

---
 .sync.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index aa256ac07e..5cb79702a3 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -41,3 +41,6 @@ appveyor.yml:
 .rubocop.yml:
   default_configs:
     inherit_from: .rubocop_todo.yml
+
+.gitlab-ci.yml:
+  unmanaged: true

From 1993eb7fa6b76aa7ff5ca1759c984fe266da3d12 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppet.com>
Date: Wed, 16 May 2018 15:16:19 +0100
Subject: [PATCH 1352/2267] Re-add the parallel test run

---
 .sync.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index 5cb79702a3..d9cd2c6232 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,5 +1,7 @@
 ---
 .travis.yml:
+  global_env:
+    - PARALLEL_TEST_PROCESSORS=16  
   docker_sets:
     - set: docker/centos-7
     - set: docker/ubuntu-14.04

From b908de5234fa5804f1407b3798d863d743a8feb4 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppet.com>
Date: Wed, 16 May 2018 16:24:02 +0100
Subject: [PATCH 1353/2267] pdksync_heads/master-0-gfe44b98

---
 .gitignore             |  1 +
 .pdkignore             | 23 ++++++++++++++++
 .rubocop.yml           |  7 +++--
 .travis.yml            | 17 ++++++------
 .yardopts              |  1 +
 Gemfile                | 62 +++++-------------------------------------
 Rakefile               |  4 ++-
 metadata.json          |  6 ++--
 spec/default_facts.yml |  8 ++++++
 spec/spec_helper.rb    |  6 ++++
 10 files changed, 65 insertions(+), 70 deletions(-)
 create mode 100644 .pdkignore
 create mode 100644 .yardopts
 create mode 100644 spec/default_facts.yml

diff --git a/.gitignore b/.gitignore
index 56efb9ca14..49bc2a4014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@
 /tmp/
 /vendor/
 /convert_report.txt
+/update_report.txt
 .DS_Store
diff --git a/.pdkignore b/.pdkignore
new file mode 100644
index 0000000000..49bc2a4014
--- /dev/null
+++ b/.pdkignore
@@ -0,0 +1,23 @@
+.*.sw[op]
+.metadata
+.yardoc
+.yardwarns
+*.iml
+/.bundle/
+/.idea/
+/.vagrant/
+/coverage/
+/bin/
+/doc/
+/Gemfile.local
+/Gemfile.lock
+/junit/
+/log/
+/pkg/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/tmp/
+/vendor/
+/convert_report.txt
+/update_report.txt
+.DS_Store
diff --git a/.rubocop.yml b/.rubocop.yml
index 50220b4bce..63ad23b62e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,11 +8,14 @@ AllCops:
   Exclude:
   - bin/*
   - ".vendor/**/*"
-  - Gemfile
-  - Rakefile
+  - "**/Gemfile"
+  - "**/Rakefile"
   - pkg/**/*
   - spec/fixtures/**/*
   - vendor/**/*
+  - "**/Puppetfile"
+  - "**/Vagrantfile"
+  - "**/Guardfile"
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
diff --git a/.travis.yml b/.travis.yml
index 7cbb7181ca..57a95dd739 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
 ---
-env:
-  global:
-    - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
 sudo: false
 dist: trusty
 language: ruby
@@ -19,14 +16,16 @@ bundler_args: --without system_tests
 rvm:
   - 2.4.1
 env:
-  - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
+  global:
+    - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
+    - PARALLEL_TEST_PROCESSORS=16
 matrix:
   fast_finish: true
   include:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/centos-7
       rvm: 2.4.1
       script: bundle exec rake beaker
       services: docker
@@ -34,7 +33,7 @@ matrix:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04
       rvm: 2.4.1
       script: bundle exec rake beaker
       services: docker
@@ -46,11 +45,11 @@ matrix:
     -
       env: CHECK=metadata_lint
     -
-      env: CHECK=release_checks
+      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file"
     -
-      env: CHECK=spec
+      env: CHECK=parallel_spec
     -
-      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
+      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
       rvm: 2.1.9
 branches:
   only:
diff --git a/.yardopts b/.yardopts
new file mode 100644
index 0000000000..29c933bcf1
--- /dev/null
+++ b/.yardopts
@@ -0,0 +1 @@
+--markup markdown
diff --git a/Gemfile b/Gemfile
index 37597a3035..a7ec8208c8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,11 +28,12 @@ group :development do
   gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
   gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
+  gem "json", '<= 2.0.4',                              require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
   gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-blacksmith", '~> 3.4',                   require: false
+  gem "puppet-blacksmith", '~> 3.4',                   require: false, platforms: [:ruby]
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
@@ -49,73 +50,24 @@ puppet_type = gem_type(puppet_version)
 facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
 
-def puppet_older_than?(version)
-  puppet_version = ENV['PUPPET_GEM_VERSION']
-  !puppet_version.nil? &&
-    Gem::Version.correct?(puppet_version) &&
-    Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup))
-end
-
 gems = {}
 
 gems['puppet'] = location_for(puppet_version)
 
 # If facter or hiera versions have been specified via the environment
-# variables, use those versions. If not, and if the puppet version is < 3.5.0,
-# use known good versions of both for puppet < 3.5.0.
-if facter_version
-  gems['facter'] = location_for(facter_version)
-elsif puppet_type == :gem && puppet_older_than?('3.5.0')
-  gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false]
-end
-
-if hiera_version
-  gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION'])
-elsif puppet_type == :gem && puppet_older_than?('3.5.0')
-  gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false]
-end
+# variables
 
-if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0'))
-  # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows
-  if puppet_type == :gem
-    gems['ffi'] =            ['1.9.0',                require: false]
-    gems['minitar'] =        ['0.5.4',                require: false]
-    gems['win32-eventlog'] = ['0.5.3',    '<= 0.6.5', require: false]
-    gems['win32-process'] =  ['0.6.5',    '<= 0.7.5', require: false]
-    gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false]
-    gems['win32-service'] =  ['0.7.2',    '<= 0.8.8', require: false]
-  else
-    gems['ffi'] =            ['~> 1.9.0',             require: false]
-    gems['minitar'] =        ['~> 0.5.4',             require: false]
-    gems['win32-eventlog'] = ['~> 0.5',   '<= 0.6.5', require: false]
-    gems['win32-process'] =  ['~> 0.6',   '<= 0.7.5', require: false]
-    gems['win32-security'] = ['~> 0.1',   '<= 0.2.5', require: false]
-    gems['win32-service'] =  ['~> 0.7',   '<= 0.8.8', require: false]
-  end
-
-  gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false]
-
-  if RUBY_VERSION.start_with?('1.')
-    gems['win32console'] = ['1.3.2', require: false]
-    # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x
-    gems['sys-admin'] =    ['1.5.6', require: false]
-  end
+gems['facter'] = location_for(facter_version) if facter_version
+gems['hiera'] = location_for(hiera_version) if hiera_version
 
-  # Puppet < 3.7.0 requires these.
-  # Puppet >= 3.5.0 gem includes these as requirements.
-  # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0.
-  gems['win32-api'] =           ['1.4.8', require: false]
-  gems['win32-taskscheduler'] = ['0.2.2', require: false]
-  gems['windows-api'] =         ['0.4.3', require: false]
-  gems['windows-pr'] =          ['1.2.3', require: false]
-elsif Gem.win_platform?
+if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
   # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
   # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
   gems['win32-dir'] =      ['<= 0.4.9', require: false]
   gems['win32-eventlog'] = ['<= 0.6.5', require: false]
   gems['win32-process'] =  ['<= 0.7.5', require: false]
   gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['<= 0.8.8', require: false]
+  gems['win32-service'] =  ['0.8.8', require: false]
 end
 
 gems.each do |gem_name, gem_params|
diff --git a/Rakefile b/Rakefile
index a39cae2f03..1c3928709f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,6 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet_blacksmith/rake_tasks'
+require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 require 'puppet-lint/tasks/puppet-lint'
+
+PuppetLint.configuration.send('relative')
diff --git a/metadata.json b/metadata.json
index 00f41e9117..52d310af82 100644
--- a/metadata.json
+++ b/metadata.json
@@ -78,7 +78,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.4.1",
-  "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
-  "template-ref": "1.4.1-0-g52adbbb"
+  "pdk-version": "1.5.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates",
+  "template-ref": "heads/master-0-gfe44b98"
 }
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
new file mode 100644
index 0000000000..3248be5aa6
--- /dev/null
+++ b/spec/default_facts.yml
@@ -0,0 +1,8 @@
+# Use default_module_facts.yml for module specific facts.
+#
+# Facts specified here will override the values provided by rspec-puppet-facts.
+---
+concat_basedir: "/tmp"
+ipaddress: "172.16.254.254"
+is_pe: false
+macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index efd225b540..e117192684 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,4 @@
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
@@ -27,4 +28,9 @@
 
 RSpec.configure do |c|
   c.default_facts = default_facts
+  c.before :each do
+    # set to strictest setting for testing
+    # by default Puppet runs at warning level
+    Puppet.settings[:strict] = :warning
+  end
 end

From dee2494e7d14e35f81ba4023bde08ada2f6dfe42 Mon Sep 17 00:00:00 2001
From: Helen <helen@puppetlabs.com>
Date: Thu, 17 May 2018 16:53:52 +0100
Subject: [PATCH 1354/2267] Revert "pdksync - Update using 1.5.0"

---
 .gitignore             |  1 -
 .pdkignore             | 23 ----------------
 .rubocop.yml           |  7 ++---
 .travis.yml            | 17 ++++++------
 .yardopts              |  1 -
 Gemfile                | 62 +++++++++++++++++++++++++++++++++++++-----
 Rakefile               |  4 +--
 metadata.json          |  6 ++--
 spec/default_facts.yml |  8 ------
 spec/spec_helper.rb    |  6 ----
 10 files changed, 70 insertions(+), 65 deletions(-)
 delete mode 100644 .pdkignore
 delete mode 100644 .yardopts
 delete mode 100644 spec/default_facts.yml

diff --git a/.gitignore b/.gitignore
index 49bc2a4014..56efb9ca14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,4 @@
 /tmp/
 /vendor/
 /convert_report.txt
-/update_report.txt
 .DS_Store
diff --git a/.pdkignore b/.pdkignore
deleted file mode 100644
index 49bc2a4014..0000000000
--- a/.pdkignore
+++ /dev/null
@@ -1,23 +0,0 @@
-.*.sw[op]
-.metadata
-.yardoc
-.yardwarns
-*.iml
-/.bundle/
-/.idea/
-/.vagrant/
-/coverage/
-/bin/
-/doc/
-/Gemfile.local
-/Gemfile.lock
-/junit/
-/log/
-/pkg/
-/spec/fixtures/manifests/
-/spec/fixtures/modules/
-/tmp/
-/vendor/
-/convert_report.txt
-/update_report.txt
-.DS_Store
diff --git a/.rubocop.yml b/.rubocop.yml
index 63ad23b62e..50220b4bce 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,14 +8,11 @@ AllCops:
   Exclude:
   - bin/*
   - ".vendor/**/*"
-  - "**/Gemfile"
-  - "**/Rakefile"
+  - Gemfile
+  - Rakefile
   - pkg/**/*
   - spec/fixtures/**/*
   - vendor/**/*
-  - "**/Puppetfile"
-  - "**/Vagrantfile"
-  - "**/Guardfile"
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
diff --git a/.travis.yml b/.travis.yml
index 57a95dd739..7cbb7181ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 ---
+env:
+  global:
+    - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
 sudo: false
 dist: trusty
 language: ruby
@@ -16,16 +19,14 @@ bundler_args: --without system_tests
 rvm:
   - 2.4.1
 env:
-  global:
-    - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
-    - PARALLEL_TEST_PROCESSORS=16
+  - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
 matrix:
   fast_finish: true
   include:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/centos-7
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
       rvm: 2.4.1
       script: bundle exec rake beaker
       services: docker
@@ -33,7 +34,7 @@ matrix:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
       rvm: 2.4.1
       script: bundle exec rake beaker
       services: docker
@@ -45,11 +46,11 @@ matrix:
     -
       env: CHECK=metadata_lint
     -
-      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file"
+      env: CHECK=release_checks
     -
-      env: CHECK=parallel_spec
+      env: CHECK=spec
     -
-      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
+      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
       rvm: 2.1.9
 branches:
   only:
diff --git a/.yardopts b/.yardopts
deleted file mode 100644
index 29c933bcf1..0000000000
--- a/.yardopts
+++ /dev/null
@@ -1 +0,0 @@
---markup markdown
diff --git a/Gemfile b/Gemfile
index a7ec8208c8..37597a3035 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,12 +28,11 @@ group :development do
   gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
   gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
-  gem "json", '<= 2.0.4',                              require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
   gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-blacksmith", '~> 3.4',                   require: false, platforms: [:ruby]
+  gem "puppet-blacksmith", '~> 3.4',                   require: false
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
@@ -50,24 +49,73 @@ puppet_type = gem_type(puppet_version)
 facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
 
+def puppet_older_than?(version)
+  puppet_version = ENV['PUPPET_GEM_VERSION']
+  !puppet_version.nil? &&
+    Gem::Version.correct?(puppet_version) &&
+    Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup))
+end
+
 gems = {}
 
 gems['puppet'] = location_for(puppet_version)
 
 # If facter or hiera versions have been specified via the environment
-# variables
+# variables, use those versions. If not, and if the puppet version is < 3.5.0,
+# use known good versions of both for puppet < 3.5.0.
+if facter_version
+  gems['facter'] = location_for(facter_version)
+elsif puppet_type == :gem && puppet_older_than?('3.5.0')
+  gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false]
+end
+
+if hiera_version
+  gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION'])
+elsif puppet_type == :gem && puppet_older_than?('3.5.0')
+  gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false]
+end
 
-gems['facter'] = location_for(facter_version) if facter_version
-gems['hiera'] = location_for(hiera_version) if hiera_version
+if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0'))
+  # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows
+  if puppet_type == :gem
+    gems['ffi'] =            ['1.9.0',                require: false]
+    gems['minitar'] =        ['0.5.4',                require: false]
+    gems['win32-eventlog'] = ['0.5.3',    '<= 0.6.5', require: false]
+    gems['win32-process'] =  ['0.6.5',    '<= 0.7.5', require: false]
+    gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false]
+    gems['win32-service'] =  ['0.7.2',    '<= 0.8.8', require: false]
+  else
+    gems['ffi'] =            ['~> 1.9.0',             require: false]
+    gems['minitar'] =        ['~> 0.5.4',             require: false]
+    gems['win32-eventlog'] = ['~> 0.5',   '<= 0.6.5', require: false]
+    gems['win32-process'] =  ['~> 0.6',   '<= 0.7.5', require: false]
+    gems['win32-security'] = ['~> 0.1',   '<= 0.2.5', require: false]
+    gems['win32-service'] =  ['~> 0.7',   '<= 0.8.8', require: false]
+  end
+
+  gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false]
+
+  if RUBY_VERSION.start_with?('1.')
+    gems['win32console'] = ['1.3.2', require: false]
+    # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x
+    gems['sys-admin'] =    ['1.5.6', require: false]
+  end
 
-if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
+  # Puppet < 3.7.0 requires these.
+  # Puppet >= 3.5.0 gem includes these as requirements.
+  # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0.
+  gems['win32-api'] =           ['1.4.8', require: false]
+  gems['win32-taskscheduler'] = ['0.2.2', require: false]
+  gems['windows-api'] =         ['0.4.3', require: false]
+  gems['windows-pr'] =          ['1.2.3', require: false]
+elsif Gem.win_platform?
   # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
   # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
   gems['win32-dir'] =      ['<= 0.4.9', require: false]
   gems['win32-eventlog'] = ['<= 0.6.5', require: false]
   gems['win32-process'] =  ['<= 0.7.5', require: false]
   gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['0.8.8', require: false]
+  gems['win32-service'] =  ['<= 0.8.8', require: false]
 end
 
 gems.each do |gem_name, gem_params|
diff --git a/Rakefile b/Rakefile
index 1c3928709f..a39cae2f03 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,4 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
+require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send('relative')
diff --git a/metadata.json b/metadata.json
index 52d310af82..00f41e9117 100644
--- a/metadata.json
+++ b/metadata.json
@@ -78,7 +78,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.5.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-gfe44b98"
+  "pdk-version": "1.4.1",
+  "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
+  "template-ref": "1.4.1-0-g52adbbb"
 }
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
deleted file mode 100644
index 3248be5aa6..0000000000
--- a/spec/default_facts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Use default_module_facts.yml for module specific facts.
-#
-# Facts specified here will override the values provided by rspec-puppet-facts.
----
-concat_basedir: "/tmp"
-ipaddress: "172.16.254.254"
-is_pe: false
-macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e117192684..efd225b540 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
@@ -28,9 +27,4 @@
 
 RSpec.configure do |c|
   c.default_facts = default_facts
-  c.before :each do
-    # set to strictest setting for testing
-    # by default Puppet runs at warning level
-    Puppet.settings[:strict] = :warning
-  end
 end

From fdeb7110c0995b8afd23a97d365fd4cdd0805f04 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppet.com>
Date: Fri, 18 May 2018 15:15:11 +0100
Subject: [PATCH 1355/2267] pdksync_heads/master-0-g34e3266

---
 .gitignore                              |  1 +
 .pdkignore                              | 23 ++++++++
 .rubocop.yml                            | 12 +++-
 .travis.yml                             | 24 +++-----
 .yardopts                               |  1 +
 Gemfile                                 | 62 +++-----------------
 Rakefile                                |  5 +-
 lib/facter/apache_version.rb            |  2 +-
 metadata.json                           |  6 +-
 spec/acceptance/vhost_spec.rb           |  2 +-
 spec/classes/apache_spec.rb             | 75 +++----------------------
 spec/classes/mod/dev_spec.rb            |  6 +-
 spec/classes/mod/negotiation_spec.rb    |  2 +-
 spec/classes/mod/passenger_spec.rb      |  6 +-
 spec/classes/mod/status_spec.rb         |  4 +-
 spec/default_facts.yml                  |  8 +++
 spec/defines/vhost_spec.rb              | 14 ++---
 spec/spec_helper.rb                     |  6 ++
 spec/unit/provider/a2mod/gentoo_spec.rb |  6 +-
 19 files changed, 99 insertions(+), 166 deletions(-)
 create mode 100644 .pdkignore
 create mode 100644 .yardopts
 create mode 100644 spec/default_facts.yml

diff --git a/.gitignore b/.gitignore
index 56efb9ca14..49bc2a4014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@
 /tmp/
 /vendor/
 /convert_report.txt
+/update_report.txt
 .DS_Store
diff --git a/.pdkignore b/.pdkignore
new file mode 100644
index 0000000000..49bc2a4014
--- /dev/null
+++ b/.pdkignore
@@ -0,0 +1,23 @@
+.*.sw[op]
+.metadata
+.yardoc
+.yardwarns
+*.iml
+/.bundle/
+/.idea/
+/.vagrant/
+/coverage/
+/bin/
+/doc/
+/Gemfile.local
+/Gemfile.lock
+/junit/
+/log/
+/pkg/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/tmp/
+/vendor/
+/convert_report.txt
+/update_report.txt
+.DS_Store
diff --git a/.rubocop.yml b/.rubocop.yml
index 50220b4bce..bfd2cd1d5c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,11 +8,14 @@ AllCops:
   Exclude:
   - bin/*
   - ".vendor/**/*"
-  - Gemfile
-  - Rakefile
+  - "**/Gemfile"
+  - "**/Rakefile"
   - pkg/**/*
   - spec/fixtures/**/*
   - vendor/**/*
+  - "**/Puppetfile"
+  - "**/Vagrantfile"
+  - "**/Guardfile"
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
@@ -66,6 +69,11 @@ Style/SymbolArray:
 inherit_from: ".rubocop_todo.yml"
 RSpec/MessageSpies:
   EnforcedStyle: receive
+Style/Documentation:
+  Exclude:
+  - lib/puppet/parser/functions/**/*
+Style/WordArray:
+  EnforcedStyle: brackets
 Style/CollectionMethods:
   Enabled: true
 Style/MethodCalledOnDoEndBlock:
diff --git a/.travis.yml b/.travis.yml
index 7cbb7181ca..16908eb668 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
 ---
-env:
-  global:
-    - PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
 sudo: false
 dist: trusty
 language: ruby
@@ -10,7 +7,6 @@ before_install:
   - bundle -v
   - rm -f Gemfile.lock
   - gem update --system
-  - gem update bundler
   - gem --version
   - bundle -v
 script:
@@ -19,14 +15,16 @@ bundler_args: --without system_tests
 rvm:
   - 2.4.1
 env:
-  - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
+  global:
+    - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
+    - PARALLEL_TEST_PROCESSORS=16
 matrix:
   fast_finish: true
   include:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/centos-7
       rvm: 2.4.1
       script: bundle exec rake beaker
       services: docker
@@ -34,23 +32,17 @@ matrix:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04
       rvm: 2.4.1
       script: bundle exec rake beaker
       services: docker
       sudo: required
     -
-      env: CHECK=rubocop
-    -
-      env: CHECK="syntax lint"
-    -
-      env: CHECK=metadata_lint
-    -
-      env: CHECK=release_checks
+      env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
     -
-      env: CHECK=spec
+      env: CHECK=parallel_spec
     -
-      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
+      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
       rvm: 2.1.9
 branches:
   only:
diff --git a/.yardopts b/.yardopts
new file mode 100644
index 0000000000..29c933bcf1
--- /dev/null
+++ b/.yardopts
@@ -0,0 +1 @@
+--markup markdown
diff --git a/Gemfile b/Gemfile
index 37597a3035..a7ec8208c8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,11 +28,12 @@ group :development do
   gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
   gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
+  gem "json", '<= 2.0.4',                              require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
   gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-blacksmith", '~> 3.4',                   require: false
+  gem "puppet-blacksmith", '~> 3.4',                   require: false, platforms: [:ruby]
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
@@ -49,73 +50,24 @@ puppet_type = gem_type(puppet_version)
 facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
 
-def puppet_older_than?(version)
-  puppet_version = ENV['PUPPET_GEM_VERSION']
-  !puppet_version.nil? &&
-    Gem::Version.correct?(puppet_version) &&
-    Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup))
-end
-
 gems = {}
 
 gems['puppet'] = location_for(puppet_version)
 
 # If facter or hiera versions have been specified via the environment
-# variables, use those versions. If not, and if the puppet version is < 3.5.0,
-# use known good versions of both for puppet < 3.5.0.
-if facter_version
-  gems['facter'] = location_for(facter_version)
-elsif puppet_type == :gem && puppet_older_than?('3.5.0')
-  gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false]
-end
-
-if hiera_version
-  gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION'])
-elsif puppet_type == :gem && puppet_older_than?('3.5.0')
-  gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false]
-end
+# variables
 
-if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0'))
-  # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows
-  if puppet_type == :gem
-    gems['ffi'] =            ['1.9.0',                require: false]
-    gems['minitar'] =        ['0.5.4',                require: false]
-    gems['win32-eventlog'] = ['0.5.3',    '<= 0.6.5', require: false]
-    gems['win32-process'] =  ['0.6.5',    '<= 0.7.5', require: false]
-    gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false]
-    gems['win32-service'] =  ['0.7.2',    '<= 0.8.8', require: false]
-  else
-    gems['ffi'] =            ['~> 1.9.0',             require: false]
-    gems['minitar'] =        ['~> 0.5.4',             require: false]
-    gems['win32-eventlog'] = ['~> 0.5',   '<= 0.6.5', require: false]
-    gems['win32-process'] =  ['~> 0.6',   '<= 0.7.5', require: false]
-    gems['win32-security'] = ['~> 0.1',   '<= 0.2.5', require: false]
-    gems['win32-service'] =  ['~> 0.7',   '<= 0.8.8', require: false]
-  end
-
-  gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false]
-
-  if RUBY_VERSION.start_with?('1.')
-    gems['win32console'] = ['1.3.2', require: false]
-    # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x
-    gems['sys-admin'] =    ['1.5.6', require: false]
-  end
+gems['facter'] = location_for(facter_version) if facter_version
+gems['hiera'] = location_for(hiera_version) if hiera_version
 
-  # Puppet < 3.7.0 requires these.
-  # Puppet >= 3.5.0 gem includes these as requirements.
-  # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0.
-  gems['win32-api'] =           ['1.4.8', require: false]
-  gems['win32-taskscheduler'] = ['0.2.2', require: false]
-  gems['windows-api'] =         ['0.4.3', require: false]
-  gems['windows-pr'] =          ['1.2.3', require: false]
-elsif Gem.win_platform?
+if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
   # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
   # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
   gems['win32-dir'] =      ['<= 0.4.9', require: false]
   gems['win32-eventlog'] = ['<= 0.6.5', require: false]
   gems['win32-process'] =  ['<= 0.7.5', require: false]
   gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['<= 0.8.8', require: false]
+  gems['win32-service'] =  ['0.8.8', require: false]
 end
 
 gems.each do |gem_name, gem_params|
diff --git a/Rakefile b/Rakefile
index a39cae2f03..ef5f69827b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet_blacksmith/rake_tasks'
+require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 require 'puppet-lint/tasks/puppet-lint'
+
+PuppetLint.configuration.send('disable_relative')
+
diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index de4c4c1a4f..cd29c1dbe3 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -1,5 +1,5 @@
 Facter.add(:apache_version) do
-  confine kernel: %w[FreeBSD Linux]
+  confine kernel: ['FreeBSD', 'Linux']
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
diff --git a/metadata.json b/metadata.json
index 00f41e9117..487e4f7bcf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -78,7 +78,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.4.1",
-  "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
-  "template-ref": "1.4.1-0-g52adbbb"
+  "pdk-version": "1.5.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates",
+  "template-ref": "heads/master-0-g34e3266"
 }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e8e520072b..98210f3fc0 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1039,7 +1039,7 @@ class { 'apache': }
     end
   end
 
-  %w[access error].each do |logtype|
+  ['access', 'error'].each do |logtype|
     case logtype
     when 'access'
       logname = 'CustomLog'
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index a0091554dc..cacc1215a9 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -59,16 +59,7 @@
       )
     }
     # Assert that load files are placed and symlinked for these mods, but no conf file.
-    %w[
-      auth_basic
-      authn_file
-      authz_default
-      authz_groupfile
-      authz_host
-      authz_user
-      dav
-      env
-    ].each do |modname|
+    ['auth_basic', 'authn_file', 'authz_default', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/etc/apache2/mods-available/#{modname}.load",
@@ -138,16 +129,7 @@
     end
 
     # Assert that both load files and conf files are placed and symlinked for these mods
-    %w[
-      alias
-      autoindex
-      dav_fs
-      deflate
-      dir
-      mime
-      negotiation
-      setenvif
-    ].each do |modname|
+    ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/etc/apache2/mods-available/#{modname}.load",
@@ -379,16 +361,7 @@
       end
 
       # Assert that load files are placed for these mods, but no conf file.
-      %w[
-        auth_basic
-        authn_file
-        authz_default
-        authz_groupfile
-        authz_host
-        authz_user
-        dav
-        env
-      ].each do |modname|
+      ['auth_basic', 'authn_file', 'authz_default', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
         it {
           is_expected.to contain_file("#{modname}.load").with_path(
             "/etc/httpd/mod.d/#{modname}.load",
@@ -402,16 +375,7 @@
       end
 
       # Assert that both load files and conf files are placed for these mods
-      %w[
-        alias
-        autoindex
-        dav_fs
-        deflate
-        dir
-        mime
-        negotiation
-        setenvif
-      ].each do |modname|
+      ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
         it {
           is_expected.to contain_file("#{modname}.load").with_path(
             "/etc/httpd/mod.d/#{modname}.load",
@@ -642,14 +606,7 @@
     end
     describe 'default mods custom' do
       let :params do
-        { default_mods: %w[
-          info
-          alias
-          mime
-          env
-          setenv
-          expires
-        ] }
+        { default_mods: ['info', 'alias', 'mime', 'env', 'setenv', 'expires'] }
       end
 
       it { is_expected.to contain_apache__mod('authz_host') }
@@ -774,16 +731,7 @@
       )
     }
     # Assert that load files are placed for these mods, but no conf file.
-    %w[
-      auth_basic
-      authn_core
-      authn_file
-      authz_groupfile
-      authz_host
-      authz_user
-      dav
-      env
-    ].each do |modname|
+    ['auth_basic', 'authn_core', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
@@ -794,16 +742,7 @@
     end
 
     # Assert that both load files and conf files are placed for these mods
-    %w[
-      alias
-      autoindex
-      dav_fs
-      deflate
-      dir
-      mime
-      negotiation
-      setenvif
-    ].each do |modname|
+    ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index d74450bb32..674babdc2d 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -10,9 +10,9 @@
   it_behaves_like 'a mod class, without including apache'
 
   [
-    %w[RedHat 6 Santiago Linux],
-    %w[Debian 6 squeeze Linux],
-    %w[FreeBSD 9 FreeBSD FreeBSD],
+    ['RedHat', '6', 'Santiago', 'Linux'],
+    ['Debian', '6', 'squeeze', 'Linux'],
+    ['FreeBSD', '9', 'FreeBSD', 'FreeBSD'],
   ].each do |osfamily, operatingsystemrelease, lsbdistcodename, kernel|
     context "on a #{osfamily} OS" do
       let :facts do
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 47e34996e0..2bc571683d 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -40,7 +40,7 @@
 
     context 'with language_priority parameter' do
       let :params do
-        { language_priority: %w[en es] }
+        { language_priority: ['en', 'es'] }
       end
 
       it do
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 30d993eb08..9ca45e41a7 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -36,7 +36,7 @@
       'passenger_base_uri' => { type: 'URI', pass_opt: :PassengerBaseURI },
       'passenger_buffer_response' => { type: 'OnOff', pass_opt: :PassengerBufferResponse },
       'passenger_buffer_upload' => { type: 'OnOff', pass_opt: :PassengerBufferUpload },
-      'passenger_concurrency_model' => { type: %w[process thread], pass_opt: :PassengerConcurrencyModel },
+      'passenger_concurrency_model' => { type: ['process', 'thread'], pass_opt: :PassengerConcurrencyModel },
       'passenger_data_buffer_dir' => { type: 'FullPath', pass_opt: :PassengerDataBufferDir },
       'passenger_debug_log_file' => { type: 'String', pass_opt: :PassengerDebugLogFile },
       'passenger_debugger' => { type: 'OnOff', pass_opt: :PassengerDebugger },
@@ -81,7 +81,7 @@
       'passenger_security_update_check_proxy' => { type: 'URI', pass_opt: :PassengerSecurityUpdateCheckProxy },
       'passenger_show_version_in_header' => { type: 'OnOff', pass_opt: :PassengerShowVersionInHeader },
       'passenger_socket_backlog' => { type: 'Integer', pass_opt: :PassengerSocketBacklog },
-      'passenger_spawn_method' => { type: %w[smart direct], pass_opt: :PassengerSpawnMethod },
+      'passenger_spawn_method' => { type: ['smart', 'direct'], pass_opt: :PassengerSpawnMethod },
       'passenger_start_timeout' => { type: 'Integer', pass_opt: :PassengerStartTimeout },
       'passenger_startup_file' => { type: 'RelPath', pass_opt: :PassengerStartupFile },
       'passenger_stat_throttle_rate' => { type: 'Integer', pass_opt: :PassengerStatThrottleRate },
@@ -146,7 +146,7 @@
           end
         end
       when 'OnOff'
-        valid_config_values = %w[on off]
+        valid_config_values = ['on', 'off']
         valid_config_values.each do |valid_value|
           describe "with #{puppetized_config_option} => '#{valid_value}'" do
             let :params do
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 7f906b6e73..84e30253b0 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -281,7 +281,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
     end
 
     # Only On or Off are valid options
-    %w[On Off].each do |valid_param|
+    ['On', 'Off'].each do |valid_param|
       context "with valid value $extended_status => '#{valid_param}'" do
         let :facts do
           {
@@ -308,7 +308,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
       end
     end
 
-    %w[Yes No].each do |invalid_param|
+    ['Yes', 'No'].each do |invalid_param|
       context "with invalid value $extended_status => '#{invalid_param}'" do
         let :facts do
           {
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
new file mode 100644
index 0000000000..3248be5aa6
--- /dev/null
+++ b/spec/default_facts.yml
@@ -0,0 +1,8 @@
+# Use default_module_facts.yml for module specific facts.
+#
+# Facts specified here will override the values provided by rspec-puppet-facts.
+---
+concat_basedir: "/tmp"
+ipaddress: "172.16.254.254"
+is_pe: false
+macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 74c2e8e771..06c3071e27 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -246,7 +246,7 @@
             },
             { 'path'              => '/var/www/files/indexed_directory',
               'directoryindex'    => 'disabled',
-              'options'           => %w[Indexes FollowSymLinks MultiViews],
+              'options'           => ['Indexes', 'FollowSymLinks', 'MultiViews'],
               'index_options'     => ['FancyIndexing'],
               'index_style_sheet' => '/styles/style.css' },
             { 'path'              => '/var/www/files/output_filtered',
@@ -289,7 +289,7 @@
             {
               'path'            => '/a',
               'url'             => 'http://backend-a/',
-              'keywords'        => %w[noquery interpolate],
+              'keywords'        => ['noquery', 'interpolate'],
               'no_proxy_uris'       => ['/a/foo', '/a/bar'],
               'no_proxy_uris_match' => ['/a/foomatch'],
               'reverse_cookies' => [
@@ -313,7 +313,7 @@
             {
               'path'     => '/a',
               'url'      => 'http://backend-a/',
-              'keywords' => %w[noquery interpolate],
+              'keywords' => ['noquery', 'interpolate'],
               'no_proxy_uris'       => ['/a/foo', '/a/bar'],
               'no_proxy_uris_match' => ['/a/foomatch'],
               'params' => {
@@ -326,8 +326,8 @@
           'suphp_addhandler'            => 'foo',
           'suphp_engine'                => 'on',
           'suphp_configpath'            => '/var/www/html',
-          'php_admin_flags'             => %w[foo bar],
-          'php_admin_values'            => %w[true false],
+          'php_admin_flags'             => ['foo', 'bar'],
+          'php_admin_values'            => ['true', 'false'],
           'no_proxy_uris'               => '/foo',
           'no_proxy_uris_match'         => '/foomatch',
           'proxy_preserve_host'         => true,
@@ -964,7 +964,7 @@
     context 'vhost with multiple ports' do
       let :params do
         {
-          'port'                        => %w[80 8080],
+          'port'                        => ['80', '8080'],
           'ip'                          => '127.0.0.1',
           'ip_based'                    => true,
           'servername'                  => 'example.com',
@@ -1002,7 +1002,7 @@
     context 'vhost with multiple ip addresses, multiple ports' do
       let :params do
         {
-          'port'                        => %w[80 8080],
+          'port'                        => ['80', '8080'],
           'ip'                          => ['127.0.0.1', '::1'],
           'ip_based'                    => true,
           'servername'                  => 'example.com',
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index efd225b540..e117192684 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,4 @@
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
@@ -27,4 +28,9 @@
 
 RSpec.configure do |c|
   c.default_facts = default_facts
+  c.before :each do
+    # set to strictest setting for testing
+    # by default Puppet runs at warning level
+    Puppet.settings[:strict] = :warning
+  end
 end
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index b157fa020c..6c747ed63e 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -21,21 +21,21 @@
       expect(filetype).to receive(:read).and_return(%(APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n))
       expect(provider_class).to receive(:filetype) { filetype }
 
-      expect(provider_class.modules).to eq(%w[bar baz foo])
+      expect(provider_class.modules).to eq(['bar', 'baz', 'foo'])
     end
 
     it 'caches the module list' do
       expect(filetype).to receive(:read).once { %(APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n) } # rubocop:disable Lint/AmbiguousBlockAssociation
       expect(provider_class).to receive(:filetype).once { filetype } # rubocop:disable Lint/AmbiguousBlockAssociation
 
-      2.times { expect(provider_class.modules).to eq(%w[bar baz foo]) }
+      2.times { expect(provider_class.modules).to eq(['bar', 'baz', 'foo']) }
     end
 
     it 'normalizes parameters' do
       filetype.expects(:read).returns(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
       provider_class.expects(:filetype).returns(filetype)
 
-      expect(provider_class.modules).to eq(%w[bar foo])
+      expect(provider_class.modules).to eq(['bar', 'foo'])
     end
   end
 

From 74e147246399de9a99a3345eb44f68f0cf59c3a2 Mon Sep 17 00:00:00 2001
From: Quien Sabe <quiensabe@wtfo-guru.com>
Date: Mon, 21 May 2018 18:04:21 -0400
Subject: [PATCH 1356/2267] added $ to replacment param

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3038354a69..14259faeaa 100755
--- a/README.md
+++ b/README.md
@@ -4230,7 +4230,7 @@ apache::vhost { 'site.name.fdqn':
   …
   redirectmatch_status => ['404','404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
+  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
 ```
 

From 30100cf9af3f223cb0a8c3d80f643146a6acc827 Mon Sep 17 00:00:00 2001
From: Christopher Thorn <christopher.thorn@puppetlabs.com>
Date: Mon, 21 May 2018 16:20:33 -0700
Subject: [PATCH 1357/2267] (maint) Update beaker-task_helper path

---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index fed5434601..f2bfa5b594 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -3,7 +3,7 @@
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
-require 'beaker/task_helper'
+require 'beaker-task_helper'
 
 run_puppet_install_helper
 install_bolt_on(hosts) unless pe_install?

From 30ab3541f503353f56e701c1df27dd132d31ae96 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Fri, 25 May 2018 15:56:10 +0100
Subject: [PATCH 1358/2267] [FM-6958] Removal of unsupported OS from apache

---
 metadata.json                                 |   2 -
 spec/acceptance/mod_dav_svn_spec.rb           |  23 ++-
 spec/acceptance/mod_passenger_spec.rb         |   3 +-
 spec/acceptance/vhost_spec.rb                 | 136 +++++++++---------
 spec/classes/apache_spec.rb                   |  27 ----
 spec/classes/dev_spec.rb                      |  10 +-
 spec/classes/mod/alias_spec.rb                |   4 +-
 spec/classes/mod/auth_cas_spec.rb             |   4 +-
 spec/classes/mod/auth_kerb_spec.rb            |   4 +-
 spec/classes/mod/auth_mellon_spec.rb          |   4 +-
 spec/classes/mod/authn_dbd_spec.rb            |   4 +-
 spec/classes/mod/authnz_ldap_spec.rb          |   4 +-
 spec/classes/mod/authnz_pam_spec.rb           |   6 +-
 spec/classes/mod/dav_svn_spec.rb              |   6 +-
 spec/classes/mod/deflate_spec.rb              |   4 +-
 spec/classes/mod/dev_spec.rb                  |   2 +-
 spec/classes/mod/dir_spec.rb                  |   4 +-
 spec/classes/mod/disk_cache_spec.rb           |   4 +-
 spec/classes/mod/dumpio_spec.rb               |   6 +-
 spec/classes/mod/event_spec.rb                |   4 +-
 spec/classes/mod/expires_spec.rb              |   4 +-
 spec/classes/mod/ext_filter_spec.rb           |   4 +-
 spec/classes/mod/fastcgi_spec.rb              |   2 +-
 spec/classes/mod/fcgid_spec.rb                |   6 +-
 .../classes/mod/intercept_form_submit_spec.rb |   4 +-
 spec/classes/mod/itk_spec.rb                  |   4 +-
 spec/classes/mod/ldap_spec.rb                 |   4 +-
 spec/classes/mod/lookup_identity.rb           |   4 +-
 spec/classes/mod/mime_magic_spec.rb           |   4 +-
 spec/classes/mod/mime_spec.rb                 |   4 +-
 spec/classes/mod/negotiation_spec.rb          |   4 +-
 spec/classes/mod/pagespeed_spec.rb            |   4 +-
 spec/classes/mod/passenger_spec.rb            |  52 +------
 spec/classes/mod/perl_spec.rb                 |   4 +-
 spec/classes/mod/php_spec.rb                  |   6 +-
 spec/classes/mod/prefork_spec.rb              |   4 +-
 spec/classes/mod/proxy_html_spec.rb           |  30 +---
 spec/classes/mod/python_spec.rb               |   4 +-
 spec/classes/mod/reqtimeout_spec.rb           |   4 +-
 spec/classes/mod/rpaf_spec.rb                 |   4 +-
 spec/classes/mod/security_spec.rb             |   4 +-
 spec/classes/mod/shib_spec.rb                 |   4 +-
 spec/classes/mod/speling_spec.rb              |   4 +-
 spec/classes/mod/ssl_spec.rb                  |   4 +-
 spec/classes/mod/suphp_spec.rb                |   4 +-
 spec/classes/mod/userdir_spec.rb              |   6 +-
 spec/classes/mod/worker_spec.rb               |   4 +-
 spec/classes/mod/wsgi_spec.rb                 |   4 +-
 spec/classes/params_spec.rb                   |   4 +-
 spec/classes/service_spec.rb                  |   4 +-
 spec/defines/balancer_spec.rb                 |  17 +--
 spec/defines/balancermember_spec.rb           |   4 +-
 spec/defines/custom_config_spec.rb            |   4 +-
 spec/defines/fastcgi_server_spec.rb           |   8 +-
 spec/defines/mod_spec.rb                      |   4 +-
 spec/defines/modsec_link_spec.rb              |   4 +-
 spec/defines/vhost_custom_spec.rb             |   4 +-
 spec/defines/vhost_spec.rb                    |   4 +-
 spec/spec_helper_acceptance.rb                |   4 -
 spec/spec_helper_local.rb                     |   4 +-
 60 files changed, 198 insertions(+), 318 deletions(-)

diff --git a/metadata.json b/metadata.json
index 487e4f7bcf..dbd833ec0f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -44,7 +44,6 @@
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7"
       ]
@@ -52,7 +51,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 3d5976607c..4ee0d60d08 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -1,18 +1,17 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::dav_svn class', unless: (fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7') ||
-                                               (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajorrelease') < '11') do
-  case fact('osfamily')
-  when 'Debian'
-    if fact('operatingsystemmajrelease') == '6' || fact('operatingsystemmajrelease') == '10.04' || fact('operatingsystemrelease') == '10.04' || fact('operatingsystemmajrelease') == '16.04'
-      authz_svn_load_file = 'dav_svn_authz_svn.load'
-    else
-      authz_svn_load_file = 'authz_svn.load'
-    end
-  else
-    authz_svn_load_file = 'dav_svn_authz_svn.load'
-  end
+describe 'apache::mod::dav_svn class', unless: (fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7') do
+  authz_svn_load_file = case fact('osfamily')
+                        when 'Debian'
+                          if fact('operatingsystemmajrelease') == '16.04'
+                            'dav_svn_authz_svn.load'
+                          else
+                            'authz_svn.load'
+                          end
+                        else
+                          'dav_svn_authz_svn.load'
+                        end
 
   context 'default dav_svn config' do
     pp = <<-MANIFEST
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 5321454ccc..20c15e4018 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -173,8 +173,7 @@ class { 'apache::mod::passenger': }
       # these two lines
       unless (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') ||
              (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
-             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') ||
-             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '7')
+             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
         expected_one < [%r{### Processes: [0-9]+}, %r{### Total private dirty RSS: [0-9\.]+ MB}]
       end
       it 'outputs status via passenger-memory-stats #stdout' do
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 98210f3fc0..0fdd15ef30 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -123,33 +123,31 @@ class { 'apache': }
     end
   end
 
-  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajorrelease') <= '10'
-    context 'new proxy vhost on port 80' do
-      pp = <<-MANIFEST
-        class { 'apache': }
-        apache::vhost { 'proxy.example.com':
-          port    => '80',
-          docroot => '#{$docroot}/proxy',
-          proxy_pass_match => [
-            { 'path' => '/foo', 'url' => 'http://backend-foo/'},
-          ],
-        proxy_preserve_host   => true,
-        proxy_error_override  => true,
-        }
-      MANIFEST
-      it 'configures an apache proxy vhost' do
-        apply_manifest(pp, catch_failures: true)
-      end
+  context 'new proxy vhost on port 80' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      apache::vhost { 'proxy.example.com':
+        port    => '80',
+        docroot => '#{$docroot}/proxy',
+        proxy_pass_match => [
+          { 'path' => '/foo', 'url' => 'http://backend-foo/'},
+        ],
+      proxy_preserve_host   => true,
+      proxy_error_override  => true,
+      }
+    MANIFEST
+    it 'configures an apache proxy vhost' do
+      apply_manifest(pp, catch_failures: true)
+    end
 
-      describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
-        it { is_expected.to contain '<VirtualHost \*:80>' }
-        it { is_expected.to contain 'ServerName proxy.example.com' }
-        it { is_expected.to contain 'ProxyPassMatch /foo http://backend-foo/' }
-        it { is_expected.to contain 'ProxyPreserveHost On' }
-        it { is_expected.to contain 'ProxyErrorOverride On' }
-        it { is_expected.not_to contain 'ProxyAddHeaders' }
-        it { is_expected.not_to contain "<Proxy \*>" }
-      end
+    describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
+      it { is_expected.to contain '<VirtualHost \*:80>' }
+      it { is_expected.to contain 'ServerName proxy.example.com' }
+      it { is_expected.to contain 'ProxyPassMatch /foo http://backend-foo/' }
+      it { is_expected.to contain 'ProxyPreserveHost On' }
+      it { is_expected.to contain 'ProxyErrorOverride On' }
+      it { is_expected.not_to contain 'ProxyAddHeaders' }
+      it { is_expected.not_to contain "<Proxy \*>" }
     end
   end
 
@@ -805,53 +803,51 @@ class { 'apache': default_vhost => false, }
     end
   end
 
-  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajorrelease') <= '10'
-    context 'proxy_pass_match for alternative vhost' do
-      it 'configures a local vhost and a proxy vhost' do
-        apply_manifest(%(
-          class { 'apache': default_vhost => false, }
-          apache::vhost { 'localhost':
-            docroot => '/var/www/local',
-            ip      => '127.0.0.1',
-            port    => '8888',
-          }
-          apache::listen { '*:80': }
-          apache::vhost { 'proxy.example.com':
-            docroot    => '/var/www',
-            port       => '80',
-            add_listen => false,
-            proxy_pass_match => {
-              'path' => '/',
-              'url'  => 'http://localhost:8888/subdir/',
-            },
-          }
-          host { 'proxy.example.com': ip => '127.0.0.1', }
-          file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
-          file { '/var/www/local/subdir/index.html':
-            ensure  => file,
-            content => "Hello from localhost\\n",
-          }
-                      ), catch_failures: true)
-      end
+  context 'proxy_pass_match for alternative vhost' do
+    it 'configures a local vhost and a proxy vhost' do
+      apply_manifest(%(
+        class { 'apache': default_vhost => false, }
+        apache::vhost { 'localhost':
+          docroot => '/var/www/local',
+          ip      => '127.0.0.1',
+          port    => '8888',
+        }
+        apache::listen { '*:80': }
+        apache::vhost { 'proxy.example.com':
+          docroot    => '/var/www',
+          port       => '80',
+          add_listen => false,
+          proxy_pass_match => {
+            'path' => '/',
+            'url'  => 'http://localhost:8888/subdir/',
+          },
+        }
+        host { 'proxy.example.com': ip => '127.0.0.1', }
+        file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
+        file { '/var/www/local/subdir/index.html':
+          ensure  => file,
+          content => "Hello from localhost\\n",
+        }
+                    ), catch_failures: true)
+    end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        else
-          it { is_expected.to be_enabled }
-        end
-        it { is_expected.to be_running }
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { is_expected.to be_enabled }
       end
+      it { is_expected.to be_running }
+    end
 
-      it 'gets a response from the back end #stdout' do
-        shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
-          expect(r.stdout).to eq("Hello from localhost\n")
-        end
+    it 'gets a response from the back end #stdout' do
+      shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
+        expect(r.stdout).to eq("Hello from localhost\n")
       end
-      it 'gets a response from the back end #exit_code' do
-        shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
-          expect(r.exit_code).to eq(0)
-        end
+    end
+    it 'gets a response from the back end #exit_code' do
+      shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
+        expect(r.exit_code).to eq(0)
       end
     end
   end
@@ -968,7 +964,7 @@ class { 'apache': }
     describe file($ports_file) do
       it { is_expected.to be_file }
       if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
-         fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') =~ %r{(14\.04|13\.10|16\.04)} ||
+         fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') =~ %r{(14\.04|16\.04)} ||
          fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8' ||
          fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index cacc1215a9..98e33f00ea 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -270,33 +270,6 @@
         )
       }
     end
-    context 'on Ubuntu 13.10' do
-      let :facts do
-        super().merge(operatingsystem: 'Ubuntu',
-                      lsbdistrelease: '13.10',
-                      operatingsystemrelease: '13.10')
-      end
-
-      it { is_expected.to contain_class('apache').with_apache_version('2.4') }
-    end
-    context 'on Ubuntu 12.04' do
-      let :facts do
-        super().merge(operatingsystem: 'Ubuntu',
-                      lsbdistrelease: '12.04',
-                      operatingsystemrelease: '12.04')
-      end
-
-      it { is_expected.to contain_class('apache').with_apache_version('2.2') }
-    end
-    context 'on Ubuntu 13.04' do
-      let :facts do
-        super().merge(operatingsystem: 'Ubuntu',
-                      lsbdistrelease: '13.04',
-                      operatingsystemrelease: '13.04')
-      end
-
-      it { is_expected.to contain_class('apache').with_apache_version('2.2') }
-    end
   end
 
   context 'on a RedHat 5 OS' do
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 6040eaa5c3..1b6ebffd50 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -10,7 +10,7 @@
   context 'on a Debian OS' do
     let :facts do
       {
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         osfamily: 'Debian',
         operatingsystem: 'Debian',
         operatingsystemrelease: '6',
@@ -27,14 +27,14 @@
     it { is_expected.to contain_package('libapr1-dev') }
     it { is_expected.to contain_package('apache2-prefork-dev') }
   end
-  context 'on an Ubuntu 14 OS' do
+  context 'on an Ubuntu 16 OS' do
     let :facts do
       {
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
+        lsbdistrelease: '16.04',
+        lsbdistcodename: 'xenial',
         osfamily: 'Debian',
         operatingsystem: 'Ubuntu',
-        operatingsystemrelease: '14.04',
+        operatingsystemrelease: '16.04',
         is_pe: false,
         concat_basedir: '/foo',
         id: 'root',
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 076b0d4bc6..72eab550de 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -9,10 +9,10 @@
         {
           id: 'root',
           kernel: 'Linux',
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           osfamily: 'Debian',
           operatingsystem: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           concat_basedir: '/dne',
           is_pe: false,
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index bfe8f58020..e7e83cd269 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -26,10 +26,10 @@
         {
           id: 'root',
           kernel: 'Linux',
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           osfamily: 'Debian',
           operatingsystem: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           concat_basedir: '/dne',
           is_pe: false,
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index c663a51462..d6840f7749 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -9,10 +9,10 @@
         {
           id: 'root',
           kernel: 'Linux',
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           osfamily: 'Debian',
           operatingsystem: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           concat_basedir: '/dne',
           is_pe: false,
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index 89548e2c92..8adbb4065d 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -7,9 +7,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
index c5adad496a..e0314589ba 100644
--- a/spec/classes/mod/authn_dbd_spec.rb
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -25,10 +25,10 @@
         {
           id: 'root',
           kernel: 'Linux',
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           osfamily: 'Debian',
           operatingsystem: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           concat_basedir: '/dne',
           is_pe: false,
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index 9ca8cbef42..1ff932aeae 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -6,9 +6,9 @@
   context 'default configuration with parameters on a Debian OS' do
     let :facts do
       {
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/authnz_pam_spec.rb b/spec/classes/mod/authnz_pam_spec.rb
index f3df7b4af5..e43b46a535 100644
--- a/spec/classes/mod/authnz_pam_spec.rb
+++ b/spec/classes/mod/authnz_pam_spec.rb
@@ -7,9 +7,9 @@
     context 'on a Debian OS' do
       let :facts do
         {
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           osfamily: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
@@ -28,7 +28,7 @@
       let :facts do
         {
           osfamily: 'RedHat',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index f2e61c48a1..dc2eca08a4 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -7,10 +7,10 @@
     context 'on a Debian OS' do
       let :facts do
         {
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           osfamily: 'Debian',
-          operatingsystemrelease: '6',
-          operatingsystemmajrelease: '6',
+          operatingsystemrelease: '8',
+          operatingsystemmajrelease: '8',
           concat_basedir: '/dne',
           operatingsystem: 'Debian',
           id: 'root',
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 5db10cf2ad..92d752c07b 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -34,11 +34,11 @@ def general_deflate_specs
       let :facts do
         {
           id: 'root',
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           kernel: 'Linux',
           osfamily: 'Debian',
           operatingsystem: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           concat_basedir: '/dne',
           is_pe: false,
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 674babdc2d..0de9dbcb7e 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -11,7 +11,7 @@
 
   [
     ['RedHat', '6', 'Santiago', 'Linux'],
-    ['Debian', '6', 'squeeze', 'Linux'],
+    ['Debian', '8', 'jessie', 'Linux'],
     ['FreeBSD', '9', 'FreeBSD', 'FreeBSD'],
   ].each do |osfamily, operatingsystemrelease, lsbdistcodename, kernel|
     context "on a #{osfamily} OS" do
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index b56cca4889..79371f1b59 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -7,13 +7,13 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         is_pe: false,
       }
     end
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index ec33433e5b..ec98ec7124 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -6,10 +6,10 @@
       {
         id: 'root',
         kernel: 'Linux',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         concat_basedir: '/dne',
         is_pe: false,
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
index 5e16d12c90..fc6f2886aa 100644
--- a/spec/classes/mod/dumpio_spec.rb
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -10,10 +10,10 @@
     end
     let :facts do
       {
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
-        operatingsystemmajrelease: '6',
+        operatingsystemrelease: '8',
+        operatingsystemmajrelease: '8',
         concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 02dfe944b8..0f01bc8d8a 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -44,9 +44,9 @@
   context 'on a Debian OS' do
     let :facts do
       {
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index 0c398ef855..9635a6a805 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -8,10 +8,10 @@
       {
         id: 'root',
         kernel: 'Linux',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         concat_basedir: '/dne',
         is_pe: false,
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index d9a5db3ac7..40203ac162 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -6,9 +6,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index d0153e0b5a..17b3062ab9 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -6,7 +6,7 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
         lsbdistcodename: 'squeze',
         operatingsystem: 'Debian',
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 666c29a8e2..ea4d8b7929 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -7,10 +7,10 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
-        operatingsystemmajrelease: '6',
+        operatingsystemrelease: '8',
+        operatingsystemmajrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
index 5e26257ac2..f05f1e1767 100644
--- a/spec/classes/mod/intercept_form_submit_spec.rb
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -7,9 +7,9 @@
     context 'on a Debian OS' do
       let :facts do
         {
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           osfamily: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 1c331fd025..d2a2c52730 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -9,9 +9,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index d0c3cb6286..09ae455152 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -6,9 +6,9 @@
   context 'on a Debian OS' do
     let :facts do
       {
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
index d7074ecf64..2ed371adf7 100644
--- a/spec/classes/mod/lookup_identity.rb
+++ b/spec/classes/mod/lookup_identity.rb
@@ -7,9 +7,9 @@
     context 'on a Debian OS' do
       let :facts do
         {
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           osfamily: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index 037722f56a..ed61ed6a54 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -14,7 +14,7 @@ def general_mime_magic_specs
         osfamily: 'Debian',
         operatingsystemrelease: '6',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
@@ -84,7 +84,7 @@ def general_mime_magic_specs
         osfamily: 'Debian',
         operatingsystemrelease: '6',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index a2c315fea9..3230b53f2e 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -12,9 +12,9 @@ def general_mime_specs
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 2bc571683d..947243f7e6 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -8,8 +8,8 @@
         osfamily: 'Debian',
         operatingsystem: 'Debian',
         kernel: 'Linux',
-        lsbdistcodename: 'squeeze',
-        operatingsystemrelease: '6',
+        lsbdistcodename: 'jessie',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index d45a4d8ad2..a585702a70 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -5,9 +5,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 9ca45e41a7..76aaafe0a9 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -6,10 +6,10 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         kernel: 'Linux',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -177,7 +177,7 @@
         operatingsystemrelease: '6',
         kernel: 'Linux',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -350,34 +350,14 @@
       it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$}) }
     end
 
-    context 'with Ubuntu 12.04 defaults' do
-      let :facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '12.04',
-          kernel: 'Linux',
-          operatingsystem: 'Ubuntu',
-          lsbdistrelease: '12.04',
-          concat_basedir: '/dne',
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerDefaultRuby}) }
-    end
-
-    context 'with Ubuntu 14.04 defaults' do
+    context 'with Ubuntu 16.04 defaults' do
       let :facts do
         {
           osfamily: 'Debian',
-          operatingsystemrelease: '14.04',
+          operatingsystemrelease: '16.04',
           operatingsystem: 'Ubuntu',
           kernel: 'Linux',
-          lsbdistrelease: '14.04',
+          lsbdistrelease: '16.04',
           concat_basedir: '/dne',
           id: 'root',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -390,26 +370,6 @@
       it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
     end
 
-    context 'with Debian 7 defaults' do
-      let :facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '7.3',
-          operatingsystem: 'Debian',
-          kernel: 'Linux',
-          lsbdistcodename: 'wheezy',
-          concat_basedir: '/dne',
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerDefaultRuby}) }
-    end
-
     context 'with Debian 8 defaults' do
       let :facts do
         {
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 732363a275..a5b60867f5 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -6,9 +6,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index f0eb3f1bd2..3d9b81b9df 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -5,9 +5,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
@@ -265,7 +265,7 @@
         operatingsystem: 'Debian',
         operatingsystemrelease: '6',
         kernel: 'Linux',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         concat_basedir: '/dne',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index d498abbb2d..79a7b19297 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -9,9 +9,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 38cbcdeb4e..a10e7b26fa 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -20,7 +20,7 @@
         osfamily: 'Debian',
         concat_basedir: '/dne',
         architecture: 'i386',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
@@ -30,34 +30,6 @@
       }
     end
 
-    context 'on squeeze' do
-      let(:facts) { super().merge(operatingsystemrelease: '6') }
-
-      it_behaves_like 'debian', ['/usr/lib/libxml2.so.2']
-      it { is_expected.not_to contain_apache__mod('xml2enc') }
-    end
-
-    context 'on wheezy i386' do
-      let(:facts) do
-        super().merge(operatingsystemrelease: '7',
-                      hardwaremodel: 'i686',
-                      architecture: 'i386')
-      end
-
-      it { is_expected.not_to contain_apache__mod('xml2enc') }
-      it_behaves_like 'debian', ['/usr/lib/i386-linux-gnu/libxml2.so.2']
-    end
-    context 'on wheezy x64' do
-      let(:facts) do
-        super().merge(operatingsystemrelease: '7',
-                      hardwaremodel: 'x86_64',
-                      architecture: 'amd64')
-      end
-
-      it { is_expected.not_to contain_apache__mod('xml2enc') }
-      it_behaves_like 'debian', ['/usr/lib/x86_64-linux-gnu/libxml2.so.2']
-    end
-
     context 'on jessie i386' do
       let(:facts) do
         super().merge(operatingsystemrelease: '8',
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index aac87784e0..5e6d7a0f8c 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -7,9 +7,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index 390130bbb4..8b9a66fc07 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -6,13 +6,13 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         is_pe: false,
       }
     end
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 8110d4010a..e7a4335f22 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -6,9 +6,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 10c2b302eb..45957bbe8a 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -104,9 +104,9 @@
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         kernel: 'Linux',
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index 115086bcc1..f0b44098c4 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -6,9 +6,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index bb3cd66947..a42ddeae47 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -6,9 +6,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 2d638dcb8b..7233bdfad0 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -95,9 +95,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index 51d20d30bd..1ee6aa8356 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -6,9 +6,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 3867912602..0fb352b546 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -10,10 +10,10 @@
     end
     let :facts do
       {
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
-        operatingsystemmajrelease: '6',
+        operatingsystemrelease: '8',
+        operatingsystemmajrelease: '8',
         concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 3e384646ae..eaeec71d2a 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -9,9 +9,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 85adc79e11..97baa10578 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -6,9 +6,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index 04dea1278c..e5ca863fe8 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -5,9 +5,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 7c73ccc457..00ad67ff24 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -9,9 +9,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index 89dac156d8..b89b1c6cb1 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -8,8 +8,8 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6',
-      lsbdistcodename: 'squeeze',
+      operatingsystemrelease: '8',
+      lsbdistcodename: 'jessie',
       id: 'root',
       concat_basedir: '/dne',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -25,8 +25,6 @@
 
     describe 'works when only declaring resource title' do
       it { is_expected.to contain_concat('apache_balancer_myapp') }
-      it { is_expected.not_to contain_apache__mod('slotmem_shm') }
-      it { is_expected.not_to contain_apache__mod('lbmethod_byrequests') }
       it { is_expected.to contain_concat__fragment('00-myapp-header').with_content(%r{^<Proxy balancer://myapp>$}) }
     end
     describe 'accept a target parameter and use it' do
@@ -39,8 +37,6 @@
       it {
         is_expected.to contain_concat('apache_balancer_myapp').with(path: '/tmp/myapp.conf')
       }
-      it { is_expected.not_to contain_apache__mod('slotmem_shm') }
-      it { is_expected.not_to contain_apache__mod('lbmethod_byrequests') }
     end
     describe 'accept an options parameter and use it' do
       let :params do
@@ -55,15 +51,6 @@
         )
       }
     end
-    context 'on jessie' do
-      let(:facts) do
-        super().merge(operatingsystemrelease: '8',
-                      lsbdistcodename: 'jessie')
-      end
-
-      it { is_expected.to contain_apache__mod('slotmem_shm') }
-      it { is_expected.to contain_apache__mod('lbmethod_byrequests') }
-    end
   end
   describe 'apache pre_condition with conf_dir set' do
     let :pre_condition do
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 3005dc854a..898ca8f6b4 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -8,8 +8,8 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6',
-      lsbdistcodename: 'squeeze',
+      operatingsystemrelease: '8',
+      lsbdistcodename: 'jessie',
       id: 'root',
       concat_basedir: '/dne',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 78922a6fd1..8cf280a5bc 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -10,9 +10,9 @@
   let :facts do
     {
       osfamily: 'Debian',
-      operatingsystemrelease: '6',
+      operatingsystemrelease: '8',
       concat_basedir: '/',
-      lsbdistcodename: 'squeeze',
+      lsbdistcodename: 'jessie',
       operatingsystem: 'Debian',
       id: 'root',
       kernel: 'Linux',
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 6fc3e267fe..c223c50b0d 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -38,8 +38,8 @@
         {
           osfamily: 'Debian',
           operatingsystem: 'Debian',
-          operatingsystemrelease: '6',
-          lsbdistcodename: 'squeeze',
+          operatingsystemrelease: '8',
+          lsbdistcodename: 'jessie',
           kernel: 'Linux',
           id: 'root',
           concat_basedir: '/dne',
@@ -112,8 +112,8 @@
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6',
-        lsbdistcodename: 'squeeze',
+        operatingsystemrelease: '8',
+        lsbdistcodename: 'jessie',
         kernel: 'Linux',
         id: 'root',
         concat_basedir: '/dne',
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index c519e5d120..584b4b17dc 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -64,9 +64,9 @@
     let :facts do
       {
         osfamily: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/dne',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index 19d5c155cc..9611a04c13 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -38,9 +38,9 @@ class { "apache::mod::security": activated_rules => [] }
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6',
+        operatingsystemrelease: '8',
         concat_basedir: '/',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         kernel: 'Linux',
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 9f7296a813..dc9a072ff7 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -31,8 +31,8 @@
       let :default_facts do
         {
           osfamily: 'Debian',
-          operatingsystemrelease: '6',
-          lsbdistcodename: 'squeeze',
+          operatingsystemrelease: '8',
+          lsbdistcodename: 'jessie',
           operatingsystem: 'Debian',
           concat_basedir: '/dne',
           id: 'root',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 06c3071e27..88a0ff4e2a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -38,9 +38,9 @@
       let :default_facts do
         {
           osfamily: 'Debian',
-          operatingsystemrelease: '6',
+          operatingsystemrelease: '8',
           concat_basedir: '/dne',
-          lsbdistcodename: 'squeeze',
+          lsbdistcodename: 'jessie',
           operatingsystem: 'Debian',
           id: 'root',
           kernel: 'Linux',
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index f2bfa5b594..469a9f18ad 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -13,10 +13,6 @@
 RSpec.configure do |c|
   c.filter_run focus: true
   c.run_all_when_everything_filtered = true
-  # apache on Ubuntu 10.04 and 12.04 doesn't like IPv6 VirtualHosts, so we skip ipv6 tests on those systems
-  if fact('operatingsystem') == 'Ubuntu' && (fact('operatingsystemrelease') == '10.04' || fact('operatingsystemrelease') == '12.04')
-    c.filter_run_excluding ipv6: true
-  end
   # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
   if fact('network6_lo') != '::1'
     c.filter_run_excluding ipv6: true
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 9c9cca461f..2307ab7fbc 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -23,11 +23,11 @@
   let :facts do
     {
       id: 'root',
-      lsbdistcodename: 'squeeze',
+      lsbdistcodename: 'jessie',
       kernel: 'Linux',
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6',
+      operatingsystemrelease: '8',
       operatingsystemmajrelease: nil,
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       concat_basedir: '/dne',

From cdb27cce6d0fe7e4d96b61e527e3724a11222ee2 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 31 May 2018 17:11:04 +0300
Subject: [PATCH 1359/2267] Add mod::auth_gssapi manifest

mod_auth_gssapi has a similar functionality to mod_auth_kerb, and is the
recommended way to deploy authorization with kerberos, through GSSAPI.

This merely adds the necessary module.
---
 README.md                            |  2 +
 manifests/mod/auth_gssapi.pp         |  5 ++
 manifests/params.pp                  | 31 ++++++-----
 spec/classes/mod/auth_gssapi_spec.rb | 81 ++++++++++++++++++++++++++++
 4 files changed, 107 insertions(+), 12 deletions(-)
 create mode 100644 manifests/mod/auth_gssapi.pp
 create mode 100644 spec/classes/mod/auth_gssapi_spec.rb

diff --git a/README.md b/README.md
index 3038354a69..a519064b90 100755
--- a/README.md
+++ b/README.md
@@ -170,6 +170,7 @@
 [`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html
 [`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
 [`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html
+[`mod_auth_gssapi`]: https://github.com/modauthgssapi/mod_auth_gssapi
 [`mod_authnz_external`]: https://github.com/phokz/mod-auth-external
 [`mod_auth_dbd`]: http://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
@@ -1597,6 +1598,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `auth_cas`\* (see [`apache::mod::auth_cas`][])
 * `auth_mellon`\* (see [`apache::mod::auth_mellon`][])
 * `auth_kerb`
+* `auth_gssapi`
 * `authn_core`
 * `authn_dbd`\* (see [`apache::mod::authn_dbd`][])
 * `authn_file`
diff --git a/manifests/mod/auth_gssapi.pp b/manifests/mod/auth_gssapi.pp
new file mode 100644
index 0000000000..45b8cb3c19
--- /dev/null
+++ b/manifests/mod/auth_gssapi.pp
@@ -0,0 +1,5 @@
+class apache::mod::auth_gssapi {
+  include apache
+  include apache::mod::authn_core
+  apache::mod { 'auth_gssapi': }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 9a87cf72fb..690539f534 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -100,6 +100,7 @@
       # NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
       'auth_cas'              => 'mod_auth_cas',
       'auth_kerb'             => 'mod_auth_kerb',
+      'auth_gssapi'           => 'mod_auth_gssapi',
       'auth_mellon'           => 'mod_auth_mellon',
       'authnz_ldap'           => $::apache::version::distrelease ? {
         '7'     => 'mod_ldap',
@@ -239,6 +240,7 @@
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',
         'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-svn',
@@ -267,6 +269,7 @@
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',
         'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-svn',
@@ -410,18 +413,19 @@
       # NOTE: 'php' needs to enable APACHE option in make config
       # NOTE: 'dav_svn' needs to enable MOD_DAV_SVN make config
       # NOTE: not sure where the shibboleth should come from
-      'auth_kerb'  => 'www/mod_auth_kerb2',
-      'fcgid'      => 'www/mod_fcgid',
-      'passenger'  => 'www/rubygem-passenger',
-      'perl'       => 'www/mod_perl2',
-      'phpXXX'     => 'www/mod_phpXXX',
-      'proxy_html' => 'www/mod_proxy_html',
-      'python'     => 'www/mod_python3',
-      'wsgi'       => 'www/mod_wsgi',
-      'dav_svn'    => 'devel/subversion',
-      'xsendfile'  => 'www/mod_xsendfile',
-      'rpaf'       => 'www/mod_rpaf2',
-      'shib2'      => 'security/shibboleth2-sp',
+      'auth_kerb'   => 'www/mod_auth_kerb2',
+      'auth_gssapi' => 'www/mod_auth_gssapi',
+      'fcgid'       => 'www/mod_fcgid',
+      'passenger'   => 'www/rubygem-passenger',
+      'perl'        => 'www/mod_perl2',
+      'phpXXX'      => 'www/mod_phpXXX',
+      'proxy_html'  => 'www/mod_proxy_html',
+      'python'      => 'www/mod_python3',
+      'wsgi'        => 'www/mod_wsgi',
+      'dav_svn'     => 'devel/subversion',
+      'xsendfile'   => 'www/mod_xsendfile',
+      'rpaf'        => 'www/mod_rpaf2',
+      'shib2'       => 'security/shibboleth2-sp',
     }
     $mod_libs         = {
     }
@@ -476,6 +480,7 @@
     $mod_packages     = {
       # NOTE: I list here only modules that are not included in www-servers/apache
       'auth_kerb'       => 'www-apache/mod_auth_kerb',
+      'auth_gssapi'     => 'www-apache/mod_auth_gssapi',
       'authnz_external' => 'www-apache/mod_authnz_external',
       'fcgid'           => 'www-apache/mod_fcgid',
       'passenger'       => 'www-apache/passenger',
@@ -539,6 +544,7 @@
     if $::operatingsystemrelease < '11' or $::operatingsystemrelease >= '12' {
       $mod_packages      = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
+        'auth_gssapi' => 'apache2-mod_auth_gssapi',
         'dav_svn'     => 'subversion-server',
         'perl'        => 'apache2-mod_perl',
         'php5'        => 'apache2-mod_php5',
@@ -549,6 +555,7 @@
     } else {
       $mod_packages        = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
+        'auth_gssapi' => 'apache2-mod_auth_gssapi',
         'dav_svn'     => 'subversion-server',
         'perl'        => 'apache2-mod_perl',
         'php5'        => 'apache2-mod_php53',
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
new file mode 100644
index 0000000000..61f4ce5aa6
--- /dev/null
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe 'apache::mod::auth_gssapi', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+
+  context 'default configuration with parameters' do
+    context 'on a Debian OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          lsbdistcodename: 'squeeze',
+          osfamily: 'Debian',
+          operatingsystem: 'Debian',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_gssapi') }
+      it { is_expected.to contain_package('libapache2-mod-auth-gssapi') }
+    end
+    context 'on a RedHat OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_gssapi') }
+      it { is_expected.to contain_package('mod_auth_gssapi') }
+    end
+    context 'on a FreeBSD OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'FreeBSD',
+          osfamily: 'FreeBSD',
+          operatingsystem: 'FreeBSD',
+          operatingsystemrelease: '9',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_gssapi') }
+      it { is_expected.to contain_package('www/mod_auth_gssapi') }
+    end
+    context 'on a Gentoo OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'Gentoo',
+          operatingsystem: 'Gentoo',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+          operatingsystemrelease: '3.16.1-gentoo',
+          concat_basedir: '/dne',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_gssapi') }
+      it { is_expected.to contain_package('www-apache/mod_auth_gssapi') }
+    end
+  end
+end

From fab75413e7b955036603a714b3e1b6ba75282ac3 Mon Sep 17 00:00:00 2001
From: Andy Goodnough <andy.goodnough@wisc.edu>
Date: Mon, 4 Jun 2018 12:51:02 -0500
Subject: [PATCH 1360/2267] (DOCUMENT-870) Updates ssl_proxyengine default

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3038354a69..33b79f06f7 100755
--- a/README.md
+++ b/README.md
@@ -5412,7 +5412,7 @@ Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/c
 
 Boolean.
 
-Default: `true`.
+Default: `false`.
 
 ##### `ssl_stapling`
 

From 18bd154ea81b40c37878edf1f2292b04d3c60411 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Thu, 21 Jun 2018 11:14:54 +0100
Subject: [PATCH 1361/2267] 3.2.0 PreRelease

---
 CHANGELOG.md  | 19 +++++++++++++++++++
 metadata.json |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2ff16ed7f..1b58a1bcae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
+## Supported Release [3.2.0]
+### Summary
+This is a clean release to prepare for several planned backwards incompatible changes.
+
+#### Changed
+- Parameter `passenger_pre_start` has been moved outside of `<VirtualHost>`.
+- Apache version fact has been enabled on FreeBSD.
+- Parameter `ssl_proxyengine` has had it's default changed to false.
+
+#### Added
+- Parameter `passenger_group` can now be set in `apache::vhost`.
+- Multiple `passenger_pre_start` URIs can now be set at once.
+- Manifest `mod::auth_gssapi` has been added to allow the deployment of authorisation with kerberos, through GSSAPI.
+
+#### Removed
+- Scientific 5 and Debian 7 are no longer supported on Apache.
+
 ## Supported Release [3.1.0]
 ### Summary
 This release includes the module being converted using version 1.4.1 of the PDK. It also includes a couple of additional parameters added.
@@ -1040,6 +1057,8 @@ worker/prefork
 * f672e46 a2mod fix
 * 8a56ee9 add pthon support to apache
 
+[3.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/3.1.0...3.2.0
+[3.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/3.0.0...3.1.0
 [3.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.1...3.0.0
 [2.3.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.0...2.3.1
 [2.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.2.0...2.3.0
diff --git a/metadata.json b/metadata.json
index dbd833ec0f..9051b27e2b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From b4cbc858a61ba2eea4a1178c261a982a59db963d Mon Sep 17 00:00:00 2001
From: yatin <ykarel@redhat.com>
Date: Fri, 22 Jun 2018 19:10:39 +0530
Subject: [PATCH 1362/2267] MODULES-7343: Allow overrides by adding mod_libs in
 apache class

This commit allows to override 'mod_libs' similar to how 'mod_packages'
is currently overriden. All the references to apache::params::mod_libs
are changed to apache::mod_libs.
---
 README.md                     | 15 +++++++++++++++
 manifests/init.pp             |  1 +
 manifests/mod.pp              |  2 +-
 spec/classes/mod/wsgi_spec.rb | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6915bbad46..95cc6023d1 100755
--- a/README.md
+++ b/README.md
@@ -1212,6 +1212,21 @@ Default: Depends on operating system.
 - **Gentoo**: `/etc/apache2/modules.d`
 - **Red Hat**: `/etc/httpd/conf.d`
 
+##### `mod_libs`
+
+Allows the user to override default module library names.
+
+```puppet
+include apache::params
+class { 'apache':
+  mod_libs => merge($::apache::params::mod_libs, {
+    'wsgi' => 'mod_wsgi_python3.so',
+  })
+}
+```
+
+Hash. Default: `$apache::params::mod_libs`
+
 ##### `mod_packages`
 
 Allows the user to override default module package names.
diff --git a/manifests/init.pp b/manifests/init.pp
index 92deb56414..caa2f80a54 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -47,6 +47,7 @@
   $confd_dir                                                     = $::apache::params::confd_dir,
   $vhost_dir                                                     = $::apache::params::vhost_dir,
   $vhost_enable_dir                                              = $::apache::params::vhost_enable_dir,
+  $mod_libs                                                      = $::apache::params::mod_libs,
   $mod_packages                                                  = $::apache::params::mod_packages,
   $vhost_include_pattern                                         = $::apache::params::vhost_include_pattern,
   $mod_dir                                                       = $::apache::params::mod_dir,
diff --git a/manifests/mod.pp b/manifests/mod.pp
index ddef130c8e..721b90b071 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -17,7 +17,7 @@
   $mod_dir = $::apache::mod_dir
 
   # Determine if we have special lib
-  $mod_libs = $::apache::params::mod_libs
+  $mod_libs = $::apache::mod_libs
   if $lib {
     $_lib = $lib
   } elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 97baa10578..b07b03b22d 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -160,4 +160,37 @@
     }
     it { is_expected.to contain_package('www-apache/mod_wsgi') }
   end
+  context 'overriding mod_libs' do
+    context 'on a RedHat OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'Fedora',
+          operatingsystemrelease: '28',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          concat_basedir: '/dne',
+          is_pe: false,
+        }
+      end
+      let :pre_condition do
+        <<-MANIFEST
+        include apache::params
+        class { 'apache':
+          mod_packages => merge($::apache::params::mod_packages, {
+            'wsgi' => 'python3-mod_wsgi',
+          }),
+          mod_libs => merge($::apache::params::mod_libs, {
+            'wsgi' => 'mod_wsgi_python3.so',
+          })
+        }
+        MANIFEST
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module modules/mod_wsgi_python3.so}) }
+      it { is_expected.to contain_package('python3-mod_wsgi') }
+    end
+  end
 end

From a34083c3c26ba8a1e2134d2479195b9d29b14d42 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Tue, 26 Jun 2018 10:55:20 -0700
Subject: [PATCH 1363/2267] (L10n) Updating translations for
 readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index b8ac3f5913..7e547f0bf7 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -170,6 +170,7 @@
 [`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html
 [`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas
 [`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html
+[`mod_auth_gssapi`]: https://github.com/modauthgssapi/mod_auth_gssapi
 [`mod_authnz_external`]: https://github.com/phokz/mod-auth-external
 [`mod_auth_dbd`]: http://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
@@ -1597,6 +1598,7 @@ class { 'apache::mod::alias':
 * `auth_cas`\* ([`apache::mod::auth_cas`][]参照)
 * `auth_mellon`\* ([`apache::mod::auth_mellon`][]参照)
 * `auth_kerb`
+* auth_gssapi
 * `authn_core`
 * `authn_dbd`\* ([`apache::mod::authn_dbd`][]参照)
 * `authn_file`
@@ -4057,6 +4059,10 @@ sengermaxrequests)を設定します。これは、アプリケーションプ
 
 [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser)を設定します。これは、サンドボックスアプリケーションの実行ユーザです。
 
+##### passenger_group
+
+ [PassengerGroup](https://www.phusionpassenger.com/library/config/apache/reference/#passengergroup)を設定します。これは、サンドボックスアプリケーションの実行グループです。
+
 ##### `passenger_high_performance`
 
 [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance)パラメータを設定します。
@@ -4224,7 +4230,7 @@ apache::vhost { 'site.name.fdqn':
   …
   redirectmatch_status => ['404','404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'],
+  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
 ```
 
@@ -5405,7 +5411,7 @@ apache::vhost { 'sample.example.net':
 
 ブーリアン。
 
-デフォルト値: `true`。
+デフォルト値: `false`。
 
 ##### `ssl_stapling`
 

From 39d35a2acb1439fefce22575b0ededc118b738de Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Tue, 26 Jun 2018 11:12:22 -0700
Subject: [PATCH 1364/2267] (L10n) Updating translations for
 locales/ja/puppetlabs-apache.po


From 83d4a4d9efad17104a62a0febd7f1fec5ecc0918 Mon Sep 17 00:00:00 2001
From: Wim van Ravesteijn <wim.github@ravesteijn.nl>
Date: Mon, 2 Jul 2018 15:41:25 +0200
Subject: [PATCH 1365/2267] MODULES-7379: Fixing syntax by adding newline,
 adding additional item for translation

---
 templates/mod/proxy_html.conf.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/mod/proxy_html.conf.erb b/templates/mod/proxy_html.conf.erb
index f2f0bc0ce7..3cb8eca625 100644
--- a/templates/mod/proxy_html.conf.erb
+++ b/templates/mod/proxy_html.conf.erb
@@ -9,9 +9,10 @@ ProxyHTMLLinks  ins             cite
 ProxyHTMLLinks  del             cite
 ProxyHTMLLinks  form            action
 ProxyHTMLLinks  input           src usemap
-ProxyHTMLLinks  head            profileProxyHTMLLinks  base            href
-ProxyHTMLLinks  script          src for
+ProxyHTMLLinks  head            profile
 ProxyHTMLLinks  base            href
+ProxyHTMLLinks  script          src for
+ProxyHTMLLinks  meta            content
 
 ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \
                 onmouseover onmousemove onmouseout onkeypress \

From 619570f22a96dd45eb63184bee12571119cd3680 Mon Sep 17 00:00:00 2001
From: Andy Goodnough <andy.goodnough@wisc.edu>
Date: Fri, 22 Jun 2018 20:33:47 -0500
Subject: [PATCH 1366/2267] Add support for mod_proxy's ProxyTimeout directive

---
 manifests/mod/proxy.pp       | 1 +
 templates/mod/proxy.conf.erb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index ce82cb3a89..f2d496dc64 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -4,6 +4,7 @@
   $apache_version = undef,
   $package_name   = undef,
   $proxy_via      = 'On',
+  $proxy_timeout  = $::apache::timeout,
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index d023c14e53..f3114fdb55 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -24,4 +24,6 @@
   # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
   # Set to one of: Off | On | Full | Block
   ProxyVia <%= @proxy_via %>
+
+  ProxyTimeout <%= @proxy_timeout %>
 </IfModule>

From f47880d6c0d8ecba524de41e69235d4346ec93e6 Mon Sep 17 00:00:00 2001
From: Andy Goodnough <andy.goodnough@wisc.edu>
Date: Fri, 22 Jun 2018 20:34:33 -0500
Subject: [PATCH 1367/2267] Set the Timeout default value to Apache's default

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index caa2f80a54..8a2297d716 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -40,7 +40,7 @@
   $serveradmin                                                   = 'root@localhost',
   Enum['On', 'Off', 'on', 'off'] $sendfile                       = 'On',
   $error_documents                                               = false,
-  $timeout                                                       = '120',
+  $timeout                                                       = '60',
   $httpd_dir                                                     = $::apache::params::httpd_dir,
   $server_root                                                   = $::apache::params::server_root,
   $conf_dir                                                      = $::apache::params::conf_dir,

From 3f9e91bd32b3bb22073afb20dc7a2ebd1151f0b4 Mon Sep 17 00:00:00 2001
From: Andy Goodnough <andy.goodnough@wisc.edu>
Date: Fri, 6 Jul 2018 16:21:09 -0500
Subject: [PATCH 1368/2267] Hardcode default to match Apache's Timeout default

---
 manifests/mod/proxy.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index f2d496dc64..84d116508d 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -4,7 +4,7 @@
   $apache_version = undef,
   $package_name   = undef,
   $proxy_via      = 'On',
-  $proxy_timeout  = $::apache::timeout,
+  $proxy_timeout  = '60',
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)

From aa123267453a0c388c3a2c94badb863b635fca00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 11:16:14 +0200
Subject: [PATCH 1369/2267] Allow setting PassengerRestartDir in a VHost

While here, ensure we have a line-break after PassengerStartupFile.
---
 manifests/vhost.pp             | 1 +
 spec/defines/vhost_spec.rb     | 6 ++++++
 templates/vhost/_passenger.erb | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1dd7b29140..b9f26ada66 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -149,6 +149,7 @@
   $passenger_nodejs                                                                 = undef,
   Optional[Boolean] $passenger_sticky_sessions                                      = undef,
   $passenger_startup_file                                                           = undef,
+  Optional[String] $passenger_restart_dir                                           = undef,
   $add_default_charset                                                              = undef,
   $modsec_disable_vhost                                                             = undef,
   Optional[Variant[Hash, Array]] $modsec_disable_ids                                = undef,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 88a0ff4e2a..ef596db10f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -416,6 +416,7 @@
           'passenger_nodejs'            => '/usr/bin/node',
           'passenger_sticky_sessions'   => true,
           'passenger_startup_file'      => 'bin/www',
+          'passenger_restart_dir'       => 'tmp',
           'add_default_charset'         => 'UTF-8',
           'jk_mounts'                   => [
             { 'mount'   => '/*',     'worker' => 'tcnode1' },
@@ -922,6 +923,11 @@
           content: %r{^\s+PassengerStartupFile\sbin/www$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerRestartDir\stmp$},
+        )
+      }
     end
     context 'vhost with multiple ip addresses' do
       let :params do
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index 5eb8b5bc9d..a0164f9029 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -35,5 +35,8 @@
   PassengerStickySessions <%= scope.call_function('apache::bool2httpd', [@passenger_sticky_sessions]) %>
 <% end -%>
 <% if @passenger_startup_file -%>
-  PassengerStartupFile <%= @passenger_startup_file -%>
+  PassengerStartupFile <%= @passenger_startup_file %>
+<% end -%>
+<% if @passenger_restart_dir -%>
+  PassengerRestartDir <%= @passenger_restart_dir %>
 <% end -%>

From 98542a634a2f7eea6de79643bbf3cad56938e5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 13:15:31 +0200
Subject: [PATCH 1370/2267] Reorder Passenger parameters

Follow the Passenger's documentation ordering for parameters:
https://www.phusionpassenger.com/library/config/apache/reference

No functional change.
---
 manifests/vhost.pp             | 18 ++++++------
 spec/defines/vhost_spec.rb     | 50 ++++++++++++++++-----------------
 templates/vhost/_passenger.erb | 51 ++++++++++++++++++++--------------
 3 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b9f26ada66..b8ed01b975 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -135,21 +135,21 @@
   $apache_version                                                                   = $::apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
   Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                           = undef,
-  $passenger_spawn_method                                                           = undef,
-  $passenger_app_root                                                               = undef,
-  $passenger_app_env                                                                = undef,
   $passenger_ruby                                                                   = undef,
+  $passenger_nodejs                                                                 = undef,
+  $passenger_app_env                                                                = undef,
+  $passenger_app_root                                                               = undef,
+  $passenger_startup_file                                                           = undef,
+  Optional[String] $passenger_restart_dir                                           = undef,
+  $passenger_spawn_method                                                           = undef,
+  $passenger_user                                                                   = undef,
+  $passenger_group                                                                  = undef,
   $passenger_min_instances                                                          = undef,
-  $passenger_max_requests                                                           = undef,
   $passenger_start_timeout                                                          = undef,
+  $passenger_max_requests                                                           = undef,
   Optional[Variant[String,Array[String]]] $passenger_pre_start                      = undef,
-  $passenger_user                                                                   = undef,
-  $passenger_group                                                                  = undef,
   $passenger_high_performance                                                       = undef,
-  $passenger_nodejs                                                                 = undef,
   Optional[Boolean] $passenger_sticky_sessions                                      = undef,
-  $passenger_startup_file                                                           = undef,
-  Optional[String] $passenger_restart_dir                                           = undef,
   $add_default_charset                                                              = undef,
   $modsec_disable_vhost                                                             = undef,
   Optional[Variant[Hash, Array]] $modsec_disable_ids                                = undef,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index ef596db10f..618d6e29ef 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -402,21 +402,21 @@
           'suexec_user_group'           => 'root root',
           'allow_encoded_slashes'       => 'nodecode',
           'use_canonical_name'          => 'dns',
-          'passenger_spawn_method'      => 'direct',
-          'passenger_app_root'          => '/usr/share/myapp',
-          'passenger_app_env'           => 'test',
           'passenger_ruby'              => '/usr/bin/ruby1.9.1',
+          'passenger_nodejs'            => '/usr/bin/node',
+          'passenger_app_env'           => 'test',
+          'passenger_app_root'          => '/usr/share/myapp',
+          'passenger_startup_file'      => 'bin/www',
+          'passenger_restart_dir'       => 'tmp',
+          'passenger_spawn_method'      => 'direct',
+          'passenger_user'              => 'sandbox',
+          'passenger_group'             => 'sandbox',
           'passenger_min_instances'     => '1',
-          'passenger_max_requests'      => '1000',
           'passenger_start_timeout'     => '600',
+          'passenger_max_requests'      => '1000',
           'passenger_pre_start'         => 'http://localhost/myapp',
           'passenger_high_performance'  => true,
-          'passenger_user'              => 'sandbox',
-          'passenger_group'             => 'sandbox',
-          'passenger_nodejs'            => '/usr/bin/node',
           'passenger_sticky_sessions'   => true,
-          'passenger_startup_file'      => 'bin/www',
-          'passenger_restart_dir'       => 'tmp',
           'add_default_charset'         => 'UTF-8',
           'jk_mounts'                   => [
             { 'mount'   => '/*',     'worker' => 'tcnode1' },
@@ -855,12 +855,12 @@
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerSpawnMethod\sdirect$},
+          content: %r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerAppRoot\s/usr/share/myapp$},
+          content: %r{^\s+PassengerNodejs\s/usr/bin/node$},
         )
       }
       it {
@@ -870,62 +870,62 @@
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$},
+          content: %r{^\s+PassengerAppRoot\s/usr/share/myapp$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMinInstances\s1$},
+          content: %r{^\s+PassengerStartupFile\sbin/www$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMaxRequests\s1000$},
+          content: %r{^\s+PassengerRestartDir\stmp$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerStartTimeout\s600$},
+          content: %r{^\s+PassengerSpawnMethod\sdirect$},
         )
       }
       it {
-        is_expected.to contain_concat__fragment('rspec.example.com-file_footer').with(
-          content: %r{^PassengerPreStart\shttp://localhost/myapp$},
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerUser\ssandbox$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerHighPerformance\sOn$},
+          content: %r{^\s+PassengerGroup\ssandbox$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerUser\ssandbox$},
+          content: %r{^\s+PassengerMinInstances\s1$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerGroup\ssandbox$},
+          content: %r{^\s+PassengerStartTimeout\s600$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerNodejs\s/usr/bin/node$},
+          content: %r{^\s+PassengerMaxRequests\s1000$},
         )
       }
       it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerStickySessions\sOn$},
+        is_expected.to contain_concat__fragment('rspec.example.com-file_footer').with(
+          content: %r{^PassengerPreStart\shttp://localhost/myapp$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerStartupFile\sbin/www$},
+          content: %r{^\s+PassengerHighPerformance\sOn$},
         )
       }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerRestartDir\stmp$},
+          content: %r{^\s+PassengerStickySessions\sOn$},
         )
       }
     end
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index a0164f9029..7283177db6 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -1,42 +1,51 @@
-<% if @passenger_spawn_method -%>
-  PassengerSpawnMethod <%= @passenger_spawn_method %>
+<%# 1 - Essentials -%>
+<%# 2 - Deployment options -%>
+<%# 3 - Application loading options -%>
+<% if @passenger_ruby -%>
+  PassengerRuby <%= @passenger_ruby %>
 <% end -%>
-<% if @passenger_app_root -%>
-  PassengerAppRoot <%= @passenger_app_root %>
+<% if @passenger_nodejs -%>
+  PassengerNodejs <%= @passenger_nodejs %>
 <% end -%>
 <% if @passenger_app_env -%>
   PassengerAppEnv <%= @passenger_app_env %>
 <% end -%>
-<% if @passenger_ruby -%>
-  PassengerRuby <%= @passenger_ruby %>
+<% if @passenger_app_root -%>
+  PassengerAppRoot <%= @passenger_app_root %>
 <% end -%>
-<% if @passenger_min_instances -%>
-  PassengerMinInstances <%= @passenger_min_instances %>
+<% if @passenger_startup_file -%>
+  PassengerStartupFile <%= @passenger_startup_file %>
 <% end -%>
-<% if @passenger_max_requests -%>
-  PassengerMaxRequests <%= @passenger_max_requests %>
+<% if @passenger_restart_dir -%>
+  PassengerRestartDir <%= @passenger_restart_dir %>
 <% end -%>
-<% if @passenger_start_timeout -%>
-  PassengerStartTimeout <%= @passenger_start_timeout %>
+<% if @passenger_spawn_method -%>
+  PassengerSpawnMethod <%= @passenger_spawn_method %>
 <% end -%>
+<%# 4 - Security options -%>
 <% if @passenger_user -%>
   PassengerUser <%= @passenger_user %>
 <% end -%>
 <% if @passenger_group -%>
   PassengerGroup <%= @passenger_group %>
 <% end -%>
+<%# 5 - Resource control and optimization options -%>
+<% if @passenger_min_instances -%>
+  PassengerMinInstances <%= @passenger_min_instances %>
+<% end -%>
+<% if @passenger_start_timeout -%>
+  PassengerStartTimeout <%= @passenger_start_timeout %>
+<% end -%>
+<% if @passenger_max_requests -%>
+  PassengerMaxRequests <%= @passenger_max_requests %>
+<% end -%>
 <% if @passenger_high_performance -%>
   PassengerHighPerformance <%= scope.call_function('apache::bool2httpd', [@passenger_high_performance]) %>
 <% end -%>
-<% if @passenger_nodejs -%>
-  PassengerNodejs <%= @passenger_nodejs %>
-<% end -%>
+<%# 6 - Connection handling options -%>
 <% if @passenger_sticky_sessions -%>
   PassengerStickySessions <%= scope.call_function('apache::bool2httpd', [@passenger_sticky_sessions]) %>
 <% end -%>
-<% if @passenger_startup_file -%>
-  PassengerStartupFile <%= @passenger_startup_file %>
-<% end -%>
-<% if @passenger_restart_dir -%>
-  PassengerRestartDir <%= @passenger_restart_dir %>
-<% end -%>
+<%# 7 - Compatibility options -%>
+<%# 8 - Logging and debugging options -%>
+<%# 9 - Advanced options -%>

From 17361442ac00ec1e29345eb67227af7b1e59b698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 13:31:18 +0200
Subject: [PATCH 1371/2267] Add types for all VHost passenger parameters

---
 manifests/vhost.pp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b8ed01b975..147b476f84 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -135,20 +135,20 @@
   $apache_version                                                                   = $::apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
   Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                           = undef,
-  $passenger_ruby                                                                   = undef,
-  $passenger_nodejs                                                                 = undef,
-  $passenger_app_env                                                                = undef,
-  $passenger_app_root                                                               = undef,
-  $passenger_startup_file                                                           = undef,
+  Optional[Stdlib::Absolutepath] $passenger_ruby                                    = undef,
+  Optional[Stdlib::Absolutepath] $passenger_nodejs                                  = undef,
+  Optional[String] $passenger_app_env                                               = undef,
+  Optional[Stdlib::Absolutepath] $passenger_app_root                                = undef,
+  Optional[String] $passenger_startup_file                                          = undef,
   Optional[String] $passenger_restart_dir                                           = undef,
-  $passenger_spawn_method                                                           = undef,
-  $passenger_user                                                                   = undef,
-  $passenger_group                                                                  = undef,
-  $passenger_min_instances                                                          = undef,
-  $passenger_start_timeout                                                          = undef,
-  $passenger_max_requests                                                           = undef,
+  Optional[Enum['direct', 'smart']] $passenger_spawn_method                         = undef,
+  Optional[String] $passenger_user                                                  = undef,
+  Optional[String] $passenger_group                                                 = undef,
+  Optional[String] $passenger_min_instances                                         = undef, # FIXME: Should be Integer, not String
+  Optional[String] $passenger_start_timeout                                         = undef, # FIXME: Should be Integer, not String
+  Optional[String] $passenger_max_requests                                          = undef, # FIXME: Should be Integer, not String
   Optional[Variant[String,Array[String]]] $passenger_pre_start                      = undef,
-  $passenger_high_performance                                                       = undef,
+  Optional[Boolean] $passenger_high_performance                                     = undef,
   Optional[Boolean] $passenger_sticky_sessions                                      = undef,
   $add_default_charset                                                              = undef,
   $modsec_disable_vhost                                                             = undef,

From 1320045adfced3bf2d565ccae2ef82ddedcd09a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 14:20:57 +0200
Subject: [PATCH 1372/2267] Allow false booleans to set parameters to 'Off'

Without this change, explicitely setting these parameters to 'false'
does the same as not setting the parameters at all.

Since both parameters default to 'Off', this has no direct consequence,
but since we will introduce boolean that defaults to 'On', always output
the parameters with their value when they are set.
---
 templates/vhost/_passenger.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index 7283177db6..d883c78eca 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -39,11 +39,11 @@
 <% if @passenger_max_requests -%>
   PassengerMaxRequests <%= @passenger_max_requests %>
 <% end -%>
-<% if @passenger_high_performance -%>
+<% unless @passenger_high_performance.nil? -%>
   PassengerHighPerformance <%= scope.call_function('apache::bool2httpd', [@passenger_high_performance]) %>
 <% end -%>
 <%# 6 - Connection handling options -%>
-<% if @passenger_sticky_sessions -%>
+<% unless @passenger_sticky_sessions.nil? -%>
   PassengerStickySessions <%= scope.call_function('apache::bool2httpd', [@passenger_sticky_sessions]) %>
 <% end -%>
 <%# 7 - Compatibility options -%>

From 8988757edf828aee38d07df1e86a67c6c7158a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 14:48:21 +0200
Subject: [PATCH 1373/2267] Remove unused variable

---
 manifests/vhost.pp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 147b476f84..554884e9b4 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -281,10 +281,6 @@
     }
   }
 
-
-  # Is apache::mod::passenger enabled (or apache::mod['passenger'])
-  $passenger_enabled = defined(Apache::Mod['passenger'])
-
   # Is apache::mod::shib enabled (or apache::mod['shib2'])
   $shibboleth_enabled = defined(Apache::Mod['shib2'])
 

From 5bcef4d211f070159388d1beb893a74337b4532c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 15:08:37 +0200
Subject: [PATCH 1374/2267] Remove deprecated parameters

RailsBaseURI and RackBaseURI where deprecated in Passenger 3.0.0.
PassengerBaseURI should be used instead.

For some reason, the implementation expected an array, but setting this
parameter with multiple values in a single context does not really make
sense.
---
 manifests/vhost.pp                       | 34 ------------------------
 spec/defines/vhost_spec.rb               |  4 ---
 templates/vhost/_passenger_base_uris.erb |  7 -----
 templates/vhost/_rack.erb                |  7 -----
 4 files changed, 52 deletions(-)
 delete mode 100644 templates/vhost/_passenger_base_uris.erb
 delete mode 100644 templates/vhost/_rack.erb

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 554884e9b4..9c06a7f95c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -98,8 +98,6 @@
   $redirectmatch_status                                                             = undef,
   $redirectmatch_regexp                                                             = undef,
   $redirectmatch_dest                                                               = undef,
-  $rack_base_uris                                                                   = undef,
-  $passenger_base_uris                                                              = undef,
   $headers                                                                          = undef,
   $request_headers                                                                  = undef,
   $filters                                                                          = undef,
@@ -402,18 +400,6 @@
     }
   }
 
-  # Load mod_passenger if needed and not yet loaded
-  if $rack_base_uris {
-    if ! defined(Class['apache::mod::passenger']) {
-      include ::apache::mod::passenger
-    }
-  }
-
-  # Load mod_passenger if needed and not yet loaded
-  if $passenger_base_uris {
-      include ::apache::mod::passenger
-  }
-
   # Load mod_fastci if needed and not yet loaded
   if $fastcgi_server and $fastcgi_socket {
     if ! defined(Class['apache::mod::fastcgi']) {
@@ -723,26 +709,6 @@
     }
   }
 
-  # Template uses:
-  # - $rack_base_uris
-  if $rack_base_uris {
-    concat::fragment { "${name}-rack":
-      target  => "${priority_real}${filename}.conf",
-      order   => 170,
-      content => template('apache/vhost/_rack.erb'),
-    }
-  }
-
-  # Template uses:
-  # - $passenger_base_uris
-  if $passenger_base_uris {
-    concat::fragment { "${name}-passenger_uris":
-      target  => "${priority_real}${filename}.conf",
-      order   => 175,
-      content => template('apache/vhost/_passenger_base_uris.erb'),
-    }
-  }
-
   # Template uses:
   # - $redirect_source
   # - $redirect_dest
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 618d6e29ef..f22072a98a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -339,8 +339,6 @@
           'redirectmatch_status'        => ['404'],
           'redirectmatch_regexp'        => ['\.git$'],
           'redirectmatch_dest'          => ['http://www.example.com'],
-          'rack_base_uris'              => ['/rackapp1'],
-          'passenger_base_uris'         => ['/passengerapp1'],
           'headers'                     => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
           'request_headers'             => ['append MirrorID "mirror 12"'],
           'rewrites'                    => [
@@ -703,7 +701,6 @@
           %r{ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo},
         )
       }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
       it {
@@ -1310,7 +1307,6 @@
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-block') }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-error_document') }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-proxy') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-rack') }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-redirect') }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite') }
       it { is_expected.not_to contain_concat__fragment('rspec.example.com-scriptalias') }
diff --git a/templates/vhost/_passenger_base_uris.erb b/templates/vhost/_passenger_base_uris.erb
deleted file mode 100644
index f3ef5aa0a5..0000000000
--- a/templates/vhost/_passenger_base_uris.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @passenger_base_uris -%>
-
-  ## Enable passenger base uris
-<% Array(@passenger_base_uris).each do |uri| -%>
-  PassengerBaseURI <%= uri %>
-<% end -%>
-<% end -%>
diff --git a/templates/vhost/_rack.erb b/templates/vhost/_rack.erb
deleted file mode 100644
index 4a5b5f1cdc..0000000000
--- a/templates/vhost/_rack.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @rack_base_uris -%>
-
-  ## Enable rack
-<% Array(@rack_base_uris).each do |uri| -%>
-  RackBaseURI <%= uri %>
-<% end -%>
-<% end -%>

From 390ddfd711f13b203eb63d6120aaab14885d5fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 16:34:31 +0200
Subject: [PATCH 1375/2267] Add missing Passenger VHost parameters

---
 manifests/vhost.pp             |  27 ++++++
 spec/defines/vhost_spec.rb     | 162 +++++++++++++++++++++++++++++++++
 templates/vhost/_passenger.erb |  81 +++++++++++++++++
 3 files changed, 270 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9c06a7f95c..3b52fdb7f7 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -133,21 +133,48 @@
   $apache_version                                                                   = $::apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
   Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                           = undef,
+  Optional[Boolean] $passenger_enabled                                              = undef,
+  Optional[String] $passenger_base_uri                                              = undef,
   Optional[Stdlib::Absolutepath] $passenger_ruby                                    = undef,
+  Optional[Stdlib::Absolutepath] $passenger_python                                  = undef,
   Optional[Stdlib::Absolutepath] $passenger_nodejs                                  = undef,
+  Optional[String] $passenger_meteor_app_settings                                   = undef,
   Optional[String] $passenger_app_env                                               = undef,
   Optional[Stdlib::Absolutepath] $passenger_app_root                                = undef,
+  Optional[String] $passenger_app_group_name                                        = undef,
+  Optional[Enum['meteor', 'node', 'rack', 'wsgi']] $passenger_app_type              = undef,
   Optional[String] $passenger_startup_file                                          = undef,
   Optional[String] $passenger_restart_dir                                           = undef,
   Optional[Enum['direct', 'smart']] $passenger_spawn_method                         = undef,
+  Optional[Boolean] $passenger_load_shell_envvars                                   = undef,
+  Optional[Boolean] $passenger_rolling_restarts                                     = undef,
+  Optional[Boolean] $passenger_resist_deployment_errors                             = undef,
   Optional[String] $passenger_user                                                  = undef,
   Optional[String] $passenger_group                                                 = undef,
+  Optional[Boolean] $passenger_friendly_error_pages                                 = undef,
   Optional[String] $passenger_min_instances                                         = undef, # FIXME: Should be Integer, not String
+  Optional[Integer] $passenger_max_instances                                        = undef,
+  Optional[Integer] $passenger_max_preloader_idle_time                              = undef,
+  Optional[Integer] $passenger_force_max_concurrent_requests_per_process            = undef,
   Optional[String] $passenger_start_timeout                                         = undef, # FIXME: Should be Integer, not String
+  Optional[Enum['process', 'thread']] $passenger_concurrency_model                  = undef,
+  Optional[Integer] $passenger_thread_count                                         = undef,
   Optional[String] $passenger_max_requests                                          = undef, # FIXME: Should be Integer, not String
+  Optional[Integer] $passenger_max_request_time                                     = undef,
+  Optional[Integer] $passenger_memory_limit                                         = undef,
+  Optional[Integer] $passenger_stat_throttle_rate                                   = undef,
   Optional[Variant[String,Array[String]]] $passenger_pre_start                      = undef,
   Optional[Boolean] $passenger_high_performance                                     = undef,
+  Optional[Boolean] $passenger_buffer_upload                                        = undef,
+  Optional[Boolean] $passenger_buffer_response                                      = undef,
+  Optional[Boolean] $passenger_error_override                                       = undef,
+  Optional[Integer] $passenger_max_request_queue_size                               = undef,
+  Optional[Integer] $passenger_max_request_queue_time                               = undef,
   Optional[Boolean] $passenger_sticky_sessions                                      = undef,
+  Optional[String] $passenger_sticky_sessions_cookie_name                           = undef,
+  Optional[Boolean] $passenger_allow_encoded_slashes                                = undef,
+  Optional[Boolean] $passenger_debugger                                             = undef,
+  Optional[Integer] $passenger_lve_min_uid                                          = undef,
   $add_default_charset                                                              = undef,
   $modsec_disable_vhost                                                             = undef,
   Optional[Variant[Hash, Array]] $modsec_disable_ids                                = undef,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f22072a98a..2ac7a1e471 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -400,21 +400,48 @@
           'suexec_user_group'           => 'root root',
           'allow_encoded_slashes'       => 'nodecode',
           'use_canonical_name'          => 'dns',
+          'passenger_enabled'           => false,
+          'passenger_base_uri'          => '/app',
           'passenger_ruby'              => '/usr/bin/ruby1.9.1',
+          'passenger_python'            => '/usr/local/bin/python',
           'passenger_nodejs'            => '/usr/bin/node',
+          'passenger_meteor_app_settings' => '/path/to/some/file.json',
           'passenger_app_env'           => 'test',
           'passenger_app_root'          => '/usr/share/myapp',
+          'passenger_app_group_name'    => 'app_customer',
+          'passenger_app_type'          => 'rack',
           'passenger_startup_file'      => 'bin/www',
           'passenger_restart_dir'       => 'tmp',
           'passenger_spawn_method'      => 'direct',
+          'passenger_load_shell_envvars' => false,
+          'passenger_rolling_restarts'  => false,
+          'passenger_resist_deployment_errors' => true,
           'passenger_user'              => 'sandbox',
           'passenger_group'             => 'sandbox',
+          'passenger_friendly_error_pages' => false,
           'passenger_min_instances'     => '1',
+          'passenger_max_instances'     => 30,
+          'passenger_max_preloader_idle_time' => 600,
+          'passenger_force_max_concurrent_requests_per_process' => 10,
           'passenger_start_timeout'     => '600',
+          'passenger_concurrency_model' => 'thread',
+          'passenger_thread_count'      => 5,
           'passenger_max_requests'      => '1000',
+          'passenger_max_request_time'  => 2,
+          'passenger_memory_limit'      => 64,
+          'passenger_stat_throttle_rate' => 5,
           'passenger_pre_start'         => 'http://localhost/myapp',
           'passenger_high_performance'  => true,
+          'passenger_buffer_upload'     => false,
+          'passenger_buffer_response'   => false,
+          'passenger_error_override'    => true,
+          'passenger_max_request_queue_size' => 10,
+          'passenger_max_request_queue_time' => 2,
           'passenger_sticky_sessions'   => true,
+          'passenger_sticky_sessions_cookie_name' => '_nom_nom_nom',
+          'passenger_allow_encoded_slashes' => true,
+          'passenger_debugger'          => true,
+          'passenger_lve_min_uid'       => 500,
           'add_default_charset'         => 'UTF-8',
           'jk_mounts'                   => [
             { 'mount'   => '/*',     'worker' => 'tcnode1' },
@@ -850,16 +877,36 @@
           content: %r{^\s+MaxKeepAliveRequests\s1000$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerEnabled\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerBaseURI\s/app$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerPython\s/usr/local/bin/python$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerNodejs\s/usr/bin/node$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMeteorAppSettings\s/path/to/some/file.json$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerAppEnv\stest$},
@@ -870,6 +917,16 @@
           content: %r{^\s+PassengerAppRoot\s/usr/share/myapp$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerAppGroupName\sapp_customer$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerAppType\srack$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerStartupFile\sbin/www$},
@@ -885,6 +942,21 @@
           content: %r{^\s+PassengerSpawnMethod\sdirect$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerRollingRestarts\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerResistDeploymentErrors\sOn$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerUser\ssandbox$},
@@ -895,21 +967,66 @@
           content: %r{^\s+PassengerGroup\ssandbox$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerFriendlyErrorPages\sOff$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerMinInstances\s1$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMaxInstances\s30$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMaxPreloaderIdleTime\s600$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s10$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerStartTimeout\s600$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerConcurrencyModel\sthread$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerThreadCount\s5$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerMaxRequests\s1000$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMaxRequestTime\s2$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMemoryLimit\s64$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerStatThrottleRate\s5$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-file_footer').with(
           content: %r{^PassengerPreStart\shttp://localhost/myapp$},
@@ -920,11 +1037,56 @@
           content: %r{^\s+PassengerHighPerformance\sOn$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerBufferUpload\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerBufferResponse\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerErrorOverride\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMaxRequestQueueSize\s10$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerMaxRequestQueueTime\s2$},
+        )
+      }
       it {
         is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
           content: %r{^\s+PassengerStickySessions\sOn$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerStickySessionsCookieName\s_nom_nom_nom$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerAllowEncodedSlashes\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerDebugger\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+          content: %r{^\s+PassengerLveMinUid\s500$},
+        )
+      }
     end
     context 'vhost with multiple ip addresses' do
       let :params do
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index d883c78eca..6e453abb7e 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -1,18 +1,36 @@
 <%# 1 - Essentials -%>
 <%# 2 - Deployment options -%>
+<% unless @passenger_enabled.nil? -%>
+  PassengerEnabled <%= scope.call_function('apache::bool2httpd', [@passenger_enabled]) %>
+<% end -%>
+<% if @passenger_base_uri -%>
+  PassengerBaseURI <%= @passenger_base_uri %>
+<% end -%>
 <%# 3 - Application loading options -%>
 <% if @passenger_ruby -%>
   PassengerRuby <%= @passenger_ruby %>
 <% end -%>
+<% if @passenger_python -%>
+  PassengerPython <%= @passenger_python %>
+<% end -%>
 <% if @passenger_nodejs -%>
   PassengerNodejs <%= @passenger_nodejs %>
 <% end -%>
+<% if @passenger_meteor_app_settings -%>
+  PassengerMeteorAppSettings <%= @passenger_meteor_app_settings %>
+<% end -%>
 <% if @passenger_app_env -%>
   PassengerAppEnv <%= @passenger_app_env %>
 <% end -%>
 <% if @passenger_app_root -%>
   PassengerAppRoot <%= @passenger_app_root %>
 <% end -%>
+<% if @passenger_app_group_name -%>
+  PassengerAppGroupName <%= @passenger_app_group_name %>
+<% end -%>
+<% if @passenger_app_type -%>
+  PassengerAppType <%= @passenger_app_type %>
+<% end -%>
 <% if @passenger_startup_file -%>
   PassengerStartupFile <%= @passenger_startup_file %>
 <% end -%>
@@ -22,6 +40,15 @@
 <% if @passenger_spawn_method -%>
   PassengerSpawnMethod <%= @passenger_spawn_method %>
 <% end -%>
+<% unless @passenger_load_shell_envvars.nil? -%>
+  PassengerLoadShellEnvvars <%= scope.call_function('apache::bool2httpd', [@passenger_load_shell_envvars]) %>
+<% end -%>
+<% unless @passenger_rolling_restarts.nil? -%>
+  PassengerRollingRestarts <%= scope.call_function('apache::bool2httpd', [@passenger_rolling_restarts]) %>
+<% end -%>
+<% unless @passenger_resist_deployment_errors.nil? -%>
+  PassengerResistDeploymentErrors <%= scope.call_function('apache::bool2httpd', [@passenger_resist_deployment_errors]) %>
+<% end -%>
 <%# 4 - Security options -%>
 <% if @passenger_user -%>
   PassengerUser <%= @passenger_user %>
@@ -29,23 +56,77 @@
 <% if @passenger_group -%>
   PassengerGroup <%= @passenger_group %>
 <% end -%>
+<% unless @passenger_friendly_error_pages.nil? -%>
+  PassengerFriendlyErrorPages <%= scope.call_function('apache::bool2httpd', [@passenger_friendly_error_pages]) %>
+<% end -%>
 <%# 5 - Resource control and optimization options -%>
 <% if @passenger_min_instances -%>
   PassengerMinInstances <%= @passenger_min_instances %>
 <% end -%>
+<% if @passenger_max_instances -%>
+  PassengerMaxInstances <%= @passenger_max_instances %>
+<% end -%>
+<% if @passenger_max_preloader_idle_time -%>
+  PassengerMaxPreloaderIdleTime <%= @passenger_max_preloader_idle_time %>
+<% end -%>
+<% if @passenger_force_max_concurrent_requests_per_process -%>
+  PassengerForceMaxConcurrentRequestsPerProcess <%= @passenger_force_max_concurrent_requests_per_process %>
+<% end -%>
 <% if @passenger_start_timeout -%>
   PassengerStartTimeout <%= @passenger_start_timeout %>
 <% end -%>
+<% if @passenger_concurrency_model -%>
+  PassengerConcurrencyModel <%= @passenger_concurrency_model %>
+<% end -%>
+<% if @passenger_thread_count -%>
+  PassengerThreadCount <%= @passenger_thread_count %>
+<% end -%>
 <% if @passenger_max_requests -%>
   PassengerMaxRequests <%= @passenger_max_requests %>
 <% end -%>
+<% if @passenger_max_request_time -%>
+  PassengerMaxRequestTime <%= @passenger_max_request_time %>
+<% end -%>
+<% if @passenger_memory_limit -%>
+  PassengerMemoryLimit <%= @passenger_memory_limit %>
+<% end -%>
+<% if @passenger_stat_throttle_rate -%>
+  PassengerStatThrottleRate <%= @passenger_stat_throttle_rate %>
+<% end -%>
 <% unless @passenger_high_performance.nil? -%>
   PassengerHighPerformance <%= scope.call_function('apache::bool2httpd', [@passenger_high_performance]) %>
 <% end -%>
 <%# 6 - Connection handling options -%>
+<% unless @passenger_buffer_upload.nil? -%>
+  PassengerBufferUpload <%= scope.call_function('apache::bool2httpd', [@passenger_buffer_upload]) %>
+<% end -%>
+<% unless @passenger_buffer_response.nil? -%>
+  PassengerBufferResponse <%= scope.call_function('apache::bool2httpd', [@passenger_buffer_response]) %>
+<% end -%>
+<% unless @passenger_error_override.nil? -%>
+  PassengerErrorOverride <%= scope.call_function('apache::bool2httpd', [@passenger_error_override]) %>
+<% end -%>
+<% if @passenger_max_request_queue_size -%>
+  PassengerMaxRequestQueueSize <%= @passenger_max_request_queue_size %>
+<% end -%>
+<% if @passenger_max_request_queue_time -%>
+  PassengerMaxRequestQueueTime <%= @passenger_max_request_queue_time %>
+<% end -%>
 <% unless @passenger_sticky_sessions.nil? -%>
   PassengerStickySessions <%= scope.call_function('apache::bool2httpd', [@passenger_sticky_sessions]) %>
 <% end -%>
+<% if @passenger_sticky_sessions_cookie_name -%>
+  PassengerStickySessionsCookieName <%= @passenger_sticky_sessions_cookie_name %>
+<% end -%>
 <%# 7 - Compatibility options -%>
+<% unless @passenger_allow_encoded_slashes.nil? -%>
+  PassengerAllowEncodedSlashes <%= scope.call_function('apache::bool2httpd', [@passenger_allow_encoded_slashes]) %>
+<% end -%>
 <%# 8 - Logging and debugging options -%>
+<% unless @passenger_debugger.nil? -%>
+  PassengerDebugger <%= scope.call_function('apache::bool2httpd', [@passenger_debugger]) %>
+<% end -%>
 <%# 9 - Advanced options -%>
+<% if @passenger_lve_min_uid -%>
+  PassengerLveMinUid <%= @passenger_lve_min_uid %>
+<% end -%>

From 5c2f555f883ec3b41bd5e4240eb03e1267520a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 17:41:22 +0200
Subject: [PATCH 1376/2267] Align (most) passenger parameters after last commit

---
 spec/defines/vhost_spec.rb | 80 +++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 2ac7a1e471..f3852a8c52 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -400,48 +400,48 @@
           'suexec_user_group'           => 'root root',
           'allow_encoded_slashes'       => 'nodecode',
           'use_canonical_name'          => 'dns',
-          'passenger_enabled'           => false,
-          'passenger_base_uri'          => '/app',
-          'passenger_ruby'              => '/usr/bin/ruby1.9.1',
-          'passenger_python'            => '/usr/local/bin/python',
-          'passenger_nodejs'            => '/usr/bin/node',
-          'passenger_meteor_app_settings' => '/path/to/some/file.json',
-          'passenger_app_env'           => 'test',
-          'passenger_app_root'          => '/usr/share/myapp',
-          'passenger_app_group_name'    => 'app_customer',
-          'passenger_app_type'          => 'rack',
-          'passenger_startup_file'      => 'bin/www',
-          'passenger_restart_dir'       => 'tmp',
-          'passenger_spawn_method'      => 'direct',
-          'passenger_load_shell_envvars' => false,
-          'passenger_rolling_restarts'  => false,
-          'passenger_resist_deployment_errors' => true,
-          'passenger_user'              => 'sandbox',
-          'passenger_group'             => 'sandbox',
-          'passenger_friendly_error_pages' => false,
-          'passenger_min_instances'     => '1',
-          'passenger_max_instances'     => 30,
-          'passenger_max_preloader_idle_time' => 600,
+          'passenger_enabled'                     => false,
+          'passenger_base_uri'                    => '/app',
+          'passenger_ruby'                        => '/usr/bin/ruby1.9.1',
+          'passenger_python'                      => '/usr/local/bin/python',
+          'passenger_nodejs'                      => '/usr/bin/node',
+          'passenger_meteor_app_settings'         => '/path/to/some/file.json',
+          'passenger_app_env'                     => 'test',
+          'passenger_app_root'                    => '/usr/share/myapp',
+          'passenger_app_group_name'              => 'app_customer',
+          'passenger_app_type'                    => 'rack',
+          'passenger_startup_file'                => 'bin/www',
+          'passenger_restart_dir'                 => 'tmp',
+          'passenger_spawn_method'                => 'direct',
+          'passenger_load_shell_envvars'          => false,
+          'passenger_rolling_restarts'            => false,
+          'passenger_resist_deployment_errors'    => true,
+          'passenger_user'                        => 'sandbox',
+          'passenger_group'                       => 'sandbox',
+          'passenger_friendly_error_pages'        => false,
+          'passenger_min_instances'               => '1',
+          'passenger_max_instances'               => 30,
+          'passenger_max_preloader_idle_time'     => 600,
           'passenger_force_max_concurrent_requests_per_process' => 10,
-          'passenger_start_timeout'     => '600',
-          'passenger_concurrency_model' => 'thread',
-          'passenger_thread_count'      => 5,
-          'passenger_max_requests'      => '1000',
-          'passenger_max_request_time'  => 2,
-          'passenger_memory_limit'      => 64,
-          'passenger_stat_throttle_rate' => 5,
-          'passenger_pre_start'         => 'http://localhost/myapp',
-          'passenger_high_performance'  => true,
-          'passenger_buffer_upload'     => false,
-          'passenger_buffer_response'   => false,
-          'passenger_error_override'    => true,
-          'passenger_max_request_queue_size' => 10,
-          'passenger_max_request_queue_time' => 2,
-          'passenger_sticky_sessions'   => true,
+          'passenger_start_timeout'               => '600',
+          'passenger_concurrency_model'           => 'thread',
+          'passenger_thread_count'                => 5,
+          'passenger_max_requests'                => '1000',
+          'passenger_max_request_time'            => 2,
+          'passenger_memory_limit'                => 64,
+          'passenger_stat_throttle_rate'          => 5,
+          'passenger_pre_start'                   => 'http://localhost/myapp',
+          'passenger_high_performance'            => true,
+          'passenger_buffer_upload'               => false,
+          'passenger_buffer_response'             => false,
+          'passenger_error_override'              => true,
+          'passenger_max_request_queue_size'      => 10,
+          'passenger_max_request_queue_time'      => 2,
+          'passenger_sticky_sessions'             => true,
           'passenger_sticky_sessions_cookie_name' => '_nom_nom_nom',
-          'passenger_allow_encoded_slashes' => true,
-          'passenger_debugger'          => true,
-          'passenger_lve_min_uid'       => 500,
+          'passenger_allow_encoded_slashes'       => true,
+          'passenger_debugger'                    => true,
+          'passenger_lve_min_uid'                 => 500,
           'add_default_charset'         => 'UTF-8',
           'jk_mounts'                   => [
             { 'mount'   => '/*',     'worker' => 'tcnode1' },

From 0c71629eb00b770b56f9ef7ebb5e48315a13729b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 17:30:44 +0200
Subject: [PATCH 1377/2267] Allow passing Passenger parameters to directories

A bunch of parameters can be set on a virtual host, but also
directories.  This allows to build complex setups composed of multiple
applications available through a single VirtualHost.
---
 spec/defines/vhost_spec.rb       | 225 +++++++++++++++++++++++++++++++
 templates/vhost/_directories.erb | 112 ++++++++++++++-
 2 files changed, 335 insertions(+), 2 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f3852a8c52..ba6a1df5d3 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -267,6 +267,46 @@
               'dav'                => 'filesystem',
               'dav_depth_infinity' => true,
               'dav_min_timeout'    => '600' },
+            {
+              'path'                                                => '/var/www/node-app/public',
+              'passenger_enabled'                                   => true,
+              'passenger_base_uri'                                  => '/app',
+              'passenger_ruby'                                      => '/path/to/ruby',
+              'passenger_python'                                    => '/path/to/python',
+              'passenger_nodejs'                                    => '/path/to/nodejs',
+              'passenger_meteor_app_settings'                       => '/path/to/file.json',
+              'passenger_app_env'                                   => 'demo',
+              'passenger_app_root'                                  => '/var/www/node-app',
+              'passenger_app_group_name'                            => 'foo_bar',
+              'passenger_app_type'                                  => 'node',
+              'passenger_startup_file'                              => 'start.js',
+              'passenger_restart_dir'                               => 'temp',
+              'passenger_load_shell_envvars'                        => false,
+              'passenger_rolling_restarts'                          => false,
+              'passenger_resist_deployment_errors'                  => false,
+              'passenger_user'                                      => 'nodeuser',
+              'passenger_group'                                     => 'nodegroup',
+              'passenger_friendly_error_pages'                      => true,
+              'passenger_min_instances'                             => 7,
+              'passenger_max_instances'                             => 9,
+              'passenger_force_max_concurrent_requests_per_process' => 12,
+              'passenger_start_timeout'                             => 10,
+              'passenger_concurrency_model'                         => 'thread',
+              'passenger_thread_count'                              => 20,
+              'passenger_max_requests'                              => 2000,
+              'passenger_max_request_time'                          => 1,
+              'passenger_memory_limit'                              => 32,
+              'passenger_high_performance'                          => false,
+              'passenger_buffer_upload'                             => false,
+              'passenger_buffer_response'                           => false,
+              'passenger_error_override'                            => false,
+              'passenger_max_request_queue_size'                    => 120,
+              'passenger_max_request_queue_time'                    => 5,
+              'passenger_sticky_sessions'                           => true,
+              'passenger_sticky_sessions_cookie_name'               => '_delicious_cookie',
+              'passenger_allow_encoded_slashes'                     => false,
+              'passenger_debugger'                                  => false,
+            },
           ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
@@ -676,6 +716,191 @@
           content: %r{^\s+DavMinTimeout\s600$},
         )
       }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerEnabled\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerBaseURI\s/app$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerRuby\s/path/to/ruby$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerPython\s/path/to/python$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerNodejs\s/path/to/nodejs$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerMeteorAppSettings\s/path/to/file\.json$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerAppEnv\sdemo$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerAppRoot\s/var/www/node-app$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerAppGroupName\sfoo_bar$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerAppType\snode$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerStartupFile\sstart\.js$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerRestartDir\stemp$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerRollingRestarts\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerResistDeploymentErrors\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerUser\snodeuser$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerGroup\snodegroup$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerFriendlyErrorPages\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerMinInstances\s7$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerMaxInstances\s9$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s12$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerStartTimeout\s10$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerConcurrencyModel\sthread$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerThreadCount\s20$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerMaxRequests\s2000$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerMaxRequestTime\s1$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerMemoryLimit\s32$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerHighPerformance\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerBufferUpload\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerBufferResponse\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerErrorOverride\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerMaxRequestQueueSize\s120$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerMaxRequestQueueTime\s5$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerStickySessions\sOn$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerStickySessionsCookieName\s_delicious_cookie$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerAllowEncodedSlashes\sOff$},
+        )
+      }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+          content: %r{^\s+PassengerDebugger\sOff$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 07eff7e894..219d09e168 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -85,8 +85,116 @@
     <%- if directory['sethandler'] and directory['sethandler'] != '' -%>
     SetHandler <%= directory['sethandler'] %>
     <%- end -%>
-    <%- if directory['passenger_enabled'] and directory['passenger_enabled'] != '' -%>
-    PassengerEnabled <%= directory['passenger_enabled'] %>
+    <%- unless directory['passenger_enabled'].nil? -%>
+    PassengerEnabled <%= scope.call_function('apache::bool2httpd', [directory['passenger_enabled']]) %>
+    <%- end -%>
+    <%- if directory['passenger_base_uri'] and ! directory['passenger_base_uri'].empty? -%>
+    PassengerBaseURI <%= directory['passenger_base_uri'] %>
+    <%- end -%>
+    <%- if directory['passenger_ruby'] and ! directory['passenger_ruby'].empty? -%>
+    PassengerRuby <%= directory['passenger_ruby'] %>
+    <%- end -%>
+    <%- if directory['passenger_python'] and ! directory['passenger_python'].empty? -%>
+    PassengerPython <%= directory['passenger_python'] %>
+    <%- end -%>
+    <%- if directory['passenger_nodejs'] and ! directory['passenger_nodejs'].empty? -%>
+    PassengerNodejs <%= directory['passenger_nodejs'] %>
+    <%- end -%>
+    <%- if directory['passenger_meteor_app_settings'] and ! directory['passenger_meteor_app_settings'].empty? -%>
+    PassengerMeteorAppSettings <%= directory['passenger_meteor_app_settings'] %>
+    <%- end -%>
+    <%- if directory['passenger_app_env'] and ! directory['passenger_app_env'].empty? -%>
+    PassengerAppEnv <%= directory['passenger_app_env'] %>
+    <%- end -%>
+    <%- if directory['passenger_app_root'] and ! directory['passenger_app_root'].empty? -%>
+    PassengerAppRoot <%= directory['passenger_app_root'] %>
+    <%- end -%>
+    <%- if directory['passenger_app_group_name'] and ! directory['passenger_app_group_name'].empty? -%>
+    PassengerAppGroupName <%= directory['passenger_app_group_name'] %>
+    <%- end -%>
+    <%- if directory['passenger_app_type'] and ! directory['passenger_app_type'].empty? -%>
+    PassengerAppType <%= directory['passenger_app_type'] %>
+    <%- end -%>
+    <%- if directory['passenger_startup_file'] and ! directory['passenger_startup_file'].empty? -%>
+    PassengerStartupFile <%= directory['passenger_startup_file'] %>
+    <%- end -%>
+    <%- if directory['passenger_restart_dir'] and ! directory['passenger_restart_dir'].empty? -%>
+    PassengerRestartDir <%= directory['passenger_restart_dir'] %>
+    <%- end -%>
+    <%- unless directory['passenger_load_shell_envvars'].nil? -%>
+    PassengerLoadShellEnvvars <%= scope.call_function('apache::bool2httpd', [directory['passenger_load_shell_envvars']]) %>
+    <%- end -%>
+    <%- unless directory['passenger_rolling_restarts'].nil? -%>
+    PassengerRollingRestarts <%= scope.call_function('apache::bool2httpd', [directory['passenger_rolling_restarts']]) %>
+    <%- end -%>
+    <%- unless directory['passenger_resist_deployment_errors'].nil? -%>
+    PassengerResistDeploymentErrors <%= scope.call_function('apache::bool2httpd', [directory['passenger_resist_deployment_errors']]) %>
+    <%- end -%>
+    <%- if directory['passenger_user'] and ! directory['passenger_user'].empty? -%>
+    PassengerUser <%= directory['passenger_user'] %>
+    <%- end -%>
+    <%- if directory['passenger_group'] and ! directory['passenger_group'].empty? -%>
+    PassengerGroup <%= directory['passenger_group'] %>
+    <%- end -%>
+    <%- unless directory['passenger_friendly_error_pages'].nil? -%>
+    PassengerFriendlyErrorPages <%= scope.call_function('apache::bool2httpd', [directory['passenger_friendly_error_pages']]) %>
+    <%- end -%>
+    <%- unless directory['passenger_min_instances'].nil? -%>
+    PassengerMinInstances <%= directory['passenger_min_instances'] %>
+    <%- end -%>
+    <%- unless directory['passenger_max_instances'].nil? -%>
+    PassengerMaxInstances <%= directory['passenger_max_instances'] %>
+    <%- end -%>
+    <%- unless directory['passenger_force_max_concurrent_requests_per_process'].nil? -%>
+    PassengerForceMaxConcurrentRequestsPerProcess <%= directory['passenger_force_max_concurrent_requests_per_process'] %>
+    <%- end -%>
+    <%- unless directory['passenger_start_timeout'].nil? -%>
+    PassengerStartTimeout <%= directory['passenger_start_timeout'] %>
+    <%- end -%>
+    <%- if directory['passenger_concurrency_model'] and ! directory['passenger_concurrency_model'].empty? -%>
+    PassengerConcurrencyModel <%= directory['passenger_concurrency_model'] %>
+    <%- end -%>
+    <%- unless directory['passenger_thread_count'].nil? -%>
+    PassengerThreadCount <%= directory['passenger_thread_count'] %>
+    <%- end -%>
+    <%- unless directory['passenger_max_requests'].nil? -%>
+    PassengerMaxRequests <%= directory['passenger_max_requests'] %>
+    <%- end -%>
+    <%- unless directory['passenger_max_request_time'].nil? -%>
+    PassengerMaxRequestTime <%= directory['passenger_max_request_time'] %>
+    <%- end -%>
+    <%- unless directory['passenger_memory_limit'].nil? -%>
+    PassengerMemoryLimit <%= directory['passenger_memory_limit'] %>
+    <%- end -%>
+    <%- unless directory['passenger_high_performance'].nil? -%>
+    PassengerHighPerformance <%= scope.call_function('apache::bool2httpd', [directory['passenger_high_performance']]) %>
+    <%- end -%>
+    <%- unless directory['passenger_buffer_upload'].nil? -%>
+    PassengerBufferUpload <%= scope.call_function('apache::bool2httpd', [directory['passenger_buffer_upload']]) %>
+    <%- end -%>
+    <%- unless directory['passenger_buffer_response'].nil? -%>
+    PassengerBufferResponse <%= scope.call_function('apache::bool2httpd', [directory['passenger_buffer_response']]) %>
+    <%- end -%>
+    <%- unless directory['passenger_error_override'].nil? -%>
+    PassengerErrorOverride <%= scope.call_function('apache::bool2httpd', [directory['passenger_error_override']]) %>
+    <%- end -%>
+    <%- unless directory['passenger_max_request_queue_size'].nil? -%>
+    PassengerMaxRequestQueueSize <%= directory['passenger_max_request_queue_size'] %>
+    <%- end -%>
+    <%- unless directory['passenger_max_request_queue_time'].nil? -%>
+    PassengerMaxRequestQueueTime <%= directory['passenger_max_request_queue_time'] %>
+    <%- end -%>
+    <%- unless directory['passenger_sticky_sessions'].nil? -%>
+    PassengerStickySessions <%= scope.call_function('apache::bool2httpd', [directory['passenger_sticky_sessions']]) %>
+    <%- end -%>
+    <%- if directory['passenger_sticky_sessions_cookie_name'] and ! directory['passenger_sticky_sessions_cookie_name'].empty? -%>
+    PassengerStickySessionsCookieName <%= directory['passenger_sticky_sessions_cookie_name'] %>
+    <%- end -%>
+    <%- unless directory['passenger_allow_encoded_slashes'].nil? -%>
+    PassengerAllowEncodedSlashes <%= scope.call_function('apache::bool2httpd', [directory['passenger_allow_encoded_slashes']]) %>
+    <%- end -%>
+    <%- unless directory['passenger_debugger'].nil? -%>
+    PassengerDebugger <%= scope.call_function('apache::bool2httpd', [directory['passenger_debugger']]) %>
     <%- end -%>
     <%- if directory['php_flags'] and ! directory['php_flags'].empty? -%>
       <%- directory['php_flags'].sort.each do |flag,value| -%>

From f55a61ce2d0f293bb40d9f22c23ac57fd981e508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 17 Apr 2018 17:44:09 +0200
Subject: [PATCH 1378/2267] Ensure passed numbers are Integer

These parameters used to be String (not enforced by types).  In order to
avoid changing the Unit Tests, they were kept as-is.  Now that
refactoring is done, switch to a better type.
---
 manifests/vhost.pp         | 6 +++---
 spec/defines/vhost_spec.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 3b52fdb7f7..32b619ae6c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -152,14 +152,14 @@
   Optional[String] $passenger_user                                                  = undef,
   Optional[String] $passenger_group                                                 = undef,
   Optional[Boolean] $passenger_friendly_error_pages                                 = undef,
-  Optional[String] $passenger_min_instances                                         = undef, # FIXME: Should be Integer, not String
+  Optional[Integer] $passenger_min_instances                                        = undef,
   Optional[Integer] $passenger_max_instances                                        = undef,
   Optional[Integer] $passenger_max_preloader_idle_time                              = undef,
   Optional[Integer] $passenger_force_max_concurrent_requests_per_process            = undef,
-  Optional[String] $passenger_start_timeout                                         = undef, # FIXME: Should be Integer, not String
+  Optional[Integer] $passenger_start_timeout                                        = undef,
   Optional[Enum['process', 'thread']] $passenger_concurrency_model                  = undef,
   Optional[Integer] $passenger_thread_count                                         = undef,
-  Optional[String] $passenger_max_requests                                          = undef, # FIXME: Should be Integer, not String
+  Optional[Integer] $passenger_max_requests                                         = undef,
   Optional[Integer] $passenger_max_request_time                                     = undef,
   Optional[Integer] $passenger_memory_limit                                         = undef,
   Optional[Integer] $passenger_stat_throttle_rate                                   = undef,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index ba6a1df5d3..d835ee9102 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -459,14 +459,14 @@
           'passenger_user'                        => 'sandbox',
           'passenger_group'                       => 'sandbox',
           'passenger_friendly_error_pages'        => false,
-          'passenger_min_instances'               => '1',
+          'passenger_min_instances'               => 1,
           'passenger_max_instances'               => 30,
           'passenger_max_preloader_idle_time'     => 600,
           'passenger_force_max_concurrent_requests_per_process' => 10,
-          'passenger_start_timeout'               => '600',
+          'passenger_start_timeout'               => 600,
           'passenger_concurrency_model'           => 'thread',
           'passenger_thread_count'                => 5,
-          'passenger_max_requests'                => '1000',
+          'passenger_max_requests'                => 1000,
           'passenger_max_request_time'            => 2,
           'passenger_memory_limit'                => 64,
           'passenger_stat_throttle_rate'          => 5,

From 47d7c3895bc7a27d2ed21361a6b59ed836a03508 Mon Sep 17 00:00:00 2001
From: Christoph Maser <christoph.maser@gmail.com>
Date: Sun, 22 Jul 2018 10:06:29 +0200
Subject: [PATCH 1379/2267] remove fact for concat_basedir

---
 spec/classes/apache_spec.rb                    |  6 ------
 spec/classes/dev_spec.rb                       |  5 -----
 spec/classes/mod/alias_spec.rb                 |  5 -----
 spec/classes/mod/auth_cas_spec.rb              |  2 --
 spec/classes/mod/auth_gssapi_spec.rb           |  4 ----
 spec/classes/mod/auth_kerb_spec.rb             |  5 -----
 spec/classes/mod/auth_mellon_spec.rb           |  2 --
 spec/classes/mod/authn_dbd_spec.rb             |  2 --
 spec/classes/mod/authnz_ldap_spec.rb           |  2 --
 spec/classes/mod/authnz_pam_spec.rb            |  2 --
 spec/classes/mod/cluster_spec.rb               |  3 ---
 spec/classes/mod/data_spec.rb                  |  1 -
 spec/classes/mod/dav_svn_spec.rb               |  4 ----
 spec/classes/mod/deflate_spec.rb               |  4 ----
 spec/classes/mod/dev_spec.rb                   |  1 -
 spec/classes/mod/dir_spec.rb                   |  4 ----
 spec/classes/mod/disk_cache_spec.rb            |  3 ---
 spec/classes/mod/dumpio_spec.rb                |  1 -
 spec/classes/mod/event_spec.rb                 |  4 ----
 spec/classes/mod/expires_spec.rb               |  3 ---
 spec/classes/mod/ext_filter_spec.rb            |  2 --
 spec/classes/mod/fastcgi_spec.rb               |  2 --
 spec/classes/mod/fcgid_spec.rb                 |  5 -----
 spec/classes/mod/info_spec.rb                  |  4 ----
 spec/classes/mod/intercept_form_submit_spec.rb |  2 --
 spec/classes/mod/itk_spec.rb                   |  3 ---
 spec/classes/mod/ldap_spec.rb                  |  2 --
 spec/classes/mod/lookup_identity.rb            |  2 --
 spec/classes/mod/mime_magic_spec.rb            |  3 ---
 spec/classes/mod/mime_spec.rb                  |  2 --
 spec/classes/mod/negotiation_spec.rb           |  1 -
 spec/classes/mod/pagespeed_spec.rb             |  2 --
 spec/classes/mod/passenger_spec.rb             |  7 -------
 spec/classes/mod/perl_spec.rb                  |  4 ----
 spec/classes/mod/peruser_spec.rb               |  2 --
 spec/classes/mod/php_spec.rb                   |  5 -----
 spec/classes/mod/prefork_spec.rb               |  4 ----
 spec/classes/mod/proxy_balancer_spec.rb        |  3 ---
 spec/classes/mod/proxy_connect_spec.rb         |  1 -
 spec/classes/mod/proxy_html_spec.rb            |  4 ----
 spec/classes/mod/python_spec.rb                |  4 ----
 spec/classes/mod/remoteip_spec.rb              |  1 -
 spec/classes/mod/reqtimeout_spec.rb            |  4 ----
 spec/classes/mod/rpaf_spec.rb                  |  3 ---
 spec/classes/mod/security_spec.rb              |  2 --
 spec/classes/mod/shib_spec.rb                  |  2 --
 spec/classes/mod/speling_spec.rb               |  2 --
 spec/classes/mod/ssl_spec.rb                   |  9 ---------
 spec/classes/mod/status_spec.rb                |  9 ---------
 spec/classes/mod/suphp_spec.rb                 |  2 --
 spec/classes/mod/userdir_spec.rb               |  1 -
 spec/classes/mod/worker_spec.rb                |  5 -----
 spec/classes/mod/wsgi_spec.rb                  |  5 -----
 spec/classes/params_spec.rb                    |  1 -
 spec/classes/service_spec.rb                   |  4 ----
 spec/classes/vhosts_spec.rb                    |  1 -
 spec/default_facts.yml                         |  1 -
 spec/defines/balancer_spec.rb                  |  1 -
 spec/defines/balancermember_spec.rb            |  1 -
 spec/defines/custom_config_spec.rb             |  1 -
 spec/defines/fastcgi_server_spec.rb            |  5 -----
 spec/defines/mod_spec.rb                       |  4 ----
 spec/defines/modsec_link_spec.rb               |  2 --
 spec/defines/vhost_custom_spec.rb              |  4 ----
 spec/defines/vhost_spec.rb                     | 17 -----------------
 spec/spec_helper_local.rb                      |  1 -
 66 files changed, 215 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 98e33f00ea..ebac58cbfa 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -11,7 +11,6 @@
         operatingsystem: 'Debian',
         operatingsystemrelease: '6',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        concat_basedir: '/dne',
         is_pe: false,
       }
     end
@@ -280,7 +279,6 @@
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
         operatingsystemrelease: '5',
-        concat_basedir: '/dne',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
@@ -667,7 +665,6 @@
         osfamily: 'FreeBSD',
         operatingsystem: 'FreeBSD',
         operatingsystemrelease: '10',
-        concat_basedir: '/dne',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
@@ -738,7 +735,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
         is_pe: false,
       }
@@ -782,7 +778,6 @@
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
@@ -875,7 +870,6 @@
     let :facts do
       { osfamily: 'Darwin',
         operatingsystemrelease: '13.1.0',
-        concat_basedir: '/dne',
         is_pe: false }
     end
 
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 1b6ebffd50..a94844cf54 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -15,7 +15,6 @@
         operatingsystem: 'Debian',
         operatingsystemrelease: '6',
         is_pe: false,
-        concat_basedir: '/foo',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
         kernel: 'Linux',
@@ -36,7 +35,6 @@
         operatingsystem: 'Ubuntu',
         operatingsystemrelease: '16.04',
         is_pe: false,
-        concat_basedir: '/foo',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
         kernel: 'Linux',
@@ -52,7 +50,6 @@
         operatingsystem: 'RedHat',
         operatingsystemrelease: '6',
         is_pe: false,
-        concat_basedir: '/foo',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
         kernel: 'Linux',
@@ -69,7 +66,6 @@
         operatingsystem: 'FreeBSD',
         operatingsystemrelease: '9',
         is_pe: false,
-        concat_basedir: '/foo',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
         kernel: 'FreeBSD',
@@ -85,7 +81,6 @@
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
         is_pe: false,
-        concat_basedir: '/foo',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
         kernel: 'Linux',
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 72eab550de..ecb9c69ab0 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -14,7 +14,6 @@
           operatingsystem: 'Debian',
           operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -31,7 +30,6 @@
           operatingsystem: 'RedHat',
           operatingsystemrelease: '6',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -48,7 +46,6 @@
           operatingsystem: 'RedHat',
           operatingsystemrelease: '7',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -68,7 +65,6 @@
           operatingsystem: 'RedHat',
           operatingsystemrelease: '7',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -90,7 +86,6 @@
           operatingsystem: 'FreeBSD',
           operatingsystemrelease: '10',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index e7e83cd269..b5a5f62aab 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -31,7 +31,6 @@
           operatingsystem: 'Debian',
           operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -51,7 +50,6 @@
           operatingsystem: 'RedHat',
           operatingsystemrelease: '6',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
index 61f4ce5aa6..96b95ba401 100644
--- a/spec/classes/mod/auth_gssapi_spec.rb
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -14,7 +14,6 @@
           operatingsystem: 'Debian',
           operatingsystemrelease: '6',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -32,7 +31,6 @@
           operatingsystem: 'RedHat',
           operatingsystemrelease: '6',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -50,7 +48,6 @@
           operatingsystem: 'FreeBSD',
           operatingsystemrelease: '9',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -68,7 +65,6 @@
           operatingsystem: 'Gentoo',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
           operatingsystemrelease: '3.16.1-gentoo',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index d6840f7749..87177e866f 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -14,7 +14,6 @@
           operatingsystem: 'Debian',
           operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -32,7 +31,6 @@
           operatingsystem: 'RedHat',
           operatingsystemrelease: '6',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -50,7 +48,6 @@
           operatingsystem: 'FreeBSD',
           operatingsystemrelease: '9',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -68,7 +65,6 @@
           operatingsystem: 'Gentoo',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
           operatingsystemrelease: '3.16.1-gentoo',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -88,7 +84,6 @@
           operatingsystem: 'RedHat',
           operatingsystemrelease: '6',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index 8adbb4065d..86dca2754f 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -8,7 +8,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -50,7 +49,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
index e0314589ba..a40fc50490 100644
--- a/spec/classes/mod/authn_dbd_spec.rb
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -30,7 +30,6 @@
           operatingsystem: 'Debian',
           operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -50,7 +49,6 @@
           operatingsystem: 'RedHat',
           operatingsystemrelease: '6',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index 1ff932aeae..7d449b94ff 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -9,7 +9,6 @@
         lsbdistcodename: 'jessie',
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         operatingsystem: 'Debian',
@@ -46,7 +45,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         operatingsystem: 'RedHat',
diff --git a/spec/classes/mod/authnz_pam_spec.rb b/spec/classes/mod/authnz_pam_spec.rb
index e43b46a535..2438c1c8d3 100644
--- a/spec/classes/mod/authnz_pam_spec.rb
+++ b/spec/classes/mod/authnz_pam_spec.rb
@@ -10,7 +10,6 @@
           lsbdistcodename: 'jessie',
           osfamily: 'Debian',
           operatingsystemrelease: '8',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           operatingsystem: 'Debian',
@@ -29,7 +28,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '8',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           operatingsystem: 'RedHat',
diff --git a/spec/classes/mod/cluster_spec.rb b/spec/classes/mod/cluster_spec.rb
index 793012dd52..2862b72598 100644
--- a/spec/classes/mod/cluster_spec.rb
+++ b/spec/classes/mod/cluster_spec.rb
@@ -6,7 +6,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '7',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -40,7 +39,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '7',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -74,7 +72,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/data_spec.rb b/spec/classes/mod/data_spec.rb
index 511abda130..7efb3c2aad 100644
--- a/spec/classes/mod/data_spec.rb
+++ b/spec/classes/mod/data_spec.rb
@@ -6,7 +6,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index dc2eca08a4..a25f34126a 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -11,7 +11,6 @@
           osfamily: 'Debian',
           operatingsystemrelease: '8',
           operatingsystemmajrelease: '8',
-          concat_basedir: '/dne',
           operatingsystem: 'Debian',
           id: 'root',
           kernel: 'Linux',
@@ -30,7 +29,6 @@
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
           operatingsystemmajrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -49,7 +47,6 @@
           osfamily: 'FreeBSD',
           operatingsystemrelease: '9',
           operatingsystemmajrelease: '9',
-          concat_basedir: '/dne',
           operatingsystem: 'FreeBSD',
           id: 'root',
           kernel: 'Linux',
@@ -67,7 +64,6 @@
         {
           id: 'root',
           operatingsystemrelease: '3.16.1-gentoo',
-          concat_basedir: '/dne',
           kernel: 'Linux',
           osfamily: 'Gentoo',
           operatingsystem: 'Gentoo',
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 92d752c07b..8273c4435a 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -40,7 +40,6 @@ def general_deflate_specs
           operatingsystem: 'Debian',
           operatingsystemrelease: '8',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -67,7 +66,6 @@ def general_deflate_specs
           operatingsystem: 'RedHat',
           operatingsystemrelease: '6',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -87,7 +85,6 @@ def general_deflate_specs
           operatingsystem: 'FreeBSD',
           operatingsystemrelease: '9',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
@@ -110,7 +107,6 @@ def general_deflate_specs
           operatingsystem: 'Gentoo',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
           operatingsystemrelease: '3.16.1-gentoo',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 0de9dbcb7e..9304634452 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -22,7 +22,6 @@
           operatingsystem: osfamily,
           operatingsystemrelease: operatingsystemrelease,
           is_pe: false,
-          concat_basedir: '/foo',
           id: 'root',
           path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
           kernel: kernel,
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 79371f1b59..f0774463ed 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -8,7 +8,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
@@ -43,7 +42,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'Redhat',
         id: 'root',
         kernel: 'Linux',
@@ -77,7 +75,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -112,7 +109,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index ec98ec7124..93a6b77494 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -11,7 +11,6 @@
         operatingsystem: 'Debian',
         operatingsystemrelease: '8',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        concat_basedir: '/dne',
         is_pe: false,
       }
     end
@@ -68,7 +67,6 @@
         operatingsystem: 'RedHat',
         operatingsystemrelease: '6',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        concat_basedir: '/dne',
         is_pe: false,
       }
     end
@@ -119,7 +117,6 @@
         operatingsystem: 'FreeBSD',
         operatingsystemrelease: '10',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        concat_basedir: '/dne',
         is_pe: false,
       }
     end
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
index fc6f2886aa..6b84192e7c 100644
--- a/spec/classes/mod/dumpio_spec.rb
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -14,7 +14,6 @@
         osfamily: 'Debian',
         operatingsystemrelease: '8',
         operatingsystemmajrelease: '8',
-        concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 0f01bc8d8a..368e9561a7 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -10,7 +10,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -29,7 +28,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
@@ -47,7 +45,6 @@
         lsbdistcodename: 'jessie',
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
@@ -183,7 +180,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index 9635a6a805..d79158c0be 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -13,7 +13,6 @@
         operatingsystem: 'Debian',
         operatingsystemrelease: '8',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        concat_basedir: '/dne',
         is_pe: false,
       }
     end
@@ -33,7 +32,6 @@
         operatingsystem: 'RedHat',
         operatingsystemrelease: '7',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        concat_basedir: '/dne',
         is_pe: false,
       }
     end
@@ -63,7 +61,6 @@
         operatingsystem: 'RedHat',
         operatingsystemrelease: '7',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        concat_basedir: '/dne',
         is_pe: false,
       }
     end
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index 40203ac162..78bc0a936a 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -37,7 +36,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 17b3062ab9..d60da277e0 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'squeze',
         operatingsystem: 'Debian',
         id: 'root',
@@ -28,7 +27,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index ea4d8b7929..da091a4195 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -9,7 +9,6 @@
         osfamily: 'Debian',
         operatingsystemrelease: '8',
         operatingsystemmajrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -32,7 +31,6 @@
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
         operatingsystemmajrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -82,7 +80,6 @@
         osfamily: 'RedHat',
         operatingsystemrelease: '7',
         operatingsystemmajrelease: '7',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -106,7 +103,6 @@
         osfamily: 'FreeBSD',
         operatingsystemrelease: '10',
         operatingsystemmajrelease: '10',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -128,7 +124,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index c24e5eb686..e61c0b0baf 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -126,7 +126,6 @@ def general_info_specs_24
       {
         osfamily: 'Debian',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         lsbdistcodename: 'squeeze',
         operatingsystem: 'Debian',
         id: 'root',
@@ -154,7 +153,6 @@ def general_info_specs_24
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -177,7 +175,6 @@ def general_info_specs_24
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '10',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -201,7 +198,6 @@ def general_info_specs_24
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
index f05f1e1767..1623814594 100644
--- a/spec/classes/mod/intercept_form_submit_spec.rb
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -10,7 +10,6 @@
           lsbdistcodename: 'jessie',
           osfamily: 'Debian',
           operatingsystemrelease: '8',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           operatingsystem: 'Debian',
@@ -29,7 +28,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           operatingsystem: 'RedHat',
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index d2a2c52730..1c010d4bef 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -10,7 +10,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -84,7 +83,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -160,7 +158,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '10',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 09ae455152..46f6de7edc 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -9,7 +9,6 @@
         lsbdistcodename: 'jessie',
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         operatingsystem: 'Debian',
@@ -61,7 +60,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         operatingsystem: 'RedHat',
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
index 2ed371adf7..5fae97d0e6 100644
--- a/spec/classes/mod/lookup_identity.rb
+++ b/spec/classes/mod/lookup_identity.rb
@@ -10,7 +10,6 @@
           lsbdistcodename: 'jessie',
           osfamily: 'Debian',
           operatingsystemrelease: '8',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           operatingsystem: 'Debian',
@@ -29,7 +28,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           operatingsystem: 'RedHat',
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index ed61ed6a54..6d01ed5f8a 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -13,7 +13,6 @@ def general_mime_magic_specs
       {
         osfamily: 'Debian',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -58,7 +57,6 @@ def general_mime_magic_specs
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -83,7 +81,6 @@ def general_mime_magic_specs
       {
         osfamily: 'Debian',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 3230b53f2e..7f3f0b86dd 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -13,7 +13,6 @@ def general_mime_specs
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -33,7 +32,6 @@ def general_mime_specs
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 947243f7e6..4d23bf6ab9 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -10,7 +10,6 @@
         kernel: 'Linux',
         lsbdistcodename: 'jessie',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index a585702a70..171b7672f6 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -6,7 +6,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -42,7 +41,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 76aaafe0a9..e0136ec891 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -8,7 +8,6 @@
         osfamily: 'Debian',
         operatingsystemrelease: '8',
         kernel: 'Linux',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -176,7 +175,6 @@
         osfamily: 'Debian',
         operatingsystemrelease: '6',
         kernel: 'Linux',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -358,7 +356,6 @@
           operatingsystem: 'Ubuntu',
           kernel: 'Linux',
           lsbdistrelease: '16.04',
-          concat_basedir: '/dne',
           id: 'root',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           is_pe: false,
@@ -378,7 +375,6 @@
           operatingsystem: 'Debian',
           kernel: 'Linux',
           lsbdistcodename: 'jessie',
-          concat_basedir: '/dne',
           id: 'root',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           is_pe: false,
@@ -395,7 +391,6 @@
     let :rh_facts do
       {
         osfamily: 'RedHat',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -452,7 +447,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -471,7 +465,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index a5b60867f5..0176c16027 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -26,7 +25,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -44,7 +42,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -62,7 +59,6 @@
       {
         osfamily: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         operatingsystem: 'Gentoo',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index 89cbc118ed..0f6a62b335 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -10,7 +10,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '10',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -31,7 +30,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 3d9b81b9df..6ccd1363df 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -6,7 +6,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -84,7 +83,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -191,7 +189,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '10',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -228,7 +225,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
@@ -266,7 +262,6 @@
         operatingsystemrelease: '6',
         kernel: 'Linux',
         lsbdistcodename: 'jessie',
-        concat_basedir: '/dne',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 79a7b19297..8554577cbd 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -10,7 +10,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -57,7 +56,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -108,7 +106,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -127,7 +124,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index 88d8cf5ea7..8071a696bd 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -26,7 +26,6 @@ def balancer_manager_conf_spec(allow_from, manager_path)
         {
           osfamily: 'Debian',
           operatingsystemrelease: '8',
-          concat_basedir: '/dne',
           lsbdistcodename: 'jessie',
           operatingsystem: 'Debian',
           id: 'root',
@@ -47,7 +46,6 @@ def balancer_manager_conf_spec(allow_from, manager_path)
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -67,7 +65,6 @@ def balancer_manager_conf_spec(allow_from, manager_path)
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index 40356ed6a0..0f39a05bc0 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -12,7 +12,6 @@
     let :facts do
       {
         osfamily: 'Debian',
-        concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index a10e7b26fa..b8944ad0ac 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -18,7 +18,6 @@
     let :facts do
       {
         osfamily: 'Debian',
-        concat_basedir: '/dne',
         architecture: 'i386',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
@@ -57,7 +56,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -76,7 +74,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -96,7 +93,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 5e6d7a0f8c..21e4e42727 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -8,7 +8,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -27,7 +26,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -54,7 +52,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -73,7 +70,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index bfccb5a60f..c4238f1244 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -6,7 +6,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index 8b9a66fc07..d86ed20bc9 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
@@ -46,7 +45,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'Redhat',
         id: 'root',
         kernel: 'Linux',
@@ -84,7 +82,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -123,7 +120,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index e7a4335f22..eb389baa78 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -52,7 +51,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -97,7 +95,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 45957bbe8a..8f4d053fd7 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -11,7 +11,6 @@
         operatingsystemrelease: '7',
         kernel: 'Linux',
         id: 'root',
-        concat_basedir: '/',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
@@ -105,7 +104,6 @@
         osfamily: 'Debian',
         operatingsystem: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/',
         lsbdistcodename: 'jessie',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index f0b44098c4..ec9706ca60 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -27,7 +26,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index a42ddeae47..1824c72444 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -25,7 +24,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 7233bdfad0..31fc44217f 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Magic',
         operatingsystemrelease: '0',
-        concat_basedir: '/dne',
         operatingsystem: 'Magic',
         id: 'root',
         kernel: 'Linux',
@@ -25,7 +24,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -44,7 +42,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -68,7 +65,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -96,7 +92,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -116,7 +111,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -135,7 +129,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
@@ -154,7 +147,6 @@
         osfamily: 'Suse',
         operatingsystem: 'SLES',
         operatingsystemrelease: '12',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
@@ -175,7 +167,6 @@
         operatingsystemrelease: '6',
         kernel: 'Linux',
         id: 'root',
-        concat_basedir: '/dne',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 84e30253b0..09c6bb741a 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -71,7 +71,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
         {
           osfamily: 'Debian',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           lsbdistcodename: 'squeeze',
           operatingsystem: 'Debian',
           id: 'root',
@@ -101,7 +100,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -147,7 +145,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
           {
             osfamily: 'Debian',
             operatingsystemrelease: '8',
-            concat_basedir: '/dne',
             lsbdistcodename: 'squeeze',
             operatingsystem: 'Debian',
             id: 'root',
@@ -183,7 +180,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
           {
             osfamily: 'RedHat',
             operatingsystemrelease: '7',
-            concat_basedir: '/dne',
             operatingsystem: 'RedHat',
             id: 'root',
             kernel: 'Linux',
@@ -211,7 +207,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
         {
           osfamily: 'Debian',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           lsbdistcodename: 'squeeze',
           operatingsystem: 'Debian',
           id: 'root',
@@ -236,7 +231,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
         {
           osfamily: 'Debian',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           lsbdistcodename: 'squeeze',
           operatingsystem: 'Debian',
           id: 'root',
@@ -261,7 +255,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
         {
           osfamily: 'Debian',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'Debian',
           id: 'root',
           kernel: 'Linux',
@@ -287,7 +280,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
           {
             osfamily: 'Debian',
             operatingsystemrelease: '6',
-            concat_basedir: '/dne',
             lsbdistcodename: 'squeeze',
             operatingsystem: 'Debian',
             id: 'root',
@@ -314,7 +306,6 @@ def status_conf_spec_require(requires, extended_status, status_path)
           {
             osfamily: 'Debian',
             operatingsystemrelease: '6',
-            concat_basedir: '/dne',
             operatingsystem: 'Debian',
             id: 'root',
             kernel: 'Linux',
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index 1ee6aa8356..573b7c16c7 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -25,7 +24,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 0fb352b546..f33920a262 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -14,7 +14,6 @@
         osfamily: 'Debian',
         operatingsystemrelease: '8',
         operatingsystemmajrelease: '8',
-        concat_basedir: '/dne',
         operatingsystem: 'Debian',
         id: 'root',
         kernel: 'Linux',
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index eaeec71d2a..2ebd5a9709 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -10,7 +10,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -57,7 +56,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -102,7 +100,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -121,7 +118,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
@@ -143,7 +139,6 @@
         operatingsystemrelease: '6',
         kernel: 'Linux',
         id: 'root',
-        concat_basedir: '/dne',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index b07b03b22d..664c0b7544 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -7,7 +7,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -30,7 +29,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -121,7 +119,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -144,7 +141,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
@@ -170,7 +166,6 @@
           operatingsystem: 'Fedora',
           operatingsystemrelease: '28',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          concat_basedir: '/dne',
           is_pe: false,
         }
       end
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index e5ca863fe8..ad616377a1 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -6,7 +6,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 00ad67ff24..0ade8ef10e 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -10,7 +10,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -110,7 +109,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '5',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -134,7 +132,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -158,7 +155,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
index 2f2f914158..319e3df596 100644
--- a/spec/classes/vhosts_spec.rb
+++ b/spec/classes/vhosts_spec.rb
@@ -9,7 +9,6 @@
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index 3248be5aa6..ea1e4808e3 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,7 +2,6 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-concat_basedir: "/tmp"
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index b89b1c6cb1..4b6f96ec08 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -11,7 +11,6 @@
       operatingsystemrelease: '8',
       lsbdistcodename: 'jessie',
       id: 'root',
-      concat_basedir: '/dne',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       kernel: 'Linux',
       is_pe: false,
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 898ca8f6b4..1e57ca59cb 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -11,7 +11,6 @@
       operatingsystemrelease: '8',
       lsbdistcodename: 'jessie',
       id: 'root',
-      concat_basedir: '/dne',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       kernel: 'Linux',
       is_pe: false,
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 8cf280a5bc..4b262ef688 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -11,7 +11,6 @@
     {
       osfamily: 'Debian',
       operatingsystemrelease: '8',
-      concat_basedir: '/',
       lsbdistcodename: 'jessie',
       operatingsystem: 'Debian',
       id: 'root',
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index c223c50b0d..9d3f62d8b0 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -17,7 +17,6 @@
           operatingsystemrelease: '6',
           kernel: 'Linux',
           id: 'root',
-          concat_basedir: '/dne',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           is_pe: false,
         }
@@ -42,7 +41,6 @@
           lsbdistcodename: 'jessie',
           kernel: 'Linux',
           id: 'root',
-          concat_basedir: '/dne',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           is_pe: false,
         }
@@ -66,7 +64,6 @@
           operatingsystemrelease: '9',
           kernel: 'FreeBSD',
           id: 'root',
-          concat_basedir: '/dne',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           is_pe: false,
         }
@@ -88,7 +85,6 @@
           osfamily: 'Gentoo',
           operatingsystem: 'Gentoo',
           operatingsystemrelease: '3.16.1-gentoo',
-          concat_basedir: '/dne',
           kernel: 'Linux',
           id: 'root',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
@@ -116,7 +112,6 @@
         lsbdistcodename: 'jessie',
         kernel: 'Linux',
         id: 'root',
-        concat_basedir: '/dne',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index 584b4b17dc..2466161107 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -10,7 +10,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -65,7 +64,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/dne',
         lsbdistcodename: 'jessie',
         operatingsystem: 'Debian',
         id: 'root',
@@ -103,7 +101,6 @@
       {
         osfamily: 'FreeBSD',
         operatingsystemrelease: '9',
-        concat_basedir: '/dne',
         operatingsystem: 'FreeBSD',
         id: 'root',
         kernel: 'FreeBSD',
@@ -134,7 +131,6 @@
         osfamily: 'Gentoo',
         operatingsystem: 'Gentoo',
         operatingsystemrelease: '3.16.1-gentoo',
-        concat_basedir: '/dne',
         id: 'root',
         kernel: 'Linux',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index 9611a04c13..8a181841ef 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -19,7 +19,6 @@ class { "apache::mod::security": activated_rules => [] }
         operatingsystemrelease: '7',
         kernel: 'Linux',
         id: 'root',
-        concat_basedir: '/',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         is_pe: false,
       }
@@ -39,7 +38,6 @@ class { "apache::mod::security": activated_rules => [] }
         osfamily: 'Debian',
         operatingsystem: 'Debian',
         operatingsystemrelease: '8',
-        concat_basedir: '/',
         lsbdistcodename: 'jessie',
         id: 'root',
         path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index dc9a072ff7..05c9183bc5 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -17,7 +17,6 @@
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
           operatingsystem: 'RedHat',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -34,7 +33,6 @@
           operatingsystemrelease: '8',
           lsbdistcodename: 'jessie',
           operatingsystem: 'Debian',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -65,7 +63,6 @@
           osfamily: 'FreeBSD',
           operatingsystemrelease: '9',
           operatingsystem: 'FreeBSD',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'FreeBSD',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
@@ -89,7 +86,6 @@
           osfamily: 'Gentoo',
           operatingsystem: 'Gentoo',
           operatingsystemrelease: '3.16.1-gentoo',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index d835ee9102..ca67baa703 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -20,7 +20,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -39,7 +38,6 @@
         {
           osfamily: 'Debian',
           operatingsystemrelease: '8',
-          concat_basedir: '/dne',
           lsbdistcodename: 'jessie',
           operatingsystem: 'Debian',
           id: 'root',
@@ -72,7 +70,6 @@
         {
           osfamily: 'FreeBSD',
           operatingsystemrelease: '9',
-          concat_basedir: '/dne',
           operatingsystem: 'FreeBSD',
           id: 'root',
           kernel: 'FreeBSD',
@@ -98,7 +95,6 @@
           osfamily: 'Gentoo',
           operatingsystem: 'Gentoo',
           operatingsystemrelease: '3.16.1-gentoo',
-          concat_basedir: '/dne',
           id: 'root',
           kernel: 'Linux',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
@@ -123,7 +119,6 @@
       {
         osfamily: 'Debian',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         lsbdistcodename: 'squeeze',
         operatingsystem: 'Debian',
         id: 'root',
@@ -504,7 +499,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -1329,7 +1323,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -1367,7 +1360,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -1405,7 +1397,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -1447,7 +1438,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -1483,7 +1473,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -1611,7 +1600,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -1856,7 +1844,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -1928,7 +1915,6 @@
       {
         osfamily: 'RedHat',
         operatingsystemrelease: '6',
-        concat_basedir: '/dne',
         operatingsystem: 'RedHat',
         id: 'root',
         kernel: 'Linux',
@@ -2209,7 +2195,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -2245,7 +2230,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '7',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
@@ -2269,7 +2253,6 @@
         {
           osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          concat_basedir: '/dne',
           operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 2307ab7fbc..6c37eb2af7 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -30,7 +30,6 @@
       operatingsystemrelease: '8',
       operatingsystemmajrelease: nil,
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      concat_basedir: '/dne',
       is_pe: false,
       hardwaremodel: 'x86_64',
     }

From 8fbffea21e7bf742f4b3df51f572478c8d5531f4 Mon Sep 17 00:00:00 2001
From: Helen <helen@puppetlabs.com>
Date: Wed, 1 Aug 2018 16:07:39 +0100
Subject: [PATCH 1380/2267] Revert "enforce modern crypto ciphers and protocol"

---
 README.md            | 8 ++++----
 manifests/mod/ssl.pp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7c1f851868..95cc6023d1 100755
--- a/README.md
+++ b/README.md
@@ -2756,7 +2756,7 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 
 To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to `true` **or** the [`ssl`][] parameter in [`apache::vhost`][] to `true`.
 
-- `ssl_cipher`: Default: 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'.
+- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
 - `ssl_compression`: Default: false.
 - `ssl_cryptodevice`: Default: 'builtin'.
 - `ssl_honorcipherorder`: Default: true.
@@ -2765,7 +2765,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 - `ssl_key`: Default: undef.
 - `ssl_options`: Default: ['StdEnvVars']
 - `ssl_pass_phrase_dialog`: Default: 'builtin'.
-- `ssl_protocol`: Default: ['all', '-SSLv2', '-SSLv3', '-TLSv1', '-TLSv1.1'].
+- `ssl_protocol`: Default: ['all', '-SSLv2', '-SSLv3'].
 - `ssl_proxy_protocol`: Default: [].
 - `ssl_random_seed_bytes`: Valid options: A string. Default: '512'.
 - `ssl_sessioncache`: Valid options: A string. Default: '300'.
@@ -2778,7 +2778,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 
 * `ssl_cipher`
 
-  Default: 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'.
+  Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
 
 * `ssl_compression`
 
@@ -2814,7 +2814,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 
 * `ssl_protocol`
 
-  Default: ['all', '-SSLv2', '-SSLv3', '-TLSv1', '-TLSv1.1'].
+  Default: ['all', '*SSLv2', '*SSLv3'].
 
 * `ssl_random_seed_bytes`
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index f41b03fc74..3064bf815e 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -6,9 +6,9 @@
   Optional[String] $ssl_cert                                = undef,
   Optional[String] $ssl_key                                 = undef,
   $ssl_ca                                                   = undef,
-  $ssl_cipher                                               = 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH',
+  $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
-  $ssl_protocol                                             = [ 'all', '-SSLv2', '-SSLv3', '-TLSv1', '-TLSv1.1' ],
+  $ssl_protocol                                             = [ 'all', '-SSLv2', '-SSLv3' ],
   Array $ssl_proxy_protocol                                 = [],
   $ssl_pass_phrase_dialog                                   = 'builtin',
   $ssl_random_seed_bytes                                    = '512',

From 47e367bb35d8a58fa9e670eac6bfebfe91b54807 Mon Sep 17 00:00:00 2001
From: Helen <helen@puppetlabs.com>
Date: Wed, 1 Aug 2018 16:41:26 +0100
Subject: [PATCH 1381/2267] Update Readme typo for ssl_protocol

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 95cc6023d1..1873e6e589 100755
--- a/README.md
+++ b/README.md
@@ -2814,7 +2814,7 @@ To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][]
 
 * `ssl_protocol`
 
-  Default: ['all', '*SSLv2', '*SSLv3'].
+  Default: ['all', '-SSLv2', '-SSLv3'].
 
 * `ssl_random_seed_bytes`
 

From 5155d749faefdae0442b32a8988ffe3c46ab3d96 Mon Sep 17 00:00:00 2001
From: K2patel <k2patel@users.noreply.github.com>
Date: Wed, 1 Aug 2018 16:05:01 -0400
Subject: [PATCH 1382/2267] Fix for MODULES-7575 reverse sort the aliases

root location alias must be defined last in order for others to work
---
 templates/vhost/_wsgi.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index 12c7826371..6632a9b8bd 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -13,14 +13,14 @@
   WSGIProcessGroup <%= @wsgi_process_group %>
 <% end -%>
 <% if @wsgi_script_aliases_match and ! @wsgi_script_aliases_match.empty? -%>
-  <%- @wsgi_script_aliases_match.keys.sort.each do |key| -%>
+  <%- @wsgi_script_aliases_match.keys.sort.reverse.each do |key| -%>
     <%- if key != '' and @wsgi_script_aliases_match[key] != ''-%>
   WSGIScriptAliasMatch <%= key %> "<%= @wsgi_script_aliases_match[key] %>"
     <%- end -%>
   <%- end -%>
 <% end -%>
 <% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
-  <%- @wsgi_script_aliases.keys.sort.each do |key| -%>
+  <%- @wsgi_script_aliases.keys.sort.reverse.each do |key| -%>
     <%- if key != '' and @wsgi_script_aliases[key] != ''-%>
       <%- if @wsgi_script_aliases[key].is_a? Array -%>
   WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key].join(' ') %>

From 4b89cf6192df14022e8a5d7fbdd76f8f7c697b13 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Mon, 6 Aug 2018 20:55:22 +0200
Subject: [PATCH 1383/2267] fix typo in the tests

This typo is present since ~ 7 months. https://github.com/puppetlabs/puppetlabs-apache/commit/02919a8295b31931efda728654ab1d69ac4771e7#diff-54659813dfca25ca1f5df88aaccb09ecL199
Nobody noticed it because there are no acceptance tests running for
everything where unless does not match. I discovered this in https://github.com/puppetlabs/puppetlabs-apache/pull/1809
---
 spec/acceptance/mod_passenger_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 20c15e4018..6c00256679 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -174,7 +174,7 @@ class { 'apache::mod::passenger': }
       unless (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') ||
              (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
              (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
-        expected_one < [%r{### Processes: [0-9]+}, %r{### Total private dirty RSS: [0-9\.]+ MB}]
+        expected_one << [%r{### Processes: [0-9]+}, %r{### Total private dirty RSS: [0-9\.]+ MB}]
       end
       it 'outputs status via passenger-memory-stats #stdout' do
         expected_one.each do |expect|

From 59260073f380c222b5704820d48b2f0c44921ad6 Mon Sep 17 00:00:00 2001
From: ehom <ehom@users.noreply.github.com>
Date: Tue, 7 Aug 2018 01:22:28 -0700
Subject: [PATCH 1384/2267] (maint) fixed typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1873e6e589..aaf53acf62 100755
--- a/README.md
+++ b/README.md
@@ -1073,7 +1073,7 @@ Default: `false`.
 
 Sets the group ID that owns any Apache processes spawned to answer requests.
 
-By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To to prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to `false`.
+By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to `false`.
 
 > **Note**: Modifying this parameter only changes the group ID that Apache uses to spawn child processes to access resources. It does not change the user that owns the parent server process.
 

From 7a3946f7a45ce3b5d7b53dab4f741ec73c4f60c2 Mon Sep 17 00:00:00 2001
From: Andreas Paul <xorpaul@gmail.com>
Date: Tue, 7 Aug 2018 15:51:13 +0200
Subject: [PATCH 1385/2267] fix apache::mod::jk typo and add hint for more info

---
 README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1873e6e589..cfe384eef2 100755
--- a/README.md
+++ b/README.md
@@ -2267,17 +2267,19 @@ Installs and manages `mod_jk`, a connector for Apache httpd redirection to old v
 
 ``` puppet
 class { '::apache::mod::jk':
-  ip           = '192.168.2.15',
-  workers_file = 'conf/workers.properties',
-  mount_file   = 'conf/uriworkermap.properties',
-  shm_file     = 'run/jk.shm',
-  shm_size     = '50M',
-  $workers_file_content = {
+  ip                   => '192.168.2.15',
+  workers_file         => 'conf/workers.properties',
+  mount_file           => 'conf/uriworkermap.properties',
+  shm_file             => 'run/jk.shm',
+  shm_size             => '50M',
+  workers_file_content => {
     <Content>
   },
 }
 ```
 
+See [templates/mod/jk/workers.properties.erb](templates/mod/jk/workers.properties.erb) for more information.
+
 **Parameters within `apache::mod::jk`**:
 
 The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for:

From 40135f8226203a5a09b410b30244c33c4b989b3b Mon Sep 17 00:00:00 2001
From: ehom <ehom@users.noreply.github.com>
Date: Tue, 7 Aug 2018 17:50:58 -0700
Subject: [PATCH 1386/2267] (maint) fixed typo

---
 README.md | 82 +++++++++++++++++++++++++++----------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index aaf53acf62..2f52cd5c7e 100755
--- a/README.md
+++ b/README.md
@@ -2426,83 +2426,83 @@ The current set of server configurations settings were taken directly from the [
 |mod_package|undef|n/a|||
 |mod_package_ensure|undef|n/a|||
 |mod_path|undef|n/a|||
-|passenger_allow_encoded_slashes|undef|[`PassengerAllowEncodedSlashes`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAllowEncodedSlashes)|server-config virutal-host htaccess directory ||
-|passenger_app_env|undef|[`PassengerAppEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppEnv)|server-config virutal-host htaccess directory ||
-|passenger_app_group_name|undef|[`PassengerAppGroupName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppGroupName)|server-config virutal-host htaccess directory ||
-|passenger_app_root|undef|[`PassengerAppRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppRoot)|server-config virutal-host htaccess directory ||
-|passenger_app_type|undef|[`PassengerAppType`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppType)|server-config virutal-host htaccess directory ||
-|passenger_base_uri|undef|[`PassengerBaseURI`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBaseURI)|server-config virutal-host htaccess directory ||
-|passenger_buffer_response|undef|[`PassengerBufferResponse`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferResponse)|server-config virutal-host htaccess directory ||
-|passenger_buffer_upload|undef|[`PassengerBufferUpload`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferUpload)|server-config virutal-host htaccess directory ||
-|passenger_concurrency_model|undef|[`PassengerConcurrencyModel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerConcurrencyModel)|server-config virutal-host htaccess directory ||
+|passenger_allow_encoded_slashes|undef|[`PassengerAllowEncodedSlashes`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAllowEncodedSlashes)|server-config virtual-host htaccess directory ||
+|passenger_app_env|undef|[`PassengerAppEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppEnv)|server-config virtual-host htaccess directory ||
+|passenger_app_group_name|undef|[`PassengerAppGroupName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppGroupName)|server-config virtual-host htaccess directory ||
+|passenger_app_root|undef|[`PassengerAppRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppRoot)|server-config virtual-host htaccess directory ||
+|passenger_app_type|undef|[`PassengerAppType`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppType)|server-config virtual-host htaccess directory ||
+|passenger_base_uri|undef|[`PassengerBaseURI`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBaseURI)|server-config virtual-host htaccess directory ||
+|passenger_buffer_response|undef|[`PassengerBufferResponse`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferResponse)|server-config virtual-host htaccess directory ||
+|passenger_buffer_upload|undef|[`PassengerBufferUpload`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferUpload)|server-config virtual-host htaccess directory ||
+|passenger_concurrency_model|undef|[`PassengerConcurrencyModel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerConcurrencyModel)|server-config virtual-host htaccess directory ||
 |passenger_conf_file|$::apache::params::passenger_conf_file|n/a|||
 |passenger_conf_package_file|$::apache::params::passenger_conf_package_file|n/a|||
 |passenger_data_buffer_dir|undef|[`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDataBufferDir)|server-config ||
 |passenger_debug_log_file|undef|PassengerDebugLogFile|server-config |This option has been renamed in version 5.0.5 to PassengerLogFile.|
-|passenger_debugger|undef|[`PassengerDebugger`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDebugger)|server-config virutal-host htaccess directory ||
+|passenger_debugger|undef|[`PassengerDebugger`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDebugger)|server-config virtual-host htaccess directory ||
 |passenger_default_group|undef|[`PassengerDefaultGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultGroup)|server-config ||
 |passenger_default_ruby|$::apache::params::passenger_default_ruby|[`PassengerDefaultRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultRuby)|server-config ||
 |passenger_default_user|undef|[`PassengerDefaultUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultUser)|server-config ||
 |passenger_disable_security_update_check|undef|[`PassengerDisableSecurityUpdateCheck`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDisableSecurityUpdateCheck)|server-config ||
-|passenger_enabled|undef|[`PassengerEnabled`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerEnabled)|server-config virutal-host htaccess directory ||
-|passenger_error_override|undef|[`PassengerErrorOverride`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerErrorOverride)|server-config virutal-host htaccess directory ||
+|passenger_enabled|undef|[`PassengerEnabled`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerEnabled)|server-config virtual-host htaccess directory ||
+|passenger_error_override|undef|[`PassengerErrorOverride`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerErrorOverride)|server-config virtual-host htaccess directory ||
 |passenger_file_descriptor_log_file|undef|[`PassengerFileDescriptorLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFileDescriptorLogFile)|server-config ||
 |passenger_fly_with|undef|[`PassengerFlyWith`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFlyWith)|server-config ||
-|passenger_force_max_concurrent_requests_per_process|undef|[`PassengerForceMaxConcurrentRequestsPerProcess`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerForceMaxConcurrentRequestsPerProcess)|server-config virutal-host htaccess directory ||
-|passenger_friendly_error_pages|undef|[`PassengerFriendlyErrorPages`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFriendlyErrorPages)|server-config virutal-host htaccess directory ||
-|passenger_group|undef|[`PassengerGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerGroup)|server-config virutal-host directory ||
-|passenger_high_performance|undef|[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerHighPerformance)|server-config virutal-host htaccess directory ||
+|passenger_force_max_concurrent_requests_per_process|undef|[`PassengerForceMaxConcurrentRequestsPerProcess`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerForceMaxConcurrentRequestsPerProcess)|server-config virtual-host htaccess directory ||
+|passenger_friendly_error_pages|undef|[`PassengerFriendlyErrorPages`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFriendlyErrorPages)|server-config virtual-host htaccess directory ||
+|passenger_group|undef|[`PassengerGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerGroup)|server-config virtual-host directory ||
+|passenger_high_performance|undef|[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerHighPerformance)|server-config virtual-host htaccess directory ||
 |passenger_installed_version|undef|n/a| |If set, will enable version checking of the passenger options against the value set.|
 |passenger_instance_registry_dir|undef|[`PassengerInstanceRegistryDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerInstanceRegistryDir)|server-config ||
-|passenger_load_shell_envvars|undef|[`PassengerLoadShellEnvvars`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLoadShellEnvvars)|server-config virutal-host htaccess directory ||
+|passenger_load_shell_envvars|undef|[`PassengerLoadShellEnvvars`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLoadShellEnvvars)|server-config virtual-host htaccess directory ||
 |passenger_log_file|undef|[`PassengerLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogFile)|server-config ||
 |passenger_log_level|undef|[`PassengerLogLevel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogLevel)|server-config ||
-|passenger_lve_min_uid|undef|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)|server-config virutal-host ||
-|passenger_max_instances|undef|[`PassengerMaxInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstances)|server-config virutal-host htaccess directory ||
+|passenger_lve_min_uid|undef|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)|server-config virtual-host ||
+|passenger_max_instances|undef|[`PassengerMaxInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstances)|server-config virtual-host htaccess directory ||
 |passenger_max_instances_per_app|undef|[`PassengerMaxInstancesPerApp`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstancesPerApp)|server-config ||
 |passenger_max_pool_size|undef|[`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPoolSize)|server-config ||
-|passenger_max_preloader_idle_time|undef|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)|server-config virutal-host ||
-|passenger_max_request_queue_size|undef|[`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestQueueSize)|server-config virutal-host htaccess directory ||
-|passenger_max_request_time|undef|[`PassengerMaxRequestTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestTime)|server-config virutal-host htaccess directory ||
-|passenger_max_requests|undef|[`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequests)|server-config virutal-host htaccess directory ||
-|passenger_memory_limit|undef|[`PassengerMemoryLimit`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMemoryLimit)|server-config virutal-host htaccess directory ||
-|passenger_meteor_app_settings|undef|[`PassengerMeteorAppSettings`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMeteorAppSettings)|server-config virutal-host htaccess directory ||
-|passenger_min_instances|undef|[`PassengerMinInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMinInstances)|server-config virutal-host htaccess directory ||
-|passenger_nodejs|undef|[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerNodejs)|server-config virutal-host htaccess directory ||
+|passenger_max_preloader_idle_time|undef|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)|server-config virtual-host ||
+|passenger_max_request_queue_size|undef|[`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestQueueSize)|server-config virtual-host htaccess directory ||
+|passenger_max_request_time|undef|[`PassengerMaxRequestTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestTime)|server-config virtual-host htaccess directory ||
+|passenger_max_requests|undef|[`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequests)|server-config virtual-host htaccess directory ||
+|passenger_memory_limit|undef|[`PassengerMemoryLimit`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMemoryLimit)|server-config virtual-host htaccess directory ||
+|passenger_meteor_app_settings|undef|[`PassengerMeteorAppSettings`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMeteorAppSettings)|server-config virtual-host htaccess directory ||
+|passenger_min_instances|undef|[`PassengerMinInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMinInstances)|server-config virtual-host htaccess directory ||
+|passenger_nodejs|undef|[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerNodejs)|server-config virtual-host htaccess directory ||
 |passenger_pool_idle_time|undef|[`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPoolIdleTime)|server-config ||
-|passenger_pre_start|undef|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)|server-config virutal-host ||
-|passenger_python|undef|[`PassengerPython`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPython)|server-config virutal-host htaccess directory ||
-|passenger_resist_deployment_errors|undef|[`PassengerResistDeploymentErrors`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResistDeploymentErrors)|server-config virutal-host htaccess directory ||
-|passenger_resolve_symlinks_in_document_root|undef|[`PassengerResolveSymlinksInDocumentRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResolveSymlinksInDocumentRoot)|server-config virutal-host htaccess directory ||
+|passenger_pre_start|undef|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)|server-config virtual-host ||
+|passenger_python|undef|[`PassengerPython`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPython)|server-config virtual-host htaccess directory ||
+|passenger_resist_deployment_errors|undef|[`PassengerResistDeploymentErrors`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResistDeploymentErrors)|server-config virtual-host htaccess directory ||
+|passenger_resolve_symlinks_in_document_root|undef|[`PassengerResolveSymlinksInDocumentRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResolveSymlinksInDocumentRoot)|server-config virtual-host htaccess directory ||
 |passenger_response_buffer_high_watermark|undef|[`PassengerResponseBufferHighWatermark`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResponseBufferHighWatermark)|server-config ||
-|passenger_restart_dir|undef|[`PassengerRestartDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRestartDir)|server-config virutal-host htaccess directory ||
+|passenger_restart_dir|undef|[`PassengerRestartDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRestartDir)|server-config virtual-host htaccess directory ||
 |passenger_rolling_restarts|undef|[`PassengerRollingRestarts`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRollingRestarts)|server-config virutal-host htaccess directory ||
 |passenger_root|$::apache::params::passenger_root|[`PassengerRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRoot)|server-config ||
 |passenger_ruby|$::apache::params::passenger_ruby|[`PassengerRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRuby)|server-config virutal-host htaccess directory ||
 |passenger_security_update_check_proxy|undef|[`PassengerSecurityUpdateCheckProxy`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSecurityUpdateCheckProxy)|server-config ||
 |passenger_show_version_in_header|undef|[`PassengerShowVersionInHeader`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerShowVersionInHeader)|server-config ||
 |passenger_socket_backlog|undef|[`PassengerSocketBacklog`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSocketBacklog)|server-config ||
-|passenger_spawn_method|undef|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)|server-config virutal-host ||
-|passenger_start_timeout|undef|[`PassengerStartTimeout`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartTimeout)|server-config virutal-host htaccess directory ||
-|passenger_startup_file|undef|[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartupFile)|server-config virutal-host htaccess directory ||
+|passenger_spawn_method|undef|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)|server-config virtual-host ||
+|passenger_start_timeout|undef|[`PassengerStartTimeout`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartTimeout)|server-config virtual-host htaccess directory ||
+|passenger_startup_file|undef|[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartupFile)|server-config virtual-host htaccess directory ||
 |passenger_stat_throttle_rate|undef|[`PassengerStatThrottleRate`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStatThrottleRate)|server-config ||
-|passenger_sticky_sessions|undef|[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessions)|server-config virutal-host htaccess directory ||
-|passenger_sticky_sessions_cookie_name|undef|[`PassengerStickySessionsCookieName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessionsCookieName)|server-config virutal-host htaccess directory ||
-|passenger_thread_count|undef|[`PassengerThreadCount`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerThreadCount)|server-config virutal-host htaccess directory ||
+|passenger_sticky_sessions|undef|[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessions)|server-config virtual-host htaccess directory ||
+|passenger_sticky_sessions_cookie_name|undef|[`PassengerStickySessionsCookieName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessionsCookieName)|server-config virtual-host htaccess directory ||
+|passenger_thread_count|undef|[`PassengerThreadCount`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerThreadCount)|server-config virtual-host htaccess directory ||
 |passenger_use_global_queue|undef|PassengerUseGlobalQueue|server-config ||
-|passenger_user|undef|[`PassengerUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUser)|server-config virutal-host directory ||
+|passenger_user|undef|[`PassengerUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUser)|server-config virtual-host directory ||
 |passenger_user_switching|undef|[`PassengerUserSwitching`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUserSwitching)|server-config ||
 |rack_auto_detect|undef|RackAutoDetect|server-config |These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
 |rack_autodetect|undef|n/a|||
 |rack_base_uri|undef|RackBaseURI|server-config |Deprecated in 3.0.0 in favor of PassengerBaseURI.|
-|rack_env|undef|[`RackEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RackEnv)|server-config virutal-host htaccess directory ||
+|rack_env|undef|[`RackEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RackEnv)|server-config virtual-host htaccess directory ||
 |rails_allow_mod_rewrite|undef|RailsAllowModRewrite|server-config |This option doesn't do anything anymore in since version 4.0.0.|
 |rails_app_spawner_idle_time|undef|RailsAppSpawnerIdleTime|server-config |This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.|
 |rails_auto_detect|undef|RailsAutoDetect|server-config |These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
 |rails_autodetect|undef|n/a|||
 |rails_base_uri|undef|RailsBaseURI|server-config |Deprecated in 3.0.0 in favor of PassengerBaseURI.|
 |rails_default_user|undef|RailsDefaultUser|server-config |Deprecated in 3.0.0 in favor of PassengerDefaultUser.|
-|rails_env|undef|[`RailsEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RailsEnv)|server-config virutal-host htaccess directory ||
+|rails_env|undef|[`RailsEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RailsEnv)|server-config virtual-host htaccess directory ||
 |rails_framework_spawner_idle_time|undef|RailsFrameworkSpawnerIdleTime|server-config |This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.|
 |rails_ruby|undef|RailsRuby|server-config |Deprecated in 3.0.0 in favor of PassengerRuby.|
 |rails_spawn_method|undef|RailsSpawnMethod|server-config |Deprecated in 3.0.0 in favor of PassengerSpawnMethod.|

From ebd6fca3a595b1879b1ce8d1a88a833eecce7c25 Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@puppet.com>
Date: Wed, 8 Aug 2018 17:57:09 +0100
Subject: [PATCH 1387/2267] (MODULES-7624) - Update README Limitations section

---
 README.md | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/README.md b/README.md
index aaf53acf62..01a7caea5c 100755
--- a/README.md
+++ b/README.md
@@ -5590,16 +5590,7 @@ most secure format supported by the most platforms.
 
 ## Limitations
 
-### General
-
-This module is CI tested against both [open source Puppet][] and [Puppet Enterprise][] on:
-
-- CentOS 5 and 6
-- Ubuntu 12.04 and 14.04
-- Debian 7
-- RHEL 5, 6, and 7
-
-This module also provides functions for other distributions and operating systems, such as FreeBSD, Gentoo, and Amazon Linux, but is not formally tested on them and are subject to regressions.
+For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apache/blob/master/metadata.json)
 
 ### FreeBSD
 

From 18e44eb06af45bd8ef809bccacbaefddf13cdb20 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 21 Aug 2018 15:27:01 +0100
Subject: [PATCH 1388/2267] (MODULES-7658) use beaker3 in puppet-module-gems

---
 .sync.yml | 11 -----------
 Gemfile   |  5 -----
 2 files changed, 16 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index d9cd2c6232..4b74c7f0f4 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -21,17 +21,6 @@ Gemfile:
           - mswin
           - mingw
           - x64_mingw
-      - gem: beaker
-        version: '~> 3.13'
-        from_env: BEAKER_VERSION
-      - gem: beaker-abs
-        from_env: BEAKER_ABS_VERSION
-        version: '~> 0.1'
-      - gem: beaker-pe
-      - gem: beaker-hostgenerator
-        from_env: BEAKER_HOSTGENERATOR_VERSION
-      - gem: beaker-rspec
-        from_env: BEAKER_RSPEC_VERSION
 
 Rakefile:
   requires:
diff --git a/Gemfile b/Gemfile
index a7ec8208c8..28126978d1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,11 +38,6 @@ end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
   gem "puppet-module-win-system-r#{minor_version}",                              require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.13')
-  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
-  gem "beaker-pe",                                                               require: false
-  gem "beaker-hostgenerator"
-  gem "beaker-rspec"
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

From 5183c032cbcba634fd3549c7ebabcea7acfd3a42 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Wed, 22 Aug 2018 14:29:36 +0100
Subject: [PATCH 1389/2267] pdksync_1.7.0-0-g57412ed

---
 .gitignore             |  1 +
 .pdkignore             |  1 +
 .rubocop.yml           |  3 ++
 .travis.yml            | 10 +++---
 Gemfile                |  5 ++-
 Rakefile               | 69 ++++++++++++++++++++++++++++++++++++++++++
 metadata.json          |  4 +--
 spec/default_facts.yml |  1 +
 spec/spec_helper.rb    | 10 +++++-
 9 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 49bc2a4014..650022e58e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.git/
 .*.sw[op]
 .metadata
 .yardoc
diff --git a/.pdkignore b/.pdkignore
index 49bc2a4014..650022e58e 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -1,3 +1,4 @@
+.git/
 .*.sw[op]
 .metadata
 .yardoc
diff --git a/.rubocop.yml b/.rubocop.yml
index bfd2cd1d5c..d3f5e22d6d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -72,6 +72,7 @@ RSpec/MessageSpies:
 Style/Documentation:
   Exclude:
   - lib/puppet/parser/functions/**/*
+  - spec/**/*
 Style/WordArray:
   EnforcedStyle: brackets
 Style/CollectionMethods:
@@ -82,6 +83,8 @@ Style/StringMethods:
   Enabled: true
 Layout/EndOfLine:
   Enabled: false
+Layout/IndentHeredoc:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
diff --git a/.travis.yml b/.travis.yml
index 16908eb668..35540cb82c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.4.1
+  - 2.4.4
 env:
   global:
     - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
@@ -24,16 +24,16 @@ matrix:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/centos-7
-      rvm: 2.4.1
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
+      rvm: 2.4.4
       script: bundle exec rake beaker
       services: docker
       sudo: required
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04
-      rvm: 2.4.1
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+      rvm: 2.4.4
       script: bundle exec rake beaker
       services: docker
       sudo: required
diff --git a/Gemfile b/Gemfile
index 28126978d1..d1932e62c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,11 +33,10 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-blacksmith", '~> 3.4',                   require: false, platforms: [:ruby]
 end
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
-  gem "puppet-module-win-system-r#{minor_version}",                              require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index ef5f69827b..a7c4d68168 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,76 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
+require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
 require 'puppet-lint/tasks/puppet-lint'
 
+def changelog_user
+  return unless Rake.application.top_level_tasks.include? "changelog"
+  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
+  raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
+  puts "GitHubChangelogGenerator user:#{returnVal}"
+  returnVal
+end
+
+def changelog_project
+  return unless Rake.application.top_level_tasks.include? "changelog"
+  returnVal = nil || JSON.load(File.read('metadata.json'))['name']
+  raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
+  puts "GitHubChangelogGenerator project:#{returnVal}"
+  returnVal
+end
+
+def changelog_future_release
+  return unless Rake.application.top_level_tasks.include? "changelog"
+  returnVal = JSON.load(File.read('metadata.json'))['version']
+  raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
+  puts "GitHubChangelogGenerator future_release:#{returnVal}"
+  returnVal
+end
+
 PuppetLint.configuration.send('disable_relative')
 
+if Bundler.rubygems.find_name('github_changelog_generator').any?
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
+    config.user = "#{changelog_user}"
+    config.project = "#{changelog_project}"
+    config.future_release = "#{changelog_future_release}"
+    config.exclude_labels = ['maintenance']
+    config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
+    config.add_pr_wo_labels = true
+    config.issues = false
+    config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
+    config.configure_sections = {
+      "Changed" => {
+        "prefix" => "### Changed",
+        "labels" => ["backwards-incompatible"],
+      },
+      "Added" => {
+        "prefix" => "### Added",
+        "labels" => ["feature", "enhancement"],
+      },
+      "Fixed" => {
+        "prefix" => "### Fixed",
+        "labels" => ["bugfix"],
+      },
+    }
+  end
+else
+  desc 'Generate a Changelog from GitHub'
+  task :changelog do
+    raise <<EOM
+The changelog tasks depends on unreleased features of the github_changelog_generator gem.
+Please manually add it to your .sync.yml for now, and run `pdk update`:
+---
+Gemfile:
+  optional:
+    ':development':
+      - gem: 'github_changelog_generator'
+        git: 'https://github.com/skywinder/github-changelog-generator'
+        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
+        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
+EOM
+  end
+end
+
diff --git a/metadata.json b/metadata.json
index 9051b27e2b..9c87db0cb3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -76,7 +76,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.5.0",
+  "pdk-version": "1.7.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-g34e3266"
+  "template-ref": "1.7.0-0-g57412ed"
 }
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index ea1e4808e3..3248be5aa6 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,6 +2,7 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
+concat_basedir: "/tmp"
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e117192684..5e721b7ff4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
@@ -34,3 +33,12 @@
     Puppet.settings[:strict] = :warning
   end
 end
+
+def ensure_module_defined(module_name)
+  module_name.split('::').reduce(Object) do |last_module, next_module|
+    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module)
+    last_module.const_get(next_module)
+  end
+end
+
+# 'spec_overrides' from sync.yml will appear below this line

From d2244aea736694d11f3e9369a4f2d72400ddcf1d Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Wed, 22 Aug 2018 16:33:00 +0100
Subject: [PATCH 1390/2267] adressing rubocop errors

---
 .rubocop_todo.yml                 | 2 --
 spec/acceptance/mod_suphp_spec.rb | 1 -
 2 files changed, 3 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7e74cd50e3..9e99e20040 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,8 +6,6 @@ RSpec/RepeatedExample:
   Enabled: false
 RSpec/ExpectInHook:
   Enabled: false
-Style/CommentedKeyword:
-  Enabled: false
 RSpec/NamedSubject:
   Enabled: false
 RSpec/VoidExpect:
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
index a2dd791f5a..6950202900 100644
--- a/spec/acceptance/mod_suphp_spec.rb
+++ b/spec/acceptance/mod_suphp_spec.rb
@@ -2,7 +2,6 @@
 
 describe 'apache::mod::suphp class', if: (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') != '16.04') do
   context 'default suphp config' do
-    # rubocop:disable Layout/IndentHeredoc : Manifest must have zero base indents
     pp = <<-MANIFEST
 class { 'apache':
   mpm_module => 'prefork',

From 41790fb089f2a2b2a0c66d3d57eaae2bbb47c269 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Fri, 24 Aug 2018 16:20:07 +0100
Subject: [PATCH 1391/2267] pdksync - (MODULES-7705) - Bumping stdlib/concat
 dependency from < 5.0.0 to < 6.0.0 (#1821)

 (MODULES-7705) - Bumping stdlib and concat requirements to 6.0.0
---
 metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index 9c87db0cb3..cd326ade6b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,11 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 5.0.0"
+      "version_requirement": ">= 4.13.1 < 6.0.0"
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 2.2.1 < 5.0.0"
+      "version_requirement": ">= 2.2.1 < 6.0.0"
     }
   ],
   "operatingsystem_support": [

From 4182e89bba356911176226edd16de29c5a562634 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Thu, 30 Aug 2018 17:07:42 +0100
Subject: [PATCH 1392/2267] (MODULES-7658) use beaker4 in puppet-module-gems

---
 spec/spec_helper_acceptance.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 469a9f18ad..4854ee1343 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,3 +1,5 @@
+require 'beaker-pe'
+require 'beaker-puppet'
 require 'puppet'
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
@@ -6,6 +8,7 @@
 require 'beaker-task_helper'
 
 run_puppet_install_helper
+configure_type_defaults_on(hosts)
 install_bolt_on(hosts) unless pe_install?
 install_module_on(hosts)
 install_module_dependencies_on(hosts)

From fb9af2f1e58cfd4f4376563c72a087391c7a5c56 Mon Sep 17 00:00:00 2001
From: ehom <ehom@users.noreply.github.com>
Date: Fri, 31 Aug 2018 17:11:36 -0700
Subject: [PATCH 1393/2267] (maint) Broken link

Resolved broken link.
Also, added text for readability
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f37cd2c59c..4c433fa930 100755
--- a/README.md
+++ b/README.md
@@ -2748,7 +2748,7 @@ Installs the [Shibboleth](http://shibboleth.net/) Apache module `mod_shib`, whic
 
 This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
 
-**Note**: The shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories. See [http://wiki.aaf.edu.au/tech-info/sp-install-guide]()
+**Note**: The Shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories. See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide).
 
 ##### Class: `apache::mod::ssl`
 

From 115f91917c7aded2e5a9163a73f6e63c170489bd Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Mon, 10 Sep 2018 16:59:47 +0100
Subject: [PATCH 1394/2267] 3.3.0 Pre Release

---
 .github_changelog_generator |    3 +
 .sync.yml                   |    6 +
 CHANGELOG.md                |   24 +-
 Gemfile                     |    1 +
 HISTORY.md                  | 1090 +++++++++++++++++++++++++++++++++++
 Rakefile                    |    2 +-
 metadata.json               |    4 +-
 7 files changed, 1124 insertions(+), 6 deletions(-)
 create mode 100644 .github_changelog_generator
 create mode 100644 HISTORY.md

diff --git a/.github_changelog_generator b/.github_changelog_generator
new file mode 100644
index 0000000000..8edccb1cce
--- /dev/null
+++ b/.github_changelog_generator
@@ -0,0 +1,3 @@
+user=puppetlabs
+project=puppetlabs-apache
+since_tag=3.4.0
diff --git a/.sync.yml b/.sync.yml
index 4b74c7f0f4..b189508aed 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -21,6 +21,12 @@ Gemfile:
           - mswin
           - mingw
           - x64_mingw
+  optional:
+    ':development':
+      - gem: 'github_changelog_generator'
+        git: 'https://github.com/skywinder/github-changelog-generator'
+        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
+        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
 
 Rakefile:
   requires:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b58a1bcae..423c21f894 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,24 @@
 # Change log
 
-All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org).
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## Supported Release [3.2.0]
+## [3.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.3.0) (2018-09-10)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.2.0...3.3.0)
+
+### Added
+
+- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1821](https://github.com/puppetlabs/puppetlabs-apache/pull/1821) ([pmcmaw](https://github.com/pmcmaw))
+- Add support for ProxyTimeout [\#1805](https://github.com/puppetlabs/puppetlabs-apache/pull/1805) ([agoodno](https://github.com/agoodno))
+- MODULES-7343: Allow overrides by adding mod\_libs in apache class [\#1800](https://github.com/puppetlabs/puppetlabs-apache/pull/1800) ([karelyatin](https://github.com/karelyatin))
+- Rework passenger VHost and Directories [\#1778](https://github.com/puppetlabs/puppetlabs-apache/pull/1778) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- MODULES-7575 reverse sort the aliases [\#1808](https://github.com/puppetlabs/puppetlabs-apache/pull/1808) ([k2patel](https://github.com/k2patel))
+- fixes for OpenSUSE ans SLES [\#1783](https://github.com/puppetlabs/puppetlabs-apache/pull/1783) ([tuxmea](https://github.com/tuxmea))
+
+## 3.2.0
 ### Summary
 This is a clean release to prepare for several planned backwards incompatible changes.
 
@@ -1093,3 +1108,6 @@ worker/prefork
 [0.5.0-rc1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.4.0...0.5.0-rc1
 [0.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.3.0...0.4.0
 [0.0.4]:https://github.com/puppetlabs/puppetlabs-apache/commits/0.0.4
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/Gemfile b/Gemfile
index d1932e62c5..05cb6e6f34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,6 +33,7 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator",                    require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
diff --git a/HISTORY.md b/HISTORY.md
new file mode 100644
index 0000000000..90e65f6584
--- /dev/null
+++ b/HISTORY.md
@@ -0,0 +1,1090 @@
+## 3.2.0
+### Summary
+This is a clean release to prepare for several planned backwards incompatible changes.
+
+#### Changed
+- Parameter `passenger_pre_start` has been moved outside of `<VirtualHost>`.
+- Apache version fact has been enabled on FreeBSD.
+- Parameter `ssl_proxyengine` has had it's default changed to false.
+
+#### Added
+- Parameter `passenger_group` can now be set in `apache::vhost`.
+- Multiple `passenger_pre_start` URIs can now be set at once.
+- Manifest `mod::auth_gssapi` has been added to allow the deployment of authorisation with kerberos, through GSSAPI.
+
+#### Removed
+- Scientific 5 and Debian 7 are no longer supported on Apache.
+
+## Supported Release [3.1.0]
+### Summary
+This release includes the module being converted using version 1.4.1 of the PDK. It also includes a couple of additional parameters added.
+
+#### Added
+- Module has been pdk converted with version 1.4.1 ([MODULES-6331](https://tickets.puppet.com/browse/MODULES-6331))
+- Parameter `ssl_cert` to provide a SSLCertificateFile option for use with SSL, optional of type String.
+- Parameter `ssl_key` to provide a SSLCertificateKey option for use with SSL, optional of type String.
+
+#### Fixed
+- Documentation updates.
+- Updates to the Japanese translation based on documentation update.
+
+## Supported Release [3.0.0]
+### Summary
+This major release changes the default value of `keepalive` to `On`. It also includes many other features and bugfixes.
+
+#### Changed
+- Default `apache::keepalive` from `Off` to `On`.
+
+#### Added
+- Class `apache::mod::data`
+- Function `apache::apache_pw_hash` function (puppet 4 port of `apache_pw_hash()`)
+- Function `apache::bool2httpd` function (puppet 4 port of `bool2httpd()`)
+- Function `apache::validate_apache_log_level` function (puppet 4 port of `validate_apache_log_level()`)
+- Parameter `apache::balancer::options` for additional directives.
+- Parameter `apache::limitreqfields` setting the LimitRequestFields directive to 100.
+- Parameter `apache::use_canonical_name` to control how httpd uses self-referential URLs.
+- Parameter `apache::mod::disk_cache::cache_ignore_headers` to ignore cache headers.
+- Parameter `apache::mod::itk::enablecapabilities` to manage ITK capabilities.
+- Parameter `apache::mod::ldap::ldap_trusted_mode` to manage trusted mode.
+- Parameters for `apache::mod::passenger`:
+  - `passenger_allow_encoded_slashes`
+  - `passenger_app_group_name`
+  - `passenger_app_root`
+  - `passenger_app_type`
+  - `passenger_base_uri`
+  - `passenger_buffer_response`
+  - `passenger_buffer_upload`
+  - `passenger_concurrency_model`
+  - `passenger_debug_log_file`
+  - `passenger_debugger`
+  - `passenger_default_group`
+  - `passenger_default_user`
+  - `passenger_disable_security_update_check`
+  - `passenger_enabled`
+  - `passenger_error_override`
+  - `passenger_file_descriptor_log_file`
+  - `passenger_fly_with`
+  - `passenger_force_max_concurrent_requests_per_process`
+  - `passenger_friendly_error_pages`
+  - `passenger_group`
+  - `passenger_installed_version`
+  - `passenger_instance_registry_dir`
+  - `passenger_load_shell_envvars`
+  - `passenger_lve_min_uid`
+  - `passenger_max_instances`
+  - `passenger_max_preloader_idle_time`
+  - `passenger_max_request_time`
+  - `passenger_memory_limit`
+  - `passenger_meteor_app_settings`
+  - `passenger_nodejs`
+  - `passenger_pre_start`
+  - `passenger_python`
+  - `passenger_resist_deployment_errors`
+  - `passenger_resolve_symlinks_in_document_root`
+  - `passenger_response_buffer_high_watermark`
+  - `passenger_restart_dir`
+  - `passenger_rolling_restarts`
+  - `passenger_security_update_check_proxy`
+  - `passenger_show_version_in_header`
+  - `passenger_socket_backlog`
+  - `passenger_start_timeout`
+  - `passenger_startup_file`
+  - `passenger_sticky_sessions`
+  - `passenger_sticky_sessions_cookie_name`
+  - `passenger_thread_count`
+  - `passenger_user`
+  - `passenger_user_switching`
+  - `rack_auto_detect`
+  - `rack_base_uri`
+  - `rack_env`
+  - `rails_allow_mod_rewrite`
+  - `rails_app_spawner_idle_time`
+  - `rails_auto_detect`
+  - `rails_base_uri`
+  - `rails_default_user`
+  - `rails_env`
+  - `rails_framework_spawner_idle_time`
+  - `rails_ruby`
+  - `rails_spawn_method`
+  - `rails_user_switching`
+  - `wsgi_auto_detect`
+- Parameter `apache::mod::prefork::listenbacklog` to set the listen backlog to 511.
+- Parameter `apache::mod::python::loadfile_name` to workaround python.load filename conflicts.
+- Parameter `apache::mod::ssl::ssl_cert` to manage the client auth cert.
+- Parameter `apache::mod::ssl::ssl_key` to manage the client auth key.
+- Parameter `apache::mod::status::requires` as an alternative to `apache::mod::status::allow_from`
+- Parameter `apache::vhost::ssl_proxy_cipher_suite` to manage that directive.
+- Parameter `apache::vhost::shib_compat_valid_user` to manage that directive.
+- Parameter `apache::vhost::use_canonical_name` to manage that directive.
+- Parameter value `mellon_session_length` for `apache::vhost::directories`
+
+### Fixed
+- `apache_version` is confined to just Linux to avoid erroring on AIX.
+- Parameter `apache::mod::jk::workers_file_content` docs typo of "mantain" instead of maintain.
+- Deduplicate `apache::mod::ldap` managing `File['ldap.conf']` to avoid resource conflicts.
+- ITK package name on Debian 9
+- Dav_svn package for SLES
+- Log client IP instead of loadbalancer IP when behind a loadbalancer.
+- `apache::mod::remoteip` now notifies the `Class['apache::service']` class instead of `Service['httpd']` to avoid restarting the service when `apache::service_manage` is false.
+- `apache::vhost::cas_scrub_request_headers` actually manages the directive.
+
+## Supported Release [2.3.1]
+### Summary
+This release fixes CVE-2018-6508 which is a potential arbitrary code execution via tasks.
+
+### Fixed
+- Fix init task for arbitrary remote code
+
+## Supported Release [2.3.0]
+### Summary
+This is a feature release. It includes a task that will reload the apache service.
+
+#### Added
+- Add a task that allows the reloading of the Apache service.
+
+## Supported Release [2.2.0]
+### Summary
+This is a maintainence and feature release. It will include updates to translations in Japanese, some maintainence and adding `PassengerSpawnMethod` to vhost.
+
+#### Added
+- `PassengerSpawnMethod` added to `vhost`.
+
+#### Changed
+- Improve version match fact for `apache_version`
+- Update to prefork.conf params for Apache 2.4
+- Updates to `CONTRIBUTING.md`
+- Do not install mod_fastcgi on el7
+- Include mod_wsgi when using wsgi options
+
+## Supported Release [2.1.0]
+### Summary
+This is a feature release including a security patch (CVE-2017-2299)
+
+#### Added
+- `apache::mod::jk` class for managing the mod_jk connector
+- `apache_pw_hash` function
+- the ProxyPass directive in location contexts
+- more Puppet 4 type validation
+- `apache::mod::macro` class for managing mod_macro
+
+#### Changed
+- $ssl_certs_dir default to `undef` for all platorms
+- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check`
+
+#### Fixed
+- issue where mod_alias was not being loaded when RedirectMatch* directives were being used ([MODULES-3942](https://tickets.puppet.com/browse/MODULES-3942))
+- issue with `$directories` parameter in `apache::vhost`
+- issue in UserDir template where the UserDir path did not match the Directory path
+- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory**
+
+#### Removed
+- support for EOL platforms: Ubuntu 10.04, 12.04 and Debian 6 (Squeeze)
+
+## Supported Release [2.0.0]
+### Summary
+Major release **removing Puppet 3 support** and other backwards-incompatible changes.
+
+#### Added
+- support for FileETag directive configurable with the `file_e_tag` parameter
+- ability to configure multiple ports per vhost
+- RequestHeader directive to vhost template ([MODULES-4156](https://tickets.puppet.com/browse/MODULES-4156))
+- customizability for AllowOverride directive in userdir.conf ([MODULES-4516](https://tickets.puppet.com/browse/MODULES-4516))
+- AdvertiseFrequency directive for cluster.conf ([MODULES-4500](https://tickets.puppet.com/browse/MODULES-4500))
+- `ssl_proxy_protocol` and `ssl_sessioncache` parameters for mod::ssl ([MODULES-4737](https://tickets.puppet.com/browse/MODULES-4737))
+- SSLCACertificateFile directive in ssl.conf configurable with `ssl_ca` parameter
+- mod::authnz_pam 
+- mod::intercept_form_submit 
+- mod::lookup_identity
+- Suse compatibility for mod::proxy_html
+- support for AddCharset directive configurable with `add_charset` parameter
+- support for SSLProxyVerifyDepth and SSLProxyCACertificateFile directives configurable with `ssl_proxy_verify_depth` and `ssl_proxy_ca_cert` respectively
+- `manage_security_crs` parameter for mod::security
+- support for LimitExcept directive configurable with `limit_except` parameter
+- support for WSGIRestrictEmbedded directive configurable with `wsgi_restrict_embedded` parameter
+- support for custom UserDir path ([MODULES-4933](https://tickets.puppet.com/browse/MODULES-4933))
+- support for PassengerMaxRequests directive configurable with `passenger_max_requests`
+- option to override module package names with `mod_packages` parameter ([MODULES-3838](https://tickets.puppet.com/browse/MODULES-3838))
+
+#### Removed
+- enclose_ipv6 as it was added to puppetlabs-stdlib
+- deprecated `$verifyServerCert` parameter from the `apache::mod::authnz_ldap` class ([MODULES-4445](https://tickets.puppet.com/browse/MODULES-4445))
+
+#### Changed
+- `keepalive` default to 'On' from 'Off'
+- Puppet version compatibility to ">= 4.7.0 < 6.0.0"
+- puppetlabs-stdlib dependency to ">= 4.12.0 < 5.0.0"
+- `ssl_cipher` to explicitly disable 3DES because of Sweet32
+
+#### Fixed
+- various issues in the vhost template
+- use of deprecated `include_src` parameter in vhost_spec
+- management of ssl.conf on RedHat systems
+- various SLES/Suse params
+- mod::cgi ordering for FreeBSD
+- issue where ProxyPreserveHost could not be set without other Proxy* directives
+- the module attempting to install proxy_html on Ubuntu Xenial and Debian Stretch
+
+## Supported Release [1.11.1]
+#### Summary
+This is a security patch release (CVE-2017-2299). These changes are also in version 2.1.0 and higher.
+
+#### Changed
+- $ssl_certs_dir default to `undef` for all platorms
+- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check`
+
+#### Fixed
+- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory** ([MODULES-5471](https://tickets.puppet.com/browse/MODULES-5471))
+
+## Supported Release [1.11.0]
+### Summary
+This release adds SLES12 Support and many more features and bugfixes.
+
+#### Features
+- (MODULES-4049) Adds SLES 12 Support
+- Adds additional directories options for LDAP Auth
+  - `auth_ldap_url`
+  - `auth_ldap_bind_dn`
+  - `auth_ldap_bind_password`
+  - `auth_ldap_group_attribute`
+  - `auth_ldap_group_attribute_is_dn`
+- Allows `mod_event` parameters to be unset
+- Allows management of default root directory access rights
+- Adds class `apache::vhosts` to create apache::vhost resources
+- Adds class `apache::mod::proxy_wstunnel`
+- Adds class `apache::mod::dumpio`
+- Adds class `apache::mod::socache_shmcb`
+- Adds class `apache::mod::authn_dbd`
+- Adds support for apache 2.4 on Amazon Linux
+- Support the newer `mod_auth_cas` config options
+- Adds `wsgi_script_aliases_match` parameter to `apache::vhost`
+- Allow to override all SecDefaultAction attributes
+- Add audit_log_relevant_status parameter to apache::mod::security
+- Allow absolute path to $apache::mod::security::activated_rules
+- Allow setting SecAuditLog
+- Adds `passenger_max_instances_per_app` to `mod::passenger`
+- Allow the proxy_via setting to be configured
+- Allow no_proxy_uris to be used within proxy_pass
+- Add rpaf.conf template parameter to `mod::rpaf`
+- Allow user to specify alternative package and library names for shibboleth module
+- Allows configuration of shibboleth lib path
+- Adds parameter `passenger_data_buffer_dir` to `mod::passenger`
+- Adds SSL stapling 
+- Allows use of `balance_manager` with `mod_proxy_balancer`
+- Raises lower bound of `stdlib` dependency to version 4.2
+- Adds support for Passenger repo on Amazon Linux
+- Add ability to set SSLStaplingReturnResponderErrors on server level 
+- (MODULES-4213) Allow global rewrite rules inheritance in vhosts
+- Moves `mod_env` to its own class and load it when required
+
+#### Bugfixes
+- Deny access to .ht and .hg, which are created by mercurial hg.
+- Instead of failing, include apache::mod::prefork in manifests/mod/itk.pp instead.
+- Only set SSLCompression when it is set to true.
+- Remove duplicate shib2 hash element
+- (MODULES-3388) Include mpm_module classes instead of class declaration
+- Updates `apache::balancer` to respect `apache::confd_dir`
+- Wrap mod_security directives in an IfModule
+- Fixes to various mods for Ubuntu Xenial
+- Fix /etc/modsecurity perms to match package
+- Fix PassengerRoot under Debian stretch
+- (MODULES-3476) Updates regex in apache_version custom fact to work with EL5
+- Dont sql_injection_attacks.data
+- Add force option to confd file resource to purge directory without warnings
+- Patch httpoxy through mod_security
+- Fixes config ordering of IncludeOptional
+- Fixes bug where port numbers were unquoted
+- Fixes bug where empty servername for vhost were written to template
+- Auto-load `slotmem_shm` and `lbmethod_byrequests` with `proxy_balancer` on 2.4
+- Simplify MPM setup on FreeBSD
+- Adds requirement for httpd package
+- Do not set ssl_certs_dir on FreeBSD
+- Fixes bug that produces a duplicate `Listen 443` after a package update on EL7
+- Fixes bug where custom facts break structured facts
+- Avoid relative classname inclusion
+- Fixes a failure in `vhost` if the first element of `$rewrites` is not a hash
+- (MODULES-3744) Process $crs_package before $modsec_dir
+- (MODULES-1491) Adds `::apache` include to mods that need it
+
+## Supported Release [1.10.0]
+#### Summary
+This release fixes backwards compatibility bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature.
+
+#### Features
+- Allow setting KeepAlive related options per vhost
+  - `apache::vhost::keepalive`
+  - `apache::vhost::keepalive_timeout`
+  - `apache::vhost::max_keepalive_requests`
+- Adds new class `apache::mod::cluster`
+
+#### Bugfixes
+- MODULES-2890: Allow php_version != 5
+- MODULES-2890: mod::php: Explicit test on jessie
+- MODULES-2890: Fix PHP on Debian stretch and Ubuntu Xenial
+- MODULES-2890: Fix mod_php SetHandler and cleanup
+- Fixed trailing slash in lib_path on Suse
+- Revert "MODULES-2956: Enable options within location block on proxy_match". Bug introduced in release 1.9.0.
+- Revert "changed rpaf Configuration Directives: RPAF -> RPAF_". Bug introduced in release 1.9.0.
+- Set actual path to apachectl on FreeBSD. Fixes snippets verification.
+
+## Supported Release [1.9.0] [DELETED]
+#### Features
+- Added `apache_version` fact
+- Added `apache::balancer::target` attribute
+- Added `apache::fastcgi::server::pass_header` attribute
+- Added ability for `apache::fastcgi::server::host` using sockets
+- Added `apache::root_directory_options` attribute
+- Added for `apache::mod::ldap`:
+  - `ldap_shared_cache_size`
+  - `ldap_cache_entries`
+  - `ldap_cache_ttl`
+  - `ldap_opcache_entries`
+  - `ldap_opcache_ttl`
+- Added `apache::mod::pagespeed::package_ensure` attribute
+- Added `apache::mod::passenger` attributes:
+  - `passenger_log_level`
+  - `manage_repo`
+- Added upstream repo for `apache::mod::passenger`
+- Added `apache::mod::proxy_fcgi` class
+- Added `apache::mod::security` attributes:
+  - `audit_log_parts`
+  - `secpcrematchlimit`
+  - `secpcrematchlimitrecursion`
+  - `secdefaultaction`
+  - `anomaly_score_blocking`
+  - `inbound_anomaly_threshold`
+  - `outbound_anomaly_threshold`
+- Added `apache::mod::ssl` attributes:
+  - `ssl_mutex`
+  - `apache_version`
+- Added ubuntu 16.04 support
+- Added `apache::mod::authnz_ldap::package_name` attribute
+- Added `apache::mod::ldap::package_name` attribute
+- Added `apache::mod::proxy::package_name` attribute
+- Added `apache::vhost` attributes:
+  - `ssl_proxy_check_peen_expire`
+  - `ssl_proxy_protocol`
+  - `logroot_owner`
+  - `logroot_group`
+  - `setenvifnocase`
+  - `passenger_user`
+  - `passenger_high_performance`
+  - `jk_mounts`
+  - `fastcgi_idle_timeout`
+  - `modsec_disable_msgs`
+  - `modsec_disable_tags`
+- Added ability for 2.4-style `RequireAll|RequireNone|RequireAny` directory permissions
+- Added ability for includes in vhost directory
+- Added directory values:
+  - `AuthMerging`
+  - `MellonSPMetadataFile`
+- Adds Configurability of Collaborative Detection Severity Levels for OWASP Core Rule Set to `apache::mod::security` class
+  - `critical_anomaly_score`
+  - `error_anomaly_score`
+  - `warning_anomaly_score`
+  - `notice_anomaly_score`
+- Adds ability to configure `info_path` in `apache::mod::info` class
+- Adds ability to configure `verify_config` in `apache::vhost::custom`
+
+#### Bugfixes
+- Fixed apache mod setup for event/worker failing syntax
+- Fixed concat deprecation warnings
+- Fixed pagespeed mod
+- Fixed service restart on mod update
+- Fixed mod dir purging to happen after package installs
+- Fixed various `apache::mod::*` file modes
+- Fixed `apache::mod::authnz_ldap` parameter `verifyServerCert` to be `verify_server_cert`
+- Fixed loadfile name in `apache::mod::fcgid`
+- Fixed `apache::mod::remoteip` to fail on apache < 2.4 (because it is not available)
+- Fixed `apache::mod::ssl::ssl_honorcipherorder` interpolation
+- Lint fixes
+- Strict variable fixes
+- Fixed `apache::vhost` attribute `redirectmatch_status` to be optional
+- Fixed SSLv3 on by default in mod\_nss
+- Fixed mod\_rpaf directive names in template
+- Fixed mod\_worker needing MaxClients with ThreadLimit
+- Fixed quoting on vhost php\_value
+- Fixed xml2enc for proxy\_html on debian
+- Fixed a problem where the apache service restarts too fast
+
+## Supported Release [1.8.1]
+### Summary
+This release includes bug fixes and a documentation update.
+
+#### Bugfixes
+- Fixes a bug that occurs when using the module in combination with puppetlabs-concat 2.x.
+- Fixes a bug where passenger.conf was vulnerable to purging.
+- Removes the pin of the concat module dependency.
+
+## Supported Release [1.8.0]
+### Summary
+This release includes a lot of bug fixes and feature updates, including support for Debian 8, as well as many test improvements.
+
+#### Features
+- Debian 8 Support.
+- Added the 'file_mode' property to allow a custom permission setting for config files.
+- Enable 'PassengerMaxRequestQueueSize' to be set for mod_passenger.
+- MODULES-2956: Enable options within location block on proxy_match.
+- Support itk on redhat.
+- Support the mod_ssl SSLProxyVerify directive.
+- Support ProxPassReverseCookieDomain directive (mod_proxy).
+- Support proxy provider for vhost directories.
+- Added new 'apache::vhost::custom' resource.
+
+#### Bugfixes
+- Fixed ProxyPassReverse configuration.
+- Fixed error in Amazon operatingsystem detection.
+- Fixed mod_security catalog ordering issues for RedHat 7.
+- Fixed paths and packages for the shib2 apache module on Debian pre Jessie.
+- Fixed EL7 directory path for apache modules.
+- Fixed validation error when empty array is passed for the rewrites parameter.
+- Idempotency fixes with regards to '::apache::mod_enable_dir'.
+- ITK fixes.
+- (MODULES-2865) fix $mpm_module logic for 'false'.
+- Set SSLProxy directives even if ssl is false, due to issue with RewriteRules and ProxyPass directives.
+- Enable setting LimitRequestFieldSize globally, and remove it from vhost.
+
+#### Improvements
+- apache::mod::php now uses FilesMatch to configure the php handler. This is following the recommended upstream configuration guidelines (http://php.net/manual/en/install.unix.apache2.php#example-20) and distribution's default config (e.g.: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/php5/vivid/view/head:/debian/php5.conf). It avoids inadvertently exposing the PHP handler to executing uploads with names like 'file.php.jpg', but might impact setups with unusual requirements.
+- Improved compatibility for Gentoo.
+- Vhosts can now be supplied with a wildcard listen value.
+- Numerous test improvements.
+- Removed workarounds for https://bz.apache.org/bugzilla/show_bug.cgi?id=38864 as the issues have been fixed in Apache.
+- Documentation updates.
+- Ensureed order of ProxyPass and ProxyPassMatch parameters.
+- Ensure that ProxyPreserveHost is set to off mode explicitly if not set in manifest.
+- Put headers and request headers before proxy with regards to template generation.
+- Added X-Forwarded-For into log_formats defaults.
+- (MODULES-2703) Allow mod pagespeed to take an array of lines as additional_configuration.
+
+## Supported Release [1.7.1]
+###Summary
+
+Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
+
+## Supported Release [1.7.0]
+### Summary
+This release includes many new features and bugfixes. There are test, documentation and misc improvements.
+
+#### Features
+- allow groups with - like vhost-users 
+- ability to enable/disable the secruleengine through a parameter
+- add mod_auth_kerb parameters to vhost
+- client auth for reverse proxy
+- support for mod_auth_mellon
+- change SSLProtocol in apache::vhost to be space separated
+- RewriteLock support
+
+#### Bugfixes
+- fix apache::mod::cgid so it can be used with the event MPM 
+- load unixd before fcgid on all operating systems
+- fixes conditional in vhost aliases
+- corrects mod_cgid worker/event defaults
+- ProxyPassMatch parameters were ending up on a newline
+- catch that mod_authz_default has been removed in Apache 2.4
+- mod::ssl fails on SLES
+- fix typo of MPM_PREFORK for FreeBSD package install 
+- install all modules before adding custom configs
+- fix acceptance testing for SSLProtocol behaviour for real
+- fix ordering issue with conf_file and ports_file 
+
+#### Known Issues
+- mod_passenger is having issues installing on Redhat/Centos 6, This is due to package dependency issues.
+
+#### Improvements
+- added docs for forcetype directive
+- removes ruby 1.8.7 from the travisci test matrix
+- readme reorganisation, minor fixups
+- support the mod_proxy ProxyPassReverseCookiePath directive
+- the purge_vhost_configs parameter is actually called purge_vhost_dir
+- add ListenBacklog for mod worker
+- deflate application/json by default 
+- install mod_authn_alias as default mod in debian for apache < 2.4
+- optionally set LimitRequestFieldSize on an apache::vhost
+- add SecUploadDir parameter to support file uploads with mod_security
+- optionally set parameters for mod_ext_filter module
+- allow SetOutputFilter to be set on a directory
+- RC4 is deprecated
+- allow empty docroot
+- add option to configure the include pattern for the vhost_enable dir
+- allow multiple IP addresses per vhost
+- default document root update for Ubuntu 14.04 and Debian 8 
+
+## Supported Release [1.6.0]
+### Summary
+This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds.
+
+#### Features
+- Add `scan_proxy_header_field` parameter to `apache::mod::geoip`
+- Add `ssl_openssl_conf_cmd` parameter to `apache::vhost` and `apache::mod::ssl`
+- Add `filters` parameter to `apache::vhost`
+
+#### Bugfixes
+- Test updates
+- Do not use systemd on Amazon Linux
+- Add missing docs for `timeout` parameter (MODULES-2148)
+
+## Supported Release [1.5.0]
+### Summary
+This release primarily adds Suse compatibility. It also adds a handful of other
+parameters for greater configuration control.
+
+#### Features
+- Add `apache::lib_path` parameter
+- Add `apache::service_restart` parameter
+- Add `apache::vhost::geoip_enable` parameter
+- Add `apache::mod::geoip` class
+- Add `apache::mod::remoteip` class
+- Add parameters to `apache::mod::expires` class
+- Add `index_style_sheet` handling to `apache::vhost::directories`
+- Add some compatibility for SLES 11
+- Add `apache::mod::ssl::ssl_sessioncachetimeout` parameter
+- Add `apache::mod::ssl::ssl_cryptodevice` parameter
+- Add `apache::mod::ssl::ssl_honorcipherorder` parameter
+- Add `apache::mod::userdir::options` parameter
+
+#### Bugfixes
+- Document `apache::user` parameter
+- Document `apache::group` parameter
+- Fix apache::dev on FreeBSD
+- Fix proxy\_connect on apache >= 2.2
+- Validate log levels better
+- Fix `apache::apache_name` for package and vhost
+- Fix Debian Jessie mod\_prefork package name
+- Fix alias module being declared even when vhost is absent
+- Fix proxy\_pass\_match handling in vhost's proxy template
+- Fix userdir access permissions
+- Fix issue where the module was trying to use systemd on Amazon Linux.
+
+## Supported Release [1.4.1]
+
+This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module.
+
+## Supported Release [1.4.0]
+###Summary
+
+This release fixes the issue where the docroot was still managed even if the default vhosts were disabled and has many other features and bugfixes including improved support for 'deny' and 'require' as arrays in the 'directories' parameter under `apache::vhost`
+
+#### Features
+- New parameters to `apache`
+  - `default_charset`
+  - `default_type`
+- New parameters to `apache::vhost`
+  - `proxy_error_override`
+  - `passenger_app_env` (MODULES-1776)
+  - `proxy_dest_match`
+  - `proxy_dest_reverse_match`
+  - `proxy_pass_match`
+  - `no_proxy_uris_match`
+- New parameters to `apache::mod::passenger`
+  - `passenger_app_env`
+  - `passenger_min_instances`
+- New parameter to `apache::mod::alias`
+  - `icons_options`
+- New classes added under `apache::mod::*`
+  - `authn_file`
+  - `authz_default`
+  - `authz_user`
+- Added support for 'deny' as an array in 'directories' under `apache::vhost`
+- Added support for RewriteMap
+- Improved support for FreeBSD. (Note: If using apache < 2.4.12, see the discussion [here](https://github.com/puppetlabs/puppetlabs-apache/pull/1030))
+- Added check for deprecated options in directories and fail when they are unsupported
+- Added gentoo compatibility
+- Added proper array support for `require` in the `directories` parameter in `apache::vhost`
+- Added support for `setenv` inside proxy locations
+
+### Bugfixes
+- Fix issue in `apache::vhost` that was preventing the scriptalias fragment from being included (MODULES-1784)
+- Install required `mod_ldap` package for EL7 (MODULES-1779)
+- Change default value of `maxrequestworkers` in `apache::mod::event` to be a multiple of the default `ThreadsPerChild` of 25.
+- Use the correct `mod_prefork` package name for trusty and jessie
+- Don't manage docroot when default vhosts are disabled
+- Ensure resources notify `Class['Apache::Service']` instead of `Service['httpd']` (MODULES-1829)
+- Change the loadfile name for `mod_passenger` so `mod_proxy` will load by default before `mod_passenger`
+- Remove old Debian work-around that removed `passenger_extra.conf`
+
+## Supported Release [1.3.0]
+### Summary
+
+This release has many new features and bugfixes, including the ability to optionally not trigger service restarts on config changes.
+
+#### Features
+- New parameters - `apache`
+  - `service_manage`
+  - `use_optional_includes`
+- New parameters - `apache::service`
+  - `service_manage`
+- New parameters - `apache::vhost`
+  - `access_logs`
+  - `php_flags`
+  - `php_values`
+  - `modsec_disable_vhost`
+  - `modsec_disable_ids`
+  - `modsec_disable_ips`
+  - `modsec_body_limit`
+- Improved FreeBSD support
+- Add ability to omit priority prefix if `$priority` is set to false
+- Add `apache::security::rule_link` define
+- Improvements to `apache::mod::*`
+  - Add `apache::mod::auth_cas` class
+  - Add `threadlimit`, `listenbacklog`, `maxrequestworkers`, `maxconnectionsperchild` parameters to `apache::mod::event`
+  - Add `apache::mod::filter` class
+  - Add `root_group` to `apache::mod::php`
+  - Add `apache::mod::proxy_connect` class
+  - Add `apache::mod::security` class
+  - Add `ssl_pass_phrase_dialog` and `ssl_random_seed_bytes` parameters to `apache::mod::ssl` (MODULES-1719)
+  - Add `status_path` parameter to `apache::mod::status`
+  - Add `apache_version` parameter to `apache::mod::version`
+  - Add `package_name` and `mod_path` parameters to `apache::mod::wsgi` (MODULES-1458)
+- Improved SCL support
+  - Add support for specifying the docroot
+- Updated `_directories.erb` to add support for SetEnv
+- Support multiple access log directives (MODULES-1382)
+- Add passenger support for Debian Jessie
+- Add support for not having puppet restart the apache service (MODULES-1559)
+
+#### Bugfixes
+- For apache 2.4 `mod_itk` requires `mod_prefork` (MODULES-825)
+- Allow SSLCACertificatePath to be unset in `apache::vhost` (MODULES-1457)
+- Load fcgid after unixd on RHEL7
+- Allow disabling default vhost for Apache 2.4
+- Test fixes
+- `mod_version` is now built-in (MODULES-1446)
+- Sort LogFormats for idempotency
+- `allow_encoded_slashes` was omitted from `apache::vhost`
+- Fix documentation bug (MODULES-1403, MODULES-1510)
+- Sort `wsgi_script_aliases` for idempotency (MODULES-1384)
+- lint fixes
+- Fix automatic version detection for Debian Jessie
+- Fix error docs and icons path for RHEL7-based systems (MODULES-1554)
+- Sort php_* hashes for idempotency (MODULES-1680)
+- Ensure `mod::setenvif` is included if needed (MODULES-1696)
+- Fix indentation in `vhost/_directories.erb` template (MODULES-1688)
+- Create symlinks on all distros if `vhost_enable_dir` is specified
+
+## Supported Release [1.2.0]
+### Summary
+
+This release features many improvements and bugfixes, including several new defines, a reworking of apache::vhost for more extensibility, and many new parameters for more customization. This release also includes improved support for strict variables and the future parser.
+
+#### Features
+- Convert apache::vhost to use concat for easier extensions
+- Test improvements
+- Synchronize files with modulesync
+- Strict variable and future parser support
+- Added apache::custom_config defined type to allow validation of configs before they are created
+- Added bool2httpd function to convert true/false to apache 'On' and 'Off'. Intended for internal use in the module.
+- Improved SCL support
+  - allow overriding of the mod_ssl package name
+- Add support for reverse_urls/ProxyPassReverse in apache::vhost
+- Add satisfy directive in apache::vhost::directories
+- Add apache::fastcgi::server defined type
+- New parameters - apache
+  - allow_encoded_slashes
+  - apache_name
+  - conf_dir
+  - default_ssl_crl_check
+  - docroot
+  - logroot_mode
+  - purge_vhost_dir
+- New parameters - apache::vhost
+  - add_default_charset
+  - allow_encoded_slashes
+  - logroot_ensure
+  - logroot_mode
+  - manage_docroot
+  - passenger_app_root
+  - passenger_min_instances
+  - passenger_pre_start
+  - passenger_ruby
+  - passenger_start_timeout
+  - proxy_preserve_host
+  - redirectmatch_dest
+  - ssl_crl_check
+  - wsgi_chunked_request
+  - wsgi_pass_authorization
+- Add support for ScriptAlias and ScriptAliasMatch in the apache::vhost::aliases parameter
+- Add support for rewrites in the apache::vhost::directories parameter
+- If the service_ensure parameter in apache::service is set to anything other than true, false, running, or stopped, ensure will not be passed to the service resource, allowing for the service to not be managed by puppet
+- Turn of SSLv3 by default
+- Improvements to apache::mod*
+  - Add restrict_access parameter to apache::mod::info
+  - Add force_language_priority and language_priority parameters to apache::mod::negotiation
+  - Add threadlimit parameter to apache::mod::worker
+  - Add content, template, and source parameters to apache::mod::php
+  - Add mod_authz_svn support via the authz_svn_enabled parameter in apache::mod::dav_svn
+  - Add loadfile_name parameter to apache::mod
+  - Add apache::mod::deflate class
+  - Add options parameter to apache::mod::fcgid
+  - Add timeouts parameter to apache::mod::reqtimeout
+  - Add apache::mod::shib
+  - Add apache_version parameter to apache::mod::ldap
+  - Add magic_file parameter to apache::mod::mime_magic
+  - Add apache_version parameter to apache::mod::pagespeed
+  - Add passenger_default_ruby parameter to apache::mod::passenger
+  - Add content, template, and source parameters to apache::mod::php
+  - Add apache_version parameter to apache::mod::proxy
+  - Add loadfiles parameter to apache::mod::proxy_html
+  - Add ssl_protocol and package_name parameters to apache::mod::ssl
+  - Add apache_version parameter to apache::mod::status
+  - Add apache_version parameter to apache::mod::userdir
+  - Add apache::mod::version class
+
+#### Bugfixes
+- Set osfamily defaults for wsgi_socket_prefix
+- Support multiple balancermembers with the same url
+- Validate apache::vhost::custom_fragment
+- Add support for itk with mod_php
+- Allow apache::vhost::ssl_certs_dir to not be set
+- Improved passenger support for Debian
+- Improved 2.4 support without mod_access_compat
+- Support for more than one 'Allow from'-directive in _directories.erb
+- Don't load systemd on Amazon linux based on CentOS6 with apache 2.4
+- Fix missing newline in ModPagespeed filter and memcached servers directive
+- Use interpolated strings instead of numbers where required by future parser
+- Make auth_require take precedence over default with apache 2.4
+- Lint fixes
+- Set default for php_admin_flags and php_admin_values to be empty hash instead of empty array
+- Correct typo in mod::pagespeed
+- spec_helper fixes
+- Install mod packages before dealing with the configuration
+- Use absolute scope to check class definition in apache::mod::php
+- Fix dependency loop in apache::vhost
+- Properly scope variables in the inline template in apache::balancer
+- Documentation clarification, typos, and formatting
+- Set apache::mod::ssl::ssl_mutex to default for debian on apache >= 2.4
+- Strict variables fixes
+- Add authn_core mode to Ubuntu trusty defaults
+- Keep default loadfile for authz_svn on Debian
+- Remove '.conf' from the site-include regexp for better Ubuntu/Debian support
+- Load unixd before fcgid for EL7
+- Fix RedirectMatch rules
+- Fix misleading error message in apache::version
+
+#### Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+## Supported Release [1.1.1]
+### Summary
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
+## Supported Release [1.1.0]
+
+### Summary
+
+This release primarily focuses on extending the httpd 2.4 support, tested
+through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger 
+4 support, as well as several new modules and important bugfixes.
+
+#### Features
+
+- Add support for RHEL7 and Ubuntu 14.04
+- More complete apache24 support
+- Passenger 4 support
+- Add support for max_keepalive_requests and log_formats parameters
+- Add mod_pagespeed support
+- Add mod_speling support
+- Added several parameters for mod_passenger
+- Added ssl_cipher parameter to apache::mod::ssl
+- Improved examples in documentation
+- Added docroot_mode, action, and suexec_user_group parameters to apache::vhost
+- Add support for custom extensions for mod_php
+- Improve proxy_html support for Debian
+
+#### Bugfixes
+
+- Remove NameVirtualHost directive for apache >= 2.4
+- Order proxy_set option so it doesn't change between runs
+- Fix inverted SSL compression
+- Fix missing ensure on concat::fragment resources
+- Fix bad dependencies in apache::mod and apache::mod::mime
+
+#### Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+## Supported Release [1.0.1]
+### Summary
+
+This is a supported release.  This release removes a testing symlink that can
+cause trouble on systems where /var is on a seperate filesystem from the
+modulepath.
+
+#### Features
+#### Bugfixes
+#### Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+ 
+## Supported Release [1.0.0]
+### Summary
+
+This is a supported release. This release introduces Apache 2.4 support for
+Debian and RHEL based osfamilies.
+
+#### Features
+
+- Add apache24 support
+- Add rewrite_base functionality to rewrites
+- Updated README documentation
+- Add WSGIApplicationGroup and WSGIImportScript directives
+
+#### Bugfixes
+
+- Replace mutating hashes with merge() for Puppet 3.5
+- Fix WSGI import_script and mod_ssl issues on Lucid
+
+#### Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+---
+
+## Supported Release [0.11.0]
+### Summary:
+
+This release adds preliminary support for Windows compatibility and multiple rewrite support.
+
+#### Backwards-incompatible Changes:
+
+- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
+  and will be removed in a future release.
+
+#### Features:
+
+- add Match directive
+- quote paths for windows compatibility
+- add auth_group_file option to README.md
+- allow AuthGroupFile directive for vhosts
+- Support Header directives in vhost context
+- Don't purge mods-available dir when separate enable dir is used
+- Fix the servername used in log file name
+- Added support for mod_include
+- Remove index parameters.
+- Support environment variable control for CustomLog
+- added redirectmatch support
+- Setting up the ability to do multiple rewrites and conditions.
+- Convert spec tests to beaker.
+- Support php_admin_(flag|value)s
+
+#### Bugfixes:
+
+- directories are either a Hash or an Array of Hashes
+- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
+- (docs) Update list of `apache::mod::[name]` classes
+- (docs) Fix apache::namevirtualhost example call style
+- Fix $ports_file reference in apache::listen.
+- Fix $ports_file reference in Namevirtualhost.
+
+
+## Supported Release [0.10.0]
+### Summary:
+
+This release adds FreeBSD osfamily support and various other improvements to some mods.
+
+#### Features:
+
+- Add suPHP_UserGroup directive to directory context
+- Add support for ScriptAliasMatch directives
+- Set SSLOptions StdEnvVars in server context
+- No implicit <Directory> entry for ScriptAlias path
+- Add support for overriding ErrorDocument
+- Add support for AliasMatch directives
+- Disable default "allow from all" in vhost-directories
+- Add WSGIPythonPath as an optional parameter to mod_wsgi. 
+- Add mod_rpaf support
+- Add directives: IndexOptions, IndexOrderDefault
+- Add ability to include additional external configurations in vhost
+- need to use the provider variable not the provider key value from the directory hash for matches
+- Support for FreeBSD and few other features
+- Add new params to apache::mod::mime class
+- Allow apache::mod to specify module id and path
+- added $server_root parameter
+- Add Allow and ExtendedStatus support to mod_status
+- Expand vhost/_directories.pp directive support
+- Add initial support for nss module (no directives in vhost template yet)
+- added peruser and event mpms
+- added $service_name parameter
+- add parameter for TraceEnable
+- Make LogLevel configurable for server and vhost
+- Add documentation about $ip
+- Add ability to pass ip (instead of wildcard) in default vhost files
+
+#### Bugfixes:
+
+- Don't listen on port or set NameVirtualHost for non-existent vhost
+- only apply Directory defaults when provider is a directory
+- Working mod_authnz_ldap support on Debian/Ubuntu
+
+## Supported Release [0.9.0]
+### Summary:
+This release adds more parameters to the base apache class and apache defined
+resource to make the module more flexible. It also adds or enhances SuPHP,
+WSGI, and Passenger mod support, and support for the ITK mpm module.
+
+#### Backwards-incompatible Changes:
+- Remove many default mods that are not normally needed.
+- Remove `rewrite_base` `apache::vhost` parameter; did not work anyway.
+- Specify dependencies on stdlib >=2.4.0 (this was already the case, but
+making explicit)
+- Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod`
+defined resource.
+
+#### Features:
+- `apache` class
+  - Add `httpd_dir` parameter to change the location of the configuration
+  files.
+  - Add `logroot` parameter to change the logroot
+  - Add `ports_file` parameter to changes the `ports.conf` file location
+  - Add `keepalive` parameter to enable persistent connections
+  - Add `keepalive_timeout` parameter to change the timeout
+  - Update `default_mods` to be able to take an array of mods to enable.
+- `apache::vhost`
+  - Add `wsgi_daemon_process`, `wsgi_daemon_process_options`,
+  `wsgi_process_group`, and `wsgi_script_aliases` parameters for per-vhost
+  WSGI configuration.
+  - Add `access_log_syslog` parameter to enable syslogging.
+  - Add `error_log_syslog` parameter to enable syslogging of errors.
+  - Add `directories` hash parameter. Please see README for documentation.
+  - Add `sslproxyengine` parameter to enable SSLProxyEngine
+  - Add `suphp_addhandler`, `suphp_engine`, and `suphp_configpath` for
+  configuring SuPHP.
+  - Add `custom_fragment` parameter to allow for arbitrary apache
+  configuration injection. (Feature pull requests are prefered over using
+  this, but it is available in a pinch.)
+- Add `apache::mod::suphp` class for configuring SuPHP.
+- Add `apache::mod::itk` class for configuring ITK mpm module.
+- Update `apache::mod::wsgi` class for global WSGI configuration with
+`wsgi_socket_prefix` and `wsgi_python_home` parameters.
+- Add README.passenger.md to document the `apache::mod::passenger` usage.
+Added `passenger_high_performance`, `passenger_pool_idle_time`,
+`passenger_max_requests`, `passenger_stat_throttle_rate`, `rack_autodetect`,
+and `rails_autodetect` parameters.
+- Separate the httpd service resource into a new `apache::service` class for
+dependency chaining of `Class['apache'] -> <resource> ~>
+Class['apache::service']`
+- Added `apache::mod::proxy_balancer` class for `apache::balancer`
+
+#### Bugfixes:
+- Change dependency to puppetlabs-concat
+- Fix ruby 1.9 bug for `a2mod`
+- Change servername to be `$::hostname` if there is no `$::fqdn`
+- Make `/etc/ssl/certs` the default ssl certs directory for RedHat non-5.
+- Make `php` the default php package for RedHat non-5.
+- Made `aliases` able to take a single alias hash instead of requiring an
+array.
+
+## Supported Release [0.8.1]
+#### Bugfixes:
+- Update `apache::mpm_module` detection for worker/prefork
+- Update `apache::mod::cgi` and `apache::mod::cgid` detection for
+worker/prefork
+
+## Supported Release [0.8.0]
+#### Features:
+- Add `servername` parameter to `apache` class
+- Add `proxy_set` parameter to `apache::balancer` define
+
+#### Bugfixes:
+- Fix ordering for multiple `apache::balancer` clusters
+- Fix symlinking for sites-available on Debian-based OSs
+- Fix dependency ordering for recursive confdir management
+- Fix `apache::mod::*` to notify the service on config change
+- Documentation updates
+
+## Supported Release [0.7.0]
+#### Changes:
+- Essentially rewrite the module -- too many to list
+- `apache::vhost` has many abilities -- see README.md for details
+- `apache::mod::*` classes provide httpd mod-loading capabilities
+- `apache` base class is much more configurable
+
+#### Bugfixes:
+- Many. And many more to come
+
+## Supported Release [0.6.0]
+- update travis tests (add more supported versions)
+- add access log_parameter
+- make purging of vhost dir configurable
+
+## Supported Release [0.4.0]
+#### Changes:
+- `include apache` is now required when using `apache::mod::*`
+
+#### Bugfixes:
+- Fix syntax for validate_re
+- Fix formatting in vhost template
+- Fix spec tests such that they pass
+
+## Supported Release [0.0.4]
+* e62e362 Fix broken tests for ssl, vhost, vhost::*
+* 42c6363 Changes to match style guide and pass puppet-lint without error
+* 42bc8ba changed name => path for file resources in order to name namevar by it's name
+* 72e13de One end too much
+* 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
+* 273f94d fix tests
+* a35ede5 (#13860) Make a2enmod/a2dismo commands optional
+* 98d774e (#13860) Autorequire Package['httpd']
+* 05fcec5 (#13073) Add missing puppet spec tests
+* 541afda (#6899) Remove virtual a2mod definition
+* 976cb69 (#13072) Move mod python and wsgi package names to params
+* 323915a (#13060) Add .gitignore to repo
+* fdf40af (#13060) Remove pkg directory from source tree
+* fd90015 Add LICENSE file and update the ModuleFile
+* d3d0d23 Re-enable local php class
+* d7516c7 Make management of firewalls configurable for vhosts
+* 60f83ba Explicitly lookup scope of apache_name in templates.
+* f4d287f (#12581) Add explicit ordering for vdir directory
+* 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
+* a776a8b (#11071) Fix to work with latest firewall module
+* 2b79e8b (#11070) Add support for Scientific Linux
+* 405b3e9 Fix for a2mod
+* 57b9048 Commit apache::vhost::redirect Manifest
+* 8862d01 Commit apache::vhost::proxy Manifest
+* d5c1fd0 Commit apache::mod::wsgi Manifest
+* a825ac7 Commit apache::mod::python Manifest
+* b77062f Commit Templates
+* 9a51b4a Vhost File Declarations
+* 6cf7312 Defaults for Parameters
+* 6a5b11a Ensure installed
+* f672e46 a2mod fix
+* 8a56ee9 add pthon support to apache
+
+[3.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/3.1.0...3.2.0
+[3.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/3.0.0...3.1.0
+[3.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.1...3.0.0
+[2.3.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.0...2.3.1
+[2.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.2.0...2.3.0
+[2.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.1.0...2.2.0
+[2.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...2.1.0
+[2.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0
+[1.11.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...1.11.1
+[1.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...1.11.0
+[1.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...1.10.0
+[1.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...1.9.0
+[1.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.0...1.8.1
+[1.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.1...1.8.0
+[1.7.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.0...1.7.1
+[1.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.6.0...1.7.0
+[1.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.5.0...1.6.0
+[1.5.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.1...1.5.0
+[1.4.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.0...1.4.1
+[1.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.3.0...1.4.0
+[1.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.2.0...1.3.0
+[1.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.1...1.2.0
+[1.1.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.0...1.1.1
+[1.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.1...1.1.0
+[1.0.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.0...1.0.1
+[1.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.11.0...1.0.0
+[0.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...0.11.0
+[0.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...0.10.0
+[0.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...0.9.0
+[0.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.8.0...0.8.1
+[0.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.7.0...0.8.0
+[0.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.6.0...0.7.0
+[0.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.5.0-rc1...0.6.0
+[0.5.0-rc1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.4.0...0.5.0-rc1
+[0.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.3.0...0.4.0
+[0.0.4]:https://github.com/puppetlabs/puppetlabs-apache/commits/0.0.4
diff --git a/Rakefile b/Rakefile
index a7c4d68168..af1ff9af2f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,7 @@ require 'puppet-lint/tasks/puppet-lint'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
+  returnVal = 'puppetlabs' || JSON.load(File.read('metadata.json'))['author']
   raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
   puts "GitHubChangelogGenerator user:#{returnVal}"
   returnVal
diff --git a/metadata.json b/metadata.json
index cd326ade6b..24921756a5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -78,5 +78,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.7.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "1.7.0-0-g57412ed"
+  "template-ref": "heads/master-0-g9c4766b"
 }

From ada4150abe83a9796f082766a3f2e1c95424ada1 Mon Sep 17 00:00:00 2001
From: ehom <ehom@users.noreply.github.com>
Date: Mon, 10 Sep 2018 20:47:30 -0700
Subject: [PATCH 1395/2267] (maint) localizability fixes

* added language identifier to code blocks
* bulleted some items
* decouple code blocks from sentence grammar
* use linked text instead of URL
---
 README.md | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 4c433fa930..2e70ce2c8e 100755
--- a/README.md
+++ b/README.md
@@ -2000,7 +2000,7 @@ Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to gener
 
 ##### Class: `apache::mod::cluster`
 
-**Note**: There is no official package available for `mod_cluster`, so you must make it available outside of the apache module. Binaries can be found at http://mod-cluster.jboss.org/
+**Note**: There is no official package available for `mod_cluster`, so you must make it available outside of the apache module. Binaries can be found at [here](http://mod-cluster.jboss.org/).
 
 ``` puppet
 class { '::apache::mod::cluster':
@@ -2310,9 +2310,9 @@ Default: '80'
 
 Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values.
 Plus, there are two global directives, 'worker.list' and 'worker.maintain'
-For example, the workers file below:
+For example, the workers file below should be parameterized as Figure 1:
 
-```
+``` puppet
 worker.list = status
 worker.list = some_name,other_name
 
@@ -2327,9 +2327,9 @@ worker.other_name.type=ajp12 (why would you?)
 worker.other_name.socket_keepalive=false
 ```
 
-Should be parameterized as:
+**Figure 1:**
 
-```
+``` puppet
 $workers_file_content = {
   worker_lists    => ['status', 'some_name,other_name'],
   worker_maintain => '60',
@@ -2348,10 +2348,12 @@ $workers_file_content = {
 
 **mount\_file\_content**
 
-Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker.
-For example, the mount file below:
+Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: 
+* uri_list&mdash;an array with URIs to be mapped to the worker 
+* comment&mdash;an optional string with a comment for the worker.
+For example, the mount file below should be parameterized as Figure 2:
 
-```
+``` puppet
 # Worker 1
 /context_1/ = worker_1
 /context_1/* = worker_1
@@ -2362,9 +2364,9 @@ For example, the mount file below:
 /context_2/* = worker_2
 ```
 
-Should be parameterized as:
+**Figure 2:**
 
-```
+``` puppet
 $mount_file_content = {
   worker_1 => {
     uri_list => ['/context_1/', '/context_1/*'],
@@ -2385,17 +2387,17 @@ Depending on how these files are specified, the class creates their final path d
 
 Examples (RHEL 6):
 
-```
+``` puppet
 shm_file => 'shm_file'
 # Ends up in
 $shm_path = '/var/log/httpd/shm_file'
 ```
-```
+``` puppet
 shm_file => '/run/shm_file'
 # Ends up in
 $shm_path = '/run/shm_file'
 ```
-```
+``` puppet
 shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 # Ends up in
 $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
@@ -3808,7 +3810,7 @@ Default is 'off'
 
 Specifies the location of the virtual host's logfiles.
 
-Default: '/var/log/<apache log location>/'.
+Default: `/var/log/<apache log location>/`.
 
 ##### `$logroot_ensure`
 

From a30524a1bf3515a6bf4f2f858294b4ca35f74799 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Wed, 12 Sep 2018 13:41:48 +0100
Subject: [PATCH 1396/2267] 3.3.0 Pre Release (#1829)

---
 .github_changelog_generator |    3 +
 .sync.yml                   |    6 +
 CHANGELOG.md                |   24 +-
 Gemfile                     |    1 +
 HISTORY.md                  | 1090 +++++++++++++++++++++++++++++++++++
 Rakefile                    |    2 +-
 metadata.json               |    4 +-
 7 files changed, 1124 insertions(+), 6 deletions(-)
 create mode 100644 .github_changelog_generator
 create mode 100644 HISTORY.md

diff --git a/.github_changelog_generator b/.github_changelog_generator
new file mode 100644
index 0000000000..8edccb1cce
--- /dev/null
+++ b/.github_changelog_generator
@@ -0,0 +1,3 @@
+user=puppetlabs
+project=puppetlabs-apache
+since_tag=3.4.0
diff --git a/.sync.yml b/.sync.yml
index 4b74c7f0f4..b189508aed 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -21,6 +21,12 @@ Gemfile:
           - mswin
           - mingw
           - x64_mingw
+  optional:
+    ':development':
+      - gem: 'github_changelog_generator'
+        git: 'https://github.com/skywinder/github-changelog-generator'
+        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
+        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
 
 Rakefile:
   requires:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b58a1bcae..423c21f894 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,24 @@
 # Change log
 
-All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org).
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## Supported Release [3.2.0]
+## [3.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.3.0) (2018-09-10)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.2.0...3.3.0)
+
+### Added
+
+- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1821](https://github.com/puppetlabs/puppetlabs-apache/pull/1821) ([pmcmaw](https://github.com/pmcmaw))
+- Add support for ProxyTimeout [\#1805](https://github.com/puppetlabs/puppetlabs-apache/pull/1805) ([agoodno](https://github.com/agoodno))
+- MODULES-7343: Allow overrides by adding mod\_libs in apache class [\#1800](https://github.com/puppetlabs/puppetlabs-apache/pull/1800) ([karelyatin](https://github.com/karelyatin))
+- Rework passenger VHost and Directories [\#1778](https://github.com/puppetlabs/puppetlabs-apache/pull/1778) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- MODULES-7575 reverse sort the aliases [\#1808](https://github.com/puppetlabs/puppetlabs-apache/pull/1808) ([k2patel](https://github.com/k2patel))
+- fixes for OpenSUSE ans SLES [\#1783](https://github.com/puppetlabs/puppetlabs-apache/pull/1783) ([tuxmea](https://github.com/tuxmea))
+
+## 3.2.0
 ### Summary
 This is a clean release to prepare for several planned backwards incompatible changes.
 
@@ -1093,3 +1108,6 @@ worker/prefork
 [0.5.0-rc1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.4.0...0.5.0-rc1
 [0.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.3.0...0.4.0
 [0.0.4]:https://github.com/puppetlabs/puppetlabs-apache/commits/0.0.4
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/Gemfile b/Gemfile
index d1932e62c5..05cb6e6f34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,6 +33,7 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator",                    require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
diff --git a/HISTORY.md b/HISTORY.md
new file mode 100644
index 0000000000..90e65f6584
--- /dev/null
+++ b/HISTORY.md
@@ -0,0 +1,1090 @@
+## 3.2.0
+### Summary
+This is a clean release to prepare for several planned backwards incompatible changes.
+
+#### Changed
+- Parameter `passenger_pre_start` has been moved outside of `<VirtualHost>`.
+- Apache version fact has been enabled on FreeBSD.
+- Parameter `ssl_proxyengine` has had it's default changed to false.
+
+#### Added
+- Parameter `passenger_group` can now be set in `apache::vhost`.
+- Multiple `passenger_pre_start` URIs can now be set at once.
+- Manifest `mod::auth_gssapi` has been added to allow the deployment of authorisation with kerberos, through GSSAPI.
+
+#### Removed
+- Scientific 5 and Debian 7 are no longer supported on Apache.
+
+## Supported Release [3.1.0]
+### Summary
+This release includes the module being converted using version 1.4.1 of the PDK. It also includes a couple of additional parameters added.
+
+#### Added
+- Module has been pdk converted with version 1.4.1 ([MODULES-6331](https://tickets.puppet.com/browse/MODULES-6331))
+- Parameter `ssl_cert` to provide a SSLCertificateFile option for use with SSL, optional of type String.
+- Parameter `ssl_key` to provide a SSLCertificateKey option for use with SSL, optional of type String.
+
+#### Fixed
+- Documentation updates.
+- Updates to the Japanese translation based on documentation update.
+
+## Supported Release [3.0.0]
+### Summary
+This major release changes the default value of `keepalive` to `On`. It also includes many other features and bugfixes.
+
+#### Changed
+- Default `apache::keepalive` from `Off` to `On`.
+
+#### Added
+- Class `apache::mod::data`
+- Function `apache::apache_pw_hash` function (puppet 4 port of `apache_pw_hash()`)
+- Function `apache::bool2httpd` function (puppet 4 port of `bool2httpd()`)
+- Function `apache::validate_apache_log_level` function (puppet 4 port of `validate_apache_log_level()`)
+- Parameter `apache::balancer::options` for additional directives.
+- Parameter `apache::limitreqfields` setting the LimitRequestFields directive to 100.
+- Parameter `apache::use_canonical_name` to control how httpd uses self-referential URLs.
+- Parameter `apache::mod::disk_cache::cache_ignore_headers` to ignore cache headers.
+- Parameter `apache::mod::itk::enablecapabilities` to manage ITK capabilities.
+- Parameter `apache::mod::ldap::ldap_trusted_mode` to manage trusted mode.
+- Parameters for `apache::mod::passenger`:
+  - `passenger_allow_encoded_slashes`
+  - `passenger_app_group_name`
+  - `passenger_app_root`
+  - `passenger_app_type`
+  - `passenger_base_uri`
+  - `passenger_buffer_response`
+  - `passenger_buffer_upload`
+  - `passenger_concurrency_model`
+  - `passenger_debug_log_file`
+  - `passenger_debugger`
+  - `passenger_default_group`
+  - `passenger_default_user`
+  - `passenger_disable_security_update_check`
+  - `passenger_enabled`
+  - `passenger_error_override`
+  - `passenger_file_descriptor_log_file`
+  - `passenger_fly_with`
+  - `passenger_force_max_concurrent_requests_per_process`
+  - `passenger_friendly_error_pages`
+  - `passenger_group`
+  - `passenger_installed_version`
+  - `passenger_instance_registry_dir`
+  - `passenger_load_shell_envvars`
+  - `passenger_lve_min_uid`
+  - `passenger_max_instances`
+  - `passenger_max_preloader_idle_time`
+  - `passenger_max_request_time`
+  - `passenger_memory_limit`
+  - `passenger_meteor_app_settings`
+  - `passenger_nodejs`
+  - `passenger_pre_start`
+  - `passenger_python`
+  - `passenger_resist_deployment_errors`
+  - `passenger_resolve_symlinks_in_document_root`
+  - `passenger_response_buffer_high_watermark`
+  - `passenger_restart_dir`
+  - `passenger_rolling_restarts`
+  - `passenger_security_update_check_proxy`
+  - `passenger_show_version_in_header`
+  - `passenger_socket_backlog`
+  - `passenger_start_timeout`
+  - `passenger_startup_file`
+  - `passenger_sticky_sessions`
+  - `passenger_sticky_sessions_cookie_name`
+  - `passenger_thread_count`
+  - `passenger_user`
+  - `passenger_user_switching`
+  - `rack_auto_detect`
+  - `rack_base_uri`
+  - `rack_env`
+  - `rails_allow_mod_rewrite`
+  - `rails_app_spawner_idle_time`
+  - `rails_auto_detect`
+  - `rails_base_uri`
+  - `rails_default_user`
+  - `rails_env`
+  - `rails_framework_spawner_idle_time`
+  - `rails_ruby`
+  - `rails_spawn_method`
+  - `rails_user_switching`
+  - `wsgi_auto_detect`
+- Parameter `apache::mod::prefork::listenbacklog` to set the listen backlog to 511.
+- Parameter `apache::mod::python::loadfile_name` to workaround python.load filename conflicts.
+- Parameter `apache::mod::ssl::ssl_cert` to manage the client auth cert.
+- Parameter `apache::mod::ssl::ssl_key` to manage the client auth key.
+- Parameter `apache::mod::status::requires` as an alternative to `apache::mod::status::allow_from`
+- Parameter `apache::vhost::ssl_proxy_cipher_suite` to manage that directive.
+- Parameter `apache::vhost::shib_compat_valid_user` to manage that directive.
+- Parameter `apache::vhost::use_canonical_name` to manage that directive.
+- Parameter value `mellon_session_length` for `apache::vhost::directories`
+
+### Fixed
+- `apache_version` is confined to just Linux to avoid erroring on AIX.
+- Parameter `apache::mod::jk::workers_file_content` docs typo of "mantain" instead of maintain.
+- Deduplicate `apache::mod::ldap` managing `File['ldap.conf']` to avoid resource conflicts.
+- ITK package name on Debian 9
+- Dav_svn package for SLES
+- Log client IP instead of loadbalancer IP when behind a loadbalancer.
+- `apache::mod::remoteip` now notifies the `Class['apache::service']` class instead of `Service['httpd']` to avoid restarting the service when `apache::service_manage` is false.
+- `apache::vhost::cas_scrub_request_headers` actually manages the directive.
+
+## Supported Release [2.3.1]
+### Summary
+This release fixes CVE-2018-6508 which is a potential arbitrary code execution via tasks.
+
+### Fixed
+- Fix init task for arbitrary remote code
+
+## Supported Release [2.3.0]
+### Summary
+This is a feature release. It includes a task that will reload the apache service.
+
+#### Added
+- Add a task that allows the reloading of the Apache service.
+
+## Supported Release [2.2.0]
+### Summary
+This is a maintainence and feature release. It will include updates to translations in Japanese, some maintainence and adding `PassengerSpawnMethod` to vhost.
+
+#### Added
+- `PassengerSpawnMethod` added to `vhost`.
+
+#### Changed
+- Improve version match fact for `apache_version`
+- Update to prefork.conf params for Apache 2.4
+- Updates to `CONTRIBUTING.md`
+- Do not install mod_fastcgi on el7
+- Include mod_wsgi when using wsgi options
+
+## Supported Release [2.1.0]
+### Summary
+This is a feature release including a security patch (CVE-2017-2299)
+
+#### Added
+- `apache::mod::jk` class for managing the mod_jk connector
+- `apache_pw_hash` function
+- the ProxyPass directive in location contexts
+- more Puppet 4 type validation
+- `apache::mod::macro` class for managing mod_macro
+
+#### Changed
+- $ssl_certs_dir default to `undef` for all platorms
+- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check`
+
+#### Fixed
+- issue where mod_alias was not being loaded when RedirectMatch* directives were being used ([MODULES-3942](https://tickets.puppet.com/browse/MODULES-3942))
+- issue with `$directories` parameter in `apache::vhost`
+- issue in UserDir template where the UserDir path did not match the Directory path
+- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory**
+
+#### Removed
+- support for EOL platforms: Ubuntu 10.04, 12.04 and Debian 6 (Squeeze)
+
+## Supported Release [2.0.0]
+### Summary
+Major release **removing Puppet 3 support** and other backwards-incompatible changes.
+
+#### Added
+- support for FileETag directive configurable with the `file_e_tag` parameter
+- ability to configure multiple ports per vhost
+- RequestHeader directive to vhost template ([MODULES-4156](https://tickets.puppet.com/browse/MODULES-4156))
+- customizability for AllowOverride directive in userdir.conf ([MODULES-4516](https://tickets.puppet.com/browse/MODULES-4516))
+- AdvertiseFrequency directive for cluster.conf ([MODULES-4500](https://tickets.puppet.com/browse/MODULES-4500))
+- `ssl_proxy_protocol` and `ssl_sessioncache` parameters for mod::ssl ([MODULES-4737](https://tickets.puppet.com/browse/MODULES-4737))
+- SSLCACertificateFile directive in ssl.conf configurable with `ssl_ca` parameter
+- mod::authnz_pam 
+- mod::intercept_form_submit 
+- mod::lookup_identity
+- Suse compatibility for mod::proxy_html
+- support for AddCharset directive configurable with `add_charset` parameter
+- support for SSLProxyVerifyDepth and SSLProxyCACertificateFile directives configurable with `ssl_proxy_verify_depth` and `ssl_proxy_ca_cert` respectively
+- `manage_security_crs` parameter for mod::security
+- support for LimitExcept directive configurable with `limit_except` parameter
+- support for WSGIRestrictEmbedded directive configurable with `wsgi_restrict_embedded` parameter
+- support for custom UserDir path ([MODULES-4933](https://tickets.puppet.com/browse/MODULES-4933))
+- support for PassengerMaxRequests directive configurable with `passenger_max_requests`
+- option to override module package names with `mod_packages` parameter ([MODULES-3838](https://tickets.puppet.com/browse/MODULES-3838))
+
+#### Removed
+- enclose_ipv6 as it was added to puppetlabs-stdlib
+- deprecated `$verifyServerCert` parameter from the `apache::mod::authnz_ldap` class ([MODULES-4445](https://tickets.puppet.com/browse/MODULES-4445))
+
+#### Changed
+- `keepalive` default to 'On' from 'Off'
+- Puppet version compatibility to ">= 4.7.0 < 6.0.0"
+- puppetlabs-stdlib dependency to ">= 4.12.0 < 5.0.0"
+- `ssl_cipher` to explicitly disable 3DES because of Sweet32
+
+#### Fixed
+- various issues in the vhost template
+- use of deprecated `include_src` parameter in vhost_spec
+- management of ssl.conf on RedHat systems
+- various SLES/Suse params
+- mod::cgi ordering for FreeBSD
+- issue where ProxyPreserveHost could not be set without other Proxy* directives
+- the module attempting to install proxy_html on Ubuntu Xenial and Debian Stretch
+
+## Supported Release [1.11.1]
+#### Summary
+This is a security patch release (CVE-2017-2299). These changes are also in version 2.1.0 and higher.
+
+#### Changed
+- $ssl_certs_dir default to `undef` for all platorms
+- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check`
+
+#### Fixed
+- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory** ([MODULES-5471](https://tickets.puppet.com/browse/MODULES-5471))
+
+## Supported Release [1.11.0]
+### Summary
+This release adds SLES12 Support and many more features and bugfixes.
+
+#### Features
+- (MODULES-4049) Adds SLES 12 Support
+- Adds additional directories options for LDAP Auth
+  - `auth_ldap_url`
+  - `auth_ldap_bind_dn`
+  - `auth_ldap_bind_password`
+  - `auth_ldap_group_attribute`
+  - `auth_ldap_group_attribute_is_dn`
+- Allows `mod_event` parameters to be unset
+- Allows management of default root directory access rights
+- Adds class `apache::vhosts` to create apache::vhost resources
+- Adds class `apache::mod::proxy_wstunnel`
+- Adds class `apache::mod::dumpio`
+- Adds class `apache::mod::socache_shmcb`
+- Adds class `apache::mod::authn_dbd`
+- Adds support for apache 2.4 on Amazon Linux
+- Support the newer `mod_auth_cas` config options
+- Adds `wsgi_script_aliases_match` parameter to `apache::vhost`
+- Allow to override all SecDefaultAction attributes
+- Add audit_log_relevant_status parameter to apache::mod::security
+- Allow absolute path to $apache::mod::security::activated_rules
+- Allow setting SecAuditLog
+- Adds `passenger_max_instances_per_app` to `mod::passenger`
+- Allow the proxy_via setting to be configured
+- Allow no_proxy_uris to be used within proxy_pass
+- Add rpaf.conf template parameter to `mod::rpaf`
+- Allow user to specify alternative package and library names for shibboleth module
+- Allows configuration of shibboleth lib path
+- Adds parameter `passenger_data_buffer_dir` to `mod::passenger`
+- Adds SSL stapling 
+- Allows use of `balance_manager` with `mod_proxy_balancer`
+- Raises lower bound of `stdlib` dependency to version 4.2
+- Adds support for Passenger repo on Amazon Linux
+- Add ability to set SSLStaplingReturnResponderErrors on server level 
+- (MODULES-4213) Allow global rewrite rules inheritance in vhosts
+- Moves `mod_env` to its own class and load it when required
+
+#### Bugfixes
+- Deny access to .ht and .hg, which are created by mercurial hg.
+- Instead of failing, include apache::mod::prefork in manifests/mod/itk.pp instead.
+- Only set SSLCompression when it is set to true.
+- Remove duplicate shib2 hash element
+- (MODULES-3388) Include mpm_module classes instead of class declaration
+- Updates `apache::balancer` to respect `apache::confd_dir`
+- Wrap mod_security directives in an IfModule
+- Fixes to various mods for Ubuntu Xenial
+- Fix /etc/modsecurity perms to match package
+- Fix PassengerRoot under Debian stretch
+- (MODULES-3476) Updates regex in apache_version custom fact to work with EL5
+- Dont sql_injection_attacks.data
+- Add force option to confd file resource to purge directory without warnings
+- Patch httpoxy through mod_security
+- Fixes config ordering of IncludeOptional
+- Fixes bug where port numbers were unquoted
+- Fixes bug where empty servername for vhost were written to template
+- Auto-load `slotmem_shm` and `lbmethod_byrequests` with `proxy_balancer` on 2.4
+- Simplify MPM setup on FreeBSD
+- Adds requirement for httpd package
+- Do not set ssl_certs_dir on FreeBSD
+- Fixes bug that produces a duplicate `Listen 443` after a package update on EL7
+- Fixes bug where custom facts break structured facts
+- Avoid relative classname inclusion
+- Fixes a failure in `vhost` if the first element of `$rewrites` is not a hash
+- (MODULES-3744) Process $crs_package before $modsec_dir
+- (MODULES-1491) Adds `::apache` include to mods that need it
+
+## Supported Release [1.10.0]
+#### Summary
+This release fixes backwards compatibility bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature.
+
+#### Features
+- Allow setting KeepAlive related options per vhost
+  - `apache::vhost::keepalive`
+  - `apache::vhost::keepalive_timeout`
+  - `apache::vhost::max_keepalive_requests`
+- Adds new class `apache::mod::cluster`
+
+#### Bugfixes
+- MODULES-2890: Allow php_version != 5
+- MODULES-2890: mod::php: Explicit test on jessie
+- MODULES-2890: Fix PHP on Debian stretch and Ubuntu Xenial
+- MODULES-2890: Fix mod_php SetHandler and cleanup
+- Fixed trailing slash in lib_path on Suse
+- Revert "MODULES-2956: Enable options within location block on proxy_match". Bug introduced in release 1.9.0.
+- Revert "changed rpaf Configuration Directives: RPAF -> RPAF_". Bug introduced in release 1.9.0.
+- Set actual path to apachectl on FreeBSD. Fixes snippets verification.
+
+## Supported Release [1.9.0] [DELETED]
+#### Features
+- Added `apache_version` fact
+- Added `apache::balancer::target` attribute
+- Added `apache::fastcgi::server::pass_header` attribute
+- Added ability for `apache::fastcgi::server::host` using sockets
+- Added `apache::root_directory_options` attribute
+- Added for `apache::mod::ldap`:
+  - `ldap_shared_cache_size`
+  - `ldap_cache_entries`
+  - `ldap_cache_ttl`
+  - `ldap_opcache_entries`
+  - `ldap_opcache_ttl`
+- Added `apache::mod::pagespeed::package_ensure` attribute
+- Added `apache::mod::passenger` attributes:
+  - `passenger_log_level`
+  - `manage_repo`
+- Added upstream repo for `apache::mod::passenger`
+- Added `apache::mod::proxy_fcgi` class
+- Added `apache::mod::security` attributes:
+  - `audit_log_parts`
+  - `secpcrematchlimit`
+  - `secpcrematchlimitrecursion`
+  - `secdefaultaction`
+  - `anomaly_score_blocking`
+  - `inbound_anomaly_threshold`
+  - `outbound_anomaly_threshold`
+- Added `apache::mod::ssl` attributes:
+  - `ssl_mutex`
+  - `apache_version`
+- Added ubuntu 16.04 support
+- Added `apache::mod::authnz_ldap::package_name` attribute
+- Added `apache::mod::ldap::package_name` attribute
+- Added `apache::mod::proxy::package_name` attribute
+- Added `apache::vhost` attributes:
+  - `ssl_proxy_check_peen_expire`
+  - `ssl_proxy_protocol`
+  - `logroot_owner`
+  - `logroot_group`
+  - `setenvifnocase`
+  - `passenger_user`
+  - `passenger_high_performance`
+  - `jk_mounts`
+  - `fastcgi_idle_timeout`
+  - `modsec_disable_msgs`
+  - `modsec_disable_tags`
+- Added ability for 2.4-style `RequireAll|RequireNone|RequireAny` directory permissions
+- Added ability for includes in vhost directory
+- Added directory values:
+  - `AuthMerging`
+  - `MellonSPMetadataFile`
+- Adds Configurability of Collaborative Detection Severity Levels for OWASP Core Rule Set to `apache::mod::security` class
+  - `critical_anomaly_score`
+  - `error_anomaly_score`
+  - `warning_anomaly_score`
+  - `notice_anomaly_score`
+- Adds ability to configure `info_path` in `apache::mod::info` class
+- Adds ability to configure `verify_config` in `apache::vhost::custom`
+
+#### Bugfixes
+- Fixed apache mod setup for event/worker failing syntax
+- Fixed concat deprecation warnings
+- Fixed pagespeed mod
+- Fixed service restart on mod update
+- Fixed mod dir purging to happen after package installs
+- Fixed various `apache::mod::*` file modes
+- Fixed `apache::mod::authnz_ldap` parameter `verifyServerCert` to be `verify_server_cert`
+- Fixed loadfile name in `apache::mod::fcgid`
+- Fixed `apache::mod::remoteip` to fail on apache < 2.4 (because it is not available)
+- Fixed `apache::mod::ssl::ssl_honorcipherorder` interpolation
+- Lint fixes
+- Strict variable fixes
+- Fixed `apache::vhost` attribute `redirectmatch_status` to be optional
+- Fixed SSLv3 on by default in mod\_nss
+- Fixed mod\_rpaf directive names in template
+- Fixed mod\_worker needing MaxClients with ThreadLimit
+- Fixed quoting on vhost php\_value
+- Fixed xml2enc for proxy\_html on debian
+- Fixed a problem where the apache service restarts too fast
+
+## Supported Release [1.8.1]
+### Summary
+This release includes bug fixes and a documentation update.
+
+#### Bugfixes
+- Fixes a bug that occurs when using the module in combination with puppetlabs-concat 2.x.
+- Fixes a bug where passenger.conf was vulnerable to purging.
+- Removes the pin of the concat module dependency.
+
+## Supported Release [1.8.0]
+### Summary
+This release includes a lot of bug fixes and feature updates, including support for Debian 8, as well as many test improvements.
+
+#### Features
+- Debian 8 Support.
+- Added the 'file_mode' property to allow a custom permission setting for config files.
+- Enable 'PassengerMaxRequestQueueSize' to be set for mod_passenger.
+- MODULES-2956: Enable options within location block on proxy_match.
+- Support itk on redhat.
+- Support the mod_ssl SSLProxyVerify directive.
+- Support ProxPassReverseCookieDomain directive (mod_proxy).
+- Support proxy provider for vhost directories.
+- Added new 'apache::vhost::custom' resource.
+
+#### Bugfixes
+- Fixed ProxyPassReverse configuration.
+- Fixed error in Amazon operatingsystem detection.
+- Fixed mod_security catalog ordering issues for RedHat 7.
+- Fixed paths and packages for the shib2 apache module on Debian pre Jessie.
+- Fixed EL7 directory path for apache modules.
+- Fixed validation error when empty array is passed for the rewrites parameter.
+- Idempotency fixes with regards to '::apache::mod_enable_dir'.
+- ITK fixes.
+- (MODULES-2865) fix $mpm_module logic for 'false'.
+- Set SSLProxy directives even if ssl is false, due to issue with RewriteRules and ProxyPass directives.
+- Enable setting LimitRequestFieldSize globally, and remove it from vhost.
+
+#### Improvements
+- apache::mod::php now uses FilesMatch to configure the php handler. This is following the recommended upstream configuration guidelines (http://php.net/manual/en/install.unix.apache2.php#example-20) and distribution's default config (e.g.: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/php5/vivid/view/head:/debian/php5.conf). It avoids inadvertently exposing the PHP handler to executing uploads with names like 'file.php.jpg', but might impact setups with unusual requirements.
+- Improved compatibility for Gentoo.
+- Vhosts can now be supplied with a wildcard listen value.
+- Numerous test improvements.
+- Removed workarounds for https://bz.apache.org/bugzilla/show_bug.cgi?id=38864 as the issues have been fixed in Apache.
+- Documentation updates.
+- Ensureed order of ProxyPass and ProxyPassMatch parameters.
+- Ensure that ProxyPreserveHost is set to off mode explicitly if not set in manifest.
+- Put headers and request headers before proxy with regards to template generation.
+- Added X-Forwarded-For into log_formats defaults.
+- (MODULES-2703) Allow mod pagespeed to take an array of lines as additional_configuration.
+
+## Supported Release [1.7.1]
+###Summary
+
+Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
+
+## Supported Release [1.7.0]
+### Summary
+This release includes many new features and bugfixes. There are test, documentation and misc improvements.
+
+#### Features
+- allow groups with - like vhost-users 
+- ability to enable/disable the secruleengine through a parameter
+- add mod_auth_kerb parameters to vhost
+- client auth for reverse proxy
+- support for mod_auth_mellon
+- change SSLProtocol in apache::vhost to be space separated
+- RewriteLock support
+
+#### Bugfixes
+- fix apache::mod::cgid so it can be used with the event MPM 
+- load unixd before fcgid on all operating systems
+- fixes conditional in vhost aliases
+- corrects mod_cgid worker/event defaults
+- ProxyPassMatch parameters were ending up on a newline
+- catch that mod_authz_default has been removed in Apache 2.4
+- mod::ssl fails on SLES
+- fix typo of MPM_PREFORK for FreeBSD package install 
+- install all modules before adding custom configs
+- fix acceptance testing for SSLProtocol behaviour for real
+- fix ordering issue with conf_file and ports_file 
+
+#### Known Issues
+- mod_passenger is having issues installing on Redhat/Centos 6, This is due to package dependency issues.
+
+#### Improvements
+- added docs for forcetype directive
+- removes ruby 1.8.7 from the travisci test matrix
+- readme reorganisation, minor fixups
+- support the mod_proxy ProxyPassReverseCookiePath directive
+- the purge_vhost_configs parameter is actually called purge_vhost_dir
+- add ListenBacklog for mod worker
+- deflate application/json by default 
+- install mod_authn_alias as default mod in debian for apache < 2.4
+- optionally set LimitRequestFieldSize on an apache::vhost
+- add SecUploadDir parameter to support file uploads with mod_security
+- optionally set parameters for mod_ext_filter module
+- allow SetOutputFilter to be set on a directory
+- RC4 is deprecated
+- allow empty docroot
+- add option to configure the include pattern for the vhost_enable dir
+- allow multiple IP addresses per vhost
+- default document root update for Ubuntu 14.04 and Debian 8 
+
+## Supported Release [1.6.0]
+### Summary
+This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds.
+
+#### Features
+- Add `scan_proxy_header_field` parameter to `apache::mod::geoip`
+- Add `ssl_openssl_conf_cmd` parameter to `apache::vhost` and `apache::mod::ssl`
+- Add `filters` parameter to `apache::vhost`
+
+#### Bugfixes
+- Test updates
+- Do not use systemd on Amazon Linux
+- Add missing docs for `timeout` parameter (MODULES-2148)
+
+## Supported Release [1.5.0]
+### Summary
+This release primarily adds Suse compatibility. It also adds a handful of other
+parameters for greater configuration control.
+
+#### Features
+- Add `apache::lib_path` parameter
+- Add `apache::service_restart` parameter
+- Add `apache::vhost::geoip_enable` parameter
+- Add `apache::mod::geoip` class
+- Add `apache::mod::remoteip` class
+- Add parameters to `apache::mod::expires` class
+- Add `index_style_sheet` handling to `apache::vhost::directories`
+- Add some compatibility for SLES 11
+- Add `apache::mod::ssl::ssl_sessioncachetimeout` parameter
+- Add `apache::mod::ssl::ssl_cryptodevice` parameter
+- Add `apache::mod::ssl::ssl_honorcipherorder` parameter
+- Add `apache::mod::userdir::options` parameter
+
+#### Bugfixes
+- Document `apache::user` parameter
+- Document `apache::group` parameter
+- Fix apache::dev on FreeBSD
+- Fix proxy\_connect on apache >= 2.2
+- Validate log levels better
+- Fix `apache::apache_name` for package and vhost
+- Fix Debian Jessie mod\_prefork package name
+- Fix alias module being declared even when vhost is absent
+- Fix proxy\_pass\_match handling in vhost's proxy template
+- Fix userdir access permissions
+- Fix issue where the module was trying to use systemd on Amazon Linux.
+
+## Supported Release [1.4.1]
+
+This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module.
+
+## Supported Release [1.4.0]
+###Summary
+
+This release fixes the issue where the docroot was still managed even if the default vhosts were disabled and has many other features and bugfixes including improved support for 'deny' and 'require' as arrays in the 'directories' parameter under `apache::vhost`
+
+#### Features
+- New parameters to `apache`
+  - `default_charset`
+  - `default_type`
+- New parameters to `apache::vhost`
+  - `proxy_error_override`
+  - `passenger_app_env` (MODULES-1776)
+  - `proxy_dest_match`
+  - `proxy_dest_reverse_match`
+  - `proxy_pass_match`
+  - `no_proxy_uris_match`
+- New parameters to `apache::mod::passenger`
+  - `passenger_app_env`
+  - `passenger_min_instances`
+- New parameter to `apache::mod::alias`
+  - `icons_options`
+- New classes added under `apache::mod::*`
+  - `authn_file`
+  - `authz_default`
+  - `authz_user`
+- Added support for 'deny' as an array in 'directories' under `apache::vhost`
+- Added support for RewriteMap
+- Improved support for FreeBSD. (Note: If using apache < 2.4.12, see the discussion [here](https://github.com/puppetlabs/puppetlabs-apache/pull/1030))
+- Added check for deprecated options in directories and fail when they are unsupported
+- Added gentoo compatibility
+- Added proper array support for `require` in the `directories` parameter in `apache::vhost`
+- Added support for `setenv` inside proxy locations
+
+### Bugfixes
+- Fix issue in `apache::vhost` that was preventing the scriptalias fragment from being included (MODULES-1784)
+- Install required `mod_ldap` package for EL7 (MODULES-1779)
+- Change default value of `maxrequestworkers` in `apache::mod::event` to be a multiple of the default `ThreadsPerChild` of 25.
+- Use the correct `mod_prefork` package name for trusty and jessie
+- Don't manage docroot when default vhosts are disabled
+- Ensure resources notify `Class['Apache::Service']` instead of `Service['httpd']` (MODULES-1829)
+- Change the loadfile name for `mod_passenger` so `mod_proxy` will load by default before `mod_passenger`
+- Remove old Debian work-around that removed `passenger_extra.conf`
+
+## Supported Release [1.3.0]
+### Summary
+
+This release has many new features and bugfixes, including the ability to optionally not trigger service restarts on config changes.
+
+#### Features
+- New parameters - `apache`
+  - `service_manage`
+  - `use_optional_includes`
+- New parameters - `apache::service`
+  - `service_manage`
+- New parameters - `apache::vhost`
+  - `access_logs`
+  - `php_flags`
+  - `php_values`
+  - `modsec_disable_vhost`
+  - `modsec_disable_ids`
+  - `modsec_disable_ips`
+  - `modsec_body_limit`
+- Improved FreeBSD support
+- Add ability to omit priority prefix if `$priority` is set to false
+- Add `apache::security::rule_link` define
+- Improvements to `apache::mod::*`
+  - Add `apache::mod::auth_cas` class
+  - Add `threadlimit`, `listenbacklog`, `maxrequestworkers`, `maxconnectionsperchild` parameters to `apache::mod::event`
+  - Add `apache::mod::filter` class
+  - Add `root_group` to `apache::mod::php`
+  - Add `apache::mod::proxy_connect` class
+  - Add `apache::mod::security` class
+  - Add `ssl_pass_phrase_dialog` and `ssl_random_seed_bytes` parameters to `apache::mod::ssl` (MODULES-1719)
+  - Add `status_path` parameter to `apache::mod::status`
+  - Add `apache_version` parameter to `apache::mod::version`
+  - Add `package_name` and `mod_path` parameters to `apache::mod::wsgi` (MODULES-1458)
+- Improved SCL support
+  - Add support for specifying the docroot
+- Updated `_directories.erb` to add support for SetEnv
+- Support multiple access log directives (MODULES-1382)
+- Add passenger support for Debian Jessie
+- Add support for not having puppet restart the apache service (MODULES-1559)
+
+#### Bugfixes
+- For apache 2.4 `mod_itk` requires `mod_prefork` (MODULES-825)
+- Allow SSLCACertificatePath to be unset in `apache::vhost` (MODULES-1457)
+- Load fcgid after unixd on RHEL7
+- Allow disabling default vhost for Apache 2.4
+- Test fixes
+- `mod_version` is now built-in (MODULES-1446)
+- Sort LogFormats for idempotency
+- `allow_encoded_slashes` was omitted from `apache::vhost`
+- Fix documentation bug (MODULES-1403, MODULES-1510)
+- Sort `wsgi_script_aliases` for idempotency (MODULES-1384)
+- lint fixes
+- Fix automatic version detection for Debian Jessie
+- Fix error docs and icons path for RHEL7-based systems (MODULES-1554)
+- Sort php_* hashes for idempotency (MODULES-1680)
+- Ensure `mod::setenvif` is included if needed (MODULES-1696)
+- Fix indentation in `vhost/_directories.erb` template (MODULES-1688)
+- Create symlinks on all distros if `vhost_enable_dir` is specified
+
+## Supported Release [1.2.0]
+### Summary
+
+This release features many improvements and bugfixes, including several new defines, a reworking of apache::vhost for more extensibility, and many new parameters for more customization. This release also includes improved support for strict variables and the future parser.
+
+#### Features
+- Convert apache::vhost to use concat for easier extensions
+- Test improvements
+- Synchronize files with modulesync
+- Strict variable and future parser support
+- Added apache::custom_config defined type to allow validation of configs before they are created
+- Added bool2httpd function to convert true/false to apache 'On' and 'Off'. Intended for internal use in the module.
+- Improved SCL support
+  - allow overriding of the mod_ssl package name
+- Add support for reverse_urls/ProxyPassReverse in apache::vhost
+- Add satisfy directive in apache::vhost::directories
+- Add apache::fastcgi::server defined type
+- New parameters - apache
+  - allow_encoded_slashes
+  - apache_name
+  - conf_dir
+  - default_ssl_crl_check
+  - docroot
+  - logroot_mode
+  - purge_vhost_dir
+- New parameters - apache::vhost
+  - add_default_charset
+  - allow_encoded_slashes
+  - logroot_ensure
+  - logroot_mode
+  - manage_docroot
+  - passenger_app_root
+  - passenger_min_instances
+  - passenger_pre_start
+  - passenger_ruby
+  - passenger_start_timeout
+  - proxy_preserve_host
+  - redirectmatch_dest
+  - ssl_crl_check
+  - wsgi_chunked_request
+  - wsgi_pass_authorization
+- Add support for ScriptAlias and ScriptAliasMatch in the apache::vhost::aliases parameter
+- Add support for rewrites in the apache::vhost::directories parameter
+- If the service_ensure parameter in apache::service is set to anything other than true, false, running, or stopped, ensure will not be passed to the service resource, allowing for the service to not be managed by puppet
+- Turn of SSLv3 by default
+- Improvements to apache::mod*
+  - Add restrict_access parameter to apache::mod::info
+  - Add force_language_priority and language_priority parameters to apache::mod::negotiation
+  - Add threadlimit parameter to apache::mod::worker
+  - Add content, template, and source parameters to apache::mod::php
+  - Add mod_authz_svn support via the authz_svn_enabled parameter in apache::mod::dav_svn
+  - Add loadfile_name parameter to apache::mod
+  - Add apache::mod::deflate class
+  - Add options parameter to apache::mod::fcgid
+  - Add timeouts parameter to apache::mod::reqtimeout
+  - Add apache::mod::shib
+  - Add apache_version parameter to apache::mod::ldap
+  - Add magic_file parameter to apache::mod::mime_magic
+  - Add apache_version parameter to apache::mod::pagespeed
+  - Add passenger_default_ruby parameter to apache::mod::passenger
+  - Add content, template, and source parameters to apache::mod::php
+  - Add apache_version parameter to apache::mod::proxy
+  - Add loadfiles parameter to apache::mod::proxy_html
+  - Add ssl_protocol and package_name parameters to apache::mod::ssl
+  - Add apache_version parameter to apache::mod::status
+  - Add apache_version parameter to apache::mod::userdir
+  - Add apache::mod::version class
+
+#### Bugfixes
+- Set osfamily defaults for wsgi_socket_prefix
+- Support multiple balancermembers with the same url
+- Validate apache::vhost::custom_fragment
+- Add support for itk with mod_php
+- Allow apache::vhost::ssl_certs_dir to not be set
+- Improved passenger support for Debian
+- Improved 2.4 support without mod_access_compat
+- Support for more than one 'Allow from'-directive in _directories.erb
+- Don't load systemd on Amazon linux based on CentOS6 with apache 2.4
+- Fix missing newline in ModPagespeed filter and memcached servers directive
+- Use interpolated strings instead of numbers where required by future parser
+- Make auth_require take precedence over default with apache 2.4
+- Lint fixes
+- Set default for php_admin_flags and php_admin_values to be empty hash instead of empty array
+- Correct typo in mod::pagespeed
+- spec_helper fixes
+- Install mod packages before dealing with the configuration
+- Use absolute scope to check class definition in apache::mod::php
+- Fix dependency loop in apache::vhost
+- Properly scope variables in the inline template in apache::balancer
+- Documentation clarification, typos, and formatting
+- Set apache::mod::ssl::ssl_mutex to default for debian on apache >= 2.4
+- Strict variables fixes
+- Add authn_core mode to Ubuntu trusty defaults
+- Keep default loadfile for authz_svn on Debian
+- Remove '.conf' from the site-include regexp for better Ubuntu/Debian support
+- Load unixd before fcgid for EL7
+- Fix RedirectMatch rules
+- Fix misleading error message in apache::version
+
+#### Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+## Supported Release [1.1.1]
+### Summary
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
+## Supported Release [1.1.0]
+
+### Summary
+
+This release primarily focuses on extending the httpd 2.4 support, tested
+through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger 
+4 support, as well as several new modules and important bugfixes.
+
+#### Features
+
+- Add support for RHEL7 and Ubuntu 14.04
+- More complete apache24 support
+- Passenger 4 support
+- Add support for max_keepalive_requests and log_formats parameters
+- Add mod_pagespeed support
+- Add mod_speling support
+- Added several parameters for mod_passenger
+- Added ssl_cipher parameter to apache::mod::ssl
+- Improved examples in documentation
+- Added docroot_mode, action, and suexec_user_group parameters to apache::vhost
+- Add support for custom extensions for mod_php
+- Improve proxy_html support for Debian
+
+#### Bugfixes
+
+- Remove NameVirtualHost directive for apache >= 2.4
+- Order proxy_set option so it doesn't change between runs
+- Fix inverted SSL compression
+- Fix missing ensure on concat::fragment resources
+- Fix bad dependencies in apache::mod and apache::mod::mime
+
+#### Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+## Supported Release [1.0.1]
+### Summary
+
+This is a supported release.  This release removes a testing symlink that can
+cause trouble on systems where /var is on a seperate filesystem from the
+modulepath.
+
+#### Features
+#### Bugfixes
+#### Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+ 
+## Supported Release [1.0.0]
+### Summary
+
+This is a supported release. This release introduces Apache 2.4 support for
+Debian and RHEL based osfamilies.
+
+#### Features
+
+- Add apache24 support
+- Add rewrite_base functionality to rewrites
+- Updated README documentation
+- Add WSGIApplicationGroup and WSGIImportScript directives
+
+#### Bugfixes
+
+- Replace mutating hashes with merge() for Puppet 3.5
+- Fix WSGI import_script and mod_ssl issues on Lucid
+
+#### Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+---
+
+## Supported Release [0.11.0]
+### Summary:
+
+This release adds preliminary support for Windows compatibility and multiple rewrite support.
+
+#### Backwards-incompatible Changes:
+
+- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
+  and will be removed in a future release.
+
+#### Features:
+
+- add Match directive
+- quote paths for windows compatibility
+- add auth_group_file option to README.md
+- allow AuthGroupFile directive for vhosts
+- Support Header directives in vhost context
+- Don't purge mods-available dir when separate enable dir is used
+- Fix the servername used in log file name
+- Added support for mod_include
+- Remove index parameters.
+- Support environment variable control for CustomLog
+- added redirectmatch support
+- Setting up the ability to do multiple rewrites and conditions.
+- Convert spec tests to beaker.
+- Support php_admin_(flag|value)s
+
+#### Bugfixes:
+
+- directories are either a Hash or an Array of Hashes
+- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
+- (docs) Update list of `apache::mod::[name]` classes
+- (docs) Fix apache::namevirtualhost example call style
+- Fix $ports_file reference in apache::listen.
+- Fix $ports_file reference in Namevirtualhost.
+
+
+## Supported Release [0.10.0]
+### Summary:
+
+This release adds FreeBSD osfamily support and various other improvements to some mods.
+
+#### Features:
+
+- Add suPHP_UserGroup directive to directory context
+- Add support for ScriptAliasMatch directives
+- Set SSLOptions StdEnvVars in server context
+- No implicit <Directory> entry for ScriptAlias path
+- Add support for overriding ErrorDocument
+- Add support for AliasMatch directives
+- Disable default "allow from all" in vhost-directories
+- Add WSGIPythonPath as an optional parameter to mod_wsgi. 
+- Add mod_rpaf support
+- Add directives: IndexOptions, IndexOrderDefault
+- Add ability to include additional external configurations in vhost
+- need to use the provider variable not the provider key value from the directory hash for matches
+- Support for FreeBSD and few other features
+- Add new params to apache::mod::mime class
+- Allow apache::mod to specify module id and path
+- added $server_root parameter
+- Add Allow and ExtendedStatus support to mod_status
+- Expand vhost/_directories.pp directive support
+- Add initial support for nss module (no directives in vhost template yet)
+- added peruser and event mpms
+- added $service_name parameter
+- add parameter for TraceEnable
+- Make LogLevel configurable for server and vhost
+- Add documentation about $ip
+- Add ability to pass ip (instead of wildcard) in default vhost files
+
+#### Bugfixes:
+
+- Don't listen on port or set NameVirtualHost for non-existent vhost
+- only apply Directory defaults when provider is a directory
+- Working mod_authnz_ldap support on Debian/Ubuntu
+
+## Supported Release [0.9.0]
+### Summary:
+This release adds more parameters to the base apache class and apache defined
+resource to make the module more flexible. It also adds or enhances SuPHP,
+WSGI, and Passenger mod support, and support for the ITK mpm module.
+
+#### Backwards-incompatible Changes:
+- Remove many default mods that are not normally needed.
+- Remove `rewrite_base` `apache::vhost` parameter; did not work anyway.
+- Specify dependencies on stdlib >=2.4.0 (this was already the case, but
+making explicit)
+- Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod`
+defined resource.
+
+#### Features:
+- `apache` class
+  - Add `httpd_dir` parameter to change the location of the configuration
+  files.
+  - Add `logroot` parameter to change the logroot
+  - Add `ports_file` parameter to changes the `ports.conf` file location
+  - Add `keepalive` parameter to enable persistent connections
+  - Add `keepalive_timeout` parameter to change the timeout
+  - Update `default_mods` to be able to take an array of mods to enable.
+- `apache::vhost`
+  - Add `wsgi_daemon_process`, `wsgi_daemon_process_options`,
+  `wsgi_process_group`, and `wsgi_script_aliases` parameters for per-vhost
+  WSGI configuration.
+  - Add `access_log_syslog` parameter to enable syslogging.
+  - Add `error_log_syslog` parameter to enable syslogging of errors.
+  - Add `directories` hash parameter. Please see README for documentation.
+  - Add `sslproxyengine` parameter to enable SSLProxyEngine
+  - Add `suphp_addhandler`, `suphp_engine`, and `suphp_configpath` for
+  configuring SuPHP.
+  - Add `custom_fragment` parameter to allow for arbitrary apache
+  configuration injection. (Feature pull requests are prefered over using
+  this, but it is available in a pinch.)
+- Add `apache::mod::suphp` class for configuring SuPHP.
+- Add `apache::mod::itk` class for configuring ITK mpm module.
+- Update `apache::mod::wsgi` class for global WSGI configuration with
+`wsgi_socket_prefix` and `wsgi_python_home` parameters.
+- Add README.passenger.md to document the `apache::mod::passenger` usage.
+Added `passenger_high_performance`, `passenger_pool_idle_time`,
+`passenger_max_requests`, `passenger_stat_throttle_rate`, `rack_autodetect`,
+and `rails_autodetect` parameters.
+- Separate the httpd service resource into a new `apache::service` class for
+dependency chaining of `Class['apache'] -> <resource> ~>
+Class['apache::service']`
+- Added `apache::mod::proxy_balancer` class for `apache::balancer`
+
+#### Bugfixes:
+- Change dependency to puppetlabs-concat
+- Fix ruby 1.9 bug for `a2mod`
+- Change servername to be `$::hostname` if there is no `$::fqdn`
+- Make `/etc/ssl/certs` the default ssl certs directory for RedHat non-5.
+- Make `php` the default php package for RedHat non-5.
+- Made `aliases` able to take a single alias hash instead of requiring an
+array.
+
+## Supported Release [0.8.1]
+#### Bugfixes:
+- Update `apache::mpm_module` detection for worker/prefork
+- Update `apache::mod::cgi` and `apache::mod::cgid` detection for
+worker/prefork
+
+## Supported Release [0.8.0]
+#### Features:
+- Add `servername` parameter to `apache` class
+- Add `proxy_set` parameter to `apache::balancer` define
+
+#### Bugfixes:
+- Fix ordering for multiple `apache::balancer` clusters
+- Fix symlinking for sites-available on Debian-based OSs
+- Fix dependency ordering for recursive confdir management
+- Fix `apache::mod::*` to notify the service on config change
+- Documentation updates
+
+## Supported Release [0.7.0]
+#### Changes:
+- Essentially rewrite the module -- too many to list
+- `apache::vhost` has many abilities -- see README.md for details
+- `apache::mod::*` classes provide httpd mod-loading capabilities
+- `apache` base class is much more configurable
+
+#### Bugfixes:
+- Many. And many more to come
+
+## Supported Release [0.6.0]
+- update travis tests (add more supported versions)
+- add access log_parameter
+- make purging of vhost dir configurable
+
+## Supported Release [0.4.0]
+#### Changes:
+- `include apache` is now required when using `apache::mod::*`
+
+#### Bugfixes:
+- Fix syntax for validate_re
+- Fix formatting in vhost template
+- Fix spec tests such that they pass
+
+## Supported Release [0.0.4]
+* e62e362 Fix broken tests for ssl, vhost, vhost::*
+* 42c6363 Changes to match style guide and pass puppet-lint without error
+* 42bc8ba changed name => path for file resources in order to name namevar by it's name
+* 72e13de One end too much
+* 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
+* 273f94d fix tests
+* a35ede5 (#13860) Make a2enmod/a2dismo commands optional
+* 98d774e (#13860) Autorequire Package['httpd']
+* 05fcec5 (#13073) Add missing puppet spec tests
+* 541afda (#6899) Remove virtual a2mod definition
+* 976cb69 (#13072) Move mod python and wsgi package names to params
+* 323915a (#13060) Add .gitignore to repo
+* fdf40af (#13060) Remove pkg directory from source tree
+* fd90015 Add LICENSE file and update the ModuleFile
+* d3d0d23 Re-enable local php class
+* d7516c7 Make management of firewalls configurable for vhosts
+* 60f83ba Explicitly lookup scope of apache_name in templates.
+* f4d287f (#12581) Add explicit ordering for vdir directory
+* 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
+* a776a8b (#11071) Fix to work with latest firewall module
+* 2b79e8b (#11070) Add support for Scientific Linux
+* 405b3e9 Fix for a2mod
+* 57b9048 Commit apache::vhost::redirect Manifest
+* 8862d01 Commit apache::vhost::proxy Manifest
+* d5c1fd0 Commit apache::mod::wsgi Manifest
+* a825ac7 Commit apache::mod::python Manifest
+* b77062f Commit Templates
+* 9a51b4a Vhost File Declarations
+* 6cf7312 Defaults for Parameters
+* 6a5b11a Ensure installed
+* f672e46 a2mod fix
+* 8a56ee9 add pthon support to apache
+
+[3.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/3.1.0...3.2.0
+[3.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/3.0.0...3.1.0
+[3.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.1...3.0.0
+[2.3.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.0...2.3.1
+[2.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.2.0...2.3.0
+[2.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.1.0...2.2.0
+[2.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...2.1.0
+[2.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0
+[1.11.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...1.11.1
+[1.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...1.11.0
+[1.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...1.10.0
+[1.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...1.9.0
+[1.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.0...1.8.1
+[1.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.1...1.8.0
+[1.7.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.0...1.7.1
+[1.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.6.0...1.7.0
+[1.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.5.0...1.6.0
+[1.5.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.1...1.5.0
+[1.4.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.0...1.4.1
+[1.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.3.0...1.4.0
+[1.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.2.0...1.3.0
+[1.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.1...1.2.0
+[1.1.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.0...1.1.1
+[1.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.1...1.1.0
+[1.0.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.0...1.0.1
+[1.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.11.0...1.0.0
+[0.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...0.11.0
+[0.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...0.10.0
+[0.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...0.9.0
+[0.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.8.0...0.8.1
+[0.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.7.0...0.8.0
+[0.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.6.0...0.7.0
+[0.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.5.0-rc1...0.6.0
+[0.5.0-rc1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.4.0...0.5.0-rc1
+[0.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.3.0...0.4.0
+[0.0.4]:https://github.com/puppetlabs/puppetlabs-apache/commits/0.0.4
diff --git a/Rakefile b/Rakefile
index a7c4d68168..af1ff9af2f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,7 @@ require 'puppet-lint/tasks/puppet-lint'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
+  returnVal = 'puppetlabs' || JSON.load(File.read('metadata.json'))['author']
   raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
   puts "GitHubChangelogGenerator user:#{returnVal}"
   returnVal
diff --git a/metadata.json b/metadata.json
index cd326ade6b..24921756a5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "author": "puppet",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -78,5 +78,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.7.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "1.7.0-0-g57412ed"
+  "template-ref": "heads/master-0-g9c4766b"
 }

From 120f5e35f80ddaeddde3ed1c1ee4823c21a25218 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Fri, 14 Sep 2018 09:51:05 -0700
Subject: [PATCH 1397/2267] (L10n) Updating translations for
 readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 7e547f0bf7..f192609caf 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -1212,6 +1212,21 @@ Puppetが[Apacheモジュール][]の設定ファイルを置く場所を設定
 - **Gentoo**: `/etc/apache2/modules.d`
 - **Red Hat**: `/etc/httpd/conf.d`
 
+##### `mod_libs`
+
+デフォルトのモジュールライブラリ名をユーザがオーバーライドすることを許可します。
+
+```puppet
+include apache::params
+class { 'apache':
+  mod_libs => merge($::apache::params::mod_libs, {
+    'wsgi' => 'mod_wsgi_python3.so',
+  })
+}
+```
+
+ハッシュ。デフォルト値: `$apache::params::mod_libs`
+
 ##### `mod_packages`
 
 デフォルトのモジュールパッケージ名をユーザがオーバーライドすることを許可します。
@@ -2442,11 +2457,11 @@ $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 |passenger_load_shell_envvars|未定義|[`PassengerLoadShellEnvvars`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLoadShellEnvvars)|server-config virutal-host htaccess directory ||
 |passenger_log_file|未定義|[`PassengerLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogFile)|server-config ||
 |passenger_log_level|未定義|[`PassengerLogLevel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogLevel)|server-config ||
-|passenger_lve_min_uid|未定義|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)|server-config virutal-host ||
+|passenger_lve_min_uid|未定義|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)|server-config virtual-host ||
 |passenger_max_instances|未定義|[`PassengerMaxInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstances)|server-config virutal-host htaccess directory ||
 |passenger_max_instances_per_app|未定義|[`PassengerMaxInstancesPerApp`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstancesPerApp)|server-config ||
 |passenger_max_pool_size|未定義|[`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPoolSize)|server-config ||
-|passenger_max_preloader_idle_time|未定義|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)|server-config virutal-host ||
+|passenger_max_preloader_idle_time|未定義|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)|server-config virtual-host ||
 |passenger_max_request_queue_size|未定義|[`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestQueueSize)|server-config virutal-host htaccess directory ||
 |passenger_max_request_time|未定義|[`PassengerMaxRequestTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestTime)|server-config virutal-host htaccess directory ||
 |passenger_max_requests|未定義|[`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequests)|server-config virutal-host htaccess directory ||
@@ -2455,7 +2470,7 @@ $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 |passenger_min_instances|未定義|[`PassengerMinInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMinInstances)|server-config virutal-host htaccess directory ||
 |passenger_nodejs|未定義|[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerNodejs)|server-config virutal-host htaccess directory ||
 |passenger_pool_idle_time|未定義|[`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPoolIdleTime)|server-config ||
-|passenger_pre_start|未定義|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)|server-config virutal-host ||
+|passenger_pre_start|未定義|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)|server-config virtual-host ||
 |passenger_python|未定義|[`PassengerPython`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPython)|server-config virutal-host htaccess directory ||
 |passenger_resist_deployment_errors|未定義|[`PassengerResistDeploymentErrors`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResistDeploymentErrors)|server-config virutal-host htaccess directory ||
 |passenger_resolve_symlinks_in_document_root|未定義|[`PassengerResolveSymlinksInDocumentRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResolveSymlinksInDocumentRoot)|server-config virutal-host htaccess directory ||
@@ -2467,7 +2482,7 @@ $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 |passenger_security_update_check_proxy|未定義|[`PassengerSecurityUpdateCheckProxy`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSecurityUpdateCheckProxy)|server-config ||
 |passenger_show_version_in_header|未定義|[`PassengerShowVersionInHeader`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerShowVersionInHeader)|server-config ||
 |passenger_socket_backlog|未定義|[`PassengerSocketBacklog`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSocketBacklog)|server-config ||
-|passenger_spawn_method|未定義|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)|server-config virutal-host ||
+|passenger_spawn_method|未定義|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)|server-config virtual-host ||
 |passenger_start_timeout|未定義|[`PassengerStartTimeout`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartTimeout)|server-config virutal-host htaccess directory ||
 |passenger_startup_file|未定義|[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartupFile)|server-config virutal-host htaccess directory ||
 |passenger_stat_throttle_rate|未定義|[`PassengerStatThrottleRate`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStatThrottleRate)|server-config ||
@@ -2732,7 +2747,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 このクラスでインストールおよび設定されるのは、Shibboleth SSO認証をコンシュームするWebアプリケーションのApacheコンポーネントのみです。PuppetでShibboleth設定を手動で管理することも、[Shibboleth Puppetモジュール](https://github.com/aethylred/puppet-shibboleth)を使用することもできます。
 
-**注意**: shibbolethモジュールは、Shibbolethのリポジトリにより提供される依存関係パッケージがなければ、RH/CentOSでは使用できません。[http://wiki.aaf.edu.au/tech-info/sp-install-guide]()を参照してください。
+**注意**: shibbolethモジュールは、Shibbolethのリポジトリにより提供される依存関係パッケージがなければ、RH/CentOSでは使用できません。[Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide)を参照してください。
 
 ##### クラス: `apache::mod::ssl`
 
@@ -2798,7 +2813,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 * `ssl_protocol`
 
-  デフォルト値: ['all', '*SSLv2', '*SSLv3']。
+  デフォルト値: ['all', '-SSLv2', '-SSLv3']
 
 * `ssl_random_seed_bytes`
 
@@ -5569,18 +5584,9 @@ Apacheが読みこむhtpasswdファイルに適したフォーマットでパス
 
 現在はSHAハッシュを使用しています。これは、このフォーマットは安全ではないとされているものの、ほとんどのプラットフォームでサポートされているもっとも安全なフォーマットであるためです。
 
-## 制約事項
-
-### 全般
-
-このモジュールは、以下に関して、[オープンソースPuppet][]および[Puppet Enterprise][]の両方でCIテストが実施されています。
-
-- CentOS 5および6
-- Ubuntu 12.04および14.04
-- Debian 7
-- RHEL 5、6、7
+## 制約
 
-このモジュールでは、FreeBSD、Gentoo、Amazon Linuxなどの、他のディストリビューションおよびオペレーティングシステムで使用できる機能も提供されていますが、そうしたシステムについては公式なテストは実施されておらず、新たに不具合が生じる可能性があります。
+ サポートされているオペレーティングシステムの一覧については、[metadata.json](https://github.com/puppetlabs/puppetlabs-apache/blob/master/metadata.json)を参照してください。
 
 ### FreeBSD
 

From b2d2ae09a61e0a85813a66f8f2169e0b16d1a99f Mon Sep 17 00:00:00 2001
From: Steve Mokris <smokris@softpixel.com>
Date: Sat, 15 Sep 2018 11:55:50 -0400
Subject: [PATCH 1398/2267] Fix "audit_log_relevant_status" typo in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2e70ce2c8e..684aa0d342 100755
--- a/README.md
+++ b/README.md
@@ -2951,7 +2951,7 @@ ${modsec\_dir}/activated\_rules.
 
   Defaults to the Apache log directory (Redhat: `/var/log/httpd`,  Debian: `/var/log/apache2`).
 
-* `audit_log_releavant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging.
+* `audit_log_relevant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging.
 
   Default: '^(?:5|4(?!04))'.
 

From ccaf08d452f543b105687586f2c21e85beaac57f Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Thu, 20 Sep 2018 12:12:39 +0100
Subject: [PATCH 1399/2267] (maint) - logic update for puppet 6

---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 4854ee1343..88dad9e68b 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -32,7 +32,7 @@
 
   # Configure all nodes in nodeset
   c.before :suite do
-    run_puppet_access_login(user: 'admin') if pe_install? && puppet_version =~ %r{(5\.\d\.\d)}
+    run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
     # net-tools required for netstat utility being used by be_listening
     if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
       pp = <<-EOS

From 01736a1b874e3352c46d5c7929b3f8fa1c459c1c Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Thu, 20 Sep 2018 16:33:42 +0100
Subject: [PATCH 1400/2267] (MODULES-6805) metadata.json shows support for
 puppet 6

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 24921756a5..e091ea31dd 100644
--- a/metadata.json
+++ b/metadata.json
@@ -72,7 +72,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.7.0 < 6.0.0"
+      "version_requirement": ">= 4.7.0 < 7.0.0"
     }
   ],
   "description": "Module for Apache configuration",

From 14996251ab5f5b118d0aea95bd22e0446718fe3d Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Mon, 24 Sep 2018 16:39:55 +0100
Subject: [PATCH 1401/2267] (FM-7392) - Puppet 6 Testing Changes

---
 .rubocop.yml           |  4 ++++
 .travis.yml            | 15 +++++++++------
 Gemfile                | 22 +++++++---------------
 Rakefile               |  2 +-
 metadata.json          |  2 +-
 spec/default_facts.yml |  2 +-
 6 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index d3f5e22d6d..b349606f1a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -19,6 +19,10 @@ AllCops:
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
+GetText/DecorateString:
+  Description: We don't want to decorate test output.
+  Exclude:
+  - spec/*
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
diff --git a/.travis.yml b/.travis.yml
index 35540cb82c..db1d9e9591 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,10 @@ script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.4.4
+  - 2.5.0
 env:
   global:
-    - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
+    - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
     - PARALLEL_TEST_PROCESSORS=16
 matrix:
   fast_finish: true
@@ -24,16 +24,16 @@ matrix:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
-      rvm: 2.4.4
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
+      rvm: 2.5.0
       script: bundle exec rake beaker
       services: docker
       sudo: required
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
-      rvm: 2.4.4
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+      rvm: 2.5.0
       script: bundle exec rake beaker
       services: docker
       sudo: required
@@ -41,6 +41,9 @@ matrix:
       env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
     -
       env: CHECK=parallel_spec
+    -
+      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+      rvm: 2.4.4
     -
       env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
       rvm: 2.1.9
diff --git a/Gemfile b/Gemfile
index 05cb6e6f34..47fa24e654 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,22 +1,15 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 def location_for(place_or_version, fake_version = nil)
-  if place_or_version =~ %r{\A(git[:@][^#]*)#(.*)}
-    [fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact
-  elsif place_or_version =~ %r{\Afile:\/\/(.*)}
-    ['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }]
-  else
-    [place_or_version, { require: false }]
-  end
-end
+  git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
+  file_url_regex = %r{\Afile:\/\/(?<path>.*)}
 
-def gem_type(place_or_version)
-  if place_or_version =~ %r{\Agit[:@]}
-    :git
-  elsif !place_or_version.nil? && place_or_version.start_with?('file:')
-    :file
+  if place_or_version && (git_url = place_or_version.match(git_url_regex))
+    [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
+  elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
+    ['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
   else
-    :gem
+    [place_or_version, { require: false }]
   end
 end
 
@@ -41,7 +34,6 @@ group :system_tests do
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
-puppet_type = gem_type(puppet_version)
 facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
 
diff --git a/Rakefile b/Rakefile
index af1ff9af2f..a7c4d68168 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,7 @@ require 'puppet-lint/tasks/puppet-lint'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = 'puppetlabs' || JSON.load(File.read('metadata.json'))['author']
+  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
   raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
   puts "GitHubChangelogGenerator user:#{returnVal}"
   returnVal
diff --git a/metadata.json b/metadata.json
index 24921756a5..38cfa9ce03 100644
--- a/metadata.json
+++ b/metadata.json
@@ -78,5 +78,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.7.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-g9c4766b"
+  "template-ref": "heads/master-0-g8fc95db"
 }
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index 3248be5aa6..e10d991db2 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,7 +2,7 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-concat_basedir: "/tmp"
+concat_basedir: ""
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"

From 90e227502661ed15b54adacd6001a346ede56420 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Tue, 25 Sep 2018 12:47:32 +0100
Subject: [PATCH 1402/2267] (MODULES-7849) yumrepo_core added as a fixture for
 Puppet 6 and above

---
 .fixtures.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.fixtures.yml b/.fixtures.yml
index 66ad3e5370..c65734b30c 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -3,6 +3,9 @@ fixtures:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
     concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
     portage: "git://github.com/gentoo/puppet-portage.git"
+    yumrepo_core: 
+      repo: "git://github.com/puppetlabs/puppetlabs-yumrepo_core.git"
+      puppet_version: '>= 6.0.0'
   symlinks:
     apache: "#{source_dir}"
     site_apache: "#{source_dir}/spec/fixtures/site_apache"

From 8fae0b0a78ab595632581a615afcdd26101ee463 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Thu, 27 Sep 2018 13:19:02 +0100
Subject: [PATCH 1403/2267] Module Release Prep

---
 .github_changelog_generator |  3 ---
 CHANGELOG.md                | 15 ++++++++++++++-
 metadata.json               |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github_changelog_generator b/.github_changelog_generator
index 8edccb1cce..e69de29bb2 100644
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1,3 +0,0 @@
-user=puppetlabs
-project=puppetlabs-apache
-since_tag=3.4.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 423c21f894..6055e1ea59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,20 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [3.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.3.0) (2018-09-10)
+## [3.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.4.0) (2018-09-27)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.3.0...3.4.0)
+
+### Added
+
+- pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#1838](https://github.com/puppetlabs/puppetlabs-apache/pull/1838) ([pmcmaw](https://github.com/pmcmaw))
+- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#1836](https://github.com/puppetlabs/puppetlabs-apache/pull/1836) ([tphoney](https://github.com/tphoney))
+
+### Fixed
+
+- Fix "audit\_log\_relevant\_status" typo in README.md [\#1830](https://github.com/puppetlabs/puppetlabs-apache/pull/1830) ([smokris](https://github.com/smokris))
+
+## [3.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.3.0) (2018-09-11)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.2.0...3.3.0)
 
diff --git a/metadata.json b/metadata.json
index 60da1f3a99..378a2b751f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,7 +1,7 @@
 {
   "name": "puppetlabs-apache",
-  "version": "3.3.0",
-  "author": "puppet",
+  "version": "3.4.0",
+  "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-apache.git",

From f87d7ca438915e6a536115ed56427b18c031599d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=B6rner?= <martin.moerner@aperto.com>
Date: Fri, 12 Oct 2018 23:54:14 +0200
Subject: [PATCH 1404/2267] Fix default vhost priority in the readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 684aa0d342..d8c013f63a 100755
--- a/README.md
+++ b/README.md
@@ -369,7 +369,7 @@ apache::vhost { 'vhost.example.com':
 
 See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters.
 
-> **Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] defined type applies a default [`priority`][] of 15, which Puppet interprets by prefixing the virtual host's file name with `15-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to false, Apache still processes virtual hosts in alphabetical order.
+> **Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] defined type applies a default [`priority`][] of 25, which Puppet interprets by prefixing the virtual host's file name with `25-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to false, Apache still processes virtual hosts in alphabetical order.
 
 To configure user and group ownership for `docroot`, use the [`docroot_owner`][] and [`docroot_group`][] parameters:
 

From d40efd4c78cab2731e257a34a4e31bf710e77d42 Mon Sep 17 00:00:00 2001
From: Mark McLaren <mark.mclaren@bristol.ac.uk>
Date: Wed, 17 Oct 2018 08:12:54 +0100
Subject: [PATCH 1405/2267] Replaced references to diskio mod that should be
 dumpio mod

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 684aa0d342..a5dd080fb4 100755
--- a/README.md
+++ b/README.md
@@ -1736,18 +1736,18 @@ class {'::apache::mod::disk_cache':
 }
 ```
 
-##### Class: `apache::mod::diskio`
+##### Class: `apache::mod::dumpio`
 
-Installs and configures [`mod_diskio`][].
+Installs and configures [`mod_dumpio`][].
 
 ```puppet
 class{'apache':
   default_mods => false,
   log_level    => 'dumpio:trace7',
 }
-class{'apache::mod::diskio':
-  disk_io_input  => 'On',
-  disk_io_output => 'Off',
+class{'apache::mod::dumpio':
+  dump_io_input  => 'On',
+  dump_io_output => 'Off',
 }
 ```
 

From 68ec49ee06a307c76a04b15fc42473f6a511ef85 Mon Sep 17 00:00:00 2001
From: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
Date: Mon, 1 Oct 2018 17:36:01 +0200
Subject: [PATCH 1406/2267] Add option to add comments to the header of a vhost
 file

You can pass

```puppet
comment => 'My comment',
```

or
```puppet
comment => [
  'comment 1',
  'comment 2',
],
```

Each element from the array will be added as a separate line.
---
 manifests/vhost.pp               |  1 +
 spec/defines/vhost_spec.rb       | 10 +++++++++-
 templates/vhost/_file_header.erb |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 32b619ae6c..d607be1d93 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -205,6 +205,7 @@
   $cas_validate_saml                                                                = undef,
   Optional[String] $shib_compat_valid_user                                          = undef,
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name        = undef,
+  Optional[Variant[String,Array[String]]] $comment                                  = undef,
 ) {
 
   # The base class must be included first because it is used by parameter defaults
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index ca67baa703..b5427aead2 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -493,6 +493,10 @@
           'keepalive'                   => 'on',
           'keepalive_timeout'           => '100',
           'max_keepalive_requests'      => '1000',
+          'comment'                     => [
+            'Comment 1',
+            'Comment 2',
+          ],
         }
       end
       let :facts do
@@ -554,7 +558,11 @@
         is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
                                                                               'path' => '/etc/apache2/sites-enabled/30-rspec.example.com.conf')
       }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
+      it {
+        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+          content: %r{^# Comment 1$},
+        )
+      }
       it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index 4cf7629ebf..0e610f8474 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -2,6 +2,7 @@
 # Vhost template in module puppetlabs-apache
 # Managed by Puppet
 # ************************************
+<%= [@comment].flatten.collect{|c| "# #{c}"}.join("\n") -%>
 
 <VirtualHost <%= [@nvh_addr_port].flatten.compact.join(' ') %>>
 <% if @servername and not @servername.empty? -%>

From 210ae51c00ed04285f7eaa8194aed114ef719504 Mon Sep 17 00:00:00 2001
From: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
Date: Sat, 3 Nov 2018 07:42:38 +0100
Subject: [PATCH 1407/2267] Add documentation

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index a5dd080fb4..e765c38436 100755
--- a/README.md
+++ b/README.md
@@ -3482,6 +3482,28 @@ Sets the URL to use when validating a client-presented ticket in an HTTP query s
 
 Defaults to the value set by [`apache::mod::auth_cas`][].
 
+
+##### `comment`
+
+Adds comments to the header of the configuration file. Pass as string or an array of strings.
+
+Default: `undef`.
+
+For example:
+
+``` puppet
+comment => "Account number: 123B",
+```
+
+Or:
+
+``` puppet
+comment => [
+  "Customer: X",
+  "Frontend domain: x.example.org",
+]
+```
+
 ##### `custom_fragment`
 
 Passes a string of custom configuration directives to place at the end of the virtual host configuration.

From 76ca870b7aaa818e040abf998893e050999eca07 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 7 Nov 2018 10:20:48 +0000
Subject: [PATCH 1408/2267] pdksync_heads/master-0-gabccfb1

---
 metadata.json       |  2 +-
 spec/spec_helper.rb | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/metadata.json b/metadata.json
index 378a2b751f..3c57cc55fd 100644
--- a/metadata.json
+++ b/metadata.json
@@ -78,5 +78,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.7.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-g8fc95db"
+  "template-ref": "heads/master-0-gabccfb1"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5e721b7ff4..a7281d5300 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,11 +1,7 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
-begin
-  require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
-rescue LoadError => loaderror
-  warn "Could not require spec_helper_local: #{loaderror.message}"
-end
+require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 
 include RspecPuppetFacts
 
@@ -14,15 +10,19 @@
   facterversion: Facter.version,
 }
 
-default_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml'))
-default_module_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml'))
+default_fact_files = [
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')),
+]
 
-if File.exist?(default_facts_path) && File.readable?(default_facts_path)
-  default_facts.merge!(YAML.safe_load(File.read(default_facts_path)))
-end
+default_fact_files.each do |f|
+  next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
-if File.exist?(default_module_facts_path) && File.readable?(default_module_facts_path)
-  default_facts.merge!(YAML.safe_load(File.read(default_module_facts_path)))
+  begin
+    default_facts.merge!(YAML.safe_load(File.read(f)))
+  rescue => e
+    RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
+  end
 end
 
 RSpec.configure do |c|

From 22cece7275f96cecbfd19ca45fdd753cbfe2ba8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCssel=2C=20Sascha?= <ruessel@synyx.de>
Date: Wed, 28 Feb 2018 17:03:09 +0100
Subject: [PATCH 1409/2267] (MODULES-6677) make sure event mpm is disabled

---
 manifests/mpm.pp | 51 ++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 2c4dd13335..1e27597f25 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -71,35 +71,48 @@
             before  => Class['apache::service'],
           }
         }
+      } else {
+        package { "apache2-mpm-${mpm}":
+          ensure => present,
+          before => [
+            Class['apache::service'],
+            File[$::apache::mod_enable_dir],
+          ],
+        }
       }
 
-      if $mpm == 'itk' and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '14.04' {
-        # workaround https://bugs.launchpad.net/ubuntu/+source/mpm-itk/+bug/1286882
-        exec {
-          '/usr/sbin/a2dismod mpm_event':
-            onlyif  => '/usr/bin/test -e /etc/apache2/mods-enabled/mpm_event.load',
+      if $mpm == 'itk' {
+
+        if ( ( $::operatingsystem == 'Ubuntu' ) or ( ($::operatingsystem == 'Debian') and ( versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) ) {
+          ensure_resource('exec', '/usr/sbin/a2dismod mpm_event', {
+            onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
             require => Package['httpd'],
-            before  => Package['apache2-mpm-itk'],
+            before  => Class['apache::service'],
+          })
         }
-      }
-
-      if $mpm == 'itk' and ( ( $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '16.04' ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9.0.0') >= 0 ) ) {
-        $packagename = 'libapache2-mpm-itk'
-      } else {
-        $packagename = "apache2-mpm-${mpm}"
-      }
 
-      if versioncmp($apache_version, '2.4') < 0 or $mpm == 'itk' {
-        package { $packagename:
+        package { 'libapache2-mpm-itk':
           ensure => present,
+          before => [
+            Class['apache::service'],
+            File[$::apache::mod_enable_dir],
+          ],
         }
-        if $::apache::mod_enable_dir {
-          Package[$packagename] {
-            before => File[$::apache::mod_enable_dir],
-          }
+
+      }
+
+      if $mpm == 'prefork' {
+        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9.0.0') >= 0 ) ) {
+          ensure_resource('exec', '/usr/sbin/a2dismod mpm_event', {
+            onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
+            require => Package['httpd'],
+            before  => Class['apache::service'],
+          })
         }
       }
+
     }
+
     'freebsd': {
       class { '::apache::package':
         mpm_module => $mpm,

From 475dca8dac8631d0db074f9455b2e971367e5e71 Mon Sep 17 00:00:00 2001
From: Adam Bottchen <adam.bottchen@puppet.com>
Date: Wed, 14 Nov 2018 14:22:14 -0800
Subject: [PATCH 1410/2267] (MODULES-8429) Update GPG key for phusion passenger

Prior to this commit, a GPG key mismatch prevented the phusion
passenger RPM from installing on RedHat based installs.  This
commit updates the GPGKey to match the one provided by the script
https://packagecloud.io/phusion/passenger/install#bash-rpm.
---
 manifests/mod/passenger.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 4a97312b71..be12255a77 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -527,7 +527,7 @@
       descr         => 'passenger',
       enabled       => '1',
       gpgcheck      => '0',
-      gpgkey        => 'https://packagecloud.io/gpg.key',
+      gpgkey        => 'https://packagecloud.io/phusion/passenger/gpgkey',
       repo_gpgcheck => '1',
       sslcacert     => '/etc/pki/tls/certs/ca-bundle.crt',
       sslverify     => '1',

From e7a8d6b2308e6fa01c20237330f41128ff609cc4 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 14 Nov 2018 16:12:34 +0000
Subject: [PATCH 1411/2267] (MODULES-8108) - Support added for Debian 9 Updated
 default params added. Exclusions added for certain features. Removed some
 code for Ubuntu 10.04

---
 manifests/mod/dav_svn.pp              |  2 +-
 manifests/mod/security.pp             |  5 +-
 manifests/params.pp                   | 96 +++++++++++++++++++++------
 metadata.json                         |  3 +-
 spec/acceptance/mod_dav_svn_spec.rb   |  2 +-
 spec/acceptance/mod_passenger_spec.rb | 81 +++++++++++++---------
 spec/acceptance/mod_php_spec.rb       |  9 ++-
 spec/acceptance/mod_security_spec.rb  | 18 +++--
 spec/acceptance/vhost_spec.rb         |  2 +
 spec/spec_helper_acceptance.rb        |  3 +-
 10 files changed, 154 insertions(+), 67 deletions(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 35d5417b52..c8b05f4a9e 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -13,7 +13,7 @@
 
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04' and $::operatingsystemmajrelease != '16.04') {
+  if $::osfamily == 'Debian' and ! ($::operatingsystemmajrelease in ['6', '16.04', '9']) {
     $loadfile_name = undef
   } else {
     $loadfile_name = 'dav_svn_authz_svn.load'
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 95c58a0330..89a166261f 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -128,6 +128,9 @@
     }
   }
 
-  unless $::operatingsystem == 'SLES' { apache::security::rule_link { $activated_rules: } }
+  # Debian 9 has a different rule setup
+  unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) {
+    apache::security::rule_link { $activated_rules: }
+  }
 
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 690539f534..68162cc77e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -263,6 +263,34 @@
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
+    } elsif ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) {
+      # Debian stretch uses a different dav_svn from Ubuntu Xenial
+      $php_version = '7.0'
+      $mod_packages = {
+        'auth_cas'              => 'libapache2-mod-auth-cas',
+        'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
+        'auth_mellon'           => 'libapache2-mod-auth-mellon',
+        'authnz_pam'            => 'libapache2-mod-authnz-pam',
+        'dav_svn'               => 'libapache2-mod-svn',
+        'fastcgi'               => 'libapache2-mod-fastcgi',
+        'fcgid'                 => 'libapache2-mod-fcgid',
+        'geoip'                 => 'libapache2-mod-geoip',
+        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+        'lookup_identity'       => 'libapache2-mod-lookup-identity',
+        'nss'                   => 'libapache2-mod-nss',
+        'pagespeed'             => 'mod-pagespeed-stable',
+        'passenger'             => 'libapache2-mod-passenger',
+        'perl'                  => 'libapache2-mod-perl2',
+        'phpXXX'                => 'libapache2-mod-phpXXX',
+        'python'                => 'libapache2-mod-python',
+        'rpaf'                  => 'libapache2-mod-rpaf',
+        'security'              => 'libapache2-mod-security2',
+        'shib2'                 => 'libapache2-mod-shib2',
+        'suphp'                 => 'libapache2-mod-suphp',
+        'wsgi'                  => 'libapache2-mod-wsgi',
+        'xsendfile'             => 'libapache2-mod-xsendfile',
+      }
     } else {
       # major.minor version used since Debian stretch and Ubuntu Xenial
       $php_version = '7.0'
@@ -326,28 +354,52 @@
     $secpcrematchlimit = 1500
     $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
-    $modsec_default_rules = [
-      'base_rules/modsecurity_35_bad_robots.data',
-      'base_rules/modsecurity_35_scanners.data',
-      'base_rules/modsecurity_40_generic_attacks.data',
-      'base_rules/modsecurity_50_outbound.data',
-      'base_rules/modsecurity_50_outbound_malware.data',
-      'base_rules/modsecurity_crs_20_protocol_violations.conf',
-      'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
-      'base_rules/modsecurity_crs_23_request_limits.conf',
-      'base_rules/modsecurity_crs_30_http_policy.conf',
-      'base_rules/modsecurity_crs_35_bad_robots.conf',
-      'base_rules/modsecurity_crs_40_generic_attacks.conf',
-      'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
-      'base_rules/modsecurity_crs_41_xss_attacks.conf',
-      'base_rules/modsecurity_crs_42_tight_security.conf',
-      'base_rules/modsecurity_crs_45_trojans.conf',
-      'base_rules/modsecurity_crs_47_common_exceptions.conf',
-      'base_rules/modsecurity_crs_49_inbound_blocking.conf',
-      'base_rules/modsecurity_crs_50_outbound.conf',
-      'base_rules/modsecurity_crs_59_outbound_blocking.conf',
-      'base_rules/modsecurity_crs_60_correlation.conf',
-    ]
+    if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 {
+      $modsec_default_rules = [
+        'crawlers-user-agents.data',
+        'iis-errors.data',
+        'java-code-leakages.data',
+        'java-errors.data',
+        'lfi-os-files.data',
+        'php-config-directives.data',
+        'php-errors.data',
+        'php-function-names-933150.data',
+        'php-function-names-933151.data',
+        'php-variables.data',
+        'restricted-files.data',
+        'scanners-headers.data',
+        'scanners-urls.data',
+        'scanners-user-agents.data',
+        'scripting-user-agents.data',
+        'sql-errors.data',
+        'sql-function-names.data',
+        'unix-shell.data',
+        'windows-powershell-commands.data',
+      ]
+    } else {
+      $modsec_default_rules = [
+        'base_rules/modsecurity_35_bad_robots.data',
+        'base_rules/modsecurity_35_scanners.data',
+        'base_rules/modsecurity_40_generic_attacks.data',
+        'base_rules/modsecurity_50_outbound.data',
+        'base_rules/modsecurity_50_outbound_malware.data',
+        'base_rules/modsecurity_crs_20_protocol_violations.conf',
+        'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
+        'base_rules/modsecurity_crs_23_request_limits.conf',
+        'base_rules/modsecurity_crs_30_http_policy.conf',
+        'base_rules/modsecurity_crs_35_bad_robots.conf',
+        'base_rules/modsecurity_crs_40_generic_attacks.conf',
+        'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
+        'base_rules/modsecurity_crs_41_xss_attacks.conf',
+        'base_rules/modsecurity_crs_42_tight_security.conf',
+        'base_rules/modsecurity_crs_45_trojans.conf',
+        'base_rules/modsecurity_crs_47_common_exceptions.conf',
+        'base_rules/modsecurity_crs_49_inbound_blocking.conf',
+        'base_rules/modsecurity_crs_50_outbound.conf',
+        'base_rules/modsecurity_crs_59_outbound_blocking.conf',
+        'base_rules/modsecurity_crs_60_correlation.conf',
+      ]
+    }
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
diff --git a/metadata.json b/metadata.json
index 3c57cc55fd..e31fc1b1c3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -51,7 +51,8 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 4ee0d60d08..2032837cd9 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -4,7 +4,7 @@
 describe 'apache::mod::dav_svn class', unless: (fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7') do
   authz_svn_load_file = case fact('osfamily')
                         when 'Debian'
-                          if fact('operatingsystemmajrelease') == '16.04'
+                          if fact('operatingsystemmajrelease') == '16.04' || fact('operatingsystemmajrelease') == '9'
                             'dav_svn_authz_svn.load'
                           else
                             'authz_svn.load'
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 6c00256679..67cfd8313b 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -23,8 +23,11 @@
         passenger_ruby = '/usr/bin/ruby'
       end
     when 'Debian'
-      case fact('lsbdistcodename')
-      when 'jessie'
+      case fact('operatingsystemmajrelease')
+      when '8'
+        passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+        passenger_default_ruby = '/usr/bin/ruby'
+      when '9'
         passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
         passenger_default_ruby = '/usr/bin/ruby'
       else
@@ -76,11 +79,11 @@
   when 'Debian'
     context 'passenger config with passenger_installed_version set' do
       pp_one = <<-MANIFEST
-          class { 'apache': }
-          class { 'apache::mod::passenger':
-            passenger_installed_version     => '4.0.0',
-            passenger_instance_registry_dir => '/some/path/to/nowhere'
-          }
+        class { 'apache': }
+        class { 'apache::mod::passenger':
+          passenger_installed_version     => '4.0.0',
+          passenger_instance_registry_dir => '/some/path/to/nowhere'
+        }
       MANIFEST
       it 'fails when an option is not valid for $passenger_installed_version' do
         apply_manifest(pp_one, expect_failures: true) do |r|
@@ -88,11 +91,11 @@ class { 'apache::mod::passenger':
         end
       end
       pp_two = <<-MANIFEST
-          class { 'apache': }
-          class { 'apache::mod::passenger':
-            passenger_installed_version => '5.0.0',
-            rails_autodetect            => 'on'
-          }
+        class { 'apache': }
+        class { 'apache::mod::passenger':
+          passenger_installed_version => '5.0.0',
+          rails_autodetect            => 'on'
+        }
       MANIFEST
       it 'fails when an option is removed' do
         apply_manifest(pp_two, expect_failures: true) do |r|
@@ -100,11 +103,11 @@ class { 'apache::mod::passenger':
         end
       end
       pp_three = <<-MANIFEST
-          class { 'apache': }
-          class { 'apache::mod::passenger':
-            passenger_installed_version => '5.0.0',
-            rails_ruby                  => '/some/path/to/ruby'
-          }
+        class { 'apache': }
+        class { 'apache::mod::passenger':
+          passenger_installed_version => '5.0.0',
+          rails_ruby                  => '/some/path/to/ruby'
+        }
       MANIFEST
       it 'warns when an option is deprecated' do
         apply_manifest(pp_three, catch_failures: true) do |r|
@@ -113,12 +116,23 @@ class { 'apache::mod::passenger':
       end
     end
     context 'default passenger config' do
-      pp = <<-MANIFEST
-          /* stock apache and mod_passenger */
-          class { 'apache': }
-          class { 'apache::mod::passenger': }
-          #{pp_rackapp}
-      MANIFEST
+      pp =  if ['7', '9', '16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
+              <<-MANIFEST
+                /* stock apache and mod_passenger */
+                class { 'apache': }
+                class { 'apache::mod::passenger':
+                  passenger_instance_registry_dir => '/var/run',
+                }
+                #{pp_rackapp}
+              MANIFEST
+            else
+              <<-MANIFEST
+                /* stock apache and mod_passenger */
+                class { 'apache': }
+                class { 'apache::mod::passenger': }
+                #{pp_rackapp}
+              MANIFEST
+            end
       it 'succeeds in puppeting passenger' do
         apply_manifest(pp, catch_failures: true)
       end
@@ -150,8 +164,11 @@ class { 'apache::mod::passenger': }
             it { is_expected.not_to contain '/PassengerDefaultRuby/' }
           end
         when 'Debian'
-          case fact('lsbdistcodename')
-          when 'jessie'
+          case fact('operatingsystemmajrelease')
+          when '8'
+            it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
+            it { is_expected.not_to contain '/PassengerRuby/' }
+          when '9'
             it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
             it { is_expected.not_to contain '/PassengerRuby/' }
           else
@@ -173,7 +190,8 @@ class { 'apache::mod::passenger': }
       # these two lines
       unless (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') ||
              (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
-             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
+             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') ||
+             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
         expected_one << [%r{### Processes: [0-9]+}, %r{### Total private dirty RSS: [0-9\.]+ MB}]
       end
       it 'outputs status via passenger-memory-stats #stdout' do
@@ -193,27 +211,28 @@ class { 'apache::mod::passenger': }
       # even when the passenger process is successfully installed and running
       unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
         it 'outputs status via passenger-status #General information' do
-          shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-status') do |r|
+          shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
             # spacing may vary
             expect(r.stdout).to match(%r{[\-]+ General information [\-]+})
           end
         end
-        expected_two = if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' ||
+        expected_two = if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') ||
                           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
-                          fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+                          (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') ||
+                          (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
                          [%r{Max pool size[ ]+: [0-9]+}, %r{Processes[ ]+: [0-9]+}, %r{Requests in top-level queue[ ]+: [0-9]+}]
                        else
                          [%r{max[ ]+= [0-9]+}, %r{count[ ]+= [0-9]+}, %r{active[ ]+= [0-9]+}, %r{inactive[ ]+= [0-9]+}, %r{Waiting on global queue: [0-9]+}]
                        end
         it 'outputs status via passenger-status #stdout' do
-          shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-status') do |r|
+          shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
             expected_two.each do |expect|
               expect(r.stdout).to match(expect)
             end
           end
         end
         it 'outputs status via passenger-status #exit_code' do
-          shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-status') do |r|
+          shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
             expect(r.exit_code).to eq(0)
           end
         end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index f6f8fcdbd4..fa9e5d8195 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -32,7 +32,8 @@ class { 'apache::mod::php': }
         it { is_expected.to be_running }
       end
 
-      if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04'
+      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
+         (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
         describe file("#{$mod_dir}/php7.0.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
@@ -120,7 +121,8 @@ class {'apache::mod::php':
       it 'succeeds in puppeting php' do
         apply_manifest(pp, catch_failures: true)
       end
-      if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04'
+      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
+         (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
         describe file("#{$mod_dir}/php7.0.conf") do
           it { is_expected.to contain '# somecontent' }
         end
@@ -145,7 +147,8 @@ class {'apache::mod::php':
         apply_manifest(pp, catch_failures: true)
       end
 
-      if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04'
+      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
+         (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
         describe file("#{$mod_dir}/php7.0.conf") do
           it { is_expected.to contain '# somecontent' }
         end
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index e14694e7da..bc25b742c4 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -75,7 +75,8 @@ class { 'apache::mod::security': }
         end
       end
 
-      unless fact('operatingsystem') == 'SLES'
+      unless fact('operatingsystem') == 'SLES' ||
+             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
         it 'blocks query with SQL' do
           shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
         end
@@ -114,7 +115,8 @@ class { 'apache::mod::security': }
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless fact('operatingsystem') == 'SLES'
+    unless fact('operatingsystem') == 'SLES' ||
+           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -176,7 +178,8 @@ class { 'apache::mod::security': }
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless fact('operatingsystem') == 'SLES'
+    unless  fact('operatingsystem') == 'SLES' ||
+            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -242,7 +245,8 @@ class { 'apache::mod::security': }
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless fact('operatingsystem') == 'SLES'
+    unless  fact('operatingsystem') == 'SLES' ||
+            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -308,7 +312,8 @@ class { 'apache::mod::security': }
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless fact('operatingsystem') == 'SLES'
+    unless  fact('operatingsystem') == 'SLES' ||
+            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -374,7 +379,8 @@ class { 'apache::mod::security': }
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless fact('operatingsystem') == 'SLES'
+    unless  fact('operatingsystem') == 'SLES' ||
+            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 0fdd15ef30..49b554aa2a 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -966,6 +966,7 @@ class { 'apache': }
       if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
          fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') =~ %r{(14\.04|16\.04)} ||
          fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8' ||
+         fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9' ||
          fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
@@ -1567,6 +1568,7 @@ class { 'apache': }
   # Limit testing to Debian, since Centos does not have fastcgi package.
   case fact('osfamily')
   when 'Debian'
+    next if fact('operatingsystemmajrelease') == '9' # Debian 9 does not support this fastcgi
     describe 'fastcgi' do
       pp_one = <<-MANIFEST
         $_os = $::operatingsystem
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 88dad9e68b..b2115947d7 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -34,7 +34,8 @@
   c.before :suite do
     run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
     # net-tools required for netstat utility being used by be_listening
-    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
+    if (fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7') ||
+       (fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '9')
       pp = <<-EOS
         package { 'net-tools': ensure => installed }
       EOS

From 1ff11b0fee321adc6898ef66b0b06fd0e53a1c71 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Fri, 30 Nov 2018 11:56:26 +0000
Subject: [PATCH 1412/2267] (MODULES-8107) - Support added for Ubuntu 18.04. PR
 made to finialize work started by community member bastelfreak,
 (https://github.com/puppetlabs/puppetlabs-apache/pull/1809). Includes work
 done to migrate spec classes tests to rspec-puppet-facts.

Co-authored-by: Tim Meusel <tim@bastelfreak.de>
---
 manifests/mod/dav_svn.pp              |    2 +-
 manifests/mod/fastcgi.pp              |    3 +
 manifests/mod/security.pp             |    3 +-
 manifests/mod/suphp.pp                |    4 +
 manifests/mpm.pp                      |    2 -
 manifests/params.pp                   |   29 +-
 metadata.json                         |    4 +-
 spec/acceptance/mod_passenger_spec.rb |  322 +-
 spec/acceptance/mod_php_spec.rb       |   52 +-
 spec/acceptance/mod_security_spec.rb  |   18 +-
 spec/acceptance/mod_suphp_spec.rb     |   60 -
 spec/acceptance/vhost_spec.rb         |    9 +-
 spec/classes/dev_spec.rb              |  112 +-
 spec/classes/mod/fastcgi_spec.rb      |   69 +-
 spec/classes/mod/passenger_spec.rb    |  798 +++--
 spec/classes/mod/php_spec.rb          |  628 ++--
 spec/classes/mod/security_spec.rb     |  342 +-
 spec/classes/mod/suphp_spec.rb        |   40 +-
 spec/defines/fastcgi_server_spec.rb   |  205 +-
 spec/defines/modsec_link_spec.rb      |   61 +-
 spec/defines/vhost_spec.rb            | 4268 ++++++++++++-------------
 spec/spec_helper_acceptance.rb        |    3 +-
 spec/spec_helper_local.rb             |   19 +-
 23 files changed, 3195 insertions(+), 3858 deletions(-)
 delete mode 100644 spec/acceptance/mod_suphp_spec.rb

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index c8b05f4a9e..6cb5af560c 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -13,7 +13,7 @@
 
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and ! ($::operatingsystemmajrelease in ['6', '16.04', '9']) {
+  if $::osfamily == 'Debian' and ! ($::operatingsystemmajrelease in ['6', '9', '16.04', '18.04']) {
     $loadfile_name = undef
   } else {
     $loadfile_name = 'dav_svn_authz_svn.load'
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index 399d93aa7c..ef4f8f259c 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -3,6 +3,9 @@
   if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemrelease, '7.0') >= 0) {
     fail('mod_fastcgi is no longer supported on el7 and above.')
   }
+  if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '18.04') >= 0) {
+    fail('mod_fastcgi is no longer supported on Ubuntu 18.04 and above. Please use mod_proxy_fcgi')
+  }
   # Debian specifies it's fastcgi lib path, but RedHat uses the default value
   # with no config file
   $fastcgi_lib_path = $::apache::params::fastcgi_lib_path
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 89a166261f..68d90b4e90 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -129,8 +129,7 @@
   }
 
   # Debian 9 has a different rule setup
-  unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) {
+  unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
     apache::security::rule_link { $activated_rules: }
   }
-
 }
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index 955bba302c..52b8b3de94 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -1,5 +1,9 @@
 class apache::mod::suphp (
 ){
+  if  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
+      ($facts['os']['name'] == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
+    fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
+  }
   include ::apache
   ::apache::mod { 'suphp': }
 
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 1e27597f25..7f3585c42f 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -82,7 +82,6 @@
       }
 
       if $mpm == 'itk' {
-
         if ( ( $::operatingsystem == 'Ubuntu' ) or ( ($::operatingsystem == 'Debian') and ( versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) ) {
           ensure_resource('exec', '/usr/sbin/a2dismod mpm_event', {
             onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
@@ -98,7 +97,6 @@
             File[$::apache::mod_enable_dir],
           ],
         }
-
       }
 
       if $mpm == 'prefork' {
diff --git a/manifests/params.pp b/manifests/params.pp
index 68162cc77e..b80eb86fb3 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -291,6 +291,33 @@
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
+    } elsif ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
+      # major.minor version used since Debian stretch and Ubuntu Xenial
+      $php_version = '7.2' # different to Ubuntu 16.04
+      # fastcgi and suphp got removed from #mod_packages, they aren't supported anymore
+      $mod_packages = {
+        'auth_cas'              => 'libapache2-mod-auth-cas',
+        'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
+        'auth_mellon'           => 'libapache2-mod-auth-mellon',
+        'authnz_pam'            => 'libapache2-mod-authnz-pam',
+        'dav_svn'               => 'libapache2-mod-svn', # different to Ubuntu16.04
+        'fcgid'                 => 'libapache2-mod-fcgid',
+        'geoip'                 => 'libapache2-mod-geoip',
+        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+        'lookup_identity'       => 'libapache2-mod-lookup-identity',
+        'nss'                   => 'libapache2-mod-nss',
+        'pagespeed'             => 'mod-pagespeed-stable',
+        'passenger'             => 'libapache2-mod-passenger',
+        'perl'                  => 'libapache2-mod-perl2',
+        'phpXXX'                => 'libapache2-mod-phpXXX',
+        'python'                => 'libapache2-mod-python',
+        'rpaf'                  => 'libapache2-mod-rpaf',
+        'security'              => 'libapache2-mod-security2',
+        'shib2'                 => 'libapache2-mod-shib2',
+        'wsgi'                  => 'libapache2-mod-wsgi',
+        'xsendfile'             => 'libapache2-mod-xsendfile',
+      }
     } else {
       # major.minor version used since Debian stretch and Ubuntu Xenial
       $php_version = '7.0'
@@ -354,7 +381,7 @@
     $secpcrematchlimit = 1500
     $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
-    if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 {
+    if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
       $modsec_default_rules = [
         'crawlers-user-agents.data',
         'iis-errors.data',
diff --git a/metadata.json b/metadata.json
index e31fc1b1c3..6b81698407 100644
--- a/metadata.json
+++ b/metadata.json
@@ -65,8 +65,8 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     }
   ],
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 67cfd8313b..8fbed8f80f 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -1,56 +1,16 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::passenger class' do
-  case fact('osfamily')
-  when 'Debian'
-    conf_file = "#{$mod_dir}/passenger.conf"
-    load_file = "#{$mod_dir}/zpassenger.load"
+describe 'apache::mod::passenger class', if: fact('osfamily') == 'Debian' do
+  conf_file = "#{$mod_dir}/passenger.conf"
+  load_file = "#{$mod_dir}/zpassenger.load"
 
-    case fact('operatingsystem')
-    when 'Ubuntu'
-      case fact('lsbdistrelease')
-      when '14.04'
-        passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_default_ruby = '/usr/bin/ruby'
-      when '16.04'
-        passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_default_ruby = '/usr/bin/ruby'
-      else
-        # Includes 10.04 and 12.04
-        # This may or may not work on Ubuntu releases other than the above
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      end
-    when 'Debian'
-      case fact('operatingsystemmajrelease')
-      when '8'
-        passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_default_ruby = '/usr/bin/ruby'
-      when '9'
-        passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_default_ruby = '/usr/bin/ruby'
-      else
-        # Includes wheezy
-        # This may or may not work on Debian releases other than the above
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      end
-    end
+  passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+  passenger_default_ruby = '/usr/bin/ruby'
 
-    passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so'
-    rackapp_user = 'www-data'
-    rackapp_group = 'www-data'
-  when 'RedHat'
-    conf_file = "#{$mod_dir}/passenger.conf"
-    load_file = "#{$mod_dir}/zpassenger.load"
-    # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part
-    passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-    passenger_ruby = '/usr/bin/ruby'
-    passenger_module_path = 'modules/mod_passenger.so'
-    rackapp_user = 'apache'
-    rackapp_group = 'apache'
-  end
+  passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so'
+  rackapp_user = 'www-data'
+  rackapp_group = 'www-data'
 
   pp_rackapp = <<-MANIFEST
     /* a simple ruby rack 'hello world' app */
@@ -75,178 +35,134 @@
     host { 'passenger.example.com': ip => '127.0.0.1', }
   MANIFEST
 
-  case fact('osfamily')
-  when 'Debian'
-    context 'passenger config with passenger_installed_version set' do
-      pp_one = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::passenger':
-          passenger_installed_version     => '4.0.0',
-          passenger_instance_registry_dir => '/some/path/to/nowhere'
-        }
-      MANIFEST
-      it 'fails when an option is not valid for $passenger_installed_version' do
-        apply_manifest(pp_one, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{passenger_instance_registry_dir is not introduced until version 5.0.0})
-        end
-      end
-      pp_two = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::passenger':
-          passenger_installed_version => '5.0.0',
-          rails_autodetect            => 'on'
-        }
-      MANIFEST
-      it 'fails when an option is removed' do
-        apply_manifest(pp_two, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{REMOVED PASSENGER OPTION})
-        end
-      end
-      pp_three = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::passenger':
-          passenger_installed_version => '5.0.0',
-          rails_ruby                  => '/some/path/to/ruby'
-        }
-      MANIFEST
-      it 'warns when an option is deprecated' do
-        apply_manifest(pp_three, catch_failures: true) do |r|
-          expect(r.stderr).to match(%r{DEPRECATED PASSENGER OPTION})
-        end
+  context 'passenger config with passenger_installed_version set' do
+    pp_one = <<-MANIFEST
+      class { 'apache': }
+      class { 'apache::mod::passenger':
+        passenger_installed_version     => '4.0.0',
+        passenger_instance_registry_dir => '/some/path/to/nowhere'
+      }
+    MANIFEST
+    it 'fails when an option is not valid for $passenger_installed_version' do
+      apply_manifest(pp_one, expect_failures: true) do |r|
+        expect(r.stderr).to match(%r{passenger_instance_registry_dir is not introduced until version 5.0.0})
       end
     end
-    context 'default passenger config' do
-      pp =  if ['7', '9', '16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
-              <<-MANIFEST
-                /* stock apache and mod_passenger */
-                class { 'apache': }
-                class { 'apache::mod::passenger':
-                  passenger_instance_registry_dir => '/var/run',
-                }
-                #{pp_rackapp}
-              MANIFEST
-            else
-              <<-MANIFEST
-                /* stock apache and mod_passenger */
-                class { 'apache': }
-                class { 'apache::mod::passenger': }
-                #{pp_rackapp}
-              MANIFEST
-            end
-      it 'succeeds in puppeting passenger' do
-        apply_manifest(pp, catch_failures: true)
+    pp_two = <<-MANIFEST
+      class { 'apache': }
+      class { 'apache::mod::passenger':
+        passenger_installed_version => '5.0.0',
+        rails_autodetect            => 'on'
+      }
+    MANIFEST
+    it 'fails when an option is removed' do
+      apply_manifest(pp_two, expect_failures: true) do |r|
+        expect(r.stderr).to match(%r{REMOVED PASSENGER OPTION})
       end
-
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        else
-          it { is_expected.to be_enabled }
-        end
-        it { is_expected.to be_running }
+    end
+    pp_three = <<-MANIFEST
+      class { 'apache': }
+      class { 'apache::mod::passenger':
+        passenger_installed_version => '5.0.0',
+        rails_ruby                  => '/some/path/to/ruby'
+      }
+    MANIFEST
+    it 'warns when an option is deprecated' do
+      apply_manifest(pp_three, catch_failures: true) do |r|
+        expect(r.stderr).to match(%r{DEPRECATED PASSENGER OPTION})
       end
-
-      describe file(conf_file) do
-        it { is_expected.to contain %(PassengerRoot "#{passenger_root}") }
-        case fact('operatingsystem')
-        when 'Ubuntu'
-          case fact('lsbdistrelease')
-          when '14.04'
-            it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
-            it { is_expected.not_to contain '/PassengerRuby/' }
-          when '16.04'
-            it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
-            it { is_expected.not_to contain '/PassengerRuby/' }
-          else
-            # Includes 10.04 and 12.04
-            # This may or may not work on Ubuntu releases other than the above
-            it { is_expected.to contain %(PassengerRuby "#{passenger_ruby}) }
-            it { is_expected.not_to contain '/PassengerDefaultRuby/' }
-          end
-        when 'Debian'
-          case fact('operatingsystemmajrelease')
-          when '8'
-            it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
-            it { is_expected.not_to contain '/PassengerRuby/' }
-          when '9'
-            it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
-            it { is_expected.not_to contain '/PassengerRuby/' }
+    end
+  end
+  context 'default passenger config' do
+    # We need to set passenger_instance_registry_dir on every sane distro
+    # with systemd. Systemd can force processes into a seperate/private
+    # tmpdir. This is the default for apache on Ubuntu 18.04. As a result,
+    # passenger CLI tools can't find the config/socket, which defaults to /tmp
+    # we enable it for ubuntu 16.04/18.04, centos7 and debian 9
+    pp =  if ['7', '9', '16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
+            <<-MANIFEST
+              /* stock apache and mod_passenger */
+              class { 'apache': }
+              class { 'apache::mod::passenger':
+                passenger_instance_registry_dir => '/var/run',
+              }
+              #{pp_rackapp}
+            MANIFEST
           else
-            # Includes wheezy
-            # This may or may not work on Debian releases other than the above
-            it { is_expected.to contain %(PassengerRuby "#{passenger_ruby}) }
-            it { is_expected.not_to contain '/PassengerDefaultRuby/' }
+            <<-MANIFEST
+              /* stock apache and mod_passenger */
+              class { 'apache': }
+              class { 'apache::mod::passenger': }
+              #{pp_rackapp}
+            MANIFEST
           end
-        end
-      end
-      # rubocop:enable RSpec/RepeatedExample
+    it 'succeeds in puppeting passenger' do
+      apply_manifest(pp, catch_failures: true)
+    end
 
-      describe file(load_file) do
-        it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      else
+        it { is_expected.to be_enabled }
       end
+      it { is_expected.to be_running }
+    end
 
-      expected_one = [%r{Apache processes}, %r{Nginx processes}, %r{Passenger processes}]
-      # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain
-      # these two lines
-      unless (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') ||
-             (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
-             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') ||
-             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
-        expected_one << [%r{### Processes: [0-9]+}, %r{### Total private dirty RSS: [0-9\.]+ MB}]
-      end
-      it 'outputs status via passenger-memory-stats #stdout' do
-        expected_one.each do |expect|
-          shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats') do |r|
-            expect(r.stdout).to match(expect)
-          end
-        end
-      end
-      it 'outputs status via passenger-memory-stats #exit_code' do
+    describe file(conf_file) do
+      it { is_expected.to contain %(PassengerRoot "#{passenger_root}") }
+      it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
+      it { is_expected.not_to contain '/PassengerRuby/' }
+    end
+    # rubocop:enable RSpec/RepeatedExample
+
+    describe file(load_file) do
+      it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
+    end
+
+    expected_one = [%r{Apache processes}, %r{Nginx processes}, %r{Passenger processes}]
+    it 'outputs status via passenger-memory-stats #stdout' do
+      expected_one.each do |expect|
         shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats') do |r|
-          expect(r.exit_code).to eq(0)
+          expect(r.stdout).to match(expect)
         end
       end
+    end
+    it 'outputs status via passenger-memory-stats #exit_code' do
+      shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats') do |r|
+        expect(r.exit_code).to eq(0)
+      end
+    end
 
-      # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
-      # even when the passenger process is successfully installed and running
-      unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
-        it 'outputs status via passenger-status #General information' do
-          shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
-            # spacing may vary
-            expect(r.stdout).to match(%r{[\-]+ General information [\-]+})
-          end
-        end
-        expected_two = if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') ||
-                          (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') ||
-                          (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') ||
-                          (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
-                         [%r{Max pool size[ ]+: [0-9]+}, %r{Processes[ ]+: [0-9]+}, %r{Requests in top-level queue[ ]+: [0-9]+}]
-                       else
-                         [%r{max[ ]+= [0-9]+}, %r{count[ ]+= [0-9]+}, %r{active[ ]+= [0-9]+}, %r{inactive[ ]+= [0-9]+}, %r{Waiting on global queue: [0-9]+}]
-                       end
-        it 'outputs status via passenger-status #stdout' do
-          shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
-            expected_two.each do |expect|
-              expect(r.stdout).to match(expect)
-            end
-          end
-        end
-        it 'outputs status via passenger-status #exit_code' do
-          shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
-            expect(r.exit_code).to eq(0)
-          end
-        end
+    it 'outputs status via passenger-status #General information' do
+      shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
+        # spacing may vary
+        expect(r.stdout).to match(%r{[\-]+ General information [\-]+})
       end
+    end
 
-      it 'answers to passenger.example.com #stdout' do
-        shell('/usr/bin/curl passenger.example.com:80') do |r|
-          expect(r.stdout).to match(%r{^hello <b>world<\/b>$})
+    expected_two = [%r{Max pool size[ ]+: [0-9]+}, %r{Processes[ ]+: [0-9]+}, %r{Requests in top-level queue[ ]+: [0-9]+}]
+    it 'outputs status via passenger-status #stdout' do
+      shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
+        expected_two.each do |expect|
+          expect(r.stdout).to match(expect)
         end
       end
-      it 'answers to passenger.example.com #exit_code' do
-        shell('/usr/bin/curl passenger.example.com:80') do |r|
-          expect(r.exit_code).to eq(0)
-        end
+    end
+    it 'outputs status via passenger-status #exit_code' do
+      shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
+        expect(r.exit_code).to eq(0)
+      end
+    end
+
+    it 'answers to passenger.example.com #stdout' do
+      shell('/usr/bin/curl passenger.example.com:80') do |r|
+        expect(r.stdout).to match(%r{^hello <b>world<\/b>$})
+      end
+    end
+    it 'answers to passenger.example.com #exit_code' do
+      shell('/usr/bin/curl passenger.example.com:80') do |r|
+        expect(r.exit_code).to eq(0)
       end
     end
   end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index fa9e5d8195..8d5df588bf 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -4,6 +4,28 @@
 unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12'
   describe 'apache::mod::php class' do
     context 'default php config' do
+      if ['16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
+        # this policy defaults to 101. it prevents newly installed services from starting
+        # it is useful for containers, it prevents new processes during 'docker build'
+        # but we actually want to test the services and this should not behave like docker
+        # but like a normal operating system
+
+        # without this apache fails to start -> installation of mod-php-something fails because it reloads apache to enable the module
+        # exit codes are documented at https://askubuntu.com/a/365912. Default for docker images is 101
+        shell("if [ -a '/usr/sbin/policy-rc.d' ]; then sed -i 's/^exit.*/exit 0/' /usr/sbin/policy-rc.d; fi")
+      end
+      if fact('operatingsystemmajrelease') == '18.04'
+        # apache helper script has a bug which prevents the installation of certain apache modules
+        # https://bugs.launchpad.net/ubuntu/+source/php7.2/+bug/1771934
+        # https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1782806
+        pp1 = "class { 'apache': mpm_module => 'prefork',}"
+        it 'succeeds in installing apache' do
+          apply_manifest(pp1, catch_failures: true)
+        end
+        it 'fixes the broken apache2 helper from Ubuntu 18.04' do
+          shell("sed -i 's|a2query -m \"$mpm_$MPM\"|a2query -m \"mpm_$MPM\"|' /usr/share/apache2/apache2-maintscript-helper")
+        end
+      end
       pp = <<-MANIFEST
           class { 'apache':
             mpm_module => 'prefork',
@@ -37,6 +59,10 @@ class { 'apache::mod::php': }
         describe file("#{$mod_dir}/php7.0.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
+      elsif fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04'
+        describe file("#{$mod_dir}/php7.2.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
       else
         describe file("#{$mod_dir}/php5.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
@@ -126,30 +152,8 @@ class {'apache::mod::php':
         describe file("#{$mod_dir}/php7.0.conf") do
           it { is_expected.to contain '# somecontent' }
         end
-      else
-        describe file("#{$mod_dir}/php5.conf") do
-          it { is_expected.to contain '# somecontent' }
-        end
-      end
-    end
-
-    context 'provide content and template config file' do
-      pp = <<-MANIFEST
-          class {'apache':
-            mpm_module => 'prefork',
-          }
-          class {'apache::mod::php':
-            content  => '# somecontent',
-            template => 'apache/mod/php5.conf.erb',
-          }
-      MANIFEST
-      it 'succeeds in puppeting php' do
-        apply_manifest(pp, catch_failures: true)
-      end
-
-      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
-         (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
-        describe file("#{$mod_dir}/php7.0.conf") do
+      elsif fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04'
+        describe file("#{$mod_dir}/php7.2.conf") do
           it { is_expected.to contain '# somecontent' }
         end
       else
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index bc25b742c4..265f6aaf04 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -76,7 +76,8 @@ class { 'apache::mod::security': }
       end
 
       unless fact('operatingsystem') == 'SLES' ||
-             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
+             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+             (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
         it 'blocks query with SQL' do
           shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
         end
@@ -116,7 +117,8 @@ class { 'apache::mod::security': }
     end
 
     unless fact('operatingsystem') == 'SLES' ||
-           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
+           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -179,7 +181,8 @@ class { 'apache::mod::security': }
     end
 
     unless  fact('operatingsystem') == 'SLES' ||
-            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
+            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+            (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -246,7 +249,8 @@ class { 'apache::mod::security': }
     end
 
     unless  fact('operatingsystem') == 'SLES' ||
-            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
+            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+            (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -313,7 +317,8 @@ class { 'apache::mod::security': }
     end
 
     unless  fact('operatingsystem') == 'SLES' ||
-            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
+            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+            (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -380,7 +385,8 @@ class { 'apache::mod::security': }
     end
 
     unless  fact('operatingsystem') == 'SLES' ||
-            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
+            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+            (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
diff --git a/spec/acceptance/mod_suphp_spec.rb b/spec/acceptance/mod_suphp_spec.rb
deleted file mode 100644
index 6950202900..0000000000
--- a/spec/acceptance/mod_suphp_spec.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::suphp class', if: (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') != '16.04') do
-  context 'default suphp config' do
-    pp = <<-MANIFEST
-class { 'apache':
-  mpm_module => 'prefork',
-}
-host { 'suphp.example.com': ip => '127.0.0.1', }
-apache::vhost { 'suphp.example.com':
-  port    => '80',
-  docroot => '/var/www/suphp',
-}
-file { '/var/www/suphp/index.php':
-  ensure  => file,
-  owner   => 'daemon',
-  group   => 'daemon',
-  content => "<?php echo get_current_user(); ?>\\n",
-  require => File['/var/www/suphp'],
-  before  => Class['apache::mod::php'],
-}
-class { 'apache::mod::php': }
-class { 'apache::mod::suphp': }
-    MANIFEST
-    # rubocop:enable Layout/IndentHeredoc
-    it 'succeeds in puppeting suphp' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service('apache2') do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    it 'answers to suphp.example.com #timeout' do
-      timeout = 0
-      loop do
-        r = shell('curl suphp.example.com:80')
-        timeout += 1
-        break if r.stdout =~ %r{^daemon$}
-        break expect(timeout < 40).to be true if timeout > 40
-        sleep(1)
-      end
-    end
-    it 'answers to suphp.example.com #stdout' do
-      shell('/usr/bin/curl suphp.example.com:80') do |r|
-        expect(r.stdout).to match(%r{^daemon$})
-      end
-    end
-    it 'answers to suphp.example.com #exit_code' do
-      shell('/usr/bin/curl suphp.example.com:80') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end
-end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 49b554aa2a..dc97bfa2b8 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -964,9 +964,7 @@ class { 'apache': }
     describe file($ports_file) do
       it { is_expected.to be_file }
       if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
-         fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') =~ %r{(14\.04|16\.04)} ||
-         fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8' ||
-         fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9' ||
+         fact('osfamily') == 'Debian' ||
          fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
@@ -1566,9 +1564,8 @@ class { 'apache': }
   end
 
   # Limit testing to Debian, since Centos does not have fastcgi package.
-  case fact('osfamily')
-  when 'Debian'
-    next if fact('operatingsystemmajrelease') == '9' # Debian 9 does not support this fastcgi
+  # In addition Debian 9/Ubuntu 18.04 no longer support this fastcgi
+  if fact('osfamily') == 'Debian' && !['9', '18.04'].include?(fact('operatingsystemmajrelease'))
     describe 'fastcgi' do
       pp_one = <<-MANIFEST
         $_os = $::operatingsystem
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index a94844cf54..7ef4281f84 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -1,92 +1,34 @@
 require 'spec_helper'
 
-describe 'apache::dev', type: :class do
-  let(:pre_condition) do
-    [
-      'include apache',
-    ]
-  end
+describe 'apache::dev' do
+  on_supported_os.each do |os, facts|
+    context "on #{os} " do
+      let :facts do
+        facts
+      end
 
-  context 'on a Debian OS' do
-    let :facts do
-      {
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '6',
-        is_pe: false,
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        kernel: 'Linux',
-      }
-    end
+      context 'with all defaults' do
+        let(:pre_condition) do
+          [
+            'include apache',
+          ]
+        end
 
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_package('libaprutil1-dev') }
-    it { is_expected.to contain_package('libapr1-dev') }
-    it { is_expected.to contain_package('apache2-prefork-dev') }
-  end
-  context 'on an Ubuntu 16 OS' do
-    let :facts do
-      {
-        lsbdistrelease: '16.04',
-        lsbdistcodename: 'xenial',
-        osfamily: 'Debian',
-        operatingsystem: 'Ubuntu',
-        operatingsystemrelease: '16.04',
-        is_pe: false,
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        kernel: 'Linux',
-      }
+        it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_class('apache::params') }
+        case facts[:os]['name']
+        when 'Debian'
+          it { is_expected.to contain_package('libaprutil1-dev') }
+          it { is_expected.to contain_package('libapr1-dev') }
+          if facts[:os]['release']['major'].to_i < 8
+            it { is_expected.to contain_package('apache2-prefork-dev') }
+          end
+        when 'Ubuntu'
+          it { is_expected.to contain_package('apache2-dev') }
+        when 'RedHat'
+          it { is_expected.to contain_package('httpd-devel') }
+        end
+      end
     end
-
-    it { is_expected.to contain_package('apache2-dev') }
-  end
-  context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '6',
-        is_pe: false,
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        kernel: 'Linux',
-      }
-    end
-
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_package('httpd-devel') }
-  end
-  context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystem: 'FreeBSD',
-        operatingsystemrelease: '9',
-        is_pe: false,
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        kernel: 'FreeBSD',
-      }
-    end
-
-    it { is_expected.to contain_class('apache::params') }
-  end
-  context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        is_pe: false,
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-        kernel: 'Linux',
-      }
-    end
-
-    it { is_expected.to contain_class('apache::params') }
   end
 end
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index d60da277e0..1e054a9f86 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -1,43 +1,40 @@
 require 'spec_helper'
 
 describe 'apache::mod::fastcgi', type: :class do
-  it_behaves_like 'a mod class, without including apache'
-  context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'squeze',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_apache__mod('fastcgi') }
-    it { is_expected.to contain_package('libapache2-mod-fastcgi') }
-    it { is_expected.to contain_file('fastcgi.conf') }
-  end
+  on_supported_os.each do |os, facts|
+    context "on #{os} " do
+      let :facts do
+        facts
+      end
 
-  context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
+      context 'with all defaults' do
+        case facts[:os]['name']
+        when 'Debian'
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_class('apache::params') }
+          it { is_expected.to contain_apache__mod('fastcgi') }
+          it { is_expected.to contain_package('libapache2-mod-fastcgi') }
+          it { is_expected.to contain_file('fastcgi.conf') }
+        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific'
+          if facts[:os]['release']['major'].to_i < 7
+            it { is_expected.to compile.with_all_deps }
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_apache__mod('fastcgi') }
+            it { is_expected.to contain_package('mod_fastcgi') }
+            it { is_expected.not_to contain_file('fastcgi.conf') }
+          else
+            it { is_expected.not_to compile }
+          end
+        when 'Ubuntu'
+          if facts[:os]['release']['major'].to_i < 18
+            it { is_expected.to compile.with_all_deps }
+          else
+            it { is_expected.not_to compile }
+          end
+        else
+          it { is_expected.to compile.with_all_deps }
+        end
+      end
     end
-
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_apache__mod('fastcgi') }
-    it { is_expected.to contain_package('mod_fastcgi') }
-    it { is_expected.not_to contain_file('fastcgi.conf') }
   end
 end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index e0136ec891..5ef80738b2 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -1,479 +1,405 @@
 require 'spec_helper'
 
 describe 'apache::mod::passenger', type: :class do
-  it_behaves_like 'a mod class, without including apache'
-  context 'validating all passenger params - using Debian' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        kernel: 'Linux',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+  on_supported_os.each do |os, facts|
+    context "on #{os} " do
+      let :facts do
+        facts
+      end
 
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package('libapache2-mod-passenger') }
-    it {
-      is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
-    }
-    it {
-      is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
-    }
-
-    passenger_config_options = {
-      'passenger_allow_encoded_slashes' => { type: 'OnOff', pass_opt: :PassengerAllowEncodedSlashes },
-      'passenger_app_env' => { type: 'String', pass_opt: :PassengerAppEnv },
-      'passenger_app_group_name' => { type: 'String', pass_opt: :PassengerAppGroupName },
-      'passenger_app_root' => { type: 'FullPath', pass_opt: :PassengerAppRoot },
-      'passenger_app_type' => { type: 'String', pass_opt: :PassengerAppType },
-      'passenger_base_uri' => { type: 'URI', pass_opt: :PassengerBaseURI },
-      'passenger_buffer_response' => { type: 'OnOff', pass_opt: :PassengerBufferResponse },
-      'passenger_buffer_upload' => { type: 'OnOff', pass_opt: :PassengerBufferUpload },
-      'passenger_concurrency_model' => { type: ['process', 'thread'], pass_opt: :PassengerConcurrencyModel },
-      'passenger_data_buffer_dir' => { type: 'FullPath', pass_opt: :PassengerDataBufferDir },
-      'passenger_debug_log_file' => { type: 'String', pass_opt: :PassengerDebugLogFile },
-      'passenger_debugger' => { type: 'OnOff', pass_opt: :PassengerDebugger },
-      'passenger_default_group' => { type: 'String', pass_opt: :PassengerDefaultGroup },
-      'passenger_default_ruby' => { type: 'FullPath', pass_opt: :PassengerDefaultRuby },
-      'passenger_default_user' => { type: 'String', pass_opt: :PassengerDefaultUser },
-      'passenger_disable_security_update_check' => { type: 'OnOff', pass_opt: :PassengerDisableSecurityUpdateCheck },
-      'passenger_enabled' => { type: 'OnOff', pass_opt: :PassengerEnabled },
-      'passenger_error_override' => { type: 'OnOff', pass_opt: :PassengerErrorOverride },
-      'passenger_file_descriptor_log_file' => { type: 'FullPath', pass_opt: :PassengerFileDescriptorLogFile },
-      'passenger_fly_with' => { type: 'FullPath', pass_opt: :PassengerFlyWith },
-      'passenger_force_max_concurrent_requests_per_process' => { type: 'Integer', pass_opt: :PassengerForceMaxConcurrentRequestsPerProcess },
-      'passenger_friendly_error_pages' => { type: 'OnOff', pass_opt: :PassengerFriendlyErrorPages },
-      'passenger_group' => { type: 'String', pass_opt: :PassengerGroup },
-      'passenger_high_performance' => { type: 'OnOff', pass_opt: :PassengerHighPerformance },
-      'passenger_instance_registry_dir' => { type: 'FullPath', pass_opt: :PassengerInstanceRegistryDir },
-      'passenger_load_shell_envvars' => { type: 'OnOff', pass_opt: :PassengerLoadShellEnvvars },
-      'passenger_log_file' => { type: 'FullPath', pass_opt: :PassengerLogFile },
-      'passenger_log_level' => { type: 'Integer', pass_opt: :PassengerLogLevel },
-      'passenger_lve_min_uid' => { type: 'Integer', pass_opt: :PassengerLveMinUid },
-      'passenger_max_instances' => { type: 'Integer', pass_opt: :PassengerMaxInstances },
-      'passenger_max_instances_per_app' => { type: 'Integer', pass_opt: :PassengerMaxInstancesPerApp },
-      'passenger_max_pool_size' => { type: 'Integer', pass_opt: :PassengerMaxPoolSize },
-      'passenger_max_preloader_idle_time' => { type: 'Integer', pass_opt: :PassengerMaxPreloaderIdleTime },
-      'passenger_max_request_queue_size' => { type: 'Integer', pass_opt: :PassengerMaxRequestQueueSize },
-      'passenger_max_request_time' => { type: 'Integer', pass_opt: :PassengerMaxRequestTime },
-      'passenger_max_requests' => { type: 'Integer', pass_opt: :PassengerMaxRequests },
-      'passenger_memory_limit' => { type: 'Integer', pass_opt: :PassengerMemoryLimit },
-      'passenger_meteor_app_settings' => { type: 'FullPath', pass_opt: :PassengerMeteorAppSettings },
-      'passenger_min_instances' => { type: 'Integer', pass_opt: :PassengerMinInstances },
-      'passenger_nodejs' => { type: 'FullPath', pass_opt: :PassengerNodejs },
-      'passenger_pool_idle_time' => { type: 'Integer', pass_opt: :PassengerPoolIdleTime },
-      'passenger_pre_start' => { type: 'URI', pass_opt: :PassengerPreStart },
-      'passenger_python' => { type: 'FullPath', pass_opt: :PassengerPython },
-      'passenger_resist_deployment_errors' => { type: 'OnOff', pass_opt: :PassengerResistDeploymentErrors },
-      'passenger_resolve_symlinks_in_document_root' => { type: 'OnOff', pass_opt: :PassengerResolveSymlinksInDocumentRoot },
-      'passenger_response_buffer_high_watermark' => { type: 'Integer', pass_opt: :PassengerResponseBufferHighWatermark },
-      'passenger_restart_dir' => { type: 'Path', pass_opt: :PassengerRestartDir },
-      'passenger_rolling_restarts' => { type: 'OnOff', pass_opt: :PassengerRollingRestarts },
-      'passenger_root' => { type: 'FullPath', pass_opt: :PassengerRoot },
-      'passenger_ruby' => { type: 'FullPath', pass_opt: :PassengerRuby },
-      'passenger_security_update_check_proxy' => { type: 'URI', pass_opt: :PassengerSecurityUpdateCheckProxy },
-      'passenger_show_version_in_header' => { type: 'OnOff', pass_opt: :PassengerShowVersionInHeader },
-      'passenger_socket_backlog' => { type: 'Integer', pass_opt: :PassengerSocketBacklog },
-      'passenger_spawn_method' => { type: ['smart', 'direct'], pass_opt: :PassengerSpawnMethod },
-      'passenger_start_timeout' => { type: 'Integer', pass_opt: :PassengerStartTimeout },
-      'passenger_startup_file' => { type: 'RelPath', pass_opt: :PassengerStartupFile },
-      'passenger_stat_throttle_rate' => { type: 'Integer', pass_opt: :PassengerStatThrottleRate },
-      'passenger_sticky_sessions' => { type: 'OnOff', pass_opt: :PassengerStickySessions },
-      'passenger_sticky_sessions_cookie_name' => { type: 'String', pass_opt: :PassengerStickySessionsCookieName },
-      'passenger_thread_count' => { type: 'Integer', pass_opt: :PassengerThreadCount },
-      'passenger_use_global_queue' => { type: 'String', pass_opt: :PassengerUseGlobalQueue },
-      'passenger_user' => { type: 'String', pass_opt: :PassengerUser },
-      'passenger_user_switching' => { type: 'OnOff', pass_opt: :PassengerUserSwitching },
-      'rack_auto_detect' => { type: 'String', pass_opt: :RackAutoDetect },
-      'rack_autodetect' => { type: 'String', pass_opt: :RackAutoDetect },
-      'rack_base_uri' => { type: 'String', pass_opt: :RackBaseURI },
-      'rack_env' => { type: 'String', pass_opt: :RackEnv },
-      'rails_allow_mod_rewrite' => { type: 'String', pass_opt: :RailsAllowModRewrite },
-      'rails_app_spawner_idle_time' => { type: 'String', pass_opt: :RailsAppSpawnerIdleTime },
-      'rails_auto_detect' => { type: 'String', pass_opt: :RailsAutoDetect },
-      'rails_autodetect' => { type: 'String', pass_opt: :RailsAutoDetect },
-      'rails_base_uri' => { type: 'String', pass_opt: :RailsBaseURI },
-      'rails_default_user' => { type: 'String', pass_opt: :RailsDefaultUser },
-      'rails_env' => { type: 'String', pass_opt: :RailsEnv },
-      'rails_framework_spawner_idle_time' => { type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime },
-      'rails_ruby' => { type: 'String', pass_opt: :RailsRuby },
-      'rails_spawn_method' => { type: 'String', pass_opt: :RailsSpawnMethod },
-      'rails_user_switching' => { type: 'String', pass_opt: :RailsUserSwitching },
-      'wsgi_auto_detect' => { type: 'String', pass_opt: :WsgiAutoDetect },
-    }
-    passenger_config_options.each do |config_option, config_hash|
-      puppetized_config_option = config_option
-      case config_hash[:type]
-        # UnionStationFilter values are quoted strings
-      when 'QuotedString'
-        valid_config_values = ['"a quoted string"']
-        valid_config_values.each do |valid_value|
-          describe "with #{puppetized_config_option} => '#{valid_value.delete('"')}'" do
-            let :params do
-              { puppetized_config_option.to_sym => valid_value }
+      case facts[:os]['family']
+      when 'Debian'
+        context 'validating all passenger params - using Debian' do
+          it { is_expected.to contain_class('apache::params') }
+          it { is_expected.to contain_apache__mod('passenger') }
+          it { is_expected.to contain_package('libapache2-mod-passenger') }
+          it {
+            is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
+          }
+          it {
+            is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
+          }
+
+          passenger_config_options = {
+            'passenger_allow_encoded_slashes' => { type: 'OnOff', pass_opt: :PassengerAllowEncodedSlashes },
+            'passenger_app_env' => { type: 'String', pass_opt: :PassengerAppEnv },
+            'passenger_app_group_name' => { type: 'String', pass_opt: :PassengerAppGroupName },
+            'passenger_app_root' => { type: 'FullPath', pass_opt: :PassengerAppRoot },
+            'passenger_app_type' => { type: 'String', pass_opt: :PassengerAppType },
+            'passenger_base_uri' => { type: 'URI', pass_opt: :PassengerBaseURI },
+            'passenger_buffer_response' => { type: 'OnOff', pass_opt: :PassengerBufferResponse },
+            'passenger_buffer_upload' => { type: 'OnOff', pass_opt: :PassengerBufferUpload },
+            'passenger_concurrency_model' => { type: ['process', 'thread'], pass_opt: :PassengerConcurrencyModel },
+            'passenger_data_buffer_dir' => { type: 'FullPath', pass_opt: :PassengerDataBufferDir },
+            'passenger_debug_log_file' => { type: 'String', pass_opt: :PassengerDebugLogFile },
+            'passenger_debugger' => { type: 'OnOff', pass_opt: :PassengerDebugger },
+            'passenger_default_group' => { type: 'String', pass_opt: :PassengerDefaultGroup },
+            'passenger_default_ruby' => { type: 'FullPath', pass_opt: :PassengerDefaultRuby },
+            'passenger_default_user' => { type: 'String', pass_opt: :PassengerDefaultUser },
+            'passenger_disable_security_update_check' => { type: 'OnOff', pass_opt: :PassengerDisableSecurityUpdateCheck },
+            'passenger_enabled' => { type: 'OnOff', pass_opt: :PassengerEnabled },
+            'passenger_error_override' => { type: 'OnOff', pass_opt: :PassengerErrorOverride },
+            'passenger_file_descriptor_log_file' => { type: 'FullPath', pass_opt: :PassengerFileDescriptorLogFile },
+            'passenger_fly_with' => { type: 'FullPath', pass_opt: :PassengerFlyWith },
+            'passenger_force_max_concurrent_requests_per_process' => { type: 'Integer', pass_opt: :PassengerForceMaxConcurrentRequestsPerProcess },
+            'passenger_friendly_error_pages' => { type: 'OnOff', pass_opt: :PassengerFriendlyErrorPages },
+            'passenger_group' => { type: 'String', pass_opt: :PassengerGroup },
+            'passenger_high_performance' => { type: 'OnOff', pass_opt: :PassengerHighPerformance },
+            'passenger_instance_registry_dir' => { type: 'FullPath', pass_opt: :PassengerInstanceRegistryDir },
+            'passenger_load_shell_envvars' => { type: 'OnOff', pass_opt: :PassengerLoadShellEnvvars },
+            'passenger_log_file' => { type: 'FullPath', pass_opt: :PassengerLogFile },
+            'passenger_log_level' => { type: 'Integer', pass_opt: :PassengerLogLevel },
+            'passenger_lve_min_uid' => { type: 'Integer', pass_opt: :PassengerLveMinUid },
+            'passenger_max_instances' => { type: 'Integer', pass_opt: :PassengerMaxInstances },
+            'passenger_max_instances_per_app' => { type: 'Integer', pass_opt: :PassengerMaxInstancesPerApp },
+            'passenger_max_pool_size' => { type: 'Integer', pass_opt: :PassengerMaxPoolSize },
+            'passenger_max_preloader_idle_time' => { type: 'Integer', pass_opt: :PassengerMaxPreloaderIdleTime },
+            'passenger_max_request_queue_size' => { type: 'Integer', pass_opt: :PassengerMaxRequestQueueSize },
+            'passenger_max_request_time' => { type: 'Integer', pass_opt: :PassengerMaxRequestTime },
+            'passenger_max_requests' => { type: 'Integer', pass_opt: :PassengerMaxRequests },
+            'passenger_memory_limit' => { type: 'Integer', pass_opt: :PassengerMemoryLimit },
+            'passenger_meteor_app_settings' => { type: 'FullPath', pass_opt: :PassengerMeteorAppSettings },
+            'passenger_min_instances' => { type: 'Integer', pass_opt: :PassengerMinInstances },
+            'passenger_nodejs' => { type: 'FullPath', pass_opt: :PassengerNodejs },
+            'passenger_pool_idle_time' => { type: 'Integer', pass_opt: :PassengerPoolIdleTime },
+            'passenger_pre_start' => { type: 'URI', pass_opt: :PassengerPreStart },
+            'passenger_python' => { type: 'FullPath', pass_opt: :PassengerPython },
+            'passenger_resist_deployment_errors' => { type: 'OnOff', pass_opt: :PassengerResistDeploymentErrors },
+            'passenger_resolve_symlinks_in_document_root' => { type: 'OnOff', pass_opt: :PassengerResolveSymlinksInDocumentRoot },
+            'passenger_response_buffer_high_watermark' => { type: 'Integer', pass_opt: :PassengerResponseBufferHighWatermark },
+            'passenger_restart_dir' => { type: 'Path', pass_opt: :PassengerRestartDir },
+            'passenger_rolling_restarts' => { type: 'OnOff', pass_opt: :PassengerRollingRestarts },
+            'passenger_root' => { type: 'FullPath', pass_opt: :PassengerRoot },
+            'passenger_ruby' => { type: 'FullPath', pass_opt: :PassengerRuby },
+            'passenger_security_update_check_proxy' => { type: 'URI', pass_opt: :PassengerSecurityUpdateCheckProxy },
+            'passenger_show_version_in_header' => { type: 'OnOff', pass_opt: :PassengerShowVersionInHeader },
+            'passenger_socket_backlog' => { type: 'Integer', pass_opt: :PassengerSocketBacklog },
+            'passenger_spawn_method' => { type: ['smart', 'direct'], pass_opt: :PassengerSpawnMethod },
+            'passenger_start_timeout' => { type: 'Integer', pass_opt: :PassengerStartTimeout },
+            'passenger_startup_file' => { type: 'RelPath', pass_opt: :PassengerStartupFile },
+            'passenger_stat_throttle_rate' => { type: 'Integer', pass_opt: :PassengerStatThrottleRate },
+            'passenger_sticky_sessions' => { type: 'OnOff', pass_opt: :PassengerStickySessions },
+            'passenger_sticky_sessions_cookie_name' => { type: 'String', pass_opt: :PassengerStickySessionsCookieName },
+            'passenger_thread_count' => { type: 'Integer', pass_opt: :PassengerThreadCount },
+            'passenger_use_global_queue' => { type: 'String', pass_opt: :PassengerUseGlobalQueue },
+            'passenger_user' => { type: 'String', pass_opt: :PassengerUser },
+            'passenger_user_switching' => { type: 'OnOff', pass_opt: :PassengerUserSwitching },
+            'rack_auto_detect' => { type: 'String', pass_opt: :RackAutoDetect },
+            'rack_autodetect' => { type: 'String', pass_opt: :RackAutoDetect },
+            'rack_base_uri' => { type: 'String', pass_opt: :RackBaseURI },
+            'rack_env' => { type: 'String', pass_opt: :RackEnv },
+            'rails_allow_mod_rewrite' => { type: 'String', pass_opt: :RailsAllowModRewrite },
+            'rails_app_spawner_idle_time' => { type: 'String', pass_opt: :RailsAppSpawnerIdleTime },
+            'rails_auto_detect' => { type: 'String', pass_opt: :RailsAutoDetect },
+            'rails_autodetect' => { type: 'String', pass_opt: :RailsAutoDetect },
+            'rails_base_uri' => { type: 'String', pass_opt: :RailsBaseURI },
+            'rails_default_user' => { type: 'String', pass_opt: :RailsDefaultUser },
+            'rails_env' => { type: 'String', pass_opt: :RailsEnv },
+            'rails_framework_spawner_idle_time' => { type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime },
+            'rails_ruby' => { type: 'String', pass_opt: :RailsRuby },
+            'rails_spawn_method' => { type: 'String', pass_opt: :RailsSpawnMethod },
+            'rails_user_switching' => { type: 'String', pass_opt: :RailsUserSwitching },
+            'wsgi_auto_detect' => { type: 'String', pass_opt: :WsgiAutoDetect },
+          }
+          passenger_config_options.each do |config_option, config_hash|
+            puppetized_config_option = config_option
+            case config_hash[:type]
+              # UnionStationFilter values are quoted strings
+            when 'QuotedString'
+              valid_config_values = ['"a quoted string"']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value.delete('"')}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} "#{valid_value}"$}) }
+                end
+              end
+            when 'FullPath', 'RelPath', 'Path'
+              valid_config_values = ['/some/path/to/somewhere']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => #{valid_value}" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} "#{valid_value}"$}) }
+                end
+              end
+            when 'URI', 'String', 'Integer'
+              valid_config_values = ['some_value_for_you']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => #{valid_value}" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'OnOff'
+              valid_config_values = ['on', 'off']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            else
+              valid_config_values = config_hash[:type]
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
             end
-
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} "#{valid_value}"$}) }
           end
         end
-      when 'FullPath', 'RelPath', 'Path'
-        valid_config_values = ['/some/path/to/somewhere']
-        valid_config_values.each do |valid_value|
-          describe "with #{puppetized_config_option} => #{valid_value}" do
-            let :params do
-              { puppetized_config_option.to_sym => valid_value }
-            end
 
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} "#{valid_value}"$}) }
+        it { is_expected.to contain_class('apache::params') }
+        it { is_expected.to contain_apache__mod('passenger') }
+        it { is_expected.to contain_package('libapache2-mod-passenger') }
+        it {
+          is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
+        }
+        it {
+          is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
+        }
+        describe "with passenger_root => '/usr/lib/example'" do
+          let :params do
+            { passenger_root: '/usr/lib/example' }
           end
-        end
-      when 'URI', 'String', 'Integer'
-        valid_config_values = ['some_value_for_you']
-        valid_config_values.each do |valid_value|
-          describe "with #{puppetized_config_option} => #{valid_value}" do
-            let :params do
-              { puppetized_config_option.to_sym => valid_value }
-            end
 
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
-          end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
         end
-      when 'OnOff'
-        valid_config_values = ['on', 'off']
-        valid_config_values.each do |valid_value|
-          describe "with #{puppetized_config_option} => '#{valid_value}'" do
-            let :params do
-              { puppetized_config_option.to_sym => valid_value }
-            end
-
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
+        describe 'with passenger_ruby => /usr/lib/example/ruby' do
+          let :params do
+            { passenger_ruby: '/usr/lib/example/ruby' }
           end
-        end
-      else
-        valid_config_values = config_hash[:type]
-        valid_config_values.each do |valid_value|
-          describe "with #{puppetized_config_option} => '#{valid_value}'" do
-            let :params do
-              { puppetized_config_option.to_sym => valid_value }
-            end
 
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
-          end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
         end
-      end
-    end
-  end
-  context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '6',
-        kernel: 'Linux',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package('libapache2-mod-passenger') }
-    it {
-      is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
-    }
-    it {
-      is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
-    }
-    describe "with passenger_root => '/usr/lib/example'" do
-      let :params do
-        { passenger_root: '/usr/lib/example' }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
-    end
-    describe 'with passenger_ruby => /usr/lib/example/ruby' do
-      let :params do
-        { passenger_ruby: '/usr/lib/example/ruby' }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
-    end
-    describe 'with passenger_default_ruby => /usr/lib/example/ruby1.9.3' do
-      let :params do
-        { passenger_ruby: '/usr/lib/example/ruby1.9.3' }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
-    end
-    describe 'with passenger_high_performance => on' do
-      let :params do
-        { passenger_high_performance: 'on' }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerHighPerformance on$}) }
-    end
-    describe 'with passenger_pool_idle_time => 1200' do
-      let :params do
-        { passenger_pool_idle_time: 1200 }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerPoolIdleTime 1200$}) }
-    end
-    describe 'with passenger_max_request_queue_size => 100' do
-      let :params do
-        { passenger_max_request_queue_size: 100 }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxRequestQueueSize 100$}) }
-    end
-
-    describe 'with passenger_max_requests => 20' do
-      let :params do
-        { passenger_max_requests: 20 }
-      end
-
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxRequests 20$}) }
-    end
-    describe 'with passenger_spawn_method => direct' do
-      let :params do
-        { passenger_spawn_method: 'direct' }
-      end
+        describe 'with passenger_default_ruby => /usr/lib/example/ruby1.9.3' do
+          let :params do
+            { passenger_ruby: '/usr/lib/example/ruby1.9.3' }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerSpawnMethod direct$}) }
-    end
-    describe 'with passenger_stat_throttle_rate => 10' do
-      let :params do
-        { passenger_stat_throttle_rate: 10 }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
+        end
+        describe 'with passenger_high_performance => on' do
+          let :params do
+            { passenger_high_performance: 'on' }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerStatThrottleRate 10$}) }
-    end
-    describe 'with passenger_max_pool_size => 16' do
-      let :params do
-        { passenger_max_pool_size: 16 }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerHighPerformance on$}) }
+        end
+        describe 'with passenger_pool_idle_time => 1200' do
+          let :params do
+            { passenger_pool_idle_time: 1200 }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxPoolSize 16$}) }
-    end
-    describe 'with passenger_min_instances => 5' do
-      let :params do
-        { passenger_min_instances: 5 }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerPoolIdleTime 1200$}) }
+        end
+        describe 'with passenger_max_request_queue_size => 100' do
+          let :params do
+            { passenger_max_request_queue_size: 100 }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMinInstances 5$}) }
-    end
-    describe 'with passenger_max_instances_per_app => 8' do
-      let :params do
-        { passenger_max_instances_per_app: 8 }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxRequestQueueSize 100$}) }
+        end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxInstancesPerApp 8$}) }
-    end
-    describe 'with rack_autodetect => on' do
-      let :params do
-        { rack_autodetect: 'on' }
-      end
+        describe 'with passenger_max_requests => 20' do
+          let :params do
+            { passenger_max_requests: 20 }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RackAutoDetect on$}) }
-    end
-    describe 'with rails_autodetect => on' do
-      let :params do
-        { rails_autodetect: 'on' }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxRequests 20$}) }
+        end
+        describe 'with passenger_spawn_method => direct' do
+          let :params do
+            { passenger_spawn_method: 'direct' }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RailsAutoDetect on$}) }
-    end
-    describe 'with passenger_use_global_queue => on' do
-      let :params do
-        { passenger_use_global_queue: 'on' }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerSpawnMethod direct$}) }
+        end
+        describe 'with passenger_stat_throttle_rate => 10' do
+          let :params do
+            { passenger_stat_throttle_rate: 10 }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerUseGlobalQueue on$}) }
-    end
-    describe "with passenger_app_env => 'foo'" do
-      let :params do
-        { passenger_app_env: 'foo' }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerStatThrottleRate 10$}) }
+        end
+        describe 'with passenger_max_pool_size => 16' do
+          let :params do
+            { passenger_max_pool_size: 16 }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerAppEnv foo$}) }
-    end
-    describe "with passenger_log_file => '/var/log/apache2/passenger.log'" do
-      let :params do
-        { passenger_log_file: '/var/log/apache2/passenger.log' }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxPoolSize 16$}) }
+        end
+        describe 'with passenger_min_instances => 5' do
+          let :params do
+            { passenger_min_instances: 5 }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogFile "/var/log/apache2/passenger.log"$}) }
-    end
-    describe 'with passenger_log_level => 3' do
-      let :params do
-        { passenger_log_level: 3 }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMinInstances 5$}) }
+        end
+        describe 'with passenger_max_instances_per_app => 8' do
+          let :params do
+            { passenger_max_instances_per_app: 8 }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogLevel 3$}) }
-    end
-    describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
-      let :params do
-        { mod_path: '/usr/lib/foo/mod_foo.so' }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxInstancesPerApp 8$}) }
+        end
+        describe 'with rack_autodetect => on' do
+          let :params do
+            { rack_autodetect: 'on' }
+          end
 
-      it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$}) }
-    end
-    describe "with mod_lib_path => '/usr/lib/foo'" do
-      let :params do
-        { mod_lib_path: '/usr/lib/foo' }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RackAutoDetect on$}) }
+        end
+        describe 'with rails_autodetect => on' do
+          let :params do
+            { rails_autodetect: 'on' }
+          end
 
-      it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$}) }
-    end
-    describe "with mod_lib => 'mod_foo.so'" do
-      let :params do
-        { mod_lib: 'mod_foo.so' }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RailsAutoDetect on$}) }
+        end
+        describe 'with passenger_use_global_queue => on' do
+          let :params do
+            { passenger_use_global_queue: 'on' }
+          end
 
-      it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$}) }
-    end
-    describe "with mod_id => 'mod_foo'" do
-      let :params do
-        { mod_id: 'mod_foo' }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerUseGlobalQueue on$}) }
+        end
+        describe "with passenger_app_env => 'foo'" do
+          let :params do
+            { passenger_app_env: 'foo' }
+          end
 
-      it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$}) }
-    end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerAppEnv foo$}) }
+        end
+        describe "with passenger_log_file => '/var/log/apache2/passenger.log'" do
+          let :params do
+            { passenger_log_file: '/var/log/apache2/passenger.log' }
+          end
 
-    context 'with Ubuntu 16.04 defaults' do
-      let :facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '16.04',
-          operatingsystem: 'Ubuntu',
-          kernel: 'Linux',
-          lsbdistrelease: '16.04',
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogFile "/var/log/apache2/passenger.log"$}) }
+        end
+        describe 'with passenger_log_level => 3' do
+          let :params do
+            { passenger_log_level: 3 }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
-    end
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogLevel 3$}) }
+        end
+        describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
+          let :params do
+            { mod_path: '/usr/lib/foo/mod_foo.so' }
+          end
 
-    context 'with Debian 8 defaults' do
-      let :facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '8.0',
-          operatingsystem: 'Debian',
-          kernel: 'Linux',
-          lsbdistcodename: 'jessie',
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$}) }
+        end
+        describe "with mod_lib_path => '/usr/lib/foo'" do
+          let :params do
+            { mod_lib_path: '/usr/lib/foo' }
+          end
 
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
-      it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
-    end
-  end
+          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$}) }
+        end
+        describe "with mod_lib => 'mod_foo.so'" do
+          let :params do
+            { mod_lib: 'mod_foo.so' }
+          end
 
-  context 'on a RedHat OS' do
-    let :rh_facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$}) }
+        end
+        describe "with mod_id => 'mod_foo'" do
+          let :params do
+            { mod_id: 'mod_foo' }
+          end
 
-    context 'on EL6' do
-      let(:facts) { rh_facts.merge(operatingsystemrelease: '6') }
-
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('passenger') }
-      it { is_expected.to contain_package('mod_passenger') }
-      it {
-        is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
-      }
-      it { is_expected.to contain_file('passenger_package.conf').without_content }
-      it { is_expected.to contain_file('passenger_package.conf').without_source }
-      it {
-        is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
-      }
-      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRoot}) }
-      it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
-      describe "with passenger_root => '/usr/lib/example'" do
-        let :params do
-          { passenger_root: '/usr/lib/example' }
+          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$}) }
         end
 
-        it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRoot "\/usr\/lib\/example"$}) }
-      end
-      describe 'with passenger_ruby => /usr/lib/example/ruby' do
-        let :params do
-          { passenger_ruby: '/usr/lib/example/ruby' }
+        context 'with Ubuntu 16.04 defaults' do
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
+          it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
+          it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
         end
 
-        it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRuby "\/usr\/lib\/example\/ruby"$}) }
+        if facts[:os]['release']['major'].to_i == 8
+          context 'with Debian 8 defaults' do
+            it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
+            it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
+            it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
+          end
+        end
+      when 'RedHat'
+        context 'on a RedHat OS' do
+          case facts[:os]['release']['major']
+          when '6'
+            context 'on EL6' do
+              it { is_expected.to contain_class('apache::params') }
+              it { is_expected.to contain_apache__mod('passenger') }
+              it { is_expected.to contain_package('mod_passenger') }
+              it {
+                is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
+              }
+              it { is_expected.to contain_file('passenger_package.conf').without_content }
+              it { is_expected.to contain_file('passenger_package.conf').without_source }
+              it {
+                is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
+              }
+              it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRoot}) }
+              it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
+              describe "with passenger_root => '/usr/lib/example'" do
+                let :params do
+                  { passenger_root: '/usr/lib/example' }
+                end
+
+                it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRoot "\/usr\/lib\/example"$}) }
+              end
+              describe 'with passenger_ruby => /usr/lib/example/ruby' do
+                let :params do
+                  { passenger_ruby: '/usr/lib/example/ruby' }
+                end
+
+                it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRuby "\/usr\/lib\/example\/ruby"$}) }
+              end
+            end
+          when '7'
+
+            context 'on EL7' do
+              it {
+                is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
+              }
+              it {
+                is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
+              }
+            end
+          end
+        end
+      when 'FreeBSD'
+        context 'on a FreeBSD OS' do
+          it { is_expected.to contain_class('apache::params') }
+          it { is_expected.to contain_apache__mod('passenger') }
+          it { is_expected.to contain_package('www/rubygem-passenger') }
+        end
+      when 'Gentoo'
+        context 'on a Gentoo OS' do
+          it { is_expected.to contain_class('apache::params') }
+          it { is_expected.to contain_apache__mod('passenger') }
+          it { is_expected.to contain_package('www-apache/passenger') }
+        end
       end
     end
-
-    context 'on EL7' do
-      let(:facts) { rh_facts.merge(operatingsystemrelease: '7') }
-
-      it {
-        is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
-      }
-      it {
-        is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
-      }
-    end
-  end
-  context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package('www/rubygem-passenger') }
-  end
-  context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
-
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_apache__mod('passenger') }
-    it { is_expected.to contain_package('www-apache/passenger') }
   end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 6ccd1363df..0555e57afd 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -1,373 +1,321 @@
 require 'spec_helper'
 
 describe 'apache::mod::php', type: :class do
-  describe 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    context 'with mpm_module => prefork' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_class('apache::mod::prefork') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('libapache2-mod-php5') }
-      it {
-        is_expected.to contain_file('php5.load').with(
-          content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
-        )
-      }
-    end
-    context 'with mpm_module => itk' do
-      let :pre_condition do
-        'class { "apache": mpm_module => itk, }'
+  on_supported_os.each do |os, facts|
+    context "on #{os} " do
+      let :facts do
+        facts
       end
 
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_class('apache::mod::itk') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('libapache2-mod-php5') }
-      it {
-        is_expected.to contain_file('php5.load').with(
-          content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
-        )
-      }
-    end
-    context 'on jessie' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let(:facts) do
-        super().merge(operatingsystemrelease: '8',
-                      lsbdistcodename: 'jessie')
-      end
+      case facts[:os]['family']
+      when 'Debian'
+        describe 'on a Debian OS' do
+          context 'with mpm_module => prefork' do
+            let :pre_condition do
+              'class { "apache": mpm_module => prefork, }'
+            end
 
-      it {
-        is_expected.to contain_file('php5.load').with(
-          content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
-        )
-      }
-    end
-    context 'on stretch' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let(:facts) do
-        super().merge(operatingsystemrelease: '9',
-                      lsbdistcodename: 'stretch')
-      end
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_class('apache::mod::prefork') }
+          end
+          case facts[:os]['release']['major']
+          when '8'
+            context 'on jessie' do
+              let :pre_condition do
+                'class { "apache": mpm_module => prefork, }'
+              end
 
-      it { is_expected.to contain_apache__mod('php7.0') }
-      it { is_expected.to contain_package('libapache2-mod-php7.0') }
-      it {
-        is_expected.to contain_file('php7.0.load').with(
-          content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n",
-        )
-      }
-    end
-  end
-  describe 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+              it {
+                is_expected.to contain_file('php5.load').with(
+                  content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
+                )
+              }
+              context 'with mpm_module => itk on jessie' do
+                let :pre_condition do
+                  'class { "apache": mpm_module => itk, }'
+                end
 
-    context 'with default params' do
-      let :pre_condition do
-        'class { "apache": }'
-      end
+                it { is_expected.to contain_class('apache::params') }
+                it { is_expected.to contain_class('apache::mod::itk') }
+                it { is_expected.to contain_apache__mod('php5') }
+                it { is_expected.to contain_package('libapache2-mod-php5') }
+                it {
+                  is_expected.to contain_file('php5.load').with(
+                    content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
+                  )
+                }
+              end
+            end
+          when '9'
+            context 'on stretch' do
+              let :pre_condition do
+                'class { "apache": mpm_module => prefork, }'
+              end
 
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('php') }
-      it {
-        is_expected.to contain_file('php5.load').with(
-          content: "LoadModule php5_module modules/libphp5.so\n",
-        )
-      }
-    end
-    context 'with alternative package name' do
-      let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { package_name: 'php54' }
-      end
+              it { is_expected.to contain_apache__mod('php7.0') }
+              it { is_expected.to contain_package('libapache2-mod-php7.0') }
+              it {
+                is_expected.to contain_file('php7.0.load').with(
+                  content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n",
+                )
+              }
+            end
+          end
+        end
+      when 'RedHat'
+        describe 'on a RedHat OS' do
+          context 'with default params' do
+            let :pre_condition do
+              'class { "apache": }'
+            end
 
-      it { is_expected.to contain_package('php54') }
-    end
-    context 'with alternative path' do
-      let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { path: 'alternative-path' }
-      end
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
+            it {
+              is_expected.to contain_file('php5.load').with(
+                content: "LoadModule php5_module modules/libphp5.so\n",
+              )
+            }
+          end
+          context 'with alternative package name' do
+            let :pre_condition do
+              'class { "apache": }'
+            end
+            let :params do
+              { package_name: 'php54' }
+            end
 
-      it {
-        is_expected.to contain_file('php5.load').with(
-          content: "LoadModule php5_module alternative-path\n",
-        )
-      }
-    end
-    context 'with alternative extensions' do
-      let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { extensions: ['.php', '.php5'] }
-      end
+            it { is_expected.to contain_package('php54') }
+          end
+          context 'with alternative path' do
+            let :pre_condition do
+              'class { "apache": }'
+            end
+            let :params do
+              { path: 'alternative-path' }
+            end
 
-      it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) }
-    end
-    context 'with specific version' do
-      let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { package_ensure: '5.3.13' }
-      end
+            it {
+              is_expected.to contain_file('php5.load').with(
+                content: "LoadModule php5_module alternative-path\n",
+              )
+            }
+          end
+          context 'with alternative extensions' do
+            let :pre_condition do
+              'class { "apache": }'
+            end
+            let :params do
+              { extensions: ['.php', '.php5'] }
+            end
 
-      it {
-        is_expected.to contain_package('php').with(
-          ensure: '5.3.13',
-        )
-      }
-    end
-    context 'with mpm_module => prefork' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
+            it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) }
+          end
+          if facts[:os]['release']['major'].to_i > 5
+            context 'with specific version' do
+              let :pre_condition do
+                'class { "apache": }'
+              end
+              let :params do
+                { package_ensure: '5.3.13' }
+              end
 
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_class('apache::mod::prefork') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('php') }
-      it {
-        is_expected.to contain_file('php5.load').with(
-          content: "LoadModule php5_module modules/libphp5.so\n",
-        )
-      }
-    end
-    context 'with mpm_module => itk' do
-      let :pre_condition do
-        'class { "apache": mpm_module => itk, }'
-      end
+              it {
+                is_expected.to contain_package('php').with(
+                  ensure: '5.3.13',
+                )
+              }
+            end
+          end
+          context 'with mpm_module => prefork' do
+            let :pre_condition do
+              'class { "apache": mpm_module => prefork, }'
+            end
 
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_class('apache::mod::itk') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('php') }
-      it {
-        is_expected.to contain_file('php5.load').with(
-          content: "LoadModule php5_module modules/libphp5.so\n",
-        )
-      }
-    end
-  end
-  describe 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '10',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_class('apache::mod::prefork') }
+            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
+            it {
+              is_expected.to contain_file('php5.load').with(
+                content: "LoadModule php5_module modules/libphp5.so\n",
+              )
+            }
+          end
+          context 'with mpm_module => itk' do
+            let :pre_condition do
+              'class { "apache": mpm_module => itk, }'
+            end
 
-    context 'with mpm_module => prefork' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_class('apache::mod::itk') }
+            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
+            it {
+              is_expected.to contain_file('php5.load').with(
+                content: "LoadModule php5_module modules/libphp5.so\n",
+              )
+            }
+          end
+        end
+      when 'FreeBSD'
+        describe 'on a FreeBSD OS' do
+          context 'with mpm_module => prefork' do
+            let :pre_condition do
+              'class { "apache": mpm_module => prefork, }'
+            end
 
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('www/mod_php5') }
-      it { is_expected.to contain_file('php5.load') }
-    end
-    context 'with mpm_module => itk' do
-      let :pre_condition do
-        'class { "apache": mpm_module => itk, }'
-      end
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_package('www/mod_php5') }
+            it { is_expected.to contain_file('php5.load') }
+          end
+          context 'with mpm_module => itk' do
+            let :pre_condition do
+              'class { "apache": mpm_module => itk, }'
+            end
 
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_class('apache::mod::itk') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('www/mod_php5') }
-      it { is_expected.to contain_file('php5.load') }
-    end
-  end
-  describe 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_class('apache::mod::itk') }
+            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_package('www/mod_php5') }
+            it { is_expected.to contain_file('php5.load') }
+          end
+        end
+      when 'Gentoo'
+        describe 'on a Gentoo OS' do
+          context 'with mpm_module => prefork' do
+            let :pre_condition do
+              'class { "apache": mpm_module => prefork, }'
+            end
 
-    context 'with mpm_module => prefork' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_package('dev-lang/php') }
+            it { is_expected.to contain_file('php5.load') }
+          end
+          context 'with mpm_module => itk' do
+            let :pre_condition do
+              'class { "apache": mpm_module => itk, }'
+            end
 
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('dev-lang/php') }
-      it { is_expected.to contain_file('php5.load') }
-    end
-    context 'with mpm_module => itk' do
-      let :pre_condition do
-        'class { "apache": mpm_module => itk, }'
+            it { is_expected.to contain_class('apache::params') }
+            it { is_expected.to contain_class('apache::mod::itk') }
+            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_package('dev-lang/php') }
+            it { is_expected.to contain_file('php5.load') }
+          end
+        end
       end
 
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_class('apache::mod::itk') }
-      it { is_expected.to contain_apache__mod('php5') }
-      it { is_expected.to contain_package('dev-lang/php') }
-      it { is_expected.to contain_file('php5.load') }
-    end
-  end
-  describe 'OS independent tests' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '6',
-        kernel: 'Linux',
-        lsbdistcodename: 'jessie',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+      # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu
+      next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
+              (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian')
 
-    context 'with content param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { content: 'somecontent' }
-      end
+      describe 'OS independent tests' do
+        context 'with content param' do
+          let :pre_condition do
+            'class { "apache": mpm_module => prefork, }'
+          end
+          let :params do
+            { content: 'somecontent' }
+          end
 
-      it {
-        is_expected.to contain_file('php5.conf').with(
-          content: 'somecontent',
-        )
-      }
-    end
-    context 'with template param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { template: 'apache/mod/php.conf.erb' }
-      end
+          it {
+            is_expected.to contain_file('php5.conf').with(
+              content: 'somecontent',
+            )
+          }
+        end
+        context 'with template param' do
+          let :pre_condition do
+            'class { "apache": mpm_module => prefork, }'
+          end
+          let :params do
+            { template: 'apache/mod/php.conf.erb' }
+          end
 
-      it {
-        is_expected.to contain_file('php5.conf').with(
-          content: %r{^# PHP is an HTML-embedded scripting language which attempts to make it},
-        )
-      }
-    end
-    context 'with source param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { source: 'some-path' }
-      end
+          it {
+            is_expected.to contain_file('php5.conf').with(
+              content: %r{^# PHP is an HTML-embedded scripting language which attempts to make it},
+            )
+          }
+        end
+        context 'with source param' do
+          let :pre_condition do
+            'class { "apache": mpm_module => prefork, }'
+          end
+          let :params do
+            { source: 'some-path' }
+          end
 
-      it {
-        is_expected.to contain_file('php5.conf').with(
-          source: 'some-path',
-        )
-      }
-    end
-    context 'content has priority over template' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          template: 'apache/mod/php5.conf.erb',
-          content: 'somecontent',
-        }
-      end
+          it {
+            is_expected.to contain_file('php5.conf').with(
+              source: 'some-path',
+            )
+          }
+        end
+        context 'content has priority over template' do
+          let :pre_condition do
+            'class { "apache": mpm_module => prefork, }'
+          end
+          let :params do
+            {
+              template: 'apache/mod/php5.conf.erb',
+              content: 'somecontent',
+            }
+          end
 
-      it {
-        is_expected.to contain_file('php5.conf').with(
-          content: 'somecontent',
-        )
-      }
-    end
-    context 'source has priority over template' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          template: 'apache/mod/php5.conf.erb',
-          source: 'some-path',
-        }
-      end
+          it {
+            is_expected.to contain_file('php5.conf').with(
+              content: 'somecontent',
+            )
+          }
+        end
+        context 'source has priority over template' do
+          let :pre_condition do
+            'class { "apache": mpm_module => prefork, }'
+          end
+          let :params do
+            {
+              template: 'apache/mod/php5.conf.erb',
+              source: 'some-path',
+            }
+          end
 
-      it {
-        is_expected.to contain_file('php5.conf').with(
-          source: 'some-path',
-        )
-      }
-    end
-    context 'source has priority over content' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          content: 'somecontent',
-          source: 'some-path',
-        }
-      end
+          it {
+            is_expected.to contain_file('php5.conf').with(
+              source: 'some-path',
+            )
+          }
+        end
+        context 'source has priority over content' do
+          let :pre_condition do
+            'class { "apache": mpm_module => prefork, }'
+          end
+          let :params do
+            {
+              content: 'somecontent',
+              source: 'some-path',
+            }
+          end
 
-      it {
-        is_expected.to contain_file('php5.conf').with(
-          source: 'some-path',
-        )
-      }
-    end
-    context 'with mpm_module => worker' do
-      let :pre_condition do
-        'class { "apache": mpm_module => worker, }'
-      end
+          it {
+            is_expected.to contain_file('php5.conf').with(
+              source: 'some-path',
+            )
+          }
+        end
+        context 'with mpm_module => worker' do
+          let :pre_condition do
+            'class { "apache": mpm_module => worker, }'
+          end
 
-      it 'raises an error' do
-        expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, %r{mpm_module => 'prefork' or mpm_module => 'itk'}
+          it 'raises an error' do
+            expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, %r{mpm_module => 'prefork' or mpm_module => 'itk'}
+          end
+        end
       end
     end
   end
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 8f4d053fd7..570d9af606 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -2,187 +2,181 @@
 require 'spec_helper'
 
 describe 'apache::mod::security', type: :class do
-  it_behaves_like 'a mod class, without including apache'
-  context 'on RedHat based systems' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'CentOS',
-        operatingsystemrelease: '7',
-        kernel: 'Linux',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+  on_supported_os.each do |os, facts|
+    context "on #{os} " do
+      let :facts do
+        facts
+      end
 
-    it {
-      is_expected.to contain_apache__mod('security').with(
-        id: 'security2_module',
-        lib: 'mod_security2.so',
-      )
-    }
-    it {
-      is_expected.to contain_apache__mod('unique_id_module').with(
-        id: 'unique_id_module',
-        lib: 'mod_unique_id.so',
-      )
-    }
-    it { is_expected.to contain_package('mod_security_crs') }
-    it {
-      is_expected.to contain_file('security.conf').with(
-        path: '/etc/httpd/conf.modules.d/security.conf',
-      )
-    }
-    it {
-      is_expected.to contain_file('security.conf')
-        .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
-        .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
-        .with_content(%r{^\s+SecDebugLog /var/log/httpd/modsec_debug.log$})
-        .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$})
-    }
-    it {
-      is_expected.to contain_file('/etc/httpd/modsecurity.d').with(
-        ensure: 'directory', path: '/etc/httpd/modsecurity.d',
-        owner: 'root', group: 'root', mode: '0755'
-      )
-    }
-    it {
-      is_expected.to contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
-        ensure: 'directory', path: '/etc/httpd/modsecurity.d/activated_rules',
-        owner: 'apache', group: 'apache'
-      )
-    }
-    it {
-      is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with(
-        path: '/etc/httpd/modsecurity.d/security_crs.conf',
-      )
-    }
-    it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
-    it {
-      is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
-        path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
-        target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
-      )
-    }
+      case facts[:os]['family']
+      when 'RedHat'
+        context 'on RedHat based systems' do
+          it {
+            is_expected.to contain_apache__mod('security').with(
+              id: 'security2_module',
+              lib: 'mod_security2.so',
+            )
+          }
+          it {
+            is_expected.to contain_apache__mod('unique_id_module').with(
+              id: 'unique_id_module',
+              lib: 'mod_unique_id.so',
+            )
+          }
+          it { is_expected.to contain_package('mod_security_crs') }
+          if facts[:os]['release']['major'].to_i > 6
+            it {
+              is_expected.to contain_file('security.conf').with(
+                path: '/etc/httpd/conf.modules.d/security.conf',
+              )
+            }
+          end
+          it {
+            is_expected.to contain_file('security.conf')
+              .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
+              .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
+              .with_content(%r{^\s+SecDebugLog /var/log/httpd/modsec_debug.log$})
+              .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$})
+          }
+          it {
+            is_expected.to contain_file('/etc/httpd/modsecurity.d').with(
+              ensure: 'directory', path: '/etc/httpd/modsecurity.d',
+              owner: 'root', group: 'root', mode: '0755'
+            )
+          }
+          it {
+            is_expected.to contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
+              ensure: 'directory', path: '/etc/httpd/modsecurity.d/activated_rules',
+              owner: 'apache', group: 'apache'
+            )
+          }
+          it {
+            is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with(
+              path: '/etc/httpd/modsecurity.d/security_crs.conf',
+            )
+          }
+          it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+          it {
+            is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+              path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+              target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
+            )
+          }
 
-    describe 'with parameters' do
-      let :params do
-        {
-          activated_rules: [
-            '/tmp/foo/bar.conf',
-          ],
-          audit_log_relevant_status: '^(?:5|4(?!01|04))',
-          audit_log_parts: 'ABCDZ',
-          secdefaultaction: 'deny,status:406,nolog,auditlog',
-        }
-      end
+          describe 'with parameters' do
+            let :params do
+              {
+                activated_rules: [
+                  '/tmp/foo/bar.conf',
+                ],
+                audit_log_relevant_status: '^(?:5|4(?!01|04))',
+                audit_log_parts: 'ABCDZ',
+                secdefaultaction: 'deny,status:406,nolog,auditlog',
+              }
+            end
 
-      it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
-      it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
-      it { is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
-      it {
-        is_expected.to contain_file('bar.conf').with(
-          path: '/etc/httpd/modsecurity.d/activated_rules/bar.conf',
-          target: '/tmp/foo/bar.conf',
-        )
-      }
-    end
-    describe 'with other modsec parameters' do
-      let :params do
-        {
-          manage_security_crs: false,
-        }
-      end
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
+            it { is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
+            it {
+              is_expected.to contain_file('bar.conf').with(
+                path: '/etc/httpd/modsecurity.d/activated_rules/bar.conf',
+                target: '/tmp/foo/bar.conf',
+              )
+            }
+          end
+          describe 'with other modsec parameters' do
+            let :params do
+              {
+                manage_security_crs: false,
+              }
+            end
 
-      it { is_expected.not_to contain_file('/etc/httpd/modsecurity.d/security_crs.conf') }
-    end
-  end
-  context 'on Debian based systems' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        kernel: 'Linux',
-        is_pe: false,
-      }
-    end
+            it { is_expected.not_to contain_file('/etc/httpd/modsecurity.d/security_crs.conf') }
+          end
+        end
+      when 'Debian'
+        context 'on Debian based systems' do
+          it {
+            is_expected.to contain_apache__mod('security').with(
+              id: 'security2_module',
+              lib: 'mod_security2.so',
+            )
+          }
+          it {
+            is_expected.to contain_apache__mod('unique_id_module').with(
+              id: 'unique_id_module',
+              lib: 'mod_unique_id.so',
+            )
+          }
+          it { is_expected.to contain_package('modsecurity-crs') }
+          it {
+            is_expected.to contain_file('security.conf').with(
+              path: '/etc/apache2/mods-available/security.conf',
+            )
+          }
+          it {
+            is_expected.to contain_file('security.conf')
+              .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
+              .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
+              .with_content(%r{^\s+SecDebugLog /var/log/apache2/modsec_debug.log$})
+              .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$})
+          }
+          it {
+            is_expected.to contain_file('/etc/modsecurity').with(
+              ensure: 'directory', path: '/etc/modsecurity',
+              owner: 'root', group: 'root', mode: '0755'
+            )
+          }
+          it {
+            is_expected.to contain_file('/etc/modsecurity/activated_rules').with(
+              ensure: 'directory', path: '/etc/modsecurity/activated_rules',
+              owner: 'www-data', group: 'www-data'
+            )
+          }
+          it {
+            is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with(
+              path: '/etc/modsecurity/security_crs.conf',
+            )
+          }
+          if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') ||
+             (facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian')
+            it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+            it {
+              is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+                path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
+                target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
+              )
+            }
+          end
 
-    it {
-      is_expected.to contain_apache__mod('security').with(
-        id: 'security2_module',
-        lib: 'mod_security2.so',
-      )
-    }
-    it {
-      is_expected.to contain_apache__mod('unique_id_module').with(
-        id: 'unique_id_module',
-        lib: 'mod_unique_id.so',
-      )
-    }
-    it { is_expected.to contain_package('modsecurity-crs') }
-    it {
-      is_expected.to contain_file('security.conf').with(
-        path: '/etc/apache2/mods-available/security.conf',
-      )
-    }
-    it {
-      is_expected.to contain_file('security.conf')
-        .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
-        .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
-        .with_content(%r{^\s+SecDebugLog /var/log/apache2/modsec_debug.log$})
-        .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$})
-    }
-    it {
-      is_expected.to contain_file('/etc/modsecurity').with(
-        ensure: 'directory', path: '/etc/modsecurity',
-        owner: 'root', group: 'root', mode: '0755'
-      )
-    }
-    it {
-      is_expected.to contain_file('/etc/modsecurity/activated_rules').with(
-        ensure: 'directory', path: '/etc/modsecurity/activated_rules',
-        owner: 'www-data', group: 'www-data'
-      )
-    }
-    it {
-      is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with(
-        path: '/etc/modsecurity/security_crs.conf',
-      )
-    }
-    it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
-    it {
-      is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
-        path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
-        target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
-      )
-    }
+          describe 'with parameters' do
+            let :params do
+              {
+                activated_rules: [
+                  '/tmp/foo/bar.conf',
+                ],
+                audit_log_relevant_status: '^(?:5|4(?!01|04))',
+                audit_log_parts: 'ABCDZ',
+                secdefaultaction: 'deny,status:406,nolog,auditlog',
+              }
+            end
 
-    describe 'with parameters' do
-      let :params do
-        {
-          activated_rules: [
-            '/tmp/foo/bar.conf',
-          ],
-          audit_log_relevant_status: '^(?:5|4(?!01|04))',
-          audit_log_parts: 'ABCDZ',
-          secdefaultaction: 'deny,status:406,nolog,auditlog',
-        }
+            if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') ||
+               (facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian')
+              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
+              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
+              it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
+              it {
+                is_expected.to contain_file('bar.conf').with(
+                  path: '/etc/modsecurity/activated_rules/bar.conf',
+                  target: '/tmp/foo/bar.conf',
+                )
+              }
+            end
+          end
+        end
       end
-
-      it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
-      it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
-      it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
-      it {
-        is_expected.to contain_file('bar.conf').with(
-          path: '/etc/modsecurity/activated_rules/bar.conf',
-          target: '/tmp/foo/bar.conf',
-        )
-      }
     end
   end
 end
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index 573b7c16c7..db4bebd501 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -1,38 +1,16 @@
 require 'spec_helper'
 
 describe 'apache::mod::suphp', type: :class do
-  it_behaves_like 'a mod class, without including apache'
-  context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+  on_supported_os.each do |os, facts|
+    # suphp has been declared EOL and is no longer supported on any Debian module that we test on
+    next unless facts[:os]['family'] == 'RedHat'
+    context "on #{os} " do
+      let :facts do
+        facts
+      end
 
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_package('libapache2-mod-suphp') }
-  end
-  context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_package('mod_suphp') }
     end
-
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_package('mod_suphp') }
   end
 end
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 9d3f62d8b0..fafc63acb4 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -8,162 +8,97 @@
     'www'
   end
 
-  describe 'os-dependent items' do
-    context 'on RedHat based systems' do
-      let :default_facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystem: 'CentOS',
-          operatingsystemrelease: '6',
-          kernel: 'Linux',
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
+  on_supported_os.each do |os, facts|
+    next if facts[:os]['release']['major'] == '18.04'
+    next if facts[:os]['release']['major'] == '7' && facts[:os]['family']['RedHat']
+    context "on #{os} " do
+      let :facts do
+        facts
       end
-      let(:facts) { default_facts }
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_class('apache::mod::fastcgi') }
-      it {
-        is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-          ensure: 'file',
-          path: "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf",
-        )
-      }
-    end
-    context 'on Debian based systems' do
-      let :default_facts do
-        {
-          osfamily: 'Debian',
-          operatingsystem: 'Debian',
-          operatingsystemrelease: '8',
-          lsbdistcodename: 'jessie',
-          kernel: 'Linux',
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
+      case facts[:os]['family']
+      when 'RedHat'
+        it {
+          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
+            ensure: 'file',
+            path: "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf",
+          )
         }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::fastcgi') }
-      it {
-        is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-          ensure: 'file',
-          path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
-        )
-      }
-    end
-    context 'on FreeBSD systems' do
-      let :default_facts do
-        {
-          osfamily: 'FreeBSD',
-          operatingsystem: 'FreeBSD',
-          operatingsystemrelease: '9',
-          kernel: 'FreeBSD',
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
+      when 'Debian'
+        it {
+          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
+            ensure: 'file',
+            path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
+          )
         }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::fastcgi') }
-      it {
-        is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-          ensure: 'file',
-          path: "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf",
-        )
-      }
-    end
-    context 'on Gentoo systems' do
-      let :default_facts do
-        {
-          osfamily: 'Gentoo',
-          operatingsystem: 'Gentoo',
-          operatingsystemrelease: '3.16.1-gentoo',
-          kernel: 'Linux',
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          is_pe: false,
+      when 'FreeBSD'
+        it {
+          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
+            ensure: 'file',
+            path: "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf",
+          )
         }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::fastcgi') }
-      it {
-        is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-          ensure: 'file',
-          path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
-        )
-      }
-    end
-  end
-  describe 'os-independent items' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        kernel: 'Linux',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    describe '.conf content using TCP communication' do
-      let :params do
-        {
-          host: '127.0.0.1:9001',
-          timeout: 30,
-          flush: true,
-          faux_path: '/var/www/php-www.fcgi',
-          fcgi_alias: '/php-www.fcgi',
-          file_type: 'application/x-httpd-php',
-          pass_header: 'Authorization',
+      when 'Gentoo'
+        it {
+          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
+            ensure: 'file',
+            path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
+          )
         }
       end
-      let :expected do
+
+      describe 'os-independent items' do
+        describe '.conf content using TCP communication' do
+          let :params do
+            {
+              host: '127.0.0.1:9001',
+              timeout: 30,
+              flush: true,
+              faux_path: '/var/www/php-www.fcgi',
+              fcgi_alias: '/php-www.fcgi',
+              file_type: 'application/x-httpd-php',
+              pass_header: 'Authorization',
+            }
+          end
+          let :expected do
 # rubocop:disable Layout/IndentationWidth : Changes to the indent causes test failures.
 'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -host 127.0.0.1:9001 -pass-header Authorization
 Alias /php-www.fcgi /var/www/php-www.fcgi
 Action application/x-httpd-php /php-www.fcgi
 '
-        # rubocop:enable Layout/IndentationWidth
-      end
+            # rubocop:enable Layout/IndentationWidth
+          end
 
-      it do
-        is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
-      end
-    end
-    describe '.conf content using socket communication' do
-      let :params do
-        {
-          host: '/var/run/fcgi.sock',
-          timeout: 30,
-          flush: true,
-          faux_path: '/var/www/php-www.fcgi',
-          fcgi_alias: '/php-www.fcgi',
-          file_type: 'application/x-httpd-php',
-        }
-      end
-      let :expected do
+          it do
+            is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
+          end
+        end
+        describe '.conf content using socket communication' do
+          let :params do
+            {
+              host: '/var/run/fcgi.sock',
+              timeout: 30,
+              flush: true,
+              faux_path: '/var/www/php-www.fcgi',
+              fcgi_alias: '/php-www.fcgi',
+              file_type: 'application/x-httpd-php',
+            }
+          end
+          let :expected do
 # rubocop:disable Layout/IndentationWidth : Changes to the indent causes test failures.
 'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -socket /var/run/fcgi.sock
 Alias /php-www.fcgi /var/www/php-www.fcgi
 Action application/x-httpd-php /php-www.fcgi
 '
-        # rubocop:enable Layout/IndentationWidth
-      end
+            # rubocop:enable Layout/IndentationWidth
+          end
 
-      it do
-        is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
+          it do
+            is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
+          end
+        end
       end
     end
   end
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index 8a181841ef..3035b71b71 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -11,46 +11,29 @@ class { "apache::mod::security": activated_rules => [] }
     'base_rules/modsecurity_35_bad_robots.data'
   end
 
-  context 'on RedHat based systems' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'CentOS',
-        operatingsystemrelease: '7',
-        kernel: 'Linux',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    it {
-      is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
-        path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
-        target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
-      )
-    }
-  end
+  on_supported_os.each do |os, facts|
+    context "on #{os} " do
+      let :facts do
+        facts
+      end
 
-  context 'on Debian based systems' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        kernel: 'Linux',
-        is_pe: false,
-      }
+      it { is_expected.to compile.with_all_deps }
+      case facts[:os]['family']
+      when 'RedHat'
+        it {
+          is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+            path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+            target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
+          )
+        }
+      when 'Debian'
+        it {
+          is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+            path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
+            target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
+          )
+        }
+      end
     end
-
-    it {
-      is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
-        path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
-        target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
-      )
-    }
   end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b5427aead2..f301864048 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1,2299 +1,2053 @@
 require 'spec_helper'
 
 describe 'apache::vhost', type: :define do
-  let :pre_condition do
-    'class { "apache": default_vhost => false, default_mods => false, vhost_enable_dir => "/etc/apache2/sites-enabled"}'
-  end
-  let :title do
-    'rspec.example.com'
-  end
-  let :default_params do
-    {
-      docroot: '/rspec/docroot',
-      port: '84',
-    }
-  end
+  describe 'os-independent items' do
+    on_supported_os.each do |os, facts|
+      # this setup uses fastcgi wich isn't available on RHEL 7 / Ubuntu 18.04
+      next if facts[:os]['release']['major'] == '18.04'
+      next if facts[:os]['release']['major'] == '7' && facts[:os]['family']['RedHat']
+      # next if facts[:os]['name'] == 'SLES'
 
-  describe 'os-dependent items' do
-    context 'on RedHat based systems' do
-      let :default_facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
-      let(:params) { default_params }
-      let(:facts) { default_facts }
+      apache_name = case facts[:os]['family']
+                    when 'RedHat'
+                      'httpd'
+                    when 'Debian'
+                      'apache2'
+                    else
+                      'apache2'
+                    end
 
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::params') }
-    end
-    context 'on Debian based systems' do
-      let :default_facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '8',
-          lsbdistcodename: 'jessie',
-          operatingsystem: 'Debian',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
+      let :pre_condition do
+        "class {'apache': default_vhost => false, default_mods => false, vhost_enable_dir => '/etc/#{apache_name}/sites-enabled'}"
       end
-      let(:params) { default_params }
-      let(:facts) { default_facts }
-
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::params') }
-      it {
-        is_expected.to contain_concat('25-rspec.example.com.conf').with(
-          ensure: 'present',
-          path: '/etc/apache2/sites-available/25-rspec.example.com.conf',
-        )
-      }
-      it {
-        is_expected.to contain_file('25-rspec.example.com.conf symlink').with(
-          ensure: 'link',
-          path: '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
-          target: '/etc/apache2/sites-available/25-rspec.example.com.conf',
-        )
-      }
-    end
-    context 'on FreeBSD systems' do
-      let :default_facts do
-        {
-          osfamily: 'FreeBSD',
-          operatingsystemrelease: '9',
-          operatingsystem: 'FreeBSD',
-          id: 'root',
-          kernel: 'FreeBSD',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
+
+      let :title do
+        'rspec.example.com'
       end
-      let(:params) { default_params }
-      let(:facts) { default_facts }
-
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::params') }
-      it {
-        is_expected.to contain_concat('25-rspec.example.com.conf').with(
-          ensure: 'present',
-          path: '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf',
-        )
-      }
-    end
-    context 'on Gentoo systems' do
-      let :default_facts do
+
+      let :default_params do
         {
-          osfamily: 'Gentoo',
-          operatingsystem: 'Gentoo',
-          operatingsystemrelease: '3.16.1-gentoo',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          is_pe: false,
+          docroot: '/rspec/docroot',
+          port: '84',
         }
       end
-      let(:params) { default_params }
-      let(:facts) { default_facts }
-
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::params') }
-      it {
-        is_expected.to contain_concat('25-rspec.example.com.conf').with(
-          ensure: 'present',
-          path: '/etc/apache2/vhosts.d/25-rspec.example.com.conf',
-        )
-      }
-    end
-  end
-  describe 'os-independent items' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '6',
-        lsbdistcodename: 'squeeze',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
 
-    describe 'basic assumptions' do
-      let(:params) { default_params }
+      context "on #{os} " do
+        let :facts do
+          facts
+        end
 
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__listen(params[:port]) }
-      it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
-    end
-    context 'set everything!' do
-      let :params do
-        {
-          'docroot'                     => '/var/www/foo',
-          'manage_docroot'              => false,
-          'virtual_docroot'             => true,
-          'port'                        => '8080',
-          'ip'                          => '127.0.0.1',
-          'ip_based'                    => true,
-          'add_listen'                  => false,
-          'docroot_owner'               => 'user',
-          'docroot_group'               => 'wheel',
-          'docroot_mode'                => '0664',
-          'serveradmin'                 => 'foo@localhost',
-          'ssl'                         => true,
-          'ssl_cert'                    => '/ssl/cert',
-          'ssl_key'                     => '/ssl/key',
-          'ssl_chain'                   => '/ssl/chain',
-          'ssl_crl_path'                => '/ssl/crl',
-          'ssl_crl'                     => 'foo.crl',
-          'ssl_certs_dir'               => '/ssl/certs',
-          'ssl_protocol'                => 'SSLv2',
-          'ssl_cipher'                  => 'HIGH',
-          'ssl_honorcipherorder'        => 'Off',
-          'ssl_verify_client'           => 'optional',
-          'ssl_verify_depth'            => '3',
-          'ssl_options'                 => '+ExportCertData',
-          'ssl_openssl_conf_cmd'        => 'DHParameters "foo.pem"',
-          'ssl_proxy_verify'            => 'require',
-          'ssl_proxy_check_peer_cn'     => 'on',
-          'ssl_proxy_check_peer_name'   => 'on',
-          'ssl_proxy_check_peer_expire' => 'on',
-          'ssl_proxyengine'             => true,
-          'ssl_proxy_cipher_suite'      => 'HIGH',
-          'ssl_proxy_protocol'          => 'TLSv1.2',
-
-          'priority'                    => '30',
-          'default_vhost'               => true,
-          'servername'                  => 'example.com',
-          'serveraliases'               => ['test-example.com'],
-          'options'                     => ['MultiView'],
-          'override'                    => ['All'],
-          'directoryindex'              => 'index.html',
-          'vhost_name'                  => 'test',
-          'logroot'                     => '/var/www/logs',
-          'logroot_ensure'              => 'directory',
-          'logroot_mode'                => '0600',
-          'logroot_owner'               => 'root',
-          'logroot_group'               => 'root',
-          'log_level'                   => 'crit',
-          'access_log'                  => false,
-          'access_log_file'             => 'httpd_access_log',
-          'access_log_syslog'           => true,
-          'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
-          'access_log_env_var'          => '',
-          'aliases'                     => '/image',
-          'directories'                 => [
+        describe 'basic assumptions' do
+          let(:params) { default_params }
+
+          it { is_expected.to contain_class('apache') }
+          it { is_expected.to contain_class('apache::params') }
+          it { is_expected.to contain_apache__listen(params[:port]) }
+          # namebased virualhost is only created on apache 2.2 and older
+          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
+             (facts[:os]['name'] == 'Amazon') ||
+             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
+            it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
+          end
+        end
+        context 'set everything!' do
+          let :params do
             {
-              'path'     => '/var/www/files',
-              'provider' => 'files',
-              'require'  => ['valid-user', 'all denied'],
-            },
+              'docroot'                     => '/var/www/foo',
+              'manage_docroot'              => false,
+              'virtual_docroot'             => true,
+              'port'                        => '8080',
+              'ip'                          => '127.0.0.1',
+              'ip_based'                    => true,
+              'add_listen'                  => false,
+              'docroot_owner'               => 'user',
+              'docroot_group'               => 'wheel',
+              'docroot_mode'                => '0664',
+              'serveradmin'                 => 'foo@localhost',
+              'ssl'                         => true,
+              'ssl_cert'                    => '/ssl/cert',
+              'ssl_key'                     => '/ssl/key',
+              'ssl_chain'                   => '/ssl/chain',
+              'ssl_crl_path'                => '/ssl/crl',
+              'ssl_crl'                     => 'foo.crl',
+              'ssl_certs_dir'               => '/ssl/certs',
+              'ssl_protocol'                => 'SSLv2',
+              'ssl_cipher'                  => 'HIGH',
+              'ssl_honorcipherorder'        => 'Off',
+              'ssl_verify_client'           => 'optional',
+              'ssl_verify_depth'            => '3',
+              'ssl_options'                 => '+ExportCertData',
+              'ssl_openssl_conf_cmd'        => 'DHParameters "foo.pem"',
+              'ssl_proxy_verify'            => 'require',
+              'ssl_proxy_check_peer_cn'     => 'on',
+              'ssl_proxy_check_peer_name'   => 'on',
+              'ssl_proxy_check_peer_expire' => 'on',
+              'ssl_proxyengine'             => true,
+              'ssl_proxy_cipher_suite'      => 'HIGH',
+              'ssl_proxy_protocol'          => 'TLSv1.2',
+
+              'priority'                    => '30',
+              'default_vhost'               => true,
+              'servername'                  => 'example.com',
+              'serveraliases'               => ['test-example.com'],
+              'options'                     => ['MultiView'],
+              'override'                    => ['All'],
+              'directoryindex'              => 'index.html',
+              'vhost_name'                  => 'test',
+              'logroot'                     => '/var/www/logs',
+              'logroot_ensure'              => 'directory',
+              'logroot_mode'                => '0600',
+              'logroot_owner'               => 'root',
+              'logroot_group'               => 'root',
+              'log_level'                   => 'crit',
+              'access_log'                  => false,
+              'access_log_file'             => 'httpd_access_log',
+              'access_log_syslog'           => true,
+              'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
+              'access_log_env_var'          => '',
+              'aliases'                     => '/image',
+              'directories'                 => [
+                {
+                  'path'     => '/var/www/files',
+                  'provider' => 'files',
+                  'require'  => ['valid-user', 'all denied'],
+                },
+                {
+                  'path'     => '/var/www/files',
+                  'provider' => 'files',
+                  'additional_includes' => ['/custom/path/includes', '/custom/path/another_includes'],
+                },
+                {
+                  'path'     => '/var/www/files',
+                  'provider' => 'files',
+                  'require'  => 'all granted',
+                },
+                {
+                  'path'     => '/var/www/files',
+                  'provider' => 'files',
+                  'require'  =>
+                  {
+                    'enforce'  => 'all',
+                    'requires' => ['all-valid1', 'all-valid2'],
+                  },
+                },
+                {
+                  'path'     => '/var/www/files',
+                  'provider' => 'files',
+                  'require'  =>
+                  {
+                    'enforce'  => 'none',
+                    'requires' => ['none-valid1', 'none-valid2'],
+                  },
+                },
+                {
+                  'path'     => '/var/www/files',
+                  'provider' => 'files',
+                  'require'  =>
+                  {
+                    'enforce'  => 'any',
+                    'requires' => ['any-valid1', 'any-valid2'],
+                  },
+                },
+                {
+                  'path'     => '*',
+                  'provider' => 'proxy',
+                },
+                { 'path'              => '/var/www/files/indexed_directory',
+                  'directoryindex'    => 'disabled',
+                  'options'           => ['Indexes', 'FollowSymLinks', 'MultiViews'],
+                  'index_options'     => ['FancyIndexing'],
+                  'index_style_sheet' => '/styles/style.css' },
+                { 'path'              => '/var/www/files/output_filtered',
+                  'set_output_filter' => 'output_filter' },
+                { 'path'     => '/var/www/files',
+                  'provider' => 'location',
+                  'limit'    => [
+                    { 'methods' => 'GET HEAD',
+                      'require' => ['valid-user'] },
+                  ] },
+                { 'path'         => '/var/www/files',
+                  'provider'     => 'location',
+                  'limit_except' => [
+                    { 'methods' => 'GET HEAD',
+                      'require' => ['valid-user'] },
+                  ] },
+                { 'path'               => '/var/www/dav',
+                  'dav'                => 'filesystem',
+                  'dav_depth_infinity' => true,
+                  'dav_min_timeout'    => '600' },
+                {
+                  'path'                                                => '/var/www/node-app/public',
+                  'passenger_enabled'                                   => true,
+                  'passenger_base_uri'                                  => '/app',
+                  'passenger_ruby'                                      => '/path/to/ruby',
+                  'passenger_python'                                    => '/path/to/python',
+                  'passenger_nodejs'                                    => '/path/to/nodejs',
+                  'passenger_meteor_app_settings'                       => '/path/to/file.json',
+                  'passenger_app_env'                                   => 'demo',
+                  'passenger_app_root'                                  => '/var/www/node-app',
+                  'passenger_app_group_name'                            => 'foo_bar',
+                  'passenger_app_type'                                  => 'node',
+                  'passenger_startup_file'                              => 'start.js',
+                  'passenger_restart_dir'                               => 'temp',
+                  'passenger_load_shell_envvars'                        => false,
+                  'passenger_rolling_restarts'                          => false,
+                  'passenger_resist_deployment_errors'                  => false,
+                  'passenger_user'                                      => 'nodeuser',
+                  'passenger_group'                                     => 'nodegroup',
+                  'passenger_friendly_error_pages'                      => true,
+                  'passenger_min_instances'                             => 7,
+                  'passenger_max_instances'                             => 9,
+                  'passenger_force_max_concurrent_requests_per_process' => 12,
+                  'passenger_start_timeout'                             => 10,
+                  'passenger_concurrency_model'                         => 'thread',
+                  'passenger_thread_count'                              => 20,
+                  'passenger_max_requests'                              => 2000,
+                  'passenger_max_request_time'                          => 1,
+                  'passenger_memory_limit'                              => 32,
+                  'passenger_high_performance'                          => false,
+                  'passenger_buffer_upload'                             => false,
+                  'passenger_buffer_response'                           => false,
+                  'passenger_error_override'                            => false,
+                  'passenger_max_request_queue_size'                    => 120,
+                  'passenger_max_request_queue_time'                    => 5,
+                  'passenger_sticky_sessions'                           => true,
+                  'passenger_sticky_sessions_cookie_name'               => '_delicious_cookie',
+                  'passenger_allow_encoded_slashes'                     => false,
+                  'passenger_debugger'                                  => false,
+                },
+              ],
+              'error_log'                   => false,
+              'error_log_file'              => 'httpd_error_log',
+              'error_log_syslog'            => true,
+              'error_documents'             => 'true',
+              'fallbackresource'            => '/index.php',
+              'scriptalias'                 => '/usr/lib/cgi-bin',
+              'scriptaliases'               => [
+                {
+                  'alias' => '/myscript',
+                  'path'  => '/usr/share/myscript',
+                },
+                {
+                  'aliasmatch' => '^/foo(.*)',
+                  'path'       => '/usr/share/fooscripts$1',
+                },
+              ],
+              'proxy_dest'                  => '/',
+              'proxy_pass'                  => [
+                {
+                  'path'            => '/a',
+                  'url'             => 'http://backend-a/',
+                  'keywords'        => ['noquery', 'interpolate'],
+                  'no_proxy_uris'       => ['/a/foo', '/a/bar'],
+                  'no_proxy_uris_match' => ['/a/foomatch'],
+                  'reverse_cookies' => [
+                    {
+                      'path' => '/a',
+                      'url' => 'http://backend-a/',
+                    },
+                    {
+                      'domain' => 'foo',
+                      'url'    => 'http://foo',
+                    },
+                  ],
+                  'params' => {
+                    'retry'   => '0',
+                    'timeout' => '5',
+                  },
+                  'setenv'   => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
+                },
+              ],
+              'proxy_pass_match' => [
+                {
+                  'path'     => '/a',
+                  'url'      => 'http://backend-a/',
+                  'keywords' => ['noquery', 'interpolate'],
+                  'no_proxy_uris'       => ['/a/foo', '/a/bar'],
+                  'no_proxy_uris_match' => ['/a/foomatch'],
+                  'params' => {
+                    'retry'   => '0',
+                    'timeout' => '5',
+                  },
+                  'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
+                },
+              ],
+              'suphp_addhandler'            => 'foo',
+              'suphp_engine'                => 'on',
+              'suphp_configpath'            => '/var/www/html',
+              'php_admin_flags'             => ['foo', 'bar'],
+              'php_admin_values'            => ['true', 'false'],
+              'no_proxy_uris'               => '/foo',
+              'no_proxy_uris_match'         => '/foomatch',
+              'proxy_preserve_host'         => true,
+              'proxy_add_headers'           => true,
+              'proxy_error_override'        => true,
+              'redirect_source'             => '/bar',
+              'redirect_dest'               => '/',
+              'redirect_status'             => 'temp',
+              'redirectmatch_status'        => ['404'],
+              'redirectmatch_regexp'        => ['\.git$'],
+              'redirectmatch_dest'          => ['http://www.example.com'],
+              'headers'                     => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+              'request_headers'             => ['append MirrorID "mirror 12"'],
+              'rewrites'                    => [
+                {
+                  'rewrite_rule' => ['^index\.html$ welcome.html'],
+                },
+              ],
+              'filters' => [
+                'FilterDeclare COMPRESS',
+                'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/html',
+                'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/css',
+                'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/plain',
+                'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/xml',
+                'FilterChain COMPRESS',
+                'FilterProtocol COMPRESS  DEFLATE change=yes;byteranges=no',
+              ],
+              'rewrite_base'                => '/',
+              'rewrite_rule'                => '^index\.html$ welcome.html',
+              'rewrite_cond'                => '%{HTTP_USER_AGENT} ^MSIE',
+              'rewrite_inherit'             => true,
+              'setenv'                      => ['FOO=/bin/true'],
+              'setenvif'                    => 'Request_URI "\.gif$" object_is_image=gif',
+              'setenvifnocase'              => 'REMOTE_ADDR ^127.0.0.1 localhost=true',
+              'block'                       => 'scm',
+              'wsgi_application_group'      => '%{GLOBAL}',
+              'wsgi_daemon_process'         => 'wsgi',
+              'wsgi_daemon_process_options' => {
+                'processes'    => '2',
+                'threads'      => '15',
+                'display-name' => '%{GROUP}',
+              },
+              'wsgi_import_script'          => '/var/www/demo.wsgi',
+              'wsgi_import_script_options'  => {
+                'process-group'     => 'wsgi',
+                'application-group' => '%{GLOBAL}',
+              },
+              'wsgi_process_group'          => 'wsgi',
+              'wsgi_script_aliases'         => {
+                '/' => '/var/www/demo.wsgi',
+              },
+              'wsgi_script_aliases_match' => {
+                '^/test/(^[/*)' => '/var/www/demo.wsgi',
+              },
+              'wsgi_pass_authorization'     => 'On',
+              'custom_fragment'             => '#custom string',
+              'itk'                         => {
+                'user'  => 'someuser',
+                'group' => 'somegroup',
+              },
+              'wsgi_chunked_request'        => 'On',
+              'action'                      => 'foo',
+              'fastcgi_server'              => 'localhost',
+              'fastcgi_socket'              => '/tmp/fastcgi.socket',
+              'fastcgi_dir'                 => '/tmp',
+              'fastcgi_idle_timeout'        => '120',
+              'additional_includes'         => '/custom/path/includes',
+              'apache_version'              => '2.4',
+              'use_optional_includes'       => true,
+              'suexec_user_group'           => 'root root',
+              'allow_encoded_slashes'       => 'nodecode',
+              'use_canonical_name'          => 'dns',
+              'passenger_enabled'                     => false,
+              'passenger_base_uri'                    => '/app',
+              'passenger_ruby'                        => '/usr/bin/ruby1.9.1',
+              'passenger_python'                      => '/usr/local/bin/python',
+              'passenger_nodejs'                      => '/usr/bin/node',
+              'passenger_meteor_app_settings'         => '/path/to/some/file.json',
+              'passenger_app_env'                     => 'test',
+              'passenger_app_root'                    => '/usr/share/myapp',
+              'passenger_app_group_name'              => 'app_customer',
+              'passenger_app_type'                    => 'rack',
+              'passenger_startup_file'                => 'bin/www',
+              'passenger_restart_dir'                 => 'tmp',
+              'passenger_spawn_method'                => 'direct',
+              'passenger_load_shell_envvars'          => false,
+              'passenger_rolling_restarts'            => false,
+              'passenger_resist_deployment_errors'    => true,
+              'passenger_user'                        => 'sandbox',
+              'passenger_group'                       => 'sandbox',
+              'passenger_friendly_error_pages'        => false,
+              'passenger_min_instances'               => 1,
+              'passenger_max_instances'               => 30,
+              'passenger_max_preloader_idle_time'     => 600,
+              'passenger_force_max_concurrent_requests_per_process' => 10,
+              'passenger_start_timeout'               => 600,
+              'passenger_concurrency_model'           => 'thread',
+              'passenger_thread_count'                => 5,
+              'passenger_max_requests'                => 1000,
+              'passenger_max_request_time'            => 2,
+              'passenger_memory_limit'                => 64,
+              'passenger_stat_throttle_rate'          => 5,
+              'passenger_pre_start'                   => 'http://localhost/myapp',
+              'passenger_high_performance'            => true,
+              'passenger_buffer_upload'               => false,
+              'passenger_buffer_response'             => false,
+              'passenger_error_override'              => true,
+              'passenger_max_request_queue_size'      => 10,
+              'passenger_max_request_queue_time'      => 2,
+              'passenger_sticky_sessions'             => true,
+              'passenger_sticky_sessions_cookie_name' => '_nom_nom_nom',
+              'passenger_allow_encoded_slashes'       => true,
+              'passenger_debugger'                    => true,
+              'passenger_lve_min_uid'                 => 500,
+              'add_default_charset'         => 'UTF-8',
+              'jk_mounts'                   => [
+                { 'mount'   => '/*',     'worker' => 'tcnode1' },
+                { 'unmount' => '/*.jpg', 'worker' => 'tcnode1' },
+              ],
+              'auth_kerb'                   => true,
+              'krb_method_negotiate'        => 'off',
+              'krb_method_k5passwd'         => 'off',
+              'krb_authoritative'           => 'off',
+              'krb_auth_realms'             => ['EXAMPLE.ORG', 'EXAMPLE.NET'],
+              'krb_5keytab'                 => '/tmp/keytab5',
+              'krb_local_user_mapping'      => 'off',
+              'http_protocol_options' => 'Strict LenientMethods Allow0.9',
+              'keepalive'                   => 'on',
+              'keepalive_timeout'           => '100',
+              'max_keepalive_requests'      => '1000',
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.not_to contain_file('/var/www/foo') }
+          it { is_expected.to contain_class('apache::mod::ssl') }
+          it {
+            is_expected.to contain_file('ssl.conf').with(
+              content: %r{^\s+SSLHonorCipherOrder On$},
+            )
+          }
+          it {
+            is_expected.to contain_file('ssl.conf').with(
+              content: %r{^\s+SSLPassPhraseDialog builtin$},
+            )
+          }
+          it {
+            is_expected.to contain_file('ssl.conf').with(
+              content: %r{^\s+SSLSessionCacheTimeout 300$},
+            )
+          }
+          it { is_expected.to contain_class('apache::mod::mime') }
+          it { is_expected.to contain_class('apache::mod::vhost_alias') }
+          it { is_expected.to contain_class('apache::mod::wsgi') }
+          it { is_expected.to contain_class('apache::mod::suexec') }
+          it { is_expected.to contain_class('apache::mod::passenger') }
+          it {
+            is_expected.to contain_file('/var/www/logs').with('ensure' => 'directory',
+                                                              'mode' => '0600')
+          }
+          it { is_expected.to contain_class('apache::mod::rewrite') }
+          it { is_expected.to contain_class('apache::mod::alias') }
+          it { is_expected.to contain_class('apache::mod::proxy') }
+          it { is_expected.to contain_class('apache::mod::proxy_http') }
+          it { is_expected.to contain_class('apache::mod::fastcgi') }
+          it { is_expected.to contain_class('apache::mod::headers') }
+          it { is_expected.to contain_class('apache::mod::filter') }
+          it { is_expected.to contain_class('apache::mod::env') }
+          it { is_expected.to contain_class('apache::mod::setenvif') }
+          it {
+            is_expected.to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
+                                                                            'mode'    => '0644',
+                                                                            'require' => 'Package[httpd]',
+                                                                            'notify'  => 'Class[Apache::Service]')
+          }
+          if facts[:os]['release']['major'].to_i >= 18 && facts[:os]['name'] == 'Ubuntu'
+            it {
+              is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
+                                                                                    'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf")
+            }
+          end
+          it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<Proxy "\*">$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Include\s'\/custom\/path\/includes'$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Include\s'\/custom\/path\/another_includes'$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require valid-user$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require all denied$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require all granted$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<RequireAll>$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<\/RequireAll>$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require all-valid1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require all-valid2$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<RequireNone>$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<\/RequireNone>$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require none-valid1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require none-valid2$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<RequireAny>$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<\/RequireAny>$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require any-valid1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Require any-valid2$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+IndexOptions\sFancyIndexing$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+IndexStyleSheet\s'\/styles\/style\.css'$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+DirectoryIndex\sdisabled$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+SetOutputFilter\soutput_filter$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<Limit GET HEAD>$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>}m,
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+<LimitExcept GET HEAD>$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/LimitExcept>}m,
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+Dav\sfilesystem$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+DavDepthInfinity\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+DavMinTimeout\s600$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerEnabled\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerBaseURI\s/app$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerRuby\s/path/to/ruby$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerPython\s/path/to/python$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerNodejs\s/path/to/nodejs$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerMeteorAppSettings\s/path/to/file\.json$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerAppEnv\sdemo$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerAppRoot\s/var/www/node-app$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerAppGroupName\sfoo_bar$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerAppType\snode$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerStartupFile\sstart\.js$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerRestartDir\stemp$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerRollingRestarts\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerResistDeploymentErrors\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerUser\snodeuser$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerGroup\snodegroup$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerFriendlyErrorPages\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerMinInstances\s7$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerMaxInstances\s9$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s12$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerStartTimeout\s10$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerConcurrencyModel\sthread$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerThreadCount\s20$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerMaxRequests\s2000$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerMaxRequestTime\s1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerMemoryLimit\s32$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerHighPerformance\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerBufferUpload\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerBufferResponse\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerErrorOverride\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerMaxRequestQueueSize\s120$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerMaxRequestQueueTime\s5$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerStickySessions\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerStickySessionsCookieName\s_delicious_cookie$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerAllowEncodedSlashes\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerDebugger\sOff$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-access_log') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{retry=0},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{timeout=5},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{SetEnv force-proxy-request-1.0 1},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{SetEnv proxy-nokeepalive 1},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{noquery interpolate},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{ProxyPreserveHost On},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{ProxyAddHeaders On},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{ProxyPassReverseCookiePath\s+\/a\s+http:\/\/},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
+              content: %r{^\s+RewriteOptions Inherit$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+              %r{SetEnv FOO=/bin/true},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+              %r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
+              %r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+              content: %r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+              content: %r{^\s+SSLProxyEngine On$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+              content: %r{^\s+SSLProxyCheckPeerCN\s+on$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+              content: %r{^\s+SSLProxyCheckPeerName\s+on$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+              content: %r{^\s+SSLProxyCheckPeerExpire\s+on$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+              content: %r{^\s+SSLProxyCipherSuite\s+HIGH$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
+              content: %r{^\s+SSLProxyProtocol\s+TLSv1.2$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
+              content: %r{^\s+FilterDeclare COMPRESS$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-security') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
+              content: %r{^\s+JkMount\s+\/\*\s+tcnode1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
+              content: %r{^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+              content: %r{^\s+KrbMethodNegotiate\soff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+              content: %r{^\s+KrbAuthoritative\soff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+              content: %r{^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+              content: %r{^\s+Krb5Keytab\s\/tmp\/keytab5$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+              content: %r{^\s+KrbLocalUserMapping\soff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+              content: %r{^\s+KrbServiceName\sHTTP$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+              content: %r{^\s+KrbSaveCredentials\soff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+              content: %r{^\s+KrbVerifyKDC\son$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
+              content: %r{^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+              content: %r{^\s+KeepAlive\son$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+              content: %r{^\s+KeepAliveTimeout\s100$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
+              content: %r{^\s+MaxKeepAliveRequests\s1000$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerEnabled\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerBaseURI\s/app$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerPython\s/usr/local/bin/python$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerNodejs\s/usr/bin/node$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMeteorAppSettings\s/path/to/some/file.json$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerAppEnv\stest$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerAppRoot\s/usr/share/myapp$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerAppGroupName\sapp_customer$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerAppType\srack$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerStartupFile\sbin/www$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerRestartDir\stmp$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerSpawnMethod\sdirect$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerRollingRestarts\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerResistDeploymentErrors\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerUser\ssandbox$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerGroup\ssandbox$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerFriendlyErrorPages\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMinInstances\s1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMaxInstances\s30$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMaxPreloaderIdleTime\s600$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s10$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerStartTimeout\s600$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerConcurrencyModel\sthread$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerThreadCount\s5$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMaxRequests\s1000$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMaxRequestTime\s2$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMemoryLimit\s64$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerStatThrottleRate\s5$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-file_footer').with(
+              content: %r{^PassengerPreStart\shttp://localhost/myapp$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerHighPerformance\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerBufferUpload\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerBufferResponse\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerErrorOverride\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMaxRequestQueueSize\s10$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerMaxRequestQueueTime\s2$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerStickySessions\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerStickySessionsCookieName\s_nom_nom_nom$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerAllowEncodedSlashes\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerDebugger\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerLveMinUid\s500$},
+            )
+          }
+        end
+        context 'vhost with multiple ip addresses' do
+          let :params do
             {
-              'path'     => '/var/www/files',
-              'provider' => 'files',
-              'additional_includes' => ['/custom/path/includes', '/custom/path/another_includes'],
-            },
+              'port'                        => '80',
+              'ip'                          => ['127.0.0.1', '::1'],
+              'ip_based'                    => true,
+              'servername'                  => 'example.com',
+              'docroot'                     => '/var/www/html',
+              'add_listen'                  => true,
+              'ensure'                      => 'present',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[.\/m]*$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
+          it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
+        end
+
+        context 'vhost with multiple ports' do
+          let :params do
             {
-              'path'     => '/var/www/files',
-              'provider' => 'files',
-              'require'  => 'all granted',
-            },
+              'port'                        => ['80', '8080'],
+              'ip'                          => '127.0.0.1',
+              'ip_based'                    => true,
+              'servername'                  => 'example.com',
+              'docroot'                     => '/var/www/html',
+              'add_listen'                  => true,
+              'ensure'                      => 'present',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[.\/m]*$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
+          it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
+        end
+
+        context 'vhost with multiple ip addresses, multiple ports' do
+          let :params do
             {
-              'path'     => '/var/www/files',
-              'provider' => 'files',
-              'require'  =>
-              {
-                'enforce'  => 'all',
-                'requires' => ['all-valid1', 'all-valid2'],
-              },
-            },
+              'port'                        => ['80', '8080'],
+              'ip'                          => ['127.0.0.1', '::1'],
+              'ip_based'                    => true,
+              'servername'                  => 'example.com',
+              'docroot'                     => '/var/www/html',
+              'add_listen'                  => true,
+              'ensure'                      => 'present',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[.\/m]*$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
+          it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
+          it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
+          it { is_expected.to contain_concat__fragment('Listen [::1]:8080') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:8080') }
+        end
+
+        context 'vhost with ipv6 address' do
+          let :params do
             {
-              'path'     => '/var/www/files',
-              'provider' => 'files',
-              'require'  =>
-              {
-                'enforce'  => 'none',
-                'requires' => ['none-valid1', 'none-valid2'],
-              },
-            },
+              'port'                        => '80',
+              'ip'                          => '::1',
+              'ip_based'                    => true,
+              'servername'                  => 'example.com',
+              'docroot'                     => '/var/www/html',
+              'add_listen'                  => true,
+              'ensure'                      => 'present',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{[.\/m]*<VirtualHost \[::1\]:80>[.\/m]*$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
+        end
+
+        context 'vhost with wildcard ip address' do
+          let :params do
             {
-              'path'     => '/var/www/files',
-              'provider' => 'files',
-              'require'  =>
-              {
-                'enforce'  => 'any',
-                'requires' => ['any-valid1', 'any-valid2'],
-              },
-            },
+              'port'                        => '80',
+              'ip'                          => '*',
+              'ip_based'                    => true,
+              'servername'                  => 'example.com',
+              'docroot'                     => '/var/www/html',
+              'add_listen'                  => true,
+              'ensure'                      => 'present',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{[.\/m]*<VirtualHost \*:80>[.\/m]*$},
+            )
+          }
+          it { is_expected.to contain_concat__fragment('Listen *:80') }
+          it { is_expected.not_to contain_concat__fragment('NameVirtualHost *:80') }
+        end
+
+        context 'modsec_audit_log' do
+          let :params do
             {
-              'path'     => '*',
-              'provider' => 'proxy',
-            },
-            { 'path'              => '/var/www/files/indexed_directory',
-              'directoryindex'    => 'disabled',
-              'options'           => ['Indexes', 'FollowSymLinks', 'MultiViews'],
-              'index_options'     => ['FancyIndexing'],
-              'index_style_sheet' => '/styles/style.css' },
-            { 'path'              => '/var/www/files/output_filtered',
-              'set_output_filter' => 'output_filter' },
-            { 'path'     => '/var/www/files',
-              'provider' => 'location',
-              'limit'    => [
-                { 'methods' => 'GET HEAD',
-                  'require' => ['valid-user'] },
-              ] },
-            { 'path'         => '/var/www/files',
-              'provider'     => 'location',
-              'limit_except' => [
-                { 'methods' => 'GET HEAD',
-                  'require' => ['valid-user'] },
-              ] },
-            { 'path'               => '/var/www/dav',
-              'dav'                => 'filesystem',
-              'dav_depth_infinity' => true,
-              'dav_min_timeout'    => '600' },
+              'docroot'          => '/rspec/docroot',
+              'modsec_audit_log' => true,
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+              content: %r{^\s*SecAuditLog "\/var\/log\/#{apache_name}\/rspec\.example\.com_security\.log"$},
+            )
+          }
+        end
+        context 'modsec_audit_log_file' do
+          let :params do
             {
-              'path'                                                => '/var/www/node-app/public',
-              'passenger_enabled'                                   => true,
-              'passenger_base_uri'                                  => '/app',
-              'passenger_ruby'                                      => '/path/to/ruby',
-              'passenger_python'                                    => '/path/to/python',
-              'passenger_nodejs'                                    => '/path/to/nodejs',
-              'passenger_meteor_app_settings'                       => '/path/to/file.json',
-              'passenger_app_env'                                   => 'demo',
-              'passenger_app_root'                                  => '/var/www/node-app',
-              'passenger_app_group_name'                            => 'foo_bar',
-              'passenger_app_type'                                  => 'node',
-              'passenger_startup_file'                              => 'start.js',
-              'passenger_restart_dir'                               => 'temp',
-              'passenger_load_shell_envvars'                        => false,
-              'passenger_rolling_restarts'                          => false,
-              'passenger_resist_deployment_errors'                  => false,
-              'passenger_user'                                      => 'nodeuser',
-              'passenger_group'                                     => 'nodegroup',
-              'passenger_friendly_error_pages'                      => true,
-              'passenger_min_instances'                             => 7,
-              'passenger_max_instances'                             => 9,
-              'passenger_force_max_concurrent_requests_per_process' => 12,
-              'passenger_start_timeout'                             => 10,
-              'passenger_concurrency_model'                         => 'thread',
-              'passenger_thread_count'                              => 20,
-              'passenger_max_requests'                              => 2000,
-              'passenger_max_request_time'                          => 1,
-              'passenger_memory_limit'                              => 32,
-              'passenger_high_performance'                          => false,
-              'passenger_buffer_upload'                             => false,
-              'passenger_buffer_response'                           => false,
-              'passenger_error_override'                            => false,
-              'passenger_max_request_queue_size'                    => 120,
-              'passenger_max_request_queue_time'                    => 5,
-              'passenger_sticky_sessions'                           => true,
-              'passenger_sticky_sessions_cookie_name'               => '_delicious_cookie',
-              'passenger_allow_encoded_slashes'                     => false,
-              'passenger_debugger'                                  => false,
-            },
-          ],
-          'error_log'                   => false,
-          'error_log_file'              => 'httpd_error_log',
-          'error_log_syslog'            => true,
-          'error_documents'             => 'true',
-          'fallbackresource'            => '/index.php',
-          'scriptalias'                 => '/usr/lib/cgi-bin',
-          'scriptaliases'               => [
+              'docroot'               => '/rspec/docroot',
+              'modsec_audit_log_file' => 'foo.log',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+              content: %r{\s*SecAuditLog "\/var\/log\/#{apache_name}\/foo.log"$},
+            )
+          }
+        end
+        context 'set only aliases' do
+          let :params do
             {
-              'alias' => '/myscript',
-              'path'  => '/usr/share/myscript',
-            },
+              'docroot' => '/rspec/docroot',
+              'aliases' => [
+                {
+                  'alias' => '/alias',
+                  'path'  => '/rspec/docroot',
+                },
+              ],
+            }
+          end
+
+          it { is_expected.to contain_class('apache::mod::alias') }
+        end
+        context 'proxy_pass_match' do
+          let :params do
             {
-              'aliasmatch' => '^/foo(.*)',
-              'path'       => '/usr/share/fooscripts$1',
-            },
-          ],
-          'proxy_dest'                  => '/',
-          'proxy_pass'                  => [
+              'docroot' => '/rspec/docroot',
+              'proxy_pass_match' => [
+                {
+                  'path'     => '.*',
+                  'url'      => 'http://backend-a/',
+                  'params'   => { 'timeout' => 300 },
+                },
+              ],
+            }
+          end
+
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+              %r{ProxyPassMatch .* http:\/\/backend-a\/ timeout=300},
+            ).with_content(%r{## Proxy rules})
+          }
+        end
+        context 'proxy_dest_match' do
+          let :params do
+            {
+              'docroot'          => '/rspec/docroot',
+              'proxy_dest_match' => '/',
+            }
+          end
+
+          it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{## Proxy rules}) }
+        end
+        context 'not everything can be set together...' do
+          let :params do
             {
-              'path'            => '/a',
-              'url'             => 'http://backend-a/',
-              'keywords'        => ['noquery', 'interpolate'],
-              'no_proxy_uris'       => ['/a/foo', '/a/bar'],
-              'no_proxy_uris_match' => ['/a/foomatch'],
-              'reverse_cookies' => [
+              'access_log_pipe' => '/dev/null',
+              'error_log_pipe'  => '/dev/null',
+              'docroot'         => '/var/www/foo',
+              'ensure'          => 'absent',
+              'manage_docroot'  => true,
+              'logroot'         => '/tmp/logroot',
+              'logroot_ensure'  => 'absent',
+              'directories'     => [
                 {
-                  'path' => '/a',
-                  'url' => 'http://backend-a/',
+                  'path'     => '/var/www/files',
+                  'provider' => 'files',
+                  'allow'    => ['from 127.0.0.1', 'from 127.0.0.2'],
+                  'deny'     => ['from 127.0.0.3', 'from 127.0.0.4'],
+                  'satisfy'  => 'any',
                 },
                 {
-                  'domain' => 'foo',
-                  'url'    => 'http://foo',
+                  'path'     => '/var/www/foo',
+                  'provider' => 'files',
+                  'allow'    => 'from 127.0.0.5',
+                  'deny'     => 'from all',
+                  'order'    => 'deny,allow',
                 },
               ],
-              'params' => {
-                'retry'   => '0',
-                'timeout' => '5',
-              },
-              'setenv'   => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
-            },
-          ],
-          'proxy_pass_match' => [
+
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.not_to contain_class('apache::mod::ssl') }
+          it { is_expected.not_to contain_class('apache::mod::mime') }
+          it { is_expected.not_to contain_class('apache::mod::vhost_alias') }
+          it { is_expected.not_to contain_class('apache::mod::wsgi') }
+          it { is_expected.not_to contain_class('apache::mod::passenger') }
+          it { is_expected.not_to contain_class('apache::mod::suexec') }
+          it { is_expected.not_to contain_class('apache::mod::rewrite') }
+          it { is_expected.not_to contain_class('apache::mod::alias') }
+          it { is_expected.not_to contain_class('apache::mod::proxy') }
+          it { is_expected.not_to contain_class('apache::mod::proxy_http') }
+          it { is_expected.not_to contain_class('apache::mod::headers') }
+          it { is_expected.to contain_file('/var/www/foo') }
+          it {
+            is_expected.to contain_file('/tmp/logroot').with('ensure' => 'absent')
+          }
+          it {
+            is_expected.to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
+          }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-aliases') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-itk') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-fallbackresource') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+          # the following style is only present on Apache 2.2
+          # That is used in SLES 11, RHEL6, Amazon Linux
+          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
+             (facts[:os]['name'] == 'Amazon') ||
+             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Allow from 127\.0\.0\.1$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Allow from 127\.0\.0\.2$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Allow from 127\.0\.0\.5$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Deny from 127\.0\.0\.3$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Deny from 127\.0\.0\.4$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Deny from all$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Satisfy any$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Order deny,allow$},
+              )
+            }
+          end
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-additional_includes') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-access_log') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-action') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-block') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-error_document') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-proxy') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-redirect') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-scriptalias') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-serveralias') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-setenv') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-suphp') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-php_admin') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-header') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-requestheader') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-wsgi') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-custom_fragment') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-fastcgi') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-suexec') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-charsets') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-limits') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
+        end
+        context 'wsgi_application_group should set apache::mod::wsgi' do
+          let :params do
             {
-              'path'     => '/a',
-              'url'      => 'http://backend-a/',
-              'keywords' => ['noquery', 'interpolate'],
-              'no_proxy_uris'       => ['/a/foo', '/a/bar'],
-              'no_proxy_uris_match' => ['/a/foomatch'],
-              'params' => {
-                'retry'   => '0',
-                'timeout' => '5',
-              },
-              'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
-            },
-          ],
-          'suphp_addhandler'            => 'foo',
-          'suphp_engine'                => 'on',
-          'suphp_configpath'            => '/var/www/html',
-          'php_admin_flags'             => ['foo', 'bar'],
-          'php_admin_values'            => ['true', 'false'],
-          'no_proxy_uris'               => '/foo',
-          'no_proxy_uris_match'         => '/foomatch',
-          'proxy_preserve_host'         => true,
-          'proxy_add_headers'           => true,
-          'proxy_error_override'        => true,
-          'redirect_source'             => '/bar',
-          'redirect_dest'               => '/',
-          'redirect_status'             => 'temp',
-          'redirectmatch_status'        => ['404'],
-          'redirectmatch_regexp'        => ['\.git$'],
-          'redirectmatch_dest'          => ['http://www.example.com'],
-          'headers'                     => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-          'request_headers'             => ['append MirrorID "mirror 12"'],
-          'rewrites'                    => [
+              'docroot'                    => '/rspec/docroot',
+              'wsgi_application_group'     => '%{GLOBAL}',
+            }
+          end
+
+          it { is_expected.to contain_class('apache::mod::wsgi') }
+        end
+        context 'wsgi_daemon_process should set apache::mod::wsgi' do
+          let :params do
             {
-              'rewrite_rule' => ['^index\.html$ welcome.html'],
-            },
-          ],
-          'filters' => [
-            'FilterDeclare COMPRESS',
-            'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/html',
-            'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/css',
-            'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/plain',
-            'FilterProvider COMPRESS  DEFLATE resp=Content-Type $text/xml',
-            'FilterChain COMPRESS',
-            'FilterProtocol COMPRESS  DEFLATE change=yes;byteranges=no',
-          ],
-          'rewrite_base'                => '/',
-          'rewrite_rule'                => '^index\.html$ welcome.html',
-          'rewrite_cond'                => '%{HTTP_USER_AGENT} ^MSIE',
-          'rewrite_inherit'             => true,
-          'setenv'                      => ['FOO=/bin/true'],
-          'setenvif'                    => 'Request_URI "\.gif$" object_is_image=gif',
-          'setenvifnocase'              => 'REMOTE_ADDR ^127.0.0.1 localhost=true',
-          'block'                       => 'scm',
-          'wsgi_application_group'      => '%{GLOBAL}',
-          'wsgi_daemon_process'         => 'wsgi',
-          'wsgi_daemon_process_options' => {
-            'processes'    => '2',
-            'threads'      => '15',
-            'display-name' => '%{GROUP}',
-          },
-          'wsgi_import_script'          => '/var/www/demo.wsgi',
-          'wsgi_import_script_options'  => {
-            'process-group'     => 'wsgi',
-            'application-group' => '%{GLOBAL}',
-          },
-          'wsgi_process_group'          => 'wsgi',
-          'wsgi_script_aliases'         => {
-            '/' => '/var/www/demo.wsgi',
-          },
-          'wsgi_script_aliases_match' => {
-            '^/test/(^[/*)' => '/var/www/demo.wsgi',
-          },
-          'wsgi_pass_authorization'     => 'On',
-          'custom_fragment'             => '#custom string',
-          'itk'                         => {
-            'user'  => 'someuser',
-            'group' => 'somegroup',
-          },
-          'wsgi_chunked_request'        => 'On',
-          'action'                      => 'foo',
-          'fastcgi_server'              => 'localhost',
-          'fastcgi_socket'              => '/tmp/fastcgi.socket',
-          'fastcgi_dir'                 => '/tmp',
-          'fastcgi_idle_timeout'        => '120',
-          'additional_includes'         => '/custom/path/includes',
-          'apache_version'              => '2.4',
-          'use_optional_includes'       => true,
-          'suexec_user_group'           => 'root root',
-          'allow_encoded_slashes'       => 'nodecode',
-          'use_canonical_name'          => 'dns',
-          'passenger_enabled'                     => false,
-          'passenger_base_uri'                    => '/app',
-          'passenger_ruby'                        => '/usr/bin/ruby1.9.1',
-          'passenger_python'                      => '/usr/local/bin/python',
-          'passenger_nodejs'                      => '/usr/bin/node',
-          'passenger_meteor_app_settings'         => '/path/to/some/file.json',
-          'passenger_app_env'                     => 'test',
-          'passenger_app_root'                    => '/usr/share/myapp',
-          'passenger_app_group_name'              => 'app_customer',
-          'passenger_app_type'                    => 'rack',
-          'passenger_startup_file'                => 'bin/www',
-          'passenger_restart_dir'                 => 'tmp',
-          'passenger_spawn_method'                => 'direct',
-          'passenger_load_shell_envvars'          => false,
-          'passenger_rolling_restarts'            => false,
-          'passenger_resist_deployment_errors'    => true,
-          'passenger_user'                        => 'sandbox',
-          'passenger_group'                       => 'sandbox',
-          'passenger_friendly_error_pages'        => false,
-          'passenger_min_instances'               => 1,
-          'passenger_max_instances'               => 30,
-          'passenger_max_preloader_idle_time'     => 600,
-          'passenger_force_max_concurrent_requests_per_process' => 10,
-          'passenger_start_timeout'               => 600,
-          'passenger_concurrency_model'           => 'thread',
-          'passenger_thread_count'                => 5,
-          'passenger_max_requests'                => 1000,
-          'passenger_max_request_time'            => 2,
-          'passenger_memory_limit'                => 64,
-          'passenger_stat_throttle_rate'          => 5,
-          'passenger_pre_start'                   => 'http://localhost/myapp',
-          'passenger_high_performance'            => true,
-          'passenger_buffer_upload'               => false,
-          'passenger_buffer_response'             => false,
-          'passenger_error_override'              => true,
-          'passenger_max_request_queue_size'      => 10,
-          'passenger_max_request_queue_time'      => 2,
-          'passenger_sticky_sessions'             => true,
-          'passenger_sticky_sessions_cookie_name' => '_nom_nom_nom',
-          'passenger_allow_encoded_slashes'       => true,
-          'passenger_debugger'                    => true,
-          'passenger_lve_min_uid'                 => 500,
-          'add_default_charset'         => 'UTF-8',
-          'jk_mounts'                   => [
-            { 'mount'   => '/*',     'worker' => 'tcnode1' },
-            { 'unmount' => '/*.jpg', 'worker' => 'tcnode1' },
-          ],
-          'auth_kerb'                   => true,
-          'krb_method_negotiate'        => 'off',
-          'krb_method_k5passwd'         => 'off',
-          'krb_authoritative'           => 'off',
-          'krb_auth_realms'             => ['EXAMPLE.ORG', 'EXAMPLE.NET'],
-          'krb_5keytab'                 => '/tmp/keytab5',
-          'krb_local_user_mapping'      => 'off',
-          'http_protocol_options' => 'Strict LenientMethods Allow0.9',
-          'keepalive'                   => 'on',
-          'keepalive_timeout'           => '100',
-          'max_keepalive_requests'      => '1000',
-          'comment'                     => [
-            'Comment 1',
-            'Comment 2',
-          ],
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.6.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.not_to contain_file('/var/www/foo') }
-      it { is_expected.to contain_class('apache::mod::ssl') }
-      it {
-        is_expected.to contain_file('ssl.conf').with(
-          content: %r{^\s+SSLHonorCipherOrder On$},
-        )
-      }
-      it {
-        is_expected.to contain_file('ssl.conf').with(
-          content: %r{^\s+SSLPassPhraseDialog builtin$},
-        )
-      }
-      it {
-        is_expected.to contain_file('ssl.conf').with(
-          content: %r{^\s+SSLSessionCacheTimeout 300$},
-        )
-      }
-      it { is_expected.to contain_class('apache::mod::mime') }
-      it { is_expected.to contain_class('apache::mod::vhost_alias') }
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-      it { is_expected.to contain_class('apache::mod::suexec') }
-      it { is_expected.to contain_class('apache::mod::passenger') }
-      it {
-        is_expected.to contain_file('/var/www/logs').with('ensure' => 'directory',
-                                                          'mode' => '0600')
-      }
-      it { is_expected.to contain_class('apache::mod::rewrite') }
-      it { is_expected.to contain_class('apache::mod::alias') }
-      it { is_expected.to contain_class('apache::mod::proxy') }
-      it { is_expected.to contain_class('apache::mod::proxy_http') }
-      it { is_expected.to contain_class('apache::mod::fastcgi') }
-      it { is_expected.to contain_class('apache::mod::headers') }
-      it { is_expected.to contain_class('apache::mod::filter') }
-      it { is_expected.to contain_class('apache::mod::env') }
-      it { is_expected.to contain_class('apache::mod::setenvif') }
-      it {
-        is_expected.to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
-                                                                        'mode'    => '0644',
-                                                                        'require' => 'Package[httpd]',
-                                                                        'notify'  => 'Class[Apache::Service]')
-      }
-      it {
-        is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
-                                                                              'path' => '/etc/apache2/sites-enabled/30-rspec.example.com.conf')
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-          content: %r{^# Comment 1$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<Proxy "\*">$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Include\s'\/custom\/path\/includes'$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Include\s'\/custom\/path\/another_includes'$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require valid-user$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require all denied$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require all granted$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<RequireAll>$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<\/RequireAll>$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require all-valid1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require all-valid2$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<RequireNone>$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<\/RequireNone>$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require none-valid1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require none-valid2$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<RequireAny>$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<\/RequireAny>$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require any-valid1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require any-valid2$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+IndexOptions\sFancyIndexing$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+IndexStyleSheet\s'\/styles\/style\.css'$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+DirectoryIndex\sdisabled$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+SetOutputFilter\soutput_filter$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<Limit GET HEAD>$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>}m,
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+<LimitExcept GET HEAD>$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/LimitExcept>}m,
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Dav\sfilesystem$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+DavDepthInfinity\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+DavMinTimeout\s600$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerEnabled\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerBaseURI\s/app$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerRuby\s/path/to/ruby$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerPython\s/path/to/python$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerNodejs\s/path/to/nodejs$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerMeteorAppSettings\s/path/to/file\.json$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerAppEnv\sdemo$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerAppRoot\s/var/www/node-app$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerAppGroupName\sfoo_bar$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerAppType\snode$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerStartupFile\sstart\.js$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerRestartDir\stemp$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerRollingRestarts\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerResistDeploymentErrors\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerUser\snodeuser$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerGroup\snodegroup$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerFriendlyErrorPages\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerMinInstances\s7$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerMaxInstances\s9$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s12$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerStartTimeout\s10$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerConcurrencyModel\sthread$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerThreadCount\s20$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerMaxRequests\s2000$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerMaxRequestTime\s1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerMemoryLimit\s32$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerHighPerformance\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerBufferUpload\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerBufferResponse\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerErrorOverride\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerMaxRequestQueueSize\s120$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerMaxRequestQueueTime\s5$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerStickySessions\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerStickySessionsCookieName\s_delicious_cookie$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerAllowEncodedSlashes\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+PassengerDebugger\sOff$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-access_log') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{retry=0},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{timeout=5},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{SetEnv force-proxy-request-1.0 1},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{SetEnv proxy-nokeepalive 1},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{noquery interpolate},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{ProxyPreserveHost On},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{ProxyAddHeaders On},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{ProxyPassReverseCookiePath\s+\/a\s+http:\/\/},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
-          content: %r{^\s+RewriteOptions Inherit$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-          %r{SetEnv FOO=/bin/true},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-          %r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-          %r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
-          content: %r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-          content: %r{^\s+SSLProxyEngine On$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-          content: %r{^\s+SSLProxyCheckPeerCN\s+on$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-          content: %r{^\s+SSLProxyCheckPeerName\s+on$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-          content: %r{^\s+SSLProxyCheckPeerExpire\s+on$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-          content: %r{^\s+SSLProxyCipherSuite\s+HIGH$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-          content: %r{^\s+SSLProxyProtocol\s+TLSv1.2$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
-          content: %r{^\s+FilterDeclare COMPRESS$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-security') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
-          content: %r{^\s+JkMount\s+\/\*\s+tcnode1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
-          content: %r{^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-          content: %r{^\s+KrbMethodNegotiate\soff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-          content: %r{^\s+KrbAuthoritative\soff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-          content: %r{^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-          content: %r{^\s+Krb5Keytab\s\/tmp\/keytab5$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-          content: %r{^\s+KrbLocalUserMapping\soff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-          content: %r{^\s+KrbServiceName\sHTTP$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-          content: %r{^\s+KrbSaveCredentials\soff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-          content: %r{^\s+KrbVerifyKDC\son$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
-          content: %r{^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-          content: %r{^\s+KeepAlive\son$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-          content: %r{^\s+KeepAliveTimeout\s100$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-          content: %r{^\s+MaxKeepAliveRequests\s1000$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerEnabled\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerBaseURI\s/app$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerPython\s/usr/local/bin/python$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerNodejs\s/usr/bin/node$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMeteorAppSettings\s/path/to/some/file.json$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerAppEnv\stest$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerAppRoot\s/usr/share/myapp$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerAppGroupName\sapp_customer$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerAppType\srack$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerStartupFile\sbin/www$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerRestartDir\stmp$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerSpawnMethod\sdirect$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerRollingRestarts\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerResistDeploymentErrors\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerUser\ssandbox$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerGroup\ssandbox$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerFriendlyErrorPages\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMinInstances\s1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMaxInstances\s30$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMaxPreloaderIdleTime\s600$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s10$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerStartTimeout\s600$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerConcurrencyModel\sthread$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerThreadCount\s5$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMaxRequests\s1000$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMaxRequestTime\s2$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMemoryLimit\s64$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerStatThrottleRate\s5$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-file_footer').with(
-          content: %r{^PassengerPreStart\shttp://localhost/myapp$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerHighPerformance\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerBufferUpload\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerBufferResponse\sOff$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerErrorOverride\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMaxRequestQueueSize\s10$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerMaxRequestQueueTime\s2$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerStickySessions\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerStickySessionsCookieName\s_nom_nom_nom$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerAllowEncodedSlashes\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerDebugger\sOn$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-          content: %r{^\s+PassengerLveMinUid\s500$},
-        )
-      }
-    end
-    context 'vhost with multiple ip addresses' do
-      let :params do
-        {
-          'port'                        => '80',
-          'ip'                          => ['127.0.0.1', '::1'],
-          'ip_based'                    => true,
-          'servername'                  => 'example.com',
-          'docroot'                     => '/var/www/html',
-          'add_listen'                  => true,
-          'ensure'                      => 'present',
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.6.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-          content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[.\/m]*$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
-      it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
-    end
-
-    context 'vhost with multiple ports' do
-      let :params do
-        {
-          'port'                        => ['80', '8080'],
-          'ip'                          => '127.0.0.1',
-          'ip_based'                    => true,
-          'servername'                  => 'example.com',
-          'docroot'                     => '/var/www/html',
-          'add_listen'                  => true,
-          'ensure'                      => 'present',
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.6.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-          content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[.\/m]*$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
-      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
-    end
-
-    context 'vhost with multiple ip addresses, multiple ports' do
-      let :params do
-        {
-          'port'                        => ['80', '8080'],
-          'ip'                          => ['127.0.0.1', '::1'],
-          'ip_based'                    => true,
-          'servername'                  => 'example.com',
-          'docroot'                     => '/var/www/html',
-          'add_listen'                  => true,
-          'ensure'                      => 'present',
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.6.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-          content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[.\/m]*$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
-      it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
-      it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
-      it { is_expected.to contain_concat__fragment('Listen [::1]:8080') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:8080') }
-    end
-
-    context 'vhost with ipv6 address' do
-      let :params do
-        {
-          'port'                        => '80',
-          'ip'                          => '::1',
-          'ip_based'                    => true,
-          'servername'                  => 'example.com',
-          'docroot'                     => '/var/www/html',
-          'add_listen'                  => true,
-          'ensure'                      => 'present',
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.6.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-          content: %r{[.\/m]*<VirtualHost \[::1\]:80>[.\/m]*$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
-    end
-
-    context 'vhost with wildcard ip address' do
-      let :params do
-        {
-          'port'                        => '80',
-          'ip'                          => '*',
-          'ip_based'                    => true,
-          'servername'                  => 'example.com',
-          'docroot'                     => '/var/www/html',
-          'add_listen'                  => true,
-          'ensure'                      => 'present',
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.6.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-          content: %r{[.\/m]*<VirtualHost \*:80>[.\/m]*$},
-        )
-      }
-      it { is_expected.to contain_concat__fragment('Listen *:80') }
-      it { is_expected.not_to contain_concat__fragment('NameVirtualHost *:80') }
-    end
-
-    context 'modsec_audit_log' do
-      let :params do
-        {
-          'docroot'          => '/rspec/docroot',
-          'modsec_audit_log' => true,
-        }
-      end
-
-      it { is_expected.to compile }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-security').with(
-          content: %r{^\s*SecAuditLog "\/var\/log\/apache2\/rspec\.example\.com_security\.log"$},
-        )
-      }
-    end
-    context 'modsec_audit_log_file' do
-      let :params do
-        {
-          'docroot'               => '/rspec/docroot',
-          'modsec_audit_log_file' => 'foo.log',
-        }
-      end
-
-      it { is_expected.to compile }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-security').with(
-          content: %r{\s*SecAuditLog "\/var\/log\/apache2\/foo.log"$},
-        )
-      }
-    end
-    context 'set only aliases' do
-      let :params do
-        {
-          'docroot' => '/rspec/docroot',
-          'aliases' => [
+              'docroot'                    => '/rspec/docroot',
+              'wsgi_daemon_process' => 'wsgi',
+            }
+          end
+
+          it { is_expected.to contain_class('apache::mod::wsgi') }
+        end
+        context 'wsgi_import_script on its own should not set apache::mod::wsgi' do
+          let :params do
             {
-              'alias' => '/alias',
-              'path'  => '/rspec/docroot',
-            },
-          ],
-        }
-      end
-
-      it { is_expected.to contain_class('apache::mod::alias') }
-    end
-    context 'proxy_pass_match' do
-      let :params do
-        {
-          'docroot' => '/rspec/docroot',
-          'proxy_pass_match' => [
+              'docroot'                    => '/rspec/docroot',
+              'wsgi_import_script'         => '/var/www/demo.wsgi',
+            }
+          end
+
+          it { is_expected.not_to contain_class('apache::mod::wsgi') }
+        end
+        context 'wsgi_import_script_options on its own should not set apache::mod::wsgi' do
+          let :params do
             {
-              'path'     => '.*',
-              'url'      => 'http://backend-a/',
-              'params'   => { 'timeout' => 300 },
-            },
-          ],
-        }
-      end
+              'docroot' => '/rspec/docroot',
+              'wsgi_import_script_options' => {
+                'process-group'           => 'wsgi',
+                'application-group'       => '%{GLOBAL}',
+              },
+            }
+          end
 
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-          %r{ProxyPassMatch .* http:\/\/backend-a\/ timeout=300},
-        ).with_content(%r{## Proxy rules})
-      }
-    end
-    context 'proxy_dest_match' do
-      let :params do
-        {
-          'docroot'          => '/rspec/docroot',
-          'proxy_dest_match' => '/',
-        }
-      end
+          it { is_expected.not_to contain_class('apache::mod::wsgi') }
+        end
+        context 'wsgi_import_script and wsgi_import_script_options should set apache::mod::wsgi' do
+          let :params do
+            {
+              'docroot'                     => '/rspec/docroot',
+              'wsgi_import_script'          => '/var/www/demo.wsgi',
+              'wsgi_import_script_options'  => {
+                'process-group'           => 'wsgi',
+                'application-group'       => '%{GLOBAL}',
+              },
+            }
+          end
 
-      it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{## Proxy rules}) }
-    end
-    context 'not everything can be set together...' do
-      let :params do
-        {
-          'access_log_pipe' => '/dev/null',
-          'error_log_pipe'  => '/dev/null',
-          'docroot'         => '/var/www/foo',
-          'ensure'          => 'absent',
-          'manage_docroot'  => true,
-          'logroot'         => '/tmp/logroot',
-          'logroot_ensure'  => 'absent',
-          'directories'     => [
+          it { is_expected.to contain_class('apache::mod::wsgi') }
+        end
+        context 'wsgi_process_group should set apache::mod::wsgi' do
+          let :params do
             {
-              'path'     => '/var/www/files',
-              'provider' => 'files',
-              'allow'    => ['from 127.0.0.1', 'from 127.0.0.2'],
-              'deny'     => ['from 127.0.0.3', 'from 127.0.0.4'],
-              'satisfy'  => 'any',
-            },
+              'docroot'                    => '/rspec/docroot',
+              'wsgi_daemon_process'        => 'wsgi',
+            }
+          end
+
+          it { is_expected.to contain_class('apache::mod::wsgi') }
+        end
+        context 'wsgi_script_aliases with non-empty aliases should set apache::mod::wsgi' do
+          let :params do
             {
-              'path'     => '/var/www/foo',
-              'provider' => 'files',
-              'allow'    => 'from 127.0.0.5',
-              'deny'     => 'from all',
-              'order'    => 'deny,allow',
-            },
-          ],
-
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.6.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.not_to contain_class('apache::mod::ssl') }
-      it { is_expected.not_to contain_class('apache::mod::mime') }
-      it { is_expected.not_to contain_class('apache::mod::vhost_alias') }
-      it { is_expected.not_to contain_class('apache::mod::wsgi') }
-      it { is_expected.not_to contain_class('apache::mod::passenger') }
-      it { is_expected.not_to contain_class('apache::mod::suexec') }
-      it { is_expected.not_to contain_class('apache::mod::rewrite') }
-      it { is_expected.not_to contain_class('apache::mod::alias') }
-      it { is_expected.not_to contain_class('apache::mod::proxy') }
-      it { is_expected.not_to contain_class('apache::mod::proxy_http') }
-      it { is_expected.not_to contain_class('apache::mod::headers') }
-      it { is_expected.to contain_file('/var/www/foo') }
-      it {
-        is_expected.to contain_file('/tmp/logroot').with('ensure' => 'absent')
-      }
-      it {
-        is_expected.to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
-      }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-aliases') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-itk') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-fallbackresource') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Allow from 127\.0\.0\.1$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Allow from 127\.0\.0\.2$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Allow from 127\.0\.0\.5$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Deny from 127\.0\.0\.3$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Deny from 127\.0\.0\.4$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Deny from all$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Satisfy any$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Order deny,allow$},
-        )
-      }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-additional_includes') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-access_log') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-action') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-block') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-error_document') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-proxy') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-redirect') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-scriptalias') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-serveralias') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-setenv') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-suphp') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-php_admin') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-header') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-requestheader') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-wsgi') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-custom_fragment') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-fastcgi') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-suexec') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-charsets') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-limits') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
-    end
-    context 'wsgi_application_group should set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot'                    => '/rspec/docroot',
-          'wsgi_application_group'     => '%{GLOBAL}',
-        }
-      end
-
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-    end
-    context 'wsgi_daemon_process should set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot'                    => '/rspec/docroot',
-          'wsgi_daemon_process' => 'wsgi',
-        }
-      end
-
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-    end
-    context 'wsgi_import_script on its own should not set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot'                    => '/rspec/docroot',
-          'wsgi_import_script'         => '/var/www/demo.wsgi',
-        }
-      end
-
-      it { is_expected.not_to contain_class('apache::mod::wsgi') }
-    end
-    context 'wsgi_import_script_options on its own should not set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot' => '/rspec/docroot',
-          'wsgi_import_script_options' => {
-            'process-group'           => 'wsgi',
-            'application-group'       => '%{GLOBAL}',
-          },
-        }
-      end
-
-      it { is_expected.not_to contain_class('apache::mod::wsgi') }
-    end
-    context 'wsgi_import_script and wsgi_import_script_options should set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot'                     => '/rspec/docroot',
-          'wsgi_import_script'          => '/var/www/demo.wsgi',
-          'wsgi_import_script_options'  => {
-            'process-group'           => 'wsgi',
-            'application-group'       => '%{GLOBAL}',
-          },
-        }
-      end
-
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-    end
-    context 'wsgi_process_group should set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot'                    => '/rspec/docroot',
-          'wsgi_daemon_process'        => 'wsgi',
-        }
-      end
-
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-    end
-    context 'wsgi_script_aliases with non-empty aliases should set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot'                    => '/rspec/docroot',
-          'wsgi_script_aliases'        => {
-            '/' => '/var/www/demo.wsgi',
-          },
-        }
-      end
-
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-    end
-    context 'wsgi_script_aliases with empty aliases should set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot'                    => '/rspec/docroot',
-          'wsgi_script_aliases'        => {},
-        }
-      end
-
-      it { is_expected.not_to contain_class('apache::mod::wsgi') }
-    end
-    context 'wsgi_pass_authorization should set apache::mod::wsgi' do
-      let :params do
-        {
-          'docroot'                    => '/rspec/docroot',
-          'wsgi_pass_authorization'    => 'On',
-        }
-      end
-
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-    end
-    context 'when not setting nor managing the docroot' do
-      let :params do
-        {
-          'docroot'                     => false,
-          'manage_docroot'              => false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
-    end
-    context 'ssl_proxyengine without ssl' do
-      let :params do
-        {
-          'docroot'         => '/rspec/docroot',
-          'ssl'             => false,
-          'ssl_proxyengine' => true,
-        }
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
-    end
-    context 'ssl_proxy_protocol without ssl_proxyengine' do
-      let :params do
-        {
-          'docroot'            => '/rspec/docroot',
-          'ssl'                => true,
-          'ssl_proxyengine'    => false,
-          'ssl_proxy_protocol' => 'TLSv1.2',
-        }
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
-      it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
-    end
-  end
-  describe 'access logs' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    context 'single log file' do
-      let(:params) do
-        {
-          'docroot'         => '/rspec/docroot',
-          'access_log_file' => 'my_log_file',
-        }
-      end
-
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-          content: %r{^\s+CustomLog.*my_log_file" combined\s*$},
-        )
-      }
-    end
-    context 'single log file with environment' do
-      let(:params) do
-        {
-          'docroot'            => '/rspec/docroot',
-          'access_log_file'    => 'my_log_file',
-          'access_log_env_var' => 'prod',
-        }
-      end
-
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-          content: %r{^\s+CustomLog.*my_log_file" combined\s+env=prod$},
-        )
-      }
-    end
-    context 'multiple log files' do
-      let(:params) do
-        {
-          'docroot'     => '/rspec/docroot',
-          'access_logs' => [
-            { 'file' => '/tmp/log1', 'env' => 'dev' },
-            { 'file' => 'log2' },
-            { 'syslog' => 'syslog', 'format' => '%h %l' },
-          ],
-        }
-      end
-
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-          content: %r{^\s+CustomLog "\/tmp\/log1"\s+combined\s+env=dev$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-          content: %r{^\s+CustomLog "\/var\/log\/httpd\/log2"\s+combined\s*$},
-        )
-      }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-          content: %r{^\s+CustomLog "syslog" "%h %l"\s*$},
-        )
-      }
-    end
-  end # access logs
-  describe 'validation' do
-    let :default_facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    context 'bad ensure' do
-      let :params do
-        {
-          'docroot' => '/rspec/docroot',
-          'ensure'  => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad suphp_engine' do
-      let :params do
-        {
-          'docroot'      => '/rspec/docroot',
-          'suphp_engine' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad ip_based' do
-      let :params do
-        {
-          'docroot'  => '/rspec/docroot',
-          'ip_based' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad access_log' do
-      let :params do
-        {
-          'docroot'    => '/rspec/docroot',
-          'access_log' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad error_log' do
-      let :params do
-        {
-          'docroot'   => '/rspec/docroot',
-          'error_log' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad_ssl' do
-      let :params do
-        {
-          'docroot' => '/rspec/docroot',
-          'ssl'     => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad default_vhost' do
-      let :params do
-        {
-          'docroot'       => '/rspec/docroot',
-          'default_vhost' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad ssl_proxyengine' do
-      let :params do
-        {
-          'docroot'         => '/rspec/docroot',
-          'ssl_proxyengine' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad rewrites' do
-      let :params do
-        {
-          'docroot'  => '/rspec/docroot',
-          'rewrites' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad rewrites 2' do
-      let :params do
-        {
-          'docroot'  => '/rspec/docroot',
-          'rewrites' => ['bogus'],
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'empty rewrites' do
-      let :params do
-        {
-          'docroot'  => '/rspec/docroot',
-          'rewrites' => [],
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to compile }
-    end
-    context 'bad suexec_user_group' do
-      let :params do
-        {
-          'docroot'           => '/rspec/docroot',
-          'suexec_user_group' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad wsgi_script_alias' do
-      let :params do
-        {
-          'docroot'           => '/rspec/docroot',
-          'wsgi_script_alias' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad wsgi_daemon_process_options' do
-      let :params do
-        {
-          'docroot'                     => '/rspec/docroot',
-          'wsgi_daemon_process_options' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad wsgi_import_script_alias' do
-      let :params do
-        {
-          'docroot'                  => '/rspec/docroot',
-          'wsgi_import_script_alias' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad itk' do
-      let :params do
-        {
-          'docroot' => '/rspec/docroot',
-          'itk'     => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad logroot_ensure' do
-      let :params do
-        {
-          'docroot'   => '/rspec/docroot',
-          'log_level' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad log_level' do
-      let :params do
-        {
-          'docroot'   => '/rspec/docroot',
-          'log_level' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'access_log_file and access_log_pipe' do
-      let :params do
-        {
-          'docroot'         => '/rspec/docroot',
-          'access_log_file' => 'bogus',
-          'access_log_pipe' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'error_log_file and error_log_pipe' do
-      let :params do
-        {
-          'docroot'        => '/rspec/docroot',
-          'error_log_file' => 'bogus',
-          'error_log_pipe' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad fallbackresource' do
-      let :params do
-        {
-          'docroot'          => '/rspec/docroot',
-          'fallbackresource' => 'bogus',
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad custom_fragment' do
-      let :params do
-        {
-          'docroot'         => '/rspec/docroot',
-          'custom_fragment' => true,
-        }
-      end
-      let(:facts) { default_facts }
-
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'bad access_logs' do
-      let :params do
-        {
-          'docroot'     => '/rspec/docroot',
-          'access_logs' => '/var/log/somewhere',
-        }
-      end
-      let(:facts) { default_facts }
+              'docroot'                    => '/rspec/docroot',
+              'wsgi_script_aliases'        => {
+                '/' => '/var/www/demo.wsgi',
+              },
+            }
+          end
 
-      it { is_expected.to raise_error(Puppet::Error) }
-    end
-    context 'default of require all granted' do
-      let :params do
-        {
-          'docroot'         => '/var/www/foo',
-          'directories'     => [
+          it { is_expected.to contain_class('apache::mod::wsgi') }
+        end
+        context 'wsgi_script_aliases with empty aliases should set apache::mod::wsgi' do
+          let :params do
             {
-              'path'     => '/var/www/foo/files',
-              'provider' => 'files',
-            },
-          ],
-
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.19.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.to contain_concat('25-rspec.example.com.conf') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-      it {
-        is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require all granted$},
-        )
-      }
-    end
-    context 'require unmanaged' do
-      let :params do
-        {
-          'docroot'         => '/var/www/foo',
-          'directories'     => [
+              'docroot'                    => '/rspec/docroot',
+              'wsgi_script_aliases'        => {},
+            }
+          end
+
+          it { is_expected.not_to contain_class('apache::mod::wsgi') }
+        end
+        context 'wsgi_pass_authorization should set apache::mod::wsgi' do
+          let :params do
             {
-              'path'     => '/var/www/foo',
-              'require'  => 'unmanaged',
-            },
-          ],
-
-        }
-      end
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          kernelversion: '3.19.2',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.to contain_concat('25-rspec.example.com.conf') }
-      it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-      it {
-        is_expected.not_to contain_concat__fragment('rspec.example.com-directories').with(
-          content: %r{^\s+Require all granted$},
-        )
-      }
-    end
-    describe 'redirectmatch_*' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
-      let :dparams do
-        {
-          docroot: '/rspec/docroot',
-          port: '84',
-        }
-      end
-
-      context 'status' do
-        let(:params) { dparams.merge(redirectmatch_status: '404') }
-
-        it { is_expected.to contain_class('apache::mod::alias') }
-      end
-      context 'dest' do
-        let(:params) { dparams.merge(redirectmatch_dest: 'http://other.example.com$1.jpg') }
-
-        it { is_expected.to contain_class('apache::mod::alias') }
-      end
-      context 'regexp' do
-        let(:params) { dparams.merge(redirectmatch_regexp: "(.*)\.gif$") }
-
-        it { is_expected.to contain_class('apache::mod::alias') }
-      end
-      context 'none' do
-        let(:params) { dparams }
-
-        it { is_expected.not_to contain_class('apache::mod::alias') }
+              'docroot'                    => '/rspec/docroot',
+              'wsgi_pass_authorization'    => 'On',
+            }
+          end
+
+          it { is_expected.to contain_class('apache::mod::wsgi') }
+        end
+        context 'when not setting nor managing the docroot' do
+          let :params do
+            {
+              'docroot'                     => false,
+              'manage_docroot'              => false,
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
+        end
+        context 'ssl_proxyengine without ssl' do
+          let :params do
+            {
+              'docroot'         => '/rspec/docroot',
+              'ssl'             => false,
+              'ssl_proxyengine' => true,
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
+        end
+        context 'ssl_proxy_protocol without ssl_proxyengine' do
+          let :params do
+            {
+              'docroot'            => '/rspec/docroot',
+              'ssl'                => true,
+              'ssl_proxyengine'    => false,
+              'ssl_proxy_protocol' => 'TLSv1.2',
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
+        end
+        describe 'access logs' do
+          context 'single log file' do
+            let(:params) do
+              {
+                'docroot'         => '/rspec/docroot',
+                'access_log_file' => 'my_log_file',
+              }
+            end
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+                content: %r{^\s+CustomLog.*my_log_file" combined\s*$},
+              )
+            }
+          end
+          context 'single log file with environment' do
+            let(:params) do
+              {
+                'docroot'            => '/rspec/docroot',
+                'access_log_file'    => 'my_log_file',
+                'access_log_env_var' => 'prod',
+              }
+            end
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+                content: %r{^\s+CustomLog.*my_log_file" combined\s+env=prod$},
+              )
+            }
+          end
+          context 'multiple log files' do
+            let(:params) do
+              {
+                'docroot'     => '/rspec/docroot',
+                'access_logs' => [
+                  { 'file' => '/tmp/log1', 'env' => 'dev' },
+                  { 'file' => 'log2' },
+                  { 'syslog' => 'syslog', 'format' => '%h %l' },
+                ],
+              }
+            end
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+                content: %r{^\s+CustomLog "\/tmp\/log1"\s+combined\s+env=dev$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+                content: %r{^\s+CustomLog "\/var\/log\/#{apache_name}\/log2"\s+combined\s*$},
+              )
+            }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+                content: %r{^\s+CustomLog "syslog" "%h %l"\s*$},
+              )
+            }
+          end
+        end # access logs
+        describe 'validation' do
+          context 'bad ensure' do
+            let :params do
+              {
+                'docroot' => '/rspec/docroot',
+                'ensure'  => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad suphp_engine' do
+            let :params do
+              {
+                'docroot'      => '/rspec/docroot',
+                'suphp_engine' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad ip_based' do
+            let :params do
+              {
+                'docroot'  => '/rspec/docroot',
+                'ip_based' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad access_log' do
+            let :params do
+              {
+                'docroot'    => '/rspec/docroot',
+                'access_log' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad error_log' do
+            let :params do
+              {
+                'docroot'   => '/rspec/docroot',
+                'error_log' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad_ssl' do
+            let :params do
+              {
+                'docroot' => '/rspec/docroot',
+                'ssl'     => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad default_vhost' do
+            let :params do
+              {
+                'docroot'       => '/rspec/docroot',
+                'default_vhost' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad ssl_proxyengine' do
+            let :params do
+              {
+                'docroot'         => '/rspec/docroot',
+                'ssl_proxyengine' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad rewrites' do
+            let :params do
+              {
+                'docroot'  => '/rspec/docroot',
+                'rewrites' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad rewrites 2' do
+            let :params do
+              {
+                'docroot'  => '/rspec/docroot',
+                'rewrites' => ['bogus'],
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'empty rewrites' do
+            let :params do
+              {
+                'docroot'  => '/rspec/docroot',
+                'rewrites' => [],
+              }
+            end
+
+            it { is_expected.to compile }
+          end
+          context 'bad suexec_user_group' do
+            let :params do
+              {
+                'docroot'           => '/rspec/docroot',
+                'suexec_user_group' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad wsgi_script_alias' do
+            let :params do
+              {
+                'docroot'           => '/rspec/docroot',
+                'wsgi_script_alias' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad wsgi_daemon_process_options' do
+            let :params do
+              {
+                'docroot'                     => '/rspec/docroot',
+                'wsgi_daemon_process_options' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad wsgi_import_script_alias' do
+            let :params do
+              {
+                'docroot'                  => '/rspec/docroot',
+                'wsgi_import_script_alias' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad itk' do
+            let :params do
+              {
+                'docroot' => '/rspec/docroot',
+                'itk'     => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad logroot_ensure' do
+            let :params do
+              {
+                'docroot'   => '/rspec/docroot',
+                'log_level' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad log_level' do
+            let :params do
+              {
+                'docroot'   => '/rspec/docroot',
+                'log_level' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'access_log_file and access_log_pipe' do
+            let :params do
+              {
+                'docroot'         => '/rspec/docroot',
+                'access_log_file' => 'bogus',
+                'access_log_pipe' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'error_log_file and error_log_pipe' do
+            let :params do
+              {
+                'docroot'        => '/rspec/docroot',
+                'error_log_file' => 'bogus',
+                'error_log_pipe' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad fallbackresource' do
+            let :params do
+              {
+                'docroot'          => '/rspec/docroot',
+                'fallbackresource' => 'bogus',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad custom_fragment' do
+            let :params do
+              {
+                'docroot'         => '/rspec/docroot',
+                'custom_fragment' => true,
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'bad access_logs' do
+            let :params do
+              {
+                'docroot'     => '/rspec/docroot',
+                'access_logs' => '/var/log/somewhere',
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
+          context 'default of require all granted' do
+            let :params do
+              {
+                'docroot'         => '/var/www/foo',
+                'directories'     => [
+                  {
+                    'path'     => '/var/www/foo/files',
+                    'provider' => 'files',
+                  },
+                ],
+
+              }
+            end
+
+            it { is_expected.to compile }
+            it { is_expected.to contain_concat('25-rspec.example.com.conf') }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+            # this works only with apache 2.4 and newer
+            if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i > 6) ||
+               (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i > 11)
+              it {
+                is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                  content: %r{^\s+Require all granted$},
+                )
+              }
+            end
+          end
+          context 'require unmanaged' do
+            let :params do
+              {
+                'docroot'         => '/var/www/foo',
+                'directories'     => [
+                  {
+                    'path'     => '/var/www/foo',
+                    'require'  => 'unmanaged',
+                  },
+                ],
+
+              }
+            end
+
+            it { is_expected.to compile }
+            it { is_expected.to contain_concat('25-rspec.example.com.conf') }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+            it {
+              is_expected.not_to contain_concat__fragment('rspec.example.com-directories').with(
+                content: %r{^\s+Require all granted$},
+              )
+            }
+          end
+          describe 'redirectmatch_*' do
+            let :dparams do
+              {
+                docroot: '/rspec/docroot',
+                port: '84',
+              }
+            end
+
+            context 'status' do
+              let(:params) { dparams.merge(redirectmatch_status: '404') }
+
+              it { is_expected.to contain_class('apache::mod::alias') }
+            end
+            context 'dest' do
+              let(:params) { dparams.merge(redirectmatch_dest: 'http://other.example.com$1.jpg') }
+
+              it { is_expected.to contain_class('apache::mod::alias') }
+            end
+            context 'regexp' do
+              let(:params) { dparams.merge(redirectmatch_regexp: "(.*)\.gif$") }
+
+              it { is_expected.to contain_class('apache::mod::alias') }
+            end
+            context 'none' do
+              let(:params) { dparams }
+
+              it { is_expected.not_to contain_class('apache::mod::alias') }
+            end
+          end
+        end
       end
     end
   end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index b2115947d7..0c19871d27 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -35,7 +35,8 @@
     run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
     # net-tools required for netstat utility being used by be_listening
     if (fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7') ||
-       (fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '9')
+       (fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+       (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       pp = <<-EOS
         package { 'net-tools': ensure => installed }
       EOS
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 6c37eb2af7..58b7d0a8f7 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -19,21 +19,6 @@
   it { is_expected.to compile.with_all_deps }
 end
 
-shared_examples 'a mod class, without including apache' do
-  let :facts do
-    {
-      id: 'root',
-      lsbdistcodename: 'jessie',
-      kernel: 'Linux',
-      osfamily: 'Debian',
-      operatingsystem: 'Debian',
-      operatingsystemrelease: '8',
-      operatingsystemmajrelease: nil,
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      is_pe: false,
-      hardwaremodel: 'x86_64',
-    }
-  end
-
-  it { is_expected.to compile.with_all_deps }
+shared_context 'a mod class, without including apache' do
+  let(:facts) { on_supported_os['debian-8-x86_64'] }
 end

From 54996ad795a284b8e8aed6ba4729ae7f874702b6 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Thu, 22 Nov 2018 15:26:21 +0000
Subject: [PATCH 1413/2267] (MODULES-5990) Addition of 'IncludeOptional
 conf-enabled/*.conf' to 'apache2.conf' on Debian Family OS of 9/18.04 onwards

---
 manifests/params.pp      | 4 ++++
 templates/httpd.conf.erb | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index b80eb86fb3..df65e73d92 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -69,6 +69,7 @@
     $server_root          = '/etc/httpd'
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
+    $conf_enabled         = undef
     $mod_dir              = $::apache::version::distrelease ? {
       '7'     => "${httpd_dir}/conf.modules.d",
       default => "${httpd_dir}/conf.d",
@@ -217,6 +218,7 @@
     $server_root         = '/etc/apache2'
     $conf_dir            = $httpd_dir
     $confd_dir           = "${httpd_dir}/conf.d"
+    $conf_enabled        = "${httpd_dir}/conf-enabled"
     $mod_dir             = "${httpd_dir}/mods-available"
     $mod_enable_dir      = "${httpd_dir}/mods-enabled"
     $vhost_dir           = "${httpd_dir}/sites-available"
@@ -462,6 +464,7 @@
     $server_root      = '/usr/local'
     $conf_dir         = $httpd_dir
     $confd_dir        = "${httpd_dir}/Includes"
+    $conf_enabled     = undef
     $mod_dir          = "${httpd_dir}/Modules"
     $mod_enable_dir   = undef
     $vhost_dir        = "${httpd_dir}/Vhosts"
@@ -602,6 +605,7 @@
     $server_root         = '/etc/apache2'
     $conf_dir            = $httpd_dir
     $confd_dir           = "${httpd_dir}/conf.d"
+    $conf_enabled        = undef
     $mod_dir             = "${httpd_dir}/mods-available"
     $mod_enable_dir      = "${httpd_dir}/mods-enabled"
     $vhost_dir           = "${httpd_dir}/sites-available"
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index aedefd0862..65a0aa2b6e 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -114,6 +114,9 @@ IncludeOptional "<%= @confd_dir %>/*.conf"
 <%- else -%>
 Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
+<%- if @conf_enabled and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+IncludeOptional "<%= @conf_enabled %>/*.conf"
+<%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"

From 634d5292be88a18eccfe2a8099c7272987969c59 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Tue, 4 Dec 2018 11:31:26 +0000
Subject: [PATCH 1414/2267] (maint) Fix to add Ubuntu 14.04 back to he
 supported modules list

---
 metadata.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.json b/metadata.json
index 6b81698407..aa999befd1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -65,6 +65,7 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
+        "14.04",
         "16.04",
         "18.04"
       ]

From edec924d32230070f1d8ef1e914138425faa523b Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 5 Dec 2018 17:09:39 +0000
Subject: [PATCH 1415/2267] (FM-7605) Disabling conf_enabled on Ubuntu 18.04 by
 default as it conflicts with Shibboleth, causing errors with apache2

---
 manifests/params.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index df65e73d92..06f3adf27a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -218,7 +218,12 @@
     $server_root         = '/etc/apache2'
     $conf_dir            = $httpd_dir
     $confd_dir           = "${httpd_dir}/conf.d"
-    $conf_enabled        = "${httpd_dir}/conf-enabled"
+    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') == 0) {
+      # Overwrite conf_enabled to be false as it causes errors with Shibboleth when enabled on Ubuntu 18.04
+      $conf_enabled      = undef
+    } else {
+      $conf_enabled      = "${httpd_dir}/conf-enabled"
+    }
     $mod_dir             = "${httpd_dir}/mods-available"
     $mod_enable_dir      = "${httpd_dir}/mods-enabled"
     $vhost_dir           = "${httpd_dir}/sites-available"

From 60c99b22c271ee37d8098b3e41fc09d9ebbc8e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20Nyg=C3=A5rd?= <kny@ambita.com>
Date: Sun, 14 Jan 2018 07:44:31 +0100
Subject: [PATCH 1416/2267] SCL support for httpd and php7.1

---
 README.md            |  26 ++++++++-
 manifests/mod/php.pp |  42 ++++++++------
 manifests/params.pp  | 127 ++++++++++++++++++++++++++++++++++++++++---
 manifests/version.pp |  10 +++-
 4 files changed, 177 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index bd54409e1d..6f37630bcd 100755
--- a/README.md
+++ b/README.md
@@ -1504,7 +1504,9 @@ To prevent Puppet from managing the user, set the [`manage_user`][] parameter to
 
 ##### `apache_name`
 
-The name of the Apache package to install. If you are using a non-standard Apache package, such as those from Red Hat's software collections, you might need to override the default setting.
+The name of the Apache package to install. If you are using a non-standard Apache package you might need to override the default setting.
+
+For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::scl_httpd_version`.
 
 Default: Depends on the user set by [`apache::params`][] class, based on your operating system:
 
@@ -3075,6 +3077,28 @@ Manages the Apache daemon.
 
 Attempts to automatically detect the Apache version based on the operating system.
 
+##### Red Hat Software Collections (SCL)
+
+Software Collections on CentOS/RHEL allow for newer Apache and PHP, amongst other packages.
+
+If `scl_httpd_version` is set, Apache Httpd will get installed from [Software Collections](https://www.softwarecollections.org/en/).
+
+If `scl_httpd_version` is set, `scl_php_version` also needs to be set, even if PHP is not going to be installed.
+
+The repository is not managed by this module yet. For CentOS you can enable the repo by installing the package `centos-release-scl-rh`.
+
+##### `scl_httpd_version`
+
+#### Version of httpd to install.
+
+Example: `2.4` for Apache 2.4.
+
+##### `scl_php_version`
+
+Version of PHP to use.
+
+Example: `7.1`
+
 ### Public defined types
 
 #### Defined type: `apache::balancer`
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 722d198239..7ddb5bb83a 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -13,6 +13,9 @@
   include ::apache
   $mod = "php${php_version}"
 
+  if $::apache::version::scl_httpd_version == undef and $::apache::version::scl_php_version != undef {
+    fail('If you define apache::version::scl_php_version, you also need to specify apache::version::scl_httpd_version')
+  }
   if defined(Class['::apache::mod::prefork']) {
     Class['::apache::mod::prefork']->File["${mod}.conf"]
   }
@@ -49,28 +52,31 @@
     $_package_name = undef
   }
 
-  $_lib = "libphp${php_version}.so"
   $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
+  $_php_version_no_dot = regsubst($php_version, '\.', '')
+  if $apache::version::scl_httpd_version {
+    $_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
+  } else {
+    $_lib = "libphp${php_version}.so"
+  }
 
   if $::operatingsystem == 'SLES' {
-      ::apache::mod { $mod:
-        package        => $_package_name,
-        package_ensure => $package_ensure,
-        lib            => "mod_${mod}.so",
-        id             => "php${_php_major}_module",
-        path           => "${::apache::lib_path}/mod_${mod}.so",
-      }
-    } else {
-      ::apache::mod { $mod:
-        package        => $_package_name,
-        package_ensure => $package_ensure,
-        lib            => $_lib,
-        id             => "php${_php_major}_module",
-        path           => $path,
-      }
-
+    ::apache::mod { $mod:
+      package        => $_package_name,
+      package_ensure => $package_ensure,
+      lib            => "mod_${mod}.so",
+      id             => "php${_php_major}_module",
+      path           => "${::apache::lib_path}/mod_${mod}.so",
     }
-
+  } else {
+    ::apache::mod { $mod:
+      package        => $_package_name,
+      package_ensure => $package_ensure,
+      lib            => $_lib,
+      id             => "php${_php_major}_module",
+      path           => $path,
+    }
+  }
 
   include ::apache::mod::mime
   include ::apache::mod::dir
diff --git a/manifests/params.pp b/manifests/params.pp
index 06f3adf27a..4c66106630 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -52,14 +52,117 @@
   # no client certs should be trusted for auth by default.
   $ssl_certs_dir          = undef
 
-  if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::operatingsystem == 'SLES') {
-    $verify_command = '/usr/sbin/apache2ctl -t'
-  } elsif $::operatingsystem == 'FreeBSD' {
-    $verify_command = '/usr/local/sbin/apachectl -t'
-  } else {
-    $verify_command = '/usr/sbin/apachectl -t'
+  if ($::apache::version::scl_httpd_version) {
+    if $::apache::version::scl_php_version == undef {
+      fail('If you define apache::version::scl_httpd_version, you also need to specify apache::version::scl_php_version')
+    }
+    $_scl_httpd_version_nodot = regsubst($::apache::version::scl_httpd_version, '\.', '')
+    $_scl_httpd_name = "httpd${_scl_httpd_version_nodot}"
+
+    $_scl_php_version_no_dot = regsubst($::apache::version::scl_php_version, '\.', '')
+    $user                 = 'apache'
+    $group                = 'apache'
+    $root_group           = 'root'
+    $apache_name          = "${_scl_httpd_name}-httpd"
+    $service_name         = "${_scl_httpd_name}-httpd"
+    $httpd_root           = "/opt/rh/${_scl_httpd_name}/root"
+    $httpd_dir            = "${httpd_root}/etc/httpd"
+    $server_root          = "${httpd_root}/etc/httpd"
+    $conf_dir             = "${httpd_dir}/conf"
+    $confd_dir            = "${httpd_dir}/conf.d"
+    $mod_dir              = $::apache::version::distrelease ? {
+      '7'     => "${httpd_dir}/conf.modules.d",
+      default => "${httpd_dir}/conf.d",
+    }
+    $mod_enable_dir       = undef
+    $vhost_dir            = "${httpd_dir}/conf.d"
+    $vhost_enable_dir     = undef
+    $conf_file            = 'httpd.conf'
+    $ports_file           = "${conf_dir}/ports.conf"
+    $pidfile              = 'run/httpd.pid'
+    $logroot              = "/var/log/${_scl_httpd_name}"
+    $logroot_mode         = undef
+    $lib_path             = 'modules'
+    $mpm_module           = 'prefork'
+    $dev_packages         = "${_scl_httpd_name}-httpd-devel"
+    $default_ssl_cert     = '/etc/pki/tls/certs/localhost.crt'
+    $default_ssl_key      = '/etc/pki/tls/private/localhost.key'
+    $ssl_sessioncache     = '/var/cache/mod_ssl/scache(512000)'
+    $passenger_conf_file  = 'passenger_extra.conf'
+    $passenger_conf_package_file = 'passenger.conf'
+    $passenger_root       = undef
+    $passenger_ruby       = undef
+    $passenger_default_ruby = undef
+    $suphp_addhandler     = 'php5-script'
+    $suphp_engine         = 'off'
+    $suphp_configpath     = undef
+    $php_version          = $::apache::version::scl_php_version
+    $mod_packages         = {
+      "php${::apache::version::scl_php_version}" => "rh-php${_scl_php_version_no_dot}-php",
+      'ssl'                   => "${_scl_httpd_name}-mod_ssl",
+    }
+    $mod_libs             = {
+      'nss' => 'libmodnss.so',
+    }
+    $conf_template        = 'apache/httpd.conf.erb'
+    $http_protocol_options  = undef
+    $keepalive            = 'On'
+    $keepalive_timeout    = 15
+    $max_keepalive_requests = 100
+    $fastcgi_lib_path     = undef
+    $mime_support_package = 'mailcap'
+    $mime_types_config    = '/etc/mime.types'
+    $docroot              = "${httpd_root}/var/www/html"
+    $alias_icons_path     = $::apache::version::distrelease ? {
+      '7'     => "${httpd_root}/usr/share/httpd/icons",
+      default => '/var/www/icons',
+    }
+    $error_documents_path = $::apache::version::distrelease ? {
+      '7'     => "${httpd_root}/usr/share/httpd/error",
+      default => '/var/www/error'
+    }
+    if $::osfamily == 'RedHat' {
+      $wsgi_socket_prefix = '/var/run/wsgi'
+    } else {
+      $wsgi_socket_prefix = undef
+    }
+    $cas_cookie_path      = '/var/cache/mod_auth_cas/'
+    $mellon_lock_file     = '/run/mod_auth_mellon/lock'
+    $mellon_cache_size    = 100
+    $mellon_post_directory = undef
+    $modsec_crs_package   = 'mod_security_crs'
+    $modsec_crs_path      = '/usr/lib/modsecurity.d'
+    $modsec_dir           = '/etc/httpd/modsecurity.d'
+    $secpcrematchlimit = 1500
+    $secpcrematchlimitrecursion = 1500
+    $modsec_secruleengine = 'On'
+    $modsec_default_rules = [
+      'base_rules/modsecurity_35_bad_robots.data',
+      'base_rules/modsecurity_35_scanners.data',
+      'base_rules/modsecurity_40_generic_attacks.data',
+      'base_rules/modsecurity_50_outbound.data',
+      'base_rules/modsecurity_50_outbound_malware.data',
+      'base_rules/modsecurity_crs_20_protocol_violations.conf',
+      'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
+      'base_rules/modsecurity_crs_23_request_limits.conf',
+      'base_rules/modsecurity_crs_30_http_policy.conf',
+      'base_rules/modsecurity_crs_35_bad_robots.conf',
+      'base_rules/modsecurity_crs_40_generic_attacks.conf',
+      'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
+      'base_rules/modsecurity_crs_41_xss_attacks.conf',
+      'base_rules/modsecurity_crs_42_tight_security.conf',
+      'base_rules/modsecurity_crs_45_trojans.conf',
+      'base_rules/modsecurity_crs_47_common_exceptions.conf',
+      'base_rules/modsecurity_crs_49_inbound_blocking.conf',
+      'base_rules/modsecurity_crs_50_outbound.conf',
+      'base_rules/modsecurity_crs_59_outbound_blocking.conf',
+      'base_rules/modsecurity_crs_60_correlation.conf',
+    ]
+    $error_log           = 'error_log'
+    $scriptalias         = "${httpd_root}/var/www/cgi-bin"
+    $access_log_file     = 'access_log'
   }
-  if $::osfamily == 'RedHat' or $::operatingsystem =~ /^[Aa]mazon$/ {
+  elsif $::osfamily == 'RedHat' or $::operatingsystem =~ /^[Aa]mazon$/ {
     $user                 = 'apache'
     $group                = 'apache'
     $root_group           = 'root'
@@ -697,4 +800,14 @@
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
+
+  if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::operatingsystem == 'SLES') {
+    $verify_command = '/usr/sbin/apache2ctl -t'
+  } elsif $::operatingsystem == 'FreeBSD' {
+    $verify_command = '/usr/local/sbin/apachectl -t'
+  } elsif ($::apache::version::scl_httpd_version) {
+    $verify_command = "/opt/rh/${_scl_httpd_name}/root/usr/sbin/apachectl -t"
+  } else {
+    $verify_command = '/usr/sbin/apachectl -t'
+  }
 }
diff --git a/manifests/version.pp b/manifests/version.pp
index 8950b668a1..82c00c5f91 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -2,7 +2,10 @@
 #
 # Try to automatically detect the version by OS
 #
-class apache::version {
+class apache::version(
+  Optional[String] $scl_httpd_version = undef,
+  Optional[String] $scl_php_version   = undef,
+) {
   # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, etc.
   $osr_array = split($::operatingsystemrelease,'[\/\.]')
   $distrelease = $osr_array[0]
@@ -12,7 +15,10 @@
 
   case $::osfamily {
     'RedHat': {
-      if ($::operatingsystem == 'Amazon') {
+      if $scl_httpd_version {
+        $default = $scl_httpd_version
+      }
+      elsif ($::operatingsystem == 'Amazon') {
         $default = '2.2'
       } elsif ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($distrelease, '7') >= 0) {
         $default = '2.4'

From b6f17a4b70500f47afc7e9a4f2c09b71d57472b9 Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Thu, 13 Dec 2018 16:17:33 +0100
Subject: [PATCH 1417/2267] add acceptance test for SCL on CentOS

---
 spec/acceptance/zzz_centos_scl_spec.rb | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 spec/acceptance/zzz_centos_scl_spec.rb

diff --git a/spec/acceptance/zzz_centos_scl_spec.rb b/spec/acceptance/zzz_centos_scl_spec.rb
new file mode 100644
index 0000000000..beffe6a92f
--- /dev/null
+++ b/spec/acceptance/zzz_centos_scl_spec.rb
@@ -0,0 +1,50 @@
+# "zzz_" got added to ensure, this test runs last, as it breaks the non-SCL httpd in later tests
+require 'spec_helper_acceptance'
+
+describe 'CentOS with SCL enabled', if: (fact('operatingsystem') == 'CentOS' && fact('operatingsystemmajrelease') != '5') do
+  context 'when setting the respective parameters' do
+    pp = <<-MANIFEST
+      package { 'centos-release-scl-rh':
+        ensure => installed,
+      }
+      host { 'sclphp.example.com':
+        ip => '127.0.0.1',
+      }
+      class { 'apache::version':
+        scl_httpd_version => '2.4',
+        scl_php_version   => '7.0',
+      }
+      class { 'apache':
+        mpm_module => 'prefork',
+      }
+      class { 'apache::mod::php': }
+      apache::vhost { 'sclphp.example.com':
+        port    => '80',
+        docroot => '/opt/rh/httpd24/root/var/www/php',
+      }
+      file { '/opt/rh/httpd24/root/var/www/php/index.php':
+        ensure  => file,
+        content => "<?php echo 'Hello world'; ?>",
+      }
+    MANIFEST
+
+    it 'succeeds in puppeting Apache and PHP from SCL' do
+      # stop the non-SCL Apache before this test
+      shell('service httpd stop')
+
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    describe service('httpd24-httpd') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    it 'answers to sclphp.example.com' do
+      shell("/usr/bin/curl -H 'Host: sclphp.example.com' 127.0.0.1:80") do |r|
+        expect(r.stdout).to eq('Hello world')
+        expect(r.exit_code).to eq(0)
+      end
+    end
+  end
+end

From a33be69887d1b3c02e2c88e2377f41e41fb36311 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Fri, 14 Dec 2018 11:01:47 +0000
Subject: [PATCH 1418/2267] (MODULES-8374) - Release Prep 3.5.0

---
 CHANGELOG.md  | 22 +++++++++++++++++++++-
 metadata.json |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6055e1ea59..eedde12b3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [3.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.5.0) (2018-12-14)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.4.0...3.5.0)
+
+### Added
+
+- \(MODULES-5990\) Addition of 'IncludeOptional conf-enabled/\*.conf' to apache2.conf' on Debian Family OS [\#1851](https://github.com/puppetlabs/puppetlabs-apache/pull/1851) ([david22swan](https://github.com/david22swan))
+- \(MODULES-8107\) - Support added for Ubuntu 18.04. [\#1850](https://github.com/puppetlabs/puppetlabs-apache/pull/1850) ([david22swan](https://github.com/david22swan))
+- \(MODULES-8108\) - Support added for Debian 9 [\#1849](https://github.com/puppetlabs/puppetlabs-apache/pull/1849) ([david22swan](https://github.com/david22swan))
+- Add option to add comments to the header of a vhost file [\#1841](https://github.com/puppetlabs/puppetlabs-apache/pull/1841) ([jovandeginste](https://github.com/jovandeginste))
+
+### Fixed
+
+- \(FM-7605\) - Disabling conf\_enabled on Ubuntu 18.04  by default as it conflicts with Shibboleth causing errors with apache2. [\#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
+- \(MODULES-8429\) Update GPG key for phusion passenger [\#1848](https://github.com/puppetlabs/puppetlabs-apache/pull/1848) ([abottchen](https://github.com/abottchen))
+- Fix default vhost priority in readme [\#1843](https://github.com/puppetlabs/puppetlabs-apache/pull/1843) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+- fix apache::mod::jk example typo and add link for more info [\#1812](https://github.com/puppetlabs/puppetlabs-apache/pull/1812) ([xorpaul](https://github.com/xorpaul))
+- MODULES-7379: Fixing syntax by adding newline [\#1803](https://github.com/puppetlabs/puppetlabs-apache/pull/1803) ([wimvr](https://github.com/wimvr))
+- ensure mpm\_event is disabled under debian 9 if mpm itk is used [\#1766](https://github.com/puppetlabs/puppetlabs-apache/pull/1766) ([zivis](https://github.com/zivis))
+
 ## [3.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.4.0) (2018-09-27)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.3.0...3.4.0)
@@ -23,7 +43,7 @@ All notable changes to this project will be documented in this file. The format
 
 - pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1821](https://github.com/puppetlabs/puppetlabs-apache/pull/1821) ([pmcmaw](https://github.com/pmcmaw))
 - Add support for ProxyTimeout [\#1805](https://github.com/puppetlabs/puppetlabs-apache/pull/1805) ([agoodno](https://github.com/agoodno))
-- MODULES-7343: Allow overrides by adding mod\_libs in apache class [\#1800](https://github.com/puppetlabs/puppetlabs-apache/pull/1800) ([karelyatin](https://github.com/karelyatin))
+- \(MODULES-7343\) - Allow overrides by adding mod\_libs in apache class [\#1800](https://github.com/puppetlabs/puppetlabs-apache/pull/1800) ([karelyatin](https://github.com/karelyatin))
 - Rework passenger VHost and Directories [\#1778](https://github.com/puppetlabs/puppetlabs-apache/pull/1778) ([smortex](https://github.com/smortex))
 
 ### Fixed
diff --git a/metadata.json b/metadata.json
index aa999befd1..ce67e2fce2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 19468a44094617709fa98763b62343ce38045edc Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Mon, 17 Dec 2018 10:22:42 +0000
Subject: [PATCH 1419/2267] (MODULES-8374) - Minor README update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd54409e1d..861e19ff05 100755
--- a/README.md
+++ b/README.md
@@ -369,7 +369,7 @@ apache::vhost { 'vhost.example.com':
 
 See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters.
 
-> **Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] defined type applies a default [`priority`][] of 25, which Puppet interprets by prefixing the virtual host's file name with `25-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to false, Apache still processes virtual hosts in alphabetical order.
+> **Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] defined type applies a default [`priority`][] of 25, which Puppet interprets by prefixing the virtual host's file name with `25-`. This means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to false, Apache still processes virtual hosts in alphabetical order.
 
 To configure user and group ownership for `docroot`, use the [`docroot_owner`][] and [`docroot_group`][] parameters:
 

From 2de508a4162935856c3a5cbfb776247e416b2887 Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@puppet.com>
Date: Mon, 17 Dec 2018 11:29:14 +0000
Subject: [PATCH 1420/2267] pdksync_heads/master-0-gbf720df

---
 .gitattributes         |  2 +-
 .pdkignore             | 13 +++++++++++++
 .puppet-lint.rc        |  0
 .travis.yml            |  7 +++----
 Rakefile               |  1 +
 metadata.json          |  6 +++---
 spec/default_facts.yml |  1 -
 spec/spec_helper.rb    |  4 ++--
 8 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 .puppet-lint.rc

diff --git a/.gitattributes b/.gitattributes
index 02d4646b9b..9032a014a0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
-#This file is generated by ModuleSync, do not edit.
 *.rb eol=lf
 *.erb eol=lf
 *.pp eol=lf
 *.sh eol=lf
+*.epp eol=lf
diff --git a/.pdkignore b/.pdkignore
index 650022e58e..b713b3b1f7 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -22,3 +22,16 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+/appveyor.yml
+/.fixtures.yml
+/Gemfile
+/.gitattributes
+/.gitignore
+/.gitlab-ci.yml
+/.pdkignore
+/Rakefile
+/.rspec
+/.rubocop.yml
+/.travis.yml
+/.yardopts
+/spec/
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.travis.yml b/.travis.yml
index db1d9e9591..97fc99de9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 ---
-sudo: false
 dist: trusty
 language: ruby
 cache: bundler
@@ -13,7 +12,7 @@ script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.0
+  - 2.5.1
 env:
   global:
     - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
@@ -25,7 +24,7 @@ matrix:
       bundler_args: 
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
-      rvm: 2.5.0
+      rvm: 2.5.1
       script: bundle exec rake beaker
       services: docker
       sudo: required
@@ -33,7 +32,7 @@ matrix:
       bundler_args: 
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
-      rvm: 2.5.0
+      rvm: 2.5.1
       script: bundle exec rake beaker
       services: docker
       sudo: required
diff --git a/Rakefile b/Rakefile
index a7c4d68168..2d60dbbda6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
+require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
 require 'puppet-lint/tasks/puppet-lint'
 
 def changelog_user
diff --git a/metadata.json b/metadata.json
index aa999befd1..d8497de195 100644
--- a/metadata.json
+++ b/metadata.json
@@ -78,7 +78,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.7.0",
+  "pdk-version": "1.8.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-gabccfb1"
-}
+  "template-ref": "heads/master-0-gbf720df"
+}
\ No newline at end of file
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index e10d991db2..ea1e4808e3 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,7 +2,6 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-concat_basedir: ""
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a7281d5300..35654b3d2c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -36,8 +36,8 @@
 
 def ensure_module_defined(module_name)
   module_name.split('::').reduce(Object) do |last_module, next_module|
-    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module)
-    last_module.const_get(next_module)
+    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)
+    last_module.const_get(next_module, false)
   end
 end
 

From bfad584b27f30695358c34ee5cacc1f1c4008342 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Fri, 14 Dec 2018 17:23:56 +0000
Subject: [PATCH 1421/2267] (MODULES-8379) - Temporary pending's placed into
 code to account for bug on the specinfra gem caused by several services,
 including `apache2`, being migrated to systemctl on SLES 15

---
 spec/acceptance/apache_parameters_spec.rb |  6 ++++++
 spec/acceptance/class_spec.rb             |  4 ++++
 spec/acceptance/itk_spec.rb               |  2 ++
 spec/acceptance/mod_dav_svn_spec.rb       |  4 ++++
 spec/acceptance/mod_deflate_spec.rb       |  2 ++
 spec/acceptance/mod_mime_spec.rb          |  2 ++
 spec/acceptance/mod_negotiation_spec.rb   |  6 ++++++
 spec/acceptance/mod_passenger_spec.rb     |  2 ++
 spec/acceptance/mod_php_spec.rb           |  4 ++++
 spec/acceptance/mod_proxy_html_spec.rb    |  2 ++
 spec/acceptance/mod_security_spec.rb      | 12 +++++++++++
 spec/acceptance/prefork_worker_spec.rb    |  6 ++++++
 spec/acceptance/vhost_spec.rb             | 26 +++++++++++++++++++++++
 13 files changed, 78 insertions(+)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 0720be560f..8a554c59e9 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -56,6 +56,8 @@ class { 'apache':
       it { is_expected.to be_running }
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -77,6 +79,8 @@ class { 'apache':
       it { is_expected.not_to be_running }
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.not_to be_enabled }
       end
@@ -99,6 +103,8 @@ class { 'apache':
       it { is_expected.not_to be_running }
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.not_to be_enabled }
       end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index f085896dbd..2cd63b6518 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -28,6 +28,8 @@
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -80,6 +82,8 @@ class { 'apache':
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 1f698fd9c4..2093d642e8 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -54,6 +54,8 @@ class { 'apache':
     it { is_expected.to be_running }
     if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
       pending 'Should be enabled - Bug 760616 on Debian 8'
+    elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
     else
       it { is_expected.to be_enabled }
     end
diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
index 2032837cd9..359ba9ea7b 100644
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -25,6 +25,8 @@ class { 'apache': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -50,6 +52,8 @@ class { 'apache::mod::dav_svn':
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
index 52e04bee19..7cab78cb5d 100644
--- a/spec/acceptance/mod_deflate_spec.rb
+++ b/spec/acceptance/mod_deflate_spec.rb
@@ -14,6 +14,8 @@ class { 'apache': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
index fd74b3d6a9..4496c02132 100644
--- a/spec/acceptance/mod_mime_spec.rb
+++ b/spec/acceptance/mod_mime_spec.rb
@@ -14,6 +14,8 @@ class { 'apache': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
index e8e793f874..e270e567de 100644
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ b/spec/acceptance/mod_negotiation_spec.rb
@@ -21,6 +21,8 @@ class { '::apache::mod::negotiation': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -46,6 +48,8 @@ class { '::apache::mod::negotiation':
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -71,6 +75,8 @@ class { '::apache::mod::negotiation':
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 8fbed8f80f..1a2310b4bf 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -103,6 +103,8 @@ class { 'apache::mod::passenger': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 8d5df588bf..bd40fc10bb 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -48,6 +48,8 @@ class { 'apache::mod::php': }
       describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
         end
@@ -110,6 +112,8 @@ class { 'apache::mod::php':
       describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
         end
diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
index 6659893a0d..f6ba115548 100644
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ b/spec/acceptance/mod_proxy_html_spec.rb
@@ -27,6 +27,8 @@ class { 'apache::mod::proxy_html': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 265f6aaf04..74a0f832d4 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -49,6 +49,8 @@ class { 'apache::mod::security': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -106,6 +108,8 @@ class { 'apache::mod::security': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -170,6 +174,8 @@ class { 'apache::mod::security': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -238,6 +244,8 @@ class { 'apache::mod::security': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -306,6 +314,8 @@ class { 'apache::mod::security': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -374,6 +384,8 @@ class { 'apache::mod::security': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 6939edfc8c..67ee79d5a4 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -23,6 +23,8 @@ class { 'apache':
         it { is_expected.to be_running }
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
         end
@@ -49,6 +51,8 @@ class { 'apache':
       it { is_expected.to be_running }
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -74,6 +78,8 @@ class { 'apache':
       it { is_expected.to be_running }
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index dc97bfa2b8..d5f7a8492c 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -180,6 +180,8 @@ class { 'apache': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -224,6 +226,8 @@ class { 'apache':
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -280,6 +284,8 @@ class { 'apache':
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -337,6 +343,8 @@ class { 'apache':
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -409,6 +417,8 @@ class { 'apache':
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -470,6 +480,8 @@ class { 'apache': }
       describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
         end
@@ -534,6 +546,8 @@ class { 'apache': }
       describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
         end
@@ -578,6 +592,8 @@ class { 'apache': }
       describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
         end
@@ -658,6 +674,8 @@ class { 'apache': }
       describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
         end
@@ -697,6 +715,8 @@ class { 'apache': }
       describe service($service_name) do
         if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
         end
@@ -735,6 +755,8 @@ class { 'apache': }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -785,6 +807,8 @@ class { 'apache': default_vhost => false, }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end
@@ -834,6 +858,8 @@ class { 'apache': default_vhost => false, }
     describe service($service_name) do
       if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
       end

From 4cb137989e633b41cd8b763142cd2b3873c79f25 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Mon, 17 Dec 2018 15:54:15 +0000
Subject: [PATCH 1422/2267] (MODULES-8141) - Addition of support for SLES 15 On
 SLES 15 when `gensslcert` is called without a name it defaults it to the
 hostname Extension of SLES exceptions SLES 15 requires 'net-tools-deprecated'
 to be installed prior to test's running

---
 manifests/params.pp                  | 10 ++++++++--
 metadata.json                        |  3 ++-
 spec/acceptance/default_mods_spec.rb |  2 +-
 spec/acceptance/mod_php_spec.rb      |  2 +-
 spec/acceptance/vhost_spec.rb        |  7 ++++++-
 spec/spec_helper_acceptance.rb       |  6 ++++++
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 4c66106630..e02100382a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -725,8 +725,14 @@
     $logroot_mode        = undef
     $lib_path            = '/usr/lib64/apache2' #changes for some modules based on mpm
     $mpm_module          = 'prefork'
-    $default_ssl_cert    = '/etc/apache2/ssl.crt/server.crt'
-    $default_ssl_key     = '/etc/apache2/ssl.key/server.key'
+
+    if $::operatingsystemrelease < '15' {
+      $default_ssl_cert    = '/etc/apache2/ssl.crt/server.crt'
+      $default_ssl_key     = '/etc/apache2/ssl.key/server.key'
+    } else {
+      $default_ssl_cert    = '/etc/apache2/ssl.crt/default-server.crt'
+      $default_ssl_key     = '/etc/apache2/ssl.key/default-server.key'
+    }
     $ssl_sessioncache    = '/var/lib/apache2/ssl_scache(512000)'
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
diff --git a/metadata.json b/metadata.json
index cc42ac8c95..0f71cec85f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -59,7 +59,8 @@
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "11 SP1",
-        "12"
+        "12",
+        "15"
       ]
     },
     {
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index b6a52fb6e8..60fb89b897 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -19,7 +19,7 @@ class { 'apache':
     end
   end
 
-  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12'
+  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') >= '12'
     describe 'no default mods and failing' do
       before :all do
         pp = <<-PP
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index bd40fc10bb..a1224c3909 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12'
+unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') >= '12'
   describe 'apache::mod::php class' do
     context 'default php config' do
       if ['16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index d5f7a8492c..de3c903d96 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -9,10 +9,15 @@ class { 'apache':
         default_ssl_vhost => false,
         service_ensure => stopped,
       }
-      if ($::osfamily == 'Suse') {
+      if ($::osfamily == 'Suse' and $::operatingsystemrelease < '15') {
         exec { '/usr/bin/gensslcert':
           require => Class['apache'],
         }
+      } elsif ($::osfamily == 'Suse' and $::operatingsystemrelease >= '15') {
+        # In SLES 15, if not given a name, gensslcert defaults the name to be the hostname
+        exec { '/usr/bin/gensslcert -n default':
+          require => Class['apache'],
+        }
       }
     MANIFEST
     it 'creates no default vhosts' do
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 0c19871d27..20d6685018 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -41,6 +41,12 @@
         package { 'net-tools': ensure => installed }
       EOS
 
+      apply_manifest_on(agents, pp, catch_failures: false)
+    elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      pp = <<-EOS
+        package { 'net-tools-deprecated': ensure => installed }
+      EOS
+
       apply_manifest_on(agents, pp, catch_failures: false)
     end
 

From a4112304eba464da67032043a1ecb9ad43638534 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Tue, 18 Dec 2018 09:45:53 -0800
Subject: [PATCH 1423/2267] (L10n) Updating translations for
 readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 82 +++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 28 deletions(-)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index f192609caf..3798cda758 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -369,7 +369,7 @@ apache::vhost { 'vhost.example.com':
 
 すべてのバーチャルホストパラメータのリストについては、[`apache::vhost`][]定義タイプのリファレンスを参照してください。
 
-> **注意**: Apacheはバーチャルホストをアルファベット順に処理します。サーバ管理者は、バーチャルホスト設定ファイル名の先頭に数字を付けることで、 Apacheバーチャルホスト処理の優先順位を設定できます。[`apache::vhost`][]定義タイプは、デフォルトの [`priority`][]である15を適用します。これはPuppetではバーチャルホストのファイル名の先頭に`15-`が付いていると解釈されます。そのため、優先順位が同じサイトが複数ある場合や、`priority`パラメータの値をfalseに設定して優先順位番号を無効にした場合でも、Apacheはバーチャルホストをアルファベット順に処理します。
+> **注意**: Apacheはバーチャルホストをアルファベット順に処理します。サーバ管理者は、バーチャルホスト設定ファイル名の先頭に数字を付けることで、 Apacheバーチャルホスト処理の優先順位を設定できます。[`apache::vhost`][]定義タイプは、デフォルトの [`priority`][]である25を適用します。これはPuppetではバーチャルホストのファイル名の先頭に`25-`が付いていると解釈されます。そのため、優先順位が同じサイトが複数ある場合や、`priority`パラメータの値をfalseに設定して優先順位番号を無効にした場合でも、Apacheはバーチャルホストをアルファベット順に処理します。
 
 `docroot`のユーザおよびグループのオーナーシップを設定するには、[`docroot_owner`][]および[`docroot_group`][]パラメータを使用します。
 
@@ -1736,18 +1736,18 @@ class {'::apache::mod::disk_cache':
 }
 ```
 
-##### クラス: `apache::mod::diskio`
+##### クラス: `apache::mod::dumpio`
 
-[`mod_diskio`][]をインストールして設定します。
+[`mod_dumpio`][]をインストールして設定します。
 
 ```puppet
 class{'apache':
   default_mods => false,
   log_level    => 'dumpio:trace7',
 }
-class{'apache::mod::diskio':
-  disk_io_input  => 'On',
-  disk_io_output => 'Off',
+class{'apache::mod::dumpio':
+  dump_io_input  => 'On',
+  dump_io_output => 'Off',
 }
 ```
 
@@ -2000,7 +2000,7 @@ class { 'apache::mod::authn_dbd':
 
 ##### クラス: `apache::mod::cluster`
 
-**注意**: `mod_cluster`に関して提供されている公式なパッケージはありません。そのため、Apacheモジュールの外部から使用できるようにする必要があります。バイナリはhttp://mod-cluster.jboss.org/にあります。
+**注意**: `mod_cluster`に関して提供されている公式なパッケージはありません。そのため、Apacheモジュールの外部から使用できるようにする必要があります。バイナリは[こちら](http://mod-cluster.jboss.org/)にあります。
 
 ``` puppet
 class { '::apache::mod::cluster':
@@ -2267,17 +2267,19 @@ apache::vhost { 'example.org':
 
 ``` puppet
 class { '::apache::mod::jk':
-  ip           = '192.168.2.15',
-  workers_file = 'conf/workers.properties',
-  mount_file   = 'conf/uriworkermap.properties',
-  shm_file     = 'run/jk.shm',
-  shm_size     = '50M',
-  $workers_file_content = {
+  ip                   => '192.168.2.15',
+  workers_file         => 'conf/workers.properties',
+  mount_file           => 'conf/uriworkermap.properties',
+  shm_file             => 'run/jk.shm',
+  shm_size             => '50M',
+  workers_file_content => {
     <Content>
   },
 }
 ```
 
+詳細については、[templates/mod/jk/workers.properties.erb](templates/mod/jk/workers.properties.erb)を参照してください。
+
 **`apache::mod::jk`**内のパラメータ:
 
 `mod_jk`パラメータを理解するための情報源としては、[公式ドキュメント](https://tomcat.apache.org/connectors-doc/reference/apache.html)が最適です。ただし、次はこれに含まれません:
@@ -2310,9 +2312,9 @@ class { '::apache::mod::jk':
 
 各ディレクティブにはフォーマット`worker.<Worker name>.<Property>=<Value>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは各ワーカーのプロパティと値を指定します。
 また、2つのグローバルディレクティブ 'worker.list'および'worker.maintain'もあります。  
-例えば、ワーカーファイルは以下のようになります。
+例えば、以下のワーカーファイルは図1のようにパラメータ化します。
 
-```
+``` puppet
 worker.list = status
 worker.list = some_name,other_name
 
@@ -2327,9 +2329,9 @@ worker.other_name.type=ajp12 (why would you?)
 worker.other_name.socket_keepalive=false
 ```
 
-以下のようにパラメータ化する必要があります。　
+**図1:**
 
-```
+``` puppet
 $workers_file_content = {
   worker_lists    => ['status', 'some_name,other_name'],
   worker_maintain => '60',
@@ -2348,10 +2350,12 @@ $workers_file_content = {
 
 **mount\_file\_content**
 
-各ディレクティブにはフォーマット`<URI> = <Worker name>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは次の2つのアイテムを含みます: uri_list - ワーカーにマップするURIを用いた配列 - およびコメント - ワーカーに関するコメントを記したオプションの文字列。 
-例えば、マウントファイルは以下のようになります。
+各ディレクティブにはフォーマット`<URI> = <Worker name>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは次の2つのアイテムを含みます: 
+* uri_list&mdash - ワーカーにマップするURIを用いた配列
+* comment&mdash - ワーカーに関するコメントを記したオプションの文字列
+例えば、以下のマウントファイルは図2のようにパラメータ化します。
 
-```
+``` puppet
 # Worker 1
 /context_1/ = worker_1
 /context_1/* = worker_1
@@ -2362,9 +2366,9 @@ $workers_file_content = {
 /context_2/* = worker_2
 ```
 
-以下のようにパラメータ化する必要があります。　
+**図2:**
 
-```
+``` puppet
 $mount_file_content = {
   worker_1 => {
     uri_list => ['/context_1/', '/context_1/*'],
@@ -2385,17 +2389,17 @@ $mount_file_content = {
 
 例 (RHEL 6):
 
-```
+``` puppet
 shm_file => 'shm_file'
 # Ends up in
 $shm_path = '/var/log/httpd/shm_file'
 ```
-```
+``` puppet
 shm_file => '/run/shm_file'
 # Ends up in
 $shm_path = '/run/shm_file'
 ```
-```
+``` puppet
 shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 # Ends up in
 $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
@@ -2854,7 +2858,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
   > Apacheバージョンが2.4以降の場合のみ使用
 
   - `undef` - `allow_from` および古いディレクティブ構文(`Allow from <List of IPs and/or names>`)を使用し、廃止予定の警告を通知します。
-  - 文字列
+  - String
     - `''`または`'unmanaged'` - authディレクティブなし(アクセス制御は別の方法で実施)
     - `'ip <List of IPs>'` - `/server-status`にアクセスできるIP/範囲
     - `'host <List of names>'` - `/server-status`にアクセスできる名前/ドメイン
@@ -2948,7 +2952,7 @@ ${modsec\_dir}/activated\_rules。
 
   デフォルト値はApacheのログディレクトリ(Redhat: `/var/log/httpd`、Debian: `/var/log/apache2`)。
 
-* `audit_log_releavant_status`: オーディットロギングの目的に関して、考慮すべき応答ステータスコードを設定します。
+* `audit_log_relevant_status`: オーディットロギングの目的に関して、考慮すべき応答ステータスコードを設定します。
 
   デフォルト値: '^(?:5|4(?!04))'。
 
@@ -3478,6 +3482,28 @@ HTTPクエリ文字列でクライアントの提示するチケットをバリ
 
 デフォルト値: [`apache::mod::auth_cas`][]により設定された値。
 
+
+##### `comment`
+
+設定ファイルのヘッダにコメントを追加します。文字列または文字列の配列として渡します。
+
+デフォルト値: `undef`。
+
+例:　
+
+``` puppet
+comment => "Account number: 123B",
+```
+
+Or:
+
+``` puppet
+comment => [
+  "Customer: X",
+  "Frontend domain: x.example.org",
+]
+```
+
 ##### `custom_fragment`
 
 カスタム設定ディレクティブの文字列を渡し、バーチャルホスト設定の最後に配置します。
@@ -3806,7 +3832,7 @@ Apacheが認証に使用するサービス名を指定します。この名前
 
 バーチャルホストのログファイルの保存場所を指定します。
 
-デフォルト値: '/var/log/<apache log location>/'。
+デフォルト値: `/var/log/<apache log location>/`。
 
 ##### `$logroot_ensure`
 

From 655ef81c35911aba2bbb0844bba2afdff1dbc47c Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Tue, 18 Dec 2018 10:14:32 -0800
Subject: [PATCH 1424/2267] (L10n) Updating translations for
 readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 82 +++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 28 deletions(-)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index f192609caf..3798cda758 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -369,7 +369,7 @@ apache::vhost { 'vhost.example.com':
 
 すべてのバーチャルホストパラメータのリストについては、[`apache::vhost`][]定義タイプのリファレンスを参照してください。
 
-> **注意**: Apacheはバーチャルホストをアルファベット順に処理します。サーバ管理者は、バーチャルホスト設定ファイル名の先頭に数字を付けることで、 Apacheバーチャルホスト処理の優先順位を設定できます。[`apache::vhost`][]定義タイプは、デフォルトの [`priority`][]である15を適用します。これはPuppetではバーチャルホストのファイル名の先頭に`15-`が付いていると解釈されます。そのため、優先順位が同じサイトが複数ある場合や、`priority`パラメータの値をfalseに設定して優先順位番号を無効にした場合でも、Apacheはバーチャルホストをアルファベット順に処理します。
+> **注意**: Apacheはバーチャルホストをアルファベット順に処理します。サーバ管理者は、バーチャルホスト設定ファイル名の先頭に数字を付けることで、 Apacheバーチャルホスト処理の優先順位を設定できます。[`apache::vhost`][]定義タイプは、デフォルトの [`priority`][]である25を適用します。これはPuppetではバーチャルホストのファイル名の先頭に`25-`が付いていると解釈されます。そのため、優先順位が同じサイトが複数ある場合や、`priority`パラメータの値をfalseに設定して優先順位番号を無効にした場合でも、Apacheはバーチャルホストをアルファベット順に処理します。
 
 `docroot`のユーザおよびグループのオーナーシップを設定するには、[`docroot_owner`][]および[`docroot_group`][]パラメータを使用します。
 
@@ -1736,18 +1736,18 @@ class {'::apache::mod::disk_cache':
 }
 ```
 
-##### クラス: `apache::mod::diskio`
+##### クラス: `apache::mod::dumpio`
 
-[`mod_diskio`][]をインストールして設定します。
+[`mod_dumpio`][]をインストールして設定します。
 
 ```puppet
 class{'apache':
   default_mods => false,
   log_level    => 'dumpio:trace7',
 }
-class{'apache::mod::diskio':
-  disk_io_input  => 'On',
-  disk_io_output => 'Off',
+class{'apache::mod::dumpio':
+  dump_io_input  => 'On',
+  dump_io_output => 'Off',
 }
 ```
 
@@ -2000,7 +2000,7 @@ class { 'apache::mod::authn_dbd':
 
 ##### クラス: `apache::mod::cluster`
 
-**注意**: `mod_cluster`に関して提供されている公式なパッケージはありません。そのため、Apacheモジュールの外部から使用できるようにする必要があります。バイナリはhttp://mod-cluster.jboss.org/にあります。
+**注意**: `mod_cluster`に関して提供されている公式なパッケージはありません。そのため、Apacheモジュールの外部から使用できるようにする必要があります。バイナリは[こちら](http://mod-cluster.jboss.org/)にあります。
 
 ``` puppet
 class { '::apache::mod::cluster':
@@ -2267,17 +2267,19 @@ apache::vhost { 'example.org':
 
 ``` puppet
 class { '::apache::mod::jk':
-  ip           = '192.168.2.15',
-  workers_file = 'conf/workers.properties',
-  mount_file   = 'conf/uriworkermap.properties',
-  shm_file     = 'run/jk.shm',
-  shm_size     = '50M',
-  $workers_file_content = {
+  ip                   => '192.168.2.15',
+  workers_file         => 'conf/workers.properties',
+  mount_file           => 'conf/uriworkermap.properties',
+  shm_file             => 'run/jk.shm',
+  shm_size             => '50M',
+  workers_file_content => {
     <Content>
   },
 }
 ```
 
+詳細については、[templates/mod/jk/workers.properties.erb](templates/mod/jk/workers.properties.erb)を参照してください。
+
 **`apache::mod::jk`**内のパラメータ:
 
 `mod_jk`パラメータを理解するための情報源としては、[公式ドキュメント](https://tomcat.apache.org/connectors-doc/reference/apache.html)が最適です。ただし、次はこれに含まれません:
@@ -2310,9 +2312,9 @@ class { '::apache::mod::jk':
 
 各ディレクティブにはフォーマット`worker.<Worker name>.<Property>=<Value>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは各ワーカーのプロパティと値を指定します。
 また、2つのグローバルディレクティブ 'worker.list'および'worker.maintain'もあります。  
-例えば、ワーカーファイルは以下のようになります。
+例えば、以下のワーカーファイルは図1のようにパラメータ化します。
 
-```
+``` puppet
 worker.list = status
 worker.list = some_name,other_name
 
@@ -2327,9 +2329,9 @@ worker.other_name.type=ajp12 (why would you?)
 worker.other_name.socket_keepalive=false
 ```
 
-以下のようにパラメータ化する必要があります。　
+**図1:**
 
-```
+``` puppet
 $workers_file_content = {
   worker_lists    => ['status', 'some_name,other_name'],
   worker_maintain => '60',
@@ -2348,10 +2350,12 @@ $workers_file_content = {
 
 **mount\_file\_content**
 
-各ディレクティブにはフォーマット`<URI> = <Worker name>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは次の2つのアイテムを含みます: uri_list - ワーカーにマップするURIを用いた配列 - およびコメント - ワーカーに関するコメントを記したオプションの文字列。 
-例えば、マウントファイルは以下のようになります。
+各ディレクティブにはフォーマット`<URI> = <Worker name>`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは次の2つのアイテムを含みます: 
+* uri_list&mdash - ワーカーにマップするURIを用いた配列
+* comment&mdash - ワーカーに関するコメントを記したオプションの文字列
+例えば、以下のマウントファイルは図2のようにパラメータ化します。
 
-```
+``` puppet
 # Worker 1
 /context_1/ = worker_1
 /context_1/* = worker_1
@@ -2362,9 +2366,9 @@ $workers_file_content = {
 /context_2/* = worker_2
 ```
 
-以下のようにパラメータ化する必要があります。　
+**図2:**
 
-```
+``` puppet
 $mount_file_content = {
   worker_1 => {
     uri_list => ['/context_1/', '/context_1/*'],
@@ -2385,17 +2389,17 @@ $mount_file_content = {
 
 例 (RHEL 6):
 
-```
+``` puppet
 shm_file => 'shm_file'
 # Ends up in
 $shm_path = '/var/log/httpd/shm_file'
 ```
-```
+``` puppet
 shm_file => '/run/shm_file'
 # Ends up in
 $shm_path = '/run/shm_file'
 ```
-```
+``` puppet
 shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 # Ends up in
 $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
@@ -2854,7 +2858,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
   > Apacheバージョンが2.4以降の場合のみ使用
 
   - `undef` - `allow_from` および古いディレクティブ構文(`Allow from <List of IPs and/or names>`)を使用し、廃止予定の警告を通知します。
-  - 文字列
+  - String
     - `''`または`'unmanaged'` - authディレクティブなし(アクセス制御は別の方法で実施)
     - `'ip <List of IPs>'` - `/server-status`にアクセスできるIP/範囲
     - `'host <List of names>'` - `/server-status`にアクセスできる名前/ドメイン
@@ -2948,7 +2952,7 @@ ${modsec\_dir}/activated\_rules。
 
   デフォルト値はApacheのログディレクトリ(Redhat: `/var/log/httpd`、Debian: `/var/log/apache2`)。
 
-* `audit_log_releavant_status`: オーディットロギングの目的に関して、考慮すべき応答ステータスコードを設定します。
+* `audit_log_relevant_status`: オーディットロギングの目的に関して、考慮すべき応答ステータスコードを設定します。
 
   デフォルト値: '^(?:5|4(?!04))'。
 
@@ -3478,6 +3482,28 @@ HTTPクエリ文字列でクライアントの提示するチケットをバリ
 
 デフォルト値: [`apache::mod::auth_cas`][]により設定された値。
 
+
+##### `comment`
+
+設定ファイルのヘッダにコメントを追加します。文字列または文字列の配列として渡します。
+
+デフォルト値: `undef`。
+
+例:　
+
+``` puppet
+comment => "Account number: 123B",
+```
+
+Or:
+
+``` puppet
+comment => [
+  "Customer: X",
+  "Frontend domain: x.example.org",
+]
+```
+
 ##### `custom_fragment`
 
 カスタム設定ディレクティブの文字列を渡し、バーチャルホスト設定の最後に配置します。
@@ -3806,7 +3832,7 @@ Apacheが認証に使用するサービス名を指定します。この名前
 
 バーチャルホストのログファイルの保存場所を指定します。
 
-デフォルト値: '/var/log/<apache log location>/'。
+デフォルト値: `/var/log/<apache log location>/`。
 
 ##### `$logroot_ensure`
 

From 563d2f09dc59e090618cf70cef590f46a631ea30 Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Tue, 18 Dec 2018 10:14:32 -0800
Subject: [PATCH 1425/2267] (L10n) Updating translations for
 readmes/README_ja_JP.md


From 7a42c83d3edc88e2227f65f928ce7fa7049ec9ff Mon Sep 17 00:00:00 2001
From: clairecadman <claire.cadman@puppet.com>
Date: Wed, 19 Dec 2018 14:24:42 +0000
Subject: [PATCH 1426/2267] (maint) Add HTML anchor tag

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 31d7e6c980..dd1411a2cd 100755
--- a/README.md
+++ b/README.md
@@ -301,12 +301,15 @@
     - [Contributing to the apache module][Contributing]
     - [Running tests - A quick guide][Running tests]
 
+<a id="module-description"></a>
 ## Module description
 
 [Apache HTTP Server][] (also called Apache HTTPD, or simply Apache) is a widely used web server. This [Puppet module][] simplifies the task of creating configurations to manage Apache servers in your infrastructure. It can configure and manage a range of virtual host setups and provides a streamlined way to install and configure [Apache modules][].
 
+<a id="setup"></a>
 ## Setup
 
+<a id="apache-affects"></a>
 ### What the apache module affects:
 
 - Configuration files and directories (created and written to)
@@ -323,6 +326,7 @@ On Gentoo, this module depends on the [`gentoo/puppet-portage`][] Puppet module.
 >
 >To temporarily disable full Puppet management, set the [`purge_configs`][] parameter in the [`apache`][] class declaration to false. We recommend this only as a temporary means of saving and relocating customized configurations.
 
+<a id="beginning-with-apache"></a>
 ### Beginning with Apache
 
 To have Puppet install Apache with the default parameters, declare the [`apache`][] class:
@@ -351,8 +355,10 @@ class { 'apache':
 
 > **Note**: When `default_vhost` is set to `false`, you have to add at least one `apache::vhost` resource or Apache will not start. To establish a default virtual host, either set the `default_vhost` in the `apache` class or use the [`apache::vhost`][] defined type. You can also configure additional specific virtual hosts with the [`apache::vhost`][] defined type.
 
+<a id="usage"></a>
 ## Usage
 
+<a id="configuring-virtual-hosts"></a>
 ### Configuring virtual hosts
 
 The default [`apache`][] class sets up a virtual host on port 80, listening on all interfaces and serving the [`docroot`][] parameter's default directory of `/var/www`.
@@ -720,6 +726,7 @@ apache::mod { 'mod_authnz_external': }
 
 There are several optional parameters you can specify when defining Apache modules this way. See the [defined type's reference][`apache::mod`] for details.
 
+<a id="configuring-fastCGI-servers"></a>
 ### Configuring FastCGI servers to handle PHP files
 
 Add the [`apache::fastcgi::server`][] defined type to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
@@ -745,6 +752,7 @@ apache::vhost { 'www':
 }
 ```
 
+<a id="load-balancing-examples"></a> 
 ### Load balancing examples
 
 Apache supports load balancing across groups of servers through the [`mod_proxy`][] Apache module. Puppet supports configuring Apache load balancing groups (also known as balancer clusters) through the [`apache::balancer`][] and [`apache::balancermember`][] defined types.
@@ -792,6 +800,7 @@ apache::balancer { 'puppet01':
 
 Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balancer documentation](https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html).
 
+<a id="reference"></a> 
 ## Reference
 
 - [**Public classes**](#public-classes)
@@ -5638,6 +5647,7 @@ Hashes a password in a format suitable for htpasswd files read by apache.
 Currently uses SHA-hashes, because although this format is considered insecure, its the
 most secure format supported by the most platforms.
 
+<a id="limitations"></a>
 ## Limitations
 
 For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apache/blob/master/metadata.json)
@@ -5721,6 +5731,7 @@ The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside t
 ### Ubuntu 16.04
 The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
 
+<a id="development"></a> 
 ## Development
 
 ### Contributing

From 2da732149f586144ba9fca32be821477399deedd Mon Sep 17 00:00:00 2001
From: clairecadman <claire.cadman@puppet.com>
Date: Thu, 20 Dec 2018 09:46:35 +0000
Subject: [PATCH 1427/2267] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dd1411a2cd..17e2ec1803 100755
--- a/README.md
+++ b/README.md
@@ -726,7 +726,7 @@ apache::mod { 'mod_authnz_external': }
 
 There are several optional parameters you can specify when defining Apache modules this way. See the [defined type's reference][`apache::mod`] for details.
 
-<a id="configuring-fastCGI-servers"></a>
+<a id="configuring-fastcgi-servers-to-handle-php-files"></a>
 ### Configuring FastCGI servers to handle PHP files
 
 Add the [`apache::fastcgi::server`][] defined type to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:

From 68f6e90dd6b0adc6afc3d5a50f1c415321dc021e Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Thu, 20 Dec 2018 10:09:31 +0000
Subject: [PATCH 1428/2267] (FM-7655) Fix rubygems-update for ruby < 2.3

---
 .travis.yml   | 4 ++--
 metadata.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 97fc99de9a..5b5d486e44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
-  - gem update --system
+  - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - bundle -v
 script:
@@ -44,7 +44,7 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
       rvm: 2.4.4
     -
-      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
+      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8
       rvm: 2.1.9
 branches:
   only:
diff --git a/metadata.json b/metadata.json
index 0f71cec85f..3346f799df 100644
--- a/metadata.json
+++ b/metadata.json
@@ -80,6 +80,6 @@
   ],
   "description": "Module for Apache configuration",
   "pdk-version": "1.8.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-gbf720df"
+  "template-url": "https://github.com/puppetlabs/pdk-templates/",
+  "template-ref": "heads/master-0-g20af4c6"
 }
\ No newline at end of file

From e633d099f40c3c535baf65239a8269d947ad88a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 18 Dec 2018 12:05:58 -1000
Subject: [PATCH 1429/2267] Add support for mod_http2: 1/3: server config

---
 README.md                      | 135 +++++++++++++++++++++++++++++++++
 manifests/mod/http2.pp         |  38 ++++++++++
 spec/classes/mod/http2_spec.rb |  98 ++++++++++++++++++++++++
 templates/mod/http2.conf.erb   |  65 ++++++++++++++++
 4 files changed, 336 insertions(+)
 create mode 100644 manifests/mod/http2.pp
 create mode 100644 spec/classes/mod/http2_spec.rb
 create mode 100644 templates/mod/http2.conf.erb

diff --git a/README.md b/README.md
index 31d7e6c980..bacd65b865 100755
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@
 [`apache::mod::event`]: #class-apachemodevent
 [`apache::mod::ext_filter`]: #class-apachemodext_filter
 [`apache::mod::geoip`]: #class-apachemodgeoip
+[`apache::mod::http2`]: #class-apachemodhttp2
 [`apache::mod::itk`]: #class-apachemoditk
 [`apache::mod::jk`]: #class-apachemodjk
 [`apache::mod::ldap`]: #class-apachemodldap
@@ -182,6 +183,7 @@
 [`mod_ext_filter`]: https://httpd.apache.org/docs/current/mod/mod_ext_filter.html
 [`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
 [`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/
+[`mod_http2`]: https://httpd.apache.org/docs/current/mod/mod_http2.html
 [`mod_info`]: https://httpd.apache.org/docs/current/mod/mod_info.html
 [`mod_ldap`]: https://httpd.apache.org/docs/2.2/mod/mod_ldap.html
 [`mod_mpm_event`]: https://httpd.apache.org/docs/current/mod/event.html
@@ -1647,6 +1649,7 @@ The following Apache modules have supported classes, many of which allow for par
 * `filter`
 * `geoip` (see [`apache::mod::geoip`][])
 * `headers`
+* `http2` (see [`apache::mod::http2`][])
 * `include`
 * `info`\*
 * `intercept_form_submit`
@@ -2190,6 +2193,138 @@ Installs and manages [`mod_geoip`][].
 
   Default: `undef`.
 
+##### Class: `apache::mod::http2`
+
+Installs and manages [`mod_http2`][].
+
+**Parameters**:
+
+* `h2_copy_files`: Determines if file handles or copies of file content are
+passed from the requestion processing down to the main connection.
+
+  Boolean.
+
+  Default: `undef`
+
+* `h2_direct`: Toggles the usage of the HTTP/2 Direct Mode.
+
+  Boolean.
+
+  Default: `undef`
+
+* `h2_early_hints`: Controls if HTTP status 103 interim responses are forwarded
+to the client or not.
+
+  Boolean.
+
+  Default: `undef`
+
+* `h2_max_session_streams`: Sets the maximum number of active streams per
+HTTP/2 session that the server allows.
+
+  Integer.
+
+  Default: `undef`
+
+* `h2_max_worker_idle_seconds`: Sets the maximum number of seconds a h2 worker
+  may idle until it shuts itself down.
+
+  Integer.
+
+  Default: `undef`
+
+* `h2_max_workers`: Sets the maximum number of worker threads to spawn per
+  child process for HTTP/2 processing.
+
+  Integer.
+
+  Default: `undef`
+
+* `h2_min_workers`: Sets the minimum number of worker threads to spawn per
+  child process for HTTP/2 processing.
+
+  Integer.
+
+  Default: `undef`
+
+* `h2_modern_tls_only`: Toggles the security checks on HTTP/2 connections in
+  TLS mode.
+
+  Boolean.
+
+  Default: `undef`
+
+* `h2_push`: Toggles the usage of the HTTP/2 server push protocol feature.
+
+  Boolean.
+
+  Default: `undef`
+
+* `h2_push_diary_size`: Toggles the maximum number of HTTP/2 server pushes that
+  are remembered per HTTP/2 connection.
+
+  Integer.
+
+  Default: `undef`
+
+* `h2_push_priority`: Defines the priority handling of pushed responses based
+  on the content-type of the response.
+
+  Values: An array of priority definitions.
+
+  Default: `[]`
+
+* `h2_push_resource`: Declares resources for early pushing to the client.
+
+  Values: An array of resources.
+
+  Default: `[]`
+
+* `h2_serialize_headers`: Toggles if HTTP/2 requests shall be serialized in
+  HTTP/1.1 format for processing by httpd core.
+
+  Boolean.
+
+  Default: `undef`
+
+* `h2_stream_max_mem_size`: Maximum number of outgoing data bytes buffered in
+  memory for an active streams.
+
+  Integer.
+
+  Default: `undef`
+
+* `h2_tls_cool_down_secs`: Sets the number of seconds of idle time on a TLS
+  connection before the TLS write size falls back to small (~1300 bytes)
+  length.
+
+  Integer.
+
+  Default: `undef`
+
+* `h2_tls_warm_up_size`: Sets the number of bytes to be sent in small TLS
+  records (~1300 bytes) until doing maximum sized writes (16k) on https: HTTP/2
+  connections.
+
+  Integer.
+
+  Default: `undef`
+
+* `h2_upgrade`: Toggles the usage of the HTTP/1.1 Upgrade method for switching
+  to HTTP/2.
+
+  Boolean.
+
+  Default: `undef`
+
+* `h2_window_size`: Sets the size of the window that is used for flow control
+  from client to server and limits the amount of data the server has to buffer.
+
+  Integer.
+
+  Default: `undef`
+
+
 ##### Class: `apache::mod::info`
 
 Installs and manages [`mod_info`][], which provides a comprehensive overview of the server configuration.
diff --git a/manifests/mod/http2.pp b/manifests/mod/http2.pp
new file mode 100644
index 0000000000..468c0db51d
--- /dev/null
+++ b/manifests/mod/http2.pp
@@ -0,0 +1,38 @@
+class apache::mod::http2 (
+  Optional[Boolean] $h2_copy_files              = undef,
+  Optional[Boolean] $h2_direct                  = undef,
+  Optional[Boolean] $h2_early_hints             = undef,
+  Optional[Integer] $h2_max_session_streams     = undef,
+  Optional[Integer] $h2_max_worker_idle_seconds = undef,
+  Optional[Integer] $h2_max_workers             = undef,
+  Optional[Integer] $h2_min_workers             = undef,
+  Optional[Boolean] $h2_modern_tls_only         = undef,
+  Optional[Boolean] $h2_push                    = undef,
+  Optional[Integer] $h2_push_diary_size         = undef,
+  Array[String]     $h2_push_priority           = [],
+  Array[String]     $h2_push_resource           = [],
+  Optional[Boolean] $h2_serialize_headers       = undef,
+  Optional[Integer] $h2_stream_max_mem_size     = undef,
+  Optional[Integer] $h2_tls_cool_down_secs      = undef,
+  Optional[Integer] $h2_tls_warm_up_size        = undef,
+  Optional[Boolean] $h2_upgrade                 = undef,
+  Optional[Integer] $h2_window_size             = undef,
+  Optional[String]  $apache_version             = undef,
+) {
+  include ::apache
+  apache::mod { 'http2': }
+
+  $_apache_version = pick($apache_version, $apache::apache_version)
+
+  file { 'http2.conf':
+    ensure  => file,
+    content => template('apache/mod/http2.conf.erb'),
+    mode    => $::apache::file_mode,
+    path    => "${::apache::mod_dir}/http2.conf",
+    owner   => $::apache::params::user,
+    group   => $::apache::params::group,
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
+}
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
new file mode 100644
index 0000000000..d1a9c4b51f
--- /dev/null
+++ b/spec/classes/mod/http2_spec.rb
@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe 'apache::mod::http2', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+
+  context 'default configuration with parameters on a Debian OS' do
+    let :facts do
+      {
+        lsbdistcodename: 'jessie',
+        osfamily: 'Debian',
+        operatingsystemrelease: '8',
+        id: 'root',
+        kernel: 'Linux',
+        operatingsystem: 'Debian',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
+      }
+    end
+
+    it { is_expected.to contain_class('apache::mod::http2') }
+    context 'with default values' do
+      let(:expected_content) do
+        <<EOT
+# The http2 Apache module configuration file is being
+# managed by Puppet and changes will be overwritten.
+
+EOT
+      end
+
+      it { is_expected.to contain_file('http2.conf').with(content: expected_content) }
+    end
+
+    context 'with all values set' do
+      let(:params) do
+        {
+          h2_copy_files: false,
+          h2_direct: true,
+          h2_early_hints: false,
+          h2_max_session_streams: 100,
+          h2_max_worker_idle_seconds: 600,
+          h2_max_workers: 20,
+          h2_min_workers: 10,
+          h2_modern_tls_only: true,
+          h2_push: true,
+          h2_push_diary_size: 256,
+          h2_push_priority: [
+            'application/json 32',
+            'image/jpeg before',
+            'text/css   interleaved',
+          ],
+          h2_push_resource: [
+            '/xxx.css',
+            '/xxx.js',
+          ],
+          h2_serialize_headers: true,
+          h2_stream_max_mem_size: 128_000,
+          h2_tls_cool_down_secs: 0,
+          h2_tls_warm_up_size: 0,
+          h2_upgrade: false,
+          h2_window_size: 128_000,
+
+          apache_version: '2.4',
+        }
+      end
+
+      let(:expected_content) do
+        <<EOT
+# The http2 Apache module configuration file is being
+# managed by Puppet and changes will be overwritten.
+
+H2CopyFiles Off
+H2Direct On
+H2EarlyHints Off
+H2MaxSessionStreams 100
+H2MaxWorkerIdleSeconds 600
+H2MaxWorkers 20
+H2MinWorkers 10
+H2ModernTLSOnly On
+H2Push On
+H2PushDiarySize 256
+H2PushPriority application/json 32
+H2PushPriority image/jpeg before
+H2PushPriority text/css   interleaved
+H2PushResource /xxx.css
+H2PushResource /xxx.js
+H2SerializeHeaders On
+H2StreamMaxMemSize 128000
+H2TLSCoolDownSecs 0
+H2TLSWarmUpSize 0
+H2Upgrade Off
+H2WindowSize 128000
+EOT
+      end
+
+      it { is_expected.to contain_file('http2.conf').with(content: expected_content) }
+    end
+  end
+end
diff --git a/templates/mod/http2.conf.erb b/templates/mod/http2.conf.erb
new file mode 100644
index 0000000000..4839013680
--- /dev/null
+++ b/templates/mod/http2.conf.erb
@@ -0,0 +1,65 @@
+# The http2 Apache module configuration file is being
+# managed by Puppet and changes will be overwritten.
+
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
+<% if !@h2_copy_files.nil? && scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
+H2CopyFiles <%= scope.call_function('apache::bool2httpd', [@h2_copy_files]) %>
+<% end -%>
+<% unless @h2_direct.nil? -%>
+H2Direct <%= scope.call_function('apache::bool2httpd', [@h2_direct]) %>
+<% end -%>
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
+<% if !@h2_early_hints.nil? && scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
+H2EarlyHints <%= scope.call_function('apache::bool2httpd', [@h2_early_hints]) %>
+<% end -%>
+<% unless @h2_max_session_streams.nil? -%>
+H2MaxSessionStreams <%= @h2_max_session_streams %>
+<% end -%>
+<% unless @h2_max_worker_idle_seconds.nil? -%>
+H2MaxWorkerIdleSeconds <%= @h2_max_worker_idle_seconds %>
+<% end -%>
+<% unless @h2_max_workers.nil? -%>
+H2MaxWorkers <%= @h2_max_workers %>
+<% end -%>
+<% unless @h2_min_workers.nil? -%>
+H2MinWorkers <%= @h2_min_workers %>
+<% end -%>
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
+<% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
+    <%- unless @h2_modern_tls_only.nil? -%>
+H2ModernTLSOnly <%= scope.call_function('apache::bool2httpd', [@h2_modern_tls_only]) %>
+    <%- end -%>
+    <%- unless @h2_push.nil? -%>
+H2Push <%= scope.call_function('apache::bool2httpd', [@h2_push]) %>
+    <%- end -%>
+    <%- unless @h2_push_diary_size.nil? -%>
+H2PushDiarySize <%= @h2_push_diary_size %>
+    <%- end -%>
+    <%- @h2_push_priority.each do |expr| -%>
+H2PushPriority <%= expr %>
+    <%- end -%>
+    <%- @h2_push_resource.each do |expr| -%>
+H2PushResource <%= expr %>
+    <%- end -%>
+<% end -%>
+<% unless @h2_serialize_headers.nil? -%>
+H2SerializeHeaders <%= scope.call_function('apache::bool2httpd', [@h2_serialize_headers]) %>
+<% end -%>
+<% unless @h2_stream_max_mem_size.nil? -%>
+H2StreamMaxMemSize <%= @h2_stream_max_mem_size %>
+<% end -%>
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
+<% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
+    <%- unless @h2_tls_cool_down_secs.nil? -%>
+H2TLSCoolDownSecs <%= @h2_tls_cool_down_secs %>
+    <%- end -%>
+    <%- unless @h2_tls_warm_up_size.nil? -%>
+H2TLSWarmUpSize <%= @h2_tls_warm_up_size %>
+    <%- end -%>
+<% end -%>
+<% unless @h2_upgrade.nil? -%>
+H2Upgrade <%= scope.call_function('apache::bool2httpd', [@h2_upgrade]) %>
+<% end -%>
+<% unless @h2_window_size.nil? -%>
+H2WindowSize <%= @h2_window_size %>
+<% end -%>

From a35bf55d6724de50790b0f6d037b2f829d092304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 18 Dec 2018 12:07:20 -1000
Subject: [PATCH 1430/2267] Add support for mod_http2: 2/3: virtual host

---
 README.md                  |  87 +++++++++++++++++++++++++++++++
 manifests/vhost.pp         |  27 ++++++++++
 spec/defines/vhost_spec.rb | 104 +++++++++++++++++++++++++++++++++++++
 templates/vhost/_http2.erb |  53 +++++++++++++++++++
 4 files changed, 271 insertions(+)
 create mode 100644 templates/vhost/_http2.erb

diff --git a/README.md b/README.md
index bacd65b865..538d1144a8 100755
--- a/README.md
+++ b/README.md
@@ -3831,6 +3831,93 @@ Sets the [`ForceType`][] directive, which forces Apache to serve all matching fi
 
 Lets Apache set custom content character sets per directory and/or file extension
 
+##### `h2_copy_files`
+
+Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
+directive which influences how the requestion process pass files to the main
+connection.
+
+##### `h2_direct`
+
+Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
+directive which toggles the usage of the HTTP/2 Direct Mode.
+
+##### `h2_early_hints`
+
+Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2earlyhints)
+directive which controls if HTTP status 103 interim responses are forwarded to
+the client or not.
+
+##### `h2_max_session_streams`
+
+Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2maxsessionstreams)
+directive which sets the maximum number of active streams per HTTP/2 session
+that the server allows.
+
+##### `h2_modern_tls_only`
+
+Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
+directive which toggles the security checks on HTTP/2 connections in TLS mode.
+
+##### `h2_push`
+
+Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
+directive which toggles the usage of the HTTP/2 server push protocol feature.
+
+##### `h2_push_diary_size`
+
+Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushdiarysize)
+directive which toggles the maximum number of HTTP/2 server pushes that are
+remembered per HTTP/2 connection.
+
+##### `h2_push_priority`
+
+Sets the [H2PushPriority](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushpriority)
+directive which defines the priority handling of pushed responses based on the
+content-type of the response.
+
+##### `h2_push_resource`
+
+Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource)
+directive which declares resources for early pushing to the client.
+
+##### `h2_serialize_headers`
+
+Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
+directive which toggles if HTTP/2 requests shall be serialized in HTTP/1.1
+format for processing by httpd core.
+
+##### `h2_stream_max_mem_size`
+
+Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
+directive which sets the maximum number of outgoing data bytes buffered in
+memory for an active streams.
+
+##### `h2_tls_cool_down_secs`
+
+Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
+directive which sets the number of seconds of idle time on a TLS connection
+before the TLS write size falls back to small (~1300 bytes) length.
+
+##### `h2_tls_warm_up_size`
+
+Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlswarmupsize)
+directive which sets the number of bytes to be sent in small TLS records (~1300
+bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
+
+##### `h2_upgrade`
+
+Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2upgrade)
+directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
+to HTTP/2.
+
+##### `h2_window_size`
+
+Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2windowsize)
+directive which sets the size of the window that is used for flow control from
+client to server and limits the amount of data the server has to buffer.
+
+
 ##### `headers`
 
 Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d607be1d93..53f41d9b77 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -133,6 +133,23 @@
   $apache_version                                                                   = $::apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
   Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                           = undef,
+
+  Optional[Boolean] $h2_copy_files                                                  = undef,
+  Optional[Boolean] $h2_direct                                                      = undef,
+  Optional[Boolean] $h2_early_hints                                                 = undef,
+  Optional[Integer] $h2_max_session_streams                                         = undef,
+  Optional[Boolean] $h2_modern_tls_only                                             = undef,
+  Optional[Boolean] $h2_push                                                        = undef,
+  Optional[Integer] $h2_push_diary_size                                             = undef,
+  Array[String]     $h2_push_priority                                               = [],
+  Array[String]     $h2_push_resource                                               = [],
+  Optional[Boolean] $h2_serialize_headers                                           = undef,
+  Optional[Integer] $h2_stream_max_mem_size                                         = undef,
+  Optional[Integer] $h2_tls_cool_down_secs                                          = undef,
+  Optional[Integer] $h2_tls_warm_up_size                                            = undef,
+  Optional[Boolean] $h2_upgrade                                                     = undef,
+  Optional[Integer] $h2_window_size                                                 = undef,
+
   Optional[Boolean] $passenger_enabled                                              = undef,
   Optional[String] $passenger_base_uri                                              = undef,
   Optional[Stdlib::Absolutepath] $passenger_ruby                                    = undef,
@@ -950,6 +967,16 @@
     }
   }
 
+  if $h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef {
+    include ::apache::mod::http2
+
+    concat::fragment { "${name}-http2":
+      target  => "${priority_real}${filename}.conf",
+      order   => 300,
+      content => template('apache/vhost/_http2.erb'),
+    }
+  }
+
   # Template uses:
   # - $passenger_spawn_method
   # - $passenger_app_root
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f301864048..b7726744b3 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -349,6 +349,28 @@
               'suexec_user_group'           => 'root root',
               'allow_encoded_slashes'       => 'nodecode',
               'use_canonical_name'          => 'dns',
+
+              'h2_copy_files'               => false,
+              'h2_direct'                   => true,
+              'h2_early_hints'              => false,
+              'h2_max_session_streams'      => 100,
+              'h2_modern_tls_only'          => true,
+              'h2_push'                     => true,
+              'h2_push_diary_size'          => 256,
+              'h2_push_priority'            => [
+                'application/json 32',
+              ],
+              'h2_push_resource' => [
+                '/css/main.css',
+                '/js/main.js',
+              ],
+              'h2_serialize_headers'        => false,
+              'h2_stream_max_mem_size'      => 65_536,
+              'h2_tls_cool_down_secs'       => 1,
+              'h2_tls_warm_up_size'         => 1_048_576,
+              'h2_upgrade'                  => true,
+              'h2_window_size'              => 65_535,
+
               'passenger_enabled'                     => false,
               'passenger_base_uri'                    => '/app',
               'passenger_ruby'                        => '/usr/bin/ruby1.9.1',
@@ -1000,6 +1022,88 @@
               content: %r{^\s+MaxKeepAliveRequests\s1000$},
             )
           }
+
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2CopyFiles\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2Direct\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2EarlyHints\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2MaxSessionStreams\s100$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2ModernTLSOnly\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2Push\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2PushDiarySize\s256$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2PushPriority\sapplication/json 32$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2PushResource\s/css/main.css$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2PushResource\s/js/main.js$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2SerializeHeaders\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2StreamMaxMemSize\s65536$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2TLSCoolDownSecs\s1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2TLSWarmUpSize\s1048576$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2Upgrade\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
+              content: %r{^\s+H2WindowSize\s65535$},
+            )
+          }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
               content: %r{^\s+PassengerEnabled\sOff$},
diff --git a/templates/vhost/_http2.erb b/templates/vhost/_http2.erb
new file mode 100644
index 0000000000..54110c95a9
--- /dev/null
+++ b/templates/vhost/_http2.erb
@@ -0,0 +1,53 @@
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
+<% if !@h2_copy_files.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  H2CopyFiles <%= scope.call_function('apache::bool2httpd', [@h2_copy_files]) %>
+<% end -%>
+<% unless @h2_direct.nil? -%>
+  H2Direct <%= scope.call_function('apache::bool2httpd', [@h2_direct]) %>
+<% end -%>
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
+<% if !@h2_early_hints.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  H2EarlyHints <%= scope.call_function('apache::bool2httpd', [@h2_early_hints]) %>
+<% end -%>
+<% unless @h2_max_session_streams.nil? -%>
+  H2MaxSessionStreams <%= @h2_max_session_streams %>
+<% end -%>
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
+<% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    <%- unless @h2_modern_tls_only.nil? -%>
+  H2ModernTLSOnly <%= scope.call_function('apache::bool2httpd', [@h2_modern_tls_only]) %>
+    <%- end -%>
+    <%- unless @h2_push.nil? -%>
+  H2Push <%= scope.call_function('apache::bool2httpd', [@h2_push]) %>
+    <%- end -%>
+    <%- unless @h2_push_diary_size.nil? -%>
+  H2PushDiarySize <%= @h2_push_diary_size %>
+    <%- end -%>
+    <%- @h2_push_priority.each do |expr| -%>
+  H2PushPriority <%= expr %>
+    <%- end -%>
+    <%- @h2_push_resource.each do |expr| -%>
+  H2PushResource <%= expr %>
+    <%- end -%>
+<% end -%>
+<% unless @h2_serialize_headers.nil? -%>
+  H2SerializeHeaders <%= scope.call_function('apache::bool2httpd', [@h2_serialize_headers]) %>
+<% end -%>
+<% unless @h2_stream_max_mem_size.nil? -%>
+  H2StreamMaxMemSize <%= @h2_stream_max_mem_size %>
+<% end -%>
+<%# Actually >= 2.4.24, but the minor version is not provided -%>
+<% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+    <%- unless @h2_tls_cool_down_secs.nil? -%>
+  H2TLSCoolDownSecs <%= @h2_tls_cool_down_secs %>
+    <%- end -%>
+    <%- unless @h2_tls_warm_up_size.nil? -%>
+  H2TLSWarmUpSize <%= @h2_tls_warm_up_size %>
+    <%- end -%>
+<% end -%>
+<% unless @h2_upgrade.nil? -%>
+  H2Upgrade <%= scope.call_function('apache::bool2httpd', [@h2_upgrade]) %>
+<% end -%>
+<% unless @h2_window_size.nil? -%>
+  H2WindowSize <%= @h2_window_size %>
+<% end -%>

From 5fdc9875957ff648e312d970eddc678c3abbc7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 18 Dec 2018 12:07:46 -1000
Subject: [PATCH 1431/2267] Add support for mod_http2: 3/3: directory

---
 README.md                        | 10 ++++++++++
 spec/defines/vhost_spec.rb       | 23 +++++++++++++++++++++++
 templates/vhost/_directories.erb |  8 ++++++++
 3 files changed, 41 insertions(+)

diff --git a/README.md b/README.md
index 538d1144a8..d99eb0ab32 100755
--- a/README.md
+++ b/README.md
@@ -5078,6 +5078,16 @@ apache::vhost { 'first.example.com':
 }
 ```
 
+##### `h2_copy_files`
+
+Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.
+Note that you must declare `class {'apache::mod::http2': }` before using this directive.
+
+##### `h2_push_resource`
+
+Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.
+Note that you must declare `class {'apache::mod::http2': }` before using this directive.
+
 ##### `headers`
 
 Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b7726744b3..bed535b238 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -176,6 +176,14 @@
                   'dav'                => 'filesystem',
                   'dav_depth_infinity' => true,
                   'dav_min_timeout'    => '600' },
+                {
+                  'path'             => '/var/www/http2',
+                  'h2_copy_files'    => true,
+                  'h2_push_resource' => [
+                    '/foo.css',
+                    '/foo.js',
+                  ],
+                },
                 {
                   'path'                                                => '/var/www/node-app/public',
                   'passenger_enabled'                                   => true,
@@ -501,6 +509,21 @@
               content: %r{^\s+Include\s'\/custom\/path\/another_includes'$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+H2CopyFiles\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+H2PushResource\s/foo.css$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+H2PushResource\s/foo.js$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+Require valid-user$},
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 219d09e168..8d92afbde7 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -85,6 +85,14 @@
     <%- if directory['sethandler'] and directory['sethandler'] != '' -%>
     SetHandler <%= directory['sethandler'] %>
     <%- end -%>
+    <%- unless directory['h2_copy_files'].nil? -%>
+    H2CopyFiles <%= scope.call_function('apache::bool2httpd', [directory['h2_copy_files']]) %>
+    <%- end -%>
+    <%- if directory['h2_push_resource'] && ! directory['h2_push_resource'].empty? -%>
+      <%- [directory['h2_push_resource']].flatten.compact.each do |h2_push_resource| -%>
+    H2PushResource <%= h2_push_resource %>
+      <%- end -%>
+    <%- end -%>
     <%- unless directory['passenger_enabled'].nil? -%>
     PassengerEnabled <%= scope.call_function('apache::bool2httpd', [directory['passenger_enabled']]) %>
     <%- end -%>

From 84576165183f879d8834df9a1e597863ec6fc22a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 20 Dec 2018 08:10:45 -1000
Subject: [PATCH 1432/2267] Allow setting protocols

Required for using mod_http2.
---
 README.md                        | 24 ++++++++++++++++++++++++
 manifests/init.pp                |  2 ++
 manifests/vhost.pp               |  5 +++++
 spec/defines/vhost_spec.rb       | 12 ++++++++++++
 templates/httpd.conf.erb         | 10 ++++++++++
 templates/vhost/_file_header.erb |  9 +++++++++
 6 files changed, 62 insertions(+)

diff --git a/README.md b/README.md
index d99eb0ab32..09d15dd783 100755
--- a/README.md
+++ b/README.md
@@ -1283,6 +1283,18 @@ Sets the path to the file containing Apache ports configuration.
 
 Default: '{$conf_dir}/ports.conf'.
 
+##### `protocols`
+
+Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols) directive, which lists available protocols for the server.
+
+Default: `undef`
+
+##### `protocols_honor_order`
+
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines if order of Protocols determines precedence during negotiation.
+
+Default: `undef`
+
 ##### `purge_configs`
 
 Removes all other Apache configs and virtual hosts.
@@ -4409,6 +4421,18 @@ To omit the priority prefix in file names, pass a priority of `false`.
 
 Default: '25'.
 
+##### `protocols`
+
+Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols) directive, which lists available protocols for the virutal host.
+
+Default: `undef`
+
+##### `protocols_honor_order`
+
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines if order of Protocols determines precedence during negotiation.
+
+Default: `undef`
+
 ##### `proxy_dest`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
diff --git a/manifests/init.pp b/manifests/init.pp
index d13f2899d9..60ccc0c0cb 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -94,6 +94,8 @@
   $error_log                                                     = $::apache::params::error_log,
   $scriptalias                                                   = $::apache::params::scriptalias,
   $access_log_file                                               = $::apache::params::access_log_file,
+  Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                = [],
+  Optional[Boolean] $protocols_honor_order                       = undef,
 ) inherits ::apache::params {
 
   $valid_mpms_re = $apache_version ? {
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 53f41d9b77..be8e10e29d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -10,6 +10,8 @@
   $docroot_owner                                                                    = 'root',
   $docroot_group                                                                    = $::apache::params::root_group,
   $docroot_mode                                                                     = undef,
+  Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                                   = [],
+  Optional[Boolean] $protocols_honor_order                                          = undef,
   $serveradmin                                                                      = undef,
   Boolean $ssl                                                                      = false,
   $ssl_cert                                                                         = $::apache::default_ssl_cert,
@@ -571,6 +573,9 @@
   # - $nvh_addr_port
   # - $servername
   # - $serveradmin
+  # - $protocols
+  # - $protocols_honor_order
+  # - $apache_version
   concat::fragment { "${name}-apache-header":
     target  => "${priority_real}${filename}.conf",
     order   => 0,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index bed535b238..31d71b9d80 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -437,6 +437,8 @@
               'keepalive'                   => 'on',
               'keepalive_timeout'           => '100',
               'max_keepalive_requests'      => '1000',
+              'protocols'                   => ['h2', 'http/1.1'],
+              'protocols_honor_order'       => true,
             }
           end
 
@@ -1045,6 +1047,16 @@
               content: %r{^\s+MaxKeepAliveRequests\s1000$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+Protocols\sh2 http/1.1$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+ProtocolsHonorOrder\sOn$},
+            )
+          }
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 65a0aa2b6e..5fd4f29c95 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -17,6 +17,16 @@ LimitRequestFields <%= @limitreqfields %>
 HttpProtocolOptions <%= @http_protocol_options %>
 <%- end -%>
 
+<%# Actually >= 2.4.17, but the minor version is not provided -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- unless @protocols.empty? -%>
+Protocols <%= @protocols.join(' ') %>
+  <%- end -%>
+  <%- unless @protocols_honor_order.nil? -%>
+ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %>
+  <%- end -%>
+<%- end -%>
+
 <%- if @rewrite_lock and scope.function_versioncmp([@apache_version, '2.2']) <= 0 -%>
 RewriteLock <%= @rewrite_lock %>
 <%- end -%>
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index 0e610f8474..9ff4aff3d8 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -11,3 +11,12 @@
 <% if @serveradmin -%>
   ServerAdmin <%= @serveradmin %>
 <% end -%>
+<%# Actually >= 2.4.17, but the minor version is not provided -%>
+<% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- unless @protocols.empty? -%>
+  Protocols <%= @protocols.join(' ') %>
+  <%- end -%>
+  <%- unless @protocols_honor_order.nil? -%>
+  ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %>
+  <%- end -%>
+<% end -%>

From 666ac9a1df7cb95aa60ec1032ebc3024392dd119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 20 Dec 2018 08:11:26 -1000
Subject: [PATCH 1433/2267] Document missing variable used in template

---
 manifests/vhost.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index be8e10e29d..1d5ec01ba8 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -570,6 +570,7 @@
   }
 
   # Template uses:
+  # - $comment
   # - $nvh_addr_port
   # - $servername
   # - $serveradmin

From 168582b353472b9068a0c13747aec3ee0395fb8a Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Thu, 3 Jan 2019 14:32:00 +0000
Subject: [PATCH 1434/2267] pdksync_heads/master-0-g9c815ea

---
 .travis.yml   | 5 ++++-
 metadata.json | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b5d486e44..445717bccd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ dist: trusty
 language: ruby
 cache: bundler
 before_install:
+  - if [ $BUNDLER_VERSION ]; then
+      gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
+    fi
   - bundle -v
   - rm -f Gemfile.lock
   - gem update --system $RUBYGEMS_VERSION
@@ -44,7 +47,7 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
       rvm: 2.4.4
     -
-      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8
+      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
       rvm: 2.1.9
 branches:
   only:
diff --git a/metadata.json b/metadata.json
index 3346f799df..2c12300e04 100644
--- a/metadata.json
+++ b/metadata.json
@@ -79,7 +79,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.8.0",
+  "pdk-version": "1.7.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates/",
-  "template-ref": "heads/master-0-g20af4c6"
-}
\ No newline at end of file
+  "template-ref": "heads/master-0-g9c815ea"
+}

From ab23b9f2e99cb64313f369704d7889a6e5d73ff9 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 2 Jan 2019 14:03:31 +0000
Subject: [PATCH 1435/2267] (MODULES-5990) - conf-enabled defaulted to undef

---
 manifests/params.pp      | 8 ++------
 templates/httpd.conf.erb | 6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index e02100382a..f73651d471 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -321,12 +321,8 @@
     $server_root         = '/etc/apache2'
     $conf_dir            = $httpd_dir
     $confd_dir           = "${httpd_dir}/conf.d"
-    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') == 0) {
-      # Overwrite conf_enabled to be false as it causes errors with Shibboleth when enabled on Ubuntu 18.04
-      $conf_enabled      = undef
-    } else {
-      $conf_enabled      = "${httpd_dir}/conf-enabled"
-    }
+    # Overwrite conf_enabled causes errors with Shibboleth when enabled on Ubuntu 18.04
+    $conf_enabled        = undef #"${httpd_dir}/conf-enabled.d"
     $mod_dir             = "${httpd_dir}/mods-available"
     $mod_enable_dir      = "${httpd_dir}/mods-enabled"
     $vhost_dir           = "${httpd_dir}/sites-available"
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 65a0aa2b6e..a0fa6a71d9 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -109,14 +109,14 @@ LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>
 
+<%- if @conf_enabled and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+IncludeOptional "<%= @conf_enabled %>/*.conf"
+<%- end -%>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @confd_dir %>/*.conf"
 <%- else -%>
 Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
-<%- if @conf_enabled and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-IncludeOptional "<%= @conf_enabled %>/*.conf"
-<%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"

From 9919924b00c1b99386f9b1115888803e8b6fb338 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Mon, 7 Jan 2019 09:27:03 +0000
Subject: [PATCH 1436/2267] (MODULES-8433) - 4.0.0 Release Prep

---
 CHANGELOG.md  | 20 +++++++++++++++++++-
 metadata.json |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eedde12b3d..03898cec87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,25 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [3.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.5.0) (2018-12-14)
+## [4.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.6.0) (2019-01-07)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...3.6.0)
+
+### Changed
+
+- default server\_tokens to prod - more secure default [\#1746](https://github.com/puppetlabs/puppetlabs-apache/pull/1746) ([juju4](https://github.com/juju4))
+
+### Added
+
+- \(Modules 8141/Modules 8379\) - Addition of support for SLES 15 [\#1862](https://github.com/puppetlabs/puppetlabs-apache/pull/1862) ([david22swan](https://github.com/david22swan))
+- SCL support for httpd and php7.1 [\#1822](https://github.com/puppetlabs/puppetlabs-apache/pull/1822) ([mmoll](https://github.com/mmoll))
+
+### Fixed
+
+- \(MODULES-5990\) - conf-enabled defaulted to undef [\#1869](https://github.com/puppetlabs/puppetlabs-apache/pull/1869) ([david22swan](https://github.com/david22swan))
+- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#1866](https://github.com/puppetlabs/puppetlabs-apache/pull/1866) ([tphoney](https://github.com/tphoney))
+
+## [3.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.5.0) (2018-12-17)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.4.0...3.5.0)
 
diff --git a/metadata.json b/metadata.json
index 2c12300e04..bf79754de6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "3.5.0",
+  "version": "4.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 9a9e2d846be0880ed3fd07b7c3c24b30332ab4ce Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 9 Jan 2019 15:38:56 +0000
Subject: [PATCH 1437/2267] (MODULES-8434) - Docs Fix

---
 README.md | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 17e2ec1803..bd6227d967 100755
--- a/README.md
+++ b/README.md
@@ -3098,15 +3098,29 @@ The repository is not managed by this module yet. For CentOS you can enable the
 
 ##### `scl_httpd_version`
 
-#### Version of httpd to install.
+Version of httpd to install using Red Hat Software Collections (SCL). These collections for CentOS and RHEL allow for newer Apache and PHP packages.
 
-Example: `2.4` for Apache 2.4.
+If you set `scl_httpd_version`, Apache httpd is installed from [Software Collections](https://www.softwarecollections.org/en/).
+
+If you set `scl_httpd_version`, you must also set `scl_php_version`, even if you are not installing PHP.
+
+The SCL repository is not managed by this module. For CentOS, enable the repo by installing the package `centos-release-scl-rh`.
+
+Valid value: A string specifying the version of httpd to install. For example, for Apache 2.4, specify '2.4'.
+
+Default: undef.
 
 ##### `scl_php_version`
 
-Version of PHP to use.
+Version of PHP to install using Red Hat Software Collections (SCL). Version of httpd to install using Red Hat Software Collections (SCL). These collections for CentOS and RHEL allow for newer Apache and PHP packages.
 
-Example: `7.1`
+If you set `scl_php_version`, PHP is installed from [Software Collections](https://www.softwarecollections.org/en/).
+
+The SCL repository is not managed by this module. For CentOS, enable the repo by installing the package `centos-release-scl-rh`.
+
+Valid value: A string specifying the version of PHP to install. For example, for PHP 7.1, specify '7.1'.
+
+Default: undef.
 
 ### Public defined types
 

From a5d6e6d61b71a2db041f5baa83ddedd458826ab2 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Thu, 10 Jan 2019 15:23:22 +0000
Subject: [PATCH 1438/2267] pdksync_heads/master-0-g6814a87

---
 .travis.yml   | 6 ------
 Gemfile       | 3 ++-
 metadata.json | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 445717bccd..99e95b17a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,6 @@ dist: trusty
 language: ruby
 cache: bundler
 before_install:
-  - if [ $BUNDLER_VERSION ]; then
-      gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
-    fi
   - bundle -v
   - rm -f Gemfile.lock
   - gem update --system $RUBYGEMS_VERSION
@@ -46,9 +43,6 @@ matrix:
     -
       env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
       rvm: 2.4.4
-    -
-      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
-      rvm: 2.1.9
 branches:
   only:
     - master
diff --git a/Gemfile b/Gemfile
index 47fa24e654..b7d80c3e53 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,8 @@ group :development do
   gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
   gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
-  gem "json", '<= 2.0.4',                              require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
+  gem "json", '= 2.0.4',                               require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.1.0',                               require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
diff --git a/metadata.json b/metadata.json
index bf79754de6..6f1c4be953 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,5 +81,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.7.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates/",
-  "template-ref": "heads/master-0-g9c815ea"
+  "template-ref": "heads/master-0-g6814a87"
 }

From fa443d67b443d374d5c6f64f1d291d3a61f501dd Mon Sep 17 00:00:00 2001
From: Graham King <kingy@LPT3416.bjss.co.uk>
Date: Tue, 15 Jan 2019 08:23:00 +0000
Subject: [PATCH 1439/2267] Added documentation

---
 manifests/mod/php.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 722d198239..56a5921f20 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -48,7 +48,8 @@
   } else {
     $_package_name = undef
   }
-
+  
+  # Controls the php version and libphp prefix
   $_lib = "libphp${php_version}.so"
   $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
 

From 12a58565e22d82d348ce42a55098d20dabc6b7e8 Mon Sep 17 00:00:00 2001
From: Graham King <graham.king@bjss.com>
Date: Tue, 27 Nov 2018 14:28:56 +0000
Subject: [PATCH 1440/2267] Added code to paramertize the libphp prefix

---
 manifests/mod/php.pp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 56a5921f20..3f71f7c6c7 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -8,6 +8,7 @@
   $source           = undef,
   $root_group       = $::apache::params::root_group,
   $php_version      = $::apache::params::php_version,
+  $libphp_prefix    = 'libphp'
 ) inherits apache::params {
 
   include ::apache
@@ -48,9 +49,9 @@
   } else {
     $_package_name = undef
   }
-  
-  # Controls the php version and libphp prefix
-  $_lib = "libphp${php_version}.so"
+
+  # Controls php version and libphp prefix
+  $_lib = "${libphp_prefix}${php_version}.so"
   $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
 
   if $::operatingsystem == 'SLES' {

From f8b1aff5c71c6859dffbf959f2e5a1f6a4819b89 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Mon, 14 Jan 2019 16:42:18 +0000
Subject: [PATCH 1441/2267] (MODULES-5990) - Managing conf_enabled

---
 manifests/init.pp                         | 12 +++++++++++
 manifests/params.pp                       |  1 +
 spec/acceptance/apache_parameters_spec.rb | 25 +++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index d13f2899d9..ef6fd8738f 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -45,6 +45,7 @@
   $server_root                                                   = $::apache::params::server_root,
   $conf_dir                                                      = $::apache::params::conf_dir,
   $confd_dir                                                     = $::apache::params::confd_dir,
+  $conf_enabled                                                  = $::apache::params::conf_enabled,
   $vhost_dir                                                     = $::apache::params::vhost_dir,
   $vhost_enable_dir                                              = $::apache::params::vhost_enable_dir,
   $mod_libs                                                      = $::apache::params::mod_libs,
@@ -193,6 +194,17 @@
     require => Package['httpd'],
   }
 
+  if $conf_enabled and ! defined(File[$conf_enabled]) {
+    file { $conf_enabled:
+      ensure  => directory,
+      recurse => true,
+      purge   => $purge_confd,
+      force   => $purge_confd,
+      notify  => Class['Apache::Service'],
+      require => Package['httpd'],
+    }
+  }
+
   if ! defined(File[$mod_dir]) {
     exec { "mkdir ${mod_dir}":
       creates => $mod_dir,
diff --git a/manifests/params.pp b/manifests/params.pp
index f73651d471..5365f533e4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -640,6 +640,7 @@
     $server_root      = '/var/www'
     $conf_dir         = $httpd_dir
     $confd_dir        = "${httpd_dir}/conf.d"
+    $conf_enabled     = undef
     $mod_dir          = "${httpd_dir}/modules.d"
     $mod_enable_dir   = undef
     $vhost_dir        = "${httpd_dir}/vhosts.d"
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 8a554c59e9..ceec65fdb4 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -111,6 +111,31 @@ class { 'apache':
     end
   end
 
+  if fact('osfamily') == 'Debian'
+    describe 'conf_enabled => /etc/apache2/conf-enabled' do
+      pp = <<-MANIFEST
+          class { 'apache':
+            purge_configs   => false,
+            conf_enabled    => "/etc/apache2/conf-enabled"
+          }
+      MANIFEST
+      it 'applies cleanly' do
+        shell('touch /etc/apache2/conf-enabled/test.conf')
+        apply_manifest(pp, catch_failures: true)
+      end
+
+      # Ensure the created file didn't disappear.
+      describe file('/etc/apache2/conf-enabled/test.conf') do
+        it { is_expected.to be_file }
+      end
+
+      # Ensure the default file didn't disappear.
+      describe file('/etc/apache2/conf-enabled/security.conf') do
+        it { is_expected.to be_file }
+      end
+    end
+  end
+
   describe 'purge parameters => false' do
     pp = <<-MANIFEST
         class { 'apache':

From 62d15c0b52507e8d726e08d414a1deb2ee406140 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Fri, 18 Jan 2019 15:56:01 +0000
Subject: [PATCH 1442/2267] (maint) - Doc's Fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd6227d967..32e48e274a 100755
--- a/README.md
+++ b/README.md
@@ -3112,7 +3112,7 @@ Default: undef.
 
 ##### `scl_php_version`
 
-Version of PHP to install using Red Hat Software Collections (SCL). Version of httpd to install using Red Hat Software Collections (SCL). These collections for CentOS and RHEL allow for newer Apache and PHP packages.
+Version of PHP to install using Red Hat Software Collections (SCL). These collections for CentOS and RHEL allow for newer Apache and PHP packages.
 
 If you set `scl_php_version`, PHP is installed from [Software Collections](https://www.softwarecollections.org/en/).
 

From 714da34bf27cbc64943eee130b2d4c7b6c8b34cd Mon Sep 17 00:00:00 2001
From: transifex-bot <localization@puppet.com>
Date: Tue, 22 Jan 2019 17:31:09 -0800
Subject: [PATCH 1443/2267] (L10n) Updating translations for
 readmes/README_ja_JP.md

---
 readmes/README_ja_JP.md | 55 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 3798cda758..958b839c8d 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -301,12 +301,15 @@
     - [apacheモジュールへの貢献][貢献]
     - [テストの実施 - クイックガイド][テストの実施]
 
+<a id="module-description"></a>
 ## モジュールの概要
 
 [Apache HTTPサーバ][] (Apache HTTPD、あるいは単にApacheとも呼ばれます)は、広く使用されているWebサーバです。この[Puppetモジュール][]によって、インフラ内でApacheを管理するための設定がシンプルなものになります。幅広いバーチャルホストセットアップを設定および管理し、[Apacheモジュール][]を効率的にインストールして設定することができます。
 
+<a id="setup"></a>
 ## セットアップ
 
+<a id="apache-affects"></a>
 ### apacheモジュールが影響を与えるもの:
 
 - (作成し、書き込みを行う)設定ファイルおよびディレクトリ
@@ -323,6 +326,7 @@ Gentooでは、このモジュールは [`gentoo/puppet-portage`][] Puppetモジ
 >
 >全面的なPuppet管理を一時的に無効にするには、[`apache`][]クラス宣言の[`purge_configs`][]パラメータをfalseに設定します。この手順は、カスタマイズした設定を保存し、リロケーションするための一時的な対策としてのみ推奨されます。
 
+<a id="beginning-with-apache"></a>
 ### Apacheの使用を始める
 
 デフォルトパラメータを用いてPuppetでApacheをインストールするには、[`apache`][]クラスを宣言します。
@@ -351,8 +355,10 @@ class { 'apache':
 
 > **注意**: `default_vhost`を`false`に設定する場合、少なくとも1つの`apache::vhost`リソースを追加する必要があります。追加しなければ、Apacheは起動しません。デフォルトのバーチャルホストを設定するには、`apache`クラスで`default_vhost`を設定するか、[`apache::vhost`][]定義タイプを使用します。[`apache::vhost`][]定義タイプを用いて、追加の固有バーチャルホストを設定することもできます。
 
+<a id="usage"></a>
 ## 使用方法
 
+<a id="configuring-virtual-hosts"></a>
 ### バーチャルホストの設定
 
 デフォルトの[`apache`][]クラスは、ポート80にバーチャルホストを設定します。すべてのインターフェースをリッスンし、[`docroot`][]パラメータのデフォルトディレクトリ`/var/www`をサーブします。
@@ -720,6 +726,7 @@ apache::mod { 'mod_authnz_external': }
 
 この方法でApacheモジュールを定義する際には、いくつかのオプションパラメータを指定できます。詳細については、[定義タイプのリファレンス][`apache::mod`]を参照してください。
 
+<a id="configuring-fastcgi-servers-to-handle-php-files"></a>
 ### PHPファイルを処理するFastCGIサーバの設定
 
 [`apache::fastcgi::server`][]定義タイプを追加すれば、 [FastCGI][]サーバで特定のファイルに関するリクエストを処理することができます。以下の例では、PHPリクエストを処理するFastCGIサーバをポート9000の127.0.0.1 (ローカルホスト)で定義しています。
@@ -745,6 +752,7 @@ apache::vhost { 'www':
 }
 ```
 
+<a id="load-balancing-examples"></a> 
 ### ロードバランシングの例
 
 Apacheは、[`mod_proxy`][] Apacheモジュールを通じて、複数のグループのサーバにわたるロードバランシングをサポートしています。Puppetでは、[`apache::balancer`][]および[`apache::balancermember`][]定義タイプにより、Apacheロードバランシンググループ(バランサクラスタとも呼ばれます)をサポートしています。
@@ -792,6 +800,7 @@ apache::balancer { 'puppet01':
 
 ロードバランシングのスケジューラのアルゴリズム(`lbmethod`)は、[mod_proxy_balancerドキュメント](https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html)に記載されています。
 
+<a id="reference"></a> 
 ## リファレンス
 
 - [**パブリッククラス**](#public-classes)
@@ -1348,7 +1357,7 @@ Apacheの[`ServerSignature`][]ディレクティブで、エラードキュメ
 
 Apacheの[`ServerTokens`][]ディレクティブで、Apacheからブラウザに送信される、Apacheやオペレーティングシステムに関する情報の量を制御します。
 
-デフォルト値: 'OS'。
+デフォルト値: 'Prod'.
 
 ##### `service_enable`
 
@@ -1504,7 +1513,9 @@ Puppetがこのユーザを管理しないようにするには、[`manage_user`
 
 ##### `apache_name`
 
-インストールするApacheパッケージの名前。Red Hatのソフトウェアコレクションのパッケージなど、標準的ではないApacheパッケージを使用している場合は、デフォルト設定をオーバーライドする必要があるかもしれません。
+インストールするApacheパッケージの名前。標準的ではないApacheパッケージを使用している場合は、デフォルト設定をオーバーライドする必要があるかもしれません。
+
+CentOS/RHELソフトウェアコレクション(SCL)では、`apache::version::scl_httpd_version`も使用できます。
 
 デフォルト値: [`apache::params`][]クラスにより設定されたユーザに依存します。これはオペレーティングシステムによって異なります。
 
@@ -3074,6 +3085,42 @@ Apacheデーモンを管理します。
 
 オペレーティングシステムに基づき、Apacheバージョンの自動検出を試みます。 
 
+##### Red Hat Software Collections (SCL)
+
+CentOS/RHELのSoftware Collectionsでは、新しいApacheおよびPHPに加え、他のパッケージも使用できます。
+
+`scl_httpd_version`が設定されている場合、Apache Httpdは[Software Collections](https://www.softwarecollections.org/en/)からインストールされます。
+
+`scl_httpd_version`が設定されている場合、PHPをインストールする予定がない場合でも`scl_php_version`を設定する必要があります。
+
+リポジトリはこのモジュールではまだ管理されていません。CentOSでは、`centos-release-scl-rh`パッケージをインストールすることでリポジトリを有効にできます。
+
+##### `scl_httpd_version`
+
+Red Hat Software Collections (SCL)を使用してインストールされるhttpdのバージョン。CentOSおよびRHELのコレクションでは、新しいApacheおよびPHPパッケージを使用できます。
+
+`scl_httpd_version`を設定すると、Apache httpdは[Software Collections](https://www.softwarecollections.org/en/)からインストールされます。
+
+`scl_httpd_version`を設定した場合、PHPをインストールする予定がない場合でも`scl_php_version`を設定する必要があります。
+
+SCLリポジトリはこのモジュールではまだ管理されていません。CentOSでは、`centos-release-scl-rh`パッケージをインストールすることでリポジトリを有効にできます。
+
+有効な値: インストールするhttpdのバージョンを指定する文字列。例えば、Apache 2.4の場合は'2.4'を指定します。
+
+デフォルト値: undef。
+
+##### `scl_php_version`
+
+Red Hat Software Collections (SCL)を使用してインストールするhttpdのバージョン。CentOSおよびRHELのコレクションでは、新しいApacheおよびPHPのパッケージを使用できます。
+
+`scl_php_version`を設定すると、PHPは[Software Collections](https://www.softwarecollections.org/en/)からインストールされます。
+
+SCLリポジトリはこのモジュールではまだ管理されていません。CentOSでは、`centos-release-scl-rh`パッケージをインストールすることでリポジトリを有効にできます。
+
+有効な値: インストールするPHPのバージョンを指定する文字列。例えば、PHP 7.1の場合は'7.1'を指定します。
+
+デフォルト値: undef。
+
 ### パブリック定義タイプ　
 
 #### 定義タイプ: `apache::balancer`
@@ -5610,7 +5657,8 @@ Apacheが読みこむhtpasswdファイルに適したフォーマットでパス
 
 現在はSHAハッシュを使用しています。これは、このフォーマットは安全ではないとされているものの、ほとんどのプラットフォームでサポートされているもっとも安全なフォーマットであるためです。
 
-## 制約
+<a id="limitations"></a>
+## 制約事項
 
  サポートされているオペレーティングシステムの一覧については、[metadata.json](https://github.com/puppetlabs/puppetlabs-apache/blob/master/metadata.json)を参照してください。
 
@@ -5693,6 +5741,7 @@ apache::vhost { 'test.server':
 ### Ubuntu 16.04
 [`apache::mod::suphp`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。
 
+<a id="development"></a> 
 ## 開発
 
 ### 貢献

From 444156f2d70ce954c6f81210eee9dcaa4d9b6c82 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 31 Jan 2019 11:20:15 +0200
Subject: [PATCH 1444/2267] pdksync_1.9.0-0-g7281db5

---
 .puppet-lint.rc     | 1 +
 metadata.json       | 6 +++---
 spec/spec_helper.rb | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index e69de29bb2..cc96ece051 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -0,0 +1 @@
+--relative
diff --git a/metadata.json b/metadata.json
index 6f1c4be953..2352d318ff 100644
--- a/metadata.json
+++ b/metadata.json
@@ -79,7 +79,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.7.1",
+  "pdk-version": "1.9.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates/",
-  "template-ref": "heads/master-0-g6814a87"
-}
+  "template-ref": "1.9.0-0-g7281db5"
+}
\ No newline at end of file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 35654b3d2c..0d5efc0be2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -32,6 +32,9 @@
     # by default Puppet runs at warning level
     Puppet.settings[:strict] = :warning
   end
+  c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
+  c.after(:suite) do
+  end
 end
 
 def ensure_module_defined(module_name)

From 1503035d788f9fdaa2bab9cdaabfb66e858c2c39 Mon Sep 17 00:00:00 2001
From: Johan Fleury <jfleury@arcaik.net>
Date: Sat, 2 Feb 2019 15:48:30 -0500
Subject: [PATCH 1445/2267] feat(mod::remoteip): use Puppet 4+ data type

---
 manifests/mod/remoteip.pp | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index 21ad57f3e0..51627210ac 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -1,9 +1,37 @@
+# @summary Setup and load Apache `mod_remoteip`
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_remoteip.html
+#
+# @param header
+#   The header field in which `mod_remoteip` will look for the useragent IP.
+#
+# @param proxy_ips
+#   A list of IP addresses, IP blocks or hostname that are trusted to set a
+#   valid value inside specified header. Unlike the `$trusted_proxy_ips`
+#   parameter, any IP address (including private addresses) presented by these
+#   proxies will trusted by `mod_remoteip`.
+#
+# @param proxies_header
+#   A header into which `mod_remoteip` will collect a list of all of the
+#   intermediate client IP addresses trusted to resolve the useragent IP of the
+#   request (e.g. `X-Forwarded-By`).
+#
+# @param trusted_proxy_ips
+#   A list of IP addresses, IP blocks or hostname that are trusted to set a
+#   valid value inside the specified header. Unlike the `$proxy_ips` parameter,
+#   any private IP presented by these proxies will be disgarded by
+#   `mod_remoteip`.
+#
+# @param apache_version
+#   A version string used to validate that your apache version supports
+#   `mod_remoteip`. If not specified, `$::apache::apache_version` is used.
+#
 class apache::mod::remoteip (
-  $header            = 'X-Forwarded-For',
-  $proxy_ips         = [ '127.0.0.1' ],
-  $proxies_header    = undef,
-  $trusted_proxy_ips = undef,
-  $apache_version    = undef,
+  String                        $header            = 'X-Forwarded-For',
+  Optional[Array[Stdlib::Host]] $proxy_ips         = [ '127.0.0.1' ],
+  Optional[String]              $proxies_header    = undef,
+  Optional[Array[Stdlib::Host]] $trusted_proxy_ips = undef,
+  Optional[String]              $apache_version    = undef,
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)

From 4e4bad04c8404325631a114d9c42f05924b05881 Mon Sep 17 00:00:00 2001
From: Johan Fleury <jfleury@arcaik.net>
Date: Sat, 2 Feb 2019 15:53:36 -0500
Subject: [PATCH 1446/2267] feat(mod::remoteip): deprecate $proxy_ips and
 $trusted_proxy_ips

Makes this class parameters closer to the Apache mod_remoteip
parameters.
---
 manifests/mod/remoteip.pp         | 30 +++++++++++++++++++++++++++---
 spec/classes/mod/remoteip_spec.rb | 28 +++++++++++++++++++++++++---
 templates/mod/remoteip.conf.erb   |  8 ++++----
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index 51627210ac..9548bf3b19 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -5,31 +5,39 @@
 # @param header
 #   The header field in which `mod_remoteip` will look for the useragent IP.
 #
-# @param proxy_ips
+# @param internal_proxy
 #   A list of IP addresses, IP blocks or hostname that are trusted to set a
 #   valid value inside specified header. Unlike the `$trusted_proxy_ips`
 #   parameter, any IP address (including private addresses) presented by these
 #   proxies will trusted by `mod_remoteip`.
 #
+# @param proxy_ips
+#   *Deprecated*: use `$internal_proxy` instead.
+#
 # @param proxies_header
 #   A header into which `mod_remoteip` will collect a list of all of the
 #   intermediate client IP addresses trusted to resolve the useragent IP of the
 #   request (e.g. `X-Forwarded-By`).
 #
-# @param trusted_proxy_ips
+# @param trusted_proxy
 #   A list of IP addresses, IP blocks or hostname that are trusted to set a
 #   valid value inside the specified header. Unlike the `$proxy_ips` parameter,
 #   any private IP presented by these proxies will be disgarded by
 #   `mod_remoteip`.
 #
+# @param trusted_proxy_ips
+#   *Deprecated*: use `$trusted_proxy` instead.
+#
 # @param apache_version
 #   A version string used to validate that your apache version supports
 #   `mod_remoteip`. If not specified, `$::apache::apache_version` is used.
 #
 class apache::mod::remoteip (
   String                        $header            = 'X-Forwarded-For',
-  Optional[Array[Stdlib::Host]] $proxy_ips         = [ '127.0.0.1' ],
+  Optional[Array[Stdlib::Host]] $internal_proxy    = undef,
+  Optional[Array[Stdlib::Host]] $proxy_ips         = undef,
   Optional[String]              $proxies_header    = undef,
+  Optional[Array[Stdlib::Host]] $trusted_proxy     = undef,
   Optional[Array[Stdlib::Host]] $trusted_proxy_ips = undef,
   Optional[String]              $apache_version    = undef,
 ) {
@@ -39,6 +47,22 @@
     fail('mod_remoteip is only available in Apache 2.4')
   }
 
+  if $proxy_ips {
+    deprecation('apache::mod::remoteip::proxy_ips', 'This parameter is deprecated, please use `internal_proxy`.')
+    $_internal_proxy = $proxy_ips
+  } elsif $internal_proxy {
+    $_internal_proxy = $internal_proxy
+  } else {
+    $_internal_proxy = ['127.0.0.1']
+  }
+
+  if $trusted_proxy_ips {
+    deprecation('apache::mod::remoteip::trusted_proxy_ips', 'This parameter is deprecated, please use `trusted_proxy`.')
+    $_trusted_proxy = $trusted_proxy_ips
+  } else {
+    $_trusted_proxy = $trusted_proxy
+  }
+
   ::apache::mod { 'remoteip': }
 
   # Template uses:
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index c4238f1244..379cffd79d 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -30,6 +30,14 @@
 
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPHeader X-Forwarded-For$}) }
     end
+    describe 'with internal_proxy => [ 10.42.17.8, 10.42.18.99 ]' do
+      let :params do
+        { internal_proxy: ['10.42.17.8', '10.42.18.99'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.17.8$}) }
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.18.99$}) }
+    end
     describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
@@ -38,14 +46,28 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.18.99$}) }
     end
+    describe 'with trusted_proxy => [ 10.42.17.8, 10.42.18.99 ]' do
+      let :params do
+        { trusted_proxy: ['10.42.17.8', '10.42.18.99'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.17.8$}) }
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.18.99$}) }
+    end
+    describe 'with trusted_proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
+      let :params do
+        { trusted_proxy: ['10.42.17.8', '10.42.18.99'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.17.8$}) }
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.18.99$}) }
+    end
     describe 'with Apache version < 2.4' do
       let :params do
         { apache_version: '2.2' }
       end
 
-      it 'fails' do
-        expect { catalogue }.to raise_error(Puppet::Error, %r{mod_remoteip is only available in Apache 2.4})
-      end
+      it { expect { catalogue }.to raise_error(Puppet::Error, %r{mod_remoteip is only available in Apache 2.4}) }
     end
   end
 end
diff --git a/templates/mod/remoteip.conf.erb b/templates/mod/remoteip.conf.erb
index e10ebb51c8..f5c1a36a77 100644
--- a/templates/mod/remoteip.conf.erb
+++ b/templates/mod/remoteip.conf.erb
@@ -1,10 +1,10 @@
 # Declare the header field which should be parsed for useragent IP addresses
 RemoteIPHeader <%= @header %>
 
-<%- if @proxy_ips -%>
+<%- if @_internal_proxy -%>
 # Declare client intranet IP addresses trusted to present
 # the RemoteIPHeader value
-<%-   [@proxy_ips].flatten.each do |proxy| -%>
+<%-   [@_internal_proxy].flatten.each do |proxy| -%>
 RemoteIPInternalProxy <%= proxy %>
 <%-   end -%>
 <%- end -%>
@@ -14,10 +14,10 @@ RemoteIPInternalProxy <%= proxy %>
 RemoteIPProxiesHeader <%= @proxies_header %>
 <%- end -%>
 
-<%- if @trusted_proxy_ips -%>
+<%- if @_trusted_proxy -%>
 # Declare client intranet IP addresses trusted to present
 # the RemoteIPHeader value
-  <%- [@trusted_proxy_ips].flatten.each do |proxy| -%>
+  <%- [@_trusted_proxy].flatten.each do |proxy| -%>
 RemoteIPTrustedProxy <%= proxy %>
   <%- end -%>
 <%- end -%>

From 6799d3354caf3652b3e79879114a6304dba4f2eb Mon Sep 17 00:00:00 2001
From: Johan Fleury <jfleury@arcaik.net>
Date: Sat, 2 Feb 2019 17:14:35 -0500
Subject: [PATCH 1447/2267] feat(mod::remoteip): use epp for template

---
 manifests/mod/remoteip.pp       | 14 ++++++++------
 templates/mod/remoteip.conf.epp | 29 +++++++++++++++++++++++++++++
 templates/mod/remoteip.conf.erb | 23 -----------------------
 3 files changed, 37 insertions(+), 29 deletions(-)
 create mode 100644 templates/mod/remoteip.conf.epp
 delete mode 100644 templates/mod/remoteip.conf.erb

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index 9548bf3b19..747f2e22d8 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -65,16 +65,18 @@
 
   ::apache::mod { 'remoteip': }
 
-  # Template uses:
-  # - $header
-  # - $proxy_ips
-  # - $proxies_header
-  # - $trusted_proxy_ips
+  $template_parameters = {
+    header                    => $header,
+    internal_proxy            => $_internal_proxy,
+    proxies_header            => $proxies_header,
+    trusted_proxy             => $_trusted_proxy,
+  }
+
   file { 'remoteip.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/remoteip.conf",
     mode    => $::apache::file_mode,
-    content => template('apache/mod/remoteip.conf.erb'),
+    content => epp('apache/mod/remoteip.conf.epp', $template_parameters),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/templates/mod/remoteip.conf.epp b/templates/mod/remoteip.conf.epp
new file mode 100644
index 0000000000..44e944cc2b
--- /dev/null
+++ b/templates/mod/remoteip.conf.epp
@@ -0,0 +1,29 @@
+<%- |
+  String                               $header,
+  Optional[Array[Stdlib::IP::Address]] $internal_proxy            = undef,
+  Optional[String]                     $proxies_header            = undef,
+  Optional[Array[Stdlib::IP::Address]] $trusted_proxy             = undef,
+| -%>
+# Declare the header field which should be parsed for useragent IP addresses
+RemoteIPHeader <%= $header %>
+
+<%- if $internal_proxy { -%>
+# Declare client intranet IP addresses trusted to present
+# the RemoteIPHeader value
+<%-   [$internal_proxy].flatten.each |$proxy| { -%>
+RemoteIPInternalProxy <%= $proxy %>
+<%-   } -%>
+<%- } -%>
+
+<%- if $proxies_header { -%>
+# Declare the header field which will record all intermediate IP addresses
+RemoteIPProxiesHeader <%= $proxies_header %>
+<%- } -%>
+
+<%- if $trusted_proxy { -%>
+# Declare client intranet IP addresses trusted to present
+# the RemoteIPHeader value
+  <%- [$trusted_proxy].flatten.each |$proxy| { -%>
+RemoteIPTrustedProxy <%= $proxy %>
+  <%- } -%>
+<%- } -%>
diff --git a/templates/mod/remoteip.conf.erb b/templates/mod/remoteip.conf.erb
deleted file mode 100644
index f5c1a36a77..0000000000
--- a/templates/mod/remoteip.conf.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Declare the header field which should be parsed for useragent IP addresses
-RemoteIPHeader <%= @header %>
-
-<%- if @_internal_proxy -%>
-# Declare client intranet IP addresses trusted to present
-# the RemoteIPHeader value
-<%-   [@_internal_proxy].flatten.each do |proxy| -%>
-RemoteIPInternalProxy <%= proxy %>
-<%-   end -%>
-<%- end -%>
-
-<%- if @proxies_header -%>
-# Declare the header field which will record all intermediate IP addresses
-RemoteIPProxiesHeader <%= @proxies_header %>
-<%- end -%>
-
-<%- if @_trusted_proxy -%>
-# Declare client intranet IP addresses trusted to present
-# the RemoteIPHeader value
-  <%- [@_trusted_proxy].flatten.each do |proxy| -%>
-RemoteIPTrustedProxy <%= proxy %>
-  <%- end -%>
-<%- end -%>

From f496e8eb12610a139c95de117e2089b323cf8e56 Mon Sep 17 00:00:00 2001
From: Johan Fleury <jfleury@arcaik.net>
Date: Sat, 2 Feb 2019 17:14:55 -0500
Subject: [PATCH 1448/2267] feat(mod::remoteip): manage all parameters
 supported by Apache

---
 manifests/mod/remoteip.pp       | 41 +++++++++++++++++++++++++++------
 templates/mod/remoteip.conf.epp | 22 ++++++++++++++++++
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index 747f2e22d8..e0e6dedac5 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -14,11 +14,24 @@
 # @param proxy_ips
 #   *Deprecated*: use `$internal_proxy` instead.
 #
+# @param internal_proxy_list
+#   The path to a file containing a list of IP addresses, IP blocks or hostname
+#   that are trusted to set a valid value inside the specified header. See
+#   `$internal_proxy` for details.
+#
 # @param proxies_header
 #   A header into which `mod_remoteip` will collect a list of all of the
 #   intermediate client IP addresses trusted to resolve the useragent IP of the
 #   request (e.g. `X-Forwarded-By`).
 #
+# @param proxy_protocol
+#   Wether or not to enable the PROXY protocol header handling. If enabled
+#   upstream clients must set the header every time they open a connection.
+#
+# @param proxy_protocol_exceptions
+#   A list of IP address or IP blocks that are not required to use the PROXY
+#   protocol.
+#
 # @param trusted_proxy
 #   A list of IP addresses, IP blocks or hostname that are trusted to set a
 #   valid value inside the specified header. Unlike the `$proxy_ips` parameter,
@@ -28,20 +41,30 @@
 # @param trusted_proxy_ips
 #   *Deprecated*: use `$trusted_proxy` instead.
 #
+# @param trusted_proxy_list
+#   The path to a file containing a list of IP addresses, IP blocks or hostname
+#   that are trusted to set a valid value inside the specified header. See
+#   `$trusted_proxy` for details.
+#
 # @param apache_version
 #   A version string used to validate that your apache version supports
 #   `mod_remoteip`. If not specified, `$::apache::apache_version` is used.
 #
 class apache::mod::remoteip (
-  String                        $header            = 'X-Forwarded-For',
-  Optional[Array[Stdlib::Host]] $internal_proxy    = undef,
-  Optional[Array[Stdlib::Host]] $proxy_ips         = undef,
-  Optional[String]              $proxies_header    = undef,
-  Optional[Array[Stdlib::Host]] $trusted_proxy     = undef,
-  Optional[Array[Stdlib::Host]] $trusted_proxy_ips = undef,
-  Optional[String]              $apache_version    = undef,
+  String                         $header                    = 'X-Forwarded-For',
+  Optional[Array[Stdlib::Host]]  $internal_proxy            = undef,
+  Optional[Array[Stdlib::Host]]  $proxy_ips                 = undef,
+  Optional[Stdlib::Absolutepath] $internal_proxy_list       = undef,
+  Optional[String]               $proxies_header            = undef,
+  Boolean                        $proxy_protocol            = false,
+  Optional[Array[Stdlib::Host]]  $proxy_protocol_exceptions = undef,
+  Optional[Array[Stdlib::Host]]  $trusted_proxy             = undef,
+  Optional[Array[Stdlib::Host]]  $trusted_proxy_ips         = undef,
+  Optional[Stdlib::Absolutepath] $trusted_proxy_list        = undef,
+  Optional[String]               $apache_version            = undef,
 ) {
   include ::apache
+
   $_apache_version = pick($apache_version, $apache::apache_version)
   if versioncmp($_apache_version, '2.4') < 0 {
     fail('mod_remoteip is only available in Apache 2.4')
@@ -68,8 +91,12 @@
   $template_parameters = {
     header                    => $header,
     internal_proxy            => $_internal_proxy,
+    internal_proxy_list       => $internal_proxy_list,
     proxies_header            => $proxies_header,
+    proxy_protocol            => $proxy_protocol,
+    proxy_protocol_exceptions => $proxy_protocol_exceptions,
     trusted_proxy             => $_trusted_proxy,
+    trusted_proxy_list        => $trusted_proxy_list,
   }
 
   file { 'remoteip.conf':
diff --git a/templates/mod/remoteip.conf.epp b/templates/mod/remoteip.conf.epp
index 44e944cc2b..8211511c67 100644
--- a/templates/mod/remoteip.conf.epp
+++ b/templates/mod/remoteip.conf.epp
@@ -1,8 +1,12 @@
 <%- |
   String                               $header,
   Optional[Array[Stdlib::IP::Address]] $internal_proxy            = undef,
+  Optional[Stdlib::Absolutepath]       $internal_proxy_list       = undef,
   Optional[String]                     $proxies_header            = undef,
+  Boolean                              $proxy_protocol            = undef,
+  Optional[Array[Stdlib::IP::Address]] $proxy_protocol_exceptions = undef,
   Optional[Array[Stdlib::IP::Address]] $trusted_proxy             = undef,
+  Optional[Stdlib::Absolutepath]       $trusted_proxy_list        = undef,
 | -%>
 # Declare the header field which should be parsed for useragent IP addresses
 RemoteIPHeader <%= $header %>
@@ -15,11 +19,25 @@ RemoteIPInternalProxy <%= $proxy %>
 <%-   } -%>
 <%- } -%>
 
+<%- if $internal_proxy_list { -%>
+RemoteIPInternalProxyList <%= $internal_proxy_list %>
+<%- } -%>
+
 <%- if $proxies_header { -%>
 # Declare the header field which will record all intermediate IP addresses
 RemoteIPProxiesHeader <%= $proxies_header %>
 <%- } -%>
 
+<%- if $proxy_protocol { -%>
+RemoteIPProxyProtocol On
+<%- } -%>
+
+<%- if $proxy_protocol_exceptions { -%>
+<%-   [$proxy_protocol_exceptions].flatten.each |$exception| { -%>
+RemoteIPProxyProtocolExceptions <%= $exception %>
+<%-   } -%>
+<%- } -%>
+
 <%- if $trusted_proxy { -%>
 # Declare client intranet IP addresses trusted to present
 # the RemoteIPHeader value
@@ -27,3 +45,7 @@ RemoteIPProxiesHeader <%= $proxies_header %>
 RemoteIPTrustedProxy <%= $proxy %>
   <%- } -%>
 <%- } -%>
+
+<%- if $trusted_proxy_list { -%>
+RemoteIPTrustedProxyList <%= $trusted_proxy_list %>
+<%- } -%>

From 074596be6709a2aff2cdc3d1c0b28826eca567ae Mon Sep 17 00:00:00 2001
From: Christian Kelinski <c.kelinski@emetriq.com>
Date: Tue, 13 Nov 2018 17:05:44 +0100
Subject: [PATCH 1449/2267] Added WSGI Options WSGIApplicationGroup and
 WSGIPythonOptimize

---
 README.md                     | 18 ++++++++++++++++--
 manifests/mod/wsgi.pp         |  2 ++
 spec/classes/mod/wsgi_spec.rb |  7 +++++++
 templates/mod/wsgi.conf.erb   |  6 ++++++
 templates/vhost/_wsgi.erb     |  2 +-
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 32e48e274a..e82a6fc987 100755
--- a/README.md
+++ b/README.md
@@ -278,6 +278,8 @@
 [`WSGIRestrictEmbedded`]: http://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIRestrictEmbedded.html
 [`WSGIPythonPath`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonPath.html
 [`WSGIPythonHome`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonHome.html
+[`WSGIApplicationGroup`]: https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIApplicationGroup.html
+[`WSGIPythonOptimize`]: https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIPythonOptimize.html
 
 #### Table of Contents
 
@@ -3046,9 +3048,21 @@ Enables Python support via [`mod_wsgi`][].
 
 * `wsgi_restrict_embedded`: Defines the [`WSGIRestrictEmbedded`][] directive, such as 'On'.
 
-Values: On|Off|undef.
+  Values: On|Off|undef.
 
-Default: undef.
+  Default: undef.
+
+* `wsgi_application_group`: Defines the [`WSGIApplicationGroup`][] directive, such as "%{GLOBAL}".
+
+  Values: A string specifying a wsgi application.
+
+  Default: `undef`.
+
+* `wsgi_python_optimize`: Defines the [`WSGIPythonOptimize`][] directive, such as 1.
+
+  Values: A integer specifying the level of Python compiler optimisations.
+
+  Default: `undef`.
 
 * `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE\_RUN\_DIR}WSGI".
 
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 6f9d4379a7..38e7a86d56 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -3,6 +3,8 @@
   $wsgi_socket_prefix     = $::apache::params::wsgi_socket_prefix,
   $wsgi_python_path       = undef,
   $wsgi_python_home       = undef,
+  $wsgi_python_optimize   = undef,
+  $wsgi_application_group = undef,
   $package_name           = undef,
   $mod_path               = undef,
 ) inherits ::apache::params {
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 664c0b7544..3f228f54be 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -66,6 +66,13 @@
 
       it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIPythonHome "\/path\/to\/virtenv"$}) }
     end
+    describe 'with custom WSGIApplicationGroup' do
+      let :params do
+        { wsgi_python_home: '%{GLOBAL}' }
+      end
+
+      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIApplicationGroup "%{GLOBAL}"$}) }
+    end
     describe 'with custom package_name and mod_path' do
       let :params do
         {
diff --git a/templates/mod/wsgi.conf.erb b/templates/mod/wsgi.conf.erb
index 084a4fc53a..490f8b616c 100644
--- a/templates/mod/wsgi.conf.erb
+++ b/templates/mod/wsgi.conf.erb
@@ -13,4 +13,10 @@
   <%- if @wsgi_python_path -%>
   WSGIPythonPath "<%= @wsgi_python_path %>"
   <%- end -%>
+  <%- if @wsgi_application_group -%>
+  WSGIApplicationGroup "<%= @wsgi_application_group %>"
+  <%- end -%>
+  <%- if @wsgi_python_optimize -%>
+  WSGIPythonOptimize <%= @wsgi_python_optimize %>
+  <%- end -%>
 </IfModule>
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index 6632a9b8bd..b3417705a5 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -25,7 +25,7 @@
       <%- if @wsgi_script_aliases[key].is_a? Array -%>
   WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key].join(' ') %>
       <%- else -%>
-  WSGIScriptAlias <%= key %> "<%= @wsgi_script_aliases[key] %>"
+  WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key] %>
       <%- end -%>
     <%- end -%>
   <%- end -%>

From 76393aa050c20dffd2c5cdbbf41048786e9cbb8e Mon Sep 17 00:00:00 2001
From: Christian Kelinski <c.kelinski@emetriq.com>
Date: Wed, 14 Nov 2018 10:27:10 +0100
Subject: [PATCH 1450/2267] Added a test for WSGIPythonOptimize

---
 spec/classes/mod/wsgi_spec.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 3f228f54be..f7c94a52e3 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -68,11 +68,18 @@
     end
     describe 'with custom WSGIApplicationGroup' do
       let :params do
-        { wsgi_python_home: '%{GLOBAL}' }
+        { wsgi_application_group: '%{GLOBAL}' }
       end
 
       it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIApplicationGroup "%{GLOBAL}"$}) }
     end
+    describe 'with custom WSGIPythonOptimize' do
+      let :params do
+        { wsgi_python_optimize: 1 }
+      end
+
+      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIPythonOptimize 1$}) }
+    end
     describe 'with custom package_name and mod_path' do
       let :params do
         {

From 7cfbec2d1a72016edb7854777cb7a5a8b286df16 Mon Sep 17 00:00:00 2001
From: Christian Kelinski <c.kelinski@emetriq.com>
Date: Wed, 14 Nov 2018 10:49:48 +0100
Subject: [PATCH 1451/2267] Added a small header at the beginning of the
 vhost-wsgi configuration block

---
 templates/vhost/_wsgi.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index b3417705a5..4f1f422a64 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -1,3 +1,7 @@
+<% if @wsgi_application_group or @wsgi_daemon_process or @wsgi_import_script or @wsgi_process_group -%>
+
+  ## WSGI configuration
+<% end -%>
 <% if @wsgi_application_group -%>
   WSGIApplicationGroup <%= @wsgi_application_group %>
 <% end -%>

From dfa741fb69b5934d5d16c330d95e911b4eda2438 Mon Sep 17 00:00:00 2001
From: Christian Kelinski <c.kelinski@emetriq.com>
Date: Wed, 14 Nov 2018 11:19:12 +0100
Subject: [PATCH 1452/2267] Added quotes

---
 templates/vhost/_wsgi.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index 4f1f422a64..72d40ff59c 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -29,7 +29,7 @@
       <%- if @wsgi_script_aliases[key].is_a? Array -%>
   WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key].join(' ') %>
       <%- else -%>
-  WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key] %>
+  WSGIScriptAlias <%= key %> "<%= @wsgi_script_aliases[key] %>"
       <%- end -%>
     <%- end -%>
   <%- end -%>

From 8038c631e47bbb2ffc9a2fc6751448cc813ea077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Wed, 6 Feb 2019 11:08:48 -1000
Subject: [PATCH 1453/2267] Typo: add missing comma in example snippet

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e82a6fc987..12eb3e8205 100755
--- a/README.md
+++ b/README.md
@@ -3381,7 +3381,7 @@ For the custom fragment's `order` parameter, the `apache::vhost` defined type us
 
 ```
 class { 'apache':
-  default_vhost     => false
+  default_vhost     => false,
   default_ssl_vhost => false,
 }
 ```

From 8bb7a71a69db91d4cab6d32744411cacd56c775c Mon Sep 17 00:00:00 2001
From: Thodoris Sotiropoulos <theosotr@aueb.gr>
Date: Thu, 14 Feb 2019 15:00:05 +0200
Subject: [PATCH 1454/2267] Logging: prevent Apache from missing log events

This commit fixes a problematic situation regarding logging.
Specifically, when Apache service starts up, it opens log files (e.g.,
`/var/log/apache2/access.log`). While Apache service is up, those files
remain open for efficiency.

Consider this scenario: If the log directory (i.e, `/var/log/apache2`)
misses from the host, applying the catalog creates the directory again.
The issue is that the service is unaffected. Specifically, the Apache
server still handles a file descriptor that corresponds to the original
log file (`/var/log/apache2/access.log`), i.e., the open file descriptor
points to the inode which the initial log file was pointing to.

When we remove a file, which is open, the underlying system call
(`unlink()`) does not affect the file descriptors of the file.
In other words, any open file descriptor still refers to the inode of
the removed file. However, the inode becomes *orphaned*; thus it becomes
non-accessible.

Therefore, in the case of a missing notifier, the log history of the
upcoming events is *lost* because the service writes to an orphaned inode.

To fix that issue, the log file should notify the service so that
Apache opens the freshly-created log file. This prevents any upcoming
log events from getting lost.
---
 manifests/vhost.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d607be1d93..0d7a057af8 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -304,6 +304,7 @@
       mode    => $logroot_mode,
       require => Package['httpd'],
       before  => Concat["${priority_real}${filename}.conf"],
+      notify  => Class['Apache::Service'],
     }
   }
 

From 337ed4032ebe7364f80ba01334b79b13ed55bb97 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Wed, 20 Feb 2019 11:40:49 +0200
Subject: [PATCH 1455/2267] (maint) - Removing dead link

Running Tests section no longer exists therefore this is a dead link that goes nowhere. Removing to clean this up.
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 12eb3e8205..44c52f4d18 100755
--- a/README.md
+++ b/README.md
@@ -301,8 +301,7 @@
 5. [Limitations - OS compatibility, etc.][Limitations]
 6. [Development - Guide for contributing to the module][Development]
     - [Contributing to the apache module][Contributing]
-    - [Running tests - A quick guide][Running tests]
-
+    
 <a id="module-description"></a>
 ## Module description
 

From 1b6f592d52e784f495e0be90e8488695cc544248 Mon Sep 17 00:00:00 2001
From: Helen <helen@puppetlabs.com>
Date: Thu, 21 Feb 2019 14:00:49 +0200
Subject: [PATCH 1456/2267] Fix indentation missed during merge

---
 manifests/mod/php.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 0122209fe5..28f6404226 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -58,8 +58,8 @@
   if $apache::version::scl_httpd_version {
     $_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
   } else {
-  # Controls php version and libphp prefix
-  $_lib = "${libphp_prefix}${php_version}.so"
+    # Controls php version and libphp prefix
+    $_lib = "${libphp_prefix}${php_version}.so"
   }
 
   if $::operatingsystem == 'SLES' {

From b2753cf9670c3d7dd23c72096999608a950c6a3b Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppet.com>
Date: Tue, 26 Feb 2019 15:59:21 +0000
Subject: [PATCH 1457/2267] Update README to include new param for mod::php

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 44c52f4d18..5998c1c642 100755
--- a/README.md
+++ b/README.md
@@ -2729,6 +2729,7 @@ Default values for these parameters depend on your operating system. Most of thi
 * `source`: Defines the path to the default configuration. Values include a `puppet:///` path.
 * `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
 * `content`: Adds arbitrary content to `php.conf`.
+* `libphp_prefix`: Allows the definition of a libphp prefix. Defaults to `libphp`.
 
 ##### Class: `apache::mod::proxy_html`
 

From d30da9e4cf851fc95e779924723d2f558d036ead Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@puppet.com>
Date: Thu, 7 Mar 2019 12:43:23 +0000
Subject: [PATCH 1458/2267] (MODULES-8728) Remove .project from .gitignore

---
 .gitignore          | 2 ++
 .pdkignore          | 2 ++
 .puppet-lint.rc     | 1 -
 .sync.yml           | 4 ++++
 Rakefile            | 2 +-
 metadata.json       | 6 +++---
 spec/spec_helper.rb | 2 +-
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 650022e58e..88cf7a6c6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.vscode/
+.envrc
diff --git a/.pdkignore b/.pdkignore
index b713b3b1f7..2ec773abe2 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -22,6 +22,8 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.vscode/
+.envrc
 /appveyor.yml
 /.fixtures.yml
 /Gemfile
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index cc96ece051..e69de29bb2 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1 +0,0 @@
---relative
diff --git a/.sync.yml b/.sync.yml
index b189508aed..bfeeb145a3 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,4 +1,8 @@
 ---
+.gitignore:
+  required:
+    - ---.project
+
 .travis.yml:
   global_env:
     - PARALLEL_TEST_PROCESSORS=16  
diff --git a/Rakefile b/Rakefile
index 2d60dbbda6..a1d0de1226 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,7 +23,7 @@ end
 
 def changelog_future_release
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = JSON.load(File.read('metadata.json'))['version']
+  returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
   raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
   puts "GitHubChangelogGenerator future_release:#{returnVal}"
   returnVal
diff --git a/metadata.json b/metadata.json
index 2352d318ff..065de8911c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -79,7 +79,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.9.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates/",
-  "template-ref": "1.9.0-0-g7281db5"
+  "pdk-version": "1.8.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates",
+  "template-ref": "heads/master-0-gfde5699"
 }
\ No newline at end of file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0d5efc0be2..93b25ecbde 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -19,7 +19,7 @@
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f)))
+    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
   rescue => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end

From 545341de663bc1126051e341f418c3c8e0dff6c3 Mon Sep 17 00:00:00 2001
From: Ketan Patel <patelkr@ornl.gov>
Date: Thu, 31 Jan 2019 16:34:23 -0500
Subject: [PATCH 1459/2267] MODULES-8541 : Allow HostnameLookups to be modified

---
 README.md                                 |   7 +
 manifests/init.pp                         | 163 +++++++++++-----------
 manifests/params.pp                       |   3 +
 spec/acceptance/apache_parameters_spec.rb |  38 +++++
 spec/classes/apache_spec.rb               |  35 +++++
 spec/defines/vhost_spec.rb                |   1 -
 templates/httpd.conf.erb                  |   2 +-
 7 files changed, 166 insertions(+), 83 deletions(-)

diff --git a/README.md b/README.md
index 32e48e274a..59d8e7dea0 100755
--- a/README.md
+++ b/README.md
@@ -1125,6 +1125,13 @@ Limits the number of requests allowed per connection when the [`keepalive` param
 
 Default: '100'.
 
+##### `hostname_lookups`
+
+This directive enables DNS lookups so that host names can be logged (and passed to CGIs/SSIs in REMOTE_HOST). Values:'On','Off','Double'.
+
+Default: 'Off'.
+> **Note**: If enabled, it impacts performance significantly.
+
 ##### `lib_path`
 
 Specifies the location where [Apache module][Apache modules] files are stored.
diff --git a/manifests/init.pp b/manifests/init.pp
index ef6fd8738f..5c0ec647e2 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,88 +13,89 @@
 # Sample Usage:
 #
 class apache (
-  $apache_name                                                   = $::apache::params::apache_name,
-  $service_name                                                  = $::apache::params::service_name,
-  $default_mods                                                  = true,
-  Boolean $default_vhost                                         = true,
-  $default_charset                                               = undef,
-  Boolean $default_confd_files                                   = true,
-  Boolean $default_ssl_vhost                                     = false,
-  $default_ssl_cert                                              = $::apache::params::default_ssl_cert,
-  $default_ssl_key                                               = $::apache::params::default_ssl_key,
-  $default_ssl_chain                                             = undef,
-  $default_ssl_ca                                                = undef,
-  $default_ssl_crl_path                                          = undef,
-  $default_ssl_crl                                               = undef,
-  $default_ssl_crl_check                                         = undef,
-  $default_type                                                  = 'none',
-  $dev_packages                                                  = $::apache::params::dev_packages,
-  $ip                                                            = undef,
-  Boolean $service_enable                                        = true,
-  Boolean $service_manage                                        = true,
-  $service_ensure                                                = 'running',
-  $service_restart                                               = undef,
-  $purge_configs                                                 = true,
-  $purge_vhost_dir                                               = undef,
-  $purge_vdir                                                    = false,
-  $serveradmin                                                   = 'root@localhost',
-  Enum['On', 'Off', 'on', 'off'] $sendfile                       = 'On',
-  $error_documents                                               = false,
-  $timeout                                                       = '60',
-  $httpd_dir                                                     = $::apache::params::httpd_dir,
-  $server_root                                                   = $::apache::params::server_root,
-  $conf_dir                                                      = $::apache::params::conf_dir,
-  $confd_dir                                                     = $::apache::params::confd_dir,
-  $conf_enabled                                                  = $::apache::params::conf_enabled,
-  $vhost_dir                                                     = $::apache::params::vhost_dir,
-  $vhost_enable_dir                                              = $::apache::params::vhost_enable_dir,
-  $mod_libs                                                      = $::apache::params::mod_libs,
-  $mod_packages                                                  = $::apache::params::mod_packages,
-  $vhost_include_pattern                                         = $::apache::params::vhost_include_pattern,
-  $mod_dir                                                       = $::apache::params::mod_dir,
-  $mod_enable_dir                                                = $::apache::params::mod_enable_dir,
-  $mpm_module                                                    = $::apache::params::mpm_module,
-  $lib_path                                                      = $::apache::params::lib_path,
-  $conf_template                                                 = $::apache::params::conf_template,
-  $servername                                                    = $::apache::params::servername,
-  $pidfile                                                       = $::apache::params::pidfile,
-  Optional[Stdlib::Absolutepath] $rewrite_lock                   = undef,
-  Boolean $manage_user                                           = true,
-  Boolean $manage_group                                          = true,
-  $user                                                          = $::apache::params::user,
-  $group                                                         = $::apache::params::group,
-  $http_protocol_options                                         = $::apache::params::http_protocol_options,
-  $supplementary_groups                                          = [],
-  $keepalive                                                     = $::apache::params::keepalive,
-  $keepalive_timeout                                             = $::apache::params::keepalive_timeout,
-  $max_keepalive_requests                                        = $::apache::params::max_keepalive_requests,
-  $limitreqfieldsize                                             = '8190',
-  $limitreqfields                                                = '100',
-  $logroot                                                       = $::apache::params::logroot,
-  $logroot_mode                                                  = $::apache::params::logroot_mode,
-  $log_level                                                     = $::apache::params::log_level,
-  $log_formats                                                   = {},
-  $ssl_file                                                      = undef,
-  $ports_file                                                    = $::apache::params::ports_file,
-  $docroot                                                       = $::apache::params::docroot,
-  $apache_version                                                = $::apache::version::default,
-  $server_tokens                                                 = 'Prod',
-  $server_signature                                              = 'On',
-  $trace_enable                                                  = 'On',
-  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef,
-  $file_e_tag                                                    = undef,
+  $apache_name                                                          = $::apache::params::apache_name,
+  $service_name                                                         = $::apache::params::service_name,
+  $default_mods                                                         = true,
+  Boolean $default_vhost                                                = true,
+  $default_charset                                                      = undef,
+  Boolean $default_confd_files                                          = true,
+  Boolean $default_ssl_vhost                                            = false,
+  $default_ssl_cert                                                     = $::apache::params::default_ssl_cert,
+  $default_ssl_key                                                      = $::apache::params::default_ssl_key,
+  $default_ssl_chain                                                    = undef,
+  $default_ssl_ca                                                       = undef,
+  $default_ssl_crl_path                                                 = undef,
+  $default_ssl_crl                                                      = undef,
+  $default_ssl_crl_check                                                = undef,
+  $default_type                                                         = 'none',
+  $dev_packages                                                         = $::apache::params::dev_packages,
+  $ip                                                                   = undef,
+  Boolean $service_enable                                               = true,
+  Boolean $service_manage                                               = true,
+  $service_ensure                                                       = 'running',
+  $service_restart                                                      = undef,
+  $purge_configs                                                        = true,
+  $purge_vhost_dir                                                      = undef,
+  $purge_vdir                                                           = false,
+  $serveradmin                                                          = 'root@localhost',
+  Enum['On', 'Off', 'on', 'off'] $sendfile                              = 'On',
+  $error_documents                                                      = false,
+  $timeout                                                              = '60',
+  $httpd_dir                                                            = $::apache::params::httpd_dir,
+  $server_root                                                          = $::apache::params::server_root,
+  $conf_dir                                                             = $::apache::params::conf_dir,
+  $confd_dir                                                            = $::apache::params::confd_dir,
+  Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups  = $::apache::params::hostname_lookups,
+  $conf_enabled                                                         = $::apache::params::conf_enabled,
+  $vhost_dir                                                            = $::apache::params::vhost_dir,
+  $vhost_enable_dir                                                     = $::apache::params::vhost_enable_dir,
+  $mod_libs                                                             = $::apache::params::mod_libs,
+  $mod_packages                                                         = $::apache::params::mod_packages,
+  $vhost_include_pattern                                                = $::apache::params::vhost_include_pattern,
+  $mod_dir                                                              = $::apache::params::mod_dir,
+  $mod_enable_dir                                                       = $::apache::params::mod_enable_dir,
+  $mpm_module                                                           = $::apache::params::mpm_module,
+  $lib_path                                                             = $::apache::params::lib_path,
+  $conf_template                                                        = $::apache::params::conf_template,
+  $servername                                                           = $::apache::params::servername,
+  $pidfile                                                              = $::apache::params::pidfile,
+  Optional[Stdlib::Absolutepath] $rewrite_lock                          = undef,
+  Boolean $manage_user                                                  = true,
+  Boolean $manage_group                                                 = true,
+  $user                                                                 = $::apache::params::user,
+  $group                                                                = $::apache::params::group,
+  $http_protocol_options                                                = $::apache::params::http_protocol_options,
+  $supplementary_groups                                                 = [],
+  $keepalive                                                            = $::apache::params::keepalive,
+  $keepalive_timeout                                                    = $::apache::params::keepalive_timeout,
+  $max_keepalive_requests                                               = $::apache::params::max_keepalive_requests,
+  $limitreqfieldsize                                                    = '8190',
+  $limitreqfields                                                       = '100',
+  $logroot                                                              = $::apache::params::logroot,
+  $logroot_mode                                                         = $::apache::params::logroot_mode,
+  $log_level                                                            = $::apache::params::log_level,
+  $log_formats                                                          = {},
+  $ssl_file                                                             = undef,
+  $ports_file                                                           = $::apache::params::ports_file,
+  $docroot                                                              = $::apache::params::docroot,
+  $apache_version                                                       = $::apache::version::default,
+  $server_tokens                                                        = 'Prod',
+  $server_signature                                                     = 'On',
+  $trace_enable                                                         = 'On',
+  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes        = undef,
+  $file_e_tag                                                           = undef,
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]
-    $use_canonical_name                                          = undef,
-  $package_ensure                                                = 'installed',
-  Boolean $use_optional_includes                                 = $::apache::params::use_optional_includes,
-  $use_systemd                                                   = $::apache::params::use_systemd,
-  $mime_types_additional                                         = $::apache::params::mime_types_additional,
-  $file_mode                                                     = $::apache::params::file_mode,
-  $root_directory_options                                        = $::apache::params::root_directory_options,
-  Boolean $root_directory_secured                                = false,
-  $error_log                                                     = $::apache::params::error_log,
-  $scriptalias                                                   = $::apache::params::scriptalias,
-  $access_log_file                                               = $::apache::params::access_log_file,
+    $use_canonical_name                                                 = undef,
+  $package_ensure                                                       = 'installed',
+  Boolean $use_optional_includes                                        = $::apache::params::use_optional_includes,
+  $use_systemd                                                          = $::apache::params::use_systemd,
+  $mime_types_additional                                                = $::apache::params::mime_types_additional,
+  $file_mode                                                            = $::apache::params::file_mode,
+  $root_directory_options                                               = $::apache::params::root_directory_options,
+  Boolean $root_directory_secured                                       = false,
+  $error_log                                                            = $::apache::params::error_log,
+  $scriptalias                                                          = $::apache::params::scriptalias,
+  $access_log_file                                                      = $::apache::params::access_log_file,
 ) inherits ::apache::params {
 
   $valid_mpms_re = $apache_version ? {
diff --git a/manifests/params.pp b/manifests/params.pp
index 5365f533e4..2fa9980046 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -42,6 +42,9 @@
   # Default mode for files
   $file_mode = '0644'
 
+  # The default value for host hame lookup
+  $hostname_lookups = 'Off'
+
   # Default options for / directory
   $root_directory_options = ['FollowSymLinks']
 
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index ceec65fdb4..6f615ecb1b 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -529,6 +529,44 @@ class { 'apache':
     end
   end
 
+  describe 'hostname_lookups' do
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': hostname_lookups => 'On' }"
+        apply_manifest(pp, catch_failures: true)
+      end
+    end
+
+    describe file($conf_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'HostnameLookups On' }
+    end
+
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': hostname_lookups => 'Off' }"
+        apply_manifest(pp, catch_failures: true)
+      end
+    end
+
+    describe file($conf_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'HostnameLookups Off' }
+    end
+
+    describe 'setup' do
+      it 'applies cleanly' do
+        pp = "class { 'apache': hostname_lookups => 'Double' }"
+        apply_manifest(pp, catch_failures: true)
+      end
+    end
+
+    describe file($conf_file) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'HostnameLookups Double' }
+    end
+  end
+
   describe 'trace_enable' do
     pp = <<-MANIFEST
         class { 'apache':
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index ebac58cbfa..ad4f8dcc62 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -438,6 +438,7 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^AllowEncodedSlashes nodecode$} }
     end
+
     describe 'Alternate confd/mod/vhosts directory when specifying default character set' do
       let :params do
         {
@@ -628,6 +629,40 @@
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^EnableSendfile Off\n} }
     end
 
+    describe 'hostname lookup with invalid value' do
+      let :params do
+        { hostname_lookups: 'foo' }
+      end
+
+      it 'fails' do
+        expect {
+          catalogue
+        }.to raise_error(Puppet::Error, %r{Evaluation Error})
+      end
+    end
+    describe 'hostname_lookups On' do
+      let :params do
+        { hostname_lookups: 'On' }
+      end
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^HostnameLookups On\n} }
+    end
+    describe 'hostname_lookups Off' do
+      let :params do
+        { hostname_lookups: 'Off' }
+      end
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^HostnameLookups Off\n} }
+    end
+
+    describe 'hostname_lookups Double' do
+      let :params do
+        { hostname_lookups: 'Double' }
+      end
+
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^HostnameLookups Double\n} }
+    end
+
     context 'on Fedora 21' do
       let :facts do
         super().merge(operatingsystem: 'Fedora',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f301864048..fd81aa123a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -85,7 +85,6 @@
               'ssl_proxyengine'             => true,
               'ssl_proxy_cipher_suite'      => 'HIGH',
               'ssl_proxy_protocol'          => 'TLSv1.2',
-
               'priority'                    => '30',
               'default_vhost'               => true,
               'servername'                  => 'example.com',
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index a0fa6a71d9..4d0df57b69 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -55,7 +55,7 @@ AddDefaultCharset <%= @default_charset %>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) < 0 -%>
 DefaultType <%= @default_type %>
 <%- end -%>
-HostnameLookups Off
+HostnameLookups <%= @hostname_lookups %>
 <%- if /^[|\/]/.match(@error_log) || /^syslog:/.match(@error_log) -%>
 ErrorLog "<%= @error_log %>"
 <%- else -%>

From 7a33327f7b649f6dfa48aedd972036bfa23a399b Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio <jaosorior@gmail.com>
Date: Fri, 8 Mar 2019 19:50:00 +0200
Subject: [PATCH 1460/2267] (MODULES-8731) Allow CIDRs for
 proxy_ips/internal_proxy in remoteip (#1891)

* (MODULES-8731) Allow CIDRs for proxy_ips/internal_proxy in remoteip
The recent addition of data types for this module [1] introduced an
issue, where CIDRs are no longer allowed. This allows those sort of
values.
[1] https://github.com/puppetlabs/puppetlabs-apache/commit/1503035d788f9fdaa2bab9cdaabfb66e858c2c39#diff-c2ea3c67760696a0d67bab9fb81757c6
* Make internal_proxy data type in template match module
The template and module data types for the internal_proxy parameter
didn't match. This makes it so.
---
 manifests/mod/remoteip.pp         | 22 +++++++++++-----------
 spec/classes/mod/remoteip_spec.rb | 28 ++++++++++++++++++++++++++++
 templates/mod/remoteip.conf.epp   | 16 ++++++++--------
 3 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index e0e6dedac5..d628819376 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -51,17 +51,17 @@
 #   `mod_remoteip`. If not specified, `$::apache::apache_version` is used.
 #
 class apache::mod::remoteip (
-  String                         $header                    = 'X-Forwarded-For',
-  Optional[Array[Stdlib::Host]]  $internal_proxy            = undef,
-  Optional[Array[Stdlib::Host]]  $proxy_ips                 = undef,
-  Optional[Stdlib::Absolutepath] $internal_proxy_list       = undef,
-  Optional[String]               $proxies_header            = undef,
-  Boolean                        $proxy_protocol            = false,
-  Optional[Array[Stdlib::Host]]  $proxy_protocol_exceptions = undef,
-  Optional[Array[Stdlib::Host]]  $trusted_proxy             = undef,
-  Optional[Array[Stdlib::Host]]  $trusted_proxy_ips         = undef,
-  Optional[Stdlib::Absolutepath] $trusted_proxy_list        = undef,
-  Optional[String]               $apache_version            = undef,
+  String                                                     $header                    = 'X-Forwarded-For',
+  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $internal_proxy            = undef,
+  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $proxy_ips                 = undef,
+  Optional[Stdlib::Absolutepath]                             $internal_proxy_list       = undef,
+  Optional[String]                                           $proxies_header            = undef,
+  Boolean                                                    $proxy_protocol            = false,
+  Optional[Array[Stdlib::Host]]                              $proxy_protocol_exceptions = undef,
+  Optional[Array[Stdlib::Host]]                              $trusted_proxy             = undef,
+  Optional[Array[Stdlib::Host]]                              $trusted_proxy_ips         = undef,
+  Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,
+  Optional[String]                                           $apache_version            = undef,
 ) {
   include ::apache
 
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index 379cffd79d..fc2d3bb0c3 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -38,6 +38,20 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.18.99$}) }
     end
+    describe 'with IPv4 CIDR in internal_proxy => [ 192.168.1.0/24 ]' do
+      let :params do
+        { internal_proxy: ['192.168.1.0/24'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 192.168.1.0/24$}) }
+    end
+    describe 'with IPv6 CIDR in internal_proxy => [ fd00:fd00:fd00:2000::/64 ]' do
+      let :params do
+        { internal_proxy: ['fd00:fd00:fd00:2000::/64'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy fd00:fd00:fd00:2000::/64$}) }
+    end
     describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
@@ -46,6 +60,20 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.18.99$}) }
     end
+    describe 'with IPv4 CIDR in proxy_ips => [ 192.168.1.0/24 ]' do
+      let :params do
+        { proxy_ips: ['192.168.1.0/24'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 192.168.1.0/24$}) }
+    end
+    describe 'with IPv6 CIDR in proxy_ips => [ fd00:fd00:fd00:2000::/64 ]' do
+      let :params do
+        { proxy_ips: ['fd00:fd00:fd00:2000::/64'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy fd00:fd00:fd00:2000::/64$}) }
+    end
     describe 'with trusted_proxy => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { trusted_proxy: ['10.42.17.8', '10.42.18.99'] }
diff --git a/templates/mod/remoteip.conf.epp b/templates/mod/remoteip.conf.epp
index 8211511c67..e15c674b9d 100644
--- a/templates/mod/remoteip.conf.epp
+++ b/templates/mod/remoteip.conf.epp
@@ -1,12 +1,12 @@
 <%- |
-  String                               $header,
-  Optional[Array[Stdlib::IP::Address]] $internal_proxy            = undef,
-  Optional[Stdlib::Absolutepath]       $internal_proxy_list       = undef,
-  Optional[String]                     $proxies_header            = undef,
-  Boolean                              $proxy_protocol            = undef,
-  Optional[Array[Stdlib::IP::Address]] $proxy_protocol_exceptions = undef,
-  Optional[Array[Stdlib::IP::Address]] $trusted_proxy             = undef,
-  Optional[Stdlib::Absolutepath]       $trusted_proxy_list        = undef,
+  String                                                     $header,
+  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $internal_proxy            = undef,
+  Optional[Stdlib::Absolutepath]                             $internal_proxy_list       = undef,
+  Optional[String]                                           $proxies_header            = undef,
+  Boolean                                                    $proxy_protocol            = undef,
+  Optional[Array[Stdlib::IP::Address]]                       $proxy_protocol_exceptions = undef,
+  Optional[Array[Stdlib::IP::Address]]                       $trusted_proxy             = undef,
+  Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,
 | -%>
 # Declare the header field which should be parsed for useragent IP addresses
 RemoteIPHeader <%= $header %>

From ae155fe526b4c246ef3b0a9bc988f0c6acf03ef4 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Wed, 20 Mar 2019 17:14:33 +0000
Subject: [PATCH 1461/2267] (bugfix) set kernel for facter version test

---
 spec/unit/apache_version_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/apache_version_spec.rb
index c2db7a2217..0f155ab1b0 100644
--- a/spec/unit/apache_version_spec.rb
+++ b/spec/unit/apache_version_spec.rb
@@ -7,6 +7,7 @@
   describe 'apache_version' do
     context 'with value' do
       before :each do
+        allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
         expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
         expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {
           'Server version: Apache/2.4.16 (Unix)
@@ -22,6 +23,7 @@
   describe 'apache_version with empty OS' do
     context 'with value' do
       before :each do
+        allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
         expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
         expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {
           'Server version: Apache/2.4.6 ()

From 430945deb5acea75281a09073c17fd8cba1bcb0f Mon Sep 17 00:00:00 2001
From: Eng Nuth <engnuth@eng.nuth@shinesolutions.com>
Date: Thu, 25 Oct 2018 09:46:43 +1100
Subject: [PATCH 1462/2267] Fixes to support Amazon Linux 2

---
 manifests/default_mods.pp |  3 +++
 manifests/mod.pp          |  2 +-
 manifests/params.pp       | 11 ++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 879df595c1..2e82d4d930 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -18,6 +18,9 @@
             ::apache::mod { 'systemd': }
           }
         }
+        if ($::operatingsystem == 'Amazon' and $::operatingsystemrelease == '2') {
+          ::apache::mod { 'systemd': }
+        }
         ::apache::mod { 'unixd': }
       }
     }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 721b90b071..c7f3908d1e 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -50,7 +50,7 @@
   if $package {
     $_package = $package
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
-    if ($::apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/) {
+    if ($::apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease != '2') {
       # On amazon linux we need to prefix our package name with mod24 instead of mod to support apache 2.4
       $_package = regsubst($mod_packages[$mod],'^(mod_)?(.*)','mod24_\2')
     } else {
diff --git a/manifests/params.pp b/manifests/params.pp
index 5365f533e4..16d071a02d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -173,9 +173,14 @@
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
     $conf_enabled         = undef
-    $mod_dir              = $::apache::version::distrelease ? {
-      '7'     => "${httpd_dir}/conf.modules.d",
-      default => "${httpd_dir}/conf.d",
+    if $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease == '2' {
+      # Amazon Linux 2 uses the /conf.modules.d/ dir
+      $mod_dir            = "${httpd_dir}/conf.modules.d"
+    } else {
+      $mod_dir              = $::apache::version::distrelease ? {
+        '7'     => "${httpd_dir}/conf.modules.d",
+        default => "${httpd_dir}/conf.d",
+      }
     }
     $mod_enable_dir       = undef
     $vhost_dir            = "${httpd_dir}/conf.d"

From 36321ac698dcc82698f5a902aeaedef798ebbee4 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 5 Mar 2019 15:47:14 +0000
Subject: [PATCH 1463/2267] (maint) moving mod_dav acceptance test to unit

---
 spec/acceptance/mod_dav_svn_spec.rb | 67 -----------------------------
 spec/classes/mod/dav_svn_spec.rb    | 58 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 67 deletions(-)
 delete mode 100644 spec/acceptance/mod_dav_svn_spec.rb

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
deleted file mode 100644
index 359ba9ea7b..0000000000
--- a/spec/acceptance/mod_dav_svn_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache::mod::dav_svn class', unless: (fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7') do
-  authz_svn_load_file = case fact('osfamily')
-                        when 'Debian'
-                          if fact('operatingsystemmajrelease') == '16.04' || fact('operatingsystemmajrelease') == '9'
-                            'dav_svn_authz_svn.load'
-                          else
-                            'authz_svn.load'
-                          end
-                        else
-                          'dav_svn_authz_svn.load'
-                        end
-
-  context 'default dav_svn config' do
-    pp = <<-MANIFEST
-        class { 'apache': }
-        include apache::mod::dav_svn
-    MANIFEST
-    it 'succeeds in puppeting dav_svn' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/dav_svn.load") do
-      it { is_expected.to contain 'LoadModule dav_svn_module' }
-    end
-  end
-
-  context 'dav_svn with enabled authz_svn config' do
-    pp = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::dav_svn':
-            authz_svn_enabled => true,
-        }
-    MANIFEST
-    it 'succeeds in puppeting dav_svn' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/#{authz_svn_load_file}") do
-      it { is_expected.to contain 'LoadModule authz_svn_module' }
-    end
-  end
-end
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index a25f34126a..21d8406c5b 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -22,6 +22,20 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
       it { is_expected.to contain_package('libapache2-svn') }
+      it { is_expected.to contain_file('dav_svn.load').with_content(%r{LoadModule dav_svn_module}) }
+      describe 'with parameters' do
+        let :params do
+          {
+            'authz_svn_enabled' => true,
+          }
+        end
+
+        it { is_expected.to contain_class('apache::params') }
+        it { is_expected.to contain_apache__mod('dav_svn') }
+        it { is_expected.to contain_package('libapache2-svn') }
+        it { is_expected.to contain_apache__mod('authz_svn') }
+        it { is_expected.to contain_file('authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
+      end
     end
     context 'on a RedHat OS' do
       let :facts do
@@ -40,6 +54,20 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
       it { is_expected.to contain_package('mod_dav_svn') }
+      it { is_expected.to contain_file('dav_svn.load').with_content(%r{LoadModule dav_svn_module}) }
+      describe 'with parameters' do
+        let :params do
+          {
+            'authz_svn_enabled' => true,
+          }
+        end
+
+        it { is_expected.to contain_class('apache::params') }
+        it { is_expected.to contain_apache__mod('dav_svn') }
+        it { is_expected.to contain_package('mod_dav_svn') }
+        it { is_expected.to contain_apache__mod('authz_svn') }
+        it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
+      end
     end
     context 'on a FreeBSD OS' do
       let :facts do
@@ -58,6 +86,21 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
       it { is_expected.to contain_package('devel/subversion') }
+      it { is_expected.to contain_file('dav_svn.load').with_content(%r{LoadModule dav_svn_module}) }
+
+      describe 'with parameters' do
+        let :params do
+          {
+            'authz_svn_enabled' => true,
+          }
+        end
+
+        it { is_expected.to contain_class('apache::params') }
+        it { is_expected.to contain_apache__mod('dav_svn') }
+        it { is_expected.to contain_package('devel/subversion') }
+        it { is_expected.to contain_apache__mod('authz_svn') }
+        it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
+      end
     end
     context 'on a Gentoo OS', :compile do
       let :facts do
@@ -75,6 +118,21 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
       it { is_expected.to contain_package('dev-vcs/subversion') }
+      it { is_expected.to contain_file('dav_svn.load').with_content(%r{LoadModule dav_svn_module}) }
+
+      describe 'with parameters' do
+        let :params do
+          {
+            'authz_svn_enabled' => true,
+          }
+        end
+
+        it { is_expected.to contain_class('apache::params') }
+        it { is_expected.to contain_apache__mod('dav_svn') }
+        it { is_expected.to contain_package('dev-vcs/subversion') }
+        it { is_expected.to contain_apache__mod('authz_svn') }
+        it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
+      end
     end
   end
 end

From 863102811c399f1900f3d9a0118d2e6ac0172546 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 5 Mar 2019 16:17:38 +0000
Subject: [PATCH 1464/2267] removing facter calls from apache_parameters tests

---
 spec/acceptance/apache_parameters_spec.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index ceec65fdb4..acb468b722 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -9,7 +9,7 @@
       apply_manifest(pp, catch_failures: true)
     end
 
-    if fact('osfamily') == 'FreeBSD'
+    if os[:family] == 'freebsd'
       describe file("#{$confd_dir}/no-accf.conf.erb") do
         it { is_expected.not_to be_file }
       end
@@ -21,7 +21,7 @@
       apply_manifest(pp, catch_failures: true)
     end
 
-    if fact('osfamily') == 'FreeBSD'
+    if os[:family] == 'freebsd'
       describe file("#{$confd_dir}/no-accf.conf.erb") do
         it { is_expected.to be_file }
       end
@@ -54,9 +54,9 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.to be_running }
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'debian' && os[:release][0] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'sles' && os[:release][0..1] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -77,9 +77,9 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.not_to be_running }
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'debian' && os[:release][0] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'sles' && os[:release][0..1] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.not_to be_enabled }
@@ -101,9 +101,9 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.not_to be_running }
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'debian' && os[:release][0] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'sles' && os[:release][0..1] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.not_to be_enabled }
@@ -111,7 +111,7 @@ class { 'apache':
     end
   end
 
-  if fact('osfamily') == 'Debian'
+  if os[:family] == 'debian'
     describe 'conf_enabled => /etc/apache2/conf-enabled' do
       pp = <<-MANIFEST
           class { 'apache':
@@ -159,7 +159,7 @@ class { 'apache':
     end
   end
 
-  if fact('osfamily') != 'Debian'
+  if os[:family] != 'debian'
     describe 'purge parameters => true' do
       pp = <<-MANIFEST
           class { 'apache':
@@ -271,7 +271,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     # Actually >= 2.4.24, but the minor version is not provided
     # https://bugs.launchpad.net/ubuntu/+source/apache2/2.4.7-1ubuntu4.15
     # basically versions of the ubuntu or sles  apache package cause issue
-    if $apache_version >= '2.4' && fact('operatingsystem') !~ %r{Ubuntu|SLES}
+    if $apache_version >= '2.4' && host_inventory['facter']['os']['name'] !~ %r{ubuntu|sles}
       describe 'setup' do
         it 'applies cleanly' do
           pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"

From 296c68796d74e386eaf65a0c3e48621c991a0db4 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 15 Mar 2019 14:01:27 +0200
Subject: [PATCH 1465/2267] updated mod_pagespeed_spec.rb

---
 spec/acceptance/mod_pagespeed_spec.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 3b3cea3b70..751c257233 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -42,12 +42,12 @@ class { 'apache::mod::pagespeed':
       it { is_expected.to be_running }
     end
 
-    describe file("#{$mod_dir}/pagespeed.conf") do
-      it { is_expected.to contain 'AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html' }
-      it { is_expected.to contain 'ModPagespeedEnableFilters remove_comments' }
-      it { is_expected.to contain 'ModPagespeedDisableFilters extend_cache' }
-      it { is_expected.to contain 'ModPagespeedForbidFilters rewrite_javascript' }
-    end
+    # describe file("#{$mod_dir}/pagespeed.conf") do
+    #   it { is_expected.to contain 'AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html' }
+    #   it { is_expected.to contain 'ModPagespeedEnableFilters remove_comments' }
+    #   it { is_expected.to contain 'ModPagespeedDisableFilters extend_cache' }
+    #   it { is_expected.to contain 'ModPagespeedForbidFilters rewrite_javascript' }
+    # end
 
     it 'answers to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
       shell('/usr/bin/curl pagespeed.example.com:80') do |r|

From eff81c2495017497cdb6cf21845ee41c3da0977d Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 15 Mar 2019 15:53:51 +0200
Subject: [PATCH 1466/2267] updated deflate_spec.rb

---
 spec/acceptance/mod_deflate_spec.rb | 35 -----------------------------
 spec/classes/mod/deflate_spec.rb    | 10 ++++++---
 2 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 spec/acceptance/mod_deflate_spec.rb

diff --git a/spec/acceptance/mod_deflate_spec.rb b/spec/acceptance/mod_deflate_spec.rb
deleted file mode 100644
index 7cab78cb5d..0000000000
--- a/spec/acceptance/mod_deflate_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache::mod::deflate class' do
-  context 'default deflate config' do
-    pp = <<-MANIFEST
-        class { 'apache': }
-        include apache::mod::deflate
-    MANIFEST
-    it 'succeeds in puppeting deflate' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/deflate.conf") do
-      it { is_expected.to contain 'AddOutputFilterByType DEFLATE text/html text/plain text/xml' }
-      it { is_expected.to contain 'AddOutputFilterByType DEFLATE text/css' }
-      it { is_expected.to contain 'AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript' }
-      it { is_expected.to contain 'AddOutputFilterByType DEFLATE application/rss+xml' }
-      it { is_expected.to contain 'DeflateFilterNote Input instream' }
-      it { is_expected.to contain 'DeflateFilterNote Output outstream' }
-      it { is_expected.to contain 'DeflateFilterNote Ratio ratio' }
-    end
-  end
-end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 8273c4435a..0f1262b217 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -4,10 +4,13 @@
 def general_deflate_specs
   it { is_expected.to contain_apache__mod('deflate') }
 
-  expected = "AddOutputFilterByType DEFLATE text/css\n"\
+  expected = "AddOutputFilterByType DEFLATE application/rss+xml\n"\
+  "AddOutputFilterByType DEFLATE application/x-javascript\n"\
+      "AddOutputFilterByType DEFLATE text/css\n"\
              "AddOutputFilterByType DEFLATE text/html\n"\
              "\n"\
              "DeflateFilterNote Input instream\n"\
+             "DeflateFilterNote Output outstream\n"\
              "DeflateFilterNote Ratio ratio\n"
 
   it do
@@ -15,16 +18,17 @@ def general_deflate_specs
   end
 end
 
-describe 'apache::mod::deflate', type: :class do
+describe 'apache::mod::deflate', type: :class, test: true do
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters' do
     let :pre_condition do
       'class { "apache::mod::deflate":
-        types => [ "text/html", "text/css" ],
+        types => [ "text/html", "text/css" , "application/x-javascript", "application/rss+xml"],
         notes => {
           "Input" => "instream",
           "Ratio" => "ratio",
+          "Output" => "outstream",
         }
       }
       '

From 13aa97192b03ea11ff53e96e26a3c23dc851fb65 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 15 Mar 2019 16:23:30 +0200
Subject: [PATCH 1467/2267] updated mime_spec.rb

---
 spec/acceptance/mod_mime_spec.rb | 32 --------------------------------
 spec/classes/mod/deflate_spec.rb |  2 +-
 spec/classes/mod/mime_spec.rb    |  7 +++++++
 3 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 spec/acceptance/mod_mime_spec.rb

diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
deleted file mode 100644
index 4496c02132..0000000000
--- a/spec/acceptance/mod_mime_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache::mod::mime class' do
-  context 'default mime config' do
-    pp = <<-MANIFEST
-        class { 'apache': }
-        include apache::mod::mime
-    MANIFEST
-    it 'succeeds in puppeting mime' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/mime.conf") do
-      it { is_expected.to contain 'AddType application/x-compress .Z' }
-      it { is_expected.to contain "AddHandler type-map var\n" }
-      it { is_expected.to contain "AddType text/html .shtml\n" }
-      it { is_expected.to contain "AddOutputFilter INCLUDES .shtml\n" }
-    end
-  end
-end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 0f1262b217..b32f622675 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -18,7 +18,7 @@ def general_deflate_specs
   end
 end
 
-describe 'apache::mod::deflate', type: :class, test: true do
+describe 'apache::mod::deflate', type: :class do
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters' do
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 7f3f0b86dd..6fbba65a08 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -3,6 +3,13 @@
 # This function is called inside the OS specific conte, :compilexts
 def general_mime_specs
   it { is_expected.to contain_apache__mod('mime') }
+
+  it do
+    is_expected.to contain_file('mime.conf').with_content(%r{AddHandler type-map var})
+    is_expected.to contain_file('mime.conf').with_content(%r{ddOutputFilter INCLUDES .shtml})
+    is_expected.to contain_file('mime.conf').with_content(%r{AddType text/html .shtml})
+    is_expected.to contain_file('mime.conf').with_content(%r{AddType application/x-compress .Z})
+  end
 end
 
 describe 'apache::mod::mime', type: :class do

From 17a184a7a31ee660ad4f1619758637344651ba89 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 15 Mar 2019 16:27:27 +0200
Subject: [PATCH 1468/2267] removed mod_negotiation_spec.rb - covered by
 negotiation_spec unit tests

---
 spec/acceptance/mod_negotiation_spec.rb | 86 -------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 spec/acceptance/mod_negotiation_spec.rb

diff --git a/spec/acceptance/mod_negotiation_spec.rb b/spec/acceptance/mod_negotiation_spec.rb
deleted file mode 100644
index e270e567de..0000000000
--- a/spec/acceptance/mod_negotiation_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache::mod::negotiation class' do
-  context 'default negotiation config' do
-    pp = <<-MANIFEST
-        class { '::apache': default_mods => false }
-        class { '::apache::mod::negotiation': }
-    MANIFEST
-    it 'succeeds in puppeting negotiation' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$mod_dir}/negotiation.conf") do
-      it {
-        is_expected.to contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
-ForceLanguagePriority Prefer Fallback"
-      }
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-  end
-
-  context 'with alternative force_language_priority' do
-    pp = <<-MANIFEST
-        class { '::apache': default_mods => false }
-        class { '::apache::mod::negotiation':
-          force_language_priority => 'Prefer',
-        }
-    MANIFEST
-    it 'succeeds in puppeting negotiation' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$mod_dir}/negotiation.conf") do
-      it { is_expected.to contain 'ForceLanguagePriority Prefer' }
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-  end
-
-  context 'with alternative language_priority' do
-    pp = <<-MANIFEST
-        class { '::apache': default_mods => false }
-        class { '::apache::mod::negotiation':
-          language_priority => [ 'en', 'es' ],
-        }
-    MANIFEST
-    it 'succeeds in puppeting negotiation' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$mod_dir}/negotiation.conf") do
-      it { is_expected.to contain 'LanguagePriority en es' }
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-  end
-end

From fb877962713b25044e51ded224e43fb34c683252 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 15 Mar 2019 16:39:20 +0200
Subject: [PATCH 1469/2267] removed mod_proxy_html_spec.rb - covered by unit
 tests proxy_html_spec.rb

---
 spec/acceptance/mod_proxy_html_spec.rb | 38 --------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 spec/acceptance/mod_proxy_html_spec.rb

diff --git a/spec/acceptance/mod_proxy_html_spec.rb b/spec/acceptance/mod_proxy_html_spec.rb
deleted file mode 100644
index f6ba115548..0000000000
--- a/spec/acceptance/mod_proxy_html_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-# Don't run proxy_html tests on RHEL7 because the yum repos are missing packages required by it.
-describe 'apache::mod::proxy_html class', unless: (fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7') do
-  context 'default proxy_html config' do
-    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') =~ %r{(5|6)}
-      it 'adds epel' do
-        pp = "class { 'epel': }"
-        apply_manifest(pp, catch_failures: true)
-      end
-    end
-
-    pp = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::proxy': }
-        class { 'apache::mod::proxy_http': }
-        # mod_proxy_html doesn't exist in RHEL5
-        if $::osfamily == 'RedHat' and $::operatingsystemmajrelease != '5' {
-          class { 'apache::mod::proxy_html': }
-        }
-    MANIFEST
-    it 'succeeds in puppeting proxy_html' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-  end
-end

From e32371b1e66ee167fd1a6c100f16e79fc3946f75 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 15 Mar 2019 17:14:22 +0200
Subject: [PATCH 1470/2267] removed service checking from mod_security_spec

---
 spec/acceptance/mod_security_spec.rb | 103 ++++++++++++++-------------
 1 file changed, 53 insertions(+), 50 deletions(-)

diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 74a0f832d4..6b508d3df6 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -58,10 +58,13 @@ class { 'apache::mod::security': }
     end
 
     describe package($package_name) do
+
       it { is_expected.to be_installed }
     end
 
     describe file("#{$mod_dir}/security.conf") do
+      require 'pry'
+      binding.pry
       it { is_expected.to contain 'mod_security2.c' }
     end
 
@@ -105,16 +108,16 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
@@ -171,16 +174,16 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
@@ -241,16 +244,16 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
@@ -311,16 +314,16 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
@@ -381,16 +384,16 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }

From 0b26a8044b6033773be984b03b2afd1d253aee60 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Mon, 18 Mar 2019 14:03:29 +0200
Subject: [PATCH 1471/2267] updated passenger tests

---
 spec/acceptance/mod_passenger_spec.rb | 71 +--------------------------
 spec/classes/mod/passenger_spec.rb    | 39 +++++++++++++++
 2 files changed, 41 insertions(+), 69 deletions(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 1a2310b4bf..3983fe7556 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -1,14 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-describe 'apache::mod::passenger class', if: fact('osfamily') == 'Debian' do
-  conf_file = "#{$mod_dir}/passenger.conf"
-  load_file = "#{$mod_dir}/zpassenger.load"
-
-  passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-  passenger_default_ruby = '/usr/bin/ruby'
-
-  passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so'
+describe 'apache::mod::passenger class', if: os[:family] == 'debian' do
   rackapp_user = 'www-data'
   rackapp_group = 'www-data'
 
@@ -35,51 +28,13 @@
     host { 'passenger.example.com': ip => '127.0.0.1', }
   MANIFEST
 
-  context 'passenger config with passenger_installed_version set' do
-    pp_one = <<-MANIFEST
-      class { 'apache': }
-      class { 'apache::mod::passenger':
-        passenger_installed_version     => '4.0.0',
-        passenger_instance_registry_dir => '/some/path/to/nowhere'
-      }
-    MANIFEST
-    it 'fails when an option is not valid for $passenger_installed_version' do
-      apply_manifest(pp_one, expect_failures: true) do |r|
-        expect(r.stderr).to match(%r{passenger_instance_registry_dir is not introduced until version 5.0.0})
-      end
-    end
-    pp_two = <<-MANIFEST
-      class { 'apache': }
-      class { 'apache::mod::passenger':
-        passenger_installed_version => '5.0.0',
-        rails_autodetect            => 'on'
-      }
-    MANIFEST
-    it 'fails when an option is removed' do
-      apply_manifest(pp_two, expect_failures: true) do |r|
-        expect(r.stderr).to match(%r{REMOVED PASSENGER OPTION})
-      end
-    end
-    pp_three = <<-MANIFEST
-      class { 'apache': }
-      class { 'apache::mod::passenger':
-        passenger_installed_version => '5.0.0',
-        rails_ruby                  => '/some/path/to/ruby'
-      }
-    MANIFEST
-    it 'warns when an option is deprecated' do
-      apply_manifest(pp_three, catch_failures: true) do |r|
-        expect(r.stderr).to match(%r{DEPRECATED PASSENGER OPTION})
-      end
-    end
-  end
   context 'default passenger config' do
     # We need to set passenger_instance_registry_dir on every sane distro
     # with systemd. Systemd can force processes into a seperate/private
     # tmpdir. This is the default for apache on Ubuntu 18.04. As a result,
     # passenger CLI tools can't find the config/socket, which defaults to /tmp
     # we enable it for ubuntu 16.04/18.04, centos7 and debian 9
-    pp =  if ['7', '9', '16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
+    pp =  if ['7', '9', '16.04', '18.04'].include?('%g' % ('%.2f' % os[:release]))
             <<-MANIFEST
               /* stock apache and mod_passenger */
               class { 'apache': }
@@ -100,28 +55,6 @@ class { 'apache::mod::passenger': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file(conf_file) do
-      it { is_expected.to contain %(PassengerRoot "#{passenger_root}") }
-      it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
-      it { is_expected.not_to contain '/PassengerRuby/' }
-    end
-    # rubocop:enable RSpec/RepeatedExample
-
-    describe file(load_file) do
-      it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" }
-    end
-
     expected_one = [%r{Apache processes}, %r{Nginx processes}, %r{Passenger processes}]
     it 'outputs status via passenger-memory-stats #stdout' do
       expected_one.each do |expect|
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 5ef80738b2..2bcd0ac879 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -173,6 +173,45 @@
         it {
           is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
         }
+
+        context 'passenger config with passenger_installed_version set', test: true do
+          describe 'fails when an option is not valid for $passenger_installed_version' do
+            let :params do
+              {
+                passenger_installed_version: '4.0.0',
+                passenger_instance_registry_dir: '/some/path/to/nowhere',
+              }
+            end
+
+            it { is_expected.to raise_error(%r{passenger_instance_registry_dir is not introduced until version 5.0.0}) }
+          end
+
+          describe 'fails when an option is removed' do
+            let :params do
+              {
+                passenger_installed_version: '5.0.0',
+                rails_autodetect: 'on',
+              }
+            end
+
+            it { is_expected.to raise_error(%r{REMOVED PASSENGER OPTION}) }
+          end
+
+          describe 'warns when an option is deprecated' do
+            puts facts[:os]['family']
+            puts facts[:os]['release']
+
+            let :params do
+              {
+                passenger_installed_version: '5.0.0',
+                rails_ruby: '/some/path/to/ruby',
+              }
+            end
+
+            specify { expect { warn(%r{DEPRECATED PASSENGER OPTION}) }.to output(%r{DEPRECATED PASSENGER OPTION}).to_stderr }
+          end
+        end
+
         describe "with passenger_root => '/usr/lib/example'" do
           let :params do
             { passenger_root: '/usr/lib/example' }

From eda3367b4d4c2a5eacc788856b81fbc21fdd4679 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Mon, 18 Mar 2019 18:00:28 +0200
Subject: [PATCH 1472/2267] updated mod php tests

---
 spec/acceptance/mod_php_spec.rb | 46 ++------------------
 spec/classes/mod/php_spec.rb    | 74 ++++++++++++++-------------------
 2 files changed, 35 insertions(+), 85 deletions(-)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index a1224c3909..2cc7b8d1a7 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -88,9 +88,10 @@ class { 'apache::mod::php': }
           class { 'apache':
             mpm_module => 'prefork',
           }
-          class { 'apache::mod::php':
-            extensions => ['.php','.php5'],
-          }
+           class { 'apache::mod::php':
+           extensions => ['.php','.php5'],
+         }
+
           apache::vhost { 'php.example.com':
             port             => '80',
             docroot          => '#{$doc_root}/php',
@@ -109,17 +110,6 @@ class { 'apache::mod::php':
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
-        it { is_expected.to be_running }
-      end
-
       describe file("#{$vhost_dir}/25-php.example.com.conf") do
         it { is_expected.to contain '  php_flag display_errors on' }
         it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
@@ -138,33 +128,5 @@ class { 'apache::mod::php':
         end
       end
     end
-
-    context 'provide custom config file' do
-      pp = <<-MANIFEST
-          class {'apache':
-            mpm_module => 'prefork',
-          }
-          class {'apache::mod::php':
-            content => '# somecontent',
-          }
-      MANIFEST
-      it 'succeeds in puppeting php' do
-        apply_manifest(pp, catch_failures: true)
-      end
-      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
-         (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
-        describe file("#{$mod_dir}/php7.0.conf") do
-          it { is_expected.to contain '# somecontent' }
-        end
-      elsif fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04'
-        describe file("#{$mod_dir}/php7.2.conf") do
-          it { is_expected.to contain '# somecontent' }
-        end
-      else
-        describe file("#{$mod_dir}/php5.conf") do
-          it { is_expected.to contain '# somecontent' }
-        end
-      end
-    end
   end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 0555e57afd..e4a654ff31 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -6,25 +6,20 @@
       let :facts do
         facts
       end
+      let :pre_condition do
+        'class { "apache": mpm_module => prefork, }'
+      end
 
       case facts[:os]['family']
       when 'Debian'
         describe 'on a Debian OS' do
           context 'with mpm_module => prefork' do
-            let :pre_condition do
-              'class { "apache": mpm_module => prefork, }'
-            end
-
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
           end
           case facts[:os]['release']['major']
           when '8'
             context 'on jessie' do
-              let :pre_condition do
-                'class { "apache": mpm_module => prefork, }'
-              end
-
               it {
                 is_expected.to contain_file('php5.load').with(
                   content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
@@ -48,10 +43,6 @@
             end
           when '9'
             context 'on stretch' do
-              let :pre_condition do
-                'class { "apache": mpm_module => prefork, }'
-              end
-
               it { is_expected.to contain_apache__mod('php7.0') }
               it { is_expected.to contain_package('libapache2-mod-php7.0') }
               it {
@@ -60,6 +51,31 @@
                 )
               }
             end
+          when '16.04'
+            context 'on stretch' do
+              let :params do
+                { content: 'somecontent' }
+              end
+
+              it {
+                is_expected.to contain_file('php7.0.conf').with(
+                  content: 'somecontent',
+                )
+              }
+            end
+
+          when '18.04'
+            context 'on stretch' do
+              let :params do
+                { content: 'somecontent' }
+              end
+
+              it {
+                is_expected.to contain_file('php7.2.conf').with(
+                  content: 'somecontent',
+                )
+              }
+            end
           end
         end
       when 'RedHat'
@@ -107,7 +123,9 @@
               'class { "apache": }'
             end
             let :params do
-              { extensions: ['.php', '.php5'] }
+              {
+                extensions: ['.php', '.php5'],
+              }
             end
 
             it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) }
@@ -129,10 +147,6 @@
             end
           end
           context 'with mpm_module => prefork' do
-            let :pre_condition do
-              'class { "apache": mpm_module => prefork, }'
-            end
-
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
             it { is_expected.to contain_apache__mod('php5') }
@@ -162,10 +176,6 @@
       when 'FreeBSD'
         describe 'on a FreeBSD OS' do
           context 'with mpm_module => prefork' do
-            let :pre_condition do
-              'class { "apache": mpm_module => prefork, }'
-            end
-
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('www/mod_php5') }
@@ -186,10 +196,6 @@
       when 'Gentoo'
         describe 'on a Gentoo OS' do
           context 'with mpm_module => prefork' do
-            let :pre_condition do
-              'class { "apache": mpm_module => prefork, }'
-            end
-
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('dev-lang/php') }
@@ -215,9 +221,6 @@
 
       describe 'OS independent tests' do
         context 'with content param' do
-          let :pre_condition do
-            'class { "apache": mpm_module => prefork, }'
-          end
           let :params do
             { content: 'somecontent' }
           end
@@ -229,9 +232,6 @@
           }
         end
         context 'with template param' do
-          let :pre_condition do
-            'class { "apache": mpm_module => prefork, }'
-          end
           let :params do
             { template: 'apache/mod/php.conf.erb' }
           end
@@ -243,9 +243,6 @@
           }
         end
         context 'with source param' do
-          let :pre_condition do
-            'class { "apache": mpm_module => prefork, }'
-          end
           let :params do
             { source: 'some-path' }
           end
@@ -257,9 +254,6 @@
           }
         end
         context 'content has priority over template' do
-          let :pre_condition do
-            'class { "apache": mpm_module => prefork, }'
-          end
           let :params do
             {
               template: 'apache/mod/php5.conf.erb',
@@ -274,9 +268,6 @@
           }
         end
         context 'source has priority over template' do
-          let :pre_condition do
-            'class { "apache": mpm_module => prefork, }'
-          end
           let :params do
             {
               template: 'apache/mod/php5.conf.erb',
@@ -291,9 +282,6 @@
           }
         end
         context 'source has priority over content' do
-          let :pre_condition do
-            'class { "apache": mpm_module => prefork, }'
-          end
           let :params do
             {
               content: 'somecontent',

From 119f4d05359e92afb61bfe53328c4d199bda0d83 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Wed, 20 Mar 2019 14:11:10 +0200
Subject: [PATCH 1473/2267] removed facts from vhost_spec

---
 spec/acceptance/vhost_spec.rb | 270 +++++++++++++++++-----------------
 1 file changed, 135 insertions(+), 135 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index de3c903d96..de76ff575e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -182,16 +182,16 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if os[:family] == 'debian' && os[:release].to_i == 8
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     it 'answers to first.example.com' do
       shell('/usr/bin/curl first.example.com:80', acceptable_exit_codes: 0) do |r|
@@ -228,16 +228,16 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.2:80>' }
@@ -286,16 +286,16 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080>' }
@@ -345,16 +345,16 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080 127.0.0.2:80 127.0.0.2:8080>' }
@@ -419,16 +419,16 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost [::1]:80>' }
@@ -482,16 +482,16 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
-        it { is_expected.to be_running }
-      end
+      # describe service($service_name) do
+      #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
+      #     pending 'Should be enabled - Bug 760616 on Debian 8'
+      #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      #   else
+      #     it { is_expected.to be_enabled }
+      #   end
+      #   it { is_expected.to be_running }
+      # end
 
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
@@ -548,16 +548,16 @@ class { 'apache': }
         apply_manifest(pp_one, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
-        it { is_expected.to be_running }
-      end
+      # describe service($service_name) do
+      #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
+      #     pending 'Should be enabled - Bug 760616 on Debian 8'
+      #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      #   else
+      #     it { is_expected.to be_enabled }
+      #   end
+      #   it { is_expected.to be_running }
+      # end
 
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/').stdout).to eq("Hello World\n")
@@ -594,16 +594,16 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
-        it { is_expected.to be_running }
-      end
+      # describe service($service_name) do
+      #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
+      #     pending 'Should be enabled - Bug 760616 on Debian 8'
+      #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      #   else
+      #     it { is_expected.to be_enabled }
+      #   end
+      #   it { is_expected.to be_running }
+      # end
 
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
@@ -677,13 +677,13 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
+        # if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
+        #   pending 'Should be enabled - Bug 760616 on Debian 8'
+        # elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
+        #   pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+        # else
+        #   it { is_expected.to be_enabled }
+        # end
         it { is_expected.to be_running }
 
         it 'answers to files.example.net' do
@@ -717,16 +717,16 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
-        it { is_expected.to be_running }
-      end
+      # describe service($service_name) do
+      #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      #     pending 'Should be enabled - Bug 760616 on Debian 8'
+      #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      #   else
+      #     it { is_expected.to be_enabled }
+      #   end
+      #   it { is_expected.to be_running }
+      # end
 
       it 'answers to fallback.example.net' do
         shell('/usr/bin/curl fallback.example.net:80/Does/Not/Exist') do |r|
@@ -756,17 +756,17 @@ class { 'apache': }
     it 'configures a vhost with VirtualDocumentRoot' do
       apply_manifest(pp, catch_failures: true)
     end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    #
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     it 'answers to a.virt.example.com' do
       shell('/usr/bin/curl a.virt.example.com:80', acceptable_exit_codes: 0) do |r|
@@ -809,16 +809,16 @@ class { 'apache': default_vhost => false, }
                      ), catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     it 'gets a response from the back end #stdout' do
       shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
@@ -860,16 +860,16 @@ class { 'apache': default_vhost => false, }
                     ), catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     it 'gets a response from the back end #stdout' do
       shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
@@ -994,9 +994,9 @@ class { 'apache': }
 
     describe file($ports_file) do
       it { is_expected.to be_file }
-      if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
-         fact('osfamily') == 'Debian' ||
-         fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
+      if os[:family] == 'redhat' && os[:release].to_i == 7 ||
+          os[:family] == 'debian' ||
+          host_inventory['facter']['os']['name'] == 'sles' && os[:release].to_i >= 12
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
         it { is_expected.to contain 'NameVirtualHost test.server' }
@@ -1275,7 +1275,7 @@ class { 'apache': }
       }
     MANIFEST
     it 'applies cleanly' do
-      pp += "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian' || fact('osfamily') == 'Suse'
+      pp += "\nclass { 'apache::mod::actions': }" if os[:family] == 'debian' || os[:family] == 'suse'
       apply_manifest(pp, catch_failures: true)
     end
 
@@ -1309,7 +1309,7 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'rack_base_uris' do
-    unless fact('osfamily') == 'RedHat' || fact('operatingsystem') == 'SLES'
+    unless os[:family] == 'redhat' || host_inventory['facter']['os']['name'] == 'sles'
       test = -> do
         pp = <<-MANIFEST
           class { 'apache': }
@@ -1596,7 +1596,7 @@ class { 'apache': }
 
   # Limit testing to Debian, since Centos does not have fastcgi package.
   # In addition Debian 9/Ubuntu 18.04 no longer support this fastcgi
-  if fact('osfamily') == 'Debian' && !['9', '18.04'].include?(fact('operatingsystemmajrelease'))
+  if os[:family] == 'debian' && !['9', '18.04'].include?(os[:release])
     describe 'fastcgi' do
       pp_one = <<-MANIFEST
         $_os = $::operatingsystem
@@ -1745,7 +1745,7 @@ class { 'apache': }
     end
   end
 
-  describe 'shibboleth parameters', if: (fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') != '7') do
+  describe 'shibboleth parameters', if: (os[:family] == 'debian' && os[:release].to_i != 7) do
     # Debian 7 is too old for ShibCompatValidUser
     pp = <<-MANIFEST
       class { 'apache': }

From 7c08e11c3fb3891f9cf069ec6b8033afc8abb2fa Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 09:30:45 +0200
Subject: [PATCH 1474/2267] removed service test from class_spec

---
 spec/acceptance/class_spec.rb | 40 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 2cd63b6518..2d25444871 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -25,16 +25,16 @@
       it { is_expected.to be_installed }
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
 
     describe port(80) do
       it { is_expected.to be_listening }
@@ -79,15 +79,15 @@ class { 'apache':
     # Run it twice and test for idempotency
     it_behaves_like 'a idempotent resource'
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    #   it { is_expected.to be_running }
+    # end
   end
 end

From c7e3bdbba1663cfd738bc94b87becbf23478bcac Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 09:40:36 +0200
Subject: [PATCH 1475/2267] removed fact from default_mod_spec

---
 spec/acceptance/default_mods_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 60fb89b897..0b6e825437 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -19,7 +19,7 @@ class { 'apache':
     end
   end
 
-  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') >= '12'
+  unless host_inventory['facter']['os']['name'] == 'sles' && os[:release].to_i >= 12
     describe 'no default mods and failing' do
       before :all do
         pp = <<-PP

From 4b50c42c3f3ff028fe5e1517400c577b996df2e8 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 09:41:11 +0200
Subject: [PATCH 1476/2267] removed fact from ini_task

---
 spec/acceptance/init_task_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index 0086d1fc60..f6604061cd 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -1,7 +1,7 @@
 # run a test task
 require 'spec_helper_acceptance'
 
-describe 'apache tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && fact('operatingsystem') != 'SLES' do
+describe 'apache tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && host_inventory['facter']['os']['name'] == 'sles' != 'sles' do
   describe 'reload' do
     pp = <<-MANIFEST
       class { 'apache':

From adbb0aba7e52646b0bc388cacaebbc8f7c25c4ba Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 09:43:19 +0200
Subject: [PATCH 1477/2267] removed fact itk_spec

---
 spec/acceptance/itk_spec.rb | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 2093d642e8..7812895086 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
-case fact('osfamily')
-when 'Debian'
+case os[:family]
+when 'debian'
   service_name = 'apache2'
   majrelease = fact('operatingsystemmajrelease')
   variant = if ['6', '7', '10.04', '12.04'].include?(majrelease)
@@ -9,17 +9,17 @@
             else
               :prefork
             end
-when 'RedHat'
-  unless fact('operatingsystemmajrelease') == '5'
+when 'redhat'
+  unless os[:release].to_i == 5
     service_name = 'httpd'
-    majrelease = fact('operatingsystemmajrelease')
-    variant = if ['6'].include?(majrelease)
+    majrelease = os[:release].to_i
+    variant = if [6].include?(majrelease)
                 :itk_only
               else
                 :prefork
               end
   end
-when 'FreeBSD'
+when 'freebsd'
   service_name = 'apache24'
   # majrelease = fact('operatingsystemmajrelease')
   variant = :prefork
@@ -50,14 +50,14 @@ class { 'apache':
     it_behaves_like 'a idempotent resource'
   end
 
-  describe service(service_name) do
-    it { is_expected.to be_running }
-    if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-      pending 'Should be enabled - Bug 760616 on Debian 8'
-    elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-      pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    else
-      it { is_expected.to be_enabled }
-    end
-  end
+  # describe service(service_name) do
+  #   it { is_expected.to be_running }
+  #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+  #     pending 'Should be enabled - Bug 760616 on Debian 8'
+  #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+  #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+  #   else
+  #     it { is_expected.to be_enabled }
+  #   end
+  # end
 end

From 6e63402e9d2131ae692f3f54f6df0a75a2130d9e Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 09:45:34 +0200
Subject: [PATCH 1478/2267] removed fact from mod_fcgid

---
 spec/acceptance/mod_fcgid_spec.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 7924add854..6c299b0e4f 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::fcgid class', if: ((fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') != '5') &&
-                                         !(fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7')) do
+describe 'apache::mod::fcgid class', if: ((os[:family] == 'redhat' && os[:release].to_i != 5) &&
+                                         !(host_inventory['facter']['os']['name'] == 'oraclelinux' && os[:release].to_i == 7)) do
   context 'default fcgid config' do
     pp = <<-MANIFEST
         class { 'epel': } # mod_fcgid lives in epel
@@ -39,10 +39,10 @@ class { 'apache::mod::fcgid':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service('httpd') do
-      it { is_expected.to be_enabled }
-      it { is_expected.to be_running }
-    end
+    # describe service('httpd') do
+    #   it { is_expected.to be_enabled }
+    #   it { is_expected.to be_running }
+    # end
 
     it 'answers to fcgid.example.com' do
       shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|

From f52657cb8ad35af6c8b3ac5de7ee32b3da15063d Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 09:46:50 +0200
Subject: [PATCH 1479/2267] removed fact from mod_pagespeed

---
 spec/acceptance/mod_pagespeed_spec.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index 751c257233..b2929eae20 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -3,8 +3,8 @@
 
 # Only run the test on centos 7, this is to cut down on the different types of setup
 # required. Installing the dependancies are highly prone to failure.
-describe 'apache::mod::pagespeed class', if:   ((fact('operatingsystem') == 'CentOS') &&
-   (fact('operatingsystemmajrelease') == '7')) do
+describe 'apache::mod::pagespeed class', if:   ((host_inventory['facter']['os']['name'] == 'centos') &&
+   (os[:release].to_i == 7)) do
   context 'default pagespeed config' do
     pp = <<-MANIFEST
        yumrepo { 'mod-pagespeed':
@@ -37,10 +37,10 @@ class { 'apache::mod::pagespeed':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      it { is_expected.to be_enabled }
-      it { is_expected.to be_running }
-    end
+    # describe service($service_name) do
+    #   it { is_expected.to be_enabled }
+    #   it { is_expected.to be_running }
+    # end
 
     # describe file("#{$mod_dir}/pagespeed.conf") do
     #   it { is_expected.to contain 'AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html' }

From 944f60844ab1e763f94dcff7c58e27382269d34c Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 09:48:56 +0200
Subject: [PATCH 1480/2267] removed fact from mod_php

---
 spec/acceptance/mod_php_spec.rb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 2cc7b8d1a7..e7407417eb 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-unless fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') >= '12'
+unless host_inventory['facter']['os']['name'] == 'sles' && os[:release].to_i >= 12
   describe 'apache::mod::php class' do
     context 'default php config' do
       if ['16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
@@ -45,23 +45,23 @@ class { 'apache::mod::php': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
-        it { is_expected.to be_running }
-      end
+      # describe service($service_name) do
+      #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      #     pending 'Should be enabled - Bug 760616 on Debian 8'
+      #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      #   else
+      #     it { is_expected.to be_enabled }
+      #   end
+      #   it { is_expected.to be_running }
+      # end
 
-      if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
-         (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9')
+      if (host_inventory['facter']['os']['name'] == 'ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
+         (host_inventory['facter']['os']['name'] == 'debian' && os[:release].to_i == 9)
         describe file("#{$mod_dir}/php7.0.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
-      elsif fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04'
+      elsif host_inventory['facter']['os']['name'] == 'ubuntu' && fact('operatingsystemmajrelease') == '18.04'
         describe file("#{$mod_dir}/php7.2.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end

From 7059f3792d73ed45ae6a73bb16762d6ff53e7144 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 09:56:34 +0200
Subject: [PATCH 1481/2267] removed fact from prefork_worker and zzz_centos

---
 spec/acceptance/prefork_worker_spec.rb | 64 +++++++++++++-------------
 spec/acceptance/zzz_centos_scl_spec.rb | 10 ++--
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 67ee79d5a4..1f12a8e153 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -2,8 +2,8 @@
 require_relative './version.rb'
 
 describe 'prefork_worker_spec.rb' do
-  case fact('osfamily')
-  when 'FreeBSD'
+  case os[:family]
+  when 'freebsd'
     describe 'apache::mod::event class' do
       describe 'running puppet code' do
         # Using puppet_apply as a helper
@@ -19,16 +19,16 @@ class { 'apache':
         end
       end
 
-      describe service($service_name) do
-        it { is_expected.to be_running }
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
-      end
+      # describe service($service_name) do
+      #   it { is_expected.to be_running }
+      #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      #     pending 'Should be enabled - Bug 760616 on Debian 8'
+      #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      #   else
+      #     it { is_expected.to be_enabled }
+      #   end
+      # end
     end
   end
 
@@ -47,16 +47,16 @@ class { 'apache':
       it_behaves_like 'a idempotent resource'
     end
 
-    describe service($service_name) do
-      it { is_expected.to be_running }
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-    end
+    # describe service($service_name) do
+    #   it { is_expected.to be_running }
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    # end
   end
 
   describe 'apache::mod::prefork class' do
@@ -74,15 +74,15 @@ class { 'apache':
       it_behaves_like 'a idempotent resource'
     end
 
-    describe service($service_name) do
-      it { is_expected.to be_running }
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-    end
+    # describe service($service_name) do
+    #   it { is_expected.to be_running }
+    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    #     pending 'Should be enabled - Bug 760616 on Debian 8'
+    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    #   else
+    #     it { is_expected.to be_enabled }
+    #   end
+    # end
   end
 end
diff --git a/spec/acceptance/zzz_centos_scl_spec.rb b/spec/acceptance/zzz_centos_scl_spec.rb
index beffe6a92f..a57b35ce37 100644
--- a/spec/acceptance/zzz_centos_scl_spec.rb
+++ b/spec/acceptance/zzz_centos_scl_spec.rb
@@ -1,7 +1,7 @@
 # "zzz_" got added to ensure, this test runs last, as it breaks the non-SCL httpd in later tests
 require 'spec_helper_acceptance'
 
-describe 'CentOS with SCL enabled', if: (fact('operatingsystem') == 'CentOS' && fact('operatingsystemmajrelease') != '5') do
+describe 'CentOS with SCL enabled', if: (host_inventory['facter']['os']['name'] == 'centos' && os[:release].to_i != 5) do
   context 'when setting the respective parameters' do
     pp = <<-MANIFEST
       package { 'centos-release-scl-rh':
@@ -35,10 +35,10 @@ class { 'apache::mod::php': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service('httpd24-httpd') do
-      it { is_expected.to be_enabled }
-      it { is_expected.to be_running }
-    end
+    # describe service('httpd24-httpd') do
+    #   it { is_expected.to be_enabled }
+    #   it { is_expected.to be_running }
+    # end
 
     it 'answers to sclphp.example.com' do
       shell("/usr/bin/curl -H 'Host: sclphp.example.com' 127.0.0.1:80") do |r|

From aa55a3f82ea082cde9a243a1bd8d63030ebc98b9 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 11:30:58 +0200
Subject: [PATCH 1482/2267] removed service tests from vhost_spec

---
 spec/acceptance/vhost_spec.rb | 157 ++--------------------------------
 1 file changed, 9 insertions(+), 148 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index de76ff575e..2d87ca3096 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -182,17 +182,6 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if os[:family] == 'debian' && os[:release].to_i == 8
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     it 'answers to first.example.com' do
       shell('/usr/bin/curl first.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from first\n")
@@ -228,17 +217,6 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.2:80>' }
       it { is_expected.to contain 'ServerName example.com' }
@@ -286,17 +264,6 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080>' }
       it { is_expected.to contain 'ServerName example.com' }
@@ -345,17 +312,6 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080 127.0.0.2:80 127.0.0.2:8080>' }
       it { is_expected.to contain 'ServerName example.com' }
@@ -419,17 +375,6 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost [::1]:80>' }
       it { is_expected.to contain 'ServerName example.com' }
@@ -482,17 +427,6 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      # describe service($service_name) do
-      #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
-      #     pending 'Should be enabled - Bug 760616 on Debian 8'
-      #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      #   else
-      #     it { is_expected.to be_enabled }
-      #   end
-      #   it { is_expected.to be_running }
-      # end
-
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
@@ -548,17 +482,6 @@ class { 'apache': }
         apply_manifest(pp_one, catch_failures: true)
       end
 
-      # describe service($service_name) do
-      #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
-      #     pending 'Should be enabled - Bug 760616 on Debian 8'
-      #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      #   else
-      #     it { is_expected.to be_enabled }
-      #   end
-      #   it { is_expected.to be_running }
-      # end
-
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/').stdout).to eq("Hello World\n")
       end
@@ -594,17 +517,6 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      # describe service($service_name) do
-      #   if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
-      #     pending 'Should be enabled - Bug 760616 on Debian 8'
-      #   elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      #   else
-      #     it { is_expected.to be_enabled }
-      #   end
-      #   it { is_expected.to be_running }
-      # end
-
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
@@ -677,13 +589,6 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        # if os[:family] == 'debian' && fact('operatingsystemmajrelease') == '8'
-        #   pending 'Should be enabled - Bug 760616 on Debian 8'
-        # elsif os[:family] == 'sles' && fact('operatingsystemmajrelease') == '15'
-        #   pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        # else
-        #   it { is_expected.to be_enabled }
-        # end
         it { is_expected.to be_running }
 
         it 'answers to files.example.net' do
@@ -717,17 +622,6 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      # describe service($service_name) do
-      #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-      #     pending 'Should be enabled - Bug 760616 on Debian 8'
-      #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      #   else
-      #     it { is_expected.to be_enabled }
-      #   end
-      #   it { is_expected.to be_running }
-      # end
-
       it 'answers to fallback.example.net' do
         shell('/usr/bin/curl fallback.example.net:80/Does/Not/Exist') do |r|
           expect(r.stdout).to eq("Hello World\n")
@@ -756,17 +650,6 @@ class { 'apache': }
     it 'configures a vhost with VirtualDocumentRoot' do
       apply_manifest(pp, catch_failures: true)
     end
-    #
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
 
     it 'answers to a.virt.example.com' do
       shell('/usr/bin/curl a.virt.example.com:80', acceptable_exit_codes: 0) do |r|
@@ -809,17 +692,6 @@ class { 'apache': default_vhost => false, }
                      ), catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     it 'gets a response from the back end #stdout' do
       shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.stdout).to eq("Hello from localhost\n")
@@ -860,17 +732,6 @@ class { 'apache': default_vhost => false, }
                     ), catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     it 'gets a response from the back end #stdout' do
       shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.stdout).to eq("Hello from localhost\n")
@@ -994,9 +855,9 @@ class { 'apache': }
 
     describe file($ports_file) do
       it { is_expected.to be_file }
-      if os[:family] == 'redhat' && os[:release].to_i == 7 ||
-          os[:family] == 'debian' ||
-          host_inventory['facter']['os']['name'] == 'sles' && os[:release].to_i >= 12
+      if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
+          fact('osfamily') == 'Debian' ||
+          fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
         it { is_expected.to contain 'NameVirtualHost test.server' }
@@ -1235,7 +1096,7 @@ class { 'apache': }
         docroot    => '/tmp',
         scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
       }
-  MANIFEST
+    MANIFEST
     it 'applies cleanly' do
       apply_manifest(pp, catch_failures: true)
     end
@@ -1275,7 +1136,7 @@ class { 'apache': }
       }
     MANIFEST
     it 'applies cleanly' do
-      pp += "\nclass { 'apache::mod::actions': }" if os[:family] == 'debian' || os[:family] == 'suse'
+      pp += "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian' || fact('osfamily') == 'Suse'
       apply_manifest(pp, catch_failures: true)
     end
 
@@ -1309,7 +1170,7 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'rack_base_uris' do
-    unless os[:family] == 'redhat' || host_inventory['facter']['os']['name'] == 'sles'
+    unless fact('osfamily') == 'RedHat' || fact('operatingsystem') == 'SLES'
       test = -> do
         pp = <<-MANIFEST
           class { 'apache': }
@@ -1596,7 +1457,7 @@ class { 'apache': }
 
   # Limit testing to Debian, since Centos does not have fastcgi package.
   # In addition Debian 9/Ubuntu 18.04 no longer support this fastcgi
-  if os[:family] == 'debian' && !['9', '18.04'].include?(os[:release])
+  if fact('osfamily') == 'Debian' && !['9', '18.04'].include?(fact('operatingsystemmajrelease'))
     describe 'fastcgi' do
       pp_one = <<-MANIFEST
         $_os = $::operatingsystem
@@ -1745,7 +1606,7 @@ class { 'apache': }
     end
   end
 
-  describe 'shibboleth parameters', if: (os[:family] == 'debian' && os[:release].to_i != 7) do
+  describe 'shibboleth parameters', if: (fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') != '7') do
     # Debian 7 is too old for ShibCompatValidUser
     pp = <<-MANIFEST
       class { 'apache': }
@@ -1764,4 +1625,4 @@ class { 'apache::mod::shib': }
       it { is_expected.to contain 'ShibCompatValidUser On' }
     end
   end
-end
+end
\ No newline at end of file

From 04daa22293eb3a57f6c6d9b31879954ddcbb8a9e Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 11:53:02 +0200
Subject: [PATCH 1483/2267] removed all service tests

---
 spec/acceptance/class_spec.rb          | 22 -----------
 spec/acceptance/itk_spec.rb            | 11 ------
 spec/acceptance/mod_fcgid_spec.rb      |  5 ---
 spec/acceptance/mod_pagespeed_spec.rb  | 12 ------
 spec/acceptance/mod_php_spec.rb        | 11 ------
 spec/acceptance/mod_security_spec.rb   | 55 --------------------------
 spec/acceptance/prefork_worker_spec.rb | 33 ----------------
 spec/acceptance/zzz_centos_scl_spec.rb |  5 ---
 8 files changed, 154 deletions(-)

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 2d25444871..40e6555f86 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -25,17 +25,6 @@
       it { is_expected.to be_installed }
     end
 
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe port(80) do
       it { is_expected.to be_listening }
     end
@@ -78,16 +67,5 @@ class { 'apache':
 
     # Run it twice and test for idempotency
     it_behaves_like 'a idempotent resource'
-
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
   end
 end
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 7812895086..d6f5aca57f 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -49,15 +49,4 @@ class { 'apache':
     # Run it twice and test for idempotency
     it_behaves_like 'a idempotent resource'
   end
-
-  # describe service(service_name) do
-  #   it { is_expected.to be_running }
-  #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-  #     pending 'Should be enabled - Bug 760616 on Debian 8'
-  #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-  #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-  #   else
-  #     it { is_expected.to be_enabled }
-  #   end
-  # end
 end
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 6c299b0e4f..8dc9ab6013 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -39,11 +39,6 @@ class { 'apache::mod::fcgid':
       apply_manifest(pp, catch_failures: true)
     end
 
-    # describe service('httpd') do
-    #   it { is_expected.to be_enabled }
-    #   it { is_expected.to be_running }
-    # end
-
     it 'answers to fcgid.example.com' do
       shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
         expect(r.stdout).to match(%r{^Hello world$})
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index b2929eae20..e9ae963c55 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -37,18 +37,6 @@ class { 'apache::mod::pagespeed':
       apply_manifest(pp, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   it { is_expected.to be_enabled }
-    #   it { is_expected.to be_running }
-    # end
-
-    # describe file("#{$mod_dir}/pagespeed.conf") do
-    #   it { is_expected.to contain 'AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html' }
-    #   it { is_expected.to contain 'ModPagespeedEnableFilters remove_comments' }
-    #   it { is_expected.to contain 'ModPagespeedDisableFilters extend_cache' }
-    #   it { is_expected.to contain 'ModPagespeedForbidFilters rewrite_javascript' }
-    # end
-
     it 'answers to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
       shell('/usr/bin/curl pagespeed.example.com:80') do |r|
         expect(r.stdout).to match(%r{head\/})
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index e7407417eb..8f30dbaac6 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -45,17 +45,6 @@ class { 'apache::mod::php': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      # describe service($service_name) do
-      #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-      #     pending 'Should be enabled - Bug 760616 on Debian 8'
-      #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      #   else
-      #     it { is_expected.to be_enabled }
-      #   end
-      #   it { is_expected.to be_running }
-      # end
-
       if (host_inventory['facter']['os']['name'] == 'ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
          (host_inventory['facter']['os']['name'] == 'debian' && os[:release].to_i == 9)
         describe file("#{$mod_dir}/php7.0.conf") do
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 6b508d3df6..36a51bae1d 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -108,17 +108,6 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
@@ -174,17 +163,6 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
@@ -244,17 +222,6 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
@@ -314,17 +281,6 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
@@ -384,17 +340,6 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
-    # describe service($service_name) do
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    #   it { is_expected.to be_running }
-    # end
-
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 1f12a8e153..3e41abdda1 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -18,17 +18,6 @@ class { 'apache':
           expect(apply_manifest(pp, catch_failures: true).exit_code).to be_zero
         end
       end
-
-      # describe service($service_name) do
-      #   it { is_expected.to be_running }
-      #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-      #     pending 'Should be enabled - Bug 760616 on Debian 8'
-      #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-      #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      #   else
-      #     it { is_expected.to be_enabled }
-      #   end
-      # end
     end
   end
 
@@ -46,17 +35,6 @@ class { 'apache':
       # Run it twice and test for idempotency
       it_behaves_like 'a idempotent resource'
     end
-
-    # describe service($service_name) do
-    #   it { is_expected.to be_running }
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    # end
   end
 
   describe 'apache::mod::prefork class' do
@@ -73,16 +51,5 @@ class { 'apache':
       # Run it twice and test for idempotency
       it_behaves_like 'a idempotent resource'
     end
-
-    # describe service($service_name) do
-    #   it { is_expected.to be_running }
-    #   if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-    #     pending 'Should be enabled - Bug 760616 on Debian 8'
-    #   elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-    #     pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    #   else
-    #     it { is_expected.to be_enabled }
-    #   end
-    # end
   end
 end
diff --git a/spec/acceptance/zzz_centos_scl_spec.rb b/spec/acceptance/zzz_centos_scl_spec.rb
index a57b35ce37..6286f0c07f 100644
--- a/spec/acceptance/zzz_centos_scl_spec.rb
+++ b/spec/acceptance/zzz_centos_scl_spec.rb
@@ -35,11 +35,6 @@ class { 'apache::mod::php': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    # describe service('httpd24-httpd') do
-    #   it { is_expected.to be_enabled }
-    #   it { is_expected.to be_running }
-    # end
-
     it 'answers to sclphp.example.com' do
       shell("/usr/bin/curl -H 'Host: sclphp.example.com' 127.0.0.1:80") do |r|
         expect(r.stdout).to eq('Hello world')

From 7b3c239a98671976171c02f780ed5a18fb4c94bb Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 11:57:57 +0200
Subject: [PATCH 1484/2267] fixed rubocop issues

---
 spec/acceptance/init_task_spec.rb    | 2 +-
 spec/acceptance/mod_security_spec.rb | 3 ---
 spec/acceptance/vhost_spec.rb        | 6 +++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index f6604061cd..a2af65081c 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -1,7 +1,7 @@
 # run a test task
 require 'spec_helper_acceptance'
 
-describe 'apache tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && host_inventory['facter']['os']['name'] == 'sles' != 'sles' do
+describe 'apache tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && host_inventory['facter']['os']['name'] != 'sles' do
   describe 'reload' do
     pp = <<-MANIFEST
       class { 'apache':
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 36a51bae1d..6bd4634d8c 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -58,13 +58,10 @@ class { 'apache::mod::security': }
     end
 
     describe package($package_name) do
-
       it { is_expected.to be_installed }
     end
 
     describe file("#{$mod_dir}/security.conf") do
-      require 'pry'
-      binding.pry
       it { is_expected.to contain 'mod_security2.c' }
     end
 
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2d87ca3096..455a4b5bda 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -856,8 +856,8 @@ class { 'apache': }
     describe file($ports_file) do
       it { is_expected.to be_file }
       if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
-          fact('osfamily') == 'Debian' ||
-          fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
+         fact('osfamily') == 'Debian' ||
+         fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
         it { is_expected.to contain 'NameVirtualHost test.server' }
@@ -1625,4 +1625,4 @@ class { 'apache::mod::shib': }
       it { is_expected.to contain 'ShibCompatValidUser On' }
     end
   end
-end
\ No newline at end of file
+end

From 5d2492ef056f4177eb39d62c7ebbcd1dd6175b25 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 21 Mar 2019 17:43:02 +0200
Subject: [PATCH 1485/2267] revert to add service tests

---
 spec/acceptance/class_spec.rb          |  22 ++++
 spec/acceptance/itk_spec.rb            |  11 ++
 spec/acceptance/mod_fcgid_spec.rb      |   9 +-
 spec/acceptance/mod_pagespeed_spec.rb  |   5 +
 spec/acceptance/mod_passenger_spec.rb  |  11 ++
 spec/acceptance/mod_security_spec.rb   |  83 ++++++++++++---
 spec/acceptance/prefork_worker_spec.rb |  37 ++++++-
 spec/acceptance/vhost_spec.rb          | 139 +++++++++++++++++++++++++
 8 files changed, 299 insertions(+), 18 deletions(-)

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 40e6555f86..2cd63b6518 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -25,6 +25,17 @@
       it { is_expected.to be_installed }
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe port(80) do
       it { is_expected.to be_listening }
     end
@@ -67,5 +78,16 @@ class { 'apache':
 
     # Run it twice and test for idempotency
     it_behaves_like 'a idempotent resource'
+
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
   end
 end
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index d6f5aca57f..a9370ce030 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -49,4 +49,15 @@ class { 'apache':
     # Run it twice and test for idempotency
     it_behaves_like 'a idempotent resource'
   end
+
+  describe service(service_name) do
+    it { is_expected.to be_running }
+    if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      pending 'Should be enabled - Bug 760616 on Debian 8'
+    elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+    else
+      it { is_expected.to be_enabled }
+    end
+  end
 end
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
index 8dc9ab6013..6c82a0fd52 100644
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ b/spec/acceptance/mod_fcgid_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::fcgid class', if: ((os[:family] == 'redhat' && os[:release].to_i != 5) &&
-                                         !(host_inventory['facter']['os']['name'] == 'oraclelinux' && os[:release].to_i == 7)) do
+describe 'apache::mod::fcgid class', if: ((fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') != '5') &&
+    !(fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7')) do
   context 'default fcgid config' do
     pp = <<-MANIFEST
         class { 'epel': } # mod_fcgid lives in epel
@@ -39,6 +39,11 @@ class { 'apache::mod::fcgid':
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service('httpd') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
     it 'answers to fcgid.example.com' do
       shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
         expect(r.stdout).to match(%r{^Hello world$})
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
index e9ae963c55..4cb67a5606 100644
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ b/spec/acceptance/mod_pagespeed_spec.rb
@@ -37,6 +37,11 @@ class { 'apache::mod::pagespeed':
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service($service_name) do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
     it 'answers to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
       shell('/usr/bin/curl pagespeed.example.com:80') do |r|
         expect(r.stdout).to match(%r{head\/})
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 3983fe7556..c77c6e3da0 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -55,6 +55,17 @@ class { 'apache::mod::passenger': }
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     expected_one = [%r{Apache processes}, %r{Nginx processes}, %r{Passenger processes}]
     it 'outputs status via passenger-memory-stats #stdout' do
       expected_one.each do |expect|
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
index 6bd4634d8c..cf87291c0c 100644
--- a/spec/acceptance/mod_security_spec.rb
+++ b/spec/acceptance/mod_security_spec.rb
@@ -2,8 +2,8 @@
 require_relative './version.rb'
 
 describe 'apache::mod::security class', unless: (fact('osfamily') == 'Debian' && (fact('lsbdistcodename') == 'squeeze' ||
-                                                fact('lsbdistcodename') == 'lucid' || fact('lsbdistcodename') == 'precise' ||
-                                                fact('lsbdistcodename') == 'wheezy')) || (fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') < '11') do
+    fact('lsbdistcodename') == 'lucid' || fact('lsbdistcodename') == 'precise' ||
+    fact('lsbdistcodename') == 'wheezy')) || (fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') < '11') do
   context 'default mod_security config' do
     if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') =~ %r{(5|6)}
       pp_one = "class { 'epel': }"
@@ -105,6 +105,17 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
@@ -160,13 +171,24 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless  fact('operatingsystem') == 'SLES' ||
-            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-            (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
+    unless fact('operatingsystem') == 'SLES' ||
+           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -219,13 +241,24 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless  fact('operatingsystem') == 'SLES' ||
-            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-            (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
+    unless fact('operatingsystem') == 'SLES' ||
+           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -278,13 +311,24 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless  fact('operatingsystem') == 'SLES' ||
-            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-            (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
+    unless fact('operatingsystem') == 'SLES' ||
+           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
@@ -337,13 +381,24 @@ class { 'apache::mod::security': }
       apply_manifest(pp_one, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$mod_dir}/security.conf") do
       it { is_expected.to contain 'mod_security2.c' }
     end
 
-    unless  fact('operatingsystem') == 'SLES' ||
-            (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-            (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
+    unless fact('operatingsystem') == 'SLES' ||
+           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
+           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
       it 'blocks query with SQL' do
         shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
       end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 3e41abdda1..67ee79d5a4 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -2,8 +2,8 @@
 require_relative './version.rb'
 
 describe 'prefork_worker_spec.rb' do
-  case os[:family]
-  when 'freebsd'
+  case fact('osfamily')
+  when 'FreeBSD'
     describe 'apache::mod::event class' do
       describe 'running puppet code' do
         # Using puppet_apply as a helper
@@ -18,6 +18,17 @@ class { 'apache':
           expect(apply_manifest(pp, catch_failures: true).exit_code).to be_zero
         end
       end
+
+      describe service($service_name) do
+        it { is_expected.to be_running }
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+        else
+          it { is_expected.to be_enabled }
+        end
+      end
     end
   end
 
@@ -35,6 +46,17 @@ class { 'apache':
       # Run it twice and test for idempotency
       it_behaves_like 'a idempotent resource'
     end
+
+    describe service($service_name) do
+      it { is_expected.to be_running }
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+    end
   end
 
   describe 'apache::mod::prefork class' do
@@ -51,5 +73,16 @@ class { 'apache':
       # Run it twice and test for idempotency
       it_behaves_like 'a idempotent resource'
     end
+
+    describe service($service_name) do
+      it { is_expected.to be_running }
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+    end
   end
 end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 455a4b5bda..417dfee781 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -182,6 +182,17 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     it 'answers to first.example.com' do
       shell('/usr/bin/curl first.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from first\n")
@@ -217,6 +228,17 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.2:80>' }
       it { is_expected.to contain 'ServerName example.com' }
@@ -264,6 +286,17 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080>' }
       it { is_expected.to contain 'ServerName example.com' }
@@ -312,6 +345,17 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080 127.0.0.2:80 127.0.0.2:8080>' }
       it { is_expected.to contain 'ServerName example.com' }
@@ -375,6 +419,17 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     describe file("#{$vhost_dir}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost [::1]:80>' }
       it { is_expected.to contain 'ServerName example.com' }
@@ -427,6 +482,17 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
+      describe service($service_name) do
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+        else
+          it { is_expected.to be_enabled }
+        end
+        it { is_expected.to be_running }
+      end
+
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
@@ -482,6 +548,17 @@ class { 'apache': }
         apply_manifest(pp_one, catch_failures: true)
       end
 
+      describe service($service_name) do
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+        else
+          it { is_expected.to be_enabled }
+        end
+        it { is_expected.to be_running }
+      end
+
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/').stdout).to eq("Hello World\n")
       end
@@ -517,6 +594,17 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
+      describe service($service_name) do
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+        else
+          it { is_expected.to be_enabled }
+        end
+        it { is_expected.to be_running }
+      end
+
       it 'answers to files.example.net #stdout' do
         expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
@@ -589,6 +677,13 @@ class { 'apache': }
       end
 
       describe service($service_name) do
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+        else
+          it { is_expected.to be_enabled }
+        end
         it { is_expected.to be_running }
 
         it 'answers to files.example.net' do
@@ -622,6 +717,17 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
+      describe service($service_name) do
+        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+          pending 'Should be enabled - Bug 760616 on Debian 8'
+        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+        else
+          it { is_expected.to be_enabled }
+        end
+        it { is_expected.to be_running }
+      end
+
       it 'answers to fallback.example.net' do
         shell('/usr/bin/curl fallback.example.net:80/Does/Not/Exist') do |r|
           expect(r.stdout).to eq("Hello World\n")
@@ -651,6 +757,17 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     it 'answers to a.virt.example.com' do
       shell('/usr/bin/curl a.virt.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from a.virt\n")
@@ -692,6 +809,17 @@ class { 'apache': default_vhost => false, }
                      ), catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     it 'gets a response from the back end #stdout' do
       shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.stdout).to eq("Hello from localhost\n")
@@ -732,6 +860,17 @@ class { 'apache': default_vhost => false, }
                     ), catch_failures: true)
     end
 
+    describe service($service_name) do
+      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        pending 'Should be enabled - Bug 760616 on Debian 8'
+      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+      else
+        it { is_expected.to be_enabled }
+      end
+      it { is_expected.to be_running }
+    end
+
     it 'gets a response from the back end #stdout' do
       shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.stdout).to eq("Hello from localhost\n")

From ae087e6734c0bb6ce99e131c3aa3f9d85a06c707 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 22 Mar 2019 09:50:33 +0200
Subject: [PATCH 1486/2267] fixed

---
 spec/acceptance/mod_passenger_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index c77c6e3da0..e2c2715716 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -34,7 +34,7 @@
     # tmpdir. This is the default for apache on Ubuntu 18.04. As a result,
     # passenger CLI tools can't find the config/socket, which defaults to /tmp
     # we enable it for ubuntu 16.04/18.04, centos7 and debian 9
-    pp =  if ['7', '9', '16.04', '18.04'].include?('%g' % ('%.2f' % os[:release]))
+    pp =  if ['7', '9', '16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
             <<-MANIFEST
               /* stock apache and mod_passenger */
               class { 'apache': }

From 76ee436e90ded113f6b5f97173a3870aa87118ba Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 22 Mar 2019 13:58:27 +0200
Subject: [PATCH 1487/2267] updated init_task and itk_spec

---
 spec/acceptance/init_task_spec.rb |  2 +-
 spec/acceptance/itk_spec.rb       | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index a2af65081c..b15dbb4fb7 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -1,7 +1,7 @@
 # run a test task
 require 'spec_helper_acceptance'
 
-describe 'apache tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && host_inventory['facter']['os']['name'] != 'sles' do
+describe 'apache tasks', if: puppet_version =~ %r{(5\.\d+\.\d+)} && host_inventory['facter']['os']['name'] != 'sles' do
   describe 'reload' do
     pp = <<-MANIFEST
       class { 'apache':
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index a9370ce030..4dde4ad9de 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -3,17 +3,11 @@
 case os[:family]
 when 'debian'
   service_name = 'apache2'
-  majrelease = fact('operatingsystemmajrelease')
-  variant = if ['6', '7', '10.04', '12.04'].include?(majrelease)
-              :itk_only
-            else
-              :prefork
-            end
+  variant = :prefork
 when 'redhat'
   unless os[:release].to_i == 5
     service_name = 'httpd'
-    majrelease = os[:release].to_i
-    variant = if [6].include?(majrelease)
+    variant = if [6].include?(os[:release].to_i)
                 :itk_only
               else
                 :prefork
@@ -21,7 +15,6 @@
   end
 when 'freebsd'
   service_name = 'apache24'
-  # majrelease = fact('operatingsystemmajrelease')
   variant = :prefork
 end
 

From 887b18e3dea958e112ef3eef619b9d7b90e0fa86 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 22 Mar 2019 14:39:22 +0200
Subject: [PATCH 1488/2267] removed fact from init_task and itk_spec

---
 spec/acceptance/init_task_spec.rb | 2 +-
 spec/acceptance/itk_spec.rb       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index b15dbb4fb7..4c074e1dc4 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -1,7 +1,7 @@
 # run a test task
 require 'spec_helper_acceptance'
 
-describe 'apache tasks', if: puppet_version =~ %r{(5\.\d+\.\d+)} && host_inventory['facter']['os']['name'] != 'sles' do
+describe 'apache tasks', if: puppet_version =~ %r{(5\.\d+\.\d+)} && host_inventory['facter']['os']['name'] != 'SLES' do
   describe 'reload' do
     pp = <<-MANIFEST
       class { 'apache':
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 4dde4ad9de..81864dd1f0 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -45,9 +45,11 @@ class { 'apache':
 
   describe service(service_name) do
     it { is_expected.to be_running }
-    if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+    require 'pry'
+    binding.pry
+    if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
       pending 'Should be enabled - Bug 760616 on Debian 8'
-    elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
       pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
     else
       it { is_expected.to be_enabled }

From 6006ca218f6893566e7b1d9b9fdf9f41dc4255ff Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 22 Mar 2019 15:03:04 +0200
Subject: [PATCH 1489/2267] removed acceptance tests for modules. They are
 covered by units. Removed tests were checking the connection to a specific
 port, or the server answer

---
 spec/acceptance/class_spec.rb          |   8 +-
 spec/acceptance/default_mods_spec.rb   |   2 +-
 spec/acceptance/mod_fcgid_spec.rb      |  58 ----
 spec/acceptance/mod_pagespeed_spec.rb  |  53 ---
 spec/acceptance/mod_passenger_spec.rb  | 115 -------
 spec/acceptance/mod_php_spec.rb        |  48 +--
 spec/acceptance/mod_security_spec.rb   | 431 -------------------------
 spec/acceptance/prefork_worker_spec.rb |  12 +-
 spec/acceptance/zzz_centos_scl_spec.rb |  45 ---
 9 files changed, 13 insertions(+), 759 deletions(-)
 delete mode 100644 spec/acceptance/mod_fcgid_spec.rb
 delete mode 100644 spec/acceptance/mod_pagespeed_spec.rb
 delete mode 100644 spec/acceptance/mod_passenger_spec.rb
 delete mode 100644 spec/acceptance/mod_security_spec.rb
 delete mode 100644 spec/acceptance/zzz_centos_scl_spec.rb

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 2cd63b6518..d86a8dfdf5 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -26,9 +26,9 @@
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -80,9 +80,9 @@ class { 'apache':
     it_behaves_like 'a idempotent resource'
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 0b6e825437..e14dca7fef 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -19,7 +19,7 @@ class { 'apache':
     end
   end
 
-  unless host_inventory['facter']['os']['name'] == 'sles' && os[:release].to_i >= 12
+  unless host_inventory['facter']['os']['name'] == 'SLES' && os[:release].to_i >= 12
     describe 'no default mods and failing' do
       before :all do
         pp = <<-PP
diff --git a/spec/acceptance/mod_fcgid_spec.rb b/spec/acceptance/mod_fcgid_spec.rb
deleted file mode 100644
index 6c82a0fd52..0000000000
--- a/spec/acceptance/mod_fcgid_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::fcgid class', if: ((fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') != '5') &&
-    !(fact('operatingsystem') == 'OracleLinux' && fact('operatingsystemmajrelease') == '7')) do
-  context 'default fcgid config' do
-    pp = <<-MANIFEST
-        class { 'epel': } # mod_fcgid lives in epel
-        class { 'apache': }
-        class { 'apache::mod::php': } # For /usr/bin/php-cgi
-        class { 'apache::mod::fcgid':
-          options => {
-            'FcgidIPCDir'  => '/var/run/fcgidsock',
-          },
-        }
-        apache::vhost { 'fcgid.example.com':
-          port        => '80',
-          docroot     => '/var/www/fcgid',
-          directories => {
-            path        => '/var/www/fcgid',
-            options     => '+ExecCGI',
-            addhandlers => {
-              handler    => 'fcgid-script',
-              extensions => '.php',
-            },
-            fcgiwrapper => {
-              command => '/usr/bin/php-cgi',
-              suffix  => '.php',
-            }
-          },
-        }
-        file { '/var/www/fcgid/index.php':
-          ensure  => file,
-          owner   => 'root',
-          group   => 'root',
-          content => "<?php echo 'Hello world'; ?>\\n",
-        }
-    MANIFEST
-    it 'succeeds in puppeting fcgid' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service('httpd') do
-      it { is_expected.to be_enabled }
-      it { is_expected.to be_running }
-    end
-
-    it 'answers to fcgid.example.com' do
-      shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
-        expect(r.stdout).to match(%r{^Hello world$})
-        expect(r.exit_code).to eq(0)
-      end
-    end
-
-    it 'runs a php-cgi process' do
-      shell('pgrep -u apache php-cgi', acceptable_exit_codes: [0])
-    end
-  end
-end
diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
deleted file mode 100644
index 4cb67a5606..0000000000
--- a/spec/acceptance/mod_pagespeed_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-# Only run the test on centos 7, this is to cut down on the different types of setup
-# required. Installing the dependancies are highly prone to failure.
-describe 'apache::mod::pagespeed class', if:   ((host_inventory['facter']['os']['name'] == 'centos') &&
-   (os[:release].to_i == 7)) do
-  context 'default pagespeed config' do
-    pp = <<-MANIFEST
-       yumrepo { 'mod-pagespeed':
-        baseurl  => "http://dl.google.com/linux/mod-pagespeed/rpm/stable/$::architecture",
-          enabled  => 1,
-          gpgcheck => 1,
-          gpgkey   => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',
-          before   => Class['apache'],
-        }
-
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::pagespeed':
-          enable_filters  => ['remove_comments'],
-          disable_filters => ['extend_cache'],
-          forbid_filters  => ['rewrite_javascript'],
-        }
-        apache::vhost { 'pagespeed.example.com':
-          port    => '80',
-          docroot => '#{$doc_root}/pagespeed',
-        }
-        host { 'pagespeed.example.com': ip => '127.0.0.1', }
-        file { '#{$doc_root}/pagespeed/index.html':
-          ensure  => file,
-          content => "<html>\n<!-- comment -->\n<body>\n<p>Hello World!</p>\n</body>\n</html>",
-        }
-    MANIFEST
-    it 'succeeds in puppeting pagespeed' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      it { is_expected.to be_enabled }
-      it { is_expected.to be_running }
-    end
-
-    it 'answers to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
-      shell('/usr/bin/curl pagespeed.example.com:80') do |r|
-        expect(r.stdout).to match(%r{head\/})
-        expect(r.stdout).not_to match(%r{<!-- comment -->})
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end
-end
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
deleted file mode 100644
index e2c2715716..0000000000
--- a/spec/acceptance/mod_passenger_spec.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache::mod::passenger class', if: os[:family] == 'debian' do
-  rackapp_user = 'www-data'
-  rackapp_group = 'www-data'
-
-  pp_rackapp = <<-MANIFEST
-    /* a simple ruby rack 'hello world' app */
-    file { '/var/www/passenger':
-      ensure => directory,
-      owner  => '#{rackapp_user}',
-      group  => '#{rackapp_group}',
-    }
-    file { '/var/www/passenger/config.ru':
-      ensure  => file,
-      owner   => '#{rackapp_user}',
-      group   => '#{rackapp_group}',
-      content => "app = proc { |env| [200, { \\"Content-Type\\" => \\"text/html\\" }, [\\"hello <b>world</b>\\"]] }\\nrun app",
-    }
-    apache::vhost { 'passenger.example.com':
-      port          => '80',
-      docroot       => '/var/www/passenger/public',
-      docroot_group => '#{rackapp_group}',
-      docroot_owner => '#{rackapp_user}',
-      require       => File['/var/www/passenger/config.ru'],
-    }
-    host { 'passenger.example.com': ip => '127.0.0.1', }
-  MANIFEST
-
-  context 'default passenger config' do
-    # We need to set passenger_instance_registry_dir on every sane distro
-    # with systemd. Systemd can force processes into a seperate/private
-    # tmpdir. This is the default for apache on Ubuntu 18.04. As a result,
-    # passenger CLI tools can't find the config/socket, which defaults to /tmp
-    # we enable it for ubuntu 16.04/18.04, centos7 and debian 9
-    pp =  if ['7', '9', '16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
-            <<-MANIFEST
-              /* stock apache and mod_passenger */
-              class { 'apache': }
-              class { 'apache::mod::passenger':
-                passenger_instance_registry_dir => '/var/run',
-              }
-              #{pp_rackapp}
-            MANIFEST
-          else
-            <<-MANIFEST
-              /* stock apache and mod_passenger */
-              class { 'apache': }
-              class { 'apache::mod::passenger': }
-              #{pp_rackapp}
-            MANIFEST
-          end
-    it 'succeeds in puppeting passenger' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    expected_one = [%r{Apache processes}, %r{Nginx processes}, %r{Passenger processes}]
-    it 'outputs status via passenger-memory-stats #stdout' do
-      expected_one.each do |expect|
-        shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats') do |r|
-          expect(r.stdout).to match(expect)
-        end
-      end
-    end
-    it 'outputs status via passenger-memory-stats #exit_code' do
-      shell('PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-
-    it 'outputs status via passenger-status #General information' do
-      shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
-        # spacing may vary
-        expect(r.stdout).to match(%r{[\-]+ General information [\-]+})
-      end
-    end
-
-    expected_two = [%r{Max pool size[ ]+: [0-9]+}, %r{Processes[ ]+: [0-9]+}, %r{Requests in top-level queue[ ]+: [0-9]+}]
-    it 'outputs status via passenger-status #stdout' do
-      shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
-        expected_two.each do |expect|
-          expect(r.stdout).to match(expect)
-        end
-      end
-    end
-    it 'outputs status via passenger-status #exit_code' do
-      shell('PATH=/usr/bin:$PATH PASSENGER_INSTANCE_REGISTRY_DIR=/var/run /usr/sbin/passenger-status') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-
-    it 'answers to passenger.example.com #stdout' do
-      shell('/usr/bin/curl passenger.example.com:80') do |r|
-        expect(r.stdout).to match(%r{^hello <b>world<\/b>$})
-      end
-    end
-    it 'answers to passenger.example.com #exit_code' do
-      shell('/usr/bin/curl passenger.example.com:80') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end
-end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 8f30dbaac6..2cf139eceb 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -4,28 +4,6 @@
 unless host_inventory['facter']['os']['name'] == 'sles' && os[:release].to_i >= 12
   describe 'apache::mod::php class' do
     context 'default php config' do
-      if ['16.04', '18.04'].include?(fact('operatingsystemmajrelease'))
-        # this policy defaults to 101. it prevents newly installed services from starting
-        # it is useful for containers, it prevents new processes during 'docker build'
-        # but we actually want to test the services and this should not behave like docker
-        # but like a normal operating system
-
-        # without this apache fails to start -> installation of mod-php-something fails because it reloads apache to enable the module
-        # exit codes are documented at https://askubuntu.com/a/365912. Default for docker images is 101
-        shell("if [ -a '/usr/sbin/policy-rc.d' ]; then sed -i 's/^exit.*/exit 0/' /usr/sbin/policy-rc.d; fi")
-      end
-      if fact('operatingsystemmajrelease') == '18.04'
-        # apache helper script has a bug which prevents the installation of certain apache modules
-        # https://bugs.launchpad.net/ubuntu/+source/php7.2/+bug/1771934
-        # https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1782806
-        pp1 = "class { 'apache': mpm_module => 'prefork',}"
-        it 'succeeds in installing apache' do
-          apply_manifest(pp1, catch_failures: true)
-        end
-        it 'fixes the broken apache2 helper from Ubuntu 18.04' do
-          shell("sed -i 's|a2query -m \"$mpm_$MPM\"|a2query -m \"mpm_$MPM\"|' /usr/share/apache2/apache2-maintscript-helper")
-        end
-      end
       pp = <<-MANIFEST
           class { 'apache':
             mpm_module => 'prefork',
@@ -45,12 +23,12 @@ class { 'apache::mod::php': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      if (host_inventory['facter']['os']['name'] == 'ubuntu' && fact('operatingsystemmajrelease') == '16.04') ||
+      if (host_inventory['facter']['os']['name'] == 'ubuntu' && host_inventory['facter']['os']['release']['full'] == '16.04') ||
          (host_inventory['facter']['os']['name'] == 'debian' && os[:release].to_i == 9)
         describe file("#{$mod_dir}/php7.0.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
-      elsif host_inventory['facter']['os']['name'] == 'ubuntu' && fact('operatingsystemmajrelease') == '18.04'
+      elsif host_inventory['facter']['os']['name'] == 'ubuntu' && host_inventory['facter']['os']['release']['full'] == '18.04'
         describe file("#{$mod_dir}/php7.2.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
@@ -59,17 +37,6 @@ class { 'apache::mod::php': }
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
       end
-
-      it 'answers to php.example.com #stdout' do
-        shell('/usr/bin/curl php.example.com:80') do |r|
-          expect(r.stdout).to match(%r{PHP Version})
-        end
-      end
-      it 'answers to php.example.com #exit_code' do
-        shell('/usr/bin/curl php.example.com:80') do |r|
-          expect(r.exit_code).to eq(0)
-        end
-      end
     end
 
     context 'custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value' do
@@ -105,17 +72,6 @@ class { 'apache::mod::php':
         it { is_expected.to contain '  php_admin_flag engine on' }
         it { is_expected.to contain '  php_admin_value open_basedir /var/www/php/:/usr/share/pear/' }
       end
-
-      it 'answers to php.example.com #stdout' do
-        shell('/usr/bin/curl php.example.com:80') do |r|
-          expect(r.stdout).to match(%r{\/usr\/share\/pear\/})
-        end
-      end
-      it 'answers to php.example.com #exit_code' do
-        shell('/usr/bin/curl php.example.com:80') do |r|
-          expect(r.exit_code).to eq(0)
-        end
-      end
     end
   end
 end
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
deleted file mode 100644
index cf87291c0c..0000000000
--- a/spec/acceptance/mod_security_spec.rb
+++ /dev/null
@@ -1,431 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache::mod::security class', unless: (fact('osfamily') == 'Debian' && (fact('lsbdistcodename') == 'squeeze' ||
-    fact('lsbdistcodename') == 'lucid' || fact('lsbdistcodename') == 'precise' ||
-    fact('lsbdistcodename') == 'wheezy')) || (fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') < '11') do
-  context 'default mod_security config' do
-    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') =~ %r{(5|6)}
-      pp_one = "class { 'epel': }"
-      it 'adds epel' do
-        apply_manifest(pp_one, catch_failures: true)
-      end
-    elsif fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
-      pp_two = <<-MANIFEST
-          ini_setting { 'obsoletes':
-            path    => '/etc/yum.conf',
-            section => 'main',
-            setting => 'obsoletes',
-            value   => '0',
-          }
-      MANIFEST
-      it 'changes obsoletes, per PUP-4497' do
-        apply_manifest(pp_two, catch_failures: true)
-      end
-    end
-
-    pp_three = <<-MANIFEST
-        host { 'modsec.example.com': ip => '127.0.0.1', }
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port    => '80',
-          docroot => '#{$doc_root}/html',
-        }
-        file { '#{$doc_root}/html/index.html':
-          ensure  => file,
-          content => 'Index page',
-        }
-    MANIFEST
-    it 'succeeds in puppeting mod_security' do
-      apply_manifest(pp_three, catch_failures: true)
-
-      # Need to add a short sleep here because on RHEL6 the service takes a bit longer to init
-      if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') =~ %r{(5|6)}
-        sleep 5
-      end
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe package($package_name) do
-      it { is_expected.to be_installed }
-    end
-
-    describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain 'mod_security2.c' }
-    end
-
-    describe 'should be listening on port 80' do
-      it 'returns index page #stdout' do
-        shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
-          expect(r.stdout).to match(%r{Index page})
-        end
-      end
-      it 'returns index page #exit_code' do
-        shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
-          expect(r.exit_code).to eq(0)
-        end
-      end
-
-      unless fact('operatingsystem') == 'SLES' ||
-             (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-             (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
-        it 'blocks query with SQL' do
-          shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
-        end
-      end
-    end
-  end # default mod_security config
-
-  context 'mod_security should allow disabling by vhost' do
-    pp_one = <<-MANIFEST
-        host { 'modsec.example.com': ip => '127.0.0.1', }
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port    => '80',
-          docroot => '#{$doc_root}/html',
-        }
-        file { '#{$doc_root}/html/index.html':
-          ensure  => file,
-          content => 'Index page',
-        }
-    MANIFEST
-    it 'succeeds in puppeting mod_security' do
-      apply_manifest(pp_one, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain 'mod_security2.c' }
-    end
-
-    unless fact('operatingsystem') == 'SLES' ||
-           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
-      it 'blocks query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
-      end
-    end
-
-    pp_two = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port                 => '80',
-          docroot              => '#{$doc_root}/html',
-          modsec_disable_vhost => true,
-        }
-    MANIFEST
-    it 'disables mod_security per vhost' do
-      apply_manifest(pp_two, catch_failures: true)
-    end
-
-    it 'returns index page #stdout' do
-      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.stdout).to match(%r{Index page})
-      end
-    end
-    it 'returns index page #exit_code' do
-      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end # mod_security should allow disabling by vhost
-
-  context 'mod_security should allow disabling by ip' do
-    pp_one = <<-MANIFEST
-        host { 'modsec.example.com': ip => '127.0.0.1', }
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port    => '80',
-          docroot => '#{$doc_root}/html',
-        }
-        file { '#{$doc_root}/html/index.html':
-          ensure  => file,
-          content => 'Index page',
-        }
-    MANIFEST
-    it 'succeeds in puppeting mod_security' do
-      apply_manifest(pp_one, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain 'mod_security2.c' }
-    end
-
-    unless fact('operatingsystem') == 'SLES' ||
-           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
-      it 'blocks query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
-      end
-    end
-
-    pp_two = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port               => '80',
-          docroot            => '#{$doc_root}/html',
-          modsec_disable_ips => [ '127.0.0.1' ],
-        }
-    MANIFEST
-    it 'disables mod_security per vhost' do
-      apply_manifest(pp_two, catch_failures: true)
-    end
-
-    it 'returns index page #stdout' do
-      shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
-        expect(r.stdout).to match(%r{Index page})
-      end
-    end
-    it 'returns index page #exit_code' do
-      shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end # mod_security should allow disabling by ip
-
-  context 'mod_security should allow disabling by id' do
-    pp_one = <<-MANIFEST
-        host { 'modsec.example.com': ip => '127.0.0.1', }
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port    => '80',
-          docroot => '#{$doc_root}/html',
-        }
-        file { '#{$doc_root}/html/index.html':
-          ensure  => file,
-          content => 'Index page',
-        }
-        file { '#{$doc_root}/html/index2.html':
-          ensure  => file,
-          content => 'Page 2',
-        }
-    MANIFEST
-    it 'succeeds in puppeting mod_security' do
-      apply_manifest(pp_one, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain 'mod_security2.c' }
-    end
-
-    unless fact('operatingsystem') == 'SLES' ||
-           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
-      it 'blocks query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
-      end
-    end
-
-    pp_two = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port               => '80',
-          docroot            => '#{$doc_root}/html',
-          modsec_disable_ids => [ '950007' ],
-        }
-    MANIFEST
-    it 'disables mod_security per vhost' do
-      apply_manifest(pp_two, catch_failures: true)
-    end
-
-    it 'returns index page #stdout' do
-      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.stdout).to match(%r{Index page})
-      end
-    end
-    it 'returns index page #exit_code' do
-      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end # mod_security should allow disabling by id
-
-  context 'mod_security should allow disabling by msg' do
-    pp_one = <<-MANIFEST
-        host { 'modsec.example.com': ip => '127.0.0.1', }
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port    => '80',
-          docroot => '#{$doc_root}/html',
-        }
-        file { '#{$doc_root}/html/index.html':
-          ensure  => file,
-          content => 'Index page',
-        }
-        file { '#{$doc_root}/html/index2.html':
-          ensure  => file,
-          content => 'Page 2',
-        }
-    MANIFEST
-    it 'succeeds in puppeting mod_security' do
-      apply_manifest(pp_one, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain 'mod_security2.c' }
-    end
-
-    unless fact('operatingsystem') == 'SLES' ||
-           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
-      it 'blocks query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
-      end
-    end
-
-    pp_two = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port               => '80',
-          docroot            => '#{$doc_root}/html',
-          modsec_disable_msgs => [ 'Blind SQL Injection Attack' ],
-        }
-    MANIFEST
-    it 'disables mod_security per vhost' do
-      apply_manifest(pp_two, catch_failures: true)
-    end
-
-    it 'returns index page #stdout' do
-      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.stdout).to match(%r{Index page})
-      end
-    end
-    it 'returns index page #exit_code' do
-      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end # mod_security should allow disabling by msg
-
-  context 'mod_security should allow disabling by tag' do
-    pp_one = <<-MANIFEST
-        host { 'modsec.example.com': ip => '127.0.0.1', }
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port    => '80',
-          docroot => '#{$doc_root}/html',
-        }
-        file { '#{$doc_root}/html/index.html':
-          ensure  => file,
-          content => 'Index page',
-        }
-        file { '#{$doc_root}/html/index2.html':
-          ensure  => file,
-          content => 'Page 2',
-        }
-    MANIFEST
-    it 'succeeds in puppeting mod_security' do
-      apply_manifest(pp_one, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$mod_dir}/security.conf") do
-      it { is_expected.to contain 'mod_security2.c' }
-    end
-
-    unless fact('operatingsystem') == 'SLES' ||
-           (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-           (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
-      it 'blocks query with SQL' do
-        shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', acceptable_exit_codes: [22]
-      end
-    end
-
-    pp_two = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::security': }
-        apache::vhost { 'modsec.example.com':
-          port                => '80',
-          docroot             => '#{$doc_root}/html',
-          modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION' ],
-        }
-    MANIFEST
-    it 'disables mod_security per vhost' do
-      apply_manifest(pp_two, catch_failures: true)
-    end
-
-    it 'returns index page #stdout' do
-      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.stdout).to match(%r{Index page})
-      end
-    end
-    it 'returns index page #exit_code' do
-      shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r|
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end # mod_security should allow disabling by tag
-end # apache::mod::security class
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 67ee79d5a4..b312c62b2d 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -21,9 +21,9 @@ class { 'apache':
 
       describe service($service_name) do
         it { is_expected.to be_running }
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
           pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
@@ -49,9 +49,9 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.to be_running }
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -76,9 +76,9 @@ class { 'apache':
 
     describe service($service_name) do
       it { is_expected.to be_running }
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
diff --git a/spec/acceptance/zzz_centos_scl_spec.rb b/spec/acceptance/zzz_centos_scl_spec.rb
deleted file mode 100644
index 6286f0c07f..0000000000
--- a/spec/acceptance/zzz_centos_scl_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# "zzz_" got added to ensure, this test runs last, as it breaks the non-SCL httpd in later tests
-require 'spec_helper_acceptance'
-
-describe 'CentOS with SCL enabled', if: (host_inventory['facter']['os']['name'] == 'centos' && os[:release].to_i != 5) do
-  context 'when setting the respective parameters' do
-    pp = <<-MANIFEST
-      package { 'centos-release-scl-rh':
-        ensure => installed,
-      }
-      host { 'sclphp.example.com':
-        ip => '127.0.0.1',
-      }
-      class { 'apache::version':
-        scl_httpd_version => '2.4',
-        scl_php_version   => '7.0',
-      }
-      class { 'apache':
-        mpm_module => 'prefork',
-      }
-      class { 'apache::mod::php': }
-      apache::vhost { 'sclphp.example.com':
-        port    => '80',
-        docroot => '/opt/rh/httpd24/root/var/www/php',
-      }
-      file { '/opt/rh/httpd24/root/var/www/php/index.php':
-        ensure  => file,
-        content => "<?php echo 'Hello world'; ?>",
-      }
-    MANIFEST
-
-    it 'succeeds in puppeting Apache and PHP from SCL' do
-      # stop the non-SCL Apache before this test
-      shell('service httpd stop')
-
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    it 'answers to sclphp.example.com' do
-      shell("/usr/bin/curl -H 'Host: sclphp.example.com' 127.0.0.1:80") do |r|
-        expect(r.stdout).to eq('Hello world')
-        expect(r.exit_code).to eq(0)
-      end
-    end
-  end
-end

From efd25f31d695f9ee096b63e8d397fd0f041c2e8a Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 22 Mar 2019 15:04:38 +0200
Subject: [PATCH 1490/2267] updated to host_invetory[facter]

---
 spec/acceptance/itk_spec.rb            | 18 ++++++------------
 spec/acceptance/mod_php_spec.rb        |  8 ++++----
 spec/acceptance/prefork_worker_spec.rb |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 81864dd1f0..4376b00d0a 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -1,19 +1,15 @@
 require 'spec_helper_acceptance'
 
-case os[:family]
-when 'debian'
+case host_inventory['facter']['os']['family']
+when 'Debian'
   service_name = 'apache2'
   variant = :prefork
-when 'redhat'
-  unless os[:release].to_i == 5
+when 'RedHat'
+  unless host_inventory['facter']['os']['release']['major'] == '5'
+    variant = (os[:release].to_i >= 7) ? :prefork : :itk_only
     service_name = 'httpd'
-    variant = if [6].include?(os[:release].to_i)
-                :itk_only
-              else
-                :prefork
-              end
   end
-when 'freebsd'
+when 'FreeBSD'
   service_name = 'apache24'
   variant = :prefork
 end
@@ -45,8 +41,6 @@ class { 'apache':
 
   describe service(service_name) do
     it { is_expected.to be_running }
-    require 'pry'
-    binding.pry
     if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
       pending 'Should be enabled - Bug 760616 on Debian 8'
     elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 2cf139eceb..e05290b9a1 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-unless host_inventory['facter']['os']['name'] == 'sles' && os[:release].to_i >= 12
+unless host_inventory['facter']['os']['name'] == 'SLES' && os[:release].to_i >= 12
   describe 'apache::mod::php class' do
     context 'default php config' do
       pp = <<-MANIFEST
@@ -23,12 +23,12 @@ class { 'apache::mod::php': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      if (host_inventory['facter']['os']['name'] == 'ubuntu' && host_inventory['facter']['os']['release']['full'] == '16.04') ||
-         (host_inventory['facter']['os']['name'] == 'debian' && os[:release].to_i == 9)
+      if (host_inventory['facter']['os']['name'] == 'Ubuntu' && host_inventory['facter']['os']['release']['full'] == '16.04') ||
+         (host_inventory['facter']['os']['name'] == 'Debian' && os[:release].to_i == 9)
         describe file("#{$mod_dir}/php7.0.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
-      elsif host_inventory['facter']['os']['name'] == 'ubuntu' && host_inventory['facter']['os']['release']['full'] == '18.04'
+      elsif host_inventory['facter']['os']['name'] == 'Ubuntu' && host_inventory['facter']['os']['release']['full'] == '18.04'
         describe file("#{$mod_dir}/php7.2.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index b312c62b2d..6ff8651661 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -2,7 +2,7 @@
 require_relative './version.rb'
 
 describe 'prefork_worker_spec.rb' do
-  case fact('osfamily')
+  case host_inventory['facter']['os']['family']
   when 'FreeBSD'
     describe 'apache::mod::event class' do
       describe 'running puppet code' do

From 11997afc39b93a79c2f8c3a8899532a5c80ecfaa Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Mon, 25 Mar 2019 10:41:18 +0200
Subject: [PATCH 1491/2267] fixed apache_params for SLES

---
 spec/acceptance/apache_parameters_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index acb468b722..a979cdb87c 100755
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -9,7 +9,7 @@
       apply_manifest(pp, catch_failures: true)
     end
 
-    if os[:family] == 'freebsd'
+    if host_inventory['facter']['os']['family'] == 'FreeBSD'
       describe file("#{$confd_dir}/no-accf.conf.erb") do
         it { is_expected.not_to be_file }
       end
@@ -21,7 +21,7 @@
       apply_manifest(pp, catch_failures: true)
     end
 
-    if os[:family] == 'freebsd'
+    if host_inventory['facter']['os']['family'] == 'FreeBSD'
       describe file("#{$confd_dir}/no-accf.conf.erb") do
         it { is_expected.to be_file }
       end
@@ -111,7 +111,7 @@ class { 'apache':
     end
   end
 
-  if os[:family] == 'debian'
+  if host_inventory['facter']['os']['family'] == 'Debian'
     describe 'conf_enabled => /etc/apache2/conf-enabled' do
       pp = <<-MANIFEST
           class { 'apache':
@@ -159,7 +159,7 @@ class { 'apache':
     end
   end
 
-  if os[:family] != 'debian'
+  if host_inventory['facter']['os']['family'] != 'Debian'
     describe 'purge parameters => true' do
       pp = <<-MANIFEST
           class { 'apache':
@@ -271,7 +271,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     # Actually >= 2.4.24, but the minor version is not provided
     # https://bugs.launchpad.net/ubuntu/+source/apache2/2.4.7-1ubuntu4.15
     # basically versions of the ubuntu or sles  apache package cause issue
-    if $apache_version >= '2.4' && host_inventory['facter']['os']['name'] !~ %r{ubuntu|sles}
+    if $apache_version >= '2.4' && host_inventory['facter']['os']['name'] !~ %r{Ubuntu|SLES}
       describe 'setup' do
         it 'applies cleanly' do
           pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"

From 94168b15a3915a981048ee82ac6dab208e469446 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Mon, 25 Mar 2019 12:44:19 +0200
Subject: [PATCH 1492/2267] fixed codename issue for vhost_spec

---
 spec/acceptance/vhost_spec.rb  | 164 +++++++++++++++++----------------
 spec/spec_helper_acceptance.rb |  16 ++--
 2 files changed, 93 insertions(+), 87 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 417dfee781..2a911581fd 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -183,9 +183,9 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -229,9 +229,9 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -287,9 +287,9 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -346,9 +346,9 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -420,9 +420,9 @@ class { 'apache':
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -483,9 +483,9 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
           pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
@@ -549,9 +549,9 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
           pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
@@ -595,9 +595,9 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
           pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
@@ -677,9 +677,9 @@ class { 'apache': }
       end
 
       describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+        if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
           pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+        elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
           pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
         else
           it { is_expected.to be_enabled }
@@ -698,39 +698,41 @@ class { 'apache': }
     end
   end
 
-  case fact('lsbdistcodename')
-  when 'precise', 'wheezy'
-    context 'vhost FallbackResource example' do
-      pp = <<-MANIFEST
-        class { 'apache': }
-        apache::vhost { 'fallback.example.net':
-          docroot         => '/var/www/fallback',
-          fallbackresource => '/index.html'
-        }
-        file { '/var/www/fallback/index.html':
-          ensure  => file,
-          content => "Hello World\\n",
-        }
-        host { 'fallback.example.net': ip => '127.0.0.1', }
-      MANIFEST
-      it 'configures a vhost with FallbackResource' do
-        apply_manifest(pp, catch_failures: true)
-      end
+  unless host_inventory['facter']['os']['distro'].nil?
+    case host_inventory['facter']['os']['distro']['codename']
+    when 'precise', 'wheezy'
+      context 'vhost FallbackResource example' do
+        pp = <<-MANIFEST
+          class { 'apache': }
+          apache::vhost { 'fallback.example.net':
+            docroot         => '/var/www/fallback',
+            fallbackresource => '/index.html'
+          }
+          file { '/var/www/fallback/index.html':
+            ensure  => file,
+            content => "Hello World\\n",
+          }
+          host { 'fallback.example.net': ip => '127.0.0.1', }
+        MANIFEST
+        it 'configures a vhost with FallbackResource' do
+          apply_manifest(pp, catch_failures: true)
+        end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
+        describe service($service_name) do
+          if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
+            pending 'Should be enabled - Bug 760616 on Debian 8'
+          elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
+            pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
+          else
+            it { is_expected.to be_enabled }
+          end
+          it { is_expected.to be_running }
         end
-        it { is_expected.to be_running }
-      end
 
-      it 'answers to fallback.example.net' do
-        shell('/usr/bin/curl fallback.example.net:80/Does/Not/Exist') do |r|
-          expect(r.stdout).to eq("Hello World\n")
+        it 'answers to fallback.example.net' do
+          shell('/usr/bin/curl fallback.example.net:80/Does/Not/Exist') do |r|
+            expect(r.stdout).to eq("Hello World\n")
+          end
         end
       end
     end
@@ -758,9 +760,9 @@ class { 'apache': }
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -810,9 +812,9 @@ class { 'apache': default_vhost => false, }
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -861,9 +863,9 @@ class { 'apache': default_vhost => false, }
     end
 
     describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8'
+      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
         pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
         pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
       else
         it { is_expected.to be_enabled }
@@ -994,9 +996,9 @@ class { 'apache': }
 
     describe file($ports_file) do
       it { is_expected.to be_file }
-      if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
+      if fact('osfamily') == 'RedHat' && host_inventory['facter']['os']['release']['major'] == '7' ||
          fact('osfamily') == 'Debian' ||
-         fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') >= '12'
+         host_inventory['facter']['os']['name'] == 'SLES' && fact('operatingsystemrelease') >= '12'
         it { is_expected.not_to contain 'NameVirtualHost test.server' }
       else
         it { is_expected.to contain 'NameVirtualHost test.server' }
@@ -1309,7 +1311,7 @@ class { 'apache': service_ensure => stopped, }
   end
 
   describe 'rack_base_uris' do
-    unless fact('osfamily') == 'RedHat' || fact('operatingsystem') == 'SLES'
+    unless fact('osfamily') == 'RedHat' || host_inventory['facter']['os']['name'] == 'SLES'
       test = -> do
         pp = <<-MANIFEST
           class { 'apache': }
@@ -1499,28 +1501,31 @@ class { 'apache': }
   end
 
   describe 'wsgi' do
-    context 'on lucid', if: fact('lsbdistcodename') == 'lucid' do
-      pp = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::wsgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot                     => '/tmp',
-          wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => 'wsgi',
-          wsgi_daemon_process_options => {processes => '2'},
-          wsgi_process_group          => 'nobody',
-          wsgi_script_aliases         => { '/test' => '/test1' },
-          wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
-          wsgi_pass_authorization     => 'On',
-        }
-      MANIFEST
-      it 'import_script applies cleanly' do
-        apply_manifest(pp, catch_failures: true)
+    require 'pry'
+    binding.pry
+    unless host_inventory['facter']['os']['distro'].nil?
+      context 'on lucid', if: host_inventory['facter']['os']['distro']['codename'] == 'lucid' do
+        pp = <<-MANIFEST
+          class { 'apache': }
+          class { 'apache::mod::wsgi': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            docroot                     => '/tmp',
+            wsgi_application_group      => '%{GLOBAL}',
+            wsgi_daemon_process         => 'wsgi',
+            wsgi_daemon_process_options => {processes => '2'},
+            wsgi_process_group          => 'nobody',
+            wsgi_script_aliases         => { '/test' => '/test1' },
+            wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
+            wsgi_pass_authorization     => 'On',
+          }
+        MANIFEST
+        it 'import_script applies cleanly' do
+          apply_manifest(pp, catch_failures: true)
+        end
       end
-    end
 
-    context 'on everything but lucid', unless: (fact('lsbdistcodename') == 'lucid' || fact('operatingsystem') == 'SLES') do
+    context 'on everything but lucid', unless: (host_inventory['facter']['os']['distro']['codename'] == 'lucid' || host_inventory['facter']['os']['name'] == 'SLES') do
       pp = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::wsgi': }
@@ -1554,6 +1559,7 @@ class { 'apache::mod::wsgi': }
         it { is_expected.to contain 'WSGIChunkedRequest On' }
       end
     end
+    end
   end
 
   describe 'custom_fragment' do
@@ -1596,7 +1602,7 @@ class { 'apache': }
 
   # Limit testing to Debian, since Centos does not have fastcgi package.
   # In addition Debian 9/Ubuntu 18.04 no longer support this fastcgi
-  if fact('osfamily') == 'Debian' && !['9', '18.04'].include?(fact('operatingsystemmajrelease'))
+  if fact('osfamily') == 'Debian' && !['9', '18.04'].include?(host_inventory['facter']['os']['release']['major'])
     describe 'fastcgi' do
       pp_one = <<-MANIFEST
         $_os = $::operatingsystem
@@ -1745,7 +1751,7 @@ class { 'apache': }
     end
   end
 
-  describe 'shibboleth parameters', if: (fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') != '7') do
+  describe 'shibboleth parameters', if: (fact('osfamily') == 'Debian' && host_inventory['facter']['os']['release']['major'] != '7') do
     # Debian 7 is too old for ShibCompatValidUser
     pp = <<-MANIFEST
       class { 'apache': }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 20d6685018..498c82648c 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -26,7 +26,7 @@
 
   # detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case
   # also note how fact('puppetversion') is not available because of PUP-4359
-  if fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '8' && shell('puppet --version').stdout =~ %r{^4\.2}
+  if host_inventory['facter']['os']['family'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8' && shell('puppet --version').stdout =~ %r{^4\.2}
     c.filter_run_excluding skip_pup_5016: true
   end
 
@@ -34,15 +34,15 @@
   c.before :suite do
     run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
     # net-tools required for netstat utility being used by be_listening
-    if (fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7') ||
-       (fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '9') ||
-       (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '18.04')
+    if (host_inventory['facter']['os']['family'] == 'RedHat' && host_inventory['facter']['os']['release']['major'] == '7') ||
+       (host_inventory['facter']['os']['family'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '9') ||
+       (host_inventory['facter']['os']['name'] == 'Ubuntu' && host_inventory['facter']['os']['release']['full'] == '18.04')
       pp = <<-EOS
         package { 'net-tools': ensure => installed }
       EOS
 
       apply_manifest_on(agents, pp, catch_failures: false)
-    elsif fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '15'
+    elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
       pp = <<-EOS
         package { 'net-tools-deprecated': ensure => installed }
       EOS
@@ -50,7 +50,7 @@
       apply_manifest_on(agents, pp, catch_failures: false)
     end
 
-    if fact('osfamily') == 'Debian'
+    if host_inventory['facter']['os']['family'] == 'Debian'
       # Make sure snake-oil certs are installed.
       shell 'apt-get install -y ssl-cert'
     end
@@ -58,7 +58,7 @@
     # Install module and dependencies
     hosts.each do |host|
       # Required for mod_passenger tests.
-      if fact('osfamily') == 'RedHat'
+      if host_inventory['facter']['os']['family'] == 'RedHat'
         on host, puppet('module', 'install', 'stahnma/epel')
         on host, puppet('module', 'install', 'puppetlabs/inifile')
         # we need epel installed, so we can get plugins, wsgi, mime ...
@@ -70,7 +70,7 @@ class { 'epel': }
       end
 
       # Required for manifest to make mod_pagespeed repository available
-      if fact('osfamily') == 'Debian'
+      if host_inventory['facter']['os']['family'] == 'Debian'
         on host, puppet('module', 'install', 'puppetlabs-apt')
       end
 

From 5da8cc571a04e87bf5f64173384237948748ebaf Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Mon, 25 Mar 2019 14:27:53 +0200
Subject: [PATCH 1493/2267] updated Readme file and fixed rubocop

---
 README.md                     | 22 ++++++++++++++++++++++
 spec/acceptance/vhost_spec.rb | 32 +++++++++++++++-----------------
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index a4da3cb8aa..070649e332 100755
--- a/README.md
+++ b/README.md
@@ -6018,6 +6018,28 @@ The [`apache::mod::suphp`][] class is untested since repositories are missing co
 <a id="development"></a> 
 ## Development
 
+### Testing
+
+Due to the difficult and slow process of acceptance testing, modules will now tested with unit tests.
+
+To run the unit tests you have to install all the necessary gems:
+
+```
+bundle install
+```
+
+And then execute the command:
+
+```
+bundle exec rake parallel_spec
+```
+
+To check the code coverage you can run the command:
+
+```
+COVERAGE=yes bundle exec rake parallel_spec
+```
+
 ### Contributing
 
 [Puppet][] modules on the [Puppet Forge][] are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve.
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2a911581fd..d587ba1d7b 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1501,8 +1501,6 @@ class { 'apache': }
   end
 
   describe 'wsgi' do
-    require 'pry'
-    binding.pry
     unless host_inventory['facter']['os']['distro'].nil?
       context 'on lucid', if: host_inventory['facter']['os']['distro']['codename'] == 'lucid' do
         pp = <<-MANIFEST
@@ -1525,8 +1523,8 @@ class { 'apache::mod::wsgi': }
         end
       end
 
-    context 'on everything but lucid', unless: (host_inventory['facter']['os']['distro']['codename'] == 'lucid' || host_inventory['facter']['os']['name'] == 'SLES') do
-      pp = <<-MANIFEST
+      context 'on everything but lucid', unless: (host_inventory['facter']['os']['distro']['codename'] == 'lucid' || host_inventory['facter']['os']['name'] == 'SLES') do
+        pp = <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::wsgi': }
         host { 'test.server': ip => '127.0.0.1' }
@@ -1544,22 +1542,22 @@ class { 'apache::mod::wsgi': }
           wsgi_chunked_request        => 'On',
         }
       MANIFEST
-      it 'import_script applies cleanly' do
-        apply_manifest(pp, catch_failures: true)
-      end
+        it 'import_script applies cleanly' do
+          apply_manifest(pp, catch_failures: true)
+        end
 
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { is_expected.to be_file }
-        it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
-        it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
-        it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
-        it { is_expected.to contain 'WSGIProcessGroup nobody' }
-        it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
-        it { is_expected.to contain 'WSGIPassAuthorization On' }
-        it { is_expected.to contain 'WSGIChunkedRequest On' }
+        describe file("#{$vhost_dir}/25-test.server.conf") do
+          it { is_expected.to be_file }
+          it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
+          it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
+          it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
+          it { is_expected.to contain 'WSGIProcessGroup nobody' }
+          it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
+          it { is_expected.to contain 'WSGIPassAuthorization On' }
+          it { is_expected.to contain 'WSGIChunkedRequest On' }
+        end
       end
     end
-    end
   end
 
   describe 'custom_fragment' do

From a0fa23519e7ebe4829331906cbedda9433f8859f Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Mon, 25 Mar 2019 16:02:48 +0200
Subject: [PATCH 1494/2267] Readme updates

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 070649e332..26f6aa198f 100755
--- a/README.md
+++ b/README.md
@@ -6020,7 +6020,7 @@ The [`apache::mod::suphp`][] class is untested since repositories are missing co
 
 ### Testing
 
-Due to the difficult and slow process of acceptance testing, modules will now tested with unit tests.
+Due to the difficult and specialised nature of acceptance testing mods in apache IE (high OS specificity), we have moved those acceptance tests into unit tests as much as possible.
 
 To run the unit tests you have to install all the necessary gems:
 

From 807b8464aa802ac9d85da27838463698256444c6 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Mon, 25 Mar 2019 15:58:47 +0200
Subject: [PATCH 1495/2267] MODULES-3958 Get rid of mocha-based stubbing across
 all modules

---
 .sync.yml                               | 10 ++++--
 metadata.json                           |  4 +--
 spec/spec_helper.rb                     |  5 +++
 spec/spec_helper_local.rb               | 48 ++++++++++++++++++-------
 spec/unit/provider/a2mod/gentoo_spec.rb | 24 ++++++++-----
 5 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index bfeeb145a3..c1b38c2de0 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,4 +1,7 @@
 ---
+.gitlab-ci.yml:
+  unmanaged: true
+
 .gitignore:
   required:
     - ---.project
@@ -43,5 +46,8 @@ appveyor.yml:
   default_configs:
     inherit_from: .rubocop_todo.yml
 
-.gitlab-ci.yml:
-  unmanaged: true
+
+spec/spec_helper.rb:
+  delete: true
+  mock_with: ':rspec'
+  coverage_report: true
\ No newline at end of file
diff --git a/metadata.json b/metadata.json
index 065de8911c..8245b6730c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -79,7 +79,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.8.0",
+  "pdk-version": "1.9.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-gfde5699"
+  "template-ref": "heads/master-0-g615413e"
 }
\ No newline at end of file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 93b25ecbde..1f8b6b4bcb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,7 @@
+RSpec.configure do |c|
+  c.mock_with :rspec
+end
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
@@ -34,6 +38,7 @@
   end
   c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
   c.after(:suite) do
+    RSpec::Puppet::Coverage.report!(0)
   end
 end
 
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 58b7d0a8f7..25e7fbc67f 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -1,19 +1,41 @@
-RSpec.configure do |c|
-  c.before :each do
-    # Ensure that we don't accidentally cache facts and environment
-    # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
+if ENV['COVERAGE'] == 'yes'
+  require 'simplecov'
+  require 'simplecov-console'
+  require 'codecov'
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::Console,
+    SimpleCov::Formatter::Codecov,
+  ]
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+
+    add_filter '/spec'
+
+    # do not track vendored files
+    add_filter '/vendor'
+    add_filter '/.vendor'
+
+    # do not track gitignored files
+    # this adds about 4 seconds to the coverage check
+    # this could definitely be optimized
+    add_filter do |f|
+      # system returns true if exit status is 0, which with git-check-ignore means file is ignored
+      system("git check-ignore --quiet #{f.filename}")
+    end
   end
 end
 
-RSpec.configure do |config|
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
-  # as soon as psh is updated, the following line can be removed
-  config.mock_with :rspec
-end
+# RSpec.configure do |c|
+#   c.before :each do
+#     # Ensure that we don't accidentally cache facts and environment
+#     # between test cases.
+#     Facter::Util::Loader.any_instance.stubs(:load_all)
+#     Facter.clear
+#     Facter.clear_messages
+#   end
+# end
 
 shared_examples :compile, compile: true do
   it { is_expected.to compile.with_all_deps }
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index 6c747ed63e..da958800d2 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -32,9 +32,11 @@
     end
 
     it 'normalizes parameters' do
-      filetype.expects(:read).returns(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
-      provider_class.expects(:filetype).returns(filetype)
-
+      # filetype.expects(:read).returns(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
+      allow(filetype).to receive(:read).and_return(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
+      # provider_class.expects(:filetype).returns(filetype)
+      allow(provider_class).to receive(:filetype)
+      expect(provider_class).to receive(:filetype) { filetype }
       expect(provider_class.modules).to eq(['bar', 'foo'])
     end
   end
@@ -43,7 +45,8 @@
     it 'matches providers to resources' do
       provider = instance_double('ssl_provider', name: 'ssl')
       resource = instance_double('ssl_resource')
-      resource.expects(:provider=).with(provider)
+      expect(resource).to receive(:provider=).with(provider)
+      # resource.expects(:provider=).with(provider)
 
       expect(provider_class).to receive(:instances) { [provider] }
       provider_class.prefetch('ssl' => resource)
@@ -155,8 +158,11 @@
       allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch('ssl' => @ssl)
 
-      @filetype.unstub(:backup)
-      @filetype.expects(:backup)
+      # @filetype.unstub(:backup)
+      # allow(@filetype).to receive(:backup).and_call_original
+      # @filetype.expects(:backup)
+      expect(@filetype).to receive(:backup)
+
       provider_class.flush
     end
 
@@ -170,8 +176,10 @@
       allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch('ssl' => @ssl)
 
-      @filetype.unstub(:backup)
-      @filetype.expects(:backup).never
+      # @filetype.unstub(:backup)
+      # allow(@filetype).to receive(:backup).and_call_original
+      # @filetype.expects(:backup).never
+      expect(@filetype).to receive(:backup).never
       provider_class.flush
     end
     # rubocop:enable RSpec/ExampleLength

From c46bf003dd8a615624eba95103302dfbb36ff3dc Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Thu, 28 Mar 2019 14:21:53 +0200
Subject: [PATCH 1496/2267] removed commented code

---
 spec/spec_helper_local.rb               | 10 ----------
 spec/unit/provider/a2mod/gentoo_spec.rb | 16 +---------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 25e7fbc67f..d348d87e21 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -27,16 +27,6 @@
   end
 end
 
-# RSpec.configure do |c|
-#   c.before :each do
-#     # Ensure that we don't accidentally cache facts and environment
-#     # between test cases.
-#     Facter::Util::Loader.any_instance.stubs(:load_all)
-#     Facter.clear
-#     Facter.clear_messages
-#   end
-# end
-
 shared_examples :compile, compile: true do
   it { is_expected.to compile.with_all_deps }
 end
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index da958800d2..0255897bd2 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -32,10 +32,7 @@
     end
 
     it 'normalizes parameters' do
-      # filetype.expects(:read).returns(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
-      allow(filetype).to receive(:read).and_return(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
-      # provider_class.expects(:filetype).returns(filetype)
-      allow(provider_class).to receive(:filetype)
+      expect(filetype).to receive(:read).and_return(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
       expect(provider_class).to receive(:filetype) { filetype }
       expect(provider_class.modules).to eq(['bar', 'foo'])
     end
@@ -46,7 +43,6 @@
       provider = instance_double('ssl_provider', name: 'ssl')
       resource = instance_double('ssl_resource')
       expect(resource).to receive(:provider=).with(provider)
-      # resource.expects(:provider=).with(provider)
 
       expect(provider_class).to receive(:instances) { [provider] }
       provider_class.prefetch('ssl' => resource)
@@ -158,9 +154,6 @@
       allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch('ssl' => @ssl)
 
-      # @filetype.unstub(:backup)
-      # allow(@filetype).to receive(:backup).and_call_original
-      # @filetype.expects(:backup)
       expect(@filetype).to receive(:backup)
 
       provider_class.flush
@@ -176,15 +169,8 @@
       allow(@ssl).to receive(:should).with(:ensure) { :present }
       provider_class.prefetch('ssl' => @ssl)
 
-      # @filetype.unstub(:backup)
-      # allow(@filetype).to receive(:backup).and_call_original
-      # @filetype.expects(:backup).never
       expect(@filetype).to receive(:backup).never
       provider_class.flush
     end
-    # rubocop:enable RSpec/ExampleLength
-    # rubocop:enable RSpec/MultipleExpectations
   end
-  # rubocop:enable RSpec/InstanceVariable
-  # rubocop:enable RSpec/MessageSpies
 end

From 5cb3c566f77209c71ca56ec8e850d980b02f60cb Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Tue, 22 May 2018 11:06:24 -0400
Subject: [PATCH 1497/2267] Allow setting CASRootProxiedAS per-vhost

---
 manifests/vhost.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1d5ec01ba8..515ade7ef6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -217,6 +217,7 @@
   $max_keepalive_requests                                                           = undef,
   $cas_attribute_prefix                                                             = undef,
   $cas_attribute_delimiter                                                          = undef,
+  $cas_root_proxied_as                                                              = undef,
   $cas_scrub_request_headers                                                        = undef,
   $cas_sso_enabled                                                                  = undef,
   $cas_login_url                                                                    = undef,

From 0ce47c2309f4267ca4b6d29e9cdf9908204d4dba Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Tue, 22 May 2018 12:05:57 -0400
Subject: [PATCH 1498/2267] Remind not to add trailing slash to
 CASRootProxiedAs

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 26f6aa198f..5fc865d948 100755
--- a/README.md
+++ b/README.md
@@ -1894,7 +1894,7 @@ The `cas_login_url` and `cas_validate_url` parameters are required; several othe
 
   Default: `undef`.
 
-- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied.
+- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. This URL should not include a trailing slash.
 
   Default: `undef`.
 

From f90ae201efb85e8326248afa1a8f807eb9abba1c Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Mon, 10 Dec 2018 00:08:36 -0500
Subject: [PATCH 1499/2267] Add acceptance test for CASRootProxiedAs in vhost

---
 spec/acceptance/vhost_spec.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index d587ba1d7b..fe8b93db6b 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1768,4 +1768,26 @@ class { 'apache::mod::shib': }
       it { is_expected.to contain 'ShibCompatValidUser On' }
     end
   end
+
+  describe 'cas parameters' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      class {'::apache::mod::auth_cas':
+        cas_login_url    => 'https://login.example.com/cas/login',
+        cas_validate_url => 'https://login.example.com/cas/serviceValidate',
+      }
+      apache::vhost { 'test.server':
+        port    => '80',
+        docroot => '/var/www/html',
+        cas_root_proxied_as => 'http://test.server'
+      }
+    MANIFEST
+    it 'applies cleanly' do
+      apply_manifest(pp, catch_failures: true)
+    end
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'CASRootProxiedAs http://test.server' }
+    end
+  end
 end

From e9bcb179b1b9c9f79febe76832b2e3e35cd3d42a Mon Sep 17 00:00:00 2001
From: Lavinia Dan <lavinia.gergi@gmail.com>
Date: Fri, 29 Mar 2019 11:37:46 +0200
Subject: [PATCH 1500/2267] unit tests instead of acceptance

---
 spec/acceptance/vhost_spec.rb     | 22 ----------------------
 spec/classes/mod/auth_cas_spec.rb | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index fe8b93db6b..d587ba1d7b 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1768,26 +1768,4 @@ class { 'apache::mod::shib': }
       it { is_expected.to contain 'ShibCompatValidUser On' }
     end
   end
-
-  describe 'cas parameters' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      class {'::apache::mod::auth_cas':
-        cas_login_url    => 'https://login.example.com/cas/login',
-        cas_validate_url => 'https://login.example.com/cas/serviceValidate',
-      }
-      apache::vhost { 'test.server':
-        port    => '80',
-        docroot => '/var/www/html',
-        cas_root_proxied_as => 'http://test.server'
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'CASRootProxiedAs http://test.server' }
-    end
-  end
 end
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index b5a5f62aab..611370d7a5 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -60,5 +60,32 @@
       it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
     end
+
+    context 'vhost setup', :compile do
+      let :pre_condition do
+        "class { 'apache': } apache::vhost { 'test.server': docroot => '/var/www/html', cas_root_proxied_as => 'http://test.server'} "
+      end
+
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_cas') }
+      it { is_expected.to contain_package('mod_auth_cas') }
+      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
+      it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
+      it {
+        is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASRootProxiedAs http://test.server$})
+      }
+    end
   end
 end

From 6b2507a2000c8ccd71344970b554d7a027afca66 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Wed, 3 Apr 2019 13:28:21 +0100
Subject: [PATCH 1501/2267] (MODULES-8837) - 4.1.0 Release Prep

---
 CHANGELOG.md  | 24 ++++++++++++++++++++++--
 metadata.json |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03898cec87..5fb5c02363 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,29 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [4.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.6.0) (2019-01-07)
+## [v4.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v4.1.0) (2019-04-03)
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...3.6.0)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.0.0...v4.1.0)
+
+### Added
+
+- \(MODULES-7196\) Allow setting CASRootProxiedAs per virtualhost \(replaces \#1857\) [\#1900](https://github.com/puppetlabs/puppetlabs-apache/pull/1900) ([Lavinia-Dan](https://github.com/Lavinia-Dan))
+- \(feat\) - Amazon Linux 2 compatibility added [\#1898](https://github.com/puppetlabs/puppetlabs-apache/pull/1898) ([david22swan](https://github.com/david22swan))
+- \(MODULES-8731\) Allow CIDRs for proxy\_ips/internal\_proxy in remoteip [\#1891](https://github.com/puppetlabs/puppetlabs-apache/pull/1891) ([JAORMX](https://github.com/JAORMX))
+- Manage all mod\_remoteip parameters supported by Apache [\#1882](https://github.com/puppetlabs/puppetlabs-apache/pull/1882) ([johanfleury](https://github.com/johanfleury))
+- MODULES-8541 : Allow HostnameLookups to be modified [\#1881](https://github.com/puppetlabs/puppetlabs-apache/pull/1881) ([k2patel](https://github.com/k2patel))
+- Add support for mod\_http2 [\#1867](https://github.com/puppetlabs/puppetlabs-apache/pull/1867) ([smortex](https://github.com/smortex))
+- Added code to paramertize the libphp prefix [\#1852](https://github.com/puppetlabs/puppetlabs-apache/pull/1852) ([grahamuk2018](https://github.com/grahamuk2018))
+- Added WSGI Options WSGIApplicationGroup and WSGIPythonOptimize [\#1847](https://github.com/puppetlabs/puppetlabs-apache/pull/1847) ([emetriqLikedeeler](https://github.com/emetriqLikedeeler))
+
+### Fixed
+
+- \(bugfix\) set kernel for facter version test [\#1895](https://github.com/puppetlabs/puppetlabs-apache/pull/1895) ([tphoney](https://github.com/tphoney))
+- \(MODULES-5990\) - Managing conf\_enabled [\#1875](https://github.com/puppetlabs/puppetlabs-apache/pull/1875) ([david22swan](https://github.com/david22swan))
+
+## [4.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.0.0) (2019-01-10)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...4.0.0)
 
 ### Changed
 
diff --git a/metadata.json b/metadata.json
index 8245b6730c..66967c7927 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From fb47f2ebfe54bec80e1fed13500baa85ec795ad8 Mon Sep 17 00:00:00 2001
From: clairecadman <claire.cadman@puppet.com>
Date: Thu, 4 Apr 2019 11:11:26 +0100
Subject: [PATCH 1502/2267] (MODULES-8837) DOCS Release Review

This commit contains minor edits to the README.
---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 619fa33047..5c02b2a345 100755
--- a/README.md
+++ b/README.md
@@ -1130,7 +1130,7 @@ Default: '100'.
 
 ##### `hostname_lookups`
 
-This directive enables DNS lookups so that host names can be logged (and passed to CGIs/SSIs in REMOTE_HOST). Values:'On','Off','Double'.
+This directive enables DNS lookups so that host names can be logged and passed to CGIs/SSIs in REMOTE_HOST. Values:'On','Off','Double'.
 
 Default: 'Off'.
 > **Note**: If enabled, it impacts performance significantly.
@@ -1308,7 +1308,7 @@ Default: `undef`
 
 ##### `protocols_honor_order`
 
-Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines if order of Protocols determines precedence during negotiation.
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines whether the order of Protocols sets precedence during negotiation.
 
 Default: `undef`
 
@@ -2324,7 +2324,7 @@ HTTP/2 session that the server allows.
   Default: `undef`
 
 * `h2_tls_cool_down_secs`: Sets the number of seconds of idle time on a TLS
-  connection before the TLS write size falls back to small (~1300 bytes)
+  connection before the TLS write size falls back to a small (~1300 bytes)
   length.
 
   Integer.
@@ -3940,20 +3940,20 @@ directive which declares resources for early pushing to the client.
 ##### `h2_serialize_headers`
 
 Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
-directive which toggles if HTTP/2 requests shall be serialized in HTTP/1.1
+directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
 format for processing by httpd core.
 
 ##### `h2_stream_max_mem_size`
 
 Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
 directive which sets the maximum number of outgoing data bytes buffered in
-memory for an active streams.
+memory for an active stream.
 
 ##### `h2_tls_cool_down_secs`
 
 Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
 directive which sets the number of seconds of idle time on a TLS connection
-before the TLS write size falls back to small (~1300 bytes) length.
+before the TLS write size falls back to a small (~1300 bytes) length.
 
 ##### `h2_tls_warm_up_size`
 
@@ -4473,7 +4473,7 @@ Default: `undef`
 
 ##### `protocols_honor_order`
 
-Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines if order of Protocols determines precedence during negotiation.
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines wether the order of Protocols sets precedence during negotiation.
 
 Default: `undef`
 
@@ -6027,9 +6027,9 @@ The [`apache::mod::suphp`][] class is untested since repositories are missing co
 
 ### Testing
 
-Due to the difficult and specialised nature of acceptance testing mods in apache IE (high OS specificity), we have moved those acceptance tests into unit tests as much as possible.
+Due to the difficult and specialised nature of acceptance testing mods in apache IE (high OS specificity), we have replaced  acceptance tests with unit tests.
 
-To run the unit tests you have to install all the necessary gems:
+To run the unit tests, install the necessary gems:
 
 ```
 bundle install
@@ -6041,7 +6041,7 @@ And then execute the command:
 bundle exec rake parallel_spec
 ```
 
-To check the code coverage you can run the command:
+To check the code coverage, run:
 
 ```
 COVERAGE=yes bundle exec rake parallel_spec

From 30806c97ac07b19dc93178f0e9f08f55c778d2e5 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Fri, 5 Apr 2019 10:17:27 +0100
Subject: [PATCH 1503/2267] (MODULES-8837) - Prep Fix

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb5c02363..55ee7c653f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,9 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v4.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v4.1.0) (2019-04-03)
+## [4.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.1.0) (2019-04-03)
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.0.0...v4.1.0)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.0.0...4.1.0)
 
 ### Added
 

From 79db7b7dbbfd25a6c6d30a280933842e581420a4 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Wed, 10 Apr 2019 16:39:27 +0100
Subject: [PATCH 1504/2267] (MODULES-8444) - Raise lower Puppet bound

---
 metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index 66967c7927..697a6fb850 100644
--- a/metadata.json
+++ b/metadata.json
@@ -75,11 +75,11 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.7.0 < 7.0.0"
+      "version_requirement": ">= 5.5.10 < 7.0.0"
     }
   ],
   "description": "Module for Apache configuration",
   "pdk-version": "1.9.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
   "template-ref": "heads/master-0-g615413e"
-}
\ No newline at end of file
+}

From 23ec7310f0624e7d663f9ade7e469363a18462ab Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@puppet.com>
Date: Mon, 15 Apr 2019 10:34:12 +0100
Subject: [PATCH 1505/2267] pdksync - (maint) Update pdk-template to f778803

---
 .gitignore          |  2 +-
 .pdkignore          |  4 +++-
 .puppet-lint.rc     |  1 +
 .travis.yml         | 32 ++++++++++++++++++++--------
 metadata.json       |  6 +++---
 spec/spec_helper.rb | 52 ---------------------------------------------
 6 files changed, 31 insertions(+), 66 deletions(-)
 delete mode 100644 spec/spec_helper.rb

diff --git a/.gitignore b/.gitignore
index 88cf7a6c6e..3f4e2e8494 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,5 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
-.vscode/
 .envrc
+/inventory.yaml
diff --git a/.pdkignore b/.pdkignore
index 2ec773abe2..54d2cda3ab 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -22,8 +22,8 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
-.vscode/
 .envrc
+/inventory.yaml
 /appveyor.yml
 /.fixtures.yml
 /Gemfile
@@ -32,8 +32,10 @@
 /.gitlab-ci.yml
 /.pdkignore
 /Rakefile
+/rakelib/
 /.rspec
 /.rubocop.yml
 /.travis.yml
 /.yardopts
 /spec/
+/.vscode/
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index e69de29bb2..cc96ece051 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -0,0 +1 @@
+--relative
diff --git a/.travis.yml b/.travis.yml
index 99e95b17a7..485a2d84b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 ---
-dist: trusty
 language: ruby
 cache: bundler
 before_install:
@@ -12,11 +11,17 @@ script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.1
+  - 2.5.3
 env:
   global:
-    - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
     - PARALLEL_TEST_PROCESSORS=16
+stages:
+  - static
+  - spec
+  - acceptance
+  -
+    if: tag =~ ^v\d
+    name: deploy
 matrix:
   fast_finish: true
   include:
@@ -24,25 +29,34 @@ matrix:
       bundler_args: 
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
-      rvm: 2.5.1
+      rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
+      stage: acceptance
       sudo: required
     -
       bundler_args: 
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
-      rvm: 2.5.1
+      rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
+      stage: acceptance
       sudo: required
     -
-      env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
-    -
-      env: CHECK=parallel_spec
+      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+      stage: static
     -
       env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
-      rvm: 2.4.4
+      rvm: 2.4.5
+      stage: spec
+    -
+      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
+      rvm: 2.5.3
+      stage: spec
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
 branches:
   only:
     - master
diff --git a/metadata.json b/metadata.json
index 697a6fb850..16b56cf38e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -79,7 +79,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.9.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-g615413e"
+  "pdk-version": "1.10.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
+  "template-ref": "heads/master-0-gf778803"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
deleted file mode 100644
index 1f8b6b4bcb..0000000000
--- a/spec/spec_helper.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-RSpec.configure do |c|
-  c.mock_with :rspec
-end
-
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet-facts'
-
-require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
-
-include RspecPuppetFacts
-
-default_facts = {
-  puppetversion: Puppet.version,
-  facterversion: Facter.version,
-}
-
-default_fact_files = [
-  File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
-  File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')),
-]
-
-default_fact_files.each do |f|
-  next unless File.exist?(f) && File.readable?(f) && File.size?(f)
-
-  begin
-    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
-  rescue => e
-    RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
-  end
-end
-
-RSpec.configure do |c|
-  c.default_facts = default_facts
-  c.before :each do
-    # set to strictest setting for testing
-    # by default Puppet runs at warning level
-    Puppet.settings[:strict] = :warning
-  end
-  c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
-  c.after(:suite) do
-    RSpec::Puppet::Coverage.report!(0)
-  end
-end
-
-def ensure_module_defined(module_name)
-  module_name.split('::').reduce(Object) do |last_module, next_module|
-    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)
-    last_module.const_get(next_module, false)
-  end
-end
-
-# 'spec_overrides' from sync.yml will appear below this line

From 068d2226cfbba445b34348f8b24815656f454d6c Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@puppet.com>
Date: Mon, 15 Apr 2019 14:16:53 +0100
Subject: [PATCH 1506/2267] (maint) Remove delete:true for spec/spec_helper.rb

---
 .sync.yml           |  2 --
 spec/spec_helper.rb | 52 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 spec/spec_helper.rb

diff --git a/.sync.yml b/.sync.yml
index c1b38c2de0..7c941ee542 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -46,8 +46,6 @@ appveyor.yml:
   default_configs:
     inherit_from: .rubocop_todo.yml
 
-
 spec/spec_helper.rb:
-  delete: true
   mock_with: ':rspec'
   coverage_report: true
\ No newline at end of file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000000..1f8b6b4bcb
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,52 @@
+RSpec.configure do |c|
+  c.mock_with :rspec
+end
+
+require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet-facts'
+
+require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
+
+include RspecPuppetFacts
+
+default_facts = {
+  puppetversion: Puppet.version,
+  facterversion: Facter.version,
+}
+
+default_fact_files = [
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')),
+]
+
+default_fact_files.each do |f|
+  next unless File.exist?(f) && File.readable?(f) && File.size?(f)
+
+  begin
+    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
+  rescue => e
+    RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
+  end
+end
+
+RSpec.configure do |c|
+  c.default_facts = default_facts
+  c.before :each do
+    # set to strictest setting for testing
+    # by default Puppet runs at warning level
+    Puppet.settings[:strict] = :warning
+  end
+  c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
+  c.after(:suite) do
+    RSpec::Puppet::Coverage.report!(0)
+  end
+end
+
+def ensure_module_defined(module_name)
+  module_name.split('::').reduce(Object) do |last_module, next_module|
+    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)
+    last_module.const_get(next_module, false)
+  end
+end
+
+# 'spec_overrides' from sync.yml will appear below this line

From 675f648a55b0624b96ec46ff6aea5796e2aae941 Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@puppet.com>
Date: Wed, 17 Apr 2019 16:32:34 +0100
Subject: [PATCH 1507/2267] (MODULES-8931) Fix stahnma/epel failures

---
 spec/spec_helper_acceptance.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 498c82648c..e98ad28ebb 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -61,10 +61,20 @@
       if host_inventory['facter']['os']['family'] == 'RedHat'
         on host, puppet('module', 'install', 'stahnma/epel')
         on host, puppet('module', 'install', 'puppetlabs/inifile')
-        # we need epel installed, so we can get plugins, wsgi, mime ...
-        pp = <<-EOS
-          class { 'epel': }
-        EOS
+        # We need epel installed, so we can get plugins, wsgi, mime ...
+        # The osmirror is required as epel no longer supports el5
+        pp = <<-PUPPETCODE
+          if $::osfamily == 'RedHat' {
+            if $::operatingsystemmajrelease == '5' or ($::operatingsystem == 'OracleLinux' and $::operatingsystemmajrelease == '6'){
+              class { 'epel':
+                epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
+                epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
+              }
+            } else {
+              class { 'epel': }
+            }
+          }
+        PUPPETCODE
 
         apply_manifest_on(host, pp, catch_failures: true)
       end

From 65a4709c412692ebfd4c79dce2a477bedff57585 Mon Sep 17 00:00:00 2001
From: Yannick Denzer <yannick.denzer@stepping-stone.ch>
Date: Tue, 22 Jan 2019 11:04:52 +0100
Subject: [PATCH 1508/2267] Add additional commands to detect Apache version
 and make sure the regular expression actually matched something

---
 lib/facter/apache_version.rb     | 19 ++++++++++++++++---
 spec/unit/apache_version_spec.rb |  8 ++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index cd29c1dbe3..ec577ca52c 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -1,14 +1,27 @@
 Facter.add(:apache_version) do
   confine kernel: ['FreeBSD', 'Linux']
   setcode do
-    if Facter::Util::Resolution.which('apachectl')
+    apache_version = nil
+
+    if Facter::Util::Resolution.which('httpd')
+      apache_version = Facter::Util::Resolution.exec('httpd -V 2>&1')
+      Facter.debug "Matching httpd '#{apache_version}'"
+    elsif Facter::Util::Resolution.which('apache2')
+      apache_version = Facter::Util::Resolution.exec('apache2 -V 2>&1')
+      Facter.debug "Matching apache2 '#{apache_version}'"
+    elsif Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
       Facter.debug "Matching apachectl '#{apache_version}'"
-      %r{^Server version: Apache/(\d+\.\d+(\.\d+)?)}.match(apache_version)[1]
     elsif Facter::Util::Resolution.which('apache2ctl')
       apache_version = Facter::Util::Resolution.exec('apache2ctl -v 2>&1')
       Facter.debug "Matching apache2ctl '#{apache_version}'"
-      %r{^Server version: Apache/(\d+\.\d+(\.\d+)?)}.match(apache_version)[1]
+    end
+
+    unless apache_version.nil?
+      match = %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)
+      unless match.nil?
+        match[1]
+      end
     end
   end
 end
diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/apache_version_spec.rb
index c2db7a2217..d43623cb71 100644
--- a/spec/unit/apache_version_spec.rb
+++ b/spec/unit/apache_version_spec.rb
@@ -7,8 +7,8 @@
   describe 'apache_version' do
     context 'with value' do
       before :each do
-        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
-        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {
+        expect(Facter::Util::Resolution).to receive(:which).with('httpd') { true }
+        expect(Facter::Util::Resolution).to receive(:exec).with('httpd -V 2>&1') {
           'Server version: Apache/2.4.16 (Unix)
            Server built:   Jul 31 2015 15:53:26'
         }
@@ -22,8 +22,8 @@
   describe 'apache_version with empty OS' do
     context 'with value' do
       before :each do
-        expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true }
-        expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {
+        expect(Facter::Util::Resolution).to receive(:which).with('httpd') { true }
+        expect(Facter::Util::Resolution).to receive(:exec).with('httpd -V 2>&1') {
           'Server version: Apache/2.4.6 ()
            Server built:   Nov 21 2015 05:34:59'
         }

From 0d5e0bef88c741e964efc3e0c91fe4764182803f Mon Sep 17 00:00:00 2001
From: Mark Dechiaro <mdechiaro@users.noreply.github.com>
Date: Mon, 11 Feb 2019 16:12:08 -0600
Subject: [PATCH 1509/2267] Fix wsgi_daemon_process to support hash data type

The README states wsgi_daemon_process is a hash data type however the
ERB template interpolates it as a string. As this type it currently
cannot accept multiple daemon processes per vhost, and requires
wsgi_daemon_process_options to manage parameters.

This commit adds logic to the parameter to support this data type while
maintaining original functionality. The data type allows for multiple
daemons per vhost, and deprecates wsgi_daemon_process_options.
---
 README.md                     | 24 ++++++++++++++----------
 manifests/vhost.pp            |  5 ++++-
 spec/acceptance/vhost_spec.rb |  7 ++++---
 spec/defines/vhost_spec.rb    |  4 ++--
 templates/vhost/_wsgi.erb     | 12 ++++++++++--
 5 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 5c02b2a345..9f64f1f202 100755
--- a/README.md
+++ b/README.md
@@ -561,11 +561,13 @@ apache::vhost { 'wsgi.example.com':
   port                        => '80',
   docroot                     => '/var/www/pythonapp',
   wsgi_application_group      => '%{GLOBAL}',
-  wsgi_daemon_process         => 'wsgi',
-  wsgi_daemon_process_options => {
-    processes    => '2',
-    threads      => '15',
-    display-name => '%{GROUP}',
+  wsgi_daemon_process         => {
+    'wsgi' => {
+      processes    => '2',
+      threads      => '15',
+      display-name => '%{GROUP}',
+    },
+    'foo' => {},
   },
   wsgi_import_script          => '/var/www/demo.wsgi',
   wsgi_import_script_options  => {
@@ -4853,7 +4855,7 @@ apache::vhost { 'subdomain.loc':
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi).
 
 * `wsgi_daemon_process`: A hash that sets the name of the WSGI daemon, accepting [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html). Default: `undef`.
-* `wsgi_daemon_process_options`. _Optional._ Default: `undef`.
+* `wsgi_daemon_process_options`. _Optional._ Default: `undef`. **Deprecated:** Please add values inside Hash `wsgi_daemon_process`.
 * `wsgi_process_group`: Sets the group ID that the virtual host runs under. Default: `undef`.
 * `wsgi_script_aliases`: Requires a hash of web paths to filesystem .wsgi paths. Default: `undef`.
 * `wsgi_script_aliases_match`: Requires a hash of web path regexes to filesystem .wsgi paths. Default: `undef`
@@ -4866,12 +4868,14 @@ An example virtual host configuration with WSGI:
 apache::vhost { 'wsgi.example.com':
   port                        => '80',
   docroot                     => '/var/www/pythonapp',
-  wsgi_daemon_process         => 'wsgi',
-  wsgi_daemon_process_options =>
-    { processes    => '2',
+  wsgi_daemon_process         => {
+    'wsgi' => {
+      processes    => '2',
       threads      => '15',
       display-name => '%{GROUP}',
-     },
+    },
+    'foo' => {},
+  },
   wsgi_process_group          => 'wsgi',
   wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
   wsgi_chunked_request        => 'On',
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e2630f10a6..6a77e764de 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -114,7 +114,7 @@
   $block                                                                            = [],
   Enum['absent', 'present'] $ensure                                                 = 'present',
   $wsgi_application_group                                                           = undef,
-  $wsgi_daemon_process                                                              = undef,
+  Optional[Variant[String,Hash]] $wsgi_daemon_process                               = undef,
   Optional[Hash] $wsgi_daemon_process_options                                       = undef,
   $wsgi_import_script                                                               = undef,
   Optional[Hash] $wsgi_import_script_options                                        = undef,
@@ -933,6 +933,9 @@
   # - $wsgi_process_group
   # - $wsgi_script_aliases
   # - $wsgi_pass_authorization
+  if $wsgi_daemon_process_options {
+    deprecation('apache::vhost::wsgi_daemon_process_options', 'This parameter is deprecated. Please add values inside Hash `wsgi_daemon_process`.')
+  }
   if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
     concat::fragment { "${name}-wsgi":
       target  => "${priority_real}${filename}.conf",
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index d587ba1d7b..434c59df43 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1510,7 +1510,7 @@ class { 'apache::mod::wsgi': }
           apache::vhost { 'test.server':
             docroot                     => '/tmp',
             wsgi_application_group      => '%{GLOBAL}',
-            wsgi_daemon_process         => 'wsgi',
+            wsgi_daemon_process         => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
             wsgi_daemon_process_options => {processes => '2'},
             wsgi_process_group          => 'nobody',
             wsgi_script_aliases         => { '/test' => '/test1' },
@@ -1531,7 +1531,7 @@ class { 'apache::mod::wsgi': }
         apache::vhost { 'test.server':
           docroot                     => '/tmp',
           wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => 'wsgi',
+          wsgi_daemon_process         => { 'wsgi' => { 'python-home' => '/usr' }, 'foo' => {} },
           wsgi_daemon_process_options => {processes => '2'},
           wsgi_import_script          => '/test1',
           wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
@@ -1549,7 +1549,8 @@ class { 'apache::mod::wsgi': }
         describe file("#{$vhost_dir}/25-test.server.conf") do
           it { is_expected.to be_file }
           it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
-          it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
+          it { is_expected.to contain 'WSGIDaemonProcess foo' }
+          it { is_expected.to contain 'WSGIDaemonProcess wsgi python-home=/usr' }
           it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
           it { is_expected.to contain 'WSGIProcessGroup nobody' }
           it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 92796656f0..dcefbd1ba0 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -320,7 +320,7 @@
               'setenvifnocase'              => 'REMOTE_ADDR ^127.0.0.1 localhost=true',
               'block'                       => 'scm',
               'wsgi_application_group'      => '%{GLOBAL}',
-              'wsgi_daemon_process'         => 'wsgi',
+              'wsgi_daemon_process'         => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
               'wsgi_daemon_process_options' => {
                 'processes'    => '2',
                 'threads'      => '15',
@@ -1691,7 +1691,7 @@
           let :params do
             {
               'docroot'                    => '/rspec/docroot',
-              'wsgi_daemon_process' => 'wsgi',
+              'wsgi_daemon_process' => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
             }
           end
 
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index 72d40ff59c..fdc8141700 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -5,10 +5,18 @@
 <% if @wsgi_application_group -%>
   WSGIApplicationGroup <%= @wsgi_application_group %>
 <% end -%>
-<% if @wsgi_daemon_process and @wsgi_daemon_process_options -%>
+<% if @wsgi_daemon_process.is_a? String and @wsgi_daemon_process_options -%>
   WSGIDaemonProcess <%= @wsgi_daemon_process %> <%= @wsgi_daemon_process_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
-<% elsif @wsgi_daemon_process and !@wsgi_daemon_process_options -%>
+<% elsif @wsgi_daemon_process.is_a? String and !@wsgi_daemon_process_options -%>
   WSGIDaemonProcess <%= @wsgi_daemon_process %>
+<% elsif @wsgi_daemon_process.is_a? Hash -%>
+  <%- @wsgi_daemon_process.each do |key, val| -%>
+    <%- if val.empty? -%>
+  WSGIDaemonProcess <%= key %>
+    <%- else -%>
+  WSGIDaemonProcess <%= key %> <%= val.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
+<% end -%>
+<% end -%>
 <% end -%>
 <% if @wsgi_import_script and @wsgi_import_script_options -%>
   WSGIImportScript <%= @wsgi_import_script %> <%= @wsgi_import_script_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>

From fbb2ae86812c0d1b0bd09f474e406b463d26c415 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Mon, 18 Mar 2019 11:21:15 -0400
Subject: [PATCH 1510/2267] Define SCL package name for mod_ldap

---
 manifests/params.pp                  |  3 +++
 spec/classes/mod/authnz_ldap_spec.rb | 12 ++++++++++++
 spec/classes/mod/ldap_spec.rb        | 12 ++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index 3ea105454a..c29a7bbf25 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -81,6 +81,7 @@
     $vhost_dir            = "${httpd_dir}/conf.d"
     $vhost_enable_dir     = undef
     $conf_file            = 'httpd.conf'
+    $conf_enabled         = undef
     $ports_file           = "${conf_dir}/ports.conf"
     $pidfile              = 'run/httpd.pid'
     $logroot              = "/var/log/${_scl_httpd_name}"
@@ -101,6 +102,8 @@
     $suphp_configpath     = undef
     $php_version          = $::apache::version::scl_php_version
     $mod_packages         = {
+      'authnz_ldap' => "${_scl_httpd_name}-mod_ldap",
+      'ldap' => "${_scl_httpd_name}-mod_ldap",
       "php${::apache::version::scl_php_version}" => "rh-php${_scl_php_version_no_dot}-php",
       'ssl'                   => "${_scl_httpd_name}-mod_ssl",
     }
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index 7d449b94ff..a48b1ad208 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -74,5 +74,17 @@
         expect { is_expected.to raise_error Puppet::Error }
       end
     end
+
+    context 'SCL' do
+      let(:pre_condition) do
+        "class { 'apache::version':
+          scl_httpd_version => '2.4',
+          scl_php_version   => '7.0',
+        }
+        include apache"
+      end
+
+      it { is_expected.to contain_package('httpd24-mod_ldap') }
+    end
   end # Redhat
 end
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 46f6de7edc..e069e28c6a 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -92,5 +92,17 @@
 
       it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_DER ca\.pem$}) }
     end
+
+    context 'SCL' do
+      let(:pre_condition) do
+        "class { 'apache::version':
+          scl_httpd_version => '2.4',
+          scl_php_version   => '7.0',
+        }
+        include apache"
+      end
+
+      it { is_expected.to contain_package('httpd24-mod_ldap') }
+    end
   end # Redhat
 end

From 77097dec83d60826b609641b7c119e301ab39f32 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 3 May 2019 14:31:24 +0300
Subject: [PATCH 1511/2267] (MODULES-9017) - update metadata to support current
 version of stdlib

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 16b56cf38e..a9835fb126 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 6.0.0"
+      "version_requirement": ">= 4.13.1 < 7.0.0"
     },
     {
       "name": "puppetlabs/concat",

From 98cf15c01cc7467f9d493a479db063b6a8812ec5 Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimlav@users.noreply.github.com>
Date: Tue, 7 May 2019 09:35:43 +0100
Subject: [PATCH 1512/2267] (FM-7923) Implement Puppet Strings (#1916)

* (FM-7923) - Implement Puppet Strings.
Authors:
 David Swan david.swan@puppet.com
 Eimhin Laverty eimhin.laverty@puppet.com
 Claire Cadman claire.cadman@puppet.com
---
 README.md                                     | 5158 +--------
 REFERENCE.md                                  | 9349 +++++++++++++++++
 lib/puppet/functions/apache/apache_pw_hash.rb |    8 +-
 lib/puppet/functions/apache/bool2httpd.rb     |   29 +-
 .../apache/validate_apache_log_level.rb       |   25 +-
 lib/puppet/parser/functions/apache_pw_hash.rb |   10 +-
 lib/puppet/parser/functions/bool2httpd.rb     |   28 +-
 .../functions/validate_apache_log_level.rb    |   20 +-
 lib/puppet/provider/a2mod.rb                  |    5 +
 manifests/balancer.pp                         |   65 +-
 manifests/balancermember.pp                   |   57 +-
 manifests/confd/no_accf.pp                    |    4 +
 manifests/custom_config.pp                    |   39 +-
 manifests/default_confd_files.pp              |    4 +
 manifests/default_mods.pp                     |    4 +
 manifests/default_mods/load.pp                |    5 +-
 manifests/dev.pp                              |    9 +
 manifests/fastcgi/server.pp                   |   30 +
 manifests/init.pp                             |  445 +-
 manifests/listen.pp                           |    6 +
 manifests/mod.pp                              |   34 +
 manifests/mod/actions.pp                      |    5 +
 manifests/mod/alias.pp                        |   19 +
 manifests/mod/auth_basic.pp                   |    5 +
 manifests/mod/auth_cas.pp                     |   83 +
 manifests/mod/auth_gssapi.pp                  |    5 +
 manifests/mod/auth_kerb.pp                    |    4 +
 manifests/mod/auth_mellon.pp                  |   26 +
 manifests/mod/authn_core.pp                   |    8 +
 manifests/mod/authn_dbd.pp                    |   29 +
 manifests/mod/authn_file.pp                   |    5 +
 manifests/mod/authnz_ldap.pp                  |   11 +
 manifests/mod/authnz_pam.pp                   |    5 +
 manifests/mod/authz_default.pp                |    8 +
 manifests/mod/authz_user.pp                   |    5 +
 manifests/mod/autoindex.pp                    |    5 +
 manifests/mod/cache.pp                        |    5 +
 manifests/mod/cgi.pp                          |    5 +
 manifests/mod/cgid.pp                         |    5 +
 manifests/mod/cluster.pp                      |   50 +
 manifests/mod/data.pp                         |    8 +
 manifests/mod/dav.pp                          |    5 +
 manifests/mod/dav_fs.pp                       |    5 +
 manifests/mod/dav_svn.pp                      |    8 +
 manifests/mod/dbd.pp                          |    8 +
 manifests/mod/deflate.pp                      |   11 +
 manifests/mod/dev.pp                          |    6 +
 manifests/mod/dir.pp                          |   18 +-
 manifests/mod/disk_cache.pp                   |   19 +
 manifests/mod/dumpio.pp                       |   21 +
 manifests/mod/env.pp                          |    5 +
 manifests/mod/event.pp                        |   48 +
 manifests/mod/expires.pp                      |   16 +
 manifests/mod/ext_filter.pp                   |   16 +
 manifests/mod/fastcgi.pp                      |    5 +
 manifests/mod/fcgid.pp                        |   37 +
 manifests/mod/filter.pp                       |    5 +
 manifests/mod/geoip.pp                        |   29 +
 manifests/mod/headers.pp                      |    8 +
 manifests/mod/http2.pp                        |   67 +
 manifests/mod/include.pp                      |    5 +
 manifests/mod/info.pp                         |   18 +
 manifests/mod/intercept_form_submit.pp        |    5 +
 manifests/mod/itk.pp                          |   31 +
 manifests/mod/jk.pp                           |  245 +-
 manifests/mod/ldap.pp                         |   47 +
 manifests/mod/lookup_identity.pp              |    5 +
 manifests/mod/macro.pp                        |    5 +
 manifests/mod/mime.pp                         |   14 +
 manifests/mod/mime_magic.pp                   |    8 +
 manifests/mod/negotiation.pp                  |   11 +
 manifests/mod/nss.pp                          |   17 +
 manifests/mod/pagespeed.pp                    |   15 +
 manifests/mod/passenger.pp                    |  313 +-
 manifests/mod/perl.pp                         |    5 +
 manifests/mod/peruser.pp                      |    5 +
 manifests/mod/php.pp                          |    5 +
 manifests/mod/prefork.pp                      |   35 +
 manifests/mod/proxy.pp                        |   23 +
 manifests/mod/proxy_ajp.pp                    |    5 +
 manifests/mod/proxy_balancer.pp               |   17 +
 manifests/mod/proxy_connect.pp                |    8 +
 manifests/mod/proxy_fcgi.pp                   |    5 +
 manifests/mod/proxy_html.pp                   |    5 +
 manifests/mod/proxy_http.pp                   |    5 +
 manifests/mod/proxy_wstunnel.pp               |    5 +
 manifests/mod/python.pp                       |    8 +
 manifests/mod/remoteip.pp                     |    5 +-
 manifests/mod/reqtimeout.pp                   |    8 +
 manifests/mod/rewrite.pp                      |    5 +
 manifests/mod/rpaf.pp                         |   17 +
 manifests/mod/security.pp                     |   86 +
 manifests/mod/setenvif.pp                     |    5 +
 manifests/mod/shib.pp                         |   25 +
 manifests/mod/socache_shmcb.pp                |    7 +-
 manifests/mod/speling.pp                      |    5 +
 manifests/mod/ssl.pp                          |   76 +
 manifests/mod/status.pp                       |   43 +-
 manifests/mod/suexec.pp                       |    5 +
 manifests/mod/suphp.pp                        |    5 +
 manifests/mod/userdir.pp                      |   26 +
 manifests/mod/version.pp                      |    8 +
 manifests/mod/vhost_alias.pp                  |    5 +
 manifests/mod/worker.pp                       |   58 +-
 manifests/mod/wsgi.pp                         |   29 +
 manifests/mod/xsendfile.pp                    |    5 +
 manifests/mpm.pp                              |    3 +
 manifests/namevirtualhost.pp                  |    6 +
 manifests/package.pp                          |    4 +
 manifests/params.pp                           |   22 +-
 manifests/peruser/multiplexer.pp              |    6 +
 manifests/peruser/processor.pp                |    4 +
 manifests/php.pp                              |   17 +-
 manifests/proxy.pp                            |   14 +-
 manifests/python.pp                           |    6 +-
 manifests/security/rule_link.pp               |    4 +
 manifests/service.pp                          |   20 +-
 manifests/ssl.pp                              |   17 +-
 manifests/version.pp                          |    6 +-
 manifests/vhost.pp                            | 1627 ++-
 manifests/vhost/custom.pp                     |   18 +-
 manifests/vhosts.pp                           |   20 +
 122 files changed, 13636 insertions(+), 5418 deletions(-)
 create mode 100644 REFERENCE.md

diff --git a/README.md b/README.md
index 9f64f1f202..505a9420e7 100755
--- a/README.md
+++ b/README.md
@@ -19,12 +19,6 @@
 [apache affects]: #what-the-apache-module-affects
 
 [Reference]: #reference
-[Public classes]: #public-classes
-[Private classes]: #private-classes
-[Public defined types]: #public-defined-types
-[Private defined types]: #private-defined-types
-[Templates]: #templates
-[Tasks]: #tasks
 
 [Limitations]: #limitations
 
@@ -294,12 +288,6 @@
     - [Configuring FastCGI servers to handle PHP files][Configuring FastCGI servers]
     - [Load balancing with exported and non-exported resources][Load balancing examples]
 4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
-    - [Public classes][]
-    - [Private classes][]
-    - [Public defined types][]
-    - [Private defined types][]
-    - [Templates][]
-    - [Tasks][]
 5. [Limitations - OS compatibility, etc.][Limitations]
 6. [Development - Guide for contributing to the module][Development]
     - [Contributing to the apache module][Contributing]
@@ -561,13 +549,11 @@ apache::vhost { 'wsgi.example.com':
   port                        => '80',
   docroot                     => '/var/www/pythonapp',
   wsgi_application_group      => '%{GLOBAL}',
-  wsgi_daemon_process         => {
-    'wsgi' => {
-      processes    => '2',
-      threads      => '15',
-      display-name => '%{GROUP}',
-    },
-    'foo' => {},
+  wsgi_daemon_process         => 'wsgi',
+  wsgi_daemon_process_options => {
+    processes    => '2',
+    threads      => '15',
+    display-name => '%{GROUP}',
   },
   wsgi_import_script          => '/var/www/demo.wsgi',
   wsgi_import_script_options  => {
@@ -808,5140 +794,16 @@ Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balanc
 <a id="reference"></a> 
 ## Reference
 
-- [**Public classes**](#public-classes)
-    - [Class: apache](#class-apache)
-    - [Class: apache::dev](#class-apachedev)
-    - [Class: apache::vhosts](#class-apachevhosts)
-    - [Classes: apache::mod::\*](#classes-apachemodname)
-- [**Private classes**](#private-classes)
-    - [Class: apache::confd::no_accf](#class-apacheconfdno_accf)
-    - [Class: apache::default_confd_files](#class-apachedefault_confd_files)
-    - [Class: apache::default_mods](#class-apachedefault_mods)
-    - [Class: apache::package](#class-apachepackage)
-    - [Class: apache::params](#class-apacheparams)
-    - [Class: apache::service](#class-apacheservice)
-    - [Class: apache::version](#class-apacheversion)
-- [**Public defined types**](#public-defined-types)
-    - [Defined type: apache::balancer](#defined-type-apachebalancer)
-    - [Defined type: apache::balancermember](#defined-type-apachebalancermember)
-    - [Defined type: apache::custom_config](#defined-type-apachecustom_config)
-    - [Defined type: apache::fastcgi::server](#defined-type-fastcgi-server)
-    - [Defined type: apache::listen](#defined-type-apachelisten)
-    - [Defined type: apache::mod](#defined-type-apachemod)
-    - [Defined type: apache::namevirtualhost](#defined-type-apachenamevirtualhost)
-    - [Defined type: apache::vhost](#defined-type-apachevhost)
-    - [Defined type: apache::vhost::custom](#defined-type-apachevhostcustom)
-- [**Private defined types**](#private-defined-types)
-    - [Defined type: apache::default_mods::load](#defined-type-default_mods-load)
-    - [Defined type: apache::peruser::multiplexer](#defined-type-apacheperusermultiplexer)
-    - [Defined type: apache::peruser::processor](#defined-type-apacheperuserprocessor)
-    - [Defined type: apache::security::file_link](#defined-type-apachesecurityfile_link)
-- [**Templates**](#templates)
-- [**Tasks**](#tasks)
-
-### Public Classes
-
-#### Class: `apache`
-
-Guides the basic setup and installation of Apache on your system.
-
-When this class is declared with the default options, Puppet:
-
-- Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
-- Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system.
-- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
-- Creates a document root directory determined by your operating system, typically `/var/www`.
-- Starts the Apache service.
-
-You can simply declare the default `apache` class:
-
-``` puppet
-class { 'apache': }
-```
-
-##### `allow_encoded_slashes`
-
-Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. If not specified, this parameter omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
-
-Values: 'on', 'off', 'nodecode'.
-
-Default: `undef`.
-
-##### `apache_version`
-
-Configures module template behavior, package names, and default Apache modules by defining the version of Apache to use. We do not recommend manually configuring this parameter without reason.
-
-Default: Depends on operating system and release version detected by the [`apache::version`][] class.
-
-##### `conf_dir`
-
-Sets the directory where the Apache server's main configuration file is located.
-
-Default: Depends on operating system.
-
-- **Debian**: `/etc/apache2`
-- **FreeBSD**: `/usr/local/etc/apache22`
-- **Gentoo**: `/etc/apache2`
-- **Red Hat**: `/etc/httpd/conf`
-
-##### `conf_template`
-
-Defines the [template][] used for the main Apache configuration file. Modifying this parameter is potentially risky, as the apache module is designed to use a minimal configuration file customized by `conf.d` entries.
-
-Default: `apache/httpd.conf.erb`.
-
-##### `confd_dir`
-
-Sets the location of the Apache server's custom configuration directory.
-
-Default: Depends on operating system.
-
-- **Debian**: `/etc/apache2/conf.d`
-- **FreeBSD**: `/usr/local/etc/apache22`
-- **Gentoo**: `/etc/apache2/conf.d`
-- **Red Hat**: `/etc/httpd/conf.d`
-
-##### `default_charset`
-
-Used as the [`AddDefaultCharset`][] directive in the main configuration file.
-
-Default: `undef`.
-
-##### `default_confd_files`
-
-Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system.
-
-Boolean.
-
-Default: `true`.
-
-##### `default_mods`
-
-Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system.
-
-If `false`, Puppet includes only the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::<MODULE NAME>`][] class or [`apache::mod`][] defined type.
-
-If `true`, Puppet installs additional modules, depending on the operating system and the values of [`apache_version`][] and [`mpm_module`][] parameters. Because these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists.
-
-If this parameter contains an array, Puppet instead enables all passed Apache modules.
-
-Values: Boolean or an array of Apache module names.
-
-Default: `true`.
-
-##### `default_ssl_ca`
-
-Sets the default certificate authority for the Apache server.
-
-Although the default value results in a functioning Apache server, you **must** update this parameter with your certificate authority information before deploying this server in a production environment.
-
-Boolean.
-
-Default: `undef`.
-
-##### `default_ssl_cert`
-
-Sets the [SSL encryption][] certificate location.
-
-Although the default value results in a functioning Apache server, you **must** update this parameter with your certificate location before deploying this server in a production environment.
-
-Default: Depends on operating system.
-
-- **Debian**: `/etc/ssl/certs/ssl-cert-snakeoil.pem`
-- **FreeBSD**: `/usr/local/etc/apache22/server.crt`
-- **Gentoo**: `/etc/ssl/apache2/server.crt`
-- **Red Hat**: `/etc/pki/tls/certs/localhost.crt`
-
-##### `default_ssl_chain`
-
-Sets the default [SSL chain][] location.
-
-Although this default value results in a functioning Apache server, you **must** update this parameter with your SSL chain before deploying this server in a production environment.
-
-Default: `undef`.
-
-##### `default_ssl_crl`
-
-Sets the path of the default [certificate revocation list][] (CRL) file to use.
-
-Although this default value results in a functioning Apache server, you **must** update this parameter with the CRL file path before deploying this server in a production environment. You can use this parameter with or in place of the [`default_ssl_crl_path`][].
-
-Default: `undef`.
-
-##### `default_ssl_crl_path`
-
-Sets the server's [certificate revocation list path][], which contains your CRLs.
-
-Although this default value results in a functioning Apache server, you **must** update this parameter with the CRL file path before deploying this server in a production environment.
-
-Default: `undef`.
-
-##### `default_ssl_crl_check`
-
-Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. This parameter applies only to Apache 2.4 or higher and is ignored on older versions.
-
-Although this default value results in a functioning Apache server, you **must** specify this parameter when using certificate revocation lists in a production environment.
-
-Default: `undef`.
-
-##### `default_ssl_key`
-
-Sets the [SSL certificate key file][] location.
-
-Although the default values result in a functioning Apache server, you **must** update this parameter with your SSL key's location before deploying this server in a production environment.
-
-Default: Depends on operating system.
-
-- **Debian**: `/etc/ssl/private/ssl-cert-snakeoil.key`
-- **FreeBSD**: `/usr/local/etc/apache22/server.key`
-- **Gentoo**: `/etc/ssl/apache2/server.key`
-- **Red Hat**: `/etc/pki/tls/private/localhost.key`
-
-
-##### `default_ssl_vhost`
-
-Configures a default [SSL][SSL encryption] virtual host.
-
-If `true`, Puppet automatically configures the following virtual host using the [`apache::vhost`][] defined type:
-
-```puppet
-apache::vhost { 'default-ssl':
-  port            => 443,
-  ssl             => true,
-  docroot         => $docroot,
-  scriptalias     => $scriptalias,
-  serveradmin     => $serveradmin,
-  access_log_file => "ssl_${access_log_file}",
-  }
-```
-
-> **Note**: SSL virtual hosts only respond to HTTPS queries.
-
-
-Boolean.
-
-Default: `false`.
-
-##### `default_type`
-
-_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer, and is only for backwards compatibility in configuration files.
-
-Default: `undef`.
-
-##### `default_vhost`
-
-Configures a default virtual host when the class is declared.
-
-To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to `false`.
-
-> **Note**: Apache will not start without at least one virtual host. If you set this to `false` you must configure a virtual host elsewhere.
-
-Boolean.
-
-Default: `true`.
-
-##### `dev_packages`
-
-Configures a specific dev package to use.
-
-Values: A string or array of strings.
-
-Example for using httpd 2.4 from the IUS yum repo:
-
-``` puppet
-include ::apache::dev
-class { 'apache':
-  apache_name  => 'httpd24u',
-  dev_packages => 'httpd24u-devel',
-}
-```
-
-Default: Depends on operating system.
-
-- **Red Hat:** 'httpd-devel'
-- **Debian 8/Ubuntu 13.10 or newer:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
-- **Older Debian/Ubuntu versions:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
-- **FreeBSD, Gentoo:** `undef`
-- **Suse:** ['libapr-util1-devel', 'libapr1-devel']
-
-##### `docroot`
-
-Sets the default [`DocumentRoot`][] location.
-
-Default: Depends on operating system.
-
-- **Debian**: `/var/www/html`
-- **FreeBSD**: `/usr/local/www/apache22/data`
-- **Gentoo**: `/var/www/localhost/htdocs`
-- **Red Hat**: `/var/www/html`
-
-##### `error_documents`
-
-Determines whether to enable [custom error documents][] on the Apache server.
-
-Boolean.
-
-Default: `false`.
-
-##### `group`
-
-Sets the group ID that owns any Apache processes spawned to answer requests.
-
-By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to `false`.
-
-> **Note**: Modifying this parameter only changes the group ID that Apache uses to spawn child processes to access resources. It does not change the user that owns the parent server process.
-
-##### `httpd_dir`
-
-Sets the Apache server's base configuration directory. This is useful for specially repackaged Apache server builds but might have unintended consequences when combined with the default distribution packages.
-
-Default: Depends on operating system.
-
-- **Debian**: `/etc/apache2`
-- **FreeBSD**: `/usr/local/etc/apache22`
-- **Gentoo**: `/etc/apache2`
-- **Red Hat**: `/etc/httpd`
-
-##### `http_protocol_options`
-
-Specifies the strictness of HTTP protocol checks.
-
-Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`, `RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`.
-
-Default '`Strict LenientMethods Allow0.9`'.
-
-##### `keepalive`
-
-Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. If you set this to 'On', use the [`keepalive_timeout`][] and [`max_keepalive_requests`][] parameters to set relevant options.
-
-Values: 'Off', 'On'.
-
-Default: 'On'.
-
-##### `keepalive_timeout`
+For information on classes, types and functions see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apache/blob/master/REFERENCE.md)
 
-Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. This parameter is only relevant if the [`keepalive` parameter][] is enabled.
-
-Default: '15'.
-
-##### `max_keepalive_requests`
-
-Limits the number of requests allowed per connection when the [`keepalive` parameter][] is enabled.
-
-Default: '100'.
-
-##### `hostname_lookups`
-
-This directive enables DNS lookups so that host names can be logged and passed to CGIs/SSIs in REMOTE_HOST. Values:'On','Off','Double'.
-
-Default: 'Off'.
-> **Note**: If enabled, it impacts performance significantly.
-
-##### `lib_path`
-
-Specifies the location where [Apache module][Apache modules] files are stored.
-
-Default: Depends on operating system.
-
-- **Debian** and **Gentoo**: `/usr/lib/apache2/modules`
-- **FreeBSD**: `/usr/local/libexec/apache24`
-- **Red Hat**: `modules`
-
-> **Note**: Do not configure this parameter manually without special reason.
-
-##### `log_level`
-
-Changes the error log's verbosity. Values: 'alert', 'crit', 'debug', 'emerg', 'error', 'info', 'notice', 'warn'.
-
-Default: 'warn'.
-
-##### `log_formats`
-
-Define additional [`LogFormat`][] directives. Values: A [hash][], such as:
-
-``` puppet
-$log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
-```
-
-There are a number of predefined `LogFormats` in the `httpd.conf` that Puppet creates:
-
-``` httpd
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
-```
-
-If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition.
-
-##### `logroot`
-
-Changes the directory of Apache log files for the virtual host.
-
-Default: Depends on operating system.
-
-- **Debian**: `/var/log/apache2`
-- **FreeBSD**: `/var/log/apache22`
-- **Gentoo**: `/var/log/apache2`
-- **Red Hat**: `/var/log/httpd`
-
-##### `logroot_mode`
-
-Overrides the default [`logroot`][] directory's mode.
-
-> **Note**: Do _not_ grant write access to the directory where the logs are stored without being aware of the consequences. See the [Apache documentation][Log security] for details.
-
-Default: `undef`.
-
-##### `manage_group`
-
-When `false`, stops Puppet from creating the group resource.
-
-If you have a group created from another Puppet module that you want to use to run Apache, set this to `false`. Without this parameter, attempting to use a previously established group results in a duplicate resource error.
-
-Boolean.
-
-Default: `true`.
-
-##### `supplementary_groups`
-
-A list of groups to which the user belongs. These groups are in addition to the primary group.
-
-Default: No additional groups.
-
-Notice: This option only has an effect when `manage_user` is set to true.
-
-##### `manage_user`
-
-When `false`, stops Puppet from creating the user resource.
-
-This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
-
-Boolean.
-
-Default: `true`.
-
-##### `mod_dir`
-
-Sets where Puppet places configuration files for your [Apache modules][].
-
-Default: Depends on operating system.
-
-- **Debian**: `/etc/apache2/mods-available`
-- **FreeBSD**: `/usr/local/etc/apache22/Modules`
-- **Gentoo**: `/etc/apache2/modules.d`
-- **Red Hat**: `/etc/httpd/conf.d`
-
-##### `mod_libs`
-
-Allows the user to override default module library names.
-
-```puppet
-include apache::params
-class { 'apache':
-  mod_libs => merge($::apache::params::mod_libs, {
-    'wsgi' => 'mod_wsgi_python3.so',
-  })
-}
-```
-
-Hash. Default: `$apache::params::mod_libs`
-
-##### `mod_packages`
-
-Allows the user to override default module package names.
-
-```puppet
-include apache::params
-class { 'apache':
-  mod_packages => merge($::apache::params::mod_packages, {
-    'auth_kerb' => 'httpd24-mod_auth_kerb',
-  })
-}
-```
-
-Hash. Default: `$apache::params::mod_packages`
-
-##### `mpm_module`
-
-Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Values: 'event', 'itk', 'peruser', 'prefork', 'worker', or `false`.
-
-You must set this to `false` to explicitly declare the following classes with custom parameters:
-
-- [`apache::mod::event`][]
-- [`apache::mod::itk`][]
-- [`apache::mod::peruser`][]
-- [`apache::mod::prefork`][]
-- [`apache::mod::worker`][]
-
-Default: Depends on operating system.
-
-- **Debian**: 'worker'
-- **FreeBSD, Gentoo, and Red Hat**: 'prefork'
-
-##### `package_ensure`
-
-Controls the `package` resource's [`ensure`][] attribute. Values: 'absent', 'installed' (or equivalent 'present'), or a version string.
-
-Default: 'installed'.
-
-##### `pidfile`
-
-Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm.
-
-Default: Depends on operating system.
-
-- **Debian:** '\${APACHE_PID_FILE}'
-- **FreeBSD:** '/var/run/httpd.pid'
-- **Red Hat:** 'run/httpd.pid'
-
-##### `ports_file`
-
-Sets the path to the file containing Apache ports configuration.
-
-Default: '{$conf_dir}/ports.conf'.
-
-##### `protocols`
-
-Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols) directive, which lists available protocols for the server.
-
-Default: `undef`
-
-##### `protocols_honor_order`
-
-Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines whether the order of Protocols sets precedence during negotiation.
-
-Default: `undef`
-
-##### `purge_configs`
-
-Removes all other Apache configs and virtual hosts.
-
-Setting this to `false` is a stopgap measure to allow the apache module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][].
-
-Boolean.
-
-Default: `true`.
-
-##### `purge_vhost_dir`
-
-If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, this parameter determines whether Puppet removes any configurations inside `vhost_dir` that are _not_ managed by Puppet.
-
-Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
-
-Boolean.
-
-Default: same as [`purge_configs`][].
-
-##### `rewrite_lock`
-
-Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your virtual host. This parameter only applies to Apache version 2.2 or lower and is ignored on newer versions.
-
-Default: `undef`.
-
-##### `sendfile`
-
-Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the [`EnableSendfile`][] directive. Values: 'On', 'Off'.
-
-Default: 'On'.
-
-##### `serveradmin`
-
-Sets the Apache server administrator's contact information via Apache's [`ServerAdmin`][] directive.
-
-Default: 'root@localhost'.
-
-##### `servername`
-
-Sets the Apache server name via Apache's [`ServerName`][] directive.
-
-Setting to `false` will not set ServerName at all.
-
-Default: the 'fqdn' fact reported by [Facter][].
-
-##### `server_root`
-
-Sets the Apache server's root directory via Apache's [`ServerRoot`][] directive.
-
-Default: Depends on operating system.
-
-- **Debian**: `/etc/apache2`
-- **FreeBSD**: `/usr/local`
-- **Gentoo**: `/var/www`
-- **Red Hat**: `/etc/httpd`
-
-##### `server_signature`
-
-Configures a trailing footer line to display at the bottom of server-generated documents, such as error documents and output of certain [Apache modules][], via Apache's [`ServerSignature`][] directive. Values: 'Off', 'On'.
-
-Default: 'On'.
-
-##### `server_tokens`
-
-Controls how much information Apache sends to the browser about itself and the operating system, via Apache's [`ServerTokens`][] directive.
-
-Default: 'Prod'.
-
-##### `service_enable`
-
-Determines whether Puppet enables the Apache HTTPD service when the system is booted.
-
-Boolean.
-
-Default: `true`.
-
-##### `service_ensure`
-
-Determines whether Puppet should make sure the service is running. Values: `true` (or 'running'), `false` (or 'stopped').
-
-The `false` or 'stopped' values set the 'httpd' service resource's `ensure` parameter to `false`, which is useful when you want to let the service be managed by another application, such as Pacemaker.
+### Templates
 
-Default: 'running'.
+The Apache module relies heavily on templates to enable the [`apache::vhost`][] and [`apache::mod`][] defined types. These templates are built based on [Facter][] facts that are specific to your operating system. Unless explicitly called out, most templates are not meant for configuration.
 
-##### `service_name`
-
-Sets the name of the Apache service.
-
-Default: Depends on operating system.
-
-- **Debian and Gentoo**: 'apache2'
-- **FreeBSD**: 'apache22'
-- **Red Hat**: 'httpd'
-
-##### `service_manage`
-
-Determines whether Puppet manages the HTTPD service's state.
-
-Boolean.
-
-Default: `true`.
-
-##### `service_restart`
-
-Determines whether Puppet should use a specific command to restart the HTTPD service.
-
-Values: a command to restart the Apache service. The default setting uses the [default Puppet behavior][Service attribute restart].
-
-Default: `undef`.
-
-##### `ssl_cert`
-
-This enables the user to specify a specific SSLCertificateFile.
-
-For more information see: [SSLCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#SSLCertificateFile)
-
-Default: `undef.`
-
-##### `ssl_key`
-This enables the user to specify a specific SSLCertificateKey.
-
-For more information see: [SSLCertificateKey](https://httpd.apache.org/docs/current/mod/mod_ssl.html#SSLCertificateKeyFile)
-
-Default: `undef`.
-
-
-##### `ssl_ca`
-
-Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile) to use to verify certificate used in ssl client authentication.
-
-It is possible to override this on a vhost level.
-
-Default: `undef`.
-
-
-##### `timeout`
-
-Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request.
-
-Default: 120.
-
-##### `trace_enable`
-
-Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceEnable`][] directive.
-
-Values: 'Off', 'On'.
-
-Default: 'On'.
-
-##### `use_canonical_name`
-
-Controls Apache's [`UseCanonicalName`][] directive which controls how Apache handles self-referential URLs. If not specified, this parameter omits the declaration from the server's configuration and uses Apache's default setting of 'off'.
-
-Values: 'On', 'on', 'Off', 'off', 'DNS', 'dns'.
-
-Default: `undef`.
-
-##### `use_systemd`
-
-Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs.
-
-Boolean.
-
-Default: `true`.
-
-##### `file_mode`
-
-Sets the desired permissions mode for config files.
-
-Values: A string, with permissions mode in symbolic or numeric notation.
-
-Default: '0644'.
-
-##### `root_directory_options`
-
-Array of the desired options for the / directory in httpd.conf.
-
-Defaults: 'FollowSymLinks'.
-
-##### `root_directory_secured`
-
-Sets the default access policy for the / directory in httpd.conf. A value of `false` allows access to all resources that are missing a more specific access policy. A value of `true` denies access to all resources by default. If `true`, more specific rules must be used to allow access to these resources (for example, in a directory block using the [`directories`](#parameter-directories-for-apachevhost) parameter).
-
-Boolean.
-
-Default: `false`.
-
-##### `vhost_dir`
-
-Changes your virtual host configuration files' location.
-
-Default: Depends on operating system:
-
-- **Debian**: `/etc/apache2/sites-available`
-- **FreeBSD**: `/usr/local/etc/apache22/Vhosts`
-- **Gentoo**: `/etc/apache2/vhosts.d`
-- **Red Hat**: `/etc/httpd/conf.d`
-
-##### `vhost_include_pattern`
-
-Defines the pattern for files included from the `vhost_dir`.
-
-If set to a value like `[^.#]\*.conf[^~]` to make sure that files accidentally created in this directory (such as files created by version control systems or editor backups) are *not* included in your server configuration.
-
-Default: '*'.
-
-Some operating systems use a value of `*.conf`. By default, this module creates configuration files ending in `.conf`.
-
-##### `user`
-
-Changes the user that Apache uses to answer requests. Apache's parent process continues to run as root, but child processes access resources as the user defined by this parameter. To prevent Puppet from managing the user, set the [`manage_user`][] parameter to `false`.
-
-Default: Depends on the user set by [`apache::params`][] class, based on your operating system:
-
-- **Debian**: 'www-data'
-- **FreeBSD**: 'www'
-- **Gentoo** and **Red Hat**: 'apache'
-
-To prevent Puppet from managing the user, set the [`manage_user`][] parameter to false.
-
-##### `apache_name`
-
-The name of the Apache package to install. If you are using a non-standard Apache package you might need to override the default setting.
-
-For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::scl_httpd_version`.
-
-Default: Depends on the user set by [`apache::params`][] class, based on your operating system:
-
-- **Debian**: 'apache2'
-- **FreeBSD**: 'apache24'
-- **Gentoo**: 'www-servers/apache'
-- **Red Hat**: 'httpd'
-
-##### `error_log`
-
-The name of the error log file for the main server instance. If the string starts with `/`, `|`, or `syslog`: the full path is set. Otherwise, the filename  is prefixed with `$logroot`.
-
-Default: Depends on operating system:
-
-- **Debian**: 'error.log'
-- **FreeBSD**: 'httpd-error.log'
-- **Gentoo**: 'error.log'
-- **Red Hat**: 'error_log'
-- **Suse**: 'error.log'
-
-##### `scriptalias`
-
-Directory to use for global script alias
-
-Default: Depends on operating system:
-
-- **Debian**: '/usr/lib/cgi-bin'
-- **FreeBSD**: '/usr/local/www/apache24/cgi-bin'
-- **Gentoo**: 'var/www/localhost/cgi-bin'
-- **Red Hat**: '/var/www/cgi-bin'
-- **Suse**: '/usr/lib/cgi-bin'
-
-##### `access_log_file`
-
-The name of the access log file for the main server instance.
-
-Default: Depends on operating system:
-
-- **Debian**: 'error.log'
-- **FreeBSD**: 'httpd-access.log'
-- **Gentoo**: 'access.log'
-- **Red Hat**: 'access_log'
-- **Suse**: 'access.log'
-
-##### `limitreqfields`
-
-The [`limitreqfields`][] parameter sets the maximum number of request header fields in an HTTP request. This directive gives the server administrator greater control over abnormal client request behavior, which may be useful for avoiding some forms of denial-of-service attacks. The value should be increased if normal clients see an error response from the server that indicates too many fields were sent in the request.
-
-Default: '100'
-
-#### Class: `apache::dev`
-
-Installs Apache development libraries.
-
-Default: Depends on the operating system:[`dev_packages`][] parameter of the [`apache::params`][] class, based on your operating system:
-
-- **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions.
-- **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
-- **Gentoo**: `undef`.
-- **Red Hat**: 'httpd-devel'.
-
-#### Class: `apache::vhosts`
-
-Creates [`apache::vhost`][] defined types.
-
-**Parameters**:
-
-* `vhosts`: Specifies the [`apache::vhost`][] defined type's parameters.
-
-  Values: A [hash][], where the key represents the name and the value represents a [hash][] of [`apache::vhost`][] defined type's parameters.
-
-  Default: '{}'
-
-  > **Note**: See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters or [Configuring virtual hosts].
-
-  For example, to create a [name-based virtual host][name-based virtual hosts] 'custom_vhost_1, declare this class with the `vhosts` parameter set to '{ "custom_vhost_1" => { "docroot" => "/var/www/custom_vhost_1", "port" => "81" }':
-
-``` puppet
-class { 'apache::vhosts':
-  vhosts => {
-    'custom_vhost_1' => {
-      'docroot' => '/var/www/custom_vhost_1',
-      'port'    => '81',
-    },
-  },
-}
-```
-
-#### Classes: `apache::mod::<MODULE NAME>`
-
-Enables specific [Apache modules][]. Enable and configure an Apache module by declaring its class.
-
-For example, to install and enable [`mod_alias`][] with no icons, declare the [`apache::mod::alias`][] class with the `icons_options` parameter set to 'None':
-
-``` puppet
-class { 'apache::mod::alias':
-  icons_options => 'None',
-}
-```
-
-The following Apache modules have supported classes, many of which allow for parameterized configuration. You can install other Apache modules with the [`apache::mod`][] defined type.
-
-* `actions`
-* `alias` (see [`apache::mod::alias`][])
-* `auth_basic`
-* `auth_cas`\* (see [`apache::mod::auth_cas`][])
-* `auth_mellon`\* (see [`apache::mod::auth_mellon`][])
-* `auth_kerb`
-* `auth_gssapi`
-* `authn_core`
-* `authn_dbd`\* (see [`apache::mod::authn_dbd`][])
-* `authn_file`
-* `authnz_ldap`\* (see [`apache::mod::authnz_ldap`][])
-* `authnz_pam`
-* `authz_default`
-* `authz_user`
-* `autoindex`
-* `cache`
-* `cgi`
-* `cgid`
-* `cluster` (see [`apache::mod::cluster`][])
-* `data`
-* `dav`
-* `dav_fs`
-* `dav_svn`\*
-* `dbd`
-* `deflate\`
-* `dev`
-* `dir`\*
-* `disk_cache` (see [`apache::mod::disk_cache`][])
-* `dumpio` (see [`apache::mod::dumpio`][])
-* `env`
-* `event` (see [`apache::mod::event`][])
-* `expires`
-* `ext_filter` (see [`apache::mod::ext_filter`][])
-* `fastcgi`
-* `fcgid`
-* `filter`
-* `geoip` (see [`apache::mod::geoip`][])
-* `headers`
-* `http2` (see [`apache::mod::http2`][])
-* `include`
-* `info`\*
-* `intercept_form_submit`
-* `itk`
-* `jk` (see [`apache::mod::jk`])
-* `ldap` (see [`apache::mod::ldap`][])
-* `lookup_identity`
-* `macro` (see [`apache:mod:macro`][])
-* `mime`
-* `mime_magic`\*
-* `negotiation`
-* `nss`\* (see [`apache::mod::nss`][])
-* `pagespeed` (see [`apache::mod::pagespeed`][])
-* `passenger`\* (see [`apache::mod::passenger`][])
-* `perl`
-* `peruser`
-* `php` (requires [`mpm_module`][] set to `prefork`)
-* `prefork`\*
-* `proxy`\* (see [`apache::mod::proxy`][])
-* `proxy_ajp`
-* `proxy_balancer`\* (see [`apache::mod::proxy_balancer`][])
-* `proxy_balancer`
-* `proxy_html` (see [`apache::mod::proxy_html`][])
-* `proxy_http`
-* `python` (see [`apache::mod::python`][])
-* `reqtimeout`
-* `remoteip`\*
-* `rewrite`
-* `rpaf`\*
-* `setenvif`
-* `security`
-* `shib`\* (see [`apache::mod::shib`])
-* `speling`
-* `ssl`\* (see [`apache::mod::ssl`][])
-* `status`\* (see [`apache::mod::status`][])
-* `suphp`
-* `userdir`\* (see [`apache::mod::userdir`][])
-* `version`
-* `vhost_alias`
-* `worker`\*
-* `wsgi` (see [`apache::mod::wsgi`][])
-* `xsendfile`
-
-Modules noted with a * indicate that the module has settings and a template that includes parameters to configure the module. Most Apache module class parameters have default values and don't require configuration. For modules with templates, Puppet installs template files with the module; these template files are required for the module to work.
-
-##### Class: `apache::mod::alias`
-
-Installs and manages [`mod_alias`][].
-
-**Parameters**:
-
-* `icons_options`: Disables directory listings for the icons directory, via Apache [`Options`] directive.
-
-  Default: 'Indexes MultiViews'.
-
-* `icons_path`: Sets the local path for an `/icons/` Alias.
-
-  Default: Depends on operating system.
-
-    * **Debian**: `/usr/share/apache2/icons`
-    * **FreeBSD**: `/usr/local/www/apache24/icons`
-    * **Gentoo**: `/var/www/icons`
-    * **Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons`
-
-#### Class: `apache::mod::disk_cache`
-
-Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4.
-
-Default: Depends on the Apache version and operating system:
-
-- **Debian**: `/var/cache/apache2/mod_cache_disk`
-- **FreeBSD**: `/var/cache/mod_cache_disk`
-- **Red Hat, Apache 2.4**: `/var/cache/httpd/proxy`
-- **Red Hat, Apache 2.2**: `/var/cache/mod_proxy`
-
-To specify the cache root, pass a path as a string to the `cache_root` parameter.
-
-``` puppet
-class {'::apache::mod::disk_cache':
-  cache_root => '/path/to/cache',
-}
-```
-
-To specify cache ignore headers, pass a string to the `cache_ignore_headers` parameter.
-
-``` puppet
-class {'::apache::mod::disk_cache':
-  cache_ignore_headers => "Set-Cookie",
-}
-```
-
-##### Class: `apache::mod::dumpio`
-
-Installs and configures [`mod_dumpio`][].
-
-```puppet
-class{'apache':
-  default_mods => false,
-  log_level    => 'dumpio:trace7',
-}
-class{'apache::mod::dumpio':
-  dump_io_input  => 'On',
-  dump_io_output => 'Off',
-}
-```
-
-**Parameters**:
-
-* `dump_io_input`: Dump all input data to the error log.
-
-  Values: 'On', 'Off'.
-
-  Default: 'Off'.
-
-* `dump_io_output`: Dump all output data to the error log.
-
-  Values: 'On', 'Off'.
-
-  Defaults to 'Off'.
-
-##### Class: `apache::mod::event`
-
-Installs and manages [`mod_mpm_event`][]. You cannot include `apache::mod::event` with [`apache::mod::itk`][], [`apache::mod::peruser`][], [`apache::mod::prefork`][], or [`apache::mod::worker`][] on the same server.
-
-**Parameters**:
-
-* `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive.  Setting this to `false` removes the parameter.
-
-  Default: '511'.
-
-* `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive.  Setting these to `false` removes the parameters.
-
-  Default: '150'.
-
-* `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Setting these to `false` removes the parameters.
-
-  Default: '0'.
-
-* `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Setting these to `false` removes the parameters.
-
-  Default: '75' and '25', respectively.
-
-* `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Setting this to `false` removes the parameter.
-
-  Default: '25'.
-
-* `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Setting this to `false` removes the parameter.
-
-  Default: '2'.
-
-* `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Setting this to `false` removes the parameter.
-
-  Default: '64'.
-
-* `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive.
-
-  Default: '25'. Setting this to `false` removes the parameter.
-
-##### Class: `apache::mod::auth_cas`
-
-Installs and manages [`mod_auth_cas`][]. Parameters share names with the Apache module's directives.
-
-The `cas_login_url` and `cas_validate_url` parameters are required; several other parameters have `undef` default values.
-
-> **Note**: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL. See [https://github.com/Jasig/mod_auth_cas]()
-
-**Parameters**:
-
-- `cas_attribute_prefix`: Adds a header with the value of this header being the attribute values when SAML validation is enabled.
-
-  Default: CAS_.
-
-- `cas_attribute_delimiter`: The delimiter between attribute values in the header created by `cas_attribute_prefix`.
-
-  Default: ,
-
-- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding.
-
-  Default: `undef`.
-
-- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`.
-
-  Default: `undef`.
-
-- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings.
-
-  Default: `undef`.
-
-- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header.
-
-  Default: `undef`.
-
-- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers.
-
-  Default: `undef`.
-
-- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies.
-
-  Default: `undef`.
-
-- `cas_cookie_path`: Where cas cookie session data is stored. Should be writable by web server user.
-
-  Default: OS dependent.
-
-- `cas_cookie_path_mode`: The mode of `cas_cookie_path`.
-
-  Default: '0750'.
-
-- `cas_debug`: Determines whether to enable the module's debugging mode.
-
-  Default: 'Off'.
-
-- `cas_idle_timeout`: Sets the idle timeout limit, in seconds.
-
-  Default: `undef`.
-
-- `cas_login_url`: **Required**. Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and don't have an active session.
-
-- `cas_proxy_validate_url`: The URL to use when performing a proxy validation.
-
-  Default: `undef`.
-
-- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. This URL should not include a trailing slash.
-
-  Default: `undef`.
-
-- `cas_scrub_request_headers`: Remove inbound request headers that may have special meaning within mod_auth_cas.
-
-- `cas_sso_enabled`: Enables experimental support for single sign out (may mangle POST data).
-
-  Default: 'Off'.
-
-- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active.
-
-  Default: `undef`.
-
-- `cas_validate_depth`: Limits the depth for chained certificate validation.
-
-  Default: `undef`.
-
-- `cas_validate_saml`: Parse response from CAS server for SAML.
-
-  Default: 'Off'.
-
-- `cas_validate_server`: Whether to validate the cert of the CAS server (deprecated in 1.1 - RedHat 7).
-
-  Default: `undef`.
-
-- `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string.
-
-- `cas_version`: The CAS protocol version to adhere to. Values: '1', '2'.
-
-  Default: '2'.
-
-- `suppress_warning`: Suppress warning about being on RedHat (`mod_auth_cas` package is now available in epel-testing repo).
-
-  Default: `false`.
-
-##### Class: `apache::mod::auth_mellon`
-
-Installs and manages [`mod_auth_mellon`][]. Parameters share names with the Apache module's directives.
-
-``` puppet
-class{ 'apache::mod::auth_mellon':
-  mellon_cache_size => 101,
-}
-```
-
-**Parameters**:
-
-* `mellon_cache_entry_size`: Maximum size for a single session.
-
-  Default: `undef`.
-
-* `mellon_cache_size`: Size in megabytes of the mellon cache.
-
-  Default: 100.
-
-* `mellon_lock_file`: Location of lock file.
-
-  Default: '`/run/mod_auth_mellon/lock`'.
-
-* `mellon_post_directory`: Full path where post requests are saved.
-
-  Default: '`/var/cache/apache2/mod_auth_mellon/`'
-
-* `mellon_post_ttl`: Time to keep post requests.
-
-  Default: `undef`.
-
-* `mellon_post_size`: Maximum size of post requests.
-
-  Default: `undef`.
-
-* `mellon_post_count`: Maximum number of post requests.
-
- Default: `undef`.
-
-##### Class: `apache::mod::authn_dbd`
-
-Installs `mod_authn_dbd` and uses `authn_dbd.conf.erb` template to generate its configuration. Optionally, creates AuthnProviderAlias.
-
-``` puppet
-class { 'apache::mod::authn_dbd':
-  $authn_dbd_params =>
-    'host=db01 port=3306 user=apache password=xxxxxx dbname=apacheauth',
-  $authn_dbd_query  => 'SELECT password FROM authn WHERE user = %s',
-  $authn_dbd_alias  => 'db_auth',
-}
-```
-
-**Parameters**:
-
-* `authn_dbd_alias`: Name for the 'AuthnProviderAlias'.
-
-* `authn_dbd_dbdriver`: Specifies the database driver to use.
-
-  Default: 'mysql'.
-
-* `authn_dbd_exptime`: corresponds to DBDExptime.
-
-  Default: 300.
-
-* `authn_dbd_keep`: Corresponds to DBDKeep.
-
-  Default: 8.
-
-* `authn_dbd_max`: Corresponds to DBDMax.
-
-  Default: 20.
-
-* `authn_dbd_min`: Corresponds to DBDMin.
-
-  Default: 4.
-
-* `authn_dbd_params`: **Required**. Corresponds to DBDParams for the connection string.
-
-* `authn_dbd_query`: Whether to query the user and password for authentication.
-
-##### Class: `apache::mod::authnz_ldap`
-
-Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to generate its configuration.
-
-**Parameters**:
-
-* `package_name`: The name of the package.
-
-  Default: `undef`.
-
-* `verify_server_cert`: Whether to verify the server certificate.
-
-  Default: `undef`.
-
-##### Class: `apache::mod::cluster`
-
-**Note**: There is no official package available for `mod_cluster`, so you must make it available outside of the apache module. Binaries can be found at [here](http://mod-cluster.jboss.org/).
-
-``` puppet
-class { '::apache::mod::cluster':
-  ip                      => '172.17.0.1',
-  allowed_network         => '172.17.0.',
-  balancer_name           => 'mycluster',
-  version                 => '1.3.1'
-}
-```
-
-**Parameters**:
-
-* `port`: mod_cluster listen port.
-
-  Default: '6666'.
-
-* `server_advertise`: Whether the server should advertise.
-
-  Default: `true`.
-
-* `advertise_frequency`: Sets the interval between advertise messages in seconds[.miliseconds].
-
-  Default: 10.
-
-* `manager_allowed_network`: Whether to allow the network to access the mod_cluster_manager.
-
-  Default: '127.0.0.1'.
-
-* `keep_alive_timeout`: Specifies how long Apache should wait for a request, in seconds.
-
-  Default: 60.
-
-* `max_keep_alive_requests`: Maximum number of requests kept alive.
-
-  Default: 0.
-
-* `enable_mcpm_receive`: Whether MCPM should be enabled.
-
-  Default: `true`.
-
-* `ip`: Specifies the IP address to listen to.
-
-* `allowed_network`: Balanced members network.
-
-* `version`: Specifies the `mod_cluster` version. Version 1.3.0 or greater is required for httpd 2.4.
-
-##### Class: `apache::mod::deflate`
-
-Installs and configures [`mod_deflate`][].
-
-**Parameters**:
-
-* `types`: An [array][] of [MIME types][MIME `content-type`] to be deflated.
-
-  Default: ['text/html text/plain text/xml', 'text/css', 'application/x-javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json'].
-
-* `notes`: A [Hash][] where the key represents the type and the value represents the note name.
-
-  Default: { 'Input'  => 'instream', 'Output' => 'outstream', 'Ratio'  => 'ratio' }.
-
-##### Class: `apache::mod::expires`
-
-Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate its configuration.
-
-**Parameters**:
-
-* `expires_active`: Enables generation of `Expires` headers for a document realm.
-
-  Boolean.
-
-  Default: `true`.
-
-* `expires_default`: Specifies the default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][].
-
-  Default: `undef`.
-
-* `expires_by_type`: Describes a set of [MIME `content-type`][] and their expiration times.
-
-  Values: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content-type` (i.e. 'text/json') and its value following valid [interval syntax][].
-
-  Default: `undef`.
-
-##### Class: `apache::mod::ext_filter`
-
-Installs and configures [`mod_ext_filter`][].
-
-``` puppet
-class { 'apache::mod::ext_filter':
-  ext_filter_define => {
-    'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
-    'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
-  },
-}
-```
-
-**Parameters**:
-
-* `ext_filter_define`: A hash of filter names and their parameters.
-
-  Default: `undef`.
-
-##### Class: `apache::mod::fcgid`
-
-Installs and configures [`mod_fcgid`][].
-
-The class does not individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [hash][]. For example:
-
-``` puppet
-class { 'apache::mod::fcgid':
-  options => {
-    'FcgidIPCDir'  => '/var/run/fcgidsock',
-    'SharememPath' => '/var/run/fcgid_shm',
-    'AddHandler'   => 'fcgid-script .fcgi',
-  },
-}
-```
-
-For a full list of options, see the [official `mod_fcgid` documentation][`mod_fcgid`].
-
-If you include `apache::mod::fcgid`, you can set the [`FcgidWrapper`][] per directory, per virtual host. The module must be loaded first; Puppet will not automatically enable it if you set the `fcgiwrapper` parameter in `apache::vhost`.
-
-``` puppet
-include apache::mod::fcgid
-
-apache::vhost { 'example.org':
-  docroot     => '/var/www/html',
-  directories => {
-    path        => '/var/www/html',
-    fcgiwrapper => {
-      command => '/usr/local/bin/fcgiwrapper',
-    }
-  },
-}
-```
-
-##### Class: `apache::mod::geoip`
-
-Installs and manages [`mod_geoip`][].
-
-**Parameters**:
-
-* `db_file`: Sets the path to your GeoIP database file.
-
-  Values: a path, or an [array][] paths for multiple GeoIP database files.
-
-  Default: `/usr/share/GeoIP/GeoIP.dat`.
-
-* `enable`: Determines whether to globally enable [`mod_geoip`][].
-
-  Boolean.
-
-  Default: `false`.
-
-* `flag`: Sets the GeoIP flag.
-
-  Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'.
-
-  Default: 'Standard'.
-
-* `output`: Defines which output variables to use.
-
-  Values: 'All', 'Env', 'Request', 'Notes'.
-
-  Default: 'All'.
-
-* `enable_utf8`: Changes the output from ISO*8859*1 (Latin*1) to UTF*8.
-
-  Boolean.
-
-  Default: `undef`.
-
-* `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option.
-
-  Boolean.
-
-  Default: `undef`.
-
-* `scan_proxy_header_field`: Specifies the header [`mod_geoip`][] uses to determine the client's IP address.
-
-  Default: `undef`.
-
-* `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
-
-  Boolean.
-
-  Default: `undef`.
-
-##### Class: `apache::mod::http2`
-
-Installs and manages [`mod_http2`][].
-
-**Parameters**:
-
-* `h2_copy_files`: Determines if file handles or copies of file content are
-passed from the requestion processing down to the main connection.
-
-  Boolean.
-
-  Default: `undef`
-
-* `h2_direct`: Toggles the usage of the HTTP/2 Direct Mode.
-
-  Boolean.
-
-  Default: `undef`
-
-* `h2_early_hints`: Controls if HTTP status 103 interim responses are forwarded
-to the client or not.
-
-  Boolean.
-
-  Default: `undef`
-
-* `h2_max_session_streams`: Sets the maximum number of active streams per
-HTTP/2 session that the server allows.
-
-  Integer.
-
-  Default: `undef`
-
-* `h2_max_worker_idle_seconds`: Sets the maximum number of seconds a h2 worker
-  may idle until it shuts itself down.
-
-  Integer.
-
-  Default: `undef`
-
-* `h2_max_workers`: Sets the maximum number of worker threads to spawn per
-  child process for HTTP/2 processing.
-
-  Integer.
-
-  Default: `undef`
-
-* `h2_min_workers`: Sets the minimum number of worker threads to spawn per
-  child process for HTTP/2 processing.
-
-  Integer.
-
-  Default: `undef`
-
-* `h2_modern_tls_only`: Toggles the security checks on HTTP/2 connections in
-  TLS mode.
-
-  Boolean.
-
-  Default: `undef`
-
-* `h2_push`: Toggles the usage of the HTTP/2 server push protocol feature.
-
-  Boolean.
-
-  Default: `undef`
-
-* `h2_push_diary_size`: Toggles the maximum number of HTTP/2 server pushes that
-  are remembered per HTTP/2 connection.
-
-  Integer.
-
-  Default: `undef`
-
-* `h2_push_priority`: Defines the priority handling of pushed responses based
-  on the content-type of the response.
-
-  Values: An array of priority definitions.
-
-  Default: `[]`
-
-* `h2_push_resource`: Declares resources for early pushing to the client.
-
-  Values: An array of resources.
-
-  Default: `[]`
-
-* `h2_serialize_headers`: Toggles if HTTP/2 requests shall be serialized in
-  HTTP/1.1 format for processing by httpd core.
-
-  Boolean.
-
-  Default: `undef`
-
-* `h2_stream_max_mem_size`: Maximum number of outgoing data bytes buffered in
-  memory for an active streams.
-
-  Integer.
-
-  Default: `undef`
-
-* `h2_tls_cool_down_secs`: Sets the number of seconds of idle time on a TLS
-  connection before the TLS write size falls back to a small (~1300 bytes)
-  length.
-
-  Integer.
-
-  Default: `undef`
-
-* `h2_tls_warm_up_size`: Sets the number of bytes to be sent in small TLS
-  records (~1300 bytes) until doing maximum sized writes (16k) on https: HTTP/2
-  connections.
-
-  Integer.
-
-  Default: `undef`
-
-* `h2_upgrade`: Toggles the usage of the HTTP/1.1 Upgrade method for switching
-  to HTTP/2.
-
-  Boolean.
-
-  Default: `undef`
-
-* `h2_window_size`: Sets the size of the window that is used for flow control
-  from client to server and limits the amount of data the server has to buffer.
-
-  Integer.
-
-  Default: `undef`
-
-
-##### Class: `apache::mod::info`
-
-Installs and manages [`mod_info`][], which provides a comprehensive overview of the server configuration.
-
-**Parameters**:
-
-* `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server*info`.
-
-  Values: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either.
-
-  Default: ['127.0.0.1','::1'].
-
-* `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'.
-
-  Default: The value of [`$::apache::apache_version`][`apache_version`].
-
-
-* `restrict_access`: Determines whether to enable access restrictions. If `false`, the `allow_from` whitelist is ignored and any IP address can access `/server*info`.
-
-  Boolean.
-
-  Default: `true`.
-
-##### Class: `apache::mod::itk`
-
-Installs and manages [`mod_itk`][], which is an (MPM) that is loaded and configured for the HTTPD process. [official documentation](http://mpm-itk.sesse.net/)
-
-**Parameters**:
-
-* `startservers`: The number of child server processes created on startup.
-
-  Values: Integer.
-
-  Default: `8`.
-
-* `minspareservers`: The desired minimum number of idle child server processes.
-
-  Values: Integer.
-
-  Default: `5`.
-
-* `maxspareservers`: The desired maximum number of idle child server processes.
-
-  Values: Integer.
-
-  Default: `20`.
-
-* `serverlimit`: The maximum configured value for MaxRequestWorkers for the lifetime of the Apache httpd process.
-
-  Values: Integer.
-
-  Default: `256`.
-
-* `maxclients`: The limit on the number of simultaneous requests that will be served.
-
-  Values: Integer.
-
-  Default: `256`.
-
-* `maxrequestsperchild`: The limit on the number of connections that an individual child server process will handle.
-
-  Values: Integer.
-
-  Default: `4000`.
-
-* `enablecapabilities`: Drop most root capabilities in the parent process, and instead run as the user given by the User/Group directives with some extra capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor capabilities, such as NFS.
-
-  Values: Boolean.
-
-  Default: `undef`.
-
-##### Class: `apache::mod::jk`
-
-Installs and manages `mod_jk`, a connector for Apache httpd redirection to old versions of TomCat and JBoss
-
-**Note**: There is no official package available for mod\_jk and thus it must be made available by means outside of the control of the apache module. Binaries can be found at [Apache Tomcat Connectors download page](https://tomcat.apache.org/download-connectors.cgi)
-
-``` puppet
-class { '::apache::mod::jk':
-  ip                   => '192.168.2.15',
-  workers_file         => 'conf/workers.properties',
-  mount_file           => 'conf/uriworkermap.properties',
-  shm_file             => 'run/jk.shm',
-  shm_size             => '50M',
-  workers_file_content => {
-    <Content>
-  },
-}
-```
-
-See [templates/mod/jk/workers.properties.erb](templates/mod/jk/workers.properties.erb) for more information.
-
-**Parameters within `apache::mod::jk`**:
-
-The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for:
-
-**add_listen**
-
-Defines if a `Listen` directive according to parameters `ip` and `port` (see below), so that Apache listens to the IP/port combination and redirect to `mod_jk`.
-Useful when another `Listen` directive, like `Listen *:<Port>` or `Listen <Port>`, can conflict with the one necessary for `mod_jk` binding.
-
-Type: Boolean
-Default: true
-
-**ip**
-
-IP for binding to `mod_jk`.
-Useful when the binding address is not the primary network interface IP.
-
-Type: String
-Default: `$facts['ipaddress']`
-
-**port**
-
-Port for binding to `mod_jk`.
-Useful when something else, like a reverse proxy or cache, is receiving requests at port 80, then needs to forward them to Apache at a different port.
-
-Type: String (numerical)
-Default: '80'
-
-**workers\_file\_content**
-
-Each directive has the format `worker.<Worker name>.<Property>=<Value>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values.
-Plus, there are two global directives, 'worker.list' and 'worker.maintain'
-For example, the workers file below should be parameterized as Figure 1:
-
-``` puppet
-worker.list = status
-worker.list = some_name,other_name
-
-worker.maintain = 60
-
-# Optional comment
-worker.some_name.type=ajp13
-worker.some_name.socket_keepalive=true
-
-# I just like comments
-worker.other_name.type=ajp12 (why would you?)
-worker.other_name.socket_keepalive=false
-```
-
-**Figure 1:**
-
-``` puppet
-$workers_file_content = {
-  worker_lists    => ['status', 'some_name,other_name'],
-  worker_maintain => '60',
-  some_name       => {
-    comment          => 'Optional comment',
-    type             => 'ajp13',
-    socket_keepalive => 'true',
-  },
-  other_name      => {
-    comment          => 'I just like comments',
-    type             => 'ajp12',
-    socket_keepalive => 'false',
-  },
-}
-```
-
-**mount\_file\_content**
-
-Each directive has the format `<URI> = <Worker name>`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: 
-* uri_list&mdash;an array with URIs to be mapped to the worker 
-* comment&mdash;an optional string with a comment for the worker.
-For example, the mount file below should be parameterized as Figure 2:
-
-``` puppet
-# Worker 1
-/context_1/ = worker_1
-/context_1/* = worker_1
-
-# Worker 2
-/ = worker_2
-/context_2/ = worker_2
-/context_2/* = worker_2
-```
-
-**Figure 2:**
-
-``` puppet
-$mount_file_content = {
-  worker_1 => {
-    uri_list => ['/context_1/', '/context_1/*'],
-    comment  => 'Worker 1',
-  },
-  worker_2 => {
-    uri_list => ['/context_2/', '/context_2/*'],
-    comment  => 'Worker 2',
-  },
-},
-```
-
-**shm\_file and log\_file**
-
-Depending on how these files are specified, the class creates their final path differently:
-- Relative path: prepends supplied path with `logroot` (see below)
-- Absolute path or pipe: uses supplied path as-is
-
-Examples (RHEL 6):
-
-``` puppet
-shm_file => 'shm_file'
-# Ends up in
-$shm_path = '/var/log/httpd/shm_file'
-```
-``` puppet
-shm_file => '/run/shm_file'
-# Ends up in
-$shm_path = '/run/shm_file'
-```
-``` puppet
-shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
-# Ends up in
-$shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
-```
-
-> The default logroot is sane enough. Therefore, it is not recommended to specify absolute paths.
-
-**logroot**
-
-The base directory for `shm_file` and `log_file` is determined by the `logroot` parameter. If unspecified, defaults to `apache::params::logroot`.
-
-> The default logroot is sane enough. Therefore, it is not recommended to override it.
-
-##### Class: `apache::mod::passenger`
-
-Installs and manages [`mod_passenger`][]. For Red Hat-based systems, ensure that you meet the minimum requirements described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux).
-
-The current set of server configurations settings were taken directly from the [Passenger Reference](https://www.phusionpassenger.com/library/config/apache/reference/). To enable deprecation warnings and removal failure messages, set the `passenger_installed_version` to the version number installed on the server.
-
-**Parameters**:
-
-|parameter|default value|passenger config setting|context|notes|
-|---------|-------------|------------------------|-------|-----|
-|manage_repo|true|n/a|||
-|mod_id|undef|n/a|||
-|mod_lib|undef|n/a|||
-|mod_lib_path|undef|n/a|||
-|mod_package|undef|n/a|||
-|mod_package_ensure|undef|n/a|||
-|mod_path|undef|n/a|||
-|passenger_allow_encoded_slashes|undef|[`PassengerAllowEncodedSlashes`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAllowEncodedSlashes)|server-config virtual-host htaccess directory ||
-|passenger_app_env|undef|[`PassengerAppEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppEnv)|server-config virtual-host htaccess directory ||
-|passenger_app_group_name|undef|[`PassengerAppGroupName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppGroupName)|server-config virtual-host htaccess directory ||
-|passenger_app_root|undef|[`PassengerAppRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppRoot)|server-config virtual-host htaccess directory ||
-|passenger_app_type|undef|[`PassengerAppType`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerAppType)|server-config virtual-host htaccess directory ||
-|passenger_base_uri|undef|[`PassengerBaseURI`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBaseURI)|server-config virtual-host htaccess directory ||
-|passenger_buffer_response|undef|[`PassengerBufferResponse`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferResponse)|server-config virtual-host htaccess directory ||
-|passenger_buffer_upload|undef|[`PassengerBufferUpload`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerBufferUpload)|server-config virtual-host htaccess directory ||
-|passenger_concurrency_model|undef|[`PassengerConcurrencyModel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerConcurrencyModel)|server-config virtual-host htaccess directory ||
-|passenger_conf_file|$::apache::params::passenger_conf_file|n/a|||
-|passenger_conf_package_file|$::apache::params::passenger_conf_package_file|n/a|||
-|passenger_data_buffer_dir|undef|[`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDataBufferDir)|server-config ||
-|passenger_debug_log_file|undef|PassengerDebugLogFile|server-config |This option has been renamed in version 5.0.5 to PassengerLogFile.|
-|passenger_debugger|undef|[`PassengerDebugger`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDebugger)|server-config virtual-host htaccess directory ||
-|passenger_default_group|undef|[`PassengerDefaultGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultGroup)|server-config ||
-|passenger_default_ruby|$::apache::params::passenger_default_ruby|[`PassengerDefaultRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultRuby)|server-config ||
-|passenger_default_user|undef|[`PassengerDefaultUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDefaultUser)|server-config ||
-|passenger_disable_security_update_check|undef|[`PassengerDisableSecurityUpdateCheck`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerDisableSecurityUpdateCheck)|server-config ||
-|passenger_enabled|undef|[`PassengerEnabled`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerEnabled)|server-config virtual-host htaccess directory ||
-|passenger_error_override|undef|[`PassengerErrorOverride`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerErrorOverride)|server-config virtual-host htaccess directory ||
-|passenger_file_descriptor_log_file|undef|[`PassengerFileDescriptorLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFileDescriptorLogFile)|server-config ||
-|passenger_fly_with|undef|[`PassengerFlyWith`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFlyWith)|server-config ||
-|passenger_force_max_concurrent_requests_per_process|undef|[`PassengerForceMaxConcurrentRequestsPerProcess`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerForceMaxConcurrentRequestsPerProcess)|server-config virtual-host htaccess directory ||
-|passenger_friendly_error_pages|undef|[`PassengerFriendlyErrorPages`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerFriendlyErrorPages)|server-config virtual-host htaccess directory ||
-|passenger_group|undef|[`PassengerGroup`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerGroup)|server-config virtual-host directory ||
-|passenger_high_performance|undef|[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerHighPerformance)|server-config virtual-host htaccess directory ||
-|passenger_installed_version|undef|n/a| |If set, will enable version checking of the passenger options against the value set.|
-|passenger_instance_registry_dir|undef|[`PassengerInstanceRegistryDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerInstanceRegistryDir)|server-config ||
-|passenger_load_shell_envvars|undef|[`PassengerLoadShellEnvvars`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLoadShellEnvvars)|server-config virtual-host htaccess directory ||
-|passenger_log_file|undef|[`PassengerLogFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogFile)|server-config ||
-|passenger_log_level|undef|[`PassengerLogLevel`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLogLevel)|server-config ||
-|passenger_lve_min_uid|undef|[`PassengerLveMinUid`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerLveMinUid)|server-config virtual-host ||
-|passenger_max_instances|undef|[`PassengerMaxInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstances)|server-config virtual-host htaccess directory ||
-|passenger_max_instances_per_app|undef|[`PassengerMaxInstancesPerApp`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxInstancesPerApp)|server-config ||
-|passenger_max_pool_size|undef|[`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPoolSize)|server-config ||
-|passenger_max_preloader_idle_time|undef|[`PassengerMaxPreloaderIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxPreloaderIdleTime)|server-config virtual-host ||
-|passenger_max_request_queue_size|undef|[`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestQueueSize)|server-config virtual-host htaccess directory ||
-|passenger_max_request_time|undef|[`PassengerMaxRequestTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequestTime)|server-config virtual-host htaccess directory ||
-|passenger_max_requests|undef|[`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMaxRequests)|server-config virtual-host htaccess directory ||
-|passenger_memory_limit|undef|[`PassengerMemoryLimit`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMemoryLimit)|server-config virtual-host htaccess directory ||
-|passenger_meteor_app_settings|undef|[`PassengerMeteorAppSettings`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMeteorAppSettings)|server-config virtual-host htaccess directory ||
-|passenger_min_instances|undef|[`PassengerMinInstances`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerMinInstances)|server-config virtual-host htaccess directory ||
-|passenger_nodejs|undef|[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerNodejs)|server-config virtual-host htaccess directory ||
-|passenger_pool_idle_time|undef|[`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPoolIdleTime)|server-config ||
-|passenger_pre_start|undef|[`PassengerPreStart`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPreStart)|server-config virtual-host ||
-|passenger_python|undef|[`PassengerPython`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerPython)|server-config virtual-host htaccess directory ||
-|passenger_resist_deployment_errors|undef|[`PassengerResistDeploymentErrors`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResistDeploymentErrors)|server-config virtual-host htaccess directory ||
-|passenger_resolve_symlinks_in_document_root|undef|[`PassengerResolveSymlinksInDocumentRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResolveSymlinksInDocumentRoot)|server-config virtual-host htaccess directory ||
-|passenger_response_buffer_high_watermark|undef|[`PassengerResponseBufferHighWatermark`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerResponseBufferHighWatermark)|server-config ||
-|passenger_restart_dir|undef|[`PassengerRestartDir`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRestartDir)|server-config virtual-host htaccess directory ||
-|passenger_rolling_restarts|undef|[`PassengerRollingRestarts`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRollingRestarts)|server-config virutal-host htaccess directory ||
-|passenger_root|$::apache::params::passenger_root|[`PassengerRoot`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRoot)|server-config ||
-|passenger_ruby|$::apache::params::passenger_ruby|[`PassengerRuby`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerRuby)|server-config virutal-host htaccess directory ||
-|passenger_security_update_check_proxy|undef|[`PassengerSecurityUpdateCheckProxy`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSecurityUpdateCheckProxy)|server-config ||
-|passenger_show_version_in_header|undef|[`PassengerShowVersionInHeader`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerShowVersionInHeader)|server-config ||
-|passenger_socket_backlog|undef|[`PassengerSocketBacklog`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSocketBacklog)|server-config ||
-|passenger_spawn_method|undef|[`PassengerSpawnMethod`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerSpawnMethod)|server-config virtual-host ||
-|passenger_start_timeout|undef|[`PassengerStartTimeout`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartTimeout)|server-config virtual-host htaccess directory ||
-|passenger_startup_file|undef|[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStartupFile)|server-config virtual-host htaccess directory ||
-|passenger_stat_throttle_rate|undef|[`PassengerStatThrottleRate`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStatThrottleRate)|server-config ||
-|passenger_sticky_sessions|undef|[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessions)|server-config virtual-host htaccess directory ||
-|passenger_sticky_sessions_cookie_name|undef|[`PassengerStickySessionsCookieName`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerStickySessionsCookieName)|server-config virtual-host htaccess directory ||
-|passenger_thread_count|undef|[`PassengerThreadCount`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerThreadCount)|server-config virtual-host htaccess directory ||
-|passenger_use_global_queue|undef|PassengerUseGlobalQueue|server-config ||
-|passenger_user|undef|[`PassengerUser`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUser)|server-config virtual-host directory ||
-|passenger_user_switching|undef|[`PassengerUserSwitching`](https://www.phusionpassenger.com/library/config/apache/reference/#PassengerUserSwitching)|server-config ||
-|rack_auto_detect|undef|RackAutoDetect|server-config |These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
-|rack_autodetect|undef|n/a|||
-|rack_base_uri|undef|RackBaseURI|server-config |Deprecated in 3.0.0 in favor of PassengerBaseURI.|
-|rack_env|undef|[`RackEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RackEnv)|server-config virtual-host htaccess directory ||
-|rails_allow_mod_rewrite|undef|RailsAllowModRewrite|server-config |This option doesn't do anything anymore in since version 4.0.0.|
-|rails_app_spawner_idle_time|undef|RailsAppSpawnerIdleTime|server-config |This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.|
-|rails_auto_detect|undef|RailsAutoDetect|server-config |These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
-|rails_autodetect|undef|n/a|||
-|rails_base_uri|undef|RailsBaseURI|server-config |Deprecated in 3.0.0 in favor of PassengerBaseURI.|
-|rails_default_user|undef|RailsDefaultUser|server-config |Deprecated in 3.0.0 in favor of PassengerDefaultUser.|
-|rails_env|undef|[`RailsEnv`](https://www.phusionpassenger.com/library/config/apache/reference/#RailsEnv)|server-config virtual-host htaccess directory ||
-|rails_framework_spawner_idle_time|undef|RailsFrameworkSpawnerIdleTime|server-config |This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.|
-|rails_ruby|undef|RailsRuby|server-config |Deprecated in 3.0.0 in favor of PassengerRuby.|
-|rails_spawn_method|undef|RailsSpawnMethod|server-config |Deprecated in 3.0.0 in favor of PassengerSpawnMethod.|
-|rails_user_switching|undef|RailsUserSwitching|server-config |Deprecated in 3.0.0 in favor of PassengerUserSwitching.|
-|wsgi_auto_detect|undef|WsgiAutoDetect|server-config |These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.|
-
-
-##### Class: `apache::mod::ldap`
-
-Installs and configures [`mod_ldap`][], and allows you to modify the
-[`LDAPTrustedGlobalCert`](https://httpd.apache.org/docs/current/mod/mod_ldap.html#ldaptrustedglobalcert) Directive:
-
-``` puppet
-class { 'apache::mod::ldap':
-  ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
-  ldap_trusted_global_cert_type => 'CA_DER',
-  ldap_trusted_mode             => 'TLS',
-  ldap_shared_cache_size        => '500000',
-  ldap_cache_entries            => '1024',
-  ldap_cache_ttl                => '600',
-  ldap_opcache_entries          => '1024',
-  ldap_opcache_ttl              => '600',
-}
-```
-
-**Parameters**
-
-* `apache_version`: Specifies the installed Apache version.
-
-  Default: `undef`.
-
-* `ldap_trusted_global_cert_file`: Specifies the path and file name of the trusted CA certificates to use when establishing SSL or TLS connections to an LDAP server.
-
-* `ldap_trusted_global_cert_type`: Specifies the global trust certificate format.
-
-  Default: 'CA_BASE64'.
-
-* `ldap_trusted_mode`: Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
-
-* `ldap_shared_cache_size`: Specifies the size, in bytes, of the shared memory cache.
-
-* `ldap_cache_entries`: Specifies the maximum number of entries in the primary LDAP cache.
-
-* `ldap_cache_ttl`: Specifies the time, in seconds, that cached items remain valid.
-
-* `ldap_opcache_entries`: Specifies the number of entries used to cache LDAP compare operations.
-
-* `ldap_opcache_ttl`: Specifies the time, in seconds, that entries in the operation cache remain valid.
-
-* `package_name`: Specifies the custom package name.
-
-  Default: `undef`.
-
-##### Class: `apache::mod::negotiation`
-
-Installs and configures [`mod_negotiation`][].
-
-**Parameters**:
-
-* `force_language_priority`: Sets the `ForceLanguagePriority` option.
-
-  Values: A string.
-
-  Default: `Prefer Fallback`.
-
-* `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module.
-
-  Default: ['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN', 'zh-TW']
-
-##### Class: `apache::mod::nss`
-
-An SSL provider for Apache using the NSS crypto libraries.
-
-**Parameters:**
-
-- `transfer_log`: path to access.log
-- `error_log`: path to error.log
-- `passwd_file`: path to file used for NSSPassPhraseDialog directive
-- `port`: SSL port. Defaults to 8443
-
-##### Class: `apache::mod::pagespeed`
-
-Installs and manages [`mod_pagespeed`][], a Google module that rewrites web pages to reduce latency and bandwidth.
-
-Although this apache module requires the `mod-pagespeed-stable` package, Puppet **does not** manage the software repositories required to automatically install the package. If you declare this class when the package is either not installed or not available to your package manager, your Puppet run will fail.
-
-> **Note:** Verify that your system is compatible with the latest Google Pagespeed requirements.
-
-**Parameters**:
-
-These parameters correspond to the module's directives. See the [module's documentation][`mod_pagespeed`] for details.
-
-* `inherit_vhost_config`: Default: 'on'.
-* `filter_xhtml`: Default: `false`.
-* `cache_path`: Default: '/var/cache/mod_pagespeed/'.
-* `log_dir`: Default: '/var/log/pagespeed'.
-* `memcache_servers`: Default: [].
-* `rewrite_level`: Default: 'CoreFilters'.
-* `disable_filters`: Default: [].
-* `enable_filters`: Default: [].
-* `forbid_filters`: Default: [].
-* `rewrite_deadline_per_flush_ms`: Default: 10.
-* `additional_domains`: Default: `undef`.
-* `file_cache_size_kb`: Default: 102400.
-* `file_cache_clean_interval_ms`: Default: 3600000.
-* `lru_cache_per_process`: Default: 1024.
-* `lru_cache_byte_limit`: Default: 16384.
-* `css_flatten_max_bytes`: Default: 2048.
-* `css_inline_max_bytes`: Default: 2048.
-* `css_image_inline_max_bytes`: Default: 2048.
-* `image_inline_max_bytes`: Default: 2048.
-* `js_inline_max_bytes`: Default: 2048.
-* `css_outline_min_bytes`: Default: 3000.
-* `js_outline_min_bytes`: Default: 3000.
-* `inode_limit`: Default: 500000.
-* `image_max_rewrites_at_once`: Default: 8.
-* `num_rewrite_threads`: Default: 4.
-* `num_expensive_rewrite_threads`: Default: 4.
-* `collect_statistics`: Default: 'on'.
-* `statistics_logging`: Default: 'on'.
-* `allow_view_stats`: Default: [].
-* `allow_pagespeed_console`: Default: [].
-* `allow_pagespeed_message`: Default: [].
-* `message_buffer_size`: Default: 100000.
-* `additional_configuration`: A hash of directive value pairs, or an array of lines to insert at the end of the pagespeed configuration. Default: '{ }'.
-
-##### Class: `apache::mod::passenger`
-
-Installs and configures `mod_passenger`.
-
->**Note**: The passenger module isn't available on RH/CentOS without providing the dependency packages provided by EPEL and the `mod_passengers` custom repository. See the `manage_repo` parameter above and [https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()
-
-**Parameters**:
-
-* `passenger_conf_file`: `$::apache::params::passenger_conf_file`
-* `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file`
-* `passenger_high_performance`: Default: `undef`
-* `passenger_pool_idle_time`: Default: `undef`
-* `passenger_max_request_queue_size`: Default: `undef`
-* `passenger_max_requests`: Default: `undef`
-* `passenger_spawn_method`: Default: `undef`
-* `passenger_stat_throttle_rate`: Default: `undef`
-* `rack_autodetect`: Default: `undef`
-* `rails_autodetect`: Default: `undef`
-* `passenger_root` : `$::apache::params::passenger_root`
-* `passenger_ruby` : `$::apache::params::passenger_ruby`
-* `passenger_default_ruby`: `$::apache::params::passenger_default_ruby`
-* `passenger_max_pool_size`: Default: `undef`
-* `passenger_min_instances`: Default: `undef`
-* `passenger_max_instances_per_app`: Default: `undef`
-* `passenger_use_global_queue`: Default: `undef`
-* `passenger_app_env`: Default: `undef`
-* `passenger_log_file`: Default: `undef`
-* `passenger_log_level`: Default: `undef`
-* `passenger_data_buffer_dir`: Default: `undef`
-* `manage_repo`: Whether to manage the phusionpassenger.com repository. Default: `true`.
-* `mod_package`: Default: `undef`.
-* `mod_package_ensure`: Default: `undef`.
-* `mod_lib`: Default: `undef`.
-* `mod_lib_path`: Default: `undef`.
-* `mod_id`: Default: `undef`.
-* `mod_path`: Default: `undef`.
-
-##### Class: `apache::mod::proxy`
-
-Installs `mod_proxy` and uses the `proxy.conf.erb` template to generate its configuration.
-
-**Parameters within `apache::mod::proxy`**:
-
-- `allow_from`: Default: `undef`.
-- `apache_version`: Default: `undef`.
-- `package_name`: Default: `undef`.
-- `proxy_requests`: Default: 'Off'.
-- `proxy_via`: Default: 'On'.
-
-##### Class: `apache::mod::proxy_balancer`
-
-Installs and manages [`mod_proxy_balancer`][], which provides load balancing.
-
-**Parameters**:
-
-* `manager`: Determines whether to enable balancer manager support.
-
-  Default: `false`.
-
-* `manager_path`: The server location of the balancer manager.
-
-  Default: '/balancer-manager'.
-
-* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/balancer-manager`.
-
-  Default: ['127.0.0.1','::1'].
-
-* `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'.
-
-  Default: the value of [`$::apache::apache_version`][`apache_version`]. On Apache 2.4 or greater, `mod_slotmem_shm` is loaded.
-
-##### Class: `apache::mod::php`
-
-Installs and configures [`mod_php`][].
-
-**Parameters**:
-
-Default values for these parameters depend on your operating system. Most of this class's parameters correspond to `mod_php` directives; see the [module's documentation][`mod_php`] for details.
-
-* `package_name`: Names the package that installs `mod_php`.
-* `path`: Defines the path to the `mod_php` shared object (`.so`) file.
-* `source`: Defines the path to the default configuration. Values include a `puppet:///` path.
-* `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file.
-* `content`: Adds arbitrary content to `php.conf`.
-* `libphp_prefix`: Allows the definition of a libphp prefix. Defaults to `libphp`.
-
-##### Class: `apache::mod::proxy_html`
-
-**Note**: There is no official package available for `mod_proxy_html`, so you must make it available outside of the apache module.
-
-##### Class: `apache::mod::python`
-
-Installs and configures [`mod_python`][].
-
-**Parameters**
-
-* `loadfile_name`: Sets the name of the configuration file that is used to load the python module.
-
-##### Class: `apache::mod::reqtimeout`
-
-Installs and configures [`mod_reqtimeout`][].
-
-**Parameters**
-
-* `timeouts`: Sets the [`RequestReadTimeout`][] option.
-
-  Values:  A string or [array][].
-
-  Default: ['header=20-40,MinRate=500', 'body=20,MinRate=500'].
-
-##### Class: `apache::mod::rewrite`
-
-Installs and enables the Apache module `mod_rewrite`.
-
-##### Class: `apache::mod::shib`
-
-Installs the [Shibboleth](http://shibboleth.net/) Apache module `mod_shib`, which enables SAML2 single sign-on (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. Defining this class enables Shibboleth-specific parameters in `apache::vhost` instances.
-
-This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
-
-**Note**: The Shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories. See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide).
-
-##### Class: `apache::mod::ssl`
-
-Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration. On most operating systems, this `ssl.conf` is placed in the module configuration directory. On Red Hat-based operating systems, this file is placed in `/etc/httpd/conf.d`, the same location in which the RPM stores the configuration.
-
-To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to `true` **or** the [`ssl`][] parameter in [`apache::vhost`][] to `true`.
-
-- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
-- `ssl_compression`: Default: false.
-- `ssl_cryptodevice`: Default: 'builtin'.
-- `ssl_honorcipherorder`: Default: true.
-- `ssl_openssl_conf_cmd`: Default: undef.
-- `ssl_cert`: Default: undef.
-- `ssl_key`: Default: undef.
-- `ssl_options`: Default: ['StdEnvVars']
-- `ssl_pass_phrase_dialog`: Default: 'builtin'.
-- `ssl_protocol`: Default: ['all', '-SSLv2', '-SSLv3'].
-- `ssl_proxy_protocol`: Default: [].
-- `ssl_random_seed_bytes`: Valid options: A string. Default: '512'.
-- `ssl_sessioncache`: Valid options: A string. Default: '300'.
-- `ssl_sessioncachetimeout`: Valid options: A string. Default: '300'.
-- `ssl_mutex`: Default: Determined based on the OS. Valid options: See [mod_ssl][mod_ssl] documentation.
-  - RedHat/FreeBSD/Suse/Gentoo: 'default'
-  - Debian/Ubuntu + Apache >= 2.4: 'default'
-  - Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'
-**Parameters:
-
-* `ssl_cipher`
-
-  Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
-
-* `ssl_compression`
-
-  Default: `false`.
-
-* `ssl_cryptodevice`
-
-  Default: 'builtin'.
-
-* `ssl_honorcipherorder`
-
-  Default: `true`.
-
-* `ssl_openssl_conf_cmd`
-
-  Default: `undef`.
-
-* `ssl_cert`
-
-  Default: `undef`.
-
-* `ssl_key`
-
-  Default: `undef`.
-
-* `ssl_options`
-
-  Default: ['StdEnvVars']
-
-* `ssl_pass_phrase_dialog`
-
-  Default: 'builtin'.
-
-* `ssl_protocol`
-
-  Default: ['all', '-SSLv2', '-SSLv3'].
-
-* `ssl_random_seed_bytes`
-
-  Values: A string.
-
-  Default: '512'.
-
-* `ssl_sessioncachetimeout`
-
-  Values: A string.
-
-  Default: '300'.
-
-* `ssl_mutex`:
-
-  Values: See [mod_ssl][mod_ssl] documentation.
-
-  Default: Based on the OS:
-
-  * RedHat/FreeBSD/Suse/Gentoo: 'default'.
-  * Debian/Ubuntu + Apache >= 2.4: 'default'.
-  * Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'.
-  * Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
-
-
-##### Class: `apache::mod::status`
-
-Installs [`mod_status`][] and uses the `status.conf.erb` template to generate its configuration.
-
-**Parameters**:
-
-* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/server-status`.
-
-  Default: ['127.0.0.1','::1'].
-
-* `requires`: A string, an [array][] or a [hash][], of IPs and/or names that can/can't access `/server-status`, using Apache v. >= 2.4 `mod_authz_host` directives (`require ip`, `require host`, etc.). This parameter should follow one of the structures below:
-
-  > Only used if Apache version >= 2.4
-
-  - `undef` - Uses `allow_from` and old directive syntax (`Allow from <List of IPs and/or names>`). Issues deprecation warning.
-  - String
-    - `''` or `'unmanaged'` - No auth directives (access controlled elsewhere)
-    - `'ip <List of IPs>'` - IPs/ranges allowed to access `/server-status`
-    - `'host <List of names>'` - Names/domains allowed to access `/server-status`
-    - `'all [granted|denied]'` - Allow / block everyone
-  - Array - Each item should be a string from those described above. Results in one directive per array item.
-  - Hash with structure below (shown as key => value, where keys are strings):
-    - `'requires'` => Array as above - Same effect as the array
-    - `'enforce'`  => String `'Any'`, `'All'` or `'None'` (optional) - Encloses all directives from `'requires'` key in a `<Require(Any|All|None)>` block
-
-  Default: 'ip 127.0.0.1 ::1'
-
-* `extended_status`: Determines whether to track extended status information for each request, via the [`ExtendedStatus`][] directive.
-
-  Values: 'Off', 'On'.
-
-  Default: 'On'.
-
-* `status_path`: The server location of the status page.
-
-  Default: '/server-status'.
-
-##### Class: `apache::mod::userdir`
-
-Allows user-specific directories to be accessed using the `http://example.com/~user/` syntax. All parameters can be found in in the [official Apache documentation](https://httpd.apache.org/docs/2.4/mod/mod_userdir.html).
-
-**Parameters**:
-
-* `overrides`: An [array][] of directive-types.
-
-  Default: ['FileInfo', 'AuthConfig', 'Limit', 'Indexes'].
-
-##### Class: `apache::mod::version`
-
-Installs [`mod_version`][] on many operating systems and Apache configurations.
-
-If Debian and Ubuntu systems with Apache 2.4 are classified with `apache::mod::version`, Puppet warns that `mod_version` is built-in and can't be loaded.
-
-##### Class: `apache::mod::security`
-
-Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs by default on all virtual hosts.
-
-**Parameters**:
-
-* `activated_rules`: An [array][] of rules from the `modsec_crs_path` or absolute to activate via symlinks.
-* `allowed_methods`: A space-separated list of allowed HTTP methods.
-
-  Default: 'GET HEAD POST OPTIONS'.
-
-* `content_types`: A list of one or more allowed [MIME types][MIME `content-type`].
-
-  Default: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'.
-
-* `crs_package`: Names the package that installs CRS rules.
-
-  Default: `modsec_crs_package` in [`apache::params`][].
-
-* `manage_security_crs`: Manage security_crs.conf rules file.
-
-  Default: `true`.
-
-* `modsec_dir`: Defines the path where Puppet installs the modsec configuration and activated rules links.
-
-  Default: 'On', set by `modsec_dir` in [`apache::params`][].
-${modsec\_dir}/activated\_rules.
-
-* `modsec_secruleengine`: Configures the modsec rules engine. Values: 'On', 'Off', and 'DetectionOnly'.
-
-  Default: `modsec_secruleengine` in [`apache::params`][].
-
-* `restricted_extensions`: A space-sparated list of prohibited file extensions.
-
-  Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'.
-
-* `restricted_headers`: A list of restricted headers separated by slashes and spaces.
-
-  Default: 'Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'.
-
-* `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') or Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set.
-
-  Default: 'deny'. You can also set full values, such as "log,auditlog,deny,status:406,tag:'SLA 24/7'".
-
-* `secpcrematchlimit`: Sets the number for the match limit in the PCRE library.
-
-  Default: 1500.
-
-* `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library.
-
-  Default: 1500.
-
-* `logroot`: Configures the location of audit and debug logs.
-
-  Defaults to the Apache log directory (Redhat: `/var/log/httpd`,  Debian: `/var/log/apache2`).
-
-* `audit_log_relevant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging.
-
-  Default: '^(?:5|4(?!04))'.
-
-* `audit_log_parts`: Sets the sections to be put in the [audit log][].
-
-  Default: 'ABIJDEFHZ'.
-
-* `anomaly_score_blocking`: Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set.
-
-  Default: 'off'.
-
-* `inbound_anomaly_threshold`: Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
-
-  Default: 5.
-
-* `outbound_anomaly_threshold`: Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
-
-  Default: 4.
-
-* `critical_anomaly_score`: Sets the scoring points of the critical severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
-
-  Default: 5.
-
-* `error_anomaly_score`: Sets the scoring points of the error severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
-
-  Default: 4.
-
-* `warning_anomaly_score`: Sets the scoring points of the warning severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
-
-  Default: 3.
-
-* `notice_anomaly_score`: Sets the scoring points of the notice severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
-
-Default: 2.
-
-* `secrequestmaxnumargs`: Sets the Maximum number of arguments in the request.
-
-  Default: 255.
-
-* `secrequestbodylimit`:  Sets the maximum request body size ModSecurity accepts for buffering.
-
-  Default: '13107200'.
-
-* `secrequestbodynofileslimit`: Sets the maximum request body size ModSecurity accepts for buffering, excluding the size of any files being transported in the request.
-
-  Default: '131072'.
-
-* `secrequestbodyinmemorylimit`: Sets the maximum request body size that ModSecurity stores in memory.
-
-  Default: '131072'
-
-##### Class: `apache::mod::wsgi`
-
-Enables Python support via [`mod_wsgi`][].
-
-**Parameters**:
-
-* `mod_path`: Defines the path to the `mod_wsgi` shared object (`.so`) file.
-
-  Default: `undef`.
-
-  * If the `mod_path` parameter doesn't contain `/`, Puppet prefixes it with your operating system's default module path. Otherwise, Puppet follows it literally.
-
-* `package_name`: Names the package that installs `mod_wsgi`.
-
-  Default: `undef`.
-
-* `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'.
-
-  Values: A string specifying a path.
-
-  Default: `undef`.
-
-* `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site-packages'.
-
-  Values: A string specifying a path.
-
-  Default: `undef`.
-
-* `wsgi_restrict_embedded`: Defines the [`WSGIRestrictEmbedded`][] directive, such as 'On'.
-
-  Values: On|Off|undef.
-
-  Default: undef.
-
-* `wsgi_application_group`: Defines the [`WSGIApplicationGroup`][] directive, such as "%{GLOBAL}".
-
-  Values: A string specifying a wsgi application.
-
-  Default: `undef`.
-
-* `wsgi_python_optimize`: Defines the [`WSGIPythonOptimize`][] directive, such as 1.
-
-  Values: A integer specifying the level of Python compiler optimisations.
-
-  Default: `undef`.
-
-* `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE\_RUN\_DIR}WSGI".
-
-  Default: `wsgi_socket_prefix` in [`apache::params`][].
-
-The class's parameters correspond to the module's directives. See the [module's documentation][`mod_wsgi`] for details.
-
-### Private Classes
-
-#### Class: `apache::confd::no_accf`
-
-Creates the `no-accf.conf` configuration file in `conf.d`, required by FreeBSD's Apache 2.4.
-
-#### Class: `apache::default_confd_files`
-
-Includes `conf.d` files for FreeBSD.
-
-#### Class: `apache::default_mods`
-
-Installs the Apache modules required to run the default configuration. See the `apache` class's [`default_mods`][] parameter for details.
-
-#### Class: `apache::package`
-
-Installs and configures basic Apache packages.
-
-#### Class: `apache::params`
-
-Manages Apache parameters for different operating systems.
-
-#### Class: `apache::service`
-
-Manages the Apache daemon.
-
-#### Class: `apache::version`
-
-Attempts to automatically detect the Apache version based on the operating system.
-
-##### Red Hat Software Collections (SCL)
-
-Software Collections on CentOS/RHEL allow for newer Apache and PHP, amongst other packages.
-
-If `scl_httpd_version` is set, Apache Httpd will get installed from [Software Collections](https://www.softwarecollections.org/en/).
-
-If `scl_httpd_version` is set, `scl_php_version` also needs to be set, even if PHP is not going to be installed.
-
-The repository is not managed by this module yet. For CentOS you can enable the repo by installing the package `centos-release-scl-rh`.
-
-##### `scl_httpd_version`
-
-Version of httpd to install using Red Hat Software Collections (SCL). These collections for CentOS and RHEL allow for newer Apache and PHP packages.
-
-If you set `scl_httpd_version`, Apache httpd is installed from [Software Collections](https://www.softwarecollections.org/en/).
-
-If you set `scl_httpd_version`, you must also set `scl_php_version`, even if you are not installing PHP.
-
-The SCL repository is not managed by this module. For CentOS, enable the repo by installing the package `centos-release-scl-rh`.
-
-Valid value: A string specifying the version of httpd to install. For example, for Apache 2.4, specify '2.4'.
-
-Default: undef.
-
-##### `scl_php_version`
-
-Version of PHP to install using Red Hat Software Collections (SCL). These collections for CentOS and RHEL allow for newer Apache and PHP packages.
-
-If you set `scl_php_version`, PHP is installed from [Software Collections](https://www.softwarecollections.org/en/).
-
-The SCL repository is not managed by this module. For CentOS, enable the repo by installing the package `centos-release-scl-rh`.
-
-Valid value: A string specifying the version of PHP to install. For example, for PHP 7.1, specify '7.1'.
-
-Default: undef.
-
-### Public defined types
-
-#### Defined type: `apache::balancer`
-
-Creates an Apache load balancing group, also known as a balancer cluster, using [`mod_proxy`][]. Each load balancing group needs one or more balancer members, which you can declare in Puppet with the  [`apache::balancermember`][] defined type.
-
-Declare one `apache::balancer` defined type for each Apache load balancing group. You can export `apache::balancermember` defined types for all balancer members and collect them on a single Apache load balancer server using [exported resources][].
-
-**Parameters**:
-
-##### `name`
-
-Sets the title of the balancer cluster and name of the `conf.d` file containing its configuration.
-
-##### `proxy_set`
-
-Configures key-value pairs as [`ProxySet`][] lines. Values: a [hash][].
-
-Default: '{}'.
-
-##### `options`
-
-Specifies an [array][] of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the balancer URL, and accepts any key-value pairs available to [`ProxyPass`][].
-
-Default: [].
-
-##### `collect_exported`
-
-Determines whether to use [exported resources][].
-
-If you statically declare all of your backend servers, set this parameter to `false` to rely on existing, declared balancer member resources. Also, use `apache::balancermember` with [array][] arguments.
-
-To dynamically declare backend servers via exported resources collected on a central node, set this parameter to `true` to collect the balancer member resources exported by the balancer member nodes.
-
-If you don't use exported resources, a single Puppet run configures all balancer members. If you use exported resources, Puppet has to run on the balanced nodes first, then run on the balancer.
-
-Boolean.
-
-Default: `true`.
-
-#### Defined type: `apache::balancermember`
-
-Defines members of [`mod_proxy_balancer`][], which sets up a balancer member inside a listening service configuration block in the load balancer's `apache.cfg`.
-
-**Parameters**:
-
-##### `balancer_cluster`
-
-**Required**.
-
-Sets the Apache service's instance name, and must match the name of a declared [`apache::balancer`][] resource.
-
-##### `url`
-
-Specifies the URL used to contact the balancer member server.
-
-Default: 'http://${::fqdn}/'.
-
-##### `options`
-
-Specifies an [array][] of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the URL, and accepts any key-value pairs available to [`ProxyPass`][].
-
-Default: an empty array.
-
-#### Defined type: `apache::custom_config`
-
-Adds a custom configuration file to the Apache server's `conf.d` directory. If the file is invalid and this defined type's [`verify_config`][] parameter's value is `true`, Puppet throws an error during a Puppet run.
-
-**Parameters**:
-
-##### `ensure`
-
-Specifies whether the configuration file should be present.
-
-Values: 'absent', 'present'.
-
-Default: 'present'.
-
-##### `confdir`
-
-Sets the directory in which Puppet places configuration files.
-
-Default: the value of [`$::apache::confd_dir`][`confd_dir`].
-
-##### `content`
-
-Sets the configuration file's content. The `content` and [`source`][] parameters are exclusive of each other.
-
-Default: `undef`
-
-##### `filename`
-
-Sets the name of the file under `confdir` in which Puppet stores the configuration.
-
-Default: Filename generated from the `priority` parameter and the resource name.
-
-##### `priority`
-
-Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order.
-
-To omit the priority prefix in the configuration file's name, set this parameter to `false`.
-
-Default: '25'.
-
-##### `source`
-
-Points to the configuration file's source. The [`content`][] and `source` parameters are exclusive of each other.
-
-Default: `undef`
-
-##### `verify_command`
-
-Specifies the command Puppet uses to verify the configuration file. Use a fully qualified command.
-
-This parameter is used only if the [`verify_config`][] parameter's value is `true`. If the `verify_command` fails, the Puppet run deletes the configuration file and raises an error, but does not notify the Apache service.
-
-Default: '/usr/sbin/apachectl -t'.
-
-##### `verify_config`
-
-Specifies whether to validate the configuration file before notifying the Apache service.
-
-Boolean.
-
-Default: `true`.
-
-#### Defined type: `apache::fastcgi::server`
-
-Defines one or more external FastCGI servers to handle specific file types. Use this defined type with [`mod_fastcgi`][FastCGI].
-
-**Parameters**
-
-##### `host`
-
-Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
-
-Default: '127.0.0.1:9000'.
-
-##### `timeout`
-
-Sets the number of seconds a [FastCGI][] application can be inactive before aborting the request and logging the event at the error LogLevel. The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond by writing and flushing within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
-
-Default: 15.
-
-##### `flush`
-
-Forces [`mod_fastcgi`][FastCGI] to write to the client as data is received from the application. By default, `mod_fastcgi` buffers data in order to free the application as quickly as possible.
-
-Default: `false`.
-
-##### `faux_path`
-
-Apache has [FastCGI][] handle URIs that resolve to this filename. The path set in this parameter does not have to exist in the local filesystem.
-
-Default: "/var/www/${name}.fcgi".
-
-##### `alias`
-
-Internally links actions with the FastCGI server. This alias must be unique.
-
-Default: "/${name}.fcgi".
-
-##### `file_type`
-
-Sets the [MIME `content-type`][] of the file to be processed by the FastCGI server.
-
-Default: 'application/x-httpd-php'.
-
-#### Defined type: `apache::listen`
-
-Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this defined type, and titles take the form `<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
-
-#### Defined type: `apache::mod`
-
-Installs packages for an Apache module that doesn't have a corresponding [`apache::mod::<MODULE NAME>`][] class, and checks for or places the module's default configuration files in the Apache server's `module` and `enable` directories. The default locations depend on your operating system.
-
-**Parameters**:
-
-##### `package`
-
-**Required**.
-
-Names the package Puppet uses to install the Apache module.
-
-Default: `undef`.
-
-##### `package_ensure`
-
-Determines whether Puppet ensures the Apache module should be installed.
-
-Values: 'absent', 'present'.
-
-Default: 'present'.
-
-##### `lib`
-
-Defines the module's shared object name. Do not configure manually without special reason.
-
-Default: `mod_$name.so`.
-
-##### `lib_path`
-
-Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The [`path`][] parameter overrides this value.
-
-Default: The `apache` class's [`lib_path`][] parameter.
-
-
-##### `loadfile_name`
-
-Sets the filename for the module's [`LoadFile`][] directive, which can also set the module load order as Apache processes them in alphanumeric order.
-
-Values: Filenames formatted `\*.load`.
-
-Default: the resource's name followed by 'load', as in '$name.load'.
-
-##### `loadfiles`
-
-Specifies an array of [`LoadFile`][] directives.
-
-Default: `undef`.
-
-##### `path`
-
-Specifies a path to the module. Do not manually set this parameter without a special reason.
-
-Default: [`lib_path`][]/[`lib`][].
-
-#### Defined type: `apache::namevirtualhost`
-
-Enables [name-based virtual hosts][] and adds all related directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles can take the forms '\*', '\*:\<PORT\>', '\_default\_:\<PORT\>, '\<IP\>', or '\<IP\>:\<PORT\>'.
-
-#### 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` being a defined resource type, which allows Apache to evaluate it multiple times with different parameters.
-
-The `apache::vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default virtual host within the base `::apache` class, as well as set a customized virtual host as the default. Customized virtual hosts have a lower numeric [`priority`][] than the base class's, causing Apache to process the customized virtual host first.
-
-The `apache::vhost` defined type uses `concat::fragment` to build the configuration file. To inject custom fragments for pieces of the configuration that the defined type doesn't inherently support, add a custom fragment.
-
-For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples of 10, so any `order` that isn't a multiple of 10 should work.
-
-> **Note:** When creating an `apache::vhost`, it cannot be named `default` or `default-ssl`, because vhosts with these titles are always managed by the module. This means that you cannot override `Apache::Vhost['default']`  or `Apache::Vhost['default-ssl]` resources. An optional workaround is to create a vhost named something else, such as `my default`, and ensure that the `default` and `default_ssl` vhosts are set to `false`:
-
-```
-class { 'apache':
-  default_vhost     => false,
-  default_ssl_vhost => false,
-}
-```
-
-**Parameters**:
-
-##### `access_log`
-
-Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
-
-Boolean.
-
-Default: `true`.
-
-##### `access_log_env_var`
-
-Specifies that only requests with particular environment variables be logged.
-
-Default: `undef`.
-
-##### `access_log_file`
-
-Sets the filename of the `*_access.log` placed in [`logroot`][]. Given a virtual host---for instance, example.com---it defaults to 'example.com_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com_access.log' for unencrypted virtual hosts.
-
-Default: `false`.
-
-##### `access_log_format`
-
-Specifies the use of either a [`LogFormat`][] nickname or a custom-formatted string for the access log.
-
-Default: 'combined'.
-
-##### `access_log_pipe`
-
-Specifies a pipe where Apache sends access log messages.
-
-Default: `undef`.
-
-##### `access_log_syslog`
-
-Sends all access log messages to syslog.
-
-Default: `undef`.
-
-##### `add_default_charset`
-
-Sets a default media charset value for the [`AddDefaultCharset`][] directive, which is added to `text/plain` and `text/html` responses.
-
-Default: `undef`.
-
-##### `add_listen`
-
-Determines whether the virtual host creates a [`Listen`][] statement.
-
-Setting `add_listen` to `false` prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are.
-
-Boolean.
-
-Default: `true`.
-
-##### `use_optional_includes`
-
-Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer.
-
-Boolean.
-
-Default: `false`.
-
-##### `additional_includes`
-
-Specifies paths to additional static, virtual host-specific Apache configuration files. You can use this parameter to implement a unique, custom configuration not supported by this module.
-
-Values: a string or [array][] of strings specifying paths.
-
-Default: an empty array.
-
-##### `aliases`
-
-Passes a list of [hashes][hash] to the virtual host to create [`Alias`][], [`AliasMatch`][], [`ScriptAlias`][] or [`ScriptAliasMatch`][] directives as per the [`mod_alias`][] documentation.
-
-For example:
-
-``` puppet
-aliases => [
-  { aliasmatch       => '^/image/(.*)\.jpg$',
-    path             => '/files/jpg.images/$1.jpg',
-  },
-  { alias            => '/image',
-    path             => '/ftp/pub/image',
-  },
-  { scriptaliasmatch => '^/cgi-bin(.*)',
-    path             => '/usr/local/share/cgi-bin$1',
-  },
-  { scriptalias      => '/nagios/cgi-bin/',
-    path             => '/usr/lib/nagios/cgi-bin/',
-  },
-  { alias            => '/nagios',
-    path             => '/usr/share/nagios/html',
-  },
-],
-```
-
-For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs a corresponding context, such as `<Directory /path/to/directory>` or `<Location /some/location/here>`. Puppet creates the directives in the order specified in the `aliases` parameter. As described in the [`mod_alias`][] documentation, add more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more general ones to avoid shadowing.
-
-> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because you can precisely control the order of various alias directives. Defining `ScriptAliases` using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` directives. This often causes problems; for example, this could cause problems with Nagios.
-
-If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is `true`, the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
-
-##### `allow_encoded_slashes`
-
-Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Values: 'nodecode', 'off', 'on'. The default setting omits the declaration from the server configuration and selects the Apache default setting of 'Off'.
-
-Default: `undef`
-
-##### `block`
-
-Specifies the list of things to which Apache blocks access. Valid option: 'scm', which blocks web access to `.svn`, `.git`, and `.bzr` directories.
-
-Default: an empty [array][].
-
-##### `cas_attribute_prefix`
-
-Adds a header with the value of this header being the attribute values when SAML validation is enabled.
-
-Defaults: The value set by [`apache::mod::auth_cas`][].
-
-##### `cas_attribute_delimiter`
-
-Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
-
-Default: The value set by [`apache::mod::auth_cas`][].
-
-##### `cas_login_url`
-
-Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and
-don't have an active session.
-
-Default: The value set by [`apache::mod::auth_cas`][].
-
-##### `cas_scrub_request_headers`
-
-Remove inbound request headers that may have special meaning within mod_auth_cas.
-
-Default: The value set by [`apache::mod::auth_cas`][].
-
-##### `cas_sso_enabled`
-
-Enables experimental support for single sign out (may mangle POST data).
-
-Default: The value set by [`apache::mod::auth_cas`][].
-
-##### `cas_validate_saml`
-
-Parse response from CAS server for SAML.
-
-Default: The value set by [`apache::mod::auth_cas`][].
-
-##### `cas_validate_url`
-
-Sets the URL to use when validating a client-presented ticket in an HTTP query string.
-
-Defaults to the value set by [`apache::mod::auth_cas`][].
-
-
-##### `comment`
-
-Adds comments to the header of the configuration file. Pass as string or an array of strings.
-
-Default: `undef`.
-
-For example:
-
-``` puppet
-comment => "Account number: 123B",
-```
-
-Or:
-
-``` puppet
-comment => [
-  "Customer: X",
-  "Frontend domain: x.example.org",
-]
-```
-
-##### `custom_fragment`
-
-Passes a string of custom configuration directives to place at the end of the virtual host configuration.
-
-Default: `undef`.
-
-##### `default_vhost`
-
-Sets a given `apache::vhost` defined type as the default to serve requests that do not match any other `apache::vhost` defined types.
-
-Default: `false`.
-
-##### `directories`
-
-See the [`directories`](#parameter-directories-for-apachevhost) section.
-
-##### `directoryindex`
-
-Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details.
-
-Default: `undef`.
-
-##### `docroot`
-
-**Required**.
-
-Sets the [`DocumentRoot`][] location, from which Apache serves files.
-
-If `docroot` and [`manage_docroot`][] are both set to `false`, no [`DocumentRoot`][] will be set and the accompanying `<Directory /path/to/directory>` block will not be created.
-
-Values: A string specifying a directory path.
-
-##### `docroot_group`
-
-Sets group access to the [`docroot`][] directory.
-
-Values: A string specifying a system group.
-
-Default: 'root'.
-
-##### `docroot_owner`
-
-Sets individual user access to the [`docroot`][] directory.
-
-Values: A string specifying a user account.
-
-Default: 'root'.
-
-##### `docroot_mode`
-
-Sets access permissions for the [`docroot`][] directory, in numeric notation.
-
-Values: A string.
-
-Default: `undef`.
-
-##### `manage_docroot`
-
-Determines whether Puppet manages the [`docroot`][] directory.
-
-Boolean.
-
-Default: `true`.
-
-##### `error_log`
-
-Specifies whether `*_error.log` directives should be configured.
-
-Boolean.
-
-Default: `true`.
-
-##### `error_log_file`
-
-Points the virtual host's error logs to a `*_error.log` file. If this parameter is undefined, Puppet checks for values in [`error_log_pipe`][], then [`error_log_syslog`][].
-
-If none of these parameters is set, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts.
-
-Default: `undef`.
-
-##### `error_log_pipe`
-
-Specifies a pipe to send error log messages to.
-
-This parameter has no effect if the [`error_log_file`][] parameter has a value. If neither this parameter nor `error_log_file` has a value, Puppet then checks [`error_log_syslog`][].
-
-Default: `undef`.
-
-##### `error_log_syslog`
-
-Determines whether to send all error log messages to syslog.
-
-This parameter has no effect if either of the [`error_log_file`][] or [`error_log_pipe`][] parameters has a value. If none of these parameters has a value, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts.
-
-Boolean.
-
-Default: `undef`.
-
-##### `error_documents`
-
-A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this virtual host.
-
-For example:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  error_documents => [
-    { 'error_code' => '503', 'document' => '/service-unavail' },
-    { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
-  ],
-}
-```
-
-Default: [].
-
-##### `ensure`
-
-Specifies if the virtual host is present or absent.
-
-Values: 'absent', 'present'.
-
-Default: 'present'.
-
-##### `fallbackresource`
-
-Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin with a '/' or be 'disabled'.
-
-Default: `undef`.
-
-##### `fastcgi_idle_timeout`
-
-If using fastcgi, this option sets the timeout for the server to respond.
-
-Default: `undef`.
-
-##### `file_e_tag`
-
-Sets the server default for the [`FileETag`][] declaration, which modifies the response header field for static files.
-
-Values: 'INode', 'MTime', 'Size', 'All', 'None'.
-
-Default: `undef`, which uses Apache's default setting of 'MTime Size'.
-
-##### `filters`
-
-[Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
-
-``` puppet
-apache::vhost { "$::fqdn":
-  filters => [
-    'FilterDeclare   COMPRESS',
-    'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
-    'FilterChain     COMPRESS',
-    'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
-  ],
-}
-```
-
-##### `force_type`
-
-Sets the [`ForceType`][] directive, which forces Apache to serve all matching files with a [MIME `content-type`][] matching this parameter's value.
-
-#### `add_charset`
-
-Lets Apache set custom content character sets per directory and/or file extension
-
-##### `h2_copy_files`
-
-Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
-directive which influences how the requestion process pass files to the main
-connection.
-
-##### `h2_direct`
-
-Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
-directive which toggles the usage of the HTTP/2 Direct Mode.
-
-##### `h2_early_hints`
-
-Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2earlyhints)
-directive which controls if HTTP status 103 interim responses are forwarded to
-the client or not.
-
-##### `h2_max_session_streams`
-
-Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2maxsessionstreams)
-directive which sets the maximum number of active streams per HTTP/2 session
-that the server allows.
-
-##### `h2_modern_tls_only`
-
-Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
-directive which toggles the security checks on HTTP/2 connections in TLS mode.
-
-##### `h2_push`
-
-Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
-directive which toggles the usage of the HTTP/2 server push protocol feature.
-
-##### `h2_push_diary_size`
-
-Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushdiarysize)
-directive which toggles the maximum number of HTTP/2 server pushes that are
-remembered per HTTP/2 connection.
-
-##### `h2_push_priority`
-
-Sets the [H2PushPriority](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushpriority)
-directive which defines the priority handling of pushed responses based on the
-content-type of the response.
-
-##### `h2_push_resource`
-
-Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource)
-directive which declares resources for early pushing to the client.
-
-##### `h2_serialize_headers`
-
-Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
-directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
-format for processing by httpd core.
-
-##### `h2_stream_max_mem_size`
-
-Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
-directive which sets the maximum number of outgoing data bytes buffered in
-memory for an active stream.
-
-##### `h2_tls_cool_down_secs`
-
-Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
-directive which sets the number of seconds of idle time on a TLS connection
-before the TLS write size falls back to a small (~1300 bytes) length.
-
-##### `h2_tls_warm_up_size`
-
-Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlswarmupsize)
-directive which sets the number of bytes to be sent in small TLS records (~1300
-bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
-
-##### `h2_upgrade`
-
-Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2upgrade)
-directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
-to HTTP/2.
-
-##### `h2_window_size`
-
-Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2windowsize)
-directive which sets the size of the window that is used for flow control from
-client to server and limits the amount of data the server has to buffer.
-
-
-##### `headers`
-
-Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
-
-Values: A string or an array of strings.
-
-Default: `undef`.
-
-##### `ip`
-
-Sets the IP address the virtual host listens on. By default, uses Apache's default behavior of listening on all IPs.
-
-Values: A string or an array of strings.
-
-Default: `undef`.
-
-##### `ip_based`
-
-Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual host. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based virtual hosts.
-
-Default: `false`.
-
-##### `itk`
-
-Configures [ITK](http://mpm-itk.sesse.net/) in a hash.
-
-Usage typically looks something like:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot => '/path/to/directory',
-  itk     => {
-    user  => 'someuser',
-    group => 'somegroup',
-  },
-}
-```
-
-Values: a hash, which can include the keys:
-
-* user + group
-* `assignuseridexpr`
-* `assigngroupidexpr`
-* `maxclientvhost`
-* `nice`
-* `limituidrange` (Linux 3.5.0 or newer)
-* `limitgidrange` (Linux 3.5.0 or newer)
-
-Usage typically looks like:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot => '/path/to/directory',
-  itk     => {
-    user  => 'someuser',
-    group => 'somegroup',
-  },
-}
-```
-
-Default: `undef`.
-
-##### `jk_mounts`
-
-Sets up a virtual host with 'JkMount' and 'JkUnMount' directives to handle the paths for URL mapping between Tomcat and Apache.
-
-The parameter must be an array of hashes where each hash must contain the 'worker' and either the 'mount' or 'unmount' keys.
-
-Usage typically looks like:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  jk_mounts => [
-    { mount   => '/*',     worker => 'tcnode1', },
-    { unmount => '/*.jpg', worker => 'tcnode1', },
-  ],
-}
-```
-Default: `undef`.
-
-##### `keepalive`
-
-Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive for the virtual host. By default, the global, server-wide [`KeepAlive`][] setting is in effect.
-
-Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options for the virtual host.
-
-Values: 'Off', 'On'.
-
-Default: `undef`
-
-##### `keepalive_timeout`
-
-Sets the [`KeepAliveTimeout`] directive for the virtual host, which determines the amount of time to wait for subsequent requests on a persistent HTTP connection. By default, the global, server-wide [`KeepAlive`][] setting is in effect.
-
-This parameter is only relevant if either the global, server-wide [`keepalive` parameter][] or the per-vhost `keepalive` parameter is enabled.
-
-Default: `undef`
-
-##### `max_keepalive_requests`
-
-Limits the number of requests allowed per connection to the virtual host. By default,  the global, server-wide [`KeepAlive`][] setting is in effect.
-
-This parameter is only relevant if either the global, server-wide [`keepalive` parameter][] or the per-vhost `keepalive` parameter is enabled.
-
-Default: `undef`.
-
-##### `auth_kerb`
-
-Enable [`mod_auth_kerb`][] parameters for a virtual host.
-
-Usage typically looks like:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  auth_kerb              => `true`,
-  krb_method_negotiate   => 'on',
-  krb_auth_realms        => ['EXAMPLE.ORG'],
-  krb_local_user_mapping => 'on',
-  directories            => {
-    path         => '/var/www/html',
-    auth_name    => 'Kerberos Login',
-    auth_type    => 'Kerberos',
-    auth_require => 'valid-user',
-  },
-}
-```
-
-Related parameters follow the names of `mod_auth_kerb` directives:
-
-- `krb_method_negotiate`: Determines whether to use the Negotiate method. Default: 'on'.
-- `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'.
-- `krb_authoritative`: If set to 'off', authentication controls can be passed on to another module. Default: 'on'.
-- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: [].
-- `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: `undef`.
-- `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: `undef`.
-
-Boolean.
-
-Default: `false`.
-
-##### `krb_verify_kdc`
-
-This option can be used to disable the verification tickets against local keytab to prevent KDC spoofing attacks.
-
-Default: 'on'.
-
-##### `krb_servicename`
-
-Specifies the service name that will be used by Apache for authentication. Corresponding key of this name must be stored in the keytab.
-
-Default: 'HTTP'.
-
-##### `krb_save_credentials`
-
-This option enables credential saving functionality.
-
-Default is 'off'
-
-##### `logroot`
-
-Specifies the location of the virtual host's logfiles.
-
-Default: `/var/log/<apache log location>/`.
-
-##### `$logroot_ensure`
-
-Determines whether or not to remove the logroot directory for a virtual host.
-
-Values: 'directory', 'absent'.
-
-Default: 'directory'.
-
-##### `logroot_mode`
-
-Overrides the mode the logroot directory is set to. Do *not* grant write access to the directory the logs are stored in without being aware of the consequences; for more information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
-
-Default: `undef`.
-
-##### `logroot_owner`
-
-Sets individual user access to the logroot directory.
-
-Defaults to `undef`.
-
-##### `logroot_group`
-
-Sets group access to the [`logroot`][] directory.
-
-Defaults to `undef`.
-
-##### `log_level`
-
-Specifies the verbosity of the error log.
-
-Values: 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
-
-Default: 'warn' for the global server configuration. Can be overridden on a per-virtual host basis.
-
-###### `modsec_body_limit`
-
-Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
-
-Values: An integer.
-
-Default: `undef`.
-
-###### `modsec_disable_vhost`
-
-Disables [`mod_security`][] on a virtual host. Only valid if [`apache::mod::security`][] is included.
-
-Boolean.
-
-Default: `undef`.
-
-###### `modsec_disable_ids`
-
-Removes `mod_security` IDs from the virtual host.
-
-Values: An array of `mod_security` IDs to remove from the virtual host. Also takes a hash allowing removal of an ID from a specific location.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_ids => [ 90015, 90016 ],
-}
-```
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
-}
-```
-
-Default: `undef`.
-
-###### `modsec_disable_ips`
-
-Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching.
-
-Default: `undef`.
-
-###### `modsec_disable_msgs`
-
-Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing removal of an Msg from a specific location.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_msgs => ['Blind SQL Injection Attack', 'Session Fixation Attack'],
-}
-```
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_msgs => { '/location1' => ['Blind SQL Injection Attack', 'Session Fixation Attack'] },
-}
-```
-
-Default: `undef`.
-
-###### `modsec_disable_tags`
-
-Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing removal of an Tag from a specific location.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_tags => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'],
-}
-```
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_tags => { '/location1' => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'] },
-}
-```
-
-Default: `undef`.
-
-##### `modsec_audit*`
-
-* `modsec_audit_log`
-* `modsec_audit_log_file`
-* `modsec_audit_log_pipe`
-
-These three parameters together determine how to send `mod_security` audit log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
-
-* If `modsec_audit_log_file` is set, it is relative to [`logroot`][].
-
-  Default: `undef`.
-
-* If `modsec_audit_log_pipe` is set, it should start with a pipe. Example '|/path/to/mlogc /path/to/mlogc.conf'.
-
-  Default: `undef`.
-
-* If `modsec_audit_log` is `true`, given a virtual host---for instance, example.com---it defaults to 'example.com\_security\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_security.log' for unencrypted virtual hosts.
-
-  Default: `false`.
-
-If none of those parameters are set, the global audit log is used (''/var/log/httpd/modsec\_audit.log''; Debian and derivatives: ''/var/log/apache2/modsec\_audit.log''; others: ).
-
-##### `no_proxy_uris`
-
-Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
-
-Default: [].
-
-##### `no_proxy_uris_match`
-
-This directive is equivalent to [`no_proxy_uris`][], but takes regular expressions.
-
-Default: [].
-
-##### `proxy_preserve_host`
-
-Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost).
-
-Setting this parameter to `true` enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
-
-Boolean.
-
-Default: `false`.
-
-##### `proxy_add_headers`
-
-Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders).
-
-This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
-
-Boolean.
-
-Default: `false`.
-
-##### `proxy_error_override`
-
-Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content.
-
-Boolean.
-
-Default: `false`.
-
-##### `options`
-
-Sets the [`Options`][] for the specified virtual host. For example:
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  options => ['Indexes','FollowSymLinks','MultiViews'],
-}
-```
-
-> **Note**: If you use the [`directories`][] parameter of [`apache::vhost`][], 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
-
-Default: ['Indexes','FollowSymLinks','MultiViews'],
-
-##### `override`
-
-Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
-
-Default: ['None'].
-
-##### `passenger_spawn_method`
-
-Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod), whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
-
-Valid options: `smart` or `direct`.
-
-Default: `undef`.
-
-##### `passenger_app_root`
-
-Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot), the location of the Passenger application root if different from the DocumentRoot.
-
-Values: A string specifying a path.
-
-Default: `undef`.
-
-##### `passenger_app_env`
-
-Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv), the environment for the Passenger application. If not specified, defaults to the global setting or 'production'.
-
-Values: A string specifying the name of the environment.
-
-Default: `undef`.
-
-##### `passenger_log_file`
-
-By default, Passenger log messages are written to the Apache global error log. With [PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile), you can configure those messages to be logged to a different file. This option is only available since Passenger 5.0.5.
-
-Values: A string specifying a path.
-
-Default: `undef`.
-
-##### `passenger_log_level`
-
-This option allows to specify how much information should be written to the log file. If not set, [PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel) will not show up in the configuration file and the defaults are used.
-
-Default: Passenger versions less than 3.0.0: '0'; 5.0.0 and later: '3'.
-
-##### `passenger_ruby`
-
-Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby), the Ruby interpreter to use for the application, on this virtual host.
-
-Default: `undef`.
-
-##### `passenger_min_instances`
-
-Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances), the minimum number of application processes to run.
-
-##### `passenger_max_requests`
-
-Sets [PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#pas
-sengermaxrequests), the maximum number of requests an application process will process.
-
-##### `passenger_max_instances_per_app`
-
-Sets [PassengerMaxInstancesPerApp](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstancesperapp), the maximum number of application processes that may simultaneously exist for a single application.
-
-Default: `undef`.
-
-##### `passenger_start_timeout`
-
-Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout), the timeout for the application startup.
-
-##### `passenger_pre_start`
-
-Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart), the URL of the application if pre-starting is required.
-
-##### `passenger_user`
-
-Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser), the running user for sandboxing applications.
-
-##### `passenger_group`
-
-Sets [PassengerGroup](https://www.phusionpassenger.com/library/config/apache/reference/#passengergroup), the running group for sandboxing applications.
-
-##### `passenger_high_performance`
-
-Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter.
-
-Values: `true`, `false`.
-
-Default: `undef`.
-
-##### `passenger_nodejs`
-
-Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs), the NodeJS interpreter to use for the application, on this virtual host.
-
-##### `passenger_sticky_sessions`
-
-Sets the [`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions) parameter.
-
-Boolean.
-
-Default: `undef`.
-
-##### `passenger_startup_file`
-
-Sets the [`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile) path. This path is relative to the application root.
-
-##### `php_values & php_flags`
-
-Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application.
-
-Default: '{}'.
-
-Within a vhost declaration:
-``` puppet
-  php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
-```
-
-##### `php_admin_flags & values`
-
-Allows per-virtual host setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application.
-
-Default: '{}'.
-
-##### `port`
-
-Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only listens on the port set in this parameter.
-
-##### `priority`
-
-Sets the relative load-order for Apache HTTPD VirtualHost configuration files.
-
-If nothing matches the priority, the first name-based virtual host is used. Likewise, passing a higher priority causes the alphabetically first name-based virtual host to be used if no other names match.
-
-> **Note:** You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
-
-To omit the priority prefix in file names, pass a priority of `false`.
-
-Default: '25'.
-
-##### `protocols`
-
-Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols) directive, which lists available protocols for the virutal host.
-
-Default: `undef`
-
-##### `protocols_honor_order`
-
-Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines wether the order of Protocols sets precedence during negotiation.
-
-Default: `undef`
-
-##### `proxy_dest`
-
-Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
-
-Default: `undef`.
-
-##### `proxy_pass`
-
-Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Optionally, parameters can be added as an array.
-
-Default: `undef`.
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  proxy_pass => [
-    { 'path' => '/a', 'url' => 'http://backend-a/' },
-    { 'path' => '/b', 'url' => 'http://backend-b/' },
-    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
-    { 'path' => '/l', 'url' => 'http://backend-xy',
-      'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
-    { 'path' => '/d', 'url' => 'http://backend-a/d',
-      'params' => { 'retry' => '0', 'timeout' => '5' }, },
-    { 'path' => '/e', 'url' => 'http://backend-a/e',
-      'keywords' => ['nocanon', 'interpolate'] },
-    { 'path' => '/f', 'url' => 'http://backend-f/',
-      'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
-    { 'path' => '/g', 'url' => 'http://backend-g/',
-      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
-    { 'path' => '/h', 'url' => 'http://backend-h/h',
-      'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
-  ],
-}
-```
-
-* `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string.
-* `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
-* `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
-* `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
-
-##### `proxy_dest_match`
-
-This directive is equivalent to [`proxy_dest`][], but takes regular expressions, see [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
-
-##### `proxy_dest_reverse_match`
-
-Allows you to pass a ProxyPassReverse if [`proxy_dest_match`][] is specified. See [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) for details.
-
-##### `proxy_pass_match`
-
-This directive is equivalent to [`proxy_pass`][], but takes regular expressions, see [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details.
-
-##### `rack_base_uris`
-
-Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template.
-
-Default: `undef`.
-
-##### `passenger_base_uris`
-
-Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template.
-
-Default: `undef`.
-
-##### `redirect_dest`
-
-Specifies the address to redirect to.
-
-Default: `undef`.
-
-##### `redirect_source`
-
-Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent.
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  redirect_source => ['/images','/downloads'],
-  redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
-}
-```
-
-##### `redirect_status`
-
-Specifies the status to append to the redirect.
-
-Default: `undef`.
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  redirect_status => ['temp','permanent'],
-}
-```
-
-##### `redirectmatch_*`
-
-* `redirectmatch_regexp`
-* `redirectmatch_status`
-* `redirectmatch_dest`
-
-Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays.
-
-Default: `undef`.
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  redirectmatch_status => ['404','404'],
-  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
-}
-```
-
-##### `request_headers`
-
-Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, and so on.
-
-Default: `undef`.
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  request_headers => [
-    'append MirrorID "mirror 12"',
-    'unset MirrorID',
-  ],
-}
-```
-
-##### `rewrites`
-
-Creates URL rewrite rules. Expects an array of hashes.
-
-Values: Hash keys that are any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'.
-
-Default: `undef`.
-
-For example, you can specify that anyone trying to access index.html is served welcome.html
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
-}
-```
-
-The parameter allows rewrite conditions that, when `true`, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  rewrites => [
-    {
-      comment      => 'redirect IE',
-      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-      rewrite_rule => ['^index\.html$ welcome.html'],
-    },
-  ],
-}
-```
-
-You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  rewrites => [
-    {
-      comment      => 'Lynx or Mozilla v1/2',
-      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-      rewrite_rule => ['^index\.html$ welcome.html'],
-    },
-  ],
-}
-```
-
-Multiple rewrites and conditions are also possible
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  rewrites => [
-    {
-      comment      => 'Lynx or Mozilla v1/2',
-      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-      rewrite_rule => ['^index\.html$ welcome.html'],
-    },
-    {
-      comment      => 'Internet Explorer',
-      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-      rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
-    },
-    {
-      rewrite_base => /apps/,
-      rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
-    },
-    { comment      => 'Rewrite to lower case',
-      rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
-      rewrite_map  => ['lc int:tolower'],
-      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
-    },
-  ],
-}
-```
-
-Refer to the [`mod_rewrite` documentation][`mod_rewrite`] for more details on what is possible with rewrite rules and conditions.
-
-##### `rewrite_inherit`
-
-Determines whether the virtual host inherits global rewrite rules.
-
-Default: `false`.
-
-Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or inside the virtual host `.conf` file. By default, virtual hosts do not inherit global settings. To activate inheritance, specify the `rewrites` parameter and set `rewrite_inherit` parameter to `true`:
-
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  …
-  rewrites => [
-    <rules>,
-  ],
-  rewrite_inherit => `true`,
-}
-```
-
-> **Note**: The `rewrites` parameter is **required** for this to have effect
-
-Apache activates global `Rewrite` rules inheritance if the virtual host files contains the following directives:
-
-``` ApacheConf
-RewriteEngine On
-RewriteOptions Inherit
-```
-
-Refer to the [official `mod_rewrite` documentation](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html), section "Rewriting in Virtual Hosts".
-
-##### `scriptalias`
-
-Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as '/usr/scripts'.
-
-Default: `undef`.
-
-##### `scriptaliases`
-
-> **Note**: This parameter is deprecated in favor of the `aliases` parameter.
-
-Passes an array of hashes to the virtual host to create either ScriptAlias or ScriptAliasMatch statements per the [`mod_alias` documentation][`mod_alias`].
-
-``` puppet
-scriptaliases => [
-  {
-    alias => '/myscript',
-    path  => '/usr/share/myscript',
-  },
-  {
-    aliasmatch => '^/foo(.*)',
-    path       => '/usr/share/fooscripts$1',
-  },
-  {
-    aliasmatch => '^/bar/(.*)',
-    path       => '/usr/share/bar/wrapper.sh/$1',
-  },
-  {
-    alias => '/neatscript',
-    path  => '/usr/share/neatscript',
-  },
-]
-```
-
-The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases before more general ones to avoid shadowing.
-
-##### `serveradmin`
-
-Specifies the email address Apache displays when it renders one of its error pages.
-
-Default: `undef`.
-
-##### `serveraliases`
-
-Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site.
-
-Default: [].
-
-##### `servername`
-
-Sets the servername corresponding to the hostname you connect to the virtual host at.
-
-Default: the title of the resource.
-
-##### `setenv`
-
-Used by HTTPD to set environment variables for virtual hosts.
-
-Default: [].
-
-Example:
-
-``` puppet
-apache::vhost { 'setenv.example.com':
-  setenv => ['SPECIAL_PATH /foo/bin'],
-}
-```
-
-##### `setenvif`
-
-Used by HTTPD to conditionally set environment variables for virtual hosts.
-
-Default: [].
-
-##### `setenvifnocase`
-
-Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
-
-Default: [].
-
-##### `suphp_*`
-
-* `suphp_addhandler`
-* `suphp_configpath`
-* `suphp_engine`
-
-Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG).
-
-* `suphp_addhandler`. Default: 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian and Gentoo.
-* `suphp_configpath`. Default: `undef` on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian and Gentoo.
-* `suphp_engine`. Values: 'on' or 'off'. Default: 'off'.
-
-An example virtual host configuration with suPHP:
-
-``` puppet
-apache::vhost { 'suphp.example.com':
-  port             => '80',
-  docroot          => '/home/appuser/myphpapp',
-  suphp_addhandler => 'x-httpd-php',
-  suphp_engine     => 'on',
-  suphp_configpath => '/etc/php5/apache2',
-  directories      => { path => '/home/appuser/myphpapp',
-    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-  }
-}
-```
-
-##### `vhost_name`
-
-Enables name-based virtual hosting. If no IP is passed to the virtual host, but the virtual host is assigned a port, then the virtual host name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the virtual host name is set to the title of the resource.
-
-Default: '*'.
-
-##### `virtual_docroot`
-
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'.
-
-Default: `false`.
-
-``` puppet
-apache::vhost { 'subdomain.loc':
-  vhost_name      => '*',
-  port            => '80',
-  virtual_docroot => '/var/www/%-2+',
-  docroot         => '/var/www',
-  serveraliases   => ['*.loc',],
-}
-```
-
-##### `wsgi*`
-
-* `wsgi_daemon_process`
-* `wsgi_daemon_process_options`
-* `wsgi_process_group`
-* `wsgi_script_aliases`
-* `wsgi_pass_authorization`
-
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi).
-
-* `wsgi_daemon_process`: A hash that sets the name of the WSGI daemon, accepting [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html). Default: `undef`.
-* `wsgi_daemon_process_options`. _Optional._ Default: `undef`. **Deprecated:** Please add values inside Hash `wsgi_daemon_process`.
-* `wsgi_process_group`: Sets the group ID that the virtual host runs under. Default: `undef`.
-* `wsgi_script_aliases`: Requires a hash of web paths to filesystem .wsgi paths. Default: `undef`.
-* `wsgi_script_aliases_match`: Requires a hash of web path regexes to filesystem .wsgi paths. Default: `undef`
-* `wsgi_pass_authorization`: Uses the WSGI application to handle authorization instead of Apache when set to 'On'. For more information, see [mod_wsgi's WSGIPassAuthorization documentation] (https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html). Default: `undef`, leading Apache to use its default value of 'Off'.
-* `wsgi_chunked_request`: Enables support for chunked requests. Default: `undef`.
-
-An example virtual host configuration with WSGI:
-
-``` puppet
-apache::vhost { 'wsgi.example.com':
-  port                        => '80',
-  docroot                     => '/var/www/pythonapp',
-  wsgi_daemon_process         => {
-    'wsgi' => {
-      processes    => '2',
-      threads      => '15',
-      display-name => '%{GROUP}',
-    },
-    'foo' => {},
-  },
-  wsgi_process_group          => 'wsgi',
-  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-  wsgi_chunked_request        => 'On',
-}
-```
-
-#### Parameter `directories` for `apache::vhost`
-
-The `directories` parameter within the `apache::vhost` class passes an array of hashes to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory), [File](https://httpd.apache.org/docs/current/mod/core.html#files), and [Location](https://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
-
-The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys.
-
-The `provider` key is optional. If missing, this key defaults to 'directory'. Values: 'directory', 'files', 'proxy', 'location', 'directorymatch', 'filesmatch', 'proxymatch' or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
-
-An example use of `directories`:
-
-``` puppet
-apache::vhost { 'files.example.net':
-  docroot     => '/var/www/files',
-  directories => [
-    { 'path'     => '/var/www/files',
-      'provider' => 'files',
-      'deny'     => 'from all',
-     },
-  ],
-}
-```
-
-> **Note:** At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter.
-
-Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes. This looks like
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [ { path => '/path/to/directory', handler => value } ],
-}
-```
-
-Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are:
-
-##### `addhandlers`
-
-Sets [AddHandler](https://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension'] }`.
-
-An example:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path        => '/path/to/directory',
-      addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
-    },
-  ],
-}
-```
-
-##### `allow`
-
-Sets an [Allow](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path  => '/path/to/directory',
-      allow => 'from example.org',
-    },
-  ],
-}
-```
-
-##### `allow_override`
-
-Sets the types of directives allowed in [.htaccess](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot      => '/path/to/directory',
-  directories  => [
-    { path           => '/path/to/directory',
-      allow_override => ['AuthConfig', 'Indexes'],
-    },
-  ],
-}
-```
-
-##### `auth_basic_authoritative`
-
-Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative), which determines whether authorization and authentication are passed to lower level Apache modules.
-
-##### `auth_basic_fake`
-
-Sets the value for [AuthBasicFake](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
-
-##### `auth_basic_provider`
-
-Sets the value for [AuthBasicProvider](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
-
-##### `auth_digest_algorithm`
-
-Sets the value for [AuthDigestAlgorithm](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
-
-###### `auth_digest_domain`
-
-Sets the value for [AuthDigestDomain](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
-
-##### `auth_digest_nonce_lifetime`
-
-Sets the value for [AuthDigestNonceLifetime](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
-
-##### `auth_digest_provider`
-
-Sets the value for [AuthDigestProvider](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
-
-##### `auth_digest_qop`
-
-Sets the value for [AuthDigestQop](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
-
-##### `auth_digest_shmem_size`
-
-Sets the value for [AuthAuthDigestShmemSize](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
-
-##### `auth_group_file`
-
-Sets the value for [AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile), which sets the name of the text file containing the list of user groups for authorization.
-
-##### `auth_name`
-
-Sets the value for [AuthName](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm.
-
-##### `auth_require`
-
-Sets the entity name you're requiring to allow access. Read more about [Require](https://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives).
-
-##### `auth_type`
-
-Sets the value for [AuthType](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
-
-##### `auth_user_file`
-
-Sets the value for [AuthUserFile](https://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
-
-##### `auth_merging`
-
-Sets the value for [AuthMerging](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#authmerging), which determines if authorization logic should be combined
-
-##### `auth_ldap_url`
-
-Sets the value for [AuthLDAPURL](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapurl), which determines URL of LDAP-server(s) if AuthBasicProvider 'ldap' is used
-
-##### `auth_ldap_bind_dn`
-
-Sets the value for [AuthLDAPBindDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbinddn), which allows use of an optional DN used to bind to the LDAP-server when searching for entries if AuthBasicProvider 'ldap' is used.
-
-##### `auth_ldap_bind_password`
-
-Sets the value for [AuthLDAPBindPassword](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbindpassword), which allows use of an optional bind password to use in conjunction with the bind DN if AuthBasicProvider 'ldap' is used.
-
-##### `auth_ldap_group_attribute`
-
-Array of values for [AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute), specifies which LDAP attributes are used to check for user members within ldap-groups.
-
-Default: "member" and "uniquemember".
-
-##### `auth_ldap_group_attribute_is_dn`
-
-Sets value for [AuthLDAPGroupAttributeIsDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattributeisdn), specifies if member of a ldapgroup is a dn or simple username. When set on, this directive says to use the distinguished name of the client username when checking for group membership. Otherwise, the username will be used. valid values are: "on" or "off"
-
-##### `custom_fragment`
-
-Pass a string of custom configuration directives to be placed at the end of the directory configuration.
-
-``` puppet
-apache::vhost { 'monitor':
-  …
-  directories => [
-    {
-      path => '/path/to/directory',
-      custom_fragment => '
-<Location /balancer-manager>
-  SetHandler balancer-manager
-  Order allow,deny
-  Allow from all
-</Location>
-<Location /server-status>
-  SetHandler server-status
-  Order allow,deny
-  Allow from all
-</Location>
-ProxyStatus On',
-    },
-  ]
-}
-```
-
-##### `dav`
-
-Sets the value for [Dav](http://httpd.apache.org/docs/current/mod/mod_dav.html#dav), which determines if the WebDAV HTTP methods should be enabled. The value can be either 'On', 'Off' or the name of the provider. A value of 'On' enables the default filesystem provider implemented by the `mod_dav_fs` module.
-
-##### `dav_depth_infinity`
-
-Sets the value for [DavDepthInfinity](http://httpd.apache.org/docs/current/mod/mod_dav.html#davdepthinfinity), which is used to enable the processing of `PROPFIND` requests having a `Depth: Infinity` header.
-
-##### `dav_min_timeout`
-
-Sets the value for [DavMinTimeout](http://httpd.apache.org/docs/current/mod/mod_dav.html#davmintimeout), which sets the time the server holds a lock on a DAV resource. The value should be the number of seconds to set.
-
-##### `deny`
-
-Sets a [Deny](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path => '/path/to/directory',
-      deny => 'from example.org',
-    },
-  ],
-}
-```
-
-##### `error_documents`
-
-An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  directories => [
-    { path            => '/srv/www',
-      error_documents => [
-        { 'error_code' => '503',
-          'document'   => '/service-unavail',
-        },
-      ],
-    },
-  ],
-}
-```
-
-##### `ext_filter_options`
-
-Sets the [ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive.
-Note that you must declare `class { 'apache::mod::ext_filter': }` before using this directive.
-
-``` puppet
-apache::vhost { 'filter.example.org':
-  docroot     => '/var/www/filter',
-  directories => [
-    { path               => '/var/www/filter',
-      ext_filter_options => 'LogStderr Onfail=abort',
-    },
-  ],
-}
-```
-
-##### `geoip_enable`
-
-Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive.
-Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
-
-``` puppet
-apache::vhost { 'first.example.com':
-  docroot     => '/var/www/first',
-  directories => [
-    { path         => '/var/www/first',
-      geoip_enable => `true`,
-    },
-  ],
-}
-```
-
-##### `h2_copy_files`
-
-Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.
-Note that you must declare `class {'apache::mod::http2': }` before using this directive.
-
-##### `h2_push_resource`
-
-Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.
-Note that you must declare `class {'apache::mod::http2': }` before using this directive.
-
-##### `headers`
-
-Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => {
-    path    => '/path/to/directory',
-    headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-  },
-}
-```
-
-##### `index_options`
-
-Allows configuration settings for [directory indexing](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path           => '/path/to/directory',
-      directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work
-      options        => ['Indexes','FollowSymLinks','MultiViews'],
-      index_options  => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
-    },
-  ],
-}
-```
-
-##### `index_order_default`
-
-Sets the [default ordering](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path                => '/path/to/directory',
-      order               => 'Allow,Deny',
-      index_order_default => ['Descending', 'Date'],
-    },
-  ],
-}
-```
-
-###### `index_style_sheet`
-
-Sets the [IndexStyleSheet](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet), which adds a CSS stylesheet to the directory index.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path              => '/path/to/directory',
-      options           => ['Indexes','FollowSymLinks','MultiViews'],
-      index_options     => ['FancyIndexing'],
-      index_style_sheet => '/styles/style.css',
-    },
-  ],
-}
-```
-
-##### `limit`
-
-Creates a [Limit](https://httpd.apache.org/docs/current/mod/core.html#limit) block inside the Directory block, which can also contain `require` directives.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/docroot',
-  directories => [
-    { path     => '/',
-      provider => 'location',
-      limit    => [
-        { methods => 'GET HEAD',
-          require => ['valid-user']
-        },
-      ],
-    },
-  ],
-}
-```
-
-##### `limit_except`
-
-Creates a [LimitExcept](https://httpd.apache.org/docs/current/mod/core.html#limitexcept) block inside the Directory block, which can also contain `require` directives.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/docroot',
-  directories => [
-    { path         => '/',
-      provider     => 'location',
-      limit_except => [
-        { methods => 'GET HEAD',
-          require => ['valid-user']
-        },
-      ],
-    },
-  ],
-}
-```
-
-##### `mellon_enable`
-
-Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_mellon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path                       => '/',
-      provider                   => 'directory',
-      mellon_enable              => 'info',
-      mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key',
-      mellon_endpoint_path       => '/mellon',
-      mellon_set_env_no_prefix   => { 'ADFS_GROUP' => 'http://schemas.xmlsoap.org/claims/Group',
-                                      'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress', },
-      mellon_user => 'ADFS_LOGIN',
-    },
-    { path          => '/protected',
-      provider      => 'location',
-      mellon_enable => 'auth',
-      auth_type     => 'Mellon',
-      auth_require  => 'valid-user',
-      mellon_cond   => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]'],
-    },
-  ]
-}
-```
-
-Related parameters follow the names of `mod_auth_mellon` directives:
-
-- `mellon_cond`: Takes an array of mellon conditions that must be met to grant access, and creates a [MellonCond][`mod_auth_mellon`] directive for each item in the array.
-- `mellon_endpoint_path`: Sets the [MellonEndpointPath][`mod_auth_mellon`] to set the mellon endpoint path.
-- `mellon_sp_metadata_file`: Sets the [MellonSPMetadataFile][`mod_auth_mellon`] location of the SP metadata file.
-- `mellon_idp_metadata_file`: Sets the [MellonIDPMetadataFile][`mod_auth_mellon`] location of the IDP metadata file.
-- `mellon_saml_rsponse_dump`: Sets the [MellonSamlResponseDump][`mod_auth_mellon`] directive to enable debug of SAML.
-- `mellon_set_env_no_prefix`: Sets the [MellonSetEnvNoPrefix][`mod_auth_mellon`] directive to a hash of attribute names to map
-to environment variables.
-- `mellon_sp_private_key_file`: Sets the [MellonSPPrivateKeyFile][`mod_auth_mellon`] directive for the private key location of the service provider.
-- `mellon_sp_cert_file`: Sets the [MellonSPCertFile][`mod_auth_mellon`] directive for the public key location of the service provider.
-- `mellon_user`: Sets the [MellonUser][`mod_auth_mellon`] attribute to use for the username.
-- `mellon_session_length`: Sets the [MellonSessionLength][`mod_auth_mellon`] attribute.
-
-##### `options`
-
-Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path    => '/path/to/directory',
-      options => ['Indexes','FollowSymLinks','MultiViews'],
-    },
-  ],
-}
-```
-
-##### `order`
-
-Sets the order of processing Allow and Deny statements as per [Apache core documentation](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path  => '/path/to/directory',
-      order => 'Allow,Deny',
-    },
-  ],
-}
-```
-
-##### `passenger_enabled`
-
-Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directive to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path              => '/path/to/directory',
-      passenger_enabled => 'on',
-    },
-  ],
-}
-```
-
-> **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
-
-##### `php_value` and `php_flag`
-
-`php_value` sets the value of the directory, and `php_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
-
-##### `php_admin_value` and `php_admin_flag`
-
-`php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
-
-
-##### `require`
-
-
-Sets a `Require` directive as per the [Apache Authz documentation](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#require). If no `require` is set, it will default to `Require all granted`.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path    => '/path/to/directory',
-      require => 'ip 10.17.42.23',
-    }
-  ],
-}
-```
-
-When more complex sets of requirement are needed, apache >= 2.4 provides the use of [RequireAll](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireall), [RequireNone](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requirenone) or [RequireAny](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireany) directives.
-Using the 'enforce' key, which only supports 'any','none','all' (other values are silently ignored), this could be established like:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path    => '/path/to/directory',
-      require => {
-        enforce  => 'any',
-        requires => [
-          'ip 1.2.3.4',
-          'not host host.example.com',
-          'user xyz',
-        ],
-      },
-    },
-  ],
-}
-```
-
-If `require` is set to `unmanaged` it will not be set at all. This is useful for complex authentication/authorization requirements which are handled in a custom fragment.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path    => '/path/to/directory',
-      require => 'unmanaged',
-    }
-  ],
-}
-```
-
-
-
-##### `satisfy`
-
-Sets a `Satisfy` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path    => '/path/to/directory',
-      satisfy => 'Any',
-    }
-  ],
-}
-```
-
-##### `sethandler`
-
-Sets a `SetHandler` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#sethandler).
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path       => '/path/to/directory',
-      sethandler => 'None',
-    }
-  ],
-}
-```
-
-##### `set_output_filter`
-
-Sets a `SetOutputFilter` directive per the [Apache Core documentation](https://httpd.apache.org/docs/current/mod/core.html#setoutputfilter).
-
-``` puppet
-apache::vhost{ 'filter.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path              => '/path/to/directory',
-      set_output_filter => puppetdb-strip-resource-params,
-    },
-  ],
-}
-```
-
-##### `rewrites`
-
-Creates URL [`rewrites`](#rewrites) rules in virtual host directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'.
-
-``` puppet
-apache::vhost { 'secure.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path        => '/path/to/directory',
-      rewrites => [ { comment      => 'Permalink Rewrites',
-                      rewrite_base => '/'
-                    },
-                    { rewrite_rule => ['^index\.php$ - [L]']
-                    },
-                    { rewrite_cond => ['%{REQUEST_FILENAME} !-f',
-                                       '%{REQUEST_FILENAME} !-d',
-                                      ],
-                      rewrite_rule => ['. /index.php [L]'],
-                    }
-                  ],
-    },
-  ],
-}
-```
-
-> **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the virtual host's directories.
-
-##### `shib_request_settings`
-
-Allows a valid content setting to be set or altered for the application request. This command takes two parameters: the name of the content setting, and the value to set it to. Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
-
-``` puppet
-apache::vhost { 'secure.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path                  => '/path/to/directory',
-      shib_request_settings => { 'requiresession' => 'On' },
-      shib_use_headers      => 'On',
-    },
-  ],
-}
-```
-
-##### `shib_use_headers`
-
-When set to 'On', this turns on the use of request headers to publish attributes to applications. Values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details.
-
-##### `shib_compat_valid_user`
-
-Default is Off, matching the behavior prior to this command's existence. Addresses a conflict when using Shibboleth in conjunction with other auth/auth modules by restoring "standard" Apache behavior when processing the "valid-user" and "user" Require rules. See the [`mod_shib`documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions), and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess) topic for more details. This key is disabled if `apache::mod::shib` is not defined.
-
-##### `ssl_options`
-
-String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the virtual host.
-
-``` puppet
-apache::vhost { 'secure.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path        => '/path/to/directory',
-      ssl_options => '+ExportCertData',
-    },
-    { path        => '/path/to/different/dir',
-      ssl_options => ['-StdEnvVars', '+ExportCertData'],
-    },
-  ],
-}
-```
-
-##### `suphp`
-
-A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the virtual host declaration, and can only be passed within `directories`.
-
-``` puppet
-apache::vhost { 'secure.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path  => '/path/to/directory',
-      suphp => {
-        user  => 'myappuser',
-        group => 'myappgroup',
-      },
-    },
-  ],
-}
-```
-##### `additional_includes`
-
-Specifies paths to additional static, specific Apache configuration files in virtual host directories. Values: a array of string path.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path  => '/path/to/different/dir',
-      additional_includes => ['/custom/path/includes', '/custom/path/another_includes',],
-    },
-  ],
-}
-```
-
-#### SSL parameters for `apache::vhost`
-
-All of the SSL parameters for `::vhost` default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific virtual hosts.
-
-##### `ssl`
-
-Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Values: Boolean.
-
-Default: `false`.
-
-##### `ssl_ca`
-
-Specifies the SSL certificate authority to be used to verify client certificates used for authentication. You must also set `ssl_verify_client` to use this.
-
-Default: `undef`.
-
-##### `ssl_cert`
-
-Specifies the SSL certification.
-
-Default: Depends on operating system.
-
-* RedHat: '/etc/pki/tls/certs/localhost.crt'
-* Debian: '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-* FreeBSD: '/usr/local/etc/apache22/server.crt'
-* Gentoo: '/etc/ssl/apache2/server.crt'
-
-##### `ssl_protocol`
-
-Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array or space separated string of accepted protocols.
-
-Defaults: 'all', '-SSLv2', '-SSLv3'.
-
-##### `ssl_cipher`
-
-Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
-
-Default: 'HIGH:MEDIUM:!aNULL:!MD5'.
-
-##### `ssl_honorcipherorder`
-
-Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), to cause Apache to use the server's preferred order of ciphers rather than the client's preferred order. Values:
-
-Values: Boolean, 'on', 'off'.
-
-Default: `true`.
-
-##### `ssl_certs_dir`
-
-Specifies the location of the SSL certification directory to verify client certs. Will not be used unless `ssl_verify_client` is also set (see below).
-
-Default: undef
-
-##### `ssl_chain`
-
-Specifies the SSL chain. This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production.
-
-Default: `undef`.
-
-##### `ssl_crl`
-
-Specifies the certificate revocation list to use. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-Default: `undef`.
-
-##### `ssl_crl_path`
-
-Specifies the location of the certificate revocation list to verify certificates for client authentication with. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-Default: `undef`.
-
-##### `ssl_crl_check`
-
-Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck) for ssl client authentication. The default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions.
-
-Default: `undef`.
-
-##### `ssl_key`
-
-Specifies the SSL key.
-
-Defaults are based on your operating system. Default work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.
-
-* RedHat: '/etc/pki/tls/private/localhost.key'
-* Debian: '/etc/ssl/private/ssl-cert-snakeoil.key'
-* FreeBSD: '/usr/local/etc/apache22/server.key'
-* Gentoo: '/etc/ssl/apache2/server.key'
-
-##### `ssl_verify_client`
-
-Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  …
-  ssl_verify_client => 'optional',
-}
-```
-
-Values: 'none', 'optional', 'require', and 'optional_no_ca'.
-
-Default: `undef`.
-
-
-##### `ssl_verify_depth`
-
-Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. You must set `ssl_verify_client` for it to take effect.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  …
-  ssl_verify_client => 'require',
-  ssl_verify_depth => 1,
-}
-```
-
-Default: `undef`.
-
-##### `ssl_proxy_protocol`
-
-Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) directive, which controls which SSL protocol flavors `mod_ssl` should use when establishing its server environment for proxy. It connects to servers using only one of the provided protocols.
-
-Default: `undef`.
-
-##### `ssl_proxy_verify`
-
-Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server.
-
-Default: `undef`.
-
-##### `ssl_proxy_verify_depth`
-
-Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth) directive, which configures how deeply mod_ssl should verify before deciding that the remote server does not have a valid certificate.
-
-A depth of 0 means that only self-signed remote server certificates are accepted, the default depth of 1 means the remote server certificate can be self-signed or signed by a CA that is directly known to the server.
-
-Default: `undef`
-
-##### `ssl_proxy_cipher_suite`
-
-Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite) directive, which controls cipher suites supported for ssl proxy traffic.
-
-Default: `undef`
-
-##### `ssl_proxy_ca_cert`
-
-Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile) directive, which specifies an all-in-one file where you can assemble the Certificates of Certification Authorities (CA) whose remote servers you deal with. These are used for Remote Server Authentication. This file should be a concatenation of the PEM-encoded certificate files in order of preference.
-
-Default: `undef`
-
-##### `ssl_proxy_machine_cert`
-
-Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference.
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  …
-  ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
-}
-```
-
-Default: `undef`
-
-##### `ssl_proxy_check_peer_cn`
-
-Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL.
-
-Values: 'on', 'off'.
-
-Default: `undef`
-
-##### `ssl_proxy_check_peer_name`
-
-Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL.
-
-Values: 'on', 'off'.
-
-Default: `undef`
-
-##### `ssl_proxy_check_peer_expire`
-
-Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not.
-
-Values: 'on', 'off'.
-
-Default: `undef`
-
-##### `ssl_options`
-
-Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given virtual host and can be a string or an array.
-
-A string:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  …
-  ssl_options => '+ExportCertData',
-}
-```
-
-An array:
-
-``` puppet
-apache::vhost { 'sample.example.net':
-  …
-  ssl_options => ['+StrictRequire', '+ExportCertData'],
-}
-```
-
-Default: `undef`.
-
-##### `ssl_openssl_conf_cmd`
-
-Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters.
-
-Default: `undef`
-
-##### `ssl_proxyengine`
-
-Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
-
-Boolean.
-
-Default: `false`.
-
-##### `ssl_stapling`
-
-Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). By default, uses what is set globally.
-
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
-
-Boolean or `undef`.
-
-Default: `undef`
-
-##### `ssl_stapling_timeout`
-
-Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.
-
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
-
-Default: none.
-
-##### `ssl_stapling_return_errors`
-
-Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.
-
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
-
-Default: none.
-
-#### Defined type: FastCGI Server
-
-This type is intended for use with mod\_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types.
-
-** Note ** If using Ubuntu 10.04+, you'll need to manually enable the multiverse repository.
-
-Ex:
-
-``` puppet
-apache::fastcgi::server { 'php':
-  host        => '127.0.0.1:9000',
-  timeout     => 15,
-  flush       => `false`,
-  faux_path   => '/var/www/php.fcgi',
-  fcgi_alias  => '/php.fcgi',
-  file_type   => 'application/x-httpd-php',
-  pass_header => ''
-}
-```
-
-Within your virtual host, you can then configure the specified file type to be handled by the fastcgi server specified above.
-
-``` puppet
-apache::vhost { 'www':
-  ...
-  custom_fragment => 'AddType application/x-httpd-php .php'
-  ...
-}
-```
-
-##### `host`
-
-The hostname or IP address and TCP port number (1-65535) of the FastCGI server.
-
-It is also possible to pass a unix socket:
-
-``` puppet
-apache::fastcgi::server { 'php':
-  host        => '/var/run/fcgi.sock',
-}
-```
-
-##### `timeout`
-
-The number of seconds of FastCGI application inactivity allowed before the request is aborted and the event is logged (at the error LogLevel). The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond (by writing and flushing) within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply.
-
-##### `flush`
-
-Force a write to the client as data is received from the application. By default, `mod_fastcgi` buffers data in order to free the application as quickly as possible.
-
-##### `faux_path`
-
-Does not have to exist in the local filesystem. URIs that Apache resolves to this filename are handled by this external FastCGI application.
-
-##### `alias`
-
-A unique alias. This is used internally to link the action with the FastCGI server.
-
-##### `file_type`
-
-The MIME-type of the file to be processed by the FastCGI server.
-
-##### `pass_header`
-
-The name of an HTTP Request Header to be passed in the request environment. This option makes available the contents of headers which are normally not available (e.g. Authorization) to a CGI environment.
-
-#### Defined type: `apache::vhost::custom`
-
-The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
-
-**Parameters within `apache::vhost::custom`**:
-
-##### `content`
-
-Sets the configuration file's content.
-
-##### `ensure`
-
-Specifies if the virtual host file is present or absent.
-
-Values: 'absent', 'present'.
-
-Default: 'present'.
-
-##### `priority`
-
-Sets the relative load order for Apache HTTPD VirtualHost configuration files.
-
-Default: '25'.
-
-##### `verify_config`
-
-Specifies whether to validate the configuration file before notifying the Apache service.
-
-Boolean.
-
-Default: `true`.
-
-### Private defined types
-
-#### Defined type: `apache::peruser::multiplexer`
-
-This defined type checks if an Apache module has a class. If it does, it includes that class. If it does not, it passes the module name to the [`apache::mod`][] defined type.
-
-#### Defined type: `apache::peruser::multiplexer`
-
-Enables the [`Peruser`][] module for FreeBSD only.
-
-#### Defined type: `apache::peruser::processor`
-
-Enables the [`Peruser`][] module for FreeBSD only.
-
-#### Defined type: `apache::security::file_link`
-
-Links the `activated_rules` from [`apache::mod::security`][] to the respective CRS rules on disk.
-
-### Templates
-
-The Apache module relies heavily on templates to enable the [`apache::vhost`][] and [`apache::mod`][] defined types. These templates are built based on [Facter][] facts specific to your operating system. Unless explicitly called out, most templates are not meant for configuration.
-
-### Tasks
+### Tasks
 
 The Apache module has a task that allows a user to reload the Apache config without restarting the service. Please refer to to the [PE documentation](https://puppet.com/docs/pe/2017.3/orchestrator/running_tasks.html) or [Bolt documentation](https://puppet.com/docs/bolt/latest/bolt.html) on how to execute a task.
 
-### Functions
-#### apache_pw_hash
-Hashes a password in a format suitable for htpasswd files read by apache.
-
-Currently uses SHA-hashes, because although this format is considered insecure, its the
-most secure format supported by the most platforms.
-
 <a id="limitations"></a>
 ## Limitations
 
@@ -6057,4 +919,4 @@ COVERAGE=yes bundle exec rake parallel_spec
 
 We want to make it as easy as possible to contribute changes so our modules work in your environment, but we also need contributors to follow a few guidelines to help us maintain and improve the modules' quality.
 
-For more information, please read the complete [module contribution guide][] and check out [CONTRIBUTING.md][].
+For more information, please read the complete [module contribution guide][] and check out [CONTRIBUTING.md][].
\ No newline at end of file
diff --git a/REFERENCE.md b/REFERENCE.md
new file mode 100644
index 0000000000..4329d3ab9f
--- /dev/null
+++ b/REFERENCE.md
@@ -0,0 +1,9349 @@
+# Reference
+<!-- DO NOT EDIT: This document was generated by Puppet Strings -->
+
+## Table of Contents
+
+**Classes**
+
+_Public Classes_
+
+* [`apache`](#apache): Guides the basic setup and installation of Apache on your system.
+* [`apache::dev`](#apachedev): Installs Apache development libraries.
+* [`apache::mod::actions`](#apachemodactions): Installs Apache mod_actions
+* [`apache::mod::alias`](#apachemodalias): Installs and configures `mod_alias`.
+* [`apache::mod::auth_basic`](#apachemodauth_basic): Installs `mod_auth_basic`
+* [`apache::mod::auth_cas`](#apachemodauth_cas): Installs and configures `mod_auth_cas`.
+* [`apache::mod::auth_gssapi`](#apachemodauth_gssapi): Installs `mod_auth_gsappi`.
+* [`apache::mod::auth_kerb`](#apachemodauth_kerb): Installs `mod_auth_kerb`
+* [`apache::mod::auth_mellon`](#apachemodauth_mellon): Installs and configures `mod_auth_mellon`.
+* [`apache::mod::authn_core`](#apachemodauthn_core): Installs `mod_authn_core`.
+* [`apache::mod::authn_dbd`](#apachemodauthn_dbd): Installs `mod_authn_dbd`.
+* [`apache::mod::authn_file`](#apachemodauthn_file): Installs `mod_authn_file`.
+* [`apache::mod::authnz_ldap`](#apachemodauthnz_ldap): Installs `mod_authnz_ldap`.
+* [`apache::mod::authnz_pam`](#apachemodauthnz_pam): Installs `mod_authnz_pam`.
+* [`apache::mod::authz_default`](#apachemodauthz_default): Installs and configures `mod_authz_default`.
+* [`apache::mod::authz_user`](#apachemodauthz_user): Installs `mod_authz_user`
+* [`apache::mod::autoindex`](#apachemodautoindex): Installs `mod_autoindex`
+* [`apache::mod::cache`](#apachemodcache): Installs `mod_cache`
+* [`apache::mod::cgi`](#apachemodcgi): Installs `mod_cgi`.
+* [`apache::mod::cgid`](#apachemodcgid): Installs `mod_cgid`.
+* [`apache::mod::cluster`](#apachemodcluster): Installs `mod_cluster`.
+* [`apache::mod::data`](#apachemoddata): Installs and configures `mod_data`.
+* [`apache::mod::dav`](#apachemoddav): Installs `mod_dav`.
+* [`apache::mod::dav_fs`](#apachemoddav_fs): Installs `mod_dav_fs`.
+* [`apache::mod::dav_svn`](#apachemoddav_svn): Installs and configures `mod_dav_svn`.
+* [`apache::mod::dbd`](#apachemoddbd): Installs `mod_dbd`.
+* [`apache::mod::deflate`](#apachemoddeflate): Installs and configures `mod_deflate`.
+* [`apache::mod::dev`](#apachemoddev): Installs `mod_dev`.
+* [`apache::mod::dir`](#apachemoddir): Installs and configures `mod_dir`.
+* [`apache::mod::disk_cache`](#apachemoddisk_cache): Installs and configures `mod_disk_cache`.
+* [`apache::mod::dumpio`](#apachemoddumpio): Installs and configures `mod_dumpio`.
+* [`apache::mod::env`](#apachemodenv): Installs `mod_env`.
+* [`apache::mod::event`](#apachemodevent): Installs and configures `mod_event`.
+* [`apache::mod::expires`](#apachemodexpires): Installs and configures `mod_expires`.
+* [`apache::mod::ext_filter`](#apachemodext_filter): Installs and configures `mod_ext_filter`.
+* [`apache::mod::fastcgi`](#apachemodfastcgi): Installs `mod_fastcgi`.
+* [`apache::mod::fcgid`](#apachemodfcgid): Installs and configures `mod_fcgid`.
+* [`apache::mod::filter`](#apachemodfilter): Installs `mod_filter`.
+* [`apache::mod::geoip`](#apachemodgeoip): Installs and configures `mod_geoip`.
+* [`apache::mod::headers`](#apachemodheaders): Installs and configures `mod_headers`.
+* [`apache::mod::http2`](#apachemodhttp2): Installs and configures `mod_http2`.
+* [`apache::mod::include`](#apachemodinclude): Installs `mod_include`.
+* [`apache::mod::info`](#apachemodinfo): Installs and configures `mod_info`.
+* [`apache::mod::intercept_form_submit`](#apachemodintercept_form_submit): Installs `mod_intercept_form_submit`.
+* [`apache::mod::itk`](#apachemoditk): Installs MPM `mod_itk`.
+* [`apache::mod::jk`](#apachemodjk): Installs `mod_jk`.
+* [`apache::mod::ldap`](#apachemodldap): Installs and configures `mod_ldap`.
+* [`apache::mod::lookup_identity`](#apachemodlookup_identity): Installs `mod_lookup_identity`
+* [`apache::mod::macro`](#apachemodmacro): Installs `mod_macro`.
+* [`apache::mod::mime`](#apachemodmime): Installs and configures `mod_mime`.
+* [`apache::mod::mime_magic`](#apachemodmime_magic): Installs and configures `mod_mime_magic`.
+* [`apache::mod::negotiation`](#apachemodnegotiation): Installs and configures `mod_negotiation`.
+* [`apache::mod::nss`](#apachemodnss): Installs and configures `mod_nss`.
+* [`apache::mod::pagespeed`](#apachemodpagespeed): Installs and configures `mod_pagespeed`.
+* [`apache::mod::passenger`](#apachemodpassenger): Installs `mod_pasenger`.
+* [`apache::mod::perl`](#apachemodperl): Installs `mod_perl`.
+* [`apache::mod::peruser`](#apachemodperuser): Installs `mod_peruser`.
+* [`apache::mod::php`](#apachemodphp): Installs `mod_php`.
+* [`apache::mod::prefork`](#apachemodprefork): Installs and configures MPM `prefork`.
+* [`apache::mod::proxy`](#apachemodproxy): Installs and configures `mod_proxy`.
+* [`apache::mod::proxy_ajp`](#apachemodproxy_ajp): Installs `mod_proxy_ajp`.
+* [`apache::mod::proxy_balancer`](#apachemodproxy_balancer): Installs and configures `mod_proxy_balancer`.
+* [`apache::mod::proxy_connect`](#apachemodproxy_connect): Installs `mod_proxy_connect`.
+* [`apache::mod::proxy_fcgi`](#apachemodproxy_fcgi): Installs `mod_proxy_fcgi`.
+* [`apache::mod::proxy_html`](#apachemodproxy_html): Installs `mod_proxy_html`.
+* [`apache::mod::proxy_http`](#apachemodproxy_http): Installs `mod_proxy_http`.
+* [`apache::mod::proxy_wstunnel`](#apachemodproxy_wstunnel): Installs `mod_proxy_wstunnel`.
+* [`apache::mod::python`](#apachemodpython): Installs and configures `mod_python`.
+* [`apache::mod::remoteip`](#apachemodremoteip): Installs and configures `mod_remoteip`.
+* [`apache::mod::reqtimeout`](#apachemodreqtimeout): Installs and configures `mod_reqtimeout`.
+* [`apache::mod::rewrite`](#apachemodrewrite): Installs `mod_rewrite`.
+* [`apache::mod::rpaf`](#apachemodrpaf): Installs and configures `mod_rpaf`.
+* [`apache::mod::security`](#apachemodsecurity): Installs and configures `mod_security`.
+* [`apache::mod::setenvif`](#apachemodsetenvif): Installs `mod_setenvif`.
+* [`apache::mod::shib`](#apachemodshib): Installs and configures `mod_shib`.
+* [`apache::mod::socache_shmcb`](#apachemodsocache_shmcb): Installs `mod_socache_shmcb`.
+* [`apache::mod::speling`](#apachemodspeling): Installs `mod_spelling`.
+* [`apache::mod::ssl`](#apachemodssl): Installs `mod_ssl`.
+* [`apache::mod::status`](#apachemodstatus): Installs and configures `mod_status`.
+* [`apache::mod::suexec`](#apachemodsuexec): Installs `mod_suexec`.
+* [`apache::mod::suphp`](#apachemodsuphp): Installs `mod_suphp`.
+* [`apache::mod::userdir`](#apachemoduserdir): Installs and configures `mod_userdir`.
+* [`apache::mod::version`](#apachemodversion): Installs `mod_version`.
+* [`apache::mod::vhost_alias`](#apachemodvhost_alias): Installs Apache `mod_vhost_alias`.
+* [`apache::mod::worker`](#apachemodworker): Installs and manages the MPM `worker`.
+* [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
+* [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
+* [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
+
+_Private Classes_
+
+* `apache::confd::no_accf`: Manages the `no-accf.conf` file.
+* `apache::default_confd_files`: Helper for setting up default conf.d files.
+* `apache::default_mods`: Installs and congfigures default mods for Apache
+* `apache::package`: Installs an Apache MPM.
+* `apache::params`: This class manages Apache parameters
+* `apache::php`: This class installs PHP for Apache.
+* `apache::proxy`: This class enabled the proxy module for Apache.
+* `apache::python`: This class installs Python for Apache
+* `apache::service`: Installs and configures Apache service.
+* `apache::ssl`: This class installs Apache SSL capabilities
+* `apache::version`: Try to automatically detect the version by OS
+
+**Defined types**
+
+_Public Defined types_
+
+* [`apache::balancer`](#apachebalancer): This type will create an apache balancer cluster file inside the conf.d
+directory.
+* [`apache::balancermember`](#apachebalancermember): Defines members of `mod_proxy_balancer`
+* [`apache::custom_config`](#apachecustom_config): Adds a custom configuration file to the Apache server's `conf.d` directory.
+* [`apache::fastcgi::server`](#apachefastcgiserver): Defines one or more external FastCGI servers to handle specific file types. Use this
+defined type with `mod_fastcgi`.
+* [`apache::listen`](#apachelisten): Adds `Listen` directives to `ports.conf` that define the
+Apache server's or a virtual host's listening address and port.
+* [`apache::mod`](#apachemod): Installs packages for an Apache module that doesn't have a corresponding
+`apache::mod::<MODULE NAME>` class.
+* [`apache::namevirtualhost`](#apachenamevirtualhost): Enables name-based virtual hosts
+* [`apache::vhost`](#apachevhost): Allows specialised configurations for virtual hosts that possess requirements
+outside of the defaults.
+* [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
+
+_Private Defined types_
+
+* `apache::default_mods::load`: Helper used by `apache::default_mods`
+* `apache::mpm`: Enables the use of Apache MPMs.
+* `apache::peruser::multiplexer`: Checks if an Apache module has a class.
+* `apache::peruser::processor`: Enables the `Peruser` module for FreeBSD only.
+* `apache::security::rule_link`: Links the activated_rules from `apache::mod::security` to the respective CRS rules on disk.
+
+**Resource types**
+
+* [`a2mod`](#a2mod): Manage Apache 2 modules
+
+**Functions**
+
+* [`apache::apache_pw_hash`](#apacheapache_pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
+* [`apache::bool2httpd`](#apachebool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
+* [`apache::validate_apache_log_level`](#apachevalidate_apache_log_level): Perform simple validation of a string against the list of known log levels.
+* [`apache_pw_hash`](#apache_pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
+* [`bool2httpd`](#bool2httpd): Transform a supposed boolean to On or Off. Pass all other values through.
+* [`validate_apache_log_level`](#validate_apache_log_level): Perform simple validation of a string against the list of known log levels.
+
+**Tasks**
+
+* [`init`](#init): Allows you to perform apache service functions
+
+## Classes
+
+### apache
+
+When this class is declared with the default options, Puppet:
+- Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
+- Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system.
+- Configures the server with a default virtual host and standard port (`80`) and address (`\*`) bindings.
+- Creates a document root directory determined by your operating system, typically `/var/www`.
+- Starts the Apache service.
+
+#### Examples
+
+##### 
+
+```puppet
+class { 'apache': }
+```
+
+#### Parameters
+
+The following parameters are available in the `apache` class.
+
+##### `allow_encoded_slashes`
+
+Data type: `Optional[Enum['on', 'off', 'nodecode']]`
+
+Sets the server default for the `AllowEncodedSlashes` declaration, which modifies the
+responses to URLs containing '\' and '/' characters. If not specified, this parameter omits
+the declaration from the server's configuration and uses Apache's default setting of 'off'.
+
+Default value: `undef`
+
+##### `apache_version`
+
+Data type: `Any`
+
+Configures module template behavior, package names, and default Apache modules by defining
+the version of Apache to use. We do not recommend manually configuring this parameter
+without reason.
+
+Default value: $::apache::version::default
+
+##### `conf_dir`
+
+Data type: `Any`
+
+Sets the directory where the Apache server's main configuration file is located.
+
+Default value: $::apache::params::conf_dir
+
+##### `conf_template`
+
+Data type: `Any`
+
+Defines the template used for the main Apache configuration file. Modifying this
+parameter is potentially risky, as the apache module is designed to use a minimal
+configuration file customized by `conf.d` entries.
+
+Default value: $::apache::params::conf_template
+
+##### `confd_dir`
+
+Data type: `Any`
+
+Sets the location of the Apache server's custom configuration directory.
+
+Default value: $::apache::params::confd_dir
+
+##### `default_charset`
+
+Data type: `Any`
+
+Used as the `AddDefaultCharset` directive in the main configuration file.
+
+Default value: `undef`
+
+##### `default_confd_files`
+
+Data type: `Boolean`
+
+Determines whether Puppet generates a default set of includable Apache configuration files
+in the directory defined by the `confd_dir` parameter. These configuration files
+correspond to what is typically installed with the Apache package on the server's
+operating system.
+
+Default value: `true`
+
+##### `default_mods`
+
+Data type: `Any`
+
+Determines whether to configure and enable a set of default Apache modules depending on
+your operating system.<br />
+If `false`, Puppet includes only the Apache modules required to make the HTTP daemon work
+on your operating system, and you can declare any other modules separately using the
+`apache::mod::<MODULE NAME>` class or `apache::mod` defined type.<br />
+If `true`, Puppet installs additional modules, depending on the operating system and
+the values of `apache_version` and `mpm_module` parameters. Because these lists of
+modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
+If this parameter contains an array, Puppet instead enables all passed Apache modules.
+
+Default value: `true`
+
+##### `default_ssl_ca`
+
+Data type: `Any`
+
+Sets the default certificate authority for the Apache server.<br />
+Although the default value results in a functioning Apache server, you **must** update
+this parameter with your certificate authority information before deploying this server in
+a production environment.
+
+Default value: `undef`
+
+##### `default_ssl_cert`
+
+Data type: `Any`
+
+Sets the SSL encryption certificate location.<br />
+Although the default value results in a functioning Apache server, you **must** update this
+parameter with your certificate location before deploying this server in a production environment.
+
+Default value: $::apache::params::default_ssl_cert
+
+##### `default_ssl_chain`
+
+Data type: `Any`
+
+Sets the default SSL chain location.<br />
+Although this default value results in a functioning Apache server, you **must** update
+this parameter with your SSL chain before deploying this server in a production environment.
+
+Default value: `undef`
+
+##### `default_ssl_crl`
+
+Data type: `Any`
+
+Sets the path of the default certificate revocation list (CRL) file to use.<br />
+Although this default value results in a functioning Apache server, you **must** update
+this parameter with the CRL file path before deploying this server in a production
+environment. You can use this parameter with or in place of the `default_ssl_crl_path`.
+
+Default value: `undef`
+
+##### `default_ssl_crl_path`
+
+Data type: `Any`
+
+Sets the server's certificate revocation list path, which contains your CRLs.<br />
+Although this default value results in a functioning Apache server, you **must** update
+this parameter with the CRL file path before deploying this server in a production environment.
+
+Default value: `undef`
+
+##### `default_ssl_crl_check`
+
+Data type: `Any`
+
+Sets the default certificate revocation check level via the `SSLCARevocationCheck` directive.
+This parameter applies only to Apache 2.4 or higher and is ignored on older versions.<br />
+Although this default value results in a functioning Apache server, you **must** specify
+this parameter when using certificate revocation lists in a production environment.
+
+Default value: `undef`
+
+##### `default_ssl_key`
+
+Data type: `Any`
+
+Sets the SSL certificate key file location.
+Although the default values result in a functioning Apache server, you **must** update
+this parameter with your SSL key's location before deploying this server in a production
+environment.
+
+Default value: $::apache::params::default_ssl_key
+
+##### `default_ssl_vhost`
+
+Data type: `Boolean`
+
+Configures a default SSL virtual host.
+If `true`, Puppet automatically configures the following virtual host using the
+`apache::vhost` defined type:
+```puppet
+apache::vhost { 'default-ssl':
+  port            => 443,
+  ssl             => true,
+  docroot         => $docroot,
+  scriptalias     => $scriptalias,
+  serveradmin     => $serveradmin,
+  access_log_file => "ssl_${access_log_file}",
+}
+```
+**Note**: SSL virtual hosts only respond to HTTPS queries.
+
+Default value: `false`
+
+##### `default_type`
+
+Data type: `Any`
+
+_Apache 2.2 only_. Sets the MIME `content-type` sent if the server cannot otherwise
+determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and
+newer, and is only for backwards compatibility in configuration files.
+
+Default value: 'none'
+
+##### `default_vhost`
+
+Data type: `Boolean`
+
+Configures a default virtual host when the class is declared.<br />
+To configure customized virtual hosts, set this parameter's
+value to `false`.<br />
+> **Note**: Apache will not start without at least one virtual host. If you set this
+to `false` you must configure a virtual host elsewhere.
+
+Default value: `true`
+
+##### `dev_packages`
+
+Data type: `Any`
+
+Configures a specific dev package to use.<br />
+For example, using httpd 2.4 from the IUS yum repo:<br />
+``` puppet
+include ::apache::dev
+class { 'apache':
+  apache_name  => 'httpd24u',
+  dev_packages => 'httpd24u-devel',
+}
+```
+
+Default value: $::apache::params::dev_packages
+
+##### `docroot`
+
+Data type: `Any`
+
+Sets the default `DocumentRoot` location.
+
+Default value: $::apache::params::docroot
+
+##### `error_documents`
+
+Data type: `Any`
+
+Determines whether to enable [custom error documents](https://httpd.apache.org/docs/current/custom-error.html) on the Apache server.
+
+Default value: `false`
+
+##### `group`
+
+Data type: `Any`
+
+Sets the group ID that owns any Apache processes spawned to answer requests.<br />
+By default, Puppet attempts to manage this group as a resource under the `apache`
+class, determining the group based on the operating system as detected by the
+`apache::params` class. To prevent the group resource from being created and use a group
+created by another Puppet module, set the `manage_group` parameter's value to `false`.<br />
+> **Note**: Modifying this parameter only changes the group ID that Apache uses to spawn
+child processes to access resources. It does not change the user that owns the parent server
+process.
+
+Default value: $::apache::params::group
+
+##### `httpd_dir`
+
+Data type: `Any`
+
+Sets the Apache server's base configuration directory. This is useful for specially
+repackaged Apache server builds but might have unintended consequences when combined
+with the default distribution packages.
+
+Default value: $::apache::params::httpd_dir
+
+##### `http_protocol_options`
+
+Data type: `Any`
+
+Specifies the strictness of HTTP protocol checks.<br />
+Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`,
+`RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`.
+
+Default value: $::apache::params::http_protocol_options
+
+##### `keepalive`
+
+Data type: `Any`
+
+Determines whether to enable persistent HTTP connections with the `KeepAlive` directive.
+If you set this to `On`, use the `keepalive_timeout` and `max_keepalive_requests` parameters
+to set relevant options.<br />
+
+Default value: $::apache::params::keepalive
+
+##### `keepalive_timeout`
+
+Data type: `Any`
+
+Sets the `KeepAliveTimeout` directive, which determines the amount of time the Apache
+server waits for subsequent requests on a persistent HTTP connection. This parameter is
+only relevant if the `keepalive` parameter is enabled.
+
+Default value: $::apache::params::keepalive_timeout
+
+##### `max_keepalive_requests`
+
+Data type: `Any`
+
+Limits the number of requests allowed per connection when the `keepalive` parameter is enabled.
+
+Default value: $::apache::params::max_keepalive_requests
+
+##### `hostname_lookups`
+
+Data type: `Enum['Off', 'On', 'Double', 'off', 'on', 'double']`
+
+This directive enables DNS lookups so that host names can be logged and passed to
+CGIs/SSIs in REMOTE_HOST.<br />
+> **Note**: If enabled, it impacts performance significantly.
+
+Default value: $::apache::params::hostname_lookups
+
+##### `lib_path`
+
+Data type: `Any`
+
+Specifies the location whereApache module files are stored.<br />
+> **Note**: Do not configure this parameter manually without special reason.
+
+Default value: $::apache::params::lib_path
+
+##### `log_level`
+
+Data type: `Any`
+
+Changes the error log's verbosity. Valid options are: `alert`, `crit`, `debug`, `emerg`, `error`,
+`info`, `notice` and `warn`.
+
+Default value: $::apache::params::log_level
+
+##### `log_formats`
+
+Data type: `Any`
+
+Define additional `LogFormat` directives. Values: A hash, such as:
+``` puppet
+$log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
+```
+  There are a number of predefined `LogFormats` in the `httpd.conf` that Puppet creates:
+``` httpd
+  LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+  LogFormat "%h %l %u %t \"%r\" %>s %b" common
+  LogFormat "%{Referer}i -> %U" referer
+  LogFormat "%{User-agent}i" agent
+  LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
+```
+If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition.
+
+Default value: {}
+
+##### `logroot`
+
+Data type: `Any`
+
+Changes the directory of Apache log files for the virtual host.
+
+Default value: $::apache::params::logroot
+
+##### `logroot_mode`
+
+Data type: `Any`
+
+Overrides the default `logroot` directory's mode.<br />
+> **Note**: Do _not_ grant write access to the directory where the logs are stored
+without being aware of the consequences. See the [Apache documentation](https://httpd.apache.org/docs/current/logs.html#security)
+for details.
+
+Default value: $::apache::params::logroot_mode
+
+##### `manage_group`
+
+Data type: `Boolean`
+
+When `false`, stops Puppet from creating the group resource.<br />
+If you have a group created from another Puppet module that you want to use to run Apache,
+set this to `false`. Without this parameter, attempting to use a previously established
+group results in a duplicate resource error.
+
+Default value: `true`
+
+##### `supplementary_groups`
+
+Data type: `Any`
+
+A list of groups to which the user belongs. These groups are in addition to the primary group.<br />
+Notice: This option only has an effect when `manage_user` is set to true.
+
+Default value: []
+
+##### `manage_user`
+
+Data type: `Boolean`
+
+When `false`, stops Puppet from creating the user resource.<br />
+This is for instances when you have a user, created from another Puppet module, you want
+to use to run Apache. Without this parameter, attempting to use a previously established
+user would result in a duplicate resource error.
+
+Default value: `true`
+
+##### `mod_dir`
+
+Data type: `Any`
+
+Sets where Puppet places configuration files for your Apache modules.
+
+Default value: $::apache::params::mod_dir
+
+##### `mod_libs`
+
+Data type: `Any`
+
+Allows the user to override default module library names.
+```puppet
+include apache::params
+class { 'apache':
+  mod_libs => merge($::apache::params::mod_libs, {
+    'wsgi' => 'mod_wsgi_python3.so',
+  })
+}
+```
+
+Default value: $::apache::params::mod_libs
+
+##### `mod_packages`
+
+Data type: `Any`
+
+Allows the user to override default module package names.
+```puppet
+include apache::params
+class { 'apache':
+  mod_packages => merge($::apache::params::mod_packages, {
+    'auth_kerb' => 'httpd24-mod_auth_kerb',
+  })
+}
+```
+
+Default value: $::apache::params::mod_packages
+
+##### `mpm_module`
+
+Data type: `Any`
+
+Determines which [multi-processing module](https://httpd.apache.org/docs/current/mpm.html) (MPM) is loaded and configured for the
+HTTPD process. Valid values are: `event`, `itk`, `peruser`, `prefork`, `worker` or `false`.<br />
+You must set this to `false` to explicitly declare the following classes with custom parameters:
+- `apache::mod::event`
+- `apache::mod::itk`
+- `apache::mod::peruser`
+- `apache::mod::prefork`
+- `apache::mod::worker`
+
+Default value: $::apache::params::mpm_module
+
+##### `package_ensure`
+
+Data type: `Any`
+
+Controls the `package` resource's `ensure` attribute. Valid values are: `absent`, `installed`
+(or equivalent `present`), or a version string.
+
+Default value: 'installed'
+
+##### `pidfile`
+
+Data type: `Any`
+
+Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm.
+
+Default value: $::apache::params::pidfile
+
+##### `ports_file`
+
+Data type: `Any`
+
+Sets the path to the file containing Apache ports configuration.
+
+Default value: $::apache::params::ports_file
+
+##### `protocols`
+
+Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
+
+Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols)
+directive, which lists available protocols for the server.
+
+Default value: []
+
+##### `protocols_honor_order`
+
+Data type: `Optional[Boolean]`
+
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
+directive which determines whether the order of Protocols sets precedence during negotiation.
+
+Default value: `undef`
+
+##### `purge_configs`
+
+Data type: `Any`
+
+Removes all other Apache configs and virtual hosts.<br />
+Setting this to `false` is a stopgap measure to allow the apache module to coexist with
+existing or unmanaged configurations. We recommend moving your configuration to resources
+within this module. For virtual host configurations, see `purge_vhost_dir`.
+
+Default value: `true`
+
+##### `purge_vhost_dir`
+
+Data type: `Any`
+
+If the `vhost_dir` parameter's value differs from the `confd_dir` parameter's, this parameter
+determines whether Puppet removes any configurations inside `vhost_dir` that are _not_ managed
+by Puppet.<br />
+Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to
+coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
+
+Default value: `undef`
+
+##### `rewrite_lock`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Allows setting a custom location for a rewrite lock - considered best practice if using
+a RewriteMap of type prg in the `rewrites` parameter of your virtual host. This parameter
+only applies to Apache version 2.2 or lower and is ignored on newer versions.
+
+Default value: `undef`
+
+##### `sendfile`
+
+Data type: `Enum['On', 'Off', 'on', 'off']`
+
+Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the
+`EnableSendfile` directive.
+
+Default value: 'On'
+
+##### `serveradmin`
+
+Data type: `Any`
+
+Sets the Apache server administrator's contact information via Apache's `ServerAdmin` directive.
+
+Default value: 'root@localhost'
+
+##### `servername`
+
+Data type: `Any`
+
+Sets the Apache server name via Apache's `ServerName` directive.
+Setting to `false` will not set ServerName at all.
+
+Default value: $::apache::params::servername
+
+##### `server_root`
+
+Data type: `Any`
+
+Sets the Apache server's root directory via Apache's `ServerRoot` directive.
+
+Default value: $::apache::params::server_root
+
+##### `server_signature`
+
+Data type: `Any`
+
+Configures a trailing footer line to display at the bottom of server-generated documents,
+such as error documents and output of certain Apache modules, via Apache's `ServerSignature`
+directive. Valid values are: `On` or `Off`.
+
+Default value: 'On'
+
+##### `server_tokens`
+
+Data type: `Any`
+
+Controls how much information Apache sends to the browser about itself and the operating
+system, via Apache's `ServerTokens` directive.
+
+Default value: 'Prod'
+
+##### `service_enable`
+
+Data type: `Boolean`
+
+Determines whether Puppet enables the Apache HTTPD service when the system is booted.
+
+Default value: `true`
+
+##### `service_ensure`
+
+Data type: `Any`
+
+Determines whether Puppet should make sure the service is running.
+Valid values are: `true` (or `running`) or `false` (or `stopped`).<br />
+The `false` or `stopped` values set the 'httpd' service resource's `ensure` parameter
+to `false`, which is useful when you want to let the service be managed by another
+application, such as Pacemaker.<br />
+
+Default value: 'running'
+
+##### `service_name`
+
+Data type: `Any`
+
+Sets the name of the Apache service.
+
+Default value: $::apache::params::service_name
+
+##### `service_manage`
+
+Data type: `Boolean`
+
+Determines whether Puppet manages the HTTPD service's state.
+
+Default value: `true`
+
+##### `service_restart`
+
+Data type: `Any`
+
+Determines whether Puppet should use a specific command to restart the HTTPD service.
+Values: a command to restart the Apache service.
+
+Default value: `undef`
+
+##### `timeout`
+
+Data type: `Any`
+
+Sets Apache's `TimeOut` directive, which defines the number of seconds Apache waits for
+certain events before failing a request.
+
+Default value: '60'
+
+##### `trace_enable`
+
+Data type: `Any`
+
+Controls how Apache handles `TRACE` requests (per RFC 2616) via the `TraceEnable` directive.
+
+Default value: 'On'
+
+##### `use_canonical_name`
+
+Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
+
+Controls Apache's `UseCanonicalName` directive which controls how Apache handles
+self-referential URLs. If not specified, this parameter omits the declaration from the
+server's configuration and uses Apache's default setting of 'off'.
+
+Default value: `undef`
+
+##### `use_systemd`
+
+Data type: `Any`
+
+Controls whether the systemd module should be installed on Centos 7 servers, this is
+especially useful if using custom-built RPMs.
+
+Default value: $::apache::params::use_systemd
+
+##### `file_mode`
+
+Data type: `Any`
+
+Sets the desired permissions mode for config files.
+Valid values are: a string, with permissions mode in symbolic or numeric notation.
+
+Default value: $::apache::params::file_mode
+
+##### `root_directory_options`
+
+Data type: `Any`
+
+Array of the desired options for the `/` directory in httpd.conf.
+
+Default value: $::apache::params::root_directory_options
+
+##### `root_directory_secured`
+
+Data type: `Boolean`
+
+Sets the default access policy for the `/` directory in httpd.conf. A value of `false`
+allows access to all resources that are missing a more specific access policy. A value of
+`true` denies access to all resources by default. If `true`, more specific rules must be
+used to allow access to these resources (for example, in a directory block using the
+`directories` parameter).
+
+Default value: `false`
+
+##### `vhost_dir`
+
+Data type: `Any`
+
+Changes your virtual host configuration files' location.
+
+Default value: $::apache::params::vhost_dir
+
+##### `vhost_include_pattern`
+
+Data type: `Any`
+
+Defines the pattern for files included from the `vhost_dir`.
+If set to a value like `[^.#]\*.conf[^~]` to make sure that files accidentally created in
+this directory (such as files created by version control systems or editor backups) are
+*not* included in your server configuration.<br />
+Some operating systems use a value of `*.conf`. By default, this module creates configuration
+files ending in `.conf`.
+
+Default value: $::apache::params::vhost_include_pattern
+
+##### `user`
+
+Data type: `Any`
+
+Changes the user that Apache uses to answer requests. Apache's parent process continues
+to run as root, but child processes access resources as the user defined by this parameter.
+To prevent Puppet from managing the user, set the `manage_user` parameter to `false`.
+
+Default value: $::apache::params::user
+
+##### `apache_name`
+
+Data type: `Any`
+
+The name of the Apache package to install. If you are using a non-standard Apache package
+you might need to override the default setting.<br />
+For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::scl_httpd_version`.
+
+Default value: $::apache::params::apache_name
+
+##### `error_log`
+
+Data type: `Any`
+
+The name of the error log file for the main server instance. If the string starts with
+`/`, `|`, or `syslog`: the full path is set. Otherwise, the filename  is prefixed with
+`$logroot`.
+
+Default value: $::apache::params::error_log
+
+##### `scriptalias`
+
+Data type: `Any`
+
+Directory to use for global script alias
+
+Default value: $::apache::params::scriptalias
+
+##### `access_log_file`
+
+Data type: `Any`
+
+The name of the access log file for the main server instance.
+
+Default value: $::apache::params::access_log_file
+
+##### `limitreqfields`
+
+Data type: `Any`
+
+The `limitreqfields` parameter sets the maximum number of request header fields in
+an HTTP request. This directive gives the server administrator greater control over
+abnormal client request behavior, which may be useful for avoiding some forms of
+denial-of-service attacks. The value should be increased if normal clients see an error
+response from the server that indicates too many fields were sent in the request.
+
+Default value: '100'
+
+##### `limitreqfieldsize`
+
+Data type: `Any`
+
+The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
+be allowed within a request header.
+
+Default value: '8190'
+
+##### `ip`
+
+Data type: `Any`
+
+Specifies the ip address
+
+Default value: `undef`
+
+##### `purge_vdir`
+
+Data type: `Any`
+
+Removes all other Apache configs and virtual hosts.<br />
+> **Note**: This parameter is deprecated in favor of the `purge_config` parameter.<br />
+
+Default value: `false`
+
+##### `conf_enabled`
+
+Data type: `Any`
+
+Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.
+
+Default value: $::apache::params::conf_enabled
+
+##### `vhost_enable_dir`
+
+Data type: `Any`
+
+Set's whether the vhost definitions will be stored in sites-availible and if
+they will be symlinked to and from sites-enabled.
+
+Default value: $::apache::params::vhost_enable_dir
+
+##### `mod_enable_dir`
+
+Data type: `Any`
+
+Set's whether the mods-enabled directory should be managed.
+
+Default value: $::apache::params::mod_enable_dir
+
+##### `ssl_file`
+
+Data type: `Any`
+
+This parameter allows you to set an ssl.conf file to be managed in order to implement
+an SSL Certificate.
+
+Default value: `undef`
+
+##### `file_e_tag`
+
+Data type: `Any`
+
+Sets the server default for the `FileETag` declaration, which modifies the response header
+field for static files.
+
+Default value: `undef`
+
+##### `use_optional_includes`
+
+Data type: `Boolean`
+
+Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for
+`additional_includes` in Apache 2.4 or newer.
+
+Default value: $::apache::params::use_optional_includes
+
+##### `mime_types_additional`
+
+Data type: `Any`
+
+Specifies any idditional Internet media (mime) types that you wish to be configured.
+
+Default value: $::apache::params::mime_types_additional
+
+### apache::dev
+
+The libraries installed depends on the `dev_packages` parameter of the `apache::params`
+class, based on your operating system:
+- **Debian** : `libaprutil1-dev`, `libapr1-dev`; `apache2-dev` on Ubuntu 13.10 and Debian 8; `apache2-prefork-dev` on other versions.
+- **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
+- **Gentoo**: `undef`.
+- **Red Hat**: `httpd-devel`.
+
+### apache::mod::actions
+
+Installs Apache mod_actions
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_actions.html
+for additional documentation.
+
+### apache::mod::alias
+
+Installs and configures `mod_alias`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_alias.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::alias` class.
+
+##### `apache_version`
+
+Data type: `Any`
+
+The version of Apache, if not set will be retrieved from the init class.
+
+Default value: `undef`
+
+##### `icons_options`
+
+Data type: `Any`
+
+Disables directory listings for the icons directory, via Apache [Options](https://httpd.apache.org/docs/current/mod/core.html#options)
+directive.
+
+Default value: 'Indexes MultiViews'
+
+##### `icons_path`
+
+Data type: `Any`
+
+Sets the local path for an /icons/ Alias. Default depends on operating system:
+- Debian: /usr/share/apache2/icons
+- FreeBSD: /usr/local/www/apache24/icons
+- Gentoo: /var/www/icons
+- Red Hat: /var/www/icons, except on Apache 2.4, where it's /usr/share/httpd/icons
+
+Default value: $::apache::params::alias_icons_path
+
+### apache::mod::auth_basic
+
+Installs `mod_auth_basic`
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_auth_basic.html
+for additional documentation.
+
+### apache::mod::auth_cas
+
+Installs and configures `mod_auth_cas`.
+
+* **Note** The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
+
+* **See also**
+https://github.com/apereo/mod_auth_cas
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::auth_cas` class.
+
+##### `cas_login_url`
+
+Data type: `String`
+
+Sets the URL to which the module redirects users when they attempt to access a
+CAS-protected resource and don't have an active session.
+
+##### `cas_validate_url`
+
+Data type: `String`
+
+Sets the URL to use when validating a client-presented ticket in an HTTP query string.
+
+##### `cas_cookie_path`
+
+Data type: `String`
+
+Sets the location where information on the current session should be stored. This should
+be writable by the web server only.
+
+Default value: $::apache::params::cas_cookie_path
+
+##### `cas_cookie_path_mode`
+
+Data type: `Any`
+
+The mode of cas_cookie_path.
+
+Default value: '0750'
+
+##### `cas_version`
+
+Data type: `Any`
+
+The version of the CAS protocol to adhere to.
+
+Default value: 2
+
+##### `cas_debug`
+
+Data type: `Any`
+
+Whether to enable or disable debug mode.
+
+Default value: 'Off'
+
+##### `cas_validate_server`
+
+Data type: `Any`
+
+Whether to validate the presented certificate. This has been deprecated and
+removed from Version 1.1-RC1 onward.
+
+Default value: `undef`
+
+##### `cas_validatedepth`
+
+The maximum depth for chained certificate validation.
+
+##### `cas_proxy_validate_url`
+
+Data type: `Any`
+
+The URL to use when performing a proxy validation.
+
+Default value: `undef`
+
+##### `cas_root_proxied_as`
+
+Data type: `Any`
+
+Sets the URL end users see when access to this Apache server is proxied per vhost.
+This URL should not include a trailing slash.
+
+Default value: `undef`
+
+##### `cas_cookie_entropy`
+
+Data type: `Any`
+
+When creating a local session, this many random bytes are used to create a unique
+session identifier.
+
+Default value: `undef`
+
+##### `cas_timeout`
+
+Data type: `Any`
+
+The hard limit, in seconds, for a mod_auth_cas session.
+
+Default value: `undef`
+
+##### `cas_idle_timeout`
+
+Data type: `Any`
+
+The limit, in seconds, of how long a mod_auth_cas session can be idle.
+
+Default value: `undef`
+
+##### `cas_cache_clean_interval`
+
+Data type: `Any`
+
+The minimum amount of time that must pass inbetween cache cleanings.
+
+Default value: `undef`
+
+##### `cas_cookie_domain`
+
+Data type: `Any`
+
+The value for the 'Domain=' parameter in the Set-Cookie header.
+
+Default value: `undef`
+
+##### `cas_cookie_http_only`
+
+Data type: `Any`
+
+Setting this flag prevents the mod_auth_cas cookies from being accessed by
+client side Javascript.
+
+Default value: `undef`
+
+##### `cas_authoritative`
+
+Data type: `Any`
+
+Determines whether an optional authorization directive is authoritative and thus binding.
+
+Default value: `undef`
+
+##### `cas_validate_saml`
+
+Data type: `Any`
+
+Parse response from CAS server for SAML.
+
+Default value: `undef`
+
+##### `cas_sso_enabled`
+
+Data type: `Any`
+
+Enables experimental support for single sign out (may mangle POST data).
+
+Default value: `undef`
+
+##### `cas_attribute_prefix`
+
+Data type: `Any`
+
+Adds a header with the value of this header being the attribute values when SAML
+validation is enabled.
+
+Default value: `undef`
+
+##### `cas_attribute_delimiter`
+
+Data type: `Any`
+
+Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
+
+Default value: `undef`
+
+##### `cas_scrub_request_headers`
+
+Data type: `Any`
+
+Remove inbound request headers that may have special meaning within mod_auth_cas.
+
+Default value: `undef`
+
+##### `suppress_warning`
+
+Data type: `Any`
+
+Suppress warning about being on RedHat (mod_auth_cas package is now available in epel-testing repo).
+
+Default value: `false`
+
+##### `cas_validate_depth`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `cas_certificate_path`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+### apache::mod::auth_gssapi
+
+Installs `mod_auth_gsappi`.
+
+* **See also**
+https://github.com/modauthgssapi/mod_auth_gssapi
+for additional documentation.
+
+### apache::mod::auth_kerb
+
+Installs `mod_auth_kerb`
+
+* **See also**
+http://modauthkerb.sourceforge.net
+for additional documentation.
+
+### apache::mod::auth_mellon
+
+Installs and configures `mod_auth_mellon`.
+
+* **See also**
+https://github.com/Uninett/mod_auth_mellon
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::auth_mellon` class.
+
+##### `mellon_cache_size`
+
+Data type: `Any`
+
+Maximum number of sessions which can be active at once.
+
+Default value: $::apache::params::mellon_cache_size
+
+##### `mellon_lock_file`
+
+Data type: `Any`
+
+Full path to a file used for synchronizing access to the session data.
+
+Default value: $::apache::params::mellon_lock_file
+
+##### `mellon_post_directory`
+
+Data type: `Any`
+
+Full path of a directory where POST requests are saved during authentication.
+
+Default value: $::apache::params::mellon_post_directory
+
+##### `mellon_cache_entry_size`
+
+Data type: `Any`
+
+Maximum size for a single session entry in bytes.
+
+Default value: `undef`
+
+##### `mellon_post_ttl`
+
+Data type: `Any`
+
+Delay in seconds before a saved POST request can be flushed.
+
+Default value: `undef`
+
+##### `mellon_post_size`
+
+Data type: `Any`
+
+Maximum size for saved POST requests.
+
+Default value: `undef`
+
+##### `mellon_post_count`
+
+Data type: `Any`
+
+Maximum amount of saved POST requests.
+
+Default value: `undef`
+
+### apache::mod::authn_core
+
+Installs `mod_authn_core`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_authn_core.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::authn_core` class.
+
+##### `apache_version`
+
+Data type: `Any`
+
+The version of apache being run.
+
+Default value: $::apache::apache_version
+
+### apache::mod::authn_dbd
+
+Installs `mod_authn_dbd`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::authn_dbd` class.
+
+##### `authn_dbd_params`
+
+Data type: `Any`
+
+The params needed for the mod to function.
+
+##### `authn_dbd_dbdriver`
+
+Data type: `Any`
+
+Selects an apr_dbd driver by name.
+
+Default value: 'mysql'
+
+##### `authn_dbd_query`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `authn_dbd_min`
+
+Data type: `Any`
+
+Set the minimum number of connections per process.
+
+Default value: '4'
+
+##### `authn_dbd_max`
+
+Data type: `Any`
+
+Set the maximum number of connections per process.
+
+Default value: '20'
+
+##### `authn_dbd_keep`
+
+Data type: `Any`
+
+Set the maximum number of connections per process to be sustained.
+
+Default value: '8'
+
+##### `authn_dbd_exptime`
+
+Data type: `Any`
+
+Set the time to keep idle connections alive when the number of
+connections specified in DBDKeep has been exceeded.
+
+Default value: '300'
+
+##### `authn_dbd_alias`
+
+Data type: `Any`
+
+Sets an alias for `AuthnProvider.
+
+Default value: `undef`
+
+### apache::mod::authn_file
+
+Installs `mod_authn_file`.
+
+* **See also**
+https://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
+for additional documentation.
+
+### apache::mod::authnz_ldap
+
+Installs `mod_authnz_ldap`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::authnz_ldap` class.
+
+##### `verify_server_cert`
+
+Data type: `Boolean`
+
+Whether to force te verification of a server cert or not.
+
+Default value: `true`
+
+##### `package_name`
+
+Data type: `Any`
+
+The name of the ldap package.
+
+Default value: `undef`
+
+### apache::mod::authnz_pam
+
+Installs `mod_authnz_pam`.
+
+* **See also**
+https://www.adelton.com/apache/mod_authnz_pam
+for additional documentation.
+
+### apache::mod::authz_default
+
+Installs and configures `mod_authz_default`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_authz_default.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::authz_default` class.
+
+##### `apache_version`
+
+Data type: `Any`
+
+Version of Apache to install module on.
+
+Default value: $::apache::apache_version
+
+### apache::mod::authz_user
+
+Installs `mod_authz_user`
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_authz_user.html
+for additional documentation.
+
+### apache::mod::autoindex
+
+Installs `mod_autoindex`
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_autoindex.html
+for additional documentation.
+
+### apache::mod::cache
+
+Installs `mod_cache`
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_cache.html
+for additional documentation.
+
+### apache::mod::cgi
+
+Installs `mod_cgi`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_cgi.html
+for additional documentation.
+
+### apache::mod::cgid
+
+Installs `mod_cgid`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_cgid.html
+
+### apache::mod::cluster
+
+Installs `mod_cluster`.
+
+* **Note** There is no official package available for mod_cluster, so you must make it available outside of the apache module.
+Binaries can be found [here](https://modcluster.io/).
+
+* **See also**
+https://modcluster.io/
+for additional documentation.
+
+#### Examples
+
+##### 
+
+```puppet
+class { '::apache::mod::cluster':
+  ip                      => '172.17.0.1',
+  allowed_network         => '172.17.0.',
+  balancer_name           => 'mycluster',
+  version                 => '1.3.1'
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::cluster` class.
+
+##### `allowed_network`
+
+Data type: `Any`
+
+Balanced members network.
+
+##### `balancer_name`
+
+Data type: `Any`
+
+Name of balancer.
+
+##### `ip`
+
+Data type: `Any`
+
+Specifies the IP address to listen to.
+
+##### `version`
+
+Data type: `Any`
+
+Specifies the mod_cluster version. Version 1.3.0 or greater is required for httpd 2.4.
+
+##### `enable_mcpm_receive`
+
+Data type: `Any`
+
+Whether MCPM should be enabled.
+
+Default value: `true`
+
+##### `port`
+
+Data type: `Any`
+
+mod_cluster listen port.
+
+Default value: '6666'
+
+##### `keep_alive_timeout`
+
+Data type: `Any`
+
+Specifies how long Apache should wait for a request, in seconds.
+
+Default value: 60
+
+##### `manager_allowed_network`
+
+Data type: `Any`
+
+Whether to allow the network to access the mod_cluster_manager.
+
+Default value: '127.0.0.1'
+
+##### `max_keep_alive_requests`
+
+Data type: `Any`
+
+Maximum number of requests kept alive.
+
+Default value: 0
+
+##### `server_advertise`
+
+Data type: `Any`
+
+Whether the server should advertise.
+
+Default value: `true`
+
+##### `advertise_frequency`
+
+Data type: `Any`
+
+Sets the interval between advertise messages in seconds.
+
+Default value: `undef`
+
+### apache::mod::data
+
+Installs and configures `mod_data`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_data.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::data` class.
+
+##### `apache_version`
+
+Data type: `Any`
+
+Version of Apache to install module on.
+
+Default value: `undef`
+
+### apache::mod::dav
+
+Installs `mod_dav`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_dav.html
+for additional documentation.
+
+### apache::mod::dav_fs
+
+Installs `mod_dav_fs`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_dav_fs.html
+for additional documentation.
+
+### apache::mod::dav_svn
+
+Installs and configures `mod_dav_svn`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_dav_svn.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::dav_svn` class.
+
+##### `authz_svn_enabled`
+
+Data type: `Any`
+
+Specifies whether to install Apache mod_authz_svn
+
+Default value: `false`
+
+### apache::mod::dbd
+
+Installs `mod_dbd`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_dbd.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::dbd` class.
+
+##### `apache_version`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+### apache::mod::deflate
+
+Installs and configures `mod_deflate`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_deflate.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::deflate` class.
+
+##### `types`
+
+Data type: `Any`
+
+An array of MIME types to be deflated. See https://www.iana.org/assignments/media-types/media-types.xhtml.
+
+Default value: [
+    'text/html text/plain text/xml',
+    'text/css',
+    'application/x-javascript application/javascript application/ecmascript',
+    'application/rss+xml',
+    'application/json',
+  ]
+
+##### `notes`
+
+Data type: `Any`
+
+A Hash where the key represents the type and the value represents the note name.
+
+Default value: {
+    'Input'  => 'instream',
+    'Output' => 'outstream',
+    'Ratio'  => 'ratio',
+  }
+
+### apache::mod::dev
+
+Installs `mod_dev`.
+
+* **Note** This module is deprecated. Please use `apache::dev`.
+
+### apache::mod::dir
+
+Installs and configures `mod_dir`.
+
+* **TODO** This sets the global DirectoryIndex directive, so it may be necessary to consider being able to modify the apache::vhost to declare
+DirectoryIndex statements in a vhost configuration
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_dir.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::dir` class.
+
+##### `types`
+
+Specifies the text-based content types to compress.
+
+##### `indexes`
+
+Data type: `Array[String]`
+
+Provides a string for the DirectoryIndex directive
+
+Default value: ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml']
+
+##### `dir`
+
+Data type: `Any`
+
+
+
+Default value: 'public_html'
+
+### apache::mod::disk_cache
+
+Installs and configures `mod_disk_cache`.
+
+* **Note** Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
+
+* **See also**
+https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::disk_cache` class.
+
+##### `cache_root`
+
+Data type: `Any`
+
+Defines the name of the directory on the disk to contain cache files.
+Default depends on the Apache version and operating system:
+- Debian: /var/cache/apache2/mod_cache_disk
+- FreeBSD: /var/cache/mod_cache_disk
+- Red Hat, Apache 2.4: /var/cache/httpd/proxy
+- Red Hat, Apache 2.2: /var/cache/mod_proxy
+
+Default value: `undef`
+
+##### `cache_ignore_headers`
+
+Data type: `Any`
+
+Specifies HTTP header(s) that should not be stored in the cache.
+
+Default value: `undef`
+
+### apache::mod::dumpio
+
+Installs and configures `mod_dumpio`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_dumpio.html
+for additional documentation.
+
+#### Examples
+
+##### 
+
+```puppet
+class{'apache':
+  default_mods => false,
+  log_level    => 'dumpio:trace7',
+}
+class{'apache::mod::dumpio':
+  dump_io_input  => 'On',
+  dump_io_output => 'Off',
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::dumpio` class.
+
+##### `dump_io_input`
+
+Data type: `Enum['Off', 'On', 'off', 'on']`
+
+Dump all input data to the error log
+
+Default value: 'Off'
+
+##### `dump_io_output`
+
+Data type: `Enum['Off', 'On', 'off', 'on']`
+
+Dump all output data to the error log
+
+Default value: 'Off'
+
+### apache::mod::env
+
+Installs `mod_env`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_env.html
+for additional documentation.
+
+### apache::mod::event
+
+Installs and configures `mod_event`.
+
+* **Note** You cannot include apache::mod::event with apache::mod::itk, apache::mod::peruser, apache::mod::prefork, or
+apache::mod::worker on the same server.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/event.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::event` class.
+
+##### `startservers`
+
+Data type: `Any`
+
+Sets the number of child server processes created at startup, via the module's `StartServers` directive. Setting this to `false`
+removes the parameter.
+
+Default value: '2'
+
+##### `maxclients`
+
+Data type: `Any`
+
+Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
+
+Default value: '150'
+
+##### `maxrequestworkers`
+
+Data type: `Any`
+
+Sets the maximum number of connections Apache can simultaneously process, via the module's `MaxRequestWorkers` directive. Setting
+these to `false` removes the parameters.
+
+Default value: `undef`
+
+##### `minsparethreads`
+
+Data type: `Any`
+
+Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Setting this to `false` removes the parameters.
+
+Default value: '25'
+
+##### `maxsparethreads`
+
+Data type: `Any`
+
+Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Setting this to `false` removes the parameters.
+
+Default value: '75'
+
+##### `threadsperchild`
+
+Data type: `Any`
+
+Number of threads created by each child process.
+
+Default value: '25'
+
+##### `maxrequestsperchild`
+
+Data type: `Any`
+
+Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
+
+Default value: '0'
+
+##### `maxconnectionsperchild`
+
+Data type: `Any`
+
+Limit on the number of connections that an individual child server will handle during its life.
+
+Default value: `undef`
+
+##### `serverlimit`
+
+Data type: `Any`
+
+Limits the configurable number of processes via the `ServerLimit` directive. Setting this to `false` removes the parameter.
+
+Default value: '25'
+
+##### `apache_version`
+
+Data type: `Any`
+
+Version of Apache to install module on.
+
+Default value: `undef`
+
+##### `threadlimit`
+
+Data type: `Any`
+
+Limits the number of event threads via the module's `ThreadLimit` directive. Setting this to `false` removes the parameter.
+
+Default value: '64'
+
+##### `listenbacklog`
+
+Data type: `Any`
+
+Sets the maximum length of the pending connections queue via the module's `ListenBackLog` directive. Setting this to `false` removes
+the parameter.
+
+Default value: '511'
+
+### apache::mod::expires
+
+Installs and configures `mod_expires`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_expires.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::expires` class.
+
+##### `expires_active`
+
+Data type: `Any`
+
+Enables generation of Expires headers.
+
+Default value: `true`
+
+##### `expires_default`
+
+Data type: `Any`
+
+Specifies the default algorithm for calculating expiration time using ExpiresByType syntax or interval syntax.
+
+Default value: `undef`
+
+##### `expires_by_type`
+
+Data type: `Any`
+
+Describes a set of [MIME content-types](https://www.iana.org/assignments/media-types/media-types.xhtml) and their expiration
+times. This should be used as an array of Hashes, with each Hash's key a valid MIME content-type (i.e. 'text/json') and its
+value following valid interval syntax.
+
+Default value: `undef`
+
+### apache::mod::ext_filter
+
+Installs and configures `mod_ext_filter`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_ext_filter.html
+for additional documentation.
+
+#### Examples
+
+##### 
+
+```puppet
+class { 'apache::mod::ext_filter':
+  ext_filter_define => {
+    'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
+    'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
+  },
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::ext_filter` class.
+
+##### `ext_filter_define`
+
+Data type: `Optional[Hash]`
+
+Hash of filter names and their parameters.
+
+Default value: `undef`
+
+### apache::mod::fastcgi
+
+Installs `mod_fastcgi`.
+
+* **See also**
+https://github.com/FastCGI-Archives/mod_fastcgi
+for additional documentation.
+
+### apache::mod::fcgid
+
+loaded first; Puppet will not automatically enable it if you set the fcgiwrapper parameter in apache::vhost.
+  include apache::mod::fcgid
+
+  apache::vhost { 'example.org':
+    docroot     => '/var/www/html',
+    directories => {
+      path        => '/var/www/html',
+      fcgiwrapper => {
+        command => '/usr/local/bin/fcgiwrapper',
+      }
+    },
+  }
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_fcgid.html
+for additional documentation.
+
+#### Examples
+
+##### The class does not individually parameterize all available options. Instead, configure mod_fcgid using the options hash.
+
+```puppet
+class { 'apache::mod::fcgid':
+  options => {
+    'FcgidIPCDir'  => '/var/run/fcgidsock',
+    'SharememPath' => '/var/run/fcgid_shm',
+    'AddHandler'   => 'fcgid-script .fcgi',
+  },
+}
+```
+
+##### If you include apache::mod::fcgid, you can set the [FcgidWrapper][] per directory, per virtual host. The module must be
+
+```puppet
+
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::fcgid` class.
+
+##### `expires_active`
+
+Enables generation of Expires headers.
+
+##### `expires_default`
+
+Default algorithm for calculating expiration time.
+
+##### `expires_by_type`
+
+Value of the Expires header configured by MIME type.
+
+##### `options`
+
+Data type: `Any`
+
+
+
+Default value: {}
+
+### apache::mod::filter
+
+Installs `mod_filter`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_filter.html
+for additional documentation.
+
+### apache::mod::geoip
+
+Installs and configures `mod_geoip`.
+
+* **See also**
+https://dev.maxmind.com/geoip/legacy/mod_geoip2
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::geoip` class.
+
+##### `enable`
+
+Data type: `Any`
+
+Toggles whether to enable geoip.
+
+Default value: `false`
+
+##### `db_file`
+
+Data type: `Any`
+
+Path to database for GeoIP to use.
+
+Default value: '/usr/share/GeoIP/GeoIP.dat'
+
+##### `flag`
+
+Data type: `Any`
+
+Caching directive to use. Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'.
+
+Default value: 'Standard'
+
+##### `output`
+
+Data type: `Any`
+
+Output variable locations. Values: 'All', 'Env', 'Request', 'Notes'.
+
+Default value: 'All'
+
+##### `enable_utf8`
+
+Data type: `Any`
+
+Changes the output from ISO88591 (Latin1) to UTF8.
+
+Default value: `undef`
+
+##### `scan_proxy_headers`
+
+Data type: `Any`
+
+Enables the GeoIPScanProxyHeaders option.
+
+Default value: `undef`
+
+##### `scan_proxy_headers_field`
+
+Specifies the header mod_geoip uses to determine the client's IP address.
+
+##### `use_last_xforwarededfor_ip`
+
+Data type: `Any`
+
+Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
+
+Default value: `undef`
+
+##### `scan_proxy_header_field`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+### apache::mod::headers
+
+Installs and configures `mod_headers`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_headers.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::headers` class.
+
+##### `apache_version`
+
+Version of Apache to install module on.
+
+### apache::mod::http2
+
+Installs and configures `mod_http2`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_http2.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::http2` class.
+
+##### `h2_copy_files`
+
+Data type: `Optional[Boolean]`
+
+Determine file handling in responses.
+
+Default value: `undef`
+
+##### `h2_direct`
+
+Data type: `Optional[Boolean]`
+
+H2 Direct Protocol Switch.
+
+Default value: `undef`
+
+##### `h2_early_hints`
+
+Data type: `Optional[Boolean]`
+
+Determine sending of 103 status codes.
+
+Default value: `undef`
+
+##### `h2_max_session_streams`
+
+Data type: `Optional[Integer]`
+
+Sets maximum number of active streams per HTTP/2 session.
+
+Default value: `undef`
+
+##### `h2_max_worker_idle_seconds`
+
+Data type: `Optional[Integer]`
+
+Sets maximum number of seconds h2 workers remain idle until shut down.
+
+Default value: `undef`
+
+##### `h2_max_workers`
+
+Data type: `Optional[Integer]`
+
+Sets maximum number of worker threads to use per child process.
+
+Default value: `undef`
+
+##### `h2_min_workers`
+
+Data type: `Optional[Integer]`
+
+Sets minimal number of worker threads to use per child process.
+
+Default value: `undef`
+
+##### `h2_modern_tls_only`
+
+Data type: `Optional[Boolean]`
+
+Toggles the security checks on HTTP/2 connections in TLS mode
+
+Default value: `undef`
+
+##### `h2_push`
+
+Data type: `Optional[Boolean]`
+
+Toggles the usage of the HTTP/2 server push protocol feature.
+
+Default value: `undef`
+
+##### `h2_push_diary_size`
+
+Data type: `Optional[Integer]`
+
+Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection.
+
+Default value: `undef`
+
+##### `h2_priority`
+
+Require HTTP/2 connections to be "modern TLS" only
+
+##### `h2_push_resource`
+
+Data type: `Array[String]`
+
+When added to a directory/location, HTTP/2 PUSHes will be attempted for all paths added
+via this directive
+
+Default value: []
+
+##### `h2_serialize_headers`
+
+Data type: `Optional[Boolean]`
+
+Toggles if HTTP/2 requests shall be serialized in HTTP/1.1 format for processing by httpd
+core or if received binary data shall be passed into the request_recs directly.
+
+Default value: `undef`
+
+##### `h2_stream_max_mem_size`
+
+Data type: `Optional[Integer]`
+
+Sets the maximum number of outgoing data bytes buffered in memory for an active streams.
+
+Default value: `undef`
+
+##### `h2_tls_cool_down_secs`
+
+Data type: `Optional[Integer]`
+
+Sets the number of seconds of idle time on a TLS connection before the TLS write size falls
+back to small (~1300 bytes) length.
+
+Default value: `undef`
+
+##### `h2_tls_warm_up_size`
+
+Data type: `Optional[Integer]`
+
+Sets the number of bytes to be sent in small TLS records (~1300 bytes) until doing maximum
+sized writes (16k) on https: HTTP/2 connections.
+
+Default value: `undef`
+
+##### `h2_upgrade`
+
+Data type: `Optional[Boolean]`
+
+Toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2.
+
+Default value: `undef`
+
+##### `h2_window_size`
+
+Data type: `Optional[Integer]`
+
+Sets the size of the window that is used for flow control from client to server and limits
+the amount of data the server has to buffer.
+
+Default value: `undef`
+
+##### `apache_version`
+
+Data type: `Optional[String]`
+
+Version of Apache to install module on.
+
+Default value: `undef`
+
+##### `h2_push_priority`
+
+Data type: `Array[String]`
+
+
+
+Default value: []
+
+### apache::mod::include
+
+Installs `mod_include`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_include.html
+for additional documentation.
+
+### apache::mod::info
+
+Installs and configures `mod_info`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_info.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::info` class.
+
+##### `allow_from`
+
+Data type: `Any`
+
+Whitelist of IPv4 or IPv6 addresses or ranges that can access the info path.
+
+Default value: ['127.0.0.1','::1']
+
+##### `apache_version`
+
+Data type: `Any`
+
+Version of Apache to install module on.
+
+Default value: `undef`
+
+##### `restrict_access`
+
+Data type: `Any`
+
+Toggles whether to restrict access to info path. If `false`, the `allow_from` whitelist is ignored and any IP address can
+access the info path.
+
+Default value: `true`
+
+##### `info_path`
+
+Data type: `Any`
+
+Path on server to file containing server configuration information.
+
+Default value: '/server-info'
+
+### apache::mod::intercept_form_submit
+
+Installs `mod_intercept_form_submit`.
+
+* **See also**
+https://www.adelton.com/apache/mod_intercept_form_submit
+for additional documentation.
+
+### apache::mod::itk
+
+Installs MPM `mod_itk`.
+
+* **See also**
+http://mpm-itk.sesse.net
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::itk` class.
+
+##### `startservers`
+
+Data type: `Any`
+
+Number of child server processes created on startup.
+
+Default value: '8'
+
+##### `minspareservers`
+
+Data type: `Any`
+
+Minimum number of idle child server processes.
+
+Default value: '5'
+
+##### `maxspareservers`
+
+Data type: `Any`
+
+Maximum number of idle child server processes.
+
+Default value: '20'
+
+##### `serverlimit`
+
+Data type: `Any`
+
+Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache httpd process.
+
+Default value: '256'
+
+##### `maxclients`
+
+Data type: `Any`
+
+Limit on the number of simultaneous requests that will be served.
+
+Default value: '256'
+
+##### `maxrequestsperchild`
+
+Data type: `Any`
+
+Limit on the number of connections that an individual child server process will handle.
+
+Default value: '4000'
+
+##### `enablecapabilities`
+
+Data type: `Any`
+
+Drop most root capabilities in the parent process, and instead run as the user given by the User/Group directives with some extra
+capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor
+capabilities, such as NFS.
+
+Default value: `undef`
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+### apache::mod::jk
+
+Installs `mod_jk`.
+
+* **Note** shm_file and log_file
+Depending on how these files are specified, the class creates their final path differently:
+
+Relative path: prepends supplied path with logroot (see below)
+Absolute path or pipe: uses supplied path as-is
+
+```
+shm_file => 'shm_file'
+# Ends up in
+$shm_path = '/var/log/httpd/shm_file'
+
+shm_file => '/run/shm_file'
+# Ends up in
+$shm_path = '/run/shm_file'
+
+shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+# Ends up in
+$shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+```
+
+* **See also**
+https://tomcat.apache.org/connectors-doc/reference/apache.html
+for additional documentation.
+
+#### Examples
+
+##### 
+
+```puppet
+class { '::apache::mod::jk':
+  ip                   => '192.168.2.15',
+  workers_file         => 'conf/workers.properties',
+  mount_file           => 'conf/uriworkermap.properties',
+  shm_file             => 'run/jk.shm',
+  shm_size             => '50M',
+  workers_file_content => {
+    <Content>
+  },
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::jk` class.
+
+##### `ip`
+
+Data type: `Optional[String]`
+
+IP for binding to mod_jk. Useful when the binding address is not the primary network interface IP.
+
+Default value: `undef`
+
+##### `port`
+
+Data type: `Integer`
+
+Port for binding to mod_jk. Useful when something else, like a reverse proxy or cache, is receiving requests at port 80, then
+needs to forward them to Apache at a different port.
+
+Default value: 80
+
+##### `add_listen`
+
+Data type: `Boolean`
+
+Defines if a Listen directive according to parameters ip and port (see below), so that Apache listens to the IP/port combination
+and redirect to mod_jk. Useful when another Listen directive, like Listen *:<Port> or Listen <Port>, can conflict with the one
+necessary for mod_jk binding.
+
+Default value: `true`
+
+##### `workers_file`
+
+Data type: `Any`
+
+The name of a worker file for the Tomcat servlet containers.
+
+Default value: `undef`
+
+##### `worker_property`
+
+Data type: `Any`
+
+Enables setting worker properties inside Apache configuration file.
+
+Default value: {}
+
+##### `logroot`
+
+Data type: `Any`
+
+The base directory for shm_file and log_file is determined by the logroot parameter. If unspecified, defaults to
+apache::params::logroot. The default logroot is sane enough therefore it is not recommended to override it.
+
+Default value: `undef`
+
+##### `shm_file`
+
+Data type: `Any`
+
+Shared memory file name.
+
+Default value: 'jk-runtime-status'
+
+##### `shm_size`
+
+Data type: `Any`
+
+Size of the shared memory file name.
+
+Default value: `undef`
+
+##### `mount_file`
+
+Data type: `Any`
+
+File containing multiple mappings from a context to a Tomcat worker.
+
+Default value: `undef`
+
+##### `mount_file_reload`
+
+Data type: `Any`
+
+This directive configures the reload check interval in seconds.
+
+Default value: `undef`
+
+##### `mount`
+
+Data type: `Any`
+
+A mount point from a context to a Tomcat worker.
+
+Default value: {}
+
+##### `un_mount`
+
+Data type: `Any`
+
+An exclusion mount point from a context to a Tomcat worker.
+
+Default value: {}
+
+##### `auto_alias`
+
+Data type: `Any`
+
+Automatically Alias webapp context directories into the Apache document space
+
+Default value: `undef`
+
+##### `mount_copy`
+
+Data type: `Any`
+
+If this directive is set to "On" in some virtual server, the mounts from the global server will be copied
+to this virtual server, more precisely all mounts defined by JkMount or JkUnMount.
+
+Default value: `undef`
+
+##### `worker_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable that can be used to set worker names in combination with SetHandler
+jakarta-servlet.
+
+Default value: `undef`
+
+##### `watchdog_interval`
+
+Data type: `Any`
+
+This directive configures the watchdog thread interval in seconds.
+
+Default value: `undef`
+
+##### `log_file`
+
+Data type: `Any`
+
+Full or server relative path to the mod_jk log file.
+
+Default value: 'mod_jk.log'
+
+##### `log_level`
+
+Data type: `Any`
+
+The mod_jk log level, can be debug, info, warn error or trace.
+
+Default value: `undef`
+
+##### `log_stamp_format`
+
+Data type: `Any`
+
+The mod_jk date log format, using an extended strftime syntax.
+
+Default value: `undef`
+
+##### `request_log_format`
+
+Data type: `Any`
+
+Request log format string.
+
+Default value: `undef`
+
+##### `extract_ssl`
+
+Data type: `Any`
+
+Turns on SSL processing and information gathering by mod_jk.
+
+Default value: `undef`
+
+##### `https_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable that contains SSL indication.
+
+Default value: `undef`
+
+##### `sslprotocol_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable that contains the SSL protocol name.
+
+Default value: `undef`
+
+##### `certs_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable that contains SSL client certificates.
+
+Default value: `undef`
+
+##### `cipher_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable that contains SSL client cipher.
+
+Default value: `undef`
+
+##### `certchain_prefix`
+
+Data type: `Any`
+
+Name of the Apache environment (prefix) that contains SSL client chain certificates.
+
+Default value: `undef`
+
+##### `session_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable that contains SSL session.
+
+Default value: `undef`
+
+##### `keysize_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable that contains SSL key size in use.
+
+Default value: `undef`
+
+##### `local_name_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which can be used to overwrite the forwarded local name.
+
+Default value: `undef`
+
+##### `ignore_cl_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which forces to ignore an existing Content-Length request header.
+
+Default value: `undef`
+
+##### `local_addr_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which can be used to overwrite the forwarded local IP address.
+
+Default value: `undef`
+
+##### `local_port_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which can be used to overwrite the forwarded local port.
+
+Default value: `undef`
+
+##### `remote_host_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) host name.
+
+Default value: `undef`
+
+##### `remote_addr_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
+
+Default value: `undef`
+
+##### `remote_port_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
+
+Default value: `undef`
+
+##### `remote_user_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which can be used to overwrite the forwarded user name.
+
+Default value: `undef`
+
+##### `auth_type_indicator`
+
+Data type: `Any`
+
+Name of the Apache environment variable which can be used to overwrite the forwarded authentication type.
+
+Default value: `undef`
+
+##### `options`
+
+Data type: `Any`
+
+Set one of more options to configure the mod_jk module.
+
+Default value: []
+
+##### `env_var`
+
+Data type: `Any`
+
+Adds a name and an optional default value of environment variable that should be sent to servlet-engine as a request attribute.
+
+Default value: {}
+
+##### `strip_session`
+
+Data type: `Any`
+
+If this directive is set to On in some virtual server, the session IDs ;jsessionid=... will be removed for URLs which are not
+forwarded but instead are handled by the local server.
+
+Default value: `undef`
+
+##### `workers_file_content`
+
+Data type: `Any`
+
+Each directive has the format worker.<Worker name>.<Property>=<Value>. This maps as a hash of hashes, where the outer hash specifies
+workers, and each inner hash specifies each worker properties and values. Plus, there are two global directives, 'worker.list' and
+'worker.maintain' For example, the workers file below should be parameterized as follows:
+
+Worker file:
+```
+worker.list = status
+worker.list = some_name,other_name
+
+worker.maintain = 60
+
+# Optional comment
+worker.some_name.type=ajp13
+worker.some_name.socket_keepalive=true
+
+# I just like comments
+worker.other_name.type=ajp12 (why would you?)
+worker.other_name.socket_keepalive=false
+```
+
+Puppet file:
+```
+$workers_file_content = {
+  worker_lists    => ['status', 'some_name,other_name'],
+  worker_maintain => '60',
+  some_name       => {
+    comment          => 'Optional comment',
+    type             => 'ajp13',
+    socket_keepalive => 'true',
+  },
+  other_name      => {
+    comment          => 'I just like comments',
+    type             => 'ajp12',
+    socket_keepalive => 'false',
+  },
+}
+```
+
+Default value: {}
+
+##### `mount_file_content`
+
+Data type: `Any`
+
+Each directive has the format <URI> = <Worker name>. This maps as a hash of hashes, where the outer hash specifies workers, and
+each inner hash contains two items:
+- uri_list—an array with URIs to be mapped to the worker
+- comment—an optional string with a comment for the worker. For example, the mount file below should be parameterized as Figure 2:
+
+Worker file:
+```
+# Worker 1
+/context_1/ = worker_1
+/context_1/* = worker_1
+
+# Worker 2
+/ = worker_2
+/context_2/ = worker_2
+/context_2/* = worker_2
+```
+
+Puppet file:
+```
+$mount_file_content = {
+  worker_1 => {
+    uri_list => ['/context_1/', '/context_1/*'],
+    comment  => 'Worker 1',
+  },
+  worker_2 => {
+    uri_list => ['/context_2/', '/context_2/*'],
+    comment  => 'Worker 2',
+  },
+},
+```
+
+Default value: {}
+
+##### `location_list`
+
+Data type: `Any`
+
+
+
+Default value: []
+
+### apache::mod::ldap
+
+Installs and configures `mod_ldap`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_ldap.html
+for additional documentation.
+
+#### Examples
+
+##### 
+
+```puppet
+class { 'apache::mod::ldap':
+  ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
+  ldap_trusted_global_cert_type => 'CA_DER',
+  ldap_trusted_mode             => 'TLS',
+  ldap_shared_cache_size        => '500000',
+  ldap_cache_entries            => '1024',
+  ldap_cache_ttl                => '600',
+  ldap_opcache_entries          => '1024',
+  ldap_opcache_ttl              => '600',
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::ldap` class.
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+##### `package_name`
+
+Data type: `Any`
+
+Specifies the custom package name.
+
+Default value: `undef`
+
+##### `ldap_trusted_global_cert_file`
+
+Data type: `Any`
+
+Sets the file or database containing global trusted Certificate Authority or global client certificates.
+
+Default value: `undef`
+
+##### `ldap_trusted_global_cert_type`
+
+Data type: `Optional[String]`
+
+Sets the the certificate parameter of the global trusted Certificate Authority or global client certificates.
+
+Default value: 'CA_BASE64'
+
+##### `ldap_shared_cache_size`
+
+Data type: `Any`
+
+Size in bytes of the shared-memory cache
+
+Default value: `undef`
+
+##### `ldap_cache_entries`
+
+Data type: `Any`
+
+Maximum number of entries in the primary LDAP cache
+
+Default value: `undef`
+
+##### `ldap_cache_ttl`
+
+Data type: `Any`
+
+Time that cached items remain valid (in seconds).
+
+Default value: `undef`
+
+##### `ldap_opcache_entries`
+
+Data type: `Any`
+
+Number of entries used to cache LDAP compare operations
+
+Default value: `undef`
+
+##### `ldap_opcache_ttl`
+
+Data type: `Any`
+
+Time that entries in the operation cache remain valid (in seconds).
+
+Default value: `undef`
+
+##### `ldap_trusted_mode`
+
+Data type: `Any`
+
+Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
+
+Default value: `undef`
+
+### apache::mod::lookup_identity
+
+Installs `mod_lookup_identity`
+
+* **See also**
+https://www.adelton.com/apache/mod_lookup_identity
+for additional documentation.
+
+### apache::mod::macro
+
+Installs `mod_macro`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_macro.html
+for additional documentation.
+
+### apache::mod::mime
+
+Installs and configures `mod_mime`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_mime.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::mime` class.
+
+##### `mime_support_package`
+
+Data type: `Any`
+
+Name of the MIME package to be installed.
+
+Default value: $::apache::params::mime_support_package
+
+##### `mime_types_config`
+
+Data type: `Any`
+
+The location of the mime.types file.
+
+Default value: $::apache::params::mime_types_config
+
+##### `mime_types_additional`
+
+Data type: `Any`
+
+List of additional MIME types to include.
+
+Default value: `undef`
+
+### apache::mod::mime_magic
+
+Installs and configures `mod_mime_magic`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_mime_magic.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::mime_magic` class.
+
+##### `magic_file`
+
+Data type: `Any`
+
+Enable MIME-type determination based on file contents using the specified magic file.
+
+Default value: `undef`
+
+### apache::mod::negotiation
+
+Installs and configures `mod_negotiation`.
+
+* **See also**
+[https://httpd.apache.org/docs/current/mod/mod_negotiation.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::negotiation` class.
+
+##### `force_language_priority`
+
+Data type: `Variant[Array[String], String]`
+
+Action to take if a single acceptable document is not found.
+
+Default value: 'Prefer Fallback'
+
+##### `language_priority`
+
+Data type: `Variant[Array[String], String]`
+
+The precedence of language variants for cases where the client does not express a preference.
+
+Default value: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+                        'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
+                        'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
+                        'zh-TW' ]
+
+### apache::mod::nss
+
+Installs and configures `mod_nss`.
+
+* **See also**
+https://pagure.io/mod_nss
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::nss` class.
+
+##### `transfer_log`
+
+Data type: `Any`
+
+Path to `access.log`.
+
+Default value: "${::apache::params::logroot}/access.log"
+
+##### `error_Log`
+
+Path to `error.log`
+
+##### `passwd_file`
+
+Data type: `Any`
+
+Path to file containing token passwords used for NSSPassPhraseDialog.
+
+Default value: `undef`
+
+##### `port`
+
+Data type: `Any`
+
+Sets the SSL port that should be used by mod_nss.
+
+Default value: 8443
+
+##### `error_log`
+
+Data type: `Any`
+
+
+
+Default value: "${::apache::params::logroot}/error.log"
+
+### apache::mod::pagespeed
+
+Although this apache module requires the mod-pagespeed-stable package, Puppet does not manage the software repositories required to
+automatically install the package. If you declare this class when the package is either not installed or not available to your
+package manager, your Puppet run will fail.
+
+* **TODO** Add docs
+
+* **Note** Verify that your system is compatible with the latest Google Pagespeed requirements.
+
+* **See also**
+https://developers.google.com/speed/pagespeed/module/
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::pagespeed` class.
+
+##### `inherit_vhost_config`
+
+Data type: `Any`
+
+
+
+Default value: 'on'
+
+##### `filter_xhtml`
+
+Data type: `Any`
+
+
+
+Default value: `false`
+
+##### `cache_path`
+
+Data type: `Any`
+
+
+
+Default value: '/var/cache/mod_pagespeed/'
+
+##### `log_dir`
+
+Data type: `Any`
+
+
+
+Default value: '/var/log/pagespeed'
+
+##### `memcache_servers`
+
+Data type: `Any`
+
+
+
+Default value: []
+
+##### `rewrite_level`
+
+Data type: `Any`
+
+
+
+Default value: 'CoreFilters'
+
+##### `disable_filters`
+
+Data type: `Any`
+
+
+
+Default value: []
+
+##### `enable_filters`
+
+Data type: `Any`
+
+
+
+Default value: []
+
+##### `forbid_filters`
+
+Data type: `Any`
+
+
+
+Default value: []
+
+##### `rewrite_deadline_per_flush_ms`
+
+Data type: `Any`
+
+
+
+Default value: 10
+
+##### `additional_domains`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `file_cache_size_kb`
+
+Data type: `Any`
+
+
+
+Default value: 102400
+
+##### `file_cache_clean_interval_ms`
+
+Data type: `Any`
+
+
+
+Default value: 3600000
+
+##### `lru_cache_per_process`
+
+Data type: `Any`
+
+
+
+Default value: 1024
+
+##### `lru_cache_byte_limit`
+
+Data type: `Any`
+
+
+
+Default value: 16384
+
+##### `css_flatten_max_bytes`
+
+Data type: `Any`
+
+
+
+Default value: 2048
+
+##### `css_inline_max_bytes`
+
+Data type: `Any`
+
+
+
+Default value: 2048
+
+##### `css_image_inline_max_bytes`
+
+Data type: `Any`
+
+
+
+Default value: 2048
+
+##### `image_inline_max_bytes`
+
+Data type: `Any`
+
+
+
+Default value: 2048
+
+##### `js_inline_max_bytes`
+
+Data type: `Any`
+
+
+
+Default value: 2048
+
+##### `css_outline_min_bytes`
+
+Data type: `Any`
+
+
+
+Default value: 3000
+
+##### `js_outline_min_bytes`
+
+Data type: `Any`
+
+
+
+Default value: 3000
+
+##### `inode_limit`
+
+Data type: `Any`
+
+
+
+Default value: 500000
+
+##### `image_max_rewrites_at_once`
+
+Data type: `Any`
+
+
+
+Default value: 8
+
+##### `num_rewrite_threads`
+
+Data type: `Any`
+
+
+
+Default value: 4
+
+##### `num_expensive_rewrite_threads`
+
+Data type: `Any`
+
+
+
+Default value: 4
+
+##### `collect_statistics`
+
+Data type: `Any`
+
+
+
+Default value: 'on'
+
+##### `statistics_logging`
+
+Data type: `Any`
+
+
+
+Default value: 'on'
+
+##### `allow_view_stats`
+
+Data type: `Any`
+
+
+
+Default value: []
+
+##### `allow_pagespeed_console`
+
+Data type: `Any`
+
+
+
+Default value: []
+
+##### `allow_pagespeed_message`
+
+Data type: `Any`
+
+
+
+Default value: []
+
+##### `message_buffer_size`
+
+Data type: `Any`
+
+
+
+Default value: 100000
+
+##### `additional_configuration`
+
+Data type: `Any`
+
+
+
+Default value: {}
+
+##### `apache_version`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `package_ensure`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+### apache::mod::passenger
+
+The current set of server configurations settings were taken directly from the Passenger Reference. To enable deprecation warnings
+and removal failure messages, set the passenger_installed_version to the version number installed on the server.
+
+Change Log:
+  - As of 08/13/2017 there are 84 available/deprecated/removed settings.
+  - Around 08/20/2017 UnionStation was discontinued options were removed.
+  - As of 08/20/2017 there are 77 available/deprecated/removed settings.
+
+* **Note** In Passenger source code you can strip out what are all the available options by looking in
+  - src/apache2_module/Configuration.cpp
+  - src/apache2_module/ConfigurationCommands.cpp
+There are also several undocumented settings.
+
+* **See also**
+https://www.phusionpassenger.com/library/config/apache/reference/
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::passenger` class.
+
+##### `manage_repo`
+
+Data type: `Any`
+
+Toggle whether to manage yum repo if on a RedHat node.
+
+Default value: `true`
+
+##### `mod_id`
+
+Data type: `Any`
+
+Specifies the package id.
+
+Default value: `undef`
+
+##### `mod_lib`
+
+Data type: `Any`
+
+Defines the module's shared object name. Do not configure manually without special reason.
+
+Default value: `undef`
+
+##### `mod_lib_path`
+
+Data type: `Any`
+
+Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter overrides
+this value.
+
+Default value: `undef`
+
+##### `mod_package`
+
+Data type: `Any`
+
+Name of the module package to install.
+
+Default value: `undef`
+
+##### `mod_package_ensure`
+
+Data type: `Any`
+
+Determines whether Puppet ensures the module should be installed.
+
+Default value: `undef`
+
+##### `mod_path`
+
+Data type: `Any`
+
+Specifies a path to the module. Do not manually set this parameter without a special reason.
+
+Default value: `undef`
+
+##### `passenger_allow_encoded_slashes`
+
+Data type: `Any`
+
+Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
+
+Default value: `undef`
+
+##### `passenger_app_env`
+
+Data type: `Any`
+
+This option sets, for the current application, the value of the following environment variables:
+- RAILS_ENV
+- RACK_ENV
+- WSGI_ENV
+- NODE_ENV
+- PASSENGER_APP_ENV
+
+Default value: `undef`
+
+##### `passenger_app_group_name`
+
+Data type: `Any`
+
+Sets the name of the application group that the current application should belong to.
+
+Default value: `undef`
+
+##### `passenger_app_root`
+
+Data type: `Any`
+
+Path to the application root which allows access independent from the DocumentRoot.
+
+Default value: `undef`
+
+##### `passenger_app_type`
+
+Data type: `Any`
+
+Specifies the type of the application. If you set this option, then you must also set PassengerAppRoot, otherwise Passenger will
+not properly recognize your application.
+
+Default value: `undef`
+
+##### `passenger_base_uri`
+
+Data type: `Any`
+
+Used to specify that the given URI is an distinct application that should be served by Passenger.
+
+Default value: `undef`
+
+##### `passenger_buffer_response`
+
+Data type: `Any`
+
+Toggle whether application-generated responses are buffered by Apache. Buffering will happen in memory.
+
+Default value: `undef`
+
+##### `passenger_buffer_upload`
+
+Data type: `Any`
+
+Toggle whether HTTP client request bodies are buffered before they are sent to the application.
+
+Default value: `undef`
+
+##### `passenger_concurrency_model`
+
+Data type: `Any`
+
+Specifies the I/O concurrency model that should be used for Ruby application processes.
+
+Default value: `undef`
+
+##### `passenger_conf_file`
+
+Data type: `Any`
+
+
+
+Default value: $::apache::params::passenger_conf_file
+
+##### `passenger_conf_package_file`
+
+Data type: `Any`
+
+
+
+Default value: $::apache::params::passenger_conf_package_file
+
+##### `passenger_data_buffer_dir`
+
+Data type: `Any`
+
+Specifies the directory in which to store data buffers.
+
+Default value: `undef`
+
+##### `passenger_debug_log_file`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `passenger_debugger`
+
+Data type: `Any`
+
+Turns support for Ruby application debugging on or off.
+
+Default value: `undef`
+
+##### `passenger_default_group`
+
+Data type: `Any`
+
+Allows you to specify the group that applications must run as, if user switching fails or is disabled.
+
+Default value: `undef`
+
+##### `passenger_default_ruby`
+
+Data type: `Any`
+
+File path to desired ruby interpreter to use by default.
+
+Default value: $::apache::params::passenger_default_ruby
+
+##### `passenger_default_user`
+
+Data type: `Any`
+
+Allows you to specify the user that applications must run as, if user switching fails or is disabled.
+
+Default value: `undef`
+
+##### `passenger_disable_security_update_check`
+
+Data type: `Any`
+
+Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
+security updates that might be available.
+
+Default value: `undef`
+
+##### `passenger_enabled`
+
+Data type: `Any`
+
+Toggles whether Passenger should be enabled for that particular context.
+
+Default value: `undef`
+
+##### `passenger_error_override`
+
+Data type: `Any`
+
+Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher.
+
+Default value: `undef`
+
+##### `passenger_file_descriptor_log_file`
+
+Data type: `Any`
+
+Log file descriptor debug tracing messages to the given file.
+
+Default value: `undef`
+
+##### `passenger_fly_with`
+
+Data type: `Any`
+
+Enables the Flying Passenger mode, and configures Apache to connect to the Flying Passenger daemon that's listening on the
+given socket filename.
+
+Default value: `undef`
+
+##### `passenger_force_max_concurrent_requests_per_process`
+
+Data type: `Any`
+
+Use this option to tell Passenger how many concurrent requests the application can handle per process.
+
+Default value: `undef`
+
+##### `passenger_friendly_error_pages`
+
+Data type: `Any`
+
+Toggles whether Passenger should display friendly error pages whenever an application fails to start.
+
+Default value: `undef`
+
+##### `passenger_group`
+
+Data type: `Any`
+
+Allows you to override that behavior and explicitly set a group to run the web application as, regardless of the ownership of the
+startup file.
+
+Default value: `undef`
+
+##### `passenger_high_performance`
+
+Data type: `Any`
+
+Toggles whether to enable PassengerHighPerformance which will make Passenger will be a little faster, in return for reduced
+compatibility with other Apache modules.
+
+Default value: `undef`
+
+##### `passenger_installed_version`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `passenger_instance_registry_dir`
+
+Data type: `Any`
+
+Specifies the directory that Passenger should use for registering its current instance.
+
+Default value: `undef`
+
+##### `passenger_load_shell_envvars`
+
+Data type: `Any`
+
+Enables or disables the loading of shell environment variables before spawning the application.
+
+Default value: `undef`
+
+##### `passenger_log_file`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+File path to log file. By default Passenger log messages are written to the Apache global error log.
+
+Default value: `undef`
+
+##### `passenger_log_level`
+
+Data type: `Any`
+
+Specifies how much information Passenger should log to its log file. A higher log level value means that more
+information will be logged.
+
+Default value: `undef`
+
+##### `passenger_lve_min_uid`
+
+Data type: `Any`
+
+When using Passenger on a LVE-enabled kernel, a security check (enter) is run for spawning application processes. This options
+tells the check to only allow processes with UIDs equal to, or higher than, the specified value.
+
+Default value: `undef`
+
+##### `passenger_max_instances`
+
+Data type: `Any`
+
+The maximum number of application processes that may simultaneously exist for an application.
+
+Default value: `undef`
+
+##### `passenger_max_instances_per_app`
+
+Data type: `Any`
+
+The maximum number of application processes that may simultaneously exist for a single application.
+
+Default value: `undef`
+
+##### `passenger_max_pool_size`
+
+Data type: `Any`
+
+The maximum number of application processes that may simultaneously exist.
+
+Default value: `undef`
+
+##### `passenger_max_preloader_idle_time`
+
+Data type: `Any`
+
+Set the preloader's idle timeout, in seconds. A value of 0 means that it should never idle timeout.
+
+Default value: `undef`
+
+##### `passenger_max_request_queue_size`
+
+Data type: `Any`
+
+Specifies the maximum size for the queue of all incoming requests.
+
+Default value: `undef`
+
+##### `passenger_max_request_time`
+
+Data type: `Any`
+
+The maximum amount of time, in seconds, that an application process may take to process a request.
+
+Default value: `undef`
+
+##### `passenger_max_requests`
+
+Data type: `Any`
+
+The maximum number of requests an application process will process.
+
+Default value: `undef`
+
+##### `passenger_memory_limit`
+
+Data type: `Any`
+
+The maximum amount of memory that an application process may use, in megabytes.
+
+Default value: `undef`
+
+##### `passenger_meteor_app_settings`
+
+Data type: `Any`
+
+When using a Meteor application in non-bundled mode, use this option to specify a JSON file with settings for the application.
+
+Default value: `undef`
+
+##### `passenger_min_instances`
+
+Data type: `Any`
+
+Specifies the minimum number of application processes that should exist for a given application.
+
+Default value: `undef`
+
+##### `passenger_nodejs`
+
+Data type: `Any`
+
+Specifies the Node.js command to use for serving Node.js web applications.
+
+Default value: `undef`
+
+##### `passenger_pool_idle_time`
+
+Data type: `Any`
+
+The maximum number of seconds that an application process may be idle.
+
+Default value: `undef`
+
+##### `passenger_pre_start`
+
+Data type: `Optional[Variant[String,Array[String]]]`
+
+URL of the web application you want to pre-start.
+
+Default value: `undef`
+
+##### `passenger_python`
+
+Data type: `Any`
+
+Specifies the Python interpreter to use for serving Python web applications.
+
+Default value: `undef`
+
+##### `passenger_resist_deployment_errors`
+
+Data type: `Any`
+
+Enables or disables resistance against deployment errors.
+
+Default value: `undef`
+
+##### `passenger_resolve_symlinks_in_document_root`
+
+Data type: `Any`
+
+This option is no longer available in version 5.2.0. Switch to PassengerAppRoot if you are setting the application root via a
+document root containing symlinks.
+
+Default value: `undef`
+
+##### `passenger_response_buffer_high_watermark`
+
+Data type: `Any`
+
+Configures the maximum size of the real-time disk-backed response buffering system.
+
+Default value: `undef`
+
+##### `passenger_restart_dir`
+
+Data type: `Any`
+
+Path to directory containing restart.txt file. Can be either absolute or relative.
+
+Default value: `undef`
+
+##### `passenger_rolling_restarts`
+
+Data type: `Any`
+
+Enables or disables support for zero-downtime application restarts through restart.txt.
+
+Default value: `undef`
+
+##### `passenger_root`
+
+Data type: `Any`
+
+Refers to the location to the Passenger root directory, or to a location configuration file.
+
+Default value: $::apache::params::passenger_root
+
+##### `passenger_ruby`
+
+Data type: `Any`
+
+Specifies the Ruby interpreter to use for serving Ruby web applications.
+
+Default value: $::apache::params::passenger_ruby
+
+##### `passenger_security_update_check_proxy`
+
+Data type: `Any`
+
+Allows use of an intermediate proxy for the Passenger security update check.
+
+Default value: `undef`
+
+##### `passenger_show_version_in_header`
+
+Data type: `Any`
+
+Toggle whether Passenger will output its version number in the X-Powered-By header in all Passenger-served requests:
+
+Default value: `undef`
+
+##### `passenger_socket_backlog`
+
+Data type: `Any`
+
+This option can be raised if Apache manages to overflow the backlog queue.
+
+Default value: `undef`
+
+##### `passenger_spawn_method`
+
+Data type: `Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']]`
+
+Controls whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
+
+Default value: `undef`
+
+##### `passenger_start_timeout`
+
+Data type: `Any`
+
+Specifies a timeout for the startup of application processes.
+
+Default value: `undef`
+
+##### `passenger_startup_file`
+
+Data type: `Any`
+
+Specifies the startup file that Passenger should use when loading the application.
+
+Default value: `undef`
+
+##### `passenger_stat_throttle_rate`
+
+Data type: `Any`
+
+Setting this option to a value of x means that certain filesystem checks will be performed at most once every x seconds.
+
+Default value: `undef`
+
+##### `passenger_sticky_sessions`
+
+Data type: `Any`
+
+Toggles whether all requests that a client sends will be routed to the same originating application process, whenever possible.
+
+Default value: `undef`
+
+##### `passenger_sticky_sessions_cookie_name`
+
+Data type: `Any`
+
+Sets the name of the sticky sessions cookie.
+
+Default value: `undef`
+
+##### `passenger_thread_count`
+
+Data type: `Any`
+
+Specifies the number of threads that Passenger should spawn per Ruby application process.
+
+Default value: `undef`
+
+##### `passenger_use_global_queue`
+
+Data type: `Any`
+
+N/A.
+
+Default value: `undef`
+
+##### `passenger_user`
+
+Data type: `Any`
+
+Allows you to override that behavior and explicitly set a user to run the web application as, regardless of the ownership of the
+startup file.
+
+Default value: `undef`
+
+##### `passenger_user_switching`
+
+Data type: `Any`
+
+Toggles whether to attempt to enable user account sandboxing, also known as user switching.
+
+Default value: `undef`
+
+##### `rack_auto_detect`
+
+Data type: `Any`
+
+This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+
+Default value: `undef`
+
+##### `rack_autodetect`
+
+Data type: `Any`
+
+This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+
+Default value: `undef`
+
+##### `rack_base_uri`
+
+Data type: `Any`
+
+Deprecated in 3.0.0 in favor of PassengerBaseURI.
+
+Default value: `undef`
+
+##### `rack_env`
+
+Data type: `Any`
+
+Alias for PassengerAppEnv.
+
+Default value: `undef`
+
+##### `rails_allow_mod_rewrite`
+
+Data type: `Any`
+
+This option doesn't do anything anymore since version 4.0.0.
+
+Default value: `undef`
+
+##### `rails_app_spawner_idle_time`
+
+Data type: `Any`
+
+This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
+
+Default value: `undef`
+
+##### `rails_auto_detect`
+
+Data type: `Any`
+
+This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+
+Default value: `undef`
+
+##### `rails_autodetect`
+
+Data type: `Any`
+
+This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+
+Default value: `undef`
+
+##### `rails_base_uri`
+
+Data type: `Any`
+
+Deprecated in 3.0.0 in favor of PassengerBaseURI.
+
+Default value: `undef`
+
+##### `rails_default_user`
+
+Data type: `Any`
+
+Deprecated in 3.0.0 in favor of PassengerDefaultUser
+
+Default value: `undef`
+
+##### `rails_env`
+
+Data type: `Any`
+
+Alias for PassengerAppEnv.
+
+Default value: `undef`
+
+##### `rails_framework_spawner_idle_time`
+
+Data type: `Any`
+
+This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed
+altogether. You should use smart spawning instead.
+
+Default value: `undef`
+
+##### `rails_ruby`
+
+Data type: `Any`
+
+Deprecated in 3.0.0 in favor of PassengerRuby.
+
+Default value: `undef`
+
+##### `rails_spawn_method`
+
+Data type: `Any`
+
+Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
+
+Default value: `undef`
+
+##### `rails_user_switching`
+
+Data type: `Any`
+
+Deprecated in 3.0.0 in favor of PassengerUserSwitching.
+
+Default value: `undef`
+
+##### `wsgi_auto_detect`
+
+Data type: `Any`
+
+This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+
+Default value: `undef`
+
+### apache::mod::perl
+
+Installs `mod_perl`.
+
+* **See also**
+https://perl.apache.org
+for additional documentation.
+
+### apache::mod::peruser
+
+Installs `mod_peruser`.
+
+* **TODO** Add docs
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::peruser` class.
+
+##### `minspareprocessors`
+
+Data type: `Any`
+
+
+
+Default value: '2'
+
+##### `minprocessors`
+
+Data type: `Any`
+
+
+
+Default value: '2'
+
+##### `maxprocessors`
+
+Data type: `Any`
+
+
+
+Default value: '10'
+
+##### `maxclients`
+
+Data type: `Any`
+
+
+
+Default value: '150'
+
+##### `maxrequestsperchild`
+
+Data type: `Any`
+
+
+
+Default value: '1000'
+
+##### `idletimeout`
+
+Data type: `Any`
+
+
+
+Default value: '120'
+
+##### `expiretimeout`
+
+Data type: `Any`
+
+
+
+Default value: '120'
+
+##### `keepalive`
+
+Data type: `Any`
+
+
+
+Default value: 'Off'
+
+### apache::mod::php
+
+Installs `mod_php`.
+
+* **TODO** Add docs
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::php` class.
+
+##### `package_name`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `package_ensure`
+
+Data type: `Any`
+
+
+
+Default value: 'present'
+
+##### `path`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `extensions`
+
+Data type: `Array`
+
+
+
+Default value: ['.php']
+
+##### `content`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `template`
+
+Data type: `Any`
+
+
+
+Default value: 'apache/mod/php.conf.erb'
+
+##### `source`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `root_group`
+
+Data type: `Any`
+
+
+
+Default value: $::apache::params::root_group
+
+##### `php_version`
+
+Data type: `Any`
+
+
+
+Default value: $::apache::params::php_version
+
+##### `libphp_prefix`
+
+Data type: `Any`
+
+
+
+Default value: 'libphp'
+
+### apache::mod::prefork
+
+Installs and configures MPM `prefork`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/prefork.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::prefork` class.
+
+##### `startservers`
+
+Data type: `Any`
+
+Number of child server processes created at startup.
+
+Default value: '8'
+
+##### `minspareservers`
+
+Data type: `Any`
+
+Minimum number of idle child server processes.
+
+Default value: '5'
+
+##### `maxspareservers`
+
+Data type: `Any`
+
+Maximum number of idle child server processes.
+
+Default value: '20'
+
+##### `serverlimit`
+
+Data type: `Any`
+
+Upper limit on configurable number of processes.
+
+Default value: '256'
+
+##### `maxclients`
+
+Data type: `Any`
+
+Old alias for MaxRequestWorkers.
+
+Default value: '256'
+
+##### `maxrequestworkers`
+
+Data type: `Any`
+
+Maximum number of connections that will be processed simultaneously.
+
+Default value: `undef`
+
+##### `maxrequestsperchild`
+
+Data type: `Any`
+
+Old alias for MaxConnectionsPerChild.
+
+Default value: '4000'
+
+##### `maxconnectionsperchild`
+
+Data type: `Any`
+
+Limit on the number of connections that an individual child server will handle during its life.
+
+Default value: `undef`
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+##### `listenbacklog`
+
+Data type: `Any`
+
+Maximum length of the queue of pending connections.
+
+Default value: '511'
+
+### apache::mod::proxy
+
+Installs and configures `mod_proxy`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_proxy.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::proxy` class.
+
+##### `proxy_requests`
+
+Data type: `Any`
+
+Enables forward (standard) proxy requests.
+
+Default value: 'Off'
+
+##### `allow_from`
+
+Data type: `Any`
+
+List of IPs allowed to access proxy.
+
+Default value: `undef`
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+##### `package_name`
+
+Data type: `Any`
+
+Name of the proxy package to install.
+
+Default value: `undef`
+
+##### `proxy_via`
+
+Data type: `Any`
+
+Set local IP address for outgoing proxy connections.
+
+Default value: 'On'
+
+##### `proxy_timeout`
+
+Data type: `Any`
+
+Network timeout for proxied requests.
+
+Default value: '60'
+
+### apache::mod::proxy_ajp
+
+Installs `mod_proxy_ajp`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html
+for additional documentation.
+
+### apache::mod::proxy_balancer
+
+Installs and configures `mod_proxy_balancer`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::proxy_balancer` class.
+
+##### `manager`
+
+Data type: `Boolean`
+
+Toggle whether to enable balancer manager support.
+
+Default value: `false`
+
+##### `maanger_path`
+
+Server relative path to balancer manager.
+
+##### `allow_from`
+
+Data type: `Array`
+
+List of IPs from which the balancer manager can be accessed.
+
+Default value: ['127.0.0.1','::1']
+
+##### `apache_version`
+
+Data type: `Any`
+
+Version of Apache to install module on.
+
+Default value: $::apache::apache_version
+
+##### `manager_path`
+
+Data type: `Stdlib::Absolutepath`
+
+
+
+Default value: '/balancer-manager'
+
+### apache::mod::proxy_connect
+
+Installs `mod_proxy_connect`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::proxy_connect` class.
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+### apache::mod::proxy_fcgi
+
+Installs `mod_proxy_fcgi`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html
+for additional documentation.
+
+### apache::mod::proxy_html
+
+Installs `mod_proxy_html`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_proxy_html.html
+for additional documentation.
+
+### apache::mod::proxy_http
+
+Installs `mod_proxy_http`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_proxy_http.html
+for additional documentation.
+
+### apache::mod::proxy_wstunnel
+
+Installs `mod_proxy_wstunnel`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html
+for additional documentation.
+
+### apache::mod::python
+
+Installs and configures `mod_python`.
+
+* **See also**
+https://github.com/grisha/mod_python
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::python` class.
+
+##### `loadfile_name`
+
+Data type: `Optional[String]`
+
+Sets the name of the configuration file that is used to load the python module.
+
+Default value: `undef`
+
+### apache::mod::remoteip
+
+Installs and configures `mod_remoteip`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_remoteip.html
+https://httpd.apache.org/docs/current/mod/mod_remoteip.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::remoteip` class.
+
+##### `header`
+
+Data type: `String`
+
+The header field in which `mod_remoteip` will look for the useragent IP.
+
+Default value: 'X-Forwarded-For'
+
+##### `internal_proxy`
+
+Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
+
+A list of IP addresses, IP blocks or hostname that are trusted to set a
+valid value inside specified header. Unlike the `$trusted_proxy_ips`
+parameter, any IP address (including private addresses) presented by these
+proxies will trusted by `mod_remoteip`.
+
+Default value: `undef`
+
+##### `proxy_ips`
+
+Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
+
+*Deprecated*: use `$internal_proxy` instead.
+
+Default value: `undef`
+
+##### `internal_proxy_list`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+The path to a file containing a list of IP addresses, IP blocks or hostname
+that are trusted to set a valid value inside the specified header. See
+`$internal_proxy` for details.
+
+Default value: `undef`
+
+##### `proxies_header`
+
+Data type: `Optional[String]`
+
+A header into which `mod_remoteip` will collect a list of all of the
+intermediate client IP addresses trusted to resolve the useragent IP of the
+request (e.g. `X-Forwarded-By`).
+
+Default value: `undef`
+
+##### `proxy_protocol`
+
+Data type: `Boolean`
+
+Wether or not to enable the PROXY protocol header handling. If enabled
+upstream clients must set the header every time they open a connection.
+
+Default value: `false`
+
+##### `proxy_protocol_exceptions`
+
+Data type: `Optional[Array[Stdlib::Host]]`
+
+A list of IP address or IP blocks that are not required to use the PROXY
+protocol.
+
+Default value: `undef`
+
+##### `trusted_proxy`
+
+Data type: `Optional[Array[Stdlib::Host]]`
+
+A list of IP addresses, IP blocks or hostname that are trusted to set a
+valid value inside the specified header. Unlike the `$proxy_ips` parameter,
+any private IP presented by these proxies will be disgarded by
+`mod_remoteip`.
+
+Default value: `undef`
+
+##### `trusted_proxy_ips`
+
+Data type: `Optional[Array[Stdlib::Host]]`
+
+*Deprecated*: use `$trusted_proxy` instead.
+
+Default value: `undef`
+
+##### `trusted_proxy_list`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+The path to a file containing a list of IP addresses, IP blocks or hostname
+that are trusted to set a valid value inside the specified header. See
+`$trusted_proxy` for details.
+
+Default value: `undef`
+
+##### `apache_version`
+
+Data type: `Optional[String]`
+
+A version string used to validate that your apache version supports
+`mod_remoteip`. If not specified, `$::apache::apache_version` is used.
+
+Default value: `undef`
+
+### apache::mod::reqtimeout
+
+Installs and configures `mod_reqtimeout`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::reqtimeout` class.
+
+##### `timeouts`
+
+Data type: `Any`
+
+List of timeouts and data rates for receiving requests.
+
+Default value: ['header=20-40,minrate=500', 'body=10,minrate=500']
+
+### apache::mod::rewrite
+
+Installs `mod_rewrite`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_rewrite.html
+for additional documentation.
+
+### apache::mod::rpaf
+
+Installs and configures `mod_rpaf`.
+
+* **See also**
+https://github.com/gnif/mod_rpaf
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::rpaf` class.
+
+##### `sethostname`
+
+Data type: `Any`
+
+Toggles whether to update vhost name so ServerName and ServerAlias work.
+
+Default value: `true`
+
+##### `proxy_ips`
+
+Data type: `Any`
+
+List of IPs & bitmasked subnets to adjust requests for
+
+Default value: [ '127.0.0.1' ]
+
+##### `header`
+
+Data type: `Any`
+
+Header to use for the real IP address.
+
+Default value: 'X-Forwarded-For'
+
+##### `template`
+
+Data type: `Any`
+
+Path to template to use for configuring mod_rpaf.
+
+Default value: 'apache/mod/rpaf.conf.erb'
+
+### apache::mod::security
+
+Installs and configures `mod_security`.
+
+* **See also**
+https://github.com/SpiderLabs/ModSecurity/wiki
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::security` class.
+
+##### `logroot`
+
+Data type: `Any`
+
+Configures the location of audit and debug logs.
+
+Default value: $::apache::params::logroot
+
+##### `crs_package`
+
+Data type: `Any`
+
+Name of package that installs CRS rules.
+
+Default value: $::apache::params::modsec_crs_package
+
+##### `activated_rules`
+
+Data type: `Any`
+
+An array of rules from the modsec_crs_path or absolute to activate via symlinks.
+
+Default value: $::apache::params::modsec_default_rules
+
+##### `modsec_dir`
+
+Data type: `Any`
+
+Defines the path where Puppet installs the modsec configuration and activated rules links.
+
+Default value: $::apache::params::modsec_dir
+
+##### `modsec_secruleengine`
+
+Data type: `Any`
+
+Configures the rules engine.
+
+Default value: $::apache::params::modsec_secruleengine
+
+##### `audit_log_relevant_status`
+
+Data type: `Any`
+
+Configures which response status code is to be considered relevant for the purpose of audit logging.
+
+Default value: '^(?:5|4(?!04))'
+
+##### `audit_log_parts`
+
+Data type: `Any`
+
+Defines which parts of each transaction are going to be recorded in the audit log. Each part is assigned a single letter; when a
+letter appears in the list then the equivalent part will be recorded.
+
+Default value: $::apache::params::modsec_audit_log_parts
+
+##### `secpcrematchlimit`
+
+Data type: `Any`
+
+Sets the match limit in the PCRE library.
+
+Default value: $::apache::params::secpcrematchlimit
+
+##### `secpcrematchlimitrecursion`
+
+Data type: `Any`
+
+Sets the match limit recursion in the PCRE library.
+
+Default value: $::apache::params::secpcrematchlimitrecursion
+
+##### `allowed_methods`
+
+Data type: `Any`
+
+A space-separated list of allowed HTTP methods.
+
+Default value: 'GET HEAD POST OPTIONS'
+
+##### `content_types`
+
+Data type: `Any`
+
+A list of one or more allowed MIME types.
+
+Default value: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'
+
+##### `restricted_extensions`
+
+Data type: `Any`
+
+A space-sparated list of prohibited file extensions.
+
+Default value: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'
+
+##### `restricted_headers`
+
+Data type: `Any`
+
+A list of restricted headers separated by slashes and spaces.
+
+Default value: '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'
+
+##### `secdefaultaction`
+
+Data type: `Any`
+
+Defines the default list of actions, which will be inherited by the rules in the same configuration context.
+
+Default value: 'deny'
+
+##### `anomaly_score_blocking`
+
+Data type: `Any`
+
+Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set.
+
+Default value: 'off'
+
+##### `inbound_anomaly_threshold`
+
+Data type: `Any`
+
+Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+
+Default value: '5'
+
+##### `outbound_anomaly_threshold`
+
+Data type: `Any`
+
+Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+
+Default value: '4'
+
+##### `critical_anomaly_score`
+
+Data type: `Any`
+
+Sets the Anomaly Score for rules assigned with a critical severity.
+
+Default value: '5'
+
+##### `error_anomaly_score`
+
+Data type: `Any`
+
+Sets the Anomaly Score for rules assigned with a error severity.
+
+Default value: '4'
+
+##### `warning_anomaly_score`
+
+Data type: `Any`
+
+Sets the Anomaly Score for rules assigned with a warning severity.
+
+Default value: '3'
+
+##### `notice_anomaly_score`
+
+Data type: `Any`
+
+Sets the Anomaly Score for rules assigned with a notice severity.
+
+Default value: '2'
+
+##### `secrequestmaxnumargs`
+
+Data type: `Any`
+
+Sets the maximum number of arguments in the request.
+
+Default value: '255'
+
+##### `secrequestbodylimit`
+
+Data type: `Any`
+
+Sets the maximum request body size ModSecurity will accept for buffering.
+
+Default value: '13107200'
+
+##### `secrequestbodynofileslimit`
+
+Data type: `Any`
+
+Configures the maximum request body size ModSecurity will accept for buffering, excluding the size of any files being transported
+in the request.
+
+Default value: '131072'
+
+##### `secrequestbodyinmemorylimit`
+
+Data type: `Any`
+
+Configures the maximum request body size that ModSecurity will store in memory.
+
+Default value: '131072'
+
+##### `manage_security_crs`
+
+Data type: `Any`
+
+Toggles whether to manage ModSecurity Core Rule Set
+
+Default value: `true`
+
+### apache::mod::setenvif
+
+Installs `mod_setenvif`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_setenvif.html
+for additional documentation.
+
+### apache::mod::shib
+
+This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
+can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
+
+* **Note** The Shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories.
+See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide).
+
+* **See also**
+https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::shib` class.
+
+##### `suppress_warning`
+
+Data type: `Any`
+
+Toggles whether to trigger warning on RedHat nodes.
+
+Default value: `false`
+
+##### `mod_full_path`
+
+Data type: `Any`
+
+Specifies a path to the module. Do not manually set this parameter without a special reason.
+
+Default value: `undef`
+
+##### `package_name`
+
+Data type: `Any`
+
+Name of the Shibboleth package to be installed.
+
+Default value: `undef`
+
+##### `mod_lib`
+
+Data type: `Any`
+
+Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
+overrides this value.
+
+Default value: `undef`
+
+### apache::mod::socache_shmcb
+
+Installs `mod_socache_shmcb`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html
+for additional documentation.
+
+### apache::mod::speling
+
+Installs `mod_spelling`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_speling.html
+for additional documentation.
+
+### apache::mod::ssl
+
+On most operating systems, the ssl.conf is placed in the module configuration directory. On Red Hat based operating systems, this
+file is placed in /etc/httpd/conf.d, the same location in which the RPM stores the configuration.
+
+To use SSL with a virtual host, you must either set the default_ssl_vhost parameter in ::apache to true or the ssl parameter in
+apache::vhost to true.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_ssl.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::ssl` class.
+
+##### `ssl_compression`
+
+Data type: `Boolean`
+
+Enable compression on the SSL level.
+
+Default value: `false`
+
+##### `ssl_cryptodevice`
+
+Data type: `Any`
+
+Enable use of a cryptographic hardware accelerator.
+
+Default value: 'builtin'
+
+##### `ssl_options`
+
+Data type: `Any`
+
+Configure various SSL engine run-time options.
+
+Default value: [ 'StdEnvVars' ]
+
+##### `ssl_openssl_conf_cmd`
+
+Data type: `Any`
+
+Configure OpenSSL parameters through its SSL_CONF API.
+
+Default value: `undef`
+
+##### `ssl_cert`
+
+Data type: `Optional[String]`
+
+Path to server PEM-encoded X.509 certificate data file.
+
+Default value: `undef`
+
+##### `ssl_key`
+
+Data type: `Optional[String]`
+
+Path to server PEM-encoded private key file
+
+Default value: `undef`
+
+##### `ssl_ca`
+
+Data type: `Any`
+
+File of concatenated PEM-encoded CA Certificates for Client Auth.
+
+Default value: `undef`
+
+##### `ssl_cipher`
+
+Data type: `Any`
+
+Cipher Suite available for negotiation in SSL handshake.
+
+Default value: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES'
+
+##### `ssl_honorcipherorder`
+
+Data type: `Variant[Boolean, Enum['on', 'off']]`
+
+Option to prefer the server's cipher preference order.
+
+Default value: `true`
+
+##### `ssl_protocol`
+
+Data type: `Any`
+
+Configure usable SSL/TLS protocol versions.
+
+Default value: [ 'all', '-SSLv2', '-SSLv3' ]
+
+##### `ssl_proxy_protocol`
+
+Data type: `Array`
+
+Configure usable SSL protocol flavors for proxy usage.
+
+Default value: []
+
+##### `ssl_pass_phrase_dialog`
+
+Data type: `Any`
+
+Type of pass phrase dialog for encrypted private keys.
+
+Default value: 'builtin'
+
+##### `ssl_random_seed_bytes`
+
+Data type: `Any`
+
+Pseudo Random Number Generator (PRNG) seeding source.
+
+Default value: '512'
+
+##### `ssl_sessioncache`
+
+Data type: `String`
+
+Configures the storage type of the global/inter-process SSL Session Cache
+
+Default value: $::apache::params::ssl_sessioncache
+
+##### `ssl_sessioncachetimeout`
+
+Data type: `Any`
+
+Number of seconds before an SSL session expires in the Session Cache.
+
+Default value: '300'
+
+##### `ssl_stapling`
+
+Data type: `Boolean`
+
+Enable stapling of OCSP responses in the TLS handshake.
+
+Default value: `false`
+
+##### `ssl_stapling_return_errors`
+
+Data type: `Optional[Boolean]`
+
+Pass stapling related OCSP errors on to client.
+
+Default value: `undef`
+
+##### `ssl_mutex`
+
+Data type: `Any`
+
+Configures mutex mechanism and lock file directory for all or specified mutexes.
+Default based on the OS and/or Apache version:
+- RedHat/FreeBSD/Suse/Gentoo: 'default'.
+- Debian/Ubuntu + Apache >= 2.4: 'default'.
+- Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
+- Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
+
+Default value: `undef`
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+##### `package_name`
+
+Data type: `Any`
+
+Name of ssl package to install.
+
+Default value: `undef`
+
+### apache::mod::status
+
+Installs and configures `mod_status`.
+
+* **See also**
+http://httpd.apache.org/docs/current/mod/mod_status.html
+for additional documentation.
+
+#### Examples
+
+##### 
+
+```puppet
+# Simple usage allowing access from localhost and a private subnet
+class { 'apache::mod::status':
+  $allow_from => ['127.0.0.1', '10.10.10.10/24'],
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::status` class.
+
+##### `allow_from`
+
+Data type: `Optional[Array]`
+
+Array of hosts, ip addresses, partial network numbers or networks, in CIDR notation specifying what hosts can view the special
+/server-status URL.  Defaults to ['127.0.0.1', '::1'].
+> Creates Apache < 2.4 directive "Allow from".
+
+Default value: `undef`
+
+##### `requires`
+
+Data type: `Optional[Variant[String, Array, Hash]]`
+
+A Variant type that can be:
+- String with:
+  - '' or 'unmanaged' - Host auth control done elsewhere
+  - 'ip <List of IPs>' - Allowed IPs/ranges
+  - 'host <List of names>' - Allowed names/domains
+  - 'all [granted|denied]'
+- Array of strings with ip or host as above
+- Hash with following keys:
+  - 'requires' - Value => Array as above
+  - 'enforce' - Value => String 'Any', 'All' or 'None'
+    This encloses "Require" directives in "<Require(Any|All|None)>" block
+    Optional - If unspecified, "Require" directives follow current flow
+> Creates Apache >= 2.4 directives "Require"
+
+Default value: `undef`
+
+##### `extended_status`
+
+Data type: `Enum['On', 'Off', 'on', 'off']`
+
+Determines whether to track extended status information for each request, via the ExtendedStatus directive.
+
+Default value: 'On'
+
+##### `status_path`
+
+Data type: `Any`
+
+Path assigned to the Location directive which defines the URL to access the server status.
+
+Default value: '/server-status'
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+### apache::mod::suexec
+
+Installs `mod_suexec`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_suexec.html
+for additional documentation.
+
+### apache::mod::suphp
+
+Installs `mod_suphp`.
+
+* **See also**
+https://www.suphp.org/DocumentationView.html?file=apache/INSTALL
+for additional documentation.
+
+### apache::mod::userdir
+
+Installs and configures `mod_userdir`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_userdir.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::userdir` class.
+
+##### `home`
+
+Data type: `Any`
+
+*Deprecated* Path to system home directory.
+
+Default value: `undef`
+
+##### `dir`
+
+Data type: `Any`
+
+*Deprecated* Path from user's home directory to public directory.
+
+Default value: `undef`
+
+##### `disable_root`
+
+Data type: `Any`
+
+Toggles whether to allow use of root directory.
+
+Default value: `true`
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+##### `path`
+
+Data type: `Any`
+
+Path to directory or pattern from which to find user-specific directories.
+
+Default value: '/home/*/public_html'
+
+##### `overrides`
+
+Data type: `Any`
+
+Array of directives that are allowed in .htaccess files.
+
+Default value: [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]
+
+##### `options`
+
+Data type: `Any`
+
+Configures what features are available in a particular directory.
+
+Default value: [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ]
+
+### apache::mod::version
+
+Installs `mod_version`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_version.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::version` class.
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: $::apache::apache_version
+
+### apache::mod::vhost_alias
+
+Installs Apache `mod_vhost_alias`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/mod_vhost_alias.html
+for additional documentation.
+
+### apache::mod::worker
+
+Installs and manages the MPM `worker`.
+
+* **See also**
+https://httpd.apache.org/docs/current/mod/worker.html
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::worker` class.
+
+##### `startservers`
+
+Data type: `Any`
+
+The number of child server processes created on startup
+
+Default value: '2'
+
+##### `maxclients`
+
+Data type: `Any`
+
+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.
+
+Default value: '150'
+
+##### `minsparethreads`
+
+Data type: `Any`
+
+Minimum number of idle threads to handle request spikes.
+
+Default value: '25'
+
+##### `maxsparethreads`
+
+Data type: `Any`
+
+Maximum number of idle threads.
+
+Default value: '75'
+
+##### `threadsperchild`
+
+Data type: `Any`
+
+The number of threads created by each child process.
+
+Default value: '25'
+
+##### `maxrequestsperchild`
+
+Data type: `Any`
+
+Limit on the number of connectiojns an individual child server
+process will handle. This is the old name and is still supported. The new
+name is MaxConnectionsPerChild as of 2.3.9+.
+
+Default value: '0'
+
+##### `serverlimit`
+
+Data type: `Any`
+
+With worker, use this directive only if your MaxRequestWorkers
+and ThreadsPerChild settings require more than 16 server processes
+(default). Do not set the value of this directive any higher than the
+number of server processes required by what you may want for
+MaxRequestWorkers and ThreadsPerChild.
+
+Default value: '25'
+
+##### `threadlimit`
+
+Data type: `Any`
+
+This directive sets the maximum configured value for
+ThreadsPerChild for the lifetime of the Apache httpd process.
+
+Default value: '64'
+
+##### `listenbacklog`
+
+Data type: `Any`
+
+Maximum length of the queue of pending connections.
+
+Default value: '511'
+
+##### `apache_version`
+
+Data type: `Any`
+
+Used to verify that the Apache version you have requested is compatible with the module.
+
+Default value: `undef`
+
+### apache::mod::wsgi
+
+Installs and configures `mod_wsgi`.
+
+* **See also**
+https://github.com/GrahamDumpleton/mod_wsgi
+for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::wsgi` class.
+
+##### `wsgi_restrict_embedded`
+
+Data type: `Any`
+
+Enable restrictions on use of embedded mode.
+
+Default value: `undef`
+
+##### `wsgi_socket_prefix`
+
+Data type: `Any`
+
+Configure directory to use for daemon sockets.
+
+Default value: $::apache::params::wsgi_socket_prefix
+
+##### `wsgi_python_path`
+
+Data type: `Any`
+
+Additional directories to search for Python modules.
+
+Default value: `undef`
+
+##### `wsgi_python_home`
+
+Data type: `Any`
+
+Absolute path to Python prefix/exec_prefix directories.
+
+Default value: `undef`
+
+##### `wsgi_python_optimize`
+
+Data type: `Any`
+
+Enables basic Python optimisation features.
+
+Default value: `undef`
+
+##### `wsgi_application_group`
+
+Data type: `Any`
+
+Sets which application group WSGI application belongs to.
+
+Default value: `undef`
+
+##### `package_name`
+
+Data type: `Any`
+
+Names of package that installs mod_wsgi.
+
+Default value: `undef`
+
+##### `mod_path`
+
+Data type: `Any`
+
+Defines the path to the mod_wsgi shared object (.so) file.
+
+Default value: `undef`
+
+### apache::mod::xsendfile
+
+Installs `mod_xsendfile`.
+
+* **See also**
+https://tn123.org/mod_xsendfile/
+for additional documentation.
+
+### apache::vhosts
+
+host parameters or Configuring virtual hosts in the README section.
+
+* **Note** See the `apache::vhost` defined type's reference for a list of all virtual
+
+#### Examples
+
+##### To create a [name-based virtual host](https://httpd.apache.org/docs/current/vhosts/name-based.html) `custom_vhost_1`
+
+```puppet
+class { 'apache::vhosts':
+  vhosts => {
+    'custom_vhost_1' => {
+      'docroot' => '/var/www/custom_vhost_1',
+      'port'    => '81',
+    },
+  },
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::vhosts` class.
+
+##### `vhosts`
+
+Data type: `Any`
+
+A hash, where the key represents the name and the value represents a hash of
+`apache::vhost` defined type's parameters.
+
+Default value: {}
+
+## Defined types
+
+### apache::balancer
+
+Each balancer cluster needs one or more balancer members (that can
+be declared with the apache::balancermember defined resource type). Using
+storeconfigs, you can export the apache::balancermember resources on all
+balancer members, and then collect them on a single apache load balancer
+server.
+
+* **Note** Currently requires the puppetlabs/concat module on the Puppet Forge and uses
+storeconfigs on the Puppet Master to export/collect resources from all
+balancer members.
+
+#### Examples
+
+##### 
+
+```puppet
+apache::balancer { 'puppet00': }
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::balancer` defined type.
+
+##### `name`
+
+The namevar of the defined resource type is the balancer clusters name.<br />
+This name is also used in the name of the conf.d file
+
+##### `proxy_set`
+
+Data type: `Any`
+
+Configures key-value pairs to be used as a ProxySet lines in the configuration.
+
+Default value: {}
+
+##### `target`
+
+Data type: `Any`
+
+The path to the file the balancer definition will be written in.
+
+Default value: `undef`
+
+##### `collect_exported`
+
+Data type: `Any`
+
+Determines whether to use exported resources.<br />
+If you statically declare all of your backend servers, set this parameter to false to rely
+on existing, declared balancer member resources. Also, use apache::balancermember with array
+arguments.<br />
+To dynamically declare backend servers via exported resources collected on a central node,
+set this parameter to true to collect the balancer member resources exported by the balancer
+member nodes.<br />
+If you don't use exported resources, a single Puppet run configures all balancer members. If
+you use exported resources, Puppet has to run on the balanced nodes first, then run on the
+balancer.
+
+Default value: `true`
+
+##### `options`
+
+Data type: `Any`
+
+Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)
+after the balancer URL, and accepts any key-value pairs available to `ProxyPass`.
+
+Default value: []
+
+### apache::balancermember
+
+Sets up a balancer member inside a listening service configuration block in
+the load balancer's `apache.cfg`.
+
+This type will setup a balancer member inside a listening service
+configuration block in /etc/apache/apache.cfg on the load balancer.
+Currently it only has the ability to specify the instance name, url and an
+array of options. More features can be added as needed. The best way to
+implement this is to export this resource for all apache balancer member
+servers, and then collect them on the main apache load balancer.
+
+* **Note** Currently requires the puppetlabs/concat module on the Puppet Forge and
+uses storeconfigs on the Puppet Master to export/collect resources
+from all balancer members.
+
+#### Examples
+
+##### 
+
+```puppet
+@@apache::balancermember { 'apache':
+  balancer_cluster => 'puppet00',
+  url              => "ajp://${::fqdn}:8009"
+  options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::balancermember` defined type.
+
+##### `name`
+
+The title of the resource is arbitrary and only utilized in the concat
+fragment name.
+
+##### `balancer_cluster`
+
+Data type: `Any`
+
+The apache service's instance name (or, the title of the apache::balancer
+resource). This must match up with a declared apache::balancer resource.
+
+##### `url`
+
+Data type: `Any`
+
+The url used to contact the balancer member server.
+
+Default value: "http://${::fqdn}/"
+
+##### `options`
+
+Data type: `Any`
+
+Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)
+after the URL, and accepts any key-value pairs available to `ProxyPass`.
+
+Default value: []
+
+### apache::custom_config
+
+If the file is invalid and this defined type's `verify_config` parameter's value is
+`true`, Puppet throws an error during a Puppet run.
+
+#### Parameters
+
+The following parameters are available in the `apache::custom_config` defined type.
+
+##### `ensure`
+
+Data type: `Enum['absent', 'present']`
+
+Specifies whether the configuration file should be present.
+
+Default value: 'present'
+
+##### `confdir`
+
+Data type: `Any`
+
+Sets the directory in which Puppet places configuration files.
+
+Default value: $::apache::confd_dir
+
+##### `content`
+
+Data type: `Any`
+
+Sets the configuration file's content. The `content` and `source` parameters are exclusive
+of each other.
+
+Default value: `undef`
+
+##### `filename`
+
+Data type: `Any`
+
+Sets the name of the file under `confdir` in which Puppet stores the configuration.
+
+Default value: `undef`
+
+##### `priority`
+
+Data type: `Any`
+
+Sets the configuration file's priority by prefixing its filename with this parameter's
+numeric value, as Apache processes configuration files in alphanumeric order.<br />
+To omit the priority prefix in the configuration file's name, set this parameter to `false`.
+
+Default value: '25'
+
+##### `source`
+
+Data type: `Any`
+
+Points to the configuration file's source. The `content` and `source` parameters are
+exclusive of each other.
+
+Default value: `undef`
+
+##### `verify_command`
+
+Data type: `Any`
+
+Specifies the command Puppet uses to verify the configuration file. Use a fully qualified
+command.<br />
+This parameter is used only if the `verify_config` parameter's value is `true`. If the
+`verify_command` fails, the Puppet run deletes the configuration file and raises an error,
+but does not notify the Apache service.
+
+Default value: $::apache::params::verify_command
+
+##### `verify_config`
+
+Data type: `Boolean`
+
+Specifies whether to validate the configuration file before notifying the Apache service.
+
+Default value: `true`
+
+### apache::fastcgi::server
+
+Defines one or more external FastCGI servers to handle specific file types. Use this
+defined type with `mod_fastcgi`.
+
+#### Parameters
+
+The following parameters are available in the `apache::fastcgi::server` defined type.
+
+##### `host`
+
+Data type: `Any`
+
+Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
+
+Default value: '127.0.0.1:9000'
+
+##### `timeout`
+
+Data type: `Any`
+
+Sets the number of seconds a [FastCGI](http://www.fastcgi.com/) application can be inactive before aborting the
+request and logging the event at the error LogLevel. The inactivity timer applies only as
+long as a connection is pending with the FastCGI application. If a request is queued to an
+application, but the application doesn't respond by writing and flushing within this period,
+the request is aborted. If communication is complete with the application but incomplete with
+the client (the response is buffered), the timeout does not apply.
+
+Default value: 15
+
+##### `flush`
+
+Data type: `Any`
+
+Forces `mod_fastcgi` to write to the client as data is received from the
+application. By default, `mod_fastcgi` buffers data in order to free the application
+as quickly as possible.
+
+Default value: `false`
+
+##### `faux_path`
+
+Data type: `Any`
+
+Apache has FastCGI handle URIs that resolve to this filename. The path set in this
+parameter does not have to exist in the local filesystem.
+
+Default value: "/var/www/${name}.fcgi"
+
+##### `fcgi_alias`
+
+Data type: `Any`
+
+Internally links actions with the FastCGI server. This alias must be unique.
+
+Default value: "/${name}.fcgi"
+
+##### `file_type`
+
+Data type: `Any`
+
+Sets the MIME `content-type` of the file to be processed by the FastCGI server.
+
+Default value: 'application/x-httpd-php'
+
+##### `pass_header`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+### apache::listen
+
+The `apache::vhost` class uses this defined type, and titles take the form
+`<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
+
+### apache::mod
+
+Checks for or places the module's default configuration files in the Apache server's
+`module` and `enable` directories. The default locations depend on your operating system.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod` defined type.
+
+##### `package`
+
+Data type: `Any`
+
+**Required**.<br />
+Names the package Puppet uses to install the Apache module.
+
+Default value: `undef`
+
+##### `package_ensure`
+
+Data type: `Any`
+
+Determines whether Puppet ensures the Apache module should be installed.
+
+Default value: 'present'
+
+##### `lib`
+
+Data type: `Any`
+
+Defines the module's shared object name. Do not configure manually without special reason.
+
+Default value: `undef`
+
+##### `lib_path`
+
+Data type: `Any`
+
+Specifies a path to the module's libraries. Do not manually set this parameter
+without special reason. The `path` parameter overrides this value.
+
+Default value: $::apache::lib_path
+
+##### `loadfile_name`
+
+Data type: `Any`
+
+Sets the filename for the module's `LoadFile` directive, which can also set
+the module load order as Apache processes them in alphanumeric order.
+
+Default value: `undef`
+
+##### `id`
+
+Data type: `Any`
+
+Specifies the package id
+
+Default value: `undef`
+
+##### `loadfiles`
+
+Data type: `Any`
+
+Specifies an array of `LoadFile` directives.
+
+Default value: `undef`
+
+##### `path`
+
+Data type: `Any`
+
+Specifies a path to the module. Do not manually set this parameter without a special reason.
+
+Default value: `undef`
+
+### apache::namevirtualhost
+
+Adds all related directives to the `ports.conf` file in the Apache HTTPD configuration
+directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`,
+`\<IP\>`, or `\<IP\>:\<PORT\>`.
+
+### 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` being a defined resource type, which allows Apache
+to evaluate it multiple times with different parameters.<br />
+The `apache::vhost` defined type allows you to have specialized configurations for virtual hosts
+that have requirements outside the defaults. You can set up a default virtual host within
+the base `::apache` class, as well as set a customized virtual host as the default.
+Customized virtual hosts have a lower numeric `priority` than the base class's, causing
+Apache to process the customized virtual host first.<br />
+The `apache::vhost` defined type uses `concat::fragment` to build the configuration file. To
+inject custom fragments for pieces of the configuration that the defined type doesn't
+inherently support, add a custom fragment.<br />
+For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples
+of 10, so any `order` that isn't a multiple of 10 should work.<br />
+> **Note:** When creating an `apache::vhost`, it cannot be named `default` or `default-ssl`,
+because vhosts with these titles are always managed by the module. This means that you cannot
+override `Apache::Vhost['default']`  or `Apache::Vhost['default-ssl]` resources. An optional
+workaround is to create a vhost named something else, such as `my default`, and ensure that the
+`default` and `default_ssl` vhosts are set to `false`:
+
+#### Examples
+
+##### 
+
+```puppet
+class { 'apache':
+  default_vhost     => false,
+  default_ssl_vhost => false,
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::vhost` defined type.
+
+##### `apache_version`
+
+Data type: `Any`
+
+Apache's version number as a string, such as '2.2' or '2.4'.
+
+Default value: $::apache::apache_version
+
+##### `access_log`
+
+Data type: `Boolean`
+
+Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
+
+Default value: `true`
+
+##### `access_log_env_var`
+
+Data type: `Any`
+
+Specifies that only requests with particular environment variables be logged.
+
+Default value: `false`
+
+##### `access_log_file`
+
+Data type: `Any`
+
+Sets the filename of the `*_access.log` placed in `logroot`. Given a virtual host ---for
+instance, example.com--- it defaults to 'example.com_ssl.log' for
+[SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
+`example.com_access.log` for unencrypted virtual hosts.
+
+Default value: `false`
+
+##### `access_log_format`
+
+Data type: `Any`
+
+Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the
+access log.
+
+Default value: `false`
+
+##### `access_log_pipe`
+
+Data type: `Any`
+
+Specifies a pipe where Apache sends access log messages.
+
+Default value: `false`
+
+##### `access_log_syslog`
+
+Data type: `Any`
+
+Sends all access log messages to syslog.
+
+Default value: `false`
+
+##### `access_logs`
+
+Data type: `Optional[Array]`
+
+Allows you to give a hash that specifies the state of each of the `access_log_*`
+directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
+
+Default value: `undef`
+
+##### `add_default_charset`
+
+Data type: `Any`
+
+Sets a default media charset value for the `AddDefaultCharset` directive, which is
+added to `text/plain` and `text/html` responses.
+
+Default value: `undef`
+
+##### `add_listen`
+
+Data type: `Any`
+
+Determines whether the virtual host creates a `Listen` statement.<br />
+Setting `add_listen` to `false` prevents the virtual host from creating a `Listen`
+statement. This is important when combining virtual hosts that aren't passed an `ip`
+parameter with those that are.
+
+Default value: `true`
+
+##### `use_optional_includes`
+
+Data type: `Any`
+
+Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for
+`additional_includes` in Apache 2.4 or newer.
+
+Default value: $::apache::use_optional_includes
+
+##### `additional_includes`
+
+Data type: `Any`
+
+Specifies paths to additional static, virtual host-specific Apache configuration files.
+You can use this parameter to implement a unique, custom configuration not supported by
+this module.
+
+Default value: []
+
+##### `aliases`
+
+Data type: `Any`
+
+Passes a list of [hashes][hash] to the virtual host to create `Alias`, `AliasMatch`,
+`ScriptAlias` or `ScriptAliasMatch` directives as per the `mod_alias` documentation.<br />
+For example:
+``` puppet
+aliases => [
+  { aliasmatch       => '^/image/(.*)\.jpg$',
+    path             => '/files/jpg.images/$1.jpg',
+  },
+  { alias            => '/image',
+    path             => '/ftp/pub/image',
+  },
+  { scriptaliasmatch => '^/cgi-bin(.*)',
+    path             => '/usr/local/share/cgi-bin$1',
+  },
+  { scriptalias      => '/nagios/cgi-bin/',
+    path             => '/usr/lib/nagios/cgi-bin/',
+  },
+  { alias            => '/nagios',
+    path             => '/usr/share/nagios/html',
+  },
+],
+```
+For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs
+a corresponding context, such as `<Directory /path/to/directory>` or
+`<Location /some/location/here>`. Puppet creates the directives in the order specified in
+the `aliases` parameter. As described in the `mod_alias` documentation, add more specific
+`alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more
+general ones to avoid shadowing.<BR />
+> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because
+you can precisely control the order of various alias directives. Defining `ScriptAliases`
+using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after
+*all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias`
+directives. This often causes problems; for example, this could cause problems with Nagios.<BR />
+If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias`
+directive might not be able to honor the `PassengerEnabled => off` statement. See
+[this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
+
+Default value: `undef`
+
+##### `allow_encoded_slashes`
+
+Data type: `Optional[Enum['on', 'off', 'nodecode']]`
+
+Sets the `AllowEncodedSlashes` declaration for the virtual host, overriding the server
+default. This modifies the virtual host responses to URLs with `\` and `/` characters. The
+default setting omits the declaration from the server configuration and selects the
+Apache default setting of `Off`.
+
+Default value: `undef`
+
+##### `block`
+
+Data type: `Any`
+
+Specifies the list of things to which Apache blocks access. Valid options are: `scm` (which
+blocks web access to `.svn`), `.git`, and `.bzr` directories.
+
+Default value: []
+
+##### `cas_attribute_prefix`
+
+Data type: `Any`
+
+Adds a header with the value of this header being the attribute values when SAML
+validation is enabled.
+
+Default value: `undef`
+
+##### `cas_attribute_delimiter`
+
+Data type: `Any`
+
+Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
+
+Default value: `undef`
+
+##### `cas_login_url`
+
+Data type: `Any`
+
+Sets the URL to which the module redirects users when they attempt to access a
+CAS-protected resource and don't have an active session.
+
+Default value: `undef`
+
+##### `cas_root_proxied_as`
+
+Data type: `Any`
+
+Sets the URL end users see when access to this Apache server is proxied per vhost.
+This URL should not include a trailing slash.
+
+Default value: `undef`
+
+##### `cas_scrub_request_headers`
+
+Data type: `Any`
+
+Remove inbound request headers that may have special meaning within mod_auth_cas.
+
+Default value: `undef`
+
+##### `cas_sso_enabled`
+
+Data type: `Any`
+
+Enables experimental support for single sign out (may mangle POST data).
+
+Default value: `undef`
+
+##### `cas_validate_saml`
+
+Data type: `Any`
+
+Parse response from CAS server for SAML.
+
+Default value: `undef`
+
+##### `cas_validate_url`
+
+Data type: `Any`
+
+Sets the URL to use when validating a client-presented ticket in an HTTP query string.
+
+Default value: `undef`
+
+##### `comment`
+
+Data type: `Optional[Variant[String,Array[String]]]`
+
+Adds comments to the header of the configuration file. Pass as string or an array of strings.
+For example:
+``` puppet
+comment => "Account number: 123B",
+```
+Or:
+``` puppet
+comment => [
+  "Customer: X",
+  "Frontend domain: x.example.org",
+]
+```
+
+Default value: `undef`
+
+##### `custom_fragment`
+
+Data type: `Optional[String]`
+
+Passes a string of custom configuration directives to place at the end of the virtual
+host configuration.
+
+Default value: `undef`
+
+##### `default_vhost`
+
+Data type: `Boolean`
+
+Sets a given `apache::vhost` defined type as the default to serve requests that do not
+match any other `apache::vhost` defined types.
+
+Default value: `false`
+
+##### `directoryindex`
+
+Data type: `Any`
+
+Sets the list of resources to look for when a client requests an index of the directory
+by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive
+documentation for details.
+
+Default value: ''
+
+##### `docroot`
+
+Data type: `Variant[Boolean,String]`
+
+**Required**.<br />
+Sets the `DocumentRoot` location, from which Apache serves files.<br />
+If `docroot` and `manage_docroot` are both set to `false`, no `DocumentRoot` will be set
+and the accompanying `<Directory /path/to/directory>` block will not be created.
+
+##### `docroot_group`
+
+Data type: `Any`
+
+Sets group access to the `docroot` directory.
+
+Default value: $::apache::params::root_group
+
+##### `docroot_owner`
+
+Data type: `Any`
+
+Sets individual user access to the `docroot` directory.
+
+Default value: 'root'
+
+##### `docroot_mode`
+
+Data type: `Any`
+
+Sets access permissions for the `docroot` directory, in numeric notation.
+
+Default value: `undef`
+
+##### `manage_docroot`
+
+Data type: `Any`
+
+Determines whether Puppet manages the `docroot` directory.
+
+Default value: `true`
+
+##### `error_log`
+
+Data type: `Boolean`
+
+Specifies whether `*_error.log` directives should be configured.
+
+Default value: `true`
+
+##### `error_log_file`
+
+Data type: `Any`
+
+Points the virtual host's error logs to a `*_error.log` file. If this parameter is
+undefined, Puppet checks for values in `error_log_pipe`, then `error_log_syslog`.<br />
+If none of these parameters is set, given a virtual host `example.com`, Puppet defaults
+to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and
+`$logroot/example.com_error.log` for non-SSL virtual hosts.
+
+Default value: `undef`
+
+##### `error_log_pipe`
+
+Data type: `Any`
+
+Specifies a pipe to send error log messages to.<br />
+This parameter has no effect if the `error_log_file` parameter has a value. If neither
+this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
+
+Default value: `undef`
+
+##### `error_log_syslog`
+
+Data type: `Any`
+
+Determines whether to send all error log messages to syslog.
+This parameter has no effect if either of the `error_log_file` or `error_log_pipe`
+parameters has a value. If none of these parameters has a value, given a virtual host
+`example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual
+hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
+
+Default value: `undef`
+
+##### `error_documents`
+
+Data type: `Any`
+
+A list of hashes which can be used to override the
+[ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)
+settings for this virtual host.<br />
+For example:
+``` puppet
+apache::vhost { 'sample.example.net':
+  error_documents => [
+    { 'error_code' => '503', 'document' => '/service-unavail' },
+    { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
+  ],
+}
+```
+
+Default value: []
+
+##### `ensure`
+
+Data type: `Enum['absent', 'present']`
+
+Specifies if the virtual host is present or absent.<br />
+
+Default value: 'present'
+
+##### `fallbackresource`
+
+Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
+
+Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource)
+directive, which specifies an action to take for any URL that doesn't map to anything in
+your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin
+with a `/` or be `disabled`.
+
+Default value: `undef`
+
+##### `fastcgi_server`
+
+Data type: `Any`
+
+Specify an external FastCGI server to manage a connection to.
+
+Default value: `undef`
+
+##### `fastcgi_socket`
+
+Data type: `Any`
+
+Specify the socket that will be used to communicate with an external FastCGI server.
+
+Default value: `undef`
+
+##### `fastcgi_idle_timeout`
+
+Data type: `Any`
+
+If using fastcgi, this option sets the timeout for the server to respond.
+
+Default value: `undef`
+
+##### `fastcgi_dir`
+
+Data type: `Any`
+
+Specify an internal FastCGI directory that is to be managed.
+
+Default value: `undef`
+
+##### `filters`
+
+Data type: `Any`
+
+[Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart,
+context-sensitive configuration of output content filters.
+``` puppet
+apache::vhost { "$::fqdn":
+  filters => [
+    'FilterDeclare   COMPRESS',
+    'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
+    'FilterChain     COMPRESS',
+    'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
+  ],
+}
+```
+
+Default value: `undef`
+
+##### `h2_copy_files`
+
+Data type: `Optional[Boolean]`
+
+Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
+directive which influences how the requestion process pass files to the main connection.
+
+Default value: `undef`
+
+##### `h2_direct`
+
+Data type: `Optional[Boolean]`
+
+Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
+directive which toggles the usage of the HTTP/2 Direct Mode.
+
+Default value: `undef`
+
+##### `h2_early_hints`
+
+Data type: `Optional[Boolean]`
+
+Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2earlyhints)
+directive which controls if HTTP status 103 interim responses are forwarded to
+the client or not.
+
+Default value: `undef`
+
+##### `h2_max_session_streams`
+
+Data type: `Optional[Integer]`
+
+Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2maxsessionstreams)
+directive which sets the maximum number of active streams per HTTP/2 session
+that the server allows.
+
+Default value: `undef`
+
+##### `h2_modern_tls_only`
+
+Data type: `Optional[Boolean]`
+
+Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
+directive which toggles the security checks on HTTP/2 connections in TLS mode.
+
+Default value: `undef`
+
+##### `h2_push`
+
+Data type: `Optional[Boolean]`
+
+Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
+directive which toggles the usage of the HTTP/2 server push protocol feature.
+
+Default value: `undef`
+
+##### `h2_push_diary_size`
+
+Data type: `Optional[Integer]`
+
+Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushdiarysize)
+directive which toggles the maximum number of HTTP/2 server pushes that are
+remembered per HTTP/2 connection.
+
+Default value: `undef`
+
+##### `h2_push_priority`
+
+Data type: `Array[String]`
+
+Sets the [H2PushPriority](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushpriority)
+directive which defines the priority handling of pushed responses based on the
+content-type of the response.
+
+Default value: []
+
+##### `h2_push_resource`
+
+Data type: `Array[String]`
+
+Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource)
+directive which declares resources for early pushing to the client.
+
+Default value: []
+
+##### `h2_serialize_headers`
+
+Data type: `Optional[Boolean]`
+
+Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
+directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
+format for processing by httpd core.
+
+Default value: `undef`
+
+##### `h2_stream_max_mem_size`
+
+Data type: `Optional[Integer]`
+
+Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
+directive which sets the maximum number of outgoing data bytes buffered in
+memory for an active stream.
+
+Default value: `undef`
+
+##### `h2_tls_cool_down_secs`
+
+Data type: `Optional[Integer]`
+
+Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
+directive which sets the number of seconds of idle time on a TLS connection
+before the TLS write size falls back to a small (~1300 bytes) length.
+
+Default value: `undef`
+
+##### `h2_tls_warm_up_size`
+
+Data type: `Optional[Integer]`
+
+Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlswarmupsize)
+directive which sets the number of bytes to be sent in small TLS records (~1300
+bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
+
+Default value: `undef`
+
+##### `h2_upgrade`
+
+Data type: `Optional[Boolean]`
+
+Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2upgrade)
+directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
+to HTTP/2.
+
+Default value: `undef`
+
+##### `h2_window_size`
+
+Data type: `Optional[Integer]`
+
+Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2windowsize)
+directive which sets the size of the window that is used for flow control from
+client to server and limits the amount of data the server has to buffer.
+
+Default value: `undef`
+
+##### `headers`
+
+Data type: `Any`
+
+Adds lines to replace, merge, or remove response headers. See
+[Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
+
+Default value: `undef`
+
+##### `ip`
+
+Data type: `Any`
+
+Sets the IP address the virtual host listens on. By default, uses Apache's default behavior
+of listening on all IPs.
+
+Default value: `undef`
+
+##### `ip_based`
+
+Data type: `Boolean`
+
+Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual
+host. This parameter inhibits the creation of a NameVirtualHost directive, since those are
+used to funnel requests to name-based virtual hosts.
+
+Default value: `false`
+
+##### `itk`
+
+Data type: `Optional[Hash]`
+
+Configures [ITK](http://mpm-itk.sesse.net/) in a hash.<br />
+Usage typically looks something like:
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot => '/path/to/directory',
+  itk     => {
+    user  => 'someuser',
+    group => 'somegroup',
+  },
+}
+```
+Valid values are: a hash, which can include the keys:
+* `user` + `group`
+* `assignuseridexpr`
+* `assigngroupidexpr`
+* `maxclientvhost`
+* `nice`
+* `limituidrange` (Linux 3.5.0 or newer)
+* `limitgidrange` (Linux 3.5.0 or newer)
+
+Default value: `undef`
+
+##### `action`
+
+Data type: `Any`
+
+Specifies whether you wish to configure mod_actions action directive which will
+activate cgi-script when triggered by a request.
+
+Default value: `undef`
+
+##### `jk_mounts`
+
+Data type: `Any`
+
+Sets up a virtual host with `JkMount` and `JkUnMount` directives to handle the paths
+for URL mapping between Tomcat and Apache.<br />
+The parameter must be an array of hashes where each hash must contain the `worker`
+and either the `mount` or `unmount` keys.<br />
+Usage typically looks like:
+``` puppet
+apache::vhost { 'sample.example.net':
+  jk_mounts => [
+    { mount   => '/*',     worker => 'tcnode1', },
+    { unmount => '/*.jpg', worker => 'tcnode1', },
+  ],
+}
+```
+
+Default value: `undef`
+
+##### `http_protocol_options`
+
+Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
+
+Specifies the strictness of HTTP protocol checks.
+
+Default value: `undef`
+
+##### `keepalive`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Determines whether to enable persistent HTTP connections with the `KeepAlive` directive
+for the virtual host. By default, the global, server-wide `KeepAlive` setting is in effect.<br />
+Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options
+for the virtual host.
+
+Default value: `undef`
+
+##### `keepalive_timeout`
+
+Data type: `Any`
+
+Sets the `KeepAliveTimeout` directive for the virtual host, which determines the amount
+of time to wait for subsequent requests on a persistent HTTP connection. By default, the
+global, server-wide `KeepAlive` setting is in effect.<br />
+This parameter is only relevant if either the global, server-wide `keepalive` parameter or
+the per-vhost `keepalive` parameter is enabled.
+
+Default value: `undef`
+
+##### `max_keepalive_requests`
+
+Data type: `Any`
+
+Limits the number of requests allowed per connection to the virtual host. By default,
+the global, server-wide `KeepAlive` setting is in effect.<br />
+This parameter is only relevant if either the global, server-wide `keepalive` parameter or
+the per-vhost `keepalive` parameter is enabled.
+
+Default value: `undef`
+
+##### `auth_kerb`
+
+Data type: `Boolean`
+
+Enable `mod_auth_kerb` parameters for a virtual host.<br />
+Usage typically looks like:
+``` puppet
+apache::vhost { 'sample.example.net':
+  auth_kerb              => `true`,
+  krb_method_negotiate   => 'on',
+  krb_auth_realms        => ['EXAMPLE.ORG'],
+  krb_local_user_mapping => 'on',
+  directories            => {
+    path         => '/var/www/html',
+    auth_name    => 'Kerberos Login',
+    auth_type    => 'Kerberos',
+    auth_require => 'valid-user',
+  },
+}
+```
+
+Default value: `false`
+
+##### `krb_method_negotiate`
+
+Data type: `Any`
+
+Determines whether to use the Negotiate method.
+
+Default value: 'on'
+
+##### `krb_method_k5passwd`
+
+Data type: `Any`
+
+Determines whether to use password-based authentication for Kerberos v5.
+
+Default value: 'on'
+
+##### `krb_authoritative`
+
+Data type: `Any`
+
+If set to `off`, authentication controls can be passed on to another module.
+
+Default value: 'on'
+
+##### `krb_auth_realms`
+
+Data type: `Any`
+
+Specifies an array of Kerberos realms to use for authentication.
+
+Default value: []
+
+##### `krb_5keytab`
+
+Data type: `Any`
+
+Specifies the Kerberos v5 keytab file's location.
+
+Default value: `undef`
+
+##### `krb_local_user_mapping`
+
+Data type: `Any`
+
+Strips @REALM from usernames for further use.
+
+Default value: `undef`
+
+##### `krb_verify_kdc`
+
+Data type: `Any`
+
+This option can be used to disable the verification tickets against local keytab to prevent
+KDC spoofing attacks.
+
+Default value: 'on'
+
+##### `krb_servicename`
+
+Data type: `Any`
+
+Specifies the service name that will be used by Apache for authentication. Corresponding
+key of this name must be stored in the keytab.
+
+Default value: 'HTTP'
+
+##### `krb_save_credentials`
+
+Data type: `Any`
+
+This option enables credential saving functionality.
+
+Default value: 'off'
+
+##### `logroot`
+
+Data type: `Any`
+
+Specifies the location of the virtual host's logfiles.
+
+Default value: $::apache::logroot
+
+##### `logroot_ensure`
+
+Data type: `Enum['directory', 'absent']`
+
+Determines whether or not to remove the logroot directory for a virtual host.
+
+Default value: 'directory'
+
+##### `logroot_mode`
+
+Data type: `Any`
+
+Overrides the mode the logroot directory is set to. Do *not* grant write access to the
+directory the logs are stored in without being aware of the consequences; for more
+information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
+
+Default value: `undef`
+
+##### `logroot_owner`
+
+Data type: `Any`
+
+Sets individual user access to the logroot directory.
+
+Default value: `undef`
+
+##### `logroot_group`
+
+Data type: `Any`
+
+Sets group access to the `logroot` directory.
+
+Default value: `undef`
+
+##### `log_level`
+
+Data type: `Any`
+
+Specifies the verbosity of the error log.
+
+Default value: `undef`
+
+##### `modsec_body_limit`
+
+Data type: `Any`
+
+Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
+
+Default value: `undef`
+
+##### `modsec_disable_vhost`
+
+Data type: `Any`
+
+Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
+
+Default value: `undef`
+
+##### `modsec_disable_ids`
+
+Data type: `Optional[Variant[Hash, Array]]`
+
+Removes `mod_security` IDs from the virtual host.<br />
+Also takes a hash allowing removal of an ID from a specific location.
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_ids => [ 90015, 90016 ],
+}
+```
+
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
+}
+```
+
+Default value: `undef`
+
+##### `modsec_disable_ips`
+
+Data type: `Any`
+
+Specifies an array of IP addresses to exclude from `mod_security` rule matching.
+
+Default value: `undef`
+
+##### `modsec_disable_msgs`
+
+Data type: `Optional[Variant[Hash, Array]]`
+
+Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing
+removal of an Msg from a specific location.
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_msgs => ['Blind SQL Injection Attack', 'Session Fixation Attack'],
+}
+```
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_msgs => { '/location1' => ['Blind SQL Injection Attack', 'Session Fixation Attack'] },
+}
+```
+
+Default value: `undef`
+
+##### `modsec_disable_tags`
+
+Data type: `Optional[Variant[Hash, Array]]`
+
+Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing
+removal of an Tag from a specific location.
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_tags => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'],
+}
+```
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_tags => { '/location1' => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'] },
+}
+```
+
+Default value: `undef`
+
+##### `modsec_audit_log_file`
+
+Data type: `Any`
+
+If set, it is relative to `logroot`.<br />
+One of the parameters that determines how to send `mod_security` audit
+log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
+If none of those parameters are set, the global audit log is used
+(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
+
+Default value: `undef`
+
+##### `modsec_audit_log_pipe`
+
+Data type: `Any`
+
+If `modsec_audit_log_pipe` is set, it should start with a pipe. Example
+`|/path/to/mlogc /path/to/mlogc.conf`.<br />
+One of the parameters that determines how to send `mod_security` audit
+log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
+If none of those parameters are set, the global audit log is used
+(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
+
+Default value: `undef`
+
+##### `modsec_audit_log`
+
+Data type: `Any`
+
+If `modsec_audit_log` is `true`, given a virtual host ---for instance, example.com--- it
+defaults to `example.com\_security\_ssl.log` for SSL-encrypted virtual hosts
+and `example.com\_security.log` for unencrypted virtual hosts.<br />
+One of the parameters that determines how to send `mod_security` audit
+log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).<br />
+If none of those parameters are set, the global audit log is used
+(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
+
+Default value: `undef`
+
+##### `no_proxy_uris`
+
+Data type: `Any`
+
+Specifies URLs you do not want to proxy. This parameter is meant to be used in combination
+with [`proxy_dest`](#proxy_dest).
+
+Default value: []
+
+##### `no_proxy_uris_match`
+
+Data type: `Any`
+
+This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
+
+Default value: []
+
+##### `proxy_preserve_host`
+
+Data type: `Any`
+
+Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost).<br />
+Setting this parameter to `true` enables the `Host:` line from an incoming request to be
+proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
+
+Default value: `false`
+
+##### `proxy_add_headers`
+
+Data type: `Any`
+
+Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders).<br />
+This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For,
+X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
+
+Default value: `undef`
+
+##### `proxy_error_override`
+
+Data type: `Any`
+
+Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride).
+This directive controls whether Apache should override error pages for proxied content.
+
+Default value: `false`
+
+##### `options`
+
+Data type: `Any`
+
+Sets the `Options` for the specified virtual host. For example:
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  options => ['Indexes','FollowSymLinks','MultiViews'],
+}
+```
+> **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options',
+'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
+
+Default value: ['Indexes','FollowSymLinks','MultiViews']
+
+##### `override`
+
+Data type: `Any`
+
+Sets the overrides for the specified virtual host. Accepts an array of
+[AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
+
+Default value: ['None']
+
+##### `passenger_enabled`
+
+Data type: `Optional[Boolean]`
+
+Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled)
+directive to `on` or `off`. Requires `apache::mod::passenger` to be included.
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      passenger_enabled => 'on',
+    },
+  ],
+}
+```
+> **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)
+using the PassengerEnabled directive with the PassengerHighPerformance directive.
+
+Default value: `undef`
+
+##### `passenger_base_uri`
+
+Data type: `Optional[String]`
+
+Sets [PassengerBaseURI](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbase_rui),
+ to specify that the given URI is a distinct application served by Passenger.
+
+Default value: `undef`
+
+##### `passenger_ruby`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby),
+specifying the Ruby interpreter to use when serving the relevant web applications.
+
+Default value: `undef`
+
+##### `passenger_python`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Sets [PassengerPython](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpython),
+specifying the Python interpreter to use when serving the relevant web applications.
+
+Default value: `undef`
+
+##### `passenger_nodejs`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs),
+specifying Node.js command to use when serving the relevant web applications.
+
+Default value: `undef`
+
+##### `passenger_meteor_app_settings`
+
+Data type: `Optional[String]`
+
+Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/library/config/apache/reference/#passengermeteorappsettings),
+specifying a JSON file with settings for the application when using a Meteor
+application in non-bundled mode.
+
+Default value: `undef`
+
+##### `passenger_app_env`
+
+Data type: `Optional[String]`
+
+Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv),
+the environment for the Passenger application. If not specified, defaults to the global
+setting or 'production'.
+
+Default value: `undef`
+
+##### `passenger_app_root`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot),
+the location of the Passenger application root if different from the DocumentRoot.
+
+Default value: `undef`
+
+##### `passenger_app_group_name`
+
+Data type: `Optional[String]`
+
+Sets [PassengerAppGroupName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappgroupname),
+ the name of the application group that the current application should belong to.
+
+Default value: `undef`
+
+##### `passenger_app_type`
+
+Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
+
+Sets [PassengerAppType](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapptype),
+ to force Passenger to recognize the application as a specific type.
+
+Default value: `undef`
+
+##### `passenger_startup_file`
+
+Data type: `Optional[String]`
+
+Sets the [PassengerStartupFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile)
+path. This path is relative to the application root.
+
+Default value: `undef`
+
+##### `passenger_restart_dir`
+
+Data type: `Optional[String]`
+
+Sets the [PassengerRestartDir](https://www.phusionpassenger.com/library/config/apache/reference/#passengerrestartdir)
+ to customize the directory in which `restart.txt` is searched for.
+
+Default value: `undef`
+
+##### `passenger_spawn_method`
+
+Data type: `Optional[Enum['direct', 'smart']]`
+
+Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod),
+whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
+
+Default value: `undef`
+
+##### `passenger_load_shell_envvars`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloadshellenvvars),
+to enable or disable the loading of shell environment variables before spawning the application.
+
+Default value: `undef`
+
+##### `passenger_rolling_restarts`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/library/config/apache/reference/#passengerrollingrestarts),
+to enable or disable support for zero-downtime application restarts through `restart.txt`.
+
+Default value: `undef`
+
+##### `passenger_resist_deployment_errors`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/library/config/apache/reference/#passengerresistdeploymenterrors),
+to enable or disable resistance against deployment errors.
+
+Default value: `undef`
+
+##### `passenger_user`
+
+Data type: `Optional[String]`
+
+Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser),
+the running user for sandboxing applications.
+
+Default value: `undef`
+
+##### `passenger_group`
+
+Data type: `Optional[String]`
+
+Sets [PassengerGroup](https://www.phusionpassenger.com/library/config/apache/reference/#passengergroup),
+the running group for sandboxing applications.
+
+Default value: `undef`
+
+##### `passenger_friendly_error_pages`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/library/config/apache/reference/#passengerfriendlyerrorpages),
+which can display friendly error pages whenever an application fails to start. This
+friendly error page presents the startup error message, some suggestions for solving
+the problem, a backtrace and a dump of the environment variables.
+
+Default value: `undef`
+
+##### `passenger_min_instances`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances),
+the minimum number of application processes to run.
+
+Default value: `undef`
+
+##### `passenger_max_instances`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerMaxInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstances),
+the maximum number of application processes to run.
+
+Default value: `undef`
+
+##### `passenger_max_preloader_idle_time`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpreloaderidletime),
+the maximum amount of time the preloader waits before shutting down an idle process.
+
+Default value: `undef`
+
+##### `passenger_force_max_concurrent_requests_per_process`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/library/config/apache/reference/#passengerforcemaxconcurrentrequestsperprocess),
+the maximum amount of concurrent requests the application can handle per process.
+
+Default value: `undef`
+
+##### `passenger_start_timeout`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout),
+the timeout for the application startup.
+
+Default value: `undef`
+
+##### `passenger_concurrency_model`
+
+Data type: `Optional[Enum['process', 'thread']]`
+
+Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerconcurrencyodel),
+to specify the I/O concurrency model that should be used for Ruby application processes.
+Passenger supports two concurrency models:<br />
+* `process` – single-threaded, multi-processed I/O concurrency.
+* `thread` – multi-threaded, multi-processed I/O concurrency.
+
+Default value: `undef`
+
+##### `passenger_thread_count`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerThreadCount](https://www.phusionpassenger.com/library/config/apache/reference/#passengerthreadcount),
+the number of threads that Passenger should spawn per Ruby application process.<br />
+This option only has effect if PassengerConcurrencyModel is `thread`.
+
+Default value: `undef`
+
+##### `passenger_max_requests`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests),
+the maximum number of requests an application process will process.
+
+Default value: `undef`
+
+##### `passenger_max_request_time`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequesttime),
+the maximum amount of time, in seconds, that an application process may take to
+process a request.
+
+Default value: `undef`
+
+##### `passenger_memory_limit`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/library/config/apache/reference/#passengermemorylimit),
+the maximum amount of memory that an application process may use, in megabytes.
+
+Default value: `undef`
+
+##### `passenger_stat_throttle_rate`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstatthrottlerate),
+to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
+
+Default value: `undef`
+
+##### `passenger_pre_start`
+
+Data type: `Optional[Variant[String,Array[String]]]`
+
+Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart),
+the URL of the application if pre-starting is required.
+
+Default value: `undef`
+
+##### `passenger_high_performance`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerHighPerformance](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance),
+to enhance performance in return for reduced compatibility.
+
+Default value: `undef`
+
+##### `passenger_buffer_upload`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerBufferUpload](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbufferupload),
+to buffer HTTP client request bodies before they are sent to the application.
+
+Default value: `undef`
+
+##### `passenger_buffer_response`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerBufferResponse](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbufferresponse),
+to buffer Happlication-generated responses.
+
+Default value: `undef`
+
+##### `passenger_error_override`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerErrorOverride](https://www.phusionpassenger.com/library/config/apache/reference/#passengererroroverride),
+to specify whether Apache will intercept and handle response with HTTP status codes of
+400 and higher.
+
+Default value: `undef`
+
+##### `passenger_max_request_queue_size`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize),
+to specify the maximum amount of requests that are allowed to queue whenever the maximum
+concurrent request limit is reached. If the queue is already at this specified limit, then
+Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
+A value of 0 means that the queue size is unbounded.
+
+Default value: `undef`
+
+##### `passenger_max_request_queue_time`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuetime),
+to specify the maximum amount of time that requests are allowed to stay in the queue
+whenever the maximum concurrent request limit is reached. If a request reaches this specified
+limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
+A value of 0 means that the queue time is unbounded.
+
+Default value: `undef`
+
+##### `passenger_sticky_sessions`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerStickySessions](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions),
+to specify that, whenever possible, all requests sent by a client will be routed to the same
+originating application process.
+
+Default value: `undef`
+
+##### `passenger_sticky_sessions_cookie_name`
+
+Data type: `Optional[String]`
+
+Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessionscookiename),
+to specify the name of the sticky sessions cookie.
+
+Default value: `undef`
+
+##### `passenger_allow_encoded_slashes`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/library/config/apache/reference/#passengerallowencodedslashes),
+to allow URLs with encoded slashes. Please note that this feature will not work properly
+unless Apache's `AllowEncodedSlashes` is also enabled.
+
+Default value: `undef`
+
+##### `passenger_debugger`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerDebugger](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdebugger),
+to turn support for Ruby application debugging on or off.
+
+Default value: `undef`
+
+##### `passenger_lve_min_uid`
+
+Data type: `Optional[Integer]`
+
+Sets [PassengerLveMinUid](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlveminuid),
+to only allow the spawning of application processes with UIDs equal to, or higher than, this
+specified value on LVE-enabled kernels.
+
+Default value: `undef`
+
+##### `php_values`
+
+Data type: `Any`
+
+Allows per-virtual host setting [`php_value`s](http://php.net/manual/en/configuration.changes.php).
+These flags or values can be overwritten by a user or an application.
+Within a vhost declaration:
+``` puppet
+  php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
+```
+
+Default value: {}
+
+##### `php_flags`
+
+Data type: `Any`
+
+Allows per-virtual host setting [`php_flags\``](http://php.net/manual/en/configuration.changes.php).
+These flags or values can be overwritten by a user or an application.
+
+Default value: {}
+
+##### `php_admin_values`
+
+Data type: `Any`
+
+Allows per-virtual host setting [`php_admin_value`](http://php.net/manual/en/configuration.changes.php).
+These flags or values cannot be overwritten by a user or an application.
+
+Default value: {}
+
+##### `php_admin_flags`
+
+Data type: `Any`
+
+Allows per-virtual host setting [`php_admin_flag`](http://php.net/manual/en/configuration.changes.php).
+These flags or values cannot be overwritten by a user or an application.
+
+Default value: {}
+
+##### `port`
+
+Data type: `Any`
+
+Sets the port the host is configured on. The module's defaults ensure the host listens
+on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only
+listens on the port set in this parameter.
+
+Default value: `undef`
+
+##### `priority`
+
+Data type: `Any`
+
+Sets the relative load-order for Apache HTTPD VirtualHost configuration files.<br />
+If nothing matches the priority, the first name-based virtual host is used. Likewise,
+passing a higher priority causes the alphabetically first name-based virtual host to be
+used if no other names match.<br />
+> **Note:** You should not need to use this parameter. However, if you do use it, be
+aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
+To omit the priority prefix in file names, pass a priority of `false`.
+
+Default value: `undef`
+
+##### `protocols`
+
+Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
+
+Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols)
+directive, which lists available protocols for the virutal host.
+
+Default value: []
+
+##### `protocols_honor_order`
+
+Data type: `Optional[Boolean]`
+
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
+directive which determines wether the order of Protocols sets precedence during negotiation.
+
+Default value: `undef`
+
+##### `proxy_dest`
+
+Data type: `Any`
+
+Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
+
+Default value: `undef`
+
+##### `proxy_pass`
+
+Data type: `Any`
+
+Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)
+configuration. Optionally, parameters can be added as an array.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  proxy_pass => [
+    { 'path' => '/a', 'url' => 'http://backend-a/' },
+    { 'path' => '/b', 'url' => 'http://backend-b/' },
+    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
+    { 'path' => '/l', 'url' => 'http://backend-xy',
+      'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
+    { 'path' => '/d', 'url' => 'http://backend-a/d',
+      'params' => { 'retry' => '0', 'timeout' => '5' }, },
+    { 'path' => '/e', 'url' => 'http://backend-a/e',
+      'keywords' => ['nocanon', 'interpolate'] },
+    { 'path' => '/f', 'url' => 'http://backend-f/',
+      'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+    { 'path' => '/g', 'url' => 'http://backend-g/',
+      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
+    { 'path' => '/h', 'url' => 'http://backend-h/h',
+      'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
+  ],
+}
+```
+* `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string.
+* `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
+* `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
+* `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
+
+Default value: `undef`
+
+##### `proxy_dest_match`
+
+Data type: `Any`
+
+This directive is equivalent to `proxy_dest`, but takes regular expressions, see
+[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+for details.
+
+Default value: `undef`
+
+##### `proxy_dest_reverse_match`
+
+Data type: `Any`
+
+Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
+[ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
+for details.
+
+Default value: `undef`
+
+##### `proxy_pass_match`
+
+Data type: `Any`
+
+This directive is equivalent to `proxy_pass`, but takes regular expressions, see
+[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+for details.
+
+Default value: `undef`
+
+##### `redirect_dest`
+
+Data type: `Any`
+
+Specifies the address to redirect to.
+
+Default value: `undef`
+
+##### `redirect_source`
+
+Data type: `Any`
+
+Specifies the source URIs that redirect to the destination specified in `redirect_dest`.
+If more than one item for redirect is supplied, the source and destination must be the same
+length, and the items are order-dependent.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  redirect_source => ['/images','/downloads'],
+  redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+}
+```
+
+Default value: '/'
+
+##### `redirect_status`
+
+Data type: `Any`
+
+Specifies the status to append to the redirect.
+``` puppet
+  apache::vhost { 'site.name.fdqn':
+  …
+  redirect_status => ['temp','permanent'],
+}
+```
+
+Default value: `undef`
+
+##### `redirectmatch_regexp`
+
+Data type: `Any`
+
+Determines which server status should be raised for a given regular expression
+and where to forward the user to. Entered as an array alongside redirectmatch_status
+and redirectmatch_dest.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+}
+```
+
+Default value: `undef`
+
+##### `redirectmatch_status`
+
+Data type: `Any`
+
+Determines which server status should be raised for a given regular expression
+and where to forward the user to. Entered as an array alongside redirectmatch_regexp
+and redirectmatch_dest.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+}
+```
+
+Default value: `undef`
+
+##### `redirectmatch_dest`
+
+Data type: `Any`
+
+Determines which server status should be raised for a given regular expression
+and where to forward the user to. Entered as an array alongside redirectmatch_status
+and redirectmatch_regexp.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+}
+```
+
+Default value: `undef`
+
+##### `request_headers`
+
+Data type: `Any`
+
+Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader)
+in various ways, including adding additional request headers, removing request headers,
+and so on.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  request_headers => [
+    'append MirrorID "mirror 12"',
+    'unset MirrorID',
+  ],
+}
+```
+
+Default value: `undef`
+
+##### `rewrites`
+
+Data type: `Optional[Array]`
+
+Creates URL rewrite rules. Expects an array of hashes.<br />
+Valid Hash keys include `comment`, `rewrite_base`, `rewrite_cond`, `rewrite_rule`
+or `rewrite_map`.<br />
+For example, you can specify that anyone trying to access index.html is served welcome.html
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
+}
+```
+The parameter allows rewrite conditions that, when `true`, execute the associated rule.
+For instance, if you wanted to rewrite URLs only if the visitor is using IE
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'redirect IE',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
+```
+You can also apply multiple conditions. For instance, rewrite index.html to welcome.html
+only when the browser is Lynx or Mozilla (version 1 or 2)
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
+```
+Multiple rewrites and conditions are also possible
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+    {
+      comment      => 'Internet Explorer',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+    },
+    {
+      rewrite_base => /apps/,
+      rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
+    },
+    { comment      => 'Rewrite to lower case',
+      rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
+      rewrite_map  => ['lc int:tolower'],
+      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+    },
+  ],
+}
+```
+Refer to the [`mod_rewrite` documentation](https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html)
+for more details on what is possible with rewrite rules and conditions.<br />
+> **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite`
+and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather
+than setting the rewrites in the virtual host's directories.
+
+Default value: `undef`
+
+##### `rewrite_base`
+
+Data type: `Any`
+
+The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase)
+specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
+that substitue a relative path.
+
+Default value: `undef`
+
+##### `rewrite_rule`
+
+Data type: `Any`
+
+The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
+allows the user to define the rules that will be used by the rewrite engine.
+
+Default value: `undef`
+
+##### `rewrite_cond`
+
+Data type: `Any`
+
+The parameter [`rewrite_cond`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritecond)
+defines a rule condition, that when satisfied will implement that rule within the
+rewrite engine.
+
+Default value: `undef`
+
+##### `rewrite_inherit`
+
+Data type: `Any`
+
+Determines whether the virtual host inherits global rewrite rules.<br />
+Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or
+inside the virtual host `.conf` file. By default, virtual hosts do not inherit
+global settings. To activate inheritance, specify the `rewrites` parameter and set
+`rewrite_inherit` parameter to `true`:
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  …
+  rewrites => [
+    <rules>,
+  ],
+  rewrite_inherit => `true`,
+}
+```
+> **Note**: The `rewrites` parameter is **required** for this to have effect<br />
+Apache activates global `Rewrite` rules inheritance if the virtual host files contains
+the following directives:
+``` ApacheConf
+RewriteEngine On
+RewriteOptions Inherit
+```
+Refer to the official [`mod_rewrite`](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)
+documentation, section "Rewriting in Virtual Hosts".
+
+Default value: `false`
+
+##### `scriptalias`
+
+Data type: `Any`
+
+Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
+'/usr/scripts'.
+
+Default value: `undef`
+
+##### `scriptaliases`
+
+Data type: `Any`
+
+> **Note**: This parameter is deprecated in favor of the `aliases` parameter.<br />
+Passes an array of hashes to the virtual host to create either ScriptAlias or
+ScriptAliasMatch statements per the `mod_alias` documentation.
+``` puppet
+scriptaliases => [
+  {
+    alias => '/myscript',
+    path  => '/usr/share/myscript',
+  },
+  {
+    aliasmatch => '^/foo(.*)',
+    path       => '/usr/share/fooscripts$1',
+  },
+  {
+    aliasmatch => '^/bar/(.*)',
+    path       => '/usr/share/bar/wrapper.sh/$1',
+  },
+  {
+    alias => '/neatscript',
+    path  => '/usr/share/neatscript',
+  },
+]
+```
+The ScriptAlias and ScriptAliasMatch directives are created in the order specified.
+As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases
+before more general ones to avoid shadowing.
+
+Default value: []
+
+##### `serveradmin`
+
+Data type: `Any`
+
+Specifies the email address Apache displays when it renders one of its error pages.
+
+Default value: `undef`
+
+##### `serveraliases`
+
+Data type: `Any`
+
+Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias)
+of the site.
+
+Default value: []
+
+##### `servername`
+
+Data type: `Any`
+
+Sets the servername corresponding to the hostname you connect to the virtual host at.
+
+Default value: $name
+
+##### `setenv`
+
+Data type: `Any`
+
+Used by HTTPD to set environment variables for virtual hosts.<br />
+Example:
+``` puppet
+apache::vhost { 'setenv.example.com':
+  setenv => ['SPECIAL_PATH /foo/bin'],
+}
+```
+
+Default value: []
+
+##### `setenvif`
+
+Data type: `Any`
+
+Used by HTTPD to conditionally set environment variables for virtual hosts.
+
+Default value: []
+
+##### `setenvifnocase`
+
+Data type: `Any`
+
+Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
+
+Default value: []
+
+##### `suexec_user_group`
+
+Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
+
+Allows the spcification of user and group execution privileges for CGI programs through
+inclusion of the `mod_suexec` module.
+
+Default value: `undef`
+
+##### `suphp_addhandler`
+
+Data type: `Any`
+
+Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+working together with suphp_configpath and suphp_engine.<br />
+An example virtual host configuration with suPHP:
+``` puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => { path => '/home/appuser/myphpapp',
+    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
+```
+
+Default value: $::apache::params::suphp_addhandler
+
+##### `suphp_configpath`
+
+Data type: `Any`
+
+Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+working together with suphp_addhandler and suphp_engine.<br />
+An example virtual host configuration with suPHP:
+``` puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => { path => '/home/appuser/myphpapp',
+    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
+```
+
+Default value: $::apache::params::suphp_configpath
+
+##### `suphp_engine`
+
+Data type: `Enum['on', 'off']`
+
+Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+working together with suphp_configpath and suphp_addhandler.<br />
+An example virtual host configuration with suPHP:
+``` puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => { path => '/home/appuser/myphpapp',
+    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
+```
+
+Default value: $::apache::params::suphp_engine
+
+##### `vhost_name`
+
+Data type: `Any`
+
+Enables name-based virtual hosting. If no IP is passed to the virtual host, but the
+virtual host is assigned a port, then the virtual host name is `vhost_name:port`.
+If the virtual host has no assigned IP or port, the virtual host name is set to the
+title of the resource.
+
+Default value: '*'
+
+##### `virtual_docroot`
+
+Data type: `Any`
+
+Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the
+same name. For example, `http://example.com` would map to `/var/www/example.com`.
+``` puppet
+apache::vhost { 'subdomain.loc':
+  vhost_name      => '*',
+  port            => '80',
+  virtual_docroot => '/var/www/%-2+',
+  docroot         => '/var/www',
+  serveraliases   => ['*.loc',],
+}
+```
+
+Default value: `false`
+
+##### `wsgi_daemon_process`
+
+Data type: `Optional[Variant[String,Hash]]`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process_options, wsgi_process_group,
+wsgi_script_aliases and wsgi_pass_authorization.<br />
+A hash that sets the name of the WSGI daemon, accepting
+[certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html).<br />
+An example virtual host configuration with WSGI:
+``` puppet
+apache::vhost { 'wsgi.example.com':
+  port                        => '80',
+  docroot                     => '/var/www/pythonapp',
+  wsgi_daemon_process         => 'wsgi',
+  wsgi_daemon_process_options =>
+    { processes    => '2',
+      threads      => '15',
+      display-name => '%{GROUP}',
+    },
+  wsgi_process_group          => 'wsgi',
+  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+  wsgi_chunked_request        => 'On',
+}
+```
+
+Default value: `undef`
+
+##### `wsgi_daemon_process_options`
+
+Data type: `Optional[Hash]`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_process_group,
+wsgi_script_aliases and wsgi_pass_authorization.<br />
+Sets the group ID that the virtual host runs under.
+
+Default value: `undef`
+
+##### `wsgi_application_group`
+
+Data type: `Any`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+This parameter defines the [`WSGIApplicationGroup directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIApplicationGroup.html),
+thus allowing you to specify which application group the WSGI application belongs to,
+with all WSGI applications within the same group executing within the context of the
+same Python sub interpreter.
+
+Default value: `undef`
+
+##### `wsgi_import_script`
+
+Data type: `Any`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
+which can be used in order to specify a script file to be loaded upon a process starting.
+
+Default value: `undef`
+
+##### `wsgi_import_script_options`
+
+Data type: `Optional[Hash]`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
+which can be used in order to specify a script file to be loaded upon a process starting.<br />
+Specifies the process and aplication groups of the script.
+
+Default value: `undef`
+
+##### `wsgi_chunked_request`
+
+Data type: `Any`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+This parameter defines the [`WSGIChunkedRequest directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIChunkedRequest.html),
+allowing you to enable support for chunked request content.<br />
+WSGI is technically incapable of supporting chunked request content without all chunked
+request content having first been read in and buffered.
+
+Default value: `undef`
+
+##### `wsgi_process_group`
+
+Data type: `Any`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options,
+wsgi_script_aliases and wsgi_pass_authorization.<br />
+Requires a hash of web paths to filesystem `.wsgi paths/`.
+
+Default value: `undef`
+
+##### `wsgi_script_aliases`
+
+Data type: `Optional[Hash]`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
+For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
+
+Default value: `undef`
+
+##### `wsgi_script_aliases_match`
+
+Data type: `Optional[Hash]`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
+This directive is similar to `wsgi_script_aliases`, but makes use of regular expressions
+in place of simple prefix matching.<br />
+For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
+
+Default value: `undef`
+
+##### `wsgi_pass_authorization`
+
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
+wsgi_script_aliases.<br />
+Enables support for chunked requests.
+
+Default value: `undef`
+
+##### `directories`
+
+Data type: `Optional[Variant[Hash, Array[Variant[Array,Hash]]]]`
+
+The `directories` parameter within the `apache::vhost` class passes an array of hashes
+to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory),
+[File](https://httpd.apache.org/docs/current/mod/core.html#files), and
+[Location](https://httpd.apache.org/docs/current/mod/core.html#location) directive blocks.
+These blocks take the form, `< Directory /path/to/directory>...< /Directory>`.<br />
+The `path` key sets the path for the directory, files, and location blocks. Its value
+must be a path for the `directory`, `files`, and `location` providers, or a regex for
+the `directorymatch`, `filesmatch`, or `locationmatch` providers. Each hash passed to
+`directories` **must** contain `path` as one of the keys.<br />
+The `provider` key is optional. If missing, this key defaults to `directory`.
+ Values: `directory`, `files`, `proxy`, `location`, `directorymatch`, `filesmatch`,
+`proxymatch` or `locationmatch`. If you set `provider` to `directorymatch`, it
+uses the keyword `DirectoryMatch` in the Apache config file.<br />
+An example use of `directories`:
+``` puppet
+apache::vhost { 'files.example.net':
+  docroot     => '/var/www/files',
+  directories => [
+    { 'path'     => '/var/www/files',
+      'provider' => 'files',
+      'deny'     => 'from all',
+    },
+  ],
+}
+```
+> **Note:** At least one directory should match the `docroot` parameter. After you
+start declaring directories, `apache::vhost` assumes that all required Directory blocks
+will be declared. If not defined, a single default Directory block is created that matches
+the `docroot` parameter.<br />
+Available handlers, represented as keys, should be placed within the `directory`,
+`files`, or `location` hashes. This looks like
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [ { path => '/path/to/directory', handler => value } ],
+}
+```
+Any handlers you do not set in these hashes are considered `undefined` within Puppet and
+are not added to the virtual host, resulting in the module using their default values.
+
+Default value: `undef`
+
+##### `custom_fragment`
+
+Pass a string of custom configuration directives to be placed at the end of the directory
+configuration.
+``` puppet
+apache::vhost { 'monitor':
+  …
+  directories => [
+    {
+      path => '/path/to/directory',
+      custom_fragment => '
+<Location /balancer-manager>
+  SetHandler balancer-manager
+  Order allow,deny
+  Allow from all
+</Location>
+<Location /server-status>
+  SetHandler server-status
+  Order allow,deny
+  Allow from all
+</Location>
+ProxyStatus On',
+    },
+  ]
+}
+```
+
+Default value: `undef`
+
+##### `error_documents`
+
+An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)
+settings for the directory.
+``` puppet
+apache::vhost { 'sample.example.net':
+  directories => [
+    { path            => '/srv/www',
+      error_documents => [
+        { 'error_code' => '503',
+          'document'   => '/service-unavail',
+        },
+      ],
+    },
+  ],
+}
+```
+
+Default value: []
+
+##### `h2_copy_files`
+
+Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.<br />
+Note that you must declare `class {'apache::mod::http2': }` before using this directive.
+
+Default value: `undef`
+
+##### `h2_push_resource`
+
+Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.<br />
+Note that you must declare `class {'apache::mod::http2': }` before using this directive.
+
+Default value: []
+
+##### `headers`
+
+Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => {
+    path    => '/path/to/directory',
+    headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+  },
+}
+```
+
+Default value: `undef`
+
+##### `options`
+
+Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the
+given Directory block.
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      options => ['Indexes','FollowSymLinks','MultiViews'],
+    },
+  ],
+}
+```
+
+Default value: ['Indexes','FollowSymLinks','MultiViews']
+
+##### `shib_compat_valid_user`
+
+Data type: `Optional[String]`
+
+Default is Off, matching the behavior prior to this command's existence. Addresses a conflict
+when using Shibboleth in conjunction with other auth/auth modules by restoring `standard`
+Apache behavior when processing the `valid-user` and `user` Require rules. See the
+[`mod_shib`documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions),
+and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess)
+topic for more details. This key is disabled if `apache::mod::shib` is not defined.
+
+Default value: `undef`
+
+##### `ssl_options`
+
+Data type: `Any`
+
+String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions),
+which configure SSL engine run-time options. This handler takes precedence over SSLOptions
+set in the parent block of the virtual host.
+``` puppet
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      ssl_options => '+ExportCertData',
+    },
+    { path        => '/path/to/different/dir',
+      ssl_options => ['-StdEnvVars', '+ExportCertData'],
+    },
+  ],
+}
+```
+
+Default value: `undef`
+
+##### `additional_includes`
+
+Specifies paths to additional static, specific Apache configuration files in virtual
+host directories.
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/different/dir',
+      additional_includes => ['/custom/path/includes', '/custom/path/another_includes',],
+    },
+  ],
+}
+```
+
+Default value: []
+
+##### `ssl`
+
+Data type: `Boolean`
+
+Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
+
+Default value: `false`
+
+##### `ssl_ca`
+
+Data type: `Any`
+
+Specifies the SSL certificate authority to be used to verify client certificates used
+for authentication. You must also set `ssl_verify_client` to use this.
+
+Default value: $::apache::default_ssl_ca
+
+##### `ssl_cert`
+
+Data type: `Any`
+
+Specifies the SSL certification.
+
+Default value: $::apache::default_ssl_cert
+
+##### `ssl_protocol`
+
+Data type: `Any`
+
+Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol).
+Expects an array or space separated string of accepted protocols.
+
+Default value: `undef`
+
+##### `ssl_cipher`
+
+Data type: `Any`
+
+Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
+
+Default value: `undef`
+
+##### `ssl_honorcipherorder`
+
+Data type: `Any`
+
+Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder),
+to cause Apache to use the server's preferred order of ciphers rather than the client's
+preferred order.
+
+Default value: `undef`
+
+##### `ssl_certs_dir`
+
+Data type: `Any`
+
+Specifies the location of the SSL certification directory to verify client certs. Will not
+be used unless `ssl_verify_client` is also set (see below).
+
+Default value: $::apache::params::ssl_certs_dir
+
+##### `ssl_chain`
+
+Data type: `Any`
+
+Specifies the SSL chain. This default works out of the box, but it must be updated in
+the base `apache` class with your specific certificate information before being used in
+production.
+
+Default value: $::apache::default_ssl_chain
+
+##### `ssl_crl`
+
+Data type: `Any`
+
+Specifies the certificate revocation list to use. (This default works out of the box but
+must be updated in the base `apache` class with your specific certificate information
+before being used in production.)
+
+Default value: $::apache::default_ssl_crl
+
+##### `ssl_crl_path`
+
+Data type: `Any`
+
+Specifies the location of the certificate revocation list to verify certificates for
+client authentication with. (This default works out of the box but must be updated in
+the base `apache` class with your specific certificate information before being used in
+production.)
+
+Default value: $::apache::default_ssl_crl_path
+
+##### `ssl_crl_check`
+
+Data type: `Any`
+
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck)
+for ssl client authentication. The default works out of the box but must be specified when
+using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on
+older versions.
+
+Default value: $::apache::default_ssl_crl_check
+
+##### `ssl_key`
+
+Data type: `Any`
+
+Specifies the SSL key.<br />
+Defaults are based on your operating system. Default work out of the box but must be
+updated in the base `apache` class with your specific certificate information before
+being used in production.
+
+Default value: $::apache::default_ssl_key
+
+##### `ssl_verify_client`
+
+Data type: `Any`
+
+Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient)
+directive, which sets the certificate verification level for client authentication.
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_verify_client => 'optional',
+}
+```
+
+Default value: `undef`
+
+##### `ssl_verify_depth`
+
+Data type: `Any`
+
+Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth)
+directive, which specifies the maximum depth of CA certificates in client certificate
+verification. You must set `ssl_verify_client` for it to take effect.
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_verify_client => 'require',
+  ssl_verify_depth => 1,
+}
+```
+
+Default value: `undef`
+
+##### `ssl_proxy_protocol`
+
+Data type: `Any`
+
+Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol)
+directive, which controls which SSL protocol flavors `mod_ssl` should use when establishing
+its server environment for proxy. It connects to servers using only one of the provided
+protocols.
+
+Default value: `undef`
+
+##### `ssl_proxy_verify`
+
+Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
+
+Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify)
+directive, which configures certificate verification of the remote server when a proxy is
+configured to forward requests to a remote SSL server.
+
+Default value: `undef`
+
+##### `ssl_proxy_verify_depth`
+
+Data type: `Optional[Integer[0]]`
+
+Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth)
+directive, which configures how deeply mod_ssl should verify before deciding that the
+remote server does not have a valid certificate.<br />
+A depth of 0 means that only self-signed remote server certificates are accepted,
+the default depth of 1 means the remote server certificate can be self-signed or
+signed by a CA that is directly known to the server.
+
+Default value: `undef`
+
+##### `ssl_proxy_cipher_suite`
+
+Data type: `Any`
+
+Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)
+directive, which controls cipher suites supported for ssl proxy traffic.
+
+Default value: `undef`
+
+##### `ssl_proxy_ca_cert`
+
+Data type: `Any`
+
+Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile)
+directive, which specifies an all-in-one file where you can assemble the Certificates
+of Certification Authorities (CA) whose remote servers you deal with. These are used
+for Remote Server Authentication. This file should be a concatenation of the PEM-encoded
+certificate files in order of preference.
+
+Default value: `undef`
+
+##### `ssl_proxy_machine_cert`
+
+Data type: `Any`
+
+Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile)
+directive, which specifies an all-in-one file where you keep the certs and keys used
+for this server to authenticate itself to remote servers. This file should be a
+concatenation of the PEM-encoded certificate files in order of preference.
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
+}
+```
+
+Default value: `undef`
+
+##### `ssl_proxy_check_peer_cn`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn)
+directive, which specifies whether the remote server certificate's CN field is compared
+against the hostname of the request URL.
+
+Default value: `undef`
+
+##### `ssl_proxy_check_peer_name`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername)
+directive, which specifies whether the remote server certificate's CN field is compared
+against the hostname of the request URL.
+
+Default value: `undef`
+
+##### `ssl_proxy_check_peer_expire`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire)
+directive, which specifies whether the remote server certificate is checked for expiration
+or not.
+
+Default value: `undef`
+
+##### `ssl_options`
+
+Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)
+directive, which configures various SSL engine run-time options. This is the global
+setting for the given virtual host and can be a string or an array.<br />
+A string:
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_options => '+ExportCertData',
+}
+```
+An array:
+``` puppet
+apache::vhost { 'sample.example.net':
+  …
+  ssl_options => ['+StrictRequire', '+ExportCertData'],
+}
+```
+
+Default value: `undef`
+
+##### `ssl_openssl_conf_cmd`
+
+Data type: `Any`
+
+Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)
+directive, which provides direct configuration of OpenSSL parameters.
+
+Default value: `undef`
+
+##### `ssl_proxyengine`
+
+Data type: `Boolean`
+
+Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
+
+Default value: `false`
+
+##### `ssl_stapling`
+
+Data type: `Optional[Boolean]`
+
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling).
+By default, uses what is set globally.<br />
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
+Default value: `undef`
+
+##### `ssl_stapling_timeout`
+
+Data type: `Any`
+
+Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
+Default value: `undef`
+
+##### `ssl_stapling_return_errors`
+
+Data type: `Any`
+
+Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
+Default value: `undef`
+
+##### `use_canonical_name`
+
+Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
+
+Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
+which allows you to configure how the server determines it's own name and port.
+
+Default value: `undef`
+
+### apache::vhost::custom
+
+The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
+
+#### Parameters
+
+The following parameters are available in the `apache::vhost::custom` defined type.
+
+##### `content`
+
+Data type: `Any`
+
+Sets the configuration file's content.
+
+##### `ensure`
+
+Data type: `Any`
+
+Specifies if the virtual host file is present or absent.
+
+Default value: 'present'
+
+##### `priority`
+
+Data type: `Any`
+
+Sets the relative load order for Apache HTTPD VirtualHost configuration files.
+
+Default value: '25'
+
+##### `verify_config`
+
+Data type: `Any`
+
+Specifies whether to validate the configuration file before notifying the Apache service.
+
+Default value: `true`
+
+## Resource types
+
+### a2mod
+
+Manage Apache 2 modules
+
+#### Properties
+
+The following properties are available in the `a2mod` type.
+
+##### `ensure`
+
+Valid values: present, absent
+
+The basic property that the resource should be in.
+
+Default value: present
+
+#### Parameters
+
+The following parameters are available in the `a2mod` type.
+
+##### `name`
+
+namevar
+
+The name of the module to be managed
+
+##### `lib`
+
+The name of the .so library to be loaded
+
+##### `identifier`
+
+Module identifier string used by LoadModule. Default: module-name_module
+
+## Functions
+
+### apache::apache_pw_hash
+
+Type: Ruby 4.x API
+
+Currently uses SHA-hashes, because although this format is considered insecure, its the
+most secure format supported by the most platforms.
+
+#### `apache::apache_pw_hash(String[1] $password)`
+
+Currently uses SHA-hashes, because although this format is considered insecure, its the
+most secure format supported by the most platforms.
+
+Returns: `String` Return's the hash of the input that was given.
+
+##### `password`
+
+Data type: `String[1]`
+
+The input that is to be hashed.
+
+### apache::bool2httpd
+
+Type: Ruby 4.x API
+
+Transform a supposed boolean to On or Off. Passes all other values through.
+
+#### Examples
+
+##### 
+
+```puppet
+$trace_enable     = false
+$server_signature = 'mail'
+
+bool2httpd($trace_enable) # returns 'Off'
+bool2httpd($server_signature) # returns 'mail'
+bool2httpd(undef) # returns 'Off'
+```
+
+#### `apache::bool2httpd(Any $arg)`
+
+The apache::bool2httpd function.
+
+Returns: `Any` Will return either `On` or `Off` if given a boolean value. Return's a string of any
+other given value.
+
+##### Examples
+
+###### 
+
+```puppet
+$trace_enable     = false
+$server_signature = 'mail'
+
+bool2httpd($trace_enable) # returns 'Off'
+bool2httpd($server_signature) # returns 'mail'
+bool2httpd(undef) # returns 'Off'
+```
+
+##### `arg`
+
+Data type: `Any`
+
+The value to be converted into a string.
+
+### apache::validate_apache_log_level
+
+Type: Ruby 4.x API
+
+As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
+    * validate_apache_loglevel('info')
+
+Modules maybe specified with their own levels like these:
+    * validate_apache_loglevel('warn ssl:info')
+    * validate_apache_loglevel('warn mod_ssl.c:info')
+    * validate_apache_loglevel('warn ssl_module:info')
+
+Expected to be used from the main or vhost.
+Might be used from directory too later as apache supports that
+
+#### `apache::validate_apache_log_level(String $log_level)`
+
+As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
+    * validate_apache_loglevel('info')
+
+Modules maybe specified with their own levels like these:
+    * validate_apache_loglevel('warn ssl:info')
+    * validate_apache_loglevel('warn mod_ssl.c:info')
+    * validate_apache_loglevel('warn ssl_module:info')
+
+Expected to be used from the main or vhost.
+Might be used from directory too later as apache supports that
+
+Returns: `Any` Return's an error if the validation fails.
+
+##### `log_level`
+
+Data type: `String`
+
+The string that is to be validated.
+
+### apache_pw_hash
+
+Type: Ruby 3.x API
+
+Currently uses SHA-hashes, because although this format is considered insecure, its the
+most secure format supported by the most platforms.
+
+#### `apache_pw_hash(Any $password)`
+
+Currently uses SHA-hashes, because although this format is considered insecure, its the
+most secure format supported by the most platforms.
+
+Returns: `Any` Return's the hash of the input that was given.
+
+##### `password`
+
+Data type: `Any`
+
+The input that is to be hashed.
+
+### bool2httpd
+
+Type: Ruby 3.x API
+
+Transform a supposed boolean to On or Off. Pass all other values through.
+
+#### Examples
+
+##### 
+
+```puppet
+$trace_enable     = false
+$server_signature = 'mail'
+
+bool2httpd($trace_enable) # returns 'Off'
+bool2httpd($server_signature) # returns 'mail'
+bool2httpd(undef) # returns 'Off'
+```
+
+#### `bool2httpd(Any $arg)`
+
+The bool2httpd function.
+
+Returns: `Any` Will return either `On` or `Off` if given a boolean value. Return's a string of any
+other given value.
+
+##### Examples
+
+###### 
+
+```puppet
+$trace_enable     = false
+$server_signature = 'mail'
+
+bool2httpd($trace_enable) # returns 'Off'
+bool2httpd($server_signature) # returns 'mail'
+bool2httpd(undef) # returns 'Off'
+```
+
+##### `arg`
+
+Data type: `Any`
+
+The value to be converted into a string.
+
+### validate_apache_log_level
+
+Type: Ruby 3.x API
+
+As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
+    * validate_apache_loglevel('info')
+Modules maybe specified with their own levels like these:
+    * validate_apache_loglevel('warn ssl:info')
+    * validate_apache_loglevel('warn mod_ssl.c:info')
+    * validate_apache_loglevel('warn ssl_module:info')
+Expected to be used from the main or vhost.
+Might be used from directory too later as apaceh supports that
+
+#### `validate_apache_log_level(Any $log_level)`
+
+As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
+    * validate_apache_loglevel('info')
+Modules maybe specified with their own levels like these:
+    * validate_apache_loglevel('warn ssl:info')
+    * validate_apache_loglevel('warn mod_ssl.c:info')
+    * validate_apache_loglevel('warn ssl_module:info')
+Expected to be used from the main or vhost.
+Might be used from directory too later as apaceh supports that
+
+Returns: `Any` Return's an error if the validation fails.
+
+##### `log_level`
+
+Data type: `Any`
+
+The string that is to be validated.
+
+## Tasks
+
+### init
+
+Allows you to perform apache service functions
+
+**Supports noop?** false
+
+#### Parameters
+
+##### `action`
+
+Data type: `Enum[reload]`
+
+Action to perform 
+
+##### `service_name`
+
+Data type: `Optional[String[1]]`
+
+The name of the apache service 
+
diff --git a/lib/puppet/functions/apache/apache_pw_hash.rb b/lib/puppet/functions/apache/apache_pw_hash.rb
index dc73bfd81c..77863e9424 100644
--- a/lib/puppet/functions/apache/apache_pw_hash.rb
+++ b/lib/puppet/functions/apache/apache_pw_hash.rb
@@ -1,8 +1,14 @@
-# Hashes a password in a format suitable for htpasswd files read by apache.
+# @summary
+#   Hashes a password in a format suitable for htpasswd files read by apache.
 #
 # Currently uses SHA-hashes, because although this format is considered insecure, its the
 # most secure format supported by the most platforms.
 Puppet::Functions.create_function(:'apache::apache_pw_hash') do
+  # @param password
+  #   The input that is to be hashed.
+  #
+  # @return
+  #   Return's the hash of the input that was given.
   dispatch :apache_pw_hash do
     required_param 'String[1]', :password
     return_type 'String'
diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
index a173c8b3e6..582c0db6af 100644
--- a/lib/puppet/functions/apache/bool2httpd.rb
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -1,18 +1,21 @@
-# Transform a supposed boolean to On or Off. Pass all other values through.
-# Given a nil value (undef), bool2httpd will return 'Off'
+# @summary
+#   Transform a supposed boolean to On or Off. Passes all other values through.
 #
-# Example:
-#
-#    $trace_enable     = false
-#    $server_signature = 'mail'
-#
-#    bool2httpd($trace_enable)
-#    # => 'Off'
-#    bool2httpd($server_signature)
-#    # => 'mail'
-#    bool2httpd(undef)
-#    # => 'Off'
 Puppet::Functions.create_function(:'apache::bool2httpd') do
+  # @param arg
+  #   The value to be converted into a string.
+  #
+  # @return
+  #   Will return either `On` or `Off` if given a boolean value. Return's a string of any
+  #   other given value.
+  # @example
+  #   $trace_enable     = false
+  #   $server_signature = 'mail'
+  #
+  #   bool2httpd($trace_enable) # returns 'Off'
+  #   bool2httpd($server_signature) # returns 'mail'
+  #   bool2httpd(undef) # returns 'Off'
+  #
   def bool2httpd(arg)
     return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
     return 'On' if arg == true || arg =~ %r{true}i
diff --git a/lib/puppet/functions/apache/validate_apache_log_level.rb b/lib/puppet/functions/apache/validate_apache_log_level.rb
index 1ae906cfd5..0f581f7cd5 100644
--- a/lib/puppet/functions/apache/validate_apache_log_level.rb
+++ b/lib/puppet/functions/apache/validate_apache_log_level.rb
@@ -1,15 +1,22 @@
-#    Perform simple validation of a string against the list of known log
-#    levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel
-#        validate_apache_loglevel('info')
+# @summary
+#   Perform simple validation of a string against the list of known log levels.
 #
-#    Modules maybe specified with their own levels like these:
-#        validate_apache_loglevel('warn ssl:info')
-#        validate_apache_loglevel('warn mod_ssl.c:info')
-#        validate_apache_loglevel('warn ssl_module:info')
+# As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
+#     * validate_apache_loglevel('info')
 #
-#    Expected to be used from the main or vhost.
-#    Might be used from directory too later as apache supports that
+# Modules maybe specified with their own levels like these:
+#     * validate_apache_loglevel('warn ssl:info')
+#     * validate_apache_loglevel('warn mod_ssl.c:info')
+#     * validate_apache_loglevel('warn ssl_module:info')
+#
+# Expected to be used from the main or vhost.
+# Might be used from directory too later as apache supports that
 Puppet::Functions.create_function(:'apache::validate_apache_log_level') do
+  # @param log_level
+  #   The string that is to be validated.
+  #
+  # @return
+  #   Return's an error if the validation fails.
   dispatch :validate_apache_log_level do
     required_param 'String', :log_level
   end
diff --git a/lib/puppet/parser/functions/apache_pw_hash.rb b/lib/puppet/parser/functions/apache_pw_hash.rb
index eda0875e59..2395e5b28b 100644
--- a/lib/puppet/parser/functions/apache_pw_hash.rb
+++ b/lib/puppet/parser/functions/apache_pw_hash.rb
@@ -1,9 +1,17 @@
 require 'base64'
 
 Puppet::Parser::Functions.newfunction(:apache_pw_hash, type: :rvalue, doc: <<-DOC
-  Hashes a password in a format suitable for htpasswd files read by apache.
+  @summary
+    Hashes a password in a format suitable for htpasswd files read by apache.
+
   Currently uses SHA-hashes, because although this format is considered insecure, its the
   most secure format supported by the most platforms.
+
+  @param password
+    The input that is to be hashed.
+
+  @return
+    Return's the hash of the input that was given.
 DOC
                                      ) do |args|
   raise(Puppet::ParseError, "apache_pw_hash() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
diff --git a/lib/puppet/parser/functions/bool2httpd.rb b/lib/puppet/parser/functions/bool2httpd.rb
index 00e4993853..731dbaf7ef 100644
--- a/lib/puppet/parser/functions/bool2httpd.rb
+++ b/lib/puppet/parser/functions/bool2httpd.rb
@@ -1,15 +1,21 @@
 Puppet::Parser::Functions.newfunction(:bool2httpd, type: :rvalue, doc: <<-DOC
-  Transform a supposed boolean to On or Off. Pass all other values through.
-  Given a nil value (undef), bool2httpd will return 'Off'
-  Example:
-      $trace_enable     = false
-      $server_signature = 'mail'
-      bool2httpd($trace_enable)
-      # => 'Off'
-      bool2httpd($server_signature)
-      # => 'mail'
-      bool2httpd(undef)
-      # => 'Off'
+  @summary
+    Transform a supposed boolean to On or Off. Pass all other values through.
+
+  @param arg
+    The value to be converted into a string.
+
+  @return
+    Will return either `On` or `Off` if given a boolean value. Return's a string of any
+    other given value.
+
+  @example
+    $trace_enable     = false
+    $server_signature = 'mail'
+
+    bool2httpd($trace_enable) # returns 'Off'
+    bool2httpd($server_signature) # returns 'mail'
+    bool2httpd(undef) # returns 'Off'
 DOC
                                      ) do |args|
   raise(Puppet::ParseError, "bool2httpd() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
diff --git a/lib/puppet/parser/functions/validate_apache_log_level.rb b/lib/puppet/parser/functions/validate_apache_log_level.rb
index bcbf8e7c7e..e0e06e84fe 100644
--- a/lib/puppet/parser/functions/validate_apache_log_level.rb
+++ b/lib/puppet/parser/functions/validate_apache_log_level.rb
@@ -1,15 +1,23 @@
 # validate_apache_log_level.rb
 module Puppet::Parser::Functions
   newfunction(:validate_apache_log_level, doc: <<-DOC
-    Perform simple validation of a string against the list of known log
-    levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel
-        validate_apache_loglevel('info')
+    @summary
+      Perform simple validation of a string against the list of known log levels.
+
+    As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
+        * validate_apache_loglevel('info')
     Modules maybe specified with their own levels like these:
-        validate_apache_loglevel('warn ssl:info')
-        validate_apache_loglevel('warn mod_ssl.c:info')
-        validate_apache_loglevel('warn ssl_module:info')
+        * validate_apache_loglevel('warn ssl:info')
+        * validate_apache_loglevel('warn mod_ssl.c:info')
+        * validate_apache_loglevel('warn ssl_module:info')
     Expected to be used from the main or vhost.
     Might be used from directory too later as apaceh supports that
+
+    @param log_level
+      The string that is to be validated.
+
+    @return
+      Return's an error if the validation fails.
 DOC
              ) do |args|
     if args.size != 1
diff --git a/lib/puppet/provider/a2mod.rb b/lib/puppet/provider/a2mod.rb
index af704b6014..747da44a91 100644
--- a/lib/puppet/provider/a2mod.rb
+++ b/lib/puppet/provider/a2mod.rb
@@ -1,5 +1,6 @@
 # a2mod.rb
 class Puppet::Provider::A2mod < Puppet::Provider
+  # Fetches the mod provider
   def self.prefetch(mods)
     instances.each do |prov|
       mod = mods[prov.name]
@@ -9,10 +10,12 @@ def self.prefetch(mods)
     end
   end
 
+  # Clear's the property_hash
   def flush
     @property_hash.clear
   end
 
+  # Returns a copy of the property_hash
   def properties
     if @property_hash.empty?
       @property_hash = query || { ensure: :absent }
@@ -21,6 +24,7 @@ def properties
     @property_hash.dup
   end
 
+  # Returns the properties of the given mod if it exists.
   def query
     self.class.instances.each do |mod|
       if mod.name == name || mod.name.downcase == name
@@ -30,6 +34,7 @@ def query
     nil
   end
 
+  # Return's if the ensure property is absent or not
   def exists?
     properties[:ensure] != :absent
   end
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 9f824d2d82..ee1f6c3fc3 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -1,49 +1,46 @@
-# == Define Resource Type: apache::balancer
+# @summary
+#   This type will create an apache balancer cluster file inside the conf.d
+#   directory. 
 #
-# This type will create an apache balancer cluster file inside the conf.d
-# directory. Each balancer cluster needs one or more balancer members (that can
+# Each balancer cluster needs one or more balancer members (that can
 # be declared with the apache::balancermember defined resource type). Using
 # storeconfigs, you can export the apache::balancermember resources on all
 # balancer members, and then collect them on a single apache load balancer
 # server.
 #
-# === Requirement/Dependencies:
+# @note 
+#   Currently requires the puppetlabs/concat module on the Puppet Forge and uses
+#   storeconfigs on the Puppet Master to export/collect resources from all
+#   balancer members.
 #
-# Currently requires the puppetlabs/concat module on the Puppet Forge and uses
-# storeconfigs on the Puppet Master to export/collect resources from all
-# balancer members.
+# @param name
+#   The namevar of the defined resource type is the balancer clusters name.<br />
+#   This name is also used in the name of the conf.d file
 #
-# === Parameters
+# @param proxy_set
+#   Configures key-value pairs to be used as a ProxySet lines in the configuration.
 #
-# [*name*]
-# The namevar of the defined resource type is the balancer clusters name.
-# This name is also used in the name of the conf.d file
+# @param target
+#   The path to the file the balancer definition will be written in.
 #
-# [*proxy_set*]
-# Hash, default empty. If given, each key-value pair will be used as a ProxySet
-# line in the configuration.
+# @param collect_exported
+#   Determines whether to use exported resources.<br />
+#   If you statically declare all of your backend servers, set this parameter to false to rely 
+#   on existing, declared balancer member resources. Also, use apache::balancermember with array 
+#   arguments.<br />
+#   To dynamically declare backend servers via exported resources collected on a central node, 
+#   set this parameter to true to collect the balancer member resources exported by the balancer 
+#   member nodes.<br />
+#   If you don't use exported resources, a single Puppet run configures all balancer members. If 
+#   you use exported resources, Puppet has to run on the balanced nodes first, then run on the 
+#   balancer.
 #
-# [*target*]
-# String, default undef. If given, path to the file the balancer definition will
-# be written.
+# @param options
+#   Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) 
+#   after the balancer URL, and accepts any key-value pairs available to `ProxyPass`.
 #
-# [*collect_exported*]
-# Boolean, default 'true'. True means 'collect exported @@balancermember
-# resources' (for the case when every balancermember node exports itself),
-# false means 'rely on the existing declared balancermember resources' (for the
-# case when you know the full set of balancermembers in advance and use
-# apache::balancermember with array arguments, which allows you to deploy
-# everything in 1 run)
-#
-# [*options*]
-# Array, default empty. If given, additional directives may be added to the
-# <Proxy balancer://xyz OPTIONS> block.
-#
-# === Examples
-#
-# Exporting the resource for a balancer member:
-#
-# apache::balancer { 'puppet00': }
+# @example
+#   apache::balancer { 'puppet00': }
 #
 define apache::balancer (
   $proxy_set = {},
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 6e8b29f13f..1d4abb2e40 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -1,43 +1,42 @@
-# == Define Resource Type: apache::balancermember
-#
+# @summary
+#   Defines members of `mod_proxy_balancer`
+# 
+# Sets up a balancer member inside a listening service configuration block in 
+# the load balancer's `apache.cfg`.
+#   
 # This type will setup a balancer member inside a listening service
 # configuration block in /etc/apache/apache.cfg on the load balancer.
-# currently it only has the ability to specify the instance name, url and an
+# Currently it only has the ability to specify the instance name, url and an
 # array of options. More features can be added as needed. The best way to
 # implement this is to export this resource for all apache balancer member
 # servers, and then collect them on the main apache load balancer.
 #
-# === Requirement/Dependencies:
-#
-# Currently requires the puppetlabs/concat module on the Puppet Forge and
-# uses storeconfigs on the Puppet Master to export/collect resources
-# from all balancer members.
-#
-# === Parameters
-#
-# [*name*]
-# The title of the resource is arbitrary and only utilized in the concat
-# fragment name.
-#
-# [*balancer_cluster*]
-# The apache service's instance name (or, the title of the apache::balancer
-# resource). This must match up with a declared apache::balancer resource.
+# @note
+#   Currently requires the puppetlabs/concat module on the Puppet Forge and
+#   uses storeconfigs on the Puppet Master to export/collect resources
+#   from all balancer members.
 #
-# [*url*]
-# The url used to contact the balancer member server.
+# @param name
+#   The title of the resource is arbitrary and only utilized in the concat
+#   fragment name.
 #
-# [*options*]
-# An array of options to be specified after the url.
+# @param balancer_cluster
+#   The apache service's instance name (or, the title of the apache::balancer
+#   resource). This must match up with a declared apache::balancer resource.
 #
-# === Examples
+# @param url
+#   The url used to contact the balancer member server.
 #
-# Exporting the resource for a balancer member:
+# @param  options
+#   Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) 
+#   after the URL, and accepts any key-value pairs available to `ProxyPass`.
 #
-# @@apache::balancermember { 'apache':
-#   balancer_cluster => 'puppet00',
-#   url              => "ajp://${::fqdn}:8009"
-#   options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-# }
+# @example
+#   @@apache::balancermember { 'apache':
+#     balancer_cluster => 'puppet00',
+#     url              => "ajp://${::fqdn}:8009"
+#     options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
+#   }
 #
 define apache::balancermember(
   $balancer_cluster,
diff --git a/manifests/confd/no_accf.pp b/manifests/confd/no_accf.pp
index f35c0c8b9d..4176d2b65d 100644
--- a/manifests/confd/no_accf.pp
+++ b/manifests/confd/no_accf.pp
@@ -1,3 +1,7 @@
+# @summary
+#   Manages the `no-accf.conf` file.
+#
+# @api private
 class apache::confd::no_accf {
   # Template uses no variables
   file { 'no-accf.conf':
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 6bffa05c7f..e0cea82b55 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -1,4 +1,41 @@
-# See README.md for usage information
+# @summary
+#   Adds a custom configuration file to the Apache server's `conf.d` directory. 
+#
+# If the file is invalid and this defined type's `verify_config` parameter's value is 
+# `true`, Puppet throws an error during a Puppet run.
+#
+# @param ensure
+#   Specifies whether the configuration file should be present.
+#
+# @param confdir
+#   Sets the directory in which Puppet places configuration files.
+#
+# @param content
+#   Sets the configuration file's content. The `content` and `source` parameters are exclusive 
+#   of each other.
+#
+# @param filename
+#   Sets the name of the file under `confdir` in which Puppet stores the configuration.
+#
+# @param priority
+#   Sets the configuration file's priority by prefixing its filename with this parameter's 
+#   numeric value, as Apache processes configuration files in alphanumeric order.<br />
+#   To omit the priority prefix in the configuration file's name, set this parameter to `false`.
+#
+# @param source
+#   Points to the configuration file's source. The `content` and `source` parameters are 
+#   exclusive of each other.
+#
+# @param verify_command
+#   Specifies the command Puppet uses to verify the configuration file. Use a fully qualified 
+#   command.<br />
+#   This parameter is used only if the `verify_config` parameter's value is `true`. If the 
+#   `verify_command` fails, the Puppet run deletes the configuration file and raises an error, 
+#   but does not notify the Apache service.
+#
+# @param verify_config
+#   Specifies whether to validate the configuration file before notifying the Apache service.
+#
 define apache::custom_config (
   Enum['absent', 'present'] $ensure = 'present',
   $confdir                          = $::apache::confd_dir,
diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
index c06b30c83b..36ce5321bc 100644
--- a/manifests/default_confd_files.pp
+++ b/manifests/default_confd_files.pp
@@ -1,3 +1,7 @@
+# @summary
+#   Helper for setting up default conf.d files.
+#
+# @api private
 class apache::default_confd_files (
   $all = true,
 ) {
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 2e82d4d930..8254392b0f 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -1,3 +1,7 @@
+# @summary
+#   Installs and congfigures default mods for Apache
+#
+# @api private
 class apache::default_mods (
   $all            = true,
   $mods           = undef,
diff --git a/manifests/default_mods/load.pp b/manifests/default_mods/load.pp
index 356e9fa00e..fc44ebcb31 100644
--- a/manifests/default_mods/load.pp
+++ b/manifests/default_mods/load.pp
@@ -1,4 +1,7 @@
-# private define
+# @summary
+#   Helper used by `apache::default_mods`
+#
+# @api private
 define apache::default_mods::load ($module = $title) {
   if defined("apache::mod::${module}") {
     include "::apache::mod::${module}"
diff --git a/manifests/dev.pp b/manifests/dev.pp
index d4a25a7e44..95b3fa6d41 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -1,3 +1,12 @@
+# @summary
+#   Installs Apache development libraries.
+#
+# The libraries installed depends on the `dev_packages` parameter of the `apache::params` 
+# class, based on your operating system:
+# - **Debian** : `libaprutil1-dev`, `libapr1-dev`; `apache2-dev` on Ubuntu 13.10 and Debian 8; `apache2-prefork-dev` on other versions.
+# - **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
+# - **Gentoo**: `undef`.
+# - **Red Hat**: `httpd-devel`.
 class apache::dev {
 
   if ! defined(Class['apache']) {
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index df53556af1..76b4d0bcd7 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -1,3 +1,33 @@
+# @summary
+#   Defines one or more external FastCGI servers to handle specific file types. Use this 
+#   defined type with `mod_fastcgi`.
+#
+# @param host
+#   Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
+#
+# @param timeout
+#   Sets the number of seconds a [FastCGI](http://www.fastcgi.com/) application can be inactive before aborting the 
+#   request and logging the event at the error LogLevel. The inactivity timer applies only as 
+#   long as a connection is pending with the FastCGI application. If a request is queued to an 
+#   application, but the application doesn't respond by writing and flushing within this period, 
+#   the request is aborted. If communication is complete with the application but incomplete with 
+#   the client (the response is buffered), the timeout does not apply.
+#
+# @param flush
+#   Forces `mod_fastcgi` to write to the client as data is received from the 
+#   application. By default, `mod_fastcgi` buffers data in order to free the application 
+#   as quickly as possible.
+#
+# @param faux_path
+#   Apache has FastCGI handle URIs that resolve to this filename. The path set in this 
+#   parameter does not have to exist in the local filesystem.
+#
+# @param fcgi_alias
+#   Internally links actions with the FastCGI server. This alias must be unique.
+#
+# @param file_type
+#   Sets the MIME `content-type` of the file to be processed by the FastCGI server.
+#
 define apache::fastcgi::server (
   $host          = '127.0.0.1:9000',
   $timeout       = 15,
diff --git a/manifests/init.pp b/manifests/init.pp
index 22440378ef..6846e21d37 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,17 +1,446 @@
-# Class: apache
+# @summary
+#   Guides the basic setup and installation of Apache on your system.
 #
-# This class installs Apache
+# When this class is declared with the default options, Puppet:
+# - Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
+# - Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system.
+# - Configures the server with a default virtual host and standard port (`80`) and address (`\*`) bindings.
+# - Creates a document root directory determined by your operating system, typically `/var/www`.
+# - Starts the Apache service.
 #
-# Parameters:
+# @example
+#   class { 'apache': }
 #
-# Actions:
-#   - Install Apache
-#   - Manage Apache service
+# @param allow_encoded_slashes
+#   Sets the server default for the `AllowEncodedSlashes` declaration, which modifies the 
+#   responses to URLs containing '\' and '/' characters. If not specified, this parameter omits 
+#   the declaration from the server's configuration and uses Apache's default setting of 'off'.
 #
-# Requires:
+# @param apache_version
+#   Configures module template behavior, package names, and default Apache modules by defining 
+#   the version of Apache to use. We do not recommend manually configuring this parameter 
+#   without reason.
 #
-# Sample Usage:
+# @param conf_dir
+#   Sets the directory where the Apache server's main configuration file is located.
 #
+# @param conf_template
+#   Defines the template used for the main Apache configuration file. Modifying this 
+#   parameter is potentially risky, as the apache module is designed to use a minimal 
+#   configuration file customized by `conf.d` entries.
+#
+# @param confd_dir
+#   Sets the location of the Apache server's custom configuration directory.
+#
+# @param default_charset
+#   Used as the `AddDefaultCharset` directive in the main configuration file.
+#
+# @param default_confd_files
+#   Determines whether Puppet generates a default set of includable Apache configuration files 
+#   in the directory defined by the `confd_dir` parameter. These configuration files 
+#   correspond to what is typically installed with the Apache package on the server's 
+#   operating system.
+#
+# @param default_mods
+#   Determines whether to configure and enable a set of default Apache modules depending on 
+#   your operating system.<br />
+#   If `false`, Puppet includes only the Apache modules required to make the HTTP daemon work 
+#   on your operating system, and you can declare any other modules separately using the 
+#   `apache::mod::<MODULE NAME>` class or `apache::mod` defined type.<br />
+#   If `true`, Puppet installs additional modules, depending on the operating system and 
+#   the values of `apache_version` and `mpm_module` parameters. Because these lists of 
+#   modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
+#   If this parameter contains an array, Puppet instead enables all passed Apache modules.
+#
+# @param default_ssl_ca
+#   Sets the default certificate authority for the Apache server.<br />
+#   Although the default value results in a functioning Apache server, you **must** update 
+#   this parameter with your certificate authority information before deploying this server in 
+#   a production environment.
+#
+# @param default_ssl_cert
+#   Sets the SSL encryption certificate location.<br />
+#   Although the default value results in a functioning Apache server, you **must** update this 
+#   parameter with your certificate location before deploying this server in a production environment.
+#
+# @param default_ssl_chain
+#   Sets the default SSL chain location.<br />
+#   Although this default value results in a functioning Apache server, you **must** update 
+#   this parameter with your SSL chain before deploying this server in a production environment.
+#
+# @param default_ssl_crl
+#   Sets the path of the default certificate revocation list (CRL) file to use.<br />
+#   Although this default value results in a functioning Apache server, you **must** update 
+#   this parameter with the CRL file path before deploying this server in a production 
+#   environment. You can use this parameter with or in place of the `default_ssl_crl_path`.
+#
+# @param default_ssl_crl_path
+#   Sets the server's certificate revocation list path, which contains your CRLs.<br />
+#   Although this default value results in a functioning Apache server, you **must** update 
+#   this parameter with the CRL file path before deploying this server in a production environment.
+#
+# @param default_ssl_crl_check
+#   Sets the default certificate revocation check level via the `SSLCARevocationCheck` directive. 
+#   This parameter applies only to Apache 2.4 or higher and is ignored on older versions.<br />
+#   Although this default value results in a functioning Apache server, you **must** specify 
+#   this parameter when using certificate revocation lists in a production environment.
+#
+# @param default_ssl_key
+#   Sets the SSL certificate key file location.
+#   Although the default values result in a functioning Apache server, you **must** update 
+#   this parameter with your SSL key's location before deploying this server in a production 
+#   environment.
+#
+# @param default_ssl_vhost
+#   Configures a default SSL virtual host.
+#   If `true`, Puppet automatically configures the following virtual host using the 
+#   `apache::vhost` defined type:
+#   ```puppet
+#   apache::vhost { 'default-ssl':
+#     port            => 443,
+#     ssl             => true,
+#     docroot         => $docroot,
+#     scriptalias     => $scriptalias,
+#     serveradmin     => $serveradmin,
+#     access_log_file => "ssl_${access_log_file}",
+#   }
+#   ```
+#   **Note**: SSL virtual hosts only respond to HTTPS queries.
+#
+# @param default_type
+#   _Apache 2.2 only_. Sets the MIME `content-type` sent if the server cannot otherwise 
+#   determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and 
+#   newer, and is only for backwards compatibility in configuration files.
+#
+# @param default_vhost
+#   Configures a default virtual host when the class is declared.<br />
+#   To configure customized virtual hosts, set this parameter's 
+#   value to `false`.<br />
+#   > **Note**: Apache will not start without at least one virtual host. If you set this 
+#   to `false` you must configure a virtual host elsewhere.
+#
+# @param dev_packages
+#   Configures a specific dev package to use.<br />
+#   For example, using httpd 2.4 from the IUS yum repo:<br />
+#   ``` puppet
+#   include ::apache::dev
+#   class { 'apache':
+#     apache_name  => 'httpd24u',
+#     dev_packages => 'httpd24u-devel',
+#   }
+#   ```
+#
+# @param docroot
+#   Sets the default `DocumentRoot` location.
+#
+# @param error_documents
+#   Determines whether to enable [custom error documents](https://httpd.apache.org/docs/current/custom-error.html) on the Apache server.
+#
+# @param group
+#   Sets the group ID that owns any Apache processes spawned to answer requests.<br />
+#   By default, Puppet attempts to manage this group as a resource under the `apache` 
+#   class, determining the group based on the operating system as detected by the 
+#   `apache::params` class. To prevent the group resource from being created and use a group 
+#   created by another Puppet module, set the `manage_group` parameter's value to `false`.<br />
+#   > **Note**: Modifying this parameter only changes the group ID that Apache uses to spawn 
+#   child processes to access resources. It does not change the user that owns the parent server 
+#   process.
+#
+# @param httpd_dir
+#   Sets the Apache server's base configuration directory. This is useful for specially 
+#   repackaged Apache server builds but might have unintended consequences when combined 
+#   with the default distribution packages.
+#
+# @param http_protocol_options
+#   Specifies the strictness of HTTP protocol checks.<br />
+#   Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`, 
+#   `RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`.
+#
+# @param keepalive
+#   Determines whether to enable persistent HTTP connections with the `KeepAlive` directive. 
+#   If you set this to `On`, use the `keepalive_timeout` and `max_keepalive_requests` parameters 
+#   to set relevant options.<br />
+#
+# @param keepalive_timeout
+#   Sets the `KeepAliveTimeout` directive, which determines the amount of time the Apache 
+#   server waits for subsequent requests on a persistent HTTP connection. This parameter is 
+#   only relevant if the `keepalive` parameter is enabled.
+#
+# @param max_keepalive_requests
+#   Limits the number of requests allowed per connection when the `keepalive` parameter is enabled.
+#
+# @param hostname_lookups
+#   This directive enables DNS lookups so that host names can be logged and passed to 
+#   CGIs/SSIs in REMOTE_HOST.<br />
+#   > **Note**: If enabled, it impacts performance significantly.
+#
+# @param lib_path
+#   Specifies the location whereApache module files are stored.<br />
+#   > **Note**: Do not configure this parameter manually without special reason.
+#
+# @param log_level
+#   Changes the error log's verbosity. Valid options are: `alert`, `crit`, `debug`, `emerg`, `error`, 
+#   `info`, `notice` and `warn`.
+#
+# @param log_formats
+#   Define additional `LogFormat` directives. Values: A hash, such as:
+#   ``` puppet
+#   $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
+#   ```
+#     There are a number of predefined `LogFormats` in the `httpd.conf` that Puppet creates:
+#   ``` httpd
+#     LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+#     LogFormat "%h %l %u %t \"%r\" %>s %b" common
+#     LogFormat "%{Referer}i -> %U" referer
+#     LogFormat "%{User-agent}i" agent
+#     LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
+#   ```
+#   If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition.
+#
+# @param logroot
+#   Changes the directory of Apache log files for the virtual host.
+#
+# @param logroot_mode
+#   Overrides the default `logroot` directory's mode.<br />
+#   > **Note**: Do _not_ grant write access to the directory where the logs are stored 
+#   without being aware of the consequences. See the [Apache documentation](https://httpd.apache.org/docs/current/logs.html#security)
+#   for details.
+#
+# @param manage_group
+#   When `false`, stops Puppet from creating the group resource.<br />
+#   If you have a group created from another Puppet module that you want to use to run Apache, 
+#   set this to `false`. Without this parameter, attempting to use a previously established 
+#   group results in a duplicate resource error.
+#
+# @param supplementary_groups
+#   A list of groups to which the user belongs. These groups are in addition to the primary group.<br />
+#   Notice: This option only has an effect when `manage_user` is set to true.
+#
+# @param manage_user
+#   When `false`, stops Puppet from creating the user resource.<br />
+#   This is for instances when you have a user, created from another Puppet module, you want 
+#   to use to run Apache. Without this parameter, attempting to use a previously established 
+#   user would result in a duplicate resource error.
+#
+# @param mod_dir
+#   Sets where Puppet places configuration files for your Apache modules.
+#
+# @param mod_libs
+#   Allows the user to override default module library names.
+#   ```puppet
+#   include apache::params
+#   class { 'apache':
+#     mod_libs => merge($::apache::params::mod_libs, {
+#       'wsgi' => 'mod_wsgi_python3.so',
+#     })
+#   }
+#   ```
+#
+# @param mod_packages
+#   Allows the user to override default module package names.
+#   ```puppet
+#   include apache::params
+#   class { 'apache':
+#     mod_packages => merge($::apache::params::mod_packages, {
+#       'auth_kerb' => 'httpd24-mod_auth_kerb',
+#     })
+#   }
+#   ```
+#
+# @param mpm_module
+#   Determines which [multi-processing module](https://httpd.apache.org/docs/current/mpm.html) (MPM) is loaded and configured for the 
+#   HTTPD process. Valid values are: `event`, `itk`, `peruser`, `prefork`, `worker` or `false`.<br />
+#   You must set this to `false` to explicitly declare the following classes with custom parameters:
+#   - `apache::mod::event`
+#   - `apache::mod::itk`
+#   - `apache::mod::peruser`
+#   - `apache::mod::prefork`
+#   - `apache::mod::worker`
+#
+# @param package_ensure
+#   Controls the `package` resource's `ensure` attribute. Valid values are: `absent`, `installed`
+#   (or equivalent `present`), or a version string.
+#
+# @param pidfile
+#   Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm.
+#
+# @param ports_file
+#   Sets the path to the file containing Apache ports configuration.
+#
+# @param protocols
+#   Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols) 
+#   directive, which lists available protocols for the server.
+#
+# @param protocols_honor_order
+#   Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
+#   directive which determines whether the order of Protocols sets precedence during negotiation.
+#
+# @param purge_configs
+#   Removes all other Apache configs and virtual hosts.<br />
+#   Setting this to `false` is a stopgap measure to allow the apache module to coexist with 
+#   existing or unmanaged configurations. We recommend moving your configuration to resources 
+#   within this module. For virtual host configurations, see `purge_vhost_dir`.
+#
+# @param purge_vhost_dir
+#   If the `vhost_dir` parameter's value differs from the `confd_dir` parameter's, this parameter 
+#   determines whether Puppet removes any configurations inside `vhost_dir` that are _not_ managed 
+#   by Puppet.<br />
+#   Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to 
+#   coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
+#
+# @param rewrite_lock
+#   Allows setting a custom location for a rewrite lock - considered best practice if using 
+#   a RewriteMap of type prg in the `rewrites` parameter of your virtual host. This parameter 
+#   only applies to Apache version 2.2 or lower and is ignored on newer versions.
+#
+# @param sendfile
+#   Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the 
+#   `EnableSendfile` directive.
+#
+# @param serveradmin
+#   Sets the Apache server administrator's contact information via Apache's `ServerAdmin` directive.
+#
+# @param servername
+#   Sets the Apache server name via Apache's `ServerName` directive.
+#   Setting to `false` will not set ServerName at all.
+#
+# @param server_root
+#   Sets the Apache server's root directory via Apache's `ServerRoot` directive.
+#
+# @param server_signature
+#   Configures a trailing footer line to display at the bottom of server-generated documents, 
+#   such as error documents and output of certain Apache modules, via Apache's `ServerSignature`
+#   directive. Valid values are: `On` or `Off`.
+# 
+# @param server_tokens
+#   Controls how much information Apache sends to the browser about itself and the operating 
+#   system, via Apache's `ServerTokens` directive.
+# 
+# @param service_enable
+#   Determines whether Puppet enables the Apache HTTPD service when the system is booted.
+# 
+# @param service_ensure
+#   Determines whether Puppet should make sure the service is running. 
+#   Valid values are: `true` (or `running`) or `false` (or `stopped`).<br />
+#   The `false` or `stopped` values set the 'httpd' service resource's `ensure` parameter 
+#   to `false`, which is useful when you want to let the service be managed by another 
+#   application, such as Pacemaker.<br />
+# 
+# @param service_name
+#   Sets the name of the Apache service.
+# 
+# @param service_manage
+#   Determines whether Puppet manages the HTTPD service's state.
+#
+# @param service_restart
+#   Determines whether Puppet should use a specific command to restart the HTTPD service.
+#   Values: a command to restart the Apache service.
+#
+# @param timeout
+#   Sets Apache's `TimeOut` directive, which defines the number of seconds Apache waits for 
+#   certain events before failing a request.
+#
+# @param trace_enable
+#   Controls how Apache handles `TRACE` requests (per RFC 2616) via the `TraceEnable` directive.
+#
+# @param use_canonical_name
+#   Controls Apache's `UseCanonicalName` directive which controls how Apache handles 
+#   self-referential URLs. If not specified, this parameter omits the declaration from the 
+#   server's configuration and uses Apache's default setting of 'off'.
+#
+# @param use_systemd
+#   Controls whether the systemd module should be installed on Centos 7 servers, this is 
+#   especially useful if using custom-built RPMs.
+#
+# @param file_mode
+#   Sets the desired permissions mode for config files.
+#   Valid values are: a string, with permissions mode in symbolic or numeric notation.
+#
+# @param root_directory_options
+#   Array of the desired options for the `/` directory in httpd.conf.
+#
+# @param root_directory_secured
+#   Sets the default access policy for the `/` directory in httpd.conf. A value of `false` 
+#   allows access to all resources that are missing a more specific access policy. A value of 
+#   `true` denies access to all resources by default. If `true`, more specific rules must be 
+#   used to allow access to these resources (for example, in a directory block using the 
+#   `directories` parameter).
+#
+# @param vhost_dir
+#   Changes your virtual host configuration files' location.
+#
+# @param vhost_include_pattern
+#   Defines the pattern for files included from the `vhost_dir`.
+#   If set to a value like `[^.#]\*.conf[^~]` to make sure that files accidentally created in 
+#   this directory (such as files created by version control systems or editor backups) are 
+#   *not* included in your server configuration.<br />
+#   Some operating systems use a value of `*.conf`. By default, this module creates configuration 
+#   files ending in `.conf`.
+#
+# @param user
+#   Changes the user that Apache uses to answer requests. Apache's parent process continues 
+#   to run as root, but child processes access resources as the user defined by this parameter. 
+#   To prevent Puppet from managing the user, set the `manage_user` parameter to `false`.
+#
+# @param apache_name
+#   The name of the Apache package to install. If you are using a non-standard Apache package 
+#   you might need to override the default setting.<br />
+#   For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::scl_httpd_version`.
+#
+# @param error_log
+#   The name of the error log file for the main server instance. If the string starts with 
+#   `/`, `|`, or `syslog`: the full path is set. Otherwise, the filename  is prefixed with 
+#   `$logroot`.
+#
+# @param scriptalias
+#   Directory to use for global script alias
+#
+# @param access_log_file
+#   The name of the access log file for the main server instance.
+#
+# @param limitreqfields
+#   The `limitreqfields` parameter sets the maximum number of request header fields in 
+#   an HTTP request. This directive gives the server administrator greater control over 
+#   abnormal client request behavior, which may be useful for avoiding some forms of 
+#   denial-of-service attacks. The value should be increased if normal clients see an error 
+#   response from the server that indicates too many fields were sent in the request.
+#
+# @param limitreqfieldsize
+#   The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
+#   be allowed within a request header.
+#
+# @param ip
+#   Specifies the ip address
+#
+# @param purge_vdir
+#   Removes all other Apache configs and virtual hosts.<br />
+#   > **Note**: This parameter is deprecated in favor of the `purge_config` parameter.<br />
+# 
+# @param conf_enabled
+#   Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.
+# 
+# @param vhost_enable_dir
+#   Set's whether the vhost definitions will be stored in sites-availible and if
+#   they will be symlinked to and from sites-enabled.
+#
+# @param mod_enable_dir
+#   Set's whether the mods-enabled directory should be managed.
+#
+# @param ssl_file
+#   This parameter allows you to set an ssl.conf file to be managed in order to implement
+#   an SSL Certificate.
+# 
+# @param file_e_tag
+#   Sets the server default for the `FileETag` declaration, which modifies the response header 
+#   field for static files.
+# 
+# @param use_optional_includes
+#   Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for 
+#   `additional_includes` in Apache 2.4 or newer.
+# 
+# @param mime_types_additional
+#   Specifies any idditional Internet media (mime) types that you wish to be configured.
+# 
 class apache (
   $apache_name                                                          = $::apache::params::apache_name,
   $service_name                                                         = $::apache::params::service_name,
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 503ee8860b..25fb2801b1 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -1,3 +1,9 @@
+# @summary
+#   Adds `Listen` directives to `ports.conf` that define the 
+#   Apache server's or a virtual host's listening address and port.
+#
+# The `apache::vhost` class uses this defined type, and titles take the form 
+# `<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
 define apache::listen {
   $listen_addr_port = $name
 
diff --git a/manifests/mod.pp b/manifests/mod.pp
index c7f3908d1e..323935c5b1 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -1,3 +1,37 @@
+# @summary
+#   Installs packages for an Apache module that doesn't have a corresponding 
+#   `apache::mod::<MODULE NAME>` class.
+#
+# Checks for or places the module's default configuration files in the Apache server's 
+# `module` and `enable` directories. The default locations depend on your operating system.
+#
+# @param package
+#   **Required**.<br />
+#   Names the package Puppet uses to install the Apache module.
+#
+# @param package_ensure
+#   Determines whether Puppet ensures the Apache module should be installed.
+#
+# @param lib
+#   Defines the module's shared object name. Do not configure manually without special reason.
+#
+# @param lib_path
+#   Specifies a path to the module's libraries. Do not manually set this parameter 
+#   without special reason. The `path` parameter overrides this value.
+#
+# @param loadfile_name
+#   Sets the filename for the module's `LoadFile` directive, which can also set 
+#   the module load order as Apache processes them in alphanumeric order.
+#
+# @param id
+#   Specifies the package id
+#
+# @param loadfiles
+#   Specifies an array of `LoadFile` directives.
+#
+# @param path
+#   Specifies a path to the module. Do not manually set this parameter without a special reason.
+#
 define apache::mod (
   $package        = undef,
   $package_ensure = 'present',
diff --git a/manifests/mod/actions.pp b/manifests/mod/actions.pp
index 3b60f297fd..c9b7d15d69 100644
--- a/manifests/mod/actions.pp
+++ b/manifests/mod/actions.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs Apache mod_actions
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_actions.html for additional documentation.
+#
 class apache::mod::actions {
   apache::mod { 'actions': }
 }
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 4eb42ac974..de21d2c266 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,3 +1,22 @@
+# @summary
+#   Installs and configures `mod_alias`.
+# 
+# @param apache_version
+#   The version of Apache, if not set will be retrieved from the init class.
+# 
+# @param icons_options
+#   Disables directory listings for the icons directory, via Apache [Options](https://httpd.apache.org/docs/current/mod/core.html#options)
+#   directive.
+# 
+# @param icons_path
+#   Sets the local path for an /icons/ Alias. Default depends on operating system:
+#   - Debian: /usr/share/apache2/icons
+#   - FreeBSD: /usr/local/www/apache24/icons
+#   - Gentoo: /var/www/icons
+#   - Red Hat: /var/www/icons, except on Apache 2.4, where it's /usr/share/httpd/icons
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_alias.html for additional documentation.
+#
 class apache::mod::alias(
   $apache_version = undef,
   $icons_options  = 'Indexes MultiViews',
diff --git a/manifests/mod/auth_basic.pp b/manifests/mod/auth_basic.pp
index cacfafa4d3..cb2d1313c9 100644
--- a/manifests/mod/auth_basic.pp
+++ b/manifests/mod/auth_basic.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_auth_basic`
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_auth_basic.html for additional documentation.
+#
 class apache::mod::auth_basic {
   ::apache::mod { 'auth_basic': }
 }
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 00de62242a..e13cad2152 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -1,3 +1,86 @@
+# @summary
+#   Installs and configures `mod_auth_cas`.
+# 
+# @param cas_login_url
+#   Sets the URL to which the module redirects users when they attempt to access a 
+#   CAS-protected resource and don't have an active session.
+# 
+# @param cas_validate_url
+#   Sets the URL to use when validating a client-presented ticket in an HTTP query string.
+# 
+# @param cas_cookie_path
+#   Sets the location where information on the current session should be stored. This should
+#   be writable by the web server only.
+# 
+# @param cas_cookie_path_mode
+#   The mode of cas_cookie_path.
+#
+# @param cas_version
+#   The version of the CAS protocol to adhere to.
+# 
+# @param cas_debug
+#   Whether to enable or disable debug mode.
+# 
+# @param cas_validate_server
+#   Whether to validate the presented certificate. This has been deprecated and
+#   removed from Version 1.1-RC1 onward.
+# 
+# @param cas_validatedepth
+#   The maximum depth for chained certificate validation.
+# 
+# @param cas_proxy_validate_url
+#   The URL to use when performing a proxy validation.
+# 
+# @param cas_root_proxied_as
+#   Sets the URL end users see when access to this Apache server is proxied per vhost. 
+#   This URL should not include a trailing slash.
+# 
+# @param cas_cookie_entropy
+#   When creating a local session, this many random bytes are used to create a unique 
+#   session identifier.
+# 
+# @param cas_timeout
+#   The hard limit, in seconds, for a mod_auth_cas session.
+# 
+# @param cas_idle_timeout
+#   The limit, in seconds, of how long a mod_auth_cas session can be idle.
+# 
+# @param cas_cache_clean_interval
+#   The minimum amount of time that must pass inbetween cache cleanings.
+# 
+# @param cas_cookie_domain
+#   The value for the 'Domain=' parameter in the Set-Cookie header.
+# 
+# @param cas_cookie_http_only
+#   Setting this flag prevents the mod_auth_cas cookies from being accessed by 
+#   client side Javascript.
+# 
+# @param cas_authoritative
+#   Determines whether an optional authorization directive is authoritative and thus binding.
+# 
+# @param cas_validate_saml
+#   Parse response from CAS server for SAML.
+# 
+# @param cas_sso_enabled
+#   Enables experimental support for single sign out (may mangle POST data).
+# 
+# @param cas_attribute_prefix
+#   Adds a header with the value of this header being the attribute values when SAML 
+#   validation is enabled.
+# 
+# @param cas_attribute_delimiter
+#   Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
+# 
+# @param cas_scrub_request_headers
+#   Remove inbound request headers that may have special meaning within mod_auth_cas.
+# 
+# @param suppress_warning
+#   Suppress warning about being on RedHat (mod_auth_cas package is now available in epel-testing repo).
+#
+# @note The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
+#
+# @see https://github.com/apereo/mod_auth_cas for additional documentation.
+#
 class apache::mod::auth_cas (
   String $cas_login_url,
   String $cas_validate_url,
diff --git a/manifests/mod/auth_gssapi.pp b/manifests/mod/auth_gssapi.pp
index 45b8cb3c19..226e6061c1 100644
--- a/manifests/mod/auth_gssapi.pp
+++ b/manifests/mod/auth_gssapi.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_auth_gsappi`.
+# 
+# @see https://github.com/modauthgssapi/mod_auth_gssapi for additional documentation.
+#
 class apache::mod::auth_gssapi {
   include apache
   include apache::mod::authn_core
diff --git a/manifests/mod/auth_kerb.pp b/manifests/mod/auth_kerb.pp
index 4b4887fe8c..79bde55921 100644
--- a/manifests/mod/auth_kerb.pp
+++ b/manifests/mod/auth_kerb.pp
@@ -1,3 +1,7 @@
+# @summary
+#   Installs `mod_auth_kerb`
+#
+# @see http://modauthkerb.sourceforge.net for additional documentation.
 class apache::mod::auth_kerb {
   include ::apache
   include ::apache::mod::authn_core
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index 5dbb6b5771..b1edc48253 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -1,3 +1,29 @@
+# @summary
+#   Installs and configures `mod_auth_mellon`.
+# 
+# @param mellon_cache_size
+#   Maximum number of sessions which can be active at once.
+# 
+# @param mellon_lock_file
+#   Full path to a file used for synchronizing access to the session data.
+# 
+# @param mellon_post_directory
+#   Full path of a directory where POST requests are saved during authentication.
+# 
+# @param mellon_cache_entry_size
+#   Maximum size for a single session entry in bytes.
+# 
+# @param mellon_post_ttl
+#   Delay in seconds before a saved POST request can be flushed.
+# 
+# @param mellon_post_size
+#   Maximum size for saved POST requests.
+# 
+# @param mellon_post_count
+#   Maximum amount of saved POST requests.
+# 
+# @see https://github.com/Uninett/mod_auth_mellon for additional documentation.
+#
 class apache::mod::auth_mellon (
   $mellon_cache_size = $::apache::params::mellon_cache_size,
   $mellon_lock_file  = $::apache::params::mellon_lock_file,
diff --git a/manifests/mod/authn_core.pp b/manifests/mod/authn_core.pp
index c5ce5b1070..cde5b51d48 100644
--- a/manifests/mod/authn_core.pp
+++ b/manifests/mod/authn_core.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs `mod_authn_core`.
+# 
+# @param apache_version
+#   The version of apache being run.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_authn_core.html for additional documentation.
+#
 class apache::mod::authn_core(
   $apache_version = $::apache::apache_version
 ) {
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
index be6ff3e55f..912b2574ff 100644
--- a/manifests/mod/authn_dbd.pp
+++ b/manifests/mod/authn_dbd.pp
@@ -1,3 +1,32 @@
+# @summary
+#   Installs `mod_authn_dbd`.
+# 
+# @param authn_dbd_params
+#   The params needed for the mod to function.
+#   
+# @param authn_dbd_dbdriver
+#   Selects an apr_dbd driver by name.
+#   
+# @param authn_dbd_query
+#   
+# @param authn_dbd_min
+#   Set the minimum number of connections per process.
+#   
+# @param authn_dbd_max
+#   Set the maximum number of connections per process.
+#   
+# @param authn_dbd_keep
+#   Set the maximum number of connections per process to be sustained.
+#   
+# @param authn_dbd_exptime
+#   Set the time to keep idle connections alive when the number of 
+#   connections specified in DBDKeep has been exceeded.
+#   
+# @param authn_dbd_alias
+#   Sets an alias for `AuthnProvider.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_authn_dbd.html for additional documentation.
+#
 class apache::mod::authn_dbd (
   $authn_dbd_params,
   $authn_dbd_dbdriver    = 'mysql',
diff --git a/manifests/mod/authn_file.pp b/manifests/mod/authn_file.pp
index bc787244a2..1418045078 100644
--- a/manifests/mod/authn_file.pp
+++ b/manifests/mod/authn_file.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_authn_file`.
+# 
+# @see https://httpd.apache.org/docs/2.4/mod/mod_authn_file.html for additional documentation.
+#
 class apache::mod::authn_file {
   ::apache::mod { 'authn_file': }
 }
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 560909f871..4a536c807e 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -1,3 +1,14 @@
+# @summary
+#   Installs `mod_authnz_ldap`.
+# 
+# @param verify_server_cert
+#   Whether to force te verification of a server cert or not.
+# 
+# @param package_name
+#   The name of the ldap package.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html for additional documentation.
+#
 class apache::mod::authnz_ldap (
   Boolean $verify_server_cert = true,
   $package_name               = undef,
diff --git a/manifests/mod/authnz_pam.pp b/manifests/mod/authnz_pam.pp
index c2672126d2..a8fcf60633 100644
--- a/manifests/mod/authnz_pam.pp
+++ b/manifests/mod/authnz_pam.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_authnz_pam`.
+# 
+# @see https://www.adelton.com/apache/mod_authnz_pam for additional documentation.
+#
 class apache::mod::authnz_pam {
   include ::apache
   ::apache::mod { 'authnz_pam': }
diff --git a/manifests/mod/authz_default.pp b/manifests/mod/authz_default.pp
index e457774ae5..2f07a49fe6 100644
--- a/manifests/mod/authz_default.pp
+++ b/manifests/mod/authz_default.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs and configures `mod_authz_default`.
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_authz_default.html for additional documentation.
+#
 class apache::mod::authz_default(
     $apache_version = $::apache::apache_version
 ) {
diff --git a/manifests/mod/authz_user.pp b/manifests/mod/authz_user.pp
index 948a3e2c97..81bdf5f314 100644
--- a/manifests/mod/authz_user.pp
+++ b/manifests/mod/authz_user.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_authz_user`
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_authz_user.html for additional documentation.
+#
 class apache::mod::authz_user {
   ::apache::mod { 'authz_user': }
 }
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index 67c7580e31..65b0354426 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_autoindex`
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_autoindex.html for additional documentation.
+#
 class apache::mod::autoindex {
   include ::apache
   ::apache::mod { 'autoindex': }
diff --git a/manifests/mod/cache.pp b/manifests/mod/cache.pp
index 4ab9f44bae..a822ae9aa4 100644
--- a/manifests/mod/cache.pp
+++ b/manifests/mod/cache.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_cache`
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_cache.html for additional documentation.
+#
 class apache::mod::cache {
   ::apache::mod { 'cache': }
 }
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index e4a80239af..7759176cc4 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_cgi`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_cgi.html for additional documentation.
+#
 class apache::mod::cgi {
   include ::apache
   case $::osfamily {
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index b2cb016557..0d8c27b092 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_cgid`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_cgid.html
+#
 class apache::mod::cgid {
   include ::apache
   case $::osfamily {
diff --git a/manifests/mod/cluster.pp b/manifests/mod/cluster.pp
index 442b583525..093d3683f2 100644
--- a/manifests/mod/cluster.pp
+++ b/manifests/mod/cluster.pp
@@ -1,3 +1,53 @@
+# @summary
+#   Installs `mod_cluster`.
+# 
+# @param allowed_network
+#   Balanced members network.
+# 
+# @param balancer_name
+#   Name of balancer.
+# 
+# @param ip
+#   Specifies the IP address to listen to.
+# 
+# @param version
+#   Specifies the mod_cluster version. Version 1.3.0 or greater is required for httpd 2.4.
+#
+# @param enable_mcpm_receive
+#   Whether MCPM should be enabled.
+#   
+# @param port
+#   mod_cluster listen port.
+#
+# @param keep_alive_timeout
+#   Specifies how long Apache should wait for a request, in seconds.
+# 
+# @param manager_allowed_network
+#   Whether to allow the network to access the mod_cluster_manager.
+# 
+# @param max_keep_alive_requests
+#   Maximum number of requests kept alive.
+# 
+# @param server_advertise
+#   Whether the server should advertise.
+# 
+# @param advertise_frequency
+#   Sets the interval between advertise messages in seconds.
+#
+# @example
+#   class { '::apache::mod::cluster':
+#     ip                      => '172.17.0.1',
+#     allowed_network         => '172.17.0.',
+#     balancer_name           => 'mycluster',
+#     version                 => '1.3.1'
+#   }
+#
+# @note
+#   There is no official package available for mod_cluster, so you must make it available outside of the apache module. 
+#   Binaries can be found [here](https://modcluster.io/).
+#
+# @see https://modcluster.io/ for additional documentation.
+#
 class apache::mod::cluster (
   $allowed_network,
   $balancer_name,
diff --git a/manifests/mod/data.pp b/manifests/mod/data.pp
index 00807e948a..b09e224539 100644
--- a/manifests/mod/data.pp
+++ b/manifests/mod/data.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs and configures `mod_data`.
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_data.html for additional documentation.
+#
 class apache::mod::data (
   $apache_version = undef,
 ) {
diff --git a/manifests/mod/dav.pp b/manifests/mod/dav.pp
index ade9c0809c..616492705f 100644
--- a/manifests/mod/dav.pp
+++ b/manifests/mod/dav.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_dav`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_dav.html for additional documentation.
+#
 class apache::mod::dav {
   ::apache::mod { 'dav': }
 }
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index 60127e3f6d..1a4fd83925 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_dav_fs`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_dav_fs.html for additional documentation.
+#
 class apache::mod::dav_fs {
   include ::apache
   $dav_lock = $::osfamily ? {
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 6cb5af560c..8b5094a002 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs and configures `mod_dav_svn`.
+# 
+# @param authz_svn_enabled
+#   Specifies whether to install Apache mod_authz_svn
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_dav_svn.html for additional documentation.
+#
 class apache::mod::dav_svn (
   $authz_svn_enabled = false,
 ) {
diff --git a/manifests/mod/dbd.pp b/manifests/mod/dbd.pp
index 547acc77df..cdc9cdf6f4 100644
--- a/manifests/mod/dbd.pp
+++ b/manifests/mod/dbd.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs `mod_dbd`.
+# 
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_dbd.html for additional documentation.
+#
 class apache::mod::dbd {
   ::apache::mod { 'dbd': }
 }
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 70ac5be121..28e36d490d 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -1,3 +1,14 @@
+# @summary
+#   Installs and configures `mod_deflate`.
+# 
+# @param types
+#   An array of MIME types to be deflated. See https://www.iana.org/assignments/media-types/media-types.xhtml.
+#
+# @param notes
+#   A Hash where the key represents the type and the value represents the note name.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_deflate.html for additional documentation.
+#
 class apache::mod::deflate (
   $types = [
     'text/html text/plain text/xml',
diff --git a/manifests/mod/dev.pp b/manifests/mod/dev.pp
index 5abdedd361..4b1afe8c46 100644
--- a/manifests/mod/dev.pp
+++ b/manifests/mod/dev.pp
@@ -1,3 +1,9 @@
+# @summary
+#   Installs `mod_dev`.
+#
+# @note
+#   This module is deprecated. Please use `apache::dev`.
+#
 class apache::mod::dev {
   # Development packages are not apache modules
   warning('apache::mod::dev is deprecated; please use apache::dev')
diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index 3c994d3e13..51bdfd7d68 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -1,6 +1,18 @@
-# Note: this sets the global DirectoryIndex directive, it may be necessary to consider being able to modify the apache::vhost to declare DirectoryIndex statements in a vhost configuration
-# Parameters:
-# - $indexes provides a string for the DirectoryIndex directive http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+# @summary
+#   Installs and configures `mod_dir`.
+# 
+# @param types
+#   Specifies the text-based content types to compress.
+#
+# @param indexes
+#   Provides a string for the DirectoryIndex directive
+# 
+# @todo
+#   This sets the global DirectoryIndex directive, so it may be necessary to consider being able to modify the apache::vhost to declare 
+#   DirectoryIndex statements in a vhost configuration
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_dir.html for additional documentation.
+#
 class apache::mod::dir (
   $dir                   = 'public_html',
   Array[String] $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 25f864b75d..ef9f6bd81d 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -1,3 +1,22 @@
+# @summary
+#   Installs and configures `mod_disk_cache`.
+# 
+# @param cache_root
+#   Defines the name of the directory on the disk to contain cache files.
+#   Default depends on the Apache version and operating system:
+#   - Debian: /var/cache/apache2/mod_cache_disk
+#   - FreeBSD: /var/cache/mod_cache_disk
+#   - Red Hat, Apache 2.4: /var/cache/httpd/proxy
+#   - Red Hat, Apache 2.2: /var/cache/mod_proxy
+#
+# @param cache_ignore_headers
+#   Specifies HTTP header(s) that should not be stored in the cache.
+#
+# @note
+#   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
+#
+# @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation.
+#
 class apache::mod::disk_cache (
   $cache_root           = undef,
   $cache_ignore_headers = undef,
diff --git a/manifests/mod/dumpio.pp b/manifests/mod/dumpio.pp
index c79f6da38c..c8e53a8994 100644
--- a/manifests/mod/dumpio.pp
+++ b/manifests/mod/dumpio.pp
@@ -1,3 +1,24 @@
+# @summary
+#   Installs and configures `mod_dumpio`.
+# 
+# @param dump_io_input
+#   Dump all input data to the error log
+#
+# @param dump_io_output
+#   Dump all output data to the error log
+#
+# @example
+#   class{'apache':
+#     default_mods => false,
+#     log_level    => 'dumpio:trace7',
+#   }
+#   class{'apache::mod::dumpio':
+#     dump_io_input  => 'On',
+#     dump_io_output => 'Off',
+#   }
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_dumpio.html for additional documentation.
+#
 class apache::mod::dumpio(
   Enum['Off', 'On', 'off', 'on'] $dump_io_input  = 'Off',
   Enum['Off', 'On', 'off', 'on'] $dump_io_output = 'Off',
diff --git a/manifests/mod/env.pp b/manifests/mod/env.pp
index b973005f4c..2ca17a5e79 100644
--- a/manifests/mod/env.pp
+++ b/manifests/mod/env.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_env`.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_env.html for additional documentation.
+#
 class apache::mod::env {
   ::apache::mod { 'env': }
 }
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index a873959165..9cfec971ff 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -1,3 +1,51 @@
+# @summary
+#   Installs and configures `mod_event`.
+# 
+# @param startservers
+#   Sets the number of child server processes created at startup, via the module's `StartServers` directive. Setting this to `false` 
+#   removes the parameter.
+#
+# @param maxclients
+#   Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
+#
+# @param maxrequestworkers
+#   Sets the maximum number of connections Apache can simultaneously process, via the module's `MaxRequestWorkers` directive. Setting 
+#   these to `false` removes the parameters.
+#
+# @param minsparethreads
+#   Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Setting this to `false` removes the parameters.
+#
+# @param maxsparethreads
+#   Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Setting this to `false` removes the parameters.
+#
+# @param threadsperchild
+#   Number of threads created by each child process.
+#
+# @param maxrequestsperchild
+#   Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
+#
+# @param maxconnectionsperchild
+#   Limit on the number of connections that an individual child server will handle during its life.
+#
+# @param serverlimit
+#   Limits the configurable number of processes via the `ServerLimit` directive. Setting this to `false` removes the parameter.
+#
+# @param apache_version
+#   Version of Apache to install module on.
+#
+# @param threadlimit
+#    Limits the number of event threads via the module's `ThreadLimit` directive. Setting this to `false` removes the parameter.
+#
+# @param listenbacklog
+#   Sets the maximum length of the pending connections queue via the module's `ListenBackLog` directive. Setting this to `false` removes 
+#   the parameter.
+#
+# @note
+#   You cannot include apache::mod::event with apache::mod::itk, apache::mod::peruser, apache::mod::prefork, or 
+#   apache::mod::worker on the same server.
+#
+# @see https://httpd.apache.org/docs/current/mod/event.html for additional documentation.
+#
 class apache::mod::event (
   $startservers           = '2',
   $maxclients             = '150',
diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index 07ec82e276..d134994f1a 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -1,3 +1,19 @@
+# @summary
+#   Installs and configures `mod_expires`.
+# 
+# @param expires_active
+#   Enables generation of Expires headers.
+#
+# @param expires_default
+#   Specifies the default algorithm for calculating expiration time using ExpiresByType syntax or interval syntax.
+#
+# @param expires_by_type
+#   Describes a set of [MIME content-types](https://www.iana.org/assignments/media-types/media-types.xhtml) and their expiration
+#   times. This should be used as an array of Hashes, with each Hash's key a valid MIME content-type (i.e. 'text/json') and its 
+#   value following valid interval syntax.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_expires.html for additional documentation.
+#
 class apache::mod::expires (
   $expires_active  = true,
   $expires_default = undef,
diff --git a/manifests/mod/ext_filter.pp b/manifests/mod/ext_filter.pp
index 11550320c2..59f90ae401 100644
--- a/manifests/mod/ext_filter.pp
+++ b/manifests/mod/ext_filter.pp
@@ -1,3 +1,19 @@
+# @summary
+#   Installs and configures `mod_ext_filter`.
+# 
+# @param ext_filter_define
+#   Hash of filter names and their parameters.
+#
+# @example
+#   class { 'apache::mod::ext_filter':
+#     ext_filter_define => {
+#       'slowdown'       => 'mode=output cmd=/bin/cat preservescontentlength',
+#       'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"',
+#     },
+#   }
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_ext_filter.html for additional documentation.
+#
 class apache::mod::ext_filter(
   Optional[Hash] $ext_filter_define = undef
 ) {
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index ef4f8f259c..abb529d8ff 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_fastcgi`.
+# 
+# @see https://github.com/FastCGI-Archives/mod_fastcgi for additional documentation.
+#
 class apache::mod::fastcgi {
   include ::apache
   if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemrelease, '7.0') >= 0) {
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 0e99a9b799..22f1d4d446 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,3 +1,40 @@
+# @summary
+#   Installs and configures `mod_fcgid`.
+# 
+# @param expires_active
+#   Enables generation of Expires headers.
+#
+# @param expires_default
+#   Default algorithm for calculating expiration time.
+#
+# @param expires_by_type
+#   Value of the Expires header configured by MIME type.
+#
+# @example The class does not individually parameterize all available options. Instead, configure mod_fcgid using the options hash. 
+#   class { 'apache::mod::fcgid':
+#     options => {
+#       'FcgidIPCDir'  => '/var/run/fcgidsock',
+#       'SharememPath' => '/var/run/fcgid_shm',
+#       'AddHandler'   => 'fcgid-script .fcgi',
+#     },
+#   }
+#
+# @example If you include apache::mod::fcgid, you can set the [FcgidWrapper][] per directory, per virtual host. The module must be 
+# loaded first; Puppet will not automatically enable it if you set the fcgiwrapper parameter in apache::vhost.
+#   include apache::mod::fcgid
+#   
+#   apache::vhost { 'example.org':
+#     docroot     => '/var/www/html',
+#     directories => {
+#       path        => '/var/www/html',
+#       fcgiwrapper => {
+#         command => '/usr/local/bin/fcgiwrapper',
+#       }
+#     },
+#   }
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_fcgid.html for additional documentation.
+#
 class apache::mod::fcgid(
   $options = {},
 ) {
diff --git a/manifests/mod/filter.pp b/manifests/mod/filter.pp
index 26dc488b3a..5cee277187 100644
--- a/manifests/mod/filter.pp
+++ b/manifests/mod/filter.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_filter`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_filter.html for additional documentation.
+#
 class apache::mod::filter {
   ::apache::mod { 'filter': }
 }
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index 66ae887dea..974dcb8d1b 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -1,3 +1,32 @@
+# @summary
+#   Installs and configures `mod_geoip`.
+# 
+# @param enable
+#   Toggles whether to enable geoip.
+#
+# @param db_file
+#   Path to database for GeoIP to use.
+# 
+# @param flag
+#   Caching directive to use. Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'.
+# 
+# @param output
+#   Output variable locations. Values: 'All', 'Env', 'Request', 'Notes'.
+# 
+# @param enable_utf8
+#   Changes the output from ISO88591 (Latin1) to UTF8.
+# 
+# @param scan_proxy_headers
+#   Enables the GeoIPScanProxyHeaders option.
+# 
+# @param scan_proxy_headers_field
+#   Specifies the header mod_geoip uses to determine the client's IP address.
+# 
+# @param use_last_xforwarededfor_ip
+#   Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
+# 
+# @see https://dev.maxmind.com/geoip/legacy/mod_geoip2 for additional documentation.
+#
 class apache::mod::geoip (
   $enable                     = false,
   $db_file                    = '/usr/share/GeoIP/GeoIP.dat',
diff --git a/manifests/mod/headers.pp b/manifests/mod/headers.pp
index d18c5e2793..a86dbf76a5 100644
--- a/manifests/mod/headers.pp
+++ b/manifests/mod/headers.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs and configures `mod_headers`.
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_headers.html for additional documentation.
+#
 class apache::mod::headers {
   ::apache::mod { 'headers': }
 }
diff --git a/manifests/mod/http2.pp b/manifests/mod/http2.pp
index 468c0db51d..95064fffcb 100644
--- a/manifests/mod/http2.pp
+++ b/manifests/mod/http2.pp
@@ -1,3 +1,70 @@
+# @summary
+#   Installs and configures `mod_http2`.
+# 
+# @param h2_copy_files
+#   Determine file handling in responses.
+#
+# @param h2_direct
+#   H2 Direct Protocol Switch.
+# 
+# @param h2_early_hints
+#   Determine sending of 103 status codes.
+# 
+# @param h2_max_session_streams
+#   Sets maximum number of active streams per HTTP/2 session.
+# 
+# @param h2_max_worker_idle_seconds
+#   Sets maximum number of seconds h2 workers remain idle until shut down.
+# 
+# @param h2_max_workers
+#   Sets maximum number of worker threads to use per child process.
+# 
+# @param h2_min_workers
+#   Sets minimal number of worker threads to use per child process.
+# 
+# @param h2_modern_tls_only
+#   Toggles the security checks on HTTP/2 connections in TLS mode
+#
+# @param h2_push
+#   Toggles the usage of the HTTP/2 server push protocol feature.
+# 
+# @param h2_push_diary_size
+#   Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection.
+# 
+# @param h2_priority
+#   Require HTTP/2 connections to be "modern TLS" only
+# 
+# @param h2_push_resource
+#   When added to a directory/location, HTTP/2 PUSHes will be attempted for all paths added 
+#   via this directive
+# 
+# @param h2_serialize_headers
+#   Toggles if HTTP/2 requests shall be serialized in HTTP/1.1 format for processing by httpd 
+#   core or if received binary data shall be passed into the request_recs directly.
+# 
+# @param h2_stream_max_mem_size
+#   Sets the maximum number of outgoing data bytes buffered in memory for an active streams.
+# 
+# @param h2_tls_cool_down_secs
+#   Sets the number of seconds of idle time on a TLS connection before the TLS write size falls 
+#   back to small (~1300 bytes) length. 
+# 
+# @param h2_tls_warm_up_size
+#   Sets the number of bytes to be sent in small TLS records (~1300 bytes) until doing maximum 
+#   sized writes (16k) on https: HTTP/2 connections. 
+# 
+# @param h2_upgrade
+#   Toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2. 
+# 
+# @param h2_window_size
+#   Sets the size of the window that is used for flow control from client to server and limits 
+#   the amount of data the server has to buffer. 
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_http2.html for additional documentation.
+#
 class apache::mod::http2 (
   Optional[Boolean] $h2_copy_files              = undef,
   Optional[Boolean] $h2_direct                  = undef,
diff --git a/manifests/mod/include.pp b/manifests/mod/include.pp
index edbe81f324..af9675a959 100644
--- a/manifests/mod/include.pp
+++ b/manifests/mod/include.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_include`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_include.html for additional documentation.
+#
 class apache::mod::include {
   ::apache::mod { 'include': }
 }
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index c6f1355e59..d8191bd081 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -1,3 +1,21 @@
+# @summary
+#   Installs and configures `mod_info`.
+# 
+# @param allow_from
+#   Whitelist of IPv4 or IPv6 addresses or ranges that can access the info path.
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @param restrict_access
+#   Toggles whether to restrict access to info path. If `false`, the `allow_from` whitelist is ignored and any IP address can
+#   access the info path.
+# 
+# @param info_path
+#   Path on server to file containing server configuration information.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_info.html for additional documentation.
+#
 class apache::mod::info (
   $allow_from      = ['127.0.0.1','::1'],
   $apache_version  = undef,
diff --git a/manifests/mod/intercept_form_submit.pp b/manifests/mod/intercept_form_submit.pp
index 39f1f5e07b..dba95ced33 100644
--- a/manifests/mod/intercept_form_submit.pp
+++ b/manifests/mod/intercept_form_submit.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_intercept_form_submit`.
+# 
+# @see https://www.adelton.com/apache/mod_intercept_form_submit for additional documentation.
+#
 class apache::mod::intercept_form_submit {
   include ::apache
   ::apache::mod { 'intercept_form_submit': }
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 38dad00713..05bc5ccd36 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -1,3 +1,34 @@
+# @summary
+#   Installs MPM `mod_itk`.
+# 
+# @param startservers
+#   Number of child server processes created on startup.
+#
+# @param minspareservers
+#   Minimum number of idle child server processes.
+#
+# @param maxspareservers
+#   Maximum number of idle child server processes.
+#
+# @param serverlimit
+#   Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache httpd process.
+#
+# @param maxclients
+#   Limit on the number of simultaneous requests that will be served.
+#
+# @param maxrequestsperchild
+#   Limit on the number of connections that an individual child server process will handle.
+#
+# @param enablecapabilities
+#   Drop most root capabilities in the parent process, and instead run as the user given by the User/Group directives with some extra
+#   capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor 
+#   capabilities, such as NFS.
+#
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+# 
+# @see http://mpm-itk.sesse.net for additional documentation.
+#
 class apache::mod::itk (
   $startservers        = '8',
   $minspareservers     = '5',
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index fc459b1fee..bf068320b0 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -1,12 +1,245 @@
-# Class apache::mod::jk
+# @summary
+#   Installs `mod_jk`.
+# 
+# @param ip
+#  IP for binding to mod_jk. Useful when the binding address is not the primary network interface IP.
+# 
+# @param port
+#  Port for binding to mod_jk. Useful when something else, like a reverse proxy or cache, is receiving requests at port 80, then 
+#  needs to forward them to Apache at a different port.
+# 
+# @param add_listen
+#  Defines if a Listen directive according to parameters ip and port (see below), so that Apache listens to the IP/port combination
+#  and redirect to mod_jk. Useful when another Listen directive, like Listen *:<Port> or Listen <Port>, can conflict with the one 
+#  necessary for mod_jk binding.
+# 
+# @param workers_file
+#   The name of a worker file for the Tomcat servlet containers.
+# 
+# @param worker_property
+#   Enables setting worker properties inside Apache configuration file.
+# 
+# @param logroot
+#  The base directory for shm_file and log_file is determined by the logroot parameter. If unspecified, defaults to 
+#  apache::params::logroot. The default logroot is sane enough therefore it is not recommended to override it.
+# 
+# @param shm_file
+#   Shared memory file name.
+# 
+# @param shm_size
+#   Size of the shared memory file name.
+# 
+# @param mount_file
+#   File containing multiple mappings from a context to a Tomcat worker.
+# 
+# @param mount_file_reload
+#   This directive configures the reload check interval in seconds.
+# 
+# @param mount
+#   A mount point from a context to a Tomcat worker.
+# 
+# @param un_mount
+#   An exclusion mount point from a context to a Tomcat worker.
+# 
+# @param auto_alias
+#   Automatically Alias webapp context directories into the Apache document space
+# 
+# @param mount_copy
+#   If this directive is set to "On" in some virtual server, the mounts from the global server will be copied
+#   to this virtual server, more precisely all mounts defined by JkMount or JkUnMount. 
+# 
+# @param worker_indicator
+#   Name of the Apache environment variable that can be used to set worker names in combination with SetHandler 
+#   jakarta-servlet. 
+# 
+# @param watchdog_interval
+#   This directive configures the watchdog thread interval in seconds. 
+# 
+# @param log_file
+#   Full or server relative path to the mod_jk log file.
+# 
+# @param log_level
+#   The mod_jk log level, can be debug, info, warn error or trace. 
+# 
+# @param log_stamp_format
+#   The mod_jk date log format, using an extended strftime syntax. 
+# 
+# @param request_log_format
+#   Request log format string.
+# 
+# @param extract_ssl
+#   Turns on SSL processing and information gathering by mod_jk.
+# 
+# @param https_indicator
+#   Name of the Apache environment variable that contains SSL indication.
+# 
+# @param sslprotocol_indicator
+#   Name of the Apache environment variable that contains the SSL protocol name. 
+# 
+# @param certs_indicator
+#   Name of the Apache environment variable that contains SSL client certificates. 
+# 
+# @param cipher_indicator
+#   Name of the Apache environment variable that contains SSL client cipher.
+# 
+# @param certchain_prefix
+#   Name of the Apache environment (prefix) that contains SSL client chain certificates. 
+# 
+# @param session_indicator
+#   Name of the Apache environment variable that contains SSL session. 
+# 
+# @param keysize_indicator
+#   Name of the Apache environment variable that contains SSL key size in use. 
+# 
+# @param local_name_indicator
+#   Name of the Apache environment variable which can be used to overwrite the forwarded local name. 
+# 
+# @param ignore_cl_indicator
+#   Name of the Apache environment variable which forces to ignore an existing Content-Length request header. 
 #
-# Manages mod_jk connector
+# @param local_addr_indicator
+#   Name of the Apache environment variable which can be used to overwrite the forwarded local IP address.
 #
-# All parameters are optional. When undefined, some receive default values,
-# while others cause an optional directive to be absent
+# @param local_port_indicator
+#   Name of the Apache environment variable which can be used to overwrite the forwarded local port.
+# 
+# @param remote_host_indicator
+#   Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) host name. 
 #
-# For help on parameters, pls see official reference at:
-# https://tomcat.apache.org/connectors-doc/reference/apache.html
+# @param remote_addr_indicator
+#   Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address. 
+#
+# @param remote_port_indicator
+#   Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address. 
+#
+# @param remote_user_indicator
+#   Name of the Apache environment variable which can be used to overwrite the forwarded user name. 
+#
+# @param auth_type_indicator
+#   Name of the Apache environment variable which can be used to overwrite the forwarded authentication type.
+#
+# @param options
+#   Set one of more options to configure the mod_jk module. 
+#
+# @param env_var
+#   Adds a name and an optional default value of environment variable that should be sent to servlet-engine as a request attribute.
+#
+# @param strip_session
+#   If this directive is set to On in some virtual server, the session IDs ;jsessionid=... will be removed for URLs which are not 
+#   forwarded but instead are handled by the local server. 
+#
+# @param workers_file_content
+#   Each directive has the format worker.<Worker name>.<Property>=<Value>. This maps as a hash of hashes, where the outer hash specifies
+#   workers, and each inner hash specifies each worker properties and values. Plus, there are two global directives, 'worker.list' and
+#   'worker.maintain' For example, the workers file below should be parameterized as follows:
+#
+#   Worker file:
+#   ```
+#   worker.list = status
+#   worker.list = some_name,other_name
+#   
+#   worker.maintain = 60
+#   
+#   # Optional comment
+#   worker.some_name.type=ajp13
+#   worker.some_name.socket_keepalive=true
+#   
+#   # I just like comments
+#   worker.other_name.type=ajp12 (why would you?)
+#   worker.other_name.socket_keepalive=false
+#   ```
+#
+#   Puppet file:
+#   ```
+#   $workers_file_content = {
+#     worker_lists    => ['status', 'some_name,other_name'],
+#     worker_maintain => '60',
+#     some_name       => {
+#       comment          => 'Optional comment',
+#       type             => 'ajp13',
+#       socket_keepalive => 'true',
+#     },
+#     other_name      => {
+#       comment          => 'I just like comments',
+#       type             => 'ajp12',
+#       socket_keepalive => 'false',
+#     },
+#   }
+#   ```
+#
+# @param mount_file_content
+#   Each directive has the format <URI> = <Worker name>. This maps as a hash of hashes, where the outer hash specifies workers, and 
+#   each inner hash contains two items:
+#   - uri_list—an array with URIs to be mapped to the worker
+#   - comment—an optional string with a comment for the worker. For example, the mount file below should be parameterized as Figure 2:
+#
+#   Worker file:
+#   ```
+#   # Worker 1
+#   /context_1/ = worker_1
+#   /context_1/* = worker_1
+#
+#   # Worker 2
+#   / = worker_2
+#   /context_2/ = worker_2
+#   /context_2/* = worker_2
+#   ``` 
+#
+#   Puppet file:
+#   ```
+#   $mount_file_content = {
+#     worker_1 => {
+#       uri_list => ['/context_1/', '/context_1/*'],
+#       comment  => 'Worker 1',
+#     },
+#     worker_2 => {
+#       uri_list => ['/context_2/', '/context_2/*'],
+#       comment  => 'Worker 2',
+#     },
+#   },
+#   ```
+#
+# @example
+#   class { '::apache::mod::jk':
+#     ip                   => '192.168.2.15',
+#     workers_file         => 'conf/workers.properties',
+#     mount_file           => 'conf/uriworkermap.properties',
+#     shm_file             => 'run/jk.shm',
+#     shm_size             => '50M',
+#     workers_file_content => {
+#       <Content>
+#     },
+#   }
+#
+# @note
+#   shm_file and log_file
+#   Depending on how these files are specified, the class creates their final path differently:
+#
+#   Relative path: prepends supplied path with logroot (see below)
+#   Absolute path or pipe: uses supplied path as-is
+#
+#   ```
+#   shm_file => 'shm_file'
+#   # Ends up in
+#   $shm_path = '/var/log/httpd/shm_file'
+#
+#   shm_file => '/run/shm_file'
+#   # Ends up in
+#   $shm_path = '/run/shm_file'
+#
+#   shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+#   # Ends up in
+#   $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+#   ```
+#
+# @note
+#   All parameters are optional. When undefined, some receive default values, while others cause an optional
+#   directive to be absent
+#   
+#   Additionally, There is no official package available for mod_jk and thus it must be made available by means outside of the control of the
+#   apache module. Binaries can be found at Apache Tomcat Connectors download page
+# 
+# @see https://tomcat.apache.org/connectors-doc/reference/apache.html for additional documentation.
 #
 class apache::mod::jk (
   # Binding to mod_jk
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 98dd4624d5..48c5eea3fd 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -1,3 +1,50 @@
+# @summary
+#   Installs and configures `mod_ldap`.
+# 
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+# 
+# @param package_name
+#   Specifies the custom package name.
+# 
+# @param ldap_trusted_global_cert_file
+#   Sets the file or database containing global trusted Certificate Authority or global client certificates.
+# 
+# @param ldap_trusted_global_cert_type
+#   Sets the the certificate parameter of the global trusted Certificate Authority or global client certificates.
+# 
+# @param ldap_shared_cache_size
+#   Size in bytes of the shared-memory cache
+# 
+# @param ldap_cache_entries
+#   Maximum number of entries in the primary LDAP cache
+# 
+# @param ldap_cache_ttl
+#   Time that cached items remain valid (in seconds).
+# 
+# @param ldap_opcache_entries
+#   Number of entries used to cache LDAP compare operations
+# 
+# @param ldap_opcache_ttl
+#   Time that entries in the operation cache remain valid (in seconds).
+# 
+# @param ldap_trusted_mode
+#   Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
+#
+# @example 
+#   class { 'apache::mod::ldap':
+#     ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
+#     ldap_trusted_global_cert_type => 'CA_DER',
+#     ldap_trusted_mode             => 'TLS',
+#     ldap_shared_cache_size        => '500000',
+#     ldap_cache_entries            => '1024',
+#     ldap_cache_ttl                => '600',
+#     ldap_opcache_entries          => '1024',
+#     ldap_opcache_ttl              => '600',
+#   }
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_ldap.html for additional documentation.
+#
 class apache::mod::ldap (
   $apache_version                                  = undef,
   $package_name                                    = undef,
diff --git a/manifests/mod/lookup_identity.pp b/manifests/mod/lookup_identity.pp
index 445c60ef21..1e25f5ede7 100644
--- a/manifests/mod/lookup_identity.pp
+++ b/manifests/mod/lookup_identity.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_lookup_identity`
+# 
+# @see https://www.adelton.com/apache/mod_lookup_identity for additional documentation.
+#
 class apache::mod::lookup_identity {
   include ::apache
   ::apache::mod { 'lookup_identity': }
diff --git a/manifests/mod/macro.pp b/manifests/mod/macro.pp
index 2a1218bad4..8766201acb 100644
--- a/manifests/mod/macro.pp
+++ b/manifests/mod/macro.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_macro`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_macro.html for additional documentation.
+#
 class apache::mod::macro {
   include ::apache
   ::apache::mod { 'macro': }
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index f686930932..e4cdd35dc0 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -1,3 +1,17 @@
+# @summary
+#   Installs and configures `mod_mime`.
+# 
+# @param mime_support_package
+#   Name of the MIME package to be installed.
+#
+# @param mime_types_config
+#   The location of the mime.types file.
+#
+# @param mime_types_additional
+#   List of additional MIME types to include.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_mime.html for additional documentation.
+#
 class apache::mod::mime (
   $mime_support_package = $::apache::params::mime_support_package,
   $mime_types_config    = $::apache::params::mime_types_config,
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index ecc74cfddc..582156ba2b 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs and configures `mod_mime_magic`.
+# 
+# @param magic_file
+#   Enable MIME-type determination based on file contents using the specified magic file.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_mime_magic.html for additional documentation.
+#
 class apache::mod::mime_magic (
   $magic_file = undef,
 ) {
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index 1bdea6bbb3..c24cdfac09 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -1,3 +1,14 @@
+# @summary
+#   Installs and configures `mod_negotiation`.
+# 
+# @param force_language_priority
+#   Action to take if a single acceptable document is not found.
+#
+# @param language_priority
+#   The precedence of language variants for cases where the client does not express a preference.
+# 
+# @see [https://httpd.apache.org/docs/current/mod/mod_negotiation.html for additional documentation.
+#
 class apache::mod::negotiation (
   Variant[Array[String], String] $force_language_priority = 'Prefer Fallback',
   Variant[Array[String], String] $language_priority = [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index 8814c9366f..8df2aea382 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -1,3 +1,20 @@
+# @summary
+#   Installs and configures `mod_nss`.
+# 
+# @param transfer_log
+#   Path to `access.log`.
+#
+# @param error_Log
+#   Path to `error.log`
+#
+# @param passwd_file
+#   Path to file containing token passwords used for NSSPassPhraseDialog.
+#
+# @param port
+#   Sets the SSL port that should be used by mod_nss.
+# 
+# @see https://pagure.io/mod_nss for additional documentation.
+#
 class apache::mod::nss (
   $transfer_log = "${::apache::params::logroot}/access.log",
   $error_log    = "${::apache::params::logroot}/error.log",
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index 052dad0b17..84f78dd7ae 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -1,3 +1,18 @@
+# @summary
+#   Installs and configures `mod_pagespeed`.
+# 
+# @todo
+#   Add docs
+#
+# @note
+#   Verify that your system is compatible with the latest Google Pagespeed requirements.
+#
+# Although this apache module requires the mod-pagespeed-stable package, Puppet does not manage the software repositories required to
+# automatically install the package. If you declare this class when the package is either not installed or not available to your 
+# package manager, your Puppet run will fail.
+# 
+# @see https://developers.google.com/speed/pagespeed/module/ for additional documentation.
+#
 class apache::mod::pagespeed (
   $inherit_vhost_config          = 'on',
   $filter_xhtml                  = false,
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index be12255a77..da684de54a 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -1,17 +1,308 @@
-# Manages the settings for the mod_passenger
-# The result is the /etc/mods-available/mod_passenger.conf file
+# @summary
+#   Installs `mod_pasenger`.
 #
-# Where do we get these settings?
-#   Settings are dervied from https://www.phusionpassenger.com/library/config/apache/reference
-#   Also in passenger source code you can strip out what are all the available options by looking in
-#     * src/apache2_module/Configuration.cpp
-#     * src/apache2_module/ConfigurationCommands.cpp
-#   Note: in the src there are several undocumented settings.
+# @param manage_repo
+#   Toggle whether to manage yum repo if on a RedHat node.
+#
+# @param mod_id
+#   Specifies the package id.
+#
+# @param mod_lib
+#   Defines the module's shared object name. Do not configure manually without special reason.
+#
+# @param mod_lib_path
+#   Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter overrides
+#   this value.
+#
+# @param mod_package
+#   Name of the module package to install.
+#
+# @param mod_package_ensure
+#   Determines whether Puppet ensures the module should be installed.
+#
+# @param mod_path
+#   Specifies a path to the module. Do not manually set this parameter without a special reason.
+#
+# @param passenger_allow_encoded_slashes
+#   Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
+#
+# @param passenger_app_env
+#   This option sets, for the current application, the value of the following environment variables:
+#   - RAILS_ENV
+#   - RACK_ENV
+#   - WSGI_ENV
+#   - NODE_ENV
+#   - PASSENGER_APP_ENV
+#
+# @param passenger_app_group_name
+#   Sets the name of the application group that the current application should belong to.
+#
+# @param passenger_app_root
+#   Path to the application root which allows access independent from the DocumentRoot.
+#
+# @param passenger_app_type
+#   Specifies the type of the application. If you set this option, then you must also set PassengerAppRoot, otherwise Passenger will
+#   not properly recognize your application.
+#
+# @param passenger_base_uri
+#   Used to specify that the given URI is an distinct application that should be served by Passenger.
+#
+# @param passenger_buffer_response
+#   Toggle whether application-generated responses are buffered by Apache. Buffering will happen in memory.
+#
+# @param passenger_buffer_upload
+#   Toggle whether HTTP client request bodies are buffered before they are sent to the application. 
+#
+# @param passenger_concurrency_model
+#   Specifies the I/O concurrency model that should be used for Ruby application processes.
+#
+# @param passenger_conf_file
+#   
+#
+# @param passenger_conf_package_file
+#   
+#
+# @param passenger_data_buffer_dir
+#   Specifies the directory in which to store data buffers.
+#
+# @param passenger_debug_log_file
+#   
+#
+# @param passenger_debugger
+#   Turns support for Ruby application debugging on or off. 
+#
+# @param passenger_default_group
+#   Allows you to specify the group that applications must run as, if user switching fails or is disabled.
+#
+# @param passenger_default_ruby
+#   File path to desired ruby interpreter to use by default.
+#
+# @param passenger_default_user
+#   Allows you to specify the user that applications must run as, if user switching fails or is disabled.
+#
+# @param passenger_disable_security_update_check
+#   Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
+#   security updates that might be available.
+#
+# @param passenger_enabled
+#   Toggles whether Passenger should be enabled for that particular context.
+#
+# @param passenger_error_override
+#   Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher. 
+#
+# @param passenger_file_descriptor_log_file
+#   Log file descriptor debug tracing messages to the given file.
+#
+# @param passenger_fly_with
+#   Enables the Flying Passenger mode, and configures Apache to connect to the Flying Passenger daemon that's listening on the 
+#   given socket filename.
+#
+# @param passenger_force_max_concurrent_requests_per_process
+#   Use this option to tell Passenger how many concurrent requests the application can handle per process. 
+#
+# @param passenger_friendly_error_pages
+#   Toggles whether Passenger should display friendly error pages whenever an application fails to start.
+#
+# @param passenger_group
+#   Allows you to override that behavior and explicitly set a group to run the web application as, regardless of the ownership of the 
+#   startup file.
+#
+# @param passenger_high_performance
+#   Toggles whether to enable PassengerHighPerformance which will make Passenger will be a little faster, in return for reduced
+#   compatibility with other Apache modules.
+#
+# @param passenger_installed_version
+#   
+#
+# @param passenger_instance_registry_dir
+#   Specifies the directory that Passenger should use for registering its current instance.
+#
+# @param passenger_load_shell_envvars
+#   Enables or disables the loading of shell environment variables before spawning the application.
+#
+# @param passenger_log_file
+#   File path to log file. By default Passenger log messages are written to the Apache global error log.
+#
+# @param passenger_log_level
+#   Specifies how much information Passenger should log to its log file. A higher log level value means that more 
+#   information will be logged.
+#
+# @param passenger_lve_min_uid
+#   When using Passenger on a LVE-enabled kernel, a security check (enter) is run for spawning application processes. This options
+#   tells the check to only allow processes with UIDs equal to, or higher than, the specified value.
+#
+# @param passenger_max_instances
+#   The maximum number of application processes that may simultaneously exist for an application. 
+#
+# @param passenger_max_instances_per_app
+#   The maximum number of application processes that may simultaneously exist for a single application. 
+#
+# @param passenger_max_pool_size
+#   The maximum number of application processes that may simultaneously exist.
+#
+# @param passenger_max_preloader_idle_time
+#   Set the preloader's idle timeout, in seconds. A value of 0 means that it should never idle timeout.
+#
+# @param passenger_max_request_queue_size
+#   Specifies the maximum size for the queue of all incoming requests.
+#
+# @param passenger_max_request_time
+#   The maximum amount of time, in seconds, that an application process may take to process a request.
+#
+# @param passenger_max_requests
+#   The maximum number of requests an application process will process. 
+#
+# @param passenger_memory_limit
+#   The maximum amount of memory that an application process may use, in megabytes.
+#
+# @param passenger_meteor_app_settings
+#   When using a Meteor application in non-bundled mode, use this option to specify a JSON file with settings for the application.
+#
+# @param passenger_min_instances
+#   Specifies the minimum number of application processes that should exist for a given application. 
+#
+# @param passenger_nodejs
+#   Specifies the Node.js command to use for serving Node.js web applications.
+#
+# @param passenger_pool_idle_time
+#   The maximum number of seconds that an application process may be idle.
+#
+# @param passenger_pre_start
+#   URL of the web application you want to pre-start.
+#
+# @param passenger_python
+#   Specifies the Python interpreter to use for serving Python web applications.
+#
+# @param passenger_resist_deployment_errors
+#   Enables or disables resistance against deployment errors.
+#
+# @param passenger_resolve_symlinks_in_document_root
+#   This option is no longer available in version 5.2.0. Switch to PassengerAppRoot if you are setting the application root via a
+#   document root containing symlinks.
+#
+# @param passenger_response_buffer_high_watermark
+#   Configures the maximum size of the real-time disk-backed response buffering system.
+#
+# @param passenger_restart_dir
+#   Path to directory containing restart.txt file. Can be either absolute or relative.
+#
+# @param passenger_rolling_restarts
+#   Enables or disables support for zero-downtime application restarts through restart.txt.
+#
+# @param passenger_root
+#   Refers to the location to the Passenger root directory, or to a location configuration file. 
+#
+# @param passenger_ruby
+#   Specifies the Ruby interpreter to use for serving Ruby web applications. 
+#
+# @param passenger_security_update_check_proxy
+#   Allows use of an intermediate proxy for the Passenger security update check.
+#
+# @param passenger_show_version_in_header
+#   Toggle whether Passenger will output its version number in the X-Powered-By header in all Passenger-served requests:
+#
+# @param passenger_socket_backlog
+#   This option can be raised if Apache manages to overflow the backlog queue.
+#
+# @param passenger_spawn_method
+#   Controls whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
+#
+# @param passenger_start_timeout
+#   Specifies a timeout for the startup of application processes.
+#
+# @param passenger_startup_file
+#   Specifies the startup file that Passenger should use when loading the application. 
+#
+# @param passenger_stat_throttle_rate
+#   Setting this option to a value of x means that certain filesystem checks will be performed at most once every x seconds.
+#
+# @param passenger_sticky_sessions
+#   Toggles whether all requests that a client sends will be routed to the same originating application process, whenever possible. 
+#
+# @param passenger_sticky_sessions_cookie_name
+#   Sets the name of the sticky sessions cookie.
+#
+# @param passenger_thread_count
+#   Specifies the number of threads that Passenger should spawn per Ruby application process.
+#
+# @param passenger_use_global_queue
+#   N/A.
+#
+# @param passenger_user
+#   Allows you to override that behavior and explicitly set a user to run the web application as, regardless of the ownership of the
+#   startup file.
+#
+# @param passenger_user_switching
+#   Toggles whether to attempt to enable user account sandboxing, also known as user switching.
+#
+# @param rack_auto_detect
+#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+#
+# @param rack_autodetect
+#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+#
+# @param rack_base_uri
+#   Deprecated in 3.0.0 in favor of PassengerBaseURI.
+#
+# @param rack_env
+#   Alias for PassengerAppEnv.
+#
+# @param rails_allow_mod_rewrite
+#   This option doesn't do anything anymore since version 4.0.0.
+#
+# @param rails_app_spawner_idle_time
+#   This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
+#
+# @param rails_auto_detect
+#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+#
+# @param rails_autodetect
+#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+#
+# @param rails_base_uri
+#   Deprecated in 3.0.0 in favor of PassengerBaseURI.
+#
+# @param rails_default_user
+#   Deprecated in 3.0.0 in favor of PassengerDefaultUser
+#
+# @param rails_env
+#   Alias for PassengerAppEnv.
+#
+# @param rails_framework_spawner_idle_time
+#   This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed 
+#   altogether. You should use smart spawning instead.
+#
+# @param rails_ruby
+#   Deprecated in 3.0.0 in favor of PassengerRuby.
+#
+# @param rails_spawn_method
+#   Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
+#
+# @param rails_user_switching
+#   Deprecated in 3.0.0 in favor of PassengerUserSwitching.
+#
+# @param wsgi_auto_detect
+#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
+#
+# @note 
+#   In Passenger source code you can strip out what are all the available options by looking in
+#     - src/apache2_module/Configuration.cpp
+#     - src/apache2_module/ConfigurationCommands.cpp
+#   There are also several undocumented settings.
+#
+# @note
+#   For Red Hat based systems, ensure that you meet the minimum requirements described in the passenger docs.
+#
+# The current set of server configurations settings were taken directly from the Passenger Reference. To enable deprecation warnings 
+# and removal failure messages, set the passenger_installed_version to the version number installed on the server.
 #
 # Change Log:
-#   * As of 08/13/2017 there are 84 available/deprecated/removed settings.
-#   * Around 08/20/2017 UnionStation was discontinued options were removed.
-#   * As of 08/20/2017 there are 77 available/deprecated/removed settings.
+#   - As of 08/13/2017 there are 84 available/deprecated/removed settings.
+#   - Around 08/20/2017 UnionStation was discontinued options were removed.
+#   - As of 08/20/2017 there are 77 available/deprecated/removed settings.
+#
+# @see https://www.phusionpassenger.com/library/config/apache/reference/ for additional documentation.
+#
 class apache::mod::passenger (
   $manage_repo                                                                               = true,
   $mod_id                                                                                    = undef,
diff --git a/manifests/mod/perl.pp b/manifests/mod/perl.pp
index 3bfeac9770..60010a7ec3 100644
--- a/manifests/mod/perl.pp
+++ b/manifests/mod/perl.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_perl`.
+# 
+# @see https://perl.apache.org for additional documentation.
+#
 class apache::mod::perl {
   include ::apache
   ::apache::mod { 'perl': }
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 5683dd66ce..63f6a0a4aa 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_peruser`.
+# 
+# @todo
+#   Add docs
 class apache::mod::peruser (
   $minspareprocessors = '2',
   $minprocessors = '2',
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 28f6404226..83f5dad3d4 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_php`.
+# 
+# @todo
+#   Add docs
 class apache::mod::php (
   $package_name     = undef,
   $package_ensure   = 'present',
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 63e3a294f5..051d925af4 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -1,3 +1,38 @@
+# @summary
+#   Installs and configures MPM `prefork`.
+# 
+# @param startservers
+#   Number of child server processes created at startup.
+#
+# @param minspareservers
+#   Minimum number of idle child server processes.
+# 
+# @param maxspareservers
+#   Maximum number of idle child server processes.
+# 
+# @param serverlimit
+#   Upper limit on configurable number of processes.
+# 
+# @param maxclients
+#   Old alias for MaxRequestWorkers.
+# 
+# @param maxrequestworkers
+#   Maximum number of connections that will be processed simultaneously.
+# 
+# @param maxrequestsperchild
+#  Old alias for MaxConnectionsPerChild.
+# 
+# @param maxconnectionsperchild
+#   Limit on the number of connections that an individual child server will handle during its life.
+#
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+#
+# @param listenbacklog
+#   Maximum length of the queue of pending connections.
+# 
+# @see https://httpd.apache.org/docs/current/mod/prefork.html for additional documentation.
+#
 class apache::mod::prefork (
   $startservers           = '8',
   $minspareservers        = '5',
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 84d116508d..b5c7a381a4 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -1,3 +1,26 @@
+# @summary
+#   Installs and configures `mod_proxy`.
+# 
+# @param proxy_requests
+#   Enables forward (standard) proxy requests.
+# 
+# @param allow_from
+#   List of IPs allowed to access proxy.
+# 
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+# 
+# @param package_name
+#   Name of the proxy package to install.
+# 
+# @param proxy_via
+#   Set local IP address for outgoing proxy connections.
+# 
+# @param proxy_timeout
+#   Network timeout for proxied requests.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
+#
 class apache::mod::proxy (
   $proxy_requests = 'Off',
   $allow_from     = undef,
diff --git a/manifests/mod/proxy_ajp.pp b/manifests/mod/proxy_ajp.pp
index a011a17895..36bea00c83 100644
--- a/manifests/mod/proxy_ajp.pp
+++ b/manifests/mod/proxy_ajp.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_proxy_ajp`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html for additional documentation.
+#
 class apache::mod::proxy_ajp {
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_ajp']
   ::apache::mod { 'proxy_ajp': }
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index dbc86df427..7089540af5 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -1,3 +1,20 @@
+# @summary
+#   Installs and configures `mod_proxy_balancer`.
+# 
+# @param manager
+#   Toggle whether to enable balancer manager support.
+#
+# @param maanger_path
+#   Server relative path to balancer manager.
+#
+# @param allow_from
+#   List of IPs from which the balancer manager can be accessed.
+#
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html for additional documentation.
+#
 class apache::mod::proxy_balancer(
   Boolean $manager                   = false,
   Stdlib::Absolutepath $manager_path = '/balancer-manager',
diff --git a/manifests/mod/proxy_connect.pp b/manifests/mod/proxy_connect.pp
index cda5b89dc6..56103f611d 100644
--- a/manifests/mod/proxy_connect.pp
+++ b/manifests/mod/proxy_connect.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs `mod_proxy_connect`.
+# 
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html for additional documentation.
+#
 class apache::mod::proxy_connect (
   $apache_version  = undef,
 ) {
diff --git a/manifests/mod/proxy_fcgi.pp b/manifests/mod/proxy_fcgi.pp
index 21473eb762..84bc3d178f 100644
--- a/manifests/mod/proxy_fcgi.pp
+++ b/manifests/mod/proxy_fcgi.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_proxy_fcgi`.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html for additional documentation.
+#
 class apache::mod::proxy_fcgi {
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_fcgi']
   ::apache::mod { 'proxy_fcgi': }
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 94259bd77e..7cf4695446 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_proxy_html`.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy_html.html for additional documentation.
+#
 class apache::mod::proxy_html {
   include ::apache
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
diff --git a/manifests/mod/proxy_http.pp b/manifests/mod/proxy_http.pp
index 1579e68ee2..b80857c205 100644
--- a/manifests/mod/proxy_http.pp
+++ b/manifests/mod/proxy_http.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_proxy_http`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy_http.html for additional documentation.
+#
 class apache::mod::proxy_http {
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_http']
   ::apache::mod { 'proxy_http': }
diff --git a/manifests/mod/proxy_wstunnel.pp b/manifests/mod/proxy_wstunnel.pp
index 290954b742..14e3f9d356 100644
--- a/manifests/mod/proxy_wstunnel.pp
+++ b/manifests/mod/proxy_wstunnel.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_proxy_wstunnel`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html for additional documentation.
+#
 class apache::mod::proxy_wstunnel {
   include ::apache, ::apache::mod::proxy
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_wstunnel']
diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp
index 67f578d419..3ad11b9fff 100644
--- a/manifests/mod/python.pp
+++ b/manifests/mod/python.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs and configures `mod_python`.
+# 
+# @param loadfile_name
+#   Sets the name of the configuration file that is used to load the python module.
+# 
+# @see https://github.com/grisha/mod_python for additional documentation.
+#
 class apache::mod::python (
   Optional[String] $loadfile_name = undef,
 ) {
diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index d628819376..2c9b6fc58c 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -1,4 +1,5 @@
-# @summary Setup and load Apache `mod_remoteip`
+# @summary 
+#   Installs and configures `mod_remoteip`.
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_remoteip.html
 #
@@ -50,6 +51,8 @@
 #   A version string used to validate that your apache version supports
 #   `mod_remoteip`. If not specified, `$::apache::apache_version` is used.
 #
+# @see https://httpd.apache.org/docs/current/mod/mod_remoteip.html for additional documentation.
+#
 class apache::mod::remoteip (
   String                                                     $header                    = 'X-Forwarded-For',
   Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $internal_proxy            = undef,
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index f166f6d6f6..8b4dbed3e0 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs and configures `mod_reqtimeout`.
+# 
+# @param timeouts
+#   List of timeouts and data rates for receiving requests.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html for additional documentation.
+#
 class apache::mod::reqtimeout (
   $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
 ){
diff --git a/manifests/mod/rewrite.pp b/manifests/mod/rewrite.pp
index 694f0b6f5c..e7622b1975 100644
--- a/manifests/mod/rewrite.pp
+++ b/manifests/mod/rewrite.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_rewrite`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_rewrite.html for additional documentation.
+#
 class apache::mod::rewrite {
   include ::apache::params
   ::apache::mod { 'rewrite': }
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index b9afa149f2..21430a3669 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -1,3 +1,20 @@
+# @summary
+#   Installs and configures `mod_rpaf`.
+# 
+# @param sethostname
+#   Toggles whether to update vhost name so ServerName and ServerAlias work.
+# 
+# @param proxy_ips
+#   List of IPs & bitmasked subnets to adjust requests for
+#
+# @param header
+#   Header to use for the real IP address.
+#
+# @param template
+#   Path to template to use for configuring mod_rpaf.
+#
+# @see https://github.com/gnif/mod_rpaf for additional documentation.
+#
 class apache::mod::rpaf (
   $sethostname = true,
   $proxy_ips   = [ '127.0.0.1' ],
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 68d90b4e90..f7bef39c1d 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -1,3 +1,89 @@
+
+# @summary
+#   Installs and configures `mod_security`.
+# 
+# @param logroot
+#   Configures the location of audit and debug logs.
+# 
+# @param crs_package
+#   Name of package that installs CRS rules.
+# 
+# @param activated_rules
+#   An array of rules from the modsec_crs_path or absolute to activate via symlinks.
+# 
+# @param modsec_dir
+#   Defines the path where Puppet installs the modsec configuration and activated rules links.
+# 
+# @param modsec_secruleengine
+#   Configures the rules engine.
+# 
+# @param audit_log_relevant_status
+#   Configures which response status code is to be considered relevant for the purpose of audit logging.
+# 
+# @param audit_log_parts
+#   Defines which parts of each transaction are going to be recorded in the audit log. Each part is assigned a single letter; when a
+#   letter appears in the list then the equivalent part will be recorded.
+# 
+# @param secpcrematchlimit
+#   Sets the match limit in the PCRE library.
+# 
+# @param secpcrematchlimitrecursion
+#   Sets the match limit recursion in the PCRE library.
+# 
+# @param allowed_methods
+#   A space-separated list of allowed HTTP methods.
+# 
+# @param content_types
+#   A list of one or more allowed MIME types.
+# 
+# @param restricted_extensions
+#   A space-sparated list of prohibited file extensions.
+# 
+# @param restricted_headers
+#   A list of restricted headers separated by slashes and spaces.
+# 
+# @param secdefaultaction
+#   Defines the default list of actions, which will be inherited by the rules in the same configuration context.
+# 
+# @param anomaly_score_blocking
+#   Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set.
+# 
+# @param inbound_anomaly_threshold
+#   Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+# 
+# @param outbound_anomaly_threshold
+#   Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
+# 
+# @param critical_anomaly_score
+#   Sets the Anomaly Score for rules assigned with a critical severity.
+# 
+# @param error_anomaly_score
+#   Sets the Anomaly Score for rules assigned with a error severity.
+# 
+# @param warning_anomaly_score
+#   Sets the Anomaly Score for rules assigned with a warning severity.
+# 
+# @param notice_anomaly_score
+#   Sets the Anomaly Score for rules assigned with a notice severity.
+# 
+# @param secrequestmaxnumargs
+#   Sets the maximum number of arguments in the request.
+# 
+# @param secrequestbodylimit
+#   Sets the maximum request body size ModSecurity will accept for buffering.
+# 
+# @param secrequestbodynofileslimit
+#   Configures the maximum request body size ModSecurity will accept for buffering, excluding the size of any files being transported 
+#   in the request.
+# 
+# @param secrequestbodyinmemorylimit
+#   Configures the maximum request body size that ModSecurity will store in memory.
+# 
+# @param manage_security_crs
+#   Toggles whether to manage ModSecurity Core Rule Set 
+#
+# @see https://github.com/SpiderLabs/ModSecurity/wiki for additional documentation.
+#
 class apache::mod::security (
   $logroot                    = $::apache::params::logroot,
   $crs_package                 = $::apache::params::modsec_crs_package,
diff --git a/manifests/mod/setenvif.pp b/manifests/mod/setenvif.pp
index d7baf582e3..6e07a32c1c 100644
--- a/manifests/mod/setenvif.pp
+++ b/manifests/mod/setenvif.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_setenvif`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_setenvif.html for additional documentation.
+#
 class apache::mod::setenvif {
   include ::apache
   ::apache::mod { 'setenvif': }
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 318a3a3407..064e5b70bc 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -1,3 +1,28 @@
+# @summary
+#   Installs and configures `mod_shib`.
+# 
+# @param suppress_warning
+#   Toggles whether to trigger warning on RedHat nodes.
+# 
+# @param mod_full_path
+#   Specifies a path to the module. Do not manually set this parameter without a special reason.
+# 
+# @param package_name
+#   Name of the Shibboleth package to be installed.
+# 
+# @param mod_lib
+#   Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter 
+#   overrides this value. 
+#
+# This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
+# can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
+# 
+# @note
+#   The Shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories. 
+#   See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide).
+#
+# @see https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig for additional documentation.
+#
 class apache::mod::shib (
   $suppress_warning = false,
   $mod_full_path    = undef,
diff --git a/manifests/mod/socache_shmcb.pp b/manifests/mod/socache_shmcb.pp
index 7bfb4c6b57..e5b463ff58 100644
--- a/manifests/mod/socache_shmcb.pp
+++ b/manifests/mod/socache_shmcb.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_socache_shmcb`.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html for additional documentation.
+#
 class apache::mod::socache_shmcb {
     ::apache::mod { 'socache_shmcb': }
-}
\ No newline at end of file
+}
diff --git a/manifests/mod/speling.pp b/manifests/mod/speling.pp
index fbd19d373c..dfd7433c86 100644
--- a/manifests/mod/speling.pp
+++ b/manifests/mod/speling.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_spelling`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_speling.html for additional documentation.
+#
 class apache::mod::speling {
   include ::apache
   ::apache::mod { 'speling': }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 3064bf815e..73bc91e98e 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -1,3 +1,79 @@
+# @summary
+#   Installs `mod_ssl`.
+# 
+# @param ssl_compression
+#   Enable compression on the SSL level.
+#
+# @param ssl_cryptodevice
+#   Enable use of a cryptographic hardware accelerator.
+#
+# @param ssl_options
+#   Configure various SSL engine run-time options.
+#
+# @param ssl_openssl_conf_cmd
+#   Configure OpenSSL parameters through its SSL_CONF API.
+#
+# @param ssl_cert
+#   Path to server PEM-encoded X.509 certificate data file.
+#
+# @param ssl_key
+#   Path to server PEM-encoded private key file
+#
+# @param ssl_ca
+#   File of concatenated PEM-encoded CA Certificates for Client Auth.
+#
+# @param ssl_cipher
+#   Cipher Suite available for negotiation in SSL handshake.
+#
+# @param ssl_honorcipherorder
+#   Option to prefer the server's cipher preference order.
+#
+# @param ssl_protocol
+#   Configure usable SSL/TLS protocol versions.
+#
+# @param ssl_proxy_protocol
+#   Configure usable SSL protocol flavors for proxy usage.
+#
+# @param ssl_pass_phrase_dialog
+#   Type of pass phrase dialog for encrypted private keys.
+#
+# @param ssl_random_seed_bytes
+#   Pseudo Random Number Generator (PRNG) seeding source.
+#
+# @param ssl_sessioncache
+#   Configures the storage type of the global/inter-process SSL Session Cache
+#
+# @param ssl_sessioncachetimeout
+#   Number of seconds before an SSL session expires in the Session Cache.
+#
+# @param ssl_stapling
+#   Enable stapling of OCSP responses in the TLS handshake.
+#
+# @param ssl_stapling_return_errors
+#   Pass stapling related OCSP errors on to client.
+#
+# @param ssl_mutex
+#   Configures mutex mechanism and lock file directory for all or specified mutexes.
+#   Default based on the OS and/or Apache version:
+#   - RedHat/FreeBSD/Suse/Gentoo: 'default'.
+#   - Debian/Ubuntu + Apache >= 2.4: 'default'.
+#   - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
+#   - Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
+#
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+#
+# @param package_name
+#   Name of ssl package to install.
+#
+# On most operating systems, the ssl.conf is placed in the module configuration directory. On Red Hat based operating systems, this
+# file is placed in /etc/httpd/conf.d, the same location in which the RPM stores the configuration.
+#
+# To use SSL with a virtual host, you must either set the default_ssl_vhost parameter in ::apache to true or the ssl parameter in 
+# apache::vhost to true.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_ssl.html for additional documentation.
+#
 class apache::mod::ssl (
   Boolean $ssl_compression                                  = false,
   $ssl_cryptodevice                                         = 'builtin',
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 988e13b3cc..0eedf64ecb 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -1,14 +1,13 @@
-# Class: apache::mod::status
+# @summary
+#   Installs and configures `mod_status`.
 #
-# This class enables and configures Apache mod_status
-# See: http://httpd.apache.org/docs/current/mod/mod_status.html
+# @param allow_from
+#   Array of hosts, ip addresses, partial network numbers or networks, in CIDR notation specifying what hosts can view the special
+#   /server-status URL.  Defaults to ['127.0.0.1', '::1']. 
+#   > Creates Apache < 2.4 directive "Allow from".
 #
-# Parameters:
-# - $allow_from is an array of hosts, ip addresses, partial network numbers
-#   or networks in CIDR notation specifying what hosts can view the special
-#   /server-status URL.  Defaults to ['127.0.0.1', '::1'].
-#   > Creates Apache < 2.4 directive "Allow from"
-# - $requires is either a:
+# @param requires
+#   A Variant type that can be:
 #   - String with:
 #     - '' or 'unmanaged' - Host auth control done elsewhere
 #     - 'ip <List of IPs>' - Allowed IPs/ranges
@@ -21,23 +20,23 @@
 #       This encloses "Require" directives in "<Require(Any|All|None)>" block
 #       Optional - If unspecified, "Require" directives follow current flow
 #   > Creates Apache >= 2.4 directives "Require"
-# - $extended_status track and display extended status information. Valid
-#   values are 'On' or 'Off'.  Defaults to 'On'.
-# - $status_path is the path assigned to the Location directive which
-#   defines the URL to access the server status. Defaults to '/server-status'.
 #
-# Actions:
-# - Enable and configure Apache mod_status
+# @param extended_status
+#   Determines whether to track extended status information for each request, via the ExtendedStatus directive.
 #
-# Requires:
-# - The apache class
+# @param status_path 
+#   Path assigned to the Location directive which defines the URL to access the server status.
 #
-# Sample Usage:
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
 #
-#  # Simple usage allowing access from localhost and a private subnet
-#  class { 'apache::mod::status':
-#    $allow_from => ['127.0.0.1', '10.10.10.10/24'],
-#  }
+# @example
+#   # Simple usage allowing access from localhost and a private subnet
+#   class { 'apache::mod::status':
+#     $allow_from => ['127.0.0.1', '10.10.10.10/24'],
+#   }
+#
+# @see http://httpd.apache.org/docs/current/mod/mod_status.html for additional documentation.
 #
 class apache::mod::status (
   Optional[Array] $allow_from                      = undef,
diff --git a/manifests/mod/suexec.pp b/manifests/mod/suexec.pp
index ded013d499..b6a28b1f12 100644
--- a/manifests/mod/suexec.pp
+++ b/manifests/mod/suexec.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_suexec`.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_suexec.html for additional documentation.
+#
 class apache::mod::suexec {
   ::apache::mod { 'suexec': }
 }
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index 52b8b3de94..1b998d9f3c 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_suphp`.
+#
+# @see https://www.suphp.org/DocumentationView.html?file=apache/INSTALL for additional documentation.
+#
 class apache::mod::suphp (
 ){
   if  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 203b93dd11..cd0359e820 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -1,3 +1,29 @@
+# @summary
+#   Installs and configures `mod_userdir`.
+# 
+# @param home
+#   *Deprecated* Path to system home directory.
+#   
+# @param dir
+#   *Deprecated* Path from user's home directory to public directory.
+# 
+# @param disable_root
+#   Toggles whether to allow use of root directory.
+# 
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+# 
+# @param path
+#   Path to directory or pattern from which to find user-specific directories.
+# 
+# @param overrides
+#   Array of directives that are allowed in .htaccess files.
+# 
+# @param options
+#   Configures what features are available in a particular directory.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_userdir.html for additional documentation.
+#
 class apache::mod::userdir (
   $home = undef,
   $dir = undef,
diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
index 1cc4412e1d..a3a658c48a 100644
--- a/manifests/mod/version.pp
+++ b/manifests/mod/version.pp
@@ -1,3 +1,11 @@
+# @summary
+#   Installs `mod_version`.
+# 
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_version.html for additional documentation.
+#
 class apache::mod::version(
   $apache_version = $::apache::apache_version
 ) {
diff --git a/manifests/mod/vhost_alias.pp b/manifests/mod/vhost_alias.pp
index 30ae122e15..3ff6fd1aa3 100644
--- a/manifests/mod/vhost_alias.pp
+++ b/manifests/mod/vhost_alias.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs Apache `mod_vhost_alias`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_vhost_alias.html for additional documentation.
+#
 class apache::mod::vhost_alias {
   ::apache::mod { 'vhost_alias': }
 }
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 00a9439b31..695c4907bc 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -1,56 +1,46 @@
-# == Class: apache::mod::worker
+# @summary
+#   Installs and manages the MPM `worker`.
 #
+# @param startservers
+#   The number of child server processes created on startup
 #
-# === Parameters
-#
-#  [*startservers*]
-#   (optional) The number of child server processes created on startup
-#   Defaults is '2'
-#
-#  [*maxclients*]
-#   (optional) The max number of simultaneous requests that will be served.
+# @param maxclients
+#   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.
-#   Default is '150'
 #
-#  [*minsparethreads*]
-#   (optional) Minimum number of idle threads to handle request spikes.
-#   Default is '25'
+# @param minsparethreads
+#   Minimum number of idle threads to handle request spikes.
 #
-#  [*maxsparethreads*]
-#   (optional) Maximum number of idle threads.
-#   Default is '75'
+# @param maxsparethreads
+#   Maximum number of idle threads.
 #
-#  [*threadsperchild*]
-#   (optional) The number of threads created by each child process.
-#   Default is '25'
+# @param threadsperchild
+#   The number of threads created by each child process.
 #
-#  [*maxrequestsperchild*]
-#   (optional) Limit on the number of connectiojns an individual child server
+# @param maxrequestsperchild
+#   Limit on the number of connectiojns an individual child server
 #   process will handle. This is the old name and is still supported. The new
 #   name is MaxConnectionsPerChild as of 2.3.9+.
-#   Default is '0'
 #
-#  [*serverlimit*]
-#   (optional) With worker, use this directive only if your MaxRequestWorkers
+# @param serverlimit
+#   With worker, use this directive only if your MaxRequestWorkers
 #   and ThreadsPerChild settings require more than 16 server processes
 #   (default). Do not set the value of this directive any higher than the
 #   number of server processes required by what you may want for
 #   MaxRequestWorkers and ThreadsPerChild.
-#   Default is '25'
 #
-#  [*threadlimit*]
-#   (optional) This directive sets the maximum configured value for
+# @param threadlimit
+#   This directive sets the maximum configured value for
 #   ThreadsPerChild for the lifetime of the Apache httpd process.
-#   Default is '64'
 #
-#  [*listenbacklog*]
-#    (optional) Maximum length of the queue of pending connections.
-#    Defaults is '511'
+# @param listenbacklog
+#    Maximum length of the queue of pending connections.
+#
+# @param apache_version
+#   Used to verify that the Apache version you have requested is compatible with the module.
 #
-#  [*apache_version*]
-#   (optional)
-#   Default is $::apache::apache_version
+# @see https://httpd.apache.org/docs/current/mod/worker.html for additional documentation.
 #
 class apache::mod::worker (
   $startservers        = '2',
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 38e7a86d56..94f34b98e1 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -1,3 +1,32 @@
+# @summary
+#   Installs and configures `mod_wsgi`.
+# 
+# @param wsgi_restrict_embedded
+#   Enable restrictions on use of embedded mode.
+# 
+# @param wsgi_socket_prefix
+#   Configure directory to use for daemon sockets.
+# 
+# @param wsgi_python_path
+#   Additional directories to search for Python modules.
+# 
+# @param wsgi_python_home
+#   Absolute path to Python prefix/exec_prefix directories.
+# 
+# @param wsgi_python_optimize
+#   Enables basic Python optimisation features.
+# 
+# @param wsgi_application_group
+#   Sets which application group WSGI application belongs to.
+# 
+# @param package_name
+#   Names of package that installs mod_wsgi.
+# 
+# @param mod_path
+#   Defines the path to the mod_wsgi shared object (.so) file.
+# 
+# @see https://github.com/GrahamDumpleton/mod_wsgi for additional documentation.
+#
 class apache::mod::wsgi (
   $wsgi_restrict_embedded = undef,
   $wsgi_socket_prefix     = $::apache::params::wsgi_socket_prefix,
diff --git a/manifests/mod/xsendfile.pp b/manifests/mod/xsendfile.pp
index 7c5e88437a..7d34ca7260 100644
--- a/manifests/mod/xsendfile.pp
+++ b/manifests/mod/xsendfile.pp
@@ -1,3 +1,8 @@
+# @summary
+#   Installs `mod_xsendfile`.
+# 
+# @see https://tn123.org/mod_xsendfile/ for additional documentation.
+#
 class apache::mod::xsendfile {
   include ::apache::params
   ::apache::mod { 'xsendfile': }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 7f3585c42f..270c89b54e 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -1,3 +1,6 @@
+# @summary Enables the use of Apache MPMs.
+#
+# @api private
 define apache::mpm (
   $lib_path       = $::apache::lib_path,
   $apache_version = $::apache::apache_version,
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index 4fa8795185..9701a1ac98 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -1,3 +1,9 @@
+# @summary
+#   Enables name-based virtual hosts 
+#
+# Adds all related directives to the `ports.conf` file in the Apache HTTPD configuration 
+# directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`, 
+# `\<IP\>`, or `\<IP\>:\<PORT\>`.
 define apache::namevirtualhost {
   $addr_port = $name
 
diff --git a/manifests/package.pp b/manifests/package.pp
index 7c95f99800..46bd98d2ce 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -1,3 +1,7 @@
+# @summary
+#   Installs an Apache MPM.
+#
+# @api private
 class apache::package (
   $ensure     = 'present',
   $mpm_module = $::apache::params::mpm_module,
diff --git a/manifests/params.pp b/manifests/params.pp
index c29a7bbf25..147f9bed53 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,23 +1,7 @@
-# Class: apache::params
-#
-# This class manages Apache parameters
-#
-# Parameters:
-# - The $user that Apache runs as
-# - The $group that Apache runs as
-# - The $apache_name is the name of the package and service on the relevant
-#   distribution
-# - The $php_package is the name of the package that provided PHP
-# - The $ssl_package is the name of the Apache SSL package
-# - The $apache_dev is the name of the Apache development libraries package
-# - The $conf_contents is the contents of the Apache configuration file
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
+# @summary
+#   This class manages Apache parameters
 #
+# @api private
 class apache::params inherits ::apache::version {
   if($::fqdn) {
     $servername = $::fqdn
diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
index 97143a1d4f..e0e4a5ec58 100644
--- a/manifests/peruser/multiplexer.pp
+++ b/manifests/peruser/multiplexer.pp
@@ -1,3 +1,9 @@
+# @summary
+#   Checks if an Apache module has a class.
+#
+# If Apache has a class, it includes that class. If it does not, it passes the module name to the `apache::mod` defined type.
+#
+# @api private
 define apache::peruser::multiplexer (
   $user = $::apache::user,
   $group = $::apache::group,
diff --git a/manifests/peruser/processor.pp b/manifests/peruser/processor.pp
index 30de61d7c4..798ee95791 100644
--- a/manifests/peruser/processor.pp
+++ b/manifests/peruser/processor.pp
@@ -1,3 +1,7 @@
+# @summary
+#   Enables the `Peruser` module for FreeBSD only.
+#
+# @api private
 define apache::peruser::processor (
   $user,
   $group,
diff --git a/manifests/php.pp b/manifests/php.pp
index 9fa9c682e2..24758417ac 100644
--- a/manifests/php.pp
+++ b/manifests/php.pp
@@ -1,17 +1,10 @@
-# Class: apache::php
+# @summary
+#   This class installs PHP for Apache.
 #
-# This class installs PHP for Apache
-#
-# Parameters:
-# - $php_package
-#
-# Actions:
-#   - Install Apache PHP package
-#
-# Requires:
-#
-# Sample Usage:
+# @note 
+#    This class is deprecated.
 #
+# @api private
 class apache::php {
   warning('apache::php is deprecated; please use apache::mod::php')
   include ::apache::mod::php
diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index 050f36c278..1ecdaa8f8d 100644
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -1,14 +1,10 @@
-# Class: apache::proxy
+# @summary
+#   This class enabled the proxy module for Apache.
 #
-# This class enabled the proxy module for Apache
-#
-# Actions:
-#   - Enables Apache Proxy module
-#
-# Requires:
-#
-# Sample Usage:
+# @note
+#   This class is deprecated.
 #
+# @api private
 class apache::proxy {
   warning('apache::proxy is deprecated; please use apache::mod::proxy')
   include ::apache::mod::proxy
diff --git a/manifests/python.pp b/manifests/python.pp
index 723a753f82..067ebc7867 100644
--- a/manifests/python.pp
+++ b/manifests/python.pp
@@ -1,6 +1,5 @@
-# Class: apache::python
-#
-# This class installs Python for Apache
+# @summary
+#   This class installs Python for Apache
 #
 # Parameters:
 # - $php_package
@@ -12,6 +11,7 @@
 #
 # Sample Usage:
 #
+# @api private
 class apache::python {
   warning('apache::python is deprecated; please use apache::mod::python')
   include ::apache::mod::python
diff --git a/manifests/security/rule_link.pp b/manifests/security/rule_link.pp
index 7edb1f442e..d8b79e156a 100644
--- a/manifests/security/rule_link.pp
+++ b/manifests/security/rule_link.pp
@@ -1,3 +1,7 @@
+# @summary
+#   Links the activated_rules from `apache::mod::security` to the respective CRS rules on disk.
+#
+# @api private
 define apache::security::rule_link () {
 
   $parts = split($title, '/')
diff --git a/manifests/service.pp b/manifests/service.pp
index ff082dccbf..703d95f842 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -1,21 +1,7 @@
-# Class: apache::service
-#
-# Manages the Apache daemon
-#
-# Parameters:
-#
-# Actions:
-#   - Manage Apache service
-#
-# Requires:
-#
-# Sample Usage:
-#
-#    sometype { 'foo':
-#      notify => Class['apache::service'],
-#    }
-#
+# @summary
+#   Installs and configures Apache service.
 #
+# @api private
 class apache::service (
   $service_name           = $::apache::params::service_name,
   Boolean $service_enable = true,
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index d0b36593d6..c444263828 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -1,17 +1,10 @@
-# Class: apache::ssl
+# @summary
+#   This class installs Apache SSL capabilities
 #
-# This class installs Apache SSL capabilities
-#
-# Parameters:
-# - The $ssl_package name from the apache::params class
-#
-# Actions:
-#   - Install Apache SSL capabilities
-#
-# Requires:
-#
-# Sample Usage:
+# @note
+#   This class is deprecated.
 #
+# @api private
 class apache::ssl {
   warning('apache::ssl is deprecated; please use apache::mod::ssl')
   include ::apache::mod::ssl
diff --git a/manifests/version.pp b/manifests/version.pp
index 82c00c5f91..9116fadba3 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -1,7 +1,7 @@
-# Class: apache::version
-#
-# Try to automatically detect the version by OS
+# @summary
+#   Try to automatically detect the version by OS
 #
+# @api private
 class apache::version(
   Optional[String] $scl_httpd_version = undef,
   Optional[String] $scl_php_version   = undef,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 6a77e764de..3f93e6a480 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1,4 +1,1627 @@
-# See README.md for usage information
+# @summary
+#   Allows specialised configurations for virtual hosts that possess requirements 
+#   outside of the defaults.
+#
+# The apache module allows a lot of flexibility in the setup and configuration of virtual hosts. 
+# This flexibility is due, in part, to `vhost` being a defined resource type, which allows Apache 
+# to evaluate it multiple times with different parameters.<br />
+# The `apache::vhost` defined type allows you to have specialized configurations for virtual hosts 
+# that have requirements outside the defaults. You can set up a default virtual host within 
+# the base `::apache` class, as well as set a customized virtual host as the default. 
+# Customized virtual hosts have a lower numeric `priority` than the base class's, causing 
+# Apache to process the customized virtual host first.<br />
+# The `apache::vhost` defined type uses `concat::fragment` to build the configuration file. To 
+# inject custom fragments for pieces of the configuration that the defined type doesn't 
+# inherently support, add a custom fragment.<br />
+# For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples 
+# of 10, so any `order` that isn't a multiple of 10 should work.<br />
+# > **Note:** When creating an `apache::vhost`, it cannot be named `default` or `default-ssl`, 
+# because vhosts with these titles are always managed by the module. This means that you cannot 
+# override `Apache::Vhost['default']`  or `Apache::Vhost['default-ssl]` resources. An optional 
+# workaround is to create a vhost named something else, such as `my default`, and ensure that the 
+# `default` and `default_ssl` vhosts are set to `false`:
+#
+# @example
+#   class { 'apache':
+#     default_vhost     => false,
+#     default_ssl_vhost => false,
+#   }
+#
+# @param apache_version
+#   Apache's version number as a string, such as '2.2' or '2.4'.
+#
+# @param access_log
+#   Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
+# 
+# @param access_log_env_var
+#   Specifies that only requests with particular environment variables be logged.
+# 
+# @param access_log_file
+#   Sets the filename of the `*_access.log` placed in `logroot`. Given a virtual host ---for 
+#   instance, example.com--- it defaults to 'example.com_ssl.log' for 
+#   [SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and 
+#   `example.com_access.log` for unencrypted virtual hosts.
+# 
+# @param access_log_format
+#   Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the 
+#   access log.
+# 
+# @param access_log_pipe
+#   Specifies a pipe where Apache sends access log messages.
+#
+# @param access_log_syslog
+#   Sends all access log messages to syslog.
+#
+# @param access_logs
+#   Allows you to give a hash that specifies the state of each of the `access_log_*` 
+#   directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
+# 
+# @param add_default_charset
+#   Sets a default media charset value for the `AddDefaultCharset` directive, which is 
+#   added to `text/plain` and `text/html` responses.
+# 
+# @param add_listen
+#   Determines whether the virtual host creates a `Listen` statement.<br />
+#   Setting `add_listen` to `false` prevents the virtual host from creating a `Listen` 
+#   statement. This is important when combining virtual hosts that aren't passed an `ip` 
+#   parameter with those that are.
+# 
+# @param use_optional_includes
+#   Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for 
+#   `additional_includes` in Apache 2.4 or newer.
+# 
+# @param additional_includes
+#   Specifies paths to additional static, virtual host-specific Apache configuration files. 
+#   You can use this parameter to implement a unique, custom configuration not supported by 
+#   this module.
+# 
+# @param aliases
+#   Passes a list of [hashes][hash] to the virtual host to create `Alias`, `AliasMatch`, 
+#   `ScriptAlias` or `ScriptAliasMatch` directives as per the `mod_alias` documentation.<br />
+#   For example:
+#   ``` puppet
+#   aliases => [
+#     { aliasmatch       => '^/image/(.*)\.jpg$',
+#       path             => '/files/jpg.images/$1.jpg',
+#     },
+#     { alias            => '/image',
+#       path             => '/ftp/pub/image',
+#     },
+#     { scriptaliasmatch => '^/cgi-bin(.*)',
+#       path             => '/usr/local/share/cgi-bin$1',
+#     },
+#     { scriptalias      => '/nagios/cgi-bin/',
+#       path             => '/usr/lib/nagios/cgi-bin/',
+#     },
+#     { alias            => '/nagios',
+#       path             => '/usr/share/nagios/html',
+#     },
+#   ],
+#   ```
+#   For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs 
+#   a corresponding context, such as `<Directory /path/to/directory>` or 
+#   `<Location /some/location/here>`. Puppet creates the directives in the order specified in 
+#   the `aliases` parameter. As described in the `mod_alias` documentation, add more specific 
+#   `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more 
+#   general ones to avoid shadowing.<BR />
+#   > **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because 
+#   you can precisely control the order of various alias directives. Defining `ScriptAliases` 
+#   using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after 
+#   *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` 
+#   directives. This often causes problems; for example, this could cause problems with Nagios.<BR />
+#   If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias` 
+#   directive might not be able to honor the `PassengerEnabled => off` statement. See 
+#   [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
+# 
+# @param allow_encoded_slashes
+#   Sets the `AllowEncodedSlashes` declaration for the virtual host, overriding the server 
+#   default. This modifies the virtual host responses to URLs with `\` and `/` characters. The 
+#   default setting omits the declaration from the server configuration and selects the 
+#   Apache default setting of `Off`.
+# 
+# @param block
+#   Specifies the list of things to which Apache blocks access. Valid options are: `scm` (which 
+#   blocks web access to `.svn`), `.git`, and `.bzr` directories.
+# 
+# @param cas_attribute_prefix
+#   Adds a header with the value of this header being the attribute values when SAML 
+#   validation is enabled.
+# 
+# @param cas_attribute_delimiter
+#   Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
+# 
+# @param cas_login_url
+#   Sets the URL to which the module redirects users when they attempt to access a 
+#   CAS-protected resource and don't have an active session.
+# 
+# @param cas_root_proxied_as
+#   Sets the URL end users see when access to this Apache server is proxied per vhost. 
+#   This URL should not include a trailing slash.
+# 
+# @param cas_scrub_request_headers
+#   Remove inbound request headers that may have special meaning within mod_auth_cas.
+# 
+# @param cas_sso_enabled
+#   Enables experimental support for single sign out (may mangle POST data).
+# 
+# @param cas_validate_saml
+#   Parse response from CAS server for SAML.
+# 
+# @param cas_validate_url
+#   Sets the URL to use when validating a client-presented ticket in an HTTP query string.
+# 
+# @param comment
+#   Adds comments to the header of the configuration file. Pass as string or an array of strings.
+#   For example:
+#   ``` puppet
+#   comment => "Account number: 123B",
+#   ```
+#   Or:
+#   ``` puppet
+#   comment => [
+#     "Customer: X",
+#     "Frontend domain: x.example.org",
+#   ]
+#   ```
+# 
+# @param custom_fragment
+#   Passes a string of custom configuration directives to place at the end of the virtual 
+#   host configuration.
+# 
+# @param default_vhost
+#   Sets a given `apache::vhost` defined type as the default to serve requests that do not 
+#   match any other `apache::vhost` defined types.
+# 
+# @param directoryindex
+#   Sets the list of resources to look for when a client requests an index of the directory 
+#   by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive 
+#   documentation for details.
+# 
+# @param docroot
+#   **Required**.<br />
+#   Sets the `DocumentRoot` location, from which Apache serves files.<br />
+#   If `docroot` and `manage_docroot` are both set to `false`, no `DocumentRoot` will be set 
+#   and the accompanying `<Directory /path/to/directory>` block will not be created.
+# 
+# @param docroot_group
+#   Sets group access to the `docroot` directory.
+# 
+# @param docroot_owner
+#   Sets individual user access to the `docroot` directory.
+# 
+# @param docroot_mode
+#   Sets access permissions for the `docroot` directory, in numeric notation.
+# 
+# @param manage_docroot
+#   Determines whether Puppet manages the `docroot` directory.
+# 
+# @param error_log
+#   Specifies whether `*_error.log` directives should be configured.
+# 
+# @param error_log_file
+#   Points the virtual host's error logs to a `*_error.log` file. If this parameter is 
+#   undefined, Puppet checks for values in `error_log_pipe`, then `error_log_syslog`.<br />
+#   If none of these parameters is set, given a virtual host `example.com`, Puppet defaults 
+#   to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and 
+#   `$logroot/example.com_error.log` for non-SSL virtual hosts.
+# 
+# @param error_log_pipe
+#   Specifies a pipe to send error log messages to.<br />
+#   This parameter has no effect if the `error_log_file` parameter has a value. If neither 
+#   this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
+# 
+# @param error_log_syslog
+#   Determines whether to send all error log messages to syslog.
+#   This parameter has no effect if either of the `error_log_file` or `error_log_pipe` 
+#   parameters has a value. If none of these parameters has a value, given a virtual host 
+#   `example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual 
+#   hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
+# 
+# @param error_documents
+#   A list of hashes which can be used to override the 
+#   [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) 
+#   settings for this virtual host.<br />
+#   For example:
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     error_documents => [
+#       { 'error_code' => '503', 'document' => '/service-unavail' },
+#       { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
+#     ],
+#   }
+#   ```
+# 
+# @param ensure
+#   Specifies if the virtual host is present or absent.<br />
+# 
+# @param fallbackresource
+#   Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) 
+#   directive, which specifies an action to take for any URL that doesn't map to anything in 
+#   your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin 
+#   with a `/` or be `disabled`.
+# 
+# @param fastcgi_server
+#   Specify an external FastCGI server to manage a connection to.
+# 
+# @param fastcgi_socket
+#   Specify the socket that will be used to communicate with an external FastCGI server.
+# 
+# @param fastcgi_idle_timeout
+#   If using fastcgi, this option sets the timeout for the server to respond.
+# 
+# @param fastcgi_dir
+#   Specify an internal FastCGI directory that is to be managed.
+# 
+# @param filters
+#   [Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, 
+#   context-sensitive configuration of output content filters.
+#   ``` puppet
+#   apache::vhost { "$::fqdn":
+#     filters => [
+#       'FilterDeclare   COMPRESS',
+#       'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
+#       'FilterChain     COMPRESS',
+#       'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
+#     ],
+#   }
+#   ```
+# 
+# @param h2_copy_files
+#   Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
+#   directive which influences how the requestion process pass files to the main connection.
+# 
+# @param h2_direct
+#   Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
+#   directive which toggles the usage of the HTTP/2 Direct Mode.
+# 
+# @param h2_early_hints
+#   Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2earlyhints)
+#   directive which controls if HTTP status 103 interim responses are forwarded to
+#   the client or not.
+# 
+# @param h2_max_session_streams
+#   Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2maxsessionstreams)
+#   directive which sets the maximum number of active streams per HTTP/2 session
+#   that the server allows.
+# 
+# @param h2_modern_tls_only
+#   Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
+#   directive which toggles the security checks on HTTP/2 connections in TLS mode.
+# 
+# @param h2_push
+#   Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
+#   directive which toggles the usage of the HTTP/2 server push protocol feature.
+# 
+# @param h2_push_diary_size
+#   Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushdiarysize)
+#   directive which toggles the maximum number of HTTP/2 server pushes that are
+#   remembered per HTTP/2 connection.
+# 
+# @param h2_push_priority
+#   Sets the [H2PushPriority](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushpriority)
+#   directive which defines the priority handling of pushed responses based on the
+#   content-type of the response.
+# 
+# @param h2_push_resource
+#   Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource)
+#   directive which declares resources for early pushing to the client.
+# 
+# @param h2_serialize_headers
+#   Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
+#   directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
+#   format for processing by httpd core.
+# 
+# @param h2_stream_max_mem_size
+#   Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
+#   directive which sets the maximum number of outgoing data bytes buffered in
+#   memory for an active stream.
+# 
+# @param h2_tls_cool_down_secs
+#   Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
+#   directive which sets the number of seconds of idle time on a TLS connection
+#   before the TLS write size falls back to a small (~1300 bytes) length.
+# 
+# @param h2_tls_warm_up_size
+#   Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlswarmupsize)
+#   directive which sets the number of bytes to be sent in small TLS records (~1300
+#   bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
+# 
+# @param h2_upgrade
+#   Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2upgrade)
+#   directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
+#   to HTTP/2.
+# 
+# @param h2_window_size
+#   Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2windowsize)
+#   directive which sets the size of the window that is used for flow control from
+#   client to server and limits the amount of data the server has to buffer.
+# 
+# @param headers
+#   Adds lines to replace, merge, or remove response headers. See 
+#   [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
+# 
+# @param ip
+#   Sets the IP address the virtual host listens on. By default, uses Apache's default behavior 
+#   of listening on all IPs.
+# 
+# @param ip_based
+#   Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual 
+#   host. This parameter inhibits the creation of a NameVirtualHost directive, since those are 
+#   used to funnel requests to name-based virtual hosts.
+# 
+# @param itk
+#   Configures [ITK](http://mpm-itk.sesse.net/) in a hash.<br />
+#   Usage typically looks something like:
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     docroot => '/path/to/directory',
+#     itk     => {
+#       user  => 'someuser',
+#       group => 'somegroup',
+#     },
+#   }
+#   ```
+#   Valid values are: a hash, which can include the keys:
+#   * `user` + `group`
+#   * `assignuseridexpr`
+#   * `assigngroupidexpr`
+#   * `maxclientvhost`
+#   * `nice`
+#   * `limituidrange` (Linux 3.5.0 or newer)
+#   * `limitgidrange` (Linux 3.5.0 or newer)
+# 
+# @param action
+#   Specifies whether you wish to configure mod_actions action directive which will
+#   activate cgi-script when triggered by a request.
+# 
+# @param jk_mounts
+#   Sets up a virtual host with `JkMount` and `JkUnMount` directives to handle the paths 
+#   for URL mapping between Tomcat and Apache.<br />
+#   The parameter must be an array of hashes where each hash must contain the `worker` 
+#   and either the `mount` or `unmount` keys.<br />
+#   Usage typically looks like:
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     jk_mounts => [
+#       { mount   => '/*',     worker => 'tcnode1', },
+#       { unmount => '/*.jpg', worker => 'tcnode1', },
+#     ],
+#   }
+#   ```
+# 
+# @param http_protocol_options
+#   Specifies the strictness of HTTP protocol checks.
+# 
+# @param keepalive
+#   Determines whether to enable persistent HTTP connections with the `KeepAlive` directive 
+#   for the virtual host. By default, the global, server-wide `KeepAlive` setting is in effect.<br />
+#   Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options 
+#   for the virtual host.
+# 
+# @param keepalive_timeout
+#   Sets the `KeepAliveTimeout` directive for the virtual host, which determines the amount 
+#   of time to wait for subsequent requests on a persistent HTTP connection. By default, the 
+#   global, server-wide `KeepAlive` setting is in effect.<br />
+#   This parameter is only relevant if either the global, server-wide `keepalive` parameter or 
+#   the per-vhost `keepalive` parameter is enabled.
+# 
+# @param max_keepalive_requests
+#   Limits the number of requests allowed per connection to the virtual host. By default,  
+#   the global, server-wide `KeepAlive` setting is in effect.<br />
+#   This parameter is only relevant if either the global, server-wide `keepalive` parameter or 
+#   the per-vhost `keepalive` parameter is enabled.
+# 
+# @param auth_kerb
+#   Enable `mod_auth_kerb` parameters for a virtual host.<br />
+#   Usage typically looks like:
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     auth_kerb              => `true`,
+#     krb_method_negotiate   => 'on',
+#     krb_auth_realms        => ['EXAMPLE.ORG'],
+#     krb_local_user_mapping => 'on',
+#     directories            => {
+#       path         => '/var/www/html',
+#       auth_name    => 'Kerberos Login',
+#       auth_type    => 'Kerberos',
+#       auth_require => 'valid-user',
+#     },
+#   }
+#   ```
+# 
+# @param krb_method_negotiate
+#   Determines whether to use the Negotiate method.
+# 
+# @param krb_method_k5passwd
+#   Determines whether to use password-based authentication for Kerberos v5.
+# 
+# @param krb_authoritative
+#   If set to `off`, authentication controls can be passed on to another module.
+# 
+# @param krb_auth_realms
+#   Specifies an array of Kerberos realms to use for authentication.
+# 
+# @param krb_5keytab
+#   Specifies the Kerberos v5 keytab file's location.
+# 
+# @param krb_local_user_mapping
+#   Strips @REALM from usernames for further use.
+# 
+# @param krb_verify_kdc
+#   This option can be used to disable the verification tickets against local keytab to prevent 
+#   KDC spoofing attacks.
+# 
+# @param krb_servicename
+#   Specifies the service name that will be used by Apache for authentication. Corresponding 
+#   key of this name must be stored in the keytab.
+# 
+# @param krb_save_credentials
+#   This option enables credential saving functionality.
+# 
+# @param logroot
+#   Specifies the location of the virtual host's logfiles.
+# 
+# @param logroot_ensure
+#   Determines whether or not to remove the logroot directory for a virtual host.
+# 
+# @param logroot_mode
+#   Overrides the mode the logroot directory is set to. Do *not* grant write access to the 
+#   directory the logs are stored in without being aware of the consequences; for more 
+#   information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
+# 
+# @param logroot_owner
+#   Sets individual user access to the logroot directory.
+# 
+# @param logroot_group
+#   Sets group access to the `logroot` directory.
+# 
+# @param log_level
+#   Specifies the verbosity of the error log.
+# 
+# @param modsec_body_limit
+#   Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
+# 
+# @param modsec_disable_vhost
+#   Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
+# 
+# @param modsec_disable_ids
+#   Removes `mod_security` IDs from the virtual host.<br />
+#   Also takes a hash allowing removal of an ID from a specific location.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     modsec_disable_ids => [ 90015, 90016 ],
+#   }
+#   ```
+# 
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
+#   }
+#   ```
+# 
+# @param modsec_disable_ips
+#   Specifies an array of IP addresses to exclude from `mod_security` rule matching.
+# 
+# @param modsec_disable_msgs
+#   Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing 
+#   removal of an Msg from a specific location.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     modsec_disable_msgs => ['Blind SQL Injection Attack', 'Session Fixation Attack'],
+#   }
+#   ```
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     modsec_disable_msgs => { '/location1' => ['Blind SQL Injection Attack', 'Session Fixation Attack'] },
+#   }
+#   ```
+# 
+# @param modsec_disable_tags
+#   Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing 
+#   removal of an Tag from a specific location.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     modsec_disable_tags => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'],
+#   }
+#   ```
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     modsec_disable_tags => { '/location1' => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'] },
+#   }
+#   ```
+# 
+# @param modsec_audit_log_file
+#   If set, it is relative to `logroot`.<br />
+#   One of the parameters that determines how to send `mod_security` audit 
+#   log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
+#   If none of those parameters are set, the global audit log is used 
+#   (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
+# 
+# @param modsec_audit_log_pipe
+#   If `modsec_audit_log_pipe` is set, it should start with a pipe. Example 
+#   `|/path/to/mlogc /path/to/mlogc.conf`.<br />
+#   One of the parameters that determines how to send `mod_security` audit 
+#   log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
+#   If none of those parameters are set, the global audit log is used 
+#   (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
+# 
+# @param modsec_audit_log
+#   If `modsec_audit_log` is `true`, given a virtual host ---for instance, example.com--- it 
+#   defaults to `example.com\_security\_ssl.log` for SSL-encrypted virtual hosts 
+#   and `example.com\_security.log` for unencrypted virtual hosts.<br />
+#   One of the parameters that determines how to send `mod_security` audit 
+#   log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).<br />
+#   If none of those parameters are set, the global audit log is used 
+#   (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
+# 
+# @param no_proxy_uris
+#   Specifies URLs you do not want to proxy. This parameter is meant to be used in combination 
+#   with [`proxy_dest`](#proxy_dest).
+# 
+# @param no_proxy_uris_match
+#   This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
+# 
+# @param proxy_preserve_host
+#   Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost).<br />
+#   Setting this parameter to `true` enables the `Host:` line from an incoming request to be 
+#   proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
+# 
+# @param proxy_add_headers
+#   Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders).<br />
+#   This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For, 
+#   X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
+# 
+# @param proxy_error_override
+#   Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). 
+#   This directive controls whether Apache should override error pages for proxied content.
+# 
+# @param options
+#   Sets the `Options` for the specified virtual host. For example:
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     options => ['Indexes','FollowSymLinks','MultiViews'],
+#   }
+#   ```
+#   > **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options', 
+#   'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
+# 
+# @param override
+#   Sets the overrides for the specified virtual host. Accepts an array of 
+#   [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
+#
+# @param passenger_enabled
+#   Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) 
+#   directive to `on` or `off`. Requires `apache::mod::passenger` to be included.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     docroot     => '/path/to/directory',
+#     directories => [
+#       { path              => '/path/to/directory',
+#         passenger_enabled => 'on',
+#       },
+#     ],
+#   }
+#   ```
+#   > **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) 
+#   using the PassengerEnabled directive with the PassengerHighPerformance directive.
+# 
+# @param passenger_base_uri
+#   Sets [PassengerBaseURI](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbase_rui), 
+#    to specify that the given URI is a distinct application served by Passenger.
+# 
+# @param passenger_ruby
+#   Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby), 
+#   specifying the Ruby interpreter to use when serving the relevant web applications.
+# 
+# @param passenger_python
+#   Sets [PassengerPython](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpython), 
+#   specifying the Python interpreter to use when serving the relevant web applications.
+# 
+# @param passenger_nodejs
+#   Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs), 
+#   specifying Node.js command to use when serving the relevant web applications.
+# 
+# @param passenger_meteor_app_settings
+#   Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/library/config/apache/reference/#passengermeteorappsettings), 
+#   specifying a JSON file with settings for the application when using a Meteor 
+#   application in non-bundled mode.
+# 
+# @param passenger_app_env
+#   Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv), 
+#   the environment for the Passenger application. If not specified, defaults to the global 
+#   setting or 'production'.
+# 
+# @param passenger_app_root
+#   Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot), 
+#   the location of the Passenger application root if different from the DocumentRoot.
+# 
+# @param passenger_app_group_name
+#   Sets [PassengerAppGroupName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappgroupname), 
+#    the name of the application group that the current application should belong to.
+# 
+# @param passenger_app_type
+#   Sets [PassengerAppType](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapptype), 
+#    to force Passenger to recognize the application as a specific type.
+# 
+# @param passenger_startup_file
+#   Sets the [PassengerStartupFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile) 
+#   path. This path is relative to the application root.
+# 
+# @param passenger_restart_dir
+#   Sets the [PassengerRestartDir](https://www.phusionpassenger.com/library/config/apache/reference/#passengerrestartdir) 
+#    to customize the directory in which `restart.txt` is searched for.
+# 
+# @param passenger_spawn_method
+#   Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod), 
+#   whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
+# 
+# @param passenger_load_shell_envvars
+#   Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloadshellenvvars), 
+#   to enable or disable the loading of shell environment variables before spawning the application.
+# 
+# @param passenger_rolling_restarts
+#   Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/library/config/apache/reference/#passengerrollingrestarts), 
+#   to enable or disable support for zero-downtime application restarts through `restart.txt`.
+# 
+# @param passenger_resist_deployment_errors
+#   Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/library/config/apache/reference/#passengerresistdeploymenterrors), 
+#   to enable or disable resistance against deployment errors.
+# 
+# @param passenger_user
+#   Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser), 
+#   the running user for sandboxing applications.
+# 
+# @param passenger_group
+#   Sets [PassengerGroup](https://www.phusionpassenger.com/library/config/apache/reference/#passengergroup), 
+#   the running group for sandboxing applications.
+# 
+# @param passenger_friendly_error_pages
+#   Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/library/config/apache/reference/#passengerfriendlyerrorpages), 
+#   which can display friendly error pages whenever an application fails to start. This 
+#   friendly error page presents the startup error message, some suggestions for solving 
+#   the problem, a backtrace and a dump of the environment variables.
+# 
+# @param passenger_min_instances
+#   Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances), 
+#   the minimum number of application processes to run.
+# 
+# @param passenger_max_instances
+#   Sets [PassengerMaxInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstances), 
+#   the maximum number of application processes to run.
+# 
+# @param passenger_max_preloader_idle_time
+#   Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpreloaderidletime), 
+#   the maximum amount of time the preloader waits before shutting down an idle process.
+# 
+# @param passenger_force_max_concurrent_requests_per_process
+#   Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/library/config/apache/reference/#passengerforcemaxconcurrentrequestsperprocess), 
+#   the maximum amount of concurrent requests the application can handle per process.
+# 
+# @param passenger_start_timeout
+#   Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout), 
+#   the timeout for the application startup.
+# 
+# @param passenger_concurrency_model
+#   Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerconcurrencyodel), 
+#   to specify the I/O concurrency model that should be used for Ruby application processes. 
+#   Passenger supports two concurrency models:<br />
+#   * `process` – single-threaded, multi-processed I/O concurrency.
+#   * `thread` – multi-threaded, multi-processed I/O concurrency.
+# 
+# @param passenger_thread_count
+#   Sets [PassengerThreadCount](https://www.phusionpassenger.com/library/config/apache/reference/#passengerthreadcount), 
+#   the number of threads that Passenger should spawn per Ruby application process.<br />
+#   This option only has effect if PassengerConcurrencyModel is `thread`.
+# 
+# @param passenger_max_requests
+#   Sets [PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests), 
+#   the maximum number of requests an application process will process.
+# 
+# @param passenger_max_request_time
+#   Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequesttime), 
+#   the maximum amount of time, in seconds, that an application process may take to 
+#   process a request.
+# 
+# @param passenger_memory_limit
+#   Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/library/config/apache/reference/#passengermemorylimit), 
+#   the maximum amount of memory that an application process may use, in megabytes.
+# 
+# @param passenger_stat_throttle_rate
+#   Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstatthrottlerate), 
+#   to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
+# 
+# @param passenger_pre_start
+#   Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart), 
+#   the URL of the application if pre-starting is required.
+# 
+# @param passenger_high_performance
+#   Sets [PassengerHighPerformance](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance), 
+#   to enhance performance in return for reduced compatibility.
+# 
+# @param passenger_buffer_upload
+#   Sets [PassengerBufferUpload](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbufferupload),
+#   to buffer HTTP client request bodies before they are sent to the application.
+# 
+# @param passenger_buffer_response
+#   Sets [PassengerBufferResponse](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbufferresponse),
+#   to buffer Happlication-generated responses.
+# 
+# @param passenger_error_override
+#   Sets [PassengerErrorOverride](https://www.phusionpassenger.com/library/config/apache/reference/#passengererroroverride),
+#   to specify whether Apache will intercept and handle response with HTTP status codes of
+#   400 and higher.
+# 
+# @param passenger_max_request_queue_size
+#   Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize),
+#   to specify the maximum amount of requests that are allowed to queue whenever the maximum
+#   concurrent request limit is reached. If the queue is already at this specified limit, then 
+#   Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
+#   A value of 0 means that the queue size is unbounded.
+# 
+# @param passenger_max_request_queue_time
+#   Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuetime),
+#   to specify the maximum amount of time that requests are allowed to stay in the queue 
+#   whenever the maximum concurrent request limit is reached. If a request reaches this specified 
+#   limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
+#   A value of 0 means that the queue time is unbounded.
+# 
+# @param passenger_sticky_sessions
+#   Sets [PassengerStickySessions](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions), 
+#   to specify that, whenever possible, all requests sent by a client will be routed to the same 
+#   originating application process.
+# 
+# @param passenger_sticky_sessions_cookie_name
+#   Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessionscookiename), 
+#   to specify the name of the sticky sessions cookie.
+# 
+# @param passenger_allow_encoded_slashes
+#   Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/library/config/apache/reference/#passengerallowencodedslashes), 
+#   to allow URLs with encoded slashes. Please note that this feature will not work properly
+#   unless Apache's `AllowEncodedSlashes` is also enabled.
+# 
+# @param passenger_debugger
+#   Sets [PassengerDebugger](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdebugger), 
+#   to turn support for Ruby application debugging on or off. 
+# 
+# @param passenger_lve_min_uid
+#   Sets [PassengerLveMinUid](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlveminuid), 
+#   to only allow the spawning of application processes with UIDs equal to, or higher than, this 
+#   specified value on LVE-enabled kernels.
+# 
+# @param php_values
+#   Allows per-virtual host setting [`php_value`s](http://php.net/manual/en/configuration.changes.php). 
+#   These flags or values can be overwritten by a user or an application.
+#   Within a vhost declaration:
+#   ``` puppet
+#     php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
+#   ```
+#
+# @param php_flags
+#   Allows per-virtual host setting [`php_flags\``](http://php.net/manual/en/configuration.changes.php). 
+#   These flags or values can be overwritten by a user or an application.
+#
+# @param php_admin_values
+#   Allows per-virtual host setting [`php_admin_value`](http://php.net/manual/en/configuration.changes.php). 
+#   These flags or values cannot be overwritten by a user or an application.
+#
+# @param php_admin_flags
+#   Allows per-virtual host setting [`php_admin_flag`](http://php.net/manual/en/configuration.changes.php). 
+#   These flags or values cannot be overwritten by a user or an application.
+#
+# @param port
+#   Sets the port the host is configured on. The module's defaults ensure the host listens 
+#   on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only 
+#   listens on the port set in this parameter.
+#
+# @param priority
+#   Sets the relative load-order for Apache HTTPD VirtualHost configuration files.<br />
+#   If nothing matches the priority, the first name-based virtual host is used. Likewise, 
+#   passing a higher priority causes the alphabetically first name-based virtual host to be 
+#   used if no other names match.<br />
+#   > **Note:** You should not need to use this parameter. However, if you do use it, be 
+#   aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
+#   To omit the priority prefix in file names, pass a priority of `false`.
+#
+# @param protocols
+#   Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols) 
+#   directive, which lists available protocols for the virutal host.
+#
+# @param protocols_honor_order
+#   Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) 
+#   directive which determines wether the order of Protocols sets precedence during negotiation.
+#
+# @param proxy_dest
+#   Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
+#
+# @param proxy_pass
+#   Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) 
+#   configuration. Optionally, parameters can be added as an array.
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     proxy_pass => [
+#       { 'path' => '/a', 'url' => 'http://backend-a/' },
+#       { 'path' => '/b', 'url' => 'http://backend-b/' },
+#       { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
+#       { 'path' => '/l', 'url' => 'http://backend-xy',
+#         'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
+#       { 'path' => '/d', 'url' => 'http://backend-a/d',
+#         'params' => { 'retry' => '0', 'timeout' => '5' }, },
+#       { 'path' => '/e', 'url' => 'http://backend-a/e',
+#         'keywords' => ['nocanon', 'interpolate'] },
+#       { 'path' => '/f', 'url' => 'http://backend-f/',
+#         'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+#       { 'path' => '/g', 'url' => 'http://backend-g/',
+#         'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
+#       { 'path' => '/h', 'url' => 'http://backend-h/h',
+#         'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
+#     ],
+#   }
+#   ```
+#   * `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string.
+#   * `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
+#   * `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
+#   * `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
+#
+# @param proxy_dest_match
+#   This directive is equivalent to `proxy_dest`, but takes regular expressions, see 
+#   [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) 
+#   for details.
+#
+# @param proxy_dest_reverse_match
+#   Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See 
+#   [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) 
+#   for details.
+#
+# @param proxy_pass_match
+#   This directive is equivalent to `proxy_pass`, but takes regular expressions, see 
+#   [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) 
+#   for details.
+#
+# @param redirect_dest
+#   Specifies the address to redirect to.
+#
+# @param redirect_source
+#   Specifies the source URIs that redirect to the destination specified in `redirect_dest`. 
+#   If more than one item for redirect is supplied, the source and destination must be the same 
+#   length, and the items are order-dependent.
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     redirect_source => ['/images','/downloads'],
+#     redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+#   }
+#   ```
+#
+# @param redirect_status
+#   Specifies the status to append to the redirect.
+#   ``` puppet
+#     apache::vhost { 'site.name.fdqn':
+#     …
+#     redirect_status => ['temp','permanent'],
+#   }
+#   ```
+#
+# @param redirectmatch_regexp
+#   Determines which server status should be raised for a given regular expression 
+#   and where to forward the user to. Entered as an array alongside redirectmatch_status 
+#   and redirectmatch_dest.
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     redirectmatch_status => ['404','404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#   }
+#   ```
+#
+# @param redirectmatch_status
+#   Determines which server status should be raised for a given regular expression 
+#   and where to forward the user to. Entered as an array alongside redirectmatch_regexp 
+#   and redirectmatch_dest.
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     redirectmatch_status => ['404','404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#   }
+#   ```
+#
+# @param redirectmatch_dest
+#   Determines which server status should be raised for a given regular expression 
+#   and where to forward the user to. Entered as an array alongside redirectmatch_status 
+#   and redirectmatch_regexp.
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     redirectmatch_status => ['404','404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#   }
+#   ```
+#
+# @param request_headers
+#   Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) 
+#   in various ways, including adding additional request headers, removing request headers, 
+#   and so on.
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     request_headers => [
+#       'append MirrorID "mirror 12"',
+#       'unset MirrorID',
+#     ],
+#   }
+#   ```
+#
+# @param rewrites
+#   Creates URL rewrite rules. Expects an array of hashes.<br />
+#   Valid Hash keys include `comment`, `rewrite_base`, `rewrite_cond`, `rewrite_rule`
+#   or `rewrite_map`.<br />
+#   For example, you can specify that anyone trying to access index.html is served welcome.html
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
+#   }
+#   ```
+#   The parameter allows rewrite conditions that, when `true`, execute the associated rule. 
+#   For instance, if you wanted to rewrite URLs only if the visitor is using IE
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     rewrites => [
+#       {
+#         comment      => 'redirect IE',
+#         rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+#         rewrite_rule => ['^index\.html$ welcome.html'],
+#       },
+#     ],
+#   }
+#   ```
+#   You can also apply multiple conditions. For instance, rewrite index.html to welcome.html 
+#   only when the browser is Lynx or Mozilla (version 1 or 2)
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     rewrites => [
+#       {
+#         comment      => 'Lynx or Mozilla v1/2',
+#         rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+#         rewrite_rule => ['^index\.html$ welcome.html'],
+#       },
+#     ],
+#   }
+#   ```
+#   Multiple rewrites and conditions are also possible
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     rewrites => [
+#       {
+#         comment      => 'Lynx or Mozilla v1/2',
+#         rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+#         rewrite_rule => ['^index\.html$ welcome.html'],
+#       },
+#       {
+#         comment      => 'Internet Explorer',
+#         rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+#         rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+#       },
+#       {
+#         rewrite_base => /apps/,
+#         rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
+#       },
+#       { comment      => 'Rewrite to lower case',
+#         rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
+#         rewrite_map  => ['lc int:tolower'],
+#         rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+#       },
+#     ],
+#   }
+#   ```
+#   Refer to the [`mod_rewrite` documentation](https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html)
+#   for more details on what is possible with rewrite rules and conditions.<br />
+#   > **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` 
+#   and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather 
+#   than setting the rewrites in the virtual host's directories.
+#
+# @param rewrite_base
+#   The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase)
+#   specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
+#   that substitue a relative path.
+# 
+# @param rewrite_rule
+#   The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
+#   allows the user to define the rules that will be used by the rewrite engine.
+# 
+# @param rewrite_cond
+#   The parameter [`rewrite_cond`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritecond)
+#   defines a rule condition, that when satisfied will implement that rule within the 
+#   rewrite engine.
+#
+# @param rewrite_inherit
+#   Determines whether the virtual host inherits global rewrite rules.<br />
+#   Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or 
+#   inside the virtual host `.conf` file. By default, virtual hosts do not inherit 
+#   global settings. To activate inheritance, specify the `rewrites` parameter and set 
+#   `rewrite_inherit` parameter to `true`:
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     rewrites => [
+#       <rules>,
+#     ],
+#     rewrite_inherit => `true`,
+#   }
+#   ```
+#   > **Note**: The `rewrites` parameter is **required** for this to have effect<br />
+#   Apache activates global `Rewrite` rules inheritance if the virtual host files contains 
+#   the following directives:
+#   ``` ApacheConf
+#   RewriteEngine On
+#   RewriteOptions Inherit
+#   ```
+#   Refer to the official [`mod_rewrite`](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)
+#   documentation, section "Rewriting in Virtual Hosts".
+#
+# @param scriptalias
+#   Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as 
+#   '/usr/scripts'.
+#
+# @param scriptaliases
+#   > **Note**: This parameter is deprecated in favor of the `aliases` parameter.<br />
+#   Passes an array of hashes to the virtual host to create either ScriptAlias or 
+#   ScriptAliasMatch statements per the `mod_alias` documentation.
+#   ``` puppet
+#   scriptaliases => [
+#     {
+#       alias => '/myscript',
+#       path  => '/usr/share/myscript',
+#     },
+#     {
+#       aliasmatch => '^/foo(.*)',
+#       path       => '/usr/share/fooscripts$1',
+#     },
+#     {
+#       aliasmatch => '^/bar/(.*)',
+#       path       => '/usr/share/bar/wrapper.sh/$1',
+#     },
+#     {
+#       alias => '/neatscript',
+#       path  => '/usr/share/neatscript',
+#     },
+#   ]
+#   ```
+#   The ScriptAlias and ScriptAliasMatch directives are created in the order specified. 
+#   As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases 
+#   before more general ones to avoid shadowing.
+#
+# @param serveradmin
+#   Specifies the email address Apache displays when it renders one of its error pages.
+#
+# @param serveraliases
+#   Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias) 
+#   of the site.
+#
+# @param servername
+#   Sets the servername corresponding to the hostname you connect to the virtual host at.
+#
+# @param setenv
+#   Used by HTTPD to set environment variables for virtual hosts.<br />
+#   Example:
+#   ``` puppet
+#   apache::vhost { 'setenv.example.com':
+#     setenv => ['SPECIAL_PATH /foo/bin'],
+#   }
+#   ```
+#
+# @param setenvif
+#   Used by HTTPD to conditionally set environment variables for virtual hosts.
+#
+# @param setenvifnocase
+#   Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
+#
+# @param suexec_user_group
+#   Allows the spcification of user and group execution privileges for CGI programs through
+#   inclusion of the `mod_suexec` module.
+# 
+# @param suphp_addhandler
+#   Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+#   working together with suphp_configpath and suphp_engine.<br />
+#   An example virtual host configuration with suPHP:
+#   ``` puppet
+#   apache::vhost { 'suphp.example.com':
+#     port             => '80',
+#     docroot          => '/home/appuser/myphpapp',
+#     suphp_addhandler => 'x-httpd-php',
+#     suphp_engine     => 'on',
+#     suphp_configpath => '/etc/php5/apache2',
+#     directories      => { path => '/home/appuser/myphpapp',
+#       'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+#     }
+#   }
+#   ```
+#
+# @param suphp_configpath
+#   Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+#   working together with suphp_addhandler and suphp_engine.<br />
+#   An example virtual host configuration with suPHP:
+#   ``` puppet
+#   apache::vhost { 'suphp.example.com':
+#     port             => '80',
+#     docroot          => '/home/appuser/myphpapp',
+#     suphp_addhandler => 'x-httpd-php',
+#     suphp_engine     => 'on',
+#     suphp_configpath => '/etc/php5/apache2',
+#     directories      => { path => '/home/appuser/myphpapp',
+#       'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+#     }
+#   }
+#   ```
+#
+# @param suphp_engine
+#   Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+#   working together with suphp_configpath and suphp_addhandler.<br />
+#   An example virtual host configuration with suPHP:
+#   ``` puppet
+#   apache::vhost { 'suphp.example.com':
+#     port             => '80',
+#     docroot          => '/home/appuser/myphpapp',
+#     suphp_addhandler => 'x-httpd-php',
+#     suphp_engine     => 'on',
+#     suphp_configpath => '/etc/php5/apache2',
+#     directories      => { path => '/home/appuser/myphpapp',
+#       'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+#     }
+#   }
+#   ```
+#
+# @param vhost_name
+#   Enables name-based virtual hosting. If no IP is passed to the virtual host, but the 
+#   virtual host is assigned a port, then the virtual host name is `vhost_name:port`. 
+#   If the virtual host has no assigned IP or port, the virtual host name is set to the 
+#   title of the resource.
+#
+# @param virtual_docroot
+#   Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the 
+#   same name. For example, `http://example.com` would map to `/var/www/example.com`.
+#   ``` puppet
+#   apache::vhost { 'subdomain.loc':
+#     vhost_name      => '*',
+#     port            => '80',
+#     virtual_docroot => '/var/www/%-2+',
+#     docroot         => '/var/www',
+#     serveraliases   => ['*.loc',],
+#   }
+#   ```
+# 
+# @param wsgi_daemon_process
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process_options, wsgi_process_group, 
+#   wsgi_script_aliases and wsgi_pass_authorization.<br />
+#   A hash that sets the name of the WSGI daemon, accepting 
+#   [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html).<br />
+#   An example virtual host configuration with WSGI:
+#   ``` puppet
+#   apache::vhost { 'wsgi.example.com':
+#     port                        => '80',
+#     docroot                     => '/var/www/pythonapp',
+#     wsgi_daemon_process         => 'wsgi',
+#     wsgi_daemon_process_options =>
+#       { processes    => '2',
+#         threads      => '15',
+#         display-name => '%{GROUP}',
+#       },
+#     wsgi_process_group          => 'wsgi',
+#     wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+#     wsgi_chunked_request        => 'On',
+#   }
+#   ```
+#
+# @param wsgi_daemon_process_options
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_process_group, 
+#   wsgi_script_aliases and wsgi_pass_authorization.<br />
+#   Sets the group ID that the virtual host runs under.
+#
+# @param wsgi_application_group
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, 
+#   and wsgi_pass_authorization.<br />
+#   This parameter defines the [`WSGIApplicationGroup directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIApplicationGroup.html),
+#   thus allowing you to specify which application group the WSGI application belongs to,
+#   with all WSGI applications within the same group executing within the context of the
+#   same Python sub interpreter.
+#
+# @param wsgi_import_script
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, 
+#   and wsgi_pass_authorization.<br />
+#   This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
+#   which can be used in order to specify a script file to be loaded upon a process starting.
+#
+# @param wsgi_import_script_options
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, 
+#   and wsgi_pass_authorization.<br />
+#   This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
+#   which can be used in order to specify a script file to be loaded upon a process starting.<br />
+#   Specifies the process and aplication groups of the script.
+#
+# @param wsgi_chunked_request
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, 
+#   and wsgi_pass_authorization.<br />
+#   This parameter defines the [`WSGIChunkedRequest directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIChunkedRequest.html),
+#   allowing you to enable support for chunked request content.<br />
+#   WSGI is technically incapable of supporting chunked request content without all chunked
+#   request content having first been read in and buffered.
+#
+# @param wsgi_process_group
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_daemon_process_options,  
+#   wsgi_script_aliases and wsgi_pass_authorization.<br />
+#   Requires a hash of web paths to filesystem `.wsgi paths/`.
+#
+# @param wsgi_script_aliases
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, 
+#   and wsgi_pass_authorization.<br />
+#   Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
+#   For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
+#
+# @param wsgi_script_aliases_match
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, 
+#   and wsgi_pass_authorization.<br />
+#   Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
+#   This directive is similar to `wsgi_script_aliases`, but makes use of regular expressions
+#   in place of simple prefix matching.<br />
+#   For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
+# 
+# @param wsgi_pass_authorization
+#   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+#   wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
+#   wsgi_script_aliases.<br />
+#   Enables support for chunked requests.
+#
+# @param directories
+#   The `directories` parameter within the `apache::vhost` class passes an array of hashes 
+#   to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory), 
+#   [File](https://httpd.apache.org/docs/current/mod/core.html#files), and 
+#   [Location](https://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. 
+#   These blocks take the form, `< Directory /path/to/directory>...< /Directory>`.<br />
+#   The `path` key sets the path for the directory, files, and location blocks. Its value 
+#   must be a path for the `directory`, `files`, and `location` providers, or a regex for 
+#   the `directorymatch`, `filesmatch`, or `locationmatch` providers. Each hash passed to 
+#   `directories` **must** contain `path` as one of the keys.<br />
+#   The `provider` key is optional. If missing, this key defaults to `directory`.
+#    Values: `directory`, `files`, `proxy`, `location`, `directorymatch`, `filesmatch`, 
+#   `proxymatch` or `locationmatch`. If you set `provider` to `directorymatch`, it 
+#   uses the keyword `DirectoryMatch` in the Apache config file.<br />
+#   An example use of `directories`:
+#   ``` puppet
+#   apache::vhost { 'files.example.net':
+#     docroot     => '/var/www/files',
+#     directories => [
+#       { 'path'     => '/var/www/files',
+#         'provider' => 'files',
+#         'deny'     => 'from all',
+#       },
+#     ],
+#   }
+#   ```
+#   > **Note:** At least one directory should match the `docroot` parameter. After you 
+#   start declaring directories, `apache::vhost` assumes that all required Directory blocks 
+#   will be declared. If not defined, a single default Directory block is created that matches 
+#   the `docroot` parameter.<br />
+#   Available handlers, represented as keys, should be placed within the `directory`, 
+#   `files`, or `location` hashes. This looks like
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     docroot     => '/path/to/directory',
+#     directories => [ { path => '/path/to/directory', handler => value } ],
+#   }
+#   ```
+#   Any handlers you do not set in these hashes are considered `undefined` within Puppet and 
+#   are not added to the virtual host, resulting in the module using their default values.
+#
+# @param custom_fragment
+#   Pass a string of custom configuration directives to be placed at the end of the directory 
+#   configuration.
+#   ``` puppet
+#   apache::vhost { 'monitor':
+#     …
+#     directories => [
+#       {
+#         path => '/path/to/directory',
+#         custom_fragment => '
+#   <Location /balancer-manager>
+#     SetHandler balancer-manager
+#     Order allow,deny
+#     Allow from all
+#   </Location>
+#   <Location /server-status>
+#     SetHandler server-status
+#     Order allow,deny
+#     Allow from all
+#   </Location>
+#   ProxyStatus On',
+#       },
+#     ]
+#   }
+#   ```
+#
+# @param error_documents
+#   An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) 
+#   settings for the directory.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     directories => [
+#       { path            => '/srv/www',
+#         error_documents => [
+#           { 'error_code' => '503',
+#             'document'   => '/service-unavail',
+#           },
+#         ],
+#       },
+#     ],
+#   }
+#   ```
+#
+# @param h2_copy_files
+#   Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.<br />
+#   Note that you must declare `class {'apache::mod::http2': }` before using this directive.
+#
+# @param h2_push_resource
+#   Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.<br />
+#   Note that you must declare `class {'apache::mod::http2': }` before using this directive.
+#
+# @param headers
+#   Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     docroot     => '/path/to/directory',
+#     directories => {
+#       path    => '/path/to/directory',
+#       headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+#     },
+#   }
+#   ```
+#
+# @param options
+#   Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the 
+#   given Directory block.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     docroot     => '/path/to/directory',
+#     directories => [
+#       { path    => '/path/to/directory',
+#         options => ['Indexes','FollowSymLinks','MultiViews'],
+#       },
+#     ],
+#   }
+#   ```
+# 
+# @param shib_compat_valid_user
+#   Default is Off, matching the behavior prior to this command's existence. Addresses a conflict 
+#   when using Shibboleth in conjunction with other auth/auth modules by restoring `standard` 
+#   Apache behavior when processing the `valid-user` and `user` Require rules. See the 
+#   [`mod_shib`documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions), 
+#   and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess) 
+#   topic for more details. This key is disabled if `apache::mod::shib` is not defined.
+#
+# @param ssl_options
+#   String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), 
+#   which configure SSL engine run-time options. This handler takes precedence over SSLOptions 
+#   set in the parent block of the virtual host.
+#   ``` puppet
+#   apache::vhost { 'secure.example.net':
+#     docroot     => '/path/to/directory',
+#     directories => [
+#       { path        => '/path/to/directory',
+#         ssl_options => '+ExportCertData',
+#       },
+#       { path        => '/path/to/different/dir',
+#         ssl_options => ['-StdEnvVars', '+ExportCertData'],
+#       },
+#     ],
+#   }
+#   ```
+#
+# @param additional_includes
+#   Specifies paths to additional static, specific Apache configuration files in virtual 
+#   host directories.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     docroot     => '/path/to/directory',
+#     directories => [
+#       { path  => '/path/to/different/dir',
+#         additional_includes => ['/custom/path/includes', '/custom/path/another_includes',],
+#       },
+#     ],
+#   }
+#   ```
+# 
+# @param ssl
+#   Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
+#
+# @param ssl_ca
+#   Specifies the SSL certificate authority to be used to verify client certificates used 
+#   for authentication. You must also set `ssl_verify_client` to use this.
+#
+# @param ssl_cert
+#   Specifies the SSL certification.
+#
+# @param ssl_protocol
+#   Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). 
+#   Expects an array or space separated string of accepted protocols.
+#
+# @param ssl_cipher
+#   Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
+#
+# @param ssl_honorcipherorder
+#   Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), 
+#   to cause Apache to use the server's preferred order of ciphers rather than the client's 
+#   preferred order.
+#
+# @param ssl_certs_dir
+#   Specifies the location of the SSL certification directory to verify client certs. Will not 
+#   be used unless `ssl_verify_client` is also set (see below).
+#
+# @param ssl_chain
+#   Specifies the SSL chain. This default works out of the box, but it must be updated in 
+#   the base `apache` class with your specific certificate information before being used in 
+#   production.
+#
+# @param ssl_crl
+#   Specifies the certificate revocation list to use. (This default works out of the box but 
+#   must be updated in the base `apache` class with your specific certificate information 
+#   before being used in production.)
+#
+# @param ssl_crl_path
+#   Specifies the location of the certificate revocation list to verify certificates for 
+#   client authentication with. (This default works out of the box but must be updated in 
+#   the base `apache` class with your specific certificate information before being used in 
+#   production.)
+#
+# @param ssl_crl_check
+#   Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck) 
+#   for ssl client authentication. The default works out of the box but must be specified when 
+#   using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on 
+#   older versions.
+#
+# @param ssl_key
+#   Specifies the SSL key.<br />
+#   Defaults are based on your operating system. Default work out of the box but must be 
+#   updated in the base `apache` class with your specific certificate information before 
+#   being used in production.
+#
+# @param ssl_verify_client
+#   Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) 
+#   directive, which sets the certificate verification level for client authentication.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     …
+#     ssl_verify_client => 'optional',
+#   }
+#   ```
+#
+# @param ssl_verify_depth
+#   Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) 
+#   directive, which specifies the maximum depth of CA certificates in client certificate 
+#   verification. You must set `ssl_verify_client` for it to take effect.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     …
+#     ssl_verify_client => 'require',
+#     ssl_verify_depth => 1,
+#   }
+#   ```
+#
+# @param ssl_proxy_protocol
+#   Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) 
+#   directive, which controls which SSL protocol flavors `mod_ssl` should use when establishing 
+#   its server environment for proxy. It connects to servers using only one of the provided 
+#   protocols.
+#
+# @param ssl_proxy_verify
+#   Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) 
+#   directive, which configures certificate verification of the remote server when a proxy is 
+#   configured to forward requests to a remote SSL server.
+#
+# @param ssl_proxy_verify_depth
+#   Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth) 
+#   directive, which configures how deeply mod_ssl should verify before deciding that the 
+#   remote server does not have a valid certificate.<br />
+#   A depth of 0 means that only self-signed remote server certificates are accepted, 
+#   the default depth of 1 means the remote server certificate can be self-signed or 
+#   signed by a CA that is directly known to the server.
+#
+# @param ssl_proxy_cipher_suite
+#   Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite) 
+#   directive, which controls cipher suites supported for ssl proxy traffic.
+#
+# @param ssl_proxy_ca_cert
+#   Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile) 
+#   directive, which specifies an all-in-one file where you can assemble the Certificates 
+#   of Certification Authorities (CA) whose remote servers you deal with. These are used 
+#   for Remote Server Authentication. This file should be a concatenation of the PEM-encoded 
+#   certificate files in order of preference.
+#
+# @param ssl_proxy_machine_cert
+#   Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) 
+#   directive, which specifies an all-in-one file where you keep the certs and keys used 
+#   for this server to authenticate itself to remote servers. This file should be a 
+#   concatenation of the PEM-encoded certificate files in order of preference.
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     …
+#     ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
+#   }
+#   ```
+#
+# @param ssl_proxy_check_peer_cn
+#   Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) 
+#   directive, which specifies whether the remote server certificate's CN field is compared 
+#   against the hostname of the request URL.
+#
+# @param ssl_proxy_check_peer_name
+#   Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) 
+#   directive, which specifies whether the remote server certificate's CN field is compared 
+#   against the hostname of the request URL.
+#
+# @param ssl_proxy_check_peer_expire
+#   Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) 
+#   directive, which specifies whether the remote server certificate is checked for expiration 
+#   or not.
+#
+# @param ssl_options
+#   Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) 
+#   directive, which configures various SSL engine run-time options. This is the global 
+#   setting for the given virtual host and can be a string or an array.<br />
+#   A string:
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     …
+#     ssl_options => '+ExportCertData',
+#   }
+#   ```
+#   An array:
+#   ``` puppet
+#   apache::vhost { 'sample.example.net':
+#     …
+#     ssl_options => ['+StrictRequire', '+ExportCertData'],
+#   }
+#   ```
+#
+# @param ssl_openssl_conf_cmd
+#   Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) 
+#   directive, which provides direct configuration of OpenSSL parameters.
+#
+# @param ssl_proxyengine
+#   Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
+#
+# @param ssl_stapling
+#   Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). 
+#   By default, uses what is set globally.<br />
+#   This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+#
+# @param ssl_stapling_timeout
+#   Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
+#   This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+#
+# @param ssl_stapling_return_errors
+#   Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
+#   This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+#
+# @param use_canonical_name
+#   Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
+#   which allows you to configure how the server determines it's own name and port.
+# 
 define apache::vhost(
   Variant[Boolean,String] $docroot,
   $manage_docroot                                                                   = true,
@@ -449,7 +2072,7 @@
     }
   }
 
-  # Load mod_fastci if needed and not yet loaded
+  # Load mod_fastcgi if needed and not yet loaded
   if $fastcgi_server and $fastcgi_socket {
     if ! defined(Class['apache::mod::fastcgi']) {
       include ::apache::mod::fastcgi
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index cfb06c273e..2dfa8a1d69 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -1,4 +1,20 @@
-# See README.md for usage information
+# @summary
+#   A wrapper around the `apache::custom_config` defined type.
+#  
+# The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
+#
+# @param content
+#   Sets the configuration file's content.
+#
+# @param ensure
+#   Specifies if the virtual host file is present or absent.
+#
+# @param priority
+#   Sets the relative load order for Apache HTTPD VirtualHost configuration files.
+#
+# @param verify_config
+#   Specifies whether to validate the configuration file before notifying the Apache service.
+#
 define apache::vhost::custom(
   $content,
   $ensure = 'present',
diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp
index cf212c4b12..8a37752b18 100644
--- a/manifests/vhosts.pp
+++ b/manifests/vhosts.pp
@@ -1,3 +1,23 @@
+# @summary
+#   Creates `apache::vhost` defined types.
+# 
+# @note See the `apache::vhost` defined type's reference for a list of all virtual 
+# host parameters or Configuring virtual hosts in the README section.
+#
+# @example To create a [name-based virtual host](https://httpd.apache.org/docs/current/vhosts/name-based.html) `custom_vhost_1`
+#   class { 'apache::vhosts':
+#     vhosts => {
+#       'custom_vhost_1' => {
+#         'docroot' => '/var/www/custom_vhost_1',
+#         'port'    => '81',
+#       },
+#     },
+#   }
+#
+# @param vhosts
+#   A hash, where the key represents the name and the value represents a hash of 
+#   `apache::vhost` defined type's parameters.
+#
 class apache::vhosts (
   $vhosts = {},
 ) {

From 4d5d475382402ba34862e8e49fa4886553042795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Lespez?=
 <frederic.lespez@ccheznous.org>
Date: Fri, 3 May 2019 14:24:34 +0200
Subject: [PATCH 1513/2267] (MODULES-9018) Customize SSLStaplingCache parameter

- Add a stapling_cache parameter to apache::mod::ssl
  * if it is set to undef (the default value), the actual behavior will
    take place (SSLStaplingCache will be set to a value based on the OS)
  * if is is set to a string, this string will used as a value for
    SSLStaplingCache.
- Adapt template ssl.conf.erb accordingly
- Add unit tests got the stapling_cache parameter
- Document the stapling_cache parameter
---
 REFERENCE.md                 | 14 ++++++++++++++
 manifests/mod/ssl.pp         | 19 ++++++++++++-------
 spec/classes/mod/ssl_spec.rb | 10 ++++++++++
 templates/mod/ssl.conf.erb   |  2 +-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 4329d3ab9f..f2626bf081 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5466,6 +5466,20 @@ Pass stapling related OCSP errors on to client.
 
 Default value: `undef`
 
+##### `stapling_cache`
+
+Data type: `String`
+
+Configures the storage type of the global/inter-process SSL Stapling Cache.
+Only cache type 'shmcb' is supported.
+Default based on the OS:
+- Debian/Ubuntu: '${APACHE_RUN_DIR}/ocsp(32768)'.
+- RedHat: '/run/httpd/ssl_stapling(32768)'.
+- FreeBSD/Gentoo: '/var/run/ssl_stapling(32768)'.
+- Suse: '/var/lib/apache2/ssl_stapling(32768)'.
+
+Default value: `undef`
+
 ##### `ssl_mutex`
 
 Data type: `Any`
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 73bc91e98e..5c4e762aec 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -91,6 +91,7 @@
   String $ssl_sessioncache                                  = $::apache::params::ssl_sessioncache,
   $ssl_sessioncachetimeout                                  = '300',
   Boolean $ssl_stapling                                     = false,
+  Optional[String] $stapling_cache                          = undef,
   Optional[Boolean] $ssl_stapling_return_errors             = undef,
   $ssl_mutex                                                = undef,
   $apache_version                                           = undef,
@@ -141,12 +142,16 @@
     }
   }
 
-  $stapling_cache = $::osfamily ? {
-    'debian'  => "\${APACHE_RUN_DIR}/ocsp(32768)",
-    'redhat'  => '/run/httpd/ssl_stapling(32768)',
-    'freebsd' => '/var/run/ssl_stapling(32768)',
-    'gentoo'  => '/var/run/ssl_stapling(32768)',
-    'Suse'    => '/var/lib/apache2/ssl_stapling(32768)',
+  if $stapling_cache =~ Undef {
+    $_stapling_cache = $::osfamily ? {
+      'debian'  => "\${APACHE_RUN_DIR}/ocsp(32768)",
+      'redhat'  => '/run/httpd/ssl_stapling(32768)',
+      'freebsd' => '/var/run/ssl_stapling(32768)',
+      'gentoo'  => '/var/run/ssl_stapling(32768)',
+      'Suse'    => '/var/lib/apache2/ssl_stapling(32768)',
+    }
+  } else {
+    $_stapling_cache = $stapling_cache
   }
 
   if $::osfamily == 'Suse' {
@@ -179,7 +184,7 @@
   # $ssl_options
   # $ssl_openssl_conf_cmd
   # $ssl_sessioncache
-  # $stapling_cache
+  # $_stapling_cache
   # $ssl_mutex
   # $ssl_random_seed_bytes
   # $ssl_sessioncachetimeout
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 31fc44217f..b789a788f4 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -275,6 +275,16 @@
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLStaplingReturnResponderErrors On$}) }
     end
+    context 'with Apache version >= 2.4 - setting stapling_cache' do
+      let :params do
+        {
+          apache_version: '2.4',
+          stapling_cache: '/tmp/customstaplingcache(51200)',
+        }
+      end
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLStaplingCache "shmcb:/tmp/customstaplingcache\(51200\)"$}) }
+    end
 
     context 'setting ssl_pass_phrase_dialog' do
       let :params do
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index a3cf61868f..67b62564fd 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -34,7 +34,7 @@
   <%- if not @ssl_stapling_return_errors.nil? -%>
   SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
-  SSLStaplingCache "shmcb:<%= @stapling_cache %>"
+  SSLStaplingCache "shmcb:<%= @_stapling_cache %>"
 <% end -%>
   SSLCipherSuite <%= @ssl_cipher %>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>

From e05c98e295768323e00b5e1933be880b1825011d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Lespez?=
 <frederic.lespez@ccheznous.org>
Date: Wed, 1 May 2019 21:44:42 +0200
Subject: [PATCH 1514/2267] (MODULES-9014) Add SSLSessionTickets parameter -
 Add the boolean parameter ssl_sessiontickets to apache::mod::ssl - Use
 parameter ssl_sessiontickets in ssl.conf.erb - Add unit tests for parameter
 ssl_sessiontickets - Document the parameter ssl_sessiontickets - Disable
 SSLSessionTickets parameter on Ubuntu 14.04   since Apache >=2.4.11 is needed

---
 REFERENCE.md                 |  9 +++++++
 manifests/mod/ssl.pp         |  8 +++++++
 spec/classes/mod/ssl_spec.rb | 46 ++++++++++++++++++++++++++++++++++++
 templates/mod/ssl.conf.erb   |  3 +++
 4 files changed, 66 insertions(+)

diff --git a/REFERENCE.md b/REFERENCE.md
index 4329d3ab9f..a600242dd8 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5338,6 +5338,15 @@ Enable compression on the SSL level.
 
 Default value: `false`
 
+##### `ssl_sessiontickets`
+
+Data type: `Boolean`
+
+Enable the use of TLS session tickets (RFC 5077).
+Ignored on Ubuntu 14.04 since Apache 2.4.11 or newer is needed.
+
+Default: `true`.
+
 ##### `ssl_cryptodevice`
 
 Data type: `Any`
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 73bc91e98e..3641b10a24 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -76,6 +76,7 @@
 #
 class apache::mod::ssl (
   Boolean $ssl_compression                                  = false,
+  Boolean $ssl_sessiontickets                               = true,
   $ssl_cryptodevice                                         = 'builtin',
   $ssl_options                                              = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd                                     = undef,
@@ -165,6 +166,12 @@
     }
   }
 
+  if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '14.04' {
+    $_ssl_sessiontickets = undef
+  } else {
+    $_ssl_sessiontickets = $ssl_sessiontickets
+  }
+
   if versioncmp($_apache_version, '2.4') >= 0 {
     include ::apache::mod::socache_shmcb
   }
@@ -172,6 +179,7 @@
   # Template uses
   #
   # $ssl_compression
+  # $_ssl_sessiontickets
   # $ssl_cryptodevice
   # $ssl_ca
   # $ssl_cipher
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 31fc44217f..650ab777e7 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -255,6 +255,27 @@
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLCompression On$}) }
     end
+
+    context 'with Apache version >= 2.4 - ssl_sessiontickets with default value' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets On$}) }
+    end
+    context 'with Apache version >= 2.4 - setting ssl_sessiontickets to false' do
+      let :params do
+        {
+          apache_version: '2.4',
+          ssl_sessiontickets: false,
+        }
+      end
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets Off$}) }
+    end
+
     context 'with Apache version >= 2.4 - setting ssl_stapling to true' do
       let :params do
         {
@@ -334,4 +355,29 @@
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLProxyProtocol -ALL \+TLSv1$}) }
     end
   end
+  # Template config parts varying by distro
+  context 'on Ubuntu 14.04' do
+    let :facts do
+      {
+        osfamily: 'Debian',
+        operatingsystem: 'Ubuntu',
+        operatingsystemrelease: '14.04',
+        lsbdistrelease: '14.04',
+        kernel: 'Linux',
+        id: 'root',
+        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        is_pe: false,
+      }
+    end
+
+    context 'with Apache version >= 2.4 - setting ssl_sessiontickets to false' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets Off$}) }
+    end
+  end
 end
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index a3cf61868f..41116c0ee1 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -15,6 +15,9 @@
     <%- if @ssl_compression -%>
   SSLCompression <%= scope.call_function('apache::bool2httpd', [@ssl_compression]) %>
     <%- end -%>
+    <%- unless @_ssl_sessiontickets.nil? -%>
+  SSLSessionTickets <%= scope.call_function('apache::bool2httpd', [@_ssl_sessiontickets]) %>
+    <%- end -%>
   <%- else -%>
   SSLMutex <%= @_ssl_mutex %>
   <%- end -%>

From 63fadd7447afc6a519359683ecc3c95dae53ef85 Mon Sep 17 00:00:00 2001
From: youeyoue <20174148+youeyoue@users.noreply.github.com>
Date: Thu, 9 May 2019 07:51:48 -0400
Subject: [PATCH 1515/2267] MODULES-9003 Parameterize location for ldap-status
 (#1915)

* MODULES-9003 Parameterize location for ldap-status

Add ldap_path parameter to apache::mod::ldap with
Change ldap.conf.erb to use new parameter
Add new parameter to README.md

* (MODULES-9003) Parameterize location for ldap-status

Resolved conflict with upstream README.md (PR #1916)
Moved parameter documentation to module to stay in line with puppet strings

* (MODULES-9003) Parameterize location for ldap-status

Add regex unit test for Location block and custom ldap_path
---
 manifests/mod/ldap.pp         | 4 ++++
 spec/classes/mod/ldap_spec.rb | 8 ++++++++
 templates/mod/ldap.conf.erb   | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 48c5eea3fd..ef0841bd21 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -31,6 +31,9 @@
 # @param ldap_trusted_mode
 #   Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
 #
+# @param ldap_path
+#   The server location of the ldap status page.
+#
 # @example 
 #   class { 'apache::mod::ldap':
 #     ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
@@ -56,6 +59,7 @@
   $ldap_opcache_entries                            = undef,
   $ldap_opcache_ttl                                = undef,
   $ldap_trusted_mode                               = undef,
+  String $ldap_path                                = '/ldap-status',
 ){
 
   include ::apache
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index e069e28c6a..5dbe3780ad 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -42,6 +42,7 @@
           ldap_cache_ttl: '600',
           ldap_opcache_entries: '1024',
           ldap_opcache_ttl: '600',
+          ldap_path: '/custom-ldap-status',
         }
       end
 
@@ -52,6 +53,13 @@
       it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPCacheTTL 600$}) }
       it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPOpCacheEntries 1024$}) }
       it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPOpCacheTTL 600$}) }
+
+      expected_ldap_path_re =
+        "<Location /custom-ldap-status>\n"\
+        "\s*SetHandler ldap-status\n"\
+        ".*\n"\
+        "</Location>\n"
+      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{#{expected_ldap_path_re}}m) }
     end
   end # Debian
 
diff --git a/templates/mod/ldap.conf.erb b/templates/mod/ldap.conf.erb
index d0a11b6957..7c2dac5e98 100644
--- a/templates/mod/ldap.conf.erb
+++ b/templates/mod/ldap.conf.erb
@@ -1,4 +1,4 @@
-<Location /ldap-status>
+<Location <%= @ldap_path %>>
     SetHandler ldap-status
     <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1

From ea8cc02949653387ff84ec6228274f7685c573ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Lespez?=
 <frederic.lespez@ccheznous.org>
Date: Wed, 15 May 2019 14:06:43 +0200
Subject: [PATCH 1516/2267] (MODULES-9014) Improve SSLSessionTickets handling

- Make ssl_sessiontickets parameter optional
- Set default value for ssl_sessiontickets to undef (Compatible
  with all Apache versions)
- Update documentation and unit tests accordingly
---
 REFERENCE.md                 |  6 +++---
 manifests/mod/ssl.pp         | 10 ++--------
 spec/classes/mod/ssl_spec.rb | 27 +--------------------------
 templates/mod/ssl.conf.erb   |  4 ++--
 4 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 8b9c3620c0..b22046568e 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5340,12 +5340,12 @@ Default value: `false`
 
 ##### `ssl_sessiontickets`
 
-Data type: `Boolean`
+Data type: `Optional[Boolean]`
 
 Enable the use of TLS session tickets (RFC 5077).
-Ignored on Ubuntu 14.04 since Apache 2.4.11 or newer is needed.
+Available since Apache 2.4.11.
 
-Default: `true`.
+Default: `undef`.
 
 ##### `ssl_cryptodevice`
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 0f4b19fe59..1867a55305 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -76,7 +76,7 @@
 #
 class apache::mod::ssl (
   Boolean $ssl_compression                                  = false,
-  Boolean $ssl_sessiontickets                               = true,
+  Optional[Boolean] $ssl_sessiontickets                     = undef,
   $ssl_cryptodevice                                         = 'builtin',
   $ssl_options                                              = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd                                     = undef,
@@ -171,12 +171,6 @@
     }
   }
 
-  if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '14.04' {
-    $_ssl_sessiontickets = undef
-  } else {
-    $_ssl_sessiontickets = $ssl_sessiontickets
-  }
-
   if versioncmp($_apache_version, '2.4') >= 0 {
     include ::apache::mod::socache_shmcb
   }
@@ -184,7 +178,7 @@
   # Template uses
   #
   # $ssl_compression
-  # $_ssl_sessiontickets
+  # $ssl_sessiontickets
   # $ssl_cryptodevice
   # $ssl_ca
   # $ssl_cipher
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 886373c0fa..700079ad8a 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -263,7 +263,7 @@
         }
       end
 
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets On$}) }
+      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets (Off|On)$}) }
     end
     context 'with Apache version >= 2.4 - setting ssl_sessiontickets to false' do
       let :params do
@@ -365,29 +365,4 @@
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLProxyProtocol -ALL \+TLSv1$}) }
     end
   end
-  # Template config parts varying by distro
-  context 'on Ubuntu 14.04' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Ubuntu',
-        operatingsystemrelease: '14.04',
-        lsbdistrelease: '14.04',
-        kernel: 'Linux',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    context 'with Apache version >= 2.4 - setting ssl_sessiontickets to false' do
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
-      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets Off$}) }
-    end
-  end
 end
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index bd6a799ca9..94dc7bb829 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -15,8 +15,8 @@
     <%- if @ssl_compression -%>
   SSLCompression <%= scope.call_function('apache::bool2httpd', [@ssl_compression]) %>
     <%- end -%>
-    <%- unless @_ssl_sessiontickets.nil? -%>
-  SSLSessionTickets <%= scope.call_function('apache::bool2httpd', [@_ssl_sessiontickets]) %>
+    <%- unless @ssl_sessiontickets.nil? -%>
+  SSLSessionTickets <%= scope.call_function('apache::bool2httpd', [@ssl_sessiontickets]) %>
     <%- end -%>
   <%- else -%>
   SSLMutex <%= @_ssl_mutex %>

From 2f7d55b0de719bf25bdb3326cbbac2e8687ac97c Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Fri, 17 May 2019 15:35:18 +0300
Subject: [PATCH 1517/2267] MODULES-9120 - update metadata to support current
 version concat

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index a9835fb126..3bf48949ca 100644
--- a/metadata.json
+++ b/metadata.json
@@ -14,7 +14,7 @@
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 2.2.1 < 6.0.0"
+      "version_requirement": ">= 2.2.1 < 7.0.0"
     }
   ],
   "operatingsystem_support": [

From ba901e192ea6c41474aaa55570d9864e6c6e71e5 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Mon, 20 May 2019 15:35:47 +0300
Subject: [PATCH 1518/2267] MODULES-9150 - release version 5.0.0

---
 CHANGELOG.md  | 21 ++++++++++++++++++++-
 metadata.json |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55ee7c653f..5528df9bdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,26 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [4.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.1.0) (2019-04-03)
+## [v5.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.0.0) (2019-05-20)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.1.0...v5.0.0)
+
+### Changed
+
+- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#1908](https://github.com/puppetlabs/puppetlabs-apache/pull/1908) ([david22swan](https://github.com/david22swan))
+
+### Added
+
+- \(FM-7923\) Implement Puppet Strings [\#1916](https://github.com/puppetlabs/puppetlabs-apache/pull/1916) ([eimlav](https://github.com/eimlav))
+- Define SCL package name for mod\_ldap [\#1893](https://github.com/puppetlabs/puppetlabs-apache/pull/1893) ([treydock](https://github.com/treydock))
+
+### Fixed
+
+- \(MODULES-9014\) Improve SSLSessionTickets handling [\#1923](https://github.com/puppetlabs/puppetlabs-apache/pull/1923) ([FredericLespez](https://github.com/FredericLespez))
+- \(MODULES-8931\) Fix stahnma/epel failures [\#1914](https://github.com/puppetlabs/puppetlabs-apache/pull/1914) ([eimlav](https://github.com/eimlav))
+- Fix wsgi\_daemon\_process to support hash data type [\#1884](https://github.com/puppetlabs/puppetlabs-apache/pull/1884) ([mdechiaro](https://github.com/mdechiaro))
+
+## [4.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.1.0) (2019-04-05)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.0.0...4.1.0)
 
diff --git a/metadata.json b/metadata.json
index 3bf48949ca..ba17c5f933 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 03e270fd8d4be1e46b9fa5ffbf123ad56e750e76 Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@example42.com>
Date: Mon, 8 Apr 2019 21:17:02 +0200
Subject: [PATCH 1519/2267] Remove event mpm when using prefork, worker or itk

fixes https://tickets.puppetlabs.com/browse/MODULES-8903
---
 manifests/mpm.pp                   | 19 +++++++++----------
 manifests/mpm/disable_mpm_event.pp |  8 ++++++++
 spec/classes/apache_spec.rb        | 10 +++++++++-
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 manifests/mpm/disable_mpm_event.pp

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 270c89b54e..e67d20f9f6 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -84,13 +84,10 @@
         }
       }
 
+
       if $mpm == 'itk' {
         if ( ( $::operatingsystem == 'Ubuntu' ) or ( ($::operatingsystem == 'Debian') and ( versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) ) {
-          ensure_resource('exec', '/usr/sbin/a2dismod mpm_event', {
-            onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
-            require => Package['httpd'],
-            before  => Class['apache::service'],
-          })
+          include apache::mpm::disable_mpm_event
         }
 
         package { 'libapache2-mpm-itk':
@@ -104,11 +101,13 @@
 
       if $mpm == 'prefork' {
         if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9.0.0') >= 0 ) ) {
-          ensure_resource('exec', '/usr/sbin/a2dismod mpm_event', {
-            onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
-            require => Package['httpd'],
-            before  => Class['apache::service'],
-          })
+          include apache::mpm::disable_mpm_event
+        }
+      }
+
+      if $mpm == 'worker' {
+        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) {
+          include apache::mpm::disable_mpm_event
         }
       }
 
diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
new file mode 100644
index 0000000000..04bf53d4d1
--- /dev/null
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -0,0 +1,8 @@
+class apache::mpm::disable_mpm_event {
+  exec { '/usr/sbin/a2dismod mpm_event':
+    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
+    require => Package['httpd'],
+    before  => Class['apache::service'],
+  }
+
+}
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index ad4f8dcc62..f47b6682c0 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -247,7 +247,7 @@
     context '8' do
       let :facts do
         super().merge(lsbdistcodename: 'jessie',
-                      operatingsystemrelease: '8')
+                      operatingsystemrelease: '8.0.0')
       end
 
       it {
@@ -255,7 +255,15 @@
           'ensure' => 'directory',
         )
       }
+      describe 'Alternate mpm_modules when declaring mpm_module => prefork' do
+        let :params do
+          { mpm_module: 'worker' }
+        end
+
+        it { is_expected.to contain_exec('/usr/sbin/a2dismod mpm_event') }
+      end
     end
+
     context 'on Ubuntu 14.04' do
       let :facts do
         super().merge(operatingsystem: 'Ubuntu',

From 976b60e643485227e891297d5346e8d4fdf92827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=B6rner?= <martin.moerner@aperto.com>
Date: Fri, 7 Jun 2019 21:05:40 +0200
Subject: [PATCH 1520/2267] Add LDAPReferrals configuration parameter

---
 spec/defines/vhost_spec.rb       | 10 ++++++++++
 templates/vhost/_directories.erb |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index dcefbd1ba0..8d80a36f7f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -183,6 +183,11 @@
                     '/foo.js',
                   ],
                 },
+                {
+                  'path'                => '/',
+                  'provider'            => 'location',
+                  'auth_ldap_referrals' => 'off',
+                },
                 {
                   'path'                                                => '/var/www/node-app/public',
                   'passenger_enabled'                                   => true,
@@ -600,6 +605,11 @@
               content: %r{^\s+Require any-valid2$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+LDAPReferrals off$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$},
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 8d92afbde7..aead27971d 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -290,6 +290,9 @@
     <%- if directory['auth_merging'] -%>
     AuthMerging <%= directory['auth_merging'] %>
     <%- end -%>
+    <%- if directory['auth_ldap_referrals'] -%>
+    LDAPReferrals <%= directory['auth_ldap_referrals'] %>
+    <%- end -%>
     <%- if directory['auth_ldap_url'] -%>
     AuthLDAPURL <%= directory['auth_ldap_url'] %>
     <%- end -%>

From 0b8edd4aa8b8dad63d9cd510a16976e48bd7ae58 Mon Sep 17 00:00:00 2001
From: Erick Banks <erick@puppetlabs.com>
Date: Mon, 10 Jun 2019 13:32:06 +0100
Subject: [PATCH 1521/2267] pdksync_heads/master-0-g7827fc2

---
 .rubocop.yml            |  6 +++++-
 .travis.yml             |  9 ---------
 .vscode/extensions.json |  6 ++++++
 Gemfile                 | 22 +++++++++++-----------
 Rakefile                |  2 +-
 metadata.json           |  2 +-
 spec/spec_helper.rb     |  2 ++
 7 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 .vscode/extensions.json

diff --git a/.rubocop.yml b/.rubocop.yml
index b349606f1a..413a6442f5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,7 @@
 ---
-require: rubocop-rspec
+require:
+- rubocop-rspec
+- rubocop-i18n
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: '2.1'
@@ -19,6 +21,8 @@ AllCops:
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
+GetText:
+  Enabled: false
 GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
diff --git a/.travis.yml b/.travis.yml
index 485a2d84b5..a2b763cc96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,12 +64,3 @@ branches:
     - release
 notifications:
   email: false
-deploy:
-  provider: puppetforge
-  user: puppet
-  password:
-    secure: ""
-  on:
-    tags: true
-    all_branches: true
-    condition: "$DEPLOY_TO_FORGE = yes"
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000000..6177782746
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "jpogran.puppet-vscode",
+    "rebornix.Ruby"
+  ]
+}
diff --git a/Gemfile b/Gemfile
index b7d80c3e53..60f245f4c8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,17 +17,17 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "fast_gettext", '1.1.0',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
-  gem "json", '= 2.0.4',                               require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.1.0',                               require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator",                    require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
+  gem "fast_gettext", '1.1.0',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                            require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem "json_pure", '<= 2.0.1',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "json", '= 1.8.1',                                         require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
+  gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
diff --git a/Rakefile b/Rakefile
index a1d0de1226..a5a3479cb3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ end
 
 def changelog_project
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['name']
+  returnVal = nil || JSON.load(File.read('metadata.json'))['source'].match(%r{.*/([^/]*)})[1]
   raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
   puts "GitHubChangelogGenerator project:#{returnVal}"
   returnVal
diff --git a/metadata.json b/metadata.json
index ba17c5f933..6b483b7ba6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,5 +81,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.10.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-gf778803"
+  "template-ref": "heads/master-0-g7827fc2"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1f8b6b4bcb..9ee4373705 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -42,6 +42,8 @@
   end
 end
 
+# Ensures that a module is defined
+# @param module_name Name of the module
 def ensure_module_defined(module_name)
   module_name.split('::').reduce(Object) do |last_module, next_module|
     last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)

From 1b74c7e5cc41d711e83dfc14e701e3de18c8b342 Mon Sep 17 00:00:00 2001
From: stevegarn <50631208+stevegarn@users.noreply.github.com>
Date: Wed, 12 Jun 2019 04:32:04 -0400
Subject: [PATCH 1522/2267] (MODULES-9104) Add file_mode to config files.
 (#1922)

- ::apache::file_mode attribute is missing from several config files, including the main config file in ::apache, any custom config files managed by apache::custom_config, and reqtimeout.conf managed by apache::mod::reqtimeout
- Add "mode => $::apache::file_mode" to ::apache, apache::custom_config, and apache::mod::reqtimeout to correct the inability to manage the mode of these config files.
---
 manifests/custom_config.pp  | 1 +
 manifests/init.pp           | 1 +
 manifests/mod/reqtimeout.pp | 1 +
 3 files changed, 3 insertions(+)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index e0cea82b55..905cea57cf 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -78,6 +78,7 @@
   file { "apache_${name}":
     ensure  => $ensure,
     path    => "${confdir}/${_filename}",
+    mode    => $::apache::file_mode,
     content => $content,
     source  => $source,
     require => Package['httpd'],
diff --git a/manifests/init.pp b/manifests/init.pp
index 6846e21d37..fb43a6ee46 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -776,6 +776,7 @@
     # - $root_directory_secured
     file { "${::apache::conf_dir}/${::apache::params::conf_file}":
       ensure  => file,
+      mode    => $::apache::file_mode,
       content => template($conf_template),
       notify  => Class['Apache::Service'],
       require => [Package['httpd'], Concat[$ports_file]],
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index 8b4dbed3e0..31587207b4 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -15,6 +15,7 @@
   file { 'reqtimeout.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/reqtimeout.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/reqtimeout.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],

From d55a94740854fc3d29f38cf2bc55a1fb3629be6b Mon Sep 17 00:00:00 2001
From: Dave Seff <David.Seff@racq.com.au>
Date: Thu, 13 Jun 2019 13:13:21 +1000
Subject: [PATCH 1523/2267] Add LDAP parameters to httpd.conf

---
 manifests/init.pp        | 18 ++++++++++++++++++
 templates/httpd.conf.erb |  6 ++++++
 2 files changed, 24 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index fb43a6ee46..1f230e82ac 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -174,6 +174,22 @@
 #   CGIs/SSIs in REMOTE_HOST.<br />
 #   > **Note**: If enabled, it impacts performance significantly.
 #
+# @param ldap_trusted_mode
+#  The following modes are supported:
+#
+#    NONE - no encryption
+#    SSL - ldaps:// encryption on default port 636
+#    TLS - STARTTLS encryption on default port 389
+#  Not all LDAP toolkits support all the above modes. An error message will be logged at
+#  runtime if a mode is not supported, and the connection to the LDAP server will fail.
+#
+#If an ldaps:// URL is specified, the mode becomes SSL and the setting of LDAPTrustedMode is ignored.
+#
+# @param ldap_verify_server_cert
+#  Specifies whether to force the verification of a server certificate when establishing an SSL
+#  connection to the LDAP server.
+#  On|Off
+#
 # @param lib_path
 #   Specifies the location whereApache module files are stored.<br />
 #   > **Note**: Do not configure this parameter manually without special reason.
@@ -468,6 +484,8 @@
   $purge_vdir                                                           = false,
   $serveradmin                                                          = 'root@localhost',
   Enum['On', 'Off', 'on', 'off'] $sendfile                              = 'On',
+  $ldap_verify_server_cert                                              = undef,
+  $ldap_trusted_mode                                                    = undef,
   $error_documents                                                      = false,
   $timeout                                                              = '60',
   $httpd_dir                                                            = $::apache::params::httpd_dir,
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 5393cb8bbc..c8c9d4046b 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -134,6 +134,12 @@ IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
 Include "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
 <%- end -%>
 <% end -%>
+<% if @ldap_verify_server_cert -%>
+LDAPVerifyServerCert <%= @ldap_verify_server_cert %>
+<% end -%>
+<% if @ldap_verify_server_cert -%>
+LDAPTrustedMode <%= @ldap_trusted_mode %>
+<% end -%>
 
 <% if @error_documents -%>
 # /usr/share/apache2/error on debian

From 72e60759d8b0373f6c15767a056a472f1dd44e41 Mon Sep 17 00:00:00 2001
From: Viktor Chernov <32395272+turnopil@users.noreply.github.com>
Date: Mon, 17 Jun 2019 13:04:12 +0300
Subject: [PATCH 1524/2267] (bugfix) Add default package name for mod_ldap
 (#1913)

* added default package name for mod_ldap

* edited README

* removed selector

* added default package_name for mod_ldap

* changed ldap default package_name in README file
---
 manifests/params.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 147f9bed53..4d1046d0b7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -214,10 +214,7 @@
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',
-      'ldap'                  => $::apache::version::distrelease ? {
-        '7'     => 'mod_ldap',
-        default => undef,
-      },
+      'ldap'                  => 'mod_ldap',
       'lookup_identity'       => 'mod_lookup_identity',
       'pagespeed'             => 'mod-pagespeed-stable',
       # NOTE: The passenger module isn't available on RH/CentOS without

From c88ee13d4beaf4e0dff7f6b51b3808b769b2e758 Mon Sep 17 00:00:00 2001
From: George Cox <G.H.Cox@bath.ac.uk>
Date: Wed, 19 Jun 2019 08:37:50 +0100
Subject: [PATCH 1525/2267] Added unmanaged_path and custom_fragment options to
 userdir

---
 manifests/mod/userdir.pp       | 8 ++++++++
 templates/mod/userdir.conf.erb | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index cd0359e820..d564e07fbf 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -21,6 +21,12 @@
 # 
 # @param options
 #   Configures what features are available in a particular directory.
+#
+# @param unmanaged_path
+#   Toggles whether to manage path in userdir.conf
+#
+# @param custom_fragment
+#   Custom configuration to be added to userdir.conf
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_userdir.html for additional documentation.
 #
@@ -32,6 +38,8 @@
   $path = '/home/*/public_html',
   $overrides = [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ],
   $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ],
+  $unmanaged_path = false,
+  $custom_fragment = undef,
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index edf994c502..c28081131e 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -4,6 +4,7 @@
 <% end -%>
   UserDir <%= @_path %>
 
+<%- if ! @unmanaged_path -%>
   <Directory "<%= @_path %>">
     AllowOverride <%= @overrides.join(' ') %>
     Options <%= @options.join(' ') %>
@@ -24,4 +25,8 @@
       <%- end -%>
     </LimitExcept>
   </Directory>
+<%- end -%>
+<%- if @custom_fragment -%>
+<%= @custom_fragment %>
+<%- end -%>
 </IfModule>

From 12b5868d7480e41193e91d1a61286cb2953095a3 Mon Sep 17 00:00:00 2001
From: George Cox <G.H.Cox@bath.ac.uk>
Date: Wed, 26 Jun 2019 13:41:07 +0000
Subject: [PATCH 1526/2267] Added additional tests to
 spec/classes/userdir_spec.rb

---
 spec/classes/mod/userdir_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index f33920a262..1f5aa9151d 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -55,5 +55,24 @@
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+public_html /usr/web http://www\.example\.com/$}) }
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"public_html /usr/web http://www\.example\.com/\"\>$}) }
     end
+    context 'with unmanaged_path set to true' do
+      let :params do
+        {
+          unmanaged_path: true,
+        }
+      end
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+$/home/\*/public_html$}) }
+      it { is_expected.not_to contain_file('userdir.conf').with_content(%r{^\s*\<Directory }) }
+    end
+    context 'with custom_fragment set to something' do
+      let :params do
+        {
+          custom_fragment: 'custom_test_string',
+        }
+      end
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{custom_test_string}) }
+    end
   end
 end

From c1426a575d78124d34630d57c24c8d69b82a3bc0 Mon Sep 17 00:00:00 2001
From: George Cox <G.H.Cox@bath.ac.uk>
Date: Wed, 26 Jun 2019 14:58:12 +0000
Subject: [PATCH 1527/2267] Fixed regex in mod/userdir_spec.rb

---
 spec/classes/mod/userdir_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 1f5aa9151d..9ce731d53d 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -62,7 +62,7 @@
         }
       end
 
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+$/home/\*/public_html$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/public_html$}) }
       it { is_expected.not_to contain_file('userdir.conf').with_content(%r{^\s*\<Directory }) }
     end
     context 'with custom_fragment set to something' do

From ec0141ff8b35f89e917fafbe4df43fa1395fcae0 Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Tue, 16 Jul 2019 10:03:08 +0300
Subject: [PATCH 1528/2267] pdksync_heads/master-0-gb096033

---
 .rubocop.yml        | 2 +-
 .travis.yml         | 1 +
 Rakefile            | 1 +
 metadata.json       | 4 ++--
 spec/spec_helper.rb | 5 +++++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 413a6442f5..ee74e8cbb2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -26,7 +26,7 @@ GetText:
 GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
-  - spec/*
+  - spec/**/*
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
diff --git a/.travis.yml b/.travis.yml
index a2b763cc96..c29b111623 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 ---
+dist: xenial
 language: ruby
 cache: bundler
 before_install:
diff --git a/Rakefile b/Rakefile
index a5a3479cb3..f11fbe9d58 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,4 @@
+require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
diff --git a/metadata.json b/metadata.json
index 6b483b7ba6..966a17398b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -79,7 +79,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.10.0",
+  "pdk-version": "1.11.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g7827fc2"
+  "template-ref": "heads/master-0-gb096033"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9ee4373705..c09e0024da 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -29,6 +29,11 @@
   end
 end
 
+# read default_facts and merge them over what is provided by facterdb
+default_facts.each do |fact, value|
+  add_custom_fact fact, value
+end
+
 RSpec.configure do |c|
   c.default_facts = default_facts
   c.before :each do

From 8e278ba3751f54b4c1cc2c136c28b22a32915f60 Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Thu, 1 Aug 2019 13:12:31 +0200
Subject: [PATCH 1529/2267] My first commit to make ProxyRequests a variable to
 set in hiera. Default is Off. By setting proxy_requests to 'true' it will
 become 'ProxyRequests On'

---
 manifests/vhost.pp         | 1 +
 templates/vhost/_proxy.erb | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 3f93e6a480..0ee366f2ad 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1705,6 +1705,7 @@
   $proxy_dest_reverse_match                                                         = undef,
   $proxy_pass                                                                       = undef,
   $proxy_pass_match                                                                 = undef,
+  $proxy_requests                                                                   = false,
   $suphp_addhandler                                                                 = $::apache::params::suphp_addhandler,
   Enum['on', 'off'] $suphp_engine                                                   = $::apache::params::suphp_engine,
   $suphp_configpath                                                                 = $::apache::params::suphp_configpath,
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 79f36cf047..8585363dac 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -1,7 +1,11 @@
 <% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match -%>
 
   ## Proxy rules
-  ProxyRequests Off
+  <% if @proxy_requests -%>
+    ProxyRequests On
+  <% else -%>
+    ProxyRequests Off
+  <%- end -%>
 <%- end -%>
 <% if @proxy_preserve_host -%>
   ProxyPreserveHost On

From f5c77978a3664746328d0a9031b2107ad70e80dd Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Thu, 1 Aug 2019 13:20:55 +0200
Subject: [PATCH 1530/2267] probably have to add it it
 spec/defines/vhost_spec.rb as well

---
 spec/defines/vhost_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index dcefbd1ba0..796c980056 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -279,6 +279,7 @@
                   'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
                 },
               ],
+              'proxy_requests'              => false,
               'suphp_addhandler'            => 'foo',
               'suphp_engine'                => 'on',
               'suphp_configpath'            => '/var/www/html',

From 6fe56f23a03c4f6e2577067169560519b7b50e3c Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Thu, 1 Aug 2019 13:53:19 +0200
Subject: [PATCH 1531/2267] fixed indentation. this is a template, not code...
 ;-)

---
 templates/vhost/_proxy.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 8585363dac..7523b2e1f2 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -2,9 +2,9 @@
 
   ## Proxy rules
   <% if @proxy_requests -%>
-    ProxyRequests On
+  ProxyRequests On
   <% else -%>
-    ProxyRequests Off
+  ProxyRequests Off
   <%- end -%>
 <%- end -%>
 <% if @proxy_preserve_host -%>

From 96ebbb31619ec3ace84521b09219379feae374b2 Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Thu, 1 Aug 2019 15:17:37 +0200
Subject: [PATCH 1532/2267] Indentation not quite right, this should fix it

---
 templates/vhost/_proxy.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 7523b2e1f2..feee7d8e1c 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -1,11 +1,11 @@
 <% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match -%>
 
   ## Proxy rules
-  <% if @proxy_requests -%>
+<% if @proxy_requests -%>
   ProxyRequests On
-  <% else -%>
+<% else -%>
   ProxyRequests Off
-  <%- end -%>
+<%- end -%>
 <%- end -%>
 <% if @proxy_preserve_host -%>
   ProxyPreserveHost On

From e557419fdbaac39151c1eb59b3159818376aa013 Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Thu, 1 Aug 2019 15:28:22 +0200
Subject: [PATCH 1533/2267] added comments about the proxy_requests variable in
 CHANGELOG.md, HISTORY.md and REFERENCE.md

---
 CHANGELOG.md |  1 +
 HISTORY.md   |  1 +
 REFERENCE.md | 10 ++++++++++
 3 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5528df9bdd..9d8978c950 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -808,6 +808,7 @@ This release features many improvements and bugfixes, including several new defi
   - passenger_ruby
   - passenger_start_timeout
   - proxy_preserve_host
+  - proxy_requests
   - redirectmatch_dest
   - ssl_crl_check
   - wsgi_chunked_request
diff --git a/HISTORY.md b/HISTORY.md
index 90e65f6584..3d6897f091 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -698,6 +698,7 @@ This release features many improvements and bugfixes, including several new defi
   - passenger_ruby
   - passenger_start_timeout
   - proxy_preserve_host
+  - proxy_requests
   - redirectmatch_dest
   - ssl_crl_check
   - wsgi_chunked_request
diff --git a/REFERENCE.md b/REFERENCE.md
index b22046568e..90e1431c9f 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -7369,6 +7369,16 @@ X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
 Default value: `undef`
 
+##### `proxy_requests`
+
+Data type: `Any`
+
+Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
+This prarmeter allows or prevents Apache httpd from functioning as a forward proxy server.
+(Setting ProxyRequests to Off does not disable use of the ProxyPass directive.)
+
+Default value: `false`
+
 ##### `proxy_error_override`
 
 Data type: `Any`

From 1240de9b3dc713575d17910f64ffde8eb61cd825 Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Thu, 1 Aug 2019 15:28:22 +0200
Subject: [PATCH 1534/2267] created a ticket in Jira: MODULES-9668

---
 CHANGELOG.md |  1 +
 HISTORY.md   |  1 +
 REFERENCE.md | 10 ++++++++++
 3 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5528df9bdd..9d8978c950 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -808,6 +808,7 @@ This release features many improvements and bugfixes, including several new defi
   - passenger_ruby
   - passenger_start_timeout
   - proxy_preserve_host
+  - proxy_requests
   - redirectmatch_dest
   - ssl_crl_check
   - wsgi_chunked_request
diff --git a/HISTORY.md b/HISTORY.md
index 90e65f6584..3d6897f091 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -698,6 +698,7 @@ This release features many improvements and bugfixes, including several new defi
   - passenger_ruby
   - passenger_start_timeout
   - proxy_preserve_host
+  - proxy_requests
   - redirectmatch_dest
   - ssl_crl_check
   - wsgi_chunked_request
diff --git a/REFERENCE.md b/REFERENCE.md
index b22046568e..90e1431c9f 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -7369,6 +7369,16 @@ X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
 Default value: `undef`
 
+##### `proxy_requests`
+
+Data type: `Any`
+
+Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
+This prarmeter allows or prevents Apache httpd from functioning as a forward proxy server.
+(Setting ProxyRequests to Off does not disable use of the ProxyPass directive.)
+
+Default value: `false`
+
 ##### `proxy_error_override`
 
 Data type: `Any`

From 3adaa9e186316e3bb81f83fd62e53a6cacc61365 Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Mon, 5 Aug 2019 14:14:27 +0200
Subject: [PATCH 1535/2267] Explicitly added 'Optional[Boolean]' as data type
 for proxy_requests variable

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0ee366f2ad..7002dfcec7 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1705,7 +1705,7 @@
   $proxy_dest_reverse_match                                                         = undef,
   $proxy_pass                                                                       = undef,
   $proxy_pass_match                                                                 = undef,
-  $proxy_requests                                                                   = false,
+  Optional[Boolean] $proxy_requests                                                 = false,
   $suphp_addhandler                                                                 = $::apache::params::suphp_addhandler,
   Enum['on', 'off'] $suphp_engine                                                   = $::apache::params::suphp_engine,
   $suphp_configpath                                                                 = $::apache::params::suphp_configpath,

From cbea60728a4dd71331cea8d686b1e877fb22db01 Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Mon, 5 Aug 2019 14:21:52 +0200
Subject: [PATCH 1536/2267] This shouldn't be Optional

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7002dfcec7..5d4e6498c8 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1705,7 +1705,7 @@
   $proxy_dest_reverse_match                                                         = undef,
   $proxy_pass                                                                       = undef,
   $proxy_pass_match                                                                 = undef,
-  Optional[Boolean] $proxy_requests                                                 = false,
+  Boolean $proxy_requests                                                           = false,
   $suphp_addhandler                                                                 = $::apache::params::suphp_addhandler,
   Enum['on', 'off'] $suphp_engine                                                   = $::apache::params::suphp_engine,
   $suphp_configpath                                                                 = $::apache::params::suphp_configpath,

From d292e94cb323e168e1c489efa451a5c1c9ee617d Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Mon, 5 Aug 2019 17:03:30 +0200
Subject: [PATCH 1537/2267] Corrected data type for proxy_requests to Boolean
 instead of Any

---
 REFERENCE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 90e1431c9f..c7cf8cf4ad 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -4657,7 +4657,7 @@ The following parameters are available in the `apache::mod::proxy` class.
 
 ##### `proxy_requests`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Enables forward (standard) proxy requests.
 

From 86d65493c2be9486076f419cb029e0a87588689e Mon Sep 17 00:00:00 2001
From: dev_jasper <J.Aukes@issc.leidenuniv.nl>
Date: Tue, 13 Aug 2019 16:02:50 +0200
Subject: [PATCH 1538/2267] fixed data type of proxy_requests to Boolean

---
 REFERENCE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index c7cf8cf4ad..61f46f3430 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -7371,7 +7371,7 @@ Default value: `undef`
 
 ##### `proxy_requests`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
 This prarmeter allows or prevents Apache httpd from functioning as a forward proxy server.

From cd38f18fd5654ebb23e7f6a98cc73bdfdfdefbaa Mon Sep 17 00:00:00 2001
From: puppet_puppetmaster <puppetmaster@aukes.com>
Date: Sat, 17 Aug 2019 11:06:12 +0200
Subject: [PATCH 1539/2267] changed 'ProxyErrorOverride Directive' to
 'ProxyRequests Directive' in REFERENCE.md

---
 REFERENCE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 61f46f3430..19badde107 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -7373,7 +7373,7 @@ Default value: `undef`
 
 Data type: `Boolean`
 
-Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
+Sets the [ProxyRequests Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
 This prarmeter allows or prevents Apache httpd from functioning as a forward proxy server.
 (Setting ProxyRequests to Off does not disable use of the ProxyPass directive.)
 

From b99d6b0fdf1b6cc57dbbb1f5157d28434af94e82 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Fri, 26 Jul 2019 11:23:10 +0100
Subject: [PATCH 1540/2267] (FM-8214) converted to use litmus

Fix itk_spec running unnecessarily on el5

more acceptance test setup.

Simplify vhost_spec tests
---
 .fixtures.yml                                 |    5 +-
 .sync.yml                                     |   11 +-
 .travis.yml                                   |   55 +-
 Gemfile                                       |    5 -
 distelli-manifest.yml                         |   25 +
 metadata.json                                 |    2 +-
 provision.yaml                                |   13 +
 spec/acceptance/apache_parameters_spec.rb     |  127 +-
 spec/acceptance/apache_ssl_spec.rb            |   27 +-
 spec/acceptance/class_spec.rb                 |   37 +-
 spec/acceptance/custom_config_spec.rb         |   15 +-
 spec/acceptance/default_mods_spec.rb          |   41 +-
 spec/acceptance/init_task_spec.rb             |    7 +-
 spec/acceptance/itk_spec.rb                   |   24 +-
 spec/acceptance/mod_php_spec.rb               |   27 +-
 spec/acceptance/nodesets/centos-7-x64.yml     |   10 -
 spec/acceptance/nodesets/debian-8-x64.yml     |   10 -
 spec/acceptance/nodesets/default.yml          |   10 -
 spec/acceptance/nodesets/docker/centos-7.yml  |   12 -
 spec/acceptance/nodesets/docker/debian-8.yml  |   11 -
 .../nodesets/docker/ubuntu-14.04.yml          |   12 -
 spec/acceptance/nodesets/suse.yml             |   25 -
 spec/acceptance/prefork_worker_spec.rb        |   67 +-
 spec/acceptance/service_spec.rb               |    5 +-
 spec/acceptance/version.rb                    |   93 --
 spec/acceptance/vhost_spec.rb                 | 1220 +++++------------
 spec/acceptance/vhosts_spec.rb                |    7 +-
 spec/spec_helper_acceptance.rb                |  155 +--
 spec/spec_helper_acceptance_local.rb          |  139 ++
 29 files changed, 769 insertions(+), 1428 deletions(-)
 create mode 100644 distelli-manifest.yml
 create mode 100644 provision.yaml
 mode change 100755 => 100644 spec/acceptance/apache_parameters_spec.rb
 delete mode 100644 spec/acceptance/nodesets/centos-7-x64.yml
 delete mode 100644 spec/acceptance/nodesets/debian-8-x64.yml
 delete mode 100644 spec/acceptance/nodesets/default.yml
 delete mode 100644 spec/acceptance/nodesets/docker/centos-7.yml
 delete mode 100644 spec/acceptance/nodesets/docker/debian-8.yml
 delete mode 100644 spec/acceptance/nodesets/docker/ubuntu-14.04.yml
 delete mode 100644 spec/acceptance/nodesets/suse.yml
 delete mode 100644 spec/acceptance/version.rb
 create mode 100644 spec/spec_helper_acceptance_local.rb

diff --git a/.fixtures.yml b/.fixtures.yml
index c65734b30c..4fe91b89c8 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,8 +1,11 @@
 fixtures:
   repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
     concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
+    facts: 'git://github.com/puppetlabs/puppetlabs-facts.git'
     portage: "git://github.com/gentoo/puppet-portage.git"
+    provision: 'git://github.com/puppetlabs/provision.git'
+    puppet_agent: 'git://github.com/puppetlabs/puppetlabs-puppet_agent.git'
+    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
     yumrepo_core: 
       repo: "git://github.com/puppetlabs/puppetlabs-yumrepo_core.git"
       puppet_version: '>= 6.0.0'
diff --git a/.sync.yml b/.sync.yml
index 7c941ee542..4040796c25 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -19,15 +19,6 @@
     - release
 
 Gemfile:
-  required:
-    ':system_tests':
-      - gem: 'puppet-module-posix-system-r#{minor_version}'
-        platforms: ruby
-      - gem: 'puppet-module-win-system-r#{minor_version}'
-        platforms:
-          - mswin
-          - mingw
-          - x64_mingw
   optional:
     ':development':
       - gem: 'github_changelog_generator'
@@ -48,4 +39,4 @@ appveyor.yml:
 
 spec/spec_helper.rb:
   mock_with: ':rspec'
-  coverage_report: true
\ No newline at end of file
+  coverage_report: true
diff --git a/.travis.yml b/.travis.yml
index c29b111623..3c5c304c65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,6 @@ script:
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
-env:
-  global:
-    - PARALLEL_TEST_PROCESSORS=16
 stages:
   - static
   - spec
@@ -27,22 +24,58 @@ matrix:
   fast_finish: true
   include:
     -
-      bundler_args: 
+      bundler_args:
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
+      env: PLATFORMS=deb_puppet5
       rvm: 2.5.3
-      script: bundle exec rake beaker
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_deb]'
+      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
+      - bundle exec rake 'litmus:install_agent[puppet5]'
+      - bundle exec rake litmus:install_module
+      script:
+      - bundle exec rake litmus:acceptance:parallel
       services: docker
-      stage: acceptance
       sudo: required
     -
-      bundler_args: 
+      bundler_args:
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+      env: PLATFORMS=deb_puppet6
       rvm: 2.5.3
-      script: bundle exec rake beaker
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_deb]'
+      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
+      - bundle exec rake 'litmus:install_agent[puppet6]'
+      - bundle exec rake litmus:install_module
+      script:
+      - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      sudo: required
+    -
+      bundler_args:
+      dist: trusty
+      env: PLATFORMS=el7_puppet5
+      rvm: 2.5.3
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_el7]'
+      - bundle exec rake 'litmus:install_agent[puppet5]'
+      - bundle exec rake litmus:install_module
+      script:
+      - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      sudo: required
+    -
+      bundler_args:
+      dist: trusty
+      env: PLATFORMS=el7_puppet6
+      rvm: 2.5.3
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_el7]'
+      - bundle exec rake 'litmus:install_agent[puppet6]'
+      - bundle exec rake litmus:install_module
+      script:
+      - bundle exec rake litmus:acceptance:parallel
       services: docker
-      stage: acceptance
       sudo: required
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
diff --git a/Gemfile b/Gemfile
index 60f245f4c8..0e94796156 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,6 @@ end
 
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
-
 group :development do
   gem "fast_gettext", '1.1.0',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
   gem "fast_gettext",                                            require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
@@ -29,10 +28,6 @@ group :development do
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
-group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
-  gem "puppet-module-win-system-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
 facter_version = ENV['FACTER_GEM_VERSION']
diff --git a/distelli-manifest.yml b/distelli-manifest.yml
new file mode 100644
index 0000000000..520a54bfd1
--- /dev/null
+++ b/distelli-manifest.yml
@@ -0,0 +1,25 @@
+team-modules/puppetlabs-apache:
+  PreBuild:
+    - source /opt/rh/rh-ruby25/enable
+    - echo "--- LETS update BUNDLER ---"
+    - bundle install --path vendor/bundle --jobs 3
+  Build:
+    - echo "--- PROVISIONING ---"
+    - source /opt/rh/rh-ruby25/enable
+    - bundle exec rake litmus:provision_list[release_checks]
+    - cat inventory.yaml
+    - echo "--- AGENT INSTALLATION ---"
+    - bundle exec rake litmus:install_agent
+    - echo "--- MODULE INSTALLATION ---"
+    - bundle exec rake litmus:install_module
+    - echo "--- TESTS RUNNING ---"
+    - bundle exec rake litmus:acceptance:parallel
+  AfterBuildSuccess:
+    - source /opt/rh/rh-ruby25/enable
+    - bundle exec rake litmus:tear_down
+  AfterBuildFailure:
+    - source /opt/rh/rh-ruby25/enable
+    - bundle exec rake litmus:tear_down
+  CommitData:
+    - RepoType: Git
+    - RepoPath: .
diff --git a/metadata.json b/metadata.json
index 966a17398b..24977cc5ae 100644
--- a/metadata.json
+++ b/metadata.json
@@ -80,6 +80,6 @@
   ],
   "description": "Module for Apache configuration",
   "pdk-version": "1.11.1",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
+  "template-url": "https://github.com/puppetlabs/pdk-templates/#master",
   "template-ref": "heads/master-0-gb096033"
 }
diff --git a/provision.yaml b/provision.yaml
new file mode 100644
index 0000000000..a309065b6a
--- /dev/null
+++ b/provision.yaml
@@ -0,0 +1,13 @@
+---
+default:
+  provisioner: docker 
+  images: ['waffleimage/debian8']
+travis_deb:
+  provisioner: docker
+  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+travis_el7:
+  provisioner: docker
+  images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
+release_checks:
+  provisioner: vmpooler
+  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
old mode 100755
new mode 100644
index 98c7dd2ee4..8c862eb179
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -1,6 +1,5 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
+apache_hash = apache_settings_hash
 describe 'apache parameters' do
   # Currently this test only does something on FreeBSD.
   describe 'default_confd_files => false' do
@@ -9,8 +8,8 @@
       apply_manifest(pp, catch_failures: true)
     end
 
-    if host_inventory['facter']['os']['family'] == 'FreeBSD'
-      describe file("#{$confd_dir}/no-accf.conf.erb") do
+    if os[:family] == 'freebsd'
+      describe file("#{apache_hash['confd_dir']}/no-accf.conf.erb") do
         it { is_expected.not_to be_file }
       end
     end
@@ -21,8 +20,8 @@
       apply_manifest(pp, catch_failures: true)
     end
 
-    if host_inventory['facter']['os']['family'] == 'FreeBSD'
-      describe file("#{$confd_dir}/no-accf.conf.erb") do
+    if os[:family] == 'freebsd'
+      describe file("#{apache_hash['confd_dir']}/no-accf.conf.erb") do
         it { is_expected.to be_file }
       end
     end
@@ -34,7 +33,7 @@
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($ports_file) do
+    describe file(apache_hash['ports_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Listen 10.1.1.1' }
     end
@@ -52,15 +51,9 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
-      if host_inventory['facter']['os']['name'] == 'debian' && os[:release][0] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'sles' && os[:release][0..1] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+      it { is_expected.to be_enabled }
     end
   end
 
@@ -75,15 +68,9 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
-      if host_inventory['facter']['os']['name'] == 'debian' && os[:release][0] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'sles' && os[:release][0..1] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.not_to be_enabled }
-      end
+      it { is_expected.not_to be_enabled }
     end
   end
 
@@ -99,19 +86,13 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
-      if host_inventory['facter']['os']['name'] == 'debian' && os[:release][0] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'sles' && os[:release][0..1] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.not_to be_enabled }
-      end
+      it { is_expected.not_to be_enabled }
     end
   end
 
-  if host_inventory['facter']['os']['family'] == 'Debian'
+  if os[:family] == 'debian'
     describe 'conf_enabled => /etc/apache2/conf-enabled' do
       pp = <<-MANIFEST
           class { 'apache':
@@ -120,7 +101,7 @@ class { 'apache':
           }
       MANIFEST
       it 'applies cleanly' do
-        shell('touch /etc/apache2/conf-enabled/test.conf')
+        run_shell('touch /etc/apache2/conf-enabled/test.conf')
         apply_manifest(pp, catch_failures: true)
       end
 
@@ -141,44 +122,44 @@ class { 'apache':
         class { 'apache':
           purge_configs   => false,
           purge_vhost_dir => false,
-          vhost_dir       => "#{$confd_dir}.vhosts"
+          vhost_dir       => "#{apache_hash['confd_dir']}.vhosts"
         }
     MANIFEST
     it 'applies cleanly' do
-      shell("touch #{$confd_dir}/test.conf")
-      shell("mkdir -p #{$confd_dir}.vhosts && touch #{$confd_dir}.vhosts/test.conf")
+      run_shell("touch #{apache_hash['confd_dir']}/test.conf")
+      run_shell("mkdir -p #{apache_hash['confd_dir']}.vhosts && touch #{apache_hash['confd_dir']}.vhosts/test.conf")
       apply_manifest(pp, catch_failures: true)
     end
 
     # Ensure the files didn't disappear.
-    describe file("#{$confd_dir}/test.conf") do
+    describe file("#{apache_hash['confd_dir']}/test.conf") do
       it { is_expected.to be_file }
     end
-    describe file("#{$confd_dir}.vhosts/test.conf") do
+    describe file("#{apache_hash['confd_dir']}.vhosts/test.conf") do
       it { is_expected.to be_file }
     end
   end
 
-  if host_inventory['facter']['os']['family'] != 'Debian'
+  if os[:family] != 'debian'
     describe 'purge parameters => true' do
       pp = <<-MANIFEST
           class { 'apache':
             purge_configs   => true,
             purge_vhost_dir => true,
-            vhost_dir       => "#{$confd_dir}.vhosts"
+            vhost_dir       => "#{apache_hash['confd_dir']}.vhosts"
           }
       MANIFEST
       it 'applies cleanly' do
-        shell("touch #{$confd_dir}/test.conf")
-        shell("mkdir -p #{$confd_dir}.vhosts && touch #{$confd_dir}.vhosts/test.conf")
+        run_shell("touch #{apache_hash['confd_dir']}/test.conf")
+        run_shell("mkdir -p #{apache_hash['confd_dir']}.vhosts && touch #{apache_hash['confd_dir']}.vhosts/test.conf")
         apply_manifest(pp, catch_failures: true)
       end
 
       # File should be gone
-      describe file("#{$confd_dir}/test.conf") do
+      describe file("#{apache_hash['confd_dir']}/test.conf") do
         it { is_expected.not_to be_file }
       end
-      describe file("#{$confd_dir}.vhosts/test.conf") do
+      describe file("#{apache_hash['confd_dir']}.vhosts/test.conf") do
         it { is_expected.not_to be_file }
       end
     end
@@ -190,7 +171,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($vhost) do
+    describe file(apache_hash['vhost']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ServerAdmin test@example.com' }
     end
@@ -204,7 +185,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'EnableSendfile On' }
     end
@@ -216,7 +197,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Sendfile Off' }
     end
@@ -230,7 +211,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Alias /error/' }
     end
@@ -244,7 +225,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Timeout 1234' }
     end
@@ -261,7 +242,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file("#{$mod_dir}/mime.conf") do
+    describe file("#{apache_hash['mod_dir']}/mime.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'AddLanguage eo .eo' }
     end
@@ -271,7 +252,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     # Actually >= 2.4.24, but the minor version is not provided
     # https://bugs.launchpad.net/ubuntu/+source/apache2/2.4.7-1ubuntu4.15
     # basically versions of the ubuntu or sles  apache package cause issue
-    if $apache_version >= '2.4' && host_inventory['facter']['os']['name'] !~ %r{Ubuntu|SLES}
+    if apache_hash['version'] >= '2.4' && os[:family] !~ %r{ubuntu|sles}
       describe 'setup' do
         it 'applies cleanly' do
           pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}"
@@ -279,7 +260,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
         end
       end
 
-      describe file($conf_file) do
+      describe file(apache_hash['conf_file']) do
         it { is_expected.to be_file }
         it { is_expected.to contain 'HttpProtocolOptions Unsafe RegisteredMethods Require1.0' }
       end
@@ -294,7 +275,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ServerRoot "/tmp/root"' }
     end
@@ -308,13 +289,13 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    if $apache_version == '2.4'
-      describe file($conf_file) do
+    if apache_hash['version'] == '2.4'
+      describe file(apache_hash['conf_file']) do
         it { is_expected.to be_file }
         it { is_expected.to contain 'IncludeOptional "/tmp/root/*.conf"' }
       end
     else
-      describe file($conf_file) do
+      describe file(apache_hash['conf_file']) do
         it { is_expected.to be_file }
         it { is_expected.to contain 'Include "/tmp/root/*.conf"' }
       end
@@ -325,13 +306,13 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
     describe 'setup' do
       it 'applies cleanly' do
         pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }"
-        shell("mkdir -p #{default['distmoduledir']}/another/templates")
-        shell("echo 'testcontent' >> #{default['distmoduledir']}/another/templates/test.conf.erb")
+        run_shell('mkdir -p /etc/puppetlabs/code/environments/production/modules/another/templates')
+        run_shell("echo 'testcontent' >>  /etc/puppetlabs/code/environments/production/modules/another/templates/test.conf.erb")
         apply_manifest(pp, catch_failures: true)
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'testcontent' }
     end
@@ -345,7 +326,7 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ServerName "test.server"' }
     end
@@ -391,7 +372,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common' }
       it { is_expected.to contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined' }
@@ -406,7 +387,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'KeepAlive Off' }
       it { is_expected.to contain 'KeepAliveTimeout 30' }
@@ -422,7 +403,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'LimitRequestFieldSize 16830' }
     end
@@ -436,7 +417,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'LimitRequestFields 120' }
     end
@@ -472,7 +453,7 @@ class { 'apache': logroot => '/apache_spec' }
       end
     end
 
-    describe file("/apache_spec/#{$error_log}") do
+    describe file("/apache_spec/#{apache_hash['error_log']}") do
       it { is_expected.to be_file }
     end
   end
@@ -506,7 +487,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ServerTokens Minor' }
     end
@@ -523,7 +504,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ServerSignature testsig' }
     end
@@ -537,7 +518,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'HostnameLookups On' }
     end
@@ -549,7 +530,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'HostnameLookups Off' }
     end
@@ -561,7 +542,7 @@ class { 'apache':
       end
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'HostnameLookups Double' }
     end
@@ -577,7 +558,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'TraceEnable Off' }
     end
@@ -593,7 +574,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($conf_file) do
+    describe file(apache_hash['conf_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'FileETag None' }
     end
@@ -609,7 +590,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe package($package_name) do
+    describe package(apache_hash['package_name']) do
       it { is_expected.to be_installed }
     end
   end
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 63a44e7ea8..669f54a0af 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -1,6 +1,5 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
+apache_hash = apache_settings_hash
 describe 'apache ssl' do
   describe 'ssl parameters' do
     pp = <<-MANIFEST
@@ -17,11 +16,10 @@ class { 'apache':
         }
     MANIFEST
     it 'runs without error' do
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
+      idempotent_apply(pp)
     end
 
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
@@ -29,7 +27,7 @@ class { 'apache':
       it { is_expected.not_to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
       it { is_expected.not_to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
       it { is_expected.not_to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
-      if $apache_version == '2.4'
+      if apache_hash['version'] == '2.4'
         it { is_expected.not_to contain 'SSLCARevocationCheck    "chain"' }
       else
         it { is_expected.not_to contain 'SSLCARevocationCheck' }
@@ -65,11 +63,10 @@ class { 'apache':
         }
     MANIFEST
     it 'runs without error' do
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
+      idempotent_apply(pp)
     end
 
-    describe file("#{$vhost_dir}/25-test_ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test_ssl.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
@@ -85,7 +82,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLVerifyClient         test' }
       it { is_expected.to contain 'SSLVerifyDepth          test' }
       it { is_expected.to contain 'SSLOptions test test1' }
-      if $apache_version == '2.4'
+      if apache_hash['version'] == '2.4'
         it { is_expected.to contain 'SSLCARevocationCheck    "chain"' }
       else
         it { is_expected.not_to contain 'SSLCARevocationCheck' }
@@ -109,11 +106,10 @@ class { 'apache':
         }
     MANIFEST
     it 'runs without error' do
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
+      idempotent_apply(pp)
     end
 
-    describe file("#{$vhost_dir}/25-test_ssl_ca_only.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test_ssl_ca_only.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
@@ -138,11 +134,10 @@ class { 'apache':
         }
     MANIFEST
     it 'runs without error' do
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
+      idempotent_apply(pp)
     end
 
-    describe file("#{$vhost_dir}/25-test_ssl_certs_dir_only.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test_ssl_certs_dir_only.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index d86a8dfdf5..d983599cd8 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -1,11 +1,12 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
+apache_hash = apache_settings_hash
 describe 'apache class' do
   context 'default parameters' do
     let(:pp) { "class { 'apache': }" }
 
-    it_behaves_like 'a idempotent resource'
+    it 'behaves idempotently' do
+      idempotent_apply(pp)
+    end
 
     describe 'apache_version fact' do
       let(:result) do
@@ -17,22 +18,16 @@
       end
 
       it {
-        expect(result.output).to match(%r{apache_version = >#{$apache_version}.*<})
+        expect(result.stdout).to match(%r{apache_version = >#{apache_hash['version']}.*<})
       }
     end
 
-    describe package($package_name) do
+    describe package(apache_hash['package_name']) do
       it { is_expected.to be_installed }
     end
 
-    describe service($service_name) do
-      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+    describe service(apache_hash['service_name']) do
+      it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
@@ -42,7 +37,6 @@
   end
 
   context 'custom site/mod dir parameters' do
-    # Using puppet_apply as a helper
     let(:pp) do
       <<-MANIFEST
         if $::osfamily == 'RedHat' and "$::selinux" == "true" {
@@ -76,17 +70,12 @@ class { 'apache':
       MANIFEST
     end
 
-    # Run it twice and test for idempotency
-    it_behaves_like 'a idempotent resource'
+    it 'behaves idempotently' do
+      idempotent_apply(pp)
+    end
 
-    describe service($service_name) do
-      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+    describe service(apache_hash['service_name']) do
+      it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
   end
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index 799fdc1646..52b58fe136 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -1,6 +1,5 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
+apache_hash = apache_settings_hash
 describe 'apache::custom_config define' do
   context 'invalid config' do
     pp = <<-MANIFEST
@@ -13,7 +12,7 @@ class { 'apache': }
       apply_manifest(pp, expect_failures: true)
     end
 
-    describe file("#{$confd_dir}/25-acceptance_test.conf") do
+    describe file("#{apache_hash['confd_dir']}/25-acceptance_test.conf") do
       it { expect(file).not_to exist }
     end
   end
@@ -29,7 +28,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$confd_dir}/25-acceptance_test.conf") do
+    describe file("#{apache_hash['confd_dir']}/25-acceptance_test.conf") do
       it { is_expected.to contain '# just a comment' }
     end
   end
@@ -46,7 +45,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$confd_dir}/custom_filename") do
+    describe file("#{apache_hash['confd_dir']}/custom_filename") do
       it { is_expected.to contain '# just another comment' }
     end
   end
@@ -63,7 +62,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$confd_dir}/prefix_test.conf") do
+    describe file("#{apache_hash['confd_dir']}/prefix_test.conf") do
       it { is_expected.to be_file }
     end
   end
@@ -78,13 +77,13 @@ class { 'apache': }
 
         # Try to wedge the apache::custom_config call between when httpd.conf is written and
         # ports.conf is written. This should trigger a dependency cycle
-        File["#{$conf_file}"] -> Apache::Custom_config['ordering_test'] -> Concat["#{$ports_file}"]
+        File["#{apache_hash['conf_file']}"] -> Apache::Custom_config['ordering_test'] -> Concat["#{apache_hash['ports_file']}"]
     MANIFEST
     it 'applies in the right order' do
       expect(apply_manifest(pp, expect_failures: true).stderr).to match(%r{Found 1 dependency cycle}i)
     end
 
-    describe file("#{$confd_dir}/25-ordering_test.conf") do
+    describe file("#{apache_hash['confd_dir']}/25-ordering_test.conf") do
       it { is_expected.not_to be_file }
     end
   end
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index e14dca7fef..eeef5586d3 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -1,6 +1,5 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
+apache_hash = apache_settings_hash
 describe 'apache::default_mods class' do
   describe 'no default mods' do
     # Using puppet_apply as a helper
@@ -12,14 +11,16 @@ class { 'apache':
       MANIFEST
     end
 
-    # Run it twice and test for idempotency
-    it_behaves_like 'a idempotent resource'
-    describe service($service_name) do
+    it 'behaves idempotently' do
+      idempotent_apply(pp)
+    end
+
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
   end
 
-  unless host_inventory['facter']['os']['name'] == 'SLES' && os[:release].to_i >= 12
+  unless os[:family] == 'sles' && os[:release].to_i >= 12
     describe 'no default mods and failing' do
       before :all do
         pp = <<-PP
@@ -34,14 +35,14 @@ class { 'apache':
             default_mods => false,
           }
           apache::vhost { 'defaults.example.com':
-            docroot     => '#{$doc_root}/defaults',
+            docroot     => '#{apache_hash['doc_root']}/defaults',
             aliases     => {
               alias => '/css',
-              path  => '#{$doc_root}/css',
+              path  => '#{apache_hash['doc_root']}/css',
             },
             directories => [
             {
-                'path'            => "#{$doc_root}/admin",
+                'path'            => "#{apache_hash['doc_root']}/admin",
                 'auth_basic_fake' => 'demo demopass',
               }
             ],
@@ -53,7 +54,7 @@ class { 'apache':
       end
     end
 
-    describe service($service_name) do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
     end
   end
@@ -72,19 +73,21 @@ class { 'apache':
           ],
         }
         apache::vhost { 'defaults.example.com':
-          docroot => '#{$doc_root}/defaults',
+          docroot => '#{apache_hash['doc_root']}/defaults',
           aliases => {
             alias => '/css',
-            path  => '#{$doc_root}/css',
+            path  => '#{apache_hash['doc_root']}/css',
           },
           setenv  => 'TEST1 one',
         }
       MANIFEST
     end
 
-    it_behaves_like 'a idempotent resource'
+    it 'behaves idempotently' do
+      idempotent_apply(pp)
+    end
 
-    describe service($service_name) do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
   end
@@ -99,13 +102,15 @@ class { 'apache': default_mods => false }
       MANIFEST
     end
 
-    # Run it twice and test for idempotency
-    it_behaves_like 'a idempotent resource'
-    describe service($service_name) do
+    it 'behaves idempotently' do
+      idempotent_apply(pp)
+    end
+
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
 
-    describe file("#{$mod_dir}/zz_auth_basic.load") do
+    describe file("#{apache_hash['mod_dir']}/zz_auth_basic.load") do
       it { is_expected.to be_file }
     end
   end
diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index 4c074e1dc4..3405c62d4c 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -1,7 +1,6 @@
-# run a test task
 require 'spec_helper_acceptance'
 
-describe 'apache tasks', if: puppet_version =~ %r{(5\.\d+\.\d+)} && host_inventory['facter']['os']['name'] != 'SLES' do
+describe 'apache tasks' do
   describe 'reload' do
     pp = <<-MANIFEST
       class { 'apache':
@@ -12,8 +11,8 @@ class { 'apache':
     it 'execute reload' do
       apply_manifest(pp, catch_failures: true)
 
-      result = run_task(task_name: 'apache', params: 'action=reload')
-      expect_multiple_regexes(result: result, regexes: [%r{reload successful}, %r{Job completed. 1/1 nodes succeeded|Ran on 1 node}])
+      result = run_bolt_task('apache', 'action' => 'reload')
+      expect(result.stdout).to contain(%(reload successful))
     end
   end
 end
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 4376b00d0a..fc3089cc5a 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -1,22 +1,21 @@
 require 'spec_helper_acceptance'
 
-case host_inventory['facter']['os']['family']
-when 'Debian'
+case os[:family]
+when 'debian', 'ubuntu'
   service_name = 'apache2'
   variant = :prefork
-when 'RedHat'
-  unless host_inventory['facter']['os']['release']['major'] == '5'
+when 'redhat'
+  unless os[:release] =~ %r{^5}
     variant = (os[:release].to_i >= 7) ? :prefork : :itk_only
     service_name = 'httpd'
   end
-when 'FreeBSD'
+when 'freebsd'
   service_name = 'apache24'
   variant = :prefork
 end
 
 describe 'apache::mod::itk class', if: service_name do
   describe 'running puppet code' do
-    # Using puppet_apply as a helper
     let(:pp) do
       case variant
       when :prefork
@@ -35,18 +34,13 @@ class { 'apache':
       end
     end
 
-    # Run it twice and test for idempotency
-    it_behaves_like 'a idempotent resource'
+    it 'behaves idempotently' do
+      idempotent_apply(pp)
+    end
   end
 
   describe service(service_name) do
     it { is_expected.to be_running }
-    if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-      pending 'Should be enabled - Bug 760616 on Debian 8'
-    elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-      pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-    else
-      it { is_expected.to be_enabled }
-    end
+    it { is_expected.to be_enabled }
   end
 end
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index e05290b9a1..df3d9e8e60 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-unless host_inventory['facter']['os']['name'] == 'SLES' && os[:release].to_i >= 12
+apache_hash = apache_settings_hash
+unless os[:family] == 'sles' && os[:release].to_i >= 12
   describe 'apache::mod::php class' do
     context 'default php config' do
       pp = <<-MANIFEST
@@ -11,10 +10,10 @@ class { 'apache':
           class { 'apache::mod::php': }
           apache::vhost { 'php.example.com':
             port    => '80',
-            docroot => '#{$doc_root}/php',
+            docroot => '#{apache_hash['doc_root']}/php',
           }
           host { 'php.example.com': ip => '127.0.0.1', }
-          file { '#{$doc_root}/php/index.php':
+          file { '#{apache_hash['doc_root']}/php/index.php':
             ensure  => file,
             content => "<?php phpinfo(); ?>\\n",
           }
@@ -23,17 +22,17 @@ class { 'apache::mod::php': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      if (host_inventory['facter']['os']['name'] == 'Ubuntu' && host_inventory['facter']['os']['release']['full'] == '16.04') ||
-         (host_inventory['facter']['os']['name'] == 'Debian' && os[:release].to_i == 9)
-        describe file("#{$mod_dir}/php7.0.conf") do
+      if (os[:family] == 'ubuntu' && os[:release] == '16.04') ||
+         (os[:family] == 'debian' && os[:release] =~ %r{9})
+        describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
-      elsif host_inventory['facter']['os']['name'] == 'Ubuntu' && host_inventory['facter']['os']['release']['full'] == '18.04'
-        describe file("#{$mod_dir}/php7.2.conf") do
+      elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
+        describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
       else
-        describe file("#{$mod_dir}/php5.conf") do
+        describe file("#{apache_hash['mod_dir']}/php5.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
       end
@@ -50,14 +49,14 @@ class { 'apache::mod::php':
 
           apache::vhost { 'php.example.com':
             port             => '80',
-            docroot          => '#{$doc_root}/php',
+            docroot          => '#{apache_hash['doc_root']}/php',
             php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
             php_flags        => { 'display_errors' => 'on', },
             php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
             php_admin_flags  => { 'engine' => 'on', },
           }
           host { 'php.example.com': ip => '127.0.0.1', }
-          file { '#{$doc_root}/php/index.php5':
+          file { '#{apache_hash['doc_root']}/php/index.php5':
             ensure  => file,
             content => "<?php phpinfo(); ?>\\n",
           }
@@ -66,7 +65,7 @@ class { 'apache::mod::php':
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe file("#{$vhost_dir}/25-php.example.com.conf") do
+      describe file("#{apache_hash['vhost_dir']}/25-php.example.com.conf") do
         it { is_expected.to contain '  php_flag display_errors on' }
         it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
         it { is_expected.to contain '  php_admin_flag engine on' }
diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml
deleted file mode 100644
index 5eebdefbfa..0000000000
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    roles:
-      - agent
-      - default
-    platform: el-7-x86_64
-    hypervisor: vagrant
-    box: puppetlabs/centos-7.2-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/debian-8-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml
deleted file mode 100644
index fef6e63ca5..0000000000
--- a/spec/acceptance/nodesets/debian-8-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    roles:
-      - agent
-      - default
-    platform: debian-8-amd64
-    hypervisor: vagrant
-    box: puppetlabs/debian-8.2-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index dba339c46a..0000000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    roles:
-      - agent
-      - default
-    platform: ubuntu-14.04-amd64
-    hypervisor: vagrant
-    box: puppetlabs/ubuntu-14.04-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml
deleted file mode 100644
index a3333aac53..0000000000
--- a/spec/acceptance/nodesets/docker/centos-7.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    platform: el-7-x86_64
-    hypervisor: docker
-    image: centos:7
-    docker_preserve_image: true
-    docker_cmd: '["/usr/sbin/init"]'
-    # install various tools required to get the image up to usable levels
-    docker_image_commands:
-      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml
deleted file mode 100644
index df5c31944f..0000000000
--- a/spec/acceptance/nodesets/docker/debian-8.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    platform: debian-8-amd64
-    hypervisor: docker
-    image: debian:8
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
deleted file mode 100644
index b1efa58390..0000000000
--- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    platform: ubuntu-14.04-amd64
-    hypervisor: docker
-    image: ubuntu:14.04
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      # ensure that upstart is booting correctly in the container
-      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/acceptance/nodesets/suse.yml b/spec/acceptance/nodesets/suse.yml
deleted file mode 100644
index ac04926992..0000000000
--- a/spec/acceptance/nodesets/suse.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-HOSTS:
-  sles-11-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: sles-11-x86_64
-    template: sles-11-x86_64
-    hypervisor: virtualbox
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: virtualbox
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 6ff8651661..703448a65c 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -1,40 +1,29 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'prefork_worker_spec.rb' do
-  case host_inventory['facter']['os']['family']
-  when 'FreeBSD'
-    describe 'apache::mod::event class' do
-      describe 'running puppet code' do
-        # Using puppet_apply as a helper
-        pp = <<-MANIFEEST
+apache_hash = apache_settings_hash
+describe 'prefork_worker_spec.rb', unless: (os[:family] =~ %r{sles}) do
+  describe 'apache::mod::event class' do
+    describe 'running puppet code' do
+      let(:pp) do
+        <<-MANIFEEST
             class { 'apache':
               mpm_module => 'event',
             }
         MANIFEEST
-        it 'works with no errors' do
-          # Run it twice and test for idempotency
-          apply_manifest(pp, catch_failures: true)
-          expect(apply_manifest(pp, catch_failures: true).exit_code).to be_zero
-        end
       end
 
-      describe service($service_name) do
-        it { is_expected.to be_running }
-        if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
+      it 'behaves idempotently' do
+        idempotent_apply(pp)
       end
     end
+
+    describe service(apache_hash['service_name']) do
+      it { is_expected.to be_running }
+      it { is_expected.to be_enabled }
+    end
   end
 
   describe 'apache::mod::worker class' do
     describe 'running puppet code' do
-      # Using puppet_apply as a helper
       let(:pp) do
         <<-MANIFEEST
           class { 'apache':
@@ -43,19 +32,14 @@ class { 'apache':
         MANIFEEST
       end
 
-      # Run it twice and test for idempotency
-      it_behaves_like 'a idempotent resource'
+      it 'behaves idempotently' do
+        idempotent_apply(pp)
+      end
     end
 
-    describe service($service_name) do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
-      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+      it { is_expected.to be_enabled }
     end
   end
 
@@ -70,19 +54,14 @@ class { 'apache':
         MANIFEEST
       end
 
-      # Run it twice and test for idempotency
-      it_behaves_like 'a idempotent resource'
+      it 'behaves idempotently' do
+        idempotent_apply(pp)
+      end
     end
 
-    describe service($service_name) do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
-      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+      it { is_expected.to be_enabled }
     end
   end
 end
diff --git a/spec/acceptance/service_spec.rb b/spec/acceptance/service_spec.rb
index ee6aa0b2a1..bcb204c520 100644
--- a/spec/acceptance/service_spec.rb
+++ b/spec/acceptance/service_spec.rb
@@ -12,7 +12,8 @@ class { 'apache': }
       MANIFEST
     end
 
-    # Run it twice and test for idempotency
-    it_behaves_like 'a idempotent resource'
+    it 'behaves idempotently' do
+      idempotent_apply(pp)
+    end
   end
 end
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
deleted file mode 100644
index 6aefcec6e2..0000000000
--- a/spec/acceptance/version.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-@osfamily               = fact('osfamily')
-@operatingsystem        = fact('operatingsystem')
-@operatingsystemrelease = fact('operatingsystemrelease').to_f
-
-case @osfamily
-when 'RedHat'
-  $confd_dir        = '/etc/httpd/conf.d'
-  $conf_file        = '/etc/httpd/conf/httpd.conf'
-  $ports_file       = '/etc/httpd/conf/ports.conf'
-  $vhost_dir        = '/etc/httpd/conf.d'
-  $vhost            = '/etc/httpd/conf.d/15-default.conf'
-  $run_dir          = '/var/run/httpd'
-  $doc_root         = '/var/www'
-  $service_name     = 'httpd'
-  $package_name     = 'httpd'
-  $error_log        = 'error_log'
-  $suphp_handler    = 'php5-script'
-  $suphp_configpath = 'undef'
-
-  if (@operatingsystem == 'Fedora' && @operatingsystemrelease >= 18) || (@operatingsystem != 'Fedora' && @operatingsystemrelease >= 7)
-    $apache_version = '2.4'
-    $mod_dir        = '/etc/httpd/conf.modules.d'
-  else
-    $apache_version = '2.2'
-    $mod_dir        = '/etc/httpd/conf.d'
-  end
-when 'Debian'
-  $confd_dir        = '/etc/apache2/conf.d'
-  $mod_dir          = '/etc/apache2/mods-available'
-  $conf_file        = '/etc/apache2/apache2.conf'
-  $ports_file       = '/etc/apache2/ports.conf'
-  $vhost            = '/etc/apache2/sites-available/15-default.conf'
-  $vhost_dir        = '/etc/apache2/sites-enabled'
-  $run_dir          = '/var/run/apache2'
-  $doc_root         = '/var/www'
-  $service_name     = 'apache2'
-  $package_name     = 'apache2'
-  $error_log        = 'error.log'
-  $suphp_handler    = 'x-httpd-php'
-  $suphp_configpath = '/etc/php5/apache2'
-  $apache_version = if @operatingsystem == 'Ubuntu' && @operatingsystemrelease >= 13.10
-                      '2.4'
-                    elsif @operatingsystem == 'Debian' && @operatingsystemrelease >= 8.0
-                      '2.4'
-                    else
-                      '2.2'
-                    end
-when 'FreeBSD'
-  $confd_dir        = '/usr/local/etc/apache24/Includes'
-  $mod_dir          = '/usr/local/etc/apache24/Modules'
-  $conf_file        = '/usr/local/etc/apache24/httpd.conf'
-  $ports_file       = '/usr/local/etc/apache24/Includes/ports.conf'
-  $vhost            = '/usr/local/etc/apache24/Vhosts/15-default.conf'
-  $vhost_dir        = '/usr/local/etc/apache24/Vhosts'
-  $run_dir          = '/var/run/apache24'
-  $doc_root         = '/var/www'
-  $service_name     = 'apache24'
-  $package_name     = 'apache24'
-  $error_log        = 'http-error.log'
-  $apache_version   = '2.2'
-when 'Gentoo'
-  $confd_dir        = '/etc/apache2/conf.d'
-  $mod_dir          = '/etc/apache2/modules.d'
-  $conf_file        = '/etc/apache2/httpd.conf'
-  $ports_file       = '/etc/apache2/ports.conf'
-  $vhost            = '/etc/apache2/vhosts.d/15-default.conf'
-  $vhost_dir        = '/etc/apache2/vhosts.d'
-  $run_dir          = '/var/run/apache2'
-  $doc_root         = '/var/www'
-  $service_name     = 'apache2'
-  $package_name     = 'www-servers/apache'
-  $error_log        = 'http-error.log'
-  $apache_version   = '2.4'
-when 'Suse'
-  $confd_dir        = '/etc/apache2/conf.d'
-  $mod_dir          = '/etc/apache2/mods-available'
-  $conf_file        = '/etc/apache2/httpd.conf'
-  $ports_file       = '/etc/apache2/ports.conf'
-  $vhost            = '/etc/apache2/sites-available/15-default.conf'
-  $vhost_dir        = '/etc/apache2/sites-available'
-  $run_dir          = '/var/run/apache2'
-  $doc_root         = '/srv/www'
-  $service_name     = 'apache2'
-  $package_name     = 'apache2'
-  $error_log        = 'error.log'
-  $apache_version   = if @operatingsystemrelease < 12
-                        '2.2'
-                      else
-                        '2.4'
-                      end
-else
-  $apache_version   = '0'
-end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 434c59df43..b95400fce9 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1,6 +1,5 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
+apache_hash = apache_settings_hash
 describe 'apache::vhost define' do
   context 'no default vhosts' do
     pp = <<-MANIFEST
@@ -24,11 +23,11 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/15-default.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
       it { is_expected.not_to be_file }
     end
 
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
       it { is_expected.not_to be_file }
     end
   end
@@ -41,36 +40,36 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/15-default.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
     end
 
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
       it { is_expected.not_to be_file }
     end
   end
 
   context 'default vhost with ssl' do
     pp = <<-MANIFEST
-      file { '#{$run_dir}':
+      file { '#{apache_hash['run_dir']}':
         ensure  => 'directory',
         recurse => true,
       }
 
       class { 'apache':
         default_ssl_vhost => true,
-        require => File['#{$run_dir}'],
+        require => File['#{apache_hash['run_dir']}'],
       }
     MANIFEST
     it 'creates default vhost configs' do
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/15-default.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
     end
 
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
       it { is_expected.to contain '<VirtualHost \*:443>' }
       it { is_expected.to contain 'SSLEngine on' }
     end
@@ -94,7 +93,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-first.example.com.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-first.example.com.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
       it { is_expected.to contain 'ServerName first.example.com' }
     end
@@ -117,7 +116,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-proxy.example.com.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
       it { is_expected.to contain 'ServerName proxy.example.com' }
       it { is_expected.to contain 'ProxyPass' }
@@ -133,7 +132,7 @@ class { 'apache': }
       class { 'apache': }
       apache::vhost { 'proxy.example.com':
         port    => '80',
-        docroot => '#{$docroot}/proxy',
+        docroot => '#{apache_hash['doc_root']}/proxy',
         proxy_pass_match => [
           { 'path' => '/foo', 'url' => 'http://backend-foo/'},
         ],
@@ -145,7 +144,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-proxy.example.com.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
       it { is_expected.to contain 'ServerName proxy.example.com' }
       it { is_expected.to contain 'ProxyPassMatch /foo http://backend-foo/' }
@@ -156,173 +155,6 @@ class { 'apache': }
     end
   end
 
-  context 'new vhost on port 80' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      apache::vhost { 'first.example.com':
-        port    => '80',
-        docroot => '/var/www/first',
-      }
-      host { 'first.example.com': ip => '127.0.0.1', }
-      file { '/var/www/first/index.html':
-        ensure  => file,
-        content => "Hello from first\\n",
-      }
-      apache::vhost { 'second.example.com':
-        port    => '80',
-        docroot => '/var/www/second',
-      }
-      host { 'second.example.com': ip => '127.0.0.1', }
-      file { '/var/www/second/index.html':
-        ensure  => file,
-        content => "Hello from second\\n",
-      }
-    MANIFEST
-    it 'configures two apache vhosts' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    it 'answers to first.example.com' do
-      shell('/usr/bin/curl first.example.com:80', acceptable_exit_codes: 0) do |r|
-        expect(r.stdout).to eq("Hello from first\n")
-      end
-    end
-
-    it 'answers to second.example.com' do
-      shell('/usr/bin/curl second.example.com:80', acceptable_exit_codes: 0) do |r|
-        expect(r.stdout).to eq("Hello from second\n")
-      end
-    end
-  end
-
-  context 'new vhost with multiple IP addresses on port 80' do
-    pp = <<-MANIFEST
-      class { 'apache':
-        default_vhost => false,
-      }
-      apache::vhost { 'example.com':
-        port     => '80',
-        ip       => ['127.0.0.1','127.0.0.2'],
-        ip_based => true,
-        docroot  => '/var/www/html',
-      }
-      host { 'host1.example.com': ip => '127.0.0.1', }
-      host { 'host2.example.com': ip => '127.0.0.2', }
-      file { '/var/www/html/index.html':
-        ensure  => file,
-        content => "Hello from vhost\\n",
-      }
-    MANIFEST
-    it 'configures one apache vhost with 2 ip addresses' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$vhost_dir}/25-example.com.conf") do
-      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.2:80>' }
-      it { is_expected.to contain 'ServerName example.com' }
-    end
-
-    describe file($ports_file) do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'Listen 127.0.0.1:80' }
-      it { is_expected.to contain 'Listen 127.0.0.2:80' }
-      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' }
-      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:80' }
-    end
-
-    it 'answers to host1.example.com' do
-      shell('/usr/bin/curl host1.example.com:80', acceptable_exit_codes: 0) do |r|
-        expect(r.stdout).to eq("Hello from vhost\n")
-      end
-    end
-
-    it 'answers to host2.example.com' do
-      shell('/usr/bin/curl host2.example.com:80', acceptable_exit_codes: 0) do |r|
-        expect(r.stdout).to eq("Hello from vhost\n")
-      end
-    end
-  end
-
-  context 'new vhost with multiple ports on 1 IP address' do
-    pp = <<-MANIFEST
-      class { 'apache':
-        default_vhost => false,
-      }
-      apache::vhost { 'example.com':
-        port     => ['80','8080'],
-        ip       => '127.0.0.1',
-        ip_based => true,
-        docroot  => '/var/www/html',
-      }
-      host { 'host1.example.com': ip => '127.0.0.1', }
-      file { '/var/www/html/index.html':
-        ensure  => file,
-        content => "Hello from vhost\\n",
-      }
-    MANIFEST
-    it 'configures one apache vhost with 2 ports' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
-      it { is_expected.to be_running }
-    end
-
-    describe file("#{$vhost_dir}/25-example.com.conf") do
-      it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080>' }
-      it { is_expected.to contain 'ServerName example.com' }
-    end
-
-    describe file($ports_file) do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'Listen 127.0.0.1:80' }
-      it { is_expected.to contain 'Listen 127.0.0.1:8080' }
-      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' }
-      it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:8080' }
-    end
-
-    it 'answers to host1.example.com port 80' do
-      shell('/usr/bin/curl host1.example.com:80', acceptable_exit_codes: 0) do |r|
-        expect(r.stdout).to eq("Hello from vhost\n")
-      end
-    end
-
-    it 'answers to host1.example.com port 8080' do
-      shell('/usr/bin/curl host1.example.com:8080', acceptable_exit_codes: 0) do |r|
-        expect(r.stdout).to eq("Hello from vhost\n")
-      end
-    end
-  end
-
   context 'new vhost with multiple IP addresses on multiple ports' do
     pp = <<-MANIFEST
       class { 'apache':
@@ -345,23 +177,17 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+    describe service(apache_hash['service_name']) do
+      it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{$vhost_dir}/25-example.com.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost 127.0.0.1:80 127.0.0.1:8080 127.0.0.2:80 127.0.0.2:8080>' }
       it { is_expected.to contain 'ServerName example.com' }
     end
 
-    describe file($ports_file) do
+    describe file(apache_hash['ports_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Listen 127.0.0.1:80' }
       it { is_expected.to contain 'Listen 127.0.0.1:8080' }
@@ -374,25 +200,25 @@ class { 'apache':
     end
 
     it 'answers to host1.example.com port 80' do
-      shell('/usr/bin/curl host1.example.com:80', acceptable_exit_codes: 0) do |r|
+      run_shell('/usr/bin/curl host1.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
     it 'answers to host1.example.com port 8080' do
-      shell('/usr/bin/curl host1.example.com:8080', acceptable_exit_codes: 0) do |r|
+      run_shell('/usr/bin/curl host1.example.com:8080', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
     it 'answers to host2.example.com port 80' do
-      shell('/usr/bin/curl host2.example.com:80', acceptable_exit_codes: 0) do |r|
+      run_shell('/usr/bin/curl host2.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
 
     it 'answers to host2.example.com port 8080' do
-      shell('/usr/bin/curl host2.example.com:8080', acceptable_exit_codes: 0) do |r|
+      run_shell('/usr/bin/curl host2.example.com:8080', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
@@ -419,85 +245,78 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+    describe service(apache_hash['service_name']) do
+      it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{$vhost_dir}/25-example.com.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-example.com.conf") do
       it { is_expected.to contain '<VirtualHost [::1]:80>' }
       it { is_expected.to contain 'ServerName example.com' }
     end
 
-    describe file($ports_file) do
+    describe file(apache_hash['ports_file']) do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Listen [::1]:80' }
       it { is_expected.not_to contain 'NameVirtualHost [::1]:80' }
     end
 
     it 'answers to ipv6.example.com' do
-      shell('/usr/bin/curl ipv6.example.com:80', acceptable_exit_codes: 0) do |r|
+      run_shell('/usr/bin/curl ipv6.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from vhost\n")
       end
     end
   end
 
   context 'apache_directories' do
-    describe 'readme example, adapted' do
-      pp = <<-MANIFEST
-        class { 'apache': }
+    let(:pp) do
+      <<-MANIFEST
+      class { 'apache': }
 
-        if versioncmp($apache_version, '2.4') >= 0 {
-          $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
-        } else {
-          $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
-        }
+      if versioncmp('#{apache_hash['version']}', '2.4') >= 0 {
+        $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
+      } else {
+        $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
+      }
 
-        $_directories = [
-          { 'path' => '/var/www/files', },
-          $_files_match_directory,
-        ]
+      $_directories = [
+        { 'path' => '/var/www/files', },
+        $_files_match_directory,
+      ]
 
-        apache::vhost { 'files.example.net':
-          docroot     => '/var/www/files',
-          directories => $_directories,
-        }
-        file { '/var/www/files/index.html':
-          ensure  => file,
-          content => "Hello World\\n",
-        }
-        file { '/var/www/files/index.html.bak':
-          ensure  => file,
-          content => "Hello World\\n",
-        }
-        host { 'files.example.net': ip => '127.0.0.1', }
-      MANIFEST
+      apache::vhost { 'files.example.net':
+        docroot     => '/var/www/files',
+        directories => $_directories,
+      }
+      file { '/var/www/files/index.html':
+        ensure  => file,
+        content => "Hello World\\n",
+      }
+      file { '/var/www/files/index.html.bak':
+        ensure  => file,
+        content => "Hello World\\n",
+      }
+      host { 'files.example.net': ip => '127.0.0.1', }
+    MANIFEST
+    end
+
+    describe 'readme example, adapted' do
       it 'configures a vhost with Files' do
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
+      describe service(apache_hash['service_name']) do
+        it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
 
       it 'answers to files.example.net #stdout' do
-        expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
+        expect(run_shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
       it 'answers to files.example.net #stderr' do
-        expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html.bak', acceptable_exit_codes: 22).stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
+        result = run_shell('/usr/bin/curl -sSf files.example.net:80/index.html.bak', expect_failures: true)
+        expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
+        expect(result.exit_code).to eq 22
       end
     end
 
@@ -548,28 +367,24 @@ class { 'apache': }
         apply_manifest(pp_one, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
+      describe service(apache_hash['service_name']) do
+        it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
 
       it 'answers to files.example.net #stdout' do
-        expect(shell('/usr/bin/curl -sSf files.example.net:80/').stdout).to eq("Hello World\n")
+        expect(run_shell('/usr/bin/curl -sSf files.example.net:80/').stdout).to eq("Hello World\n")
       end
       it 'answers to files.example.net #stdout foo' do
-        expect(shell('/usr/bin/curl -sSf files.example.net:80/foo/').stdout).to eq("Hello Foo\n")
+        expect(run_shell('/usr/bin/curl -sSf files.example.net:80/foo/').stdout).to eq("Hello Foo\n")
       end
       it 'answers to files.example.net #stderr' do
-        expect(shell('/usr/bin/curl -sSf files.example.net:80/private.html', acceptable_exit_codes: 22).stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
+        result = run_shell('/usr/bin/curl -sSf files.example.net:80/private.html', expect_failures: true)
+        expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
+        expect(result.exit_code).to eq 22
       end
       it 'answers to files.example.net #stdout bar' do
-        expect(shell('/usr/bin/curl -sSf files.example.net:80/bar/bar.html').stdout).to eq("Hello Bar\n")
+        expect(run_shell('/usr/bin/curl -sSf files.example.net:80/bar/bar.html').stdout).to eq("Hello Bar\n")
       end
     end
 
@@ -594,26 +409,20 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
+      describe service(apache_hash['service_name']) do
+        it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
 
       it 'answers to files.example.net #stdout' do
-        expect(shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
+        expect(run_shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
       it 'answers to files.example.net #stdout regex' do
-        expect(shell('/usr/bin/curl -sSf files.example.net:80/server-status?auto').stdout).to match(%r{Scoreboard: })
+        expect(run_shell('/usr/bin/curl -sSf files.example.net:80/server-status?auto').stdout).to match(%r{Scoreboard: })
       end
     end
 
-    describe 'Satisfy and Auth directive', unless: $apache_version == '2.4' do
+    describe 'Satisfy and Auth directive', unless: apache_hash['version'] == '2.4' do
       pp_two = <<-MANIFEST
         class { 'apache': }
         host { 'files.example.net': ip => '127.0.0.1', }
@@ -676,63 +485,21 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service($service_name) do
-        if fact('operatingsystem') == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-          pending 'Should be enabled - Bug 760616 on Debian 8'
-        elsif fact('operatingsystem') == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-          pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-        else
-          it { is_expected.to be_enabled }
-        end
+      describe service(apache_hash['service_name']) do
+        it { is_expected.to be_enabled }
         it { is_expected.to be_running }
 
         it 'answers to files.example.net' do
-          shell('/usr/bin/curl -sSf files.example.net:80/foo/index.html', acceptable_exit_codes: 22).stderr.should match(%r{curl: \(22\) The requested URL returned error: 401})
-          shell('/usr/bin/curl -sSf -u login:password files.example.net:80/foo/index.html').stdout.should eq("Hello World\n")
-          shell('/usr/bin/curl -sSf files.example.net:80/bar/index.html').stdout.should eq("Hello World\n")
-          shell('/usr/bin/curl -sSf -u login:password files.example.net:80/bar/index.html').stdout.should eq("Hello World\n")
-          shell('/usr/bin/curl -sSf files.example.net:80/baz/index.html', acceptable_exit_codes: 22).stderr.should match(%r{curl: \(22\) The requested URL returned error: 401})
-          shell('/usr/bin/curl -sSf -u login:password files.example.net:80/baz/index.html').stdout.should eq("Hello World\n")
-        end
-      end
-    end
-  end
-
-  unless host_inventory['facter']['os']['distro'].nil?
-    case host_inventory['facter']['os']['distro']['codename']
-    when 'precise', 'wheezy'
-      context 'vhost FallbackResource example' do
-        pp = <<-MANIFEST
-          class { 'apache': }
-          apache::vhost { 'fallback.example.net':
-            docroot         => '/var/www/fallback',
-            fallbackresource => '/index.html'
-          }
-          file { '/var/www/fallback/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          host { 'fallback.example.net': ip => '127.0.0.1', }
-        MANIFEST
-        it 'configures a vhost with FallbackResource' do
-          apply_manifest(pp, catch_failures: true)
-        end
-
-        describe service($service_name) do
-          if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-            pending 'Should be enabled - Bug 760616 on Debian 8'
-          elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-            pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-          else
-            it { is_expected.to be_enabled }
-          end
-          it { is_expected.to be_running }
-        end
-
-        it 'answers to fallback.example.net' do
-          shell('/usr/bin/curl fallback.example.net:80/Does/Not/Exist') do |r|
-            expect(r.stdout).to eq("Hello World\n")
-          end
+          result = run_shell('/usr/bin/curl -sSf files.example.net:80/foo/index.html', expect_failures: true)
+          expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 401})
+          expect(result.exit_code).to eq 22
+          expect(run_shell('/usr/bin/curl -sSf -u login:password files.example.net:80/foo/index.html').stdout).to eq("Hello World\n")
+          expect(run_shell('/usr/bin/curl -sSf files.example.net:80/bar/index.html').stdout).to eq("Hello World\n")
+          expect(run_shell('/usr/bin/curl -sSf -u login:password files.example.net:80/bar/index.html').stdout).to eq("Hello World\n")
+          result = run_shell('/usr/bin/curl -sSf files.example.net:80/baz/index.html', expect_failures: true)
+          expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 401})
+          expect(result.exit_code).to eq 22
+          expect(run_shell('/usr/bin/curl -sSf -u login:password files.example.net:80/baz/index.html').stdout).to eq("Hello World\n")
         end
       end
     end
@@ -759,25 +526,19 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service($service_name) do
-      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+    describe service(apache_hash['service_name']) do
+      it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
     it 'answers to a.virt.example.com' do
-      shell('/usr/bin/curl a.virt.example.com:80', acceptable_exit_codes: 0) do |r|
+      run_shell('/usr/bin/curl a.virt.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from a.virt\n")
       end
     end
 
     it 'answers to b.virt.example.com' do
-      shell('/usr/bin/curl b.virt.example.com:80', acceptable_exit_codes: 0) do |r|
+      run_shell('/usr/bin/curl b.virt.example.com:80', acceptable_exit_codes: 0) do |r|
         expect(r.stdout).to eq("Hello from b.virt\n")
       end
     end
@@ -811,24 +572,18 @@ class { 'apache': default_vhost => false, }
                      ), catch_failures: true)
     end
 
-    describe service($service_name) do
-      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+    describe service(apache_hash['service_name']) do
+      it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
     it 'gets a response from the back end #stdout' do
-      shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
+      run_shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.stdout).to eq("Hello from localhost\n")
       end
     end
     it 'gets a response from the back end #exit_code' do
-      shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
+      run_shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.exit_code).to eq(0)
       end
     end
@@ -862,24 +617,18 @@ class { 'apache': default_vhost => false, }
                     ), catch_failures: true)
     end
 
-    describe service($service_name) do
-      if host_inventory['facter']['os']['name'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8'
-        pending 'Should be enabled - Bug 760616 on Debian 8'
-      elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-        pending 'Should be enabled - MODULES-8379 `be_enabled` check does not currently work for apache2 on SLES 15'
-      else
-        it { is_expected.to be_enabled }
-      end
+    describe service(apache_hash['service_name']) do
+      it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
     it 'gets a response from the back end #stdout' do
-      shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
+      run_shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.stdout).to eq("Hello from localhost\n")
       end
     end
     it 'gets a response from the back end #exit_code' do
-      shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
+      run_shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.exit_code).to eq(0)
       end
     end
@@ -899,11 +648,11 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($ports_file) do
+    describe file(apache_hash['ports_file']) do
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'NameVirtualHost test.server' }
     end
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ServerName test.server' }
     end
@@ -923,11 +672,11 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($ports_file) do
+    describe file(apache_hash['ports_file']) do
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'NameVirtualHost test.server' }
     end
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'ServerName' }
     end
@@ -949,7 +698,7 @@ class { 'apache': default_vhost => false }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($ports_file) do
+    describe file(apache_hash['ports_file']) do
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'Listen 80' }
       it { is_expected.to contain 'Listen 81' }
@@ -994,77 +743,209 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file($ports_file) do
+    describe file(apache_hash['ports_file']) do
       it { is_expected.to be_file }
-      if fact('osfamily') == 'RedHat' && host_inventory['facter']['os']['release']['major'] == '7' ||
-         fact('osfamily') == 'Debian' ||
-         host_inventory['facter']['os']['name'] == 'SLES' && fact('operatingsystemrelease') >= '12'
-        it { is_expected.not_to contain 'NameVirtualHost test.server' }
-      else
-        it { is_expected.to contain 'NameVirtualHost test.server' }
-      end
     end
 
-    describe file("#{$vhost_dir}/10-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/10-test.server.conf") do
       it { is_expected.to be_file }
     end
   end
 
-  describe 'options' do
+  describe 'parameter tests' do
     pp = <<-MANIFEST
       class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot    => '/tmp',
-        options    => ['Indexes','FollowSymLinks', 'ExecCGI'],
+      host { 'test.itk': ip => '127.0.0.1' }
+      apache::vhost { 'test.itk':
+        docroot  => '/tmp',
+        itk      => { user => 'nobody', group => 'nobody' }
       }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'Options Indexes FollowSymLinks ExecCGI' }
-    end
-  end
-
-  describe 'override' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
+      host { 'test.custom_fragment': ip => '127.0.0.1' }
+      apache::vhost { 'test.custom_fragment':
+        docroot  => '/tmp',
+        custom_fragment => inline_template('#weird test string'),
+      }
+      apache::vhost { 'test.without_priority_prefix':
+        priority => false,
+        docroot => '/tmp'
+      }
+      apache::vhost { 'test.ssl_protool':
+        docroot      => '/tmp',
+        ssl          => true,
+        ssl_protocol => ['All', '-SSLv2'],
+      }
+      apache::vhost { 'test.block':
+        docroot  => '/tmp',
+        block    => 'scm',
+      }
+      apache::vhost { 'test.setenv_setenvif':
+        docroot  => '/tmp',
+        setenv   => ['TEST /test'],
+        setenvif => ['Request_URI "\.gif$" object_is_image=gif']
+      }
+      apache::vhost { 'test.rewrite':
+        docroot          => '/tmp',
+        rewrites => [
+          { comment => 'test',
+            rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
+            rewrite_rule => ['^index\.html$ welcome.html'],
+            rewrite_map  => ['lc int:tolower'],
+          }
+        ],
+      }
+      apache::vhost { 'test.request_headers':
+        docroot          => '/tmp',
+        request_headers  => ['append MirrorID "mirror 12"'],
+      }
+      apache::vhost { 'test.redirect':
+        docroot          => '/tmp',
+        redirect_source  => ['/images'],
+        redirect_dest    => ['http://test.server/'],
+        redirect_status  => ['permanent'],
+      }
+      apache::vhost { 'test.no_proxy_uris':
+        docroot          => '/tmp',
+        proxy_dest       => 'http://test2',
+        no_proxy_uris    => [ 'http://test2/test' ],
+      }
+      apache::vhost { 'test.proxy':
         docroot    => '/tmp',
-        override   => ['All'],
+        proxy_dest => 'test2',
       }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'AllowOverride All' }
-    end
-  end
-
-  describe 'logroot' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
+      apache::vhost { 'test.scriptaliases':
         docroot    => '/tmp',
-        logroot    => '/tmp',
+        scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
       }
-    MANIFEST
+      apache::vhost { 'test.aliases':
+        docroot    => '/tmp',
+        aliases => [
+          { alias       => '/image'    , path => '/ftp/pub/image' }   ,
+          { scriptalias => '/myscript' , path => '/usr/share/myscript' }
+        ],
+      }
+      apache::vhost { 'test.access_logs':
+        docroot            => '/tmp',
+        logroot            => '/tmp',
+        access_logs => [
+          {'file' => 'log1'},
+          {'file' => 'log2', 'env' => 'admin' },
+          {'file' => '/var/tmp/log3', 'format' => '%h %l'},
+          {'syslog' => 'syslog' }
+        ]
+      }
+      apache::vhost { 'test.access_log_env_var':
+        docroot            => '/tmp',
+        logroot            => '/tmp',
+        access_log_syslog  => 'syslog',
+        access_log_env_var => 'admin',
+      }
+      apache::vhost { 'test.access_log_format':
+        docroot    => '/tmp',
+        logroot    => '/tmp',
+        access_log_syslog => 'syslog',
+        access_log_format => '%h %l',
+      }
+      apache::vhost { 'test.logroot':
+        docroot    => '/tmp',
+        logroot    => '/tmp',
+      }
+      apache::vhost { 'test.override':
+        docroot    => '/tmp',
+        override   => ['All'],
+      }
+      apache::vhost { 'test.options':
+        docroot    => '/tmp',
+        options    => ['Indexes','FollowSymLinks', 'ExecCGI'],
+      }
+    MANIFEST
     it 'applies cleanly' do
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.itk.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'AssignUserId nobody nobody' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.custom_fragment.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain '#weird test string' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/test.without_priority_prefix.conf") do
+      it { is_expected.to be_file }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.ssl_protool.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.block.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain '<DirectoryMatch .*\.(svn|git|bzr|hg|ht)/.*>' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.setenv_setenvif.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SetEnv TEST /test' }
+      it { is_expected.to contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.rewrite.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain '#test' }
+      it { is_expected.to contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
+      it { is_expected.to contain 'RewriteRule ^index.html$ welcome.html' }
+      it { is_expected.to contain 'RewriteMap lc int:tolower' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.request_headers.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'append MirrorID "mirror 12"' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.redirect.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Redirect permanent /images http://test.server/' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.no_proxy_uris.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ProxyPass        http://test2/test !' }
+      it { is_expected.to contain 'ProxyPass        / http://test2/' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.proxy.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ProxyPass        / test2/' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.scriptaliases.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.aliases.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Alias /image "/ftp/pub/image"' }
+      it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.access_logs.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'CustomLog "/tmp/log1" combined' }
+      it { is_expected.to contain 'CustomLog "/tmp/log2" combined env=admin' }
+      it { is_expected.to contain 'CustomLog "/var/tmp/log3" "%h %l"' }
+      it { is_expected.to contain 'CustomLog "syslog" combined' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.access_log_env_var.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'CustomLog "syslog" combined env=admin' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.access_log_format.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'CustomLog "syslog" "%h %l"' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.logroot.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain '  CustomLog "/tmp' }
     end
+    describe file("#{apache_hash['vhost_dir']}/25-test.override.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'AllowOverride All' }
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.options.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'Options Indexes FollowSymLinks ExecCGI' }
+    end
   end
 
   ['access', 'error'].each do |logtype|
@@ -1089,7 +970,7 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe file("#{$vhost_dir}/25-test.server.conf") do
+      describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }
         it { is_expected.not_to contain "  #{logname} \"/tmp" }
       end
@@ -1109,7 +990,7 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe file("#{$vhost_dir}/25-test.server.conf") do
+      describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain "  #{logname} \"|/bin/sh" }
       end
@@ -1129,144 +1010,13 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe file("#{$vhost_dir}/25-test.server.conf") do
+      describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain "  #{logname} \"syslog\"" }
       end
     end
   end
 
-  describe 'access_log_format' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot    => '/tmp',
-        logroot    => '/tmp',
-        access_log_syslog => 'syslog',
-        access_log_format => '%h %l',
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'CustomLog "syslog" "%h %l"' }
-    end
-  end
-
-  describe 'access_log_env_var' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot            => '/tmp',
-        logroot            => '/tmp',
-        access_log_syslog  => 'syslog',
-        access_log_env_var => 'admin',
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'CustomLog "syslog" combined env=admin' }
-    end
-  end
-
-  describe 'multiple access_logs' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot            => '/tmp',
-        logroot            => '/tmp',
-        access_logs => [
-          {'file' => 'log1'},
-          {'file' => 'log2', 'env' => 'admin' },
-          {'file' => '/var/tmp/log3', 'format' => '%h %l'},
-          {'syslog' => 'syslog' }
-        ]
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'CustomLog "/tmp/log1" combined' }
-      it { is_expected.to contain 'CustomLog "/tmp/log2" combined env=admin' }
-      it { is_expected.to contain 'CustomLog "/var/tmp/log3" "%h %l"' }
-      it { is_expected.to contain 'CustomLog "syslog" combined' }
-    end
-  end
-
-  describe 'aliases' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot    => '/tmp',
-        aliases => [
-          { alias       => '/image'    , path => '/ftp/pub/image' }   ,
-          { scriptalias => '/myscript' , path => '/usr/share/myscript' }
-        ],
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'Alias /image "/ftp/pub/image"' }
-      it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
-    end
-  end
-
-  describe 'scriptaliases' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot    => '/tmp',
-        scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
-    end
-  end
-
-  describe 'proxy' do
-    pp = <<-MANIFEST
-      class { 'apache': service_ensure => stopped, }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot    => '/tmp',
-        proxy_dest => 'test2',
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'ProxyPass        / test2/' }
-    end
-  end
-
   describe 'actions' do
     pp = <<-MANIFEST
       class { 'apache': }
@@ -1277,11 +1027,11 @@ class { 'apache': }
       }
     MANIFEST
     it 'applies cleanly' do
-      pp += "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian' || fact('osfamily') == 'Suse'
+      pp += "\nclass { 'apache::mod::actions': }" if os[:family] =~ %r{debian|suse}
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Action php-fastcgi /cgi-bin virtual' }
     end
@@ -1293,128 +1043,20 @@ class { 'apache': service_ensure => stopped, }
       host { 'test.server': ip => '127.0.0.1' }
       apache::vhost { 'test.server':
         docroot          => '/tmp',
-        suphp_addhandler => '#{$suphp_handler}',
+        suphp_addhandler => '#{apache_hash['suphp_handler']}',
         suphp_engine     => 'on',
-        suphp_configpath => '#{$suphp_configpath}',
+        suphp_configpath => '#{apache_hash['suphp_configpath']}',
       }
     MANIFEST
     it 'applies cleanly' do
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain "suPHP_AddHandler #{$suphp_handler}" }
+      it { is_expected.to contain "suPHP_AddHandler #{apache_hash['suphp_handler']}" }
       it { is_expected.to contain 'suPHP_Engine on' }
-      it { is_expected.to contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" }
-    end
-  end
-
-  describe 'rack_base_uris' do
-    unless fact('osfamily') == 'RedHat' || host_inventory['facter']['os']['name'] == 'SLES'
-      test = -> do
-        pp = <<-MANIFEST
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot          => '/tmp',
-            rack_base_uris  => ['/test'],
-          }
-        MANIFEST
-        it 'applies cleanly' do
-          apply_manifest(pp, catch_failures: true)
-        end
-        test.call
-      end
-    end
-  end
-
-  describe 'no_proxy_uris' do
-    pp = <<-MANIFEST
-      class { 'apache': service_ensure => stopped, }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot          => '/tmp',
-        proxy_dest       => 'http://test2',
-        no_proxy_uris    => [ 'http://test2/test' ],
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'ProxyPass        http://test2/test !' }
-      it { is_expected.to contain 'ProxyPass        / http://test2/' }
-    end
-  end
-
-  describe 'redirect' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot          => '/tmp',
-        redirect_source  => ['/images'],
-        redirect_dest    => ['http://test.server/'],
-        redirect_status  => ['permanent'],
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'Redirect permanent /images http://test.server/' }
-    end
-  end
-
-  describe 'request_headers' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot          => '/tmp',
-        request_headers  => ['append MirrorID "mirror 12"'],
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'append MirrorID "mirror 12"' }
-    end
-  end
-
-  describe 'rewrite rules' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot          => '/tmp',
-        rewrites => [
-          { comment => 'test',
-            rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
-            rewrite_rule => ['^index\.html$ welcome.html'],
-            rewrite_map  => ['lc int:tolower'],
-          }
-        ],
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain '#test' }
-      it { is_expected.to contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
-      it { is_expected.to contain 'RewriteRule ^index.html$ welcome.html' }
-      it { is_expected.to contain 'RewriteMap lc int:tolower' }
+      it { is_expected.to contain "suPHP_ConfigPath \"#{apache_hash['suphp_configpath']}\"" }
     end
   end
 
@@ -1448,7 +1090,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain '#Permalink Rewrites' }
       it { is_expected.to contain 'RewriteEngine On' }
@@ -1460,207 +1102,39 @@ class { 'apache': }
     end
   end
 
-  describe 'setenv/setenvif' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot  => '/tmp',
-        setenv   => ['TEST /test'],
-        setenvif => ['Request_URI "\.gif$" object_is_image=gif']
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'SetEnv TEST /test' }
-      it { is_expected.to contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
-    end
-  end
-
-  describe 'block' do
-    pp = <<-MANIFEST
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          block    => 'scm',
-        }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain '<DirectoryMatch .*\.(svn|git|bzr|hg|ht)/.*>' }
-    end
-  end
-
   describe 'wsgi' do
-    unless host_inventory['facter']['os']['distro'].nil?
-      context 'on lucid', if: host_inventory['facter']['os']['distro']['codename'] == 'lucid' do
-        pp = <<-MANIFEST
-          class { 'apache': }
-          class { 'apache::mod::wsgi': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot                     => '/tmp',
-            wsgi_application_group      => '%{GLOBAL}',
-            wsgi_daemon_process         => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
-            wsgi_daemon_process_options => {processes => '2'},
-            wsgi_process_group          => 'nobody',
-            wsgi_script_aliases         => { '/test' => '/test1' },
-            wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
-            wsgi_pass_authorization     => 'On',
-          }
-        MANIFEST
-        it 'import_script applies cleanly' do
-          apply_manifest(pp, catch_failures: true)
-        end
-      end
-
-      context 'on everything but lucid', unless: (host_inventory['facter']['os']['distro']['codename'] == 'lucid' || host_inventory['facter']['os']['name'] == 'SLES') do
-        pp = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::wsgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot                     => '/tmp',
-          wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => { 'wsgi' => { 'python-home' => '/usr' }, 'foo' => {} },
-          wsgi_daemon_process_options => {processes => '2'},
-          wsgi_import_script          => '/test1',
-          wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
-          wsgi_process_group          => 'nobody',
-          wsgi_script_aliases         => { '/test' => '/test1' },
-          wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
-          wsgi_pass_authorization     => 'On',
-          wsgi_chunked_request        => 'On',
-        }
-      MANIFEST
-        it 'import_script applies cleanly' do
-          apply_manifest(pp, catch_failures: true)
-        end
-
-        describe file("#{$vhost_dir}/25-test.server.conf") do
-          it { is_expected.to be_file }
-          it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
-          it { is_expected.to contain 'WSGIDaemonProcess foo' }
-          it { is_expected.to contain 'WSGIDaemonProcess wsgi python-home=/usr' }
-          it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
-          it { is_expected.to contain 'WSGIProcessGroup nobody' }
-          it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
-          it { is_expected.to contain 'WSGIPassAuthorization On' }
-          it { is_expected.to contain 'WSGIChunkedRequest On' }
-        end
-      end
-    end
-  end
-
-  describe 'custom_fragment' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot  => '/tmp',
-        custom_fragment => inline_template('#weird test string'),
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain '#weird test string' }
-    end
-  end
-
-  describe 'itk' do
-    pp = <<-MANIFEST
+    context 'filter on OS', unless: (os[:family] =~ %r{sles|redhat}) do
+      pp = <<-MANIFEST
       class { 'apache': }
+      class { 'apache::mod::wsgi': }
       host { 'test.server': ip => '127.0.0.1' }
       apache::vhost { 'test.server':
-        docroot  => '/tmp',
-        itk      => { user => 'nobody', group => 'nobody' }
+        docroot                     => '/tmp',
+        wsgi_application_group      => '%{GLOBAL}',
+        wsgi_daemon_process         => { 'wsgi' => { 'python-home' => '/usr' }, 'foo' => {} },
+        wsgi_daemon_process_options => {processes => '2'},
+        wsgi_import_script          => '/test1',
+        wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
+        wsgi_process_group          => 'nobody',
+        wsgi_script_aliases         => { '/test' => '/test1' },
+        wsgi_script_aliases_match   => { '/test/([^/*])' => '/test1' },
+        wsgi_pass_authorization     => 'On',
+        wsgi_chunked_request        => 'On',
       }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'AssignUserId nobody nobody' }
-    end
-  end
-
-  # Limit testing to Debian, since Centos does not have fastcgi package.
-  # In addition Debian 9/Ubuntu 18.04 no longer support this fastcgi
-  if fact('osfamily') == 'Debian' && !['9', '18.04'].include?(host_inventory['facter']['os']['release']['major'])
-    describe 'fastcgi' do
-      pp_one = <<-MANIFEST
-        $_os = $::operatingsystem
-
-        if $_os == 'Ubuntu' {
-          $_location = "http://archive.ubuntu.com/ubuntu/"
-          $_security_location = "http://archive.ubuntu.com/ubuntu/"
-          $_release = $::lsbdistcodename
-          $_release_security = "${_release}-security"
-          $_repos = "main universe multiverse"
-        } else {
-          $_location = "http://httpredir.debian.org/debian/"
-          $_security_location = "http://security.debian.org/"
-          $_release = $::lsbdistcodename
-          $_release_security = "${_release}/updates"
-          $_repos = "main contrib non-free"
-        }
-
-        include ::apt
-        apt::source { "${_os}_${_release}":
-          location    => $_location,
-          release     => $_release,
-          repos       => $_repos,
-        }
-
-        apt::source { "${_os}_${_release}-updates":
-          location    => $_location,
-          release     => "${_release}-updates",
-          repos       => $_repos,
-        }
-
-        apt::source { "${_os}_${_release}-security":
-          location    => $_security_location,
-          release     => $_release_security,
-          repos       => $_repos,
-        }
-      MANIFEST
-      pp_two = <<-MANIFEST
-        class { 'apache': }
-        class { 'apache::mod::fastcgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot        => '/tmp',
-          fastcgi_server => 'localhost',
-          fastcgi_socket => '/tmp/fast/1234',
-          fastcgi_dir    => '/tmp/fast',
-        }
       MANIFEST
-      it 'applies cleanly' do
-        # apt-get update may not run clean here. Should be OK.
-        apply_manifest(pp_one, catch_failures: false)
-
-        apply_manifest(pp_two, catch_failures: true, acceptable_exit_codes: [0, 2])
+      it 'import_script applies cleanly' do
+        apply_manifest(pp, catch_failures: true)
       end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
+      describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }
-        it { is_expected.to contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
-        it { is_expected.to contain '<Directory "/tmp/fast">' }
+        it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
+        it { is_expected.to contain 'WSGIDaemonProcess foo' }
+        it { is_expected.to contain 'WSGIDaemonProcess wsgi python-home=/usr' }
+        it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
+        it { is_expected.to contain 'WSGIProcessGroup nobody' }
+        it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
+        it { is_expected.to contain 'WSGIPassAuthorization On' }
+        it { is_expected.to contain 'WSGIChunkedRequest On' }
       end
     end
   end
@@ -1698,59 +1172,13 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Include "/apache_spec/include"' }
     end
   end
 
-  describe 'virtualhost without priority prefix' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      apache::vhost { 'test.server':
-        priority => false,
-        docroot => '/tmp'
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/test.server.conf") do
-      it { is_expected.to be_file }
-    end
-  end
-
-  describe 'SSLProtocol directive' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      apache::vhost { 'test.server':
-        docroot      => '/tmp',
-        ssl          => true,
-        ssl_protocol => ['All', '-SSLv2'],
-      }
-      apache::vhost { 'test2.server':
-        docroot      => '/tmp',
-        ssl          => true,
-        ssl_protocol => 'All -SSLv2',
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
-    end
-
-    describe file("#{$vhost_dir}/25-test2.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
-    end
-  end
-
-  describe 'shibboleth parameters', if: (fact('osfamily') == 'Debian' && host_inventory['facter']['os']['release']['major'] != '7') do
+  describe 'shibboleth parameters', if: (os[:family] == 'debian' && os[:release] != '7') do
     # Debian 7 is too old for ShibCompatValidUser
     pp = <<-MANIFEST
       class { 'apache': }
@@ -1764,7 +1192,7 @@ class { 'apache::mod::shib': }
     it 'applies cleanly' do
       apply_manifest(pp, catch_failures: true)
     end
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ShibCompatValidUser On' }
     end
diff --git a/spec/acceptance/vhosts_spec.rb b/spec/acceptance/vhosts_spec.rb
index 9c49c5b173..3051700352 100644
--- a/spec/acceptance/vhosts_spec.rb
+++ b/spec/acceptance/vhosts_spec.rb
@@ -1,6 +1,5 @@
 require 'spec_helper_acceptance'
-require_relative './version.rb'
-
+apache_hash = apache_settings_hash
 describe 'apache::vhosts class' do
   context 'custom vhosts defined via class apache::vhosts' do
     pp = <<-MANIFEST
@@ -21,11 +20,11 @@ class { 'apache::vhosts':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{$vhost_dir}/25-custom_vhost_1.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-custom_vhost_1.conf") do
       it { is_expected.to contain '<VirtualHost \*:81>' }
     end
 
-    describe file("#{$vhost_dir}/25-custom_vhost_2.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-custom_vhost_2.conf") do
       it { is_expected.to contain '<VirtualHost \*:82>' }
     end
   end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index e98ad28ebb..745d46e1b0 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,102 +1,59 @@
-require 'beaker-pe'
-require 'beaker-puppet'
-require 'puppet'
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
-require 'beaker/puppet_install_helper'
-require 'beaker/module_install_helper'
-require 'beaker-task_helper'
-
-run_puppet_install_helper
-configure_type_defaults_on(hosts)
-install_bolt_on(hosts) unless pe_install?
-install_module_on(hosts)
-install_module_dependencies_on(hosts)
-
-RSpec.configure do |c|
-  c.filter_run focus: true
-  c.run_all_when_everything_filtered = true
-  # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
-  if fact('network6_lo') != '::1'
-    c.filter_run_excluding ipv6: true
-  end
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case
-  # also note how fact('puppetversion') is not available because of PUP-4359
-  if host_inventory['facter']['os']['family'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '8' && shell('puppet --version').stdout =~ %r{^4\.2}
-    c.filter_run_excluding skip_pup_5016: true
-  end
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
-    # net-tools required for netstat utility being used by be_listening
-    if (host_inventory['facter']['os']['family'] == 'RedHat' && host_inventory['facter']['os']['release']['major'] == '7') ||
-       (host_inventory['facter']['os']['family'] == 'Debian' && host_inventory['facter']['os']['release']['major'] == '9') ||
-       (host_inventory['facter']['os']['name'] == 'Ubuntu' && host_inventory['facter']['os']['release']['full'] == '18.04')
-      pp = <<-EOS
-        package { 'net-tools': ensure => installed }
-      EOS
-
-      apply_manifest_on(agents, pp, catch_failures: false)
-    elsif host_inventory['facter']['os']['name'] == 'SLES' && host_inventory['facter']['os']['release']['major'] == '15'
-      pp = <<-EOS
-        package { 'net-tools-deprecated': ensure => installed }
-      EOS
-
-      apply_manifest_on(agents, pp, catch_failures: false)
-    end
-
-    if host_inventory['facter']['os']['family'] == 'Debian'
-      # Make sure snake-oil certs are installed.
-      shell 'apt-get install -y ssl-cert'
-    end
-
-    # Install module and dependencies
-    hosts.each do |host|
-      # Required for mod_passenger tests.
-      if host_inventory['facter']['os']['family'] == 'RedHat'
-        on host, puppet('module', 'install', 'stahnma/epel')
-        on host, puppet('module', 'install', 'puppetlabs/inifile')
-        # We need epel installed, so we can get plugins, wsgi, mime ...
-        # The osmirror is required as epel no longer supports el5
-        pp = <<-PUPPETCODE
-          if $::osfamily == 'RedHat' {
-            if $::operatingsystemmajrelease == '5' or ($::operatingsystem == 'OracleLinux' and $::operatingsystemmajrelease == '6'){
-              class { 'epel':
-                epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
-                epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
-              }
-            } else {
-              class { 'epel': }
-            }
-          }
-        PUPPETCODE
-
-        apply_manifest_on(host, pp, catch_failures: true)
-      end
-
-      # Required for manifest to make mod_pagespeed repository available
-      if host_inventory['facter']['os']['family'] == 'Debian'
-        on host, puppet('module', 'install', 'puppetlabs-apt')
-      end
-
-      # Make sure selinux is disabled so the tests work.
-      on host, puppet('apply', '-e',
-                      %("exec { 'setenforce 0': path   => '/bin:/sbin:/usr/bin:/usr/sbin', onlyif => 'which setenforce && getenforce | grep Enforcing', }"))
-    end
+# frozen_string_literal: true
+
+require 'serverspec'
+require 'puppet_litmus'
+require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))
+include PuppetLitmus
+
+if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost'
+  puts 'Running tests against this machine !'
+  if Gem.win_platform?
+    set :backend, :cmd
+  else
+    set :backend, :exec
   end
-end
-
-shared_examples 'a idempotent resource' do
-  it 'applies with no errors' do
-    apply_manifest(pp, catch_failures: true)
-  end
-
-  it 'applies a second time without changes', :skip_pup_5016 do
-    apply_manifest(pp, catch_changes: true)
+else
+  # load inventory
+  inventory_hash = inventory_hash_from_inventory_file
+  node_config = config_from_node(inventory_hash, ENV['TARGET_HOST'])
+
+  if target_in_group(inventory_hash, ENV['TARGET_HOST'], 'docker_nodes')
+    host = ENV['TARGET_HOST']
+    set :backend, :docker
+    set :docker_container, host
+  elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'ssh_nodes')
+    set :backend, :ssh
+    options = Net::SSH::Config.for(host)
+    options[:user] = node_config.dig('ssh', 'user') unless node_config.dig('ssh', 'user').nil?
+    options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil?
+    options[:keys] = node_config.dig('ssh', 'private-key') unless node_config.dig('ssh', 'private-key').nil?
+    options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil?
+    options[:verify_host_key] = Net::SSH::Verifiers::Null.new unless node_config.dig('ssh', 'host-key-check').nil?
+    host = if ENV['TARGET_HOST'].include?(':')
+             ENV['TARGET_HOST'].split(':').first
+           else
+             ENV['TARGET_HOST']
+           end
+    set :host,        options[:host_name] || host
+    set :ssh_options, options
+    set :request_pty, true
+  elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'winrm_nodes')
+    require 'winrm'
+
+    set :backend, :winrm
+    set :os, family: 'windows'
+    user = node_config.dig('winrm', 'user') unless node_config.dig('winrm', 'user').nil?
+    pass = node_config.dig('winrm', 'password') unless node_config.dig('winrm', 'password').nil?
+    endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
+
+    opts = {
+      user: user,
+      password: pass,
+      endpoint: endpoint,
+      operation_timeout: 300,
+    }
+
+    winrm = WinRM::Connection.new opts
+    Specinfra.configuration.winrm = winrm
   end
 end
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
new file mode 100644
index 0000000000..c97eebd63a
--- /dev/null
+++ b/spec/spec_helper_acceptance_local.rb
@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+RSpec.configure do |c|
+  # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
+  if ENV['CI'] == 'true'
+    c.filter_run_excluding ipv6: true
+  end
+  c.before :suite do
+    run_shell('puppet module install stahnma/epel')
+    pp = <<-PUPPETCODE
+    # needed by tests
+    package { 'curl':
+      ensure   => 'latest',
+    }
+    # needed for netstat, for serverspec checks
+    if $::osfamily == 'SLES' or $::osfamily == 'SUSE' {
+      package { 'net-tools-deprecated':
+        ensure   => 'latest',
+      }
+    }
+    # needed for ss, for serverspec checks
+    if $::operatingsystem == 'Ubuntu' and $::operatingsystemmajrelease !~ /14.04|16.04/ {
+      package { 'iproute2':
+        ensure   => 'latest',
+      }
+    }
+    if $::osfamily == 'RedHat' {
+      if $::operatingsystemmajrelease == '5' or $::operatingsystemmajrelease == '6'{
+        class { 'epel':
+          epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
+          epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
+        }
+      } else {
+        class { 'epel': }
+      }
+    }
+    PUPPETCODE
+    apply_manifest(pp)
+
+    # Make sure selinux is disabled so the tests work.
+    run_shell('setenforce 0', expect_failures: true) if os[:family] =~ %r{redhat|oracle}
+  end
+end
+
+def apache_settings_hash
+  osfamily               = os[:family]
+  operatingsystemrelease = os[:release].to_f
+  apache = {}
+  case osfamily
+  when 'redhat', 'oracle'
+    apache['confd_dir']        = '/etc/httpd/conf.d'
+    apache['conf_file']        = '/etc/httpd/conf/httpd.conf'
+    apache['ports_file']       = '/etc/httpd/conf/ports.conf'
+    apache['vhost_dir']        = '/etc/httpd/conf.d'
+    apache['vhost']            = '/etc/httpd/conf.d/15-default.conf'
+    apache['run_dir']          = '/var/run/httpd'
+    apache['doc_root']         = '/var/www'
+    apache['service_name']     = 'httpd'
+    apache['package_name']     = 'httpd'
+    apache['error_log']        = 'error_log'
+    apache['suphp_handler']    = 'php5-script'
+    apache['suphp_configpath'] = 'undef'
+
+    if operatingsystemrelease >= 7
+      apache['version'] = '2.4'
+      apache['mod_dir'] = '/etc/httpd/conf.modules.d'
+    else
+      apache['version'] = '2.2'
+      apache['mod_dir'] = '/etc/httpd/conf.d'
+    end
+  when 'debian', 'ubuntu'
+    apache['confd_dir']        = '/etc/apache2/conf.d'
+    apache['mod_dir']          = '/etc/apache2/mods-available'
+    apache['conf_file']        = '/etc/apache2/apache2.conf'
+    apache['ports_file']       = '/etc/apache2/ports.conf'
+    apache['vhost']            = '/etc/apache2/sites-available/15-default.conf'
+    apache['vhost_dir']        = '/etc/apache2/sites-enabled'
+    apache['run_dir']          = '/var/run/apache2'
+    apache['doc_root']         = '/var/www'
+    apache['service_name']     = 'apache2'
+    apache['package_name']     = 'apache2'
+    apache['error_log']        = 'error.log'
+    apache['suphp_handler']    = 'x-httpd-php'
+    apache['suphp_configpath'] = '/etc/php5/apache2'
+    apache['version'] = if osfamily == 'ubuntu' && operatingsystemrelease >= 13.10
+                          '2.4'
+                        elsif osfamily == 'debian' && operatingsystemrelease >= 8.0
+                          '2.4'
+                        else
+                          '2.2'
+                        end
+  when 'freebsd'
+    apache['confd_dir']        = '/usr/local/etc/apache24/Includes'
+    apache['mod_dir']          = '/usr/local/etc/apache24/Modules'
+    apache['conf_file']        = '/usr/local/etc/apache24/httpd.conf'
+    apache['ports_file']       = '/usr/local/etc/apache24/Includes/ports.conf'
+    apache['vhost']            = '/usr/local/etc/apache24/Vhosts/15-default.conf'
+    apache['vhost_dir']        = '/usr/local/etc/apache24/Vhosts'
+    apache['run_dir']          = '/var/run/apache24'
+    apache['doc_root']         = '/var/www'
+    apache['service_name']     = 'apache24'
+    apache['package_name']     = 'apache24'
+    apache['error_log']        = 'http-error.log'
+    apache['version'] = '2.2'
+  when 'gentoo'
+    apache['confd_dir']        = '/etc/apache2/conf.d'
+    apache['mod_dir']          = '/etc/apache2/modules.d'
+    apache['conf_file']        = '/etc/apache2/httpd.conf'
+    apache['ports_file']       = '/etc/apache2/ports.conf'
+    apache['vhost']            = '/etc/apache2/vhosts.d/15-default.conf'
+    apache['vhost_dir']        = '/etc/apache2/vhosts.d'
+    apache['run_dir']          = '/var/run/apache2'
+    apache['doc_root']         = '/var/www'
+    apache['service_name']     = 'apache2'
+    apache['package_name']     = 'www-servers/apache'
+    apache['error_log']        = 'http-error.log'
+    apache['version'] = '2.4'
+  when 'suse', 'sles'
+    apache['confd_dir']        = '/etc/apache2/conf.d'
+    apache['mod_dir']          = '/etc/apache2/mods-available'
+    apache['conf_file']        = '/etc/apache2/httpd.conf'
+    apache['ports_file']       = '/etc/apache2/ports.conf'
+    apache['vhost']            = '/etc/apache2/sites-available/15-default.conf'
+    apache['vhost_dir']        = '/etc/apache2/sites-available'
+    apache['run_dir']          = '/var/run/apache2'
+    apache['doc_root']         = '/srv/www'
+    apache['service_name']     = 'apache2'
+    apache['package_name']     = 'apache2'
+    apache['error_log']        = 'error.log'
+    apache['version'] = if operatingsystemrelease < 12
+                          '2.2'
+                        else
+                          '2.4'
+                        end
+  else
+    raise 'unable to figure out what apache version'
+  end
+  apache
+end

From 6054786b9859bfc81b475a0f0c8d1c786afee6a2 Mon Sep 17 00:00:00 2001
From: Florin Dragos <florin@puppet.com>
Date: Thu, 29 Aug 2019 17:09:23 +0300
Subject: [PATCH 1541/2267] (MAINT) pdksync: fix for net-ssh 5 host_key check

---
 spec/spec_helper_acceptance.rb | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 745d46e1b0..aabeb0b80d 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -28,7 +28,30 @@
     options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil?
     options[:keys] = node_config.dig('ssh', 'private-key') unless node_config.dig('ssh', 'private-key').nil?
     options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil?
-    options[:verify_host_key] = Net::SSH::Verifiers::Null.new unless node_config.dig('ssh', 'host-key-check').nil?
+    # Support both net-ssh 4 and 5.
+    # rubocop:disable Metrics/BlockNesting
+    options[:verify_host_key] = if node_config.dig('ssh', 'host-key-check').nil?
+                                  # Fall back to SSH behavior. This variable will only be set in net-ssh 5.3+.
+                                  if @strict_host_key_checking.nil? || @strict_host_key_checking
+                                    Net::SSH::Verifiers::Always.new
+                                  else
+                                    # SSH's behavior with StrictHostKeyChecking=no: adds new keys to known_hosts.
+                                    # If known_hosts points to /dev/null, then equivalent to :never where it
+                                    # accepts any key beacuse they're all new.
+                                    Net::SSH::Verifiers::AcceptNewOrLocalTunnel.new
+                                  end
+                                elsif node_config.dig('ssh', 'host-key-check')
+                                  if defined?(Net::SSH::Verifiers::Always)
+                                    Net::SSH::Verifiers::Always.new
+                                  else
+                                    Net::SSH::Verifiers::Secure.new
+                                  end
+                                elsif defined?(Net::SSH::Verifiers::Never)
+                                  Net::SSH::Verifiers::Never.new
+                                else
+                                  Net::SSH::Verifiers::Null.new
+                                end
+    # rubocop:enable Metrics/BlockNesting
     host = if ENV['TARGET_HOST'].include?(':')
              ENV['TARGET_HOST'].split(':').first
            else

From cd81ee3c04ee419731483a0b23a59de6659e3382 Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Fri, 30 Aug 2019 10:50:46 +0100
Subject: [PATCH 1542/2267] FM-8140 Add Redhat 8 support

---
 metadata.json                             |  3 ++-
 provision.yaml                            |  2 +-
 spec/acceptance/apache_parameters_spec.rb |  6 +++---
 spec/acceptance/class_spec.rb             |  4 ++--
 spec/acceptance/default_mods_spec.rb      |  8 ++++----
 spec/acceptance/itk_spec.rb               |  2 +-
 spec/acceptance/prefork_worker_spec.rb    |  6 +++---
 spec/acceptance/vhost_spec.rb             | 18 +++++++++---------
 spec/classes/mod/passenger_spec.rb        | 10 ++++++++++
 spec/classes/mod/security_spec.rb         |  9 ++++++++-
 spec/defines/fastcgi_server_spec.rb       |  2 +-
 spec/defines/vhost_spec.rb                |  6 +++---
 spec/spec_helper_acceptance_local.rb      | 15 +++++++++++++--
 13 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/metadata.json b/metadata.json
index 24977cc5ae..a589dd3b5c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -23,7 +23,8 @@
       "operatingsystemrelease": [
         "5",
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
diff --git a/provision.yaml b/provision.yaml
index a309065b6a..91f67c96fc 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -10,4 +10,4 @@ travis_el7:
   images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
 release_checks:
   provisioner: vmpooler
-  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 8c862eb179..345e359776 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -51,7 +51,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -68,7 +68,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.not_to be_running }
       it { is_expected.not_to be_enabled }
     end
@@ -86,7 +86,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.not_to be_running }
       it { is_expected.not_to be_enabled }
     end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index d983599cd8..67248b8771 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -26,7 +26,7 @@
       it { is_expected.to be_installed }
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -74,7 +74,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index eeef5586d3..4093ec0b1a 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -15,7 +15,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_running }
     end
   end
@@ -54,7 +54,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.not_to be_running }
     end
   end
@@ -87,7 +87,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_running }
     end
   end
@@ -106,7 +106,7 @@ class { 'apache': default_mods => false }
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index fc3089cc5a..5e4c67e095 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -39,7 +39,7 @@ class { 'apache':
     end
   end
 
-  describe service(service_name) do
+  describe service(service_name), skip: 'FM-8483' do
     it { is_expected.to be_running }
     it { is_expected.to be_enabled }
   end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 703448a65c..31d7e38e05 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -16,7 +16,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -37,7 +37,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -59,7 +59,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index b95400fce9..eb3a5e4437 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -177,7 +177,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -245,7 +245,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -305,7 +305,7 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']) do
+      describe service(apache_hash['service_name']), skip: 'FM-8483' do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -367,7 +367,7 @@ class { 'apache': }
         apply_manifest(pp_one, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']) do
+      describe service(apache_hash['service_name']), skip: 'FM-8483' do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -409,7 +409,7 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']) do
+      describe service(apache_hash['service_name']), skip: 'FM-8483' do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -485,7 +485,7 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']) do
+      describe service(apache_hash['service_name']), skip: 'FM-8483' do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
 
@@ -526,7 +526,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -572,7 +572,7 @@ class { 'apache': default_vhost => false, }
                      ), catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -617,7 +617,7 @@ class { 'apache': default_vhost => false, }
                     ), catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']) do
+    describe service(apache_hash['service_name']), skip: 'FM-8483' do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 2bcd0ac879..e8c37a67d8 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -424,6 +424,16 @@
                 is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
               }
             end
+          when '8'
+
+            context 'on EL8' do
+              it {
+                is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
+              }
+              it {
+                is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
+              }
+            end
           end
         end
       when 'FreeBSD'
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 570d9af606..c0efd7cdb4 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -24,13 +24,20 @@
             )
           }
           it { is_expected.to contain_package('mod_security_crs') }
-          if facts[:os]['release']['major'].to_i > 6
+          if facts[:os]['release']['major'].to_i > 6 && facts[:os]['release']['major'].to_i <= 7
             it {
               is_expected.to contain_file('security.conf').with(
                 path: '/etc/httpd/conf.modules.d/security.conf',
               )
             }
           end
+          if facts[:os]['release']['major'].to_i >= 8
+            it {
+              is_expected.to contain_file('security.conf').with(
+                path: '/etc/httpd/conf.d/security.conf',
+              )
+            }
+          end
           it {
             is_expected.to contain_file('security.conf')
               .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index fafc63acb4..844dfd5ad7 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -10,7 +10,7 @@
 
   on_supported_os.each do |os, facts|
     next if facts[:os]['release']['major'] == '18.04'
-    next if facts[:os]['release']['major'] == '7' && facts[:os]['family']['RedHat']
+    next if (facts[:os]['release']['major'] == '7' || facts[:os]['release']['major'] == '8') && facts[:os]['family']['RedHat']
     context "on #{os} " do
       let :facts do
         facts
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 796c980056..aa5d5934f1 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -3,9 +3,9 @@
 describe 'apache::vhost', type: :define do
   describe 'os-independent items' do
     on_supported_os.each do |os, facts|
-      # this setup uses fastcgi wich isn't available on RHEL 7 / Ubuntu 18.04
+      # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Ubuntu 18.04
       next if facts[:os]['release']['major'] == '18.04'
-      next if facts[:os]['release']['major'] == '7' && facts[:os]['family']['RedHat']
+      next if (facts[:os]['release']['major'] == '7' || facts[:os]['release']['major'] == '8') && facts[:os]['family']['RedHat']
       # next if facts[:os]['name'] == 'SLES'
 
       apache_name = case facts[:os]['family']
@@ -44,7 +44,7 @@
           it { is_expected.to contain_class('apache::params') }
           it { is_expected.to contain_apache__listen(params[:port]) }
           # namebased virualhost is only created on apache 2.2 and older
-          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
+          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 8) ||
              (facts[:os]['name'] == 'Amazon') ||
              (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
             it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index c97eebd63a..99614dccda 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -30,6 +30,12 @@ class { 'epel':
           epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
           epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
         }
+        } elsif $::operatingsystemmajrelease == '8' {
+          class { 'epel':
+                os_maj_release => "7",
+                epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
+                epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
+          }
       } else {
         class { 'epel': }
       }
@@ -60,8 +66,13 @@ def apache_settings_hash
     apache['error_log']        = 'error_log'
     apache['suphp_handler']    = 'php5-script'
     apache['suphp_configpath'] = 'undef'
-
-    if operatingsystemrelease >= 7
+    if (operatingsystemrelease >= 7 && operatingsystemrelease < 8) && (osfamily == 'redhat')
+      apache['version'] = '2.4'
+      apache['mod_dir'] = '/etc/httpd/conf.modules.d'
+    elsif operatingsystemrelease >= 8 && osfamily == 'redhat'
+      apache['version'] = '2.4'
+      apache['mod_dir'] = '/etc/httpd/conf.d'
+    elsif operatingsystemrelease >= 7 && osfamily == 'oracle'
       apache['version'] = '2.4'
       apache['mod_dir'] = '/etc/httpd/conf.modules.d'
     else

From 93c21e5b953fe8e9baeae851fc93c926e3587415 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Wed, 4 Sep 2019 08:48:30 -0400
Subject: [PATCH 1543/2267] Add owner, group, file_mode and show_diff to
 apache::custom_config

---
 manifests/custom_config.pp | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 905cea57cf..8a13163e57 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -36,6 +36,18 @@
 # @param verify_config
 #   Specifies whether to validate the configuration file before notifying the Apache service.
 #
+# @param owner
+#   File owner of configuration file
+#
+# @param group
+#   File group of configuration file
+#
+# @param file_mode
+#   File mode of configuration file
+#
+# @param show_diff
+#   show_diff property for configuration file resource
+#
 define apache::custom_config (
   Enum['absent', 'present'] $ensure = 'present',
   $confdir                          = $::apache::confd_dir,
@@ -45,6 +57,10 @@
   $verify_command                   = $::apache::params::verify_command,
   Boolean $verify_config            = true,
   $filename                         = undef,
+  $owner                            = undef,
+  $group                            = undef,
+  $file_mode                        = undef,
+  Boolean $show_diff                = true,
 ) {
 
   if $content and $source {
@@ -75,14 +91,19 @@
     $notifies = undef
   }
 
+  $_file_mode = pick($file_mode, $::apache::file_mode)
+
   file { "apache_${name}":
-    ensure  => $ensure,
-    path    => "${confdir}/${_filename}",
-    mode    => $::apache::file_mode,
-    content => $content,
-    source  => $source,
-    require => Package['httpd'],
-    notify  => $notifies,
+    ensure    => $ensure,
+    path      => "${confdir}/${_filename}",
+    owner     => $owner,
+    group     => $group,
+    mode      => $_file_mode,
+    content   => $content,
+    source    => $source,
+    show_diff => $show_diff,
+    require   => Package['httpd'],
+    notify    => $notifies,
   }
 
   if $ensure == 'present' and $verify_config {

From ce4565a77b38c1cab19c42e0f4039d357a618322 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 8 Jul 2019 23:17:32 +0200
Subject: [PATCH 1544/2267] Set PHP version to 7.3 for Debian Buster

---
 manifests/params.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 4d1046d0b7..a0e4af8282 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -362,8 +362,10 @@
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
     } elsif ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) {
-      # Debian stretch uses a different dav_svn from Ubuntu Xenial
-      $php_version = '7.0'
+      $php_version = $facts['operatingsystemmajrelease'] ? {
+        '9'     => '7.0', # Debian Stretch
+        '10'    => '7.3', # Debian Buster
+      }
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',
         'auth_kerb'             => 'libapache2-mod-auth-kerb',

From 8ffd52f6a1d3ba4f591c6421c68bde45a87528e8 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 8 Jul 2019 23:17:51 +0200
Subject: [PATCH 1545/2267] Merge Debian and Ubuntu configs where possible

---
 manifests/params.pp | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index a0e4af8282..8222fa6798 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -361,10 +361,11 @@
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
-    } elsif ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) {
+    } elsif ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
         '10'    => '7.3', # Debian Buster
+        default => '7.2', # Ubuntu Bionic, Cosmic and Disco
       }
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',
@@ -374,35 +375,6 @@
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-mod-svn',
         'fastcgi'               => 'libapache2-mod-fastcgi',
-        'fcgid'                 => 'libapache2-mod-fcgid',
-        'geoip'                 => 'libapache2-mod-geoip',
-        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
-        'lookup_identity'       => 'libapache2-mod-lookup-identity',
-        'nss'                   => 'libapache2-mod-nss',
-        'pagespeed'             => 'mod-pagespeed-stable',
-        'passenger'             => 'libapache2-mod-passenger',
-        'perl'                  => 'libapache2-mod-perl2',
-        'phpXXX'                => 'libapache2-mod-phpXXX',
-        'python'                => 'libapache2-mod-python',
-        'rpaf'                  => 'libapache2-mod-rpaf',
-        'security'              => 'libapache2-mod-security2',
-        'shib2'                 => 'libapache2-mod-shib2',
-        'suphp'                 => 'libapache2-mod-suphp',
-        'wsgi'                  => 'libapache2-mod-wsgi',
-        'xsendfile'             => 'libapache2-mod-xsendfile',
-      }
-    } elsif ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
-      # major.minor version used since Debian stretch and Ubuntu Xenial
-      $php_version = '7.2' # different to Ubuntu 16.04
-      # fastcgi and suphp got removed from #mod_packages, they aren't supported anymore
-      $mod_packages = {
-        'auth_cas'              => 'libapache2-mod-auth-cas',
-        'auth_kerb'             => 'libapache2-mod-auth-kerb',
-        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
-        'auth_mellon'           => 'libapache2-mod-auth-mellon',
-        'authnz_pam'            => 'libapache2-mod-authnz-pam',
-        'dav_svn'               => 'libapache2-mod-svn', # different to Ubuntu16.04
-        'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
         'lookup_identity'       => 'libapache2-mod-lookup-identity',
@@ -419,7 +391,7 @@
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
     } else {
-      # major.minor version used since Debian stretch and Ubuntu Xenial
+      # Ubuntu Xenial
       $php_version = '7.0'
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',

From a0a21d4639ae41908e4acc5cb9b0772d084dbc00 Mon Sep 17 00:00:00 2001
From: Erick Banks <erick@puppetlabs.com>
Date: Mon, 9 Sep 2019 13:28:57 -0700
Subject: [PATCH 1546/2267] (FM-8393) add debian 10 to provision.yaml and
 metadata

---
 metadata.json  | 3 ++-
 provision.yaml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index a589dd3b5c..09d1fad076 100644
--- a/metadata.json
+++ b/metadata.json
@@ -53,7 +53,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
diff --git a/provision.yaml b/provision.yaml
index 91f67c96fc..2b93256820 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -10,4 +10,4 @@ travis_el7:
   images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
 release_checks:
   provisioner: vmpooler
-  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From 32b9d1f7405d2a782d202e5dcb191a2e9eb05330 Mon Sep 17 00:00:00 2001
From: Erick Banks <erick@puppetlabs.com>
Date: Mon, 9 Sep 2019 14:34:59 -0700
Subject: [PATCH 1547/2267] (FM-8393-ekohl) fix acceptance test.

---
 spec/acceptance/mod_php_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index df3d9e8e60..1bc06014ed 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -27,6 +27,10 @@ class { 'apache::mod::php': }
         describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
+      elsif os[:family] == 'debian' && os[:release] =~ %r{10}
+        describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
       elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
         describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }

From afbaf1df1dc8eb79e64354878430530448160913 Mon Sep 17 00:00:00 2001
From: jnguiot <45011516+jnguiot@users.noreply.github.com>
Date: Mon, 13 May 2019 18:12:45 +0200
Subject: [PATCH 1548/2267] MODULES-9083: remove double quotes to allow flags
 in SSLCARevocationCheck (mod_ssl)

---
 templates/vhost/_ssl.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 7f5767c4cb..4200f78590 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -34,7 +34,7 @@
   SSLVerifyDepth          <%= @ssl_verify_depth %>
   <%- end -%>
   <%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  SSLCARevocationCheck    "<%= @ssl_crl_check %>"
+  SSLCARevocationCheck    <%= @ssl_crl_check %>
   <%- end -%>
   <%- end -%>
   <%- if @ssl_options -%>

From d2bc04605fa09cd1c7493ed62a92d19b0b465129 Mon Sep 17 00:00:00 2001
From: jnguiot <45011516+jnguiot@users.noreply.github.com>
Date: Tue, 14 May 2019 09:40:09 +0200
Subject: [PATCH 1549/2267] MODULES-9083: add unit test

---
 spec/acceptance/apache_ssl_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 669f54a0af..6195e7e8da 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -50,7 +50,7 @@ class { 'apache':
           ssl_ca               => '/tmp/ssl_ca',
           ssl_crl_path         => '/tmp/ssl_crl_path',
           ssl_crl              => '/tmp/ssl_crl',
-          ssl_crl_check        => 'chain',
+          ssl_crl_check        => 'chain flag',
           ssl_certs_dir        => '/tmp',
           ssl_protocol         => 'test',
           ssl_cipher           => 'test',
@@ -83,7 +83,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLVerifyDepth          test' }
       it { is_expected.to contain 'SSLOptions test test1' }
       if apache_hash['version'] == '2.4'
-        it { is_expected.to contain 'SSLCARevocationCheck    "chain"' }
+        it { is_expected.to contain 'SSLCARevocationCheck    chain flag' }
       else
         it { is_expected.not_to contain 'SSLCARevocationCheck' }
       end

From d904f30722a2b8586ea39e8d7740e874fd7b73da Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Tue, 10 Sep 2019 22:45:51 +0200
Subject: [PATCH 1550/2267] add possibility to define variables inside
 VirtualHost definition

The variable can them be used inside the vhost tag as a variable.
At the footer, the variable is undefined to avoid side effects
in other vhosts.

also see https://httpd.apache.org/docs/2.4/mod/core.html#define
---
 manifests/vhost.pp               | 5 +++++
 templates/vhost/_file_footer.erb | 3 +++
 templates/vhost/_file_header.erb | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5d4e6498c8..c743814151 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1622,6 +1622,10 @@
 #   Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
 #   which allows you to configure how the server determines it's own name and port.
 # 
+# @param define
+#   this lets you define configuration variables inside a vhost using [`Define`](https://httpd.apache.org/docs/2.4/mod/core.html#define),
+#   these can then be used to replace configuration values. All Defines are Undefined at the end of the VirtualHost.
+#
 define apache::vhost(
   Variant[Boolean,String] $docroot,
   $manage_docroot                                                                   = true,
@@ -1850,6 +1854,7 @@
   Optional[String] $shib_compat_valid_user                                          = undef,
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name        = undef,
   Optional[Variant[String,Array[String]]] $comment                                  = undef,
+  Hash $define                                                                      = {},
 ) {
 
   # The base class must be included first because it is used by parameter defaults
diff --git a/templates/vhost/_file_footer.erb b/templates/vhost/_file_footer.erb
index f8108e5c3f..d42a1bdbe6 100644
--- a/templates/vhost/_file_footer.erb
+++ b/templates/vhost/_file_footer.erb
@@ -1,3 +1,6 @@
+<% @define.each do | k, v| -%>
+  Undefine <%= k %>
+<% end -%>
 </VirtualHost>
 <% if @passenger_pre_start -%>
   <%- [@passenger_pre_start].flatten.compact.each do |passenger_pre_start| -%>
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index 9ff4aff3d8..65d9b5cfd6 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -5,6 +5,9 @@
 <%= [@comment].flatten.collect{|c| "# #{c}"}.join("\n") -%>
 
 <VirtualHost <%= [@nvh_addr_port].flatten.compact.join(' ') %>>
+<% @define.each do | k, v| -%>
+  Define <%= k %> <%= v %>
+<% end -%>
 <% if @servername and not @servername.empty? -%>
   ServerName <%= @servername %>
 <% end -%>

From 512c2fc4a7e43cd7b859d74b8356bd015f09e345 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Fri, 13 Sep 2019 10:06:25 +0100
Subject: [PATCH 1551/2267] (MODULES-9863) 5.1.0 release prep

---
 CHANGELOG.md  |  20 +++++++++
 REFERENCE.md  | 114 +++++++++++++++++++++++++++++++++++---------------
 metadata.json |   4 +-
 3 files changed, 102 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d8978c950..70a56d5a35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.1.0) (2019-09-13)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.0.0...v5.1.0)
+
+### Added
+
+- \(FM-8393\) add support on Debian 10 [\#1945](https://github.com/puppetlabs/puppetlabs-apache/pull/1945) ([ThoughtCrhyme](https://github.com/ThoughtCrhyme))
+- FM-8140 Add Redhat 8 support [\#1941](https://github.com/puppetlabs/puppetlabs-apache/pull/1941) ([sheenaajay](https://github.com/sheenaajay))
+- \(FM-8214\) converted to use litmus [\#1938](https://github.com/puppetlabs/puppetlabs-apache/pull/1938) ([tphoney](https://github.com/tphoney))
+- \(MODULES-9668 \) Please make ProxyRequests setting in vhost.pp configurable [\#1935](https://github.com/puppetlabs/puppetlabs-apache/pull/1935) ([aukesj](https://github.com/aukesj))
+- Added unmanaged\_path and custom\_fragment options to userdir [\#1931](https://github.com/puppetlabs/puppetlabs-apache/pull/1931) ([GeorgeCox](https://github.com/GeorgeCox))
+- Add LDAP parameters to httpd.conf [\#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
+- Add LDAPReferrals configuration parameter [\#1928](https://github.com/puppetlabs/puppetlabs-apache/pull/1928) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+
+### Fixed
+
+- \(MODULES-9104\) Add file\_mode to config files. [\#1922](https://github.com/puppetlabs/puppetlabs-apache/pull/1922) ([stevegarn](https://github.com/stevegarn))
+- \(bugfix\) Add default package name for mod\_ldap [\#1913](https://github.com/puppetlabs/puppetlabs-apache/pull/1913) ([turnopil](https://github.com/turnopil))
+- Remove event mpm when using prefork, worker or itk [\#1905](https://github.com/puppetlabs/puppetlabs-apache/pull/1905) ([tuxmea](https://github.com/tuxmea))
+
 ## [v5.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.0.0) (2019-05-20)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.1.0...v5.0.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 19badde107..a6c7def72e 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -94,6 +94,7 @@ _Public Classes_
 * [`apache::mod::worker`](#apachemodworker): Installs and manages the MPM `worker`.
 * [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
 * [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
+* [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event): 
 * [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
 
 _Private Classes_
@@ -165,6 +166,8 @@ When this class is declared with the default options, Puppet:
 - Creates a document root directory determined by your operating system, typically `/var/www`.
 - Starts the Apache service.
 
+If an ldaps:// URL is specified, the mode becomes SSL and the setting of LDAPTrustedMode is ignored.
+
 #### Examples
 
 ##### 
@@ -480,6 +483,30 @@ CGIs/SSIs in REMOTE_HOST.<br />
 
 Default value: $::apache::params::hostname_lookups
 
+##### `ldap_trusted_mode`
+
+Data type: `Any`
+
+The following modes are supported:
+
+  NONE - no encryption
+  SSL - ldaps:// encryption on default port 636
+  TLS - STARTTLS encryption on default port 389
+Not all LDAP toolkits support all the above modes. An error message will be logged at
+runtime if a mode is not supported, and the connection to the LDAP server will fail.
+
+Default value: `undef`
+
+##### `ldap_verify_server_cert`
+
+Data type: `Any`
+
+Specifies whether to force the verification of a server certificate when establishing an SSL
+connection to the LDAP server.
+On|Off
+
+Default value: `undef`
+
 ##### `lib_path`
 
 Data type: `Any`
@@ -3179,6 +3206,14 @@ Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
 
 Default value: `undef`
 
+##### `ldap_path`
+
+Data type: `String`
+
+The server location of the ldap status page.
+
+Default value: '/ldap-status'
+
 ### apache::mod::lookup_identity
 
 Installs `mod_lookup_identity`
@@ -4657,7 +4692,7 @@ The following parameters are available in the `apache::mod::proxy` class.
 
 ##### `proxy_requests`
 
-Data type: `Boolean`
+Data type: `Any`
 
 Enables forward (standard) proxy requests.
 
@@ -5338,15 +5373,6 @@ Enable compression on the SSL level.
 
 Default value: `false`
 
-##### `ssl_sessiontickets`
-
-Data type: `Optional[Boolean]`
-
-Enable the use of TLS session tickets (RFC 5077).
-Available since Apache 2.4.11.
-
-Default: `undef`.
-
 ##### `ssl_cryptodevice`
 
 Data type: `Any`
@@ -5475,20 +5501,6 @@ Pass stapling related OCSP errors on to client.
 
 Default value: `undef`
 
-##### `stapling_cache`
-
-Data type: `String`
-
-Configures the storage type of the global/inter-process SSL Stapling Cache.
-Only cache type 'shmcb' is supported.
-Default based on the OS:
-- Debian/Ubuntu: '${APACHE_RUN_DIR}/ocsp(32768)'.
-- RedHat: '/run/httpd/ssl_stapling(32768)'.
-- FreeBSD/Gentoo: '/var/run/ssl_stapling(32768)'.
-- Suse: '/var/lib/apache2/ssl_stapling(32768)'.
-
-Default value: `undef`
-
 ##### `ssl_mutex`
 
 Data type: `Any`
@@ -5516,6 +5528,22 @@ Data type: `Any`
 
 Name of ssl package to install.
 
+Default value: `undef`
+
+##### `ssl_sessiontickets`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: `undef`
+
+##### `stapling_cache`
+
+Data type: `Optional[String]`
+
+
+
 Default value: `undef`
 
 ### apache::mod::status
@@ -5679,6 +5707,22 @@ Configures what features are available in a particular directory.
 
 Default value: [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ]
 
+##### `unmanaged_path`
+
+Data type: `Any`
+
+Toggles whether to manage path in userdir.conf
+
+Default value: `false`
+
+##### `custom_fragment`
+
+Data type: `Any`
+
+Custom configuration to be added to userdir.conf
+
+Default value: `undef`
+
 ### apache::mod::version
 
 Installs `mod_version`.
@@ -5892,6 +5936,10 @@ Installs `mod_xsendfile`.
 https://tn123.org/mod_xsendfile/
 for additional documentation.
 
+### apache::mpm::disable_mpm_event
+
+The apache::mpm::disable_mpm_event class.
+
 ### apache::vhosts
 
 host parameters or Configuring virtual hosts in the README section.
@@ -7369,16 +7417,6 @@ X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
 Default value: `undef`
 
-##### `proxy_requests`
-
-Data type: `Boolean`
-
-Sets the [ProxyRequests Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
-This prarmeter allows or prevents Apache httpd from functioning as a forward proxy server.
-(Setting ProxyRequests to Off does not disable use of the ProxyPass directive.)
-
-Default value: `false`
-
 ##### `proxy_error_override`
 
 Data type: `Any`
@@ -9084,6 +9122,14 @@ which allows you to configure how the server determines it's own name and port.
 
 Default value: `undef`
 
+##### `proxy_requests`
+
+Data type: `Boolean`
+
+
+
+Default value: `false`
+
 ### apache::vhost::custom
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
diff --git a/metadata.json b/metadata.json
index 09d1fad076..74014c40a8 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,10 +1,10 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
-  "source": "git://github.com/puppetlabs/puppetlabs-apache.git",
+  "source": "https://github.com/puppetlabs/puppetlabs-apache",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [

From bb1fa6b8f097e4fab987bccea4610883516eba10 Mon Sep 17 00:00:00 2001
From: Robert Klein <r.klein@kennisnet.nl>
Date: Wed, 28 Aug 2019 11:42:08 +0200
Subject: [PATCH 1552/2267] Add shibboleth support for Debian 10

---
 manifests/params.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 8222fa6798..0612b66fe4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -424,8 +424,10 @@
     $access_log_file     = 'access.log'
     if $::osfamily == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0 {
       $shib2_lib = 'mod_shib_22.so'
-    } else {
+    } elsif ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '19.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '10') < 0) {
       $shib2_lib = 'mod_shib2.so'
+    } else {
+      $shib2_lib = 'mod_shib.so'
     }
     $mod_libs             = {
       'shib2' => $shib2_lib,

From ff26868919121077445ec8b02f0942fb54e3ebd9 Mon Sep 17 00:00:00 2001
From: Matthieu FAURE <mfaure@asqatasun.org>
Date: Sat, 14 Sep 2019 19:00:35 +0200
Subject: [PATCH 1553/2267] FIX FastCGI doc on Ubuntu 18.04

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index 505a9420e7..18956f8b70 100755
--- a/README.md
+++ b/README.md
@@ -720,6 +720,28 @@ There are several optional parameters you can specify when defining Apache modul
 <a id="configuring-fastcgi-servers-to-handle-php-files"></a>
 ### Configuring FastCGI servers to handle PHP files
 
+#### FastCGI on Ubuntu 18.04
+
+On Ubuntu 18.04, `mod_fastcgi` is no longer supported. So considering:
+
+* an Apache Vhost with docroot set to `/var/www/html`
+* a FastCGI server listening on `127.0.0.1:9000`
+
+you can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
+
+``` puppet
+apache::vhost { 'www':
+  ...
+  docroot         => '/var/www/html/',
+  custom_fragment => 'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/var/www/html/$1',
+  ...
+}
+```
+
+Please note you have to adjust the second ProxyPassMatch parameter to you docroot value (here `/var/www/html/`).
+
+#### Other OSes
+
 Add the [`apache::fastcgi::server`][] defined type to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
 
 ``` puppet

From 6cd1ddb80462ad4178a36f53697cc9b87ad1159f Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 17 Sep 2019 15:50:39 +0100
Subject: [PATCH 1554/2267] (maint) Add a codeowners file

---
 CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 CODEOWNERS

diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000..a5d109e998
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# Setting ownership to the modules team
+* @puppetlabs/modules

From 5db9d5d2cee66ad76c8d4f05dffaa9b31dfceeb4 Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@example42.com>
Date: Fri, 20 Sep 2019 13:18:05 +0200
Subject: [PATCH 1555/2267] Add parameter version for mod security

We want to be able to select mod security 1 or 2.
Depending on Version, package names and config files are different.
---
 manifests/mod/security.pp         | 21 +++++++++++++++++++--
 manifests/params.pp               |  4 ++++
 spec/classes/mod/security_spec.rb | 15 +++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index f7bef39c1d..5f51bbb45f 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -2,6 +2,9 @@
 # @summary
 #   Installs and configures `mod_security`.
 # 
+# @param version
+#   Manage mod_security or mod_security2
+#
 # @param logroot
 #   Configures the location of audit and debug logs.
 # 
@@ -86,6 +89,7 @@
 #
 class apache::mod::security (
   $logroot                    = $::apache::params::logroot,
+  $version                     = $::apache::params::modsec_version,
   $crs_package                 = $::apache::params::modsec_crs_package,
   $activated_rules             = $::apache::params::modsec_default_rules,
   $modsec_dir                  = $::apache::params::modsec_dir,
@@ -127,7 +131,20 @@
     fail('SLES 10 is not currently supported.')
   }
 
-  ::apache::mod { 'security':
+  case $version {
+    1: {
+      $mod_name = 'security'
+      $mod_conf_name = 'security.conf'
+    }
+    2: {
+      $mod_name = 'security2'
+      $mod_conf_name = 'security2.conf'
+    }
+    default: {
+      fail('Unsuported version for mod security')
+    }
+  }
+  ::apache::mod { $mod_name:
     id  => 'security2_module',
     lib => 'mod_security2.so',
   }
@@ -161,7 +178,7 @@
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
     mode    => $::apache::file_mode,
-    path    => "${::apache::mod_dir}/security.conf",
+    path    => "${::apache::mod_dir}/${mod_conf_name}",
     owner   => $::apache::params::user,
     group   => $::apache::params::group,
     require => Exec["mkdir ${::apache::mod_dir}"],
diff --git a/manifests/params.pp b/manifests/params.pp
index 0612b66fe4..1053d86d1d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -120,6 +120,7 @@
     $mellon_lock_file     = '/run/mod_auth_mellon/lock'
     $mellon_cache_size    = 100
     $mellon_post_directory = undef
+    $modsec_version       = 1
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
@@ -272,6 +273,7 @@
     $mellon_lock_file     = '/run/mod_auth_mellon/lock'
     $mellon_cache_size    = 100
     $mellon_post_directory = undef
+    $modsec_version       = 1
     $modsec_crs_package   = 'mod_security_crs'
     $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
@@ -449,6 +451,7 @@
     $mellon_lock_file     = undef
     $mellon_cache_size    = undef
     $mellon_post_directory = '/var/cache/apache2/mod_auth_mellon/'
+    $modsec_version       = 1
     $modsec_crs_package   = 'modsecurity-crs'
     $modsec_crs_path      = '/usr/share/modsecurity-crs'
     $modsec_dir           = '/etc/modsecurity'
@@ -745,6 +748,7 @@
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     $dev_packages        = ['libapr-util1-devel', 'libapr1-devel', 'libcurl-devel']
+    $modsec_version       = 1
     $modsec_crs_package   = undef
     $modsec_crs_path      = undef
     $modsec_default_rules = undef
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index c0efd7cdb4..042bf4d668 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -182,6 +182,21 @@
               }
             end
           end
+
+          describe 'with mod security version' do
+            let :params do
+              {
+                version: 2,
+              }
+            end
+
+            it { is_expected.to contain_apache__mod('security2') }
+            it {
+              is_expected.to contain_file('security.conf').with(
+                path: '/etc/apache2/mods-available/security2.conf',
+              )
+            }
+          end
         end
       end
     end

From 57bbb10b22c8d2c6949b28435ddba08f343de031 Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@example42.com>
Date: Fri, 20 Sep 2019 14:13:01 +0200
Subject: [PATCH 1556/2267] Disable worker, when using prefork mpm

---
 manifests/mpm.pp                    | 1 +
 manifests/mpm/disable_mpm_worker.pp | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 manifests/mpm/disable_mpm_worker.pp

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index e67d20f9f6..a4796edced 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -102,6 +102,7 @@
       if $mpm == 'prefork' {
         if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9.0.0') >= 0 ) ) {
           include apache::mpm::disable_mpm_event
+          include apache::mpm::disable_mpm_worker
         }
       }
 
diff --git a/manifests/mpm/disable_mpm_worker.pp b/manifests/mpm/disable_mpm_worker.pp
new file mode 100644
index 0000000000..e6668b7609
--- /dev/null
+++ b/manifests/mpm/disable_mpm_worker.pp
@@ -0,0 +1,8 @@
+class apache::mpm::disable_mpm_worker {
+  exec { '/usr/sbin/a2dismod mpm_worker':
+    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_worker.load",
+    require => Package['httpd'],
+    before  => Class['apache::service'],
+  }
+
+}

From 728dc18baac30f5ef336d42870a2cbe8f6376e93 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Mon, 23 Sep 2019 16:12:14 +0100
Subject: [PATCH 1557/2267] use full path for proxy host in test

---
 spec/acceptance/vhost_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index eb3a5e4437..df241dd716 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -810,7 +810,7 @@ class { 'apache': }
       }
       apache::vhost { 'test.proxy':
         docroot    => '/tmp',
-        proxy_dest => 'test2',
+        proxy_dest => 'http://testproxy',
       }
       apache::vhost { 'test.scriptaliases':
         docroot    => '/tmp',
@@ -908,7 +908,7 @@ class { 'apache': }
     end
     describe file("#{apache_hash['vhost_dir']}/25-test.proxy.conf") do
       it { is_expected.to be_file }
-      it { is_expected.to contain 'ProxyPass        / test2/' }
+      it { is_expected.to contain 'ProxyPass        / http://testproxy/' }
     end
     describe file("#{apache_hash['vhost_dir']}/25-test.scriptaliases.conf") do
       it { is_expected.to be_file }
@@ -1027,7 +1027,7 @@ class { 'apache': }
       }
     MANIFEST
     it 'applies cleanly' do
-      pp += "\nclass { 'apache::mod::actions': }" if os[:family] =~ %r{debian|suse}
+      pp += "\nclass { 'apache::mod::actions': }" if os[:family] =~ %r{debian|suse|ubuntu}
       apply_manifest(pp, catch_failures: true)
     end
 

From 9f1598a04c6d2faa5775060dd4a257fe535fa8f4 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben.roberts@gsacapital.com>
Date: Fri, 27 Sep 2019 15:40:55 +0100
Subject: [PATCH 1558/2267] MODULES-9904 Fix lbmethod module load order

Under recent apache versions (not sure when changed, but certainly
in 2.4.34), the lbmethod modules depend on symbols present in either
the mod_proxy or mod_proxy_balancer modules. Prior to this commit,
this module creates an `lbmethod_${method}.load` file which comes
alphabetically before `proxy.load` and `proxy_balancer.load`.
Under these recent apache versions, the daemon will therefore fail
to configtest or startup due to the invalid configuration.

This commit adjusts the module load order so that the lbmethod module
is loaded after those its dependent upon.
---
 manifests/balancer.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index ee1f6c3fc3..0bd8af95f7 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -55,7 +55,9 @@
       undef   => 'byrequests',
       default => $proxy_set['lbmethod'],
     }
-    ensure_resource('apache::mod', "lbmethod_${lbmethod}")
+    ensure_resource('apache::mod', "lbmethod_${lbmethod}", {
+      'loadfile_name' => "proxy_balancer_lbmethod_${lbmethod}.load"
+    })
   }
 
   if $target {

From 8f52c86d6d004f7b54406a621bf5bc1d5ed9e434 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 10 Oct 2019 18:55:59 +0200
Subject: [PATCH 1559/2267] always quote ExpiresDefault in vhost::directories

this was already done in expires.conf, but not in a vhost
---
 templates/vhost/_directories.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index aead27971d..0025d29cd1 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -320,7 +320,7 @@
     ExpiresActive <%= directory['expires_active'] %>
     <%- end -%>
     <%- if directory['expires_default'] -%>
-    ExpiresDefault <%= directory['expires_default'] %>
+    ExpiresDefault "<%= directory['expires_default'] %>"
     <%- end -%>
     <%- if directory['expires_by_type'] -%>
     <%- Array(directory['expires_by_type']).each do |rule| -%>

From e9f019f1c33073a9a38f033cbf2960fb1bdb88f3 Mon Sep 17 00:00:00 2001
From: Michael T Lombardi <michael.t.lombardi@outlook.com>
Date: Mon, 14 Oct 2019 12:00:24 -0500
Subject: [PATCH 1560/2267] (MAINT) Fix linting errors

---
 manifests/mod/proxy_html.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 7cf4695446..2acffef6d4 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -28,6 +28,7 @@
         ::apache::mod { 'xml2enc': }
       }
     }
+    default: { }
   }
 
   ::apache::mod { 'proxy_html':

From c9a45ea5b19ce1ee03581d825b909db3056428b8 Mon Sep 17 00:00:00 2001
From: Michael T Lombardi <michael.t.lombardi@outlook.com>
Date: Fri, 18 Oct 2019 16:57:10 -0500
Subject: [PATCH 1561/2267] (FM-8275) Add vagrant provision list

Prior to this commit the only provisioners included in
the provision lists were docker and vmpooler, neither
of which are particularly accessible to folks developing
on Windows outside of Puppet.

This commit adds a list which leverages the vagrant
provisioner.
---
 provision.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/provision.yaml b/provision.yaml
index 2b93256820..dea17c2977 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -8,6 +8,9 @@ travis_deb:
 travis_el7:
   provisioner: docker
   images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
+vagrant:
+  provisioner: vagrant
+  images: ['centos/7', 'generic/ubuntu1804']
 release_checks:
   provisioner: vmpooler
   images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From 5e3a830ee3eb87a418e3cf4f2c536ad49eb5dfc8 Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@example42.com>
Date: Sat, 19 Oct 2019 12:10:39 +0200
Subject: [PATCH 1562/2267] Allow switching of thread modules

Usual thread modules are: prefork, event and worker.
When switching from one thread module to another we must ensure that the
old, no longer to use, thread module gets disabled.

Puppet Apache module will always use the new mpm base thread modules and place
them in files without mpm_ prefix.
The a2dismod utility only checks for file names, not the real thread
module.
---
 manifests/mpm.pp                     | 1 +
 manifests/mpm/disable_mpm_event.pp   | 4 ++--
 manifests/mpm/disable_mpm_prefork.pp | 8 ++++++++
 manifests/mpm/disable_mpm_worker.pp  | 4 ++--
 spec/classes/apache_spec.rb          | 3 ++-
 5 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 manifests/mpm/disable_mpm_prefork.pp

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index a4796edced..d988b36238 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -109,6 +109,7 @@
       if $mpm == 'worker' {
         if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) {
           include apache::mpm::disable_mpm_event
+          include apache::mpm::disable_mpm_prefork
         }
       }
 
diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
index 04bf53d4d1..10d22412db 100644
--- a/manifests/mpm/disable_mpm_event.pp
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -1,6 +1,6 @@
 class apache::mpm::disable_mpm_event {
-  exec { '/usr/sbin/a2dismod mpm_event':
-    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
+  exec { '/usr/sbin/a2dismod event':
+    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/event.load",
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
diff --git a/manifests/mpm/disable_mpm_prefork.pp b/manifests/mpm/disable_mpm_prefork.pp
new file mode 100644
index 0000000000..d7ff8aade6
--- /dev/null
+++ b/manifests/mpm/disable_mpm_prefork.pp
@@ -0,0 +1,8 @@
+class apache::mpm::disable_mpm_prefork {
+  exec { '/usr/sbin/a2dismod prefork':
+    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/prefork.load",
+    require => Package['httpd'],
+    before  => Class['apache::service'],
+  }
+
+}
diff --git a/manifests/mpm/disable_mpm_worker.pp b/manifests/mpm/disable_mpm_worker.pp
index e6668b7609..414e7f58dc 100644
--- a/manifests/mpm/disable_mpm_worker.pp
+++ b/manifests/mpm/disable_mpm_worker.pp
@@ -1,6 +1,6 @@
 class apache::mpm::disable_mpm_worker {
-  exec { '/usr/sbin/a2dismod mpm_worker':
-    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_worker.load",
+  exec { '/usr/sbin/a2dismod worker':
+    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/worker.load",
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index f47b6682c0..a9a6952685 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -260,7 +260,8 @@
           { mpm_module: 'worker' }
         end
 
-        it { is_expected.to contain_exec('/usr/sbin/a2dismod mpm_event') }
+        it { is_expected.to contain_exec('/usr/sbin/a2dismod event') }
+        it { is_expected.to contain_exec('/usr/sbin/a2dismod prefork') }
       end
     end
 

From a6eab15cb8320f5a02c5663d7ab69e887b7eddd2 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Thu, 24 Oct 2019 15:21:51 +0100
Subject: [PATCH 1563/2267] Point pdk gem to head of master until PDK-1525
 resolved

---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 0e94796156..7afb0756ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,5 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
+gem 'pdk', git: 'https://github.com/puppetlabs/pdk.git', branch: 'master'
 
 def location_for(place_or_version, fake_version = nil)
   git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
@@ -68,4 +69,4 @@ extra_gemfiles.each do |gemfile|
     eval(File.read(gemfile), binding)
   end
 end
-# vim: syntax=ruby
+# vim: syntax=ruby
\ No newline at end of file

From 91795cc8488d4d2f8421c6495256deeb0cd22e60 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Wed, 30 Oct 2019 10:29:28 +0000
Subject: [PATCH 1564/2267] (FM-8662) Correct  in manifests/mod/ssl.pp for SLES
 11

---
 manifests/mod/ssl.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 1867a55305..3bea4a780e 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -159,7 +159,7 @@
     if defined(Class['::apache::mod::worker']){
       $suse_path = '/usr/lib64/apache2-worker'
     } else {
-      $suse_path = '/usr/lib64/apache2-worker'
+      $suse_path = '/usr/lib64/apache2-prefork'
     }
     ::apache::mod { 'ssl':
       package  => $package_name,

From 9a4d894570a8cde84bd073b0e3ae71fed0374afc Mon Sep 17 00:00:00 2001
From: Glenn Sarti <glennsarti@users.noreply.github.com>
Date: Thu, 31 Oct 2019 11:05:55 +0800
Subject: [PATCH 1565/2267] (maint) Update for PDK templates

This commit updates the module as per PDK-Templates commit 0b5b39b
---
 .rubocop.yml           |  7 +++++++
 .sync.yml              | 11 +----------
 Gemfile                |  4 +++-
 Rakefile               | 13 +++++++++++--
 metadata.json          |  4 ++--
 spec/default_facts.yml |  1 +
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ee74e8cbb2..33688a79ec 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -27,6 +27,7 @@ GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
   - spec/**/*
+  Enabled: false
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
@@ -89,6 +90,12 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+GetText/DecorateFunctionMessage:
+  Enabled: false
+GetText/DecorateStringFormattingUsingInterpolation:
+  Enabled: false
+GetText/DecorateStringFormattingUsingPercent:
+  Enabled: false
 Layout/EndOfLine:
   Enabled: false
 Layout/IndentHeredoc:
diff --git a/.sync.yml b/.sync.yml
index 4040796c25..fb1e501d57 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -7,16 +7,7 @@
     - ---.project
 
 .travis.yml:
-  global_env:
-    - PARALLEL_TEST_PROCESSORS=16  
-  docker_sets:
-    - set: docker/centos-7
-    - set: docker/ubuntu-14.04
-  docker_defaults:
-    bundler_args: ""
-  secure: ""
-  branches:
-    - release
+  unmanaged: true
 
 Gemfile:
   optional:
diff --git a/Gemfile b/Gemfile
index 7afb0756ee..f7560c1626 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,7 @@ end
 
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
+
 group :development do
   gem "fast_gettext", '1.1.0',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
   gem "fast_gettext",                                            require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
@@ -23,6 +24,7 @@ group :development do
   gem "json", '= 1.8.1',                                         require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
@@ -69,4 +71,4 @@ extra_gemfiles.each do |gemfile|
     eval(File.read(gemfile), binding)
   end
 end
-# vim: syntax=ruby
\ No newline at end of file
+# vim: syntax=ruby
diff --git a/Rakefile b/Rakefile
index f11fbe9d58..0aab55f9ed 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,8 +16,17 @@ end
 
 def changelog_project
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['source'].match(%r{.*/([^/]*)})[1]
-  raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
+
+  returnVal = nil
+  returnVal ||= begin
+    metadata_source = JSON.load(File.read('metadata.json'))['source']
+    metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
+
+    metadata_source_match && metadata_source_match[1]
+  end
+
+  raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
+
   puts "GitHubChangelogGenerator project:#{returnVal}"
   returnVal
 end
diff --git a/metadata.json b/metadata.json
index 74014c40a8..8becadf075 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,7 +81,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.11.1",
+  "pdk-version": "1.14.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates/#master",
-  "template-ref": "heads/master-0-gb096033"
+  "template-ref": "heads/master-0-g0b5b39b"
 }
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index ea1e4808e3..f777abfc99 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -3,5 +3,6 @@
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
 ipaddress: "172.16.254.254"
+ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"

From a80408f2b2648578b410170665b6d6b10ef28b32 Mon Sep 17 00:00:00 2001
From: Glenn Sarti <glennsarti@users.noreply.github.com>
Date: Thu, 31 Oct 2019 11:11:08 +0800
Subject: [PATCH 1566/2267] (PDK-1501) Allow Travis CI config to be templated

Previously the module unmanaged the Travis CI file when converted to Litmus.
This commit allows the Travis CI file to be managed.
---
 .sync.yml   | 60 ++++++++++++++++++++++++++++++++++++++++++++-
 .travis.yml | 70 ++++++++++++++++++++---------------------------------
 2 files changed, 85 insertions(+), 45 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index fb1e501d57..0bbf256f95 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -7,7 +7,65 @@
     - ---.project
 
 .travis.yml:
-  unmanaged: true
+  includes:
+    -
+      bundler_args:
+      dist: trusty
+      env: PLATFORMS=deb_puppet5
+      rvm: 2.5.3
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_deb]'
+      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
+      - bundle exec rake 'litmus:install_agent[puppet5]'
+      - bundle exec rake litmus:install_module
+      script:
+      - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      sudo: required
+    -
+      bundler_args:
+      dist: trusty
+      env: PLATFORMS=deb_puppet6
+      rvm: 2.5.3
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_deb]'
+      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
+      - bundle exec rake 'litmus:install_agent[puppet6]'
+      - bundle exec rake litmus:install_module
+      script:
+      - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      sudo: required
+    -
+      bundler_args:
+      dist: trusty
+      env: PLATFORMS=el7_puppet5
+      rvm: 2.5.3
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_el7]'
+      - bundle exec rake 'litmus:install_agent[puppet5]'
+      - bundle exec rake litmus:install_module
+      script:
+      - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      sudo: required
+    -
+      bundler_args:
+      dist: trusty
+      env: PLATFORMS=el7_puppet6
+      rvm: 2.5.3
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_el7]'
+      - bundle exec rake 'litmus:install_agent[puppet6]'
+      - bundle exec rake litmus:install_module
+      script:
+      - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      sudo: required
+
+  secure: ""
+  branches:
+    - release
 
 Gemfile:
   optional:
diff --git a/.travis.yml b/.travis.yml
index 3c5c304c65..78e791e859 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,73 +24,55 @@ matrix:
   fast_finish: true
   include:
     -
-      bundler_args:
+      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+      stage: static
+    -
+      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+      rvm: 2.4.5
+      stage: spec
+    -
+      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
+      rvm: 2.5.3
+      stage: spec
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
+    -
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
       dist: trusty
       env: PLATFORMS=deb_puppet5
       rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_deb]'
-      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       sudo: required
     -
-      bundler_args:
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
       dist: trusty
       env: PLATFORMS=deb_puppet6
       rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_deb]'
-      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       sudo: required
     -
-      bundler_args:
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
       dist: trusty
       env: PLATFORMS=el7_puppet5
       rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_el7]'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       sudo: required
     -
-      bundler_args:
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
       dist: trusty
       env: PLATFORMS=el7_puppet6
       rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_el7]'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       sudo: required
-    -
-      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
-      stage: static
-    -
-      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
-      rvm: 2.4.5
-      stage: spec
-    -
-      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.3
-      stage: spec
-    -
-      env: DEPLOY_TO_FORGE=yes
-      stage: deploy
 branches:
   only:
     - master

From 546aa6c3af01c192231e172b5da50d7cd4f8d431 Mon Sep 17 00:00:00 2001
From: Michael T Lombardi <michael.t.lombardi@outlook.com>
Date: Thu, 31 Oct 2019 13:25:57 -0500
Subject: [PATCH 1567/2267] (FM-8391) Update README per team practices

This commit updates the readme to remove the language marking litmus
as an experimental tool as well as clarifying the instructions for
running acceptance tests and noting the schedule for the IA Content
office hours.
---
 README.md | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 18956f8b70..38b973a3ff 100755
--- a/README.md
+++ b/README.md
@@ -915,8 +915,6 @@ The [`apache::mod::suphp`][] class is untested since repositories are missing co
 
 ### Testing
 
-Due to the difficult and specialised nature of acceptance testing mods in apache IE (high OS specificity), we have replaced  acceptance tests with unit tests.
-
 To run the unit tests, install the necessary gems:
 
 ```
@@ -935,10 +933,19 @@ To check the code coverage, run:
 COVERAGE=yes bundle exec rake parallel_spec
 ```
 
-### Contributing
+## Development
+
+Acceptance tests for this module leverage [puppet_litmus](https://github.com/puppetlabs/puppet_litmus).
+To run the acceptance tests follow the instructions [here](https://github.com/puppetlabs/puppet_litmus/wiki/Tutorial:-use-Litmus-to-execute-acceptance-tests-with-a-sample-module-(MoTD)#install-the-necessary-gems-for-the-module).
+You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
 
-[Puppet][] modules on the [Puppet Forge][] are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve.
+If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://tickets.puppetlabs.com/browse/MODULES/).
+Every Monday the Puppet IA Content Team has [office hours](https://puppet.com/community/office-hours) in the [Puppet Community Slack](http://slack.puppet.com/), alternating between an EMEA friendly time (1300 UTC) and an Americas friendly time (0900 Pacific, 1700 UTC).
 
-We want to make it as easy as possible to contribute changes so our modules work in your environment, but we also need contributors to follow a few guidelines to help us maintain and improve the modules' quality.
+If you have problems getting this module up and running, please [contact Support](http://puppetlabs.com/services/customer-support).
 
-For more information, please read the complete [module contribution guide][] and check out [CONTRIBUTING.md][].
\ No newline at end of file
+If you submit a change to this module, be sure to regenerate the reference documentation as follows:
+
+```bash
+puppet strings generate --format markdown --out REFERENCE.md
+```

From 987820ff9a02525d8710a802ff031cd4bdfb2431 Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Fri, 1 Nov 2019 11:02:10 +0000
Subject: [PATCH 1568/2267] (maint) minor fix for sles

---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index df241dd716..70cadc33e4 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1027,7 +1027,7 @@ class { 'apache': }
       }
     MANIFEST
     it 'applies cleanly' do
-      pp += "\nclass { 'apache::mod::actions': }" if os[:family] =~ %r{debian|suse|ubuntu}
+      pp += "\nclass { 'apache::mod::actions': }" if os[:family] =~ %r{debian|suse|ubuntu|sles}
       apply_manifest(pp, catch_failures: true)
     end
 

From a1c2587f1543255d0569314f20cf199473e27b94 Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Fri, 1 Nov 2019 12:26:56 +0000
Subject: [PATCH 1569/2267] Release version 5.2.0

---
 CHANGELOG.md  | 17 ++++++++++++++++
 REFERENCE.md  | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 metadata.json |  2 +-
 3 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70a56d5a35..f7015121f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.2.0) (2019-11-01)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.1.0...v5.2.0)
+
+### Added
+
+- Add parameter version for mod security [\#1953](https://github.com/puppetlabs/puppetlabs-apache/pull/1953) ([tuxmea](https://github.com/tuxmea))
+- add possibility to define variables inside VirtualHost definition [\#1947](https://github.com/puppetlabs/puppetlabs-apache/pull/1947) ([trefzer](https://github.com/trefzer))
+
+### Fixed
+
+- \(FM-8662\) Correct  in manifests/mod/ssl.pp for SLES 11 [\#1963](https://github.com/puppetlabs/puppetlabs-apache/pull/1963) ([cmccrisken-puppet](https://github.com/cmccrisken-puppet))
+- always quote ExpiresDefault in vhost::directories [\#1958](https://github.com/puppetlabs/puppetlabs-apache/pull/1958) ([evgeni](https://github.com/evgeni))
+- MODULES-9904 Fix lbmethod module load order [\#1956](https://github.com/puppetlabs/puppetlabs-apache/pull/1956) ([optiz0r](https://github.com/optiz0r))
+- Add owner, group, file\_mode and show\_diff to apache::custom\_config [\#1942](https://github.com/puppetlabs/puppetlabs-apache/pull/1942) ([treydock](https://github.com/treydock))
+- Add shibboleth support for Debian 10 [\#1939](https://github.com/puppetlabs/puppetlabs-apache/pull/1939) ([fabbks](https://github.com/fabbks))
+
 ## [v5.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.1.0) (2019-09-13)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.0.0...v5.1.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index a6c7def72e..42463257af 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -95,6 +95,7 @@ _Public Classes_
 * [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
 * [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
 * [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event): 
+* [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker): 
 * [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
 
 _Private Classes_
@@ -5066,6 +5067,14 @@ for additional documentation.
 
 The following parameters are available in the `apache::mod::security` class.
 
+##### `version`
+
+Data type: `Any`
+
+Manage mod_security or mod_security2
+
+Default value: $::apache::params::modsec_version
+
 ##### `logroot`
 
 Data type: `Any`
@@ -5940,6 +5949,10 @@ for additional documentation.
 
 The apache::mpm::disable_mpm_event class.
 
+### apache::mpm::disable_mpm_worker
+
+The apache::mpm::disable_mpm_worker class.
+
 ### apache::vhosts
 
 host parameters or Configuring virtual hosts in the README section.
@@ -6189,6 +6202,38 @@ Specifies whether to validate the configuration file before notifying the Apache
 
 Default value: `true`
 
+##### `owner`
+
+Data type: `Any`
+
+File owner of configuration file
+
+Default value: `undef`
+
+##### `group`
+
+Data type: `Any`
+
+File group of configuration file
+
+Default value: `undef`
+
+##### `file_mode`
+
+Data type: `Any`
+
+File mode of configuration file
+
+Default value: `undef`
+
+##### `show_diff`
+
+Data type: `Boolean`
+
+show_diff property for configuration file resource
+
+Default value: `true`
+
 ### apache::fastcgi::server
 
 Defines one or more external FastCGI servers to handle specific file types. Use this
@@ -9122,6 +9167,15 @@ which allows you to configure how the server determines it's own name and port.
 
 Default value: `undef`
 
+##### `define`
+
+Data type: `Hash`
+
+this lets you define configuration variables inside a vhost using [`Define`](https://httpd.apache.org/docs/2.4/mod/core.html#define),
+these can then be used to replace configuration values. All Defines are Undefined at the end of the VirtualHost.
+
+Default value: {}
+
 ##### `proxy_requests`
 
 Data type: `Boolean`
diff --git a/metadata.json b/metadata.json
index 8becadf075..302ebcad7f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 66637ce3a9c5e71f1e49ab37ca920ebfe7a8ef56 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Fri, 1 Nov 2019 16:48:52 +0000
Subject: [PATCH 1570/2267] (FM-8634) ensure encrypted communication for
 fixtures

---
 .fixtures.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 4fe91b89c8..c7abf0e1ab 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,13 +1,13 @@
 fixtures:
   repositories:
-    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
-    facts: 'git://github.com/puppetlabs/puppetlabs-facts.git'
-    portage: "git://github.com/gentoo/puppet-portage.git"
-    provision: 'git://github.com/puppetlabs/provision.git'
-    puppet_agent: 'git://github.com/puppetlabs/puppetlabs-puppet_agent.git'
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
+    facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
+    portage: "https://github.com/gentoo/puppet-portage.git"
+    provision: 'https://github.com/puppetlabs/provision.git'
+    puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
+    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     yumrepo_core: 
-      repo: "git://github.com/puppetlabs/puppetlabs-yumrepo_core.git"
+      repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git"
       puppet_version: '>= 6.0.0'
   symlinks:
     apache: "#{source_dir}"

From 708fd50b69556a0d9f91a4c9fe2601b541f43964 Mon Sep 17 00:00:00 2001
From: Glenn Sarti <glennsarti@users.noreply.github.com>
Date: Tue, 5 Nov 2019 13:09:19 +0800
Subject: [PATCH 1571/2267] (PDK-1501) Fix acceptance stages in Travis CI

Previously the Travis CI file was brought under PDK control, however the
sync.yml did not contain the stage settings for the Litmus jobs which meant
that they did not run.  This commit fixes that error and runs PDK Update again
---
 .sync.yml   | 4 ++++
 .travis.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index 0bbf256f95..9ab36105c7 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -22,6 +22,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
@@ -36,6 +37,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
@@ -49,6 +51,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
@@ -62,6 +65,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
 
   secure: ""
   branches:
diff --git a/.travis.yml b/.travis.yml
index 78e791e859..a4a48cc86b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
@@ -54,6 +55,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
@@ -63,6 +65,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
@@ -72,6 +75,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
 branches:
   only:

From 6d6b99f23995a7c621f106172b07a6525d54c25b Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Wed, 6 Nov 2019 17:45:13 +0200
Subject: [PATCH 1572/2267] FM-8499 - remove ubuntu14 support

---
 metadata.json  | 1 -
 provision.yaml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/metadata.json b/metadata.json
index 302ebcad7f..ede7c062cf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -68,7 +68,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04"
       ]
diff --git a/provision.yaml b/provision.yaml
index dea17c2977..08a9f09da2 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -4,7 +4,7 @@ default:
   images: ['waffleimage/debian8']
 travis_deb:
   provisioner: docker
-  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
 travis_el7:
   provisioner: docker
   images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
@@ -13,4 +13,4 @@ vagrant:
   images: ['centos/7', 'generic/ubuntu1804']
 release_checks:
   provisioner: vmpooler
-  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From 3ecb3201d249bb60e8a6072b0573bf62edb8400a Mon Sep 17 00:00:00 2001
From: Simon Hoenscheid <sh@example42.com>
Date: Mon, 11 Nov 2019 16:30:32 +0100
Subject: [PATCH 1573/2267] move unless into manage_security_corerules

---
 manifests/mod/security.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 5f51bbb45f..683fad0be5 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -229,10 +229,10 @@
       require => File[$modsec_dir],
       notify  => Class['apache::service'],
     }
-  }
 
-  # Debian 9 has a different rule setup
-  unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
-    apache::security::rule_link { $activated_rules: }
+    # Debian 9 has a different rule setup
+    unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
+      apache::security::rule_link { $activated_rules: }
+    }
   }
 }

From 2926250d8c8e706436d0895b7db68a8e9cba8e0f Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Tue, 5 Nov 2019 13:46:55 +0000
Subject: [PATCH 1574/2267] (FM-8721) fix php version on redhat8

---
 manifests/mod/ssl.pp            |  2 +-
 manifests/params.pp             |  5 +++-
 spec/acceptance/mod_php_spec.rb |  4 ++++
 spec/acceptance/vhost_spec.rb   |  4 ++--
 spec/classes/mod/php_spec.rb    | 41 ++++++++++++---------------------
 5 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 3bea4a780e..240b4ff616 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -85,7 +85,7 @@
   $ssl_ca                                                   = undef,
   $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
-  $ssl_protocol                                             = [ 'all', '-SSLv2', '-SSLv3' ],
+  $ssl_protocol                                             = ['all'],   # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
   Array $ssl_proxy_protocol                                 = [],
   $ssl_pass_phrase_dialog                                   = 'builtin',
   $ssl_random_seed_bytes                                    = '512',
diff --git a/manifests/params.pp b/manifests/params.pp
index 1053d86d1d..9ae363c0da 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -195,7 +195,10 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
-    $php_version          = '5'
+    $php_version = $facts['operatingsystemmajrelease'] ? {
+        '8'     => '7', # RedHat8
+        default => '5', # RedHat5, RedHat6, RedHat7 
+      }
     $mod_packages         = {
       # NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
       'auth_cas'              => 'mod_auth_cas',
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 1bc06014ed..778c1be1f6 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -35,6 +35,10 @@ class { 'apache::mod::php': }
         describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
+      elsif os[:family] == 'redhat' && os[:release] =~ %r{^8}
+        describe file("#{apache_hash['mod_dir']}/php7.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
       else
         describe file("#{apache_hash['mod_dir']}/php5.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 70cadc33e4..04dcb597af 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -49,7 +49,7 @@ class { 'apache': }
     end
   end
 
-  context 'default vhost with ssl' do
+  context 'default vhost with ssl', unless: (os[:family] =~ %r{redhat} && os[:release].to_i == 8) do
     pp = <<-MANIFEST
       file { '#{apache_hash['run_dir']}':
         ensure  => 'directory',
@@ -752,7 +752,7 @@ class { 'apache': }
     end
   end
 
-  describe 'parameter tests' do
+  describe 'parameter tests', unless: (os[:family] =~ %r{redhat} && os[:release].to_i == 8) do
     pp = <<-MANIFEST
       class { 'apache': }
       host { 'test.itk': ip => '127.0.0.1' }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index e4a654ff31..b60a18db36 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -86,13 +86,10 @@
             end
 
             it { is_expected.to contain_class('apache::params') }
-            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
-            it {
-              is_expected.to contain_file('php5.load').with(
-                content: "LoadModule php5_module modules/libphp5.so\n",
-              )
-            }
+            it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
+            it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with alternative package name' do
             let :pre_condition do
@@ -112,11 +109,8 @@
               { path: 'alternative-path' }
             end
 
-            it {
-              is_expected.to contain_file('php5.load').with(
-                content: "LoadModule php5_module alternative-path\n",
-              )
-            }
+            it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module alternative-path\n") } if facts[:os]['release']['major'].to_i < 8
+            it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module alternative-path\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with alternative extensions' do
             let :pre_condition do
@@ -128,7 +122,7 @@
               }
             end
 
-            it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) }
+            it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) } if facts[:os]['release']['major'].to_i < 8
           end
           if facts[:os]['release']['major'].to_i > 5
             context 'with specific version' do
@@ -149,13 +143,10 @@
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
-            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
-            it {
-              is_expected.to contain_file('php5.load').with(
-                content: "LoadModule php5_module modules/libphp5.so\n",
-              )
-            }
+            it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
+            it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with mpm_module => itk' do
             let :pre_condition do
@@ -164,13 +155,10 @@
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::itk') }
-            it { is_expected.to contain_apache__mod('php5') }
+            it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
-            it {
-              is_expected.to contain_file('php5.load').with(
-                content: "LoadModule php5_module modules/libphp5.so\n",
-              )
-            }
+            it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
+            it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
         end
       when 'FreeBSD'
@@ -215,9 +203,10 @@
         end
       end
 
-      # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu
+      # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
       next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
-              (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian')
+              (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
+              (facts[:os]['release']['major'].to_i >= 8 && facts[:os]['name'] == 'RedHat')
 
       describe 'OS independent tests' do
         context 'with content param' do

From d8b836cc1cc1eba068e9f0f1d79df86fa66a2d0d Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Thu, 14 Nov 2019 14:12:30 +0000
Subject: [PATCH 1575/2267] (FM-8672) - Addition of Support for CentOS 8

---
 metadata.json  | 3 ++-
 provision.yaml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index ede7c062cf..b8f15c620f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -32,7 +32,8 @@
       "operatingsystemrelease": [
         "5",
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
diff --git a/provision.yaml b/provision.yaml
index 08a9f09da2..33eefbc524 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -13,4 +13,4 @@ vagrant:
   images: ['centos/7', 'generic/ubuntu1804']
 release_checks:
   provisioner: vmpooler
-  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From 25f6a9e7b7e73a9da546f63717dc975c28ee7e0f Mon Sep 17 00:00:00 2001
From: Greg Cox <gcox@mozilla.com>
Date: Fri, 8 Nov 2019 18:45:47 +0000
Subject: [PATCH 1576/2267] Change mod_proxy's ProxyTimeout to follow Apache's
 global timeout by default

---
 manifests/mod/proxy.pp       | 2 +-
 templates/mod/proxy.conf.erb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index b5c7a381a4..c6c266b25a 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -27,7 +27,7 @@
   $apache_version = undef,
   $package_name   = undef,
   $proxy_via      = 'On',
-  $proxy_timeout  = '60',
+  $proxy_timeout  = $::apache::timeout,
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index f3114fdb55..f9dee733f9 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -25,5 +25,7 @@
   # Set to one of: Off | On | Full | Block
   ProxyVia <%= @proxy_via %>
 
+  <%- if @proxy_timeout -%>
   ProxyTimeout <%= @proxy_timeout %>
+  <%- end -%>
 </IfModule>

From fe7a6f404e524fb1ca9687fef7c542913577436c Mon Sep 17 00:00:00 2001
From: Greg Cox <gcox@mozilla.com>
Date: Wed, 20 Nov 2019 17:40:46 +0000
Subject: [PATCH 1577/2267] Remove double-colons before apache parameter

---
 manifests/mod/proxy.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index c6c266b25a..a2c8316c9e 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -27,7 +27,7 @@
   $apache_version = undef,
   $package_name   = undef,
   $proxy_via      = 'On',
-  $proxy_timeout  = $::apache::timeout,
+  $proxy_timeout  = $apache::timeout,
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)

From 8bd713881241fe9eaea9eca15f41f224230088d2 Mon Sep 17 00:00:00 2001
From: Greg Cox <gcox@mozilla.com>
Date: Wed, 20 Nov 2019 17:53:16 +0000
Subject: [PATCH 1578/2267] Updating proxy per suggestions in #1975

---
 manifests/mod/proxy.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index a2c8316c9e..154898acbe 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -27,9 +27,10 @@
   $apache_version = undef,
   $package_name   = undef,
   $proxy_via      = 'On',
-  $proxy_timeout  = $apache::timeout,
+  $proxy_timeout  = undef,
 ) {
   include ::apache
+  $_proxy_timeout = $apache::timeout
   $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'proxy':
     package => $package_name,

From d97bce770089206157268d05a998a8c4761c6f84 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Thu, 21 Nov 2019 17:17:50 +0000
Subject: [PATCH 1579/2267] (maint) sort and canonicalise .sync.yml

---
 .sync.yml | 158 +++++++++++++++++++++++++-----------------------------
 1 file changed, 73 insertions(+), 85 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 9ab36105c7..ccd6ab7053 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,95 +1,83 @@
 ---
-.gitlab-ci.yml:
-  unmanaged: true
-
-.gitignore:
+".gitignore":
   required:
-    - ---.project
-
-.travis.yml:
+  - "---.project"
+".gitlab-ci.yml":
+  unmanaged: true
+".rubocop.yml":
+  default_configs:
+    inherit_from: ".rubocop_todo.yml"
+".travis.yml":
   includes:
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORMS=deb_puppet5
-      rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_deb]'
-      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
-      services: docker
-      sudo: required
-      stage: acceptance
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORMS=deb_puppet6
-      rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_deb]'
-      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
-      services: docker
-      sudo: required
-      stage: acceptance
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORMS=el7_puppet5
-      rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_el7]'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
-      services: docker
-      sudo: required
-      stage: acceptance
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORMS=el7_puppet6
-      rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_el7]'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
-      services: docker
-      sudo: required
-      stage: acceptance
-
-  secure: ""
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=deb_puppet5
+    rvm: 2.5.3
+    before_script:
+    - bundle exec rake 'litmus:provision_list[travis_deb]'
+    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
+    - bundle exec rake 'litmus:install_agent[puppet5]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    sudo: required
+    stage: acceptance
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=deb_puppet6
+    rvm: 2.5.3
+    before_script:
+    - bundle exec rake 'litmus:provision_list[travis_deb]'
+    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
+    - bundle exec rake 'litmus:install_agent[puppet6]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    sudo: required
+    stage: acceptance
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=el7_puppet5
+    rvm: 2.5.3
+    before_script:
+    - bundle exec rake 'litmus:provision_list[travis_el7]'
+    - bundle exec rake 'litmus:install_agent[puppet5]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    sudo: required
+    stage: acceptance
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=el7_puppet6
+    rvm: 2.5.3
+    before_script:
+    - bundle exec rake 'litmus:provision_list[travis_el7]'
+    - bundle exec rake 'litmus:install_agent[puppet6]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    sudo: required
+    stage: acceptance
+  secure: ''
   branches:
-    - release
-
+  - release
+appveyor.yml:
+  delete: true
 Gemfile:
   optional:
-    ':development':
-      - gem: 'github_changelog_generator'
-        git: 'https://github.com/skywinder/github-changelog-generator'
-        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
-
+    ":development":
+    - gem: github_changelog_generator
+      git: https://github.com/skywinder/github-changelog-generator
+      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
+      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 Rakefile:
   requires:
-    - puppet-lint/tasks/puppet-lint
-
-appveyor.yml:
-  delete: true
-
-.rubocop.yml:
-  default_configs:
-    inherit_from: .rubocop_todo.yml
-
+  - puppet-lint/tasks/puppet-lint
 spec/spec_helper.rb:
-  mock_with: ':rspec'
+  mock_with: ":rspec"
   coverage_report: true

From 18ca5b8581d5451524f1bb3fa5f90481e3effad1 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Thu, 21 Nov 2019 17:18:40 +0000
Subject: [PATCH 1580/2267] (maint) mark .gitlab-ci.yml as deleted

---
 .sync.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.sync.yml b/.sync.yml
index ccd6ab7053..6e7170eb16 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -3,7 +3,7 @@
   required:
   - "---.project"
 ".gitlab-ci.yml":
-  unmanaged: true
+  delete: true
 ".rubocop.yml":
   default_configs:
     inherit_from: ".rubocop_todo.yml"

From 42a477a1f10ca74426d49f80a674db2af2c06a3c Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Thu, 21 Nov 2019 18:06:18 +0000
Subject: [PATCH 1581/2267] (maint) remove obsolete gepetto .project files

---
 .project  | 23 -----------------------
 .sync.yml |  3 ---
 2 files changed, 26 deletions(-)
 delete mode 100644 .project

diff --git a/.project b/.project
deleted file mode 100644
index 51770ab1ca..0000000000
--- a/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>puppetlabs-apache</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/.sync.yml b/.sync.yml
index 6e7170eb16..aaea33fe0a 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,7 +1,4 @@
 ---
-".gitignore":
-  required:
-  - "---.project"
 ".gitlab-ci.yml":
   delete: true
 ".rubocop.yml":

From e19aa7fcbb90e724469651e0937049be543655fb Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Thu, 21 Nov 2019 18:16:13 +0000
Subject: [PATCH 1582/2267] (maint) update gitignore and pdkignore for .project
 file removal

---
 .gitignore | 1 +
 .pdkignore | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3f4e2e8494..2767022cd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,6 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.project
 .envrc
 /inventory.yaml
diff --git a/.pdkignore b/.pdkignore
index 54d2cda3ab..e6215cd0cb 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -22,6 +22,7 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.project
 .envrc
 /inventory.yaml
 /appveyor.yml

From a0a03f82c2c20ef4c3e28cb832ede0f0fd950936 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 25 Nov 2019 18:25:27 +0000
Subject: [PATCH 1583/2267] (maint) enable simplecov for ruby codecoverage
 testing

---
 .sync.yml   | 1 +
 .travis.yml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index aaea33fe0a..dc64759378 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -63,6 +63,7 @@
   secure: ''
   branches:
   - release
+  simplecov: true
 appveyor.yml:
   delete: true
 Gemfile:
diff --git a/.travis.yml b/.travis.yml
index a4a48cc86b..d4ab1a4b9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ before_install:
   - gem --version
   - bundle -v
 script:
-  - 'bundle exec rake $CHECK'
+  - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
@@ -34,9 +34,6 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
       rvm: 2.5.3
       stage: spec
-    -
-      env: DEPLOY_TO_FORGE=yes
-      stage: deploy
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
@@ -77,6 +74,9 @@ matrix:
       services: docker
       stage: acceptance
       sudo: required
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
 branches:
   only:
     - master

From 0fdb582385b259485d37209667f11e34ea83bee8 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 27 Nov 2019 18:31:35 +0000
Subject: [PATCH 1584/2267] (maint) Update to PDK 1.14.1

---
 Gemfile       | 1 -
 metadata.json | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index f7560c1626..0e395e7ecb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,4 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-gem 'pdk', git: 'https://github.com/puppetlabs/pdk.git', branch: 'master'
 
 def location_for(place_or_version, fake_version = nil)
   git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
diff --git a/metadata.json b/metadata.json
index b8f15c620f..0ade146448 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,7 +81,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.14.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates/#master",
-  "template-ref": "heads/master-0-g0b5b39b"
+  "pdk-version": "1.14.1",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
+  "template-ref": "heads/master-0-gfaf9e8b"
 }

From b5552d38bb978af10628e7d9ec07f123aeb95afc Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@example42.com>
Date: Fri, 29 Nov 2019 11:43:36 +0100
Subject: [PATCH 1585/2267] When using mod jk, we expect the libapache2-mod-jk
 package to be installed

---
 manifests/params.pp         | 3 +++
 spec/classes/mod/jk_spec.rb | 1 +
 2 files changed, 4 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index 9ae363c0da..5e89fc4d28 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -351,6 +351,7 @@
         'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+        'jk'                    => 'libapache2-mod-jk',
         'lookup_identity'       => 'libapache2-mod-lookup-identity',
         'nss'                   => 'libapache2-mod-nss',
         'pagespeed'             => 'mod-pagespeed-stable',
@@ -382,6 +383,7 @@
         'fastcgi'               => 'libapache2-mod-fastcgi',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+        'jk'                    => 'libapache2-mod-jk',
         'lookup_identity'       => 'libapache2-mod-lookup-identity',
         'nss'                   => 'libapache2-mod-nss',
         'pagespeed'             => 'mod-pagespeed-stable',
@@ -409,6 +411,7 @@
         'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+        'jk'                    => 'libapache2-mod-jk',
         'lookup_identity'       => 'libapache2-mod-lookup-identity',
         'nss'                   => 'libapache2-mod-nss',
         'pagespeed'             => 'mod-pagespeed-stable',
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index d253c2f984..a8a4d5b9e2 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -114,6 +114,7 @@
     it_behaves_like 'minimal resources', mod_dir
     it_behaves_like 'specific workers_file', mod_dir
     it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
+    it { is_expected.to contain_package('libapache2-mod-jk') }
     it {
       verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
     }

From 3faf03664f0dfd40d96a10b863a8f662972c283a Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 4 Dec 2019 16:01:03 +0100
Subject: [PATCH 1586/2267] Add an apache::vhost::fragment define

The apache::vhost::fragment define allows adding fragments to an
existing vhost. This is easier than using the custom_fragment property,
especially when one class defines the vhost and another class wants to
add add some content to that.
---
 manifests/vhost/fragment.pp         |  80 +++++++++++++++++++
 spec/defines/vhost_fragment_spec.rb | 117 ++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+)
 create mode 100644 manifests/vhost/fragment.pp
 create mode 100644 spec/defines/vhost_fragment_spec.rb

diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
new file mode 100644
index 0000000000..e5b33184b0
--- /dev/null
+++ b/manifests/vhost/fragment.pp
@@ -0,0 +1,80 @@
+# @summary Define a fragment within a vhost
+#
+# @param vhost
+#   The title of the vhost resource to append to
+#
+# @param priority
+#   Set the priority to match the one `apache::vhost` sets. This must match the
+#   one `apache::vhost` sets or else the concat fragment won't be found.
+#
+# @param content
+#   The content to put in the fragment. Only when it's non-empty the actual
+#   fragment will be created.
+#
+# @param order
+#   The order to insert the fragment at
+#
+# @example With a vhost without priority
+#   include apache
+#   apache::vhost { 'myvhost':
+#   }
+#   apache::vhost::fragment { 'myfragment':
+#     vhost   => 'myvhost',
+#     content => '# Foo',
+#   }
+#
+# @example With a vhost with priority
+#   include apache
+#   apache::vhost { 'myvhost':
+#     priority => '42',
+#   }
+#   apache::vhost::fragment { 'myfragment':
+#     vhost    => 'myvhost',
+#     priority => '42',
+#     content  => '# Foo',
+#   }
+#
+# @example With a vhost with default vhost
+#   include apache
+#   apache::vhost { 'myvhost':
+#     default_vhost => true,
+#   }
+#   apache::vhost::fragment { 'myfragment':
+#     vhost    => 'myvhost',
+#     priority => '10', # default_vhost implies priority 10
+#     content  => '# Foo',
+#   }
+#
+# @example Adding a fragment to the built in default vhost
+#   include apache
+#   apache::vhost::fragment { 'myfragment':
+#     vhost    => 'default',
+#     priority => '15',
+#     content  => '# Foo',
+#   }
+#
+define apache::vhost::fragment(
+  String[1] $vhost,
+  $priority = undef,
+  Optional[String] $content = undef,
+  Integer[0] $order = 900,
+) {
+  # This copies the logic from apache::vhost
+  if $priority {
+    $priority_real = "${priority}-"
+  } elsif $priority == false {
+    $priority_real = ''
+  } else {
+    $priority_real = '25-'
+  }
+
+  $filename = regsubst($vhost, ' ', '_', 'G')
+
+  if $content =~ String[1] {
+    concat::fragment { "${vhost}-${title}":
+      target  => "${priority_real}${filename}.conf",
+      order   => $order,
+      content => $content,
+    }
+  }
+}
diff --git a/spec/defines/vhost_fragment_spec.rb b/spec/defines/vhost_fragment_spec.rb
new file mode 100644
index 0000000000..2db780d213
--- /dev/null
+++ b/spec/defines/vhost_fragment_spec.rb
@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+describe 'apache::vhost::fragment' do
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+      let(:title) { 'myfragment' }
+
+      context 'adding to the default vhost' do
+        let(:pre_condition) { 'include apache' }
+
+        let(:params) do
+          {
+            vhost: 'default',
+            priority: '15',
+          }
+        end
+
+        context 'with content' do
+          let(:params) { super().merge(content: '# Foo') }
+
+          it 'creates a vhost concat fragment' do
+            is_expected.to compile.with_all_deps
+            is_expected.to contain_concat('15-default.conf')
+            is_expected.to create_concat__fragment('default-myfragment')
+              .with_target('15-default.conf')
+              .with_order(900)
+              .with_content('# Foo')
+          end
+        end
+
+        context 'without content' do
+          let(:params) { super().merge(content: '') }
+
+          it 'does not create a vhost concat fragment' do
+            is_expected.to compile.with_all_deps
+            is_expected.to contain_concat('15-default.conf')
+            is_expected.not_to contain_concat__fragment('default-myfragment')
+          end
+        end
+      end
+
+      context 'adding to a custom vhost' do
+        let(:params) do
+          {
+            vhost: 'custom',
+            content: '# Foo',
+          }
+        end
+
+        context 'with priority => false' do
+          let(:params) { super().merge(priority: false) }
+          let(:pre_condition) do
+            <<-PUPPET
+            include apache
+            apache::vhost { 'custom':
+              docroot  => '/path/to/docroot',
+              priority => false,
+            }
+            PUPPET
+          end
+
+          it 'creates a vhost concat fragment' do
+            is_expected.to compile.with_all_deps
+            is_expected.to contain_concat('custom.conf')
+            is_expected.to create_concat__fragment('custom-myfragment')
+              .with_target('custom.conf')
+              .with_order(900)
+              .with_content('# Foo')
+          end
+        end
+
+        context 'with priority => 42' do
+          let(:params) { super().merge(priority: '42') }
+          let(:pre_condition) do
+            <<-PUPPET
+            include apache
+            apache::vhost { 'custom':
+              docroot  => '/path/to/docroot',
+              priority => '42',
+            }
+            PUPPET
+          end
+
+          it 'creates a vhost concat fragment' do
+            is_expected.to compile.with_all_deps
+            is_expected.to contain_concat('42-custom.conf')
+            is_expected.to create_concat__fragment('custom-myfragment')
+              .with_target('42-custom.conf')
+              .with_order(900)
+              .with_content('# Foo')
+          end
+        end
+
+        context 'with default priority' do
+          let(:pre_condition) do
+            <<-PUPPET
+            include apache
+            apache::vhost { 'custom':
+              docroot  => '/path/to/docroot',
+            }
+            PUPPET
+          end
+
+          it 'creates a vhost concat fragment' do
+            is_expected.to compile.with_all_deps
+            is_expected.to contain_concat('25-custom.conf')
+            is_expected.to create_concat__fragment('custom-myfragment')
+              .with_target('25-custom.conf')
+              .with_order(900)
+              .with_content('# Foo')
+          end
+        end
+      end
+    end
+  end
+end

From 2f4175ab2a819c62a9c46cf07234d8219e57a6ca Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Fri, 6 Dec 2019 11:24:25 +0000
Subject: [PATCH 1587/2267] MODULES-10242 Add ubuntu14 support back to the
 modules

---
 metadata.json  | 1 +
 provision.yaml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index 0ade146448..b8a0909228 100644
--- a/metadata.json
+++ b/metadata.json
@@ -69,6 +69,7 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
+        "14.04",
         "16.04",
         "18.04"
       ]
diff --git a/provision.yaml b/provision.yaml
index 33eefbc524..d01b85372a 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -4,7 +4,7 @@ default:
   images: ['waffleimage/debian8']
 travis_deb:
   provisioner: docker
-  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
 travis_el7:
   provisioner: docker
   images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
@@ -13,4 +13,4 @@ vagrant:
   images: ['centos/7', 'generic/ubuntu1804']
 release_checks:
   provisioner: vmpooler
-  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From 5447ba0df254174563feaa1befac5a49921c21fa Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Fri, 6 Dec 2019 14:38:59 +0000
Subject: [PATCH 1588/2267] MODULES-10236 disable deploy_to_forge for the
 module

---
 .sync.yml     | 2 ++
 .travis.yml   | 6 ------
 metadata.json | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index dc64759378..bcab526cff 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -5,6 +5,8 @@
   default_configs:
     inherit_from: ".rubocop_todo.yml"
 ".travis.yml":
+  deploy_to_forge:
+    enabled: false
   includes:
   - bundler_args: 
     dist: trusty
diff --git a/.travis.yml b/.travis.yml
index d4ab1a4b9f..b09bc91a69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,6 @@ stages:
   - static
   - spec
   - acceptance
-  -
-    if: tag =~ ^v\d
-    name: deploy
 matrix:
   fast_finish: true
   include:
@@ -74,9 +71,6 @@ matrix:
       services: docker
       stage: acceptance
       sudo: required
-    -
-      env: DEPLOY_TO_FORGE=yes
-      stage: deploy
 branches:
   only:
     - master
diff --git a/metadata.json b/metadata.json
index b8a0909228..6b4f904ee9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -84,5 +84,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.14.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-gfaf9e8b"
+  "template-ref": "heads/master-0-g643529a"
 }

From f1ba113096f6c52b7908ed2b16840664de2af655 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Thu, 28 Nov 2019 14:31:04 +0200
Subject: [PATCH 1589/2267] Add Github Actions release workflow

---
 .github/workflows/release.yml | 52 +++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..820339d7b2
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,52 @@
+name: "release"
+
+on: 
+  push:
+    branches:
+      - 'release'
+
+jobs:
+  LitmusAcceptance:
+
+    runs-on: self-hosted
+
+    strategy:
+      matrix:
+        ruby_version: [2.5.x]
+        puppet_gem_version: [~> 6.0]
+        platform: [release_checks]
+        agent_family: ['puppet5', 'puppet6']
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Litmus Parallel
+      uses: puppetlabs/action-litmus_parallel@master
+      with:
+        platform: ${{ matrix.platform }}
+        agent_family: ${{ matrix.agent_family }}
+
+  Spec:
+    runs-on: self-hosted
+
+    strategy:
+      matrix:
+        check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
+        ruby_version: [2.4.x, 2.5.x]
+        puppet_gem_version: [~> 5.0, ~> 6.0]
+        exclude:
+        - puppet_gem_version: ~> 5.0
+          check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
+        - ruby_version: 2.4.x
+          puppet_gem_version: ~> 6.0
+        - ruby_version: 2.5.x
+          puppet_gem_version: ~> 5.0
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Spec Tests
+      uses: puppetlabs/action-litmus_spec@master
+      with:
+        puppet_gem_versionm: ${{ matrix.puppet_gem_version }}
+        check: ${{ matrix.check }}

From f5562878b0786d23c199802ba6c54e0b7b1509f6 Mon Sep 17 00:00:00 2001
From: Bernhard Frauendienst <puppet@nospam.obeliks.de>
Date: Tue, 10 Dec 2019 12:35:18 +0100
Subject: [PATCH 1590/2267] Fix newline being added before proxy params

When a proxy_pass with additional params is defined within a location
block, the params were appended in a new line.
---
 spec/defines/vhost_spec.rb       | 19 +++++++++++++++++++
 templates/vhost/_directories.erb |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index e60173e004..99c950f041 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -188,6 +188,20 @@
                   'provider'            => 'location',
                   'auth_ldap_referrals' => 'off',
                 },
+                {
+                  'path'       => '/proxy',
+                  'provider'   => 'location',
+                  'proxy_pass' => [
+                    {
+                      'url'             => 'http://backend-b/',
+                      'keywords'        => ['noquery', 'interpolate'],
+                      'params' => {
+                        'retry'   => '0',
+                        'timeout' => '5',
+                      },
+                    },
+                  ],
+                },
                 {
                   'path'                                                => '/var/www/node-app/public',
                   'passenger_enabled'                                   => true,
@@ -611,6 +625,11 @@
               content: %r{^\s+LDAPReferrals off$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+ProxyPass http://backend-b/ retry=0 timeout=5 noquery interpolate$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$},
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 0025d29cd1..bb95ac14ef 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -460,7 +460,7 @@
     <%- end -%>
     <%- if directory['proxy_pass'] and directory['provider'] and directory['provider'].match('location') -%>
       <%- directory['proxy_pass'].flatten.compact.each do |proxy| -%>
-    ProxyPass <%= proxy['url'] %>
+    ProxyPass <%= proxy['url'] -%>
         <%- if proxy['params'] -%>
           <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
           <%- end -%>

From d92d48266b7e5f6fd0ec66f9eb54a342a3000dcf Mon Sep 17 00:00:00 2001
From: Molly Waggett <mwaggett@alumni.reed.edu>
Date: Tue, 10 Dec 2019 10:14:00 -0800
Subject: [PATCH 1591/2267] (maint) Remove MAINTAINERS file

---
 MAINTAINERS.md | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 MAINTAINERS.md

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
deleted file mode 100644
index 18a33881e0..0000000000
--- a/MAINTAINERS.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Maintenance
-
-Maintainers:
-  - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
-
-Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `apache`.

From 84c8cfdaf9b815c2984b7a1f49489fdc9d45548f Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Wed, 11 Dec 2019 12:25:53 +0000
Subject: [PATCH 1592/2267] Release version 5.3.0

---
 CHANGELOG.md  | 17 +++++++++++++++++
 REFERENCE.md  |  9 +++++++--
 metadata.json |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7015121f5..147aa7de43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.3.0) (2019-12-11)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.2.0...v5.3.0)
+
+### Added
+
+- \(FM-8672\) - Addition of Support for CentOS 8 [\#1977](https://github.com/puppetlabs/puppetlabs-apache/pull/1977) ([david22swan](https://github.com/david22swan))
+- \(MODULES-9948\) Allow switching of thread modules [\#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
+
+### Fixed
+
+- Fix newline being added before proxy params [\#1984](https://github.com/puppetlabs/puppetlabs-apache/pull/1984) ([oxc](https://github.com/oxc))
+- When using mod jk, we expect the libapache2-mod-jk package to be installed [\#1979](https://github.com/puppetlabs/puppetlabs-apache/pull/1979) ([tuxmea](https://github.com/tuxmea))
+- move unless into manage\_security\_corerules [\#1976](https://github.com/puppetlabs/puppetlabs-apache/pull/1976) ([SimonHoenscheid](https://github.com/SimonHoenscheid))
+- Change mod\_proxy's ProxyTimeout to follow Apache's global timeout [\#1975](https://github.com/puppetlabs/puppetlabs-apache/pull/1975) ([gcoxmoz](https://github.com/gcoxmoz))
+- \(FM-8721\) fix php version and ssl error on redhat8 [\#1973](https://github.com/puppetlabs/puppetlabs-apache/pull/1973) ([sheenaajay](https://github.com/sheenaajay))
+
 ## [v5.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.2.0) (2019-11-01)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.1.0...v5.2.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 42463257af..9ecd848a8f 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -95,6 +95,7 @@ _Public Classes_
 * [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
 * [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
 * [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event): 
+* [`apache::mpm::disable_mpm_prefork`](#apachempmdisable_mpm_prefork): 
 * [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker): 
 * [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
 
@@ -4737,7 +4738,7 @@ Data type: `Any`
 
 Network timeout for proxied requests.
 
-Default value: '60'
+Default value: `undef`
 
 ### apache::mod::proxy_ajp
 
@@ -5452,7 +5453,7 @@ Data type: `Any`
 
 Configure usable SSL/TLS protocol versions.
 
-Default value: [ 'all', '-SSLv2', '-SSLv3' ]
+Default value: ['all']
 
 ##### `ssl_proxy_protocol`
 
@@ -5949,6 +5950,10 @@ for additional documentation.
 
 The apache::mpm::disable_mpm_event class.
 
+### apache::mpm::disable_mpm_prefork
+
+The apache::mpm::disable_mpm_prefork class.
+
 ### apache::mpm::disable_mpm_worker
 
 The apache::mpm::disable_mpm_worker class.
diff --git a/metadata.json b/metadata.json
index 6b4f904ee9..f494d022e6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 41388eb8fc3f2a18bdefb2c89c63d03fbbd1d3a7 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 16 Dec 2019 20:14:39 +0000
Subject: [PATCH 1593/2267] (maint) update travis to not use bundle update
 --system

---
 .travis.yml   | 4 +++-
 metadata.json | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b09bc91a69..63ffa57b88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@ cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
-  - gem update --system $RUBYGEMS_VERSION
+  - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
+  - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
+  - '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
   - gem --version
   - bundle -v
 script:
diff --git a/metadata.json b/metadata.json
index f494d022e6..86c6cd363e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -82,7 +82,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.14.1",
+  "pdk-version": "1.15.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g643529a"
+  "template-ref": "heads/master-0-gcaed9d7"
 }

From 55ae61ee8a390a71268ab7152b0a046940594284 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 16 Dec 2019 20:57:21 +0000
Subject: [PATCH 1594/2267] (maint) update travis to notify puppet slack

---
 .sync.yml   | 3 +++
 .travis.yml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index bcab526cff..0c12b9a58a 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -66,6 +66,9 @@
   branches:
   - release
   simplecov: true
+  notifications:
+    slack:
+      secure: MrXQwGIUO7WNmLbe7iiWgURiZPUgyvDLkKe3d9S58ohE6gdN6pqlsjP8YgodK8JmIBV1zp5Wj/0cXUmY3xvCtnDmII0DCEk2Y1Cs/W1drKZtS/0BsUpJkj0rDP2fSlKsY5ifESdEta/y8+NkjRnqadbl7SQPYeek4IjAfxjjuig=
 appveyor.yml:
   delete: true
 Gemfile:
diff --git a/.travis.yml b/.travis.yml
index 63ffa57b88..f03c40ca82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,3 +80,5 @@ branches:
     - release
 notifications:
   email: false
+  slack:
+    secure: MrXQwGIUO7WNmLbe7iiWgURiZPUgyvDLkKe3d9S58ohE6gdN6pqlsjP8YgodK8JmIBV1zp5Wj/0cXUmY3xvCtnDmII0DCEk2Y1Cs/W1drKZtS/0BsUpJkj0rDP2fSlKsY5ifESdEta/y8+NkjRnqadbl7SQPYeek4IjAfxjjuig=

From 9f7f38ff21036c9a1ce4d669ccaea816941209ca Mon Sep 17 00:00:00 2001
From: Asier Aguado <asier.aguado@cern.ch>
Date: Fri, 13 Dec 2019 11:43:57 +0100
Subject: [PATCH 1595/2267] Add mod_auth_openidc to the supported modules

---
 manifests/mod/auth_openidc.pp         |  13 +++
 manifests/params.pp                   |   5 ++
 manifests/vhost.pp                    |  23 ++++++
 spec/classes/mod/auth_openidc_spec.rb |  89 ++++++++++++++++++++
 spec/defines/vhost_spec.rb            |  43 ++++++++++
 templates/vhost/_auth_oidc.erb        |   5 ++
 types/oidcsettings.pp                 | 112 ++++++++++++++++++++++++++
 7 files changed, 290 insertions(+)
 create mode 100644 manifests/mod/auth_openidc.pp
 create mode 100644 spec/classes/mod/auth_openidc_spec.rb
 create mode 100644 templates/vhost/_auth_oidc.erb
 create mode 100644 types/oidcsettings.pp

diff --git a/manifests/mod/auth_openidc.pp b/manifests/mod/auth_openidc.pp
new file mode 100644
index 0000000000..36337fd3c4
--- /dev/null
+++ b/manifests/mod/auth_openidc.pp
@@ -0,0 +1,13 @@
+# @summary
+#   Installs and configures `mod_auth_openidc`.
+# 
+# @see https://github.com/zmartzone/mod_auth_openidc for additional documentation.
+#
+class apache::mod::auth_openidc (
+) inherits ::apache::params {
+
+  include ::apache
+  include ::apache::mod::authz_user
+  apache::mod { 'auth_openidc': }
+
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index 5e89fc4d28..47081ef46c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -205,6 +205,7 @@
       'auth_kerb'             => 'mod_auth_kerb',
       'auth_gssapi'           => 'mod_auth_gssapi',
       'auth_mellon'           => 'mod_auth_mellon',
+      'auth_openidc'          => 'mod_auth_openidc',
       'authnz_ldap'           => $::apache::version::distrelease ? {
         '7'     => 'mod_ldap',
         default => 'mod_authz_ldap',
@@ -343,6 +344,7 @@
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',
         'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_openidc'          => 'libapache2-mod-auth-openidc',
         'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
@@ -376,6 +378,7 @@
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',
         'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_openidc'          => 'libapache2-mod-auth-openidc',
         'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
@@ -403,6 +406,7 @@
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',
         'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_openidc'          => 'libapache2-mod-auth-openidc',
         'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
@@ -578,6 +582,7 @@
       # NOTE: not sure where the shibboleth should come from
       'auth_kerb'   => 'www/mod_auth_kerb2',
       'auth_gssapi' => 'www/mod_auth_gssapi',
+      'auth_openidc'=> 'www/mod_auth_openidc',
       'fcgid'       => 'www/mod_fcgid',
       'passenger'   => 'www/rubygem-passenger',
       'perl'        => 'www/mod_perl2',
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index c743814151..9200e9ed6f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1626,6 +1626,12 @@
 #   this lets you define configuration variables inside a vhost using [`Define`](https://httpd.apache.org/docs/2.4/mod/core.html#define),
 #   these can then be used to replace configuration values. All Defines are Undefined at the end of the VirtualHost.
 #
+# @param auth_oidc
+#   Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
+#
+# @param oidc_settings
+#   An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf].
+#
 define apache::vhost(
   Variant[Boolean,String] $docroot,
   $manage_docroot                                                                   = true,
@@ -1855,6 +1861,8 @@
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name        = undef,
   Optional[Variant[String,Array[String]]] $comment                                  = undef,
   Hash $define                                                                      = {},
+  Boolean $auth_oidc                                                                = false,
+  Optional[Apache::OIDCSettings] $oidc_settings                                     = undef,
 ) {
 
   # The base class must be included first because it is used by parameter defaults
@@ -1901,6 +1909,10 @@
     include ::apache::mod::auth_kerb
   }
 
+  if $auth_oidc and $ensure == 'present' {
+    include ::apache::mod::auth_openidc
+  }
+
   if $virtual_docroot {
     include ::apache::mod::vhost_alias
   }
@@ -2716,6 +2728,17 @@
     }
   }
 
+  # Template uses:
+  # - $auth_oidc
+  # - $oidc_settings
+  if $auth_oidc {
+    concat::fragment { "${name}-auth_oidc":
+      target  => "${priority_real}${filename}.conf",
+      order   => 360,
+      content => template('apache/vhost/_auth_oidc.erb'),
+    }
+  }
+
   # Template uses:
   # - $shib_compat_valid_user
   if $shibboleth_enabled {
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
new file mode 100644
index 0000000000..3f1d640cc8
--- /dev/null
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+describe 'apache::mod::auth_openidc', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+
+  context 'default configuration with parameters' do
+    context 'on a Debian OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          lsbdistcodename: 'jessie',
+          osfamily: 'Debian',
+          operatingsystem: 'Debian',
+          operatingsystemrelease: '8',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_openidc') }
+      it { is_expected.to contain_package('libapache2-mod-auth-openidc') }
+    end
+    context 'on a RedHat OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_openidc') }
+      it { is_expected.to contain_package('mod_auth_openidc') }
+    end
+    context 'on a FreeBSD OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'FreeBSD',
+          osfamily: 'FreeBSD',
+          operatingsystem: 'FreeBSD',
+          operatingsystemrelease: '9',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('auth_openidc') }
+      it { is_expected.to contain_package('www/mod_auth_openidc') }
+    end
+  end
+  context 'overriding mod_packages' do
+    context 'on a RedHat OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '6',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+      let :pre_condition do
+        <<-MANIFEST
+        include apache::params
+        class { 'apache':
+          mod_packages => merge($::apache::params::mod_packages, {
+            'auth_openidc' => 'httpd24-mod_auth_openidc',
+          })
+        }
+        MANIFEST
+      end
+
+      it { is_expected.to contain_apache__mod('auth_openidc') }
+      it { is_expected.to contain_package('httpd24-mod_auth_openidc') }
+      it { is_expected.not_to contain_package('mod_auth_openidc') }
+    end
+  end
+end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 99c950f041..f40cfcccf5 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -458,6 +458,14 @@
               'max_keepalive_requests'      => '1000',
               'protocols'                   => ['h2', 'http/1.1'],
               'protocols_honor_order'       => true,
+              'auth_oidc'                   => true,
+              'oidc_settings'               => { 'ProviderMetadataURL'       => 'https://login.example.com/.well-known/openid-configuration',
+                                                 'ClientID'                  => 'test',
+                                                 'RedirectURI'               => 'https://login.example.com/redirect_uri',
+                                                 'ProviderTokenEndpointAuth' => 'client_secret_basic',
+                                                 'RemoteUserClaim'           => 'sub',
+                                                 'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
+                                                 'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
             }
           end
 
@@ -1378,6 +1386,41 @@
               content: %r{^\s+PassengerLveMinUid\s500$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+              content: %r{^\s+OIDCProviderMetadataURL\shttps:\/\/login.example.com\/\.well-known\/openid-configuration$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+              content: %r{^\s+OIDCClientID\stest$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+              content: %r{^\s+OIDCRedirectURI\shttps:\/\/login\.example.com\/redirect_uri$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+              content: %r{^\s+OIDCProviderTokenEndpointAuth\sclient_secret_basic$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+              content: %r{^\s+OIDCRemoteUserClaim\ssub$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+              content: %r{^\s+OIDCClientSecret\saae053a9-4abf-4824-8956-e94b2af335c8$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+              content: %r{^\s+OIDCCryptoPassphrase\s4ad1bb46-9979-450e-ae58-c696967df3cd$},
+            )
+          }
         end
         context 'vhost with multiple ip addresses' do
           let :params do
diff --git a/templates/vhost/_auth_oidc.erb b/templates/vhost/_auth_oidc.erb
new file mode 100644
index 0000000000..dd0faa429c
--- /dev/null
+++ b/templates/vhost/_auth_oidc.erb
@@ -0,0 +1,5 @@
+<% if @auth_oidc -%>
+<% @oidc_settings.each do |key, value| %>
+  OIDC<%= key %> <%= value -%>
+<% end %>
+<% end -%>
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
new file mode 100644
index 0000000000..4185258ac9
--- /dev/null
+++ b/types/oidcsettings.pp
@@ -0,0 +1,112 @@
+# https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
+type Apache::OIDCSettings = Struct[
+  {
+    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['CryptoPassphrase']                        => String,
+    Optional['MetadataDir']                             => String,
+    Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,
+    Optional['ProviderIssuer']                          => String,
+    Optional['ProviderAuthorizationEndpoint']           => Stdlib::HTTPSUrl,
+    Optional['ProviderJwksUri']                         => Stdlib::HTTPSUrl,
+    Optional['ProviderTokenEndpoint']                   => Stdlib::HTTPSUrl,
+    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','none'],
+    Optional['ProviderTokenEndpointParams']             => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
+    Optional['ProviderUserInfoEndpoint']                => Stdlib::HTTPSUrl,
+    Optional['ProviderCheckSessionIFrame']              => Stdlib::HTTPSUrl,
+    Optional['ProviderEndSessionEndpoint']              => Stdlib::HTTPSUrl,
+    Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
+    Optional['ProviderBackChannelLogoutSupported']      => Enum['On','Off'],
+    Optional['ProviderRegistrationEndpointJson']        => String,
+    Optional['Scope']                                   => Pattern['/^[A-Za-z0-9\-\._\s]+$/'],
+    Optional['AuthRequestParams']                       => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
+    Optional['SSLValidateServer']                       => Enum['On','Off'],
+    Optional['UserInfoRefreshInterval']                 => Integer,
+    Optional['JWKSRefreshInterval']                     => Interger,
+    Optional['UserInfoTokenMethod']                     => Enum['authz_header','post_param'],
+    Optional['ProviderAuthRequestMethod']               => Enum['GET','POST'],
+    Optional['PublicKeyFiles']                          => String,
+    Optional['ResponseType']                            => Enum['code','id_token','id_token token','code id_token','code token','code id_token token'],
+    Optional['ResponseMode']                            => Enum['fragment','query','form_post'],
+    Optional['ClientID']                                => String,
+    Optional['ClientSecret']                            => String,
+    Optional['ClientTokenEndpointCert']                 => String,
+    Optional['ClientTokenEndpointKey']                  => String,
+    Optional['ClientName']                              => String,
+    Optional['ClientContact']                           => String,
+    Optional['PKCDMethod']                              => Enum['plain','S256','referred_tb'],
+    Optional['TokenBindingPolicy']                      => Enum['disabled','optional','required','enforced'],
+    Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
+    Optional['IDTokenSignedResponseAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
+    Optional['UserInfoSignedResposeAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
+    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
+    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
+    Optional['OAuthServerMetadataURL']                  => Stdlib::HTTPSUrl,
+    Optional['AuthIntrospectionEndpoint']               => Stdlib::HTTPSUrl,
+    Optional['OAuthClientID']                           => String,
+    Optional['OAuthClientSecret']                       => String,
+    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','bearer_access_token','none'],
+    Optional['OAuthIntrospectionClientAuthBearerToken'] => String,
+    Optional['OAuthIntrospectionEndpointCert']          => String,
+    Optional['OAuthIntrospectionEndpointKey']           => String,
+    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST','GET'],
+    Optional['OAuthIntrospectionEndpointParams']        => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
+    Optional['OAuthIntrospectionTokenParamName']        => String,
+    Optional['OAuthTokenExpiryClaim']                   => Pattern['/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/'],
+    Optional['OAuthSSLValidateServer']                  => Enum['On','Off'],
+    Optional['OAuthVerifySharedKeys']                   => String,
+    Optional['OAuthVerifyCertFiles']                    => String,
+    Optional['OAuthVerifyJwksUri']                      => Stdlib::HTTPSUrl,
+    Optional['OAuthRemoteUserClaim']                    => String,
+    Optional['OAuthAcceptTokenAs']                      => Pattern['/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/'],
+    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled','optional','required','enforced'],
+    Optional['Cookie']                                  => String,
+    Optional['SessionCookieChunkSize']                  => Integer,
+    Optional['CookieHTTPOnly']                          => Enum['On','Off'],
+    Optional['CookieSameSite']                          => Enum['On','Off'],
+    Optional['PassCookies']                             => String,
+    Optional['StripCookies']                            => String,
+    Optional['StateMaxNumberOfCookies']                 => Pattern['/^[0-9]+\s(false|true)$/'],
+    Optional['SessionInactivityTimeout']                => Integer,
+    Optional['SessionMaxDuration']                      => Integer,
+    Optional['SessionType']                             => Pattern['/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/'],
+    Optional['SessionCacheFallbackToCookie']            => Enum['On','Off'],
+    Optional['CacheType']                               => Enum['shm','memcache','file','redis'],
+    Optional['CacheEncrypt']                            => Enum['On','Off'],
+    Optional['CacheShmMax']                             => Integer,
+    Optional['CacheShmEntrySizeMax']                    => Integer,
+    Optional['CacheFileCleanInterval']                  => Integer,
+    Optional['MemCacheServers']                         => String,
+    Optional['RedisCacheServer']                        => String,
+    Optional['RedisCachePassword']                      => String,
+    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['HTMLErrorTemplate']                       => String,
+    Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['PathScope']                               => Pattern['/^[A-Za-z0-9\-\._\s]+$/'],
+    Optional['PathAuthRequestParams']                   => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
+    Optional['IDTokenIatSlack']                         => Integer,
+    Optional['ClaimPrefix']                             => String,
+    Optional['ClaimDelimiter']                          => Pattern['/^.$/'],
+    Optional['RemoteUserClaim']                         => String,
+    Optional['PassIDTokenAs']                           => Pattern['/^((claims|payload|serialized)\s?)+$/'],
+    Optional['PassUserInfoAs']                          => Pattern['/^((claims|json|jwt)\s?)+$/'],
+    Optional['PassClaimsAs']                            => Enum['none','headers','environment','both'],
+    Optional['AuthNHeader']                             => String,
+    Optional['HTTPTimeoutLong']                         => Integer,
+    Optional['HTTPTimeoutShort']                        => Integer,
+    Optional['StateTimeout']                            => Integer,
+    Optional['ScrubRequestHeaders']                     => Enum['On','Off'],
+    Optional['OutgoingProxy']                           => String,
+    Optional['UnAuthAction']                            => Enum['auth','pass','401','410'],
+    Optional['UnAuthzAction']                           => Enum['401','403','auth'],
+    Optional['PreservePost']                            => Enum['On','Off'],
+    Optional['PassRefreshToken']                        => Enum['On','Off'],
+    Optional['RequestObject']                           => String,
+    Optional['ProviderMetadataRefreshInterval']         => Integer,
+    Optional['InfoHook']                                => Pattern['/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/'],
+    Optional['BlackListedClaims']                       => String,
+    Optional['WhiteListedClaims']                       => String,
+    Optional['RefreshAccessTokenBeforeExpiry']          => Pattern['/^[0-9]+(\slogout_on_error)?$/'],
+  }
+]

From 79407f7f44403e3a86585bffb2caea1d5a6b6029 Mon Sep 17 00:00:00 2001
From: Jon-Paul Lindquist <jlindquist@godaddy.com>
Date: Tue, 31 Dec 2019 09:57:47 -0700
Subject: [PATCH 1596/2267] Add template variables and parameters for
 ModSecurity Audit Logs

---
 manifests/mod/security.pp         | 10 ++++++++++
 manifests/params.pp               |  1 +
 spec/classes/mod/security_spec.rb |  9 +++++++++
 templates/mod/security.conf.erb   |  5 ++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 683fad0be5..1bc3edfd83 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -27,6 +27,12 @@
 #   Defines which parts of each transaction are going to be recorded in the audit log. Each part is assigned a single letter; when a
 #   letter appears in the list then the equivalent part will be recorded.
 # 
+# @param audit_log_type
+#   Defines the type of audit logging mechanism to be used.
+# 
+# @param audit_log_storage_dir
+#   Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.
+# 
 # @param secpcrematchlimit
 #   Sets the match limit in the PCRE library.
 # 
@@ -96,6 +102,8 @@
   $modsec_secruleengine        = $::apache::params::modsec_secruleengine,
   $audit_log_relevant_status   = '^(?:5|4(?!04))',
   $audit_log_parts             = $::apache::params::modsec_audit_log_parts,
+  $audit_log_type              = $::apache::params::modsec_audit_log_type,
+  $audit_log_storage_dir       = undef,
   $secpcrematchlimit           = $::apache::params::secpcrematchlimit,
   $secpcrematchlimitrecursion  = $::apache::params::secpcrematchlimitrecursion,
   $allowed_methods             = 'GET HEAD POST OPTIONS',
@@ -169,6 +177,8 @@
   # - logroot
   # - $modsec_dir
   # - $audit_log_parts
+  # - $audit_log_type
+  # - $audit_log_storage_dir
   # - secpcrematchlimit
   # - secpcrematchlimitrecursion
   # - secrequestbodylimit
diff --git a/manifests/params.pp b/manifests/params.pp
index 5e89fc4d28..e54bbeb426 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -35,6 +35,7 @@
   $vhost_include_pattern = '*'
 
   $modsec_audit_log_parts = 'ABIJDEFHZ'
+  $modsec_audit_log_type = 'Serial'
 
   # no client certs should be trusted for auth by default.
   $ssl_certs_dir          = undef
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 042bf4d668..ad7d9644a1 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -42,6 +42,7 @@
             is_expected.to contain_file('security.conf')
               .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
               .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
+              .with_content(%r{^\s+SecAuditLogType Serial$})
               .with_content(%r{^\s+SecDebugLog /var/log/httpd/modsec_debug.log$})
               .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$})
           }
@@ -78,12 +79,16 @@
                 ],
                 audit_log_relevant_status: '^(?:5|4(?!01|04))',
                 audit_log_parts: 'ABCDZ',
+                audit_log_type: 'Concurrent',
+                audit_log_storage_dir: '/var/log/httpd/audit',
                 secdefaultaction: 'deny,status:406,nolog,auditlog',
               }
             end
 
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogType Concurrent$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
             it { is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
             it {
               is_expected.to contain_file('bar.conf').with(
@@ -126,6 +131,7 @@
             is_expected.to contain_file('security.conf')
               .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
               .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
+              .with_content(%r{^\s+SecAuditLogType Serial$})
               .with_content(%r{^\s+SecDebugLog /var/log/apache2/modsec_debug.log$})
               .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$})
           }
@@ -165,6 +171,8 @@
                 ],
                 audit_log_relevant_status: '^(?:5|4(?!01|04))',
                 audit_log_parts: 'ABCDZ',
+                audit_log_type: 'Concurrent',
+                audit_log_storage_dir: '/var/log/httpd/audit',
                 secdefaultaction: 'deny,status:406,nolog,auditlog',
               }
             end
@@ -173,6 +181,7 @@
                (facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian')
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
+              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
               it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
               it {
                 is_expected.to contain_file('bar.conf').with(
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 638332e52e..5392bae3a5 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -45,7 +45,10 @@
     SecAuditEngine RelevantOnly
     SecAuditLogRelevantStatus "<%= @audit_log_relevant_status %>"
     SecAuditLogParts <%= @audit_log_parts %>
-    SecAuditLogType Serial
+    SecAuditLogType <%= @audit_log_type %>
+    <%- if @audit_log_storage_dir -%>
+    SecAuditLogStorageDir <%= @audit_log_storage_dir %>
+    <%- end -%>
     SecArgumentSeparator &
     SecCookieFormat 0
 <%- if scope.lookupvar('::osfamily') == 'Debian' -%>

From fb17d8ded60ee85850ac5073e5c40579f26b0eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20R=C3=BCssel?= <ruessel@synyx.de>
Date: Wed, 8 Jan 2020 17:37:22 +0100
Subject: [PATCH 1597/2267] SSLProxyEngine on has to be set before any
 Proxydirective using it

---
 manifests/vhost.pp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index c743814151..952e12734a 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2376,6 +2376,24 @@
     }
   }
 
+  # Template uses:
+  # - $ssl_proxyengine
+  # - $ssl_proxy_verify
+  # - $ssl_proxy_verify_depth
+  # - $ssl_proxy_ca_cert
+  # - $ssl_proxy_check_peer_cn
+  # - $ssl_proxy_check_peer_name
+  # - $ssl_proxy_check_peer_expire
+  # - $ssl_proxy_machine_cert
+  # - $ssl_proxy_protocol
+  if $ssl_proxyengine {
+    concat::fragment { "${name}-sslproxy":
+      target  => "${priority_real}${filename}.conf",
+      order   => 160,
+      content => template('apache/vhost/_sslproxy.erb'),
+    }
+  }
+
   # Template uses:
   # - $proxy_dest
   # - $proxy_pass
@@ -2386,7 +2404,7 @@
   if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host {
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}${filename}.conf",
-      order   => 160,
+      order   => 170,
       content => template('apache/vhost/_proxy.erb'),
     }
   }
@@ -2485,24 +2503,6 @@
     }
   }
 
-  # Template uses:
-  # - $ssl_proxyengine
-  # - $ssl_proxy_verify
-  # - $ssl_proxy_verify_depth
-  # - $ssl_proxy_ca_cert
-  # - $ssl_proxy_check_peer_cn
-  # - $ssl_proxy_check_peer_name
-  # - $ssl_proxy_check_peer_expire
-  # - $ssl_proxy_machine_cert
-  # - $ssl_proxy_protocol
-  if $ssl_proxyengine {
-    concat::fragment { "${name}-sslproxy":
-      target  => "${priority_real}${filename}.conf",
-      order   => 230,
-      content => template('apache/vhost/_sslproxy.erb'),
-    }
-  }
-
   # Template uses:
   # - $auth_kerb
   # - $krb_method_negotiate

From fc961f018474fd58f80d37f366d9ed573f926eac Mon Sep 17 00:00:00 2001
From: David Gardner <david.gardner@bristol.ac.uk>
Date: Thu, 9 Jan 2020 11:36:40 +0000
Subject: [PATCH 1598/2267] Set ssl_protocol defaults to 'all' only on RHEL8
 rather than all supported platforms.

---
 manifests/mod/ssl.pp | 2 +-
 manifests/params.pp  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 240b4ff616..145dbdb6a4 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -85,7 +85,7 @@
   $ssl_ca                                                   = undef,
   $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
-  $ssl_protocol                                             = ['all'],   # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
+  $ssl_protocol                                             = $::apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
   $ssl_pass_phrase_dialog                                   = 'builtin',
   $ssl_random_seed_bytes                                    = '512',
diff --git a/manifests/params.pp b/manifests/params.pp
index 5e89fc4d28..e058dedfca 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -791,4 +791,10 @@
   } else {
     $verify_command = '/usr/sbin/apachectl -t'
   }
+
+  if ($::operatingsystem == 'RedHat' and ($facts['operatingsystemmajrelease'] == '8') ) {
+    $ssl_protocol = ['all'] # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
+  } else {
+    $ssl_protocol = [ 'all', '-SSLv2', '-SSLv3' ]
+  }
 }

From 8b8743e87fdd38a6572f104defc5b91b53018a21 Mon Sep 17 00:00:00 2001
From: David Gardner <david.gardner@bristol.ac.uk>
Date: Thu, 9 Jan 2020 12:13:51 +0000
Subject: [PATCH 1599/2267] Update default value for ssl_protocol param in
 REFERENCE docs.

---
 REFERENCE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 9ecd848a8f..9ca99492db 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5453,7 +5453,7 @@ Data type: `Any`
 
 Configure usable SSL/TLS protocol versions.
 
-Default value: ['all']
+Default value: ['all', '-SSLv2', '-SSLv3']
 
 ##### `ssl_proxy_protocol`
 

From 2bcc436c929fe67db97aa59cd1fd806719e123fd Mon Sep 17 00:00:00 2001
From: David Gardner <david.gardner@bristol.ac.uk>
Date: Thu, 9 Jan 2020 12:42:57 +0000
Subject: [PATCH 1600/2267] Check osfamily and version >= 8 to cover CentOS and
 any newer versions.

---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index e058dedfca..896ef78177 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -792,7 +792,7 @@
     $verify_command = '/usr/sbin/apachectl -t'
   }
 
-  if ($::operatingsystem == 'RedHat' and ($facts['operatingsystemmajrelease'] == '8') ) {
+  if ($::osfamily == 'RedHat' and ($facts['operatingsystemmajrelease'] >= '8') ) {
     $ssl_protocol = ['all'] # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
   } else {
     $ssl_protocol = [ 'all', '-SSLv2', '-SSLv3' ]

From 236a5599f4db684cf6de5057ab6754213f177b6c Mon Sep 17 00:00:00 2001
From: 2and3makes23 <59733711+2and3makes23@users.noreply.github.com>
Date: Fri, 10 Jan 2020 14:16:36 +0100
Subject: [PATCH 1601/2267] Added different behavior for @osfamily == 'RedHat'

The icon suffix '-20x22' is removed when @osfamily == 'RedHat' is true.
This way icon paths are correct on RedHat systems and remain unchanged for other OSes.
---
 templates/mod/autoindex.conf.erb | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/templates/mod/autoindex.conf.erb b/templates/mod/autoindex.conf.erb
index ef6bbebea6..54ced045b5 100644
--- a/templates/mod/autoindex.conf.erb
+++ b/templates/mod/autoindex.conf.erb
@@ -30,24 +30,24 @@ AddIcon /icons/hand.right.gif README
 AddIcon /icons/folder.gif ^^DIRECTORY^^
 AddIcon /icons/blank.gif ^^BLANKICON^^
 
-AddIcon /icons/odf6odt-20x22.png .odt
-AddIcon /icons/odf6ods-20x22.png .ods
-AddIcon /icons/odf6odp-20x22.png .odp
-AddIcon /icons/odf6odg-20x22.png .odg
-AddIcon /icons/odf6odc-20x22.png .odc
-AddIcon /icons/odf6odf-20x22.png .odf
-AddIcon /icons/odf6odb-20x22.png .odb
-AddIcon /icons/odf6odi-20x22.png .odi
-AddIcon /icons/odf6odm-20x22.png .odm
+AddIcon /icons/odf6odt<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odt
+AddIcon /icons/odf6ods<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .ods
+AddIcon /icons/odf6odp<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odp
+AddIcon /icons/odf6odg<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odg
+AddIcon /icons/odf6odc<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odc
+AddIcon /icons/odf6odf<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odf
+AddIcon /icons/odf6odb<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odb
+AddIcon /icons/odf6odi<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odi
+AddIcon /icons/odf6odm<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odm
 
-AddIcon /icons/odf6ott-20x22.png .ott
-AddIcon /icons/odf6ots-20x22.png .ots
-AddIcon /icons/odf6otp-20x22.png .otp
-AddIcon /icons/odf6otg-20x22.png .otg
-AddIcon /icons/odf6otc-20x22.png .otc
-AddIcon /icons/odf6otf-20x22.png .otf
-AddIcon /icons/odf6oti-20x22.png .oti
-AddIcon /icons/odf6oth-20x22.png .oth
+AddIcon /icons/odf6ott<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .ott
+AddIcon /icons/odf6ots<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .ots
+AddIcon /icons/odf6otp<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .otp
+AddIcon /icons/odf6otg<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .otg
+AddIcon /icons/odf6otc<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .otc
+AddIcon /icons/odf6otf<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .otf
+AddIcon /icons/odf6oti<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .oti
+AddIcon /icons/odf6oth<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .oth
 
 DefaultIcon /icons/unknown.gif
 ReadmeName README.html

From 6a50579b7880ab829574c011f6d03777eee49e1a Mon Sep 17 00:00:00 2001
From: 2and3makes23 <59733711+2and3makes23@users.noreply.github.com>
Date: Fri, 10 Jan 2020 14:19:42 +0100
Subject: [PATCH 1602/2267] Updated comment

---
 manifests/mod/autoindex.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index 65b0354426..bf3df3c7f3 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -6,7 +6,7 @@
 class apache::mod::autoindex {
   include ::apache
   ::apache::mod { 'autoindex': }
-  # Template uses no variables
+  # Template changes content based on @osfamily
   file { 'autoindex.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/autoindex.conf",

From 79c8065666522a042267f28d7596e792e968c23a Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Fri, 10 Jan 2020 15:58:24 +0000
Subject: [PATCH 1603/2267] (FM-8581) - Debian 10 added to travis and provision
 file refactored

---
 .sync.yml      | 28 ++++++++++++++++++++++++++++
 .travis.yml    | 20 ++++++++++++++++++++
 provision.yaml | 14 ++++++++++----
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 0c12b9a58a..a4a6d033fb 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -36,6 +36,34 @@
     services: docker
     sudo: required
     stage: acceptance
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=ub_puppet5
+    rvm: 2.5.3
+    before_script:
+    - bundle exec rake 'litmus:provision_list[travis_ub]'
+    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
+    - bundle exec rake 'litmus:install_agent[puppet5]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    sudo: required
+    stage: acceptance
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=ub_puppet6
+    rvm: 2.5.3
+    before_script:
+    - bundle exec rake 'litmus:provision_list[travis_ub]'
+    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
+    - bundle exec rake 'litmus:install_agent[puppet6]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    sudo: required
+    stage: acceptance
   - bundler_args: 
     dist: trusty
     env: PLATFORMS=el7_puppet5
diff --git a/.travis.yml b/.travis.yml
index f03c40ca82..031e12254f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,26 @@ matrix:
       services: docker
       stage: acceptance
       sudo: required
+    -
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=ub_puppet5
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+      sudo: required
+    -
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=ub_puppet6
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+      sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
diff --git a/provision.yaml b/provision.yaml
index d01b85372a..c824da8531 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -2,15 +2,21 @@
 default:
   provisioner: docker 
   images: ['waffleimage/debian8']
+vagrant:
+  provisioner: vagrant
+  images: ['centos/7', 'generic/ubuntu1804']
 travis_deb:
   provisioner: docker
-  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/debian10']
+travis_ub:
+  provisioner: docker
+  images: ['waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+travis_el6:
+  provisioner: docker
+  images: []
 travis_el7:
   provisioner: docker
   images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
-vagrant:
-  provisioner: vagrant
-  images: ['centos/7', 'generic/ubuntu1804']
 release_checks:
   provisioner: vmpooler
   images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From 1cf5740335b49d85a79564df5512d1938d1520d0 Mon Sep 17 00:00:00 2001
From: David Gardner <david.gardner@bristol.ac.uk>
Date: Tue, 14 Jan 2020 10:07:14 +0000
Subject: [PATCH 1604/2267] Switch away from using deprecated facts in
 ssl_protocol params addition.

---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 896ef78177..b7dc0ff4bd 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -792,7 +792,7 @@
     $verify_command = '/usr/sbin/apachectl -t'
   }
 
-  if ($::osfamily == 'RedHat' and ($facts['operatingsystemmajrelease'] >= '8') ) {
+  if ($facts['os']['family'] == 'RedHat' and ($facts['os']['release']['major'] >= '8') ) {
     $ssl_protocol = ['all'] # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
   } else {
     $ssl_protocol = [ 'all', '-SSLv2', '-SSLv3' ]

From aed6d635cb722197307f7aed849ff7d2e2fc461c Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Mon, 20 Jan 2020 12:33:03 +0000
Subject: [PATCH 1605/2267] (MODULES-10391) Fix/Add tests for checking default
 values of ssl_protocol on os.

---
 manifests/params.pp                  |  2 +-
 spec/acceptance/apache_ssl_spec.rb   |  9 +++++++++
 spec/classes/mod/ssl_spec.rb         | 22 +++++++++++++++++++++-
 spec/spec_helper_acceptance_local.rb | 28 ++++++++++++++++++----------
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index b7dc0ff4bd..642791a47a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -792,7 +792,7 @@
     $verify_command = '/usr/sbin/apachectl -t'
   }
 
-  if ($facts['os']['family'] == 'RedHat' and ($facts['os']['release']['major'] >= '8') ) {
+  if $::osfamily == 'RedHat' and versioncmp($::operatingsystemrelease, '8.0') >= 0 {
     $ssl_protocol = ['all'] # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
   } else {
     $ssl_protocol = [ 'all', '-SSLv2', '-SSLv3' ]
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 6195e7e8da..a02e4dd6ef 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -19,6 +19,15 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
+    describe file("#{apache_hash['mod_ssl_dir']}/ssl.conf") do
+      it { is_expected.to be_file }
+      if os[:family] =~ %r{redhat} && os[:release].to_i == 8
+        it { is_expected.to contain 'SSLProtocol all' }
+      else
+        it { is_expected.to contain 'SSLProtocol all -SSLv2 -SSLv3' }
+      end
+    end
+
     describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 700079ad8a..1fe0955a8e 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -36,6 +36,26 @@
       it { is_expected.to contain_apache__mod('ssl') }
       it { is_expected.to contain_package('mod_ssl') }
       it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.d/ssl.conf') }
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv2 -SSLv3}) }
+    end
+    context '8 OS' do
+      let :facts do
+        {
+          osfamily: 'RedHat',
+          operatingsystemrelease: '8',
+          operatingsystem: 'RedHat',
+          id: 'root',
+          kernel: 'Linux',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_apache__mod('ssl') }
+      it { is_expected.to contain_package('mod_ssl') }
+      it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.d/ssl.conf') }
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all}) }
     end
     context '6 OS with a custom package_name parameter' do
       let :facts do
@@ -104,8 +124,8 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
     it { is_expected.not_to contain_package('libapache2-mod-ssl') }
+    it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv2 -SSLv3}) }
   end
-
   context 'on a FreeBSD OS' do
     let :facts do
       {
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 99614dccda..b6eca89aa0 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -67,17 +67,21 @@ def apache_settings_hash
     apache['suphp_handler']    = 'php5-script'
     apache['suphp_configpath'] = 'undef'
     if (operatingsystemrelease >= 7 && operatingsystemrelease < 8) && (osfamily == 'redhat')
-      apache['version'] = '2.4'
-      apache['mod_dir'] = '/etc/httpd/conf.modules.d'
+      apache['version']     = '2.4'
+      apache['mod_dir']     = '/etc/httpd/conf.modules.d'
+      apache['mod_ssl_dir'] = apache['confd_dir']
     elsif operatingsystemrelease >= 8 && osfamily == 'redhat'
-      apache['version'] = '2.4'
-      apache['mod_dir'] = '/etc/httpd/conf.d'
+      apache['version']     = '2.4'
+      apache['mod_dir']     = '/etc/httpd/conf.d'
+      apache['mod_ssl_dir'] = apache['mod_dir']
     elsif operatingsystemrelease >= 7 && osfamily == 'oracle'
-      apache['version'] = '2.4'
-      apache['mod_dir'] = '/etc/httpd/conf.modules.d'
+      apache['version']     = '2.4'
+      apache['mod_dir']     = '/etc/httpd/conf.modules.d'
+      apache['mod_ssl_dir'] = apache['confd_dir']
     else
-      apache['version'] = '2.2'
-      apache['mod_dir'] = '/etc/httpd/conf.d'
+      apache['version']     = '2.2'
+      apache['mod_dir']     = '/etc/httpd/conf.d'
+      apache['mod_ssl_dir'] = apache['mod_dir']
     end
   when 'debian', 'ubuntu'
     apache['confd_dir']        = '/etc/apache2/conf.d'
@@ -100,6 +104,7 @@ def apache_settings_hash
                         else
                           '2.2'
                         end
+    apache['mod_ssl_dir']      = apache['mod_dir']
   when 'freebsd'
     apache['confd_dir']        = '/usr/local/etc/apache24/Includes'
     apache['mod_dir']          = '/usr/local/etc/apache24/Modules'
@@ -112,7 +117,8 @@ def apache_settings_hash
     apache['service_name']     = 'apache24'
     apache['package_name']     = 'apache24'
     apache['error_log']        = 'http-error.log'
-    apache['version'] = '2.2'
+    apache['version']          = '2.2'
+    apache['mod_ssl_dir']      = apache['mod_dir']
   when 'gentoo'
     apache['confd_dir']        = '/etc/apache2/conf.d'
     apache['mod_dir']          = '/etc/apache2/modules.d'
@@ -125,7 +131,8 @@ def apache_settings_hash
     apache['service_name']     = 'apache2'
     apache['package_name']     = 'www-servers/apache'
     apache['error_log']        = 'http-error.log'
-    apache['version'] = '2.4'
+    apache['version']          = '2.4'
+    apache['mod_ssl_dir']      = apache['mod_dir']
   when 'suse', 'sles'
     apache['confd_dir']        = '/etc/apache2/conf.d'
     apache['mod_dir']          = '/etc/apache2/mods-available'
@@ -143,6 +150,7 @@ def apache_settings_hash
                         else
                           '2.4'
                         end
+    apache['mod_ssl_dir'] = apache['mod_dir']
   else
     raise 'unable to figure out what apache version'
   end

From d0ef41ae94d0f4280ed1fdff86655b6d5de829c4 Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Tue, 21 Jan 2020 18:03:27 +0000
Subject: [PATCH 1606/2267] Release version 5.4.0

---
 CHANGELOG.md         | 12 ++++++
 REFERENCE.md         | 99 +++++++++++++++++++++++++++++++++++++++++++-
 manifests/mod/ssl.pp |  3 ++
 metadata.json        |  2 +-
 4 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 147aa7de43..a32c71f436 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.4.0) (2020-01-21)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.3.0...v5.4.0)
+
+### Added
+
+- Add an apache::vhost::fragment define [\#1980](https://github.com/puppetlabs/puppetlabs-apache/pull/1980) ([ekohl](https://github.com/ekohl))
+
+### Fixed
+
+- \(MODULES-10391\) ssl\_protocol includes SSLv2 and SSLv3 on all platforms [\#1990](https://github.com/puppetlabs/puppetlabs-apache/pull/1990) ([legooolas](https://github.com/legooolas))
+
 ## [v5.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.3.0) (2019-12-11)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.2.0...v5.3.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 9ca99492db..d82e2d8564 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -131,6 +131,7 @@ Apache server's or a virtual host's listening address and port.
 * [`apache::vhost`](#apachevhost): Allows specialised configurations for virtual hosts that possess requirements
 outside of the defaults.
 * [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
+* [`apache::vhost::fragment`](#apachevhostfragment): Define a fragment within a vhost
 
 _Private Defined types_
 
@@ -5452,8 +5453,11 @@ Default value: `true`
 Data type: `Any`
 
 Configure usable SSL/TLS protocol versions.
+Default based on the OS:
+- RedHat 8: [ 'all' ].
+- Other Platforms: [ 'all', '-SSLv2', '-SSLv3' ].
 
-Default value: ['all', '-SSLv2', '-SSLv3']
+Default value: $::apache::params::ssl_protocol
 
 ##### `ssl_proxy_protocol`
 
@@ -9227,6 +9231,99 @@ Specifies whether to validate the configuration file before notifying the Apache
 
 Default value: `true`
 
+### apache::vhost::fragment
+
+Define a fragment within a vhost
+
+#### Examples
+
+##### With a vhost without priority
+
+```puppet
+include apache
+apache::vhost { 'myvhost':
+}
+apache::vhost::fragment { 'myfragment':
+  vhost   => 'myvhost',
+  content => '# Foo',
+}
+```
+
+##### With a vhost with priority
+
+```puppet
+include apache
+apache::vhost { 'myvhost':
+  priority => '42',
+}
+apache::vhost::fragment { 'myfragment':
+  vhost    => 'myvhost',
+  priority => '42',
+  content  => '# Foo',
+}
+```
+
+##### With a vhost with default vhost
+
+```puppet
+include apache
+apache::vhost { 'myvhost':
+  default_vhost => true,
+}
+apache::vhost::fragment { 'myfragment':
+  vhost    => 'myvhost',
+  priority => '10', # default_vhost implies priority 10
+  content  => '# Foo',
+}
+```
+
+##### Adding a fragment to the built in default vhost
+
+```puppet
+include apache
+apache::vhost::fragment { 'myfragment':
+  vhost    => 'default',
+  priority => '15',
+  content  => '# Foo',
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::vhost::fragment` defined type.
+
+##### `vhost`
+
+Data type: `String[1]`
+
+The title of the vhost resource to append to
+
+##### `priority`
+
+Data type: `Any`
+
+Set the priority to match the one `apache::vhost` sets. This must match the
+one `apache::vhost` sets or else the concat fragment won't be found.
+
+Default value: `undef`
+
+##### `content`
+
+Data type: `Optional[String]`
+
+The content to put in the fragment. Only when it's non-empty the actual
+fragment will be created.
+
+Default value: `undef`
+
+##### `order`
+
+Data type: `Integer[0]`
+
+The order to insert the fragment at
+
+Default value: 900
+
 ## Resource types
 
 ### a2mod
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 145dbdb6a4..ccfc74eaf1 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -30,6 +30,9 @@
 #
 # @param ssl_protocol
 #   Configure usable SSL/TLS protocol versions.
+#   Default based on the OS:
+#   - RedHat 8: [ 'all' ].
+#   - Other Platforms: [ 'all', '-SSLv2', '-SSLv3' ].
 #
 # @param ssl_proxy_protocol
 #   Configure usable SSL protocol flavors for proxy usage.
diff --git a/metadata.json b/metadata.json
index 86c6cd363e..dcf194ef93 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 952bd7b586fa14807eb45149db8911212b1e0536 Mon Sep 17 00:00:00 2001
From: 2and3makes23 <59733711+2and3makes23@users.noreply.github.com>
Date: Thu, 23 Jan 2020 12:15:21 +0100
Subject: [PATCH 1607/2267] Moved and simplified logic

---
 templates/mod/autoindex.conf.erb | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/templates/mod/autoindex.conf.erb b/templates/mod/autoindex.conf.erb
index 54ced045b5..ac4103a7ba 100644
--- a/templates/mod/autoindex.conf.erb
+++ b/templates/mod/autoindex.conf.erb
@@ -30,24 +30,24 @@ AddIcon /icons/hand.right.gif README
 AddIcon /icons/folder.gif ^^DIRECTORY^^
 AddIcon /icons/blank.gif ^^BLANKICON^^
 
-AddIcon /icons/odf6odt<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odt
-AddIcon /icons/odf6ods<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .ods
-AddIcon /icons/odf6odp<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odp
-AddIcon /icons/odf6odg<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odg
-AddIcon /icons/odf6odc<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odc
-AddIcon /icons/odf6odf<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odf
-AddIcon /icons/odf6odb<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odb
-AddIcon /icons/odf6odi<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odi
-AddIcon /icons/odf6odm<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .odm
+AddIcon /icons/odf6odt<%= @icon_suffix %>.png .odt
+AddIcon /icons/odf6ods<%= @icon_suffix %>.png .ods
+AddIcon /icons/odf6odp<%= @icon_suffix %>.png .odp
+AddIcon /icons/odf6odg<%= @icon_suffix %>.png .odg
+AddIcon /icons/odf6odc<%= @icon_suffix %>.png .odc
+AddIcon /icons/odf6odf<%= @icon_suffix %>.png .odf
+AddIcon /icons/odf6odb<%= @icon_suffix %>.png .odb
+AddIcon /icons/odf6odi<%= @icon_suffix %>.png .odi
+AddIcon /icons/odf6odm<%= @icon_suffix %>.png .odm
 
-AddIcon /icons/odf6ott<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .ott
-AddIcon /icons/odf6ots<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .ots
-AddIcon /icons/odf6otp<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .otp
-AddIcon /icons/odf6otg<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .otg
-AddIcon /icons/odf6otc<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .otc
-AddIcon /icons/odf6otf<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .otf
-AddIcon /icons/odf6oti<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .oti
-AddIcon /icons/odf6oth<% if @osfamily != 'RedHat' -%>-20x22<% end -%>.png .oth
+AddIcon /icons/odf6ott<%= @icon_suffix %>.png .ott
+AddIcon /icons/odf6ots<%= @icon_suffix %>.png .ots
+AddIcon /icons/odf6otp<%= @icon_suffix %>.png .otp
+AddIcon /icons/odf6otg<%= @icon_suffix %>.png .otg
+AddIcon /icons/odf6otc<%= @icon_suffix %>.png .otc
+AddIcon /icons/odf6otf<%= @icon_suffix %>.png .otf
+AddIcon /icons/odf6oti<%= @icon_suffix %>.png .oti
+AddIcon /icons/odf6oth<%= @icon_suffix %>.png .oth
 
 DefaultIcon /icons/unknown.gif
 ReadmeName README.html

From b5c8963e6ccb2e1f2ebc389f83567ce40bdc61eb Mon Sep 17 00:00:00 2001
From: 2and3makes23 <59733711+2and3makes23@users.noreply.github.com>
Date: Thu, 23 Jan 2020 12:18:47 +0100
Subject: [PATCH 1608/2267] Less if-statements, better readability

---
 manifests/mod/autoindex.pp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index bf3df3c7f3..ff875f39e3 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -6,7 +6,17 @@
 class apache::mod::autoindex {
   include ::apache
   ::apache::mod { 'autoindex': }
-  # Template changes content based on @osfamily
+
+  # Determine icon filename suffix for autoindex.conf.erb
+  case $operatingsystem {
+    'Debian', 'Ubuntu': {
+      icon_suffix = '-20x22'
+    }
+    default: {
+      icon_suffix = ''
+    }
+  }
+
   file { 'autoindex.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/autoindex.conf",

From 801b06be44b6f67c7f568c0b3d4b358c2362a659 Mon Sep 17 00:00:00 2001
From: 2and3makes23 <59733711+2and3makes23@users.noreply.github.com>
Date: Thu, 23 Jan 2020 12:23:14 +0100
Subject: [PATCH 1609/2267] Fixed var

---
 manifests/mod/autoindex.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index ff875f39e3..4c79d019cc 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -10,10 +10,10 @@
   # Determine icon filename suffix for autoindex.conf.erb
   case $operatingsystem {
     'Debian', 'Ubuntu': {
-      icon_suffix = '-20x22'
+      $icon_suffix = '-20x22'
     }
     default: {
-      icon_suffix = ''
+      $icon_suffix = ''
     }
   }
 

From 767f21d704da5af59f1885207a7757ec87768beb Mon Sep 17 00:00:00 2001
From: 2and3makes23 <59733711+2and3makes23@users.noreply.github.com>
Date: Thu, 23 Jan 2020 12:41:33 +0100
Subject: [PATCH 1610/2267] Fixed scope

---
 manifests/mod/autoindex.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index 4c79d019cc..868568777d 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -10,10 +10,10 @@
   # Determine icon filename suffix for autoindex.conf.erb
   case $operatingsystem {
     'Debian', 'Ubuntu': {
-      $icon_suffix = '-20x22'
+      $::icon_suffix = '-20x22'
     }
     default: {
-      $icon_suffix = ''
+      $::icon_suffix = ''
     }
   }
 

From 280ec7d8dd9149dd4e521c9616b47ebe00322179 Mon Sep 17 00:00:00 2001
From: 2and3makes23 <59733711+2and3makes23@users.noreply.github.com>
Date: Thu, 23 Jan 2020 14:12:21 +0100
Subject: [PATCH 1611/2267] Namespace issues

---
 manifests/mod/autoindex.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index 868568777d..c22d0a00a4 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -8,12 +8,12 @@
   ::apache::mod { 'autoindex': }
 
   # Determine icon filename suffix for autoindex.conf.erb
-  case $operatingsystem {
+  case $::operatingsystem {
     'Debian', 'Ubuntu': {
-      $::icon_suffix = '-20x22'
+      $icon_suffix = '-20x22'
     }
     default: {
-      $::icon_suffix = ''
+      $icon_suffix = ''
     }
   }
 

From 429dcdb626cdc89d5e9fd0022a44a53ae86a30c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20D=C3=B6hring?= <c.doehring@babiel.com>
Date: Fri, 24 Jan 2020 13:43:25 +0100
Subject: [PATCH 1612/2267] Fix proxy_html Module to work on Debian 10

---
 manifests/mod/proxy_html.pp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 2acffef6d4..730940a4f5 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -19,10 +19,22 @@
         'i686'  => 'i386',
         default => $::hardwaremodel,
       }
-      $loadfiles = $::apache::params::distrelease ? {
-        '6'     => ['/usr/lib/libxml2.so.2'],
-        '10'    => ['/usr/lib/libxml2.so.2'],
-        default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
+      case $::operatingsystem {
+        'Ubuntu': {
+          $loadfiles = $::apache::params::distrelease ? {
+            '10'    => ['/usr/lib/libxml2.so.2'],
+            default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
+          }
+        }
+        'Debian': {
+          $loadfiles = $::apache::params::distrelease ? {
+            '6'     => ['/usr/lib/libxml2.so.2'],
+            default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
+          }
+        }
+        default: {
+          $loadfiles = ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"]
+        }
       }
       if versioncmp($::apache::apache_version, '2.4') >= 0 {
         ::apache::mod { 'xml2enc': }

From 1bfc5754fca0b1a1f2faf187387d94119ec0a9e2 Mon Sep 17 00:00:00 2001
From: Asier Aguado <asier.aguado@cern.ch>
Date: Tue, 28 Jan 2020 14:47:45 +0100
Subject: [PATCH 1613/2267] Add acceptance test for auth_oidc with settings

---
 spec/acceptance/vhost_spec.rb | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 04dcb597af..e4b34f46a3 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1197,4 +1197,37 @@ class { 'apache::mod::shib': }
       it { is_expected.to contain 'ShibCompatValidUser On' }
     end
   end
+
+  describe 'auth_oidc' do
+    pp = <<-MANIFEST
+        class { 'apache': }
+        apache::vhost { 'test.server':
+          port    => '80',
+          docroot => '/var/www/html',
+          auth_oidc     => true,
+          oidc_settings => {
+            'ProviderMetadataURL'       => 'https://login.example.com/.well-known/openid-configuration',
+            'ClientID'                  => 'test',
+            'RedirectURI'               => 'https://login.example.com/redirect_uri',
+            'ProviderTokenEndpointAuth' => 'client_secret_basic',
+            'RemoteUserClaim'           => 'sub',
+            'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
+            'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd'
+          }
+        }
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
+    end
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'OIDCProviderMetadataURL https://login.example.com/.well-known/openid-configuration' }
+      it { is_expected.to contain 'OIDCClientID test' }
+      it { is_expected.to contain 'OIDCRedirectURI https://login.example.com/redirect_uri' }
+      it { is_expected.to contain 'OIDCProviderTokenEndpointAuth client_secret_basic' }
+      it { is_expected.to contain 'OIDCRemoteUserClaim sub' }
+      it { is_expected.to contain 'OIDCClientSecret aae053a9-4abf-4824-8956-e94b2af335c8' }
+      it { is_expected.to contain 'OIDCCryptoPassphrase 4ad1bb46-9979-450e-ae58-c696967df3cd' }
+    end
+  end
 end

From 8e4edc34c8aa244c0e3f8b1fb9a5092ebfaa07b8 Mon Sep 17 00:00:00 2001
From: Asier Aguado Corman <asierakor@gmail.com>
Date: Thu, 30 Jan 2020 17:49:03 +0100
Subject: [PATCH 1614/2267] Skip acceptance test for Ubuntu 14.04

Co-Authored-By: Michael T Lombardi (He/Him) <michael.t.lombardi@outlook.com>
---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e4b34f46a3..3a99cebd0c 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1198,7 +1198,7 @@ class { 'apache::mod::shib': }
     end
   end
 
-  describe 'auth_oidc' do
+  describe 'auth_oidc', unless: (os[:family] == 'ubuntu' && os[:release].to_f == '14.04') do
     pp = <<-MANIFEST
         class { 'apache': }
         apache::vhost { 'test.server':

From 7af064077a06defc6e131eb0f6b6d7a719abb60f Mon Sep 17 00:00:00 2001
From: Asier Aguado Corman <asierakor@gmail.com>
Date: Mon, 3 Feb 2020 10:57:10 +0100
Subject: [PATCH 1615/2267] Fix ubuntu version as float

Co-Authored-By: Michael T Lombardi (He/Him) <michael.t.lombardi@outlook.com>
---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 3a99cebd0c..d1b9db21c0 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1198,7 +1198,7 @@ class { 'apache::mod::shib': }
     end
   end
 
-  describe 'auth_oidc', unless: (os[:family] == 'ubuntu' && os[:release].to_f == '14.04') do
+  describe 'auth_oidc', unless: (os[:family] == 'ubuntu' && os[:release].to_f == 14.04) do
     pp = <<-MANIFEST
         class { 'apache': }
         apache::vhost { 'test.server':

From c8dffa1f5f4c42894da290358eadfbaec6813934 Mon Sep 17 00:00:00 2001
From: Alexander Ursu <alexander.ursu@gmail.com>
Date: Mon, 3 Feb 2020 13:05:18 +0100
Subject: [PATCH 1616/2267] Add ErrorLogFormat directive into virtual host
 level

---
 manifests/vhost.pp           | 33 +++++++++++++
 spec/defines/vhost_spec.rb   | 95 ++++++++++++++++++++++++++++++++++++
 templates/vhost/_logging.erb | 11 +++++
 3 files changed, 139 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 952e12734a..2ad8f3a1da 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -216,6 +216,23 @@
 #   parameters has a value. If none of these parameters has a value, given a virtual host 
 #   `example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual 
 #   hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
+#
+# @param error_log_format
+#   Sets the [ErrorLogFormat](https://httpd.apache.org/docs/current/mod/core.html#errorlogformat)
+#   format specification for error log entries inside virtual host
+#   For example:
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     ...
+#     error_log_format => [
+#       '[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M',
+#       { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' }, 
+#       { "[%{uc}t] [R:%L] UA:'%+{User-Agent}i'" => 'request' },
+#       { "[%{uc}t] [R:%L] Referer:'%+{Referer}i'" => 'request' },
+#       { '[%{uc}t] [C:%{c}L] local\ %a remote\ %A' => 'connection' },
+#     ],
+#   }
+#   ```
 # 
 # @param error_documents
 #   A list of hashes which can be used to override the 
@@ -1696,6 +1713,14 @@
   $error_log_file                                                                   = undef,
   $error_log_pipe                                                                   = undef,
   $error_log_syslog                                                                 = undef,
+  Optional[
+    Array[
+      Variant[
+        String,
+        Hash[String, Enum['connection', 'request']]
+      ]
+    ]
+  ]       $error_log_format                                                         = undef,
   Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]] $http_protocol_options = undef,
   $modsec_audit_log                                                                 = undef,
   $modsec_audit_log_file                                                            = undef,
@@ -1994,6 +2019,13 @@
     }
   }
 
+  if versioncmp($apache_version, '2.4') >= 0 {
+    $error_log_format24 = $error_log_format
+  }
+  else {
+    $error_log_format24 = undef
+  }
+
   if $modsec_audit_log == false {
     $modsec_audit_log_destination = undef
   } elsif $modsec_audit_log_file {
@@ -2292,6 +2324,7 @@
 
   # Template uses:
   # - $error_log
+  # - $error_log_format24
   # - $log_level
   # - $error_log_destination
   # - $log_level
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 99c950f041..46267cf3cf 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -246,6 +246,7 @@
               'error_log'                   => false,
               'error_log_file'              => 'httpd_error_log',
               'error_log_syslog'            => true,
+              'error_log_format'            => [ '[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i' ],
               'error_documents'             => 'true',
               'fallbackresource'            => '/index.php',
               'scriptalias'                 => '/usr/lib/cgi-bin',
@@ -877,6 +878,10 @@
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-logging')
+              .with_content(%r{^\s+ErrorLogFormat "\[%t\] \[%l\] %7F: %E: \[client\\ %a\] %M% ,\\ referer\\ %\{Referer\}i"$})
+          }
           it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-access_log') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
@@ -1903,6 +1908,84 @@
             }
           end
         end # access logs
+        describe 'error logs format' do
+          context 'on Apache 2.2' do
+            let(:params) do
+              {
+                'docroot'         => '/rspec/docroot',
+                'apache_version'  => '2.2',
+                'error_log_format' => [ '[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i' ],
+              }
+            end
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-logging')
+                .without_content(%r{ErrorLogFormat})
+            }
+          end
+
+          context 'single log format directive as a string' do
+            let(:params) do
+              {
+                'docroot'          => '/rspec/docroot',
+                'apache_version'   => '2.4',
+                'error_log_format' => [ '[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i' ],
+              }
+            end
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
+                content: %r{^\s+ErrorLogFormat "\[%t\] \[%l\] %7F: %E: \[client\\ %a\] %M% ,\\ referer\\ %\{Referer\}i"$},
+              )
+            }
+          end
+
+          context 'multiple log format directives' do
+            let(:params) do
+              {
+                'docroot'          => '/rspec/docroot',
+                'apache_version'   => '2.4',
+                'error_log_format' => [ 
+                  '[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M',
+                  { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' }, 
+                  { "[%{uc}t] [R:%L] UA:'%+{User-Agent}i'" => 'request' },
+                  { "[%{uc}t] [R:%L] Referer:'%+{Referer}i'" => 'request' },
+                  { '[%{uc}t] [C:%{c}L] local\ %a remote\ %A' => 'connection' },
+                ],
+              }
+            end
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
+                content: %r{^\s+ErrorLogFormat "\[%\{uc\}t\] \[%-m:%-l\] \[R:%L\] \[C:%\{C\}L\] %7F: %E: %M"$},
+              )
+            }
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
+                content: %r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] Request %k on C:%\{c\}L pid:%P tid:%T"$},
+              )
+            }
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
+                content: %r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] UA:'%\+\{User-Agent\}i'"$},
+              )
+            }
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
+                content: %r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] Referer:'%\+\{Referer\}i'"$},
+              )
+            }
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
+                content: %r{^\s+ErrorLogFormat connection "\[%\{uc\}t\] \[C:%\{c\}L\] local\\ %a remote\\ %A"$},
+              )
+            }
+          end
+        end # error logs format
         describe 'validation' do
           context 'bad ensure' do
             let :params do
@@ -2084,6 +2167,18 @@
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
+          context 'bad error_log_format flag' do
+            let :params do
+              {
+                'docroot'   => '/rspec/docroot',
+                'error_log_format' => [
+                  { 'some format' => 'bogus' },
+                ],
+              }
+            end
+
+            it { is_expected.to raise_error(Puppet::Error) }
+          end
           context 'access_log_file and access_log_pipe' do
             let :params do
               {
diff --git a/templates/vhost/_logging.erb b/templates/vhost/_logging.erb
index 35a924d29b..b41c85cc5b 100644
--- a/templates/vhost/_logging.erb
+++ b/templates/vhost/_logging.erb
@@ -8,3 +8,14 @@
 <% if @log_level -%>
   LogLevel <%= @log_level %>
 <% end -%>
+<% if @error_log_format24 -%>
+  <%- @error_log_format24.each do |lfmt| -%>
+    <%- if lfmt.is_a?(Hash) -%>
+      <%- lfmt.each do |fmt, flag| -%>
+  ErrorLogFormat <%= flag %> "<%= fmt %>"
+      <%- end -%>
+    <%- else -%>
+  ErrorLogFormat "<%= lfmt %>"
+    <%- end -%>
+  <%- end -%>
+<% end -%>

From d64451330f0c1cbe241435d444150b0cac9c0b7e Mon Sep 17 00:00:00 2001
From: Alexander Ursu <alexander.ursu@gmail.com>
Date: Mon, 3 Feb 2020 13:28:51 +0100
Subject: [PATCH 1617/2267] Fix pdk validate (rubocop) warnings

---
 spec/defines/vhost_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 46267cf3cf..49aa22b52a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -246,7 +246,7 @@
               'error_log'                   => false,
               'error_log_file'              => 'httpd_error_log',
               'error_log_syslog'            => true,
-              'error_log_format'            => [ '[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i' ],
+              'error_log_format'            => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
               'error_documents'             => 'true',
               'fallbackresource'            => '/index.php',
               'scriptalias'                 => '/usr/lib/cgi-bin',
@@ -1914,7 +1914,7 @@
               {
                 'docroot'         => '/rspec/docroot',
                 'apache_version'  => '2.2',
-                'error_log_format' => [ '[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i' ],
+                'error_log_format' => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
               }
             end
 
@@ -1929,7 +1929,7 @@
               {
                 'docroot'          => '/rspec/docroot',
                 'apache_version'   => '2.4',
-                'error_log_format' => [ '[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i' ],
+                'error_log_format' => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
               }
             end
 
@@ -1945,9 +1945,9 @@
               {
                 'docroot'          => '/rspec/docroot',
                 'apache_version'   => '2.4',
-                'error_log_format' => [ 
+                'error_log_format' => [
                   '[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M',
-                  { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' }, 
+                  { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' },
                   { "[%{uc}t] [R:%L] UA:'%+{User-Agent}i'" => 'request' },
                   { "[%{uc}t] [R:%L] Referer:'%+{Referer}i'" => 'request' },
                   { '[%{uc}t] [C:%{c}L] local\ %a remote\ %A' => 'connection' },

From e84c705254220ea63c132f1fe6fd21e5401795d1 Mon Sep 17 00:00:00 2001
From: Alexander Ursu <alexander.ursu@gmail.com>
Date: Mon, 3 Feb 2020 15:53:29 +0100
Subject: [PATCH 1618/2267] Added acceptance test

---
 spec/acceptance/vhost_spec.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 04dcb597af..07ed107571 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1017,6 +1017,32 @@ class { 'apache': }
     end
   end
 
+  describe 'error_log_format is set' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      host { 'test.server': ip => '127.0.0.1' }
+      apache::vhost { 'test.server':
+        docroot          => '/tmp',
+        error_log        => true,
+        error_log_file   => 'error.log',
+        error_log_format => ['%{Referer}i'],
+      }
+    MANIFEST
+
+    it 'applies cleanly' do
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      if apache_hash['version'] == '2.4'
+        it { is_expected.to contain '  ErrorLogFormat "%{Referer}i"' }
+      else
+        it { is_expected.not_to contain 'ErrorLogFormat' }
+      end
+    end
+  end
+
   describe 'actions' do
     pp = <<-MANIFEST
       class { 'apache': }

From 94ad3ad63419b010e07f372281d7d90dba06a1a0 Mon Sep 17 00:00:00 2001
From: Alexander Ursu <alexander.ursu@gmail.com>
Date: Mon, 3 Feb 2020 17:44:14 +0100
Subject: [PATCH 1619/2267] Rename host (run on clean env?)

---
 spec/acceptance/vhost_spec.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 07ed107571..9d4d447f52 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1020,11 +1020,9 @@ class { 'apache': }
   describe 'error_log_format is set' do
     pp = <<-MANIFEST
       class { 'apache': }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
+      host { 'testlog.server': ip => '127.0.0.1' }
+      apache::vhost { 'testlog.server':
         docroot          => '/tmp',
-        error_log        => true,
-        error_log_file   => 'error.log',
         error_log_format => ['%{Referer}i'],
       }
     MANIFEST
@@ -1033,7 +1031,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-testlog.server.conf") do
       it { is_expected.to be_file }
       if apache_hash['version'] == '2.4'
         it { is_expected.to contain '  ErrorLogFormat "%{Referer}i"' }

From 8fa95942ad628b01ee032aa935dcfdd2bbdfc1b5 Mon Sep 17 00:00:00 2001
From: Alexander Ursu <alexander.ursu@gmail.com>
Date: Tue, 4 Feb 2020 00:45:33 +0100
Subject: [PATCH 1620/2267] Remove acceptance test

---
 spec/acceptance/vhost_spec.rb | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 9d4d447f52..04dcb597af 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1017,30 +1017,6 @@ class { 'apache': }
     end
   end
 
-  describe 'error_log_format is set' do
-    pp = <<-MANIFEST
-      class { 'apache': }
-      host { 'testlog.server': ip => '127.0.0.1' }
-      apache::vhost { 'testlog.server':
-        docroot          => '/tmp',
-        error_log_format => ['%{Referer}i'],
-      }
-    MANIFEST
-
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{apache_hash['vhost_dir']}/25-testlog.server.conf") do
-      it { is_expected.to be_file }
-      if apache_hash['version'] == '2.4'
-        it { is_expected.to contain '  ErrorLogFormat "%{Referer}i"' }
-      else
-        it { is_expected.not_to contain 'ErrorLogFormat' }
-      end
-    end
-  end
-
   describe 'actions' do
     pp = <<-MANIFEST
       class { 'apache': }

From 011cd8ab90cf9becd98720f11fe7952e3b0b5c11 Mon Sep 17 00:00:00 2001
From: Alexander Ursu <alexander.ursu@gmail.com>
Date: Tue, 4 Feb 2020 12:45:54 +0100
Subject: [PATCH 1621/2267] Add new directives on virtual host level

   Added deirectives LimitRequestBody, LimitRequestFields, LimitRequestFieldSize
   and LimitRequestLine
---
 manifests/vhost.pp               | 34 ++++++++++++++++++++++++++++++++
 spec/defines/vhost_spec.rb       | 24 ++++++++++++++++++++++
 templates/vhost/_file_header.erb | 12 +++++++++++
 3 files changed, 70 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f2e8ebd787..ffad93f275 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1632,6 +1632,36 @@
 # @param oidc_settings
 #   An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf].
 #
+# @param limitreqfields
+#   The `limitreqfields` parameter sets the maximum number of request header fields in
+#   an HTTP request. This directive gives the server administrator greater control over
+#   abnormal client request behavior, which may be useful for avoiding some forms of
+#   denial-of-service attacks. The value should be increased if normal clients see an error
+#   response from the server that indicates too many fields were sent in the request.
+#
+# @param limitreqfieldsize
+#   The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
+#   be allowed within a request header.
+#
+# @param limitreqline
+#   Limit the size of the HTTP request line that will be accepted from the client
+#   This directive sets the number of bytes that will be allowed on the HTTP
+#   request-line. The LimitRequestLine directive allows the server administrator
+#   to set the limit on the allowed size of a client's HTTP request-line. Since
+#   the request-line consists of the HTTP method, URI, and protocol version, the
+#   LimitRequestLine directive places a restriction on the length of a request-URI
+#   allowed for a request on the server. A server needs this value to be large
+#   enough to hold any of its resource names, including any information that might
+#   be passed in the query part of a GET request.
+#
+# @param limitreqbody
+#   Restricts the total size of the HTTP request body sent from the client
+#   The LimitRequestBody directive allows the user to set a limit on the allowed
+#   size of an HTTP request message body within the context in which the
+#   directive is given (server, per-directory, per-file or per-location). If the
+#   client request exceeds that limit, the server will return an error response
+#   instead of servicing the request.
+#
 define apache::vhost(
   Variant[Boolean,String] $docroot,
   $manage_docroot                                                                   = true,
@@ -1710,6 +1740,10 @@
   Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource       = undef,
   $scriptalias                                                                      = undef,
   $scriptaliases                                                                    = [],
+  Optional[Integer] $limitreqfieldsize                                              = undef,
+  Optional[Integer] $limitreqfields                                                 = undef,
+  Optional[Integer] $limitreqline                                                   = undef,
+  Optional[Integer] $limitreqbody                                                   = undef,
   $proxy_dest                                                                       = undef,
   $proxy_dest_match                                                                 = undef,
   $proxy_dest_reverse_match                                                         = undef,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f40cfcccf5..7effb2b4b5 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -259,6 +259,10 @@
                   'path'       => '/usr/share/fooscripts$1',
                 },
               ],
+              'limitreqfieldsize'           => 8190,
+              'limitreqfields'              => 100,
+              'limitreqline'                => 8190,
+              'limitreqbody'                => 0,
               'proxy_dest'                  => '/',
               'proxy_pass'                  => [
                 {
@@ -518,6 +522,26 @@
             }
           end
           it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+LimitRequestFieldSize 8190$},
+            ) 
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+LimitRequestFields 100$},
+            ) 
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+LimitRequestLine 8190$},
+            ) 
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+LimitRequestBody 0$},
+            ) 
+          }
           it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index 65d9b5cfd6..ac119ae01e 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -23,3 +23,15 @@
   ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %>
   <%- end -%>
 <% end -%>
+<% if @limitreqfieldsize -%>
+  LimitRequestFieldSize <%= @limitreqfieldsize %>
+<% end -%>
+<% if @limitreqfields -%>
+  LimitRequestFields <%= @limitreqfields %>
+<% end -%>
+<% if @limitreqline -%>
+  LimitRequestLine <%= @limitreqline %>
+<% end -%>
+<% if @limitreqbody -%>
+  LimitRequestBody <%= @limitreqbody %>
+<% end -%>
\ No newline at end of file

From e37da46f853ed321e5c7dd4297e2f1db6800ec3d Mon Sep 17 00:00:00 2001
From: Alexander Ursu <alexander.ursu@gmail.com>
Date: Tue, 4 Feb 2020 12:56:29 +0100
Subject: [PATCH 1622/2267] Corrected PDK issues (rubocop errors)

---
 spec/defines/vhost_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 7effb2b4b5..f1a16ba3f3 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -525,22 +525,22 @@
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+LimitRequestFieldSize 8190$},
-            ) 
+            )
           }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+LimitRequestFields 100$},
-            ) 
+            )
           }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+LimitRequestLine 8190$},
-            ) 
+            )
           }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+LimitRequestBody 0$},
-            ) 
+            )
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') }

From e882b9aa12f7f93a91ee0824e09360fb545209f1 Mon Sep 17 00:00:00 2001
From: Asier Aguado Corman <asier.aguado@cern.ch>
Date: Tue, 4 Feb 2020 14:24:43 +0100
Subject: [PATCH 1623/2267] Typo in oidcsettings.pp

---
 types/oidcsettings.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 4185258ac9..6993e2bdd6 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -21,7 +21,7 @@
     Optional['AuthRequestParams']                       => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
     Optional['SSLValidateServer']                       => Enum['On','Off'],
     Optional['UserInfoRefreshInterval']                 => Integer,
-    Optional['JWKSRefreshInterval']                     => Interger,
+    Optional['JWKSRefreshInterval']                     => Integer,
     Optional['UserInfoTokenMethod']                     => Enum['authz_header','post_param'],
     Optional['ProviderAuthRequestMethod']               => Enum['GET','POST'],
     Optional['PublicKeyFiles']                          => String,

From 9dd3fbfa540e9c6be3757bf29163e46fb88e833f Mon Sep 17 00:00:00 2001
From: Alex Dacre <alex.dacre@cirrus.com>
Date: Wed, 5 Feb 2020 16:43:51 +0000
Subject: [PATCH 1624/2267] Use ldap_trusted_mode in conditional

---
 templates/httpd.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index c8c9d4046b..b19d8da813 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -137,7 +137,7 @@ Include "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
 <% if @ldap_verify_server_cert -%>
 LDAPVerifyServerCert <%= @ldap_verify_server_cert %>
 <% end -%>
-<% if @ldap_verify_server_cert -%>
+<% if @ldap_trusted_mode -%>
 LDAPTrustedMode <%= @ldap_trusted_mode %>
 <% end -%>
 

From 3d0dcbecee815249a87e1e1ad8bd67fc00651848 Mon Sep 17 00:00:00 2001
From: Asier Aguado <asier.aguado@cern.ch>
Date: Wed, 5 Feb 2020 18:15:32 +0100
Subject: [PATCH 1625/2267] Remove quotes in oidcsettings regex patterns

---
 types/oidcsettings.pp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 6993e2bdd6..bc3ce5c7da 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -10,15 +10,15 @@
     Optional['ProviderJwksUri']                         => Stdlib::HTTPSUrl,
     Optional['ProviderTokenEndpoint']                   => Stdlib::HTTPSUrl,
     Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','none'],
-    Optional['ProviderTokenEndpointParams']             => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
+    Optional['ProviderTokenEndpointParams']             => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['ProviderUserInfoEndpoint']                => Stdlib::HTTPSUrl,
     Optional['ProviderCheckSessionIFrame']              => Stdlib::HTTPSUrl,
     Optional['ProviderEndSessionEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderBackChannelLogoutSupported']      => Enum['On','Off'],
     Optional['ProviderRegistrationEndpointJson']        => String,
-    Optional['Scope']                                   => Pattern['/^[A-Za-z0-9\-\._\s]+$/'],
-    Optional['AuthRequestParams']                       => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
+    Optional['Scope']                                   => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
+    Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['SSLValidateServer']                       => Enum['On','Off'],
     Optional['UserInfoRefreshInterval']                 => Integer,
     Optional['JWKSRefreshInterval']                     => Integer,
@@ -51,15 +51,15 @@
     Optional['OAuthIntrospectionEndpointCert']          => String,
     Optional['OAuthIntrospectionEndpointKey']           => String,
     Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST','GET'],
-    Optional['OAuthIntrospectionEndpointParams']        => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
+    Optional['OAuthIntrospectionEndpointParams']        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']        => String,
-    Optional['OAuthTokenExpiryClaim']                   => Pattern['/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/'],
+    Optional['OAuthTokenExpiryClaim']                   => Pattern[/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/],
     Optional['OAuthSSLValidateServer']                  => Enum['On','Off'],
     Optional['OAuthVerifySharedKeys']                   => String,
     Optional['OAuthVerifyCertFiles']                    => String,
     Optional['OAuthVerifyJwksUri']                      => Stdlib::HTTPSUrl,
     Optional['OAuthRemoteUserClaim']                    => String,
-    Optional['OAuthAcceptTokenAs']                      => Pattern['/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/'],
+    Optional['OAuthAcceptTokenAs']                      => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
     Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled','optional','required','enforced'],
     Optional['Cookie']                                  => String,
     Optional['SessionCookieChunkSize']                  => Integer,
@@ -67,10 +67,10 @@
     Optional['CookieSameSite']                          => Enum['On','Off'],
     Optional['PassCookies']                             => String,
     Optional['StripCookies']                            => String,
-    Optional['StateMaxNumberOfCookies']                 => Pattern['/^[0-9]+\s(false|true)$/'],
+    Optional['StateMaxNumberOfCookies']                 => Pattern[/^[0-9]+\s(false|true)$/],
     Optional['SessionInactivityTimeout']                => Integer,
     Optional['SessionMaxDuration']                      => Integer,
-    Optional['SessionType']                             => Pattern['/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/'],
+    Optional['SessionType']                             => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/],
     Optional['SessionCacheFallbackToCookie']            => Enum['On','Off'],
     Optional['CacheType']                               => Enum['shm','memcache','file','redis'],
     Optional['CacheEncrypt']                            => Enum['On','Off'],
@@ -83,14 +83,14 @@
     Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
     Optional['HTMLErrorTemplate']                       => String,
     Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
-    Optional['PathScope']                               => Pattern['/^[A-Za-z0-9\-\._\s]+$/'],
-    Optional['PathAuthRequestParams']                   => Pattern['/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/'],
+    Optional['PathScope']                               => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
+    Optional['PathAuthRequestParams']                   => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['IDTokenIatSlack']                         => Integer,
     Optional['ClaimPrefix']                             => String,
-    Optional['ClaimDelimiter']                          => Pattern['/^.$/'],
+    Optional['ClaimDelimiter']                          => Pattern[/^.$/],
     Optional['RemoteUserClaim']                         => String,
-    Optional['PassIDTokenAs']                           => Pattern['/^((claims|payload|serialized)\s?)+$/'],
-    Optional['PassUserInfoAs']                          => Pattern['/^((claims|json|jwt)\s?)+$/'],
+    Optional['PassIDTokenAs']                           => Pattern[/^((claims|payload|serialized)\s?)+$/],
+    Optional['PassUserInfoAs']                          => Pattern[/^((claims|json|jwt)\s?)+$/],
     Optional['PassClaimsAs']                            => Enum['none','headers','environment','both'],
     Optional['AuthNHeader']                             => String,
     Optional['HTTPTimeoutLong']                         => Integer,
@@ -104,9 +104,9 @@
     Optional['PassRefreshToken']                        => Enum['On','Off'],
     Optional['RequestObject']                           => String,
     Optional['ProviderMetadataRefreshInterval']         => Integer,
-    Optional['InfoHook']                                => Pattern['/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/'],
+    Optional['InfoHook']                                => Pattern[/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/],
     Optional['BlackListedClaims']                       => String,
     Optional['WhiteListedClaims']                       => String,
-    Optional['RefreshAccessTokenBeforeExpiry']          => Pattern['/^[0-9]+(\slogout_on_error)?$/'],
+    Optional['RefreshAccessTokenBeforeExpiry']          => Pattern[/^[0-9]+(\slogout_on_error)?$/],
   }
 ]

From 6659236faab64e290ecd91ace231c064d063e210 Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Wed, 5 Feb 2020 11:13:11 +0000
Subject: [PATCH 1626/2267] (IAC-365) updating tokens and dataset for honeycomb

---
 .github/workflows/release.yml | 4 +++-
 .sync.yml                     | 2 ++
 .travis.yml                   | 6 +++++-
 Gemfile                       | 8 ++++----
 Rakefile                      | 2 ++
 metadata.json                 | 4 ++--
 spec/spec_helper.rb           | 2 ++
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 820339d7b2..35162951ee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,9 @@ on:
 
 jobs:
   LitmusAcceptance:
-
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
     runs-on: self-hosted
 
     strategy:
diff --git a/.sync.yml b/.sync.yml
index a4a6d033fb..92ff48c0f4 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -5,6 +5,8 @@
   default_configs:
     inherit_from: ".rubocop_todo.yml"
 ".travis.yml":
+  global_env: 
+    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
   deploy_to_forge:
     enabled: false
   includes:
diff --git a/.travis.yml b/.travis.yml
index 031e12254f..d60d3d40ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ before_install:
   - rm -f Gemfile.lock
   - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
   - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
-  - '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
+  - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
+  - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
   - gem --version
   - bundle -v
 script:
@@ -15,6 +16,9 @@ script:
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
+env:
+  global:
+    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
 stages:
   - static
   - spec
diff --git a/Gemfile b/Gemfile
index 0e395e7ecb..4f6e33b02d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,10 +24,10 @@ group :development do
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
 
diff --git a/Rakefile b/Rakefile
index 0aab55f9ed..c21ec57741 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
diff --git a/metadata.json b/metadata.json
index dcf194ef93..f4b8440c1c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -82,7 +82,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.15.0",
+  "pdk-version": "1.16.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-gcaed9d7"
+  "template-ref": "heads/master-0-g5d52853"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c09e0024da..bc023f51af 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |c|
   c.mock_with :rspec
 end

From 91e924fd011e5692c6a4faf275587a52dc4c68b8 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Fri, 14 Feb 2020 15:18:52 +0000
Subject: [PATCH 1627/2267] (IAC-215) - Implement use_litmus:true

---
 .sync.yml | 90 +++++--------------------------------------------------
 1 file changed, 7 insertions(+), 83 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 92ff48c0f4..a36572bd9b 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -9,92 +9,16 @@
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
   deploy_to_forge:
     enabled: false
-  includes:
-  - bundler_args: 
-    dist: trusty
-    env: PLATFORMS=deb_puppet5
-    rvm: 2.5.3
-    before_script:
-    - bundle exec rake 'litmus:provision_list[travis_deb]'
-    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
-    - bundle exec rake 'litmus:install_agent[puppet5]'
-    - bundle exec rake litmus:install_module
-    script:
-    - bundle exec rake litmus:acceptance:parallel
-    services: docker
-    sudo: required
-    stage: acceptance
-  - bundler_args: 
-    dist: trusty
-    env: PLATFORMS=deb_puppet6
-    rvm: 2.5.3
-    before_script:
-    - bundle exec rake 'litmus:provision_list[travis_deb]'
-    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
-    - bundle exec rake 'litmus:install_agent[puppet6]'
-    - bundle exec rake litmus:install_module
-    script:
-    - bundle exec rake litmus:acceptance:parallel
-    services: docker
-    sudo: required
-    stage: acceptance
-  - bundler_args: 
-    dist: trusty
-    env: PLATFORMS=ub_puppet5
-    rvm: 2.5.3
-    before_script:
-    - bundle exec rake 'litmus:provision_list[travis_ub]'
-    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
-    - bundle exec rake 'litmus:install_agent[puppet5]'
-    - bundle exec rake litmus:install_module
-    script:
-    - bundle exec rake litmus:acceptance:parallel
-    services: docker
-    sudo: required
-    stage: acceptance
-  - bundler_args: 
-    dist: trusty
-    env: PLATFORMS=ub_puppet6
-    rvm: 2.5.3
-    before_script:
-    - bundle exec rake 'litmus:provision_list[travis_ub]'
-    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'
-    - bundle exec rake 'litmus:install_agent[puppet6]'
-    - bundle exec rake litmus:install_module
-    script:
-    - bundle exec rake litmus:acceptance:parallel
-    services: docker
-    sudo: required
-    stage: acceptance
-  - bundler_args: 
-    dist: trusty
-    env: PLATFORMS=el7_puppet5
-    rvm: 2.5.3
-    before_script:
-    - bundle exec rake 'litmus:provision_list[travis_el7]'
-    - bundle exec rake 'litmus:install_agent[puppet5]'
-    - bundle exec rake litmus:install_module
-    script:
-    - bundle exec rake litmus:acceptance:parallel
-    services: docker
-    sudo: required
-    stage: acceptance
-  - bundler_args: 
-    dist: trusty
-    env: PLATFORMS=el7_puppet6
-    rvm: 2.5.3
-    before_script:
-    - bundle exec rake 'litmus:provision_list[travis_el7]'
-    - bundle exec rake 'litmus:install_agent[puppet6]'
-    - bundle exec rake litmus:install_module
-    script:
-    - bundle exec rake litmus:acceptance:parallel
-    services: docker
-    sudo: required
-    stage: acceptance
   secure: ''
   branches:
   - release
+  use_litmus: true
+  litmus:
+    provision_list:
+      - travis_deb
+      - travis_ub
+      - travis_el7
+      - ---travis_el
   simplecov: true
   notifications:
     slack:

From 6316616fb93671f2dbea6139fa76d42632f31060 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Fri, 14 Feb 2020 15:19:53 +0000
Subject: [PATCH 1628/2267] (IAC-215) - Pdk Update

---
 .travis.yml   | 73 ++++++++++++++++++++++++++++++---------------------
 metadata.json |  2 +-
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d60d3d40ef..38115786db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 ---
+os: linux
 dist: xenial
 language: ruby
 cache: bundler
@@ -23,80 +24,92 @@ stages:
   - static
   - spec
   - acceptance
-matrix:
+jobs:
   fast_finish: true
   include:
     -
-      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
-      stage: static
-    -
-      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
-      rvm: 2.4.5
-      stage: spec
-    -
-      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.3
-      stage: spec
-    -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
       bundler_args: 
       dist: trusty
-      env: PLATFORMS=deb_puppet5
+      env: PLATFORMS=travis_deb_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-      sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_ub]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
       bundler_args: 
       dist: trusty
-      env: PLATFORMS=deb_puppet6
+      env: PLATFORMS=travis_ub_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-      sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
       bundler_args: 
       dist: trusty
-      env: PLATFORMS=ub_puppet5
+      env: PLATFORMS=travis_el7_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-      sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
       bundler_args: 
       dist: trusty
-      env: PLATFORMS=ub_puppet6
+      env: PLATFORMS=travis_deb_puppet6
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-      sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_ub]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
       bundler_args: 
       dist: trusty
-      env: PLATFORMS=el7_puppet5
+      env: PLATFORMS=travis_ub_puppet6
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-      sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
       bundler_args: 
       dist: trusty
-      env: PLATFORMS=el7_puppet6
+      env: PLATFORMS=travis_el7_puppet6
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-      sudo: required
+    -
+      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+      stage: static
+    -
+      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+      rvm: 2.4.5
+      stage: spec
+    -
+      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
+      rvm: 2.5.3
+      stage: spec
 branches:
   only:
     - master
diff --git a/metadata.json b/metadata.json
index f4b8440c1c..fa81197eee 100644
--- a/metadata.json
+++ b/metadata.json
@@ -84,5 +84,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.16.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g5d52853"
+  "template-ref": "heads/master-0-g88c96ab"
 }

From 9c1ad635f6393a918ac5fa41288e282eaaefd8a4 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Thu, 20 Feb 2020 11:36:33 +0200
Subject: [PATCH 1629/2267] Add weekly workflow on default branch

---
 .github/workflows/weekly.yml | 42 ++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 .github/workflows/weekly.yml

diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
new file mode 100644
index 0000000000..3be2e0523a
--- /dev/null
+++ b/.github/workflows/weekly.yml
@@ -0,0 +1,42 @@
+name: "weekly"
+
+on:
+  schedule:
+    - cron: '0 0 * * 6'
+
+jobs:
+  LitmusAcceptance:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby_version: [2.5.x]
+        puppet_gem_version: [~> 6.0]
+        platform: [release_checks]
+        agent_family: ['puppet5', 'puppet6']
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Litmus Parallel
+      uses: puppetlabs/action-litmus_parallel@master
+      with:
+        platform: ${{ matrix.platform }}
+        agent_family: ${{ matrix.agent_family }}
+  Spec:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        check: [spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
+        ruby_version: [2.5.x]
+        puppet_gem_version: [~> 5.0, ~> 6.0]
+        exclude:
+        - puppet_gem_version: ~> 5.0
+          check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
+        - ruby_version: 2.5.x
+          puppet_gem_version: ~> 5.0
+    steps:
+    - uses: actions/checkout@v1
+    - name: Spec Tests
+      uses: puppetlabs/action-litmus_spec@master
+      with:
+        puppet_gem_version: ${{ matrix.puppet_gem_version }}
+        check: ${{ matrix.check }}

From 74082b2a326a11222bd0cecc391b370d17241357 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Fri, 21 Feb 2020 17:48:57 +0200
Subject: [PATCH 1630/2267] Fix php_spec tests for CentOS-8

---
 spec/classes/mod/php_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index b60a18db36..fa557f24f0 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -206,7 +206,7 @@
       # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
       next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
               (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
-              (facts[:os]['release']['major'].to_i >= 8 && facts[:os]['name'] == 'RedHat')
+              (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS'))
 
       describe 'OS independent tests' do
         context 'with content param' do

From f43e0f1607901a7e7cc0d12e13b16ea07d6f3d72 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Wed, 26 Feb 2020 11:41:04 +0200
Subject: [PATCH 1631/2267] Update weekly workflow schedule

---
 .github/workflows/weekly.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 3be2e0523a..8b621bca8f 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -2,10 +2,13 @@ name: "weekly"
 
 on:
   schedule:
-    - cron: '0 0 * * 6'
+    - cron: '0 4 * * 1'
 
 jobs:
   LitmusAcceptance:
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
     runs-on: self-hosted
     strategy:
       matrix:
@@ -25,7 +28,7 @@ jobs:
     runs-on: self-hosted
     strategy:
       matrix:
-        check: [spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
+        check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
         ruby_version: [2.5.x]
         puppet_gem_version: [~> 5.0, ~> 6.0]
         exclude:

From 9784395d9526f4a250cb0724f3c64d4b54f7b5e0 Mon Sep 17 00:00:00 2001
From: HoucemEddine <h_hamidi@esi.dz>
Date: Wed, 26 Feb 2020 17:52:53 +0100
Subject: [PATCH 1632/2267] adding SetInputFilter

needed to treat incoming gzip objects
---
 spec/defines/vhost_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9d7642d8db..059279a88f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -159,6 +159,8 @@
                   'index_style_sheet' => '/styles/style.css' },
                 { 'path'              => '/var/www/files/output_filtered',
                   'set_output_filter' => 'output_filter' },
+                { 'path'              => '/var/www/files/input_filtered',
+                  'set_input_filter' => 'input_filter' },
                 { 'path'     => '/var/www/files',
                   'provider' => 'location',
                   'limit'    => [

From 213ff5fffe871c399566b0a0c39d0d30138af64a Mon Sep 17 00:00:00 2001
From: HoucemEddine <h_hamidi@esi.dz>
Date: Wed, 26 Feb 2020 17:54:32 +0100
Subject: [PATCH 1633/2267] add SetInputFilter to vhost template

---
 templates/vhost/_directories.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index bb95ac14ef..97056de893 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -377,6 +377,9 @@
     <%- if directory['set_output_filter'] -%>
     SetOutputFilter <%= directory['set_output_filter'] %>
     <%- end -%>
+    <%- if directory['set_input_filter'] -%>
+    SetInputFilter <%= directory['set_input_filter'] %>
+    <%- end -%>
     <%- if @shibboleth_enabled -%>
       <%- if directory['shib_require_session'] and ! directory['shib_require_session'].empty? -%>
     ShibRequireSession <%= directory['shib_require_session'] %>

From ef9828b92750efb9c597d10331c8c42485dde425 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Thu, 27 Feb 2020 13:47:23 +0200
Subject: [PATCH 1634/2267] Update travis to remove livelock

---
 .travis.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38115786db..7c6f9d9387 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ script:
   - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.3
+  - 2.5.7
 env:
   global:
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
@@ -35,8 +35,8 @@ jobs:
       bundler_args: 
       dist: trusty
       env: PLATFORMS=travis_deb_puppet5
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -47,8 +47,8 @@ jobs:
       bundler_args: 
       dist: trusty
       env: PLATFORMS=travis_ub_puppet5
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -59,8 +59,8 @@ jobs:
       bundler_args: 
       dist: trusty
       env: PLATFORMS=travis_el7_puppet5
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -71,8 +71,8 @@ jobs:
       bundler_args: 
       dist: trusty
       env: PLATFORMS=travis_deb_puppet6
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -83,8 +83,8 @@ jobs:
       bundler_args: 
       dist: trusty
       env: PLATFORMS=travis_ub_puppet6
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -95,8 +95,8 @@ jobs:
       bundler_args: 
       dist: trusty
       env: PLATFORMS=travis_el7_puppet6
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -108,7 +108,7 @@ jobs:
       stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.3
+      rvm: 2.5.7
       stage: spec
 branches:
   only:

From 460c395e55e58a421c6f86d5740cc41d111dfd20 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Thu, 27 Feb 2020 13:14:03 +0000
Subject: [PATCH 1635/2267] (maint) - Pdk Update

---
 .travis.yml   | 46 ++++++++++++++++++++--------------------------
 metadata.json |  4 ++--
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38115786db..434c282060 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ script:
   - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.3
+  - 2.5.7
 env:
   global:
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
@@ -32,11 +32,10 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args: 
-      dist: trusty
+      bundler_args:
       env: PLATFORMS=travis_deb_puppet5
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -44,11 +43,10 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_ub]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args: 
-      dist: trusty
+      bundler_args:
       env: PLATFORMS=travis_ub_puppet5
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -56,11 +54,10 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args: 
-      dist: trusty
+      bundler_args:
       env: PLATFORMS=travis_el7_puppet5
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -68,11 +65,10 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args: 
-      dist: trusty
+      bundler_args:
       env: PLATFORMS=travis_deb_puppet6
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -80,11 +76,10 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_ub]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args: 
-      dist: trusty
+      bundler_args:
       env: PLATFORMS=travis_ub_puppet6
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -92,11 +87,10 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args: 
-      dist: trusty
+      bundler_args:
       env: PLATFORMS=travis_el7_puppet6
-      rvm: 2.5.3
-      script: ["bundle exec rake litmus:acceptance:parallel"]
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
@@ -108,7 +102,7 @@ jobs:
       stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.3
+      rvm: 2.5.7
       stage: spec
 branches:
   only:
diff --git a/metadata.json b/metadata.json
index fa81197eee..62dbdab48b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -82,7 +82,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.16.0",
+  "pdk-version": "1.17.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g88c96ab"
+  "template-ref": "1.17.0-0-gd3a4319"
 }

From fc86edc305d6594e2d15a497febd9f8d0e013897 Mon Sep 17 00:00:00 2001
From: HoucemEddine <h_hamidi@esi.dz>
Date: Wed, 4 Mar 2020 09:56:50 +0100
Subject: [PATCH 1636/2267] adding inputfilter to vhost_spec

---
 spec/defines/vhost_spec.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 059279a88f..9832f328ed 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -690,6 +690,11 @@
               content: %r{^\s+SetOutputFilter\soutput_filter$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+SetInputFilter\sinput_filter$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+<Limit GET HEAD>$},

From 88ea59a173f74968eb4ebb89acae90f94a5b9a9b Mon Sep 17 00:00:00 2001
From: Jan Vansteenkiste <jan@vstone.eu>
Date: Wed, 26 Feb 2020 15:05:54 +0100
Subject: [PATCH 1637/2267] Re-add package for fcgid on debian/ubuntu machines

I'm not sure why this was ever removed. See #1932

* https://packages.debian.org/buster/libapache2-mod-fcgid
* https://packages.ubuntu.com/eoan/libapache2-mod-fcgid
---
 manifests/params.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index f6c6df7501..76a732e592 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -385,6 +385,7 @@
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-mod-svn',
         'fastcgi'               => 'libapache2-mod-fastcgi',
+        'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
         'jk'                    => 'libapache2-mod-jk',

From b06d9e48fea0be0663a2da36f71240077435c18d Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Fri, 6 Mar 2020 12:37:45 +0000
Subject: [PATCH 1638/2267] (IAC-555) - Remove distelli-manifest.yml

---
 distelli-manifest.yml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 distelli-manifest.yml

diff --git a/distelli-manifest.yml b/distelli-manifest.yml
deleted file mode 100644
index 520a54bfd1..0000000000
--- a/distelli-manifest.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-team-modules/puppetlabs-apache:
-  PreBuild:
-    - source /opt/rh/rh-ruby25/enable
-    - echo "--- LETS update BUNDLER ---"
-    - bundle install --path vendor/bundle --jobs 3
-  Build:
-    - echo "--- PROVISIONING ---"
-    - source /opt/rh/rh-ruby25/enable
-    - bundle exec rake litmus:provision_list[release_checks]
-    - cat inventory.yaml
-    - echo "--- AGENT INSTALLATION ---"
-    - bundle exec rake litmus:install_agent
-    - echo "--- MODULE INSTALLATION ---"
-    - bundle exec rake litmus:install_module
-    - echo "--- TESTS RUNNING ---"
-    - bundle exec rake litmus:acceptance:parallel
-  AfterBuildSuccess:
-    - source /opt/rh/rh-ruby25/enable
-    - bundle exec rake litmus:tear_down
-  AfterBuildFailure:
-    - source /opt/rh/rh-ruby25/enable
-    - bundle exec rake litmus:tear_down
-  CommitData:
-    - RepoType: Git
-    - RepoPath: .

From 78b1e4884e26d4fe36e3bb72d5768e0443956f75 Mon Sep 17 00:00:00 2001
From: Michael T Lombardi <michael.t.lombardi@outlook.com>
Date: Mon, 9 Mar 2020 09:22:49 -0500
Subject: [PATCH 1639/2267] (MAINT) Update docker image names

Prior to this commit the provision file referenced the old
waffleimage repo for CI docker images to use. This commit
updates the file to point at litmusimage, which is the repo
the latest images are released to.
---
 provision.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/provision.yaml b/provision.yaml
index c824da8531..7ba151cf0f 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -1,22 +1,22 @@
 ---
 default:
   provisioner: docker 
-  images: ['waffleimage/debian8']
+  images: ['litmusimage/debian:8']
 vagrant:
   provisioner: vagrant
   images: ['centos/7', 'generic/ubuntu1804']
 travis_deb:
   provisioner: docker
-  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/debian10']
+  images: ['litmusimage/debian:8', 'litmusimage/debian:9', 'litmusimage/debian:10']
 travis_ub:
   provisioner: docker
-  images: ['waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+  images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04']
 travis_el6:
   provisioner: docker
   images: []
 travis_el7:
   provisioner: docker
-  images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
+  images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
 release_checks:
   provisioner: vmpooler
   images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From 5540c82f58dfbeed0ecc880584771e1617cb697d Mon Sep 17 00:00:00 2001
From: Florin Dragos <florindragos@users.noreply.github.com>
Date: Wed, 18 Mar 2020 17:32:05 +0200
Subject: [PATCH 1640/2267] (maint) Lock facter version < 4

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 4f6e33b02d..84cfc2c346 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ group :development do
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
-facter_version = ENV['FACTER_GEM_VERSION']
+facter_version = ENV['FACTER_GEM_VERSION'] || '< 4.0.0'
 hiera_version = ENV['HIERA_GEM_VERSION']
 
 gems = {}

From dbb8767b91713e2ee4d1fa2412796a40dda2a738 Mon Sep 17 00:00:00 2001
From: Jon-Paul Lindquist <jlindquist@godaddy.com>
Date: Wed, 18 Mar 2020 17:42:26 -0700
Subject: [PATCH 1641/2267] Add ProxyIOBufferSize option

---
 manifests/mod/proxy.pp       | 27 ++++++++++++++-------------
 templates/mod/proxy.conf.erb |  3 +++
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 154898acbe..e8b648b46e 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -1,33 +1,34 @@
 # @summary
 #   Installs and configures `mod_proxy`.
-# 
+#
 # @param proxy_requests
 #   Enables forward (standard) proxy requests.
-# 
+#
 # @param allow_from
 #   List of IPs allowed to access proxy.
-# 
+#
 # @param apache_version
 #   Used to verify that the Apache version you have requested is compatible with the module.
-# 
+#
 # @param package_name
 #   Name of the proxy package to install.
-# 
+#
 # @param proxy_via
 #   Set local IP address for outgoing proxy connections.
-# 
+#
 # @param proxy_timeout
 #   Network timeout for proxied requests.
-# 
+#
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
 #
 class apache::mod::proxy (
-  $proxy_requests = 'Off',
-  $allow_from     = undef,
-  $apache_version = undef,
-  $package_name   = undef,
-  $proxy_via      = 'On',
-  $proxy_timeout  = undef,
+  $proxy_requests     = 'Off',
+  $allow_from         = undef,
+  $apache_version     = undef,
+  $package_name       = undef,
+  $proxy_via          = 'On',
+  $proxy_timeout      = undef,
+  $proxyiobuffersize  = undef,
 ) {
   include ::apache
   $_proxy_timeout = $apache::timeout
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index f9dee733f9..5d3011a435 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -28,4 +28,7 @@
   <%- if @proxy_timeout -%>
   ProxyTimeout <%= @proxy_timeout %>
   <%- end -%>
+  <%- if @proxyiobuffersize -%>
+  ProxyIOBufferSize <%= @proxyiobuffersize %>
+  <%- end -%>
 </IfModule>

From d0fbb6789dfeae5ba33d6d593b745a0c668cd0f5 Mon Sep 17 00:00:00 2001
From: Florin Dragos <florindragos@users.noreply.github.com>
Date: Mon, 23 Mar 2020 17:06:16 +0200
Subject: [PATCH 1642/2267] Revert "(maint) Lock facter version < 4"

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 84cfc2c346..4f6e33b02d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ group :development do
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
-facter_version = ENV['FACTER_GEM_VERSION'] || '< 4.0.0'
+facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
 
 gems = {}

From 68085c39fe17a94a164479dae3c4171d84a8e892 Mon Sep 17 00:00:00 2001
From: Atanas Stoyanov <astoyanov@intelliad.de>
Date: Mon, 6 Apr 2020 14:23:02 +0200
Subject: [PATCH 1643/2267] Changed the apache-mod-ldap.conf title to
 ldap.conf, otherwise no symlink for the ldap.conf is created as required by
 mod.pp.

---
 manifests/mod/ldap.pp         |  2 +-
 spec/classes/mod/ldap_spec.rb | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index ef0841bd21..95707b47a8 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -68,7 +68,7 @@
     package => $package_name,
   }
   # Template uses $_apache_version
-  file { 'apache-mod-ldap.conf':
+  file { 'ldap.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/ldap.conf",
     mode    => $::apache::file_mode,
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 5dbe3780ad..b9cb9dfb35 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -22,13 +22,13 @@
     it { is_expected.to contain_apache__mod('ldap') }
 
     context 'default ldap_trusted_global_cert_file' do
-      it { is_expected.to contain_file('apache-mod-ldap.conf').without_content(%r{^LDAPTrustedGlobalCert}) }
+      it { is_expected.to contain_file('ldap.conf').without_content(%r{^LDAPTrustedGlobalCert}) }
     end
 
     context 'ldap_trusted_global_cert_file param' do
       let(:params) { { ldap_trusted_global_cert_file: 'ca.pem' } }
 
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$}) }
     end
 
     context 'set multiple ldap params' do
@@ -46,20 +46,20 @@
         }
       end
 
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_DER ca\.pem$}) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedMode TLS$}) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPSharedCacheSize 500000$}) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPCacheEntries 1024$}) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPCacheTTL 600$}) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPOpCacheEntries 1024$}) }
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPOpCacheTTL 600$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_DER ca\.pem$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPTrustedMode TLS$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPSharedCacheSize 500000$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPCacheEntries 1024$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPCacheTTL 600$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPOpCacheEntries 1024$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPOpCacheTTL 600$}) }
 
       expected_ldap_path_re =
         "<Location /custom-ldap-status>\n"\
         "\s*SetHandler ldap-status\n"\
         ".*\n"\
         "</Location>\n"
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{#{expected_ldap_path_re}}m) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{#{expected_ldap_path_re}}m) }
     end
   end # Debian
 
@@ -81,13 +81,13 @@
     it { is_expected.to contain_apache__mod('ldap') }
 
     context 'default ldap_trusted_global_cert_file' do
-      it { is_expected.to contain_file('apache-mod-ldap.conf').without_content(%r{^LDAPTrustedGlobalCert}) }
+      it { is_expected.to contain_file('ldap.conf').without_content(%r{^LDAPTrustedGlobalCert}) }
     end
 
     context 'ldap_trusted_global_cert_file param' do
       let(:params) { { ldap_trusted_global_cert_file: 'ca.pem' } }
 
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$}) }
     end
 
     context 'ldap_trusted_global_cert_file and ldap_trusted_global_cert_type params' do
@@ -98,7 +98,7 @@
         }
       end
 
-      it { is_expected.to contain_file('apache-mod-ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_DER ca\.pem$}) }
+      it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPTrustedGlobalCert CA_DER ca\.pem$}) }
     end
 
     context 'SCL' do

From f01a028a15262c742fdbe244c79d7ddb518fc6fb Mon Sep 17 00:00:00 2001
From: Jon-Paul Lindquist <jlindquist@godaddy.com>
Date: Wed, 8 Apr 2020 09:34:59 -0700
Subject: [PATCH 1644/2267] Rename variable, add param description

---
 manifests/mod/proxy.pp       | 5 ++++-
 templates/mod/proxy.conf.erb | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index e8b648b46e..4564e337b6 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -19,6 +19,9 @@
 # @param proxy_timeout
 #   Network timeout for proxied requests.
 #
+# @param proxy_iobuffersize
+#   Set the size of internal data throughput buffer
+#
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
 #
 class apache::mod::proxy (
@@ -28,7 +31,7 @@
   $package_name       = undef,
   $proxy_via          = 'On',
   $proxy_timeout      = undef,
-  $proxyiobuffersize  = undef,
+  $proxy_iobuffersize = undef,
 ) {
   include ::apache
   $_proxy_timeout = $apache::timeout
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index 5d3011a435..ddfe15afed 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -29,6 +29,6 @@
   ProxyTimeout <%= @proxy_timeout %>
   <%- end -%>
   <%- if @proxyiobuffersize -%>
-  ProxyIOBufferSize <%= @proxyiobuffersize %>
+  ProxyIOBufferSize <%= @proxy_iobuffersize %>
   <%- end -%>
 </IfModule>

From 0e74db4451223dcc7d634642e06a3e8aebb9b669 Mon Sep 17 00:00:00 2001
From: Jon-Paul Lindquist <jlindquist@godaddy.com>
Date: Mon, 13 Apr 2020 15:55:23 -0700
Subject: [PATCH 1645/2267] Fix conditional

---
 templates/mod/proxy.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index ddfe15afed..76968cb6fe 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -28,7 +28,7 @@
   <%- if @proxy_timeout -%>
   ProxyTimeout <%= @proxy_timeout %>
   <%- end -%>
-  <%- if @proxyiobuffersize -%>
+  <%- if @proxy_iobuffersize -%>
   ProxyIOBufferSize <%= @proxy_iobuffersize %>
   <%- end -%>
 </IfModule>

From d4f1ac3ce2d27eaf469e4031e0c525ec2024347f Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 27 Apr 2020 14:26:49 +0300
Subject: [PATCH 1646/2267] Add net-ssh dependency gems to development group

---
 Gemfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index 4f6e33b02d..adbbe6d0a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,8 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
+  gem 'ed25519', '>= 1.2', '< 2.0'
+  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

From 8fa7511308ce0d06ea7fff1b634c282d3661e7a3 Mon Sep 17 00:00:00 2001
From: Daiana_Mezdrea <daiana.mezdrea@yahoo.com>
Date: Thu, 30 Apr 2020 11:18:10 +0300
Subject: [PATCH 1647/2267] Disable testing on Redhat5 and Centos5

---
 metadata.json  | 2 --
 provision.yaml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/metadata.json b/metadata.json
index 62dbdab48b..885c9c6808 100644
--- a/metadata.json
+++ b/metadata.json
@@ -21,7 +21,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7",
         "8"
@@ -30,7 +29,6 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7",
         "8"
diff --git a/provision.yaml b/provision.yaml
index 7ba151cf0f..1a3951d975 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -19,4 +19,4 @@ travis_el7:
   images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
 release_checks:
   provisioner: vmpooler
-  images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From 4016e418ab8c7040f28b90df694550e0f1986f5e Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Sat, 2 May 2020 11:05:38 +0100
Subject: [PATCH 1648/2267] Tidy up `pw_hash` function

* Remove legacy non-namespaced `lib/puppet/parser/functions/apache_pw_hash.rb`
* Create 4x API non-namespaced `apache_pw_hash` shim that calls `apache::pw_hash`
* Rename existing 4x API `apache::apache_pw_hash` to `apache::pw_hash`
* Create shim for `apache::apache_pw_hash` that calls `apache::pw_hash`
* Mark shims as DEPRECATED
* Test all 3 versions work
---
 lib/puppet/functions/apache/apache_pw_hash.rb | 23 ++++---------
 lib/puppet/functions/apache/pw_hash.rb        | 21 ++++++++++++
 lib/puppet/functions/apache_pw_hash.rb        | 10 ++++++
 lib/puppet/parser/functions/apache_pw_hash.rb | 23 -------------
 ...apache_pw_hash_spec.rb => pw_hash_spec.rb} | 15 ++++++++-
 .../parser/functions/apache_pw_hash_spec.rb   | 32 -------------------
 6 files changed, 51 insertions(+), 73 deletions(-)
 create mode 100644 lib/puppet/functions/apache/pw_hash.rb
 create mode 100644 lib/puppet/functions/apache_pw_hash.rb
 delete mode 100644 lib/puppet/parser/functions/apache_pw_hash.rb
 rename spec/functions/{apache_pw_hash_spec.rb => pw_hash_spec.rb} (60%)
 delete mode 100644 spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb

diff --git a/lib/puppet/functions/apache/apache_pw_hash.rb b/lib/puppet/functions/apache/apache_pw_hash.rb
index 77863e9424..019db01822 100644
--- a/lib/puppet/functions/apache/apache_pw_hash.rb
+++ b/lib/puppet/functions/apache/apache_pw_hash.rb
@@ -1,21 +1,10 @@
-# @summary
-#   Hashes a password in a format suitable for htpasswd files read by apache.
-#
-# Currently uses SHA-hashes, because although this format is considered insecure, its the
-# most secure format supported by the most platforms.
+# @summary DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
 Puppet::Functions.create_function(:'apache::apache_pw_hash') do
-  # @param password
-  #   The input that is to be hashed.
-  #
-  # @return
-  #   Return's the hash of the input that was given.
-  dispatch :apache_pw_hash do
-    required_param 'String[1]', :password
-    return_type 'String'
+  dispatch :deprecation_gen do
+    repeated_param 'Any', :args
   end
-
-  def apache_pw_hash(password)
-    require 'base64'
-    '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
+  def deprecation_gen(*args)
+    call_function('deprecation', 'apache::apache_pw_hash', 'This function is deprecated, please use apache::pw_hash instead.')
+    call_function('apache::pw_hash', *args)
   end
 end
diff --git a/lib/puppet/functions/apache/pw_hash.rb b/lib/puppet/functions/apache/pw_hash.rb
new file mode 100644
index 0000000000..60a41c240f
--- /dev/null
+++ b/lib/puppet/functions/apache/pw_hash.rb
@@ -0,0 +1,21 @@
+# @summary
+#   Hashes a password in a format suitable for htpasswd files read by apache.
+#
+# Currently uses SHA-hashes, because although this format is considered insecure, it's the
+# most secure format supported by the most platforms.
+Puppet::Functions.create_function(:'apache::pw_hash') do
+  # @param password
+  #   The input that is to be hashed.
+  #
+  # @return
+  #   Returns the hash of the input that was given.
+  dispatch :apache_pw_hash do
+    required_param 'String[1]', :password
+    return_type 'String'
+  end
+
+  def apache_pw_hash(password)
+    require 'base64'
+    '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
+  end
+end
diff --git a/lib/puppet/functions/apache_pw_hash.rb b/lib/puppet/functions/apache_pw_hash.rb
new file mode 100644
index 0000000000..2fd9cf8292
--- /dev/null
+++ b/lib/puppet/functions/apache_pw_hash.rb
@@ -0,0 +1,10 @@
+# @summary DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
+Puppet::Functions.create_function(:apache_pw_hash) do
+  dispatch :deprecation_gen do
+    repeated_param 'Any', :args
+  end
+  def deprecation_gen(*args)
+    call_function('deprecation', 'apache_pw_hash', 'This function is deprecated, please use apache::pw_hash instead.')
+    call_function('apache::pw_hash', *args)
+  end
+end
diff --git a/lib/puppet/parser/functions/apache_pw_hash.rb b/lib/puppet/parser/functions/apache_pw_hash.rb
deleted file mode 100644
index 2395e5b28b..0000000000
--- a/lib/puppet/parser/functions/apache_pw_hash.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'base64'
-
-Puppet::Parser::Functions.newfunction(:apache_pw_hash, type: :rvalue, doc: <<-DOC
-  @summary
-    Hashes a password in a format suitable for htpasswd files read by apache.
-
-  Currently uses SHA-hashes, because although this format is considered insecure, its the
-  most secure format supported by the most platforms.
-
-  @param password
-    The input that is to be hashed.
-
-  @return
-    Return's the hash of the input that was given.
-DOC
-                                     ) do |args|
-  raise(Puppet::ParseError, "apache_pw_hash() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
-  raise(Puppet::ParseError, 'apache_pw_hash(): first argument must be a string') unless args[0].is_a? String
-  raise(Puppet::ParseError, 'apache_pw_hash(): first argument must not be empty') if args[0].empty?
-
-  password = args[0]
-  return '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
-end
diff --git a/spec/functions/apache_pw_hash_spec.rb b/spec/functions/pw_hash_spec.rb
similarity index 60%
rename from spec/functions/apache_pw_hash_spec.rb
rename to spec/functions/pw_hash_spec.rb
index b8b6812347..9f34f7d43d 100644
--- a/spec/functions/apache_pw_hash_spec.rb
+++ b/spec/functions/pw_hash_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'apache::apache_pw_hash' do
+shared_examples 'apache::pw_hash function' do
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('').and_raise_error(ArgumentError) }
@@ -10,3 +10,16 @@
   it { is_expected.to run.with_params([]).and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('test').and_return('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=') }
 end
+
+describe 'apache::pw_hash' do
+  it_behaves_like 'apache::pw_hash function'
+
+  describe 'deprecated shims' do
+    describe 'apache_pw_hash', type: :puppet_function do
+      it_behaves_like 'apache::pw_hash function'
+    end
+    describe 'apache::apache_pw_hash', type: :puppet_function do
+      it_behaves_like 'apache::pw_hash function'
+    end
+  end
+end
diff --git a/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb b/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb
deleted file mode 100644
index 13f733788a..0000000000
--- a/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe 'the apache_pw_hash function' do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it 'exists' do
-    expect(Puppet::Parser::Functions.function('apache_pw_hash')).to eq('function_apache_pw_hash')
-  end
-
-  it 'raises a ParseError if there is less than 1 arguments' do
-    expect { scope.function_apache_pw_hash([]) }.to(raise_error(Puppet::ParseError))
-  end
-
-  it 'raises an Puppet::ParseError if argument is an empty string' do
-    expect { scope.function_apache_pw_hash(['']) }.to(raise_error(Puppet::ParseError))
-  end
-
-  context 'when argument is not a string' do
-    it { expect { scope.function_apache_pw_hash([1]) }.to(raise_error(Puppet::ParseError)) }
-    it { expect { scope.function_apache_pw_hash([true]) }.to(raise_error(Puppet::ParseError)) }
-    it { expect { scope.function_apache_pw_hash([{}]) }.to(raise_error(Puppet::ParseError)) }
-    it { expect { scope.function_apache_pw_hash([[]]) }.to(raise_error(Puppet::ParseError)) }
-  end
-
-  it 'raises an Puppet::ParseError if argument is not a string' do
-    expect { scope.function_apache_pw_hash([1]) }.to(raise_error(Puppet::ParseError))
-  end
-
-  it 'returns proper hash' do
-    expect(scope.function_apache_pw_hash(['test'])).to(eq('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M='))
-  end
-end

From 331e5273a655ed594456bb2971f3628e56ae139c Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Sat, 2 May 2020 11:39:18 +0100
Subject: [PATCH 1649/2267] Replace legacy `bool2httpd()` function with shim

This commit replaces the legacy
`lib/puppet/parser/functions/bool2httpd.rb` function with a 4.x API shim
function that calls the namespaced `apache::bool2httpd` function.

The shim might not actually be necessary as the function is probably
`private`.

The non-namespaced legacy version was still being used in a few
instances in templates.  This has been corrected.
---
 lib/puppet/functions/apache/bool2httpd.rb     |  8 +--
 lib/puppet/functions/bool2httpd.rb            | 10 ++++
 lib/puppet/parser/functions/bool2httpd.rb     | 27 ----------
 spec/functions/bool2httpd_spec.rb             | 12 ++++-
 .../parser/functions/bool2httpd_spec.rb       | 53 -------------------
 templates/mod/geoip.conf.erb                  |  4 +-
 templates/mod/itk.conf.erb                    |  2 +-
 7 files changed, 28 insertions(+), 88 deletions(-)
 create mode 100644 lib/puppet/functions/bool2httpd.rb
 delete mode 100644 lib/puppet/parser/functions/bool2httpd.rb
 delete mode 100644 spec/unit/puppet/parser/functions/bool2httpd_spec.rb

diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
index 582c0db6af..991216408c 100644
--- a/lib/puppet/functions/apache/bool2httpd.rb
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -6,15 +6,15 @@
   #   The value to be converted into a string.
   #
   # @return
-  #   Will return either `On` or `Off` if given a boolean value. Return's a string of any
+  #   Will return either `On` or `Off` if given a boolean value. Returns a string of any
   #   other given value.
   # @example
   #   $trace_enable     = false
   #   $server_signature = 'mail'
   #
-  #   bool2httpd($trace_enable) # returns 'Off'
-  #   bool2httpd($server_signature) # returns 'mail'
-  #   bool2httpd(undef) # returns 'Off'
+  #   apache::bool2httpd($trace_enable) # returns 'Off'
+  #   apache::bool2httpd($server_signature) # returns 'mail'
+  #   apache::bool2httpd(undef) # returns 'Off'
   #
   def bool2httpd(arg)
     return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
diff --git a/lib/puppet/functions/bool2httpd.rb b/lib/puppet/functions/bool2httpd.rb
new file mode 100644
index 0000000000..af5b5c5d55
--- /dev/null
+++ b/lib/puppet/functions/bool2httpd.rb
@@ -0,0 +1,10 @@
+# @summary DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
+Puppet::Functions.create_function(:bool2httpd) do
+  dispatch :deprecation_gen do
+    repeated_param 'Any', :args
+  end
+  def deprecation_gen(*args)
+    call_function('deprecation', 'bool2httpd', 'This function is deprecated, please use apache::bool2httpd instead.')
+    call_function('apache::bool2httpd', *args)
+  end
+end
diff --git a/lib/puppet/parser/functions/bool2httpd.rb b/lib/puppet/parser/functions/bool2httpd.rb
deleted file mode 100644
index 731dbaf7ef..0000000000
--- a/lib/puppet/parser/functions/bool2httpd.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-Puppet::Parser::Functions.newfunction(:bool2httpd, type: :rvalue, doc: <<-DOC
-  @summary
-    Transform a supposed boolean to On or Off. Pass all other values through.
-
-  @param arg
-    The value to be converted into a string.
-
-  @return
-    Will return either `On` or `Off` if given a boolean value. Return's a string of any
-    other given value.
-
-  @example
-    $trace_enable     = false
-    $server_signature = 'mail'
-
-    bool2httpd($trace_enable) # returns 'Off'
-    bool2httpd($server_signature) # returns 'mail'
-    bool2httpd(undef) # returns 'Off'
-DOC
-                                     ) do |args|
-  raise(Puppet::ParseError, "bool2httpd() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
-
-  arg = args[0]
-  return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
-  return 'On' if arg == true || arg =~ %r{true}i
-  return arg.to_s
-end
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
index 9d37d6b74d..e436e0e3a6 100644
--- a/spec/functions/bool2httpd_spec.rb
+++ b/spec/functions/bool2httpd_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'apache::bool2httpd' do
+shared_examples 'apache::bool2httpd function' do
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
@@ -17,3 +17,13 @@
   it { is_expected.to run.with_params(:undef).and_return('Off') }
   it { is_expected.to run.with_params('foo').and_return('foo') }
 end
+
+describe 'apache::bool2httpd' do
+  it_behaves_like 'apache::bool2httpd function'
+
+  describe 'deprecated non-namespaced shim' do
+    describe 'bool2httpd', type: :puppet_function do
+      it_behaves_like 'apache::bool2httpd function'
+    end
+  end
+end
diff --git a/spec/unit/puppet/parser/functions/bool2httpd_spec.rb b/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
deleted file mode 100644
index 1b73fa242a..0000000000
--- a/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require 'spec_helper'
-
-describe 'the bool2httpd function' do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it 'exists' do
-    expect(Puppet::Parser::Functions.function('bool2httpd')).to eq('function_bool2httpd')
-  end
-
-  it 'raises a ParseError if there is less than 1 arguments' do
-    expect { scope.function_bool2httpd([]) }.to(raise_error(Puppet::ParseError))
-  end
-
-  it "converts true to 'On'" do
-    result = scope.function_bool2httpd([true])
-    expect(result).to(eq('On'))
-  end
-
-  it 'converts true to a string' do
-    result = scope.function_bool2httpd([true])
-    expect(result.class).to(eq(String))
-  end
-
-  it "converts false to 'Off'" do
-    result = scope.function_bool2httpd([false])
-    expect(result).to(eq('Off'))
-  end
-
-  it 'converts false to a string' do
-    result = scope.function_bool2httpd([false])
-    expect(result.class).to(eq(String))
-  end
-
-  it 'accepts (and return) any string' do
-    result = scope.function_bool2httpd(['mail'])
-    expect(result).to(eq('mail'))
-  end
-
-  it 'accepts a nil value (and return Off)' do
-    result = scope.function_bool2httpd([nil])
-    expect(result).to(eq('Off'))
-  end
-
-  it "accepts an undef value (and return 'Off')" do
-    result = scope.function_bool2httpd([:undef])
-    expect(result).to(eq('Off'))
-  end
-
-  it 'returns a default value on non-matches' do
-    result = scope.function_bool2httpd(['foo'])
-    expect(result).to(eq('foo'))
-  end
-end
diff --git a/templates/mod/geoip.conf.erb b/templates/mod/geoip.conf.erb
index 8cedc79ebb..a99bee0485 100644
--- a/templates/mod/geoip.conf.erb
+++ b/templates/mod/geoip.conf.erb
@@ -14,12 +14,12 @@ GeoIPOutput <%= @output %>
 GeoIPEnableUTF8 <%= scope.call_function('apache::bool2httpd', [@enable_utf8]) %>
 <% end -%>
 <% if ! @scan_proxy_headers.nil? -%>
-GeoIPScanProxyHeaders <%= scope.function_bool2httpd([@scan_proxy_headers]) %>
+GeoIPScanProxyHeaders <%= scope.call_function('apache::bool2httpd', [@scan_proxy_headers]) %>
 <% end -%>
 <% if ! @scan_proxy_header_field.nil? -%>
 GeoIPScanProxyHeaderField <%= @scan_proxy_header_field %>
 <% end -%>
 <% if ! @use_last_xforwarededfor_ip.nil? -%>
-GeoIPUseLastXForwardedForIP <%= scope.function_bool2httpd([@use_last_xforwarededfor_ip]) %>
+GeoIPUseLastXForwardedForIP <%= scope.call_function('apache::bool2httpd', [@use_last_xforwarededfor_ip]) %>
 <% end -%>
 
diff --git a/templates/mod/itk.conf.erb b/templates/mod/itk.conf.erb
index fe6ef19be4..4abade8fb5 100644
--- a/templates/mod/itk.conf.erb
+++ b/templates/mod/itk.conf.erb
@@ -6,6 +6,6 @@
   MaxClients          <%= @maxclients %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
   <%- if (not @enablecapabilities.nil?) && (scope.function_versioncmp([@_apache_version, '2.4']) >= 0) -%>
-  EnableCapabilities  <%= scope.function_bool2httpd([@enablecapabilities]) %>
+  EnableCapabilities  <%= scope.call_function('apache::bool2httpd', [@enablecapabilities]) %>
   <%- end -%>
 </IfModule>

From 426099e50c0f7a2d80f5b10b6f296edbb553a446 Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Sat, 2 May 2020 10:12:47 +0100
Subject: [PATCH 1650/2267] Replace validate_apache_loglevel() with data type

The function was introduced before Puppet 4 was released.  It was
originally created to reduce duplicated use of stdlib's `validate_re`.

See https://github.com/puppetlabs/puppetlabs-apache/pull/1097
---
 .../apache/validate_apache_log_level.rb       | 28 --------------
 .../functions/validate_apache_log_level.rb    | 31 ---------------
 manifests/init.pp                             |  8 ++--
 manifests/vhost.pp                            |  6 +--
 .../validate_apache_log_level_spec.rb         | 12 ------
 spec/type_aliases/loglevel_spec.rb            | 23 +++++++++++
 .../functions/validate_apache_log_level.rb    | 38 -------------------
 types/loglevel.pp                             | 27 +++++++++++++
 8 files changed, 54 insertions(+), 119 deletions(-)
 delete mode 100644 lib/puppet/functions/apache/validate_apache_log_level.rb
 delete mode 100644 lib/puppet/parser/functions/validate_apache_log_level.rb
 delete mode 100644 spec/functions/validate_apache_log_level_spec.rb
 create mode 100644 spec/type_aliases/loglevel_spec.rb
 delete mode 100644 spec/unit/puppet/parser/functions/validate_apache_log_level.rb
 create mode 100644 types/loglevel.pp

diff --git a/lib/puppet/functions/apache/validate_apache_log_level.rb b/lib/puppet/functions/apache/validate_apache_log_level.rb
deleted file mode 100644
index 0f581f7cd5..0000000000
--- a/lib/puppet/functions/apache/validate_apache_log_level.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# @summary
-#   Perform simple validation of a string against the list of known log levels.
-#
-# As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
-#     * validate_apache_loglevel('info')
-#
-# Modules maybe specified with their own levels like these:
-#     * validate_apache_loglevel('warn ssl:info')
-#     * validate_apache_loglevel('warn mod_ssl.c:info')
-#     * validate_apache_loglevel('warn ssl_module:info')
-#
-# Expected to be used from the main or vhost.
-# Might be used from directory too later as apache supports that
-Puppet::Functions.create_function(:'apache::validate_apache_log_level') do
-  # @param log_level
-  #   The string that is to be validated.
-  #
-  # @return
-  #   Return's an error if the validation fails.
-  dispatch :validate_apache_log_level do
-    required_param 'String', :log_level
-  end
-
-  def validate_apache_log_level(log_level)
-    msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."
-    raise Puppet::ParseError, msg unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
-  end
-end
diff --git a/lib/puppet/parser/functions/validate_apache_log_level.rb b/lib/puppet/parser/functions/validate_apache_log_level.rb
deleted file mode 100644
index e0e06e84fe..0000000000
--- a/lib/puppet/parser/functions/validate_apache_log_level.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# validate_apache_log_level.rb
-module Puppet::Parser::Functions
-  newfunction(:validate_apache_log_level, doc: <<-DOC
-    @summary
-      Perform simple validation of a string against the list of known log levels.
-
-    As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
-        * validate_apache_loglevel('info')
-    Modules maybe specified with their own levels like these:
-        * validate_apache_loglevel('warn ssl:info')
-        * validate_apache_loglevel('warn mod_ssl.c:info')
-        * validate_apache_loglevel('warn ssl_module:info')
-    Expected to be used from the main or vhost.
-    Might be used from directory too later as apaceh supports that
-
-    @param log_level
-      The string that is to be validated.
-
-    @return
-      Return's an error if the validation fails.
-DOC
-             ) do |args|
-    if args.size != 1
-      raise Puppet::ParseError, "validate_apache_loglevel(): wrong number of arguments (#{args.length}; must be 1)"
-    end
-
-    log_level = args[0]
-    msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."
-    raise Puppet::ParseError, msg unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
-  end
-end
diff --git a/manifests/init.pp b/manifests/init.pp
index 1f230e82ac..67fdaf7c4a 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -195,8 +195,8 @@
 #   > **Note**: Do not configure this parameter manually without special reason.
 #
 # @param log_level
-#   Changes the error log's verbosity. Valid options are: `alert`, `crit`, `debug`, `emerg`, `error`, 
-#   `info`, `notice` and `warn`.
+#   Configures the apache [LogLevel](https://httpd.apache.org/docs/current/mod/core.html#loglevel) directive
+#   which adjusts the verbosity of the messages recorded in the error logs.
 #
 # @param log_formats
 #   Define additional `LogFormat` directives. Values: A hash, such as:
@@ -520,7 +520,7 @@
   $limitreqfields                                                       = '100',
   $logroot                                                              = $::apache::params::logroot,
   $logroot_mode                                                         = $::apache::params::logroot_mode,
-  $log_level                                                            = $::apache::params::log_level,
+  Apache::LogLevel $log_level                                           = $::apache::params::log_level,
   $log_formats                                                          = {},
   $ssl_file                                                             = undef,
   $ports_file                                                           = $::apache::params::ports_file,
@@ -602,8 +602,6 @@
     }
   }
 
-  apache::validate_apache_log_level($log_level)
-
   class { '::apache::service':
     service_name    => $service_name,
     service_enable  => $service_enable,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4dcfd21ed7..bb7a036e13 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1735,7 +1735,7 @@
   $logroot_mode                                                                     = undef,
   $logroot_owner                                                                    = undef,
   $logroot_group                                                                    = undef,
-  $log_level                                                                        = undef,
+  Optional[Apache::LogLevel] $log_level                                             = undef,
   Boolean $access_log                                                               = true,
   $access_log_file                                                                  = false,
   $access_log_pipe                                                                  = false,
@@ -1940,10 +1940,6 @@
 
   # Input validation begins
 
-  if $log_level {
-    apache::validate_apache_log_level($log_level)
-  }
-
   if $access_log_file and $access_log_pipe {
     fail("Apache::Vhost[${name}]: 'access_log_file' and 'access_log_pipe' cannot be defined at the same time")
   }
diff --git a/spec/functions/validate_apache_log_level_spec.rb b/spec/functions/validate_apache_log_level_spec.rb
deleted file mode 100644
index be69d0c5dd..0000000000
--- a/spec/functions/validate_apache_log_level_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::validate_apache_log_level' do
-  it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
-  it { is_expected.to run.with_params('garbage').and_raise_error(Puppet::ParseError) }
-  it { is_expected.to run.with_params('info') }
-  it { is_expected.to run.with_params('warn ssl:info') }
-  it { is_expected.to run.with_params('warn mod_ssl.c:info') }
-  it { is_expected.to run.with_params('warn ssl_module:info') }
-  it { is_expected.to run.with_params('trace4') }
-end
diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb
new file mode 100644
index 0000000000..ecd09f9a16
--- /dev/null
+++ b/spec/type_aliases/loglevel_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe 'Apache::LogLevel' do
+  [
+    'info',
+    'warn ssl:info',
+    'warn mod_ssl.c:info',
+    'warn mod_ssl.c:info',
+    'warn ssl_module:info',
+    'trace4',
+  ].each do |allowed_value|
+    it { is_expected.to allow_value(allowed_value) }
+  end
+
+  [
+    'garbage',
+    '',
+    [],
+    ['info'],
+  ].each do |invalid_value|
+    it { is_expected.not_to allow_value(invalid_value) }
+  end
+end
diff --git a/spec/unit/puppet/parser/functions/validate_apache_log_level.rb b/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
deleted file mode 100644
index 9647815ca1..0000000000
--- a/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby -S rspec # rubocop:disable Lint/ScriptPermission
-require 'spec_helper'
-
-describe 'the validate_apache_log_level function' do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it 'exists' do
-    expect(Puppet::Parser::Functions.function('validate_apache_log_level')).to eq('function_validate_apache_log_level')
-  end
-
-  it 'raises a ParseError if there is less than 1 arguments' do
-    expect { scope.function_validate_apache_log_level([]) }.to(raise_error(Puppet::ParseError))
-  end
-
-  it 'raises a ParseError when given garbage' do
-    expect { scope.function_validate_apache_log_level(['garbage']) }.to(raise_error(Puppet::ParseError))
-  end
-
-  it 'does not raise a ParseError when given a plain log level' do
-    expect { scope.function_validate_apache_log_level(['info']) }.not_to raise_error
-  end
-
-  it 'does not raise a ParseError when given a log level and module log level #ssl' do
-    expect { scope.function_validate_apache_log_level(['warn ssl:info']) }.not_to raise_error
-  end
-
-  it 'does not raise a ParseError when given a log level and module log level #mod_ssl.c' do
-    expect { scope.function_validate_apache_log_level(['warn mod_ssl.c:info']) }.not_to raise_error
-  end
-
-  it 'does not raise a ParseError when given a log level and module log level #ssl_module' do
-    expect { scope.function_validate_apache_log_level(['warn ssl_module:info']) }.not_to raise_error
-  end
-
-  it 'does not raise a ParseError when given a trace level' do
-    expect { scope.function_validate_apache_log_level(['trace4']) }.not_to raise_error
-  end
-end
diff --git a/types/loglevel.pp b/types/loglevel.pp
new file mode 100644
index 0000000000..3d45adab39
--- /dev/null
+++ b/types/loglevel.pp
@@ -0,0 +1,27 @@
+# @summary A string that conforms to the Apache `LogLevel` syntax.
+#
+# A string that conforms to the Apache `LogLevel` syntax.
+# Different levels can be specified for individual apache modules.
+#
+# ie. `[module:]level [module:level] ...`
+#
+# The levels are (in order of decreasing significance):
+# * `emerg`
+# * `alert`
+# * `crit`
+# * `error`
+# * `warn`
+# * `notice`
+# * `info`
+# * `debug`
+# * `trace1`
+# * `trace2`
+# * `trace3`
+# * `trace4`
+# * `trace5`
+# * `trace6`
+# * `trace7`
+# * `trace8`
+#
+# @see https://httpd.apache.org/docs/current/mod/core.html#loglevel
+type Apache::LogLevel = Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]

From dfbd6ef5a5931acdecc19d982a4efedb87bf3ea3 Mon Sep 17 00:00:00 2001
From: Alex Skrenchuk <alexskr@stanford.edu>
Date: Fri, 8 May 2020 00:21:05 -0700
Subject: [PATCH 1651/2267] update passenger yum repo pgpkey url

https://tickets.puppetlabs.com/browse/MODULES-10656
---
 manifests/mod/passenger.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index da684de54a..fa8597b764 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -818,7 +818,7 @@
       descr         => 'passenger',
       enabled       => '1',
       gpgcheck      => '0',
-      gpgkey        => 'https://packagecloud.io/phusion/passenger/gpgkey',
+      gpgkey        => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
       repo_gpgcheck => '1',
       sslcacert     => '/etc/pki/tls/certs/ca-bundle.crt',
       sslverify     => '1',

From 0629928108fb415a1b062faa2231003ff45c8879 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Tue, 12 May 2020 12:06:31 +0100
Subject: [PATCH 1652/2267] (IAC-587) Back out vhost_spec.rb:1201 on RHEL

---
 spec/acceptance/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index d1b9db21c0..f8e35927d3 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1198,7 +1198,7 @@ class { 'apache::mod::shib': }
     end
   end
 
-  describe 'auth_oidc', unless: (os[:family] == 'ubuntu' && os[:release].to_f == 14.04) do
+  describe 'auth_oidc', if: (os[:family] == 'ubuntu' && os[:release].to_i > 14 || os[:family] == 'debian') do
     pp = <<-MANIFEST
         class { 'apache': }
         apache::vhost { 'test.server':

From 2f1f9a20afa2c5cdc0d86992ac661153b817d35b Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Tue, 12 May 2020 12:07:12 +0100
Subject: [PATCH 1653/2267] (IAC-787) Back out itk_spec.rb:19 on RHEL 8.x

---
 spec/acceptance/itk_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 5e4c67e095..d7fe96676c 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -14,7 +14,9 @@
   variant = :prefork
 end
 
-describe 'apache::mod::itk class', if: service_name do
+# IAC-787: The http-itk mod package is not available in any of the standard RHEL/CentOS 8.x repos. Disable this test
+# on those platforms until we can find a suitable source for this package.
+describe 'apache::mod::itk class', if: service_name, unless: os[:family] == 'redhat' && os[:release].to_i >= 8 do
   describe 'running puppet code' do
     let(:pp) do
       case variant

From 404ae131afaa37c288c00c02277acb5d6534a9d7 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Tue, 12 May 2020 12:08:08 +0100
Subject: [PATCH 1654/2267] (IAC-785) Back out apache_parameters_spec.rb:96 on
 Debian 10

(IAC-587) Add comment explaining test restrictions
---
 spec/acceptance/apache_parameters_spec.rb | 40 +++++++++++------------
 spec/acceptance/vhost_spec.rb             |  2 ++
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 345e359776..46ea401b02 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -92,28 +92,28 @@ class { 'apache':
     end
   end
 
-  if os[:family] == 'debian'
-    describe 'conf_enabled => /etc/apache2/conf-enabled' do
-      pp = <<-MANIFEST
-          class { 'apache':
-            purge_configs   => false,
-            conf_enabled    => "/etc/apache2/conf-enabled"
-          }
-      MANIFEST
-      it 'applies cleanly' do
-        run_shell('touch /etc/apache2/conf-enabled/test.conf')
-        apply_manifest(pp, catch_failures: true)
-      end
+  # IAC-785: The Shibboleth mod does not seem to be configured correctly on Debian 10 systems. We should reenable
+  # this test on Debian 10 systems once the issue has been RCA'd and resolved.
+  describe 'conf_enabled => /etc/apache2/conf-enabled', if: os[:family] == 'debian' && os[:release].to_i < 10 do
+    pp = <<-MANIFEST
+        class { 'apache':
+          purge_configs   => false,
+          conf_enabled    => "/etc/apache2/conf-enabled"
+        }
+    MANIFEST
+    it 'applies cleanly' do
+      run_shell('touch /etc/apache2/conf-enabled/test.conf')
+      apply_manifest(pp, catch_failures: true)
+    end
 
-      # Ensure the created file didn't disappear.
-      describe file('/etc/apache2/conf-enabled/test.conf') do
-        it { is_expected.to be_file }
-      end
+    # Ensure the created file didn't disappear.
+    describe file('/etc/apache2/conf-enabled/test.conf') do
+      it { is_expected.to be_file }
+    end
 
-      # Ensure the default file didn't disappear.
-      describe file('/etc/apache2/conf-enabled/security.conf') do
-        it { is_expected.to be_file }
-      end
+    # Ensure the default file didn't disappear.
+    describe file('/etc/apache2/conf-enabled/security.conf') do
+      it { is_expected.to be_file }
     end
   end
 
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index f8e35927d3..8f0f8e6af1 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1198,6 +1198,8 @@ class { 'apache::mod::shib': }
     end
   end
 
+  # IAC-587: These tests do not currently run successfully on certain RHEL OSs due to dependency issues with the
+  # mod_auth_openidc module.
   describe 'auth_oidc', if: (os[:family] == 'ubuntu' && os[:release].to_i > 14 || os[:family] == 'debian') do
     pp = <<-MANIFEST
         class { 'apache': }

From 1138758e3ba73e987a8556232badd572b47f5da7 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Tue, 12 May 2020 15:39:45 +0100
Subject: [PATCH 1655/2267] (maint) - Pdk Update

---
 .rubocop.yml            | 4 ++++
 .vscode/extensions.json | 2 +-
 Gemfile                 | 2 --
 metadata.json           | 2 +-
 spec/spec_helper.rb     | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 33688a79ec..200675437f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -40,6 +40,10 @@ Style/BlockDelimiters:
   Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
     be consistent then.
   EnforcedStyle: braces_for_chaining
+Style/BracesAroundHashParameters:
+  Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
+    See https://github.com/rubocop-hq/rubocop/pull/7643
+  Enabled: true
 Style/ClassAndModuleChildren:
   Description: Compact style reduces the required amount of indentation.
   EnforcedStyle: compact
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 6177782746..2f1e4f73a5 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    "jpogran.puppet-vscode",
+    "puppet.puppet-vscode",
     "rebornix.Ruby"
   ]
 }
diff --git a/Gemfile b/Gemfile
index adbbe6d0a4..4f6e33b02d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,8 +29,6 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-  gem 'ed25519', '>= 1.2', '< 2.0'
-  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/metadata.json b/metadata.json
index 885c9c6808..24a7da5e23 100644
--- a/metadata.json
+++ b/metadata.json
@@ -82,5 +82,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "1.17.0-0-gd3a4319"
+  "template-ref": "heads/master-0-g095317c"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bc023f51af..16764b6ff1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -42,6 +42,7 @@
     # set to strictest setting for testing
     # by default Puppet runs at warning level
     Puppet.settings[:strict] = :warning
+    Puppet.settings[:strict_variables] = true
   end
   c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
   c.after(:suite) do

From 251d36bd6eb524a6ac2f464f3ee0bdb4129b52c8 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 18 May 2020 09:55:43 +0300
Subject: [PATCH 1656/2267] Change provision from vmpooler to abs

---
 provision.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provision.yaml b/provision.yaml
index 1a3951d975..372e26bcac 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -18,5 +18,5 @@ travis_el7:
   provisioner: docker
   images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
 release_checks:
-  provisioner: vmpooler
+  provisioner: abs
   images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From d0a62d708d1f1a0ad842b346f2e1b279cb6b598d Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 18 May 2020 10:02:01 +0300
Subject: [PATCH 1657/2267] Switch to default spec_helper_acceptance file

---
 spec/spec_helper_acceptance.rb | 78 +---------------------------------
 1 file changed, 1 insertion(+), 77 deletions(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index aabeb0b80d..4ac8d7e0f6 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,82 +1,6 @@
 # frozen_string_literal: true
 
-require 'serverspec'
 require 'puppet_litmus'
 require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))
-include PuppetLitmus
 
-if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost'
-  puts 'Running tests against this machine !'
-  if Gem.win_platform?
-    set :backend, :cmd
-  else
-    set :backend, :exec
-  end
-else
-  # load inventory
-  inventory_hash = inventory_hash_from_inventory_file
-  node_config = config_from_node(inventory_hash, ENV['TARGET_HOST'])
-
-  if target_in_group(inventory_hash, ENV['TARGET_HOST'], 'docker_nodes')
-    host = ENV['TARGET_HOST']
-    set :backend, :docker
-    set :docker_container, host
-  elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'ssh_nodes')
-    set :backend, :ssh
-    options = Net::SSH::Config.for(host)
-    options[:user] = node_config.dig('ssh', 'user') unless node_config.dig('ssh', 'user').nil?
-    options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil?
-    options[:keys] = node_config.dig('ssh', 'private-key') unless node_config.dig('ssh', 'private-key').nil?
-    options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil?
-    # Support both net-ssh 4 and 5.
-    # rubocop:disable Metrics/BlockNesting
-    options[:verify_host_key] = if node_config.dig('ssh', 'host-key-check').nil?
-                                  # Fall back to SSH behavior. This variable will only be set in net-ssh 5.3+.
-                                  if @strict_host_key_checking.nil? || @strict_host_key_checking
-                                    Net::SSH::Verifiers::Always.new
-                                  else
-                                    # SSH's behavior with StrictHostKeyChecking=no: adds new keys to known_hosts.
-                                    # If known_hosts points to /dev/null, then equivalent to :never where it
-                                    # accepts any key beacuse they're all new.
-                                    Net::SSH::Verifiers::AcceptNewOrLocalTunnel.new
-                                  end
-                                elsif node_config.dig('ssh', 'host-key-check')
-                                  if defined?(Net::SSH::Verifiers::Always)
-                                    Net::SSH::Verifiers::Always.new
-                                  else
-                                    Net::SSH::Verifiers::Secure.new
-                                  end
-                                elsif defined?(Net::SSH::Verifiers::Never)
-                                  Net::SSH::Verifiers::Never.new
-                                else
-                                  Net::SSH::Verifiers::Null.new
-                                end
-    # rubocop:enable Metrics/BlockNesting
-    host = if ENV['TARGET_HOST'].include?(':')
-             ENV['TARGET_HOST'].split(':').first
-           else
-             ENV['TARGET_HOST']
-           end
-    set :host,        options[:host_name] || host
-    set :ssh_options, options
-    set :request_pty, true
-  elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'winrm_nodes')
-    require 'winrm'
-
-    set :backend, :winrm
-    set :os, family: 'windows'
-    user = node_config.dig('winrm', 'user') unless node_config.dig('winrm', 'user').nil?
-    pass = node_config.dig('winrm', 'password') unless node_config.dig('winrm', 'password').nil?
-    endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
-
-    opts = {
-      user: user,
-      password: pass,
-      endpoint: endpoint,
-      operation_timeout: 300,
-    }
-
-    winrm = WinRM::Connection.new opts
-    Specinfra.configuration.winrm = winrm
-  end
-end
+PuppetLitmus.configure!

From 33439291f76e807c2c5a21f980b0045743ddcdd1 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 18 May 2020 15:08:26 +0300
Subject: [PATCH 1658/2267] Update spec_helper_acceptance_local and Gemfile

---
 Gemfile                              |  2 ++
 spec/spec_helper_acceptance_local.rb | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4f6e33b02d..adbbe6d0a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,8 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
+  gem 'ed25519', '>= 1.2', '< 2.0'
+  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index b6eca89aa0..f991fdef04 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
+require 'singleton'
+
+class LitmusHelper
+  include Singleton
+  include PuppetLitmus
+end
+
 RSpec.configure do |c|
   # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
   if ENV['CI'] == 'true'
     c.filter_run_excluding ipv6: true
   end
   c.before :suite do
-    run_shell('puppet module install stahnma/epel')
+    LitmusHelper.instance.run_shell('puppet module install stahnma/epel')
     pp = <<-PUPPETCODE
     # needed by tests
     package { 'curl':
@@ -41,10 +48,10 @@ class { 'epel': }
       }
     }
     PUPPETCODE
-    apply_manifest(pp)
+    LitmusHelper.instance.apply_manifest(pp)
 
     # Make sure selinux is disabled so the tests work.
-    run_shell('setenforce 0', expect_failures: true) if os[:family] =~ %r{redhat|oracle}
+    LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if os[:family] =~ %r{redhat|oracle}
   end
 end
 

From 250e0f46885abe2a04fd539830d9308ddebff2ed Mon Sep 17 00:00:00 2001
From: Christian Baumann <chris@hadiko.de>
Date: Sat, 23 May 2020 13:18:36 +0200
Subject: [PATCH 1659/2267] Allow IPv6 CIDRs for proxy_protocol_exceptions in
 remoteip

This is the same fix as in https://github.com/puppetlabs/puppetlabs-apache/pull/1891
---
 manifests/mod/remoteip.pp         |  2 +-
 spec/classes/mod/remoteip_spec.rb | 22 ++++++++++++++++++++++
 templates/mod/remoteip.conf.epp   |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index 2c9b6fc58c..9c7f5b17df 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -60,7 +60,7 @@
   Optional[Stdlib::Absolutepath]                             $internal_proxy_list       = undef,
   Optional[String]                                           $proxies_header            = undef,
   Boolean                                                    $proxy_protocol            = false,
-  Optional[Array[Stdlib::Host]]                              $proxy_protocol_exceptions = undef,
+  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $proxy_protocol_exceptions = undef,
   Optional[Array[Stdlib::Host]]                              $trusted_proxy             = undef,
   Optional[Array[Stdlib::Host]]                              $trusted_proxy_ips         = undef,
   Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index fc2d3bb0c3..bb5215ab08 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -90,6 +90,28 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.18.99$}) }
     end
+    describe 'with proxy_protocol_exceptions => [ 10.42.17.8, 10.42.18.99 ]' do
+      let :params do
+        { proxy_protocol_exceptions: ['10.42.17.8', '10.42.18.99'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPProxyProtocolExceptions 10.42.17.8$}) }
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPProxyProtocolExceptions 10.42.18.99$}) }
+    end
+    describe 'with IPv4 CIDR in proxy_protocol_exceptions => [ 192.168.1.0/24 ]' do
+      let :params do
+        { proxy_protocol_exceptions: ['192.168.1.0/24'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPProxyProtocolExceptions 192.168.1.0/24$}) }
+    end
+    describe 'with IPv6 CIDR in proxy_protocol_exceptions => [ fd00:fd00:fd00:2000::/64 ]' do
+      let :params do
+        { proxy_protocol_exceptions: ['fd00:fd00:fd00:2000::/64'] }
+      end
+
+      it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPProxyProtocolExceptions fd00:fd00:fd00:2000::/64$}) }
+    end
     describe 'with Apache version < 2.4' do
       let :params do
         { apache_version: '2.2' }
diff --git a/templates/mod/remoteip.conf.epp b/templates/mod/remoteip.conf.epp
index e15c674b9d..6f47939793 100644
--- a/templates/mod/remoteip.conf.epp
+++ b/templates/mod/remoteip.conf.epp
@@ -4,7 +4,7 @@
   Optional[Stdlib::Absolutepath]                             $internal_proxy_list       = undef,
   Optional[String]                                           $proxies_header            = undef,
   Boolean                                                    $proxy_protocol            = undef,
-  Optional[Array[Stdlib::IP::Address]]                       $proxy_protocol_exceptions = undef,
+  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $proxy_protocol_exceptions = undef,
   Optional[Array[Stdlib::IP::Address]]                       $trusted_proxy             = undef,
   Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,
 | -%>

From 342b15aa9bd2a1cdca24cf35c7e4e6849906dcd6 Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@example42.com>
Date: Mon, 25 May 2020 15:20:09 +0200
Subject: [PATCH 1660/2267] Allow switching of thread module

Extends #1961 to also work correctly on Debian 10 and Ubuntu 20
---
 manifests/mpm.pp                   |  3 ++-
 manifests/mpm/disable_mpm_event.pp | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index d988b36238..f77bf89d3a 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -88,6 +88,7 @@
       if $mpm == 'itk' {
         if ( ( $::operatingsystem == 'Ubuntu' ) or ( ($::operatingsystem == 'Debian') and ( versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) ) {
           include apache::mpm::disable_mpm_event
+          include apache::mpm::disable_mpm_worker
         }
 
         package { 'libapache2-mpm-itk':
@@ -100,7 +101,7 @@
       }
 
       if $mpm == 'prefork' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9.0.0') >= 0 ) ) {
+        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) {
           include apache::mpm::disable_mpm_event
           include apache::mpm::disable_mpm_worker
         }
diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
index 10d22412db..bb2acd23fc 100644
--- a/manifests/mpm/disable_mpm_event.pp
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -4,5 +4,17 @@
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
+  exec { 'remove distribution event load file':
+    command => "/bin/rm ${apache::mod_enable_dir}/mpm_event.load",
+    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
+    require => Package['httpd'],
+    before  => Class['apache::service'],
+  }
+  exec { 'remove distribution event conf file':
+    command => "/bin/rm ${apache::mod_enable_dir}/mpm_event.conf",
+    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.conf",
+    require => Package['httpd'],
+    before  => Class['apache::service'],
+  }
 
 }

From 93a524360ca63767865f210b76567fd3b1d8873d Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Thu, 28 May 2020 15:53:50 +0100
Subject: [PATCH 1661/2267] Update Gemfile

---
 Gemfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index adbbe6d0a4..4f6e33b02d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,8 +29,6 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-  gem 'ed25519', '>= 1.2', '< 2.0'
-  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

From b03481a029d50a7a2d1732480219d8d92fa05698 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Wed, 20 May 2020 11:52:06 +0100
Subject: [PATCH 1662/2267] (IAC-746) - Add ubuntu 20.04 support

---
 .github/workflows/release.yml       | 25 +++++++++++++++++++++----
 .github/workflows/weekly.yml        | 25 ++++++++++++++++++++++---
 .sync.yml                           | 18 ++++++++++++++----
 .travis.yml                         | 24 ++++++++++++------------
 manifests/params.pp                 |  1 +
 metadata.json                       |  5 +++--
 provision.yaml                      | 10 ++++++++--
 spec/acceptance/mod_php_spec.rb     |  4 ++++
 spec/defines/fastcgi_server_spec.rb |  2 +-
 spec/defines/vhost_spec.rb          |  2 +-
 10 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 35162951ee..aa16f1846e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,22 +6,39 @@ on:
       - 'release'
 
 jobs:
-  LitmusAcceptance:
+  LitmusAcceptancePuppet5:
     env:
       HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
       HONEYCOMB_DATASET: litmus tests
     runs-on: self-hosted
-
     strategy:
       matrix:
         ruby_version: [2.5.x]
         puppet_gem_version: [~> 6.0]
-        platform: [release_checks]
-        agent_family: ['puppet5', 'puppet6']
+        platform: [release_checks_5]
+        agent_family: ['puppet5']
 
     steps:
     - uses: actions/checkout@v1
+    - name: Litmus Parallel
+      uses: puppetlabs/action-litmus_parallel@master
+      with:
+        platform: ${{ matrix.platform }}
+        agent_family: ${{ matrix.agent_family }}
+  LitmusAcceptancePuppet6:
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby_version: [2.5.x]
+        puppet_gem_version: [~> 6.0]
+        platform: [release_checks_6]
+        agent_family: ['puppet6']
 
+    steps:
+    - uses: actions/checkout@v1
     - name: Litmus Parallel
       uses: puppetlabs/action-litmus_parallel@master
       with:
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 8b621bca8f..7ad3cbaf19 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -5,7 +5,7 @@ on:
     - cron: '0 4 * * 1'
 
 jobs:
-  LitmusAcceptance:
+  LitmusAcceptancePuppet5:
     env:
       HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
       HONEYCOMB_DATASET: litmus tests
@@ -14,8 +14,27 @@ jobs:
       matrix:
         ruby_version: [2.5.x]
         puppet_gem_version: [~> 6.0]
-        platform: [release_checks]
-        agent_family: ['puppet5', 'puppet6']
+        platform: [release_checks_5]
+        agent_family: ['puppet5']
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Litmus Parallel
+      uses: puppetlabs/action-litmus_parallel@master
+      with:
+        platform: ${{ matrix.platform }}
+        agent_family: ${{ matrix.agent_family }}
+  LitmusAcceptancePuppet6:
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby_version: [2.5.x]
+        puppet_gem_version: [~> 6.0]
+        platform: [release_checks_6]
+        agent_family: ['puppet6']
 
     steps:
     - uses: actions/checkout@v1
diff --git a/.sync.yml b/.sync.yml
index a36572bd9b..3013a20335 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -15,10 +15,20 @@
   use_litmus: true
   litmus:
     provision_list:
-      - travis_deb
-      - travis_ub
-      - travis_el7
-      - ---travis_el
+    - ---travis_el
+    - travis_deb
+    - travis_el7
+    complex:
+    - collection:
+        puppet_collection:
+        - puppet6
+        provision_list:
+        - travis_ub_6
+    - collection:
+        puppet_collection:
+        - puppet5
+        provision_list:
+        - travis_ub_5
   simplecov: true
   notifications:
     slack:
diff --git a/.travis.yml b/.travis.yml
index 434c282060..04ad1d58dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,55 +29,55 @@ jobs:
   include:
     -
       before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      env: PLATFORMS=travis_deb_puppet5
+      env: PLATFORMS=travis_ub_6_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
       before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_ub]'"
+      - "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      env: PLATFORMS=travis_ub_puppet5
+      env: PLATFORMS=travis_ub_5_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
       before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      env: PLATFORMS=travis_el7_puppet5
+      env: PLATFORMS=travis_deb_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
       before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
-      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      env: PLATFORMS=travis_deb_puppet6
+      env: PLATFORMS=travis_el7_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
     -
       before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_ub]'"
+      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      env: PLATFORMS=travis_ub_puppet6
+      env: PLATFORMS=travis_deb_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
diff --git a/manifests/params.pp b/manifests/params.pp
index 76a732e592..b0156fad51 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -374,6 +374,7 @@
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
         '10'    => '7.3', # Debian Buster
+        '20.04' => '7.4', # Ubuntu Foccal Fossal
         default => '7.2', # Ubuntu Bionic, Cosmic and Disco
       }
       $mod_packages = {
diff --git a/metadata.json b/metadata.json
index 24a7da5e23..aaa7da55fc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -69,7 +69,8 @@
       "operatingsystemrelease": [
         "14.04",
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     }
   ],
@@ -82,5 +83,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g095317c"
+  "template-ref": "heads/master-0-g88b05c7"
 }
diff --git a/provision.yaml b/provision.yaml
index 372e26bcac..6b59ceb1f9 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -8,15 +8,21 @@ vagrant:
 travis_deb:
   provisioner: docker
   images: ['litmusimage/debian:8', 'litmusimage/debian:9', 'litmusimage/debian:10']
-travis_ub:
+travis_ub_5:
   provisioner: docker
   images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04']
+travis_ub_6:
+  provisioner: docker
+  images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04', 'litmusimage/ubuntu:20.04']
 travis_el6:
   provisioner: docker
   images: []
 travis_el7:
   provisioner: docker
   images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
-release_checks:
+release_checks_5:
   provisioner: abs
   images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+release_checks_6:
+  provisioner: abs
+  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 778c1be1f6..1657a68112 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -35,6 +35,10 @@ class { 'apache::mod::php': }
         describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
         end
+      elsif os[:family] == 'ubuntu' && os[:release] == '20.04'
+        describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
       elsif os[:family] == 'redhat' && os[:release] =~ %r{^8}
         describe file("#{apache_hash['mod_dir']}/php7.conf") do
           it { is_expected.to contain 'DirectoryIndex index.php' }
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 844dfd5ad7..cd3e1781c6 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -9,7 +9,7 @@
   end
 
   on_supported_os.each do |os, facts|
-    next if facts[:os]['release']['major'] == '18.04'
+    next if facts[:os]['release']['major'] == '18.04' || facts[:os]['release']['major'] == '20.04'
     next if (facts[:os]['release']['major'] == '7' || facts[:os]['release']['major'] == '8') && facts[:os]['family']['RedHat']
     context "on #{os} " do
       let :facts do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9832f328ed..9fe185471a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -4,7 +4,7 @@
   describe 'os-independent items' do
     on_supported_os.each do |os, facts|
       # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Ubuntu 18.04
-      next if facts[:os]['release']['major'] == '18.04'
+      next if facts[:os]['release']['major'] == '18.04' || facts[:os]['release']['major'] == '20.04'
       next if (facts[:os]['release']['major'] == '7' || facts[:os]['release']['major'] == '8') && facts[:os]['family']['RedHat']
       # next if facts[:os]['name'] == 'SLES'
 

From f560e1d85b6c03103c4dc1d7badf5ffb7a393f1b Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Fri, 12 Jun 2020 16:33:37 +0100
Subject: [PATCH 1663/2267] (IAC-886) Remove SLES 11 from release checks

---
 provision.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/provision.yaml b/provision.yaml
index 6b59ceb1f9..b2347e5290 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -22,7 +22,7 @@ travis_el7:
   images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
 release_checks_5:
   provisioner: abs
-  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
 release_checks_6:
   provisioner: abs
-  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From c49061ec506d30489bcfa355d001efc96f60864e Mon Sep 17 00:00:00 2001
From: Ashish Vijayaram <initrd@gmail.com>
Date: Fri, 12 Jun 2020 09:34:06 -0700
Subject: [PATCH 1664/2267] Update mod_dir, alias_icons_path,
 error_documents_path for CentOS 8

---
 manifests/params.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index b0156fad51..545268256f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -171,6 +171,7 @@
     } else {
       $mod_dir              = $::apache::version::distrelease ? {
         '7'     => "${httpd_dir}/conf.modules.d",
+        '8'     => "${httpd_dir}/conf.modules.d",
         default => "${httpd_dir}/conf.d",
       }
     }
@@ -263,10 +264,12 @@
     $docroot              = '/var/www/html'
     $alias_icons_path     = $::apache::version::distrelease ? {
       '7'     => '/usr/share/httpd/icons',
+      '8'     => '/usr/share/httpd/icons',
       default => '/var/www/icons',
     }
     $error_documents_path = $::apache::version::distrelease ? {
       '7'     => '/usr/share/httpd/error',
+      '8'     => '/usr/share/httpd/error',
       default => '/var/www/error'
     }
     if $::osfamily == 'RedHat' {

From f1b9c4edc54e328f69354b7ae358dfbbf91fe6d1 Mon Sep 17 00:00:00 2001
From: Ashish Vijayaram <initrd@gmail.com>
Date: Fri, 12 Jun 2020 10:30:25 -0700
Subject: [PATCH 1665/2267] Update tests

---
 spec/classes/mod/passenger_spec.rb | 2 +-
 spec/classes/mod/security_spec.rb  | 2 +-
 spec/classes/mod/ssl_spec.rb       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index e8c37a67d8..8cbac880c8 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -431,7 +431,7 @@
                 is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
               }
               it {
-                is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
+                is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
               }
             end
           end
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index ad7d9644a1..f9967f6d0b 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -34,7 +34,7 @@
           if facts[:os]['release']['major'].to_i >= 8
             it {
               is_expected.to contain_file('security.conf').with(
-                path: '/etc/httpd/conf.d/security.conf',
+                path: '/etc/httpd/conf.modules.d/security.conf',
               )
             }
           end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 1fe0955a8e..33b00c4f4a 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -54,7 +54,7 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('ssl') }
       it { is_expected.to contain_package('mod_ssl') }
-      it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.d/ssl.conf') }
+      it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.modules.d/ssl.conf') }
       it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all}) }
     end
     context '6 OS with a custom package_name parameter' do

From 0a1eea81cafb16e0fc395ee41a0d8d7337e37500 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Tue, 16 Jun 2020 16:24:48 +0100
Subject: [PATCH 1666/2267] (IAC-890) - Implement CentOS 8 travis tests

---
 .sync.yml      |  1 +
 .travis.yml    | 22 ++++++++++++++++++++++
 metadata.json  |  4 ++--
 provision.yaml |  3 +++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 3013a20335..42165dba5c 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -18,6 +18,7 @@
     - ---travis_el
     - travis_deb
     - travis_el7
+    - travis_el8
     complex:
     - collection:
         puppet_collection:
diff --git a/.travis.yml b/.travis.yml
index 04ad1d58dd..23bd152a59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,6 +71,17 @@ jobs:
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args:
+      env: PLATFORMS=travis_el8_puppet5
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
     -
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
@@ -93,6 +104,17 @@ jobs:
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args:
+      env: PLATFORMS=travis_el8_puppet6
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static
diff --git a/metadata.json b/metadata.json
index aaa7da55fc..b823e925f2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,7 +81,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.17.0",
+  "pdk-version": "1.18.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g88b05c7"
+  "template-ref": "heads/master-0-g9c14433"
 }
diff --git a/provision.yaml b/provision.yaml
index b2347e5290..b490efade8 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -20,6 +20,9 @@ travis_el6:
 travis_el7:
   provisioner: docker
   images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
+travis_el8:
+  provisioner: docker
+  images: ['litmusimage/centos:8']
 release_checks_5:
   provisioner: abs
   images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

From beff9916e26807d3d75462bda868d093225fac1a Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Tue, 23 Jun 2020 18:37:03 +0100
Subject: [PATCH 1667/2267] (maint) Update test settings hash for CentOS 8
 expectations

After the recent introduction of the CentOS 8 platform to TravisCI's tests in https://github.com/puppetlabs/puppetlabs-apache/pull/2040, it caused a number of test failures as the test expectations were not updated with the common conf dirs for CentOS 8. This PR should not have been merged without the TravisCI tests executing.

(maint) Fix Rubocop violations

(maint) Eval OS maj version as float, not int

(maint) Cleanup to make more readable
---
 spec/spec_helper_acceptance_local.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index f991fdef04..e7550b3e6d 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -73,10 +73,11 @@ def apache_settings_hash
     apache['error_log']        = 'error_log'
     apache['suphp_handler']    = 'php5-script'
     apache['suphp_configpath'] = 'undef'
-    if (operatingsystemrelease >= 7 && operatingsystemrelease < 8) && (osfamily == 'redhat')
+    if (operatingsystemrelease >= 7 && operatingsystemrelease < 9) && (osfamily == 'redhat')
       apache['version']     = '2.4'
       apache['mod_dir']     = '/etc/httpd/conf.modules.d'
       apache['mod_ssl_dir'] = apache['confd_dir']
+      apache['mod_ssl_dir'] = apache['mod_dir'] if operatingsystemrelease >= 8
     elsif operatingsystemrelease >= 8 && osfamily == 'redhat'
       apache['version']     = '2.4'
       apache['mod_dir']     = '/etc/httpd/conf.d'

From add189aeb57d305a852f088dba8b52b332790912 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 24 Jun 2020 16:28:55 +0200
Subject: [PATCH 1668/2267] (maint) Straighten up test settings for EL8

beff9916e26807d3d75462bda868d093225fac1a changed the logic, but in a
very complicated way. This prefers to put the newest version first and
fall back to older versions. That avoids multiple if conditions.
---
 spec/spec_helper_acceptance_local.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index e7550b3e6d..e5a2efd7a8 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -73,15 +73,14 @@ def apache_settings_hash
     apache['error_log']        = 'error_log'
     apache['suphp_handler']    = 'php5-script'
     apache['suphp_configpath'] = 'undef'
-    if (operatingsystemrelease >= 7 && operatingsystemrelease < 9) && (osfamily == 'redhat')
-      apache['version']     = '2.4'
-      apache['mod_dir']     = '/etc/httpd/conf.modules.d'
-      apache['mod_ssl_dir'] = apache['confd_dir']
-      apache['mod_ssl_dir'] = apache['mod_dir'] if operatingsystemrelease >= 8
-    elsif operatingsystemrelease >= 8 && osfamily == 'redhat'
+    if operatingsystemrelease >= 8 && osfamily == 'redhat'
       apache['version']     = '2.4'
       apache['mod_dir']     = '/etc/httpd/conf.d'
       apache['mod_ssl_dir'] = apache['mod_dir']
+    elsif operatingsystemrelease >= 7 && osfamily == 'redhat'
+      apache['version']     = '2.4'
+      apache['mod_dir']     = '/etc/httpd/conf.modules.d'
+      apache['mod_ssl_dir'] = apache['confd_dir']
     elsif operatingsystemrelease >= 7 && osfamily == 'oracle'
       apache['version']     = '2.4'
       apache['mod_dir']     = '/etc/httpd/conf.modules.d'

From ae83bfae06af8bf6db51e9e36431de2393906bfc Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 29 Jun 2020 17:09:38 +0100
Subject: [PATCH 1669/2267] (maint) Fix test expectations from bad PR merge

https://github.com/puppetlabs/puppetlabs-apache/pull/2042 fixed an issue with the apache_settings hash being set with incorrect expectations for RHEL 8.x systems. https://github.com/puppetlabs/puppetlabs-apache/pull/2043 attempted to improve upon that, but reverted the change made to set the 'mod_dir' for RHEL 8.x in https://github.com/puppetlabs/puppetlabs-apache/pull/2042 . Some CI test runner issues obsficated the break in both cases.
---
 spec/spec_helper_acceptance_local.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index e5a2efd7a8..f59cb7fb00 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -75,7 +75,7 @@ def apache_settings_hash
     apache['suphp_configpath'] = 'undef'
     if operatingsystemrelease >= 8 && osfamily == 'redhat'
       apache['version']     = '2.4'
-      apache['mod_dir']     = '/etc/httpd/conf.d'
+      apache['mod_dir']     = '/etc/httpd/conf.modules.d'
       apache['mod_ssl_dir'] = apache['mod_dir']
     elsif operatingsystemrelease >= 7 && osfamily == 'redhat'
       apache['version']     = '2.4'

From f89a8d1f0627d1ff76b0ebfb8c5acdc91e8025cc Mon Sep 17 00:00:00 2001
From: Christian Klein <christian.klein@aperto.com>
Date: Thu, 9 Apr 2020 12:03:20 +0200
Subject: [PATCH 1670/2267] (MODULES-10586) Centos 8: wrong package used to
 install mod_ldap

Enhance spec/classes/mod/authnz_ldap_spec.rb unit tests

Expand the RHEL tests to ensure that the 'mod_authnz_ldap' pkg is
present on versions >= 7 and 'mod_ldap' is present on all other
versions.

An acceptance test executing against an actual RHEL instance will
be the only way to catch any divergence in package names in the
future. The unit tests will need to be updated with that change.

There seems to be more effort required to get this running against
all supported OSs. This was beyond the scope of this PR.

Add acceptance test to ensure correct authnz_ldap pkg is installed

Fix typos and nesting issues in mod_authnz_ldap_spec.rb

Restrict mod_authnz_ldap_spec.rb tests to RHEL 7.x, 8.x

Apply suggestions from code review

Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>

Fix authnz_ldap_spec.rb test expectations

Some additional cleanup and filtering of scenarios too.

Move filtering rule to context block
---
 manifests/params.pp                     |  1 +
 spec/acceptance/mod_authnz_ldap_spec.rb | 21 ++++++
 spec/classes/mod/authnz_ldap_spec.rb    | 89 +++++++++++++------------
 3 files changed, 68 insertions(+), 43 deletions(-)
 create mode 100644 spec/acceptance/mod_authnz_ldap_spec.rb

diff --git a/manifests/params.pp b/manifests/params.pp
index 545268256f..1e068d188f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -210,6 +210,7 @@
       'auth_openidc'          => 'mod_auth_openidc',
       'authnz_ldap'           => $::apache::version::distrelease ? {
         '7'     => 'mod_ldap',
+        '8'     => 'mod_ldap',
         default => 'mod_authz_ldap',
       },
       'authnz_pam'            => 'mod_authnz_pam',
diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb
new file mode 100644
index 0000000000..3face66ffb
--- /dev/null
+++ b/spec/acceptance/mod_authnz_ldap_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper_acceptance'
+apache_hash = apache_settings_hash
+
+# We need to restrict this test to RHEL 7.x, 8.x derived OSs as there are too many unique
+# dependency issues to solve on all supported platforms.
+describe 'apache::mod_authnz_ldap', if: os[:family] == 'redhat' && os[:release].to_i > 6 do
+  context 'Default mod_authnz_ldap module installation' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      class { 'apache::mod::authnz_ldap': }
+      MANIFEST
+
+    it 'succeeds in installing the mod_authnz_ldap module' do
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    describe file("#{apache_hash['mod_dir']}/authnz_ldap.load") do
+      it { is_expected.to contain 'mod_authnz_ldap.so' }
+    end
+  end
+end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index a48b1ad208..baa76dc237 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -41,50 +41,53 @@
   end # Debian
 
   context 'default configuration with parameters on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        id: 'root',
-        kernel: 'Linux',
-        operatingsystem: 'RedHat',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
-    it { is_expected.to contain_class('apache::params') }
-    it { is_expected.to contain_class('apache::mod::ldap') }
-    it { is_expected.to contain_apache__mod('authnz_ldap') }
-
-    context 'default verify_server_cert' do
-      it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert On$}) }
-    end
-
-    context 'verify_server_cert = false' do
-      let(:params) { { verify_server_cert: false } }
-
-      it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert Off$}) }
-    end
-
-    context 'verify_server_cert = wrong' do
-      let(:params) { { verify_server_cert: 'wrong' } }
-
-      it 'raises an error' do
-        expect { is_expected.to raise_error Puppet::Error }
+    on_supported_os.each do |os, os_facts|
+      next unless os.start_with?('redhat')
+      context "On #{os}" do
+        let :facts do
+          os_facts
+        end
+
+        it { is_expected.to contain_class('apache::params') }
+        it { is_expected.to contain_class('apache::mod::ldap') }
+        it { is_expected.to contain_apache__mod('authnz_ldap') }
+
+        if os_facts[:operatingsystemmajrelease].to_i >= 7
+          it { is_expected.to contain_package('mod_ldap') }
+        else
+          it { is_expected.to contain_package('mod_authz_ldap') }
+        end
+
+        context 'default verify_server_cert' do
+          it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert On$}) }
+        end
+
+        context 'verify_server_cert = false' do
+          let(:params) { { verify_server_cert: false } }
+
+          it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert Off$}) }
+        end
+
+        context 'verify_server_cert = wrong' do
+          let(:params) { { verify_server_cert: 'wrong' } }
+
+          it 'raises an error' do
+            expect { is_expected.to raise_error Puppet::Error }
+          end
+        end
+
+        context 'SCL', if: (os_facts[:operatingsystemmajrelease].to_i >= 6 && os_facts[:operatingsystemmajrelease].to_i < 8) do
+          let(:pre_condition) do
+            "class { 'apache::version':
+              scl_httpd_version => '2.4',
+              scl_php_version   => '7.0',
+            }
+            include apache"
+          end
+
+          it { is_expected.to contain_package('httpd24-mod_ldap') }
+        end
       end
     end
-
-    context 'SCL' do
-      let(:pre_condition) do
-        "class { 'apache::version':
-          scl_httpd_version => '2.4',
-          scl_php_version   => '7.0',
-        }
-        include apache"
-      end
-
-      it { is_expected.to contain_package('httpd24-mod_ldap') }
-    end
   end # Redhat
 end

From cbef540a6a7ca7b6827b5b34903334d6a3e0a686 Mon Sep 17 00:00:00 2001
From: Hugo Haakseth <hha@spk.no>
Date: Fri, 19 Jun 2020 12:30:43 +0200
Subject: [PATCH 1671/2267] MODULES-10712 fix mod_ldap on RH/CentOS 5 and 6

---
 manifests/params.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 545268256f..4e94f93727 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -199,7 +199,7 @@
     $suphp_configpath     = undef
     $php_version = $facts['operatingsystemmajrelease'] ? {
         '8'     => '7', # RedHat8
-        default => '5', # RedHat5, RedHat6, RedHat7 
+        default => '5', # RedHat5, RedHat6, RedHat7
       }
     $mod_packages         = {
       # NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
@@ -221,7 +221,11 @@
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',
-      'ldap'                  => 'mod_ldap',
+      'ldap'                  => $::apache::version::distrelease ? {
+        '5'     => undef,
+        '6'     => undef,
+        default => 'mod_ldap',
+      },
       'lookup_identity'       => 'mod_lookup_identity',
       'pagespeed'             => 'mod-pagespeed-stable',
       # NOTE: The passenger module isn't available on RH/CentOS without

From a20cf03eadeae418ccf2f742d496bef7ae4140ed Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 29 Jun 2020 22:44:28 +0100
Subject: [PATCH 1672/2267] (IAC-790) Enable Oracle Linux 7 Optional Repo for
 mod_authnz_ldap_spec.rb

---
 spec/acceptance/mod_authnz_ldap_spec.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb
index 3face66ffb..1bb5f824e4 100644
--- a/spec/acceptance/mod_authnz_ldap_spec.rb
+++ b/spec/acceptance/mod_authnz_ldap_spec.rb
@@ -5,10 +5,24 @@
 # dependency issues to solve on all supported platforms.
 describe 'apache::mod_authnz_ldap', if: os[:family] == 'redhat' && os[:release].to_i > 6 do
   context 'Default mod_authnz_ldap module installation' do
-    pp = <<-MANIFEST
+    pp = if run_shell("grep 'Oracle Linux Server' /etc/os-release", expect_failures: true).exit_status == 0
+           <<-MANIFEST
+      yumrepo { 'ol7_optional_latest':
+        name 	  => 'ol7_optional_latest',
+        baseurl 	  => 'https://yum.oracle.com/repo/OracleLinux/OL7/optional/latest/x86_64/',
+        gpgkey 	  => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle',
+        gpgcheck => 1,
+        enabled	   => 1,
+      }
       class { 'apache': }
       class { 'apache::mod::authnz_ldap': }
       MANIFEST
+         else
+           <<-MANIFEST
+        class { 'apache': }
+        class { 'apache::mod::authnz_ldap': }
+        MANIFEST
+         end
 
     it 'succeeds in installing the mod_authnz_ldap module' do
       apply_manifest(pp, catch_failures: true)

From 0c1fada8c4af9917f761255d5d52a286c93b5bbd Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 29 Jun 2020 22:55:45 +0100
Subject: [PATCH 1673/2267] (IAC-790) Enable EPEL repo for
 mod_authnz_ldap_spec.rb

---
 spec/acceptance/mod_authnz_ldap_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb
index 1bb5f824e4..2dd235d6bd 100644
--- a/spec/acceptance/mod_authnz_ldap_spec.rb
+++ b/spec/acceptance/mod_authnz_ldap_spec.rb
@@ -19,6 +19,9 @@ class { 'apache::mod::authnz_ldap': }
       MANIFEST
          else
            <<-MANIFEST
+        package { 'epel-release':
+          ensure => present,
+        }
         class { 'apache': }
         class { 'apache::mod::authnz_ldap': }
         MANIFEST

From f95dd775ecf5c6e0e6627b31c21d15d6f00fc6d3 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Tue, 30 Jun 2020 19:00:41 +0100
Subject: [PATCH 1674/2267] (MODULES-10712) Add acceptance test for 'mod::ldap'

(MODULES-10712) Exclude test from RHEL 8.x platforms
---
 spec/acceptance/mod_ldap_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 spec/acceptance/mod_ldap_spec.rb

diff --git a/spec/acceptance/mod_ldap_spec.rb b/spec/acceptance/mod_ldap_spec.rb
new file mode 100644
index 0000000000..c972304243
--- /dev/null
+++ b/spec/acceptance/mod_ldap_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper_acceptance'
+apache_hash = apache_settings_hash
+
+describe 'apache::mod::ldap', unless: os[:family] == 'redhat' && os[:release].to_i >= 8 do
+  context 'Default ldap module installation' do
+    pp = <<-MANIFEST
+        class { 'apache': }
+        class { 'apache::mod::ldap': }
+    MANIFEST
+
+    it 'succeeds in installing the ldap module' do
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    describe file("#{apache_hash['mod_dir']}/ldap.load") do
+      it { is_expected.to contain 'mod_ldap.so' }
+    end
+  end
+end

From 7c0d21d71b9f2ef7ae1f56b315cc79e1886492be Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Thu, 4 Jun 2020 15:16:52 +0100
Subject: [PATCH 1675/2267] (IAC-824) Ability to exclude Apache MOD tests from
 unsupported platforms

(IAC-824) Added more tests, refactoring and fixes

(IAC-824) Fix Rubocop violations

(IAC-824) Add guard for no tag scenario. Move init to RSpec.configure.

(IAC-824) Fixes from 1st integration test results

(IAC-824) Invert query and response for mods.

After discussion, it was determined that it read much better to have a method called 'mod_support_on_platform' than 'mod_unsupported_on_platform'

(IAC-824) Update README with Apache MOD test excl details

(IAC-824) Add ability to disable Apache MOD test exclusion functionality

(IAC-824) Tweak headingin README

(IAC-824) Some minor fixes discovered from testing

(IAC-824) Remove accidentally checked in binding.pry
---
 README.md                                     |  58 +++++-
 spec/spec_helper_acceptance.rb                |   1 +
 spec/spec_helper_acceptance_local.rb          |  29 +++
 spec/util/_resources/test_metadata_json.rb    |  86 +++++++++
 spec/util/apache_mod_platform_support_spec.rb | 179 ++++++++++++++++++
 util/_resources/tag_format_help_msg.txt       |  22 +++
 util/apache_mod_platform_support.rb           | 147 ++++++++++++++
 7 files changed, 521 insertions(+), 1 deletion(-)
 create mode 100644 spec/util/_resources/test_metadata_json.rb
 create mode 100644 spec/util/apache_mod_platform_support_spec.rb
 create mode 100644 util/_resources/tag_format_help_msg.txt
 create mode 100644 util/apache_mod_platform_support.rb

diff --git a/README.md b/README.md
index 38b973a3ff..af1fe523ca 100755
--- a/README.md
+++ b/README.md
@@ -129,6 +129,7 @@
 [Hash]: https://docs.puppet.com/puppet/latest/reference/lang_data_hash.html
 [`HttpProtocolOptions`]: http://httpd.apache.org/docs/current/mod/core.html#httpprotocoloptions
 
+[IAC Team]: https://puppetlabs.github.io/iac/
 [`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional
 [`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include
 [interval syntax]: https://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn
@@ -933,12 +934,13 @@ To check the code coverage, run:
 COVERAGE=yes bundle exec rake parallel_spec
 ```
 
-## Development
+
 
 Acceptance tests for this module leverage [puppet_litmus](https://github.com/puppetlabs/puppet_litmus).
 To run the acceptance tests follow the instructions [here](https://github.com/puppetlabs/puppet_litmus/wiki/Tutorial:-use-Litmus-to-execute-acceptance-tests-with-a-sample-module-(MoTD)#install-the-necessary-gems-for-the-module).
 You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
 
+### Development Support
 If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://tickets.puppetlabs.com/browse/MODULES/).
 Every Monday the Puppet IA Content Team has [office hours](https://puppet.com/community/office-hours) in the [Puppet Community Slack](http://slack.puppet.com/), alternating between an EMEA friendly time (1300 UTC) and an Americas friendly time (0900 Pacific, 1700 UTC).
 
@@ -949,3 +951,57 @@ If you submit a change to this module, be sure to regenerate the reference docum
 ```bash
 puppet strings generate --format markdown --out REFERENCE.md
 ```
+
+### Apache MOD Test & Support Lifecycle
+#### Adding Support for a new Apache MOD
+Support for new [Apache Modules] can be added under the [`apache::mod`] namespace.
+Acceptance tests should be added for each new [Apache Module][Apache Modules] added.
+Ideally, the acceptance tests should run on all compatible platforms that this module is supported on (see `metdata.json`), however there are cases when a more niche module is difficult to set up and install on a particular Linux distro.
+This could be for one or more of the following reasons:
+- Package not available in default repositories of distro
+- Package dependencies not available in default repositories of distro
+- Package (and/or its dependencies) are only available in a specific version of an OS
+
+In these cases, it is possible to exclude a module from a test platform using a specific tag, defined above the class declaration:
+```puppet
+# @note Unsupported platforms: OS: ver, ver; OS: ver, ver, ver; OS: all
+class apache::mod::foobar {
+...
+}
+```
+For example:
+```puppet
+# @note Unsupported platforms: RedHat: 5, 6; Ubuntu: 14.04; SLES: all; Scientific: 11 SP1
+class apache::mod::actions {
+...
+}
+```
+Please be aware of the following format guidelines for the tag:
+- All OS/Version declarations must be preceded with `@note Unsupported platforms:`
+- The tag must be declared ABOVE the class declaration (i.e. not as footer at the bottom of the file)
+- Each OS/Version declaration must be separated by semicolons (`;`)
+- Each version must be separated by a comma (`,`)
+- Versions CANNOT be declared in ranges (e.g. `RedHat:5-7`), they should be explicitly declared (e.g. `RedHat:5,6,7`)
+- However, to declare all versions of an OS as unsupported, use the word `all` (e.g. `SLES:all`)
+- OSs with word characters as part of their versions are acceptable (e.g. `Scientific: 11 SP1, 11 SP2, 12, 13`)
+- Spaces are permitted between OS/Version declarations and version numbers within a declaration
+- Refer to the `operatingsystem_support` values in the `metadata.json` to find the acceptable OS name and version syntax:
+  - E.g. `OracleLinux` OR `oraclelinux`, not: `Oracle` or `OraLinux`
+  - E.g. `RedHat` OR `redhat`, not: `Red Hat Enterprise Linux`, `RHEL`, or `Red Hat`
+
+If the tag is incorrectly formatted, a warning will be printed out at the end of the test run, indicating what tag(s) could not be parsed.
+This will not halt the execution of other tests.  
+
+Once the class is tagged, it is possible to exclude a test for that particular [Apache MOD][Apache Modules] using RSpec's filtering and a helper method:
+```ruby
+describe 'auth_oidc', if: mod_supported_on_platform('apache::mod::auth_openidc') do
+```
+The `mod_supported_on_platform` helper method takes the [Apache Module][Apache Modules] class definition as defined in the manifests under `manifest/mod`.
+
+This functionality can be disabled by setting the `DISABLE_MOD_TEST_EXCLUSION` environment variable.
+When set, all exclusions will be ignored.
+#### Test Support Lifecycle
+Given the breadth of compatible platforms that this module is supported on, and the amount of [Apache Modules][Apache Modules] supported, it is quite common for an [Apache Module's][Apache Modules] test(s) to start failing due to the package or package dependencies being removed from a particular Linux distro's repositories.
+Whilst all reasonable effort will be made by the [IAC Team][IAC Team] to resolve these issues and update setup instructions for a particular [Apache Module][Apache Modules], given the limited time and resources available, it will mean that in some cases, the effort required to continue maintaining a particular module's test(s) and installation instructions exceeds an acceptable limit.
+In these cases, we will begin excluding test(s) from certain platforms using the functionality outlined above.
+**This does not prevent any members within the community from undertaking this task, if they so wish, and the [IAC Team][IAC Team] will be more than happy to assist in this process, as much as we can.**
\ No newline at end of file
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 4ac8d7e0f6..9899608a14 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -4,3 +4,4 @@
 require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))
 
 PuppetLitmus.configure!
+ApacheModTestFilterHelper.instance.initialize_ampc(os)
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index f59cb7fb00..740248fa76 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -1,12 +1,32 @@
 # frozen_string_literal: true
 
 require 'singleton'
+require_relative '../util/apache_mod_platform_support'
 
 class LitmusHelper
   include Singleton
   include PuppetLitmus
 end
 
+class ApacheModTestFilterHelper
+  include Singleton
+
+  def initialize_ampc(os)
+    @ampc = ApacheModPlatformCompatibility.new
+    @ampc.generate_supported_platforms_versions
+    @ampc.register_running_platform(os)
+    @ampc.generate_mod_platform_exclusions
+  end
+
+  def mod_supported_on_platform?(mod)
+    @ampc.mod_supported_on_platform?(mod)
+  end
+
+  def print_parsing_errors
+    @ampc.print_parsing_errors
+  end
+end
+
 RSpec.configure do |c|
   # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
   if ENV['CI'] == 'true'
@@ -53,6 +73,10 @@ class { 'epel': }
     # Make sure selinux is disabled so the tests work.
     LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if os[:family] =~ %r{redhat|oracle}
   end
+
+  c.after :suite do
+    ApacheModTestFilterHelper.instance.print_parsing_errors
+  end
 end
 
 def apache_settings_hash
@@ -163,3 +187,8 @@ def apache_settings_hash
   end
   apache
 end
+
+def mod_supported_on_platform?(mod)
+  return false if ENV['DISABLE_MOD_TEST_EXCLUSION']
+  ApacheModTestFilterHelper.instance.mod_supported_on_platform?(mod)
+end
diff --git a/spec/util/_resources/test_metadata_json.rb b/spec/util/_resources/test_metadata_json.rb
new file mode 100644
index 0000000000..f00933ba25
--- /dev/null
+++ b/spec/util/_resources/test_metadata_json.rb
@@ -0,0 +1,86 @@
+METADATA_JSON = '{
+  "name": "puppetlabs-apache",
+  "version": "5.4.0",
+  "author": "puppetlabs",
+  "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
+  "license": "Apache-2.0",
+  "source": "https://github.com/puppetlabs/puppetlabs-apache",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 7.0.0"
+    },
+    {
+      "name": "puppetlabs/concat",
+      "version_requirement": ">= 2.2.1 < 7.0.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7",
+        "8"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7",
+        "8"
+      ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Scientific",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "8",
+        "9",
+        "10"
+      ]
+    },
+    {
+      "operatingsystem": "SLES",
+      "operatingsystemrelease": [
+        "11 SP1",
+        "12",
+        "15"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "14.04",
+        "16.04",
+        "18.04"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 5.5.10 < 7.0.0"
+    }
+  ],
+  "description": "Module for Apache configuration",
+  "pdk-version": "1.17.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
+  "template-ref": "heads/master-0-g095317c"
+}'.freeze
diff --git a/spec/util/apache_mod_platform_support_spec.rb b/spec/util/apache_mod_platform_support_spec.rb
new file mode 100644
index 0000000000..e01ae3d5a8
--- /dev/null
+++ b/spec/util/apache_mod_platform_support_spec.rb
@@ -0,0 +1,179 @@
+require 'rspec'
+require 'rspec-puppet-facts'
+require_relative '../../util/apache_mod_platform_support'
+require_relative '_resources/test_metadata_json'
+
+describe ApacheModPlatformCompatibility do
+  foobar_pp = 'foobar.pp'
+  foobar_mod = 'apache::mod::foobar'
+  foobar_class = "class #{foobar_mod}"
+  foobar_linux = 'foobar_linux'
+
+  expected_compatible_platform_versions = {
+    'redhat' => [6, 7, 8],
+    'centos' => [6, 7, 8],
+    'oraclelinux' => [6, 7],
+    'scientific' => [6, 7],
+    'debian' => [8, 9, 10],
+    'sles' => [11, 12, 15],
+    'ubuntu' => [14, 16, 18],
+  }
+
+  context 'when initialized' do
+    describe '#process_line' do
+      ampc = described_class.new
+      it 'returns an empty hash when given garbage line' do
+        expect(ampc.process_line('foobar')).to eq({})
+      end
+      it 'returns a hash with type: :unsupported_platform_declaration and extracted value' do
+        expect(ampc.process_line('# @note Unsupported platforms: foobar')).to eq(type: :unsupported_platform_declaration, value: 'foobar')
+      end
+      it 'returns a hash with type: :class_declaration and extracted value' do
+        expect(ampc.process_line(foobar_class)).to eq(type: :class_declaration, value: foobar_mod)
+      end
+    end
+
+    describe '#extract_os_ver_pairs' do
+      ampc = described_class.new
+      it 'handles single OS with single Version' do
+        expect(ampc.extract_os_ver_pairs('Debian: 5')).to eq('debian' => [5])
+      end
+      it 'handles single OS with multiple Versions' do
+        expect(ampc.extract_os_ver_pairs('Debian: 5, 6, 7')).to eq('debian' => [5, 6, 7])
+      end
+      it 'handles multiple OSs with multiple Versions' do
+        expect(ampc.extract_os_ver_pairs('Debian: 5, 6, 7; CentOS: 5,6,7')).to eq('debian' => [5, 6, 7], 'centos' => [5, 6, 7])
+      end
+      it 'handles Versions in \d+\.\d+ format' do
+        expect(ampc.extract_os_ver_pairs('Ubuntu: 14.04, 16.04')).to eq('ubuntu' => [14, 16])
+      end
+      it 'handles Versions with "SP"' do
+        expect(ampc.extract_os_ver_pairs('SLES: 11 SP1, 12')).to eq('sles' => [11, 12])
+      end
+      it 'returns an empty Hash when given data in an entirely invalid format' do
+        expect(ampc.extract_os_ver_pairs('foobar')).to eq({})
+      end
+      it 'returns an empty Hash when given data with incorrect OS/Version group separator' do
+        expect(ampc.extract_os_ver_pairs('Ubuntu#14.04, 16.04')).to eq({})
+      end
+      it 'returns an empty Hash when given data with incorrect OS + Version separator' do
+        expect(ampc.extract_os_ver_pairs('CentOS:5,6#Debian:5,6')).to eq({})
+      end
+      it 'returns an empty Hash when given data with incorrect Version separator' do
+        expect(ampc.extract_os_ver_pairs('CentOS:5@6')).to eq({})
+      end
+    end
+
+    describe '#register_unsupported_platforms' do
+      ampc = described_class.new
+      it 'registers a valid unsupported platform' do
+        ampc.register_running_platform(family: 'debian', release: '8.11', arch: 'x86_64')
+        expect(ampc).to receive(:valid_os?).with('debian').and_return(true)
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'debian' => [8])
+        expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
+      end
+      it 'registers multiple valid unsupported platforms' do
+        expect(ampc).to receive(:valid_os?).with('debian').and_return(true)
+        expect(ampc).to receive(:valid_os?).with('ubuntu').and_return(true)
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'debian' => [8])
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'ubuntu' => [14])
+        ampc.register_running_platform(family: 'debian', release: '8.11', arch: 'x86_64')
+        expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
+        ampc.register_running_platform(family: 'ubuntu', release: '14.04', arch: 'x86_64')
+        expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
+      end
+      it 'registers an :os_parse error when given an invalid platform' do
+        expect(ampc).to receive(:valid_os?).with(foobar_linux).and_return(false)
+        expect(ampc).to receive(:register_error).with(foobar_pp, 1, :os_parse, foobar_linux)
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, foobar_linux => [1])
+        ampc.register_running_platform(family: 'debian', release: '8.11', arch: 'x86_64')
+      end
+    end
+
+    describe '#generate_supported_platforms_versions' do
+      ampc = described_class.new
+
+      before(:each) do
+        allow(File).to receive(:read).and_call_original
+        allow(File).to receive(:read).with('../../metadata.json').and_return(METADATA_JSON)
+        ampc.generate_supported_platforms_versions
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, foobar_linux => [1])
+      end
+
+      context 'after parsing the metadata.json' do
+        expected_compatible_platform_versions.each do |os, vers|
+          vers.each do |ver|
+            it "should state #{os} version #{ver} IS a compatible platform" do
+              ampc.register_running_platform(family: os, version: ver)
+              expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(true)
+            end
+          end
+        end
+      end
+    end
+
+    describe '#mod_unsupported_on_platform' do
+      ampc = described_class.new
+      before(:each) do
+        allow(File).to receive(:read).and_call_original
+        allow(File).to receive(:read).with('../../metadata.json').and_return(METADATA_JSON)
+        ampc = described_class.new
+        ampc.generate_supported_platforms_versions
+      end
+
+      ubuntu_14_04_os = { family: 'ubuntu', release: '14.04' }
+
+      it 'returns false when running on an OS with all versions incompatible' do
+        ampc.register_running_platform(ubuntu_14_04_os)
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'ubuntu' => [0])
+        expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
+      end
+      it 'returns false when running on an OS with one specific version incompatible' do
+        ampc.register_running_platform(ubuntu_14_04_os)
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'ubuntu' => [14])
+        expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
+      end
+      it 'returns true when running on an OS with no versions marked as incompatible' do
+        ampc.register_running_platform(ubuntu_14_04_os)
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'debian' => [6, 7])
+        expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(true)
+      end
+      it 'returns true when running on an OS version not marked as incompatible' do
+        ampc.register_running_platform(ubuntu_14_04_os)
+        ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'ubuntu' => [16, 18])
+        expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(true)
+      end
+    end
+
+    describe '#print_parsing_errors' do
+      ampc = described_class.new
+      abc_pp = 'abc.pp'
+      abc_pp_error_line = 1
+      abc_pp_error_type = :tag_parse
+      abc_pp_error_type_msg = 'OS and version information in incorrect format:'
+      abc_pp_error_detail = 'Bad line'
+      def_pp = 'def.pp'
+      def_pp_error_line = 2
+      def_pp_error_type = :os_parse
+      def_pp_error_type_msg = 'OS name is not present in metadata.json:'
+      def_pp_error_detail = foobar_linux
+
+      tag_format_help_msg_txt = ['succint', 'warning']
+
+      expected_stderr_msg = "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n" \
+                            " * #{abc_pp} (line #{abc_pp_error_line}): #{abc_pp_error_type_msg} #{abc_pp_error_detail}\n" \
+                            " * #{def_pp} (line #{def_pp_error_line}): #{def_pp_error_type_msg} #{def_pp_error_detail}\n" \
+                            "#{tag_format_help_msg_txt[0]}\n" \
+                            "#{tag_format_help_msg_txt[1]}\n"
+
+      context 'given a number of errors were discovered when parsing the manifests' do
+        ampc.register_error(abc_pp, abc_pp_error_line, abc_pp_error_type, abc_pp_error_detail)
+        ampc.register_error(def_pp, def_pp_error_line, def_pp_error_type, def_pp_error_detail)
+        it 'prints the expected warnings to $stderr' do
+          allow(File).to receive(:readlines).with('util/_resources/tag_format_help_msg.txt').and_return(tag_format_help_msg_txt)
+          expect { ampc.print_parsing_errors }.to output(expected_stderr_msg).to_stderr
+        end
+      end
+    end
+  end
+end
diff --git a/util/_resources/tag_format_help_msg.txt b/util/_resources/tag_format_help_msg.txt
new file mode 100644
index 0000000000..201f6fcc63
--- /dev/null
+++ b/util/_resources/tag_format_help_msg.txt
@@ -0,0 +1,22 @@
+Tags to mark an Apache MOD as unsupported on a specific OS version must be in the following format:
+
+# @note Unsupported platforms: OS: ver, ver; OS: ver, ver, ver; OS: all'
+class apache::mod::foobar {
+...
+
+For example:
+# @note Unsupported platforms: RedHat: 5, 6; Ubuntu: 14.04; SLES: all; Scientific: 11 SP1'
+class apache::mod::actions {
+...
+
+- All OS/Version declarations must be preceded with '@note Unsupported platforms:'
+- The tag must be declared ABOVE the class declaration (i.e. not as footer at the bottom of the file)
+- Each OS/Version declaration must be separated by semicolons (;)
+- Each version must be separated by a comma (,)
+- Versions CANNOT be declared in ranges (e.g. 'RedHat:5-7'), they should be explicitly declared (e.g. 'RedHat:5,6,7')
+- However, to declare all versions of an OS as unsupported, use the word 'all' (e.g. SLES:all)
+- OSs with word characters as part of their versions are acceptable (e.g. 'Scientific: 11 SP1, 11 SP2, 12, 13')
+- Spaces are permitted between OS/Version declarations and version numbers within a declaration
+- Refer to the 'operatingsystem_support' values in the metadata.json to find the acceptable OS name and version syntax:
+--- E.g. OracleLinux OR oraclelinux, not: [Oracle, OraLinux]
+--- E.g. RedHat OR redhat, not: [Red Hat Enterprise Linux, RHEL, Red Hat]
\ No newline at end of file
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb
new file mode 100644
index 0000000000..16e0b1aebf
--- /dev/null
+++ b/util/apache_mod_platform_support.rb
@@ -0,0 +1,147 @@
+require 'json'
+# Helper class to facilitate exclusion of tests that use an Apache MOD on platforms it isn't supported on.
+# All Apache MOD classes are defined under 'manifests/mod'. The exclusion should be in the format:
+#
+# @note Unsupported platforms: OS: ver, ver; OS: ver, ver, ver; OS: all'
+# class apache::mod::foobar {
+# ...
+#
+# For example:
+# @note Unsupported platforms: RedHat: 5, 6; Ubuntu: 14.04; SLES: all; Scientific: 11 SP1'
+# class apache::mod::actions {
+#   apache::mod { 'actions': }
+# }
+#
+# Filtering is then performed during the test using RSpec's filtering, like so:
+#
+# describe 'auth_oidc', unless: mod_unsupported_on_platform('apache::mod::auth_openidc') do
+# ...
+# it 'applies cleanly', unless: mod_unsupported_on_platform('apache::mod::auth_openidc') do
+# ...
+class ApacheModPlatformCompatibility
+  ERROR_MSG = {
+    tag_parse:  'OS and version information in incorrect format:',
+    os_parse:   'OS name is not present in metadata.json:',
+  }.freeze
+
+  def initialize
+    @os = {}
+    @mapping = {}
+    @manifest_errors = []
+    @compatible_platform_versions = {}
+    @mod_platform_compatibility_mapping = {}
+  end
+
+  def register_running_platform(os)
+    @os = { family: os[:family], release: os[:release].to_i }
+  end
+
+  def generate_supported_platforms_versions
+    metadata = JSON.parse(File.read('metadata.json'))
+    metadata['operatingsystem_support'].each do |os|
+      @compatible_platform_versions[os['operatingsystem'].downcase] = os['operatingsystemrelease'].map(&:to_i)
+    end
+  end
+
+  # Class to hold the details of an error whilst parsing an unsupported tag
+  class ManifestError
+    attr_reader :manifest, :line_num, :error_type, :error_detail
+
+    def initialize(manifest, line_num, error_type, error_detail)
+      @manifest = manifest
+      @line_num = line_num
+      @error_type = error_type
+      @error_detail = error_detail
+    end
+  end
+
+  def print_parsing_errors
+    return if @manifest_errors.empty?
+    $stderr.puts "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n"
+    @manifest_errors.each do |manifest_error|
+      $stderr.puts " * #{manifest_error.manifest} (line #{manifest_error.line_num}): #{ERROR_MSG[manifest_error.error_type]} #{manifest_error.error_detail}"
+    end
+    File.readlines('util/_resources/tag_format_help_msg.txt').each do |line|
+      $stderr.puts line
+    end
+  end
+
+  def valid_os?(os)
+    @compatible_platform_versions.keys.include? os
+  end
+
+  def register_error(manifest, line_num, error_type, error_detail)
+    @manifest_errors << ManifestError.new(manifest, line_num, error_type, error_detail)
+  end
+
+  def register_unsupported_platforms(manifest, line_num, mod, platforms_versions)
+    platforms_versions.keys.each do |os|
+      unless valid_os?(os)
+        register_error(manifest, line_num, :os_parse, os)
+        next
+      end
+      if @mod_platform_compatibility_mapping.key? mod
+        @mod_platform_compatibility_mapping[mod].merge!(platforms_versions)
+      else
+        @mod_platform_compatibility_mapping[mod] = platforms_versions
+      end
+    end
+  end
+
+  def extract_os_ver_pairs(line)
+    platforms_versions = {}
+    os_ver_groups = line.delete(' ').downcase
+    # E.g. "debian:5,6;centos:5;sles:11sp1,12;scientific:all;ubuntu:14.04,16.04"
+    if %r{^((?:\w+:(?:(?:\d+(?:\.\d+|sp\d+)?|all),?)+;?)+)$}i =~ os_ver_groups
+      os_ver_groups.split(';').each do |os_vers|
+        os, vers = os_vers.split(':')
+        vers.gsub!(%r{sp\d+}, '') # Remove SP ver as we cannot determine this level of granularity from values from Litmus
+        platforms_versions[os] = vers.split(',').map(&:to_i) # 'all' will be converted to 0
+      end
+    end
+    platforms_versions
+  end
+
+  def process_line(line)
+    data = {}
+    return data unless line =~ %r{@note\sUnsupported\splatforms?:\s?|class\sapache::mod}i
+    if (match = %r{@note\sUnsupported\splatforms?:\s?(?<os_vers>.*)$}i.match(line))
+      data[:type] = :unsupported_platform_declaration
+      data[:value] = match[:os_vers]
+    elsif (match = %r{class\s(?<mod>apache::mod::\w+)}i.match(line))
+      data[:type] = :class_declaration
+      data[:value] = match[:mod]
+    end
+    data
+  end
+
+  def generate_mod_platform_exclusions
+    Dir.glob('manifests/mod/*.pp').each do |manifest|
+      platforms_versions = []
+      line_num = 0
+      File.readlines(manifest).each do |line|
+        line_num += 1
+        data = process_line(line)
+        next if data.empty?
+        if data[:type] == :unsupported_platform_declaration
+          platforms_versions = extract_os_ver_pairs(data[:value])
+          register_error(manifest, line_num, :tag_parse, line) if platforms_versions.empty?
+          next
+        elsif data[:type] == :class_declaration
+          register_unsupported_platforms(manifest, line_num, data[:value], platforms_versions) unless platforms_versions.empty?
+          break # Once we detect the class declaration, we can move on
+        end
+      end
+    end
+  end
+
+  # Called from within the context of a test run, making use of RSpec's filtering, e.g.:
+  # it 'should do some test', if: mod_supported_on_platform('apache::mod::foobar')
+  def mod_supported_on_platform?(mod)
+    return true if @mod_platform_compatibility_mapping.empty?
+    return true unless @mod_platform_compatibility_mapping.key? mod
+    return true unless @mod_platform_compatibility_mapping[mod].key? @os[:family]
+    return false if @mod_platform_compatibility_mapping[mod][@os[:family]] == [0]
+    !@mod_platform_compatibility_mapping[mod][@os[:family]].include? @os[:release]
+  end
+end

From 66ade4103985298928d5ff7c1ba4c3577fc98707 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Thu, 2 Jul 2020 17:30:32 +0100
Subject: [PATCH 1676/2267] (maint) Add EPEL repo for RHEL 8 tests in
 mod_authnz_ldap_spec

This should eventually be moved to the spec_helper_acceptance_local before(:suite) steps when an official EPEL repo is available for RedHat and CentOS 8.x.

Also added a 'yum clean all' as the Oracle 7 hosts from VMPooler were sometimes encountering the following error:
```
Error downloading packages:
[Errno 256] No more mirrors to try.
```
---
 spec/acceptance/mod_authnz_ldap_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb
index 2dd235d6bd..e758004c75 100644
--- a/spec/acceptance/mod_authnz_ldap_spec.rb
+++ b/spec/acceptance/mod_authnz_ldap_spec.rb
@@ -4,6 +4,10 @@
 # We need to restrict this test to RHEL 7.x, 8.x derived OSs as there are too many unique
 # dependency issues to solve on all supported platforms.
 describe 'apache::mod_authnz_ldap', if: os[:family] == 'redhat' && os[:release].to_i > 6 do
+  before(:each) do
+    run_shell('yum clean all') # To clear some issues when configuring EPEL / Optional repos
+    run_shell('dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y') if os[:release].to_i == 8
+  end
   context 'Default mod_authnz_ldap module installation' do
     pp = if run_shell("grep 'Oracle Linux Server' /etc/os-release", expect_failures: true).exit_status == 0
            <<-MANIFEST

From 683e94e0ef752739c14ec8a9a499b7f8f73bbbe5 Mon Sep 17 00:00:00 2001
From: Michael T Lombardi <michael.t.lombardi@outlook.com>
Date: Wed, 1 Jul 2020 13:48:34 -0500
Subject: [PATCH 1677/2267] (IAC-932) Prep for 5.5.0 release

---
 CHANGELOG.md  | 37 ++++++++++++++++++++++++++++++++++---
 metadata.json |  2 +-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a32c71f436..4cc97fcbc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,38 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v5.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.4.0) (2020-01-21)
+## [v5.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.5.0) (2020-07-01)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.4.0...v5.5.0)
+
+### Added
+
+- Allow IPv6 CIDRs for proxy\_protocol\_exceptions in mod remoteip [\#2033](https://github.com/puppetlabs/puppetlabs-apache/pull/2033) ([thechristschn](https://github.com/thechristschn))
+- \(IAC-746\) - Add ubuntu 20.04 support [\#2032](https://github.com/puppetlabs/puppetlabs-apache/pull/2032) ([david22swan](https://github.com/david22swan))
+- Replace legacy `bool2httpd\(\)` function with shim [\#2025](https://github.com/puppetlabs/puppetlabs-apache/pull/2025) ([alexjfisher](https://github.com/alexjfisher))
+- Tidy up `pw\_hash` function [\#2024](https://github.com/puppetlabs/puppetlabs-apache/pull/2024) ([alexjfisher](https://github.com/alexjfisher))
+- Replace validate\_apache\_loglevel\(\) with data type [\#2023](https://github.com/puppetlabs/puppetlabs-apache/pull/2023) ([alexjfisher](https://github.com/alexjfisher))
+- Add ProxyIOBufferSize option [\#2014](https://github.com/puppetlabs/puppetlabs-apache/pull/2014) ([jplindquist](https://github.com/jplindquist))
+- Add support for SetInputFilter directive [\#2007](https://github.com/puppetlabs/puppetlabs-apache/pull/2007) ([HoucemEddine](https://github.com/HoucemEddine))
+- \[MODULES-10530\] Add request limiting directives on virtual host level [\#1996](https://github.com/puppetlabs/puppetlabs-apache/pull/1996) ([aursu](https://github.com/aursu))
+- \[MODULES-10528\] Add ErrorLogFormat directive on virtual host level [\#1995](https://github.com/puppetlabs/puppetlabs-apache/pull/1995) ([aursu](https://github.com/aursu))
+- Add template variables and parameters for ModSecurity Audit Logs [\#1988](https://github.com/puppetlabs/puppetlabs-apache/pull/1988) ([jplindquist](https://github.com/jplindquist))
+- \(MODULES-10432\) Add mod\_auth\_openidc support [\#1987](https://github.com/puppetlabs/puppetlabs-apache/pull/1987) ([asieraguado](https://github.com/asieraguado))
+
+### Fixed
+
+- \(MODULES-10712\) Fix mod\_ldap on RH/CentOS 5 and 6 [\#2041](https://github.com/puppetlabs/puppetlabs-apache/pull/2041) ([h-haaks](https://github.com/h-haaks))
+- Update mod\_dir, alias\_icons\_path, error\_documents\_path for CentOS 8 [\#2038](https://github.com/puppetlabs/puppetlabs-apache/pull/2038) ([initrd](https://github.com/initrd))
+- Ensure switching of thread module works on Debian 10 / Ubuntu 20.04 [\#2034](https://github.com/puppetlabs/puppetlabs-apache/pull/2034) ([tuxmea](https://github.com/tuxmea))
+- MODULES-10586 Centos 8: wrong package used to install mod\_authnz\_ldap [\#2021](https://github.com/puppetlabs/puppetlabs-apache/pull/2021) ([farebers](https://github.com/farebers))
+- Re-add package for fcgid on debian/ubuntu machines [\#2006](https://github.com/puppetlabs/puppetlabs-apache/pull/2006) ([vStone](https://github.com/vStone))
+- Use ldap\_trusted\_mode in conditional [\#1999](https://github.com/puppetlabs/puppetlabs-apache/pull/1999) ([dacron](https://github.com/dacron))
+- Typo in oidcsettings.pp [\#1997](https://github.com/puppetlabs/puppetlabs-apache/pull/1997) ([asieraguado](https://github.com/asieraguado))
+- Fix proxy\_html Module to work on Debian 10 [\#1994](https://github.com/puppetlabs/puppetlabs-apache/pull/1994) ([buchstabensalat](https://github.com/buchstabensalat))
+- \(MODULES-10360\) Fix icon paths for RedHat systems [\#1991](https://github.com/puppetlabs/puppetlabs-apache/pull/1991) ([2and3makes23](https://github.com/2and3makes23))
+- SSLProxyEngine on has to be set before any Proxydirective using it [\#1989](https://github.com/puppetlabs/puppetlabs-apache/pull/1989) ([zivis](https://github.com/zivis))
+
+## [v5.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.4.0) (2020-01-22)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.3.0...v5.4.0)
 
@@ -42,7 +73,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- \(FM-8662\) Correct  in manifests/mod/ssl.pp for SLES 11 [\#1963](https://github.com/puppetlabs/puppetlabs-apache/pull/1963) ([cmccrisken-puppet](https://github.com/cmccrisken-puppet))
+- \(FM-8662\) Correct  in manifests/mod/ssl.pp for SLES 11 [\#1963](https://github.com/puppetlabs/puppetlabs-apache/pull/1963) ([sanfrancrisko](https://github.com/sanfrancrisko))
 - always quote ExpiresDefault in vhost::directories [\#1958](https://github.com/puppetlabs/puppetlabs-apache/pull/1958) ([evgeni](https://github.com/evgeni))
 - MODULES-9904 Fix lbmethod module load order [\#1956](https://github.com/puppetlabs/puppetlabs-apache/pull/1956) ([optiz0r](https://github.com/optiz0r))
 - Add owner, group, file\_mode and show\_diff to apache::custom\_config [\#1942](https://github.com/puppetlabs/puppetlabs-apache/pull/1942) ([treydock](https://github.com/treydock))
@@ -118,7 +149,6 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 - \(Modules 8141/Modules 8379\) - Addition of support for SLES 15 [\#1862](https://github.com/puppetlabs/puppetlabs-apache/pull/1862) ([david22swan](https://github.com/david22swan))
-- SCL support for httpd and php7.1 [\#1822](https://github.com/puppetlabs/puppetlabs-apache/pull/1822) ([mmoll](https://github.com/mmoll))
 
 ### Fixed
 
@@ -153,6 +183,7 @@ All notable changes to this project will be documented in this file. The format
 
 - pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#1838](https://github.com/puppetlabs/puppetlabs-apache/pull/1838) ([pmcmaw](https://github.com/pmcmaw))
 - pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#1836](https://github.com/puppetlabs/puppetlabs-apache/pull/1836) ([tphoney](https://github.com/tphoney))
+- SCL support for httpd and php7.1 [\#1822](https://github.com/puppetlabs/puppetlabs-apache/pull/1822) ([mmoll](https://github.com/mmoll))
 
 ### Fixed
 
diff --git a/metadata.json b/metadata.json
index b823e925f2..c399a69017 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.4.0",
+  "version": "5.5.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From cfd9525dde8b8929dbfb294ed0559ac5c9241a15 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Fri, 3 Jul 2020 11:09:19 +0100
Subject: [PATCH 1678/2267] Tweak README based on suggestion from ccadman

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index af1fe523ca..84b73b7d5c 100755
--- a/README.md
+++ b/README.md
@@ -1001,7 +1001,8 @@ The `mod_supported_on_platform` helper method takes the [Apache Module][Apache M
 This functionality can be disabled by setting the `DISABLE_MOD_TEST_EXCLUSION` environment variable.
 When set, all exclusions will be ignored.
 #### Test Support Lifecycle
-Given the breadth of compatible platforms that this module is supported on, and the amount of [Apache Modules][Apache Modules] supported, it is quite common for an [Apache Module's][Apache Modules] test(s) to start failing due to the package or package dependencies being removed from a particular Linux distro's repositories.
-Whilst all reasonable effort will be made by the [IAC Team][IAC Team] to resolve these issues and update setup instructions for a particular [Apache Module][Apache Modules], given the limited time and resources available, it will mean that in some cases, the effort required to continue maintaining a particular module's test(s) and installation instructions exceeds an acceptable limit.
-In these cases, we will begin excluding test(s) from certain platforms using the functionality outlined above.
-**This does not prevent any members within the community from undertaking this task, if they so wish, and the [IAC Team][IAC Team] will be more than happy to assist in this process, as much as we can.**
\ No newline at end of file
+The puppetlabs-apache module supports a large number of compatible platforms and [Apache Modules][Apache modules].
+As a result, Apache Module tests can fail because a package or package dependency has been removed from a Linux distribution repository.
+The [IAC Team][IAC Team] will try to resolve these issues and keep instructions updated, but due to limited resources this won’t always be possible.
+In these cases, we will exclude test(s) from certain platforms.
+As always, we welcome help from our community members, and the IAC team is here to assist and answer questions.

From f4ad04ec0231c33af851fc9dbaedd6b67c62d99a Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Wed, 1 Jul 2020 23:52:58 +0100
Subject: [PATCH 1679/2267] (IAC-587) Tag apache::mod:authnz_ldap with
 unsupported platforms

---
 manifests/mod/authnz_ldap.pp  | 2 +-
 spec/acceptance/vhost_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 4a536c807e..8322bb9f70 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -8,7 +8,7 @@
 #   The name of the ldap package.
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html for additional documentation.
-#
+# @note Unsupported platforms: RedHat: 6, 8; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: 14.04; SLES: all
 class apache::mod::authnz_ldap (
   Boolean $verify_server_cert = true,
   $package_name               = undef,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 8f0f8e6af1..70ab1c04b0 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1200,7 +1200,7 @@ class { 'apache::mod::shib': }
 
   # IAC-587: These tests do not currently run successfully on certain RHEL OSs due to dependency issues with the
   # mod_auth_openidc module.
-  describe 'auth_oidc', if: (os[:family] == 'ubuntu' && os[:release].to_i > 14 || os[:family] == 'debian') do
+  describe 'auth_oidc', if: mod_supported_on_platform?('apache::mod::authnz_ldap') do
     pp = <<-MANIFEST
         class { 'apache': }
         apache::vhost { 'test.server':

From 9b0865c46cfa7a43db943ed585e4e580d4716bfd Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Thu, 9 Jul 2020 16:51:47 +0100
Subject: [PATCH 1680/2267] (IAC-934) Use tagging to filter Apache MOD tests
 from execution

---
 manifests/mod/authnz_ldap.pp              |   2 +-
 manifests/mod/event.pp                    |   2 +-
 manifests/mod/itk.pp                      |   2 +-
 manifests/mod/ldap.pp                     |   2 +-
 manifests/mod/php.pp                      |   1 +
 manifests/mod/shib.pp                     |   2 +-
 manifests/mod/wsgi.pp                     |   2 +-
 spec/acceptance/apache_parameters_spec.rb |   2 +-
 spec/acceptance/itk_spec.rb               |   2 +-
 spec/acceptance/mod_authnz_ldap_spec.rb   |   8 +-
 spec/acceptance/mod_ldap_spec.rb          |   2 +-
 spec/acceptance/mod_php_spec.rb           | 153 +++++++++++-----------
 spec/acceptance/prefork_worker_spec.rb    |   2 +-
 spec/acceptance/vhost_spec.rb             |   4 +-
 14 files changed, 94 insertions(+), 92 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 8322bb9f70..672373ff9e 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -8,7 +8,7 @@
 #   The name of the ldap package.
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html for additional documentation.
-# @note Unsupported platforms: RedHat: 6, 8; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: 14.04; SLES: all
+# @note Unsupported platforms: RedHat: 6, 8; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
 class apache::mod::authnz_ldap (
   Boolean $verify_server_cert = true,
   $package_name               = undef,
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 9cfec971ff..e7cae3da68 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -45,7 +45,7 @@
 #   apache::mod::worker on the same server.
 #
 # @see https://httpd.apache.org/docs/current/mod/event.html for additional documentation.
-#
+# @note Unsupported platforms: SLES: all
 class apache::mod::event (
   $startservers           = '2',
   $maxclients             = '150',
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 05bc5ccd36..e631dfde60 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -28,7 +28,7 @@
 #   Used to verify that the Apache version you have requested is compatible with the module.
 # 
 # @see http://mpm-itk.sesse.net for additional documentation.
-#
+# @note Unsupported platforms: CentOS: 8; RedHat: 8; SLES: all
 class apache::mod::itk (
   $startservers        = '8',
   $minspareservers     = '5',
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 95707b47a8..4994aafc11 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -47,7 +47,7 @@
 #   }
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_ldap.html for additional documentation.
-#
+# @note Unsupported platforms: CentOS: 8; RedHat: 8
 class apache::mod::ldap (
   $apache_version                                  = undef,
   $package_name                                    = undef,
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 83f5dad3d4..96465cd43d 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -3,6 +3,7 @@
 # 
 # @todo
 #   Add docs
+# @note Unsupported platforms: SLES: all
 class apache::mod::php (
   $package_name     = undef,
   $package_ensure   = 'present',
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 064e5b70bc..8d177f668d 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -22,7 +22,7 @@
 #   See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide).
 #
 # @see https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig for additional documentation.
-#
+# @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Debian: 7, 8; Ubuntu: all; OracleLinux: all
 class apache::mod::shib (
   $suppress_warning = false,
   $mod_full_path    = undef,
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 94f34b98e1..b6d5a999f7 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -26,7 +26,7 @@
 #   Defines the path to the mod_wsgi shared object (.so) file.
 # 
 # @see https://github.com/GrahamDumpleton/mod_wsgi for additional documentation.
-#
+# @note Unsupported platforms: SLES: all; RedHat: all; CentOS: all; OracleLinux: all; Scientific: all
 class apache::mod::wsgi (
   $wsgi_restrict_embedded = undef,
   $wsgi_socket_prefix     = $::apache::params::wsgi_socket_prefix,
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 46ea401b02..1327d4c9b9 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -94,7 +94,7 @@ class { 'apache':
 
   # IAC-785: The Shibboleth mod does not seem to be configured correctly on Debian 10 systems. We should reenable
   # this test on Debian 10 systems once the issue has been RCA'd and resolved.
-  describe 'conf_enabled => /etc/apache2/conf-enabled', if: os[:family] == 'debian' && os[:release].to_i < 10 do
+  describe 'conf_enabled => /etc/apache2/conf-enabled', skip: 'IAC-785' do
     pp = <<-MANIFEST
         class { 'apache':
           purge_configs   => false,
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index d7fe96676c..9efe7f459d 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -16,7 +16,7 @@
 
 # IAC-787: The http-itk mod package is not available in any of the standard RHEL/CentOS 8.x repos. Disable this test
 # on those platforms until we can find a suitable source for this package.
-describe 'apache::mod::itk class', if: service_name, unless: os[:family] == 'redhat' && os[:release].to_i >= 8 do
+describe 'apache::mod::itk class', if: service_name && mod_supported_on_platform?('apache::mod::itk') do
   describe 'running puppet code' do
     let(:pp) do
       case variant
diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb
index e758004c75..be4bbb7b8b 100644
--- a/spec/acceptance/mod_authnz_ldap_spec.rb
+++ b/spec/acceptance/mod_authnz_ldap_spec.rb
@@ -3,10 +3,12 @@
 
 # We need to restrict this test to RHEL 7.x, 8.x derived OSs as there are too many unique
 # dependency issues to solve on all supported platforms.
-describe 'apache::mod_authnz_ldap', if: os[:family] == 'redhat' && os[:release].to_i > 6 do
+describe 'apache::mod::authnz_ldap', if: mod_supported_on_platform?('apache::mod::authnz_ldap') do
   before(:each) do
-    run_shell('yum clean all') # To clear some issues when configuring EPEL / Optional repos
-    run_shell('dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y') if os[:release].to_i == 8
+    if os[:family] == 'redhat'
+      run_shell('yum clean all') # To clear some issues when configuring EPEL / Optional repos
+      run_shell('dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y') if os[:release].to_i == 8
+    end
   end
   context 'Default mod_authnz_ldap module installation' do
     pp = if run_shell("grep 'Oracle Linux Server' /etc/os-release", expect_failures: true).exit_status == 0
diff --git a/spec/acceptance/mod_ldap_spec.rb b/spec/acceptance/mod_ldap_spec.rb
index c972304243..0fabfe6bcc 100644
--- a/spec/acceptance/mod_ldap_spec.rb
+++ b/spec/acceptance/mod_ldap_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 
-describe 'apache::mod::ldap', unless: os[:family] == 'redhat' && os[:release].to_i >= 8 do
+describe 'apache::mod::ldap', if: mod_supported_on_platform?('apache::mod::ldap') do
   context 'Default ldap module installation' do
     pp = <<-MANIFEST
         class { 'apache': }
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 1657a68112..ab660f9534 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,88 +1,87 @@
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
-unless os[:family] == 'sles' && os[:release].to_i >= 12
-  describe 'apache::mod::php class' do
-    context 'default php config' do
-      pp = <<-MANIFEST
-          class { 'apache':
-            mpm_module => 'prefork',
-          }
-          class { 'apache::mod::php': }
-          apache::vhost { 'php.example.com':
-            port    => '80',
-            docroot => '#{apache_hash['doc_root']}/php',
-          }
-          host { 'php.example.com': ip => '127.0.0.1', }
-          file { '#{apache_hash['doc_root']}/php/index.php':
-            ensure  => file,
-            content => "<?php phpinfo(); ?>\\n",
-          }
-      MANIFEST
-      it 'succeeds in puppeting php' do
-        apply_manifest(pp, catch_failures: true)
-      end
 
-      if (os[:family] == 'ubuntu' && os[:release] == '16.04') ||
-         (os[:family] == 'debian' && os[:release] =~ %r{9})
-        describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'debian' && os[:release] =~ %r{10}
-        describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
-        describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'ubuntu' && os[:release] == '20.04'
-        describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'redhat' && os[:release] =~ %r{^8}
-        describe file("#{apache_hash['mod_dir']}/php7.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      else
-        describe file("#{apache_hash['mod_dir']}/php5.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
+describe 'apache::mod::php class', if: mod_supported_on_platform?('apache::mod::php') do
+  context 'default php config' do
+    pp = <<-MANIFEST
+        class { 'apache':
+          mpm_module => 'prefork',
+        }
+        class { 'apache::mod::php': }
+        apache::vhost { 'php.example.com':
+          port    => '80',
+          docroot => '#{apache_hash['doc_root']}/php',
+        }
+        host { 'php.example.com': ip => '127.0.0.1', }
+        file { '#{apache_hash['doc_root']}/php/index.php':
+          ensure  => file,
+          content => "<?php phpinfo(); ?>\\n",
+        }
+    MANIFEST
+    it 'succeeds in puppeting php' do
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    if (os[:family] == 'ubuntu' && os[:release] == '16.04') ||
+       (os[:family] == 'debian' && os[:release] =~ %r{9})
+      describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'debian' && os[:release] =~ %r{10}
+      describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
+      describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'ubuntu' && os[:release] == '20.04'
+      describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8}
+      describe file("#{apache_hash['mod_dir']}/php7.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    else
+      describe file("#{apache_hash['mod_dir']}/php5.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
       end
     end
+  end
 
-    context 'custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value' do
-      pp = <<-MANIFEST
-          class { 'apache':
-            mpm_module => 'prefork',
-          }
-           class { 'apache::mod::php':
-           extensions => ['.php','.php5'],
-         }
+  context 'custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value' do
+    pp = <<-MANIFEST
+        class { 'apache':
+          mpm_module => 'prefork',
+        }
+         class { 'apache::mod::php':
+         extensions => ['.php','.php5'],
+       }
 
-          apache::vhost { 'php.example.com':
-            port             => '80',
-            docroot          => '#{apache_hash['doc_root']}/php',
-            php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
-            php_flags        => { 'display_errors' => 'on', },
-            php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
-            php_admin_flags  => { 'engine' => 'on', },
-          }
-          host { 'php.example.com': ip => '127.0.0.1', }
-          file { '#{apache_hash['doc_root']}/php/index.php5':
-            ensure  => file,
-            content => "<?php phpinfo(); ?>\\n",
-          }
-      MANIFEST
-      it 'succeeds in puppeting php' do
-        apply_manifest(pp, catch_failures: true)
-      end
+        apache::vhost { 'php.example.com':
+          port             => '80',
+          docroot          => '#{apache_hash['doc_root']}/php',
+          php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
+          php_flags        => { 'display_errors' => 'on', },
+          php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
+          php_admin_flags  => { 'engine' => 'on', },
+        }
+        host { 'php.example.com': ip => '127.0.0.1', }
+        file { '#{apache_hash['doc_root']}/php/index.php5':
+          ensure  => file,
+          content => "<?php phpinfo(); ?>\\n",
+        }
+    MANIFEST
+    it 'succeeds in puppeting php' do
+      apply_manifest(pp, catch_failures: true)
+    end
 
-      describe file("#{apache_hash['vhost_dir']}/25-php.example.com.conf") do
-        it { is_expected.to contain '  php_flag display_errors on' }
-        it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
-        it { is_expected.to contain '  php_admin_flag engine on' }
-        it { is_expected.to contain '  php_admin_value open_basedir /var/www/php/:/usr/share/pear/' }
-      end
+    describe file("#{apache_hash['vhost_dir']}/25-php.example.com.conf") do
+      it { is_expected.to contain '  php_flag display_errors on' }
+      it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
+      it { is_expected.to contain '  php_admin_flag engine on' }
+      it { is_expected.to contain '  php_admin_value open_basedir /var/www/php/:/usr/share/pear/' }
     end
   end
 end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 31d7e38e05..6b64d19c5b 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
-describe 'prefork_worker_spec.rb', unless: (os[:family] =~ %r{sles}) do
+describe 'prefork_worker_spec.rb', if: mod_supported_on_platform?('apache::mod::event') do
   describe 'apache::mod::event class' do
     describe 'running puppet code' do
       let(:pp) do
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 70ab1c04b0..19561f85df 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -752,7 +752,7 @@ class { 'apache': }
     end
   end
 
-  describe 'parameter tests', unless: (os[:family] =~ %r{redhat} && os[:release].to_i == 8) do
+  describe 'parameter tests', if: mod_supported_on_platform?('apache::mod::itk') do
     pp = <<-MANIFEST
       class { 'apache': }
       host { 'test.itk': ip => '127.0.0.1' }
@@ -1103,7 +1103,7 @@ class { 'apache': }
   end
 
   describe 'wsgi' do
-    context 'filter on OS', unless: (os[:family] =~ %r{sles|redhat}) do
+    context 'filter on OS', if: mod_supported_on_platform?('apache::mod::wsgi') do
       pp = <<-MANIFEST
       class { 'apache': }
       class { 'apache::mod::wsgi': }

From d346b76d1aab954b642c55942d3ff8cf6cb578ac Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 27 Jul 2020 14:09:59 +0900
Subject: [PATCH 1681/2267] Use python3-mod_wsgi instead of mod_wsgi on CentOS8

The mod_wsgi package was renamed to python3-mod_wsgi on CentOS8, and
now the old name doesn't work since the provides and obsoletes for it
was removed[1].

[1] https://centos.pkgs.org/8/centos-appstream-x86_64/python3-mod_wsgi-4.6.4-4.el8.x86_64.rpm.html
---
 manifests/params.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 9ae363c0da..5a16c46e0e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -240,7 +240,10 @@
       # See http://wiki.aaf.edu.au/tech-info/sp-install-guide
       'shibboleth'            => 'shibboleth',
       'ssl'                   => 'mod_ssl',
-      'wsgi'                  => 'mod_wsgi',
+      'wsgi'                  => $facts['operatingsystemmajrelease'] ? {
+        '8'     => 'python3-mod_wsgi', # RedHat8
+        default => 'mod_wsgi',         # RedHat5, RedHat6, RedHat7
+      },
       'dav_svn'               => 'mod_dav_svn',
       'suphp'                 => 'mod_suphp',
       'xsendfile'             => 'mod_xsendfile',

From 342a5f4e0014c69d47905f91480e90f994ef424e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 27 Jul 2020 23:31:04 +0900
Subject: [PATCH 1682/2267] [CentOS] Always use distrelease to detect OS major
 versions

This change makes sure that apache::version::distrelease is always used
to detect OS major version, instead of facts, so that the same logic is
used for the version detection.
---
 manifests/params.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index e299d6f25c..7a0f16caa0 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -197,7 +197,7 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
-    $php_version = $facts['operatingsystemmajrelease'] ? {
+    $php_version = $::apache::version::distrelease ? {
         '8'     => '7', # RedHat8
         default => '5', # RedHat5, RedHat6, RedHat7
       }
@@ -248,7 +248,7 @@
       # See http://wiki.aaf.edu.au/tech-info/sp-install-guide
       'shibboleth'            => 'shibboleth',
       'ssl'                   => 'mod_ssl',
-      'wsgi'                  => $facts['operatingsystemmajrelease'] ? {
+      'wsgi'                  => $::apache::version::distrelease ? {
         '8'     => 'python3-mod_wsgi', # RedHat8
         default => 'mod_wsgi',         # RedHat5, RedHat6, RedHat7
       },

From 88bda28f9a4f1e4ed8bc704adfdf5d64838c7fa7 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Tue, 4 Aug 2020 10:51:47 +0100
Subject: [PATCH 1683/2267] (IAC-973) - Update travis/appveyor to run on new
 default branch main

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 23bd152a59..c08233a4c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -128,7 +128,7 @@ jobs:
       stage: spec
 branches:
   only:
-    - master
+    - main
     - /^v\d/
     - release
 notifications:

From dd9f3ac80f1e8958a05292768850733bc635ed28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sun, 9 Aug 2020 13:45:30 -1000
Subject: [PATCH 1684/2267] Compare passenger optional values with undef

An explicit Boolean value 'false' means a passenger setting was
explicitely set, and should not account as the setting being absent.
---
 manifests/vhost.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bb7a036e13..f6042c7270 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1980,7 +1980,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_max_requests or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_group or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file {
+  if $passenger_spawn_method != undef or $passenger_app_root != undef or $passenger_app_env != undef or $passenger_ruby != undef or $passenger_min_instances != undef or $passenger_max_requests != undef or $passenger_start_timeout != undef or $passenger_pre_start != undef or $passenger_user != undef or $passenger_group != undef or $passenger_high_performance != undef or $passenger_nodejs != undef or $passenger_sticky_sessions != undef or $passenger_startup_file != undef {
     include ::apache::mod::passenger
   }
 
@@ -2705,7 +2705,7 @@
   # - $passenger_nodejs
   # - $passenger_sticky_sessions
   # - $passenger_startup_file
-  if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_user or $passenger_group or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{
+  if $passenger_spawn_method != undef or $passenger_app_root != undef or $passenger_app_env != undef or $passenger_ruby != undef or $passenger_min_instances != undef or $passenger_start_timeout != undef or $passenger_user != undef or $passenger_group != undef or $passenger_nodejs != undef or $passenger_sticky_sessions != undef or $passenger_startup_file != undef {
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,

From e4bedb40d368c9e52b1522fa64a82d7830adefc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sun, 9 Aug 2020 13:56:29 -1000
Subject: [PATCH 1685/2267] Add missing/new passenger settings

---
 manifests/mod/passenger.pp         | 30 ++++++++++++++++++++++++++++++
 manifests/vhost.pp                 | 15 +++++++++++++++
 spec/classes/mod/passenger_spec.rb | 23 +++++++++++++++++++++++
 spec/defines/vhost_spec.rb         |  6 ++++++
 templates/mod/passenger.conf.erb   | 15 +++++++++++++++
 templates/vhost/_passenger.erb     |  9 +++++++++
 6 files changed, 98 insertions(+)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index fa8597b764..74eeb0ec7c 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -312,6 +312,7 @@
   $mod_package_ensure                                                                        = undef,
   $mod_path                                                                                  = undef,
   $passenger_allow_encoded_slashes                                                           = undef,
+  Optional[String] $passenger_anonymous_telemetry_proxy                                      = undef,
   $passenger_app_env                                                                         = undef,
   $passenger_app_group_name                                                                  = undef,
   $passenger_app_root                                                                        = undef,
@@ -328,6 +329,8 @@
   $passenger_default_group                                                                   = undef,
   $passenger_default_ruby                                                                    = $::apache::params::passenger_default_ruby,
   $passenger_default_user                                                                    = undef,
+  Optional[Boolean] $passenger_disable_anonymous_telemetry                                   = undef,
+  Optional[Boolean ] $passenger_disable_log_prefix                                           = undef,
   $passenger_disable_security_update_check                                                   = undef,
   $passenger_enabled                                                                         = undef,
   $passenger_error_override                                                                  = undef,
@@ -367,12 +370,14 @@
   $passenger_security_update_check_proxy                                                     = undef,
   $passenger_show_version_in_header                                                          = undef,
   $passenger_socket_backlog                                                                  = undef,
+  Optional[String] $passenger_spawn_dir                                                      = undef,
   Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method     = undef,
   $passenger_start_timeout                                                                   = undef,
   $passenger_startup_file                                                                    = undef,
   $passenger_stat_throttle_rate                                                              = undef,
   $passenger_sticky_sessions                                                                 = undef,
   $passenger_sticky_sessions_cookie_name                                                     = undef,
+  Optional[String] $passenger_sticky_sessions_cookie_attributes                              = undef,
   $passenger_thread_count                                                                    = undef,
   $passenger_use_global_queue                                                                = undef,
   $passenger_user                                                                            = undef,
@@ -401,6 +406,11 @@
         fail("Passenger config option :: passenger_allow_encoded_slashes is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
+    if $passenger_anonymous_telemetry_proxy {
+      if (versioncmp($passenger_installed_version, '6.0.0') < 0) {
+        fail("Passenger config option :: passenger_anonymous_telemetry_proxy is not introduced until version 6.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
     if $passenger_app_env {
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
         fail("Passenger config option :: passenger_app_env is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
@@ -471,6 +481,16 @@
         fail("Passenger config option :: passenger_default_user is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
+    if $passenger_disable_anonymous_telemetry {
+      if (versioncmp($passenger_installed_version, '6.0.0') < 0) {
+        fail("Passenger config option :: passenger_disable_anonymous_telemetry is not introduced until version 6.0.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_disable_log_prefix {
+      if (versioncmp($passenger_installed_version, '6.0.2') < 0) {
+        fail("Passenger config option :: passenger_disable_log_prefix is not introduced until version 6.0.2 :: ${passenger_installed_version} is the version reported")
+      }
+    }
     if $passenger_disable_security_update_check {
       if (versioncmp($passenger_installed_version, '5.1.0') < 0) {
         fail("Passenger config option :: passenger_disable_security_update_check is not introduced until version 5.1.0 :: ${passenger_installed_version} is the version reported")
@@ -661,6 +681,11 @@
         fail("Passenger config option :: passenger_socket_backlog is not introduced until version 5.0.24 :: ${passenger_installed_version} is the version reported")
       }
     }
+    if $passenger_spawn_dir {
+      if (versioncmp($passenger_installed_version, '6.0.3') < 0) {
+        fail("Passenger config option :: passenger_spawn_dir is not introduced until version 6.0.3 :: ${passenger_installed_version} is the version reported")
+      }
+    }
     if $passenger_spawn_method {
       if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
         fail("Passenger config option :: passenger_spawn_method is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
@@ -691,6 +716,11 @@
         fail("Passenger config option :: passenger_sticky_sessions_cookie_name is not introduced until version 4.0.45 :: ${passenger_installed_version} is the version reported")
       }
     }
+    if $passenger_sticky_sessions_cookie_attributes {
+      if (versioncmp($passenger_installed_version, '6.0.5') < 0) {
+        fail("Passenger config option :: passenger_sticky_sessions_cookie_attributes is not introduced until version 6.0.5 :: ${passenger_installed_version} is the version reported")
+      }
+    }
     if $passenger_thread_count {
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
         fail("Passenger config option :: passenger_thread_count is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f6042c7270..e6aa7c3696 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -657,6 +657,10 @@
 #   Sets [PassengerAppGroupName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappgroupname), 
 #    the name of the application group that the current application should belong to.
 # 
+# @param passenger_app_start_command
+#   Sets [PassengerAppStartCommand](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappstartcommand),
+#    how Passenger should start your app on a specific port.
+#
 # @param passenger_app_type
 #   Sets [PassengerAppType](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapptype), 
 #    to force Passenger to recognize the application as a specific type.
@@ -791,12 +795,20 @@
 # @param passenger_sticky_sessions_cookie_name
 #   Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessionscookiename), 
 #   to specify the name of the sticky sessions cookie.
+#
+# @param passenger_sticky_sessions_cookie_attributes
+#   Sets [PassengerStickySessionsCookieAttributes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookieattributes),
+#   the attributes of the sticky sessions cookie.
 # 
 # @param passenger_allow_encoded_slashes
 #   Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/library/config/apache/reference/#passengerallowencodedslashes), 
 #   to allow URLs with encoded slashes. Please note that this feature will not work properly
 #   unless Apache's `AllowEncodedSlashes` is also enabled.
 # 
+# @param passenger_app_log_file
+#   Sets [PassengerAppLogFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapplogfile),
+#   app specific messages logged to a different file in addition to Passenger log file.
+#
 # @param passenger_debugger
 #   Sets [PassengerDebugger](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdebugger), 
 #   to turn support for Ruby application debugging on or off. 
@@ -1854,6 +1866,7 @@
   Optional[String] $passenger_app_env                                               = undef,
   Optional[Stdlib::Absolutepath] $passenger_app_root                                = undef,
   Optional[String] $passenger_app_group_name                                        = undef,
+  Optional[String] $passenger_app_start_command                                     = undef,
   Optional[Enum['meteor', 'node', 'rack', 'wsgi']] $passenger_app_type              = undef,
   Optional[String] $passenger_startup_file                                          = undef,
   Optional[String] $passenger_restart_dir                                           = undef,
@@ -1884,7 +1897,9 @@
   Optional[Integer] $passenger_max_request_queue_time                               = undef,
   Optional[Boolean] $passenger_sticky_sessions                                      = undef,
   Optional[String] $passenger_sticky_sessions_cookie_name                           = undef,
+  Optional[String] $passenger_sticky_sessions_cookie_attributes                     = undef,
   Optional[Boolean] $passenger_allow_encoded_slashes                                = undef,
+  Optional[String] $passenger_app_log_file                                          = undef,
   Optional[Boolean] $passenger_debugger                                             = undef,
   Optional[Integer] $passenger_lve_min_uid                                          = undef,
   $add_default_charset                                                              = undef,
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 8cbac880c8..699cc9bb09 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -22,6 +22,7 @@
 
           passenger_config_options = {
             'passenger_allow_encoded_slashes' => { type: 'OnOff', pass_opt: :PassengerAllowEncodedSlashes },
+            'passenger_anonymous_telemetry_proxy' => { type: 'String', pass_opt: :PassengerAnonymousTelemetryProxy },
             'passenger_app_env' => { type: 'String', pass_opt: :PassengerAppEnv },
             'passenger_app_group_name' => { type: 'String', pass_opt: :PassengerAppGroupName },
             'passenger_app_root' => { type: 'FullPath', pass_opt: :PassengerAppRoot },
@@ -36,6 +37,8 @@
             'passenger_default_group' => { type: 'String', pass_opt: :PassengerDefaultGroup },
             'passenger_default_ruby' => { type: 'FullPath', pass_opt: :PassengerDefaultRuby },
             'passenger_default_user' => { type: 'String', pass_opt: :PassengerDefaultUser },
+            'passenger_disable_anonymous_telemetry' => { type: 'Boolean', pass_opt: :PassengerDisableAnonymousTelemetry },
+            'passenger_disable_log_prefix' => { type: 'Boolean', pass_opt: :PassengerDisableLogPrefix },
             'passenger_disable_security_update_check' => { type: 'OnOff', pass_opt: :PassengerDisableSecurityUpdateCheck },
             'passenger_enabled' => { type: 'OnOff', pass_opt: :PassengerEnabled },
             'passenger_error_override' => { type: 'OnOff', pass_opt: :PassengerErrorOverride },
@@ -74,12 +77,14 @@
             'passenger_security_update_check_proxy' => { type: 'URI', pass_opt: :PassengerSecurityUpdateCheckProxy },
             'passenger_show_version_in_header' => { type: 'OnOff', pass_opt: :PassengerShowVersionInHeader },
             'passenger_socket_backlog' => { type: 'Integer', pass_opt: :PassengerSocketBacklog },
+            'passenger_spawn_dir' => { type: 'FullPath', pass_opt: :PassengerSpawnDir },
             'passenger_spawn_method' => { type: ['smart', 'direct'], pass_opt: :PassengerSpawnMethod },
             'passenger_start_timeout' => { type: 'Integer', pass_opt: :PassengerStartTimeout },
             'passenger_startup_file' => { type: 'RelPath', pass_opt: :PassengerStartupFile },
             'passenger_stat_throttle_rate' => { type: 'Integer', pass_opt: :PassengerStatThrottleRate },
             'passenger_sticky_sessions' => { type: 'OnOff', pass_opt: :PassengerStickySessions },
             'passenger_sticky_sessions_cookie_name' => { type: 'String', pass_opt: :PassengerStickySessionsCookieName },
+            'passenger_sticky_sessions_cookie_attributes' => { type: 'QuotedString', pass_opt: :PassengerStickySessionsCookieAttributes },
             'passenger_thread_count' => { type: 'Integer', pass_opt: :PassengerThreadCount },
             'passenger_use_global_queue' => { type: 'String', pass_opt: :PassengerUseGlobalQueue },
             'passenger_user' => { type: 'String', pass_opt: :PassengerUser },
@@ -149,6 +154,24 @@
                   it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
                 end
               end
+            when 'Boolean'
+              valid_config_values = [true, false]
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => #{valid_value}" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  let :expected_value do
+                    {
+                      true => 'On',
+                      false => 'Off',
+                    }[valid_value]
+                  end
+
+                  it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{expected_value}$}) }
+                end
+              end
             else
               valid_config_values = config_hash[:type]
               valid_config_values.each do |valid_value|
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9fe185471a..61a9869a58 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -215,6 +215,7 @@
                   'passenger_app_env'                                   => 'demo',
                   'passenger_app_root'                                  => '/var/www/node-app',
                   'passenger_app_group_name'                            => 'foo_bar',
+                  'passenger_app_start_command'                         => 'start-command',
                   'passenger_app_type'                                  => 'node',
                   'passenger_startup_file'                              => 'start.js',
                   'passenger_restart_dir'                               => 'temp',
@@ -241,7 +242,9 @@
                   'passenger_max_request_queue_time'                    => 5,
                   'passenger_sticky_sessions'                           => true,
                   'passenger_sticky_sessions_cookie_name'               => '_delicious_cookie',
+                  'passenger_sticky_sessions_cookie_attributes'         => 'SameSite=Lax; Secure;',
                   'passenger_allow_encoded_slashes'                     => false,
+                  'passenger_app_log_file'                              => '/tmp/app.log',
                   'passenger_debugger'                                  => false,
                 },
               ],
@@ -414,6 +417,7 @@
               'passenger_app_env'                     => 'test',
               'passenger_app_root'                    => '/usr/share/myapp',
               'passenger_app_group_name'              => 'app_customer',
+              'passenger_app_start_command'           => 'start-my-app',
               'passenger_app_type'                    => 'rack',
               'passenger_startup_file'                => 'bin/www',
               'passenger_restart_dir'                 => 'tmp',
@@ -444,7 +448,9 @@
               'passenger_max_request_queue_time'      => 2,
               'passenger_sticky_sessions'             => true,
               'passenger_sticky_sessions_cookie_name' => '_nom_nom_nom',
+              'passenger_sticky_sessions_cookie_attributes' => 'Nom=nom; Secure;',
               'passenger_allow_encoded_slashes'       => true,
+              'passenger_app_log_file'                => '/app/log/file',
               'passenger_debugger'                    => true,
               'passenger_lve_min_uid'                 => 500,
               'add_default_charset'         => 'UTF-8',
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 11da3309ca..f7078db922 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -4,6 +4,9 @@
   <%- if @passenger_allow_encoded_slashes -%>
   PassengerAllowEncodedSlashes <%= @passenger_allow_encoded_slashes %>
   <%- end -%>
+  <%- if @passenger_anonymous_telemetry_proxy -%>
+  PassengerAnonymousTelemetryProxy <%= @passenger_anonymous_telemetry_proxy %>
+  <%- end -%>
   <%- if @passenger_app_env -%>
   PassengerAppEnv <%= @passenger_app_env %>
   <%- end -%>
@@ -46,6 +49,12 @@
   <%- if @passenger_default_user -%>
   PassengerDefaultUser <%= @passenger_default_user %>
   <%- end -%>
+  <%- unless @passenger_disable_anonymous_telemetry.nil? -%>
+  PassengerDisableAnonymousTelemetry <%= scope.call_function('apache::bool2httpd', [@passenger_disable_anonymous_telemetry]) %>
+  <%- end -%>
+  <%- unless @passenger_disable_log_prefix.nil? -%>
+  PassengerDisableLogPrefix <%= scope.call_function('apache::bool2httpd', [@passenger_disable_log_prefix]) %>
+  <%- end -%>
   <%- if @passenger_disable_security_update_check -%>
   PassengerDisableSecurityUpdateCheck <%= @passenger_disable_security_update_check %>
   <%- end -%>
@@ -162,6 +171,9 @@
   <%- if @passenger_socket_backlog -%>
   PassengerSocketBacklog <%= @passenger_socket_backlog %>
   <%- end -%>
+  <%- if @passenger_spawn_dir -%>
+  PassengerSpawnDir "<%= @passenger_spawn_dir %>"
+  <%- end -%>
   <%- if @passenger_spawn_method -%>
   PassengerSpawnMethod <%= @passenger_spawn_method %>
   <%- end -%>
@@ -180,6 +192,9 @@
   <%- if @passenger_sticky_sessions_cookie_name -%>
   PassengerStickySessionsCookieName <%= @passenger_sticky_sessions_cookie_name %>
   <%- end -%>
+  <%- if @passenger_sticky_sessions_cookie_attributes -%>
+  PassengerStickySessionsCookieAttributes "<%= @passenger_sticky_sessions_cookie_attributes %>"
+  <%- end -%>
   <%- if @passenger_thread_count -%>
   PassengerThreadCount <%= @passenger_thread_count %>
   <%- end -%>
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index 6e453abb7e..6e6d6d4e5e 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -28,6 +28,9 @@
 <% if @passenger_app_group_name -%>
   PassengerAppGroupName <%= @passenger_app_group_name %>
 <% end -%>
+<% if @passenger_app_start_command -%>
+  PassengerAppStartCommand <%= @passenger_app_start_command %>
+<% end -%>
 <% if @passenger_app_type -%>
   PassengerAppType <%= @passenger_app_type %>
 <% end -%>
@@ -118,10 +121,16 @@
 <% if @passenger_sticky_sessions_cookie_name -%>
   PassengerStickySessionsCookieName <%= @passenger_sticky_sessions_cookie_name %>
 <% end -%>
+<% if @passenger_sticky_sessions_cookie_attributes -%>
+  PassengerStickySessionsCookieAttributes <%= @passenger_sticky_sessions_cookie_attributes %>
+<% end -%>
 <%# 7 - Compatibility options -%>
 <% unless @passenger_allow_encoded_slashes.nil? -%>
   PassengerAllowEncodedSlashes <%= scope.call_function('apache::bool2httpd', [@passenger_allow_encoded_slashes]) %>
 <% end -%>
+<% if @passenger_app_log_file -%>
+  PassengerAppLogFile <%= @passenger_app_log_file %>
+<% end -%>
 <%# 8 - Logging and debugging options -%>
 <% unless @passenger_debugger.nil? -%>
   PassengerDebugger <%= scope.call_function('apache::bool2httpd', [@passenger_debugger]) %>

From 996a1ae3b5801b1f462744b7cc9bcdde346ca223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sun, 9 Aug 2020 15:16:45 -1000
Subject: [PATCH 1686/2267] Fix the list of passenger parameters

Some supported Passenger parameters where not checked for conditional
configuration of passenger, resulting in some configuration being
ignored.

Check all supported parameters and if any is set, include the passenger
configuration snippet.
---
 manifests/vhost.pp | 49 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e6aa7c3696..af6075865b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1995,7 +1995,7 @@
     include ::apache::mod::suexec
   }
 
-  if $passenger_spawn_method != undef or $passenger_app_root != undef or $passenger_app_env != undef or $passenger_ruby != undef or $passenger_min_instances != undef or $passenger_max_requests != undef or $passenger_start_timeout != undef or $passenger_pre_start != undef or $passenger_user != undef or $passenger_group != undef or $passenger_high_performance != undef or $passenger_nodejs != undef or $passenger_sticky_sessions != undef or $passenger_startup_file != undef {
+  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
     include ::apache::mod::passenger
   }
 
@@ -2708,19 +2708,50 @@
   }
 
   # Template uses:
-  # - $passenger_spawn_method
-  # - $passenger_app_root
-  # - $passenger_app_env
+  # - $passenger_enabled
+  # - $passenger_start_timeout
   # - $passenger_ruby
+  # - $passenger_python
+  # - $passenger_nodejs
+  # - $passenger_meteor_app_settings
+  # - $passenger_app_env
+  # - $passenger_app_root
+  # - $passenger_app_group_name
+  # - $passenger_app_start_command
+  # - $passenger_app_type
+  # - $passenger_startup_file
+  # - $passenger_restart_dir
+  # - $passenger_spawn_method
+  # - $passenger_load_shell_envvars
+  # - $passenger_rolling_restarts
+  # - $passenger_resist_deployment_errors
   # - $passenger_min_instances
-  # - $passenger_max_requests
-  # - $passenger_start_timeout
+  # - $passenger_max_instances
+  # - $passenger_max_preloader_idle_time
+  # - $passenger_force_max_concurrent_requests_per_process
+  # - $passenger_concurrency_model
+  # - $passenger_thread_count
+  # - $passenger_high_performance
+  # - $passenger_max_request_queue_size
+  # - $passenger_max_request_queue_time
   # - $passenger_user
   # - $passenger_group
-  # - $passenger_nodejs
+  # - $passenger_friendly_error_pages
+  # - $passenger_buffer_upload
+  # - $passenger_buffer_response
+  # - $passenger_allow_encoded_slashes
+  # - $passenger_lve_min_uid
+  # - $passenger_base_uri
+  # - $passenger_error_override
   # - $passenger_sticky_sessions
-  # - $passenger_startup_file
-  if $passenger_spawn_method != undef or $passenger_app_root != undef or $passenger_app_env != undef or $passenger_ruby != undef or $passenger_min_instances != undef or $passenger_start_timeout != undef or $passenger_user != undef or $passenger_group != undef or $passenger_nodejs != undef or $passenger_sticky_sessions != undef or $passenger_startup_file != undef {
+  # - $passenger_sticky_sessions_cookie_name
+  # - $passenger_sticky_sessions_cookie_attributes
+  # - $passenger_app_log_file
+  # - $passenger_debugger
+  # - $passenger_max_requests
+  # - $passenger_max_request_time
+  # - $passenger_memory_limit
+  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,

From 7b9ee56477ba1bece5a05d0cc3054bcb3c134a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sun, 9 Aug 2020 15:30:39 -1000
Subject: [PATCH 1687/2267] Update passenger documentation links

Point to the latest documentation available.  The old documentation is
not updated in respect to the latest passenger releases, so for
consistency update all links to point to the new documenation.
---
 manifests/mod/passenger.pp |  2 +-
 manifests/vhost.pp         | 82 +++++++++++++++++++-------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 74eeb0ec7c..cbc83269d1 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -301,7 +301,7 @@
 #   - Around 08/20/2017 UnionStation was discontinued options were removed.
 #   - As of 08/20/2017 there are 77 available/deprecated/removed settings.
 #
-# @see https://www.phusionpassenger.com/library/config/apache/reference/ for additional documentation.
+# @see https://www.phusionpassenger.com/docs/references/config_reference/apache/ for additional documentation.
 #
 class apache::mod::passenger (
   $manage_repo                                                                               = true,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index af6075865b..e2a86a3b8d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -624,37 +624,37 @@
 #   using the PassengerEnabled directive with the PassengerHighPerformance directive.
 # 
 # @param passenger_base_uri
-#   Sets [PassengerBaseURI](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbase_rui), 
+#   Sets [PassengerBaseURI](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbase_rui),
 #    to specify that the given URI is a distinct application served by Passenger.
 # 
 # @param passenger_ruby
-#   Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby), 
+#   Sets [PassengerRuby](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerruby),
 #   specifying the Ruby interpreter to use when serving the relevant web applications.
 # 
 # @param passenger_python
-#   Sets [PassengerPython](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpython), 
+#   Sets [PassengerPython](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpython),
 #   specifying the Python interpreter to use when serving the relevant web applications.
 # 
 # @param passenger_nodejs
-#   Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs), 
+#   Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengernodejs),
 #   specifying Node.js command to use when serving the relevant web applications.
 # 
 # @param passenger_meteor_app_settings
-#   Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/library/config/apache/reference/#passengermeteorappsettings), 
+#   Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermeteorappsettings),
 #   specifying a JSON file with settings for the application when using a Meteor 
 #   application in non-bundled mode.
 # 
 # @param passenger_app_env
-#   Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv), 
+#   Sets [PassengerAppEnv](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappenv),
 #   the environment for the Passenger application. If not specified, defaults to the global 
 #   setting or 'production'.
 # 
 # @param passenger_app_root
-#   Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot), 
+#   Sets [PassengerRoot](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapproot),
 #   the location of the Passenger application root if different from the DocumentRoot.
 # 
 # @param passenger_app_group_name
-#   Sets [PassengerAppGroupName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappgroupname), 
+#   Sets [PassengerAppGroupName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappgroupname),
 #    the name of the application group that the current application should belong to.
 # 
 # @param passenger_app_start_command
@@ -662,138 +662,138 @@
 #    how Passenger should start your app on a specific port.
 #
 # @param passenger_app_type
-#   Sets [PassengerAppType](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapptype), 
+#   Sets [PassengerAppType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapptype),
 #    to force Passenger to recognize the application as a specific type.
 # 
 # @param passenger_startup_file
-#   Sets the [PassengerStartupFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile) 
+#   Sets the [PassengerStartupFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstartupfile),
 #   path. This path is relative to the application root.
 # 
 # @param passenger_restart_dir
-#   Sets the [PassengerRestartDir](https://www.phusionpassenger.com/library/config/apache/reference/#passengerrestartdir) 
+#   Sets the [PassengerRestartDir](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrestartdir),
 #    to customize the directory in which `restart.txt` is searched for.
 # 
 # @param passenger_spawn_method
-#   Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod), 
+#   Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerspawnmethod),
 #   whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 # 
 # @param passenger_load_shell_envvars
-#   Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloadshellenvvars), 
+#   Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
 #   to enable or disable the loading of shell environment variables before spawning the application.
 # 
 # @param passenger_rolling_restarts
-#   Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/library/config/apache/reference/#passengerrollingrestarts), 
+#   Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
 #   to enable or disable support for zero-downtime application restarts through `restart.txt`.
 # 
 # @param passenger_resist_deployment_errors
-#   Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/library/config/apache/reference/#passengerresistdeploymenterrors), 
+#   Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerresistdeploymenterrors),
 #   to enable or disable resistance against deployment errors.
 # 
 # @param passenger_user
-#   Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser), 
+#   Sets [PassengerUser](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeruser),
 #   the running user for sandboxing applications.
 # 
 # @param passenger_group
-#   Sets [PassengerGroup](https://www.phusionpassenger.com/library/config/apache/reference/#passengergroup), 
+#   Sets [PassengerGroup](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengergroup),
 #   the running group for sandboxing applications.
 # 
 # @param passenger_friendly_error_pages
-#   Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/library/config/apache/reference/#passengerfriendlyerrorpages), 
+#   Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerfriendlyerrorpages),
 #   which can display friendly error pages whenever an application fails to start. This 
 #   friendly error page presents the startup error message, some suggestions for solving 
 #   the problem, a backtrace and a dump of the environment variables.
 # 
 # @param passenger_min_instances
-#   Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances), 
+#   Sets [PassengerMinInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermininstances),
 #   the minimum number of application processes to run.
 # 
 # @param passenger_max_instances
-#   Sets [PassengerMaxInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstances), 
+#   Sets [PassengerMaxInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxinstances),
 #   the maximum number of application processes to run.
 # 
 # @param passenger_max_preloader_idle_time
-#   Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpreloaderidletime), 
+#   Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxpreloaderidletime),
 #   the maximum amount of time the preloader waits before shutting down an idle process.
 # 
 # @param passenger_force_max_concurrent_requests_per_process
-#   Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/library/config/apache/reference/#passengerforcemaxconcurrentrequestsperprocess), 
+#   Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerforcemaxconcurrentrequestsperprocess),
 #   the maximum amount of concurrent requests the application can handle per process.
 # 
 # @param passenger_start_timeout
-#   Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout), 
+#   Sets [PassengerStartTimeout](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstarttimeout),
 #   the timeout for the application startup.
 # 
 # @param passenger_concurrency_model
-#   Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerconcurrencyodel), 
+#   Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerconcurrencyodel),
 #   to specify the I/O concurrency model that should be used for Ruby application processes. 
 #   Passenger supports two concurrency models:<br />
 #   * `process` – single-threaded, multi-processed I/O concurrency.
 #   * `thread` – multi-threaded, multi-processed I/O concurrency.
 # 
 # @param passenger_thread_count
-#   Sets [PassengerThreadCount](https://www.phusionpassenger.com/library/config/apache/reference/#passengerthreadcount), 
+#   Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerthreadcount),
 #   the number of threads that Passenger should spawn per Ruby application process.<br />
 #   This option only has effect if PassengerConcurrencyModel is `thread`.
 # 
 # @param passenger_max_requests
-#   Sets [PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests), 
+#   Sets [PassengerMaxRequests](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequests),
 #   the maximum number of requests an application process will process.
 # 
 # @param passenger_max_request_time
-#   Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequesttime), 
+#   Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequesttime),
 #   the maximum amount of time, in seconds, that an application process may take to 
 #   process a request.
 # 
 # @param passenger_memory_limit
-#   Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/library/config/apache/reference/#passengermemorylimit), 
+#   Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermemorylimit),
 #   the maximum amount of memory that an application process may use, in megabytes.
 # 
 # @param passenger_stat_throttle_rate
-#   Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstatthrottlerate), 
+#   Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstatthrottlerate),
 #   to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
 # 
 # @param passenger_pre_start
-#   Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart), 
+#   Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
 #   the URL of the application if pre-starting is required.
 # 
 # @param passenger_high_performance
-#   Sets [PassengerHighPerformance](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance), 
+#   Sets [PassengerHighPerformance](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerhighperformance),
 #   to enhance performance in return for reduced compatibility.
 # 
 # @param passenger_buffer_upload
-#   Sets [PassengerBufferUpload](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbufferupload),
+#   Sets [PassengerBufferUpload](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferupload),
 #   to buffer HTTP client request bodies before they are sent to the application.
 # 
 # @param passenger_buffer_response
-#   Sets [PassengerBufferResponse](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbufferresponse),
+#   Sets [PassengerBufferResponse](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferresponse),
 #   to buffer Happlication-generated responses.
 # 
 # @param passenger_error_override
-#   Sets [PassengerErrorOverride](https://www.phusionpassenger.com/library/config/apache/reference/#passengererroroverride),
+#   Sets [PassengerErrorOverride](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengererroroverride),
 #   to specify whether Apache will intercept and handle response with HTTP status codes of
 #   400 and higher.
 # 
 # @param passenger_max_request_queue_size
-#   Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize),
+#   Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuesize),
 #   to specify the maximum amount of requests that are allowed to queue whenever the maximum
 #   concurrent request limit is reached. If the queue is already at this specified limit, then 
 #   Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
 #   A value of 0 means that the queue size is unbounded.
 # 
 # @param passenger_max_request_queue_time
-#   Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuetime),
+#   Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuetime),
 #   to specify the maximum amount of time that requests are allowed to stay in the queue 
 #   whenever the maximum concurrent request limit is reached. If a request reaches this specified 
 #   limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
 #   A value of 0 means that the queue time is unbounded.
 # 
 # @param passenger_sticky_sessions
-#   Sets [PassengerStickySessions](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions), 
+#   Sets [PassengerStickySessions](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessions),
 #   to specify that, whenever possible, all requests sent by a client will be routed to the same 
 #   originating application process.
 # 
 # @param passenger_sticky_sessions_cookie_name
-#   Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessionscookiename), 
+#   Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookiename),
 #   to specify the name of the sticky sessions cookie.
 #
 # @param passenger_sticky_sessions_cookie_attributes
@@ -801,7 +801,7 @@
 #   the attributes of the sticky sessions cookie.
 # 
 # @param passenger_allow_encoded_slashes
-#   Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/library/config/apache/reference/#passengerallowencodedslashes), 
+#   Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerallowencodedslashes),
 #   to allow URLs with encoded slashes. Please note that this feature will not work properly
 #   unless Apache's `AllowEncodedSlashes` is also enabled.
 # 
@@ -810,11 +810,11 @@
 #   app specific messages logged to a different file in addition to Passenger log file.
 #
 # @param passenger_debugger
-#   Sets [PassengerDebugger](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdebugger), 
+#   Sets [PassengerDebugger](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerdebugger),
 #   to turn support for Ruby application debugging on or off. 
 # 
 # @param passenger_lve_min_uid
-#   Sets [PassengerLveMinUid](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlveminuid), 
+#   Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerlveminuid),
 #   to only allow the spawning of application processes with UIDs equal to, or higher than, this 
 #   specified value on LVE-enabled kernels.
 # 

From 4332276d20174d34f18acc13e3ce722a8cf7abda Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 10 Aug 2020 14:27:27 +0200
Subject: [PATCH 1688/2267] Use Ruby 2.7 compatible string matching

In Ruby 2.7, performing true =~ %r{false}i raises a deprecation warning.
---
 lib/puppet/functions/apache/bool2httpd.rb | 10 ++++++++--
 spec/functions/bool2httpd_spec.rb         |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
index 991216408c..511adba65b 100644
--- a/lib/puppet/functions/apache/bool2httpd.rb
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -17,8 +17,14 @@
   #   apache::bool2httpd(undef) # returns 'Off'
   #
   def bool2httpd(arg)
-    return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
-    return 'On' if arg == true || arg =~ %r{true}i
+    return 'Off' if arg.nil? || arg == false || matches_string?(arg, %r{false}i) || arg == :undef
+    return 'On' if arg == true || matches_string?(arg, %r{true}i)
     arg.to_s
   end
+
+  private
+
+  def matches_string?(value, matcher)
+    value.is_a?(String) && value.match?(matcher)
+  end
 end
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
index e436e0e3a6..fabcf2749e 100644
--- a/spec/functions/bool2httpd_spec.rb
+++ b/spec/functions/bool2httpd_spec.rb
@@ -5,10 +5,12 @@
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params(true).and_return('On') }
+  it { is_expected.to run.with_params('true').and_return('On') }
   it 'expected to return a string "On"' do
     expect(subject.execute(true)).to be_an_instance_of(String)
   end
   it { is_expected.to run.with_params(false).and_return('Off') }
+  it { is_expected.to run.with_params('false').and_return('Off') }
   it 'expected to return a string "Off"' do
     expect(subject.execute(false)).to be_an_instance_of(String)
   end

From ffbd0b7e233868e0e6a35deb169032c746c1a0cb Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Thu, 27 Aug 2020 12:13:19 +0100
Subject: [PATCH 1689/2267] (feat) - Removal of inappropriate terminology

---
 .github/workflows/release.yml              | 6 +++---
 .github/workflows/weekly.yml               | 6 +++---
 CONTRIBUTING.md                            | 2 +-
 README.md                                  | 6 +++---
 REFERENCE.md                               | 8 ++++----
 manifests/balancer.pp                      | 2 +-
 manifests/balancermember.pp                | 2 +-
 manifests/mod/info.pp                      | 4 ++--
 manifests/vhost.pp                         | 2 +-
 metadata.json                              | 4 ++--
 readmes/README_ja_JP.md                    | 4 ++--
 spec/util/_resources/test_metadata_json.rb | 4 ++--
 templates/mod/security_crs.conf.erb        | 2 +-
 types/oidcsettings.pp                      | 2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aa16f1846e..ced1d93e59 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -40,7 +40,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -65,7 +65,7 @@ jobs:
     - uses: actions/checkout@v1
 
     - name: Spec Tests
-      uses: puppetlabs/action-litmus_spec@master
+      uses: puppetlabs/action-litmus_spec@main
       with:
         puppet_gem_versionm: ${{ matrix.puppet_gem_version }}
         check: ${{ matrix.check }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 7ad3cbaf19..382b276116 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -39,7 +39,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -58,7 +58,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Spec Tests
-      uses: puppetlabs/action-litmus_spec@master
+      uses: puppetlabs/action-litmus_spec@main
       with:
         puppet_gem_version: ${{ matrix.puppet_gem_version }}
         check: ${{ matrix.check }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a9fb3a5cd..9c171f9949 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -108,7 +108,7 @@ process as easy as possible.
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
-      directly on "master".
+      directly on "main".
       It makes things much easier to keep track of, especially if
       you decide to work on another thing before your first change
       is merged in.
diff --git a/README.md b/README.md
index 84b73b7d5c..ffa93dd1fc 100755
--- a/README.md
+++ b/README.md
@@ -219,7 +219,7 @@
 [Puppet Forge]: https://forge.puppet.com
 [Puppet]: https://puppet.com
 [Puppet module]: https://docs.puppet.com/puppet/latest/reference/modules_fundamentals.html
-[Puppet module's code]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp
+[Puppet module's code]: https://github.com/puppetlabs/puppetlabs-apache/blob/main/manifests/default_mods.pp
 [`purge_configs`]: #purge_configs
 [`purge_vhost_dir`]: #purge_vhost_dir
 [Python]: https://www.python.org/
@@ -817,7 +817,7 @@ Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balanc
 <a id="reference"></a> 
 ## Reference
 
-For information on classes, types and functions see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apache/blob/master/REFERENCE.md)
+For information on classes, types and functions see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apache/blob/main/REFERENCE.md)
 
 ### Templates
 
@@ -830,7 +830,7 @@ The Apache module has a task that allows a user to reload the Apache config with
 <a id="limitations"></a>
 ## Limitations
 
-For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apache/blob/master/metadata.json)
+For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apache/blob/main/metadata.json)
 
 ### FreeBSD
 
diff --git a/REFERENCE.md b/REFERENCE.md
index d82e2d8564..19d0bdb655 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -2520,7 +2520,7 @@ The following parameters are available in the `apache::mod::info` class.
 
 Data type: `Any`
 
-Whitelist of IPv4 or IPv6 addresses or ranges that can access the info path.
+Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 
 Default value: ['127.0.0.1','::1']
 
@@ -2536,7 +2536,7 @@ Default value: `undef`
 
 Data type: `Any`
 
-Toggles whether to restrict access to info path. If `false`, the `allow_from` whitelist is ignored and any IP address can
+Toggles whether to restrict access to info path. If `false`, the `allow_from` allowlist is ignored and any IP address can
 access the info path.
 
 Default value: `true`
@@ -6007,7 +6007,7 @@ balancer members, and then collect them on a single apache load balancer
 server.
 
 * **Note** Currently requires the puppetlabs/concat module on the Puppet Forge and uses
-storeconfigs on the Puppet Master to export/collect resources from all
+storeconfigs on the Puppet Server to export/collect resources from all
 balancer members.
 
 #### Examples
@@ -6082,7 +6082,7 @@ implement this is to export this resource for all apache balancer member
 servers, and then collect them on the main apache load balancer.
 
 * **Note** Currently requires the puppetlabs/concat module on the Puppet Forge and
-uses storeconfigs on the Puppet Master to export/collect resources
+uses storeconfigs on the Puppet Server to export/collect resources
 from all balancer members.
 
 #### Examples
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 0bd8af95f7..790386f196 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -10,7 +10,7 @@
 #
 # @note 
 #   Currently requires the puppetlabs/concat module on the Puppet Forge and uses
-#   storeconfigs on the Puppet Master to export/collect resources from all
+#   storeconfigs on the Puppet Server to export/collect resources from all
 #   balancer members.
 #
 # @param name
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 1d4abb2e40..ec66dcda96 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -13,7 +13,7 @@
 #
 # @note
 #   Currently requires the puppetlabs/concat module on the Puppet Forge and
-#   uses storeconfigs on the Puppet Master to export/collect resources
+#   uses storeconfigs on the Puppet Server to export/collect resources
 #   from all balancer members.
 #
 # @param name
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index d8191bd081..abcd93ee74 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -2,13 +2,13 @@
 #   Installs and configures `mod_info`.
 # 
 # @param allow_from
-#   Whitelist of IPv4 or IPv6 addresses or ranges that can access the info path.
+#   Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 # 
 # @param apache_version
 #   Version of Apache to install module on.
 # 
 # @param restrict_access
-#   Toggles whether to restrict access to info path. If `false`, the `allow_from` whitelist is ignored and any IP address can
+#   Toggles whether to restrict access to info path. If `false`, the `allow_from` allowlist is ignored and any IP address can
 #   access the info path.
 # 
 # @param info_path
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e2a86a3b8d..08997e3ead 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1659,7 +1659,7 @@
 #   Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
 #
 # @param oidc_settings
-#   An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf].
+#   An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/main/auth_openidc.conf].
 #
 # @param limitreqfields
 #   The `limitreqfields` parameter sets the maximum number of request header fields in
diff --git a/metadata.json b/metadata.json
index c399a69017..a95496c0da 100644
--- a/metadata.json
+++ b/metadata.json
@@ -82,6 +82,6 @@
   ],
   "description": "Module for Apache configuration",
   "pdk-version": "1.18.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g9c14433"
+  "template-url": "https://github.com/puppetlabs/pdk-templates#main",
+  "template-ref": "heads/main-0-g9c14433"
 }
diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 958b839c8d..2e9a564892 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -222,7 +222,7 @@
 [Puppet Forge]: https://forge.puppet.com
 [Puppet]: https://puppet.com
 [Puppetモジュール]: https://docs.puppet.com/puppet/latest/reference/modules_fundamentals.html
-[Puppetモジュールのコード]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp
+[Puppetモジュールのコード]: https://github.com/puppetlabs/puppetlabs-apache/blob/main/manifests/default_mods.pp
 [`purge_configs`]: #purge_configs
 [`purge_vhost_dir`]: #purge_vhost_dir
 [Python]: https://www.python.org/
@@ -5660,7 +5660,7 @@ Apacheが読みこむhtpasswdファイルに適したフォーマットでパス
 <a id="limitations"></a>
 ## 制約事項
 
- サポートされているオペレーティングシステムの一覧については、[metadata.json](https://github.com/puppetlabs/puppetlabs-apache/blob/master/metadata.json)を参照してください。
+ サポートされているオペレーティングシステムの一覧については、[metadata.json](https://github.com/puppetlabs/puppetlabs-apache/blob/main/metadata.json)を参照してください。
 
 ### FreeBSD
 
diff --git a/spec/util/_resources/test_metadata_json.rb b/spec/util/_resources/test_metadata_json.rb
index f00933ba25..b8f64ae564 100644
--- a/spec/util/_resources/test_metadata_json.rb
+++ b/spec/util/_resources/test_metadata_json.rb
@@ -81,6 +81,6 @@
   ],
   "description": "Module for Apache configuration",
   "pdk-version": "1.17.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g095317c"
+  "template-url": "https://github.com/puppetlabs/pdk-templates#main",
+  "template-ref": "heads/main-0-g095317c"
 }'.freeze
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 641daac3ed..2a725e20a7 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -23,7 +23,7 @@
 # You should use the modsecurity.conf-recommended file that comes with the
 # ModSecurity source code archive.
 #
-# Ref: https://github.com/SpiderLabs/ModSecurity/blob/master/modsecurity.conf-recommended 
+# Ref: https://github.com/SpiderLabs/ModSecurity/blob/main/modsecurity.conf-recommended 
 #
 
 
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index bc3ce5c7da..a2356ae948 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -1,4 +1,4 @@
-# https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
+# https://github.com/zmartzone/mod_auth_openidc/blob/main/auth_openidc.conf
 type Apache::OIDCSettings = Struct[
   {
     Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],

From d3487969312089ec52941ac9031100f9d1e05337 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Thu, 27 Aug 2020 15:14:20 +0100
Subject: [PATCH 1690/2267] Reverting URLs back to master

---
 manifests/vhost.pp                  | 2 +-
 templates/mod/security_crs.conf.erb | 2 +-
 types/oidcsettings.pp               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 08997e3ead..e2a86a3b8d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1659,7 +1659,7 @@
 #   Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
 #
 # @param oidc_settings
-#   An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/main/auth_openidc.conf].
+#   An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf].
 #
 # @param limitreqfields
 #   The `limitreqfields` parameter sets the maximum number of request header fields in
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 2a725e20a7..641daac3ed 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -23,7 +23,7 @@
 # You should use the modsecurity.conf-recommended file that comes with the
 # ModSecurity source code archive.
 #
-# Ref: https://github.com/SpiderLabs/ModSecurity/blob/main/modsecurity.conf-recommended 
+# Ref: https://github.com/SpiderLabs/ModSecurity/blob/master/modsecurity.conf-recommended 
 #
 
 
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index a2356ae948..bc3ce5c7da 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -1,4 +1,4 @@
-# https://github.com/zmartzone/mod_auth_openidc/blob/main/auth_openidc.conf
+# https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 type Apache::OIDCSettings = Struct[
   {
     Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],

From f31e392a6732c92c24545ec846a9b7d78d452a06 Mon Sep 17 00:00:00 2001
From: Nacho Barrientos <nacho.barrientos@cern.ch>
Date: Fri, 4 Sep 2020 10:04:46 +0200
Subject: [PATCH 1691/2267] Configure default shared lib path for mod_wsgi on
 RHEL8

RHEL8:
  # rpm -ql python3-mod_wsgi | grep \.so$
  /usr/lib64/httpd/modules/mod_wsgi_python3.so

RHEL7:
  # rpm -ql mod_wsgi | grep \.so$
  /usr/lib64/httpd/modules/mod_wsgi.so
---
 manifests/params.pp           |  4 ++++
 spec/classes/mod/wsgi_spec.rb | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index 7a0f16caa0..4aed7c04a1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -260,6 +260,10 @@
     }
     $mod_libs             = {
       'nss' => 'libmodnss.so',
+      'wsgi'                  => $::apache::version::distrelease ? {
+        '8'     => 'mod_wsgi_python3.so',
+        default => 'mod_wsgi.so',
+      },
     }
     $conf_template        = 'apache/httpd.conf.erb'
     $http_protocol_options  = undef
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index f7c94a52e3..902d6877b4 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -45,6 +45,16 @@
     }
     it { is_expected.to contain_package('mod_wsgi') }
 
+    context 'on RHEL8' do
+      let(:facts) do
+        super().merge(operatingsystemrelease: '8')
+      end
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module modules/mod_wsgi_python3.so}) }
+      it { is_expected.to contain_package('python3-mod_wsgi') }
+    end
+
     describe 'with WSGIRestrictEmbedded enabled' do
       let :params do
         { wsgi_restrict_embedded: 'On' }

From c08c517d8818142791bc4875b15e2ee395356bca Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 14 Sep 2020 15:28:21 +0100
Subject: [PATCH 1692/2267] (maint) Use 'policycoreutils-python-utils' on RHEL
 8

The `policycoreutils-python` has now been replaced by the `policycoreutils-python-utils`
on RHEL 8 according to [this documentation](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#selinux-python3_security)
---
 README.md                                 | 3 +++
 spec/acceptance/apache_parameters_spec.rb | 1 +
 spec/acceptance/class_spec.rb             | 1 +
 3 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index ffa93dd1fc..e5f336c477 100755
--- a/README.md
+++ b/README.md
@@ -902,6 +902,9 @@ apache::vhost { 'test.server':
 }
 ```
 
+**NOTE:** On RHEL 8, the SELinux packages contained in `policycoreutils-python` have been replaced by the `policycoreutils-python-utils` package.
+See [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#selinux-python3_security) for more details.
+
 You must set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
 ### Ubuntu 10.04
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 1327d4c9b9..1d7b9c1013 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -429,6 +429,7 @@ class { 'apache':
           if $::osfamily == 'RedHat' and "$::selinux" == "true" {
             $semanage_package = $::operatingsystemmajrelease ? {
               '5'     => 'policycoreutils',
+              '8'     => 'policycoreutils-python-utils',
               default => 'policycoreutils-python',
             }
 
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 67248b8771..1a6deac80c 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -42,6 +42,7 @@
         if $::osfamily == 'RedHat' and "$::selinux" == "true" {
           $semanage_package = $::operatingsystemmajrelease ? {
             '5'     => 'policycoreutils',
+            '8'     => 'policycoreutils-python-utils',
             default => 'policycoreutils-python',
           }
 

From efc9a727a2ec71991f49c44ea50681e9aed1313e Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Tue, 15 Sep 2020 16:28:29 +0100
Subject: [PATCH 1693/2267] (maint) Use 'policycoreutils-python-utils' on RHEL
 8

Add an additional reference that was missed in https://github.com/puppetlabs/puppetlabs-apache/pull/2065
---
 spec/acceptance/vhost_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 19561f85df..9c49ba6a70 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1144,6 +1144,7 @@ class { 'apache::mod::wsgi': }
       if $::osfamily == 'RedHat' and "$::selinux" == "true" {
         $semanage_package = $::operatingsystemmajrelease ? {
           '5'     => 'policycoreutils',
+          '8'     => 'policycoreutils-python-utils',
           default => 'policycoreutils-python',
         }
         exec { 'set_apache_defaults':

From 09d314c2216f4bf2978d71d96e8af592fae24c3e Mon Sep 17 00:00:00 2001
From: Pat Riehecky <riehecky@fnal.gov>
Date: Tue, 22 Sep 2020 11:57:47 -0500
Subject: [PATCH 1694/2267] Resolve easy puppet-lint notices

---
 examples/apache.pp                     |  12 +--
 examples/dev.pp                        |   2 +-
 examples/init.pp                       |   2 +-
 examples/mod_load_params.pp            |   3 +-
 examples/mods.pp                       |   3 +-
 examples/mods_custom.pp                |   3 +-
 examples/php.pp                        |   4 +-
 examples/vhost.pp                      |   4 +-
 examples/vhost_directories.pp          |   3 +-
 examples/vhost_filter.pp               |   3 +-
 examples/vhost_ip_based.pp             |   2 +-
 examples/vhost_proxypass.pp            |   6 +-
 examples/vhost_ssl.pp                  |   2 +-
 examples/vhosts_without_listen.pp      |   3 +-
 manifests/balancer.pp                  |   8 +-
 manifests/balancermember.pp            |   3 +-
 manifests/confd/no_accf.pp             |   6 +-
 manifests/custom_config.pp             |   7 +-
 manifests/default_confd_files.pp       |   2 +-
 manifests/default_mods.pp              |  98 +++++++++----------
 manifests/dev.pp                       |   3 +-
 manifests/fastcgi/server.pp            |  12 +--
 manifests/init.pp                      | 125 ++++++++++++-------------
 manifests/listen.pp                    |   2 +-
 manifests/mod.pp                       |  46 ++++-----
 manifests/mod/alias.pp                 |  14 +--
 manifests/mod/auth_cas.pp              |  14 ++-
 manifests/mod/auth_kerb.pp             |   6 +-
 manifests/mod/auth_mellon.pp           |  18 ++--
 manifests/mod/auth_openidc.pp          |   6 +-
 manifests/mod/authn_core.pp            |   4 +-
 manifests/mod/authn_dbd.pp             |  14 +--
 manifests/mod/authnz_ldap.pp           |  13 ++-
 manifests/mod/authnz_pam.pp            |   2 +-
 manifests/mod/authz_default.pp         |   4 +-
 manifests/mod/autoindex.pp             |  10 +-
 manifests/mod/cgi.pp                   |   3 +-
 manifests/mod/cgid.pp                  |  10 +-
 manifests/mod/cluster.pp               |  14 ++-
 manifests/mod/data.pp                  |   2 +-
 manifests/mod/dav_fs.pp                |  10 +-
 manifests/mod/dav_svn.pp               |   6 +-
 manifests/mod/deflate.pp               |  10 +-
 manifests/mod/dev.pp                   |   2 +-
 manifests/mod/dir.pp                   |  11 +--
 manifests/mod/disk_cache.pp            |  14 +--
 manifests/mod/dumpio.pp                |  15 ++-
 manifests/mod/event.pp                 |  18 ++--
 manifests/mod/expires.pp               |  10 +-
 manifests/mod/ext_filter.pp            |  12 +--
 manifests/mod/fastcgi.pp               |  13 ++-
 manifests/mod/fcgid.pp                 |  12 +--
 manifests/mod/geoip.pp                 |  11 +--
 manifests/mod/http2.pp                 |  14 +--
 manifests/mod/info.pp                  |  14 +--
 manifests/mod/intercept_form_submit.pp |   2 +-
 manifests/mod/itk.pp                   |  20 ++--
 manifests/mod/jk.pp                    |  15 ++-
 manifests/mod/ldap.pp                  |  13 ++-
 manifests/mod/lookup_identity.pp       |   2 +-
 manifests/mod/macro.pp                 |   2 +-
 manifests/mod/mime.pp                  |  14 +--
 manifests/mod/mime_magic.pp            |  12 +--
 manifests/mod/negotiation.pp           |  18 ++--
 manifests/mod/nss.pp                   |  18 ++--
 manifests/mod/pagespeed.pp             |  12 +--
 manifests/mod/passenger.pp             |  22 ++---
 manifests/mod/perl.pp                  |   2 +-
 manifests/mod/peruser.pp               |  28 +++---
 manifests/mod/php.pp                   |  25 +++--
 manifests/mod/prefork.pp               |  18 ++--
 manifests/mod/proxy.pp                 |  10 +-
 manifests/mod/proxy_balancer.pp        |  19 ++--
 manifests/mod/proxy_connect.pp         |   2 +-
 manifests/mod/proxy_html.pp            |  18 ++--
 manifests/mod/proxy_wstunnel.pp        |   2 +-
 manifests/mod/python.pp                |   4 +-
 manifests/mod/remoteip.pp              |  10 +-
 manifests/mod/reqtimeout.pp            |  12 +--
 manifests/mod/rewrite.pp               |   2 +-
 manifests/mod/rpaf.pp                  |  12 +--
 manifests/mod/security.pp              |  46 +++++----
 manifests/mod/setenvif.pp              |  10 +-
 manifests/mod/shib.pp                  |   4 +-
 manifests/mod/socache_shmcb.pp         |   2 +-
 manifests/mod/speling.pp               |   2 +-
 manifests/mod/ssl.pp                   |  23 +++--
 manifests/mod/status.pp                |  11 +--
 manifests/mod/suphp.pp                 |  17 ++--
 manifests/mod/userdir.pp               |  18 ++--
 manifests/mod/version.pp               |   5 +-
 manifests/mod/worker.pp                |  17 ++--
 manifests/mod/wsgi.pp                  |  17 ++--
 manifests/mod/xsendfile.pp             |   2 +-
 manifests/mpm.pp                       |  70 +++++++-------
 manifests/mpm/disable_mpm_event.pp     |   1 -
 manifests/mpm/disable_mpm_prefork.pp   |   1 -
 manifests/mpm/disable_mpm_worker.pp    |   1 -
 manifests/namevirtualhost.pp           |   2 +-
 manifests/package.pp                   |   5 +-
 manifests/params.pp                    |  55 ++++++-----
 manifests/peruser/multiplexer.pp       |   8 +-
 manifests/peruser/processor.pp         |   4 +-
 manifests/php.pp                       |   2 +-
 manifests/proxy.pp                     |   2 +-
 manifests/python.pp                    |   2 +-
 manifests/security/rule_link.pp        |   7 +-
 manifests/service.pp                   |   3 +-
 manifests/ssl.pp                       |   2 +-
 manifests/version.pp                   |   4 +-
 manifests/vhost.pp                     | 112 +++++++++++-----------
 manifests/vhost/custom.pp              |  18 ++--
 manifests/vhost/fragment.pp            |   2 +-
 manifests/vhosts.pp                    |   2 +-
 114 files changed, 703 insertions(+), 758 deletions(-)

diff --git a/examples/apache.pp b/examples/apache.pp
index 18ec55311b..0d4543564c 100644
--- a/examples/apache.pp
+++ b/examples/apache.pp
@@ -1,6 +1,6 @@
-include ::apache
-include ::apache::mod::php
-include ::apache::mod::cgi
-include ::apache::mod::userdir
-include ::apache::mod::disk_cache
-include ::apache::mod::proxy_http
+include apache
+include apache::mod::php
+include apache::mod::cgi
+include apache::mod::userdir
+include apache::mod::disk_cache
+include apache::mod::proxy_http
diff --git a/examples/dev.pp b/examples/dev.pp
index 5616e32bad..6c4f95571d 100644
--- a/examples/dev.pp
+++ b/examples/dev.pp
@@ -1 +1 @@
-include ::apache::mod::dev
+include apache::mod::dev
diff --git a/examples/init.pp b/examples/init.pp
index 33911073b0..b3f9f13aac 100644
--- a/examples/init.pp
+++ b/examples/init.pp
@@ -1 +1 @@
-include ::apache
+include apache
diff --git a/examples/mod_load_params.pp b/examples/mod_load_params.pp
index fa43132b73..879f2cfe55 100644
--- a/examples/mod_load_params.pp
+++ b/examples/mod_load_params.pp
@@ -1,8 +1,7 @@
 # Tests the path and identifier parameters for the apache::mod class
 
 # Base class for clarity:
-class { '::apache': }
-
+class { 'apache': }
 
 # Exaple parameter usage:
 apache::mod { 'testmod':
diff --git a/examples/mods.pp b/examples/mods.pp
index 699638248d..dd64e3b233 100644
--- a/examples/mods.pp
+++ b/examples/mods.pp
@@ -3,7 +3,6 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot, and declaring our default set of modules.
-class { '::apache':
+class { 'apache':
   default_mods => true,
 }
-
diff --git a/examples/mods_custom.pp b/examples/mods_custom.pp
index 4098c83aae..103e52a4f0 100644
--- a/examples/mods_custom.pp
+++ b/examples/mods_custom.pp
@@ -3,7 +3,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot, and declaring a custom set of modules.
-class { '::apache':
+class { 'apache':
   default_mods => [
     'info',
     'alias',
@@ -13,4 +13,3 @@
     'expires',
   ],
 }
-
diff --git a/examples/php.pp b/examples/php.pp
index ee187717e7..1d926bfb46 100644
--- a/examples/php.pp
+++ b/examples/php.pp
@@ -1,4 +1,4 @@
-class { '::apache':
+class { 'apache':
   mpm_module => 'prefork',
 }
-include ::apache::mod::php
+include apache::mod::php
diff --git a/examples/vhost.pp b/examples/vhost.pp
index 60acda5cb4..c0813d1608 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -5,7 +5,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { '::apache': }
+class { 'apache': }
 
 # Most basic vhost
 apache::vhost { 'first.example.com':
@@ -141,7 +141,6 @@
   rack_base_uris => ['/rackapp1', '/rackapp2'],
 }
 
-
 # Vhost to redirect non-ssl to ssl
 apache::vhost { 'sixteenth.example.com non-ssl':
   servername => 'sixteenth.example.com',
@@ -255,4 +254,3 @@
   docroot        => '/var/www/twentysecond',
   rack_base_uris => ['/passengerapp1', '/passengerapp2'],
 }
-
diff --git a/examples/vhost_directories.pp b/examples/vhost_directories.pp
index df5a2d52a1..f02734d029 100644
--- a/examples/vhost_directories.pp
+++ b/examples/vhost_directories.pp
@@ -1,7 +1,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { '::apache': }
+class { 'apache': }
 
 # Example from README adapted.
 apache::vhost { 'readme.example.net':
@@ -41,4 +41,3 @@
     },
   ],
 }
-
diff --git a/examples/vhost_filter.pp b/examples/vhost_filter.pp
index 1a66b856b7..ef27639c9c 100644
--- a/examples/vhost_filter.pp
+++ b/examples/vhost_filter.pp
@@ -1,5 +1,5 @@
 # Base class. Declares default vhost on port 80 with filters.
-class { '::apache': }
+class { 'apache': }
 
 # Example from README adapted.
 apache::vhost { 'readme.example.net':
@@ -14,4 +14,3 @@
     'FilterProtocol  COMPRESS  DEFLATE change=yes;byteranges=no',
   ],
 }
-
diff --git a/examples/vhost_ip_based.pp b/examples/vhost_ip_based.pp
index 249c4199c0..dc0fa4f33b 100644
--- a/examples/vhost_ip_based.pp
+++ b/examples/vhost_ip_based.pp
@@ -3,7 +3,7 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { '::apache':
+class { 'apache':
   default_vhost => false,
 }
 
diff --git a/examples/vhost_proxypass.pp b/examples/vhost_proxypass.pp
index 8edd0de9c0..ca9c57dff5 100644
--- a/examples/vhost_proxypass.pp
+++ b/examples/vhost_proxypass.pp
@@ -5,7 +5,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { '::apache': }
+class { 'apache': }
 
 # Most basic vhost with proxy_pass
 apache::vhost { 'first.example.com':
@@ -30,7 +30,7 @@
       'params' => {
         'retry'   => '0',
         'timeout' => '5',
-        }
+      }
     },
   ],
 }
@@ -59,7 +59,7 @@
       'params'   => {
         'retry'   => '0',
         'timeout' => '5',
-        },
+      },
       'keywords' => ['noquery', 'interpolate']
     },
   ],
diff --git a/examples/vhost_ssl.pp b/examples/vhost_ssl.pp
index 53989ff1b6..8e7a2b279e 100644
--- a/examples/vhost_ssl.pp
+++ b/examples/vhost_ssl.pp
@@ -3,7 +3,7 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { '::apache':
+class { 'apache':
   default_vhost => false,
 }
 
diff --git a/examples/vhosts_without_listen.pp b/examples/vhosts_without_listen.pp
index 0e97a0221f..d42118bc2c 100644
--- a/examples/vhosts_without_listen.pp
+++ b/examples/vhosts_without_listen.pp
@@ -4,11 +4,10 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { '::apache':
+class { 'apache':
   default_vhost => false,
 }
 
-
 # Add two an IP-based vhost on 10.0.0.10, ssl and non-ssl
 apache::vhost { 'The first IP-based vhost, non-ssl':
   servername => 'first.example.com',
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 790386f196..6740a73c27 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -48,7 +48,7 @@
   $target = undef,
   $options = [],
 ) {
-  include ::apache::mod::proxy_balancer
+  include apache::mod::proxy_balancer
 
   if versioncmp($apache::mod::proxy_balancer::apache_version, '2.4') >= 0 {
     $lbmethod = $proxy_set['lbmethod'] ? {
@@ -56,14 +56,14 @@
       default => $proxy_set['lbmethod'],
     }
     ensure_resource('apache::mod', "lbmethod_${lbmethod}", {
-      'loadfile_name' => "proxy_balancer_lbmethod_${lbmethod}.load"
+        'loadfile_name' => "proxy_balancer_lbmethod_${lbmethod}.load"
     })
   }
 
   if $target {
     $_target = $target
   } else {
-    $_target = "${::apache::confd_dir}/balancer_${name}.conf"
+    $_target = "${apache::confd_dir}/balancer_${name}.conf"
   }
 
   if !empty($options) {
@@ -76,7 +76,7 @@
     owner  => '0',
     group  => '0',
     path   => $_target,
-    mode   => $::apache::file_mode,
+    mode   => $apache::file_mode,
     notify => Class['Apache::Service'],
   }
 
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index ec66dcda96..3fa54960dd 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -38,12 +38,11 @@
 #     options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
 #   }
 #
-define apache::balancermember(
+define apache::balancermember (
   $balancer_cluster,
   $url = "http://${::fqdn}/",
   $options = [],
 ) {
-
   concat::fragment { "BalancerMember ${name}":
     target  => "apache_balancer_${balancer_cluster}",
     content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
diff --git a/manifests/confd/no_accf.pp b/manifests/confd/no_accf.pp
index 4176d2b65d..024a088a96 100644
--- a/manifests/confd/no_accf.pp
+++ b/manifests/confd/no_accf.pp
@@ -6,9 +6,9 @@
   # Template uses no variables
   file { 'no-accf.conf':
     ensure  => 'file',
-    path    => "${::apache::confd_dir}/no-accf.conf",
+    path    => "${apache::confd_dir}/no-accf.conf",
     content => template('apache/confd/no-accf.conf.erb'),
-    require => Exec["mkdir ${::apache::confd_dir}"],
-    before  => File[$::apache::confd_dir],
+    require => Exec["mkdir ${apache::confd_dir}"],
+    before  => File[$apache::confd_dir],
   }
 }
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 8a13163e57..52b94b4891 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -50,11 +50,11 @@
 #
 define apache::custom_config (
   Enum['absent', 'present'] $ensure = 'present',
-  $confdir                          = $::apache::confd_dir,
+  $confdir                          = $apache::confd_dir,
   $content                          = undef,
   $priority                         = '25',
   $source                           = undef,
-  $verify_command                   = $::apache::params::verify_command,
+  $verify_command                   = $apache::params::verify_command,
   Boolean $verify_config            = true,
   $filename                         = undef,
   $owner                            = undef,
@@ -62,7 +62,6 @@
   $file_mode                        = undef,
   Boolean $show_diff                = true,
 ) {
-
   if $content and $source {
     fail('Only one of $content and $source can be specified.')
   }
@@ -91,7 +90,7 @@
     $notifies = undef
   }
 
-  $_file_mode = pick($file_mode, $::apache::file_mode)
+  $_file_mode = pick($file_mode, $apache::file_mode)
 
   file { "apache_${name}":
     ensure    => $ensure,
diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
index 36ce5321bc..ecf543eed1 100644
--- a/manifests/default_confd_files.pp
+++ b/manifests/default_confd_files.pp
@@ -9,7 +9,7 @@
   if $all {
     case $::osfamily {
       'freebsd': {
-        include ::apache::confd::no_accf
+        include apache::confd::no_accf
       }
       default: {
         # do nothing
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 8254392b0f..8e7b5d0283 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -5,8 +5,8 @@
 class apache::default_mods (
   $all            = true,
   $mods           = undef,
-  $apache_version = $::apache::apache_version,
-  $use_systemd    = $::apache::use_systemd,
+  $apache_version = $apache::apache_version,
+  $use_systemd    = $apache::use_systemd,
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
@@ -47,24 +47,24 @@
   if $all {
     case $::osfamily {
       'debian': {
-        include ::apache::mod::authn_core
-        include ::apache::mod::reqtimeout
+        include apache::mod::authn_core
+        include apache::mod::reqtimeout
         if versioncmp($apache_version, '2.4') < 0 {
           ::apache::mod { 'authn_alias': }
         }
       }
       'redhat': {
-        include ::apache::mod::actions
-        include ::apache::mod::authn_core
-        include ::apache::mod::cache
-        include ::apache::mod::ext_filter
-        include ::apache::mod::mime
-        include ::apache::mod::mime_magic
-        include ::apache::mod::rewrite
-        include ::apache::mod::speling
-        include ::apache::mod::suexec
-        include ::apache::mod::version
-        include ::apache::mod::vhost_alias
+        include apache::mod::actions
+        include apache::mod::authn_core
+        include apache::mod::cache
+        include apache::mod::ext_filter
+        include apache::mod::mime
+        include apache::mod::mime_magic
+        include apache::mod::rewrite
+        include apache::mod::speling
+        include apache::mod::suexec
+        include apache::mod::version
+        include apache::mod::vhost_alias
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
         ::apache::mod { 'authn_dbm': }
@@ -82,20 +82,20 @@
         }
       }
       'freebsd': {
-        include ::apache::mod::actions
-        include ::apache::mod::authn_core
-        include ::apache::mod::cache
-        include ::apache::mod::disk_cache
-        include ::apache::mod::headers
-        include ::apache::mod::info
-        include ::apache::mod::mime_magic
-        include ::apache::mod::reqtimeout
-        include ::apache::mod::rewrite
-        include ::apache::mod::userdir
-        include ::apache::mod::version
-        include ::apache::mod::vhost_alias
-        include ::apache::mod::speling
-        include ::apache::mod::filter
+        include apache::mod::actions
+        include apache::mod::authn_core
+        include apache::mod::cache
+        include apache::mod::disk_cache
+        include apache::mod::headers
+        include apache::mod::info
+        include apache::mod::mime_magic
+        include apache::mod::reqtimeout
+        include apache::mod::rewrite
+        include apache::mod::userdir
+        include apache::mod::version
+        include apache::mod::vhost_alias
+        include apache::mod::speling
+        include apache::mod::filter
 
         ::apache::mod { 'asis': }
         ::apache::mod { 'auth_digest': }
@@ -109,7 +109,7 @@
         ::apache::mod { 'dumpio': }
         ::apache::mod { 'expires': }
         ::apache::mod { 'file_cache': }
-        ::apache::mod { 'imagemap':}
+        ::apache::mod { 'imagemap': }
         ::apache::mod { 'include': }
         ::apache::mod { 'logio': }
         ::apache::mod { 'request': }
@@ -118,32 +118,32 @@
       }
       default: {}
     }
-    case $::apache::mpm_module {
+    case $apache::mpm_module {
       'prefork': {
-        include ::apache::mod::cgi
+        include apache::mod::cgi
       }
       'worker': {
-        include ::apache::mod::cgid
+        include apache::mod::cgid
       }
       default: {
         # do nothing
       }
     }
-    include ::apache::mod::alias
-    include ::apache::mod::authn_file
-    include ::apache::mod::autoindex
-    include ::apache::mod::dav
-    include ::apache::mod::dav_fs
-    include ::apache::mod::deflate
-    include ::apache::mod::dir
-    include ::apache::mod::mime
-    include ::apache::mod::negotiation
-    include ::apache::mod::setenvif
+    include apache::mod::alias
+    include apache::mod::authn_file
+    include apache::mod::autoindex
+    include apache::mod::dav
+    include apache::mod::dav_fs
+    include apache::mod::deflate
+    include apache::mod::dir
+    include apache::mod::mime
+    include apache::mod::negotiation
+    include apache::mod::setenvif
     ::apache::mod { 'auth_basic': }
 
     if versioncmp($apache_version, '2.4') >= 0 {
       # filter is needed by mod_deflate
-      include ::apache::mod::filter
+      include apache::mod::filter
 
       # authz_core is needed for 'Require' directive
       ::apache::mod { 'authz_core':
@@ -153,13 +153,13 @@
       # lots of stuff seems to break without access_compat
       ::apache::mod { 'access_compat': }
     } else {
-      include ::apache::mod::authz_default
+      include apache::mod::authz_default
     }
 
-    include ::apache::mod::authz_user
+    include apache::mod::authz_user
 
     ::apache::mod { 'authz_groupfile': }
-    include ::apache::mod::env
+    include apache::mod::env
   } elsif $mods {
     ::apache::default_mods::load { $mods: }
 
@@ -170,7 +170,7 @@
       }
 
       # filter is needed by mod_deflate
-      include ::apache::mod::filter
+      include apache::mod::filter
     }
   } else {
     if versioncmp($apache_version, '2.4') >= 0 {
@@ -180,7 +180,7 @@
       }
 
       # filter is needed by mod_deflate
-      include ::apache::mod::filter
+      include apache::mod::filter
     }
   }
 }
diff --git a/manifests/dev.pp b/manifests/dev.pp
index 95b3fa6d41..b8c6991eaa 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -8,12 +8,11 @@
 # - **Gentoo**: `undef`.
 # - **Red Hat**: `httpd-devel`.
 class apache::dev {
-
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
   }
 
-  $packages = $::apache::dev_packages
+  $packages = $apache::dev_packages
   if $packages { # FreeBSD doesn't have dev packages to install
     package { $packages:
       ensure  => present,
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index 76b4d0bcd7..2e372b1a14 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -37,7 +37,7 @@
   $file_type     = 'application/x-httpd-php',
   $pass_header   = undef,
 ) {
-  include ::apache::mod::fastcgi
+  include apache::mod::fastcgi
 
   Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server[$title]
 
@@ -47,13 +47,13 @@
 
   file { "fastcgi-pool-${name}.conf":
     ensure  => file,
-    path    => "${::apache::confd_dir}/fastcgi-pool-${name}.conf",
+    path    => "${apache::confd_dir}/fastcgi-pool-${name}.conf",
     owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => $::apache::file_mode,
+    group   => $apache::params::root_group,
+    mode    => $apache::file_mode,
     content => template('apache/fastcgi/server.erb'),
-    require => Exec["mkdir ${::apache::confd_dir}"],
-    before  => File[$::apache::confd_dir],
+    require => Exec["mkdir ${apache::confd_dir}"],
+    before  => File[$apache::confd_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 67fdaf7c4a..6fc612495e 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -458,22 +458,22 @@
 #   Specifies any idditional Internet media (mime) types that you wish to be configured.
 # 
 class apache (
-  $apache_name                                                          = $::apache::params::apache_name,
-  $service_name                                                         = $::apache::params::service_name,
+  $apache_name                                                          = $apache::params::apache_name,
+  $service_name                                                         = $apache::params::service_name,
   $default_mods                                                         = true,
   Boolean $default_vhost                                                = true,
   $default_charset                                                      = undef,
   Boolean $default_confd_files                                          = true,
   Boolean $default_ssl_vhost                                            = false,
-  $default_ssl_cert                                                     = $::apache::params::default_ssl_cert,
-  $default_ssl_key                                                      = $::apache::params::default_ssl_key,
+  $default_ssl_cert                                                     = $apache::params::default_ssl_cert,
+  $default_ssl_key                                                      = $apache::params::default_ssl_key,
   $default_ssl_chain                                                    = undef,
   $default_ssl_ca                                                       = undef,
   $default_ssl_crl_path                                                 = undef,
   $default_ssl_crl                                                      = undef,
   $default_ssl_crl_check                                                = undef,
   $default_type                                                         = 'none',
-  $dev_packages                                                         = $::apache::params::dev_packages,
+  $dev_packages                                                         = $apache::params::dev_packages,
   $ip                                                                   = undef,
   Boolean $service_enable                                               = true,
   Boolean $service_manage                                               = true,
@@ -488,83 +488,82 @@
   $ldap_trusted_mode                                                    = undef,
   $error_documents                                                      = false,
   $timeout                                                              = '60',
-  $httpd_dir                                                            = $::apache::params::httpd_dir,
-  $server_root                                                          = $::apache::params::server_root,
-  $conf_dir                                                             = $::apache::params::conf_dir,
-  $confd_dir                                                            = $::apache::params::confd_dir,
-  Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups  = $::apache::params::hostname_lookups,
-  $conf_enabled                                                         = $::apache::params::conf_enabled,
-  $vhost_dir                                                            = $::apache::params::vhost_dir,
-  $vhost_enable_dir                                                     = $::apache::params::vhost_enable_dir,
-  $mod_libs                                                             = $::apache::params::mod_libs,
-  $mod_packages                                                         = $::apache::params::mod_packages,
-  $vhost_include_pattern                                                = $::apache::params::vhost_include_pattern,
-  $mod_dir                                                              = $::apache::params::mod_dir,
-  $mod_enable_dir                                                       = $::apache::params::mod_enable_dir,
-  $mpm_module                                                           = $::apache::params::mpm_module,
-  $lib_path                                                             = $::apache::params::lib_path,
-  $conf_template                                                        = $::apache::params::conf_template,
-  $servername                                                           = $::apache::params::servername,
-  $pidfile                                                              = $::apache::params::pidfile,
+  $httpd_dir                                                            = $apache::params::httpd_dir,
+  $server_root                                                          = $apache::params::server_root,
+  $conf_dir                                                             = $apache::params::conf_dir,
+  $confd_dir                                                            = $apache::params::confd_dir,
+  Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups  = $apache::params::hostname_lookups,
+  $conf_enabled                                                         = $apache::params::conf_enabled,
+  $vhost_dir                                                            = $apache::params::vhost_dir,
+  $vhost_enable_dir                                                     = $apache::params::vhost_enable_dir,
+  $mod_libs                                                             = $apache::params::mod_libs,
+  $mod_packages                                                         = $apache::params::mod_packages,
+  $vhost_include_pattern                                                = $apache::params::vhost_include_pattern,
+  $mod_dir                                                              = $apache::params::mod_dir,
+  $mod_enable_dir                                                       = $apache::params::mod_enable_dir,
+  $mpm_module                                                           = $apache::params::mpm_module,
+  $lib_path                                                             = $apache::params::lib_path,
+  $conf_template                                                        = $apache::params::conf_template,
+  $servername                                                           = $apache::params::servername,
+  $pidfile                                                              = $apache::params::pidfile,
   Optional[Stdlib::Absolutepath] $rewrite_lock                          = undef,
   Boolean $manage_user                                                  = true,
   Boolean $manage_group                                                 = true,
-  $user                                                                 = $::apache::params::user,
-  $group                                                                = $::apache::params::group,
-  $http_protocol_options                                                = $::apache::params::http_protocol_options,
+  $user                                                                 = $apache::params::user,
+  $group                                                                = $apache::params::group,
+  $http_protocol_options                                                = $apache::params::http_protocol_options,
   $supplementary_groups                                                 = [],
-  $keepalive                                                            = $::apache::params::keepalive,
-  $keepalive_timeout                                                    = $::apache::params::keepalive_timeout,
-  $max_keepalive_requests                                               = $::apache::params::max_keepalive_requests,
+  $keepalive                                                            = $apache::params::keepalive,
+  $keepalive_timeout                                                    = $apache::params::keepalive_timeout,
+  $max_keepalive_requests                                               = $apache::params::max_keepalive_requests,
   $limitreqfieldsize                                                    = '8190',
   $limitreqfields                                                       = '100',
-  $logroot                                                              = $::apache::params::logroot,
-  $logroot_mode                                                         = $::apache::params::logroot_mode,
-  Apache::LogLevel $log_level                                           = $::apache::params::log_level,
+  $logroot                                                              = $apache::params::logroot,
+  $logroot_mode                                                         = $apache::params::logroot_mode,
+  Apache::LogLevel $log_level                                           = $apache::params::log_level,
   $log_formats                                                          = {},
   $ssl_file                                                             = undef,
-  $ports_file                                                           = $::apache::params::ports_file,
-  $docroot                                                              = $::apache::params::docroot,
-  $apache_version                                                       = $::apache::version::default,
+  $ports_file                                                           = $apache::params::ports_file,
+  $docroot                                                              = $apache::params::docroot,
+  $apache_version                                                       = $apache::version::default,
   $server_tokens                                                        = 'Prod',
   $server_signature                                                     = 'On',
   $trace_enable                                                         = 'On',
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes        = undef,
   $file_e_tag                                                           = undef,
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]
-    $use_canonical_name                                          = undef,
+  $use_canonical_name                                          = undef,
   $package_ensure                                                = 'installed',
-  Boolean $use_optional_includes                                 = $::apache::params::use_optional_includes,
-  $use_systemd                                                   = $::apache::params::use_systemd,
-  $mime_types_additional                                         = $::apache::params::mime_types_additional,
-  $file_mode                                                     = $::apache::params::file_mode,
-  $root_directory_options                                        = $::apache::params::root_directory_options,
+  Boolean $use_optional_includes                                 = $apache::params::use_optional_includes,
+  $use_systemd                                                   = $apache::params::use_systemd,
+  $mime_types_additional                                         = $apache::params::mime_types_additional,
+  $file_mode                                                     = $apache::params::file_mode,
+  $root_directory_options                                        = $apache::params::root_directory_options,
   Boolean $root_directory_secured                                = false,
-  $error_log                                                     = $::apache::params::error_log,
-  $scriptalias                                                   = $::apache::params::scriptalias,
-  $access_log_file                                               = $::apache::params::access_log_file,
+  $error_log                                                     = $apache::params::error_log,
+  $scriptalias                                                   = $apache::params::scriptalias,
+  $access_log_file                                               = $apache::params::access_log_file,
   Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                = [],
   Optional[Boolean] $protocols_honor_order                       = undef,
 ) inherits ::apache::params {
-
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
     default => '(event|itk|prefork|worker)'
   }
 
-  if $::osfamily == 'RedHat' and $::apache::version::distrelease == '7' {
+  if $::osfamily == 'RedHat' and $apache::version::distrelease == '7' {
     # On redhat 7 the ssl.conf lives in /etc/httpd/conf.d (the confd_dir)
     # when all other module configs live in /etc/httpd/conf.modules.d (the
     # mod_dir). On all other platforms and versions, ssl.conf lives in the
     # mod_dir. This should maintain the expected location of ssl.conf
     $_ssl_file = $ssl_file ? {
       undef   => "${apache::confd_dir}/ssl.conf",
-      default =>  $ssl_file
+      default => $ssl_file
     }
   } else {
     $_ssl_file = $ssl_file ? {
       undef   => "${apache::mod_dir}/ssl.conf",
-      default =>  $ssl_file
+      default => $ssl_file
     }
   }
 
@@ -602,7 +601,7 @@
     }
   }
 
-  class { '::apache::service':
+  class { 'apache::service':
     service_name    => $service_name,
     service_enable  => $service_enable,
     service_manage  => $service_manage,
@@ -721,8 +720,8 @@
   concat { $ports_file:
     ensure  => present,
     owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => $::apache::file_mode,
+    group   => $apache::params::root_group,
+    mode    => $apache::file_mode,
     notify  => Class['Apache::Service'],
     require => Package['httpd'],
   }
@@ -731,14 +730,14 @@
     content => template('apache/ports_header.erb'),
   }
 
-  if $::apache::conf_dir and $::apache::params::conf_file {
+  if $apache::conf_dir and $apache::params::conf_file {
     if $::osfamily == 'gentoo' {
       $error_documents_path = '/usr/share/apache2/error'
       if $default_mods =~ Array {
         if versioncmp($apache_version, '2.4') >= 0 {
           if defined('apache::mod::ssl') {
             ::portage::makeconf { 'apache2_modules':
-              content => concat($default_mods, [ 'authz_core', 'socache_shmcb' ]),
+              content => concat($default_mods, ['authz_core', 'socache_shmcb']),
             }
           } else {
             ::portage::makeconf { 'apache2_modules':
@@ -753,11 +752,11 @@
       }
 
       file { [
-        '/etc/apache2/modules.d/.keep_www-servers_apache-2',
-        '/etc/apache2/vhosts.d/.keep_www-servers_apache-2',
-      ]:
-        ensure  => absent,
-        require => Package['httpd'],
+          '/etc/apache2/modules.d/.keep_www-servers_apache-2',
+          '/etc/apache2/vhosts.d/.keep_www-servers_apache-2',
+        ]:
+          ensure  => absent,
+          require => Package['httpd'],
       }
     }
 
@@ -790,9 +789,9 @@
     # - $trace_enable
     # - $rewrite_lock
     # - $root_directory_secured
-    file { "${::apache::conf_dir}/${::apache::params::conf_file}":
+    file { "${apache::conf_dir}/${apache::params::conf_file}":
       ensure  => file,
-      mode    => $::apache::file_mode,
+      mode    => $apache::file_mode,
       content => template($conf_template),
       notify  => Class['Apache::Service'],
       require => [Package['httpd'], Concat[$ports_file]],
@@ -801,16 +800,16 @@
     # preserve back-wards compatibility to the times when default_mods was
     # only a boolean value. Now it can be an array (too)
     if $default_mods =~ Array {
-      class { '::apache::default_mods':
+      class { 'apache::default_mods':
         all  => false,
         mods => $default_mods,
       }
     } else {
-      class { '::apache::default_mods':
+      class { 'apache::default_mods':
         all => $default_mods,
       }
     }
-    class { '::apache::default_confd_files':
+    class { 'apache::default_confd_files':
       all => $default_confd_files,
     }
     if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 25fb2801b1..3eb60baad8 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -9,7 +9,7 @@
 
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
-    target  => $::apache::ports_file,
+    target  => $apache::ports_file,
     content => template('apache/listen.erb'),
   }
 }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 323935c5b1..0f7105d630 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -36,7 +36,7 @@
   $package        = undef,
   $package_ensure = 'present',
   $lib            = undef,
-  $lib_path       = $::apache::lib_path,
+  $lib_path       = $apache::lib_path,
   $id             = undef,
   $path           = undef,
   $loadfile_name  = undef,
@@ -48,10 +48,10 @@
 
   $mod = $name
   #include apache #This creates duplicate resources in rspec-puppet
-  $mod_dir = $::apache::mod_dir
+  $mod_dir = $apache::mod_dir
 
   # Determine if we have special lib
-  $mod_libs = $::apache::mod_libs
+  $mod_libs = $apache::mod_libs
   if $lib {
     $_lib = $lib
   } elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack
@@ -80,11 +80,11 @@
   }
 
   # Determine if we have a package
-  $mod_packages = $::apache::mod_packages
+  $mod_packages = $apache::mod_packages
   if $package {
     $_package = $package
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
-    if ($::apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease != '2') {
+    if ($apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease != '2') {
       # On amazon linux we need to prefix our package name with mod24 instead of mod to support apache 2.4
       $_package = regsubst($mod_packages[$mod],'^(mod_)?(.*)','mod24_\2')
     } else {
@@ -101,11 +101,11 @@
     $package_before = $::osfamily ? {
       'freebsd' => [
         File[$_loadfile_name],
-        File["${::apache::conf_dir}/${::apache::params::conf_file}"]
+        File["${apache::conf_dir}/${apache::params::conf_file}"]
       ],
       default => [
         File[$_loadfile_name],
-        File[$::apache::confd_dir],
+        File[$apache::confd_dir],
       ],
     }
     # if there are any packages, they should be installed before the associated conf file
@@ -123,8 +123,8 @@
     ensure  => file,
     path    => "${mod_dir}/${_loadfile_name}",
     owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => $::apache::file_mode,
+    group   => $apache::params::root_group,
+    mode    => $apache::file_mode,
     content => template('apache/mod/load.erb'),
     require => [
       Package['httpd'],
@@ -135,14 +135,14 @@
   }
 
   if $::osfamily == 'Debian' {
-    $enable_dir = $::apache::mod_enable_dir
-    file{ "${_loadfile_name} symlink":
+    $enable_dir = $apache::mod_enable_dir
+    file { "${_loadfile_name} symlink":
       ensure  => link,
       path    => "${enable_dir}/${_loadfile_name}",
       target  => "${mod_dir}/${_loadfile_name}",
       owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => $::apache::file_mode,
+      group   => $apache::params::root_group,
+      mode    => $apache::file_mode,
       require => [
         File[$_loadfile_name],
         Exec["mkdir ${enable_dir}"],
@@ -154,13 +154,13 @@
     # defined in the class apache::mod::module
     # Some modules do not require this file.
     if defined(File["${mod}.conf"]) {
-      file{ "${mod}.conf symlink":
+      file { "${mod}.conf symlink":
         ensure  => link,
         path    => "${enable_dir}/${mod}.conf",
         target  => "${mod_dir}/${mod}.conf",
         owner   => 'root',
-        group   => $::apache::params::root_group,
-        mode    => $::apache::file_mode,
+        group   => $apache::params::root_group,
+        mode    => $apache::file_mode,
         require => [
           File["${mod}.conf"],
           Exec["mkdir ${enable_dir}"],
@@ -170,14 +170,14 @@
       }
     }
   } elsif $::osfamily == 'Suse' {
-    $enable_dir = $::apache::mod_enable_dir
-    file{ "${_loadfile_name} symlink":
+    $enable_dir = $apache::mod_enable_dir
+    file { "${_loadfile_name} symlink":
       ensure  => link,
       path    => "${enable_dir}/${_loadfile_name}",
       target  => "${mod_dir}/${_loadfile_name}",
       owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => $::apache::file_mode,
+      group   => $apache::params::root_group,
+      mode    => $apache::file_mode,
       require => [
         File[$_loadfile_name],
         Exec["mkdir ${enable_dir}"],
@@ -189,13 +189,13 @@
     # defined in the class apache::mod::module
     # Some modules do not require this file.
     if defined(File["${mod}.conf"]) {
-      file{ "${mod}.conf symlink":
+      file { "${mod}.conf symlink":
         ensure  => link,
         path    => "${enable_dir}/${mod}.conf",
         target  => "${mod_dir}/${mod}.conf",
         owner   => 'root',
-        group   => $::apache::params::root_group,
-        mode    => $::apache::file_mode,
+        group   => $apache::params::root_group,
+        mode    => $apache::file_mode,
         require => [
           File["${mod}.conf"],
           Exec["mkdir ${enable_dir}"],
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index de21d2c266..e8bca44483 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -17,13 +17,13 @@
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_alias.html for additional documentation.
 #
-class apache::mod::alias(
+class apache::mod::alias (
   $apache_version = undef,
   $icons_options  = 'Indexes MultiViews',
   # set icons_path to false to disable the alias
-  $icons_path     = $::apache::params::alias_icons_path,
+  $icons_path     = $apache::params::alias_icons_path,
 ) inherits ::apache::params {
-  include ::apache
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   apache::mod { 'alias': }
 
@@ -31,11 +31,11 @@
   if $icons_path {
     file { 'alias.conf':
       ensure  => file,
-      path    => "${::apache::mod_dir}/alias.conf",
-      mode    => $::apache::file_mode,
+      path    => "${apache::mod_dir}/alias.conf",
+      mode    => $apache::file_mode,
       content => template('apache/mod/alias.conf.erb'),
-      require => Exec["mkdir ${::apache::mod_dir}"],
-      before  => File[$::apache::mod_dir],
+      require => Exec["mkdir ${apache::mod_dir}"],
+      before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],
     }
   }
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index e13cad2152..51e7d2c084 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -84,7 +84,7 @@
 class apache::mod::auth_cas (
   String $cas_login_url,
   String $cas_validate_url,
-  String $cas_cookie_path    = $::apache::params::cas_cookie_path,
+  String $cas_cookie_path    = $apache::params::cas_cookie_path,
   $cas_cookie_path_mode      = '0750',
   $cas_version               = 2,
   $cas_debug                 = 'Off',
@@ -107,12 +107,11 @@
   $cas_scrub_request_headers = undef,
   $suppress_warning          = false,
 ) inherits ::apache::params {
-
   if $::osfamily == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')
   }
 
-  include ::apache
+  include apache
   ::apache::mod { 'auth_cas': }
 
   file { $cas_cookie_path:
@@ -127,12 +126,11 @@
   # - All variables beginning with cas_
   file { 'auth_cas.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/auth_cas.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/auth_cas.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/auth_cas.conf.erb'),
-    require => [ Exec["mkdir ${::apache::mod_dir}"], ],
-    before  => File[$::apache::mod_dir],
+    require => [Exec["mkdir ${apache::mod_dir}"],],
+    before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],
   }
-
 }
diff --git a/manifests/mod/auth_kerb.pp b/manifests/mod/auth_kerb.pp
index 79bde55921..093c26d227 100644
--- a/manifests/mod/auth_kerb.pp
+++ b/manifests/mod/auth_kerb.pp
@@ -3,9 +3,7 @@
 #
 # @see http://modauthkerb.sourceforge.net for additional documentation.
 class apache::mod::auth_kerb {
-  include ::apache
-  include ::apache::mod::authn_core
+  include apache
+  include apache::mod::authn_core
   ::apache::mod { 'auth_kerb': }
 }
-
-
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index b1edc48253..d585aed641 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -25,28 +25,26 @@
 # @see https://github.com/Uninett/mod_auth_mellon for additional documentation.
 #
 class apache::mod::auth_mellon (
-  $mellon_cache_size = $::apache::params::mellon_cache_size,
-  $mellon_lock_file  = $::apache::params::mellon_lock_file,
-  $mellon_post_directory = $::apache::params::mellon_post_directory,
+  $mellon_cache_size = $apache::params::mellon_cache_size,
+  $mellon_lock_file  = $apache::params::mellon_lock_file,
+  $mellon_post_directory = $apache::params::mellon_post_directory,
   $mellon_cache_entry_size = undef,
   $mellon_post_ttl = undef,
   $mellon_post_size = undef,
   $mellon_post_count = undef
 ) inherits ::apache::params {
-
-  include ::apache
+  include apache
   ::apache::mod { 'auth_mellon': }
 
   # Template uses
   # - All variables beginning with mellon_
   file { 'auth_mellon.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/auth_mellon.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/auth_mellon.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/auth_mellon.conf.erb'),
-    require => [ Exec["mkdir ${::apache::mod_dir}"], ],
-    before  => File[$::apache::mod_dir],
+    require => [Exec["mkdir ${apache::mod_dir}"],],
+    before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],
   }
-
 }
diff --git a/manifests/mod/auth_openidc.pp b/manifests/mod/auth_openidc.pp
index 36337fd3c4..ad0024fc4d 100644
--- a/manifests/mod/auth_openidc.pp
+++ b/manifests/mod/auth_openidc.pp
@@ -5,9 +5,7 @@
 #
 class apache::mod::auth_openidc (
 ) inherits ::apache::params {
-
-  include ::apache
-  include ::apache::mod::authz_user
+  include apache
+  include apache::mod::authz_user
   apache::mod { 'auth_openidc': }
-
 }
diff --git a/manifests/mod/authn_core.pp b/manifests/mod/authn_core.pp
index cde5b51d48..f145982e2d 100644
--- a/manifests/mod/authn_core.pp
+++ b/manifests/mod/authn_core.pp
@@ -6,8 +6,8 @@
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_authn_core.html for additional documentation.
 #
-class apache::mod::authn_core(
-  $apache_version = $::apache::apache_version
+class apache::mod::authn_core (
+  $apache_version = $apache::apache_version
 ) {
   if versioncmp($apache_version, '2.4') >= 0 {
     ::apache::mod { 'authn_core': }
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
index 912b2574ff..b5e8d2c915 100644
--- a/manifests/mod/authn_dbd.pp
+++ b/manifests/mod/authn_dbd.pp
@@ -37,23 +37,23 @@
   $authn_dbd_exptime     = '300',
   $authn_dbd_alias       = undef,
 ) inherits ::apache::params {
-  include ::apache
-  include ::apache::mod::dbd
+  include apache
+  include apache::mod::dbd
   ::apache::mod { 'authn_dbd': }
 
   if $authn_dbd_alias {
-  include ::apache::mod::authn_core
+    include apache::mod::authn_core
   }
 
   # Template uses
   # - All variables beginning with authn_dbd
   file { 'authn_dbd.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/authn_dbd.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/authn_dbd.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/authn_dbd.conf.erb'),
-    require => [ Exec["mkdir ${::apache::mod_dir}"], ],
-    before  => File[$::apache::mod_dir],
+    require => [Exec["mkdir ${apache::mod_dir}"],],
+    before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],
   }
 }
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 672373ff9e..3f194d7363 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -13,9 +13,8 @@
   Boolean $verify_server_cert = true,
   $package_name               = undef,
 ) {
-
-  include ::apache
-  include '::apache::mod::ldap'
+  include apache
+  include 'apache::mod::ldap'
   ::apache::mod { 'authnz_ldap':
     package => $package_name,
   }
@@ -24,11 +23,11 @@
   # - $verify_server_cert
   file { 'authnz_ldap.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/authnz_ldap.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/authnz_ldap.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/authnz_ldap.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/authnz_pam.pp b/manifests/mod/authnz_pam.pp
index a8fcf60633..35ddb779e1 100644
--- a/manifests/mod/authnz_pam.pp
+++ b/manifests/mod/authnz_pam.pp
@@ -4,6 +4,6 @@
 # @see https://www.adelton.com/apache/mod_authnz_pam for additional documentation.
 #
 class apache::mod::authnz_pam {
-  include ::apache
+  include apache
   ::apache::mod { 'authnz_pam': }
 }
diff --git a/manifests/mod/authz_default.pp b/manifests/mod/authz_default.pp
index 2f07a49fe6..540d086ab0 100644
--- a/manifests/mod/authz_default.pp
+++ b/manifests/mod/authz_default.pp
@@ -6,8 +6,8 @@
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_authz_default.html for additional documentation.
 #
-class apache::mod::authz_default(
-    $apache_version = $::apache::apache_version
+class apache::mod::authz_default (
+  $apache_version = $apache::apache_version
 ) {
   if versioncmp($apache_version, '2.4') >= 0 {
     warning('apache::mod::authz_default has been removed in Apache 2.4')
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index c22d0a00a4..15e0e55443 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_autoindex.html for additional documentation.
 #
 class apache::mod::autoindex {
-  include ::apache
+  include apache
   ::apache::mod { 'autoindex': }
 
   # Determine icon filename suffix for autoindex.conf.erb
@@ -19,11 +19,11 @@
 
   file { 'autoindex.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/autoindex.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/autoindex.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/autoindex.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index 7759176cc4..c11ea7fc98 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_cgi.html for additional documentation.
 #
 class apache::mod::cgi {
-  include ::apache
+  include apache
   case $::osfamily {
     'FreeBSD': {}
     default: {
@@ -25,5 +25,4 @@
   } else {
     ::apache::mod { 'cgi': }
   }
-
 }
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 0d8c27b092..e40af45b43 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_cgid.html
 #
 class apache::mod::cgid {
-  include ::apache
+  include apache
   case $::osfamily {
     'FreeBSD': {}
     default: {
@@ -36,11 +36,11 @@
     # Template uses $cgisock_path
     file { 'cgid.conf':
       ensure  => file,
-      path    => "${::apache::mod_dir}/cgid.conf",
-      mode    => $::apache::file_mode,
+      path    => "${apache::mod_dir}/cgid.conf",
+      mode    => $apache::file_mode,
       content => template('apache/mod/cgid.conf.erb'),
-      require => Exec["mkdir ${::apache::mod_dir}"],
-      before  => File[$::apache::mod_dir],
+      require => Exec["mkdir ${apache::mod_dir}"],
+      before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],
     }
   }
diff --git a/manifests/mod/cluster.pp b/manifests/mod/cluster.pp
index 093d3683f2..9b827f7630 100644
--- a/manifests/mod/cluster.pp
+++ b/manifests/mod/cluster.pp
@@ -61,8 +61,7 @@
   $server_advertise = true,
   $advertise_frequency = undef,
 ) {
-
-  include ::apache
+  include apache
 
   ::apache::mod { 'proxy': }
   ::apache::mod { 'proxy_ajp': }
@@ -76,14 +75,13 @@
     ::apache::mod { 'slotmem': }
   }
 
-  file {'cluster.conf':
+  file { 'cluster.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/cluster.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/cluster.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/cluster.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
-
 }
diff --git a/manifests/mod/data.pp b/manifests/mod/data.pp
index b09e224539..43bc2d0c90 100644
--- a/manifests/mod/data.pp
+++ b/manifests/mod/data.pp
@@ -9,7 +9,7 @@
 class apache::mod::data (
   $apache_version = undef,
 ) {
-  include ::apache
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   if versioncmp($_apache_version, '2.3') < 0 {
     fail('mod_data is only available in Apache 2.3 and later')
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index 1a4fd83925..20fd5c0157 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_dav_fs.html for additional documentation.
 #
 class apache::mod::dav_fs {
-  include ::apache
+  include apache
   $dav_lock = $::osfamily ? {
     'debian'  => "\${APACHE_LOCK_DIR}/DAVLock",
     'freebsd' => '/usr/local/var/DavLock',
@@ -17,11 +17,11 @@
   # Template uses: $dav_lock
   file { 'dav_fs.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/dav_fs.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/dav_fs.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/dav_fs.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 8b5094a002..916e830619 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -10,9 +10,9 @@
   $authz_svn_enabled = false,
 ) {
   Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
-  include ::apache
-  include ::apache::mod::dav
-  if($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){
+  include apache
+  include apache::mod::dav
+  if($::operatingsystem == 'SLES' and versioncmp($::operatingsystemmajrelease, '12') < 0) {
     package { 'subversion-server':
       ensure   => 'installed',
       provider => 'zypper',
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 28e36d490d..777c2f8886 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -23,16 +23,16 @@
     'Ratio'  => 'ratio',
   }
 ) {
-  include ::apache
+  include apache
   ::apache::mod { 'deflate': }
 
   file { 'deflate.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/deflate.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/deflate.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/deflate.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/dev.pp b/manifests/mod/dev.pp
index 4b1afe8c46..4039ff1fd0 100644
--- a/manifests/mod/dev.pp
+++ b/manifests/mod/dev.pp
@@ -7,5 +7,5 @@
 class apache::mod::dev {
   # Development packages are not apache modules
   warning('apache::mod::dev is deprecated; please use apache::dev')
-  include ::apache::dev
+  include apache::dev
 }
diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index 51bdfd7d68..86f97a0706 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -17,19 +17,18 @@
   $dir                   = 'public_html',
   Array[String] $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
 ) {
-
-  include ::apache
+  include apache
   ::apache::mod { 'dir': }
 
   # Template uses
   # - $indexes
   file { 'dir.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/dir.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/dir.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/dir.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index ef9f6bd81d..abd46dddde 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -21,11 +21,11 @@
   $cache_root           = undef,
   $cache_ignore_headers = undef,
 ) {
-  include ::apache
+  include apache
   if $cache_root {
     $_cache_root = $cache_root
   }
-  elsif versioncmp($::apache::apache_version, '2.4') >= 0 {
+  elsif versioncmp($apache::apache_version, '2.4') >= 0 {
     $_cache_root = $::osfamily ? {
       'debian'  => '/var/cache/apache2/mod_cache_disk',
       'redhat'  => '/var/cache/httpd/proxy',
@@ -40,7 +40,7 @@
     }
   }
 
-  if versioncmp($::apache::apache_version, '2.4') >= 0 {
+  if versioncmp($apache::apache_version, '2.4') >= 0 {
     apache::mod { 'cache_disk': }
   }
   else {
@@ -52,11 +52,11 @@
   # Template uses $_cache_root
   file { 'disk_cache.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/disk_cache.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/disk_cache.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/disk_cache.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/dumpio.pp b/manifests/mod/dumpio.pp
index c8e53a8994..df892a919e 100644
--- a/manifests/mod/dumpio.pp
+++ b/manifests/mod/dumpio.pp
@@ -19,21 +19,20 @@
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_dumpio.html for additional documentation.
 #
-class apache::mod::dumpio(
+class apache::mod::dumpio (
   Enum['Off', 'On', 'off', 'on'] $dump_io_input  = 'Off',
   Enum['Off', 'On', 'off', 'on'] $dump_io_output = 'Off',
 ) {
-  include ::apache
+  include apache
 
   ::apache::mod { 'dumpio': }
-  file{'dumpio.conf':
+  file { 'dumpio.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/dumpio.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/dumpio.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/dumpio.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
-
 }
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index e7cae3da68..402a8530ee 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -60,7 +60,7 @@
   $threadlimit            = '64',
   $listenbacklog          = '511',
 ) {
-  include ::apache
+  include apache
 
   $_apache_version = pick($apache_version, $apache::apache_version)
 
@@ -78,8 +78,8 @@
   }
   File {
     owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => $::apache::file_mode,
+    group => $apache::params::root_group,
+    mode  => $apache::file_mode,
   }
 
   # Template uses:
@@ -90,25 +90,25 @@
   # - $threadsperchild
   # - $maxrequestsperchild
   # - $serverlimit
-  file { "${::apache::mod_dir}/event.conf":
+  file { "${apache::mod_dir}/event.conf":
     ensure  => file,
-    mode    => $::apache::file_mode,
+    mode    => $apache::file_mode,
     content => template('apache/mod/event.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 
   case $::osfamily {
     'redhat': {
       if versioncmp($_apache_version, '2.4') >= 0 {
-        apache::mpm{ 'event':
+        apache::mpm { 'event':
           apache_version => $_apache_version,
         }
       }
     }
     'debian','freebsd' : {
-      apache::mpm{ 'event':
+      apache::mpm { 'event':
         apache_version => $_apache_version,
       }
     }
diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index d134994f1a..7a5bfddea2 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -19,7 +19,7 @@
   $expires_default = undef,
   $expires_by_type = undef,
 ) {
-  include ::apache
+  include apache
   ::apache::mod { 'expires': }
 
   # Template uses
@@ -28,11 +28,11 @@
   # $expires_by_type
   file { 'expires.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/expires.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/expires.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/expires.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/ext_filter.pp b/manifests/mod/ext_filter.pp
index 59f90ae401..d2a3d635e9 100644
--- a/manifests/mod/ext_filter.pp
+++ b/manifests/mod/ext_filter.pp
@@ -14,10 +14,10 @@
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_ext_filter.html for additional documentation.
 #
-class apache::mod::ext_filter(
+class apache::mod::ext_filter (
   Optional[Hash] $ext_filter_define = undef
 ) {
-  include ::apache
+  include apache
 
   ::apache::mod { 'ext_filter': }
 
@@ -27,11 +27,11 @@
   if $ext_filter_define {
     file { 'ext_filter.conf':
       ensure  => file,
-      path    => "${::apache::mod_dir}/ext_filter.conf",
-      mode    => $::apache::file_mode,
+      path    => "${apache::mod_dir}/ext_filter.conf",
+      mode    => $apache::file_mode,
       content => template('apache/mod/ext_filter.conf.erb'),
-      require => [ Exec["mkdir ${::apache::mod_dir}"], ],
-      before  => File[$::apache::mod_dir],
+      require => [Exec["mkdir ${apache::mod_dir}"],],
+      before  => File[$apache::mod_dir],
       notify  => Class['Apache::Service'],
     }
   }
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index abb529d8ff..d24dcbf0da 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -4,7 +4,7 @@
 # @see https://github.com/FastCGI-Archives/mod_fastcgi for additional documentation.
 #
 class apache::mod::fastcgi {
-  include ::apache
+  include apache
   if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemrelease, '7.0') >= 0) {
     fail('mod_fastcgi is no longer supported on el7 and above.')
   }
@@ -13,7 +13,7 @@
   }
   # Debian specifies it's fastcgi lib path, but RedHat uses the default value
   # with no config file
-  $fastcgi_lib_path = $::apache::params::fastcgi_lib_path
+  $fastcgi_lib_path = $apache::params::fastcgi_lib_path
 
   ::apache::mod { 'fastcgi': }
 
@@ -24,13 +24,12 @@
     # - $fastcgi_dir
     file { 'fastcgi.conf':
       ensure  => file,
-      path    => "${::apache::mod_dir}/fastcgi.conf",
-      mode    => $::apache::file_mode,
+      path    => "${apache::mod_dir}/fastcgi.conf",
+      mode    => $apache::file_mode,
       content => template('apache/mod/fastcgi.conf.erb'),
-      require => Exec["mkdir ${::apache::mod_dir}"],
-      before  => File[$::apache::mod_dir],
+      require => Exec["mkdir ${apache::mod_dir}"],
+      before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],
     }
   }
-
 }
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 22f1d4d446..2209ccd3b1 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -35,10 +35,10 @@
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_fcgid.html for additional documentation.
 #
-class apache::mod::fcgid(
+class apache::mod::fcgid (
   $options = {},
 ) {
-  include ::apache
+  include apache
   if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7') or $::osfamily == 'FreeBSD' {
     $loadfile_name = 'unixd_fcgid.load'
     $conf_name = 'unixd_fcgid.conf'
@@ -55,11 +55,11 @@
   # - $options
   file { $conf_name:
     ensure  => file,
-    path    => "${::apache::mod_dir}/${conf_name}",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/${conf_name}",
+    mode    => $apache::file_mode,
     content => template('apache/mod/fcgid.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index 974dcb8d1b..b77ea05c6c 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -37,7 +37,7 @@
   $scan_proxy_header_field    = undef,
   $use_last_xforwarededfor_ip = undef,
 ) {
-  include ::apache
+  include apache
   ::apache::mod { 'geoip': }
 
   # Template uses:
@@ -51,12 +51,11 @@
   # - use_last_xforwarededfor_ip
   file { 'geoip.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/geoip.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/geoip.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/geoip.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
-
 }
diff --git a/manifests/mod/http2.pp b/manifests/mod/http2.pp
index 95064fffcb..0637aee4dd 100644
--- a/manifests/mod/http2.pp
+++ b/manifests/mod/http2.pp
@@ -86,7 +86,7 @@
   Optional[Integer] $h2_window_size             = undef,
   Optional[String]  $apache_version             = undef,
 ) {
-  include ::apache
+  include apache
   apache::mod { 'http2': }
 
   $_apache_version = pick($apache_version, $apache::apache_version)
@@ -94,12 +94,12 @@
   file { 'http2.conf':
     ensure  => file,
     content => template('apache/mod/http2.conf.erb'),
-    mode    => $::apache::file_mode,
-    path    => "${::apache::mod_dir}/http2.conf",
-    owner   => $::apache::params::user,
-    group   => $::apache::params::group,
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    mode    => $apache::file_mode,
+    path    => "${apache::mod_dir}/http2.conf",
+    owner   => $apache::params::user,
+    group   => $apache::params::group,
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index abcd93ee74..baf20cb321 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -21,12 +21,12 @@
   $apache_version  = undef,
   $restrict_access = true,
   $info_path       = '/server-info',
-){
-  include ::apache
+) {
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
 
   if $::osfamily == 'Suse' {
-    if defined(Class['::apache::mod::worker']){
+    if defined(Class['::apache::mod::worker']) {
       $suse_path = '/usr/lib64/apache2-worker'
     } else {
       $suse_path = '/usr/lib64/apache2-prefork'
@@ -41,11 +41,11 @@
   # Template uses $allow_from, $_apache_version
   file { 'info.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/info.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/info.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/info.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/intercept_form_submit.pp b/manifests/mod/intercept_form_submit.pp
index dba95ced33..f6ccf653b8 100644
--- a/manifests/mod/intercept_form_submit.pp
+++ b/manifests/mod/intercept_form_submit.pp
@@ -4,6 +4,6 @@
 # @see https://www.adelton.com/apache/mod_intercept_form_submit for additional documentation.
 #
 class apache::mod::intercept_form_submit {
-  include ::apache
+  include apache
   ::apache::mod { 'intercept_form_submit': }
 }
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index e631dfde60..2f44b01a84 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -39,7 +39,7 @@
   $enablecapabilities  = undef,
   $apache_version      = undef,
 ) {
-  include ::apache
+  include apache
 
   $_apache_version = pick($apache_version, $apache::apache_version)
 
@@ -61,7 +61,7 @@
       }
     } else {
       if ! defined(Class['apache::mod::prefork']) {
-        include ::apache::mod::prefork
+        include apache::mod::prefork
       }
     }
   }
@@ -70,8 +70,8 @@
   }
   File {
     owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => $::apache::file_mode,
+    group => $apache::params::root_group,
+    mode  => $apache::file_mode,
   }
 
   # Template uses:
@@ -81,12 +81,12 @@
   # - $serverlimit
   # - $maxclients
   # - $maxrequestsperchild
-  file { "${::apache::mod_dir}/itk.conf":
+  file { "${apache::mod_dir}/itk.conf":
     ensure  => file,
-    mode    => $::apache::file_mode,
+    mode    => $apache::file_mode,
     content => template('apache/mod/itk.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 
@@ -96,7 +96,7 @@
         ensure => present,
       }
       if versioncmp($_apache_version, '2.4') >= 0 {
-        ::apache::mpm{ 'itk':
+        ::apache::mpm { 'itk':
           apache_version => $_apache_version,
         }
       }
@@ -112,7 +112,7 @@
       }
     }
     'debian', 'freebsd': {
-      apache::mpm{ 'itk':
+      apache::mpm { 'itk':
         apache_version => $_apache_version,
       }
     }
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index bf068320b0..a2b929b046 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -293,10 +293,9 @@
   # Mount file content
   # See comments in template mod/jk/uriworkermap.properties.erb
   $mount_file_content          = {},
-){
-
+) {
   # Provides important variables
-  include ::apache
+  include apache
   # Manages basic module config
   ::apache::mod { 'jk': }
 
@@ -306,7 +305,6 @@
     fail('Please replace $workers_file_content[\'worker_mantain\'] by $workers_file_content[\'worker_maintain\']. See MODULES-6225 for details.')
   }
 
-
   # Binding to mod_jk
   if $add_listen {
     $_ip = $ip ? {
@@ -319,14 +317,14 @@
   # File resource common parameters
   File {
     ensure  => file,
-    mode    => $::apache::file_mode,
+    mode    => $apache::file_mode,
     notify  => Class['apache::service'],
   }
 
   # Shared memory and log paths
   # If logroot unspecified, use default
   $log_dir = $logroot ? {
-    undef   => $::apache::logroot,
+    undef   => $apache::logroot,
     default => $logroot,
   }
   # If absolute path or pipe, use as-is
@@ -344,8 +342,8 @@
   }
 
   # Main config file
-  $mod_dir = $::apache::mod_dir
-  file {'jk.conf':
+  $mod_dir = $apache::mod_dir
+  file { 'jk.conf':
     path    => "${mod_dir}/jk.conf",
     content => template('apache/mod/jk.conf.erb'),
     require => [
@@ -377,5 +375,4 @@
       require => Package['httpd'],
     }
   }
-
 }
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 4994aafc11..7a0fff6f2a 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -60,9 +60,8 @@
   $ldap_opcache_ttl                                = undef,
   $ldap_trusted_mode                               = undef,
   String $ldap_path                                = '/ldap-status',
-){
-
-  include ::apache
+) {
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'ldap':
     package => $package_name,
@@ -70,11 +69,11 @@
   # Template uses $_apache_version
   file { 'ldap.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/ldap.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/ldap.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/ldap.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/lookup_identity.pp b/manifests/mod/lookup_identity.pp
index 1e25f5ede7..3161ec329f 100644
--- a/manifests/mod/lookup_identity.pp
+++ b/manifests/mod/lookup_identity.pp
@@ -4,6 +4,6 @@
 # @see https://www.adelton.com/apache/mod_lookup_identity for additional documentation.
 #
 class apache::mod::lookup_identity {
-  include ::apache
+  include apache
   ::apache::mod { 'lookup_identity': }
 }
diff --git a/manifests/mod/macro.pp b/manifests/mod/macro.pp
index 8766201acb..c4d2af0033 100644
--- a/manifests/mod/macro.pp
+++ b/manifests/mod/macro.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_macro.html for additional documentation.
 #
 class apache::mod::macro {
-  include ::apache
+  include apache
   ::apache::mod { 'macro': }
 }
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index e4cdd35dc0..9243ae1e1f 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -13,21 +13,21 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_mime.html for additional documentation.
 #
 class apache::mod::mime (
-  $mime_support_package = $::apache::params::mime_support_package,
-  $mime_types_config    = $::apache::params::mime_types_config,
+  $mime_support_package = $apache::params::mime_support_package,
+  $mime_types_config    = $apache::params::mime_types_config,
   $mime_types_additional = undef,
 ) inherits ::apache::params {
-  include ::apache
+  include apache
   $_mime_types_additional = pick($mime_types_additional, $apache::mime_types_additional)
   apache::mod { 'mime': }
   # Template uses $_mime_types_config
   file { 'mime.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/mime.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/mime.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/mime.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
   if $mime_support_package {
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index 582156ba2b..99a1ec4bb1 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -9,17 +9,17 @@
 class apache::mod::mime_magic (
   $magic_file = undef,
 ) {
-  include ::apache
-  $_magic_file = pick($magic_file, "${::apache::conf_dir}/magic")
+  include apache
+  $_magic_file = pick($magic_file, "${apache::conf_dir}/magic")
   apache::mod { 'mime_magic': }
   # Template uses $magic_file
   file { 'mime_magic.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/mime_magic.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/mime_magic.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/mime_magic.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index c24cdfac09..bc018001a8 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -11,22 +11,22 @@
 #
 class apache::mod::negotiation (
   Variant[Array[String], String] $force_language_priority = 'Prefer Fallback',
-  Variant[Array[String], String] $language_priority = [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
-                        'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
-                        'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
-                        'zh-TW' ],
+  Variant[Array[String], String] $language_priority = ['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+    'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
+    'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
+  'zh-TW'],
 ) {
-  include ::apache
+  include apache
 
   ::apache::mod { 'negotiation': }
   # Template uses no variables
   file { 'negotiation.conf':
     ensure  => file,
-    mode    => $::apache::file_mode,
-    path    => "${::apache::mod_dir}/negotiation.conf",
+    mode    => $apache::file_mode,
+    path    => "${apache::mod_dir}/negotiation.conf",
     content => template('apache/mod/negotiation.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index 8df2aea382..4c986ff81b 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -16,17 +16,17 @@
 # @see https://pagure.io/mod_nss for additional documentation.
 #
 class apache::mod::nss (
-  $transfer_log = "${::apache::params::logroot}/access.log",
-  $error_log    = "${::apache::params::logroot}/error.log",
+  $transfer_log = "${apache::params::logroot}/access.log",
+  $error_log    = "${apache::params::logroot}/error.log",
   $passwd_file  = undef,
   $port     = 8443,
 ) {
-  include ::apache
-  include ::apache::mod::mime
+  include apache
+  include apache::mod::mime
 
   apache::mod { 'nss': }
 
-  $httpd_dir = $::apache::httpd_dir
+  $httpd_dir = $apache::httpd_dir
 
   # Template uses:
   # $transfer_log
@@ -35,11 +35,11 @@
   # passwd_file
   file { 'nss.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/nss.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/nss.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/nss.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index 84f78dd7ae..54181545ae 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -49,8 +49,8 @@
   $additional_configuration      = {},
   $apache_version                = undef,
   $package_ensure                = undef,
-){
-  include ::apache
+) {
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   $_lib = $_apache_version ? {
     '2.4'   => 'mod_pagespeed_ap24.so',
@@ -65,11 +65,11 @@
   # Template uses $_apache_version
   file { 'pagespeed.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/pagespeed.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/pagespeed.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/pagespeed.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index cbc83269d1..8cd9e8b36d 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -321,16 +321,16 @@
   $passenger_buffer_response                                                                 = undef,
   $passenger_buffer_upload                                                                   = undef,
   $passenger_concurrency_model                                                               = undef,
-  $passenger_conf_file                                                                       = $::apache::params::passenger_conf_file,
-  $passenger_conf_package_file                                                               = $::apache::params::passenger_conf_package_file,
+  $passenger_conf_file                                                                       = $apache::params::passenger_conf_file,
+  $passenger_conf_package_file                                                               = $apache::params::passenger_conf_package_file,
   $passenger_data_buffer_dir                                                                 = undef,
   $passenger_debug_log_file                                                                  = undef,
   $passenger_debugger                                                                        = undef,
   $passenger_default_group                                                                   = undef,
-  $passenger_default_ruby                                                                    = $::apache::params::passenger_default_ruby,
+  $passenger_default_ruby                                                                    = $apache::params::passenger_default_ruby,
   $passenger_default_user                                                                    = undef,
   Optional[Boolean] $passenger_disable_anonymous_telemetry                                   = undef,
-  Optional[Boolean ] $passenger_disable_log_prefix                                           = undef,
+  Optional[Boolean] $passenger_disable_log_prefix                                           = undef,
   $passenger_disable_security_update_check                                                   = undef,
   $passenger_enabled                                                                         = undef,
   $passenger_error_override                                                                  = undef,
@@ -365,8 +365,8 @@
   $passenger_response_buffer_high_watermark                                                  = undef,
   $passenger_restart_dir                                                                     = undef,
   $passenger_rolling_restarts                                                                = undef,
-  $passenger_root                                                                            = $::apache::params::passenger_root,
-  $passenger_ruby                                                                            = $::apache::params::passenger_ruby,
+  $passenger_root                                                                            = $apache::params::passenger_root,
+  $passenger_ruby                                                                            = $apache::params::passenger_ruby,
   $passenger_security_update_check_proxy                                                     = undef,
   $passenger_show_version_in_header                                                          = undef,
   $passenger_socket_backlog                                                                  = undef,
@@ -399,7 +399,7 @@
   $rails_user_switching                                                                      = undef,
   $wsgi_auto_detect                                                                          = undef,
 ) inherits ::apache::params {
-  include ::apache
+  include apache
   if $passenger_installed_version {
     if $passenger_allow_encoded_slashes {
       if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
@@ -818,7 +818,7 @@
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
     file { 'passenger_package.conf':
-      path => "${::apache::confd_dir}/${passenger_conf_package_file}",
+      path => "${apache::confd_dir}/${passenger_conf_package_file}",
     }
   }
 
@@ -952,10 +952,10 @@
   # - $rack_autodetect : this options is only for backward compatiblity with older versions of this class
   file { 'passenger.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/${passenger_conf_file}",
+    path    => "${apache::mod_dir}/${passenger_conf_file}",
     content => template('apache/mod/passenger.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/perl.pp b/manifests/mod/perl.pp
index 60010a7ec3..f883305ea7 100644
--- a/manifests/mod/perl.pp
+++ b/manifests/mod/perl.pp
@@ -4,6 +4,6 @@
 # @see https://perl.apache.org for additional documentation.
 #
 class apache::mod::perl {
-  include ::apache
+  include apache
   ::apache::mod { 'perl': }
 }
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 63f6a0a4aa..4fec2c04ca 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -13,7 +13,7 @@
   $expiretimeout = '120',
   $keepalive = 'Off',
 ) {
-  include ::apache
+  include apache
   case $::osfamily {
     'freebsd' : {
       fail("Unsupported osfamily ${::osfamily}")
@@ -39,11 +39,11 @@
       }
       File {
         owner => 'root',
-        group => $::apache::params::root_group,
-        mode  => $::apache::file_mode,
+        group => $apache::params::root_group,
+        mode  => $apache::file_mode,
       }
 
-      $mod_dir = $::apache::mod_dir
+      $mod_dir = $apache::mod_dir
 
       # Template uses:
       # - $minspareprocessors
@@ -55,25 +55,25 @@
       # - $expiretimeout
       # - $keepalive
       # - $mod_dir
-      file { "${::apache::mod_dir}/peruser.conf":
+      file { "${apache::mod_dir}/peruser.conf":
         ensure  => file,
-        mode    => $::apache::file_mode,
+        mode    => $apache::file_mode,
         content => template('apache/mod/peruser.conf.erb'),
-        require => Exec["mkdir ${::apache::mod_dir}"],
-        before  => File[$::apache::mod_dir],
+        require => Exec["mkdir ${apache::mod_dir}"],
+        before  => File[$apache::mod_dir],
         notify  => Class['apache::service'],
       }
-      file { "${::apache::mod_dir}/peruser":
+      file { "${apache::mod_dir}/peruser":
         ensure  => directory,
-        require => File[$::apache::mod_dir],
+        require => File[$apache::mod_dir],
       }
-      file { "${::apache::mod_dir}/peruser/multiplexers":
+      file { "${apache::mod_dir}/peruser/multiplexers":
         ensure  => directory,
-        require => File["${::apache::mod_dir}/peruser"],
+        require => File["${apache::mod_dir}/peruser"],
       }
-      file { "${::apache::mod_dir}/peruser/processors":
+      file { "${apache::mod_dir}/peruser/processors":
         ensure  => directory,
-        require => File["${::apache::mod_dir}/peruser"],
+        require => File["${apache::mod_dir}/peruser"],
       }
 
       ::apache::peruser::multiplexer { '01-default': }
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 96465cd43d..7b320d0066 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -12,15 +12,14 @@
   $content          = undef,
   $template         = 'apache/mod/php.conf.erb',
   $source           = undef,
-  $root_group       = $::apache::params::root_group,
-  $php_version      = $::apache::params::php_version,
+  $root_group       = $apache::params::root_group,
+  $php_version      = $apache::params::php_version,
   $libphp_prefix    = 'libphp'
 ) inherits apache::params {
-
-  include ::apache
+  include apache
   $mod = "php${php_version}"
 
-  if $::apache::version::scl_httpd_version == undef and $::apache::version::scl_php_version != undef {
+  if $apache::version::scl_httpd_version == undef and $apache::version::scl_php_version != undef {
     fail('If you define apache::version::scl_php_version, you also need to specify apache::version::scl_httpd_version')
   }
   if defined(Class['::apache::mod::prefork']) {
@@ -48,7 +47,7 @@
   }
 
   # Determine if we have a package
-  $mod_packages = $::apache::mod_packages
+  $mod_packages = $apache::mod_packages
   if $package_name {
     $_package_name = $package_name
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
@@ -74,7 +73,7 @@
       package_ensure => $package_ensure,
       lib            => "mod_${mod}.so",
       id             => "php${_php_major}_module",
-      path           => "${::apache::lib_path}/mod_${mod}.so",
+      path           => "${apache::lib_path}/mod_${mod}.so",
     }
   } else {
     ::apache::mod { $mod:
@@ -86,23 +85,23 @@
     }
   }
 
-  include ::apache::mod::mime
-  include ::apache::mod::dir
+  include apache::mod::mime
+  include apache::mod::dir
   Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
 
   # Template uses $extensions
   file { "${mod}.conf":
     ensure  => file,
-    path    => "${::apache::mod_dir}/${mod}.conf",
+    path    => "${apache::mod_dir}/${mod}.conf",
     owner   => 'root',
     group   => $root_group,
-    mode    => $::apache::file_mode,
+    mode    => $apache::file_mode,
     content => $manage_content,
     source  => $source,
     require => [
-      Exec["mkdir ${::apache::mod_dir}"],
+      Exec["mkdir ${apache::mod_dir}"],
     ],
-    before  => File[$::apache::mod_dir],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 051d925af4..f6c6315aee 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -45,7 +45,7 @@
   $apache_version         = undef,
   $listenbacklog          = '511'
 ) {
-  include ::apache
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
@@ -72,8 +72,8 @@
 
   File {
     owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => $::apache::file_mode,
+    group => $apache::params::root_group,
+    mode  => $apache::file_mode,
   }
 
   # Template uses:
@@ -85,18 +85,18 @@
   # - $maxrequestworkers
   # - $maxrequestsperchild
   # - $maxconnectionsperchild
-  file { "${::apache::mod_dir}/prefork.conf":
+  file { "${apache::mod_dir}/prefork.conf":
     ensure  => file,
     content => template('apache/mod/prefork.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 
   case $::osfamily {
     'redhat': {
       if versioncmp($_apache_version, '2.4') >= 0 {
-        ::apache::mpm{ 'prefork':
+        ::apache::mpm { 'prefork':
           apache_version => $_apache_version,
         }
       }
@@ -112,12 +112,12 @@
       }
     }
     'debian', 'freebsd': {
-      ::apache::mpm{ 'prefork':
+      ::apache::mpm { 'prefork':
         apache_version => $_apache_version,
       }
     }
     'Suse': {
-      ::apache::mpm{ 'prefork':
+      ::apache::mpm { 'prefork':
         apache_version => $apache_version,
         lib_path       => '/usr/lib64/apache2-prefork',
       }
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 4564e337b6..2a9eb71495 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -33,7 +33,7 @@
   $proxy_timeout      = undef,
   $proxy_iobuffersize = undef,
 ) {
-  include ::apache
+  include apache
   $_proxy_timeout = $apache::timeout
   $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'proxy':
@@ -42,11 +42,11 @@
   # Template uses $proxy_requests, $_apache_version
   file { 'proxy.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/proxy.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/proxy.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/proxy.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 7089540af5..43bd0af658 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -15,15 +15,14 @@
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html for additional documentation.
 #
-class apache::mod::proxy_balancer(
+class apache::mod::proxy_balancer (
   Boolean $manager                   = false,
   Stdlib::Absolutepath $manager_path = '/balancer-manager',
   Array $allow_from                  = ['127.0.0.1','::1'],
-  $apache_version                    = $::apache::apache_version,
+  $apache_version                    = $apache::apache_version,
 ) {
-
-  include ::apache::mod::proxy
-  include ::apache::mod::proxy_http
+  include apache::mod::proxy
+  include apache::mod::proxy_http
   if versioncmp($apache_version, '2.4') >= 0 {
     ::apache::mod { 'slotmem_shm': }
   }
@@ -32,14 +31,14 @@
   Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_balancer']
   ::apache::mod { 'proxy_balancer': }
   if $manager {
-    include ::apache::mod::status
+    include apache::mod::status
     file { 'proxy_balancer.conf':
       ensure  => file,
-      path    => "${::apache::mod_dir}/proxy_balancer.conf",
-      mode    => $::apache::file_mode,
+      path    => "${apache::mod_dir}/proxy_balancer.conf",
+      mode    => $apache::file_mode,
       content => template('apache/mod/proxy_balancer.conf.erb'),
-      require => Exec["mkdir ${::apache::mod_dir}"],
-      before  => File[$::apache::mod_dir],
+      require => Exec["mkdir ${apache::mod_dir}"],
+      before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],
     }
   }
diff --git a/manifests/mod/proxy_connect.pp b/manifests/mod/proxy_connect.pp
index 56103f611d..e09cab0795 100644
--- a/manifests/mod/proxy_connect.pp
+++ b/manifests/mod/proxy_connect.pp
@@ -9,7 +9,7 @@
 class apache::mod::proxy_connect (
   $apache_version  = undef,
 ) {
-  include ::apache
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   if versioncmp($_apache_version, '2.2') >= 0 {
     Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_connect']
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 730940a4f5..22a576641e 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_html.html for additional documentation.
 #
 class apache::mod::proxy_html {
-  include ::apache
+  include apache
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
   Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
 
@@ -21,13 +21,13 @@
       }
       case $::operatingsystem {
         'Ubuntu': {
-          $loadfiles = $::apache::params::distrelease ? {
+          $loadfiles = $apache::params::distrelease ? {
             '10'    => ['/usr/lib/libxml2.so.2'],
             default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
           }
         }
         'Debian': {
-          $loadfiles = $::apache::params::distrelease ? {
+          $loadfiles = $apache::params::distrelease ? {
             '6'     => ['/usr/lib/libxml2.so.2'],
             default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
           }
@@ -36,11 +36,11 @@
           $loadfiles = ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"]
         }
       }
-      if versioncmp($::apache::apache_version, '2.4') >= 0 {
+      if versioncmp($apache::apache_version, '2.4') >= 0 {
         ::apache::mod { 'xml2enc': }
       }
     }
-    default: { }
+    default: {}
   }
 
   ::apache::mod { 'proxy_html':
@@ -50,11 +50,11 @@
   # Template uses $icons_path
   file { 'proxy_html.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/proxy_html.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/proxy_html.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/proxy_html.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/proxy_wstunnel.pp b/manifests/mod/proxy_wstunnel.pp
index 14e3f9d356..a7dc00f0f4 100644
--- a/manifests/mod/proxy_wstunnel.pp
+++ b/manifests/mod/proxy_wstunnel.pp
@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html for additional documentation.
 #
 class apache::mod::proxy_wstunnel {
-  include ::apache, ::apache::mod::proxy
+  include apache, apache::mod::proxy
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_wstunnel']
   ::apache::mod { 'proxy_wstunnel': }
 }
diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp
index 3ad11b9fff..91f1d38181 100644
--- a/manifests/mod/python.pp
+++ b/manifests/mod/python.pp
@@ -9,10 +9,8 @@
 class apache::mod::python (
   Optional[String] $loadfile_name = undef,
 ) {
-  include ::apache
+  include apache
   ::apache::mod { 'python':
     loadfile_name => $loadfile_name,
   }
 }
-
-
diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index 9c7f5b17df..addc966fa8 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -66,7 +66,7 @@
   Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,
   Optional[String]                                           $apache_version            = undef,
 ) {
-  include ::apache
+  include apache
 
   $_apache_version = pick($apache_version, $apache::apache_version)
   if versioncmp($_apache_version, '2.4') < 0 {
@@ -104,11 +104,11 @@
 
   file { 'remoteip.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/remoteip.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/remoteip.conf",
+    mode    => $apache::file_mode,
     content => epp('apache/mod/remoteip.conf.epp', $template_parameters),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index 31587207b4..a971e045dd 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -8,17 +8,17 @@
 #
 class apache::mod::reqtimeout (
   $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
-){
-  include ::apache
+) {
+  include apache
   ::apache::mod { 'reqtimeout': }
   # Template uses no variables
   file { 'reqtimeout.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/reqtimeout.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/reqtimeout.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/reqtimeout.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/rewrite.pp b/manifests/mod/rewrite.pp
index e7622b1975..06986d1e89 100644
--- a/manifests/mod/rewrite.pp
+++ b/manifests/mod/rewrite.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_rewrite.html for additional documentation.
 #
 class apache::mod::rewrite {
-  include ::apache::params
+  include apache::params
   ::apache::mod { 'rewrite': }
 }
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index 21430a3669..7e4bab23e9 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -17,11 +17,11 @@
 #
 class apache::mod::rpaf (
   $sethostname = true,
-  $proxy_ips   = [ '127.0.0.1' ],
+  $proxy_ips   = ['127.0.0.1'],
   $header      = 'X-Forwarded-For',
   $template    = 'apache/mod/rpaf.conf.erb'
 ) {
-  include ::apache
+  include apache
   ::apache::mod { 'rpaf': }
 
   # Template uses:
@@ -30,11 +30,11 @@
   # - $header
   file { 'rpaf.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/rpaf.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/rpaf.conf",
+    mode    => $apache::file_mode,
     content => template($template),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 1bc3edfd83..e011c33bcc 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -1,4 +1,3 @@
-
 # @summary
 #   Installs and configures `mod_security`.
 # 
@@ -94,18 +93,18 @@
 # @see https://github.com/SpiderLabs/ModSecurity/wiki for additional documentation.
 #
 class apache::mod::security (
-  $logroot                    = $::apache::params::logroot,
-  $version                     = $::apache::params::modsec_version,
-  $crs_package                 = $::apache::params::modsec_crs_package,
-  $activated_rules             = $::apache::params::modsec_default_rules,
-  $modsec_dir                  = $::apache::params::modsec_dir,
-  $modsec_secruleengine        = $::apache::params::modsec_secruleengine,
+  $logroot                    = $apache::params::logroot,
+  $version                     = $apache::params::modsec_version,
+  $crs_package                 = $apache::params::modsec_crs_package,
+  $activated_rules             = $apache::params::modsec_default_rules,
+  $modsec_dir                  = $apache::params::modsec_dir,
+  $modsec_secruleengine        = $apache::params::modsec_secruleengine,
   $audit_log_relevant_status   = '^(?:5|4(?!04))',
-  $audit_log_parts             = $::apache::params::modsec_audit_log_parts,
-  $audit_log_type              = $::apache::params::modsec_audit_log_type,
+  $audit_log_parts             = $apache::params::modsec_audit_log_parts,
+  $audit_log_type              = $apache::params::modsec_audit_log_type,
   $audit_log_storage_dir       = undef,
-  $secpcrematchlimit           = $::apache::params::secpcrematchlimit,
-  $secpcrematchlimitrecursion  = $::apache::params::secpcrematchlimitrecursion,
+  $secpcrematchlimit           = $apache::params::secpcrematchlimit,
+  $secpcrematchlimitrecursion  = $apache::params::secpcrematchlimitrecursion,
   $allowed_methods             = 'GET HEAD POST OPTIONS',
   $content_types               = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
   $restricted_extensions       = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
@@ -124,7 +123,7 @@
   $secrequestbodyinmemorylimit = '131072',
   $manage_security_crs         = true,
 ) inherits ::apache::params {
-  include ::apache
+  include apache
 
   $_secdefaultaction = $secdefaultaction ? {
     /log/   => $secdefaultaction, # it has log or nolog,auditlog or log,noauditlog
@@ -135,7 +134,7 @@
     fail('FreeBSD is not currently supported')
   }
 
-  if ($::osfamily == 'Suse' and $::operatingsystemrelease < '11') {
+  if ($::osfamily == 'Suse' and versioncmp($::operatingsystemrelease, '11') < 0) {
     fail('SLES 10 is not currently supported.')
   }
 
@@ -157,17 +156,16 @@
     lib => 'mod_security2.so',
   }
 
-
   ::apache::mod { 'unique_id_module':
     id  => 'unique_id_module',
     lib => 'mod_unique_id.so',
   }
 
-  if $crs_package  {
+  if $crs_package {
     package { $crs_package:
       ensure => 'installed',
       before => [
-        File[$::apache::confd_dir],
+        File[$apache::confd_dir],
         File[$modsec_dir],
       ],
     }
@@ -187,12 +185,12 @@
   file { 'security.conf':
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
-    mode    => $::apache::file_mode,
-    path    => "${::apache::mod_dir}/${mod_conf_name}",
-    owner   => $::apache::params::user,
-    group   => $::apache::params::group,
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    mode    => $apache::file_mode,
+    path    => "${apache::mod_dir}/${mod_conf_name}",
+    owner   => $apache::params::user,
+    group   => $apache::params::group,
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 
@@ -209,8 +207,8 @@
 
   file { "${modsec_dir}/activated_rules":
     ensure  => directory,
-    owner   => $::apache::params::user,
-    group   => $::apache::params::group,
+    owner   => $apache::params::user,
+    group   => $apache::params::group,
     mode    => '0555',
     purge   => true,
     force   => true,
diff --git a/manifests/mod/setenvif.pp b/manifests/mod/setenvif.pp
index 6e07a32c1c..6b3586a7aa 100644
--- a/manifests/mod/setenvif.pp
+++ b/manifests/mod/setenvif.pp
@@ -4,16 +4,16 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_setenvif.html for additional documentation.
 #
 class apache::mod::setenvif {
-  include ::apache
+  include apache
   ::apache::mod { 'setenvif': }
   # Template uses no variables
   file { 'setenvif.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/setenvif.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/setenvif.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/setenvif.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 8d177f668d..85946a10b4 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -29,14 +29,14 @@
   $package_name     = undef,
   $mod_lib          = undef,
 ) {
-  include ::apache
+  include apache
   if $::osfamily == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_shib in their default package repositories.')
   }
 
   $mod_shib = 'shib2'
 
-  apache::mod {$mod_shib:
+  apache::mod { $mod_shib:
     id      => 'mod_shib',
     path    => $mod_full_path,
     package => $package_name,
diff --git a/manifests/mod/socache_shmcb.pp b/manifests/mod/socache_shmcb.pp
index e5b463ff58..e9be75dce8 100644
--- a/manifests/mod/socache_shmcb.pp
+++ b/manifests/mod/socache_shmcb.pp
@@ -4,5 +4,5 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html for additional documentation.
 #
 class apache::mod::socache_shmcb {
-    ::apache::mod { 'socache_shmcb': }
+  ::apache::mod { 'socache_shmcb': }
 }
diff --git a/manifests/mod/speling.pp b/manifests/mod/speling.pp
index dfd7433c86..538e8ffa6f 100644
--- a/manifests/mod/speling.pp
+++ b/manifests/mod/speling.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_speling.html for additional documentation.
 #
 class apache::mod::speling {
-  include ::apache
+  include apache
   ::apache::mod { 'speling': }
 }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index ccfc74eaf1..1d4026a59a 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -81,18 +81,18 @@
   Boolean $ssl_compression                                  = false,
   Optional[Boolean] $ssl_sessiontickets                     = undef,
   $ssl_cryptodevice                                         = 'builtin',
-  $ssl_options                                              = [ 'StdEnvVars' ],
+  $ssl_options                                              = ['StdEnvVars'],
   $ssl_openssl_conf_cmd                                     = undef,
   Optional[String] $ssl_cert                                = undef,
   Optional[String] $ssl_key                                 = undef,
   $ssl_ca                                                   = undef,
   $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
-  $ssl_protocol                                             = $::apache::params::ssl_protocol,
+  $ssl_protocol                                             = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
   $ssl_pass_phrase_dialog                                   = 'builtin',
   $ssl_random_seed_bytes                                    = '512',
-  String $ssl_sessioncache                                  = $::apache::params::ssl_sessioncache,
+  String $ssl_sessioncache                                  = $apache::params::ssl_sessioncache,
   $ssl_sessioncachetimeout                                  = '300',
   Boolean $ssl_stapling                                     = false,
   Optional[String] $stapling_cache                          = undef,
@@ -101,9 +101,8 @@
   $apache_version                                           = undef,
   $package_name                                             = undef,
 ) inherits ::apache::params {
-
-  include ::apache
-  include ::apache::mod::mime
+  include apache
+  include apache::mod::mime
   $_apache_version = pick($apache_version, $apache::apache_version)
   if $ssl_mutex {
     $_ssl_mutex = $ssl_mutex
@@ -159,7 +158,7 @@
   }
 
   if $::osfamily == 'Suse' {
-    if defined(Class['::apache::mod::worker']){
+    if defined(Class['::apache::mod::worker']) {
       $suse_path = '/usr/lib64/apache2-worker'
     } else {
       $suse_path = '/usr/lib64/apache2-prefork'
@@ -175,7 +174,7 @@
   }
 
   if versioncmp($_apache_version, '2.4') >= 0 {
-    include ::apache::mod::socache_shmcb
+    include apache::mod::socache_shmcb
   }
 
   # Template uses
@@ -196,11 +195,11 @@
   # $_apache_version
   file { 'ssl.conf':
     ensure  => file,
-    path    => $::apache::_ssl_file,
-    mode    => $::apache::file_mode,
+    path    => $apache::_ssl_file,
+    mode    => $apache::file_mode,
     content => template('apache/mod/ssl.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 0eedf64ecb..ddd9690495 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -45,8 +45,7 @@
   $apache_version                                  = undef,
   $status_path                                     = '/server-status',
 ) inherits ::apache::params {
-
-  include ::apache
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'status': }
 
@@ -57,11 +56,11 @@
   # Template uses $allow_from, $extended_status, $_apache_version, $status_path
   file { 'status.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/status.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/status.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/status.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index 1b998d9f3c..3a16a76aaa 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -4,22 +4,21 @@
 # @see https://www.suphp.org/DocumentationView.html?file=apache/INSTALL for additional documentation.
 #
 class apache::mod::suphp (
-){
+) {
   if  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
-      ($facts['os']['name'] == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
+  ($facts['os']['name'] == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
     fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
   }
-  include ::apache
+  include apache
   ::apache::mod { 'suphp': }
 
-  file {'suphp.conf':
+  file { 'suphp.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/suphp.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/suphp.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/suphp.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
-
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index d564e07fbf..4cab25beeb 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -36,22 +36,22 @@
   $disable_root = true,
   $apache_version = undef,
   $path = '/home/*/public_html',
-  $overrides = [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ],
-  $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ],
+  $overrides = ['FileInfo', 'AuthConfig', 'Limit', 'Indexes'],
+  $options = ['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec'],
   $unmanaged_path = false,
   $custom_fragment = undef,
 ) {
-  include ::apache
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
 
   if $home or $dir {
     $_home = $home ? {
       undef   => '/home',
-      default =>  $home,
+      default => $home,
     }
     $_dir = $dir ? {
       undef   => 'public_html',
-      default =>  $dir,
+      default => $dir,
     }
     warning('home and dir are deprecated; use path instead')
     $_path = "${_home}/*/${_dir}"
@@ -64,11 +64,11 @@
   # Template uses $home, $dir, $disable_root, $_apache_version
   file { 'userdir.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/userdir.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/userdir.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/userdir.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
index a3a658c48a..7dd89adce0 100644
--- a/manifests/mod/version.pp
+++ b/manifests/mod/version.pp
@@ -6,10 +6,9 @@
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_version.html for additional documentation.
 #
-class apache::mod::version(
-  $apache_version = $::apache::apache_version
+class apache::mod::version (
+  $apache_version = $apache::apache_version
 ) {
-
   if ($::osfamily == 'debian' and versioncmp($apache_version, '2.4') >= 0) {
     warning("${module_name}: module version_module is built-in and can't be loaded")
   } else {
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 695c4907bc..d6b57b89b8 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -54,7 +54,7 @@
   $listenbacklog       = '511',
   $apache_version      = undef,
 ) {
-  include ::apache
+  include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
 
   if defined(Class['apache::mod::event']) {
@@ -71,8 +71,8 @@
   }
   File {
     owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => $::apache::file_mode,
+    group => $apache::params::root_group,
+    mode  => $apache::file_mode,
   }
 
   # Template uses:
@@ -85,19 +85,18 @@
   # - $serverlimit
   # - $threadLimit
   # - $listenbacklog
-  file { "${::apache::mod_dir}/worker.conf":
+  file { "${apache::mod_dir}/worker.conf":
     ensure  => file,
     content => template('apache/mod/worker.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 
   case $::osfamily {
     'redhat': {
-
       if versioncmp($_apache_version, '2.4') >= 0 {
-        ::apache::mpm{ 'worker':
+        ::apache::mpm { 'worker':
           apache_version => $_apache_version,
         }
       }
@@ -114,7 +113,7 @@
     }
 
     'debian', 'freebsd': {
-      ::apache::mpm{ 'worker':
+      ::apache::mpm { 'worker':
         apache_version => $_apache_version,
       }
     }
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index b6d5a999f7..0d326a4d5c 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -29,7 +29,7 @@
 # @note Unsupported platforms: SLES: all; RedHat: all; CentOS: all; OracleLinux: all; Scientific: all
 class apache::mod::wsgi (
   $wsgi_restrict_embedded = undef,
-  $wsgi_socket_prefix     = $::apache::params::wsgi_socket_prefix,
+  $wsgi_socket_prefix     = $apache::params::wsgi_socket_prefix,
   $wsgi_python_path       = undef,
   $wsgi_python_home       = undef,
   $wsgi_python_optimize   = undef,
@@ -37,7 +37,7 @@
   $package_name           = undef,
   $mod_path               = undef,
 ) inherits ::apache::params {
-  include ::apache
+  include apache
   if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) {
     fail('apache::mod::wsgi - both package_name and mod_path must be specified!')
   }
@@ -46,7 +46,7 @@
     if $mod_path =~ /\// {
       $_mod_path = $mod_path
     } else {
-      $_mod_path = "${::apache::lib_path}/${mod_path}"
+      $_mod_path = "${apache::lib_path}/${mod_path}"
     }
     ::apache::mod { 'wsgi':
       package => $package_name,
@@ -62,14 +62,13 @@
   # - $wsgi_socket_prefix
   # - $wsgi_python_path
   # - $wsgi_python_home
-  file {'wsgi.conf':
+  file { 'wsgi.conf':
     ensure  => file,
-    path    => "${::apache::mod_dir}/wsgi.conf",
-    mode    => $::apache::file_mode,
+    path    => "${apache::mod_dir}/wsgi.conf",
+    mode    => $apache::file_mode,
     content => template('apache/mod/wsgi.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
-
diff --git a/manifests/mod/xsendfile.pp b/manifests/mod/xsendfile.pp
index 7d34ca7260..955488461b 100644
--- a/manifests/mod/xsendfile.pp
+++ b/manifests/mod/xsendfile.pp
@@ -4,6 +4,6 @@
 # @see https://tn123.org/mod_xsendfile/ for additional documentation.
 #
 class apache::mod::xsendfile {
-  include ::apache::params
+  include apache::params
   ::apache::mod { 'xsendfile': }
 }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index f77bf89d3a..644d0e1fd0 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -2,15 +2,15 @@
 #
 # @api private
 define apache::mpm (
-  $lib_path       = $::apache::lib_path,
-  $apache_version = $::apache::apache_version,
+  $lib_path       = $apache::lib_path,
+  $apache_version = $apache::apache_version,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
   }
 
   $mpm     = $name
-  $mod_dir = $::apache::mod_dir
+  $mod_dir = $apache::mod_dir
 
   $_lib  = "mod_mpm_${mpm}.so"
   $_path = "${lib_path}/${_lib}"
@@ -32,37 +32,37 @@
       }
     }
   } else {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        file { "${mod_dir}/${mpm}.load":
-          ensure  => file,
-          path    => "${mod_dir}/${mpm}.load",
-          content => "LoadModule ${_id} ${_path}\n",
-          require => [
-            Package['httpd'],
-            Exec["mkdir ${mod_dir}"],
-          ],
-          before  => File[$mod_dir],
-          notify  => Class['apache::service'],
-        }
+    if versioncmp($apache_version, '2.4') >= 0 {
+      file { "${mod_dir}/${mpm}.load":
+        ensure  => file,
+        path    => "${mod_dir}/${mpm}.load",
+        content => "LoadModule ${_id} ${_path}\n",
+        require => [
+          Package['httpd'],
+          Exec["mkdir ${mod_dir}"],
+        ],
+        before  => File[$mod_dir],
+        notify  => Class['apache::service'],
       }
     }
+  }
 
   case $::osfamily {
     'debian': {
-      file { "${::apache::mod_enable_dir}/${mpm}.conf":
+      file { "${apache::mod_enable_dir}/${mpm}.conf":
         ensure  => link,
-        target  => "${::apache::mod_dir}/${mpm}.conf",
-        require => Exec["mkdir ${::apache::mod_enable_dir}"],
-        before  => File[$::apache::mod_enable_dir],
+        target  => "${apache::mod_dir}/${mpm}.conf",
+        require => Exec["mkdir ${apache::mod_enable_dir}"],
+        before  => File[$apache::mod_enable_dir],
         notify  => Class['apache::service'],
       }
 
       if versioncmp($apache_version, '2.4') >= 0 {
-        file { "${::apache::mod_enable_dir}/${mpm}.load":
+        file { "${apache::mod_enable_dir}/${mpm}.load":
           ensure  => link,
-          target  => "${::apache::mod_dir}/${mpm}.load",
-          require => Exec["mkdir ${::apache::mod_enable_dir}"],
-          before  => File[$::apache::mod_enable_dir],
+          target  => "${apache::mod_dir}/${mpm}.load",
+          require => Exec["mkdir ${apache::mod_enable_dir}"],
+          before  => File[$apache::mod_enable_dir],
           notify  => Class['apache::service'],
         }
 
@@ -79,12 +79,11 @@
           ensure => present,
           before => [
             Class['apache::service'],
-            File[$::apache::mod_enable_dir],
+            File[$apache::mod_enable_dir],
           ],
         }
       }
 
-
       if $mpm == 'itk' {
         if ( ( $::operatingsystem == 'Ubuntu' ) or ( ($::operatingsystem == 'Debian') and ( versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) ) {
           include apache::mpm::disable_mpm_event
@@ -95,7 +94,7 @@
           ensure => present,
           before => [
             Class['apache::service'],
-            File[$::apache::mod_enable_dir],
+            File[$apache::mod_enable_dir],
           ],
         }
       }
@@ -113,11 +112,10 @@
           include apache::mpm::disable_mpm_prefork
         }
       }
-
     }
 
     'freebsd': {
-      class { '::apache::package':
+      class { 'apache::package':
         mpm_module => $mpm,
       }
     }
@@ -128,20 +126,20 @@
       # so we don't fail
     }
     'Suse': {
-      file { "${::apache::mod_enable_dir}/${mpm}.conf":
+      file { "${apache::mod_enable_dir}/${mpm}.conf":
         ensure  => link,
-        target  => "${::apache::mod_dir}/${mpm}.conf",
-        require => Exec["mkdir ${::apache::mod_enable_dir}"],
-        before  => File[$::apache::mod_enable_dir],
+        target  => "${apache::mod_dir}/${mpm}.conf",
+        require => Exec["mkdir ${apache::mod_enable_dir}"],
+        before  => File[$apache::mod_enable_dir],
         notify  => Class['apache::service'],
       }
 
       if versioncmp($apache_version, '2.4') >= 0 {
-        file { "${::apache::mod_enable_dir}/${mpm}.load":
+        file { "${apache::mod_enable_dir}/${mpm}.load":
           ensure  => link,
-          target  => "${::apache::mod_dir}/${mpm}.load",
-          require => Exec["mkdir ${::apache::mod_enable_dir}"],
-          before  => File[$::apache::mod_enable_dir],
+          target  => "${apache::mod_dir}/${mpm}.load",
+          require => Exec["mkdir ${apache::mod_enable_dir}"],
+          before  => File[$apache::mod_enable_dir],
           notify  => Class['apache::service'],
         }
 
diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
index bb2acd23fc..8c47576a79 100644
--- a/manifests/mpm/disable_mpm_event.pp
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -16,5 +16,4 @@
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
-
 }
diff --git a/manifests/mpm/disable_mpm_prefork.pp b/manifests/mpm/disable_mpm_prefork.pp
index d7ff8aade6..ea67edbdb5 100644
--- a/manifests/mpm/disable_mpm_prefork.pp
+++ b/manifests/mpm/disable_mpm_prefork.pp
@@ -4,5 +4,4 @@
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
-
 }
diff --git a/manifests/mpm/disable_mpm_worker.pp b/manifests/mpm/disable_mpm_worker.pp
index 414e7f58dc..4156d8438b 100644
--- a/manifests/mpm/disable_mpm_worker.pp
+++ b/manifests/mpm/disable_mpm_worker.pp
@@ -4,5 +4,4 @@
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
-
 }
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index 9701a1ac98..246df53dd8 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -9,7 +9,7 @@
 
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
-    target  => $::apache::ports_file,
+    target  => $apache::ports_file,
     content => template('apache/namevirtualhost.erb'),
   }
 }
diff --git a/manifests/package.pp b/manifests/package.pp
index 46bd98d2ce..684995ea3c 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -4,9 +4,8 @@
 # @api private
 class apache::package (
   $ensure     = 'present',
-  $mpm_module = $::apache::params::mpm_module,
+  $mpm_module = $apache::params::mpm_module,
 ) inherits ::apache::params {
-
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
@@ -35,7 +34,7 @@
 
   package { 'httpd':
     ensure => $ensure,
-    name   => $::apache::apache_name,
+    name   => $apache::apache_name,
     notify => Class['Apache::Service'],
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 4aed7c04a1..a1ebd4bcdc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -40,14 +40,14 @@
   # no client certs should be trusted for auth by default.
   $ssl_certs_dir          = undef
 
-  if ($::apache::version::scl_httpd_version) {
-    if $::apache::version::scl_php_version == undef {
+  if ($apache::version::scl_httpd_version) {
+    if $apache::version::scl_php_version == undef {
       fail('If you define apache::version::scl_httpd_version, you also need to specify apache::version::scl_php_version')
     }
-    $_scl_httpd_version_nodot = regsubst($::apache::version::scl_httpd_version, '\.', '')
+    $_scl_httpd_version_nodot = regsubst($apache::version::scl_httpd_version, '\.', '')
     $_scl_httpd_name = "httpd${_scl_httpd_version_nodot}"
 
-    $_scl_php_version_no_dot = regsubst($::apache::version::scl_php_version, '\.', '')
+    $_scl_php_version_no_dot = regsubst($apache::version::scl_php_version, '\.', '')
     $user                 = 'apache'
     $group                = 'apache'
     $root_group           = 'root'
@@ -58,7 +58,7 @@
     $server_root          = "${httpd_root}/etc/httpd"
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
-    $mod_dir              = $::apache::version::distrelease ? {
+    $mod_dir              = $apache::version::distrelease ? {
       '7'     => "${httpd_dir}/conf.modules.d",
       default => "${httpd_dir}/conf.d",
     }
@@ -85,11 +85,11 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
-    $php_version          = $::apache::version::scl_php_version
+    $php_version          = $apache::version::scl_php_version
     $mod_packages         = {
       'authnz_ldap' => "${_scl_httpd_name}-mod_ldap",
       'ldap' => "${_scl_httpd_name}-mod_ldap",
-      "php${::apache::version::scl_php_version}" => "rh-php${_scl_php_version_no_dot}-php",
+      "php${apache::version::scl_php_version}" => "rh-php${_scl_php_version_no_dot}-php",
       'ssl'                   => "${_scl_httpd_name}-mod_ssl",
     }
     $mod_libs             = {
@@ -104,11 +104,11 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = "${httpd_root}/var/www/html"
-    $alias_icons_path     = $::apache::version::distrelease ? {
+    $alias_icons_path     = $apache::version::distrelease ? {
       '7'     => "${httpd_root}/usr/share/httpd/icons",
       default => '/var/www/icons',
     }
-    $error_documents_path = $::apache::version::distrelease ? {
+    $error_documents_path = $apache::version::distrelease ? {
       '7'     => "${httpd_root}/usr/share/httpd/error",
       default => '/var/www/error'
     }
@@ -169,7 +169,7 @@
       # Amazon Linux 2 uses the /conf.modules.d/ dir
       $mod_dir            = "${httpd_dir}/conf.modules.d"
     } else {
-      $mod_dir              = $::apache::version::distrelease ? {
+      $mod_dir              = $apache::version::distrelease ? {
         '7'     => "${httpd_dir}/conf.modules.d",
         '8'     => "${httpd_dir}/conf.modules.d",
         default => "${httpd_dir}/conf.d",
@@ -197,10 +197,10 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
-    $php_version = $::apache::version::distrelease ? {
-        '8'     => '7', # RedHat8
-        default => '5', # RedHat5, RedHat6, RedHat7
-      }
+    $php_version = $apache::version::distrelease ? {
+      '8'     => '7', # RedHat8
+      default => '5', # RedHat5, RedHat6, RedHat7
+    }
     $mod_packages         = {
       # NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
       'auth_cas'              => 'mod_auth_cas',
@@ -208,13 +208,13 @@
       'auth_gssapi'           => 'mod_auth_gssapi',
       'auth_mellon'           => 'mod_auth_mellon',
       'auth_openidc'          => 'mod_auth_openidc',
-      'authnz_ldap'           => $::apache::version::distrelease ? {
+      'authnz_ldap'           => $apache::version::distrelease ? {
         '7'     => 'mod_ldap',
         '8'     => 'mod_ldap',
         default => 'mod_authz_ldap',
       },
       'authnz_pam'            => 'mod_authnz_pam',
-      'fastcgi'               => $::apache::version::distrelease ? {
+      'fastcgi'               => $apache::version::distrelease ? {
         '5'     => 'mod_fastcgi',
         '6'     => 'mod_fastcgi',
         default => undef,
@@ -222,7 +222,7 @@
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',
-      'ldap'                  => $::apache::version::distrelease ? {
+      'ldap'                  => $apache::version::distrelease ? {
         '5'     => undef,
         '6'     => undef,
         default => 'mod_ldap',
@@ -235,7 +235,7 @@
       # https://www.phusionpassenger.com/library/install/apache/install/oss/el7/
       'passenger'             => 'mod_passenger',
       'perl'                  => 'mod_perl',
-      'php5'                  => $::apache::version::distrelease ? {
+      'php5'                  => $apache::version::distrelease ? {
         '5'     => 'php53',
         default => 'php',
       },
@@ -248,7 +248,7 @@
       # See http://wiki.aaf.edu.au/tech-info/sp-install-guide
       'shibboleth'            => 'shibboleth',
       'ssl'                   => 'mod_ssl',
-      'wsgi'                  => $::apache::version::distrelease ? {
+      'wsgi'                  => $apache::version::distrelease ? {
         '8'     => 'python3-mod_wsgi', # RedHat8
         default => 'mod_wsgi',         # RedHat5, RedHat6, RedHat7
       },
@@ -260,7 +260,7 @@
     }
     $mod_libs             = {
       'nss' => 'libmodnss.so',
-      'wsgi'                  => $::apache::version::distrelease ? {
+      'wsgi'                  => $apache::version::distrelease ? {
         '8'     => 'mod_wsgi_python3.so',
         default => 'mod_wsgi.so',
       },
@@ -274,12 +274,12 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
-    $alias_icons_path     = $::apache::version::distrelease ? {
+    $alias_icons_path     = $apache::version::distrelease ? {
       '7'     => '/usr/share/httpd/icons',
       '8'     => '/usr/share/httpd/icons',
       default => '/var/www/icons',
     }
-    $error_documents_path = $::apache::version::distrelease ? {
+    $error_documents_path = $apache::version::distrelease ? {
       '7'     => '/usr/share/httpd/error',
       '8'     => '/usr/share/httpd/error',
       default => '/var/www/error'
@@ -723,7 +723,7 @@
     $lib_path            = '/usr/lib64/apache2' #changes for some modules based on mpm
     $mpm_module          = 'prefork'
 
-    if $::operatingsystemrelease < '15' {
+    if versioncmp($::operatingsystemrelease, '15') < 0 {
       $default_ssl_cert    = '/etc/apache2/ssl.crt/server.crt'
       $default_ssl_key     = '/etc/apache2/ssl.key/server.key'
     } else {
@@ -735,7 +735,7 @@
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
     $php_version         = '5'
-    if $::operatingsystemrelease < '11' or $::operatingsystemrelease >= '12' {
+    if versioncmp($::operatingsystemrelease, '11') < 0 or versioncmp($::operatingsystemrelease, '12') >= 0 {
       $mod_packages      = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
         'auth_gssapi' => 'apache2-mod_auth_gssapi',
@@ -745,7 +745,7 @@
         'python'      => 'apache2-mod_python',
         'security'    => 'apache2-mod_security2',
         'worker'      => 'apache2-worker',
-        }
+      }
     } else {
       $mod_packages        = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
@@ -800,7 +800,6 @@
     $passenger_ruby               = '/usr/bin/ruby'
     $passenger_default_ruby       = '/usr/bin/ruby'
     $wsgi_socket_prefix           = undef
-
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
@@ -809,7 +808,7 @@
     $verify_command = '/usr/sbin/apache2ctl -t'
   } elsif $::operatingsystem == 'FreeBSD' {
     $verify_command = '/usr/local/sbin/apachectl -t'
-  } elsif ($::apache::version::scl_httpd_version) {
+  } elsif ($apache::version::scl_httpd_version) {
     $verify_command = "/opt/rh/${_scl_httpd_name}/root/usr/sbin/apachectl -t"
   } else {
     $verify_command = '/usr/sbin/apachectl -t'
@@ -818,6 +817,6 @@
   if $::osfamily == 'RedHat' and versioncmp($::operatingsystemrelease, '8.0') >= 0 {
     $ssl_protocol = ['all'] # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
   } else {
-    $ssl_protocol = [ 'all', '-SSLv2', '-SSLv3' ]
+    $ssl_protocol = ['all', '-SSLv2', '-SSLv3']
   }
 }
diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
index e0e4a5ec58..5001090c4c 100644
--- a/manifests/peruser/multiplexer.pp
+++ b/manifests/peruser/multiplexer.pp
@@ -5,8 +5,8 @@
 #
 # @api private
 define apache::peruser::multiplexer (
-  $user = $::apache::user,
-  $group = $::apache::group,
+  $user = $apache::user,
+  $group = $apache::group,
   $file = undef,
 ) {
   if ! $file {
@@ -14,10 +14,10 @@
   } else {
     $filename = $file
   }
-  file { "${::apache::mod_dir}/peruser/multiplexers/${filename}":
+  file { "${apache::mod_dir}/peruser/multiplexers/${filename}":
     ensure  => file,
     content => "Multiplexer ${user} ${group}\n",
-    require => File["${::apache::mod_dir}/peruser/multiplexers"],
+    require => File["${apache::mod_dir}/peruser/multiplexers"],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/peruser/processor.pp b/manifests/peruser/processor.pp
index 798ee95791..57c26fa9f8 100644
--- a/manifests/peruser/processor.pp
+++ b/manifests/peruser/processor.pp
@@ -12,10 +12,10 @@
   } else {
     $filename = $file
   }
-  file { "${::apache::mod_dir}/peruser/processors/${filename}":
+  file { "${apache::mod_dir}/peruser/processors/${filename}":
     ensure  => file,
     content => "Processor ${user} ${group}\n",
-    require => File["${::apache::mod_dir}/peruser/processors"],
+    require => File["${apache::mod_dir}/peruser/processors"],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/php.pp b/manifests/php.pp
index 24758417ac..32999a9296 100644
--- a/manifests/php.pp
+++ b/manifests/php.pp
@@ -7,5 +7,5 @@
 # @api private
 class apache::php {
   warning('apache::php is deprecated; please use apache::mod::php')
-  include ::apache::mod::php
+  include apache::mod::php
 }
diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index 1ecdaa8f8d..9df41958c9 100644
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -7,5 +7,5 @@
 # @api private
 class apache::proxy {
   warning('apache::proxy is deprecated; please use apache::mod::proxy')
-  include ::apache::mod::proxy
+  include apache::mod::proxy
 }
diff --git a/manifests/python.pp b/manifests/python.pp
index 067ebc7867..586ed9e81e 100644
--- a/manifests/python.pp
+++ b/manifests/python.pp
@@ -14,5 +14,5 @@
 # @api private
 class apache::python {
   warning('apache::python is deprecated; please use apache::mod::python')
-  include ::apache::mod::python
+  include apache::mod::python
 }
diff --git a/manifests/security/rule_link.pp b/manifests/security/rule_link.pp
index d8b79e156a..a3f70b1095 100644
--- a/manifests/security/rule_link.pp
+++ b/manifests/security/rule_link.pp
@@ -3,20 +3,19 @@
 #
 # @api private
 define apache::security::rule_link () {
-
   $parts = split($title, '/')
   $filename = $parts[-1]
 
   $target = $title ? {
     /^\//   => $title,
-    default => "${::apache::params::modsec_crs_path}/${title}",
+    default => "${apache::params::modsec_crs_path}/${title}",
   }
 
   file { $filename:
     ensure  => 'link',
-    path    => "${::apache::mod::security::modsec_dir}/activated_rules/${filename}",
+    path    => "${apache::mod::security::modsec_dir}/activated_rules/${filename}",
     target  => $target ,
-    require => File["${::apache::mod::security::modsec_dir}/activated_rules"],
+    require => File["${apache::mod::security::modsec_dir}/activated_rules"],
     notify  => Class['apache::service'],
   }
 }
diff --git a/manifests/service.pp b/manifests/service.pp
index 703d95f842..7366e5fd31 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -3,13 +3,12 @@
 #
 # @api private
 class apache::service (
-  $service_name           = $::apache::params::service_name,
+  $service_name           = $apache::params::service_name,
   Boolean $service_enable = true,
   $service_ensure         = 'running',
   Boolean $service_manage = true,
   $service_restart        = undef
 ) {
-
   # The base class must be included first because parameter defaults depend on it
   if ! defined(Class['apache::params']) {
     fail('You must include the apache::params class before using any apache defined resources')
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index c444263828..a241a98a23 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -7,5 +7,5 @@
 # @api private
 class apache::ssl {
   warning('apache::ssl is deprecated; please use apache::mod::ssl')
-  include ::apache::mod::ssl
+  include apache::mod::ssl
 }
diff --git a/manifests/version.pp b/manifests/version.pp
index 9116fadba3..36e2a04043 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -2,7 +2,7 @@
 #   Try to automatically detect the version by OS
 #
 # @api private
-class apache::version(
+class apache::version (
   Optional[String] $scl_httpd_version = undef,
   Optional[String] $scl_php_version   = undef,
 ) {
@@ -42,7 +42,7 @@
       $default = '2.4'
     }
     'Suse': {
-      if ($::operatingsystem == 'SLES' and $::operatingsystemrelease >= '12') or ($::operatingsystem == 'OpenSuSE' and $::operatingsystemrelease >= '42') {
+      if ($::operatingsystem == 'SLES' and versioncmp($::operatingsystemrelease, '12') >= 0) or ($::operatingsystem == 'OpenSuSE' and versioncmp($::operatingsystemrelease, '42') >= 0) {
         $default = '2.4'
       } else {
         $default = '2.2'
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e2a86a3b8d..bf953433ff 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1691,7 +1691,7 @@
 #   client request exceeds that limit, the server will return an error response
 #   instead of servicing the request.
 #
-define apache::vhost(
+define apache::vhost (
   Variant[Boolean,String] $docroot,
   $manage_docroot                                                                   = true,
   $virtual_docroot                                                                  = false,
@@ -1700,20 +1700,20 @@
   Boolean $ip_based                                                                 = false,
   $add_listen                                                                       = true,
   $docroot_owner                                                                    = 'root',
-  $docroot_group                                                                    = $::apache::params::root_group,
+  $docroot_group                                                                    = $apache::params::root_group,
   $docroot_mode                                                                     = undef,
   Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                                   = [],
   Optional[Boolean] $protocols_honor_order                                          = undef,
   $serveradmin                                                                      = undef,
   Boolean $ssl                                                                      = false,
-  $ssl_cert                                                                         = $::apache::default_ssl_cert,
-  $ssl_key                                                                          = $::apache::default_ssl_key,
-  $ssl_chain                                                                        = $::apache::default_ssl_chain,
-  $ssl_ca                                                                           = $::apache::default_ssl_ca,
-  $ssl_crl_path                                                                     = $::apache::default_ssl_crl_path,
-  $ssl_crl                                                                          = $::apache::default_ssl_crl,
-  $ssl_crl_check                                                                    = $::apache::default_ssl_crl_check,
-  $ssl_certs_dir                                                                    = $::apache::params::ssl_certs_dir,
+  $ssl_cert                                                                         = $apache::default_ssl_cert,
+  $ssl_key                                                                          = $apache::default_ssl_key,
+  $ssl_chain                                                                        = $apache::default_ssl_chain,
+  $ssl_ca                                                                           = $apache::default_ssl_ca,
+  $ssl_crl_path                                                                     = $apache::default_ssl_crl_path,
+  $ssl_crl                                                                          = $apache::default_ssl_crl,
+  $ssl_crl_check                                                                    = $apache::default_ssl_crl_check,
+  $ssl_certs_dir                                                                    = $apache::params::ssl_certs_dir,
   $ssl_protocol                                                                     = undef,
   $ssl_cipher                                                                       = undef,
   $ssl_honorcipherorder                                                             = undef,
@@ -1742,7 +1742,7 @@
   $override                                                                         = ['None'],
   $directoryindex                                                                   = '',
   $vhost_name                                                                       = '*',
-  $logroot                                                                          = $::apache::logroot,
+  $logroot                                                                          = $apache::logroot,
   Enum['directory', 'absent'] $logroot_ensure                                       = 'directory',
   $logroot_mode                                                                     = undef,
   $logroot_owner                                                                    = undef,
@@ -1787,9 +1787,9 @@
   $proxy_pass                                                                       = undef,
   $proxy_pass_match                                                                 = undef,
   Boolean $proxy_requests                                                           = false,
-  $suphp_addhandler                                                                 = $::apache::params::suphp_addhandler,
-  Enum['on', 'off'] $suphp_engine                                                   = $::apache::params::suphp_engine,
-  $suphp_configpath                                                                 = $::apache::params::suphp_configpath,
+  $suphp_addhandler                                                                 = $apache::params::suphp_addhandler,
+  Enum['on', 'off'] $suphp_engine                                                   = $apache::params::suphp_engine,
+  $suphp_configpath                                                                 = $apache::params::suphp_configpath,
   $php_flags                                                                        = {},
   $php_values                                                                       = {},
   $php_admin_flags                                                                  = {},
@@ -1836,8 +1836,8 @@
   $fastcgi_dir                                                                      = undef,
   $fastcgi_idle_timeout                                                             = undef,
   $additional_includes                                                              = [],
-  $use_optional_includes                                                            = $::apache::use_optional_includes,
-  $apache_version                                                                   = $::apache::apache_version,
+  $use_optional_includes                                                            = $apache::use_optional_includes,
+  $apache_version                                                                   = $apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
   Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                           = undef,
 
@@ -1938,13 +1938,12 @@
   Boolean $auth_oidc                                                                = false,
   Optional[Apache::OIDCSettings] $oidc_settings                                     = undef,
 ) {
-
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
   }
 
-  $apache_name = $::apache::apache_name
+  $apache_name = $apache::apache_name
 
   if $rewrites {
     unless empty($rewrites) {
@@ -1970,33 +1969,33 @@
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
-    include ::apache::mod::ssl
+    include apache::mod::ssl
     # Required for the AddType lines.
-    include ::apache::mod::mime
+    include apache::mod::mime
   }
 
   if $auth_kerb and $ensure == 'present' {
-    include ::apache::mod::auth_kerb
+    include apache::mod::auth_kerb
   }
 
   if $auth_oidc and $ensure == 'present' {
-    include ::apache::mod::auth_openidc
+    include apache::mod::auth_openidc
   }
 
   if $virtual_docroot {
-    include ::apache::mod::vhost_alias
+    include apache::mod::vhost_alias
   }
 
   if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
-    include ::apache::mod::wsgi
+    include apache::mod::wsgi
   }
 
   if $suexec_user_group {
-    include ::apache::mod::suexec
+    include apache::mod::suexec
   }
 
   if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
-    include ::apache::mod::passenger
+    include apache::mod::passenger
   }
 
   # Configure the defaultness of a vhost
@@ -2047,11 +2046,11 @@
 
   if $access_log and !$access_logs {
     $_access_logs = [{
-      'file'        => $access_log_file,
-      'pipe'        => $access_log_pipe,
-      'syslog'      => $access_log_syslog,
-      'format'      => $access_log_format,
-      'env'         => $access_log_env_var
+        'file'        => $access_log_file,
+        'pipe'        => $access_log_pipe,
+        'syslog'      => $access_log_syslog,
+        'format'      => $access_log_format,
+        'env'         => $access_log_env_var
     }]
   } elsif $access_logs {
     $_access_logs = $access_logs
@@ -2099,7 +2098,6 @@
     $modsec_audit_log_destination = undef
   }
 
-
   if $ip {
     $_ip = any2array(enclose_ipv6($ip))
     if $port {
@@ -2143,48 +2141,48 @@
   # Load mod_rewrite if needed and not yet loaded
   if $rewrites or $rewrite_cond {
     if ! defined(Class['apache::mod::rewrite']) {
-      include ::apache::mod::rewrite
+      include apache::mod::rewrite
     }
   }
 
   # Load mod_alias if needed and not yet loaded
   if ($scriptalias or $scriptaliases != [])
-    or ($aliases and $aliases != [])
-    or ($redirect_source and $redirect_dest)
-    or ($redirectmatch_regexp or $redirectmatch_status or $redirectmatch_dest){
+  or ($aliases and $aliases != [])
+  or ($redirect_source and $redirect_dest)
+  or ($redirectmatch_regexp or $redirectmatch_status or $redirectmatch_dest) {
     if ! defined(Class['apache::mod::alias'])  and ($ensure == 'present') {
-      include ::apache::mod::alias
+      include apache::mod::alias
     }
   }
 
   # Load mod_proxy if needed and not yet loaded
   if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match) {
     if ! defined(Class['apache::mod::proxy']) {
-      include ::apache::mod::proxy
+      include apache::mod::proxy
     }
     if ! defined(Class['apache::mod::proxy_http']) {
-      include ::apache::mod::proxy_http
+      include apache::mod::proxy_http
     }
   }
 
   # Load mod_fastcgi if needed and not yet loaded
   if $fastcgi_server and $fastcgi_socket {
     if ! defined(Class['apache::mod::fastcgi']) {
-      include ::apache::mod::fastcgi
+      include apache::mod::fastcgi
     }
   }
 
   # Check if mod_headers is required to process $headers/$request_headers
   if $headers or $request_headers {
     if ! defined(Class['apache::mod::headers']) {
-      include ::apache::mod::headers
+      include apache::mod::headers
     }
   }
 
   # Check if mod_filter is required to process $filters
   if $filters {
     if ! defined(Class['apache::mod::filter']) {
-      include ::apache::mod::filter
+      include apache::mod::filter
     }
   }
 
@@ -2193,7 +2191,7 @@
   $use_env_mod = $setenv and ! empty($setenv)
   if ($use_env_mod) {
     if ! defined(Class['apache::mod::env']) {
-      include ::apache::mod::env
+      include apache::mod::env
     }
   }
   # Check if mod_setenvif is required and not yet loaded.
@@ -2202,7 +2200,7 @@
 
   if ($use_setenvif_mod) {
     if ! defined(Class['apache::mod::setenvif']) {
-      include ::apache::mod::setenvif
+      include apache::mod::setenvif
     }
   }
 
@@ -2229,7 +2227,7 @@
       }
     }
 
-    $_directories = [ merge($_directory, $_directory_version) ]
+    $_directories = [merge($_directory, $_directory_version)]
   } else {
     $_directories = undef
   }
@@ -2261,29 +2259,29 @@
 
   concat { "${priority_real}${filename}.conf":
     ensure  => $ensure,
-    path    => "${::apache::vhost_dir}/${priority_real}${filename}.conf",
+    path    => "${apache::vhost_dir}/${priority_real}${filename}.conf",
     owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => $::apache::file_mode,
+    group   => $apache::params::root_group,
+    mode    => $apache::file_mode,
     order   => 'numeric',
     require => Package['httpd'],
     notify  => Class['apache::service'],
   }
   # NOTE(pabelanger): This code is duplicated in ::apache::vhost::custom and
   # needs to be converted into something generic.
-  if $::apache::vhost_enable_dir {
-    $vhost_enable_dir = $::apache::vhost_enable_dir
+  if $apache::vhost_enable_dir {
+    $vhost_enable_dir = $apache::vhost_enable_dir
     $vhost_symlink_ensure = $ensure ? {
-      present => link,
+      'present' => link,
       default => $ensure,
     }
-    file{ "${priority_real}${filename}.conf symlink":
+    file { "${priority_real}${filename}.conf symlink":
       ensure  => $vhost_symlink_ensure,
       path    => "${vhost_enable_dir}/${priority_real}${filename}.conf",
-      target  => "${::apache::vhost_dir}/${priority_real}${filename}.conf",
+      target  => "${apache::vhost_dir}/${priority_real}${filename}.conf",
       owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => $::apache::file_mode,
+      group   => $apache::params::root_group,
+      mode    => $apache::file_mode,
       require => Concat["${priority_real}${filename}.conf"],
       notify  => Class['apache::service'],
     }
@@ -2537,7 +2535,7 @@
   # Template uses:
   # - $scriptaliases
   # - $scriptalias
-  if ( $scriptalias or $scriptaliases != [] ) {
+  if ( $scriptalias or $scriptaliases != []) {
     concat::fragment { "${name}-scriptalias":
       target  => "${priority_real}${filename}.conf",
       order   => 200,
@@ -2698,7 +2696,7 @@
   }
 
   if $h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef {
-    include ::apache::mod::http2
+    include apache::mod::http2
 
     concat::fragment { "${name}-http2":
       target  => "${priority_real}${filename}.conf",
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index 2dfa8a1d69..56e8b1258c 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -15,20 +15,20 @@
 # @param verify_config
 #   Specifies whether to validate the configuration file before notifying the Apache service.
 #
-define apache::vhost::custom(
+define apache::vhost::custom (
   $content,
   $ensure = 'present',
   $priority = '25',
   $verify_config = true,
 ) {
-  include ::apache
+  include apache
 
   ## Apache include does not always work with spaces in the filename
   $filename = regsubst($name, ' ', '_', 'G')
 
   ::apache::custom_config { $filename:
     ensure        => $ensure,
-    confdir       => $::apache::vhost_dir,
+    confdir       => $apache::vhost_dir,
     content       => $content,
     priority      => $priority,
     verify_config => $verify_config,
@@ -36,19 +36,19 @@
 
   # NOTE(pabelanger): This code is duplicated in ::apache::vhost and needs to
   # converted into something generic.
-  if $::apache::vhost_enable_dir {
+  if $apache::vhost_enable_dir {
     $vhost_symlink_ensure = $ensure ? {
-      present => link,
+      'present' => link,
       default => $ensure,
     }
 
     file { "${priority}-${filename}.conf symlink":
       ensure  => $vhost_symlink_ensure,
-      path    => "${::apache::vhost_enable_dir}/${priority}-${filename}.conf",
-      target  => "${::apache::vhost_dir}/${priority}-${filename}.conf",
+      path    => "${apache::vhost_enable_dir}/${priority}-${filename}.conf",
+      target  => "${apache::vhost_dir}/${priority}-${filename}.conf",
       owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => $::apache::file_mode,
+      group   => $apache::params::root_group,
+      mode    => $apache::file_mode,
       require => Apache::Custom_config[$filename],
       notify  => Class['apache::service'],
     }
diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
index e5b33184b0..37a3105b52 100644
--- a/manifests/vhost/fragment.pp
+++ b/manifests/vhost/fragment.pp
@@ -53,7 +53,7 @@
 #     content  => '# Foo',
 #   }
 #
-define apache::vhost::fragment(
+define apache::vhost::fragment (
   String[1] $vhost,
   $priority = undef,
   Optional[String] $content = undef,
diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp
index 8a37752b18..6d0fcf27f2 100644
--- a/manifests/vhosts.pp
+++ b/manifests/vhosts.pp
@@ -21,6 +21,6 @@
 class apache::vhosts (
   $vhosts = {},
 ) {
-  include ::apache
+  include apache
   create_resources('apache::vhost', $vhosts)
 }

From aff4ef613f005030f6e20149eb0a4e1b6e1fc0b3 Mon Sep 17 00:00:00 2001
From: Jorge Vallecillo <jorgevallecilloc@gmail.com>
Date: Fri, 25 Sep 2020 11:55:45 -0600
Subject: [PATCH 1695/2267] Fix typos including consecutive occurrences of
 'the'

---
 README.md             | 2 +-
 REFERENCE.md          | 2 +-
 manifests/mod/ldap.pp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e5f336c477..caece2ba32 100755
--- a/README.md
+++ b/README.md
@@ -851,7 +851,7 @@ The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are u
 
 #### RHEL/CentOS 6
 
-The [`apache::mod::passenger`][] class is not installing, because the the EL6 repository is missing compatible packages.
+The [`apache::mod::passenger`][] class is not installing, because the EL6 repository is missing compatible packages.
 
 #### RHEL/CentOS 7
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 19d0bdb655..0d344242c5 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -3157,7 +3157,7 @@ Default value: `undef`
 
 Data type: `Optional[String]`
 
-Sets the the certificate parameter of the global trusted Certificate Authority or global client certificates.
+Sets the certificate parameter of the global trusted Certificate Authority or global client certificates.
 
 Default value: 'CA_BASE64'
 
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 4994aafc11..4f0f701441 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -11,7 +11,7 @@
 #   Sets the file or database containing global trusted Certificate Authority or global client certificates.
 # 
 # @param ldap_trusted_global_cert_type
-#   Sets the the certificate parameter of the global trusted Certificate Authority or global client certificates.
+#   Sets the certificate parameter of the global trusted Certificate Authority or global client certificates.
 # 
 # @param ldap_shared_cache_size
 #   Size in bytes of the shared-memory cache

From 988b1cdef7dc155b0b7e4aa05b035c4bec9cb080 Mon Sep 17 00:00:00 2001
From: dleich <daniel.leich@gmail.com>
Date: Mon, 28 Sep 2020 10:52:00 -0400
Subject: [PATCH 1696/2267] Replace non-ascii characters with proper versions

---
 manifests/vhost.pp | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e2a86a3b8d..ebb15f09a5 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -596,7 +596,7 @@
 #   Sets the `Options` for the specified virtual host. For example:
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     options => ['Indexes','FollowSymLinks','MultiViews'],
 #   }
 #   ```
@@ -727,8 +727,8 @@
 #   Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerconcurrencyodel),
 #   to specify the I/O concurrency model that should be used for Ruby application processes. 
 #   Passenger supports two concurrency models:<br />
-#   * `process` – single-threaded, multi-processed I/O concurrency.
-#   * `thread` – multi-threaded, multi-processed I/O concurrency.
+#   * `process` - single-threaded, multi-processed I/O concurrency.
+#   * `thread` - multi-threaded, multi-processed I/O concurrency.
 # 
 # @param passenger_thread_count
 #   Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerthreadcount),
@@ -868,7 +868,7 @@
 #   configuration. Optionally, parameters can be added as an array.
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     proxy_pass => [
 #       { 'path' => '/a', 'url' => 'http://backend-a/' },
 #       { 'path' => '/b', 'url' => 'http://backend-b/' },
@@ -917,7 +917,7 @@
 #   length, and the items are order-dependent.
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     redirect_source => ['/images','/downloads'],
 #     redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
 #   }
@@ -927,7 +927,7 @@
 #   Specifies the status to append to the redirect.
 #   ``` puppet
 #     apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     redirect_status => ['temp','permanent'],
 #   }
 #   ```
@@ -938,7 +938,7 @@
 #   and redirectmatch_dest.
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     redirectmatch_status => ['404','404'],
 #     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
 #     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
@@ -951,7 +951,7 @@
 #   and redirectmatch_dest.
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     redirectmatch_status => ['404','404'],
 #     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
 #     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
@@ -964,7 +964,7 @@
 #   and redirectmatch_regexp.
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     redirectmatch_status => ['404','404'],
 #     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
 #     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
@@ -977,7 +977,7 @@
 #   and so on.
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     request_headers => [
 #       'append MirrorID "mirror 12"',
 #       'unset MirrorID',
@@ -992,7 +992,7 @@
 #   For example, you can specify that anyone trying to access index.html is served welcome.html
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
 #   }
 #   ```
@@ -1000,7 +1000,7 @@
 #   For instance, if you wanted to rewrite URLs only if the visitor is using IE
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     rewrites => [
 #       {
 #         comment      => 'redirect IE',
@@ -1014,7 +1014,7 @@
 #   only when the browser is Lynx or Mozilla (version 1 or 2)
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     rewrites => [
 #       {
 #         comment      => 'Lynx or Mozilla v1/2',
@@ -1027,7 +1027,7 @@
 #   Multiple rewrites and conditions are also possible
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     rewrites => [
 #       {
 #         comment      => 'Lynx or Mozilla v1/2',
@@ -1079,7 +1079,7 @@
 #   `rewrite_inherit` parameter to `true`:
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
-#     …
+#     ...
 #     rewrites => [
 #       <rules>,
 #     ],
@@ -1363,7 +1363,7 @@
 #   configuration.
 #   ``` puppet
 #   apache::vhost { 'monitor':
-#     …
+#     ...
 #     directories => [
 #       {
 #         path => '/path/to/directory',
@@ -1534,7 +1534,7 @@
 #   directive, which sets the certificate verification level for client authentication.
 #   ``` puppet
 #   apache::vhost { 'sample.example.net':
-#     …
+#     ...
 #     ssl_verify_client => 'optional',
 #   }
 #   ```
@@ -1545,7 +1545,7 @@
 #   verification. You must set `ssl_verify_client` for it to take effect.
 #   ``` puppet
 #   apache::vhost { 'sample.example.net':
-#     …
+#     ...
 #     ssl_verify_client => 'require',
 #     ssl_verify_depth => 1,
 #   }
@@ -1588,7 +1588,7 @@
 #   concatenation of the PEM-encoded certificate files in order of preference.
 #   ``` puppet
 #   apache::vhost { 'sample.example.net':
-#     …
+#     ...
 #     ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
 #   }
 #   ```
@@ -1615,14 +1615,14 @@
 #   A string:
 #   ``` puppet
 #   apache::vhost { 'sample.example.net':
-#     …
+#     ...
 #     ssl_options => '+ExportCertData',
 #   }
 #   ```
 #   An array:
 #   ``` puppet
 #   apache::vhost { 'sample.example.net':
-#     …
+#     ...
 #     ssl_options => ['+StrictRequire', '+ExportCertData'],
 #   }
 #   ```

From 6e5a52abd028d970ab9bd97733c18b34f563d7fe Mon Sep 17 00:00:00 2001
From: dleich <daniel.leich@gmail.com>
Date: Mon, 28 Sep 2020 11:00:52 -0400
Subject: [PATCH 1697/2267] additionally replace non-ascii chars in mod/jk

---
 manifests/mod/jk.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index bf068320b0..62a7f17b0e 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -170,8 +170,8 @@
 # @param mount_file_content
 #   Each directive has the format <URI> = <Worker name>. This maps as a hash of hashes, where the outer hash specifies workers, and 
 #   each inner hash contains two items:
-#   - uri_list—an array with URIs to be mapped to the worker
-#   - comment—an optional string with a comment for the worker. For example, the mount file below should be parameterized as Figure 2:
+#   - uri_list-an array with URIs to be mapped to the worker
+#   - comment-an optional string with a comment for the worker. For example, the mount file below should be parameterized as Figure 2:
 #
 #   Worker file:
 #   ```

From a0f685d4a94013720458672d89a9c1d2610071e1 Mon Sep 17 00:00:00 2001
From: creativefre <creativefre@gmail.com>
Date: Wed, 30 Sep 2020 15:12:03 +0200
Subject: [PATCH 1698/2267] make apache::mod::fcgid redhat 8 compatible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

before -> rhel 8 fcgid.load is loaded before unixd.load  which causes httpd to fail
---
 manifests/mod/fcgid.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 22f1d4d446..72399e058e 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -39,7 +39,7 @@
   $options = {},
 ) {
   include ::apache
-  if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7') or $::osfamily == 'FreeBSD' {
+  if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease >= '7') or $::osfamily == 'FreeBSD' {
     $loadfile_name = 'unixd_fcgid.load'
     $conf_name = 'unixd_fcgid.conf'
   } else {

From ac7560272debd0a32ca00902c37ac91514f80a4a Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Thu, 1 Oct 2020 17:37:33 +0000
Subject: [PATCH 1699/2267] Release version 5.6.0

---
 CHANGELOG.md  |   21 +-
 REFERENCE.md  | 2842 +++++++++++++++++++++++++++----------------------
 metadata.json |    2 +-
 3 files changed, 1581 insertions(+), 1284 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cc97fcbc7..64efb24bce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,22 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v5.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.5.0) (2020-07-01)
+## [v5.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.6.0) (2020-10-01)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.5.0...v5.6.0)
+
+### Added
+
+- Configure default shared lib path for mod\_wsgi on RHEL8 [\#2063](https://github.com/puppetlabs/puppetlabs-apache/pull/2063) ([nbarrientos](https://github.com/nbarrientos))
+- Various enhancements to apache::mod::passenger [\#2058](https://github.com/puppetlabs/puppetlabs-apache/pull/2058) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- make apache::mod::fcgid redhat 8 compatible [\#2071](https://github.com/puppetlabs/puppetlabs-apache/pull/2071) ([creativefre](https://github.com/creativefre))
+- pdksync - \(feat\) - Removal of inappropriate terminology [\#2062](https://github.com/puppetlabs/puppetlabs-apache/pull/2062) ([pmcmaw](https://github.com/pmcmaw))
+- Use python3-mod\_wsgi instead of mod\_wsgi on CentOS8 [\#2052](https://github.com/puppetlabs/puppetlabs-apache/pull/2052) ([kajinamit](https://github.com/kajinamit))
+
+## [v5.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.5.0) (2020-07-03)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.4.0...v5.5.0)
 
@@ -73,7 +88,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- \(FM-8662\) Correct  in manifests/mod/ssl.pp for SLES 11 [\#1963](https://github.com/puppetlabs/puppetlabs-apache/pull/1963) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- \(FM-8662\) Correction in manifests/mod/ssl.pp for SLES 11 [\#1963](https://github.com/puppetlabs/puppetlabs-apache/pull/1963) ([sanfrancrisko](https://github.com/sanfrancrisko))
 - always quote ExpiresDefault in vhost::directories [\#1958](https://github.com/puppetlabs/puppetlabs-apache/pull/1958) ([evgeni](https://github.com/evgeni))
 - MODULES-9904 Fix lbmethod module load order [\#1956](https://github.com/puppetlabs/puppetlabs-apache/pull/1956) ([optiz0r](https://github.com/optiz0r))
 - Add owner, group, file\_mode and show\_diff to apache::custom\_config [\#1942](https://github.com/puppetlabs/puppetlabs-apache/pull/1942) ([treydock](https://github.com/treydock))
@@ -149,6 +164,7 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 - \(Modules 8141/Modules 8379\) - Addition of support for SLES 15 [\#1862](https://github.com/puppetlabs/puppetlabs-apache/pull/1862) ([david22swan](https://github.com/david22swan))
+- SCL support for httpd and php7.1 [\#1822](https://github.com/puppetlabs/puppetlabs-apache/pull/1822) ([mmoll](https://github.com/mmoll))
 
 ### Fixed
 
@@ -183,7 +199,6 @@ All notable changes to this project will be documented in this file. The format
 
 - pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#1838](https://github.com/puppetlabs/puppetlabs-apache/pull/1838) ([pmcmaw](https://github.com/pmcmaw))
 - pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#1836](https://github.com/puppetlabs/puppetlabs-apache/pull/1836) ([tphoney](https://github.com/tphoney))
-- SCL support for httpd and php7.1 [\#1822](https://github.com/puppetlabs/puppetlabs-apache/pull/1822) ([mmoll](https://github.com/mmoll))
 
 ### Fixed
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 0d344242c5..4b14146619 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1,11 +1,12 @@
 # Reference
+
 <!-- DO NOT EDIT: This document was generated by Puppet Strings -->
 
 ## Table of Contents
 
-**Classes**
+### Classes
 
-_Public Classes_
+#### Public Classes
 
 * [`apache`](#apache): Guides the basic setup and installation of Apache on your system.
 * [`apache::dev`](#apachedev): Installs Apache development libraries.
@@ -16,6 +17,7 @@ _Public Classes_
 * [`apache::mod::auth_gssapi`](#apachemodauth_gssapi): Installs `mod_auth_gsappi`.
 * [`apache::mod::auth_kerb`](#apachemodauth_kerb): Installs `mod_auth_kerb`
 * [`apache::mod::auth_mellon`](#apachemodauth_mellon): Installs and configures `mod_auth_mellon`.
+* [`apache::mod::auth_openidc`](#apachemodauth_openidc): Installs and configures `mod_auth_openidc`.
 * [`apache::mod::authn_core`](#apachemodauthn_core): Installs `mod_authn_core`.
 * [`apache::mod::authn_dbd`](#apachemodauthn_dbd): Installs `mod_authn_dbd`.
 * [`apache::mod::authn_file`](#apachemodauthn_file): Installs `mod_authn_file`.
@@ -94,12 +96,12 @@ _Public Classes_
 * [`apache::mod::worker`](#apachemodworker): Installs and manages the MPM `worker`.
 * [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
 * [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
-* [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event): 
-* [`apache::mpm::disable_mpm_prefork`](#apachempmdisable_mpm_prefork): 
-* [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker): 
+* [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event)
+* [`apache::mpm::disable_mpm_prefork`](#apachempmdisable_mpm_prefork)
+* [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker)
 * [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
 
-_Private Classes_
+#### Private Classes
 
 * `apache::confd::no_accf`: Manages the `no-accf.conf` file.
 * `apache::default_confd_files`: Helper for setting up default conf.d files.
@@ -113,9 +115,9 @@ _Private Classes_
 * `apache::ssl`: This class installs Apache SSL capabilities
 * `apache::version`: Try to automatically detect the version by OS
 
-**Defined types**
+### Defined types
 
-_Public Defined types_
+#### Public Defined types
 
 * [`apache::balancer`](#apachebalancer): This type will create an apache balancer cluster file inside the conf.d
 directory.
@@ -133,7 +135,7 @@ outside of the defaults.
 * [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
 * [`apache::vhost::fragment`](#apachevhostfragment): Define a fragment within a vhost
 
-_Private Defined types_
+#### Private Defined types
 
 * `apache::default_mods::load`: Helper used by `apache::default_mods`
 * `apache::mpm`: Enables the use of Apache MPMs.
@@ -141,26 +143,30 @@ _Private Defined types_
 * `apache::peruser::processor`: Enables the `Peruser` module for FreeBSD only.
 * `apache::security::rule_link`: Links the activated_rules from `apache::mod::security` to the respective CRS rules on disk.
 
-**Resource types**
+### Resource types
 
 * [`a2mod`](#a2mod): Manage Apache 2 modules
 
-**Functions**
+### Functions
 
-* [`apache::apache_pw_hash`](#apacheapache_pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
+* [`apache::apache_pw_hash`](#apacheapache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
 * [`apache::bool2httpd`](#apachebool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
-* [`apache::validate_apache_log_level`](#apachevalidate_apache_log_level): Perform simple validation of a string against the list of known log levels.
-* [`apache_pw_hash`](#apache_pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
-* [`bool2httpd`](#bool2httpd): Transform a supposed boolean to On or Off. Pass all other values through.
-* [`validate_apache_log_level`](#validate_apache_log_level): Perform simple validation of a string against the list of known log levels.
+* [`apache::pw_hash`](#apachepw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
+* [`apache_pw_hash`](#apache_pw_hash): DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
+* [`bool2httpd`](#bool2httpd): DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
+
+### Data types
+
+* [`Apache::LogLevel`](#apacheloglevel): A string that conforms to the Apache `LogLevel` syntax.
+* [`Apache::OIDCSettings`](#apacheoidcsettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 
-**Tasks**
+### Tasks
 
 * [`init`](#init): Allows you to perform apache service functions
 
 ## Classes
 
-### apache
+### `apache`
 
 When this class is declared with the default options, Puppet:
 - Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
@@ -191,7 +197,7 @@ Sets the server default for the `AllowEncodedSlashes` declaration, which modifie
 responses to URLs containing '\' and '/' characters. If not specified, this parameter omits
 the declaration from the server's configuration and uses Apache's default setting of 'off'.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `apache_version`
 
@@ -201,7 +207,7 @@ Configures module template behavior, package names, and default Apache modules b
 the version of Apache to use. We do not recommend manually configuring this parameter
 without reason.
 
-Default value: $::apache::version::default
+Default value: `$::apache::version::default`
 
 ##### `conf_dir`
 
@@ -209,7 +215,7 @@ Data type: `Any`
 
 Sets the directory where the Apache server's main configuration file is located.
 
-Default value: $::apache::params::conf_dir
+Default value: `$::apache::params::conf_dir`
 
 ##### `conf_template`
 
@@ -219,7 +225,7 @@ Defines the template used for the main Apache configuration file. Modifying this
 parameter is potentially risky, as the apache module is designed to use a minimal
 configuration file customized by `conf.d` entries.
 
-Default value: $::apache::params::conf_template
+Default value: `$::apache::params::conf_template`
 
 ##### `confd_dir`
 
@@ -227,7 +233,7 @@ Data type: `Any`
 
 Sets the location of the Apache server's custom configuration directory.
 
-Default value: $::apache::params::confd_dir
+Default value: `$::apache::params::confd_dir`
 
 ##### `default_charset`
 
@@ -235,7 +241,7 @@ Data type: `Any`
 
 Used as the `AddDefaultCharset` directive in the main configuration file.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `default_confd_files`
 
@@ -246,7 +252,7 @@ in the directory defined by the `confd_dir` parameter. These configuration files
 correspond to what is typically installed with the Apache package on the server's
 operating system.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `default_mods`
 
@@ -262,7 +268,7 @@ the values of `apache_version` and `mpm_module` parameters. Because these lists
 modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
 If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `default_ssl_ca`
 
@@ -273,7 +279,7 @@ Although the default value results in a functioning Apache server, you **must**
 this parameter with your certificate authority information before deploying this server in
 a production environment.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `default_ssl_cert`
 
@@ -283,7 +289,7 @@ Sets the SSL encryption certificate location.<br />
 Although the default value results in a functioning Apache server, you **must** update this
 parameter with your certificate location before deploying this server in a production environment.
 
-Default value: $::apache::params::default_ssl_cert
+Default value: `$::apache::params::default_ssl_cert`
 
 ##### `default_ssl_chain`
 
@@ -293,7 +299,7 @@ Sets the default SSL chain location.<br />
 Although this default value results in a functioning Apache server, you **must** update
 this parameter with your SSL chain before deploying this server in a production environment.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `default_ssl_crl`
 
@@ -304,7 +310,7 @@ Although this default value results in a functioning Apache server, you **must**
 this parameter with the CRL file path before deploying this server in a production
 environment. You can use this parameter with or in place of the `default_ssl_crl_path`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `default_ssl_crl_path`
 
@@ -314,7 +320,7 @@ Sets the server's certificate revocation list path, which contains your CRLs.<br
 Although this default value results in a functioning Apache server, you **must** update
 this parameter with the CRL file path before deploying this server in a production environment.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `default_ssl_crl_check`
 
@@ -325,7 +331,7 @@ This parameter applies only to Apache 2.4 or higher and is ignored on older vers
 Although this default value results in a functioning Apache server, you **must** specify
 this parameter when using certificate revocation lists in a production environment.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `default_ssl_key`
 
@@ -336,7 +342,7 @@ Although the default values result in a functioning Apache server, you **must**
 this parameter with your SSL key's location before deploying this server in a production
 environment.
 
-Default value: $::apache::params::default_ssl_key
+Default value: `$::apache::params::default_ssl_key`
 
 ##### `default_ssl_vhost`
 
@@ -357,7 +363,7 @@ apache::vhost { 'default-ssl':
 ```
 **Note**: SSL virtual hosts only respond to HTTPS queries.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `default_type`
 
@@ -367,7 +373,7 @@ _Apache 2.2 only_. Sets the MIME `content-type` sent if the server cannot otherw
 determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and
 newer, and is only for backwards compatibility in configuration files.
 
-Default value: 'none'
+Default value: `'none'`
 
 ##### `default_vhost`
 
@@ -379,7 +385,7 @@ value to `false`.<br />
 > **Note**: Apache will not start without at least one virtual host. If you set this
 to `false` you must configure a virtual host elsewhere.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `dev_packages`
 
@@ -395,7 +401,7 @@ class { 'apache':
 }
 ```
 
-Default value: $::apache::params::dev_packages
+Default value: `$::apache::params::dev_packages`
 
 ##### `docroot`
 
@@ -403,7 +409,7 @@ Data type: `Any`
 
 Sets the default `DocumentRoot` location.
 
-Default value: $::apache::params::docroot
+Default value: `$::apache::params::docroot`
 
 ##### `error_documents`
 
@@ -411,7 +417,7 @@ Data type: `Any`
 
 Determines whether to enable [custom error documents](https://httpd.apache.org/docs/current/custom-error.html) on the Apache server.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `group`
 
@@ -426,7 +432,7 @@ created by another Puppet module, set the `manage_group` parameter's value to `f
 child processes to access resources. It does not change the user that owns the parent server
 process.
 
-Default value: $::apache::params::group
+Default value: `$::apache::params::group`
 
 ##### `httpd_dir`
 
@@ -436,7 +442,7 @@ Sets the Apache server's base configuration directory. This is useful for specia
 repackaged Apache server builds but might have unintended consequences when combined
 with the default distribution packages.
 
-Default value: $::apache::params::httpd_dir
+Default value: `$::apache::params::httpd_dir`
 
 ##### `http_protocol_options`
 
@@ -446,7 +452,7 @@ Specifies the strictness of HTTP protocol checks.<br />
 Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`,
 `RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`.
 
-Default value: $::apache::params::http_protocol_options
+Default value: `$::apache::params::http_protocol_options`
 
 ##### `keepalive`
 
@@ -456,7 +462,7 @@ Determines whether to enable persistent HTTP connections with the `KeepAlive` di
 If you set this to `On`, use the `keepalive_timeout` and `max_keepalive_requests` parameters
 to set relevant options.<br />
 
-Default value: $::apache::params::keepalive
+Default value: `$::apache::params::keepalive`
 
 ##### `keepalive_timeout`
 
@@ -466,7 +472,7 @@ Sets the `KeepAliveTimeout` directive, which determines the amount of time the A
 server waits for subsequent requests on a persistent HTTP connection. This parameter is
 only relevant if the `keepalive` parameter is enabled.
 
-Default value: $::apache::params::keepalive_timeout
+Default value: `$::apache::params::keepalive_timeout`
 
 ##### `max_keepalive_requests`
 
@@ -474,7 +480,7 @@ Data type: `Any`
 
 Limits the number of requests allowed per connection when the `keepalive` parameter is enabled.
 
-Default value: $::apache::params::max_keepalive_requests
+Default value: `$::apache::params::max_keepalive_requests`
 
 ##### `hostname_lookups`
 
@@ -484,7 +490,7 @@ This directive enables DNS lookups so that host names can be logged and passed t
 CGIs/SSIs in REMOTE_HOST.<br />
 > **Note**: If enabled, it impacts performance significantly.
 
-Default value: $::apache::params::hostname_lookups
+Default value: `$::apache::params::hostname_lookups`
 
 ##### `ldap_trusted_mode`
 
@@ -498,7 +504,7 @@ The following modes are supported:
 Not all LDAP toolkits support all the above modes. An error message will be logged at
 runtime if a mode is not supported, and the connection to the LDAP server will fail.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_verify_server_cert`
 
@@ -508,7 +514,7 @@ Specifies whether to force the verification of a server certificate when establi
 connection to the LDAP server.
 On|Off
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `lib_path`
 
@@ -517,16 +523,16 @@ Data type: `Any`
 Specifies the location whereApache module files are stored.<br />
 > **Note**: Do not configure this parameter manually without special reason.
 
-Default value: $::apache::params::lib_path
+Default value: `$::apache::params::lib_path`
 
 ##### `log_level`
 
-Data type: `Any`
+Data type: `Apache::LogLevel`
 
-Changes the error log's verbosity. Valid options are: `alert`, `crit`, `debug`, `emerg`, `error`,
-`info`, `notice` and `warn`.
+Configures the apache [LogLevel](https://httpd.apache.org/docs/current/mod/core.html#loglevel) directive
+which adjusts the verbosity of the messages recorded in the error logs.
 
-Default value: $::apache::params::log_level
+Default value: `$::apache::params::log_level`
 
 ##### `log_formats`
 
@@ -546,7 +552,7 @@ $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
 ```
 If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition.
 
-Default value: {}
+Default value: `{}`
 
 ##### `logroot`
 
@@ -554,7 +560,7 @@ Data type: `Any`
 
 Changes the directory of Apache log files for the virtual host.
 
-Default value: $::apache::params::logroot
+Default value: `$::apache::params::logroot`
 
 ##### `logroot_mode`
 
@@ -565,7 +571,7 @@ Overrides the default `logroot` directory's mode.<br />
 without being aware of the consequences. See the [Apache documentation](https://httpd.apache.org/docs/current/logs.html#security)
 for details.
 
-Default value: $::apache::params::logroot_mode
+Default value: `$::apache::params::logroot_mode`
 
 ##### `manage_group`
 
@@ -576,7 +582,7 @@ If you have a group created from another Puppet module that you want to use to r
 set this to `false`. Without this parameter, attempting to use a previously established
 group results in a duplicate resource error.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `supplementary_groups`
 
@@ -585,7 +591,7 @@ Data type: `Any`
 A list of groups to which the user belongs. These groups are in addition to the primary group.<br />
 Notice: This option only has an effect when `manage_user` is set to true.
 
-Default value: []
+Default value: `[]`
 
 ##### `manage_user`
 
@@ -596,7 +602,7 @@ This is for instances when you have a user, created from another Puppet module,
 to use to run Apache. Without this parameter, attempting to use a previously established
 user would result in a duplicate resource error.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `mod_dir`
 
@@ -604,7 +610,7 @@ Data type: `Any`
 
 Sets where Puppet places configuration files for your Apache modules.
 
-Default value: $::apache::params::mod_dir
+Default value: `$::apache::params::mod_dir`
 
 ##### `mod_libs`
 
@@ -620,7 +626,7 @@ class { 'apache':
 }
 ```
 
-Default value: $::apache::params::mod_libs
+Default value: `$::apache::params::mod_libs`
 
 ##### `mod_packages`
 
@@ -636,7 +642,7 @@ class { 'apache':
 }
 ```
 
-Default value: $::apache::params::mod_packages
+Default value: `$::apache::params::mod_packages`
 
 ##### `mpm_module`
 
@@ -651,7 +657,7 @@ You must set this to `false` to explicitly declare the following classes with cu
 - `apache::mod::prefork`
 - `apache::mod::worker`
 
-Default value: $::apache::params::mpm_module
+Default value: `$::apache::params::mpm_module`
 
 ##### `package_ensure`
 
@@ -660,7 +666,7 @@ Data type: `Any`
 Controls the `package` resource's `ensure` attribute. Valid values are: `absent`, `installed`
 (or equivalent `present`), or a version string.
 
-Default value: 'installed'
+Default value: `'installed'`
 
 ##### `pidfile`
 
@@ -668,7 +674,7 @@ Data type: `Any`
 
 Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm.
 
-Default value: $::apache::params::pidfile
+Default value: `$::apache::params::pidfile`
 
 ##### `ports_file`
 
@@ -676,7 +682,7 @@ Data type: `Any`
 
 Sets the path to the file containing Apache ports configuration.
 
-Default value: $::apache::params::ports_file
+Default value: `$::apache::params::ports_file`
 
 ##### `protocols`
 
@@ -685,7 +691,7 @@ Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols)
 directive, which lists available protocols for the server.
 
-Default value: []
+Default value: `[]`
 
 ##### `protocols_honor_order`
 
@@ -694,7 +700,7 @@ Data type: `Optional[Boolean]`
 Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
 directive which determines whether the order of Protocols sets precedence during negotiation.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `purge_configs`
 
@@ -705,7 +711,7 @@ Setting this to `false` is a stopgap measure to allow the apache module to coexi
 existing or unmanaged configurations. We recommend moving your configuration to resources
 within this module. For virtual host configurations, see `purge_vhost_dir`.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `purge_vhost_dir`
 
@@ -717,7 +723,7 @@ by Puppet.<br />
 Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to
 coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rewrite_lock`
 
@@ -727,7 +733,7 @@ Allows setting a custom location for a rewrite lock - considered best practice i
 a RewriteMap of type prg in the `rewrites` parameter of your virtual host. This parameter
 only applies to Apache version 2.2 or lower and is ignored on newer versions.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `sendfile`
 
@@ -736,7 +742,7 @@ Data type: `Enum['On', 'Off', 'on', 'off']`
 Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the
 `EnableSendfile` directive.
 
-Default value: 'On'
+Default value: `'On'`
 
 ##### `serveradmin`
 
@@ -744,7 +750,7 @@ Data type: `Any`
 
 Sets the Apache server administrator's contact information via Apache's `ServerAdmin` directive.
 
-Default value: 'root@localhost'
+Default value: `'root@localhost'`
 
 ##### `servername`
 
@@ -753,7 +759,7 @@ Data type: `Any`
 Sets the Apache server name via Apache's `ServerName` directive.
 Setting to `false` will not set ServerName at all.
 
-Default value: $::apache::params::servername
+Default value: `$::apache::params::servername`
 
 ##### `server_root`
 
@@ -761,7 +767,7 @@ Data type: `Any`
 
 Sets the Apache server's root directory via Apache's `ServerRoot` directive.
 
-Default value: $::apache::params::server_root
+Default value: `$::apache::params::server_root`
 
 ##### `server_signature`
 
@@ -771,7 +777,7 @@ Configures a trailing footer line to display at the bottom of server-generated d
 such as error documents and output of certain Apache modules, via Apache's `ServerSignature`
 directive. Valid values are: `On` or `Off`.
 
-Default value: 'On'
+Default value: `'On'`
 
 ##### `server_tokens`
 
@@ -780,7 +786,7 @@ Data type: `Any`
 Controls how much information Apache sends to the browser about itself and the operating
 system, via Apache's `ServerTokens` directive.
 
-Default value: 'Prod'
+Default value: `'Prod'`
 
 ##### `service_enable`
 
@@ -788,7 +794,7 @@ Data type: `Boolean`
 
 Determines whether Puppet enables the Apache HTTPD service when the system is booted.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `service_ensure`
 
@@ -800,7 +806,7 @@ The `false` or `stopped` values set the 'httpd' service resource's `ensure` para
 to `false`, which is useful when you want to let the service be managed by another
 application, such as Pacemaker.<br />
 
-Default value: 'running'
+Default value: `'running'`
 
 ##### `service_name`
 
@@ -808,7 +814,7 @@ Data type: `Any`
 
 Sets the name of the Apache service.
 
-Default value: $::apache::params::service_name
+Default value: `$::apache::params::service_name`
 
 ##### `service_manage`
 
@@ -816,7 +822,7 @@ Data type: `Boolean`
 
 Determines whether Puppet manages the HTTPD service's state.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `service_restart`
 
@@ -825,7 +831,7 @@ Data type: `Any`
 Determines whether Puppet should use a specific command to restart the HTTPD service.
 Values: a command to restart the Apache service.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `timeout`
 
@@ -834,7 +840,7 @@ Data type: `Any`
 Sets Apache's `TimeOut` directive, which defines the number of seconds Apache waits for
 certain events before failing a request.
 
-Default value: '60'
+Default value: `'60'`
 
 ##### `trace_enable`
 
@@ -842,7 +848,7 @@ Data type: `Any`
 
 Controls how Apache handles `TRACE` requests (per RFC 2616) via the `TraceEnable` directive.
 
-Default value: 'On'
+Default value: `'On'`
 
 ##### `use_canonical_name`
 
@@ -852,7 +858,7 @@ Controls Apache's `UseCanonicalName` directive which controls how Apache handles
 self-referential URLs. If not specified, this parameter omits the declaration from the
 server's configuration and uses Apache's default setting of 'off'.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `use_systemd`
 
@@ -861,7 +867,7 @@ Data type: `Any`
 Controls whether the systemd module should be installed on Centos 7 servers, this is
 especially useful if using custom-built RPMs.
 
-Default value: $::apache::params::use_systemd
+Default value: `$::apache::params::use_systemd`
 
 ##### `file_mode`
 
@@ -870,7 +876,7 @@ Data type: `Any`
 Sets the desired permissions mode for config files.
 Valid values are: a string, with permissions mode in symbolic or numeric notation.
 
-Default value: $::apache::params::file_mode
+Default value: `$::apache::params::file_mode`
 
 ##### `root_directory_options`
 
@@ -878,7 +884,7 @@ Data type: `Any`
 
 Array of the desired options for the `/` directory in httpd.conf.
 
-Default value: $::apache::params::root_directory_options
+Default value: `$::apache::params::root_directory_options`
 
 ##### `root_directory_secured`
 
@@ -890,7 +896,7 @@ allows access to all resources that are missing a more specific access policy. A
 used to allow access to these resources (for example, in a directory block using the
 `directories` parameter).
 
-Default value: `false`
+Default value: ``false``
 
 ##### `vhost_dir`
 
@@ -898,7 +904,7 @@ Data type: `Any`
 
 Changes your virtual host configuration files' location.
 
-Default value: $::apache::params::vhost_dir
+Default value: `$::apache::params::vhost_dir`
 
 ##### `vhost_include_pattern`
 
@@ -911,7 +917,7 @@ this directory (such as files created by version control systems or editor backu
 Some operating systems use a value of `*.conf`. By default, this module creates configuration
 files ending in `.conf`.
 
-Default value: $::apache::params::vhost_include_pattern
+Default value: `$::apache::params::vhost_include_pattern`
 
 ##### `user`
 
@@ -921,7 +927,7 @@ Changes the user that Apache uses to answer requests. Apache's parent process co
 to run as root, but child processes access resources as the user defined by this parameter.
 To prevent Puppet from managing the user, set the `manage_user` parameter to `false`.
 
-Default value: $::apache::params::user
+Default value: `$::apache::params::user`
 
 ##### `apache_name`
 
@@ -931,7 +937,7 @@ The name of the Apache package to install. If you are using a non-standard Apach
 you might need to override the default setting.<br />
 For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::scl_httpd_version`.
 
-Default value: $::apache::params::apache_name
+Default value: `$::apache::params::apache_name`
 
 ##### `error_log`
 
@@ -941,7 +947,7 @@ The name of the error log file for the main server instance. If the string start
 `/`, `|`, or `syslog`: the full path is set. Otherwise, the filename  is prefixed with
 `$logroot`.
 
-Default value: $::apache::params::error_log
+Default value: `$::apache::params::error_log`
 
 ##### `scriptalias`
 
@@ -949,7 +955,7 @@ Data type: `Any`
 
 Directory to use for global script alias
 
-Default value: $::apache::params::scriptalias
+Default value: `$::apache::params::scriptalias`
 
 ##### `access_log_file`
 
@@ -957,7 +963,7 @@ Data type: `Any`
 
 The name of the access log file for the main server instance.
 
-Default value: $::apache::params::access_log_file
+Default value: `$::apache::params::access_log_file`
 
 ##### `limitreqfields`
 
@@ -969,7 +975,7 @@ abnormal client request behavior, which may be useful for avoiding some forms of
 denial-of-service attacks. The value should be increased if normal clients see an error
 response from the server that indicates too many fields were sent in the request.
 
-Default value: '100'
+Default value: `'100'`
 
 ##### `limitreqfieldsize`
 
@@ -978,7 +984,7 @@ Data type: `Any`
 The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 be allowed within a request header.
 
-Default value: '8190'
+Default value: `'8190'`
 
 ##### `ip`
 
@@ -986,7 +992,7 @@ Data type: `Any`
 
 Specifies the ip address
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `purge_vdir`
 
@@ -995,7 +1001,7 @@ Data type: `Any`
 Removes all other Apache configs and virtual hosts.<br />
 > **Note**: This parameter is deprecated in favor of the `purge_config` parameter.<br />
 
-Default value: `false`
+Default value: ``false``
 
 ##### `conf_enabled`
 
@@ -1003,7 +1009,7 @@ Data type: `Any`
 
 Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.
 
-Default value: $::apache::params::conf_enabled
+Default value: `$::apache::params::conf_enabled`
 
 ##### `vhost_enable_dir`
 
@@ -1012,7 +1018,7 @@ Data type: `Any`
 Set's whether the vhost definitions will be stored in sites-availible and if
 they will be symlinked to and from sites-enabled.
 
-Default value: $::apache::params::vhost_enable_dir
+Default value: `$::apache::params::vhost_enable_dir`
 
 ##### `mod_enable_dir`
 
@@ -1020,7 +1026,7 @@ Data type: `Any`
 
 Set's whether the mods-enabled directory should be managed.
 
-Default value: $::apache::params::mod_enable_dir
+Default value: `$::apache::params::mod_enable_dir`
 
 ##### `ssl_file`
 
@@ -1029,7 +1035,7 @@ Data type: `Any`
 This parameter allows you to set an ssl.conf file to be managed in order to implement
 an SSL Certificate.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `file_e_tag`
 
@@ -1038,7 +1044,7 @@ Data type: `Any`
 Sets the server default for the `FileETag` declaration, which modifies the response header
 field for static files.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `use_optional_includes`
 
@@ -1047,7 +1053,7 @@ Data type: `Boolean`
 Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for
 `additional_includes` in Apache 2.4 or newer.
 
-Default value: $::apache::params::use_optional_includes
+Default value: `$::apache::params::use_optional_includes`
 
 ##### `mime_types_additional`
 
@@ -1055,9 +1061,9 @@ Data type: `Any`
 
 Specifies any idditional Internet media (mime) types that you wish to be configured.
 
-Default value: $::apache::params::mime_types_additional
+Default value: `$::apache::params::mime_types_additional`
 
-### apache::dev
+### `apache::dev`
 
 The libraries installed depends on the `dev_packages` parameter of the `apache::params`
 class, based on your operating system:
@@ -1066,21 +1072,21 @@ class, based on your operating system:
 - **Gentoo**: `undef`.
 - **Red Hat**: `httpd-devel`.
 
-### apache::mod::actions
+### `apache::mod::actions`
 
 Installs Apache mod_actions
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_actions.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_actions.html
+    * for additional documentation.
 
-### apache::mod::alias
+### `apache::mod::alias`
 
 Installs and configures `mod_alias`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_alias.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_alias.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1092,7 +1098,7 @@ Data type: `Any`
 
 The version of Apache, if not set will be retrieved from the init class.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `icons_options`
 
@@ -1101,7 +1107,7 @@ Data type: `Any`
 Disables directory listings for the icons directory, via Apache [Options](https://httpd.apache.org/docs/current/mod/core.html#options)
 directive.
 
-Default value: 'Indexes MultiViews'
+Default value: `'Indexes MultiViews'`
 
 ##### `icons_path`
 
@@ -1113,25 +1119,25 @@ Sets the local path for an /icons/ Alias. Default depends on operating system:
 - Gentoo: /var/www/icons
 - Red Hat: /var/www/icons, except on Apache 2.4, where it's /usr/share/httpd/icons
 
-Default value: $::apache::params::alias_icons_path
+Default value: `$::apache::params::alias_icons_path`
 
-### apache::mod::auth_basic
+### `apache::mod::auth_basic`
 
 Installs `mod_auth_basic`
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_auth_basic.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_auth_basic.html
+    * for additional documentation.
 
-### apache::mod::auth_cas
+### `apache::mod::auth_cas`
 
 Installs and configures `mod_auth_cas`.
 
 * **Note** The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
 
 * **See also**
-https://github.com/apereo/mod_auth_cas
-for additional documentation.
+  * https://github.com/apereo/mod_auth_cas
+    * for additional documentation.
 
 #### Parameters
 
@@ -1157,7 +1163,7 @@ Data type: `String`
 Sets the location where information on the current session should be stored. This should
 be writable by the web server only.
 
-Default value: $::apache::params::cas_cookie_path
+Default value: `$::apache::params::cas_cookie_path`
 
 ##### `cas_cookie_path_mode`
 
@@ -1165,7 +1171,7 @@ Data type: `Any`
 
 The mode of cas_cookie_path.
 
-Default value: '0750'
+Default value: `'0750'`
 
 ##### `cas_version`
 
@@ -1173,7 +1179,7 @@ Data type: `Any`
 
 The version of the CAS protocol to adhere to.
 
-Default value: 2
+Default value: `2`
 
 ##### `cas_debug`
 
@@ -1181,7 +1187,7 @@ Data type: `Any`
 
 Whether to enable or disable debug mode.
 
-Default value: 'Off'
+Default value: `'Off'`
 
 ##### `cas_validate_server`
 
@@ -1190,7 +1196,7 @@ Data type: `Any`
 Whether to validate the presented certificate. This has been deprecated and
 removed from Version 1.1-RC1 onward.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_validatedepth`
 
@@ -1202,7 +1208,7 @@ Data type: `Any`
 
 The URL to use when performing a proxy validation.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_root_proxied_as`
 
@@ -1211,7 +1217,7 @@ Data type: `Any`
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_cookie_entropy`
 
@@ -1220,7 +1226,7 @@ Data type: `Any`
 When creating a local session, this many random bytes are used to create a unique
 session identifier.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_timeout`
 
@@ -1228,7 +1234,7 @@ Data type: `Any`
 
 The hard limit, in seconds, for a mod_auth_cas session.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_idle_timeout`
 
@@ -1236,7 +1242,7 @@ Data type: `Any`
 
 The limit, in seconds, of how long a mod_auth_cas session can be idle.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_cache_clean_interval`
 
@@ -1244,7 +1250,7 @@ Data type: `Any`
 
 The minimum amount of time that must pass inbetween cache cleanings.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_cookie_domain`
 
@@ -1252,7 +1258,7 @@ Data type: `Any`
 
 The value for the 'Domain=' parameter in the Set-Cookie header.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_cookie_http_only`
 
@@ -1261,7 +1267,7 @@ Data type: `Any`
 Setting this flag prevents the mod_auth_cas cookies from being accessed by
 client side Javascript.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_authoritative`
 
@@ -1269,7 +1275,7 @@ Data type: `Any`
 
 Determines whether an optional authorization directive is authoritative and thus binding.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_validate_saml`
 
@@ -1277,7 +1283,7 @@ Data type: `Any`
 
 Parse response from CAS server for SAML.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_sso_enabled`
 
@@ -1285,7 +1291,7 @@ Data type: `Any`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_attribute_prefix`
 
@@ -1294,7 +1300,7 @@ Data type: `Any`
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_attribute_delimiter`
 
@@ -1302,7 +1308,7 @@ Data type: `Any`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_scrub_request_headers`
 
@@ -1310,7 +1316,7 @@ Data type: `Any`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `suppress_warning`
 
@@ -1318,7 +1324,7 @@ Data type: `Any`
 
 Suppress warning about being on RedHat (mod_auth_cas package is now available in epel-testing repo).
 
-Default value: `false`
+Default value: ``false``
 
 ##### `cas_validate_depth`
 
@@ -1326,7 +1332,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_certificate_path`
 
@@ -1334,31 +1340,31 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::auth_gssapi
+### `apache::mod::auth_gssapi`
 
 Installs `mod_auth_gsappi`.
 
 * **See also**
-https://github.com/modauthgssapi/mod_auth_gssapi
-for additional documentation.
+  * https://github.com/modauthgssapi/mod_auth_gssapi
+    * for additional documentation.
 
-### apache::mod::auth_kerb
+### `apache::mod::auth_kerb`
 
 Installs `mod_auth_kerb`
 
 * **See also**
-http://modauthkerb.sourceforge.net
-for additional documentation.
+  * http://modauthkerb.sourceforge.net
+    * for additional documentation.
 
-### apache::mod::auth_mellon
+### `apache::mod::auth_mellon`
 
 Installs and configures `mod_auth_mellon`.
 
 * **See also**
-https://github.com/Uninett/mod_auth_mellon
-for additional documentation.
+  * https://github.com/Uninett/mod_auth_mellon
+    * for additional documentation.
 
 #### Parameters
 
@@ -1370,7 +1376,7 @@ Data type: `Any`
 
 Maximum number of sessions which can be active at once.
 
-Default value: $::apache::params::mellon_cache_size
+Default value: `$::apache::params::mellon_cache_size`
 
 ##### `mellon_lock_file`
 
@@ -1378,7 +1384,7 @@ Data type: `Any`
 
 Full path to a file used for synchronizing access to the session data.
 
-Default value: $::apache::params::mellon_lock_file
+Default value: `$::apache::params::mellon_lock_file`
 
 ##### `mellon_post_directory`
 
@@ -1386,7 +1392,7 @@ Data type: `Any`
 
 Full path of a directory where POST requests are saved during authentication.
 
-Default value: $::apache::params::mellon_post_directory
+Default value: `$::apache::params::mellon_post_directory`
 
 ##### `mellon_cache_entry_size`
 
@@ -1394,7 +1400,7 @@ Data type: `Any`
 
 Maximum size for a single session entry in bytes.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mellon_post_ttl`
 
@@ -1402,7 +1408,7 @@ Data type: `Any`
 
 Delay in seconds before a saved POST request can be flushed.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mellon_post_size`
 
@@ -1410,7 +1416,7 @@ Data type: `Any`
 
 Maximum size for saved POST requests.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mellon_post_count`
 
@@ -1418,15 +1424,23 @@ Data type: `Any`
 
 Maximum amount of saved POST requests.
 
-Default value: `undef`
+Default value: ``undef``
+
+### `apache::mod::auth_openidc`
+
+Installs and configures `mod_auth_openidc`.
 
-### apache::mod::authn_core
+* **See also**
+  * https://github.com/zmartzone/mod_auth_openidc
+    * for additional documentation.
+
+### `apache::mod::authn_core`
 
 Installs `mod_authn_core`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_authn_core.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_authn_core.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1438,15 +1452,15 @@ Data type: `Any`
 
 The version of apache being run.
 
-Default value: $::apache::apache_version
+Default value: `$::apache::apache_version`
 
-### apache::mod::authn_dbd
+### `apache::mod::authn_dbd`
 
 Installs `mod_authn_dbd`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1464,7 +1478,7 @@ Data type: `Any`
 
 Selects an apr_dbd driver by name.
 
-Default value: 'mysql'
+Default value: `'mysql'`
 
 ##### `authn_dbd_query`
 
@@ -1472,7 +1486,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `authn_dbd_min`
 
@@ -1480,7 +1494,7 @@ Data type: `Any`
 
 Set the minimum number of connections per process.
 
-Default value: '4'
+Default value: `'4'`
 
 ##### `authn_dbd_max`
 
@@ -1488,7 +1502,7 @@ Data type: `Any`
 
 Set the maximum number of connections per process.
 
-Default value: '20'
+Default value: `'20'`
 
 ##### `authn_dbd_keep`
 
@@ -1496,7 +1510,7 @@ Data type: `Any`
 
 Set the maximum number of connections per process to be sustained.
 
-Default value: '8'
+Default value: `'8'`
 
 ##### `authn_dbd_exptime`
 
@@ -1505,7 +1519,7 @@ Data type: `Any`
 Set the time to keep idle connections alive when the number of
 connections specified in DBDKeep has been exceeded.
 
-Default value: '300'
+Default value: `'300'`
 
 ##### `authn_dbd_alias`
 
@@ -1513,23 +1527,25 @@ Data type: `Any`
 
 Sets an alias for `AuthnProvider.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::authn_file
+### `apache::mod::authn_file`
 
 Installs `mod_authn_file`.
 
 * **See also**
-https://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
-for additional documentation.
+  * https://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
+    * for additional documentation.
 
-### apache::mod::authnz_ldap
+### `apache::mod::authnz_ldap`
 
 Installs `mod_authnz_ldap`.
 
+* **Note** Unsupported platforms: RedHat: 6, 8; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
+
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1541,7 +1557,7 @@ Data type: `Boolean`
 
 Whether to force te verification of a server cert or not.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `package_name`
 
@@ -1549,23 +1565,23 @@ Data type: `Any`
 
 The name of the ldap package.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::authnz_pam
+### `apache::mod::authnz_pam`
 
 Installs `mod_authnz_pam`.
 
 * **See also**
-https://www.adelton.com/apache/mod_authnz_pam
-for additional documentation.
+  * https://www.adelton.com/apache/mod_authnz_pam
+    * for additional documentation.
 
-### apache::mod::authz_default
+### `apache::mod::authz_default`
 
 Installs and configures `mod_authz_default`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_authz_default.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_authz_default.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1577,48 +1593,48 @@ Data type: `Any`
 
 Version of Apache to install module on.
 
-Default value: $::apache::apache_version
+Default value: `$::apache::apache_version`
 
-### apache::mod::authz_user
+### `apache::mod::authz_user`
 
 Installs `mod_authz_user`
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_authz_user.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_authz_user.html
+    * for additional documentation.
 
-### apache::mod::autoindex
+### `apache::mod::autoindex`
 
 Installs `mod_autoindex`
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_autoindex.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_autoindex.html
+    * for additional documentation.
 
-### apache::mod::cache
+### `apache::mod::cache`
 
 Installs `mod_cache`
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_cache.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_cache.html
+    * for additional documentation.
 
-### apache::mod::cgi
+### `apache::mod::cgi`
 
 Installs `mod_cgi`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_cgi.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_cgi.html
+    * for additional documentation.
 
-### apache::mod::cgid
+### `apache::mod::cgid`
 
 Installs `mod_cgid`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_cgid.html
+  * https://httpd.apache.org/docs/current/mod/mod_cgid.html
 
-### apache::mod::cluster
+### `apache::mod::cluster`
 
 Installs `mod_cluster`.
 
@@ -1626,8 +1642,8 @@ Installs `mod_cluster`.
 Binaries can be found [here](https://modcluster.io/).
 
 * **See also**
-https://modcluster.io/
-for additional documentation.
+  * https://modcluster.io/
+    * for additional documentation.
 
 #### Examples
 
@@ -1676,7 +1692,7 @@ Data type: `Any`
 
 Whether MCPM should be enabled.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `port`
 
@@ -1684,7 +1700,7 @@ Data type: `Any`
 
 mod_cluster listen port.
 
-Default value: '6666'
+Default value: `'6666'`
 
 ##### `keep_alive_timeout`
 
@@ -1692,7 +1708,7 @@ Data type: `Any`
 
 Specifies how long Apache should wait for a request, in seconds.
 
-Default value: 60
+Default value: `60`
 
 ##### `manager_allowed_network`
 
@@ -1700,7 +1716,7 @@ Data type: `Any`
 
 Whether to allow the network to access the mod_cluster_manager.
 
-Default value: '127.0.0.1'
+Default value: `'127.0.0.1'`
 
 ##### `max_keep_alive_requests`
 
@@ -1708,7 +1724,7 @@ Data type: `Any`
 
 Maximum number of requests kept alive.
 
-Default value: 0
+Default value: `0`
 
 ##### `server_advertise`
 
@@ -1716,7 +1732,7 @@ Data type: `Any`
 
 Whether the server should advertise.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `advertise_frequency`
 
@@ -1724,15 +1740,15 @@ Data type: `Any`
 
 Sets the interval between advertise messages in seconds.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::data
+### `apache::mod::data`
 
 Installs and configures `mod_data`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_data.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_data.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1744,31 +1760,31 @@ Data type: `Any`
 
 Version of Apache to install module on.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::dav
+### `apache::mod::dav`
 
 Installs `mod_dav`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_dav.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_dav.html
+    * for additional documentation.
 
-### apache::mod::dav_fs
+### `apache::mod::dav_fs`
 
 Installs `mod_dav_fs`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_dav_fs.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_dav_fs.html
+    * for additional documentation.
 
-### apache::mod::dav_svn
+### `apache::mod::dav_svn`
 
 Installs and configures `mod_dav_svn`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_dav_svn.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_dav_svn.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1780,15 +1796,15 @@ Data type: `Any`
 
 Specifies whether to install Apache mod_authz_svn
 
-Default value: `false`
+Default value: ``false``
 
-### apache::mod::dbd
+### `apache::mod::dbd`
 
 Installs `mod_dbd`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_dbd.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_dbd.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1798,13 +1814,13 @@ The following parameters are available in the `apache::mod::dbd` class.
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-### apache::mod::deflate
+### `apache::mod::deflate`
 
 Installs and configures `mod_deflate`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_deflate.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_deflate.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1816,13 +1832,13 @@ Data type: `Any`
 
 An array of MIME types to be deflated. See https://www.iana.org/assignments/media-types/media-types.xhtml.
 
-Default value: [
+Default value: `[
     'text/html text/plain text/xml',
     'text/css',
     'application/x-javascript application/javascript application/ecmascript',
     'application/rss+xml',
     'application/json',
-  ]
+  ]`
 
 ##### `notes`
 
@@ -1830,19 +1846,19 @@ Data type: `Any`
 
 A Hash where the key represents the type and the value represents the note name.
 
-Default value: {
+Default value: `{
     'Input'  => 'instream',
     'Output' => 'outstream',
     'Ratio'  => 'ratio',
-  }
+  }`
 
-### apache::mod::dev
+### `apache::mod::dev`
 
 Installs `mod_dev`.
 
 * **Note** This module is deprecated. Please use `apache::dev`.
 
-### apache::mod::dir
+### `apache::mod::dir`
 
 Installs and configures `mod_dir`.
 
@@ -1850,8 +1866,8 @@ Installs and configures `mod_dir`.
 DirectoryIndex statements in a vhost configuration
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_dir.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_dir.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1867,7 +1883,7 @@ Data type: `Array[String]`
 
 Provides a string for the DirectoryIndex directive
 
-Default value: ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml']
+Default value: `['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml']`
 
 ##### `dir`
 
@@ -1875,17 +1891,17 @@ Data type: `Any`
 
 
 
-Default value: 'public_html'
+Default value: `'public_html'`
 
-### apache::mod::disk_cache
+### `apache::mod::disk_cache`
 
 Installs and configures `mod_disk_cache`.
 
 * **Note** Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
 
 * **See also**
-https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
-for additional documentation.
+  * https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1902,7 +1918,7 @@ Default depends on the Apache version and operating system:
 - Red Hat, Apache 2.4: /var/cache/httpd/proxy
 - Red Hat, Apache 2.2: /var/cache/mod_proxy
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cache_ignore_headers`
 
@@ -1910,15 +1926,15 @@ Data type: `Any`
 
 Specifies HTTP header(s) that should not be stored in the cache.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::dumpio
+### `apache::mod::dumpio`
 
 Installs and configures `mod_dumpio`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_dumpio.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_dumpio.html
+    * for additional documentation.
 
 #### Examples
 
@@ -1945,7 +1961,7 @@ Data type: `Enum['Off', 'On', 'off', 'on']`
 
 Dump all input data to the error log
 
-Default value: 'Off'
+Default value: `'Off'`
 
 ##### `dump_io_output`
 
@@ -1953,17 +1969,17 @@ Data type: `Enum['Off', 'On', 'off', 'on']`
 
 Dump all output data to the error log
 
-Default value: 'Off'
+Default value: `'Off'`
 
-### apache::mod::env
+### `apache::mod::env`
 
 Installs `mod_env`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_env.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_env.html
+    * for additional documentation.
 
-### apache::mod::event
+### `apache::mod::event`
 
 Installs and configures `mod_event`.
 
@@ -1971,8 +1987,8 @@ Installs and configures `mod_event`.
 apache::mod::worker on the same server.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/event.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/event.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -1985,7 +2001,7 @@ Data type: `Any`
 Sets the number of child server processes created at startup, via the module's `StartServers` directive. Setting this to `false`
 removes the parameter.
 
-Default value: '2'
+Default value: `'2'`
 
 ##### `maxclients`
 
@@ -1993,7 +2009,7 @@ Data type: `Any`
 
 Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
 
-Default value: '150'
+Default value: `'150'`
 
 ##### `maxrequestworkers`
 
@@ -2002,7 +2018,7 @@ Data type: `Any`
 Sets the maximum number of connections Apache can simultaneously process, via the module's `MaxRequestWorkers` directive. Setting
 these to `false` removes the parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `minsparethreads`
 
@@ -2010,7 +2026,7 @@ Data type: `Any`
 
 Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Setting this to `false` removes the parameters.
 
-Default value: '25'
+Default value: `'25'`
 
 ##### `maxsparethreads`
 
@@ -2018,7 +2034,7 @@ Data type: `Any`
 
 Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Setting this to `false` removes the parameters.
 
-Default value: '75'
+Default value: `'75'`
 
 ##### `threadsperchild`
 
@@ -2026,7 +2042,7 @@ Data type: `Any`
 
 Number of threads created by each child process.
 
-Default value: '25'
+Default value: `'25'`
 
 ##### `maxrequestsperchild`
 
@@ -2034,7 +2050,7 @@ Data type: `Any`
 
 Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
 
-Default value: '0'
+Default value: `'0'`
 
 ##### `maxconnectionsperchild`
 
@@ -2042,7 +2058,7 @@ Data type: `Any`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `serverlimit`
 
@@ -2050,7 +2066,7 @@ Data type: `Any`
 
 Limits the configurable number of processes via the `ServerLimit` directive. Setting this to `false` removes the parameter.
 
-Default value: '25'
+Default value: `'25'`
 
 ##### `apache_version`
 
@@ -2058,7 +2074,7 @@ Data type: `Any`
 
 Version of Apache to install module on.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `threadlimit`
 
@@ -2066,7 +2082,7 @@ Data type: `Any`
 
 Limits the number of event threads via the module's `ThreadLimit` directive. Setting this to `false` removes the parameter.
 
-Default value: '64'
+Default value: `'64'`
 
 ##### `listenbacklog`
 
@@ -2075,15 +2091,15 @@ Data type: `Any`
 Sets the maximum length of the pending connections queue via the module's `ListenBackLog` directive. Setting this to `false` removes
 the parameter.
 
-Default value: '511'
+Default value: `'511'`
 
-### apache::mod::expires
+### `apache::mod::expires`
 
 Installs and configures `mod_expires`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_expires.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_expires.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -2095,7 +2111,7 @@ Data type: `Any`
 
 Enables generation of Expires headers.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `expires_default`
 
@@ -2103,7 +2119,7 @@ Data type: `Any`
 
 Specifies the default algorithm for calculating expiration time using ExpiresByType syntax or interval syntax.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `expires_by_type`
 
@@ -2113,15 +2129,15 @@ Describes a set of [MIME content-types](https://www.iana.org/assignments/media-t
 times. This should be used as an array of Hashes, with each Hash's key a valid MIME content-type (i.e. 'text/json') and its
 value following valid interval syntax.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::ext_filter
+### `apache::mod::ext_filter`
 
 Installs and configures `mod_ext_filter`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_ext_filter.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_ext_filter.html
+    * for additional documentation.
 
 #### Examples
 
@@ -2146,17 +2162,17 @@ Data type: `Optional[Hash]`
 
 Hash of filter names and their parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::fastcgi
+### `apache::mod::fastcgi`
 
 Installs `mod_fastcgi`.
 
 * **See also**
-https://github.com/FastCGI-Archives/mod_fastcgi
-for additional documentation.
+  * https://github.com/FastCGI-Archives/mod_fastcgi
+    * for additional documentation.
 
-### apache::mod::fcgid
+### `apache::mod::fcgid`
 
 loaded first; Puppet will not automatically enable it if you set the fcgiwrapper parameter in apache::vhost.
   include apache::mod::fcgid
@@ -2172,8 +2188,8 @@ loaded first; Puppet will not automatically enable it if you set the fcgiwrapper
   }
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_fcgid.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_fcgid.html
+    * for additional documentation.
 
 #### Examples
 
@@ -2217,23 +2233,23 @@ Data type: `Any`
 
 
 
-Default value: {}
+Default value: `{}`
 
-### apache::mod::filter
+### `apache::mod::filter`
 
 Installs `mod_filter`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_filter.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_filter.html
+    * for additional documentation.
 
-### apache::mod::geoip
+### `apache::mod::geoip`
 
 Installs and configures `mod_geoip`.
 
 * **See also**
-https://dev.maxmind.com/geoip/legacy/mod_geoip2
-for additional documentation.
+  * https://dev.maxmind.com/geoip/legacy/mod_geoip2
+    * for additional documentation.
 
 #### Parameters
 
@@ -2245,7 +2261,7 @@ Data type: `Any`
 
 Toggles whether to enable geoip.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `db_file`
 
@@ -2253,7 +2269,7 @@ Data type: `Any`
 
 Path to database for GeoIP to use.
 
-Default value: '/usr/share/GeoIP/GeoIP.dat'
+Default value: `'/usr/share/GeoIP/GeoIP.dat'`
 
 ##### `flag`
 
@@ -2261,7 +2277,7 @@ Data type: `Any`
 
 Caching directive to use. Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'.
 
-Default value: 'Standard'
+Default value: `'Standard'`
 
 ##### `output`
 
@@ -2269,7 +2285,7 @@ Data type: `Any`
 
 Output variable locations. Values: 'All', 'Env', 'Request', 'Notes'.
 
-Default value: 'All'
+Default value: `'All'`
 
 ##### `enable_utf8`
 
@@ -2277,7 +2293,7 @@ Data type: `Any`
 
 Changes the output from ISO88591 (Latin1) to UTF8.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `scan_proxy_headers`
 
@@ -2285,7 +2301,7 @@ Data type: `Any`
 
 Enables the GeoIPScanProxyHeaders option.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `scan_proxy_headers_field`
 
@@ -2297,7 +2313,7 @@ Data type: `Any`
 
 Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `scan_proxy_header_field`
 
@@ -2305,15 +2321,15 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::headers
+### `apache::mod::headers`
 
 Installs and configures `mod_headers`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_headers.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_headers.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -2323,13 +2339,13 @@ The following parameters are available in the `apache::mod::headers` class.
 
 Version of Apache to install module on.
 
-### apache::mod::http2
+### `apache::mod::http2`
 
 Installs and configures `mod_http2`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_http2.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_http2.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -2341,7 +2357,7 @@ Data type: `Optional[Boolean]`
 
 Determine file handling in responses.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_direct`
 
@@ -2349,7 +2365,7 @@ Data type: `Optional[Boolean]`
 
 H2 Direct Protocol Switch.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_early_hints`
 
@@ -2357,7 +2373,7 @@ Data type: `Optional[Boolean]`
 
 Determine sending of 103 status codes.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_max_session_streams`
 
@@ -2365,7 +2381,7 @@ Data type: `Optional[Integer]`
 
 Sets maximum number of active streams per HTTP/2 session.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_max_worker_idle_seconds`
 
@@ -2373,7 +2389,7 @@ Data type: `Optional[Integer]`
 
 Sets maximum number of seconds h2 workers remain idle until shut down.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_max_workers`
 
@@ -2381,7 +2397,7 @@ Data type: `Optional[Integer]`
 
 Sets maximum number of worker threads to use per child process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_min_workers`
 
@@ -2389,7 +2405,7 @@ Data type: `Optional[Integer]`
 
 Sets minimal number of worker threads to use per child process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_modern_tls_only`
 
@@ -2397,7 +2413,7 @@ Data type: `Optional[Boolean]`
 
 Toggles the security checks on HTTP/2 connections in TLS mode
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_push`
 
@@ -2405,7 +2421,7 @@ Data type: `Optional[Boolean]`
 
 Toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_push_diary_size`
 
@@ -2413,7 +2429,7 @@ Data type: `Optional[Integer]`
 
 Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_priority`
 
@@ -2426,7 +2442,7 @@ Data type: `Array[String]`
 When added to a directory/location, HTTP/2 PUSHes will be attempted for all paths added
 via this directive
 
-Default value: []
+Default value: `[]`
 
 ##### `h2_serialize_headers`
 
@@ -2435,7 +2451,7 @@ Data type: `Optional[Boolean]`
 Toggles if HTTP/2 requests shall be serialized in HTTP/1.1 format for processing by httpd
 core or if received binary data shall be passed into the request_recs directly.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_stream_max_mem_size`
 
@@ -2443,7 +2459,7 @@ Data type: `Optional[Integer]`
 
 Sets the maximum number of outgoing data bytes buffered in memory for an active streams.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_tls_cool_down_secs`
 
@@ -2452,7 +2468,7 @@ Data type: `Optional[Integer]`
 Sets the number of seconds of idle time on a TLS connection before the TLS write size falls
 back to small (~1300 bytes) length.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_tls_warm_up_size`
 
@@ -2461,7 +2477,7 @@ Data type: `Optional[Integer]`
 Sets the number of bytes to be sent in small TLS records (~1300 bytes) until doing maximum
 sized writes (16k) on https: HTTP/2 connections.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_upgrade`
 
@@ -2469,7 +2485,7 @@ Data type: `Optional[Boolean]`
 
 Toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_window_size`
 
@@ -2478,7 +2494,7 @@ Data type: `Optional[Integer]`
 Sets the size of the window that is used for flow control from client to server and limits
 the amount of data the server has to buffer.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `apache_version`
 
@@ -2486,7 +2502,7 @@ Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_push_priority`
 
@@ -2494,23 +2510,23 @@ Data type: `Array[String]`
 
 
 
-Default value: []
+Default value: `[]`
 
-### apache::mod::include
+### `apache::mod::include`
 
 Installs `mod_include`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_include.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_include.html
+    * for additional documentation.
 
-### apache::mod::info
+### `apache::mod::info`
 
 Installs and configures `mod_info`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_info.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_info.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -2522,7 +2538,7 @@ Data type: `Any`
 
 Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 
-Default value: ['127.0.0.1','::1']
+Default value: `['127.0.0.1','::1']`
 
 ##### `apache_version`
 
@@ -2530,7 +2546,7 @@ Data type: `Any`
 
 Version of Apache to install module on.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `restrict_access`
 
@@ -2539,7 +2555,7 @@ Data type: `Any`
 Toggles whether to restrict access to info path. If `false`, the `allow_from` allowlist is ignored and any IP address can
 access the info path.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `info_path`
 
@@ -2547,23 +2563,25 @@ Data type: `Any`
 
 Path on server to file containing server configuration information.
 
-Default value: '/server-info'
+Default value: `'/server-info'`
 
-### apache::mod::intercept_form_submit
+### `apache::mod::intercept_form_submit`
 
 Installs `mod_intercept_form_submit`.
 
 * **See also**
-https://www.adelton.com/apache/mod_intercept_form_submit
-for additional documentation.
+  * https://www.adelton.com/apache/mod_intercept_form_submit
+    * for additional documentation.
 
-### apache::mod::itk
+### `apache::mod::itk`
 
 Installs MPM `mod_itk`.
 
+* **Note** Unsupported platforms: CentOS: 8; RedHat: 8; SLES: all
+
 * **See also**
-http://mpm-itk.sesse.net
-for additional documentation.
+  * http://mpm-itk.sesse.net
+    * for additional documentation.
 
 #### Parameters
 
@@ -2575,7 +2593,7 @@ Data type: `Any`
 
 Number of child server processes created on startup.
 
-Default value: '8'
+Default value: `'8'`
 
 ##### `minspareservers`
 
@@ -2583,7 +2601,7 @@ Data type: `Any`
 
 Minimum number of idle child server processes.
 
-Default value: '5'
+Default value: `'5'`
 
 ##### `maxspareservers`
 
@@ -2591,7 +2609,7 @@ Data type: `Any`
 
 Maximum number of idle child server processes.
 
-Default value: '20'
+Default value: `'20'`
 
 ##### `serverlimit`
 
@@ -2599,7 +2617,7 @@ Data type: `Any`
 
 Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache httpd process.
 
-Default value: '256'
+Default value: `'256'`
 
 ##### `maxclients`
 
@@ -2607,7 +2625,7 @@ Data type: `Any`
 
 Limit on the number of simultaneous requests that will be served.
 
-Default value: '256'
+Default value: `'256'`
 
 ##### `maxrequestsperchild`
 
@@ -2615,7 +2633,7 @@ Data type: `Any`
 
 Limit on the number of connections that an individual child server process will handle.
 
-Default value: '4000'
+Default value: `'4000'`
 
 ##### `enablecapabilities`
 
@@ -2625,7 +2643,7 @@ Drop most root capabilities in the parent process, and instead run as the user g
 capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor
 capabilities, such as NFS.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `apache_version`
 
@@ -2633,9 +2651,9 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::jk
+### `apache::mod::jk`
 
 Installs `mod_jk`.
 
@@ -2660,8 +2678,8 @@ $shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
 ```
 
 * **See also**
-https://tomcat.apache.org/connectors-doc/reference/apache.html
-for additional documentation.
+  * https://tomcat.apache.org/connectors-doc/reference/apache.html
+    * for additional documentation.
 
 #### Examples
 
@@ -2690,7 +2708,7 @@ Data type: `Optional[String]`
 
 IP for binding to mod_jk. Useful when the binding address is not the primary network interface IP.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `port`
 
@@ -2699,7 +2717,7 @@ Data type: `Integer`
 Port for binding to mod_jk. Useful when something else, like a reverse proxy or cache, is receiving requests at port 80, then
 needs to forward them to Apache at a different port.
 
-Default value: 80
+Default value: `80`
 
 ##### `add_listen`
 
@@ -2709,7 +2727,7 @@ Defines if a Listen directive according to parameters ip and port (see below), s
 and redirect to mod_jk. Useful when another Listen directive, like Listen *:<Port> or Listen <Port>, can conflict with the one
 necessary for mod_jk binding.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `workers_file`
 
@@ -2717,7 +2735,7 @@ Data type: `Any`
 
 The name of a worker file for the Tomcat servlet containers.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `worker_property`
 
@@ -2725,7 +2743,7 @@ Data type: `Any`
 
 Enables setting worker properties inside Apache configuration file.
 
-Default value: {}
+Default value: `{}`
 
 ##### `logroot`
 
@@ -2734,7 +2752,7 @@ Data type: `Any`
 The base directory for shm_file and log_file is determined by the logroot parameter. If unspecified, defaults to
 apache::params::logroot. The default logroot is sane enough therefore it is not recommended to override it.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `shm_file`
 
@@ -2742,7 +2760,7 @@ Data type: `Any`
 
 Shared memory file name.
 
-Default value: 'jk-runtime-status'
+Default value: `'jk-runtime-status'`
 
 ##### `shm_size`
 
@@ -2750,7 +2768,7 @@ Data type: `Any`
 
 Size of the shared memory file name.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mount_file`
 
@@ -2758,7 +2776,7 @@ Data type: `Any`
 
 File containing multiple mappings from a context to a Tomcat worker.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mount_file_reload`
 
@@ -2766,7 +2784,7 @@ Data type: `Any`
 
 This directive configures the reload check interval in seconds.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mount`
 
@@ -2774,7 +2792,7 @@ Data type: `Any`
 
 A mount point from a context to a Tomcat worker.
 
-Default value: {}
+Default value: `{}`
 
 ##### `un_mount`
 
@@ -2782,7 +2800,7 @@ Data type: `Any`
 
 An exclusion mount point from a context to a Tomcat worker.
 
-Default value: {}
+Default value: `{}`
 
 ##### `auto_alias`
 
@@ -2790,7 +2808,7 @@ Data type: `Any`
 
 Automatically Alias webapp context directories into the Apache document space
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mount_copy`
 
@@ -2799,7 +2817,7 @@ Data type: `Any`
 If this directive is set to "On" in some virtual server, the mounts from the global server will be copied
 to this virtual server, more precisely all mounts defined by JkMount or JkUnMount.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `worker_indicator`
 
@@ -2808,7 +2826,7 @@ Data type: `Any`
 Name of the Apache environment variable that can be used to set worker names in combination with SetHandler
 jakarta-servlet.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `watchdog_interval`
 
@@ -2816,7 +2834,7 @@ Data type: `Any`
 
 This directive configures the watchdog thread interval in seconds.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `log_file`
 
@@ -2824,7 +2842,7 @@ Data type: `Any`
 
 Full or server relative path to the mod_jk log file.
 
-Default value: 'mod_jk.log'
+Default value: `'mod_jk.log'`
 
 ##### `log_level`
 
@@ -2832,7 +2850,7 @@ Data type: `Any`
 
 The mod_jk log level, can be debug, info, warn error or trace.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `log_stamp_format`
 
@@ -2840,7 +2858,7 @@ Data type: `Any`
 
 The mod_jk date log format, using an extended strftime syntax.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `request_log_format`
 
@@ -2848,7 +2866,7 @@ Data type: `Any`
 
 Request log format string.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `extract_ssl`
 
@@ -2856,7 +2874,7 @@ Data type: `Any`
 
 Turns on SSL processing and information gathering by mod_jk.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `https_indicator`
 
@@ -2864,7 +2882,7 @@ Data type: `Any`
 
 Name of the Apache environment variable that contains SSL indication.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `sslprotocol_indicator`
 
@@ -2872,7 +2890,7 @@ Data type: `Any`
 
 Name of the Apache environment variable that contains the SSL protocol name.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `certs_indicator`
 
@@ -2880,7 +2898,7 @@ Data type: `Any`
 
 Name of the Apache environment variable that contains SSL client certificates.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cipher_indicator`
 
@@ -2888,7 +2906,7 @@ Data type: `Any`
 
 Name of the Apache environment variable that contains SSL client cipher.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `certchain_prefix`
 
@@ -2896,7 +2914,7 @@ Data type: `Any`
 
 Name of the Apache environment (prefix) that contains SSL client chain certificates.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `session_indicator`
 
@@ -2904,7 +2922,7 @@ Data type: `Any`
 
 Name of the Apache environment variable that contains SSL session.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `keysize_indicator`
 
@@ -2912,7 +2930,7 @@ Data type: `Any`
 
 Name of the Apache environment variable that contains SSL key size in use.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `local_name_indicator`
 
@@ -2920,7 +2938,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local name.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ignore_cl_indicator`
 
@@ -2928,7 +2946,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which forces to ignore an existing Content-Length request header.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `local_addr_indicator`
 
@@ -2936,7 +2954,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local IP address.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `local_port_indicator`
 
@@ -2944,7 +2962,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local port.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `remote_host_indicator`
 
@@ -2952,7 +2970,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) host name.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `remote_addr_indicator`
 
@@ -2960,7 +2978,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `remote_port_indicator`
 
@@ -2968,7 +2986,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `remote_user_indicator`
 
@@ -2976,7 +2994,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded user name.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `auth_type_indicator`
 
@@ -2984,7 +3002,7 @@ Data type: `Any`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded authentication type.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `options`
 
@@ -2992,7 +3010,7 @@ Data type: `Any`
 
 Set one of more options to configure the mod_jk module.
 
-Default value: []
+Default value: `[]`
 
 ##### `env_var`
 
@@ -3000,7 +3018,7 @@ Data type: `Any`
 
 Adds a name and an optional default value of environment variable that should be sent to servlet-engine as a request attribute.
 
-Default value: {}
+Default value: `{}`
 
 ##### `strip_session`
 
@@ -3009,7 +3027,7 @@ Data type: `Any`
 If this directive is set to On in some virtual server, the session IDs ;jsessionid=... will be removed for URLs which are not
 forwarded but instead are handled by the local server.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `workers_file_content`
 
@@ -3053,7 +3071,7 @@ $workers_file_content = {
 }
 ```
 
-Default value: {}
+Default value: `{}`
 
 ##### `mount_file_content`
 
@@ -3061,8 +3079,8 @@ Data type: `Any`
 
 Each directive has the format <URI> = <Worker name>. This maps as a hash of hashes, where the outer hash specifies workers, and
 each inner hash contains two items:
-- uri_list—an array with URIs to be mapped to the worker
-- comment—an optional string with a comment for the worker. For example, the mount file below should be parameterized as Figure 2:
+- uri_list-an array with URIs to be mapped to the worker
+- comment-an optional string with a comment for the worker. For example, the mount file below should be parameterized as Figure 2:
 
 Worker file:
 ```
@@ -3090,7 +3108,7 @@ $mount_file_content = {
 },
 ```
 
-Default value: {}
+Default value: `{}`
 
 ##### `location_list`
 
@@ -3098,15 +3116,17 @@ Data type: `Any`
 
 
 
-Default value: []
+Default value: `[]`
 
-### apache::mod::ldap
+### `apache::mod::ldap`
 
 Installs and configures `mod_ldap`.
 
+* **Note** Unsupported platforms: CentOS: 8; RedHat: 8
+
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_ldap.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_ldap.html
+    * for additional documentation.
 
 #### Examples
 
@@ -3135,7 +3155,7 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `package_name`
 
@@ -3143,7 +3163,7 @@ Data type: `Any`
 
 Specifies the custom package name.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_trusted_global_cert_file`
 
@@ -3151,7 +3171,7 @@ Data type: `Any`
 
 Sets the file or database containing global trusted Certificate Authority or global client certificates.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_trusted_global_cert_type`
 
@@ -3159,7 +3179,7 @@ Data type: `Optional[String]`
 
 Sets the certificate parameter of the global trusted Certificate Authority or global client certificates.
 
-Default value: 'CA_BASE64'
+Default value: `'CA_BASE64'`
 
 ##### `ldap_shared_cache_size`
 
@@ -3167,7 +3187,7 @@ Data type: `Any`
 
 Size in bytes of the shared-memory cache
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_cache_entries`
 
@@ -3175,7 +3195,7 @@ Data type: `Any`
 
 Maximum number of entries in the primary LDAP cache
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_cache_ttl`
 
@@ -3183,7 +3203,7 @@ Data type: `Any`
 
 Time that cached items remain valid (in seconds).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_opcache_entries`
 
@@ -3191,7 +3211,7 @@ Data type: `Any`
 
 Number of entries used to cache LDAP compare operations
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_opcache_ttl`
 
@@ -3199,7 +3219,7 @@ Data type: `Any`
 
 Time that entries in the operation cache remain valid (in seconds).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_trusted_mode`
 
@@ -3207,7 +3227,7 @@ Data type: `Any`
 
 Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ldap_path`
 
@@ -3215,31 +3235,31 @@ Data type: `String`
 
 The server location of the ldap status page.
 
-Default value: '/ldap-status'
+Default value: `'/ldap-status'`
 
-### apache::mod::lookup_identity
+### `apache::mod::lookup_identity`
 
 Installs `mod_lookup_identity`
 
 * **See also**
-https://www.adelton.com/apache/mod_lookup_identity
-for additional documentation.
+  * https://www.adelton.com/apache/mod_lookup_identity
+    * for additional documentation.
 
-### apache::mod::macro
+### `apache::mod::macro`
 
 Installs `mod_macro`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_macro.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_macro.html
+    * for additional documentation.
 
-### apache::mod::mime
+### `apache::mod::mime`
 
 Installs and configures `mod_mime`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_mime.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_mime.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -3251,7 +3271,7 @@ Data type: `Any`
 
 Name of the MIME package to be installed.
 
-Default value: $::apache::params::mime_support_package
+Default value: `$::apache::params::mime_support_package`
 
 ##### `mime_types_config`
 
@@ -3259,7 +3279,7 @@ Data type: `Any`
 
 The location of the mime.types file.
 
-Default value: $::apache::params::mime_types_config
+Default value: `$::apache::params::mime_types_config`
 
 ##### `mime_types_additional`
 
@@ -3267,15 +3287,15 @@ Data type: `Any`
 
 List of additional MIME types to include.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::mime_magic
+### `apache::mod::mime_magic`
 
 Installs and configures `mod_mime_magic`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_mime_magic.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_mime_magic.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -3287,15 +3307,15 @@ Data type: `Any`
 
 Enable MIME-type determination based on file contents using the specified magic file.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::negotiation
+### `apache::mod::negotiation`
 
 Installs and configures `mod_negotiation`.
 
 * **See also**
-[https://httpd.apache.org/docs/current/mod/mod_negotiation.html
-for additional documentation.
+  * [https://httpd.apache.org/docs/current/mod/mod_negotiation.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -3307,7 +3327,7 @@ Data type: `Variant[Array[String], String]`
 
 Action to take if a single acceptable document is not found.
 
-Default value: 'Prefer Fallback'
+Default value: `'Prefer Fallback'`
 
 ##### `language_priority`
 
@@ -3315,18 +3335,18 @@ Data type: `Variant[Array[String], String]`
 
 The precedence of language variants for cases where the client does not express a preference.
 
-Default value: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+Default value: `[ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
                         'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
                         'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
-                        'zh-TW' ]
+                        'zh-TW' ]`
 
-### apache::mod::nss
+### `apache::mod::nss`
 
 Installs and configures `mod_nss`.
 
 * **See also**
-https://pagure.io/mod_nss
-for additional documentation.
+  * https://pagure.io/mod_nss
+    * for additional documentation.
 
 #### Parameters
 
@@ -3338,7 +3358,7 @@ Data type: `Any`
 
 Path to `access.log`.
 
-Default value: "${::apache::params::logroot}/access.log"
+Default value: `"${::apache::params::logroot}/access.log"`
 
 ##### `error_Log`
 
@@ -3350,7 +3370,7 @@ Data type: `Any`
 
 Path to file containing token passwords used for NSSPassPhraseDialog.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `port`
 
@@ -3358,7 +3378,7 @@ Data type: `Any`
 
 Sets the SSL port that should be used by mod_nss.
 
-Default value: 8443
+Default value: `8443`
 
 ##### `error_log`
 
@@ -3366,9 +3386,9 @@ Data type: `Any`
 
 
 
-Default value: "${::apache::params::logroot}/error.log"
+Default value: `"${::apache::params::logroot}/error.log"`
 
-### apache::mod::pagespeed
+### `apache::mod::pagespeed`
 
 Although this apache module requires the mod-pagespeed-stable package, Puppet does not manage the software repositories required to
 automatically install the package. If you declare this class when the package is either not installed or not available to your
@@ -3379,8 +3399,8 @@ package manager, your Puppet run will fail.
 * **Note** Verify that your system is compatible with the latest Google Pagespeed requirements.
 
 * **See also**
-https://developers.google.com/speed/pagespeed/module/
-for additional documentation.
+  * https://developers.google.com/speed/pagespeed/module/
+    * for additional documentation.
 
 #### Parameters
 
@@ -3392,7 +3412,7 @@ Data type: `Any`
 
 
 
-Default value: 'on'
+Default value: `'on'`
 
 ##### `filter_xhtml`
 
@@ -3400,7 +3420,7 @@ Data type: `Any`
 
 
 
-Default value: `false`
+Default value: ``false``
 
 ##### `cache_path`
 
@@ -3408,7 +3428,7 @@ Data type: `Any`
 
 
 
-Default value: '/var/cache/mod_pagespeed/'
+Default value: `'/var/cache/mod_pagespeed/'`
 
 ##### `log_dir`
 
@@ -3416,7 +3436,7 @@ Data type: `Any`
 
 
 
-Default value: '/var/log/pagespeed'
+Default value: `'/var/log/pagespeed'`
 
 ##### `memcache_servers`
 
@@ -3424,7 +3444,7 @@ Data type: `Any`
 
 
 
-Default value: []
+Default value: `[]`
 
 ##### `rewrite_level`
 
@@ -3432,7 +3452,7 @@ Data type: `Any`
 
 
 
-Default value: 'CoreFilters'
+Default value: `'CoreFilters'`
 
 ##### `disable_filters`
 
@@ -3440,7 +3460,7 @@ Data type: `Any`
 
 
 
-Default value: []
+Default value: `[]`
 
 ##### `enable_filters`
 
@@ -3448,7 +3468,7 @@ Data type: `Any`
 
 
 
-Default value: []
+Default value: `[]`
 
 ##### `forbid_filters`
 
@@ -3456,7 +3476,7 @@ Data type: `Any`
 
 
 
-Default value: []
+Default value: `[]`
 
 ##### `rewrite_deadline_per_flush_ms`
 
@@ -3464,7 +3484,7 @@ Data type: `Any`
 
 
 
-Default value: 10
+Default value: `10`
 
 ##### `additional_domains`
 
@@ -3472,7 +3492,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `file_cache_size_kb`
 
@@ -3480,7 +3500,7 @@ Data type: `Any`
 
 
 
-Default value: 102400
+Default value: `102400`
 
 ##### `file_cache_clean_interval_ms`
 
@@ -3488,7 +3508,7 @@ Data type: `Any`
 
 
 
-Default value: 3600000
+Default value: `3600000`
 
 ##### `lru_cache_per_process`
 
@@ -3496,7 +3516,7 @@ Data type: `Any`
 
 
 
-Default value: 1024
+Default value: `1024`
 
 ##### `lru_cache_byte_limit`
 
@@ -3504,7 +3524,7 @@ Data type: `Any`
 
 
 
-Default value: 16384
+Default value: `16384`
 
 ##### `css_flatten_max_bytes`
 
@@ -3512,7 +3532,7 @@ Data type: `Any`
 
 
 
-Default value: 2048
+Default value: `2048`
 
 ##### `css_inline_max_bytes`
 
@@ -3520,7 +3540,7 @@ Data type: `Any`
 
 
 
-Default value: 2048
+Default value: `2048`
 
 ##### `css_image_inline_max_bytes`
 
@@ -3528,7 +3548,7 @@ Data type: `Any`
 
 
 
-Default value: 2048
+Default value: `2048`
 
 ##### `image_inline_max_bytes`
 
@@ -3536,7 +3556,7 @@ Data type: `Any`
 
 
 
-Default value: 2048
+Default value: `2048`
 
 ##### `js_inline_max_bytes`
 
@@ -3544,7 +3564,7 @@ Data type: `Any`
 
 
 
-Default value: 2048
+Default value: `2048`
 
 ##### `css_outline_min_bytes`
 
@@ -3552,7 +3572,7 @@ Data type: `Any`
 
 
 
-Default value: 3000
+Default value: `3000`
 
 ##### `js_outline_min_bytes`
 
@@ -3560,7 +3580,7 @@ Data type: `Any`
 
 
 
-Default value: 3000
+Default value: `3000`
 
 ##### `inode_limit`
 
@@ -3568,7 +3588,7 @@ Data type: `Any`
 
 
 
-Default value: 500000
+Default value: `500000`
 
 ##### `image_max_rewrites_at_once`
 
@@ -3576,7 +3596,7 @@ Data type: `Any`
 
 
 
-Default value: 8
+Default value: `8`
 
 ##### `num_rewrite_threads`
 
@@ -3584,7 +3604,7 @@ Data type: `Any`
 
 
 
-Default value: 4
+Default value: `4`
 
 ##### `num_expensive_rewrite_threads`
 
@@ -3592,7 +3612,7 @@ Data type: `Any`
 
 
 
-Default value: 4
+Default value: `4`
 
 ##### `collect_statistics`
 
@@ -3600,7 +3620,7 @@ Data type: `Any`
 
 
 
-Default value: 'on'
+Default value: `'on'`
 
 ##### `statistics_logging`
 
@@ -3608,7 +3628,7 @@ Data type: `Any`
 
 
 
-Default value: 'on'
+Default value: `'on'`
 
 ##### `allow_view_stats`
 
@@ -3616,7 +3636,7 @@ Data type: `Any`
 
 
 
-Default value: []
+Default value: `[]`
 
 ##### `allow_pagespeed_console`
 
@@ -3624,7 +3644,7 @@ Data type: `Any`
 
 
 
-Default value: []
+Default value: `[]`
 
 ##### `allow_pagespeed_message`
 
@@ -3632,7 +3652,7 @@ Data type: `Any`
 
 
 
-Default value: []
+Default value: `[]`
 
 ##### `message_buffer_size`
 
@@ -3640,7 +3660,7 @@ Data type: `Any`
 
 
 
-Default value: 100000
+Default value: `100000`
 
 ##### `additional_configuration`
 
@@ -3648,7 +3668,7 @@ Data type: `Any`
 
 
 
-Default value: {}
+Default value: `{}`
 
 ##### `apache_version`
 
@@ -3656,7 +3676,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `package_ensure`
 
@@ -3664,9 +3684,9 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::passenger
+### `apache::mod::passenger`
 
 The current set of server configurations settings were taken directly from the Passenger Reference. To enable deprecation warnings
 and removal failure messages, set the passenger_installed_version to the version number installed on the server.
@@ -3682,8 +3702,8 @@ Change Log:
 There are also several undocumented settings.
 
 * **See also**
-https://www.phusionpassenger.com/library/config/apache/reference/
-for additional documentation.
+  * https://www.phusionpassenger.com/docs/references/config_reference/apache/
+    * for additional documentation.
 
 #### Parameters
 
@@ -3695,7 +3715,7 @@ Data type: `Any`
 
 Toggle whether to manage yum repo if on a RedHat node.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `mod_id`
 
@@ -3703,7 +3723,7 @@ Data type: `Any`
 
 Specifies the package id.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mod_lib`
 
@@ -3711,7 +3731,7 @@ Data type: `Any`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mod_lib_path`
 
@@ -3720,7 +3740,7 @@ Data type: `Any`
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter overrides
 this value.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mod_package`
 
@@ -3728,7 +3748,7 @@ Data type: `Any`
 
 Name of the module package to install.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mod_package_ensure`
 
@@ -3736,7 +3756,7 @@ Data type: `Any`
 
 Determines whether Puppet ensures the module should be installed.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mod_path`
 
@@ -3744,7 +3764,7 @@ Data type: `Any`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_allow_encoded_slashes`
 
@@ -3752,7 +3772,7 @@ Data type: `Any`
 
 Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_app_env`
 
@@ -3765,7 +3785,7 @@ This option sets, for the current application, the value of the following enviro
 - NODE_ENV
 - PASSENGER_APP_ENV
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_app_group_name`
 
@@ -3773,7 +3793,7 @@ Data type: `Any`
 
 Sets the name of the application group that the current application should belong to.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_app_root`
 
@@ -3781,7 +3801,7 @@ Data type: `Any`
 
 Path to the application root which allows access independent from the DocumentRoot.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_app_type`
 
@@ -3790,7 +3810,7 @@ Data type: `Any`
 Specifies the type of the application. If you set this option, then you must also set PassengerAppRoot, otherwise Passenger will
 not properly recognize your application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_base_uri`
 
@@ -3798,7 +3818,7 @@ Data type: `Any`
 
 Used to specify that the given URI is an distinct application that should be served by Passenger.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_buffer_response`
 
@@ -3806,7 +3826,7 @@ Data type: `Any`
 
 Toggle whether application-generated responses are buffered by Apache. Buffering will happen in memory.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_buffer_upload`
 
@@ -3814,7 +3834,7 @@ Data type: `Any`
 
 Toggle whether HTTP client request bodies are buffered before they are sent to the application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_concurrency_model`
 
@@ -3822,7 +3842,7 @@ Data type: `Any`
 
 Specifies the I/O concurrency model that should be used for Ruby application processes.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_conf_file`
 
@@ -3830,7 +3850,7 @@ Data type: `Any`
 
 
 
-Default value: $::apache::params::passenger_conf_file
+Default value: `$::apache::params::passenger_conf_file`
 
 ##### `passenger_conf_package_file`
 
@@ -3838,7 +3858,7 @@ Data type: `Any`
 
 
 
-Default value: $::apache::params::passenger_conf_package_file
+Default value: `$::apache::params::passenger_conf_package_file`
 
 ##### `passenger_data_buffer_dir`
 
@@ -3846,7 +3866,7 @@ Data type: `Any`
 
 Specifies the directory in which to store data buffers.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_debug_log_file`
 
@@ -3854,7 +3874,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_debugger`
 
@@ -3862,7 +3882,7 @@ Data type: `Any`
 
 Turns support for Ruby application debugging on or off.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_default_group`
 
@@ -3870,7 +3890,7 @@ Data type: `Any`
 
 Allows you to specify the group that applications must run as, if user switching fails or is disabled.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_default_ruby`
 
@@ -3878,7 +3898,7 @@ Data type: `Any`
 
 File path to desired ruby interpreter to use by default.
 
-Default value: $::apache::params::passenger_default_ruby
+Default value: `$::apache::params::passenger_default_ruby`
 
 ##### `passenger_default_user`
 
@@ -3886,7 +3906,7 @@ Data type: `Any`
 
 Allows you to specify the user that applications must run as, if user switching fails or is disabled.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_disable_security_update_check`
 
@@ -3895,7 +3915,7 @@ Data type: `Any`
 Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
 security updates that might be available.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_enabled`
 
@@ -3903,7 +3923,7 @@ Data type: `Any`
 
 Toggles whether Passenger should be enabled for that particular context.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_error_override`
 
@@ -3911,7 +3931,7 @@ Data type: `Any`
 
 Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_file_descriptor_log_file`
 
@@ -3919,7 +3939,7 @@ Data type: `Any`
 
 Log file descriptor debug tracing messages to the given file.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_fly_with`
 
@@ -3928,7 +3948,7 @@ Data type: `Any`
 Enables the Flying Passenger mode, and configures Apache to connect to the Flying Passenger daemon that's listening on the
 given socket filename.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_force_max_concurrent_requests_per_process`
 
@@ -3936,7 +3956,7 @@ Data type: `Any`
 
 Use this option to tell Passenger how many concurrent requests the application can handle per process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_friendly_error_pages`
 
@@ -3944,7 +3964,7 @@ Data type: `Any`
 
 Toggles whether Passenger should display friendly error pages whenever an application fails to start.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_group`
 
@@ -3953,7 +3973,7 @@ Data type: `Any`
 Allows you to override that behavior and explicitly set a group to run the web application as, regardless of the ownership of the
 startup file.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_high_performance`
 
@@ -3962,7 +3982,7 @@ Data type: `Any`
 Toggles whether to enable PassengerHighPerformance which will make Passenger will be a little faster, in return for reduced
 compatibility with other Apache modules.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_installed_version`
 
@@ -3970,7 +3990,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_instance_registry_dir`
 
@@ -3978,7 +3998,7 @@ Data type: `Any`
 
 Specifies the directory that Passenger should use for registering its current instance.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_load_shell_envvars`
 
@@ -3986,7 +4006,7 @@ Data type: `Any`
 
 Enables or disables the loading of shell environment variables before spawning the application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_log_file`
 
@@ -3994,7 +4014,7 @@ Data type: `Optional[Stdlib::Absolutepath]`
 
 File path to log file. By default Passenger log messages are written to the Apache global error log.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_log_level`
 
@@ -4003,7 +4023,7 @@ Data type: `Any`
 Specifies how much information Passenger should log to its log file. A higher log level value means that more
 information will be logged.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_lve_min_uid`
 
@@ -4012,7 +4032,7 @@ Data type: `Any`
 When using Passenger on a LVE-enabled kernel, a security check (enter) is run for spawning application processes. This options
 tells the check to only allow processes with UIDs equal to, or higher than, the specified value.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_instances`
 
@@ -4020,7 +4040,7 @@ Data type: `Any`
 
 The maximum number of application processes that may simultaneously exist for an application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_instances_per_app`
 
@@ -4028,7 +4048,7 @@ Data type: `Any`
 
 The maximum number of application processes that may simultaneously exist for a single application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_pool_size`
 
@@ -4036,7 +4056,7 @@ Data type: `Any`
 
 The maximum number of application processes that may simultaneously exist.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_preloader_idle_time`
 
@@ -4044,7 +4064,7 @@ Data type: `Any`
 
 Set the preloader's idle timeout, in seconds. A value of 0 means that it should never idle timeout.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_request_queue_size`
 
@@ -4052,7 +4072,7 @@ Data type: `Any`
 
 Specifies the maximum size for the queue of all incoming requests.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_request_time`
 
@@ -4060,7 +4080,7 @@ Data type: `Any`
 
 The maximum amount of time, in seconds, that an application process may take to process a request.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_requests`
 
@@ -4068,7 +4088,7 @@ Data type: `Any`
 
 The maximum number of requests an application process will process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_memory_limit`
 
@@ -4076,7 +4096,7 @@ Data type: `Any`
 
 The maximum amount of memory that an application process may use, in megabytes.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_meteor_app_settings`
 
@@ -4084,7 +4104,7 @@ Data type: `Any`
 
 When using a Meteor application in non-bundled mode, use this option to specify a JSON file with settings for the application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_min_instances`
 
@@ -4092,7 +4112,7 @@ Data type: `Any`
 
 Specifies the minimum number of application processes that should exist for a given application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_nodejs`
 
@@ -4100,7 +4120,7 @@ Data type: `Any`
 
 Specifies the Node.js command to use for serving Node.js web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_pool_idle_time`
 
@@ -4108,7 +4128,7 @@ Data type: `Any`
 
 The maximum number of seconds that an application process may be idle.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_pre_start`
 
@@ -4116,7 +4136,7 @@ Data type: `Optional[Variant[String,Array[String]]]`
 
 URL of the web application you want to pre-start.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_python`
 
@@ -4124,7 +4144,7 @@ Data type: `Any`
 
 Specifies the Python interpreter to use for serving Python web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_resist_deployment_errors`
 
@@ -4132,7 +4152,7 @@ Data type: `Any`
 
 Enables or disables resistance against deployment errors.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_resolve_symlinks_in_document_root`
 
@@ -4141,7 +4161,7 @@ Data type: `Any`
 This option is no longer available in version 5.2.0. Switch to PassengerAppRoot if you are setting the application root via a
 document root containing symlinks.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_response_buffer_high_watermark`
 
@@ -4149,7 +4169,7 @@ Data type: `Any`
 
 Configures the maximum size of the real-time disk-backed response buffering system.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_restart_dir`
 
@@ -4157,7 +4177,7 @@ Data type: `Any`
 
 Path to directory containing restart.txt file. Can be either absolute or relative.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_rolling_restarts`
 
@@ -4165,7 +4185,7 @@ Data type: `Any`
 
 Enables or disables support for zero-downtime application restarts through restart.txt.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_root`
 
@@ -4173,7 +4193,7 @@ Data type: `Any`
 
 Refers to the location to the Passenger root directory, or to a location configuration file.
 
-Default value: $::apache::params::passenger_root
+Default value: `$::apache::params::passenger_root`
 
 ##### `passenger_ruby`
 
@@ -4181,7 +4201,7 @@ Data type: `Any`
 
 Specifies the Ruby interpreter to use for serving Ruby web applications.
 
-Default value: $::apache::params::passenger_ruby
+Default value: `$::apache::params::passenger_ruby`
 
 ##### `passenger_security_update_check_proxy`
 
@@ -4189,7 +4209,7 @@ Data type: `Any`
 
 Allows use of an intermediate proxy for the Passenger security update check.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_show_version_in_header`
 
@@ -4197,7 +4217,7 @@ Data type: `Any`
 
 Toggle whether Passenger will output its version number in the X-Powered-By header in all Passenger-served requests:
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_socket_backlog`
 
@@ -4205,7 +4225,7 @@ Data type: `Any`
 
 This option can be raised if Apache manages to overflow the backlog queue.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_spawn_method`
 
@@ -4213,7 +4233,7 @@ Data type: `Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']]`
 
 Controls whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_start_timeout`
 
@@ -4221,7 +4241,7 @@ Data type: `Any`
 
 Specifies a timeout for the startup of application processes.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_startup_file`
 
@@ -4229,7 +4249,7 @@ Data type: `Any`
 
 Specifies the startup file that Passenger should use when loading the application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_stat_throttle_rate`
 
@@ -4237,7 +4257,7 @@ Data type: `Any`
 
 Setting this option to a value of x means that certain filesystem checks will be performed at most once every x seconds.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_sticky_sessions`
 
@@ -4245,7 +4265,7 @@ Data type: `Any`
 
 Toggles whether all requests that a client sends will be routed to the same originating application process, whenever possible.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_sticky_sessions_cookie_name`
 
@@ -4253,7 +4273,7 @@ Data type: `Any`
 
 Sets the name of the sticky sessions cookie.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_thread_count`
 
@@ -4261,7 +4281,7 @@ Data type: `Any`
 
 Specifies the number of threads that Passenger should spawn per Ruby application process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_use_global_queue`
 
@@ -4269,7 +4289,7 @@ Data type: `Any`
 
 N/A.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_user`
 
@@ -4278,7 +4298,7 @@ Data type: `Any`
 Allows you to override that behavior and explicitly set a user to run the web application as, regardless of the ownership of the
 startup file.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_user_switching`
 
@@ -4286,7 +4306,7 @@ Data type: `Any`
 
 Toggles whether to attempt to enable user account sandboxing, also known as user switching.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rack_auto_detect`
 
@@ -4294,7 +4314,7 @@ Data type: `Any`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rack_autodetect`
 
@@ -4302,7 +4322,7 @@ Data type: `Any`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rack_base_uri`
 
@@ -4310,7 +4330,7 @@ Data type: `Any`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rack_env`
 
@@ -4318,7 +4338,7 @@ Data type: `Any`
 
 Alias for PassengerAppEnv.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_allow_mod_rewrite`
 
@@ -4326,7 +4346,7 @@ Data type: `Any`
 
 This option doesn't do anything anymore since version 4.0.0.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_app_spawner_idle_time`
 
@@ -4334,7 +4354,7 @@ Data type: `Any`
 
 This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_auto_detect`
 
@@ -4342,7 +4362,7 @@ Data type: `Any`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_autodetect`
 
@@ -4350,7 +4370,7 @@ Data type: `Any`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_base_uri`
 
@@ -4358,7 +4378,7 @@ Data type: `Any`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_default_user`
 
@@ -4366,7 +4386,7 @@ Data type: `Any`
 
 Deprecated in 3.0.0 in favor of PassengerDefaultUser
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_env`
 
@@ -4374,7 +4394,7 @@ Data type: `Any`
 
 Alias for PassengerAppEnv.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_framework_spawner_idle_time`
 
@@ -4383,7 +4403,7 @@ Data type: `Any`
 This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed
 altogether. You should use smart spawning instead.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_ruby`
 
@@ -4391,7 +4411,7 @@ Data type: `Any`
 
 Deprecated in 3.0.0 in favor of PassengerRuby.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_spawn_method`
 
@@ -4399,7 +4419,7 @@ Data type: `Any`
 
 Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rails_user_switching`
 
@@ -4407,7 +4427,7 @@ Data type: `Any`
 
 Deprecated in 3.0.0 in favor of PassengerUserSwitching.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_auto_detect`
 
@@ -4415,17 +4435,57 @@ Data type: `Any`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
+
+##### `passenger_anonymous_telemetry_proxy`
+
+Data type: `Optional[String]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_disable_anonymous_telemetry`
+
+Data type: `Optional[Boolean]`
+
+
 
-### apache::mod::perl
+Default value: ``undef``
+
+##### `passenger_disable_log_prefix`
+
+Data type: `Optional[Boolean ]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_spawn_dir`
+
+Data type: `Optional[String]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_sticky_sessions_cookie_attributes`
+
+Data type: `Optional[String]`
+
+
+
+Default value: ``undef``
+
+### `apache::mod::perl`
 
 Installs `mod_perl`.
 
 * **See also**
-https://perl.apache.org
-for additional documentation.
+  * https://perl.apache.org
+    * for additional documentation.
 
-### apache::mod::peruser
+### `apache::mod::peruser`
 
 Installs `mod_peruser`.
 
@@ -4441,7 +4501,7 @@ Data type: `Any`
 
 
 
-Default value: '2'
+Default value: `'2'`
 
 ##### `minprocessors`
 
@@ -4449,7 +4509,7 @@ Data type: `Any`
 
 
 
-Default value: '2'
+Default value: `'2'`
 
 ##### `maxprocessors`
 
@@ -4457,7 +4517,7 @@ Data type: `Any`
 
 
 
-Default value: '10'
+Default value: `'10'`
 
 ##### `maxclients`
 
@@ -4465,7 +4525,7 @@ Data type: `Any`
 
 
 
-Default value: '150'
+Default value: `'150'`
 
 ##### `maxrequestsperchild`
 
@@ -4473,7 +4533,7 @@ Data type: `Any`
 
 
 
-Default value: '1000'
+Default value: `'1000'`
 
 ##### `idletimeout`
 
@@ -4481,7 +4541,7 @@ Data type: `Any`
 
 
 
-Default value: '120'
+Default value: `'120'`
 
 ##### `expiretimeout`
 
@@ -4489,7 +4549,7 @@ Data type: `Any`
 
 
 
-Default value: '120'
+Default value: `'120'`
 
 ##### `keepalive`
 
@@ -4497,14 +4557,16 @@ Data type: `Any`
 
 
 
-Default value: 'Off'
+Default value: `'Off'`
 
-### apache::mod::php
+### `apache::mod::php`
 
 Installs `mod_php`.
 
 * **TODO** Add docs
 
+* **Note** Unsupported platforms: SLES: all
+
 #### Parameters
 
 The following parameters are available in the `apache::mod::php` class.
@@ -4515,7 +4577,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `package_ensure`
 
@@ -4523,7 +4585,7 @@ Data type: `Any`
 
 
 
-Default value: 'present'
+Default value: `'present'`
 
 ##### `path`
 
@@ -4531,7 +4593,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `extensions`
 
@@ -4539,7 +4601,7 @@ Data type: `Array`
 
 
 
-Default value: ['.php']
+Default value: `['.php']`
 
 ##### `content`
 
@@ -4547,7 +4609,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `template`
 
@@ -4555,7 +4617,7 @@ Data type: `Any`
 
 
 
-Default value: 'apache/mod/php.conf.erb'
+Default value: `'apache/mod/php.conf.erb'`
 
 ##### `source`
 
@@ -4563,7 +4625,7 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `root_group`
 
@@ -4571,7 +4633,7 @@ Data type: `Any`
 
 
 
-Default value: $::apache::params::root_group
+Default value: `$::apache::params::root_group`
 
 ##### `php_version`
 
@@ -4579,7 +4641,7 @@ Data type: `Any`
 
 
 
-Default value: $::apache::params::php_version
+Default value: `$::apache::params::php_version`
 
 ##### `libphp_prefix`
 
@@ -4587,15 +4649,15 @@ Data type: `Any`
 
 
 
-Default value: 'libphp'
+Default value: `'libphp'`
 
-### apache::mod::prefork
+### `apache::mod::prefork`
 
 Installs and configures MPM `prefork`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/prefork.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/prefork.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -4607,7 +4669,7 @@ Data type: `Any`
 
 Number of child server processes created at startup.
 
-Default value: '8'
+Default value: `'8'`
 
 ##### `minspareservers`
 
@@ -4615,7 +4677,7 @@ Data type: `Any`
 
 Minimum number of idle child server processes.
 
-Default value: '5'
+Default value: `'5'`
 
 ##### `maxspareservers`
 
@@ -4623,7 +4685,7 @@ Data type: `Any`
 
 Maximum number of idle child server processes.
 
-Default value: '20'
+Default value: `'20'`
 
 ##### `serverlimit`
 
@@ -4631,7 +4693,7 @@ Data type: `Any`
 
 Upper limit on configurable number of processes.
 
-Default value: '256'
+Default value: `'256'`
 
 ##### `maxclients`
 
@@ -4639,7 +4701,7 @@ Data type: `Any`
 
 Old alias for MaxRequestWorkers.
 
-Default value: '256'
+Default value: `'256'`
 
 ##### `maxrequestworkers`
 
@@ -4647,7 +4709,7 @@ Data type: `Any`
 
 Maximum number of connections that will be processed simultaneously.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `maxrequestsperchild`
 
@@ -4655,7 +4717,7 @@ Data type: `Any`
 
 Old alias for MaxConnectionsPerChild.
 
-Default value: '4000'
+Default value: `'4000'`
 
 ##### `maxconnectionsperchild`
 
@@ -4663,7 +4725,7 @@ Data type: `Any`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `apache_version`
 
@@ -4671,7 +4733,7 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `listenbacklog`
 
@@ -4679,15 +4741,15 @@ Data type: `Any`
 
 Maximum length of the queue of pending connections.
 
-Default value: '511'
+Default value: `'511'`
 
-### apache::mod::proxy
+### `apache::mod::proxy`
 
 Installs and configures `mod_proxy`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_proxy.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_proxy.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -4699,7 +4761,7 @@ Data type: `Any`
 
 Enables forward (standard) proxy requests.
 
-Default value: 'Off'
+Default value: `'Off'`
 
 ##### `allow_from`
 
@@ -4707,7 +4769,7 @@ Data type: `Any`
 
 List of IPs allowed to access proxy.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `apache_version`
 
@@ -4715,7 +4777,7 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `package_name`
 
@@ -4723,7 +4785,7 @@ Data type: `Any`
 
 Name of the proxy package to install.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_via`
 
@@ -4731,7 +4793,7 @@ Data type: `Any`
 
 Set local IP address for outgoing proxy connections.
 
-Default value: 'On'
+Default value: `'On'`
 
 ##### `proxy_timeout`
 
@@ -4739,23 +4801,31 @@ Data type: `Any`
 
 Network timeout for proxied requests.
 
-Default value: `undef`
+Default value: ``undef``
+
+##### `proxy_iobuffersize`
+
+Data type: `Any`
+
+Set the size of internal data throughput buffer
 
-### apache::mod::proxy_ajp
+Default value: ``undef``
+
+### `apache::mod::proxy_ajp`
 
 Installs `mod_proxy_ajp`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html
+    * for additional documentation.
 
-### apache::mod::proxy_balancer
+### `apache::mod::proxy_balancer`
 
 Installs and configures `mod_proxy_balancer`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -4767,7 +4837,7 @@ Data type: `Boolean`
 
 Toggle whether to enable balancer manager support.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `maanger_path`
 
@@ -4779,7 +4849,7 @@ Data type: `Array`
 
 List of IPs from which the balancer manager can be accessed.
 
-Default value: ['127.0.0.1','::1']
+Default value: `['127.0.0.1','::1']`
 
 ##### `apache_version`
 
@@ -4787,7 +4857,7 @@ Data type: `Any`
 
 Version of Apache to install module on.
 
-Default value: $::apache::apache_version
+Default value: `$::apache::apache_version`
 
 ##### `manager_path`
 
@@ -4795,15 +4865,15 @@ Data type: `Stdlib::Absolutepath`
 
 
 
-Default value: '/balancer-manager'
+Default value: `'/balancer-manager'`
 
-### apache::mod::proxy_connect
+### `apache::mod::proxy_connect`
 
 Installs `mod_proxy_connect`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -4815,47 +4885,47 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::proxy_fcgi
+### `apache::mod::proxy_fcgi`
 
 Installs `mod_proxy_fcgi`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html
+    * for additional documentation.
 
-### apache::mod::proxy_html
+### `apache::mod::proxy_html`
 
 Installs `mod_proxy_html`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_proxy_html.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_proxy_html.html
+    * for additional documentation.
 
-### apache::mod::proxy_http
+### `apache::mod::proxy_http`
 
 Installs `mod_proxy_http`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_proxy_http.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_proxy_http.html
+    * for additional documentation.
 
-### apache::mod::proxy_wstunnel
+### `apache::mod::proxy_wstunnel`
 
 Installs `mod_proxy_wstunnel`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html
+    * for additional documentation.
 
-### apache::mod::python
+### `apache::mod::python`
 
 Installs and configures `mod_python`.
 
 * **See also**
-https://github.com/grisha/mod_python
-for additional documentation.
+  * https://github.com/grisha/mod_python
+    * for additional documentation.
 
 #### Parameters
 
@@ -4867,16 +4937,16 @@ Data type: `Optional[String]`
 
 Sets the name of the configuration file that is used to load the python module.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::remoteip
+### `apache::mod::remoteip`
 
 Installs and configures `mod_remoteip`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_remoteip.html
-https://httpd.apache.org/docs/current/mod/mod_remoteip.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_remoteip.html
+  * https://httpd.apache.org/docs/current/mod/mod_remoteip.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -4888,7 +4958,7 @@ Data type: `String`
 
 The header field in which `mod_remoteip` will look for the useragent IP.
 
-Default value: 'X-Forwarded-For'
+Default value: `'X-Forwarded-For'`
 
 ##### `internal_proxy`
 
@@ -4899,7 +4969,7 @@ valid value inside specified header. Unlike the `$trusted_proxy_ips`
 parameter, any IP address (including private addresses) presented by these
 proxies will trusted by `mod_remoteip`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_ips`
 
@@ -4907,7 +4977,7 @@ Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
 *Deprecated*: use `$internal_proxy` instead.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `internal_proxy_list`
 
@@ -4917,7 +4987,7 @@ The path to a file containing a list of IP addresses, IP blocks or hostname
 that are trusted to set a valid value inside the specified header. See
 `$internal_proxy` for details.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxies_header`
 
@@ -4927,7 +4997,7 @@ A header into which `mod_remoteip` will collect a list of all of the
 intermediate client IP addresses trusted to resolve the useragent IP of the
 request (e.g. `X-Forwarded-By`).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_protocol`
 
@@ -4936,16 +5006,16 @@ Data type: `Boolean`
 Wether or not to enable the PROXY protocol header handling. If enabled
 upstream clients must set the header every time they open a connection.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `proxy_protocol_exceptions`
 
-Data type: `Optional[Array[Stdlib::Host]]`
+Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
 A list of IP address or IP blocks that are not required to use the PROXY
 protocol.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `trusted_proxy`
 
@@ -4956,7 +5026,7 @@ valid value inside the specified header. Unlike the `$proxy_ips` parameter,
 any private IP presented by these proxies will be disgarded by
 `mod_remoteip`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `trusted_proxy_ips`
 
@@ -4964,7 +5034,7 @@ Data type: `Optional[Array[Stdlib::Host]]`
 
 *Deprecated*: use `$trusted_proxy` instead.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `trusted_proxy_list`
 
@@ -4974,7 +5044,7 @@ The path to a file containing a list of IP addresses, IP blocks or hostname
 that are trusted to set a valid value inside the specified header. See
 `$trusted_proxy` for details.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `apache_version`
 
@@ -4983,15 +5053,15 @@ Data type: `Optional[String]`
 A version string used to validate that your apache version supports
 `mod_remoteip`. If not specified, `$::apache::apache_version` is used.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::reqtimeout
+### `apache::mod::reqtimeout`
 
 Installs and configures `mod_reqtimeout`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -5003,23 +5073,23 @@ Data type: `Any`
 
 List of timeouts and data rates for receiving requests.
 
-Default value: ['header=20-40,minrate=500', 'body=10,minrate=500']
+Default value: `['header=20-40,minrate=500', 'body=10,minrate=500']`
 
-### apache::mod::rewrite
+### `apache::mod::rewrite`
 
 Installs `mod_rewrite`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_rewrite.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_rewrite.html
+    * for additional documentation.
 
-### apache::mod::rpaf
+### `apache::mod::rpaf`
 
 Installs and configures `mod_rpaf`.
 
 * **See also**
-https://github.com/gnif/mod_rpaf
-for additional documentation.
+  * https://github.com/gnif/mod_rpaf
+    * for additional documentation.
 
 #### Parameters
 
@@ -5031,7 +5101,7 @@ Data type: `Any`
 
 Toggles whether to update vhost name so ServerName and ServerAlias work.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `proxy_ips`
 
@@ -5039,7 +5109,7 @@ Data type: `Any`
 
 List of IPs & bitmasked subnets to adjust requests for
 
-Default value: [ '127.0.0.1' ]
+Default value: `[ '127.0.0.1' ]`
 
 ##### `header`
 
@@ -5047,7 +5117,7 @@ Data type: `Any`
 
 Header to use for the real IP address.
 
-Default value: 'X-Forwarded-For'
+Default value: `'X-Forwarded-For'`
 
 ##### `template`
 
@@ -5055,15 +5125,15 @@ Data type: `Any`
 
 Path to template to use for configuring mod_rpaf.
 
-Default value: 'apache/mod/rpaf.conf.erb'
+Default value: `'apache/mod/rpaf.conf.erb'`
 
-### apache::mod::security
+### `apache::mod::security`
 
 Installs and configures `mod_security`.
 
 * **See also**
-https://github.com/SpiderLabs/ModSecurity/wiki
-for additional documentation.
+  * https://github.com/SpiderLabs/ModSecurity/wiki
+    * for additional documentation.
 
 #### Parameters
 
@@ -5075,7 +5145,7 @@ Data type: `Any`
 
 Manage mod_security or mod_security2
 
-Default value: $::apache::params::modsec_version
+Default value: `$::apache::params::modsec_version`
 
 ##### `logroot`
 
@@ -5083,7 +5153,7 @@ Data type: `Any`
 
 Configures the location of audit and debug logs.
 
-Default value: $::apache::params::logroot
+Default value: `$::apache::params::logroot`
 
 ##### `crs_package`
 
@@ -5091,7 +5161,7 @@ Data type: `Any`
 
 Name of package that installs CRS rules.
 
-Default value: $::apache::params::modsec_crs_package
+Default value: `$::apache::params::modsec_crs_package`
 
 ##### `activated_rules`
 
@@ -5099,7 +5169,7 @@ Data type: `Any`
 
 An array of rules from the modsec_crs_path or absolute to activate via symlinks.
 
-Default value: $::apache::params::modsec_default_rules
+Default value: `$::apache::params::modsec_default_rules`
 
 ##### `modsec_dir`
 
@@ -5107,7 +5177,7 @@ Data type: `Any`
 
 Defines the path where Puppet installs the modsec configuration and activated rules links.
 
-Default value: $::apache::params::modsec_dir
+Default value: `$::apache::params::modsec_dir`
 
 ##### `modsec_secruleengine`
 
@@ -5115,7 +5185,7 @@ Data type: `Any`
 
 Configures the rules engine.
 
-Default value: $::apache::params::modsec_secruleengine
+Default value: `$::apache::params::modsec_secruleengine`
 
 ##### `audit_log_relevant_status`
 
@@ -5123,7 +5193,7 @@ Data type: `Any`
 
 Configures which response status code is to be considered relevant for the purpose of audit logging.
 
-Default value: '^(?:5|4(?!04))'
+Default value: `'^(?:5|4(?!04))'`
 
 ##### `audit_log_parts`
 
@@ -5132,7 +5202,23 @@ Data type: `Any`
 Defines which parts of each transaction are going to be recorded in the audit log. Each part is assigned a single letter; when a
 letter appears in the list then the equivalent part will be recorded.
 
-Default value: $::apache::params::modsec_audit_log_parts
+Default value: `$::apache::params::modsec_audit_log_parts`
+
+##### `audit_log_type`
+
+Data type: `Any`
+
+Defines the type of audit logging mechanism to be used.
+
+Default value: `$::apache::params::modsec_audit_log_type`
+
+##### `audit_log_storage_dir`
+
+Data type: `Any`
+
+Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.
+
+Default value: ``undef``
 
 ##### `secpcrematchlimit`
 
@@ -5140,7 +5226,7 @@ Data type: `Any`
 
 Sets the match limit in the PCRE library.
 
-Default value: $::apache::params::secpcrematchlimit
+Default value: `$::apache::params::secpcrematchlimit`
 
 ##### `secpcrematchlimitrecursion`
 
@@ -5148,7 +5234,7 @@ Data type: `Any`
 
 Sets the match limit recursion in the PCRE library.
 
-Default value: $::apache::params::secpcrematchlimitrecursion
+Default value: `$::apache::params::secpcrematchlimitrecursion`
 
 ##### `allowed_methods`
 
@@ -5156,7 +5242,7 @@ Data type: `Any`
 
 A space-separated list of allowed HTTP methods.
 
-Default value: 'GET HEAD POST OPTIONS'
+Default value: `'GET HEAD POST OPTIONS'`
 
 ##### `content_types`
 
@@ -5164,7 +5250,7 @@ Data type: `Any`
 
 A list of one or more allowed MIME types.
 
-Default value: 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'
+Default value: `'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'`
 
 ##### `restricted_extensions`
 
@@ -5172,7 +5258,7 @@ Data type: `Any`
 
 A space-sparated list of prohibited file extensions.
 
-Default value: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'
+Default value: `'.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'`
 
 ##### `restricted_headers`
 
@@ -5180,7 +5266,7 @@ Data type: `Any`
 
 A list of restricted headers separated by slashes and spaces.
 
-Default value: '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'
+Default value: `'/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'`
 
 ##### `secdefaultaction`
 
@@ -5188,7 +5274,7 @@ Data type: `Any`
 
 Defines the default list of actions, which will be inherited by the rules in the same configuration context.
 
-Default value: 'deny'
+Default value: `'deny'`
 
 ##### `anomaly_score_blocking`
 
@@ -5196,7 +5282,7 @@ Data type: `Any`
 
 Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set.
 
-Default value: 'off'
+Default value: `'off'`
 
 ##### `inbound_anomaly_threshold`
 
@@ -5204,7 +5290,7 @@ Data type: `Any`
 
 Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
-Default value: '5'
+Default value: `'5'`
 
 ##### `outbound_anomaly_threshold`
 
@@ -5212,7 +5298,7 @@ Data type: `Any`
 
 Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
-Default value: '4'
+Default value: `'4'`
 
 ##### `critical_anomaly_score`
 
@@ -5220,7 +5306,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a critical severity.
 
-Default value: '5'
+Default value: `'5'`
 
 ##### `error_anomaly_score`
 
@@ -5228,7 +5314,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a error severity.
 
-Default value: '4'
+Default value: `'4'`
 
 ##### `warning_anomaly_score`
 
@@ -5236,7 +5322,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a warning severity.
 
-Default value: '3'
+Default value: `'3'`
 
 ##### `notice_anomaly_score`
 
@@ -5244,7 +5330,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a notice severity.
 
-Default value: '2'
+Default value: `'2'`
 
 ##### `secrequestmaxnumargs`
 
@@ -5252,7 +5338,7 @@ Data type: `Any`
 
 Sets the maximum number of arguments in the request.
 
-Default value: '255'
+Default value: `'255'`
 
 ##### `secrequestbodylimit`
 
@@ -5260,7 +5346,7 @@ Data type: `Any`
 
 Sets the maximum request body size ModSecurity will accept for buffering.
 
-Default value: '13107200'
+Default value: `'13107200'`
 
 ##### `secrequestbodynofileslimit`
 
@@ -5269,7 +5355,7 @@ Data type: `Any`
 Configures the maximum request body size ModSecurity will accept for buffering, excluding the size of any files being transported
 in the request.
 
-Default value: '131072'
+Default value: `'131072'`
 
 ##### `secrequestbodyinmemorylimit`
 
@@ -5277,7 +5363,7 @@ Data type: `Any`
 
 Configures the maximum request body size that ModSecurity will store in memory.
 
-Default value: '131072'
+Default value: `'131072'`
 
 ##### `manage_security_crs`
 
@@ -5285,17 +5371,17 @@ Data type: `Any`
 
 Toggles whether to manage ModSecurity Core Rule Set
 
-Default value: `true`
+Default value: ``true``
 
-### apache::mod::setenvif
+### `apache::mod::setenvif`
 
 Installs `mod_setenvif`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_setenvif.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_setenvif.html
+    * for additional documentation.
 
-### apache::mod::shib
+### `apache::mod::shib`
 
 This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
 can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
@@ -5304,8 +5390,8 @@ can manage the Shibboleth configuration manually, with Puppet, or using a [Shibb
 See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide).
 
 * **See also**
-https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
-for additional documentation.
+  * https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
+    * for additional documentation.
 
 #### Parameters
 
@@ -5317,7 +5403,7 @@ Data type: `Any`
 
 Toggles whether to trigger warning on RedHat nodes.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `mod_full_path`
 
@@ -5325,7 +5411,7 @@ Data type: `Any`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `package_name`
 
@@ -5333,7 +5419,7 @@ Data type: `Any`
 
 Name of the Shibboleth package to be installed.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mod_lib`
 
@@ -5342,25 +5428,25 @@ Data type: `Any`
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
 overrides this value.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::socache_shmcb
+### `apache::mod::socache_shmcb`
 
 Installs `mod_socache_shmcb`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html
+    * for additional documentation.
 
-### apache::mod::speling
+### `apache::mod::speling`
 
 Installs `mod_spelling`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_speling.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_speling.html
+    * for additional documentation.
 
-### apache::mod::ssl
+### `apache::mod::ssl`
 
 On most operating systems, the ssl.conf is placed in the module configuration directory. On Red Hat based operating systems, this
 file is placed in /etc/httpd/conf.d, the same location in which the RPM stores the configuration.
@@ -5369,8 +5455,8 @@ To use SSL with a virtual host, you must either set the default_ssl_vhost parame
 apache::vhost to true.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_ssl.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_ssl.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -5382,7 +5468,7 @@ Data type: `Boolean`
 
 Enable compression on the SSL level.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `ssl_cryptodevice`
 
@@ -5390,7 +5476,7 @@ Data type: `Any`
 
 Enable use of a cryptographic hardware accelerator.
 
-Default value: 'builtin'
+Default value: `'builtin'`
 
 ##### `ssl_options`
 
@@ -5398,7 +5484,7 @@ Data type: `Any`
 
 Configure various SSL engine run-time options.
 
-Default value: [ 'StdEnvVars' ]
+Default value: `[ 'StdEnvVars' ]`
 
 ##### `ssl_openssl_conf_cmd`
 
@@ -5406,7 +5492,7 @@ Data type: `Any`
 
 Configure OpenSSL parameters through its SSL_CONF API.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_cert`
 
@@ -5414,7 +5500,7 @@ Data type: `Optional[String]`
 
 Path to server PEM-encoded X.509 certificate data file.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_key`
 
@@ -5422,7 +5508,7 @@ Data type: `Optional[String]`
 
 Path to server PEM-encoded private key file
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_ca`
 
@@ -5430,7 +5516,7 @@ Data type: `Any`
 
 File of concatenated PEM-encoded CA Certificates for Client Auth.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_cipher`
 
@@ -5438,7 +5524,7 @@ Data type: `Any`
 
 Cipher Suite available for negotiation in SSL handshake.
 
-Default value: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES'
+Default value: `'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES'`
 
 ##### `ssl_honorcipherorder`
 
@@ -5446,7 +5532,7 @@ Data type: `Variant[Boolean, Enum['on', 'off']]`
 
 Option to prefer the server's cipher preference order.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `ssl_protocol`
 
@@ -5457,7 +5543,7 @@ Default based on the OS:
 - RedHat 8: [ 'all' ].
 - Other Platforms: [ 'all', '-SSLv2', '-SSLv3' ].
 
-Default value: $::apache::params::ssl_protocol
+Default value: `$::apache::params::ssl_protocol`
 
 ##### `ssl_proxy_protocol`
 
@@ -5465,7 +5551,7 @@ Data type: `Array`
 
 Configure usable SSL protocol flavors for proxy usage.
 
-Default value: []
+Default value: `[]`
 
 ##### `ssl_pass_phrase_dialog`
 
@@ -5473,7 +5559,7 @@ Data type: `Any`
 
 Type of pass phrase dialog for encrypted private keys.
 
-Default value: 'builtin'
+Default value: `'builtin'`
 
 ##### `ssl_random_seed_bytes`
 
@@ -5481,7 +5567,7 @@ Data type: `Any`
 
 Pseudo Random Number Generator (PRNG) seeding source.
 
-Default value: '512'
+Default value: `'512'`
 
 ##### `ssl_sessioncache`
 
@@ -5489,7 +5575,7 @@ Data type: `String`
 
 Configures the storage type of the global/inter-process SSL Session Cache
 
-Default value: $::apache::params::ssl_sessioncache
+Default value: `$::apache::params::ssl_sessioncache`
 
 ##### `ssl_sessioncachetimeout`
 
@@ -5497,7 +5583,7 @@ Data type: `Any`
 
 Number of seconds before an SSL session expires in the Session Cache.
 
-Default value: '300'
+Default value: `'300'`
 
 ##### `ssl_stapling`
 
@@ -5505,7 +5591,7 @@ Data type: `Boolean`
 
 Enable stapling of OCSP responses in the TLS handshake.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `ssl_stapling_return_errors`
 
@@ -5513,7 +5599,7 @@ Data type: `Optional[Boolean]`
 
 Pass stapling related OCSP errors on to client.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_mutex`
 
@@ -5526,7 +5612,7 @@ Default based on the OS and/or Apache version:
 - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
 - Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `apache_version`
 
@@ -5534,7 +5620,7 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `package_name`
 
@@ -5542,7 +5628,7 @@ Data type: `Any`
 
 Name of ssl package to install.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_sessiontickets`
 
@@ -5550,7 +5636,7 @@ Data type: `Optional[Boolean]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `stapling_cache`
 
@@ -5558,15 +5644,15 @@ Data type: `Optional[String]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::status
+### `apache::mod::status`
 
 Installs and configures `mod_status`.
 
 * **See also**
-http://httpd.apache.org/docs/current/mod/mod_status.html
-for additional documentation.
+  * http://httpd.apache.org/docs/current/mod/mod_status.html
+    * for additional documentation.
 
 #### Examples
 
@@ -5591,7 +5677,7 @@ Array of hosts, ip addresses, partial network numbers or networks, in CIDR notat
 /server-status URL.  Defaults to ['127.0.0.1', '::1'].
 > Creates Apache < 2.4 directive "Allow from".
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `requires`
 
@@ -5611,7 +5697,7 @@ A Variant type that can be:
     Optional - If unspecified, "Require" directives follow current flow
 > Creates Apache >= 2.4 directives "Require"
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `extended_status`
 
@@ -5619,7 +5705,7 @@ Data type: `Enum['On', 'Off', 'on', 'off']`
 
 Determines whether to track extended status information for each request, via the ExtendedStatus directive.
 
-Default value: 'On'
+Default value: `'On'`
 
 ##### `status_path`
 
@@ -5627,7 +5713,7 @@ Data type: `Any`
 
 Path assigned to the Location directive which defines the URL to access the server status.
 
-Default value: '/server-status'
+Default value: `'/server-status'`
 
 ##### `apache_version`
 
@@ -5635,31 +5721,31 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::suexec
+### `apache::mod::suexec`
 
 Installs `mod_suexec`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_suexec.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_suexec.html
+    * for additional documentation.
 
-### apache::mod::suphp
+### `apache::mod::suphp`
 
 Installs `mod_suphp`.
 
 * **See also**
-https://www.suphp.org/DocumentationView.html?file=apache/INSTALL
-for additional documentation.
+  * https://www.suphp.org/DocumentationView.html?file=apache/INSTALL
+    * for additional documentation.
 
-### apache::mod::userdir
+### `apache::mod::userdir`
 
 Installs and configures `mod_userdir`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_userdir.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_userdir.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -5671,7 +5757,7 @@ Data type: `Any`
 
 *Deprecated* Path to system home directory.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `dir`
 
@@ -5679,7 +5765,7 @@ Data type: `Any`
 
 *Deprecated* Path from user's home directory to public directory.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `disable_root`
 
@@ -5687,7 +5773,7 @@ Data type: `Any`
 
 Toggles whether to allow use of root directory.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `apache_version`
 
@@ -5695,7 +5781,7 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `path`
 
@@ -5703,7 +5789,7 @@ Data type: `Any`
 
 Path to directory or pattern from which to find user-specific directories.
 
-Default value: '/home/*/public_html'
+Default value: `'/home/*/public_html'`
 
 ##### `overrides`
 
@@ -5711,7 +5797,7 @@ Data type: `Any`
 
 Array of directives that are allowed in .htaccess files.
 
-Default value: [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]
+Default value: `[ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]`
 
 ##### `options`
 
@@ -5719,7 +5805,7 @@ Data type: `Any`
 
 Configures what features are available in a particular directory.
 
-Default value: [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ]
+Default value: `[ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ]`
 
 ##### `unmanaged_path`
 
@@ -5727,7 +5813,7 @@ Data type: `Any`
 
 Toggles whether to manage path in userdir.conf
 
-Default value: `false`
+Default value: ``false``
 
 ##### `custom_fragment`
 
@@ -5735,15 +5821,15 @@ Data type: `Any`
 
 Custom configuration to be added to userdir.conf
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::version
+### `apache::mod::version`
 
 Installs `mod_version`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_version.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_version.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -5755,23 +5841,23 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: $::apache::apache_version
+Default value: `$::apache::apache_version`
 
-### apache::mod::vhost_alias
+### `apache::mod::vhost_alias`
 
 Installs Apache `mod_vhost_alias`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/mod_vhost_alias.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/mod_vhost_alias.html
+    * for additional documentation.
 
-### apache::mod::worker
+### `apache::mod::worker`
 
 Installs and manages the MPM `worker`.
 
 * **See also**
-https://httpd.apache.org/docs/current/mod/worker.html
-for additional documentation.
+  * https://httpd.apache.org/docs/current/mod/worker.html
+    * for additional documentation.
 
 #### Parameters
 
@@ -5783,7 +5869,7 @@ Data type: `Any`
 
 The number of child server processes created on startup
 
-Default value: '2'
+Default value: `'2'`
 
 ##### `maxclients`
 
@@ -5793,7 +5879,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.
 
-Default value: '150'
+Default value: `'150'`
 
 ##### `minsparethreads`
 
@@ -5801,7 +5887,7 @@ Data type: `Any`
 
 Minimum number of idle threads to handle request spikes.
 
-Default value: '25'
+Default value: `'25'`
 
 ##### `maxsparethreads`
 
@@ -5809,7 +5895,7 @@ Data type: `Any`
 
 Maximum number of idle threads.
 
-Default value: '75'
+Default value: `'75'`
 
 ##### `threadsperchild`
 
@@ -5817,7 +5903,7 @@ Data type: `Any`
 
 The number of threads created by each child process.
 
-Default value: '25'
+Default value: `'25'`
 
 ##### `maxrequestsperchild`
 
@@ -5827,7 +5913,7 @@ Limit on the number of connectiojns an individual child server
 process will handle. This is the old name and is still supported. The new
 name is MaxConnectionsPerChild as of 2.3.9+.
 
-Default value: '0'
+Default value: `'0'`
 
 ##### `serverlimit`
 
@@ -5839,7 +5925,7 @@ and ThreadsPerChild settings require more than 16 server processes
 number of server processes required by what you may want for
 MaxRequestWorkers and ThreadsPerChild.
 
-Default value: '25'
+Default value: `'25'`
 
 ##### `threadlimit`
 
@@ -5848,7 +5934,7 @@ Data type: `Any`
 This directive sets the maximum configured value for
 ThreadsPerChild for the lifetime of the Apache httpd process.
 
-Default value: '64'
+Default value: `'64'`
 
 ##### `listenbacklog`
 
@@ -5856,7 +5942,7 @@ Data type: `Any`
 
 Maximum length of the queue of pending connections.
 
-Default value: '511'
+Default value: `'511'`
 
 ##### `apache_version`
 
@@ -5864,15 +5950,17 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::wsgi
+### `apache::mod::wsgi`
 
 Installs and configures `mod_wsgi`.
 
+* **Note** Unsupported platforms: SLES: all; RedHat: all; CentOS: all; OracleLinux: all; Scientific: all
+
 * **See also**
-https://github.com/GrahamDumpleton/mod_wsgi
-for additional documentation.
+  * https://github.com/GrahamDumpleton/mod_wsgi
+    * for additional documentation.
 
 #### Parameters
 
@@ -5884,7 +5972,7 @@ Data type: `Any`
 
 Enable restrictions on use of embedded mode.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_socket_prefix`
 
@@ -5892,7 +5980,7 @@ Data type: `Any`
 
 Configure directory to use for daemon sockets.
 
-Default value: $::apache::params::wsgi_socket_prefix
+Default value: `$::apache::params::wsgi_socket_prefix`
 
 ##### `wsgi_python_path`
 
@@ -5900,7 +5988,7 @@ Data type: `Any`
 
 Additional directories to search for Python modules.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_python_home`
 
@@ -5908,7 +5996,7 @@ Data type: `Any`
 
 Absolute path to Python prefix/exec_prefix directories.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_python_optimize`
 
@@ -5916,7 +6004,7 @@ Data type: `Any`
 
 Enables basic Python optimisation features.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_application_group`
 
@@ -5924,7 +6012,7 @@ Data type: `Any`
 
 Sets which application group WSGI application belongs to.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `package_name`
 
@@ -5932,7 +6020,7 @@ Data type: `Any`
 
 Names of package that installs mod_wsgi.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `mod_path`
 
@@ -5940,29 +6028,29 @@ Data type: `Any`
 
 Defines the path to the mod_wsgi shared object (.so) file.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::mod::xsendfile
+### `apache::mod::xsendfile`
 
 Installs `mod_xsendfile`.
 
 * **See also**
-https://tn123.org/mod_xsendfile/
-for additional documentation.
+  * https://tn123.org/mod_xsendfile/
+    * for additional documentation.
 
-### apache::mpm::disable_mpm_event
+### `apache::mpm::disable_mpm_event`
 
 The apache::mpm::disable_mpm_event class.
 
-### apache::mpm::disable_mpm_prefork
+### `apache::mpm::disable_mpm_prefork`
 
 The apache::mpm::disable_mpm_prefork class.
 
-### apache::mpm::disable_mpm_worker
+### `apache::mpm::disable_mpm_worker`
 
 The apache::mpm::disable_mpm_worker class.
 
-### apache::vhosts
+### `apache::vhosts`
 
 host parameters or Configuring virtual hosts in the README section.
 
@@ -5994,11 +6082,11 @@ Data type: `Any`
 A hash, where the key represents the name and the value represents a hash of
 `apache::vhost` defined type's parameters.
 
-Default value: {}
+Default value: `{}`
 
 ## Defined types
 
-### apache::balancer
+### `apache::balancer`
 
 Each balancer cluster needs one or more balancer members (that can
 be declared with the apache::balancermember defined resource type). Using
@@ -6033,7 +6121,7 @@ Data type: `Any`
 
 Configures key-value pairs to be used as a ProxySet lines in the configuration.
 
-Default value: {}
+Default value: `{}`
 
 ##### `target`
 
@@ -6041,7 +6129,7 @@ Data type: `Any`
 
 The path to the file the balancer definition will be written in.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `collect_exported`
 
@@ -6058,7 +6146,7 @@ If you don't use exported resources, a single Puppet run configures all balancer
 you use exported resources, Puppet has to run on the balanced nodes first, then run on the
 balancer.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `options`
 
@@ -6067,9 +6155,9 @@ Data type: `Any`
 Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)
 after the balancer URL, and accepts any key-value pairs available to `ProxyPass`.
 
-Default value: []
+Default value: `[]`
 
-### apache::balancermember
+### `apache::balancermember`
 
 Sets up a balancer member inside a listening service configuration block in
 the load balancer's `apache.cfg`.
@@ -6119,7 +6207,7 @@ Data type: `Any`
 
 The url used to contact the balancer member server.
 
-Default value: "http://${::fqdn}/"
+Default value: `"http://${::fqdn}/"`
 
 ##### `options`
 
@@ -6128,9 +6216,9 @@ Data type: `Any`
 Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)
 after the URL, and accepts any key-value pairs available to `ProxyPass`.
 
-Default value: []
+Default value: `[]`
 
-### apache::custom_config
+### `apache::custom_config`
 
 If the file is invalid and this defined type's `verify_config` parameter's value is
 `true`, Puppet throws an error during a Puppet run.
@@ -6145,7 +6233,7 @@ Data type: `Enum['absent', 'present']`
 
 Specifies whether the configuration file should be present.
 
-Default value: 'present'
+Default value: `'present'`
 
 ##### `confdir`
 
@@ -6153,7 +6241,7 @@ Data type: `Any`
 
 Sets the directory in which Puppet places configuration files.
 
-Default value: $::apache::confd_dir
+Default value: `$::apache::confd_dir`
 
 ##### `content`
 
@@ -6162,7 +6250,7 @@ Data type: `Any`
 Sets the configuration file's content. The `content` and `source` parameters are exclusive
 of each other.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `filename`
 
@@ -6170,7 +6258,7 @@ Data type: `Any`
 
 Sets the name of the file under `confdir` in which Puppet stores the configuration.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `priority`
 
@@ -6180,7 +6268,7 @@ Sets the configuration file's priority by prefixing its filename with this param
 numeric value, as Apache processes configuration files in alphanumeric order.<br />
 To omit the priority prefix in the configuration file's name, set this parameter to `false`.
 
-Default value: '25'
+Default value: `'25'`
 
 ##### `source`
 
@@ -6189,7 +6277,7 @@ Data type: `Any`
 Points to the configuration file's source. The `content` and `source` parameters are
 exclusive of each other.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `verify_command`
 
@@ -6201,7 +6289,7 @@ This parameter is used only if the `verify_config` parameter's value is `true`.
 `verify_command` fails, the Puppet run deletes the configuration file and raises an error,
 but does not notify the Apache service.
 
-Default value: $::apache::params::verify_command
+Default value: `$::apache::params::verify_command`
 
 ##### `verify_config`
 
@@ -6209,7 +6297,7 @@ Data type: `Boolean`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `owner`
 
@@ -6217,7 +6305,7 @@ Data type: `Any`
 
 File owner of configuration file
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `group`
 
@@ -6225,7 +6313,7 @@ Data type: `Any`
 
 File group of configuration file
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `file_mode`
 
@@ -6233,7 +6321,7 @@ Data type: `Any`
 
 File mode of configuration file
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `show_diff`
 
@@ -6241,9 +6329,9 @@ Data type: `Boolean`
 
 show_diff property for configuration file resource
 
-Default value: `true`
+Default value: ``true``
 
-### apache::fastcgi::server
+### `apache::fastcgi::server`
 
 Defines one or more external FastCGI servers to handle specific file types. Use this
 defined type with `mod_fastcgi`.
@@ -6258,7 +6346,7 @@ Data type: `Any`
 
 Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
 
-Default value: '127.0.0.1:9000'
+Default value: `'127.0.0.1:9000'`
 
 ##### `timeout`
 
@@ -6271,7 +6359,7 @@ application, but the application doesn't respond by writing and flushing within
 the request is aborted. If communication is complete with the application but incomplete with
 the client (the response is buffered), the timeout does not apply.
 
-Default value: 15
+Default value: `15`
 
 ##### `flush`
 
@@ -6281,7 +6369,7 @@ Forces `mod_fastcgi` to write to the client as data is received from the
 application. By default, `mod_fastcgi` buffers data in order to free the application
 as quickly as possible.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `faux_path`
 
@@ -6290,7 +6378,7 @@ Data type: `Any`
 Apache has FastCGI handle URIs that resolve to this filename. The path set in this
 parameter does not have to exist in the local filesystem.
 
-Default value: "/var/www/${name}.fcgi"
+Default value: `"/var/www/${name}.fcgi"`
 
 ##### `fcgi_alias`
 
@@ -6298,7 +6386,7 @@ Data type: `Any`
 
 Internally links actions with the FastCGI server. This alias must be unique.
 
-Default value: "/${name}.fcgi"
+Default value: `"/${name}.fcgi"`
 
 ##### `file_type`
 
@@ -6306,7 +6394,7 @@ Data type: `Any`
 
 Sets the MIME `content-type` of the file to be processed by the FastCGI server.
 
-Default value: 'application/x-httpd-php'
+Default value: `'application/x-httpd-php'`
 
 ##### `pass_header`
 
@@ -6314,14 +6402,14 @@ Data type: `Any`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::listen
+### `apache::listen`
 
 The `apache::vhost` class uses this defined type, and titles take the form
 `<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
 
-### apache::mod
+### `apache::mod`
 
 Checks for or places the module's default configuration files in the Apache server's
 `module` and `enable` directories. The default locations depend on your operating system.
@@ -6337,7 +6425,7 @@ Data type: `Any`
 **Required**.<br />
 Names the package Puppet uses to install the Apache module.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `package_ensure`
 
@@ -6345,7 +6433,7 @@ Data type: `Any`
 
 Determines whether Puppet ensures the Apache module should be installed.
 
-Default value: 'present'
+Default value: `'present'`
 
 ##### `lib`
 
@@ -6353,7 +6441,7 @@ Data type: `Any`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `lib_path`
 
@@ -6362,7 +6450,7 @@ Data type: `Any`
 Specifies a path to the module's libraries. Do not manually set this parameter
 without special reason. The `path` parameter overrides this value.
 
-Default value: $::apache::lib_path
+Default value: `$::apache::lib_path`
 
 ##### `loadfile_name`
 
@@ -6371,7 +6459,7 @@ Data type: `Any`
 Sets the filename for the module's `LoadFile` directive, which can also set
 the module load order as Apache processes them in alphanumeric order.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `id`
 
@@ -6379,7 +6467,7 @@ Data type: `Any`
 
 Specifies the package id
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `loadfiles`
 
@@ -6387,7 +6475,7 @@ Data type: `Any`
 
 Specifies an array of `LoadFile` directives.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `path`
 
@@ -6395,15 +6483,15 @@ Data type: `Any`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apache::namevirtualhost
+### `apache::namevirtualhost`
 
 Adds all related directives to the `ports.conf` file in the Apache HTTPD configuration
 directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`,
 `\<IP\>`, or `\<IP\>:\<PORT\>`.
 
-### apache::vhost
+### `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` being a defined resource type, which allows Apache
@@ -6445,7 +6533,7 @@ Data type: `Any`
 
 Apache's version number as a string, such as '2.2' or '2.4'.
 
-Default value: $::apache::apache_version
+Default value: `$::apache::apache_version`
 
 ##### `access_log`
 
@@ -6453,7 +6541,7 @@ Data type: `Boolean`
 
 Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
 
-Default value: `true`
+Default value: ``true``
 
 ##### `access_log_env_var`
 
@@ -6461,7 +6549,7 @@ Data type: `Any`
 
 Specifies that only requests with particular environment variables be logged.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `access_log_file`
 
@@ -6472,7 +6560,7 @@ instance, example.com--- it defaults to 'example.com_ssl.log' for
 [SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
 `example.com_access.log` for unencrypted virtual hosts.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `access_log_format`
 
@@ -6481,7 +6569,7 @@ Data type: `Any`
 Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the
 access log.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `access_log_pipe`
 
@@ -6489,7 +6577,7 @@ Data type: `Any`
 
 Specifies a pipe where Apache sends access log messages.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `access_log_syslog`
 
@@ -6497,7 +6585,7 @@ Data type: `Any`
 
 Sends all access log messages to syslog.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `access_logs`
 
@@ -6506,7 +6594,7 @@ Data type: `Optional[Array]`
 Allows you to give a hash that specifies the state of each of the `access_log_*`
 directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `add_default_charset`
 
@@ -6515,7 +6603,7 @@ Data type: `Any`
 Sets a default media charset value for the `AddDefaultCharset` directive, which is
 added to `text/plain` and `text/html` responses.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `add_listen`
 
@@ -6526,7 +6614,7 @@ Setting `add_listen` to `false` prevents the virtual host from creating a `Liste
 statement. This is important when combining virtual hosts that aren't passed an `ip`
 parameter with those that are.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `use_optional_includes`
 
@@ -6535,7 +6623,7 @@ Data type: `Any`
 Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for
 `additional_includes` in Apache 2.4 or newer.
 
-Default value: $::apache::use_optional_includes
+Default value: `$::apache::use_optional_includes`
 
 ##### `additional_includes`
 
@@ -6545,7 +6633,7 @@ Specifies paths to additional static, virtual host-specific Apache configuration
 You can use this parameter to implement a unique, custom configuration not supported by
 this module.
 
-Default value: []
+Default value: `[]`
 
 ##### `aliases`
 
@@ -6588,7 +6676,7 @@ If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`,
 directive might not be able to honor the `PassengerEnabled => off` statement. See
 [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `allow_encoded_slashes`
 
@@ -6599,7 +6687,7 @@ default. This modifies the virtual host responses to URLs with `\` and `/` chara
 default setting omits the declaration from the server configuration and selects the
 Apache default setting of `Off`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `block`
 
@@ -6608,7 +6696,7 @@ Data type: `Any`
 Specifies the list of things to which Apache blocks access. Valid options are: `scm` (which
 blocks web access to `.svn`), `.git`, and `.bzr` directories.
 
-Default value: []
+Default value: `[]`
 
 ##### `cas_attribute_prefix`
 
@@ -6617,7 +6705,7 @@ Data type: `Any`
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_attribute_delimiter`
 
@@ -6625,7 +6713,7 @@ Data type: `Any`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_login_url`
 
@@ -6634,7 +6722,7 @@ Data type: `Any`
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_root_proxied_as`
 
@@ -6643,7 +6731,7 @@ Data type: `Any`
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_scrub_request_headers`
 
@@ -6651,7 +6739,7 @@ Data type: `Any`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_sso_enabled`
 
@@ -6659,7 +6747,7 @@ Data type: `Any`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_validate_saml`
 
@@ -6667,7 +6755,7 @@ Data type: `Any`
 
 Parse response from CAS server for SAML.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `cas_validate_url`
 
@@ -6675,7 +6763,7 @@ Data type: `Any`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `comment`
 
@@ -6694,7 +6782,7 @@ comment => [
 ]
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `custom_fragment`
 
@@ -6703,7 +6791,7 @@ Data type: `Optional[String]`
 Passes a string of custom configuration directives to place at the end of the virtual
 host configuration.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `default_vhost`
 
@@ -6712,7 +6800,7 @@ Data type: `Boolean`
 Sets a given `apache::vhost` defined type as the default to serve requests that do not
 match any other `apache::vhost` defined types.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `directoryindex`
 
@@ -6722,7 +6810,7 @@ Sets the list of resources to look for when a client requests an index of the di
 by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive
 documentation for details.
 
-Default value: ''
+Default value: `''`
 
 ##### `docroot`
 
@@ -6739,7 +6827,7 @@ Data type: `Any`
 
 Sets group access to the `docroot` directory.
 
-Default value: $::apache::params::root_group
+Default value: `$::apache::params::root_group`
 
 ##### `docroot_owner`
 
@@ -6747,7 +6835,7 @@ Data type: `Any`
 
 Sets individual user access to the `docroot` directory.
 
-Default value: 'root'
+Default value: `'root'`
 
 ##### `docroot_mode`
 
@@ -6755,7 +6843,7 @@ Data type: `Any`
 
 Sets access permissions for the `docroot` directory, in numeric notation.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `manage_docroot`
 
@@ -6763,7 +6851,7 @@ Data type: `Any`
 
 Determines whether Puppet manages the `docroot` directory.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `error_log`
 
@@ -6771,7 +6859,7 @@ Data type: `Boolean`
 
 Specifies whether `*_error.log` directives should be configured.
 
-Default value: `true`
+Default value: ``true``
 
 ##### `error_log_file`
 
@@ -6783,7 +6871,7 @@ If none of these parameters is set, given a virtual host `example.com`, Puppet d
 to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and
 `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `error_log_pipe`
 
@@ -6793,7 +6881,7 @@ Specifies a pipe to send error log messages to.<br />
 This parameter has no effect if the `error_log_file` parameter has a value. If neither
 this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `error_log_syslog`
 
@@ -6805,7 +6893,36 @@ parameters has a value. If none of these parameters has a value, given a virtual
 `example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual
 hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: `undef`
+Default value: ``undef``
+
+##### `error_log_format`
+
+Data type: `Optional[
+    Array[
+      Variant[
+        String,
+        Hash[String, Enum['connection', 'request']]
+      ]
+    ]
+  ]`
+
+Sets the [ErrorLogFormat](https://httpd.apache.org/docs/current/mod/core.html#errorlogformat)
+format specification for error log entries inside virtual host
+For example:
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  error_log_format => [
+    '[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M',
+    { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' },
+    { "[%{uc}t] [R:%L] UA:'%+{User-Agent}i'" => 'request' },
+    { "[%{uc}t] [R:%L] Referer:'%+{Referer}i'" => 'request' },
+    { '[%{uc}t] [C:%{c}L] local\ %a remote\ %A' => 'connection' },
+  ],
+}
+```
+
+Default value: ``undef``
 
 ##### `error_documents`
 
@@ -6824,7 +6941,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: []
+Default value: `[]`
 
 ##### `ensure`
 
@@ -6832,7 +6949,7 @@ Data type: `Enum['absent', 'present']`
 
 Specifies if the virtual host is present or absent.<br />
 
-Default value: 'present'
+Default value: `'present'`
 
 ##### `fallbackresource`
 
@@ -6843,7 +6960,7 @@ directive, which specifies an action to take for any URL that doesn't map to any
 your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin
 with a `/` or be `disabled`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `fastcgi_server`
 
@@ -6851,7 +6968,7 @@ Data type: `Any`
 
 Specify an external FastCGI server to manage a connection to.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `fastcgi_socket`
 
@@ -6859,7 +6976,7 @@ Data type: `Any`
 
 Specify the socket that will be used to communicate with an external FastCGI server.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `fastcgi_idle_timeout`
 
@@ -6867,7 +6984,7 @@ Data type: `Any`
 
 If using fastcgi, this option sets the timeout for the server to respond.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `fastcgi_dir`
 
@@ -6875,7 +6992,7 @@ Data type: `Any`
 
 Specify an internal FastCGI directory that is to be managed.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `filters`
 
@@ -6894,7 +7011,7 @@ apache::vhost { "$::fqdn":
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_copy_files`
 
@@ -6903,7 +7020,7 @@ Data type: `Optional[Boolean]`
 Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
 directive which influences how the requestion process pass files to the main connection.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_direct`
 
@@ -6912,7 +7029,7 @@ Data type: `Optional[Boolean]`
 Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
 directive which toggles the usage of the HTTP/2 Direct Mode.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_early_hints`
 
@@ -6922,7 +7039,7 @@ Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html
 directive which controls if HTTP status 103 interim responses are forwarded to
 the client or not.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_max_session_streams`
 
@@ -6932,7 +7049,7 @@ Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_htt
 directive which sets the maximum number of active streams per HTTP/2 session
 that the server allows.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_modern_tls_only`
 
@@ -6941,7 +7058,7 @@ Data type: `Optional[Boolean]`
 Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
 directive which toggles the security checks on HTTP/2 connections in TLS mode.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_push`
 
@@ -6950,7 +7067,7 @@ Data type: `Optional[Boolean]`
 Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
 directive which toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_push_diary_size`
 
@@ -6960,7 +7077,7 @@ Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.h
 directive which toggles the maximum number of HTTP/2 server pushes that are
 remembered per HTTP/2 connection.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_push_priority`
 
@@ -6970,7 +7087,7 @@ Sets the [H2PushPriority](https://httpd.apache.org/docs/current/mod/mod_http2.ht
 directive which defines the priority handling of pushed responses based on the
 content-type of the response.
 
-Default value: []
+Default value: `[]`
 
 ##### `h2_push_resource`
 
@@ -6979,7 +7096,7 @@ Data type: `Array[String]`
 Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource)
 directive which declares resources for early pushing to the client.
 
-Default value: []
+Default value: `[]`
 
 ##### `h2_serialize_headers`
 
@@ -6989,7 +7106,7 @@ Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http
 directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
 format for processing by httpd core.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_stream_max_mem_size`
 
@@ -6999,7 +7116,7 @@ Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http
 directive which sets the maximum number of outgoing data bytes buffered in
 memory for an active stream.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_tls_cool_down_secs`
 
@@ -7009,7 +7126,7 @@ Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2
 directive which sets the number of seconds of idle time on a TLS connection
 before the TLS write size falls back to a small (~1300 bytes) length.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_tls_warm_up_size`
 
@@ -7019,7 +7136,7 @@ Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.h
 directive which sets the number of bytes to be sent in small TLS records (~1300
 bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_upgrade`
 
@@ -7029,7 +7146,7 @@ Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2
 directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
 to HTTP/2.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_window_size`
 
@@ -7039,7 +7156,7 @@ Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html
 directive which sets the size of the window that is used for flow control from
 client to server and limits the amount of data the server has to buffer.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `headers`
 
@@ -7048,7 +7165,7 @@ Data type: `Any`
 Adds lines to replace, merge, or remove response headers. See
 [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ip`
 
@@ -7057,7 +7174,7 @@ Data type: `Any`
 Sets the IP address the virtual host listens on. By default, uses Apache's default behavior
 of listening on all IPs.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ip_based`
 
@@ -7067,7 +7184,7 @@ Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html
 host. This parameter inhibits the creation of a NameVirtualHost directive, since those are
 used to funnel requests to name-based virtual hosts.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `itk`
 
@@ -7093,7 +7210,7 @@ Valid values are: a hash, which can include the keys:
 * `limituidrange` (Linux 3.5.0 or newer)
 * `limitgidrange` (Linux 3.5.0 or newer)
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `action`
 
@@ -7102,7 +7219,7 @@ Data type: `Any`
 Specifies whether you wish to configure mod_actions action directive which will
 activate cgi-script when triggered by a request.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `jk_mounts`
 
@@ -7122,7 +7239,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `http_protocol_options`
 
@@ -7130,7 +7247,7 @@ Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Method
 
 Specifies the strictness of HTTP protocol checks.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `keepalive`
 
@@ -7141,7 +7258,7 @@ for the virtual host. By default, the global, server-wide `KeepAlive` setting is
 Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options
 for the virtual host.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `keepalive_timeout`
 
@@ -7153,7 +7270,7 @@ global, server-wide `KeepAlive` setting is in effect.<br />
 This parameter is only relevant if either the global, server-wide `keepalive` parameter or
 the per-vhost `keepalive` parameter is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `max_keepalive_requests`
 
@@ -7164,7 +7281,7 @@ the global, server-wide `KeepAlive` setting is in effect.<br />
 This parameter is only relevant if either the global, server-wide `keepalive` parameter or
 the per-vhost `keepalive` parameter is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `auth_kerb`
 
@@ -7187,7 +7304,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `false`
+Default value: ``false``
 
 ##### `krb_method_negotiate`
 
@@ -7195,7 +7312,7 @@ Data type: `Any`
 
 Determines whether to use the Negotiate method.
 
-Default value: 'on'
+Default value: `'on'`
 
 ##### `krb_method_k5passwd`
 
@@ -7203,7 +7320,7 @@ Data type: `Any`
 
 Determines whether to use password-based authentication for Kerberos v5.
 
-Default value: 'on'
+Default value: `'on'`
 
 ##### `krb_authoritative`
 
@@ -7211,7 +7328,7 @@ Data type: `Any`
 
 If set to `off`, authentication controls can be passed on to another module.
 
-Default value: 'on'
+Default value: `'on'`
 
 ##### `krb_auth_realms`
 
@@ -7219,7 +7336,7 @@ Data type: `Any`
 
 Specifies an array of Kerberos realms to use for authentication.
 
-Default value: []
+Default value: `[]`
 
 ##### `krb_5keytab`
 
@@ -7227,7 +7344,7 @@ Data type: `Any`
 
 Specifies the Kerberos v5 keytab file's location.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `krb_local_user_mapping`
 
@@ -7235,7 +7352,7 @@ Data type: `Any`
 
 Strips @REALM from usernames for further use.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `krb_verify_kdc`
 
@@ -7244,7 +7361,7 @@ Data type: `Any`
 This option can be used to disable the verification tickets against local keytab to prevent
 KDC spoofing attacks.
 
-Default value: 'on'
+Default value: `'on'`
 
 ##### `krb_servicename`
 
@@ -7253,7 +7370,7 @@ Data type: `Any`
 Specifies the service name that will be used by Apache for authentication. Corresponding
 key of this name must be stored in the keytab.
 
-Default value: 'HTTP'
+Default value: `'HTTP'`
 
 ##### `krb_save_credentials`
 
@@ -7261,7 +7378,7 @@ Data type: `Any`
 
 This option enables credential saving functionality.
 
-Default value: 'off'
+Default value: `'off'`
 
 ##### `logroot`
 
@@ -7269,7 +7386,7 @@ Data type: `Any`
 
 Specifies the location of the virtual host's logfiles.
 
-Default value: $::apache::logroot
+Default value: `$::apache::logroot`
 
 ##### `logroot_ensure`
 
@@ -7277,7 +7394,7 @@ Data type: `Enum['directory', 'absent']`
 
 Determines whether or not to remove the logroot directory for a virtual host.
 
-Default value: 'directory'
+Default value: `'directory'`
 
 ##### `logroot_mode`
 
@@ -7287,7 +7404,7 @@ Overrides the mode the logroot directory is set to. Do *not* grant write access
 directory the logs are stored in without being aware of the consequences; for more
 information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `logroot_owner`
 
@@ -7295,7 +7412,7 @@ Data type: `Any`
 
 Sets individual user access to the logroot directory.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `logroot_group`
 
@@ -7303,15 +7420,15 @@ Data type: `Any`
 
 Sets group access to the `logroot` directory.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `log_level`
 
-Data type: `Any`
+Data type: `Optional[Apache::LogLevel]`
 
 Specifies the verbosity of the error log.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_body_limit`
 
@@ -7319,7 +7436,7 @@ Data type: `Any`
 
 Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_disable_vhost`
 
@@ -7327,7 +7444,7 @@ Data type: `Any`
 
 Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_disable_ids`
 
@@ -7347,7 +7464,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_disable_ips`
 
@@ -7355,7 +7472,7 @@ Data type: `Any`
 
 Specifies an array of IP addresses to exclude from `mod_security` rule matching.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_disable_msgs`
 
@@ -7374,7 +7491,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_disable_tags`
 
@@ -7393,7 +7510,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_audit_log_file`
 
@@ -7405,7 +7522,7 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_audit_log_pipe`
 
@@ -7418,7 +7535,7 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `modsec_audit_log`
 
@@ -7432,7 +7549,7 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `no_proxy_uris`
 
@@ -7441,7 +7558,7 @@ Data type: `Any`
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination
 with [`proxy_dest`](#proxy_dest).
 
-Default value: []
+Default value: `[]`
 
 ##### `no_proxy_uris_match`
 
@@ -7449,7 +7566,7 @@ Data type: `Any`
 
 This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
-Default value: []
+Default value: `[]`
 
 ##### `proxy_preserve_host`
 
@@ -7459,7 +7576,7 @@ Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod
 Setting this parameter to `true` enables the `Host:` line from an incoming request to be
 proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `proxy_add_headers`
 
@@ -7469,7 +7586,7 @@ Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/m
 This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For,
 X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_error_override`
 
@@ -7478,7 +7595,7 @@ Data type: `Any`
 Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride).
 This directive controls whether Apache should override error pages for proxied content.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `options`
 
@@ -7487,14 +7604,14 @@ Data type: `Any`
 Sets the `Options` for the specified virtual host. For example:
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   options => ['Indexes','FollowSymLinks','MultiViews'],
 }
 ```
 > **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options',
 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
-Default value: ['Indexes','FollowSymLinks','MultiViews']
+Default value: `['Indexes','FollowSymLinks','MultiViews']`
 
 ##### `override`
 
@@ -7503,7 +7620,7 @@ Data type: `Any`
 Sets the overrides for the specified virtual host. Accepts an array of
 [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
 
-Default value: ['None']
+Default value: `['None']`
 
 ##### `passenger_enabled`
 
@@ -7524,395 +7641,422 @@ apache::vhost { 'sample.example.net':
 > **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)
 using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_base_uri`
 
 Data type: `Optional[String]`
 
-Sets [PassengerBaseURI](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbase_rui),
+Sets [PassengerBaseURI](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbase_rui),
  to specify that the given URI is a distinct application served by Passenger.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_ruby`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
-Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby),
+Sets [PassengerRuby](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerruby),
 specifying the Ruby interpreter to use when serving the relevant web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_python`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
-Sets [PassengerPython](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpython),
+Sets [PassengerPython](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpython),
 specifying the Python interpreter to use when serving the relevant web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_nodejs`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
-Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs),
+Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengernodejs),
 specifying Node.js command to use when serving the relevant web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_meteor_app_settings`
 
 Data type: `Optional[String]`
 
-Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/library/config/apache/reference/#passengermeteorappsettings),
+Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermeteorappsettings),
 specifying a JSON file with settings for the application when using a Meteor
 application in non-bundled mode.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_app_env`
 
 Data type: `Optional[String]`
 
-Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv),
+Sets [PassengerAppEnv](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappenv),
 the environment for the Passenger application. If not specified, defaults to the global
 setting or 'production'.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_app_root`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
-Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot),
+Sets [PassengerRoot](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapproot),
 the location of the Passenger application root if different from the DocumentRoot.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_app_group_name`
 
 Data type: `Optional[String]`
 
-Sets [PassengerAppGroupName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappgroupname),
+Sets [PassengerAppGroupName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappgroupname),
  the name of the application group that the current application should belong to.
 
-Default value: `undef`
+Default value: ``undef``
+
+##### `passenger_app_start_command`
+
+Data type: `Optional[String]`
+
+Sets [PassengerAppStartCommand](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappstartcommand),
+ how Passenger should start your app on a specific port.
+
+Default value: ``undef``
 
 ##### `passenger_app_type`
 
 Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
-Sets [PassengerAppType](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapptype),
+Sets [PassengerAppType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapptype),
  to force Passenger to recognize the application as a specific type.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_startup_file`
 
 Data type: `Optional[String]`
 
-Sets the [PassengerStartupFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile)
+Sets the [PassengerStartupFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstartupfile),
 path. This path is relative to the application root.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_restart_dir`
 
 Data type: `Optional[String]`
 
-Sets the [PassengerRestartDir](https://www.phusionpassenger.com/library/config/apache/reference/#passengerrestartdir)
+Sets the [PassengerRestartDir](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrestartdir),
  to customize the directory in which `restart.txt` is searched for.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_spawn_method`
 
 Data type: `Optional[Enum['direct', 'smart']]`
 
-Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod),
+Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerspawnmethod),
 whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_load_shell_envvars`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloadshellenvvars),
+Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
 to enable or disable the loading of shell environment variables before spawning the application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_rolling_restarts`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/library/config/apache/reference/#passengerrollingrestarts),
+Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
 to enable or disable support for zero-downtime application restarts through `restart.txt`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_resist_deployment_errors`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/library/config/apache/reference/#passengerresistdeploymenterrors),
+Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerresistdeploymenterrors),
 to enable or disable resistance against deployment errors.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_user`
 
 Data type: `Optional[String]`
 
-Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser),
+Sets [PassengerUser](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeruser),
 the running user for sandboxing applications.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_group`
 
 Data type: `Optional[String]`
 
-Sets [PassengerGroup](https://www.phusionpassenger.com/library/config/apache/reference/#passengergroup),
+Sets [PassengerGroup](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengergroup),
 the running group for sandboxing applications.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_friendly_error_pages`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/library/config/apache/reference/#passengerfriendlyerrorpages),
+Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerfriendlyerrorpages),
 which can display friendly error pages whenever an application fails to start. This
 friendly error page presents the startup error message, some suggestions for solving
 the problem, a backtrace and a dump of the environment variables.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_min_instances`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances),
+Sets [PassengerMinInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermininstances),
 the minimum number of application processes to run.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_instances`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerMaxInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstances),
+Sets [PassengerMaxInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxinstances),
 the maximum number of application processes to run.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_preloader_idle_time`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpreloaderidletime),
+Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxpreloaderidletime),
 the maximum amount of time the preloader waits before shutting down an idle process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/library/config/apache/reference/#passengerforcemaxconcurrentrequestsperprocess),
+Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerforcemaxconcurrentrequestsperprocess),
 the maximum amount of concurrent requests the application can handle per process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_start_timeout`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout),
+Sets [PassengerStartTimeout](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstarttimeout),
 the timeout for the application startup.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_concurrency_model`
 
 Data type: `Optional[Enum['process', 'thread']]`
 
-Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerconcurrencyodel),
+Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerconcurrencyodel),
 to specify the I/O concurrency model that should be used for Ruby application processes.
 Passenger supports two concurrency models:<br />
-* `process` – single-threaded, multi-processed I/O concurrency.
-* `thread` – multi-threaded, multi-processed I/O concurrency.
+* `process` - single-threaded, multi-processed I/O concurrency.
+* `thread` - multi-threaded, multi-processed I/O concurrency.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_thread_count`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerThreadCount](https://www.phusionpassenger.com/library/config/apache/reference/#passengerthreadcount),
+Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerthreadcount),
 the number of threads that Passenger should spawn per Ruby application process.<br />
 This option only has effect if PassengerConcurrencyModel is `thread`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_requests`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests),
+Sets [PassengerMaxRequests](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequests),
 the maximum number of requests an application process will process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_request_time`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequesttime),
+Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequesttime),
 the maximum amount of time, in seconds, that an application process may take to
 process a request.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_memory_limit`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/library/config/apache/reference/#passengermemorylimit),
+Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermemorylimit),
 the maximum amount of memory that an application process may use, in megabytes.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_stat_throttle_rate`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstatthrottlerate),
+Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstatthrottlerate),
 to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_pre_start`
 
 Data type: `Optional[Variant[String,Array[String]]]`
 
-Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart),
+Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
 the URL of the application if pre-starting is required.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_high_performance`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerHighPerformance](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance),
+Sets [PassengerHighPerformance](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerhighperformance),
 to enhance performance in return for reduced compatibility.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_buffer_upload`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerBufferUpload](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbufferupload),
+Sets [PassengerBufferUpload](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferupload),
 to buffer HTTP client request bodies before they are sent to the application.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_buffer_response`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerBufferResponse](https://www.phusionpassenger.com/library/config/apache/reference/#passengerbufferresponse),
+Sets [PassengerBufferResponse](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferresponse),
 to buffer Happlication-generated responses.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_error_override`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerErrorOverride](https://www.phusionpassenger.com/library/config/apache/reference/#passengererroroverride),
+Sets [PassengerErrorOverride](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengererroroverride),
 to specify whether Apache will intercept and handle response with HTTP status codes of
 400 and higher.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_request_queue_size`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize),
+Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuesize),
 to specify the maximum amount of requests that are allowed to queue whenever the maximum
 concurrent request limit is reached. If the queue is already at this specified limit, then
 Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
 A value of 0 means that the queue size is unbounded.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_max_request_queue_time`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuetime),
+Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuetime),
 to specify the maximum amount of time that requests are allowed to stay in the queue
 whenever the maximum concurrent request limit is reached. If a request reaches this specified
 limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
 A value of 0 means that the queue time is unbounded.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_sticky_sessions`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerStickySessions](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions),
+Sets [PassengerStickySessions](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessions),
 to specify that, whenever possible, all requests sent by a client will be routed to the same
 originating application process.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_sticky_sessions_cookie_name`
 
 Data type: `Optional[String]`
 
-Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessionscookiename),
+Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookiename),
 to specify the name of the sticky sessions cookie.
 
-Default value: `undef`
+Default value: ``undef``
+
+##### `passenger_sticky_sessions_cookie_attributes`
+
+Data type: `Optional[String]`
+
+Sets [PassengerStickySessionsCookieAttributes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookieattributes),
+the attributes of the sticky sessions cookie.
+
+Default value: ``undef``
 
 ##### `passenger_allow_encoded_slashes`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/library/config/apache/reference/#passengerallowencodedslashes),
+Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerallowencodedslashes),
 to allow URLs with encoded slashes. Please note that this feature will not work properly
 unless Apache's `AllowEncodedSlashes` is also enabled.
 
-Default value: `undef`
+Default value: ``undef``
+
+##### `passenger_app_log_file`
+
+Data type: `Optional[String]`
+
+Sets [PassengerAppLogFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapplogfile),
+app specific messages logged to a different file in addition to Passenger log file.
+
+Default value: ``undef``
 
 ##### `passenger_debugger`
 
 Data type: `Optional[Boolean]`
 
-Sets [PassengerDebugger](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdebugger),
+Sets [PassengerDebugger](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerdebugger),
 to turn support for Ruby application debugging on or off.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
-Sets [PassengerLveMinUid](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlveminuid),
+Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerlveminuid),
 to only allow the spawning of application processes with UIDs equal to, or higher than, this
 specified value on LVE-enabled kernels.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `php_values`
 
@@ -7925,7 +8069,7 @@ Within a vhost declaration:
   php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
 ```
 
-Default value: {}
+Default value: `{}`
 
 ##### `php_flags`
 
@@ -7934,7 +8078,7 @@ Data type: `Any`
 Allows per-virtual host setting [`php_flags\``](http://php.net/manual/en/configuration.changes.php).
 These flags or values can be overwritten by a user or an application.
 
-Default value: {}
+Default value: `{}`
 
 ##### `php_admin_values`
 
@@ -7943,7 +8087,7 @@ Data type: `Any`
 Allows per-virtual host setting [`php_admin_value`](http://php.net/manual/en/configuration.changes.php).
 These flags or values cannot be overwritten by a user or an application.
 
-Default value: {}
+Default value: `{}`
 
 ##### `php_admin_flags`
 
@@ -7952,7 +8096,7 @@ Data type: `Any`
 Allows per-virtual host setting [`php_admin_flag`](http://php.net/manual/en/configuration.changes.php).
 These flags or values cannot be overwritten by a user or an application.
 
-Default value: {}
+Default value: `{}`
 
 ##### `port`
 
@@ -7962,7 +8106,7 @@ Sets the port the host is configured on. The module's defaults ensure the host l
 on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only
 listens on the port set in this parameter.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `priority`
 
@@ -7976,7 +8120,7 @@ used if no other names match.<br />
 aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
 To omit the priority prefix in file names, pass a priority of `false`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `protocols`
 
@@ -7985,7 +8129,7 @@ Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols)
 directive, which lists available protocols for the virutal host.
 
-Default value: []
+Default value: `[]`
 
 ##### `protocols_honor_order`
 
@@ -7994,7 +8138,7 @@ Data type: `Optional[Boolean]`
 Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
 directive which determines wether the order of Protocols sets precedence during negotiation.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_dest`
 
@@ -8002,7 +8146,7 @@ Data type: `Any`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_pass`
 
@@ -8012,7 +8156,7 @@ Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apach
 configuration. Optionally, parameters can be added as an array.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   proxy_pass => [
     { 'path' => '/a', 'url' => 'http://backend-a/' },
     { 'path' => '/b', 'url' => 'http://backend-b/' },
@@ -8037,7 +8181,7 @@ apache::vhost { 'site.name.fdqn':
 * `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
 * `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_dest_match`
 
@@ -8047,7 +8191,7 @@ This directive is equivalent to `proxy_dest`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_dest_reverse_match`
 
@@ -8057,7 +8201,7 @@ Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
 [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `proxy_pass_match`
 
@@ -8067,7 +8211,7 @@ This directive is equivalent to `proxy_pass`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `redirect_dest`
 
@@ -8075,7 +8219,7 @@ Data type: `Any`
 
 Specifies the address to redirect to.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `redirect_source`
 
@@ -8086,13 +8230,13 @@ If more than one item for redirect is supplied, the source and destination must
 length, and the items are order-dependent.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   redirect_source => ['/images','/downloads'],
   redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
 }
 ```
 
-Default value: '/'
+Default value: `'/'`
 
 ##### `redirect_status`
 
@@ -8101,12 +8245,12 @@ Data type: `Any`
 Specifies the status to append to the redirect.
 ``` puppet
   apache::vhost { 'site.name.fdqn':
-  …
+  ...
   redirect_status => ['temp','permanent'],
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `redirectmatch_regexp`
 
@@ -8117,14 +8261,14 @@ and where to forward the user to. Entered as an array alongside redirectmatch_st
 and redirectmatch_dest.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   redirectmatch_status => ['404','404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `redirectmatch_status`
 
@@ -8135,14 +8279,14 @@ and where to forward the user to. Entered as an array alongside redirectmatch_re
 and redirectmatch_dest.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   redirectmatch_status => ['404','404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `redirectmatch_dest`
 
@@ -8153,14 +8297,14 @@ and where to forward the user to. Entered as an array alongside redirectmatch_st
 and redirectmatch_regexp.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   redirectmatch_status => ['404','404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `request_headers`
 
@@ -8171,7 +8315,7 @@ in various ways, including adding additional request headers, removing request h
 and so on.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   request_headers => [
     'append MirrorID "mirror 12"',
     'unset MirrorID',
@@ -8179,7 +8323,7 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rewrites`
 
@@ -8191,7 +8335,7 @@ or `rewrite_map`.<br />
 For example, you can specify that anyone trying to access index.html is served welcome.html
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
 }
 ```
@@ -8199,7 +8343,7 @@ The parameter allows rewrite conditions that, when `true`, execute the associate
 For instance, if you wanted to rewrite URLs only if the visitor is using IE
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   rewrites => [
     {
       comment      => 'redirect IE',
@@ -8213,7 +8357,7 @@ You can also apply multiple conditions. For instance, rewrite index.html to welc
 only when the browser is Lynx or Mozilla (version 1 or 2)
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   rewrites => [
     {
       comment      => 'Lynx or Mozilla v1/2',
@@ -8226,7 +8370,7 @@ apache::vhost { 'site.name.fdqn':
 Multiple rewrites and conditions are also possible
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   rewrites => [
     {
       comment      => 'Lynx or Mozilla v1/2',
@@ -8256,7 +8400,7 @@ for more details on what is possible with rewrite rules and conditions.<br />
 and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather
 than setting the rewrites in the virtual host's directories.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rewrite_base`
 
@@ -8266,7 +8410,7 @@ The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rew
 specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
 that substitue a relative path.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rewrite_rule`
 
@@ -8275,7 +8419,7 @@ Data type: `Any`
 The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
 allows the user to define the rules that will be used by the rewrite engine.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rewrite_cond`
 
@@ -8285,7 +8429,7 @@ The parameter [`rewrite_cond`](https://httpd.apache.org/docs/current/mod/mod_rew
 defines a rule condition, that when satisfied will implement that rule within the
 rewrite engine.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `rewrite_inherit`
 
@@ -8298,7 +8442,7 @@ global settings. To activate inheritance, specify the `rewrites` parameter and s
 `rewrite_inherit` parameter to `true`:
 ``` puppet
 apache::vhost { 'site.name.fdqn':
-  …
+  ...
   rewrites => [
     <rules>,
   ],
@@ -8315,7 +8459,7 @@ RewriteOptions Inherit
 Refer to the official [`mod_rewrite`](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)
 documentation, section "Rewriting in Virtual Hosts".
 
-Default value: `false`
+Default value: ``false``
 
 ##### `scriptalias`
 
@@ -8324,7 +8468,7 @@ Data type: `Any`
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
 '/usr/scripts'.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `scriptaliases`
 
@@ -8357,7 +8501,7 @@ The ScriptAlias and ScriptAliasMatch directives are created in the order specifi
 As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases
 before more general ones to avoid shadowing.
 
-Default value: []
+Default value: `[]`
 
 ##### `serveradmin`
 
@@ -8365,7 +8509,7 @@ Data type: `Any`
 
 Specifies the email address Apache displays when it renders one of its error pages.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `serveraliases`
 
@@ -8374,7 +8518,7 @@ Data type: `Any`
 Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias)
 of the site.
 
-Default value: []
+Default value: `[]`
 
 ##### `servername`
 
@@ -8382,7 +8526,7 @@ Data type: `Any`
 
 Sets the servername corresponding to the hostname you connect to the virtual host at.
 
-Default value: $name
+Default value: `$name`
 
 ##### `setenv`
 
@@ -8396,7 +8540,7 @@ apache::vhost { 'setenv.example.com':
 }
 ```
 
-Default value: []
+Default value: `[]`
 
 ##### `setenvif`
 
@@ -8404,7 +8548,7 @@ Data type: `Any`
 
 Used by HTTPD to conditionally set environment variables for virtual hosts.
 
-Default value: []
+Default value: `[]`
 
 ##### `setenvifnocase`
 
@@ -8412,7 +8556,7 @@ Data type: `Any`
 
 Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
 
-Default value: []
+Default value: `[]`
 
 ##### `suexec_user_group`
 
@@ -8421,7 +8565,7 @@ Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 Allows the spcification of user and group execution privileges for CGI programs through
 inclusion of the `mod_suexec` module.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `suphp_addhandler`
 
@@ -8443,7 +8587,7 @@ apache::vhost { 'suphp.example.com':
 }
 ```
 
-Default value: $::apache::params::suphp_addhandler
+Default value: `$::apache::params::suphp_addhandler`
 
 ##### `suphp_configpath`
 
@@ -8465,7 +8609,7 @@ apache::vhost { 'suphp.example.com':
 }
 ```
 
-Default value: $::apache::params::suphp_configpath
+Default value: `$::apache::params::suphp_configpath`
 
 ##### `suphp_engine`
 
@@ -8487,7 +8631,7 @@ apache::vhost { 'suphp.example.com':
 }
 ```
 
-Default value: $::apache::params::suphp_engine
+Default value: `$::apache::params::suphp_engine`
 
 ##### `vhost_name`
 
@@ -8498,7 +8642,7 @@ virtual host is assigned a port, then the virtual host name is `vhost_name:port`
 If the virtual host has no assigned IP or port, the virtual host name is set to the
 title of the resource.
 
-Default value: '*'
+Default value: `'*'`
 
 ##### `virtual_docroot`
 
@@ -8516,7 +8660,7 @@ apache::vhost { 'subdomain.loc':
 }
 ```
 
-Default value: `false`
+Default value: ``false``
 
 ##### `wsgi_daemon_process`
 
@@ -8544,7 +8688,7 @@ apache::vhost { 'wsgi.example.com':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_daemon_process_options`
 
@@ -8555,7 +8699,7 @@ wsgi_daemon_process, wsgi_process_group,
 wsgi_script_aliases and wsgi_pass_authorization.<br />
 Sets the group ID that the virtual host runs under.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_application_group`
 
@@ -8569,7 +8713,7 @@ thus allowing you to specify which application group the WSGI application belong
 with all WSGI applications within the same group executing within the context of the
 same Python sub interpreter.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_import_script`
 
@@ -8581,7 +8725,7 @@ and wsgi_pass_authorization.<br />
 This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
 which can be used in order to specify a script file to be loaded upon a process starting.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_import_script_options`
 
@@ -8594,7 +8738,7 @@ This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readth
 which can be used in order to specify a script file to be loaded upon a process starting.<br />
 Specifies the process and aplication groups of the script.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_chunked_request`
 
@@ -8608,7 +8752,7 @@ allowing you to enable support for chunked request content.<br />
 WSGI is technically incapable of supporting chunked request content without all chunked
 request content having first been read in and buffered.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_process_group`
 
@@ -8619,7 +8763,7 @@ wsgi_daemon_process, wsgi_daemon_process_options,
 wsgi_script_aliases and wsgi_pass_authorization.<br />
 Requires a hash of web paths to filesystem `.wsgi paths/`.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_script_aliases`
 
@@ -8631,7 +8775,7 @@ and wsgi_pass_authorization.<br />
 Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
 For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_script_aliases_match`
 
@@ -8645,7 +8789,7 @@ This directive is similar to `wsgi_script_aliases`, but makes use of regular exp
 in place of simple prefix matching.<br />
 For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `wsgi_pass_authorization`
 
@@ -8656,7 +8800,7 @@ wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
 wsgi_script_aliases.<br />
 Enables support for chunked requests.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `directories`
 
@@ -8702,7 +8846,7 @@ apache::vhost { 'sample.example.net':
 Any handlers you do not set in these hashes are considered `undefined` within Puppet and
 are not added to the virtual host, resulting in the module using their default values.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `custom_fragment`
 
@@ -8710,7 +8854,7 @@ Pass a string of custom configuration directives to be placed at the end of the
 configuration.
 ``` puppet
 apache::vhost { 'monitor':
-  …
+  ...
   directories => [
     {
       path => '/path/to/directory',
@@ -8731,7 +8875,7 @@ ProxyStatus On',
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `error_documents`
 
@@ -8751,21 +8895,21 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: []
+Default value: `[]`
 
 ##### `h2_copy_files`
 
 Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.<br />
 Note that you must declare `class {'apache::mod::http2': }` before using this directive.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `h2_push_resource`
 
 Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.<br />
 Note that you must declare `class {'apache::mod::http2': }` before using this directive.
 
-Default value: []
+Default value: `[]`
 
 ##### `headers`
 
@@ -8780,7 +8924,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `options`
 
@@ -8797,7 +8941,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ['Indexes','FollowSymLinks','MultiViews']
+Default value: `['Indexes','FollowSymLinks','MultiViews']`
 
 ##### `shib_compat_valid_user`
 
@@ -8810,7 +8954,7 @@ Apache behavior when processing the `valid-user` and `user` Require rules. See t
 and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess)
 topic for more details. This key is disabled if `apache::mod::shib` is not defined.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_options`
 
@@ -8833,7 +8977,7 @@ apache::vhost { 'secure.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `additional_includes`
 
@@ -8850,7 +8994,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: []
+Default value: `[]`
 
 ##### `ssl`
 
@@ -8858,7 +9002,7 @@ Data type: `Boolean`
 
 Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
 
-Default value: `false`
+Default value: ``false``
 
 ##### `ssl_ca`
 
@@ -8867,7 +9011,7 @@ Data type: `Any`
 Specifies the SSL certificate authority to be used to verify client certificates used
 for authentication. You must also set `ssl_verify_client` to use this.
 
-Default value: $::apache::default_ssl_ca
+Default value: `$::apache::default_ssl_ca`
 
 ##### `ssl_cert`
 
@@ -8875,7 +9019,7 @@ Data type: `Any`
 
 Specifies the SSL certification.
 
-Default value: $::apache::default_ssl_cert
+Default value: `$::apache::default_ssl_cert`
 
 ##### `ssl_protocol`
 
@@ -8884,7 +9028,7 @@ Data type: `Any`
 Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol).
 Expects an array or space separated string of accepted protocols.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_cipher`
 
@@ -8892,7 +9036,7 @@ Data type: `Any`
 
 Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_honorcipherorder`
 
@@ -8902,7 +9046,7 @@ Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.htm
 to cause Apache to use the server's preferred order of ciphers rather than the client's
 preferred order.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_certs_dir`
 
@@ -8911,7 +9055,7 @@ Data type: `Any`
 Specifies the location of the SSL certification directory to verify client certs. Will not
 be used unless `ssl_verify_client` is also set (see below).
 
-Default value: $::apache::params::ssl_certs_dir
+Default value: `$::apache::params::ssl_certs_dir`
 
 ##### `ssl_chain`
 
@@ -8921,7 +9065,7 @@ Specifies the SSL chain. This default works out of the box, but it must be updat
 the base `apache` class with your specific certificate information before being used in
 production.
 
-Default value: $::apache::default_ssl_chain
+Default value: `$::apache::default_ssl_chain`
 
 ##### `ssl_crl`
 
@@ -8931,7 +9075,7 @@ Specifies the certificate revocation list to use. (This default works out of the
 must be updated in the base `apache` class with your specific certificate information
 before being used in production.)
 
-Default value: $::apache::default_ssl_crl
+Default value: `$::apache::default_ssl_crl`
 
 ##### `ssl_crl_path`
 
@@ -8942,7 +9086,7 @@ client authentication with. (This default works out of the box but must be updat
 the base `apache` class with your specific certificate information before being used in
 production.)
 
-Default value: $::apache::default_ssl_crl_path
+Default value: `$::apache::default_ssl_crl_path`
 
 ##### `ssl_crl_check`
 
@@ -8953,7 +9097,7 @@ for ssl client authentication. The default works out of the box but must be spec
 using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on
 older versions.
 
-Default value: $::apache::default_ssl_crl_check
+Default value: `$::apache::default_ssl_crl_check`
 
 ##### `ssl_key`
 
@@ -8964,7 +9108,7 @@ Defaults are based on your operating system. Default work out of the box but mus
 updated in the base `apache` class with your specific certificate information before
 being used in production.
 
-Default value: $::apache::default_ssl_key
+Default value: `$::apache::default_ssl_key`
 
 ##### `ssl_verify_client`
 
@@ -8974,12 +9118,12 @@ Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.htm
 directive, which sets the certificate verification level for client authentication.
 ``` puppet
 apache::vhost { 'sample.example.net':
-  …
+  ...
   ssl_verify_client => 'optional',
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_verify_depth`
 
@@ -8990,13 +9134,13 @@ directive, which specifies the maximum depth of CA certificates in client certif
 verification. You must set `ssl_verify_client` for it to take effect.
 ``` puppet
 apache::vhost { 'sample.example.net':
-  …
+  ...
   ssl_verify_client => 'require',
   ssl_verify_depth => 1,
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_protocol`
 
@@ -9007,7 +9151,7 @@ directive, which controls which SSL protocol flavors `mod_ssl` should use when e
 its server environment for proxy. It connects to servers using only one of the provided
 protocols.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_verify`
 
@@ -9017,7 +9161,7 @@ Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html
 directive, which configures certificate verification of the remote server when a proxy is
 configured to forward requests to a remote SSL server.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_verify_depth`
 
@@ -9030,7 +9174,7 @@ A depth of 0 means that only self-signed remote server certificates are accepted
 the default depth of 1 means the remote server certificate can be self-signed or
 signed by a CA that is directly known to the server.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_cipher_suite`
 
@@ -9039,7 +9183,7 @@ Data type: `Any`
 Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)
 directive, which controls cipher suites supported for ssl proxy traffic.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_ca_cert`
 
@@ -9051,7 +9195,7 @@ of Certification Authorities (CA) whose remote servers you deal with. These are
 for Remote Server Authentication. This file should be a concatenation of the PEM-encoded
 certificate files in order of preference.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_machine_cert`
 
@@ -9063,12 +9207,12 @@ for this server to authenticate itself to remote servers. This file should be a
 concatenation of the PEM-encoded certificate files in order of preference.
 ``` puppet
 apache::vhost { 'sample.example.net':
-  …
+  ...
   ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_check_peer_cn`
 
@@ -9078,7 +9222,7 @@ Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl
 directive, which specifies whether the remote server certificate's CN field is compared
 against the hostname of the request URL.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_check_peer_name`
 
@@ -9088,7 +9232,7 @@ Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_s
 directive, which specifies whether the remote server certificate's CN field is compared
 against the hostname of the request URL.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxy_check_peer_expire`
 
@@ -9098,7 +9242,7 @@ Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod
 directive, which specifies whether the remote server certificate is checked for expiration
 or not.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_options`
 
@@ -9108,19 +9252,19 @@ setting for the given virtual host and can be a string or an array.<br />
 A string:
 ``` puppet
 apache::vhost { 'sample.example.net':
-  …
+  ...
   ssl_options => '+ExportCertData',
 }
 ```
 An array:
 ``` puppet
 apache::vhost { 'sample.example.net':
-  …
+  ...
   ssl_options => ['+StrictRequire', '+ExportCertData'],
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_openssl_conf_cmd`
 
@@ -9129,7 +9273,7 @@ Data type: `Any`
 Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)
 directive, which provides direct configuration of OpenSSL parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_proxyengine`
 
@@ -9137,7 +9281,7 @@ Data type: `Boolean`
 
 Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
 
-Default value: `false`
+Default value: ``false``
 
 ##### `ssl_stapling`
 
@@ -9147,7 +9291,7 @@ Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/cu
 By default, uses what is set globally.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_stapling_timeout`
 
@@ -9156,7 +9300,7 @@ Data type: `Any`
 Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `ssl_stapling_return_errors`
 
@@ -9165,7 +9309,7 @@ Data type: `Any`
 Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `use_canonical_name`
 
@@ -9174,7 +9318,7 @@ Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
 Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
 which allows you to configure how the server determines it's own name and port.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `define`
 
@@ -9183,7 +9327,73 @@ Data type: `Hash`
 this lets you define configuration variables inside a vhost using [`Define`](https://httpd.apache.org/docs/2.4/mod/core.html#define),
 these can then be used to replace configuration values. All Defines are Undefined at the end of the VirtualHost.
 
-Default value: {}
+Default value: `{}`
+
+##### `auth_oidc`
+
+Data type: `Boolean`
+
+Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
+
+Default value: ``false``
+
+##### `oidc_settings`
+
+Data type: `Optional[Apache::OIDCSettings]`
+
+An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf].
+
+Default value: ``undef``
+
+##### `limitreqfields`
+
+Data type: `Optional[Integer]`
+
+The `limitreqfields` parameter sets the maximum number of request header fields in
+an HTTP request. This directive gives the server administrator greater control over
+abnormal client request behavior, which may be useful for avoiding some forms of
+denial-of-service attacks. The value should be increased if normal clients see an error
+response from the server that indicates too many fields were sent in the request.
+
+Default value: ``undef``
+
+##### `limitreqfieldsize`
+
+Data type: `Optional[Integer]`
+
+The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
+be allowed within a request header.
+
+Default value: ``undef``
+
+##### `limitreqline`
+
+Data type: `Optional[Integer]`
+
+Limit the size of the HTTP request line that will be accepted from the client
+This directive sets the number of bytes that will be allowed on the HTTP
+request-line. The LimitRequestLine directive allows the server administrator
+to set the limit on the allowed size of a client's HTTP request-line. Since
+the request-line consists of the HTTP method, URI, and protocol version, the
+LimitRequestLine directive places a restriction on the length of a request-URI
+allowed for a request on the server. A server needs this value to be large
+enough to hold any of its resource names, including any information that might
+be passed in the query part of a GET request.
+
+Default value: ``undef``
+
+##### `limitreqbody`
+
+Data type: `Optional[Integer]`
+
+Restricts the total size of the HTTP request body sent from the client
+The LimitRequestBody directive allows the user to set a limit on the allowed
+size of an HTTP request message body within the context in which the
+directive is given (server, per-directory, per-file or per-location). If the
+client request exceeds that limit, the server will return an error response
+instead of servicing the request.
+
+Default value: ``undef``
 
 ##### `proxy_requests`
 
@@ -9191,9 +9401,9 @@ Data type: `Boolean`
 
 
 
-Default value: `false`
+Default value: ``false``
 
-### apache::vhost::custom
+### `apache::vhost::custom`
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
 
@@ -9213,7 +9423,7 @@ Data type: `Any`
 
 Specifies if the virtual host file is present or absent.
 
-Default value: 'present'
+Default value: `'present'`
 
 ##### `priority`
 
@@ -9221,7 +9431,7 @@ Data type: `Any`
 
 Sets the relative load order for Apache HTTPD VirtualHost configuration files.
 
-Default value: '25'
+Default value: `'25'`
 
 ##### `verify_config`
 
@@ -9229,9 +9439,9 @@ Data type: `Any`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Default value: `true`
+Default value: ``true``
 
-### apache::vhost::fragment
+### `apache::vhost::fragment`
 
 Define a fragment within a vhost
 
@@ -9305,7 +9515,7 @@ Data type: `Any`
 Set the priority to match the one `apache::vhost` sets. This must match the
 one `apache::vhost` sets or else the concat fragment won't be found.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `content`
 
@@ -9314,7 +9524,7 @@ Data type: `Optional[String]`
 The content to put in the fragment. Only when it's non-empty the actual
 fragment will be created.
 
-Default value: `undef`
+Default value: ``undef``
 
 ##### `order`
 
@@ -9322,11 +9532,11 @@ Data type: `Integer[0]`
 
 The order to insert the fragment at
 
-Default value: 900
+Default value: `900`
 
 ## Resource types
 
-### a2mod
+### `a2mod`
 
 Manage Apache 2 modules
 
@@ -9336,53 +9546,56 @@ The following properties are available in the `a2mod` type.
 
 ##### `ensure`
 
-Valid values: present, absent
+Valid values: `present`, `absent`
 
 The basic property that the resource should be in.
 
-Default value: present
+Default value: `present`
 
 #### Parameters
 
 The following parameters are available in the `a2mod` type.
 
-##### `name`
-
-namevar
+##### `identifier`
 
-The name of the module to be managed
+Module identifier string used by LoadModule. Default: module-name_module
 
 ##### `lib`
 
 The name of the .so library to be loaded
 
-##### `identifier`
+##### `name`
 
-Module identifier string used by LoadModule. Default: module-name_module
+namevar
+
+The name of the module to be managed
+
+##### `provider`
+
+The specific backend to use for this `a2mod` resource. You will seldom need to specify this --- Puppet will usually
+discover the appropriate provider for your platform.
 
 ## Functions
 
-### apache::apache_pw_hash
+### `apache::apache_pw_hash`
 
 Type: Ruby 4.x API
 
-Currently uses SHA-hashes, because although this format is considered insecure, its the
-most secure format supported by the most platforms.
+DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
 
-#### `apache::apache_pw_hash(String[1] $password)`
+#### `apache::apache_pw_hash(Any *$args)`
 
-Currently uses SHA-hashes, because although this format is considered insecure, its the
-most secure format supported by the most platforms.
+The apache::apache_pw_hash function.
 
-Returns: `String` Return's the hash of the input that was given.
+Returns: `Any`
 
-##### `password`
+##### `*args`
+
+Data type: `Any`
 
-Data type: `String[1]`
 
-The input that is to be hashed.
 
-### apache::bool2httpd
+### `apache::bool2httpd`
 
 Type: Ruby 4.x API
 
@@ -9396,16 +9609,16 @@ Transform a supposed boolean to On or Off. Passes all other values through.
 $trace_enable     = false
 $server_signature = 'mail'
 
-bool2httpd($trace_enable) # returns 'Off'
-bool2httpd($server_signature) # returns 'mail'
-bool2httpd(undef) # returns 'Off'
+apache::bool2httpd($trace_enable) # returns 'Off'
+apache::bool2httpd($server_signature) # returns 'mail'
+apache::bool2httpd(undef) # returns 'Off'
 ```
 
 #### `apache::bool2httpd(Any $arg)`
 
 The apache::bool2httpd function.
 
-Returns: `Any` Will return either `On` or `Off` if given a boolean value. Return's a string of any
+Returns: `Any` Will return either `On` or `Off` if given a boolean value. Returns a string of any
 other given value.
 
 ##### Examples
@@ -9416,9 +9629,9 @@ other given value.
 $trace_enable     = false
 $server_signature = 'mail'
 
-bool2httpd($trace_enable) # returns 'Off'
-bool2httpd($server_signature) # returns 'mail'
-bool2httpd(undef) # returns 'Off'
+apache::bool2httpd($trace_enable) # returns 'Off'
+apache::bool2httpd($server_signature) # returns 'mail'
+apache::bool2httpd(undef) # returns 'Off'
 ```
 
 ##### `arg`
@@ -9427,142 +9640,211 @@ Data type: `Any`
 
 The value to be converted into a string.
 
-### apache::validate_apache_log_level
+### `apache::pw_hash`
 
 Type: Ruby 4.x API
 
-As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
-    * validate_apache_loglevel('info')
-
-Modules maybe specified with their own levels like these:
-    * validate_apache_loglevel('warn ssl:info')
-    * validate_apache_loglevel('warn mod_ssl.c:info')
-    * validate_apache_loglevel('warn ssl_module:info')
-
-Expected to be used from the main or vhost.
-Might be used from directory too later as apache supports that
-
-#### `apache::validate_apache_log_level(String $log_level)`
-
-As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
-    * validate_apache_loglevel('info')
-
-Modules maybe specified with their own levels like these:
-    * validate_apache_loglevel('warn ssl:info')
-    * validate_apache_loglevel('warn mod_ssl.c:info')
-    * validate_apache_loglevel('warn ssl_module:info')
-
-Expected to be used from the main or vhost.
-Might be used from directory too later as apache supports that
-
-Returns: `Any` Return's an error if the validation fails.
-
-##### `log_level`
-
-Data type: `String`
-
-The string that is to be validated.
-
-### apache_pw_hash
-
-Type: Ruby 3.x API
-
-Currently uses SHA-hashes, because although this format is considered insecure, its the
+Currently uses SHA-hashes, because although this format is considered insecure, it's the
 most secure format supported by the most platforms.
 
-#### `apache_pw_hash(Any $password)`
+#### `apache::pw_hash(String[1] $password)`
 
-Currently uses SHA-hashes, because although this format is considered insecure, its the
+Currently uses SHA-hashes, because although this format is considered insecure, it's the
 most secure format supported by the most platforms.
 
-Returns: `Any` Return's the hash of the input that was given.
+Returns: `String` Returns the hash of the input that was given.
 
 ##### `password`
 
-Data type: `Any`
+Data type: `String[1]`
 
 The input that is to be hashed.
 
-### bool2httpd
+### `apache_pw_hash`
 
-Type: Ruby 3.x API
+Type: Ruby 4.x API
 
-Transform a supposed boolean to On or Off. Pass all other values through.
+DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
 
-#### Examples
+#### `apache_pw_hash(Any *$args)`
 
-##### 
+The apache_pw_hash function.
 
-```puppet
-$trace_enable     = false
-$server_signature = 'mail'
+Returns: `Any`
 
-bool2httpd($trace_enable) # returns 'Off'
-bool2httpd($server_signature) # returns 'mail'
-bool2httpd(undef) # returns 'Off'
-```
+##### `*args`
 
-#### `bool2httpd(Any $arg)`
+Data type: `Any`
 
-The bool2httpd function.
 
-Returns: `Any` Will return either `On` or `Off` if given a boolean value. Return's a string of any
-other given value.
 
-##### Examples
+### `bool2httpd`
 
-###### 
+Type: Ruby 4.x API
 
-```puppet
-$trace_enable     = false
-$server_signature = 'mail'
+DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
 
-bool2httpd($trace_enable) # returns 'Off'
-bool2httpd($server_signature) # returns 'mail'
-bool2httpd(undef) # returns 'Off'
-```
+#### `bool2httpd(Any *$args)`
 
-##### `arg`
+The bool2httpd function.
 
-Data type: `Any`
+Returns: `Any`
 
-The value to be converted into a string.
+##### `*args`
 
-### validate_apache_log_level
+Data type: `Any`
 
-Type: Ruby 3.x API
 
-As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
-    * validate_apache_loglevel('info')
-Modules maybe specified with their own levels like these:
-    * validate_apache_loglevel('warn ssl:info')
-    * validate_apache_loglevel('warn mod_ssl.c:info')
-    * validate_apache_loglevel('warn ssl_module:info')
-Expected to be used from the main or vhost.
-Might be used from directory too later as apaceh supports that
 
-#### `validate_apache_log_level(Any $log_level)`
+## Data types
 
-As per http://httpd.apache.org/docs/current/mod/core.html#loglevel
-    * validate_apache_loglevel('info')
-Modules maybe specified with their own levels like these:
-    * validate_apache_loglevel('warn ssl:info')
-    * validate_apache_loglevel('warn mod_ssl.c:info')
-    * validate_apache_loglevel('warn ssl_module:info')
-Expected to be used from the main or vhost.
-Might be used from directory too later as apaceh supports that
+### `Apache::LogLevel`
 
-Returns: `Any` Return's an error if the validation fails.
+A string that conforms to the Apache `LogLevel` syntax.
+Different levels can be specified for individual apache modules.
 
-##### `log_level`
+ie. `[module:]level [module:level] ...`
 
-Data type: `Any`
+The levels are (in order of decreasing significance):
+* `emerg`
+* `alert`
+* `crit`
+* `error`
+* `warn`
+* `notice`
+* `info`
+* `debug`
+* `trace1`
+* `trace2`
+* `trace3`
+* `trace4`
+* `trace5`
+* `trace6`
+* `trace7`
+* `trace8`
 
-The string that is to be validated.
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/core.html#loglevel
+
+Alias of `Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]`
+
+### `Apache::OIDCSettings`
+
+https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
+
+Alias of `Struct[{
+    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['CryptoPassphrase']                        => String,
+    Optional['MetadataDir']                             => String,
+    Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,
+    Optional['ProviderIssuer']                          => String,
+    Optional['ProviderAuthorizationEndpoint']           => Stdlib::HTTPSUrl,
+    Optional['ProviderJwksUri']                         => Stdlib::HTTPSUrl,
+    Optional['ProviderTokenEndpoint']                   => Stdlib::HTTPSUrl,
+    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','none'],
+    Optional['ProviderTokenEndpointParams']             => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['ProviderUserInfoEndpoint']                => Stdlib::HTTPSUrl,
+    Optional['ProviderCheckSessionIFrame']              => Stdlib::HTTPSUrl,
+    Optional['ProviderEndSessionEndpoint']              => Stdlib::HTTPSUrl,
+    Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
+    Optional['ProviderBackChannelLogoutSupported']      => Enum['On','Off'],
+    Optional['ProviderRegistrationEndpointJson']        => String,
+    Optional['Scope']                                   => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
+    Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['SSLValidateServer']                       => Enum['On','Off'],
+    Optional['UserInfoRefreshInterval']                 => Integer,
+    Optional['JWKSRefreshInterval']                     => Integer,
+    Optional['UserInfoTokenMethod']                     => Enum['authz_header','post_param'],
+    Optional['ProviderAuthRequestMethod']               => Enum['GET','POST'],
+    Optional['PublicKeyFiles']                          => String,
+    Optional['ResponseType']                            => Enum['code','id_token','id_token token','code id_token','code token','code id_token token'],
+    Optional['ResponseMode']                            => Enum['fragment','query','form_post'],
+    Optional['ClientID']                                => String,
+    Optional['ClientSecret']                            => String,
+    Optional['ClientTokenEndpointCert']                 => String,
+    Optional['ClientTokenEndpointKey']                  => String,
+    Optional['ClientName']                              => String,
+    Optional['ClientContact']                           => String,
+    Optional['PKCDMethod']                              => Enum['plain','S256','referred_tb'],
+    Optional['TokenBindingPolicy']                      => Enum['disabled','optional','required','enforced'],
+    Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
+    Optional['IDTokenSignedResponseAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
+    Optional['UserInfoSignedResposeAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
+    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
+    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
+    Optional['OAuthServerMetadataURL']                  => Stdlib::HTTPSUrl,
+    Optional['AuthIntrospectionEndpoint']               => Stdlib::HTTPSUrl,
+    Optional['OAuthClientID']                           => String,
+    Optional['OAuthClientSecret']                       => String,
+    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','bearer_access_token','none'],
+    Optional['OAuthIntrospectionClientAuthBearerToken'] => String,
+    Optional['OAuthIntrospectionEndpointCert']          => String,
+    Optional['OAuthIntrospectionEndpointKey']           => String,
+    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST','GET'],
+    Optional['OAuthIntrospectionEndpointParams']        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['OAuthIntrospectionTokenParamName']        => String,
+    Optional['OAuthTokenExpiryClaim']                   => Pattern[/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/],
+    Optional['OAuthSSLValidateServer']                  => Enum['On','Off'],
+    Optional['OAuthVerifySharedKeys']                   => String,
+    Optional['OAuthVerifyCertFiles']                    => String,
+    Optional['OAuthVerifyJwksUri']                      => Stdlib::HTTPSUrl,
+    Optional['OAuthRemoteUserClaim']                    => String,
+    Optional['OAuthAcceptTokenAs']                      => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
+    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled','optional','required','enforced'],
+    Optional['Cookie']                                  => String,
+    Optional['SessionCookieChunkSize']                  => Integer,
+    Optional['CookieHTTPOnly']                          => Enum['On','Off'],
+    Optional['CookieSameSite']                          => Enum['On','Off'],
+    Optional['PassCookies']                             => String,
+    Optional['StripCookies']                            => String,
+    Optional['StateMaxNumberOfCookies']                 => Pattern[/^[0-9]+\s(false|true)$/],
+    Optional['SessionInactivityTimeout']                => Integer,
+    Optional['SessionMaxDuration']                      => Integer,
+    Optional['SessionType']                             => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/],
+    Optional['SessionCacheFallbackToCookie']            => Enum['On','Off'],
+    Optional['CacheType']                               => Enum['shm','memcache','file','redis'],
+    Optional['CacheEncrypt']                            => Enum['On','Off'],
+    Optional['CacheShmMax']                             => Integer,
+    Optional['CacheShmEntrySizeMax']                    => Integer,
+    Optional['CacheFileCleanInterval']                  => Integer,
+    Optional['MemCacheServers']                         => String,
+    Optional['RedisCacheServer']                        => String,
+    Optional['RedisCachePassword']                      => String,
+    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['HTMLErrorTemplate']                       => String,
+    Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['PathScope']                               => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
+    Optional['PathAuthRequestParams']                   => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['IDTokenIatSlack']                         => Integer,
+    Optional['ClaimPrefix']                             => String,
+    Optional['ClaimDelimiter']                          => Pattern[/^.$/],
+    Optional['RemoteUserClaim']                         => String,
+    Optional['PassIDTokenAs']                           => Pattern[/^((claims|payload|serialized)\s?)+$/],
+    Optional['PassUserInfoAs']                          => Pattern[/^((claims|json|jwt)\s?)+$/],
+    Optional['PassClaimsAs']                            => Enum['none','headers','environment','both'],
+    Optional['AuthNHeader']                             => String,
+    Optional['HTTPTimeoutLong']                         => Integer,
+    Optional['HTTPTimeoutShort']                        => Integer,
+    Optional['StateTimeout']                            => Integer,
+    Optional['ScrubRequestHeaders']                     => Enum['On','Off'],
+    Optional['OutgoingProxy']                           => String,
+    Optional['UnAuthAction']                            => Enum['auth','pass','401','410'],
+    Optional['UnAuthzAction']                           => Enum['401','403','auth'],
+    Optional['PreservePost']                            => Enum['On','Off'],
+    Optional['PassRefreshToken']                        => Enum['On','Off'],
+    Optional['RequestObject']                           => String,
+    Optional['ProviderMetadataRefreshInterval']         => Integer,
+    Optional['InfoHook']                                => Pattern[/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/],
+    Optional['BlackListedClaims']                       => String,
+    Optional['WhiteListedClaims']                       => String,
+    Optional['RefreshAccessTokenBeforeExpiry']          => Pattern[/^[0-9]+(\slogout_on_error)?$/],
+  }]`
 
 ## Tasks
 
-### init
+### `init`
 
 Allows you to perform apache service functions
 
diff --git a/metadata.json b/metadata.json
index a95496c0da..f6ae412024 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.5.0",
+  "version": "5.6.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From c0d64643e340aacc84b99edc2226f2dd14db7572 Mon Sep 17 00:00:00 2001
From: Abel Navarro <abel.navarro@webfleet.com>
Date: Fri, 2 Oct 2020 10:01:57 +0200
Subject: [PATCH 1700/2267] Extend vhost proxy options

Added the Apache vhost proxy config option
SSLProxyMachineCertificateChainFile.

Reference: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatechainfile
---
 REFERENCE.md                  | 14 ++++++++++++++
 manifests/vhost.pp            | 10 ++++++++++
 templates/vhost/_sslproxy.erb |  3 +++
 3 files changed, 27 insertions(+)

diff --git a/REFERENCE.md b/REFERENCE.md
index 0d344242c5..80b01aeb5f 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -9070,6 +9070,20 @@ apache::vhost { 'sample.example.net':
 
 Default value: `undef`
 
+##### `ssl_proxy_machine_cert_chain`
+
+Data type: `Any`
+
+Sets the [SSLProxyMachineCertificateChainFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatechainfile)
+directive, which specifies an all-in-one file where you keep the certificate chain for
+all of the client certs in use. This directive will be needed if the remote server
+presents a list of CA certificates that are not direct signers of one of the configured
+client certificates. This referenced file is simply the concatenation of the various
+PEM-encoded certificate files. Upon startup, each client certificate configured will be
+examined and a chain of trust will be constructed.
+
+Default value: `undef`
+
 ##### `ssl_proxy_check_peer_cn`
 
 Data type: `Optional[Enum['on', 'off']]`
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ebb15f09a5..a60c0e54d3 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1592,6 +1592,14 @@
 #     ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
 #   }
 #   ```
+# @param ssl_proxy_machine_cert_chain
+#   Sets the [SSLProxyMachineCertificateChainFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatechainfile)
+#   directive, which specifies an all-in-one file where you keep the certificate chain for
+#   all of the client certs in use. This directive will be needed if the remote server
+#   presents a list of CA certificates that are not direct signers of one of the configured
+#   client certificates. This referenced file is simply the concatenation of the various
+#   PEM-encoded certificate files. Upon startup, each client certificate configured will be
+#   examined and a chain of trust will be constructed.
 #
 # @param ssl_proxy_check_peer_cn
 #   Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) 
@@ -1726,6 +1734,7 @@
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                            = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                          = undef,
   $ssl_proxy_machine_cert                                                           = undef,
+  $ssl_proxy_machine_cert_chain                                                     = undef,
   $ssl_proxy_cipher_suite                                                           = undef,
   $ssl_proxy_protocol                                                               = undef,
   $ssl_options                                                                      = undef,
@@ -2475,6 +2484,7 @@
   # - $ssl_proxy_check_peer_name
   # - $ssl_proxy_check_peer_expire
   # - $ssl_proxy_machine_cert
+  # - $ssl_proxy_machine_cert_chain
   # - $ssl_proxy_protocol
   if $ssl_proxyengine {
     concat::fragment { "${name}-sslproxy":
diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
index 2db394ab0e..ff6b61e3c9 100644
--- a/templates/vhost/_sslproxy.erb
+++ b/templates/vhost/_sslproxy.erb
@@ -23,6 +23,9 @@
   <%- if @ssl_proxy_machine_cert -%>
   SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
   <%- end -%>
+  <%- if @ssl_proxy_machine_cert_chain -%>
+  SSLProxyMachineCertificateChainFile "<%= @ssl_proxy_machine_cert_chain %>"
+  <%- end -%>
   <%- if @ssl_proxy_cipher_suite -%>
   SSLProxyCipherSuite <%= @ssl_proxy_cipher_suite %>
   <%- end -%>

From 7731b8cf6786f4f8ba666ece633285e82a17a968 Mon Sep 17 00:00:00 2001
From: sanfrancrisko <55992494+sanfrancrisko@users.noreply.github.com>
Date: Fri, 14 Aug 2020 10:43:41 +0100
Subject: [PATCH 1701/2267] Merge pull request #2060 from ekohl/ruby-2.7

Use Ruby 2.7 compatible string matching
---
 lib/puppet/functions/apache/bool2httpd.rb | 10 ++++++++--
 spec/functions/bool2httpd_spec.rb         |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
index 991216408c..511adba65b 100644
--- a/lib/puppet/functions/apache/bool2httpd.rb
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -17,8 +17,14 @@
   #   apache::bool2httpd(undef) # returns 'Off'
   #
   def bool2httpd(arg)
-    return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
-    return 'On' if arg == true || arg =~ %r{true}i
+    return 'Off' if arg.nil? || arg == false || matches_string?(arg, %r{false}i) || arg == :undef
+    return 'On' if arg == true || matches_string?(arg, %r{true}i)
     arg.to_s
   end
+
+  private
+
+  def matches_string?(value, matcher)
+    value.is_a?(String) && value.match?(matcher)
+  end
 end
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
index e436e0e3a6..fabcf2749e 100644
--- a/spec/functions/bool2httpd_spec.rb
+++ b/spec/functions/bool2httpd_spec.rb
@@ -5,10 +5,12 @@
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params(true).and_return('On') }
+  it { is_expected.to run.with_params('true').and_return('On') }
   it 'expected to return a string "On"' do
     expect(subject.execute(true)).to be_an_instance_of(String)
   end
   it { is_expected.to run.with_params(false).and_return('Off') }
+  it { is_expected.to run.with_params('false').and_return('Off') }
   it 'expected to return a string "Off"' do
     expect(subject.execute(false)).to be_an_instance_of(String)
   end

From 891fdaf24992e0e96b0ae14e2eca8f1991db373a Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Fri, 23 Oct 2020 13:23:00 +0200
Subject: [PATCH 1702/2267] Support mod_auth_gssapi parameters

mod_auth_gssapi parameters can only used inside a directory section of a vhost.

Parameters are specified as a hash `gssapi` to the directories parameter.

Currently only the three obvious parameters are supported, adding extra ones is a
trivial addition to the `_gssapi.epp` template.

Example

```puppet
include apache::mod::auth_gssapi
apache::vhost { 'sample.example.net':
  docroot     => '/path/to/directory',
  directories => [
    { path   => '/path/to/different/dir',
      gssapi => {
        credstore => 'keytab:/foo/bar.keytab',
        localname => 'Off',
        sslonly   => 'On',
      }
    },
  ],
```

These 3 values match to an apache configuration of

```config
<Directory /path/to/directory>
  GssapiSSLonly Off
  GssapiLocalName On
  GssapiCredStore keytab:/foo/bar.keytab
</Directory>
```

https://github.com/gssapi/mod_auth_gssapi#gssapisslonly
---
 manifests/vhost.pp               | 18 ++++++++++++++++++
 spec/defines/vhost_spec.rb       | 20 ++++++++++++++++++++
 templates/vhost/_directories.erb |  3 +++
 templates/vhost/_gssapi.epp      | 16 ++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 templates/vhost/_gssapi.epp

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a7da4ba7dc..24eb29931e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1475,6 +1475,24 @@
 #   }
 #   ```
 # 
+# @param gssapi
+#  Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
+#  ```puppet
+#   include apache::mod::auth_gssapi
+#   apache::vhost { 'sample.example.net':
+#     docroot     => '/path/to/directory',
+#     directories => [
+#       { path   => '/path/to/different/dir',
+#         gssapi => {
+#           credstore => 'keytab:/foo/bar.keytab',
+#           localname => 'Off',
+#           sslonly   => 'On',
+#         }
+#       },
+#     ],
+#   }
+#   ```
+#
 # @param ssl
 #   Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
 #
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 61a9869a58..148bd7a98f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -246,6 +246,11 @@
                   'passenger_allow_encoded_slashes'                     => false,
                   'passenger_app_log_file'                              => '/tmp/app.log',
                   'passenger_debugger'                                  => false,
+                  'gssapi'                                              => {
+                    'credstore' => 'keytab:/foo/bar.keytab',
+                    'localname' => 'On',
+                    'sslonly'   => 'Off',
+                  },
                 },
               ],
               'error_log'                   => false,
@@ -921,6 +926,21 @@
               content: %r{^\s+PassengerDebugger\sOff$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiCredStore\skeytab:/foo/bar.keytab$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiSSLonly\sOff$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiLocalName\sOn$},
+            )
+          }
           it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
           it {
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 97056de893..ec85742064 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -497,6 +497,9 @@
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>
+    <%- if directory['gssapi'] -%>
+      <%= scope.call_function('epp',["apache/vhost/_gssapi.epp", directory['gssapi']]) -%>
+    <%- end -%>
   </<%= provider %>>
     <%- end -%>
   <%- end -%>
diff --git a/templates/vhost/_gssapi.epp b/templates/vhost/_gssapi.epp
new file mode 100644
index 0000000000..4f2d9f9114
--- /dev/null
+++ b/templates/vhost/_gssapi.epp
@@ -0,0 +1,16 @@
+<%|
+  # https://github.com/gssapi/mod_auth_gssapi
+  Optional[String[1]]        $credstore = undef,
+  Optional[Enum['On','Off']] $sslonly   = undef,
+  Optional[Enum['On','Off']] $localname = undef,
+|%>
+# mod_auth_gssapi configuration
+<% if $sslonly { -%>
+    GssapiSSLonly <%= $sslonly %>
+<% } -%>
+<% if $localname { -%>
+    GssapiLocalName <%= $localname %>
+<% } -%>
+<% if $credstore { -%>
+    GssapiCredStore <%= $credstore %>
+<% } -%>

From 14c1ed18b3ab78ca7eb02da1dc052b6fe0284245 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Sun, 25 Oct 2020 23:33:35 -0400
Subject: [PATCH 1703/2267] Allow changing /icons/ alias path

---
 manifests/mod/alias.pp           |  4 ++
 manifests/mod/autoindex.pp       |  4 +-
 manifests/params.pp              |  3 ++
 spec/classes/mod/alias_spec.rb   | 24 +++++++++
 templates/mod/alias.conf.erb     |  2 +-
 templates/mod/autoindex.conf.erb | 90 ++++++++++++++++----------------
 6 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index e8bca44483..58ab0bdf8f 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -15,6 +15,9 @@
 #   - Gentoo: /var/www/icons
 #   - Red Hat: /var/www/icons, except on Apache 2.4, where it's /usr/share/httpd/icons
 # 
+# @param icons_path
+#   Change the alias for /icons/.
+#
 # @see https://httpd.apache.org/docs/current/mod/mod_alias.html for additional documentation.
 #
 class apache::mod::alias (
@@ -22,6 +25,7 @@
   $icons_options  = 'Indexes MultiViews',
   # set icons_path to false to disable the alias
   $icons_path     = $apache::params::alias_icons_path,
+  $icons_prefix   = $apache::params::icons_prefix
 ) inherits ::apache::params {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index 15e0e55443..e3215540af 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -3,7 +3,9 @@
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_autoindex.html for additional documentation.
 #
-class apache::mod::autoindex {
+class apache::mod::autoindex (
+  $icons_prefix   = $apache::params::icons_prefix
+) inherits ::apache::params {
   include apache
   ::apache::mod { 'autoindex': }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index a1ebd4bcdc..d2ee9a5e76 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -40,6 +40,9 @@
   # no client certs should be trusted for auth by default.
   $ssl_certs_dir          = undef
 
+  # Allow overriding the autoindex alias location
+  $icons_prefix = 'icons'
+
   if ($apache::version::scl_httpd_version) {
     if $apache::version::scl_php_version == undef {
       fail('If you define apache::version::scl_httpd_version, you also need to specify apache::version::scl_php_version')
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index ecb9c69ab0..324bcd1bac 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -77,6 +77,30 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Options foo}) }
     end
+    context 'with icons path change', :compile do
+      let :pre_condition do
+        'class { apache: default_mods => false }'
+      end
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '7',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+      let :params do
+        {
+          'icons_prefix' => 'apache-icons',
+        }
+      end
+
+      it { is_expected.to contain_apache__mod('alias') }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/apache-icons\/ "\/usr\/share\/httpd\/icons\/"}) }
+    end
     context 'on a FreeBSD OS', :compile do
       let :facts do
         {
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
index 8580f707c1..313fdf9d1a 100644
--- a/templates/mod/alias.conf.erb
+++ b/templates/mod/alias.conf.erb
@@ -1,5 +1,5 @@
 <IfModule alias_module>
-Alias /icons/ "<%= @icons_path %>/"
+Alias /<%= @icons_prefix %>/ "<%= @icons_path %>/"
 <Directory "<%= @icons_path %>">
     Options <%= @icons_options %>
     AllowOverride None
diff --git a/templates/mod/autoindex.conf.erb b/templates/mod/autoindex.conf.erb
index ac4103a7ba..d9d453f142 100644
--- a/templates/mod/autoindex.conf.erb
+++ b/templates/mod/autoindex.conf.erb
@@ -1,55 +1,55 @@
 IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8
-AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip x-bzip2
+AddIconByEncoding (CMP,/<%= @icons_prefix %>/compressed.gif) x-compress x-gzip x-bzip2
 
-AddIconByType (TXT,/icons/text.gif) text/*
-AddIconByType (IMG,/icons/image2.gif) image/*
-AddIconByType (SND,/icons/sound2.gif) audio/*
-AddIconByType (VID,/icons/movie.gif) video/*
+AddIconByType (TXT,/<%= @icons_prefix %>/text.gif) text/*
+AddIconByType (IMG,/<%= @icons_prefix %>/image2.gif) image/*
+AddIconByType (SND,/<%= @icons_prefix %>/sound2.gif) audio/*
+AddIconByType (VID,/<%= @icons_prefix %>/movie.gif) video/*
 
-AddIcon /icons/binary.gif .bin .exe
-AddIcon /icons/binhex.gif .hqx
-AddIcon /icons/tar.gif .tar
-AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
-AddIcon /icons/a.gif .ps .ai .eps
-AddIcon /icons/layout.gif .html .shtml .htm .pdf
-AddIcon /icons/text.gif .txt
-AddIcon /icons/c.gif .c
-AddIcon /icons/p.gif .pl .py
-AddIcon /icons/f.gif .for
-AddIcon /icons/dvi.gif .dvi
-AddIcon /icons/uuencoded.gif .uu
-AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
-AddIcon /icons/tex.gif .tex
-AddIcon /icons/bomb.gif /core
-AddIcon (SND,/icons/sound2.gif) .ogg
-AddIcon (VID,/icons/movie.gif) .ogm
+AddIcon /<%= @icons_prefix %>/binary.gif .bin .exe
+AddIcon /<%= @icons_prefix %>/binhex.gif .hqx
+AddIcon /<%= @icons_prefix %>/tar.gif .tar
+AddIcon /<%= @icons_prefix %>/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /<%= @icons_prefix %>/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /<%= @icons_prefix %>/a.gif .ps .ai .eps
+AddIcon /<%= @icons_prefix %>/layout.gif .html .shtml .htm .pdf
+AddIcon /<%= @icons_prefix %>/text.gif .txt
+AddIcon /<%= @icons_prefix %>/c.gif .c
+AddIcon /<%= @icons_prefix %>/p.gif .pl .py
+AddIcon /<%= @icons_prefix %>/f.gif .for
+AddIcon /<%= @icons_prefix %>/dvi.gif .dvi
+AddIcon /<%= @icons_prefix %>/uuencoded.gif .uu
+AddIcon /<%= @icons_prefix %>/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /<%= @icons_prefix %>/tex.gif .tex
+AddIcon /<%= @icons_prefix %>/bomb.gif /core
+AddIcon (SND,/<%= @icons_prefix %>/sound2.gif) .ogg
+AddIcon (VID,/<%= @icons_prefix %>/movie.gif) .ogm
 
-AddIcon /icons/back.gif ..
-AddIcon /icons/hand.right.gif README
-AddIcon /icons/folder.gif ^^DIRECTORY^^
-AddIcon /icons/blank.gif ^^BLANKICON^^
+AddIcon /<%= @icons_prefix %>/back.gif ..
+AddIcon /<%= @icons_prefix %>/hand.right.gif README
+AddIcon /<%= @icons_prefix %>/folder.gif ^^DIRECTORY^^
+AddIcon /<%= @icons_prefix %>/blank.gif ^^BLANKICON^^
 
-AddIcon /icons/odf6odt<%= @icon_suffix %>.png .odt
-AddIcon /icons/odf6ods<%= @icon_suffix %>.png .ods
-AddIcon /icons/odf6odp<%= @icon_suffix %>.png .odp
-AddIcon /icons/odf6odg<%= @icon_suffix %>.png .odg
-AddIcon /icons/odf6odc<%= @icon_suffix %>.png .odc
-AddIcon /icons/odf6odf<%= @icon_suffix %>.png .odf
-AddIcon /icons/odf6odb<%= @icon_suffix %>.png .odb
-AddIcon /icons/odf6odi<%= @icon_suffix %>.png .odi
-AddIcon /icons/odf6odm<%= @icon_suffix %>.png .odm
+AddIcon /<%= @icons_prefix %>/odf6odt<%= @icon_suffix %>.png .odt
+AddIcon /<%= @icons_prefix %>/odf6ods<%= @icon_suffix %>.png .ods
+AddIcon /<%= @icons_prefix %>/odf6odp<%= @icon_suffix %>.png .odp
+AddIcon /<%= @icons_prefix %>/odf6odg<%= @icon_suffix %>.png .odg
+AddIcon /<%= @icons_prefix %>/odf6odc<%= @icon_suffix %>.png .odc
+AddIcon /<%= @icons_prefix %>/odf6odf<%= @icon_suffix %>.png .odf
+AddIcon /<%= @icons_prefix %>/odf6odb<%= @icon_suffix %>.png .odb
+AddIcon /<%= @icons_prefix %>/odf6odi<%= @icon_suffix %>.png .odi
+AddIcon /<%= @icons_prefix %>/odf6odm<%= @icon_suffix %>.png .odm
 
-AddIcon /icons/odf6ott<%= @icon_suffix %>.png .ott
-AddIcon /icons/odf6ots<%= @icon_suffix %>.png .ots
-AddIcon /icons/odf6otp<%= @icon_suffix %>.png .otp
-AddIcon /icons/odf6otg<%= @icon_suffix %>.png .otg
-AddIcon /icons/odf6otc<%= @icon_suffix %>.png .otc
-AddIcon /icons/odf6otf<%= @icon_suffix %>.png .otf
-AddIcon /icons/odf6oti<%= @icon_suffix %>.png .oti
-AddIcon /icons/odf6oth<%= @icon_suffix %>.png .oth
+AddIcon /<%= @icons_prefix %>/odf6ott<%= @icon_suffix %>.png .ott
+AddIcon /<%= @icons_prefix %>/odf6ots<%= @icon_suffix %>.png .ots
+AddIcon /<%= @icons_prefix %>/odf6otp<%= @icon_suffix %>.png .otp
+AddIcon /<%= @icons_prefix %>/odf6otg<%= @icon_suffix %>.png .otg
+AddIcon /<%= @icons_prefix %>/odf6otc<%= @icon_suffix %>.png .otc
+AddIcon /<%= @icons_prefix %>/odf6otf<%= @icon_suffix %>.png .otf
+AddIcon /<%= @icons_prefix %>/odf6oti<%= @icon_suffix %>.png .oti
+AddIcon /<%= @icons_prefix %>/odf6oth<%= @icon_suffix %>.png .oth
 
-DefaultIcon /icons/unknown.gif
+DefaultIcon /<%= @icons_prefix %>/unknown.gif
 ReadmeName README.html
 HeaderName HEADER.html
 

From ed82074235cb4abec236c8ba8df1800ba6b95f30 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Sun, 25 Oct 2020 23:33:56 -0400
Subject: [PATCH 1704/2267] Update documentation

---
 REFERENCE.md | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 4b14146619..51de459d89 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1121,6 +1121,20 @@ Sets the local path for an /icons/ Alias. Default depends on operating system:
 
 Default value: `$::apache::params::alias_icons_path`
 
+##### `icons_path`
+
+Change the alias for /icons/.
+
+Default value: `$::apache::params::alias_icons_path`
+
+##### `icons_prefix`
+
+Data type: `Any`
+
+
+
+Default value: `$::apache::params::icons_prefix`
+
 ### `apache::mod::auth_basic`
 
 Installs `mod_auth_basic`
@@ -1611,6 +1625,18 @@ Installs `mod_autoindex`
   * https://httpd.apache.org/docs/current/mod/mod_autoindex.html
     * for additional documentation.
 
+#### Parameters
+
+The following parameters are available in the `apache::mod::autoindex` class.
+
+##### `icons_prefix`
+
+Data type: `Any`
+
+
+
+Default value: `$::apache::params::icons_prefix`
+
 ### `apache::mod::cache`
 
 Installs `mod_cache`
@@ -3335,10 +3361,10 @@ Data type: `Variant[Array[String], String]`
 
 The precedence of language variants for cases where the client does not express a preference.
 
-Default value: `[ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
-                        'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
-                        'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
-                        'zh-TW' ]`
+Default value: `['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+    'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
+    'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
+  'zh-TW']`
 
 ### `apache::mod::nss`
 
@@ -4455,7 +4481,7 @@ Default value: ``undef``
 
 ##### `passenger_disable_log_prefix`
 
-Data type: `Optional[Boolean ]`
+Data type: `Optional[Boolean]`
 
 
 
@@ -5109,7 +5135,7 @@ Data type: `Any`
 
 List of IPs & bitmasked subnets to adjust requests for
 
-Default value: `[ '127.0.0.1' ]`
+Default value: `['127.0.0.1']`
 
 ##### `header`
 
@@ -5484,7 +5510,7 @@ Data type: `Any`
 
 Configure various SSL engine run-time options.
 
-Default value: `[ 'StdEnvVars' ]`
+Default value: `['StdEnvVars']`
 
 ##### `ssl_openssl_conf_cmd`
 
@@ -5797,7 +5823,7 @@ Data type: `Any`
 
 Array of directives that are allowed in .htaccess files.
 
-Default value: `[ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]`
+Default value: `['FileInfo', 'AuthConfig', 'Limit', 'Indexes']`
 
 ##### `options`
 
@@ -5805,7 +5831,7 @@ Data type: `Any`
 
 Configures what features are available in a particular directory.
 
-Default value: `[ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ]`
+Default value: `['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec']`
 
 ##### `unmanaged_path`
 

From ca26a762924c2608dbe8450eb5525ebfbc0e7561 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Wed, 21 Oct 2020 17:09:59 -0400
Subject: [PATCH 1705/2267] Add missing tests for RHEL 8

---
 spec/classes/mod/alias_spec.rb  | 16 ++++++++++++++++
 spec/classes/mod/status_spec.rb | 26 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 324bcd1bac..fc0a84f1cb 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -53,6 +53,22 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
     end
+    context 'on a RedHat 8-based OS', :compile do
+      let :facts do
+        {
+          id: 'root',
+          kernel: 'Linux',
+          osfamily: 'RedHat',
+          operatingsystem: 'RedHat',
+          operatingsystemrelease: '8',
+          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+          is_pe: false,
+        }
+      end
+
+      it { is_expected.to contain_apache__mod('alias') }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
+    end
     context 'with icons options', :compile do
       let :pre_condition do
         'class { apache: default_mods => false }'
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 09c6bb741a..440804bb65 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -200,6 +200,32 @@ def status_conf_spec_require(requires, extended_status, status_path)
 
         it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
       end
+
+      context "on a RedHat 8 OS with default params and #{req_key} requires" do
+        let :facts do
+          {
+            osfamily: 'RedHat',
+            operatingsystemrelease: '8',
+            operatingsystem: 'RedHat',
+            id: 'root',
+            kernel: 'Linux',
+            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+            is_pe: false,
+          }
+        end
+
+        let :params do
+          {
+            requires: req_value,
+          }
+        end
+
+        it { is_expected.to contain_apache__mod('status') }
+
+        status_conf_spec_require(req_value, 'On', '/server-status')
+
+        it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
+      end
     end
 
     context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do

From e91861ae66d407fadfe3699a896edb128a120fa8 Mon Sep 17 00:00:00 2001
From: psaiz <psaiz@users.noreply.github.com>
Date: Tue, 20 Oct 2020 12:36:30 +0200
Subject: [PATCH 1706/2267] Update oidcsettings.pp

---
 types/oidcsettings.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index bc3ce5c7da..9c07e42345 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -1,7 +1,7 @@
 # https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 type Apache::OIDCSettings = Struct[
   {
-    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl,Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
     Optional['CryptoPassphrase']                        => String,
     Optional['MetadataDir']                             => String,
     Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,

From e7d36e8e5b5fc8c1a93069bf90740a93dba53691 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 2 Nov 2020 11:55:07 +0000
Subject: [PATCH 1707/2267] (maint) Add tests for OIDC RedirectURL values

---
 spec/defines/vhost_spec.rb | 40 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 148bd7a98f..c85b52d666 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2411,6 +2411,46 @@
             end
           end
         end
+        context 'oidc_settings RedirectURL' do
+          describe 'with VALID relative URI' do
+            let :params do
+              default_params.merge(
+                'auth_oidc' => true,
+                'oidc_settings' => { 'ProviderMetadataURL' => 'https://login.example.com/.well-known/openid-configuration',
+                                     'ClientID'                  => 'test',
+                                     'RedirectURI'               => '/some/valid/relative/uri',
+                                     'ProviderTokenEndpointAuth' => 'client_secret_basic',
+                                     'RemoteUserClaim'           => 'sub',
+                                     'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
+                                     'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
+              )
+            end
+
+            it { is_expected.to compile }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+                content: %r{^\s+OIDCRedirectURI\s/some/valid/relative/uri$},
+              )
+            }
+          end
+
+          describe 'with INVALID relative URI' do
+            let :params do
+              default_params.merge(
+                'auth_oidc' => true,
+                'oidc_settings' => { 'ProviderMetadataURL' => 'https://login.example.com/.well-known/openid-configuration',
+                                     'ClientID'                  => 'test',
+                                     'RedirectURI'               => 'total_garbage',
+                                     'ProviderTokenEndpointAuth' => 'client_secret_basic',
+                                     'RemoteUserClaim'           => 'sub',
+                                     'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
+                                     'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
+              )
+            end
+
+            it { is_expected.not_to compile }
+          end
+        end
       end
     end
   end

From a57bd5adcc6840a09b8e928c5d8baefe3f7a76a1 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Wed, 4 Nov 2020 12:28:05 +0000
Subject: [PATCH 1708/2267] Fix negative test data

---
 spec/defines/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index c85b52d666..f7de631e9a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2440,7 +2440,7 @@
                 'auth_oidc' => true,
                 'oidc_settings' => { 'ProviderMetadataURL' => 'https://login.example.com/.well-known/openid-configuration',
                                      'ClientID'                  => 'test',
-                                     'RedirectURI'               => 'total_garbage',
+                                     'RedirectURI'               => 'invalid_uri',
                                      'ProviderTokenEndpointAuth' => 'client_secret_basic',
                                      'RemoteUserClaim'           => 'sub',
                                      'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',

From 641508b77791d02c6037d17838a7ffb1a28feddc Mon Sep 17 00:00:00 2001
From: Kirika <31585107+TigerKriika@users.noreply.github.com>
Date: Thu, 5 Nov 2020 13:18:17 +0100
Subject: [PATCH 1709/2267] Fix apreq2 LoadModule

---
 manifests/mod/apreq2.pp | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 manifests/mod/apreq2.pp

diff --git a/manifests/mod/apreq2.pp b/manifests/mod/apreq2.pp
new file mode 100644
index 0000000000..1b3924111b
--- /dev/null
+++ b/manifests/mod/apreq2.pp
@@ -0,0 +1,11 @@
+# @summary
+#   Installs `mod_apreq2`.
+#
+# @see http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html for additional documentation.
+#
+
+class apache::mod::apreq2 {
+  ::apache::mod { 'apreq2':
+    id => 'apreq_module',
+  }
+}

From 7bcfae3e329c2f21afd07df1aee859d0613a45bf Mon Sep 17 00:00:00 2001
From: bovy89 <bovy89@gmail.com>
Date: Mon, 2 Nov 2020 21:37:05 +0100
Subject: [PATCH 1710/2267] Improve SSLVerify options

Enable SSLVerifyClient and SSLVerifyDepth inside locations. Add SSLVerifyClient validation. SSLCACertificate (and related options) can now be specified even without SSLVerifyClient (can be inside a location).

Co-authored-by: Ewoud Kohl van Wijngaarden <ekohl@users.noreply.github.com>
---
 manifests/vhost.pp                 |  7 +++----
 spec/acceptance/apache_ssl_spec.rb | 18 +++++++++---------
 spec/defines/vhost_spec.rb         | 17 +++++++++++++++++
 templates/vhost/_directories.erb   |  6 ++++++
 templates/vhost/_ssl.erb           |  8 ++++----
 5 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 075123cf88..84533a751f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1498,7 +1498,7 @@
 #
 # @param ssl_ca
 #   Specifies the SSL certificate authority to be used to verify client certificates used 
-#   for authentication. You must also set `ssl_verify_client` to use this.
+#   for authentication.
 #
 # @param ssl_cert
 #   Specifies the SSL certification.
@@ -1516,8 +1516,7 @@
 #   preferred order.
 #
 # @param ssl_certs_dir
-#   Specifies the location of the SSL certification directory to verify client certs. Will not 
-#   be used unless `ssl_verify_client` is also set (see below).
+#   Specifies the location of the SSL certification directory to verify client certs.
 #
 # @param ssl_chain
 #   Specifies the SSL chain. This default works out of the box, but it must be updated in 
@@ -1743,7 +1742,7 @@
   $ssl_protocol                                                                     = undef,
   $ssl_cipher                                                                       = undef,
   $ssl_honorcipherorder                                                             = undef,
-  $ssl_verify_client                                                                = undef,
+  Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client = undef,
   $ssl_verify_depth                                                                 = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef,
   Optional[Integer[0]] $ssl_proxy_verify_depth                                      = undef,
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index a02e4dd6ef..c67afcd811 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -33,11 +33,11 @@ class { 'apache':
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
       it { is_expected.to contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
-      it { is_expected.not_to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
-      it { is_expected.not_to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
-      it { is_expected.not_to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
+      it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
+      it { is_expected.to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
+      it { is_expected.to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
       if apache_hash['version'] == '2.4'
-        it { is_expected.not_to contain 'SSLCARevocationCheck    "chain"' }
+        it { is_expected.to contain 'SSLCARevocationCheck    chain' }
       else
         it { is_expected.not_to contain 'SSLCARevocationCheck' }
       end
@@ -64,7 +64,7 @@ class { 'apache':
           ssl_protocol         => 'test',
           ssl_cipher           => 'test',
           ssl_honorcipherorder => 'test',
-          ssl_verify_client    => 'test',
+          ssl_verify_client    => 'require',
           ssl_verify_depth     => 'test',
           ssl_options          => ['test', 'test1'],
           ssl_proxyengine      => true,
@@ -88,7 +88,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLProtocol             test' }
       it { is_expected.to contain 'SSLCipherSuite          test' }
       it { is_expected.to contain 'SSLHonorCipherOrder     test' }
-      it { is_expected.to contain 'SSLVerifyClient         test' }
+      it { is_expected.to contain 'SSLVerifyClient         require' }
       it { is_expected.to contain 'SSLVerifyDepth          test' }
       it { is_expected.to contain 'SSLOptions test test1' }
       if apache_hash['version'] == '2.4'
@@ -111,7 +111,7 @@ class { 'apache':
           ssl_cert             => '/tmp/ssl_cert',
           ssl_key              => '/tmp/ssl_key',
           ssl_ca               => '/tmp/ssl_ca',
-          ssl_verify_client    => 'test',
+          ssl_verify_client    => 'optional',
         }
     MANIFEST
     it 'runs without error' do
@@ -139,7 +139,7 @@ class { 'apache':
           ssl_cert             => '/tmp/ssl_cert',
           ssl_key              => '/tmp/ssl_key',
           ssl_certs_dir        => '/tmp',
-          ssl_verify_client    => 'test',
+          ssl_verify_client    => 'require',
         }
     MANIFEST
     it 'runs without error' do
@@ -151,7 +151,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
       it { is_expected.to contain 'SSLCACertificatePath    "/tmp"' }
-      it { is_expected.to contain 'SSLVerifyClient         test' }
+      it { is_expected.to contain 'SSLVerifyClient         require' }
       it { is_expected.not_to contain 'SSLCACertificateFile' }
     end
   end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 148bd7a98f..e9c9935b6c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -252,6 +252,13 @@
                     'sslonly'   => 'Off',
                   },
                 },
+                {
+                  'path'              => '/private_1',
+                  'provider'          => 'location',
+                  'ssl_options'       => ['+ExportCertData', '+StdEnvVars'],
+                  'ssl_verify_client' => 'optional',
+                  'ssl_verify_depth'  => '10',
+                },
               ],
               'error_log'                   => false,
               'error_log_file'              => 'httpd_error_log',
@@ -941,6 +948,16 @@
               content: %r{^\s+GssapiLocalName\sOn$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+SSLVerifyClient\soptional$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+SSLVerifyDepth\s10$},
+            )
+          }
           it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
           it {
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index ec85742064..2f43e01290 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -339,6 +339,12 @@
     <%- if directory['ssl_options'] -%>
     SSLOptions <%= Array(directory['ssl_options']).join(' ') %>
     <%- end -%>
+    <%- if directory['ssl_verify_client'] and directory['ssl_verify_client'].match('(none|optional|require|optional_no_ca)') -%>
+    SSLVerifyClient <%= directory['ssl_verify_client'] %>
+    <%- if directory['ssl_verify_depth'] -%>
+    SSLVerifyDepth <%= directory['ssl_verify_depth'] %>
+    <%- end -%>
+    <%- end -%>
     <%- if directory['suphp'] and @suphp_engine == 'on' -%>
     suPHP_UserGroup <%= directory['suphp']['user'] %> <%= directory['suphp']['group'] %>
     <%- end -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 4200f78590..568c28ad83 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -18,6 +18,10 @@
   <%- end -%>
   <%- if @ssl_verify_client -%>
   SSLVerifyClient         <%= @ssl_verify_client %>
+  <%- if @ssl_verify_depth -%>
+  SSLVerifyDepth          <%= @ssl_verify_depth %>
+  <%- end -%>
+  <%- end -%>
   <%- if @ssl_certs_dir && @ssl_certs_dir != '' -%>
   SSLCACertificatePath    "<%= @ssl_certs_dir %>"
   <%- end -%>
@@ -30,13 +34,9 @@
   <%- if @ssl_crl -%>
   SSLCARevocationFile     "<%= @ssl_crl %>"
   <%- end -%>
-  <%- if @ssl_verify_depth -%>
-  SSLVerifyDepth          <%= @ssl_verify_depth %>
-  <%- end -%>
   <%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   SSLCARevocationCheck    <%= @ssl_crl_check %>
   <%- end -%>
-  <%- end -%>
   <%- if @ssl_options -%>
   SSLOptions <%= Array(@ssl_options).join(' ') %>
   <%- end -%>

From 7e233fe7cc108605384506f11083aeea6e3a2464 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 9 Nov 2020 12:44:15 +0000
Subject: [PATCH 1711/2267] (IAC-1186) Add new $use_servername_for_filenames
 parameter

Prior to this commit, the `$filename` variable, which is used to
construct the filename of Apache's various config and log files,
obtained it's default value from the `$name` parameter.

As #2064 highlights, it is possible for `$name` to contain spaces
in it and this can cause cumbersome log file names, albeit POSIX
compliant.

Also related is #2068, which changes the `$filename` variable source
from `$name` to `$servername`. This arguably seems more appropriate,
especially given that `$servername` defaults to `$name` if undefined.

This commit attempts to create a satisfactory solution to both #2064
and #2068 by introducing the `$use_servername_for_filenames` param.
When set to `true`, a sanitized `$servername` parameter value will be
used to construct `$filename`.

When undefined or set to `$false`, it will retain the existing
behaviour and use the `$name` parameter value.

This will default to `false` until the next major release (v6.0.0),
after which it will default to `true`. Then, in the subsequent major
release (v7.0.0) it will be deprecated altogether and the default
behaviour will be to use the sanitized value of `$servername` for the
`$filename` var.

Warning messages are output to the console to alert users of this
change in behaviour.
---
 manifests/vhost.pp              | 50 +++++++++++++++++++++++++++----
 spec/acceptance/vhost_spec.rb   | 52 +++++++++++++++++++++++++++++++++
 templates/vhost/_access_log.erb |  4 +--
 3 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 075123cf88..091a99f574 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1717,6 +1717,12 @@
 #   client request exceeds that limit, the server will return an error response
 #   instead of servicing the request.
 #
+# @param $use_servername_for_filenames
+#   When set to true, default log / config file names will be derived from the sanitized
+#   value of the $servername parameter.
+#   When set to false (default), the existing behaviour of using the $name parameter
+#   will remain.
+
 define apache::vhost (
   Variant[Boolean,String] $docroot,
   $manage_docroot                                                                   = true,
@@ -1782,6 +1788,7 @@
   $access_log_format                                                                = false,
   $access_log_env_var                                                               = false,
   Optional[Array] $access_logs                                                      = undef,
+  Optional[Boolean] $use_servername_for_filenames                                   = false,
   $aliases                                                                          = undef,
   Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                  = undef,
   Boolean $error_log                                                                = true,
@@ -2036,8 +2043,39 @@
     $priority_real = '25-'
   }
 
-  ## Apache include does not always work with spaces in the filename
-  $filename = regsubst($name, ' ', '_', 'G')
+  # IAC-1186: A number of configuration and log file names are generated using the $name parameter. It is possible for
+  # the $name parameter to contain spaces, which could then be transferred to the log / config filenames. Although
+  # POSIX compliant, this can be cumbersome.
+  #
+  # It seems more appropriate to use the $servername parameter to derive default log / config filenames from. We should
+  # also perform some sanitiation on the $servername parameter to strip spaces from it, as it defaults to the value of
+  # $name, should $servername NOT be defined.
+  #
+  # We will retain the default behaviour for filenames but allow the use of a sanitized version of $servername to be
+  # used, using the new $use_servername_for_filenames parameter.
+  #
+  # This will default to false until the next major release (v6.0.0), at which point, we will default this to true and
+  # warn about it's imminent deprecation in the subsequent major release (v7.0.0)
+  #
+  # In v7.0.0, we will deprecate the $use_servername_for_filenames parameter altogether and use the sanitized value of
+  # $servername for default log / config filenames.
+  $filename = $use_servername_for_filenames ? {
+    true => regsubst($servername, ' ', '_', 'G'),
+    false => $name,
+  }
+
+  if ! $use_servername_for_filenames {
+    $use_servername_for_filenames_warn_msg = '
+    It is possible for the $name parameter to be defined with spaces in it. Although supported on POSIX systems, this
+    can lead to cumbersome file names. The $servername attribute has stricter conditions from Apache (i.e. no spaces)
+    When $use_servername_for_filenames = true, the $servername parameter, sanitized, is used to construct log and config
+    file names.
+
+    From version v6.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v7.0.0 of the
+    module, the $use_servername_for_filenames will be removed and log/config file names will be dervied from the
+    sanitized $servername parameter when not explicitly defined.'
+    warning($use_servername_for_filenames_warn_msg)
+  }
 
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
@@ -2096,9 +2134,9 @@
     $error_log_destination = $error_log_syslog
   } else {
     if $ssl {
-      $error_log_destination = "${logroot}/${name}_error_ssl.log"
+      $error_log_destination = "${logroot}/${filename}_error_ssl.log"
     } else {
-      $error_log_destination = "${logroot}/${name}_error.log"
+      $error_log_destination = "${logroot}/${filename}_error.log"
     }
   }
 
@@ -2117,9 +2155,9 @@
     $modsec_audit_log_destination = $modsec_audit_log_pipe
   } elsif $modsec_audit_log {
     if $ssl {
-      $modsec_audit_log_destination = "${logroot}/${name}_security_ssl.log"
+      $modsec_audit_log_destination = "${logroot}/${filename}_security_ssl.log"
     } else {
-      $modsec_audit_log_destination = "${logroot}/${name}_security.log"
+      $modsec_audit_log_destination = "${logroot}/${filename}_security.log"
     }
   } else {
     $modsec_audit_log_destination = undef
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 9c49ba6a70..865f1e155b 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -948,6 +948,58 @@ class { 'apache': }
     end
   end
 
+  context 'when a manifest defines $servername' do
+    describe 'when the $use_servername_for_filenames parameter is set to true' do
+      pp = <<-MANIFEST
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            use_servername_for_filenames  => true,
+            servername                    => 'test.servername',
+            docroot                       => '/tmp',
+            logroot                       => '/tmp',
+          }
+      MANIFEST
+      it 'applies cleanly and DOES NOT print warning about $use_servername_for_filenames usage for test.server vhost' do
+        result = apply_manifest(pp, catch_failures: true)
+        expect(result.stderr).not_to contain %r{
+          .*Warning\:\sScope\(Apache::Vhost\[test\.server\]\)\:.*
+          It\sis\spossible\sfor\sthe\s\$name\sparameter.*
+          sanitized\s\$servername\sparameter\swhen\snot\sexplicitly\sdefined\.
+        }xm
+      end
+      describe file("#{apache_hash['vhost_dir']}/25-test.servername.conf") do
+        it { is_expected.to be_file }
+        it { is_expected.to contain '  ErrorLog "/tmp/test.servername_error.log' }
+        it { is_expected.to contain '  CustomLog "/tmp/test.servername_access.log' }
+      end
+    end
+    describe 'when the $use_servername_for_filenames parameter is NOT defined' do
+      pp = <<-MANIFEST
+          class { 'apache': }
+          host { 'test.server': ip => '127.0.0.1' }
+          apache::vhost { 'test.server':
+            servername                    => 'test.servername',
+            docroot                       => '/tmp',
+            logroot                       => '/tmp',
+          }
+      MANIFEST
+      it 'applies cleanly and prints warning about $use_servername_for_filenames usage for test.server vhost' do
+        result = apply_manifest(pp, catch_failures: true)
+        expect(result.stderr).to contain %r{
+          .*Warning\:\sScope\(Apache::Vhost\[test\.server\]\)\:.*
+          It\sis\spossible\sfor\sthe\s\$name\sparameter.*
+          sanitized\s\$servername\sparameter\swhen\snot\sexplicitly\sdefined\.
+        }xm
+      end
+      describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
+        it { is_expected.to be_file }
+        it { is_expected.to contain '  ErrorLog "/tmp/test.server_error.log' }
+        it { is_expected.to contain '  CustomLog "/tmp/test.server_access.log' }
+      end
+    end
+  end
+
   ['access', 'error'].each do |logtype|
     case logtype
     when 'access'
diff --git a/templates/vhost/_access_log.erb b/templates/vhost/_access_log.erb
index 894daa7ce4..6aa7815ad0 100644
--- a/templates/vhost/_access_log.erb
+++ b/templates/vhost/_access_log.erb
@@ -14,8 +14,8 @@
 <%   elsif log['pipe'] -%>
 <%     destination = log['pipe'] -%>
 <%   else -%>
-<%     destination ||= "#{@logroot}/#{@name}_access_ssl.log" if @ssl -%>
-<%     destination ||= "#{@logroot}/#{@name}_access.log" -%>
+<%     destination ||= "#{@logroot}/#{@filename}_access_ssl.log" if @ssl -%>
+<%     destination ||= "#{@logroot}/#{@filename}_access.log" -%>
 <%   end -%>
   CustomLog "<%= destination %>" <%= format %> <%= env %>
 <% end -%>

From 49d6256bc919186af9a3fb1fe49352ca97407ad5 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Fri, 13 Nov 2020 14:26:18 +0200
Subject: [PATCH 1712/2267] (maint) Add module to cloud ci

---
 .github/workflows/nightly.yml | 146 ++++++++++++++++++++++++++++++++++
 .github/workflows/pr_test.yml | 126 +++++++++++++++++++++++++++++
 .github/workflows/release.yml |  71 -----------------
 .github/workflows/weekly.yml  |  64 ---------------
 Gemfile                       |   1 +
 5 files changed, 273 insertions(+), 135 deletions(-)
 create mode 100644 .github/workflows/nightly.yml
 create mode 100644 .github/workflows/pr_test.yml
 delete mode 100644 .github/workflows/release.yml
 delete mode 100644 .github/workflows/weekly.yml

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
new file mode 100644
index 0000000000..5dfe7a186f
--- /dev/null
+++ b/.github/workflows/nightly.yml
@@ -0,0 +1,146 @@
+name: "nightly"
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+  HONEYCOMB_DATASET: litmus tests
+
+jobs:
+  setup_matrix:
+    name: "Setup Test Matrix"
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.get-matrix.outputs.matrix }}
+    steps:
+    - name: Checkout Source
+      uses: actions/checkout@v2
+
+    - name: Activate Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: "2.7"
+
+    - name: Cache gems
+      uses: actions/cache@v2
+      with:
+        path: vendor/gems
+        key: ${{ runner.os }}-nightly-${{ hashFiles('**/Gemfile') }}
+        restore-keys: |
+          ${{ runner.os }}-nightly-
+          ${{ runner.os }}-
+
+    - name: Install gems
+      run: |
+        bundle config path vendor/gems
+        bundle config jobs 8
+        bundle config retry 3
+        bundle install
+        bundle clean
+
+    - name: Setup Acceptance Test Matrix
+      id: get-matrix
+      run: "bundle exec matrix_from_metadata"
+
+  Acceptance:
+    needs:
+      - setup_matrix
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
+
+    steps:
+    - name: Checkout Source
+      uses: actions/checkout@v2
+
+    - name: Activate Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: "2.7"
+
+    - name: Cache gems
+      uses: actions/cache@v2
+      with:
+        path: vendor/gems
+        key: ${{ runner.os }}-nightly-${{ hashFiles('**/Gemfile') }}
+        restore-keys: |
+          ${{ runner.os }}-nightly-
+          ${{ runner.os }}-
+
+    - name: Install gems
+      run: |
+        bundle config path vendor/gems
+        bundle config jobs 8
+        bundle config retry 3
+        bundle install
+        bundle clean
+
+    - name: bundler environment
+      run: |
+        bundle env
+
+    - name: Provision test environment
+      run: |
+        bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        echo ::group::=== REQUEST ===
+        cat request.json || true
+        echo
+        echo ::endgroup::
+        echo ::group::=== INVENTORY ===
+        sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
+        echo ::endgroup::
+
+    # The provision service hands out machines as soon as they're provisioned.
+    # The GCP VMs might still take a while to spool up and configure themselves fully.
+    # This retry loop spins until all agents have been installed successfully.
+    - name: Install agent
+      uses: nick-invision/retry@v1
+      with:
+        timeout_minutes: 30
+        max_attempts: 5
+        retry_wait_seconds: 90
+        command: bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+
+    # The agent installer on windows does not finish in time for this to work. To
+    # work around this for now, retry after a minute if installing the module failed.
+    - name: Install module
+      uses: nick-invision/retry@v1
+      with:
+        timeout_minutes: 30
+        max_attempts: 5
+        retry_wait_seconds: 60
+        command: bundle exec rake 'litmus:install_module'
+
+    - name: Run acceptance tests
+      run: bundle exec rake 'litmus:acceptance:parallel'
+
+    - name: Remove test environment
+      if: ${{ always() }}
+      run: |
+        bundle exec rake 'litmus:tear_down'
+        echo ::group::=== REQUEST ===
+        cat request.json || true
+        echo
+        echo ::endgroup::
+
+  slack-workflow-status:
+    if: always()
+    name: Post Workflow Status To Slack
+    needs:
+      - Acceptance
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Slack Workflow Notification
+        uses: Gamesight/slack-workflow-status@master
+        with:
+          # Required Input
+          repo_token: ${{secrets.GITHUB_TOKEN}}
+          slack_webhook_url: ${{secrets.SLACK_WEBHOOK}}
+          # Optional Input
+          channel: '#team-ia-bots'
+          name: 'GABot'
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
new file mode 100644
index 0000000000..7b47199fe2
--- /dev/null
+++ b/.github/workflows/pr_test.yml
@@ -0,0 +1,126 @@
+name: "PR Testing"
+
+on: [pull_request]
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+  HONEYCOMB_DATASET: litmus tests
+
+jobs:
+  setup_matrix:
+    name: "Setup Test Matrix"
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.get-matrix.outputs.matrix }}
+    steps:
+    - name: Checkout Source
+      uses: actions/checkout@v2
+
+    - name: Activate Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: "2.7"
+
+    - name: Cache gems
+      uses: actions/cache@v2
+      with:
+        path: vendor/gems
+        key: ${{ runner.os }}-pr-${{ hashFiles('**/Gemfile') }}
+        restore-keys: |
+          ${{ runner.os }}-pr-
+          ${{ runner.os }}-
+
+    - name: Install gems
+      run: |
+        bundle config path vendor/gems
+        bundle config jobs 8
+        bundle config retry 3
+        bundle install
+        bundle clean
+
+    - name: Setup Acceptance Test Matrix
+      id: get-matrix
+      run: "bundle exec matrix_from_metadata"
+
+  Acceptance:
+    needs:
+      - setup_matrix
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
+
+    steps:
+    - name: Checkout Source
+      uses: actions/checkout@v2
+
+    - name: Activate Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: "2.7"
+
+    - name: Cache gems
+      uses: actions/cache@v2
+      with:
+        path: vendor/gems
+        key: ${{ runner.os }}-pr-${{ hashFiles('**/Gemfile') }}
+        restore-keys: |
+          ${{ runner.os }}-pr-
+          ${{ runner.os }}-
+
+    - name: Install gems
+      run: |
+        bundle config path vendor/gems
+        bundle config jobs 8
+        bundle config retry 3
+        bundle install
+        bundle clean
+
+    - name: bundler environment
+      run: |
+        bundle env
+
+    - name: Provision test environment
+      run: |
+        bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        echo ::group::=== REQUEST ===
+        cat request.json || true
+        echo
+        echo ::endgroup::
+        echo ::group::=== INVENTORY ===
+        sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
+        echo ::endgroup::
+
+    # The provision service hands out machines as soon as they're provisioned.
+    # The GCP VMs might still take a while to spool up and configure themselves fully.
+    # This retry loop spins until all agents have been installed successfully.
+    - name: Install agent
+      uses: nick-invision/retry@v1
+      with:
+        timeout_minutes: 30
+        max_attempts: 5
+        retry_wait_seconds: 90
+        command: bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+
+    # The agent installer on windows does not finish in time for this to work. To
+    # work around this for now, retry after a minute if installing the module failed.
+    - name: Install module
+      uses: nick-invision/retry@v1
+      with:
+        timeout_minutes: 30
+        max_attempts: 5
+        retry_wait_seconds: 60
+        command: bundle exec rake 'litmus:install_module'
+
+    - name: Run acceptance tests
+      run: bundle exec rake 'litmus:acceptance:parallel'
+
+    - name: Remove test environment
+      if: ${{ always() }}
+      run: |
+        bundle exec rake 'litmus:tear_down'
+        echo ::group::=== REQUEST ===
+        cat request.json || true
+        echo
+        echo ::endgroup::
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index ced1d93e59..0000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: "release"
-
-on: 
-  push:
-    branches:
-      - 'release'
-
-jobs:
-  LitmusAcceptancePuppet5:
-    env:
-      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
-      HONEYCOMB_DATASET: litmus tests
-    runs-on: self-hosted
-    strategy:
-      matrix:
-        ruby_version: [2.5.x]
-        puppet_gem_version: [~> 6.0]
-        platform: [release_checks_5]
-        agent_family: ['puppet5']
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@main
-      with:
-        platform: ${{ matrix.platform }}
-        agent_family: ${{ matrix.agent_family }}
-  LitmusAcceptancePuppet6:
-    env:
-      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
-      HONEYCOMB_DATASET: litmus tests
-    runs-on: self-hosted
-    strategy:
-      matrix:
-        ruby_version: [2.5.x]
-        puppet_gem_version: [~> 6.0]
-        platform: [release_checks_6]
-        agent_family: ['puppet6']
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@main
-      with:
-        platform: ${{ matrix.platform }}
-        agent_family: ${{ matrix.agent_family }}
-
-  Spec:
-    runs-on: self-hosted
-
-    strategy:
-      matrix:
-        check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
-        ruby_version: [2.4.x, 2.5.x]
-        puppet_gem_version: [~> 5.0, ~> 6.0]
-        exclude:
-        - puppet_gem_version: ~> 5.0
-          check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
-        - ruby_version: 2.4.x
-          puppet_gem_version: ~> 6.0
-        - ruby_version: 2.5.x
-          puppet_gem_version: ~> 5.0
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Spec Tests
-      uses: puppetlabs/action-litmus_spec@main
-      with:
-        puppet_gem_versionm: ${{ matrix.puppet_gem_version }}
-        check: ${{ matrix.check }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
deleted file mode 100644
index 382b276116..0000000000
--- a/.github/workflows/weekly.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: "weekly"
-
-on:
-  schedule:
-    - cron: '0 4 * * 1'
-
-jobs:
-  LitmusAcceptancePuppet5:
-    env:
-      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
-      HONEYCOMB_DATASET: litmus tests
-    runs-on: self-hosted
-    strategy:
-      matrix:
-        ruby_version: [2.5.x]
-        puppet_gem_version: [~> 6.0]
-        platform: [release_checks_5]
-        agent_family: ['puppet5']
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@main
-      with:
-        platform: ${{ matrix.platform }}
-        agent_family: ${{ matrix.agent_family }}
-  LitmusAcceptancePuppet6:
-    env:
-      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
-      HONEYCOMB_DATASET: litmus tests
-    runs-on: self-hosted
-    strategy:
-      matrix:
-        ruby_version: [2.5.x]
-        puppet_gem_version: [~> 6.0]
-        platform: [release_checks_6]
-        agent_family: ['puppet6']
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@main
-      with:
-        platform: ${{ matrix.platform }}
-        agent_family: ${{ matrix.agent_family }}
-  Spec:
-    runs-on: self-hosted
-    strategy:
-      matrix:
-        check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
-        ruby_version: [2.5.x]
-        puppet_gem_version: [~> 5.0, ~> 6.0]
-        exclude:
-        - puppet_gem_version: ~> 5.0
-          check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
-        - ruby_version: 2.5.x
-          puppet_gem_version: ~> 5.0
-    steps:
-    - uses: actions/checkout@v1
-    - name: Spec Tests
-      uses: puppetlabs/action-litmus_spec@main
-      with:
-        puppet_gem_version: ${{ matrix.puppet_gem_version }}
-        check: ${{ matrix.check }}
diff --git a/Gemfile b/Gemfile
index 4f6e33b02d..46bffec87d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,7 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
+  gem "puppet_litmus",                                           require: false, git: 'https://github.com/puppetlabs/puppet_litmus', ref: 'main' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

From 6af65e6db7b15e0c820b13f632dce6bb589a3604 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Mon, 16 Nov 2020 12:43:07 -0500
Subject: [PATCH 1713/2267] Add cas_cookie_path in vhosts

---
 manifests/vhost.pp                | 5 +++++
 spec/classes/mod/auth_cas_spec.rb | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 091a99f574..f240f1974c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -150,6 +150,10 @@
 # @param cas_validate_url
 #   Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 # 
+# @param cas_cookie_path
+#   Sets the location where information on the current session should be stored. This should
+#   be writable by the web server only.
+#
 # @param comment
 #   Adds comments to the header of the configuration file. Pass as string or an array of strings.
 #   For example:
@@ -1965,6 +1969,7 @@
   $cas_login_url                                                                    = undef,
   $cas_validate_url                                                                 = undef,
   $cas_validate_saml                                                                = undef,
+  $cas_cookie_path                                                                  = undef,
   Optional[String] $shib_compat_valid_user                                          = undef,
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name        = undef,
   Optional[Variant[String,Array[String]]] $comment                                  = undef,
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index 611370d7a5..fe64fb3edf 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -63,7 +63,7 @@
 
     context 'vhost setup', :compile do
       let :pre_condition do
-        "class { 'apache': } apache::vhost { 'test.server': docroot => '/var/www/html', cas_root_proxied_as => 'http://test.server'} "
+        "class { 'apache': } apache::vhost { 'test.server': docroot => '/var/www/html', cas_root_proxied_as => 'http://test.server', cas_cookie_path => '/my/cas/path'} "
       end
 
       let :facts do
@@ -85,6 +85,7 @@
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
       it {
         is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASRootProxiedAs http://test.server$})
+        is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASCookiePath /my/cas/path$})
       }
     end
   end

From 2ea2609373400b203531d20482773817bbcfc569 Mon Sep 17 00:00:00 2001
From: TP Honey <tphoney@users.noreply.github.com>
Date: Tue, 17 Nov 2020 13:26:28 +0000
Subject: [PATCH 1714/2267] (docs) small readme change

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index caece2ba32..fc0c66b665 100755
--- a/README.md
+++ b/README.md
@@ -841,6 +841,7 @@ In order to use this module on FreeBSD, you _must_ use apache24-2.4.12 (www/apac
 On Gentoo, this module depends on the [`gentoo/puppet-portage`][] Puppet module. Although several options apply or enable certain features and settings for Gentoo, it is not a [supported operating system][] for this module.
 
 ### RHEL/CentOS
+
 The [`apache::mod::auth_cas`][], [`apache::mod::passenger`][], [`apache::mod::proxy_html`][] and [`apache::mod::shib`][] classes are not functional on RH/CentOS without providing dependency packages from extra repositories.
 
 See their respective documentation below for related repositories and packages.

From 2a405141918c309c8ce10a970e943da6c09ed0bb Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Tue, 17 Nov 2020 14:15:45 +0200
Subject: [PATCH 1715/2267] Fix vhost_spec acceptance test

---
 spec/acceptance/vhost_spec.rb        | 4 ++--
 spec/spec_helper_acceptance_local.rb | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 865f1e155b..da144ae534 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1199,12 +1199,12 @@ class { 'apache::mod::wsgi': }
           '8'     => 'policycoreutils-python-utils',
           default => 'policycoreutils-python',
         }
+        package { $semanage_package: ensure => installed }
         exec { 'set_apache_defaults':
           command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
           path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
           require => Package[$semanage_package],
         }
-        package { $semanage_package: ensure => installed }
         exec { 'restorecon_apache':
           command => 'restorecon -Rv /apache_spec',
           path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
@@ -1222,7 +1222,7 @@ class { 'apache': }
       }
     MANIFEST
     it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_failures: false)
     end
 
     describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 740248fa76..2922671e1d 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -33,6 +33,9 @@ def print_parsing_errors
     c.filter_run_excluding ipv6: true
   end
   c.before :suite do
+    # Make sure selinux is disabled so the tests work.
+    LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if os[:family] =~ %r{redhat|oracle}
+
     LitmusHelper.instance.run_shell('puppet module install stahnma/epel')
     pp = <<-PUPPETCODE
     # needed by tests
@@ -69,9 +72,6 @@ class { 'epel': }
     }
     PUPPETCODE
     LitmusHelper.instance.apply_manifest(pp)
-
-    # Make sure selinux is disabled so the tests work.
-    LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if os[:family] =~ %r{redhat|oracle}
   end
 
   c.after :suite do

From abb3817ca079e7a656de9cbe5867a230405f87a5 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 17 Nov 2020 21:22:26 +0000
Subject: [PATCH 1716/2267] Update pdk-templates for gitpod and codespaces
 support

---
 .devcontainer/Dockerfile        |  6 ++++++
 .devcontainer/devcontainer.json | 23 +++++++++++++++++++++++
 .gitpod.Dockerfile              | 18 ++++++++++++++++++
 .gitpod.yml                     |  9 +++++++++
 .pdkignore                      |  2 ++
 .rubocop.yml                    |  2 +-
 .sync.yml                       |  4 ++++
 Gemfile                         |  1 +
 Rakefile                        | 13 ++++++-------
 data/common.yaml                |  1 +
 hiera.yaml                      | 21 +++++++++++++++++++++
 metadata.json                   |  4 ++--
 12 files changed, 94 insertions(+), 10 deletions(-)
 create mode 100644 .devcontainer/Dockerfile
 create mode 100644 .devcontainer/devcontainer.json
 create mode 100644 .gitpod.Dockerfile
 create mode 100644 .gitpod.yml
 create mode 100644 data/common.yaml
 create mode 100644 hiera.yaml

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000000..12ed4ff109
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,6 @@
+FROM puppet/pdk:latest
+
+# [Optional] Uncomment this section to install additional packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..f1a55dc3f0
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,23 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
+{
+	"name": "Puppet Development Kit (Community)",
+	"dockerFile": "Dockerfile",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"puppet.puppet-vscode",
+		"rebornix.Ruby"
+	]
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "pdk --version",
+}
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 0000000000..0814c5e61f
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,18 @@
+FROM gitpod/workspace-full
+RUN sudo wget https://apt.puppet.com/puppet-tools-release-bionic.deb && \
+    wget https://apt.puppetlabs.com/puppet6-release-bionic.deb && \
+    sudo dpkg -i puppet6-release-bionic.deb && \
+    sudo dpkg -i puppet-tools-release-bionic.deb && \
+    sudo apt-get update && \
+    sudo apt-get install -y pdk zsh puppet-agent && \
+    sudo apt-get clean && \
+    sudo rm -rf /var/lib/apt/lists/*
+RUN sudo usermod -s $(which zsh) gitpod && \
+    sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \
+    echo "plugins=(git gitignore github gem pip bundler python ruby docker docker-compose)" >> /home/gitpod/.zshrc && \
+    echo 'PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin"'  >> /home/gitpod/.zshrc && \
+    sudo /opt/puppetlabs/puppet/bin/gem install puppet-debugger hub -N && \
+    mkdir -p /home/gitpod/.config/puppet && \
+    /opt/puppetlabs/puppet/bin/ruby -r yaml -e "puts ({'disabled' => true}).to_yaml" > /home/gitpod/.config/puppet/analytics.yml
+RUN rm -f puppet6-release-bionic.deb  puppet-tools-release-bionic.deb
+ENTRYPOINT /usr/bin/zsh
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 0000000000..18406c5086
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,9 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+  - init: pdk bundle install
+
+vscode:
+  extensions:
+    - puppet.puppet-vscode@1.0.0:oSzfTkDf6Cmc1jOjgW33VA==
diff --git a/.pdkignore b/.pdkignore
index e6215cd0cb..254808c8f3 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -32,6 +32,7 @@
 /.gitignore
 /.gitlab-ci.yml
 /.pdkignore
+/.puppet-lint.rc
 /Rakefile
 /rakelib/
 /.rspec
@@ -40,3 +41,4 @@
 /.yardopts
 /spec/
 /.vscode/
+/.sync.yml
diff --git a/.rubocop.yml b/.rubocop.yml
index 200675437f..b7c972b286 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -43,7 +43,7 @@ Style/BlockDelimiters:
 Style/BracesAroundHashParameters:
   Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
     See https://github.com/rubocop-hq/rubocop/pull/7643
-  Enabled: true
+  Enabled: false
 Style/ClassAndModuleChildren:
   Description: Compact style reduces the required amount of indentation.
   EnforcedStyle: compact
diff --git a/.sync.yml b/.sync.yml
index 42165dba5c..613c40d939 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -49,3 +49,7 @@ Rakefile:
 spec/spec_helper.rb:
   mock_with: ":rspec"
   coverage_report: true
+.gitpod.Dockerfile:
+  unmanaged: false
+.gitpod.yml:
+  unmanaged: false
diff --git a/Gemfile b/Gemfile
index 4f6e33b02d..b6b25afe48 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ group :development do
   gem "json", '= 1.8.1',                                         require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
diff --git a/Rakefile b/Rakefile
index c21ec57741..11539b96b0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -53,7 +53,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
     config.add_pr_wo_labels = true
     config.issues = false
-    config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
+    config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
     config.configure_sections = {
       "Changed" => {
         "prefix" => "### Changed",
@@ -61,11 +61,11 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
       },
       "Added" => {
         "prefix" => "### Added",
-        "labels" => ["feature", "enhancement"],
+        "labels" => ["enhancement", "feature"],
       },
       "Fixed" => {
         "prefix" => "### Fixed",
-        "labels" => ["bugfix"],
+        "labels" => ["bug", "documentation", "bugfix"],
       },
     }
   end
@@ -73,16 +73,15 @@ else
   desc 'Generate a Changelog from GitHub'
   task :changelog do
     raise <<EOM
-The changelog tasks depends on unreleased features of the github_changelog_generator gem.
+The changelog tasks depends on recent features of the github_changelog_generator gem.
 Please manually add it to your .sync.yml for now, and run `pdk update`:
 ---
 Gemfile:
   optional:
     ':development':
       - gem: 'github_changelog_generator'
-        git: 'https://github.com/skywinder/github-changelog-generator'
-        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
+        version: '~> 1.15'
+        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
 EOM
   end
 end
diff --git a/data/common.yaml b/data/common.yaml
new file mode 100644
index 0000000000..2fbf0ffd71
--- /dev/null
+++ b/data/common.yaml
@@ -0,0 +1 @@
+--- {}
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 0000000000..545fff3272
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,21 @@
+---
+version: 5
+
+defaults:  # Used for any hierarchy level that omits these keys.
+  datadir: data         # This path is relative to hiera.yaml's directory.
+  data_hash: yaml_data  # Use the built-in YAML backend.
+
+hierarchy:
+  - name: "osfamily/major release"
+    paths:
+        # Used to distinguish between Debian and Ubuntu
+      - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
+      - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
+        # Used for Solaris
+      - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
+  - name: "osfamily"
+    paths:
+      - "os/%{facts.os.name}.yaml"
+      - "os/%{facts.os.family}.yaml"
+  - name: 'common'
+    path: 'common.yaml'
diff --git a/metadata.json b/metadata.json
index f6ae412024..dba16ee8e9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,7 +81,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.18.0",
+  "pdk-version": "1.18.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates#main",
-  "template-ref": "heads/main-0-g9c14433"
+  "template-ref": "heads/main-0-g874030e"
 }

From 7e7b14daa3e94f9f7c64ca0e788fdb8c47d3dc71 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 23 Nov 2020 17:05:22 +0000
Subject: [PATCH 1717/2267] (feat) Add package deps and tests for mod_apreq2 on
 Debian 9, 10

This commit ensures that the required package for the `apreq2` MOD
is installed on Debian 9 and 10.

Also adds a basic acceptance test for this MOD on those platforms.
---
 manifests/mod/apreq2.pp            |  2 +-
 manifests/params.pp                |  1 +
 spec/acceptance/mod_apreq2_spec.rb | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 spec/acceptance/mod_apreq2_spec.rb

diff --git a/manifests/mod/apreq2.pp b/manifests/mod/apreq2.pp
index 1b3924111b..51f1a9f986 100644
--- a/manifests/mod/apreq2.pp
+++ b/manifests/mod/apreq2.pp
@@ -3,7 +3,7 @@
 #
 # @see http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html for additional documentation.
 #
-
+# @note Unsupported platforms: CentOS: all; Debian: 8; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
 class apache::mod::apreq2 {
   ::apache::mod { 'apreq2':
     id => 'apreq_module',
diff --git a/manifests/params.pp b/manifests/params.pp
index 7a0f16caa0..f860322eaa 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -389,6 +389,7 @@
         default => '7.2', # Ubuntu Bionic, Cosmic and Disco
       }
       $mod_packages = {
+        'apreq2'                => 'libapache2-mod-apreq2',
         'auth_cas'              => 'libapache2-mod-auth-cas',
         'auth_kerb'             => 'libapache2-mod-auth-kerb',
         'auth_openidc'          => 'libapache2-mod-auth-openidc',
diff --git a/spec/acceptance/mod_apreq2_spec.rb b/spec/acceptance/mod_apreq2_spec.rb
new file mode 100644
index 0000000000..a07a3b994f
--- /dev/null
+++ b/spec/acceptance/mod_apreq2_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper_acceptance'
+apache_hash = apache_settings_hash
+
+describe 'apache::mod::apreq2', if: mod_supported_on_platform?('apache::mod::apreq2') do
+  pp = <<-MANIFEST
+    class { 'apache' : }
+    class { 'apache::mod::apreq2': }
+  MANIFEST
+
+  it 'succeeds in installing the mod_authnz_apreq2 module' do
+    apply_manifest(pp, catch_failures: true)
+  end
+end
\ No newline at end of file

From a83c7b74aac17789d2260141ea8cdb424f8d1ea8 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Tue, 24 Nov 2020 15:15:29 +0200
Subject: [PATCH 1718/2267] PDK update for GA workflows

---
 .github/workflows/nightly.yml | 148 ++++++++++++++++++++++++++--------
 .github/workflows/pr_test.yml | 143 +++++++++++++++++++++++++-------
 .sync.yml                     |   4 +
 Gemfile                       |   1 -
 metadata.json                 |   2 +-
 5 files changed, 235 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5dfe7a186f..d59437aab0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -3,7 +3,6 @@ name: "nightly"
 on:
   schedule:
     - cron: '0 0 * * *'
-  workflow_dispatch:
 
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
@@ -15,35 +14,63 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
+
     steps:
+    - name: "Honeycomb: Start recording"
+      uses: kvrhdn/gha-buildevents@v1.0.2
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+
+    - name: "Honeycomb: Start first step"
+      run: |
+        echo STEP_ID=0 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
     - name: Checkout Source
       uses: actions/checkout@v2
+      if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Activate Ruby 2.7
       uses: actions/setup-ruby@v1
+      if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         ruby-version: "2.7"
 
     - name: Cache gems
       uses: actions/cache@v2
+      if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         path: vendor/gems
-        key: ${{ runner.os }}-nightly-${{ hashFiles('**/Gemfile') }}
+        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
         restore-keys: |
-          ${{ runner.os }}-nightly-
+          ${{ runner.os }}-${{ github.event_name }}-
           ${{ runner.os }}-
 
     - name: Install gems
+      if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        bundle config path vendor/gems
-        bundle config jobs 8
-        bundle config retry 3
-        bundle install
-        bundle clean
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
-      run: "bundle exec matrix_from_metadata"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
+        else
+          echo  "::set-output name=matrix::{}"
+        fi
+
+    - name: "Honeycomb: Record setup time"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
 
   Acceptance:
     needs:
@@ -54,7 +81,27 @@ jobs:
       fail-fast: false
       matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
 
+    env:
+      BUILDEVENT_FILE: '../buildevents.txt'
+
     steps:
+    - run: |
+        echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
+        echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+
+    - name: "Honeycomb: Start recording"
+      uses: kvrhdn/gha-buildevents@v1.0.2
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+        matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
+
+    - name: "Honeycomb: start first step"
+      run: |
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
     - name: Checkout Source
       uses: actions/checkout@v2
 
@@ -67,26 +114,39 @@ jobs:
       uses: actions/cache@v2
       with:
         path: vendor/gems
-        key: ${{ runner.os }}-nightly-${{ hashFiles('**/Gemfile') }}
+        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
         restore-keys: |
-          ${{ runner.os }}-nightly-
+          ${{ runner.os }}-${{ github.event_name }}-
           ${{ runner.os }}-
 
-    - name: Install gems
+    - name: "Honeycomb: Record cache setup time"
+      if: ${{ always() }}
       run: |
-        bundle config path vendor/gems
-        bundle config jobs 8
-        bundle config retry 3
-        bundle install
-        bundle clean
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
-    - name: bundler environment
+    - name: Bundler Setup
       run: |
-        bundle env
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
+
+    - name: "Honeycomb: Record Bundler Setup time"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
       run: |
-        bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo
@@ -103,8 +163,8 @@ jobs:
       with:
         timeout_minutes: 30
         max_attempts: 5
-        retry_wait_seconds: 90
-        command: bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+        retry_wait_seconds: 60
+        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
     # The agent installer on windows does not finish in time for this to work. To
     # work around this for now, retry after a minute if installing the module failed.
@@ -112,21 +172,45 @@ jobs:
       uses: nick-invision/retry@v1
       with:
         timeout_minutes: 30
-        max_attempts: 5
+        max_attempts: 2
         retry_wait_seconds: 60
-        command: bundle exec rake 'litmus:install_module'
+        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+
+    - name: "Honeycomb: Record deployment times"
+      if: ${{ always() }}
+      run: |
+        echo ::group::honeycomb step
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+        echo ::endgroup::
 
     - name: Run acceptance tests
-      run: bundle exec rake 'litmus:acceptance:parallel'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
+
+    - name: "Honeycomb: Record acceptance testing times"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
       if: ${{ always() }}
       run: |
-        bundle exec rake 'litmus:tear_down'
-        echo ::group::=== REQUEST ===
-        cat request.json || true
-        echo
-        echo ::endgroup::
+        if [ -f inventory.yaml ]; then
+          buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
+          echo ::group::=== REQUEST ===
+          cat request.json || true
+          echo
+          echo ::endgroup::
+        fi
+
+    - name: "Honeycomb: Record removal times"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
 
   slack-workflow-status:
     if: always()
@@ -139,8 +223,8 @@ jobs:
         uses: Gamesight/slack-workflow-status@master
         with:
           # Required Input
-          repo_token: ${{secrets.GITHUB_TOKEN}}
-          slack_webhook_url: ${{secrets.SLACK_WEBHOOK}}
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
           # Optional Input
           channel: '#team-ia-bots'
           name: 'GABot'
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 7b47199fe2..17f5a649b3 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -12,35 +12,63 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
+
     steps:
+    - name: "Honeycomb: Start recording"
+      uses: kvrhdn/gha-buildevents@v1.0.2
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+
+    - name: "Honeycomb: Start first step"
+      run: |
+        echo STEP_ID=0 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
     - name: Checkout Source
       uses: actions/checkout@v2
+      if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Activate Ruby 2.7
       uses: actions/setup-ruby@v1
+      if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         ruby-version: "2.7"
 
     - name: Cache gems
       uses: actions/cache@v2
+      if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         path: vendor/gems
-        key: ${{ runner.os }}-pr-${{ hashFiles('**/Gemfile') }}
+        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
         restore-keys: |
-          ${{ runner.os }}-pr-
+          ${{ runner.os }}-${{ github.event_name }}-
           ${{ runner.os }}-
 
     - name: Install gems
+      if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        bundle config path vendor/gems
-        bundle config jobs 8
-        bundle config retry 3
-        bundle install
-        bundle clean
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
-      run: "bundle exec matrix_from_metadata"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
+        else
+          echo  "::set-output name=matrix::{}"
+        fi
+
+    - name: "Honeycomb: Record setup time"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
 
   Acceptance:
     needs:
@@ -51,7 +79,27 @@ jobs:
       fail-fast: false
       matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
 
+    env:
+      BUILDEVENT_FILE: '../buildevents.txt'
+
     steps:
+    - run: |
+        echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
+        echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+
+    - name: "Honeycomb: Start recording"
+      uses: kvrhdn/gha-buildevents@v1.0.2
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+        matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
+
+    - name: "Honeycomb: start first step"
+      run: |
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
     - name: Checkout Source
       uses: actions/checkout@v2
 
@@ -64,26 +112,39 @@ jobs:
       uses: actions/cache@v2
       with:
         path: vendor/gems
-        key: ${{ runner.os }}-pr-${{ hashFiles('**/Gemfile') }}
+        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
         restore-keys: |
-          ${{ runner.os }}-pr-
+          ${{ runner.os }}-${{ github.event_name }}-
           ${{ runner.os }}-
 
-    - name: Install gems
+    - name: "Honeycomb: Record cache setup time"
+      if: ${{ always() }}
       run: |
-        bundle config path vendor/gems
-        bundle config jobs 8
-        bundle config retry 3
-        bundle install
-        bundle clean
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
-    - name: bundler environment
+    - name: Bundler Setup
       run: |
-        bundle env
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
+
+    - name: "Honeycomb: Record Bundler Setup time"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
       run: |
-        bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo
@@ -100,8 +161,8 @@ jobs:
       with:
         timeout_minutes: 30
         max_attempts: 5
-        retry_wait_seconds: 90
-        command: bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+        retry_wait_seconds: 60
+        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
     # The agent installer on windows does not finish in time for this to work. To
     # work around this for now, retry after a minute if installing the module failed.
@@ -109,18 +170,42 @@ jobs:
       uses: nick-invision/retry@v1
       with:
         timeout_minutes: 30
-        max_attempts: 5
+        max_attempts: 2
         retry_wait_seconds: 60
-        command: bundle exec rake 'litmus:install_module'
+        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+
+    - name: "Honeycomb: Record deployment times"
+      if: ${{ always() }}
+      run: |
+        echo ::group::honeycomb step
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+        echo ::endgroup::
 
     - name: Run acceptance tests
-      run: bundle exec rake 'litmus:acceptance:parallel'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
+
+    - name: "Honeycomb: Record acceptance testing times"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
       if: ${{ always() }}
       run: |
-        bundle exec rake 'litmus:tear_down'
-        echo ::group::=== REQUEST ===
-        cat request.json || true
-        echo
-        echo ::endgroup::
+        if [ -f inventory.yaml ]; then
+          buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
+          echo ::group::=== REQUEST ===
+          cat request.json || true
+          echo
+          echo ::endgroup::
+        fi
+
+    - name: "Honeycomb: Record removal times"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
diff --git a/.sync.yml b/.sync.yml
index 613c40d939..e34552f80a 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -53,3 +53,7 @@ spec/spec_helper.rb:
   unmanaged: false
 .gitpod.yml:
   unmanaged: false
+.github/workflows/nightly.yml:
+  unmanaged: false
+.github/workflows/pr_test.yml:
+  unmanaged: false
diff --git a/Gemfile b/Gemfile
index b9c554791a..b6b25afe48 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,6 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-  gem "puppet_litmus",                                           require: false, git: 'https://github.com/puppetlabs/puppet_litmus', ref: 'main' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/metadata.json b/metadata.json
index dba16ee8e9..99b65c7475 100644
--- a/metadata.json
+++ b/metadata.json
@@ -83,5 +83,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.18.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates#main",
-  "template-ref": "heads/main-0-g874030e"
+  "template-ref": "heads/main-0-g5afcd3d"
 }

From 01b9a96572477cfe1af62bcfa8206859ab732f3b Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Tue, 24 Nov 2020 15:46:31 +0000
Subject: [PATCH 1719/2267] Release version 5.7.0

---
 CHANGELOG.md  |   23 +-
 REFERENCE.md  | 2760 ++++++++++++++++---------------------------------
 metadata.json |    2 +-
 3 files changed, 902 insertions(+), 1883 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64efb24bce..2c96de9bc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.7.0) (2020-11-24)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.6.0...v5.7.0)
+
+### Added
+
+- Add cas\_cookie\_path in vhosts [\#2089](https://github.com/puppetlabs/puppetlabs-apache/pull/2089) ([yakatz](https://github.com/yakatz))
+- \(IAC-1186\) Add new $use\_servername\_for\_filenames parameter [\#2086](https://github.com/puppetlabs/puppetlabs-apache/pull/2086) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- Allow relative paths in oidc\_redirect\_uri [\#2082](https://github.com/puppetlabs/puppetlabs-apache/pull/2082) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- Improve SSLVerify options [\#2081](https://github.com/puppetlabs/puppetlabs-apache/pull/2081) ([bovy89](https://github.com/bovy89))
+- Add ssl\_proxy\_machine\_cert\_chain param to vhost class [\#2072](https://github.com/puppetlabs/puppetlabs-apache/pull/2072) ([AbelNavarro](https://github.com/AbelNavarro))
+
+### Fixed
+
+- Use Ruby 2.7 compatible string matching [\#2074](https://github.com/puppetlabs/puppetlabs-apache/pull/2074) ([sanfrancrisko](https://github.com/sanfrancrisko))
+
+### UNCATEGORIZED PRS; LABEL THEM ON GITHUB
+
+- Change icon path [\#2079](https://github.com/puppetlabs/puppetlabs-apache/pull/2079) ([yakatz](https://github.com/yakatz))
+- Support mod\_auth\_gssapi parameters [\#2078](https://github.com/puppetlabs/puppetlabs-apache/pull/2078) ([traylenator](https://github.com/traylenator))
+
 ## [v5.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.6.0) (2020-10-01)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.5.0...v5.6.0)
@@ -107,6 +128,7 @@ All notable changes to this project will be documented in this file. The format
 - Added unmanaged\_path and custom\_fragment options to userdir [\#1931](https://github.com/puppetlabs/puppetlabs-apache/pull/1931) ([GeorgeCox](https://github.com/GeorgeCox))
 - Add LDAP parameters to httpd.conf [\#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
 - Add LDAPReferrals configuration parameter [\#1928](https://github.com/puppetlabs/puppetlabs-apache/pull/1928) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+- Define SCL package name for mod\_ldap [\#1893](https://github.com/puppetlabs/puppetlabs-apache/pull/1893) ([treydock](https://github.com/treydock))
 
 ### Fixed
 
@@ -125,7 +147,6 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 - \(FM-7923\) Implement Puppet Strings [\#1916](https://github.com/puppetlabs/puppetlabs-apache/pull/1916) ([eimlav](https://github.com/eimlav))
-- Define SCL package name for mod\_ldap [\#1893](https://github.com/puppetlabs/puppetlabs-apache/pull/1893) ([treydock](https://github.com/treydock))
 
 ### Fixed
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 806c2b2467..68d61b5b0e 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -130,8 +130,7 @@ Apache server's or a virtual host's listening address and port.
 * [`apache::mod`](#apachemod): Installs packages for an Apache module that doesn't have a corresponding
 `apache::mod::<MODULE NAME>` class.
 * [`apache::namevirtualhost`](#apachenamevirtualhost): Enables name-based virtual hosts
-* [`apache::vhost`](#apachevhost): Allows specialised configurations for virtual hosts that possess requirements
-outside of the defaults.
+* [`apache::vhost`](#apachevhost)
 * [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
 * [`apache::vhost::fragment`](#apachevhostfragment): Define a fragment within a vhost
 
@@ -207,7 +206,7 @@ Configures module template behavior, package names, and default Apache modules b
 the version of Apache to use. We do not recommend manually configuring this parameter
 without reason.
 
-Default value: `$::apache::version::default`
+Default value: `$apache::version::default`
 
 ##### `conf_dir`
 
@@ -215,7 +214,7 @@ Data type: `Any`
 
 Sets the directory where the Apache server's main configuration file is located.
 
-Default value: `$::apache::params::conf_dir`
+Default value: `$apache::params::conf_dir`
 
 ##### `conf_template`
 
@@ -225,7 +224,7 @@ Defines the template used for the main Apache configuration file. Modifying this
 parameter is potentially risky, as the apache module is designed to use a minimal
 configuration file customized by `conf.d` entries.
 
-Default value: `$::apache::params::conf_template`
+Default value: `$apache::params::conf_template`
 
 ##### `confd_dir`
 
@@ -233,7 +232,7 @@ Data type: `Any`
 
 Sets the location of the Apache server's custom configuration directory.
 
-Default value: `$::apache::params::confd_dir`
+Default value: `$apache::params::confd_dir`
 
 ##### `default_charset`
 
@@ -289,7 +288,7 @@ Sets the SSL encryption certificate location.<br />
 Although the default value results in a functioning Apache server, you **must** update this
 parameter with your certificate location before deploying this server in a production environment.
 
-Default value: `$::apache::params::default_ssl_cert`
+Default value: `$apache::params::default_ssl_cert`
 
 ##### `default_ssl_chain`
 
@@ -342,7 +341,7 @@ Although the default values result in a functioning Apache server, you **must**
 this parameter with your SSL key's location before deploying this server in a production
 environment.
 
-Default value: `$::apache::params::default_ssl_key`
+Default value: `$apache::params::default_ssl_key`
 
 ##### `default_ssl_vhost`
 
@@ -401,7 +400,7 @@ class { 'apache':
 }
 ```
 
-Default value: `$::apache::params::dev_packages`
+Default value: `$apache::params::dev_packages`
 
 ##### `docroot`
 
@@ -409,7 +408,7 @@ Data type: `Any`
 
 Sets the default `DocumentRoot` location.
 
-Default value: `$::apache::params::docroot`
+Default value: `$apache::params::docroot`
 
 ##### `error_documents`
 
@@ -432,7 +431,7 @@ created by another Puppet module, set the `manage_group` parameter's value to `f
 child processes to access resources. It does not change the user that owns the parent server
 process.
 
-Default value: `$::apache::params::group`
+Default value: `$apache::params::group`
 
 ##### `httpd_dir`
 
@@ -442,7 +441,7 @@ Sets the Apache server's base configuration directory. This is useful for specia
 repackaged Apache server builds but might have unintended consequences when combined
 with the default distribution packages.
 
-Default value: `$::apache::params::httpd_dir`
+Default value: `$apache::params::httpd_dir`
 
 ##### `http_protocol_options`
 
@@ -452,7 +451,7 @@ Specifies the strictness of HTTP protocol checks.<br />
 Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`,
 `RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`.
 
-Default value: `$::apache::params::http_protocol_options`
+Default value: `$apache::params::http_protocol_options`
 
 ##### `keepalive`
 
@@ -462,7 +461,7 @@ Determines whether to enable persistent HTTP connections with the `KeepAlive` di
 If you set this to `On`, use the `keepalive_timeout` and `max_keepalive_requests` parameters
 to set relevant options.<br />
 
-Default value: `$::apache::params::keepalive`
+Default value: `$apache::params::keepalive`
 
 ##### `keepalive_timeout`
 
@@ -472,7 +471,7 @@ Sets the `KeepAliveTimeout` directive, which determines the amount of time the A
 server waits for subsequent requests on a persistent HTTP connection. This parameter is
 only relevant if the `keepalive` parameter is enabled.
 
-Default value: `$::apache::params::keepalive_timeout`
+Default value: `$apache::params::keepalive_timeout`
 
 ##### `max_keepalive_requests`
 
@@ -480,7 +479,7 @@ Data type: `Any`
 
 Limits the number of requests allowed per connection when the `keepalive` parameter is enabled.
 
-Default value: `$::apache::params::max_keepalive_requests`
+Default value: `$apache::params::max_keepalive_requests`
 
 ##### `hostname_lookups`
 
@@ -490,7 +489,7 @@ This directive enables DNS lookups so that host names can be logged and passed t
 CGIs/SSIs in REMOTE_HOST.<br />
 > **Note**: If enabled, it impacts performance significantly.
 
-Default value: `$::apache::params::hostname_lookups`
+Default value: `$apache::params::hostname_lookups`
 
 ##### `ldap_trusted_mode`
 
@@ -523,7 +522,7 @@ Data type: `Any`
 Specifies the location whereApache module files are stored.<br />
 > **Note**: Do not configure this parameter manually without special reason.
 
-Default value: `$::apache::params::lib_path`
+Default value: `$apache::params::lib_path`
 
 ##### `log_level`
 
@@ -532,7 +531,7 @@ Data type: `Apache::LogLevel`
 Configures the apache [LogLevel](https://httpd.apache.org/docs/current/mod/core.html#loglevel) directive
 which adjusts the verbosity of the messages recorded in the error logs.
 
-Default value: `$::apache::params::log_level`
+Default value: `$apache::params::log_level`
 
 ##### `log_formats`
 
@@ -560,7 +559,7 @@ Data type: `Any`
 
 Changes the directory of Apache log files for the virtual host.
 
-Default value: `$::apache::params::logroot`
+Default value: `$apache::params::logroot`
 
 ##### `logroot_mode`
 
@@ -571,7 +570,7 @@ Overrides the default `logroot` directory's mode.<br />
 without being aware of the consequences. See the [Apache documentation](https://httpd.apache.org/docs/current/logs.html#security)
 for details.
 
-Default value: `$::apache::params::logroot_mode`
+Default value: `$apache::params::logroot_mode`
 
 ##### `manage_group`
 
@@ -610,7 +609,7 @@ Data type: `Any`
 
 Sets where Puppet places configuration files for your Apache modules.
 
-Default value: `$::apache::params::mod_dir`
+Default value: `$apache::params::mod_dir`
 
 ##### `mod_libs`
 
@@ -626,7 +625,7 @@ class { 'apache':
 }
 ```
 
-Default value: `$::apache::params::mod_libs`
+Default value: `$apache::params::mod_libs`
 
 ##### `mod_packages`
 
@@ -642,7 +641,7 @@ class { 'apache':
 }
 ```
 
-Default value: `$::apache::params::mod_packages`
+Default value: `$apache::params::mod_packages`
 
 ##### `mpm_module`
 
@@ -657,7 +656,7 @@ You must set this to `false` to explicitly declare the following classes with cu
 - `apache::mod::prefork`
 - `apache::mod::worker`
 
-Default value: `$::apache::params::mpm_module`
+Default value: `$apache::params::mpm_module`
 
 ##### `package_ensure`
 
@@ -674,7 +673,7 @@ Data type: `Any`
 
 Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm.
 
-Default value: `$::apache::params::pidfile`
+Default value: `$apache::params::pidfile`
 
 ##### `ports_file`
 
@@ -682,7 +681,7 @@ Data type: `Any`
 
 Sets the path to the file containing Apache ports configuration.
 
-Default value: `$::apache::params::ports_file`
+Default value: `$apache::params::ports_file`
 
 ##### `protocols`
 
@@ -759,7 +758,7 @@ Data type: `Any`
 Sets the Apache server name via Apache's `ServerName` directive.
 Setting to `false` will not set ServerName at all.
 
-Default value: `$::apache::params::servername`
+Default value: `$apache::params::servername`
 
 ##### `server_root`
 
@@ -767,7 +766,7 @@ Data type: `Any`
 
 Sets the Apache server's root directory via Apache's `ServerRoot` directive.
 
-Default value: `$::apache::params::server_root`
+Default value: `$apache::params::server_root`
 
 ##### `server_signature`
 
@@ -814,7 +813,7 @@ Data type: `Any`
 
 Sets the name of the Apache service.
 
-Default value: `$::apache::params::service_name`
+Default value: `$apache::params::service_name`
 
 ##### `service_manage`
 
@@ -867,7 +866,7 @@ Data type: `Any`
 Controls whether the systemd module should be installed on Centos 7 servers, this is
 especially useful if using custom-built RPMs.
 
-Default value: `$::apache::params::use_systemd`
+Default value: `$apache::params::use_systemd`
 
 ##### `file_mode`
 
@@ -876,7 +875,7 @@ Data type: `Any`
 Sets the desired permissions mode for config files.
 Valid values are: a string, with permissions mode in symbolic or numeric notation.
 
-Default value: `$::apache::params::file_mode`
+Default value: `$apache::params::file_mode`
 
 ##### `root_directory_options`
 
@@ -884,7 +883,7 @@ Data type: `Any`
 
 Array of the desired options for the `/` directory in httpd.conf.
 
-Default value: `$::apache::params::root_directory_options`
+Default value: `$apache::params::root_directory_options`
 
 ##### `root_directory_secured`
 
@@ -904,7 +903,7 @@ Data type: `Any`
 
 Changes your virtual host configuration files' location.
 
-Default value: `$::apache::params::vhost_dir`
+Default value: `$apache::params::vhost_dir`
 
 ##### `vhost_include_pattern`
 
@@ -917,7 +916,7 @@ this directory (such as files created by version control systems or editor backu
 Some operating systems use a value of `*.conf`. By default, this module creates configuration
 files ending in `.conf`.
 
-Default value: `$::apache::params::vhost_include_pattern`
+Default value: `$apache::params::vhost_include_pattern`
 
 ##### `user`
 
@@ -927,7 +926,7 @@ Changes the user that Apache uses to answer requests. Apache's parent process co
 to run as root, but child processes access resources as the user defined by this parameter.
 To prevent Puppet from managing the user, set the `manage_user` parameter to `false`.
 
-Default value: `$::apache::params::user`
+Default value: `$apache::params::user`
 
 ##### `apache_name`
 
@@ -937,7 +936,7 @@ The name of the Apache package to install. If you are using a non-standard Apach
 you might need to override the default setting.<br />
 For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::scl_httpd_version`.
 
-Default value: `$::apache::params::apache_name`
+Default value: `$apache::params::apache_name`
 
 ##### `error_log`
 
@@ -947,7 +946,7 @@ The name of the error log file for the main server instance. If the string start
 `/`, `|`, or `syslog`: the full path is set. Otherwise, the filename  is prefixed with
 `$logroot`.
 
-Default value: `$::apache::params::error_log`
+Default value: `$apache::params::error_log`
 
 ##### `scriptalias`
 
@@ -955,7 +954,7 @@ Data type: `Any`
 
 Directory to use for global script alias
 
-Default value: `$::apache::params::scriptalias`
+Default value: `$apache::params::scriptalias`
 
 ##### `access_log_file`
 
@@ -963,7 +962,7 @@ Data type: `Any`
 
 The name of the access log file for the main server instance.
 
-Default value: `$::apache::params::access_log_file`
+Default value: `$apache::params::access_log_file`
 
 ##### `limitreqfields`
 
@@ -1009,7 +1008,7 @@ Data type: `Any`
 
 Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.
 
-Default value: `$::apache::params::conf_enabled`
+Default value: `$apache::params::conf_enabled`
 
 ##### `vhost_enable_dir`
 
@@ -1018,7 +1017,7 @@ Data type: `Any`
 Set's whether the vhost definitions will be stored in sites-availible and if
 they will be symlinked to and from sites-enabled.
 
-Default value: `$::apache::params::vhost_enable_dir`
+Default value: `$apache::params::vhost_enable_dir`
 
 ##### `mod_enable_dir`
 
@@ -1026,7 +1025,7 @@ Data type: `Any`
 
 Set's whether the mods-enabled directory should be managed.
 
-Default value: `$::apache::params::mod_enable_dir`
+Default value: `$apache::params::mod_enable_dir`
 
 ##### `ssl_file`
 
@@ -1053,7 +1052,7 @@ Data type: `Boolean`
 Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for
 `additional_includes` in Apache 2.4 or newer.
 
-Default value: `$::apache::params::use_optional_includes`
+Default value: `$apache::params::use_optional_includes`
 
 ##### `mime_types_additional`
 
@@ -1061,7 +1060,7 @@ Data type: `Any`
 
 Specifies any idditional Internet media (mime) types that you wish to be configured.
 
-Default value: `$::apache::params::mime_types_additional`
+Default value: `$apache::params::mime_types_additional`
 
 ### `apache::dev`
 
@@ -1119,13 +1118,13 @@ Sets the local path for an /icons/ Alias. Default depends on operating system:
 - Gentoo: /var/www/icons
 - Red Hat: /var/www/icons, except on Apache 2.4, where it's /usr/share/httpd/icons
 
-Default value: `$::apache::params::alias_icons_path`
+Default value: `$apache::params::alias_icons_path`
 
 ##### `icons_path`
 
 Change the alias for /icons/.
 
-Default value: `$::apache::params::alias_icons_path`
+Default value: `$apache::params::alias_icons_path`
 
 ##### `icons_prefix`
 
@@ -1133,7 +1132,7 @@ Data type: `Any`
 
 
 
-Default value: `$::apache::params::icons_prefix`
+Default value: `$apache::params::icons_prefix`
 
 ### `apache::mod::auth_basic`
 
@@ -1177,7 +1176,7 @@ Data type: `String`
 Sets the location where information on the current session should be stored. This should
 be writable by the web server only.
 
-Default value: `$::apache::params::cas_cookie_path`
+Default value: `$apache::params::cas_cookie_path`
 
 ##### `cas_cookie_path_mode`
 
@@ -1390,7 +1389,7 @@ Data type: `Any`
 
 Maximum number of sessions which can be active at once.
 
-Default value: `$::apache::params::mellon_cache_size`
+Default value: `$apache::params::mellon_cache_size`
 
 ##### `mellon_lock_file`
 
@@ -1398,7 +1397,7 @@ Data type: `Any`
 
 Full path to a file used for synchronizing access to the session data.
 
-Default value: `$::apache::params::mellon_lock_file`
+Default value: `$apache::params::mellon_lock_file`
 
 ##### `mellon_post_directory`
 
@@ -1406,7 +1405,7 @@ Data type: `Any`
 
 Full path of a directory where POST requests are saved during authentication.
 
-Default value: `$::apache::params::mellon_post_directory`
+Default value: `$apache::params::mellon_post_directory`
 
 ##### `mellon_cache_entry_size`
 
@@ -1466,7 +1465,7 @@ Data type: `Any`
 
 The version of apache being run.
 
-Default value: `$::apache::apache_version`
+Default value: `$apache::apache_version`
 
 ### `apache::mod::authn_dbd`
 
@@ -1607,7 +1606,7 @@ Data type: `Any`
 
 Version of Apache to install module on.
 
-Default value: `$::apache::apache_version`
+Default value: `$apache::apache_version`
 
 ### `apache::mod::authz_user`
 
@@ -1635,7 +1634,7 @@ Data type: `Any`
 
 
 
-Default value: `$::apache::params::icons_prefix`
+Default value: `$apache::params::icons_prefix`
 
 ### `apache::mod::cache`
 
@@ -3297,7 +3296,7 @@ Data type: `Any`
 
 Name of the MIME package to be installed.
 
-Default value: `$::apache::params::mime_support_package`
+Default value: `$apache::params::mime_support_package`
 
 ##### `mime_types_config`
 
@@ -3305,7 +3304,7 @@ Data type: `Any`
 
 The location of the mime.types file.
 
-Default value: `$::apache::params::mime_types_config`
+Default value: `$apache::params::mime_types_config`
 
 ##### `mime_types_additional`
 
@@ -3384,7 +3383,7 @@ Data type: `Any`
 
 Path to `access.log`.
 
-Default value: `"${::apache::params::logroot}/access.log"`
+Default value: `"${apache::params::logroot}/access.log"`
 
 ##### `error_Log`
 
@@ -3412,7 +3411,7 @@ Data type: `Any`
 
 
 
-Default value: `"${::apache::params::logroot}/error.log"`
+Default value: `"${apache::params::logroot}/error.log"`
 
 ### `apache::mod::pagespeed`
 
@@ -3876,7 +3875,7 @@ Data type: `Any`
 
 
 
-Default value: `$::apache::params::passenger_conf_file`
+Default value: `$apache::params::passenger_conf_file`
 
 ##### `passenger_conf_package_file`
 
@@ -3884,7 +3883,7 @@ Data type: `Any`
 
 
 
-Default value: `$::apache::params::passenger_conf_package_file`
+Default value: `$apache::params::passenger_conf_package_file`
 
 ##### `passenger_data_buffer_dir`
 
@@ -3924,7 +3923,7 @@ Data type: `Any`
 
 File path to desired ruby interpreter to use by default.
 
-Default value: `$::apache::params::passenger_default_ruby`
+Default value: `$apache::params::passenger_default_ruby`
 
 ##### `passenger_default_user`
 
@@ -4219,7 +4218,7 @@ Data type: `Any`
 
 Refers to the location to the Passenger root directory, or to a location configuration file.
 
-Default value: `$::apache::params::passenger_root`
+Default value: `$apache::params::passenger_root`
 
 ##### `passenger_ruby`
 
@@ -4227,7 +4226,7 @@ Data type: `Any`
 
 Specifies the Ruby interpreter to use for serving Ruby web applications.
 
-Default value: `$::apache::params::passenger_ruby`
+Default value: `$apache::params::passenger_ruby`
 
 ##### `passenger_security_update_check_proxy`
 
@@ -4659,7 +4658,7 @@ Data type: `Any`
 
 
 
-Default value: `$::apache::params::root_group`
+Default value: `$apache::params::root_group`
 
 ##### `php_version`
 
@@ -4667,7 +4666,7 @@ Data type: `Any`
 
 
 
-Default value: `$::apache::params::php_version`
+Default value: `$apache::params::php_version`
 
 ##### `libphp_prefix`
 
@@ -4883,7 +4882,7 @@ Data type: `Any`
 
 Version of Apache to install module on.
 
-Default value: `$::apache::apache_version`
+Default value: `$apache::apache_version`
 
 ##### `manager_path`
 
@@ -5171,7 +5170,7 @@ Data type: `Any`
 
 Manage mod_security or mod_security2
 
-Default value: `$::apache::params::modsec_version`
+Default value: `$apache::params::modsec_version`
 
 ##### `logroot`
 
@@ -5179,7 +5178,7 @@ Data type: `Any`
 
 Configures the location of audit and debug logs.
 
-Default value: `$::apache::params::logroot`
+Default value: `$apache::params::logroot`
 
 ##### `crs_package`
 
@@ -5187,7 +5186,7 @@ Data type: `Any`
 
 Name of package that installs CRS rules.
 
-Default value: `$::apache::params::modsec_crs_package`
+Default value: `$apache::params::modsec_crs_package`
 
 ##### `activated_rules`
 
@@ -5195,7 +5194,7 @@ Data type: `Any`
 
 An array of rules from the modsec_crs_path or absolute to activate via symlinks.
 
-Default value: `$::apache::params::modsec_default_rules`
+Default value: `$apache::params::modsec_default_rules`
 
 ##### `modsec_dir`
 
@@ -5203,7 +5202,7 @@ Data type: `Any`
 
 Defines the path where Puppet installs the modsec configuration and activated rules links.
 
-Default value: `$::apache::params::modsec_dir`
+Default value: `$apache::params::modsec_dir`
 
 ##### `modsec_secruleengine`
 
@@ -5211,7 +5210,7 @@ Data type: `Any`
 
 Configures the rules engine.
 
-Default value: `$::apache::params::modsec_secruleengine`
+Default value: `$apache::params::modsec_secruleengine`
 
 ##### `audit_log_relevant_status`
 
@@ -5228,7 +5227,7 @@ Data type: `Any`
 Defines which parts of each transaction are going to be recorded in the audit log. Each part is assigned a single letter; when a
 letter appears in the list then the equivalent part will be recorded.
 
-Default value: `$::apache::params::modsec_audit_log_parts`
+Default value: `$apache::params::modsec_audit_log_parts`
 
 ##### `audit_log_type`
 
@@ -5236,7 +5235,7 @@ Data type: `Any`
 
 Defines the type of audit logging mechanism to be used.
 
-Default value: `$::apache::params::modsec_audit_log_type`
+Default value: `$apache::params::modsec_audit_log_type`
 
 ##### `audit_log_storage_dir`
 
@@ -5252,7 +5251,7 @@ Data type: `Any`
 
 Sets the match limit in the PCRE library.
 
-Default value: `$::apache::params::secpcrematchlimit`
+Default value: `$apache::params::secpcrematchlimit`
 
 ##### `secpcrematchlimitrecursion`
 
@@ -5260,7 +5259,7 @@ Data type: `Any`
 
 Sets the match limit recursion in the PCRE library.
 
-Default value: `$::apache::params::secpcrematchlimitrecursion`
+Default value: `$apache::params::secpcrematchlimitrecursion`
 
 ##### `allowed_methods`
 
@@ -5569,7 +5568,7 @@ Default based on the OS:
 - RedHat 8: [ 'all' ].
 - Other Platforms: [ 'all', '-SSLv2', '-SSLv3' ].
 
-Default value: `$::apache::params::ssl_protocol`
+Default value: `$apache::params::ssl_protocol`
 
 ##### `ssl_proxy_protocol`
 
@@ -5601,7 +5600,7 @@ Data type: `String`
 
 Configures the storage type of the global/inter-process SSL Session Cache
 
-Default value: `$::apache::params::ssl_sessioncache`
+Default value: `$apache::params::ssl_sessioncache`
 
 ##### `ssl_sessioncachetimeout`
 
@@ -5867,7 +5866,7 @@ Data type: `Any`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: `$::apache::apache_version`
+Default value: `$apache::apache_version`
 
 ### `apache::mod::vhost_alias`
 
@@ -6006,7 +6005,7 @@ Data type: `Any`
 
 Configure directory to use for daemon sockets.
 
-Default value: `$::apache::params::wsgi_socket_prefix`
+Default value: `$apache::params::wsgi_socket_prefix`
 
 ##### `wsgi_python_path`
 
@@ -6267,7 +6266,7 @@ Data type: `Any`
 
 Sets the directory in which Puppet places configuration files.
 
-Default value: `$::apache::confd_dir`
+Default value: `$apache::confd_dir`
 
 ##### `content`
 
@@ -6315,7 +6314,7 @@ This parameter is used only if the `verify_config` parameter's value is `true`.
 `verify_command` fails, the Puppet run deletes the configuration file and raises an error,
 but does not notify the Apache service.
 
-Default value: `$::apache::params::verify_command`
+Default value: `$apache::params::verify_command`
 
 ##### `verify_config`
 
@@ -6476,7 +6475,7 @@ Data type: `Any`
 Specifies a path to the module's libraries. Do not manually set this parameter
 without special reason. The `path` parameter overrides this value.
 
-Default value: `$::apache::lib_path`
+Default value: `$apache::lib_path`
 
 ##### `loadfile_name`
 
@@ -6519,2923 +6518,1914 @@ directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`
 
 ### `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` being a defined resource type, which allows Apache
-to evaluate it multiple times with different parameters.<br />
-The `apache::vhost` defined type allows you to have specialized configurations for virtual hosts
-that have requirements outside the defaults. You can set up a default virtual host within
-the base `::apache` class, as well as set a customized virtual host as the default.
-Customized virtual hosts have a lower numeric `priority` than the base class's, causing
-Apache to process the customized virtual host first.<br />
-The `apache::vhost` defined type uses `concat::fragment` to build the configuration file. To
-inject custom fragments for pieces of the configuration that the defined type doesn't
-inherently support, add a custom fragment.<br />
-For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples
-of 10, so any `order` that isn't a multiple of 10 should work.<br />
-> **Note:** When creating an `apache::vhost`, it cannot be named `default` or `default-ssl`,
-because vhosts with these titles are always managed by the module. This means that you cannot
-override `Apache::Vhost['default']`  or `Apache::Vhost['default-ssl]` resources. An optional
-workaround is to create a vhost named something else, such as `my default`, and ensure that the
-`default` and `default_ssl` vhosts are set to `false`:
-
-#### Examples
-
-##### 
-
-```puppet
-class { 'apache':
-  default_vhost     => false,
-  default_ssl_vhost => false,
-}
-```
+The apache::vhost class.
 
 #### Parameters
 
 The following parameters are available in the `apache::vhost` defined type.
 
-##### `apache_version`
+##### `docroot`
 
-Data type: `Any`
+Data type: `Variant[Boolean,String]`
 
-Apache's version number as a string, such as '2.2' or '2.4'.
 
-Default value: `$::apache::apache_version`
 
-##### `access_log`
+##### `manage_docroot`
+
+Data type: `Any`
 
-Data type: `Boolean`
 
-Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
 
 Default value: ``true``
 
-##### `access_log_env_var`
+##### `virtual_docroot`
 
 Data type: `Any`
 
-Specifies that only requests with particular environment variables be logged.
+
 
 Default value: ``false``
 
-##### `access_log_file`
+##### `port`
 
 Data type: `Any`
 
-Sets the filename of the `*_access.log` placed in `logroot`. Given a virtual host ---for
-instance, example.com--- it defaults to 'example.com_ssl.log' for
-[SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
-`example.com_access.log` for unencrypted virtual hosts.
-
-Default value: ``false``
 
-##### `access_log_format`
 
-Data type: `Any`
+Default value: ``undef``
 
-Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the
-access log.
+##### `ip`
 
-Default value: ``false``
+Data type: `Any`
 
-##### `access_log_pipe`
 
-Data type: `Any`
 
-Specifies a pipe where Apache sends access log messages.
+Default value: ``undef``
 
-Default value: ``false``
+##### `ip_based`
 
-##### `access_log_syslog`
+Data type: `Boolean`
 
-Data type: `Any`
 
-Sends all access log messages to syslog.
 
 Default value: ``false``
 
-##### `access_logs`
+##### `add_listen`
 
-Data type: `Optional[Array]`
+Data type: `Any`
 
-Allows you to give a hash that specifies the state of each of the `access_log_*`
-directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
 
-Default value: ``undef``
 
-##### `add_default_charset`
+Default value: ``true``
+
+##### `docroot_owner`
 
 Data type: `Any`
 
-Sets a default media charset value for the `AddDefaultCharset` directive, which is
-added to `text/plain` and `text/html` responses.
 
-Default value: ``undef``
 
-##### `add_listen`
+Default value: `'root'`
+
+##### `docroot_group`
 
 Data type: `Any`
 
-Determines whether the virtual host creates a `Listen` statement.<br />
-Setting `add_listen` to `false` prevents the virtual host from creating a `Listen`
-statement. This is important when combining virtual hosts that aren't passed an `ip`
-parameter with those that are.
 
-Default value: ``true``
 
-##### `use_optional_includes`
+Default value: `$apache::params::root_group`
 
-Data type: `Any`
+##### `docroot_mode`
 
-Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for
-`additional_includes` in Apache 2.4 or newer.
+Data type: `Any`
 
-Default value: `$::apache::use_optional_includes`
 
-##### `additional_includes`
 
-Data type: `Any`
+Default value: ``undef``
 
-Specifies paths to additional static, virtual host-specific Apache configuration files.
-You can use this parameter to implement a unique, custom configuration not supported by
-this module.
+##### `protocols`
 
-Default value: `[]`
+Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
-##### `aliases`
 
-Data type: `Any`
 
-Passes a list of [hashes][hash] to the virtual host to create `Alias`, `AliasMatch`,
-`ScriptAlias` or `ScriptAliasMatch` directives as per the `mod_alias` documentation.<br />
-For example:
-``` puppet
-aliases => [
-  { aliasmatch       => '^/image/(.*)\.jpg$',
-    path             => '/files/jpg.images/$1.jpg',
-  },
-  { alias            => '/image',
-    path             => '/ftp/pub/image',
-  },
-  { scriptaliasmatch => '^/cgi-bin(.*)',
-    path             => '/usr/local/share/cgi-bin$1',
-  },
-  { scriptalias      => '/nagios/cgi-bin/',
-    path             => '/usr/lib/nagios/cgi-bin/',
-  },
-  { alias            => '/nagios',
-    path             => '/usr/share/nagios/html',
-  },
-],
-```
-For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs
-a corresponding context, such as `<Directory /path/to/directory>` or
-`<Location /some/location/here>`. Puppet creates the directives in the order specified in
-the `aliases` parameter. As described in the `mod_alias` documentation, add more specific
-`alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more
-general ones to avoid shadowing.<BR />
-> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because
-you can precisely control the order of various alias directives. Defining `ScriptAliases`
-using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after
-*all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias`
-directives. This often causes problems; for example, this could cause problems with Nagios.<BR />
-If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias`
-directive might not be able to honor the `PassengerEnabled => off` statement. See
-[this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
+Default value: `[]`
 
-Default value: ``undef``
+##### `protocols_honor_order`
 
-##### `allow_encoded_slashes`
+Data type: `Optional[Boolean]`
 
-Data type: `Optional[Enum['on', 'off', 'nodecode']]`
 
-Sets the `AllowEncodedSlashes` declaration for the virtual host, overriding the server
-default. This modifies the virtual host responses to URLs with `\` and `/` characters. The
-default setting omits the declaration from the server configuration and selects the
-Apache default setting of `Off`.
 
 Default value: ``undef``
 
-##### `block`
+##### `serveradmin`
 
 Data type: `Any`
 
-Specifies the list of things to which Apache blocks access. Valid options are: `scm` (which
-blocks web access to `.svn`), `.git`, and `.bzr` directories.
 
-Default value: `[]`
 
-##### `cas_attribute_prefix`
+Default value: ``undef``
 
-Data type: `Any`
+##### `ssl`
 
-Adds a header with the value of this header being the attribute values when SAML
-validation is enabled.
+Data type: `Boolean`
 
-Default value: ``undef``
 
-##### `cas_attribute_delimiter`
+
+Default value: ``false``
+
+##### `ssl_cert`
 
 Data type: `Any`
 
-Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: ``undef``
 
-##### `cas_login_url`
+Default value: `$apache::default_ssl_cert`
+
+##### `ssl_key`
 
 Data type: `Any`
 
-Sets the URL to which the module redirects users when they attempt to access a
-CAS-protected resource and don't have an active session.
 
-Default value: ``undef``
 
-##### `cas_root_proxied_as`
+Default value: `$apache::default_ssl_key`
+
+##### `ssl_chain`
 
 Data type: `Any`
 
-Sets the URL end users see when access to this Apache server is proxied per vhost.
-This URL should not include a trailing slash.
 
-Default value: ``undef``
 
-##### `cas_scrub_request_headers`
+Default value: `$apache::default_ssl_chain`
+
+##### `ssl_ca`
 
 Data type: `Any`
 
-Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: ``undef``
 
-##### `cas_sso_enabled`
+Default value: `$apache::default_ssl_ca`
+
+##### `ssl_crl_path`
 
 Data type: `Any`
 
-Enables experimental support for single sign out (may mangle POST data).
 
-Default value: ``undef``
 
-##### `cas_validate_saml`
+Default value: `$apache::default_ssl_crl_path`
+
+##### `ssl_crl`
 
 Data type: `Any`
 
-Parse response from CAS server for SAML.
 
-Default value: ``undef``
 
-##### `cas_validate_url`
+Default value: `$apache::default_ssl_crl`
 
-Data type: `Any`
+##### `ssl_crl_check`
 
-Sets the URL to use when validating a client-presented ticket in an HTTP query string.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `comment`
 
-Data type: `Optional[Variant[String,Array[String]]]`
+Default value: `$apache::default_ssl_crl_check`
 
-Adds comments to the header of the configuration file. Pass as string or an array of strings.
-For example:
-``` puppet
-comment => "Account number: 123B",
-```
-Or:
-``` puppet
-comment => [
-  "Customer: X",
-  "Frontend domain: x.example.org",
-]
-```
+##### `ssl_certs_dir`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### `custom_fragment`
 
-Data type: `Optional[String]`
 
-Passes a string of custom configuration directives to place at the end of the virtual
-host configuration.
+Default value: `$apache::params::ssl_certs_dir`
 
-Default value: ``undef``
+##### `ssl_protocol`
 
-##### `default_vhost`
+Data type: `Any`
 
-Data type: `Boolean`
 
-Sets a given `apache::vhost` defined type as the default to serve requests that do not
-match any other `apache::vhost` defined types.
 
-Default value: ``false``
+Default value: ``undef``
 
-##### `directoryindex`
+##### `ssl_cipher`
 
 Data type: `Any`
 
-Sets the list of resources to look for when a client requests an index of the directory
-by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive
-documentation for details.
 
-Default value: `''`
 
-##### `docroot`
+Default value: ``undef``
 
-Data type: `Variant[Boolean,String]`
+##### `ssl_honorcipherorder`
 
-**Required**.<br />
-Sets the `DocumentRoot` location, from which Apache serves files.<br />
-If `docroot` and `manage_docroot` are both set to `false`, no `DocumentRoot` will be set
-and the accompanying `<Directory /path/to/directory>` block will not be created.
+Data type: `Any`
 
-##### `docroot_group`
 
-Data type: `Any`
 
-Sets group access to the `docroot` directory.
+Default value: ``undef``
 
-Default value: `$::apache::params::root_group`
+##### `ssl_verify_client`
 
-##### `docroot_owner`
+Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
-Data type: `Any`
 
-Sets individual user access to the `docroot` directory.
 
-Default value: `'root'`
+Default value: ``undef``
 
-##### `docroot_mode`
+##### `ssl_verify_depth`
 
 Data type: `Any`
 
-Sets access permissions for the `docroot` directory, in numeric notation.
-
-Default value: ``undef``
 
-##### `manage_docroot`
 
-Data type: `Any`
+Default value: ``undef``
 
-Determines whether Puppet manages the `docroot` directory.
+##### `ssl_proxy_verify`
 
-Default value: ``true``
+Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
-##### `error_log`
 
-Data type: `Boolean`
 
-Specifies whether `*_error.log` directives should be configured.
+Default value: ``undef``
 
-Default value: ``true``
+##### `ssl_proxy_verify_depth`
 
-##### `error_log_file`
+Data type: `Optional[Integer[0]]`
 
-Data type: `Any`
 
-Points the virtual host's error logs to a `*_error.log` file. If this parameter is
-undefined, Puppet checks for values in `error_log_pipe`, then `error_log_syslog`.<br />
-If none of these parameters is set, given a virtual host `example.com`, Puppet defaults
-to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and
-`$logroot/example.com_error.log` for non-SSL virtual hosts.
 
 Default value: ``undef``
 
-##### `error_log_pipe`
+##### `ssl_proxy_ca_cert`
 
 Data type: `Any`
 
-Specifies a pipe to send error log messages to.<br />
-This parameter has no effect if the `error_log_file` parameter has a value. If neither
-this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
+
 
 Default value: ``undef``
 
-##### `error_log_syslog`
+##### `ssl_proxy_check_peer_cn`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off']]`
 
-Determines whether to send all error log messages to syslog.
-This parameter has no effect if either of the `error_log_file` or `error_log_pipe`
-parameters has a value. If none of these parameters has a value, given a virtual host
-`example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual
-hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: ``undef``
 
-##### `error_log_format`
+Default value: ``undef``
 
-Data type: `Optional[
-    Array[
-      Variant[
-        String,
-        Hash[String, Enum['connection', 'request']]
-      ]
-    ]
-  ]`
+##### `ssl_proxy_check_peer_name`
 
-Sets the [ErrorLogFormat](https://httpd.apache.org/docs/current/mod/core.html#errorlogformat)
-format specification for error log entries inside virtual host
-For example:
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  error_log_format => [
-    '[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M',
-    { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' },
-    { "[%{uc}t] [R:%L] UA:'%+{User-Agent}i'" => 'request' },
-    { "[%{uc}t] [R:%L] Referer:'%+{Referer}i'" => 'request' },
-    { '[%{uc}t] [C:%{c}L] local\ %a remote\ %A' => 'connection' },
-  ],
-}
-```
+Data type: `Optional[Enum['on', 'off']]`
 
-Default value: ``undef``
 
-##### `error_documents`
 
-Data type: `Any`
+Default value: ``undef``
 
-A list of hashes which can be used to override the
-[ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)
-settings for this virtual host.<br />
-For example:
-``` puppet
-apache::vhost { 'sample.example.net':
-  error_documents => [
-    { 'error_code' => '503', 'document' => '/service-unavail' },
-    { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
-  ],
-}
-```
+##### `ssl_proxy_check_peer_expire`
 
-Default value: `[]`
+Data type: `Optional[Enum['on', 'off']]`
 
-##### `ensure`
 
-Data type: `Enum['absent', 'present']`
 
-Specifies if the virtual host is present or absent.<br />
+Default value: ``undef``
 
-Default value: `'present'`
+##### `ssl_proxy_machine_cert`
 
-##### `fallbackresource`
+Data type: `Any`
 
-Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
 
-Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource)
-directive, which specifies an action to take for any URL that doesn't map to anything in
-your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin
-with a `/` or be `disabled`.
 
 Default value: ``undef``
 
-##### `fastcgi_server`
+##### `ssl_proxy_machine_cert_chain`
 
 Data type: `Any`
 
-Specify an external FastCGI server to manage a connection to.
+
 
 Default value: ``undef``
 
-##### `fastcgi_socket`
+##### `ssl_proxy_cipher_suite`
 
 Data type: `Any`
 
-Specify the socket that will be used to communicate with an external FastCGI server.
+
 
 Default value: ``undef``
 
-##### `fastcgi_idle_timeout`
+##### `ssl_proxy_protocol`
 
 Data type: `Any`
 
-If using fastcgi, this option sets the timeout for the server to respond.
+
 
 Default value: ``undef``
 
-##### `fastcgi_dir`
+##### `ssl_options`
 
 Data type: `Any`
 
-Specify an internal FastCGI directory that is to be managed.
+
 
 Default value: ``undef``
 
-##### `filters`
+##### `ssl_openssl_conf_cmd`
 
 Data type: `Any`
 
-[Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart,
-context-sensitive configuration of output content filters.
-``` puppet
-apache::vhost { "$::fqdn":
-  filters => [
-    'FilterDeclare   COMPRESS',
-    'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
-    'FilterChain     COMPRESS',
-    'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
-  ],
-}
-```
+
 
 Default value: ``undef``
 
-##### `h2_copy_files`
+##### `ssl_proxyengine`
 
-Data type: `Optional[Boolean]`
+Data type: `Boolean`
 
-Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
-directive which influences how the requestion process pass files to the main connection.
 
-Default value: ``undef``
 
-##### `h2_direct`
+Default value: ``false``
+
+##### `ssl_stapling`
 
 Data type: `Optional[Boolean]`
 
-Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
-directive which toggles the usage of the HTTP/2 Direct Mode.
+
 
 Default value: ``undef``
 
-##### `h2_early_hints`
-
-Data type: `Optional[Boolean]`
-
-Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2earlyhints)
-directive which controls if HTTP status 103 interim responses are forwarded to
-the client or not.
-
-Default value: ``undef``
+##### `ssl_stapling_timeout`
 
-##### `h2_max_session_streams`
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2maxsessionstreams)
-directive which sets the maximum number of active streams per HTTP/2 session
-that the server allows.
 
 Default value: ``undef``
 
-##### `h2_modern_tls_only`
+##### `ssl_stapling_return_errors`
+
+Data type: `Any`
 
-Data type: `Optional[Boolean]`
 
-Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
-directive which toggles the security checks on HTTP/2 connections in TLS mode.
 
 Default value: ``undef``
 
-##### `h2_push`
+##### `priority`
 
-Data type: `Optional[Boolean]`
+Data type: `Any`
 
-Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
-directive which toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: ``undef``
 
-##### `h2_push_diary_size`
+Default value: ``undef``
 
-Data type: `Optional[Integer]`
+##### `default_vhost`
 
-Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushdiarysize)
-directive which toggles the maximum number of HTTP/2 server pushes that are
-remembered per HTTP/2 connection.
+Data type: `Boolean`
 
-Default value: ``undef``
 
-##### `h2_push_priority`
 
-Data type: `Array[String]`
+Default value: ``false``
 
-Sets the [H2PushPriority](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushpriority)
-directive which defines the priority handling of pushed responses based on the
-content-type of the response.
+##### `servername`
 
-Default value: `[]`
+Data type: `Any`
 
-##### `h2_push_resource`
 
-Data type: `Array[String]`
 
-Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource)
-directive which declares resources for early pushing to the client.
+Default value: `$name`
 
-Default value: `[]`
+##### `serveraliases`
 
-##### `h2_serialize_headers`
+Data type: `Any`
 
-Data type: `Optional[Boolean]`
 
-Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
-directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
-format for processing by httpd core.
 
-Default value: ``undef``
+Default value: `[]`
 
-##### `h2_stream_max_mem_size`
+##### `options`
 
-Data type: `Optional[Integer]`
+Data type: `Any`
 
-Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
-directive which sets the maximum number of outgoing data bytes buffered in
-memory for an active stream.
 
-Default value: ``undef``
 
-##### `h2_tls_cool_down_secs`
+Default value: `['Indexes','FollowSymLinks','MultiViews']`
 
-Data type: `Optional[Integer]`
+##### `override`
 
-Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
-directive which sets the number of seconds of idle time on a TLS connection
-before the TLS write size falls back to a small (~1300 bytes) length.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `h2_tls_warm_up_size`
 
-Data type: `Optional[Integer]`
+Default value: `['None']`
 
-Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlswarmupsize)
-directive which sets the number of bytes to be sent in small TLS records (~1300
-bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
+##### `directoryindex`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### `h2_upgrade`
 
-Data type: `Optional[Boolean]`
 
-Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2upgrade)
-directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
-to HTTP/2.
+Default value: `''`
 
-Default value: ``undef``
+##### `vhost_name`
 
-##### `h2_window_size`
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2windowsize)
-directive which sets the size of the window that is used for flow control from
-client to server and limits the amount of data the server has to buffer.
 
-Default value: ``undef``
+Default value: `'*'`
 
-##### `headers`
+##### `logroot`
 
 Data type: `Any`
 
-Adds lines to replace, merge, or remove response headers. See
-[Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
-
-Default value: ``undef``
 
-##### `ip`
 
-Data type: `Any`
+Default value: `$apache::logroot`
 
-Sets the IP address the virtual host listens on. By default, uses Apache's default behavior
-of listening on all IPs.
+##### `logroot_ensure`
 
-Default value: ``undef``
+Data type: `Enum['directory', 'absent']`
 
-##### `ip_based`
 
-Data type: `Boolean`
 
-Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual
-host. This parameter inhibits the creation of a NameVirtualHost directive, since those are
-used to funnel requests to name-based virtual hosts.
+Default value: `'directory'`
 
-Default value: ``false``
+##### `logroot_mode`
 
-##### `itk`
+Data type: `Any`
 
-Data type: `Optional[Hash]`
 
-Configures [ITK](http://mpm-itk.sesse.net/) in a hash.<br />
-Usage typically looks something like:
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot => '/path/to/directory',
-  itk     => {
-    user  => 'someuser',
-    group => 'somegroup',
-  },
-}
-```
-Valid values are: a hash, which can include the keys:
-* `user` + `group`
-* `assignuseridexpr`
-* `assigngroupidexpr`
-* `maxclientvhost`
-* `nice`
-* `limituidrange` (Linux 3.5.0 or newer)
-* `limitgidrange` (Linux 3.5.0 or newer)
 
 Default value: ``undef``
 
-##### `action`
+##### `logroot_owner`
 
 Data type: `Any`
 
-Specifies whether you wish to configure mod_actions action directive which will
-activate cgi-script when triggered by a request.
+
 
 Default value: ``undef``
 
-##### `jk_mounts`
+##### `logroot_group`
 
 Data type: `Any`
 
-Sets up a virtual host with `JkMount` and `JkUnMount` directives to handle the paths
-for URL mapping between Tomcat and Apache.<br />
-The parameter must be an array of hashes where each hash must contain the `worker`
-and either the `mount` or `unmount` keys.<br />
-Usage typically looks like:
-``` puppet
-apache::vhost { 'sample.example.net':
-  jk_mounts => [
-    { mount   => '/*',     worker => 'tcnode1', },
-    { unmount => '/*.jpg', worker => 'tcnode1', },
-  ],
-}
-```
+
 
 Default value: ``undef``
 
-##### `http_protocol_options`
+##### `log_level`
 
-Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
+Data type: `Optional[Apache::LogLevel]`
 
-Specifies the strictness of HTTP protocol checks.
 
-Default value: ``undef``
 
-##### `keepalive`
+Default value: ``undef``
 
-Data type: `Optional[Enum['on', 'off']]`
+##### `access_log`
 
-Determines whether to enable persistent HTTP connections with the `KeepAlive` directive
-for the virtual host. By default, the global, server-wide `KeepAlive` setting is in effect.<br />
-Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options
-for the virtual host.
+Data type: `Boolean`
 
-Default value: ``undef``
 
-##### `keepalive_timeout`
 
-Data type: `Any`
+Default value: ``true``
 
-Sets the `KeepAliveTimeout` directive for the virtual host, which determines the amount
-of time to wait for subsequent requests on a persistent HTTP connection. By default, the
-global, server-wide `KeepAlive` setting is in effect.<br />
-This parameter is only relevant if either the global, server-wide `keepalive` parameter or
-the per-vhost `keepalive` parameter is enabled.
+##### `access_log_file`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### `max_keepalive_requests`
 
-Data type: `Any`
 
-Limits the number of requests allowed per connection to the virtual host. By default,
-the global, server-wide `KeepAlive` setting is in effect.<br />
-This parameter is only relevant if either the global, server-wide `keepalive` parameter or
-the per-vhost `keepalive` parameter is enabled.
+Default value: ``false``
 
-Default value: ``undef``
+##### `access_log_pipe`
 
-##### `auth_kerb`
+Data type: `Any`
 
-Data type: `Boolean`
 
-Enable `mod_auth_kerb` parameters for a virtual host.<br />
-Usage typically looks like:
-``` puppet
-apache::vhost { 'sample.example.net':
-  auth_kerb              => `true`,
-  krb_method_negotiate   => 'on',
-  krb_auth_realms        => ['EXAMPLE.ORG'],
-  krb_local_user_mapping => 'on',
-  directories            => {
-    path         => '/var/www/html',
-    auth_name    => 'Kerberos Login',
-    auth_type    => 'Kerberos',
-    auth_require => 'valid-user',
-  },
-}
-```
 
 Default value: ``false``
 
-##### `krb_method_negotiate`
+##### `access_log_syslog`
 
 Data type: `Any`
 
-Determines whether to use the Negotiate method.
 
-Default value: `'on'`
 
-##### `krb_method_k5passwd`
+Default value: ``false``
 
-Data type: `Any`
+##### `access_log_format`
 
-Determines whether to use password-based authentication for Kerberos v5.
+Data type: `Any`
 
-Default value: `'on'`
 
-##### `krb_authoritative`
 
-Data type: `Any`
+Default value: ``false``
 
-If set to `off`, authentication controls can be passed on to another module.
+##### `access_log_env_var`
 
-Default value: `'on'`
+Data type: `Any`
 
-##### `krb_auth_realms`
 
-Data type: `Any`
 
-Specifies an array of Kerberos realms to use for authentication.
+Default value: ``false``
 
-Default value: `[]`
+##### `access_logs`
 
-##### `krb_5keytab`
+Data type: `Optional[Array]`
 
-Data type: `Any`
 
-Specifies the Kerberos v5 keytab file's location.
 
 Default value: ``undef``
 
-##### `krb_local_user_mapping`
+##### `use_servername_for_filenames`
 
-Data type: `Any`
+Data type: `Optional[Boolean]`
 
-Strips @REALM from usernames for further use.
 
-Default value: ``undef``
 
-##### `krb_verify_kdc`
+Default value: ``false``
+
+##### `aliases`
 
 Data type: `Any`
 
-This option can be used to disable the verification tickets against local keytab to prevent
-KDC spoofing attacks.
 
-Default value: `'on'`
 
-##### `krb_servicename`
+Default value: ``undef``
 
-Data type: `Any`
+##### `directories`
 
-Specifies the service name that will be used by Apache for authentication. Corresponding
-key of this name must be stored in the keytab.
+Data type: `Optional[Variant[Hash, Array[Variant[Array,Hash]]]]`
 
-Default value: `'HTTP'`
 
-##### `krb_save_credentials`
 
-Data type: `Any`
+Default value: ``undef``
 
-This option enables credential saving functionality.
+##### `error_log`
 
-Default value: `'off'`
+Data type: `Boolean`
 
-##### `logroot`
 
-Data type: `Any`
 
-Specifies the location of the virtual host's logfiles.
+Default value: ``true``
 
-Default value: `$::apache::logroot`
+##### `error_log_file`
 
-##### `logroot_ensure`
+Data type: `Any`
 
-Data type: `Enum['directory', 'absent']`
 
-Determines whether or not to remove the logroot directory for a virtual host.
 
-Default value: `'directory'`
+Default value: ``undef``
 
-##### `logroot_mode`
+##### `error_log_pipe`
 
 Data type: `Any`
 
-Overrides the mode the logroot directory is set to. Do *not* grant write access to the
-directory the logs are stored in without being aware of the consequences; for more
-information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
+
 
 Default value: ``undef``
 
-##### `logroot_owner`
+##### `error_log_syslog`
 
 Data type: `Any`
 
-Sets individual user access to the logroot directory.
+
 
 Default value: ``undef``
 
-##### `logroot_group`
+##### `error_log_format`
+
+Data type: `Optional[
+    Array[
+      Variant[
+        String,
+        Hash[String, Enum['connection', 'request']]
+      ]
+    ]
+  ]`
 
-Data type: `Any`
 
-Sets group access to the `logroot` directory.
 
 Default value: ``undef``
 
-##### `log_level`
+##### `http_protocol_options`
+
+Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
 
-Data type: `Optional[Apache::LogLevel]`
 
-Specifies the verbosity of the error log.
 
 Default value: ``undef``
 
-##### `modsec_body_limit`
+##### `modsec_audit_log`
 
 Data type: `Any`
 
-Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
+
 
 Default value: ``undef``
 
-##### `modsec_disable_vhost`
+##### `modsec_audit_log_file`
 
 Data type: `Any`
 
-Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
+
 
 Default value: ``undef``
 
-##### `modsec_disable_ids`
+##### `modsec_audit_log_pipe`
 
-Data type: `Optional[Variant[Hash, Array]]`
+Data type: `Any`
 
-Removes `mod_security` IDs from the virtual host.<br />
-Also takes a hash allowing removal of an ID from a specific location.
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_ids => [ 90015, 90016 ],
-}
-```
 
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
-}
-```
 
 Default value: ``undef``
 
-##### `modsec_disable_ips`
+##### `error_documents`
 
 Data type: `Any`
 
-Specifies an array of IP addresses to exclude from `mod_security` rule matching.
-
-Default value: ``undef``
-
-##### `modsec_disable_msgs`
 
-Data type: `Optional[Variant[Hash, Array]]`
 
-Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing
-removal of an Msg from a specific location.
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_msgs => ['Blind SQL Injection Attack', 'Session Fixation Attack'],
-}
-```
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_msgs => { '/location1' => ['Blind SQL Injection Attack', 'Session Fixation Attack'] },
-}
-```
+Default value: `[]`
 
-Default value: ``undef``
+##### `fallbackresource`
 
-##### `modsec_disable_tags`
+Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
 
-Data type: `Optional[Variant[Hash, Array]]`
 
-Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing
-removal of an Tag from a specific location.
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_tags => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'],
-}
-```
-``` puppet
-apache::vhost { 'sample.example.net':
-  modsec_disable_tags => { '/location1' => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'] },
-}
-```
 
 Default value: ``undef``
 
-##### `modsec_audit_log_file`
+##### `scriptalias`
 
 Data type: `Any`
 
-If set, it is relative to `logroot`.<br />
-One of the parameters that determines how to send `mod_security` audit
-log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
-If none of those parameters are set, the global audit log is used
-(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
+
 
 Default value: ``undef``
 
-##### `modsec_audit_log_pipe`
+##### `scriptaliases`
 
 Data type: `Any`
 
-If `modsec_audit_log_pipe` is set, it should start with a pipe. Example
-`|/path/to/mlogc /path/to/mlogc.conf`.<br />
-One of the parameters that determines how to send `mod_security` audit
-log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
-If none of those parameters are set, the global audit log is used
-(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: ``undef``
 
-##### `modsec_audit_log`
+Default value: `[]`
 
-Data type: `Any`
+##### `limitreqfieldsize`
 
-If `modsec_audit_log` is `true`, given a virtual host ---for instance, example.com--- it
-defaults to `example.com\_security\_ssl.log` for SSL-encrypted virtual hosts
-and `example.com\_security.log` for unencrypted virtual hosts.<br />
-One of the parameters that determines how to send `mod_security` audit
-log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).<br />
-If none of those parameters are set, the global audit log is used
-(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
+Data type: `Optional[Integer]`
 
-Default value: ``undef``
 
-##### `no_proxy_uris`
 
-Data type: `Any`
+Default value: ``undef``
 
-Specifies URLs you do not want to proxy. This parameter is meant to be used in combination
-with [`proxy_dest`](#proxy_dest).
+##### `limitreqfields`
 
-Default value: `[]`
+Data type: `Optional[Integer]`
 
-##### `no_proxy_uris_match`
 
-Data type: `Any`
 
-This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
+Default value: ``undef``
 
-Default value: `[]`
+##### `limitreqline`
 
-##### `proxy_preserve_host`
+Data type: `Optional[Integer]`
 
-Data type: `Any`
 
-Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost).<br />
-Setting this parameter to `true` enables the `Host:` line from an incoming request to be
-proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
-Default value: ``false``
+Default value: ``undef``
 
-##### `proxy_add_headers`
+##### `limitreqbody`
+
+Data type: `Optional[Integer]`
 
-Data type: `Any`
 
-Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders).<br />
-This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For,
-X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
 Default value: ``undef``
 
-##### `proxy_error_override`
+##### `proxy_dest`
 
 Data type: `Any`
 
-Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride).
-This directive controls whether Apache should override error pages for proxied content.
 
-Default value: ``false``
 
-##### `options`
+Default value: ``undef``
+
+##### `proxy_dest_match`
 
 Data type: `Any`
 
-Sets the `Options` for the specified virtual host. For example:
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  options => ['Indexes','FollowSymLinks','MultiViews'],
-}
-```
-> **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options',
-'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
-Default value: `['Indexes','FollowSymLinks','MultiViews']`
 
-##### `override`
+Default value: ``undef``
+
+##### `proxy_dest_reverse_match`
 
 Data type: `Any`
 
-Sets the overrides for the specified virtual host. Accepts an array of
-[AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
 
-Default value: `['None']`
 
-##### `passenger_enabled`
+Default value: ``undef``
+
+##### `proxy_pass`
+
+Data type: `Any`
 
-Data type: `Optional[Boolean]`
 
-Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled)
-directive to `on` or `off`. Requires `apache::mod::passenger` to be included.
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path              => '/path/to/directory',
-      passenger_enabled => 'on',
-    },
-  ],
-}
-```
-> **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)
-using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
 Default value: ``undef``
 
-##### `passenger_base_uri`
+##### `proxy_pass_match`
+
+Data type: `Any`
 
-Data type: `Optional[String]`
 
-Sets [PassengerBaseURI](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbase_rui),
- to specify that the given URI is a distinct application served by Passenger.
 
 Default value: ``undef``
 
-##### `passenger_ruby`
+##### `proxy_requests`
 
-Data type: `Optional[Stdlib::Absolutepath]`
+Data type: `Boolean`
 
-Sets [PassengerRuby](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerruby),
-specifying the Ruby interpreter to use when serving the relevant web applications.
 
-Default value: ``undef``
 
-##### `passenger_python`
+Default value: ``false``
 
-Data type: `Optional[Stdlib::Absolutepath]`
+##### `suphp_addhandler`
 
-Sets [PassengerPython](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpython),
-specifying the Python interpreter to use when serving the relevant web applications.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `passenger_nodejs`
 
-Data type: `Optional[Stdlib::Absolutepath]`
+Default value: `$apache::params::suphp_addhandler`
 
-Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengernodejs),
-specifying Node.js command to use when serving the relevant web applications.
+##### `suphp_engine`
 
-Default value: ``undef``
+Data type: `Enum['on', 'off']`
 
-##### `passenger_meteor_app_settings`
 
-Data type: `Optional[String]`
 
-Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermeteorappsettings),
-specifying a JSON file with settings for the application when using a Meteor
-application in non-bundled mode.
+Default value: `$apache::params::suphp_engine`
 
-Default value: ``undef``
+##### `suphp_configpath`
 
-##### `passenger_app_env`
+Data type: `Any`
 
-Data type: `Optional[String]`
 
-Sets [PassengerAppEnv](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappenv),
-the environment for the Passenger application. If not specified, defaults to the global
-setting or 'production'.
 
-Default value: ``undef``
+Default value: `$apache::params::suphp_configpath`
 
-##### `passenger_app_root`
+##### `php_flags`
 
-Data type: `Optional[Stdlib::Absolutepath]`
+Data type: `Any`
 
-Sets [PassengerRoot](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapproot),
-the location of the Passenger application root if different from the DocumentRoot.
 
-Default value: ``undef``
 
-##### `passenger_app_group_name`
+Default value: `{}`
 
-Data type: `Optional[String]`
+##### `php_values`
 
-Sets [PassengerAppGroupName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappgroupname),
- the name of the application group that the current application should belong to.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `passenger_app_start_command`
 
-Data type: `Optional[String]`
+Default value: `{}`
 
-Sets [PassengerAppStartCommand](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappstartcommand),
- how Passenger should start your app on a specific port.
+##### `php_admin_flags`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### `passenger_app_type`
 
-Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
-Sets [PassengerAppType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapptype),
- to force Passenger to recognize the application as a specific type.
+Default value: `{}`
 
-Default value: ``undef``
+##### `php_admin_values`
 
-##### `passenger_startup_file`
+Data type: `Any`
 
-Data type: `Optional[String]`
 
-Sets the [PassengerStartupFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstartupfile),
-path. This path is relative to the application root.
 
-Default value: ``undef``
+Default value: `{}`
 
-##### `passenger_restart_dir`
+##### `no_proxy_uris`
 
-Data type: `Optional[String]`
+Data type: `Any`
 
-Sets the [PassengerRestartDir](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrestartdir),
- to customize the directory in which `restart.txt` is searched for.
 
-Default value: ``undef``
 
-##### `passenger_spawn_method`
+Default value: `[]`
 
-Data type: `Optional[Enum['direct', 'smart']]`
+##### `no_proxy_uris_match`
 
-Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerspawnmethod),
-whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `passenger_load_shell_envvars`
 
-Data type: `Optional[Boolean]`
+Default value: `[]`
 
-Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
-to enable or disable the loading of shell environment variables before spawning the application.
+##### `proxy_preserve_host`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### `passenger_rolling_restarts`
 
-Data type: `Optional[Boolean]`
 
-Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
-to enable or disable support for zero-downtime application restarts through `restart.txt`.
+Default value: ``false``
 
-Default value: ``undef``
+##### `proxy_add_headers`
 
-##### `passenger_resist_deployment_errors`
+Data type: `Any`
 
-Data type: `Optional[Boolean]`
 
-Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerresistdeploymenterrors),
-to enable or disable resistance against deployment errors.
 
 Default value: ``undef``
 
-##### `passenger_user`
-
-Data type: `Optional[String]`
+##### `proxy_error_override`
 
-Sets [PassengerUser](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeruser),
-the running user for sandboxing applications.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `passenger_group`
 
-Data type: `Optional[String]`
+Default value: ``false``
 
-Sets [PassengerGroup](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengergroup),
-the running group for sandboxing applications.
+##### `redirect_source`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### `passenger_friendly_error_pages`
 
-Data type: `Optional[Boolean]`
 
-Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerfriendlyerrorpages),
-which can display friendly error pages whenever an application fails to start. This
-friendly error page presents the startup error message, some suggestions for solving
-the problem, a backtrace and a dump of the environment variables.
+Default value: `'/'`
 
-Default value: ``undef``
+##### `redirect_dest`
 
-##### `passenger_min_instances`
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerMinInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermininstances),
-the minimum number of application processes to run.
 
 Default value: ``undef``
 
-##### `passenger_max_instances`
+##### `redirect_status`
+
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerMaxInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxinstances),
-the maximum number of application processes to run.
 
 Default value: ``undef``
 
-##### `passenger_max_preloader_idle_time`
+##### `redirectmatch_status`
+
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxpreloaderidletime),
-the maximum amount of time the preloader waits before shutting down an idle process.
 
 Default value: ``undef``
 
-##### `passenger_force_max_concurrent_requests_per_process`
+##### `redirectmatch_regexp`
+
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerforcemaxconcurrentrequestsperprocess),
-the maximum amount of concurrent requests the application can handle per process.
 
 Default value: ``undef``
 
-##### `passenger_start_timeout`
+##### `redirectmatch_dest`
+
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerStartTimeout](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstarttimeout),
-the timeout for the application startup.
 
 Default value: ``undef``
 
-##### `passenger_concurrency_model`
+##### `headers`
+
+Data type: `Any`
 
-Data type: `Optional[Enum['process', 'thread']]`
 
-Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerconcurrencyodel),
-to specify the I/O concurrency model that should be used for Ruby application processes.
-Passenger supports two concurrency models:<br />
-* `process` - single-threaded, multi-processed I/O concurrency.
-* `thread` - multi-threaded, multi-processed I/O concurrency.
 
 Default value: ``undef``
 
-##### `passenger_thread_count`
+##### `request_headers`
+
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerthreadcount),
-the number of threads that Passenger should spawn per Ruby application process.<br />
-This option only has effect if PassengerConcurrencyModel is `thread`.
 
 Default value: ``undef``
 
-##### `passenger_max_requests`
+##### `filters`
+
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerMaxRequests](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequests),
-the maximum number of requests an application process will process.
 
 Default value: ``undef``
 
-##### `passenger_max_request_time`
+##### `rewrites`
+
+Data type: `Optional[Array]`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequesttime),
-the maximum amount of time, in seconds, that an application process may take to
-process a request.
 
 Default value: ``undef``
 
-##### `passenger_memory_limit`
+##### `rewrite_base`
+
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermemorylimit),
-the maximum amount of memory that an application process may use, in megabytes.
 
 Default value: ``undef``
 
-##### `passenger_stat_throttle_rate`
+##### `rewrite_rule`
+
+Data type: `Any`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstatthrottlerate),
-to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
 
 Default value: ``undef``
 
-##### `passenger_pre_start`
+##### `rewrite_cond`
 
-Data type: `Optional[Variant[String,Array[String]]]`
+Data type: `Any`
 
-Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
-the URL of the application if pre-starting is required.
 
-Default value: ``undef``
 
-##### `passenger_high_performance`
+Default value: ``undef``
 
-Data type: `Optional[Boolean]`
+##### `rewrite_inherit`
 
-Sets [PassengerHighPerformance](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerhighperformance),
-to enhance performance in return for reduced compatibility.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `passenger_buffer_upload`
 
-Data type: `Optional[Boolean]`
+Default value: ``false``
 
-Sets [PassengerBufferUpload](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferupload),
-to buffer HTTP client request bodies before they are sent to the application.
+##### `setenv`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### `passenger_buffer_response`
 
-Data type: `Optional[Boolean]`
 
-Sets [PassengerBufferResponse](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferresponse),
-to buffer Happlication-generated responses.
+Default value: `[]`
 
-Default value: ``undef``
+##### `setenvif`
 
-##### `passenger_error_override`
+Data type: `Any`
 
-Data type: `Optional[Boolean]`
 
-Sets [PassengerErrorOverride](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengererroroverride),
-to specify whether Apache will intercept and handle response with HTTP status codes of
-400 and higher.
 
-Default value: ``undef``
+Default value: `[]`
 
-##### `passenger_max_request_queue_size`
+##### `setenvifnocase`
 
-Data type: `Optional[Integer]`
+Data type: `Any`
 
-Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuesize),
-to specify the maximum amount of requests that are allowed to queue whenever the maximum
-concurrent request limit is reached. If the queue is already at this specified limit, then
-Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
-A value of 0 means that the queue size is unbounded.
 
-Default value: ``undef``
 
-##### `passenger_max_request_queue_time`
+Default value: `[]`
 
-Data type: `Optional[Integer]`
+##### `block`
 
-Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuetime),
-to specify the maximum amount of time that requests are allowed to stay in the queue
-whenever the maximum concurrent request limit is reached. If a request reaches this specified
-limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
-A value of 0 means that the queue time is unbounded.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `passenger_sticky_sessions`
 
-Data type: `Optional[Boolean]`
+Default value: `[]`
 
-Sets [PassengerStickySessions](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessions),
-to specify that, whenever possible, all requests sent by a client will be routed to the same
-originating application process.
+##### `ensure`
 
-Default value: ``undef``
+Data type: `Enum['absent', 'present']`
 
-##### `passenger_sticky_sessions_cookie_name`
 
-Data type: `Optional[String]`
 
-Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookiename),
-to specify the name of the sticky sessions cookie.
+Default value: `'present'`
 
-Default value: ``undef``
+##### `wsgi_application_group`
 
-##### `passenger_sticky_sessions_cookie_attributes`
+Data type: `Any`
 
-Data type: `Optional[String]`
 
-Sets [PassengerStickySessionsCookieAttributes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookieattributes),
-the attributes of the sticky sessions cookie.
 
 Default value: ``undef``
 
-##### `passenger_allow_encoded_slashes`
+##### `wsgi_daemon_process`
+
+Data type: `Optional[Variant[String,Hash]]`
 
-Data type: `Optional[Boolean]`
 
-Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerallowencodedslashes),
-to allow URLs with encoded slashes. Please note that this feature will not work properly
-unless Apache's `AllowEncodedSlashes` is also enabled.
 
 Default value: ``undef``
 
-##### `passenger_app_log_file`
+##### `wsgi_daemon_process_options`
+
+Data type: `Optional[Hash]`
 
-Data type: `Optional[String]`
 
-Sets [PassengerAppLogFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapplogfile),
-app specific messages logged to a different file in addition to Passenger log file.
 
 Default value: ``undef``
 
-##### `passenger_debugger`
+##### `wsgi_import_script`
+
+Data type: `Any`
 
-Data type: `Optional[Boolean]`
 
-Sets [PassengerDebugger](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerdebugger),
-to turn support for Ruby application debugging on or off.
 
 Default value: ``undef``
 
-##### `passenger_lve_min_uid`
+##### `wsgi_import_script_options`
+
+Data type: `Optional[Hash]`
 
-Data type: `Optional[Integer]`
 
-Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerlveminuid),
-to only allow the spawning of application processes with UIDs equal to, or higher than, this
-specified value on LVE-enabled kernels.
 
 Default value: ``undef``
 
-##### `php_values`
+##### `wsgi_process_group`
 
 Data type: `Any`
 
-Allows per-virtual host setting [`php_value`s](http://php.net/manual/en/configuration.changes.php).
-These flags or values can be overwritten by a user or an application.
-Within a vhost declaration:
-``` puppet
-  php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
-```
 
-Default value: `{}`
 
-##### `php_flags`
+Default value: ``undef``
 
-Data type: `Any`
+##### `wsgi_script_aliases_match`
 
-Allows per-virtual host setting [`php_flags\``](http://php.net/manual/en/configuration.changes.php).
-These flags or values can be overwritten by a user or an application.
+Data type: `Optional[Hash]`
 
-Default value: `{}`
 
-##### `php_admin_values`
 
-Data type: `Any`
+Default value: ``undef``
 
-Allows per-virtual host setting [`php_admin_value`](http://php.net/manual/en/configuration.changes.php).
-These flags or values cannot be overwritten by a user or an application.
+##### `wsgi_script_aliases`
 
-Default value: `{}`
+Data type: `Optional[Hash]`
 
-##### `php_admin_flags`
 
-Data type: `Any`
 
-Allows per-virtual host setting [`php_admin_flag`](http://php.net/manual/en/configuration.changes.php).
-These flags or values cannot be overwritten by a user or an application.
+Default value: ``undef``
 
-Default value: `{}`
+##### `wsgi_pass_authorization`
 
-##### `port`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
-Data type: `Any`
 
-Sets the port the host is configured on. The module's defaults ensure the host listens
-on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only
-listens on the port set in this parameter.
 
 Default value: ``undef``
 
-##### `priority`
+##### `wsgi_chunked_request`
 
 Data type: `Any`
 
-Sets the relative load-order for Apache HTTPD VirtualHost configuration files.<br />
-If nothing matches the priority, the first name-based virtual host is used. Likewise,
-passing a higher priority causes the alphabetically first name-based virtual host to be
-used if no other names match.<br />
-> **Note:** You should not need to use this parameter. However, if you do use it, be
-aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
-To omit the priority prefix in file names, pass a priority of `false`.
-
-Default value: ``undef``
-
-##### `protocols`
 
-Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
-Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols)
-directive, which lists available protocols for the virutal host.
+Default value: ``undef``
 
-Default value: `[]`
+##### `custom_fragment`
 
-##### `protocols_honor_order`
+Data type: `Optional[String]`
 
-Data type: `Optional[Boolean]`
 
-Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
-directive which determines wether the order of Protocols sets precedence during negotiation.
 
 Default value: ``undef``
 
-##### `proxy_dest`
+##### `itk`
+
+Data type: `Optional[Hash]`
 
-Data type: `Any`
 
-Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
 
 Default value: ``undef``
 
-##### `proxy_pass`
+##### `action`
 
 Data type: `Any`
 
-Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)
-configuration. Optionally, parameters can be added as an array.
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  proxy_pass => [
-    { 'path' => '/a', 'url' => 'http://backend-a/' },
-    { 'path' => '/b', 'url' => 'http://backend-b/' },
-    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
-    { 'path' => '/l', 'url' => 'http://backend-xy',
-      'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
-    { 'path' => '/d', 'url' => 'http://backend-a/d',
-      'params' => { 'retry' => '0', 'timeout' => '5' }, },
-    { 'path' => '/e', 'url' => 'http://backend-a/e',
-      'keywords' => ['nocanon', 'interpolate'] },
-    { 'path' => '/f', 'url' => 'http://backend-f/',
-      'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
-    { 'path' => '/g', 'url' => 'http://backend-g/',
-      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
-    { 'path' => '/h', 'url' => 'http://backend-h/h',
-      'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
-  ],
-}
-```
-* `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string.
-* `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
-* `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
-* `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
+
 
 Default value: ``undef``
 
-##### `proxy_dest_match`
+##### `fastcgi_server`
 
 Data type: `Any`
 
-This directive is equivalent to `proxy_dest`, but takes regular expressions, see
-[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
-for details.
+
 
 Default value: ``undef``
 
-##### `proxy_dest_reverse_match`
+##### `fastcgi_socket`
 
 Data type: `Any`
 
-Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
-[ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
-for details.
+
 
 Default value: ``undef``
 
-##### `proxy_pass_match`
+##### `fastcgi_dir`
 
 Data type: `Any`
 
-This directive is equivalent to `proxy_pass`, but takes regular expressions, see
-[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
-for details.
+
 
 Default value: ``undef``
 
-##### `redirect_dest`
+##### `fastcgi_idle_timeout`
 
 Data type: `Any`
 
-Specifies the address to redirect to.
+
 
 Default value: ``undef``
 
-##### `redirect_source`
+##### `additional_includes`
 
 Data type: `Any`
 
-Specifies the source URIs that redirect to the destination specified in `redirect_dest`.
-If more than one item for redirect is supplied, the source and destination must be the same
-length, and the items are order-dependent.
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  redirect_source => ['/images','/downloads'],
-  redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
-}
-```
 
-Default value: `'/'`
 
-##### `redirect_status`
+Default value: `[]`
+
+##### `use_optional_includes`
 
 Data type: `Any`
 
-Specifies the status to append to the redirect.
-``` puppet
-  apache::vhost { 'site.name.fdqn':
-  ...
-  redirect_status => ['temp','permanent'],
-}
-```
 
-Default value: ``undef``
 
-##### `redirectmatch_regexp`
+Default value: `$apache::use_optional_includes`
+
+##### `apache_version`
 
 Data type: `Any`
 
-Determines which server status should be raised for a given regular expression
-and where to forward the user to. Entered as an array alongside redirectmatch_status
-and redirectmatch_dest.
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  redirectmatch_status => ['404','404'],
-  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
-}
-```
 
-Default value: ``undef``
 
-##### `redirectmatch_status`
+Default value: `$apache::apache_version`
+
+##### `allow_encoded_slashes`
+
+Data type: `Optional[Enum['on', 'off', 'nodecode']]`
 
-Data type: `Any`
 
-Determines which server status should be raised for a given regular expression
-and where to forward the user to. Entered as an array alongside redirectmatch_regexp
-and redirectmatch_dest.
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  redirectmatch_status => ['404','404'],
-  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
-}
-```
 
 Default value: ``undef``
 
-##### `redirectmatch_dest`
+##### `suexec_user_group`
+
+Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 
-Data type: `Any`
 
-Determines which server status should be raised for a given regular expression
-and where to forward the user to. Entered as an array alongside redirectmatch_status
-and redirectmatch_regexp.
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  redirectmatch_status => ['404','404'],
-  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
-}
-```
 
 Default value: ``undef``
 
-##### `request_headers`
+##### `h2_copy_files`
+
+Data type: `Optional[Boolean]`
 
-Data type: `Any`
 
-Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader)
-in various ways, including adding additional request headers, removing request headers,
-and so on.
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  request_headers => [
-    'append MirrorID "mirror 12"',
-    'unset MirrorID',
-  ],
-}
-```
 
 Default value: ``undef``
 
-##### `rewrites`
+##### `h2_direct`
+
+Data type: `Optional[Boolean]`
 
-Data type: `Optional[Array]`
 
-Creates URL rewrite rules. Expects an array of hashes.<br />
-Valid Hash keys include `comment`, `rewrite_base`, `rewrite_cond`, `rewrite_rule`
-or `rewrite_map`.<br />
-For example, you can specify that anyone trying to access index.html is served welcome.html
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
-}
-```
-The parameter allows rewrite conditions that, when `true`, execute the associated rule.
-For instance, if you wanted to rewrite URLs only if the visitor is using IE
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  rewrites => [
-    {
-      comment      => 'redirect IE',
-      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-      rewrite_rule => ['^index\.html$ welcome.html'],
-    },
-  ],
-}
-```
-You can also apply multiple conditions. For instance, rewrite index.html to welcome.html
-only when the browser is Lynx or Mozilla (version 1 or 2)
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  rewrites => [
-    {
-      comment      => 'Lynx or Mozilla v1/2',
-      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-      rewrite_rule => ['^index\.html$ welcome.html'],
-    },
-  ],
-}
-```
-Multiple rewrites and conditions are also possible
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  rewrites => [
-    {
-      comment      => 'Lynx or Mozilla v1/2',
-      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-      rewrite_rule => ['^index\.html$ welcome.html'],
-    },
-    {
-      comment      => 'Internet Explorer',
-      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-      rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
-    },
-    {
-      rewrite_base => /apps/,
-      rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
-    },
-    { comment      => 'Rewrite to lower case',
-      rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
-      rewrite_map  => ['lc int:tolower'],
-      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
-    },
-  ],
-}
-```
-Refer to the [`mod_rewrite` documentation](https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html)
-for more details on what is possible with rewrite rules and conditions.<br />
-> **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite`
-and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather
-than setting the rewrites in the virtual host's directories.
 
 Default value: ``undef``
 
-##### `rewrite_base`
+##### `h2_early_hints`
+
+Data type: `Optional[Boolean]`
 
-Data type: `Any`
 
-The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase)
-specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
-that substitue a relative path.
 
 Default value: ``undef``
 
-##### `rewrite_rule`
+##### `h2_max_session_streams`
+
+Data type: `Optional[Integer]`
 
-Data type: `Any`
 
-The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
-allows the user to define the rules that will be used by the rewrite engine.
 
 Default value: ``undef``
 
-##### `rewrite_cond`
+##### `h2_modern_tls_only`
+
+Data type: `Optional[Boolean]`
 
-Data type: `Any`
 
-The parameter [`rewrite_cond`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritecond)
-defines a rule condition, that when satisfied will implement that rule within the
-rewrite engine.
 
 Default value: ``undef``
 
-##### `rewrite_inherit`
+##### `h2_push`
 
-Data type: `Any`
+Data type: `Optional[Boolean]`
 
-Determines whether the virtual host inherits global rewrite rules.<br />
-Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or
-inside the virtual host `.conf` file. By default, virtual hosts do not inherit
-global settings. To activate inheritance, specify the `rewrites` parameter and set
-`rewrite_inherit` parameter to `true`:
-``` puppet
-apache::vhost { 'site.name.fdqn':
-  ...
-  rewrites => [
-    <rules>,
-  ],
-  rewrite_inherit => `true`,
-}
-```
-> **Note**: The `rewrites` parameter is **required** for this to have effect<br />
-Apache activates global `Rewrite` rules inheritance if the virtual host files contains
-the following directives:
-``` ApacheConf
-RewriteEngine On
-RewriteOptions Inherit
-```
-Refer to the official [`mod_rewrite`](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)
-documentation, section "Rewriting in Virtual Hosts".
 
-Default value: ``false``
 
-##### `scriptalias`
+Default value: ``undef``
 
-Data type: `Any`
+##### `h2_push_diary_size`
 
-Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
-'/usr/scripts'.
+Data type: `Optional[Integer]`
 
-Default value: ``undef``
 
-##### `scriptaliases`
 
-Data type: `Any`
+Default value: ``undef``
 
-> **Note**: This parameter is deprecated in favor of the `aliases` parameter.<br />
-Passes an array of hashes to the virtual host to create either ScriptAlias or
-ScriptAliasMatch statements per the `mod_alias` documentation.
-``` puppet
-scriptaliases => [
-  {
-    alias => '/myscript',
-    path  => '/usr/share/myscript',
-  },
-  {
-    aliasmatch => '^/foo(.*)',
-    path       => '/usr/share/fooscripts$1',
-  },
-  {
-    aliasmatch => '^/bar/(.*)',
-    path       => '/usr/share/bar/wrapper.sh/$1',
-  },
-  {
-    alias => '/neatscript',
-    path  => '/usr/share/neatscript',
-  },
-]
-```
-The ScriptAlias and ScriptAliasMatch directives are created in the order specified.
-As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases
-before more general ones to avoid shadowing.
+##### `h2_push_priority`
 
-Default value: `[]`
+Data type: `Array[String]`
 
-##### `serveradmin`
 
-Data type: `Any`
 
-Specifies the email address Apache displays when it renders one of its error pages.
+Default value: `[]`
 
-Default value: ``undef``
+##### `h2_push_resource`
 
-##### `serveraliases`
+Data type: `Array[String]`
 
-Data type: `Any`
 
-Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias)
-of the site.
 
 Default value: `[]`
 
-##### `servername`
+##### `h2_serialize_headers`
 
-Data type: `Any`
+Data type: `Optional[Boolean]`
 
-Sets the servername corresponding to the hostname you connect to the virtual host at.
 
-Default value: `$name`
 
-##### `setenv`
+Default value: ``undef``
 
-Data type: `Any`
+##### `h2_stream_max_mem_size`
 
-Used by HTTPD to set environment variables for virtual hosts.<br />
-Example:
-``` puppet
-apache::vhost { 'setenv.example.com':
-  setenv => ['SPECIAL_PATH /foo/bin'],
-}
-```
+Data type: `Optional[Integer]`
 
-Default value: `[]`
 
-##### `setenvif`
 
-Data type: `Any`
+Default value: ``undef``
 
-Used by HTTPD to conditionally set environment variables for virtual hosts.
+##### `h2_tls_cool_down_secs`
 
-Default value: `[]`
+Data type: `Optional[Integer]`
 
-##### `setenvifnocase`
 
-Data type: `Any`
 
-Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
+Default value: ``undef``
 
-Default value: `[]`
+##### `h2_tls_warm_up_size`
 
-##### `suexec_user_group`
+Data type: `Optional[Integer]`
 
-Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 
-Allows the spcification of user and group execution privileges for CGI programs through
-inclusion of the `mod_suexec` module.
 
 Default value: ``undef``
 
-##### `suphp_addhandler`
+##### `h2_upgrade`
 
-Data type: `Any`
+Data type: `Optional[Boolean]`
 
-Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-working together with suphp_configpath and suphp_engine.<br />
-An example virtual host configuration with suPHP:
-``` puppet
-apache::vhost { 'suphp.example.com':
-  port             => '80',
-  docroot          => '/home/appuser/myphpapp',
-  suphp_addhandler => 'x-httpd-php',
-  suphp_engine     => 'on',
-  suphp_configpath => '/etc/php5/apache2',
-  directories      => { path => '/home/appuser/myphpapp',
-    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-  }
-}
-```
 
-Default value: `$::apache::params::suphp_addhandler`
 
-##### `suphp_configpath`
+Default value: ``undef``
 
-Data type: `Any`
+##### `h2_window_size`
 
-Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-working together with suphp_addhandler and suphp_engine.<br />
-An example virtual host configuration with suPHP:
-``` puppet
-apache::vhost { 'suphp.example.com':
-  port             => '80',
-  docroot          => '/home/appuser/myphpapp',
-  suphp_addhandler => 'x-httpd-php',
-  suphp_engine     => 'on',
-  suphp_configpath => '/etc/php5/apache2',
-  directories      => { path => '/home/appuser/myphpapp',
-    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-  }
-}
-```
+Data type: `Optional[Integer]`
 
-Default value: `$::apache::params::suphp_configpath`
 
-##### `suphp_engine`
 
-Data type: `Enum['on', 'off']`
+Default value: ``undef``
 
-Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-working together with suphp_configpath and suphp_addhandler.<br />
-An example virtual host configuration with suPHP:
-``` puppet
-apache::vhost { 'suphp.example.com':
-  port             => '80',
-  docroot          => '/home/appuser/myphpapp',
-  suphp_addhandler => 'x-httpd-php',
-  suphp_engine     => 'on',
-  suphp_configpath => '/etc/php5/apache2',
-  directories      => { path => '/home/appuser/myphpapp',
-    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-  }
-}
-```
+##### `passenger_enabled`
 
-Default value: `$::apache::params::suphp_engine`
+Data type: `Optional[Boolean]`
 
-##### `vhost_name`
 
-Data type: `Any`
 
-Enables name-based virtual hosting. If no IP is passed to the virtual host, but the
-virtual host is assigned a port, then the virtual host name is `vhost_name:port`.
-If the virtual host has no assigned IP or port, the virtual host name is set to the
-title of the resource.
+Default value: ``undef``
 
-Default value: `'*'`
+##### `passenger_base_uri`
 
-##### `virtual_docroot`
+Data type: `Optional[String]`
 
-Data type: `Any`
 
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the
-same name. For example, `http://example.com` would map to `/var/www/example.com`.
-``` puppet
-apache::vhost { 'subdomain.loc':
-  vhost_name      => '*',
-  port            => '80',
-  virtual_docroot => '/var/www/%-2+',
-  docroot         => '/var/www',
-  serveraliases   => ['*.loc',],
-}
-```
 
-Default value: ``false``
+Default value: ``undef``
 
-##### `wsgi_daemon_process`
+##### `passenger_ruby`
+
+Data type: `Optional[Stdlib::Absolutepath]`
 
-Data type: `Optional[Variant[String,Hash]]`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process_options, wsgi_process_group,
-wsgi_script_aliases and wsgi_pass_authorization.<br />
-A hash that sets the name of the WSGI daemon, accepting
-[certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html).<br />
-An example virtual host configuration with WSGI:
-``` puppet
-apache::vhost { 'wsgi.example.com':
-  port                        => '80',
-  docroot                     => '/var/www/pythonapp',
-  wsgi_daemon_process         => 'wsgi',
-  wsgi_daemon_process_options =>
-    { processes    => '2',
-      threads      => '15',
-      display-name => '%{GROUP}',
-    },
-  wsgi_process_group          => 'wsgi',
-  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-  wsgi_chunked_request        => 'On',
-}
-```
 
 Default value: ``undef``
 
-##### `wsgi_daemon_process_options`
+##### `passenger_python`
+
+Data type: `Optional[Stdlib::Absolutepath]`
 
-Data type: `Optional[Hash]`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_process_group,
-wsgi_script_aliases and wsgi_pass_authorization.<br />
-Sets the group ID that the virtual host runs under.
 
 Default value: ``undef``
 
-##### `wsgi_application_group`
+##### `passenger_nodejs`
+
+Data type: `Optional[Stdlib::Absolutepath]`
 
-Data type: `Any`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
-and wsgi_pass_authorization.<br />
-This parameter defines the [`WSGIApplicationGroup directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIApplicationGroup.html),
-thus allowing you to specify which application group the WSGI application belongs to,
-with all WSGI applications within the same group executing within the context of the
-same Python sub interpreter.
 
 Default value: ``undef``
 
-##### `wsgi_import_script`
+##### `passenger_meteor_app_settings`
+
+Data type: `Optional[String]`
 
-Data type: `Any`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
-and wsgi_pass_authorization.<br />
-This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
-which can be used in order to specify a script file to be loaded upon a process starting.
 
 Default value: ``undef``
 
-##### `wsgi_import_script_options`
+##### `passenger_app_env`
+
+Data type: `Optional[String]`
 
-Data type: `Optional[Hash]`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
-and wsgi_pass_authorization.<br />
-This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
-which can be used in order to specify a script file to be loaded upon a process starting.<br />
-Specifies the process and aplication groups of the script.
 
 Default value: ``undef``
 
-##### `wsgi_chunked_request`
+##### `passenger_app_root`
+
+Data type: `Optional[Stdlib::Absolutepath]`
 
-Data type: `Any`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
-and wsgi_pass_authorization.<br />
-This parameter defines the [`WSGIChunkedRequest directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIChunkedRequest.html),
-allowing you to enable support for chunked request content.<br />
-WSGI is technically incapable of supporting chunked request content without all chunked
-request content having first been read in and buffered.
 
 Default value: ``undef``
 
-##### `wsgi_process_group`
+##### `passenger_app_group_name`
+
+Data type: `Optional[String]`
 
-Data type: `Any`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_daemon_process_options,
-wsgi_script_aliases and wsgi_pass_authorization.<br />
-Requires a hash of web paths to filesystem `.wsgi paths/`.
 
 Default value: ``undef``
 
-##### `wsgi_script_aliases`
+##### `passenger_app_start_command`
+
+Data type: `Optional[String]`
 
-Data type: `Optional[Hash]`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
-and wsgi_pass_authorization.<br />
-Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
-For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
 Default value: ``undef``
 
-##### `wsgi_script_aliases_match`
+##### `passenger_app_type`
+
+Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
-Data type: `Optional[Hash]`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
-and wsgi_pass_authorization.<br />
-Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
-This directive is similar to `wsgi_script_aliases`, but makes use of regular expressions
-in place of simple prefix matching.<br />
-For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
 Default value: ``undef``
 
-##### `wsgi_pass_authorization`
+##### `passenger_startup_file`
+
+Data type: `Optional[String]`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
-Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
-wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
-wsgi_script_aliases.<br />
-Enables support for chunked requests.
 
 Default value: ``undef``
 
-##### `directories`
+##### `passenger_restart_dir`
+
+Data type: `Optional[String]`
 
-Data type: `Optional[Variant[Hash, Array[Variant[Array,Hash]]]]`
 
-The `directories` parameter within the `apache::vhost` class passes an array of hashes
-to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory),
-[File](https://httpd.apache.org/docs/current/mod/core.html#files), and
-[Location](https://httpd.apache.org/docs/current/mod/core.html#location) directive blocks.
-These blocks take the form, `< Directory /path/to/directory>...< /Directory>`.<br />
-The `path` key sets the path for the directory, files, and location blocks. Its value
-must be a path for the `directory`, `files`, and `location` providers, or a regex for
-the `directorymatch`, `filesmatch`, or `locationmatch` providers. Each hash passed to
-`directories` **must** contain `path` as one of the keys.<br />
-The `provider` key is optional. If missing, this key defaults to `directory`.
- Values: `directory`, `files`, `proxy`, `location`, `directorymatch`, `filesmatch`,
-`proxymatch` or `locationmatch`. If you set `provider` to `directorymatch`, it
-uses the keyword `DirectoryMatch` in the Apache config file.<br />
-An example use of `directories`:
-``` puppet
-apache::vhost { 'files.example.net':
-  docroot     => '/var/www/files',
-  directories => [
-    { 'path'     => '/var/www/files',
-      'provider' => 'files',
-      'deny'     => 'from all',
-    },
-  ],
-}
-```
-> **Note:** At least one directory should match the `docroot` parameter. After you
-start declaring directories, `apache::vhost` assumes that all required Directory blocks
-will be declared. If not defined, a single default Directory block is created that matches
-the `docroot` parameter.<br />
-Available handlers, represented as keys, should be placed within the `directory`,
-`files`, or `location` hashes. This looks like
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [ { path => '/path/to/directory', handler => value } ],
-}
-```
-Any handlers you do not set in these hashes are considered `undefined` within Puppet and
-are not added to the virtual host, resulting in the module using their default values.
 
 Default value: ``undef``
 
-##### `custom_fragment`
+##### `passenger_spawn_method`
+
+Data type: `Optional[Enum['direct', 'smart']]`
+
 
-Pass a string of custom configuration directives to be placed at the end of the directory
-configuration.
-``` puppet
-apache::vhost { 'monitor':
-  ...
-  directories => [
-    {
-      path => '/path/to/directory',
-      custom_fragment => '
-<Location /balancer-manager>
-  SetHandler balancer-manager
-  Order allow,deny
-  Allow from all
-</Location>
-<Location /server-status>
-  SetHandler server-status
-  Order allow,deny
-  Allow from all
-</Location>
-ProxyStatus On',
-    },
-  ]
-}
-```
 
 Default value: ``undef``
 
-##### `error_documents`
+##### `passenger_load_shell_envvars`
 
-An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)
-settings for the directory.
-``` puppet
-apache::vhost { 'sample.example.net':
-  directories => [
-    { path            => '/srv/www',
-      error_documents => [
-        { 'error_code' => '503',
-          'document'   => '/service-unavail',
-        },
-      ],
-    },
-  ],
-}
-```
+Data type: `Optional[Boolean]`
 
-Default value: `[]`
 
-##### `h2_copy_files`
 
-Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.<br />
-Note that you must declare `class {'apache::mod::http2': }` before using this directive.
+Default value: ``undef``
+
+##### `passenger_rolling_restarts`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_resist_deployment_errors`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_user`
+
+Data type: `Optional[String]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_group`
+
+Data type: `Optional[String]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_friendly_error_pages`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_min_instances`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_max_instances`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_max_preloader_idle_time`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_force_max_concurrent_requests_per_process`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_start_timeout`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_concurrency_model`
+
+Data type: `Optional[Enum['process', 'thread']]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_thread_count`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_max_requests`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_max_request_time`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_memory_limit`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_stat_throttle_rate`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_pre_start`
+
+Data type: `Optional[Variant[String,Array[String]]]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_high_performance`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_buffer_upload`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_buffer_response`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_error_override`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_max_request_queue_size`
+
+Data type: `Optional[Integer]`
+
+
+
+Default value: ``undef``
+
+##### `passenger_max_request_queue_time`
+
+Data type: `Optional[Integer]`
+
+
 
 Default value: ``undef``
 
-##### `h2_push_resource`
-
-Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.<br />
-Note that you must declare `class {'apache::mod::http2': }` before using this directive.
+##### `passenger_sticky_sessions`
 
-Default value: `[]`
+Data type: `Optional[Boolean]`
 
-##### `headers`
 
-Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => {
-    path    => '/path/to/directory',
-    headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-  },
-}
-```
 
 Default value: ``undef``
 
-##### `options`
+##### `passenger_sticky_sessions_cookie_name`
 
-Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the
-given Directory block.
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path    => '/path/to/directory',
-      options => ['Indexes','FollowSymLinks','MultiViews'],
-    },
-  ],
-}
-```
+Data type: `Optional[String]`
 
-Default value: `['Indexes','FollowSymLinks','MultiViews']`
 
-##### `shib_compat_valid_user`
+
+Default value: ``undef``
+
+##### `passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
-Default is Off, matching the behavior prior to this command's existence. Addresses a conflict
-when using Shibboleth in conjunction with other auth/auth modules by restoring `standard`
-Apache behavior when processing the `valid-user` and `user` Require rules. See the
-[`mod_shib`documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions),
-and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess)
-topic for more details. This key is disabled if `apache::mod::shib` is not defined.
+
 
 Default value: ``undef``
 
-##### `ssl_options`
+##### `passenger_allow_encoded_slashes`
+
+Data type: `Optional[Boolean]`
 
-Data type: `Any`
 
-String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions),
-which configure SSL engine run-time options. This handler takes precedence over SSLOptions
-set in the parent block of the virtual host.
-``` puppet
-apache::vhost { 'secure.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path        => '/path/to/directory',
-      ssl_options => '+ExportCertData',
-    },
-    { path        => '/path/to/different/dir',
-      ssl_options => ['-StdEnvVars', '+ExportCertData'],
-    },
-  ],
-}
-```
 
 Default value: ``undef``
 
-##### `additional_includes`
+##### `passenger_app_log_file`
 
-Specifies paths to additional static, specific Apache configuration files in virtual
-host directories.
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => [
-    { path  => '/path/to/different/dir',
-      additional_includes => ['/custom/path/includes', '/custom/path/another_includes',],
-    },
-  ],
-}
-```
+Data type: `Optional[String]`
 
-Default value: `[]`
 
-##### `ssl`
 
-Data type: `Boolean`
+Default value: ``undef``
 
-Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
+##### `passenger_debugger`
 
-Default value: ``false``
+Data type: `Optional[Boolean]`
 
-##### `ssl_ca`
 
-Data type: `Any`
 
-Specifies the SSL certificate authority to be used to verify client certificates used
-for authentication. You must also set `ssl_verify_client` to use this.
+Default value: ``undef``
 
-Default value: `$::apache::default_ssl_ca`
+##### `passenger_lve_min_uid`
 
-##### `ssl_cert`
+Data type: `Optional[Integer]`
 
-Data type: `Any`
 
-Specifies the SSL certification.
 
-Default value: `$::apache::default_ssl_cert`
+Default value: ``undef``
 
-##### `ssl_protocol`
+##### `add_default_charset`
 
 Data type: `Any`
 
-Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol).
-Expects an array or space separated string of accepted protocols.
+
 
 Default value: ``undef``
 
-##### `ssl_cipher`
+##### `modsec_disable_vhost`
 
 Data type: `Any`
 
-Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
+
 
 Default value: ``undef``
 
-##### `ssl_honorcipherorder`
+##### `modsec_disable_ids`
+
+Data type: `Optional[Variant[Hash, Array]]`
 
-Data type: `Any`
 
-Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder),
-to cause Apache to use the server's preferred order of ciphers rather than the client's
-preferred order.
 
 Default value: ``undef``
 
-##### `ssl_certs_dir`
+##### `modsec_disable_ips`
 
 Data type: `Any`
 
-Specifies the location of the SSL certification directory to verify client certs. Will not
-be used unless `ssl_verify_client` is also set (see below).
 
-Default value: `$::apache::params::ssl_certs_dir`
 
-##### `ssl_chain`
+Default value: ``undef``
 
-Data type: `Any`
+##### `modsec_disable_msgs`
+
+Data type: `Optional[Variant[Hash, Array]]`
 
-Specifies the SSL chain. This default works out of the box, but it must be updated in
-the base `apache` class with your specific certificate information before being used in
-production.
 
-Default value: `$::apache::default_ssl_chain`
 
-##### `ssl_crl`
+Default value: ``undef``
 
-Data type: `Any`
+##### `modsec_disable_tags`
+
+Data type: `Optional[Variant[Hash, Array]]`
 
-Specifies the certificate revocation list to use. (This default works out of the box but
-must be updated in the base `apache` class with your specific certificate information
-before being used in production.)
 
-Default value: `$::apache::default_ssl_crl`
 
-##### `ssl_crl_path`
+Default value: ``undef``
+
+##### `modsec_body_limit`
 
 Data type: `Any`
 
-Specifies the location of the certificate revocation list to verify certificates for
-client authentication with. (This default works out of the box but must be updated in
-the base `apache` class with your specific certificate information before being used in
-production.)
 
-Default value: `$::apache::default_ssl_crl_path`
 
-##### `ssl_crl_check`
+Default value: ``undef``
+
+##### `jk_mounts`
 
 Data type: `Any`
 
-Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck)
-for ssl client authentication. The default works out of the box but must be specified when
-using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on
-older versions.
 
-Default value: `$::apache::default_ssl_crl_check`
 
-##### `ssl_key`
+Default value: ``undef``
 
-Data type: `Any`
+##### `auth_kerb`
+
+Data type: `Boolean`
 
-Specifies the SSL key.<br />
-Defaults are based on your operating system. Default work out of the box but must be
-updated in the base `apache` class with your specific certificate information before
-being used in production.
 
-Default value: `$::apache::default_ssl_key`
 
-##### `ssl_verify_client`
+Default value: ``false``
+
+##### `krb_method_negotiate`
 
 Data type: `Any`
 
-Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient)
-directive, which sets the certificate verification level for client authentication.
-``` puppet
-apache::vhost { 'sample.example.net':
-  ...
-  ssl_verify_client => 'optional',
-}
-```
 
-Default value: ``undef``
 
-##### `ssl_verify_depth`
+Default value: `'on'`
+
+##### `krb_method_k5passwd`
 
 Data type: `Any`
 
-Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth)
-directive, which specifies the maximum depth of CA certificates in client certificate
-verification. You must set `ssl_verify_client` for it to take effect.
-``` puppet
-apache::vhost { 'sample.example.net':
-  ...
-  ssl_verify_client => 'require',
-  ssl_verify_depth => 1,
-}
-```
 
-Default value: ``undef``
 
-##### `ssl_proxy_protocol`
+Default value: `'on'`
+
+##### `krb_authoritative`
 
 Data type: `Any`
 
-Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol)
-directive, which controls which SSL protocol flavors `mod_ssl` should use when establishing
-its server environment for proxy. It connects to servers using only one of the provided
-protocols.
 
-Default value: ``undef``
 
-##### `ssl_proxy_verify`
+Default value: `'on'`
 
-Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
+##### `krb_auth_realms`
 
-Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify)
-directive, which configures certificate verification of the remote server when a proxy is
-configured to forward requests to a remote SSL server.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `ssl_proxy_verify_depth`
 
-Data type: `Optional[Integer[0]]`
+Default value: `[]`
+
+##### `krb_5keytab`
+
+Data type: `Any`
+
 
-Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth)
-directive, which configures how deeply mod_ssl should verify before deciding that the
-remote server does not have a valid certificate.<br />
-A depth of 0 means that only self-signed remote server certificates are accepted,
-the default depth of 1 means the remote server certificate can be self-signed or
-signed by a CA that is directly known to the server.
 
 Default value: ``undef``
 
-##### `ssl_proxy_cipher_suite`
+##### `krb_local_user_mapping`
 
 Data type: `Any`
 
-Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)
-directive, which controls cipher suites supported for ssl proxy traffic.
+
 
 Default value: ``undef``
 
-##### `ssl_proxy_ca_cert`
+##### `krb_verify_kdc`
 
 Data type: `Any`
 
-Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile)
-directive, which specifies an all-in-one file where you can assemble the Certificates
-of Certification Authorities (CA) whose remote servers you deal with. These are used
-for Remote Server Authentication. This file should be a concatenation of the PEM-encoded
-certificate files in order of preference.
 
-Default value: ``undef``
 
-##### `ssl_proxy_machine_cert`
+Default value: `'on'`
+
+##### `krb_servicename`
 
 Data type: `Any`
 
-Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile)
-directive, which specifies an all-in-one file where you keep the certs and keys used
-for this server to authenticate itself to remote servers. This file should be a
-concatenation of the PEM-encoded certificate files in order of preference.
-``` puppet
-apache::vhost { 'sample.example.net':
-  ...
-  ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
-}
-```
 
-Default value: ``undef``
 
-##### `ssl_proxy_machine_cert_chain`
+Default value: `'HTTP'`
+
+##### `krb_save_credentials`
 
 Data type: `Any`
 
-Sets the [SSLProxyMachineCertificateChainFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatechainfile)
-directive, which specifies an all-in-one file where you keep the certificate chain for
-all of the client certs in use. This directive will be needed if the remote server
-presents a list of CA certificates that are not direct signers of one of the configured
-client certificates. This referenced file is simply the concatenation of the various
-PEM-encoded certificate files. Upon startup, each client certificate configured will be
-examined and a chain of trust will be constructed.
 
-Default value: `undef`
 
-##### `ssl_proxy_check_peer_cn`
+Default value: `'off'`
+
+##### `keepalive`
 
 Data type: `Optional[Enum['on', 'off']]`
 
-Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn)
-directive, which specifies whether the remote server certificate's CN field is compared
-against the hostname of the request URL.
+
 
 Default value: ``undef``
 
-##### `ssl_proxy_check_peer_name`
+##### `keepalive_timeout`
+
+Data type: `Any`
 
-Data type: `Optional[Enum['on', 'off']]`
 
-Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername)
-directive, which specifies whether the remote server certificate's CN field is compared
-against the hostname of the request URL.
 
 Default value: ``undef``
 
-##### `ssl_proxy_check_peer_expire`
+##### `max_keepalive_requests`
+
+Data type: `Any`
 
-Data type: `Optional[Enum['on', 'off']]`
 
-Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire)
-directive, which specifies whether the remote server certificate is checked for expiration
-or not.
 
 Default value: ``undef``
 
-##### `ssl_options`
+##### `cas_attribute_prefix`
+
+Data type: `Any`
+
 
-Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)
-directive, which configures various SSL engine run-time options. This is the global
-setting for the given virtual host and can be a string or an array.<br />
-A string:
-``` puppet
-apache::vhost { 'sample.example.net':
-  ...
-  ssl_options => '+ExportCertData',
-}
-```
-An array:
-``` puppet
-apache::vhost { 'sample.example.net':
-  ...
-  ssl_options => ['+StrictRequire', '+ExportCertData'],
-}
-```
 
 Default value: ``undef``
 
-##### `ssl_openssl_conf_cmd`
+##### `cas_attribute_delimiter`
 
 Data type: `Any`
 
-Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)
-directive, which provides direct configuration of OpenSSL parameters.
+
 
 Default value: ``undef``
 
-##### `ssl_proxyengine`
+##### `cas_root_proxied_as`
 
-Data type: `Boolean`
+Data type: `Any`
 
-Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
 
-Default value: ``false``
 
-##### `ssl_stapling`
+Default value: ``undef``
+
+##### `cas_scrub_request_headers`
+
+Data type: `Any`
 
-Data type: `Optional[Boolean]`
 
-Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling).
-By default, uses what is set globally.<br />
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
 Default value: ``undef``
 
-##### `ssl_stapling_timeout`
+##### `cas_sso_enabled`
 
 Data type: `Any`
 
-Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
+
 
 Default value: ``undef``
 
-##### `ssl_stapling_return_errors`
+##### `cas_login_url`
 
 Data type: `Any`
 
-Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
-This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: ``undef``
 
-##### `use_canonical_name`
+Default value: ``undef``
 
-Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
+##### `cas_validate_url`
 
-Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
-which allows you to configure how the server determines it's own name and port.
+Data type: `Any`
 
-Default value: ``undef``
 
-##### `define`
 
-Data type: `Hash`
+Default value: ``undef``
 
-this lets you define configuration variables inside a vhost using [`Define`](https://httpd.apache.org/docs/2.4/mod/core.html#define),
-these can then be used to replace configuration values. All Defines are Undefined at the end of the VirtualHost.
+##### `cas_validate_saml`
 
-Default value: `{}`
+Data type: `Any`
 
-##### `auth_oidc`
 
-Data type: `Boolean`
 
-Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
+Default value: ``undef``
 
-Default value: ``false``
+##### `cas_cookie_path`
 
-##### `oidc_settings`
+Data type: `Any`
 
-Data type: `Optional[Apache::OIDCSettings]`
 
-An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf].
 
 Default value: ``undef``
 
-##### `limitreqfields`
+##### `shib_compat_valid_user`
+
+Data type: `Optional[String]`
 
-Data type: `Optional[Integer]`
 
-The `limitreqfields` parameter sets the maximum number of request header fields in
-an HTTP request. This directive gives the server administrator greater control over
-abnormal client request behavior, which may be useful for avoiding some forms of
-denial-of-service attacks. The value should be increased if normal clients see an error
-response from the server that indicates too many fields were sent in the request.
 
 Default value: ``undef``
 
-##### `limitreqfieldsize`
+##### `use_canonical_name`
+
+Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
 
-Data type: `Optional[Integer]`
 
-The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
-be allowed within a request header.
 
 Default value: ``undef``
 
-##### `limitreqline`
+##### `comment`
+
+Data type: `Optional[Variant[String,Array[String]]]`
 
-Data type: `Optional[Integer]`
 
-Limit the size of the HTTP request line that will be accepted from the client
-This directive sets the number of bytes that will be allowed on the HTTP
-request-line. The LimitRequestLine directive allows the server administrator
-to set the limit on the allowed size of a client's HTTP request-line. Since
-the request-line consists of the HTTP method, URI, and protocol version, the
-LimitRequestLine directive places a restriction on the length of a request-URI
-allowed for a request on the server. A server needs this value to be large
-enough to hold any of its resource names, including any information that might
-be passed in the query part of a GET request.
 
 Default value: ``undef``
 
-##### `limitreqbody`
+##### `define`
 
-Data type: `Optional[Integer]`
+Data type: `Hash`
 
-Restricts the total size of the HTTP request body sent from the client
-The LimitRequestBody directive allows the user to set a limit on the allowed
-size of an HTTP request message body within the context in which the
-directive is given (server, per-directory, per-file or per-location). If the
-client request exceeds that limit, the server will return an error response
-instead of servicing the request.
 
-Default value: ``undef``
 
-##### `proxy_requests`
+Default value: `{}`
+
+##### `auth_oidc`
 
 Data type: `Boolean`
 
@@ -9443,6 +8433,14 @@ Data type: `Boolean`
 
 Default value: ``false``
 
+##### `oidc_settings`
+
+Data type: `Optional[Apache::OIDCSettings]`
+
+
+
+Default value: ``undef``
+
 ### `apache::vhost::custom`
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
@@ -9773,7 +8771,7 @@ Alias of `Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]`
 https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 
 Alias of `Struct[{
-    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl,Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
     Optional['CryptoPassphrase']                        => String,
     Optional['MetadataDir']                             => String,
     Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,
diff --git a/metadata.json b/metadata.json
index dba16ee8e9..be7211acca 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From be6f385b74e322f36ad82cbe68c3e5bef21b83e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 16 Nov 2020 09:12:40 -1000
Subject: [PATCH 1720/2267] (maint) Add support for mod_watchdog

This apache module defines programmatic hooks for other apache modules
to periodically run tasks.  It is a dependency for some apache modules
not yet supported by the puppet module:

  * mod_heartbeat
  * mod_heartmonitor
  * mod_md
  * mod_proxy_hcheck
---
 manifests/mod/watchdog.pp         | 31 +++++++++++++++++++++++++++++
 spec/classes/mod/watchdog_spec.rb | 33 +++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 manifests/mod/watchdog.pp
 create mode 100644 spec/classes/mod/watchdog_spec.rb

diff --git a/manifests/mod/watchdog.pp b/manifests/mod/watchdog.pp
new file mode 100644
index 0000000000..ff17a1cdd6
--- /dev/null
+++ b/manifests/mod/watchdog.pp
@@ -0,0 +1,31 @@
+# @summary
+#   Installs and configures `mod_watchdog`.
+#
+# @param watchdog_interval
+#   Sets the interval at which the watchdog_step hook runs.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_watchdog.html for additional documentation.
+class apache::mod::watchdog (
+  Optional[Integer] $watchdog_interval = undef,
+) {
+  include apache
+
+  $module_builtin = $facts['os']['family'] in ['Debian']
+
+  unless $module_builtin {
+    apache::mod { 'watchdog':
+    }
+  }
+
+  if $watchdog_interval {
+    file { 'watchdog.conf':
+      ensure  => file,
+      path    => "${apache::mod_dir}/watchdog.conf",
+      mode    => $apache::file_mode,
+      content => "WatchdogInterval ${watchdog_interval}\n",
+      require => Exec["mkdir ${apache::mod_dir}"],
+      before  => File[$apache::mod_dir],
+      notify  => Class['apache::service'],
+    }
+  }
+}
diff --git a/spec/classes/mod/watchdog_spec.rb b/spec/classes/mod/watchdog_spec.rb
new file mode 100644
index 0000000000..42e0c7d206
--- /dev/null
+++ b/spec/classes/mod/watchdog_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'apache::mod::watchdog', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+
+  on_supported_os.each do |os, os_facts|
+    context "On #{os}" do
+      let :facts do
+        os_facts
+      end
+
+      if os_facts[:os]['family'] == 'Debian'
+        it { is_expected.not_to contain_apache__mod('watchdog') }
+      else
+        it { is_expected.to contain_apache__mod('watchdog') }
+      end
+
+      context 'with default configuration' do
+        it { is_expected.not_to contain_file('watchdog.conf') }
+      end
+
+      context 'with custom configuration' do
+        let(:params) do
+          {
+            watchdog_interval: 5,
+          }
+        end
+
+        it { is_expected.to contain_file('watchdog.conf').with_content(%r{^WatchdogInterval 5$}) }
+      end
+    end
+  end
+end

From 73fe071b96357c9d137027bf7da04f5455d2e6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 16 Nov 2020 11:36:01 -1000
Subject: [PATCH 1721/2267] (maint) Add support for mod_md

Allow configuring all parameters provided by the module.
---
 manifests/mod/md.pp         | 137 +++++++++++++++++++++++++
 spec/classes/mod/md_spec.rb | 199 ++++++++++++++++++++++++++++++++++++
 templates/mod/md.conf.epp   |  84 +++++++++++++++
 3 files changed, 420 insertions(+)
 create mode 100644 manifests/mod/md.pp
 create mode 100644 spec/classes/mod/md_spec.rb
 create mode 100644 templates/mod/md.conf.epp

diff --git a/manifests/mod/md.pp b/manifests/mod/md.pp
new file mode 100644
index 0000000000..77b7b55f03
--- /dev/null
+++ b/manifests/mod/md.pp
@@ -0,0 +1,137 @@
+# @summary
+#   Installs and configures `mod_md`.
+#
+# @param md_activation_delay
+#   -
+#
+# @param md_base_server
+#   Control if base server may be managed or only virtual hosts.
+#
+# @param md_ca_challenges
+#   Type of ACME challenge used to prove domain ownership.
+#
+# @param md_certificate_agreement
+#   You confirm that you accepted the Terms of Service of the Certificate
+#   Authority.
+#
+# @param md_certificate_authority
+#   The URL of the ACME Certificate Authority service.
+#
+# @param md_certificate_check
+#   -
+#
+# @param md_certificate_monitor
+#   The URL of a certificate log monitor.
+#
+# @param md_certificate_protocol
+#   The protocol to use with the Certificate Authority.
+#
+# @param md_certificate_status
+#   Exposes public certificate information in JSON.
+#
+# @param md_challenge_dns01
+#   Define a program to be called when the `dns-01` challenge needs to be
+#   setup/torn down. 
+#
+# @param md_contact_email
+#   The ACME protocol requires you to give a contact url when you sign up.
+#
+# @param md_http_proxy
+#   Define a proxy for outgoing connections.
+#
+# @param md_members
+#   Control if the alias domain names are automatically added.
+#
+# @param md_message_cmd
+#   Handle events for Manage Domains.
+#
+# @param md_must_staple
+#   Control if new certificates carry the OCSP Must Staple flag.
+#
+# @param md_notify_cmd
+#   Run a program when a Managed Domain is ready.
+#
+# @param md_port_map
+#   Map external to internal ports for domain ownership verification.
+#
+# @param md_private_keys
+#   Set type and size of the private keys generated.
+#
+# @param md_renew_mode
+#   Controls if certificates shall be renewed.
+#
+# @param md_renew_window
+#   Control when a certificate will be renewed.
+#
+# @param md_require_https
+#   Redirects http: traffic to https: for Managed Domains.
+#
+# @param md_server_status
+#   Control if Managed Domain information is added to server-status.
+#
+# @param md_staple_others
+#   Enable stapling for certificates not managed by mod_md.
+#
+# @param md_stapling
+#   Enable stapling for all or a particular MDomain.
+#
+# @param md_stapling_keep_response
+#   Controls when old responses should be removed.
+#
+# @param md_stapling_renew_window
+#   Control when the stapling responses will be renewed.
+#
+# @param md_store_dir
+#   Path on the local file system to store the Managed Domains data.
+#
+# @param md_warn_window
+#  Define the time window when you want to be warned about an expiring
+#  certificate.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_md.html for additional documentation.
+class apache::mod::md (
+  Optional[String]                                          $md_activation_delay       = undef,
+  Optional[Enum['on', 'off']]                               $md_base_server            = undef,
+  Optional[Array[Enum['dns-01', 'http-01', 'tls-alpn-01']]] $md_ca_challenges          = undef,
+  Optional[Enum['accepted']]                                $md_certificate_agreement  = undef,
+  Optional[Stdlib::HTTPUrl]                                 $md_certificate_authority  = undef,
+  Optional[String]                                          $md_certificate_check      = undef, # undocumented
+  Optional[String]                                          $md_certificate_monitor    = undef,
+  Optional[Enum['ACME']]                                    $md_certificate_protocol   = undef,
+  Optional[Enum['on', 'off']]                               $md_certificate_status     = undef,
+  Optional[Stdlib::Absolutepath]                            $md_challenge_dns01        = undef,
+  Optional[String]                                          $md_contact_email          = undef,
+  Optional[Stdlib::HTTPUrl]                                 $md_http_proxy             = undef,
+  Optional[Enum['auto', 'manual']]                          $md_members                = undef,
+  Optional[Stdlib::Absolutepath]                            $md_message_cmd            = undef,
+  Optional[Enum['on', 'off']]                               $md_must_staple            = undef,
+  Optional[Stdlib::Absolutepath]                            $md_notify_cmd             = undef,
+  Optional[String]                                          $md_port_map               = undef,
+  Optional[String]                                          $md_private_keys           = undef,
+  Optional[Enum['always', 'auto', 'manual']]                $md_renew_mode             = undef,
+  Optional[String]                                          $md_renew_window           = undef,
+  Optional[Enum['off', 'permanent', 'temporary']]           $md_require_https          = undef,
+  Optional[Enum['on', 'off']]                               $md_server_status          = undef,
+  Optional[Enum['on', 'off']]                               $md_staple_others          = undef,
+  Optional[Enum['on', 'off']]                               $md_stapling               = undef,
+  Optional[String]                                          $md_stapling_keep_response = undef,
+  Optional[String]                                          $md_stapling_renew_window  = undef,
+  Optional[Stdlib::Absolutepath]                            $md_store_dir              = undef,
+  Optional[String]                                          $md_warn_window            = undef,
+) {
+  include apache
+  include apache::mod::watchdog
+
+  apache::mod { 'md':
+  }
+
+  file { 'md.conf':
+    ensure  => file,
+    path    => "${apache::mod_dir}/md.conf",
+    mode    => $apache::file_mode,
+    content => epp('apache/mod/md.conf.epp'),
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
+}
diff --git a/spec/classes/mod/md_spec.rb b/spec/classes/mod/md_spec.rb
new file mode 100644
index 0000000000..11fe1599aa
--- /dev/null
+++ b/spec/classes/mod/md_spec.rb
@@ -0,0 +1,199 @@
+require 'spec_helper'
+
+describe 'apache::mod::md', type: :class do
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let :facts do
+        facts
+      end
+
+      if facts[:os]['family'] == 'Debian'
+        context 'validating all md params - using Debian' do
+          md_options = {
+            'md_activation_delay' => { type: 'Duration', pass_opt: 'MDActivationDelay' },
+            'md_base_server' => { type: 'OnOff', pass_opt: 'MDBaseServer' },
+            'md_ca_challenges' => { type: 'CAChallenges', pass_opt: 'MDCAChallenges' },
+            'md_certificate_agreement' => { type: 'MDCertificateAgreement', pass_opt: 'MDCertificateAgreement' },
+            'md_certificate_authority' => { type: 'URL', pass_opt: 'MDCertificateAuthority' },
+            'md_certificate_check' => { type: 'String', pass_opt: 'MDCertificateCheck' },
+            'md_certificate_monitor' => { type: 'URL', pass_opt: 'MDCertificateMonitor' },
+            'md_certificate_protocol' => { type: 'MDCertificateProtocol', pass_opt: 'MDCertificateProtocol' },
+            'md_certificate_status' => { type: 'OnOff', pass_opt: 'MDCertificateStatus' },
+            'md_challenge_dns01' => { type: 'Path', pass_opt: 'MDChallengeDns01' },
+            'md_contact_email' => { type: 'EMail', pass_opt: 'MDContactEmail' },
+            'md_http_proxy' => { type: 'URL', pass_opt: 'MDHttpProxy' },
+            'md_members' => { type: 'MDMembers', pass_opt: 'MDMembers' },
+            'md_message_cmd' => { type: 'Path', pass_opt: 'MDMessageCmd' },
+            'md_must_staple' => { type: 'OnOff', pass_opt: 'MDMustStaple' },
+            'md_notify_cmd' => { type: 'Path', pass_opt: 'MDNotifyCmd' },
+            'md_port_map' => { type: 'String', pass_opt: 'MDPortMap' },
+            'md_private_keys' => { type: 'String', pass_opt: 'MDPrivateKeys' },
+            'md_renew_mode' => { type: 'MDRenewMode', pass_opt: 'MDRenewMode' },
+            'md_renew_window' => { type: 'Duration', pass_opt: 'MDRenewWindow' },
+            'md_require_https' => { type: 'MDRequireHttps', pass_opt: 'MDRequireHttps' },
+            'md_server_status' => { type: 'OnOff', pass_opt: 'MDServerStatus' },
+            'md_staple_others' => { type: 'OnOff', pass_opt: 'MDStapleOthers' },
+            'md_stapling' => { type: 'OnOff', pass_opt: 'MDStapling' },
+            'md_stapling_keep_response' => { type: 'Duration', pass_opt: 'MDStaplingKeepResponse' },
+            'md_stapling_renew_window' => { type: 'Duration', pass_opt: 'MDStaplingRenewWindow' },
+            'md_store_dir' => { type: 'Path', pass_opt: 'MDStoreDir' },
+            'md_warn_window' => { type: 'Duration', pass_opt: 'MDWarnWindow' },
+          }
+
+          md_options.each do |config_option, config_hash|
+            puppetized_config_option = config_option
+            case config_hash[:type]
+            when 'CAChallenges'
+              valid_config_values = [['dns-01'], ['tls-alpn-01', 'http-01']]
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => #{valid_value}" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value.join(' ')}}) }
+                end
+              end
+            when 'EMail'
+              valid_config_values = ['root@example.com']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => #{valid_value}" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'Duration'
+              valid_config_values = ['7d', '33%']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'MDCertificateAgreement'
+              valid_config_values = ['accepted']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'MDCertificateProtocol'
+              valid_config_values = ['ACME']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'MDMembers'
+              valid_config_values = ['auto', 'manual']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'MDRenewMode'
+              valid_config_values = ['always', 'auto', 'manual']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'MDRequireHttps'
+              valid_config_values = ['off', 'temporary', 'permanent']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'OnOff'
+              valid_config_values = ['on', 'off']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'Path'
+              valid_config_values = ['/some/path/to/somewhere']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => #{valid_value}" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} "#{valid_value}"$}) }
+                end
+              end
+            when 'String'
+              valid_config_values = ['a random string']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'URL'
+              valid_config_values = ['https://example.com/example']
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            else
+              valid_config_values = config_hash[:type]
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => '#{valid_value}'" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
+                  it { is_expected.to contain_file('md.conf').with_content(%r{^#{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            end
+          end
+        end
+      end
+
+      it { is_expected.to contain_class('apache::mod::watchdog') }
+      it { is_expected.to contain_apache__mod('md') }
+      it { is_expected.to contain_file('md.conf') }
+    end
+  end
+end
diff --git a/templates/mod/md.conf.epp b/templates/mod/md.conf.epp
new file mode 100644
index 0000000000..0ae45fc7cf
--- /dev/null
+++ b/templates/mod/md.conf.epp
@@ -0,0 +1,84 @@
+<% if $apache::mod::md::md_activation_delay { -%>
+MDActivationDelay <%= $apache::mod::md::md_activation_delay %>
+<% } -%>
+<% if $apache::mod::md::md_base_server { -%>
+MDBaseServer <%= $apache::mod::md::md_base_server %>
+<% } -%>
+<% if $apache::mod::md::md_ca_challenges { -%>
+MDCAChallenges <%= $apache::mod::md::md_ca_challenges.join(' ') %>
+<% } -%>
+<% if $apache::mod::md::md_certificate_agreement { -%>
+MDCertificateAgreement <%= $apache::mod::md::md_certificate_agreement %>
+<% } -%>
+<% if $apache::mod::md::md_certificate_authority { -%>
+MDCertificateAuthority <%= $apache::mod::md::md_certificate_authority %>
+<% } -%>
+<% if $apache::mod::md::md_certificate_check { -%>
+MDCertificateCheck <%= $apache::mod::md::md_certificate_check %>
+<% } -%>
+<% if $apache::mod::md::md_certificate_monitor { -%>
+MDCertificateMonitor <%= $apache::mod::md::md_certificate_monitor %>
+<% } -%>
+<% if $apache::mod::md::md_certificate_protocol { -%>
+MDCertificateProtocol <%= $apache::mod::md::md_certificate_protocol %>
+<% } -%>
+<% if $apache::mod::md::md_certificate_status { -%>
+MDCertificateStatus <%= $apache::mod::md::md_certificate_status %>
+<% } -%>
+<% if $apache::mod::md::md_challenge_dns01 { -%>
+MDChallengeDns01 "<%= $apache::mod::md::md_challenge_dns01 %>"
+<% } -%>
+<% if $apache::mod::md::md_contact_email { -%>
+MDContactEmail <%= $apache::mod::md::md_contact_email %>
+<% } -%>
+<% if $apache::mod::md::md_http_proxy { -%>
+MDHttpProxy <%= $apache::mod::md::md_http_proxy %>
+<% } -%>
+<% if $apache::mod::md::md_members { -%>
+MDMembers <%= $apache::mod::md::md_members %>
+<% } -%>
+<% if $apache::mod::md::md_message_cmd { -%>
+MDMessageCmd "<%= $apache::mod::md::md_message_cmd %>"
+<% } -%>
+<% if $apache::mod::md::md_must_staple { -%>
+MDMustStaple <%= $apache::mod::md::md_must_staple %>
+<% } -%>
+<% if $apache::mod::md::md_notify_cmd { -%>
+MDNotifyCmd "<%= $apache::mod::md::md_notify_cmd %>"
+<% } -%>
+<% if $apache::mod::md::md_port_map { -%>
+MDPortMap <%= $apache::mod::md::md_port_map %>
+<% } -%>
+<% if $apache::mod::md::md_private_keys { -%>
+MDPrivateKeys <%= $apache::mod::md::md_private_keys %>
+<% } -%>
+<% if $apache::mod::md::md_renew_mode { -%>
+MDRenewMode <%= $apache::mod::md::md_renew_mode %>
+<% } -%>
+<% if $apache::mod::md::md_renew_window { -%>
+MDRenewWindow <%= $apache::mod::md::md_renew_window %>
+<% } -%>
+<% if $apache::mod::md::md_require_https { -%>
+MDRequireHttps <%= $apache::mod::md::md_require_https %>
+<% } -%>
+<% if $apache::mod::md::md_server_status { -%>
+MDServerStatus <%= $apache::mod::md::md_server_status %>
+<% } -%>
+<% if $apache::mod::md::md_staple_others { -%>
+MDStapleOthers <%= $apache::mod::md::md_staple_others %>
+<% } -%>
+<% if $apache::mod::md::md_stapling { -%>
+MDStapling <%= $apache::mod::md::md_stapling %>
+<% } -%>
+<% if $apache::mod::md::md_stapling_keep_response { -%>
+MDStaplingKeepResponse <%= $apache::mod::md::md_stapling_keep_response %>
+<% } -%>
+<% if $apache::mod::md::md_stapling_renew_window { -%>
+MDStaplingRenewWindow <%= $apache::mod::md::md_stapling_renew_window %>
+<% } -%>
+<% if $apache::mod::md::md_store_dir { -%>
+MDStoreDir "<%= $apache::mod::md::md_store_dir %>"
+<% } -%>
+<% if $apache::mod::md::md_warn_window { -%>
+MDWarnWindow <%= $apache::mod::md::md_warn_window %>
+<% } -%>

From 2349ba7f35442493d29a08676382044aebaa6eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 16 Nov 2020 12:18:42 -1000
Subject: [PATCH 1722/2267] (maint) Allow using mod_md for managing
 certificates

Add a $mdomain parameter to apache::vhost.  When set to true, the
certifcate configuration is automatically managed by mod_md.  It is also
possible to use an explicit String to fully control the Subject
Alternative Names of the requested certificate.
---
 manifests/vhost.pp               |  9 +++++++++
 spec/defines/vhost_spec.rb       | 20 ++++++++++++++++++++
 templates/vhost/_file_header.erb |  8 ++++++++
 templates/vhost/_ssl.erb         |  2 ++
 4 files changed, 39 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 091a99f574..6b02bf2514 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1722,6 +1722,10 @@
 #   value of the $servername parameter.
 #   When set to false (default), the existing behaviour of using the $name parameter
 #   will remain.
+#
+# @param $mdomain
+#   All the names in the list are managed as one Managed Domain (MD). mod_md will request
+#   one single certificate that is valid for all these names.
 
 define apache::vhost (
   Variant[Boolean,String] $docroot,
@@ -1971,6 +1975,7 @@
   Hash $define                                                                      = {},
   Boolean $auth_oidc                                                                = false,
   Optional[Apache::OIDCSettings] $oidc_settings                                     = undef,
+  Optional[Variant[Boolean,String]] $mdomain                                        = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -2771,6 +2776,10 @@
     }
   }
 
+  if $mdomain {
+    include apache::mod::md
+  }
+
   # Template uses:
   # - $passenger_enabled
   # - $passenger_start_timeout
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f7de631e9a..52f17c6b55 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -484,6 +484,7 @@
                                                  'RemoteUserClaim'           => 'sub',
                                                  'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
                                                  'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
+              'mdomain'                     => 'example.com example.net auto',
             }
           end
 
@@ -1483,6 +1484,12 @@
               content: %r{^\s+OIDCCryptoPassphrase\s4ad1bb46-9979-450e-ae58-c696967df3cd$},
             )
           }
+          it { is_expected.to contain_class('apache::mod::md') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^MDomain example\.com example\.net auto$},
+            )
+          }
         end
         context 'vhost with multiple ip addresses' do
           let :params do
@@ -2451,6 +2458,19 @@
             it { is_expected.not_to compile }
           end
         end
+        context 'mdomain' do
+          let :params do
+            default_params.merge(
+              'mdomain' => true,
+            )
+          end
+
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^MDomain rspec.example.com$},
+            )
+          }
+        end
       end
     end
   end
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index ac119ae01e..6920f3e92a 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -3,6 +3,14 @@
 # Managed by Puppet
 # ************************************
 <%= [@comment].flatten.collect{|c| "# #{c}"}.join("\n") -%>
+<% if @mdomain -%>
+
+  <%- if @mdomain.is_a?(String) -%>
+MDomain <%= @mdomain %>
+  <%- else -%>
+MDomain <%= @servername %>
+  <%- end -%>
+<% end -%>
 
 <VirtualHost <%= [@nvh_addr_port].flatten.compact.join(' ') %>>
 <% @define.each do | k, v| -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 4200f78590..3c918c3672 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -2,8 +2,10 @@
 
   ## SSL directives
   SSLEngine on
+  <%- unless @mdomain -%>
   SSLCertificateFile      "<%= @ssl_cert %>"
   SSLCertificateKeyFile   "<%= @ssl_key %>"
+  <%- end -%>
   <%- if @ssl_chain -%>
   SSLCertificateChainFile "<%= @ssl_chain %>"
   <%- end -%>

From b082294d344bf6b406fc092cbe07ecf4c63890a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 23 Nov 2020 12:49:56 -1000
Subject: [PATCH 1723/2267] (maint) Add basic acceptance test for mod_md

---
 manifests/mod/md.pp            |  2 ++
 manifests/params.pp            |  1 +
 spec/acceptance/mod_md_spec.rb | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 spec/acceptance/mod_md_spec.rb

diff --git a/manifests/mod/md.pp b/manifests/mod/md.pp
index 77b7b55f03..b39ee2451f 100644
--- a/manifests/mod/md.pp
+++ b/manifests/mod/md.pp
@@ -89,6 +89,8 @@
 #  certificate.
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_md.html for additional documentation.
+#
+# @note Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
 class apache::mod::md (
   Optional[String]                                          $md_activation_delay       = undef,
   Optional[Enum['on', 'off']]                               $md_base_server            = undef,
diff --git a/manifests/params.pp b/manifests/params.pp
index d2ee9a5e76..f3b4a46ef1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -231,6 +231,7 @@
         default => 'mod_ldap',
       },
       'lookup_identity'       => 'mod_lookup_identity',
+      'md'                    => 'mod_md',
       'pagespeed'             => 'mod-pagespeed-stable',
       # NOTE: The passenger module isn't available on RH/CentOS without
       # providing dependency packages provided by EPEL and passenger
diff --git a/spec/acceptance/mod_md_spec.rb b/spec/acceptance/mod_md_spec.rb
new file mode 100644
index 0000000000..5bf0c1dc7d
--- /dev/null
+++ b/spec/acceptance/mod_md_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::md', if: mod_supported_on_platform?('apache::mod::md') do
+  pp = <<-MANIFEST
+    class { 'apache':
+    }
+    apache::vhost { 'example.com':
+      docroot => '/var/www/example.com',
+      port    => 443,
+      ssl     => true,
+      mdomain => true,
+    }
+  MANIFEST
+
+  it 'succeeds in configuring a virtual host using mod_md' do
+    apply_manifest(pp, catch_failures: true)
+  end
+end

From 09e1e2f98e3114949cddf07405b8f29b4ebd0439 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Wed, 25 Nov 2020 13:28:26 +0000
Subject: [PATCH 1724/2267] (maint) Add release_checks_7 config to
 provision.yaml

---
 provision.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 10 deletions(-)

diff --git a/provision.yaml b/provision.yaml
index b490efade8..c4e3e7b454 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -1,31 +1,100 @@
 ---
 default:
-  provisioner: docker 
-  images: ['litmusimage/debian:8']
+  provisioner: docker
+  images:
+  - litmusimage/debian:8
 vagrant:
   provisioner: vagrant
-  images: ['centos/7', 'generic/ubuntu1804']
+  images:
+  - centos/7
+  - generic/ubuntu1804
 travis_deb:
   provisioner: docker
-  images: ['litmusimage/debian:8', 'litmusimage/debian:9', 'litmusimage/debian:10']
+  images:
+  - litmusimage/debian:8
+  - litmusimage/debian:9
+  - litmusimage/debian:10
 travis_ub_5:
   provisioner: docker
-  images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04']
+  images:
+  - litmusimage/ubuntu:14.04
+  - litmusimage/ubuntu:16.04
+  - litmusimage/ubuntu:18.04
 travis_ub_6:
   provisioner: docker
-  images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04', 'litmusimage/ubuntu:20.04']
+  images:
+  - litmusimage/ubuntu:14.04
+  - litmusimage/ubuntu:16.04
+  - litmusimage/ubuntu:18.04
+  - litmusimage/ubuntu:20.04
 travis_el6:
   provisioner: docker
   images: []
 travis_el7:
   provisioner: docker
-  images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
+  images:
+  - litmusimage/centos:7
+  - litmusimage/oraclelinux:7
+  - litmusimage/scientificlinux:7
 travis_el8:
   provisioner: docker
-  images: ['litmusimage/centos:8']
+  images:
+  - litmusimage/centos:8
 release_checks_5:
   provisioner: abs
-  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images:
+  - redhat-6-x86_64
+  - redhat-7-x86_64
+  - redhat-8-x86_64
+  - centos-6-x86_64
+  - centos-7-x86_64
+  - centos-8-x86_64
+  - oracle-6-x86_64
+  - oracle-7-x86_64
+  - scientific-6-x86_64
+  - scientific-7-x86_64
+  - debian-8-x86_64
+  - debian-9-x86_64
+  - debian-10-x86_64
+  - ubuntu-1404-x86_64
+  - ubuntu-1604-x86_64
+  - ubuntu-1804-x86_64
+  - sles-12-x86_64
+  - sles-15-x86_64
 release_checks_6:
   provisioner: abs
-  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64',  'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64',  'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
+  images:
+  - redhat-6-x86_64
+  - redhat-7-x86_64
+  - redhat-8-x86_64
+  - centos-6-x86_64
+  - centos-7-x86_64
+  - centos-8-x86_64
+  - oracle-6-x86_64
+  - oracle-7-x86_64
+  - scientific-6-x86_64
+  - scientific-7-x86_64
+  - debian-8-x86_64
+  - debian-9-x86_64
+  - debian-10-x86_64
+  - ubuntu-1404-x86_64
+  - ubuntu-1604-x86_64
+  - ubuntu-1804-x86_64
+  - ubuntu-2004-x86_64
+  - sles-12-x86_64
+  - sles-15-x86_64
+release_checks_7:
+  provisioner: abs
+  images:
+  - redhat-7-x86_64
+  - redhat-8-x86_64
+  - centos-7-x86_64
+  - centos-8-x86_64
+  - oracle-7-x86_64
+  - scientific-7-x86_64
+  - debian-9-x86_64
+  - debian-10-x86_64
+  - sles-12-x86_64
+  - sles-15-x86_64
+  - ubuntu-1804-x86_64
+  - ubuntu-2004-x86_64

From bdaaf97e4f0662db45474f4e43aa49cee7723250 Mon Sep 17 00:00:00 2001
From: Matt Dainty <matthew.dainty@aspectcapital.com>
Date: Fri, 20 Nov 2020 10:23:06 +0000
Subject: [PATCH 1725/2267] Add ssl_user_name vhost parameter

Maps to SSLUserName directive.
---
 manifests/vhost.pp         | 4 ++++
 spec/defines/vhost_spec.rb | 6 ++++++
 templates/vhost/_ssl.erb   | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 091a99f574..983225991c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1673,6 +1673,9 @@
 #   Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
 #   This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 #
+# @param ssl_user_name
+#   Sets the [SSLUserName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusername) directive.
+#
 # @param use_canonical_name
 #   Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
 #   which allows you to configure how the server determines it's own name and port.
@@ -1767,6 +1770,7 @@
   Optional[Boolean] $ssl_stapling                                                   = undef,
   $ssl_stapling_timeout                                                             = undef,
   $ssl_stapling_return_errors                                                       = undef,
+  Optional[String] $ssl_user_name                                                   = undef,
   $priority                                                                         = undef,
   Boolean $default_vhost                                                            = false,
   $servername                                                                       = $name,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f7de631e9a..2345d9460f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -85,6 +85,7 @@
               'ssl_proxyengine'             => true,
               'ssl_proxy_cipher_suite'      => 'HIGH',
               'ssl_proxy_protocol'          => 'TLSv1.2',
+              'ssl_user_name'               => 'SSL_CLIENT_S_DN_CN',
               'priority'                    => '30',
               'default_vhost'               => true,
               'servername'                  => 'example.com',
@@ -1027,6 +1028,11 @@
               content: %r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+              content: %r{^\s+SSLUserName\s+SSL_CLIENT_S_DN_CN$},
+            )
+          }
           it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 4200f78590..24e0f7edf2 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -52,4 +52,7 @@
   <%- if (not @ssl_stapling_return_errors.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
   SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
+  <%- if @ssl_user_name -%>
+  SSLUserName             <%= @ssl_user_name %>
+  <%- end -%>
 <% end -%>

From a97f9b5a27887d8075733e76a61cf5a6aa83a1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 26 Nov 2020 10:50:57 -1000
Subject: [PATCH 1726/2267] (maint) Document http: VHost is still required

---
 manifests/mod/md.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mod/md.pp b/manifests/mod/md.pp
index b39ee2451f..d8847ed67f 100644
--- a/manifests/mod/md.pp
+++ b/manifests/mod/md.pp
@@ -65,6 +65,7 @@
 #
 # @param md_require_https
 #   Redirects http: traffic to https: for Managed Domains.
+#   An http: Virtual Host must nevertheless be setup for that domain.
 #
 # @param md_server_status
 #   Control if Managed Domain information is added to server-status.

From 0c19106e19e2001c5ef98a0c290376ee1a30864e Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Mon, 30 Nov 2020 11:42:34 +0000
Subject: [PATCH 1727/2267] (maint) - Rubocop Fix

---
 spec/acceptance/mod_apreq2_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/mod_apreq2_spec.rb b/spec/acceptance/mod_apreq2_spec.rb
index a07a3b994f..19c14ca7e2 100644
--- a/spec/acceptance/mod_apreq2_spec.rb
+++ b/spec/acceptance/mod_apreq2_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper_acceptance'
-apache_hash = apache_settings_hash
+_apache_hash = apache_settings_hash
 
 describe 'apache::mod::apreq2', if: mod_supported_on_platform?('apache::mod::apreq2') do
   pp = <<-MANIFEST
@@ -10,4 +10,4 @@ class { 'apache::mod::apreq2': }
   it 'succeeds in installing the mod_authnz_apreq2 module' do
     apply_manifest(pp, catch_failures: true)
   end
-end
\ No newline at end of file
+end

From 5c26cc5970c776c0de9d82042db882fb9cb610f2 Mon Sep 17 00:00:00 2001
From: Daiana_Mezdrea <daiana.mezdrea@yahoo.com>
Date: Thu, 3 Dec 2020 16:34:09 +0200
Subject: [PATCH 1728/2267] (feat) - Bump Puppet boundary

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 47194f903a..dfe18186a5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -77,7 +77,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.10 < 7.0.0"
+      "version_requirement": ">= 5.5.10 < 8.0.0"
     }
   ],
   "description": "Module for Apache configuration",

From fa9d54eb0d548315bc2497bb2e6a544d495aed3c Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Thu, 3 Dec 2020 18:12:03 +0200
Subject: [PATCH 1729/2267] Fix bool2httpd function call for older ruby
 versions

---
 lib/puppet/functions/apache/bool2httpd.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
index 511adba65b..a8b2cb473e 100644
--- a/lib/puppet/functions/apache/bool2httpd.rb
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -25,6 +25,10 @@ def bool2httpd(arg)
   private
 
   def matches_string?(value, matcher)
-    value.is_a?(String) && value.match?(matcher)
+    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4.0')
+      value =~ matcher
+    else
+      value.is_a?(String) && value.match?(matcher)
+    end
   end
 end

From a00038336da6f2e436a390f430f4146beabb25ff Mon Sep 17 00:00:00 2001
From: Tobias Wolter <tobias.wolter@b1-systems.de>
Date: Sat, 5 Dec 2020 00:04:24 +0100
Subject: [PATCH 1730/2267] (MODULES-10887) Set `use_servername_for_filenames`
 for defaults

The default vhost definitions are called without
`use_servername_for_filenames` being set, which leads to a deprecation
warning on every run.

With this PR, the parameters are added to the default entries and thus
avoid generating said error message.

This was verified on a local installation.
---
 manifests/init.pp | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 6fc612495e..225f98d5b3 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -826,33 +826,35 @@
     }
 
     ::apache::vhost { 'default':
-      ensure          => $default_vhost_ensure,
-      port            => '80',
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => $access_log_file,
-      priority        => '15',
-      ip              => $ip,
-      logroot_mode    => $logroot_mode,
-      manage_docroot  => $default_vhost,
+      ensure                       => $default_vhost_ensure,
+      port                         => '80',
+      docroot                      => $docroot,
+      scriptalias                  => $scriptalias,
+      serveradmin                  => $serveradmin,
+      access_log_file              => $access_log_file,
+      priority                     => '15',
+      ip                           => $ip,
+      logroot_mode                 => $logroot_mode,
+      manage_docroot               => $default_vhost,
+      use_servername_for_filenames => true,
     }
     $ssl_access_log_file = $::osfamily ? {
       'freebsd' => $access_log_file,
       default   => "ssl_${access_log_file}",
     }
     ::apache::vhost { 'default-ssl':
-      ensure          => $default_ssl_vhost_ensure,
-      port            => '443',
-      ssl             => true,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => $ssl_access_log_file,
-      priority        => '15',
-      ip              => $ip,
-      logroot_mode    => $logroot_mode,
-      manage_docroot  => $default_ssl_vhost,
+      ensure                       => $default_ssl_vhost_ensure,
+      port                         => '443',
+      ssl                          => true,
+      docroot                      => $docroot,
+      scriptalias                  => $scriptalias,
+      serveradmin                  => $serveradmin,
+      access_log_file              => $ssl_access_log_file,
+      priority                     => '15',
+      ip                           => $ip,
+      logroot_mode                 => $logroot_mode,
+      manage_docroot               => $default_ssl_vhost,
+      use_servername_for_filenames => true,
     }
   }
 

From d24a0fe1ae5a9f3f33ef73af4c349bb75a475223 Mon Sep 17 00:00:00 2001
From: Robert <robertscheer@xs4all.net>
Date: Mon, 7 Dec 2020 13:45:46 +0100
Subject: [PATCH 1731/2267] single line warnings instead of multi-line

---
 templates/mod/_require.erb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/templates/mod/_require.erb b/templates/mod/_require.erb
index 6a06d68da8..d55e312e9d 100644
--- a/templates/mod/_require.erb
+++ b/templates/mod/_require.erb
@@ -1,8 +1,7 @@
 <% if @requires != nil -%>
   <%- _requires = @requires -%>
 <% elsif @allow_from != nil and ! @allow_from.empty? -%>
-  <%- scope.function_warning(["Class #{@title}: Using Allow"]) -%>
-  <%- scope.function_warning(["is deprecated in Apache #{@_apache_version}"]) -%>
+  <%- scope.function_warning(["Class #{@title}: Using Allow is deprecated in Apache #{@_apache_version}"]) -%>
   <%- _requires = 'ip ' + Array(@allow_from).join(" ") -%>
 <% else -%>
   <%- _requires = @requires_defaults -%>
@@ -24,8 +23,7 @@
     <%- indentation = '    ' -%>
   <%- else -%>
     <%- if _requires.has_key?('enforce') -%>
-      <%- scope.function_warning(["Class #{@title}: Require can only"]) -%>
-      <%- scope.function_warning(["be overwritten with all, none or any."]) -%>
+      <%- scope.function_warning(["Class #{@title}: Require can only be overwritten with all, none or any."]) -%>
     <%- end -%>
     <%- enforce_open = '' -%>
     <%- enforce_close = '' -%>
@@ -38,7 +36,6 @@
       <%- end -%>
 <%# %><%= enforce_close -%>
   <%- else -%>
-    <%- scope.function_warning(["Class #{@title}: Require hash must have"]) -%>
-    <%- scope.function_warning(["a key named \"requires\" with array value"]) -%>
+    <%- scope.function_warning(["Class #{@title}: Require hash must have a key named \"requires\" with array value"]) -%>
   <%- end -%>
 <% end -%>

From ea2caec6f1a1e9509a84d262aa44cf495fdffd5e Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Mon, 7 Dec 2020 15:11:05 +0000
Subject: [PATCH 1732/2267] Release version 5.8.0

---
 CHANGELOG.md  | 25 +++++++++++++++++++------
 REFERENCE.md  | 11 +++++++++++
 metadata.json |  2 +-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c96de9bc0..53d1c21b93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.8.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.8.0) (2020-12-07)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.7.0...v5.8.0)
+
+### Added
+
+- \(MODULES-10887\) Set `use\_servername\_for\_filenames` for defaults [\#2103](https://github.com/puppetlabs/puppetlabs-apache/pull/2103) ([towo](https://github.com/towo))
+- pdksync - \(feat\) Add support for Puppet 7 [\#2101](https://github.com/puppetlabs/puppetlabs-apache/pull/2101) ([daianamezdrea](https://github.com/daianamezdrea))
+- \(feat\) Add support for apreq2 MOD on Debian 9, 10 [\#2085](https://github.com/puppetlabs/puppetlabs-apache/pull/2085) ([TigerKriika](https://github.com/TigerKriika))
+
+### Fixed
+
+- \(fix\) Convert unnecessary multi line warnings to single lines [\#2104](https://github.com/puppetlabs/puppetlabs-apache/pull/2104) ([rj667](https://github.com/rj667))
+- Fix bool2httpd function call for older ruby versions [\#2102](https://github.com/puppetlabs/puppetlabs-apache/pull/2102) ([carabasdaniel](https://github.com/carabasdaniel))
+- Use Ruby 2.7 compatible string matching [\#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
+
 ## [v5.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.7.0) (2020-11-24)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.6.0...v5.7.0)
@@ -12,17 +28,14 @@ All notable changes to this project will be documented in this file. The format
 - \(IAC-1186\) Add new $use\_servername\_for\_filenames parameter [\#2086](https://github.com/puppetlabs/puppetlabs-apache/pull/2086) ([sanfrancrisko](https://github.com/sanfrancrisko))
 - Allow relative paths in oidc\_redirect\_uri [\#2082](https://github.com/puppetlabs/puppetlabs-apache/pull/2082) ([sanfrancrisko](https://github.com/sanfrancrisko))
 - Improve SSLVerify options [\#2081](https://github.com/puppetlabs/puppetlabs-apache/pull/2081) ([bovy89](https://github.com/bovy89))
+- Change icon path [\#2079](https://github.com/puppetlabs/puppetlabs-apache/pull/2079) ([yakatz](https://github.com/yakatz))
+- Support mod\_auth\_gssapi parameters [\#2078](https://github.com/puppetlabs/puppetlabs-apache/pull/2078) ([traylenator](https://github.com/traylenator))
 - Add ssl\_proxy\_machine\_cert\_chain param to vhost class [\#2072](https://github.com/puppetlabs/puppetlabs-apache/pull/2072) ([AbelNavarro](https://github.com/AbelNavarro))
 
 ### Fixed
 
 - Use Ruby 2.7 compatible string matching [\#2074](https://github.com/puppetlabs/puppetlabs-apache/pull/2074) ([sanfrancrisko](https://github.com/sanfrancrisko))
 
-### UNCATEGORIZED PRS; LABEL THEM ON GITHUB
-
-- Change icon path [\#2079](https://github.com/puppetlabs/puppetlabs-apache/pull/2079) ([yakatz](https://github.com/yakatz))
-- Support mod\_auth\_gssapi parameters [\#2078](https://github.com/puppetlabs/puppetlabs-apache/pull/2078) ([traylenator](https://github.com/traylenator))
-
 ## [v5.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.6.0) (2020-10-01)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.5.0...v5.6.0)
@@ -128,7 +141,6 @@ All notable changes to this project will be documented in this file. The format
 - Added unmanaged\_path and custom\_fragment options to userdir [\#1931](https://github.com/puppetlabs/puppetlabs-apache/pull/1931) ([GeorgeCox](https://github.com/GeorgeCox))
 - Add LDAP parameters to httpd.conf [\#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
 - Add LDAPReferrals configuration parameter [\#1928](https://github.com/puppetlabs/puppetlabs-apache/pull/1928) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
-- Define SCL package name for mod\_ldap [\#1893](https://github.com/puppetlabs/puppetlabs-apache/pull/1893) ([treydock](https://github.com/treydock))
 
 ### Fixed
 
@@ -147,6 +159,7 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 - \(FM-7923\) Implement Puppet Strings [\#1916](https://github.com/puppetlabs/puppetlabs-apache/pull/1916) ([eimlav](https://github.com/eimlav))
+- Define SCL package name for mod\_ldap [\#1893](https://github.com/puppetlabs/puppetlabs-apache/pull/1893) ([treydock](https://github.com/treydock))
 
 ### Fixed
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 68d61b5b0e..d7a4d94110 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -12,6 +12,7 @@
 * [`apache::dev`](#apachedev): Installs Apache development libraries.
 * [`apache::mod::actions`](#apachemodactions): Installs Apache mod_actions
 * [`apache::mod::alias`](#apachemodalias): Installs and configures `mod_alias`.
+* [`apache::mod::apreq2`](#apachemodapreq2): Installs `mod_apreq2`.
 * [`apache::mod::auth_basic`](#apachemodauth_basic): Installs `mod_auth_basic`
 * [`apache::mod::auth_cas`](#apachemodauth_cas): Installs and configures `mod_auth_cas`.
 * [`apache::mod::auth_gssapi`](#apachemodauth_gssapi): Installs `mod_auth_gsappi`.
@@ -1134,6 +1135,16 @@ Data type: `Any`
 
 Default value: `$apache::params::icons_prefix`
 
+### `apache::mod::apreq2`
+
+Installs `mod_apreq2`.
+
+* **Note** Unsupported platforms: CentOS: all; Debian: 8; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
+
+* **See also**
+  * http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html
+    * for additional documentation.
+
 ### `apache::mod::auth_basic`
 
 Installs `mod_auth_basic`
diff --git a/metadata.json b/metadata.json
index dfe18186a5..302cd902e8 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 4aaeac8b0315fcf5f84fb08c7025bf61e3b7a0b4 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 7 Dec 2020 17:23:44 +0200
Subject: [PATCH 1733/2267] Remove EL6 testing from Travis

---
 provision.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/provision.yaml b/provision.yaml
index c4e3e7b454..bbdfd7a412 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -27,9 +27,6 @@ travis_ub_6:
   - litmusimage/ubuntu:16.04
   - litmusimage/ubuntu:18.04
   - litmusimage/ubuntu:20.04
-travis_el6:
-  provisioner: docker
-  images: []
 travis_el7:
   provisioner: docker
   images:

From 5262a5649a8393965fd9c18041331c73a36bdb04 Mon Sep 17 00:00:00 2001
From: Matt Dainty <matt@bodgit-n-scarper.com>
Date: Tue, 22 Dec 2020 16:55:09 +0000
Subject: [PATCH 1734/2267] Add acceptance test

---
 spec/acceptance/vhost_spec.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index da144ae534..888376e0f6 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -769,10 +769,11 @@ class { 'apache': }
         priority => false,
         docroot => '/tmp'
       }
-      apache::vhost { 'test.ssl_protool':
-        docroot      => '/tmp',
-        ssl          => true,
-        ssl_protocol => ['All', '-SSLv2'],
+      apache::vhost { 'test.ssl_protocol':
+        docroot       => '/tmp',
+        ssl           => true,
+        ssl_protocol  => ['All', '-SSLv2'],
+        ssl_user_name => 'SSL_CLIENT_S_DN_CN',
       }
       apache::vhost { 'test.block':
         docroot  => '/tmp',
@@ -873,9 +874,10 @@ class { 'apache': }
     describe file("#{apache_hash['vhost_dir']}/test.without_priority_prefix.conf") do
       it { is_expected.to be_file }
     end
-    describe file("#{apache_hash['vhost_dir']}/25-test.ssl_protool.conf") do
+    describe file("#{apache_hash['vhost_dir']}/25-test.ssl_protocol.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
+      it { is_expected.to contain 'SSLUserName  *SSL_CLIENT_S_DN_CN' }
     end
     describe file("#{apache_hash['vhost_dir']}/25-test.block.conf") do
       it { is_expected.to be_file }

From 2f027fccaaf5de5634f0f8f6fd3d4d519954e90f Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 16 Dec 2020 13:04:10 +0000
Subject: [PATCH 1735/2267] Update to pdk-templates and puppet-module-gems
 1.0.0

---
 .github/workflows/nightly.yml |  27 +--
 .github/workflows/pr_test.yml |  25 +-
 .rubocop.yml                  | 440 ++++++++++++++++++++++++++++++++--
 .sync.yml                     |  11 +-
 .travis.yml                   |  24 +-
 Gemfile                       |  19 +-
 Rakefile                      |   1 -
 metadata.json                 |   2 +-
 8 files changed, 450 insertions(+), 99 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index d59437aab0..4021da7645 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -90,7 +90,7 @@ jobs:
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -155,26 +155,13 @@ jobs:
         sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
         echo ::endgroup::
 
-    # The provision service hands out machines as soon as they're provisioned.
-    # The GCP VMs might still take a while to spool up and configure themselves fully.
-    # This retry loop spins until all agents have been installed successfully.
     - name: Install agent
-      uses: nick-invision/retry@v1
-      with:
-        timeout_minutes: 30
-        max_attempts: 5
-        retry_wait_seconds: 60
-        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
-    # The agent installer on windows does not finish in time for this to work. To
-    # work around this for now, retry after a minute if installing the module failed.
     - name: Install module
-      uses: nick-invision/retry@v1
-      with:
-        timeout_minutes: 30
-        max_attempts: 2
-        retry_wait_seconds: 60
-        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
 
     - name: "Honeycomb: Record deployment times"
       if: ${{ always() }}
@@ -220,7 +207,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Slack Workflow Notification
-        uses: Gamesight/slack-workflow-status@master
+        uses: Gamesight/slack-workflow-status@88ee95b73b4669825883ddf22747966204663e58 # pin@master
         with:
           # Required Input
           repo_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 17f5a649b3..2b5ab1f576 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -88,7 +88,7 @@ jobs:
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -153,26 +153,13 @@ jobs:
         sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
         echo ::endgroup::
 
-    # The provision service hands out machines as soon as they're provisioned.
-    # The GCP VMs might still take a while to spool up and configure themselves fully.
-    # This retry loop spins until all agents have been installed successfully.
     - name: Install agent
-      uses: nick-invision/retry@v1
-      with:
-        timeout_minutes: 30
-        max_attempts: 5
-        retry_wait_seconds: 60
-        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
-    # The agent installer on windows does not finish in time for this to work. To
-    # work around this for now, retry after a minute if installing the module failed.
     - name: Install module
-      uses: nick-invision/retry@v1
-      with:
-        timeout_minutes: 30
-        max_attempts: 2
-        retry_wait_seconds: 60
-        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
 
     - name: "Honeycomb: Record deployment times"
       if: ${{ always() }}
diff --git a/.rubocop.yml b/.rubocop.yml
index b7c972b286..33c33fa52a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,12 +1,12 @@
 ---
 require:
+- rubocop-performance
 - rubocop-rspec
-- rubocop-i18n
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.1'
+  TargetRubyVersion: '2.4'
   Include:
-  - "./**/*.rb"
+  - "**/*.rb"
   Exclude:
   - bin/*
   - ".vendor/**/*"
@@ -18,16 +18,9 @@ AllCops:
   - "**/Puppetfile"
   - "**/Vagrantfile"
   - "**/Guardfile"
-Metrics/LineLength:
+Layout/LineLength:
   Description: People have wide screens, use them.
   Max: 200
-GetText:
-  Enabled: false
-GetText/DecorateString:
-  Description: We don't want to decorate test output.
-  Exclude:
-  - spec/**/*
-  Enabled: false
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
@@ -40,10 +33,6 @@ Style/BlockDelimiters:
   Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
     be consistent then.
   EnforcedStyle: braces_for_chaining
-Style/BracesAroundHashParameters:
-  Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
-    See https://github.com/rubocop-hq/rubocop/pull/7643
-  Enabled: false
 Style/ClassAndModuleChildren:
   Description: Compact style reduces the required amount of indentation.
   EnforcedStyle: compact
@@ -72,14 +61,13 @@ Style/TrailingCommaInArguments:
   Description: Prefer always trailing comma on multiline argument lists. This makes
     diffs, and re-ordering nicer.
   EnforcedStyleForMultiline: comma
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
   Description: Prefer always trailing comma on multiline literals. This makes diffs,
     and re-ordering nicer.
   EnforcedStyleForMultiline: comma
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets
-inherit_from: ".rubocop_todo.yml"
 RSpec/MessageSpies:
   EnforcedStyle: receive
 Style/Documentation:
@@ -88,21 +76,219 @@ Style/Documentation:
   - spec/**/*
 Style/WordArray:
   EnforcedStyle: brackets
+Performance/AncestorsInclude:
+  Enabled: true
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+Performance/BlockGivenWithExplicitBlock:
+  Enabled: true
+Performance/Caller:
+  Enabled: true
+Performance/CaseWhenSplat:
+  Enabled: true
+Performance/Casecmp:
+  Enabled: true
+Performance/CollectionLiteralInLoop:
+  Enabled: true
+Performance/CompareWithBlock:
+  Enabled: true
+Performance/ConstantRegexp:
+  Enabled: true
+Performance/Count:
+  Enabled: true
+Performance/Detect:
+  Enabled: true
+Performance/DoubleStartEndWith:
+  Enabled: true
+Performance/EndWith:
+  Enabled: true
+Performance/FixedSize:
+  Enabled: true
+Performance/FlatMap:
+  Enabled: true
+Performance/MethodObjectAsBlock:
+  Enabled: true
+Performance/RangeInclude:
+  Enabled: true
+Performance/RedundantBlockCall:
+  Enabled: true
+Performance/RedundantMatch:
+  Enabled: true
+Performance/RedundantMerge:
+  Enabled: true
+Performance/RedundantSortBlock:
+  Enabled: true
+Performance/RedundantStringChars:
+  Enabled: true
+Performance/RegexpMatch:
+  Enabled: true
+Performance/ReverseEach:
+  Enabled: true
+Performance/ReverseFirst:
+  Enabled: true
+Performance/Size:
+  Enabled: true
+Performance/SortReverse:
+  Enabled: true
+Performance/Squeeze:
+  Enabled: true
+Performance/StartWith:
+  Enabled: true
+Performance/StringInclude:
+  Enabled: true
+Performance/StringReplacement:
+  Enabled: true
+Performance/Sum:
+  Enabled: true
+Performance/TimesMap:
+  Enabled: true
 Style/CollectionMethods:
   Enabled: true
 Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
-GetText/DecorateFunctionMessage:
+Bundler/InsecureProtocolSource:
+  Enabled: false
+Gemspec/DuplicatedAssignment:
+  Enabled: false
+Gemspec/OrderedDependencies:
   Enabled: false
-GetText/DecorateStringFormattingUsingInterpolation:
+Gemspec/RequiredRubyVersion:
   Enabled: false
-GetText/DecorateStringFormattingUsingPercent:
+Gemspec/RubyVersionGlobalsUsage:
+  Enabled: false
+Layout/ArgumentAlignment:
+  Enabled: false
+Layout/BeginEndAlignment:
+  Enabled: false
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+Layout/EmptyComment:
+  Enabled: false
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/EmptyLinesAroundArguments:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: false
 Layout/EndOfLine:
   Enabled: false
-Layout/IndentHeredoc:
+Layout/FirstArgumentIndentation:
+  Enabled: false
+Layout/HashAlignment:
+  Enabled: false
+Layout/HeredocIndentation:
+  Enabled: false
+Layout/LeadingEmptyLines:
+  Enabled: false
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: false
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: false
+Layout/SpaceInsideReferenceBrackets:
+  Enabled: false
+Lint/BigDecimalNew:
+  Enabled: false
+Lint/BooleanSymbol:
+  Enabled: false
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: false
+Lint/DisjunctiveAssignmentInConstructor:
+  Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
+Lint/DuplicateElsifCondition:
+  Enabled: false
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: false
+Lint/DuplicateRequire:
+  Enabled: false
+Lint/DuplicateRescueException:
+  Enabled: false
+Lint/EmptyBlock:
+  Enabled: false
+Lint/EmptyClass:
+  Enabled: false
+Lint/EmptyConditionalBody:
+  Enabled: false
+Lint/EmptyFile:
+  Enabled: false
+Lint/ErbNewArguments:
+  Enabled: false
+Lint/FloatComparison:
+  Enabled: false
+Lint/HashCompareByIdentity:
+  Enabled: false
+Lint/IdentityComparison:
+  Enabled: false
+Lint/InterpolationCheck:
+  Enabled: false
+Lint/MissingCopEnableDirective:
+  Enabled: false
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+Lint/NestedPercentLiteral:
+  Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+Lint/NonDeterministicRequireOrder:
+  Enabled: false
+Lint/OrderedMagicComments:
+  Enabled: false
+Lint/OutOfRangeRegexpRef:
+  Enabled: false
+Lint/RaiseException:
+  Enabled: false
+Lint/RedundantCopEnableDirective:
+  Enabled: false
+Lint/RedundantRequireStatement:
+  Enabled: false
+Lint/RedundantSafeNavigation:
+  Enabled: false
+Lint/RedundantWithIndex:
+  Enabled: false
+Lint/RedundantWithObject:
+  Enabled: false
+Lint/RegexpAsCondition:
+  Enabled: false
+Lint/ReturnInVoidContext:
+  Enabled: false
+Lint/SafeNavigationConsistency:
+  Enabled: false
+Lint/SafeNavigationWithEmpty:
+  Enabled: false
+Lint/SelfAssignment:
+  Enabled: false
+Lint/SendWithMixinArgument:
+  Enabled: false
+Lint/ShadowedArgument:
+  Enabled: false
+Lint/StructNewOverride:
+  Enabled: false
+Lint/ToEnumArguments:
+  Enabled: false
+Lint/ToJSON:
+  Enabled: false
+Lint/TopLevelReturnWithArgument:
+  Enabled: false
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: false
+Lint/UnexpectedBlockArity:
+  Enabled: false
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: false
+Lint/UnreachableLoop:
+  Enabled: false
+Lint/UriEscapeUnescape:
+  Enabled: false
+Lint/UriRegexp:
+  Enabled: false
+Lint/UselessMethodDefinition:
+  Enabled: false
+Lint/UselessTimes:
   Enabled: false
 Metrics/AbcSize:
   Enabled: false
@@ -120,19 +306,229 @@ Metrics/ParameterLists:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
+Migration/DepartmentName:
+  Enabled: false
+Naming/BlockParameterName:
+  Enabled: false
+Naming/HeredocDelimiterCase:
+  Enabled: false
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+RSpec/Be:
+  Enabled: false
+RSpec/Capybara/CurrentPathExpectation:
+  Enabled: false
+RSpec/Capybara/FeatureMethods:
+  Enabled: false
+RSpec/Capybara/VisibilityMatcher:
+  Enabled: false
+RSpec/ContextMethod:
+  Enabled: false
+RSpec/ContextWording:
+  Enabled: false
 RSpec/DescribeClass:
   Enabled: false
+RSpec/EmptyHook:
+  Enabled: false
+RSpec/EmptyLineAfterExample:
+  Enabled: false
+RSpec/EmptyLineAfterExampleGroup:
+  Enabled: false
+RSpec/EmptyLineAfterHook:
+  Enabled: false
 RSpec/ExampleLength:
   Enabled: false
-RSpec/MessageExpectation:
+RSpec/ExampleWithoutDescription:
+  Enabled: false
+RSpec/ExpectChange:
+  Enabled: false
+RSpec/ExpectInHook:
+  Enabled: false
+RSpec/FactoryBot/AttributeDefinedStatically:
+  Enabled: false
+RSpec/FactoryBot/CreateList:
+  Enabled: false
+RSpec/FactoryBot/FactoryClassName:
+  Enabled: false
+RSpec/HooksBeforeExamples:
+  Enabled: false
+RSpec/ImplicitBlockExpectation:
+  Enabled: false
+RSpec/ImplicitSubject:
+  Enabled: false
+RSpec/LeakyConstantDeclaration:
+  Enabled: false
+RSpec/LetBeforeExamples:
+  Enabled: false
+RSpec/MissingExampleGroupArgument:
   Enabled: false
 RSpec/MultipleExpectations:
   Enabled: false
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+RSpec/MultipleSubjects:
+  Enabled: false
 RSpec/NestedGroups:
   Enabled: false
+RSpec/PredicateMatcher:
+  Enabled: false
+RSpec/ReceiveCounts:
+  Enabled: false
+RSpec/ReceiveNever:
+  Enabled: false
+RSpec/RepeatedExampleGroupBody:
+  Enabled: false
+RSpec/RepeatedExampleGroupDescription:
+  Enabled: false
+RSpec/RepeatedIncludeExample:
+  Enabled: false
+RSpec/ReturnFromStub:
+  Enabled: false
+RSpec/SharedExamples:
+  Enabled: false
+RSpec/StubbedMock:
+  Enabled: false
+RSpec/UnspecifiedException:
+  Enabled: false
+RSpec/VariableDefinition:
+  Enabled: false
+RSpec/VoidExpect:
+  Enabled: false
+RSpec/Yield:
+  Enabled: false
+Security/Open:
+  Enabled: false
+Style/AccessModifierDeclarations:
+  Enabled: false
+Style/AccessorGrouping:
+  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
 Style/AsciiComments:
   Enabled: false
+Style/BisectedAttrAccessor:
+  Enabled: false
+Style/CaseLikeIf:
+  Enabled: false
+Style/ClassEqualityComparison:
+  Enabled: false
+Style/CollectionCompact:
+  Enabled: false
+Style/ColonMethodDefinition:
+  Enabled: false
+Style/CombinableLoops:
+  Enabled: false
+Style/CommentedKeyword:
+  Enabled: false
+Style/Dir:
+  Enabled: false
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+Style/DoubleCopDisableDirective:
+  Enabled: false
+Style/EmptyBlockParameter:
+  Enabled: false
+Style/EmptyLambdaParameter:
+  Enabled: false
+Style/Encoding:
+  Enabled: false
+Style/EvalWithLocation:
+  Enabled: false
+Style/ExpandPathArguments:
+  Enabled: false
+Style/ExplicitBlockArgument:
+  Enabled: false
+Style/ExponentialNotation:
+  Enabled: false
+Style/FloatDivision:
+  Enabled: false
+Style/GlobalStdStream:
+  Enabled: false
+Style/HashAsLastArrayItem:
+  Enabled: false
+Style/HashLikeCase:
+  Enabled: false
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false
 Style/IfUnlessModifier:
   Enabled: false
+Style/KeywordParametersOrder:
+  Enabled: false
+Style/MinMax:
+  Enabled: false
+Style/MixinUsage:
+  Enabled: false
+Style/MultilineWhenThen:
+  Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
+Style/NegatedUnless:
+  Enabled: false
+Style/NilLambda:
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
+Style/OrAssignment:
+  Enabled: false
+Style/RandomWithOffset:
+  Enabled: false
+Style/RedundantArgument:
+  Enabled: false
+Style/RedundantAssignment:
+  Enabled: false
+Style/RedundantCondition:
+  Enabled: false
+Style/RedundantConditional:
+  Enabled: false
+Style/RedundantFetchBlock:
+  Enabled: false
+Style/RedundantFileExtensionInRequire:
+  Enabled: false
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+Style/RedundantRegexpEscape:
+  Enabled: false
+Style/RedundantSelfAssignment:
+  Enabled: false
+Style/RedundantSort:
+  Enabled: false
+Style/RescueStandardError:
+  Enabled: false
+Style/SingleArgumentDig:
+  Enabled: false
+Style/SlicingWithRange:
+  Enabled: false
+Style/SoleNestedConditional:
+  Enabled: false
+Style/StderrPuts:
+  Enabled: false
+Style/StringConcatenation:
+  Enabled: false
+Style/Strip:
+  Enabled: false
+Style/SwapValues:
+  Enabled: false
 Style/SymbolProc:
   Enabled: false
+Style/TrailingBodyOnClass:
+  Enabled: false
+Style/TrailingBodyOnMethodDefinition:
+  Enabled: false
+Style/TrailingBodyOnModule:
+  Enabled: false
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+Style/TrailingMethodEndStatement:
+  Enabled: false
+Style/UnpackFirst:
+  Enabled: false
diff --git a/.sync.yml b/.sync.yml
index e34552f80a..c98af8dc77 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,11 +1,8 @@
 ---
 ".gitlab-ci.yml":
   delete: true
-".rubocop.yml":
-  default_configs:
-    inherit_from: ".rubocop_todo.yml"
 ".travis.yml":
-  global_env: 
+  global_env:
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
   deploy_to_forge:
     enabled: false
@@ -40,12 +37,6 @@ Gemfile:
   optional:
     ":development":
     - gem: github_changelog_generator
-      git: https://github.com/skywinder/github-changelog-generator
-      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
-      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-Rakefile:
-  requires:
-  - puppet-lint/tasks/puppet-lint
 spec/spec_helper.rb:
   mock_with: ":rspec"
   coverage_report: true
diff --git a/.travis.yml b/.travis.yml
index c08233a4c8..52dc74b763 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,89 +27,81 @@ stages:
 jobs:
   fast_finish: true
   include:
-    -
+    - bundler_args: --with system_tests
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
       env: PLATFORMS=travis_ub_6_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
+    - bundler_args: --with system_tests
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
       env: PLATFORMS=travis_ub_5_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
+    - bundler_args: --with system_tests
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
       env: PLATFORMS=travis_deb_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
+    - bundler_args: --with system_tests
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
       env: PLATFORMS=travis_el7_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
+    - bundler_args: --with system_tests
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el8]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
       env: PLATFORMS=travis_el8_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
+    - bundler_args: --with system_tests
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
       env: PLATFORMS=travis_deb_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
+    - bundler_args: --with system_tests
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
       env: PLATFORMS=travis_el7_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
+    - bundler_args: --with system_tests
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el8]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
       env: PLATFORMS=travis_el8_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
diff --git a/Gemfile b/Gemfile
index b6b25afe48..ae2b430dc2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,19 +17,18 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "fast_gettext", '1.1.0',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                            require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem "json_pure", '<= 2.0.1',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "json", '= 1.8.1',                                         require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator",                              require: false
+end
+group :system_tests do
+  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 11539b96b0..0a5093b33a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,6 @@ require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
 require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
-require 'puppet-lint/tasks/puppet-lint'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
diff --git a/metadata.json b/metadata.json
index 302cd902e8..2209cd261f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -83,5 +83,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.18.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates#main",
-  "template-ref": "heads/main-0-g5afcd3d"
+  "template-ref": "heads/main-0-g4543421"
 }

From e13c5a20f0f37a46e63ede8e577ee207f75edb03 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 16 Dec 2020 13:04:26 +0000
Subject: [PATCH 1736/2267] Add the FrozenStrings magic comment

---
 lib/facter/apache_version.rb                   | 2 ++
 lib/puppet/functions/apache/apache_pw_hash.rb  | 2 ++
 lib/puppet/functions/apache/bool2httpd.rb      | 2 ++
 lib/puppet/functions/apache/pw_hash.rb         | 2 ++
 lib/puppet/functions/apache_pw_hash.rb         | 2 ++
 lib/puppet/functions/bool2httpd.rb             | 2 ++
 lib/puppet/provider/a2mod.rb                   | 2 ++
 lib/puppet/provider/a2mod/a2mod.rb             | 2 ++
 lib/puppet/provider/a2mod/gentoo.rb            | 2 ++
 lib/puppet/provider/a2mod/modfix.rb            | 2 ++
 lib/puppet/provider/a2mod/redhat.rb            | 2 ++
 lib/puppet/type/a2mod.rb                       | 2 ++
 spec/acceptance/apache_parameters_spec.rb      | 2 ++
 spec/acceptance/apache_ssl_spec.rb             | 2 ++
 spec/acceptance/class_spec.rb                  | 2 ++
 spec/acceptance/custom_config_spec.rb          | 2 ++
 spec/acceptance/default_mods_spec.rb           | 2 ++
 spec/acceptance/init_task_spec.rb              | 2 ++
 spec/acceptance/itk_spec.rb                    | 2 ++
 spec/acceptance/mod_apreq2_spec.rb             | 2 ++
 spec/acceptance/mod_authnz_ldap_spec.rb        | 2 ++
 spec/acceptance/mod_ldap_spec.rb               | 2 ++
 spec/acceptance/mod_md_spec.rb                 | 2 ++
 spec/acceptance/mod_php_spec.rb                | 2 ++
 spec/acceptance/prefork_worker_spec.rb         | 2 ++
 spec/acceptance/service_spec.rb                | 2 ++
 spec/acceptance/vhost_spec.rb                  | 2 ++
 spec/acceptance/vhosts_spec.rb                 | 2 ++
 spec/classes/apache_spec.rb                    | 4 +++-
 spec/classes/dev_spec.rb                       | 2 ++
 spec/classes/mod/alias_spec.rb                 | 2 ++
 spec/classes/mod/auth_cas_spec.rb              | 2 ++
 spec/classes/mod/auth_gssapi_spec.rb           | 2 ++
 spec/classes/mod/auth_kerb_spec.rb             | 2 ++
 spec/classes/mod/auth_mellon_spec.rb           | 2 ++
 spec/classes/mod/auth_openidc_spec.rb          | 2 ++
 spec/classes/mod/authn_dbd_spec.rb             | 2 ++
 spec/classes/mod/authnz_ldap_spec.rb           | 2 ++
 spec/classes/mod/authnz_pam_spec.rb            | 2 ++
 spec/classes/mod/cluster_spec.rb               | 2 ++
 spec/classes/mod/data_spec.rb                  | 2 ++
 spec/classes/mod/dav_svn_spec.rb               | 2 ++
 spec/classes/mod/deflate_spec.rb               | 2 ++
 spec/classes/mod/dev_spec.rb                   | 2 ++
 spec/classes/mod/dir_spec.rb                   | 2 ++
 spec/classes/mod/disk_cache_spec.rb            | 2 ++
 spec/classes/mod/dumpio_spec.rb                | 2 ++
 spec/classes/mod/event_spec.rb                 | 2 ++
 spec/classes/mod/expires_spec.rb               | 2 ++
 spec/classes/mod/ext_filter_spec.rb            | 2 ++
 spec/classes/mod/fastcgi_spec.rb               | 2 ++
 spec/classes/mod/fcgid_spec.rb                 | 2 ++
 spec/classes/mod/http2_spec.rb                 | 2 ++
 spec/classes/mod/info_spec.rb                  | 2 ++
 spec/classes/mod/intercept_form_submit_spec.rb | 2 ++
 spec/classes/mod/itk_spec.rb                   | 2 ++
 spec/classes/mod/jk_spec.rb                    | 2 ++
 spec/classes/mod/ldap_spec.rb                  | 2 ++
 spec/classes/mod/lookup_identity.rb            | 2 ++
 spec/classes/mod/md_spec.rb                    | 2 ++
 spec/classes/mod/mime_magic_spec.rb            | 2 ++
 spec/classes/mod/mime_spec.rb                  | 2 ++
 spec/classes/mod/negotiation_spec.rb           | 2 ++
 spec/classes/mod/pagespeed_spec.rb             | 2 ++
 spec/classes/mod/passenger_spec.rb             | 2 ++
 spec/classes/mod/perl_spec.rb                  | 2 ++
 spec/classes/mod/peruser_spec.rb               | 2 ++
 spec/classes/mod/php_spec.rb                   | 2 ++
 spec/classes/mod/prefork_spec.rb               | 2 ++
 spec/classes/mod/proxy_balancer_spec.rb        | 2 ++
 spec/classes/mod/proxy_connect_spec.rb         | 2 ++
 spec/classes/mod/proxy_html_spec.rb            | 2 ++
 spec/classes/mod/proxy_wstunnel.rb             | 2 ++
 spec/classes/mod/python_spec.rb                | 2 ++
 spec/classes/mod/remoteip_spec.rb              | 2 ++
 spec/classes/mod/reqtimeout_spec.rb            | 2 ++
 spec/classes/mod/rpaf_spec.rb                  | 2 ++
 spec/classes/mod/security_spec.rb              | 1 +
 spec/classes/mod/shib_spec.rb                  | 2 ++
 spec/classes/mod/speling_spec.rb               | 2 ++
 spec/classes/mod/ssl_spec.rb                   | 2 ++
 spec/classes/mod/status_spec.rb                | 2 ++
 spec/classes/mod/suphp_spec.rb                 | 2 ++
 spec/classes/mod/userdir_spec.rb               | 2 ++
 spec/classes/mod/watchdog_spec.rb              | 2 ++
 spec/classes/mod/worker_spec.rb                | 2 ++
 spec/classes/mod/wsgi_spec.rb                  | 2 ++
 spec/classes/params_spec.rb                    | 2 ++
 spec/classes/service_spec.rb                   | 2 ++
 spec/classes/vhosts_spec.rb                    | 2 ++
 spec/defines/balancer_spec.rb                  | 2 ++
 spec/defines/balancermember_spec.rb            | 2 ++
 spec/defines/custom_config_spec.rb             | 2 ++
 spec/defines/fastcgi_server_spec.rb            | 2 ++
 spec/defines/mod_spec.rb                       | 2 ++
 spec/defines/modsec_link_spec.rb               | 2 ++
 spec/defines/vhost_custom_spec.rb              | 2 ++
 spec/defines/vhost_fragment_spec.rb            | 2 ++
 spec/defines/vhost_spec.rb                     | 2 ++
 spec/functions/bool2httpd_spec.rb              | 2 ++
 spec/functions/pw_hash_spec.rb                 | 2 ++
 spec/spec_helper_local.rb                      | 2 ++
 spec/type_aliases/loglevel_spec.rb             | 2 ++
 spec/unit/apache_version_spec.rb               | 2 ++
 spec/unit/provider/a2mod/gentoo_spec.rb        | 2 ++
 spec/util/_resources/test_metadata_json.rb     | 2 ++
 spec/util/apache_mod_platform_support_spec.rb  | 2 ++
 tasks/init.rb                                  | 2 ++
 util/apache_mod_platform_support.rb            | 2 ++
 109 files changed, 218 insertions(+), 1 deletion(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index ec577ca52c..bb16670dbf 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Facter.add(:apache_version) do
   confine kernel: ['FreeBSD', 'Linux']
   setcode do
diff --git a/lib/puppet/functions/apache/apache_pw_hash.rb b/lib/puppet/functions/apache/apache_pw_hash.rb
index 019db01822..4606ac7312 100644
--- a/lib/puppet/functions/apache/apache_pw_hash.rb
+++ b/lib/puppet/functions/apache/apache_pw_hash.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @summary DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
 Puppet::Functions.create_function(:'apache::apache_pw_hash') do
   dispatch :deprecation_gen do
diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
index a8b2cb473e..1fb71c590c 100644
--- a/lib/puppet/functions/apache/bool2httpd.rb
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @summary
 #   Transform a supposed boolean to On or Off. Passes all other values through.
 #
diff --git a/lib/puppet/functions/apache/pw_hash.rb b/lib/puppet/functions/apache/pw_hash.rb
index 60a41c240f..c56e916b9e 100644
--- a/lib/puppet/functions/apache/pw_hash.rb
+++ b/lib/puppet/functions/apache/pw_hash.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @summary
 #   Hashes a password in a format suitable for htpasswd files read by apache.
 #
diff --git a/lib/puppet/functions/apache_pw_hash.rb b/lib/puppet/functions/apache_pw_hash.rb
index 2fd9cf8292..7aad4400df 100644
--- a/lib/puppet/functions/apache_pw_hash.rb
+++ b/lib/puppet/functions/apache_pw_hash.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @summary DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
 Puppet::Functions.create_function(:apache_pw_hash) do
   dispatch :deprecation_gen do
diff --git a/lib/puppet/functions/bool2httpd.rb b/lib/puppet/functions/bool2httpd.rb
index af5b5c5d55..62569f7bb4 100644
--- a/lib/puppet/functions/bool2httpd.rb
+++ b/lib/puppet/functions/bool2httpd.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @summary DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
 Puppet::Functions.create_function(:bool2httpd) do
   dispatch :deprecation_gen do
diff --git a/lib/puppet/provider/a2mod.rb b/lib/puppet/provider/a2mod.rb
index 747da44a91..7406e01da3 100644
--- a/lib/puppet/provider/a2mod.rb
+++ b/lib/puppet/provider/a2mod.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # a2mod.rb
 class Puppet::Provider::A2mod < Puppet::Provider
   # Fetches the mod provider
diff --git a/lib/puppet/provider/a2mod/a2mod.rb b/lib/puppet/provider/a2mod/a2mod.rb
index 8b18686f8e..3330fd5dcc 100644
--- a/lib/puppet/provider/a2mod/a2mod.rb
+++ b/lib/puppet/provider/a2mod/a2mod.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet/provider/a2mod'
 
 Puppet::Type.type(:a2mod).provide(:a2mod, parent: Puppet::Provider::A2mod) do
diff --git a/lib/puppet/provider/a2mod/gentoo.rb b/lib/puppet/provider/a2mod/gentoo.rb
index d4c0b6d612..c53fbd5b6e 100644
--- a/lib/puppet/provider/a2mod/gentoo.rb
+++ b/lib/puppet/provider/a2mod/gentoo.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet/util/filetype'
 Puppet::Type.type(:a2mod).provide(:gentoo, parent: Puppet::Provider) do
   desc 'Manage Apache 2 modules on Gentoo'
diff --git a/lib/puppet/provider/a2mod/modfix.rb b/lib/puppet/provider/a2mod/modfix.rb
index 59fdc9296a..755c927e45 100644
--- a/lib/puppet/provider/a2mod/modfix.rb
+++ b/lib/puppet/provider/a2mod/modfix.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:a2mod).provide :modfix do
   desc "Dummy provider for A2mod.
   Fake nil resources when there is no crontab binary available. Allows
diff --git a/lib/puppet/provider/a2mod/redhat.rb b/lib/puppet/provider/a2mod/redhat.rb
index 6b063779b7..149a7b909b 100644
--- a/lib/puppet/provider/a2mod/redhat.rb
+++ b/lib/puppet/provider/a2mod/redhat.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet/provider/a2mod'
 
 Puppet::Type.type(:a2mod).provide(:redhat, parent: Puppet::Provider::A2mod) do
diff --git a/lib/puppet/type/a2mod.rb b/lib/puppet/type/a2mod.rb
index 0251698964..da04d7f4d8 100644
--- a/lib/puppet/type/a2mod.rb
+++ b/lib/puppet/type/a2mod.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.newtype(:a2mod) do
   @doc = 'Manage Apache 2 modules'
 
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 1d7b9c1013..cfad4f5faf 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 describe 'apache parameters' do
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index c67afcd811..42a187ef6b 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 describe 'apache ssl' do
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 1a6deac80c..3a204e5fe2 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 describe 'apache class' do
diff --git a/spec/acceptance/custom_config_spec.rb b/spec/acceptance/custom_config_spec.rb
index 52b58fe136..94754240ea 100644
--- a/spec/acceptance/custom_config_spec.rb
+++ b/spec/acceptance/custom_config_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 describe 'apache::custom_config define' do
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 4093ec0b1a..8653aafd59 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 describe 'apache::default_mods class' do
diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index 3405c62d4c..bfe8c34b6b 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 describe 'apache tasks' do
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 9efe7f459d..9832ad4d90 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 case os[:family]
diff --git a/spec/acceptance/mod_apreq2_spec.rb b/spec/acceptance/mod_apreq2_spec.rb
index 19c14ca7e2..0708ea7068 100644
--- a/spec/acceptance/mod_apreq2_spec.rb
+++ b/spec/acceptance/mod_apreq2_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 _apache_hash = apache_settings_hash
 
diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb
index be4bbb7b8b..ef59b6a5b0 100644
--- a/spec/acceptance/mod_authnz_ldap_spec.rb
+++ b/spec/acceptance/mod_authnz_ldap_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 
diff --git a/spec/acceptance/mod_ldap_spec.rb b/spec/acceptance/mod_ldap_spec.rb
index 0fabfe6bcc..2924046a7b 100644
--- a/spec/acceptance/mod_ldap_spec.rb
+++ b/spec/acceptance/mod_ldap_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 
diff --git a/spec/acceptance/mod_md_spec.rb b/spec/acceptance/mod_md_spec.rb
index 5bf0c1dc7d..047c7c5116 100644
--- a/spec/acceptance/mod_md_spec.rb
+++ b/spec/acceptance/mod_md_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 describe 'apache::mod::md', if: mod_supported_on_platform?('apache::mod::md') do
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index ab660f9534..02926df27f 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 6b64d19c5b..d6bc2239f7 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 describe 'prefork_worker_spec.rb', if: mod_supported_on_platform?('apache::mod::event') do
diff --git a/spec/acceptance/service_spec.rb b/spec/acceptance/service_spec.rb
index bcb204c520..d4442fe25b 100644
--- a/spec/acceptance/service_spec.rb
+++ b/spec/acceptance/service_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 describe 'apache::service class' do
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 888376e0f6..2c240b1daf 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 describe 'apache::vhost define' do
diff --git a/spec/acceptance/vhosts_spec.rb b/spec/acceptance/vhosts_spec.rb
index 3051700352..90dc8c99f4 100644
--- a/spec/acceptance/vhosts_spec.rb
+++ b/spec/acceptance/vhosts_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 describe 'apache::vhosts class' do
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index a9a6952685..11865838f4 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache', type: :class do
@@ -620,7 +622,7 @@
       it 'fails' do
         expect {
           catalogue
-        }.to raise_error(Puppet::PreformattedError, %r{Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\]}) # rubocop:disable Metrics/LineLength
+        }.to raise_error(Puppet::PreformattedError, %r{Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\]}) # rubocop:disable Layout/LineLength
       end
     end
     describe 'sendfile On' do
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 7ef4281f84..96ec70aabc 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::dev' do
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index fc0a84f1cb..4974211ce0 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::alias', type: :class do
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index fe64fb3edf..f9686b221a 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::auth_cas', type: :class do
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
index 96b95ba401..fbb0763a50 100644
--- a/spec/classes/mod/auth_gssapi_spec.rb
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::auth_gssapi', type: :class do
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 87177e866f..a4a09dc11d 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::auth_kerb', type: :class do
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index 86dca2754f..1a915a08ed 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::auth_mellon', type: :class do
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index 3f1d640cc8..a0309da8d1 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::auth_openidc', type: :class do
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
index a40fc50490..0f78816f96 100644
--- a/spec/classes/mod/authn_dbd_spec.rb
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::authn_dbd', type: :class do
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index baa76dc237..307b16d795 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::authnz_ldap', type: :class do
diff --git a/spec/classes/mod/authnz_pam_spec.rb b/spec/classes/mod/authnz_pam_spec.rb
index 2438c1c8d3..92bc157bd3 100644
--- a/spec/classes/mod/authnz_pam_spec.rb
+++ b/spec/classes/mod/authnz_pam_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::authnz_pam', type: :class do
diff --git a/spec/classes/mod/cluster_spec.rb b/spec/classes/mod/cluster_spec.rb
index 2862b72598..998ab1d799 100644
--- a/spec/classes/mod/cluster_spec.rb
+++ b/spec/classes/mod/cluster_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::cluster', type: :class do
diff --git a/spec/classes/mod/data_spec.rb b/spec/classes/mod/data_spec.rb
index 7efb3c2aad..226918d7e1 100644
--- a/spec/classes/mod/data_spec.rb
+++ b/spec/classes/mod/data_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::data', type: :class do
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 21d8406c5b..1d773b3b9c 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::dav_svn', type: :class do
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index b32f622675..1770cd6cc3 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # This function is called inside the OS specific contexts
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 9304634452..9294597cf4 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::dev', type: :class do
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index f0774463ed..93d2246f57 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::dir', type: :class do
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 93a6b77494..31ee6cd5d4 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::disk_cache', type: :class do
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
index 6b84192e7c..4af592abe2 100644
--- a/spec/classes/mod/dumpio_spec.rb
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::dumpio', type: :class do
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 368e9561a7..da70fd440c 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::event', type: :class do
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index d79158c0be..c01ca25768 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::expires', type: :class do
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index 78bc0a936a..1d7d4c6dde 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::ext_filter', type: :class do
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 1e054a9f86..702ed0603e 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::fastcgi', type: :class do
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index da091a4195..08205ec45d 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::fcgid', type: :class do
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
index d1a9c4b51f..978eb63f0f 100644
--- a/spec/classes/mod/http2_spec.rb
+++ b/spec/classes/mod/http2_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::http2', type: :class do
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index e61c0b0baf..9ca6654492 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # This function is called inside the OS specific contexts
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
index 1623814594..45045cbd09 100644
--- a/spec/classes/mod/intercept_form_submit_spec.rb
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::intercept_form_submit', type: :class do
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 1c010d4bef..0e7956e5b1 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::itk', type: :class do
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index a8a4d5b9e2..84c09bc57e 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::jk', type: :class do
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index b9cb9dfb35..e95a33cfbc 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::ldap', type: :class do
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
index 5fae97d0e6..33c8017e3e 100644
--- a/spec/classes/mod/lookup_identity.rb
+++ b/spec/classes/mod/lookup_identity.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::lookup_identity', type: :class do
diff --git a/spec/classes/mod/md_spec.rb b/spec/classes/mod/md_spec.rb
index 11fe1599aa..738671d04e 100644
--- a/spec/classes/mod/md_spec.rb
+++ b/spec/classes/mod/md_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::md', type: :class do
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index 6d01ed5f8a..28fcfe03cb 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # This function is called inside the OS specific contexts
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 6fbba65a08..a2b5382439 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # This function is called inside the OS specific conte, :compilexts
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 4d23bf6ab9..63c24acd86 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::negotiation', type: :class do
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index 171b7672f6..a6c2629087 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::pagespeed', type: :class do
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 699cc9bb09..f2c7152aa9 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::passenger', type: :class do
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 0176c16027..ddd004b687 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::perl', type: :class do
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index 0f6a62b335..d5f2a93a1f 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::peruser', type: :class do
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index fa557f24f0..a7d6fe88c4 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::php', type: :class do
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 8554577cbd..fdc8762a9c 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::prefork', type: :class do
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index 8071a696bd..e4b1a72ce8 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # Helper function for testing the contents of `proxy_balancer.conf`
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index 0f39a05bc0..b9fc082ea2 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::proxy_connect', type: :class do
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index b8944ad0ac..c305aa31d2 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::proxy_html', type: :class do
diff --git a/spec/classes/mod/proxy_wstunnel.rb b/spec/classes/mod/proxy_wstunnel.rb
index e332d94f80..4626d539c4 100644
--- a/spec/classes/mod/proxy_wstunnel.rb
+++ b/spec/classes/mod/proxy_wstunnel.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::proxy_wstunnel', type: :class do
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 21e4e42727..a433deb062 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::python', type: :class do
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index bb5215ab08..d9cc055eb3 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::remoteip', type: :class do
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index d86ed20bc9..6dca3cb2d0 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::reqtimeout', type: :class do
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index eb389baa78..a36af731e6 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::rpaf', type: :class do
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index f9967f6d0b..62ea9a618d 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'spec_helper'
 
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index ec9706ca60..a6bbe46bf8 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::shib', type: :class do
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index 1824c72444..f4a34e3fe2 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::speling', type: :class do
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 33b00c4f4a..48f4683fd2 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::ssl', type: :class do
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 440804bb65..5f1ad0f138 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # Helper function for testing the contents of `status.conf`
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
index db4bebd501..4e8a7548db 100644
--- a/spec/classes/mod/suphp_spec.rb
+++ b/spec/classes/mod/suphp_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::suphp', type: :class do
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 9ce731d53d..848dc72544 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::userdir', type: :class do
diff --git a/spec/classes/mod/watchdog_spec.rb b/spec/classes/mod/watchdog_spec.rb
index 42e0c7d206..648357b879 100644
--- a/spec/classes/mod/watchdog_spec.rb
+++ b/spec/classes/mod/watchdog_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::watchdog', type: :class do
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 2ebd5a9709..8ab2090051 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::worker', type: :class do
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 902d6877b4..ba1314ebad 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod::wsgi', type: :class do
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index ad616377a1..ef0c06b5cc 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::params', type: :class do
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 0ade8ef10e..d446f66703 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::service', type: :class do
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
index 319e3df596..673028b8ac 100644
--- a/spec/classes/vhosts_spec.rb
+++ b/spec/classes/vhosts_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::vhosts', type: :class do
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index 4b6f96ec08..7ba64a8a99 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::balancer', type: :define do
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 1e57ca59cb..8458d3f3f3 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::balancermember', type: :define do
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 4b262ef688..9011fd68f3 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::custom_config', type: :define do
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index cd3e1781c6..6a0e7377a8 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::fastcgi::server', type: :define do
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index 2466161107..e4c11af57a 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::mod', type: :define do
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index 3035b71b71..400ae555de 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::security::rule_link', type: :define do
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 05c9183bc5..007481c3af 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::vhost::custom', type: :define do
diff --git a/spec/defines/vhost_fragment_spec.rb b/spec/defines/vhost_fragment_spec.rb
index 2db780d213..886c71f03b 100644
--- a/spec/defines/vhost_fragment_spec.rb
+++ b/spec/defines/vhost_fragment_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::vhost::fragment' do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b970f40001..a6ce2b291b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apache::vhost', type: :define do
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
index fabcf2749e..e3f40af43d 100644
--- a/spec/functions/bool2httpd_spec.rb
+++ b/spec/functions/bool2httpd_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 shared_examples 'apache::bool2httpd function' do
diff --git a/spec/functions/pw_hash_spec.rb b/spec/functions/pw_hash_spec.rb
index 9f34f7d43d..5faf7d43e9 100644
--- a/spec/functions/pw_hash_spec.rb
+++ b/spec/functions/pw_hash_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 shared_examples 'apache::pw_hash function' do
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index d348d87e21..0c6b56b930 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV['COVERAGE'] == 'yes'
   require 'simplecov'
   require 'simplecov-console'
diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb
index ecd09f9a16..265ecc8e61 100644
--- a/spec/type_aliases/loglevel_spec.rb
+++ b/spec/type_aliases/loglevel_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Apache::LogLevel' do
diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/apache_version_spec.rb
index 02461bf261..da4d3f5ec8 100644
--- a/spec/unit/apache_version_spec.rb
+++ b/spec/unit/apache_version_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Facter::Util::Fact do
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index 0255897bd2..48f860b37d 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:a2mod).provider(:gentoo)
diff --git a/spec/util/_resources/test_metadata_json.rb b/spec/util/_resources/test_metadata_json.rb
index b8f64ae564..b03edfcc98 100644
--- a/spec/util/_resources/test_metadata_json.rb
+++ b/spec/util/_resources/test_metadata_json.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 METADATA_JSON = '{
   "name": "puppetlabs-apache",
   "version": "5.4.0",
diff --git a/spec/util/apache_mod_platform_support_spec.rb b/spec/util/apache_mod_platform_support_spec.rb
index e01ae3d5a8..5d9cd84da4 100644
--- a/spec/util/apache_mod_platform_support_spec.rb
+++ b/spec/util/apache_mod_platform_support_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'rspec-puppet-facts'
 require_relative '../../util/apache_mod_platform_support'
diff --git a/tasks/init.rb b/tasks/init.rb
index 1df27bda26..bb82d9aa7e 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -1,4 +1,6 @@
 #!/opt/puppetlabs/puppet/bin/ruby
+# frozen_string_literal: true
+
 require 'json'
 require 'open3'
 require 'puppet'
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb
index 16e0b1aebf..f277b30abd 100644
--- a/util/apache_mod_platform_support.rb
+++ b/util/apache_mod_platform_support.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 # Helper class to facilitate exclusion of tests that use an Apache MOD on platforms it isn't supported on.
 # All Apache MOD classes are defined under 'manifests/mod'. The exclusion should be in the format:

From 78d554a3f06bd669d78358196a646a4822c2e39a Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 16 Dec 2020 13:04:40 +0000
Subject: [PATCH 1737/2267] Add all safe auto corrects

---
 spec/acceptance/itk_spec.rb                   | 2 +-
 spec/acceptance/vhost_spec.rb                 | 2 +-
 spec/spec_helper_acceptance_local.rb          | 2 +-
 spec/unit/provider/a2mod/gentoo_spec.rb       | 2 +-
 spec/util/_resources/test_metadata_json.rb    | 2 +-
 spec/util/apache_mod_platform_support_spec.rb | 2 +-
 util/apache_mod_platform_support.rb           | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 9832ad4d90..2283e00b01 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -7,7 +7,7 @@
   service_name = 'apache2'
   variant = :prefork
 when 'redhat'
-  unless os[:release] =~ %r{^5}
+  unless %r{^5}.match?(os[:release])
     variant = (os[:release].to_i >= 7) ? :prefork : :itk_only
     service_name = 'httpd'
   end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2c240b1daf..8c0079e8b9 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1083,7 +1083,7 @@ class { 'apache': }
       }
     MANIFEST
     it 'applies cleanly' do
-      pp += "\nclass { 'apache::mod::actions': }" if os[:family] =~ %r{debian|suse|ubuntu|sles}
+      pp += "\nclass { 'apache::mod::actions': }" if %r{debian|suse|ubuntu|sles}.match?(os[:family])
       apply_manifest(pp, catch_failures: true)
     end
 
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 2922671e1d..c80aa202bf 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -34,7 +34,7 @@ def print_parsing_errors
   end
   c.before :suite do
     # Make sure selinux is disabled so the tests work.
-    LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if os[:family] =~ %r{redhat|oracle}
+    LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if %r{redhat|oracle}.match?(os[:family])
 
     LitmusHelper.instance.run_shell('puppet module install stahnma/epel')
     pp = <<-PUPPETCODE
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index 48f860b37d..53e1c83fb3 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -10,7 +10,7 @@
   end
 
   [:conf_file, :instances, :modules, :initvars, :conf_file, :clear].each do |method|
-    it "should respond to the class method #{method}" do
+    it "responds to the class method #{method}" do
       expect(provider_class).to respond_to(method)
     end
   end
diff --git a/spec/util/_resources/test_metadata_json.rb b/spec/util/_resources/test_metadata_json.rb
index b03edfcc98..bd333b73dd 100644
--- a/spec/util/_resources/test_metadata_json.rb
+++ b/spec/util/_resources/test_metadata_json.rb
@@ -85,4 +85,4 @@
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#main",
   "template-ref": "heads/main-0-g095317c"
-}'.freeze
+}'
diff --git a/spec/util/apache_mod_platform_support_spec.rb b/spec/util/apache_mod_platform_support_spec.rb
index 5d9cd84da4..1025a866a4 100644
--- a/spec/util/apache_mod_platform_support_spec.rb
+++ b/spec/util/apache_mod_platform_support_spec.rb
@@ -105,7 +105,7 @@
       context 'after parsing the metadata.json' do
         expected_compatible_platform_versions.each do |os, vers|
           vers.each do |ver|
-            it "should state #{os} version #{ver} IS a compatible platform" do
+            it "states #{os} version #{ver} IS a compatible platform" do
               ampc.register_running_platform(family: os, version: ver)
               expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(true)
             end
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb
index f277b30abd..320142fb5d 100644
--- a/util/apache_mod_platform_support.rb
+++ b/util/apache_mod_platform_support.rb
@@ -94,7 +94,7 @@ def extract_os_ver_pairs(line)
     platforms_versions = {}
     os_ver_groups = line.delete(' ').downcase
     # E.g. "debian:5,6;centos:5;sles:11sp1,12;scientific:all;ubuntu:14.04,16.04"
-    if %r{^((?:\w+:(?:(?:\d+(?:\.\d+|sp\d+)?|all),?)+;?)+)$}i =~ os_ver_groups
+    if %r{^((?:\w+:(?:(?:\d+(?:\.\d+|sp\d+)?|all),?)+;?)+)$}i.match?(os_ver_groups)
       os_ver_groups.split(';').each do |os_vers|
         os, vers = os_vers.split(':')
         vers.gsub!(%r{sp\d+}, '') # Remove SP ver as we cannot determine this level of granularity from values from Litmus
@@ -106,7 +106,7 @@ def extract_os_ver_pairs(line)
 
   def process_line(line)
     data = {}
-    return data unless line =~ %r{@note\sUnsupported\splatforms?:\s?|class\sapache::mod}i
+    return data unless %r{@note\sUnsupported\splatforms?:\s?|class\sapache::mod}i.match?(line)
     if (match = %r{@note\sUnsupported\splatforms?:\s?(?<os_vers>.*)$}i.match(line))
       data[:type] = :unsupported_platform_declaration
       data[:value] = match[:os_vers]

From ea20a6d9944ae7159bc60081294281c054645e7f Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 16 Dec 2020 16:02:01 +0000
Subject: [PATCH 1738/2267] Apply remaining rubocop fixes

---
 .rubocop.yml                                  |   5 +
 .sync.yml                                     |   2 +
 spec/acceptance/apache_ssl_spec.rb            |   2 +-
 spec/acceptance/mod_php_spec.rb               |   6 +-
 spec/acceptance/vhost_spec.rb                 |   2 +-
 spec/classes/mod/info_spec.rb                 |  12 +-
 spec/classes/mod/security_spec.rb             |  12 +-
 spec/classes/mod/status_spec.rb               |   6 +-
 spec/defines/fastcgi_server_spec.rb           |   9 +-
 spec/defines/vhost_custom_spec.rb             |   2 +
 .../util/fact_apache_version_spec.rb}         |   0
 spec/unit/provider/a2mod/gentoo_spec.rb       | 127 +++++++++---------
 ...apache_mod_platform_compatibility_spec.rb} |   0
 util/apache_mod_platform_support.rb           |   4 +-
 14 files changed, 95 insertions(+), 94 deletions(-)
 rename spec/unit/{apache_version_spec.rb => facter/util/fact_apache_version_spec.rb} (100%)
 rename spec/util/{apache_mod_platform_support_spec.rb => apache_mod_platform_compatibility_spec.rb} (100%)

diff --git a/.rubocop.yml b/.rubocop.yml
index 33c33fa52a..3479f61a76 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -18,6 +18,7 @@ AllCops:
   - "**/Puppetfile"
   - "**/Vagrantfile"
   - "**/Guardfile"
+inherit_from: ".rubocop_todo.yml"
 Layout/LineLength:
   Description: People have wide screens, use them.
   Max: 200
@@ -89,6 +90,8 @@ Performance/CaseWhenSplat:
 Performance/Casecmp:
   Enabled: true
 Performance/CollectionLiteralInLoop:
+  Exclude:
+  - spec/**/*
   Enabled: true
 Performance/CompareWithBlock:
   Enabled: true
@@ -308,6 +311,8 @@ Metrics/PerceivedComplexity:
   Enabled: false
 Migration/DepartmentName:
   Enabled: false
+Naming/AccessorMethodName:
+  Enabled: false
 Naming/BlockParameterName:
   Enabled: false
 Naming/HeredocDelimiterCase:
diff --git a/.sync.yml b/.sync.yml
index c98af8dc77..76e371572f 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,6 +1,8 @@
 ---
 ".gitlab-ci.yml":
   delete: true
+".rubocop.yml":
+  include_todos: true
 ".travis.yml":
   global_env:
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 42a187ef6b..4645db4df0 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -23,7 +23,7 @@ class { 'apache':
 
     describe file("#{apache_hash['mod_ssl_dir']}/ssl.conf") do
       it { is_expected.to be_file }
-      if os[:family] =~ %r{redhat} && os[:release].to_i == 8
+      if os[:family].include?(redhat) && os[:release].to_i == 8
         it { is_expected.to contain 'SSLProtocol all' }
       else
         it { is_expected.to contain 'SSLProtocol all -SSLv2 -SSLv3' }
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 02926df27f..b95f738542 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -25,11 +25,11 @@ class { 'apache::mod::php': }
     end
 
     if (os[:family] == 'ubuntu' && os[:release] == '16.04') ||
-       (os[:family] == 'debian' && os[:release] =~ %r{9})
+       (os[:family] == 'debian' && os[:release] =~ %r{^9\.})
       describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
-    elsif os[:family] == 'debian' && os[:release] =~ %r{10}
+    elsif os[:family] == 'debian' && os[:release] =~ %r{^10\.}
       describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
@@ -41,7 +41,7 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
-    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8}
+    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8\.}
       describe file("#{apache_hash['mod_dir']}/php7.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 8c0079e8b9..5ddf6df382 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -51,7 +51,7 @@ class { 'apache': }
     end
   end
 
-  context 'default vhost with ssl', unless: (os[:family] =~ %r{redhat} && os[:release].to_i == 8) do
+  context 'default vhost with ssl', unless: (os[:family].inclde?(redhat) && os[:release].to_i == 8) do
     pp = <<-MANIFEST
       file { '#{apache_hash['run_dir']}':
         ensure  => 'directory',
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 9ca6654492..5dc70f7139 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # This function is called inside the OS specific contexts
-def general_info_specs_22
+def general_info_specs_apache22
   it { is_expected.to contain_apache__mod('info') }
 
   context 'passing no parameters' do
@@ -64,7 +64,7 @@ def general_info_specs_22
   end
 end
 
-def general_info_specs_24
+def general_info_specs_apache24
   it { is_expected.to contain_apache__mod('info') }
 
   context 'passing no parameters' do
@@ -138,7 +138,7 @@ def general_info_specs_24
     end
 
     # Load the more generic tests for this context
-    general_info_specs_22
+    general_info_specs_apache22
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
@@ -164,7 +164,7 @@ def general_info_specs_24
     end
 
     # Load the more generic tests for this context
-    general_info_specs_22
+    general_info_specs_apache22
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
@@ -186,7 +186,7 @@ def general_info_specs_24
     end
 
     # Load the more generic tests for this context
-    general_info_specs_24
+    general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
@@ -208,7 +208,7 @@ def general_info_specs_24
     end
 
     # Load the more generic tests for this context
-    general_info_specs_24
+    general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 62ea9a618d..50e9986aa2 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -24,21 +24,17 @@
               lib: 'mod_unique_id.so',
             )
           }
+
           it { is_expected.to contain_package('mod_security_crs') }
-          if facts[:os]['release']['major'].to_i > 6 && facts[:os]['release']['major'].to_i <= 7
-            it {
-              is_expected.to contain_file('security.conf').with(
-                path: '/etc/httpd/conf.modules.d/security.conf',
-              )
-            }
-          end
-          if facts[:os]['release']['major'].to_i >= 8
+
+          if (facts[:os]['release']['major'].to_i > 6 && facts[:os]['release']['major'].to_i <= 7) || (facts[:os]['release']['major'].to_i >= 8)
             it {
               is_expected.to contain_file('security.conf').with(
                 path: '/etc/httpd/conf.modules.d/security.conf',
               )
             }
           end
+
           it {
             is_expected.to contain_file('security.conf')
               .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 5f1ad0f138..f4741a9991 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -18,7 +18,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
     "    # Show Proxy LoadBalancer status in mod_status\n"\
     "    ProxyStatus On\n"\
     "</IfModule>\n"
-  it do
+  it('status conf') do
     is_expected.to contain_file('status.conf').with_content(expected)
   end
 end
@@ -59,7 +59,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
     "    # Show Proxy LoadBalancer status in mod_status\n"\
     "    ProxyStatus On\n"\
     "</IfModule>\n"
-  it do
+  it('status conf require') do
     is_expected.to contain_file('status.conf').with_content(expected)
   end
 end
@@ -251,6 +251,8 @@ def status_conf_spec_require(requires, extended_status, status_path)
         }
       end
 
+      it { is_expected.to compile }
+
       status_conf_spec(['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status')
     end
 
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 6a0e7377a8..44ba4dd8d9 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -28,7 +28,7 @@
             path: "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf",
           )
         }
-      when 'Debian'
+      when 'Debian', 'Gentoo'
         it {
           is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
             ensure: 'file',
@@ -42,13 +42,6 @@
             path: "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf",
           )
         }
-      when 'Gentoo'
-        it {
-          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-            ensure: 'file',
-            path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
-          )
-        }
       end
 
       describe 'os-independent items' do
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 007481c3af..962e12da3e 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -27,6 +27,8 @@
       end
       let(:params) { default_params }
       let(:facts) { default_facts }
+
+      it { is_expected.to compile }
     end
     context 'on Debian based systems' do
       let :default_facts do
diff --git a/spec/unit/apache_version_spec.rb b/spec/unit/facter/util/fact_apache_version_spec.rb
similarity index 100%
rename from spec/unit/apache_version_spec.rb
rename to spec/unit/facter/util/fact_apache_version_spec.rb
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
index 53e1c83fb3..2fb48f34a1 100644
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ b/spec/unit/provider/a2mod/gentoo_spec.rb
@@ -51,127 +51,128 @@
     end
   end
   describe 'when flushing' do
+    let(:filetype) { double }
+    let(:info) { double }
+    let(:mpm) { double }
+    let(:ssl) { double }
+
     before :each do
-      @filetype = double
-      allow(@filetype).to receive(:backup)
-      allow(provider_class).to receive(:filetype).at_least(:once) { @filetype }
+      allow(filetype).to receive(:backup)
+      allow(provider_class).to receive(:filetype).at_least(:once) { filetype }
 
-      @info = double
-      allow(@info).to receive(:[]).with(:name) { 'info' }
-      allow(@info).to receive(:provider=)
+      allow(info).to receive(:[]).with(:name) { 'info' }
+      allow(info).to receive(:provider=)
 
-      @mpm = double
-      allow(@mpm).to receive(:[]).with(:name) { 'mpm' }
-      allow(@mpm).to receive(:provider=)
+      allow(mpm).to receive(:[]).with(:name) { 'mpm' }
+      allow(mpm).to receive(:provider=)
 
-      @ssl = double
-      allow(@ssl).to receive(:[]).with(:name) { 'ssl' }
-      allow(@ssl).to receive(:provider=)
+      allow(ssl).to receive(:[]).with(:name) { 'ssl' }
+      allow(ssl).to receive(:provider=)
     end
     it 'adds modules whose ensure is present' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
-      expect(@filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO"))
+      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
+      expect(filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO"))
 
-      allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => @info)
+      allow(info).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('info' => info)
 
       provider_class.flush
     end
     it 'removes modules whose ensure is present' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO") }
-      expect(@filetype).to receive(:write).with(%(APACHE2_OPTS=""))
+      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO") }
+      expect(filetype).to receive(:write).with(%(APACHE2_OPTS=""))
 
-      allow(@info).to receive(:should).with(:ensure) { :absent }
-      allow(@info).to receive(:provider=)
-      provider_class.prefetch('info' => @info)
+      allow(info).to receive(:should).with(:ensure) { :absent }
+      allow(info).to receive(:provider=)
+      provider_class.prefetch('info' => info)
 
       provider_class.flush
     end
 
     it 'does not modify providers without resources' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO -D MPM") }
-      expect(@filetype).to receive(:write).with(%(APACHE2_OPTS="-D MPM -D SSL"))
+      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO -D MPM") }
+      expect(filetype).to receive(:write).with(%(APACHE2_OPTS="-D MPM -D SSL"))
 
-      allow(@info).to receive(:should).with(:ensure) { :absent }
-      provider_class.prefetch('info' => @info)
+      allow(info).to receive(:should).with(:ensure) { :absent }
+      provider_class.prefetch('info' => info)
 
-      allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => @ssl)
+      allow(ssl).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('ssl' => ssl)
 
       provider_class.flush
     end
 
     it 'writes the modules in sorted order' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
-      expect(@filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO -D MPM -D SSL"))
+      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
+      expect(filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO -D MPM -D SSL"))
 
-      allow(@mpm).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('mpm' => @mpm)
-      allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => @info)
-      allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => @ssl)
+      allow(mpm).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('mpm' => mpm)
+      allow(info).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('info' => info)
+      allow(ssl).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('ssl' => ssl)
 
       provider_class.flush
     end
 
     it 'writes the records back once' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
-      expect(@filetype).to receive(:write).once.with(%(APACHE2_OPTS="-D INFO -D SSL"))
+      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
+      expect(filetype).to receive(:write).once.with(%(APACHE2_OPTS="-D INFO -D SSL"))
 
-      allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => @info)
+      allow(info).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('info' => info)
 
-      allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => @ssl)
+      allow(ssl).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('ssl' => ssl)
 
       provider_class.flush
     end
 
     it 'onlies modify the line containing APACHE2_OPTS' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(# Comment\nAPACHE2_OPTS=""\n# Another comment) }
-      expect(@filetype).to receive(:write).once.with(%(# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment))
+      expect(filetype).to receive(:read).at_least(:once) { %(# Comment\nAPACHE2_OPTS=""\n# Another comment) }
+      expect(filetype).to receive(:write).once.with(%(# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment))
 
-      allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => @info)
+      allow(info).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('info' => info)
       provider_class.flush
     end
 
     it 'restores any arbitrary arguments' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-Y -D MPM -X") }
-      expect(@filetype).to receive(:write).once.with(%(APACHE2_OPTS="-Y -X -D INFO -D MPM"))
+      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-Y -D MPM -X") }
+      expect(filetype).to receive(:write).once.with(%(APACHE2_OPTS="-Y -X -D INFO -D MPM"))
 
-      allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => @info)
+      allow(info).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('info' => info)
       provider_class.flush
     end
 
     it 'backups the file once if changes were made' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
-      expect(@filetype).to receive(:write).once.with(%(APACHE2_OPTS="-D INFO -D SSL"))
+      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
+      expect(filetype).to receive(:write).once.with(%(APACHE2_OPTS="-D INFO -D SSL"))
 
-      allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => @info)
+      allow(info).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('info' => info)
 
-      allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => @ssl)
+      allow(ssl).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('ssl' => ssl)
 
-      expect(@filetype).to receive(:backup)
+      expect(filetype).to receive(:backup)
 
       provider_class.flush
     end
 
     it 'does not write the file or run backups if no changes were made' do
-      expect(@filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-X -D INFO -D SSL -Y") }
-      expect(@filetype).to receive(:write).never
+      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-X -D INFO -D SSL -Y") }
+      expect(filetype).to receive(:write).never
 
-      allow(@info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => @info)
+      allow(info).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('info' => info)
 
-      allow(@ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => @ssl)
+      allow(ssl).to receive(:should).with(:ensure) { :present }
+      provider_class.prefetch('ssl' => ssl)
 
-      expect(@filetype).to receive(:backup).never
+      expect(filetype).to receive(:backup).never
       provider_class.flush
     end
   end
diff --git a/spec/util/apache_mod_platform_support_spec.rb b/spec/util/apache_mod_platform_compatibility_spec.rb
similarity index 100%
rename from spec/util/apache_mod_platform_support_spec.rb
rename to spec/util/apache_mod_platform_compatibility_spec.rb
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb
index 320142fb5d..5c608cf53d 100644
--- a/util/apache_mod_platform_support.rb
+++ b/util/apache_mod_platform_support.rb
@@ -69,7 +69,7 @@ def print_parsing_errors
   end
 
   def valid_os?(os)
-    @compatible_platform_versions.keys.include? os
+    @compatible_platform_versions.key?(os)
   end
 
   def register_error(manifest, line_num, error_type, error_detail)
@@ -77,7 +77,7 @@ def register_error(manifest, line_num, error_type, error_detail)
   end
 
   def register_unsupported_platforms(manifest, line_num, mod, platforms_versions)
-    platforms_versions.keys.each do |os|
+    platforms_versions.each_key do |os|
       unless valid_os?(os)
         register_error(manifest, line_num, :os_parse, os)
         next

From 6005e2d1e6d2357a562f5786b69c28879f4edea6 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 4 Jan 2021 11:10:40 +0000
Subject: [PATCH 1739/2267] Fix typos

---
 spec/acceptance/apache_ssl_spec.rb | 2 +-
 spec/acceptance/vhost_spec.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 4645db4df0..416b31f73b 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -23,7 +23,7 @@ class { 'apache':
 
     describe file("#{apache_hash['mod_ssl_dir']}/ssl.conf") do
       it { is_expected.to be_file }
-      if os[:family].include?(redhat) && os[:release].to_i == 8
+      if os[:family].include?('redhat') && os[:release].to_i == 8
         it { is_expected.to contain 'SSLProtocol all' }
       else
         it { is_expected.to contain 'SSLProtocol all -SSLv2 -SSLv3' }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 5ddf6df382..1b8250c00e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -51,7 +51,7 @@ class { 'apache': }
     end
   end
 
-  context 'default vhost with ssl', unless: (os[:family].inclde?(redhat) && os[:release].to_i == 8) do
+  context 'default vhost with ssl', unless: (os[:family].include?('redhat') && os[:release].to_i == 8) do
     pp = <<-MANIFEST
       file { '#{apache_hash['run_dir']}':
         ensure  => 'directory',

From 341bc2fcc49e5b2d45b61750703f95a8b79ef70e Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 11 Jan 2021 13:05:25 +0000
Subject: [PATCH 1740/2267] (MAINT) Perform pdk update

This was primarily done to add the following line to the Rakefile:
`FastGettext.default_text_domain = 'default-text-domain'` and
prevent syntax checks failing because of the text domain is not
set (which generates a return code of 1).
---
 .sync.yml | 3 +++
 Rakefile  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index 76e371572f..e5558234e6 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -50,3 +50,6 @@ spec/spec_helper.rb:
   unmanaged: false
 .github/workflows/pr_test.yml:
   unmanaged: false
+Rakefile:
+  extras:
+    "FastGettext.default_text_domain = 'default-text-domain'"
diff --git a/Rakefile b/Rakefile
index 0a5093b33a..e66cbd3730 100644
--- a/Rakefile
+++ b/Rakefile
@@ -85,3 +85,4 @@ EOM
   end
 end
 
+FastGettext.default_text_domain = 'default-text-domain'

From 2152f7496b398835f5c5059ccb4c12889fdf80ee Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 5 Jan 2021 17:16:38 +0100
Subject: [PATCH 1741/2267] Correct Ubuntu 16.04 packages

This corrects some module packages for Ubuntu 16.04. suphp was actually
removed. The other packages are transitional packages. Using the modern
ones aligns them with newer versions. It also greatly simplifies the
params code.
---
 manifests/params.pp | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index d0201f05b2..bad6f3e5f7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -389,9 +389,10 @@
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
-    } elsif ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
+    } else {
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
+        '16.04' => '7.0', # Ubuntu Xenial
         '10'    => '7.3', # Debian Buster
         '20.04' => '7.4', # Ubuntu Foccal Fossal
         default => '7.2', # Ubuntu Bionic, Cosmic and Disco
@@ -423,36 +424,6 @@
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
-    } else {
-      # Ubuntu Xenial
-      $php_version = '7.0'
-      $mod_packages = {
-        'auth_cas'              => 'libapache2-mod-auth-cas',
-        'auth_kerb'             => 'libapache2-mod-auth-kerb',
-        'auth_openidc'          => 'libapache2-mod-auth-openidc',
-        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
-        'auth_mellon'           => 'libapache2-mod-auth-mellon',
-        'authnz_pam'            => 'libapache2-mod-authnz-pam',
-        'dav_svn'               => 'libapache2-svn',
-        'fastcgi'               => 'libapache2-mod-fastcgi',
-        'fcgid'                 => 'libapache2-mod-fcgid',
-        'geoip'                 => 'libapache2-mod-geoip',
-        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
-        'jk'                    => 'libapache2-mod-jk',
-        'lookup_identity'       => 'libapache2-mod-lookup-identity',
-        'nss'                   => 'libapache2-mod-nss',
-        'pagespeed'             => 'mod-pagespeed-stable',
-        'passenger'             => 'libapache2-mod-passenger',
-        'perl'                  => 'libapache2-mod-perl2',
-        'phpXXX'                => 'libapache2-mod-phpXXX',
-        'python'                => 'libapache2-mod-python',
-        'rpaf'                  => 'libapache2-mod-rpaf',
-        'security'              => 'libapache2-modsecurity',
-        'shib2'                 => 'libapache2-mod-shib2',
-        'suphp'                 => 'libapache2-mod-suphp',
-        'wsgi'                  => 'libapache2-mod-wsgi',
-        'xsendfile'             => 'libapache2-mod-xsendfile',
-      }
     }
     $error_log           = 'error.log'
     $scriptalias         = '/usr/lib/cgi-bin'

From 48f8ffa472650520caed0e99e9824837836b3f29 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 5 Jan 2021 20:01:54 +0100
Subject: [PATCH 1742/2267] (maint) - Use the correct matches in rspec

Rather than checking the notify/require properties, it uses the matchers
that check the dependency graph. That means it can also check transitive
requires/notifies.

It also uses compile and compile.and_raise_error as a shorter way to
check for errors (or the absense of them).
---
 spec/classes/apache_spec.rb          | 79 +++++++++++-----------------
 spec/classes/mod/authnz_ldap_spec.rb |  4 +-
 spec/classes/mod/data_spec.rb        |  4 +-
 spec/classes/mod/peruser_spec.rb     |  6 +--
 spec/classes/mod/php_spec.rb         |  2 +-
 spec/classes/mod/remoteip_spec.rb    |  2 +-
 spec/classes/mod/ssl_spec.rb         |  2 +-
 spec/classes/mod/status_spec.rb      | 16 ++----
 spec/classes/mod/wsgi_spec.rb        |  4 +-
 9 files changed, 44 insertions(+), 75 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 11865838f4..ba858ae0b6 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -35,29 +35,26 @@
     it {
       is_expected.to contain_file('/etc/apache2/sites-enabled').with(
         'ensure' => 'directory', 'recurse' => 'true',
-        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      )
+        'purge' => 'true'
+      ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
     it {
       is_expected.to contain_file('/etc/apache2/mods-enabled').with(
         'ensure' => 'directory', 'recurse' => 'true',
-        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      )
+        'purge' => 'true'
+      ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
     it {
       is_expected.to contain_file('/etc/apache2/mods-available').with(
         'ensure' => 'directory', 'recurse' => 'true',
-        'purge' => 'false', 'notify' => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      )
+        'purge' => 'false'
+      ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
-        'mode' => '0644', 'notify' => 'Class[Apache::Service]'
-      )
+        'mode' => '0644'
+      ).that_notifies('Class[Apache::Service]')
     }
     # Assert that load files are placed and symlinked for these mods, but no conf file.
     ['auth_basic', 'authn_file', 'authz_default', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
@@ -313,15 +310,14 @@
     it {
       is_expected.to contain_file('/etc/httpd/conf.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
-        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      )
+        'purge' => 'true'
+      ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
     it {
       is_expected.to contain_concat('/etc/httpd/conf/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
-        'mode' => '0644', 'notify' => 'Class[Apache::Service]'
-      )
+        'mode' => '0644'
+      ).that_notifies('Class[Apache::Service]')
     }
     describe 'Alternate confd/mod/vhosts directory' do
       let :params do
@@ -336,9 +332,8 @@
         it {
           is_expected.to contain_file("/etc/httpd/#{dir}").with(
             'ensure' => 'directory', 'recurse' => 'true',
-            'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-            'require' => 'Package[httpd]'
-          )
+            'purge' => 'true'
+          ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
         }
       end
 
@@ -509,9 +504,7 @@
       it {
         is_expected.to contain_file('/opt/rh/root/etc/httpd/conf/httpd.conf').with(
           'ensure'  => 'file',
-          'notify'  => 'Class[Apache::Service]',
-          'require' => ['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'],
-        )
+        ).that_notifies('Class[Apache::Service]').that_requires(['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'])
       }
     end
 
@@ -523,9 +516,8 @@
       it {
         is_expected.to contain_file('/etc/httpd/special_conf.d').with(
           'ensure' => 'directory', 'recurse' => 'true',
-          'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-          'require' => 'Package[httpd]'
-        )
+          'purge' => 'true',
+        ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
       }
     end
 
@@ -729,22 +721,20 @@
     it {
       is_expected.to contain_file('/usr/local/etc/apache24/Vhosts').with(
         'ensure' => 'directory', 'recurse' => 'true',
-        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      )
+        'purge' => 'true'
+      ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
     it {
       is_expected.to contain_file('/usr/local/etc/apache24/Modules').with(
         'ensure' => 'directory', 'recurse' => 'true',
-        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      )
+        'purge' => 'true'
+      ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
     it {
       is_expected.to contain_concat('/usr/local/etc/apache24/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
-        'mode' => '0644', 'notify' => 'Class[Apache::Service]'
-      )
+        'mode' => '0644',
+      ).that_notifies('Class[Apache::Service]')
     }
     # Assert that load files are placed for these mods, but no conf file.
     ['auth_basic', 'authn_core', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
@@ -798,22 +788,20 @@
     it {
       is_expected.to contain_file('/etc/apache2/vhosts.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
-        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      )
+        'purge' => 'true'
+      ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
     it {
       is_expected.to contain_file('/etc/apache2/modules.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
-        'purge' => 'true', 'notify' => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      )
+        'purge' => 'true'
+      ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
-        'mode' => '0644', 'notify' => 'Class[Apache::Service]'
-      )
+        'mode' => '0644',
+      ).that_notifies('Class[Apache::Service]')
     }
   end
   context 'on all OSes' do
@@ -838,10 +826,9 @@
 
       it {
         is_expected.to contain_package('httpd').with(
-          'notify' => 'Class[Apache::Service]',
           'ensure' => 'installed',
           'name'   => 'httpd24-httpd',
-        )
+        ).that_notifies('Class[Apache::Service]')
       }
     end
     context 'with a custom file_mode parameter' do
@@ -919,10 +906,6 @@
         is_pe: false }
     end
 
-    it do
-      expect {
-        catalogue
-      }.to raise_error(Puppet::Error, %r{Unsupported osfamily})
-    end
+    it { is_expected.to compile.and_raise_error(%r{Unsupported osfamily}) }
   end
 end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index 307b16d795..e6ecc50f03 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -37,7 +37,7 @@
       let(:params) { { verify_server_cert: 'wrong' } }
 
       it 'raises an error' do
-        expect { is_expected.to raise_error Puppet::Error }
+        is_expected.to compile.and_raise_error(%r{parameter 'verify_server_cert' expects a Boolean value, got String})
       end
     end
   end # Debian
@@ -74,7 +74,7 @@
           let(:params) { { verify_server_cert: 'wrong' } }
 
           it 'raises an error' do
-            expect { is_expected.to raise_error Puppet::Error }
+            is_expected.to compile.and_raise_error(%r{parameter 'verify_server_cert' expects a Boolean value, got String})
           end
         end
 
diff --git a/spec/classes/mod/data_spec.rb b/spec/classes/mod/data_spec.rb
index 226918d7e1..4511996f4f 100644
--- a/spec/classes/mod/data_spec.rb
+++ b/spec/classes/mod/data_spec.rb
@@ -26,9 +26,7 @@
         { apache_version: '2.2' }
       end
 
-      it 'fails' do
-        expect { catalogue }.to raise_error(Puppet::Error, %r{mod_data is only available in Apache 2.3 and later})
-      end
+      it { is_expected.to compile.and_raise_error(%r{mod_data is only available in Apache 2.3 and later}) }
     end
   end
 end
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index d5f2a93a1f..2533a28bab 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -20,11 +20,7 @@
       }
     end
 
-    it do
-      expect {
-        catalogue
-      }.to raise_error(Puppet::Error, %r{Unsupported osfamily FreeBSD})
-    end
+    it { is_expected.to compile.and_raise_error(%r{Unsupported osfamily FreeBSD}) }
   end
   context 'on a Gentoo OS' do
     let :facts do
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index a7d6fe88c4..05a6de020f 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -292,7 +292,7 @@
           end
 
           it 'raises an error' do
-            expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, %r{mpm_module => 'prefork' or mpm_module => 'itk'}
+            is_expected.to compile.and_raise_error(%r{mpm_module => 'prefork' or mpm_module => 'itk'})
           end
         end
       end
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index d9cc055eb3..3de472cbc9 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -119,7 +119,7 @@
         { apache_version: '2.2' }
       end
 
-      it { expect { catalogue }.to raise_error(Puppet::Error, %r{mod_remoteip is only available in Apache 2.4}) }
+      it { is_expected.to compile.and_raise_error(%r{mod_remoteip is only available in Apache 2.4}) }
     end
   end
 end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 48f4683fd2..36972364ca 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -17,7 +17,7 @@
       }
     end
 
-    it { expect { catalogue }.to raise_error(Puppet::Error, %r{Unsupported osfamily:}) }
+    it { is_expected.to compile.and_raise_error(%r{Unsupported osfamily:}) }
   end
 
   context 'on a RedHat' do
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index f4741a9991..11fb459935 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -274,9 +274,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
       end
 
       it 'expects to succeed array validation' do
-        expect {
-          is_expected.to contain_file('status.conf')
-        }.not_to raise_error
+        is_expected.to compile
       end
     end
 
@@ -297,9 +295,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
       end
 
       it 'expects to fail array validation' do
-        expect {
-          is_expected.to contain_file('status.conf')
-        }.to raise_error(Puppet::Error)
+        is_expected.to compile.and_raise_error(/allow_from/)
       end
     end
 
@@ -323,9 +319,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
         end
 
         it 'expects to succeed regular expression validation' do
-          expect {
-            is_expected.to contain_file('status.conf')
-          }.not_to raise_error
+          is_expected.to compile
         end
       end
     end
@@ -348,9 +342,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
         end
 
         it 'expects to fail regular expression validation' do
-          expect {
-            is_expected.to contain_file('status.conf')
-          }.to raise_error(Puppet::Error)
+          is_expected.to compile.and_raise_error(/extended_status/)
         end
       end
     end
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index ba1314ebad..fb018099cd 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -128,7 +128,7 @@
         }
       end
 
-      it { expect { catalogue }.to raise_error Puppet::Error, %r{apache::mod::wsgi - both package_name and mod_path must be specified!} }
+      it { is_expected.to compile.and_raise_error(%r{apache::mod::wsgi - both package_name and mod_path must be specified!}) }
     end
     describe 'with mod_path but no package_name' do
       let :params do
@@ -137,7 +137,7 @@
         }
       end
 
-      it { expect { catalogue }.to raise_error Puppet::Error, %r{apache::mod::wsgi - both package_name and mod_path must be specified!} }
+      it { is_expected.to compile.and_raise_error(%r{apache::mod::wsgi - both package_name and mod_path must be specified!}) }
     end
   end
   context 'on a FreeBSD OS' do

From 16a4cfdb03ff6ba9212c73973bab8d5b07d8522c Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Mon, 25 Jan 2021 09:48:55 +0000
Subject: [PATCH 1743/2267] (maint) - minor Rubocop fixes

---
 spec/classes/apache_spec.rb     | 8 ++++----
 spec/classes/mod/status_spec.rb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index ba858ae0b6..f6a14c9747 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -503,7 +503,7 @@
 
       it {
         is_expected.to contain_file('/opt/rh/root/etc/httpd/conf/httpd.conf').with(
-          'ensure'  => 'file',
+          'ensure' => 'file',
         ).that_notifies('Class[Apache::Service]').that_requires(['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'])
       }
     end
@@ -516,7 +516,7 @@
       it {
         is_expected.to contain_file('/etc/httpd/special_conf.d').with(
           'ensure' => 'directory', 'recurse' => 'true',
-          'purge' => 'true',
+          'purge' => 'true'
         ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
       }
     end
@@ -733,7 +733,7 @@
     it {
       is_expected.to contain_concat('/usr/local/etc/apache24/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
-        'mode' => '0644',
+        'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
     }
     # Assert that load files are placed for these mods, but no conf file.
@@ -800,7 +800,7 @@
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
-        'mode' => '0644',
+        'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
     }
   end
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 11fb459935..5db47bb4c6 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -295,7 +295,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
       end
 
       it 'expects to fail array validation' do
-        is_expected.to compile.and_raise_error(/allow_from/)
+        is_expected.to compile.and_raise_error(%r{allow_from})
       end
     end
 
@@ -342,7 +342,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
         end
 
         it 'expects to fail regular expression validation' do
-          is_expected.to compile.and_raise_error(/extended_status/)
+          is_expected.to compile.and_raise_error(%r{extended_status})
         end
       end
     end

From b1c08dd67904caf740d02c795f718301e92263ff Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Mon, 25 Jan 2021 14:40:40 +0000
Subject: [PATCH 1744/2267] Release version 5.9.0

---
 CHANGELOG.md  |   17 +-
 REFERENCE.md  | 3300 +++++++++++++++++++++++++++++++++----------------
 metadata.json |    2 +-
 3 files changed, 2282 insertions(+), 1037 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53d1c21b93..0b5ee020d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.9.0) (2021-01-25)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.8.0...v5.9.0)
+
+### Added
+
+- Add ssl\_user\_name vhost parameter [\#2093](https://github.com/puppetlabs/puppetlabs-apache/pull/2093) ([bodgit](https://github.com/bodgit))
+- Add support for mod\_md [\#2090](https://github.com/puppetlabs/puppetlabs-apache/pull/2090) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- \(FIX\) Correct PHP packages on Ubuntu 16.04 [\#2111](https://github.com/puppetlabs/puppetlabs-apache/pull/2111) ([ekohl](https://github.com/ekohl))
+
 ## [v5.8.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.8.0) (2020-12-07)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.7.0...v5.8.0)
@@ -101,7 +114,6 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 - \(FM-8672\) - Addition of Support for CentOS 8 [\#1977](https://github.com/puppetlabs/puppetlabs-apache/pull/1977) ([david22swan](https://github.com/david22swan))
-- \(MODULES-9948\) Allow switching of thread modules [\#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
 
 ### Fixed
 
@@ -117,6 +129,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Added
 
+- \(MODULES-9948\) Allow switching of thread modules [\#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
 - Add parameter version for mod security [\#1953](https://github.com/puppetlabs/puppetlabs-apache/pull/1953) ([tuxmea](https://github.com/tuxmea))
 - add possibility to define variables inside VirtualHost definition [\#1947](https://github.com/puppetlabs/puppetlabs-apache/pull/1947) ([trefzer](https://github.com/trefzer))
 
@@ -1347,4 +1360,4 @@ worker/prefork
 [0.0.4]:https://github.com/puppetlabs/puppetlabs-apache/commits/0.0.4
 
 
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/REFERENCE.md b/REFERENCE.md
index d7a4d94110..3d11040707 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -59,6 +59,7 @@
 * [`apache::mod::ldap`](#apachemodldap): Installs and configures `mod_ldap`.
 * [`apache::mod::lookup_identity`](#apachemodlookup_identity): Installs `mod_lookup_identity`
 * [`apache::mod::macro`](#apachemodmacro): Installs `mod_macro`.
+* [`apache::mod::md`](#apachemodmd): Installs and configures `mod_md`.
 * [`apache::mod::mime`](#apachemodmime): Installs and configures `mod_mime`.
 * [`apache::mod::mime_magic`](#apachemodmime_magic): Installs and configures `mod_mime_magic`.
 * [`apache::mod::negotiation`](#apachemodnegotiation): Installs and configures `mod_negotiation`.
@@ -94,6 +95,7 @@
 * [`apache::mod::userdir`](#apachemoduserdir): Installs and configures `mod_userdir`.
 * [`apache::mod::version`](#apachemodversion): Installs `mod_version`.
 * [`apache::mod::vhost_alias`](#apachemodvhost_alias): Installs Apache `mod_vhost_alias`.
+* [`apache::mod::watchdog`](#apachemodwatchdog): Installs and configures `mod_watchdog`.
 * [`apache::mod::worker`](#apachemodworker): Installs and manages the MPM `worker`.
 * [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
 * [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
@@ -166,7 +168,7 @@ Apache server's or a virtual host's listening address and port.
 
 ## Classes
 
-### `apache`
+### <a name="apache"></a>`apache`
 
 When this class is declared with the default options, Puppet:
 - Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
@@ -187,9 +189,96 @@ class { 'apache': }
 
 #### Parameters
 
-The following parameters are available in the `apache` class.
-
-##### `allow_encoded_slashes`
+The following parameters are available in the `apache` class:
+
+* [`allow_encoded_slashes`](#allow_encoded_slashes)
+* [`apache_version`](#apache_version)
+* [`conf_dir`](#conf_dir)
+* [`conf_template`](#conf_template)
+* [`confd_dir`](#confd_dir)
+* [`default_charset`](#default_charset)
+* [`default_confd_files`](#default_confd_files)
+* [`default_mods`](#default_mods)
+* [`default_ssl_ca`](#default_ssl_ca)
+* [`default_ssl_cert`](#default_ssl_cert)
+* [`default_ssl_chain`](#default_ssl_chain)
+* [`default_ssl_crl`](#default_ssl_crl)
+* [`default_ssl_crl_path`](#default_ssl_crl_path)
+* [`default_ssl_crl_check`](#default_ssl_crl_check)
+* [`default_ssl_key`](#default_ssl_key)
+* [`default_ssl_vhost`](#default_ssl_vhost)
+* [`default_type`](#default_type)
+* [`default_vhost`](#default_vhost)
+* [`dev_packages`](#dev_packages)
+* [`docroot`](#docroot)
+* [`error_documents`](#error_documents)
+* [`group`](#group)
+* [`httpd_dir`](#httpd_dir)
+* [`http_protocol_options`](#http_protocol_options)
+* [`keepalive`](#keepalive)
+* [`keepalive_timeout`](#keepalive_timeout)
+* [`max_keepalive_requests`](#max_keepalive_requests)
+* [`hostname_lookups`](#hostname_lookups)
+* [`ldap_trusted_mode`](#ldap_trusted_mode)
+* [`ldap_verify_server_cert`](#ldap_verify_server_cert)
+* [`lib_path`](#lib_path)
+* [`log_level`](#log_level)
+* [`log_formats`](#log_formats)
+* [`logroot`](#logroot)
+* [`logroot_mode`](#logroot_mode)
+* [`manage_group`](#manage_group)
+* [`supplementary_groups`](#supplementary_groups)
+* [`manage_user`](#manage_user)
+* [`mod_dir`](#mod_dir)
+* [`mod_libs`](#mod_libs)
+* [`mod_packages`](#mod_packages)
+* [`mpm_module`](#mpm_module)
+* [`package_ensure`](#package_ensure)
+* [`pidfile`](#pidfile)
+* [`ports_file`](#ports_file)
+* [`protocols`](#protocols)
+* [`protocols_honor_order`](#protocols_honor_order)
+* [`purge_configs`](#purge_configs)
+* [`purge_vhost_dir`](#purge_vhost_dir)
+* [`rewrite_lock`](#rewrite_lock)
+* [`sendfile`](#sendfile)
+* [`serveradmin`](#serveradmin)
+* [`servername`](#servername)
+* [`server_root`](#server_root)
+* [`server_signature`](#server_signature)
+* [`server_tokens`](#server_tokens)
+* [`service_enable`](#service_enable)
+* [`service_ensure`](#service_ensure)
+* [`service_name`](#service_name)
+* [`service_manage`](#service_manage)
+* [`service_restart`](#service_restart)
+* [`timeout`](#timeout)
+* [`trace_enable`](#trace_enable)
+* [`use_canonical_name`](#use_canonical_name)
+* [`use_systemd`](#use_systemd)
+* [`file_mode`](#file_mode)
+* [`root_directory_options`](#root_directory_options)
+* [`root_directory_secured`](#root_directory_secured)
+* [`vhost_dir`](#vhost_dir)
+* [`vhost_include_pattern`](#vhost_include_pattern)
+* [`user`](#user)
+* [`apache_name`](#apache_name)
+* [`error_log`](#error_log)
+* [`scriptalias`](#scriptalias)
+* [`access_log_file`](#access_log_file)
+* [`limitreqfields`](#limitreqfields)
+* [`limitreqfieldsize`](#limitreqfieldsize)
+* [`ip`](#ip)
+* [`purge_vdir`](#purge_vdir)
+* [`conf_enabled`](#conf_enabled)
+* [`vhost_enable_dir`](#vhost_enable_dir)
+* [`mod_enable_dir`](#mod_enable_dir)
+* [`ssl_file`](#ssl_file)
+* [`file_e_tag`](#file_e_tag)
+* [`use_optional_includes`](#use_optional_includes)
+* [`mime_types_additional`](#mime_types_additional)
+
+##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
 
 Data type: `Optional[Enum['on', 'off', 'nodecode']]`
 
@@ -199,7 +288,7 @@ the declaration from the server's configuration and uses Apache's default settin
 
 Default value: ``undef``
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -209,7 +298,7 @@ without reason.
 
 Default value: `$apache::version::default`
 
-##### `conf_dir`
+##### <a name="conf_dir"></a>`conf_dir`
 
 Data type: `Any`
 
@@ -217,7 +306,7 @@ Sets the directory where the Apache server's main configuration file is located.
 
 Default value: `$apache::params::conf_dir`
 
-##### `conf_template`
+##### <a name="conf_template"></a>`conf_template`
 
 Data type: `Any`
 
@@ -227,7 +316,7 @@ configuration file customized by `conf.d` entries.
 
 Default value: `$apache::params::conf_template`
 
-##### `confd_dir`
+##### <a name="confd_dir"></a>`confd_dir`
 
 Data type: `Any`
 
@@ -235,7 +324,7 @@ Sets the location of the Apache server's custom configuration directory.
 
 Default value: `$apache::params::confd_dir`
 
-##### `default_charset`
+##### <a name="default_charset"></a>`default_charset`
 
 Data type: `Any`
 
@@ -243,7 +332,7 @@ Used as the `AddDefaultCharset` directive in the main configuration file.
 
 Default value: ``undef``
 
-##### `default_confd_files`
+##### <a name="default_confd_files"></a>`default_confd_files`
 
 Data type: `Boolean`
 
@@ -254,7 +343,7 @@ operating system.
 
 Default value: ``true``
 
-##### `default_mods`
+##### <a name="default_mods"></a>`default_mods`
 
 Data type: `Any`
 
@@ -270,7 +359,7 @@ If this parameter contains an array, Puppet instead enables all passed Apache mo
 
 Default value: ``true``
 
-##### `default_ssl_ca`
+##### <a name="default_ssl_ca"></a>`default_ssl_ca`
 
 Data type: `Any`
 
@@ -281,7 +370,7 @@ a production environment.
 
 Default value: ``undef``
 
-##### `default_ssl_cert`
+##### <a name="default_ssl_cert"></a>`default_ssl_cert`
 
 Data type: `Any`
 
@@ -291,7 +380,7 @@ parameter with your certificate location before deploying this server in a produ
 
 Default value: `$apache::params::default_ssl_cert`
 
-##### `default_ssl_chain`
+##### <a name="default_ssl_chain"></a>`default_ssl_chain`
 
 Data type: `Any`
 
@@ -301,7 +390,7 @@ this parameter with your SSL chain before deploying this server in a production
 
 Default value: ``undef``
 
-##### `default_ssl_crl`
+##### <a name="default_ssl_crl"></a>`default_ssl_crl`
 
 Data type: `Any`
 
@@ -312,7 +401,7 @@ environment. You can use this parameter with or in place of the `default_ssl_crl
 
 Default value: ``undef``
 
-##### `default_ssl_crl_path`
+##### <a name="default_ssl_crl_path"></a>`default_ssl_crl_path`
 
 Data type: `Any`
 
@@ -322,7 +411,7 @@ this parameter with the CRL file path before deploying this server in a producti
 
 Default value: ``undef``
 
-##### `default_ssl_crl_check`
+##### <a name="default_ssl_crl_check"></a>`default_ssl_crl_check`
 
 Data type: `Any`
 
@@ -333,7 +422,7 @@ this parameter when using certificate revocation lists in a production environme
 
 Default value: ``undef``
 
-##### `default_ssl_key`
+##### <a name="default_ssl_key"></a>`default_ssl_key`
 
 Data type: `Any`
 
@@ -344,7 +433,7 @@ environment.
 
 Default value: `$apache::params::default_ssl_key`
 
-##### `default_ssl_vhost`
+##### <a name="default_ssl_vhost"></a>`default_ssl_vhost`
 
 Data type: `Boolean`
 
@@ -365,7 +454,7 @@ apache::vhost { 'default-ssl':
 
 Default value: ``false``
 
-##### `default_type`
+##### <a name="default_type"></a>`default_type`
 
 Data type: `Any`
 
@@ -375,7 +464,7 @@ newer, and is only for backwards compatibility in configuration files.
 
 Default value: `'none'`
 
-##### `default_vhost`
+##### <a name="default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
 
@@ -387,7 +476,7 @@ to `false` you must configure a virtual host elsewhere.
 
 Default value: ``true``
 
-##### `dev_packages`
+##### <a name="dev_packages"></a>`dev_packages`
 
 Data type: `Any`
 
@@ -403,7 +492,7 @@ class { 'apache':
 
 Default value: `$apache::params::dev_packages`
 
-##### `docroot`
+##### <a name="docroot"></a>`docroot`
 
 Data type: `Any`
 
@@ -411,7 +500,7 @@ Sets the default `DocumentRoot` location.
 
 Default value: `$apache::params::docroot`
 
-##### `error_documents`
+##### <a name="error_documents"></a>`error_documents`
 
 Data type: `Any`
 
@@ -419,7 +508,7 @@ Determines whether to enable [custom error documents](https://httpd.apache.org/d
 
 Default value: ``false``
 
-##### `group`
+##### <a name="group"></a>`group`
 
 Data type: `Any`
 
@@ -434,7 +523,7 @@ process.
 
 Default value: `$apache::params::group`
 
-##### `httpd_dir`
+##### <a name="httpd_dir"></a>`httpd_dir`
 
 Data type: `Any`
 
@@ -444,7 +533,7 @@ with the default distribution packages.
 
 Default value: `$apache::params::httpd_dir`
 
-##### `http_protocol_options`
+##### <a name="http_protocol_options"></a>`http_protocol_options`
 
 Data type: `Any`
 
@@ -454,7 +543,7 @@ Valid options: any sequence of the following alternative values: `Strict` or `Un
 
 Default value: `$apache::params::http_protocol_options`
 
-##### `keepalive`
+##### <a name="keepalive"></a>`keepalive`
 
 Data type: `Any`
 
@@ -464,7 +553,7 @@ to set relevant options.<br />
 
 Default value: `$apache::params::keepalive`
 
-##### `keepalive_timeout`
+##### <a name="keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Any`
 
@@ -474,7 +563,7 @@ only relevant if the `keepalive` parameter is enabled.
 
 Default value: `$apache::params::keepalive_timeout`
 
-##### `max_keepalive_requests`
+##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
 
 Data type: `Any`
 
@@ -482,7 +571,7 @@ Limits the number of requests allowed per connection when the `keepalive` parame
 
 Default value: `$apache::params::max_keepalive_requests`
 
-##### `hostname_lookups`
+##### <a name="hostname_lookups"></a>`hostname_lookups`
 
 Data type: `Enum['Off', 'On', 'Double', 'off', 'on', 'double']`
 
@@ -492,7 +581,7 @@ CGIs/SSIs in REMOTE_HOST.<br />
 
 Default value: `$apache::params::hostname_lookups`
 
-##### `ldap_trusted_mode`
+##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
 
 Data type: `Any`
 
@@ -506,7 +595,7 @@ runtime if a mode is not supported, and the connection to the LDAP server will f
 
 Default value: ``undef``
 
-##### `ldap_verify_server_cert`
+##### <a name="ldap_verify_server_cert"></a>`ldap_verify_server_cert`
 
 Data type: `Any`
 
@@ -516,7 +605,7 @@ On|Off
 
 Default value: ``undef``
 
-##### `lib_path`
+##### <a name="lib_path"></a>`lib_path`
 
 Data type: `Any`
 
@@ -525,7 +614,7 @@ Specifies the location whereApache module files are stored.<br />
 
 Default value: `$apache::params::lib_path`
 
-##### `log_level`
+##### <a name="log_level"></a>`log_level`
 
 Data type: `Apache::LogLevel`
 
@@ -534,7 +623,7 @@ which adjusts the verbosity of the messages recorded in the error logs.
 
 Default value: `$apache::params::log_level`
 
-##### `log_formats`
+##### <a name="log_formats"></a>`log_formats`
 
 Data type: `Any`
 
@@ -554,7 +643,7 @@ If your `log_formats` parameter contains one of those, it will be overwritten wi
 
 Default value: `{}`
 
-##### `logroot`
+##### <a name="logroot"></a>`logroot`
 
 Data type: `Any`
 
@@ -562,7 +651,7 @@ Changes the directory of Apache log files for the virtual host.
 
 Default value: `$apache::params::logroot`
 
-##### `logroot_mode`
+##### <a name="logroot_mode"></a>`logroot_mode`
 
 Data type: `Any`
 
@@ -573,7 +662,7 @@ for details.
 
 Default value: `$apache::params::logroot_mode`
 
-##### `manage_group`
+##### <a name="manage_group"></a>`manage_group`
 
 Data type: `Boolean`
 
@@ -584,7 +673,7 @@ group results in a duplicate resource error.
 
 Default value: ``true``
 
-##### `supplementary_groups`
+##### <a name="supplementary_groups"></a>`supplementary_groups`
 
 Data type: `Any`
 
@@ -593,7 +682,7 @@ Notice: This option only has an effect when `manage_user` is set to true.
 
 Default value: `[]`
 
-##### `manage_user`
+##### <a name="manage_user"></a>`manage_user`
 
 Data type: `Boolean`
 
@@ -604,7 +693,7 @@ user would result in a duplicate resource error.
 
 Default value: ``true``
 
-##### `mod_dir`
+##### <a name="mod_dir"></a>`mod_dir`
 
 Data type: `Any`
 
@@ -612,7 +701,7 @@ Sets where Puppet places configuration files for your Apache modules.
 
 Default value: `$apache::params::mod_dir`
 
-##### `mod_libs`
+##### <a name="mod_libs"></a>`mod_libs`
 
 Data type: `Any`
 
@@ -628,7 +717,7 @@ class { 'apache':
 
 Default value: `$apache::params::mod_libs`
 
-##### `mod_packages`
+##### <a name="mod_packages"></a>`mod_packages`
 
 Data type: `Any`
 
@@ -644,7 +733,7 @@ class { 'apache':
 
 Default value: `$apache::params::mod_packages`
 
-##### `mpm_module`
+##### <a name="mpm_module"></a>`mpm_module`
 
 Data type: `Any`
 
@@ -659,7 +748,7 @@ You must set this to `false` to explicitly declare the following classes with cu
 
 Default value: `$apache::params::mpm_module`
 
-##### `package_ensure`
+##### <a name="package_ensure"></a>`package_ensure`
 
 Data type: `Any`
 
@@ -668,7 +757,7 @@ Controls the `package` resource's `ensure` attribute. Valid values are: `absent`
 
 Default value: `'installed'`
 
-##### `pidfile`
+##### <a name="pidfile"></a>`pidfile`
 
 Data type: `Any`
 
@@ -676,7 +765,7 @@ Allows settting a custom location for the pid file. Useful if using a custom-bui
 
 Default value: `$apache::params::pidfile`
 
-##### `ports_file`
+##### <a name="ports_file"></a>`ports_file`
 
 Data type: `Any`
 
@@ -684,7 +773,7 @@ Sets the path to the file containing Apache ports configuration.
 
 Default value: `$apache::params::ports_file`
 
-##### `protocols`
+##### <a name="protocols"></a>`protocols`
 
 Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
@@ -693,7 +782,7 @@ directive, which lists available protocols for the server.
 
 Default value: `[]`
 
-##### `protocols_honor_order`
+##### <a name="protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
@@ -702,7 +791,7 @@ directive which determines whether the order of Protocols sets precedence during
 
 Default value: ``undef``
 
-##### `purge_configs`
+##### <a name="purge_configs"></a>`purge_configs`
 
 Data type: `Any`
 
@@ -713,7 +802,7 @@ within this module. For virtual host configurations, see `purge_vhost_dir`.
 
 Default value: ``true``
 
-##### `purge_vhost_dir`
+##### <a name="purge_vhost_dir"></a>`purge_vhost_dir`
 
 Data type: `Any`
 
@@ -725,7 +814,7 @@ coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
 Default value: ``undef``
 
-##### `rewrite_lock`
+##### <a name="rewrite_lock"></a>`rewrite_lock`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -735,7 +824,7 @@ only applies to Apache version 2.2 or lower and is ignored on newer versions.
 
 Default value: ``undef``
 
-##### `sendfile`
+##### <a name="sendfile"></a>`sendfile`
 
 Data type: `Enum['On', 'Off', 'on', 'off']`
 
@@ -744,7 +833,7 @@ Forces Apache to use the Linux kernel's `sendfile` support to serve static files
 
 Default value: `'On'`
 
-##### `serveradmin`
+##### <a name="serveradmin"></a>`serveradmin`
 
 Data type: `Any`
 
@@ -752,7 +841,7 @@ Sets the Apache server administrator's contact information via Apache's `ServerA
 
 Default value: `'root@localhost'`
 
-##### `servername`
+##### <a name="servername"></a>`servername`
 
 Data type: `Any`
 
@@ -761,7 +850,7 @@ Setting to `false` will not set ServerName at all.
 
 Default value: `$apache::params::servername`
 
-##### `server_root`
+##### <a name="server_root"></a>`server_root`
 
 Data type: `Any`
 
@@ -769,7 +858,7 @@ Sets the Apache server's root directory via Apache's `ServerRoot` directive.
 
 Default value: `$apache::params::server_root`
 
-##### `server_signature`
+##### <a name="server_signature"></a>`server_signature`
 
 Data type: `Any`
 
@@ -779,7 +868,7 @@ directive. Valid values are: `On` or `Off`.
 
 Default value: `'On'`
 
-##### `server_tokens`
+##### <a name="server_tokens"></a>`server_tokens`
 
 Data type: `Any`
 
@@ -788,7 +877,7 @@ system, via Apache's `ServerTokens` directive.
 
 Default value: `'Prod'`
 
-##### `service_enable`
+##### <a name="service_enable"></a>`service_enable`
 
 Data type: `Boolean`
 
@@ -796,7 +885,7 @@ Determines whether Puppet enables the Apache HTTPD service when the system is bo
 
 Default value: ``true``
 
-##### `service_ensure`
+##### <a name="service_ensure"></a>`service_ensure`
 
 Data type: `Any`
 
@@ -808,7 +897,7 @@ application, such as Pacemaker.<br />
 
 Default value: `'running'`
 
-##### `service_name`
+##### <a name="service_name"></a>`service_name`
 
 Data type: `Any`
 
@@ -816,7 +905,7 @@ Sets the name of the Apache service.
 
 Default value: `$apache::params::service_name`
 
-##### `service_manage`
+##### <a name="service_manage"></a>`service_manage`
 
 Data type: `Boolean`
 
@@ -824,7 +913,7 @@ Determines whether Puppet manages the HTTPD service's state.
 
 Default value: ``true``
 
-##### `service_restart`
+##### <a name="service_restart"></a>`service_restart`
 
 Data type: `Any`
 
@@ -833,7 +922,7 @@ Values: a command to restart the Apache service.
 
 Default value: ``undef``
 
-##### `timeout`
+##### <a name="timeout"></a>`timeout`
 
 Data type: `Any`
 
@@ -842,7 +931,7 @@ certain events before failing a request.
 
 Default value: `'60'`
 
-##### `trace_enable`
+##### <a name="trace_enable"></a>`trace_enable`
 
 Data type: `Any`
 
@@ -850,7 +939,7 @@ Controls how Apache handles `TRACE` requests (per RFC 2616) via the `TraceEnable
 
 Default value: `'On'`
 
-##### `use_canonical_name`
+##### <a name="use_canonical_name"></a>`use_canonical_name`
 
 Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
 
@@ -860,7 +949,7 @@ server's configuration and uses Apache's default setting of 'off'.
 
 Default value: ``undef``
 
-##### `use_systemd`
+##### <a name="use_systemd"></a>`use_systemd`
 
 Data type: `Any`
 
@@ -869,7 +958,7 @@ especially useful if using custom-built RPMs.
 
 Default value: `$apache::params::use_systemd`
 
-##### `file_mode`
+##### <a name="file_mode"></a>`file_mode`
 
 Data type: `Any`
 
@@ -878,7 +967,7 @@ Valid values are: a string, with permissions mode in symbolic or numeric notatio
 
 Default value: `$apache::params::file_mode`
 
-##### `root_directory_options`
+##### <a name="root_directory_options"></a>`root_directory_options`
 
 Data type: `Any`
 
@@ -886,7 +975,7 @@ Array of the desired options for the `/` directory in httpd.conf.
 
 Default value: `$apache::params::root_directory_options`
 
-##### `root_directory_secured`
+##### <a name="root_directory_secured"></a>`root_directory_secured`
 
 Data type: `Boolean`
 
@@ -898,7 +987,7 @@ used to allow access to these resources (for example, in a directory block using
 
 Default value: ``false``
 
-##### `vhost_dir`
+##### <a name="vhost_dir"></a>`vhost_dir`
 
 Data type: `Any`
 
@@ -906,7 +995,7 @@ Changes your virtual host configuration files' location.
 
 Default value: `$apache::params::vhost_dir`
 
-##### `vhost_include_pattern`
+##### <a name="vhost_include_pattern"></a>`vhost_include_pattern`
 
 Data type: `Any`
 
@@ -919,7 +1008,7 @@ files ending in `.conf`.
 
 Default value: `$apache::params::vhost_include_pattern`
 
-##### `user`
+##### <a name="user"></a>`user`
 
 Data type: `Any`
 
@@ -929,7 +1018,7 @@ To prevent Puppet from managing the user, set the `manage_user` parameter to `fa
 
 Default value: `$apache::params::user`
 
-##### `apache_name`
+##### <a name="apache_name"></a>`apache_name`
 
 Data type: `Any`
 
@@ -939,7 +1028,7 @@ For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::s
 
 Default value: `$apache::params::apache_name`
 
-##### `error_log`
+##### <a name="error_log"></a>`error_log`
 
 Data type: `Any`
 
@@ -949,7 +1038,7 @@ The name of the error log file for the main server instance. If the string start
 
 Default value: `$apache::params::error_log`
 
-##### `scriptalias`
+##### <a name="scriptalias"></a>`scriptalias`
 
 Data type: `Any`
 
@@ -957,7 +1046,7 @@ Directory to use for global script alias
 
 Default value: `$apache::params::scriptalias`
 
-##### `access_log_file`
+##### <a name="access_log_file"></a>`access_log_file`
 
 Data type: `Any`
 
@@ -965,7 +1054,7 @@ The name of the access log file for the main server instance.
 
 Default value: `$apache::params::access_log_file`
 
-##### `limitreqfields`
+##### <a name="limitreqfields"></a>`limitreqfields`
 
 Data type: `Any`
 
@@ -977,7 +1066,7 @@ response from the server that indicates too many fields were sent in the request
 
 Default value: `'100'`
 
-##### `limitreqfieldsize`
+##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
 
 Data type: `Any`
 
@@ -986,7 +1075,7 @@ be allowed within a request header.
 
 Default value: `'8190'`
 
-##### `ip`
+##### <a name="ip"></a>`ip`
 
 Data type: `Any`
 
@@ -994,7 +1083,7 @@ Specifies the ip address
 
 Default value: ``undef``
 
-##### `purge_vdir`
+##### <a name="purge_vdir"></a>`purge_vdir`
 
 Data type: `Any`
 
@@ -1003,7 +1092,7 @@ Removes all other Apache configs and virtual hosts.<br />
 
 Default value: ``false``
 
-##### `conf_enabled`
+##### <a name="conf_enabled"></a>`conf_enabled`
 
 Data type: `Any`
 
@@ -1011,7 +1100,7 @@ Whether the additional config files in `/etc/apache2/conf-enabled` should be man
 
 Default value: `$apache::params::conf_enabled`
 
-##### `vhost_enable_dir`
+##### <a name="vhost_enable_dir"></a>`vhost_enable_dir`
 
 Data type: `Any`
 
@@ -1020,7 +1109,7 @@ they will be symlinked to and from sites-enabled.
 
 Default value: `$apache::params::vhost_enable_dir`
 
-##### `mod_enable_dir`
+##### <a name="mod_enable_dir"></a>`mod_enable_dir`
 
 Data type: `Any`
 
@@ -1028,7 +1117,7 @@ Set's whether the mods-enabled directory should be managed.
 
 Default value: `$apache::params::mod_enable_dir`
 
-##### `ssl_file`
+##### <a name="ssl_file"></a>`ssl_file`
 
 Data type: `Any`
 
@@ -1037,7 +1126,7 @@ an SSL Certificate.
 
 Default value: ``undef``
 
-##### `file_e_tag`
+##### <a name="file_e_tag"></a>`file_e_tag`
 
 Data type: `Any`
 
@@ -1046,7 +1135,7 @@ field for static files.
 
 Default value: ``undef``
 
-##### `use_optional_includes`
+##### <a name="use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Boolean`
 
@@ -1055,7 +1144,7 @@ Specifies whether Apache uses the `IncludeOptional` directive instead of `Includ
 
 Default value: `$apache::params::use_optional_includes`
 
-##### `mime_types_additional`
+##### <a name="mime_types_additional"></a>`mime_types_additional`
 
 Data type: `Any`
 
@@ -1063,7 +1152,7 @@ Specifies any idditional Internet media (mime) types that you wish to be configu
 
 Default value: `$apache::params::mime_types_additional`
 
-### `apache::dev`
+### <a name="apachedev"></a>`apache::dev`
 
 The libraries installed depends on the `dev_packages` parameter of the `apache::params`
 class, based on your operating system:
@@ -1072,7 +1161,7 @@ class, based on your operating system:
 - **Gentoo**: `undef`.
 - **Red Hat**: `httpd-devel`.
 
-### `apache::mod::actions`
+### <a name="apachemodactions"></a>`apache::mod::actions`
 
 Installs Apache mod_actions
 
@@ -1080,7 +1169,7 @@ Installs Apache mod_actions
   * https://httpd.apache.org/docs/current/mod/mod_actions.html
     * for additional documentation.
 
-### `apache::mod::alias`
+### <a name="apachemodalias"></a>`apache::mod::alias`
 
 Installs and configures `mod_alias`.
 
@@ -1090,9 +1179,15 @@ Installs and configures `mod_alias`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::alias` class.
+The following parameters are available in the `apache::mod::alias` class:
+
+* [`apache_version`](#apache_version)
+* [`icons_options`](#icons_options)
+* [`icons_path`](#icons_path)
+* [`icons_path`](#icons_path)
+* [`icons_prefix`](#icons_prefix)
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -1100,7 +1195,7 @@ The version of Apache, if not set will be retrieved from the init class.
 
 Default value: ``undef``
 
-##### `icons_options`
+##### <a name="icons_options"></a>`icons_options`
 
 Data type: `Any`
 
@@ -1109,7 +1204,7 @@ directive.
 
 Default value: `'Indexes MultiViews'`
 
-##### `icons_path`
+##### <a name="icons_path"></a>`icons_path`
 
 Data type: `Any`
 
@@ -1121,13 +1216,13 @@ Sets the local path for an /icons/ Alias. Default depends on operating system:
 
 Default value: `$apache::params::alias_icons_path`
 
-##### `icons_path`
+##### <a name="icons_path"></a>`icons_path`
 
 Change the alias for /icons/.
 
 Default value: `$apache::params::alias_icons_path`
 
-##### `icons_prefix`
+##### <a name="icons_prefix"></a>`icons_prefix`
 
 Data type: `Any`
 
@@ -1135,7 +1230,7 @@ Data type: `Any`
 
 Default value: `$apache::params::icons_prefix`
 
-### `apache::mod::apreq2`
+### <a name="apachemodapreq2"></a>`apache::mod::apreq2`
 
 Installs `mod_apreq2`.
 
@@ -1145,7 +1240,7 @@ Installs `mod_apreq2`.
   * http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html
     * for additional documentation.
 
-### `apache::mod::auth_basic`
+### <a name="apachemodauth_basic"></a>`apache::mod::auth_basic`
 
 Installs `mod_auth_basic`
 
@@ -1153,7 +1248,7 @@ Installs `mod_auth_basic`
   * https://httpd.apache.org/docs/current/mod/mod_auth_basic.html
     * for additional documentation.
 
-### `apache::mod::auth_cas`
+### <a name="apachemodauth_cas"></a>`apache::mod::auth_cas`
 
 Installs and configures `mod_auth_cas`.
 
@@ -1165,22 +1260,48 @@ Installs and configures `mod_auth_cas`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::auth_cas` class.
-
-##### `cas_login_url`
+The following parameters are available in the `apache::mod::auth_cas` class:
+
+* [`cas_login_url`](#cas_login_url)
+* [`cas_validate_url`](#cas_validate_url)
+* [`cas_cookie_path`](#cas_cookie_path)
+* [`cas_cookie_path_mode`](#cas_cookie_path_mode)
+* [`cas_version`](#cas_version)
+* [`cas_debug`](#cas_debug)
+* [`cas_validate_server`](#cas_validate_server)
+* [`cas_validatedepth`](#cas_validatedepth)
+* [`cas_proxy_validate_url`](#cas_proxy_validate_url)
+* [`cas_root_proxied_as`](#cas_root_proxied_as)
+* [`cas_cookie_entropy`](#cas_cookie_entropy)
+* [`cas_timeout`](#cas_timeout)
+* [`cas_idle_timeout`](#cas_idle_timeout)
+* [`cas_cache_clean_interval`](#cas_cache_clean_interval)
+* [`cas_cookie_domain`](#cas_cookie_domain)
+* [`cas_cookie_http_only`](#cas_cookie_http_only)
+* [`cas_authoritative`](#cas_authoritative)
+* [`cas_validate_saml`](#cas_validate_saml)
+* [`cas_sso_enabled`](#cas_sso_enabled)
+* [`cas_attribute_prefix`](#cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
+* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
+* [`suppress_warning`](#suppress_warning)
+* [`cas_validate_depth`](#cas_validate_depth)
+* [`cas_certificate_path`](#cas_certificate_path)
+
+##### <a name="cas_login_url"></a>`cas_login_url`
 
 Data type: `String`
 
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
 
-##### `cas_validate_url`
+##### <a name="cas_validate_url"></a>`cas_validate_url`
 
 Data type: `String`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
-##### `cas_cookie_path`
+##### <a name="cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `String`
 
@@ -1189,7 +1310,7 @@ be writable by the web server only.
 
 Default value: `$apache::params::cas_cookie_path`
 
-##### `cas_cookie_path_mode`
+##### <a name="cas_cookie_path_mode"></a>`cas_cookie_path_mode`
 
 Data type: `Any`
 
@@ -1197,7 +1318,7 @@ The mode of cas_cookie_path.
 
 Default value: `'0750'`
 
-##### `cas_version`
+##### <a name="cas_version"></a>`cas_version`
 
 Data type: `Any`
 
@@ -1205,7 +1326,7 @@ The version of the CAS protocol to adhere to.
 
 Default value: `2`
 
-##### `cas_debug`
+##### <a name="cas_debug"></a>`cas_debug`
 
 Data type: `Any`
 
@@ -1213,7 +1334,7 @@ Whether to enable or disable debug mode.
 
 Default value: `'Off'`
 
-##### `cas_validate_server`
+##### <a name="cas_validate_server"></a>`cas_validate_server`
 
 Data type: `Any`
 
@@ -1222,11 +1343,11 @@ removed from Version 1.1-RC1 onward.
 
 Default value: ``undef``
 
-##### `cas_validatedepth`
+##### <a name="cas_validatedepth"></a>`cas_validatedepth`
 
 The maximum depth for chained certificate validation.
 
-##### `cas_proxy_validate_url`
+##### <a name="cas_proxy_validate_url"></a>`cas_proxy_validate_url`
 
 Data type: `Any`
 
@@ -1234,7 +1355,7 @@ The URL to use when performing a proxy validation.
 
 Default value: ``undef``
 
-##### `cas_root_proxied_as`
+##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
 
 Data type: `Any`
 
@@ -1243,7 +1364,7 @@ This URL should not include a trailing slash.
 
 Default value: ``undef``
 
-##### `cas_cookie_entropy`
+##### <a name="cas_cookie_entropy"></a>`cas_cookie_entropy`
 
 Data type: `Any`
 
@@ -1252,7 +1373,7 @@ session identifier.
 
 Default value: ``undef``
 
-##### `cas_timeout`
+##### <a name="cas_timeout"></a>`cas_timeout`
 
 Data type: `Any`
 
@@ -1260,7 +1381,7 @@ The hard limit, in seconds, for a mod_auth_cas session.
 
 Default value: ``undef``
 
-##### `cas_idle_timeout`
+##### <a name="cas_idle_timeout"></a>`cas_idle_timeout`
 
 Data type: `Any`
 
@@ -1268,7 +1389,7 @@ The limit, in seconds, of how long a mod_auth_cas session can be idle.
 
 Default value: ``undef``
 
-##### `cas_cache_clean_interval`
+##### <a name="cas_cache_clean_interval"></a>`cas_cache_clean_interval`
 
 Data type: `Any`
 
@@ -1276,7 +1397,7 @@ The minimum amount of time that must pass inbetween cache cleanings.
 
 Default value: ``undef``
 
-##### `cas_cookie_domain`
+##### <a name="cas_cookie_domain"></a>`cas_cookie_domain`
 
 Data type: `Any`
 
@@ -1284,7 +1405,7 @@ The value for the 'Domain=' parameter in the Set-Cookie header.
 
 Default value: ``undef``
 
-##### `cas_cookie_http_only`
+##### <a name="cas_cookie_http_only"></a>`cas_cookie_http_only`
 
 Data type: `Any`
 
@@ -1293,7 +1414,7 @@ client side Javascript.
 
 Default value: ``undef``
 
-##### `cas_authoritative`
+##### <a name="cas_authoritative"></a>`cas_authoritative`
 
 Data type: `Any`
 
@@ -1301,7 +1422,7 @@ Determines whether an optional authorization directive is authoritative and thus
 
 Default value: ``undef``
 
-##### `cas_validate_saml`
+##### <a name="cas_validate_saml"></a>`cas_validate_saml`
 
 Data type: `Any`
 
@@ -1309,7 +1430,7 @@ Parse response from CAS server for SAML.
 
 Default value: ``undef``
 
-##### `cas_sso_enabled`
+##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Any`
 
@@ -1317,7 +1438,7 @@ Enables experimental support for single sign out (may mangle POST data).
 
 Default value: ``undef``
 
-##### `cas_attribute_prefix`
+##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Any`
 
@@ -1326,7 +1447,7 @@ validation is enabled.
 
 Default value: ``undef``
 
-##### `cas_attribute_delimiter`
+##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Any`
 
@@ -1334,7 +1455,7 @@ Sets the delimiter between attribute values in the header created by `cas_attrib
 
 Default value: ``undef``
 
-##### `cas_scrub_request_headers`
+##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
 Data type: `Any`
 
@@ -1342,7 +1463,7 @@ Remove inbound request headers that may have special meaning within mod_auth_cas
 
 Default value: ``undef``
 
-##### `suppress_warning`
+##### <a name="suppress_warning"></a>`suppress_warning`
 
 Data type: `Any`
 
@@ -1350,7 +1471,7 @@ Suppress warning about being on RedHat (mod_auth_cas package is now available in
 
 Default value: ``false``
 
-##### `cas_validate_depth`
+##### <a name="cas_validate_depth"></a>`cas_validate_depth`
 
 Data type: `Any`
 
@@ -1358,7 +1479,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_certificate_path`
+##### <a name="cas_certificate_path"></a>`cas_certificate_path`
 
 Data type: `Any`
 
@@ -1366,7 +1487,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-### `apache::mod::auth_gssapi`
+### <a name="apachemodauth_gssapi"></a>`apache::mod::auth_gssapi`
 
 Installs `mod_auth_gsappi`.
 
@@ -1374,7 +1495,7 @@ Installs `mod_auth_gsappi`.
   * https://github.com/modauthgssapi/mod_auth_gssapi
     * for additional documentation.
 
-### `apache::mod::auth_kerb`
+### <a name="apachemodauth_kerb"></a>`apache::mod::auth_kerb`
 
 Installs `mod_auth_kerb`
 
@@ -1382,7 +1503,7 @@ Installs `mod_auth_kerb`
   * http://modauthkerb.sourceforge.net
     * for additional documentation.
 
-### `apache::mod::auth_mellon`
+### <a name="apachemodauth_mellon"></a>`apache::mod::auth_mellon`
 
 Installs and configures `mod_auth_mellon`.
 
@@ -1392,9 +1513,17 @@ Installs and configures `mod_auth_mellon`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::auth_mellon` class.
+The following parameters are available in the `apache::mod::auth_mellon` class:
+
+* [`mellon_cache_size`](#mellon_cache_size)
+* [`mellon_lock_file`](#mellon_lock_file)
+* [`mellon_post_directory`](#mellon_post_directory)
+* [`mellon_cache_entry_size`](#mellon_cache_entry_size)
+* [`mellon_post_ttl`](#mellon_post_ttl)
+* [`mellon_post_size`](#mellon_post_size)
+* [`mellon_post_count`](#mellon_post_count)
 
-##### `mellon_cache_size`
+##### <a name="mellon_cache_size"></a>`mellon_cache_size`
 
 Data type: `Any`
 
@@ -1402,7 +1531,7 @@ Maximum number of sessions which can be active at once.
 
 Default value: `$apache::params::mellon_cache_size`
 
-##### `mellon_lock_file`
+##### <a name="mellon_lock_file"></a>`mellon_lock_file`
 
 Data type: `Any`
 
@@ -1410,7 +1539,7 @@ Full path to a file used for synchronizing access to the session data.
 
 Default value: `$apache::params::mellon_lock_file`
 
-##### `mellon_post_directory`
+##### <a name="mellon_post_directory"></a>`mellon_post_directory`
 
 Data type: `Any`
 
@@ -1418,7 +1547,7 @@ Full path of a directory where POST requests are saved during authentication.
 
 Default value: `$apache::params::mellon_post_directory`
 
-##### `mellon_cache_entry_size`
+##### <a name="mellon_cache_entry_size"></a>`mellon_cache_entry_size`
 
 Data type: `Any`
 
@@ -1426,7 +1555,7 @@ Maximum size for a single session entry in bytes.
 
 Default value: ``undef``
 
-##### `mellon_post_ttl`
+##### <a name="mellon_post_ttl"></a>`mellon_post_ttl`
 
 Data type: `Any`
 
@@ -1434,7 +1563,7 @@ Delay in seconds before a saved POST request can be flushed.
 
 Default value: ``undef``
 
-##### `mellon_post_size`
+##### <a name="mellon_post_size"></a>`mellon_post_size`
 
 Data type: `Any`
 
@@ -1442,7 +1571,7 @@ Maximum size for saved POST requests.
 
 Default value: ``undef``
 
-##### `mellon_post_count`
+##### <a name="mellon_post_count"></a>`mellon_post_count`
 
 Data type: `Any`
 
@@ -1450,7 +1579,7 @@ Maximum amount of saved POST requests.
 
 Default value: ``undef``
 
-### `apache::mod::auth_openidc`
+### <a name="apachemodauth_openidc"></a>`apache::mod::auth_openidc`
 
 Installs and configures `mod_auth_openidc`.
 
@@ -1458,7 +1587,7 @@ Installs and configures `mod_auth_openidc`.
   * https://github.com/zmartzone/mod_auth_openidc
     * for additional documentation.
 
-### `apache::mod::authn_core`
+### <a name="apachemodauthn_core"></a>`apache::mod::authn_core`
 
 Installs `mod_authn_core`.
 
@@ -1468,9 +1597,11 @@ Installs `mod_authn_core`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::authn_core` class.
+The following parameters are available in the `apache::mod::authn_core` class:
 
-##### `apache_version`
+* [`apache_version`](#apache_version)
+
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -1478,7 +1609,7 @@ The version of apache being run.
 
 Default value: `$apache::apache_version`
 
-### `apache::mod::authn_dbd`
+### <a name="apachemodauthn_dbd"></a>`apache::mod::authn_dbd`
 
 Installs `mod_authn_dbd`.
 
@@ -1488,15 +1619,24 @@ Installs `mod_authn_dbd`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::authn_dbd` class.
+The following parameters are available in the `apache::mod::authn_dbd` class:
+
+* [`authn_dbd_params`](#authn_dbd_params)
+* [`authn_dbd_dbdriver`](#authn_dbd_dbdriver)
+* [`authn_dbd_query`](#authn_dbd_query)
+* [`authn_dbd_min`](#authn_dbd_min)
+* [`authn_dbd_max`](#authn_dbd_max)
+* [`authn_dbd_keep`](#authn_dbd_keep)
+* [`authn_dbd_exptime`](#authn_dbd_exptime)
+* [`authn_dbd_alias`](#authn_dbd_alias)
 
-##### `authn_dbd_params`
+##### <a name="authn_dbd_params"></a>`authn_dbd_params`
 
 Data type: `Any`
 
 The params needed for the mod to function.
 
-##### `authn_dbd_dbdriver`
+##### <a name="authn_dbd_dbdriver"></a>`authn_dbd_dbdriver`
 
 Data type: `Any`
 
@@ -1504,7 +1644,7 @@ Selects an apr_dbd driver by name.
 
 Default value: `'mysql'`
 
-##### `authn_dbd_query`
+##### <a name="authn_dbd_query"></a>`authn_dbd_query`
 
 Data type: `Any`
 
@@ -1512,7 +1652,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `authn_dbd_min`
+##### <a name="authn_dbd_min"></a>`authn_dbd_min`
 
 Data type: `Any`
 
@@ -1520,7 +1660,7 @@ Set the minimum number of connections per process.
 
 Default value: `'4'`
 
-##### `authn_dbd_max`
+##### <a name="authn_dbd_max"></a>`authn_dbd_max`
 
 Data type: `Any`
 
@@ -1528,7 +1668,7 @@ Set the maximum number of connections per process.
 
 Default value: `'20'`
 
-##### `authn_dbd_keep`
+##### <a name="authn_dbd_keep"></a>`authn_dbd_keep`
 
 Data type: `Any`
 
@@ -1536,7 +1676,7 @@ Set the maximum number of connections per process to be sustained.
 
 Default value: `'8'`
 
-##### `authn_dbd_exptime`
+##### <a name="authn_dbd_exptime"></a>`authn_dbd_exptime`
 
 Data type: `Any`
 
@@ -1545,7 +1685,7 @@ connections specified in DBDKeep has been exceeded.
 
 Default value: `'300'`
 
-##### `authn_dbd_alias`
+##### <a name="authn_dbd_alias"></a>`authn_dbd_alias`
 
 Data type: `Any`
 
@@ -1553,7 +1693,7 @@ Sets an alias for `AuthnProvider.
 
 Default value: ``undef``
 
-### `apache::mod::authn_file`
+### <a name="apachemodauthn_file"></a>`apache::mod::authn_file`
 
 Installs `mod_authn_file`.
 
@@ -1561,7 +1701,7 @@ Installs `mod_authn_file`.
   * https://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
     * for additional documentation.
 
-### `apache::mod::authnz_ldap`
+### <a name="apachemodauthnz_ldap"></a>`apache::mod::authnz_ldap`
 
 Installs `mod_authnz_ldap`.
 
@@ -1573,9 +1713,12 @@ Installs `mod_authnz_ldap`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::authnz_ldap` class.
+The following parameters are available in the `apache::mod::authnz_ldap` class:
 
-##### `verify_server_cert`
+* [`verify_server_cert`](#verify_server_cert)
+* [`package_name`](#package_name)
+
+##### <a name="verify_server_cert"></a>`verify_server_cert`
 
 Data type: `Boolean`
 
@@ -1583,7 +1726,7 @@ Whether to force te verification of a server cert or not.
 
 Default value: ``true``
 
-##### `package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Any`
 
@@ -1591,7 +1734,7 @@ The name of the ldap package.
 
 Default value: ``undef``
 
-### `apache::mod::authnz_pam`
+### <a name="apachemodauthnz_pam"></a>`apache::mod::authnz_pam`
 
 Installs `mod_authnz_pam`.
 
@@ -1599,7 +1742,7 @@ Installs `mod_authnz_pam`.
   * https://www.adelton.com/apache/mod_authnz_pam
     * for additional documentation.
 
-### `apache::mod::authz_default`
+### <a name="apachemodauthz_default"></a>`apache::mod::authz_default`
 
 Installs and configures `mod_authz_default`.
 
@@ -1609,9 +1752,11 @@ Installs and configures `mod_authz_default`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::authz_default` class.
+The following parameters are available in the `apache::mod::authz_default` class:
+
+* [`apache_version`](#apache_version)
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -1619,7 +1764,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### `apache::mod::authz_user`
+### <a name="apachemodauthz_user"></a>`apache::mod::authz_user`
 
 Installs `mod_authz_user`
 
@@ -1627,7 +1772,7 @@ Installs `mod_authz_user`
   * https://httpd.apache.org/docs/current/mod/mod_authz_user.html
     * for additional documentation.
 
-### `apache::mod::autoindex`
+### <a name="apachemodautoindex"></a>`apache::mod::autoindex`
 
 Installs `mod_autoindex`
 
@@ -1637,9 +1782,11 @@ Installs `mod_autoindex`
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::autoindex` class.
+The following parameters are available in the `apache::mod::autoindex` class:
 
-##### `icons_prefix`
+* [`icons_prefix`](#icons_prefix)
+
+##### <a name="icons_prefix"></a>`icons_prefix`
 
 Data type: `Any`
 
@@ -1647,7 +1794,7 @@ Data type: `Any`
 
 Default value: `$apache::params::icons_prefix`
 
-### `apache::mod::cache`
+### <a name="apachemodcache"></a>`apache::mod::cache`
 
 Installs `mod_cache`
 
@@ -1655,7 +1802,7 @@ Installs `mod_cache`
   * https://httpd.apache.org/docs/current/mod/mod_cache.html
     * for additional documentation.
 
-### `apache::mod::cgi`
+### <a name="apachemodcgi"></a>`apache::mod::cgi`
 
 Installs `mod_cgi`.
 
@@ -1663,14 +1810,14 @@ Installs `mod_cgi`.
   * https://httpd.apache.org/docs/current/mod/mod_cgi.html
     * for additional documentation.
 
-### `apache::mod::cgid`
+### <a name="apachemodcgid"></a>`apache::mod::cgid`
 
 Installs `mod_cgid`.
 
 * **See also**
   * https://httpd.apache.org/docs/current/mod/mod_cgid.html
 
-### `apache::mod::cluster`
+### <a name="apachemodcluster"></a>`apache::mod::cluster`
 
 Installs `mod_cluster`.
 
@@ -1696,33 +1843,45 @@ class { '::apache::mod::cluster':
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::cluster` class.
+The following parameters are available in the `apache::mod::cluster` class:
+
+* [`allowed_network`](#allowed_network)
+* [`balancer_name`](#balancer_name)
+* [`ip`](#ip)
+* [`version`](#version)
+* [`enable_mcpm_receive`](#enable_mcpm_receive)
+* [`port`](#port)
+* [`keep_alive_timeout`](#keep_alive_timeout)
+* [`manager_allowed_network`](#manager_allowed_network)
+* [`max_keep_alive_requests`](#max_keep_alive_requests)
+* [`server_advertise`](#server_advertise)
+* [`advertise_frequency`](#advertise_frequency)
 
-##### `allowed_network`
+##### <a name="allowed_network"></a>`allowed_network`
 
 Data type: `Any`
 
 Balanced members network.
 
-##### `balancer_name`
+##### <a name="balancer_name"></a>`balancer_name`
 
 Data type: `Any`
 
 Name of balancer.
 
-##### `ip`
+##### <a name="ip"></a>`ip`
 
 Data type: `Any`
 
 Specifies the IP address to listen to.
 
-##### `version`
+##### <a name="version"></a>`version`
 
 Data type: `Any`
 
 Specifies the mod_cluster version. Version 1.3.0 or greater is required for httpd 2.4.
 
-##### `enable_mcpm_receive`
+##### <a name="enable_mcpm_receive"></a>`enable_mcpm_receive`
 
 Data type: `Any`
 
@@ -1730,7 +1889,7 @@ Whether MCPM should be enabled.
 
 Default value: ``true``
 
-##### `port`
+##### <a name="port"></a>`port`
 
 Data type: `Any`
 
@@ -1738,7 +1897,7 @@ mod_cluster listen port.
 
 Default value: `'6666'`
 
-##### `keep_alive_timeout`
+##### <a name="keep_alive_timeout"></a>`keep_alive_timeout`
 
 Data type: `Any`
 
@@ -1746,7 +1905,7 @@ Specifies how long Apache should wait for a request, in seconds.
 
 Default value: `60`
 
-##### `manager_allowed_network`
+##### <a name="manager_allowed_network"></a>`manager_allowed_network`
 
 Data type: `Any`
 
@@ -1754,7 +1913,7 @@ Whether to allow the network to access the mod_cluster_manager.
 
 Default value: `'127.0.0.1'`
 
-##### `max_keep_alive_requests`
+##### <a name="max_keep_alive_requests"></a>`max_keep_alive_requests`
 
 Data type: `Any`
 
@@ -1762,7 +1921,7 @@ Maximum number of requests kept alive.
 
 Default value: `0`
 
-##### `server_advertise`
+##### <a name="server_advertise"></a>`server_advertise`
 
 Data type: `Any`
 
@@ -1770,7 +1929,7 @@ Whether the server should advertise.
 
 Default value: ``true``
 
-##### `advertise_frequency`
+##### <a name="advertise_frequency"></a>`advertise_frequency`
 
 Data type: `Any`
 
@@ -1778,7 +1937,7 @@ Sets the interval between advertise messages in seconds.
 
 Default value: ``undef``
 
-### `apache::mod::data`
+### <a name="apachemoddata"></a>`apache::mod::data`
 
 Installs and configures `mod_data`.
 
@@ -1788,9 +1947,11 @@ Installs and configures `mod_data`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::data` class.
+The following parameters are available in the `apache::mod::data` class:
 
-##### `apache_version`
+* [`apache_version`](#apache_version)
+
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -1798,7 +1959,7 @@ Version of Apache to install module on.
 
 Default value: ``undef``
 
-### `apache::mod::dav`
+### <a name="apachemoddav"></a>`apache::mod::dav`
 
 Installs `mod_dav`.
 
@@ -1806,7 +1967,7 @@ Installs `mod_dav`.
   * https://httpd.apache.org/docs/current/mod/mod_dav.html
     * for additional documentation.
 
-### `apache::mod::dav_fs`
+### <a name="apachemoddav_fs"></a>`apache::mod::dav_fs`
 
 Installs `mod_dav_fs`.
 
@@ -1814,7 +1975,7 @@ Installs `mod_dav_fs`.
   * https://httpd.apache.org/docs/current/mod/mod_dav_fs.html
     * for additional documentation.
 
-### `apache::mod::dav_svn`
+### <a name="apachemoddav_svn"></a>`apache::mod::dav_svn`
 
 Installs and configures `mod_dav_svn`.
 
@@ -1824,9 +1985,11 @@ Installs and configures `mod_dav_svn`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::dav_svn` class.
+The following parameters are available in the `apache::mod::dav_svn` class:
+
+* [`authz_svn_enabled`](#authz_svn_enabled)
 
-##### `authz_svn_enabled`
+##### <a name="authz_svn_enabled"></a>`authz_svn_enabled`
 
 Data type: `Any`
 
@@ -1834,7 +1997,7 @@ Specifies whether to install Apache mod_authz_svn
 
 Default value: ``false``
 
-### `apache::mod::dbd`
+### <a name="apachemoddbd"></a>`apache::mod::dbd`
 
 Installs `mod_dbd`.
 
@@ -1844,13 +2007,15 @@ Installs `mod_dbd`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::dbd` class.
+The following parameters are available in the `apache::mod::dbd` class:
 
-##### `apache_version`
+* [`apache_version`](#apache_version)
+
+##### <a name="apache_version"></a>`apache_version`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-### `apache::mod::deflate`
+### <a name="apachemoddeflate"></a>`apache::mod::deflate`
 
 Installs and configures `mod_deflate`.
 
@@ -1860,9 +2025,12 @@ Installs and configures `mod_deflate`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::deflate` class.
+The following parameters are available in the `apache::mod::deflate` class:
+
+* [`types`](#types)
+* [`notes`](#notes)
 
-##### `types`
+##### <a name="types"></a>`types`
 
 Data type: `Any`
 
@@ -1876,7 +2044,7 @@ Default value: `[
     'application/json',
   ]`
 
-##### `notes`
+##### <a name="notes"></a>`notes`
 
 Data type: `Any`
 
@@ -1888,13 +2056,13 @@ Default value: `{
     'Ratio'  => 'ratio',
   }`
 
-### `apache::mod::dev`
+### <a name="apachemoddev"></a>`apache::mod::dev`
 
 Installs `mod_dev`.
 
 * **Note** This module is deprecated. Please use `apache::dev`.
 
-### `apache::mod::dir`
+### <a name="apachemoddir"></a>`apache::mod::dir`
 
 Installs and configures `mod_dir`.
 
@@ -1907,13 +2075,17 @@ DirectoryIndex statements in a vhost configuration
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::dir` class.
+The following parameters are available in the `apache::mod::dir` class:
 
-##### `types`
+* [`types`](#types)
+* [`indexes`](#indexes)
+* [`dir`](#dir)
+
+##### <a name="types"></a>`types`
 
 Specifies the text-based content types to compress.
 
-##### `indexes`
+##### <a name="indexes"></a>`indexes`
 
 Data type: `Array[String]`
 
@@ -1921,7 +2093,7 @@ Provides a string for the DirectoryIndex directive
 
 Default value: `['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml']`
 
-##### `dir`
+##### <a name="dir"></a>`dir`
 
 Data type: `Any`
 
@@ -1929,7 +2101,7 @@ Data type: `Any`
 
 Default value: `'public_html'`
 
-### `apache::mod::disk_cache`
+### <a name="apachemoddisk_cache"></a>`apache::mod::disk_cache`
 
 Installs and configures `mod_disk_cache`.
 
@@ -1941,9 +2113,12 @@ Installs and configures `mod_disk_cache`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::disk_cache` class.
+The following parameters are available in the `apache::mod::disk_cache` class:
+
+* [`cache_root`](#cache_root)
+* [`cache_ignore_headers`](#cache_ignore_headers)
 
-##### `cache_root`
+##### <a name="cache_root"></a>`cache_root`
 
 Data type: `Any`
 
@@ -1956,7 +2131,7 @@ Default depends on the Apache version and operating system:
 
 Default value: ``undef``
 
-##### `cache_ignore_headers`
+##### <a name="cache_ignore_headers"></a>`cache_ignore_headers`
 
 Data type: `Any`
 
@@ -1964,7 +2139,7 @@ Specifies HTTP header(s) that should not be stored in the cache.
 
 Default value: ``undef``
 
-### `apache::mod::dumpio`
+### <a name="apachemoddumpio"></a>`apache::mod::dumpio`
 
 Installs and configures `mod_dumpio`.
 
@@ -1989,9 +2164,12 @@ class{'apache::mod::dumpio':
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::dumpio` class.
+The following parameters are available in the `apache::mod::dumpio` class:
 
-##### `dump_io_input`
+* [`dump_io_input`](#dump_io_input)
+* [`dump_io_output`](#dump_io_output)
+
+##### <a name="dump_io_input"></a>`dump_io_input`
 
 Data type: `Enum['Off', 'On', 'off', 'on']`
 
@@ -1999,7 +2177,7 @@ Dump all input data to the error log
 
 Default value: `'Off'`
 
-##### `dump_io_output`
+##### <a name="dump_io_output"></a>`dump_io_output`
 
 Data type: `Enum['Off', 'On', 'off', 'on']`
 
@@ -2007,7 +2185,7 @@ Dump all output data to the error log
 
 Default value: `'Off'`
 
-### `apache::mod::env`
+### <a name="apachemodenv"></a>`apache::mod::env`
 
 Installs `mod_env`.
 
@@ -2015,7 +2193,7 @@ Installs `mod_env`.
   * https://httpd.apache.org/docs/current/mod/mod_env.html
     * for additional documentation.
 
-### `apache::mod::event`
+### <a name="apachemodevent"></a>`apache::mod::event`
 
 Installs and configures `mod_event`.
 
@@ -2028,9 +2206,22 @@ apache::mod::worker on the same server.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::event` class.
+The following parameters are available in the `apache::mod::event` class:
+
+* [`startservers`](#startservers)
+* [`maxclients`](#maxclients)
+* [`maxrequestworkers`](#maxrequestworkers)
+* [`minsparethreads`](#minsparethreads)
+* [`maxsparethreads`](#maxsparethreads)
+* [`threadsperchild`](#threadsperchild)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`maxconnectionsperchild`](#maxconnectionsperchild)
+* [`serverlimit`](#serverlimit)
+* [`apache_version`](#apache_version)
+* [`threadlimit`](#threadlimit)
+* [`listenbacklog`](#listenbacklog)
 
-##### `startservers`
+##### <a name="startservers"></a>`startservers`
 
 Data type: `Any`
 
@@ -2039,7 +2230,7 @@ removes the parameter.
 
 Default value: `'2'`
 
-##### `maxclients`
+##### <a name="maxclients"></a>`maxclients`
 
 Data type: `Any`
 
@@ -2047,7 +2238,7 @@ Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
 
 Default value: `'150'`
 
-##### `maxrequestworkers`
+##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Any`
 
@@ -2056,7 +2247,7 @@ these to `false` removes the parameters.
 
 Default value: ``undef``
 
-##### `minsparethreads`
+##### <a name="minsparethreads"></a>`minsparethreads`
 
 Data type: `Any`
 
@@ -2064,7 +2255,7 @@ Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Se
 
 Default value: `'25'`
 
-##### `maxsparethreads`
+##### <a name="maxsparethreads"></a>`maxsparethreads`
 
 Data type: `Any`
 
@@ -2072,7 +2263,7 @@ Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Se
 
 Default value: `'75'`
 
-##### `threadsperchild`
+##### <a name="threadsperchild"></a>`threadsperchild`
 
 Data type: `Any`
 
@@ -2080,7 +2271,7 @@ Number of threads created by each child process.
 
 Default value: `'25'`
 
-##### `maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Any`
 
@@ -2088,7 +2279,7 @@ Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
 
 Default value: `'0'`
 
-##### `maxconnectionsperchild`
+##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Any`
 
@@ -2096,7 +2287,7 @@ Limit on the number of connections that an individual child server will handle d
 
 Default value: ``undef``
 
-##### `serverlimit`
+##### <a name="serverlimit"></a>`serverlimit`
 
 Data type: `Any`
 
@@ -2104,7 +2295,7 @@ Limits the configurable number of processes via the `ServerLimit` directive. Set
 
 Default value: `'25'`
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -2112,7 +2303,7 @@ Version of Apache to install module on.
 
 Default value: ``undef``
 
-##### `threadlimit`
+##### <a name="threadlimit"></a>`threadlimit`
 
 Data type: `Any`
 
@@ -2120,7 +2311,7 @@ Limits the number of event threads via the module's `ThreadLimit` directive. Set
 
 Default value: `'64'`
 
-##### `listenbacklog`
+##### <a name="listenbacklog"></a>`listenbacklog`
 
 Data type: `Any`
 
@@ -2129,7 +2320,7 @@ the parameter.
 
 Default value: `'511'`
 
-### `apache::mod::expires`
+### <a name="apachemodexpires"></a>`apache::mod::expires`
 
 Installs and configures `mod_expires`.
 
@@ -2139,9 +2330,13 @@ Installs and configures `mod_expires`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::expires` class.
+The following parameters are available in the `apache::mod::expires` class:
+
+* [`expires_active`](#expires_active)
+* [`expires_default`](#expires_default)
+* [`expires_by_type`](#expires_by_type)
 
-##### `expires_active`
+##### <a name="expires_active"></a>`expires_active`
 
 Data type: `Any`
 
@@ -2149,7 +2344,7 @@ Enables generation of Expires headers.
 
 Default value: ``true``
 
-##### `expires_default`
+##### <a name="expires_default"></a>`expires_default`
 
 Data type: `Any`
 
@@ -2157,7 +2352,7 @@ Specifies the default algorithm for calculating expiration time using ExpiresByT
 
 Default value: ``undef``
 
-##### `expires_by_type`
+##### <a name="expires_by_type"></a>`expires_by_type`
 
 Data type: `Any`
 
@@ -2167,7 +2362,7 @@ value following valid interval syntax.
 
 Default value: ``undef``
 
-### `apache::mod::ext_filter`
+### <a name="apachemodext_filter"></a>`apache::mod::ext_filter`
 
 Installs and configures `mod_ext_filter`.
 
@@ -2190,9 +2385,11 @@ class { 'apache::mod::ext_filter':
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::ext_filter` class.
+The following parameters are available in the `apache::mod::ext_filter` class:
 
-##### `ext_filter_define`
+* [`ext_filter_define`](#ext_filter_define)
+
+##### <a name="ext_filter_define"></a>`ext_filter_define`
 
 Data type: `Optional[Hash]`
 
@@ -2200,7 +2397,7 @@ Hash of filter names and their parameters.
 
 Default value: ``undef``
 
-### `apache::mod::fastcgi`
+### <a name="apachemodfastcgi"></a>`apache::mod::fastcgi`
 
 Installs `mod_fastcgi`.
 
@@ -2208,7 +2405,7 @@ Installs `mod_fastcgi`.
   * https://github.com/FastCGI-Archives/mod_fastcgi
     * for additional documentation.
 
-### `apache::mod::fcgid`
+### <a name="apachemodfcgid"></a>`apache::mod::fcgid`
 
 loaded first; Puppet will not automatically enable it if you set the fcgiwrapper parameter in apache::vhost.
   include apache::mod::fcgid
@@ -2249,21 +2446,26 @@ class { 'apache::mod::fcgid':
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::fcgid` class.
+The following parameters are available in the `apache::mod::fcgid` class:
+
+* [`expires_active`](#expires_active)
+* [`expires_default`](#expires_default)
+* [`expires_by_type`](#expires_by_type)
+* [`options`](#options)
 
-##### `expires_active`
+##### <a name="expires_active"></a>`expires_active`
 
 Enables generation of Expires headers.
 
-##### `expires_default`
+##### <a name="expires_default"></a>`expires_default`
 
 Default algorithm for calculating expiration time.
 
-##### `expires_by_type`
+##### <a name="expires_by_type"></a>`expires_by_type`
 
 Value of the Expires header configured by MIME type.
 
-##### `options`
+##### <a name="options"></a>`options`
 
 Data type: `Any`
 
@@ -2271,7 +2473,7 @@ Data type: `Any`
 
 Default value: `{}`
 
-### `apache::mod::filter`
+### <a name="apachemodfilter"></a>`apache::mod::filter`
 
 Installs `mod_filter`.
 
@@ -2279,7 +2481,7 @@ Installs `mod_filter`.
   * https://httpd.apache.org/docs/current/mod/mod_filter.html
     * for additional documentation.
 
-### `apache::mod::geoip`
+### <a name="apachemodgeoip"></a>`apache::mod::geoip`
 
 Installs and configures `mod_geoip`.
 
@@ -2289,9 +2491,19 @@ Installs and configures `mod_geoip`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::geoip` class.
+The following parameters are available in the `apache::mod::geoip` class:
 
-##### `enable`
+* [`enable`](#enable)
+* [`db_file`](#db_file)
+* [`flag`](#flag)
+* [`output`](#output)
+* [`enable_utf8`](#enable_utf8)
+* [`scan_proxy_headers`](#scan_proxy_headers)
+* [`scan_proxy_headers_field`](#scan_proxy_headers_field)
+* [`use_last_xforwarededfor_ip`](#use_last_xforwarededfor_ip)
+* [`scan_proxy_header_field`](#scan_proxy_header_field)
+
+##### <a name="enable"></a>`enable`
 
 Data type: `Any`
 
@@ -2299,7 +2511,7 @@ Toggles whether to enable geoip.
 
 Default value: ``false``
 
-##### `db_file`
+##### <a name="db_file"></a>`db_file`
 
 Data type: `Any`
 
@@ -2307,7 +2519,7 @@ Path to database for GeoIP to use.
 
 Default value: `'/usr/share/GeoIP/GeoIP.dat'`
 
-##### `flag`
+##### <a name="flag"></a>`flag`
 
 Data type: `Any`
 
@@ -2315,7 +2527,7 @@ Caching directive to use. Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'St
 
 Default value: `'Standard'`
 
-##### `output`
+##### <a name="output"></a>`output`
 
 Data type: `Any`
 
@@ -2323,7 +2535,7 @@ Output variable locations. Values: 'All', 'Env', 'Request', 'Notes'.
 
 Default value: `'All'`
 
-##### `enable_utf8`
+##### <a name="enable_utf8"></a>`enable_utf8`
 
 Data type: `Any`
 
@@ -2331,7 +2543,7 @@ Changes the output from ISO88591 (Latin1) to UTF8.
 
 Default value: ``undef``
 
-##### `scan_proxy_headers`
+##### <a name="scan_proxy_headers"></a>`scan_proxy_headers`
 
 Data type: `Any`
 
@@ -2339,11 +2551,11 @@ Enables the GeoIPScanProxyHeaders option.
 
 Default value: ``undef``
 
-##### `scan_proxy_headers_field`
+##### <a name="scan_proxy_headers_field"></a>`scan_proxy_headers_field`
 
 Specifies the header mod_geoip uses to determine the client's IP address.
 
-##### `use_last_xforwarededfor_ip`
+##### <a name="use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
 
 Data type: `Any`
 
@@ -2351,7 +2563,7 @@ Determines whether to use the first or last IP address for the client's IP in a
 
 Default value: ``undef``
 
-##### `scan_proxy_header_field`
+##### <a name="scan_proxy_header_field"></a>`scan_proxy_header_field`
 
 Data type: `Any`
 
@@ -2359,7 +2571,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-### `apache::mod::headers`
+### <a name="apachemodheaders"></a>`apache::mod::headers`
 
 Installs and configures `mod_headers`.
 
@@ -2369,13 +2581,15 @@ Installs and configures `mod_headers`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::headers` class.
+The following parameters are available in the `apache::mod::headers` class:
+
+* [`apache_version`](#apache_version)
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Version of Apache to install module on.
 
-### `apache::mod::http2`
+### <a name="apachemodhttp2"></a>`apache::mod::http2`
 
 Installs and configures `mod_http2`.
 
@@ -2385,9 +2599,30 @@ Installs and configures `mod_http2`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::http2` class.
-
-##### `h2_copy_files`
+The following parameters are available in the `apache::mod::http2` class:
+
+* [`h2_copy_files`](#h2_copy_files)
+* [`h2_direct`](#h2_direct)
+* [`h2_early_hints`](#h2_early_hints)
+* [`h2_max_session_streams`](#h2_max_session_streams)
+* [`h2_max_worker_idle_seconds`](#h2_max_worker_idle_seconds)
+* [`h2_max_workers`](#h2_max_workers)
+* [`h2_min_workers`](#h2_min_workers)
+* [`h2_modern_tls_only`](#h2_modern_tls_only)
+* [`h2_push`](#h2_push)
+* [`h2_push_diary_size`](#h2_push_diary_size)
+* [`h2_priority`](#h2_priority)
+* [`h2_push_resource`](#h2_push_resource)
+* [`h2_serialize_headers`](#h2_serialize_headers)
+* [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
+* [`h2_tls_cool_down_secs`](#h2_tls_cool_down_secs)
+* [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
+* [`h2_upgrade`](#h2_upgrade)
+* [`h2_window_size`](#h2_window_size)
+* [`apache_version`](#apache_version)
+* [`h2_push_priority`](#h2_push_priority)
+
+##### <a name="h2_copy_files"></a>`h2_copy_files`
 
 Data type: `Optional[Boolean]`
 
@@ -2395,7 +2630,7 @@ Determine file handling in responses.
 
 Default value: ``undef``
 
-##### `h2_direct`
+##### <a name="h2_direct"></a>`h2_direct`
 
 Data type: `Optional[Boolean]`
 
@@ -2403,7 +2638,7 @@ H2 Direct Protocol Switch.
 
 Default value: ``undef``
 
-##### `h2_early_hints`
+##### <a name="h2_early_hints"></a>`h2_early_hints`
 
 Data type: `Optional[Boolean]`
 
@@ -2411,7 +2646,7 @@ Determine sending of 103 status codes.
 
 Default value: ``undef``
 
-##### `h2_max_session_streams`
+##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
 
 Data type: `Optional[Integer]`
 
@@ -2419,7 +2654,7 @@ Sets maximum number of active streams per HTTP/2 session.
 
 Default value: ``undef``
 
-##### `h2_max_worker_idle_seconds`
+##### <a name="h2_max_worker_idle_seconds"></a>`h2_max_worker_idle_seconds`
 
 Data type: `Optional[Integer]`
 
@@ -2427,7 +2662,7 @@ Sets maximum number of seconds h2 workers remain idle until shut down.
 
 Default value: ``undef``
 
-##### `h2_max_workers`
+##### <a name="h2_max_workers"></a>`h2_max_workers`
 
 Data type: `Optional[Integer]`
 
@@ -2435,7 +2670,7 @@ Sets maximum number of worker threads to use per child process.
 
 Default value: ``undef``
 
-##### `h2_min_workers`
+##### <a name="h2_min_workers"></a>`h2_min_workers`
 
 Data type: `Optional[Integer]`
 
@@ -2443,7 +2678,7 @@ Sets minimal number of worker threads to use per child process.
 
 Default value: ``undef``
 
-##### `h2_modern_tls_only`
+##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
 
 Data type: `Optional[Boolean]`
 
@@ -2451,7 +2686,7 @@ Toggles the security checks on HTTP/2 connections in TLS mode
 
 Default value: ``undef``
 
-##### `h2_push`
+##### <a name="h2_push"></a>`h2_push`
 
 Data type: `Optional[Boolean]`
 
@@ -2459,7 +2694,7 @@ Toggles the usage of the HTTP/2 server push protocol feature.
 
 Default value: ``undef``
 
-##### `h2_push_diary_size`
+##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
 
 Data type: `Optional[Integer]`
 
@@ -2467,11 +2702,11 @@ Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 conne
 
 Default value: ``undef``
 
-##### `h2_priority`
+##### <a name="h2_priority"></a>`h2_priority`
 
 Require HTTP/2 connections to be "modern TLS" only
 
-##### `h2_push_resource`
+##### <a name="h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
 
@@ -2480,7 +2715,7 @@ via this directive
 
 Default value: `[]`
 
-##### `h2_serialize_headers`
+##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
 
 Data type: `Optional[Boolean]`
 
@@ -2489,7 +2724,7 @@ core or if received binary data shall be passed into the request_recs directly.
 
 Default value: ``undef``
 
-##### `h2_stream_max_mem_size`
+##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
 Data type: `Optional[Integer]`
 
@@ -2497,7 +2732,7 @@ Sets the maximum number of outgoing data bytes buffered in memory for an active
 
 Default value: ``undef``
 
-##### `h2_tls_cool_down_secs`
+##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
 Data type: `Optional[Integer]`
 
@@ -2506,7 +2741,7 @@ back to small (~1300 bytes) length.
 
 Default value: ``undef``
 
-##### `h2_tls_warm_up_size`
+##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
 Data type: `Optional[Integer]`
 
@@ -2515,7 +2750,7 @@ sized writes (16k) on https: HTTP/2 connections.
 
 Default value: ``undef``
 
-##### `h2_upgrade`
+##### <a name="h2_upgrade"></a>`h2_upgrade`
 
 Data type: `Optional[Boolean]`
 
@@ -2523,7 +2758,7 @@ Toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2.
 
 Default value: ``undef``
 
-##### `h2_window_size`
+##### <a name="h2_window_size"></a>`h2_window_size`
 
 Data type: `Optional[Integer]`
 
@@ -2532,7 +2767,7 @@ the amount of data the server has to buffer.
 
 Default value: ``undef``
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -2540,7 +2775,7 @@ Version of Apache to install module on.
 
 Default value: ``undef``
 
-##### `h2_push_priority`
+##### <a name="h2_push_priority"></a>`h2_push_priority`
 
 Data type: `Array[String]`
 
@@ -2548,7 +2783,7 @@ Data type: `Array[String]`
 
 Default value: `[]`
 
-### `apache::mod::include`
+### <a name="apachemodinclude"></a>`apache::mod::include`
 
 Installs `mod_include`.
 
@@ -2556,7 +2791,7 @@ Installs `mod_include`.
   * https://httpd.apache.org/docs/current/mod/mod_include.html
     * for additional documentation.
 
-### `apache::mod::info`
+### <a name="apachemodinfo"></a>`apache::mod::info`
 
 Installs and configures `mod_info`.
 
@@ -2566,9 +2801,14 @@ Installs and configures `mod_info`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::info` class.
+The following parameters are available in the `apache::mod::info` class:
+
+* [`allow_from`](#allow_from)
+* [`apache_version`](#apache_version)
+* [`restrict_access`](#restrict_access)
+* [`info_path`](#info_path)
 
-##### `allow_from`
+##### <a name="allow_from"></a>`allow_from`
 
 Data type: `Any`
 
@@ -2576,7 +2816,7 @@ Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 
 Default value: `['127.0.0.1','::1']`
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -2584,7 +2824,7 @@ Version of Apache to install module on.
 
 Default value: ``undef``
 
-##### `restrict_access`
+##### <a name="restrict_access"></a>`restrict_access`
 
 Data type: `Any`
 
@@ -2593,7 +2833,7 @@ access the info path.
 
 Default value: ``true``
 
-##### `info_path`
+##### <a name="info_path"></a>`info_path`
 
 Data type: `Any`
 
@@ -2601,7 +2841,7 @@ Path on server to file containing server configuration information.
 
 Default value: `'/server-info'`
 
-### `apache::mod::intercept_form_submit`
+### <a name="apachemodintercept_form_submit"></a>`apache::mod::intercept_form_submit`
 
 Installs `mod_intercept_form_submit`.
 
@@ -2609,7 +2849,7 @@ Installs `mod_intercept_form_submit`.
   * https://www.adelton.com/apache/mod_intercept_form_submit
     * for additional documentation.
 
-### `apache::mod::itk`
+### <a name="apachemoditk"></a>`apache::mod::itk`
 
 Installs MPM `mod_itk`.
 
@@ -2621,9 +2861,18 @@ Installs MPM `mod_itk`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::itk` class.
+The following parameters are available in the `apache::mod::itk` class:
 
-##### `startservers`
+* [`startservers`](#startservers)
+* [`minspareservers`](#minspareservers)
+* [`maxspareservers`](#maxspareservers)
+* [`serverlimit`](#serverlimit)
+* [`maxclients`](#maxclients)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`enablecapabilities`](#enablecapabilities)
+* [`apache_version`](#apache_version)
+
+##### <a name="startservers"></a>`startservers`
 
 Data type: `Any`
 
@@ -2631,7 +2880,7 @@ Number of child server processes created on startup.
 
 Default value: `'8'`
 
-##### `minspareservers`
+##### <a name="minspareservers"></a>`minspareservers`
 
 Data type: `Any`
 
@@ -2639,7 +2888,7 @@ Minimum number of idle child server processes.
 
 Default value: `'5'`
 
-##### `maxspareservers`
+##### <a name="maxspareservers"></a>`maxspareservers`
 
 Data type: `Any`
 
@@ -2647,7 +2896,7 @@ Maximum number of idle child server processes.
 
 Default value: `'20'`
 
-##### `serverlimit`
+##### <a name="serverlimit"></a>`serverlimit`
 
 Data type: `Any`
 
@@ -2655,7 +2904,7 @@ Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache
 
 Default value: `'256'`
 
-##### `maxclients`
+##### <a name="maxclients"></a>`maxclients`
 
 Data type: `Any`
 
@@ -2663,7 +2912,7 @@ Limit on the number of simultaneous requests that will be served.
 
 Default value: `'256'`
 
-##### `maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Any`
 
@@ -2671,7 +2920,7 @@ Limit on the number of connections that an individual child server process will
 
 Default value: `'4000'`
 
-##### `enablecapabilities`
+##### <a name="enablecapabilities"></a>`enablecapabilities`
 
 Data type: `Any`
 
@@ -2681,7 +2930,7 @@ capabilities, such as NFS.
 
 Default value: ``undef``
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -2689,7 +2938,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-### `apache::mod::jk`
+### <a name="apachemodjk"></a>`apache::mod::jk`
 
 Installs `mod_jk`.
 
@@ -2736,9 +2985,53 @@ class { '::apache::mod::jk':
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::jk` class.
-
-##### `ip`
+The following parameters are available in the `apache::mod::jk` class:
+
+* [`ip`](#ip)
+* [`port`](#port)
+* [`add_listen`](#add_listen)
+* [`workers_file`](#workers_file)
+* [`worker_property`](#worker_property)
+* [`logroot`](#logroot)
+* [`shm_file`](#shm_file)
+* [`shm_size`](#shm_size)
+* [`mount_file`](#mount_file)
+* [`mount_file_reload`](#mount_file_reload)
+* [`mount`](#mount)
+* [`un_mount`](#un_mount)
+* [`auto_alias`](#auto_alias)
+* [`mount_copy`](#mount_copy)
+* [`worker_indicator`](#worker_indicator)
+* [`watchdog_interval`](#watchdog_interval)
+* [`log_file`](#log_file)
+* [`log_level`](#log_level)
+* [`log_stamp_format`](#log_stamp_format)
+* [`request_log_format`](#request_log_format)
+* [`extract_ssl`](#extract_ssl)
+* [`https_indicator`](#https_indicator)
+* [`sslprotocol_indicator`](#sslprotocol_indicator)
+* [`certs_indicator`](#certs_indicator)
+* [`cipher_indicator`](#cipher_indicator)
+* [`certchain_prefix`](#certchain_prefix)
+* [`session_indicator`](#session_indicator)
+* [`keysize_indicator`](#keysize_indicator)
+* [`local_name_indicator`](#local_name_indicator)
+* [`ignore_cl_indicator`](#ignore_cl_indicator)
+* [`local_addr_indicator`](#local_addr_indicator)
+* [`local_port_indicator`](#local_port_indicator)
+* [`remote_host_indicator`](#remote_host_indicator)
+* [`remote_addr_indicator`](#remote_addr_indicator)
+* [`remote_port_indicator`](#remote_port_indicator)
+* [`remote_user_indicator`](#remote_user_indicator)
+* [`auth_type_indicator`](#auth_type_indicator)
+* [`options`](#options)
+* [`env_var`](#env_var)
+* [`strip_session`](#strip_session)
+* [`workers_file_content`](#workers_file_content)
+* [`mount_file_content`](#mount_file_content)
+* [`location_list`](#location_list)
+
+##### <a name="ip"></a>`ip`
 
 Data type: `Optional[String]`
 
@@ -2746,7 +3039,7 @@ IP for binding to mod_jk. Useful when the binding address is not the primary net
 
 Default value: ``undef``
 
-##### `port`
+##### <a name="port"></a>`port`
 
 Data type: `Integer`
 
@@ -2755,7 +3048,7 @@ needs to forward them to Apache at a different port.
 
 Default value: `80`
 
-##### `add_listen`
+##### <a name="add_listen"></a>`add_listen`
 
 Data type: `Boolean`
 
@@ -2765,7 +3058,7 @@ necessary for mod_jk binding.
 
 Default value: ``true``
 
-##### `workers_file`
+##### <a name="workers_file"></a>`workers_file`
 
 Data type: `Any`
 
@@ -2773,7 +3066,7 @@ The name of a worker file for the Tomcat servlet containers.
 
 Default value: ``undef``
 
-##### `worker_property`
+##### <a name="worker_property"></a>`worker_property`
 
 Data type: `Any`
 
@@ -2781,7 +3074,7 @@ Enables setting worker properties inside Apache configuration file.
 
 Default value: `{}`
 
-##### `logroot`
+##### <a name="logroot"></a>`logroot`
 
 Data type: `Any`
 
@@ -2790,7 +3083,7 @@ apache::params::logroot. The default logroot is sane enough therefore it is not
 
 Default value: ``undef``
 
-##### `shm_file`
+##### <a name="shm_file"></a>`shm_file`
 
 Data type: `Any`
 
@@ -2798,7 +3091,7 @@ Shared memory file name.
 
 Default value: `'jk-runtime-status'`
 
-##### `shm_size`
+##### <a name="shm_size"></a>`shm_size`
 
 Data type: `Any`
 
@@ -2806,7 +3099,7 @@ Size of the shared memory file name.
 
 Default value: ``undef``
 
-##### `mount_file`
+##### <a name="mount_file"></a>`mount_file`
 
 Data type: `Any`
 
@@ -2814,7 +3107,7 @@ File containing multiple mappings from a context to a Tomcat worker.
 
 Default value: ``undef``
 
-##### `mount_file_reload`
+##### <a name="mount_file_reload"></a>`mount_file_reload`
 
 Data type: `Any`
 
@@ -2822,7 +3115,7 @@ This directive configures the reload check interval in seconds.
 
 Default value: ``undef``
 
-##### `mount`
+##### <a name="mount"></a>`mount`
 
 Data type: `Any`
 
@@ -2830,7 +3123,7 @@ A mount point from a context to a Tomcat worker.
 
 Default value: `{}`
 
-##### `un_mount`
+##### <a name="un_mount"></a>`un_mount`
 
 Data type: `Any`
 
@@ -2838,7 +3131,7 @@ An exclusion mount point from a context to a Tomcat worker.
 
 Default value: `{}`
 
-##### `auto_alias`
+##### <a name="auto_alias"></a>`auto_alias`
 
 Data type: `Any`
 
@@ -2846,7 +3139,7 @@ Automatically Alias webapp context directories into the Apache document space
 
 Default value: ``undef``
 
-##### `mount_copy`
+##### <a name="mount_copy"></a>`mount_copy`
 
 Data type: `Any`
 
@@ -2855,7 +3148,7 @@ to this virtual server, more precisely all mounts defined by JkMount or JkUnMoun
 
 Default value: ``undef``
 
-##### `worker_indicator`
+##### <a name="worker_indicator"></a>`worker_indicator`
 
 Data type: `Any`
 
@@ -2864,7 +3157,7 @@ jakarta-servlet.
 
 Default value: ``undef``
 
-##### `watchdog_interval`
+##### <a name="watchdog_interval"></a>`watchdog_interval`
 
 Data type: `Any`
 
@@ -2872,7 +3165,7 @@ This directive configures the watchdog thread interval in seconds.
 
 Default value: ``undef``
 
-##### `log_file`
+##### <a name="log_file"></a>`log_file`
 
 Data type: `Any`
 
@@ -2880,7 +3173,7 @@ Full or server relative path to the mod_jk log file.
 
 Default value: `'mod_jk.log'`
 
-##### `log_level`
+##### <a name="log_level"></a>`log_level`
 
 Data type: `Any`
 
@@ -2888,7 +3181,7 @@ The mod_jk log level, can be debug, info, warn error or trace.
 
 Default value: ``undef``
 
-##### `log_stamp_format`
+##### <a name="log_stamp_format"></a>`log_stamp_format`
 
 Data type: `Any`
 
@@ -2896,7 +3189,7 @@ The mod_jk date log format, using an extended strftime syntax.
 
 Default value: ``undef``
 
-##### `request_log_format`
+##### <a name="request_log_format"></a>`request_log_format`
 
 Data type: `Any`
 
@@ -2904,7 +3197,7 @@ Request log format string.
 
 Default value: ``undef``
 
-##### `extract_ssl`
+##### <a name="extract_ssl"></a>`extract_ssl`
 
 Data type: `Any`
 
@@ -2912,7 +3205,7 @@ Turns on SSL processing and information gathering by mod_jk.
 
 Default value: ``undef``
 
-##### `https_indicator`
+##### <a name="https_indicator"></a>`https_indicator`
 
 Data type: `Any`
 
@@ -2920,7 +3213,7 @@ Name of the Apache environment variable that contains SSL indication.
 
 Default value: ``undef``
 
-##### `sslprotocol_indicator`
+##### <a name="sslprotocol_indicator"></a>`sslprotocol_indicator`
 
 Data type: `Any`
 
@@ -2928,7 +3221,7 @@ Name of the Apache environment variable that contains the SSL protocol name.
 
 Default value: ``undef``
 
-##### `certs_indicator`
+##### <a name="certs_indicator"></a>`certs_indicator`
 
 Data type: `Any`
 
@@ -2936,7 +3229,7 @@ Name of the Apache environment variable that contains SSL client certificates.
 
 Default value: ``undef``
 
-##### `cipher_indicator`
+##### <a name="cipher_indicator"></a>`cipher_indicator`
 
 Data type: `Any`
 
@@ -2944,7 +3237,7 @@ Name of the Apache environment variable that contains SSL client cipher.
 
 Default value: ``undef``
 
-##### `certchain_prefix`
+##### <a name="certchain_prefix"></a>`certchain_prefix`
 
 Data type: `Any`
 
@@ -2952,7 +3245,7 @@ Name of the Apache environment (prefix) that contains SSL client chain certifica
 
 Default value: ``undef``
 
-##### `session_indicator`
+##### <a name="session_indicator"></a>`session_indicator`
 
 Data type: `Any`
 
@@ -2960,7 +3253,7 @@ Name of the Apache environment variable that contains SSL session.
 
 Default value: ``undef``
 
-##### `keysize_indicator`
+##### <a name="keysize_indicator"></a>`keysize_indicator`
 
 Data type: `Any`
 
@@ -2968,7 +3261,7 @@ Name of the Apache environment variable that contains SSL key size in use.
 
 Default value: ``undef``
 
-##### `local_name_indicator`
+##### <a name="local_name_indicator"></a>`local_name_indicator`
 
 Data type: `Any`
 
@@ -2976,7 +3269,7 @@ Name of the Apache environment variable which can be used to overwrite the forwa
 
 Default value: ``undef``
 
-##### `ignore_cl_indicator`
+##### <a name="ignore_cl_indicator"></a>`ignore_cl_indicator`
 
 Data type: `Any`
 
@@ -2984,7 +3277,7 @@ Name of the Apache environment variable which forces to ignore an existing Conte
 
 Default value: ``undef``
 
-##### `local_addr_indicator`
+##### <a name="local_addr_indicator"></a>`local_addr_indicator`
 
 Data type: `Any`
 
@@ -2992,7 +3285,7 @@ Name of the Apache environment variable which can be used to overwrite the forwa
 
 Default value: ``undef``
 
-##### `local_port_indicator`
+##### <a name="local_port_indicator"></a>`local_port_indicator`
 
 Data type: `Any`
 
@@ -3000,7 +3293,7 @@ Name of the Apache environment variable which can be used to overwrite the forwa
 
 Default value: ``undef``
 
-##### `remote_host_indicator`
+##### <a name="remote_host_indicator"></a>`remote_host_indicator`
 
 Data type: `Any`
 
@@ -3008,7 +3301,7 @@ Name of the Apache environment variable which can be used to overwrite the forwa
 
 Default value: ``undef``
 
-##### `remote_addr_indicator`
+##### <a name="remote_addr_indicator"></a>`remote_addr_indicator`
 
 Data type: `Any`
 
@@ -3016,7 +3309,7 @@ Name of the Apache environment variable which can be used to overwrite the forwa
 
 Default value: ``undef``
 
-##### `remote_port_indicator`
+##### <a name="remote_port_indicator"></a>`remote_port_indicator`
 
 Data type: `Any`
 
@@ -3024,7 +3317,7 @@ Name of the Apache environment variable which can be used to overwrite the forwa
 
 Default value: ``undef``
 
-##### `remote_user_indicator`
+##### <a name="remote_user_indicator"></a>`remote_user_indicator`
 
 Data type: `Any`
 
@@ -3032,7 +3325,7 @@ Name of the Apache environment variable which can be used to overwrite the forwa
 
 Default value: ``undef``
 
-##### `auth_type_indicator`
+##### <a name="auth_type_indicator"></a>`auth_type_indicator`
 
 Data type: `Any`
 
@@ -3040,7 +3333,7 @@ Name of the Apache environment variable which can be used to overwrite the forwa
 
 Default value: ``undef``
 
-##### `options`
+##### <a name="options"></a>`options`
 
 Data type: `Any`
 
@@ -3048,7 +3341,7 @@ Set one of more options to configure the mod_jk module.
 
 Default value: `[]`
 
-##### `env_var`
+##### <a name="env_var"></a>`env_var`
 
 Data type: `Any`
 
@@ -3056,7 +3349,7 @@ Adds a name and an optional default value of environment variable that should be
 
 Default value: `{}`
 
-##### `strip_session`
+##### <a name="strip_session"></a>`strip_session`
 
 Data type: `Any`
 
@@ -3065,7 +3358,7 @@ forwarded but instead are handled by the local server.
 
 Default value: ``undef``
 
-##### `workers_file_content`
+##### <a name="workers_file_content"></a>`workers_file_content`
 
 Data type: `Any`
 
@@ -3109,7 +3402,7 @@ $workers_file_content = {
 
 Default value: `{}`
 
-##### `mount_file_content`
+##### <a name="mount_file_content"></a>`mount_file_content`
 
 Data type: `Any`
 
@@ -3146,7 +3439,7 @@ $mount_file_content = {
 
 Default value: `{}`
 
-##### `location_list`
+##### <a name="location_list"></a>`location_list`
 
 Data type: `Any`
 
@@ -3154,7 +3447,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-### `apache::mod::ldap`
+### <a name="apachemodldap"></a>`apache::mod::ldap`
 
 Installs and configures `mod_ldap`.
 
@@ -3183,9 +3476,21 @@ class { 'apache::mod::ldap':
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::ldap` class.
+The following parameters are available in the `apache::mod::ldap` class:
 
-##### `apache_version`
+* [`apache_version`](#apache_version)
+* [`package_name`](#package_name)
+* [`ldap_trusted_global_cert_file`](#ldap_trusted_global_cert_file)
+* [`ldap_trusted_global_cert_type`](#ldap_trusted_global_cert_type)
+* [`ldap_shared_cache_size`](#ldap_shared_cache_size)
+* [`ldap_cache_entries`](#ldap_cache_entries)
+* [`ldap_cache_ttl`](#ldap_cache_ttl)
+* [`ldap_opcache_entries`](#ldap_opcache_entries)
+* [`ldap_opcache_ttl`](#ldap_opcache_ttl)
+* [`ldap_trusted_mode`](#ldap_trusted_mode)
+* [`ldap_path`](#ldap_path)
+
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -3193,7 +3498,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-##### `package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Any`
 
@@ -3201,7 +3506,7 @@ Specifies the custom package name.
 
 Default value: ``undef``
 
-##### `ldap_trusted_global_cert_file`
+##### <a name="ldap_trusted_global_cert_file"></a>`ldap_trusted_global_cert_file`
 
 Data type: `Any`
 
@@ -3209,7 +3514,7 @@ Sets the file or database containing global trusted Certificate Authority or glo
 
 Default value: ``undef``
 
-##### `ldap_trusted_global_cert_type`
+##### <a name="ldap_trusted_global_cert_type"></a>`ldap_trusted_global_cert_type`
 
 Data type: `Optional[String]`
 
@@ -3217,7 +3522,7 @@ Sets the certificate parameter of the global trusted Certificate Authority or gl
 
 Default value: `'CA_BASE64'`
 
-##### `ldap_shared_cache_size`
+##### <a name="ldap_shared_cache_size"></a>`ldap_shared_cache_size`
 
 Data type: `Any`
 
@@ -3225,7 +3530,7 @@ Size in bytes of the shared-memory cache
 
 Default value: ``undef``
 
-##### `ldap_cache_entries`
+##### <a name="ldap_cache_entries"></a>`ldap_cache_entries`
 
 Data type: `Any`
 
@@ -3233,7 +3538,7 @@ Maximum number of entries in the primary LDAP cache
 
 Default value: ``undef``
 
-##### `ldap_cache_ttl`
+##### <a name="ldap_cache_ttl"></a>`ldap_cache_ttl`
 
 Data type: `Any`
 
@@ -3241,7 +3546,7 @@ Time that cached items remain valid (in seconds).
 
 Default value: ``undef``
 
-##### `ldap_opcache_entries`
+##### <a name="ldap_opcache_entries"></a>`ldap_opcache_entries`
 
 Data type: `Any`
 
@@ -3249,7 +3554,7 @@ Number of entries used to cache LDAP compare operations
 
 Default value: ``undef``
 
-##### `ldap_opcache_ttl`
+##### <a name="ldap_opcache_ttl"></a>`ldap_opcache_ttl`
 
 Data type: `Any`
 
@@ -3257,7 +3562,7 @@ Time that entries in the operation cache remain valid (in seconds).
 
 Default value: ``undef``
 
-##### `ldap_trusted_mode`
+##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
 
 Data type: `Any`
 
@@ -3265,7 +3570,7 @@ Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
 
 Default value: ``undef``
 
-##### `ldap_path`
+##### <a name="ldap_path"></a>`ldap_path`
 
 Data type: `String`
 
@@ -3273,7 +3578,7 @@ The server location of the ldap status page.
 
 Default value: `'/ldap-status'`
 
-### `apache::mod::lookup_identity`
+### <a name="apachemodlookup_identity"></a>`apache::mod::lookup_identity`
 
 Installs `mod_lookup_identity`
 
@@ -3281,7 +3586,7 @@ Installs `mod_lookup_identity`
   * https://www.adelton.com/apache/mod_lookup_identity
     * for additional documentation.
 
-### `apache::mod::macro`
+### <a name="apachemodmacro"></a>`apache::mod::macro`
 
 Installs `mod_macro`.
 
@@ -3289,7 +3594,278 @@ Installs `mod_macro`.
   * https://httpd.apache.org/docs/current/mod/mod_macro.html
     * for additional documentation.
 
-### `apache::mod::mime`
+### <a name="apachemodmd"></a>`apache::mod::md`
+
+Installs and configures `mod_md`.
+
+* **Note** Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
+
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/mod_md.html
+    * for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::md` class:
+
+* [`md_activation_delay`](#md_activation_delay)
+* [`md_base_server`](#md_base_server)
+* [`md_ca_challenges`](#md_ca_challenges)
+* [`md_certificate_agreement`](#md_certificate_agreement)
+* [`md_certificate_authority`](#md_certificate_authority)
+* [`md_certificate_check`](#md_certificate_check)
+* [`md_certificate_monitor`](#md_certificate_monitor)
+* [`md_certificate_protocol`](#md_certificate_protocol)
+* [`md_certificate_status`](#md_certificate_status)
+* [`md_challenge_dns01`](#md_challenge_dns01)
+* [`md_contact_email`](#md_contact_email)
+* [`md_http_proxy`](#md_http_proxy)
+* [`md_members`](#md_members)
+* [`md_message_cmd`](#md_message_cmd)
+* [`md_must_staple`](#md_must_staple)
+* [`md_notify_cmd`](#md_notify_cmd)
+* [`md_port_map`](#md_port_map)
+* [`md_private_keys`](#md_private_keys)
+* [`md_renew_mode`](#md_renew_mode)
+* [`md_renew_window`](#md_renew_window)
+* [`md_require_https`](#md_require_https)
+* [`md_server_status`](#md_server_status)
+* [`md_staple_others`](#md_staple_others)
+* [`md_stapling`](#md_stapling)
+* [`md_stapling_keep_response`](#md_stapling_keep_response)
+* [`md_stapling_renew_window`](#md_stapling_renew_window)
+* [`md_store_dir`](#md_store_dir)
+* [`md_warn_window`](#md_warn_window)
+
+##### <a name="md_activation_delay"></a>`md_activation_delay`
+
+Data type: `Optional[String]`
+
+-
+
+Default value: ``undef``
+
+##### <a name="md_base_server"></a>`md_base_server`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Control if base server may be managed or only virtual hosts.
+
+Default value: ``undef``
+
+##### <a name="md_ca_challenges"></a>`md_ca_challenges`
+
+Data type: `Optional[Array[Enum['dns-01', 'http-01', 'tls-alpn-01']]]`
+
+Type of ACME challenge used to prove domain ownership.
+
+Default value: ``undef``
+
+##### <a name="md_certificate_agreement"></a>`md_certificate_agreement`
+
+Data type: `Optional[Enum['accepted']]`
+
+You confirm that you accepted the Terms of Service of the Certificate
+Authority.
+
+Default value: ``undef``
+
+##### <a name="md_certificate_authority"></a>`md_certificate_authority`
+
+Data type: `Optional[Stdlib::HTTPUrl]`
+
+The URL of the ACME Certificate Authority service.
+
+Default value: ``undef``
+
+##### <a name="md_certificate_check"></a>`md_certificate_check`
+
+Data type: `Optional[String]`
+
+-
+
+Default value: ``undef``
+
+##### <a name="md_certificate_monitor"></a>`md_certificate_monitor`
+
+Data type: `Optional[String]`
+
+The URL of a certificate log monitor.
+
+Default value: ``undef``
+
+##### <a name="md_certificate_protocol"></a>`md_certificate_protocol`
+
+Data type: `Optional[Enum['ACME']]`
+
+The protocol to use with the Certificate Authority.
+
+Default value: ``undef``
+
+##### <a name="md_certificate_status"></a>`md_certificate_status`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Exposes public certificate information in JSON.
+
+Default value: ``undef``
+
+##### <a name="md_challenge_dns01"></a>`md_challenge_dns01`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Define a program to be called when the `dns-01` challenge needs to be
+setup/torn down.
+
+Default value: ``undef``
+
+##### <a name="md_contact_email"></a>`md_contact_email`
+
+Data type: `Optional[String]`
+
+The ACME protocol requires you to give a contact url when you sign up.
+
+Default value: ``undef``
+
+##### <a name="md_http_proxy"></a>`md_http_proxy`
+
+Data type: `Optional[Stdlib::HTTPUrl]`
+
+Define a proxy for outgoing connections.
+
+Default value: ``undef``
+
+##### <a name="md_members"></a>`md_members`
+
+Data type: `Optional[Enum['auto', 'manual']]`
+
+Control if the alias domain names are automatically added.
+
+Default value: ``undef``
+
+##### <a name="md_message_cmd"></a>`md_message_cmd`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Handle events for Manage Domains.
+
+Default value: ``undef``
+
+##### <a name="md_must_staple"></a>`md_must_staple`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Control if new certificates carry the OCSP Must Staple flag.
+
+Default value: ``undef``
+
+##### <a name="md_notify_cmd"></a>`md_notify_cmd`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Run a program when a Managed Domain is ready.
+
+Default value: ``undef``
+
+##### <a name="md_port_map"></a>`md_port_map`
+
+Data type: `Optional[String]`
+
+Map external to internal ports for domain ownership verification.
+
+Default value: ``undef``
+
+##### <a name="md_private_keys"></a>`md_private_keys`
+
+Data type: `Optional[String]`
+
+Set type and size of the private keys generated.
+
+Default value: ``undef``
+
+##### <a name="md_renew_mode"></a>`md_renew_mode`
+
+Data type: `Optional[Enum['always', 'auto', 'manual']]`
+
+Controls if certificates shall be renewed.
+
+Default value: ``undef``
+
+##### <a name="md_renew_window"></a>`md_renew_window`
+
+Data type: `Optional[String]`
+
+Control when a certificate will be renewed.
+
+Default value: ``undef``
+
+##### <a name="md_require_https"></a>`md_require_https`
+
+Data type: `Optional[Enum['off', 'permanent', 'temporary']]`
+
+Redirects http: traffic to https: for Managed Domains.
+An http: Virtual Host must nevertheless be setup for that domain.
+
+Default value: ``undef``
+
+##### <a name="md_server_status"></a>`md_server_status`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Control if Managed Domain information is added to server-status.
+
+Default value: ``undef``
+
+##### <a name="md_staple_others"></a>`md_staple_others`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Enable stapling for certificates not managed by mod_md.
+
+Default value: ``undef``
+
+##### <a name="md_stapling"></a>`md_stapling`
+
+Data type: `Optional[Enum['on', 'off']]`
+
+Enable stapling for all or a particular MDomain.
+
+Default value: ``undef``
+
+##### <a name="md_stapling_keep_response"></a>`md_stapling_keep_response`
+
+Data type: `Optional[String]`
+
+Controls when old responses should be removed.
+
+Default value: ``undef``
+
+##### <a name="md_stapling_renew_window"></a>`md_stapling_renew_window`
+
+Data type: `Optional[String]`
+
+Control when the stapling responses will be renewed.
+
+Default value: ``undef``
+
+##### <a name="md_store_dir"></a>`md_store_dir`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Path on the local file system to store the Managed Domains data.
+
+Default value: ``undef``
+
+##### <a name="md_warn_window"></a>`md_warn_window`
+
+Data type: `Optional[String]`
+
+Define the time window when you want to be warned about an expiring
+certificate.
+
+Default value: ``undef``
+
+### <a name="apachemodmime"></a>`apache::mod::mime`
 
 Installs and configures `mod_mime`.
 
@@ -3299,9 +3875,13 @@ Installs and configures `mod_mime`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::mime` class.
+The following parameters are available in the `apache::mod::mime` class:
+
+* [`mime_support_package`](#mime_support_package)
+* [`mime_types_config`](#mime_types_config)
+* [`mime_types_additional`](#mime_types_additional)
 
-##### `mime_support_package`
+##### <a name="mime_support_package"></a>`mime_support_package`
 
 Data type: `Any`
 
@@ -3309,7 +3889,7 @@ Name of the MIME package to be installed.
 
 Default value: `$apache::params::mime_support_package`
 
-##### `mime_types_config`
+##### <a name="mime_types_config"></a>`mime_types_config`
 
 Data type: `Any`
 
@@ -3317,7 +3897,7 @@ The location of the mime.types file.
 
 Default value: `$apache::params::mime_types_config`
 
-##### `mime_types_additional`
+##### <a name="mime_types_additional"></a>`mime_types_additional`
 
 Data type: `Any`
 
@@ -3325,7 +3905,7 @@ List of additional MIME types to include.
 
 Default value: ``undef``
 
-### `apache::mod::mime_magic`
+### <a name="apachemodmime_magic"></a>`apache::mod::mime_magic`
 
 Installs and configures `mod_mime_magic`.
 
@@ -3335,9 +3915,11 @@ Installs and configures `mod_mime_magic`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::mime_magic` class.
+The following parameters are available in the `apache::mod::mime_magic` class:
 
-##### `magic_file`
+* [`magic_file`](#magic_file)
+
+##### <a name="magic_file"></a>`magic_file`
 
 Data type: `Any`
 
@@ -3345,7 +3927,7 @@ Enable MIME-type determination based on file contents using the specified magic
 
 Default value: ``undef``
 
-### `apache::mod::negotiation`
+### <a name="apachemodnegotiation"></a>`apache::mod::negotiation`
 
 Installs and configures `mod_negotiation`.
 
@@ -3355,9 +3937,12 @@ Installs and configures `mod_negotiation`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::negotiation` class.
+The following parameters are available in the `apache::mod::negotiation` class:
+
+* [`force_language_priority`](#force_language_priority)
+* [`language_priority`](#language_priority)
 
-##### `force_language_priority`
+##### <a name="force_language_priority"></a>`force_language_priority`
 
 Data type: `Variant[Array[String], String]`
 
@@ -3365,7 +3950,7 @@ Action to take if a single acceptable document is not found.
 
 Default value: `'Prefer Fallback'`
 
-##### `language_priority`
+##### <a name="language_priority"></a>`language_priority`
 
 Data type: `Variant[Array[String], String]`
 
@@ -3376,7 +3961,7 @@ Default value: `['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
     'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
   'zh-TW']`
 
-### `apache::mod::nss`
+### <a name="apachemodnss"></a>`apache::mod::nss`
 
 Installs and configures `mod_nss`.
 
@@ -3386,9 +3971,15 @@ Installs and configures `mod_nss`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::nss` class.
+The following parameters are available in the `apache::mod::nss` class:
 
-##### `transfer_log`
+* [`transfer_log`](#transfer_log)
+* [`error_Log`](#error_Log)
+* [`passwd_file`](#passwd_file)
+* [`port`](#port)
+* [`error_log`](#error_log)
+
+##### <a name="transfer_log"></a>`transfer_log`
 
 Data type: `Any`
 
@@ -3396,11 +3987,11 @@ Path to `access.log`.
 
 Default value: `"${apache::params::logroot}/access.log"`
 
-##### `error_Log`
+##### <a name="error_Log"></a>`error_Log`
 
 Path to `error.log`
 
-##### `passwd_file`
+##### <a name="passwd_file"></a>`passwd_file`
 
 Data type: `Any`
 
@@ -3408,7 +3999,7 @@ Path to file containing token passwords used for NSSPassPhraseDialog.
 
 Default value: ``undef``
 
-##### `port`
+##### <a name="port"></a>`port`
 
 Data type: `Any`
 
@@ -3416,7 +4007,7 @@ Sets the SSL port that should be used by mod_nss.
 
 Default value: `8443`
 
-##### `error_log`
+##### <a name="error_log"></a>`error_log`
 
 Data type: `Any`
 
@@ -3424,7 +4015,7 @@ Data type: `Any`
 
 Default value: `"${apache::params::logroot}/error.log"`
 
-### `apache::mod::pagespeed`
+### <a name="apachemodpagespeed"></a>`apache::mod::pagespeed`
 
 Although this apache module requires the mod-pagespeed-stable package, Puppet does not manage the software repositories required to
 automatically install the package. If you declare this class when the package is either not installed or not available to your
@@ -3440,9 +4031,45 @@ package manager, your Puppet run will fail.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::pagespeed` class.
-
-##### `inherit_vhost_config`
+The following parameters are available in the `apache::mod::pagespeed` class:
+
+* [`inherit_vhost_config`](#inherit_vhost_config)
+* [`filter_xhtml`](#filter_xhtml)
+* [`cache_path`](#cache_path)
+* [`log_dir`](#log_dir)
+* [`memcache_servers`](#memcache_servers)
+* [`rewrite_level`](#rewrite_level)
+* [`disable_filters`](#disable_filters)
+* [`enable_filters`](#enable_filters)
+* [`forbid_filters`](#forbid_filters)
+* [`rewrite_deadline_per_flush_ms`](#rewrite_deadline_per_flush_ms)
+* [`additional_domains`](#additional_domains)
+* [`file_cache_size_kb`](#file_cache_size_kb)
+* [`file_cache_clean_interval_ms`](#file_cache_clean_interval_ms)
+* [`lru_cache_per_process`](#lru_cache_per_process)
+* [`lru_cache_byte_limit`](#lru_cache_byte_limit)
+* [`css_flatten_max_bytes`](#css_flatten_max_bytes)
+* [`css_inline_max_bytes`](#css_inline_max_bytes)
+* [`css_image_inline_max_bytes`](#css_image_inline_max_bytes)
+* [`image_inline_max_bytes`](#image_inline_max_bytes)
+* [`js_inline_max_bytes`](#js_inline_max_bytes)
+* [`css_outline_min_bytes`](#css_outline_min_bytes)
+* [`js_outline_min_bytes`](#js_outline_min_bytes)
+* [`inode_limit`](#inode_limit)
+* [`image_max_rewrites_at_once`](#image_max_rewrites_at_once)
+* [`num_rewrite_threads`](#num_rewrite_threads)
+* [`num_expensive_rewrite_threads`](#num_expensive_rewrite_threads)
+* [`collect_statistics`](#collect_statistics)
+* [`statistics_logging`](#statistics_logging)
+* [`allow_view_stats`](#allow_view_stats)
+* [`allow_pagespeed_console`](#allow_pagespeed_console)
+* [`allow_pagespeed_message`](#allow_pagespeed_message)
+* [`message_buffer_size`](#message_buffer_size)
+* [`additional_configuration`](#additional_configuration)
+* [`apache_version`](#apache_version)
+* [`package_ensure`](#package_ensure)
+
+##### <a name="inherit_vhost_config"></a>`inherit_vhost_config`
 
 Data type: `Any`
 
@@ -3450,7 +4077,7 @@ Data type: `Any`
 
 Default value: `'on'`
 
-##### `filter_xhtml`
+##### <a name="filter_xhtml"></a>`filter_xhtml`
 
 Data type: `Any`
 
@@ -3458,7 +4085,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `cache_path`
+##### <a name="cache_path"></a>`cache_path`
 
 Data type: `Any`
 
@@ -3466,7 +4093,7 @@ Data type: `Any`
 
 Default value: `'/var/cache/mod_pagespeed/'`
 
-##### `log_dir`
+##### <a name="log_dir"></a>`log_dir`
 
 Data type: `Any`
 
@@ -3474,7 +4101,7 @@ Data type: `Any`
 
 Default value: `'/var/log/pagespeed'`
 
-##### `memcache_servers`
+##### <a name="memcache_servers"></a>`memcache_servers`
 
 Data type: `Any`
 
@@ -3482,7 +4109,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `rewrite_level`
+##### <a name="rewrite_level"></a>`rewrite_level`
 
 Data type: `Any`
 
@@ -3490,7 +4117,7 @@ Data type: `Any`
 
 Default value: `'CoreFilters'`
 
-##### `disable_filters`
+##### <a name="disable_filters"></a>`disable_filters`
 
 Data type: `Any`
 
@@ -3498,7 +4125,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `enable_filters`
+##### <a name="enable_filters"></a>`enable_filters`
 
 Data type: `Any`
 
@@ -3506,7 +4133,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `forbid_filters`
+##### <a name="forbid_filters"></a>`forbid_filters`
 
 Data type: `Any`
 
@@ -3514,7 +4141,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `rewrite_deadline_per_flush_ms`
+##### <a name="rewrite_deadline_per_flush_ms"></a>`rewrite_deadline_per_flush_ms`
 
 Data type: `Any`
 
@@ -3522,7 +4149,7 @@ Data type: `Any`
 
 Default value: `10`
 
-##### `additional_domains`
+##### <a name="additional_domains"></a>`additional_domains`
 
 Data type: `Any`
 
@@ -3530,7 +4157,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `file_cache_size_kb`
+##### <a name="file_cache_size_kb"></a>`file_cache_size_kb`
 
 Data type: `Any`
 
@@ -3538,7 +4165,7 @@ Data type: `Any`
 
 Default value: `102400`
 
-##### `file_cache_clean_interval_ms`
+##### <a name="file_cache_clean_interval_ms"></a>`file_cache_clean_interval_ms`
 
 Data type: `Any`
 
@@ -3546,7 +4173,7 @@ Data type: `Any`
 
 Default value: `3600000`
 
-##### `lru_cache_per_process`
+##### <a name="lru_cache_per_process"></a>`lru_cache_per_process`
 
 Data type: `Any`
 
@@ -3554,7 +4181,7 @@ Data type: `Any`
 
 Default value: `1024`
 
-##### `lru_cache_byte_limit`
+##### <a name="lru_cache_byte_limit"></a>`lru_cache_byte_limit`
 
 Data type: `Any`
 
@@ -3562,7 +4189,7 @@ Data type: `Any`
 
 Default value: `16384`
 
-##### `css_flatten_max_bytes`
+##### <a name="css_flatten_max_bytes"></a>`css_flatten_max_bytes`
 
 Data type: `Any`
 
@@ -3570,7 +4197,7 @@ Data type: `Any`
 
 Default value: `2048`
 
-##### `css_inline_max_bytes`
+##### <a name="css_inline_max_bytes"></a>`css_inline_max_bytes`
 
 Data type: `Any`
 
@@ -3578,7 +4205,7 @@ Data type: `Any`
 
 Default value: `2048`
 
-##### `css_image_inline_max_bytes`
+##### <a name="css_image_inline_max_bytes"></a>`css_image_inline_max_bytes`
 
 Data type: `Any`
 
@@ -3586,7 +4213,7 @@ Data type: `Any`
 
 Default value: `2048`
 
-##### `image_inline_max_bytes`
+##### <a name="image_inline_max_bytes"></a>`image_inline_max_bytes`
 
 Data type: `Any`
 
@@ -3594,7 +4221,7 @@ Data type: `Any`
 
 Default value: `2048`
 
-##### `js_inline_max_bytes`
+##### <a name="js_inline_max_bytes"></a>`js_inline_max_bytes`
 
 Data type: `Any`
 
@@ -3602,7 +4229,7 @@ Data type: `Any`
 
 Default value: `2048`
 
-##### `css_outline_min_bytes`
+##### <a name="css_outline_min_bytes"></a>`css_outline_min_bytes`
 
 Data type: `Any`
 
@@ -3610,7 +4237,7 @@ Data type: `Any`
 
 Default value: `3000`
 
-##### `js_outline_min_bytes`
+##### <a name="js_outline_min_bytes"></a>`js_outline_min_bytes`
 
 Data type: `Any`
 
@@ -3618,7 +4245,7 @@ Data type: `Any`
 
 Default value: `3000`
 
-##### `inode_limit`
+##### <a name="inode_limit"></a>`inode_limit`
 
 Data type: `Any`
 
@@ -3626,7 +4253,7 @@ Data type: `Any`
 
 Default value: `500000`
 
-##### `image_max_rewrites_at_once`
+##### <a name="image_max_rewrites_at_once"></a>`image_max_rewrites_at_once`
 
 Data type: `Any`
 
@@ -3634,7 +4261,7 @@ Data type: `Any`
 
 Default value: `8`
 
-##### `num_rewrite_threads`
+##### <a name="num_rewrite_threads"></a>`num_rewrite_threads`
 
 Data type: `Any`
 
@@ -3642,7 +4269,7 @@ Data type: `Any`
 
 Default value: `4`
 
-##### `num_expensive_rewrite_threads`
+##### <a name="num_expensive_rewrite_threads"></a>`num_expensive_rewrite_threads`
 
 Data type: `Any`
 
@@ -3650,7 +4277,7 @@ Data type: `Any`
 
 Default value: `4`
 
-##### `collect_statistics`
+##### <a name="collect_statistics"></a>`collect_statistics`
 
 Data type: `Any`
 
@@ -3658,7 +4285,7 @@ Data type: `Any`
 
 Default value: `'on'`
 
-##### `statistics_logging`
+##### <a name="statistics_logging"></a>`statistics_logging`
 
 Data type: `Any`
 
@@ -3666,7 +4293,7 @@ Data type: `Any`
 
 Default value: `'on'`
 
-##### `allow_view_stats`
+##### <a name="allow_view_stats"></a>`allow_view_stats`
 
 Data type: `Any`
 
@@ -3674,7 +4301,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `allow_pagespeed_console`
+##### <a name="allow_pagespeed_console"></a>`allow_pagespeed_console`
 
 Data type: `Any`
 
@@ -3682,7 +4309,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `allow_pagespeed_message`
+##### <a name="allow_pagespeed_message"></a>`allow_pagespeed_message`
 
 Data type: `Any`
 
@@ -3690,7 +4317,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `message_buffer_size`
+##### <a name="message_buffer_size"></a>`message_buffer_size`
 
 Data type: `Any`
 
@@ -3698,7 +4325,7 @@ Data type: `Any`
 
 Default value: `100000`
 
-##### `additional_configuration`
+##### <a name="additional_configuration"></a>`additional_configuration`
 
 Data type: `Any`
 
@@ -3706,7 +4333,7 @@ Data type: `Any`
 
 Default value: `{}`
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -3714,7 +4341,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `package_ensure`
+##### <a name="package_ensure"></a>`package_ensure`
 
 Data type: `Any`
 
@@ -3722,7 +4349,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-### `apache::mod::passenger`
+### <a name="apachemodpassenger"></a>`apache::mod::passenger`
 
 The current set of server configurations settings were taken directly from the Passenger Reference. To enable deprecation warnings
 and removal failure messages, set the passenger_installed_version to the version number installed on the server.
@@ -3743,9 +4370,104 @@ There are also several undocumented settings.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::passenger` class.
-
-##### `manage_repo`
+The following parameters are available in the `apache::mod::passenger` class:
+
+* [`manage_repo`](#manage_repo)
+* [`mod_id`](#mod_id)
+* [`mod_lib`](#mod_lib)
+* [`mod_lib_path`](#mod_lib_path)
+* [`mod_package`](#mod_package)
+* [`mod_package_ensure`](#mod_package_ensure)
+* [`mod_path`](#mod_path)
+* [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
+* [`passenger_app_env`](#passenger_app_env)
+* [`passenger_app_group_name`](#passenger_app_group_name)
+* [`passenger_app_root`](#passenger_app_root)
+* [`passenger_app_type`](#passenger_app_type)
+* [`passenger_base_uri`](#passenger_base_uri)
+* [`passenger_buffer_response`](#passenger_buffer_response)
+* [`passenger_buffer_upload`](#passenger_buffer_upload)
+* [`passenger_concurrency_model`](#passenger_concurrency_model)
+* [`passenger_conf_file`](#passenger_conf_file)
+* [`passenger_conf_package_file`](#passenger_conf_package_file)
+* [`passenger_data_buffer_dir`](#passenger_data_buffer_dir)
+* [`passenger_debug_log_file`](#passenger_debug_log_file)
+* [`passenger_debugger`](#passenger_debugger)
+* [`passenger_default_group`](#passenger_default_group)
+* [`passenger_default_ruby`](#passenger_default_ruby)
+* [`passenger_default_user`](#passenger_default_user)
+* [`passenger_disable_security_update_check`](#passenger_disable_security_update_check)
+* [`passenger_enabled`](#passenger_enabled)
+* [`passenger_error_override`](#passenger_error_override)
+* [`passenger_file_descriptor_log_file`](#passenger_file_descriptor_log_file)
+* [`passenger_fly_with`](#passenger_fly_with)
+* [`passenger_force_max_concurrent_requests_per_process`](#passenger_force_max_concurrent_requests_per_process)
+* [`passenger_friendly_error_pages`](#passenger_friendly_error_pages)
+* [`passenger_group`](#passenger_group)
+* [`passenger_high_performance`](#passenger_high_performance)
+* [`passenger_installed_version`](#passenger_installed_version)
+* [`passenger_instance_registry_dir`](#passenger_instance_registry_dir)
+* [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
+* [`passenger_log_file`](#passenger_log_file)
+* [`passenger_log_level`](#passenger_log_level)
+* [`passenger_lve_min_uid`](#passenger_lve_min_uid)
+* [`passenger_max_instances`](#passenger_max_instances)
+* [`passenger_max_instances_per_app`](#passenger_max_instances_per_app)
+* [`passenger_max_pool_size`](#passenger_max_pool_size)
+* [`passenger_max_preloader_idle_time`](#passenger_max_preloader_idle_time)
+* [`passenger_max_request_queue_size`](#passenger_max_request_queue_size)
+* [`passenger_max_request_time`](#passenger_max_request_time)
+* [`passenger_max_requests`](#passenger_max_requests)
+* [`passenger_memory_limit`](#passenger_memory_limit)
+* [`passenger_meteor_app_settings`](#passenger_meteor_app_settings)
+* [`passenger_min_instances`](#passenger_min_instances)
+* [`passenger_nodejs`](#passenger_nodejs)
+* [`passenger_pool_idle_time`](#passenger_pool_idle_time)
+* [`passenger_pre_start`](#passenger_pre_start)
+* [`passenger_python`](#passenger_python)
+* [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
+* [`passenger_resolve_symlinks_in_document_root`](#passenger_resolve_symlinks_in_document_root)
+* [`passenger_response_buffer_high_watermark`](#passenger_response_buffer_high_watermark)
+* [`passenger_restart_dir`](#passenger_restart_dir)
+* [`passenger_rolling_restarts`](#passenger_rolling_restarts)
+* [`passenger_root`](#passenger_root)
+* [`passenger_ruby`](#passenger_ruby)
+* [`passenger_security_update_check_proxy`](#passenger_security_update_check_proxy)
+* [`passenger_show_version_in_header`](#passenger_show_version_in_header)
+* [`passenger_socket_backlog`](#passenger_socket_backlog)
+* [`passenger_spawn_method`](#passenger_spawn_method)
+* [`passenger_start_timeout`](#passenger_start_timeout)
+* [`passenger_startup_file`](#passenger_startup_file)
+* [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
+* [`passenger_sticky_sessions`](#passenger_sticky_sessions)
+* [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
+* [`passenger_thread_count`](#passenger_thread_count)
+* [`passenger_use_global_queue`](#passenger_use_global_queue)
+* [`passenger_user`](#passenger_user)
+* [`passenger_user_switching`](#passenger_user_switching)
+* [`rack_auto_detect`](#rack_auto_detect)
+* [`rack_autodetect`](#rack_autodetect)
+* [`rack_base_uri`](#rack_base_uri)
+* [`rack_env`](#rack_env)
+* [`rails_allow_mod_rewrite`](#rails_allow_mod_rewrite)
+* [`rails_app_spawner_idle_time`](#rails_app_spawner_idle_time)
+* [`rails_auto_detect`](#rails_auto_detect)
+* [`rails_autodetect`](#rails_autodetect)
+* [`rails_base_uri`](#rails_base_uri)
+* [`rails_default_user`](#rails_default_user)
+* [`rails_env`](#rails_env)
+* [`rails_framework_spawner_idle_time`](#rails_framework_spawner_idle_time)
+* [`rails_ruby`](#rails_ruby)
+* [`rails_spawn_method`](#rails_spawn_method)
+* [`rails_user_switching`](#rails_user_switching)
+* [`wsgi_auto_detect`](#wsgi_auto_detect)
+* [`passenger_anonymous_telemetry_proxy`](#passenger_anonymous_telemetry_proxy)
+* [`passenger_disable_anonymous_telemetry`](#passenger_disable_anonymous_telemetry)
+* [`passenger_disable_log_prefix`](#passenger_disable_log_prefix)
+* [`passenger_spawn_dir`](#passenger_spawn_dir)
+* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
+
+##### <a name="manage_repo"></a>`manage_repo`
 
 Data type: `Any`
 
@@ -3753,7 +4475,7 @@ Toggle whether to manage yum repo if on a RedHat node.
 
 Default value: ``true``
 
-##### `mod_id`
+##### <a name="mod_id"></a>`mod_id`
 
 Data type: `Any`
 
@@ -3761,7 +4483,7 @@ Specifies the package id.
 
 Default value: ``undef``
 
-##### `mod_lib`
+##### <a name="mod_lib"></a>`mod_lib`
 
 Data type: `Any`
 
@@ -3769,7 +4491,7 @@ Defines the module's shared object name. Do not configure manually without speci
 
 Default value: ``undef``
 
-##### `mod_lib_path`
+##### <a name="mod_lib_path"></a>`mod_lib_path`
 
 Data type: `Any`
 
@@ -3778,7 +4500,7 @@ this value.
 
 Default value: ``undef``
 
-##### `mod_package`
+##### <a name="mod_package"></a>`mod_package`
 
 Data type: `Any`
 
@@ -3786,7 +4508,7 @@ Name of the module package to install.
 
 Default value: ``undef``
 
-##### `mod_package_ensure`
+##### <a name="mod_package_ensure"></a>`mod_package_ensure`
 
 Data type: `Any`
 
@@ -3794,7 +4516,7 @@ Determines whether Puppet ensures the module should be installed.
 
 Default value: ``undef``
 
-##### `mod_path`
+##### <a name="mod_path"></a>`mod_path`
 
 Data type: `Any`
 
@@ -3802,7 +4524,7 @@ Specifies a path to the module. Do not manually set this parameter without a spe
 
 Default value: ``undef``
 
-##### `passenger_allow_encoded_slashes`
+##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
 Data type: `Any`
 
@@ -3810,7 +4532,7 @@ Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache do
 
 Default value: ``undef``
 
-##### `passenger_app_env`
+##### <a name="passenger_app_env"></a>`passenger_app_env`
 
 Data type: `Any`
 
@@ -3823,7 +4545,7 @@ This option sets, for the current application, the value of the following enviro
 
 Default value: ``undef``
 
-##### `passenger_app_group_name`
+##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
 
 Data type: `Any`
 
@@ -3831,7 +4553,7 @@ Sets the name of the application group that the current application should belon
 
 Default value: ``undef``
 
-##### `passenger_app_root`
+##### <a name="passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Any`
 
@@ -3839,7 +4561,7 @@ Path to the application root which allows access independent from the DocumentRo
 
 Default value: ``undef``
 
-##### `passenger_app_type`
+##### <a name="passenger_app_type"></a>`passenger_app_type`
 
 Data type: `Any`
 
@@ -3848,7 +4570,7 @@ not properly recognize your application.
 
 Default value: ``undef``
 
-##### `passenger_base_uri`
+##### <a name="passenger_base_uri"></a>`passenger_base_uri`
 
 Data type: `Any`
 
@@ -3856,7 +4578,7 @@ Used to specify that the given URI is an distinct application that should be ser
 
 Default value: ``undef``
 
-##### `passenger_buffer_response`
+##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
 
 Data type: `Any`
 
@@ -3864,7 +4586,7 @@ Toggle whether application-generated responses are buffered by Apache. Buffering
 
 Default value: ``undef``
 
-##### `passenger_buffer_upload`
+##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
 
 Data type: `Any`
 
@@ -3872,7 +4594,7 @@ Toggle whether HTTP client request bodies are buffered before they are sent to t
 
 Default value: ``undef``
 
-##### `passenger_concurrency_model`
+##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
 
 Data type: `Any`
 
@@ -3880,7 +4602,7 @@ Specifies the I/O concurrency model that should be used for Ruby application pro
 
 Default value: ``undef``
 
-##### `passenger_conf_file`
+##### <a name="passenger_conf_file"></a>`passenger_conf_file`
 
 Data type: `Any`
 
@@ -3888,7 +4610,7 @@ Data type: `Any`
 
 Default value: `$apache::params::passenger_conf_file`
 
-##### `passenger_conf_package_file`
+##### <a name="passenger_conf_package_file"></a>`passenger_conf_package_file`
 
 Data type: `Any`
 
@@ -3896,7 +4618,7 @@ Data type: `Any`
 
 Default value: `$apache::params::passenger_conf_package_file`
 
-##### `passenger_data_buffer_dir`
+##### <a name="passenger_data_buffer_dir"></a>`passenger_data_buffer_dir`
 
 Data type: `Any`
 
@@ -3904,7 +4626,7 @@ Specifies the directory in which to store data buffers.
 
 Default value: ``undef``
 
-##### `passenger_debug_log_file`
+##### <a name="passenger_debug_log_file"></a>`passenger_debug_log_file`
 
 Data type: `Any`
 
@@ -3912,7 +4634,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `passenger_debugger`
+##### <a name="passenger_debugger"></a>`passenger_debugger`
 
 Data type: `Any`
 
@@ -3920,7 +4642,7 @@ Turns support for Ruby application debugging on or off.
 
 Default value: ``undef``
 
-##### `passenger_default_group`
+##### <a name="passenger_default_group"></a>`passenger_default_group`
 
 Data type: `Any`
 
@@ -3928,7 +4650,7 @@ Allows you to specify the group that applications must run as, if user switching
 
 Default value: ``undef``
 
-##### `passenger_default_ruby`
+##### <a name="passenger_default_ruby"></a>`passenger_default_ruby`
 
 Data type: `Any`
 
@@ -3936,7 +4658,7 @@ File path to desired ruby interpreter to use by default.
 
 Default value: `$apache::params::passenger_default_ruby`
 
-##### `passenger_default_user`
+##### <a name="passenger_default_user"></a>`passenger_default_user`
 
 Data type: `Any`
 
@@ -3944,7 +4666,7 @@ Allows you to specify the user that applications must run as, if user switching
 
 Default value: ``undef``
 
-##### `passenger_disable_security_update_check`
+##### <a name="passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
 
 Data type: `Any`
 
@@ -3953,7 +4675,7 @@ security updates that might be available.
 
 Default value: ``undef``
 
-##### `passenger_enabled`
+##### <a name="passenger_enabled"></a>`passenger_enabled`
 
 Data type: `Any`
 
@@ -3961,7 +4683,7 @@ Toggles whether Passenger should be enabled for that particular context.
 
 Default value: ``undef``
 
-##### `passenger_error_override`
+##### <a name="passenger_error_override"></a>`passenger_error_override`
 
 Data type: `Any`
 
@@ -3969,7 +4691,7 @@ Toggles whether Apache will intercept and handle responses with HTTP status code
 
 Default value: ``undef``
 
-##### `passenger_file_descriptor_log_file`
+##### <a name="passenger_file_descriptor_log_file"></a>`passenger_file_descriptor_log_file`
 
 Data type: `Any`
 
@@ -3977,7 +4699,7 @@ Log file descriptor debug tracing messages to the given file.
 
 Default value: ``undef``
 
-##### `passenger_fly_with`
+##### <a name="passenger_fly_with"></a>`passenger_fly_with`
 
 Data type: `Any`
 
@@ -3986,7 +4708,7 @@ given socket filename.
 
 Default value: ``undef``
 
-##### `passenger_force_max_concurrent_requests_per_process`
+##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Any`
 
@@ -3994,7 +4716,7 @@ Use this option to tell Passenger how many concurrent requests the application c
 
 Default value: ``undef``
 
-##### `passenger_friendly_error_pages`
+##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
 Data type: `Any`
 
@@ -4002,7 +4724,7 @@ Toggles whether Passenger should display friendly error pages whenever an applic
 
 Default value: ``undef``
 
-##### `passenger_group`
+##### <a name="passenger_group"></a>`passenger_group`
 
 Data type: `Any`
 
@@ -4011,7 +4733,7 @@ startup file.
 
 Default value: ``undef``
 
-##### `passenger_high_performance`
+##### <a name="passenger_high_performance"></a>`passenger_high_performance`
 
 Data type: `Any`
 
@@ -4020,7 +4742,7 @@ compatibility with other Apache modules.
 
 Default value: ``undef``
 
-##### `passenger_installed_version`
+##### <a name="passenger_installed_version"></a>`passenger_installed_version`
 
 Data type: `Any`
 
@@ -4028,7 +4750,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `passenger_instance_registry_dir`
+##### <a name="passenger_instance_registry_dir"></a>`passenger_instance_registry_dir`
 
 Data type: `Any`
 
@@ -4036,7 +4758,7 @@ Specifies the directory that Passenger should use for registering its current in
 
 Default value: ``undef``
 
-##### `passenger_load_shell_envvars`
+##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
 Data type: `Any`
 
@@ -4044,7 +4766,7 @@ Enables or disables the loading of shell environment variables before spawning t
 
 Default value: ``undef``
 
-##### `passenger_log_file`
+##### <a name="passenger_log_file"></a>`passenger_log_file`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -4052,7 +4774,7 @@ File path to log file. By default Passenger log messages are written to the Apac
 
 Default value: ``undef``
 
-##### `passenger_log_level`
+##### <a name="passenger_log_level"></a>`passenger_log_level`
 
 Data type: `Any`
 
@@ -4061,7 +4783,7 @@ information will be logged.
 
 Default value: ``undef``
 
-##### `passenger_lve_min_uid`
+##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Any`
 
@@ -4070,7 +4792,7 @@ tells the check to only allow processes with UIDs equal to, or higher than, the
 
 Default value: ``undef``
 
-##### `passenger_max_instances`
+##### <a name="passenger_max_instances"></a>`passenger_max_instances`
 
 Data type: `Any`
 
@@ -4078,7 +4800,7 @@ The maximum number of application processes that may simultaneously exist for an
 
 Default value: ``undef``
 
-##### `passenger_max_instances_per_app`
+##### <a name="passenger_max_instances_per_app"></a>`passenger_max_instances_per_app`
 
 Data type: `Any`
 
@@ -4086,7 +4808,7 @@ The maximum number of application processes that may simultaneously exist for a
 
 Default value: ``undef``
 
-##### `passenger_max_pool_size`
+##### <a name="passenger_max_pool_size"></a>`passenger_max_pool_size`
 
 Data type: `Any`
 
@@ -4094,7 +4816,7 @@ The maximum number of application processes that may simultaneously exist.
 
 Default value: ``undef``
 
-##### `passenger_max_preloader_idle_time`
+##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
 Data type: `Any`
 
@@ -4102,7 +4824,7 @@ Set the preloader's idle timeout, in seconds. A value of 0 means that it should
 
 Default value: ``undef``
 
-##### `passenger_max_request_queue_size`
+##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
 Data type: `Any`
 
@@ -4110,7 +4832,7 @@ Specifies the maximum size for the queue of all incoming requests.
 
 Default value: ``undef``
 
-##### `passenger_max_request_time`
+##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
 
 Data type: `Any`
 
@@ -4118,7 +4840,7 @@ The maximum amount of time, in seconds, that an application process may take to
 
 Default value: ``undef``
 
-##### `passenger_max_requests`
+##### <a name="passenger_max_requests"></a>`passenger_max_requests`
 
 Data type: `Any`
 
@@ -4126,7 +4848,7 @@ The maximum number of requests an application process will process.
 
 Default value: ``undef``
 
-##### `passenger_memory_limit`
+##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Any`
 
@@ -4134,7 +4856,7 @@ The maximum amount of memory that an application process may use, in megabytes.
 
 Default value: ``undef``
 
-##### `passenger_meteor_app_settings`
+##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
 Data type: `Any`
 
@@ -4142,7 +4864,7 @@ When using a Meteor application in non-bundled mode, use this option to specify
 
 Default value: ``undef``
 
-##### `passenger_min_instances`
+##### <a name="passenger_min_instances"></a>`passenger_min_instances`
 
 Data type: `Any`
 
@@ -4150,7 +4872,7 @@ Specifies the minimum number of application processes that should exist for a gi
 
 Default value: ``undef``
 
-##### `passenger_nodejs`
+##### <a name="passenger_nodejs"></a>`passenger_nodejs`
 
 Data type: `Any`
 
@@ -4158,7 +4880,7 @@ Specifies the Node.js command to use for serving Node.js web applications.
 
 Default value: ``undef``
 
-##### `passenger_pool_idle_time`
+##### <a name="passenger_pool_idle_time"></a>`passenger_pool_idle_time`
 
 Data type: `Any`
 
@@ -4166,7 +4888,7 @@ The maximum number of seconds that an application process may be idle.
 
 Default value: ``undef``
 
-##### `passenger_pre_start`
+##### <a name="passenger_pre_start"></a>`passenger_pre_start`
 
 Data type: `Optional[Variant[String,Array[String]]]`
 
@@ -4174,7 +4896,7 @@ URL of the web application you want to pre-start.
 
 Default value: ``undef``
 
-##### `passenger_python`
+##### <a name="passenger_python"></a>`passenger_python`
 
 Data type: `Any`
 
@@ -4182,7 +4904,7 @@ Specifies the Python interpreter to use for serving Python web applications.
 
 Default value: ``undef``
 
-##### `passenger_resist_deployment_errors`
+##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
 Data type: `Any`
 
@@ -4190,7 +4912,7 @@ Enables or disables resistance against deployment errors.
 
 Default value: ``undef``
 
-##### `passenger_resolve_symlinks_in_document_root`
+##### <a name="passenger_resolve_symlinks_in_document_root"></a>`passenger_resolve_symlinks_in_document_root`
 
 Data type: `Any`
 
@@ -4199,7 +4921,7 @@ document root containing symlinks.
 
 Default value: ``undef``
 
-##### `passenger_response_buffer_high_watermark`
+##### <a name="passenger_response_buffer_high_watermark"></a>`passenger_response_buffer_high_watermark`
 
 Data type: `Any`
 
@@ -4207,7 +4929,7 @@ Configures the maximum size of the real-time disk-backed response buffering syst
 
 Default value: ``undef``
 
-##### `passenger_restart_dir`
+##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
 
 Data type: `Any`
 
@@ -4215,7 +4937,7 @@ Path to directory containing restart.txt file. Can be either absolute or relativ
 
 Default value: ``undef``
 
-##### `passenger_rolling_restarts`
+##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
 Data type: `Any`
 
@@ -4223,7 +4945,7 @@ Enables or disables support for zero-downtime application restarts through resta
 
 Default value: ``undef``
 
-##### `passenger_root`
+##### <a name="passenger_root"></a>`passenger_root`
 
 Data type: `Any`
 
@@ -4231,7 +4953,7 @@ Refers to the location to the Passenger root directory, or to a location configu
 
 Default value: `$apache::params::passenger_root`
 
-##### `passenger_ruby`
+##### <a name="passenger_ruby"></a>`passenger_ruby`
 
 Data type: `Any`
 
@@ -4239,7 +4961,7 @@ Specifies the Ruby interpreter to use for serving Ruby web applications.
 
 Default value: `$apache::params::passenger_ruby`
 
-##### `passenger_security_update_check_proxy`
+##### <a name="passenger_security_update_check_proxy"></a>`passenger_security_update_check_proxy`
 
 Data type: `Any`
 
@@ -4247,7 +4969,7 @@ Allows use of an intermediate proxy for the Passenger security update check.
 
 Default value: ``undef``
 
-##### `passenger_show_version_in_header`
+##### <a name="passenger_show_version_in_header"></a>`passenger_show_version_in_header`
 
 Data type: `Any`
 
@@ -4255,7 +4977,7 @@ Toggle whether Passenger will output its version number in the X-Powered-By head
 
 Default value: ``undef``
 
-##### `passenger_socket_backlog`
+##### <a name="passenger_socket_backlog"></a>`passenger_socket_backlog`
 
 Data type: `Any`
 
@@ -4263,7 +4985,7 @@ This option can be raised if Apache manages to overflow the backlog queue.
 
 Default value: ``undef``
 
-##### `passenger_spawn_method`
+##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']]`
 
@@ -4271,7 +4993,7 @@ Controls whether Passenger spawns applications directly, or using a prefork copy
 
 Default value: ``undef``
 
-##### `passenger_start_timeout`
+##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
 
 Data type: `Any`
 
@@ -4279,7 +5001,7 @@ Specifies a timeout for the startup of application processes.
 
 Default value: ``undef``
 
-##### `passenger_startup_file`
+##### <a name="passenger_startup_file"></a>`passenger_startup_file`
 
 Data type: `Any`
 
@@ -4287,7 +5009,7 @@ Specifies the startup file that Passenger should use when loading the applicatio
 
 Default value: ``undef``
 
-##### `passenger_stat_throttle_rate`
+##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
 Data type: `Any`
 
@@ -4295,7 +5017,7 @@ Setting this option to a value of x means that certain filesystem checks will be
 
 Default value: ``undef``
 
-##### `passenger_sticky_sessions`
+##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
 Data type: `Any`
 
@@ -4303,7 +5025,7 @@ Toggles whether all requests that a client sends will be routed to the same orig
 
 Default value: ``undef``
 
-##### `passenger_sticky_sessions_cookie_name`
+##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
 Data type: `Any`
 
@@ -4311,7 +5033,7 @@ Sets the name of the sticky sessions cookie.
 
 Default value: ``undef``
 
-##### `passenger_thread_count`
+##### <a name="passenger_thread_count"></a>`passenger_thread_count`
 
 Data type: `Any`
 
@@ -4319,7 +5041,7 @@ Specifies the number of threads that Passenger should spawn per Ruby application
 
 Default value: ``undef``
 
-##### `passenger_use_global_queue`
+##### <a name="passenger_use_global_queue"></a>`passenger_use_global_queue`
 
 Data type: `Any`
 
@@ -4327,7 +5049,7 @@ N/A.
 
 Default value: ``undef``
 
-##### `passenger_user`
+##### <a name="passenger_user"></a>`passenger_user`
 
 Data type: `Any`
 
@@ -4336,7 +5058,7 @@ startup file.
 
 Default value: ``undef``
 
-##### `passenger_user_switching`
+##### <a name="passenger_user_switching"></a>`passenger_user_switching`
 
 Data type: `Any`
 
@@ -4344,7 +5066,7 @@ Toggles whether to attempt to enable user account sandboxing, also known as user
 
 Default value: ``undef``
 
-##### `rack_auto_detect`
+##### <a name="rack_auto_detect"></a>`rack_auto_detect`
 
 Data type: `Any`
 
@@ -4352,7 +5074,7 @@ This option has been removed in version 4.0.0 as part of an optimization. You sh
 
 Default value: ``undef``
 
-##### `rack_autodetect`
+##### <a name="rack_autodetect"></a>`rack_autodetect`
 
 Data type: `Any`
 
@@ -4360,7 +5082,7 @@ This option has been removed in version 4.0.0 as part of an optimization. You sh
 
 Default value: ``undef``
 
-##### `rack_base_uri`
+##### <a name="rack_base_uri"></a>`rack_base_uri`
 
 Data type: `Any`
 
@@ -4368,7 +5090,7 @@ Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
 Default value: ``undef``
 
-##### `rack_env`
+##### <a name="rack_env"></a>`rack_env`
 
 Data type: `Any`
 
@@ -4376,7 +5098,7 @@ Alias for PassengerAppEnv.
 
 Default value: ``undef``
 
-##### `rails_allow_mod_rewrite`
+##### <a name="rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
 
 Data type: `Any`
 
@@ -4384,7 +5106,7 @@ This option doesn't do anything anymore since version 4.0.0.
 
 Default value: ``undef``
 
-##### `rails_app_spawner_idle_time`
+##### <a name="rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
 
 Data type: `Any`
 
@@ -4392,7 +5114,7 @@ This option has been removed in version 4.0.0, and replaced with PassengerMaxPre
 
 Default value: ``undef``
 
-##### `rails_auto_detect`
+##### <a name="rails_auto_detect"></a>`rails_auto_detect`
 
 Data type: `Any`
 
@@ -4400,7 +5122,7 @@ This option has been removed in version 4.0.0 as part of an optimization. You sh
 
 Default value: ``undef``
 
-##### `rails_autodetect`
+##### <a name="rails_autodetect"></a>`rails_autodetect`
 
 Data type: `Any`
 
@@ -4408,7 +5130,7 @@ This option has been removed in version 4.0.0 as part of an optimization. You sh
 
 Default value: ``undef``
 
-##### `rails_base_uri`
+##### <a name="rails_base_uri"></a>`rails_base_uri`
 
 Data type: `Any`
 
@@ -4416,7 +5138,7 @@ Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
 Default value: ``undef``
 
-##### `rails_default_user`
+##### <a name="rails_default_user"></a>`rails_default_user`
 
 Data type: `Any`
 
@@ -4424,7 +5146,7 @@ Deprecated in 3.0.0 in favor of PassengerDefaultUser
 
 Default value: ``undef``
 
-##### `rails_env`
+##### <a name="rails_env"></a>`rails_env`
 
 Data type: `Any`
 
@@ -4432,7 +5154,7 @@ Alias for PassengerAppEnv.
 
 Default value: ``undef``
 
-##### `rails_framework_spawner_idle_time`
+##### <a name="rails_framework_spawner_idle_time"></a>`rails_framework_spawner_idle_time`
 
 Data type: `Any`
 
@@ -4441,7 +5163,7 @@ altogether. You should use smart spawning instead.
 
 Default value: ``undef``
 
-##### `rails_ruby`
+##### <a name="rails_ruby"></a>`rails_ruby`
 
 Data type: `Any`
 
@@ -4449,7 +5171,7 @@ Deprecated in 3.0.0 in favor of PassengerRuby.
 
 Default value: ``undef``
 
-##### `rails_spawn_method`
+##### <a name="rails_spawn_method"></a>`rails_spawn_method`
 
 Data type: `Any`
 
@@ -4457,7 +5179,7 @@ Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
 
 Default value: ``undef``
 
-##### `rails_user_switching`
+##### <a name="rails_user_switching"></a>`rails_user_switching`
 
 Data type: `Any`
 
@@ -4465,7 +5187,7 @@ Deprecated in 3.0.0 in favor of PassengerUserSwitching.
 
 Default value: ``undef``
 
-##### `wsgi_auto_detect`
+##### <a name="wsgi_auto_detect"></a>`wsgi_auto_detect`
 
 Data type: `Any`
 
@@ -4473,7 +5195,7 @@ This option has been removed in version 4.0.0 as part of an optimization. You sh
 
 Default value: ``undef``
 
-##### `passenger_anonymous_telemetry_proxy`
+##### <a name="passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
 
 Data type: `Optional[String]`
 
@@ -4481,7 +5203,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_disable_anonymous_telemetry`
+##### <a name="passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
 
 Data type: `Optional[Boolean]`
 
@@ -4489,7 +5211,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_disable_log_prefix`
+##### <a name="passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
 
 Data type: `Optional[Boolean]`
 
@@ -4497,7 +5219,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_spawn_dir`
+##### <a name="passenger_spawn_dir"></a>`passenger_spawn_dir`
 
 Data type: `Optional[String]`
 
@@ -4505,7 +5227,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_sticky_sessions_cookie_attributes`
+##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
@@ -4513,7 +5235,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-### `apache::mod::perl`
+### <a name="apachemodperl"></a>`apache::mod::perl`
 
 Installs `mod_perl`.
 
@@ -4521,7 +5243,7 @@ Installs `mod_perl`.
   * https://perl.apache.org
     * for additional documentation.
 
-### `apache::mod::peruser`
+### <a name="apachemodperuser"></a>`apache::mod::peruser`
 
 Installs `mod_peruser`.
 
@@ -4529,9 +5251,18 @@ Installs `mod_peruser`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::peruser` class.
+The following parameters are available in the `apache::mod::peruser` class:
+
+* [`minspareprocessors`](#minspareprocessors)
+* [`minprocessors`](#minprocessors)
+* [`maxprocessors`](#maxprocessors)
+* [`maxclients`](#maxclients)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`idletimeout`](#idletimeout)
+* [`expiretimeout`](#expiretimeout)
+* [`keepalive`](#keepalive)
 
-##### `minspareprocessors`
+##### <a name="minspareprocessors"></a>`minspareprocessors`
 
 Data type: `Any`
 
@@ -4539,7 +5270,7 @@ Data type: `Any`
 
 Default value: `'2'`
 
-##### `minprocessors`
+##### <a name="minprocessors"></a>`minprocessors`
 
 Data type: `Any`
 
@@ -4547,7 +5278,7 @@ Data type: `Any`
 
 Default value: `'2'`
 
-##### `maxprocessors`
+##### <a name="maxprocessors"></a>`maxprocessors`
 
 Data type: `Any`
 
@@ -4555,7 +5286,7 @@ Data type: `Any`
 
 Default value: `'10'`
 
-##### `maxclients`
+##### <a name="maxclients"></a>`maxclients`
 
 Data type: `Any`
 
@@ -4563,7 +5294,7 @@ Data type: `Any`
 
 Default value: `'150'`
 
-##### `maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Any`
 
@@ -4571,7 +5302,7 @@ Data type: `Any`
 
 Default value: `'1000'`
 
-##### `idletimeout`
+##### <a name="idletimeout"></a>`idletimeout`
 
 Data type: `Any`
 
@@ -4579,7 +5310,7 @@ Data type: `Any`
 
 Default value: `'120'`
 
-##### `expiretimeout`
+##### <a name="expiretimeout"></a>`expiretimeout`
 
 Data type: `Any`
 
@@ -4587,7 +5318,7 @@ Data type: `Any`
 
 Default value: `'120'`
 
-##### `keepalive`
+##### <a name="keepalive"></a>`keepalive`
 
 Data type: `Any`
 
@@ -4595,7 +5326,7 @@ Data type: `Any`
 
 Default value: `'Off'`
 
-### `apache::mod::php`
+### <a name="apachemodphp"></a>`apache::mod::php`
 
 Installs `mod_php`.
 
@@ -4605,9 +5336,20 @@ Installs `mod_php`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::php` class.
+The following parameters are available in the `apache::mod::php` class:
+
+* [`package_name`](#package_name)
+* [`package_ensure`](#package_ensure)
+* [`path`](#path)
+* [`extensions`](#extensions)
+* [`content`](#content)
+* [`template`](#template)
+* [`source`](#source)
+* [`root_group`](#root_group)
+* [`php_version`](#php_version)
+* [`libphp_prefix`](#libphp_prefix)
 
-##### `package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Any`
 
@@ -4615,7 +5357,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `package_ensure`
+##### <a name="package_ensure"></a>`package_ensure`
 
 Data type: `Any`
 
@@ -4623,7 +5365,7 @@ Data type: `Any`
 
 Default value: `'present'`
 
-##### `path`
+##### <a name="path"></a>`path`
 
 Data type: `Any`
 
@@ -4631,7 +5373,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `extensions`
+##### <a name="extensions"></a>`extensions`
 
 Data type: `Array`
 
@@ -4639,7 +5381,7 @@ Data type: `Array`
 
 Default value: `['.php']`
 
-##### `content`
+##### <a name="content"></a>`content`
 
 Data type: `Any`
 
@@ -4647,7 +5389,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `template`
+##### <a name="template"></a>`template`
 
 Data type: `Any`
 
@@ -4655,7 +5397,7 @@ Data type: `Any`
 
 Default value: `'apache/mod/php.conf.erb'`
 
-##### `source`
+##### <a name="source"></a>`source`
 
 Data type: `Any`
 
@@ -4663,7 +5405,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `root_group`
+##### <a name="root_group"></a>`root_group`
 
 Data type: `Any`
 
@@ -4671,7 +5413,7 @@ Data type: `Any`
 
 Default value: `$apache::params::root_group`
 
-##### `php_version`
+##### <a name="php_version"></a>`php_version`
 
 Data type: `Any`
 
@@ -4679,7 +5421,7 @@ Data type: `Any`
 
 Default value: `$apache::params::php_version`
 
-##### `libphp_prefix`
+##### <a name="libphp_prefix"></a>`libphp_prefix`
 
 Data type: `Any`
 
@@ -4687,7 +5429,7 @@ Data type: `Any`
 
 Default value: `'libphp'`
 
-### `apache::mod::prefork`
+### <a name="apachemodprefork"></a>`apache::mod::prefork`
 
 Installs and configures MPM `prefork`.
 
@@ -4697,9 +5439,20 @@ Installs and configures MPM `prefork`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::prefork` class.
+The following parameters are available in the `apache::mod::prefork` class:
 
-##### `startservers`
+* [`startservers`](#startservers)
+* [`minspareservers`](#minspareservers)
+* [`maxspareservers`](#maxspareservers)
+* [`serverlimit`](#serverlimit)
+* [`maxclients`](#maxclients)
+* [`maxrequestworkers`](#maxrequestworkers)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`maxconnectionsperchild`](#maxconnectionsperchild)
+* [`apache_version`](#apache_version)
+* [`listenbacklog`](#listenbacklog)
+
+##### <a name="startservers"></a>`startservers`
 
 Data type: `Any`
 
@@ -4707,7 +5460,7 @@ Number of child server processes created at startup.
 
 Default value: `'8'`
 
-##### `minspareservers`
+##### <a name="minspareservers"></a>`minspareservers`
 
 Data type: `Any`
 
@@ -4715,7 +5468,7 @@ Minimum number of idle child server processes.
 
 Default value: `'5'`
 
-##### `maxspareservers`
+##### <a name="maxspareservers"></a>`maxspareservers`
 
 Data type: `Any`
 
@@ -4723,7 +5476,7 @@ Maximum number of idle child server processes.
 
 Default value: `'20'`
 
-##### `serverlimit`
+##### <a name="serverlimit"></a>`serverlimit`
 
 Data type: `Any`
 
@@ -4731,7 +5484,7 @@ Upper limit on configurable number of processes.
 
 Default value: `'256'`
 
-##### `maxclients`
+##### <a name="maxclients"></a>`maxclients`
 
 Data type: `Any`
 
@@ -4739,7 +5492,7 @@ Old alias for MaxRequestWorkers.
 
 Default value: `'256'`
 
-##### `maxrequestworkers`
+##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Any`
 
@@ -4747,7 +5500,7 @@ Maximum number of connections that will be processed simultaneously.
 
 Default value: ``undef``
 
-##### `maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Any`
 
@@ -4755,7 +5508,7 @@ Old alias for MaxConnectionsPerChild.
 
 Default value: `'4000'`
 
-##### `maxconnectionsperchild`
+##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Any`
 
@@ -4763,7 +5516,7 @@ Limit on the number of connections that an individual child server will handle d
 
 Default value: ``undef``
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -4771,7 +5524,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-##### `listenbacklog`
+##### <a name="listenbacklog"></a>`listenbacklog`
 
 Data type: `Any`
 
@@ -4779,7 +5532,7 @@ Maximum length of the queue of pending connections.
 
 Default value: `'511'`
 
-### `apache::mod::proxy`
+### <a name="apachemodproxy"></a>`apache::mod::proxy`
 
 Installs and configures `mod_proxy`.
 
@@ -4789,9 +5542,17 @@ Installs and configures `mod_proxy`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::proxy` class.
+The following parameters are available in the `apache::mod::proxy` class:
+
+* [`proxy_requests`](#proxy_requests)
+* [`allow_from`](#allow_from)
+* [`apache_version`](#apache_version)
+* [`package_name`](#package_name)
+* [`proxy_via`](#proxy_via)
+* [`proxy_timeout`](#proxy_timeout)
+* [`proxy_iobuffersize`](#proxy_iobuffersize)
 
-##### `proxy_requests`
+##### <a name="proxy_requests"></a>`proxy_requests`
 
 Data type: `Any`
 
@@ -4799,7 +5560,7 @@ Enables forward (standard) proxy requests.
 
 Default value: `'Off'`
 
-##### `allow_from`
+##### <a name="allow_from"></a>`allow_from`
 
 Data type: `Any`
 
@@ -4807,7 +5568,7 @@ List of IPs allowed to access proxy.
 
 Default value: ``undef``
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -4815,7 +5576,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-##### `package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Any`
 
@@ -4823,7 +5584,7 @@ Name of the proxy package to install.
 
 Default value: ``undef``
 
-##### `proxy_via`
+##### <a name="proxy_via"></a>`proxy_via`
 
 Data type: `Any`
 
@@ -4831,7 +5592,7 @@ Set local IP address for outgoing proxy connections.
 
 Default value: `'On'`
 
-##### `proxy_timeout`
+##### <a name="proxy_timeout"></a>`proxy_timeout`
 
 Data type: `Any`
 
@@ -4839,7 +5600,7 @@ Network timeout for proxied requests.
 
 Default value: ``undef``
 
-##### `proxy_iobuffersize`
+##### <a name="proxy_iobuffersize"></a>`proxy_iobuffersize`
 
 Data type: `Any`
 
@@ -4847,7 +5608,7 @@ Set the size of internal data throughput buffer
 
 Default value: ``undef``
 
-### `apache::mod::proxy_ajp`
+### <a name="apachemodproxy_ajp"></a>`apache::mod::proxy_ajp`
 
 Installs `mod_proxy_ajp`.
 
@@ -4855,7 +5616,7 @@ Installs `mod_proxy_ajp`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html
     * for additional documentation.
 
-### `apache::mod::proxy_balancer`
+### <a name="apachemodproxy_balancer"></a>`apache::mod::proxy_balancer`
 
 Installs and configures `mod_proxy_balancer`.
 
@@ -4865,9 +5626,15 @@ Installs and configures `mod_proxy_balancer`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::proxy_balancer` class.
+The following parameters are available in the `apache::mod::proxy_balancer` class:
 
-##### `manager`
+* [`manager`](#manager)
+* [`maanger_path`](#maanger_path)
+* [`allow_from`](#allow_from)
+* [`apache_version`](#apache_version)
+* [`manager_path`](#manager_path)
+
+##### <a name="manager"></a>`manager`
 
 Data type: `Boolean`
 
@@ -4875,11 +5642,11 @@ Toggle whether to enable balancer manager support.
 
 Default value: ``false``
 
-##### `maanger_path`
+##### <a name="maanger_path"></a>`maanger_path`
 
 Server relative path to balancer manager.
 
-##### `allow_from`
+##### <a name="allow_from"></a>`allow_from`
 
 Data type: `Array`
 
@@ -4887,7 +5654,7 @@ List of IPs from which the balancer manager can be accessed.
 
 Default value: `['127.0.0.1','::1']`
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -4895,7 +5662,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-##### `manager_path`
+##### <a name="manager_path"></a>`manager_path`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4903,7 +5670,7 @@ Data type: `Stdlib::Absolutepath`
 
 Default value: `'/balancer-manager'`
 
-### `apache::mod::proxy_connect`
+### <a name="apachemodproxy_connect"></a>`apache::mod::proxy_connect`
 
 Installs `mod_proxy_connect`.
 
@@ -4913,9 +5680,11 @@ Installs `mod_proxy_connect`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::proxy_connect` class.
+The following parameters are available in the `apache::mod::proxy_connect` class:
+
+* [`apache_version`](#apache_version)
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -4923,7 +5692,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-### `apache::mod::proxy_fcgi`
+### <a name="apachemodproxy_fcgi"></a>`apache::mod::proxy_fcgi`
 
 Installs `mod_proxy_fcgi`.
 
@@ -4931,7 +5700,7 @@ Installs `mod_proxy_fcgi`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html
     * for additional documentation.
 
-### `apache::mod::proxy_html`
+### <a name="apachemodproxy_html"></a>`apache::mod::proxy_html`
 
 Installs `mod_proxy_html`.
 
@@ -4939,7 +5708,7 @@ Installs `mod_proxy_html`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_html.html
     * for additional documentation.
 
-### `apache::mod::proxy_http`
+### <a name="apachemodproxy_http"></a>`apache::mod::proxy_http`
 
 Installs `mod_proxy_http`.
 
@@ -4947,7 +5716,7 @@ Installs `mod_proxy_http`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_http.html
     * for additional documentation.
 
-### `apache::mod::proxy_wstunnel`
+### <a name="apachemodproxy_wstunnel"></a>`apache::mod::proxy_wstunnel`
 
 Installs `mod_proxy_wstunnel`.
 
@@ -4955,7 +5724,7 @@ Installs `mod_proxy_wstunnel`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html
     * for additional documentation.
 
-### `apache::mod::python`
+### <a name="apachemodpython"></a>`apache::mod::python`
 
 Installs and configures `mod_python`.
 
@@ -4965,9 +5734,11 @@ Installs and configures `mod_python`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::python` class.
+The following parameters are available in the `apache::mod::python` class:
 
-##### `loadfile_name`
+* [`loadfile_name`](#loadfile_name)
+
+##### <a name="loadfile_name"></a>`loadfile_name`
 
 Data type: `Optional[String]`
 
@@ -4975,7 +5746,7 @@ Sets the name of the configuration file that is used to load the python module.
 
 Default value: ``undef``
 
-### `apache::mod::remoteip`
+### <a name="apachemodremoteip"></a>`apache::mod::remoteip`
 
 Installs and configures `mod_remoteip`.
 
@@ -4986,9 +5757,21 @@ Installs and configures `mod_remoteip`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::remoteip` class.
+The following parameters are available in the `apache::mod::remoteip` class:
+
+* [`header`](#header)
+* [`internal_proxy`](#internal_proxy)
+* [`proxy_ips`](#proxy_ips)
+* [`internal_proxy_list`](#internal_proxy_list)
+* [`proxies_header`](#proxies_header)
+* [`proxy_protocol`](#proxy_protocol)
+* [`proxy_protocol_exceptions`](#proxy_protocol_exceptions)
+* [`trusted_proxy`](#trusted_proxy)
+* [`trusted_proxy_ips`](#trusted_proxy_ips)
+* [`trusted_proxy_list`](#trusted_proxy_list)
+* [`apache_version`](#apache_version)
 
-##### `header`
+##### <a name="header"></a>`header`
 
 Data type: `String`
 
@@ -4996,7 +5779,7 @@ The header field in which `mod_remoteip` will look for the useragent IP.
 
 Default value: `'X-Forwarded-For'`
 
-##### `internal_proxy`
+##### <a name="internal_proxy"></a>`internal_proxy`
 
 Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
@@ -5007,7 +5790,7 @@ proxies will trusted by `mod_remoteip`.
 
 Default value: ``undef``
 
-##### `proxy_ips`
+##### <a name="proxy_ips"></a>`proxy_ips`
 
 Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
@@ -5015,7 +5798,7 @@ Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
 Default value: ``undef``
 
-##### `internal_proxy_list`
+##### <a name="internal_proxy_list"></a>`internal_proxy_list`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -5025,7 +5808,7 @@ that are trusted to set a valid value inside the specified header. See
 
 Default value: ``undef``
 
-##### `proxies_header`
+##### <a name="proxies_header"></a>`proxies_header`
 
 Data type: `Optional[String]`
 
@@ -5035,7 +5818,7 @@ request (e.g. `X-Forwarded-By`).
 
 Default value: ``undef``
 
-##### `proxy_protocol`
+##### <a name="proxy_protocol"></a>`proxy_protocol`
 
 Data type: `Boolean`
 
@@ -5044,7 +5827,7 @@ upstream clients must set the header every time they open a connection.
 
 Default value: ``false``
 
-##### `proxy_protocol_exceptions`
+##### <a name="proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
 
 Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
@@ -5053,7 +5836,7 @@ protocol.
 
 Default value: ``undef``
 
-##### `trusted_proxy`
+##### <a name="trusted_proxy"></a>`trusted_proxy`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
@@ -5064,7 +5847,7 @@ any private IP presented by these proxies will be disgarded by
 
 Default value: ``undef``
 
-##### `trusted_proxy_ips`
+##### <a name="trusted_proxy_ips"></a>`trusted_proxy_ips`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
@@ -5072,7 +5855,7 @@ Data type: `Optional[Array[Stdlib::Host]]`
 
 Default value: ``undef``
 
-##### `trusted_proxy_list`
+##### <a name="trusted_proxy_list"></a>`trusted_proxy_list`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -5082,7 +5865,7 @@ that are trusted to set a valid value inside the specified header. See
 
 Default value: ``undef``
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -5091,7 +5874,7 @@ A version string used to validate that your apache version supports
 
 Default value: ``undef``
 
-### `apache::mod::reqtimeout`
+### <a name="apachemodreqtimeout"></a>`apache::mod::reqtimeout`
 
 Installs and configures `mod_reqtimeout`.
 
@@ -5101,9 +5884,11 @@ Installs and configures `mod_reqtimeout`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::reqtimeout` class.
+The following parameters are available in the `apache::mod::reqtimeout` class:
 
-##### `timeouts`
+* [`timeouts`](#timeouts)
+
+##### <a name="timeouts"></a>`timeouts`
 
 Data type: `Any`
 
@@ -5111,7 +5896,7 @@ List of timeouts and data rates for receiving requests.
 
 Default value: `['header=20-40,minrate=500', 'body=10,minrate=500']`
 
-### `apache::mod::rewrite`
+### <a name="apachemodrewrite"></a>`apache::mod::rewrite`
 
 Installs `mod_rewrite`.
 
@@ -5119,7 +5904,7 @@ Installs `mod_rewrite`.
   * https://httpd.apache.org/docs/current/mod/mod_rewrite.html
     * for additional documentation.
 
-### `apache::mod::rpaf`
+### <a name="apachemodrpaf"></a>`apache::mod::rpaf`
 
 Installs and configures `mod_rpaf`.
 
@@ -5129,9 +5914,14 @@ Installs and configures `mod_rpaf`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::rpaf` class.
+The following parameters are available in the `apache::mod::rpaf` class:
+
+* [`sethostname`](#sethostname)
+* [`proxy_ips`](#proxy_ips)
+* [`header`](#header)
+* [`template`](#template)
 
-##### `sethostname`
+##### <a name="sethostname"></a>`sethostname`
 
 Data type: `Any`
 
@@ -5139,7 +5929,7 @@ Toggles whether to update vhost name so ServerName and ServerAlias work.
 
 Default value: ``true``
 
-##### `proxy_ips`
+##### <a name="proxy_ips"></a>`proxy_ips`
 
 Data type: `Any`
 
@@ -5147,7 +5937,7 @@ List of IPs & bitmasked subnets to adjust requests for
 
 Default value: `['127.0.0.1']`
 
-##### `header`
+##### <a name="header"></a>`header`
 
 Data type: `Any`
 
@@ -5155,7 +5945,7 @@ Header to use for the real IP address.
 
 Default value: `'X-Forwarded-For'`
 
-##### `template`
+##### <a name="template"></a>`template`
 
 Data type: `Any`
 
@@ -5163,7 +5953,7 @@ Path to template to use for configuring mod_rpaf.
 
 Default value: `'apache/mod/rpaf.conf.erb'`
 
-### `apache::mod::security`
+### <a name="apachemodsecurity"></a>`apache::mod::security`
 
 Installs and configures `mod_security`.
 
@@ -5173,9 +5963,39 @@ Installs and configures `mod_security`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::security` class.
-
-##### `version`
+The following parameters are available in the `apache::mod::security` class:
+
+* [`version`](#version)
+* [`logroot`](#logroot)
+* [`crs_package`](#crs_package)
+* [`activated_rules`](#activated_rules)
+* [`modsec_dir`](#modsec_dir)
+* [`modsec_secruleengine`](#modsec_secruleengine)
+* [`audit_log_relevant_status`](#audit_log_relevant_status)
+* [`audit_log_parts`](#audit_log_parts)
+* [`audit_log_type`](#audit_log_type)
+* [`audit_log_storage_dir`](#audit_log_storage_dir)
+* [`secpcrematchlimit`](#secpcrematchlimit)
+* [`secpcrematchlimitrecursion`](#secpcrematchlimitrecursion)
+* [`allowed_methods`](#allowed_methods)
+* [`content_types`](#content_types)
+* [`restricted_extensions`](#restricted_extensions)
+* [`restricted_headers`](#restricted_headers)
+* [`secdefaultaction`](#secdefaultaction)
+* [`anomaly_score_blocking`](#anomaly_score_blocking)
+* [`inbound_anomaly_threshold`](#inbound_anomaly_threshold)
+* [`outbound_anomaly_threshold`](#outbound_anomaly_threshold)
+* [`critical_anomaly_score`](#critical_anomaly_score)
+* [`error_anomaly_score`](#error_anomaly_score)
+* [`warning_anomaly_score`](#warning_anomaly_score)
+* [`notice_anomaly_score`](#notice_anomaly_score)
+* [`secrequestmaxnumargs`](#secrequestmaxnumargs)
+* [`secrequestbodylimit`](#secrequestbodylimit)
+* [`secrequestbodynofileslimit`](#secrequestbodynofileslimit)
+* [`secrequestbodyinmemorylimit`](#secrequestbodyinmemorylimit)
+* [`manage_security_crs`](#manage_security_crs)
+
+##### <a name="version"></a>`version`
 
 Data type: `Any`
 
@@ -5183,7 +6003,7 @@ Manage mod_security or mod_security2
 
 Default value: `$apache::params::modsec_version`
 
-##### `logroot`
+##### <a name="logroot"></a>`logroot`
 
 Data type: `Any`
 
@@ -5191,7 +6011,7 @@ Configures the location of audit and debug logs.
 
 Default value: `$apache::params::logroot`
 
-##### `crs_package`
+##### <a name="crs_package"></a>`crs_package`
 
 Data type: `Any`
 
@@ -5199,7 +6019,7 @@ Name of package that installs CRS rules.
 
 Default value: `$apache::params::modsec_crs_package`
 
-##### `activated_rules`
+##### <a name="activated_rules"></a>`activated_rules`
 
 Data type: `Any`
 
@@ -5207,7 +6027,7 @@ An array of rules from the modsec_crs_path or absolute to activate via symlinks.
 
 Default value: `$apache::params::modsec_default_rules`
 
-##### `modsec_dir`
+##### <a name="modsec_dir"></a>`modsec_dir`
 
 Data type: `Any`
 
@@ -5215,7 +6035,7 @@ Defines the path where Puppet installs the modsec configuration and activated ru
 
 Default value: `$apache::params::modsec_dir`
 
-##### `modsec_secruleengine`
+##### <a name="modsec_secruleengine"></a>`modsec_secruleengine`
 
 Data type: `Any`
 
@@ -5223,7 +6043,7 @@ Configures the rules engine.
 
 Default value: `$apache::params::modsec_secruleengine`
 
-##### `audit_log_relevant_status`
+##### <a name="audit_log_relevant_status"></a>`audit_log_relevant_status`
 
 Data type: `Any`
 
@@ -5231,7 +6051,7 @@ Configures which response status code is to be considered relevant for the purpo
 
 Default value: `'^(?:5|4(?!04))'`
 
-##### `audit_log_parts`
+##### <a name="audit_log_parts"></a>`audit_log_parts`
 
 Data type: `Any`
 
@@ -5240,7 +6060,7 @@ letter appears in the list then the equivalent part will be recorded.
 
 Default value: `$apache::params::modsec_audit_log_parts`
 
-##### `audit_log_type`
+##### <a name="audit_log_type"></a>`audit_log_type`
 
 Data type: `Any`
 
@@ -5248,7 +6068,7 @@ Defines the type of audit logging mechanism to be used.
 
 Default value: `$apache::params::modsec_audit_log_type`
 
-##### `audit_log_storage_dir`
+##### <a name="audit_log_storage_dir"></a>`audit_log_storage_dir`
 
 Data type: `Any`
 
@@ -5256,7 +6076,7 @@ Defines the directory where concurrent audit log entries are to be stored. This
 
 Default value: ``undef``
 
-##### `secpcrematchlimit`
+##### <a name="secpcrematchlimit"></a>`secpcrematchlimit`
 
 Data type: `Any`
 
@@ -5264,7 +6084,7 @@ Sets the match limit in the PCRE library.
 
 Default value: `$apache::params::secpcrematchlimit`
 
-##### `secpcrematchlimitrecursion`
+##### <a name="secpcrematchlimitrecursion"></a>`secpcrematchlimitrecursion`
 
 Data type: `Any`
 
@@ -5272,7 +6092,7 @@ Sets the match limit recursion in the PCRE library.
 
 Default value: `$apache::params::secpcrematchlimitrecursion`
 
-##### `allowed_methods`
+##### <a name="allowed_methods"></a>`allowed_methods`
 
 Data type: `Any`
 
@@ -5280,7 +6100,7 @@ A space-separated list of allowed HTTP methods.
 
 Default value: `'GET HEAD POST OPTIONS'`
 
-##### `content_types`
+##### <a name="content_types"></a>`content_types`
 
 Data type: `Any`
 
@@ -5288,7 +6108,7 @@ A list of one or more allowed MIME types.
 
 Default value: `'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'`
 
-##### `restricted_extensions`
+##### <a name="restricted_extensions"></a>`restricted_extensions`
 
 Data type: `Any`
 
@@ -5296,7 +6116,7 @@ A space-sparated list of prohibited file extensions.
 
 Default value: `'.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'`
 
-##### `restricted_headers`
+##### <a name="restricted_headers"></a>`restricted_headers`
 
 Data type: `Any`
 
@@ -5304,7 +6124,7 @@ A list of restricted headers separated by slashes and spaces.
 
 Default value: `'/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'`
 
-##### `secdefaultaction`
+##### <a name="secdefaultaction"></a>`secdefaultaction`
 
 Data type: `Any`
 
@@ -5312,7 +6132,7 @@ Defines the default list of actions, which will be inherited by the rules in the
 
 Default value: `'deny'`
 
-##### `anomaly_score_blocking`
+##### <a name="anomaly_score_blocking"></a>`anomaly_score_blocking`
 
 Data type: `Any`
 
@@ -5320,7 +6140,7 @@ Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSe
 
 Default value: `'off'`
 
-##### `inbound_anomaly_threshold`
+##### <a name="inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
 
 Data type: `Any`
 
@@ -5328,7 +6148,7 @@ Sets the scoring threshold level of the inbound blocking rules for the Collabora
 
 Default value: `'5'`
 
-##### `outbound_anomaly_threshold`
+##### <a name="outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
 
 Data type: `Any`
 
@@ -5336,7 +6156,7 @@ Sets the scoring threshold level of the outbound blocking rules for the Collabor
 
 Default value: `'4'`
 
-##### `critical_anomaly_score`
+##### <a name="critical_anomaly_score"></a>`critical_anomaly_score`
 
 Data type: `Any`
 
@@ -5344,7 +6164,7 @@ Sets the Anomaly Score for rules assigned with a critical severity.
 
 Default value: `'5'`
 
-##### `error_anomaly_score`
+##### <a name="error_anomaly_score"></a>`error_anomaly_score`
 
 Data type: `Any`
 
@@ -5352,7 +6172,7 @@ Sets the Anomaly Score for rules assigned with a error severity.
 
 Default value: `'4'`
 
-##### `warning_anomaly_score`
+##### <a name="warning_anomaly_score"></a>`warning_anomaly_score`
 
 Data type: `Any`
 
@@ -5360,7 +6180,7 @@ Sets the Anomaly Score for rules assigned with a warning severity.
 
 Default value: `'3'`
 
-##### `notice_anomaly_score`
+##### <a name="notice_anomaly_score"></a>`notice_anomaly_score`
 
 Data type: `Any`
 
@@ -5368,7 +6188,7 @@ Sets the Anomaly Score for rules assigned with a notice severity.
 
 Default value: `'2'`
 
-##### `secrequestmaxnumargs`
+##### <a name="secrequestmaxnumargs"></a>`secrequestmaxnumargs`
 
 Data type: `Any`
 
@@ -5376,7 +6196,7 @@ Sets the maximum number of arguments in the request.
 
 Default value: `'255'`
 
-##### `secrequestbodylimit`
+##### <a name="secrequestbodylimit"></a>`secrequestbodylimit`
 
 Data type: `Any`
 
@@ -5384,7 +6204,7 @@ Sets the maximum request body size ModSecurity will accept for buffering.
 
 Default value: `'13107200'`
 
-##### `secrequestbodynofileslimit`
+##### <a name="secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
 
 Data type: `Any`
 
@@ -5393,7 +6213,7 @@ in the request.
 
 Default value: `'131072'`
 
-##### `secrequestbodyinmemorylimit`
+##### <a name="secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
 
 Data type: `Any`
 
@@ -5401,7 +6221,7 @@ Configures the maximum request body size that ModSecurity will store in memory.
 
 Default value: `'131072'`
 
-##### `manage_security_crs`
+##### <a name="manage_security_crs"></a>`manage_security_crs`
 
 Data type: `Any`
 
@@ -5409,7 +6229,7 @@ Toggles whether to manage ModSecurity Core Rule Set
 
 Default value: ``true``
 
-### `apache::mod::setenvif`
+### <a name="apachemodsetenvif"></a>`apache::mod::setenvif`
 
 Installs `mod_setenvif`.
 
@@ -5417,7 +6237,7 @@ Installs `mod_setenvif`.
   * https://httpd.apache.org/docs/current/mod/mod_setenvif.html
     * for additional documentation.
 
-### `apache::mod::shib`
+### <a name="apachemodshib"></a>`apache::mod::shib`
 
 This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
 can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
@@ -5431,9 +6251,14 @@ See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::shib` class.
+The following parameters are available in the `apache::mod::shib` class:
+
+* [`suppress_warning`](#suppress_warning)
+* [`mod_full_path`](#mod_full_path)
+* [`package_name`](#package_name)
+* [`mod_lib`](#mod_lib)
 
-##### `suppress_warning`
+##### <a name="suppress_warning"></a>`suppress_warning`
 
 Data type: `Any`
 
@@ -5441,7 +6266,7 @@ Toggles whether to trigger warning on RedHat nodes.
 
 Default value: ``false``
 
-##### `mod_full_path`
+##### <a name="mod_full_path"></a>`mod_full_path`
 
 Data type: `Any`
 
@@ -5449,7 +6274,7 @@ Specifies a path to the module. Do not manually set this parameter without a spe
 
 Default value: ``undef``
 
-##### `package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Any`
 
@@ -5457,7 +6282,7 @@ Name of the Shibboleth package to be installed.
 
 Default value: ``undef``
 
-##### `mod_lib`
+##### <a name="mod_lib"></a>`mod_lib`
 
 Data type: `Any`
 
@@ -5466,7 +6291,7 @@ overrides this value.
 
 Default value: ``undef``
 
-### `apache::mod::socache_shmcb`
+### <a name="apachemodsocache_shmcb"></a>`apache::mod::socache_shmcb`
 
 Installs `mod_socache_shmcb`.
 
@@ -5474,7 +6299,7 @@ Installs `mod_socache_shmcb`.
   * https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html
     * for additional documentation.
 
-### `apache::mod::speling`
+### <a name="apachemodspeling"></a>`apache::mod::speling`
 
 Installs `mod_spelling`.
 
@@ -5482,7 +6307,7 @@ Installs `mod_spelling`.
   * https://httpd.apache.org/docs/current/mod/mod_speling.html
     * for additional documentation.
 
-### `apache::mod::ssl`
+### <a name="apachemodssl"></a>`apache::mod::ssl`
 
 On most operating systems, the ssl.conf is placed in the module configuration directory. On Red Hat based operating systems, this
 file is placed in /etc/httpd/conf.d, the same location in which the RPM stores the configuration.
@@ -5496,9 +6321,32 @@ apache::vhost to true.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::ssl` class.
-
-##### `ssl_compression`
+The following parameters are available in the `apache::mod::ssl` class:
+
+* [`ssl_compression`](#ssl_compression)
+* [`ssl_cryptodevice`](#ssl_cryptodevice)
+* [`ssl_options`](#ssl_options)
+* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
+* [`ssl_cert`](#ssl_cert)
+* [`ssl_key`](#ssl_key)
+* [`ssl_ca`](#ssl_ca)
+* [`ssl_cipher`](#ssl_cipher)
+* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
+* [`ssl_protocol`](#ssl_protocol)
+* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
+* [`ssl_pass_phrase_dialog`](#ssl_pass_phrase_dialog)
+* [`ssl_random_seed_bytes`](#ssl_random_seed_bytes)
+* [`ssl_sessioncache`](#ssl_sessioncache)
+* [`ssl_sessioncachetimeout`](#ssl_sessioncachetimeout)
+* [`ssl_stapling`](#ssl_stapling)
+* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
+* [`ssl_mutex`](#ssl_mutex)
+* [`apache_version`](#apache_version)
+* [`package_name`](#package_name)
+* [`ssl_sessiontickets`](#ssl_sessiontickets)
+* [`stapling_cache`](#stapling_cache)
+
+##### <a name="ssl_compression"></a>`ssl_compression`
 
 Data type: `Boolean`
 
@@ -5506,7 +6354,7 @@ Enable compression on the SSL level.
 
 Default value: ``false``
 
-##### `ssl_cryptodevice`
+##### <a name="ssl_cryptodevice"></a>`ssl_cryptodevice`
 
 Data type: `Any`
 
@@ -5514,7 +6362,7 @@ Enable use of a cryptographic hardware accelerator.
 
 Default value: `'builtin'`
 
-##### `ssl_options`
+##### <a name="ssl_options"></a>`ssl_options`
 
 Data type: `Any`
 
@@ -5522,7 +6370,7 @@ Configure various SSL engine run-time options.
 
 Default value: `['StdEnvVars']`
 
-##### `ssl_openssl_conf_cmd`
+##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Any`
 
@@ -5530,7 +6378,7 @@ Configure OpenSSL parameters through its SSL_CONF API.
 
 Default value: ``undef``
 
-##### `ssl_cert`
+##### <a name="ssl_cert"></a>`ssl_cert`
 
 Data type: `Optional[String]`
 
@@ -5538,7 +6386,7 @@ Path to server PEM-encoded X.509 certificate data file.
 
 Default value: ``undef``
 
-##### `ssl_key`
+##### <a name="ssl_key"></a>`ssl_key`
 
 Data type: `Optional[String]`
 
@@ -5546,7 +6394,7 @@ Path to server PEM-encoded private key file
 
 Default value: ``undef``
 
-##### `ssl_ca`
+##### <a name="ssl_ca"></a>`ssl_ca`
 
 Data type: `Any`
 
@@ -5554,7 +6402,7 @@ File of concatenated PEM-encoded CA Certificates for Client Auth.
 
 Default value: ``undef``
 
-##### `ssl_cipher`
+##### <a name="ssl_cipher"></a>`ssl_cipher`
 
 Data type: `Any`
 
@@ -5562,7 +6410,7 @@ Cipher Suite available for negotiation in SSL handshake.
 
 Default value: `'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES'`
 
-##### `ssl_honorcipherorder`
+##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
 Data type: `Variant[Boolean, Enum['on', 'off']]`
 
@@ -5570,7 +6418,7 @@ Option to prefer the server's cipher preference order.
 
 Default value: ``true``
 
-##### `ssl_protocol`
+##### <a name="ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Any`
 
@@ -5581,7 +6429,7 @@ Default based on the OS:
 
 Default value: `$apache::params::ssl_protocol`
 
-##### `ssl_proxy_protocol`
+##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Array`
 
@@ -5589,7 +6437,7 @@ Configure usable SSL protocol flavors for proxy usage.
 
 Default value: `[]`
 
-##### `ssl_pass_phrase_dialog`
+##### <a name="ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
 
 Data type: `Any`
 
@@ -5597,7 +6445,7 @@ Type of pass phrase dialog for encrypted private keys.
 
 Default value: `'builtin'`
 
-##### `ssl_random_seed_bytes`
+##### <a name="ssl_random_seed_bytes"></a>`ssl_random_seed_bytes`
 
 Data type: `Any`
 
@@ -5605,7 +6453,7 @@ Pseudo Random Number Generator (PRNG) seeding source.
 
 Default value: `'512'`
 
-##### `ssl_sessioncache`
+##### <a name="ssl_sessioncache"></a>`ssl_sessioncache`
 
 Data type: `String`
 
@@ -5613,7 +6461,7 @@ Configures the storage type of the global/inter-process SSL Session Cache
 
 Default value: `$apache::params::ssl_sessioncache`
 
-##### `ssl_sessioncachetimeout`
+##### <a name="ssl_sessioncachetimeout"></a>`ssl_sessioncachetimeout`
 
 Data type: `Any`
 
@@ -5621,7 +6469,7 @@ Number of seconds before an SSL session expires in the Session Cache.
 
 Default value: `'300'`
 
-##### `ssl_stapling`
+##### <a name="ssl_stapling"></a>`ssl_stapling`
 
 Data type: `Boolean`
 
@@ -5629,7 +6477,7 @@ Enable stapling of OCSP responses in the TLS handshake.
 
 Default value: ``false``
 
-##### `ssl_stapling_return_errors`
+##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Optional[Boolean]`
 
@@ -5637,7 +6485,7 @@ Pass stapling related OCSP errors on to client.
 
 Default value: ``undef``
 
-##### `ssl_mutex`
+##### <a name="ssl_mutex"></a>`ssl_mutex`
 
 Data type: `Any`
 
@@ -5650,7 +6498,7 @@ Default based on the OS and/or Apache version:
 
 Default value: ``undef``
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -5658,7 +6506,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-##### `package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Any`
 
@@ -5666,7 +6514,7 @@ Name of ssl package to install.
 
 Default value: ``undef``
 
-##### `ssl_sessiontickets`
+##### <a name="ssl_sessiontickets"></a>`ssl_sessiontickets`
 
 Data type: `Optional[Boolean]`
 
@@ -5674,7 +6522,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `stapling_cache`
+##### <a name="stapling_cache"></a>`stapling_cache`
 
 Data type: `Optional[String]`
 
@@ -5682,7 +6530,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-### `apache::mod::status`
+### <a name="apachemodstatus"></a>`apache::mod::status`
 
 Installs and configures `mod_status`.
 
@@ -5703,9 +6551,15 @@ class { 'apache::mod::status':
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::status` class.
+The following parameters are available in the `apache::mod::status` class:
+
+* [`allow_from`](#allow_from)
+* [`requires`](#requires)
+* [`extended_status`](#extended_status)
+* [`status_path`](#status_path)
+* [`apache_version`](#apache_version)
 
-##### `allow_from`
+##### <a name="allow_from"></a>`allow_from`
 
 Data type: `Optional[Array]`
 
@@ -5715,7 +6569,7 @@ Array of hosts, ip addresses, partial network numbers or networks, in CIDR notat
 
 Default value: ``undef``
 
-##### `requires`
+##### <a name="requires"></a>`requires`
 
 Data type: `Optional[Variant[String, Array, Hash]]`
 
@@ -5735,7 +6589,7 @@ A Variant type that can be:
 
 Default value: ``undef``
 
-##### `extended_status`
+##### <a name="extended_status"></a>`extended_status`
 
 Data type: `Enum['On', 'Off', 'on', 'off']`
 
@@ -5743,7 +6597,7 @@ Determines whether to track extended status information for each request, via th
 
 Default value: `'On'`
 
-##### `status_path`
+##### <a name="status_path"></a>`status_path`
 
 Data type: `Any`
 
@@ -5751,7 +6605,7 @@ Path assigned to the Location directive which defines the URL to access the serv
 
 Default value: `'/server-status'`
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -5759,7 +6613,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-### `apache::mod::suexec`
+### <a name="apachemodsuexec"></a>`apache::mod::suexec`
 
 Installs `mod_suexec`.
 
@@ -5767,7 +6621,7 @@ Installs `mod_suexec`.
   * https://httpd.apache.org/docs/current/mod/mod_suexec.html
     * for additional documentation.
 
-### `apache::mod::suphp`
+### <a name="apachemodsuphp"></a>`apache::mod::suphp`
 
 Installs `mod_suphp`.
 
@@ -5775,7 +6629,7 @@ Installs `mod_suphp`.
   * https://www.suphp.org/DocumentationView.html?file=apache/INSTALL
     * for additional documentation.
 
-### `apache::mod::userdir`
+### <a name="apachemoduserdir"></a>`apache::mod::userdir`
 
 Installs and configures `mod_userdir`.
 
@@ -5785,9 +6639,19 @@ Installs and configures `mod_userdir`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::userdir` class.
+The following parameters are available in the `apache::mod::userdir` class:
 
-##### `home`
+* [`home`](#home)
+* [`dir`](#dir)
+* [`disable_root`](#disable_root)
+* [`apache_version`](#apache_version)
+* [`path`](#path)
+* [`overrides`](#overrides)
+* [`options`](#options)
+* [`unmanaged_path`](#unmanaged_path)
+* [`custom_fragment`](#custom_fragment)
+
+##### <a name="home"></a>`home`
 
 Data type: `Any`
 
@@ -5795,7 +6659,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `dir`
+##### <a name="dir"></a>`dir`
 
 Data type: `Any`
 
@@ -5803,7 +6667,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `disable_root`
+##### <a name="disable_root"></a>`disable_root`
 
 Data type: `Any`
 
@@ -5811,7 +6675,7 @@ Toggles whether to allow use of root directory.
 
 Default value: ``true``
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -5819,7 +6683,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-##### `path`
+##### <a name="path"></a>`path`
 
 Data type: `Any`
 
@@ -5827,7 +6691,7 @@ Path to directory or pattern from which to find user-specific directories.
 
 Default value: `'/home/*/public_html'`
 
-##### `overrides`
+##### <a name="overrides"></a>`overrides`
 
 Data type: `Any`
 
@@ -5835,7 +6699,7 @@ Array of directives that are allowed in .htaccess files.
 
 Default value: `['FileInfo', 'AuthConfig', 'Limit', 'Indexes']`
 
-##### `options`
+##### <a name="options"></a>`options`
 
 Data type: `Any`
 
@@ -5843,7 +6707,7 @@ Configures what features are available in a particular directory.
 
 Default value: `['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec']`
 
-##### `unmanaged_path`
+##### <a name="unmanaged_path"></a>`unmanaged_path`
 
 Data type: `Any`
 
@@ -5851,7 +6715,7 @@ Toggles whether to manage path in userdir.conf
 
 Default value: ``false``
 
-##### `custom_fragment`
+##### <a name="custom_fragment"></a>`custom_fragment`
 
 Data type: `Any`
 
@@ -5859,7 +6723,7 @@ Custom configuration to be added to userdir.conf
 
 Default value: ``undef``
 
-### `apache::mod::version`
+### <a name="apachemodversion"></a>`apache::mod::version`
 
 Installs `mod_version`.
 
@@ -5869,9 +6733,11 @@ Installs `mod_version`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::version` class.
+The following parameters are available in the `apache::mod::version` class:
+
+* [`apache_version`](#apache_version)
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -5879,7 +6745,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: `$apache::apache_version`
 
-### `apache::mod::vhost_alias`
+### <a name="apachemodvhost_alias"></a>`apache::mod::vhost_alias`
 
 Installs Apache `mod_vhost_alias`.
 
@@ -5887,7 +6753,29 @@ Installs Apache `mod_vhost_alias`.
   * https://httpd.apache.org/docs/current/mod/mod_vhost_alias.html
     * for additional documentation.
 
-### `apache::mod::worker`
+### <a name="apachemodwatchdog"></a>`apache::mod::watchdog`
+
+Installs and configures `mod_watchdog`.
+
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/mod_watchdog.html
+    * for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::watchdog` class:
+
+* [`watchdog_interval`](#watchdog_interval)
+
+##### <a name="watchdog_interval"></a>`watchdog_interval`
+
+Data type: `Optional[Integer]`
+
+Sets the interval at which the watchdog_step hook runs.
+
+Default value: ``undef``
+
+### <a name="apachemodworker"></a>`apache::mod::worker`
 
 Installs and manages the MPM `worker`.
 
@@ -5897,9 +6785,20 @@ Installs and manages the MPM `worker`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::worker` class.
+The following parameters are available in the `apache::mod::worker` class:
 
-##### `startservers`
+* [`startservers`](#startservers)
+* [`maxclients`](#maxclients)
+* [`minsparethreads`](#minsparethreads)
+* [`maxsparethreads`](#maxsparethreads)
+* [`threadsperchild`](#threadsperchild)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`serverlimit`](#serverlimit)
+* [`threadlimit`](#threadlimit)
+* [`listenbacklog`](#listenbacklog)
+* [`apache_version`](#apache_version)
+
+##### <a name="startservers"></a>`startservers`
 
 Data type: `Any`
 
@@ -5907,7 +6806,7 @@ The number of child server processes created on startup
 
 Default value: `'2'`
 
-##### `maxclients`
+##### <a name="maxclients"></a>`maxclients`
 
 Data type: `Any`
 
@@ -5917,7 +6816,7 @@ MaxRequestWorkers as of 2.3.13.
 
 Default value: `'150'`
 
-##### `minsparethreads`
+##### <a name="minsparethreads"></a>`minsparethreads`
 
 Data type: `Any`
 
@@ -5925,7 +6824,7 @@ Minimum number of idle threads to handle request spikes.
 
 Default value: `'25'`
 
-##### `maxsparethreads`
+##### <a name="maxsparethreads"></a>`maxsparethreads`
 
 Data type: `Any`
 
@@ -5933,7 +6832,7 @@ Maximum number of idle threads.
 
 Default value: `'75'`
 
-##### `threadsperchild`
+##### <a name="threadsperchild"></a>`threadsperchild`
 
 Data type: `Any`
 
@@ -5941,7 +6840,7 @@ The number of threads created by each child process.
 
 Default value: `'25'`
 
-##### `maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Any`
 
@@ -5951,7 +6850,7 @@ name is MaxConnectionsPerChild as of 2.3.9+.
 
 Default value: `'0'`
 
-##### `serverlimit`
+##### <a name="serverlimit"></a>`serverlimit`
 
 Data type: `Any`
 
@@ -5963,7 +6862,7 @@ MaxRequestWorkers and ThreadsPerChild.
 
 Default value: `'25'`
 
-##### `threadlimit`
+##### <a name="threadlimit"></a>`threadlimit`
 
 Data type: `Any`
 
@@ -5972,7 +6871,7 @@ ThreadsPerChild for the lifetime of the Apache httpd process.
 
 Default value: `'64'`
 
-##### `listenbacklog`
+##### <a name="listenbacklog"></a>`listenbacklog`
 
 Data type: `Any`
 
@@ -5980,7 +6879,7 @@ Maximum length of the queue of pending connections.
 
 Default value: `'511'`
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -5988,7 +6887,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
-### `apache::mod::wsgi`
+### <a name="apachemodwsgi"></a>`apache::mod::wsgi`
 
 Installs and configures `mod_wsgi`.
 
@@ -6000,9 +6899,18 @@ Installs and configures `mod_wsgi`.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod::wsgi` class.
+The following parameters are available in the `apache::mod::wsgi` class:
+
+* [`wsgi_restrict_embedded`](#wsgi_restrict_embedded)
+* [`wsgi_socket_prefix`](#wsgi_socket_prefix)
+* [`wsgi_python_path`](#wsgi_python_path)
+* [`wsgi_python_home`](#wsgi_python_home)
+* [`wsgi_python_optimize`](#wsgi_python_optimize)
+* [`wsgi_application_group`](#wsgi_application_group)
+* [`package_name`](#package_name)
+* [`mod_path`](#mod_path)
 
-##### `wsgi_restrict_embedded`
+##### <a name="wsgi_restrict_embedded"></a>`wsgi_restrict_embedded`
 
 Data type: `Any`
 
@@ -6010,7 +6918,7 @@ Enable restrictions on use of embedded mode.
 
 Default value: ``undef``
 
-##### `wsgi_socket_prefix`
+##### <a name="wsgi_socket_prefix"></a>`wsgi_socket_prefix`
 
 Data type: `Any`
 
@@ -6018,7 +6926,7 @@ Configure directory to use for daemon sockets.
 
 Default value: `$apache::params::wsgi_socket_prefix`
 
-##### `wsgi_python_path`
+##### <a name="wsgi_python_path"></a>`wsgi_python_path`
 
 Data type: `Any`
 
@@ -6026,7 +6934,7 @@ Additional directories to search for Python modules.
 
 Default value: ``undef``
 
-##### `wsgi_python_home`
+##### <a name="wsgi_python_home"></a>`wsgi_python_home`
 
 Data type: `Any`
 
@@ -6034,7 +6942,7 @@ Absolute path to Python prefix/exec_prefix directories.
 
 Default value: ``undef``
 
-##### `wsgi_python_optimize`
+##### <a name="wsgi_python_optimize"></a>`wsgi_python_optimize`
 
 Data type: `Any`
 
@@ -6042,7 +6950,7 @@ Enables basic Python optimisation features.
 
 Default value: ``undef``
 
-##### `wsgi_application_group`
+##### <a name="wsgi_application_group"></a>`wsgi_application_group`
 
 Data type: `Any`
 
@@ -6050,7 +6958,7 @@ Sets which application group WSGI application belongs to.
 
 Default value: ``undef``
 
-##### `package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Any`
 
@@ -6058,7 +6966,7 @@ Names of package that installs mod_wsgi.
 
 Default value: ``undef``
 
-##### `mod_path`
+##### <a name="mod_path"></a>`mod_path`
 
 Data type: `Any`
 
@@ -6066,7 +6974,7 @@ Defines the path to the mod_wsgi shared object (.so) file.
 
 Default value: ``undef``
 
-### `apache::mod::xsendfile`
+### <a name="apachemodxsendfile"></a>`apache::mod::xsendfile`
 
 Installs `mod_xsendfile`.
 
@@ -6074,19 +6982,19 @@ Installs `mod_xsendfile`.
   * https://tn123.org/mod_xsendfile/
     * for additional documentation.
 
-### `apache::mpm::disable_mpm_event`
+### <a name="apachempmdisable_mpm_event"></a>`apache::mpm::disable_mpm_event`
 
 The apache::mpm::disable_mpm_event class.
 
-### `apache::mpm::disable_mpm_prefork`
+### <a name="apachempmdisable_mpm_prefork"></a>`apache::mpm::disable_mpm_prefork`
 
 The apache::mpm::disable_mpm_prefork class.
 
-### `apache::mpm::disable_mpm_worker`
+### <a name="apachempmdisable_mpm_worker"></a>`apache::mpm::disable_mpm_worker`
 
 The apache::mpm::disable_mpm_worker class.
 
-### `apache::vhosts`
+### <a name="apachevhosts"></a>`apache::vhosts`
 
 host parameters or Configuring virtual hosts in the README section.
 
@@ -6109,9 +7017,11 @@ class { 'apache::vhosts':
 
 #### Parameters
 
-The following parameters are available in the `apache::vhosts` class.
+The following parameters are available in the `apache::vhosts` class:
 
-##### `vhosts`
+* [`vhosts`](#vhosts)
+
+##### <a name="vhosts"></a>`vhosts`
 
 Data type: `Any`
 
@@ -6122,7 +7032,7 @@ Default value: `{}`
 
 ## Defined types
 
-### `apache::balancer`
+### <a name="apachebalancer"></a>`apache::balancer`
 
 Each balancer cluster needs one or more balancer members (that can
 be declared with the apache::balancermember defined resource type). Using
@@ -6144,14 +7054,20 @@ apache::balancer { 'puppet00': }
 
 #### Parameters
 
-The following parameters are available in the `apache::balancer` defined type.
+The following parameters are available in the `apache::balancer` defined type:
+
+* [`name`](#name)
+* [`proxy_set`](#proxy_set)
+* [`target`](#target)
+* [`collect_exported`](#collect_exported)
+* [`options`](#options)
 
-##### `name`
+##### <a name="name"></a>`name`
 
 The namevar of the defined resource type is the balancer clusters name.<br />
 This name is also used in the name of the conf.d file
 
-##### `proxy_set`
+##### <a name="proxy_set"></a>`proxy_set`
 
 Data type: `Any`
 
@@ -6159,7 +7075,7 @@ Configures key-value pairs to be used as a ProxySet lines in the configuration.
 
 Default value: `{}`
 
-##### `target`
+##### <a name="target"></a>`target`
 
 Data type: `Any`
 
@@ -6167,7 +7083,7 @@ The path to the file the balancer definition will be written in.
 
 Default value: ``undef``
 
-##### `collect_exported`
+##### <a name="collect_exported"></a>`collect_exported`
 
 Data type: `Any`
 
@@ -6184,7 +7100,7 @@ balancer.
 
 Default value: ``true``
 
-##### `options`
+##### <a name="options"></a>`options`
 
 Data type: `Any`
 
@@ -6193,7 +7109,7 @@ after the balancer URL, and accepts any key-value pairs available to `ProxyPass`
 
 Default value: `[]`
 
-### `apache::balancermember`
+### <a name="apachebalancermember"></a>`apache::balancermember`
 
 Sets up a balancer member inside a listening service configuration block in
 the load balancer's `apache.cfg`.
@@ -6223,21 +7139,26 @@ from all balancer members.
 
 #### Parameters
 
-The following parameters are available in the `apache::balancermember` defined type.
+The following parameters are available in the `apache::balancermember` defined type:
+
+* [`name`](#name)
+* [`balancer_cluster`](#balancer_cluster)
+* [`url`](#url)
+* [`options`](#options)
 
-##### `name`
+##### <a name="name"></a>`name`
 
 The title of the resource is arbitrary and only utilized in the concat
 fragment name.
 
-##### `balancer_cluster`
+##### <a name="balancer_cluster"></a>`balancer_cluster`
 
 Data type: `Any`
 
 The apache service's instance name (or, the title of the apache::balancer
 resource). This must match up with a declared apache::balancer resource.
 
-##### `url`
+##### <a name="url"></a>`url`
 
 Data type: `Any`
 
@@ -6245,7 +7166,7 @@ The url used to contact the balancer member server.
 
 Default value: `"http://${::fqdn}/"`
 
-##### `options`
+##### <a name="options"></a>`options`
 
 Data type: `Any`
 
@@ -6254,16 +7175,29 @@ after the URL, and accepts any key-value pairs available to `ProxyPass`.
 
 Default value: `[]`
 
-### `apache::custom_config`
+### <a name="apachecustom_config"></a>`apache::custom_config`
 
 If the file is invalid and this defined type's `verify_config` parameter's value is
 `true`, Puppet throws an error during a Puppet run.
 
 #### Parameters
 
-The following parameters are available in the `apache::custom_config` defined type.
+The following parameters are available in the `apache::custom_config` defined type:
 
-##### `ensure`
+* [`ensure`](#ensure)
+* [`confdir`](#confdir)
+* [`content`](#content)
+* [`filename`](#filename)
+* [`priority`](#priority)
+* [`source`](#source)
+* [`verify_command`](#verify_command)
+* [`verify_config`](#verify_config)
+* [`owner`](#owner)
+* [`group`](#group)
+* [`file_mode`](#file_mode)
+* [`show_diff`](#show_diff)
+
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Enum['absent', 'present']`
 
@@ -6271,7 +7205,7 @@ Specifies whether the configuration file should be present.
 
 Default value: `'present'`
 
-##### `confdir`
+##### <a name="confdir"></a>`confdir`
 
 Data type: `Any`
 
@@ -6279,7 +7213,7 @@ Sets the directory in which Puppet places configuration files.
 
 Default value: `$apache::confd_dir`
 
-##### `content`
+##### <a name="content"></a>`content`
 
 Data type: `Any`
 
@@ -6288,7 +7222,7 @@ of each other.
 
 Default value: ``undef``
 
-##### `filename`
+##### <a name="filename"></a>`filename`
 
 Data type: `Any`
 
@@ -6296,7 +7230,7 @@ Sets the name of the file under `confdir` in which Puppet stores the configurati
 
 Default value: ``undef``
 
-##### `priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Any`
 
@@ -6306,7 +7240,7 @@ To omit the priority prefix in the configuration file's name, set this parameter
 
 Default value: `'25'`
 
-##### `source`
+##### <a name="source"></a>`source`
 
 Data type: `Any`
 
@@ -6315,7 +7249,7 @@ exclusive of each other.
 
 Default value: ``undef``
 
-##### `verify_command`
+##### <a name="verify_command"></a>`verify_command`
 
 Data type: `Any`
 
@@ -6327,7 +7261,7 @@ but does not notify the Apache service.
 
 Default value: `$apache::params::verify_command`
 
-##### `verify_config`
+##### <a name="verify_config"></a>`verify_config`
 
 Data type: `Boolean`
 
@@ -6335,7 +7269,7 @@ Specifies whether to validate the configuration file before notifying the Apache
 
 Default value: ``true``
 
-##### `owner`
+##### <a name="owner"></a>`owner`
 
 Data type: `Any`
 
@@ -6343,7 +7277,7 @@ File owner of configuration file
 
 Default value: ``undef``
 
-##### `group`
+##### <a name="group"></a>`group`
 
 Data type: `Any`
 
@@ -6351,7 +7285,7 @@ File group of configuration file
 
 Default value: ``undef``
 
-##### `file_mode`
+##### <a name="file_mode"></a>`file_mode`
 
 Data type: `Any`
 
@@ -6359,7 +7293,7 @@ File mode of configuration file
 
 Default value: ``undef``
 
-##### `show_diff`
+##### <a name="show_diff"></a>`show_diff`
 
 Data type: `Boolean`
 
@@ -6367,16 +7301,24 @@ show_diff property for configuration file resource
 
 Default value: ``true``
 
-### `apache::fastcgi::server`
+### <a name="apachefastcgiserver"></a>`apache::fastcgi::server`
 
 Defines one or more external FastCGI servers to handle specific file types. Use this
 defined type with `mod_fastcgi`.
 
 #### Parameters
 
-The following parameters are available in the `apache::fastcgi::server` defined type.
+The following parameters are available in the `apache::fastcgi::server` defined type:
 
-##### `host`
+* [`host`](#host)
+* [`timeout`](#timeout)
+* [`flush`](#flush)
+* [`faux_path`](#faux_path)
+* [`fcgi_alias`](#fcgi_alias)
+* [`file_type`](#file_type)
+* [`pass_header`](#pass_header)
+
+##### <a name="host"></a>`host`
 
 Data type: `Any`
 
@@ -6384,7 +7326,7 @@ Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
 
 Default value: `'127.0.0.1:9000'`
 
-##### `timeout`
+##### <a name="timeout"></a>`timeout`
 
 Data type: `Any`
 
@@ -6397,7 +7339,7 @@ the client (the response is buffered), the timeout does not apply.
 
 Default value: `15`
 
-##### `flush`
+##### <a name="flush"></a>`flush`
 
 Data type: `Any`
 
@@ -6407,7 +7349,7 @@ as quickly as possible.
 
 Default value: ``false``
 
-##### `faux_path`
+##### <a name="faux_path"></a>`faux_path`
 
 Data type: `Any`
 
@@ -6416,7 +7358,7 @@ parameter does not have to exist in the local filesystem.
 
 Default value: `"/var/www/${name}.fcgi"`
 
-##### `fcgi_alias`
+##### <a name="fcgi_alias"></a>`fcgi_alias`
 
 Data type: `Any`
 
@@ -6424,7 +7366,7 @@ Internally links actions with the FastCGI server. This alias must be unique.
 
 Default value: `"/${name}.fcgi"`
 
-##### `file_type`
+##### <a name="file_type"></a>`file_type`
 
 Data type: `Any`
 
@@ -6432,7 +7374,7 @@ Sets the MIME `content-type` of the file to be processed by the FastCGI server.
 
 Default value: `'application/x-httpd-php'`
 
-##### `pass_header`
+##### <a name="pass_header"></a>`pass_header`
 
 Data type: `Any`
 
@@ -6440,21 +7382,30 @@ Data type: `Any`
 
 Default value: ``undef``
 
-### `apache::listen`
+### <a name="apachelisten"></a>`apache::listen`
 
 The `apache::vhost` class uses this defined type, and titles take the form
 `<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
 
-### `apache::mod`
+### <a name="apachemod"></a>`apache::mod`
 
 Checks for or places the module's default configuration files in the Apache server's
 `module` and `enable` directories. The default locations depend on your operating system.
 
 #### Parameters
 
-The following parameters are available in the `apache::mod` defined type.
+The following parameters are available in the `apache::mod` defined type:
+
+* [`package`](#package)
+* [`package_ensure`](#package_ensure)
+* [`lib`](#lib)
+* [`lib_path`](#lib_path)
+* [`loadfile_name`](#loadfile_name)
+* [`id`](#id)
+* [`loadfiles`](#loadfiles)
+* [`path`](#path)
 
-##### `package`
+##### <a name="package"></a>`package`
 
 Data type: `Any`
 
@@ -6463,7 +7414,7 @@ Names the package Puppet uses to install the Apache module.
 
 Default value: ``undef``
 
-##### `package_ensure`
+##### <a name="package_ensure"></a>`package_ensure`
 
 Data type: `Any`
 
@@ -6471,7 +7422,7 @@ Determines whether Puppet ensures the Apache module should be installed.
 
 Default value: `'present'`
 
-##### `lib`
+##### <a name="lib"></a>`lib`
 
 Data type: `Any`
 
@@ -6479,7 +7430,7 @@ Defines the module's shared object name. Do not configure manually without speci
 
 Default value: ``undef``
 
-##### `lib_path`
+##### <a name="lib_path"></a>`lib_path`
 
 Data type: `Any`
 
@@ -6488,7 +7439,7 @@ without special reason. The `path` parameter overrides this value.
 
 Default value: `$apache::lib_path`
 
-##### `loadfile_name`
+##### <a name="loadfile_name"></a>`loadfile_name`
 
 Data type: `Any`
 
@@ -6497,7 +7448,7 @@ the module load order as Apache processes them in alphanumeric order.
 
 Default value: ``undef``
 
-##### `id`
+##### <a name="id"></a>`id`
 
 Data type: `Any`
 
@@ -6505,7 +7456,7 @@ Specifies the package id
 
 Default value: ``undef``
 
-##### `loadfiles`
+##### <a name="loadfiles"></a>`loadfiles`
 
 Data type: `Any`
 
@@ -6513,7 +7464,7 @@ Specifies an array of `LoadFile` directives.
 
 Default value: ``undef``
 
-##### `path`
+##### <a name="path"></a>`path`
 
 Data type: `Any`
 
@@ -6521,27 +7472,269 @@ Specifies a path to the module. Do not manually set this parameter without a spe
 
 Default value: ``undef``
 
-### `apache::namevirtualhost`
+### <a name="apachenamevirtualhost"></a>`apache::namevirtualhost`
 
 Adds all related directives to the `ports.conf` file in the Apache HTTPD configuration
 directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`,
 `\<IP\>`, or `\<IP\>:\<PORT\>`.
 
-### `apache::vhost`
+### <a name="apachevhost"></a>`apache::vhost`
 
 The apache::vhost class.
 
 #### Parameters
 
-The following parameters are available in the `apache::vhost` defined type.
-
-##### `docroot`
+The following parameters are available in the `apache::vhost` defined type:
+
+* [`docroot`](#docroot)
+* [`manage_docroot`](#manage_docroot)
+* [`virtual_docroot`](#virtual_docroot)
+* [`port`](#port)
+* [`ip`](#ip)
+* [`ip_based`](#ip_based)
+* [`add_listen`](#add_listen)
+* [`docroot_owner`](#docroot_owner)
+* [`docroot_group`](#docroot_group)
+* [`docroot_mode`](#docroot_mode)
+* [`protocols`](#protocols)
+* [`protocols_honor_order`](#protocols_honor_order)
+* [`serveradmin`](#serveradmin)
+* [`ssl`](#ssl)
+* [`ssl_cert`](#ssl_cert)
+* [`ssl_key`](#ssl_key)
+* [`ssl_chain`](#ssl_chain)
+* [`ssl_ca`](#ssl_ca)
+* [`ssl_crl_path`](#ssl_crl_path)
+* [`ssl_crl`](#ssl_crl)
+* [`ssl_crl_check`](#ssl_crl_check)
+* [`ssl_certs_dir`](#ssl_certs_dir)
+* [`ssl_protocol`](#ssl_protocol)
+* [`ssl_cipher`](#ssl_cipher)
+* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
+* [`ssl_verify_client`](#ssl_verify_client)
+* [`ssl_verify_depth`](#ssl_verify_depth)
+* [`ssl_proxy_verify`](#ssl_proxy_verify)
+* [`ssl_proxy_verify_depth`](#ssl_proxy_verify_depth)
+* [`ssl_proxy_ca_cert`](#ssl_proxy_ca_cert)
+* [`ssl_proxy_check_peer_cn`](#ssl_proxy_check_peer_cn)
+* [`ssl_proxy_check_peer_name`](#ssl_proxy_check_peer_name)
+* [`ssl_proxy_check_peer_expire`](#ssl_proxy_check_peer_expire)
+* [`ssl_proxy_machine_cert`](#ssl_proxy_machine_cert)
+* [`ssl_proxy_machine_cert_chain`](#ssl_proxy_machine_cert_chain)
+* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
+* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
+* [`ssl_options`](#ssl_options)
+* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
+* [`ssl_proxyengine`](#ssl_proxyengine)
+* [`ssl_stapling`](#ssl_stapling)
+* [`ssl_stapling_timeout`](#ssl_stapling_timeout)
+* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
+* [`ssl_user_name`](#ssl_user_name)
+* [`priority`](#priority)
+* [`default_vhost`](#default_vhost)
+* [`servername`](#servername)
+* [`serveraliases`](#serveraliases)
+* [`options`](#options)
+* [`override`](#override)
+* [`directoryindex`](#directoryindex)
+* [`vhost_name`](#vhost_name)
+* [`logroot`](#logroot)
+* [`logroot_ensure`](#logroot_ensure)
+* [`logroot_mode`](#logroot_mode)
+* [`logroot_owner`](#logroot_owner)
+* [`logroot_group`](#logroot_group)
+* [`log_level`](#log_level)
+* [`access_log`](#access_log)
+* [`access_log_file`](#access_log_file)
+* [`access_log_pipe`](#access_log_pipe)
+* [`access_log_syslog`](#access_log_syslog)
+* [`access_log_format`](#access_log_format)
+* [`access_log_env_var`](#access_log_env_var)
+* [`access_logs`](#access_logs)
+* [`use_servername_for_filenames`](#use_servername_for_filenames)
+* [`aliases`](#aliases)
+* [`directories`](#directories)
+* [`error_log`](#error_log)
+* [`error_log_file`](#error_log_file)
+* [`error_log_pipe`](#error_log_pipe)
+* [`error_log_syslog`](#error_log_syslog)
+* [`error_log_format`](#error_log_format)
+* [`http_protocol_options`](#http_protocol_options)
+* [`modsec_audit_log`](#modsec_audit_log)
+* [`modsec_audit_log_file`](#modsec_audit_log_file)
+* [`modsec_audit_log_pipe`](#modsec_audit_log_pipe)
+* [`error_documents`](#error_documents)
+* [`fallbackresource`](#fallbackresource)
+* [`scriptalias`](#scriptalias)
+* [`scriptaliases`](#scriptaliases)
+* [`limitreqfieldsize`](#limitreqfieldsize)
+* [`limitreqfields`](#limitreqfields)
+* [`limitreqline`](#limitreqline)
+* [`limitreqbody`](#limitreqbody)
+* [`proxy_dest`](#proxy_dest)
+* [`proxy_dest_match`](#proxy_dest_match)
+* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
+* [`proxy_pass`](#proxy_pass)
+* [`proxy_pass_match`](#proxy_pass_match)
+* [`proxy_requests`](#proxy_requests)
+* [`suphp_addhandler`](#suphp_addhandler)
+* [`suphp_engine`](#suphp_engine)
+* [`suphp_configpath`](#suphp_configpath)
+* [`php_flags`](#php_flags)
+* [`php_values`](#php_values)
+* [`php_admin_flags`](#php_admin_flags)
+* [`php_admin_values`](#php_admin_values)
+* [`no_proxy_uris`](#no_proxy_uris)
+* [`no_proxy_uris_match`](#no_proxy_uris_match)
+* [`proxy_preserve_host`](#proxy_preserve_host)
+* [`proxy_add_headers`](#proxy_add_headers)
+* [`proxy_error_override`](#proxy_error_override)
+* [`redirect_source`](#redirect_source)
+* [`redirect_dest`](#redirect_dest)
+* [`redirect_status`](#redirect_status)
+* [`redirectmatch_status`](#redirectmatch_status)
+* [`redirectmatch_regexp`](#redirectmatch_regexp)
+* [`redirectmatch_dest`](#redirectmatch_dest)
+* [`headers`](#headers)
+* [`request_headers`](#request_headers)
+* [`filters`](#filters)
+* [`rewrites`](#rewrites)
+* [`rewrite_base`](#rewrite_base)
+* [`rewrite_rule`](#rewrite_rule)
+* [`rewrite_cond`](#rewrite_cond)
+* [`rewrite_inherit`](#rewrite_inherit)
+* [`setenv`](#setenv)
+* [`setenvif`](#setenvif)
+* [`setenvifnocase`](#setenvifnocase)
+* [`block`](#block)
+* [`ensure`](#ensure)
+* [`wsgi_application_group`](#wsgi_application_group)
+* [`wsgi_daemon_process`](#wsgi_daemon_process)
+* [`wsgi_daemon_process_options`](#wsgi_daemon_process_options)
+* [`wsgi_import_script`](#wsgi_import_script)
+* [`wsgi_import_script_options`](#wsgi_import_script_options)
+* [`wsgi_process_group`](#wsgi_process_group)
+* [`wsgi_script_aliases_match`](#wsgi_script_aliases_match)
+* [`wsgi_script_aliases`](#wsgi_script_aliases)
+* [`wsgi_pass_authorization`](#wsgi_pass_authorization)
+* [`wsgi_chunked_request`](#wsgi_chunked_request)
+* [`custom_fragment`](#custom_fragment)
+* [`itk`](#itk)
+* [`action`](#action)
+* [`fastcgi_server`](#fastcgi_server)
+* [`fastcgi_socket`](#fastcgi_socket)
+* [`fastcgi_dir`](#fastcgi_dir)
+* [`fastcgi_idle_timeout`](#fastcgi_idle_timeout)
+* [`additional_includes`](#additional_includes)
+* [`use_optional_includes`](#use_optional_includes)
+* [`apache_version`](#apache_version)
+* [`allow_encoded_slashes`](#allow_encoded_slashes)
+* [`suexec_user_group`](#suexec_user_group)
+* [`h2_copy_files`](#h2_copy_files)
+* [`h2_direct`](#h2_direct)
+* [`h2_early_hints`](#h2_early_hints)
+* [`h2_max_session_streams`](#h2_max_session_streams)
+* [`h2_modern_tls_only`](#h2_modern_tls_only)
+* [`h2_push`](#h2_push)
+* [`h2_push_diary_size`](#h2_push_diary_size)
+* [`h2_push_priority`](#h2_push_priority)
+* [`h2_push_resource`](#h2_push_resource)
+* [`h2_serialize_headers`](#h2_serialize_headers)
+* [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
+* [`h2_tls_cool_down_secs`](#h2_tls_cool_down_secs)
+* [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
+* [`h2_upgrade`](#h2_upgrade)
+* [`h2_window_size`](#h2_window_size)
+* [`passenger_enabled`](#passenger_enabled)
+* [`passenger_base_uri`](#passenger_base_uri)
+* [`passenger_ruby`](#passenger_ruby)
+* [`passenger_python`](#passenger_python)
+* [`passenger_nodejs`](#passenger_nodejs)
+* [`passenger_meteor_app_settings`](#passenger_meteor_app_settings)
+* [`passenger_app_env`](#passenger_app_env)
+* [`passenger_app_root`](#passenger_app_root)
+* [`passenger_app_group_name`](#passenger_app_group_name)
+* [`passenger_app_start_command`](#passenger_app_start_command)
+* [`passenger_app_type`](#passenger_app_type)
+* [`passenger_startup_file`](#passenger_startup_file)
+* [`passenger_restart_dir`](#passenger_restart_dir)
+* [`passenger_spawn_method`](#passenger_spawn_method)
+* [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
+* [`passenger_rolling_restarts`](#passenger_rolling_restarts)
+* [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
+* [`passenger_user`](#passenger_user)
+* [`passenger_group`](#passenger_group)
+* [`passenger_friendly_error_pages`](#passenger_friendly_error_pages)
+* [`passenger_min_instances`](#passenger_min_instances)
+* [`passenger_max_instances`](#passenger_max_instances)
+* [`passenger_max_preloader_idle_time`](#passenger_max_preloader_idle_time)
+* [`passenger_force_max_concurrent_requests_per_process`](#passenger_force_max_concurrent_requests_per_process)
+* [`passenger_start_timeout`](#passenger_start_timeout)
+* [`passenger_concurrency_model`](#passenger_concurrency_model)
+* [`passenger_thread_count`](#passenger_thread_count)
+* [`passenger_max_requests`](#passenger_max_requests)
+* [`passenger_max_request_time`](#passenger_max_request_time)
+* [`passenger_memory_limit`](#passenger_memory_limit)
+* [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
+* [`passenger_pre_start`](#passenger_pre_start)
+* [`passenger_high_performance`](#passenger_high_performance)
+* [`passenger_buffer_upload`](#passenger_buffer_upload)
+* [`passenger_buffer_response`](#passenger_buffer_response)
+* [`passenger_error_override`](#passenger_error_override)
+* [`passenger_max_request_queue_size`](#passenger_max_request_queue_size)
+* [`passenger_max_request_queue_time`](#passenger_max_request_queue_time)
+* [`passenger_sticky_sessions`](#passenger_sticky_sessions)
+* [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
+* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
+* [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
+* [`passenger_app_log_file`](#passenger_app_log_file)
+* [`passenger_debugger`](#passenger_debugger)
+* [`passenger_lve_min_uid`](#passenger_lve_min_uid)
+* [`add_default_charset`](#add_default_charset)
+* [`modsec_disable_vhost`](#modsec_disable_vhost)
+* [`modsec_disable_ids`](#modsec_disable_ids)
+* [`modsec_disable_ips`](#modsec_disable_ips)
+* [`modsec_disable_msgs`](#modsec_disable_msgs)
+* [`modsec_disable_tags`](#modsec_disable_tags)
+* [`modsec_body_limit`](#modsec_body_limit)
+* [`jk_mounts`](#jk_mounts)
+* [`auth_kerb`](#auth_kerb)
+* [`krb_method_negotiate`](#krb_method_negotiate)
+* [`krb_method_k5passwd`](#krb_method_k5passwd)
+* [`krb_authoritative`](#krb_authoritative)
+* [`krb_auth_realms`](#krb_auth_realms)
+* [`krb_5keytab`](#krb_5keytab)
+* [`krb_local_user_mapping`](#krb_local_user_mapping)
+* [`krb_verify_kdc`](#krb_verify_kdc)
+* [`krb_servicename`](#krb_servicename)
+* [`krb_save_credentials`](#krb_save_credentials)
+* [`keepalive`](#keepalive)
+* [`keepalive_timeout`](#keepalive_timeout)
+* [`max_keepalive_requests`](#max_keepalive_requests)
+* [`cas_attribute_prefix`](#cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
+* [`cas_root_proxied_as`](#cas_root_proxied_as)
+* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
+* [`cas_sso_enabled`](#cas_sso_enabled)
+* [`cas_login_url`](#cas_login_url)
+* [`cas_validate_url`](#cas_validate_url)
+* [`cas_validate_saml`](#cas_validate_saml)
+* [`cas_cookie_path`](#cas_cookie_path)
+* [`shib_compat_valid_user`](#shib_compat_valid_user)
+* [`use_canonical_name`](#use_canonical_name)
+* [`comment`](#comment)
+* [`define`](#define)
+* [`auth_oidc`](#auth_oidc)
+* [`oidc_settings`](#oidc_settings)
+* [`mdomain`](#mdomain)
+
+##### <a name="docroot"></a>`docroot`
 
 Data type: `Variant[Boolean,String]`
 
 
 
-##### `manage_docroot`
+##### <a name="manage_docroot"></a>`manage_docroot`
 
 Data type: `Any`
 
@@ -6549,7 +7742,7 @@ Data type: `Any`
 
 Default value: ``true``
 
-##### `virtual_docroot`
+##### <a name="virtual_docroot"></a>`virtual_docroot`
 
 Data type: `Any`
 
@@ -6557,7 +7750,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `port`
+##### <a name="port"></a>`port`
 
 Data type: `Any`
 
@@ -6565,7 +7758,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ip`
+##### <a name="ip"></a>`ip`
 
 Data type: `Any`
 
@@ -6573,7 +7766,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ip_based`
+##### <a name="ip_based"></a>`ip_based`
 
 Data type: `Boolean`
 
@@ -6581,7 +7774,7 @@ Data type: `Boolean`
 
 Default value: ``false``
 
-##### `add_listen`
+##### <a name="add_listen"></a>`add_listen`
 
 Data type: `Any`
 
@@ -6589,7 +7782,7 @@ Data type: `Any`
 
 Default value: ``true``
 
-##### `docroot_owner`
+##### <a name="docroot_owner"></a>`docroot_owner`
 
 Data type: `Any`
 
@@ -6597,7 +7790,7 @@ Data type: `Any`
 
 Default value: `'root'`
 
-##### `docroot_group`
+##### <a name="docroot_group"></a>`docroot_group`
 
 Data type: `Any`
 
@@ -6605,7 +7798,7 @@ Data type: `Any`
 
 Default value: `$apache::params::root_group`
 
-##### `docroot_mode`
+##### <a name="docroot_mode"></a>`docroot_mode`
 
 Data type: `Any`
 
@@ -6613,7 +7806,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `protocols`
+##### <a name="protocols"></a>`protocols`
 
 Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
@@ -6621,7 +7814,7 @@ Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
 Default value: `[]`
 
-##### `protocols_honor_order`
+##### <a name="protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
@@ -6629,7 +7822,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `serveradmin`
+##### <a name="serveradmin"></a>`serveradmin`
 
 Data type: `Any`
 
@@ -6637,7 +7830,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl`
+##### <a name="ssl"></a>`ssl`
 
 Data type: `Boolean`
 
@@ -6645,7 +7838,7 @@ Data type: `Boolean`
 
 Default value: ``false``
 
-##### `ssl_cert`
+##### <a name="ssl_cert"></a>`ssl_cert`
 
 Data type: `Any`
 
@@ -6653,7 +7846,7 @@ Data type: `Any`
 
 Default value: `$apache::default_ssl_cert`
 
-##### `ssl_key`
+##### <a name="ssl_key"></a>`ssl_key`
 
 Data type: `Any`
 
@@ -6661,7 +7854,7 @@ Data type: `Any`
 
 Default value: `$apache::default_ssl_key`
 
-##### `ssl_chain`
+##### <a name="ssl_chain"></a>`ssl_chain`
 
 Data type: `Any`
 
@@ -6669,7 +7862,7 @@ Data type: `Any`
 
 Default value: `$apache::default_ssl_chain`
 
-##### `ssl_ca`
+##### <a name="ssl_ca"></a>`ssl_ca`
 
 Data type: `Any`
 
@@ -6677,7 +7870,7 @@ Data type: `Any`
 
 Default value: `$apache::default_ssl_ca`
 
-##### `ssl_crl_path`
+##### <a name="ssl_crl_path"></a>`ssl_crl_path`
 
 Data type: `Any`
 
@@ -6685,7 +7878,7 @@ Data type: `Any`
 
 Default value: `$apache::default_ssl_crl_path`
 
-##### `ssl_crl`
+##### <a name="ssl_crl"></a>`ssl_crl`
 
 Data type: `Any`
 
@@ -6693,7 +7886,7 @@ Data type: `Any`
 
 Default value: `$apache::default_ssl_crl`
 
-##### `ssl_crl_check`
+##### <a name="ssl_crl_check"></a>`ssl_crl_check`
 
 Data type: `Any`
 
@@ -6701,7 +7894,7 @@ Data type: `Any`
 
 Default value: `$apache::default_ssl_crl_check`
 
-##### `ssl_certs_dir`
+##### <a name="ssl_certs_dir"></a>`ssl_certs_dir`
 
 Data type: `Any`
 
@@ -6709,7 +7902,7 @@ Data type: `Any`
 
 Default value: `$apache::params::ssl_certs_dir`
 
-##### `ssl_protocol`
+##### <a name="ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Any`
 
@@ -6717,7 +7910,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_cipher`
+##### <a name="ssl_cipher"></a>`ssl_cipher`
 
 Data type: `Any`
 
@@ -6725,7 +7918,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_honorcipherorder`
+##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
 Data type: `Any`
 
@@ -6733,7 +7926,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_verify_client`
+##### <a name="ssl_verify_client"></a>`ssl_verify_client`
 
 Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
@@ -6741,7 +7934,7 @@ Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
 Default value: ``undef``
 
-##### `ssl_verify_depth`
+##### <a name="ssl_verify_depth"></a>`ssl_verify_depth`
 
 Data type: `Any`
 
@@ -6749,7 +7942,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_proxy_verify`
+##### <a name="ssl_proxy_verify"></a>`ssl_proxy_verify`
 
 Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
@@ -6757,7 +7950,7 @@ Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
 Default value: ``undef``
 
-##### `ssl_proxy_verify_depth`
+##### <a name="ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
 
 Data type: `Optional[Integer[0]]`
 
@@ -6765,7 +7958,7 @@ Data type: `Optional[Integer[0]]`
 
 Default value: ``undef``
 
-##### `ssl_proxy_ca_cert`
+##### <a name="ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
 
 Data type: `Any`
 
@@ -6773,7 +7966,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_proxy_check_peer_cn`
+##### <a name="ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
 
 Data type: `Optional[Enum['on', 'off']]`
 
@@ -6781,7 +7974,7 @@ Data type: `Optional[Enum['on', 'off']]`
 
 Default value: ``undef``
 
-##### `ssl_proxy_check_peer_name`
+##### <a name="ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
 
 Data type: `Optional[Enum['on', 'off']]`
 
@@ -6789,7 +7982,7 @@ Data type: `Optional[Enum['on', 'off']]`
 
 Default value: ``undef``
 
-##### `ssl_proxy_check_peer_expire`
+##### <a name="ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
 
 Data type: `Optional[Enum['on', 'off']]`
 
@@ -6797,7 +7990,7 @@ Data type: `Optional[Enum['on', 'off']]`
 
 Default value: ``undef``
 
-##### `ssl_proxy_machine_cert`
+##### <a name="ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
 
 Data type: `Any`
 
@@ -6805,7 +7998,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_proxy_machine_cert_chain`
+##### <a name="ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
 
 Data type: `Any`
 
@@ -6813,7 +8006,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_proxy_cipher_suite`
+##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
 Data type: `Any`
 
@@ -6821,7 +8014,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_proxy_protocol`
+##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Any`
 
@@ -6829,7 +8022,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_options`
+##### <a name="ssl_options"></a>`ssl_options`
 
 Data type: `Any`
 
@@ -6837,7 +8030,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_openssl_conf_cmd`
+##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Any`
 
@@ -6845,7 +8038,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_proxyengine`
+##### <a name="ssl_proxyengine"></a>`ssl_proxyengine`
 
 Data type: `Boolean`
 
@@ -6853,7 +8046,7 @@ Data type: `Boolean`
 
 Default value: ``false``
 
-##### `ssl_stapling`
+##### <a name="ssl_stapling"></a>`ssl_stapling`
 
 Data type: `Optional[Boolean]`
 
@@ -6861,7 +8054,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `ssl_stapling_timeout`
+##### <a name="ssl_stapling_timeout"></a>`ssl_stapling_timeout`
 
 Data type: `Any`
 
@@ -6869,7 +8062,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `ssl_stapling_return_errors`
+##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Any`
 
@@ -6877,7 +8070,15 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `priority`
+##### <a name="ssl_user_name"></a>`ssl_user_name`
+
+Data type: `Optional[String]`
+
+
+
+Default value: ``undef``
+
+##### <a name="priority"></a>`priority`
 
 Data type: `Any`
 
@@ -6885,7 +8086,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `default_vhost`
+##### <a name="default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
 
@@ -6893,7 +8094,7 @@ Data type: `Boolean`
 
 Default value: ``false``
 
-##### `servername`
+##### <a name="servername"></a>`servername`
 
 Data type: `Any`
 
@@ -6901,7 +8102,7 @@ Data type: `Any`
 
 Default value: `$name`
 
-##### `serveraliases`
+##### <a name="serveraliases"></a>`serveraliases`
 
 Data type: `Any`
 
@@ -6909,7 +8110,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `options`
+##### <a name="options"></a>`options`
 
 Data type: `Any`
 
@@ -6917,7 +8118,7 @@ Data type: `Any`
 
 Default value: `['Indexes','FollowSymLinks','MultiViews']`
 
-##### `override`
+##### <a name="override"></a>`override`
 
 Data type: `Any`
 
@@ -6925,7 +8126,7 @@ Data type: `Any`
 
 Default value: `['None']`
 
-##### `directoryindex`
+##### <a name="directoryindex"></a>`directoryindex`
 
 Data type: `Any`
 
@@ -6933,7 +8134,7 @@ Data type: `Any`
 
 Default value: `''`
 
-##### `vhost_name`
+##### <a name="vhost_name"></a>`vhost_name`
 
 Data type: `Any`
 
@@ -6941,7 +8142,7 @@ Data type: `Any`
 
 Default value: `'*'`
 
-##### `logroot`
+##### <a name="logroot"></a>`logroot`
 
 Data type: `Any`
 
@@ -6949,7 +8150,7 @@ Data type: `Any`
 
 Default value: `$apache::logroot`
 
-##### `logroot_ensure`
+##### <a name="logroot_ensure"></a>`logroot_ensure`
 
 Data type: `Enum['directory', 'absent']`
 
@@ -6957,7 +8158,7 @@ Data type: `Enum['directory', 'absent']`
 
 Default value: `'directory'`
 
-##### `logroot_mode`
+##### <a name="logroot_mode"></a>`logroot_mode`
 
 Data type: `Any`
 
@@ -6965,7 +8166,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `logroot_owner`
+##### <a name="logroot_owner"></a>`logroot_owner`
 
 Data type: `Any`
 
@@ -6973,7 +8174,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `logroot_group`
+##### <a name="logroot_group"></a>`logroot_group`
 
 Data type: `Any`
 
@@ -6981,7 +8182,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `log_level`
+##### <a name="log_level"></a>`log_level`
 
 Data type: `Optional[Apache::LogLevel]`
 
@@ -6989,7 +8190,7 @@ Data type: `Optional[Apache::LogLevel]`
 
 Default value: ``undef``
 
-##### `access_log`
+##### <a name="access_log"></a>`access_log`
 
 Data type: `Boolean`
 
@@ -6997,7 +8198,7 @@ Data type: `Boolean`
 
 Default value: ``true``
 
-##### `access_log_file`
+##### <a name="access_log_file"></a>`access_log_file`
 
 Data type: `Any`
 
@@ -7005,7 +8206,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `access_log_pipe`
+##### <a name="access_log_pipe"></a>`access_log_pipe`
 
 Data type: `Any`
 
@@ -7013,7 +8214,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `access_log_syslog`
+##### <a name="access_log_syslog"></a>`access_log_syslog`
 
 Data type: `Any`
 
@@ -7021,7 +8222,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `access_log_format`
+##### <a name="access_log_format"></a>`access_log_format`
 
 Data type: `Any`
 
@@ -7029,7 +8230,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `access_log_env_var`
+##### <a name="access_log_env_var"></a>`access_log_env_var`
 
 Data type: `Any`
 
@@ -7037,7 +8238,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `access_logs`
+##### <a name="access_logs"></a>`access_logs`
 
 Data type: `Optional[Array]`
 
@@ -7045,7 +8246,7 @@ Data type: `Optional[Array]`
 
 Default value: ``undef``
 
-##### `use_servername_for_filenames`
+##### <a name="use_servername_for_filenames"></a>`use_servername_for_filenames`
 
 Data type: `Optional[Boolean]`
 
@@ -7053,7 +8254,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``false``
 
-##### `aliases`
+##### <a name="aliases"></a>`aliases`
 
 Data type: `Any`
 
@@ -7061,7 +8262,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `directories`
+##### <a name="directories"></a>`directories`
 
 Data type: `Optional[Variant[Hash, Array[Variant[Array,Hash]]]]`
 
@@ -7069,7 +8270,7 @@ Data type: `Optional[Variant[Hash, Array[Variant[Array,Hash]]]]`
 
 Default value: ``undef``
 
-##### `error_log`
+##### <a name="error_log"></a>`error_log`
 
 Data type: `Boolean`
 
@@ -7077,7 +8278,7 @@ Data type: `Boolean`
 
 Default value: ``true``
 
-##### `error_log_file`
+##### <a name="error_log_file"></a>`error_log_file`
 
 Data type: `Any`
 
@@ -7085,7 +8286,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `error_log_pipe`
+##### <a name="error_log_pipe"></a>`error_log_pipe`
 
 Data type: `Any`
 
@@ -7093,7 +8294,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `error_log_syslog`
+##### <a name="error_log_syslog"></a>`error_log_syslog`
 
 Data type: `Any`
 
@@ -7101,7 +8302,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `error_log_format`
+##### <a name="error_log_format"></a>`error_log_format`
 
 Data type: `Optional[
     Array[
@@ -7116,7 +8317,7 @@ Data type: `Optional[
 
 Default value: ``undef``
 
-##### `http_protocol_options`
+##### <a name="http_protocol_options"></a>`http_protocol_options`
 
 Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
 
@@ -7124,7 +8325,7 @@ Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Method
 
 Default value: ``undef``
 
-##### `modsec_audit_log`
+##### <a name="modsec_audit_log"></a>`modsec_audit_log`
 
 Data type: `Any`
 
@@ -7132,7 +8333,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `modsec_audit_log_file`
+##### <a name="modsec_audit_log_file"></a>`modsec_audit_log_file`
 
 Data type: `Any`
 
@@ -7140,7 +8341,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `modsec_audit_log_pipe`
+##### <a name="modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
 
 Data type: `Any`
 
@@ -7148,7 +8349,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `error_documents`
+##### <a name="error_documents"></a>`error_documents`
 
 Data type: `Any`
 
@@ -7156,7 +8357,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `fallbackresource`
+##### <a name="fallbackresource"></a>`fallbackresource`
 
 Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
 
@@ -7164,7 +8365,7 @@ Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
 
 Default value: ``undef``
 
-##### `scriptalias`
+##### <a name="scriptalias"></a>`scriptalias`
 
 Data type: `Any`
 
@@ -7172,7 +8373,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `scriptaliases`
+##### <a name="scriptaliases"></a>`scriptaliases`
 
 Data type: `Any`
 
@@ -7180,7 +8381,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `limitreqfieldsize`
+##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
 
 Data type: `Optional[Integer]`
 
@@ -7188,7 +8389,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `limitreqfields`
+##### <a name="limitreqfields"></a>`limitreqfields`
 
 Data type: `Optional[Integer]`
 
@@ -7196,7 +8397,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `limitreqline`
+##### <a name="limitreqline"></a>`limitreqline`
 
 Data type: `Optional[Integer]`
 
@@ -7204,7 +8405,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `limitreqbody`
+##### <a name="limitreqbody"></a>`limitreqbody`
 
 Data type: `Optional[Integer]`
 
@@ -7212,7 +8413,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `proxy_dest`
+##### <a name="proxy_dest"></a>`proxy_dest`
 
 Data type: `Any`
 
@@ -7220,7 +8421,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `proxy_dest_match`
+##### <a name="proxy_dest_match"></a>`proxy_dest_match`
 
 Data type: `Any`
 
@@ -7228,7 +8429,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `proxy_dest_reverse_match`
+##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
 Data type: `Any`
 
@@ -7236,7 +8437,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `proxy_pass`
+##### <a name="proxy_pass"></a>`proxy_pass`
 
 Data type: `Any`
 
@@ -7244,7 +8445,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `proxy_pass_match`
+##### <a name="proxy_pass_match"></a>`proxy_pass_match`
 
 Data type: `Any`
 
@@ -7252,7 +8453,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `proxy_requests`
+##### <a name="proxy_requests"></a>`proxy_requests`
 
 Data type: `Boolean`
 
@@ -7260,7 +8461,7 @@ Data type: `Boolean`
 
 Default value: ``false``
 
-##### `suphp_addhandler`
+##### <a name="suphp_addhandler"></a>`suphp_addhandler`
 
 Data type: `Any`
 
@@ -7268,7 +8469,7 @@ Data type: `Any`
 
 Default value: `$apache::params::suphp_addhandler`
 
-##### `suphp_engine`
+##### <a name="suphp_engine"></a>`suphp_engine`
 
 Data type: `Enum['on', 'off']`
 
@@ -7276,7 +8477,7 @@ Data type: `Enum['on', 'off']`
 
 Default value: `$apache::params::suphp_engine`
 
-##### `suphp_configpath`
+##### <a name="suphp_configpath"></a>`suphp_configpath`
 
 Data type: `Any`
 
@@ -7284,7 +8485,7 @@ Data type: `Any`
 
 Default value: `$apache::params::suphp_configpath`
 
-##### `php_flags`
+##### <a name="php_flags"></a>`php_flags`
 
 Data type: `Any`
 
@@ -7292,7 +8493,7 @@ Data type: `Any`
 
 Default value: `{}`
 
-##### `php_values`
+##### <a name="php_values"></a>`php_values`
 
 Data type: `Any`
 
@@ -7300,7 +8501,7 @@ Data type: `Any`
 
 Default value: `{}`
 
-##### `php_admin_flags`
+##### <a name="php_admin_flags"></a>`php_admin_flags`
 
 Data type: `Any`
 
@@ -7308,7 +8509,7 @@ Data type: `Any`
 
 Default value: `{}`
 
-##### `php_admin_values`
+##### <a name="php_admin_values"></a>`php_admin_values`
 
 Data type: `Any`
 
@@ -7316,7 +8517,7 @@ Data type: `Any`
 
 Default value: `{}`
 
-##### `no_proxy_uris`
+##### <a name="no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Any`
 
@@ -7324,7 +8525,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `no_proxy_uris_match`
+##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Any`
 
@@ -7332,7 +8533,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `proxy_preserve_host`
+##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
 
 Data type: `Any`
 
@@ -7340,7 +8541,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `proxy_add_headers`
+##### <a name="proxy_add_headers"></a>`proxy_add_headers`
 
 Data type: `Any`
 
@@ -7348,7 +8549,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `proxy_error_override`
+##### <a name="proxy_error_override"></a>`proxy_error_override`
 
 Data type: `Any`
 
@@ -7356,7 +8557,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `redirect_source`
+##### <a name="redirect_source"></a>`redirect_source`
 
 Data type: `Any`
 
@@ -7364,7 +8565,7 @@ Data type: `Any`
 
 Default value: `'/'`
 
-##### `redirect_dest`
+##### <a name="redirect_dest"></a>`redirect_dest`
 
 Data type: `Any`
 
@@ -7372,7 +8573,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `redirect_status`
+##### <a name="redirect_status"></a>`redirect_status`
 
 Data type: `Any`
 
@@ -7380,7 +8581,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `redirectmatch_status`
+##### <a name="redirectmatch_status"></a>`redirectmatch_status`
 
 Data type: `Any`
 
@@ -7388,7 +8589,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `redirectmatch_regexp`
+##### <a name="redirectmatch_regexp"></a>`redirectmatch_regexp`
 
 Data type: `Any`
 
@@ -7396,7 +8597,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `redirectmatch_dest`
+##### <a name="redirectmatch_dest"></a>`redirectmatch_dest`
 
 Data type: `Any`
 
@@ -7404,7 +8605,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `headers`
+##### <a name="headers"></a>`headers`
 
 Data type: `Any`
 
@@ -7412,7 +8613,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `request_headers`
+##### <a name="request_headers"></a>`request_headers`
 
 Data type: `Any`
 
@@ -7420,7 +8621,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `filters`
+##### <a name="filters"></a>`filters`
 
 Data type: `Any`
 
@@ -7428,7 +8629,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `rewrites`
+##### <a name="rewrites"></a>`rewrites`
 
 Data type: `Optional[Array]`
 
@@ -7436,7 +8637,7 @@ Data type: `Optional[Array]`
 
 Default value: ``undef``
 
-##### `rewrite_base`
+##### <a name="rewrite_base"></a>`rewrite_base`
 
 Data type: `Any`
 
@@ -7444,7 +8645,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `rewrite_rule`
+##### <a name="rewrite_rule"></a>`rewrite_rule`
 
 Data type: `Any`
 
@@ -7452,7 +8653,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `rewrite_cond`
+##### <a name="rewrite_cond"></a>`rewrite_cond`
 
 Data type: `Any`
 
@@ -7460,7 +8661,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `rewrite_inherit`
+##### <a name="rewrite_inherit"></a>`rewrite_inherit`
 
 Data type: `Any`
 
@@ -7468,7 +8669,7 @@ Data type: `Any`
 
 Default value: ``false``
 
-##### `setenv`
+##### <a name="setenv"></a>`setenv`
 
 Data type: `Any`
 
@@ -7476,7 +8677,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `setenvif`
+##### <a name="setenvif"></a>`setenvif`
 
 Data type: `Any`
 
@@ -7484,7 +8685,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `setenvifnocase`
+##### <a name="setenvifnocase"></a>`setenvifnocase`
 
 Data type: `Any`
 
@@ -7492,7 +8693,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `block`
+##### <a name="block"></a>`block`
 
 Data type: `Any`
 
@@ -7500,7 +8701,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Enum['absent', 'present']`
 
@@ -7508,7 +8709,7 @@ Data type: `Enum['absent', 'present']`
 
 Default value: `'present'`
 
-##### `wsgi_application_group`
+##### <a name="wsgi_application_group"></a>`wsgi_application_group`
 
 Data type: `Any`
 
@@ -7516,7 +8717,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `wsgi_daemon_process`
+##### <a name="wsgi_daemon_process"></a>`wsgi_daemon_process`
 
 Data type: `Optional[Variant[String,Hash]]`
 
@@ -7524,7 +8725,7 @@ Data type: `Optional[Variant[String,Hash]]`
 
 Default value: ``undef``
 
-##### `wsgi_daemon_process_options`
+##### <a name="wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
 
 Data type: `Optional[Hash]`
 
@@ -7532,7 +8733,7 @@ Data type: `Optional[Hash]`
 
 Default value: ``undef``
 
-##### `wsgi_import_script`
+##### <a name="wsgi_import_script"></a>`wsgi_import_script`
 
 Data type: `Any`
 
@@ -7540,7 +8741,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `wsgi_import_script_options`
+##### <a name="wsgi_import_script_options"></a>`wsgi_import_script_options`
 
 Data type: `Optional[Hash]`
 
@@ -7548,7 +8749,7 @@ Data type: `Optional[Hash]`
 
 Default value: ``undef``
 
-##### `wsgi_process_group`
+##### <a name="wsgi_process_group"></a>`wsgi_process_group`
 
 Data type: `Any`
 
@@ -7556,7 +8757,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `wsgi_script_aliases_match`
+##### <a name="wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
 
 Data type: `Optional[Hash]`
 
@@ -7564,7 +8765,7 @@ Data type: `Optional[Hash]`
 
 Default value: ``undef``
 
-##### `wsgi_script_aliases`
+##### <a name="wsgi_script_aliases"></a>`wsgi_script_aliases`
 
 Data type: `Optional[Hash]`
 
@@ -7572,7 +8773,7 @@ Data type: `Optional[Hash]`
 
 Default value: ``undef``
 
-##### `wsgi_pass_authorization`
+##### <a name="wsgi_pass_authorization"></a>`wsgi_pass_authorization`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
@@ -7580,7 +8781,7 @@ Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Default value: ``undef``
 
-##### `wsgi_chunked_request`
+##### <a name="wsgi_chunked_request"></a>`wsgi_chunked_request`
 
 Data type: `Any`
 
@@ -7588,7 +8789,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `custom_fragment`
+##### <a name="custom_fragment"></a>`custom_fragment`
 
 Data type: `Optional[String]`
 
@@ -7596,7 +8797,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `itk`
+##### <a name="itk"></a>`itk`
 
 Data type: `Optional[Hash]`
 
@@ -7604,7 +8805,7 @@ Data type: `Optional[Hash]`
 
 Default value: ``undef``
 
-##### `action`
+##### <a name="action"></a>`action`
 
 Data type: `Any`
 
@@ -7612,7 +8813,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `fastcgi_server`
+##### <a name="fastcgi_server"></a>`fastcgi_server`
 
 Data type: `Any`
 
@@ -7620,7 +8821,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `fastcgi_socket`
+##### <a name="fastcgi_socket"></a>`fastcgi_socket`
 
 Data type: `Any`
 
@@ -7628,7 +8829,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `fastcgi_dir`
+##### <a name="fastcgi_dir"></a>`fastcgi_dir`
 
 Data type: `Any`
 
@@ -7636,7 +8837,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `fastcgi_idle_timeout`
+##### <a name="fastcgi_idle_timeout"></a>`fastcgi_idle_timeout`
 
 Data type: `Any`
 
@@ -7644,7 +8845,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `additional_includes`
+##### <a name="additional_includes"></a>`additional_includes`
 
 Data type: `Any`
 
@@ -7652,7 +8853,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `use_optional_includes`
+##### <a name="use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Any`
 
@@ -7660,7 +8861,7 @@ Data type: `Any`
 
 Default value: `$apache::use_optional_includes`
 
-##### `apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
 
@@ -7668,7 +8869,7 @@ Data type: `Any`
 
 Default value: `$apache::apache_version`
 
-##### `allow_encoded_slashes`
+##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
 
 Data type: `Optional[Enum['on', 'off', 'nodecode']]`
 
@@ -7676,7 +8877,7 @@ Data type: `Optional[Enum['on', 'off', 'nodecode']]`
 
 Default value: ``undef``
 
-##### `suexec_user_group`
+##### <a name="suexec_user_group"></a>`suexec_user_group`
 
 Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 
@@ -7684,7 +8885,7 @@ Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 
 Default value: ``undef``
 
-##### `h2_copy_files`
+##### <a name="h2_copy_files"></a>`h2_copy_files`
 
 Data type: `Optional[Boolean]`
 
@@ -7692,7 +8893,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `h2_direct`
+##### <a name="h2_direct"></a>`h2_direct`
 
 Data type: `Optional[Boolean]`
 
@@ -7700,7 +8901,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `h2_early_hints`
+##### <a name="h2_early_hints"></a>`h2_early_hints`
 
 Data type: `Optional[Boolean]`
 
@@ -7708,7 +8909,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `h2_max_session_streams`
+##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
 
 Data type: `Optional[Integer]`
 
@@ -7716,7 +8917,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `h2_modern_tls_only`
+##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
 
 Data type: `Optional[Boolean]`
 
@@ -7724,7 +8925,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `h2_push`
+##### <a name="h2_push"></a>`h2_push`
 
 Data type: `Optional[Boolean]`
 
@@ -7732,7 +8933,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `h2_push_diary_size`
+##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
 
 Data type: `Optional[Integer]`
 
@@ -7740,7 +8941,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `h2_push_priority`
+##### <a name="h2_push_priority"></a>`h2_push_priority`
 
 Data type: `Array[String]`
 
@@ -7748,7 +8949,7 @@ Data type: `Array[String]`
 
 Default value: `[]`
 
-##### `h2_push_resource`
+##### <a name="h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
 
@@ -7756,7 +8957,7 @@ Data type: `Array[String]`
 
 Default value: `[]`
 
-##### `h2_serialize_headers`
+##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
 
 Data type: `Optional[Boolean]`
 
@@ -7764,7 +8965,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `h2_stream_max_mem_size`
+##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
 Data type: `Optional[Integer]`
 
@@ -7772,7 +8973,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `h2_tls_cool_down_secs`
+##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
 Data type: `Optional[Integer]`
 
@@ -7780,7 +8981,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `h2_tls_warm_up_size`
+##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
 Data type: `Optional[Integer]`
 
@@ -7788,7 +8989,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `h2_upgrade`
+##### <a name="h2_upgrade"></a>`h2_upgrade`
 
 Data type: `Optional[Boolean]`
 
@@ -7796,7 +8997,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `h2_window_size`
+##### <a name="h2_window_size"></a>`h2_window_size`
 
 Data type: `Optional[Integer]`
 
@@ -7804,7 +9005,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_enabled`
+##### <a name="passenger_enabled"></a>`passenger_enabled`
 
 Data type: `Optional[Boolean]`
 
@@ -7812,7 +9013,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_base_uri`
+##### <a name="passenger_base_uri"></a>`passenger_base_uri`
 
 Data type: `Optional[String]`
 
@@ -7820,7 +9021,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_ruby`
+##### <a name="passenger_ruby"></a>`passenger_ruby`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -7828,7 +9029,7 @@ Data type: `Optional[Stdlib::Absolutepath]`
 
 Default value: ``undef``
 
-##### `passenger_python`
+##### <a name="passenger_python"></a>`passenger_python`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -7836,7 +9037,7 @@ Data type: `Optional[Stdlib::Absolutepath]`
 
 Default value: ``undef``
 
-##### `passenger_nodejs`
+##### <a name="passenger_nodejs"></a>`passenger_nodejs`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -7844,7 +9045,7 @@ Data type: `Optional[Stdlib::Absolutepath]`
 
 Default value: ``undef``
 
-##### `passenger_meteor_app_settings`
+##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
 Data type: `Optional[String]`
 
@@ -7852,7 +9053,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_app_env`
+##### <a name="passenger_app_env"></a>`passenger_app_env`
 
 Data type: `Optional[String]`
 
@@ -7860,7 +9061,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_app_root`
+##### <a name="passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -7868,7 +9069,7 @@ Data type: `Optional[Stdlib::Absolutepath]`
 
 Default value: ``undef``
 
-##### `passenger_app_group_name`
+##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
 
 Data type: `Optional[String]`
 
@@ -7876,7 +9077,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_app_start_command`
+##### <a name="passenger_app_start_command"></a>`passenger_app_start_command`
 
 Data type: `Optional[String]`
 
@@ -7884,7 +9085,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_app_type`
+##### <a name="passenger_app_type"></a>`passenger_app_type`
 
 Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
@@ -7892,7 +9093,7 @@ Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
 Default value: ``undef``
 
-##### `passenger_startup_file`
+##### <a name="passenger_startup_file"></a>`passenger_startup_file`
 
 Data type: `Optional[String]`
 
@@ -7900,7 +9101,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_restart_dir`
+##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
 
 Data type: `Optional[String]`
 
@@ -7908,7 +9109,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_spawn_method`
+##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['direct', 'smart']]`
 
@@ -7916,7 +9117,7 @@ Data type: `Optional[Enum['direct', 'smart']]`
 
 Default value: ``undef``
 
-##### `passenger_load_shell_envvars`
+##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
 Data type: `Optional[Boolean]`
 
@@ -7924,7 +9125,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_rolling_restarts`
+##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
 Data type: `Optional[Boolean]`
 
@@ -7932,7 +9133,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_resist_deployment_errors`
+##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
 Data type: `Optional[Boolean]`
 
@@ -7940,7 +9141,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_user`
+##### <a name="passenger_user"></a>`passenger_user`
 
 Data type: `Optional[String]`
 
@@ -7948,7 +9149,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_group`
+##### <a name="passenger_group"></a>`passenger_group`
 
 Data type: `Optional[String]`
 
@@ -7956,7 +9157,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_friendly_error_pages`
+##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
 Data type: `Optional[Boolean]`
 
@@ -7964,7 +9165,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_min_instances`
+##### <a name="passenger_min_instances"></a>`passenger_min_instances`
 
 Data type: `Optional[Integer]`
 
@@ -7972,7 +9173,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_max_instances`
+##### <a name="passenger_max_instances"></a>`passenger_max_instances`
 
 Data type: `Optional[Integer]`
 
@@ -7980,7 +9181,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_max_preloader_idle_time`
+##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
 Data type: `Optional[Integer]`
 
@@ -7988,7 +9189,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_force_max_concurrent_requests_per_process`
+##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Optional[Integer]`
 
@@ -7996,7 +9197,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_start_timeout`
+##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
 
 Data type: `Optional[Integer]`
 
@@ -8004,7 +9205,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_concurrency_model`
+##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
 
 Data type: `Optional[Enum['process', 'thread']]`
 
@@ -8012,7 +9213,7 @@ Data type: `Optional[Enum['process', 'thread']]`
 
 Default value: ``undef``
 
-##### `passenger_thread_count`
+##### <a name="passenger_thread_count"></a>`passenger_thread_count`
 
 Data type: `Optional[Integer]`
 
@@ -8020,7 +9221,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_max_requests`
+##### <a name="passenger_max_requests"></a>`passenger_max_requests`
 
 Data type: `Optional[Integer]`
 
@@ -8028,7 +9229,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_max_request_time`
+##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
 
 Data type: `Optional[Integer]`
 
@@ -8036,7 +9237,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_memory_limit`
+##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Optional[Integer]`
 
@@ -8044,7 +9245,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_stat_throttle_rate`
+##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
 Data type: `Optional[Integer]`
 
@@ -8052,7 +9253,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_pre_start`
+##### <a name="passenger_pre_start"></a>`passenger_pre_start`
 
 Data type: `Optional[Variant[String,Array[String]]]`
 
@@ -8060,7 +9261,7 @@ Data type: `Optional[Variant[String,Array[String]]]`
 
 Default value: ``undef``
 
-##### `passenger_high_performance`
+##### <a name="passenger_high_performance"></a>`passenger_high_performance`
 
 Data type: `Optional[Boolean]`
 
@@ -8068,7 +9269,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_buffer_upload`
+##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
 
 Data type: `Optional[Boolean]`
 
@@ -8076,7 +9277,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_buffer_response`
+##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
 
 Data type: `Optional[Boolean]`
 
@@ -8084,7 +9285,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_error_override`
+##### <a name="passenger_error_override"></a>`passenger_error_override`
 
 Data type: `Optional[Boolean]`
 
@@ -8092,7 +9293,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_max_request_queue_size`
+##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
 Data type: `Optional[Integer]`
 
@@ -8100,7 +9301,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_max_request_queue_time`
+##### <a name="passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
 
 Data type: `Optional[Integer]`
 
@@ -8108,7 +9309,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `passenger_sticky_sessions`
+##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
 Data type: `Optional[Boolean]`
 
@@ -8116,7 +9317,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_sticky_sessions_cookie_name`
+##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
 Data type: `Optional[String]`
 
@@ -8124,7 +9325,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_sticky_sessions_cookie_attributes`
+##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
@@ -8132,7 +9333,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_allow_encoded_slashes`
+##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
 Data type: `Optional[Boolean]`
 
@@ -8140,7 +9341,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_app_log_file`
+##### <a name="passenger_app_log_file"></a>`passenger_app_log_file`
 
 Data type: `Optional[String]`
 
@@ -8148,7 +9349,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `passenger_debugger`
+##### <a name="passenger_debugger"></a>`passenger_debugger`
 
 Data type: `Optional[Boolean]`
 
@@ -8156,7 +9357,7 @@ Data type: `Optional[Boolean]`
 
 Default value: ``undef``
 
-##### `passenger_lve_min_uid`
+##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
@@ -8164,7 +9365,7 @@ Data type: `Optional[Integer]`
 
 Default value: ``undef``
 
-##### `add_default_charset`
+##### <a name="add_default_charset"></a>`add_default_charset`
 
 Data type: `Any`
 
@@ -8172,7 +9373,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `modsec_disable_vhost`
+##### <a name="modsec_disable_vhost"></a>`modsec_disable_vhost`
 
 Data type: `Any`
 
@@ -8180,7 +9381,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `modsec_disable_ids`
+##### <a name="modsec_disable_ids"></a>`modsec_disable_ids`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8188,7 +9389,7 @@ Data type: `Optional[Variant[Hash, Array]]`
 
 Default value: ``undef``
 
-##### `modsec_disable_ips`
+##### <a name="modsec_disable_ips"></a>`modsec_disable_ips`
 
 Data type: `Any`
 
@@ -8196,7 +9397,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `modsec_disable_msgs`
+##### <a name="modsec_disable_msgs"></a>`modsec_disable_msgs`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8204,7 +9405,7 @@ Data type: `Optional[Variant[Hash, Array]]`
 
 Default value: ``undef``
 
-##### `modsec_disable_tags`
+##### <a name="modsec_disable_tags"></a>`modsec_disable_tags`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8212,7 +9413,7 @@ Data type: `Optional[Variant[Hash, Array]]`
 
 Default value: ``undef``
 
-##### `modsec_body_limit`
+##### <a name="modsec_body_limit"></a>`modsec_body_limit`
 
 Data type: `Any`
 
@@ -8220,7 +9421,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `jk_mounts`
+##### <a name="jk_mounts"></a>`jk_mounts`
 
 Data type: `Any`
 
@@ -8228,7 +9429,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `auth_kerb`
+##### <a name="auth_kerb"></a>`auth_kerb`
 
 Data type: `Boolean`
 
@@ -8236,7 +9437,7 @@ Data type: `Boolean`
 
 Default value: ``false``
 
-##### `krb_method_negotiate`
+##### <a name="krb_method_negotiate"></a>`krb_method_negotiate`
 
 Data type: `Any`
 
@@ -8244,7 +9445,7 @@ Data type: `Any`
 
 Default value: `'on'`
 
-##### `krb_method_k5passwd`
+##### <a name="krb_method_k5passwd"></a>`krb_method_k5passwd`
 
 Data type: `Any`
 
@@ -8252,7 +9453,7 @@ Data type: `Any`
 
 Default value: `'on'`
 
-##### `krb_authoritative`
+##### <a name="krb_authoritative"></a>`krb_authoritative`
 
 Data type: `Any`
 
@@ -8260,7 +9461,7 @@ Data type: `Any`
 
 Default value: `'on'`
 
-##### `krb_auth_realms`
+##### <a name="krb_auth_realms"></a>`krb_auth_realms`
 
 Data type: `Any`
 
@@ -8268,7 +9469,7 @@ Data type: `Any`
 
 Default value: `[]`
 
-##### `krb_5keytab`
+##### <a name="krb_5keytab"></a>`krb_5keytab`
 
 Data type: `Any`
 
@@ -8276,7 +9477,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `krb_local_user_mapping`
+##### <a name="krb_local_user_mapping"></a>`krb_local_user_mapping`
 
 Data type: `Any`
 
@@ -8284,7 +9485,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `krb_verify_kdc`
+##### <a name="krb_verify_kdc"></a>`krb_verify_kdc`
 
 Data type: `Any`
 
@@ -8292,7 +9493,7 @@ Data type: `Any`
 
 Default value: `'on'`
 
-##### `krb_servicename`
+##### <a name="krb_servicename"></a>`krb_servicename`
 
 Data type: `Any`
 
@@ -8300,7 +9501,7 @@ Data type: `Any`
 
 Default value: `'HTTP'`
 
-##### `krb_save_credentials`
+##### <a name="krb_save_credentials"></a>`krb_save_credentials`
 
 Data type: `Any`
 
@@ -8308,7 +9509,7 @@ Data type: `Any`
 
 Default value: `'off'`
 
-##### `keepalive`
+##### <a name="keepalive"></a>`keepalive`
 
 Data type: `Optional[Enum['on', 'off']]`
 
@@ -8316,7 +9517,7 @@ Data type: `Optional[Enum['on', 'off']]`
 
 Default value: ``undef``
 
-##### `keepalive_timeout`
+##### <a name="keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Any`
 
@@ -8324,7 +9525,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `max_keepalive_requests`
+##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
 
 Data type: `Any`
 
@@ -8332,7 +9533,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_attribute_prefix`
+##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Any`
 
@@ -8340,7 +9541,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_attribute_delimiter`
+##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Any`
 
@@ -8348,7 +9549,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_root_proxied_as`
+##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
 
 Data type: `Any`
 
@@ -8356,7 +9557,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_scrub_request_headers`
+##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
 Data type: `Any`
 
@@ -8364,7 +9565,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_sso_enabled`
+##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Any`
 
@@ -8372,7 +9573,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_login_url`
+##### <a name="cas_login_url"></a>`cas_login_url`
 
 Data type: `Any`
 
@@ -8380,7 +9581,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_validate_url`
+##### <a name="cas_validate_url"></a>`cas_validate_url`
 
 Data type: `Any`
 
@@ -8388,7 +9589,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_validate_saml`
+##### <a name="cas_validate_saml"></a>`cas_validate_saml`
 
 Data type: `Any`
 
@@ -8396,7 +9597,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `cas_cookie_path`
+##### <a name="cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `Any`
 
@@ -8404,7 +9605,7 @@ Data type: `Any`
 
 Default value: ``undef``
 
-##### `shib_compat_valid_user`
+##### <a name="shib_compat_valid_user"></a>`shib_compat_valid_user`
 
 Data type: `Optional[String]`
 
@@ -8412,7 +9613,7 @@ Data type: `Optional[String]`
 
 Default value: ``undef``
 
-##### `use_canonical_name`
+##### <a name="use_canonical_name"></a>`use_canonical_name`
 
 Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
 
@@ -8420,7 +9621,7 @@ Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
 
 Default value: ``undef``
 
-##### `comment`
+##### <a name="comment"></a>`comment`
 
 Data type: `Optional[Variant[String,Array[String]]]`
 
@@ -8428,7 +9629,7 @@ Data type: `Optional[Variant[String,Array[String]]]`
 
 Default value: ``undef``
 
-##### `define`
+##### <a name="define"></a>`define`
 
 Data type: `Hash`
 
@@ -8436,7 +9637,7 @@ Data type: `Hash`
 
 Default value: `{}`
 
-##### `auth_oidc`
+##### <a name="auth_oidc"></a>`auth_oidc`
 
 Data type: `Boolean`
 
@@ -8444,7 +9645,7 @@ Data type: `Boolean`
 
 Default value: ``false``
 
-##### `oidc_settings`
+##### <a name="oidc_settings"></a>`oidc_settings`
 
 Data type: `Optional[Apache::OIDCSettings]`
 
@@ -8452,21 +9653,34 @@ Data type: `Optional[Apache::OIDCSettings]`
 
 Default value: ``undef``
 
-### `apache::vhost::custom`
+##### <a name="mdomain"></a>`mdomain`
+
+Data type: `Optional[Variant[Boolean,String]]`
+
+
+
+Default value: ``undef``
+
+### <a name="apachevhostcustom"></a>`apache::vhost::custom`
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
 
 #### Parameters
 
-The following parameters are available in the `apache::vhost::custom` defined type.
+The following parameters are available in the `apache::vhost::custom` defined type:
 
-##### `content`
+* [`content`](#content)
+* [`ensure`](#ensure)
+* [`priority`](#priority)
+* [`verify_config`](#verify_config)
+
+##### <a name="content"></a>`content`
 
 Data type: `Any`
 
 Sets the configuration file's content.
 
-##### `ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Any`
 
@@ -8474,7 +9688,7 @@ Specifies if the virtual host file is present or absent.
 
 Default value: `'present'`
 
-##### `priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Any`
 
@@ -8482,7 +9696,7 @@ Sets the relative load order for Apache HTTPD VirtualHost configuration files.
 
 Default value: `'25'`
 
-##### `verify_config`
+##### <a name="verify_config"></a>`verify_config`
 
 Data type: `Any`
 
@@ -8490,7 +9704,7 @@ Specifies whether to validate the configuration file before notifying the Apache
 
 Default value: ``true``
 
-### `apache::vhost::fragment`
+### <a name="apachevhostfragment"></a>`apache::vhost::fragment`
 
 Define a fragment within a vhost
 
@@ -8549,15 +9763,20 @@ apache::vhost::fragment { 'myfragment':
 
 #### Parameters
 
-The following parameters are available in the `apache::vhost::fragment` defined type.
+The following parameters are available in the `apache::vhost::fragment` defined type:
 
-##### `vhost`
+* [`vhost`](#vhost)
+* [`priority`](#priority)
+* [`content`](#content)
+* [`order`](#order)
+
+##### <a name="vhost"></a>`vhost`
 
 Data type: `String[1]`
 
 The title of the vhost resource to append to
 
-##### `priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Any`
 
@@ -8566,7 +9785,7 @@ one `apache::vhost` sets or else the concat fragment won't be found.
 
 Default value: ``undef``
 
-##### `content`
+##### <a name="content"></a>`content`
 
 Data type: `Optional[String]`
 
@@ -8575,7 +9794,7 @@ fragment will be created.
 
 Default value: ``undef``
 
-##### `order`
+##### <a name="order"></a>`order`
 
 Data type: `Integer[0]`
 
@@ -8585,7 +9804,7 @@ Default value: `900`
 
 ## Resource types
 
-### `a2mod`
+### <a name="a2mod"></a>`a2mod`
 
 Manage Apache 2 modules
 
@@ -8605,28 +9824,33 @@ Default value: `present`
 
 The following parameters are available in the `a2mod` type.
 
-##### `identifier`
+* [`identifier`](#identifier)
+* [`lib`](#lib)
+* [`name`](#name)
+* [`provider`](#provider)
+
+##### <a name="identifier"></a>`identifier`
 
 Module identifier string used by LoadModule. Default: module-name_module
 
-##### `lib`
+##### <a name="lib"></a>`lib`
 
 The name of the .so library to be loaded
 
-##### `name`
+##### <a name="name"></a>`name`
 
 namevar
 
 The name of the module to be managed
 
-##### `provider`
+##### <a name="provider"></a>`provider`
 
 The specific backend to use for this `a2mod` resource. You will seldom need to specify this --- Puppet will usually
 discover the appropriate provider for your platform.
 
 ## Functions
 
-### `apache::apache_pw_hash`
+### <a name="apacheapache_pw_hash"></a>`apache::apache_pw_hash`
 
 Type: Ruby 4.x API
 
@@ -8644,7 +9868,7 @@ Data type: `Any`
 
 
 
-### `apache::bool2httpd`
+### <a name="apachebool2httpd"></a>`apache::bool2httpd`
 
 Type: Ruby 4.x API
 
@@ -8689,7 +9913,7 @@ Data type: `Any`
 
 The value to be converted into a string.
 
-### `apache::pw_hash`
+### <a name="apachepw_hash"></a>`apache::pw_hash`
 
 Type: Ruby 4.x API
 
@@ -8709,7 +9933,7 @@ Data type: `String[1]`
 
 The input that is to be hashed.
 
-### `apache_pw_hash`
+### <a name="apache_pw_hash"></a>`apache_pw_hash`
 
 Type: Ruby 4.x API
 
@@ -8727,7 +9951,7 @@ Data type: `Any`
 
 
 
-### `bool2httpd`
+### <a name="bool2httpd"></a>`bool2httpd`
 
 Type: Ruby 4.x API
 
@@ -8747,7 +9971,7 @@ Data type: `Any`
 
 ## Data types
 
-### `Apache::LogLevel`
+### <a name="apacheloglevel"></a>`Apache::LogLevel`
 
 A string that conforms to the Apache `LogLevel` syntax.
 Different levels can be specified for individual apache modules.
@@ -8775,13 +9999,20 @@ The levels are (in order of decreasing significance):
 * **See also**
   * https://httpd.apache.org/docs/current/mod/core.html#loglevel
 
-Alias of `Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]`
+Alias of
+
+```puppet
+Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
+```
 
-### `Apache::OIDCSettings`
+### <a name="apacheoidcsettings"></a>`Apache::OIDCSettings`
 
 https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 
-Alias of `Struct[{
+Alias of
+
+```puppet
+Struct[{
     Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl,Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
     Optional['CryptoPassphrase']                        => String,
     Optional['MetadataDir']                             => String,
@@ -8889,11 +10120,12 @@ Alias of `Struct[{
     Optional['BlackListedClaims']                       => String,
     Optional['WhiteListedClaims']                       => String,
     Optional['RefreshAccessTokenBeforeExpiry']          => Pattern[/^[0-9]+(\slogout_on_error)?$/],
-  }]`
+  }]
+```
 
 ## Tasks
 
-### `init`
+### <a name="init"></a>`init`
 
 Allows you to perform apache service functions
 
diff --git a/metadata.json b/metadata.json
index 2209cd261f..831136a6db 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.8.0",
+  "version": "5.9.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 13f55bd1ac10bc69e26aa21f2113ce97bc06caac Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 26 Jan 2021 17:16:53 +0000
Subject: [PATCH 1745/2267] (maint) Update github actions

---
 .github/workflows/nightly.yml |  73 +++++++--------------
 .github/workflows/pr_test.yml |  73 +++++++--------------
 .rubocop.yml                  | 120 ++++++++++++++--------------------
 .travis.yml                   |  56 +++++++++-------
 Rakefile                      |   1 +
 metadata.json                 |   6 +-
 6 files changed, 134 insertions(+), 195 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4021da7645..0c1fd28b9c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -25,7 +25,7 @@ jobs:
 
     - name: "Honeycomb: Start first step"
       run: |
-        echo STEP_ID=0 >> $GITHUB_ENV
+        echo STEP_ID=setup-environment >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
@@ -33,29 +33,25 @@ jobs:
       if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         ruby-version: "2.7"
+        bundler-cache: true
 
-    - name: Cache gems
-      uses: actions/cache@v2
+    - name: Print bundle environment
       if: ${{ github.repository_owner == 'puppetlabs' }}
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
+      run: |
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
 
-    - name: Install gems
+    - name: "Honeycomb: Record Setup Environment time"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
@@ -67,7 +63,7 @@ jobs:
           echo  "::set-output name=matrix::{}"
         fi
 
-    - name: "Honeycomb: Record setup time"
+    - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
@@ -90,7 +86,7 @@ jobs:
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -106,42 +102,22 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: "2.7"
+        bundler-cache: true
 
-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
-
-    - name: "Honeycomb: Record cache setup time"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Bundler Setup
+    - name: Print bundle environment
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
 
-    - name: "Honeycomb: Record Bundler Setup time"
+    - name: "Honeycomb: Record Setup Environment time"
       if: ${{ always() }}
       run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
@@ -168,7 +144,7 @@ jobs:
       run: |
         echo ::group::honeycomb step
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
 
@@ -180,11 +156,12 @@ jobs:
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
       if: ${{ always() }}
+      continue-on-error: true
       run: |
         if [ -f inventory.yaml ]; then
           buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
@@ -207,7 +184,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Slack Workflow Notification
-        uses: Gamesight/slack-workflow-status@88ee95b73b4669825883ddf22747966204663e58 # pin@master
+        uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
         with:
           # Required Input
           repo_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 2b5ab1f576..207dfcadd5 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -23,7 +23,7 @@ jobs:
 
     - name: "Honeycomb: Start first step"
       run: |
-        echo STEP_ID=0 >> $GITHUB_ENV
+        echo STEP_ID=setup-environment >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
@@ -31,33 +31,28 @@ jobs:
       if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         ruby-version: "2.7"
+        bundler-cache: true
 
-    - name: Cache gems
-      uses: actions/cache@v2
+    - name: Print bundle environment
       if: ${{ github.repository_owner == 'puppetlabs' }}
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
+      run: |
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
 
-    - name: Install gems
+    - name: "Honeycomb: Record Setup Environment time"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
-      if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
           buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
@@ -65,7 +60,7 @@ jobs:
           echo  "::set-output name=matrix::{}"
         fi
 
-    - name: "Honeycomb: Record setup time"
+    - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
@@ -73,6 +68,7 @@ jobs:
   Acceptance:
     needs:
       - setup_matrix
+    if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
 
     runs-on: ubuntu-20.04
     strategy:
@@ -88,7 +84,7 @@ jobs:
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -104,42 +100,22 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: "2.7"
+        bundler-cache: true
 
-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
-
-    - name: "Honeycomb: Record cache setup time"
-      if: ${{ always() }}
+    - name: Print bundle environment
       run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Bundler Setup
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
 
-    - name: "Honeycomb: Record Bundler Setup time"
+    - name: "Honeycomb: Record Setup Environment time"
       if: ${{ always() }}
       run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
@@ -166,7 +142,7 @@ jobs:
       run: |
         echo ::group::honeycomb step
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
 
@@ -178,11 +154,12 @@ jobs:
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
       if: ${{ always() }}
+      continue-on-error: true
       run: |
         if [ -f inventory.yaml ]; then
           buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
diff --git a/.rubocop.yml b/.rubocop.yml
index 3479f61a76..6a240fe7f3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -83,68 +83,26 @@ Performance/BigDecimalWithNumericArgument:
   Enabled: true
 Performance/BlockGivenWithExplicitBlock:
   Enabled: true
-Performance/Caller:
-  Enabled: true
 Performance/CaseWhenSplat:
   Enabled: true
-Performance/Casecmp:
-  Enabled: true
-Performance/CollectionLiteralInLoop:
-  Exclude:
-  - spec/**/*
-  Enabled: true
-Performance/CompareWithBlock:
-  Enabled: true
 Performance/ConstantRegexp:
   Enabled: true
-Performance/Count:
-  Enabled: true
-Performance/Detect:
-  Enabled: true
-Performance/DoubleStartEndWith:
-  Enabled: true
-Performance/EndWith:
-  Enabled: true
-Performance/FixedSize:
-  Enabled: true
-Performance/FlatMap:
-  Enabled: true
 Performance/MethodObjectAsBlock:
   Enabled: true
-Performance/RangeInclude:
-  Enabled: true
-Performance/RedundantBlockCall:
-  Enabled: true
-Performance/RedundantMatch:
-  Enabled: true
-Performance/RedundantMerge:
-  Enabled: true
 Performance/RedundantSortBlock:
   Enabled: true
 Performance/RedundantStringChars:
   Enabled: true
-Performance/RegexpMatch:
-  Enabled: true
-Performance/ReverseEach:
-  Enabled: true
 Performance/ReverseFirst:
   Enabled: true
-Performance/Size:
-  Enabled: true
 Performance/SortReverse:
   Enabled: true
 Performance/Squeeze:
   Enabled: true
-Performance/StartWith:
-  Enabled: true
 Performance/StringInclude:
   Enabled: true
-Performance/StringReplacement:
-  Enabled: true
 Performance/Sum:
   Enabled: true
-Performance/TimesMap:
-  Enabled: true
 Style/CollectionMethods:
   Enabled: true
 Style/MethodCalledOnDoEndBlock:
@@ -201,20 +159,12 @@ Lint/DeprecatedOpenSSLConstant:
   Enabled: false
 Lint/DisjunctiveAssignmentInConstructor:
   Enabled: false
-Lint/DuplicateBranch:
-  Enabled: false
 Lint/DuplicateElsifCondition:
   Enabled: false
-Lint/DuplicateRegexpCharacterClassElement:
-  Enabled: false
 Lint/DuplicateRequire:
   Enabled: false
 Lint/DuplicateRescueException:
   Enabled: false
-Lint/EmptyBlock:
-  Enabled: false
-Lint/EmptyClass:
-  Enabled: false
 Lint/EmptyConditionalBody:
   Enabled: false
 Lint/EmptyFile:
@@ -235,8 +185,6 @@ Lint/MixedRegexpCaptureTypes:
   Enabled: false
 Lint/NestedPercentLiteral:
   Enabled: false
-Lint/NoReturnInBeginEndBlocks:
-  Enabled: false
 Lint/NonDeterministicRequireOrder:
   Enabled: false
 Lint/OrderedMagicComments:
@@ -271,18 +219,12 @@ Lint/ShadowedArgument:
   Enabled: false
 Lint/StructNewOverride:
   Enabled: false
-Lint/ToEnumArguments:
-  Enabled: false
 Lint/ToJSON:
   Enabled: false
 Lint/TopLevelReturnWithArgument:
   Enabled: false
 Lint/TrailingCommaInAttributeDeclaration:
   Enabled: false
-Lint/UnexpectedBlockArity:
-  Enabled: false
-Lint/UnmodifiedReduceAccumulator:
-  Enabled: false
 Lint/UnreachableLoop:
   Enabled: false
 Lint/UriEscapeUnescape:
@@ -297,6 +239,8 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
+Metrics/BlockNesting:
+  Enabled: false
 Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
@@ -325,6 +269,20 @@ Naming/MethodParameterName:
   Enabled: false
 Naming/RescuedExceptionsVariableName:
   Enabled: false
+Naming/VariableNumber:
+  Enabled: false
+Performance/BindCall:
+  Enabled: false
+Performance/DeletePrefix:
+  Enabled: false
+Performance/DeleteSuffix:
+  Enabled: false
+Performance/InefficientHashSearch:
+  Enabled: false
+Performance/UnfreezeString:
+  Enabled: false
+Performance/UriDefaultParser:
+  Enabled: false
 RSpec/Be:
   Enabled: false
 RSpec/Capybara/CurrentPathExpectation:
@@ -413,8 +371,6 @@ Style/AccessModifierDeclarations:
   Enabled: false
 Style/AccessorGrouping:
   Enabled: false
-Style/ArgumentsForwarding:
-  Enabled: false
 Style/AsciiComments:
   Enabled: false
 Style/BisectedAttrAccessor:
@@ -423,8 +379,6 @@ Style/CaseLikeIf:
   Enabled: false
 Style/ClassEqualityComparison:
   Enabled: false
-Style/CollectionCompact:
-  Enabled: false
 Style/ColonMethodDefinition:
   Enabled: false
 Style/CombinableLoops:
@@ -433,8 +387,6 @@ Style/CommentedKeyword:
   Enabled: false
 Style/Dir:
   Enabled: false
-Style/DocumentDynamicEvalDefinition:
-  Enabled: false
 Style/DoubleCopDisableDirective:
   Enabled: false
 Style/EmptyBlockParameter:
@@ -473,12 +425,8 @@ Style/MixinUsage:
   Enabled: false
 Style/MultilineWhenThen:
   Enabled: false
-Style/NegatedIfElseCondition:
-  Enabled: false
 Style/NegatedUnless:
   Enabled: false
-Style/NilLambda:
-  Enabled: false
 Style/NumericPredicate:
   Enabled: false
 Style/OptionalBooleanParameter:
@@ -487,8 +435,6 @@ Style/OrAssignment:
   Enabled: false
 Style/RandomWithOffset:
   Enabled: false
-Style/RedundantArgument:
-  Enabled: false
 Style/RedundantAssignment:
   Enabled: false
 Style/RedundantCondition:
@@ -521,8 +467,6 @@ Style/StringConcatenation:
   Enabled: false
 Style/Strip:
   Enabled: false
-Style/SwapValues:
-  Enabled: false
 Style/SymbolProc:
   Enabled: false
 Style/TrailingBodyOnClass:
@@ -537,3 +481,35 @@ Style/TrailingMethodEndStatement:
   Enabled: false
 Style/UnpackFirst:
   Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: false
+Lint/EmptyBlock:
+  Enabled: false
+Lint/EmptyClass:
+  Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+Lint/ToEnumArguments:
+  Enabled: false
+Lint/UnexpectedBlockArity:
+  Enabled: false
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: false
+Performance/CollectionLiteralInLoop:
+  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
+Style/CollectionCompact:
+  Enabled: false
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
+Style/NilLambda:
+  Enabled: false
+Style/RedundantArgument:
+  Enabled: false
+Style/SwapValues:
+  Enabled: false
diff --git a/.travis.yml b/.travis.yml
index 52dc74b763..b65063988b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,82 +27,90 @@ stages:
 jobs:
   fast_finish: true
   include:
-    - bundler_args: --with system_tests
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      env: PLATFORMS=travis_ub_6_puppet6
+      env:
+        PLATFORMS: travis_ub_6_puppet6
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - bundler_args: --with system_tests
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      env: PLATFORMS=travis_ub_5_puppet5
+      env:
+        PLATFORMS: travis_ub_5_puppet5
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - bundler_args: --with system_tests
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      env: PLATFORMS=travis_deb_puppet5
+      env:
+        PLATFORMS: travis_deb_puppet5
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - bundler_args: --with system_tests
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      env: PLATFORMS=travis_el7_puppet5
+      env:
+        PLATFORMS: travis_el7_puppet5
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - bundler_args: --with system_tests
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el8]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      env: PLATFORMS=travis_el8_puppet5
+      env:
+        PLATFORMS: travis_el8_puppet5
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - bundler_args: --with system_tests
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      env: PLATFORMS=travis_deb_puppet6
+      env:
+        PLATFORMS: travis_deb_puppet6
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - bundler_args: --with system_tests
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      env: PLATFORMS=travis_el7_puppet6
+      env:
+        PLATFORMS: travis_el7_puppet6
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - bundler_args: --with system_tests
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el8]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      env: PLATFORMS=travis_el8_puppet6
+      env:
+        PLATFORMS: travis_el8_puppet6
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
diff --git a/Rakefile b/Rakefile
index e66cbd3730..e10ba7c02a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bundler'
 require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
diff --git a/metadata.json b/metadata.json
index 831136a6db..10a9cbf8d8 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,7 +81,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.18.1",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#main",
-  "template-ref": "heads/main-0-g4543421"
+  "pdk-version": "1.19.0.pre (47)",
+  "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
+  "template-ref": "heads/main-0-g1862b96"
 }

From b2887d66ca29b78c5b99fdb3b2ec96086b4381e0 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sat, 6 Feb 2021 23:02:52 +0100
Subject: [PATCH 1746/2267] Remove left over debug code

---
 spec/classes/mod/passenger_spec.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index f2c7152aa9..fb56891124 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -223,9 +223,6 @@
           end
 
           describe 'warns when an option is deprecated' do
-            puts facts[:os]['family']
-            puts facts[:os]['release']
-
             let :params do
               {
                 passenger_installed_version: '5.0.0',

From 48d6abdf079bb1da018fbd5e0f3163d961435866 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 14:15:12 +0100
Subject: [PATCH 1747/2267] Rewrite mod_jk specs to use inheritance

---
 spec/classes/mod/jk_spec.rb | 228 ++++++++++++++----------------------
 1 file changed, 90 insertions(+), 138 deletions(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 84c09bc57e..839a1f0c61 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -63,36 +63,7 @@
   default_port = 80
   altern8_port = 8008
 
-  context 'RHEL 6 with only required facts and default parameters' do
-    let(:facts) do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '6',
-        ipaddress: default_ip,
-      }
-    end
-    let(:pre_condition) do
-      'include apache'
-    end
-    let(:params) do
-      {
-        logroot: '/var/log/httpd',
-      }
-    end
-    let(:mod_dir) { mod_dir }
-
-    mod_dir = '/etc/httpd/conf.d'
-
-    it_behaves_like 'minimal resources', mod_dir
-    it_behaves_like 'specific workers_file', mod_dir
-    it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
-    it {
-      verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
-    }
-  end
-
-  context 'Debian 8 with only required facts and default parameters' do
+  context 'Debian 8' do
     let(:facts) do
       {
         osfamily: 'Debian',
@@ -101,50 +72,32 @@
         ipaddress: default_ip,
       }
     end
-    let(:pre_condition) do
-      'include apache'
-    end
-    let(:params) do
-      {
-        logroot: '/var/log/apache2',
-      }
-    end
-    let(:mod_dir) { mod_dir }
 
-    mod_dir = '/etc/apache2/mods-available'
+    context 'with only required facts and default parameters' do
+      let(:facts) { super().merge('ipaddress' => default_ip) }
+      let(:pre_condition) do
+        'include apache'
+      end
+      let(:params) do
+        {
+          logroot: '/var/log/apache2',
+        }
+      end
+      let(:mod_dir) { mod_dir }
 
-    it_behaves_like 'minimal resources', mod_dir
-    it_behaves_like 'specific workers_file', mod_dir
-    it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
-    it { is_expected.to contain_package('libapache2-mod-jk') }
-    it {
-      verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
-    }
-  end
+      mod_dir = '/etc/apache2/mods-available'
 
-  context 'RHEL 6 with required facts and alternative IP' do
-    let(:facts) do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '6',
-        ipaddress: default_ip,
+      it_behaves_like 'minimal resources', mod_dir
+      it_behaves_like 'specific workers_file', mod_dir
+      it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
+      it { is_expected.to contain_package('libapache2-mod-jk') }
+      it {
+        verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
       }
     end
-    let(:pre_condition) do
-      'include apache'
-    end
-    let(:params) do
-      {
-        ip: altern8_ip,
-        logroot: '/var/log/httpd',
-      }
-    end
-
-    it { is_expected.to contain_apache__listen("#{altern8_ip}:#{default_port}") }
   end
 
-  context 'RHEL 6 with required facts and alternative port' do
+  context 'RHEL 6' do
     let(:facts) do
       {
         osfamily: 'RedHat',
@@ -158,89 +111,88 @@
     end
     let(:params) do
       {
-        port: altern8_port,
         logroot: '/var/log/httpd',
       }
     end
 
-    it { is_expected.to contain_apache__listen("#{default_ip}:#{altern8_port}") }
-  end
+    context 'with required facts' do
+      let(:facts) { super().merge('ipaddress' => default_ip) }
 
-  context 'RHEL 6 with required facts and no binding' do
-    let(:facts) do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '6',
-        ipaddress: default_ip,
-      }
-    end
-    let(:pre_condition) do
-      'include apache'
-    end
-    let(:params) do
-      {
-        add_listen: false,
-        logroot: '/var/log/httpd',
-      }
-    end
+      context 'and default parameters' do
+        let(:mod_dir) { mod_dir }
 
-    it { is_expected.not_to contain_apache__listen("#{default_ip}:#{default_port}") }
-  end
+        mod_dir = '/etc/httpd/conf.d'
 
-  {
-    default: {
-      shm_file: :undef,
-      log_file: :undef,
-      shm_path: '/var/log/httpd/jk-runtime-status',
-      log_path: '/var/log/httpd/mod_jk.log',
-    },
-    relative: {
-      shm_file: 'shm_file',
-      log_file: 'log_file',
-      shm_path: '/var/log/httpd/shm_file',
-      log_path: '/var/log/httpd/log_file',
-    },
-    absolute: {
-      shm_file: '/run/shm_file',
-      log_file: '/tmp/log_file',
-      shm_path: '/run/shm_file',
-      log_path: '/tmp/log_file',
-    },
-    pipe: {
-      shm_file: :undef,
-      log_file: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
-      shm_path: '/var/log/httpd/jk-runtime-status',
-      log_path: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
-    },
-  }.each do |option, paths|
-    context "RHEL 6 with #{option} shm_file and log_file paths" do
-      let(:facts) do
-        {
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
+        it_behaves_like 'minimal resources', mod_dir
+        it_behaves_like 'specific workers_file', mod_dir
+        it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
+        it {
+          verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
         }
       end
-      let(:pre_condition) do
-        'include apache'
+
+      context 'and alternative IP' do
+        let(:params) { super().merge(ip: altern8_ip) }
+
+        it { is_expected.to contain_apache__listen("#{altern8_ip}:#{default_port}") }
       end
-      let(:params) do
-        {
-          logroot: '/var/log/httpd',
-          shm_file: paths[:shm_file],
-          log_file: paths[:log_file],
-        }
+
+      context 'and alternative port' do
+        let(:params) { super().merge(port: altern8_port) }
+
+        it { is_expected.to contain_apache__listen("#{default_ip}:#{altern8_port}") }
       end
 
-      expected = "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
-                 "# Any manual changes will be overwritten\n"\
-                 "\n"\
-                 "<IfModule jk_module>\n"\
-                 "  JkShmFile #{paths[:shm_path]}\n"\
-                 "  JkLogFile #{paths[:log_path]}\n"\
-                 "</IfModule>\n"
-      it { is_expected.to contain_file('jk.conf').with_content(expected) }
+      context 'no binding' do
+        let(:params) { super().merge(add_listen: false) }
+
+        it { is_expected.not_to contain_apache__listen("#{default_ip}:#{default_port}") }
+      end
+
+      {
+        default: {
+          shm_file: :undef,
+          log_file: :undef,
+          shm_path: '/var/log/httpd/jk-runtime-status',
+          log_path: '/var/log/httpd/mod_jk.log',
+        },
+        relative: {
+          shm_file: 'shm_file',
+          log_file: 'log_file',
+          shm_path: '/var/log/httpd/shm_file',
+          log_path: '/var/log/httpd/log_file',
+        },
+        absolute: {
+          shm_file: '/run/shm_file',
+          log_file: '/tmp/log_file',
+          shm_path: '/run/shm_file',
+          log_path: '/tmp/log_file',
+        },
+        pipe: {
+          shm_file: :undef,
+          log_file: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
+          shm_path: '/var/log/httpd/jk-runtime-status',
+          log_path: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
+        },
+      }.each do |option, paths|
+        context "#{option} shm_file and log_file paths" do
+          let(:params) do
+            super().merge(
+              shm_file: paths[:shm_file],
+              log_file: paths[:log_file],
+            )
+          end
+
+          expected = "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
+                     "# Any manual changes will be overwritten\n"\
+                     "\n"\
+                     "<IfModule jk_module>\n"\
+                     "  JkShmFile #{paths[:shm_path]}\n"\
+                     "  JkLogFile #{paths[:log_path]}\n"\
+                     "</IfModule>\n"
+          it { is_expected.to contain_file('jk.conf').with_content(expected) }
+        end
+      end
     end
   end
 end

From df4002b95c4aa275f3e912c3a33c16e1b4972765 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 14:55:15 +0100
Subject: [PATCH 1748/2267] Rewrite some defs as shared examples

Shared examples have the benefit that they are a bit more native in
rspec.
---
 spec/classes/mod/status_spec.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 5db47bb4c6..1764320db8 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -4,7 +4,7 @@
 
 # Helper function for testing the contents of `status.conf`
 # Apache < 2.4
-def status_conf_spec(allow_from, extended_status, status_path)
+shared_examples 'status_conf_spec' do |allow_from, extended_status, status_path|
   expected =
     "<Location #{status_path}>\n"\
     "    SetHandler server-status\n"\
@@ -47,7 +47,7 @@ def require_directives(requires)
   end
 end
 
-def status_conf_spec_require(requires, extended_status, status_path)
+shared_examples 'status_conf_spec_require' do |requires, extended_status, status_path|
   expected =
     "<Location #{status_path}>\n"\
     "    SetHandler server-status\n"\
@@ -84,7 +84,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
 
       it { is_expected.to contain_apache__mod('status') }
 
-      status_conf_spec(['127.0.0.1', '::1'], 'On', '/server-status')
+      include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
 
       it {
         is_expected.to contain_file('status.conf').with(ensure: 'file',
@@ -112,7 +112,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
 
       it { is_expected.to contain_apache__mod('status') }
 
-      status_conf_spec(['127.0.0.1', '::1'], 'On', '/server-status')
+      include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
 
       it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.d/status.conf') }
     end
@@ -164,7 +164,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
 
         it { is_expected.to contain_apache__mod('status') }
 
-        status_conf_spec_require(req_value, 'On', '/server-status')
+        include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
 
         it {
           is_expected.to contain_file('status.conf').with(ensure: 'file',
@@ -198,7 +198,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
 
         it { is_expected.to contain_apache__mod('status') }
 
-        status_conf_spec_require(req_value, 'On', '/server-status')
+        include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
 
         it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
       end
@@ -224,7 +224,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
 
         it { is_expected.to contain_apache__mod('status') }
 
-        status_conf_spec_require(req_value, 'On', '/server-status')
+        include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
 
         it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
       end
@@ -253,7 +253,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
 
       it { is_expected.to compile }
 
-      status_conf_spec(['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status')
+      include_examples 'status_conf_spec', ['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status'
     end
 
     context "with valid parameter type $allow_from => ['10.10.10.10']" do

From 2cb0580e3078e54ff75c7e50c52b5cd506ea26fe Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 15:13:29 +0100
Subject: [PATCH 1749/2267] Restructure apache::mod::status spec tests

This uses a lot more inheritance to reduce duplication. It also makes it
easier to read the results due to the test hierarchy.
---
 spec/classes/mod/status_spec.rb | 341 ++++++++++++++------------------
 1 file changed, 144 insertions(+), 197 deletions(-)

diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 1764320db8..540db78a7a 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -68,7 +68,7 @@ def require_directives(requires)
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters' do
-    context 'on a Debian 6 OS with default params' do
+    context 'on a Debian 6 OS' do
       let :facts do
         {
           osfamily: 'Debian',
@@ -82,89 +82,10 @@ def require_directives(requires)
         }
       end
 
-      it { is_expected.to contain_apache__mod('status') }
-
-      include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
-
-      it {
-        is_expected.to contain_file('status.conf').with(ensure: 'file',
-                                                        path: '/etc/apache2/mods-available/status.conf')
-      }
-
-      it {
-        is_expected.to contain_file('status.conf symlink').with(ensure: 'link',
-                                                                path: '/etc/apache2/mods-enabled/status.conf')
-      }
-    end
-
-    context 'on a RedHat 6 OS with default params' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
-
-      it { is_expected.to contain_apache__mod('status') }
-
-      include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
-
-      it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.d/status.conf') }
-    end
-
-    valid_requires = {
-      undef: :undef,
-      empty: '',
-      unmanaged: 'unmanaged',
-      string: 'ip 127.0.0.1 192.168',
-      array: [
-        'ip 127.0.0.1',
-        'ip ::1',
-        'host localhost',
-      ],
-      hash: {
-        requires: [
-          'ip 10.1',
-          'host somehost',
-        ],
-      },
-      enforce: {
-        enforce: 'all',
-        requires: [
-          'ip 127.0.0.1',
-          'host localhost',
-        ],
-      },
-    }
-    valid_requires.each do |req_key, req_value|
-      context "on a Debian 8 OS with default params and #{req_key} requires" do
-        let :facts do
-          {
-            osfamily: 'Debian',
-            operatingsystemrelease: '8',
-            lsbdistcodename: 'squeeze',
-            operatingsystem: 'Debian',
-            id: 'root',
-            kernel: 'Linux',
-            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            is_pe: false,
-          }
-        end
-
-        let :params do
-          {
-            requires: req_value,
-          }
-        end
-
+      context 'with default params' do
         it { is_expected.to contain_apache__mod('status') }
 
-        include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
+        include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
 
         it {
           is_expected.to contain_file('status.conf').with(ensure: 'file',
@@ -177,172 +98,198 @@ def require_directives(requires)
         }
       end
 
-      context "on a RedHat 7 OS with default params and #{req_key} requires" do
-        let :facts do
-          {
-            osfamily: 'RedHat',
-            operatingsystemrelease: '7',
-            operatingsystem: 'RedHat',
-            id: 'root',
-            kernel: 'Linux',
-            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            is_pe: false,
-          }
-        end
-
+      context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
         let :params do
           {
-            requires: req_value,
+            allow_from: ['10.10.10.10', '11.11.11.11'],
+            extended_status: 'Off',
+            status_path: '/custom-status',
           }
         end
 
-        it { is_expected.to contain_apache__mod('status') }
+        it { is_expected.to compile }
+
+        include_examples 'status_conf_spec', ['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status'
+      end
 
-        include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
+      context "with valid parameter type $allow_from => ['10.10.10.10']" do
+        let :params do
+          { allow_from: ['10.10.10.10'] }
+        end
 
-        it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
+        it 'expects to succeed array validation' do
+          is_expected.to compile
+        end
       end
 
-      context "on a RedHat 8 OS with default params and #{req_key} requires" do
+      context "with invalid parameter type $allow_from => '10.10.10.10'" do
         let :facts do
           {
-            osfamily: 'RedHat',
-            operatingsystemrelease: '8',
-            operatingsystem: 'RedHat',
+            osfamily: 'Debian',
+            operatingsystemrelease: '6',
+            operatingsystem: 'Debian',
             id: 'root',
             kernel: 'Linux',
             path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
             is_pe: false,
           }
         end
-
         let :params do
-          {
-            requires: req_value,
-          }
+          { allow_from: '10.10.10.10' }
         end
 
-        it { is_expected.to contain_apache__mod('status') }
-
-        include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
-
-        it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
+        it 'expects to fail array validation' do
+          is_expected.to compile.and_raise_error(%r{allow_from})
+        end
       end
-    end
 
-    context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
-      let :facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '6',
-          lsbdistcodename: 'squeeze',
-          operatingsystem: 'Debian',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
-      let :params do
-        {
-          allow_from: ['10.10.10.10', '11.11.11.11'],
-          extended_status: 'Off',
-          status_path: '/custom-status',
-        }
+      # Only On or Off are valid options
+      ['On', 'Off'].each do |valid_param|
+        context "with valid value $extended_status => '#{valid_param}'" do
+          let :params do
+            { extended_status: valid_param }
+          end
+
+          it 'expects to succeed regular expression validation' do
+            is_expected.to compile
+          end
+        end
       end
 
-      it { is_expected.to compile }
+      ['Yes', 'No'].each do |invalid_param|
+        context "with invalid value $extended_status => '#{invalid_param}'" do
+          let :params do
+            { extended_status: invalid_param }
+          end
 
-      include_examples 'status_conf_spec', ['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status'
+          it 'expects to fail regular expression validation' do
+            is_expected.to compile.and_raise_error(%r{extended_status})
+          end
+        end
+      end
     end
 
-    context "with valid parameter type $allow_from => ['10.10.10.10']" do
+    context 'on a RedHat 6 OS' do
       let :facts do
         {
-          osfamily: 'Debian',
+          osfamily: 'RedHat',
           operatingsystemrelease: '6',
-          lsbdistcodename: 'squeeze',
-          operatingsystem: 'Debian',
+          operatingsystem: 'RedHat',
           id: 'root',
           kernel: 'Linux',
           path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
           is_pe: false,
         }
       end
-      let :params do
-        { allow_from: ['10.10.10.10'] }
-      end
 
-      it 'expects to succeed array validation' do
-        is_expected.to compile
-      end
-    end
+      context 'with default params' do
+        it { is_expected.to contain_apache__mod('status') }
 
-    context "with invalid parameter type $allow_from => '10.10.10.10'" do
-      let :facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '6',
-          operatingsystem: 'Debian',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
-      let :params do
-        { allow_from: '10.10.10.10' }
-      end
+        include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
 
-      it 'expects to fail array validation' do
-        is_expected.to compile.and_raise_error(%r{allow_from})
+        it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.d/status.conf') }
       end
     end
 
-    # Only On or Off are valid options
-    ['On', 'Off'].each do |valid_param|
-      context "with valid value $extended_status => '#{valid_param}'" do
-        let :facts do
+    valid_requires = {
+      undef: :undef,
+      empty: '',
+      unmanaged: 'unmanaged',
+      string: 'ip 127.0.0.1 192.168',
+      array: [
+        'ip 127.0.0.1',
+        'ip ::1',
+        'host localhost',
+      ],
+      hash: {
+        requires: [
+          'ip 10.1',
+          'host somehost',
+        ],
+      },
+      enforce: {
+        enforce: 'all',
+        requires: [
+          'ip 127.0.0.1',
+          'host localhost',
+        ],
+      },
+    }
+    valid_requires.each do |req_key, req_value|
+      context "with default params and #{req_key} requires" do
+        let :params do
           {
-            osfamily: 'Debian',
-            operatingsystemrelease: '6',
-            lsbdistcodename: 'squeeze',
-            operatingsystem: 'Debian',
-            id: 'root',
-            kernel: 'Linux',
-            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            is_pe: false,
+            requires: req_value,
           }
         end
-        let :params do
-          { extended_status: valid_param }
-        end
 
-        it 'expects to succeed regular expression validation' do
-          is_expected.to compile
-        end
-      end
-    end
+        context 'on a Debian 8 OS' do
+          let :facts do
+            {
+              osfamily: 'Debian',
+              operatingsystemrelease: '8',
+              lsbdistcodename: 'squeeze',
+              operatingsystem: 'Debian',
+              id: 'root',
+              kernel: 'Linux',
+              path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+              is_pe: false,
+            }
+          end
+
+          it { is_expected.to contain_apache__mod('status') }
+
+          include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
+
+          it {
+            is_expected.to contain_file('status.conf').with(ensure: 'file',
+                                                            path: '/etc/apache2/mods-available/status.conf')
+          }
 
-    ['Yes', 'No'].each do |invalid_param|
-      context "with invalid value $extended_status => '#{invalid_param}'" do
-        let :facts do
-          {
-            osfamily: 'Debian',
-            operatingsystemrelease: '6',
-            operatingsystem: 'Debian',
-            id: 'root',
-            kernel: 'Linux',
-            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            is_pe: false,
+          it {
+            is_expected.to contain_file('status.conf symlink').with(ensure: 'link',
+                                                                    path: '/etc/apache2/mods-enabled/status.conf')
           }
         end
-        let :params do
-          { extended_status: invalid_param }
+
+        context 'on a RedHat 7 OS' do
+          let :facts do
+            {
+              osfamily: 'RedHat',
+              operatingsystemrelease: '7',
+              operatingsystem: 'RedHat',
+              id: 'root',
+              kernel: 'Linux',
+              path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+              is_pe: false,
+            }
+          end
+
+          it { is_expected.to contain_apache__mod('status') }
+
+          include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
+
+          it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
         end
 
-        it 'expects to fail regular expression validation' do
-          is_expected.to compile.and_raise_error(%r{extended_status})
+        context 'on a RedHat 8 OS' do
+          let :facts do
+            {
+              osfamily: 'RedHat',
+              operatingsystemrelease: '8',
+              operatingsystem: 'RedHat',
+              id: 'root',
+              kernel: 'Linux',
+              path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+              is_pe: false,
+            }
+          end
+
+          it { is_expected.to contain_apache__mod('status') }
+
+          include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
+
+          it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
         end
       end
     end

From d0863d449c49406595be0fce9d9cf125fc0402c2 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sat, 6 Feb 2021 21:15:19 +0100
Subject: [PATCH 1750/2267] Use shared examples for facts

This extracts common sets of facts to shared examples to reduce
duplication. It also makes it easier to actually provide correct OS
facts and use modern facts.
---
 spec/classes/apache_spec.rb                   |  96 +-------
 spec/classes/mod/alias_spec.rb                |  87 +------
 spec/classes/mod/auth_cas_spec.rb             |  37 +--
 spec/classes/mod/auth_gssapi_spec.rb          |  49 +---
 spec/classes/mod/auth_kerb_spec.rb            |  61 +----
 spec/classes/mod/auth_mellon_spec.rb          |  27 +-
 spec/classes/mod/auth_openidc_spec.rb         |  49 +---
 spec/classes/mod/authn_dbd_spec.rb            |  25 +-
 spec/classes/mod/authnz_ldap_spec.rb          |  13 +-
 spec/classes/mod/authnz_pam_spec.rb           |  25 +-
 spec/classes/mod/cluster_spec.rb              |  36 +--
 spec/classes/mod/data_spec.rb                 |  12 +-
 spec/classes/mod/dav_svn_spec.rb              |  52 +---
 spec/classes/mod/deflate_spec.rb              |  49 +---
 spec/classes/mod/dev_spec.rb                  |  21 +-
 spec/classes/mod/dir_spec.rb                  |  49 +---
 spec/classes/mod/disk_cache_spec.rb           |  37 +--
 spec/classes/mod/dumpio_spec.rb               |  15 +-
 spec/classes/mod/event_spec.rb                |  49 +---
 spec/classes/mod/expires_spec.rb              |  39 +--
 spec/classes/mod/ext_filter_spec.rb           |  27 +-
 spec/classes/mod/fcgid_spec.rb                |  65 +----
 spec/classes/mod/http2_spec.rb                |  13 +-
 spec/classes/mod/info_spec.rb                 |  49 +---
 .../classes/mod/intercept_form_submit_spec.rb |  25 +-
 spec/classes/mod/itk_spec.rb                  |  39 +--
 spec/classes/mod/jk_spec.rb                   |  18 +-
 spec/classes/mod/ldap_spec.rb                 |  25 +-
 spec/classes/mod/lookup_identity.rb           |  25 +-
 spec/classes/mod/mime_magic_spec.rb           |  38 +--
 spec/classes/mod/mime_spec.rb                 |  25 +-
 spec/classes/mod/negotiation_spec.rb          |  13 +-
 spec/classes/mod/pagespeed_spec.rb            |  25 +-
 spec/classes/mod/perl_spec.rb                 |  49 +---
 spec/classes/mod/peruser_spec.rb              |  24 +-
 spec/classes/mod/prefork_spec.rb              |  49 +---
 spec/classes/mod/proxy_balancer_spec.rb       |  38 +--
 spec/classes/mod/proxy_connect_spec.rb        |  26 +-
 spec/classes/mod/proxy_html_spec.rb           |  56 +----
 spec/classes/mod/python_spec.rb               |  49 +---
 spec/classes/mod/remoteip_spec.rb             |  12 +-
 spec/classes/mod/reqtimeout_spec.rb           |  49 +---
 spec/classes/mod/rpaf_spec.rb                 |  37 +--
 spec/classes/mod/shib_spec.rb                 |  27 +-
 spec/classes/mod/speling_spec.rb              |  25 +-
 spec/classes/mod/ssl_spec.rb                  | 121 +--------
 spec/classes/mod/status_spec.rb               |  73 +-----
 spec/classes/mod/userdir_spec.rb              |  15 +-
 spec/classes/mod/worker_spec.rb               |  61 +----
 spec/classes/mod/wsgi_spec.rb                 |  65 +----
 spec/classes/params_spec.rb                   |  13 +-
 spec/classes/service_spec.rb                  |  51 +---
 spec/classes/vhosts_spec.rb                   |  12 +-
 spec/defines/balancer_spec.rb                 |  14 +-
 spec/defines/balancermember_spec.rb           |  14 +-
 spec/defines/custom_config_spec.rb            |  14 +-
 spec/defines/mod_spec.rb                      |  49 +---
 spec/defines/vhost_custom_spec.rb             |  53 +---
 spec/spec_helper_local.rb                     | 231 ++++++++++++++++++
 59 files changed, 426 insertions(+), 2016 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index f6a14c9747..3fb67b3bdf 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -4,18 +4,7 @@
 
 describe 'apache', type: :class do
   context 'on a Debian OS' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        lsbdistcodename: 'squeeze',
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '6',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 6'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -244,10 +233,7 @@
     end
 
     context '8' do
-      let :facts do
-        super().merge(lsbdistcodename: 'jessie',
-                      operatingsystemrelease: '8.0.0')
-      end
+      include_examples 'Debian 8'
 
       it {
         is_expected.to contain_file('/var/www/html').with(
@@ -265,11 +251,7 @@
     end
 
     context 'on Ubuntu 14.04' do
-      let :facts do
-        super().merge(operatingsystem: 'Ubuntu',
-                      lsbdistrelease: '14.04',
-                      operatingsystemrelease: '14.04')
-      end
+      include_examples 'Ubuntu 14.04'
 
       it {
         is_expected.to contain_file('/var/www/html').with(
@@ -280,17 +262,7 @@
   end
 
   context 'on a RedHat 5 OS' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '5',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 5'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -667,46 +639,24 @@
     end
 
     context 'on Fedora 21' do
-      let :facts do
-        super().merge(operatingsystem: 'Fedora',
-                      lsbdistrelease: '21',
-                      operatingsystemrelease: '21')
-      end
+      include_examples 'Fedora 21'
 
       it { is_expected.to contain_class('apache').with_apache_version('2.4') }
     end
     context 'on Fedora Rawhide' do
-      let :facts do
-        super().merge(operatingsystem: 'Fedora',
-                      lsbdistrelease: 'Rawhide',
-                      operatingsystemrelease: 'Rawhide')
-      end
+      include_examples 'Fedora Rawhide'
 
       it { is_expected.to contain_class('apache').with_apache_version('2.4') }
     end
     # kinda obsolete
     context 'on Fedora 17' do
-      let :facts do
-        super().merge(operatingsystem: 'Fedora',
-                      lsbdistrelease: '17',
-                      operatingsystemrelease: '17')
-      end
+      include_examples 'Fedora 17'
 
       it { is_expected.to contain_class('apache').with_apache_version('2.2') }
     end
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'FreeBSD',
-        osfamily: 'FreeBSD',
-        operatingsystem: 'FreeBSD',
-        operatingsystemrelease: '10',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 10'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::package').with('ensure' => 'present') }
@@ -764,17 +714,7 @@
     end
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_user('apache') }
@@ -805,17 +745,7 @@
     }
   end
   context 'on all OSes' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '6',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     context 'with a custom apache_name parameter' do
       let :params do
@@ -900,11 +830,7 @@
     end
   end
   context 'with unsupported osfamily' do
-    let :facts do
-      { osfamily: 'Darwin',
-        operatingsystemrelease: '13.1.0',
-        is_pe: false }
-    end
+    include_examples 'Darwin'
 
     it { is_expected.to compile.and_raise_error(%r{Unsupported osfamily}) }
   end
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 4974211ce0..9d27c80658 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -7,66 +7,25 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystem: 'Debian',
-          operatingsystemrelease: '8',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
     end
     context 'on a RedHat 6-based OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/var\/www\/icons\/"}) }
     end
     context 'on a RedHat 7-based OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '7',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 7'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
     end
     context 'on a RedHat 8-based OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '8',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
@@ -75,23 +34,14 @@
       let :pre_condition do
         'class { apache: default_mods => false }'
       end
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '7',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
       let :params do
         {
           'icons_options' => 'foo',
         }
       end
 
+      include_examples 'RedHat 7'
+
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Options foo}) }
     end
@@ -99,38 +49,19 @@
       let :pre_condition do
         'class { apache: default_mods => false }'
       end
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '7',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
       let :params do
         {
           'icons_prefix' => 'apache-icons',
         }
       end
 
+      include_examples 'RedHat 7'
+
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/apache-icons\/ "\/usr\/share\/httpd\/icons\/"}) }
     end
     context 'on a FreeBSD OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'FreeBSD',
-          osfamily: 'FreeBSD',
-          operatingsystem: 'FreeBSD',
-          operatingsystemrelease: '10',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'FreeBSD 10'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/local\/www\/apache24\/icons\/"}) }
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index f9686b221a..d8328d8598 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -24,18 +24,7 @@
     end
 
     context 'on a Debian OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystem: 'Debian',
-          operatingsystemrelease: '8',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_cas') }
@@ -44,17 +33,7 @@
       it { is_expected.to contain_file('/var/cache/apache2/mod_auth_cas/').with_owner('www-data') }
     end
     context 'on a RedHat OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_cas') }
@@ -68,17 +47,7 @@
         "class { 'apache': } apache::vhost { 'test.server': docroot => '/var/www/html', cas_root_proxied_as => 'http://test.server', cas_cookie_path => '/my/cas/path'} "
       end
 
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_cas') }
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
index fbb0763a50..071ed76831 100644
--- a/spec/classes/mod/auth_gssapi_spec.rb
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -7,69 +7,28 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          lsbdistcodename: 'squeeze',
-          osfamily: 'Debian',
-          operatingsystem: 'Debian',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('libapache2-mod-auth-gssapi') }
     end
     context 'on a RedHat OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('mod_auth_gssapi') }
     end
     context 'on a FreeBSD OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'FreeBSD',
-          osfamily: 'FreeBSD',
-          operatingsystem: 'FreeBSD',
-          operatingsystemrelease: '9',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'FreeBSD 9'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('www/mod_auth_gssapi') }
     end
     context 'on a Gentoo OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'Gentoo',
-          operatingsystem: 'Gentoo',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          operatingsystemrelease: '3.16.1-gentoo',
-          is_pe: false,
-        }
-      end
+      include_examples 'Gentoo'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index a4a09dc11d..ea2fe8fe1e 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -7,69 +7,28 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystem: 'Debian',
-          operatingsystemrelease: '8',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
     end
     context 'on a RedHat OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('mod_auth_kerb') }
     end
     context 'on a FreeBSD OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'FreeBSD',
-          osfamily: 'FreeBSD',
-          operatingsystem: 'FreeBSD',
-          operatingsystemrelease: '9',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'FreeBSD 9'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('www/mod_auth_kerb2') }
     end
     context 'on a Gentoo OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'Gentoo',
-          operatingsystem: 'Gentoo',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          operatingsystemrelease: '3.16.1-gentoo',
-          is_pe: false,
-        }
-      end
+      include_examples 'Gentoo'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
@@ -78,17 +37,7 @@
   end
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
       let :pre_condition do
         <<-MANIFEST
         include apache::params
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index 1a915a08ed..c7358a45ed 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -6,19 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        fqdn: 'test.example.com',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('auth_mellon') }
@@ -47,18 +35,7 @@
     end
   end
   context 'default configuration with parameters on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        fqdn: 'test.example.com',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('auth_mellon') }
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index a0309da8d1..c8c90acad6 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -7,52 +7,21 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystem: 'Debian',
-          operatingsystemrelease: '8',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('libapache2-mod-auth-openidc') }
     end
     context 'on a RedHat OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('mod_auth_openidc') }
     end
     context 'on a FreeBSD OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'FreeBSD',
-          osfamily: 'FreeBSD',
-          operatingsystem: 'FreeBSD',
-          operatingsystemrelease: '9',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'FreeBSD 9'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
@@ -61,17 +30,7 @@
   end
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
       let :pre_condition do
         <<-MANIFEST
         include apache::params
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
index 0f78816f96..afd3901747 100644
--- a/spec/classes/mod/authn_dbd_spec.rb
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -23,18 +23,7 @@
     end
 
     context 'on a Debian OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystem: 'Debian',
-          operatingsystemrelease: '8',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('authn_dbd') }
@@ -43,17 +32,7 @@
     end
 
     context 'on a RedHat OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('authn_dbd') }
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index e6ecc50f03..dbd76c0e39 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -6,18 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters on a Debian OS' do
-    let :facts do
-      {
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        id: 'root',
-        kernel: 'Linux',
-        operatingsystem: 'Debian',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::mod::ldap') }
diff --git a/spec/classes/mod/authnz_pam_spec.rb b/spec/classes/mod/authnz_pam_spec.rb
index 92bc157bd3..4361fb649f 100644
--- a/spec/classes/mod/authnz_pam_spec.rb
+++ b/spec/classes/mod/authnz_pam_spec.rb
@@ -7,18 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS' do
-      let :facts do
-        {
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystemrelease: '8',
-          id: 'root',
-          kernel: 'Linux',
-          operatingsystem: 'Debian',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-authnz-pam') }
@@ -26,17 +15,7 @@
     end # Debian
 
     context 'on a RedHat OS' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '8',
-          id: 'root',
-          kernel: 'Linux',
-          operatingsystem: 'RedHat',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_authnz_pam') }
diff --git a/spec/classes/mod/cluster_spec.rb b/spec/classes/mod/cluster_spec.rb
index 998ab1d799..bf2ac85bf0 100644
--- a/spec/classes/mod/cluster_spec.rb
+++ b/spec/classes/mod/cluster_spec.rb
@@ -4,17 +4,7 @@
 
 describe 'apache::mod::cluster', type: :class do
   context 'on a RedHat OS Release 7 with mod version = 1.3.0' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '7',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 7'
 
     let(:params) do
       {
@@ -37,17 +27,7 @@
   end
 
   context 'on a RedHat OS Release 7 with mod version > 1.3.0' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '7',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 7'
 
     let(:params) do
       {
@@ -70,17 +50,7 @@
   end
 
   context 'on a RedHat OS Release 6 with mod version < 1.3.0' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     let(:params) do
       {
diff --git a/spec/classes/mod/data_spec.rb b/spec/classes/mod/data_spec.rb
index 4511996f4f..f849167507 100644
--- a/spec/classes/mod/data_spec.rb
+++ b/spec/classes/mod/data_spec.rb
@@ -4,17 +4,7 @@
 
 describe 'apache::mod::data', type: :class do
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
+    include_examples 'Debian 8'
     let :params do
       { apache_version: '2.4' }
     end
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 1d773b3b9c..68d6beded5 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -7,19 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS' do
-      let :facts do
-        {
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystemrelease: '8',
-          operatingsystemmajrelease: '8',
-          operatingsystem: 'Debian',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
@@ -40,18 +28,7 @@
       end
     end
     context 'on a RedHat OS' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystemmajrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
@@ -72,18 +49,7 @@
       end
     end
     context 'on a FreeBSD OS' do
-      let :facts do
-        {
-          osfamily: 'FreeBSD',
-          operatingsystemrelease: '9',
-          operatingsystemmajrelease: '9',
-          operatingsystem: 'FreeBSD',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'FreeBSD 9'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
@@ -105,17 +71,7 @@
       end
     end
     context 'on a Gentoo OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          operatingsystemrelease: '3.16.1-gentoo',
-          kernel: 'Linux',
-          osfamily: 'Gentoo',
-          operatingsystem: 'Gentoo',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Gentoo'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 1770cd6cc3..5c71e7a5e3 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -37,18 +37,7 @@ def general_deflate_specs
     end
 
     context 'On a Debian OS with default params' do
-      let :facts do
-        {
-          id: 'root',
-          lsbdistcodename: 'jessie',
-          kernel: 'Linux',
-          osfamily: 'Debian',
-          operatingsystem: 'Debian',
-          operatingsystemrelease: '8',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       # Load the more generic tests for this context
       general_deflate_specs
@@ -64,17 +53,7 @@ def general_deflate_specs
     end
 
     context 'on a RedHat OS with default params' do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'RedHat',
-          operatingsystemrelease: '6',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       # Load the more generic tests for this context
       general_deflate_specs
@@ -83,17 +62,7 @@ def general_deflate_specs
     end
 
     context 'On a FreeBSD OS with default params' do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'FreeBSD',
-          osfamily: 'FreeBSD',
-          operatingsystem: 'FreeBSD',
-          operatingsystemrelease: '9',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'FreeBSD 9'
 
       # Load the more generic tests for this context
       general_deflate_specs
@@ -105,17 +74,7 @@ def general_deflate_specs
     end
 
     context 'On a Gentoo OS with default params' do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'Gentoo',
-          operatingsystem: 'Gentoo',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          operatingsystemrelease: '3.16.1-gentoo',
-          is_pe: false,
-        }
-      end
+      include_examples 'Gentoo'
 
       # Load the more generic tests for this context
       general_deflate_specs
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 9294597cf4..7a1200e08f 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -11,24 +11,9 @@
 
   it_behaves_like 'a mod class, without including apache'
 
-  [
-    ['RedHat', '6', 'Santiago', 'Linux'],
-    ['Debian', '8', 'jessie', 'Linux'],
-    ['FreeBSD', '9', 'FreeBSD', 'FreeBSD'],
-  ].each do |osfamily, operatingsystemrelease, lsbdistcodename, kernel|
-    context "on a #{osfamily} OS" do
-      let :facts do
-        {
-          lsbdistcodename: lsbdistcodename,
-          osfamily: osfamily,
-          operatingsystem: osfamily,
-          operatingsystemrelease: operatingsystemrelease,
-          is_pe: false,
-          id: 'root',
-          path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
-          kernel: kernel,
-        }
-      end
+  ['RedHat 6', 'Debian 8', 'FreeBSD 9'].each do |os|
+    context "on a #{os} OS" do
+      include_examples os
 
       it { is_expected.to contain_class('apache::dev') }
     end
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 93d2246f57..9f1e533c4b 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -6,18 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        lsbdistcodename: 'jessie',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
@@ -40,17 +29,7 @@
     end
   end
   context 'default configuration with parameters on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'Redhat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
@@ -73,17 +52,7 @@
     end
   end
   context 'default configuration with parameters on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
@@ -106,17 +75,7 @@
     end
   end
   context 'default configuration with parameters on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 31ee6cd5d4..7ab6d48680 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -4,18 +4,7 @@
 
 describe 'apache::mod::disk_cache', type: :class do
   context 'on a Debian OS' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '8',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     let(:params) do
       {
@@ -61,17 +50,7 @@
   end
 
   context 'on a RedHat 6-based OS' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '6',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     let(:params) do
       {
@@ -111,17 +90,7 @@
     end
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'FreeBSD',
-        osfamily: 'FreeBSD',
-        operatingsystem: 'FreeBSD',
-        operatingsystemrelease: '10',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 10'
 
     let(:params) do
       {
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
index 4af592abe2..529e2aa083 100644
--- a/spec/classes/mod/dumpio_spec.rb
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -10,19 +10,8 @@
          mod_dir    => "/tmp/junk",
        }'
     end
-    let :facts do
-      {
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        operatingsystemmajrelease: '8',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+
+    include_examples 'Debian 8'
 
     context 'default configuration fore parameters' do
       it { is_expected.to compile }
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index da70fd440c..70073efc26 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -8,52 +8,21 @@
   end
 
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('event') }
     it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/event.conf').with_ensure('file') }
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('event') }
     it { is_expected.to contain_file('/etc/apache2/modules.d/event.conf').with_ensure('file') }
   end
   context 'on a Debian OS' do
-    let :facts do
-      {
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('event') }
@@ -178,17 +147,7 @@
     end
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     context 'with Apache version >= 2.4' do
       let :params do
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index c01ca25768..003a325514 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -6,18 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'with expires active', :compile do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '8',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_apache__mod('expires') }
     it { is_expected.to contain_file('expires.conf').with(content: %r{ExpiresActive On\n}) }
@@ -26,23 +15,14 @@
     let :pre_condition do
       'class { apache: default_mods => false }'
     end
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '7',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
     let :params do
       {
         'expires_default' => 'access plus 1 month',
       }
     end
 
+    include_examples 'RedHat 7'
+
     it { is_expected.to contain_apache__mod('expires') }
     it {
       is_expected.to contain_file('expires.conf').with_content(
@@ -55,17 +35,6 @@
     let :pre_condition do
       'class { apache: default_mods => false }'
     end
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '7',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
     let :params do
       {
         'expires_by_type' => [
@@ -75,6 +44,8 @@
       }
     end
 
+    include_examples 'RedHat 7'
+
     it { is_expected.to contain_apache__mod('expires') }
     it {
       is_expected.to contain_file('expires.conf').with_content(
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index 1d7d4c6dde..04d91bd840 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -5,19 +5,7 @@
 describe 'apache::mod::ext_filter', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        fqdn: 'test.example.com',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('ext_filter') }
@@ -34,18 +22,7 @@
     end
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        fqdn: 'test.example.com',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('ext_filter') }
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 08205ec45d..680bf787af 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -6,19 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        operatingsystemmajrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -28,18 +16,7 @@
   end
 
   context 'on a RHEL6' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystemmajrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     describe 'without parameters' do
       it { is_expected.to contain_class('apache::params') }
@@ -77,18 +54,7 @@
   end
 
   context 'on RHEL7' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '7',
-        operatingsystemmajrelease: '7',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 7'
 
     describe 'without parameters' do
       it { is_expected.to contain_class('apache::params') }
@@ -100,18 +66,7 @@
   end
 
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '10',
-        operatingsystemmajrelease: '10',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 10'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -121,17 +76,7 @@
   end
 
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it {
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
index 978eb63f0f..af3ff161c8 100644
--- a/spec/classes/mod/http2_spec.rb
+++ b/spec/classes/mod/http2_spec.rb
@@ -6,18 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters on a Debian OS' do
-    let :facts do
-      {
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        id: 'root',
-        kernel: 'Linux',
-        operatingsystem: 'Debian',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::mod::http2') }
     context 'with default values' do
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 5dc70f7139..316863a98f 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -124,18 +124,7 @@ def general_info_specs_apache24
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '6',
-        lsbdistcodename: 'squeeze',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 6'
 
     # Load the more generic tests for this context
     general_info_specs_apache22
@@ -151,17 +140,7 @@ def general_info_specs_apache24
   end
 
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     # Load the more generic tests for this context
     general_info_specs_apache22
@@ -173,17 +152,7 @@ def general_info_specs_apache24
   end
 
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '10',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 10'
 
     # Load the more generic tests for this context
     general_info_specs_apache24
@@ -195,17 +164,7 @@ def general_info_specs_apache24
   end
 
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     # Load the more generic tests for this context
     general_info_specs_apache24
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
index 45045cbd09..7d2d557171 100644
--- a/spec/classes/mod/intercept_form_submit_spec.rb
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -7,18 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS' do
-      let :facts do
-        {
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystemrelease: '8',
-          id: 'root',
-          kernel: 'Linux',
-          operatingsystem: 'Debian',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-intercept-form-submit') }
@@ -26,17 +15,7 @@
     end # Debian
 
     context 'on a RedHat OS' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          id: 'root',
-          kernel: 'Linux',
-          operatingsystem: 'RedHat',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_intercept_form_submit') }
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 0e7956e5b1..4812840cd6 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -8,18 +8,7 @@
   end
 
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
@@ -81,17 +70,7 @@
   end
 
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
@@ -156,18 +135,8 @@
       'class { "apache": mpm_module => false, }'
     end
 
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '10',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-        mpm_module: 'itk',
-      }
-    end
+    include_examples 'FreeBSD 10'
+    # TODO: fact mpm_module itk?
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 839a1f0c61..b6093ab18c 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -64,14 +64,7 @@
   altern8_port = 8008
 
   context 'Debian 8' do
-    let(:facts) do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '8',
-        ipaddress: default_ip,
-      }
-    end
+    include_examples 'Debian 8'
 
     context 'with only required facts and default parameters' do
       let(:facts) { super().merge('ipaddress' => default_ip) }
@@ -98,14 +91,7 @@
   end
 
   context 'RHEL 6' do
-    let(:facts) do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '6',
-        ipaddress: default_ip,
-      }
-    end
+    include_examples 'RedHat 6'
     let(:pre_condition) do
       'include apache'
     end
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index e95a33cfbc..fd14caceca 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -6,18 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'on a Debian OS' do
-    let :facts do
-      {
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        id: 'root',
-        kernel: 'Linux',
-        operatingsystem: 'Debian',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::mod::ldap') }
@@ -66,17 +55,7 @@
   end # Debian
 
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        id: 'root',
-        kernel: 'Linux',
-        operatingsystem: 'RedHat',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::mod::ldap') }
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
index 33c8017e3e..4557f99012 100644
--- a/spec/classes/mod/lookup_identity.rb
+++ b/spec/classes/mod/lookup_identity.rb
@@ -7,18 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS' do
-      let :facts do
-        {
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          operatingsystemrelease: '8',
-          id: 'root',
-          kernel: 'Linux',
-          operatingsystem: 'Debian',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-lookup-identity') }
@@ -26,17 +15,7 @@
     end # Debian
 
     context 'on a RedHat OS' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          id: 'root',
-          kernel: 'Linux',
-          operatingsystem: 'RedHat',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_lookup_identity') }
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index 28fcfe03cb..bba4cf4e81 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -11,18 +11,7 @@ def general_mime_magic_specs
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS with default params' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '6',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 6'
 
     general_mime_magic_specs
 
@@ -55,17 +44,7 @@ def general_mime_magic_specs
   end
 
   context 'on a RedHat OS with default params' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     general_mime_magic_specs
 
@@ -79,18 +58,7 @@ def general_mime_magic_specs
   end
 
   context 'with magic_file => /tmp/magic' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '6',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 6'
 
     let :params do
       { magic_file: '/tmp/magic' }
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index a2b5382439..b7b4525fce 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -18,18 +18,7 @@ def general_mime_specs
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS with default params', :compile do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     general_mime_specs
 
@@ -37,17 +26,7 @@ def general_mime_specs
   end
 
   context 'on a RedHat OS with default params', :compile do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     general_mime_specs
 
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 63c24acd86..8f27052610 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -5,18 +5,7 @@
 describe 'apache::mod::negotiation', type: :class do
   it_behaves_like 'a mod class, without including apache'
   describe 'OS independent tests' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        kernel: 'Linux',
-        lsbdistcodename: 'jessie',
-        operatingsystemrelease: '8',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     context 'default params' do
       it { is_expected.to contain_class('apache') }
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index a6c2629087..38e9809ef1 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -4,18 +4,7 @@
 
 describe 'apache::mod::pagespeed', type: :class do
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('pagespeed') }
@@ -39,17 +28,7 @@
   end
 
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('pagespeed') }
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index ddd004b687..d2f3d961d5 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -5,69 +5,28 @@
 describe 'apache::mod::perl', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
     it { is_expected.to contain_package('libapache2-mod-perl2') }
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
     it { is_expected.to contain_package('mod_perl') }
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
     it { is_expected.to contain_package('www/mod_perl2') }
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        operatingsystem: 'Gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index 2533a28bab..d514238044 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -8,32 +8,12 @@
   end
 
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '10',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 10'
 
     it { is_expected.to compile.and_raise_error(%r{Unsupported osfamily FreeBSD}) }
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('peruser') }
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index fdc8762a9c..83e27ed040 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -8,18 +8,7 @@
   end
 
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
@@ -54,17 +43,7 @@
     end
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
@@ -104,34 +83,14 @@
     end
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
     it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/prefork.conf').with_ensure('file') }
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index e4b1a72ce8..487394626a 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -24,18 +24,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
 
   context 'default configuration with default parameters' do
     context 'on a Debian OS' do
-      let :facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '8',
-          lsbdistcodename: 'jessie',
-          operatingsystem: 'Debian',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_apache__mod('proxy_balancer') }
 
@@ -44,17 +33,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
     end
 
     context 'on a RedHat OS' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_apache__mod('proxy_balancer') }
 
@@ -63,18 +42,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
     end
   end
   context "default configuration with custom parameters $manager => true, $allow_from => ['10.10.10.10','11.11.11.11'], $status_path => '/custom-manager' on a Debian OS" do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
     let :params do
       {
         manager: true,
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index b9fc082ea2..575f17d15c 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -11,22 +11,8 @@
 
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
-
     context 'with Apache version < 2.2' do
-      let :facts do
-        super().merge(operatingsystemrelease: '7.0',
-                      lsbdistcodename: 'wheezy')
-      end
+      include_examples 'Debian 7'
       let :params do
         {
           apache_version: '2.1',
@@ -36,10 +22,7 @@
       it { is_expected.not_to contain_apache__mod('proxy_connect') }
     end
     context 'with Apache version = 2.2' do
-      let :facts do
-        super().merge(operatingsystemrelease: '7.0',
-                      lsbdistcodename: 'wheezy')
-      end
+      include_examples 'Debian 7'
       let :params do
         {
           apache_version: '2.2',
@@ -49,10 +32,7 @@
       it { is_expected.to contain_apache__mod('proxy_connect') }
     end
     context 'with Apache version >= 2.4' do
-      let :facts do
-        super().merge(operatingsystemrelease: '8.0',
-                      lsbdistcodename: 'jessie')
-      end
+      include_examples 'Debian 8'
       let :params do
         {
           apache_version: '2.4',
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index c305aa31d2..a019416337 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -17,24 +17,11 @@
       it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: loadfiles) }
       it { is_expected.to contain_package('libapache2-mod-proxy-html') }
     end
-    let :facts do
-      {
-        osfamily: 'Debian',
-        architecture: 'i386',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        hardwaremodel: 'i386',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     context 'on jessie i386' do
       let(:facts) do
-        super().merge(operatingsystemrelease: '8',
-                      hardwaremodel: 'i686',
+        super().merge(hardwaremodel: 'i686',
                       architecture: 'i386')
       end
 
@@ -43,8 +30,7 @@
     end
     context 'on jessie x64' do
       let(:facts) do
-        super().merge(operatingsystemrelease: '8',
-                      hardwaremodel: 'x86_64',
+        super().merge(hardwaremodel: 'x86_64',
                       architecture: 'amd64')
       end
 
@@ -54,17 +40,7 @@
   end
 
   context 'on a RedHat OS', :compile do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
@@ -72,17 +48,7 @@
     it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
   end
   context 'on a FreeBSD OS', :compile do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
@@ -90,17 +56,7 @@
     it { is_expected.to contain_package('www/mod_proxy_html') }
   end
   context 'on a Gentoo OS', :compile do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index a433deb062..aa08c5dbc5 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -6,35 +6,14 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('python') }
     it { is_expected.to contain_package('libapache2-mod-python') }
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('python') }
@@ -50,34 +29,14 @@
     end
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('python') }
     it { is_expected.to contain_package('www/mod_python3') }
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('python') }
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index 3de472cbc9..f83c0f2f5a 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -4,17 +4,7 @@
 
 describe 'apache::mod::remoteip', type: :class do
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
+    include_examples 'Debian 8'
     let :params do
       { apache_version: '2.4' }
     end
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index 6dca3cb2d0..7d72ea706b 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -5,18 +5,7 @@
 describe 'apache::mod::reqtimeout', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        lsbdistcodename: 'jessie',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
@@ -43,17 +32,7 @@
     end
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'Redhat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
@@ -80,17 +59,7 @@
     end
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
@@ -117,17 +86,7 @@
     end
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index a36af731e6..44a8e2cd72 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -5,18 +5,7 @@
 describe 'apache::mod::rpaf', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
@@ -49,17 +38,7 @@
     end
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
@@ -92,17 +71,7 @@
     end
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index a6bbe46bf8..2ade2eb584 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -5,37 +5,14 @@
 describe 'apache::mod::shib', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        fqdn: 'test.example.com',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('shib2').with_id('mod_shib') }
     end
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        fqdn: 'test.example.com',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('shib2').with_id('mod_shib') }
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index f4a34e3fe2..2a698f0a4b 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -5,34 +5,13 @@
 describe 'apache::mod::speling', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_apache__mod('speling') }
   end
 
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_apache__mod('speling') }
   end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 36972364ca..bcf4fe9458 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -5,34 +5,14 @@
 describe 'apache::mod::ssl', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on an unsupported OS' do
-    let :facts do
-      {
-        osfamily: 'Magic',
-        operatingsystemrelease: '0',
-        operatingsystem: 'Magic',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Unsupported OS'
 
     it { is_expected.to compile.and_raise_error(%r{Unsupported osfamily:}) }
   end
 
   context 'on a RedHat' do
     context '6 OS' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('ssl') }
@@ -41,17 +21,7 @@
       it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv2 -SSLv3}) }
     end
     context '8 OS' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '8',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('ssl') }
@@ -60,17 +30,7 @@
       it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all}) }
     end
     context '6 OS with a custom package_name parameter' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
       let :params do
         { package_name: 'httpd24-mod_ssl' }
       end
@@ -83,17 +43,7 @@
     end
 
     context '7 OS with custom directories for PR#1635' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '7',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 7'
       let :pre_condition do
         "class { 'apache':
           confd_dir           => '/etc/httpd/conf.puppet.d',
@@ -110,18 +60,7 @@
   end
 
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
@@ -129,34 +68,14 @@
     it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv2 -SSLv3}) }
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
   end
 
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
@@ -164,17 +83,7 @@
   end
 
   context 'on a Suse OS' do
-    let :facts do
-      {
-        osfamily: 'Suse',
-        operatingsystem: 'SLES',
-        operatingsystemrelease: '12',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'SLES 12'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
@@ -182,17 +91,7 @@
   end
   # Template config doesn't vary by distro
   context 'on all distros' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'CentOS',
-        operatingsystemrelease: '6',
-        kernel: 'Linux',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     context 'not setting ssl_pass_phrase_dialog' do
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLPassPhraseDialog builtin$}) }
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 540db78a7a..6fb3f69038 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -69,18 +69,7 @@ def require_directives(requires)
 
   context 'default configuration with parameters' do
     context 'on a Debian 6 OS' do
-      let :facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '6',
-          lsbdistcodename: 'squeeze',
-          operatingsystem: 'Debian',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 6'
 
       context 'with default params' do
         it { is_expected.to contain_apache__mod('status') }
@@ -123,17 +112,6 @@ def require_directives(requires)
       end
 
       context "with invalid parameter type $allow_from => '10.10.10.10'" do
-        let :facts do
-          {
-            osfamily: 'Debian',
-            operatingsystemrelease: '6',
-            operatingsystem: 'Debian',
-            id: 'root',
-            kernel: 'Linux',
-            path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-            is_pe: false,
-          }
-        end
         let :params do
           { allow_from: '10.10.10.10' }
         end
@@ -170,17 +148,7 @@ def require_directives(requires)
     end
 
     context 'on a RedHat 6 OS' do
-      let :facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
 
       context 'with default params' do
         it { is_expected.to contain_apache__mod('status') }
@@ -224,18 +192,7 @@ def require_directives(requires)
         end
 
         context 'on a Debian 8 OS' do
-          let :facts do
-            {
-              osfamily: 'Debian',
-              operatingsystemrelease: '8',
-              lsbdistcodename: 'squeeze',
-              operatingsystem: 'Debian',
-              id: 'root',
-              kernel: 'Linux',
-              path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-              is_pe: false,
-            }
-          end
+          include_examples 'Debian 8'
 
           it { is_expected.to contain_apache__mod('status') }
 
@@ -253,17 +210,7 @@ def require_directives(requires)
         end
 
         context 'on a RedHat 7 OS' do
-          let :facts do
-            {
-              osfamily: 'RedHat',
-              operatingsystemrelease: '7',
-              operatingsystem: 'RedHat',
-              id: 'root',
-              kernel: 'Linux',
-              path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-              is_pe: false,
-            }
-          end
+          include_examples 'RedHat 7'
 
           it { is_expected.to contain_apache__mod('status') }
 
@@ -273,17 +220,7 @@ def require_directives(requires)
         end
 
         context 'on a RedHat 8 OS' do
-          let :facts do
-            {
-              osfamily: 'RedHat',
-              operatingsystemrelease: '8',
-              operatingsystem: 'RedHat',
-              id: 'root',
-              kernel: 'Linux',
-              path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-              is_pe: false,
-            }
-          end
+          include_examples 'RedHat 8'
 
           it { is_expected.to contain_apache__mod('status') }
 
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 848dc72544..73c01a137b 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -10,19 +10,8 @@
          mod_dir      => "/tmp/junk",
        }'
     end
-    let :facts do
-      {
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        operatingsystemmajrelease: '8',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+
+    include_examples 'Debian 8'
 
     context 'default parameters' do
       it { is_expected.to compile }
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 8ab2090051..c1ffa7ac29 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -8,18 +8,7 @@
   end
 
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
@@ -54,17 +43,7 @@
     end
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
@@ -98,34 +77,14 @@
     end
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
     it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/worker.conf').with_ensure('file') }
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
@@ -134,17 +93,7 @@
 
   # Template config doesn't vary by distro
   context 'on all distros' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystem: 'CentOS',
-        operatingsystemrelease: '6',
-        kernel: 'Linux',
-        id: 'root',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     context 'defaults' do
       it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index fb018099cd..b8fadb1026 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -5,18 +5,7 @@
 describe 'apache::mod::wsgi', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -27,17 +16,7 @@
     it { is_expected.to contain_package('libapache2-mod-wsgi') }
   end
   context 'on a RedHat OS' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -48,9 +27,7 @@
     it { is_expected.to contain_package('mod_wsgi') }
 
     context 'on RHEL8' do
-      let(:facts) do
-        super().merge(operatingsystemrelease: '8')
-      end
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module modules/mod_wsgi_python3.so}) }
@@ -141,17 +118,7 @@
     end
   end
   context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -162,17 +129,7 @@
     it { is_expected.to contain_package('www/mod_wsgi') }
   end
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -184,17 +141,7 @@
   end
   context 'overriding mod_libs' do
     context 'on a RedHat OS', :compile do
-      let :facts do
-        {
-          id: 'root',
-          kernel: 'Linux',
-          osfamily: 'RedHat',
-          operatingsystem: 'Fedora',
-          operatingsystemrelease: '28',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Fedora 28'
       let :pre_condition do
         <<-MANIFEST
         include apache::params
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index ef0c06b5cc..a2a876ee70 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -4,18 +4,7 @@
 
 describe 'apache::params', type: :class do
   context 'On a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to have_resource_count(0) }
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index d446f66703..564c0f00a0 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -8,18 +8,7 @@
   end
 
   context 'on a Debian OS' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     it {
       is_expected.to contain_service('httpd').with(
@@ -107,17 +96,7 @@
   end
 
   context 'on a RedHat 5 OS, do not manage service' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '5',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 5'
     let(:params) do
       {
         'service_ensure' => 'running',
@@ -129,18 +108,8 @@
     it { is_expected.not_to contain_service('httpd') }
   end
 
-  context 'on a FreeBSD 5 OS' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+  context 'on a FreeBSD 9 OS' do
+    include_examples 'FreeBSD 9'
 
     it {
       is_expected.to contain_service('httpd').with(
@@ -152,17 +121,7 @@
   end
 
   context 'on a Gentoo OS' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     it {
       is_expected.to contain_service('httpd').with(
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
index 673028b8ac..42a5ed9002 100644
--- a/spec/classes/vhosts_spec.rb
+++ b/spec/classes/vhosts_spec.rb
@@ -4,17 +4,7 @@
 
 describe 'apache::vhosts', type: :class do
   context 'on all OSes' do
-    let :facts do
-      {
-        id: 'root',
-        kernel: 'Linux',
-        osfamily: 'RedHat',
-        operatingsystem: 'RedHat',
-        operatingsystemrelease: '6',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     context 'with custom vhosts parameter' do
       let :params do
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index 7ba64a8a99..5d8054695b 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -6,18 +6,8 @@
   let :title do
     'myapp'
   end
-  let :facts do
-    {
-      osfamily: 'Debian',
-      operatingsystem: 'Debian',
-      operatingsystemrelease: '8',
-      lsbdistcodename: 'jessie',
-      id: 'root',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      kernel: 'Linux',
-      is_pe: false,
-    }
-  end
+
+  include_examples 'Debian 8'
 
   describe 'apache pre_condition with defaults' do
     let :pre_condition do
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 8458d3f3f3..23d169a0de 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -6,18 +6,8 @@
   let :pre_condition do
     'include apache'
   end
-  let :facts do
-    {
-      osfamily: 'Debian',
-      operatingsystem: 'Debian',
-      operatingsystemrelease: '8',
-      lsbdistcodename: 'jessie',
-      id: 'root',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      kernel: 'Linux',
-      is_pe: false,
-    }
-  end
+
+  include_examples 'Debian 8'
 
   describe 'allows multiple balancermembers with the same url' do
     let :pre_condition do
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 9011fd68f3..791c5abd47 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -9,18 +9,8 @@
   let :title do
     'rspec'
   end
-  let :facts do
-    {
-      osfamily: 'Debian',
-      operatingsystemrelease: '8',
-      lsbdistcodename: 'jessie',
-      operatingsystem: 'Debian',
-      id: 'root',
-      kernel: 'Linux',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      is_pe: false,
-    }
-  end
+
+  include_examples 'Debian 8'
 
   context 'defaults with content' do
     let :params do
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index e4c11af57a..ab2fd74dd1 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -8,17 +8,7 @@
   end
 
   context 'on a RedHat osfamily' do
-    let :facts do
-      {
-        osfamily: 'RedHat',
-        operatingsystemrelease: '6',
-        operatingsystem: 'RedHat',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'RedHat 6'
 
     describe 'for non-special modules' do
       let :title do
@@ -62,18 +52,7 @@
   end
 
   context 'on a Debian osfamily' do
-    let :facts do
-      {
-        osfamily: 'Debian',
-        operatingsystemrelease: '8',
-        lsbdistcodename: 'jessie',
-        operatingsystem: 'Debian',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Debian 8'
 
     describe 'for non-special modules' do
       let :title do
@@ -99,17 +78,7 @@
   end
 
   context 'on a FreeBSD osfamily' do
-    let :facts do
-      {
-        osfamily: 'FreeBSD',
-        operatingsystemrelease: '9',
-        operatingsystem: 'FreeBSD',
-        id: 'root',
-        kernel: 'FreeBSD',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'FreeBSD 9'
 
     describe 'for non-special modules' do
       let :title do
@@ -128,17 +97,7 @@
   end
 
   context 'on a Gentoo osfamily' do
-    let :facts do
-      {
-        osfamily: 'Gentoo',
-        operatingsystem: 'Gentoo',
-        operatingsystemrelease: '3.16.1-gentoo',
-        id: 'root',
-        kernel: 'Linux',
-        path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-        is_pe: false,
-      }
-    end
+    include_examples 'Gentoo'
 
     describe 'for non-special modules' do
       let :title do
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 962e12da3e..527719289b 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -14,37 +14,14 @@
 
   describe 'os-dependent items' do
     context 'on RedHat based systems' do
-      let :default_facts do
-        {
-          osfamily: 'RedHat',
-          operatingsystemrelease: '6',
-          operatingsystem: 'RedHat',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'RedHat 6'
       let(:params) { default_params }
-      let(:facts) { default_facts }
 
       it { is_expected.to compile }
     end
     context 'on Debian based systems' do
-      let :default_facts do
-        {
-          osfamily: 'Debian',
-          operatingsystemrelease: '8',
-          lsbdistcodename: 'jessie',
-          operatingsystem: 'Debian',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Debian 8'
       let(:params) { default_params }
-      let(:facts) { default_facts }
 
       it {
         is_expected.to contain_file('apache_rspec.example.com').with(
@@ -62,19 +39,8 @@
       }
     end
     context 'on FreeBSD systems' do
-      let :default_facts do
-        {
-          osfamily: 'FreeBSD',
-          operatingsystemrelease: '9',
-          operatingsystem: 'FreeBSD',
-          id: 'root',
-          kernel: 'FreeBSD',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'FreeBSD 9'
       let(:params) { default_params }
-      let(:facts) { default_facts }
 
       it {
         is_expected.to contain_file('apache_rspec.example.com').with(
@@ -85,19 +51,8 @@
       }
     end
     context 'on Gentoo systems' do
-      let :default_facts do
-        {
-          osfamily: 'Gentoo',
-          operatingsystem: 'Gentoo',
-          operatingsystemrelease: '3.16.1-gentoo',
-          id: 'root',
-          kernel: 'Linux',
-          path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-          is_pe: false,
-        }
-      end
+      include_examples 'Gentoo'
       let(:params) { default_params }
-      let(:facts) { default_facts }
 
       it {
         is_expected.to contain_file('apache_rspec.example.com').with(
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 0c6b56b930..75a932c16e 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -36,3 +36,234 @@
 shared_context 'a mod class, without including apache' do
   let(:facts) { on_supported_os['debian-8-x86_64'] }
 end
+
+shared_context 'Debian 6' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'Debian',
+      operatingsystem: 'Debian',
+      operatingsystemrelease: '6',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'Debian 7' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'Debian',
+      operatingsystem: 'Debian',
+      operatingsystemrelease: '7.0.0',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'Debian 8' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'Debian',
+      operatingsystem: 'Debian',
+      operatingsystemrelease: '8.0.0',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'Ubuntu 14.04' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'Debian',
+      operatingsystem: 'Ubuntu',
+      operatingsystemrelease: '14.04',
+      lsbdistrelease: '14.04',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'RedHat 5' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'RedHat',
+      operatingsystem: 'RedHat',
+      operatingsystemrelease: '5',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'RedHat 6' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'RedHat',
+      operatingsystem: 'RedHat',
+      operatingsystemrelease: '6',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'RedHat 7' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'RedHat',
+      operatingsystem: 'RedHat',
+      operatingsystemrelease: '7',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'RedHat 8' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'RedHat',
+      operatingsystem: 'RedHat',
+      operatingsystemrelease: '8',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'Fedora 17' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'RedHat',
+      operatingsystem: 'Fedora',
+      operatingsystemrelease: '17',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'Fedora 21' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'RedHat',
+      operatingsystem: 'Fedora',
+      operatingsystemrelease: '21',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'Fedora 28' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'RedHat',
+      operatingsystem: 'Fedora',
+      operatingsystemrelease: '28',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'Fedora Rawhide' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'RedHat',
+      operatingsystem: 'Fedora',
+      operatingsystemrelease: 'Rawhide',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'FreeBSD 9' do
+  let :facts do
+    {
+      osfamily: 'FreeBSD',
+      operatingsystemrelease: '9',
+      operatingsystem: 'FreeBSD',
+      id: 'root',
+      kernel: 'FreeBSD',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'FreeBSD 10' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'FreeBSD',
+      osfamily: 'FreeBSD',
+      operatingsystem: 'FreeBSD',
+      operatingsystemrelease: '10',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'Gentoo' do
+  let :facts do
+    {
+      id: 'root',
+      kernel: 'Linux',
+      osfamily: 'Gentoo',
+      operatingsystem: 'Gentoo',
+      operatingsystemrelease: '3.16.1-gentoo',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+    }
+  end
+end
+
+shared_context 'Darwin' do
+  let :facts do
+    {
+      osfamily: 'Darwin',
+      operatingsystemrelease: '13.1.0',
+    }
+  end
+end
+
+shared_context 'Unsupported OS' do
+  let :facts do
+    {
+      osfamily: 'Magic',
+      operatingsystemrelease: '0',
+      operatingsystem: 'Magic',
+      id: 'root',
+      kernel: 'Linux',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  end
+end
+
+shared_context 'SLES 12' do
+  let :facts do
+    {
+      osfamily: 'Suse',
+      operatingsystem: 'SLES',
+      operatingsystemrelease: '12',
+      id: 'root',
+      kernel: 'Linux',
+      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+    }
+  end
+end

From 2a75887712044d10fe9a73417a3fa5df4e53c92f Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 00:19:28 +0100
Subject: [PATCH 1751/2267] Use rspec better for shorter specs

---
 spec/defines/custom_config_spec.rb |  52 +++----
 spec/defines/mod_spec.rb           |  23 +--
 spec/defines/vhost_custom_spec.rb  |   6 +-
 spec/defines/vhost_spec.rb         | 238 ++++-------------------------
 4 files changed, 55 insertions(+), 264 deletions(-)

diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 791c5abd47..59119a53ab 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -20,21 +20,21 @@
     end
 
     it {
-      is_expected.to contain_exec('syntax verification for rspec').with('refreshonly' => 'true',
-                                                                        'subscribe'   => 'File[apache_rspec]',
-                                                                        'command'     => '/usr/sbin/apachectl -t',
-                                                                        'notify'      => 'Class[Apache::Service]',
-                                                                        'before'      => 'Exec[remove rspec if invalid]')
+      is_expected.to contain_exec('syntax verification for rspec')
+        .with('refreshonly' => 'true', 'command' => '/usr/sbin/apachectl -t')
+        .that_subscribes_to('File[apache_rspec]')
+        .that_notifies('Class[Apache::Service]')
+        .that_comes_before('Exec[remove rspec if invalid]')
     }
     it {
-      is_expected.to contain_exec('remove rspec if invalid').with('unless' => '/usr/sbin/apachectl -t',
-                                                                  'subscribe'   => 'File[apache_rspec]',
-                                                                  'refreshonly' => 'true')
+      is_expected.to contain_exec('remove rspec if invalid')
+        .with('unless' => '/usr/sbin/apachectl -t', 'refreshonly' => 'true')
+        .that_subscribes_to('File[apache_rspec]')
     }
     it {
-      is_expected.to contain_file('apache_rspec').with('ensure' => 'present',
-                                                       'content' => '# Test',
-                                                       'require' => 'Package[httpd]')
+      is_expected.to contain_file('apache_rspec')
+        .with('ensure' => 'present', 'content' => '# Test')
+        .that_requires('Package[httpd]')
     }
   end
   context 'set everything with source' do
@@ -55,10 +55,11 @@
                                                                   'unless' => '/bin/true')
     }
     it {
-      is_expected.to contain_file('apache_rspec').with('path' => '/dne/30-rspec.conf',
-                                                       'ensure' => 'present',
-                                                       'source' => 'puppet:///modules/apache/test',
-                                                       'require' => 'Package[httpd]')
+      is_expected.to contain_file('apache_rspec')
+        .that_requires('Package[httpd]')
+        .with('path' => '/dne/30-rspec.conf',
+              'ensure' => 'present',
+              'source' => 'puppet:///modules/apache/test')
     }
   end
   context 'verify_config => false' do
@@ -71,9 +72,7 @@
 
     it { is_expected.not_to contain_exec('syntax verification for rspec') }
     it { is_expected.not_to contain_exec('remove rspec if invalid') }
-    it {
-      is_expected.to contain_file('apache_rspec').with('notify' => 'Class[Apache::Service]')
-    }
+    it { is_expected.to contain_file('apache_rspec').that_notifies('Class[Apache::Service]') }
   end
   context 'ensure => absent' do
     let :params do
@@ -84,9 +83,7 @@
 
     it { is_expected.not_to contain_exec('syntax verification for rspec') }
     it { is_expected.not_to contain_exec('remove rspec if invalid') }
-    it {
-      is_expected.to contain_file('apache_rspec').with('ensure' => 'absent')
-    }
+    it { is_expected.to contain_file('apache_rspec').with('ensure' => 'absent') }
   end
   describe 'validation' do
     context 'both content and source' do
@@ -97,18 +94,11 @@
         }
       end
 
-      it do
-        expect {
-          catalogue
-        }.to raise_error(Puppet::Error, %r{Only one of \$content and \$source can be specified\.})
-      end
+      it { is_expected.to compile.and_raise_error(%r{Only one of \$content and \$source can be specified\.}) }
     end
+
     context 'neither content nor source' do
-      it do
-        expect {
-          catalogue
-        }.to raise_error(Puppet::Error, %r{One of \$content and \$source must be specified\.})
-      end
+      it { is_expected.to compile.and_raise_error(%r{One of \$content and \$source must be specified\.}) }
     end
   end
 end
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index ab2fd74dd1..14a7e2929a 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -7,14 +7,14 @@
     'include apache'
   end
 
+  let :title do
+    'spec_m'
+  end
+
   context 'on a RedHat osfamily' do
     include_examples 'RedHat 6'
 
     describe 'for non-special modules' do
-      let :title do
-        'spec_m'
-      end
-
       it { is_expected.to contain_class('apache::params') }
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(path: '/etc/httpd/conf.d/spec_m.load',
@@ -29,9 +29,6 @@
       let :pre_condition do
         "class {'::apache': file_mode => '0640'}"
       end
-      let :title do
-        'spec_m'
-      end
 
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(mode: '0640')
@@ -55,10 +52,6 @@
     include_examples 'Debian 8'
 
     describe 'for non-special modules' do
-      let :title do
-        'spec_m'
-      end
-
       it { is_expected.to contain_class('apache::params') }
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(path: '/etc/apache2/mods-available/spec_m.load',
@@ -81,10 +74,6 @@
     include_examples 'FreeBSD 9'
 
     describe 'for non-special modules' do
-      let :title do
-        'spec_m'
-      end
-
       it { is_expected.to contain_class('apache::params') }
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(path: '/usr/local/etc/apache24/Modules/spec_m.load',
@@ -100,10 +89,6 @@
     include_examples 'Gentoo'
 
     describe 'for non-special modules' do
-      let :title do
-        'spec_m'
-      end
-
       it { is_expected.to contain_class('apache::params') }
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(path: '/etc/apache2/modules.d/spec_m.load',
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 527719289b..c5db0b82a1 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -6,7 +6,7 @@
   let :title do
     'rspec.example.com'
   end
-  let :default_params do
+  let(:params) do
     {
       content: 'foobar',
     }
@@ -15,13 +15,11 @@
   describe 'os-dependent items' do
     context 'on RedHat based systems' do
       include_examples 'RedHat 6'
-      let(:params) { default_params }
 
       it { is_expected.to compile }
     end
     context 'on Debian based systems' do
       include_examples 'Debian 8'
-      let(:params) { default_params }
 
       it {
         is_expected.to contain_file('apache_rspec.example.com').with(
@@ -40,7 +38,6 @@
     end
     context 'on FreeBSD systems' do
       include_examples 'FreeBSD 9'
-      let(:params) { default_params }
 
       it {
         is_expected.to contain_file('apache_rspec.example.com').with(
@@ -52,7 +49,6 @@
     end
     context 'on Gentoo systems' do
       include_examples 'Gentoo'
-      let(:params) { default_params }
 
       it {
         is_expected.to contain_file('apache_rspec.example.com').with(
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index a6ce2b291b..7d6e49bc5d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2119,247 +2119,74 @@
           end
         end # error logs format
         describe 'validation' do
-          context 'bad ensure' do
-            let :params do
-              {
-                'docroot' => '/rspec/docroot',
-                'ensure'  => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad suphp_engine' do
-            let :params do
-              {
-                'docroot'      => '/rspec/docroot',
-                'suphp_engine' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad ip_based' do
-            let :params do
-              {
-                'docroot'  => '/rspec/docroot',
-                'ip_based' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad access_log' do
-            let :params do
-              {
-                'docroot'    => '/rspec/docroot',
-                'access_log' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad error_log' do
-            let :params do
-              {
-                'docroot'   => '/rspec/docroot',
-                'error_log' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad_ssl' do
-            let :params do
-              {
-                'docroot' => '/rspec/docroot',
-                'ssl'     => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
+          let(:params) do
+            {
+              'docroot' => '/rspec/docroot',
+            }
           end
-          context 'bad default_vhost' do
-            let :params do
-              {
-                'docroot'       => '/rspec/docroot',
-                'default_vhost' => 'bogus',
-              }
-            end
 
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad ssl_proxyengine' do
-            let :params do
-              {
-                'docroot'         => '/rspec/docroot',
-                'ssl_proxyengine' => 'bogus',
-              }
+          [
+            'ensure', 'suphp_engine', 'ip_based', 'access_log', 'error_log',
+            'ssl', 'default_vhost', 'ssl_proxyengine', 'rewrites', 'suexec_user_group',
+            'wsgi_script_alias', 'wsgi_daemon_process_options',
+            'wsgi_import_script_alias', 'itk', 'logroot_ensure', 'log_level',
+            'fallbackresource'
+          ].each do |parameter|
+            context "bad #{parameter}" do
+              let(:params) { super().merge(parameter => 'bogus') }
+
+              it { is_expected.to raise_error(Puppet::Error) }
             end
-
-            it { is_expected.to raise_error(Puppet::Error) }
           end
-          context 'bad rewrites' do
-            let :params do
-              {
-                'docroot'  => '/rspec/docroot',
-                'rewrites' => 'bogus',
-              }
-            end
 
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
           context 'bad rewrites 2' do
-            let :params do
-              {
-                'docroot'  => '/rspec/docroot',
-                'rewrites' => ['bogus'],
-              }
-            end
+            let(:params) { super().merge('rewrites' => ['bogus']) }
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
           context 'empty rewrites' do
-            let :params do
-              {
-                'docroot'  => '/rspec/docroot',
-                'rewrites' => [],
-              }
-            end
+            let(:params) { super().merge('rewrites' => []) }
 
             it { is_expected.to compile }
           end
-          context 'bad suexec_user_group' do
-            let :params do
-              {
-                'docroot'           => '/rspec/docroot',
-                'suexec_user_group' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad wsgi_script_alias' do
-            let :params do
-              {
-                'docroot'           => '/rspec/docroot',
-                'wsgi_script_alias' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad wsgi_daemon_process_options' do
-            let :params do
-              {
-                'docroot'                     => '/rspec/docroot',
-                'wsgi_daemon_process_options' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad wsgi_import_script_alias' do
-            let :params do
-              {
-                'docroot'                  => '/rspec/docroot',
-                'wsgi_import_script_alias' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad itk' do
-            let :params do
-              {
-                'docroot' => '/rspec/docroot',
-                'itk'     => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad logroot_ensure' do
-            let :params do
-              {
-                'docroot'   => '/rspec/docroot',
-                'log_level' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad log_level' do
-            let :params do
-              {
-                'docroot'   => '/rspec/docroot',
-                'log_level' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
           context 'bad error_log_format flag' do
             let :params do
-              {
-                'docroot'   => '/rspec/docroot',
+              super().merge(
                 'error_log_format' => [
                   { 'some format' => 'bogus' },
                 ],
-              }
+              )
             end
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
           context 'access_log_file and access_log_pipe' do
             let :params do
-              {
-                'docroot'         => '/rspec/docroot',
+              super().merge(
                 'access_log_file' => 'bogus',
                 'access_log_pipe' => 'bogus',
-              }
+              )
             end
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
           context 'error_log_file and error_log_pipe' do
             let :params do
-              {
-                'docroot'        => '/rspec/docroot',
+              super().merge(
                 'error_log_file' => 'bogus',
                 'error_log_pipe' => 'bogus',
-              }
-            end
-
-            it { is_expected.to raise_error(Puppet::Error) }
-          end
-          context 'bad fallbackresource' do
-            let :params do
-              {
-                'docroot'          => '/rspec/docroot',
-                'fallbackresource' => 'bogus',
-              }
+              )
             end
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
           context 'bad custom_fragment' do
-            let :params do
-              {
-                'docroot'         => '/rspec/docroot',
-                'custom_fragment' => true,
-              }
-            end
+            let(:params) { super().merge('custom_fragment' => true) }
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
           context 'bad access_logs' do
-            let :params do
-              {
-                'docroot'     => '/rspec/docroot',
-                'access_logs' => '/var/log/somewhere',
-              }
-            end
+            let(:params) { super().merge('access_logs' => '/var/log/somewhere') }
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
@@ -2414,31 +2241,24 @@
             }
           end
           describe 'redirectmatch_*' do
-            let :dparams do
-              {
-                docroot: '/rspec/docroot',
-                port: '84',
-              }
-            end
+            let(:params) { super().merge(port: '84') }
 
             context 'status' do
-              let(:params) { dparams.merge(redirectmatch_status: '404') }
+              let(:params) { super().merge(redirectmatch_status: '404') }
 
               it { is_expected.to contain_class('apache::mod::alias') }
             end
             context 'dest' do
-              let(:params) { dparams.merge(redirectmatch_dest: 'http://other.example.com$1.jpg') }
+              let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg') }
 
               it { is_expected.to contain_class('apache::mod::alias') }
             end
             context 'regexp' do
-              let(:params) { dparams.merge(redirectmatch_regexp: "(.*)\.gif$") }
+              let(:params) { super().merge(redirectmatch_regexp: "(.*)\.gif$") }
 
               it { is_expected.to contain_class('apache::mod::alias') }
             end
             context 'none' do
-              let(:params) { dparams }
-
               it { is_expected.not_to contain_class('apache::mod::alias') }
             end
           end

From a0f41cd8678b7ca1e5c8fb72c6af8bb2fa4d5202 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 00:33:57 +0100
Subject: [PATCH 1752/2267] Use facts from rspec-puppet-facts where possible

These operating systems are listed in metadata.json and thus can use
facts from rspec-puppet-facts.
---
 spec/spec_helper_local.rb | 55 ++++-----------------------------------
 1 file changed, 5 insertions(+), 50 deletions(-)

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 75a932c16e..7b559a80d5 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -64,16 +64,7 @@
 end
 
 shared_context 'Debian 8' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'Debian',
-      operatingsystem: 'Debian',
-      operatingsystemrelease: '8.0.0',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
+  let(:facts) { on_supported_os['debian-8-x86_64'] }
 end
 
 shared_context 'Ubuntu 14.04' do
@@ -104,42 +95,15 @@
 end
 
 shared_context 'RedHat 6' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'RedHat',
-      operatingsystem: 'RedHat',
-      operatingsystemrelease: '6',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
+  let(:facts) { on_supported_os['redhat-6-x86_64'] }
 end
 
 shared_context 'RedHat 7' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'RedHat',
-      operatingsystem: 'RedHat',
-      operatingsystemrelease: '7',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
+  let(:facts) { on_supported_os['redhat-7-x86_64'] }
 end
 
 shared_context 'RedHat 8' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'RedHat',
-      operatingsystem: 'RedHat',
-      operatingsystemrelease: '8',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
+  let(:facts) { on_supported_os['redhat-8-x86_64'] }
 end
 
 shared_context 'Fedora 17' do
@@ -256,14 +220,5 @@
 end
 
 shared_context 'SLES 12' do
-  let :facts do
-    {
-      osfamily: 'Suse',
-      operatingsystem: 'SLES',
-      operatingsystemrelease: '12',
-      id: 'root',
-      kernel: 'Linux',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
-    }
-  end
+  let(:facts) { on_supported_os['sles-12-x86_64'] }
 end

From be0505496c4b45101db56b80649a86cb54ba5174 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 00:49:00 +0100
Subject: [PATCH 1753/2267] Remove OS fact differences in proxy_connect_spec

Using `it_behaves_like` creates a new scope and runs those tests in them.
`a mod class, including apache` is a shared context and doesn't contain
any tests. When using `include_examples`, you can actually inherit the
context.

It then goes a step further and reuses that context in every test. This
works because the Apache version is a parameter so it doesn't matter.

After that, nothing refers to the Debian 7 facts anymore and can be
cleaned up.
---
 spec/classes/mod/proxy_connect_spec.rb | 48 ++++++++++++--------------
 spec/spec_helper_local.rb              | 13 -------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index 575f17d15c..cb433f0677 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -9,37 +9,33 @@
     ]
   end
 
-  it_behaves_like 'a mod class, without including apache'
-  context 'on a Debian OS' do
-    context 'with Apache version < 2.2' do
-      include_examples 'Debian 7'
-      let :params do
-        {
-          apache_version: '2.1',
-        }
-      end
+  include_examples 'a mod class, without including apache'
 
-      it { is_expected.not_to contain_apache__mod('proxy_connect') }
+  context 'with Apache version < 2.2' do
+    let :params do
+      {
+        apache_version: '2.1',
+      }
     end
-    context 'with Apache version = 2.2' do
-      include_examples 'Debian 7'
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
 
-      it { is_expected.to contain_apache__mod('proxy_connect') }
+    it { is_expected.not_to contain_apache__mod('proxy_connect') }
+  end
+  context 'with Apache version = 2.2' do
+    let :params do
+      {
+        apache_version: '2.2',
+      }
     end
-    context 'with Apache version >= 2.4' do
-      include_examples 'Debian 8'
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
 
-      it { is_expected.to contain_apache__mod('proxy_connect') }
+    it { is_expected.to contain_apache__mod('proxy_connect') }
+  end
+  context 'with Apache version >= 2.4' do
+    let :params do
+      {
+        apache_version: '2.4',
+      }
     end
+
+    it { is_expected.to contain_apache__mod('proxy_connect') }
   end
 end
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 7b559a80d5..fa79367c1a 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -50,19 +50,6 @@
   end
 end
 
-shared_context 'Debian 7' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'Debian',
-      operatingsystem: 'Debian',
-      operatingsystemrelease: '7.0.0',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
-end
-
 shared_context 'Debian 8' do
   let(:facts) { on_supported_os['debian-8-x86_64'] }
 end

From 0cd8b4013457413ef1a7a7890340e61eb5d33833 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 00:58:20 +0100
Subject: [PATCH 1754/2267] Replace Debian 6 tests with Debian 8

Debian 6 is no longer supported according to metadata.json so it doesn't
make sense to test it. Debian 8 is. This cleans it up.
---
 spec/classes/apache_spec.rb          | 27 +++++++++------------------
 spec/classes/mod/auth_gssapi_spec.rb |  2 +-
 spec/classes/mod/auth_kerb_spec.rb   |  2 +-
 spec/classes/mod/info_spec.rb        |  4 ++--
 spec/classes/mod/mime_magic_spec.rb  |  4 ++--
 spec/classes/mod/status_spec.rb      |  8 ++++----
 spec/spec_helper_local.rb            | 13 -------------
 7 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 3fb67b3bdf..25c88f07a2 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache', type: :class do
   context 'on a Debian OS' do
-    include_examples 'Debian 6'
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -17,7 +17,7 @@
     it { is_expected.to contain_group('www-data') }
     it { is_expected.to contain_class('apache::service') }
     it {
-      is_expected.to contain_file('/var/www').with(
+      is_expected.to contain_file('/var/www/html').with(
         'ensure' => 'directory',
       )
     }
@@ -46,7 +46,7 @@
       ).that_notifies('Class[Apache::Service]')
     }
     # Assert that load files are placed and symlinked for these mods, but no conf file.
-    ['auth_basic', 'authn_file', 'authz_default', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
+    ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/etc/apache2/mods-available/#{modname}.load",
@@ -232,22 +232,13 @@
       end
     end
 
-    context '8' do
-      include_examples 'Debian 8'
-
-      it {
-        is_expected.to contain_file('/var/www/html').with(
-          'ensure' => 'directory',
-        )
-      }
-      describe 'Alternate mpm_modules when declaring mpm_module => prefork' do
-        let :params do
-          { mpm_module: 'worker' }
-        end
-
-        it { is_expected.to contain_exec('/usr/sbin/a2dismod event') }
-        it { is_expected.to contain_exec('/usr/sbin/a2dismod prefork') }
+    describe 'Alternate mpm_modules when declaring mpm_module => prefork' do
+      let :params do
+        { mpm_module: 'worker' }
       end
+
+      it { is_expected.to contain_exec('/usr/sbin/a2dismod event') }
+      it { is_expected.to contain_exec('/usr/sbin/a2dismod prefork') }
     end
 
     context 'on Ubuntu 14.04' do
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
index 071ed76831..231450f0b3 100644
--- a/spec/classes/mod/auth_gssapi_spec.rb
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 6'
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index ea2fe8fe1e..dd1dd48260 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 6'
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 316863a98f..a24d1122fd 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -124,10 +124,10 @@ def general_info_specs_apache24
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS' do
-    include_examples 'Debian 6'
+    include_examples 'Debian 8'
 
     # Load the more generic tests for this context
-    general_info_specs_apache22
+    general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index bba4cf4e81..369a34e088 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -11,7 +11,7 @@ def general_mime_magic_specs
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS with default params' do
-    include_examples 'Debian 6'
+    include_examples 'Debian 8'
 
     general_mime_magic_specs
 
@@ -58,7 +58,7 @@ def general_mime_magic_specs
   end
 
   context 'with magic_file => /tmp/magic' do
-    include_examples 'Debian 6'
+    include_examples 'Debian 8'
 
     let :params do
       { magic_file: '/tmp/magic' }
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 6fb3f69038..c4d814bd97 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -68,13 +68,13 @@ def require_directives(requires)
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters' do
-    context 'on a Debian 6 OS' do
-      include_examples 'Debian 6'
+    context 'on a Debian 8 OS' do
+      include_examples 'Debian 8'
 
       context 'with default params' do
         it { is_expected.to contain_apache__mod('status') }
 
-        include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
+        include_examples 'status_conf_spec_require', 'ip 127.0.0.1 ::1', 'On', '/server-status'
 
         it {
           is_expected.to contain_file('status.conf').with(ensure: 'file',
@@ -98,7 +98,7 @@ def require_directives(requires)
 
         it { is_expected.to compile }
 
-        include_examples 'status_conf_spec', ['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status'
+        include_examples 'status_conf_spec_require', 'ip 10.10.10.10 11.11.11.11', 'Off', '/custom-status'
       end
 
       context "with valid parameter type $allow_from => ['10.10.10.10']" do
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index fa79367c1a..79e1863020 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -37,19 +37,6 @@
   let(:facts) { on_supported_os['debian-8-x86_64'] }
 end
 
-shared_context 'Debian 6' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'Debian',
-      operatingsystem: 'Debian',
-      operatingsystemrelease: '6',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
-end
-
 shared_context 'Debian 8' do
   let(:facts) { on_supported_os['debian-8-x86_64'] }
 end

From 99379af66fd19afcb29614d93b12f4875d604dbd Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 03:11:52 +0100
Subject: [PATCH 1755/2267] Replace RedHat 5 specs with RedHat 8

Red Hat 5 is EOL and not supported according to metadata.json while Red
Hat 8 is supported.
---
 spec/classes/apache_spec.rb  |  8 ++++----
 spec/classes/service_spec.rb |  4 ++--
 spec/spec_helper_local.rb    | 13 -------------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 25c88f07a2..980be7ffdb 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -252,8 +252,8 @@
     end
   end
 
-  context 'on a RedHat 5 OS' do
-    include_examples 'RedHat 5'
+  context 'on a RedHat 8 OS' do
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -301,7 +301,7 @@
       end
 
       # Assert that load files are placed for these mods, but no conf file.
-      ['auth_basic', 'authn_file', 'authz_default', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
+      ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
         it {
           is_expected.to contain_file("#{modname}.load").with_path(
             "/etc/httpd/mod.d/#{modname}.load",
@@ -328,7 +328,7 @@
         }
       end
 
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
+      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^IncludeOptional "/etc/httpd/site\.d/\*"$} }
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 564c0f00a0..824b2eab5c 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -95,8 +95,8 @@
     end
   end
 
-  context 'on a RedHat 5 OS, do not manage service' do
-    include_examples 'RedHat 5'
+  context 'on a RedHat 8 OS, do not manage service' do
+    include_examples 'RedHat 8'
     let(:params) do
       {
         'service_ensure' => 'running',
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 79e1863020..7b7d607c4b 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -55,19 +55,6 @@
   end
 end
 
-shared_context 'RedHat 5' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'RedHat',
-      operatingsystem: 'RedHat',
-      operatingsystemrelease: '5',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
-end
-
 shared_context 'RedHat 6' do
   let(:facts) { on_supported_os['redhat-6-x86_64'] }
 end

From 581c95f0e5b8320280654fe4c8a9e93058dc80fe Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 7 Feb 2021 03:14:54 +0100
Subject: [PATCH 1756/2267] Replace Ubuntu 14.04 tests with 18.04

---
 spec/classes/apache_spec.rb |  4 ++--
 spec/spec_helper_local.rb   | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 980be7ffdb..c2b27fde8a 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -241,8 +241,8 @@
       it { is_expected.to contain_exec('/usr/sbin/a2dismod prefork') }
     end
 
-    context 'on Ubuntu 14.04' do
-      include_examples 'Ubuntu 14.04'
+    context 'on Ubuntu 18.04' do
+      include_examples 'Ubuntu 18.04'
 
       it {
         is_expected.to contain_file('/var/www/html').with(
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 7b7d607c4b..b380956a21 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -41,18 +41,8 @@
   let(:facts) { on_supported_os['debian-8-x86_64'] }
 end
 
-shared_context 'Ubuntu 14.04' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'Debian',
-      operatingsystem: 'Ubuntu',
-      operatingsystemrelease: '14.04',
-      lsbdistrelease: '14.04',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
+shared_context 'Ubuntu 18.04' do
+  let(:facts) { on_supported_os['ubuntu-18.04-x86_64'] }
 end
 
 shared_context 'RedHat 6' do

From a6fc3b31e68cfaaf5840f679d2d59c1d1190a037 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 8 Feb 2021 12:03:58 +0100
Subject: [PATCH 1757/2267] Reuse resources in tests to save time

Prior to this patch the runtime was ~21 seconds, after ~18 seconds. A
huge part of that is actually initializing facts from
rspec-puppet-facts.
---
 spec/classes/mod/dir_spec.rb | 80 ++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 9f1e533c4b..8f0dd3524b 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -11,21 +11,23 @@
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dir') }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{^DirectoryIndex }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html\.var }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.cgi }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.pl }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.php }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.xhtml$}) }
+      it do
+        is_expected.to contain_file('dir.conf')
+          .with_content(%r{^DirectoryIndex })
+          .with_content(%r{ index\.html })
+          .with_content(%r{ index\.html\.var })
+          .with_content(%r{ index\.cgi })
+          .with_content(%r{ index\.pl })
+          .with_content(%r{ index\.php })
+          .with_content(%r{ index\.xhtml$})
+      end
     end
     context "passing indexes => ['example.txt','fearsome.aspx']" do
       let :params do
         { indexes: ['example.txt', 'fearsome.aspx'] }
       end
 
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ fearsome\.aspx$}) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
     end
   end
   context 'default configuration with parameters on a RedHat OS' do
@@ -34,21 +36,23 @@
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dir') }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{^DirectoryIndex }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html\.var }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.cgi }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.pl }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.php }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.xhtml$}) }
+      it do
+        is_expected.to contain_file('dir.conf')
+          .with_content(%r{^DirectoryIndex })
+          .with_content(%r{ index\.html })
+          .with_content(%r{ index\.html\.var })
+          .with_content(%r{ index\.cgi })
+          .with_content(%r{ index\.pl })
+          .with_content(%r{ index\.php })
+          .with_content(%r{ index\.xhtml$})
+      end
     end
     context "passing indexes => ['example.txt','fearsome.aspx']" do
       let :params do
         { indexes: ['example.txt', 'fearsome.aspx'] }
       end
 
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ fearsome\.aspx$}) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
     end
   end
   context 'default configuration with parameters on a FreeBSD OS' do
@@ -57,21 +61,23 @@
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dir') }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{^DirectoryIndex }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html\.var }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.cgi }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.pl }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.php }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.xhtml$}) }
+      it do
+        is_expected.to contain_file('dir.conf')
+          .with_content(%r{^DirectoryIndex })
+          .with_content(%r{ index\.html })
+          .with_content(%r{ index\.html\.var })
+          .with_content(%r{ index\.cgi })
+          .with_content(%r{ index\.pl })
+          .with_content(%r{ index\.php })
+          .with_content(%r{ index\.xhtml$})
+      end
     end
     context "passing indexes => ['example.txt','fearsome.aspx']" do
       let :params do
         { indexes: ['example.txt', 'fearsome.aspx'] }
       end
 
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ fearsome\.aspx$}) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
     end
   end
   context 'default configuration with parameters on a Gentoo OS' do
@@ -80,21 +86,23 @@
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dir') }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{^DirectoryIndex }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.html\.var }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.cgi }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.pl }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.php }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ index\.xhtml$}) }
+      it do
+        is_expected.to contain_file('dir.conf')
+          .with_content(%r{^DirectoryIndex })
+          .with_content(%r{ index\.html })
+          .with_content(%r{ index\.html\.var })
+          .with_content(%r{ index\.cgi })
+          .with_content(%r{ index\.pl })
+          .with_content(%r{ index\.php })
+          .with_content(%r{ index\.xhtml$})
+      end
     end
     context "passing indexes => ['example.txt','fearsome.aspx']" do
       let :params do
         { indexes: ['example.txt', 'fearsome.aspx'] }
       end
 
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }) }
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ fearsome\.aspx$}) }
+      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
     end
   end
 end

From 675ba83d4ff986bf19dafc83a876c174c9acfc42 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 8 Feb 2021 12:07:02 +0100
Subject: [PATCH 1758/2267] Reduce duplication in mod_dir spec test

---
 spec/classes/mod/dir_spec.rb | 123 +++++++----------------------------
 1 file changed, 24 insertions(+), 99 deletions(-)

diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 8f0dd3524b..919d86399d 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -3,106 +3,31 @@
 require 'spec_helper'
 
 describe 'apache::mod::dir', type: :class do
-  it_behaves_like 'a mod class, without including apache'
-
-  context 'default configuration with parameters on a Debian OS' do
-    include_examples 'Debian 8'
-
-    context 'passing no parameters' do
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('dir') }
-      it do
-        is_expected.to contain_file('dir.conf')
-          .with_content(%r{^DirectoryIndex })
-          .with_content(%r{ index\.html })
-          .with_content(%r{ index\.html\.var })
-          .with_content(%r{ index\.cgi })
-          .with_content(%r{ index\.pl })
-          .with_content(%r{ index\.php })
-          .with_content(%r{ index\.xhtml$})
-      end
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        { indexes: ['example.txt', 'fearsome.aspx'] }
-      end
-
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
-    end
-  end
-  context 'default configuration with parameters on a RedHat OS' do
-    include_examples 'RedHat 6'
-
-    context 'passing no parameters' do
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('dir') }
-      it do
-        is_expected.to contain_file('dir.conf')
-          .with_content(%r{^DirectoryIndex })
-          .with_content(%r{ index\.html })
-          .with_content(%r{ index\.html\.var })
-          .with_content(%r{ index\.cgi })
-          .with_content(%r{ index\.pl })
-          .with_content(%r{ index\.php })
-          .with_content(%r{ index\.xhtml$})
-      end
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        { indexes: ['example.txt', 'fearsome.aspx'] }
-      end
-
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
-    end
-  end
-  context 'default configuration with parameters on a FreeBSD OS' do
-    include_examples 'FreeBSD 9'
-
-    context 'passing no parameters' do
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('dir') }
-      it do
-        is_expected.to contain_file('dir.conf')
-          .with_content(%r{^DirectoryIndex })
-          .with_content(%r{ index\.html })
-          .with_content(%r{ index\.html\.var })
-          .with_content(%r{ index\.cgi })
-          .with_content(%r{ index\.pl })
-          .with_content(%r{ index\.php })
-          .with_content(%r{ index\.xhtml$})
+  ['Debian 8', 'RedHat 6', 'FreeBSD 9', 'Gentoo'].each do |os|
+    context "default configuration with parameters on #{os}" do
+      include_examples os
+
+      context 'passing no parameters' do
+        it { is_expected.to contain_class('apache::params') }
+        it { is_expected.to contain_apache__mod('dir') }
+        it do
+          is_expected.to contain_file('dir.conf')
+            .with_content(%r{^DirectoryIndex })
+            .with_content(%r{ index\.html })
+            .with_content(%r{ index\.html\.var })
+            .with_content(%r{ index\.cgi })
+            .with_content(%r{ index\.pl })
+            .with_content(%r{ index\.php })
+            .with_content(%r{ index\.xhtml$})
+        end
+      end
+      context "passing indexes => ['example.txt','fearsome.aspx']" do
+        let :params do
+          { indexes: ['example.txt', 'fearsome.aspx'] }
+        end
+
+        it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
       end
     end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        { indexes: ['example.txt', 'fearsome.aspx'] }
-      end
-
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
-    end
-  end
-  context 'default configuration with parameters on a Gentoo OS' do
-    include_examples 'Gentoo'
-
-    context 'passing no parameters' do
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('dir') }
-      it do
-        is_expected.to contain_file('dir.conf')
-          .with_content(%r{^DirectoryIndex })
-          .with_content(%r{ index\.html })
-          .with_content(%r{ index\.html\.var })
-          .with_content(%r{ index\.cgi })
-          .with_content(%r{ index\.pl })
-          .with_content(%r{ index\.php })
-          .with_content(%r{ index\.xhtml$})
-      end
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        { indexes: ['example.txt', 'fearsome.aspx'] }
-      end
-
-      it { is_expected.to contain_file('dir.conf').with_content(%r{ example\.txt }).with_content(%r{ fearsome\.aspx$}) }
-    end
   end
 end

From 06f04ad6386dfdc59de014eba9b3b07380e895b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Fri, 12 Feb 2021 17:25:46 -1000
Subject: [PATCH 1759/2267] (IAC-1186) Add $use_port_for_filenames parameter

When using $use_servername_for_filenames = true, virtual hosts with the
same $servername but a different $port will introduce a duplicate
resource declaration.

Introduce a $use_port_for_filenames that act in concert with
$use_servername_for_filenames to avoid this situation.
---
 manifests/init.pp  |  2 ++
 manifests/vhost.pp | 33 +++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 225f98d5b3..cae2ba92a5 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -837,6 +837,7 @@
       logroot_mode                 => $logroot_mode,
       manage_docroot               => $default_vhost,
       use_servername_for_filenames => true,
+      use_port_for_filenames       => true,
     }
     $ssl_access_log_file = $::osfamily ? {
       'freebsd' => $access_log_file,
@@ -855,6 +856,7 @@
       logroot_mode                 => $logroot_mode,
       manage_docroot               => $default_ssl_vhost,
       use_servername_for_filenames => true,
+      use_port_for_filenames       => true,
     }
   }
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 3d83a1bd0a..3326b6fbb7 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1729,6 +1729,13 @@
 #   When set to false (default), the existing behaviour of using the $name parameter
 #   will remain.
 #
+# @param $use_port_for_filenames
+#   When set to true and use_servername_for_filenames is also set to true, default log /
+#   config file names will be derived from the sanitized value of both the $servername and
+#   $port parameters.
+#   When set to false (default), the port is not included in the file names and may lead to
+#   duplicate declarations if two virtual hosts use the same domain.
+#
 # @param $mdomain
 #   All the names in the list are managed as one Managed Domain (MD). mod_md will request
 #   one single certificate that is valid for all these names.
@@ -1800,6 +1807,7 @@
   $access_log_env_var                                                               = false,
   Optional[Array] $access_logs                                                      = undef,
   Optional[Boolean] $use_servername_for_filenames                                   = false,
+  Optional[Boolean] $use_port_for_filenames                                         = false,
   $aliases                                                                          = undef,
   Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                  = undef,
   Boolean $error_log                                                                = true,
@@ -2064,16 +2072,22 @@
   # also perform some sanitiation on the $servername parameter to strip spaces from it, as it defaults to the value of
   # $name, should $servername NOT be defined.
   #
+  # Because a single hostname may be use by multiple virtual hosts listening on different ports, the $port paramter can
+  # optionaly be used to avoid duplicate resources.
+  #
   # We will retain the default behaviour for filenames but allow the use of a sanitized version of $servername to be
-  # used, using the new $use_servername_for_filenames parameter.
+  # used, using the new $use_servername_for_filenames and $use_port_for_filenames parameters.
   #
   # This will default to false until the next major release (v6.0.0), at which point, we will default this to true and
   # warn about it's imminent deprecation in the subsequent major release (v7.0.0)
   #
-  # In v7.0.0, we will deprecate the $use_servername_for_filenames parameter altogether and use the sanitized value of
-  # $servername for default log / config filenames.
+  # In v7.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether
+  # and use the sanitized value of $servername for default log / config filenames.
   $filename = $use_servername_for_filenames ? {
-    true => regsubst($servername, ' ', '_', 'G'),
+    true => $use_port_for_filenames ? {
+      true  => regsubst("${servername}-${port}", ' ', '_', 'G'),
+      false => regsubst($servername, ' ', '_', 'G'),
+    },
     false => $name,
   }
 
@@ -2088,6 +2102,17 @@
     module, the $use_servername_for_filenames will be removed and log/config file names will be dervied from the
     sanitized $servername parameter when not explicitly defined.'
     warning($use_servername_for_filenames_warn_msg)
+  } elsif ! $use_port_for_filenames {
+    $use_port_for_filenames_warn_msg = '
+    It is possible for multiple virtual hosts to be configured using the same $servername but a different port. When
+    using $use_servername_for_filenames, this can lead to duplicate resource declarations.
+    When $use_port_for_filenames = true, the $servername and $port parameters, sanitized, are used to construct log and
+    config file names.
+
+    From version v6.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v7.0.0 of the
+    module, the $use_port_for_filenames will be removed and log/config file names will be dervied from the
+    sanitized $servername parameter when not explicitly defined.'
+    warning($use_port_for_filenames_warn_msg)
   }
 
   # This ensures that the docroot exists

From fb2a84fdd4dda50e7e3f30a52f6b465a1093768f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Fri, 12 Feb 2021 18:47:31 -1000
Subject: [PATCH 1760/2267] (IAC-1186) Adjust CI

---
 manifests/vhost/fragment.pp          |  6 +++++-
 spec/acceptance/apache_ssl_spec.rb   |  2 +-
 spec/acceptance/vhost_spec.rb        | 12 ++++++------
 spec/defines/vhost_fragment_spec.rb  |  7 ++++---
 spec/spec_helper_acceptance_local.rb | 10 +++++-----
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
index 37a3105b52..b331214bb4 100644
--- a/manifests/vhost/fragment.pp
+++ b/manifests/vhost/fragment.pp
@@ -55,6 +55,7 @@
 #
 define apache::vhost::fragment (
   String[1] $vhost,
+  Optional[Integer[0]] $port = undef,
   $priority = undef,
   Optional[String] $content = undef,
   Integer[0] $order = 900,
@@ -68,7 +69,10 @@
     $priority_real = '25-'
   }
 
-  $filename = regsubst($vhost, ' ', '_', 'G')
+  $filename = $port ? {
+    Integer => regsubst("${vhost}-${port}", ' ', '_', 'G'),
+    Undef   => regsubst($vhost, ' ', '_', 'G'),
+  }
 
   if $content =~ String[1] {
     concat::fragment { "${vhost}-${title}":
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 416b31f73b..e6ea32c4c5 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -30,7 +30,7 @@ class { 'apache':
       end
     end
 
-    describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-ssl-443.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 1b8250c00e..2b74bdb70e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -25,11 +25,11 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-80.conf") do
       it { is_expected.not_to be_file }
     end
 
-    describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-ssl-443.conf") do
       it { is_expected.not_to be_file }
     end
   end
@@ -42,11 +42,11 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-80.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
     end
 
-    describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-ssl-443.conf") do
       it { is_expected.not_to be_file }
     end
   end
@@ -67,11 +67,11 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-80.conf") do
       it { is_expected.to contain '<VirtualHost \*:80>' }
     end
 
-    describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
+    describe file("#{apache_hash['vhost_dir']}/15-default-ssl-443.conf") do
       it { is_expected.to contain '<VirtualHost \*:443>' }
       it { is_expected.to contain 'SSLEngine on' }
     end
diff --git a/spec/defines/vhost_fragment_spec.rb b/spec/defines/vhost_fragment_spec.rb
index 886c71f03b..af042e4de0 100644
--- a/spec/defines/vhost_fragment_spec.rb
+++ b/spec/defines/vhost_fragment_spec.rb
@@ -14,6 +14,7 @@
         let(:params) do
           {
             vhost: 'default',
+            port: 80,
             priority: '15',
           }
         end
@@ -23,9 +24,9 @@
 
           it 'creates a vhost concat fragment' do
             is_expected.to compile.with_all_deps
-            is_expected.to contain_concat('15-default.conf')
+            is_expected.to contain_concat('15-default-80.conf')
             is_expected.to create_concat__fragment('default-myfragment')
-              .with_target('15-default.conf')
+              .with_target('15-default-80.conf')
               .with_order(900)
               .with_content('# Foo')
           end
@@ -36,7 +37,7 @@
 
           it 'does not create a vhost concat fragment' do
             is_expected.to compile.with_all_deps
-            is_expected.to contain_concat('15-default.conf')
+            is_expected.to contain_concat('15-default-80.conf')
             is_expected.not_to contain_concat__fragment('default-myfragment')
           end
         end
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index c80aa202bf..2cb26b135d 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -89,7 +89,7 @@ def apache_settings_hash
     apache['conf_file']        = '/etc/httpd/conf/httpd.conf'
     apache['ports_file']       = '/etc/httpd/conf/ports.conf'
     apache['vhost_dir']        = '/etc/httpd/conf.d'
-    apache['vhost']            = '/etc/httpd/conf.d/15-default.conf'
+    apache['vhost']            = '/etc/httpd/conf.d/15-default-80.conf'
     apache['run_dir']          = '/var/run/httpd'
     apache['doc_root']         = '/var/www'
     apache['service_name']     = 'httpd'
@@ -119,7 +119,7 @@ def apache_settings_hash
     apache['mod_dir']          = '/etc/apache2/mods-available'
     apache['conf_file']        = '/etc/apache2/apache2.conf'
     apache['ports_file']       = '/etc/apache2/ports.conf'
-    apache['vhost']            = '/etc/apache2/sites-available/15-default.conf'
+    apache['vhost']            = '/etc/apache2/sites-available/15-default-80.conf'
     apache['vhost_dir']        = '/etc/apache2/sites-enabled'
     apache['run_dir']          = '/var/run/apache2'
     apache['doc_root']         = '/var/www'
@@ -141,7 +141,7 @@ def apache_settings_hash
     apache['mod_dir']          = '/usr/local/etc/apache24/Modules'
     apache['conf_file']        = '/usr/local/etc/apache24/httpd.conf'
     apache['ports_file']       = '/usr/local/etc/apache24/Includes/ports.conf'
-    apache['vhost']            = '/usr/local/etc/apache24/Vhosts/15-default.conf'
+    apache['vhost']            = '/usr/local/etc/apache24/Vhosts/15-default-80.conf'
     apache['vhost_dir']        = '/usr/local/etc/apache24/Vhosts'
     apache['run_dir']          = '/var/run/apache24'
     apache['doc_root']         = '/var/www'
@@ -155,7 +155,7 @@ def apache_settings_hash
     apache['mod_dir']          = '/etc/apache2/modules.d'
     apache['conf_file']        = '/etc/apache2/httpd.conf'
     apache['ports_file']       = '/etc/apache2/ports.conf'
-    apache['vhost']            = '/etc/apache2/vhosts.d/15-default.conf'
+    apache['vhost']            = '/etc/apache2/vhosts.d/15-default-80.conf'
     apache['vhost_dir']        = '/etc/apache2/vhosts.d'
     apache['run_dir']          = '/var/run/apache2'
     apache['doc_root']         = '/var/www'
@@ -169,7 +169,7 @@ def apache_settings_hash
     apache['mod_dir']          = '/etc/apache2/mods-available'
     apache['conf_file']        = '/etc/apache2/httpd.conf'
     apache['ports_file']       = '/etc/apache2/ports.conf'
-    apache['vhost']            = '/etc/apache2/sites-available/15-default.conf'
+    apache['vhost']            = '/etc/apache2/sites-available/15-default-80.conf'
     apache['vhost_dir']        = '/etc/apache2/sites-available'
     apache['run_dir']          = '/var/run/apache2'
     apache['doc_root']         = '/srv/www'

From 5b2a524546825c057f984ae1c5002760b87732be Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 22 Dec 2020 19:03:40 +0100
Subject: [PATCH 1761/2267] Use operatingsystemmajrelease fact

This fact was introduced in Facter 1.7 which by now can be assumed. By
now it's already deprecated in favor of $facts['os']['release']['major']
but the rest of the module isn't converted so this keeps it consistent.

CentOS 8 stream doesn't have a minor version and the previous comparison
code failed.

There are a lot more odd cases with facts, but I don't want to touch too
much code.
---
 manifests/default_mods.pp   |  2 +-
 manifests/init.pp           |  2 +-
 manifests/mod/fastcgi.pp    |  2 +-
 manifests/mod/proxy_html.pp |  4 ++--
 manifests/params.pp         | 28 ++++++++++++++--------------
 manifests/version.pp        | 15 ++++-----------
 spec/spec_helper_local.rb   |  7 ++++++-
 7 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 8e7b5d0283..255c9239f3 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -17,7 +17,7 @@
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon') ) {
+        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemmajrelease, '7') == -1) and !($::operatingsystem == 'Amazon') ) {
           if ($use_systemd) {
             ::apache::mod { 'systemd': }
           }
diff --git a/manifests/init.pp b/manifests/init.pp
index cae2ba92a5..f01d101bcc 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -551,7 +551,7 @@
     default => '(event|itk|prefork|worker)'
   }
 
-  if $::osfamily == 'RedHat' and $apache::version::distrelease == '7' {
+  if $::osfamily == 'RedHat' and $facts['operatingsystemmajrelease'] == '7' {
     # On redhat 7 the ssl.conf lives in /etc/httpd/conf.d (the confd_dir)
     # when all other module configs live in /etc/httpd/conf.modules.d (the
     # mod_dir). On all other platforms and versions, ssl.conf lives in the
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index d24dcbf0da..a3445c9179 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -5,7 +5,7 @@
 #
 class apache::mod::fastcgi {
   include apache
-  if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemrelease, '7.0') >= 0) {
+  if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemmajrelease, '7') >= 0) {
     fail('mod_fastcgi is no longer supported on el7 and above.')
   }
   if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '18.04') >= 0) {
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 22a576641e..0205af848c 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -21,13 +21,13 @@
       }
       case $::operatingsystem {
         'Ubuntu': {
-          $loadfiles = $apache::params::distrelease ? {
+          $loadfiles = $facts['operatingsystemmajrelease'] ? {
             '10'    => ['/usr/lib/libxml2.so.2'],
             default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
           }
         }
         'Debian': {
-          $loadfiles = $apache::params::distrelease ? {
+          $loadfiles = $facts['operatingsystemmajrelease'] ? {
             '6'     => ['/usr/lib/libxml2.so.2'],
             default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
           }
diff --git a/manifests/params.pp b/manifests/params.pp
index bad6f3e5f7..d26227cf14 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -61,7 +61,7 @@
     $server_root          = "${httpd_root}/etc/httpd"
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
-    $mod_dir              = $apache::version::distrelease ? {
+    $mod_dir              = $facts['operatingsystemmajrelease'] ? {
       '7'     => "${httpd_dir}/conf.modules.d",
       default => "${httpd_dir}/conf.d",
     }
@@ -107,11 +107,11 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = "${httpd_root}/var/www/html"
-    $alias_icons_path     = $apache::version::distrelease ? {
+    $alias_icons_path     = $facts['operatingsystemmajrelease'] ? {
       '7'     => "${httpd_root}/usr/share/httpd/icons",
       default => '/var/www/icons',
     }
-    $error_documents_path = $apache::version::distrelease ? {
+    $error_documents_path = $facts['operatingsystemmajrelease'] ? {
       '7'     => "${httpd_root}/usr/share/httpd/error",
       default => '/var/www/error'
     }
@@ -172,7 +172,7 @@
       # Amazon Linux 2 uses the /conf.modules.d/ dir
       $mod_dir            = "${httpd_dir}/conf.modules.d"
     } else {
-      $mod_dir              = $apache::version::distrelease ? {
+      $mod_dir              = $facts['operatingsystemmajrelease'] ? {
         '7'     => "${httpd_dir}/conf.modules.d",
         '8'     => "${httpd_dir}/conf.modules.d",
         default => "${httpd_dir}/conf.d",
@@ -200,7 +200,7 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
-    $php_version = $apache::version::distrelease ? {
+    $php_version = $facts['operatingsystemmajrelease'] ? {
       '8'     => '7', # RedHat8
       default => '5', # RedHat5, RedHat6, RedHat7
     }
@@ -211,13 +211,13 @@
       'auth_gssapi'           => 'mod_auth_gssapi',
       'auth_mellon'           => 'mod_auth_mellon',
       'auth_openidc'          => 'mod_auth_openidc',
-      'authnz_ldap'           => $apache::version::distrelease ? {
+      'authnz_ldap'           => $facts['operatingsystemmajrelease'] ? {
         '7'     => 'mod_ldap',
         '8'     => 'mod_ldap',
         default => 'mod_authz_ldap',
       },
       'authnz_pam'            => 'mod_authnz_pam',
-      'fastcgi'               => $apache::version::distrelease ? {
+      'fastcgi'               => $facts['operatingsystemmajrelease'] ? {
         '5'     => 'mod_fastcgi',
         '6'     => 'mod_fastcgi',
         default => undef,
@@ -225,7 +225,7 @@
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',
-      'ldap'                  => $apache::version::distrelease ? {
+      'ldap'                  => $facts['operatingsystemmajrelease'] ? {
         '5'     => undef,
         '6'     => undef,
         default => 'mod_ldap',
@@ -239,7 +239,7 @@
       # https://www.phusionpassenger.com/library/install/apache/install/oss/el7/
       'passenger'             => 'mod_passenger',
       'perl'                  => 'mod_perl',
-      'php5'                  => $apache::version::distrelease ? {
+      'php5'                  => $facts['operatingsystemmajrelease'] ? {
         '5'     => 'php53',
         default => 'php',
       },
@@ -252,7 +252,7 @@
       # See http://wiki.aaf.edu.au/tech-info/sp-install-guide
       'shibboleth'            => 'shibboleth',
       'ssl'                   => 'mod_ssl',
-      'wsgi'                  => $apache::version::distrelease ? {
+      'wsgi'                  => $facts['operatingsystemmajrelease'] ? {
         '8'     => 'python3-mod_wsgi', # RedHat8
         default => 'mod_wsgi',         # RedHat5, RedHat6, RedHat7
       },
@@ -264,7 +264,7 @@
     }
     $mod_libs             = {
       'nss' => 'libmodnss.so',
-      'wsgi'                  => $apache::version::distrelease ? {
+      'wsgi'                  => $facts['operatingsystemmajrelease'] ? {
         '8'     => 'mod_wsgi_python3.so',
         default => 'mod_wsgi.so',
       },
@@ -278,12 +278,12 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
-    $alias_icons_path     = $apache::version::distrelease ? {
+    $alias_icons_path     = $facts['operatingsystemmajrelease'] ? {
       '7'     => '/usr/share/httpd/icons',
       '8'     => '/usr/share/httpd/icons',
       default => '/var/www/icons',
     }
-    $error_documents_path = $apache::version::distrelease ? {
+    $error_documents_path = $facts['operatingsystemmajrelease'] ? {
       '7'     => '/usr/share/httpd/error',
       '8'     => '/usr/share/httpd/error',
       default => '/var/www/error'
@@ -790,7 +790,7 @@
     $verify_command = '/usr/sbin/apachectl -t'
   }
 
-  if $::osfamily == 'RedHat' and versioncmp($::operatingsystemrelease, '8.0') >= 0 {
+  if $::osfamily == 'RedHat' and versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
     $ssl_protocol = ['all'] # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
   } else {
     $ssl_protocol = ['all', '-SSLv2', '-SSLv3']
diff --git a/manifests/version.pp b/manifests/version.pp
index 36e2a04043..7ebd591c59 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -6,13 +6,6 @@
   Optional[String] $scl_httpd_version = undef,
   Optional[String] $scl_php_version   = undef,
 ) {
-  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, etc.
-  $osr_array = split($::operatingsystemrelease,'[\/\.]')
-  $distrelease = $osr_array[0]
-  if ! $distrelease {
-    fail("Class['apache::version']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
-  }
-
   case $::osfamily {
     'RedHat': {
       if $scl_httpd_version {
@@ -20,16 +13,16 @@
       }
       elsif ($::operatingsystem == 'Amazon') {
         $default = '2.2'
-      } elsif ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($distrelease, '7') >= 0) {
+      } elsif ($::operatingsystem == 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '7') >= 0) {
         $default = '2.4'
       } else {
         $default = '2.2'
       }
     }
     'Debian': {
-      if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0 {
+      if $::operatingsystem == 'Ubuntu' and versioncmp($facts['operatingsystemmajrelease'], '13.10') >= 0 {
         $default = '2.4'
-      } elsif $::operatingsystem == 'Debian' and versioncmp($distrelease, '8') >= 0 {
+      } elsif $::operatingsystem == 'Debian' and versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
         $default = '2.4'
       } else {
         $default = '2.2'
@@ -42,7 +35,7 @@
       $default = '2.4'
     }
     'Suse': {
-      if ($::operatingsystem == 'SLES' and versioncmp($::operatingsystemrelease, '12') >= 0) or ($::operatingsystem == 'OpenSuSE' and versioncmp($::operatingsystemrelease, '42') >= 0) {
+      if ($::operatingsystem == 'SLES' and versioncmp($facts['operatingsystemmajrelease'], '12') >= 0) or ($::operatingsystem == 'OpenSuSE' and versioncmp($facts['operatingsystemmajrelease'], '42') >= 0) {
         $default = '2.4'
       } else {
         $default = '2.2'
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index b380956a21..b5031e3e0f 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -65,6 +65,7 @@
       osfamily: 'RedHat',
       operatingsystem: 'Fedora',
       operatingsystemrelease: '17',
+      operatingsystemmajrelease: '17',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     }
   end
@@ -78,6 +79,7 @@
       osfamily: 'RedHat',
       operatingsystem: 'Fedora',
       operatingsystemrelease: '21',
+      operatingsystemmajrelease: '21',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     }
   end
@@ -91,6 +93,7 @@
       osfamily: 'RedHat',
       operatingsystem: 'Fedora',
       operatingsystemrelease: '28',
+      operatingsystemmajrelease: '28',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     }
   end
@@ -104,6 +107,7 @@
       osfamily: 'RedHat',
       operatingsystem: 'Fedora',
       operatingsystemrelease: 'Rawhide',
+      operatingsystemmajrelease: 'Rawhide',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     }
   end
@@ -142,7 +146,8 @@
       kernel: 'Linux',
       osfamily: 'Gentoo',
       operatingsystem: 'Gentoo',
-      operatingsystemrelease: '3.16.1-gentoo',
+      operatingsystemrelease: '2.7',
+      operatingsystemmajrelease: '2.7',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
     }
   end

From f6bd8b91735a8f7dbe7491ef67bb6f5ec6208bb0 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 15 Feb 2021 17:20:01 +0200
Subject: [PATCH 1762/2267] Remove Puppet 5 testing

---
 .travis.yml    | 48 ------------------------------------------------
 provision.yaml | 27 ---------------------------
 2 files changed, 75 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b65063988b..a1da735a64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,50 +38,6 @@ jobs:
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_ub_5_puppet5
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_deb_puppet5
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_el7_puppet5
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_el8_puppet5
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
     - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
@@ -118,10 +74,6 @@ jobs:
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static
-    -
-      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
-      rvm: 2.4.5
-      stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
       rvm: 2.5.7
diff --git a/provision.yaml b/provision.yaml
index bbdfd7a412..e3cd932962 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -14,12 +14,6 @@ travis_deb:
   - litmusimage/debian:8
   - litmusimage/debian:9
   - litmusimage/debian:10
-travis_ub_5:
-  provisioner: docker
-  images:
-  - litmusimage/ubuntu:14.04
-  - litmusimage/ubuntu:16.04
-  - litmusimage/ubuntu:18.04
 travis_ub_6:
   provisioner: docker
   images:
@@ -37,27 +31,6 @@ travis_el8:
   provisioner: docker
   images:
   - litmusimage/centos:8
-release_checks_5:
-  provisioner: abs
-  images:
-  - redhat-6-x86_64
-  - redhat-7-x86_64
-  - redhat-8-x86_64
-  - centos-6-x86_64
-  - centos-7-x86_64
-  - centos-8-x86_64
-  - oracle-6-x86_64
-  - oracle-7-x86_64
-  - scientific-6-x86_64
-  - scientific-7-x86_64
-  - debian-8-x86_64
-  - debian-9-x86_64
-  - debian-10-x86_64
-  - ubuntu-1404-x86_64
-  - ubuntu-1604-x86_64
-  - ubuntu-1804-x86_64
-  - sles-12-x86_64
-  - sles-15-x86_64
 release_checks_6:
   provisioner: abs
   images:

From 8dd76049c285d0e953e6c6da7a94e5a4cf91b8b9 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 15 Feb 2021 17:36:24 +0200
Subject: [PATCH 1763/2267] Bump minimal puppet version to 6.0.0 in
 metadata.json

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 10a9cbf8d8..c7bf220b7f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -77,7 +77,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.10 < 8.0.0"
+      "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ],
   "description": "Module for Apache configuration",

From 6f5ec62cb0d441c6280541e5fc22bb5485a30d9f Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Tue, 16 Feb 2021 09:50:56 +0200
Subject: [PATCH 1764/2267] Update .sync.yml

---
 .sync.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index e5558234e6..9aa078287c 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -24,11 +24,6 @@
         - puppet6
         provision_list:
         - travis_ub_6
-    - collection:
-        puppet_collection:
-        - puppet5
-        provision_list:
-        - travis_ub_5
   simplecov: true
   notifications:
     slack:

From 94818dd2236b2aa6124317257d54911bc5494a24 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Tue, 16 Feb 2021 15:36:48 +0200
Subject: [PATCH 1765/2267] pdk update

---
 .github/workflows/auto_release.yml | 81 ++++++++++++++++++++++++++++++
 .rubocop.yml                       |  5 ++
 metadata.json                      |  4 +-
 3 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/auto_release.yml

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
new file mode 100644
index 0000000000..a88b99ca17
--- /dev/null
+++ b/.github/workflows/auto_release.yml
@@ -0,0 +1,81 @@
+name: "Auto release"
+
+on:
+  schedule:
+    - cron: '0 3 * * 6'
+  workflow_dispatch:
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6 
+  HONEYCOMB_DATASET: litmus tests
+  CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  auto_release:
+    name: "Automatic release prep"
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: "Honeycomb: Start recording"
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+
+    - name: "Honeycomb: start first step"
+      run: |
+        echo STEP_ID="auto-release" >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: "Checkout Source"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+
+    - name: "PDK Release prep"
+      uses: docker://puppet/pdk:nightly
+      with:
+        args: 'release prep --force'
+      env:
+        CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: "Get Version"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      id: gv
+      run: |
+        echo "::set-output name=ver::$(cat metadata.json | jq .version | tr -d \")"
+
+    - name: "Commit changes"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+        git add .
+        git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
+
+    - name: Create Pull Request
+      id: cpr
+      uses: puppetlabs/peter-evans-create-pull-request@v3
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
+        branch: "release-prep"
+        delete-branch: true
+        title: "Release prep v${{ steps.gv.outputs.ver }}"
+        body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb)"
+        labels: "maintenance"
+
+    - name: PR outputs
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+        echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+    - name: "Honeycomb: Record finish step"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'
diff --git a/.rubocop.yml b/.rubocop.yml
index 6a240fe7f3..ef988c2498 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -30,6 +30,9 @@ RSpec/BeforeAfterAll:
 RSpec/HookArgument:
   Description: Prefer explicit :each argument, matching existing module's style
   EnforcedStyle: each
+RSpec/DescribeSymbol:
+  Exclude:
+  - spec/unit/facter/**/*.rb
 Style/BlockDelimiters:
   Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
     be consistent then.
@@ -405,6 +408,8 @@ Style/ExponentialNotation:
   Enabled: false
 Style/FloatDivision:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
 Style/GlobalStdStream:
   Enabled: false
 Style/HashAsLastArrayItem:
diff --git a/metadata.json b/metadata.json
index c7bf220b7f..cda175026a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,7 +81,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.19.0.pre (47)",
+  "pdk-version": "1.18.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g1862b96"
+  "template-ref": "heads/main-0-g44cc7ed"
 }

From 6190306bfd7e1202a90f32c2514b9639d630183a Mon Sep 17 00:00:00 2001
From: Christian Castelli <34291598+cdamage@users.noreply.github.com>
Date: Fri, 5 Feb 2021 15:23:14 -0600
Subject: [PATCH 1766/2267] Fix issues when using php8

PHP8 dropped the conventions of including the major versions in apache modules. This fix makes it so that moving forward the module will no longer add the major in the relevant places.

before change:
/etc/httpd/conf.modules.d/php8.conf
/etc/httpd/conf.modules.d/php8.load
^---Content---^
LoadModule php8_module modules/libphp8.so

Apache won't load

After change:
/etc/httpd/conf.modules.d/php.conf
/etc/httpd/conf.modules.d/php.load
^---Content---^
LoadModule php_module modules/libphp.so
---
 manifests/mod/php.pp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 7b320d0066..b8b1449d93 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -17,7 +17,11 @@
   $libphp_prefix    = 'libphp'
 ) inherits apache::params {
   include apache
-  $mod = "php${php_version}"
+  if $php_version <= '7' {
+    $mod = "php${php_version}"
+  } else {
+    $mod = "php"
+  }
 
   if $apache::version::scl_httpd_version == undef and $apache::version::scl_php_version != undef {
     fail('If you define apache::version::scl_php_version, you also need to specify apache::version::scl_httpd_version')
@@ -75,7 +79,7 @@
       id             => "php${_php_major}_module",
       path           => "${apache::lib_path}/mod_${mod}.so",
     }
-  } else {
+  } elsif $php_version <= '7' {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
@@ -83,6 +87,14 @@
       id             => "php${_php_major}_module",
       path           => $path,
     }
+  } else {
+    ::apache::mod { $mod:
+        package        => $_package_name,
+        package_ensure => $package_ensure,
+        lib            => "${libphp_prefix}.so",
+        id             => "php_module",
+        path           => $path,
+    }
   }
 
   include apache::mod::mime

From 8dee6e17ad3d0751e374c541308414d6bdb03457 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 8 Feb 2021 10:14:33 +0000
Subject: [PATCH 1767/2267] (MODULES_10899) Use versioncmp function for
 $php_version

Also remove restriction on tests so they execute on SLES platforms
---
 manifests/mod/php.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index b8b1449d93..25f857a456 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -3,7 +3,6 @@
 # 
 # @todo
 #   Add docs
-# @note Unsupported platforms: SLES: all
 class apache::mod::php (
   $package_name     = undef,
   $package_ensure   = 'present',
@@ -17,7 +16,7 @@
   $libphp_prefix    = 'libphp'
 ) inherits apache::params {
   include apache
-  if $php_version <= '7' {
+  if (versioncmp($php_version, '7') <= 0) {
     $mod = "php${php_version}"
   } else {
     $mod = "php"
@@ -79,7 +78,7 @@
       id             => "php${_php_major}_module",
       path           => "${apache::lib_path}/mod_${mod}.so",
     }
-  } elsif $php_version <= '7' {
+  } elsif (versioncmp($php_version, '7') <= 0) {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,

From 0d175da719a5809a91e7426119e98cd3f3ed98c7 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 8 Feb 2021 10:25:09 +0000
Subject: [PATCH 1768/2267] (MODULES-10899) Fix double quoted string issues

---
 manifests/mod/php.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 25f857a456..0f15fba3f8 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -19,7 +19,7 @@
   if (versioncmp($php_version, '7') <= 0) {
     $mod = "php${php_version}"
   } else {
-    $mod = "php"
+    $mod = 'php'
   }
 
   if $apache::version::scl_httpd_version == undef and $apache::version::scl_php_version != undef {
@@ -91,7 +91,7 @@
         package        => $_package_name,
         package_ensure => $package_ensure,
         lib            => "${libphp_prefix}.so",
-        id             => "php_module",
+        id             => 'php_module',
         path           => $path,
     }
   }

From 5285ae3ee31d2a539d9a451113f5a29ccd124bb1 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Mon, 8 Feb 2021 14:39:41 +0000
Subject: [PATCH 1769/2267] (MODULES-10899) Install PHP 7 by default on SLES >=
 15

On SLES >= 15 it appears as though the `apache2-mod_php5` package
is no longer available in the default repo.

This commit ensures that the default value for the $php_version
parameter is 7 on SLES >= 15 and the appropriate `apache2-mod_php7`
package is used.

The spec test expectations have also been updated based on the
changes.
---
 manifests/mod/php.pp            | 4 ++--
 manifests/params.pp             | 9 +++++----
 spec/acceptance/mod_php_spec.rb | 4 ++++
 spec/classes/mod/php_spec.rb    | 1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 0f15fba3f8..e072590c0a 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -16,7 +16,7 @@
   $libphp_prefix    = 'libphp'
 ) inherits apache::params {
   include apache
-  if (versioncmp($php_version, '7') <= 0) {
+  if (versioncmp($php_version, '8') < 0) {
     $mod = "php${php_version}"
   } else {
     $mod = 'php'
@@ -78,7 +78,7 @@
       id             => "php${_php_major}_module",
       path           => "${apache::lib_path}/mod_${mod}.so",
     }
-  } elsif (versioncmp($php_version, '7') <= 0) {
+  } elsif (versioncmp($php_version, '8') < 0) {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
diff --git a/manifests/params.pp b/manifests/params.pp
index bad6f3e5f7..0576ec0dc4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -698,26 +698,27 @@
     $logroot_mode        = undef
     $lib_path            = '/usr/lib64/apache2' #changes for some modules based on mpm
     $mpm_module          = 'prefork'
-
     if versioncmp($::operatingsystemrelease, '15') < 0 {
       $default_ssl_cert    = '/etc/apache2/ssl.crt/server.crt'
       $default_ssl_key     = '/etc/apache2/ssl.key/server.key'
+      $php_version         = '5'
     } else {
       $default_ssl_cert    = '/etc/apache2/ssl.crt/default-server.crt'
       $default_ssl_key     = '/etc/apache2/ssl.key/default-server.key'
+      $php_version         = '7'
     }
+    $suphp_configpath    = "/etc/php${php_version}/apache2"
     $ssl_sessioncache    = '/var/lib/apache2/ssl_scache(512000)'
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
-    $suphp_configpath    = '/etc/php5/apache2'
-    $php_version         = '5'
     if versioncmp($::operatingsystemrelease, '11') < 0 or versioncmp($::operatingsystemrelease, '12') >= 0 {
-      $mod_packages      = {
+      $mod_packages = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
         'auth_gssapi' => 'apache2-mod_auth_gssapi',
         'dav_svn'     => 'subversion-server',
         'perl'        => 'apache2-mod_perl',
         'php5'        => 'apache2-mod_php5',
+        'php7'        => 'apache2-mod_php7',
         'python'      => 'apache2-mod_python',
         'security'    => 'apache2-mod_security2',
         'worker'      => 'apache2-worker',
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index b95f738542..2917445416 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -45,6 +45,10 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
+    elsif os[:family] == 'sles' && os[:release].to_i >= 15
+      describe file("#{apache_hash['mod_dir']}/php7.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
     else
       describe file("#{apache_hash['mod_dir']}/php5.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 05a6de020f..1fb0637ba6 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -207,6 +207,7 @@
 
       # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
       next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
+              (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
               (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
               (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS'))
 

From bc3f35caf02fd784f0754e9dff78b8a2950ec7cf Mon Sep 17 00:00:00 2001
From: Beat Christen <beat.christen@systarch.com>
Date: Mon, 15 Feb 2021 16:07:14 +0100
Subject: [PATCH 1770/2267] (MODULES-10899) Fix for debian10/experimental with
 tests

This commit introduces the `$_module_id` variable which will be
populated with the correct module ID based on the version specified.
This makes things a bit more explicit and easier to follow.

Also, two spec tests added for the following scenario:
- Debian 10 (out of the box) using PHP 7.3
- Debian 10 (experimental) using PHP 8.0
---
 manifests/mod/php.pp         | 19 ++++++++-----------
 spec/classes/mod/php_spec.rb | 23 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index e072590c0a..77cd0ed1f6 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -69,31 +69,28 @@
     # Controls php version and libphp prefix
     $_lib = "${libphp_prefix}${php_version}.so"
   }
+  $_module_id = $_php_major ? {
+    '5'     => 'php5_module',
+    '7'     => 'php7_module',
+    default => 'php_module',
+  }
 
   if $::operatingsystem == 'SLES' {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
       lib            => "mod_${mod}.so",
-      id             => "php${_php_major}_module",
+      id             => $_module_id,
       path           => "${apache::lib_path}/mod_${mod}.so",
     }
-  } elsif (versioncmp($php_version, '8') < 0) {
+  } else {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
       lib            => $_lib,
-      id             => "php${_php_major}_module",
+      id             => $_module_id,
       path           => $path,
     }
-  } else {
-    ::apache::mod { $mod:
-        package        => $_package_name,
-        package_ensure => $package_ensure,
-        lib            => "${libphp_prefix}.so",
-        id             => 'php_module',
-        path           => $path,
-    }
   }
 
   include apache::mod::mime
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 1fb0637ba6..885b1a2e6d 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -53,6 +53,29 @@
                 )
               }
             end
+          when '10'
+            context 'on buster' do
+              it { is_expected.to contain_apache__mod('php7.3') }
+              it { is_expected.to contain_package('libapache2-mod-php7.3') }
+              it {
+                is_expected.to contain_file('php7.3.load').with(
+                  content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.3.so\n",
+                )
+              }
+            end
+            context 'on buster with experimental php8.0' do
+              let :params do
+                { php_version: '8.0' }
+              end
+
+              it { is_expected.to contain_apache__mod('php') }
+              it { is_expected.to contain_package('libapache2-mod-php8.0') }
+              it {
+                is_expected.to contain_file('php.load').with(
+                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
+                )
+              }
+            end
           when '16.04'
             context 'on stretch' do
               let :params do

From 76905ca48c6aeee5d62e18468b722abc44a4ad6f Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Tue, 16 Feb 2021 19:19:02 +0200
Subject: [PATCH 1771/2267] Add auto_release.yml to sync.yml

---
 .sync.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index 9aa078287c..5119761ef4 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -45,6 +45,8 @@ spec/spec_helper.rb:
   unmanaged: false
 .github/workflows/pr_test.yml:
   unmanaged: false
+.github/workflows/auto_release.yml:
+  unmanaged: false
 Rakefile:
   extras:
     "FastGettext.default_text_domain = 'default-text-domain'"

From 583f423d381f906c1ce1ec70c77218dc97da1514 Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Tue, 16 Feb 2021 21:18:30 +0000
Subject: [PATCH 1772/2267] Release version 5.10.0

---
 CHANGELOG.md  | 14 +++++++++++++-
 REFERENCE.md  | 20 ++++++++++++++++++--
 metadata.json |  2 +-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b5ee020d5..39601b1e7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.10.0) (2021-02-16)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.9.0...v5.10.0)
+
+### Added
+
+- \(IAC-1186\) Add $use\_port\_for\_filenames parameter [\#2122](https://github.com/puppetlabs/puppetlabs-apache/pull/2122) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- \(MODULES-10899\) Handle PHP8 MOD package naming convention changes [\#2121](https://github.com/puppetlabs/puppetlabs-apache/pull/2121) ([sanfrancrisko](https://github.com/sanfrancrisko))
+
 ## [v5.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.9.0) (2021-01-25)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.8.0...v5.9.0)
@@ -114,6 +126,7 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 - \(FM-8672\) - Addition of Support for CentOS 8 [\#1977](https://github.com/puppetlabs/puppetlabs-apache/pull/1977) ([david22swan](https://github.com/david22swan))
+- \(MODULES-9948\) Allow switching of thread modules [\#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
 
 ### Fixed
 
@@ -129,7 +142,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Added
 
-- \(MODULES-9948\) Allow switching of thread modules [\#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
 - Add parameter version for mod security [\#1953](https://github.com/puppetlabs/puppetlabs-apache/pull/1953) ([tuxmea](https://github.com/tuxmea))
 - add possibility to define variables inside VirtualHost definition [\#1947](https://github.com/puppetlabs/puppetlabs-apache/pull/1947) ([trefzer](https://github.com/trefzer))
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 3d11040707..1962888b47 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5332,8 +5332,6 @@ Installs `mod_php`.
 
 * **TODO** Add docs
 
-* **Note** Unsupported platforms: SLES: all
-
 #### Parameters
 
 The following parameters are available in the `apache::mod::php` class:
@@ -7552,6 +7550,7 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`access_log_env_var`](#access_log_env_var)
 * [`access_logs`](#access_logs)
 * [`use_servername_for_filenames`](#use_servername_for_filenames)
+* [`use_port_for_filenames`](#use_port_for_filenames)
 * [`aliases`](#aliases)
 * [`directories`](#directories)
 * [`error_log`](#error_log)
@@ -8252,6 +8251,14 @@ Data type: `Optional[Boolean]`
 
 
 
+Default value: ``false``
+
+##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
+
+Data type: `Optional[Boolean]`
+
+
+
 Default value: ``false``
 
 ##### <a name="aliases"></a>`aliases`
@@ -9769,6 +9776,7 @@ The following parameters are available in the `apache::vhost::fragment` defined
 * [`priority`](#priority)
 * [`content`](#content)
 * [`order`](#order)
+* [`port`](#port)
 
 ##### <a name="vhost"></a>`vhost`
 
@@ -9802,6 +9810,14 @@ The order to insert the fragment at
 
 Default value: `900`
 
+##### <a name="port"></a>`port`
+
+Data type: `Optional[Integer[0]]`
+
+
+
+Default value: ``undef``
+
 ## Resource types
 
 ### <a name="a2mod"></a>`a2mod`
diff --git a/metadata.json b/metadata.json
index 10a9cbf8d8..9707416732 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.9.0",
+  "version": "5.10.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From ce0c38dcac722aa66a206ce5f23f01839fbfe340 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 27 Dec 2020 14:19:12 +0100
Subject: [PATCH 1773/2267] Drop Ubuntu 10.04 compatibility code

This is long End of Life and should not be supported.
---
 README.md               | 4 ----
 REFERENCE.md            | 1 -
 manifests/mod/ssl.pp    | 3 ---
 manifests/params.pp     | 2 +-
 readmes/README_ja_JP.md | 5 -----
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/README.md b/README.md
index fc0c66b665..481cda31b8 100755
--- a/README.md
+++ b/README.md
@@ -908,10 +908,6 @@ See [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linu
 
 You must set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
-### Ubuntu 10.04
-
-The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
-
 ### Ubuntu 16.04
 The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 1962888b47..8543c9854a 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6492,7 +6492,6 @@ Default based on the OS and/or Apache version:
 - RedHat/FreeBSD/Suse/Gentoo: 'default'.
 - Debian/Ubuntu + Apache >= 2.4: 'default'.
 - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
-- Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
 
 Default value: ``undef``
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 1d4026a59a..28ac3d0439 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -61,7 +61,6 @@
 #   - RedHat/FreeBSD/Suse/Gentoo: 'default'.
 #   - Debian/Ubuntu + Apache >= 2.4: 'default'.
 #   - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
-#   - Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
 #
 # @param apache_version
 #   Used to verify that the Apache version you have requested is compatible with the module.
@@ -111,8 +110,6 @@
       'debian': {
         if versioncmp($_apache_version, '2.4') >= 0 {
           $_ssl_mutex = 'default'
-        } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
-          $_ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
         } else {
           $_ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex"
         }
diff --git a/manifests/params.pp b/manifests/params.pp
index 0576ec0dc4..da6fd9f217 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -781,7 +781,7 @@
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
 
-  if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::operatingsystem == 'SLES') {
+  if $::operatingsystem == 'SLES' {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } elsif $::operatingsystem == 'FreeBSD' {
     $verify_command = '/usr/local/sbin/apachectl -t'
diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 2e9a564892..22fbebcc14 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -2851,7 +2851,6 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
   * RedHat/FreeBSD/Suse/Gentoo: 'default'.
   * Debian/Ubuntu + Apache >= 2.4: 'default'.
   * Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'.
-  * Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
 
 
 ##### クラス: `apache::mod::status`
@@ -5734,10 +5733,6 @@ apache::vhost { 'test.server':
 
 `chcon`ではなく、`semanage fcontext`を用いてコンテキストを設定する必要があります。これは、Puppetの`file`リソースでは、リソースにより指定されていない場合、その値のコンテキストがリセットされるためです。
 
-### Ubuntu 10.04
-
-[`apache::vhost::WSGIImportScript`][]パラメータにより、Apacheの古いバージョンではサポートされていないバーチャルホスト内のステートメントが作成され、不具合が生じます。これは今後のリファクタリングで修正される予定です。
-
 ### Ubuntu 16.04
 [`apache::mod::suphp`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。
 

From b73c185cef67154acee4a5a3ddcbabb46d4d4e5a Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Mon, 22 Feb 2021 15:43:39 +0000
Subject: [PATCH 1774/2267] Update .github/workflows/auto_release.yml

updating user email

Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
---
 .github/workflows/auto_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index a88b99ca17..cf8dda9320 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -51,7 +51,7 @@ jobs:
     - name: "Commit changes"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        git config --local user.email "action@github.com"
+        git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
         git config --local user.name "GitHub Action"
         git add .
         git commit -m "Release prep v${{ steps.gv.outputs.ver }}"

From 7bf415d12f36f110c468a5aeba6241daf3a6a9d6 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Mon, 22 Feb 2021 15:44:17 +0000
Subject: [PATCH 1775/2267] Update .github/workflows/auto_release.yml

updating jq for metadata.json

Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
---
 .github/workflows/auto_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index cf8dda9320..f9760d23f1 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -46,7 +46,7 @@ jobs:
       if: ${{ github.repository_owner == 'puppetlabs' }}
       id: gv
       run: |
-        echo "::set-output name=ver::$(cat metadata.json | jq .version | tr -d \")"
+        echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
 
     - name: "Commit changes"
       if: ${{ github.repository_owner == 'puppetlabs' }}

From 13cc4f3c20742f7d8ccb2e3b1025892c65b6801b Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Mon, 22 Feb 2021 15:59:33 +0000
Subject: [PATCH 1776/2267] (maint) Update major dependencies prior to release

---
 metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index 9707416732..15cf611bae 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,11 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 7.0.0"
+      "version_requirement": ">= 4.13.1 < 8.0.0"
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 2.2.1 < 7.0.0"
+      "version_requirement": ">= 2.2.1 < 8.0.0"
     }
   ],
   "operatingsystem_support": [

From d2ba503859ef520309f03e3faf22ce1856350877 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Wed, 24 Feb 2021 17:04:18 +0000
Subject: [PATCH 1777/2267] (MAINT) Remove SLES 11 support

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 15cf611bae..c7847e2c8d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -59,7 +59,6 @@
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "11 SP1",
         "12",
         "15"
       ]

From 9ab68de649f1ad7d4db3e6e119cd8a4ef6fbed62 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Thu, 25 Feb 2021 16:14:49 +0000
Subject: [PATCH 1778/2267] (MAINT) pdk update

---
 .github/workflows/nightly.yml | 19 ++++++++++--------
 .github/workflows/pr_test.yml | 18 +++++++++--------
 .rubocop.yml                  |  5 +++++
 .travis.yml                   | 37 -----------------------------------
 metadata.json                 |  4 ++--
 5 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 0c1fd28b9c..abf8e7d7a6 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -58,7 +58,7 @@ jobs:
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
         else
           echo  "::set-output name=matrix::{}"
         fi
@@ -69,6 +69,7 @@ jobs:
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
 
   Acceptance:
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
     needs:
       - setup_matrix
 
@@ -82,8 +83,10 @@ jobs:
 
     steps:
     - run: |
-        echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
+        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
+
 
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
@@ -91,11 +94,11 @@ jobs:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
         job-status: ${{ job.status }}
-        matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
+        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
 
     - name: "Honeycomb: start first step"
       run: |
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
@@ -117,12 +120,12 @@ jobs:
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo
@@ -144,7 +147,7 @@ jobs:
       run: |
         echo ::group::honeycomb step
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
 
@@ -156,7 +159,7 @@ jobs:
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 207dfcadd5..fb9ff97650 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -55,7 +55,7 @@ jobs:
       id: get-matrix
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
         else
           echo  "::set-output name=matrix::{}"
         fi
@@ -66,6 +66,7 @@ jobs:
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
 
   Acceptance:
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
     needs:
       - setup_matrix
     if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
@@ -80,8 +81,9 @@ jobs:
 
     steps:
     - run: |
-        echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
+        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
@@ -89,11 +91,11 @@ jobs:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
         job-status: ${{ job.status }}
-        matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
+        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
 
     - name: "Honeycomb: start first step"
       run: |
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
@@ -115,12 +117,12 @@ jobs:
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo
@@ -142,7 +144,7 @@ jobs:
       run: |
         echo ::group::honeycomb step
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
 
@@ -154,7 +156,7 @@ jobs:
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
diff --git a/.rubocop.yml b/.rubocop.yml
index 6a240fe7f3..ef988c2498 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -30,6 +30,9 @@ RSpec/BeforeAfterAll:
 RSpec/HookArgument:
   Description: Prefer explicit :each argument, matching existing module's style
   EnforcedStyle: each
+RSpec/DescribeSymbol:
+  Exclude:
+  - spec/unit/facter/**/*.rb
 Style/BlockDelimiters:
   Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
     be consistent then.
@@ -405,6 +408,8 @@ Style/ExponentialNotation:
   Enabled: false
 Style/FloatDivision:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
 Style/GlobalStdStream:
   Enabled: false
 Style/HashAsLastArrayItem:
diff --git a/.travis.yml b/.travis.yml
index b65063988b..49e728dbc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,39 +49,6 @@ jobs:
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_deb_puppet5
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_el7_puppet5
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_el8_puppet5
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
     - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
@@ -118,10 +85,6 @@ jobs:
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static
-    -
-      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
-      rvm: 2.4.5
-      stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
       rvm: 2.5.7
diff --git a/metadata.json b/metadata.json
index c7847e2c8d..9c1157827b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -80,7 +80,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.19.0.pre (47)",
+  "pdk-version": "1.18.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g1862b96"
+  "template-ref": "heads/main-0-g2bf2de6"
 }

From 6b2a20a390df597f04222571dc7fac366a8ea898 Mon Sep 17 00:00:00 2001
From: Ciaran McCrisken <ciaran.mccrisken@puppet.com>
Date: Thu, 25 Feb 2021 15:36:51 +0000
Subject: [PATCH 1779/2267] (MAINT) Adjust $use_servername_for_filenames
 behaviour change timeline

Given the relatively close time of the `v6.0.0` release after the
`$use_servername_for_filenames` introduction, and the fact that it is
slated to change it's default value and behaviour from the next major
release, we are adjusting the timeline to give more people time to
adjust.
---
 manifests/vhost.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 3326b6fbb7..ff0e2b30a8 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2078,10 +2078,10 @@
   # We will retain the default behaviour for filenames but allow the use of a sanitized version of $servername to be
   # used, using the new $use_servername_for_filenames and $use_port_for_filenames parameters.
   #
-  # This will default to false until the next major release (v6.0.0), at which point, we will default this to true and
-  # warn about it's imminent deprecation in the subsequent major release (v7.0.0)
+  # This will default to false until the next major release (v7.0.0), at which point, we will default this to true and
+  # warn about it's imminent deprecation in the subsequent major release (v8.0.0)
   #
-  # In v7.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether
+  # In v8.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether
   # and use the sanitized value of $servername for default log / config filenames.
   $filename = $use_servername_for_filenames ? {
     true => $use_port_for_filenames ? {
@@ -2098,7 +2098,7 @@
     When $use_servername_for_filenames = true, the $servername parameter, sanitized, is used to construct log and config
     file names.
 
-    From version v6.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v7.0.0 of the
+    From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
     module, the $use_servername_for_filenames will be removed and log/config file names will be dervied from the
     sanitized $servername parameter when not explicitly defined.'
     warning($use_servername_for_filenames_warn_msg)
@@ -2109,7 +2109,7 @@
     When $use_port_for_filenames = true, the $servername and $port parameters, sanitized, are used to construct log and
     config file names.
 
-    From version v6.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v7.0.0 of the
+    From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
     module, the $use_port_for_filenames will be removed and log/config file names will be dervied from the
     sanitized $servername parameter when not explicitly defined.'
     warning($use_port_for_filenames_warn_msg)

From 13a75a89058990c686b206f431f7afbaa0ed8113 Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Tue, 2 Mar 2021 10:51:20 +0000
Subject: [PATCH 1780/2267] Release version 6.0.0

---
 CHANGELOG.md  | 19 ++++++++++++++-----
 metadata.json |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39601b1e7b..0a7a90e975 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,16 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v5.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.10.0) (2021-02-16)
+## [v6.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.0) (2021-03-02)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.10.0...v6.0.0)
+
+### Changed
+
+- pdksync - \(MAINT\) Remove SLES 11 support [\#2132](https://github.com/puppetlabs/puppetlabs-apache/pull/2132) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [\#2125](https://github.com/puppetlabs/puppetlabs-apache/pull/2125) ([carabasdaniel](https://github.com/carabasdaniel))
+
+## [v5.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.10.0) (2021-02-17)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.9.0...v5.10.0)
 
@@ -67,8 +76,8 @@ All notable changes to this project will be documented in this file. The format
 
 ### Added
 
-- Configure default shared lib path for mod\_wsgi on RHEL8 [\#2063](https://github.com/puppetlabs/puppetlabs-apache/pull/2063) ([nbarrientos](https://github.com/nbarrientos))
 - Various enhancements to apache::mod::passenger [\#2058](https://github.com/puppetlabs/puppetlabs-apache/pull/2058) ([smortex](https://github.com/smortex))
+- Allow IPv6 CIDRs for proxy\_protocol\_exceptions in mod remoteip [\#2033](https://github.com/puppetlabs/puppetlabs-apache/pull/2033) ([thechristschn](https://github.com/thechristschn))
 
 ### Fixed
 
@@ -82,7 +91,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Added
 
-- Allow IPv6 CIDRs for proxy\_protocol\_exceptions in mod remoteip [\#2033](https://github.com/puppetlabs/puppetlabs-apache/pull/2033) ([thechristschn](https://github.com/thechristschn))
+- Configure default shared lib path for mod\_wsgi on RHEL8 [\#2063](https://github.com/puppetlabs/puppetlabs-apache/pull/2063) ([nbarrientos](https://github.com/nbarrientos))
 - \(IAC-746\) - Add ubuntu 20.04 support [\#2032](https://github.com/puppetlabs/puppetlabs-apache/pull/2032) ([david22swan](https://github.com/david22swan))
 - Replace legacy `bool2httpd\(\)` function with shim [\#2025](https://github.com/puppetlabs/puppetlabs-apache/pull/2025) ([alexjfisher](https://github.com/alexjfisher))
 - Tidy up `pw\_hash` function [\#2024](https://github.com/puppetlabs/puppetlabs-apache/pull/2024) ([alexjfisher](https://github.com/alexjfisher))
@@ -144,6 +153,7 @@ All notable changes to this project will be documented in this file. The format
 
 - Add parameter version for mod security [\#1953](https://github.com/puppetlabs/puppetlabs-apache/pull/1953) ([tuxmea](https://github.com/tuxmea))
 - add possibility to define variables inside VirtualHost definition [\#1947](https://github.com/puppetlabs/puppetlabs-apache/pull/1947) ([trefzer](https://github.com/trefzer))
+- Add LDAP parameters to httpd.conf [\#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
 
 ### Fixed
 
@@ -164,7 +174,6 @@ All notable changes to this project will be documented in this file. The format
 - \(FM-8214\) converted to use litmus [\#1938](https://github.com/puppetlabs/puppetlabs-apache/pull/1938) ([tphoney](https://github.com/tphoney))
 - \(MODULES-9668 \) Please make ProxyRequests setting in vhost.pp configurable [\#1935](https://github.com/puppetlabs/puppetlabs-apache/pull/1935) ([aukesj](https://github.com/aukesj))
 - Added unmanaged\_path and custom\_fragment options to userdir [\#1931](https://github.com/puppetlabs/puppetlabs-apache/pull/1931) ([GeorgeCox](https://github.com/GeorgeCox))
-- Add LDAP parameters to httpd.conf [\#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
 - Add LDAPReferrals configuration parameter [\#1928](https://github.com/puppetlabs/puppetlabs-apache/pull/1928) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
 
 ### Fixed
@@ -206,6 +215,7 @@ All notable changes to this project will be documented in this file. The format
 - Add support for mod\_http2 [\#1867](https://github.com/puppetlabs/puppetlabs-apache/pull/1867) ([smortex](https://github.com/smortex))
 - Added code to paramertize the libphp prefix [\#1852](https://github.com/puppetlabs/puppetlabs-apache/pull/1852) ([grahamuk2018](https://github.com/grahamuk2018))
 - Added WSGI Options WSGIApplicationGroup and WSGIPythonOptimize [\#1847](https://github.com/puppetlabs/puppetlabs-apache/pull/1847) ([emetriqLikedeeler](https://github.com/emetriqLikedeeler))
+- Add option to add comments to the header of a vhost file [\#1841](https://github.com/puppetlabs/puppetlabs-apache/pull/1841) ([jovandeginste](https://github.com/jovandeginste))
 
 ### Fixed
 
@@ -239,7 +249,6 @@ All notable changes to this project will be documented in this file. The format
 - \(MODULES-5990\) Addition of 'IncludeOptional conf-enabled/\*.conf' to apache2.conf' on Debian Family OS [\#1851](https://github.com/puppetlabs/puppetlabs-apache/pull/1851) ([david22swan](https://github.com/david22swan))
 - \(MODULES-8107\) - Support added for Ubuntu 18.04. [\#1850](https://github.com/puppetlabs/puppetlabs-apache/pull/1850) ([david22swan](https://github.com/david22swan))
 - \(MODULES-8108\) - Support added for Debian 9 [\#1849](https://github.com/puppetlabs/puppetlabs-apache/pull/1849) ([david22swan](https://github.com/david22swan))
-- Add option to add comments to the header of a vhost file [\#1841](https://github.com/puppetlabs/puppetlabs-apache/pull/1841) ([jovandeginste](https://github.com/jovandeginste))
 
 ### Fixed
 
diff --git a/metadata.json b/metadata.json
index 5a1613aa8c..b8ab42c7a3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "5.10.0",
+  "version": "6.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 183489e9e7533ba2386bfbb0eebe957ac3d2b8ed Mon Sep 17 00:00:00 2001
From: Martijn de Gouw <martijn.de.gouw@prodrive-technologies.com>
Date: Mon, 1 Mar 2021 11:30:09 +0100
Subject: [PATCH 1781/2267] Always apply dav_svn/authz_svn work-around

The work-around that distros apply for dav_svn/authz_svn module loading
issue is overwritten by this module. Always apply the work-around.
---
 manifests/mod/dav_svn.pp         | 10 +++-------
 spec/classes/mod/dav_svn_spec.rb |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 916e830619..4c04d1b354 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -21,15 +21,11 @@
 
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and ! ($::operatingsystemmajrelease in ['6', '9', '16.04', '18.04']) {
-    $loadfile_name = undef
-  } else {
-    $loadfile_name = 'dav_svn_authz_svn.load'
-  }
-
   if $authz_svn_enabled {
     ::apache::mod { 'authz_svn':
-      loadfile_name => $loadfile_name,
+      # authz_svn depends on symbols from the dav_svn module,
+      # therefore, make sure authz_svn is loaded after dav_svn.
+      loadfile_name => 'dav_svn_authz_svn.load',
       require       => Apache::Mod['dav_svn'],
     }
   }
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 68d6beded5..affdb367e4 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -24,7 +24,7 @@
         it { is_expected.to contain_apache__mod('dav_svn') }
         it { is_expected.to contain_package('libapache2-svn') }
         it { is_expected.to contain_apache__mod('authz_svn') }
-        it { is_expected.to contain_file('authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
+        it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
       end
     end
     context 'on a RedHat OS' do

From 14981499369e514558f1a0c4c797a20538ae4803 Mon Sep 17 00:00:00 2001
From: Martijn de Gouw <martijn.de.gouw@prodrive-technologies.com>
Date: Mon, 1 Mar 2021 22:01:59 +0100
Subject: [PATCH 1782/2267] Add testcase for the work-around in
 apache::mod:dav_svn

---
 spec/acceptance/mod_dav_svn_spec.rb | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 spec/acceptance/mod_dav_svn_spec.rb

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
new file mode 100644
index 0000000000..956036b747
--- /dev/null
+++ b/spec/acceptance/mod_dav_svn_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::dav_svn class' do
+  context 'dav_svn module with authz_svn disabled' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      class { 'apache::mod::dav_svn':
+        authz_svn_enabled => false,
+      }
+    MANIFEST
+
+    it 'applies with no errors' do
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    it 'applies a second time without changes' do
+      apply_manifest(pp, catch_changes: true)
+    end
+  end
+
+  context 'dav_svn module with authz_svn enabled' do
+    pp = <<-MANIFEST
+      class { 'apache': }
+      class { 'apache::mod::dav_svn':
+        authz_svn_enabled => true,
+      }
+    MANIFEST
+
+    it 'applies with no errors' do
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    it 'applies a second time without changes' do
+      apply_manifest(pp, catch_changes: true)
+    end
+  end
+end

From c1717984f1d601afaf81b54e963e8b278b637959 Mon Sep 17 00:00:00 2001
From: Pami Ketolainen <pami.ketolainen@jolla.com>
Date: Thu, 11 Mar 2021 16:27:15 +0200
Subject: [PATCH 1783/2267] Fix HEADER* and README* wildcards in IndexIgnore

The original intent of HEADER* and README* in the IndexIgnore was
probably to ignore the files that are included at the top (HeaderName) and
bottom (ReadmeName) of the index listing. But the wildcard will hide other
files, like README.txt, so use full filenames instead.
---
 templates/mod/autoindex.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/autoindex.conf.erb b/templates/mod/autoindex.conf.erb
index d9d453f142..e097f9c9b1 100644
--- a/templates/mod/autoindex.conf.erb
+++ b/templates/mod/autoindex.conf.erb
@@ -53,4 +53,4 @@ DefaultIcon /<%= @icons_prefix %>/unknown.gif
 ReadmeName README.html
 HeaderName HEADER.html
 
-IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
+IndexIgnore .??* *~ *# HEADER.html README.html RCS CVS *,v *,t

From 7f26435d8659a4e70bbd91f7ad3ffc076c92929e Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 15 Mar 2021 18:45:22 +0200
Subject: [PATCH 1784/2267] Replace Travis and Appveyor with Github Actions

---
 .github/workflows/auto_release.yml |   4 +-
 .github/workflows/nightly.yml      |  11 ++-
 .github/workflows/pr_test.yml      |  11 ++-
 .github/workflows/release.yml      |  47 +++++++++++
 .github/workflows/spec.yml         | 124 +++++++++++++++++++++++++++++
 .pdkignore                         |   1 +
 .sync.yml                          |  33 ++------
 .travis.yml                        |  58 ++------------
 metadata.json                      |   2 +-
 9 files changed, 208 insertions(+), 83 deletions(-)
 create mode 100644 .github/workflows/release.yml
 create mode 100644 .github/workflows/spec.yml

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index f9760d23f1..affeca9071 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -36,7 +36,7 @@ jobs:
         persist-credentials: false
 
     - name: "PDK Release prep"
-      uses: docker://puppet/pdk:nightly
+      uses: docker://puppet/iac_release:ci
       with:
         args: 'release prep --force'
       env:
@@ -66,7 +66,7 @@ jobs:
         branch: "release-prep"
         delete-branch: true
         title: "Release prep v${{ steps.gv.outputs.ver }}"
-        body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb)"
+        body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}"
         labels: "maintenance"
 
     - name: PR outputs
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index abf8e7d7a6..865578cfd2 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -131,7 +131,14 @@ jobs:
         echo
         echo ::endgroup::
         echo ::group::=== INVENTORY ===
-        sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
+        if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
+        then
+          FILE='spec/fixtures/litmus_inventory.yaml'
+        elif [ -f 'inventory.yaml' ];
+        then
+          FILE='inventory.yaml'
+        fi
+        sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
         echo ::endgroup::
 
     - name: Install agent
@@ -166,7 +173,7 @@ jobs:
       if: ${{ always() }}
       continue-on-error: true
       run: |
-        if [ -f inventory.yaml ]; then
+        if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
           buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
           echo ::group::=== REQUEST ===
           cat request.json || true
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index fb9ff97650..69e414b558 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -128,7 +128,14 @@ jobs:
         echo
         echo ::endgroup::
         echo ::group::=== INVENTORY ===
-        sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
+        if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
+        then
+          FILE='spec/fixtures/litmus_inventory.yaml'
+        elif [ -f 'inventory.yaml' ];
+        then
+          FILE='inventory.yaml'
+        fi
+        sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
         echo ::endgroup::
 
     - name: Install agent
@@ -163,7 +170,7 @@ jobs:
       if: ${{ always() }}
       continue-on-error: true
       run: |
-        if [ -f inventory.yaml ]; then
+        if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
           buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
           echo ::group::=== REQUEST ===
           cat request.json || true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..1509f6e91f
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,47 @@
+name: "Publish module"
+
+on:
+  workflow_dispatch:
+  
+jobs:
+  create-github-release:
+    name: Deploy GitHub Release
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+          clean: true
+          fetch-depth: 0
+      - name: Get Version
+        id: gv
+        run: |
+          echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
+      - name: Create Release
+        uses: actions/create-release@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: "v${{ steps.gv.outputs.ver }}"
+          draft: false
+          prerelease: false
+
+  deploy-forge:
+    name: Deploy to Forge
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+          clean: true
+      - name: "PDK Build"
+        uses: docker://puppet/pdk:nightly
+        with:
+          args: 'build'
+      - name: "Push to Forge"
+        uses: docker://puppet/pdk:nightly
+        with:
+          args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
new file mode 100644
index 0000000000..209dd3f4a5
--- /dev/null
+++ b/.github/workflows/spec.yml
@@ -0,0 +1,124 @@
+name: "Spec Tests"
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+  pull_request:
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+  HONEYCOMB_DATASET: litmus tests
+
+jobs:
+  setup_matrix:
+    name: "Setup Test Matrix"
+    runs-on: ubuntu-20.04
+    outputs:
+      spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
+
+    steps:
+      - name: "Honeycomb: Start recording"
+        uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+        with:
+          apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+          dataset: ${{ env.HONEYCOMB_DATASET }}
+          job-status: ${{ job.status }}
+
+      - name: "Honeycomb: Start first step"
+        run: |
+          echo STEP_ID=setup-environment >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+      - name: Checkout Source
+        uses: actions/checkout@v2
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+
+      - name: Activate Ruby 2.7
+        uses: ruby/setup-ruby@v1
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        with:
+          ruby-version: "2.7"
+          bundler-cache: true
+
+      - name: Print bundle environment
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          echo ::group::bundler environment
+          buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+          echo ::endgroup::
+
+      - name: "Honeycomb: Record Setup Environment time"
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+          echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+      - name: Setup Acceptance Test Matrix
+        id: get-matrix
+        run: |
+          if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
+            buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
+          else
+            echo  "::set-output name=spec_matrix::{}"
+          fi
+
+      - name: "Honeycomb: Record Setup Test Matrix time"
+        if: ${{ always() }}
+        run: |
+          buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
+
+  Spec:
+    name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
+    needs:
+      - setup_matrix
+    if: ${{ needs.setup_matrix.outputs.spec_matrix != '{}' }}
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.setup_matrix.outputs.spec_matrix)}}
+
+    env:
+      BUILDEVENT_FILE: '../buildevents.txt'
+      PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
+
+    steps:
+      - run: |
+          echo "SANITIZED_PUPPET_VERSION=$(echo '${{ matrix.puppet_version }}' | sed 's/~> //g')" >> $GITHUB_ENV
+
+      - run: |
+          echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
+
+      - name: "Honeycomb: Start first step"
+        run: |
+          echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+      - name: "Honeycomb: Start recording"
+        uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+        with:
+          apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+          dataset: ${{ env.HONEYCOMB_DATASET }}
+          job-status: ${{ job.status }}
+          matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
+
+      - name: Checkout Source
+        uses: actions/checkout@v2
+
+      - name: "Activate Ruby ${{ matrix.ruby_version }}"
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby_version}}
+          bundler-cache: true
+
+      - name: Print bundle environment
+        run: |
+          echo ::group::bundler environment
+          buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+          echo ::endgroup::
+
+      - name: Run parallel_spec tests
+        run: |
+          buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec
diff --git a/.pdkignore b/.pdkignore
index 254808c8f3..a74c4c4f32 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -42,3 +42,4 @@
 /spec/
 /.vscode/
 /.sync.yml
+/.devcontainer/
diff --git a/.sync.yml b/.sync.yml
index 5119761ef4..dd51b095ad 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -3,33 +3,9 @@
   delete: true
 ".rubocop.yml":
   include_todos: true
-".travis.yml":
-  global_env:
-    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
-  deploy_to_forge:
-    enabled: false
-  secure: ''
-  branches:
-  - release
-  use_litmus: true
-  litmus:
-    provision_list:
-    - ---travis_el
-    - travis_deb
-    - travis_el7
-    - travis_el8
-    complex:
-    - collection:
-        puppet_collection:
-        - puppet6
-        provision_list:
-        - travis_ub_6
-  simplecov: true
-  notifications:
-    slack:
-      secure: MrXQwGIUO7WNmLbe7iiWgURiZPUgyvDLkKe3d9S58ohE6gdN6pqlsjP8YgodK8JmIBV1zp5Wj/0cXUmY3xvCtnDmII0DCEk2Y1Cs/W1drKZtS/0BsUpJkj0rDP2fSlKsY5ifESdEta/y8+NkjRnqadbl7SQPYeek4IjAfxjjuig=
 appveyor.yml:
   delete: true
+
 Gemfile:
   optional:
     ":development":
@@ -50,3 +26,10 @@ spec/spec_helper.rb:
 Rakefile:
   extras:
     "FastGettext.default_text_domain = 'default-text-domain'"
+  .github/workflows/spec.yml:
+    checks: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
+    unmanaged: false
+  .github/workflows/release.yml:
+    unmanaged: false
+  .travis.yml:
+    delete: true
diff --git a/.travis.yml b/.travis.yml
index a1da735a64..9381ad15cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,64 +13,20 @@ before_install:
   - gem --version
   - bundle -v
 script:
-  - 'SIMPLECOV=yes bundle exec rake $CHECK'
+  - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
   - 2.5.7
-env:
-  global:
-    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
 stages:
   - static
   - spec
   - acceptance
+  -
+    if: tag =~ ^v\d
+    name: deploy
 jobs:
   fast_finish: true
   include:
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
-      - "bundle exec rake 'litmus:install_agent[puppet6]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_ub_6_puppet6
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
-      - "bundle exec rake 'litmus:install_agent[puppet6]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_deb_puppet6
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
-      - "bundle exec rake 'litmus:install_agent[puppet6]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_el7_puppet6
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    - before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
-      - "bundle exec rake 'litmus:install_agent[puppet6]'"
-      - "bundle exec rake litmus:install_module"
-      env:
-        PLATFORMS: travis_el8_puppet6
-        BUNDLE_WITH: system_tests
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static
@@ -78,12 +34,12 @@ jobs:
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
       rvm: 2.5.7
       stage: spec
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
 branches:
   only:
     - main
     - /^v\d/
-    - release
 notifications:
   email: false
-  slack:
-    secure: MrXQwGIUO7WNmLbe7iiWgURiZPUgyvDLkKe3d9S58ohE6gdN6pqlsjP8YgodK8JmIBV1zp5Wj/0cXUmY3xvCtnDmII0DCEk2Y1Cs/W1drKZtS/0BsUpJkj0rDP2fSlKsY5ifESdEta/y8+NkjRnqadbl7SQPYeek4IjAfxjjuig=
diff --git a/metadata.json b/metadata.json
index b8ab42c7a3..153529859f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -82,5 +82,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.18.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g44cc7ed"
+  "template-ref": "heads/main-0-g7be43a3"
 }

From fe20ad24cbcb69f6f2c9fef7971a6f9a0bbc8404 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Fri, 2 Apr 2021 14:19:34 +0300
Subject: [PATCH 1785/2267] PDK Update for release prep workflow

---
 .github/workflows/auto_release.yml |  7 ++++++-
 Gemfile                            | 10 ----------
 metadata.json                      |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index affeca9071..d15d148d99 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -66,7 +66,12 @@ jobs:
         branch: "release-prep"
         delete-branch: true
         title: "Release prep v${{ steps.gv.outputs.ver }}"
-        body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}"
+        body: |
+          Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}. 
+          Please verify before merging:
+          - [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
+          - [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
+          - [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
         labels: "maintenance"
 
     - name: PR outputs
diff --git a/Gemfile b/Gemfile
index ae2b430dc2..135373d02b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,16 +45,6 @@ gems['puppet'] = location_for(puppet_version)
 gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version
 
-if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
-  # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
-  # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
-  gems['win32-dir'] =      ['<= 0.4.9', require: false]
-  gems['win32-eventlog'] = ['<= 0.6.5', require: false]
-  gems['win32-process'] =  ['<= 0.7.5', require: false]
-  gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['0.8.8', require: false]
-end
-
 gems.each do |gem_name, gem_params|
   gem gem_name, *gem_params
 end
diff --git a/metadata.json b/metadata.json
index 153529859f..ba28f2c17e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -82,5 +82,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "1.18.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g7be43a3"
+  "template-ref": "heads/main-0-g12a5dea"
 }

From 4c8e7cb562361991fe840344554cbfadb4abad5c Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 7 Apr 2021 15:40:50 +0100
Subject: [PATCH 1786/2267] (maint) - Removal of Locales Folder

---
 locales/config.yaml             | 26 --------------------------
 locales/ja/puppetlabs-apache.po | 28 ----------------------------
 locales/puppetlabs-apache.pot   | 25 -------------------------
 3 files changed, 79 deletions(-)
 delete mode 100644 locales/config.yaml
 delete mode 100644 locales/ja/puppetlabs-apache.po
 delete mode 100644 locales/puppetlabs-apache.pot

diff --git a/locales/config.yaml b/locales/config.yaml
deleted file mode 100644
index c837de7d08..0000000000
--- a/locales/config.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# This is the project-specific configuration file for setting up
-# fast_gettext for your project.
-gettext:
-  # This is used for the name of the .pot and .po files; they will be
-  # called <project_name>.pot?
-  project_name: puppetlabs-apache
-  # This is used in comments in the .pot and .po files to indicate what
-  # project the files belong to and should bea little more desctiptive than
-  # <project_name>
-  package_name: puppetlabs-apache
-  # The locale that the default messages in the .pot file are in
-  default_locale: en
-  # The email used for sending bug reports.
-  bugs_address: docs@puppet.com
-  # The holder of the copyright.
-  copyright_holder: Puppet, Inc.
-  # This determines which comments in code should be eligible for translation.
-  # Any comments that start with this string will be externalized. (Leave
-  # empty to include all.)
-  comments_tag: TRANSLATOR
-  # Patterns for +Dir.glob+ used to find all files that might contain
-  # translatable content, relative to the project root directory
-  source_files:
-      - './lib/**/*.rb'
-  
diff --git a/locales/ja/puppetlabs-apache.po b/locales/ja/puppetlabs-apache.po
deleted file mode 100644
index 1d61c897c9..0000000000
--- a/locales/ja/puppetlabs-apache.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-21 14:19+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: 梅田智世 <c-umeda@nifty.com>, 2017\n"
-"Language-Team: Japanese (Japan) (https://www.transifex.com/puppet/teams/29089/ja_JP/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-
-#. metadata.json
-#: .summary
-msgid ""
-"Installs, configures, and manages Apache virtual hosts, web services, and "
-"modules."
-msgstr "Apacheバーチャルホスト、Webサービス、モジュールのインストール、設定、管理。"
-
-#. metadata.json
-#: .description
-msgid "Module for Apache configuration"
-msgstr "Apache設定用のモジュール。"
diff --git a/locales/puppetlabs-apache.pot b/locales/puppetlabs-apache.pot
deleted file mode 100644
index 7602dd885a..0000000000
--- a/locales/puppetlabs-apache.pot
+++ /dev/null
@@ -1,25 +0,0 @@
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-21 14:19+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-
-#. metadata.json
-#: .summary
-msgid ""
-"Installs, configures, and manages Apache virtual hosts, web services, and "
-"modules."
-msgstr ""
-
-#. metadata.json
-#: .description
-msgid "Module for Apache configuration"
-msgstr ""

From f81bbb5cd47c1ead1114e870cb14a0b7599dcc02 Mon Sep 17 00:00:00 2001
From: Pawan Pawar <Pawan.Pawar@factset.com>
Date: Fri, 9 Apr 2021 15:45:11 +0200
Subject: [PATCH 1787/2267] The default disk_cache.conf.erb caches everything.
 Need more control over the default behaviour.

---
 manifests/mod/disk_cache.pp       | 1 +
 templates/mod/disk_cache.conf.erb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index abd46dddde..9d8c5e2069 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -20,6 +20,7 @@
 class apache::mod::disk_cache (
   $cache_root           = undef,
   $cache_ignore_headers = undef,
+  $default_cache_enable = true,
 ) {
   include apache
   if $cache_root {
diff --git a/templates/mod/disk_cache.conf.erb b/templates/mod/disk_cache.conf.erb
index 44d4fd2bca..c97ee76624 100644
--- a/templates/mod/disk_cache.conf.erb
+++ b/templates/mod/disk_cache.conf.erb
@@ -1,4 +1,6 @@
+<% if @default_cache_enable -%>
 CacheEnable disk /
+<% end -%>
 CacheRoot "<%= @_cache_root %>"
 CacheDirLevels 2
 CacheDirLength 1

From 7f6f0e70010725c28f6dc96deb18c3576c8bed07 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Mon, 26 Apr 2021 21:07:50 +0100
Subject: [PATCH 1788/2267] (maint) Running a pdk update to consume latest
 pdk-template changes

---
 .gitignore    | 1 +
 .gitpod.yml   | 2 +-
 .pdkignore    | 1 +
 metadata.json | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2767022cd6..988dcbbe62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 .project
 .envrc
 /inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
diff --git a/.gitpod.yml b/.gitpod.yml
index 18406c5086..9d89d9faa2 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -6,4 +6,4 @@ tasks:
 
 vscode:
   extensions:
-    - puppet.puppet-vscode@1.0.0:oSzfTkDf6Cmc1jOjgW33VA==
+    - puppet.puppet-vscode@1.2.0:f5iEPbmOj6FoFTOV6q8LTg==
diff --git a/.pdkignore b/.pdkignore
index a74c4c4f32..33a13477bd 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -25,6 +25,7 @@
 .project
 .envrc
 /inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
 /appveyor.yml
 /.fixtures.yml
 /Gemfile
diff --git a/metadata.json b/metadata.json
index ba28f2c17e..b13149b9b3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -80,7 +80,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "1.18.1",
+  "pdk-version": "2.0.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g12a5dea"
+  "template-ref": "heads/main-0-ge04486b"
 }

From 44e29bb42b38a1363f917d6af9a53b8444338581 Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Mon, 3 May 2021 13:57:38 +0200
Subject: [PATCH 1789/2267] Spec tests for default_cache_enable behaviour.

---
 spec/classes/mod/disk_cache_spec.rb | 180 ++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 7ab6d48680..14b420be9e 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -47,6 +47,66 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
       }
     end
+    context 'with $default_cache_enable = false' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => false}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = true' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => true}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = foo' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => 'foo'}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
+    end
   end
 
   context 'on a RedHat 6-based OS' do
@@ -88,6 +148,66 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
       }
     end
+    context 'with $default_cache_enable = false' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => false}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = true' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => true}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = foo' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => 'foo'}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
+    end
   end
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 10'
@@ -134,5 +254,65 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
       }
     end
+    context 'with $default_cache_enable = false' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => false}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = true' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => true}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = foo' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) {{ 'default_cache_enable' => 'foo'}}
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
+    end
   end
 end

From 7a2d51bd5285794651254b1feeb8f26a9bda94f8 Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Mon, 3 May 2021 14:17:46 +0200
Subject: [PATCH 1790/2267] Spec tests for default_cache_enable behaviour.

---
 spec/classes/mod/disk_cache_spec.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 14b420be9e..3499c064c2 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -56,7 +56,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => false}}
+      let(:params) { { 'default_cache_enable' => false} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -76,7 +76,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => true}}
+      let(:params) { { 'default_cache_enable' => true} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -96,7 +96,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => 'foo'}}
+      let(:params) { { 'default_cache_enable' => 'foo'} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -105,7 +105,7 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
+      }.to raise_error(Puppet::Error, %r/default_cache_enable must be true or false/)
     end
   end
 
@@ -157,7 +157,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => false}}
+      let(:params) { { 'default_cache_enable' => false} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -177,7 +177,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => true}}
+      let(:params) { { 'default_cache_enable' => true} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -197,7 +197,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => 'foo'}}
+      let(:params) { { 'default_cache_enable' => 'foo'} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -206,7 +206,7 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
+      }.to raise_error(Puppet::Error, %r/default_cache_enable must be true or false/)
     end
   end
   context 'on a FreeBSD OS' do
@@ -263,7 +263,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => false}}
+      let(:params) { { 'default_cache_enable' => false} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -283,7 +283,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => true}}
+      let(:params) { { 'default_cache_enable' => true} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -303,7 +303,7 @@
          }'
       end
 
-      let(:params) {{ 'default_cache_enable' => 'foo'}}
+      let(:params) { { 'default_cache_enable' => 'foo'} }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -312,7 +312,7 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
+      }.to raise_error(Puppet::Error, %r/default_cache_enable must be true or false/)
     end
   end
 end

From 97f7155e7b107ead2efa20b782604d7f756ad59b Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Mon, 3 May 2021 14:23:42 +0200
Subject: [PATCH 1791/2267] Spec tests for default_cache_enable behaviour.

---
 spec/classes/mod/disk_cache_spec.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 3499c064c2..0f3af0db0e 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -56,7 +56,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => false} }
+      let(:params) { { 'default_cache_enable' => false } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -76,7 +76,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => true} }
+      let(:params) { { 'default_cache_enable' => true } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -96,7 +96,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => 'foo'} }
+      let(:params) { { 'default_cache_enable' => 'foo' } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -105,7 +105,7 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, %r/default_cache_enable must be true or false/)
+      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
     end
   end
 
@@ -157,7 +157,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => false} }
+      let(:params) { { 'default_cache_enable' => false } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -177,7 +177,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => true} }
+      let(:params) { { 'default_cache_enable' => true } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -197,7 +197,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => 'foo'} }
+      let(:params) { { 'default_cache_enable' => 'foo' } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -206,7 +206,7 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, %r/default_cache_enable must be true or false/)
+      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
     end
   end
   context 'on a FreeBSD OS' do
@@ -263,7 +263,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => false} }
+      let(:params) { { 'default_cache_enable' => false } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -283,7 +283,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => true} }
+      let(:params) { { 'default_cache_enable' => true } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -303,7 +303,7 @@
          }'
       end
 
-      let(:params) { { 'default_cache_enable' => 'foo'} }
+      let(:params) { { 'default_cache_enable' => 'foo' } }
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
@@ -312,7 +312,7 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, %r/default_cache_enable must be true or false/)
+      }.to raise_error(Puppet::Error, /default_cache_enable must be true or false/)
     end
   end
 end

From 0e2614bf06ebe27a42b0b9b3a14f58a8b5ee8324 Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Mon, 3 May 2021 13:57:38 +0200
Subject: [PATCH 1792/2267] Spec tests for default_cache_enable behaviour.

---
 spec/classes/mod/disk_cache_spec.rb | 180 ++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 7ab6d48680..b6a3d8a3e6 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -47,6 +47,66 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
       }
     end
+    context 'with $default_cache_enable = false' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => false } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = true' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => true } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = foo' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => 'foo' } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+    end
   end
 
   context 'on a RedHat 6-based OS' do
@@ -88,6 +148,66 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
       }
     end
+    context 'with $default_cache_enable = false' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => false } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = true' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => true } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = foo' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => 'foo' } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+    end
   end
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 10'
@@ -134,5 +254,65 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
       }
     end
+    context 'with $default_cache_enable = false' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => false } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = true' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => true } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }
+    end
+    context 'with $default_cache_enable = foo' do
+      let :pre_condition do
+        'class{ "apache":
+          apache_version => "2.4",
+          default_mods   => ["cache"],
+          mod_dir        => "/tmp/junk",
+         }'
+      end
+
+      let(:params) { { 'default_cache_enable' => 'foo' } }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_class('apache::mod::disk_cache') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_apache_mod('cache_disk') }
+      it {
+        is_expected.to contain_file('disk_cache.conf')
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+      }.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+    end
   end
 end

From b29765c8f93503dc39805d848562740d095a9e51 Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Mon, 3 May 2021 16:23:43 +0200
Subject: [PATCH 1793/2267] Spec tests for default_cache_enable behaviour.

---
 spec/classes/mod/disk_cache_spec.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index b6a3d8a3e6..175ebe27cb 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -105,7 +105,8 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+          .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+      }
     end
   end
 
@@ -206,7 +207,8 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+          .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+      }
     end
   end
   context 'on a FreeBSD OS' do
@@ -312,7 +314,8 @@
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+          .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+      }
     end
   end
 end

From bcd4b3a45248c9c47049c72d3f55afa7a1a8f84a Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Tue, 4 May 2021 09:32:57 +0200
Subject: [PATCH 1794/2267] Spec tests for default_cache_enable behaviour.
 Correction in file content.

---
 spec/classes/mod/disk_cache_spec.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 175ebe27cb..c021c6f418 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -64,7 +64,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = true' do
@@ -84,7 +84,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = foo' do
@@ -104,7 +104,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
           .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
       }
     end
@@ -166,7 +166,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = true' do
@@ -186,7 +186,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = foo' do
@@ -206,7 +206,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
           .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
       }
     end
@@ -273,7 +273,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = true' do
@@ -293,7 +293,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = foo' do
@@ -313,7 +313,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
           .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
       }
     end

From b0dc8820991d3c08b1410c0bb37ef4011e4df039 Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Tue, 4 May 2021 14:22:58 +0200
Subject: [PATCH 1795/2267] Spec tests for default_cache_enable behaviour.
 Correction in file content.

---
 spec/classes/mod/disk_cache_spec.rb | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index c021c6f418..f38d4f0026 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -103,9 +103,7 @@
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
-          .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+        is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
       }
     end
   end
@@ -166,7 +164,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = true' do
@@ -186,7 +184,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = foo' do
@@ -205,9 +203,7 @@
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
-          .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+        is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
       }
     end
   end
@@ -273,7 +269,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = true' do
@@ -293,7 +289,7 @@
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
     context 'with $default_cache_enable = foo' do
@@ -312,9 +308,7 @@
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache_mod('cache_disk') }
       it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
-          .to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
+        is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
       }
     end
   end

From 7334ac0202b5419a0b1bf8051b2a5fdf201b9f53 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 10 May 2021 12:10:17 +0300
Subject: [PATCH 1796/2267] Set changelog_since_tag="3.2.0" in .sync.yml and
 pdk update

---
 .pdkignore    | 1 +
 .sync.yml     | 1 +
 Rakefile      | 1 +
 metadata.json | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.pdkignore b/.pdkignore
index 33a13477bd..c538bea8bd 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -27,6 +27,7 @@
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
 /appveyor.yml
+/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
diff --git a/.sync.yml b/.sync.yml
index dd51b095ad..e21a515088 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -33,3 +33,4 @@ Rakefile:
     unmanaged: false
   .travis.yml:
     delete: true
+changelog_since_tag: "3.2.0"
diff --git a/Rakefile b/Rakefile
index e10ba7c02a..55dc3ab1ed 100644
--- a/Rakefile
+++ b/Rakefile
@@ -48,6 +48,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
     config.user = "#{changelog_user}"
     config.project = "#{changelog_project}"
+    config.since_tag = "3.2.0"
     config.future_release = "#{changelog_future_release}"
     config.exclude_labels = ['maintenance']
     config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
diff --git a/metadata.json b/metadata.json
index b13149b9b3..fc08572f91 100644
--- a/metadata.json
+++ b/metadata.json
@@ -80,7 +80,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "2.0.0",
+  "pdk-version": "2.1.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-ge04486b"
+  "template-ref": "heads/main-0-g135398a"
 }

From 02976d207f2db32ccbbf8aa8775f64f529d67ac5 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 10 May 2021 11:23:58 +0100
Subject: [PATCH 1797/2267] (MODULES-11068) verify ssl_honorcipherorder
 behaviour

---
 spec/classes/mod/ssl_spec.rb | 46 ++++++++++++++++++++++++++++++++++++
 spec/defines/vhost_spec.rb   |  5 ++++
 2 files changed, 51 insertions(+)

diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index bcf4fe9458..326e45f877 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -285,5 +285,51 @@
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLProxyProtocol -ALL \+TLSv1$}) }
     end
+
+    context 'setting ssl_honorcipherorder' do
+      context 'default value' do
+        it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLHonorCipherOrder On$}) }
+      end
+
+      context 'force on' do
+        let :params do
+          {
+            ssl_honorcipherorder: true,
+          }
+        end
+
+        it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLHonorCipherOrder On$}) }
+      end
+
+      context 'force off' do
+        let :params do
+          {
+            ssl_honorcipherorder: false,
+          }
+        end
+
+        it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLHonorCipherOrder Off$}) }
+      end
+
+      context 'set on' do
+        let :params do
+          {
+            ssl_honorcipherorder: 'on',
+          }
+        end
+
+        it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLHonorCipherOrder On$}) }
+      end
+
+      context 'set off' do
+        let :params do
+          {
+            ssl_honorcipherorder: 'off',
+          }
+        end
+
+        it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLHonorCipherOrder Off$}) }
+      end
+    end
   end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 7d6e49bc5d..73d6bf6557 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1048,6 +1048,11 @@
               content: %r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
+              content: %r{^\s+SSLHonorCipherOrder\s+Off$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
               content: %r{^\s+SSLUserName\s+SSL_CLIENT_S_DN_CN$},

From 41d453e406962669a096051bbb4b49bad6f9354b Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 10 May 2021 14:23:24 +0300
Subject: [PATCH 1798/2267] Set max_issues for changelog generator to 500

---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rakefile b/Rakefile
index 55dc3ab1ed..333511b915 100644
--- a/Rakefile
+++ b/Rakefile
@@ -55,6 +55,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.add_pr_wo_labels = true
     config.issues = false
     config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
+    config.max_issues = 500
     config.configure_sections = {
       "Changed" => {
         "prefix" => "### Changed",

From 249ade154d88ce015b3329c46d881107e46efb95 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Mon, 10 May 2021 12:01:59 +0000
Subject: [PATCH 1799/2267] Release prep v6.0.1

---
 CHANGELOG.md  | 23 ++++++++++++++++-------
 metadata.json |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a7a90e975..7225a01314 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v6.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.1) (2021-05-10)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.0.0...v6.0.1)
+
+### Fixed
+
+- Fix HEADER\* and README\* wildcards in IndexIgnore [\#2138](https://github.com/puppetlabs/puppetlabs-apache/pull/2138) ([keto](https://github.com/keto))
+- Fix dav\_svn for Debian 10 [\#2135](https://github.com/puppetlabs/puppetlabs-apache/pull/2135) ([martijndegouw](https://github.com/martijndegouw))
+
 ## [v6.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.0) (2021-03-02)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.10.0...v6.0.0)
@@ -42,7 +51,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Added
 
-- \(MODULES-10887\) Set `use\_servername\_for\_filenames` for defaults [\#2103](https://github.com/puppetlabs/puppetlabs-apache/pull/2103) ([towo](https://github.com/towo))
+- \(MODULES-10887\) Set `use_servername_for_filenames` for defaults [\#2103](https://github.com/puppetlabs/puppetlabs-apache/pull/2103) ([towo](https://github.com/towo))
 - pdksync - \(feat\) Add support for Puppet 7 [\#2101](https://github.com/puppetlabs/puppetlabs-apache/pull/2101) ([daianamezdrea](https://github.com/daianamezdrea))
 - \(feat\) Add support for apreq2 MOD on Debian 9, 10 [\#2085](https://github.com/puppetlabs/puppetlabs-apache/pull/2085) ([TigerKriika](https://github.com/TigerKriika))
 
@@ -76,8 +85,8 @@ All notable changes to this project will be documented in this file. The format
 
 ### Added
 
+- Configure default shared lib path for mod\_wsgi on RHEL8 [\#2063](https://github.com/puppetlabs/puppetlabs-apache/pull/2063) ([nbarrientos](https://github.com/nbarrientos))
 - Various enhancements to apache::mod::passenger [\#2058](https://github.com/puppetlabs/puppetlabs-apache/pull/2058) ([smortex](https://github.com/smortex))
-- Allow IPv6 CIDRs for proxy\_protocol\_exceptions in mod remoteip [\#2033](https://github.com/puppetlabs/puppetlabs-apache/pull/2033) ([thechristschn](https://github.com/thechristschn))
 
 ### Fixed
 
@@ -91,10 +100,10 @@ All notable changes to this project will be documented in this file. The format
 
 ### Added
 
-- Configure default shared lib path for mod\_wsgi on RHEL8 [\#2063](https://github.com/puppetlabs/puppetlabs-apache/pull/2063) ([nbarrientos](https://github.com/nbarrientos))
+- Allow IPv6 CIDRs for proxy\_protocol\_exceptions in mod remoteip [\#2033](https://github.com/puppetlabs/puppetlabs-apache/pull/2033) ([thechristschn](https://github.com/thechristschn))
 - \(IAC-746\) - Add ubuntu 20.04 support [\#2032](https://github.com/puppetlabs/puppetlabs-apache/pull/2032) ([david22swan](https://github.com/david22swan))
-- Replace legacy `bool2httpd\(\)` function with shim [\#2025](https://github.com/puppetlabs/puppetlabs-apache/pull/2025) ([alexjfisher](https://github.com/alexjfisher))
-- Tidy up `pw\_hash` function [\#2024](https://github.com/puppetlabs/puppetlabs-apache/pull/2024) ([alexjfisher](https://github.com/alexjfisher))
+- Replace legacy `bool2httpd()` function with shim [\#2025](https://github.com/puppetlabs/puppetlabs-apache/pull/2025) ([alexjfisher](https://github.com/alexjfisher))
+- Tidy up `pw_hash` function [\#2024](https://github.com/puppetlabs/puppetlabs-apache/pull/2024) ([alexjfisher](https://github.com/alexjfisher))
 - Replace validate\_apache\_loglevel\(\) with data type [\#2023](https://github.com/puppetlabs/puppetlabs-apache/pull/2023) ([alexjfisher](https://github.com/alexjfisher))
 - Add ProxyIOBufferSize option [\#2014](https://github.com/puppetlabs/puppetlabs-apache/pull/2014) ([jplindquist](https://github.com/jplindquist))
 - Add support for SetInputFilter directive [\#2007](https://github.com/puppetlabs/puppetlabs-apache/pull/2007) ([HoucemEddine](https://github.com/HoucemEddine))
@@ -153,7 +162,6 @@ All notable changes to this project will be documented in this file. The format
 
 - Add parameter version for mod security [\#1953](https://github.com/puppetlabs/puppetlabs-apache/pull/1953) ([tuxmea](https://github.com/tuxmea))
 - add possibility to define variables inside VirtualHost definition [\#1947](https://github.com/puppetlabs/puppetlabs-apache/pull/1947) ([trefzer](https://github.com/trefzer))
-- Add LDAP parameters to httpd.conf [\#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
 
 ### Fixed
 
@@ -174,6 +182,7 @@ All notable changes to this project will be documented in this file. The format
 - \(FM-8214\) converted to use litmus [\#1938](https://github.com/puppetlabs/puppetlabs-apache/pull/1938) ([tphoney](https://github.com/tphoney))
 - \(MODULES-9668 \) Please make ProxyRequests setting in vhost.pp configurable [\#1935](https://github.com/puppetlabs/puppetlabs-apache/pull/1935) ([aukesj](https://github.com/aukesj))
 - Added unmanaged\_path and custom\_fragment options to userdir [\#1931](https://github.com/puppetlabs/puppetlabs-apache/pull/1931) ([GeorgeCox](https://github.com/GeorgeCox))
+- Add LDAP parameters to httpd.conf [\#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
 - Add LDAPReferrals configuration parameter [\#1928](https://github.com/puppetlabs/puppetlabs-apache/pull/1928) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
 
 ### Fixed
@@ -215,7 +224,6 @@ All notable changes to this project will be documented in this file. The format
 - Add support for mod\_http2 [\#1867](https://github.com/puppetlabs/puppetlabs-apache/pull/1867) ([smortex](https://github.com/smortex))
 - Added code to paramertize the libphp prefix [\#1852](https://github.com/puppetlabs/puppetlabs-apache/pull/1852) ([grahamuk2018](https://github.com/grahamuk2018))
 - Added WSGI Options WSGIApplicationGroup and WSGIPythonOptimize [\#1847](https://github.com/puppetlabs/puppetlabs-apache/pull/1847) ([emetriqLikedeeler](https://github.com/emetriqLikedeeler))
-- Add option to add comments to the header of a vhost file [\#1841](https://github.com/puppetlabs/puppetlabs-apache/pull/1841) ([jovandeginste](https://github.com/jovandeginste))
 
 ### Fixed
 
@@ -249,6 +257,7 @@ All notable changes to this project will be documented in this file. The format
 - \(MODULES-5990\) Addition of 'IncludeOptional conf-enabled/\*.conf' to apache2.conf' on Debian Family OS [\#1851](https://github.com/puppetlabs/puppetlabs-apache/pull/1851) ([david22swan](https://github.com/david22swan))
 - \(MODULES-8107\) - Support added for Ubuntu 18.04. [\#1850](https://github.com/puppetlabs/puppetlabs-apache/pull/1850) ([david22swan](https://github.com/david22swan))
 - \(MODULES-8108\) - Support added for Debian 9 [\#1849](https://github.com/puppetlabs/puppetlabs-apache/pull/1849) ([david22swan](https://github.com/david22swan))
+- Add option to add comments to the header of a vhost file [\#1841](https://github.com/puppetlabs/puppetlabs-apache/pull/1841) ([jovandeginste](https://github.com/jovandeginste))
 
 ### Fixed
 
diff --git a/metadata.json b/metadata.json
index fc08572f91..6d24a7fee6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 2577bd954b9c93ed1dd90876624e36fada877a96 Mon Sep 17 00:00:00 2001
From: Ketan Patel <k2patel@gmail.com>
Date: Thu, 29 Apr 2021 14:01:32 -0400
Subject: [PATCH 1800/2267] MODULES-11061 apache : mod security custom rule
 functionality

Reducing the string size for matching with wildcard

Changing regex based on suggestion from the tests
---
 REFERENCE.md                           | 19 +++++++++
 manifests/mod/security.pp              | 23 +++++++++++
 manifests/params.pp                    |  2 +
 spec/classes/mod/security_spec.rb      | 56 ++++++++++++++++++++++++++
 templates/mod/security.conf.erb        |  3 ++
 templates/mod/security_custom.conf.erb |  6 +++
 6 files changed, 109 insertions(+)
 create mode 100644 templates/mod/security_custom.conf.erb

diff --git a/REFERENCE.md b/REFERENCE.md
index 8543c9854a..ce981989a3 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5969,6 +5969,8 @@ The following parameters are available in the `apache::mod::security` class:
 * [`activated_rules`](#activated_rules)
 * [`modsec_dir`](#modsec_dir)
 * [`modsec_secruleengine`](#modsec_secruleengine)
+* [`custom_rules`](#custom_rules)
+* [`custom_rules_set`](#custom_rules_set)
 * [`audit_log_relevant_status`](#audit_log_relevant_status)
 * [`audit_log_parts`](#audit_log_parts)
 * [`audit_log_type`](#audit_log_type)
@@ -6041,6 +6043,23 @@ Configures the rules engine.
 
 Default value: `$apache::params::modsec_secruleengine`
 
+##### <a name="custom_rules"></a>`custom_rules`
+
+Data type: `Boolean`
+
+Enable Custom rules for security, this does not create or provide any rules rather it facilitate to add custom rules.
+If enabled, must provide `custom_rules_set`.
+
+Default value: `$apache::params::modsec_custom_rules`
+
+##### <a name="custom_rules_set"></a>`custom_rules_set`
+
+Data type: `[Array]`
+
+Customrules must be array of rules, for an example `['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"']`.
+Configures the set of custom rules.
+
+Default value: `$apache::params::modsec_custom_rules_set`
 ##### <a name="audit_log_relevant_status"></a>`audit_log_relevant_status`
 
 Data type: `Any`
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index e011c33bcc..4234f40880 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -97,6 +97,8 @@
   $version                     = $apache::params::modsec_version,
   $crs_package                 = $apache::params::modsec_crs_package,
   $activated_rules             = $apache::params::modsec_default_rules,
+  $custom_rules                = $apache::params::modsec_custom_rules,
+  $custom_rules_set            = $apache::params::modsec_custom_rules_set,
   $modsec_dir                  = $apache::params::modsec_dir,
   $modsec_secruleengine        = $apache::params::modsec_secruleengine,
   $audit_log_relevant_status   = '^(?:5|4(?!04))',
@@ -216,6 +218,27 @@
     notify  => Class['apache::service'],
   }
 
+  if $custom_rules {
+    # Template to add custom rule and included in security configuration
+    file {"${modsec_dir}/custom_rules":
+      ensure  => directory,
+      owner   => $apache::params::user,
+      group   => $apache::params::group,
+      mode    => $apache::file_mode,
+      require => File[$modsec_dir],
+    }
+
+    file { "${modsec_dir}/custom_rules/custom_01_rules.conf":
+      ensure  => file,
+      owner   => $apache::params::user,
+      group   => $apache::params::group,
+      mode    => $apache::file_mode,
+      content => template('apache/mod/security_custom.conf.erb'),
+      require => File["${modsec_dir}/custom_rules"],
+      notify  => Class['apache::service'],
+    }
+  }
+
   if $manage_security_crs {
     # Template uses:
     # - $_secdefaultaction
diff --git a/manifests/params.pp b/manifests/params.pp
index 2eaf5f1ef6..ad1772bba4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -36,6 +36,8 @@
 
   $modsec_audit_log_parts = 'ABIJDEFHZ'
   $modsec_audit_log_type = 'Serial'
+  $modsec_custom_rules = false
+  $modsec_custom_rules_set = undef
 
   # no client certs should be trusted for auth by default.
   $ssl_certs_dir          = undef
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 50e9986aa2..d562d754cf 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -103,6 +103,33 @@
 
             it { is_expected.not_to contain_file('/etc/httpd/modsecurity.d/security_crs.conf') }
           end
+          describe 'with custom parameters' do
+            let :params do
+              {
+                custom_rules: false,
+              }
+            end
+
+            it {
+              is_expected.not_to contain_file('/etc/httpd/modsecurity.d/custom_rules/custom_01_rules.conf')
+            }
+          end
+          describe 'with parameters' do
+            let :params do
+              {
+                custom_rules: true,
+                custom_rules_set: ['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"'],
+              }
+            end
+
+            it {
+              is_expected.to contain_file('/etc/httpd/modsecurity.d/custom_rules').with(
+                ensure: 'directory', path: '/etc/httpd/modsecurity.d/custom_rules',
+                owner: 'apache', group: 'apache'
+              )
+            }
+            it { is_expected.to contain_file('/etc/httpd/modsecurity.d/custom_rules/custom_01_rules.conf').with_content %r{^\s*.*"id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"$} }
+          end
         end
       when 'Debian'
         context 'on Debian based systems' do
@@ -189,6 +216,35 @@
             end
           end
 
+          describe 'with custom parameters' do
+            let :params do
+              {
+                custom_rules: false,
+              }
+            end
+
+            it {
+              is_expected.not_to contain_file('/etc/modsecurity/custom_rules/custom_01_rules.conf')
+            }
+          end
+
+          describe 'with parameters' do
+            let :params do
+              {
+                custom_rules: true,
+                custom_rules_set: ['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"'],
+              }
+            end
+
+            it {
+              is_expected.to contain_file('/etc/modsecurity/custom_rules').with(
+                ensure: 'directory', path: '/etc/modsecurity/custom_rules',
+                owner: 'www-data', group: 'www-data'
+              )
+            }
+            it { is_expected.to contain_file('/etc/modsecurity/custom_rules/custom_01_rules.conf').with_content %r{\s*.*"id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"$} }
+          end
+
           describe 'with mod security version' do
             let :params do
               {
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 5392bae3a5..0302cebf36 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -2,6 +2,9 @@
     # Default recommended configuration
     SecRuleEngine <%= @modsec_secruleengine %>
     SecRequestBodyAccess On
+  <%- if @custom_rules -%>
+    Include <%= @modsec_dir %>/custom_rules/*.conf
+  <%- end -%>
     SecRule REQUEST_HEADERS:Content-Type "text/xml" \
       "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML"
     SecRequestBodyLimit <%= @secrequestbodylimit %>
diff --git a/templates/mod/security_custom.conf.erb b/templates/mod/security_custom.conf.erb
new file mode 100644
index 0000000000..97ed20dc46
--- /dev/null
+++ b/templates/mod/security_custom.conf.erb
@@ -0,0 +1,6 @@
+# This file is managed by puppet, any direct modification will be overwritten.
+<% if defined?(@custom_rules_set) && ! @custom_rules_set.empty? -%>
+<% @custom_rules_set.each do |secrule| -%>
+SecRule <%= secrule %>
+<% end -%>
+<% end -%>
\ No newline at end of file

From 88a998b4b0f8359cd342e25e90c73d07b9e8a5a5 Mon Sep 17 00:00:00 2001
From: Hans Moulron <hans.moulron@francetv.fr>
Date: Tue, 11 May 2021 14:50:46 +0200
Subject: [PATCH 1801/2267] authorize uri for severname with
 use_servername_for_filenames

fix rubocop

fix rspec

fix rubocop

fix rubocop
---
 manifests/vhost.pp         | 12 ++++-
 spec/defines/vhost_spec.rb | 96 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ff0e2b30a8..c583b2ea9a 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2064,6 +2064,14 @@
     $priority_real = '25-'
   }
 
+  # https://httpd.apache.org/docs/2.4/fr/mod/core.html#servername
+  # Syntax:	ServerName [scheme://]domain-name|ip-address[:port]
+  # Sometimes, the server runs behind a device that processes SSL, such as a reverse proxy, load balancer or SSL offload
+  # appliance.
+  # When this is the case, specify the https:// scheme and the port number to which the clients connect in the ServerName
+  # directive to make sure that the server generates the correct self-referential URLs.
+  $normalized_servername = regsubst($servername, '(https?:\/\/)?([a-z0-9\/%_+.,#?!@&=-]+)(:?\d+)?', '\2', 'G')
+
   # IAC-1186: A number of configuration and log file names are generated using the $name parameter. It is possible for
   # the $name parameter to contain spaces, which could then be transferred to the log / config filenames. Although
   # POSIX compliant, this can be cumbersome.
@@ -2085,8 +2093,8 @@
   # and use the sanitized value of $servername for default log / config filenames.
   $filename = $use_servername_for_filenames ? {
     true => $use_port_for_filenames ? {
-      true  => regsubst("${servername}-${port}", ' ', '_', 'G'),
-      false => regsubst($servername, ' ', '_', 'G'),
+      true  => regsubst("${normalized_servername}-${port}", ' ', '_', 'G'),
+      false => regsubst($normalized_servername, ' ', '_', 'G'),
     },
     false => $name,
   }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 7d6e49bc5d..11390cd5c7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1516,6 +1516,102 @@
             )
           }
         end
+        context 'vhost with scheme and port in servername and use_servername_for_filenames' do
+          let :params do
+            {
+              'port'                          => '80',
+              'ip'                            => '127.0.0.1',
+              'ip_based'                      => true,
+              'servername'                    => 'https://www.example.com:443',
+              'docroot'                       => '/var/www/html',
+              'add_listen'                    => true,
+              'ensure'                        => 'present',
+              'use_servername_for_filenames'  => true
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+ServerName https:\/\/www\.example\.com:443$},
+            )
+          }
+          it {
+            is_expected.to contain_concat('25-www.example.com.conf')
+          }
+        end
+        context 'vhost with scheme in servername and use_servername_for_filenames' do
+          let :params do
+            {
+              'port'                          => '80',
+              'ip'                            => '127.0.0.1',
+              'ip_based'                      => true,
+              'servername'                    => 'https://www.example.com',
+              'docroot'                       => '/var/www/html',
+              'add_listen'                    => true,
+              'ensure'                        => 'present',
+              'use_servername_for_filenames'  => true
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+ServerName https:\/\/www\.example\.com$},
+            )
+          }
+          it {
+            is_expected.to contain_concat('25-www.example.com.conf')
+          }
+        end
+        context 'vhost with port in servername and use_servername_for_filenames' do
+          let :params do
+            {
+              'port'                          => '80',
+              'ip'                            => '127.0.0.1',
+              'ip_based'                      => true,
+              'servername'                    => 'www.example.com:443',
+              'docroot'                       => '/var/www/html',
+              'add_listen'                    => true,
+              'ensure'                        => 'present',
+              'use_servername_for_filenames'  => true
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+ServerName www\.example\.com:443$},
+            )
+          }
+          it {
+            is_expected.to contain_concat('25-www.example.com.conf')
+          }
+        end
+        context 'vhost with servername and use_servername_for_filenames' do
+          let :params do
+            {
+              'port'                          => '80',
+              'ip'                            => '127.0.0.1',
+              'ip_based'                      => true,
+              'servername'                    => 'www.example.com',
+              'docroot'                       => '/var/www/html',
+              'add_listen'                    => true,
+              'ensure'                        => 'present',
+              'use_servername_for_filenames'  => true
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+              content: %r{^\s+ServerName www\.example\.com$},
+            )
+          }
+          it {
+            is_expected.to contain_concat('25-www.example.com.conf')
+          }
+        end
         context 'vhost with multiple ip addresses' do
           let :params do
             {

From 35a3e3e7b69a241112abb16c9de5ee41ff0fc6fe Mon Sep 17 00:00:00 2001
From: David Croft <david@sargasso.net>
Date: Thu, 13 May 2021 22:40:37 +0100
Subject: [PATCH 1802/2267] allow vhost parameter ssl_honorcipherorder to take
 a boolean as well as on/off (fixes MODULES-11068)

---
 manifests/vhost.pp       | 16 ++++++++++++++--
 templates/vhost/_ssl.erb |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ff0e2b30a8..caa0e6ff89 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1765,7 +1765,7 @@
   $ssl_certs_dir                                                                    = $apache::params::ssl_certs_dir,
   $ssl_protocol                                                                     = undef,
   $ssl_cipher                                                                       = undef,
-  $ssl_honorcipherorder                                                             = undef,
+  Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder     = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client = undef,
   $ssl_verify_depth                                                                 = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef,
@@ -2029,6 +2029,18 @@
     include apache::mod::mime
   }
 
+  if $ssl_honorcipherorder =~ Boolean or $ssl_honorcipherorder == undef {
+    $_ssl_honorcipherorder = $ssl_honorcipherorder
+  } else {
+    $_ssl_honorcipherorder = $ssl_honorcipherorder ? {
+      'on'    => true,
+      'On'    => true,
+      'off'   => false,
+      'Off'   => false,
+      default => true,
+    }
+  }
+
   if $auth_kerb and $ensure == 'present' {
     include apache::mod::auth_kerb
   }
@@ -2680,7 +2692,7 @@
   # - $ssl_crl_check
   # - $ssl_protocol
   # - $ssl_cipher
-  # - $ssl_honorcipherorder
+  # - $_ssl_honorcipherorder
   # - $ssl_verify_client
   # - $ssl_verify_depth
   # - $ssl_options
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 0966c10cf2..7cab18de89 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -15,8 +15,8 @@
   <%- if @ssl_cipher -%>
   SSLCipherSuite          <%= @ssl_cipher %>
   <%- end -%>
-  <%- if @ssl_honorcipherorder -%>
-  SSLHonorCipherOrder     <%= @ssl_honorcipherorder %>
+  <%- if not @ssl_honorcipherorder.nil? -%>
+  SSLHonorCipherOrder     <%= scope.call_function('apache::bool2httpd', [@_ssl_honorcipherorder]) %>
   <%- end -%>
   <%- if @ssl_verify_client -%>
   SSLVerifyClient         <%= @ssl_verify_client %>

From 4c30caafa2b2276bcb37111ffa95dc8207aad891 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Mon, 17 May 2021 10:01:42 +0000
Subject: [PATCH 1803/2267] Release prep v6.1.0

---
 CHANGELOG.md  |  9 +++++++++
 REFERENCE.md  | 37 ++++++++++++++++++-------------------
 metadata.json |  2 +-
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7225a01314..c40e97ffec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v6.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.1.0) (2021-05-17)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.0.1...v6.1.0)
+
+### Added
+
+- support for uri for severname with use\_servername\_for\_filenames [\#2150](https://github.com/puppetlabs/puppetlabs-apache/pull/2150) ([Zarne](https://github.com/Zarne))
+- \(MODULES-11061\) mod\_security custom rule functionality [\#2145](https://github.com/puppetlabs/puppetlabs-apache/pull/2145) ([k2patel](https://github.com/k2patel))
+
 ## [v6.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.1) (2021-05-10)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.0.0...v6.0.1)
diff --git a/REFERENCE.md b/REFERENCE.md
index ce981989a3..57b251ce37 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5969,8 +5969,6 @@ The following parameters are available in the `apache::mod::security` class:
 * [`activated_rules`](#activated_rules)
 * [`modsec_dir`](#modsec_dir)
 * [`modsec_secruleengine`](#modsec_secruleengine)
-* [`custom_rules`](#custom_rules)
-* [`custom_rules_set`](#custom_rules_set)
 * [`audit_log_relevant_status`](#audit_log_relevant_status)
 * [`audit_log_parts`](#audit_log_parts)
 * [`audit_log_type`](#audit_log_type)
@@ -5994,6 +5992,8 @@ The following parameters are available in the `apache::mod::security` class:
 * [`secrequestbodynofileslimit`](#secrequestbodynofileslimit)
 * [`secrequestbodyinmemorylimit`](#secrequestbodyinmemorylimit)
 * [`manage_security_crs`](#manage_security_crs)
+* [`custom_rules`](#custom_rules)
+* [`custom_rules_set`](#custom_rules_set)
 
 ##### <a name="version"></a>`version`
 
@@ -6043,23 +6043,6 @@ Configures the rules engine.
 
 Default value: `$apache::params::modsec_secruleengine`
 
-##### <a name="custom_rules"></a>`custom_rules`
-
-Data type: `Boolean`
-
-Enable Custom rules for security, this does not create or provide any rules rather it facilitate to add custom rules.
-If enabled, must provide `custom_rules_set`.
-
-Default value: `$apache::params::modsec_custom_rules`
-
-##### <a name="custom_rules_set"></a>`custom_rules_set`
-
-Data type: `[Array]`
-
-Customrules must be array of rules, for an example `['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"']`.
-Configures the set of custom rules.
-
-Default value: `$apache::params::modsec_custom_rules_set`
 ##### <a name="audit_log_relevant_status"></a>`audit_log_relevant_status`
 
 Data type: `Any`
@@ -6246,6 +6229,22 @@ Toggles whether to manage ModSecurity Core Rule Set
 
 Default value: ``true``
 
+##### <a name="custom_rules"></a>`custom_rules`
+
+Data type: `Any`
+
+
+
+Default value: `$apache::params::modsec_custom_rules`
+
+##### <a name="custom_rules_set"></a>`custom_rules_set`
+
+Data type: `Any`
+
+
+
+Default value: `$apache::params::modsec_custom_rules_set`
+
 ### <a name="apachemodsetenvif"></a>`apache::mod::setenvif`
 
 Installs `mod_setenvif`.
diff --git a/metadata.json b/metadata.json
index 6d24a7fee6..d075bc143b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 9f6093ea7145200915a291b9471263f8fb3b8b49 Mon Sep 17 00:00:00 2001
From: David Croft <david@sargasso.net>
Date: Mon, 17 May 2021 18:06:59 +0100
Subject: [PATCH 1804/2267] tests for apache::vhost ssl_honorcipherorder

---
 spec/defines/vhost_spec.rb | 42 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 73d6bf6557..5ebd75f4ee 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1986,6 +1986,48 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
         end
+        context 'ssl_honorcipherorder' do
+          let :params do
+            {
+              'docroot'            => '/rspec/docroot',
+              'ssl'                => true,
+            }
+          end
+
+          context 'ssl_honorcipherorder default' do
+            it { is_expected.to compile }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').without_content(%r{^\s*SSLHonorCipherOrder}i) }
+          end
+
+          context 'ssl_honorcipherorder on' do
+            let :params do
+              super().merge({'ssl_honorcipherorder' => 'on',})
+            end
+            it { is_expected.to compile }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+On$}) }
+          end
+          context 'ssl_honorcipherorder true' do
+            let :params do
+              super().merge({'ssl_honorcipherorder' => true,})
+            end
+            it { is_expected.to compile }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+On$}) }
+          end
+          context 'ssl_honorcipherorder off' do
+            let :params do
+              super().merge({'ssl_honorcipherorder' => 'off',})
+            end
+            it { is_expected.to compile }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+Off$}) }
+          end
+          context 'ssl_honorcipherorder false' do
+            let :params do
+              super().merge({'ssl_honorcipherorder' => false,})
+            end
+            it { is_expected.to compile }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+Off$}) }
+          end
+        end
         describe 'access logs' do
           context 'single log file' do
             let(:params) do

From a6526cb4902445db600f3d7422727f4c4a3fb30b Mon Sep 17 00:00:00 2001
From: David Croft <david@sargasso.net>
Date: Mon, 17 May 2021 21:57:40 +0100
Subject: [PATCH 1805/2267] change apache::vhost ssl_honorcipherorder
 acceptance test

---
 spec/acceptance/apache_ssl_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index e6ea32c4c5..a9508f1743 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -65,7 +65,7 @@ class { 'apache':
           ssl_certs_dir        => '/tmp',
           ssl_protocol         => 'test',
           ssl_cipher           => 'test',
-          ssl_honorcipherorder => 'test',
+          ssl_honorcipherorder => true,
           ssl_verify_client    => 'require',
           ssl_verify_depth     => 'test',
           ssl_options          => ['test', 'test1'],
@@ -89,7 +89,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLProxyEngine On' }
       it { is_expected.to contain 'SSLProtocol             test' }
       it { is_expected.to contain 'SSLCipherSuite          test' }
-      it { is_expected.to contain 'SSLHonorCipherOrder     test' }
+      it { is_expected.to contain 'SSLHonorCipherOrder     On' }
       it { is_expected.to contain 'SSLVerifyClient         require' }
       it { is_expected.to contain 'SSLVerifyDepth          test' }
       it { is_expected.to contain 'SSLOptions test test1' }

From 763154fc935681f7f20da4df617f6e0b97a737ce Mon Sep 17 00:00:00 2001
From: David Croft <david@sargasso.net>
Date: Tue, 18 May 2021 09:30:14 +0100
Subject: [PATCH 1806/2267] test suite lint fixes

---
 spec/defines/vhost_spec.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 5ebd75f4ee..de792a7892 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2001,29 +2001,33 @@
 
           context 'ssl_honorcipherorder on' do
             let :params do
-              super().merge({'ssl_honorcipherorder' => 'on',})
+              super().merge({ 'ssl_honorcipherorder' => 'on' })
             end
+
             it { is_expected.to compile }
             it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+On$}) }
           end
           context 'ssl_honorcipherorder true' do
             let :params do
-              super().merge({'ssl_honorcipherorder' => true,})
+              super().merge({ 'ssl_honorcipherorder' => true })
             end
+
             it { is_expected.to compile }
             it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+On$}) }
           end
           context 'ssl_honorcipherorder off' do
             let :params do
-              super().merge({'ssl_honorcipherorder' => 'off',})
+              super().merge({ 'ssl_honorcipherorder' => 'off' })
             end
+
             it { is_expected.to compile }
             it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+Off$}) }
           end
           context 'ssl_honorcipherorder false' do
             let :params do
-              super().merge({'ssl_honorcipherorder' => false,})
+              super().merge({ 'ssl_honorcipherorder' => false })
             end
+
             it { is_expected.to compile }
             it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+Off$}) }
           end

From 19d3ea568d6072c227b8000e8aa058a2272899c0 Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Tue, 18 May 2021 16:03:55 +0200
Subject: [PATCH 1807/2267] Updated spec tests for disk_cache

---
 manifests/mod/disk_cache.pp         |  2 +-
 spec/classes/mod/disk_cache_spec.rb | 32 +++++++----------------------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 9d8c5e2069..11a6531ea6 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -20,7 +20,7 @@
 class apache::mod::disk_cache (
   $cache_root           = undef,
   $cache_ignore_headers = undef,
-  $default_cache_enable = true,
+  Boolean $default_cache_enable = true,
 ) {
   include apache
   if $cache_root {
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index f38d4f0026..4242752f77 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -61,7 +61,7 @@
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
+      it { is_expected.to contain_apache__mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -81,7 +81,7 @@
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
+      it { is_expected.to contain_apache__mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -98,13 +98,7 @@
 
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
-      it { is_expected.to compile }
-      it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
-      it {
-        is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
-      }
+      it { is_expected.not_to compile }
     end
   end
 
@@ -198,13 +192,7 @@
 
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
-      it { is_expected.to compile }
-      it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
-      it {
-        is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
-      }
+      it { is_expected.not_to compile }
     end
   end
   context 'on a FreeBSD OS' do
@@ -266,7 +254,7 @@
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
+      it { is_expected.to contain_apache__mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -286,7 +274,7 @@
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
+      it { is_expected.to contain_apache__mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -303,13 +291,7 @@
 
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
-      it { is_expected.to compile }
-      it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
-      it {
-        is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
-      }
+      it { is_expected.not_to compile }
     end
   end
 end

From 248d1b036666718c9aa51f2b2076ffb69b60b19e Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Tue, 18 May 2021 16:13:37 +0200
Subject: [PATCH 1808/2267] Updated spec tests for disk_cache

---
 spec/classes/mod/disk_cache_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 4242752f77..e60e2af57e 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -155,7 +155,7 @@
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
+      it { is_expected.to contain_apache__mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -175,7 +175,7 @@
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache_mod('cache_disk') }
+      it { is_expected.to contain_apache__mod('cache_disk') }
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})

From cf0734abb3adf2901389045095e31d2ec5b21e4c Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Sat, 22 May 2021 03:13:21 +0000
Subject: [PATCH 1809/2267] Release prep v6.2.0

---
 CHANGELOG.md  | 8 ++++++++
 REFERENCE.md  | 2 +-
 metadata.json | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c40e97ffec..e012c5a123 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) (2021-05-22)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.1.0...v6.2.0)
+
+### Added
+
+- \(MODULES-11068\) Allow apache::vhost ssl\_honorcipherorder to take boolean parameter [\#2152](https://github.com/puppetlabs/puppetlabs-apache/pull/2152) ([davidc](https://github.com/davidc))
+
 ## [v6.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.1.0) (2021-05-17)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.0.1...v6.1.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 57b251ce37..b7f9f1fd72 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -7936,7 +7936,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
-Data type: `Any`
+Data type: `Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef]`
 
 
 
diff --git a/metadata.json b/metadata.json
index d075bc143b..1cd01803cf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From c904bd19f5b66eaba5a1edd17fc510717c7e5351 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Mon, 7 Jun 2021 13:07:16 +0300
Subject: [PATCH 1810/2267] (maint) pdksync - PDK Update

---
 .github/workflows/auto_release.yml |  2 --
 Rakefile                           |  1 -
 metadata.json                      |  2 +-
 spec/spec_helper.rb                | 12 ++++++++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index d15d148d99..e028483600 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -1,8 +1,6 @@
 name: "Auto release"
 
 on:
-  schedule:
-    - cron: '0 3 * * 6'
   workflow_dispatch:
 
 env:
diff --git a/Rakefile b/Rakefile
index 333511b915..55dc3ab1ed 100644
--- a/Rakefile
+++ b/Rakefile
@@ -55,7 +55,6 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.add_pr_wo_labels = true
     config.issues = false
     config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
-    config.max_issues = 500
     config.configure_sections = {
       "Changed" => {
         "prefix" => "### Changed",
diff --git a/metadata.json b/metadata.json
index 1cd01803cf..f39afc2873 100644
--- a/metadata.json
+++ b/metadata.json
@@ -82,5 +82,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "2.1.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g135398a"
+  "template-ref": "heads/main-0-g03daa92"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 16764b6ff1..07db73426e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -48,6 +48,18 @@
   c.after(:suite) do
     RSpec::Puppet::Coverage.report!(0)
   end
+
+  # Filter backtrace noise
+  backtrace_exclusion_patterns = [
+    %r{spec_helper},
+    %r{gems},
+  ]
+
+  if c.respond_to?(:backtrace_exclusion_patterns)
+    c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
+  elsif c.respond_to?(:backtrace_clean_patterns)
+    c.backtrace_clean_patterns = backtrace_exclusion_patterns
+  end
 end
 
 # Ensures that a module is defined

From b4ede7ac3ea24f18190315a190b0617a78e5694f Mon Sep 17 00:00:00 2001
From: Pawan Pawar <pawanpawar43@gmail.com>
Date: Tue, 8 Jun 2021 08:09:20 +0200
Subject: [PATCH 1811/2267] Updated the description for param
 default_cache_enable.

---
 manifests/mod/disk_cache.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 11a6531ea6..cb82b7b6b7 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -12,6 +12,11 @@
 # @param cache_ignore_headers
 #   Specifies HTTP header(s) that should not be stored in the cache.
 #
+# @param default_cache_enable
+#   Default value is true, which enables "CacheEnable disk /" in disk_cache.conf for the webserver. This would cache
+#   every request to apache by default for every vhost. If set to false the default cache all behaviour is supressed.
+#   You can then control this behaviour in individual vhosts by explicitly defining CacheEnable.
+#
 # @note
 #   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
 #

From 6a37b36692778a02bf37aa80b46d9a690a09cfc1 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 26 May 2021 12:29:25 +0200
Subject: [PATCH 1812/2267] Only warn about servername logging if relevant

The warning about $use_servername_for_filenames is long and may not
affect users. If they use a normal $name, there would effectively be no
difference. This compares $name to $normalized_servername. The warning
is only relevant Only if they differ.

Technically there could be a space in $servername (since there is no
data type to enforce validation) but Apache wouldn't accept that anyway.

It also fixes two typos in the warnings.
---
 manifests/vhost.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0ae4cba07e..98950a1f59 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2111,7 +2111,7 @@
     false => $name,
   }
 
-  if ! $use_servername_for_filenames {
+  if ! $use_servername_for_filenames and $name != $normalized_servername {
     $use_servername_for_filenames_warn_msg = '
     It is possible for the $name parameter to be defined with spaces in it. Although supported on POSIX systems, this
     can lead to cumbersome file names. The $servername attribute has stricter conditions from Apache (i.e. no spaces)
@@ -2119,7 +2119,7 @@
     file names.
 
     From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
-    module, the $use_servername_for_filenames will be removed and log/config file names will be dervied from the
+    module, the $use_servername_for_filenames will be removed and log/config file names will be derived from the
     sanitized $servername parameter when not explicitly defined.'
     warning($use_servername_for_filenames_warn_msg)
   } elsif ! $use_port_for_filenames {
@@ -2130,7 +2130,7 @@
     config file names.
 
     From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
-    module, the $use_port_for_filenames will be removed and log/config file names will be dervied from the
+    module, the $use_port_for_filenames will be removed and log/config file names will be derived from the
     sanitized $servername parameter when not explicitly defined.'
     warning($use_port_for_filenames_warn_msg)
   }

From fac900efdfd079707e8d298bbc5d7c6de50b03b7 Mon Sep 17 00:00:00 2001
From: turnopil <turnopil@gmail.com>
Date: Wed, 16 Jun 2021 17:33:06 +0300
Subject: [PATCH 1813/2267] Update the default version of Apache for Amazon
 Linux 2

- updated minor version
---
 manifests/version.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index 7ebd591c59..6d2bb24d0b 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -11,8 +11,8 @@
       if $scl_httpd_version {
         $default = $scl_httpd_version
       }
-      elsif ($::operatingsystem == 'Amazon') {
-        $default = '2.2'
+      elsif ($::operatingsystem == 'Amazon' and $::operatingsystemmajrelease == '2') {
+        $default = '2.4'
       } elsif ($::operatingsystem == 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '7') >= 0) {
         $default = '2.4'
       } else {

From 6dba6aeb7f52a6b5fd4c987ba84bda697c1ba611 Mon Sep 17 00:00:00 2001
From: turnopil <turnopil@gmail.com>
Date: Thu, 17 Jun 2021 17:35:39 +0300
Subject: [PATCH 1814/2267] Update the default version of Apache for Amazon
 Linux 2

- added Amazon Linux 2 support for passenger module
---
 manifests/mod/passenger.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 8cd9e8b36d..d9920a1eb2 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -837,7 +837,11 @@
 
   if $::osfamily == 'RedHat' and $manage_repo {
     if $::operatingsystem == 'Amazon' {
-      $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch'
+      if $::operatingsystemmajrelease == '2' {
+        $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/7Server/$basearch'
+      } else {
+        $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch'
+      }
     } else {
       $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch'
     }

From 58bed4493b37aeaab1f79fa66e448754506c2987 Mon Sep 17 00:00:00 2001
From: turnopil <turnopil@gmail.com>
Date: Thu, 17 Jun 2021 17:47:46 +0300
Subject: [PATCH 1815/2267] Update the default version of Apache for Amazon
 Linux 2

- fixed url
---
 manifests/mod/passenger.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index d9920a1eb2..9019c33e41 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -838,9 +838,9 @@
   if $::osfamily == 'RedHat' and $manage_repo {
     if $::operatingsystem == 'Amazon' {
       if $::operatingsystemmajrelease == '2' {
-        $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/7Server/$basearch'
+        $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/7/$basearch'
       } else {
-        $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch'
+        $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6/$basearch'
       }
     } else {
       $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch'

From 2e372c99a4d712ae6ea920a0416d4a2efe80216f Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Mon, 21 Jun 2021 15:09:27 +0000
Subject: [PATCH 1816/2267] Release version 6.3.0

---
 CHANGELOG.md  | 15 ++++++++++++++-
 REFERENCE.md  | 11 +++++++++++
 metadata.json |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e012c5a123..08569abb96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,20 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) (2021-05-22)
+## [v6.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.0) (2021-06-21)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.2.0...v6.3.0)
+
+### Added
+
+- The default disk\_cache.conf.erb caches everything.  [\#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
+
+### Fixed
+
+- Update the default version of Apache for Amazon Linux 2 [\#2158](https://github.com/puppetlabs/puppetlabs-apache/pull/2158) ([turnopil](https://github.com/turnopil))
+- Only warn about servername logging if relevant [\#2154](https://github.com/puppetlabs/puppetlabs-apache/pull/2154) ([ekohl](https://github.com/ekohl))
+
+## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) (2021-05-24)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.1.0...v6.2.0)
 
diff --git a/REFERENCE.md b/REFERENCE.md
index b7f9f1fd72..54e8953304 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -2117,6 +2117,7 @@ The following parameters are available in the `apache::mod::disk_cache` class:
 
 * [`cache_root`](#cache_root)
 * [`cache_ignore_headers`](#cache_ignore_headers)
+* [`default_cache_enable`](#default_cache_enable)
 
 ##### <a name="cache_root"></a>`cache_root`
 
@@ -2139,6 +2140,16 @@ Specifies HTTP header(s) that should not be stored in the cache.
 
 Default value: ``undef``
 
+##### <a name="default_cache_enable"></a>`default_cache_enable`
+
+Data type: `Boolean`
+
+Default value is true, which enables "CacheEnable disk /" in disk_cache.conf for the webserver. This would cache
+every request to apache by default for every vhost. If set to false the default cache all behaviour is supressed.
+You can then control this behaviour in individual vhosts by explicitly defining CacheEnable.
+
+Default value: ``true``
+
 ### <a name="apachemoddumpio"></a>`apache::mod::dumpio`
 
 Installs and configures `mod_dumpio`.
diff --git a/metadata.json b/metadata.json
index f39afc2873..90117d6acc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 8c17d93c8e9ded1c687efb67edb2bb8b1d49a844 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@haugens.org>
Date: Thu, 1 Jul 2021 11:05:55 -0700
Subject: [PATCH 1817/2267] Allow custom userdir directives

`UserDir` can be various forms of strings (see
https://httpd.apache.org/docs/2.4/howto/public_html.html) whereas
`Directory` must be an absolute path. This allows UserDir to be
specified separately.

The unit test showing multiple values for `$path` seems to be incorrect
according to https://httpd.apache.org/docs/2.4/mod/core.html#directory
---
 REFERENCE.md                     |  9 +++++++++
 manifests/mod/userdir.pp         | 11 ++++++++++-
 spec/classes/mod/userdir_spec.rb | 17 ++++++++++++++---
 templates/mod/userdir.conf.erb   |  2 +-
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 54e8953304..33daccf307 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6669,6 +6669,7 @@ The following parameters are available in the `apache::mod::userdir` class:
 
 * [`home`](#home)
 * [`dir`](#dir)
+* [`userdir`](#userdir)
 * [`disable_root`](#disable_root)
 * [`apache_version`](#apache_version)
 * [`path`](#path)
@@ -6693,6 +6694,14 @@ Data type: `Any`
 
 Default value: ``undef``
 
+##### <a name="userdir"></a>`userdir`
+
+Data type: `Any`
+
+Directory out of which per-user content is loaded. It may be any valid `UserDir` directive values.
+
+Default value: The value of `$path`
+
 ##### <a name="disable_root"></a>`disable_root`
 
 Data type: `Any`
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 4cab25beeb..6bced57684 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -6,7 +6,10 @@
 #   
 # @param dir
 #   *Deprecated* Path from user's home directory to public directory.
-# 
+#
+# @param userdir
+#   Path or directory name to be used as the UserDir.
+#
 # @param disable_root
 #   Toggles whether to allow use of root directory.
 # 
@@ -33,6 +36,7 @@
 class apache::mod::userdir (
   $home = undef,
   $dir = undef,
+  $userdir = undef,
   $disable_root = true,
   $apache_version = undef,
   $path = '/home/*/public_html',
@@ -59,6 +63,11 @@
     $_path = $path
   }
 
+  $_userdir = $userdir ? {
+    undef   => $_path,
+    default => $userdir,
+  }
+
   ::apache::mod { 'userdir': }
 
   # Template uses $home, $dir, $disable_root, $_apache_version
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 73c01a137b..89b54ab762 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -39,12 +39,23 @@
     context 'with path set to something' do
       let :params do
         {
-          path: 'public_html /usr/web http://www.example.com/',
+          path: '/home/*/*/public_html',
         }
       end
 
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+public_html /usr/web http://www\.example\.com/$}) }
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"public_html /usr/web http://www\.example\.com/\"\>$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/\*/public_html$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/\*/public_html\"\>$}) }
+    end
+    context 'with userdir set to something' do
+      let :params do
+        {
+          path: '/home/*/*/public_html',
+          userdir: 'public_html',
+        }
+      end
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+public_html$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/\*/public_html\"\>$}) }
     end
     context 'with unmanaged_path set to true' do
       let :params do
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index c28081131e..1ef99f69f2 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -2,7 +2,7 @@
 <% if @disable_root -%>
   UserDir disabled root
 <% end -%>
-  UserDir <%= @_path %>
+  UserDir <%= @_userdir %>
 
 <%- if ! @unmanaged_path -%>
   <Directory "<%= @_path %>">

From 9ca3773fe572a1947d48aaaec868a0b654f902a0 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@haugens.org>
Date: Tue, 6 Jul 2021 10:03:19 -0700
Subject: [PATCH 1818/2267] Review fixups

---
 REFERENCE.md             | 6 +++---
 manifests/mod/userdir.pp | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 33daccf307..4585fe4db2 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6696,11 +6696,11 @@ Default value: ``undef``
 
 ##### <a name="userdir"></a>`userdir`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
-Directory out of which per-user content is loaded. It may be any valid `UserDir` directive values.
+Path or directory name to be used as the UserDir.
 
-Default value: The value of `$path`
+Default value: ``undef``
 
 ##### <a name="disable_root"></a>`disable_root`
 
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 6bced57684..67d7717dda 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -36,7 +36,7 @@
 class apache::mod::userdir (
   $home = undef,
   $dir = undef,
-  $userdir = undef,
+  Optional[String[1]] $userdir = undef,
   $disable_root = true,
   $apache_version = undef,
   $path = '/home/*/public_html',
@@ -63,10 +63,7 @@
     $_path = $path
   }
 
-  $_userdir = $userdir ? {
-    undef   => $_path,
-    default => $userdir,
-  }
+  $_userdir = pick($userdir, $_path)
 
   ::apache::mod { 'userdir': }
 

From b5cd8ce029847b11409c2d762f5315ca71738866 Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Thu, 15 Jul 2021 15:40:05 +0100
Subject: [PATCH 1819/2267] (MODULES-10899) Load php module with the right
 libphp file

---
 manifests/mod/php.pp         | 5 ++++-
 spec/classes/mod/php_spec.rb | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 77cd0ed1f6..02c51be64b 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -67,7 +67,10 @@
     $_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
   } else {
     # Controls php version and libphp prefix
-    $_lib = "${libphp_prefix}${php_version}.so"
+    $_lib = $_php_major ? {
+      '8'     => "${libphp_prefix}.so",
+      default => "${libphp_prefix}${php_version}.so",
+    }
   }
   $_module_id = $_php_major ? {
     '5'     => 'php5_module',
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 885b1a2e6d..5c11c49bca 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -72,7 +72,7 @@
               it { is_expected.to contain_package('libapache2-mod-php8.0') }
               it {
                 is_expected.to contain_file('php.load').with(
-                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
+                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
                 )
               }
             end

From 05cf92cf572bc317788f9f3cd617c80ac8461772 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Tue, 20 Jul 2021 15:28:50 +0100
Subject: [PATCH 1820/2267] (maint) Updating CONTRIBUTING guidelines

---
 CONTRIBUTING.md | 270 +-----------------------------------------------
 1 file changed, 1 insertion(+), 269 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9c171f9949..e7a3a7c3fe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,271 +1,3 @@
 # Contributing to Puppet modules
 
-So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing
-that very thing while setting expectations around code quality as well as a few tips for making the
-process as easy as possible. 
-
-### Table of Contents
-
-1. [Getting Started](#getting-started)
-1. [Commit Checklist](#commit-checklist)
-1. [Submission](#submission)
-1. [More about commits](#more-about-commits)
-1. [Testing](#testing)
-    - [Running Tests](#running-tests)
-    - [Writing Tests](#writing-tests)
-1. [Get Help](#get-help)
-
-## Getting Started
-
-- Fork the module repository on GitHub and clone to your workspace
-
-- Make your changes!
-
-## Commit Checklist
-
-### The Basics
-
-- [x] my commit is a single logical unit of work
-
-- [x] I have checked for unnecessary whitespace with "git diff --check" 
-
-- [x] my commit does not include commented out code or unneeded files
-
-### The Content
-
-- [x] my commit includes tests for the bug I fixed or feature I added
-
-- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality
-    
-- [x] my code passes existing test suites
-
-### The Commit Message
-
-- [x] the first line of my commit message includes:
-
-  - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" 
-  
-  - [x] a short description (50 characters is the soft limit, excluding ticket number(s))
-
-- [x] the body of my commit message:
-
-  - [x] is meaningful
-
-  - [x] uses the imperative, present tense: "change", not "changed" or "changes"
-
-  - [x] includes motivation for the change, and contrasts its implementation with the previous behavior
-
-## Submission
-
-### Pre-requisites
-
-- Make sure you have a [GitHub account](https://github.com/join)
-
-- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
-
-### Push and PR
-
-- Push your changes to your fork
-
-- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization
-
-## More about commits 
-
-  1.  Make separate commits for logically separate changes.
-
-      Please break your commits down into logically consistent units
-      which include new or changed tests relevant to the rest of the
-      change.  The goal of doing this is to make the diff easier to
-      read for whoever is reviewing your code.  In general, the easier
-      your diff is to read, the more likely someone will be happy to
-      review it and get it into the code base.
-
-      If you are going to refactor a piece of code, please do so as a
-      separate commit from your feature or bug fix changes.
-
-      We also really appreciate changes that include tests to make
-      sure the bug is not re-introduced, and that the feature is not
-      accidentally broken.
-
-      Describe the technical detail of the change(s).  If your
-      description starts to get too long, that is a good sign that you
-      probably need to split up your commit into more finely grained
-      pieces.
-
-      Commits which plainly describe the things which help
-      reviewers check the patch and future developers understand the
-      code are much more likely to be merged in with a minimum of
-      bike-shedding or requested changes.  Ideally, the commit message
-      would include information, and be in a form suitable for
-      inclusion in the release notes for the version of Puppet that
-      includes them.
-
-      Please also check that you are not introducing any trailing
-      whitespace or other "whitespace errors".  You can do this by
-      running "git diff --check" on your changes before you commit.
-
-  2.  Sending your patches
-
-      To submit your changes via a GitHub pull request, we _highly_
-      recommend that you have them on a topic branch, instead of
-      directly on "main".
-      It makes things much easier to keep track of, especially if
-      you decide to work on another thing before your first change
-      is merged in.
-
-      GitHub has some pretty good
-      [general documentation](http://help.github.com/) on using
-      their site.  They also have documentation on
-      [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).
-
-      In general, after pushing your topic branch up to your
-      repository on GitHub, you can switch to the branch in the
-      GitHub UI and click "Pull Request" towards the top of the page
-      in order to open a pull request.
-
-  3.  Update the related JIRA issue.
-
-      If there is a JIRA issue associated with the change you
-      submitted, then you should update the ticket to include the
-      location of your branch, along with any other commentary you
-      may wish to make.
-
-# Testing
-
-## Getting Started
-
-Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages,
-or Gems, are required to build, develop, and test this software.
-
-Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to 
-install all dependencies needed for this project in the project root by running
-
-```shell
-% bundle install --path .bundle/gems
-Fetching gem metadata from https://rubygems.org/........
-Fetching gem metadata from https://rubygems.org/..
-Using rake (10.1.0)
-Using builder (3.2.2)
--- 8><-- many more --><8 --
-Using rspec-system-puppet (2.2.0)
-Using serverspec (0.6.3)
-Using rspec-system-serverspec (1.0.0)
-Using bundler (1.3.5)
-Your bundle is complete!
-Use `bundle show [gemname]` to see where a bundled gem is installed.
-```
-
-NOTE: some systems may require you to run this command with sudo.
-
-If you already have those gems installed, make sure they are up-to-date:
-
-```shell
-% bundle update
-```
-
-## Running Tests
-
-With all dependencies in place and up-to-date, run the tests:
-
-### Unit Tests
-
-```shell
-% bundle exec rake spec
-```
-
-This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. 
-rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json),
-rspec tests define them in [.fixtures.yml](./fixtures.yml).
-
-### Acceptance Tests
-
-Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under
-[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test
-scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system.
-
-Run the tests by issuing the following command
-
-```shell
-% bundle exec rake spec_clean
-% bundle exec rspec spec/acceptance
-```
-
-This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
-install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
-and then run all the tests under [spec/acceptance](./spec/acceptance).
-
-## Writing Tests
-
-### Unit Tests
-
-When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a 
-catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] 
-but here's a tiny sample:
-
-Sample manifest:
-
-```puppet
-file { "a test file":
-  ensure => present,
-  path   => "/etc/sample",
-}
-```
-
-Sample test:
-
-```ruby
-it 'does a thing' do
-  expect(subject).to contain_file("a test file").with({:path => "/etc/sample"})
-end
-```
-
-### Acceptance Tests
-
-Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it
-twice to check for idempotency or errors, then run expectations.
-
-```ruby
-it 'does an end-to-end thing' do
-  pp = <<-EOF
-    file { 'a test file': 
-      ensure  => present,
-      path    => "/etc/sample",
-      content => "test string",
-    }
-    
-  apply_manifest(pp, :catch_failures => true)
-  apply_manifest(pp, :catch_changes => true)
-  
-end
-
-describe file("/etc/sample") do
-  it { is_expected.to contain "test string" }
-end
-
-```
-
-# If you have commit access to the repository
-
-Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge
-in your changes.  The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that
-all changes go through a code review process.**
-
-The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch.
-
-# Get Help
-
-### On the web
-* [Puppet help messageboard](http://puppet.com/community/get-help)
-* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-
-### On chat
-* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli
-* IRC (freenode) #puppet-dev, #voxpupuli
-
-
-[rspec-puppet]: http://rspec-puppet.com/
-[rspec-puppet_docs]: http://rspec-puppet.com/documentation/
-[beaker]: https://github.com/puppetlabs/beaker
-[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
+Check out our [Contributing to Supported Modules Blog Post](https://puppetlabs.github.io/iac/docs/contributing_to_a_module.html) to find all the information that you will need.

From bbfdc935fe5a437f4f1f1c869b3d19e6505585a4 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 13 Jul 2021 13:21:15 +0200
Subject: [PATCH 1821/2267] (maint) Fix puppet-strings docs on apache::vhost

With this empty line between the commend and the define, puppet-strings
doesn't consider the comment as a documentation string. That means all
the documentation that is written doesn't show up in REFERENCE.md.

Fixes: 7e233fe7cc108605384506f11083aeea6e3a2464
---
 REFERENCE.md       | 2877 ++++++++++++++++++++++++++++++--------------
 manifests/vhost.pp |    1 -
 2 files changed, 1973 insertions(+), 905 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 54e8953304..e5de378042 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -133,7 +133,8 @@ Apache server's or a virtual host's listening address and port.
 * [`apache::mod`](#apachemod): Installs packages for an Apache module that doesn't have a corresponding
 `apache::mod::<MODULE NAME>` class.
 * [`apache::namevirtualhost`](#apachenamevirtualhost): Enables name-based virtual hosts
-* [`apache::vhost`](#apachevhost)
+* [`apache::vhost`](#apachevhost): Allows specialised configurations for virtual hosts that possess requirements
+outside of the defaults.
 * [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
 * [`apache::vhost::fragment`](#apachevhostfragment): Define a fragment within a vhost
 
@@ -7506,157 +7507,86 @@ directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`
 
 ### <a name="apachevhost"></a>`apache::vhost`
 
-The apache::vhost class.
+The apache module allows a lot of flexibility in the setup and configuration of virtual hosts.
+This flexibility is due, in part, to `vhost` being a defined resource type, which allows Apache
+to evaluate it multiple times with different parameters.<br />
+The `apache::vhost` defined type allows you to have specialized configurations for virtual hosts
+that have requirements outside the defaults. You can set up a default virtual host within
+the base `::apache` class, as well as set a customized virtual host as the default.
+Customized virtual hosts have a lower numeric `priority` than the base class's, causing
+Apache to process the customized virtual host first.<br />
+The `apache::vhost` defined type uses `concat::fragment` to build the configuration file. To
+inject custom fragments for pieces of the configuration that the defined type doesn't
+inherently support, add a custom fragment.<br />
+For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples
+of 10, so any `order` that isn't a multiple of 10 should work.<br />
+> **Note:** When creating an `apache::vhost`, it cannot be named `default` or `default-ssl`,
+because vhosts with these titles are always managed by the module. This means that you cannot
+override `Apache::Vhost['default']`  or `Apache::Vhost['default-ssl]` resources. An optional
+workaround is to create a vhost named something else, such as `my default`, and ensure that the
+`default` and `default_ssl` vhosts are set to `false`:
+
+#### Examples
+
+##### 
+
+```puppet
+class { 'apache':
+  default_vhost     => false,
+  default_ssl_vhost => false,
+}
+```
 
 #### Parameters
 
 The following parameters are available in the `apache::vhost` defined type:
 
-* [`docroot`](#docroot)
-* [`manage_docroot`](#manage_docroot)
-* [`virtual_docroot`](#virtual_docroot)
-* [`port`](#port)
-* [`ip`](#ip)
-* [`ip_based`](#ip_based)
-* [`add_listen`](#add_listen)
-* [`docroot_owner`](#docroot_owner)
-* [`docroot_group`](#docroot_group)
-* [`docroot_mode`](#docroot_mode)
-* [`protocols`](#protocols)
-* [`protocols_honor_order`](#protocols_honor_order)
-* [`serveradmin`](#serveradmin)
-* [`ssl`](#ssl)
-* [`ssl_cert`](#ssl_cert)
-* [`ssl_key`](#ssl_key)
-* [`ssl_chain`](#ssl_chain)
-* [`ssl_ca`](#ssl_ca)
-* [`ssl_crl_path`](#ssl_crl_path)
-* [`ssl_crl`](#ssl_crl)
-* [`ssl_crl_check`](#ssl_crl_check)
-* [`ssl_certs_dir`](#ssl_certs_dir)
-* [`ssl_protocol`](#ssl_protocol)
-* [`ssl_cipher`](#ssl_cipher)
-* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
-* [`ssl_verify_client`](#ssl_verify_client)
-* [`ssl_verify_depth`](#ssl_verify_depth)
-* [`ssl_proxy_verify`](#ssl_proxy_verify)
-* [`ssl_proxy_verify_depth`](#ssl_proxy_verify_depth)
-* [`ssl_proxy_ca_cert`](#ssl_proxy_ca_cert)
-* [`ssl_proxy_check_peer_cn`](#ssl_proxy_check_peer_cn)
-* [`ssl_proxy_check_peer_name`](#ssl_proxy_check_peer_name)
-* [`ssl_proxy_check_peer_expire`](#ssl_proxy_check_peer_expire)
-* [`ssl_proxy_machine_cert`](#ssl_proxy_machine_cert)
-* [`ssl_proxy_machine_cert_chain`](#ssl_proxy_machine_cert_chain)
-* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
-* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
-* [`ssl_options`](#ssl_options)
-* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
-* [`ssl_proxyengine`](#ssl_proxyengine)
-* [`ssl_stapling`](#ssl_stapling)
-* [`ssl_stapling_timeout`](#ssl_stapling_timeout)
-* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
-* [`ssl_user_name`](#ssl_user_name)
-* [`priority`](#priority)
-* [`default_vhost`](#default_vhost)
-* [`servername`](#servername)
-* [`serveraliases`](#serveraliases)
-* [`options`](#options)
-* [`override`](#override)
-* [`directoryindex`](#directoryindex)
-* [`vhost_name`](#vhost_name)
-* [`logroot`](#logroot)
-* [`logroot_ensure`](#logroot_ensure)
-* [`logroot_mode`](#logroot_mode)
-* [`logroot_owner`](#logroot_owner)
-* [`logroot_group`](#logroot_group)
-* [`log_level`](#log_level)
+* [`apache_version`](#apache_version)
 * [`access_log`](#access_log)
+* [`access_log_env_var`](#access_log_env_var)
 * [`access_log_file`](#access_log_file)
+* [`access_log_format`](#access_log_format)
 * [`access_log_pipe`](#access_log_pipe)
 * [`access_log_syslog`](#access_log_syslog)
-* [`access_log_format`](#access_log_format)
-* [`access_log_env_var`](#access_log_env_var)
 * [`access_logs`](#access_logs)
-* [`use_servername_for_filenames`](#use_servername_for_filenames)
-* [`use_port_for_filenames`](#use_port_for_filenames)
+* [`add_default_charset`](#add_default_charset)
+* [`add_listen`](#add_listen)
+* [`use_optional_includes`](#use_optional_includes)
+* [`additional_includes`](#additional_includes)
 * [`aliases`](#aliases)
-* [`directories`](#directories)
+* [`allow_encoded_slashes`](#allow_encoded_slashes)
+* [`block`](#block)
+* [`cas_attribute_prefix`](#cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
+* [`cas_login_url`](#cas_login_url)
+* [`cas_root_proxied_as`](#cas_root_proxied_as)
+* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
+* [`cas_sso_enabled`](#cas_sso_enabled)
+* [`cas_validate_saml`](#cas_validate_saml)
+* [`cas_validate_url`](#cas_validate_url)
+* [`cas_cookie_path`](#cas_cookie_path)
+* [`comment`](#comment)
+* [`custom_fragment`](#custom_fragment)
+* [`default_vhost`](#default_vhost)
+* [`directoryindex`](#directoryindex)
+* [`docroot`](#docroot)
+* [`docroot_group`](#docroot_group)
+* [`docroot_owner`](#docroot_owner)
+* [`docroot_mode`](#docroot_mode)
+* [`manage_docroot`](#manage_docroot)
 * [`error_log`](#error_log)
 * [`error_log_file`](#error_log_file)
 * [`error_log_pipe`](#error_log_pipe)
 * [`error_log_syslog`](#error_log_syslog)
 * [`error_log_format`](#error_log_format)
-* [`http_protocol_options`](#http_protocol_options)
-* [`modsec_audit_log`](#modsec_audit_log)
-* [`modsec_audit_log_file`](#modsec_audit_log_file)
-* [`modsec_audit_log_pipe`](#modsec_audit_log_pipe)
 * [`error_documents`](#error_documents)
-* [`fallbackresource`](#fallbackresource)
-* [`scriptalias`](#scriptalias)
-* [`scriptaliases`](#scriptaliases)
-* [`limitreqfieldsize`](#limitreqfieldsize)
-* [`limitreqfields`](#limitreqfields)
-* [`limitreqline`](#limitreqline)
-* [`limitreqbody`](#limitreqbody)
-* [`proxy_dest`](#proxy_dest)
-* [`proxy_dest_match`](#proxy_dest_match)
-* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
-* [`proxy_pass`](#proxy_pass)
-* [`proxy_pass_match`](#proxy_pass_match)
-* [`proxy_requests`](#proxy_requests)
-* [`suphp_addhandler`](#suphp_addhandler)
-* [`suphp_engine`](#suphp_engine)
-* [`suphp_configpath`](#suphp_configpath)
-* [`php_flags`](#php_flags)
-* [`php_values`](#php_values)
-* [`php_admin_flags`](#php_admin_flags)
-* [`php_admin_values`](#php_admin_values)
-* [`no_proxy_uris`](#no_proxy_uris)
-* [`no_proxy_uris_match`](#no_proxy_uris_match)
-* [`proxy_preserve_host`](#proxy_preserve_host)
-* [`proxy_add_headers`](#proxy_add_headers)
-* [`proxy_error_override`](#proxy_error_override)
-* [`redirect_source`](#redirect_source)
-* [`redirect_dest`](#redirect_dest)
-* [`redirect_status`](#redirect_status)
-* [`redirectmatch_status`](#redirectmatch_status)
-* [`redirectmatch_regexp`](#redirectmatch_regexp)
-* [`redirectmatch_dest`](#redirectmatch_dest)
-* [`headers`](#headers)
-* [`request_headers`](#request_headers)
-* [`filters`](#filters)
-* [`rewrites`](#rewrites)
-* [`rewrite_base`](#rewrite_base)
-* [`rewrite_rule`](#rewrite_rule)
-* [`rewrite_cond`](#rewrite_cond)
-* [`rewrite_inherit`](#rewrite_inherit)
-* [`setenv`](#setenv)
-* [`setenvif`](#setenvif)
-* [`setenvifnocase`](#setenvifnocase)
-* [`block`](#block)
 * [`ensure`](#ensure)
-* [`wsgi_application_group`](#wsgi_application_group)
-* [`wsgi_daemon_process`](#wsgi_daemon_process)
-* [`wsgi_daemon_process_options`](#wsgi_daemon_process_options)
-* [`wsgi_import_script`](#wsgi_import_script)
-* [`wsgi_import_script_options`](#wsgi_import_script_options)
-* [`wsgi_process_group`](#wsgi_process_group)
-* [`wsgi_script_aliases_match`](#wsgi_script_aliases_match)
-* [`wsgi_script_aliases`](#wsgi_script_aliases)
-* [`wsgi_pass_authorization`](#wsgi_pass_authorization)
-* [`wsgi_chunked_request`](#wsgi_chunked_request)
-* [`custom_fragment`](#custom_fragment)
-* [`itk`](#itk)
-* [`action`](#action)
+* [`fallbackresource`](#fallbackresource)
 * [`fastcgi_server`](#fastcgi_server)
 * [`fastcgi_socket`](#fastcgi_socket)
-* [`fastcgi_dir`](#fastcgi_dir)
 * [`fastcgi_idle_timeout`](#fastcgi_idle_timeout)
-* [`additional_includes`](#additional_includes)
-* [`use_optional_includes`](#use_optional_includes)
-* [`apache_version`](#apache_version)
-* [`allow_encoded_slashes`](#allow_encoded_slashes)
-* [`suexec_user_group`](#suexec_user_group)
+* [`fastcgi_dir`](#fastcgi_dir)
+* [`filters`](#filters)
 * [`h2_copy_files`](#h2_copy_files)
 * [`h2_direct`](#h2_direct)
 * [`h2_early_hints`](#h2_early_hints)
@@ -7672,6 +7602,48 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
 * [`h2_upgrade`](#h2_upgrade)
 * [`h2_window_size`](#h2_window_size)
+* [`headers`](#headers)
+* [`ip`](#ip)
+* [`ip_based`](#ip_based)
+* [`itk`](#itk)
+* [`action`](#action)
+* [`jk_mounts`](#jk_mounts)
+* [`http_protocol_options`](#http_protocol_options)
+* [`keepalive`](#keepalive)
+* [`keepalive_timeout`](#keepalive_timeout)
+* [`max_keepalive_requests`](#max_keepalive_requests)
+* [`auth_kerb`](#auth_kerb)
+* [`krb_method_negotiate`](#krb_method_negotiate)
+* [`krb_method_k5passwd`](#krb_method_k5passwd)
+* [`krb_authoritative`](#krb_authoritative)
+* [`krb_auth_realms`](#krb_auth_realms)
+* [`krb_5keytab`](#krb_5keytab)
+* [`krb_local_user_mapping`](#krb_local_user_mapping)
+* [`krb_verify_kdc`](#krb_verify_kdc)
+* [`krb_servicename`](#krb_servicename)
+* [`krb_save_credentials`](#krb_save_credentials)
+* [`logroot`](#logroot)
+* [`logroot_ensure`](#logroot_ensure)
+* [`logroot_mode`](#logroot_mode)
+* [`logroot_owner`](#logroot_owner)
+* [`logroot_group`](#logroot_group)
+* [`log_level`](#log_level)
+* [`modsec_body_limit`](#modsec_body_limit)
+* [`modsec_disable_vhost`](#modsec_disable_vhost)
+* [`modsec_disable_ids`](#modsec_disable_ids)
+* [`modsec_disable_ips`](#modsec_disable_ips)
+* [`modsec_disable_msgs`](#modsec_disable_msgs)
+* [`modsec_disable_tags`](#modsec_disable_tags)
+* [`modsec_audit_log_file`](#modsec_audit_log_file)
+* [`modsec_audit_log_pipe`](#modsec_audit_log_pipe)
+* [`modsec_audit_log`](#modsec_audit_log)
+* [`no_proxy_uris`](#no_proxy_uris)
+* [`no_proxy_uris_match`](#no_proxy_uris_match)
+* [`proxy_preserve_host`](#proxy_preserve_host)
+* [`proxy_add_headers`](#proxy_add_headers)
+* [`proxy_error_override`](#proxy_error_override)
+* [`options`](#options)
+* [`override`](#override)
 * [`passenger_enabled`](#passenger_enabled)
 * [`passenger_base_uri`](#passenger_base_uri)
 * [`passenger_ruby`](#passenger_ruby)
@@ -7717,846 +7689,1152 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`passenger_app_log_file`](#passenger_app_log_file)
 * [`passenger_debugger`](#passenger_debugger)
 * [`passenger_lve_min_uid`](#passenger_lve_min_uid)
-* [`add_default_charset`](#add_default_charset)
-* [`modsec_disable_vhost`](#modsec_disable_vhost)
-* [`modsec_disable_ids`](#modsec_disable_ids)
-* [`modsec_disable_ips`](#modsec_disable_ips)
-* [`modsec_disable_msgs`](#modsec_disable_msgs)
-* [`modsec_disable_tags`](#modsec_disable_tags)
-* [`modsec_body_limit`](#modsec_body_limit)
-* [`jk_mounts`](#jk_mounts)
-* [`auth_kerb`](#auth_kerb)
-* [`krb_method_negotiate`](#krb_method_negotiate)
-* [`krb_method_k5passwd`](#krb_method_k5passwd)
-* [`krb_authoritative`](#krb_authoritative)
-* [`krb_auth_realms`](#krb_auth_realms)
-* [`krb_5keytab`](#krb_5keytab)
-* [`krb_local_user_mapping`](#krb_local_user_mapping)
-* [`krb_verify_kdc`](#krb_verify_kdc)
-* [`krb_servicename`](#krb_servicename)
-* [`krb_save_credentials`](#krb_save_credentials)
-* [`keepalive`](#keepalive)
-* [`keepalive_timeout`](#keepalive_timeout)
-* [`max_keepalive_requests`](#max_keepalive_requests)
-* [`cas_attribute_prefix`](#cas_attribute_prefix)
-* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
-* [`cas_root_proxied_as`](#cas_root_proxied_as)
-* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
-* [`cas_sso_enabled`](#cas_sso_enabled)
-* [`cas_login_url`](#cas_login_url)
-* [`cas_validate_url`](#cas_validate_url)
-* [`cas_validate_saml`](#cas_validate_saml)
-* [`cas_cookie_path`](#cas_cookie_path)
+* [`php_values`](#php_values)
+* [`php_flags`](#php_flags)
+* [`php_admin_values`](#php_admin_values)
+* [`php_admin_flags`](#php_admin_flags)
+* [`port`](#port)
+* [`priority`](#priority)
+* [`protocols`](#protocols)
+* [`protocols_honor_order`](#protocols_honor_order)
+* [`proxy_dest`](#proxy_dest)
+* [`proxy_pass`](#proxy_pass)
+* [`proxy_dest_match`](#proxy_dest_match)
+* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
+* [`proxy_pass_match`](#proxy_pass_match)
+* [`redirect_dest`](#redirect_dest)
+* [`redirect_source`](#redirect_source)
+* [`redirect_status`](#redirect_status)
+* [`redirectmatch_regexp`](#redirectmatch_regexp)
+* [`redirectmatch_status`](#redirectmatch_status)
+* [`redirectmatch_dest`](#redirectmatch_dest)
+* [`request_headers`](#request_headers)
+* [`rewrites`](#rewrites)
+* [`rewrite_base`](#rewrite_base)
+* [`rewrite_rule`](#rewrite_rule)
+* [`rewrite_cond`](#rewrite_cond)
+* [`rewrite_inherit`](#rewrite_inherit)
+* [`scriptalias`](#scriptalias)
+* [`scriptaliases`](#scriptaliases)
+* [`serveradmin`](#serveradmin)
+* [`serveraliases`](#serveraliases)
+* [`servername`](#servername)
+* [`setenv`](#setenv)
+* [`setenvif`](#setenvif)
+* [`setenvifnocase`](#setenvifnocase)
+* [`suexec_user_group`](#suexec_user_group)
+* [`suphp_addhandler`](#suphp_addhandler)
+* [`suphp_configpath`](#suphp_configpath)
+* [`suphp_engine`](#suphp_engine)
+* [`vhost_name`](#vhost_name)
+* [`virtual_docroot`](#virtual_docroot)
+* [`wsgi_daemon_process`](#wsgi_daemon_process)
+* [`wsgi_daemon_process_options`](#wsgi_daemon_process_options)
+* [`wsgi_application_group`](#wsgi_application_group)
+* [`wsgi_import_script`](#wsgi_import_script)
+* [`wsgi_import_script_options`](#wsgi_import_script_options)
+* [`wsgi_chunked_request`](#wsgi_chunked_request)
+* [`wsgi_process_group`](#wsgi_process_group)
+* [`wsgi_script_aliases`](#wsgi_script_aliases)
+* [`wsgi_script_aliases_match`](#wsgi_script_aliases_match)
+* [`wsgi_pass_authorization`](#wsgi_pass_authorization)
+* [`directories`](#directories)
+* [`custom_fragment`](#custom_fragment)
+* [`error_documents`](#error_documents)
+* [`h2_copy_files`](#h2_copy_files)
+* [`h2_push_resource`](#h2_push_resource)
+* [`headers`](#headers)
+* [`options`](#options)
 * [`shib_compat_valid_user`](#shib_compat_valid_user)
+* [`ssl_options`](#ssl_options)
+* [`additional_includes`](#additional_includes)
+* [`gssapi`](#gssapi)
+* [`ssl`](#ssl)
+* [`ssl_ca`](#ssl_ca)
+* [`ssl_cert`](#ssl_cert)
+* [`ssl_protocol`](#ssl_protocol)
+* [`ssl_cipher`](#ssl_cipher)
+* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
+* [`ssl_certs_dir`](#ssl_certs_dir)
+* [`ssl_chain`](#ssl_chain)
+* [`ssl_crl`](#ssl_crl)
+* [`ssl_crl_path`](#ssl_crl_path)
+* [`ssl_crl_check`](#ssl_crl_check)
+* [`ssl_key`](#ssl_key)
+* [`ssl_verify_client`](#ssl_verify_client)
+* [`ssl_verify_depth`](#ssl_verify_depth)
+* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
+* [`ssl_proxy_verify`](#ssl_proxy_verify)
+* [`ssl_proxy_verify_depth`](#ssl_proxy_verify_depth)
+* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
+* [`ssl_proxy_ca_cert`](#ssl_proxy_ca_cert)
+* [`ssl_proxy_machine_cert`](#ssl_proxy_machine_cert)
+* [`ssl_proxy_machine_cert_chain`](#ssl_proxy_machine_cert_chain)
+* [`ssl_proxy_check_peer_cn`](#ssl_proxy_check_peer_cn)
+* [`ssl_proxy_check_peer_name`](#ssl_proxy_check_peer_name)
+* [`ssl_proxy_check_peer_expire`](#ssl_proxy_check_peer_expire)
+* [`ssl_options`](#ssl_options)
+* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
+* [`ssl_proxyengine`](#ssl_proxyengine)
+* [`ssl_stapling`](#ssl_stapling)
+* [`ssl_stapling_timeout`](#ssl_stapling_timeout)
+* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
+* [`ssl_user_name`](#ssl_user_name)
 * [`use_canonical_name`](#use_canonical_name)
-* [`comment`](#comment)
 * [`define`](#define)
 * [`auth_oidc`](#auth_oidc)
 * [`oidc_settings`](#oidc_settings)
+* [`limitreqfields`](#limitreqfields)
+* [`limitreqfieldsize`](#limitreqfieldsize)
+* [`limitreqline`](#limitreqline)
+* [`limitreqbody`](#limitreqbody)
+* [`$use_servername_for_filenames`](#$use_servername_for_filenames)
+* [`$use_port_for_filenames`](#$use_port_for_filenames)
+* [`$mdomain`](#$mdomain)
+* [`use_servername_for_filenames`](#use_servername_for_filenames)
+* [`use_port_for_filenames`](#use_port_for_filenames)
+* [`proxy_requests`](#proxy_requests)
 * [`mdomain`](#mdomain)
 
-##### <a name="docroot"></a>`docroot`
-
-Data type: `Variant[Boolean,String]`
+##### <a name="apache_version"></a>`apache_version`
 
+Data type: `Any`
 
+Apache's version number as a string, such as '2.2' or '2.4'.
 
-##### <a name="manage_docroot"></a>`manage_docroot`
+Default value: `$apache::apache_version`
 
-Data type: `Any`
+##### <a name="access_log"></a>`access_log`
 
+Data type: `Boolean`
 
+Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
 
 Default value: ``true``
 
-##### <a name="virtual_docroot"></a>`virtual_docroot`
+##### <a name="access_log_env_var"></a>`access_log_env_var`
 
 Data type: `Any`
 
-
+Specifies that only requests with particular environment variables be logged.
 
 Default value: ``false``
 
-##### <a name="port"></a>`port`
-
-Data type: `Any`
-
-
-
-Default value: ``undef``
-
-##### <a name="ip"></a>`ip`
+##### <a name="access_log_file"></a>`access_log_file`
 
 Data type: `Any`
 
-
-
-Default value: ``undef``
-
-##### <a name="ip_based"></a>`ip_based`
-
-Data type: `Boolean`
-
-
+Sets the filename of the `*_access.log` placed in `logroot`. Given a virtual host ---for
+instance, example.com--- it defaults to 'example.com_ssl.log' for
+[SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
+`example.com_access.log` for unencrypted virtual hosts.
 
 Default value: ``false``
 
-##### <a name="add_listen"></a>`add_listen`
-
-Data type: `Any`
-
-
-
-Default value: ``true``
-
-##### <a name="docroot_owner"></a>`docroot_owner`
+##### <a name="access_log_format"></a>`access_log_format`
 
 Data type: `Any`
 
+Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the
+access log.
 
+Default value: ``false``
 
-Default value: `'root'`
-
-##### <a name="docroot_group"></a>`docroot_group`
+##### <a name="access_log_pipe"></a>`access_log_pipe`
 
 Data type: `Any`
 
+Specifies a pipe where Apache sends access log messages.
 
+Default value: ``false``
 
-Default value: `$apache::params::root_group`
-
-##### <a name="docroot_mode"></a>`docroot_mode`
+##### <a name="access_log_syslog"></a>`access_log_syslog`
 
 Data type: `Any`
 
+Sends all access log messages to syslog.
 
+Default value: ``false``
 
-Default value: ``undef``
-
-##### <a name="protocols"></a>`protocols`
-
-Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
-
-
-
-Default value: `[]`
-
-##### <a name="protocols_honor_order"></a>`protocols_honor_order`
-
-Data type: `Optional[Boolean]`
+##### <a name="access_logs"></a>`access_logs`
 
+Data type: `Optional[Array]`
 
+Allows you to give a hash that specifies the state of each of the `access_log_*`
+directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
 
 Default value: ``undef``
 
-##### <a name="serveradmin"></a>`serveradmin`
+##### <a name="add_default_charset"></a>`add_default_charset`
 
 Data type: `Any`
 
-
+Sets a default media charset value for the `AddDefaultCharset` directive, which is
+added to `text/plain` and `text/html` responses.
 
 Default value: ``undef``
 
-##### <a name="ssl"></a>`ssl`
-
-Data type: `Boolean`
-
-
-
-Default value: ``false``
-
-##### <a name="ssl_cert"></a>`ssl_cert`
-
-Data type: `Any`
-
-
-
-Default value: `$apache::default_ssl_cert`
-
-##### <a name="ssl_key"></a>`ssl_key`
+##### <a name="add_listen"></a>`add_listen`
 
 Data type: `Any`
 
+Determines whether the virtual host creates a `Listen` statement.<br />
+Setting `add_listen` to `false` prevents the virtual host from creating a `Listen`
+statement. This is important when combining virtual hosts that aren't passed an `ip`
+parameter with those that are.
 
+Default value: ``true``
 
-Default value: `$apache::default_ssl_key`
-
-##### <a name="ssl_chain"></a>`ssl_chain`
+##### <a name="use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Any`
 
+Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for
+`additional_includes` in Apache 2.4 or newer.
 
+Default value: `$apache::use_optional_includes`
 
-Default value: `$apache::default_ssl_chain`
-
-##### <a name="ssl_ca"></a>`ssl_ca`
+##### <a name="additional_includes"></a>`additional_includes`
 
 Data type: `Any`
 
+Specifies paths to additional static, virtual host-specific Apache configuration files.
+You can use this parameter to implement a unique, custom configuration not supported by
+this module.
 
+Default value: `[]`
 
-Default value: `$apache::default_ssl_ca`
-
-##### <a name="ssl_crl_path"></a>`ssl_crl_path`
+##### <a name="aliases"></a>`aliases`
 
 Data type: `Any`
 
+Passes a list of [hashes][hash] to the virtual host to create `Alias`, `AliasMatch`,
+`ScriptAlias` or `ScriptAliasMatch` directives as per the `mod_alias` documentation.<br />
+For example:
+``` puppet
+aliases => [
+  { aliasmatch       => '^/image/(.*)\.jpg$',
+    path             => '/files/jpg.images/$1.jpg',
+  },
+  { alias            => '/image',
+    path             => '/ftp/pub/image',
+  },
+  { scriptaliasmatch => '^/cgi-bin(.*)',
+    path             => '/usr/local/share/cgi-bin$1',
+  },
+  { scriptalias      => '/nagios/cgi-bin/',
+    path             => '/usr/lib/nagios/cgi-bin/',
+  },
+  { alias            => '/nagios',
+    path             => '/usr/share/nagios/html',
+  },
+],
+```
+For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs
+a corresponding context, such as `<Directory /path/to/directory>` or
+`<Location /some/location/here>`. Puppet creates the directives in the order specified in
+the `aliases` parameter. As described in the `mod_alias` documentation, add more specific
+`alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more
+general ones to avoid shadowing.<BR />
+> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because
+you can precisely control the order of various alias directives. Defining `ScriptAliases`
+using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after
+*all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias`
+directives. This often causes problems; for example, this could cause problems with Nagios.<BR />
+If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias`
+directive might not be able to honor the `PassengerEnabled => off` statement. See
+[this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
+Default value: ``undef``
 
-Default value: `$apache::default_ssl_crl_path`
-
-##### <a name="ssl_crl"></a>`ssl_crl`
-
-Data type: `Any`
+##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
 
+Data type: `Optional[Enum['on', 'off', 'nodecode']]`
 
+Sets the `AllowEncodedSlashes` declaration for the virtual host, overriding the server
+default. This modifies the virtual host responses to URLs with `\` and `/` characters. The
+default setting omits the declaration from the server configuration and selects the
+Apache default setting of `Off`.
 
-Default value: `$apache::default_ssl_crl`
+Default value: ``undef``
 
-##### <a name="ssl_crl_check"></a>`ssl_crl_check`
+##### <a name="block"></a>`block`
 
 Data type: `Any`
 
+Specifies the list of things to which Apache blocks access. Valid options are: `scm` (which
+blocks web access to `.svn`), `.git`, and `.bzr` directories.
 
+Default value: `[]`
 
-Default value: `$apache::default_ssl_crl_check`
-
-##### <a name="ssl_certs_dir"></a>`ssl_certs_dir`
+##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Any`
 
+Adds a header with the value of this header being the attribute values when SAML
+validation is enabled.
 
+Default value: ``undef``
 
-Default value: `$apache::params::ssl_certs_dir`
-
-##### <a name="ssl_protocol"></a>`ssl_protocol`
+##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Any`
 
-
+Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
 Default value: ``undef``
 
-##### <a name="ssl_cipher"></a>`ssl_cipher`
+##### <a name="cas_login_url"></a>`cas_login_url`
 
 Data type: `Any`
 
-
+Sets the URL to which the module redirects users when they attempt to access a
+CAS-protected resource and don't have an active session.
 
 Default value: ``undef``
 
-##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
-
-Data type: `Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef]`
+##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
 
+Data type: `Any`
 
+Sets the URL end users see when access to this Apache server is proxied per vhost.
+This URL should not include a trailing slash.
 
 Default value: ``undef``
 
-##### <a name="ssl_verify_client"></a>`ssl_verify_client`
-
-Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
+##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
+Data type: `Any`
 
+Remove inbound request headers that may have special meaning within mod_auth_cas.
 
 Default value: ``undef``
 
-##### <a name="ssl_verify_depth"></a>`ssl_verify_depth`
+##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Any`
 
-
+Enables experimental support for single sign out (may mangle POST data).
 
 Default value: ``undef``
 
-##### <a name="ssl_proxy_verify"></a>`ssl_proxy_verify`
-
-Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
+##### <a name="cas_validate_saml"></a>`cas_validate_saml`
 
+Data type: `Any`
 
+Parse response from CAS server for SAML.
 
 Default value: ``undef``
 
-##### <a name="ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
-
-Data type: `Optional[Integer[0]]`
+##### <a name="cas_validate_url"></a>`cas_validate_url`
 
+Data type: `Any`
 
+Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
 Default value: ``undef``
 
-##### <a name="ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
+##### <a name="cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `Any`
 
-
+Sets the location where information on the current session should be stored. This should
+be writable by the web server only.
 
 Default value: ``undef``
 
-##### <a name="ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
-
-Data type: `Optional[Enum['on', 'off']]`
+##### <a name="comment"></a>`comment`
 
+Data type: `Optional[Variant[String,Array[String]]]`
 
+Adds comments to the header of the configuration file. Pass as string or an array of strings.
+For example:
+``` puppet
+comment => "Account number: 123B",
+```
+Or:
+``` puppet
+comment => [
+  "Customer: X",
+  "Frontend domain: x.example.org",
+]
+```
 
 Default value: ``undef``
 
-##### <a name="ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
-
-Data type: `Optional[Enum['on', 'off']]`
+##### <a name="custom_fragment"></a>`custom_fragment`
 
+Data type: `Optional[String]`
 
+Passes a string of custom configuration directives to place at the end of the virtual
+host configuration.
 
 Default value: ``undef``
 
-##### <a name="ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
-
-Data type: `Optional[Enum['on', 'off']]`
+##### <a name="default_vhost"></a>`default_vhost`
 
+Data type: `Boolean`
 
+Sets a given `apache::vhost` defined type as the default to serve requests that do not
+match any other `apache::vhost` defined types.
 
-Default value: ``undef``
+Default value: ``false``
 
-##### <a name="ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
+##### <a name="directoryindex"></a>`directoryindex`
 
 Data type: `Any`
 
+Sets the list of resources to look for when a client requests an index of the directory
+by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive
+documentation for details.
 
+Default value: `''`
 
-Default value: ``undef``
-
-##### <a name="ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
-
-Data type: `Any`
-
+##### <a name="docroot"></a>`docroot`
 
+Data type: `Variant[Boolean,String]`
 
-Default value: ``undef``
+**Required**.<br />
+Sets the `DocumentRoot` location, from which Apache serves files.<br />
+If `docroot` and `manage_docroot` are both set to `false`, no `DocumentRoot` will be set
+and the accompanying `<Directory /path/to/directory>` block will not be created.
 
-##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
+##### <a name="docroot_group"></a>`docroot_group`
 
 Data type: `Any`
 
+Sets group access to the `docroot` directory.
 
+Default value: `$apache::params::root_group`
 
-Default value: ``undef``
-
-##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
+##### <a name="docroot_owner"></a>`docroot_owner`
 
 Data type: `Any`
 
+Sets individual user access to the `docroot` directory.
 
+Default value: `'root'`
 
-Default value: ``undef``
-
-##### <a name="ssl_options"></a>`ssl_options`
+##### <a name="docroot_mode"></a>`docroot_mode`
 
 Data type: `Any`
 
-
+Sets access permissions for the `docroot` directory, in numeric notation.
 
 Default value: ``undef``
 
-##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
+##### <a name="manage_docroot"></a>`manage_docroot`
 
 Data type: `Any`
 
+Determines whether Puppet manages the `docroot` directory.
 
+Default value: ``true``
 
-Default value: ``undef``
-
-##### <a name="ssl_proxyengine"></a>`ssl_proxyengine`
+##### <a name="error_log"></a>`error_log`
 
 Data type: `Boolean`
 
+Specifies whether `*_error.log` directives should be configured.
 
+Default value: ``true``
 
-Default value: ``false``
-
-##### <a name="ssl_stapling"></a>`ssl_stapling`
-
-Data type: `Optional[Boolean]`
+##### <a name="error_log_file"></a>`error_log_file`
 
+Data type: `Any`
 
+Points the virtual host's error logs to a `*_error.log` file. If this parameter is
+undefined, Puppet checks for values in `error_log_pipe`, then `error_log_syslog`.<br />
+If none of these parameters is set, given a virtual host `example.com`, Puppet defaults
+to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and
+`$logroot/example.com_error.log` for non-SSL virtual hosts.
 
 Default value: ``undef``
 
-##### <a name="ssl_stapling_timeout"></a>`ssl_stapling_timeout`
+##### <a name="error_log_pipe"></a>`error_log_pipe`
 
 Data type: `Any`
 
-
+Specifies a pipe to send error log messages to.<br />
+This parameter has no effect if the `error_log_file` parameter has a value. If neither
+this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
 
 Default value: ``undef``
 
-##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
+##### <a name="error_log_syslog"></a>`error_log_syslog`
 
 Data type: `Any`
 
-
+Determines whether to send all error log messages to syslog.
+This parameter has no effect if either of the `error_log_file` or `error_log_pipe`
+parameters has a value. If none of these parameters has a value, given a virtual host
+`example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual
+hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
 Default value: ``undef``
 
-##### <a name="ssl_user_name"></a>`ssl_user_name`
-
-Data type: `Optional[String]`
+##### <a name="error_log_format"></a>`error_log_format`
 
+Data type: `Optional[
+    Array[
+      Variant[
+        String,
+        Hash[String, Enum['connection', 'request']]
+      ]
+    ]
+  ]`
 
+Sets the [ErrorLogFormat](https://httpd.apache.org/docs/current/mod/core.html#errorlogformat)
+format specification for error log entries inside virtual host
+For example:
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  error_log_format => [
+    '[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M',
+    { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' },
+    { "[%{uc}t] [R:%L] UA:'%+{User-Agent}i'" => 'request' },
+    { "[%{uc}t] [R:%L] Referer:'%+{Referer}i'" => 'request' },
+    { '[%{uc}t] [C:%{c}L] local\ %a remote\ %A' => 'connection' },
+  ],
+}
+```
 
 Default value: ``undef``
 
-##### <a name="priority"></a>`priority`
+##### <a name="error_documents"></a>`error_documents`
 
 Data type: `Any`
 
+A list of hashes which can be used to override the
+[ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)
+settings for this virtual host.<br />
+For example:
+``` puppet
+apache::vhost { 'sample.example.net':
+  error_documents => [
+    { 'error_code' => '503', 'document' => '/service-unavail' },
+    { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
+  ],
+}
+```
 
+Default value: `[]`
 
-Default value: ``undef``
-
-##### <a name="default_vhost"></a>`default_vhost`
-
-Data type: `Boolean`
-
+##### <a name="ensure"></a>`ensure`
 
+Data type: `Enum['absent', 'present']`
 
-Default value: ``false``
+Specifies if the virtual host is present or absent.<br />
 
-##### <a name="servername"></a>`servername`
+Default value: `'present'`
 
-Data type: `Any`
+##### <a name="fallbackresource"></a>`fallbackresource`
 
+Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
 
+Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource)
+directive, which specifies an action to take for any URL that doesn't map to anything in
+your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin
+with a `/` or be `disabled`.
 
-Default value: `$name`
+Default value: ``undef``
 
-##### <a name="serveraliases"></a>`serveraliases`
+##### <a name="fastcgi_server"></a>`fastcgi_server`
 
 Data type: `Any`
 
+Specify an external FastCGI server to manage a connection to.
 
+Default value: ``undef``
 
-Default value: `[]`
-
-##### <a name="options"></a>`options`
+##### <a name="fastcgi_socket"></a>`fastcgi_socket`
 
 Data type: `Any`
 
+Specify the socket that will be used to communicate with an external FastCGI server.
 
+Default value: ``undef``
 
-Default value: `['Indexes','FollowSymLinks','MultiViews']`
-
-##### <a name="override"></a>`override`
+##### <a name="fastcgi_idle_timeout"></a>`fastcgi_idle_timeout`
 
 Data type: `Any`
 
+If using fastcgi, this option sets the timeout for the server to respond.
 
+Default value: ``undef``
 
-Default value: `['None']`
-
-##### <a name="directoryindex"></a>`directoryindex`
+##### <a name="fastcgi_dir"></a>`fastcgi_dir`
 
 Data type: `Any`
 
+Specify an internal FastCGI directory that is to be managed.
 
+Default value: ``undef``
 
-Default value: `''`
-
-##### <a name="vhost_name"></a>`vhost_name`
+##### <a name="filters"></a>`filters`
 
 Data type: `Any`
 
+[Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart,
+context-sensitive configuration of output content filters.
+``` puppet
+apache::vhost { "$::fqdn":
+  filters => [
+    'FilterDeclare   COMPRESS',
+    'FilterProvider  COMPRESS DEFLATE resp=Content-Type $text/html',
+    'FilterChain     COMPRESS',
+    'FilterProtocol  COMPRESS DEFLATE change=yes;byteranges=no',
+  ],
+}
+```
 
+Default value: ``undef``
 
-Default value: `'*'`
+##### <a name="h2_copy_files"></a>`h2_copy_files`
 
-##### <a name="logroot"></a>`logroot`
+Data type: `Optional[Boolean]`
 
-Data type: `Any`
+Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
+directive which influences how the requestion process pass files to the main connection.
 
+Default value: ``undef``
 
+##### <a name="h2_direct"></a>`h2_direct`
 
-Default value: `$apache::logroot`
+Data type: `Optional[Boolean]`
 
-##### <a name="logroot_ensure"></a>`logroot_ensure`
+Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
+directive which toggles the usage of the HTTP/2 Direct Mode.
 
-Data type: `Enum['directory', 'absent']`
+Default value: ``undef``
 
+##### <a name="h2_early_hints"></a>`h2_early_hints`
 
+Data type: `Optional[Boolean]`
 
-Default value: `'directory'`
+Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2earlyhints)
+directive which controls if HTTP status 103 interim responses are forwarded to
+the client or not.
 
-##### <a name="logroot_mode"></a>`logroot_mode`
+Default value: ``undef``
 
-Data type: `Any`
+##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
 
+Data type: `Optional[Integer]`
 
+Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2maxsessionstreams)
+directive which sets the maximum number of active streams per HTTP/2 session
+that the server allows.
 
 Default value: ``undef``
 
-##### <a name="logroot_owner"></a>`logroot_owner`
-
-Data type: `Any`
+##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
 
+Data type: `Optional[Boolean]`
 
+Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
+directive which toggles the security checks on HTTP/2 connections in TLS mode.
 
 Default value: ``undef``
 
-##### <a name="logroot_group"></a>`logroot_group`
-
-Data type: `Any`
+##### <a name="h2_push"></a>`h2_push`
 
+Data type: `Optional[Boolean]`
 
+Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
+directive which toggles the usage of the HTTP/2 server push protocol feature.
 
 Default value: ``undef``
 
-##### <a name="log_level"></a>`log_level`
-
-Data type: `Optional[Apache::LogLevel]`
+##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
 
+Data type: `Optional[Integer]`
 
+Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushdiarysize)
+directive which toggles the maximum number of HTTP/2 server pushes that are
+remembered per HTTP/2 connection.
 
 Default value: ``undef``
 
-##### <a name="access_log"></a>`access_log`
-
-Data type: `Boolean`
+##### <a name="h2_push_priority"></a>`h2_push_priority`
 
+Data type: `Array[String]`
 
+Sets the [H2PushPriority](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushpriority)
+directive which defines the priority handling of pushed responses based on the
+content-type of the response.
 
-Default value: ``true``
+Default value: `[]`
 
-##### <a name="access_log_file"></a>`access_log_file`
+##### <a name="h2_push_resource"></a>`h2_push_resource`
 
-Data type: `Any`
+Data type: `Array[String]`
 
+Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource)
+directive which declares resources for early pushing to the client.
 
+Default value: `[]`
 
-Default value: ``false``
+##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
 
-##### <a name="access_log_pipe"></a>`access_log_pipe`
+Data type: `Optional[Boolean]`
 
-Data type: `Any`
+Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
+directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
+format for processing by httpd core.
 
+Default value: ``undef``
 
+##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
-Default value: ``false``
+Data type: `Optional[Integer]`
 
-##### <a name="access_log_syslog"></a>`access_log_syslog`
+Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
+directive which sets the maximum number of outgoing data bytes buffered in
+memory for an active stream.
 
-Data type: `Any`
+Default value: ``undef``
 
+##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
+Data type: `Optional[Integer]`
 
-Default value: ``false``
+Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
+directive which sets the number of seconds of idle time on a TLS connection
+before the TLS write size falls back to a small (~1300 bytes) length.
 
-##### <a name="access_log_format"></a>`access_log_format`
+Default value: ``undef``
 
-Data type: `Any`
+##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
+Data type: `Optional[Integer]`
 
+Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlswarmupsize)
+directive which sets the number of bytes to be sent in small TLS records (~1300
+bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
 
-Default value: ``false``
+Default value: ``undef``
 
-##### <a name="access_log_env_var"></a>`access_log_env_var`
+##### <a name="h2_upgrade"></a>`h2_upgrade`
 
-Data type: `Any`
+Data type: `Optional[Boolean]`
 
+Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2upgrade)
+directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
+to HTTP/2.
 
+Default value: ``undef``
 
-Default value: ``false``
+##### <a name="h2_window_size"></a>`h2_window_size`
 
-##### <a name="access_logs"></a>`access_logs`
+Data type: `Optional[Integer]`
 
-Data type: `Optional[Array]`
+Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2windowsize)
+directive which sets the size of the window that is used for flow control from
+client to server and limits the amount of data the server has to buffer.
 
+Default value: ``undef``
 
+##### <a name="headers"></a>`headers`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### <a name="use_servername_for_filenames"></a>`use_servername_for_filenames`
+Adds lines to replace, merge, or remove response headers. See
+[Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
 
-Data type: `Optional[Boolean]`
+Default value: ``undef``
 
+##### <a name="ip"></a>`ip`
 
+Data type: `Any`
 
-Default value: ``false``
+Sets the IP address the virtual host listens on. By default, uses Apache's default behavior
+of listening on all IPs.
 
-##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
+Default value: ``undef``
 
-Data type: `Optional[Boolean]`
+##### <a name="ip_based"></a>`ip_based`
 
+Data type: `Boolean`
 
+Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual
+host. This parameter inhibits the creation of a NameVirtualHost directive, since those are
+used to funnel requests to name-based virtual hosts.
 
 Default value: ``false``
 
-##### <a name="aliases"></a>`aliases`
-
-Data type: `Any`
+##### <a name="itk"></a>`itk`
 
+Data type: `Optional[Hash]`
 
+Configures [ITK](http://mpm-itk.sesse.net/) in a hash.<br />
+Usage typically looks something like:
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot => '/path/to/directory',
+  itk     => {
+    user  => 'someuser',
+    group => 'somegroup',
+  },
+}
+```
+Valid values are: a hash, which can include the keys:
+* `user` + `group`
+* `assignuseridexpr`
+* `assigngroupidexpr`
+* `maxclientvhost`
+* `nice`
+* `limituidrange` (Linux 3.5.0 or newer)
+* `limitgidrange` (Linux 3.5.0 or newer)
 
 Default value: ``undef``
 
-##### <a name="directories"></a>`directories`
-
-Data type: `Optional[Variant[Hash, Array[Variant[Array,Hash]]]]`
+##### <a name="action"></a>`action`
 
+Data type: `Any`
 
+Specifies whether you wish to configure mod_actions action directive which will
+activate cgi-script when triggered by a request.
 
 Default value: ``undef``
 
-##### <a name="error_log"></a>`error_log`
-
-Data type: `Boolean`
-
+##### <a name="jk_mounts"></a>`jk_mounts`
 
+Data type: `Any`
 
-Default value: ``true``
+Sets up a virtual host with `JkMount` and `JkUnMount` directives to handle the paths
+for URL mapping between Tomcat and Apache.<br />
+The parameter must be an array of hashes where each hash must contain the `worker`
+and either the `mount` or `unmount` keys.<br />
+Usage typically looks like:
+``` puppet
+apache::vhost { 'sample.example.net':
+  jk_mounts => [
+    { mount   => '/*',     worker => 'tcnode1', },
+    { unmount => '/*.jpg', worker => 'tcnode1', },
+  ],
+}
+```
 
-##### <a name="error_log_file"></a>`error_log_file`
+Default value: ``undef``
 
-Data type: `Any`
+##### <a name="http_protocol_options"></a>`http_protocol_options`
 
+Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
 
+Specifies the strictness of HTTP protocol checks.
 
 Default value: ``undef``
 
-##### <a name="error_log_pipe"></a>`error_log_pipe`
-
-Data type: `Any`
+##### <a name="keepalive"></a>`keepalive`
 
+Data type: `Optional[Enum['on', 'off']]`
 
+Determines whether to enable persistent HTTP connections with the `KeepAlive` directive
+for the virtual host. By default, the global, server-wide `KeepAlive` setting is in effect.<br />
+Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options
+for the virtual host.
 
 Default value: ``undef``
 
-##### <a name="error_log_syslog"></a>`error_log_syslog`
+##### <a name="keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Any`
 
-
+Sets the `KeepAliveTimeout` directive for the virtual host, which determines the amount
+of time to wait for subsequent requests on a persistent HTTP connection. By default, the
+global, server-wide `KeepAlive` setting is in effect.<br />
+This parameter is only relevant if either the global, server-wide `keepalive` parameter or
+the per-vhost `keepalive` parameter is enabled.
 
 Default value: ``undef``
 
-##### <a name="error_log_format"></a>`error_log_format`
-
-Data type: `Optional[
-    Array[
-      Variant[
-        String,
-        Hash[String, Enum['connection', 'request']]
-      ]
-    ]
-  ]`
+##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
 
+Data type: `Any`
 
+Limits the number of requests allowed per connection to the virtual host. By default,
+the global, server-wide `KeepAlive` setting is in effect.<br />
+This parameter is only relevant if either the global, server-wide `keepalive` parameter or
+the per-vhost `keepalive` parameter is enabled.
 
 Default value: ``undef``
 
-##### <a name="http_protocol_options"></a>`http_protocol_options`
-
-Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
+##### <a name="auth_kerb"></a>`auth_kerb`
 
+Data type: `Boolean`
 
+Enable `mod_auth_kerb` parameters for a virtual host.<br />
+Usage typically looks like:
+``` puppet
+apache::vhost { 'sample.example.net':
+  auth_kerb              => `true`,
+  krb_method_negotiate   => 'on',
+  krb_auth_realms        => ['EXAMPLE.ORG'],
+  krb_local_user_mapping => 'on',
+  directories            => {
+    path         => '/var/www/html',
+    auth_name    => 'Kerberos Login',
+    auth_type    => 'Kerberos',
+    auth_require => 'valid-user',
+  },
+}
+```
 
-Default value: ``undef``
+Default value: ``false``
 
-##### <a name="modsec_audit_log"></a>`modsec_audit_log`
+##### <a name="krb_method_negotiate"></a>`krb_method_negotiate`
 
 Data type: `Any`
 
+Determines whether to use the Negotiate method.
 
+Default value: `'on'`
 
-Default value: ``undef``
-
-##### <a name="modsec_audit_log_file"></a>`modsec_audit_log_file`
+##### <a name="krb_method_k5passwd"></a>`krb_method_k5passwd`
 
 Data type: `Any`
 
+Determines whether to use password-based authentication for Kerberos v5.
 
+Default value: `'on'`
 
-Default value: ``undef``
-
-##### <a name="modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
+##### <a name="krb_authoritative"></a>`krb_authoritative`
 
 Data type: `Any`
 
+If set to `off`, authentication controls can be passed on to another module.
 
+Default value: `'on'`
 
-Default value: ``undef``
-
-##### <a name="error_documents"></a>`error_documents`
+##### <a name="krb_auth_realms"></a>`krb_auth_realms`
 
 Data type: `Any`
 
-
+Specifies an array of Kerberos realms to use for authentication.
 
 Default value: `[]`
 
-##### <a name="fallbackresource"></a>`fallbackresource`
-
-Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
+##### <a name="krb_5keytab"></a>`krb_5keytab`
 
+Data type: `Any`
 
+Specifies the Kerberos v5 keytab file's location.
 
 Default value: ``undef``
 
-##### <a name="scriptalias"></a>`scriptalias`
+##### <a name="krb_local_user_mapping"></a>`krb_local_user_mapping`
 
 Data type: `Any`
 
-
+Strips @REALM from usernames for further use.
 
 Default value: ``undef``
 
-##### <a name="scriptaliases"></a>`scriptaliases`
+##### <a name="krb_verify_kdc"></a>`krb_verify_kdc`
 
 Data type: `Any`
 
+This option can be used to disable the verification tickets against local keytab to prevent
+KDC spoofing attacks.
 
+Default value: `'on'`
 
-Default value: `[]`
-
-##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
+##### <a name="krb_servicename"></a>`krb_servicename`
 
-Data type: `Optional[Integer]`
+Data type: `Any`
 
+Specifies the service name that will be used by Apache for authentication. Corresponding
+key of this name must be stored in the keytab.
 
+Default value: `'HTTP'`
 
-Default value: ``undef``
+##### <a name="krb_save_credentials"></a>`krb_save_credentials`
 
-##### <a name="limitreqfields"></a>`limitreqfields`
+Data type: `Any`
 
-Data type: `Optional[Integer]`
+This option enables credential saving functionality.
 
+Default value: `'off'`
 
+##### <a name="logroot"></a>`logroot`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### <a name="limitreqline"></a>`limitreqline`
+Specifies the location of the virtual host's logfiles.
 
-Data type: `Optional[Integer]`
+Default value: `$apache::logroot`
 
+##### <a name="logroot_ensure"></a>`logroot_ensure`
 
+Data type: `Enum['directory', 'absent']`
 
-Default value: ``undef``
+Determines whether or not to remove the logroot directory for a virtual host.
 
-##### <a name="limitreqbody"></a>`limitreqbody`
+Default value: `'directory'`
 
-Data type: `Optional[Integer]`
+##### <a name="logroot_mode"></a>`logroot_mode`
 
+Data type: `Any`
 
+Overrides the mode the logroot directory is set to. Do *not* grant write access to the
+directory the logs are stored in without being aware of the consequences; for more
+information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
 
 Default value: ``undef``
 
-##### <a name="proxy_dest"></a>`proxy_dest`
+##### <a name="logroot_owner"></a>`logroot_owner`
 
 Data type: `Any`
 
-
+Sets individual user access to the logroot directory.
 
 Default value: ``undef``
 
-##### <a name="proxy_dest_match"></a>`proxy_dest_match`
+##### <a name="logroot_group"></a>`logroot_group`
 
 Data type: `Any`
 
-
+Sets group access to the `logroot` directory.
 
 Default value: ``undef``
 
-##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
-
-Data type: `Any`
+##### <a name="log_level"></a>`log_level`
 
+Data type: `Optional[Apache::LogLevel]`
 
+Specifies the verbosity of the error log.
 
 Default value: ``undef``
 
-##### <a name="proxy_pass"></a>`proxy_pass`
+##### <a name="modsec_body_limit"></a>`modsec_body_limit`
 
 Data type: `Any`
 
-
+Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
 
 Default value: ``undef``
 
-##### <a name="proxy_pass_match"></a>`proxy_pass_match`
+##### <a name="modsec_disable_vhost"></a>`modsec_disable_vhost`
 
 Data type: `Any`
 
-
+Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
 
 Default value: ``undef``
 
-##### <a name="proxy_requests"></a>`proxy_requests`
+##### <a name="modsec_disable_ids"></a>`modsec_disable_ids`
 
-Data type: `Boolean`
+Data type: `Optional[Variant[Hash, Array]]`
 
+Removes `mod_security` IDs from the virtual host.<br />
+Also takes a hash allowing removal of an ID from a specific location.
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_ids => [ 90015, 90016 ],
+}
+```
 
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
+}
+```
 
-Default value: ``false``
+Default value: ``undef``
 
-##### <a name="suphp_addhandler"></a>`suphp_addhandler`
+##### <a name="modsec_disable_ips"></a>`modsec_disable_ips`
 
 Data type: `Any`
 
+Specifies an array of IP addresses to exclude from `mod_security` rule matching.
 
+Default value: ``undef``
 
-Default value: `$apache::params::suphp_addhandler`
-
-##### <a name="suphp_engine"></a>`suphp_engine`
-
-Data type: `Enum['on', 'off']`
-
-
-
-Default value: `$apache::params::suphp_engine`
-
-##### <a name="suphp_configpath"></a>`suphp_configpath`
-
-Data type: `Any`
-
+##### <a name="modsec_disable_msgs"></a>`modsec_disable_msgs`
 
+Data type: `Optional[Variant[Hash, Array]]`
 
-Default value: `$apache::params::suphp_configpath`
+Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing
+removal of an Msg from a specific location.
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_msgs => ['Blind SQL Injection Attack', 'Session Fixation Attack'],
+}
+```
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_msgs => { '/location1' => ['Blind SQL Injection Attack', 'Session Fixation Attack'] },
+}
+```
 
-##### <a name="php_flags"></a>`php_flags`
+Default value: ``undef``
 
-Data type: `Any`
+##### <a name="modsec_disable_tags"></a>`modsec_disable_tags`
 
+Data type: `Optional[Variant[Hash, Array]]`
 
+Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing
+removal of an Tag from a specific location.
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_tags => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'],
+}
+```
+``` puppet
+apache::vhost { 'sample.example.net':
+  modsec_disable_tags => { '/location1' => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'] },
+}
+```
 
-Default value: `{}`
+Default value: ``undef``
 
-##### <a name="php_values"></a>`php_values`
+##### <a name="modsec_audit_log_file"></a>`modsec_audit_log_file`
 
 Data type: `Any`
 
+If set, it is relative to `logroot`.<br />
+One of the parameters that determines how to send `mod_security` audit
+log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
+If none of those parameters are set, the global audit log is used
+(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
+Default value: ``undef``
 
-Default value: `{}`
-
-##### <a name="php_admin_flags"></a>`php_admin_flags`
+##### <a name="modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
 
 Data type: `Any`
 
+If `modsec_audit_log_pipe` is set, it should start with a pipe. Example
+`|/path/to/mlogc /path/to/mlogc.conf`.<br />
+One of the parameters that determines how to send `mod_security` audit
+log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
+If none of those parameters are set, the global audit log is used
+(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
+Default value: ``undef``
 
-Default value: `{}`
-
-##### <a name="php_admin_values"></a>`php_admin_values`
+##### <a name="modsec_audit_log"></a>`modsec_audit_log`
 
 Data type: `Any`
 
+If `modsec_audit_log` is `true`, given a virtual host ---for instance, example.com--- it
+defaults to `example.com\_security\_ssl.log` for SSL-encrypted virtual hosts
+and `example.com\_security.log` for unencrypted virtual hosts.<br />
+One of the parameters that determines how to send `mod_security` audit
+log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).<br />
+If none of those parameters are set, the global audit log is used
+(`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-
-Default value: `{}`
+Default value: ``undef``
 
 ##### <a name="no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Any`
 
-
+Specifies URLs you do not want to proxy. This parameter is meant to be used in combination
+with [`proxy_dest`](#proxy_dest).
 
 Default value: `[]`
 
@@ -8564,7 +8842,7 @@ Default value: `[]`
 
 Data type: `Any`
 
-
+This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
 Default value: `[]`
 
@@ -8572,7 +8850,9 @@ Default value: `[]`
 
 Data type: `Any`
 
-
+Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost).<br />
+Setting this parameter to `true` enables the `Host:` line from an incoming request to be
+proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
 Default value: ``false``
 
@@ -8580,7 +8860,9 @@ Default value: ``false``
 
 Data type: `Any`
 
-
+Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders).<br />
+This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For,
+X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
 Default value: ``undef``
 
@@ -8588,1105 +8870,1892 @@ Default value: ``undef``
 
 Data type: `Any`
 
-
+Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride).
+This directive controls whether Apache should override error pages for proxied content.
 
 Default value: ``false``
 
-##### <a name="redirect_source"></a>`redirect_source`
+##### <a name="options"></a>`options`
 
 Data type: `Any`
 
+Sets the `Options` for the specified virtual host. For example:
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  options => ['Indexes','FollowSymLinks','MultiViews'],
+}
+```
+> **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options',
+'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
+Default value: `['Indexes','FollowSymLinks','MultiViews']`
 
-Default value: `'/'`
-
-##### <a name="redirect_dest"></a>`redirect_dest`
+##### <a name="override"></a>`override`
 
 Data type: `Any`
 
+Sets the overrides for the specified virtual host. Accepts an array of
+[AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
 
+Default value: `['None']`
 
-Default value: ``undef``
-
-##### <a name="redirect_status"></a>`redirect_status`
-
-Data type: `Any`
+##### <a name="passenger_enabled"></a>`passenger_enabled`
 
+Data type: `Optional[Boolean]`
 
+Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled)
+directive to `on` or `off`. Requires `apache::mod::passenger` to be included.
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path              => '/path/to/directory',
+      passenger_enabled => 'on',
+    },
+  ],
+}
+```
+> **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)
+using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
 Default value: ``undef``
 
-##### <a name="redirectmatch_status"></a>`redirectmatch_status`
-
-Data type: `Any`
+##### <a name="passenger_base_uri"></a>`passenger_base_uri`
 
+Data type: `Optional[String]`
 
+Sets [PassengerBaseURI](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbase_rui),
+ to specify that the given URI is a distinct application served by Passenger.
 
 Default value: ``undef``
 
-##### <a name="redirectmatch_regexp"></a>`redirectmatch_regexp`
-
-Data type: `Any`
+##### <a name="passenger_ruby"></a>`passenger_ruby`
 
+Data type: `Optional[Stdlib::Absolutepath]`
 
+Sets [PassengerRuby](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerruby),
+specifying the Ruby interpreter to use when serving the relevant web applications.
 
 Default value: ``undef``
 
-##### <a name="redirectmatch_dest"></a>`redirectmatch_dest`
-
-Data type: `Any`
+##### <a name="passenger_python"></a>`passenger_python`
 
+Data type: `Optional[Stdlib::Absolutepath]`
 
+Sets [PassengerPython](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpython),
+specifying the Python interpreter to use when serving the relevant web applications.
 
 Default value: ``undef``
 
-##### <a name="headers"></a>`headers`
-
-Data type: `Any`
+##### <a name="passenger_nodejs"></a>`passenger_nodejs`
 
+Data type: `Optional[Stdlib::Absolutepath]`
 
+Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengernodejs),
+specifying Node.js command to use when serving the relevant web applications.
 
 Default value: ``undef``
 
-##### <a name="request_headers"></a>`request_headers`
-
-Data type: `Any`
+##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
+Data type: `Optional[String]`
 
+Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermeteorappsettings),
+specifying a JSON file with settings for the application when using a Meteor
+application in non-bundled mode.
 
 Default value: ``undef``
 
-##### <a name="filters"></a>`filters`
-
-Data type: `Any`
+##### <a name="passenger_app_env"></a>`passenger_app_env`
 
+Data type: `Optional[String]`
 
+Sets [PassengerAppEnv](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappenv),
+the environment for the Passenger application. If not specified, defaults to the global
+setting or 'production'.
 
 Default value: ``undef``
 
-##### <a name="rewrites"></a>`rewrites`
-
-Data type: `Optional[Array]`
+##### <a name="passenger_app_root"></a>`passenger_app_root`
 
+Data type: `Optional[Stdlib::Absolutepath]`
 
+Sets [PassengerRoot](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapproot),
+the location of the Passenger application root if different from the DocumentRoot.
 
 Default value: ``undef``
 
-##### <a name="rewrite_base"></a>`rewrite_base`
-
-Data type: `Any`
+##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
 
+Data type: `Optional[String]`
 
+Sets [PassengerAppGroupName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappgroupname),
+ the name of the application group that the current application should belong to.
 
 Default value: ``undef``
 
-##### <a name="rewrite_rule"></a>`rewrite_rule`
-
-Data type: `Any`
+##### <a name="passenger_app_start_command"></a>`passenger_app_start_command`
 
+Data type: `Optional[String]`
 
+Sets [PassengerAppStartCommand](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappstartcommand),
+ how Passenger should start your app on a specific port.
 
 Default value: ``undef``
 
-##### <a name="rewrite_cond"></a>`rewrite_cond`
-
-Data type: `Any`
+##### <a name="passenger_app_type"></a>`passenger_app_type`
 
+Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
+Sets [PassengerAppType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapptype),
+ to force Passenger to recognize the application as a specific type.
 
 Default value: ``undef``
 
-##### <a name="rewrite_inherit"></a>`rewrite_inherit`
-
-Data type: `Any`
-
-
-
-Default value: ``false``
-
-##### <a name="setenv"></a>`setenv`
-
-Data type: `Any`
-
-
-
-Default value: `[]`
-
-##### <a name="setenvif"></a>`setenvif`
-
-Data type: `Any`
-
-
-
-Default value: `[]`
-
-##### <a name="setenvifnocase"></a>`setenvifnocase`
+##### <a name="passenger_startup_file"></a>`passenger_startup_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
+Sets the [PassengerStartupFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstartupfile),
+path. This path is relative to the application root.
 
+Default value: ``undef``
 
-Default value: `[]`
+##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
 
-##### <a name="block"></a>`block`
+Data type: `Optional[String]`
 
-Data type: `Any`
+Sets the [PassengerRestartDir](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrestartdir),
+ to customize the directory in which `restart.txt` is searched for.
 
+Default value: ``undef``
 
+##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
 
-Default value: `[]`
+Data type: `Optional[Enum['direct', 'smart']]`
 
-##### <a name="ensure"></a>`ensure`
+Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerspawnmethod),
+whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Data type: `Enum['absent', 'present']`
+Default value: ``undef``
 
+##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
+Data type: `Optional[Boolean]`
 
-Default value: `'present'`
+Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
+to enable or disable the loading of shell environment variables before spawning the application.
 
-##### <a name="wsgi_application_group"></a>`wsgi_application_group`
+Default value: ``undef``
 
-Data type: `Any`
+##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
+Data type: `Optional[Boolean]`
 
+Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
+to enable or disable support for zero-downtime application restarts through `restart.txt`.
 
 Default value: ``undef``
 
-##### <a name="wsgi_daemon_process"></a>`wsgi_daemon_process`
-
-Data type: `Optional[Variant[String,Hash]]`
+##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
+Data type: `Optional[Boolean]`
 
+Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerresistdeploymenterrors),
+to enable or disable resistance against deployment errors.
 
 Default value: ``undef``
 
-##### <a name="wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
-
-Data type: `Optional[Hash]`
+##### <a name="passenger_user"></a>`passenger_user`
 
+Data type: `Optional[String]`
 
+Sets [PassengerUser](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeruser),
+the running user for sandboxing applications.
 
 Default value: ``undef``
 
-##### <a name="wsgi_import_script"></a>`wsgi_import_script`
-
-Data type: `Any`
+##### <a name="passenger_group"></a>`passenger_group`
 
+Data type: `Optional[String]`
 
+Sets [PassengerGroup](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengergroup),
+the running group for sandboxing applications.
 
 Default value: ``undef``
 
-##### <a name="wsgi_import_script_options"></a>`wsgi_import_script_options`
-
-Data type: `Optional[Hash]`
+##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
+Data type: `Optional[Boolean]`
 
+Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerfriendlyerrorpages),
+which can display friendly error pages whenever an application fails to start. This
+friendly error page presents the startup error message, some suggestions for solving
+the problem, a backtrace and a dump of the environment variables.
 
 Default value: ``undef``
 
-##### <a name="wsgi_process_group"></a>`wsgi_process_group`
-
-Data type: `Any`
+##### <a name="passenger_min_instances"></a>`passenger_min_instances`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerMinInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermininstances),
+the minimum number of application processes to run.
 
 Default value: ``undef``
 
-##### <a name="wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
-
-Data type: `Optional[Hash]`
+##### <a name="passenger_max_instances"></a>`passenger_max_instances`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerMaxInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxinstances),
+the maximum number of application processes to run.
 
 Default value: ``undef``
 
-##### <a name="wsgi_script_aliases"></a>`wsgi_script_aliases`
-
-Data type: `Optional[Hash]`
+##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxpreloaderidletime),
+the maximum amount of time the preloader waits before shutting down an idle process.
 
 Default value: ``undef``
 
-##### <a name="wsgi_pass_authorization"></a>`wsgi_pass_authorization`
-
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerforcemaxconcurrentrequestsperprocess),
+the maximum amount of concurrent requests the application can handle per process.
 
 Default value: ``undef``
 
-##### <a name="wsgi_chunked_request"></a>`wsgi_chunked_request`
-
-Data type: `Any`
+##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerStartTimeout](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstarttimeout),
+the timeout for the application startup.
 
 Default value: ``undef``
 
-##### <a name="custom_fragment"></a>`custom_fragment`
-
-Data type: `Optional[String]`
+##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
 
+Data type: `Optional[Enum['process', 'thread']]`
 
+Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerconcurrencyodel),
+to specify the I/O concurrency model that should be used for Ruby application processes.
+Passenger supports two concurrency models:<br />
+* `process` - single-threaded, multi-processed I/O concurrency.
+* `thread` - multi-threaded, multi-processed I/O concurrency.
 
 Default value: ``undef``
 
-##### <a name="itk"></a>`itk`
-
-Data type: `Optional[Hash]`
+##### <a name="passenger_thread_count"></a>`passenger_thread_count`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerthreadcount),
+the number of threads that Passenger should spawn per Ruby application process.<br />
+This option only has effect if PassengerConcurrencyModel is `thread`.
 
 Default value: ``undef``
 
-##### <a name="action"></a>`action`
-
-Data type: `Any`
+##### <a name="passenger_max_requests"></a>`passenger_max_requests`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerMaxRequests](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequests),
+the maximum number of requests an application process will process.
 
 Default value: ``undef``
 
-##### <a name="fastcgi_server"></a>`fastcgi_server`
-
-Data type: `Any`
+##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequesttime),
+the maximum amount of time, in seconds, that an application process may take to
+process a request.
 
 Default value: ``undef``
 
-##### <a name="fastcgi_socket"></a>`fastcgi_socket`
-
-Data type: `Any`
+##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermemorylimit),
+the maximum amount of memory that an application process may use, in megabytes.
 
 Default value: ``undef``
 
-##### <a name="fastcgi_dir"></a>`fastcgi_dir`
-
-Data type: `Any`
+##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstatthrottlerate),
+to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
 
 Default value: ``undef``
 
-##### <a name="fastcgi_idle_timeout"></a>`fastcgi_idle_timeout`
-
-Data type: `Any`
+##### <a name="passenger_pre_start"></a>`passenger_pre_start`
 
+Data type: `Optional[Variant[String,Array[String]]]`
 
+Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
+the URL of the application if pre-starting is required.
 
 Default value: ``undef``
 
-##### <a name="additional_includes"></a>`additional_includes`
+##### <a name="passenger_high_performance"></a>`passenger_high_performance`
 
-Data type: `Any`
+Data type: `Optional[Boolean]`
 
+Sets [PassengerHighPerformance](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerhighperformance),
+to enhance performance in return for reduced compatibility.
 
+Default value: ``undef``
 
-Default value: `[]`
+##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
 
-##### <a name="use_optional_includes"></a>`use_optional_includes`
+Data type: `Optional[Boolean]`
 
-Data type: `Any`
+Sets [PassengerBufferUpload](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferupload),
+to buffer HTTP client request bodies before they are sent to the application.
 
+Default value: ``undef``
 
+##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
 
-Default value: `$apache::use_optional_includes`
+Data type: `Optional[Boolean]`
 
-##### <a name="apache_version"></a>`apache_version`
+Sets [PassengerBufferResponse](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferresponse),
+to buffer Happlication-generated responses.
 
-Data type: `Any`
+Default value: ``undef``
 
+##### <a name="passenger_error_override"></a>`passenger_error_override`
 
+Data type: `Optional[Boolean]`
 
-Default value: `$apache::apache_version`
+Sets [PassengerErrorOverride](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengererroroverride),
+to specify whether Apache will intercept and handle response with HTTP status codes of
+400 and higher.
 
-##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
+Default value: ``undef``
 
-Data type: `Optional[Enum['on', 'off', 'nodecode']]`
+##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuesize),
+to specify the maximum amount of requests that are allowed to queue whenever the maximum
+concurrent request limit is reached. If the queue is already at this specified limit, then
+Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
+A value of 0 means that the queue size is unbounded.
 
 Default value: ``undef``
 
-##### <a name="suexec_user_group"></a>`suexec_user_group`
-
-Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
+##### <a name="passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
 
+Data type: `Optional[Integer]`
 
+Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuetime),
+to specify the maximum amount of time that requests are allowed to stay in the queue
+whenever the maximum concurrent request limit is reached. If a request reaches this specified
+limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
+A value of 0 means that the queue time is unbounded.
 
 Default value: ``undef``
 
-##### <a name="h2_copy_files"></a>`h2_copy_files`
+##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
 Data type: `Optional[Boolean]`
 
-
+Sets [PassengerStickySessions](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessions),
+to specify that, whenever possible, all requests sent by a client will be routed to the same
+originating application process.
 
 Default value: ``undef``
 
-##### <a name="h2_direct"></a>`h2_direct`
-
-Data type: `Optional[Boolean]`
+##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
+Data type: `Optional[String]`
 
+Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookiename),
+to specify the name of the sticky sessions cookie.
 
 Default value: ``undef``
 
-##### <a name="h2_early_hints"></a>`h2_early_hints`
-
-Data type: `Optional[Boolean]`
+##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
+Data type: `Optional[String]`
 
+Sets [PassengerStickySessionsCookieAttributes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookieattributes),
+the attributes of the sticky sessions cookie.
 
 Default value: ``undef``
 
-##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
-
-Data type: `Optional[Integer]`
+##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
+Data type: `Optional[Boolean]`
 
+Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerallowencodedslashes),
+to allow URLs with encoded slashes. Please note that this feature will not work properly
+unless Apache's `AllowEncodedSlashes` is also enabled.
 
 Default value: ``undef``
 
-##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
-
-Data type: `Optional[Boolean]`
+##### <a name="passenger_app_log_file"></a>`passenger_app_log_file`
 
+Data type: `Optional[String]`
 
+Sets [PassengerAppLogFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapplogfile),
+app specific messages logged to a different file in addition to Passenger log file.
 
 Default value: ``undef``
 
-##### <a name="h2_push"></a>`h2_push`
+##### <a name="passenger_debugger"></a>`passenger_debugger`
 
 Data type: `Optional[Boolean]`
 
-
+Sets [PassengerDebugger](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerdebugger),
+to turn support for Ruby application debugging on or off.
 
 Default value: ``undef``
 
-##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
+##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
-
+Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerlveminuid),
+to only allow the spawning of application processes with UIDs equal to, or higher than, this
+specified value on LVE-enabled kernels.
 
 Default value: ``undef``
 
-##### <a name="h2_push_priority"></a>`h2_push_priority`
+##### <a name="php_values"></a>`php_values`
 
-Data type: `Array[String]`
+Data type: `Any`
 
+Allows per-virtual host setting [`php_value`s](http://php.net/manual/en/configuration.changes.php).
+These flags or values can be overwritten by a user or an application.
+Within a vhost declaration:
+``` puppet
+  php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
+```
 
+Default value: `{}`
 
-Default value: `[]`
+##### <a name="php_flags"></a>`php_flags`
 
-##### <a name="h2_push_resource"></a>`h2_push_resource`
+Data type: `Any`
 
-Data type: `Array[String]`
+Allows per-virtual host setting [`php_flags\``](http://php.net/manual/en/configuration.changes.php).
+These flags or values can be overwritten by a user or an application.
 
+Default value: `{}`
 
+##### <a name="php_admin_values"></a>`php_admin_values`
 
-Default value: `[]`
+Data type: `Any`
 
-##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
+Allows per-virtual host setting [`php_admin_value`](http://php.net/manual/en/configuration.changes.php).
+These flags or values cannot be overwritten by a user or an application.
 
-Data type: `Optional[Boolean]`
+Default value: `{}`
 
+##### <a name="php_admin_flags"></a>`php_admin_flags`
 
+Data type: `Any`
 
-Default value: ``undef``
+Allows per-virtual host setting [`php_admin_flag`](http://php.net/manual/en/configuration.changes.php).
+These flags or values cannot be overwritten by a user or an application.
 
-##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
+Default value: `{}`
 
-Data type: `Optional[Integer]`
+##### <a name="port"></a>`port`
 
+Data type: `Any`
 
+Sets the port the host is configured on. The module's defaults ensure the host listens
+on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only
+listens on the port set in this parameter.
 
 Default value: ``undef``
 
-##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
-
-Data type: `Optional[Integer]`
+##### <a name="priority"></a>`priority`
 
+Data type: `Any`
 
+Sets the relative load-order for Apache HTTPD VirtualHost configuration files.<br />
+If nothing matches the priority, the first name-based virtual host is used. Likewise,
+passing a higher priority causes the alphabetically first name-based virtual host to be
+used if no other names match.<br />
+> **Note:** You should not need to use this parameter. However, if you do use it, be
+aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
+To omit the priority prefix in file names, pass a priority of `false`.
 
 Default value: ``undef``
 
-##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
-
-Data type: `Optional[Integer]`
+##### <a name="protocols"></a>`protocols`
 
+Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
+Sets the [Protocols](https://httpd.apache.org/docs/current/en/mod/core.html#protocols)
+directive, which lists available protocols for the virutal host.
 
-Default value: ``undef``
+Default value: `[]`
 
-##### <a name="h2_upgrade"></a>`h2_upgrade`
+##### <a name="protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
-
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
+directive which determines wether the order of Protocols sets precedence during negotiation.
 
 Default value: ``undef``
 
-##### <a name="h2_window_size"></a>`h2_window_size`
-
-Data type: `Optional[Integer]`
+##### <a name="proxy_dest"></a>`proxy_dest`
 
+Data type: `Any`
 
+Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
 
 Default value: ``undef``
 
-##### <a name="passenger_enabled"></a>`passenger_enabled`
-
-Data type: `Optional[Boolean]`
+##### <a name="proxy_pass"></a>`proxy_pass`
 
+Data type: `Any`
 
+Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)
+configuration. Optionally, parameters can be added as an array.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  proxy_pass => [
+    { 'path' => '/a', 'url' => 'http://backend-a/' },
+    { 'path' => '/b', 'url' => 'http://backend-b/' },
+    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
+    { 'path' => '/l', 'url' => 'http://backend-xy',
+      'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
+    { 'path' => '/d', 'url' => 'http://backend-a/d',
+      'params' => { 'retry' => '0', 'timeout' => '5' }, },
+    { 'path' => '/e', 'url' => 'http://backend-a/e',
+      'keywords' => ['nocanon', 'interpolate'] },
+    { 'path' => '/f', 'url' => 'http://backend-f/',
+      'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+    { 'path' => '/g', 'url' => 'http://backend-g/',
+      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
+    { 'path' => '/h', 'url' => 'http://backend-h/h',
+      'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
+  ],
+}
+```
+* `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string.
+* `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
+* `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
+* `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
 
 Default value: ``undef``
 
-##### <a name="passenger_base_uri"></a>`passenger_base_uri`
-
-Data type: `Optional[String]`
+##### <a name="proxy_dest_match"></a>`proxy_dest_match`
 
+Data type: `Any`
 
+This directive is equivalent to `proxy_dest`, but takes regular expressions, see
+[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+for details.
 
 Default value: ``undef``
 
-##### <a name="passenger_ruby"></a>`passenger_ruby`
-
-Data type: `Optional[Stdlib::Absolutepath]`
+##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
+Data type: `Any`
 
+Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
+[ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
+for details.
 
 Default value: ``undef``
 
-##### <a name="passenger_python"></a>`passenger_python`
-
-Data type: `Optional[Stdlib::Absolutepath]`
+##### <a name="proxy_pass_match"></a>`proxy_pass_match`
 
+Data type: `Any`
 
+This directive is equivalent to `proxy_pass`, but takes regular expressions, see
+[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+for details.
 
 Default value: ``undef``
 
-##### <a name="passenger_nodejs"></a>`passenger_nodejs`
-
-Data type: `Optional[Stdlib::Absolutepath]`
+##### <a name="redirect_dest"></a>`redirect_dest`
 
+Data type: `Any`
 
+Specifies the address to redirect to.
 
 Default value: ``undef``
 
-##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
+##### <a name="redirect_source"></a>`redirect_source`
 
-Data type: `Optional[String]`
+Data type: `Any`
+
+Specifies the source URIs that redirect to the destination specified in `redirect_dest`.
+If more than one item for redirect is supplied, the source and destination must be the same
+length, and the items are order-dependent.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  redirect_source => ['/images','/downloads'],
+  redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+}
+```
+
+Default value: `'/'`
+
+##### <a name="redirect_status"></a>`redirect_status`
 
+Data type: `Any`
 
+Specifies the status to append to the redirect.
+``` puppet
+  apache::vhost { 'site.name.fdqn':
+  ...
+  redirect_status => ['temp','permanent'],
+}
+```
 
 Default value: ``undef``
 
-##### <a name="passenger_app_env"></a>`passenger_app_env`
+##### <a name="redirectmatch_regexp"></a>`redirectmatch_regexp`
 
-Data type: `Optional[String]`
+Data type: `Any`
+
+Determines which server status should be raised for a given regular expression
+and where to forward the user to. Entered as an array alongside redirectmatch_status
+and redirectmatch_dest.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+}
+```
+
+Default value: ``undef``
+
+##### <a name="redirectmatch_status"></a>`redirectmatch_status`
 
+Data type: `Any`
 
+Determines which server status should be raised for a given regular expression
+and where to forward the user to. Entered as an array alongside redirectmatch_regexp
+and redirectmatch_dest.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+}
+```
 
 Default value: ``undef``
 
-##### <a name="passenger_app_root"></a>`passenger_app_root`
+##### <a name="redirectmatch_dest"></a>`redirectmatch_dest`
+
+Data type: `Any`
+
+Determines which server status should be raised for a given regular expression
+and where to forward the user to. Entered as an array alongside redirectmatch_status
+and redirectmatch_regexp.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  redirectmatch_status => ['404','404'],
+  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+}
+```
+
+Default value: ``undef``
 
-Data type: `Optional[Stdlib::Absolutepath]`
+##### <a name="request_headers"></a>`request_headers`
 
+Data type: `Any`
 
+Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader)
+in various ways, including adding additional request headers, removing request headers,
+and so on.
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  request_headers => [
+    'append MirrorID "mirror 12"',
+    'unset MirrorID',
+  ],
+}
+```
 
 Default value: ``undef``
 
-##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
-
-Data type: `Optional[String]`
+##### <a name="rewrites"></a>`rewrites`
 
+Data type: `Optional[Array]`
 
+Creates URL rewrite rules. Expects an array of hashes.<br />
+Valid Hash keys include `comment`, `rewrite_base`, `rewrite_cond`, `rewrite_rule`
+or `rewrite_map`.<br />
+For example, you can specify that anyone trying to access index.html is served welcome.html
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
+}
+```
+The parameter allows rewrite conditions that, when `true`, execute the associated rule.
+For instance, if you wanted to rewrite URLs only if the visitor is using IE
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  rewrites => [
+    {
+      comment      => 'redirect IE',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
+```
+You can also apply multiple conditions. For instance, rewrite index.html to welcome.html
+only when the browser is Lynx or Mozilla (version 1 or 2)
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+  ],
+}
+```
+Multiple rewrites and conditions are also possible
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  rewrites => [
+    {
+      comment      => 'Lynx or Mozilla v1/2',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
+      rewrite_rule => ['^index\.html$ welcome.html'],
+    },
+    {
+      comment      => 'Internet Explorer',
+      rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
+      rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
+    },
+    {
+      rewrite_base => /apps/,
+      rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
+    },
+    { comment      => 'Rewrite to lower case',
+      rewrite_cond => ['%{REQUEST_URI} [A-Z]'],
+      rewrite_map  => ['lc int:tolower'],
+      rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'],
+    },
+  ],
+}
+```
+Refer to the [`mod_rewrite` documentation](https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html)
+for more details on what is possible with rewrite rules and conditions.<br />
+> **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite`
+and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather
+than setting the rewrites in the virtual host's directories.
 
 Default value: ``undef``
 
-##### <a name="passenger_app_start_command"></a>`passenger_app_start_command`
-
-Data type: `Optional[String]`
+##### <a name="rewrite_base"></a>`rewrite_base`
 
+Data type: `Any`
 
+The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase)
+specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
+that substitue a relative path.
 
 Default value: ``undef``
 
-##### <a name="passenger_app_type"></a>`passenger_app_type`
-
-Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
+##### <a name="rewrite_rule"></a>`rewrite_rule`
 
+Data type: `Any`
 
+The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
+allows the user to define the rules that will be used by the rewrite engine.
 
 Default value: ``undef``
 
-##### <a name="passenger_startup_file"></a>`passenger_startup_file`
-
-Data type: `Optional[String]`
+##### <a name="rewrite_cond"></a>`rewrite_cond`
 
+Data type: `Any`
 
+The parameter [`rewrite_cond`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritecond)
+defines a rule condition, that when satisfied will implement that rule within the
+rewrite engine.
 
 Default value: ``undef``
 
-##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
+##### <a name="rewrite_inherit"></a>`rewrite_inherit`
 
-Data type: `Optional[String]`
+Data type: `Any`
 
+Determines whether the virtual host inherits global rewrite rules.<br />
+Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or
+inside the virtual host `.conf` file. By default, virtual hosts do not inherit
+global settings. To activate inheritance, specify the `rewrites` parameter and set
+`rewrite_inherit` parameter to `true`:
+``` puppet
+apache::vhost { 'site.name.fdqn':
+  ...
+  rewrites => [
+    <rules>,
+  ],
+  rewrite_inherit => `true`,
+}
+```
+> **Note**: The `rewrites` parameter is **required** for this to have effect<br />
+Apache activates global `Rewrite` rules inheritance if the virtual host files contains
+the following directives:
+``` ApacheConf
+RewriteEngine On
+RewriteOptions Inherit
+```
+Refer to the official [`mod_rewrite`](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)
+documentation, section "Rewriting in Virtual Hosts".
 
+Default value: ``false``
 
-Default value: ``undef``
+##### <a name="scriptalias"></a>`scriptalias`
 
-##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
+Data type: `Any`
 
-Data type: `Optional[Enum['direct', 'smart']]`
+Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
+'/usr/scripts'.
 
+Default value: ``undef``
 
+##### <a name="scriptaliases"></a>`scriptaliases`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
+> **Note**: This parameter is deprecated in favor of the `aliases` parameter.<br />
+Passes an array of hashes to the virtual host to create either ScriptAlias or
+ScriptAliasMatch statements per the `mod_alias` documentation.
+``` puppet
+scriptaliases => [
+  {
+    alias => '/myscript',
+    path  => '/usr/share/myscript',
+  },
+  {
+    aliasmatch => '^/foo(.*)',
+    path       => '/usr/share/fooscripts$1',
+  },
+  {
+    aliasmatch => '^/bar/(.*)',
+    path       => '/usr/share/bar/wrapper.sh/$1',
+  },
+  {
+    alias => '/neatscript',
+    path  => '/usr/share/neatscript',
+  },
+]
+```
+The ScriptAlias and ScriptAliasMatch directives are created in the order specified.
+As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases
+before more general ones to avoid shadowing.
 
-Data type: `Optional[Boolean]`
+Default value: `[]`
 
+##### <a name="serveradmin"></a>`serveradmin`
 
+Data type: `Any`
 
-Default value: ``undef``
+Specifies the email address Apache displays when it renders one of its error pages.
 
-##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
+Default value: ``undef``
 
-Data type: `Optional[Boolean]`
+##### <a name="serveraliases"></a>`serveraliases`
 
+Data type: `Any`
 
+Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias)
+of the site.
 
-Default value: ``undef``
+Default value: `[]`
 
-##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
+##### <a name="servername"></a>`servername`
 
-Data type: `Optional[Boolean]`
+Data type: `Any`
 
+Sets the servername corresponding to the hostname you connect to the virtual host at.
 
+Default value: `$name`
 
-Default value: ``undef``
+##### <a name="setenv"></a>`setenv`
 
-##### <a name="passenger_user"></a>`passenger_user`
+Data type: `Any`
 
-Data type: `Optional[String]`
+Used by HTTPD to set environment variables for virtual hosts.<br />
+Example:
+``` puppet
+apache::vhost { 'setenv.example.com':
+  setenv => ['SPECIAL_PATH /foo/bin'],
+}
+```
 
+Default value: `[]`
 
+##### <a name="setenvif"></a>`setenvif`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### <a name="passenger_group"></a>`passenger_group`
+Used by HTTPD to conditionally set environment variables for virtual hosts.
 
-Data type: `Optional[String]`
+Default value: `[]`
 
+##### <a name="setenvifnocase"></a>`setenvifnocase`
 
+Data type: `Any`
 
-Default value: ``undef``
+Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
 
-##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
+Default value: `[]`
 
-Data type: `Optional[Boolean]`
+##### <a name="suexec_user_group"></a>`suexec_user_group`
 
+Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 
+Allows the spcification of user and group execution privileges for CGI programs through
+inclusion of the `mod_suexec` module.
 
 Default value: ``undef``
 
-##### <a name="passenger_min_instances"></a>`passenger_min_instances`
-
-Data type: `Optional[Integer]`
+##### <a name="suphp_addhandler"></a>`suphp_addhandler`
 
+Data type: `Any`
 
+Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+working together with suphp_configpath and suphp_engine.<br />
+An example virtual host configuration with suPHP:
+``` puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => { path => '/home/appuser/myphpapp',
+    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
+```
 
-Default value: ``undef``
+Default value: `$apache::params::suphp_addhandler`
 
-##### <a name="passenger_max_instances"></a>`passenger_max_instances`
+##### <a name="suphp_configpath"></a>`suphp_configpath`
 
-Data type: `Optional[Integer]`
+Data type: `Any`
 
+Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+working together with suphp_addhandler and suphp_engine.<br />
+An example virtual host configuration with suPHP:
+``` puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => { path => '/home/appuser/myphpapp',
+    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
+```
 
+Default value: `$apache::params::suphp_configpath`
 
-Default value: ``undef``
+##### <a name="suphp_engine"></a>`suphp_engine`
 
-##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
+Data type: `Enum['on', 'off']`
 
-Data type: `Optional[Integer]`
+Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
+working together with suphp_configpath and suphp_addhandler.<br />
+An example virtual host configuration with suPHP:
+``` puppet
+apache::vhost { 'suphp.example.com':
+  port             => '80',
+  docroot          => '/home/appuser/myphpapp',
+  suphp_addhandler => 'x-httpd-php',
+  suphp_engine     => 'on',
+  suphp_configpath => '/etc/php5/apache2',
+  directories      => { path => '/home/appuser/myphpapp',
+    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
+  }
+}
+```
 
+Default value: `$apache::params::suphp_engine`
 
+##### <a name="vhost_name"></a>`vhost_name`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
+Enables name-based virtual hosting. If no IP is passed to the virtual host, but the
+virtual host is assigned a port, then the virtual host name is `vhost_name:port`.
+If the virtual host has no assigned IP or port, the virtual host name is set to the
+title of the resource.
 
-Data type: `Optional[Integer]`
+Default value: `'*'`
 
+##### <a name="virtual_docroot"></a>`virtual_docroot`
 
+Data type: `Any`
 
-Default value: ``undef``
+Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the
+same name. For example, `http://example.com` would map to `/var/www/example.com`.
+``` puppet
+apache::vhost { 'subdomain.loc':
+  vhost_name      => '*',
+  port            => '80',
+  virtual_docroot => '/var/www/%-2+',
+  docroot         => '/var/www',
+  serveraliases   => ['*.loc',],
+}
+```
 
-##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
+Default value: ``false``
 
-Data type: `Optional[Integer]`
+##### <a name="wsgi_daemon_process"></a>`wsgi_daemon_process`
 
+Data type: `Optional[Variant[String,Hash]]`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process_options, wsgi_process_group,
+wsgi_script_aliases and wsgi_pass_authorization.<br />
+A hash that sets the name of the WSGI daemon, accepting
+[certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html).<br />
+An example virtual host configuration with WSGI:
+``` puppet
+apache::vhost { 'wsgi.example.com':
+  port                        => '80',
+  docroot                     => '/var/www/pythonapp',
+  wsgi_daemon_process         => 'wsgi',
+  wsgi_daemon_process_options =>
+    { processes    => '2',
+      threads      => '15',
+      display-name => '%{GROUP}',
+    },
+  wsgi_process_group          => 'wsgi',
+  wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
+  wsgi_chunked_request        => 'On',
+}
+```
 
 Default value: ``undef``
 
-##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
-
-Data type: `Optional[Enum['process', 'thread']]`
+##### <a name="wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
 
+Data type: `Optional[Hash]`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_process_group,
+wsgi_script_aliases and wsgi_pass_authorization.<br />
+Sets the group ID that the virtual host runs under.
 
 Default value: ``undef``
 
-##### <a name="passenger_thread_count"></a>`passenger_thread_count`
-
-Data type: `Optional[Integer]`
+##### <a name="wsgi_application_group"></a>`wsgi_application_group`
 
+Data type: `Any`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+This parameter defines the [`WSGIApplicationGroup directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIApplicationGroup.html),
+thus allowing you to specify which application group the WSGI application belongs to,
+with all WSGI applications within the same group executing within the context of the
+same Python sub interpreter.
 
 Default value: ``undef``
 
-##### <a name="passenger_max_requests"></a>`passenger_max_requests`
-
-Data type: `Optional[Integer]`
+##### <a name="wsgi_import_script"></a>`wsgi_import_script`
 
+Data type: `Any`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
+which can be used in order to specify a script file to be loaded upon a process starting.
 
 Default value: ``undef``
 
-##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
-
-Data type: `Optional[Integer]`
+##### <a name="wsgi_import_script_options"></a>`wsgi_import_script_options`
 
+Data type: `Optional[Hash]`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
+which can be used in order to specify a script file to be loaded upon a process starting.<br />
+Specifies the process and aplication groups of the script.
 
 Default value: ``undef``
 
-##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
-
-Data type: `Optional[Integer]`
+##### <a name="wsgi_chunked_request"></a>`wsgi_chunked_request`
 
+Data type: `Any`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+This parameter defines the [`WSGIChunkedRequest directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIChunkedRequest.html),
+allowing you to enable support for chunked request content.<br />
+WSGI is technically incapable of supporting chunked request content without all chunked
+request content having first been read in and buffered.
 
 Default value: ``undef``
 
-##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
-
-Data type: `Optional[Integer]`
+##### <a name="wsgi_process_group"></a>`wsgi_process_group`
 
+Data type: `Any`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options,
+wsgi_script_aliases and wsgi_pass_authorization.<br />
+Requires a hash of web paths to filesystem `.wsgi paths/`.
 
 Default value: ``undef``
 
-##### <a name="passenger_pre_start"></a>`passenger_pre_start`
-
-Data type: `Optional[Variant[String,Array[String]]]`
+##### <a name="wsgi_script_aliases"></a>`wsgi_script_aliases`
 
+Data type: `Optional[Hash]`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
+For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
 Default value: ``undef``
 
-##### <a name="passenger_high_performance"></a>`passenger_high_performance`
-
-Data type: `Optional[Boolean]`
+##### <a name="wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
 
+Data type: `Optional[Hash]`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
+and wsgi_pass_authorization.<br />
+Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
+This directive is similar to `wsgi_script_aliases`, but makes use of regular expressions
+in place of simple prefix matching.<br />
+For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
 Default value: ``undef``
 
-##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
-
-Data type: `Optional[Boolean]`
+##### <a name="wsgi_pass_authorization"></a>`wsgi_pass_authorization`
 
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
+Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
+wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
+wsgi_script_aliases.<br />
+Enables support for chunked requests.
 
 Default value: ``undef``
 
-##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
-
-Data type: `Optional[Boolean]`
+##### <a name="directories"></a>`directories`
 
+Data type: `Optional[Variant[Hash, Array[Variant[Array,Hash]]]]`
 
+The `directories` parameter within the `apache::vhost` class passes an array of hashes
+to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory),
+[File](https://httpd.apache.org/docs/current/mod/core.html#files), and
+[Location](https://httpd.apache.org/docs/current/mod/core.html#location) directive blocks.
+These blocks take the form, `< Directory /path/to/directory>...< /Directory>`.<br />
+The `path` key sets the path for the directory, files, and location blocks. Its value
+must be a path for the `directory`, `files`, and `location` providers, or a regex for
+the `directorymatch`, `filesmatch`, or `locationmatch` providers. Each hash passed to
+`directories` **must** contain `path` as one of the keys.<br />
+The `provider` key is optional. If missing, this key defaults to `directory`.
+ Values: `directory`, `files`, `proxy`, `location`, `directorymatch`, `filesmatch`,
+`proxymatch` or `locationmatch`. If you set `provider` to `directorymatch`, it
+uses the keyword `DirectoryMatch` in the Apache config file.<br />
+An example use of `directories`:
+``` puppet
+apache::vhost { 'files.example.net':
+  docroot     => '/var/www/files',
+  directories => [
+    { 'path'     => '/var/www/files',
+      'provider' => 'files',
+      'deny'     => 'from all',
+    },
+  ],
+}
+```
+> **Note:** At least one directory should match the `docroot` parameter. After you
+start declaring directories, `apache::vhost` assumes that all required Directory blocks
+will be declared. If not defined, a single default Directory block is created that matches
+the `docroot` parameter.<br />
+Available handlers, represented as keys, should be placed within the `directory`,
+`files`, or `location` hashes. This looks like
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [ { path => '/path/to/directory', handler => value } ],
+}
+```
+Any handlers you do not set in these hashes are considered `undefined` within Puppet and
+are not added to the virtual host, resulting in the module using their default values.
 
 Default value: ``undef``
 
-##### <a name="passenger_error_override"></a>`passenger_error_override`
-
-Data type: `Optional[Boolean]`
-
+##### <a name="custom_fragment"></a>`custom_fragment`
 
+Pass a string of custom configuration directives to be placed at the end of the directory
+configuration.
+``` puppet
+apache::vhost { 'monitor':
+  ...
+  directories => [
+    {
+      path => '/path/to/directory',
+      custom_fragment => '
+<Location /balancer-manager>
+  SetHandler balancer-manager
+  Order allow,deny
+  Allow from all
+</Location>
+<Location /server-status>
+  SetHandler server-status
+  Order allow,deny
+  Allow from all
+</Location>
+ProxyStatus On',
+    },
+  ]
+}
+```
 
 Default value: ``undef``
 
-##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
+##### <a name="error_documents"></a>`error_documents`
 
-Data type: `Optional[Integer]`
+An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)
+settings for the directory.
+``` puppet
+apache::vhost { 'sample.example.net':
+  directories => [
+    { path            => '/srv/www',
+      error_documents => [
+        { 'error_code' => '503',
+          'document'   => '/service-unavail',
+        },
+      ],
+    },
+  ],
+}
+```
+
+Default value: `[]`
 
+##### <a name="h2_copy_files"></a>`h2_copy_files`
 
+Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.<br />
+Note that you must declare `class {'apache::mod::http2': }` before using this directive.
 
 Default value: ``undef``
 
-##### <a name="passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
-
-Data type: `Optional[Integer]`
+##### <a name="h2_push_resource"></a>`h2_push_resource`
 
+Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.<br />
+Note that you must declare `class {'apache::mod::http2': }` before using this directive.
 
+Default value: `[]`
 
-Default value: ``undef``
+##### <a name="headers"></a>`headers`
 
-##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
+Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => {
+    path    => '/path/to/directory',
+    headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+  },
+}
+```
 
-Data type: `Optional[Boolean]`
+Default value: ``undef``
 
+##### <a name="options"></a>`options`
 
+Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the
+given Directory block.
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path    => '/path/to/directory',
+      options => ['Indexes','FollowSymLinks','MultiViews'],
+    },
+  ],
+}
+```
 
-Default value: ``undef``
+Default value: `['Indexes','FollowSymLinks','MultiViews']`
 
-##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
+##### <a name="shib_compat_valid_user"></a>`shib_compat_valid_user`
 
 Data type: `Optional[String]`
 
-
+Default is Off, matching the behavior prior to this command's existence. Addresses a conflict
+when using Shibboleth in conjunction with other auth/auth modules by restoring `standard`
+Apache behavior when processing the `valid-user` and `user` Require rules. See the
+[`mod_shib`documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions),
+and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess)
+topic for more details. This key is disabled if `apache::mod::shib` is not defined.
 
 Default value: ``undef``
 
-##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
-
-Data type: `Optional[String]`
+##### <a name="ssl_options"></a>`ssl_options`
 
+Data type: `Any`
 
+String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions),
+which configure SSL engine run-time options. This handler takes precedence over SSLOptions
+set in the parent block of the virtual host.
+``` puppet
+apache::vhost { 'secure.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path        => '/path/to/directory',
+      ssl_options => '+ExportCertData',
+    },
+    { path        => '/path/to/different/dir',
+      ssl_options => ['-StdEnvVars', '+ExportCertData'],
+    },
+  ],
+}
+```
 
 Default value: ``undef``
 
-##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
-
-Data type: `Optional[Boolean]`
-
-
+##### <a name="additional_includes"></a>`additional_includes`
 
-Default value: ``undef``
+Specifies paths to additional static, specific Apache configuration files in virtual
+host directories.
+``` puppet
+apache::vhost { 'sample.example.net':
+  docroot     => '/path/to/directory',
+  directories => [
+    { path  => '/path/to/different/dir',
+      additional_includes => ['/custom/path/includes', '/custom/path/another_includes',],
+    },
+  ],
+}
+```
 
-##### <a name="passenger_app_log_file"></a>`passenger_app_log_file`
+Default value: `[]`
 
-Data type: `Optional[String]`
+##### <a name="gssapi"></a>`gssapi`
 
+Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
+```puppet
+ include apache::mod::auth_gssapi
+ apache::vhost { 'sample.example.net':
+   docroot     => '/path/to/directory',
+   directories => [
+     { path   => '/path/to/different/dir',
+       gssapi => {
+         credstore => 'keytab:/foo/bar.keytab',
+         localname => 'Off',
+         sslonly   => 'On',
+       }
+     },
+   ],
+ }
+ ```
 
+##### <a name="ssl"></a>`ssl`
 
-Default value: ``undef``
+Data type: `Boolean`
 
-##### <a name="passenger_debugger"></a>`passenger_debugger`
+Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
 
-Data type: `Optional[Boolean]`
+Default value: ``false``
 
+##### <a name="ssl_ca"></a>`ssl_ca`
 
+Data type: `Any`
 
-Default value: ``undef``
+Specifies the SSL certificate authority to be used to verify client certificates used
+for authentication.
 
-##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
+Default value: `$apache::default_ssl_ca`
 
-Data type: `Optional[Integer]`
+##### <a name="ssl_cert"></a>`ssl_cert`
 
+Data type: `Any`
 
+Specifies the SSL certification.
 
-Default value: ``undef``
+Default value: `$apache::default_ssl_cert`
 
-##### <a name="add_default_charset"></a>`add_default_charset`
+##### <a name="ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Any`
 
-
+Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol).
+Expects an array or space separated string of accepted protocols.
 
 Default value: ``undef``
 
-##### <a name="modsec_disable_vhost"></a>`modsec_disable_vhost`
+##### <a name="ssl_cipher"></a>`ssl_cipher`
 
 Data type: `Any`
 
-
+Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
 
 Default value: ``undef``
 
-##### <a name="modsec_disable_ids"></a>`modsec_disable_ids`
-
-Data type: `Optional[Variant[Hash, Array]]`
+##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
+Data type: `Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef]`
 
+Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder),
+to cause Apache to use the server's preferred order of ciphers rather than the client's
+preferred order.
 
 Default value: ``undef``
 
-##### <a name="modsec_disable_ips"></a>`modsec_disable_ips`
+##### <a name="ssl_certs_dir"></a>`ssl_certs_dir`
 
 Data type: `Any`
 
+Specifies the location of the SSL certification directory to verify client certs.
 
+Default value: `$apache::params::ssl_certs_dir`
 
-Default value: ``undef``
+##### <a name="ssl_chain"></a>`ssl_chain`
 
-##### <a name="modsec_disable_msgs"></a>`modsec_disable_msgs`
+Data type: `Any`
 
-Data type: `Optional[Variant[Hash, Array]]`
+Specifies the SSL chain. This default works out of the box, but it must be updated in
+the base `apache` class with your specific certificate information before being used in
+production.
 
+Default value: `$apache::default_ssl_chain`
 
+##### <a name="ssl_crl"></a>`ssl_crl`
 
-Default value: ``undef``
+Data type: `Any`
 
-##### <a name="modsec_disable_tags"></a>`modsec_disable_tags`
+Specifies the certificate revocation list to use. (This default works out of the box but
+must be updated in the base `apache` class with your specific certificate information
+before being used in production.)
 
-Data type: `Optional[Variant[Hash, Array]]`
+Default value: `$apache::default_ssl_crl`
 
+##### <a name="ssl_crl_path"></a>`ssl_crl_path`
 
+Data type: `Any`
 
-Default value: ``undef``
+Specifies the location of the certificate revocation list to verify certificates for
+client authentication with. (This default works out of the box but must be updated in
+the base `apache` class with your specific certificate information before being used in
+production.)
 
-##### <a name="modsec_body_limit"></a>`modsec_body_limit`
+Default value: `$apache::default_ssl_crl_path`
 
-Data type: `Any`
+##### <a name="ssl_crl_check"></a>`ssl_crl_check`
 
+Data type: `Any`
 
+Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck)
+for ssl client authentication. The default works out of the box but must be specified when
+using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on
+older versions.
 
-Default value: ``undef``
+Default value: `$apache::default_ssl_crl_check`
 
-##### <a name="jk_mounts"></a>`jk_mounts`
+##### <a name="ssl_key"></a>`ssl_key`
 
 Data type: `Any`
 
+Specifies the SSL key.<br />
+Defaults are based on your operating system. Default work out of the box but must be
+updated in the base `apache` class with your specific certificate information before
+being used in production.
 
+Default value: `$apache::default_ssl_key`
 
-Default value: ``undef``
-
-##### <a name="auth_kerb"></a>`auth_kerb`
-
-Data type: `Boolean`
+##### <a name="ssl_verify_client"></a>`ssl_verify_client`
 
+Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
+Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient)
+directive, which sets the certificate verification level for client authentication.
+``` puppet
+apache::vhost { 'sample.example.net':
+  ...
+  ssl_verify_client => 'optional',
+}
+```
 
-Default value: ``false``
+Default value: ``undef``
 
-##### <a name="krb_method_negotiate"></a>`krb_method_negotiate`
+##### <a name="ssl_verify_depth"></a>`ssl_verify_depth`
 
 Data type: `Any`
 
+Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth)
+directive, which specifies the maximum depth of CA certificates in client certificate
+verification. You must set `ssl_verify_client` for it to take effect.
+``` puppet
+apache::vhost { 'sample.example.net':
+  ...
+  ssl_verify_client => 'require',
+  ssl_verify_depth => 1,
+}
+```
 
+Default value: ``undef``
 
-Default value: `'on'`
-
-##### <a name="krb_method_k5passwd"></a>`krb_method_k5passwd`
+##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Any`
 
+Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol)
+directive, which controls which SSL protocol flavors `mod_ssl` should use when establishing
+its server environment for proxy. It connects to servers using only one of the provided
+protocols.
 
+Default value: ``undef``
 
-Default value: `'on'`
+##### <a name="ssl_proxy_verify"></a>`ssl_proxy_verify`
 
-##### <a name="krb_authoritative"></a>`krb_authoritative`
+Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
-Data type: `Any`
+Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify)
+directive, which configures certificate verification of the remote server when a proxy is
+configured to forward requests to a remote SSL server.
 
+Default value: ``undef``
 
+##### <a name="ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
 
-Default value: `'on'`
+Data type: `Optional[Integer[0]]`
 
-##### <a name="krb_auth_realms"></a>`krb_auth_realms`
+Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth)
+directive, which configures how deeply mod_ssl should verify before deciding that the
+remote server does not have a valid certificate.<br />
+A depth of 0 means that only self-signed remote server certificates are accepted,
+the default depth of 1 means the remote server certificate can be self-signed or
+signed by a CA that is directly known to the server.
 
-Data type: `Any`
+Default value: ``undef``
 
+##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
+Data type: `Any`
 
-Default value: `[]`
+Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)
+directive, which controls cipher suites supported for ssl proxy traffic.
 
-##### <a name="krb_5keytab"></a>`krb_5keytab`
+Default value: ``undef``
 
-Data type: `Any`
+##### <a name="ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
 
+Data type: `Any`
 
+Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile)
+directive, which specifies an all-in-one file where you can assemble the Certificates
+of Certification Authorities (CA) whose remote servers you deal with. These are used
+for Remote Server Authentication. This file should be a concatenation of the PEM-encoded
+certificate files in order of preference.
 
 Default value: ``undef``
 
-##### <a name="krb_local_user_mapping"></a>`krb_local_user_mapping`
+##### <a name="ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
 
 Data type: `Any`
 
-
+Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile)
+directive, which specifies an all-in-one file where you keep the certs and keys used
+for this server to authenticate itself to remote servers. This file should be a
+concatenation of the PEM-encoded certificate files in order of preference.
+``` puppet
+apache::vhost { 'sample.example.net':
+  ...
+  ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem',
+}
+```
 
 Default value: ``undef``
 
-##### <a name="krb_verify_kdc"></a>`krb_verify_kdc`
+##### <a name="ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
 
 Data type: `Any`
 
+Sets the [SSLProxyMachineCertificateChainFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatechainfile)
+directive, which specifies an all-in-one file where you keep the certificate chain for
+all of the client certs in use. This directive will be needed if the remote server
+presents a list of CA certificates that are not direct signers of one of the configured
+client certificates. This referenced file is simply the concatenation of the various
+PEM-encoded certificate files. Upon startup, each client certificate configured will be
+examined and a chain of trust will be constructed.
 
+Default value: ``undef``
 
-Default value: `'on'`
-
-##### <a name="krb_servicename"></a>`krb_servicename`
+##### <a name="ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off']]`
 
+Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn)
+directive, which specifies whether the remote server certificate's CN field is compared
+against the hostname of the request URL.
 
+Default value: ``undef``
 
-Default value: `'HTTP'`
+##### <a name="ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
 
-##### <a name="krb_save_credentials"></a>`krb_save_credentials`
+Data type: `Optional[Enum['on', 'off']]`
 
-Data type: `Any`
+Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername)
+directive, which specifies whether the remote server certificate's CN field is compared
+against the hostname of the request URL.
 
+Default value: ``undef``
 
+##### <a name="ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
 
-Default value: `'off'`
+Data type: `Optional[Enum['on', 'off']]`
 
-##### <a name="keepalive"></a>`keepalive`
+Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire)
+directive, which specifies whether the remote server certificate is checked for expiration
+or not.
 
-Data type: `Optional[Enum['on', 'off']]`
+Default value: ``undef``
 
+##### <a name="ssl_options"></a>`ssl_options`
 
+Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)
+directive, which configures various SSL engine run-time options. This is the global
+setting for the given virtual host and can be a string or an array.<br />
+A string:
+``` puppet
+apache::vhost { 'sample.example.net':
+  ...
+  ssl_options => '+ExportCertData',
+}
+```
+An array:
+``` puppet
+apache::vhost { 'sample.example.net':
+  ...
+  ssl_options => ['+StrictRequire', '+ExportCertData'],
+}
+```
 
 Default value: ``undef``
 
-##### <a name="keepalive_timeout"></a>`keepalive_timeout`
+##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Any`
 
-
+Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)
+directive, which provides direct configuration of OpenSSL parameters.
 
 Default value: ``undef``
 
-##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
-
-Data type: `Any`
-
+##### <a name="ssl_proxyengine"></a>`ssl_proxyengine`
 
+Data type: `Boolean`
 
-Default value: ``undef``
+Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
 
-##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
+Default value: ``false``
 
-Data type: `Any`
+##### <a name="ssl_stapling"></a>`ssl_stapling`
 
+Data type: `Optional[Boolean]`
 
+Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling).
+By default, uses what is set globally.<br />
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
 Default value: ``undef``
 
-##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
+##### <a name="ssl_stapling_timeout"></a>`ssl_stapling_timeout`
 
 Data type: `Any`
 
-
+Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
 Default value: ``undef``
 
-##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
+##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Any`
 
-
+Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
+This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
 Default value: ``undef``
 
-##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
-
-Data type: `Any`
+##### <a name="ssl_user_name"></a>`ssl_user_name`
 
+Data type: `Optional[String]`
 
+Sets the [SSLUserName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusername) directive.
 
 Default value: ``undef``
 
-##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
-
-Data type: `Any`
+##### <a name="use_canonical_name"></a>`use_canonical_name`
 
+Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
 
+Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
+which allows you to configure how the server determines it's own name and port.
 
 Default value: ``undef``
 
-##### <a name="cas_login_url"></a>`cas_login_url`
+##### <a name="define"></a>`define`
 
-Data type: `Any`
+Data type: `Hash`
 
+this lets you define configuration variables inside a vhost using [`Define`](https://httpd.apache.org/docs/2.4/mod/core.html#define),
+these can then be used to replace configuration values. All Defines are Undefined at the end of the VirtualHost.
 
+Default value: `{}`
 
-Default value: ``undef``
+##### <a name="auth_oidc"></a>`auth_oidc`
 
-##### <a name="cas_validate_url"></a>`cas_validate_url`
+Data type: `Boolean`
 
-Data type: `Any`
+Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
 
+Default value: ``false``
 
+##### <a name="oidc_settings"></a>`oidc_settings`
 
-Default value: ``undef``
+Data type: `Optional[Apache::OIDCSettings]`
 
-##### <a name="cas_validate_saml"></a>`cas_validate_saml`
+An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf].
 
-Data type: `Any`
+Default value: ``undef``
 
+##### <a name="limitreqfields"></a>`limitreqfields`
 
+Data type: `Optional[Integer]`
 
-Default value: ``undef``
+The `limitreqfields` parameter sets the maximum number of request header fields in
+an HTTP request. This directive gives the server administrator greater control over
+abnormal client request behavior, which may be useful for avoiding some forms of
+denial-of-service attacks. The value should be increased if normal clients see an error
+response from the server that indicates too many fields were sent in the request.
 
-##### <a name="cas_cookie_path"></a>`cas_cookie_path`
+Default value: ``undef``
 
-Data type: `Any`
+##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
 
+Data type: `Optional[Integer]`
 
+The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
+be allowed within a request header.
 
 Default value: ``undef``
 
-##### <a name="shib_compat_valid_user"></a>`shib_compat_valid_user`
-
-Data type: `Optional[String]`
+##### <a name="limitreqline"></a>`limitreqline`
 
+Data type: `Optional[Integer]`
 
+Limit the size of the HTTP request line that will be accepted from the client
+This directive sets the number of bytes that will be allowed on the HTTP
+request-line. The LimitRequestLine directive allows the server administrator
+to set the limit on the allowed size of a client's HTTP request-line. Since
+the request-line consists of the HTTP method, URI, and protocol version, the
+LimitRequestLine directive places a restriction on the length of a request-URI
+allowed for a request on the server. A server needs this value to be large
+enough to hold any of its resource names, including any information that might
+be passed in the query part of a GET request.
 
 Default value: ``undef``
 
-##### <a name="use_canonical_name"></a>`use_canonical_name`
-
-Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
+##### <a name="limitreqbody"></a>`limitreqbody`
 
+Data type: `Optional[Integer]`
 
+Restricts the total size of the HTTP request body sent from the client
+The LimitRequestBody directive allows the user to set a limit on the allowed
+size of an HTTP request message body within the context in which the
+directive is given (server, per-directory, per-file or per-location). If the
+client request exceeds that limit, the server will return an error response
+instead of servicing the request.
 
 Default value: ``undef``
 
-##### <a name="comment"></a>`comment`
+##### <a name="$use_servername_for_filenames"></a>`$use_servername_for_filenames`
 
-Data type: `Optional[Variant[String,Array[String]]]`
+When set to true, default log / config file names will be derived from the sanitized
+value of the $servername parameter.
+When set to false (default), the existing behaviour of using the $name parameter
+will remain.
 
+##### <a name="$use_port_for_filenames"></a>`$use_port_for_filenames`
 
+When set to true and use_servername_for_filenames is also set to true, default log /
+config file names will be derived from the sanitized value of both the $servername and
+$port parameters.
+When set to false (default), the port is not included in the file names and may lead to
+duplicate declarations if two virtual hosts use the same domain.
 
-Default value: ``undef``
+##### <a name="$mdomain"></a>`$mdomain`
 
-##### <a name="define"></a>`define`
+All the names in the list are managed as one Managed Domain (MD). mod_md will request
+one single certificate that is valid for all these names.
 
-Data type: `Hash`
+##### <a name="use_servername_for_filenames"></a>`use_servername_for_filenames`
 
+Data type: `Optional[Boolean]`
 
 
-Default value: `{}`
 
-##### <a name="auth_oidc"></a>`auth_oidc`
+Default value: ``false``
 
-Data type: `Boolean`
+##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
+
+Data type: `Optional[Boolean]`
 
 
 
 Default value: ``false``
 
-##### <a name="oidc_settings"></a>`oidc_settings`
+##### <a name="proxy_requests"></a>`proxy_requests`
 
-Data type: `Optional[Apache::OIDCSettings]`
+Data type: `Boolean`
 
 
 
-Default value: ``undef``
+Default value: ``false``
 
 ##### <a name="mdomain"></a>`mdomain`
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 98950a1f59..bf9f7d8cc0 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1739,7 +1739,6 @@
 # @param $mdomain
 #   All the names in the list are managed as one Managed Domain (MD). mod_md will request
 #   one single certificate that is valid for all these names.
-
 define apache::vhost (
   Variant[Boolean,String] $docroot,
   $manage_docroot                                                                   = true,

From 9f4a3af6de8398d960987292da201d9dba073e5c Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Thu, 22 Jul 2021 14:41:01 +0000
Subject: [PATCH 1822/2267] Release version 6.3.1

---
 CHANGELOG.md  | 11 ++++++++++-
 metadata.json |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08569abb96..3494a80ed8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,16 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v6.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.0) (2021-06-21)
+## [v6.3.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.1) (2021-07-22)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.3.0...v6.3.1)
+
+### Fixed
+
+- \(MODULES-10899\) Load php module with the right libphp file [\#2166](https://github.com/puppetlabs/puppetlabs-apache/pull/2166) ([sheenaajay](https://github.com/sheenaajay))
+- \(maint\) Fix puppet-strings docs on apache::vhost [\#2165](https://github.com/puppetlabs/puppetlabs-apache/pull/2165) ([ekohl](https://github.com/ekohl))
+
+## [v6.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.0) (2021-06-22)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.2.0...v6.3.0)
 
diff --git a/metadata.json b/metadata.json
index 90117d6acc..4facff1fdf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 562a12f3dfd13407c94033b8fd8ccc5a119a2cdf Mon Sep 17 00:00:00 2001
From: timdeluxe <5765175+timdeluxe@users.noreply.github.com>
Date: Thu, 10 Jun 2021 15:01:51 +0200
Subject: [PATCH 1823/2267] (MODULES-10847) Add feature to reload apache
 service when content of ssl files has changed

---
 REFERENCE.md                         | 28 ++++++++++++++++++++++++
 manifests/init.pp                    |  4 ++++
 manifests/mod/ssl.pp                 | 22 +++++++++++++++++++
 manifests/mod/ssl/reload.pp          | 17 +++++++++++++++
 manifests/params.pp                  |  6 ++++++
 manifests/vhost.pp                   | 24 ++++++++++++++++++++-
 spec/acceptance/apache_ssl_spec.rb   | 32 ++++++++++++++++++++++++++++
 spec/classes/mod/ssl_spec.rb         | 12 +++++++++++
 spec/defines/vhost_spec.rb           | 11 +++++++++-
 spec/spec_helper_acceptance_local.rb |  5 +++++
 10 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 manifests/mod/ssl/reload.pp

diff --git a/REFERENCE.md b/REFERENCE.md
index e5de378042..73e2db314f 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -109,6 +109,7 @@
 * `apache::confd::no_accf`: Manages the `no-accf.conf` file.
 * `apache::default_confd_files`: Helper for setting up default conf.d files.
 * `apache::default_mods`: Installs and congfigures default mods for Apache
+* `apache::mod::ssl::reload`: Manages the puppet_ssl folder for ssl file copies, which is needed to track changes for reloading service on changes
 * `apache::package`: Installs an Apache MPM.
 * `apache::params`: This class manages Apache parameters
 * `apache::php`: This class installs PHP for Apache.
@@ -207,6 +208,7 @@ The following parameters are available in the `apache` class:
 * [`default_ssl_crl_path`](#default_ssl_crl_path)
 * [`default_ssl_crl_check`](#default_ssl_crl_check)
 * [`default_ssl_key`](#default_ssl_key)
+* [`default_ssl_reload_on_change`](#default_ssl_reload_on_change)
 * [`default_ssl_vhost`](#default_ssl_vhost)
 * [`default_type`](#default_type)
 * [`default_vhost`](#default_vhost)
@@ -434,6 +436,14 @@ environment.
 
 Default value: `$apache::params::default_ssl_key`
 
+##### <a name="default_ssl_reload_on_change"></a>`default_ssl_reload_on_change`
+
+Data type: `Boolean`
+
+Enable reloading of apache if the content of ssl files have changed.
+
+Default value: ``false``
+
 ##### <a name="default_ssl_vhost"></a>`default_ssl_vhost`
 
 Data type: `Boolean`
@@ -6369,6 +6379,7 @@ The following parameters are available in the `apache::mod::ssl` class:
 * [`ssl_stapling`](#ssl_stapling)
 * [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
 * [`ssl_mutex`](#ssl_mutex)
+* [`ssl_reload_on_change`](#ssl_reload_on_change)
 * [`apache_version`](#apache_version)
 * [`package_name`](#package_name)
 * [`ssl_sessiontickets`](#ssl_sessiontickets)
@@ -6525,6 +6536,14 @@ Default based on the OS and/or Apache version:
 
 Default value: ``undef``
 
+##### <a name="ssl_reload_on_change"></a>`ssl_reload_on_change`
+
+Data type: `Boolean`
+
+Enable reloading of apache if the content of ssl files have changed. It only affects ssl files configured here and not vhost ones.
+
+Default value: ``false``
+
 ##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Any`
@@ -7780,6 +7799,7 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`ssl_stapling_timeout`](#ssl_stapling_timeout)
 * [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
 * [`ssl_user_name`](#ssl_user_name)
+* [`ssl_reload_on_change`](#ssl_reload_on_change)
 * [`use_canonical_name`](#use_canonical_name)
 * [`define`](#define)
 * [`auth_oidc`](#auth_oidc)
@@ -10629,6 +10649,14 @@ Sets the [SSLUserName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ss
 
 Default value: ``undef``
 
+##### <a name="ssl_reload_on_change"></a>`ssl_reload_on_change`
+
+Data type: `Boolean`
+
+Enable reloading of apache if the content of ssl files have changed.
+
+Default value: `$apache::default_ssl_reload_on_change`
+
 ##### <a name="use_canonical_name"></a>`use_canonical_name`
 
 Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
diff --git a/manifests/init.pp b/manifests/init.pp
index f01d101bcc..26ded53a77 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -91,6 +91,9 @@
 #   this parameter with your SSL key's location before deploying this server in a production 
 #   environment.
 #
+# @param default_ssl_reload_on_change
+#   Enable reloading of apache if the content of ssl files have changed.
+#
 # @param default_ssl_vhost
 #   Configures a default SSL virtual host.
 #   If `true`, Puppet automatically configures the following virtual host using the 
@@ -472,6 +475,7 @@
   $default_ssl_crl_path                                                 = undef,
   $default_ssl_crl                                                      = undef,
   $default_ssl_crl_check                                                = undef,
+  Boolean $default_ssl_reload_on_change                                 = false,
   $default_type                                                         = 'none',
   $dev_packages                                                         = $apache::params::dev_packages,
   $ip                                                                   = undef,
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 28ac3d0439..20acb814ed 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -62,6 +62,9 @@
 #   - Debian/Ubuntu + Apache >= 2.4: 'default'.
 #   - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
 #
+# @param ssl_reload_on_change
+#   Enable reloading of apache if the content of ssl files have changed. It only affects ssl files configured here and not vhost ones.
+#
 # @param apache_version
 #   Used to verify that the Apache version you have requested is compatible with the module.
 #
@@ -97,6 +100,7 @@
   Optional[String] $stapling_cache                          = undef,
   Optional[Boolean] $ssl_stapling_return_errors             = undef,
   $ssl_mutex                                                = undef,
+  Boolean $ssl_reload_on_change                             = false,
   $apache_version                                           = undef,
   $package_name                                             = undef,
 ) inherits ::apache::params {
@@ -174,6 +178,24 @@
     include apache::mod::socache_shmcb
   }
 
+  if $ssl_reload_on_change {
+    [$ssl_cert, $ssl_key, $ssl_ca].each |$ssl_file| {
+      if $ssl_file {
+        include apache::mod::ssl::reload
+        $_ssl_file_copy = regsubst($ssl_file, '/', '_', 'G')
+        file { $_ssl_file_copy:
+          path    => "${apache::params::puppet_ssl_dir}/${_ssl_file_copy}",
+          source  => "file://${ssl_file}",
+          owner   => 'root',
+          group   => $apache::params::root_group,
+          mode    => '0640',
+          seltype => 'cert_t',
+          notify  => Class['apache::service'],
+        }
+      }
+    }
+  }
+
   # Template uses
   #
   # $ssl_compression
diff --git a/manifests/mod/ssl/reload.pp b/manifests/mod/ssl/reload.pp
new file mode 100644
index 0000000000..723c6cb8df
--- /dev/null
+++ b/manifests/mod/ssl/reload.pp
@@ -0,0 +1,17 @@
+# @summary
+#   Manages the puppet_ssl folder for ssl file copies, which is needed to track changes for reloading service on changes
+#
+# @api private
+class apache::mod::ssl::reload () inherits ::apache::params {
+  file { $apache::params::puppet_ssl_dir:
+    ensure  => directory,
+    purge   => true,
+    recurse => true,
+    require => Package['httpd'],
+  }
+  file { 'README.txt':
+    path    => "${apache::params::puppet_ssl_dir}/README.txt",
+    content => 'This directory contains puppet managed copies of ssl files, so it can track changes and reload apache on changes.',
+    seltype => 'etc_t',
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index ad1772bba4..10809ff18b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -63,6 +63,7 @@
     $server_root          = "${httpd_root}/etc/httpd"
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
+    $puppet_ssl_dir       = "${httpd_dir}/puppet_ssl"
     $mod_dir              = $facts['operatingsystemmajrelease'] ? {
       '7'     => "${httpd_dir}/conf.modules.d",
       default => "${httpd_dir}/conf.d",
@@ -169,6 +170,7 @@
     $server_root          = '/etc/httpd'
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
+    $puppet_ssl_dir       = "${httpd_dir}/puppet_ssl"
     $conf_enabled         = undef
     if $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease == '2' {
       # Amazon Linux 2 uses the /conf.modules.d/ dir
@@ -343,6 +345,7 @@
     $confd_dir           = "${httpd_dir}/conf.d"
     # Overwrite conf_enabled causes errors with Shibboleth when enabled on Ubuntu 18.04
     $conf_enabled        = undef #"${httpd_dir}/conf-enabled.d"
+    $puppet_ssl_dir      = "${httpd_dir}/puppet_ssl"
     $mod_dir             = "${httpd_dir}/mods-available"
     $mod_enable_dir      = "${httpd_dir}/mods-enabled"
     $vhost_dir           = "${httpd_dir}/sites-available"
@@ -546,6 +549,7 @@
     $conf_dir         = $httpd_dir
     $confd_dir        = "${httpd_dir}/Includes"
     $conf_enabled     = undef
+    $puppet_ssl_dir   = "${httpd_dir}/puppet_ssl"
     $mod_dir          = "${httpd_dir}/Modules"
     $mod_enable_dir   = undef
     $vhost_dir        = "${httpd_dir}/Vhosts"
@@ -619,6 +623,7 @@
     $conf_dir         = $httpd_dir
     $confd_dir        = "${httpd_dir}/conf.d"
     $conf_enabled     = undef
+    $puppet_ssl_dir   = "${httpd_dir}/puppet_ssl"
     $mod_dir          = "${httpd_dir}/modules.d"
     $mod_enable_dir   = undef
     $vhost_dir        = "${httpd_dir}/vhosts.d"
@@ -689,6 +694,7 @@
     $conf_dir            = $httpd_dir
     $confd_dir           = "${httpd_dir}/conf.d"
     $conf_enabled        = undef
+    $puppet_ssl_dir      = "${httpd_dir}/puppet_ssl"
     $mod_dir             = "${httpd_dir}/mods-available"
     $mod_enable_dir      = "${httpd_dir}/mods-enabled"
     $vhost_dir           = "${httpd_dir}/sites-available"
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bf9f7d8cc0..ad11da04dd 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1679,6 +1679,9 @@
 # @param ssl_user_name
 #   Sets the [SSLUserName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusername) directive.
 #
+# @param ssl_reload_on_change
+#   Enable reloading of apache if the content of ssl files have changed.
+#
 # @param use_canonical_name
 #   Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
 #   which allows you to configure how the server determines it's own name and port.
@@ -1762,6 +1765,7 @@
   $ssl_crl                                                                          = $apache::default_ssl_crl,
   $ssl_crl_check                                                                    = $apache::default_ssl_crl_check,
   $ssl_certs_dir                                                                    = $apache::params::ssl_certs_dir,
+  Boolean $ssl_reload_on_change                                                     = $apache::default_ssl_reload_on_change,
   $ssl_protocol                                                                     = undef,
   $ssl_cipher                                                                       = undef,
   Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder     = undef,
@@ -2706,12 +2710,30 @@
   # - $ssl_openssl_conf_cmd
   # - $ssl_stapling
   # - $apache_version
-  if $ssl {
+  if $ssl and $ensure == 'present' {
     concat::fragment { "${name}-ssl":
       target  => "${priority_real}${filename}.conf",
       order   => 230,
       content => template('apache/vhost/_ssl.erb'),
     }
+
+    if $ssl_reload_on_change {
+      [$ssl_cert, $ssl_key, $ssl_ca, $ssl_chain, $ssl_crl].each |$ssl_file| {
+        if $ssl_file {
+          include apache::mod::ssl::reload
+          $_ssl_file_copy = regsubst($ssl_file, '/', '_', 'G')
+          file { "${filename}${_ssl_file_copy}":
+            path    => "${apache::params::puppet_ssl_dir}/${filename}${_ssl_file_copy}",
+            source  => "file://${ssl_file}",
+            owner   => 'root',
+            group   => $apache::params::root_group,
+            mode    => '0640',
+            seltype => 'cert_t',
+            notify  => Class['apache::service'],
+          }
+        }
+      }
+    }
   }
 
   # Template uses:
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index a9508f1743..3d0fa0a000 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -48,6 +48,17 @@ class { 'apache':
 
   describe 'vhost ssl parameters' do
     pp = <<-MANIFEST
+        file { [
+          '/tmp/ssl_cert',
+          '/tmp/ssl_key',
+          '/tmp/ssl_chain',
+          '/tmp/ssl_ca',
+          '/tmp/ssl_crl',
+          ]:
+            ensure             => file,
+            before             => Class['apache']
+        }
+
         class { 'apache':
           service_ensure       => stopped,
         }
@@ -63,6 +74,7 @@ class { 'apache':
           ssl_crl              => '/tmp/ssl_crl',
           ssl_crl_check        => 'chain flag',
           ssl_certs_dir        => '/tmp',
+          ssl_reload_on_change => true,
           ssl_protocol         => 'test',
           ssl_cipher           => 'test',
           ssl_honorcipherorder => true,
@@ -99,6 +111,26 @@ class { 'apache':
         it { is_expected.not_to contain 'SSLCARevocationCheck' }
       end
     end
+
+    describe file("#{apache_hash['httpd_dir']}/puppet_ssl/test_ssl_tmp_ssl_cert") do
+      it { is_expected.to be_file }
+    end
+
+    describe file("#{apache_hash['httpd_dir']}/puppet_ssl/test_ssl_tmp_ssl_key") do
+      it { is_expected.to be_file }
+    end
+
+    describe file("#{apache_hash['httpd_dir']}/puppet_ssl/test_ssl_tmp_ssl_chain") do
+      it { is_expected.to be_file }
+    end
+
+    describe file("#{apache_hash['httpd_dir']}/puppet_ssl/test_ssl_tmp_ssl_ca") do
+      it { is_expected.to be_file }
+    end
+
+    describe file("#{apache_hash['httpd_dir']}/puppet_ssl/test_ssl_tmp_ssl_crl") do
+      it { is_expected.to be_file }
+    end
   end
 
   describe 'vhost ssl ssl_ca only' do
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 326e45f877..52c6276248 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -127,6 +127,18 @@
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLCACertificateFile}) }
     end
 
+    context 'setting ssl_cert with reload' do
+      let :params do
+        {
+          ssl_cert: '/etc/pki/some/path/localhost.crt',
+          ssl_reload_on_change: true,
+        }
+      end
+
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLCertificateFile}) }
+      it { is_expected.to contain_file('_etc_pki_some_path_localhost.crt') }
+    end
+
     context 'with Apache version < 2.4 - ssl_compression with default value' do
       let :params do
         {
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 5331a136ce..28291f80bc 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -71,7 +71,7 @@
               'ssl_key'                     => '/ssl/key',
               'ssl_chain'                   => '/ssl/chain',
               'ssl_crl_path'                => '/ssl/crl',
-              'ssl_crl'                     => 'foo.crl',
+              'ssl_crl'                     => '/ssl/foo.crl',
               'ssl_certs_dir'               => '/ssl/certs',
               'ssl_protocol'                => 'SSLv2',
               'ssl_cipher'                  => 'HIGH',
@@ -88,6 +88,7 @@
               'ssl_proxy_cipher_suite'      => 'HIGH',
               'ssl_proxy_protocol'          => 'TLSv1.2',
               'ssl_user_name'               => 'SSL_CLIENT_S_DN_CN',
+              'ssl_reload_on_change'        => true,
               'priority'                    => '30',
               'default_vhost'               => true,
               'servername'                  => 'example.com',
@@ -516,6 +517,10 @@
               content: %r{^\s+SSLSessionCacheTimeout 300$},
             )
           }
+          it { is_expected.to contain_file('rspec.example.com_ssl_cert') }
+          it { is_expected.to contain_file('rspec.example.com_ssl_key') }
+          it { is_expected.to contain_file('rspec.example.com_ssl_chain') }
+          it { is_expected.to contain_file('rspec.example.com_ssl_foo.crl') }
           it { is_expected.to contain_class('apache::mod::mime') }
           it { is_expected.to contain_class('apache::mod::vhost_alias') }
           it { is_expected.to contain_class('apache::mod::wsgi') }
@@ -1859,6 +1864,10 @@
           it { is_expected.not_to contain_class('apache::mod::proxy') }
           it { is_expected.not_to contain_class('apache::mod::proxy_http') }
           it { is_expected.not_to contain_class('apache::mod::headers') }
+          it { is_expected.not_to contain_file('rspec.example.com_ssl_cert') }
+          it { is_expected.not_to contain_file('rspec.example.com_ssl_key') }
+          it { is_expected.not_to contain_file('rspec.example.com_ssl_chain') }
+          it { is_expected.not_to contain_file('rspec.example.com_ssl_foo.crl') }
           it { is_expected.to contain_file('/var/www/foo') }
           it {
             is_expected.to contain_file('/tmp/logroot').with('ensure' => 'absent')
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 2cb26b135d..6f64652915 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -85,6 +85,7 @@ def apache_settings_hash
   apache = {}
   case osfamily
   when 'redhat', 'oracle'
+    apache['httpd_dir']        = '/etc/httpd'
     apache['confd_dir']        = '/etc/httpd/conf.d'
     apache['conf_file']        = '/etc/httpd/conf/httpd.conf'
     apache['ports_file']       = '/etc/httpd/conf/ports.conf'
@@ -115,6 +116,7 @@ def apache_settings_hash
       apache['mod_ssl_dir'] = apache['mod_dir']
     end
   when 'debian', 'ubuntu'
+    apache['httpd_dir']        = '/etc/apache2'
     apache['confd_dir']        = '/etc/apache2/conf.d'
     apache['mod_dir']          = '/etc/apache2/mods-available'
     apache['conf_file']        = '/etc/apache2/apache2.conf'
@@ -137,6 +139,7 @@ def apache_settings_hash
                         end
     apache['mod_ssl_dir']      = apache['mod_dir']
   when 'freebsd'
+    apache['httpd_dir']        = '/usr/local/etc/apache24'
     apache['confd_dir']        = '/usr/local/etc/apache24/Includes'
     apache['mod_dir']          = '/usr/local/etc/apache24/Modules'
     apache['conf_file']        = '/usr/local/etc/apache24/httpd.conf'
@@ -151,6 +154,7 @@ def apache_settings_hash
     apache['version']          = '2.2'
     apache['mod_ssl_dir']      = apache['mod_dir']
   when 'gentoo'
+    apache['httpd_dir']        = '/etc/apache2'
     apache['confd_dir']        = '/etc/apache2/conf.d'
     apache['mod_dir']          = '/etc/apache2/modules.d'
     apache['conf_file']        = '/etc/apache2/httpd.conf'
@@ -165,6 +169,7 @@ def apache_settings_hash
     apache['version']          = '2.4'
     apache['mod_ssl_dir']      = apache['mod_dir']
   when 'suse', 'sles'
+    apache['httpd_dir']        = '/etc/apache2'
     apache['confd_dir']        = '/etc/apache2/conf.d'
     apache['mod_dir']          = '/etc/apache2/mods-available'
     apache['conf_file']        = '/etc/apache2/httpd.conf'

From ab9c50df9a4993835336294650507bb7060b3eb5 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 22 Jul 2021 13:19:12 -0600
Subject: [PATCH 1824/2267] (MODULES-11075) Improve future version handling for
 RHEL

This change updates the version handling to better future proof the
logic when newer versions are shipped. This should prevent having to add
things like #2063, #2021, #2038, etc.
---
 manifests/params.pp | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index ad1772bba4..6106aa74f3 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -175,9 +175,8 @@
       $mod_dir            = "${httpd_dir}/conf.modules.d"
     } else {
       $mod_dir              = $facts['operatingsystemmajrelease'] ? {
-        '7'     => "${httpd_dir}/conf.modules.d",
-        '8'     => "${httpd_dir}/conf.modules.d",
-        default => "${httpd_dir}/conf.d",
+        '6'     => "${httpd_dir}/conf.d",
+        default => "${httpd_dir}/conf.modules.d",
       }
     }
     $mod_enable_dir       = undef
@@ -214,9 +213,8 @@
       'auth_mellon'           => 'mod_auth_mellon',
       'auth_openidc'          => 'mod_auth_openidc',
       'authnz_ldap'           => $facts['operatingsystemmajrelease'] ? {
-        '7'     => 'mod_ldap',
-        '8'     => 'mod_ldap',
-        default => 'mod_authz_ldap',
+        '6'     => 'mod_authz_ldap',
+        default => 'mod_ldap',
       },
       'authnz_pam'            => 'mod_authnz_pam',
       'fastcgi'               => $facts['operatingsystemmajrelease'] ? {
@@ -255,8 +253,9 @@
       'shibboleth'            => 'shibboleth',
       'ssl'                   => 'mod_ssl',
       'wsgi'                  => $facts['operatingsystemmajrelease'] ? {
-        '8'     => 'python3-mod_wsgi', # RedHat8
-        default => 'mod_wsgi',         # RedHat5, RedHat6, RedHat7
+        '6'     => 'mod_wsgi',         # RedHat6
+        '7'     => 'mod_wsgi',         # RedHat7
+        default => 'python3-mod_wsgi', # RedHat8+
       },
       'dav_svn'               => 'mod_dav_svn',
       'suphp'                 => 'mod_suphp',
@@ -267,8 +266,9 @@
     $mod_libs             = {
       'nss' => 'libmodnss.so',
       'wsgi'                  => $facts['operatingsystemmajrelease'] ? {
-        '8'     => 'mod_wsgi_python3.so',
-        default => 'mod_wsgi.so',
+        '6'     => 'mod_wsgi.so',
+        '7'     => 'mod_wsgi.so',
+        default => 'mod_wsgi_python3.so',
       },
     }
     $conf_template        = 'apache/httpd.conf.erb'
@@ -281,14 +281,12 @@
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
     $alias_icons_path     = $facts['operatingsystemmajrelease'] ? {
-      '7'     => '/usr/share/httpd/icons',
-      '8'     => '/usr/share/httpd/icons',
-      default => '/var/www/icons',
+      '6'     => '/var/www/icons',
+      default => '/usr/share/httpd/icons',
     }
     $error_documents_path = $facts['operatingsystemmajrelease'] ? {
-      '7'     => '/usr/share/httpd/error',
-      '8'     => '/usr/share/httpd/error',
-      default => '/var/www/error'
+      '6'     => '/var/www/error',
+      default => '/usr/share/httpd/error',
     }
     if $::osfamily == 'RedHat' {
       $wsgi_socket_prefix = '/var/run/wsgi'

From 580c0560fbb6dcce894133a6ec04f1ae5e70bd23 Mon Sep 17 00:00:00 2001
From: Auto-release <team-modules@puppet.com>
Date: Mon, 2 Aug 2021 10:58:34 +0000
Subject: [PATCH 1825/2267] Release version 6.4.0

---
 CHANGELOG.md  | 10 ++++++++++
 metadata.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3494a80ed8..b14ddd58fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v6.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.4.0) (2021-08-02)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.3.1...v6.4.0)
+
+### Added
+
+- \(MODULES-11075\) Improve future version handling for RHEL [\#2174](https://github.com/puppetlabs/puppetlabs-apache/pull/2174) ([mwhahaha](https://github.com/mwhahaha))
+- Allow custom userdir directives [\#2164](https://github.com/puppetlabs/puppetlabs-apache/pull/2164) ([hunner](https://github.com/hunner))
+- Add feature to reload apache service when content of ssl files has changed [\#2157](https://github.com/puppetlabs/puppetlabs-apache/pull/2157) ([timdeluxe](https://github.com/timdeluxe))
+
 ## [v6.3.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.1) (2021-07-22)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.3.0...v6.3.1)
diff --git a/metadata.json b/metadata.json
index 4facff1fdf..fea7e21868 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.3.1",
+  "version": "6.4.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 8efb2d95d444047ffffb061f5be4010a8de2f851 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Tue, 3 Aug 2021 13:11:07 +0100
Subject: [PATCH 1826/2267] (maint) - Set max_issues for changelog generator to
 500

---
 .sync.yml | 15 ++++++++-------
 Rakefile  |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index e21a515088..60a34fd258 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -24,13 +24,14 @@ spec/spec_helper.rb:
 .github/workflows/auto_release.yml:
   unmanaged: false
 Rakefile:
+  changelog_max_issues: 500
   extras:
     "FastGettext.default_text_domain = 'default-text-domain'"
-  .github/workflows/spec.yml:
-    checks: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
-    unmanaged: false
-  .github/workflows/release.yml:
-    unmanaged: false
-  .travis.yml:
-    delete: true
+.github/workflows/spec.yml:
+  checks: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
+  unmanaged: false
+.github/workflows/release.yml:
+  unmanaged: false
+.travis.yml:
+  delete: true
 changelog_since_tag: "3.2.0"
diff --git a/Rakefile b/Rakefile
index 55dc3ab1ed..88cc701712 100644
--- a/Rakefile
+++ b/Rakefile
@@ -49,6 +49,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.user = "#{changelog_user}"
     config.project = "#{changelog_project}"
     config.since_tag = "3.2.0"
+    config.max_issues = 500
     config.future_release = "#{changelog_future_release}"
     config.exclude_labels = ['maintenance']
     config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."

From c40595c351ee052fd030c39281f7ed33c72d060f Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 4 Aug 2021 15:42:21 +0100
Subject: [PATCH 1827/2267] (IAC-1709) - Add Support for Debian 11

---
 metadata.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index fea7e21868..413e228e4e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -53,7 +53,8 @@
       "operatingsystemrelease": [
         "8",
         "9",
-        "10"
+        "10",
+        "11"
       ]
     },
     {

From f4e8c1d2f77696ef78c63f2001135b5c4ffec0d2 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Tue, 10 Aug 2021 12:43:01 +0100
Subject: [PATCH 1828/2267] (IAC-1721) - Various fixes - set php version to
 default to `7.4` on Deb11 - set param `wsgi` to `libapache2-mod-wsgi-py3` for
 Deb11, Python 2 is not supported - set param `shib2` to `libapache2-mod-shib`
 for Deb11, `libapache2-mod-shib2` seems to have been discontinued going
 forward. - ensure `ipv6` is enabled on Deb11 boxes

---
 manifests/params.pp                  | 33 +++++++++++++++++++++++++++-
 spec/acceptance/mod_php_spec.rb      |  4 ++++
 spec/spec_helper_acceptance_local.rb |  3 +++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index ca1b8c57ae..cdd6e07ed7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -392,7 +392,7 @@
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
-    } else {
+    } elsif ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '11') < 0) {
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
         '16.04' => '7.0', # Ubuntu Xenial
@@ -427,6 +427,37 @@
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
+    } else {
+      $php_version = $facts['operatingsystemmajrelease'] ? {
+        default => '7.4', # Debian Bullseye
+      }
+      $mod_packages = {
+        'apreq2'                => 'libapache2-mod-apreq2',
+        'auth_cas'              => 'libapache2-mod-auth-cas',
+        'auth_kerb'             => 'libapache2-mod-auth-kerb',
+        'auth_openidc'          => 'libapache2-mod-auth-openidc',
+        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
+        'auth_mellon'           => 'libapache2-mod-auth-mellon',
+        'authnz_pam'            => 'libapache2-mod-authnz-pam',
+        'dav_svn'               => 'libapache2-mod-svn',
+        'fastcgi'               => 'libapache2-mod-fastcgi',
+        'fcgid'                 => 'libapache2-mod-fcgid',
+        'geoip'                 => 'libapache2-mod-geoip',
+        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+        'jk'                    => 'libapache2-mod-jk',
+        'lookup_identity'       => 'libapache2-mod-lookup-identity',
+        'nss'                   => 'libapache2-mod-nss',
+        'pagespeed'             => 'mod-pagespeed-stable',
+        'passenger'             => 'libapache2-mod-passenger',
+        'perl'                  => 'libapache2-mod-perl2',
+        'phpXXX'                => 'libapache2-mod-phpXXX',
+        'python'                => 'libapache2-mod-python',
+        'rpaf'                  => 'libapache2-mod-rpaf',
+        'security'              => 'libapache2-mod-security2',
+        'shib2'                 => 'libapache2-mod-shib',
+        'wsgi'                  => 'libapache2-mod-wsgi-py3',
+        'xsendfile'             => 'libapache2-mod-xsendfile',
+      }
     }
     $error_log           = 'error.log'
     $scriptalias         = '/usr/lib/cgi-bin'
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 2917445416..7bc3749c13 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -33,6 +33,10 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
+    elsif os[:family] == 'debian' && os[:release] =~ %r{^11\.}
+      describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
     elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
       describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 6f64652915..2f4405c1f7 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -72,6 +72,9 @@ class { 'epel': }
     }
     PUPPETCODE
     LitmusHelper.instance.apply_manifest(pp)
+
+    # Ensure ipv6 is enabled on our Debian 11 Docker boxes
+    LitmusHelper.instance.run_shell('sysctl -w net.ipv6.conf.all.disable_ipv6=0') if %r{debian}.match?(os[:family]) && os[:release].to_f == 11
   end
 
   c.after :suite do

From 8f8fde01e5920d584f286d9c93b02e3110e14c54 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Tue, 24 Aug 2021 14:54:41 +0000
Subject: [PATCH 1829/2267] Release prep v6.5.0

---
 CHANGELOG.md  | 8 ++++++++
 metadata.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b14ddd58fe..22c71db85f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v6.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.0) (2021-08-24)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.4.0...v6.5.0)
+
+### Added
+
+- pdksync - \(IAC-1709\) - Add Support for Debian 11 [\#2180](https://github.com/puppetlabs/puppetlabs-apache/pull/2180) ([david22swan](https://github.com/david22swan))
+
 ## [v6.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.4.0) (2021-08-02)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.3.1...v6.4.0)
diff --git a/metadata.json b/metadata.json
index 413e228e4e..f8604a7f0f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 170397689aaffcc988c39e39441ed910b5efef24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 24 Aug 2021 17:32:02 -1000
Subject: [PATCH 1830/2267] (maint) Allow stdlib 8.0.0

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index f8604a7f0f..43f065a79b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 8.0.0"
+      "version_requirement": ">= 4.13.1 < 9.0.0"
     },
     {
       "name": "puppetlabs/concat",

From ba523770c74756a1dc12216774f9f74b8f99de00 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Wed, 25 Aug 2021 10:23:45 +0000
Subject: [PATCH 1831/2267] Release prep v6.5.1

---
 CHANGELOG.md  | 8 ++++++++
 metadata.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22c71db85f..90139bc9b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v6.5.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.1) (2021-08-25)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.0...v6.5.1)
+
+### Fixed
+
+- \(maint\) Allow stdlib 8.0.0 [\#2184](https://github.com/puppetlabs/puppetlabs-apache/pull/2184) ([smortex](https://github.com/smortex))
+
 ## [v6.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.0) (2021-08-24)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.4.0...v6.5.0)
diff --git a/metadata.json b/metadata.json
index 43f065a79b..a90eca491c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From ef1afcb3c124f8d38392739d43b5d5ccf041361b Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Wed, 1 Sep 2021 12:50:34 +0200
Subject: [PATCH 1832/2267] Debian 11: fix typo in `versioncmp()` / set default
 php to 7.4

tl;dr `$::operatingsystemrelease` is different from
`$::operatingsystemmajrelease`. `$::operatingsystemmajrelease` returns
'11.0' on Debian 11, whereas `$::operatingsystemmajrelease` is `11`.
In addition `versioncmp()` says that `'11.0'` is greater than `11`.

Without this change, the module sets the default PHP version on Debian
11 to 7.2, but the actual default in Debian is 7.4:
* https://packages.debian.org/bullseye/php

The 7.2 currently comes from the default entry in the selector
statement:
* https://github.com/puppetlabs/puppetlabs-apache/blob/main/manifests/params.pp#L401

To test:

```puppet
notify { "operatingsystemrelease compared to 11: ${versioncmp($::operatingsystemrelease, '11')}":}
notify { "operatingsystemmajrelease compared to 11: ${versioncmp($::operatingsystemmajrelease, '11')}":}
notify { "operatingsystemrelease: ${::operatingsystemrelease}":}
notify { "operatingsystemmajrelease: ${::operatingsystemmajrelease}":}
```

which produces:

```terminal
puppet apply test.pp
Notice: Compiled catalog for blal in environment production in 0.02 seconds
Notice: operatingsystemrelease compared to 11: 1
Notice: /Stage[main]/Main/Notify[operatingsystemrelease compared to 11: 1]/message: defined 'message' as 'operatingsystemrelease compared to 11: 1'
Notice: operatingsystemmajrelease compared to 11: 0
Notice: /Stage[main]/Main/Notify[operatingsystemmajrelease compared to 11: 0]/message: defined 'message' as 'operatingsystemmajrelease compared to 11: 0'
Notice: operatingsystemrelease: 11.0
Notice: /Stage[main]/Main/Notify[operatingsystemrelease: 11.0]/message: defined 'message' as 'operatingsystemrelease: 11.0'
Notice: operatingsystemmajrelease: 11.0
Notice: /Stage[main]/Main/Notify[operatingsystemmajrelease: 11.0]/message: defined 'message' as 'operatingsystemmajrelease: 11'
Notice: Applied catalog in 0.01 seconds
```

```terminal
:~> facter operatingsystemmajrelease
11
:~> facter operatingsystemrelease
11.0
```

The spec tests are copied from
https://github.com/puppetlabs/puppetlabs-apache/pull/2181
Co-authored-by: Kienan Stewart <kienan.stewart@burntworld.ca>
---
 manifests/params.pp          |  2 +-
 spec/classes/mod/php_spec.rb | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index cdd6e07ed7..6e0a2310df 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -392,7 +392,7 @@
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
-    } elsif ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '11') < 0) {
+    } elsif ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
         '16.04' => '7.0', # Ubuntu Xenial
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 5c11c49bca..d5e8674d21 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -68,6 +68,29 @@
                 { php_version: '8.0' }
               end
 
+              it { is_expected.to contain_apache__mod('php') }
+              it { is_expected.to contain_package('libapache2-mod-php8.0') }
+              it {
+                is_expected.to contain_file('php.load').with(
+                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
+                )
+              }
+            end
+          when '11'
+            context 'on bullseye' do
+              it { is_expected.to contain_apache__mod('php7.4') }
+              it { is_expected.to contain_package('libapache2-mod-php7.4') }
+              it {
+                is_expected.to contain_file('php7.4.load').with(
+                  content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.4.so\n",
+                )
+              }
+            end
+            context 'on bullseye with experimental php8.0' do
+              let :params do
+                { php_version: '8.0' }
+              end
+
               it { is_expected.to contain_apache__mod('php') }
               it { is_expected.to contain_package('libapache2-mod-php8.0') }
               it {

From 012ce45d0407b3299962627e71a4b791afa2e6c6 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 15 Mar 2021 15:32:11 +0100
Subject: [PATCH 1833/2267] Match release names and numbers in php_spec.rb

---
 spec/classes/mod/php_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index d5e8674d21..b396f13bd2 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -100,7 +100,7 @@
               }
             end
           when '16.04'
-            context 'on stretch' do
+            context 'on xenial' do
               let :params do
                 { content: 'somecontent' }
               end
@@ -113,7 +113,7 @@
             end
 
           when '18.04'
-            context 'on stretch' do
+            context 'on bionic' do
               let :params do
                 { content: 'somecontent' }
               end

From 6b7536fa69a5fe15a05b274fcc9ef51bb178ad01 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 15 Mar 2021 15:32:29 +0100
Subject: [PATCH 1834/2267] Nest contexts in php_spec.rb

This uses rspec context nesting to get a better description.
---
 spec/classes/mod/php_spec.rb | 50 +++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index b396f13bd2..ad62b6d4bb 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -62,19 +62,20 @@
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.3.so\n",
                 )
               }
-            end
-            context 'on buster with experimental php8.0' do
-              let :params do
-                { php_version: '8.0' }
-              end
 
-              it { is_expected.to contain_apache__mod('php') }
-              it { is_expected.to contain_package('libapache2-mod-php8.0') }
-              it {
-                is_expected.to contain_file('php.load').with(
-                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
-                )
-              }
+              context 'with experimental php8.0' do
+                let :params do
+                  { php_version: '8.0' }
+                end
+
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_package('libapache2-mod-php8.0') }
+                it {
+                  is_expected.to contain_file('php.load').with(
+                    content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
+                  )
+                }
+              end
             end
           when '11'
             context 'on bullseye' do
@@ -85,19 +86,20 @@
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.4.so\n",
                 )
               }
-            end
-            context 'on bullseye with experimental php8.0' do
-              let :params do
-                { php_version: '8.0' }
-              end
 
-              it { is_expected.to contain_apache__mod('php') }
-              it { is_expected.to contain_package('libapache2-mod-php8.0') }
-              it {
-                is_expected.to contain_file('php.load').with(
-                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
-                )
-              }
+              context 'with experimental php8.0' do
+                let :params do
+                  { php_version: '8.0' }
+                end
+
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_package('libapache2-mod-php8.0') }
+                it {
+                  is_expected.to contain_file('php.load').with(
+                    content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
+                  )
+                }
+              end
             end
           when '16.04'
             context 'on xenial' do

From 56f326276289f0ee76400298049a46965d91d0d3 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 1 Sep 2021 13:58:06 +0200
Subject: [PATCH 1835/2267] Clean up passenger expectations

---
 spec/classes/mod/passenger_spec.rb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index fb56891124..aed525e74d 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -390,19 +390,11 @@
           it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$}) }
         end
 
-        context 'with Ubuntu 16.04 defaults' do
+        context 'with defaults' do
           it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
           it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
           it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
         end
-
-        if facts[:os]['release']['major'].to_i == 8
-          context 'with Debian 8 defaults' do
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-            it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
-          end
-        end
       when 'RedHat'
         context 'on a RedHat OS' do
           case facts[:os]['release']['major']

From 8716eb95a2123120f83cf67b1c86cfcae63f0852 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 1 Sep 2021 11:20:46 +0200
Subject: [PATCH 1836/2267] Drop Debian < 8 and Ubuntu < 14.04 code

---
 manifests/mod/suphp.pp               |  2 +-
 manifests/mpm.pp                     | 10 ++++------
 manifests/params.pp                  | 30 +++++++---------------------
 manifests/version.pp                 |  8 +-------
 spec/spec_helper_acceptance_local.rb |  8 +-------
 5 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index 3a16a76aaa..cb2389f213 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -6,7 +6,7 @@
 class apache::mod::suphp (
 ) {
   if  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
-  ($facts['os']['name'] == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
+  $facts['os']['family'] == 'Debian' {
     fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
   }
   include apache
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 644d0e1fd0..b76772eaf3 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -85,10 +85,8 @@
       }
 
       if $mpm == 'itk' {
-        if ( ( $::operatingsystem == 'Ubuntu' ) or ( ($::operatingsystem == 'Debian') and ( versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) ) {
-          include apache::mpm::disable_mpm_event
-          include apache::mpm::disable_mpm_worker
-        }
+        include apache::mpm::disable_mpm_event
+        include apache::mpm::disable_mpm_worker
 
         package { 'libapache2-mpm-itk':
           ensure => present,
@@ -100,14 +98,14 @@
       }
 
       if $mpm == 'prefork' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) {
+        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or $::operatingsystem == 'Debian' ) {
           include apache::mpm::disable_mpm_event
           include apache::mpm::disable_mpm_worker
         }
       }
 
       if $mpm == 'worker' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or ( $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0.0') >= 0 ) ) {
+        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or $::operatingsystem == 'Debian' ) {
           include apache::mpm::disable_mpm_event
           include apache::mpm::disable_mpm_prefork
         }
diff --git a/manifests/params.pp b/manifests/params.pp
index 6e0a2310df..cfa56b4481 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -459,12 +459,11 @@
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
     }
+
     $error_log           = 'error.log'
     $scriptalias         = '/usr/lib/cgi-bin'
     $access_log_file     = 'access.log'
-    if $::osfamily == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0 {
-      $shib2_lib = 'mod_shib_22.so'
-    } elsif ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '19.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '10') < 0) {
+    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '19.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '10') < 0) {
       $shib2_lib = 'mod_shib2.so'
     } else {
       $shib2_lib = 'mod_shib.so'
@@ -480,11 +479,7 @@
     $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
-    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
-      $docroot              = '/var/www/html'
-    } else {
-      $docroot              = '/var/www'
-    }
+    $docroot              = '/var/www/html'
     $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
     $mellon_lock_file     = undef
     $mellon_cache_size    = undef
@@ -544,11 +539,7 @@
     }
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
-    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) {
-      $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
-    } else {
-      $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
-    }
+    $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
 
     #
     # Passenger-specific settings
@@ -556,16 +547,9 @@
 
     $passenger_conf_file         = 'passenger.conf'
     $passenger_conf_package_file = undef
-
-    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '14.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0) {
-      $passenger_root         = '/usr'
-      $passenger_ruby         = '/usr/bin/ruby'
-      $passenger_default_ruby = undef
-    } else {
-      $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-      $passenger_ruby         = undef
-      $passenger_default_ruby = '/usr/bin/ruby'
-    }
+    $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+    $passenger_ruby         = undef
+    $passenger_default_ruby = '/usr/bin/ruby'
     $wsgi_socket_prefix = undef
   } elsif $::osfamily == 'FreeBSD' {
     $user             = 'www'
diff --git a/manifests/version.pp b/manifests/version.pp
index 6d2bb24d0b..f799db73b4 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -20,13 +20,7 @@
       }
     }
     'Debian': {
-      if $::operatingsystem == 'Ubuntu' and versioncmp($facts['operatingsystemmajrelease'], '13.10') >= 0 {
-        $default = '2.4'
-      } elsif $::operatingsystem == 'Debian' and versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
-        $default = '2.4'
-      } else {
-        $default = '2.2'
-      }
+      $default = '2.4'
     }
     'FreeBSD': {
       $default = '2.4'
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 2f4405c1f7..f8995a21f0 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -133,13 +133,7 @@ def apache_settings_hash
     apache['error_log']        = 'error.log'
     apache['suphp_handler']    = 'x-httpd-php'
     apache['suphp_configpath'] = '/etc/php5/apache2'
-    apache['version'] = if osfamily == 'ubuntu' && operatingsystemrelease >= 13.10
-                          '2.4'
-                        elsif osfamily == 'debian' && operatingsystemrelease >= 8.0
-                          '2.4'
-                        else
-                          '2.2'
-                        end
+    apache['version']          = '2.4'
     apache['mod_ssl_dir']      = apache['mod_dir']
   when 'freebsd'
     apache['httpd_dir']        = '/usr/local/etc/apache24'

From b31ef0d8d6316ae32ef45e9e7e077e59828d1e39 Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Mon, 6 Sep 2021 12:10:34 +0100
Subject: [PATCH 1837/2267] (FM-8483) reenable the testcases

---
 spec/acceptance/apache_parameters_spec.rb |  6 +++---
 spec/acceptance/class_spec.rb             |  4 ++--
 spec/acceptance/default_mods_spec.rb      |  8 ++++----
 spec/acceptance/itk_spec.rb               |  2 +-
 spec/acceptance/prefork_worker_spec.rb    |  6 +++---
 spec/acceptance/vhost_spec.rb             | 18 +++++++++---------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index cfad4f5faf..6a06d24e37 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -53,7 +53,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -70,7 +70,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
       it { is_expected.not_to be_enabled }
     end
@@ -88,7 +88,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
       it { is_expected.not_to be_enabled }
     end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 3a204e5fe2..8ef6f09f19 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -28,7 +28,7 @@
       it { is_expected.to be_installed }
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -77,7 +77,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 8653aafd59..fa5a6beabe 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -17,7 +17,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
   end
@@ -56,7 +56,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
     end
   end
@@ -89,7 +89,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
   end
@@ -108,7 +108,7 @@ class { 'apache': default_mods => false }
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 2283e00b01..c5ef34b9c4 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -43,7 +43,7 @@ class { 'apache':
     end
   end
 
-  describe service(service_name), skip: 'FM-8483' do
+  describe service(service_name) do
     it { is_expected.to be_running }
     it { is_expected.to be_enabled }
   end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index d6bc2239f7..8cf1fcd657 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -18,7 +18,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -39,7 +39,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -61,7 +61,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2b74bdb70e..09218c9612 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -179,7 +179,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -247,7 +247,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -307,7 +307,7 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']), skip: 'FM-8483' do
+      describe service(apache_hash['service_name']) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -369,7 +369,7 @@ class { 'apache': }
         apply_manifest(pp_one, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']), skip: 'FM-8483' do
+      describe service(apache_hash['service_name']) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -411,7 +411,7 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']), skip: 'FM-8483' do
+      describe service(apache_hash['service_name']) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -487,7 +487,7 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']), skip: 'FM-8483' do
+      describe service(apache_hash['service_name']) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
 
@@ -528,7 +528,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -574,7 +574,7 @@ class { 'apache': default_vhost => false, }
                      ), catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -619,7 +619,7 @@ class { 'apache': default_vhost => false, }
                     ), catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end

From 2a285730fea2fb07969a57c02b4836c23d545883 Mon Sep 17 00:00:00 2001
From: Benjamin Rechsteiner <benjamin.rechsteiner@abacus.ch>
Date: Wed, 8 Sep 2021 11:30:20 +0200
Subject: [PATCH 1838/2267] add double quote on scope parameter

---
 templates/vhost/_auth_oidc.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/vhost/_auth_oidc.erb b/templates/vhost/_auth_oidc.erb
index dd0faa429c..95c087211c 100644
--- a/templates/vhost/_auth_oidc.erb
+++ b/templates/vhost/_auth_oidc.erb
@@ -1,5 +1,9 @@
 <% if @auth_oidc -%>
 <% @oidc_settings.each do |key, value| %>
+<% if key == 'Scope' -%>
+  OIDC<%= key %> "<%= value -%>"
+<% else -%>
   OIDC<%= key %> <%= value -%>
+<% end -%>
 <% end %>
 <% end -%>

From bd58cc08463212e5d1095b995e7dbeab5a77bd9a Mon Sep 17 00:00:00 2001
From: Benjamin Rechsteiner <benjamin.rechsteiner@abacus.ch>
Date: Wed, 8 Sep 2021 11:40:08 +0200
Subject: [PATCH 1839/2267] prevent empty lines

---
 templates/vhost/_auth_oidc.erb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/templates/vhost/_auth_oidc.erb b/templates/vhost/_auth_oidc.erb
index 95c087211c..e47279dfb7 100644
--- a/templates/vhost/_auth_oidc.erb
+++ b/templates/vhost/_auth_oidc.erb
@@ -1,9 +1,5 @@
 <% if @auth_oidc -%>
 <% @oidc_settings.each do |key, value| %>
-<% if key == 'Scope' -%>
-  OIDC<%= key %> "<%= value -%>"
-<% else -%>
-  OIDC<%= key %> <%= value -%>
-<% end -%>
+  OIDC<%= key %> <% if key == 'Scope' -%>"<%= value -%>"<% else -%><%= value -%><% end%>
 <% end %>
 <% end -%>

From dcd0d597c87512a0635015e405b3b386f57e4ecc Mon Sep 17 00:00:00 2001
From: Benjamin Rechsteiner <benjamin.rechsteiner@abacus.ch>
Date: Wed, 8 Sep 2021 11:44:26 +0200
Subject: [PATCH 1840/2267] fix typo

---
 templates/vhost/_auth_oidc.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_auth_oidc.erb b/templates/vhost/_auth_oidc.erb
index e47279dfb7..196e172c1d 100644
--- a/templates/vhost/_auth_oidc.erb
+++ b/templates/vhost/_auth_oidc.erb
@@ -1,5 +1,5 @@
 <% if @auth_oidc -%>
 <% @oidc_settings.each do |key, value| %>
-  OIDC<%= key %> <% if key == 'Scope' -%>"<%= value -%>"<% else -%><%= value -%><% end%>
+  OIDC<%= key %> <% if key == 'Scope' -%>"<%= value -%>"<% else -%><%= value -%><% end-%>
 <% end %>
 <% end -%>

From ec74a8e5f73130b0a0d5c0dd645e847a2787421f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sat, 11 Sep 2021 18:58:59 -1000
Subject: [PATCH 1841/2267] Add support for setting UserDir in Virtual Hosts

We can only set this setting at the VirtualHost level by relying on the
`custom_fragment` parameter, which does not scale when we want to enable
UserDir for a single VHost because we have to manually disable it on all
other VHosts.

With this change, one can ensure UserDir is active only on specific
VHost with something like:

```
Apache::Vhost {
  userdir => 'disabled',
}

apache::vhost { 'example.com':
  # [...]
  userdir => 'enabled',
}
```

A specific `userdir` parameter avoid clashes that would prevent this
technique to be effective with `custom_fragment`.
---
 manifests/vhost.pp           | 13 +++++++++++++
 spec/defines/vhost_spec.rb   | 15 +++++++++++++++
 templates/vhost/_userdir.erb |  3 +++
 3 files changed, 31 insertions(+)
 create mode 100644 templates/vhost/_userdir.erb

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ad11da04dd..f951d67300 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1995,6 +1995,7 @@
   Boolean $auth_oidc                                                                = false,
   Optional[Apache::OIDCSettings] $oidc_settings                                     = undef,
   Optional[Variant[Boolean,String]] $mdomain                                        = undef,
+  Optional[Variant[String[1],Array[String[1]]]] $userdir                            = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -2854,6 +2855,18 @@
     include apache::mod::md
   }
 
+  # Template uses:
+  # - $userdir
+  if $userdir {
+    include apache::mod::userdir
+
+    concat::fragment { "${name}-userdir":
+      target  => "${priority_real}${filename}.conf",
+      order   => 300,
+      content => template('apache/vhost/_userdir.erb'),
+    }
+  }
+
   # Template uses:
   # - $passenger_enabled
   # - $passenger_start_timeout
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 28291f80bc..224096beda 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -496,6 +496,7 @@
                                                  'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
                                                  'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
               'mdomain'                     => 'example.com example.net auto',
+              'userdir'                     => 'disabled',
             }
           end
 
@@ -2472,6 +2473,20 @@
             )
           }
         end
+
+        context 'userdir' do
+          let :params do
+            default_params.merge(
+              'userdir' => [
+                'disabled',
+                'enabled bob',
+              ],
+            )
+
+            it { is_expected.to contain_concat__fragment('rspec.example.com-apache-userdir').with(content: %r{^\s+UserDir disabled$}) }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-apache-userdir').with(content: %r{^\s+UUserDir enabled bob$}) }
+          end
+        end
       end
     end
   end
diff --git a/templates/vhost/_userdir.erb b/templates/vhost/_userdir.erb
new file mode 100644
index 0000000000..0c6523ba0c
--- /dev/null
+++ b/templates/vhost/_userdir.erb
@@ -0,0 +1,3 @@
+  <%- [@userdir].flatten.each do |userdir| -%>
+  UserDir <%= userdir %>
+  <%- end -%>

From 795d3aef2a2798bbd93ec2e846b81e652a5aeea1 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 13 Sep 2021 12:36:14 +0200
Subject: [PATCH 1842/2267] Restore Ubuntu 14.04 support in suphp

Fixes: 8716eb95a2123120f83cf67b1c86cfcae63f0852
---
 manifests/mod/suphp.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index cb2389f213..bbeeb8721f 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -6,7 +6,7 @@
 class apache::mod::suphp (
 ) {
   if  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
-  $facts['os']['family'] == 'Debian' {
+  $facts['os']['name'] == 'Debian' {
     fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
   }
   include apache

From ae76cb53af596dba83cc18df6366e628bc4e7cc8 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 16 Sep 2021 12:11:03 +0200
Subject: [PATCH 1843/2267] Drop comments describing old Debian/Ubuntu

In 8716eb95a2123120f83cf67b1c86cfcae63f0852 support for Ubuntu < 14.04
and Debian < 8 was dropped. This removes a comment describing those
versions.

Fixes: 8716eb95a2123120f83cf67b1c86cfcae63f0852
---
 manifests/dev.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/dev.pp b/manifests/dev.pp
index b8c6991eaa..106541032a 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -3,7 +3,7 @@
 #
 # The libraries installed depends on the `dev_packages` parameter of the `apache::params` 
 # class, based on your operating system:
-# - **Debian** : `libaprutil1-dev`, `libapr1-dev`; `apache2-dev` on Ubuntu 13.10 and Debian 8; `apache2-prefork-dev` on other versions.
+# - **Debian** : `libaprutil1-dev`, `libapr1-dev`; `apache2-dev`
 # - **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
 # - **Gentoo**: `undef`.
 # - **Red Hat**: `httpd-devel`.

From 94180f4e686a293e18d20d5f755ac737e3f84f9c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 16 Sep 2021 12:09:31 +0200
Subject: [PATCH 1844/2267] Better nesting in spec tests

---
 spec/classes/mod/proxy_html_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index a019416337..417530fe22 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -19,7 +19,7 @@
     end
     include_examples 'Debian 8'
 
-    context 'on jessie i386' do
+    context 'on i386' do
       let(:facts) do
         super().merge(hardwaremodel: 'i686',
                       architecture: 'i386')
@@ -28,7 +28,7 @@
       it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
       it_behaves_like 'debian', ['/usr/lib/i386-linux-gnu/libxml2.so.2']
     end
-    context 'on jessie x64' do
+    context 'on x64' do
       let(:facts) do
         super().merge(hardwaremodel: 'x86_64',
                       architecture: 'amd64')

From fd75b580370c00e87c6014407dd693356343f8cd Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 16 Sep 2021 12:16:40 +0200
Subject: [PATCH 1845/2267] Drop redundant test

This is the same test case as 'with magic_file => /tmp/Debian_magic'.
---
 spec/classes/mod/mime_magic_spec.rb | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index 369a34e088..c5b479f2a1 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -56,18 +56,4 @@ def general_mime_magic_specs
 
     it { is_expected.to contain_file('mime_magic.conf').with_path('/etc/httpd/conf.d/mime_magic.conf') }
   end
-
-  context 'with magic_file => /tmp/magic' do
-    include_examples 'Debian 8'
-
-    let :params do
-      { magic_file: '/tmp/magic' }
-    end
-
-    it do
-      is_expected.to contain_file('mime_magic.conf').with_content(
-        "MIMEMagicFile \"/tmp/magic\"\n",
-      )
-    end
-  end
 end

From fbba7bba8246c1ad6ec21c6f11c3b5caab3b12f5 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 16 Sep 2021 12:06:42 +0200
Subject: [PATCH 1846/2267] Switch default Debian tests from 8 to 11

Previously all test suites ran with Debian 8 facts. This switches it to
Debian 11, which is the latest supported version.
---
 spec/classes/apache_spec.rb                    | 2 +-
 spec/classes/mod/alias_spec.rb                 | 2 +-
 spec/classes/mod/auth_cas_spec.rb              | 2 +-
 spec/classes/mod/auth_gssapi_spec.rb           | 2 +-
 spec/classes/mod/auth_kerb_spec.rb             | 2 +-
 spec/classes/mod/auth_mellon_spec.rb           | 2 +-
 spec/classes/mod/auth_openidc_spec.rb          | 2 +-
 spec/classes/mod/authn_dbd_spec.rb             | 2 +-
 spec/classes/mod/authnz_ldap_spec.rb           | 2 +-
 spec/classes/mod/authnz_pam_spec.rb            | 2 +-
 spec/classes/mod/data_spec.rb                  | 2 +-
 spec/classes/mod/dav_svn_spec.rb               | 6 +++---
 spec/classes/mod/deflate_spec.rb               | 2 +-
 spec/classes/mod/dev_spec.rb                   | 2 +-
 spec/classes/mod/dir_spec.rb                   | 2 +-
 spec/classes/mod/disk_cache_spec.rb            | 2 +-
 spec/classes/mod/dumpio_spec.rb                | 2 +-
 spec/classes/mod/event_spec.rb                 | 2 +-
 spec/classes/mod/expires_spec.rb               | 2 +-
 spec/classes/mod/ext_filter_spec.rb            | 2 +-
 spec/classes/mod/fcgid_spec.rb                 | 2 +-
 spec/classes/mod/http2_spec.rb                 | 2 +-
 spec/classes/mod/info_spec.rb                  | 2 +-
 spec/classes/mod/intercept_form_submit_spec.rb | 2 +-
 spec/classes/mod/itk_spec.rb                   | 2 +-
 spec/classes/mod/jk_spec.rb                    | 4 ++--
 spec/classes/mod/ldap_spec.rb                  | 2 +-
 spec/classes/mod/lookup_identity.rb            | 2 +-
 spec/classes/mod/mime_magic_spec.rb            | 2 +-
 spec/classes/mod/mime_spec.rb                  | 2 +-
 spec/classes/mod/negotiation_spec.rb           | 2 +-
 spec/classes/mod/pagespeed_spec.rb             | 2 +-
 spec/classes/mod/perl_spec.rb                  | 2 +-
 spec/classes/mod/prefork_spec.rb               | 2 +-
 spec/classes/mod/proxy_balancer_spec.rb        | 4 ++--
 spec/classes/mod/proxy_html_spec.rb            | 3 +--
 spec/classes/mod/python_spec.rb                | 2 +-
 spec/classes/mod/remoteip_spec.rb              | 2 +-
 spec/classes/mod/reqtimeout_spec.rb            | 2 +-
 spec/classes/mod/rpaf_spec.rb                  | 2 +-
 spec/classes/mod/shib_spec.rb                  | 2 +-
 spec/classes/mod/speling_spec.rb               | 2 +-
 spec/classes/mod/ssl_spec.rb                   | 2 +-
 spec/classes/mod/status_spec.rb                | 8 ++++----
 spec/classes/mod/userdir_spec.rb               | 2 +-
 spec/classes/mod/worker_spec.rb                | 2 +-
 spec/classes/mod/wsgi_spec.rb                  | 4 ++--
 spec/classes/params_spec.rb                    | 2 +-
 spec/classes/service_spec.rb                   | 2 +-
 spec/defines/balancer_spec.rb                  | 2 +-
 spec/defines/balancermember_spec.rb            | 2 +-
 spec/defines/custom_config_spec.rb             | 2 +-
 spec/defines/mod_spec.rb                       | 2 +-
 spec/defines/vhost_custom_spec.rb              | 2 +-
 spec/spec_helper_local.rb                      | 6 +++---
 55 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index c2b27fde8a..651540291e 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache', type: :class do
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it {
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 9d27c80658..8ddb9ef971 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index d8328d8598..717dd58c0e 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -24,7 +24,7 @@
     end
 
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_cas') }
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
index 231450f0b3..c8efd071d0 100644
--- a/spec/classes/mod/auth_gssapi_spec.rb
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index dd1dd48260..d5fef032c0 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index c7358a45ed..c1ccd4b23a 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -6,7 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('auth_mellon') }
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index c8c90acad6..dd40e83c5f 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
index afd3901747..78674161fd 100644
--- a/spec/classes/mod/authn_dbd_spec.rb
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -23,7 +23,7 @@
     end
 
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('authn_dbd') }
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index dbd76c0e39..27f75d66bd 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -6,7 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::mod::ldap') }
diff --git a/spec/classes/mod/authnz_pam_spec.rb b/spec/classes/mod/authnz_pam_spec.rb
index 4361fb649f..6fb9a6a697 100644
--- a/spec/classes/mod/authnz_pam_spec.rb
+++ b/spec/classes/mod/authnz_pam_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS' do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-authnz-pam') }
diff --git a/spec/classes/mod/data_spec.rb b/spec/classes/mod/data_spec.rb
index f849167507..52a19f057d 100644
--- a/spec/classes/mod/data_spec.rb
+++ b/spec/classes/mod/data_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::mod::data', type: :class do
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
     let :params do
       { apache_version: '2.4' }
     end
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index affdb367e4..e30744e801 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -7,11 +7,11 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS' do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
-      it { is_expected.to contain_package('libapache2-svn') }
+      it { is_expected.to contain_package('libapache2-mod-svn') }
       it { is_expected.to contain_file('dav_svn.load').with_content(%r{LoadModule dav_svn_module}) }
       describe 'with parameters' do
         let :params do
@@ -22,7 +22,7 @@
 
         it { is_expected.to contain_class('apache::params') }
         it { is_expected.to contain_apache__mod('dav_svn') }
-        it { is_expected.to contain_package('libapache2-svn') }
+        it { is_expected.to contain_package('libapache2-mod-svn') }
         it { is_expected.to contain_apache__mod('authz_svn') }
         it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
       end
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 5c71e7a5e3..242ee2f25d 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -37,7 +37,7 @@ def general_deflate_specs
     end
 
     context 'On a Debian OS with default params' do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       # Load the more generic tests for this context
       general_deflate_specs
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 7a1200e08f..53a61148c6 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -11,7 +11,7 @@
 
   it_behaves_like 'a mod class, without including apache'
 
-  ['RedHat 6', 'Debian 8', 'FreeBSD 9'].each do |os|
+  ['RedHat 6', 'Debian 11', 'FreeBSD 9'].each do |os|
     context "on a #{os} OS" do
       include_examples os
 
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 919d86399d..9b9ccc3049 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::dir', type: :class do
-  ['Debian 8', 'RedHat 6', 'FreeBSD 9', 'Gentoo'].each do |os|
+  ['Debian 11', 'RedHat 6', 'FreeBSD 9', 'Gentoo'].each do |os|
     context "default configuration with parameters on #{os}" do
       include_examples os
 
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index e60e2af57e..dc0dc589cd 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::mod::disk_cache', type: :class do
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     let(:params) do
       {
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
index 529e2aa083..884200836c 100644
--- a/spec/classes/mod/dumpio_spec.rb
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -11,7 +11,7 @@
        }'
     end
 
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     context 'default configuration fore parameters' do
       it { is_expected.to compile }
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 70073efc26..572baefe5d 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -22,7 +22,7 @@
     it { is_expected.to contain_file('/etc/apache2/modules.d/event.conf').with_ensure('file') }
   end
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('event') }
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index 003a325514..759c46ad25 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -6,7 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'with expires active', :compile do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_apache__mod('expires') }
     it { is_expected.to contain_file('expires.conf').with(content: %r{ExpiresActive On\n}) }
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index 04d91bd840..7933211cb6 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::mod::ext_filter', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('ext_filter') }
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 680bf787af..bc6e76dbc1 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -6,7 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it {
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
index af3ff161c8..347dcccad7 100644
--- a/spec/classes/mod/http2_spec.rb
+++ b/spec/classes/mod/http2_spec.rb
@@ -6,7 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::mod::http2') }
     context 'with default values' do
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index a24d1122fd..2d85bc3007 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -124,7 +124,7 @@ def general_info_specs_apache24
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     # Load the more generic tests for this context
     general_info_specs_apache24
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
index 7d2d557171..651150fbc0 100644
--- a/spec/classes/mod/intercept_form_submit_spec.rb
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS' do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-intercept-form-submit') }
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 4812840cd6..20819e9d75 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -8,7 +8,7 @@
   end
 
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index b6093ab18c..1d8593eb4b 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -63,8 +63,8 @@
   default_port = 80
   altern8_port = 8008
 
-  context 'Debian 8' do
-    include_examples 'Debian 8'
+  context 'Debian 11' do
+    include_examples 'Debian 11'
 
     context 'with only required facts and default parameters' do
       let(:facts) { super().merge('ipaddress' => default_ip) }
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index fd14caceca..934b62da8f 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -6,7 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::mod::ldap') }
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
index 4557f99012..30353cf3b7 100644
--- a/spec/classes/mod/lookup_identity.rb
+++ b/spec/classes/mod/lookup_identity.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS' do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-lookup-identity') }
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index c5b479f2a1..a66a683fd1 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -11,7 +11,7 @@ def general_mime_magic_specs
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS with default params' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     general_mime_magic_specs
 
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index b7b4525fce..88bc648178 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -18,7 +18,7 @@ def general_mime_specs
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS with default params', :compile do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     general_mime_specs
 
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 8f27052610..0f4bd69273 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::mod::negotiation', type: :class do
   it_behaves_like 'a mod class, without including apache'
   describe 'OS independent tests' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     context 'default params' do
       it { is_expected.to contain_class('apache') }
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index 38e9809ef1..a9e9d95c57 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::mod::pagespeed', type: :class do
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('pagespeed') }
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index d2f3d961d5..84d8cb9898 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::mod::perl', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 83e27ed040..51eb8c0904 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -8,7 +8,7 @@
   end
 
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index 487394626a..5ba4e4a4f7 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -24,7 +24,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
 
   context 'default configuration with default parameters' do
     context 'on a Debian OS' do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it { is_expected.to contain_apache__mod('proxy_balancer') }
 
@@ -42,7 +42,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
     end
   end
   context "default configuration with custom parameters $manager => true, $allow_from => ['10.10.10.10','11.11.11.11'], $status_path => '/custom-manager' on a Debian OS" do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
     let :params do
       {
         manager: true,
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 417530fe22..b212edf725 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -15,9 +15,8 @@
     shared_examples 'debian' do |loadfiles|
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: loadfiles) }
-      it { is_expected.to contain_package('libapache2-mod-proxy-html') }
     end
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     context 'on i386' do
       let(:facts) do
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index aa08c5dbc5..5c7d024c03 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -6,7 +6,7 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('python') }
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index f83c0f2f5a..694989549c 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::mod::remoteip', type: :class do
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
     let :params do
       { apache_version: '2.4' }
     end
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index 7d72ea706b..aee45edfd1 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::mod::reqtimeout', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 44a8e2cd72..5506317448 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::mod::rpaf', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index 2ade2eb584..f9e0442921 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::mod::shib', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('shib2').with_id('mod_shib') }
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index 2a698f0a4b..5f4e18c5af 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::mod::speling', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_apache__mod('speling') }
   end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 52c6276248..d1c1ef8ff8 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -60,7 +60,7 @@
   end
 
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index c4d814bd97..1b8740a174 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -68,8 +68,8 @@ def require_directives(requires)
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters' do
-    context 'on a Debian 8 OS' do
-      include_examples 'Debian 8'
+    context 'on a Debian 11 OS' do
+      include_examples 'Debian 11'
 
       context 'with default params' do
         it { is_expected.to contain_apache__mod('status') }
@@ -191,8 +191,8 @@ def require_directives(requires)
           }
         end
 
-        context 'on a Debian 8 OS' do
-          include_examples 'Debian 8'
+        context 'on a Debian 11 OS' do
+          include_examples 'Debian 11'
 
           it { is_expected.to contain_apache__mod('status') }
 
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 89b54ab762..3449373834 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -11,7 +11,7 @@
        }'
     end
 
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     context 'default parameters' do
       it { is_expected.to compile }
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index c1ffa7ac29..8d2c32d9ac 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -8,7 +8,7 @@
   end
 
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index b8fadb1026..b888366791 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::mod::wsgi', type: :class do
   it_behaves_like 'a mod class, without including apache'
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -13,7 +13,7 @@
         'wsgi_socket_prefix' => nil,
       )
     }
-    it { is_expected.to contain_package('libapache2-mod-wsgi') }
+    it { is_expected.to contain_package('libapache2-mod-wsgi-py3') }
   end
   context 'on a RedHat OS' do
     include_examples 'RedHat 6'
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index a2a876ee70..5faa269cac 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::params', type: :class do
   context 'On a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to have_resource_count(0) }
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 824b2eab5c..5e9aba39f8 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -8,7 +8,7 @@
   end
 
   context 'on a Debian OS' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     it {
       is_expected.to contain_service('httpd').with(
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index 5d8054695b..b9cdaae69c 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -7,7 +7,7 @@
     'myapp'
   end
 
-  include_examples 'Debian 8'
+  include_examples 'Debian 11'
 
   describe 'apache pre_condition with defaults' do
     let :pre_condition do
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 23d169a0de..9521d52ee6 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -7,7 +7,7 @@
     'include apache'
   end
 
-  include_examples 'Debian 8'
+  include_examples 'Debian 11'
 
   describe 'allows multiple balancermembers with the same url' do
     let :pre_condition do
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 59119a53ab..2e31b1f790 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -10,7 +10,7 @@
     'rspec'
   end
 
-  include_examples 'Debian 8'
+  include_examples 'Debian 11'
 
   context 'defaults with content' do
     let :params do
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index 14a7e2929a..f873b0cf6c 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -49,7 +49,7 @@
   end
 
   context 'on a Debian osfamily' do
-    include_examples 'Debian 8'
+    include_examples 'Debian 11'
 
     describe 'for non-special modules' do
       it { is_expected.to contain_class('apache::params') }
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index c5db0b82a1..9409ed61b6 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -19,7 +19,7 @@
       it { is_expected.to compile }
     end
     context 'on Debian based systems' do
-      include_examples 'Debian 8'
+      include_examples 'Debian 11'
 
       it {
         is_expected.to contain_file('apache_rspec.example.com').with(
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index b5031e3e0f..bef086aca9 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -34,11 +34,11 @@
 end
 
 shared_context 'a mod class, without including apache' do
-  let(:facts) { on_supported_os['debian-8-x86_64'] }
+  let(:facts) { on_supported_os['debian-10-x86_64'] }
 end
 
-shared_context 'Debian 8' do
-  let(:facts) { on_supported_os['debian-8-x86_64'] }
+shared_context 'Debian 11' do
+  let(:facts) { on_supported_os['debian-11-x86_64'] }
 end
 
 shared_context 'Ubuntu 18.04' do

From 33ae7b526b2743c8db97dd20f4fd6ff94154a9d9 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 1 Sep 2021 11:21:15 +0200
Subject: [PATCH 1847/2267] Drop Debian < 9 and Ubuntu < 16.04

---
 manifests/mod/suphp.pp       |  3 +--
 manifests/params.pp          | 33 +--------------------------------
 metadata.json                |  2 --
 spec/classes/mod/php_spec.rb | 23 -----------------------
 4 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
index bbeeb8721f..ae88413215 100644
--- a/manifests/mod/suphp.pp
+++ b/manifests/mod/suphp.pp
@@ -5,8 +5,7 @@
 #
 class apache::mod::suphp (
 ) {
-  if  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
-  $facts['os']['name'] == 'Debian' {
+  if $facts['os']['family'] == 'Debian' {
     fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
   }
   include apache
diff --git a/manifests/params.pp b/manifests/params.pp
index cfa56b4481..79313de8bf 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -361,38 +361,7 @@
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
-    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') < 0) {
-      # Only the major version is used here
-      $php_version = '5'
-      $mod_packages = {
-        'auth_cas'              => 'libapache2-mod-auth-cas',
-        'auth_kerb'             => 'libapache2-mod-auth-kerb',
-        'auth_openidc'          => 'libapache2-mod-auth-openidc',
-        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
-        'auth_mellon'           => 'libapache2-mod-auth-mellon',
-        'authnz_pam'            => 'libapache2-mod-authnz-pam',
-        'dav_svn'               => 'libapache2-svn',
-        'fastcgi'               => 'libapache2-mod-fastcgi',
-        'fcgid'                 => 'libapache2-mod-fcgid',
-        'geoip'                 => 'libapache2-mod-geoip',
-        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
-        'jk'                    => 'libapache2-mod-jk',
-        'lookup_identity'       => 'libapache2-mod-lookup-identity',
-        'nss'                   => 'libapache2-mod-nss',
-        'pagespeed'             => 'mod-pagespeed-stable',
-        'passenger'             => 'libapache2-mod-passenger',
-        'perl'                  => 'libapache2-mod-perl2',
-        'phpXXX'                => 'libapache2-mod-phpXXX',
-        'proxy_html'            => 'libapache2-mod-proxy-html',
-        'python'                => 'libapache2-mod-python',
-        'rpaf'                  => 'libapache2-mod-rpaf',
-        'security'              => 'libapache2-modsecurity',
-        'shib2'                 => 'libapache2-mod-shib2',
-        'suphp'                 => 'libapache2-mod-suphp',
-        'wsgi'                  => 'libapache2-mod-wsgi',
-        'xsendfile'             => 'libapache2-mod-xsendfile',
-      }
-    } elsif ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
+    if ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
         '16.04' => '7.0', # Ubuntu Xenial
diff --git a/metadata.json b/metadata.json
index a90eca491c..56c16b769b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -51,7 +51,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8",
         "9",
         "10",
         "11"
@@ -67,7 +66,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04",
         "20.04"
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index ad62b6d4bb..a954e56ba6 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -20,29 +20,6 @@
             it { is_expected.to contain_class('apache::mod::prefork') }
           end
           case facts[:os]['release']['major']
-          when '8'
-            context 'on jessie' do
-              it {
-                is_expected.to contain_file('php5.load').with(
-                  content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
-                )
-              }
-              context 'with mpm_module => itk on jessie' do
-                let :pre_condition do
-                  'class { "apache": mpm_module => itk, }'
-                end
-
-                it { is_expected.to contain_class('apache::params') }
-                it { is_expected.to contain_class('apache::mod::itk') }
-                it { is_expected.to contain_apache__mod('php5') }
-                it { is_expected.to contain_package('libapache2-mod-php5') }
-                it {
-                  is_expected.to contain_file('php5.load').with(
-                    content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
-                  )
-                }
-              end
-            end
           when '9'
             context 'on stretch' do
               it { is_expected.to contain_apache__mod('php7.0') }

From e43b9a1ed83786740ed68244e006c7e0ac4dafca Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Mon, 20 Sep 2021 00:54:52 -0400
Subject: [PATCH 1848/2267] Add virtual docroot default

---
 manifests/vhost.pp           | 2 ++
 templates/vhost/_docroot.erb | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ad11da04dd..22155d414b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1746,6 +1746,7 @@
   Variant[Boolean,String] $docroot,
   $manage_docroot                                                                   = true,
   $virtual_docroot                                                                  = false,
+  $virtual_use_default_docroot                                                      = false,
   $port                                                                             = undef,
   $ip                                                                               = undef,
   Boolean $ip_based                                                                 = false,
@@ -2429,6 +2430,7 @@
 
   # Template uses:
   # - $virtual_docroot
+  # - $virtual_use_default_docroot
   # - $docroot
   if $docroot {
     concat::fragment { "${name}-docroot":
diff --git a/templates/vhost/_docroot.erb b/templates/vhost/_docroot.erb
index b67998b4b4..1ec495fe24 100644
--- a/templates/vhost/_docroot.erb
+++ b/templates/vhost/_docroot.erb
@@ -2,6 +2,7 @@
   ## Vhost docroot
 <% if @virtual_docroot -%>
   VirtualDocumentRoot "<%= @virtual_docroot %>"
-<% elsif @docroot -%>
+<% end -%>
+<% if @docroot and ((not @virtual_docroot) or @virtual_use_default_docroot) -%>
   DocumentRoot "<%= @docroot %>"
 <% end -%>

From 7005622d0e1e5a9e1af032985db1e8b6485b6a41 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Mon, 20 Sep 2021 01:58:45 -0400
Subject: [PATCH 1849/2267] Add tests

---
 spec/defines/vhost_spec.rb | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 28291f80bc..a583ac44be 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -58,6 +58,7 @@
               'docroot'                     => '/var/www/foo',
               'manage_docroot'              => false,
               'virtual_docroot'             => true,
+              'virtual_use_default_docroot' => false,
               'port'                        => '8080',
               'ip'                          => '127.0.0.1',
               'ip_based'                    => true,
@@ -1747,6 +1748,44 @@
           it { is_expected.not_to contain_concat__fragment('NameVirtualHost *:80') }
         end
 
+        context 'vhost with backwards compatible virtual_docroot' do
+          let :params do
+            {
+              'docroot'         => '/var/www/html',
+              'virtual_docroot' => '/var/www/sites/%0',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
+              content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$},
+            )
+            is_expected.not_to contain_concat__fragment('rspec.example.com-docroot').with(
+              content: %r{^\s+DocumentRoot "/var/www/html"$},
+            )
+          }
+        end
+        context 'vhost with virtual_docroot and docroot' do
+          let :params do
+            {
+              'docroot'                     => '/var/www/html',
+              'virtual_use_default_docroot' => true,
+              'virtual_docroot'             => '/var/www/sites/%0',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
+              content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$},
+            )
+            is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
+              content: %r{^\s+DocumentRoot "/var/www/html"$},
+            )
+          }
+        end
+
         context 'modsec_audit_log' do
           let :params do
             {

From ddfb1612635b22c2e95e29deb75850e95a48676d Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Mon, 20 Sep 2021 09:57:47 -0400
Subject: [PATCH 1850/2267] Add documentation

---
 REFERENCE.md       | 22 ++++++++++++++++++++++
 manifests/vhost.pp | 16 ++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/REFERENCE.md b/REFERENCE.md
index 2676490d54..6da74ba9c3 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -7756,6 +7756,7 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`suphp_engine`](#suphp_engine)
 * [`vhost_name`](#vhost_name)
 * [`virtual_docroot`](#virtual_docroot)
+* [`virtual_use_default_docroot`](#virtual_use_default_docroot)
 * [`wsgi_daemon_process`](#wsgi_daemon_process)
 * [`wsgi_daemon_process_options`](#wsgi_daemon_process_options)
 * [`wsgi_application_group`](#wsgi_application_group)
@@ -9957,6 +9958,8 @@ Data type: `Any`
 
 Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the
 same name. For example, `http://example.com` would map to `/var/www/example.com`.
+Note that the `DocumentRoot` directive will not be present even though there is a value
+set for `docroot` in the manifest. See [`virtual_use_default_docroot`](#virtual_use_default_docroot) to change this behavior.
 ``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
@@ -9969,6 +9972,25 @@ apache::vhost { 'subdomain.loc':
 
 Default value: ``false``
 
+##### <a name="virtual_use_default_docroot"></a>`virtual_use_default_docroot`
+
+Data type: `Any`
+
+By default, when using `virtual_docroot`, the value of `docroot` is ignored. Setting this
+to `true` will mean both directives will be added to the configuration.
+``` puppet
+apache::vhost { 'subdomain.loc':
+  vhost_name                  => '*',
+  port                        => '80',
+  virtual_docroot             => '/var/www/%-2+',
+  docroot                     => '/var/www',
+  virtual_use_default_docroot => true,
+  serveraliases               => ['*.loc',],
+}
+```
+
+Default value: ``false``
+
 ##### <a name="wsgi_daemon_process"></a>`wsgi_daemon_process`
 
 Data type: `Optional[Variant[String,Hash]]`
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 22155d414b..b5604dd267 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1221,6 +1221,8 @@
 # @param virtual_docroot
 #   Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the 
 #   same name. For example, `http://example.com` would map to `/var/www/example.com`.
+#   Note that the `DocumentRoot` directive will not be present even though there is a value
+#   set for `docroot` in the manifest. See [`virtual_use_default_docroot`](#virtual_use_default_docroot) to change this behavior.
 #   ``` puppet
 #   apache::vhost { 'subdomain.loc':
 #     vhost_name      => '*',
@@ -1231,6 +1233,20 @@
 #   }
 #   ```
 # 
+# @param virtual_use_default_docroot
+#   By default, when using `virtual_docroot`, the value of `docroot` is ignored. Setting this
+#   to `true` will mean both directives will be added to the configuration.
+#   ``` puppet
+#   apache::vhost { 'subdomain.loc':
+#     vhost_name                  => '*',
+#     port                        => '80',
+#     virtual_docroot             => '/var/www/%-2+',
+#     docroot                     => '/var/www',
+#     virtual_use_default_docroot => true,
+#     serveraliases               => ['*.loc',],
+#   }
+#   ```
+#
 # @param wsgi_daemon_process
 #   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 #   wsgi_daemon_process_options, wsgi_process_group, 

From c1dbcd4df962c48c5e03bbd9b2fa8eec8f880e36 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Mon, 20 Sep 2021 10:07:17 -0400
Subject: [PATCH 1851/2267] Fix tests

---
 spec/defines/vhost_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index a583ac44be..730e9e0bfa 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1761,6 +1761,8 @@
             is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$},
             )
+          }
+          it {
             is_expected.not_to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+DocumentRoot "/var/www/html"$},
             )
@@ -1780,6 +1782,8 @@
             is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$},
             )
+          }
+          it {
             is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+DocumentRoot "/var/www/html"$},
             )

From 1811414e3d408aede789e449ec39fc1230a503b9 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Tue, 28 Sep 2021 10:32:50 +0100
Subject: [PATCH 1852/2267] (IAC-1751) - Add Support for Rocky 8

---
 metadata.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/metadata.json b/metadata.json
index 56c16b769b..cb0506cfa5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -70,6 +70,12 @@
         "18.04",
         "20.04"
       ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8"
+      ]
     }
   ],
   "requirements": [

From d3df050e01b4b0992e891c545aaf33127bc3d58f Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Tue, 28 Sep 2021 16:26:57 +0100
Subject: [PATCH 1853/2267] (IAC-1758) Update tests for Rocky

---
 spec/classes/mod/fastcgi_spec.rb | 2 +-
 spec/classes/mod/php_spec.rb     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 702ed0603e..05cba06dee 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -17,7 +17,7 @@
           it { is_expected.to contain_apache__mod('fastcgi') }
           it { is_expected.to contain_package('libapache2-mod-fastcgi') }
           it { is_expected.to contain_file('fastcgi.conf') }
-        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific'
+        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'Rocky'
           if facts[:os]['release']['major'].to_i < 7
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_class('apache::params') }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index a954e56ba6..9956e52428 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -234,7 +234,8 @@
       next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
               (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
               (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
-              (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS'))
+              (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
+                                                            facts[:os]['name'] == 'Rocky'))
 
       describe 'OS independent tests' do
         context 'with content param' do

From 5c496f9a61bbd086c59e2b00dd480d5d02829e9d Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Mon, 4 Oct 2021 12:54:36 +0100
Subject: [PATCH 1854/2267] (maint) - Remove .travis.yml

File should have been removed before now. Just doing a quick clean.
---
 .travis.yml | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 9381ad15cd..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-os: linux
-dist: xenial
-language: ruby
-cache: bundler
-before_install:
-  - bundle -v
-  - rm -f Gemfile.lock
-  - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
-  - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
-  - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
-  - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
-  - gem --version
-  - bundle -v
-script:
-  - 'bundle exec rake $CHECK'
-bundler_args: --without system_tests
-rvm:
-  - 2.5.7
-stages:
-  - static
-  - spec
-  - acceptance
-  -
-    if: tag =~ ^v\d
-    name: deploy
-jobs:
-  fast_finish: true
-  include:
-    -
-      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
-      stage: static
-    -
-      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.7
-      stage: spec
-    -
-      env: DEPLOY_TO_FORGE=yes
-      stage: deploy
-branches:
-  only:
-    - main
-    - /^v\d/
-notifications:
-  email: false

From 1612f700ccc0418f460bc63e7e2fa55aa9794ca7 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Mon, 11 Oct 2021 13:57:22 +0000
Subject: [PATCH 1855/2267] Release prep v7.0.0

---
 CHANGELOG.md  | 26 +++++++++++++++++++++++++-
 REFERENCE.md  |  2 +-
 metadata.json |  2 +-
 pdk.yaml      |  2 ++
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 pdk.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90139bc9b5..7ee7a7855b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v7.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v7.0.0) (2021-10-11)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.1...v7.0.0)
+
+### Changed
+
+- Drop Debian \< 8 and Ubuntu \< 14.04 code [\#2189](https://github.com/puppetlabs/puppetlabs-apache/pull/2189) ([ekohl](https://github.com/ekohl))
+- Drop support and compatibility for Debian \< 9 and Ubuntu \< 16.04 [\#2123](https://github.com/puppetlabs/puppetlabs-apache/pull/2123) ([ekohl](https://github.com/ekohl))
+
+### Added
+
+- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#2196](https://github.com/puppetlabs/puppetlabs-apache/pull/2196) ([david22swan](https://github.com/david22swan))
+- Allow `docroot` with `mod_vhost_alias` `virtual_docroot` [\#2195](https://github.com/puppetlabs/puppetlabs-apache/pull/2195) ([yakatz](https://github.com/yakatz))
+
+### Fixed
+
+- Restore Ubuntu 14.04 support in suphp [\#2193](https://github.com/puppetlabs/puppetlabs-apache/pull/2193) ([ekohl](https://github.com/ekohl))
+- add double quote on scope parameter [\#2191](https://github.com/puppetlabs/puppetlabs-apache/pull/2191) ([aba-rechsteiner](https://github.com/aba-rechsteiner))
+- Debian 11: fix typo in `versioncmp()` / set default php to 7.4 [\#2186](https://github.com/puppetlabs/puppetlabs-apache/pull/2186) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v6.5.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.1) (2021-08-25)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.0...v6.5.1)
@@ -39,7 +59,7 @@ All notable changes to this project will be documented in this file. The format
 
 ## [v6.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.0) (2021-06-22)
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.2.0...v6.3.0)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/kps_ssl_reload_and_cache_disk_combined_tag...v6.3.0)
 
 ### Added
 
@@ -50,6 +70,10 @@ All notable changes to this project will be documented in this file. The format
 - Update the default version of Apache for Amazon Linux 2 [\#2158](https://github.com/puppetlabs/puppetlabs-apache/pull/2158) ([turnopil](https://github.com/turnopil))
 - Only warn about servername logging if relevant [\#2154](https://github.com/puppetlabs/puppetlabs-apache/pull/2154) ([ekohl](https://github.com/ekohl))
 
+## [kps_ssl_reload_and_cache_disk_combined_tag](https://github.com/puppetlabs/puppetlabs-apache/tree/kps_ssl_reload_and_cache_disk_combined_tag) (2021-06-14)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.2.0...kps_ssl_reload_and_cache_disk_combined_tag)
+
 ## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) (2021-05-24)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.1.0...v6.2.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 6da74ba9c3..9d67586398 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1167,7 +1167,7 @@ Default value: `$apache::params::mime_types_additional`
 
 The libraries installed depends on the `dev_packages` parameter of the `apache::params`
 class, based on your operating system:
-- **Debian** : `libaprutil1-dev`, `libapr1-dev`; `apache2-dev` on Ubuntu 13.10 and Debian 8; `apache2-prefork-dev` on other versions.
+- **Debian** : `libaprutil1-dev`, `libapr1-dev`; `apache2-dev`
 - **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
 - **Gentoo**: `undef`.
 - **Red Hat**: `httpd-devel`.
diff --git a/metadata.json b/metadata.json
index cb0506cfa5..29255598ea 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.5.1",
+  "version": "7.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
diff --git a/pdk.yaml b/pdk.yaml
new file mode 100644
index 0000000000..4bef4bd0f9
--- /dev/null
+++ b/pdk.yaml
@@ -0,0 +1,2 @@
+---
+ignore: []

From 98de4f4c214bd7dd6f569df5b698c7448d0a7b49 Mon Sep 17 00:00:00 2001
From: Stevan Vanderwerf <github@vanderling.com>
Date: Mon, 18 Oct 2021 19:24:24 -0500
Subject: [PATCH 1856/2267] fixed broken links

---
 README.md | 211 ++++++++++++++++++++++++++----------------------------
 1 file changed, 100 insertions(+), 111 deletions(-)

diff --git a/README.md b/README.md
index 481cda31b8..1ba7e3d8f3 100755
--- a/README.md
+++ b/README.md
@@ -23,60 +23,58 @@
 [Limitations]: #limitations
 
 [Development]: #development
-[Contributing]: #contributing
 
 [`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
-[`add_listen`]: #add_listen
+[`add_listen`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#add_listen
 [`Alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#alias
 [`AliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#aliasmatch
 [aliased servers]: https://httpd.apache.org/docs/current/urlmapping.html
 [`AllowEncodedSlashes`]: https://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes
-[`apache`]: #class-apache
-[`apache_version`]: #apache_version
-[`apache::balancer`]: #defined-type-apachebalancer
-[`apache::balancermember`]: #defined-type-apachebalancermember
-[`apache::fastcgi::server`]: #defined-type-apachefastcgiserver
-[`apache::mod`]: #defined-type-apachemod
-[`apache::mod::<MODULE NAME>`]: #classes-apachemodmodule-name
-[`apache::mod::alias`]: #class-apachemodalias
-[`apache::mod::auth_cas`]: #class-apachemodauth_cas
-[`apache::mod::auth_mellon`]: #class-apachemodauth_mellon
-[`apache::mod::authn_dbd`]: #class-apachemodauthn_dbd
-[`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap
-[`apache::mod::cluster`]: #class-apachemodcluster
-[`apache::mod::data]: #class-apachemoddata
-[`apache::mod::disk_cache`]: #class-apachemoddisk_cache
-[`apache::mod::dumpio`]: #class-apachemoddumpio
-[`apache::mod::event`]: #class-apachemodevent
-[`apache::mod::ext_filter`]: #class-apachemodext_filter
-[`apache::mod::geoip`]: #class-apachemodgeoip
-[`apache::mod::http2`]: #class-apachemodhttp2
-[`apache::mod::itk`]: #class-apachemoditk
-[`apache::mod::jk`]: #class-apachemodjk
-[`apache::mod::ldap`]: #class-apachemodldap
-[`apache::mod::passenger`]: #class-apachemodpassenger
-[`apache::mod::peruser`]: #class-apachemodperuser
-[`apache::mod::prefork`]: #class-apachemodprefork
-[`apache::mod::proxy`]: #class-apachemodproxy
-[`apache::mod::proxy_balancer`]: #class-apachemodproxybalancer
-[`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi
-[`apache::mod::proxy_html`]: #class-apachemodproxy_html
-[`apache::mod::python`]: #class-apachemodpython
-[`apache::mod::security`]: #class-apachemodsecurity
-[`apache::mod::shib`]: #class-apachemodshib
-[`apache::mod::ssl`]: #class-apachemodssl
-[`apache::mod::status`]: #class-apachemodstatus
-[`apache::mod::userdir`]: #class-apachemoduserdir
-[`apache::mod::worker`]: #class-apachemodworker
-[`apache::mod::wsgi`]: #class-apachemodwsgi
-[`apache::params`]: #class-apacheparams
-[`apache::version`]: #class-apacheversion
-[`apache::vhost`]: #defined-type-apachevhost
-[`apache::vhost::custom`]: #defined-type-apachevhostcustom
-[`apache::vhost::WSGIImportScript`]: #wsgiimportscript
+[`apache`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apache
+[`apache_version`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apache_version
+[`apache::balancer`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancer
+[`apache::balancermember`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancermember
+[`apache::fastcgi::server`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachefastcgiserver
+[`apache::mod`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemod
+[`apache::mod::<MODULE NAME>`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#public-classes
+[`apache::mod::alias`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodalias
+[`apache::mod::auth_cas`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauth_cas
+[`apache::mod::auth_mellon`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauth_mellon
+[`apache::mod::authn_dbd`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauthn_dbd
+[`apache::mod::authnz_ldap`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauthnz_ldap
+[`apache::mod::cluster`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodcluster
+[`apache::mod::data]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoddata
+[`apache::mod::disk_cache`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoddisk_cache
+[`apache::mod::dumpio`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoddumpio
+[`apache::mod::event`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodevent
+[`apache::mod::ext_filter`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodext_filter
+[`apache::mod::geoip`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodgeoip
+[`apache::mod::http2`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodhttp2
+[`apache::mod::itk`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoditk
+[`apache::mod::jk`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodjk
+[`apache::mod::ldap`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodldap
+[`apache::mod::passenger`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodpassenger
+[`apache::mod::peruser`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodperuser
+[`apache::mod::prefork`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodprefork
+[`apache::mod::proxy`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodproxy
+[`apache::mod::proxy_balancer`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodproxybalancer
+[`apache::mod::proxy_fcgi`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodproxy_fcgi
+[`apache::mod::proxy_html`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodproxy_html
+[`apache::mod::python`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodpython
+[`apache::mod::security`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodsecurity
+[`apache::mod::shib`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodshib
+[`apache::mod::ssl`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodssl
+[`apache::mod::status`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodstatus
+[`apache::mod::userdir`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoduserdir
+[`apache::mod::worker`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodworker
+[`apache::mod::wsgi`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodwsgi
+[`apache::params`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#private-classes
+[`apache::version`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#private-classes
+[`apache::vhost`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachevhost
+[`apache::vhost::custom`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachevhostcustom
 [Apache HTTP Server]: https://httpd.apache.org
 [Apache modules]: https://httpd.apache.org/docs/current/mod/
-[array]: https://docs.puppet.com/puppet/latest/reference/lang_data_array.html
+[array]: https://docs.puppet.com/puppet/latest/lang_data_array.html
 
 [audit log]: https://github.com/SpiderLabs/ModSecurity/wiki/ModSecurity-2-Data-Formats#audit-log
 
@@ -85,31 +83,28 @@
 [certificate revocation list]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationfile
 [certificate revocation list path]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationpath
 [common gateway interface]: https://httpd.apache.org/docs/current/howto/cgi.html
-[`confd_dir`]: #confd_dir
-[`content`]: #content
-[CONTRIBUTING.md]: CONTRIBUTING.md
+[`conf_dir`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#conf_dir
 [custom error documents]: https://httpd.apache.org/docs/current/custom-error.html
-[`custom_fragment`]: #custom_fragment
-
-[`default_mods`]: #default_mods
-[`default_ssl_crl`]: #default_ssl_crl
-[`default_ssl_crl_path`]: #default_ssl_crl_path
-[`default_ssl_vhost`]: #default_ssl_vhost
-[`dev_packages`]: #dev_packages
-[`directory`]: #directory
-[`directories`]: #parameter-directories-for-apachevhost
+[`custom_fragment`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#custom_fragment
+
+[`default_mods`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#default_mods
+[`default_ssl_crl`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#default_ssl_crl
+[`default_ssl_crl_path`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#default_ssl_crl_path
+[`default_ssl_vhost`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#default_ssl_vhost
+[`dev_packages`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#dev_packages
+[`directories`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#directories
 [`DirectoryIndex`]: https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
-[`docroot`]: #docroot
-[`docroot_owner`]: #docroot_owner
-[`docroot_group`]: #docroot_group
+[`docroot`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#docroot
+[`docroot_owner`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#docroot_owner
+[`docroot_group`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#docroot_group
 [`DocumentRoot`]: https://httpd.apache.org/docs/current/mod/core.html#documentroot
 
 [`EnableSendfile`]: https://httpd.apache.org/docs/current/mod/core.html#enablesendfile
 [enforcing mode]: http://selinuxproject.org/page/Guide/Mode
 [`ensure`]: https://docs.puppet.com/latest/type.html#package-attribute-ensure
-[`error_log_file`]: #error_log_file
-[`error_log_syslog`]: #error_log_syslog
-[`error_log_pipe`]: #error_log_pipe
+[`error_log_file`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#error_log_file
+[`error_log_syslog`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#error_log_syslog
+[`error_log_pipe`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#error_log_pipe
 [`ExpiresByType`]: https://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype
 [exported resources]: http://docs.puppet.com/latest/reference/lang_exported.md
 [`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus
@@ -117,48 +112,44 @@
 [Facter]: http://docs.puppet.com/facter/
 [FastCGI]: http://www.fastcgi.com/
 [FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
-[`fallbackresource`]: #fallbackresource
+[`fallbackresource`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#fallbackresource
 [`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag
 [filter rules]: https://httpd.apache.org/docs/current/filter.html
-[`filters`]: #filters
+[`filters`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#filters
 [`ForceType`]: https://httpd.apache.org/docs/current/mod/core.html#forcetype
 
 [GeoIPScanProxyHeaders]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives
 [`gentoo/puppet-portage`]: https://github.com/gentoo/puppet-portage
 
-[Hash]: https://docs.puppet.com/puppet/latest/reference/lang_data_hash.html
+[Hash]: https://docs.puppet.com/puppet/latest/lang_data_hash.html
 [`HttpProtocolOptions`]: http://httpd.apache.org/docs/current/mod/core.html#httpprotocoloptions
 
 [IAC Team]: https://puppetlabs.github.io/iac/
 [`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional
 [`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include
 [interval syntax]: https://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn
-[`ip`]: #ip
-[`ip_based`]: #ip_based
+[`ip`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ip
+[`ip_based`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ip_based
 [IP-based virtual hosts]: https://httpd.apache.org/docs/current/vhosts/ip-based.html
 
-[`KeepAlive`]: https://httpd.apache.org/docs/current/mod/core.html#keepalive
-[`KeepAliveTimeout`]: https://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout
-[`keepalive` parameter]: #keepalive
-[`keepalive_timeout`]: #keepalive_timeout
 [`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize
 [`limitreqfields`]: http://httpd.apache.org/docs/current/mod/core.html#limitrequestfields
 
-[`lib`]: #lib
-[`lib_path`]: #lib_path
+[`lib`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#lib
+[`lib_path`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#lib_path
 [`Listen`]: https://httpd.apache.org/docs/current/bind.html
 [`ListenBackLog`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#listenbacklog
 [`LoadFile`]: https://httpd.apache.org/docs/current/mod/mod_so.html#loadfile
 [`LogFormat`]: https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat
-[`logroot`]: #logroot
+[`logroot`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#logroot
 [Log security]: https://httpd.apache.org/docs/current/logs.html#security
 
-[`manage_docroot`]: #manage_docroot
-[`manage_user`]: #manage_user
-[`manage_group`]: #manage_group
-[`supplementary_groups`]: #supplementary_groups
+[`manage_docroot`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#manage_docroot
+[`manage_user`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#manage_user
+[`manage_group`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#manage_group
+[`supplementary_groups`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#supplementary_groups
 [`MaxConnectionsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild
-[`max_keepalive_requests`]: #max_keepalive_requests
+[`max_keepalive_requests`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#max_keepalive_requests
 [`MaxRequestWorkers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxrequestworkers
 [`MaxSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxsparethreads
 [MIME `content-type`]: https://www.iana.org/assignments/media-types/media-types.xhtml
@@ -197,65 +188,64 @@
 [`mod_version`]: https://httpd.apache.org/docs/current/mod/mod_version.html
 [`mod_wsgi`]: https://modwsgi.readthedocs.org/en/latest/
 [module contribution guide]: https://docs.puppet.com/forge/contributing.html
-[`mpm_module`]: #mpm_module
+[`mpm_module`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#mpm_module
 [multi-processing module]: https://httpd.apache.org/docs/current/mpm.html
 
 [name-based virtual hosts]: https://httpd.apache.org/docs/current/vhosts/name-based.html
-[`no_proxy_uris`]: #no_proxy_uris
+[`no_proxy_uris`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#no_proxy_uris
 
 [open source Puppet]: https://docs.puppet.com/puppet/
 [`Options`]: https://httpd.apache.org/docs/current/mod/core.html#options
 
-[`path`]: #path
+[`path`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#path
 [`Peruser`]: https://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr
-[`port`]: #port
-[`priority`]: #defined-types-apachevhost
-[`proxy_dest`]: #proxy_dest
-[`proxy_dest_match`]: #proxy_dest_match
-[`proxy_pass`]: #proxy_pass
+[`port`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#port-3
+[`priority`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#priority
+[`proxy_dest`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#proxy_dest
+[`proxy_dest_match`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#proxy_dest_match
+[`proxy_pass`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#proxy_pass
 [`ProxyPass`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass
 [`ProxySet`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset
 [Puppet Enterprise]: https://docs.puppet.com/pe/
 [Puppet Forge]: https://forge.puppet.com
 [Puppet]: https://puppet.com
-[Puppet module]: https://docs.puppet.com/puppet/latest/reference/modules_fundamentals.html
+[Puppet module]: https://docs.puppet.com/puppet/latest/modules_fundamentals.html
 [Puppet module's code]: https://github.com/puppetlabs/puppetlabs-apache/blob/main/manifests/default_mods.pp
-[`purge_configs`]: #purge_configs
-[`purge_vhost_dir`]: #purge_vhost_dir
+[`purge_configs`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#purge_configs
+[`purge_vhost_dir`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#purge_vhost_dir
 [Python]: https://www.python.org/
 
 [Rack]: http://rack.github.io/
-[`rack_base_uris`]: #rack_base_uris
+[`rack_base_uris`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#rack_base_uris
 [RFC 2616]: https://www.ietf.org/rfc/rfc2616.txt
 [`RequestReadTimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html#requestreadtimeout
 [rspec-puppet]: http://rspec-puppet.com/
 
 [`ScriptAlias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptalias
 [`ScriptAliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptaliasmatch
-[`scriptalias`]: #scriptalias
+[`scriptalias`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#scriptalias
 [SELinux]: http://selinuxproject.org/
 [`ServerAdmin`]: https://httpd.apache.org/docs/current/mod/core.html#serveradmin
-[`serveraliases`]: #serveraliases
+[`serveraliases`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#serveraliases
 [`ServerLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#serverlimit
 [`ServerName`]: https://httpd.apache.org/docs/current/mod/core.html#servername
 [`ServerRoot`]: https://httpd.apache.org/docs/current/mod/core.html#serverroot
 [`ServerTokens`]: https://httpd.apache.org/docs/current/mod/core.html#servertokens
 [`ServerSignature`]: https://httpd.apache.org/docs/current/mod/core.html#serversignature
 [Service attribute restart]: http://docs.puppet.com/latest/type.html#service-attribute-restart
-[`source`]: #source
 [`SSLCARevocationCheck`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck
 [SSL certificate key file]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile
 [SSL chain]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatechainfile
 [SSL encryption]: https://httpd.apache.org/docs/current/ssl/index.html
-[`ssl`]: #ssl
-[`ssl_cert`]: #ssl_cert
-[`ssl_compression`]: #ssl_compression
-[`ssl_key`]: #ssl_key
+[`ssl`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl
+[`ssl_cert`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_cert
+[`ssl_compression`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_compression
+[`ssl_key`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_key
 [`StartServers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#startservers
 [suPHP]: http://www.suphp.org/Home.html
-[`suphp_addhandler`]: #suphp_addhandler
-[`suphp_configpath`]: #suphp_configpath
-[`suphp_engine`]: #suphp_engine
+[`suphp_addhandler`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#suphp_addhandler
+[`suphp_configpath`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#suphp_configpath
+[`suphp_engine`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#suphp_engine
 [supported operating system]: https://forge.puppet.com/supported#puppet-supported-modules-compatibility-matrix
 
 [`ThreadLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit
@@ -266,10 +256,10 @@
 
 [`UseCanonicalName`]: https://httpd.apache.org/docs/current/mod/core.html#usecanonicalname
 
-[`verify_config`]: #verify_config
-[`vhost`]: #defined-type-apachevhost
-[`vhost_dir`]: #vhost_dir
-[`virtual_docroot`]: #virtual_docroot
+[`verify_config`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#verify_config
+[`vhost`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachevhost
+[`vhost_dir`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#vhost_dir
+[`virtual_docroot`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#virtual_docroot
 
 [Web Server Gateway Interface]: https://www.python.org/dev/peps/pep-3333/#abstract
 [`WSGIRestrictEmbedded`]: http://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIRestrictEmbedded.html
@@ -291,7 +281,6 @@
 4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
 5. [Limitations - OS compatibility, etc.][Limitations]
 6. [Development - Guide for contributing to the module][Development]
-    - [Contributing to the apache module][Contributing]
     
 <a id="module-description"></a>
 ## Module description
@@ -329,8 +318,8 @@ class { 'apache': }
 
 When you declare this class with the default options, the module:
 
-- Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system.
-- Places the required configuration files in a directory, with the [default location](#conf_dir) Depends on operating system.
+- Installs the appropriate Apache software package and [required Apache modules][`default_mods`] for your operating system.
+- Places the required configuration files in a directory, with the [default location][`conf_dir`] Depends on operating system.
 - Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
 - Creates a document root directory Depends on operating system, typically `/var/www`.
 - Starts the Apache service.
@@ -521,7 +510,7 @@ To set up a virtual host with [suPHP][], use the following parameters:
 * [`suphp_engine`][], to enable the suPHP engine.
 * [`suphp_addhandler`][], to define a MIME type.
 * [`suphp_configpath`][], to set which path suPHP passes to the PHP interpreter.
-* [`directory`][], to configure Directory, File, and Location directive blocks.
+* [`directories`][], to configure Directory, File, and Location directive blocks.
 
 For example:
 

From e8b136389dd0026a1cf6f5c445e1671a579fc02f Mon Sep 17 00:00:00 2001
From: Stevan Vanderwerf <github@vanderling.com>
Date: Mon, 18 Oct 2021 20:13:23 -0500
Subject: [PATCH 1857/2267] fixing broken links second pass

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1ba7e3d8f3..68083eb6de 100755
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@
 [`apache::mod::shib`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodshib
 [`apache::mod::ssl`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodssl
 [`apache::mod::status`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodstatus
+[`apache::mod::suphp`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodsuphp
 [`apache::mod::userdir`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoduserdir
 [`apache::mod::worker`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodworker
 [`apache::mod::wsgi`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodwsgi
@@ -106,11 +107,11 @@
 [`error_log_syslog`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#error_log_syslog
 [`error_log_pipe`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#error_log_pipe
 [`ExpiresByType`]: https://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype
-[exported resources]: http://docs.puppet.com/latest/reference/lang_exported.md
+[exported resources]: https://puppet.com/docs/puppet/latest/lang_exported.html
 [`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus
 
 [Facter]: http://docs.puppet.com/facter/
-[FastCGI]: http://www.fastcgi.com/
+[FastCGI]: https://fast-cgi.github.io/
 [FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
 [`fallbackresource`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#fallbackresource
 [`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag
@@ -205,7 +206,7 @@
 [`proxy_dest_match`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#proxy_dest_match
 [`proxy_pass`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#proxy_pass
 [`ProxyPass`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass
-[`ProxySet`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset
+[`proxy_set`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset
 [Puppet Enterprise]: https://docs.puppet.com/pe/
 [Puppet Forge]: https://forge.puppet.com
 [Puppet]: https://puppet.com
@@ -216,7 +217,7 @@
 [Python]: https://www.python.org/
 
 [Rack]: http://rack.github.io/
-[`rack_base_uris`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#rack_base_uris
+[`rack_base_uri`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#rack_base_uri
 [RFC 2616]: https://www.ietf.org/rfc/rfc2616.txt
 [`RequestReadTimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html#requestreadtimeout
 [rspec-puppet]: http://rspec-puppet.com/
@@ -577,13 +578,13 @@ apache::vhost { 'cgi.example.com':
 }
 ```
 
-To configure a virtual host for [Rack][], use the [`rack_base_uris`][] parameter:
+To configure a virtual host for [Rack][], use the [`rack_base_uri`][] parameter:
 
 ``` puppet
 apache::vhost { 'rack.example.com':
   port           => '80',
   docroot        => '/var/www/rack',
-  rack_base_uris => ['/rackapp1', '/rackapp2'],
+  rack_base_uri => ['/rackapp1', '/rackapp2'],
 }
 ```
 
@@ -845,7 +846,7 @@ The [`apache::mod::passenger`][] class is not installing, because the EL6 reposi
 
 #### RHEL/CentOS 7
 
-The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested because the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uris`][] parameter.
+The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested because the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uri`][] parameter.
 
 ### SELinux and custom paths
 
@@ -926,8 +927,7 @@ COVERAGE=yes bundle exec rake parallel_spec
 
 
 Acceptance tests for this module leverage [puppet_litmus](https://github.com/puppetlabs/puppet_litmus).
-To run the acceptance tests follow the instructions [here](https://github.com/puppetlabs/puppet_litmus/wiki/Tutorial:-use-Litmus-to-execute-acceptance-tests-with-a-sample-module-(MoTD)#install-the-necessary-gems-for-the-module).
-You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
+To run the acceptance tests follow the instructions [here](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html). You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
 
 ### Development Support
 If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://tickets.puppetlabs.com/browse/MODULES/).

From 49849a6c1f93a7158b4ba2d07c54cb5f259e229a Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Tue, 5 Oct 2021 16:24:03 +0100
Subject: [PATCH 1858/2267] (IAC-1752) - Add Support for AlmaLinux 8

---
 metadata.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/metadata.json b/metadata.json
index 29255598ea..0358869470 100644
--- a/metadata.json
+++ b/metadata.json
@@ -76,6 +76,12 @@
       "operatingsystemrelease": [
         "8"
       ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8"
+      ]
     }
   ],
   "requirements": [

From d89ace6b6f22102549f4cf0acb490c943fab5da7 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 6 Oct 2021 10:46:05 +0100
Subject: [PATCH 1859/2267] (IAC-1752) Update test for AlmaLinux

---
 spec/classes/mod/fastcgi_spec.rb | 2 +-
 spec/classes/mod/php_spec.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 05cba06dee..4cd6c9c419 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -17,7 +17,7 @@
           it { is_expected.to contain_apache__mod('fastcgi') }
           it { is_expected.to contain_package('libapache2-mod-fastcgi') }
           it { is_expected.to contain_file('fastcgi.conf') }
-        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'Rocky'
+        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'Rocky', 'AlmaLinux'
           if facts[:os]['release']['major'].to_i < 7
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_class('apache::params') }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 9956e52428..b0c4b6d8c1 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -235,7 +235,7 @@
               (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
               (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
               (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
-                                                            facts[:os]['name'] == 'Rocky'))
+                                                            facts[:os]['name'] == 'Rocky'  || facts[:os]['name'] == 'AlmaLinux'))
 
       describe 'OS independent tests' do
         context 'with content param' do

From 4ef464779d67d85750518c6bc5f31c9c6725f180 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Mon, 1 Nov 2021 14:39:05 +0000
Subject: [PATCH 1860/2267] (IAC-1753) Update test setup

---
 spec/spec_helper_acceptance_local.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index f8995a21f0..8854b746f2 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -75,6 +75,10 @@ class { 'epel': }
 
     # Ensure ipv6 is enabled on our Debian 11 Docker boxes
     LitmusHelper.instance.run_shell('sysctl -w net.ipv6.conf.all.disable_ipv6=0') if %r{debian}.match?(os[:family]) && os[:release].to_f == 11
+
+    # Install iproute on AlmaLinux
+    # Package is used to check if ports are listening
+    LitmusHelper.instance.run_shell('sudo dnf install iproute -y') if %r{redhat}.match?(os[:family]) && os[:release].to_f >= 8
   end
 
   c.after :suite do

From bc75bea14695f1f3c721549a867f6db331a5913b Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <kenyon@kenyonralph.com>
Date: Sat, 13 Nov 2021 20:56:39 -0800
Subject: [PATCH 1861/2267] init.pp: fix typo in purge_vdir documentation

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 26ded53a77..dfeb745c48 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -433,7 +433,7 @@
 #
 # @param purge_vdir
 #   Removes all other Apache configs and virtual hosts.<br />
-#   > **Note**: This parameter is deprecated in favor of the `purge_config` parameter.<br />
+#   > **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.<br />
 # 
 # @param conf_enabled
 #   Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.

From 143ffaf1673cc3f450f269aa5608a10e7a616cb4 Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames@tamerz.com>
Date: Mon, 20 Dec 2021 12:11:54 +0300
Subject: [PATCH 1862/2267] Show `allow_override` key example in docs

---
 REFERENCE.md       | 5 +++++
 manifests/vhost.pp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/REFERENCE.md b/REFERENCE.md
index 9d67586398..0f40ddfa1a 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -10157,6 +10157,11 @@ apache::vhost { 'files.example.net':
       'provider' => 'files',
       'deny'     => 'from all',
     },
+    { 'path'           => '/var/www/html',
+      'provider'       => 'directory',
+      'options'        => ['-Indexes'],
+      'allow_override' => ['All'],
+    },
   ],
 }
 ```
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b5604dd267..1ad825fa11 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1360,6 +1360,11 @@
 #         'provider' => 'files',
 #         'deny'     => 'from all',
 #       },
+#       { 'path'           => '/var/www/html',
+#         'provider'       => 'directory',
+#         'options'        => ['-Indexes'],
+#         'allow_override' => ['All'],
+#       },
 #     ],
 #   }
 #   ```

From 7267ca1518e6de0b7fbc680b24f562c3cf0cc598 Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <freyermuth@physik.uni-bonn.de>
Date: Tue, 8 Feb 2022 14:03:39 +0100
Subject: [PATCH 1863/2267] mod_auth_gssapi: Add support for GssapiBasicAuth.

This adds support for the GssapiBasicAuth setting
which allows to fall back to basic auth if NEGOTIATE fails.
---
 manifests/vhost.pp          | 1 +
 spec/defines/vhost_spec.rb  | 6 ++++++
 templates/vhost/_gssapi.epp | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1ad825fa11..49c0a83eb4 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1509,6 +1509,7 @@
 #     directories => [
 #       { path   => '/path/to/different/dir',
 #         gssapi => {
+#           basicauth => 'On',
 #           credstore => 'keytab:/foo/bar.keytab',
 #           localname => 'Off',
 #           sslonly   => 'On',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 730e9e0bfa..c92d96b2ef 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -252,6 +252,7 @@
                   'passenger_app_log_file'                              => '/tmp/app.log',
                   'passenger_debugger'                                  => false,
                   'gssapi'                                              => {
+                    'basicauth' => 'On',
                     'credstore' => 'keytab:/foo/bar.keytab',
                     'localname' => 'On',
                     'sslonly'   => 'Off',
@@ -943,6 +944,11 @@
               content: %r{^\s+PassengerDebugger\sOff$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiBasicAuth\sOn$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+GssapiCredStore\skeytab:/foo/bar.keytab$},
diff --git a/templates/vhost/_gssapi.epp b/templates/vhost/_gssapi.epp
index 4f2d9f9114..991c9d51d2 100644
--- a/templates/vhost/_gssapi.epp
+++ b/templates/vhost/_gssapi.epp
@@ -1,10 +1,14 @@
 <%|
   # https://github.com/gssapi/mod_auth_gssapi
+  Optional[Enum['On','Off']] $basicauth = undef,
   Optional[String[1]]        $credstore = undef,
   Optional[Enum['On','Off']] $sslonly   = undef,
   Optional[Enum['On','Off']] $localname = undef,
 |%>
 # mod_auth_gssapi configuration
+<% if $basicauth { -%>
+    GssapiBasicAuth <%= $basicauth %>
+<% } -%>
 <% if $sslonly { -%>
     GssapiSSLonly <%= $sslonly %>
 <% } -%>

From c8a2f246ecd0e862c1c0011d0a243c00f3b96a83 Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <freyermuth@physik.uni-bonn.de>
Date: Tue, 8 Feb 2022 14:56:42 +0100
Subject: [PATCH 1864/2267] mod_auth_gssapi: Improve indentation in
 vhost/_gssapi template.

---
 templates/vhost/_gssapi.epp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_gssapi.epp b/templates/vhost/_gssapi.epp
index 991c9d51d2..789e90595b 100644
--- a/templates/vhost/_gssapi.epp
+++ b/templates/vhost/_gssapi.epp
@@ -5,7 +5,7 @@
   Optional[Enum['On','Off']] $sslonly   = undef,
   Optional[Enum['On','Off']] $localname = undef,
 |%>
-# mod_auth_gssapi configuration
+    # mod_auth_gssapi configuration
 <% if $basicauth { -%>
     GssapiBasicAuth <%= $basicauth %>
 <% } -%>

From 88d04e9d842d254ee01070f92dfe3a8623edc821 Mon Sep 17 00:00:00 2001
From: 22swan <david.swan@puppet.com>
Date: Tue, 8 Feb 2022 15:22:10 +0000
Subject: [PATCH 1865/2267] (IAC-1787) Remove Support for CentOS 6

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 0358869470..0c00d4ad03 100644
--- a/metadata.json
+++ b/metadata.json
@@ -29,7 +29,6 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]

From 58217d98f9a92a492505e246a76e39ace6f1cd01 Mon Sep 17 00:00:00 2001
From: canth1 <calebanthony1@hotmail.com>
Date: Fri, 11 Feb 2022 11:42:52 -0700
Subject: [PATCH 1866/2267] mod_auth_gssapi: Add support for every
 configuration directive

---
 manifests/vhost.pp          |  34 +++++++-
 spec/defines/vhost_spec.rb  | 168 ++++++++++++++++++++++++++++++++++--
 templates/vhost/_gssapi.epp | 137 +++++++++++++++++++++++++----
 3 files changed, 316 insertions(+), 23 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1ad825fa11..d04d267459 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1509,9 +1509,37 @@
 #     directories => [
 #       { path   => '/path/to/different/dir',
 #         gssapi => {
-#           credstore => 'keytab:/foo/bar.keytab',
-#           localname => 'Off',
-#           sslonly   => 'On',
+#           acceptor_name            => '{HOSTNAME}',
+#           allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
+#           basic_auth               => true,
+#           basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
+#           basic_ticket_timeout     => 300,
+#           connection_bound         => true,
+#           cred_store               => {
+#             ccache        => ['/path/to/directory'],
+#             client_keytab => ['/path/to/example.keytab'],
+#             keytab        => ['/path/to/example.keytab'],
+#           },
+#           deleg_ccache_dir         => '/path/to/directory',
+#           deleg_ccache_env_var     => 'KRB5CCNAME',
+#           deleg_ccache_perms       => {
+#             mode => '0600',
+#             uid  => 'example-user',
+#             gid  => 'example-group',
+#           },
+#           deleg_ccache_unique      => true,
+#           impersonate              => true,
+#           local_name               => true,
+#           name_attributes          => 'json',
+#           negotiate_once           => true,
+#           publish_errors           => true,
+#           publish_mech             => true,
+#           required_name_attributes =>	'auth-indicators=high',
+#           session_key              => 'file:/path/to/example.key',
+#           signal_persistent_auth   => true,
+#           ssl_only                 => true,
+#           use_s4u2_proxy           => true,
+#           use_sessions             => true,
 #         }
 #       },
 #     ],
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 730e9e0bfa..45bc4286af 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -252,9 +252,37 @@
                   'passenger_app_log_file'                              => '/tmp/app.log',
                   'passenger_debugger'                                  => false,
                   'gssapi'                                              => {
-                    'credstore' => 'keytab:/foo/bar.keytab',
-                    'localname' => 'On',
-                    'sslonly'   => 'Off',
+                    acceptor_name            => '{HOSTNAME}',
+                    allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
+                    basic_auth               => true,
+                    basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
+                    basic_ticket_timeout     => 300,
+                    connection_bound         => true,
+                    cred_store               => {
+                      ccache        => ['/path/to/directory'],
+                      client_keytab => ['/path/to/example.keytab'],
+                      keytab        => ['/path/to/example.keytab'],
+                    },
+                    deleg_ccache_dir         => '/path/to/directory',
+                    deleg_ccache_env_var     => 'KRB5CCNAME',
+                    deleg_ccache_perms       => {
+                      mode => '0600',
+                      uid  => 'example-user',
+                      gid  => 'example-group',
+                    },
+                    deleg_ccache_unique      => true,
+                    impersonate              => true,
+                    local_name               => true,
+                    name_attributes          => 'json',
+                    negotiate_once           => true,
+                    publish_errors           => true,
+                    publish_mech             => true,
+                    required_name_attributes =>	'auth-indicators=high',
+                    session_key              => 'file:/path/to/example.key',
+                    signal_persistent_auth   => true,
+                    ssl_only                 => true,
+                    use_s4u2_proxy           => true,
+                    use_sessions             => true,
                   },
                 },
                 {
@@ -945,12 +973,92 @@
           }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiCredStore\skeytab:/foo/bar.keytab$},
+              content: %r{^\s+GssapiAcceptorName\s{HOSTNAME}$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiAllowedMech\skrb5$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiAllowedMech\siakerb$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiAllowedMech\sntlmssp$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiBasicAuth\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiBasicAuthMech\skrb5$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiBasicAuthMech\siakerb$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiBasicAuthMech\sntlmssp$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiBasicTicketTimeout\s300$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiConnectionBound\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiCredStore\sccache:FILE:/path/to/directory$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiCredStore\sclient_keytab:/path/to/example\.keytab$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiCredStore\skeytab:/path/to/example\.keytab$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiDelegCcacheDir\s/path/to/directory$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiDelegCcacheEnvVar\sKRB5CCNAME$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiDelegCcachePerms\smode:0600\suid:example-user\sgid:example-group$},
             )
           }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiSSLonly\sOff$},
+              content: %r{^\s+GssapiDelegCcacheUnique\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiImpersonate\sOn$},
             )
           }
           it {
@@ -958,6 +1066,56 @@
               content: %r{^\s+GssapiLocalName\sOn$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiNameAttributes\sjson$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiNegotiateOnce\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiPublishErrors\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiPublishMech\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiRequiredNameAttributes\s"auth-indicators=high"$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiSessionKey\sfile:/path/to/example\.key$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiSignalPersistentAuth\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiSSLonly\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiUseS4U2Proxy\sOn$},
+            )
+          }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiUseSessions\sOn$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+SSLVerifyClient\soptional$},
diff --git a/templates/vhost/_gssapi.epp b/templates/vhost/_gssapi.epp
index 4f2d9f9114..87a755a6b9 100644
--- a/templates/vhost/_gssapi.epp
+++ b/templates/vhost/_gssapi.epp
@@ -1,16 +1,123 @@
-<%|
+<%- |
   # https://github.com/gssapi/mod_auth_gssapi
-  Optional[String[1]]        $credstore = undef,
-  Optional[Enum['On','Off']] $sslonly   = undef,
-  Optional[Enum['On','Off']] $localname = undef,
-|%>
-# mod_auth_gssapi configuration
-<% if $sslonly { -%>
-    GssapiSSLonly <%= $sslonly %>
-<% } -%>
-<% if $localname { -%>
-    GssapiLocalName <%= $localname %>
-<% } -%>
-<% if $credstore { -%>
-    GssapiCredStore <%= $credstore %>
-<% } -%>
+  Optional[Variant[String[1], Enum['{HOSTNAME}']]]        $acceptor_name = undef,
+  Optional[Array[Enum['krb5','iakerb','ntlmssp']]]        $allowed_mech = undef,
+  Optional[Boolean]                                       $basic_auth = undef,
+  Optional[Array[Enum['krb5','iakerb','ntlmssp']]]        $basic_auth_mech = undef,
+  Optional[[Integer[1]]]                                  $basic_ticket_timeout = undef,
+  Optional[Boolean]                                       $connection_bound = undef,
+  Optional[Struct[{
+    Optional['ccache']        => Array[Stdlib::Unixpath],
+    Optional['client_keytab'] => Array[Stdlib::Unixpath],
+    Optional['keytab']        => Array[Stdlib::Unixpath],
+  }]]                                                     $cred_store = undef,
+  Optional[Stdlib::Unixpath]                              $deleg_ccache_dir = undef,
+  Optional[[String[1]]]                                   $deleg_ccache_env_var = undef,
+  Optional[Struct[{
+    'mode' => Stdlib::Filemode,
+    'uid'  => Variant[Integer[1], String[1]],
+    'gid'  => Variant[Integer[1], String[1]],
+  }]]                                                     $deleg_ccache_perms = undef,
+  Optional[Boolean]                                       $deleg_ccache_unique = undef,
+  Optional[Boolean]                                       $impersonate = undef,
+  Optional[Boolean]                                       $local_name = undef,
+  Optional[Variant[String[1], Enum['json']]]              $name_attributes = undef,
+  Optional[Boolean]                                       $negotiate_once = undef,
+  Optional[Boolean]                                       $publish_errors = undef,
+  Optional[Boolean]                                       $publish_mech = undef,
+  Optional[[String[1]]]                                   $required_name_attributes = undef,
+  Optional[[String[1]]]                                   $session_key = undef,
+  Optional[Boolean]                                       $signal_persistent_auth = undef,
+  Optional[Boolean]                                       $ssl_only   = undef,
+  Optional[Boolean]                                       $use_s4u2_proxy = undef,
+  Optional[Boolean]                                       $use_sessions = undef,
+| -%>
+
+    # mod_auth_gssapi configuration
+<%- if $acceptor_name { -%>
+    GssapiAcceptorName <%= $acceptor_name %>
+<%- } -%>
+<%- if $allowed_mech { -%>
+  <%- $allowed_mech.each |$mech| { -%>
+    GssapiAllowedMech <%= $mech %>
+  <%- } -%>
+<%- } -%>
+<%- if $basic_auth { -%>
+    GssapiBasicAuth On
+<%- } -%>
+<%- if $basic_auth_mech { -%>
+<%- $basic_auth_mech.each |$mech| { -%>
+    GssapiBasicAuthMech <%= $mech %>
+<%- } -%>
+<%- } -%>
+<%- if $basic_ticket_timeout { -%>
+    GssapiBasicTicketTimeout <%= $basic_ticket_timeout %>
+<%- } -%>
+<%- if $connection_bound { -%>
+    GssapiConnectionBound On
+<%- } -%>
+<%- if $cred_store { -%>
+  <%- if $cred_store[ccache] { -%>
+    <%- $cred_store[ccache].each |$path| { -%>
+    GssapiCredStore ccache:FILE:<%= $path %>
+    <%- } -%>
+  <%- } -%>
+  <%- if $cred_store[client_keytab] { -%>
+    <%- $cred_store[client_keytab].each |$path| { -%>
+    GssapiCredStore client_keytab:<%= $path %>
+    <%- } -%>
+  <%- } -%>
+  <%- if $cred_store[keytab] { -%>
+    <%- $cred_store[keytab].each |$path| { -%>
+    GssapiCredStore keytab:<%= $path %>
+    <%- } -%>
+  <%- } -%>
+<%- } -%>
+<%- if $deleg_ccache_dir { -%>
+    GssapiDelegCcacheDir <%= $deleg_ccache_dir %>
+<%- } -%>
+<%- if $deleg_ccache_env_var { -%>
+    GssapiDelegCcacheEnvVar <%= $deleg_ccache_env_var %>
+<%- } -%>
+<%- if $deleg_ccache_perms { -%>
+    GssapiDelegCcachePerms mode:<%= $deleg_ccache_perms[mode] %> uid:<%= $deleg_ccache_perms[uid] %> gid:<%= $deleg_ccache_perms[gid] %>
+<%- } -%>
+<%- if $deleg_ccache_unique { -%>
+    GssapiDelegCcacheUnique On
+<%- } -%>
+<%- if $impersonate { -%>
+    GssapiImpersonate On
+<%- } -%>
+<%- if $local_name { -%>
+    GssapiLocalName On
+<%- } -%>
+<%- if $name_attributes { -%>
+    GssapiNameAttributes <%= $name_attributes %>
+<%- } -%>
+<%- if $negotiate_once { -%>
+    GssapiNegotiateOnce On
+<%- } -%>
+<%- if $publish_errors { -%>
+    GssapiPublishErrors On
+<%- } -%>
+<%- if $publish_mech { -%>
+    GssapiPublishMech On
+<%- } -%>
+<%- if $required_name_attributes { -%>
+    GssapiRequiredNameAttributes "<%= $required_name_attributes %>"
+<%- } -%>
+<%- if $session_key { -%>
+    GssapiSessionKey <%= $session_key %>
+<%- } -%>
+<%- if $signal_persistent_auth { -%>
+    GssapiSignalPersistentAuth On
+<%- } -%>
+<%- if $ssl_only { -%>
+    GssapiSSLonly On
+<%- } -%>
+<%- if $use_s4u2_proxy and $deleg_ccache_dir { -%>
+    GssapiUseS4U2Proxy On
+<%- } -%>
+<%- if $use_sessions { -%>
+    GssapiUseSessions On
+<%- } -%>

From d969ab8a2c04006d2400f79b3b457ad24fe95ce5 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 7 Mar 2022 16:21:01 +0100
Subject: [PATCH 1867/2267] Set the Apache version to 2.4 in FreeBSD acceptance

It already uses the apache24 package and service names. This aligns the
values.
---
 spec/spec_helper_acceptance_local.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 8854b746f2..886e6ffa1e 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -152,7 +152,7 @@ def apache_settings_hash
     apache['service_name']     = 'apache24'
     apache['package_name']     = 'apache24'
     apache['error_log']        = 'http-error.log'
-    apache['version']          = '2.2'
+    apache['version']          = '2.4'
     apache['mod_ssl_dir']      = apache['mod_dir']
   when 'gentoo'
     apache['httpd_dir']        = '/etc/apache2'

From 626a0d8ac0c19c2ec2eee0abce9cb5d2a519a136 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 7 Mar 2022 16:23:37 +0100
Subject: [PATCH 1868/2267] Drop Apache 2.2 support with Gentoo

This was dropped in December 2019[1] and thus has no use anymore.

[1]: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872597ae0890e11ac15718f655935f1b0c9e0dbd
     https://github.com/gentoo/gentoo/commit/872597ae0890e11ac15718f655935f1b0c9e0dbd
---
 manifests/init.pp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 26ded53a77..c76d0cddda 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -738,19 +738,13 @@
     if $::osfamily == 'gentoo' {
       $error_documents_path = '/usr/share/apache2/error'
       if $default_mods =~ Array {
-        if versioncmp($apache_version, '2.4') >= 0 {
-          if defined('apache::mod::ssl') {
-            ::portage::makeconf { 'apache2_modules':
-              content => concat($default_mods, ['authz_core', 'socache_shmcb']),
-            }
-          } else {
-            ::portage::makeconf { 'apache2_modules':
-              content => concat($default_mods, 'authz_core'),
-            }
+        if defined('apache::mod::ssl') {
+          ::portage::makeconf { 'apache2_modules':
+            content => concat($default_mods, ['authz_core', 'socache_shmcb']),
           }
         } else {
           ::portage::makeconf { 'apache2_modules':
-            content => $default_mods,
+            content => concat($default_mods, 'authz_core'),
           }
         }
       }

From b3584bca973f6050a33596126a2d17d4e755978f Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 16 Mar 2022 15:25:43 +0000
Subject: [PATCH 1869/2267] pdksync_heads/main-0-gf3911d3

---
 .devcontainer/README.md            | 34 ++++++++++++++++++++++++++++++
 .devcontainer/devcontainer.json    | 16 +++++---------
 .github/workflows/auto_release.yml | 16 +++++++++-----
 .github/workflows/nightly.yml      | 14 ++++++------
 .github/workflows/pr_test.yml      | 29 +++++++++++++------------
 .github/workflows/spec.yml         | 16 ++++++++------
 .rubocop.yml                       |  2 +-
 Gemfile                            |  1 +
 Rakefile                           |  1 +
 metadata.json                      |  4 ++--
 10 files changed, 86 insertions(+), 47 deletions(-)
 create mode 100644 .devcontainer/README.md

diff --git a/.devcontainer/README.md b/.devcontainer/README.md
new file mode 100644
index 0000000000..cc4675e5dd
--- /dev/null
+++ b/.devcontainer/README.md
@@ -0,0 +1,34 @@
+# devcontainer
+
+
+For format details, see https://aka.ms/devcontainer.json. 
+
+For config options, see the README at:
+https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
+ 
+``` json
+{
+	"name": "Puppet Development Kit (Community)",
+	"dockerFile": "Dockerfile",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"puppet.puppet-vscode",
+		"rebornix.Ruby"
+	]
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "pdk --version",
+}
+```
+
+
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f1a55dc3f0..fe7a8b12b9 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,23 +1,17 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
 {
 	"name": "Puppet Development Kit (Community)",
 	"dockerFile": "Dockerfile",
 
-	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.profiles.linux": {
+			"bash": {
+				"path": "bash",
+			}
+		}
 	},
 
-	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"puppet.puppet-vscode",
 		"rebornix.Ruby"
 	]
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "pdk --version",
 }
diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index e028483600..f4aed440e5 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
+    
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
@@ -25,7 +26,6 @@ jobs:
       run: |
         echo STEP_ID="auto-release" >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
     - name: "Checkout Source"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       uses: actions/checkout@v2
@@ -46,8 +46,14 @@ jobs:
       run: |
         echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
 
-    - name: "Commit changes"
+    - name: "Check if a release is necessary"
       if: ${{ github.repository_owner == 'puppetlabs' }}
+      id: check
+      run: |
+        git diff --quiet CHANGELOG.md && echo "::set-output name=release::false" || echo "::set-output name=release::true"
+
+    - name: "Commit changes"
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
       run: |
         git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
         git config --local user.name "GitHub Action"
@@ -57,7 +63,7 @@ jobs:
     - name: Create Pull Request
       id: cpr
       uses: puppetlabs/peter-evans-create-pull-request@v3
-      if: ${{ github.repository_owner == 'puppetlabs' }}
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
@@ -73,11 +79,11 @@ jobs:
         labels: "maintenance"
 
     - name: PR outputs
-      if: ${{ github.repository_owner == 'puppetlabs' }}
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
       run: |
         echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
         echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
-
+ 
     - name: "Honeycomb: Record finish step"
       if: ${{ always() }}
       run: |
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 865578cfd2..c8fe88a506 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -4,18 +4,21 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
 
 jobs:
   setup_matrix:
+    if: ${{ github.repository_owner == 'puppetlabs' }}
     name: "Setup Test Matrix"
     runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
     steps:
+     
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
@@ -27,7 +30,6 @@ jobs:
       run: |
         echo STEP_ID=setup-environment >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
     - name: Checkout Source
       uses: actions/checkout@v2
       if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -45,29 +47,27 @@ jobs:
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
-
+   
     - name: "Honeycomb: Record Setup Environment time"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
         echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 
         else
           echo  "::set-output name=matrix::{}"
         fi
-
+  
     - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
-
   Acceptance:
     name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
     needs:
@@ -187,7 +187,7 @@ jobs:
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
 
   slack-workflow-status:
-    if: always()
+    if: ${{ github.repository_owner == 'puppetlabs' }}
     name: Post Workflow Status To Slack
     needs:
       - Acceptance
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 69e414b558..fd310e6561 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -2,7 +2,9 @@ name: "PR Testing"
 
 on: [pull_request]
 
+
 env:
+ 
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
 
@@ -14,6 +16,7 @@ jobs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
     steps:
+    
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
@@ -25,7 +28,6 @@ jobs:
       run: |
         echo STEP_ID=setup-environment >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
     - name: Checkout Source
       uses: actions/checkout@v2
       if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -43,28 +45,31 @@ jobs:
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
-
+  
     - name: "Honeycomb: Record Setup Environment time"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
         echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
+    - name: Run validation steps
+      run: |
+        bundle exec rake validate
+      if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 
         else
           echo  "::set-output name=matrix::{}"
         fi
-
+ 
     - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
-
   Acceptance:
     name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
     needs:
@@ -84,7 +89,7 @@ jobs:
         echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
         echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
-
+ 
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
@@ -97,7 +102,6 @@ jobs:
       run: |
         echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
     - name: Checkout Source
       uses: actions/checkout@v2
 
@@ -112,14 +116,13 @@ jobs:
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
-
+ 
     - name: "Honeycomb: Record Setup Environment time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
         echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
     - name: Provision test environment
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
@@ -145,7 +148,7 @@ jobs:
     - name: Install module
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
-
+ 
     - name: "Honeycomb: Record deployment times"
       if: ${{ always() }}
       run: |
@@ -154,18 +157,16 @@ jobs:
         echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
-
     - name: Run acceptance tests
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
-
+ 
     - name: "Honeycomb: Record acceptance testing times"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
         echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
     - name: Remove test environment
       if: ${{ always() }}
       continue-on-error: true
@@ -177,7 +178,7 @@ jobs:
           echo
           echo ::endgroup::
         fi
-
+ 
     - name: "Honeycomb: Record removal times"
       if: ${{ always() }}
       run: |
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index 209dd3f4a5..6c1ae10d8c 100644
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -6,6 +6,7 @@ on:
   workflow_dispatch:
   pull_request:
 
+
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
@@ -18,6 +19,7 @@ jobs:
       spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
 
     steps:
+    
       - name: "Honeycomb: Start recording"
         uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
         with:
@@ -29,7 +31,6 @@ jobs:
         run: |
           echo STEP_ID=setup-environment >> $GITHUB_ENV
           echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
       - name: Checkout Source
         uses: actions/checkout@v2
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -47,15 +48,18 @@ jobs:
           echo ::group::bundler environment
           buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
           echo ::endgroup::
-
       - name: "Honeycomb: Record Setup Environment time"
         if: ${{ github.repository_owner == 'puppetlabs' }}
         run: |
           buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
           echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
           echo STEP_START=$(date +%s) >> $GITHUB_ENV
+      - name: Run Static & Syntax Tests
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
 
-      - name: Setup Acceptance Test Matrix
+      - name: Setup Spec Test Matrix
         id: get-matrix
         run: |
           if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
@@ -63,12 +67,10 @@ jobs:
           else
             echo  "::set-output name=spec_matrix::{}"
           fi
-
       - name: "Honeycomb: Record Setup Test Matrix time"
         if: ${{ always() }}
         run: |
           buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
-
   Spec:
     name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
     needs:
@@ -83,6 +85,7 @@ jobs:
     env:
       BUILDEVENT_FILE: '../buildevents.txt'
       PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
+      FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
 
     steps:
       - run: |
@@ -90,7 +93,6 @@ jobs:
 
       - run: |
           echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
-
       - name: "Honeycomb: Start first step"
         run: |
           echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
@@ -103,7 +105,6 @@ jobs:
           dataset: ${{ env.HONEYCOMB_DATASET }}
           job-status: ${{ job.status }}
           matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
-
       - name: Checkout Source
         uses: actions/checkout@v2
 
@@ -119,6 +120,7 @@ jobs:
           buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
           echo ::endgroup::
 
+
       - name: Run parallel_spec tests
         run: |
           buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec
diff --git a/.rubocop.yml b/.rubocop.yml
index ef988c2498..a886d8dbfe 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ require:
 - rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.4'
+  TargetRubyVersion: '2.5'
   Include:
   - "**/*.rb"
   Exclude:
diff --git a/Gemfile b/Gemfile
index 135373d02b..a14223db65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,7 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "voxpupuli-puppet-lint-plugins", '>= 3.0',                 require: false, platforms: [:ruby]
   gem "github_changelog_generator",                              require: false
 end
 group :system_tests do
diff --git a/Rakefile b/Rakefile
index 88cc701712..fd8011a675 100644
--- a/Rakefile
+++ b/Rakefile
@@ -43,6 +43,7 @@ end
 
 PuppetLint.configuration.send('disable_relative')
 
+
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
diff --git a/metadata.json b/metadata.json
index 0c00d4ad03..3aa19059e1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -90,7 +90,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "2.1.0",
+  "pdk-version": "2.3.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g03daa92"
+  "template-ref": "heads/main-0-gf3911d3"
 }

From e982ac6f5b17fa6aa5ab1ab4be5d3d77148444d3 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 23 Mar 2022 12:11:51 +0000
Subject: [PATCH 1870/2267] (GH-iac-335) Remove Support for Ubuntu 16.04

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 0c00d4ad03..a3e234a3f2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -65,7 +65,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04",
         "20.04"
       ]

From 9d7aa21530ce6c65711bbe10d10dfd8230523b2c Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 23 Mar 2022 12:34:15 +0000
Subject: [PATCH 1871/2267] (GH-iac-334) Remove Support for Ubuntu 16.04

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 0c00d4ad03..a3e234a3f2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -65,7 +65,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04",
         "20.04"
       ]

From 87cc5f0fb72f23599731c36e10a92ec37796334d Mon Sep 17 00:00:00 2001
From: Skylar Thompson <skylar2@uw.edu>
Date: Thu, 24 Mar 2022 14:29:51 -0700
Subject: [PATCH 1872/2267] test for proxy_pass_match in proxy dictionary, use
 ProxyPassMatch instead of ProxyPass if it is detected

---
 templates/vhost/_directories.erb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 2f43e01290..1a385a4397 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -467,9 +467,17 @@
         <%- end -%>
       <%- end -%>
     <%- end -%>
-    <%- if directory['proxy_pass'] and directory['provider'] and directory['provider'].match('location') -%>
-      <%- directory['proxy_pass'].flatten.compact.each do |proxy| -%>
-    ProxyPass <%= proxy['url'] -%>
+    <%- if (directory['proxy_pass'] or directory['proxy_pass_match']) and directory['provider'] and directory['provider'].match('location') -%>
+      <%# In a Location container, only one of ProxyPass or ProxyPassMatch are allowed, so only need to handle on case at a time -%>
+         <%- if directory['proxy_pass_match']
+               proxy_pass = 'ProxyPassMatch'
+               directory_proxy_pass = directory['proxy_pass_match']
+             else
+               proxy_pass = 'ProxyPass'
+               directory_proxy_pass = directory['proxy_pass']
+             end -%>
+      <%- directory_proxy_pass.flatten.compact.each do |proxy| -%>
+    <%= proxy_pass -%> <%= proxy['url'] -%>
         <%- if proxy['params'] -%>
           <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
           <%- end -%>

From 66cef3dd916452186c475ca8267033e2f6439caf Mon Sep 17 00:00:00 2001
From: Skylar Thompson <skylar2@uw.edu>
Date: Thu, 24 Mar 2022 14:31:07 -0700
Subject: [PATCH 1873/2267] Puppet String update

---
 manifests/vhost.pp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1ad825fa11..99d4292fff 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1351,6 +1351,8 @@
 #    Values: `directory`, `files`, `proxy`, `location`, `directorymatch`, `filesmatch`, 
 #   `proxymatch` or `locationmatch`. If you set `provider` to `directorymatch`, it 
 #   uses the keyword `DirectoryMatch` in the Apache config file.<br />
+#   proxy_pass and proxy_pass_match are supported like their parameters to apache::vhost, and will
+#   be rendered without their path parameter as this will be inherited from the Location/LocationMatch container.
 #   An example use of `directories`:
 #   ``` puppet
 #   apache::vhost { 'files.example.net':
@@ -1360,11 +1362,6 @@
 #         'provider' => 'files',
 #         'deny'     => 'from all',
 #       },
-#       { 'path'           => '/var/www/html',
-#         'provider'       => 'directory',
-#         'options'        => ['-Indexes'],
-#         'allow_override' => ['All'],
-#       },
 #     ],
 #   }
 #   ```

From 5bff37188bc0386a48cc278d7786d28403e1f96a Mon Sep 17 00:00:00 2001
From: Skylar Thompson <skylar2@uw.edu>
Date: Thu, 24 Mar 2022 14:31:22 -0700
Subject: [PATCH 1874/2267] test case

---
 spec/defines/vhost_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 730e9e0bfa..da5559052b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -209,6 +209,20 @@
                     },
                   ],
                 },
+                {
+                  'path'       => '^/proxy',
+                  'provider'   => 'locationmatch',
+                  'proxy_pass' => [
+                    {
+                      'url'             => 'http://backend-b/',
+                      'keywords'        => ['noquery', 'interpolate'],
+                      'params' => {
+                        'retry'   => '0',
+                        'timeout' => '5',
+                      },
+                    },
+                  ],
+                },
                 {
                   'path'                                                => '/var/www/node-app/public',
                   'passenger_enabled'                                   => true,
@@ -693,6 +707,11 @@
               content: %r{^\s+ProxyPass http://backend-b/ retry=0 timeout=5 noquery interpolate$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+ProxyPassMatch http://backend-b/ retry=0 timeout=5 noquery interpolate$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$},

From 16f9aba56c7be77dfaf1bd0cef3050d1ce050eee Mon Sep 17 00:00:00 2001
From: Skylar Thompson <skylar2@uw.edu>
Date: Thu, 24 Mar 2022 14:46:09 -0700
Subject: [PATCH 1875/2267] Puppet String

---
 manifests/vhost.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 99d4292fff..4eca2c4c53 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1362,6 +1362,11 @@
 #         'provider' => 'files',
 #         'deny'     => 'from all',
 #       },
+#       { 'path'           => '/var/www/html',
+#         'provider'       => 'directory',
+#         'options'        => ['-Indexes'],
+#         'allow_override' => ['All'],
+#       },
 #     ],
 #   }
 #   ```

From 590b9d8d69f6b98369826de31845890e41f04e03 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 25 Mar 2022 10:36:12 +0000
Subject: [PATCH 1876/2267] (GH-iac-334) Remove code specific to unsupported
 OSs

---
 README.md                                     |  3 -
 manifests/mod/fastcgi.pp                      |  2 +-
 manifests/mod/security.pp                     |  3 +-
 manifests/mpm.pp                              | 12 ++--
 manifests/params.pp                           | 68 ++++++-------------
 spec/acceptance/mod_php_spec.rb               |  3 +-
 spec/classes/mod/php_spec.rb                  | 13 ----
 spec/spec_helper_acceptance_local.rb          |  8 +--
 .../apache_mod_platform_compatibility_spec.rb |  6 +-
 9 files changed, 32 insertions(+), 86 deletions(-)

diff --git a/README.md b/README.md
index 68083eb6de..e444c5c617 100755
--- a/README.md
+++ b/README.md
@@ -898,9 +898,6 @@ See [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linu
 
 You must set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
-### Ubuntu 16.04
-The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
-
 <a id="development"></a> 
 ## Development
 
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index a3445c9179..541b9c1140 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -8,7 +8,7 @@
   if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemmajrelease, '7') >= 0) {
     fail('mod_fastcgi is no longer supported on el7 and above.')
   }
-  if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '18.04') >= 0) {
+  if ($facts['os']['name'] == 'Ubuntu') {
     fail('mod_fastcgi is no longer supported on Ubuntu 18.04 and above. Please use mod_proxy_fcgi')
   }
   # Debian specifies it's fastcgi lib path, but RedHat uses the default value
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 4234f40880..0ffcc07e91 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -261,8 +261,7 @@
       notify  => Class['apache::service'],
     }
 
-    # Debian 9 has a different rule setup
-    unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
+    unless $::operatingsystem == 'SLES' or $::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' {
       apache::security::rule_link { $activated_rules: }
     }
   }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index b76772eaf3..863d918518 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -98,17 +98,13 @@
       }
 
       if $mpm == 'prefork' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or $::operatingsystem == 'Debian' ) {
-          include apache::mpm::disable_mpm_event
-          include apache::mpm::disable_mpm_worker
-        }
+        include apache::mpm::disable_mpm_event
+        include apache::mpm::disable_mpm_worker
       }
 
       if $mpm == 'worker' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or $::operatingsystem == 'Debian' ) {
-          include apache::mpm::disable_mpm_event
-          include apache::mpm::disable_mpm_prefork
-        }
+        include apache::mpm::disable_mpm_event
+        include apache::mpm::disable_mpm_prefork
       }
     }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 79313de8bf..545d80a27e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -364,7 +364,6 @@
     if ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
-        '16.04' => '7.0', # Ubuntu Xenial
         '10'    => '7.3', # Debian Buster
         '20.04' => '7.4', # Ubuntu Foccal Fossal
         default => '7.2', # Ubuntu Bionic, Cosmic and Disco
@@ -460,52 +459,27 @@
     $secpcrematchlimit = 1500
     $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
-    if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
-      $modsec_default_rules = [
-        'crawlers-user-agents.data',
-        'iis-errors.data',
-        'java-code-leakages.data',
-        'java-errors.data',
-        'lfi-os-files.data',
-        'php-config-directives.data',
-        'php-errors.data',
-        'php-function-names-933150.data',
-        'php-function-names-933151.data',
-        'php-variables.data',
-        'restricted-files.data',
-        'scanners-headers.data',
-        'scanners-urls.data',
-        'scanners-user-agents.data',
-        'scripting-user-agents.data',
-        'sql-errors.data',
-        'sql-function-names.data',
-        'unix-shell.data',
-        'windows-powershell-commands.data',
-      ]
-    } else {
-      $modsec_default_rules = [
-        'base_rules/modsecurity_35_bad_robots.data',
-        'base_rules/modsecurity_35_scanners.data',
-        'base_rules/modsecurity_40_generic_attacks.data',
-        'base_rules/modsecurity_50_outbound.data',
-        'base_rules/modsecurity_50_outbound_malware.data',
-        'base_rules/modsecurity_crs_20_protocol_violations.conf',
-        'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
-        'base_rules/modsecurity_crs_23_request_limits.conf',
-        'base_rules/modsecurity_crs_30_http_policy.conf',
-        'base_rules/modsecurity_crs_35_bad_robots.conf',
-        'base_rules/modsecurity_crs_40_generic_attacks.conf',
-        'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
-        'base_rules/modsecurity_crs_41_xss_attacks.conf',
-        'base_rules/modsecurity_crs_42_tight_security.conf',
-        'base_rules/modsecurity_crs_45_trojans.conf',
-        'base_rules/modsecurity_crs_47_common_exceptions.conf',
-        'base_rules/modsecurity_crs_49_inbound_blocking.conf',
-        'base_rules/modsecurity_crs_50_outbound.conf',
-        'base_rules/modsecurity_crs_59_outbound_blocking.conf',
-        'base_rules/modsecurity_crs_60_correlation.conf',
-      ]
-    }
+    $modsec_default_rules = [
+      'crawlers-user-agents.data',
+      'iis-errors.data',
+      'java-code-leakages.data',
+      'java-errors.data',
+      'lfi-os-files.data',
+      'php-config-directives.data',
+      'php-errors.data',
+      'php-function-names-933150.data',
+      'php-function-names-933151.data',
+      'php-variables.data',
+      'restricted-files.data',
+      'scanners-headers.data',
+      'scanners-urls.data',
+      'scanners-user-agents.data',
+      'scripting-user-agents.data',
+      'sql-errors.data',
+      'sql-function-names.data',
+      'unix-shell.data',
+      'windows-powershell-commands.data',
+    ]
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 7bc3749c13..31b10e0f7c 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -24,8 +24,7 @@ class { 'apache::mod::php': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    if (os[:family] == 'ubuntu' && os[:release] == '16.04') ||
-       (os[:family] == 'debian' && os[:release] =~ %r{^9\.})
+    if os[:family] == 'debian' && os[:release] =~ %r{^9\.}
       describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index b0c4b6d8c1..353a94f91a 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -78,19 +78,6 @@
                 }
               end
             end
-          when '16.04'
-            context 'on xenial' do
-              let :params do
-                { content: 'somecontent' }
-              end
-
-              it {
-                is_expected.to contain_file('php7.0.conf').with(
-                  content: 'somecontent',
-                )
-              }
-            end
-
           when '18.04'
             context 'on bionic' do
               let :params do
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 8854b746f2..b53ff0b8c1 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -48,19 +48,13 @@ def print_parsing_errors
         ensure   => 'latest',
       }
     }
-    # needed for ss, for serverspec checks
-    if $::operatingsystem == 'Ubuntu' and $::operatingsystemmajrelease !~ /14.04|16.04/ {
-      package { 'iproute2':
-        ensure   => 'latest',
-      }
-    }
     if $::osfamily == 'RedHat' {
       if $::operatingsystemmajrelease == '5' or $::operatingsystemmajrelease == '6'{
         class { 'epel':
           epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
           epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
         }
-        } elsif $::operatingsystemmajrelease == '8' {
+      } elsif $::operatingsystemmajrelease == '8' {
           class { 'epel':
                 os_maj_release => "7",
                 epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
diff --git a/spec/util/apache_mod_platform_compatibility_spec.rb b/spec/util/apache_mod_platform_compatibility_spec.rb
index 1025a866a4..3ca5bb7481 100644
--- a/spec/util/apache_mod_platform_compatibility_spec.rb
+++ b/spec/util/apache_mod_platform_compatibility_spec.rb
@@ -47,7 +47,7 @@
         expect(ampc.extract_os_ver_pairs('Debian: 5, 6, 7; CentOS: 5,6,7')).to eq('debian' => [5, 6, 7], 'centos' => [5, 6, 7])
       end
       it 'handles Versions in \d+\.\d+ format' do
-        expect(ampc.extract_os_ver_pairs('Ubuntu: 14.04, 16.04')).to eq('ubuntu' => [14, 16])
+        expect(ampc.extract_os_ver_pairs('Ubuntu: 18.04, 20.04')).to eq('ubuntu' => [18, 20])
       end
       it 'handles Versions with "SP"' do
         expect(ampc.extract_os_ver_pairs('SLES: 11 SP1, 12')).to eq('sles' => [11, 12])
@@ -56,10 +56,10 @@
         expect(ampc.extract_os_ver_pairs('foobar')).to eq({})
       end
       it 'returns an empty Hash when given data with incorrect OS/Version group separator' do
-        expect(ampc.extract_os_ver_pairs('Ubuntu#14.04, 16.04')).to eq({})
+        expect(ampc.extract_os_ver_pairs('Ubuntu#18.04, 20.04')).to eq({})
       end
       it 'returns an empty Hash when given data with incorrect OS + Version separator' do
-        expect(ampc.extract_os_ver_pairs('CentOS:5,6#Debian:5,6')).to eq({})
+        expect(ampc.extract_os_ver_pairs('CentOS:7,8#Debian:10,11')).to eq({})
       end
       it 'returns an empty Hash when given data with incorrect Version separator' do
         expect(ampc.extract_os_ver_pairs('CentOS:5@6')).to eq({})

From 400c75dacacceeceeed317d33c2b4e7cdf76d2af Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 25 Mar 2022 10:37:50 +0000
Subject: [PATCH 1877/2267] (maint) Temporary disable of syntax checks to allow
 work to go through

See issue for more information: https://github.com/puppetlabs/iac/issues/336
---
 .github/workflows/spec.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index 6c1ae10d8c..f51476d7a4 100644
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -54,10 +54,10 @@ jobs:
           buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
           echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
           echo STEP_START=$(date +%s) >> $GITHUB_ENV
-      - name: Run Static & Syntax Tests
-        if: ${{ github.repository_owner == 'puppetlabs' }}
-        run: |
-          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+      # - name: Run Static & Syntax Tests
+      #   if: ${{ github.repository_owner == 'puppetlabs' }}
+      #   run: |
+      #     buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
 
       - name: Setup Spec Test Matrix
         id: get-matrix

From 70f7e9f4b3883627b7f72c5a267e49396a948f2a Mon Sep 17 00:00:00 2001
From: Craig Gumbley <craiggumbley@gmail.com>
Date: Fri, 25 Mar 2022 15:12:31 +0000
Subject: [PATCH 1878/2267] (MAINT) Add labeller and stale GHA workflows

---
 .github/workflows/labeller.yml | 22 ++++++++++++++++++++++
 .github/workflows/stale.yml    | 19 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 .github/workflows/labeller.yml
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
new file mode 100644
index 0000000000..cb3a93078f
--- /dev/null
+++ b/.github/workflows/labeller.yml
@@ -0,0 +1,22 @@
+name: community-labeller
+
+on:
+  issues:
+    types:
+      - opened
+  pull_request:
+    types:
+      - opened
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: puppetlabs/community-labeller@v0
+        name: Label issues or pull requests
+        with:
+          label_name: community
+          label_color: '5319e7'
+          org_membership: puppetlabs
+          token: ${{ secrets.IAC_COMMUNITY_LABELER }}
\ No newline at end of file
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 0000000000..c6edd6de2a
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 60
+        days-before-close: 7
+        stale-issue-message: 'This issue has been marked as stale because it has been open for a while and has had no recent activity. If this issue is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
+        stale-issue-label: 'stale'
+        stale-pr-message: 'This PR has been marked as stale because it has been open for a while and has had no recent activity. If this PR is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
+        stale-pr-label: 'stale'

From 872ff0c2ce6bd4095d2c6924026ca648b7f95575 Mon Sep 17 00:00:00 2001
From: Craig Gumbley <craiggumbley@gmail.com>
Date: Fri, 25 Mar 2022 15:33:43 +0000
Subject: [PATCH 1879/2267] (MAINT) Fixes no new line at EOF

---
 .github/workflows/labeller.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
index cb3a93078f..104370aa1c 100644
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -19,4 +19,4 @@ jobs:
           label_name: community
           label_color: '5319e7'
           org_membership: puppetlabs
-          token: ${{ secrets.IAC_COMMUNITY_LABELER }}
\ No newline at end of file
+          token: ${{ secrets.IAC_COMMUNITY_LABELER }}

From 9d92f069a2bf77d16b0d9eeed82a81190a31f6a6 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 29 Mar 2022 15:39:49 +0200
Subject: [PATCH 1880/2267] Restructure MPM disabling

This takes the approach of listing the disabling steps once rather than
repeating it for every mpm.

I wasn't quite sure on the prefork disabling. Does prefork need to stay
enabled for itk?
---
 manifests/mpm.pp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 863d918518..8fd30bf86b 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -85,9 +85,6 @@
       }
 
       if $mpm == 'itk' {
-        include apache::mpm::disable_mpm_event
-        include apache::mpm::disable_mpm_worker
-
         package { 'libapache2-mpm-itk':
           ensure => present,
           before => [
@@ -97,14 +94,16 @@
         }
       }
 
-      if $mpm == 'prefork' {
-        include apache::mpm::disable_mpm_event
+      unless $mpm in ['itk', 'prefork'] {
+        include apache::mpm::disable_mpm_prefork
+      }
+
+      if $mpm != 'worker' {
         include apache::mpm::disable_mpm_worker
       }
 
-      if $mpm == 'worker' {
+      if $mpm != 'event' {
         include apache::mpm::disable_mpm_event
-        include apache::mpm::disable_mpm_prefork
       }
     }
 

From ae65bc6b9bc142fedfb3cafdab65e5a77b10e7ca Mon Sep 17 00:00:00 2001
From: Craig Gumbley <craiggumbley@gmail.com>
Date: Mon, 4 Apr 2022 14:09:44 +0100
Subject: [PATCH 1881/2267] "This commit changes the workflow trigger for pull
 requests to pull_request_target"

---
 .github/workflows/labeller.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
index 104370aa1c..5434d3fff3 100644
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -4,7 +4,7 @@ on:
   issues:
     types:
       - opened
-  pull_request:
+  pull_request_target:
     types:
       - opened
 

From c06efe7cd9cc4bfe7db7cd8302491e7b5482afed Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 11 Oct 2021 18:51:20 +0200
Subject: [PATCH 1882/2267] Remove warnings and plans to change vhost default
 naming

In 7e233fe7cc108605384506f11083aeea6e3a2464 a plan was made to change
the naming. In 6b2a20a390df597f04222571dc7fac366a8ea898 it was already
from 6.0.0 to 7.0.0. Now that 7.0.0 has been released, the default isn't
going to change. This time I'm suggestion to drop the plan altogether
and stop bothering users with this.
---
 manifests/vhost.pp            | 33 ---------------------------------
 spec/acceptance/vhost_spec.rb | 14 ++------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1ad825fa11..4e27e85ab5 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2119,15 +2119,6 @@
   #
   # Because a single hostname may be use by multiple virtual hosts listening on different ports, the $port paramter can
   # optionaly be used to avoid duplicate resources.
-  #
-  # We will retain the default behaviour for filenames but allow the use of a sanitized version of $servername to be
-  # used, using the new $use_servername_for_filenames and $use_port_for_filenames parameters.
-  #
-  # This will default to false until the next major release (v7.0.0), at which point, we will default this to true and
-  # warn about it's imminent deprecation in the subsequent major release (v8.0.0)
-  #
-  # In v8.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether
-  # and use the sanitized value of $servername for default log / config filenames.
   $filename = $use_servername_for_filenames ? {
     true => $use_port_for_filenames ? {
       true  => regsubst("${normalized_servername}-${port}", ' ', '_', 'G'),
@@ -2136,30 +2127,6 @@
     false => $name,
   }
 
-  if ! $use_servername_for_filenames and $name != $normalized_servername {
-    $use_servername_for_filenames_warn_msg = '
-    It is possible for the $name parameter to be defined with spaces in it. Although supported on POSIX systems, this
-    can lead to cumbersome file names. The $servername attribute has stricter conditions from Apache (i.e. no spaces)
-    When $use_servername_for_filenames = true, the $servername parameter, sanitized, is used to construct log and config
-    file names.
-
-    From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
-    module, the $use_servername_for_filenames will be removed and log/config file names will be derived from the
-    sanitized $servername parameter when not explicitly defined.'
-    warning($use_servername_for_filenames_warn_msg)
-  } elsif ! $use_port_for_filenames {
-    $use_port_for_filenames_warn_msg = '
-    It is possible for multiple virtual hosts to be configured using the same $servername but a different port. When
-    using $use_servername_for_filenames, this can lead to duplicate resource declarations.
-    When $use_port_for_filenames = true, the $servername and $port parameters, sanitized, are used to construct log and
-    config file names.
-
-    From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
-    module, the $use_port_for_filenames will be removed and log/config file names will be derived from the
-    sanitized $servername parameter when not explicitly defined.'
-    warning($use_port_for_filenames_warn_msg)
-  }
-
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
   if $manage_docroot and $docroot and ! defined(File[$docroot]) {
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 09218c9612..921967b205 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -964,13 +964,8 @@ class { 'apache': }
             logroot                       => '/tmp',
           }
       MANIFEST
-      it 'applies cleanly and DOES NOT print warning about $use_servername_for_filenames usage for test.server vhost' do
+      it 'applies cleanly' do
         result = apply_manifest(pp, catch_failures: true)
-        expect(result.stderr).not_to contain %r{
-          .*Warning\:\sScope\(Apache::Vhost\[test\.server\]\)\:.*
-          It\sis\spossible\sfor\sthe\s\$name\sparameter.*
-          sanitized\s\$servername\sparameter\swhen\snot\sexplicitly\sdefined\.
-        }xm
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.servername.conf") do
         it { is_expected.to be_file }
@@ -988,13 +983,8 @@ class { 'apache': }
             logroot                       => '/tmp',
           }
       MANIFEST
-      it 'applies cleanly and prints warning about $use_servername_for_filenames usage for test.server vhost' do
+      it 'applies cleanly' do
         result = apply_manifest(pp, catch_failures: true)
-        expect(result.stderr).to contain %r{
-          .*Warning\:\sScope\(Apache::Vhost\[test\.server\]\)\:.*
-          It\sis\spossible\sfor\sthe\s\$name\sparameter.*
-          sanitized\s\$servername\sparameter\swhen\snot\sexplicitly\sdefined\.
-        }xm
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }

From a88bd78ac74bb09292032ea993c3bdafafc51afd Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 29 Mar 2022 15:30:19 +0200
Subject: [PATCH 1883/2267] Drop Apache 2.0 compatibility code

It's safe to assume the version is >= 2.2 so the conditional can be
dropped.
---
 manifests/mod/proxy_connect.pp         | 15 +++-----------
 spec/classes/mod/proxy_connect_spec.rb | 28 +-------------------------
 2 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/manifests/mod/proxy_connect.pp b/manifests/mod/proxy_connect.pp
index e09cab0795..5ece8d4666 100644
--- a/manifests/mod/proxy_connect.pp
+++ b/manifests/mod/proxy_connect.pp
@@ -1,18 +1,9 @@
 # @summary
 #   Installs `mod_proxy_connect`.
-# 
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-# 
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html for additional documentation.
 #
-class apache::mod::proxy_connect (
-  $apache_version  = undef,
-) {
+class apache::mod::proxy_connect {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
-  if versioncmp($_apache_version, '2.2') >= 0 {
-    Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_connect']
-    ::apache::mod { 'proxy_connect': }
-  }
+  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_connect']
+  apache::mod { 'proxy_connect': }
 }
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index cb433f0677..c579a58d34 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -11,31 +11,5 @@
 
   include_examples 'a mod class, without including apache'
 
-  context 'with Apache version < 2.2' do
-    let :params do
-      {
-        apache_version: '2.1',
-      }
-    end
-
-    it { is_expected.not_to contain_apache__mod('proxy_connect') }
-  end
-  context 'with Apache version = 2.2' do
-    let :params do
-      {
-        apache_version: '2.2',
-      }
-    end
-
-    it { is_expected.to contain_apache__mod('proxy_connect') }
-  end
-  context 'with Apache version >= 2.4' do
-    let :params do
-      {
-        apache_version: '2.4',
-      }
-    end
-
-    it { is_expected.to contain_apache__mod('proxy_connect') }
-  end
+  it { is_expected.to contain_apache__mod('proxy_connect') }
 end

From 46778b2a76825c4cee5f6c3534ea4335fa958bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 4 Apr 2022 08:47:50 -1000
Subject: [PATCH 1884/2267] Add support for PassengerPreloadBundler

The latest passenger include a new option to load ruby bundles earlier,
working around deployment issues.  See:
* https://github.com/phusion/passenger/issues/2410
* https://github.com/phusion/passenger/issues/2409
---
 manifests/mod/passenger.pp         | 10 ++++++++++
 manifests/vhost.pp                 | 10 ++++++++--
 spec/classes/mod/passenger_spec.rb |  1 +
 spec/defines/vhost_spec.rb         | 12 ++++++++++++
 templates/mod/passenger.conf.erb   |  3 +++
 templates/vhost/_directories.erb   |  3 +++
 templates/vhost/_passenger.erb     |  3 +++
 7 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 9019c33e41..440b7b5175 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -120,6 +120,9 @@
 # @param passenger_load_shell_envvars
 #   Enables or disables the loading of shell environment variables before spawning the application.
 #
+# @param passenger_preload_bundler
+#   Enables or disables loading bundler before loading your Ruby app.
+#
 # @param passenger_log_file
 #   File path to log file. By default Passenger log messages are written to the Apache global error log.
 #
@@ -343,6 +346,7 @@
   $passenger_installed_version                                                               = undef,
   $passenger_instance_registry_dir                                                           = undef,
   $passenger_load_shell_envvars                                                              = undef,
+  Optional[Boolean] $passenger_preload_bundler                                               = undef,
   Optional[Stdlib::Absolutepath] $passenger_log_file                                         = undef,
   $passenger_log_level                                                                       = undef,
   $passenger_lve_min_uid                                                                     = undef,
@@ -546,6 +550,11 @@
         fail("Passenger config option :: passenger_load_shell_envvars is not introduced until version 4.0.20 :: ${passenger_installed_version} is the version reported")
       }
     }
+    if $passenger_preload_bundler {
+      if (versioncmp($passenger_installed_version, '6.0.13') < 0) {
+        fail("Passenger config option :: passenger_preload_bundler is not introduced until version 6.0.13 :: ${passenger_installed_version} is the version reported")
+      }
+    }
     if $passenger_log_file {
       if (versioncmp($passenger_installed_version, '5.0.5') < 0) {
         fail("Passenger config option :: passenger_log_file is not introduced until version 5.0.5 :: ${passenger_installed_version} is the version reported")
@@ -901,6 +910,7 @@
   # - $passenger_high_performance : since 2.0.0.
   # - $passenger_instance_registry_dir : since 5.0.0.
   # - $passenger_load_shell_envvars : since 4.0.20.
+  # - $passenger_preload_bundler : since 6.0.13
   # - $passenger_log_file : since 5.0.5.
   # - $passenger_log_level : since 3.0.0.
   # - $passenger_lve_min_uid : since 5.0.28.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 1ad825fa11..a6b9a76f3f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -684,6 +684,10 @@
 # @param passenger_load_shell_envvars
 #   Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
 #   to enable or disable the loading of shell environment variables before spawning the application.
+#
+# @param passenger_preload_bundler
+#   Sets [PassengerPreloadBundler](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpreloadbundler),
+#   to enable or disable the loading of bundler before loading the application.
 # 
 # @param passenger_rolling_restarts
 #   Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
@@ -1950,6 +1954,7 @@
   Optional[String] $passenger_restart_dir                                           = undef,
   Optional[Enum['direct', 'smart']] $passenger_spawn_method                         = undef,
   Optional[Boolean] $passenger_load_shell_envvars                                   = undef,
+  Optional[Boolean] $passenger_preload_bundler                                      = undef,
   Optional[Boolean] $passenger_rolling_restarts                                     = undef,
   Optional[Boolean] $passenger_resist_deployment_errors                             = undef,
   Optional[String] $passenger_user                                                  = undef,
@@ -2086,7 +2091,7 @@
     include apache::mod::suexec
   }
 
-  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
+  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
     include apache::mod::passenger
   }
 
@@ -2893,6 +2898,7 @@
   # - $passenger_restart_dir
   # - $passenger_spawn_method
   # - $passenger_load_shell_envvars
+  # - $passenger_preload_bundler
   # - $passenger_rolling_restarts
   # - $passenger_resist_deployment_errors
   # - $passenger_min_instances
@@ -2921,7 +2927,7 @@
   # - $passenger_max_requests
   # - $passenger_max_request_time
   # - $passenger_memory_limit
-  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
+  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index aed525e74d..0925696ce6 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -52,6 +52,7 @@
             'passenger_high_performance' => { type: 'OnOff', pass_opt: :PassengerHighPerformance },
             'passenger_instance_registry_dir' => { type: 'FullPath', pass_opt: :PassengerInstanceRegistryDir },
             'passenger_load_shell_envvars' => { type: 'OnOff', pass_opt: :PassengerLoadShellEnvvars },
+            'passenger_preload_bundler' => { type: 'Boolean', pass_opt: :PassengerPreloadBundler },
             'passenger_log_file' => { type: 'FullPath', pass_opt: :PassengerLogFile },
             'passenger_log_level' => { type: 'Integer', pass_opt: :PassengerLogLevel },
             'passenger_lve_min_uid' => { type: 'Integer', pass_opt: :PassengerLveMinUid },
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 730e9e0bfa..b6e6bf7f17 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -225,6 +225,7 @@
                   'passenger_startup_file'                              => 'start.js',
                   'passenger_restart_dir'                               => 'temp',
                   'passenger_load_shell_envvars'                        => false,
+                  'passenger_preload_bundler'                           => false,
                   'passenger_rolling_restarts'                          => false,
                   'passenger_resist_deployment_errors'                  => false,
                   'passenger_user'                                      => 'nodeuser',
@@ -440,6 +441,7 @@
               'passenger_restart_dir'                 => 'tmp',
               'passenger_spawn_method'                => 'direct',
               'passenger_load_shell_envvars'          => false,
+              'passenger_preload_bundler'             => false,
               'passenger_rolling_restarts'            => false,
               'passenger_resist_deployment_errors'    => true,
               'passenger_user'                        => 'sandbox',
@@ -823,6 +825,11 @@
               content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerPreloadBundler\sOff$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+PassengerRollingRestarts\sOff$},
@@ -1345,6 +1352,11 @@
               content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerPreloadBundler\sOff$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
               content: %r{^\s+PassengerRollingRestarts\sOff$},
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index f7078db922..ca673fd501 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -88,6 +88,9 @@
   <%- if @passenger_load_shell_envvars -%>
   PassengerLoadShellEnvvars <%= @passenger_load_shell_envvars %>
   <%- end -%>
+  <%- unless @passenger_preload_bundler.nil? -%>
+  PassengerPreloadBundler <%= scope.call_function('apache::bool2httpd', [@passenger_preload_bundler]) %>
+  <%- end -%>
   <%- if @passenger_log_file -%>
   PassengerLogFile "<%= @passenger_log_file %>"
   <%- end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 2f43e01290..df4b232914 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -132,6 +132,9 @@
     <%- unless directory['passenger_load_shell_envvars'].nil? -%>
     PassengerLoadShellEnvvars <%= scope.call_function('apache::bool2httpd', [directory['passenger_load_shell_envvars']]) %>
     <%- end -%>
+    <%- unless directory['passenger_preload_bundler'].nil? -%>
+    PassengerPreloadBundler <%= scope.call_function('apache::bool2httpd', [directory['passenger_preload_bundler']]) %>
+    <%- end -%>
     <%- unless directory['passenger_rolling_restarts'].nil? -%>
     PassengerRollingRestarts <%= scope.call_function('apache::bool2httpd', [directory['passenger_rolling_restarts']]) %>
     <%- end -%>
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index 6e6d6d4e5e..b14f9245b6 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -46,6 +46,9 @@
 <% unless @passenger_load_shell_envvars.nil? -%>
   PassengerLoadShellEnvvars <%= scope.call_function('apache::bool2httpd', [@passenger_load_shell_envvars]) %>
 <% end -%>
+<% unless @passenger_preload_bundler.nil? -%>
+  PassengerPreloadBundler <%= scope.call_function('apache::bool2httpd', [@passenger_preload_bundler]) %>
+<% end -%>
 <% unless @passenger_rolling_restarts.nil? -%>
   PassengerRollingRestarts <%= scope.call_function('apache::bool2httpd', [@passenger_rolling_restarts]) %>
 <% end -%>

From 2e059c15087c020d7bdfea1078756362691b6071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 4 Apr 2022 09:12:04 -1000
Subject: [PATCH 1885/2267] Fix CI

CentOS Stream verion is just `8`, not `8.foo`.
---
 spec/acceptance/mod_php_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 31b10e0f7c..40009e562d 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -44,7 +44,7 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
-    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8\.}
+    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8\b}
       describe file("#{apache_hash['mod_dir']}/php7.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end

From c0f5db51870b552752fb455f6a69e82692785774 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 20 Apr 2022 11:07:37 +0100
Subject: [PATCH 1886/2267] (maint) PDK Update

---
 .github/workflows/nightly.yml | 2 +-
 .github/workflows/spec.yml    | 8 ++++----
 metadata.json                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c8fe88a506..42816e7de7 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -200,5 +200,5 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
           # Optional Input
-          channel: '#team-ia-bots'
+          channel: '#team-cat-bots'
           name: 'GABot'
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index f51476d7a4..6c1ae10d8c 100644
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -54,10 +54,10 @@ jobs:
           buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
           echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
           echo STEP_START=$(date +%s) >> $GITHUB_ENV
-      # - name: Run Static & Syntax Tests
-      #   if: ${{ github.repository_owner == 'puppetlabs' }}
-      #   run: |
-      #     buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+      - name: Run Static & Syntax Tests
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
 
       - name: Setup Spec Test Matrix
         id: get-matrix
diff --git a/metadata.json b/metadata.json
index b60f92db70..685bd15be2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -91,5 +91,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "2.3.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-gf3911d3"
+  "template-ref": "heads/main-0-g806810b"
 }

From b0df332c4c4a15efd61e64f23a270920dde23ff4 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 20 Apr 2022 13:25:15 +0100
Subject: [PATCH 1887/2267] (maint) syntax:hiera:yaml fixes

---
 manifests/mod/ldap.pp     | 2 +-
 manifests/mod/security.pp | 2 +-
 manifests/vhost.pp        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 9c37b09e66..fab41a7d09 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -52,7 +52,7 @@
   $apache_version                                  = undef,
   $package_name                                    = undef,
   $ldap_trusted_global_cert_file                   = undef,
-  Optional[String] $ldap_trusted_global_cert_type  = 'CA_BASE64',
+  String $ldap_trusted_global_cert_type            = 'CA_BASE64',
   $ldap_shared_cache_size                          = undef,
   $ldap_cache_entries                              = undef,
   $ldap_cache_ttl                                  = undef,
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 0ffcc07e91..88a75427f4 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -220,7 +220,7 @@
 
   if $custom_rules {
     # Template to add custom rule and included in security configuration
-    file {"${modsec_dir}/custom_rules":
+    file { "${modsec_dir}/custom_rules":
       ensure  => directory,
       owner   => $apache::params::user,
       group   => $apache::params::group,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d5ba285d30..e2945abe3d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1835,8 +1835,8 @@
   $access_log_format                                                                = false,
   $access_log_env_var                                                               = false,
   Optional[Array] $access_logs                                                      = undef,
-  Optional[Boolean] $use_servername_for_filenames                                   = false,
-  Optional[Boolean] $use_port_for_filenames                                         = false,
+  Boolean $use_servername_for_filenames                                             = false,
+  Boolean $use_port_for_filenames                                                   = false,
   $aliases                                                                          = undef,
   Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                  = undef,
   Boolean $error_log                                                                = true,

From 17dd71ac4f21ec0a665ea36a1579f59a2224f001 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 20 Apr 2022 13:26:40 +0100
Subject: [PATCH 1888/2267] (maint) Rubocop Fixes

---
 spec/acceptance/vhost_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 921967b205..a5b54f635d 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -965,7 +965,7 @@ class { 'apache': }
           }
       MANIFEST
       it 'applies cleanly' do
-        result = apply_manifest(pp, catch_failures: true)
+        _result = apply_manifest(pp, catch_failures: true)
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.servername.conf") do
         it { is_expected.to be_file }
@@ -984,7 +984,7 @@ class { 'apache': }
           }
       MANIFEST
       it 'applies cleanly' do
-        result = apply_manifest(pp, catch_failures: true)
+        _result = apply_manifest(pp, catch_failures: true)
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }

From a1c595eacf1fe7a7c8e994bd8172fa77838c04ec Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 20 Apr 2022 13:27:09 +0100
Subject: [PATCH 1889/2267] (GH-cat-9) syntax:hiera:yaml exclusions added

---
 .puppet-lint.rc |  9 +++++++++
 .sync.yml       | 12 ++++++++++++
 Rakefile        | 11 +++++++++--
 metadata.json   |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index cc96ece051..240c0001ba 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1 +1,10 @@
 --relative
+--no-parameter_types-check
+--no-parameter_documentation-check
+--no-top_scope_facts-check
+--no-legacy_facts-check
+--no-relative_classname_reference-check
+--no-relative_classname_inclusion-check
+--no-anchor_resource-check
+--no-version_comparison-check
+--no-manifest_whitespace_closing_bracket_after-check
diff --git a/.sync.yml b/.sync.yml
index 60a34fd258..c6666aea96 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -35,3 +35,15 @@ Rakefile:
 .travis.yml:
   delete: true
 changelog_since_tag: "3.2.0"
+Rakefile:
+  extra_disabled_lint_checks:
+    - parameter_types
+    - parameter_documentation
+    - top_scope_facts
+    - legacy_facts
+    - relative_classname_reference
+    - relative_classname_inclusion
+    - anchor_resource
+    - version_comparison
+    - manifest_whitespace_closing_bracket_after
+
diff --git a/Rakefile b/Rakefile
index fd8011a675..19df0a4cbd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -42,6 +42,15 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.send('disable_parameter_types')
+PuppetLint.configuration.send('disable_parameter_documentation')
+PuppetLint.configuration.send('disable_top_scope_facts')
+PuppetLint.configuration.send('disable_legacy_facts')
+PuppetLint.configuration.send('disable_relative_classname_reference')
+PuppetLint.configuration.send('disable_relative_classname_inclusion')
+PuppetLint.configuration.send('disable_anchor_resource')
+PuppetLint.configuration.send('disable_version_comparison')
+PuppetLint.configuration.send('disable_manifest_whitespace_closing_bracket_after')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
@@ -50,7 +59,6 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.user = "#{changelog_user}"
     config.project = "#{changelog_project}"
     config.since_tag = "3.2.0"
-    config.max_issues = 500
     config.future_release = "#{changelog_future_release}"
     config.exclude_labels = ['maintenance']
     config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
@@ -89,4 +97,3 @@ EOM
   end
 end
 
-FastGettext.default_text_domain = 'default-text-domain'
diff --git a/metadata.json b/metadata.json
index 685bd15be2..908760b079 100644
--- a/metadata.json
+++ b/metadata.json
@@ -89,7 +89,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "2.3.0",
+  "pdk-version": "2.4.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
   "template-ref": "heads/main-0-g806810b"
 }

From 7cefcc7d5143d9ef449067b350e23e69090568d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hendrik=20J=C3=A4ger?= <hendrik.jaeger@dswiss.com>
Date: Thu, 30 Sep 2021 16:15:10 +0200
Subject: [PATCH 1890/2267] Update modsec CRS config

---
 templates/mod/security_crs.conf.erb | 1039 ++++++++++++++++++---------
 1 file changed, 717 insertions(+), 322 deletions(-)

diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 641daac3ed..1f05ee5b5a 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -1,436 +1,831 @@
-# ---------------------------------------------------------------
-# Core ModSecurity Rule Set ver.2.2.9
-# Copyright (C) 2006-2012 Trustwave All rights reserved.
+# ------------------------------------------------------------------------
+# OWASP ModSecurity Core Rule Set ver.3.3.2
+# Copyright (c) 2006-2020 Trustwave and contributors. All rights reserved.
 #
-# The OWASP ModSecurity Core Rule Set is distributed under 
+# The OWASP ModSecurity Core Rule Set is distributed under
 # Apache Software License (ASL) version 2
-# Please see the enclosed LICENCE file for full details.
-# ---------------------------------------------------------------
+# Please see the enclosed LICENSE file for full details.
+# ------------------------------------------------------------------------
 
 
 #
-# -- [[ Recommended Base Configuration ]] ------------------------------------------------- 
+# -- [[ Introduction ]] --------------------------------------------------------
+#
+# The OWASP ModSecurity Core Rule Set (CRS) is a set of generic attack
+# detection rules that provide a base level of protection for any web
+# application. They are written for the open source, cross-platform
+# ModSecurity Web Application Firewall.
+#
+# See also:
+# https://coreruleset.org/
+# https://github.com/SpiderLabs/owasp-modsecurity-crs
+# https://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project
+#
+
+
+#
+# -- [[ System Requirements ]] -------------------------------------------------
+#
+# CRS requires ModSecurity version 2.8.0 or above.
+# We recommend to always use the newest ModSecurity version.
 #
 # The configuration directives/settings in this file are used to control
 # the OWASP ModSecurity CRS. These settings do **NOT** configure the main
-# ModSecurity settings such as:
-# 
-# - SecRuleEngine
-# - SecRequestBodyAccess
-# - SecAuditEngine
-# - SecDebugLog
+# ModSecurity settings (modsecurity.conf) such as SecRuleEngine,
+# SecRequestBodyAccess, SecAuditEngine, SecDebugLog, and XML processing.
 #
-# You should use the modsecurity.conf-recommended file that comes with the
-# ModSecurity source code archive.
+# The CRS assumes that modsecurity.conf has been loaded. It is bundled with
+# ModSecurity. If you don't have it, you can get it from:
+# 2.x: https://raw.githubusercontent.com/SpiderLabs/ModSecurity/v2/master/modsecurity.conf-recommended
+# 3.x: https://raw.githubusercontent.com/SpiderLabs/ModSecurity/v3/master/modsecurity.conf-recommended
 #
-# Ref: https://github.com/SpiderLabs/ModSecurity/blob/master/modsecurity.conf-recommended 
+# The order of file inclusion in your webserver configuration should always be:
+# 1. modsecurity.conf
+# 2. crs-setup.conf (this file)
+# 3. rules/*.conf (the CRS rule files)
+#
+# Please refer to the INSTALL file for detailed installation instructions.
 #
 
 
 #
-# -- [[ Rule Version ]] -------------------------------------------------------------------
+# -- [[ Mode of Operation: Anomaly Scoring vs. Self-Contained ]] ---------------
 #
-# Rule version data is added to the "Producer" line of Section H of the Audit log:
+# The CRS can run in two modes:
 #
-# - Producer: ModSecurity for Apache/2.7.0-rc1 (http://www.modsecurity.org/); OWASP_CRS/2.2.4.
+# -- [[ Anomaly Scoring Mode (default) ]] --
+# In CRS3, anomaly mode is the default and recommended mode, since it gives the
+# most accurate log information and offers the most flexibility in setting your
+# blocking policies. It is also called "collaborative detection mode".
+# In this mode, each matching rule increases an 'anomaly score'.
+# At the conclusion of the inbound rules, and again at the conclusion of the
+# outbound rules, the anomaly score is checked, and the blocking evaluation
+# rules apply a disruptive action, by default returning an error 403.
 #
-# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecComponentSignature 
+# -- [[ Self-Contained Mode ]] --
+# In this mode, rules apply an action instantly. This was the CRS2 default.
+# It can lower resource usage, at the cost of less flexibility in blocking policy
+# and less informative audit logs (only the first detected threat is logged).
+# Rules inherit the disruptive action that you specify (i.e. deny, drop, etc).
+# The first rule that matches will execute this action. In most cases this will
+# cause evaluation to stop after the first rule has matched, similar to how many
+# IDSs function.
 #
-SecComponentSignature "OWASP_CRS/2.2.9"
+# -- [[ Alert Logging Control ]] --
+# In the mode configuration, you must also adjust the desired logging options.
+# There are three common options for dealing with logging. By default CRS enables
+# logging to the webserver error log (or Event viewer) plus detailed logging to
+# the ModSecurity audit log (configured under SecAuditLog in modsecurity.conf).
+#
+# - To log to both error log and ModSecurity audit log file, use: "log,auditlog"
+# - To log *only* to the ModSecurity audit log file, use: "nolog,auditlog"
+# - To log *only* to the error log file, use: "log,noauditlog"
+#
+# Examples for the various modes follow.
+# You must leave one of the following options enabled.
+# Note that you must specify the same line for phase:1 and phase:2.
+#
+
+# Default: Anomaly Scoring mode, log to error log, log to ModSecurity audit log
+# - By default, offending requests are blocked with an error 403 response.
+# - To change the disruptive action, see RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf.example
+#   and review section 'Changing the Disruptive Action for Anomaly Mode'.
+# - In Apache, you can use ErrorDocument to show a friendly error page or
+#   perform a redirect: https://httpd.apache.org/docs/2.4/custom-error.html
+#
+SecDefaultAction "phase:1,log,auditlog,pass"
+SecDefaultAction "phase:2,log,auditlog,pass"
+
+# Example: Anomaly Scoring mode, log only to ModSecurity audit log
+# - By default, offending requests are blocked with an error 403 response.
+# - To change the disruptive action, see RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf.example
+#   and review section 'Changing the Disruptive Action for Anomaly Mode'.
+# - In Apache, you can use ErrorDocument to show a friendly error page or
+#   perform a redirect: https://httpd.apache.org/docs/2.4/custom-error.html
+#
+# SecDefaultAction "phase:1,nolog,auditlog,pass"
+# SecDefaultAction "phase:2,nolog,auditlog,pass"
+
+# Example: Self-contained mode, return error 403 on blocking
+# - In this configuration the default disruptive action becomes 'deny'. After a
+#   rule triggers, it will stop processing the request and return an error 403.
+# - You can also use a different error status, such as 404, 406, et cetera.
+# - In Apache, you can use ErrorDocument to show a friendly error page or
+#   perform a redirect: https://httpd.apache.org/docs/2.4/custom-error.html
+#
+# SecDefaultAction "phase:1,log,auditlog,deny,status:403"
+# SecDefaultAction "phase:2,log,auditlog,deny,status:403"
+
+# Example: Self-contained mode, redirect back to homepage on blocking
+# - In this configuration the 'tag' action includes the Host header data in the
+#   log. This helps to identify which virtual host triggered the rule (if any).
+# - Note that this might cause redirect loops in some situations; for example
+#   if a Cookie or User-Agent header is blocked, it will also be blocked when
+#   the client subsequently tries to access the homepage. You can also redirect
+#   to another custom URL.
+# SecDefaultAction "phase:1,log,auditlog,redirect:'http://%{request_headers.host}/',tag:'Host: %{request_headers.host}'"
+# SecDefaultAction "phase:2,log,auditlog,redirect:'http://%{request_headers.host}/',tag:'Host: %{request_headers.host}'"
 
+SecDefaultAction "phase:1,<%= @_secdefaultaction -%>"
+SecDefaultAction "phase:2,<%= @_secdefaultaction -%>"
 
 #
-# -- [[ Modes of Operation: Self-Contained vs. Collaborative Detection ]] -----------------
-#
-# Each detection rule uses the "block" action which will inherit the SecDefaultAction
-# specified below.  Your settings here will determine which mode of operation you use.
+# -- [[ Paranoia Level Initialization ]] ---------------------------------------
+#
+# The Paranoia Level (PL) setting allows you to choose the desired level
+# of rule checks that will add to your anomaly scores.
+#
+# With each paranoia level increase, the CRS enables additional rules
+# giving you a higher level of security. However, higher paranoia levels
+# also increase the possibility of blocking some legitimate traffic due to
+# false alarms (also named false positives or FPs). If you use higher
+# paranoia levels, it is likely that you will need to add some exclusion
+# rules for certain requests and applications receiving complex input.
+#
+# - A paranoia level of 1 is default. In this level, most core rules
+#   are enabled. PL1 is advised for beginners, installations
+#   covering many different sites and applications, and for setups
+#   with standard security requirements.
+#   At PL1 you should face FPs rarely. If you encounter FPs, please
+#   open an issue on the CRS GitHub site and don't forget to attach your
+#   complete Audit Log record for the request with the issue.
+# - Paranoia level 2 includes many extra rules, for instance enabling
+#   many regexp-based SQL and XSS injection protections, and adding
+#   extra keywords checked for code injections. PL2 is advised
+#   for moderate to experienced users desiring more complete coverage
+#   and for installations with elevated security requirements.
+#   PL2 comes with some FPs which you need to handle.
+# - Paranoia level 3 enables more rules and keyword lists, and tweaks
+#   limits on special characters used. PL3 is aimed at users experienced
+#   at the handling of FPs and at installations with a high security
+#   requirement.
+# - Paranoia level 4 further restricts special characters.
+#   The highest level is advised for experienced users protecting
+#   installations with very high security requirements. Running PL4 will
+#   likely produce a very high number of FPs which have to be
+#   treated before the site can go productive.
+#
+# All rules will log their PL to the audit log;
+# example: [tag "paranoia-level/2"]. This allows you to deduct from the
+# audit log how the WAF behavior is affected by paranoia level.
+#
+# It is important to also look into the variable
+# tx.enforce_bodyproc_urlencoded (Enforce Body Processor URLENCODED)
+# defined below. Enabling it closes a possible bypass of CRS.
+#
+# Uncomment this rule to change the default:
 #
-# -- [[ Self-Contained Mode ]] --
-# Rules inherit the "deny" disruptive action.  The first rule that matches will block.
+#SecAction \
+#  "id:900000,\
+#   phase:1,\
+#   nolog,\
+#   pass,\
+#   t:none,\
+#   setvar:tx.paranoia_level=1"
+
+
+# It is possible to execute rules from a higher paranoia level but not include
+# them in the anomaly scoring. This allows you to take a well-tuned system on
+# paranoia level 1 and add rules from paranoia level 2 without having to fear
+# the new rules would lead to false positives that raise your score above the
+# threshold.
+# This optional feature is enabled by uncommenting the following rule and
+# setting the tx.executing_paranoia_level.
+# Technically, rules up to the level defined in tx.executing_paranoia_level
+# will be executed, but only the rules up to tx.paranoia_level affect the
+# anomaly scores.
+# By default, tx.executing_paranoia_level is set to tx.paranoia_level.
+# tx.executing_paranoia_level must not be lower than tx.paranoia_level.
+#
+# Please notice that setting tx.executing_paranoia_level to a higher paranoia
+# level results in a performance impact that is equally high as setting
+# tx.paranoia_level to said level.
 #
-# -- [[ Collaborative Detection Mode ]] --
-# This is a "delayed blocking" mode of operation where each matching rule will inherit
-# the "pass" action and will only contribute to anomaly scores.  Transactional blocking
-# can be applied 
+#SecAction \
+#  "id:900001,\
+#   phase:1,\
+#   nolog,\
+#   pass,\
+#   t:none,\
+#   setvar:tx.executing_paranoia_level=1"
+
+
 #
-# -- [[ Alert Logging Control ]] --
-# You have three options -
+# -- [[ Enforce Body Processor URLENCODED ]] -----------------------------------
 #
-# - To log to both the Apache error_log and ModSecurity audit_log file use: "log"
-# - To log *only* to the ModSecurity audit_log file use: "nolog,auditlog"
-# - To log *only* to the Apache error_log file use: "log,noauditlog"
+# ModSecurity selects the body processor based on the Content-Type request
+# header. But clients are not always setting the Content-Type header for their
+# request body payloads. This will leave ModSecurity with limited vision into
+# the payload.  The variable tx.enforce_bodyproc_urlencoded lets you force the
+# URLENCODED body processor in these situations. This is off by default, as it
+# implies a change of the behaviour of ModSecurity beyond CRS (the body
+# processor applies to all rules, not only CRS) and because it may lead to
+# false positives already on paranoia level 1. However, enabling this variable
+# closes a possible bypass of CRS so it should be considered.
 #
-# Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html
-# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecDefaultAction 
+# Uncomment this rule to change the default:
 #
-SecDefaultAction "phase:1,<%= @_secdefaultaction -%>"
-SecDefaultAction "phase:2,<%= @_secdefaultaction -%>"
+#SecAction \
+#  "id:900010,\
+#   phase:1,\
+#   nolog,\
+#   pass,\
+#   t:none,\
+#   setvar:tx.enforce_bodyproc_urlencoded=1"
+
 
 #
-# -- [[ Collaborative Detection Severity Levels ]] ----------------------------------------
+# -- [[ Anomaly Mode Severity Levels ]] ----------------------------------------
 #
-# These are the default scoring points for each severity level.  You may
-# adjust these to you liking.  These settings will be used in macro expansion
-# in the rules to increment the anomaly scores when rules match.
+# Each rule in the CRS has an associated severity level.
+# These are the default scoring points for each severity level.
+# These settings will be used to increment the anomaly score if a rule matches.
+# You may adjust these points to your liking, but this is usually not needed.
 #
-# These are the default Severity ratings (with anomaly scores) of the individual rules -
+# - CRITICAL severity: Anomaly Score of 5.
+#       Mostly generated by the application attack rules (93x and 94x files).
+# - ERROR severity: Anomaly Score of 4.
+#       Generated mostly from outbound leakage rules (95x files).
+# - WARNING severity: Anomaly Score of 3.
+#       Generated mostly by malicious client rules (91x files).
+# - NOTICE severity: Anomaly Score of 2.
+#       Generated mostly by the protocol rules (92x files).
 #
-#    - 2: Critical - Anomaly Score of 5.
-#         Is the highest severity level possible without correlation.  It is
-#         normally generated by the web attack rules (40 level files).
-#    - 3: Error - Anomaly Score of 4.
-#         Is generated mostly from outbound leakage rules (50 level files).
-#    - 4: Warning - Anomaly Score of 3.
-#         Is generated by malicious client rules (35 level files).
-#    - 5: Notice - Anomaly Score of 2.
-#         Is generated by the Protocol policy and anomaly files.
+# In anomaly mode, these scores are cumulative.
+# So it's possible for a request to hit multiple rules.
+#
+# (Note: In this file, we use 'phase:1' to set CRS configuration variables.
+# In general, 'phase:request' is used. However, we want to make absolutely sure
+# that all configuration variables are set before the CRS rules are processed.)
 #
 SecAction \
-  "id:'900001', \
-  phase:1, \
-  t:none, \
+ "id:900100,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
   setvar:tx.critical_anomaly_score=<%= @critical_anomaly_score -%>, \
   setvar:tx.error_anomaly_score=<%= @error_anomaly_score -%>, \
   setvar:tx.warning_anomaly_score=<%= @warning_anomaly_score -%>, \
-  setvar:tx.notice_anomaly_score=<%= @notice_anomaly_score -%>, \
-  nolog, \
-  pass"
+  setvar:tx.notice_anomaly_score=<%= @notice_anomaly_score -%>"
 
 
 #
-# -- [[ Collaborative Detection Scoring Initialization and Threshold Levels ]] ------------------------------
+# -- [[ Anomaly Mode Blocking Threshold Levels ]] ------------------------------
+#
+# Here, you can specify at which cumulative anomaly score an inbound request,
+# or outbound response, gets blocked.
+#
+# Most detected inbound threats will give a critical score of 5.
+# Smaller violations, like violations of protocol/standards, carry lower scores.
 #
-# These variables are used in macro expansion in the 49 inbound blocking and 59
-# outbound blocking files.
+# [ At default value ]
+# If you keep the blocking thresholds at the defaults, the CRS will work
+# similarly to previous CRS versions: a single critical rule match will cause
+# the request to be blocked and logged.
 #
-# **MUST HAVE** ModSecurity v2.5.12 or higher to use macro expansion in numeric
-# operators.  If you have an earlier version, edit the 49/59 files directly to
-# set the appropriate anomaly score levels.
+# [ Using higher values ]
+# If you want to make the CRS less sensitive, you can increase the blocking
+# thresholds, for instance to 7 (which would require multiple rule matches
+# before blocking) or 10 (which would require at least two critical alerts - or
+# a combination of many lesser alerts), or even higher. However, increasing the
+# thresholds might cause some attacks to bypass the CRS rules or your policies.
 #
-# You should set the score level (rule 900003) to the proper threshold you 
-# would prefer.  If set to "5" it will work similarly to previous Mod CRS rules
-# and will create an event in the error_log file if there are any rules that
-# match.  If you would like to lessen the number of events generated in the 
-# error_log file, you should increase the anomaly score threshold to something 
-# like "20".  This would only generate an event in the error_log file if there
-# are multiple lower severity rule matches or if any 1 higher severity item matches.
+# [ New deployment strategy: Starting high and decreasing ]
+# It is a common practice to start a fresh CRS installation with elevated
+# anomaly scoring thresholds (>100) and then lower the limits as your
+# confidence in the setup grows. You may also look into the Sampling
+# Percentage section below for a different strategy to ease into a new
+# CRS installation.
+#
+# [ Anomaly Threshold / Paranoia Level Quadrant ]
+#
+#     High Anomaly Limit   |   High Anomaly Limit
+#     Low Paranoia Level   |   High Paranoia Level
+#     -> Fresh Site        |   -> Experimental Site
+# ------------------------------------------------------
+#     Low Anomaly Limit    |   Low Anomaly Limit
+#     Low Paranoia Level   |   High Paranoia Level
+#     -> Standard Site     |   -> High Security Site
+#
+# Uncomment this rule to change the defaults:
 #
 SecAction \
-  "id:'900002', \
-  phase:1, \
-  t:none, \
-  setvar:tx.anomaly_score=0, \
-  setvar:tx.sql_injection_score=0, \
-  setvar:tx.xss_score=0, \
-  setvar:tx.inbound_anomaly_score=0, \
-  setvar:tx.outbound_anomaly_score=0, \
-  nolog, \
-  pass"
-
-
+ "id:900110,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:tx.inbound_anomaly_score_threshold=<%= @inbound_anomaly_threshold -%>, \
+  setvar:tx.outbound_anomaly_score_threshold=<%= @outbound_anomaly_threshold -%>"
+
+#
+# -- [[ Application Specific Rule Exclusions ]] ----------------------------------------
+#
+# Some well-known applications may undertake actions that appear to be
+# malicious. This includes actions such as allowing HTML or Javascript within
+# parameters. In such cases the CRS aims to prevent false positives by allowing
+# administrators to enable prebuilt, application specific exclusions on an
+# application by application basis.
+# These application specific exclusions are distinct from the rules that would
+# be placed in the REQUEST-900-EXCLUSION-RULES-BEFORE-CRS configuration file as
+# they are prebuilt for specific applications. The 'REQUEST-900' file is
+# designed for users to add their own custom exclusions. Note, using these
+# application specific exclusions may loosen restrictions of the CRS,
+# especially if used with an application they weren't designed for. As a result
+# they should be applied with care.
+# To use this functionality you must specify a supported application. To do so
+# uncomment rule 900130. In addition to uncommenting the rule you will need to
+# specify which application(s) you'd like to enable exclusions for. Only a
+# (very) limited set of applications are currently supported, please use the
+# filenames prefixed with 'REQUEST-903' to guide you in your selection.
+# Such filenames use the following convention:
+# REQUEST-903.9XXX-{APPNAME}-EXCLUSIONS-RULES.conf
+#
+# It is recommended if you run multiple web applications on your site to limit
+# the effects of the exclusion to only the path where the excluded webapp
+# resides using a rule similar to the following example:
+# SecRule REQUEST_URI "@beginsWith /wordpress/" setvar:tx.crs_exclusions_wordpress=1
+
+#
+# Modify and uncomment this rule to select which application:
+#
+#SecAction \
+# "id:900130,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.crs_exclusions_cpanel=1,\
+#  setvar:tx.crs_exclusions_drupal=1,\
+#  setvar:tx.crs_exclusions_dokuwiki=1,\
+#  setvar:tx.crs_exclusions_nextcloud=1,\
+#  setvar:tx.crs_exclusions_wordpress=1,\
+#  setvar:tx.crs_exclusions_xenforo=1"
+
+#
+# -- [[ HTTP Policy Settings ]] ------------------------------------------------
+#
+# This section defines your policies for the HTTP protocol, such as:
+# - allowed HTTP versions, HTTP methods, allowed request Content-Types
+# - forbidden file extensions (e.g. .bak, .sql) and request headers (e.g. Proxy)
+#
+# These variables are used in the following rule files:
+# - REQUEST-911-METHOD-ENFORCEMENT.conf
+# - REQUEST-912-DOS-PROTECTION.conf
+# - REQUEST-920-PROTOCOL-ENFORCEMENT.conf
+
+# HTTP methods that a client is allowed to use.
+# Default: GET HEAD POST OPTIONS
+# Example: for RESTful APIs, add the following methods: PUT PATCH DELETE
+# Example: for WebDAV, add the following methods: CHECKOUT COPY DELETE LOCK
+#          MERGE MKACTIVITY MKCOL MOVE PROPFIND PROPPATCH PUT UNLOCK
+# Uncomment this rule to change the default.
 SecAction \
-  "id:'900003', \
-  phase:1, \
-  t:none, \
-  setvar:tx.inbound_anomaly_score_level=<%= @inbound_anomaly_threshold -%>, \
-  setvar:tx.outbound_anomaly_score_level=<%= @outbound_anomaly_threshold -%>, \
-  nolog, \
-  pass"
-
+ "id:900200,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.allowed_methods=<%= @allowed_methods -%>'"
+
+# Content-Types that a client is allowed to send in a request.
+# Default: |application/x-www-form-urlencoded| |multipart/form-data| |multipart/related|
+# |text/xml| |application/xml| |application/soap+xml| |application/x-amf| |application/json|
+# |application/cloudevents+json| |application/cloudevents-batch+json| |application/octet-stream|
+# |application/csp-report| |application/xss-auditor-report| |text/plain|
+# Uncomment this rule to change the default.
+SecAction \
+ "id:900220,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.allowed_request_content_type=<%= @content_types -%>'"
+
+# Allowed HTTP versions.
+# Default: HTTP/1.0 HTTP/1.1 HTTP/2 HTTP/2.0
+# Example for legacy clients: HTTP/0.9 HTTP/1.0 HTTP/1.1 HTTP/2 HTTP/2.0
+# Note that some web server versions use 'HTTP/2', some 'HTTP/2.0', so
+# we include both version strings by default.
+# Uncomment this rule to change the default.
+#SecAction \
+# "id:900230,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:'tx.allowed_http_versions=HTTP/1.0 HTTP/1.1 HTTP/2 HTTP/2.0'"
+
+# Forbidden file extensions.
+# Guards against unintended exposure of development/configuration files.
+# Default: .asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .rdb/ .resources/ .resx/ .sql/ .swp/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/
+# Example: .bak/ .config/ .conf/ .db/ .ini/ .log/ .old/ .pass/ .pdb/ .rdb/ .sql/
+# Uncomment this rule to change the default.
+SecAction \
+ "id:900240,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.restricted_extensions=<%= @restricted_extensions -%>'"
+
+# Forbidden request headers.
+# Header names should be lowercase, enclosed by /slashes/ as delimiters.
+# Blocking Proxy header prevents 'httpoxy' vulnerability: https://httpoxy.org
+# Default: /proxy/ /lock-token/ /content-range/ /if/
+# Uncomment this rule to change the default.
+SecAction \
+ "id:900250,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.restricted_headers=<%= @restricted_headers -%>'"
+
+# File extensions considered static files.
+# Extensions include the dot, lowercase, enclosed by /slashes/ as delimiters.
+# Used in DoS protection rule. See section "Anti-Automation / DoS Protection".
+# Default: /.jpg/ /.jpeg/ /.png/ /.gif/ /.js/ /.css/ /.ico/ /.svg/ /.webp/
+# Uncomment this rule to change the default.
+#SecAction \
+# "id:900260,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:'tx.static_extensions=/.jpg/ /.jpeg/ /.png/ /.gif/ /.js/ /.css/ /.ico/ /.svg/ /.webp/'"
+
+# Content-Types charsets that a client is allowed to send in a request.
+# Default: utf-8|iso-8859-1|iso-8859-15|windows-1252
+# Uncomment this rule to change the default.
+# Use "|" to separate multiple charsets like in the rule defining
+# tx.allowed_request_content_type.
+#SecAction \
+# "id:900280,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:'tx.allowed_request_content_type_charset=utf-8|iso-8859-1|iso-8859-15|windows-1252'"
 
-# 
-# -- [[ Collaborative Detection Blocking ]] -----------------------------------------------
 #
-# This is a collaborative detection mode where each rule will increment an overall
-# anomaly score for the transaction. The scores are then evaluated in the following files:
+# -- [[ HTTP Argument/Upload Limits ]] -----------------------------------------
 #
-# Inbound anomaly score - checked in the modsecurity_crs_49_inbound_blocking.conf file
-# Outbound anomaly score - checked in the modsecurity_crs_59_outbound_blocking.conf file
+# Here you can define optional limits on HTTP get/post parameters and uploads.
+# This can help to prevent application specific DoS attacks.
 #
-# If you want to use anomaly scoring mode, then uncomment this line.
+# These values are checked in REQUEST-920-PROTOCOL-ENFORCEMENT.conf.
+# Beware of blocking legitimate traffic when enabling these limits.
 #
+
+# Block request if number of arguments is too high
+# Default: unlimited
+# Example: 255
+# Uncomment this rule to set a limit.
 SecAction \
-  "id:'900004', \
-  phase:1, \
-  t:none, \
-  setvar:tx.anomaly_score_blocking=<%= @anomaly_score_blocking -%>, \
-  nolog, \
-  pass"
+ "id:900300,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:tx.max_num_args=<%= @secrequestmaxnumargs %>"
+
+# Block request if the length of any argument name is too high
+# Default: unlimited
+# Example: 100
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900310,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.arg_name_length=100"
+
+# Block request if the length of any argument value is too high
+# Default: unlimited
+# Example: 400
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900320,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.arg_length=400"
+
+# Block request if the total length of all combined arguments is too high
+# Default: unlimited
+# Example: 64000
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900330,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.total_arg_length=64000"
+
+# Block request if the file size of any individual uploaded file is too high
+# Default: unlimited
+# Example: 1048576
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900340,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.max_file_size=1048576"
+
+# Block request if the total size of all combined uploaded files is too high
+# Default: unlimited
+# Example: 1048576
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900350,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.combined_file_sizes=1048576"
 
 
 #
-# -- [[ GeoIP Database ]] -----------------------------------------------------------------
+# -- [[ Easing In / Sampling Percentage ]] -------------------------------------
 #
-# There are some rulesets that need to inspect the GEO data of the REMOTE_ADDR data.
-# 
-# You must first download the MaxMind GeoIP Lite City DB -
+# Adding the Core Rule Set to an existing productive site can lead to false
+# positives, unexpected performance issues and other undesired side effects.
 #
-#       http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+# It can be beneficial to test the water first by enabling the CRS for a
+# limited number of requests only and then, when you have solved the issues (if
+# any) and you have confidence in the setup, to raise the ratio of requests
+# being sent into the ruleset.
 #
-# You then need to define the proper path for the SecGeoLookupDb directive
+# Adjust the percentage of requests that are funnelled into the Core Rules by
+# setting TX.sampling_percentage below. The default is 100, meaning that every
+# request gets checked by the CRS.  The selection of requests, which are going
+# to be checked, is based on a pseudo random number generated by ModSecurity.
 #
-# Ref: http://blog.spiderlabs.com/2010/10/detecting-malice-with-modsecurity-geolocation-data.html
-# Ref: http://blog.spiderlabs.com/2010/11/detecting-malice-with-modsecurity-ip-forensics.html
+# If a request is allowed to pass without being checked by the CRS, there is no
+# entry in the audit log (for performance reasons), but an error log entry is
+# written.  If you want to disable the error log entry, then issue the
+# following directive somewhere after the inclusion of the CRS
+# (E.g., RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf).
+#
+# SecRuleUpdateActionById 901150 "nolog"
+#
+# ATTENTION: If this TX.sampling_percentage is below 100, then some of the
+# requests will bypass the Core Rules completely and you lose the ability to
+# protect your service with ModSecurity.
+#
+# Uncomment this rule to enable this feature:
 #
-#SecGeoLookupDb /opt/modsecurity/lib/GeoLiteCity.dat
+#SecAction "id:900400,\
+#  phase:1,\
+#  pass,\
+#  nolog,\
+#  setvar:tx.sampling_percentage=100"
 
+
+#
+# -- [[ Project Honey Pot HTTP Blacklist ]] ------------------------------------
 #
-# -- [[ Regression Testing Mode ]] --------------------------------------------------------
+# Optionally, you can check the client IP address against the Project Honey Pot
+# HTTPBL (dnsbl.httpbl.org). In order to use this, you need to register to get a
+# free API key. Set it here with SecHttpBlKey.
 #
-# If you are going to run the regression testing mode, you should uncomment the
-# following rule. It will enable DetectionOnly mode for the SecRuleEngine and
-# will enable Response Header tagging so that the client testing script can see
-# which rule IDs have matched.
+# Project Honeypot returns multiple different malicious IP types.
+# You may specify which you want to block by enabling or disabling them below.
 #
-# You must specify the your source IP address where you will be running the tests
-# from.
+# Ref: https://www.projecthoneypot.org/httpbl.php
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecHttpBlKey
 #
-#SecRule REMOTE_ADDR "@ipMatch 192.168.1.100" \
-  "id:'900005', \
-  phase:1, \
-  t:none, \
-  ctl:ruleEngine=DetectionOnly, \
-  setvar:tx.regression_testing=1, \
-  nolog, \
-  pass"
+# Uncomment these rules to use this feature:
+#
+#SecHttpBlKey XXXXXXXXXXXXXXXXX
+#SecAction "id:900500,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.block_search_ip=1,\
+#  setvar:tx.block_suspicious_ip=1,\
+#  setvar:tx.block_harvester_ip=1,\
+#  setvar:tx.block_spammer_ip=1"
 
 
 #
-# -- [[ HTTP Policy Settings ]] ----------------------------------------------------------
+# -- [[ GeoIP Database ]] ------------------------------------------------------
 #
-# Set the following policy settings here and they will be propagated to the 23 rules
-# file (modsecurity_common_23_request_limits.conf) by using macro expansion.  
-# If you run into false positives, you can adjust the settings here.
+# There are some rulesets that inspect geolocation data of the client IP address
+# (geoLookup). The CRS uses geoLookup to implement optional country blocking.
 #
-# Only the max number of args is uncommented by default as there are a high rate
-# of false positives.  Uncomment the items you wish to set.
-# 
+# To use geolocation, we make use of the MaxMind GeoIP database.
+# This database is not included with the CRS and must be downloaded.
 #
-# -- Maximum number of arguments in request limited
-SecAction \
-  "id:'900006', \
-  phase:1, \
-  t:none, \
-  setvar:tx.max_num_args=<%= @secrequestmaxnumargs %>, \
-  nolog, \
-  pass"
-
+# There are two formats for the GeoIP database. ModSecurity v2 uses GeoLite (.dat files),
+# and ModSecurity v3 uses GeoLite2 (.mmdb files).
 #
-# -- Limit argument name length
-#SecAction \
-  "id:'900007', \
-  phase:1, \
-  t:none, \
-  setvar:tx.arg_name_length=100, \
-  nolog, \
-  pass"
-
+# If you use ModSecurity 3, MaxMind provides a binary for updating GeoLite2 files,
+# see https://github.com/maxmind/geoipupdate.
 #
-# -- Limit value name length
-#SecAction \
-  "id:'900008', \
-  phase:1, \
-  t:none, \
-  setvar:tx.arg_length=400, \
-  nolog, \
-  pass"
-
+# Download the package for your OS, and read https://dev.maxmind.com/geoip/geoipupdate/
+# for configuration options.
 #
-# -- Limit arguments total length
-#SecAction \
-  "id:'900009', \
-  phase:1, \
-  t:none, \
-  setvar:tx.total_arg_length=64000, \
-  nolog, \
-  pass"
-
+# Warning: GeoLite (not GeoLite2) databases are considered legacy, and not being updated anymore.
+# See https://support.maxmind.com/geolite-legacy-discontinuation-notice/ for more info.
 #
-# -- Individual file size is limited
-#SecAction \
-  "id:'900010', \
-  phase:1, \
-  t:none, \
-  setvar:tx.max_file_size=1048576, \
-  nolog, \
-  pass"
-
+# Therefore, if you use ModSecurity v2, you need to regenerate updated .dat files
+# from CSV files first.
 #
-# -- Combined file size is limited
-#SecAction \
-  "id:'900011', \
-  phase:1, \
-  t:none, \
-  setvar:tx.combined_file_sizes=1048576, \
-  nolog, \
-  pass"
-
-
+# You can achieve this using https://github.com/sherpya/geolite2legacy
+# Pick the zip files from maxmind site:
+# https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip
 #
-# Set the following policy settings here and they will be propagated to the 30 rules
-# file (modsecurity_crs_30_http_policy.conf) by using macro expansion.  
-# If you run into false positves, you can adjust the settings here.
+# Follow the guidelines for installing the tool and run:
+# ./geolite2legacy.py -i GeoLite2-Country-CSV.zip \
+#                     -f geoname2fips.csv -o /usr/share/GeoliteCountry.dat
 #
-SecAction \
-  "id:'900012', \
-  phase:1, \
-  t:none, \
-  setvar:'tx.allowed_methods=<%= @allowed_methods -%>', \
-  setvar:'tx.allowed_request_content_type=<%= @content_types -%>', \
-  setvar:'tx.allowed_http_versions=HTTP/0.9 HTTP/1.0 HTTP/1.1', \
-  setvar:'tx.restricted_extensions=<%= @restricted_extensions -%>', \
-  setvar:'tx.restricted_headers=<%= @restricted_headers -%>', \
-  nolog, \
-  pass"
-
-
+# Update the database regularly, see Step 3 of the configuration link above.
 #
-# -- [[ Content Security Policy (CSP) Settings ]] -----------------------------------------
+# By default, when you execute `sudo geoipupdate` on Linux, files from the free database
+# will be downloaded to `/usr/share/GeoIP` (both v1 and v2).
 #
-# The purpose of these settings is to send CSP response headers to
-# Mozilla FireFox users so that you can enforce how dynamic content
-# is used. CSP usage helps to prevent XSS attacks against your users.
-#  
-# Reference Link:
+# Then choose from:
+#   - `GeoLite2-Country.mmdb` (if you are using ModSecurity v3)
+#   - `GeoLiteCountry.dat`    (if you are using ModSecurity v2)
 #
-#	https://developer.mozilla.org/en/Security/CSP
+# Ref: http://blog.spiderlabs.com/2010/10/detecting-malice-with-modsecurity-geolocation-data.html
+# Ref: http://blog.spiderlabs.com/2010/11/detecting-malice-with-modsecurity-ip-forensics.html
 #
-# Uncomment this SecAction line if you want use CSP enforcement.
-# You need to set the appropriate directives and settings for your site/domain and
-# and activate the CSP file in the experimental_rules directory.
-# 
-# Ref: http://blog.spiderlabs.com/2011/04/modsecurity-advanced-topic-of-the-week-integrating-content-security-policy-csp.html
+# Uncomment only one of the next rules here to use this feature.
+# Choose the one depending on the ModSecurity version you are using, and change the path accordingly:
 #
-#SecAction \
-  "id:'900013', \
-  phase:1, \
-  t:none, \
-  setvar:tx.csp_report_only=1, \
-  setvar:tx.csp_report_uri=/csp_violation_report, \
-  setenv:'csp_policy=allow \'self\'; img-src *.yoursite.com; media-src *.yoursite.com; style-src *.yoursite.com; frame-ancestors *.yoursite.com; script-src *.yoursite.com; report-uri %{tx.csp_report_uri}', \
-  nolog, \
-  pass"
-
+# For ModSecurity v3:
+#SecGeoLookupDB /usr/share/GeoIP/GeoLite2-Country.mmdb
+# For ModSecurity v2 (points to the converted one):
+#SecGeoLookupDB /usr/share/GeoIP/GeoLiteCountry.dat
 
 #
-# -- [[ Brute Force Protection ]] ---------------------------------------------------------
+# -=[ Block Countries ]=-
+#
+# Rules in the IP Reputation file can check the client against a list of high
+# risk country codes. These countries have to be defined in the variable
+# tx.high_risk_country_codes via their ISO 3166 two-letter country code:
+# https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements
+#
+# If you are sure that you are not getting any legitimate requests from a given
+# country, then you can disable all access from that country via this variable.
+# The rule performing the test has the rule id 910100.
 #
-# If you are using the Brute Force Protection rule set, then uncomment the following
-# lines and set the following variables:
-# - Protected URLs: resources to protect (e.g. login pages) - set to your login page
-# - Burst Time Slice Interval: time interval window to monitor for bursts
-# - Request Threshold: request # threshold to trigger a burst
-# - Block Period: temporary block timeout
+# This rule requires SecGeoLookupDB to be enabled and the GeoIP database to be
+# downloaded (see the section "GeoIP Database" above.)
+#
+# By default, the list is empty. A list used by some sites was the following:
+# setvar:'tx.high_risk_country_codes=UA ID YU LT EG RO BG TR RU PK MY CN'"
+#
+# Uncomment this rule to use this feature:
 #
 #SecAction \
-  "id:'900014', \
-  phase:1, \
-  t:none, \
-  setvar:'tx.brute_force_protected_urls=#/login.jsp# #/partner_login.php#', \
-  setvar:'tx.brute_force_burst_time_slice=60', \
-  setvar:'tx.brute_force_counter_threshold=10', \
-  setvar:'tx.brute_force_block_timeout=300', \
-  nolog, \
-  pass"
+# "id:900600,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:'tx.high_risk_country_codes='"
 
 
 #
-# -- [[ DoS Protection ]] ----------------------------------------------------------------
+# -- [[ Anti-Automation / DoS Protection ]] ------------------------------------
+#
+# Optional DoS protection against clients making requests too quickly.
+#
+# When a client is making more than 100 requests (excluding static files) within
+# 60 seconds, this is considered a 'burst'. After two bursts, the client is
+# blocked for 600 seconds.
 #
-# If you are using the DoS Protection rule set, then uncomment the following
-# lines and set the following variables:
-# - Burst Time Slice Interval: time interval window to monitor for bursts
-# - Request Threshold: request # threshold to trigger a burst
-# - Block Period: temporary block timeout
+# Requests to static files are not counted towards DoS; they are listed in the
+# 'tx.static_extensions' setting, which you can change in this file (see
+# section "HTTP Policy Settings").
+#
+# For a detailed description, see rule file REQUEST-912-DOS-PROTECTION.conf.
+#
+# Uncomment this rule to use this feature:
 #
 SecAction \
-  "id:'900015', \
-  phase:1, \
-  t:none, \
-  setvar:'tx.dos_burst_time_slice=60', \
-  setvar:'tx.dos_counter_threshold=100', \
-  setvar:'tx.dos_block_timeout=600', \
-  nolog, \
-  pass"
+ "id:900700,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.dos_burst_time_slice=60',\
+  setvar:'tx.dos_counter_threshold=100',\
+  setvar:'tx.dos_block_timeout=600'"
 
 
 #
-# -- [[ Check UTF enconding ]] -----------------------------------------------------------
+# -- [[ Check UTF-8 encoding ]] ------------------------------------------------
+#
+# The CRS can optionally check request contents for invalid UTF-8 encoding.
+# We only want to apply this check if UTF-8 encoding is actually used by the
+# site; otherwise it will result in false positives.
 #
-# We only want to apply this check if UTF-8 encoding is actually used by the site, otherwise
-# it will result in false positives.
+# Uncomment this rule to use this feature:
 #
-# Uncomment this line if your site uses UTF8 encoding
 #SecAction \
-  "id:'900016', \
-  phase:1, \
-  t:none, \
-  setvar:tx.crs_validate_utf8_encoding=1, \
-  nolog, \
-  pass"
+# "id:900950,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.crs_validate_utf8_encoding=1"
 
 
 #
-# -- [[ Enable XML Body Parsing ]] -------------------------------------------------------
+# -- [[ Blocking Based on IP Reputation ]] ------------------------------------
 #
-# The rules in this file will trigger the XML parser upon an XML request
+# Blocking based on reputation is permanent in the CRS. Unlike other rules,
+# which look at the individual request, the blocking of IPs is based on
+# a persistent record in the IP collection, which remains active for a
+# certain amount of time.
 #
-# Initiate XML Processor in case of xml content-type
+# There are two ways an individual client can become flagged for blocking:
+# - External information (RBL, GeoIP, etc.)
+# - Internal information (Core Rules)
 #
-SecRule REQUEST_HEADERS:Content-Type "text/xml" \
-  "id:'900017', \
-  phase:1, \
-  t:none,t:lowercase, \
-  nolog, \
-  pass, \
-  chain"
-	SecRule REQBODY_PROCESSOR "!@streq XML" \
-	  "ctl:requestBodyProcessor=XML"
-
-
+# The record in the IP collection carries a flag, which tags requests from
+# individual clients with a flag named IP.reput_block_flag.
+# But the flag alone is not enough to have a client blocked. There is also
+# a global switch named tx.do_reput_block. This is off by default. If you set
+# it to 1 (=On), requests from clients with the IP.reput_block_flag will
+# be blocked for a certain duration.
 #
-# -- [[ Global and IP Collections ]] -----------------------------------------------------
+# Variables
+# ip.reput_block_flag      Blocking flag for the IP collection record
+# ip.reput_block_reason    Reason (= rule message) that caused to blocking flag
+# tx.do_reput_block        Switch deciding if we really block based on flag
+# tx.reput_block_duration  Setting to define the duration of a block
 #
-# Create both Global and IP collections for rules to use
-# There are some CRS rules that assume that these two collections
-# have already been initiated.
+# It may be important to know, that all the other core rules are skipped for
+# requests, when it is clear that they carry the blocking flag in question.
 #
-SecRule REQUEST_HEADERS:User-Agent "^(.*)$" \
-  "id:'900018', \
-  phase:1, \
-  t:none,t:sha1,t:hexEncode, \
-  setvar:tx.ua_hash=%{matched_var}, \
-  nolog, \
-  pass"
-
-
-SecRule REQUEST_HEADERS:x-forwarded-for "^\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b" \
-  "id:'900019', \
-  phase:1, \
-  t:none, \
-  capture, \
-  setvar:tx.real_ip=%{tx.1}, \
-  nolog, \
-  pass"
+# Uncomment this rule to use this feature:
+#
+#SecAction \
+# "id:900960,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.do_reput_block=1"
+#
+# Uncomment this rule to change the blocking time:
+# Default: 300 (5 minutes)
+#
+#SecAction \
+# "id:900970,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.reput_block_duration=300"
 
 
-SecRule &TX:REAL_IP "!@eq 0" \
-  "id:'900020', \
-  phase:1, \
-  t:none, \
-  initcol:global=global, \
-  initcol:ip=%{tx.real_ip}_%{tx.ua_hash}, \
-  nolog, \
-  pass"
+#
+# -- [[ Collection timeout ]] --------------------------------------------------
+#
+# Set the SecCollectionTimeout directive from the ModSecurity default (1 hour)
+# to a lower setting which is appropriate to most sites.
+# This increases performance by cleaning out stale collection (block) entries.
+#
+# This value should be greater than or equal to:
+# tx.reput_block_duration (see section "Blocking Based on IP Reputation") and
+# tx.dos_block_timeout (see section "Anti-Automation / DoS Protection").
+#
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecCollectionTimeout
 
+# Please keep this directive uncommented.
+# Default: 600 (10 minutes)
+SecCollectionTimeout 600
 
-SecRule &TX:REAL_IP "@eq 0" \
-  "id:'900021', \
-  phase:1, \
-  t:none, \
-  initcol:global=global, \
-  initcol:ip=%{remote_addr}_%{tx.ua_hash}, \
-  setvar:tx.real_ip=%{remote_addr}, \
-  nolog, \
-  pass"
 
+#
+# -- [[ End of setup ]] --------------------------------------------------------
+#
+# The CRS checks the tx.crs_setup_version variable to ensure that the setup
+# has been loaded. If you are not planning to use this setup template,
+# you must manually set the tx.crs_setup_version variable before including
+# the CRS rules/* files.
+#
+# The variable is a numerical representation of the CRS version number.
+# E.g., v3.0.0 is represented as 300.
+#
+SecAction \
+    "id:900990,\
+    phase:1,\
+    nolog,\
+    pass,\
+    t:none,\
+    setvar:tx.crs_setup_version=332"

From 30d14ac6ea00cb5cc78166a3e9d3e44eb5718278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hendrik=20J=C3=A4ger?= <hendrik.jaeger@dswiss.com>
Date: Thu, 30 Sep 2021 16:25:30 +0200
Subject: [PATCH 1891/2267] Remove obsolete CRS parameter
 'anomaly_score_blocking'

---
 REFERENCE.md              | 9 ---------
 manifests/mod/security.pp | 5 -----
 2 files changed, 14 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 0f40ddfa1a..0c030b4697 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6002,7 +6002,6 @@ The following parameters are available in the `apache::mod::security` class:
 * [`restricted_extensions`](#restricted_extensions)
 * [`restricted_headers`](#restricted_headers)
 * [`secdefaultaction`](#secdefaultaction)
-* [`anomaly_score_blocking`](#anomaly_score_blocking)
 * [`inbound_anomaly_threshold`](#inbound_anomaly_threshold)
 * [`outbound_anomaly_threshold`](#outbound_anomaly_threshold)
 * [`critical_anomaly_score`](#critical_anomaly_score)
@@ -6154,14 +6153,6 @@ Defines the default list of actions, which will be inherited by the rules in the
 
 Default value: `'deny'`
 
-##### <a name="anomaly_score_blocking"></a>`anomaly_score_blocking`
-
-Data type: `Any`
-
-Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set.
-
-Default value: `'off'`
-
 ##### <a name="inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
 
 Data type: `Any`
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 88a75427f4..e7df7a662d 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -53,9 +53,6 @@
 # @param secdefaultaction
 #   Defines the default list of actions, which will be inherited by the rules in the same configuration context.
 # 
-# @param anomaly_score_blocking
-#   Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set.
-# 
 # @param inbound_anomaly_threshold
 #   Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 # 
@@ -112,7 +109,6 @@
   $restricted_extensions       = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
   $restricted_headers          = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
   $secdefaultaction            = 'deny',
-  $anomaly_score_blocking      = 'off',
   $inbound_anomaly_threshold   = '5',
   $outbound_anomaly_threshold  = '4',
   $critical_anomaly_score      = '5',
@@ -248,7 +244,6 @@
     # - $notice_anomaly_score
     # - $inbound_anomaly_threshold
     # - $outbound_anomaly_threshold
-    # - $anomaly_score_blocking
     # - $allowed_methods
     # - $content_types
     # - $restricted_extensions

From 8b5a39cb6c720b7d99e3a4735ddc0e886b23878e Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 7 Mar 2022 16:21:01 +0100
Subject: [PATCH 1892/2267] Set the Apache version to 2.4 in FreeBSD acceptance

It already uses the apache24 package and service names. This aligns the
values.
---
 spec/spec_helper_acceptance_local.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 8854b746f2..886e6ffa1e 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -152,7 +152,7 @@ def apache_settings_hash
     apache['service_name']     = 'apache24'
     apache['package_name']     = 'apache24'
     apache['error_log']        = 'http-error.log'
-    apache['version']          = '2.2'
+    apache['version']          = '2.4'
     apache['mod_ssl_dir']      = apache['mod_dir']
   when 'gentoo'
     apache['httpd_dir']        = '/etc/apache2'

From d6c62d5e6408d50470cf76012d6dfa398e5d9c94 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 7 Mar 2022 16:23:37 +0100
Subject: [PATCH 1893/2267] Drop Apache 2.2 support with Gentoo

This was dropped in December 2019[1] and thus has no use anymore.

[1]: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872597ae0890e11ac15718f655935f1b0c9e0dbd
     https://github.com/gentoo/gentoo/commit/872597ae0890e11ac15718f655935f1b0c9e0dbd
---
 manifests/init.pp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 26ded53a77..c76d0cddda 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -738,19 +738,13 @@
     if $::osfamily == 'gentoo' {
       $error_documents_path = '/usr/share/apache2/error'
       if $default_mods =~ Array {
-        if versioncmp($apache_version, '2.4') >= 0 {
-          if defined('apache::mod::ssl') {
-            ::portage::makeconf { 'apache2_modules':
-              content => concat($default_mods, ['authz_core', 'socache_shmcb']),
-            }
-          } else {
-            ::portage::makeconf { 'apache2_modules':
-              content => concat($default_mods, 'authz_core'),
-            }
+        if defined('apache::mod::ssl') {
+          ::portage::makeconf { 'apache2_modules':
+            content => concat($default_mods, ['authz_core', 'socache_shmcb']),
           }
         } else {
           ::portage::makeconf { 'apache2_modules':
-            content => $default_mods,
+            content => concat($default_mods, 'authz_core'),
           }
         }
       }

From c6f11ad012ed43a20772341120068ca0284ced79 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 25 Mar 2022 10:36:12 +0000
Subject: [PATCH 1894/2267] (GH-iac-334) Remove code specific to unsupported
 OSs

---
 README.md                                     |  3 -
 manifests/mod/fastcgi.pp                      |  2 +-
 manifests/mod/security.pp                     |  3 +-
 manifests/mpm.pp                              | 12 ++--
 manifests/params.pp                           | 68 ++++++-------------
 spec/acceptance/mod_php_spec.rb               |  3 +-
 spec/classes/mod/php_spec.rb                  | 13 ----
 spec/spec_helper_acceptance_local.rb          |  8 +--
 .../apache_mod_platform_compatibility_spec.rb |  6 +-
 9 files changed, 32 insertions(+), 86 deletions(-)

diff --git a/README.md b/README.md
index 68083eb6de..e444c5c617 100755
--- a/README.md
+++ b/README.md
@@ -898,9 +898,6 @@ See [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linu
 
 You must set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
-### Ubuntu 16.04
-The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
-
 <a id="development"></a> 
 ## Development
 
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index a3445c9179..541b9c1140 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -8,7 +8,7 @@
   if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemmajrelease, '7') >= 0) {
     fail('mod_fastcgi is no longer supported on el7 and above.')
   }
-  if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '18.04') >= 0) {
+  if ($facts['os']['name'] == 'Ubuntu') {
     fail('mod_fastcgi is no longer supported on Ubuntu 18.04 and above. Please use mod_proxy_fcgi')
   }
   # Debian specifies it's fastcgi lib path, but RedHat uses the default value
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 4234f40880..0ffcc07e91 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -261,8 +261,7 @@
       notify  => Class['apache::service'],
     }
 
-    # Debian 9 has a different rule setup
-    unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
+    unless $::operatingsystem == 'SLES' or $::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' {
       apache::security::rule_link { $activated_rules: }
     }
   }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index b76772eaf3..863d918518 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -98,17 +98,13 @@
       }
 
       if $mpm == 'prefork' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or $::operatingsystem == 'Debian' ) {
-          include apache::mpm::disable_mpm_event
-          include apache::mpm::disable_mpm_worker
-        }
+        include apache::mpm::disable_mpm_event
+        include apache::mpm::disable_mpm_worker
       }
 
       if $mpm == 'worker' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or $::operatingsystem == 'Debian' ) {
-          include apache::mpm::disable_mpm_event
-          include apache::mpm::disable_mpm_prefork
-        }
+        include apache::mpm::disable_mpm_event
+        include apache::mpm::disable_mpm_prefork
       }
     }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 79313de8bf..545d80a27e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -364,7 +364,6 @@
     if ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
-        '16.04' => '7.0', # Ubuntu Xenial
         '10'    => '7.3', # Debian Buster
         '20.04' => '7.4', # Ubuntu Foccal Fossal
         default => '7.2', # Ubuntu Bionic, Cosmic and Disco
@@ -460,52 +459,27 @@
     $secpcrematchlimit = 1500
     $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
-    if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
-      $modsec_default_rules = [
-        'crawlers-user-agents.data',
-        'iis-errors.data',
-        'java-code-leakages.data',
-        'java-errors.data',
-        'lfi-os-files.data',
-        'php-config-directives.data',
-        'php-errors.data',
-        'php-function-names-933150.data',
-        'php-function-names-933151.data',
-        'php-variables.data',
-        'restricted-files.data',
-        'scanners-headers.data',
-        'scanners-urls.data',
-        'scanners-user-agents.data',
-        'scripting-user-agents.data',
-        'sql-errors.data',
-        'sql-function-names.data',
-        'unix-shell.data',
-        'windows-powershell-commands.data',
-      ]
-    } else {
-      $modsec_default_rules = [
-        'base_rules/modsecurity_35_bad_robots.data',
-        'base_rules/modsecurity_35_scanners.data',
-        'base_rules/modsecurity_40_generic_attacks.data',
-        'base_rules/modsecurity_50_outbound.data',
-        'base_rules/modsecurity_50_outbound_malware.data',
-        'base_rules/modsecurity_crs_20_protocol_violations.conf',
-        'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
-        'base_rules/modsecurity_crs_23_request_limits.conf',
-        'base_rules/modsecurity_crs_30_http_policy.conf',
-        'base_rules/modsecurity_crs_35_bad_robots.conf',
-        'base_rules/modsecurity_crs_40_generic_attacks.conf',
-        'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
-        'base_rules/modsecurity_crs_41_xss_attacks.conf',
-        'base_rules/modsecurity_crs_42_tight_security.conf',
-        'base_rules/modsecurity_crs_45_trojans.conf',
-        'base_rules/modsecurity_crs_47_common_exceptions.conf',
-        'base_rules/modsecurity_crs_49_inbound_blocking.conf',
-        'base_rules/modsecurity_crs_50_outbound.conf',
-        'base_rules/modsecurity_crs_59_outbound_blocking.conf',
-        'base_rules/modsecurity_crs_60_correlation.conf',
-      ]
-    }
+    $modsec_default_rules = [
+      'crawlers-user-agents.data',
+      'iis-errors.data',
+      'java-code-leakages.data',
+      'java-errors.data',
+      'lfi-os-files.data',
+      'php-config-directives.data',
+      'php-errors.data',
+      'php-function-names-933150.data',
+      'php-function-names-933151.data',
+      'php-variables.data',
+      'restricted-files.data',
+      'scanners-headers.data',
+      'scanners-urls.data',
+      'scanners-user-agents.data',
+      'scripting-user-agents.data',
+      'sql-errors.data',
+      'sql-function-names.data',
+      'unix-shell.data',
+      'windows-powershell-commands.data',
+    ]
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
     $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 7bc3749c13..31b10e0f7c 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -24,8 +24,7 @@ class { 'apache::mod::php': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    if (os[:family] == 'ubuntu' && os[:release] == '16.04') ||
-       (os[:family] == 'debian' && os[:release] =~ %r{^9\.})
+    if os[:family] == 'debian' && os[:release] =~ %r{^9\.}
       describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index b0c4b6d8c1..353a94f91a 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -78,19 +78,6 @@
                 }
               end
             end
-          when '16.04'
-            context 'on xenial' do
-              let :params do
-                { content: 'somecontent' }
-              end
-
-              it {
-                is_expected.to contain_file('php7.0.conf').with(
-                  content: 'somecontent',
-                )
-              }
-            end
-
           when '18.04'
             context 'on bionic' do
               let :params do
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 886e6ffa1e..e42aa4fe56 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -48,19 +48,13 @@ def print_parsing_errors
         ensure   => 'latest',
       }
     }
-    # needed for ss, for serverspec checks
-    if $::operatingsystem == 'Ubuntu' and $::operatingsystemmajrelease !~ /14.04|16.04/ {
-      package { 'iproute2':
-        ensure   => 'latest',
-      }
-    }
     if $::osfamily == 'RedHat' {
       if $::operatingsystemmajrelease == '5' or $::operatingsystemmajrelease == '6'{
         class { 'epel':
           epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
           epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
         }
-        } elsif $::operatingsystemmajrelease == '8' {
+      } elsif $::operatingsystemmajrelease == '8' {
           class { 'epel':
                 os_maj_release => "7",
                 epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
diff --git a/spec/util/apache_mod_platform_compatibility_spec.rb b/spec/util/apache_mod_platform_compatibility_spec.rb
index 1025a866a4..3ca5bb7481 100644
--- a/spec/util/apache_mod_platform_compatibility_spec.rb
+++ b/spec/util/apache_mod_platform_compatibility_spec.rb
@@ -47,7 +47,7 @@
         expect(ampc.extract_os_ver_pairs('Debian: 5, 6, 7; CentOS: 5,6,7')).to eq('debian' => [5, 6, 7], 'centos' => [5, 6, 7])
       end
       it 'handles Versions in \d+\.\d+ format' do
-        expect(ampc.extract_os_ver_pairs('Ubuntu: 14.04, 16.04')).to eq('ubuntu' => [14, 16])
+        expect(ampc.extract_os_ver_pairs('Ubuntu: 18.04, 20.04')).to eq('ubuntu' => [18, 20])
       end
       it 'handles Versions with "SP"' do
         expect(ampc.extract_os_ver_pairs('SLES: 11 SP1, 12')).to eq('sles' => [11, 12])
@@ -56,10 +56,10 @@
         expect(ampc.extract_os_ver_pairs('foobar')).to eq({})
       end
       it 'returns an empty Hash when given data with incorrect OS/Version group separator' do
-        expect(ampc.extract_os_ver_pairs('Ubuntu#14.04, 16.04')).to eq({})
+        expect(ampc.extract_os_ver_pairs('Ubuntu#18.04, 20.04')).to eq({})
       end
       it 'returns an empty Hash when given data with incorrect OS + Version separator' do
-        expect(ampc.extract_os_ver_pairs('CentOS:5,6#Debian:5,6')).to eq({})
+        expect(ampc.extract_os_ver_pairs('CentOS:7,8#Debian:10,11')).to eq({})
       end
       it 'returns an empty Hash when given data with incorrect Version separator' do
         expect(ampc.extract_os_ver_pairs('CentOS:5@6')).to eq({})

From faaa24d5df7941345db21305bfc46c222ce1bc6e Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 25 Mar 2022 10:37:50 +0000
Subject: [PATCH 1895/2267] (maint) Temporary disable of syntax checks to allow
 work to go through

See issue for more information: https://github.com/puppetlabs/iac/issues/336
---
 .github/workflows/spec.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index 6c1ae10d8c..f51476d7a4 100644
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -54,10 +54,10 @@ jobs:
           buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
           echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
           echo STEP_START=$(date +%s) >> $GITHUB_ENV
-      - name: Run Static & Syntax Tests
-        if: ${{ github.repository_owner == 'puppetlabs' }}
-        run: |
-          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+      # - name: Run Static & Syntax Tests
+      #   if: ${{ github.repository_owner == 'puppetlabs' }}
+      #   run: |
+      #     buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
 
       - name: Setup Spec Test Matrix
         id: get-matrix

From 1530d9a9250724c93b4a13bebc791881669752a4 Mon Sep 17 00:00:00 2001
From: Craig Gumbley <craiggumbley@gmail.com>
Date: Fri, 25 Mar 2022 15:12:31 +0000
Subject: [PATCH 1896/2267] (MAINT) Add labeller and stale GHA workflows

---
 .github/workflows/labeller.yml | 22 ++++++++++++++++++++++
 .github/workflows/stale.yml    | 19 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 .github/workflows/labeller.yml
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
new file mode 100644
index 0000000000..cb3a93078f
--- /dev/null
+++ b/.github/workflows/labeller.yml
@@ -0,0 +1,22 @@
+name: community-labeller
+
+on:
+  issues:
+    types:
+      - opened
+  pull_request:
+    types:
+      - opened
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: puppetlabs/community-labeller@v0
+        name: Label issues or pull requests
+        with:
+          label_name: community
+          label_color: '5319e7'
+          org_membership: puppetlabs
+          token: ${{ secrets.IAC_COMMUNITY_LABELER }}
\ No newline at end of file
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 0000000000..c6edd6de2a
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 60
+        days-before-close: 7
+        stale-issue-message: 'This issue has been marked as stale because it has been open for a while and has had no recent activity. If this issue is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
+        stale-issue-label: 'stale'
+        stale-pr-message: 'This PR has been marked as stale because it has been open for a while and has had no recent activity. If this PR is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
+        stale-pr-label: 'stale'

From fdbbe205a0fc84f62e7873ffbaba6136b4ee3f32 Mon Sep 17 00:00:00 2001
From: Craig Gumbley <craiggumbley@gmail.com>
Date: Fri, 25 Mar 2022 15:33:43 +0000
Subject: [PATCH 1897/2267] (MAINT) Fixes no new line at EOF

---
 .github/workflows/labeller.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
index cb3a93078f..104370aa1c 100644
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -19,4 +19,4 @@ jobs:
           label_name: community
           label_color: '5319e7'
           org_membership: puppetlabs
-          token: ${{ secrets.IAC_COMMUNITY_LABELER }}
\ No newline at end of file
+          token: ${{ secrets.IAC_COMMUNITY_LABELER }}

From 92163f1803f7d4926ec480f1b02bbbe3fa60a97a Mon Sep 17 00:00:00 2001
From: Craig Gumbley <craiggumbley@gmail.com>
Date: Mon, 4 Apr 2022 14:09:44 +0100
Subject: [PATCH 1898/2267] "This commit changes the workflow trigger for pull
 requests to pull_request_target"

---
 .github/workflows/labeller.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
index 104370aa1c..5434d3fff3 100644
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -4,7 +4,7 @@ on:
   issues:
     types:
       - opened
-  pull_request:
+  pull_request_target:
     types:
       - opened
 

From 74f6e0cb05175a3360ea9b89b047445d0f444b83 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 29 Mar 2022 15:39:49 +0200
Subject: [PATCH 1899/2267] Restructure MPM disabling

This takes the approach of listing the disabling steps once rather than
repeating it for every mpm.

I wasn't quite sure on the prefork disabling. Does prefork need to stay
enabled for itk?
---
 manifests/mpm.pp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 863d918518..8fd30bf86b 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -85,9 +85,6 @@
       }
 
       if $mpm == 'itk' {
-        include apache::mpm::disable_mpm_event
-        include apache::mpm::disable_mpm_worker
-
         package { 'libapache2-mpm-itk':
           ensure => present,
           before => [
@@ -97,14 +94,16 @@
         }
       }
 
-      if $mpm == 'prefork' {
-        include apache::mpm::disable_mpm_event
+      unless $mpm in ['itk', 'prefork'] {
+        include apache::mpm::disable_mpm_prefork
+      }
+
+      if $mpm != 'worker' {
         include apache::mpm::disable_mpm_worker
       }
 
-      if $mpm == 'worker' {
+      if $mpm != 'event' {
         include apache::mpm::disable_mpm_event
-        include apache::mpm::disable_mpm_prefork
       }
     }
 

From 86c852c2804e016e0adfc59eff4f0bbb8d886f43 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 29 Mar 2022 15:30:19 +0200
Subject: [PATCH 1900/2267] Drop Apache 2.0 compatibility code

It's safe to assume the version is >= 2.2 so the conditional can be
dropped.
---
 manifests/mod/proxy_connect.pp         | 15 +++-----------
 spec/classes/mod/proxy_connect_spec.rb | 28 +-------------------------
 2 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/manifests/mod/proxy_connect.pp b/manifests/mod/proxy_connect.pp
index e09cab0795..5ece8d4666 100644
--- a/manifests/mod/proxy_connect.pp
+++ b/manifests/mod/proxy_connect.pp
@@ -1,18 +1,9 @@
 # @summary
 #   Installs `mod_proxy_connect`.
-# 
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-# 
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html for additional documentation.
 #
-class apache::mod::proxy_connect (
-  $apache_version  = undef,
-) {
+class apache::mod::proxy_connect {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
-  if versioncmp($_apache_version, '2.2') >= 0 {
-    Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_connect']
-    ::apache::mod { 'proxy_connect': }
-  }
+  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_connect']
+  apache::mod { 'proxy_connect': }
 }
diff --git a/spec/classes/mod/proxy_connect_spec.rb b/spec/classes/mod/proxy_connect_spec.rb
index cb433f0677..c579a58d34 100644
--- a/spec/classes/mod/proxy_connect_spec.rb
+++ b/spec/classes/mod/proxy_connect_spec.rb
@@ -11,31 +11,5 @@
 
   include_examples 'a mod class, without including apache'
 
-  context 'with Apache version < 2.2' do
-    let :params do
-      {
-        apache_version: '2.1',
-      }
-    end
-
-    it { is_expected.not_to contain_apache__mod('proxy_connect') }
-  end
-  context 'with Apache version = 2.2' do
-    let :params do
-      {
-        apache_version: '2.2',
-      }
-    end
-
-    it { is_expected.to contain_apache__mod('proxy_connect') }
-  end
-  context 'with Apache version >= 2.4' do
-    let :params do
-      {
-        apache_version: '2.4',
-      }
-    end
-
-    it { is_expected.to contain_apache__mod('proxy_connect') }
-  end
+  it { is_expected.to contain_apache__mod('proxy_connect') }
 end

From 395a0864514849f3597f7946bf2416fad5f5adab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 4 Apr 2022 08:47:50 -1000
Subject: [PATCH 1901/2267] Add support for PassengerPreloadBundler

The latest passenger include a new option to load ruby bundles earlier,
working around deployment issues.  See:
* https://github.com/phusion/passenger/issues/2410
* https://github.com/phusion/passenger/issues/2409
---
 manifests/mod/passenger.pp         | 10 ++++++++++
 manifests/vhost.pp                 | 10 ++++++++--
 spec/classes/mod/passenger_spec.rb |  1 +
 spec/defines/vhost_spec.rb         | 12 ++++++++++++
 templates/mod/passenger.conf.erb   |  3 +++
 templates/vhost/_directories.erb   |  3 +++
 templates/vhost/_passenger.erb     |  3 +++
 7 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 9019c33e41..440b7b5175 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -120,6 +120,9 @@
 # @param passenger_load_shell_envvars
 #   Enables or disables the loading of shell environment variables before spawning the application.
 #
+# @param passenger_preload_bundler
+#   Enables or disables loading bundler before loading your Ruby app.
+#
 # @param passenger_log_file
 #   File path to log file. By default Passenger log messages are written to the Apache global error log.
 #
@@ -343,6 +346,7 @@
   $passenger_installed_version                                                               = undef,
   $passenger_instance_registry_dir                                                           = undef,
   $passenger_load_shell_envvars                                                              = undef,
+  Optional[Boolean] $passenger_preload_bundler                                               = undef,
   Optional[Stdlib::Absolutepath] $passenger_log_file                                         = undef,
   $passenger_log_level                                                                       = undef,
   $passenger_lve_min_uid                                                                     = undef,
@@ -546,6 +550,11 @@
         fail("Passenger config option :: passenger_load_shell_envvars is not introduced until version 4.0.20 :: ${passenger_installed_version} is the version reported")
       }
     }
+    if $passenger_preload_bundler {
+      if (versioncmp($passenger_installed_version, '6.0.13') < 0) {
+        fail("Passenger config option :: passenger_preload_bundler is not introduced until version 6.0.13 :: ${passenger_installed_version} is the version reported")
+      }
+    }
     if $passenger_log_file {
       if (versioncmp($passenger_installed_version, '5.0.5') < 0) {
         fail("Passenger config option :: passenger_log_file is not introduced until version 5.0.5 :: ${passenger_installed_version} is the version reported")
@@ -901,6 +910,7 @@
   # - $passenger_high_performance : since 2.0.0.
   # - $passenger_instance_registry_dir : since 5.0.0.
   # - $passenger_load_shell_envvars : since 4.0.20.
+  # - $passenger_preload_bundler : since 6.0.13
   # - $passenger_log_file : since 5.0.5.
   # - $passenger_log_level : since 3.0.0.
   # - $passenger_lve_min_uid : since 5.0.28.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4eca2c4c53..51dd56751f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -684,6 +684,10 @@
 # @param passenger_load_shell_envvars
 #   Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
 #   to enable or disable the loading of shell environment variables before spawning the application.
+#
+# @param passenger_preload_bundler
+#   Sets [PassengerPreloadBundler](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpreloadbundler),
+#   to enable or disable the loading of bundler before loading the application.
 # 
 # @param passenger_rolling_restarts
 #   Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
@@ -1952,6 +1956,7 @@
   Optional[String] $passenger_restart_dir                                           = undef,
   Optional[Enum['direct', 'smart']] $passenger_spawn_method                         = undef,
   Optional[Boolean] $passenger_load_shell_envvars                                   = undef,
+  Optional[Boolean] $passenger_preload_bundler                                      = undef,
   Optional[Boolean] $passenger_rolling_restarts                                     = undef,
   Optional[Boolean] $passenger_resist_deployment_errors                             = undef,
   Optional[String] $passenger_user                                                  = undef,
@@ -2088,7 +2093,7 @@
     include apache::mod::suexec
   }
 
-  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
+  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
     include apache::mod::passenger
   }
 
@@ -2895,6 +2900,7 @@
   # - $passenger_restart_dir
   # - $passenger_spawn_method
   # - $passenger_load_shell_envvars
+  # - $passenger_preload_bundler
   # - $passenger_rolling_restarts
   # - $passenger_resist_deployment_errors
   # - $passenger_min_instances
@@ -2923,7 +2929,7 @@
   # - $passenger_max_requests
   # - $passenger_max_request_time
   # - $passenger_memory_limit
-  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
+  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index aed525e74d..0925696ce6 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -52,6 +52,7 @@
             'passenger_high_performance' => { type: 'OnOff', pass_opt: :PassengerHighPerformance },
             'passenger_instance_registry_dir' => { type: 'FullPath', pass_opt: :PassengerInstanceRegistryDir },
             'passenger_load_shell_envvars' => { type: 'OnOff', pass_opt: :PassengerLoadShellEnvvars },
+            'passenger_preload_bundler' => { type: 'Boolean', pass_opt: :PassengerPreloadBundler },
             'passenger_log_file' => { type: 'FullPath', pass_opt: :PassengerLogFile },
             'passenger_log_level' => { type: 'Integer', pass_opt: :PassengerLogLevel },
             'passenger_lve_min_uid' => { type: 'Integer', pass_opt: :PassengerLveMinUid },
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index da5559052b..e0118ed80f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -239,6 +239,7 @@
                   'passenger_startup_file'                              => 'start.js',
                   'passenger_restart_dir'                               => 'temp',
                   'passenger_load_shell_envvars'                        => false,
+                  'passenger_preload_bundler'                           => false,
                   'passenger_rolling_restarts'                          => false,
                   'passenger_resist_deployment_errors'                  => false,
                   'passenger_user'                                      => 'nodeuser',
@@ -454,6 +455,7 @@
               'passenger_restart_dir'                 => 'tmp',
               'passenger_spawn_method'                => 'direct',
               'passenger_load_shell_envvars'          => false,
+              'passenger_preload_bundler'             => false,
               'passenger_rolling_restarts'            => false,
               'passenger_resist_deployment_errors'    => true,
               'passenger_user'                        => 'sandbox',
@@ -842,6 +844,11 @@
               content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+PassengerPreloadBundler\sOff$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+PassengerRollingRestarts\sOff$},
@@ -1364,6 +1371,11 @@
               content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
+              content: %r{^\s+PassengerPreloadBundler\sOff$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
               content: %r{^\s+PassengerRollingRestarts\sOff$},
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index f7078db922..ca673fd501 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -88,6 +88,9 @@
   <%- if @passenger_load_shell_envvars -%>
   PassengerLoadShellEnvvars <%= @passenger_load_shell_envvars %>
   <%- end -%>
+  <%- unless @passenger_preload_bundler.nil? -%>
+  PassengerPreloadBundler <%= scope.call_function('apache::bool2httpd', [@passenger_preload_bundler]) %>
+  <%- end -%>
   <%- if @passenger_log_file -%>
   PassengerLogFile "<%= @passenger_log_file %>"
   <%- end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 1a385a4397..4b5a7523f4 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -132,6 +132,9 @@
     <%- unless directory['passenger_load_shell_envvars'].nil? -%>
     PassengerLoadShellEnvvars <%= scope.call_function('apache::bool2httpd', [directory['passenger_load_shell_envvars']]) %>
     <%- end -%>
+    <%- unless directory['passenger_preload_bundler'].nil? -%>
+    PassengerPreloadBundler <%= scope.call_function('apache::bool2httpd', [directory['passenger_preload_bundler']]) %>
+    <%- end -%>
     <%- unless directory['passenger_rolling_restarts'].nil? -%>
     PassengerRollingRestarts <%= scope.call_function('apache::bool2httpd', [directory['passenger_rolling_restarts']]) %>
     <%- end -%>
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
index 6e6d6d4e5e..b14f9245b6 100644
--- a/templates/vhost/_passenger.erb
+++ b/templates/vhost/_passenger.erb
@@ -46,6 +46,9 @@
 <% unless @passenger_load_shell_envvars.nil? -%>
   PassengerLoadShellEnvvars <%= scope.call_function('apache::bool2httpd', [@passenger_load_shell_envvars]) %>
 <% end -%>
+<% unless @passenger_preload_bundler.nil? -%>
+  PassengerPreloadBundler <%= scope.call_function('apache::bool2httpd', [@passenger_preload_bundler]) %>
+<% end -%>
 <% unless @passenger_rolling_restarts.nil? -%>
   PassengerRollingRestarts <%= scope.call_function('apache::bool2httpd', [@passenger_rolling_restarts]) %>
 <% end -%>

From 722f020eed2cd66aaf46f6f103c72c1447e3d2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 4 Apr 2022 09:12:04 -1000
Subject: [PATCH 1902/2267] Fix CI

CentOS Stream verion is just `8`, not `8.foo`.
---
 spec/acceptance/mod_php_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 31b10e0f7c..40009e562d 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -44,7 +44,7 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
-    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8\.}
+    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8\b}
       describe file("#{apache_hash['mod_dir']}/php7.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end

From c9790920822a8cd2fa4af83907341c3726e34701 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 11 Oct 2021 18:51:20 +0200
Subject: [PATCH 1903/2267] Remove warnings and plans to change vhost default
 naming

In 7e233fe7cc108605384506f11083aeea6e3a2464 a plan was made to change
the naming. In 6b2a20a390df597f04222571dc7fac366a8ea898 it was already
from 6.0.0 to 7.0.0. Now that 7.0.0 has been released, the default isn't
going to change. This time I'm suggestion to drop the plan altogether
and stop bothering users with this.
---
 manifests/vhost.pp            | 33 ---------------------------------
 spec/acceptance/vhost_spec.rb | 14 ++------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 51dd56751f..ed0b8239d5 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2126,15 +2126,6 @@
   #
   # Because a single hostname may be use by multiple virtual hosts listening on different ports, the $port paramter can
   # optionaly be used to avoid duplicate resources.
-  #
-  # We will retain the default behaviour for filenames but allow the use of a sanitized version of $servername to be
-  # used, using the new $use_servername_for_filenames and $use_port_for_filenames parameters.
-  #
-  # This will default to false until the next major release (v7.0.0), at which point, we will default this to true and
-  # warn about it's imminent deprecation in the subsequent major release (v8.0.0)
-  #
-  # In v8.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether
-  # and use the sanitized value of $servername for default log / config filenames.
   $filename = $use_servername_for_filenames ? {
     true => $use_port_for_filenames ? {
       true  => regsubst("${normalized_servername}-${port}", ' ', '_', 'G'),
@@ -2143,30 +2134,6 @@
     false => $name,
   }
 
-  if ! $use_servername_for_filenames and $name != $normalized_servername {
-    $use_servername_for_filenames_warn_msg = '
-    It is possible for the $name parameter to be defined with spaces in it. Although supported on POSIX systems, this
-    can lead to cumbersome file names. The $servername attribute has stricter conditions from Apache (i.e. no spaces)
-    When $use_servername_for_filenames = true, the $servername parameter, sanitized, is used to construct log and config
-    file names.
-
-    From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
-    module, the $use_servername_for_filenames will be removed and log/config file names will be derived from the
-    sanitized $servername parameter when not explicitly defined.'
-    warning($use_servername_for_filenames_warn_msg)
-  } elsif ! $use_port_for_filenames {
-    $use_port_for_filenames_warn_msg = '
-    It is possible for multiple virtual hosts to be configured using the same $servername but a different port. When
-    using $use_servername_for_filenames, this can lead to duplicate resource declarations.
-    When $use_port_for_filenames = true, the $servername and $port parameters, sanitized, are used to construct log and
-    config file names.
-
-    From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
-    module, the $use_port_for_filenames will be removed and log/config file names will be derived from the
-    sanitized $servername parameter when not explicitly defined.'
-    warning($use_port_for_filenames_warn_msg)
-  }
-
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
   if $manage_docroot and $docroot and ! defined(File[$docroot]) {
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 09218c9612..921967b205 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -964,13 +964,8 @@ class { 'apache': }
             logroot                       => '/tmp',
           }
       MANIFEST
-      it 'applies cleanly and DOES NOT print warning about $use_servername_for_filenames usage for test.server vhost' do
+      it 'applies cleanly' do
         result = apply_manifest(pp, catch_failures: true)
-        expect(result.stderr).not_to contain %r{
-          .*Warning\:\sScope\(Apache::Vhost\[test\.server\]\)\:.*
-          It\sis\spossible\sfor\sthe\s\$name\sparameter.*
-          sanitized\s\$servername\sparameter\swhen\snot\sexplicitly\sdefined\.
-        }xm
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.servername.conf") do
         it { is_expected.to be_file }
@@ -988,13 +983,8 @@ class { 'apache': }
             logroot                       => '/tmp',
           }
       MANIFEST
-      it 'applies cleanly and prints warning about $use_servername_for_filenames usage for test.server vhost' do
+      it 'applies cleanly' do
         result = apply_manifest(pp, catch_failures: true)
-        expect(result.stderr).to contain %r{
-          .*Warning\:\sScope\(Apache::Vhost\[test\.server\]\)\:.*
-          It\sis\spossible\sfor\sthe\s\$name\sparameter.*
-          sanitized\s\$servername\sparameter\swhen\snot\sexplicitly\sdefined\.
-        }xm
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }

From ce7b59ffb6f2085324fa55ec5e6ebb3cc6e44d05 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 20 Apr 2022 11:07:37 +0100
Subject: [PATCH 1904/2267] (maint) PDK Update

---
 .github/workflows/nightly.yml | 2 +-
 .github/workflows/spec.yml    | 8 ++++----
 metadata.json                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c8fe88a506..42816e7de7 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -200,5 +200,5 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
           # Optional Input
-          channel: '#team-ia-bots'
+          channel: '#team-cat-bots'
           name: 'GABot'
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index f51476d7a4..6c1ae10d8c 100644
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -54,10 +54,10 @@ jobs:
           buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
           echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
           echo STEP_START=$(date +%s) >> $GITHUB_ENV
-      # - name: Run Static & Syntax Tests
-      #   if: ${{ github.repository_owner == 'puppetlabs' }}
-      #   run: |
-      #     buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+      - name: Run Static & Syntax Tests
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
 
       - name: Setup Spec Test Matrix
         id: get-matrix
diff --git a/metadata.json b/metadata.json
index b60f92db70..685bd15be2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -91,5 +91,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "2.3.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-gf3911d3"
+  "template-ref": "heads/main-0-g806810b"
 }

From 4750870371da6eb75c8549f13c5ee74a25e33f6a Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 20 Apr 2022 13:25:15 +0100
Subject: [PATCH 1905/2267] (maint) syntax:hiera:yaml fixes

---
 manifests/mod/ldap.pp     | 2 +-
 manifests/mod/security.pp | 2 +-
 manifests/vhost.pp        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 9c37b09e66..fab41a7d09 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -52,7 +52,7 @@
   $apache_version                                  = undef,
   $package_name                                    = undef,
   $ldap_trusted_global_cert_file                   = undef,
-  Optional[String] $ldap_trusted_global_cert_type  = 'CA_BASE64',
+  String $ldap_trusted_global_cert_type            = 'CA_BASE64',
   $ldap_shared_cache_size                          = undef,
   $ldap_cache_entries                              = undef,
   $ldap_cache_ttl                                  = undef,
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 0ffcc07e91..88a75427f4 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -220,7 +220,7 @@
 
   if $custom_rules {
     # Template to add custom rule and included in security configuration
-    file {"${modsec_dir}/custom_rules":
+    file { "${modsec_dir}/custom_rules":
       ensure  => directory,
       owner   => $apache::params::user,
       group   => $apache::params::group,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ed0b8239d5..a4c97fdb40 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1837,8 +1837,8 @@
   $access_log_format                                                                = false,
   $access_log_env_var                                                               = false,
   Optional[Array] $access_logs                                                      = undef,
-  Optional[Boolean] $use_servername_for_filenames                                   = false,
-  Optional[Boolean] $use_port_for_filenames                                         = false,
+  Boolean $use_servername_for_filenames                                             = false,
+  Boolean $use_port_for_filenames                                                   = false,
   $aliases                                                                          = undef,
   Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                  = undef,
   Boolean $error_log                                                                = true,

From a5b06d388efbbe4438b999c84ab7d3d83542477d Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 20 Apr 2022 13:26:40 +0100
Subject: [PATCH 1906/2267] (maint) Rubocop Fixes

---
 spec/acceptance/vhost_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 921967b205..a5b54f635d 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -965,7 +965,7 @@ class { 'apache': }
           }
       MANIFEST
       it 'applies cleanly' do
-        result = apply_manifest(pp, catch_failures: true)
+        _result = apply_manifest(pp, catch_failures: true)
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.servername.conf") do
         it { is_expected.to be_file }
@@ -984,7 +984,7 @@ class { 'apache': }
           }
       MANIFEST
       it 'applies cleanly' do
-        result = apply_manifest(pp, catch_failures: true)
+        _result = apply_manifest(pp, catch_failures: true)
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }

From 2472c02dbe08935e6ff05e38c0dd75f951f6b511 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 20 Apr 2022 13:27:09 +0100
Subject: [PATCH 1907/2267] (GH-cat-9) syntax:hiera:yaml exclusions added

---
 .puppet-lint.rc |  9 +++++++++
 .sync.yml       | 12 ++++++++++++
 Rakefile        | 11 +++++++++--
 metadata.json   |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index cc96ece051..240c0001ba 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1 +1,10 @@
 --relative
+--no-parameter_types-check
+--no-parameter_documentation-check
+--no-top_scope_facts-check
+--no-legacy_facts-check
+--no-relative_classname_reference-check
+--no-relative_classname_inclusion-check
+--no-anchor_resource-check
+--no-version_comparison-check
+--no-manifest_whitespace_closing_bracket_after-check
diff --git a/.sync.yml b/.sync.yml
index 60a34fd258..c6666aea96 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -35,3 +35,15 @@ Rakefile:
 .travis.yml:
   delete: true
 changelog_since_tag: "3.2.0"
+Rakefile:
+  extra_disabled_lint_checks:
+    - parameter_types
+    - parameter_documentation
+    - top_scope_facts
+    - legacy_facts
+    - relative_classname_reference
+    - relative_classname_inclusion
+    - anchor_resource
+    - version_comparison
+    - manifest_whitespace_closing_bracket_after
+
diff --git a/Rakefile b/Rakefile
index fd8011a675..19df0a4cbd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -42,6 +42,15 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.send('disable_parameter_types')
+PuppetLint.configuration.send('disable_parameter_documentation')
+PuppetLint.configuration.send('disable_top_scope_facts')
+PuppetLint.configuration.send('disable_legacy_facts')
+PuppetLint.configuration.send('disable_relative_classname_reference')
+PuppetLint.configuration.send('disable_relative_classname_inclusion')
+PuppetLint.configuration.send('disable_anchor_resource')
+PuppetLint.configuration.send('disable_version_comparison')
+PuppetLint.configuration.send('disable_manifest_whitespace_closing_bracket_after')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
@@ -50,7 +59,6 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.user = "#{changelog_user}"
     config.project = "#{changelog_project}"
     config.since_tag = "3.2.0"
-    config.max_issues = 500
     config.future_release = "#{changelog_future_release}"
     config.exclude_labels = ['maintenance']
     config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
@@ -89,4 +97,3 @@ EOM
   end
 end
 
-FastGettext.default_text_domain = 'default-text-domain'
diff --git a/metadata.json b/metadata.json
index 685bd15be2..908760b079 100644
--- a/metadata.json
+++ b/metadata.json
@@ -89,7 +89,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "2.3.0",
+  "pdk-version": "2.4.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
   "template-ref": "heads/main-0-g806810b"
 }

From a3f10e62d3d59b82c0b92666900164b21bed270d Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <kenyon@kenyonralph.com>
Date: Sat, 13 Nov 2021 20:56:39 -0800
Subject: [PATCH 1908/2267] init.pp: fix typo in purge_vdir documentation

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index c76d0cddda..1b7516203d 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -433,7 +433,7 @@
 #
 # @param purge_vdir
 #   Removes all other Apache configs and virtual hosts.<br />
-#   > **Note**: This parameter is deprecated in favor of the `purge_config` parameter.<br />
+#   > **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.<br />
 # 
 # @param conf_enabled
 #   Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.

From 6f28430192ac94f027b2c0d831a2929b698cbe5c Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <freyermuth@physik.uni-bonn.de>
Date: Tue, 8 Feb 2022 14:03:39 +0100
Subject: [PATCH 1909/2267] mod_auth_gssapi: Add support for GssapiBasicAuth.

This adds support for the GssapiBasicAuth setting
which allows to fall back to basic auth if NEGOTIATE fails.
---
 manifests/vhost.pp          | 1 +
 spec/defines/vhost_spec.rb  | 6 ++++++
 templates/vhost/_gssapi.epp | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a4c97fdb40..ed6fb947ae 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1515,6 +1515,7 @@
 #     directories => [
 #       { path   => '/path/to/different/dir',
 #         gssapi => {
+#           basicauth => 'On',
 #           credstore => 'keytab:/foo/bar.keytab',
 #           localname => 'Off',
 #           sslonly   => 'On',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index e0118ed80f..50c565d6c2 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -267,6 +267,7 @@
                   'passenger_app_log_file'                              => '/tmp/app.log',
                   'passenger_debugger'                                  => false,
                   'gssapi'                                              => {
+                    'basicauth' => 'On',
                     'credstore' => 'keytab:/foo/bar.keytab',
                     'localname' => 'On',
                     'sslonly'   => 'Off',
@@ -969,6 +970,11 @@
               content: %r{^\s+PassengerDebugger\sOff$},
             )
           }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+              content: %r{^\s+GssapiBasicAuth\sOn$},
+            )
+          }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
               content: %r{^\s+GssapiCredStore\skeytab:/foo/bar.keytab$},
diff --git a/templates/vhost/_gssapi.epp b/templates/vhost/_gssapi.epp
index 4f2d9f9114..991c9d51d2 100644
--- a/templates/vhost/_gssapi.epp
+++ b/templates/vhost/_gssapi.epp
@@ -1,10 +1,14 @@
 <%|
   # https://github.com/gssapi/mod_auth_gssapi
+  Optional[Enum['On','Off']] $basicauth = undef,
   Optional[String[1]]        $credstore = undef,
   Optional[Enum['On','Off']] $sslonly   = undef,
   Optional[Enum['On','Off']] $localname = undef,
 |%>
 # mod_auth_gssapi configuration
+<% if $basicauth { -%>
+    GssapiBasicAuth <%= $basicauth %>
+<% } -%>
 <% if $sslonly { -%>
     GssapiSSLonly <%= $sslonly %>
 <% } -%>

From 03d8f760422bf4f914141c23e8cc881930f2cbe7 Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <freyermuth@physik.uni-bonn.de>
Date: Tue, 8 Feb 2022 14:56:42 +0100
Subject: [PATCH 1910/2267] mod_auth_gssapi: Improve indentation in
 vhost/_gssapi template.

---
 templates/vhost/_gssapi.epp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_gssapi.epp b/templates/vhost/_gssapi.epp
index 991c9d51d2..789e90595b 100644
--- a/templates/vhost/_gssapi.epp
+++ b/templates/vhost/_gssapi.epp
@@ -5,7 +5,7 @@
   Optional[Enum['On','Off']] $sslonly   = undef,
   Optional[Enum['On','Off']] $localname = undef,
 |%>
-# mod_auth_gssapi configuration
+    # mod_auth_gssapi configuration
 <% if $basicauth { -%>
     GssapiBasicAuth <%= $basicauth %>
 <% } -%>

From ad40d4fd0d25957fc789ada377633ec774905b53 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Wed, 18 May 2022 17:34:31 +0100
Subject: [PATCH 1911/2267] (MAINT) Stale-bot config/msg update

---
 .github/workflows/stale.yml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index c6edd6de2a..12fee8f0db 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -11,9 +11,24 @@ jobs:
     - uses: actions/stale@v3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-stale: 60
-        days-before-close: 7
-        stale-issue-message: 'This issue has been marked as stale because it has been open for a while and has had no recent activity. If this issue is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
-        stale-issue-label: 'stale'
-        stale-pr-message: 'This PR has been marked as stale because it has been open for a while and has had no recent activity. If this PR is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
-        stale-pr-label: 'stale'
+        days-before-issue-stale: 90
+        days-before-pr-stale: 60
+        days-before-pr-close: 7
+        stale-issue-message: |
+          Hello! 👋
+
+          This issue has been open for a while and has had no recent activity. We've labelled it with `attention-needed` so that we can get a clear view of which issues need our attention.
+
+          If you are waiting on a response from us we will try and address your comments on a future Community Day.
+
+          Alternatively, if it is no longer relevant to you please close the issue with a comment.
+        stale-issue-label: 'attention-needed'
+        stale-pr-message: |
+          Hello! 👋
+
+          This pull request has been open for a while and has had no recent activity. We've labelled it with `attention-needed` so that we can get a clear view of which PRs need our attention.
+
+          If you are waiting on a response from us we will try and address your comments on a future Community Day.
+
+          Alternatively, if it is no longer relevant to you please close the PR with a comment. Please note that if a pull request receives no update for 7 after it has been labelled, it will be closed. We are always happy to re-open pull request if they have been closed in error.
+        stale-pr-label: 'attention-needed'

From c60c4d036fb9093108621473bec9d1c6641875bd Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 19 May 2022 11:22:17 +0100
Subject: [PATCH 1912/2267] Config update

---
 .github/workflows/stale.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 12fee8f0db..26d7e5b1f8 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,11 +1,11 @@
-name: Mark stale issues and pull requests
+name: Audit aging issues/PRs
 
 on:
   schedule:
   - cron: "30 1 * * *"
 
 jobs:
-  stale:
+  audit:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/stale@v3
@@ -30,5 +30,7 @@ jobs:
 
           If you are waiting on a response from us we will try and address your comments on a future Community Day.
 
-          Alternatively, if it is no longer relevant to you please close the PR with a comment. Please note that if a pull request receives no update for 7 after it has been labelled, it will be closed. We are always happy to re-open pull request if they have been closed in error.
+          Alternatively, if it is no longer relevant to you please close the PR with a comment. 
+          
+          Please note that if a pull request receives no update for 7 after it has been labelled, it will be closed. We are always happy to re-open pull request if they have been closed in error.
         stale-pr-label: 'attention-needed'

From 133ed5c03205530b6666dd90c92db5a3f22e1845 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 20 May 2022 12:05:22 +0200
Subject: [PATCH 1913/2267] Drop support for Fedora < 18

Fedora 34 is going EOL in 20 days. Trying to support Fedora < 18 is
unreasonable.
---
 manifests/version.pp        |  2 +-
 spec/classes/apache_spec.rb | 15 ++-----------
 spec/spec_helper_local.rb   | 42 -------------------------------------
 3 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index f799db73b4..6feacb3f5d 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -13,7 +13,7 @@
       }
       elsif ($::operatingsystem == 'Amazon' and $::operatingsystemmajrelease == '2') {
         $default = '2.4'
-      } elsif ($::operatingsystem == 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '7') >= 0) {
+      } elsif $::operatingsystem == 'Fedora' or versioncmp($facts['operatingsystemmajrelease'], '7') >= 0 {
         $default = '2.4'
       } else {
         $default = '2.2'
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 651540291e..dc27f1e5e3 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -629,22 +629,11 @@
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^HostnameLookups Double\n} }
     end
 
-    context 'on Fedora 21' do
-      include_examples 'Fedora 21'
+    context 'on Fedora 28' do
+      include_examples 'Fedora 28'
 
       it { is_expected.to contain_class('apache').with_apache_version('2.4') }
     end
-    context 'on Fedora Rawhide' do
-      include_examples 'Fedora Rawhide'
-
-      it { is_expected.to contain_class('apache').with_apache_version('2.4') }
-    end
-    # kinda obsolete
-    context 'on Fedora 17' do
-      include_examples 'Fedora 17'
-
-      it { is_expected.to contain_class('apache').with_apache_version('2.2') }
-    end
   end
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 10'
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index bef086aca9..a6f789ff0e 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -57,34 +57,6 @@
   let(:facts) { on_supported_os['redhat-8-x86_64'] }
 end
 
-shared_context 'Fedora 17' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'RedHat',
-      operatingsystem: 'Fedora',
-      operatingsystemrelease: '17',
-      operatingsystemmajrelease: '17',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
-end
-
-shared_context 'Fedora 21' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'RedHat',
-      operatingsystem: 'Fedora',
-      operatingsystemrelease: '21',
-      operatingsystemmajrelease: '21',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
-end
-
 shared_context 'Fedora 28' do
   let :facts do
     {
@@ -99,20 +71,6 @@
   end
 end
 
-shared_context 'Fedora Rawhide' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'RedHat',
-      operatingsystem: 'Fedora',
-      operatingsystemrelease: 'Rawhide',
-      operatingsystemmajrelease: 'Rawhide',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
-end
-
 shared_context 'FreeBSD 9' do
   let :facts do
     {

From 22173a910d0062d47bc2fe605f5d92eb1f5598fd Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 20 May 2022 12:08:33 +0200
Subject: [PATCH 1914/2267] Test overriding mod_libs on RedHat 8

This is more likely to be used since Fedora 28 is EOL.
---
 spec/classes/mod/wsgi_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index b888366791..4b3081dc9b 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -141,7 +141,7 @@
   end
   context 'overriding mod_libs' do
     context 'on a RedHat OS', :compile do
-      include_examples 'Fedora 28'
+      include_examples 'RedHat 8'
       let :pre_condition do
         <<-MANIFEST
         include apache::params

From 65c169edfebfcb34447bd9f0de64fd67a13bfb7a Mon Sep 17 00:00:00 2001
From: Skylar Thompson <skylar2@uw.edu>
Date: Tue, 24 May 2022 09:59:20 -0700
Subject: [PATCH 1915/2267] change test case to use proxy_pass_match rather
 than proxy_pass

---
 spec/defines/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 50c565d6c2..d704989849 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -212,7 +212,7 @@
                 {
                   'path'       => '^/proxy',
                   'provider'   => 'locationmatch',
-                  'proxy_pass' => [
+                  'proxy_pass_match' => [
                     {
                       'url'             => 'http://backend-b/',
                       'keywords'        => ['noquery', 'interpolate'],

From b376826e763598538b7b3c4e182661a8c1bf0900 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 16 Jul 2021 19:38:26 +0200
Subject: [PATCH 1916/2267] Add an apache::vhost::proxy define

This builds on apache::vhost::fragment with a more specialized type for
a reverse proxy setup. This reuses the same template as apache::vhost
but has data types. The types are stricter, but this leads to a clearer
API. For example, it doesn't accept String and Array[String] but in that
case always wants an Array.

The old parameters on vhost remain and can continue to be used.
---
 manifests/vhost/proxy.pp         | 81 ++++++++++++++++++++++++++++++++
 spec/defines/vhost_proxy_spec.rb | 58 +++++++++++++++++++++++
 types/vhost/proxypass.pp         | 16 +++++++
 3 files changed, 155 insertions(+)
 create mode 100644 manifests/vhost/proxy.pp
 create mode 100644 spec/defines/vhost_proxy_spec.rb
 create mode 100644 types/vhost/proxypass.pp

diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
new file mode 100644
index 0000000000..8eb3c6aebf
--- /dev/null
+++ b/manifests/vhost/proxy.pp
@@ -0,0 +1,81 @@
+# @summary Configure a reverse reverse proxy for a vhost
+#
+# @param proxy_dest
+#   Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
+#
+# @param proxy_pass
+#   Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)
+#   configuration. Optionally, parameters can be added as an array.
+#   ``` puppet
+#   apache::vhost { 'site.name.fdqn':
+#     …
+#     proxy_pass => [
+#       { 'path' => '/a', 'url' => 'http://backend-a/' },
+#       { 'path' => '/b', 'url' => 'http://backend-b/' },
+#       { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
+#       { 'path' => '/l', 'url' => 'http://backend-xy',
+#         'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
+#       { 'path' => '/d', 'url' => 'http://backend-a/d',
+#         'params' => { 'retry' => '0', 'timeout' => '5' }, },
+#       { 'path' => '/e', 'url' => 'http://backend-a/e',
+#         'keywords' => ['nocanon', 'interpolate'] },
+#       { 'path' => '/f', 'url' => 'http://backend-f/',
+#         'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+#       { 'path' => '/g', 'url' => 'http://backend-g/',
+#         'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
+#       { 'path' => '/h', 'url' => 'http://backend-h/h',
+#         'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
+#     ],
+#   }
+#   ```
+#   * `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string.
+#   * `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
+#   * `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
+#   * `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
+#
+# @param proxy_dest_match
+#   This directive is equivalent to `proxy_dest`, but takes regular expressions, see
+#   [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+#   for details.
+#
+# @param proxy_dest_reverse_match
+#   Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
+#   [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
+#   for details.
+#
+# @param proxy_pass_match
+#   This directive is equivalent to `proxy_pass`, but takes regular expressions, see
+#   [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+#   for details.
+define apache::vhost::proxy(
+  String[1] $vhost,
+  $priority = undef,
+  Integer[0] $order = 170,
+  Optional[Stdlib::Port] $port = undef,
+  Optional[String[1]] $proxy_dest = undef,
+  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass = undef,
+  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass_match = undef,
+  Optional[String[1]] $proxy_dest_match = undef,
+  Optional[String[1]] $proxy_dest_reverse_match = undef,
+  Boolean $proxy_requests = false,
+  Boolean $proxy_preserve_host = false,
+  Optional[Boolean] $proxy_add_headers = undef,
+  Boolean $proxy_error_override = false,
+  Variant[Array[String[1]], String[1]] $no_proxy_uris = [],
+  Variant[Array[String[1]], String[1]] $no_proxy_uris_match = [],
+) {
+  include apache::mod::proxy
+  include apache::mod::proxy_http
+
+  unless $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match {
+    fail('At least one of proxy_dest, proxy_pass, proxy_pass_match or proxy_dest_match must be given')
+  }
+
+  apache::vhost::fragment { "${name}-proxy":
+    vhost    => $vhost,
+    port     => $port,
+    priority => $priority,
+    order    => $order,
+    content  => template('apache/vhost/_proxy.erb'),
+  }
+}
diff --git a/spec/defines/vhost_proxy_spec.rb b/spec/defines/vhost_proxy_spec.rb
new file mode 100644
index 0000000000..57a5477147
--- /dev/null
+++ b/spec/defines/vhost_proxy_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::vhost::proxy' do
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+      let(:title) { 'myproxy' }
+
+      context 'adding to the default vhost' do
+        let(:pre_condition) { 'include apache' }
+
+        let(:params) do
+          {
+            vhost: 'default',
+            port: 80,
+            priority: '15',
+          }
+        end
+
+        context 'without any parameters' do
+          it { is_expected.to compile.and_raise_error(%r{At least one of}) }
+        end
+
+        context 'with proxy_dest' do
+          let(:params) do
+            super().merge(
+              proxy_pass: [
+                {
+                  path: '/',
+                  url: 'http://localhost:8080/',
+                },
+              ],
+            )
+          end
+
+          it 'creates a concat fragment' do
+            is_expected.to compile.with_all_deps
+            is_expected.to contain_concat('15-default-80.conf')
+            is_expected.to create_concat__fragment('default-myproxy-proxy')
+              .with_target('15-default-80.conf')
+              .with_order(170)
+              .with_content(
+                Regexp.new(<<~CONTENT),
+                  \n\s\s## Proxy rules
+                  \s\sProxyRequests Off
+                  \s\sProxyPreserveHost Off
+                  \s\sProxyPass / http://localhost:8080/
+                  \s\sProxyPassReverse / http://localhost:8080/
+                CONTENT
+              )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/types/vhost/proxypass.pp b/types/vhost/proxypass.pp
new file mode 100644
index 0000000000..03c4da7f63
--- /dev/null
+++ b/types/vhost/proxypass.pp
@@ -0,0 +1,16 @@
+# @summary A proxy pass definition for in an Apache vhost
+type Apache::Vhost::ProxyPass = Struct[{
+  path                          => String[1],
+  url                           => String[1],
+  Optional[params]              => Hash[String[1], Variant[String[1], Integer]],
+  Optional[keywords]            => Array[String[1]],
+  Optional[reverse_cookies]     => Array[Struct[{
+    url    => String[1],
+    path   => Optional[String[1]],
+    domain => Optional[String[1]],
+  }]],
+  Optional[reverse_urls]        => Array[String[1]],
+  Optional[setenv]              => Array[String[1]],
+  Optional[no_proxy_uris]       => Array[String[1]],
+  Optional[no_proxy_uris_match] => Array[String[1]],
+}]

From c3b91c7a8bdbb6a8f0b26c2367e951c61396b2b3 Mon Sep 17 00:00:00 2001
From: William Bradford Clark <wclark@redhat.com>
Date: Fri, 27 May 2022 13:51:15 -0400
Subject: [PATCH 1917/2267] Document reverse proxy resource and data types.

Adds thorough documentation for the Apache::Vhost::Proxy
resource type and Apache::Vhost::ProxyPass data type introduced
by the commit b37682. Addresses issues with clarity and
coverage identified in code review.
---
 manifests/vhost/proxy.pp | 115 +++++++++++++++++++++++++++++----------
 types/vhost/proxypass.pp |  78 +++++++++++++++++++++++++-
 2 files changed, 163 insertions(+), 30 deletions(-)

diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 8eb3c6aebf..cc11a8b8f0 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -1,14 +1,90 @@
-# @summary Configure a reverse reverse proxy for a vhost
+# @summary Configure a reverse proxy for a vhost
+#
+# @param vhost
+#   The title of the vhost resource to which reverse proxy configuration will
+#   be appended.
+#
+# @param priority
+#   Set the priority to match the one `apache::vhost` sets. This must match the
+#   one `apache::vhost` sets or else the vhost's `concat` resource won't be found.
+#
+# @param order
+#   The order in which the `concat::fragment` containing the proxy configuration
+#   will be inserted. Useful when multiple fragments will be attached to a single
+#   vhost's configuration.
+#
+# @param port
+#   Set the port to match the one `apache::vhost` sets. This must match the one
+#   `apache::vhost` sets or else the vhost's `concat` resource won't be found.
 #
 # @param proxy_dest
-#   Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
+#   Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration for the `/` path.
+#
+# @param proxy_dest_match
+#   This directive is equivalent to `proxy_dest`, but takes regular expressions, see
+#   [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+#   for details.
+#
+# @param proxy_dest_reverse_match
+#   Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
+#   [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
+#   for details.
+#
+# @param no_proxy_uris
+#   Paths to be excluded from reverse proxying. Only valid when already using `proxy_dest`
+#   or `proxy_dest_match` to map the `/` path, otherwise it will be absent in the final
+#   vhost configuration file. In that case, instead add `no_proxy_uris => [uri1, uri2, ...]`
+#   to the `Apache::Vhost::ProxyPass` definitions passed via the `proxy_pass` parameter.
+#   See examples for this class, or refer to documentation for the `Apache::Vhost::ProxyPass`
+#   data type. This configuration uses the [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) directive with `!`.
+#
+# @param no_proxy_uris_match
+#   This directive is equivalent to `no_proxy_uris` but takes regular expressions,
+#   as it instead uses [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch).
 #
 # @param proxy_pass
 #   Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)
-#   configuration. Optionally, parameters can be added as an array.
-#   ``` puppet
-#   apache::vhost { 'site.name.fdqn':
-#     …
+#   configuration.
+#   See the documentation for the Apache::Vhost::ProxyPass data type for a detailed
+#   description of the structure including optional parameters.
+#
+# @param proxy_pass_match
+#   This directive is equivalent to `proxy_pass`, but takes regular expressions, see
+#   [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+#   for details.
+#
+# @param proxy_requests
+#   Enables forward (standard) proxy requests. See [ProxyRequests](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests) for details.
+#
+# @param proxy_preserve_host
+#   When enabled, pass the `Host:` line from the incoming request to the proxied host.
+#   See [ProxyPreserveHost](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost) for details.
+#
+# @param proxy_add_headers
+#   Add X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Server HTTP headers.
+#   See [ProxyAddHeaders](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders) for details.
+#
+# @param proxy_error_override
+#   Override error pages from the proxied host. The current Puppet implementation
+#   supports enabling or disabling the directive, but not specifying a custom list
+#   of status codes. See [ProxyErrorOverride](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride) for details.
+#
+# @example Simple configuration proxying "/" but not "/admin"
+#   include apache
+#   apache::vhost { 'basic-proxy-vhost':
+#   }
+#   apache::vhost::proxy { 'proxy-to-backend-server':
+#     vhost => 'basic-proxy-vhost',
+#     proxy_dest => 'http://backend-server/',
+#     no_proxy_uris => '/admin',
+#   }
+#
+# @example Granular configuration using `Apache::Vhost::ProxyPass` data type
+#   include apache
+#   apache::vhost { 'myvhost':
+#   }
+#   apache::vhost::proxy { 'myvhost-proxy':
+#     vhost      => 'myvhost',
 #     proxy_pass => [
 #       { 'path' => '/a', 'url' => 'http://backend-a/' },
 #       { 'path' => '/b', 'url' => 'http://backend-b/' },
@@ -27,42 +103,23 @@
 #         'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
 #     ],
 #   }
-#   ```
-#   * `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string.
-#   * `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`.
-#   * `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
-#   * `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
-#
-# @param proxy_dest_match
-#   This directive is equivalent to `proxy_dest`, but takes regular expressions, see
-#   [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
-#   for details.
-#
-# @param proxy_dest_reverse_match
-#   Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
-#   [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
-#   for details.
 #
-# @param proxy_pass_match
-#   This directive is equivalent to `proxy_pass`, but takes regular expressions, see
-#   [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
-#   for details.
 define apache::vhost::proxy(
   String[1] $vhost,
   $priority = undef,
   Integer[0] $order = 170,
   Optional[Stdlib::Port] $port = undef,
   Optional[String[1]] $proxy_dest = undef,
-  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass = undef,
-  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass_match = undef,
   Optional[String[1]] $proxy_dest_match = undef,
   Optional[String[1]] $proxy_dest_reverse_match = undef,
+  Variant[Array[String[1]], String[1]] $no_proxy_uris = [],
+  Variant[Array[String[1]], String[1]] $no_proxy_uris_match = [],
+  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass = undef,
+  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass_match = undef,
   Boolean $proxy_requests = false,
   Boolean $proxy_preserve_host = false,
   Optional[Boolean] $proxy_add_headers = undef,
   Boolean $proxy_error_override = false,
-  Variant[Array[String[1]], String[1]] $no_proxy_uris = [],
-  Variant[Array[String[1]], String[1]] $no_proxy_uris_match = [],
 ) {
   include apache::mod::proxy
   include apache::mod::proxy_http
diff --git a/types/vhost/proxypass.pp b/types/vhost/proxypass.pp
index 03c4da7f63..d2d9729349 100644
--- a/types/vhost/proxypass.pp
+++ b/types/vhost/proxypass.pp
@@ -1,4 +1,80 @@
-# @summary A proxy pass definition for in an Apache vhost
+# @summary Struct representing reverse proxy configuration for an Apache vhost, used by the Apache::Vhost::Proxy defined resource type.
+#
+# @param [String[1]] path
+#   The virtual path on the local server to map.
+#
+# @param [String[1]] url
+#   The URL to which the path and its children will be mapped.
+#
+# @param [Optional[Hash]] params
+#   Optional [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) key-value parameters, such as connection settings.
+#
+# @param [Array[String[1]]] reverse_urls
+#   Optional (but usually recommended) URLs for [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) configuration.
+#   Allows Apache to adjust certain headers on HTTP redirect responses, to prevent
+#   redirects on the back-end from bypassing the reverse proxy.
+#
+# @param [Optional[Array[Hash]]] reverse_cookies
+#   Optional Array of Hashes, each representing a ProxyPassReverseCookieDomain or
+#   ProxyPassReverseCookiePath configuration. These are similar to ProxyPassReverse but
+#   operate on Domain or Path strings respectively in Set-Cookie headers. Each Hash
+#   must contain one `url => value` pair, and exactly one `path => value` or `domain => value`
+#   pair, representing the internal domain or internal path.
+# @option reverse_cookies [String[1]] :url
+#   Required partial URL representing public domain or public path.
+# @option reverse_cookies [Optional[String[1]]] :path
+#   Internal path for [ProxyPassReverseCookiePath](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiepath) configuration.
+# @option reverse_cookies [Optional[String[1]]] :domain
+#   Internal domain for [ProxyPassReverseCookieDomain](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiedomain) configuration.
+#
+# @param [Optional[Array[String[1]]]] keywords
+#   Array of optional keywords such as `nocanon`, `interpolate`, or `noquery` supported
+#   by [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) (refer
+#   to subsection under heading "Additional ProxyPass Keywords").
+#
+# @param [Optional[Array[String[1]]]] setenv
+#   Optional Array of Strings of the form "${env_var_name} ${value}".
+#   Uses [SetEnv](https://httpd.apache.org/docs/current/mod/mod_env.html#setenv) to make [Protocol Adjustments](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) to mod_proxy in the virtual
+# host context. Because the implementation uses SetEnv, you must `include apache::mod::env`;
+# for the same reason, this cannot set the newer `no-proxy` environment variable, which
+# would require an implementation using SetEnvIf.
+#
+# @param [Optional[Array[String[1]]]] no_proxy_uris
+#   Optional Array of paths to exclude from proxying, using the `!` directive to [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass).
+#
+# @param [Optional[Array[String[1]]]] no_proxy_uris_match
+#   Similar to `no_proxy_uris` but uses [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) to allow regular
+#   expressions.
+#
+# @example Basic example
+#   { 'path' => '/a', 'url' => 'http://backend-a/', }
+#
+# @example With parameters
+#   { 'path' => '/b', 'url' => 'http://backend-a/b',
+#     'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300,}, }
+#
+# @example With ProxyPassReverse
+#   { 'path' => '/l', 'url' => 'http://backend-xy',
+#     'reverse_urls' => ['http://backend-x', 'http://backend-y'], }
+#
+# @example With additional keywords
+#   { 'path' => '/e', 'url' => 'http://backend-a/e',
+#     'keywords' => ['nocanon', 'interpolate'], }
+#
+# @example With mod_proxy environment variables
+#   { 'path' => '/f', 'url' => 'http://backend-f/',
+#     'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'], }
+#
+# @example With ProxyPassReverseCookieDomain and ProxyPassReverseCookiePath
+#   { 'path' => '/g', 'url' => 'http://backend-g/',
+#     'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',}], }
+#
+# @example With exclusions
+#   { 'path' => '/h', 'url' => 'http://backend-h/h',
+#     'no_proxy_uris' => ['/h/admin', '/h/server-status'], }
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
+#
 type Apache::Vhost::ProxyPass = Struct[{
   path                          => String[1],
   url                           => String[1],

From 6576685ab747ee3681cc5f0f3c68ae3a0c1f65fc Mon Sep 17 00:00:00 2001
From: William Bradford Clark <wclark@redhat.com>
Date: Tue, 31 May 2022 09:58:34 -0400
Subject: [PATCH 1918/2267] Fix syntax error in vhost/proxy.pp

---
 manifests/vhost/proxy.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index cc11a8b8f0..c6dd537995 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -104,7 +104,7 @@
 #     ],
 #   }
 #
-define apache::vhost::proxy(
+define apache::vhost::proxy (
   String[1] $vhost,
   $priority = undef,
   Integer[0] $order = 170,

From 7c58b4966d196acefabf2d8257522f237e2d61c8 Mon Sep 17 00:00:00 2001
From: William Bradford Clark <wclark@redhat.com>
Date: Tue, 31 May 2022 10:01:23 -0400
Subject: [PATCH 1919/2267] Add type to vhost priority variable

---
 manifests/vhost/custom.pp   | 2 +-
 manifests/vhost/fragment.pp | 2 +-
 manifests/vhost/proxy.pp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index 56e8b1258c..966f7bba54 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -18,7 +18,7 @@
 define apache::vhost::custom (
   $content,
   $ensure = 'present',
-  $priority = '25',
+  Variant[Integer,String,Boolean] $priority = '25',
   $verify_config = true,
 ) {
   include apache
diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
index b331214bb4..459839de0a 100644
--- a/manifests/vhost/fragment.pp
+++ b/manifests/vhost/fragment.pp
@@ -56,7 +56,7 @@
 define apache::vhost::fragment (
   String[1] $vhost,
   Optional[Integer[0]] $port = undef,
-  $priority = undef,
+  Optional[Variant[Integer,String,Boolean]] $priority = undef,
   Optional[String] $content = undef,
   Integer[0] $order = 900,
 ) {
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index c6dd537995..0faca113a1 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -106,7 +106,7 @@
 #
 define apache::vhost::proxy (
   String[1] $vhost,
-  $priority = undef,
+  Optional[Variant[Integer,String,Boolean]] $priority = undef,
   Integer[0] $order = 170,
   Optional[Stdlib::Port] $port = undef,
   Optional[String[1]] $proxy_dest = undef,

From 574d07e93fdbd88a62d32fcdad53f3a4cc1c452d Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 17 May 2022 14:37:10 +0100
Subject: [PATCH 1920/2267] (maint) PDK Update

---
 .devcontainer/README.md | 8 ++++++--
 Gemfile                 | 2 +-
 metadata.json           | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index cc4675e5dd..a719361689 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.profiles.linux": {
+			"bash": {
+				"path": "bash",
+			}
+		}
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"puppet.puppet-vscode",
 		"rebornix.Ruby"
-	]
+	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [],
diff --git a/Gemfile b/Gemfile
index a14223db65..a9c4bb530f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "voxpupuli-puppet-lint-plugins", '>= 3.0',                 require: false, platforms: [:ruby]
+  gem "voxpupuli-puppet-lint-plugins", '>= 3.0',                 require: false
   gem "github_changelog_generator",                              require: false
 end
 group :system_tests do
diff --git a/metadata.json b/metadata.json
index 908760b079..2dd764b2be 100644
--- a/metadata.json
+++ b/metadata.json
@@ -91,5 +91,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "2.4.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g806810b"
+  "template-ref": "heads/main-0-g369d483"
 }

From 08f7a4816d2470396fc0c7592689241116baa6a8 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 20 May 2022 14:29:01 +0100
Subject: [PATCH 1921/2267] (GH-cat-9) Update code to match syntax standard,
 part 1

Code now compliant with the following rules:
- manifest_whitespace_closing_bracket_after
- relative_classname_inclusion
- relative_classname_reference
- version_conparison
- legacy_facts
- top_scope_facts
---
 .puppet-lint.rc                     |  6 ---
 .sync.yml                           |  7 ---
 Rakefile                            |  6 ---
 manifests/balancermember.pp         |  2 +-
 manifests/default_confd_files.pp    |  2 +-
 manifests/default_mods.pp           | 10 ++--
 manifests/init.pp                   | 12 ++---
 manifests/mod.pp                    |  8 +--
 manifests/mod/alias.pp              |  2 +-
 manifests/mod/auth_cas.pp           |  4 +-
 manifests/mod/auth_mellon.pp        |  2 +-
 manifests/mod/auth_openidc.pp       |  2 +-
 manifests/mod/authn_dbd.pp          |  2 +-
 manifests/mod/autoindex.pp          |  4 +-
 manifests/mod/cgi.pp                | 14 +++---
 manifests/mod/cgid.pp               | 12 ++---
 manifests/mod/dav_fs.pp             |  4 +-
 manifests/mod/dav_svn.pp            |  4 +-
 manifests/mod/disk_cache.pp         |  6 +--
 manifests/mod/event.pp              |  4 +-
 manifests/mod/fastcgi.pp            |  2 +-
 manifests/mod/fcgid.pp              |  2 +-
 manifests/mod/info.pp               |  4 +-
 manifests/mod/itk.pp                |  6 +--
 manifests/mod/jk.pp                 |  2 +-
 manifests/mod/mime.pp               |  2 +-
 manifests/mod/passenger.pp          | 12 ++---
 manifests/mod/peruser.pp            |  6 +--
 manifests/mod/php.pp                | 12 ++---
 manifests/mod/prefork.pp            |  4 +-
 manifests/mod/proxy_ajp.pp          |  2 +-
 manifests/mod/proxy_balancer.pp     |  4 +-
 manifests/mod/proxy_fcgi.pp         |  2 +-
 manifests/mod/proxy_html.pp         | 16 +++---
 manifests/mod/proxy_http.pp         |  2 +-
 manifests/mod/proxy_wstunnel.pp     |  2 +-
 manifests/mod/security.pp           |  8 +--
 manifests/mod/shib.pp               |  2 +-
 manifests/mod/ssl.pp                | 12 ++---
 manifests/mod/ssl/reload.pp         |  2 +-
 manifests/mod/status.pp             |  2 +-
 manifests/mod/version.pp            |  2 +-
 manifests/mod/worker.pp             |  4 +-
 manifests/mod/wsgi.pp               |  2 +-
 manifests/mpm.pp                    |  6 +--
 manifests/package.pp                |  4 +-
 manifests/params.pp                 | 70 +++++++++++++-------------
 manifests/version.pp                | 10 ++--
 metadata.json                       |  2 +-
 spec/classes/mod/jk_spec.rb         |  4 +-
 spec/classes/mod/proxy_html_spec.rb |  4 +-
 spec/spec_helper_local.rb           | 76 +++++++++++++++++++++++++++--
 52 files changed, 227 insertions(+), 176 deletions(-)

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index 240c0001ba..764bae24ed 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,10 +1,4 @@
 --relative
 --no-parameter_types-check
 --no-parameter_documentation-check
---no-top_scope_facts-check
---no-legacy_facts-check
---no-relative_classname_reference-check
---no-relative_classname_inclusion-check
 --no-anchor_resource-check
---no-version_comparison-check
---no-manifest_whitespace_closing_bracket_after-check
diff --git a/.sync.yml b/.sync.yml
index c6666aea96..afd2b90909 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -39,11 +39,4 @@ Rakefile:
   extra_disabled_lint_checks:
     - parameter_types
     - parameter_documentation
-    - top_scope_facts
-    - legacy_facts
-    - relative_classname_reference
-    - relative_classname_inclusion
     - anchor_resource
-    - version_comparison
-    - manifest_whitespace_closing_bracket_after
-
diff --git a/Rakefile b/Rakefile
index 19df0a4cbd..ff4f906f72 100644
--- a/Rakefile
+++ b/Rakefile
@@ -44,13 +44,7 @@ end
 PuppetLint.configuration.send('disable_relative')
 PuppetLint.configuration.send('disable_parameter_types')
 PuppetLint.configuration.send('disable_parameter_documentation')
-PuppetLint.configuration.send('disable_top_scope_facts')
-PuppetLint.configuration.send('disable_legacy_facts')
-PuppetLint.configuration.send('disable_relative_classname_reference')
-PuppetLint.configuration.send('disable_relative_classname_inclusion')
 PuppetLint.configuration.send('disable_anchor_resource')
-PuppetLint.configuration.send('disable_version_comparison')
-PuppetLint.configuration.send('disable_manifest_whitespace_closing_bracket_after')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 3fa54960dd..8a1af44302 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -40,7 +40,7 @@
 #
 define apache::balancermember (
   $balancer_cluster,
-  $url = "http://${::fqdn}/",
+  $url = "http://${$facts['networking']['fqdn']}/",
   $options = [],
 ) {
   concat::fragment { "BalancerMember ${name}":
diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
index ecf543eed1..5a7c7f786f 100644
--- a/manifests/default_confd_files.pp
+++ b/manifests/default_confd_files.pp
@@ -7,7 +7,7 @@
 ) {
   # The rest of the conf.d/* files only get loaded if we want them
   if $all {
-    case $::osfamily {
+    case $facts['os']['family'] {
       'freebsd': {
         include apache::confd::no_accf
       }
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 255c9239f3..55eed95750 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -11,18 +11,18 @@
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
   # them to make sure it works.
-  case $::osfamily {
+  case $facts['os']['family'] {
     'redhat': {
       ::apache::mod { 'log_config': }
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemmajrelease, '7') == -1) and !($::operatingsystem == 'Amazon') ) {
+        if ( !($facts['os']['family'] == 'redhat' and versioncmp($facts['os']['release']['major'], '7') == -1) and !($facts['os']['name'] == 'Amazon') ) {
           if ($use_systemd) {
             ::apache::mod { 'systemd': }
           }
         }
-        if ($::operatingsystem == 'Amazon' and $::operatingsystemrelease == '2') {
+        if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['full'] == '2') {
           ::apache::mod { 'systemd': }
         }
         ::apache::mod { 'unixd': }
@@ -37,7 +37,7 @@
     }
     default: {}
   }
-  case $::osfamily {
+  case $facts['os']['family'] {
     'gentoo': {}
     default: {
       ::apache::mod { 'authz_host': }
@@ -45,7 +45,7 @@
   }
   # The rest of the modules only get loaded if we want all modules enabled
   if $all {
-    case $::osfamily {
+    case $facts['os']['family'] {
       'debian': {
         include apache::mod::authn_core
         include apache::mod::reqtimeout
diff --git a/manifests/init.pp b/manifests/init.pp
index 1b7516203d..1043129eb5 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -549,13 +549,13 @@
   $access_log_file                                               = $apache::params::access_log_file,
   Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                = [],
   Optional[Boolean] $protocols_honor_order                       = undef,
-) inherits ::apache::params {
+) inherits apache::params {
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
     default => '(event|itk|prefork|worker)'
   }
 
-  if $::osfamily == 'RedHat' and $facts['operatingsystemmajrelease'] == '7' {
+  if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7' {
     # On redhat 7 the ssl.conf lives in /etc/httpd/conf.d (the confd_dir)
     # when all other module configs live in /etc/httpd/conf.modules.d (the
     # mod_dir). On all other platforms and versions, ssl.conf lives in the
@@ -580,7 +580,7 @@
   # should delete the 'if' block below and modify all MPM modules' manifests
   # such that they include apache::package class (currently event.pp, itk.pp,
   # peruser.pp, prefork.pp, worker.pp).
-  if $::osfamily != 'FreeBSD' {
+  if $facts['os']['family'] != 'FreeBSD' {
     package { 'httpd':
       ensure => $package_ensure,
       name   => $apache_name,
@@ -735,7 +735,7 @@
   }
 
   if $apache::conf_dir and $apache::params::conf_file {
-    if $::osfamily == 'gentoo' {
+    if $facts['os']['family'] == 'gentoo' {
       $error_documents_path = '/usr/share/apache2/error'
       if $default_mods =~ Array {
         if defined('apache::mod::ssl') {
@@ -758,7 +758,7 @@
       }
     }
 
-    $apxs_workaround = $::osfamily ? {
+    $apxs_workaround = $facts['os']['family'] ? {
       'freebsd' => true,
       default   => false
     }
@@ -837,7 +837,7 @@
       use_servername_for_filenames => true,
       use_port_for_filenames       => true,
     }
-    $ssl_access_log_file = $::osfamily ? {
+    $ssl_access_log_file = $facts['os']['family'] ? {
       'freebsd' => $access_log_file,
       default   => "ssl_${access_log_file}",
     }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 0f7105d630..c748d2f819 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -84,7 +84,7 @@
   if $package {
     $_package = $package
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
-    if ($apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease != '2') {
+    if ($apache::apache_version == '2.4' and $facts['os']['name'] =~ /^[Aa]mazon$/ and $facts['os']['release']['major'] != '2') {
       # On amazon linux we need to prefix our package name with mod24 instead of mod to support apache 2.4
       $_package = regsubst($mod_packages[$mod],'^(mod_)?(.*)','mod24_\2')
     } else {
@@ -98,7 +98,7 @@
     # httpd.conf with 'LoadModule' directives; here, by proper resource
     # ordering, we ensure that our version of httpd.conf is reverted after
     # the module gets installed.
-    $package_before = $::osfamily ? {
+    $package_before = $facts['os']['family'] ? {
       'freebsd' => [
         File[$_loadfile_name],
         File["${apache::conf_dir}/${apache::params::conf_file}"]
@@ -134,7 +134,7 @@
     notify  => Class['apache::service'],
   }
 
-  if $::osfamily == 'Debian' {
+  if $facts['os']['family'] == 'Debian' {
     $enable_dir = $apache::mod_enable_dir
     file { "${_loadfile_name} symlink":
       ensure  => link,
@@ -169,7 +169,7 @@
         notify  => Class['apache::service'],
       }
     }
-  } elsif $::osfamily == 'Suse' {
+  } elsif $facts['os']['family'] == 'Suse' {
     $enable_dir = $apache::mod_enable_dir
     file { "${_loadfile_name} symlink":
       ensure  => link,
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 58ab0bdf8f..c187e7661c 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -26,7 +26,7 @@
   # set icons_path to false to disable the alias
   $icons_path     = $apache::params::alias_icons_path,
   $icons_prefix   = $apache::params::icons_prefix
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   apache::mod { 'alias': }
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 51e7d2c084..5d130662ed 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -106,8 +106,8 @@
   $cas_attribute_delimiter   = undef,
   $cas_scrub_request_headers = undef,
   $suppress_warning          = false,
-) inherits ::apache::params {
-  if $::osfamily == 'RedHat' and ! $suppress_warning {
+) inherits apache::params {
+  if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')
   }
 
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index d585aed641..43a5614306 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -32,7 +32,7 @@
   $mellon_post_ttl = undef,
   $mellon_post_size = undef,
   $mellon_post_count = undef
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   ::apache::mod { 'auth_mellon': }
 
diff --git a/manifests/mod/auth_openidc.pp b/manifests/mod/auth_openidc.pp
index ad0024fc4d..7311759323 100644
--- a/manifests/mod/auth_openidc.pp
+++ b/manifests/mod/auth_openidc.pp
@@ -4,7 +4,7 @@
 # @see https://github.com/zmartzone/mod_auth_openidc for additional documentation.
 #
 class apache::mod::auth_openidc (
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   include apache::mod::authz_user
   apache::mod { 'auth_openidc': }
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
index b5e8d2c915..e1f78960e7 100644
--- a/manifests/mod/authn_dbd.pp
+++ b/manifests/mod/authn_dbd.pp
@@ -36,7 +36,7 @@
   $authn_dbd_keep        = '8',
   $authn_dbd_exptime     = '300',
   $authn_dbd_alias       = undef,
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   include apache::mod::dbd
   ::apache::mod { 'authn_dbd': }
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index e3215540af..aa05bd2703 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -5,12 +5,12 @@
 #
 class apache::mod::autoindex (
   $icons_prefix   = $apache::params::icons_prefix
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   ::apache::mod { 'autoindex': }
 
   # Determine icon filename suffix for autoindex.conf.erb
-  case $::operatingsystem {
+  case $facts['os']['name'] {
     'Debian', 'Ubuntu': {
       $icon_suffix = '-20x22'
     }
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
index c11ea7fc98..862e8f0543 100644
--- a/manifests/mod/cgi.pp
+++ b/manifests/mod/cgi.pp
@@ -5,20 +5,20 @@
 #
 class apache::mod::cgi {
   include apache
-  case $::osfamily {
+  case $facts['os']['family'] {
     'FreeBSD': {}
     default: {
-      if defined(Class['::apache::mod::itk']) {
-        Class['::apache::mod::itk'] -> Class['::apache::mod::cgi']
-      } elsif defined(Class['::apache::mod::peruser']) {
-        Class['::apache::mod::peruser'] -> Class['::apache::mod::cgi']
+      if defined(Class['apache::mod::itk']) {
+        Class['apache::mod::itk'] -> Class['apache::mod::cgi']
+      } elsif defined(Class['apache::mod::peruser']) {
+        Class['apache::mod::peruser'] -> Class['apache::mod::cgi']
       } else {
-        Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
+        Class['apache::mod::prefork'] -> Class['apache::mod::cgi']
       }
     }
   }
 
-  if $::osfamily == 'Suse' {
+  if $facts['os']['family'] == 'Suse' {
     ::apache::mod { 'cgi':
       lib_path => '/usr/lib64/apache2-prefork',
     }
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index e40af45b43..90ad2c56f3 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -5,26 +5,26 @@
 #
 class apache::mod::cgid {
   include apache
-  case $::osfamily {
+  case $facts['os']['family'] {
     'FreeBSD': {}
     default: {
-      if defined(Class['::apache::mod::event']) {
-        Class['::apache::mod::event'] -> Class['::apache::mod::cgid']
+      if defined(Class['apache::mod::event']) {
+        Class['apache::mod::event'] -> Class['apache::mod::cgid']
       } else {
-        Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
+        Class['apache::mod::worker'] -> Class['apache::mod::cgid']
       }
     }
   }
 
   # Debian specifies it's cgid sock path, but RedHat uses the default value
   # with no config file
-  $cgisock_path = $::osfamily ? {
+  $cgisock_path = $facts['os']['family'] ? {
     'debian'  => "\${APACHE_RUN_DIR}/cgisock",
     'freebsd' => 'cgisock',
     default   => undef,
   }
 
-  if $::osfamily == 'Suse' {
+  if $facts['os']['family'] == 'Suse' {
     ::apache::mod { 'cgid':
       lib_path => '/usr/lib64/apache2-worker',
     }
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index 20fd5c0157..e944bcd0b9 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -5,13 +5,13 @@
 #
 class apache::mod::dav_fs {
   include apache
-  $dav_lock = $::osfamily ? {
+  $dav_lock = $facts['os']['family'] ? {
     'debian'  => "\${APACHE_LOCK_DIR}/DAVLock",
     'freebsd' => '/usr/local/var/DavLock',
     default   => '/var/lib/dav/lockdb',
   }
 
-  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_fs']
+  Class['apache::mod::dav'] -> Class['apache::mod::dav_fs']
   ::apache::mod { 'dav_fs': }
 
   # Template uses: $dav_lock
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 4c04d1b354..539e7b4ecb 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -9,10 +9,10 @@
 class apache::mod::dav_svn (
   $authz_svn_enabled = false,
 ) {
-  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
+  Class['apache::mod::dav'] -> Class['apache::mod::dav_svn']
   include apache
   include apache::mod::dav
-  if($::operatingsystem == 'SLES' and versioncmp($::operatingsystemmajrelease, '12') < 0) {
+  if($facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['major'], '12') < 0) {
     package { 'subversion-server':
       ensure   => 'installed',
       provider => 'zypper',
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index cb82b7b6b7..7851825bbc 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -32,14 +32,14 @@
     $_cache_root = $cache_root
   }
   elsif versioncmp($apache::apache_version, '2.4') >= 0 {
-    $_cache_root = $::osfamily ? {
+    $_cache_root = $facts['os']['family'] ? {
       'debian'  => '/var/cache/apache2/mod_cache_disk',
       'redhat'  => '/var/cache/httpd/proxy',
       'freebsd' => '/var/cache/mod_cache_disk',
     }
   }
   else {
-    $_cache_root = $::osfamily ? {
+    $_cache_root = $facts['os']['family'] ? {
       'debian'  => '/var/cache/apache2/mod_disk_cache',
       'redhat'  => '/var/cache/mod_proxy',
       'freebsd' => '/var/cache/mod_disk_cache',
@@ -53,7 +53,7 @@
     apache::mod { 'disk_cache': }
   }
 
-  Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache']
+  Class['apache::mod::cache'] -> Class['apache::mod::disk_cache']
 
   # Template uses $_cache_root
   file { 'disk_cache.conf':
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 402a8530ee..4d48914486 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -99,7 +99,7 @@
     notify  => Class['apache::service'],
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'redhat': {
       if versioncmp($_apache_version, '2.4') >= 0 {
         apache::mpm { 'event':
@@ -118,7 +118,7 @@
       }
     }
     default: {
-      fail("Unsupported osfamily ${::osfamily}")
+      fail("Unsupported osfamily ${$facts['os']['family']}")
     }
   }
 }
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
index 541b9c1140..a6de34fb0a 100644
--- a/manifests/mod/fastcgi.pp
+++ b/manifests/mod/fastcgi.pp
@@ -5,7 +5,7 @@
 #
 class apache::mod::fastcgi {
   include apache
-  if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemmajrelease, '7') >= 0) {
+  if ($facts['os']['family'] == 'Redhat' and versioncmp($facts['os']['release']['major'], '7') >= 0) {
     fail('mod_fastcgi is no longer supported on el7 and above.')
   }
   if ($facts['os']['name'] == 'Ubuntu') {
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 14aa141d9c..3cfd051eba 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -39,7 +39,7 @@
   $options = {},
 ) {
   include apache
-  if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease >= '7') or $::osfamily == 'FreeBSD' {
+  if ($facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '7') >= 0) or $facts['os']['family'] == 'FreeBSD' {
     $loadfile_name = 'unixd_fcgid.load'
     $conf_name = 'unixd_fcgid.conf'
   } else {
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index baf20cb321..68afb56e23 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -25,8 +25,8 @@
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
 
-  if $::osfamily == 'Suse' {
-    if defined(Class['::apache::mod::worker']) {
+  if $facts['os']['family'] == 'Suse' {
+    if defined(Class['apache::mod::worker']) {
       $suse_path = '/usr/lib64/apache2-worker'
     } else {
       $suse_path = '/usr/lib64/apache2-prefork'
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 2f44b01a84..3250270cba 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -55,7 +55,7 @@
     }
   } else {
     # prefork is a requirement for itk in 2.4; except on FreeBSD and Gentoo, which are special
-    if $::osfamily =~ /^(FreeBSD|Gentoo)/ {
+    if $facts['os']['family'] =~ /^(FreeBSD|Gentoo)/ {
       if defined(Class['apache::mod::prefork']) {
         fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
       }
@@ -90,7 +90,7 @@
     notify  => Class['apache::service'],
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'redhat': {
       package { 'httpd-itk':
         ensure => present,
@@ -122,7 +122,7 @@
       }
     }
     default: {
-      fail("Unsupported osfamily ${::osfamily}")
+      fail("Unsupported osfamily ${$facts['os']['family']}")
     }
   }
 }
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index d13ddd55ab..e26f6c70dc 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -308,7 +308,7 @@
   # Binding to mod_jk
   if $add_listen {
     $_ip = $ip ? {
-      undef   => $facts['ipaddress'],
+      undef   => $facts['networking']['ip'],
       default => $ip,
     }
     ensure_resource('apache::listen', "${_ip}:${port}", {})
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index 9243ae1e1f..58957795a6 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -16,7 +16,7 @@
   $mime_support_package = $apache::params::mime_support_package,
   $mime_types_config    = $apache::params::mime_types_config,
   $mime_types_additional = undef,
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   $_mime_types_additional = pick($mime_types_additional, $apache::mime_types_additional)
   apache::mod { 'mime': }
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 440b7b5175..8821e3c7d2 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -402,7 +402,7 @@
   $rails_spawn_method                                                                        = undef,
   $rails_user_switching                                                                      = undef,
   $wsgi_auto_detect                                                                          = undef,
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   if $passenger_installed_version {
     if $passenger_allow_encoded_slashes {
@@ -834,7 +834,7 @@
   $_package = $mod_package
   $_package_ensure = $mod_package_ensure
   $_lib = $mod_lib
-  if $::osfamily == 'FreeBSD' {
+  if $facts['os']['family'] == 'FreeBSD' {
     if $mod_lib_path {
       $_lib_path = $mod_lib_path
     } else {
@@ -844,9 +844,9 @@
     $_lib_path = $mod_lib_path
   }
 
-  if $::osfamily == 'RedHat' and $manage_repo {
-    if $::operatingsystem == 'Amazon' {
-      if $::operatingsystemmajrelease == '2' {
+  if $facts['os']['family'] == 'RedHat' and $manage_repo {
+    if $facts['os']['name'] == 'Amazon' {
+      if $facts['os']['release']['major'] == '2' {
         $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/7/$basearch'
       } else {
         $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6/$basearch'
@@ -869,7 +869,7 @@
     }
   }
 
-  unless ($::operatingsystem == 'SLES') {
+  unless ($facts['os']['name'] == 'SLES') {
     $_id = $mod_id
     $_path = $mod_path
     ::apache::mod { 'passenger':
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 4fec2c04ca..3c649c7fed 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -14,12 +14,12 @@
   $keepalive = 'Off',
 ) {
   include apache
-  case $::osfamily {
+  case $facts['os']['family'] {
     'freebsd' : {
-      fail("Unsupported osfamily ${::osfamily}")
+      fail("Unsupported osfamily ${$facts['os']['family']}")
     }
     default: {
-      if $::osfamily == 'gentoo' {
+      if $facts['os']['family'] == 'gentoo' {
         ::portage::makeconf { 'apache2_mpms':
           content => 'peruser',
         }
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 02c51be64b..4b5baac049 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -25,11 +25,11 @@
   if $apache::version::scl_httpd_version == undef and $apache::version::scl_php_version != undef {
     fail('If you define apache::version::scl_php_version, you also need to specify apache::version::scl_httpd_version')
   }
-  if defined(Class['::apache::mod::prefork']) {
-    Class['::apache::mod::prefork']->File["${mod}.conf"]
+  if defined(Class['apache::mod::prefork']) {
+    Class['apache::mod::prefork'] ->File["${mod}.conf"]
   }
-  elsif defined(Class['::apache::mod::itk']) {
-    Class['::apache::mod::itk']->File["${mod}.conf"]
+  elsif defined(Class['apache::mod::itk']) {
+    Class['apache::mod::itk'] ->File["${mod}.conf"]
   }
   else {
     fail('apache::mod::php requires apache::mod::prefork or apache::mod::itk; please enable mpm_module => \'prefork\' or mpm_module => \'itk\' on Class[\'apache\']')
@@ -78,7 +78,7 @@
     default => 'php_module',
   }
 
-  if $::operatingsystem == 'SLES' {
+  if $facts['os']['name'] == 'SLES' {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
@@ -98,7 +98,7 @@
 
   include apache::mod::mime
   include apache::mod::dir
-  Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
+  Class['apache::mod::mime'] -> Class['apache::mod::dir'] -> Class['apache::mod::php']
 
   # Template uses $extensions
   file { "${mod}.conf":
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index f6c6315aee..197f7513b0 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -93,7 +93,7 @@
     notify  => Class['apache::service'],
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'redhat': {
       if versioncmp($_apache_version, '2.4') >= 0 {
         ::apache::mpm { 'prefork':
@@ -128,7 +128,7 @@
       }
     }
     default: {
-      fail("Unsupported osfamily ${::osfamily}")
+      fail("Unsupported osfamily ${$facts['os']['family']}")
     }
   }
 }
diff --git a/manifests/mod/proxy_ajp.pp b/manifests/mod/proxy_ajp.pp
index 36bea00c83..ff14f0a0b4 100644
--- a/manifests/mod/proxy_ajp.pp
+++ b/manifests/mod/proxy_ajp.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html for additional documentation.
 #
 class apache::mod::proxy_ajp {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_ajp']
+  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_ajp']
   ::apache::mod { 'proxy_ajp': }
 }
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 43bd0af658..4778689c1d 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -27,8 +27,8 @@
     ::apache::mod { 'slotmem_shm': }
   }
 
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_balancer']
-  Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_balancer']
+  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_balancer']
+  Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_balancer']
   ::apache::mod { 'proxy_balancer': }
   if $manager {
     include apache::mod::status
diff --git a/manifests/mod/proxy_fcgi.pp b/manifests/mod/proxy_fcgi.pp
index 84bc3d178f..3196f5b68d 100644
--- a/manifests/mod/proxy_fcgi.pp
+++ b/manifests/mod/proxy_fcgi.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html for additional documentation.
 #
 class apache::mod::proxy_fcgi {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_fcgi']
+  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_fcgi']
   ::apache::mod { 'proxy_fcgi': }
 }
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 0205af848c..881d7e87b3 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -5,29 +5,29 @@
 #
 class apache::mod::proxy_html {
   include apache
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
-  Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
+  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_html']
+  Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_html']
 
   # Add libxml2
-  case $::osfamily {
+  case $facts['os']['family'] {
     /RedHat|FreeBSD|Gentoo|Suse/: {
       ::apache::mod { 'xml2enc': }
       $loadfiles = undef
     }
     'Debian': {
-      $gnu_path = $::hardwaremodel ? {
+      $gnu_path = $facts['os']['hardware'] ? {
         'i686'  => 'i386',
-        default => $::hardwaremodel,
+        default => $facts['os']['hardware'],
       }
-      case $::operatingsystem {
+      case $facts['os']['name'] {
         'Ubuntu': {
-          $loadfiles = $facts['operatingsystemmajrelease'] ? {
+          $loadfiles = $facts['os']['release']['major'] ? {
             '10'    => ['/usr/lib/libxml2.so.2'],
             default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
           }
         }
         'Debian': {
-          $loadfiles = $facts['operatingsystemmajrelease'] ? {
+          $loadfiles = $facts['os']['release']['major'] ? {
             '6'     => ['/usr/lib/libxml2.so.2'],
             default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
           }
diff --git a/manifests/mod/proxy_http.pp b/manifests/mod/proxy_http.pp
index b80857c205..76b7667ea2 100644
--- a/manifests/mod/proxy_http.pp
+++ b/manifests/mod/proxy_http.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_http.html for additional documentation.
 #
 class apache::mod::proxy_http {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_http']
+  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_http']
   ::apache::mod { 'proxy_http': }
 }
diff --git a/manifests/mod/proxy_wstunnel.pp b/manifests/mod/proxy_wstunnel.pp
index a7dc00f0f4..1d12c6b465 100644
--- a/manifests/mod/proxy_wstunnel.pp
+++ b/manifests/mod/proxy_wstunnel.pp
@@ -5,6 +5,6 @@
 #
 class apache::mod::proxy_wstunnel {
   include apache, apache::mod::proxy
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_wstunnel']
+  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_wstunnel']
   ::apache::mod { 'proxy_wstunnel': }
 }
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index e7df7a662d..a4461cf8a2 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -120,7 +120,7 @@
   $secrequestbodynofileslimit  = '131072',
   $secrequestbodyinmemorylimit = '131072',
   $manage_security_crs         = true,
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
 
   $_secdefaultaction = $secdefaultaction ? {
@@ -128,11 +128,11 @@
     default => "${secdefaultaction},log",
   }
 
-  if $::osfamily == 'FreeBSD' {
+  if $facts['os']['family'] == 'FreeBSD' {
     fail('FreeBSD is not currently supported')
   }
 
-  if ($::osfamily == 'Suse' and versioncmp($::operatingsystemrelease, '11') < 0) {
+  if ($facts['os']['family'] == 'Suse' and versioncmp($facts['os']['release']['major'], '11') < 0) {
     fail('SLES 10 is not currently supported.')
   }
 
@@ -256,7 +256,7 @@
       notify  => Class['apache::service'],
     }
 
-    unless $::operatingsystem == 'SLES' or $::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' {
+    unless $facts['os']['name'] == 'SLES' or $facts['os']['name'] == 'Debian' or $facts['os']['name'] == 'Ubuntu' {
       apache::security::rule_link { $activated_rules: }
     }
   }
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 85946a10b4..09a5d2ead5 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -30,7 +30,7 @@
   $mod_lib          = undef,
 ) {
   include apache
-  if $::osfamily == 'RedHat' and ! $suppress_warning {
+  if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_shib in their default package repositories.')
   }
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 20acb814ed..7eaed198cb 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -103,14 +103,14 @@
   Boolean $ssl_reload_on_change                             = false,
   $apache_version                                           = undef,
   $package_name                                             = undef,
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   include apache::mod::mime
   $_apache_version = pick($apache_version, $apache::apache_version)
   if $ssl_mutex {
     $_ssl_mutex = $ssl_mutex
   } else {
-    case $::osfamily {
+    case $facts['os']['family'] {
       'debian': {
         if versioncmp($_apache_version, '2.4') >= 0 {
           $_ssl_mutex = 'default'
@@ -131,7 +131,7 @@
         $_ssl_mutex = 'default'
       }
       default: {
-        fail("Unsupported osfamily ${::osfamily}, please explicitly pass in \$ssl_mutex")
+        fail("Unsupported osfamily ${$facts['os']['family']}, please explicitly pass in \$ssl_mutex")
       }
     }
   }
@@ -147,7 +147,7 @@
   }
 
   if $stapling_cache =~ Undef {
-    $_stapling_cache = $::osfamily ? {
+    $_stapling_cache = $facts['os']['family'] ? {
       'debian'  => "\${APACHE_RUN_DIR}/ocsp(32768)",
       'redhat'  => '/run/httpd/ssl_stapling(32768)',
       'freebsd' => '/var/run/ssl_stapling(32768)',
@@ -158,8 +158,8 @@
     $_stapling_cache = $stapling_cache
   }
 
-  if $::osfamily == 'Suse' {
-    if defined(Class['::apache::mod::worker']) {
+  if $facts['os']['family'] == 'Suse' {
+    if defined(Class['apache::mod::worker']) {
       $suse_path = '/usr/lib64/apache2-worker'
     } else {
       $suse_path = '/usr/lib64/apache2-prefork'
diff --git a/manifests/mod/ssl/reload.pp b/manifests/mod/ssl/reload.pp
index 723c6cb8df..1aa0a8ca7b 100644
--- a/manifests/mod/ssl/reload.pp
+++ b/manifests/mod/ssl/reload.pp
@@ -2,7 +2,7 @@
 #   Manages the puppet_ssl folder for ssl file copies, which is needed to track changes for reloading service on changes
 #
 # @api private
-class apache::mod::ssl::reload () inherits ::apache::params {
+class apache::mod::ssl::reload () inherits apache::params {
   file { $apache::params::puppet_ssl_dir:
     ensure  => directory,
     purge   => true,
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index ddd9690495..f6d41449df 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -44,7 +44,7 @@
   Enum['On', 'Off', 'on', 'off'] $extended_status  = 'On',
   $apache_version                                  = undef,
   $status_path                                     = '/server-status',
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'status': }
diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
index 7dd89adce0..2f87185131 100644
--- a/manifests/mod/version.pp
+++ b/manifests/mod/version.pp
@@ -9,7 +9,7 @@
 class apache::mod::version (
   $apache_version = $apache::apache_version
 ) {
-  if ($::osfamily == 'debian' and versioncmp($apache_version, '2.4') >= 0) {
+  if ($facts['os']['family'] == 'debian' and versioncmp($apache_version, '2.4') >= 0) {
     warning("${module_name}: module version_module is built-in and can't be loaded")
   } else {
     ::apache::mod { 'version': }
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index d6b57b89b8..258220a232 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -93,7 +93,7 @@
     notify  => Class['apache::service'],
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'redhat': {
       if versioncmp($_apache_version, '2.4') >= 0 {
         ::apache::mpm { 'worker':
@@ -130,7 +130,7 @@
       }
     }
     default: {
-      fail("Unsupported osfamily ${::osfamily}")
+      fail("Unsupported osfamily ${$facts['os']['family']}")
     }
   }
 }
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 0d326a4d5c..cf3253db9d 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -36,7 +36,7 @@
   $wsgi_application_group = undef,
   $package_name           = undef,
   $mod_path               = undef,
-) inherits ::apache::params {
+) inherits apache::params {
   include apache
   if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) {
     fail('apache::mod::wsgi - both package_name and mod_path must be specified!')
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 8fd30bf86b..854d86027a 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -16,7 +16,7 @@
   $_path = "${lib_path}/${_lib}"
   $_id   = "mpm_${mpm}_module"
 
-  if $::osfamily == 'Suse' {
+  if $facts['os']['family'] == 'Suse' {
     #mpms on Suse 12 don't use .so libraries so create a placeholder load file
     if versioncmp($apache_version, '2.4') >= 0 {
       file { "${mod_dir}/${mpm}.load":
@@ -47,7 +47,7 @@
     }
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'debian': {
       file { "${apache::mod_enable_dir}/${mpm}.conf":
         ensure  => link,
@@ -149,7 +149,7 @@
       }
     }
     default: {
-      fail("Unsupported osfamily ${::osfamily}")
+      fail("Unsupported osfamily ${$facts['os']['family']}")
     }
   }
 }
diff --git a/manifests/package.pp b/manifests/package.pp
index 684995ea3c..bc779097eb 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -5,13 +5,13 @@
 class apache::package (
   $ensure     = 'present',
   $mpm_module = $apache::params::mpm_module,
-) inherits ::apache::params {
+) inherits apache::params {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'FreeBSD': {
       case $mpm_module {
         'prefork': {
diff --git a/manifests/params.pp b/manifests/params.pp
index 545d80a27e..c610e1c0b1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -2,11 +2,11 @@
 #   This class manages Apache parameters
 #
 # @api private
-class apache::params inherits ::apache::version {
-  if($::fqdn) {
-    $servername = $::fqdn
+class apache::params inherits apache::version {
+  if($facts['networking']['fqdn']) {
+    $servername = $facts['networking']['fqdn']
   } else {
-    $servername = $::hostname
+    $servername = $facts['networking']['hostname']
   }
 
   # The default error log level
@@ -64,7 +64,7 @@
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
     $puppet_ssl_dir       = "${httpd_dir}/puppet_ssl"
-    $mod_dir              = $facts['operatingsystemmajrelease'] ? {
+    $mod_dir              = $facts['os']['release']['major'] ? {
       '7'     => "${httpd_dir}/conf.modules.d",
       default => "${httpd_dir}/conf.d",
     }
@@ -110,15 +110,15 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = "${httpd_root}/var/www/html"
-    $alias_icons_path     = $facts['operatingsystemmajrelease'] ? {
+    $alias_icons_path     = $facts['os']['release']['major'] ? {
       '7'     => "${httpd_root}/usr/share/httpd/icons",
       default => '/var/www/icons',
     }
-    $error_documents_path = $facts['operatingsystemmajrelease'] ? {
+    $error_documents_path = $facts['os']['release']['major'] ? {
       '7'     => "${httpd_root}/usr/share/httpd/error",
       default => '/var/www/error'
     }
-    if $::osfamily == 'RedHat' {
+    if $facts['os']['family'] == 'RedHat' {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
       $wsgi_socket_prefix = undef
@@ -160,7 +160,7 @@
     $scriptalias         = "${httpd_root}/var/www/cgi-bin"
     $access_log_file     = 'access_log'
   }
-  elsif $::osfamily == 'RedHat' or $::operatingsystem =~ /^[Aa]mazon$/ {
+  elsif $facts['os']['family'] == 'RedHat' or $facts['os']['name'] =~ /^[Aa]mazon$/ {
     $user                 = 'apache'
     $group                = 'apache'
     $root_group           = 'root'
@@ -172,11 +172,11 @@
     $confd_dir            = "${httpd_dir}/conf.d"
     $puppet_ssl_dir       = "${httpd_dir}/puppet_ssl"
     $conf_enabled         = undef
-    if $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease == '2' {
+    if $facts['os']['name'] =~ /^[Aa]mazon$/ and $facts['os']['release']['major'] == '2' {
       # Amazon Linux 2 uses the /conf.modules.d/ dir
       $mod_dir            = "${httpd_dir}/conf.modules.d"
     } else {
-      $mod_dir              = $facts['operatingsystemmajrelease'] ? {
+      $mod_dir              = $facts['os']['release']['major'] ? {
         '6'     => "${httpd_dir}/conf.d",
         default => "${httpd_dir}/conf.modules.d",
       }
@@ -203,7 +203,7 @@
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
-    $php_version = $facts['operatingsystemmajrelease'] ? {
+    $php_version = $facts['os']['release']['major'] ? {
       '8'     => '7', # RedHat8
       default => '5', # RedHat5, RedHat6, RedHat7
     }
@@ -214,12 +214,12 @@
       'auth_gssapi'           => 'mod_auth_gssapi',
       'auth_mellon'           => 'mod_auth_mellon',
       'auth_openidc'          => 'mod_auth_openidc',
-      'authnz_ldap'           => $facts['operatingsystemmajrelease'] ? {
+      'authnz_ldap'           => $facts['os']['release']['major'] ? {
         '6'     => 'mod_authz_ldap',
         default => 'mod_ldap',
       },
       'authnz_pam'            => 'mod_authnz_pam',
-      'fastcgi'               => $facts['operatingsystemmajrelease'] ? {
+      'fastcgi'               => $facts['os']['release']['major'] ? {
         '5'     => 'mod_fastcgi',
         '6'     => 'mod_fastcgi',
         default => undef,
@@ -227,7 +227,7 @@
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',
-      'ldap'                  => $facts['operatingsystemmajrelease'] ? {
+      'ldap'                  => $facts['os']['release']['major'] ? {
         '5'     => undef,
         '6'     => undef,
         default => 'mod_ldap',
@@ -241,7 +241,7 @@
       # https://www.phusionpassenger.com/library/install/apache/install/oss/el7/
       'passenger'             => 'mod_passenger',
       'perl'                  => 'mod_perl',
-      'php5'                  => $facts['operatingsystemmajrelease'] ? {
+      'php5'                  => $facts['os']['release']['major'] ? {
         '5'     => 'php53',
         default => 'php',
       },
@@ -254,7 +254,7 @@
       # See http://wiki.aaf.edu.au/tech-info/sp-install-guide
       'shibboleth'            => 'shibboleth',
       'ssl'                   => 'mod_ssl',
-      'wsgi'                  => $facts['operatingsystemmajrelease'] ? {
+      'wsgi'                  => $facts['os']['release']['major'] ? {
         '6'     => 'mod_wsgi',         # RedHat6
         '7'     => 'mod_wsgi',         # RedHat7
         default => 'python3-mod_wsgi', # RedHat8+
@@ -267,7 +267,7 @@
     }
     $mod_libs             = {
       'nss' => 'libmodnss.so',
-      'wsgi'                  => $facts['operatingsystemmajrelease'] ? {
+      'wsgi'                  => $facts['os']['release']['major'] ? {
         '6'     => 'mod_wsgi.so',
         '7'     => 'mod_wsgi.so',
         default => 'mod_wsgi_python3.so',
@@ -282,15 +282,15 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
-    $alias_icons_path     = $facts['operatingsystemmajrelease'] ? {
+    $alias_icons_path     = $facts['os']['release']['major'] ? {
       '6'     => '/var/www/icons',
       default => '/usr/share/httpd/icons',
     }
-    $error_documents_path = $facts['operatingsystemmajrelease'] ? {
+    $error_documents_path = $facts['os']['release']['major'] ? {
       '6'     => '/var/www/error',
       default => '/usr/share/httpd/error',
     }
-    if $::osfamily == 'RedHat' {
+    if $facts['os']['family'] == 'RedHat' {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
       $wsgi_socket_prefix = undef
@@ -331,7 +331,7 @@
     $error_log           = 'error_log'
     $scriptalias         = '/var/www/cgi-bin'
     $access_log_file     = 'access_log'
-  } elsif $::osfamily == 'Debian' {
+  } elsif $facts['os']['family'] == 'Debian' {
     $user                = 'www-data'
     $group               = 'www-data'
     $root_group          = 'root'
@@ -361,8 +361,8 @@
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
-    if ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
-      $php_version = $facts['operatingsystemmajrelease'] ? {
+    if ($facts['os']['name'] == 'Ubuntu') or ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') < 0) {
+      $php_version = $facts['os']['release']['major'] ? {
         '9'     => '7.0', # Debian Stretch
         '10'    => '7.3', # Debian Buster
         '20.04' => '7.4', # Ubuntu Foccal Fossal
@@ -396,7 +396,7 @@
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
     } else {
-      $php_version = $facts['operatingsystemmajrelease'] ? {
+      $php_version = $facts['os']['release']['major'] ? {
         default => '7.4', # Debian Bullseye
       }
       $mod_packages = {
@@ -431,7 +431,7 @@
     $error_log           = 'error.log'
     $scriptalias         = '/usr/lib/cgi-bin'
     $access_log_file     = 'access.log'
-    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '19.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '10') < 0) {
+    if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '19.04') < 0) or ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '10') < 0) {
       $shib2_lib = 'mod_shib2.so'
     } else {
       $shib2_lib = 'mod_shib.so'
@@ -494,7 +494,7 @@
     $passenger_ruby         = undef
     $passenger_default_ruby = '/usr/bin/ruby'
     $wsgi_socket_prefix = undef
-  } elsif $::osfamily == 'FreeBSD' {
+  } elsif $facts['os']['family'] == 'FreeBSD' {
     $user             = 'www'
     $group            = 'www'
     $root_group       = 'wheel'
@@ -568,7 +568,7 @@
     $error_log            = 'httpd-error.log'
     $scriptalias          = '/usr/local/www/apache24/cgi-bin'
     $access_log_file      = 'httpd-access.log'
-  } elsif $::osfamily == 'Gentoo' {
+  } elsif $facts['os']['family'] == 'Gentoo' {
     $user             = 'apache'
     $group            = 'apache'
     $root_group       = 'wheel'
@@ -639,7 +639,7 @@
     $error_log            = 'error.log'
     $scriptalias          = '/var/www/localhost/cgi-bin'
     $access_log_file      = 'access.log'
-  } elsif $::osfamily == 'Suse' {
+  } elsif $facts['os']['family'] == 'Suse' {
     $user                = 'wwwrun'
     $group               = 'www'
     $root_group          = 'root'
@@ -662,7 +662,7 @@
     $logroot_mode        = undef
     $lib_path            = '/usr/lib64/apache2' #changes for some modules based on mpm
     $mpm_module          = 'prefork'
-    if versioncmp($::operatingsystemrelease, '15') < 0 {
+    if versioncmp($facts['os']['release']['major'], '15') < 0 {
       $default_ssl_cert    = '/etc/apache2/ssl.crt/server.crt'
       $default_ssl_key     = '/etc/apache2/ssl.key/server.key'
       $php_version         = '5'
@@ -675,7 +675,7 @@
     $ssl_sessioncache    = '/var/lib/apache2/ssl_scache(512000)'
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
-    if versioncmp($::operatingsystemrelease, '11') < 0 or versioncmp($::operatingsystemrelease, '12') >= 0 {
+    if versioncmp($facts['os']['release']['major'], '11') < 0 or versioncmp($facts['os']['release']['major'], '12') >= 0 {
       $mod_packages = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
         'auth_gssapi' => 'apache2-mod_auth_gssapi',
@@ -742,12 +742,12 @@
     $passenger_default_ruby       = '/usr/bin/ruby'
     $wsgi_socket_prefix           = undef
   } else {
-    fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
+    fail("Class['apache::params']: Unsupported osfamily: ${$facts['os']['family']}")
   }
 
-  if $::operatingsystem == 'SLES' {
+  if $facts['os']['name'] == 'SLES' {
     $verify_command = '/usr/sbin/apache2ctl -t'
-  } elsif $::operatingsystem == 'FreeBSD' {
+  } elsif $facts['os']['name'] == 'FreeBSD' {
     $verify_command = '/usr/local/sbin/apachectl -t'
   } elsif ($apache::version::scl_httpd_version) {
     $verify_command = "/opt/rh/${_scl_httpd_name}/root/usr/sbin/apachectl -t"
@@ -755,7 +755,7 @@
     $verify_command = '/usr/sbin/apachectl -t'
   }
 
-  if $::osfamily == 'RedHat' and versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
+  if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') >= 0 {
     $ssl_protocol = ['all'] # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
   } else {
     $ssl_protocol = ['all', '-SSLv2', '-SSLv3']
diff --git a/manifests/version.pp b/manifests/version.pp
index 6feacb3f5d..2bd69b6842 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -6,14 +6,14 @@
   Optional[String] $scl_httpd_version = undef,
   Optional[String] $scl_php_version   = undef,
 ) {
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
       if $scl_httpd_version {
         $default = $scl_httpd_version
       }
-      elsif ($::operatingsystem == 'Amazon' and $::operatingsystemmajrelease == '2') {
+      elsif ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] == '2') {
         $default = '2.4'
-      } elsif $::operatingsystem == 'Fedora' or versioncmp($facts['operatingsystemmajrelease'], '7') >= 0 {
+      } elsif $facts['os']['name'] == 'Fedora' or versioncmp($facts['os']['release']['major'], '7') >= 0 {
         $default = '2.4'
       } else {
         $default = '2.2'
@@ -29,14 +29,14 @@
       $default = '2.4'
     }
     'Suse': {
-      if ($::operatingsystem == 'SLES' and versioncmp($facts['operatingsystemmajrelease'], '12') >= 0) or ($::operatingsystem == 'OpenSuSE' and versioncmp($facts['operatingsystemmajrelease'], '42') >= 0) {
+      if ($facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['major'], '12') >= 0) or ($facts['os']['name'] == 'OpenSuSE' and versioncmp($facts['os']['release']['major'], '42') >= 0) {
         $default = '2.4'
       } else {
         $default = '2.2'
       }
     }
     default: {
-      fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
+      fail("Class['apache::version']: Unsupported osfamily: ${$facts['os']['family']}")
     }
   }
 }
diff --git a/metadata.json b/metadata.json
index 2dd764b2be..374fcc6fba 100644
--- a/metadata.json
+++ b/metadata.json
@@ -91,5 +91,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "2.4.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g369d483"
+  "template-ref": "2.5.0-0-g369d483"
 }
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 1d8593eb4b..ba22f9e6d9 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -67,7 +67,7 @@
     include_examples 'Debian 11'
 
     context 'with only required facts and default parameters' do
-      let(:facts) { super().merge('ipaddress' => default_ip) }
+      let(:facts) { super().merge(networking: { ip: default_ip }) }
       let(:pre_condition) do
         'include apache'
       end
@@ -102,7 +102,7 @@
     end
 
     context 'with required facts' do
-      let(:facts) { super().merge('ipaddress' => default_ip) }
+      let(:facts) { super().merge(networking: { ip: default_ip }) }
 
       context 'and default parameters' do
         let(:mod_dir) { mod_dir }
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index b212edf725..50fde8d158 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -20,7 +20,7 @@
 
     context 'on i386' do
       let(:facts) do
-        super().merge(hardwaremodel: 'i686',
+        super().merge(os: { family: 'Debian', name: 'Debian', release: { full: '11', major: '11' }, hardware: 'i686', },
                       architecture: 'i386')
       end
 
@@ -29,7 +29,7 @@
     end
     context 'on x64' do
       let(:facts) do
-        super().merge(hardwaremodel: 'x86_64',
+        super().merge(os: { family: 'Debian', name: 'Debian', release: { full: '11', major: '11' }, hardware: 'x86_64', },
                       architecture: 'amd64')
       end
 
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index a6f789ff0e..3fa4f831a2 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -60,13 +60,26 @@
 shared_context 'Fedora 28' do
   let :facts do
     {
+      # Legacy
       id: 'root',
-      kernel: 'Linux',
       osfamily: 'RedHat',
       operatingsystem: 'Fedora',
       operatingsystemrelease: '28',
       operatingsystemmajrelease: '28',
+      # Modern
+      kernel: 'Linux',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      os: {
+        name: 'Fedora',
+        family: 'Redhat',
+        release: {
+          major: '28',
+          full: '28',
+        },
+      },
+      identity: {
+        uid: 'root',
+      },
     }
   end
 end
@@ -74,12 +87,24 @@
 shared_context 'FreeBSD 9' do
   let :facts do
     {
+      # Legacy
       osfamily: 'FreeBSD',
       operatingsystemrelease: '9',
       operatingsystem: 'FreeBSD',
       id: 'root',
+      # Modern
       kernel: 'FreeBSD',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      os: {
+        name: 'FreeBSD',
+        family: 'FreeBSD',
+        release: {
+          full: '9',
+        },
+      },
+      identity: {
+        uid: 'root',
+      },
     }
   end
 end
@@ -87,12 +112,24 @@
 shared_context 'FreeBSD 10' do
   let :facts do
     {
+      # Legacy
       id: 'root',
-      kernel: 'FreeBSD',
       osfamily: 'FreeBSD',
       operatingsystem: 'FreeBSD',
       operatingsystemrelease: '10',
+      # Modern
+      kernel: 'FreeBSD',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      os: {
+        name: 'FreeBSD',
+        family: 'FreeBSD',
+        release: {
+          full: '10',
+        },
+      },
+      identity: {
+        uid: 'root',
+      },
     }
   end
 end
@@ -100,13 +137,26 @@
 shared_context 'Gentoo' do
   let :facts do
     {
+      # Legacy
       id: 'root',
-      kernel: 'Linux',
       osfamily: 'Gentoo',
       operatingsystem: 'Gentoo',
       operatingsystemrelease: '2.7',
       operatingsystemmajrelease: '2.7',
+      # Modern
+      kernel: 'Linux',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
+      os: {
+        name: 'Gentoo',
+        family: 'Gentoo',
+        release: {
+          major: '2.7',
+          full: '2.7',
+        },
+      },
+      identity: {
+        uid: 'root',
+      },
     }
   end
 end
@@ -114,8 +164,16 @@
 shared_context 'Darwin' do
   let :facts do
     {
+      # Legacy
       osfamily: 'Darwin',
       operatingsystemrelease: '13.1.0',
+      # Modern
+      os: {
+        family: 'Darwin',
+        release: {
+          full: '13.1.0',
+        },
+      },
     }
   end
 end
@@ -123,12 +181,24 @@
 shared_context 'Unsupported OS' do
   let :facts do
     {
+      # Legacy
       osfamily: 'Magic',
       operatingsystemrelease: '0',
       operatingsystem: 'Magic',
       id: 'root',
+      # Modern
       kernel: 'Linux',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      os: {
+        name: 'Magic',
+        family: 'Magic',
+        release: {
+          full: '0',
+        },
+      },
+      identity: {
+        uid: 'root',
+      },
     }
   end
 end

From ae56cc9a6dbcd3846ccbcb9f8a7b9302d8b2a996 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 27 May 2022 18:16:12 +0100
Subject: [PATCH 1922/2267] (GH-cat-9) Update code to match syntax standard,
 part 2

Code now compliant with the following rules:
- parameter_documentation
- parameter_types
---
 .puppet-lint.rc                  |   2 -
 .sync.yml                        |   2 -
 Rakefile                         |   2 -
 manifests/balancer.pp            |   8 +-
 manifests/balancermember.pp      |   8 +-
 manifests/custom_config.pp       |  18 +-
 manifests/default_confd_files.pp |   2 +-
 manifests/default_mods.pp        |   8 +-
 manifests/default_mods/load.pp   |   2 +-
 manifests/fastcgi/server.pp      |  17 +-
 manifests/init.pp                | 144 ++++----
 manifests/mod.pp                 |  16 +-
 manifests/mod/alias.pp           |  11 +-
 manifests/mod/auth_cas.pp        |  49 +--
 manifests/mod/auth_mellon.pp     |  14 +-
 manifests/mod/authn_core.pp      |   2 +-
 manifests/mod/authn_dbd.pp       |  16 +-
 manifests/mod/authnz_ldap.pp     |   4 +-
 manifests/mod/authz_default.pp   |   2 +-
 manifests/mod/autoindex.pp       |   5 +-
 manifests/mod/cluster.pp         |  22 +-
 manifests/mod/data.pp            |   2 +-
 manifests/mod/dav_svn.pp         |   2 +-
 manifests/mod/dbd.pp             |   3 -
 manifests/mod/deflate.pp         |   4 +-
 manifests/mod/dir.pp             |  14 +-
 manifests/mod/disk_cache.pp      |   6 +-
 manifests/mod/event.pp           |  24 +-
 manifests/mod/expires.pp         |   6 +-
 manifests/mod/fcgid.pp           |  18 +-
 manifests/mod/geoip.pp           |  18 +-
 manifests/mod/headers.pp         |   3 -
 manifests/mod/http2.pp           |   2 +-
 manifests/mod/info.pp            |   8 +-
 manifests/mod/itk.pp             |  16 +-
 manifests/mod/jk.pp              | 114 +++---
 manifests/mod/ldap.pp            |  18 +-
 manifests/mod/mime.pp            |   6 +-
 manifests/mod/mime_magic.pp      |   2 +-
 manifests/mod/nss.pp             |  10 +-
 manifests/mod/pagespeed.pp       | 225 +++++++++---
 manifests/mod/passenger.pp       | 189 +++++-----
 manifests/mod/peruser.pp         |  38 +-
 manifests/mod/php.pp             |  48 ++-
 manifests/mod/prefork.pp         |  20 +-
 manifests/mod/proxy.pp           |  14 +-
 manifests/mod/proxy_balancer.pp  |   4 +-
 manifests/mod/reqtimeout.pp      |   2 +-
 manifests/mod/rpaf.pp            |   8 +-
 manifests/mod/security.pp        |  64 ++--
 manifests/mod/shib.pp            |   8 +-
 manifests/mod/ssl.pp             |  31 +-
 manifests/mod/status.pp          |   4 +-
 manifests/mod/userdir.pp         |  20 +-
 manifests/mod/version.pp         |   2 +-
 manifests/mod/worker.pp          |  20 +-
 manifests/mod/wsgi.pp            |  16 +-
 manifests/mpm.pp                 |   4 +-
 manifests/package.pp             |   4 +-
 manifests/peruser/multiplexer.pp |   6 +-
 manifests/peruser/processor.pp   |   6 +-
 manifests/service.pp             |  10 +-
 manifests/vhost.pp               | 578 ++++++++++++++-----------------
 manifests/vhost/custom.pp        |   8 +-
 manifests/vhost/fragment.pp      |   9 +-
 manifests/vhosts.pp              |   2 +-
 66 files changed, 1075 insertions(+), 895 deletions(-)

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index 764bae24ed..6d61fb07e3 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,4 +1,2 @@
 --relative
---no-parameter_types-check
---no-parameter_documentation-check
 --no-anchor_resource-check
diff --git a/.sync.yml b/.sync.yml
index afd2b90909..0ec6e5c8dd 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -37,6 +37,4 @@ Rakefile:
 changelog_since_tag: "3.2.0"
 Rakefile:
   extra_disabled_lint_checks:
-    - parameter_types
-    - parameter_documentation
     - anchor_resource
diff --git a/Rakefile b/Rakefile
index ff4f906f72..a959c34a12 100644
--- a/Rakefile
+++ b/Rakefile
@@ -42,8 +42,6 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
-PuppetLint.configuration.send('disable_parameter_types')
-PuppetLint.configuration.send('disable_parameter_documentation')
 PuppetLint.configuration.send('disable_anchor_resource')
 
 
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 6740a73c27..b67e10b0d7 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -43,10 +43,10 @@
 #   apache::balancer { 'puppet00': }
 #
 define apache::balancer (
-  $proxy_set = {},
-  $collect_exported = true,
-  $target = undef,
-  $options = [],
+  Hash $proxy_set = {},
+  Boolean $collect_exported = true,
+  Optional[String] $target = undef,
+  Array $options = [],
 ) {
   include apache::mod::proxy_balancer
 
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 8a1af44302..29126ee043 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -27,7 +27,7 @@
 # @param url
 #   The url used to contact the balancer member server.
 #
-# @param  options
+# @param options
 #   Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) 
 #   after the URL, and accepts any key-value pairs available to `ProxyPass`.
 #
@@ -39,9 +39,9 @@
 #   }
 #
 define apache::balancermember (
-  $balancer_cluster,
-  $url = "http://${$facts['networking']['fqdn']}/",
-  $options = [],
+  String $balancer_cluster,
+  String $url = "http://${$facts['networking']['fqdn']}/",
+  Array $options = [],
 ) {
   concat::fragment { "BalancerMember ${name}":
     target  => "apache_balancer_${balancer_cluster}",
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 52b94b4891..6a348b128a 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -50,16 +50,16 @@
 #
 define apache::custom_config (
   Enum['absent', 'present'] $ensure = 'present',
-  $confdir                          = $apache::confd_dir,
-  $content                          = undef,
-  $priority                         = '25',
-  $source                           = undef,
-  $verify_command                   = $apache::params::verify_command,
+  String $confdir                   = $apache::confd_dir,
+  Optional[String] $content         = undef,
+  Variant[String,Boolean] $priority = '25',
+  Optional[String] $source          = undef,
+  String $verify_command            = $apache::params::verify_command,
   Boolean $verify_config            = true,
-  $filename                         = undef,
-  $owner                            = undef,
-  $group                            = undef,
-  $file_mode                        = undef,
+  Optional[String] $filename        = undef,
+  Optional[String] $owner           = undef,
+  Optional[String] $group           = undef,
+  Optional[String] $file_mode       = undef,
   Boolean $show_diff                = true,
 ) {
   if $content and $source {
diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
index 5a7c7f786f..a92c53a26e 100644
--- a/manifests/default_confd_files.pp
+++ b/manifests/default_confd_files.pp
@@ -3,7 +3,7 @@
 #
 # @api private
 class apache::default_confd_files (
-  $all = true,
+  Boolean $all = true,
 ) {
   # The rest of the conf.d/* files only get loaded if we want them
   if $all {
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 55eed95750..083f1bccd3 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -3,10 +3,10 @@
 #
 # @api private
 class apache::default_mods (
-  $all            = true,
-  $mods           = undef,
-  $apache_version = $apache::apache_version,
-  $use_systemd    = $apache::use_systemd,
+  Boolean $all                                  = true,
+  Optional[Variant[Array[String],String]] $mods = undef,
+  String $apache_version                        = $apache::apache_version,
+  Boolean $use_systemd                          = $apache::use_systemd,
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
diff --git a/manifests/default_mods/load.pp b/manifests/default_mods/load.pp
index fc44ebcb31..2203f8279f 100644
--- a/manifests/default_mods/load.pp
+++ b/manifests/default_mods/load.pp
@@ -2,7 +2,7 @@
 #   Helper used by `apache::default_mods`
 #
 # @api private
-define apache::default_mods::load ($module = $title) {
+define apache::default_mods::load (String $module = $title) {
   if defined("apache::mod::${module}") {
     include "::apache::mod::${module}"
   } else {
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index 2e372b1a14..3e6af87af2 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -28,14 +28,17 @@
 # @param file_type
 #   Sets the MIME `content-type` of the file to be processed by the FastCGI server.
 #
+# @param pass_header
+#   Sets a header for the server
+#
 define apache::fastcgi::server (
-  $host          = '127.0.0.1:9000',
-  $timeout       = 15,
-  $flush         = false,
-  $faux_path     = "/var/www/${name}.fcgi",
-  $fcgi_alias    = "/${name}.fcgi",
-  $file_type     = 'application/x-httpd-php',
-  $pass_header   = undef,
+  String $host                  = '127.0.0.1:9000',
+  Integer $timeout              = 15,
+  Boolean $flush                = false,
+  String $faux_path             = "/var/www/${name}.fcgi",
+  String $fcgi_alias            = "/${name}.fcgi",
+  String $file_type             = 'application/x-httpd-php',
+  Optional[String] $pass_header = undef,
 ) {
   include apache::mod::fastcgi
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 1043129eb5..1d9af55a8f 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -461,92 +461,92 @@
 #   Specifies any idditional Internet media (mime) types that you wish to be configured.
 # 
 class apache (
-  $apache_name                                                          = $apache::params::apache_name,
-  $service_name                                                         = $apache::params::service_name,
-  $default_mods                                                         = true,
+  String $apache_name                                                   = $apache::params::apache_name,
+  String $service_name                                                  = $apache::params::service_name,
+  Variant[Array,Boolean] $default_mods                                  = true,
   Boolean $default_vhost                                                = true,
-  $default_charset                                                      = undef,
+  Optional[String] $default_charset                                     = undef,
   Boolean $default_confd_files                                          = true,
   Boolean $default_ssl_vhost                                            = false,
-  $default_ssl_cert                                                     = $apache::params::default_ssl_cert,
-  $default_ssl_key                                                      = $apache::params::default_ssl_key,
-  $default_ssl_chain                                                    = undef,
-  $default_ssl_ca                                                       = undef,
-  $default_ssl_crl_path                                                 = undef,
-  $default_ssl_crl                                                      = undef,
-  $default_ssl_crl_check                                                = undef,
+  String $default_ssl_cert                                              = $apache::params::default_ssl_cert,
+  String $default_ssl_key                                               = $apache::params::default_ssl_key,
+  Optional[String] $default_ssl_chain                                   = undef,
+  Optional[String] $default_ssl_ca                                      = undef,
+  Optional[String] $default_ssl_crl_path                                = undef,
+  Optional[String] $default_ssl_crl                                     = undef,
+  Optional[String] $default_ssl_crl_check                               = undef,
   Boolean $default_ssl_reload_on_change                                 = false,
-  $default_type                                                         = 'none',
-  $dev_packages                                                         = $apache::params::dev_packages,
-  $ip                                                                   = undef,
+  String $default_type                                                  = 'none',
+  Optional[Variant[Array,String]] $dev_packages                         = $apache::params::dev_packages,
+  Optional[String] $ip                                                  = undef,
   Boolean $service_enable                                               = true,
   Boolean $service_manage                                               = true,
-  $service_ensure                                                       = 'running',
-  $service_restart                                                      = undef,
-  $purge_configs                                                        = true,
-  $purge_vhost_dir                                                      = undef,
-  $purge_vdir                                                           = false,
-  $serveradmin                                                          = 'root@localhost',
+  Variant[Boolean,String] $service_ensure                               = 'running',
+  Optional[String] $service_restart                                     = undef,
+  Boolean $purge_configs                                                = true,
+  Optional[Boolean] $purge_vhost_dir                                    = undef,
+  Boolean $purge_vdir                                                   = false,
+  String $serveradmin                                                   = 'root@localhost',
   Enum['On', 'Off', 'on', 'off'] $sendfile                              = 'On',
-  $ldap_verify_server_cert                                              = undef,
-  $ldap_trusted_mode                                                    = undef,
-  $error_documents                                                      = false,
-  $timeout                                                              = '60',
-  $httpd_dir                                                            = $apache::params::httpd_dir,
-  $server_root                                                          = $apache::params::server_root,
-  $conf_dir                                                             = $apache::params::conf_dir,
-  $confd_dir                                                            = $apache::params::confd_dir,
+  Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert     = undef,
+  Optional[String] $ldap_trusted_mode                                   = undef,
+  Boolean $error_documents                                              = false,
+  String $timeout                                                       = '60',
+  String $httpd_dir                                                     = $apache::params::httpd_dir,
+  String $server_root                                                   = $apache::params::server_root,
+  String $conf_dir                                                      = $apache::params::conf_dir,
+  String $confd_dir                                                     = $apache::params::confd_dir,
   Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups  = $apache::params::hostname_lookups,
-  $conf_enabled                                                         = $apache::params::conf_enabled,
-  $vhost_dir                                                            = $apache::params::vhost_dir,
-  $vhost_enable_dir                                                     = $apache::params::vhost_enable_dir,
-  $mod_libs                                                             = $apache::params::mod_libs,
-  $mod_packages                                                         = $apache::params::mod_packages,
-  $vhost_include_pattern                                                = $apache::params::vhost_include_pattern,
-  $mod_dir                                                              = $apache::params::mod_dir,
-  $mod_enable_dir                                                       = $apache::params::mod_enable_dir,
-  $mpm_module                                                           = $apache::params::mpm_module,
-  $lib_path                                                             = $apache::params::lib_path,
-  $conf_template                                                        = $apache::params::conf_template,
-  $servername                                                           = $apache::params::servername,
-  $pidfile                                                              = $apache::params::pidfile,
+  Optional[String] $conf_enabled                                        = $apache::params::conf_enabled,
+  String $vhost_dir                                                     = $apache::params::vhost_dir,
+  Optional[String] $vhost_enable_dir                                    = $apache::params::vhost_enable_dir,
+  Hash $mod_libs                                                        = $apache::params::mod_libs,
+  Hash $mod_packages                                                    = $apache::params::mod_packages,
+  String $vhost_include_pattern                                         = $apache::params::vhost_include_pattern,
+  String $mod_dir                                                       = $apache::params::mod_dir,
+  Optional[String] $mod_enable_dir                                      = $apache::params::mod_enable_dir,
+  Variant[Boolean,String] $mpm_module                                   = $apache::params::mpm_module,
+  String $lib_path                                                      = $apache::params::lib_path,
+  String $conf_template                                                 = $apache::params::conf_template,
+  Optional[String] $servername                                          = $apache::params::servername,
+  String $pidfile                                                       = $apache::params::pidfile,
   Optional[Stdlib::Absolutepath] $rewrite_lock                          = undef,
   Boolean $manage_user                                                  = true,
   Boolean $manage_group                                                 = true,
-  $user                                                                 = $apache::params::user,
-  $group                                                                = $apache::params::group,
-  $http_protocol_options                                                = $apache::params::http_protocol_options,
-  $supplementary_groups                                                 = [],
-  $keepalive                                                            = $apache::params::keepalive,
-  $keepalive_timeout                                                    = $apache::params::keepalive_timeout,
-  $max_keepalive_requests                                               = $apache::params::max_keepalive_requests,
-  $limitreqfieldsize                                                    = '8190',
-  $limitreqfields                                                       = '100',
-  $logroot                                                              = $apache::params::logroot,
-  $logroot_mode                                                         = $apache::params::logroot_mode,
+  String $user                                                          = $apache::params::user,
+  String $group                                                         = $apache::params::group,
+  Optional[String] $http_protocol_options                               = $apache::params::http_protocol_options,
+  Array $supplementary_groups                                           = [],
+  String $keepalive                                                     = $apache::params::keepalive,
+  Variant[Integer,String] $keepalive_timeout                            = $apache::params::keepalive_timeout,
+  Variant[Integer,String] $max_keepalive_requests                       = $apache::params::max_keepalive_requests,
+  String $limitreqfieldsize                                             = '8190',
+  String $limitreqfields                                                = '100',
+  String $logroot                                                       = $apache::params::logroot,
+  Optional[String] $logroot_mode                                        = $apache::params::logroot_mode,
   Apache::LogLevel $log_level                                           = $apache::params::log_level,
-  $log_formats                                                          = {},
-  $ssl_file                                                             = undef,
-  $ports_file                                                           = $apache::params::ports_file,
-  $docroot                                                              = $apache::params::docroot,
-  $apache_version                                                       = $apache::version::default,
-  $server_tokens                                                        = 'Prod',
-  $server_signature                                                     = 'On',
-  $trace_enable                                                         = 'On',
+  Hash $log_formats                                                     = {},
+  Optional[String] $ssl_file                                            = undef,
+  String $ports_file                                                    = $apache::params::ports_file,
+  String $docroot                                                       = $apache::params::docroot,
+  String $apache_version                                                = $apache::version::default,
+  String $server_tokens                                                 = 'Prod',
+  String $server_signature                                              = 'On',
+  String $trace_enable                                                  = 'On',
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes        = undef,
-  $file_e_tag                                                           = undef,
+  Optional[String] $file_e_tag                                          = undef,
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]
-  $use_canonical_name                                          = undef,
-  $package_ensure                                                = 'installed',
-  Boolean $use_optional_includes                                 = $apache::params::use_optional_includes,
-  $use_systemd                                                   = $apache::params::use_systemd,
-  $mime_types_additional                                         = $apache::params::mime_types_additional,
-  $file_mode                                                     = $apache::params::file_mode,
-  $root_directory_options                                        = $apache::params::root_directory_options,
-  Boolean $root_directory_secured                                = false,
-  $error_log                                                     = $apache::params::error_log,
-  $scriptalias                                                   = $apache::params::scriptalias,
-  $access_log_file                                               = $apache::params::access_log_file,
+  $use_canonical_name                                                   = undef,
+  String $package_ensure                                                = 'installed',
+  Boolean $use_optional_includes                                        = $apache::params::use_optional_includes,
+  Boolean $use_systemd                                                  = $apache::params::use_systemd,
+  Hash $mime_types_additional                                           = $apache::params::mime_types_additional,
+  String $file_mode                                                     = $apache::params::file_mode,
+  Array $root_directory_options                                         = $apache::params::root_directory_options,
+  Boolean $root_directory_secured                                       = false,
+  String $error_log                                                     = $apache::params::error_log,
+  String $scriptalias                                                   = $apache::params::scriptalias,
+  String $access_log_file                                               = $apache::params::access_log_file,
   Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                = [],
   Optional[Boolean] $protocols_honor_order                       = undef,
 ) inherits apache::params {
diff --git a/manifests/mod.pp b/manifests/mod.pp
index c748d2f819..8118a55d54 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -33,14 +33,14 @@
 #   Specifies a path to the module. Do not manually set this parameter without a special reason.
 #
 define apache::mod (
-  $package        = undef,
-  $package_ensure = 'present',
-  $lib            = undef,
-  $lib_path       = $apache::lib_path,
-  $id             = undef,
-  $path           = undef,
-  $loadfile_name  = undef,
-  $loadfiles      = undef,
+  Optional[String] $package       = undef,
+  String $package_ensure          = 'present',
+  Optional[String] $lib           = undef,
+  String $lib_path                = $apache::lib_path,
+  Optional[String] $id            = undef,
+  Optional[String] $path          = undef,
+  Optional[String] $loadfile_name = undef,
+  Optional[Array] $loadfiles      = undef,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index c187e7661c..5271e8f2f8 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -14,18 +14,19 @@
 #   - FreeBSD: /usr/local/www/apache24/icons
 #   - Gentoo: /var/www/icons
 #   - Red Hat: /var/www/icons, except on Apache 2.4, where it's /usr/share/httpd/icons
+#   Set to 'false' to disable the alias
 # 
-# @param icons_path
+# @param icons_prefix
 #   Change the alias for /icons/.
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_alias.html for additional documentation.
 #
 class apache::mod::alias (
-  $apache_version = undef,
-  $icons_options  = 'Indexes MultiViews',
+  Optional[String] $apache_version  = undef,
+  String $icons_options             = 'Indexes MultiViews',
   # set icons_path to false to disable the alias
-  $icons_path     = $apache::params::alias_icons_path,
-  $icons_prefix   = $apache::params::icons_prefix
+  String $icons_path                = $apache::params::alias_icons_path,
+  String $icons_prefix              = $apache::params::icons_prefix
 ) inherits apache::params {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 5d130662ed..a85b9d3763 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -25,8 +25,11 @@
 #   Whether to validate the presented certificate. This has been deprecated and
 #   removed from Version 1.1-RC1 onward.
 # 
-# @param cas_validatedepth
+# @param cas_validate_depth
 #   The maximum depth for chained certificate validation.
+#
+# @param cas_certificate_path
+#   The path leading to the certificate
 # 
 # @param cas_proxy_validate_url
 #   The URL to use when performing a proxy validation.
@@ -84,28 +87,28 @@
 class apache::mod::auth_cas (
   String $cas_login_url,
   String $cas_validate_url,
-  String $cas_cookie_path    = $apache::params::cas_cookie_path,
-  $cas_cookie_path_mode      = '0750',
-  $cas_version               = 2,
-  $cas_debug                 = 'Off',
-  $cas_validate_server       = undef,
-  $cas_validate_depth        = undef,
-  $cas_certificate_path      = undef,
-  $cas_proxy_validate_url    = undef,
-  $cas_root_proxied_as       = undef,
-  $cas_cookie_entropy        = undef,
-  $cas_timeout               = undef,
-  $cas_idle_timeout          = undef,
-  $cas_cache_clean_interval  = undef,
-  $cas_cookie_domain         = undef,
-  $cas_cookie_http_only      = undef,
-  $cas_authoritative         = undef,
-  $cas_validate_saml         = undef,
-  $cas_sso_enabled           = undef,
-  $cas_attribute_prefix      = undef,
-  $cas_attribute_delimiter   = undef,
-  $cas_scrub_request_headers = undef,
-  $suppress_warning          = false,
+  String $cas_cookie_path                     = $apache::params::cas_cookie_path,
+  String $cas_cookie_path_mode                = '0750',
+  Integer $cas_version                        = 2,
+  String $cas_debug                           = 'Off',
+  Optional[String] $cas_validate_server       = undef,
+  Optional[String] $cas_validate_depth        = undef,
+  Optional[String] $cas_certificate_path      = undef,
+  Optional[String] $cas_proxy_validate_url    = undef,
+  Optional[String] $cas_root_proxied_as       = undef,
+  Optional[String] $cas_cookie_entropy        = undef,
+  Optional[String] $cas_timeout               = undef,
+  Optional[String] $cas_idle_timeout          = undef,
+  Optional[String] $cas_cache_clean_interval  = undef,
+  Optional[String] $cas_cookie_domain         = undef,
+  Optional[String] $cas_cookie_http_only      = undef,
+  Optional[String] $cas_authoritative         = undef,
+  Optional[String] $cas_validate_saml         = undef,
+  Optional[String] $cas_sso_enabled           = undef,
+  Optional[String] $cas_attribute_prefix      = undef,
+  Optional[String] $cas_attribute_delimiter   = undef,
+  Optional[String] $cas_scrub_request_headers = undef,
+  Boolean $suppress_warning                   = false,
 ) inherits apache::params {
   if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index 43a5614306..d98a4ea3eb 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -25,13 +25,13 @@
 # @see https://github.com/Uninett/mod_auth_mellon for additional documentation.
 #
 class apache::mod::auth_mellon (
-  $mellon_cache_size = $apache::params::mellon_cache_size,
-  $mellon_lock_file  = $apache::params::mellon_lock_file,
-  $mellon_post_directory = $apache::params::mellon_post_directory,
-  $mellon_cache_entry_size = undef,
-  $mellon_post_ttl = undef,
-  $mellon_post_size = undef,
-  $mellon_post_count = undef
+  Optional[Variant[String,Integer]] $mellon_cache_size  = $apache::params::mellon_cache_size,
+  Optional[String] $mellon_lock_file                    = $apache::params::mellon_lock_file,
+  Optional[String] $mellon_post_directory     = $apache::params::mellon_post_directory,
+  Optional[String] $mellon_cache_entry_size   = undef,
+  Optional[String] $mellon_post_ttl           = undef,
+  Optional[String] $mellon_post_size          = undef,
+  Optional[String] $mellon_post_count         = undef
 ) inherits apache::params {
   include apache
   ::apache::mod { 'auth_mellon': }
diff --git a/manifests/mod/authn_core.pp b/manifests/mod/authn_core.pp
index f145982e2d..6bbfc4aea1 100644
--- a/manifests/mod/authn_core.pp
+++ b/manifests/mod/authn_core.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_authn_core.html for additional documentation.
 #
 class apache::mod::authn_core (
-  $apache_version = $apache::apache_version
+  Optional[String] $apache_version = $apache::apache_version
 ) {
   if versioncmp($apache_version, '2.4') >= 0 {
     ::apache::mod { 'authn_core': }
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
index e1f78960e7..77c091fe73 100644
--- a/manifests/mod/authn_dbd.pp
+++ b/manifests/mod/authn_dbd.pp
@@ -28,14 +28,14 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_authn_dbd.html for additional documentation.
 #
 class apache::mod::authn_dbd (
-  $authn_dbd_params,
-  $authn_dbd_dbdriver    = 'mysql',
-  $authn_dbd_query       = undef,
-  $authn_dbd_min         = '4',
-  $authn_dbd_max         = '20',
-  $authn_dbd_keep        = '8',
-  $authn_dbd_exptime     = '300',
-  $authn_dbd_alias       = undef,
+  Optional[String] $authn_dbd_params,
+  String $authn_dbd_dbdriver        = 'mysql',
+  Optional[String] $authn_dbd_query = undef,
+  String $authn_dbd_min             = '4',
+  String $authn_dbd_max             = '20',
+  String $authn_dbd_keep            = '8',
+  String $authn_dbd_exptime         = '300',
+  Optional[String] $authn_dbd_alias = undef,
 ) inherits apache::params {
   include apache
   include apache::mod::dbd
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 3f194d7363..4c00ceb917 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -10,8 +10,8 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html for additional documentation.
 # @note Unsupported platforms: RedHat: 6, 8; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
 class apache::mod::authnz_ldap (
-  Boolean $verify_server_cert = true,
-  $package_name               = undef,
+  Boolean $verify_server_cert     = true,
+  Optional[String] $package_name  = undef,
 ) {
   include apache
   include 'apache::mod::ldap'
diff --git a/manifests/mod/authz_default.pp b/manifests/mod/authz_default.pp
index 540d086ab0..ba886c2587 100644
--- a/manifests/mod/authz_default.pp
+++ b/manifests/mod/authz_default.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_authz_default.html for additional documentation.
 #
 class apache::mod::authz_default (
-  $apache_version = $apache::apache_version
+  Optional[String] $apache_version = $apache::apache_version
 ) {
   if versioncmp($apache_version, '2.4') >= 0 {
     warning('apache::mod::authz_default has been removed in Apache 2.4')
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index aa05bd2703..8bc521e22b 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -1,10 +1,13 @@
 # @summary
 #   Installs `mod_autoindex`
 # 
+# @param icons_prefix
+#   Change the alias for /icons/.
+# 
 # @see https://httpd.apache.org/docs/current/mod/mod_autoindex.html for additional documentation.
 #
 class apache::mod::autoindex (
-  $icons_prefix   = $apache::params::icons_prefix
+  String $icons_prefix = $apache::params::icons_prefix
 ) inherits apache::params {
   include apache
   ::apache::mod { 'autoindex': }
diff --git a/manifests/mod/cluster.pp b/manifests/mod/cluster.pp
index 9b827f7630..2cc920b9a1 100644
--- a/manifests/mod/cluster.pp
+++ b/manifests/mod/cluster.pp
@@ -49,17 +49,17 @@
 # @see https://modcluster.io/ for additional documentation.
 #
 class apache::mod::cluster (
-  $allowed_network,
-  $balancer_name,
-  $ip,
-  $version,
-  $enable_mcpm_receive = true,
-  $port = '6666',
-  $keep_alive_timeout = 60,
-  $manager_allowed_network = '127.0.0.1',
-  $max_keep_alive_requests = 0,
-  $server_advertise = true,
-  $advertise_frequency = undef,
+  String $allowed_network,
+  String $balancer_name,
+  String $ip,
+  String $version,
+  Boolean $enable_mcpm_receive          = true,
+  String $port                          = '6666',
+  Integer $keep_alive_timeout           = 60,
+  String $manager_allowed_network       = '127.0.0.1',
+  Integer $max_keep_alive_requests      = 0,
+  Boolean $server_advertise             = true,
+  Optional[String] $advertise_frequency = undef,
 ) {
   include apache
 
diff --git a/manifests/mod/data.pp b/manifests/mod/data.pp
index 43bc2d0c90..3dd63ea9fd 100644
--- a/manifests/mod/data.pp
+++ b/manifests/mod/data.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_data.html for additional documentation.
 #
 class apache::mod::data (
-  $apache_version = undef,
+  Optional[String] $apache_version = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
index 539e7b4ecb..ae9d4b0a54 100644
--- a/manifests/mod/dav_svn.pp
+++ b/manifests/mod/dav_svn.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_dav_svn.html for additional documentation.
 #
 class apache::mod::dav_svn (
-  $authz_svn_enabled = false,
+  Boolean $authz_svn_enabled = false,
 ) {
   Class['apache::mod::dav'] -> Class['apache::mod::dav_svn']
   include apache
diff --git a/manifests/mod/dbd.pp b/manifests/mod/dbd.pp
index cdc9cdf6f4..5e9492f35b 100644
--- a/manifests/mod/dbd.pp
+++ b/manifests/mod/dbd.pp
@@ -1,9 +1,6 @@
 # @summary
 #   Installs `mod_dbd`.
 # 
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-# 
 # @see https://httpd.apache.org/docs/current/mod/mod_dbd.html for additional documentation.
 #
 class apache::mod::dbd {
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 777c2f8886..0d0180050c 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -10,14 +10,14 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_deflate.html for additional documentation.
 #
 class apache::mod::deflate (
-  $types = [
+  Array[String] $types = [
     'text/html text/plain text/xml',
     'text/css',
     'application/x-javascript application/javascript application/ecmascript',
     'application/rss+xml',
     'application/json',
   ],
-  $notes = {
+  Hash $notes = {
     'Input'  => 'instream',
     'Output' => 'outstream',
     'Ratio'  => 'ratio',
diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index 86f97a0706..23d97c1b39 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -1,8 +1,7 @@
 # @summary
 #   Installs and configures `mod_dir`.
 # 
-# @param types
-#   Specifies the text-based content types to compress.
+# @param dir
 #
 # @param indexes
 #   Provides a string for the DirectoryIndex directive
@@ -14,8 +13,15 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_dir.html for additional documentation.
 #
 class apache::mod::dir (
-  $dir                   = 'public_html',
-  Array[String] $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
+  String $dir            = 'public_html',
+  Array[String] $indexes = [
+    'index.html',
+    'index.html.var',
+    'index.cgi',
+    'index.pl',
+    'index.php',
+    'index.xhtml',
+  ],
 ) {
   include apache
   ::apache::mod { 'dir': }
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 7851825bbc..044de457d1 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -23,9 +23,9 @@
 # @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation.
 #
 class apache::mod::disk_cache (
-  $cache_root           = undef,
-  $cache_ignore_headers = undef,
-  Boolean $default_cache_enable = true,
+  Optional[String] $cache_root            = undef,
+  Optional[String] $cache_ignore_headers  = undef,
+  Boolean $default_cache_enable           = true,
 ) {
   include apache
   if $cache_root {
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 4d48914486..fc624b5f10 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -47,18 +47,18 @@
 # @see https://httpd.apache.org/docs/current/mod/event.html for additional documentation.
 # @note Unsupported platforms: SLES: all
 class apache::mod::event (
-  $startservers           = '2',
-  $maxclients             = '150',
-  $maxrequestworkers      = undef,
-  $minsparethreads        = '25',
-  $maxsparethreads        = '75',
-  $threadsperchild        = '25',
-  $maxrequestsperchild    = '0',
-  $maxconnectionsperchild = undef,
-  $serverlimit            = '25',
-  $apache_version         = undef,
-  $threadlimit            = '64',
-  $listenbacklog          = '511',
+  Variant[String,Boolean] $startservers                       = '2',
+  Variant[String,Boolean] $maxclients                         = '150',
+  Optional[Variant[String,Boolean]] $maxrequestworkers        = undef,
+  Variant[String,Boolean] $minsparethreads                    = '25',
+  Variant[String,Boolean] $maxsparethreads                    = '75',
+  Variant[String,Boolean] $threadsperchild                    = '25',
+  Variant[String,Boolean] $maxrequestsperchild                = '0',
+  Optional[Variant[String,Boolean]] $maxconnectionsperchild   = undef,
+  Variant[String,Boolean] $serverlimit                        = '25',
+  Optional[String] $apache_version                            = undef,
+  Variant[String,Boolean]  $threadlimit                       = '64',
+  Variant[String,Boolean]  $listenbacklog                     = '511',
 ) {
   include apache
 
diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index 7a5bfddea2..33bd11053f 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -15,9 +15,9 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_expires.html for additional documentation.
 #
 class apache::mod::expires (
-  $expires_active  = true,
-  $expires_default = undef,
-  $expires_by_type = undef,
+  Boolean $expires_active                 = true,
+  Optional[String] $expires_default       = undef,
+  Optional[Array[Hash]] $expires_by_type  = undef,
 ) {
   include apache
   ::apache::mod { 'expires': }
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index 3cfd051eba..ffec705a41 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -1,14 +1,14 @@
 # @summary
 #   Installs and configures `mod_fcgid`.
 # 
-# @param expires_active
-#   Enables generation of Expires headers.
-#
-# @param expires_default
-#   Default algorithm for calculating expiration time.
-#
-# @param expires_by_type
-#   Value of the Expires header configured by MIME type.
+# @param options
+#   A hash used to parameterize the availible options:
+#   expires_active
+#     Enables generation of Expires headers.
+#   expires_default
+#     Default algorithm for calculating expiration time.
+#   expires_by_type
+#     Value of the Expires header configured by MIME type.
 #
 # @example The class does not individually parameterize all available options. Instead, configure mod_fcgid using the options hash. 
 #   class { 'apache::mod::fcgid':
@@ -36,7 +36,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_fcgid.html for additional documentation.
 #
 class apache::mod::fcgid (
-  $options = {},
+  Hash $options = {},
 ) {
   include apache
   if ($facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '7') >= 0) or $facts['os']['family'] == 'FreeBSD' {
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index b77ea05c6c..cacf29af23 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -19,7 +19,7 @@
 # @param scan_proxy_headers
 #   Enables the GeoIPScanProxyHeaders option.
 # 
-# @param scan_proxy_headers_field
+# @param scan_proxy_header_field
 #   Specifies the header mod_geoip uses to determine the client's IP address.
 # 
 # @param use_last_xforwarededfor_ip
@@ -28,14 +28,14 @@
 # @see https://dev.maxmind.com/geoip/legacy/mod_geoip2 for additional documentation.
 #
 class apache::mod::geoip (
-  $enable                     = false,
-  $db_file                    = '/usr/share/GeoIP/GeoIP.dat',
-  $flag                       = 'Standard',
-  $output                     = 'All',
-  $enable_utf8                = undef,
-  $scan_proxy_headers         = undef,
-  $scan_proxy_header_field    = undef,
-  $use_last_xforwarededfor_ip = undef,
+  Boolean $enable                               = false,
+  String $db_file                               = '/usr/share/GeoIP/GeoIP.dat',
+  String $flag                                  = 'Standard',
+  String $output                                = 'All',
+  Optional[String] $enable_utf8                 = undef,
+  Optional[String] $scan_proxy_headers          = undef,
+  Optional[String] $scan_proxy_header_field     = undef,
+  Optional[String] $use_last_xforwarededfor_ip  = undef,
 ) {
   include apache
   ::apache::mod { 'geoip': }
diff --git a/manifests/mod/headers.pp b/manifests/mod/headers.pp
index a86dbf76a5..8f7b466915 100644
--- a/manifests/mod/headers.pp
+++ b/manifests/mod/headers.pp
@@ -1,9 +1,6 @@
 # @summary
 #   Installs and configures `mod_headers`.
 # 
-# @param apache_version
-#   Version of Apache to install module on.
-# 
 # @see https://httpd.apache.org/docs/current/mod/mod_headers.html for additional documentation.
 #
 class apache::mod::headers {
diff --git a/manifests/mod/http2.pp b/manifests/mod/http2.pp
index 0637aee4dd..c5d6549419 100644
--- a/manifests/mod/http2.pp
+++ b/manifests/mod/http2.pp
@@ -31,7 +31,7 @@
 # @param h2_push_diary_size
 #   Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection.
 # 
-# @param h2_priority
+# @param h2_push_priority
 #   Require HTTP/2 connections to be "modern TLS" only
 # 
 # @param h2_push_resource
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 68afb56e23..487f764276 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -17,10 +17,10 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_info.html for additional documentation.
 #
 class apache::mod::info (
-  $allow_from      = ['127.0.0.1','::1'],
-  $apache_version  = undef,
-  $restrict_access = true,
-  $info_path       = '/server-info',
+  Array[String] $allow_from         = ['127.0.0.1','::1'],
+  Optional[String] $apache_version  = undef,
+  Boolean $restrict_access          = true,
+  String $info_path                 = '/server-info',
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 3250270cba..16dbdce51f 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -30,14 +30,14 @@
 # @see http://mpm-itk.sesse.net for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8; SLES: all
 class apache::mod::itk (
-  $startservers        = '8',
-  $minspareservers     = '5',
-  $maxspareservers     = '20',
-  $serverlimit         = '256',
-  $maxclients          = '256',
-  $maxrequestsperchild = '4000',
-  $enablecapabilities  = undef,
-  $apache_version      = undef,
+  String $startservers                                  = '8',
+  String $minspareservers                               = '5',
+  String $maxspareservers                               = '20',
+  String $serverlimit                                   = '256',
+  String $maxclients                                    = '256',
+  String $maxrequestsperchild                           = '4000',
+  Optional[Variant[Boolean,String]] $enablecapabilities = undef,
+  Optional[String] $apache_version                      = undef,
 ) {
   include apache
 
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index e26f6c70dc..8f9a596dc1 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -128,6 +128,34 @@
 #   If this directive is set to On in some virtual server, the session IDs ;jsessionid=... will be removed for URLs which are not 
 #   forwarded but instead are handled by the local server. 
 #
+# @param location_list
+#   Global locations for mod_jk are defined in array location_list.
+#   Each array item is a hash with quoted* property name as key and value as value itself.
+#   You can define a comment in a special 'comment' key
+#
+#   Example:
+#   <Location /jkstatus/>
+#     # Configures jkstatus
+#     JkMount status
+#     Order deny,allow
+#     Deny from all
+#     Allow from 127.0.0.1
+#   </Location>
+#
+#   Is defined as:
+#   location_list = [
+#     {
+#       'Location'   => '/jkstatus/',
+#       'Comment'    => 'Configures jkstatus',
+#       'JkMount'    => 'status',
+#       'Order'      => 'deny,allow',
+#       'Deny from'  => 'all',
+#       'Allow from' => '127.0.0.1',
+#     },
+#   ]
+#   * Keys must be quoted to allow arbitrary case and/or multi-word keys
+#   (BTW, note the case of 'Location' and 'Comment' keys)
+#
 # @param workers_file_content
 #   Each directive has the format worker.<Worker name>.<Property>=<Value>. This maps as a hash of hashes, where the outer hash specifies
 #   workers, and each inner hash specifies each worker properties and values. Plus, there are two global directives, 'worker.list' and
@@ -243,56 +271,56 @@
 #
 class apache::mod::jk (
   # Binding to mod_jk
-  Optional[String] $ip         = undef,
-  Integer          $port       = 80,
-  Boolean          $add_listen = true,
+  Optional[String] $ip                          = undef,
+  Integer          $port                        = 80,
+  Boolean          $add_listen                  = true,
   # Conf file content
-  $workers_file                = undef,
-  $worker_property             = {},
-  $logroot                     = undef,
-  $shm_file                    = 'jk-runtime-status',
-  $shm_size                    = undef,
-  $mount_file                  = undef,
-  $mount_file_reload           = undef,
-  $mount                       = {},
-  $un_mount                    = {},
-  $auto_alias                  = undef,
-  $mount_copy                  = undef,
-  $worker_indicator            = undef,
-  $watchdog_interval           = undef,
-  $log_file                    = 'mod_jk.log',
-  $log_level                   = undef,
-  $log_stamp_format            = undef,
-  $request_log_format          = undef,
-  $extract_ssl                 = undef,
-  $https_indicator             = undef,
-  $sslprotocol_indicator       = undef,
-  $certs_indicator             = undef,
-  $cipher_indicator            = undef,
-  $certchain_prefix            = undef,
-  $session_indicator           = undef,
-  $keysize_indicator           = undef,
-  $local_name_indicator        = undef,
-  $ignore_cl_indicator         = undef,
-  $local_addr_indicator        = undef,
-  $local_port_indicator        = undef,
-  $remote_host_indicator       = undef,
-  $remote_addr_indicator       = undef,
-  $remote_port_indicator       = undef,
-  $remote_user_indicator       = undef,
-  $auth_type_indicator         = undef,
-  $options                     = [],
-  $env_var                     = {},
-  $strip_session               = undef,
+  Optional[String] $workers_file                = undef,
+  Hash $worker_property                         = {},
+  Optional[String] $logroot                     = undef,
+  String $shm_file                              = 'jk-runtime-status',
+  Optional[String] $shm_size                    = undef,
+  Optional[String] $mount_file                  = undef,
+  Optional[String] $mount_file_reload           = undef,
+  Hash $mount                                   = {},
+  Hash $un_mount                                = {},
+  Optional[String] $auto_alias                  = undef,
+  Optional[String] $mount_copy                  = undef,
+  Optional[String] $worker_indicator            = undef,
+  Optional[Integer] $watchdog_interval          = undef,
+  String $log_file                              = 'mod_jk.log',
+  Optional[String] $log_level                   = undef,
+  Optional[String] $log_stamp_format            = undef,
+  Optional[String] $request_log_format          = undef,
+  Optional[String] $extract_ssl                 = undef,
+  Optional[String] $https_indicator             = undef,
+  Optional[String] $sslprotocol_indicator       = undef,
+  Optional[String] $certs_indicator             = undef,
+  Optional[String] $cipher_indicator            = undef,
+  Optional[String] $certchain_prefix            = undef,
+  Optional[String] $session_indicator           = undef,
+  Optional[String] $keysize_indicator           = undef,
+  Optional[String] $local_name_indicator        = undef,
+  Optional[String] $ignore_cl_indicator         = undef,
+  Optional[String] $local_addr_indicator        = undef,
+  Optional[String] $local_port_indicator        = undef,
+  Optional[String] $remote_host_indicator       = undef,
+  Optional[String] $remote_addr_indicator       = undef,
+  Optional[String] $remote_port_indicator       = undef,
+  Optional[String] $remote_user_indicator       = undef,
+  Optional[String] $auth_type_indicator         = undef,
+  Array $options                                = [],
+  Hash $env_var                                 = {},
+  Optional[String] $strip_session               = undef,
   # Location list
   # See comments in template mod/jk.conf.erb
-  $location_list               = [],
+  Array $location_list                          = [],
   # Workers file content
   # See comments in template mod/jk/workers.properties.erb
-  $workers_file_content        = {},
+  Hash $workers_file_content                    = {},
   # Mount file content
   # See comments in template mod/jk/uriworkermap.properties.erb
-  $mount_file_content          = {},
+  Hash $mount_file_content                      = {},
 ) {
   # Provides important variables
   include apache
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index fab41a7d09..9fc2dabac0 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -49,16 +49,16 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_ldap.html for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8
 class apache::mod::ldap (
-  $apache_version                                  = undef,
-  $package_name                                    = undef,
-  $ldap_trusted_global_cert_file                   = undef,
+  Optional[String] $apache_version                 = undef,
+  Optional[String] $package_name                   = undef,
+  Optional[String] $ldap_trusted_global_cert_file  = undef,
   String $ldap_trusted_global_cert_type            = 'CA_BASE64',
-  $ldap_shared_cache_size                          = undef,
-  $ldap_cache_entries                              = undef,
-  $ldap_cache_ttl                                  = undef,
-  $ldap_opcache_entries                            = undef,
-  $ldap_opcache_ttl                                = undef,
-  $ldap_trusted_mode                               = undef,
+  Optional[String] $ldap_shared_cache_size         = undef,
+  Optional[String] $ldap_cache_entries             = undef,
+  Optional[String] $ldap_cache_ttl                 = undef,
+  Optional[String] $ldap_opcache_entries           = undef,
+  Optional[String] $ldap_opcache_ttl               = undef,
+  Optional[String] $ldap_trusted_mode              = undef,
   String $ldap_path                                = '/ldap-status',
 ) {
   include apache
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index 58957795a6..f21d295735 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -13,9 +13,9 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_mime.html for additional documentation.
 #
 class apache::mod::mime (
-  $mime_support_package = $apache::params::mime_support_package,
-  $mime_types_config    = $apache::params::mime_types_config,
-  $mime_types_additional = undef,
+  String $mime_support_package          = $apache::params::mime_support_package,
+  String $mime_types_config             = $apache::params::mime_types_config,
+  Optional[Hash] $mime_types_additional = undef,
 ) inherits apache::params {
   include apache
   $_mime_types_additional = pick($mime_types_additional, $apache::mime_types_additional)
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index 99a1ec4bb1..c8bc4f6abd 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_mime_magic.html for additional documentation.
 #
 class apache::mod::mime_magic (
-  $magic_file = undef,
+  Optional[String] $magic_file = undef,
 ) {
   include apache
   $_magic_file = pick($magic_file, "${apache::conf_dir}/magic")
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index 4c986ff81b..c7660cd262 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -4,7 +4,7 @@
 # @param transfer_log
 #   Path to `access.log`.
 #
-# @param error_Log
+# @param error_log
 #   Path to `error.log`
 #
 # @param passwd_file
@@ -16,10 +16,10 @@
 # @see https://pagure.io/mod_nss for additional documentation.
 #
 class apache::mod::nss (
-  $transfer_log = "${apache::params::logroot}/access.log",
-  $error_log    = "${apache::params::logroot}/error.log",
-  $passwd_file  = undef,
-  $port     = 8443,
+  String $transfer_log          = "${apache::params::logroot}/access.log",
+  String $error_log             = "${apache::params::logroot}/error.log",
+  Optional[String] $passwd_file = undef,
+  Integer $port                 = 8443,
 ) {
   include apache
   include apache::mod::mime
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index 54181545ae..f0fa0cf3b9 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -1,54 +1,197 @@
 # @summary
-#   Installs and configures `mod_pagespeed`.
+#   Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
+#
+#   This module does *not* manage the software repositories needed to automatically install the
+#   mod-pagespeed-stable package. The module does however require that the package be installed,
+#   or be installable using the system's default package provider.  You should ensure that this
+#   pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
 # 
-# @todo
-#   Add docs
+# @param inherit_vhost_config
+#   Whether or not to inherit the vhost config
+#
+# @param filter_xhtml
+#   Whether to filter by xhtml
+#
+# @param cache_path
+#   Where to cache any files
+#
+# @param log_dir
+#   The log directory
+#
+# @param memcache_servers
+#
+# @param rewrite_level
+#   The inbuilt filter level to be used.
+#   Can be `PassThrough`, `CoreFilters` or `OptimizeForBandwidth`.
+#
+# @param disable_filters
+#   An array of filters that you wish to disable
+#
+# @param enable_filters
+#   An array of filters that you wish to enable
+#
+# @param forbid_filters
+#   An array of filters that you wish to forbid
+#
+# @param rewrite_deadline_per_flush_ms
+#   How long to wait after attempting to rewrite an uncache/expired resource.
+#
+# @param additional_domains
+#   Any additional domains that PageSpeed should optimize resources from.
+#
+# @param file_cache_size_kb
+#   The maximum size of the cache
+#
+# @param file_cache_clean_interval_ms
+#   The interval between which the cache is cleaned
+#
+# @param lru_cache_per_process
+#   The amount of memory dedcated to each process
+#
+# @param lru_cache_byte_limit
+#   How large a cache entry the cache will accept
+#
+# @param css_flatten_max_bytes
+#   The maximum size in bytes of the flattened CSS
+#
+# @param css_inline_max_bytes
+#   The maximum size in bytes of any image that will be inlined into CSS
+#
+# @param css_image_inline_max_bytes
+#   The maximum size in bytes of any image that will be inlined into an HTML file
+#   
+# @param image_inline_max_bytes
+#   The maximum size in bytes of any inlined CSS file
+#
+# @param js_inline_max_bytes
+#   The maximum size in bytes of any inlined JavaScript file
+#
+# @param css_outline_min_bytes
+#   The minimum size in bytes for a CSS file to qualify as an outline
+#
+# @param js_outline_min_bytes
+#   The minimum size in bytes for a JavaScript file to qualify as an outline
+#
+# @param inode_limit
+#   The file cache inode limit
+#
+# @param image_max_rewrites_at_once
+#   The maximum number of images to optimize concurrently
+#
+# @param num_rewrite_threads
+#   The amount of threads to use for rewrite at one time
+#   These threads are used for short, latency-sensitive work.
+#
+# @param num_expensive_rewrite_threads
+#   The amount of threads to use for rewrite at one time
+#   These threads are used for full optimization.
+#
+# @param collect_statistics
+#   Whether to collect cross-process statistics
+#
+# @param statistics_logging
+#   Whether graphs should be drawn from collected statistics
+#
+# @param allow_view_stats
+#   What sources should be allowed to view the resultant graph
+#
+# @param allow_pagespeed_console
+#   What sources to draw the graphs from
+#
+# @param allow_pagespeed_message
+#
+# @param message_buffer_size
+#   The amount of bytes to allocate as a buffer to hold recent log messages
+#
+# @param additional_configuration
+#   Any additional configuration no included as it's own option
+#
+# @param apache_version
+#
+# @param package_ensure
+#
+# @example
+#   class { 'apache::mod::pagespeed':
+#     inherit_vhost_config          => 'on',
+#     filter_xhtml                  => false,
+#     cache_path                    => '/var/cache/mod_pagespeed/',
+#     log_dir                       => '/var/log/pagespeed',
+#     memache_servers               => [],
+#     rewrite_level                 => 'CoreFilters',
+#     disable_filters               => [],
+#     enable_filters                => [],
+#     forbid_filters                => [],
+#     rewrite_deadline_per_flush_ms => 10,
+#     additional_domains            => undef,
+#     file_cache_size_kb            => 102400,
+#     file_cache_clean_interval_ms  => 3600000,
+#     lru_cache_per_process         => 1024,
+#     lru_cache_byte_limit          => 16384,
+#     css_flatten_max_bytes         => 2048,
+#     css_inline_max_bytes          => 2048,
+#     css_image_inline_max_bytes    => 2048,
+#     image_inline_max_bytes        => 2048,
+#     js_inline_max_bytes           => 2048,
+#     css_outline_min_bytes         => 3000,
+#     js_outline_min_bytes          => 3000,
+#     inode_limit                   => 500000,
+#     image_max_rewrites_at_once    => 8,
+#     num_rewrite_threads           => 4,
+#     num_expensive_rewrite_threads => 4,
+#     collect_statistics            => 'on',
+#     statistics_logging            => 'on',
+#     allow_view_stats              => [],
+#     allow_pagespeed_console       => [],
+#     allow_pagespeed_message       => [],
+#     message_buffer_size           => 100000,
+#     additional_configuration      => { }
+#   }
 #
 # @note
 #   Verify that your system is compatible with the latest Google Pagespeed requirements.
 #
-# Although this apache module requires the mod-pagespeed-stable package, Puppet does not manage the software repositories required to
-# automatically install the package. If you declare this class when the package is either not installed or not available to your 
-# package manager, your Puppet run will fail.
+#   Although this apache module requires the mod-pagespeed-stable package, Puppet does not manage the software repositories required to
+#   automatically install the package. If you declare this class when the package is either not installed or not available to your 
+#   package manager, your Puppet run will fail.
 # 
 # @see https://developers.google.com/speed/pagespeed/module/ for additional documentation.
 #
 class apache::mod::pagespeed (
-  $inherit_vhost_config          = 'on',
-  $filter_xhtml                  = false,
-  $cache_path                    = '/var/cache/mod_pagespeed/',
-  $log_dir                       = '/var/log/pagespeed',
-  $memcache_servers              = [],
-  $rewrite_level                 = 'CoreFilters',
-  $disable_filters               = [],
-  $enable_filters                = [],
-  $forbid_filters                = [],
-  $rewrite_deadline_per_flush_ms = 10,
-  $additional_domains            = undef,
-  $file_cache_size_kb            = 102400,
-  $file_cache_clean_interval_ms  = 3600000,
-  $lru_cache_per_process         = 1024,
-  $lru_cache_byte_limit          = 16384,
-  $css_flatten_max_bytes         = 2048,
-  $css_inline_max_bytes          = 2048,
-  $css_image_inline_max_bytes    = 2048,
-  $image_inline_max_bytes        = 2048,
-  $js_inline_max_bytes           = 2048,
-  $css_outline_min_bytes         = 3000,
-  $js_outline_min_bytes          = 3000,
-  $inode_limit                   = 500000,
-  $image_max_rewrites_at_once    = 8,
-  $num_rewrite_threads           = 4,
-  $num_expensive_rewrite_threads = 4,
-  $collect_statistics            = 'on',
-  $statistics_logging            = 'on',
-  $allow_view_stats              = [],
-  $allow_pagespeed_console       = [],
-  $allow_pagespeed_message       = [],
-  $message_buffer_size           = 100000,
-  $additional_configuration      = {},
-  $apache_version                = undef,
-  $package_ensure                = undef,
+  String $inherit_vhost_config                  = 'on',
+  Boolean $filter_xhtml                         = false,
+  String $cache_path                            = '/var/cache/mod_pagespeed/',
+  String $log_dir                               = '/var/log/pagespeed',
+  Array $memcache_servers                       = [],
+  String $rewrite_level                         = 'CoreFilters',
+  Array $disable_filters                        = [],
+  Array $enable_filters                         = [],
+  Array $forbid_filters                         = [],
+  Integer $rewrite_deadline_per_flush_ms        = 10,
+  Optional[String] $additional_domains          = undef,
+  Integer$file_cache_size_kb                    = 102400,
+  Integer$file_cache_clean_interval_ms          = 3600000,
+  Integer$lru_cache_per_process                 = 1024,
+  Integer$lru_cache_byte_limit                  = 16384,
+  Integer$css_flatten_max_bytes                 = 2048,
+  Integer$css_inline_max_bytes                  = 2048,
+  Integer$css_image_inline_max_bytes            = 2048,
+  Integer$image_inline_max_bytes                = 2048,
+  Integer$js_inline_max_bytes                   = 2048,
+  Integer$css_outline_min_bytes                 = 3000,
+  Integer$js_outline_min_bytes                  = 3000,
+  Integer$inode_limit                           = 500000,
+  Integer$image_max_rewrites_at_once            = 8,
+  Integer$num_rewrite_threads                   = 4,
+  Integer$num_expensive_rewrite_threads         = 4,
+  String $collect_statistics                    = 'on',
+  String $statistics_logging                    = 'on',
+  Array $allow_view_stats                       = [],
+  Array $allow_pagespeed_console                = [],
+  Array $allow_pagespeed_message                = [],
+  Integer $message_buffer_size                  = 100000,
+  Variant[Array,Hash] $additional_configuration = {},
+  Optional[String] $apache_version              = undef,
+  Optional[String] $package_ensure              = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 8821e3c7d2..9892ac9573 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -26,6 +26,9 @@
 # @param passenger_allow_encoded_slashes
 #   Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
 #
+# @param passenger_anonymous_telemetry_proxy
+#   Set an intermediate proxy for the Passenger anonymous telemetry reporting.
+#
 # @param passenger_app_env
 #   This option sets, for the current application, the value of the following environment variables:
 #   - RAILS_ENV
@@ -80,6 +83,12 @@
 # @param passenger_default_user
 #   Allows you to specify the user that applications must run as, if user switching fails or is disabled.
 #
+# @param passenger_disable_anonymous_telemetry
+#   Whether or not to disable the Passenger anonymous telemetry reporting.
+#
+# @param passenger_disable_log_prefix
+#   Whether to stop Passenger from prefixing logs when they are written to a log file.
+#
 # @param passenger_disable_security_update_check
 #   Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
 #   security updates that might be available.
@@ -207,6 +216,9 @@
 # @param passenger_socket_backlog
 #   This option can be raised if Apache manages to overflow the backlog queue.
 #
+# @param passenger_spawn_dir
+#   The directory in which Passenger will record progress during startup
+#
 # @param passenger_spawn_method
 #   Controls whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 #
@@ -225,6 +237,9 @@
 # @param passenger_sticky_sessions_cookie_name
 #   Sets the name of the sticky sessions cookie.
 #
+# @param passenger_sticky_sessions_cookie_attributes
+#   Sets the attributes of the sticky sessions cookie.
+#
 # @param passenger_thread_count
 #   Specifies the number of threads that Passenger should spawn per Ruby application process.
 #
@@ -307,101 +322,101 @@
 # @see https://www.phusionpassenger.com/docs/references/config_reference/apache/ for additional documentation.
 #
 class apache::mod::passenger (
-  $manage_repo                                                                               = true,
-  $mod_id                                                                                    = undef,
-  $mod_lib                                                                                   = undef,
-  $mod_lib_path                                                                              = undef,
-  $mod_package                                                                               = undef,
-  $mod_package_ensure                                                                        = undef,
-  $mod_path                                                                                  = undef,
-  $passenger_allow_encoded_slashes                                                           = undef,
+  Boolean $manage_repo                                                                       = true,
+  Optional[String] $mod_id                                                                   = undef,
+  Optional[String] $mod_lib                                                                  = undef,
+  Optional[String] $mod_lib_path                                                             = undef,
+  Optional[String] $mod_package                                                              = undef,
+  Optional[String] $mod_package_ensure                                                       = undef,
+  Optional[String] $mod_path                                                                 = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_allow_encoded_slashes                  = undef,
   Optional[String] $passenger_anonymous_telemetry_proxy                                      = undef,
-  $passenger_app_env                                                                         = undef,
-  $passenger_app_group_name                                                                  = undef,
-  $passenger_app_root                                                                        = undef,
-  $passenger_app_type                                                                        = undef,
-  $passenger_base_uri                                                                        = undef,
-  $passenger_buffer_response                                                                 = undef,
-  $passenger_buffer_upload                                                                   = undef,
-  $passenger_concurrency_model                                                               = undef,
-  $passenger_conf_file                                                                       = $apache::params::passenger_conf_file,
-  $passenger_conf_package_file                                                               = $apache::params::passenger_conf_package_file,
-  $passenger_data_buffer_dir                                                                 = undef,
-  $passenger_debug_log_file                                                                  = undef,
-  $passenger_debugger                                                                        = undef,
-  $passenger_default_group                                                                   = undef,
-  $passenger_default_ruby                                                                    = $apache::params::passenger_default_ruby,
-  $passenger_default_user                                                                    = undef,
+  Optional[String] $passenger_app_env                                                        = undef,
+  Optional[String] $passenger_app_group_name                                                 = undef,
+  Optional[String] $passenger_app_root                                                       = undef,
+  Optional[String] $passenger_app_type                                                       = undef,
+  Optional[String] $passenger_base_uri                                                       = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_buffer_response                        = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_buffer_upload                          = undef,
+  Optional[String] $passenger_concurrency_model                                              = undef,
+  String $passenger_conf_file                                                                = $apache::params::passenger_conf_file,
+  Optional[String] $passenger_conf_package_file                                              = $apache::params::passenger_conf_package_file,
+  Optional[String] $passenger_data_buffer_dir                                                = undef,
+  Optional[String] $passenger_debug_log_file                                                 = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_debugger                               = undef,
+  Optional[String] $passenger_default_group                                                  = undef,
+  Optional[String] $passenger_default_ruby                                                   = $apache::params::passenger_default_ruby,
+  Optional[String] $passenger_default_user                                                   = undef,
   Optional[Boolean] $passenger_disable_anonymous_telemetry                                   = undef,
-  Optional[Boolean] $passenger_disable_log_prefix                                           = undef,
-  $passenger_disable_security_update_check                                                   = undef,
-  $passenger_enabled                                                                         = undef,
-  $passenger_error_override                                                                  = undef,
-  $passenger_file_descriptor_log_file                                                        = undef,
-  $passenger_fly_with                                                                        = undef,
-  $passenger_force_max_concurrent_requests_per_process                                       = undef,
-  $passenger_friendly_error_pages                                                            = undef,
-  $passenger_group                                                                           = undef,
-  $passenger_high_performance                                                                = undef,
-  $passenger_installed_version                                                               = undef,
-  $passenger_instance_registry_dir                                                           = undef,
-  $passenger_load_shell_envvars                                                              = undef,
+  Optional[Boolean] $passenger_disable_log_prefix                                            = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_disable_security_update_check          = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_enabled                                = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_error_override                         = undef,
+  Optional[String] $passenger_file_descriptor_log_file                                       = undef,
+  Optional[String] $passenger_fly_with                                                       = undef,
+  Optional[Variant[Integer,String]] $passenger_force_max_concurrent_requests_per_process     = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_friendly_error_pages                   = undef,
+  Optional[String] $passenger_group                                                          = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_high_performance                       = undef,
+  Optional[String] $passenger_installed_version                                              = undef,
+  Optional[String] $passenger_instance_registry_dir                                          = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_load_shell_envvars                     = undef,
   Optional[Boolean] $passenger_preload_bundler                                               = undef,
   Optional[Stdlib::Absolutepath] $passenger_log_file                                         = undef,
-  $passenger_log_level                                                                       = undef,
-  $passenger_lve_min_uid                                                                     = undef,
-  $passenger_max_instances                                                                   = undef,
-  $passenger_max_instances_per_app                                                           = undef,
-  $passenger_max_pool_size                                                                   = undef,
-  $passenger_max_preloader_idle_time                                                         = undef,
-  $passenger_max_request_queue_size                                                          = undef,
-  $passenger_max_request_time                                                                = undef,
-  $passenger_max_requests                                                                    = undef,
-  $passenger_memory_limit                                                                    = undef,
-  $passenger_meteor_app_settings                                                             = undef,
-  $passenger_min_instances                                                                   = undef,
-  $passenger_nodejs                                                                          = undef,
-  $passenger_pool_idle_time                                                                  = undef,
+  Optional[Variant[Integer,String]] $passenger_log_level                                     = undef,
+  Optional[Variant[Integer,String]] $passenger_lve_min_uid                                   = undef,
+  Optional[Variant[Integer,String]] $passenger_max_instances                                 = undef,
+  Optional[Variant[Integer,String]] $passenger_max_instances_per_app                         = undef,
+  Optional[Variant[Integer,String]] $passenger_max_pool_size                                 = undef,
+  Optional[Variant[Integer,String]] $passenger_max_preloader_idle_time                       = undef,
+  Optional[Variant[Integer,String]] $passenger_max_request_queue_size                        = undef,
+  Optional[Variant[Integer,String]] $passenger_max_request_time                              = undef,
+  Optional[Variant[Integer,String]] $passenger_max_requests                                  = undef,
+  Optional[Variant[Integer,String]] $passenger_memory_limit                                  = undef,
+  Optional[String] $passenger_meteor_app_settings                                            = undef,
+  Optional[Variant[Integer,String]] $passenger_min_instances                                 = undef,
+  Optional[String] $passenger_nodejs                                                         = undef,
+  Optional[Variant[Integer,String]] $passenger_pool_idle_time                                = undef,
   Optional[Variant[String,Array[String]]] $passenger_pre_start                               = undef,
-  $passenger_python                                                                          = undef,
-  $passenger_resist_deployment_errors                                                        = undef,
-  $passenger_resolve_symlinks_in_document_root                                               = undef,
-  $passenger_response_buffer_high_watermark                                                  = undef,
-  $passenger_restart_dir                                                                     = undef,
-  $passenger_rolling_restarts                                                                = undef,
-  $passenger_root                                                                            = $apache::params::passenger_root,
-  $passenger_ruby                                                                            = $apache::params::passenger_ruby,
-  $passenger_security_update_check_proxy                                                     = undef,
-  $passenger_show_version_in_header                                                          = undef,
-  $passenger_socket_backlog                                                                  = undef,
+  Optional[String] $passenger_python                                                         = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resist_deployment_errors               = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resolve_symlinks_in_document_root      = undef,
+  Optional[Variant[Integer,String]] $passenger_response_buffer_high_watermark                = undef,
+  Optional[String] $passenger_restart_dir                                                    = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_rolling_restarts                       = undef,
+  Optional[String] $passenger_root                                                           = $apache::params::passenger_root,
+  Optional[String] $passenger_ruby                                                           = $apache::params::passenger_ruby,
+  Optional[String] $passenger_security_update_check_proxy                                    = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_show_version_in_header                 = undef,
+  Optional[Variant[Integer,String]] $passenger_socket_backlog                                = undef,
   Optional[String] $passenger_spawn_dir                                                      = undef,
   Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method     = undef,
-  $passenger_start_timeout                                                                   = undef,
-  $passenger_startup_file                                                                    = undef,
-  $passenger_stat_throttle_rate                                                              = undef,
-  $passenger_sticky_sessions                                                                 = undef,
-  $passenger_sticky_sessions_cookie_name                                                     = undef,
+  Optional[Variant[Integer,String]] $passenger_start_timeout                                 = undef,
+  Optional[String] $passenger_startup_file                                                   = undef,
+  Optional[Variant[Integer,String]] $passenger_stat_throttle_rate                            = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_sticky_sessions                        = undef,
+  Optional[String] $passenger_sticky_sessions_cookie_name                                    = undef,
   Optional[String] $passenger_sticky_sessions_cookie_attributes                              = undef,
-  $passenger_thread_count                                                                    = undef,
-  $passenger_use_global_queue                                                                = undef,
-  $passenger_user                                                                            = undef,
-  $passenger_user_switching                                                                  = undef,
-  $rack_auto_detect                                                                          = undef,
-  $rack_autodetect                                                                           = undef,
-  $rack_base_uri                                                                             = undef,
-  $rack_env                                                                                  = undef,
-  $rails_allow_mod_rewrite                                                                   = undef,
-  $rails_app_spawner_idle_time                                                               = undef,
-  $rails_auto_detect                                                                         = undef,
-  $rails_autodetect                                                                          = undef,
-  $rails_base_uri                                                                            = undef,
-  $rails_default_user                                                                        = undef,
-  $rails_env                                                                                 = undef,
-  $rails_framework_spawner_idle_time                                                         = undef,
-  $rails_ruby                                                                                = undef,
-  $rails_spawn_method                                                                        = undef,
-  $rails_user_switching                                                                      = undef,
-  $wsgi_auto_detect                                                                          = undef,
+  Optional[Variant[Integer,String]] $passenger_thread_count                                  = undef,
+  Optional[String] $passenger_use_global_queue                                               = undef,
+  Optional[String] $passenger_user                                                           = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_user_switching                         = undef,
+  Optional[String] $rack_auto_detect                                                         = undef,
+  Optional[String] $rack_autodetect                                                          = undef,
+  Optional[String] $rack_base_uri                                                            = undef,
+  Optional[String] $rack_env                                                                 = undef,
+  Optional[String] $rails_allow_mod_rewrite                                                  = undef,
+  Optional[String] $rails_app_spawner_idle_time                                              = undef,
+  Optional[String] $rails_auto_detect                                                        = undef,
+  Optional[String] $rails_autodetect                                                         = undef,
+  Optional[String] $rails_base_uri                                                           = undef,
+  Optional[String] $rails_default_user                                                       = undef,
+  Optional[String] $rails_env                                                                = undef,
+  Optional[String] $rails_framework_spawner_idle_time                                        = undef,
+  Optional[String] $rails_ruby                                                               = undef,
+  Optional[String] $rails_spawn_method                                                       = undef,
+  Optional[String] $rails_user_switching                                                     = undef,
+  Optional[String] $wsgi_auto_detect                                                         = undef,
 ) inherits apache::params {
   include apache
   if $passenger_installed_version {
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 3c649c7fed..22e9d0f627 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -1,17 +1,35 @@
 # @summary
 #   Installs `mod_peruser`.
 # 
-# @todo
-#   Add docs
+# @param minspareprocessors
+# 
+# @param minprocessors
+#   The minimum amount of processors
+# 
+# @param maxprocessors
+#   The maximum amount of processors
+# 
+# @param maxclients
+#   The maximum amount of clients
+# 
+# @param maxrequestsperchild
+#   The maximum amount of requests per child
+# 
+# @param idletimeout
+# 
+# @param expiretimeout
+# 
+# @param keepalive
+# 
 class apache::mod::peruser (
-  $minspareprocessors = '2',
-  $minprocessors = '2',
-  $maxprocessors = '10',
-  $maxclients = '150',
-  $maxrequestsperchild = '1000',
-  $idletimeout = '120',
-  $expiretimeout = '120',
-  $keepalive = 'Off',
+  Variant[Integer,String] $minspareprocessors   = '2',
+  Variant[Integer,String] $minprocessors        = '2',
+  Variant[Integer,String] $maxprocessors        = '10',
+  Variant[Integer,String] $maxclients           = '150',
+  Variant[Integer,String] $maxrequestsperchild  = '1000',
+  Variant[Integer,String] $idletimeout          = '120',
+  Variant[Integer,String] $expiretimeout        = '120',
+  String $keepalive                             = 'Off',
 ) {
   include apache
   case $facts['os']['family'] {
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 4b5baac049..cb12eab092 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -1,19 +1,41 @@
 # @summary
 #   Installs `mod_php`.
-# 
-# @todo
-#   Add docs
+#
+# @param package_name
+#   The package name
+#
+# @param package_ensure
+#   Whether the package is `present` or `absent`
+#
+# @param path
+#
+# @param extensions
+#
+# @param content
+#
+# @param template
+#
+# @param source
+#
+# @param root_group
+#   UNIX group of the root user
+#
+# @param php_version
+#   The php version
+#
+# @param libphp_prefix
+#
 class apache::mod::php (
-  $package_name     = undef,
-  $package_ensure   = 'present',
-  $path             = undef,
-  Array $extensions = ['.php'],
-  $content          = undef,
-  $template         = 'apache/mod/php.conf.erb',
-  $source           = undef,
-  $root_group       = $apache::params::root_group,
-  $php_version      = $apache::params::php_version,
-  $libphp_prefix    = 'libphp'
+  Optional[String] $package_name  = undef,
+  String $package_ensure          = 'present',
+  Optional[String] $path          = undef,
+  Array $extensions               = ['.php'],
+  Optional[String] $content       = undef,
+  String $template                = 'apache/mod/php.conf.erb',
+  Optional[String] $source        = undef,
+  Optional[String] $root_group    = $apache::params::root_group,
+  Optional[String] $php_version   = $apache::params::php_version,
+  String $libphp_prefix           = 'libphp'
 ) inherits apache::params {
   include apache
   if (versioncmp($php_version, '8') < 0) {
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 197f7513b0..0b8557d866 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -34,16 +34,16 @@
 # @see https://httpd.apache.org/docs/current/mod/prefork.html for additional documentation.
 #
 class apache::mod::prefork (
-  $startservers           = '8',
-  $minspareservers        = '5',
-  $maxspareservers        = '20',
-  $serverlimit            = '256',
-  $maxclients             = '256',
-  $maxrequestworkers      = undef,
-  $maxrequestsperchild    = '4000',
-  $maxconnectionsperchild = undef,
-  $apache_version         = undef,
-  $listenbacklog          = '511'
+  Variant[Integer,String] $startservers                     = '8',
+  Variant[Integer,String] $minspareservers                  = '5',
+  Variant[Integer,String] $maxspareservers                  = '20',
+  Variant[Integer,String] $serverlimit                      = '256',
+  Variant[Integer,String] $maxclients                       = '256',
+  Optional[Variant[Integer,String]] $maxrequestworkers      = undef,
+  Variant[Integer,String] $maxrequestsperchild              = '4000',
+  Optional[Variant[Integer,String]] $maxconnectionsperchild = undef,
+  Optional[String] $apache_version                          = undef,
+  String $listenbacklog                                     = '511'
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 2a9eb71495..642577ce93 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -25,13 +25,13 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
 #
 class apache::mod::proxy (
-  $proxy_requests     = 'Off',
-  $allow_from         = undef,
-  $apache_version     = undef,
-  $package_name       = undef,
-  $proxy_via          = 'On',
-  $proxy_timeout      = undef,
-  $proxy_iobuffersize = undef,
+  String $proxy_requests               = 'Off',
+  Optional[String] $allow_from         = undef,
+  Optional[String] $apache_version     = undef,
+  Optional[String] $package_name       = undef,
+  String $proxy_via                    = 'On',
+  Optional[String] $proxy_timeout      = undef,
+  Optional[String] $proxy_iobuffersize = undef,
 ) {
   include apache
   $_proxy_timeout = $apache::timeout
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 4778689c1d..74f35ba46e 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -4,7 +4,7 @@
 # @param manager
 #   Toggle whether to enable balancer manager support.
 #
-# @param maanger_path
+# @param manager_path
 #   Server relative path to balancer manager.
 #
 # @param allow_from
@@ -19,7 +19,7 @@
   Boolean $manager                   = false,
   Stdlib::Absolutepath $manager_path = '/balancer-manager',
   Array $allow_from                  = ['127.0.0.1','::1'],
-  $apache_version                    = $apache::apache_version,
+  Optional[String] $apache_version   = $apache::apache_version,
 ) {
   include apache::mod::proxy
   include apache::mod::proxy_http
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index a971e045dd..fc64cfbfc8 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html for additional documentation.
 #
 class apache::mod::reqtimeout (
-  $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
+  Variant[Array[String],String] $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
 ) {
   include apache
   ::apache::mod { 'reqtimeout': }
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index 7e4bab23e9..7fa97b132b 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -16,10 +16,10 @@
 # @see https://github.com/gnif/mod_rpaf for additional documentation.
 #
 class apache::mod::rpaf (
-  $sethostname = true,
-  $proxy_ips   = ['127.0.0.1'],
-  $header      = 'X-Forwarded-For',
-  $template    = 'apache/mod/rpaf.conf.erb'
+  Variant[Boolean,String] $sethostname  = true,
+  Array[String] $proxy_ips              = ['127.0.0.1'],
+  String $header                        = 'X-Forwarded-For',
+  String $template                      = 'apache/mod/rpaf.conf.erb'
 ) {
   include apache
   ::apache::mod { 'rpaf': }
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index a4461cf8a2..8fbd7abdfc 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -12,7 +12,11 @@
 # 
 # @param activated_rules
 #   An array of rules from the modsec_crs_path or absolute to activate via symlinks.
+#
+# @param custom_rules
 # 
+# @param custom_rules_set
+#
 # @param modsec_dir
 #   Defines the path where Puppet installs the modsec configuration and activated rules links.
 # 
@@ -90,36 +94,36 @@
 # @see https://github.com/SpiderLabs/ModSecurity/wiki for additional documentation.
 #
 class apache::mod::security (
-  $logroot                    = $apache::params::logroot,
-  $version                     = $apache::params::modsec_version,
-  $crs_package                 = $apache::params::modsec_crs_package,
-  $activated_rules             = $apache::params::modsec_default_rules,
-  $custom_rules                = $apache::params::modsec_custom_rules,
-  $custom_rules_set            = $apache::params::modsec_custom_rules_set,
-  $modsec_dir                  = $apache::params::modsec_dir,
-  $modsec_secruleengine        = $apache::params::modsec_secruleengine,
-  $audit_log_relevant_status   = '^(?:5|4(?!04))',
-  $audit_log_parts             = $apache::params::modsec_audit_log_parts,
-  $audit_log_type              = $apache::params::modsec_audit_log_type,
-  $audit_log_storage_dir       = undef,
-  $secpcrematchlimit           = $apache::params::secpcrematchlimit,
-  $secpcrematchlimitrecursion  = $apache::params::secpcrematchlimitrecursion,
-  $allowed_methods             = 'GET HEAD POST OPTIONS',
-  $content_types               = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
-  $restricted_extensions       = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
-  $restricted_headers          = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
-  $secdefaultaction            = 'deny',
-  $inbound_anomaly_threshold   = '5',
-  $outbound_anomaly_threshold  = '4',
-  $critical_anomaly_score      = '5',
-  $error_anomaly_score         = '4',
-  $warning_anomaly_score       = '3',
-  $notice_anomaly_score        = '2',
-  $secrequestmaxnumargs        = '255',
-  $secrequestbodylimit         = '13107200',
-  $secrequestbodynofileslimit  = '131072',
-  $secrequestbodyinmemorylimit = '131072',
-  $manage_security_crs         = true,
+  String $logroot                           = $apache::params::logroot,
+  Integer $version                          = $apache::params::modsec_version,
+  Optional[String] $crs_package             = $apache::params::modsec_crs_package,
+  Array[String] $activated_rules            = $apache::params::modsec_default_rules,
+  Boolean $custom_rules                     = $apache::params::modsec_custom_rules,
+  Optional[Array[String]] $custom_rules_set = $apache::params::modsec_custom_rules_set,
+  String $modsec_dir                        = $apache::params::modsec_dir,
+  String $modsec_secruleengine              = $apache::params::modsec_secruleengine,
+  String $audit_log_relevant_status         = '^(?:5|4(?!04))',
+  String $audit_log_parts                   = $apache::params::modsec_audit_log_parts,
+  String $audit_log_type                    = $apache::params::modsec_audit_log_type,
+  Optional[String] $audit_log_storage_dir   = undef,
+  Integer $secpcrematchlimit                = $apache::params::secpcrematchlimit,
+  Integer $secpcrematchlimitrecursion       = $apache::params::secpcrematchlimitrecursion,
+  String $allowed_methods                   = 'GET HEAD POST OPTIONS',
+  String $content_types                     = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
+  String $restricted_extensions             = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
+  String $restricted_headers                = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
+  String $secdefaultaction                  = 'deny',
+  String $inbound_anomaly_threshold         = '5',
+  String $outbound_anomaly_threshold        = '4',
+  String $critical_anomaly_score            = '5',
+  String $error_anomaly_score               = '4',
+  String $warning_anomaly_score             = '3',
+  String $notice_anomaly_score              = '2',
+  String $secrequestmaxnumargs              = '255',
+  String $secrequestbodylimit               = '13107200',
+  String $secrequestbodynofileslimit        = '131072',
+  String $secrequestbodyinmemorylimit       = '131072',
+  Boolean $manage_security_crs              = true,
 ) inherits apache::params {
   include apache
 
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 09a5d2ead5..ea94344a87 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -24,10 +24,10 @@
 # @see https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig for additional documentation.
 # @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Debian: 7, 8; Ubuntu: all; OracleLinux: all
 class apache::mod::shib (
-  $suppress_warning = false,
-  $mod_full_path    = undef,
-  $package_name     = undef,
-  $mod_lib          = undef,
+  Boolean $suppress_warning       = false,
+  Optional[String] $mod_full_path = undef,
+  Optional[String] $package_name  = undef,
+  Optional[String] $mod_lib       = undef,
 ) {
   include apache
   if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 7eaed198cb..27d8bac601 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -4,6 +4,9 @@
 # @param ssl_compression
 #   Enable compression on the SSL level.
 #
+# @param ssl_sessiontickets
+#   Enable or disable use of TLS session tickets
+#
 # @param ssl_cryptodevice
 #   Enable use of a cryptographic hardware accelerator.
 #
@@ -52,6 +55,10 @@
 # @param ssl_stapling
 #   Enable stapling of OCSP responses in the TLS handshake.
 #
+# @param stapling_cache
+#   Configures the cache used to store OCSP responses which get included in
+#   the TLS handshake if SSLUseStapling is enabled.
+#
 # @param ssl_stapling_return_errors
 #   Pass stapling related OCSP errors on to client.
 #
@@ -82,27 +89,27 @@
 class apache::mod::ssl (
   Boolean $ssl_compression                                  = false,
   Optional[Boolean] $ssl_sessiontickets                     = undef,
-  $ssl_cryptodevice                                         = 'builtin',
-  $ssl_options                                              = ['StdEnvVars'],
-  $ssl_openssl_conf_cmd                                     = undef,
+  String $ssl_cryptodevice                                  = 'builtin',
+  Array[String] $ssl_options                                = ['StdEnvVars'],
+  Optional[String] $ssl_openssl_conf_cmd                    = undef,
   Optional[String] $ssl_cert                                = undef,
   Optional[String] $ssl_key                                 = undef,
-  $ssl_ca                                                   = undef,
-  $ssl_cipher                                               = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
+  Optional[String] $ssl_ca                                  = undef,
+  String $ssl_cipher                                        = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
-  $ssl_protocol                                             = $apache::params::ssl_protocol,
+  Array[String] $ssl_protocol                               = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
-  $ssl_pass_phrase_dialog                                   = 'builtin',
-  $ssl_random_seed_bytes                                    = '512',
+  String $ssl_pass_phrase_dialog                            = 'builtin',
+  Variant[Integer,String] $ssl_random_seed_bytes            = '512',
   String $ssl_sessioncache                                  = $apache::params::ssl_sessioncache,
-  $ssl_sessioncachetimeout                                  = '300',
+  Variant[Integer,String] $ssl_sessioncachetimeout          = '300',
   Boolean $ssl_stapling                                     = false,
   Optional[String] $stapling_cache                          = undef,
   Optional[Boolean] $ssl_stapling_return_errors             = undef,
-  $ssl_mutex                                                = undef,
+  Optional[String] $ssl_mutex                               = undef,
   Boolean $ssl_reload_on_change                             = false,
-  $apache_version                                           = undef,
-  $package_name                                             = undef,
+  Optional[String] $apache_version                          = undef,
+  Optional[String] $package_name                            = undef,
 ) inherits apache::params {
   include apache
   include apache::mod::mime
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index f6d41449df..4cd4c144a4 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -42,8 +42,8 @@
   Optional[Array] $allow_from                      = undef,
   Optional[Variant[String, Array, Hash]] $requires = undef,
   Enum['On', 'Off', 'on', 'off'] $extended_status  = 'On',
-  $apache_version                                  = undef,
-  $status_path                                     = '/server-status',
+  Optional[String] $apache_version                 = undef,
+  String $status_path                              = '/server-status',
 ) inherits apache::params {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 67d7717dda..c26c33c200 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -34,16 +34,16 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_userdir.html for additional documentation.
 #
 class apache::mod::userdir (
-  $home = undef,
-  $dir = undef,
-  Optional[String[1]] $userdir = undef,
-  $disable_root = true,
-  $apache_version = undef,
-  $path = '/home/*/public_html',
-  $overrides = ['FileInfo', 'AuthConfig', 'Limit', 'Indexes'],
-  $options = ['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec'],
-  $unmanaged_path = false,
-  $custom_fragment = undef,
+  Optional[String] $home            = undef,
+  Optional[String] $dir             = undef,
+  Optional[String[1]] $userdir      = undef,
+  Boolean $disable_root             = true,
+  Optional[String] $apache_version  = undef,
+  String $path                      = '/home/*/public_html',
+  Array[String] $overrides          = ['FileInfo', 'AuthConfig', 'Limit', 'Indexes'],
+  Array[String] $options            = ['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec'],
+  Boolean $unmanaged_path           = false,
+  Optional[String] $custom_fragment = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
index 2f87185131..212ef4a7bd 100644
--- a/manifests/mod/version.pp
+++ b/manifests/mod/version.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_version.html for additional documentation.
 #
 class apache::mod::version (
-  $apache_version = $apache::apache_version
+  Optional[String] $apache_version = $apache::apache_version
 ) {
   if ($facts['os']['family'] == 'debian' and versioncmp($apache_version, '2.4') >= 0) {
     warning("${module_name}: module version_module is built-in and can't be loaded")
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 258220a232..898c184d15 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -43,16 +43,16 @@
 # @see https://httpd.apache.org/docs/current/mod/worker.html for additional documentation.
 #
 class apache::mod::worker (
-  $startservers        = '2',
-  $maxclients          = '150',
-  $minsparethreads     = '25',
-  $maxsparethreads     = '75',
-  $threadsperchild     = '25',
-  $maxrequestsperchild = '0',
-  $serverlimit         = '25',
-  $threadlimit         = '64',
-  $listenbacklog       = '511',
-  $apache_version      = undef,
+  Variant[Integer,String] $startservers        = '2',
+  Variant[Integer,String] $maxclients          = '150',
+  Variant[Integer,String] $minsparethreads     = '25',
+  Variant[Integer,String] $maxsparethreads     = '75',
+  Variant[Integer,String] $threadsperchild     = '25',
+  Variant[Integer,String] $maxrequestsperchild = '0',
+  Variant[Integer,String] $serverlimit         = '25',
+  Variant[Integer,String] $threadlimit         = '64',
+  Variant[Integer,String] $listenbacklog       = '511',
+  Optional[String] $apache_version             = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index cf3253db9d..d582702273 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -28,14 +28,14 @@
 # @see https://github.com/GrahamDumpleton/mod_wsgi for additional documentation.
 # @note Unsupported platforms: SLES: all; RedHat: all; CentOS: all; OracleLinux: all; Scientific: all
 class apache::mod::wsgi (
-  $wsgi_restrict_embedded = undef,
-  $wsgi_socket_prefix     = $apache::params::wsgi_socket_prefix,
-  $wsgi_python_path       = undef,
-  $wsgi_python_home       = undef,
-  $wsgi_python_optimize   = undef,
-  $wsgi_application_group = undef,
-  $package_name           = undef,
-  $mod_path               = undef,
+  Optional[String] $wsgi_restrict_embedded                = undef,
+  Optional[String] $wsgi_socket_prefix                    = $apache::params::wsgi_socket_prefix,
+  Optional[String] $wsgi_python_path                      = undef,
+  Optional[String] $wsgi_python_home                      = undef,
+  Optional[Variant[Integer,String]] $wsgi_python_optimize = undef,
+  Optional[String] $wsgi_application_group                = undef,
+  Optional[String] $package_name                          = undef,
+  Optional[String] $mod_path                              = undef,
 ) inherits apache::params {
   include apache
   if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) {
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 854d86027a..8d76fa796a 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -2,8 +2,8 @@
 #
 # @api private
 define apache::mpm (
-  $lib_path       = $apache::lib_path,
-  $apache_version = $apache::apache_version,
+  String $lib_path                  = $apache::lib_path,
+  Optional[String] $apache_version  = $apache::apache_version,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
diff --git a/manifests/package.pp b/manifests/package.pp
index bc779097eb..06b8bc77bf 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -3,8 +3,8 @@
 #
 # @api private
 class apache::package (
-  $ensure     = 'present',
-  $mpm_module = $apache::params::mpm_module,
+  String $ensure     = 'present',
+  String $mpm_module = $apache::params::mpm_module,
 ) inherits apache::params {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
index 5001090c4c..b8b271e306 100644
--- a/manifests/peruser/multiplexer.pp
+++ b/manifests/peruser/multiplexer.pp
@@ -5,9 +5,9 @@
 #
 # @api private
 define apache::peruser::multiplexer (
-  $user = $apache::user,
-  $group = $apache::group,
-  $file = undef,
+  String $user            = $apache::user,
+  String $group           = $apache::group,
+  Optional[String] $file  = undef,
 ) {
   if ! $file {
     $filename = "${name}.conf"
diff --git a/manifests/peruser/processor.pp b/manifests/peruser/processor.pp
index 57c26fa9f8..9be3d6109a 100644
--- a/manifests/peruser/processor.pp
+++ b/manifests/peruser/processor.pp
@@ -3,9 +3,9 @@
 #
 # @api private
 define apache::peruser::processor (
-  $user,
-  $group,
-  $file = undef,
+  String $user,
+  String $group,
+  Optional[String] $file = undef,
 ) {
   if ! $file {
     $filename = "${name}.conf"
diff --git a/manifests/service.pp b/manifests/service.pp
index 7366e5fd31..6e5ce53d9f 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -3,11 +3,11 @@
 #
 # @api private
 class apache::service (
-  $service_name           = $apache::params::service_name,
-  Boolean $service_enable = true,
-  $service_ensure         = 'running',
-  Boolean $service_manage = true,
-  $service_restart        = undef
+  String $service_name                    = $apache::params::service_name,
+  Boolean $service_enable                 = true,
+  Variant[Boolean,String] $service_ensure = 'running',
+  Boolean $service_manage                 = true,
+  Optional[String] $service_restart       = undef
 ) {
   # The base class must be included first because parameter defaults depend on it
   if ! defined(Class['apache::params']) {
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a732e02700..8654831f65 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -70,11 +70,6 @@
 #   Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for 
 #   `additional_includes` in Apache 2.4 or newer.
 # 
-# @param additional_includes
-#   Specifies paths to additional static, virtual host-specific Apache configuration files. 
-#   You can use this parameter to implement a unique, custom configuration not supported by 
-#   this module.
-# 
 # @param aliases
 #   Passes a list of [hashes][hash] to the virtual host to create `Alias`, `AliasMatch`, 
 #   `ScriptAlias` or `ScriptAliasMatch` directives as per the `mod_alias` documentation.<br />
@@ -168,10 +163,6 @@
 #   ]
 #   ```
 # 
-# @param custom_fragment
-#   Passes a string of custom configuration directives to place at the end of the virtual 
-#   host configuration.
-# 
 # @param default_vhost
 #   Sets a given `apache::vhost` defined type as the default to serve requests that do not 
 #   match any other `apache::vhost` defined types.
@@ -357,10 +348,6 @@
 #   directive which sets the size of the window that is used for flow control from
 #   client to server and limits the amount of data the server has to buffer.
 # 
-# @param headers
-#   Adds lines to replace, merge, or remove response headers. See 
-#   [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
-# 
 # @param ip
 #   Sets the IP address the virtual host listens on. By default, uses Apache's default behavior 
 #   of listening on all IPs.
@@ -597,7 +584,7 @@
 #   This directive controls whether Apache should override error pages for proxied content.
 # 
 # @param options
-#   Sets the `Options` for the specified virtual host. For example:
+#   Sets the [`Options`](https://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. For example:
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
@@ -1415,31 +1402,6 @@
 #   }
 #   ```
 #
-# @param error_documents
-#   An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) 
-#   settings for the directory.
-#   ``` puppet
-#   apache::vhost { 'sample.example.net':
-#     directories => [
-#       { path            => '/srv/www',
-#         error_documents => [
-#           { 'error_code' => '503',
-#             'document'   => '/service-unavail',
-#           },
-#         ],
-#       },
-#     ],
-#   }
-#   ```
-#
-# @param h2_copy_files
-#   Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.<br />
-#   Note that you must declare `class {'apache::mod::http2': }` before using this directive.
-#
-# @param h2_push_resource
-#   Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.<br />
-#   Note that you must declare `class {'apache::mod::http2': }` before using this directive.
-#
 # @param headers
 #   Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 #   ``` puppet
@@ -1451,20 +1413,6 @@
 #     },
 #   }
 #   ```
-#
-# @param options
-#   Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the 
-#   given Directory block.
-#   ``` puppet
-#   apache::vhost { 'sample.example.net':
-#     docroot     => '/path/to/directory',
-#     directories => [
-#       { path    => '/path/to/directory',
-#         options => ['Indexes','FollowSymLinks','MultiViews'],
-#       },
-#     ],
-#   }
-#   ```
 # 
 # @param shib_compat_valid_user
 #   Default is Off, matching the behavior prior to this command's existence. Addresses a conflict 
@@ -1665,25 +1613,6 @@
 #   directive, which specifies whether the remote server certificate is checked for expiration 
 #   or not.
 #
-# @param ssl_options
-#   Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) 
-#   directive, which configures various SSL engine run-time options. This is the global 
-#   setting for the given virtual host and can be a string or an array.<br />
-#   A string:
-#   ``` puppet
-#   apache::vhost { 'sample.example.net':
-#     ...
-#     ssl_options => '+ExportCertData',
-#   }
-#   ```
-#   An array:
-#   ``` puppet
-#   apache::vhost { 'sample.example.net':
-#     ...
-#     ssl_options => ['+StrictRequire', '+ExportCertData'],
-#   }
-#   ```
-#
 # @param ssl_openssl_conf_cmd
 #   Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) 
 #   directive, which provides direct configuration of OpenSSL parameters.
@@ -1754,98 +1683,105 @@
 #   client request exceeds that limit, the server will return an error response
 #   instead of servicing the request.
 #
-# @param $use_servername_for_filenames
+# @param use_servername_for_filenames
 #   When set to true, default log / config file names will be derived from the sanitized
 #   value of the $servername parameter.
 #   When set to false (default), the existing behaviour of using the $name parameter
 #   will remain.
 #
-# @param $use_port_for_filenames
+# @param use_port_for_filenames
 #   When set to true and use_servername_for_filenames is also set to true, default log /
 #   config file names will be derived from the sanitized value of both the $servername and
 #   $port parameters.
 #   When set to false (default), the port is not included in the file names and may lead to
 #   duplicate declarations if two virtual hosts use the same domain.
 #
-# @param $mdomain
+# @param mdomain
 #   All the names in the list are managed as one Managed Domain (MD). mod_md will request
 #   one single certificate that is valid for all these names.
+#
+# @param proxy_requests
+#   Whether to accept proxy requests
+#
+# @param userdir
+#   Instances of apache::mod::userdir
+#
 define apache::vhost (
   Variant[Boolean,String] $docroot,
-  $manage_docroot                                                                   = true,
-  $virtual_docroot                                                                  = false,
-  $virtual_use_default_docroot                                                      = false,
-  $port                                                                             = undef,
-  $ip                                                                               = undef,
-  Boolean $ip_based                                                                 = false,
-  $add_listen                                                                       = true,
-  $docroot_owner                                                                    = 'root',
-  $docroot_group                                                                    = $apache::params::root_group,
-  $docroot_mode                                                                     = undef,
-  Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                                   = [],
-  Optional[Boolean] $protocols_honor_order                                          = undef,
-  $serveradmin                                                                      = undef,
-  Boolean $ssl                                                                      = false,
-  $ssl_cert                                                                         = $apache::default_ssl_cert,
-  $ssl_key                                                                          = $apache::default_ssl_key,
-  $ssl_chain                                                                        = $apache::default_ssl_chain,
-  $ssl_ca                                                                           = $apache::default_ssl_ca,
-  $ssl_crl_path                                                                     = $apache::default_ssl_crl_path,
-  $ssl_crl                                                                          = $apache::default_ssl_crl,
-  $ssl_crl_check                                                                    = $apache::default_ssl_crl_check,
-  $ssl_certs_dir                                                                    = $apache::params::ssl_certs_dir,
-  Boolean $ssl_reload_on_change                                                     = $apache::default_ssl_reload_on_change,
-  $ssl_protocol                                                                     = undef,
-  $ssl_cipher                                                                       = undef,
-  Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder     = undef,
-  Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client = undef,
-  $ssl_verify_depth                                                                 = undef,
-  Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef,
-  Optional[Integer[0]] $ssl_proxy_verify_depth                                      = undef,
-  $ssl_proxy_ca_cert                                                                = undef,
-  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn                              = undef,
-  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                            = undef,
-  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                          = undef,
-  $ssl_proxy_machine_cert                                                           = undef,
-  $ssl_proxy_machine_cert_chain                                                     = undef,
-  $ssl_proxy_cipher_suite                                                           = undef,
-  $ssl_proxy_protocol                                                               = undef,
-  $ssl_options                                                                      = undef,
-  $ssl_openssl_conf_cmd                                                             = undef,
-  Boolean $ssl_proxyengine                                                          = false,
-  Optional[Boolean] $ssl_stapling                                                   = undef,
-  $ssl_stapling_timeout                                                             = undef,
-  $ssl_stapling_return_errors                                                       = undef,
-  Optional[String] $ssl_user_name                                                   = undef,
-  $priority                                                                         = undef,
-  Boolean $default_vhost                                                            = false,
-  $servername                                                                       = $name,
-  $serveraliases                                                                    = [],
-  $options                                                                          = ['Indexes','FollowSymLinks','MultiViews'],
-  $override                                                                         = ['None'],
-  $directoryindex                                                                   = '',
-  $vhost_name                                                                       = '*',
-  $logroot                                                                          = $apache::logroot,
-  Enum['directory', 'absent'] $logroot_ensure                                       = 'directory',
-  $logroot_mode                                                                     = undef,
-  $logroot_owner                                                                    = undef,
-  $logroot_group                                                                    = undef,
-  Optional[Apache::LogLevel] $log_level                                             = undef,
-  Boolean $access_log                                                               = true,
-  $access_log_file                                                                  = false,
-  $access_log_pipe                                                                  = false,
-  $access_log_syslog                                                                = false,
-  $access_log_format                                                                = false,
-  $access_log_env_var                                                               = false,
-  Optional[Array] $access_logs                                                      = undef,
-  Boolean $use_servername_for_filenames                                             = false,
-  Boolean $use_port_for_filenames                                                   = false,
-  $aliases                                                                          = undef,
-  Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                  = undef,
-  Boolean $error_log                                                                = true,
-  $error_log_file                                                                   = undef,
-  $error_log_pipe                                                                   = undef,
-  $error_log_syslog                                                                 = undef,
+  Boolean $manage_docroot                                                             = true,
+  Variant[Boolean,String] $virtual_docroot                                            = false,
+  Boolean $virtual_use_default_docroot                                                = false,
+  Optional[Variant[Array[Integer],Array[String],Integer,String]] $port                = undef,
+  Optional[Variant[Array[String],String]] $ip                                         = undef,
+  Boolean $ip_based                                                                   = false,
+  Boolean $add_listen                                                                 = true,
+  String $docroot_owner                                                               = 'root',
+  String $docroot_group                                                               = $apache::params::root_group,
+  Optional[Variant[Integer,String]] $docroot_mode                                     = undef,
+  Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                                     = [],
+  Optional[Boolean] $protocols_honor_order                                            = undef,
+  Optional[String] $serveradmin                                                       = undef,
+  Boolean $ssl                                                                        = false,
+  Optional[String] $ssl_cert                                                          = $apache::default_ssl_cert,
+  Optional[String] $ssl_key                                                           = $apache::default_ssl_key,
+  Optional[String] $ssl_chain                                                         = $apache::default_ssl_chain,
+  Optional[String] $ssl_ca                                                            = $apache::default_ssl_ca,
+  Optional[String] $ssl_crl_path                                                      = $apache::default_ssl_crl_path,
+  Optional[String] $ssl_crl                                                           = $apache::default_ssl_crl,
+  Optional[String] $ssl_crl_check                                                     = $apache::default_ssl_crl_check,
+  Optional[String] $ssl_certs_dir                                                     = $apache::params::ssl_certs_dir,
+  Boolean $ssl_reload_on_change                                                       = $apache::default_ssl_reload_on_change,
+  Optional[Variant[Array[String],String]] $ssl_protocol                               = undef,
+  Optional[Variant[Array[String],String]] $ssl_cipher                                 = undef,
+  Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder       = undef,
+  Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client  = undef,
+  Optional[Variant[Integer,String]] $ssl_verify_depth                                 = undef,
+  Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify   = undef,
+  Optional[Integer[0]] $ssl_proxy_verify_depth                                        = undef,
+  Optional[String] $ssl_proxy_ca_cert                                                 = undef,
+  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn                                = undef,
+  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                              = undef,
+  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                            = undef,
+  Optional[String] $ssl_proxy_machine_cert                                            = undef,
+  Optional[String] $ssl_proxy_machine_cert_chain                                      = undef,
+  Optional[String] $ssl_proxy_cipher_suite                                            = undef,
+  Optional[String] $ssl_proxy_protocol                                                = undef,
+  Optional[Variant[Array[String],String]] $ssl_options                                = undef,
+  Optional[String] $ssl_openssl_conf_cmd                                              = undef,
+  Boolean $ssl_proxyengine                                                            = false,
+  Optional[Boolean] $ssl_stapling                                                     = undef,
+  Optional[Variant[Integer,String]] $ssl_stapling_timeout                             = undef,
+  Optional[Enum['on', 'off']] $ssl_stapling_return_errors                             = undef,
+  Optional[String] $ssl_user_name                                                     = undef,
+  Optional[Variant[Integer,String,Boolean]] $priority                                 = undef,
+  Boolean $default_vhost                                                              = false,
+  Optional[String] $servername                                                        = $name,
+  Variant[Array[String],String] $serveraliases                                        = [],
+  Array[String] $options                                                              = ['Indexes','FollowSymLinks','MultiViews'],
+  Array[String] $override                                                             = ['None'],
+  Optional[String] $directoryindex                                                    = undef,
+  String $vhost_name                                                                  = '*',
+  String $logroot                                                                     = $apache::logroot,
+  Enum['directory', 'absent'] $logroot_ensure                                         = 'directory',
+  Optional[String] $logroot_mode                                                      = undef,
+  Optional[String] $logroot_owner                                                     = undef,
+  Optional[String] $logroot_group                                                     = undef,
+  Optional[Apache::LogLevel] $log_level                                               = undef,
+  Boolean $access_log                                                                 = true,
+  Variant[Boolean,String] $access_log_file                                            = false,
+  Variant[Boolean,String] $access_log_pipe                                            = false,
+  Variant[Boolean,String] $access_log_syslog                                          = false,
+  Variant[Boolean,String] $access_log_format                                          = false,
+  Variant[Boolean,String] $access_log_env_var                                         = false,
+  Optional[Array] $access_logs                                                        = undef,
+  Boolean $use_servername_for_filenames                                               = false,
+  Boolean $use_port_for_filenames                                                     = false,
+  Optional[Variant[Array[Hash],Hash,String]] $aliases                                 = undef,
+  Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                    = undef,
+  Boolean $error_log                                                                  = true,
+  Optional[String] $error_log_file                                                    = undef,
+  Optional[String] $error_log_pipe                                                    = undef,
+  Optional[Variant[String,Boolean]] $error_log_syslog                                 = undef,
   Optional[
     Array[
       Variant[
@@ -1853,179 +1789,179 @@
         Hash[String, Enum['connection', 'request']]
       ]
     ]
-  ]       $error_log_format                                                         = undef,
+  ]       $error_log_format                                                           = undef,
   Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]] $http_protocol_options = undef,
-  $modsec_audit_log                                                                 = undef,
-  $modsec_audit_log_file                                                            = undef,
-  $modsec_audit_log_pipe                                                            = undef,
-  $error_documents                                                                  = [],
-  Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource       = undef,
-  $scriptalias                                                                      = undef,
-  $scriptaliases                                                                    = [],
-  Optional[Integer] $limitreqfieldsize                                              = undef,
-  Optional[Integer] $limitreqfields                                                 = undef,
-  Optional[Integer] $limitreqline                                                   = undef,
-  Optional[Integer] $limitreqbody                                                   = undef,
-  $proxy_dest                                                                       = undef,
-  $proxy_dest_match                                                                 = undef,
-  $proxy_dest_reverse_match                                                         = undef,
-  $proxy_pass                                                                       = undef,
-  $proxy_pass_match                                                                 = undef,
-  Boolean $proxy_requests                                                           = false,
-  $suphp_addhandler                                                                 = $apache::params::suphp_addhandler,
-  Enum['on', 'off'] $suphp_engine                                                   = $apache::params::suphp_engine,
-  $suphp_configpath                                                                 = $apache::params::suphp_configpath,
-  $php_flags                                                                        = {},
-  $php_values                                                                       = {},
-  $php_admin_flags                                                                  = {},
-  $php_admin_values                                                                 = {},
-  $no_proxy_uris                                                                    = [],
-  $no_proxy_uris_match                                                              = [],
-  $proxy_preserve_host                                                              = false,
-  $proxy_add_headers                                                                = undef,
-  $proxy_error_override                                                             = false,
-  $redirect_source                                                                  = '/',
-  $redirect_dest                                                                    = undef,
-  $redirect_status                                                                  = undef,
-  $redirectmatch_status                                                             = undef,
-  $redirectmatch_regexp                                                             = undef,
-  $redirectmatch_dest                                                               = undef,
-  $headers                                                                          = undef,
-  $request_headers                                                                  = undef,
-  $filters                                                                          = undef,
-  Optional[Array] $rewrites                                                         = undef,
-  $rewrite_base                                                                     = undef,
-  $rewrite_rule                                                                     = undef,
-  $rewrite_cond                                                                     = undef,
-  $rewrite_inherit                                                                  = false,
-  $setenv                                                                           = [],
-  $setenvif                                                                         = [],
-  $setenvifnocase                                                                   = [],
-  $block                                                                            = [],
-  Enum['absent', 'present'] $ensure                                                 = 'present',
-  $wsgi_application_group                                                           = undef,
-  Optional[Variant[String,Hash]] $wsgi_daemon_process                               = undef,
-  Optional[Hash] $wsgi_daemon_process_options                                       = undef,
-  $wsgi_import_script                                                               = undef,
-  Optional[Hash] $wsgi_import_script_options                                        = undef,
-  $wsgi_process_group                                                               = undef,
-  Optional[Hash] $wsgi_script_aliases_match                                         = undef,
-  Optional[Hash] $wsgi_script_aliases                                               = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $wsgi_pass_authorization                 = undef,
-  $wsgi_chunked_request                                                             = undef,
-  Optional[String] $custom_fragment                                                 = undef,
-  Optional[Hash] $itk                                                               = undef,
-  $action                                                                           = undef,
-  $fastcgi_server                                                                   = undef,
-  $fastcgi_socket                                                                   = undef,
-  $fastcgi_dir                                                                      = undef,
-  $fastcgi_idle_timeout                                                             = undef,
-  $additional_includes                                                              = [],
-  $use_optional_includes                                                            = $apache::use_optional_includes,
-  $apache_version                                                                   = $apache::apache_version,
-  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                    = undef,
-  Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                           = undef,
-
-  Optional[Boolean] $h2_copy_files                                                  = undef,
-  Optional[Boolean] $h2_direct                                                      = undef,
-  Optional[Boolean] $h2_early_hints                                                 = undef,
-  Optional[Integer] $h2_max_session_streams                                         = undef,
-  Optional[Boolean] $h2_modern_tls_only                                             = undef,
-  Optional[Boolean] $h2_push                                                        = undef,
-  Optional[Integer] $h2_push_diary_size                                             = undef,
-  Array[String]     $h2_push_priority                                               = [],
-  Array[String]     $h2_push_resource                                               = [],
-  Optional[Boolean] $h2_serialize_headers                                           = undef,
-  Optional[Integer] $h2_stream_max_mem_size                                         = undef,
-  Optional[Integer] $h2_tls_cool_down_secs                                          = undef,
-  Optional[Integer] $h2_tls_warm_up_size                                            = undef,
-  Optional[Boolean] $h2_upgrade                                                     = undef,
-  Optional[Integer] $h2_window_size                                                 = undef,
-
-  Optional[Boolean] $passenger_enabled                                              = undef,
-  Optional[String] $passenger_base_uri                                              = undef,
-  Optional[Stdlib::Absolutepath] $passenger_ruby                                    = undef,
-  Optional[Stdlib::Absolutepath] $passenger_python                                  = undef,
-  Optional[Stdlib::Absolutepath] $passenger_nodejs                                  = undef,
-  Optional[String] $passenger_meteor_app_settings                                   = undef,
-  Optional[String] $passenger_app_env                                               = undef,
-  Optional[Stdlib::Absolutepath] $passenger_app_root                                = undef,
-  Optional[String] $passenger_app_group_name                                        = undef,
-  Optional[String] $passenger_app_start_command                                     = undef,
-  Optional[Enum['meteor', 'node', 'rack', 'wsgi']] $passenger_app_type              = undef,
-  Optional[String] $passenger_startup_file                                          = undef,
-  Optional[String] $passenger_restart_dir                                           = undef,
-  Optional[Enum['direct', 'smart']] $passenger_spawn_method                         = undef,
-  Optional[Boolean] $passenger_load_shell_envvars                                   = undef,
-  Optional[Boolean] $passenger_preload_bundler                                      = undef,
-  Optional[Boolean] $passenger_rolling_restarts                                     = undef,
-  Optional[Boolean] $passenger_resist_deployment_errors                             = undef,
-  Optional[String] $passenger_user                                                  = undef,
-  Optional[String] $passenger_group                                                 = undef,
-  Optional[Boolean] $passenger_friendly_error_pages                                 = undef,
-  Optional[Integer] $passenger_min_instances                                        = undef,
-  Optional[Integer] $passenger_max_instances                                        = undef,
-  Optional[Integer] $passenger_max_preloader_idle_time                              = undef,
-  Optional[Integer] $passenger_force_max_concurrent_requests_per_process            = undef,
-  Optional[Integer] $passenger_start_timeout                                        = undef,
-  Optional[Enum['process', 'thread']] $passenger_concurrency_model                  = undef,
-  Optional[Integer] $passenger_thread_count                                         = undef,
-  Optional[Integer] $passenger_max_requests                                         = undef,
-  Optional[Integer] $passenger_max_request_time                                     = undef,
-  Optional[Integer] $passenger_memory_limit                                         = undef,
-  Optional[Integer] $passenger_stat_throttle_rate                                   = undef,
-  Optional[Variant[String,Array[String]]] $passenger_pre_start                      = undef,
-  Optional[Boolean] $passenger_high_performance                                     = undef,
-  Optional[Boolean] $passenger_buffer_upload                                        = undef,
-  Optional[Boolean] $passenger_buffer_response                                      = undef,
-  Optional[Boolean] $passenger_error_override                                       = undef,
-  Optional[Integer] $passenger_max_request_queue_size                               = undef,
-  Optional[Integer] $passenger_max_request_queue_time                               = undef,
-  Optional[Boolean] $passenger_sticky_sessions                                      = undef,
-  Optional[String] $passenger_sticky_sessions_cookie_name                           = undef,
-  Optional[String] $passenger_sticky_sessions_cookie_attributes                     = undef,
-  Optional[Boolean] $passenger_allow_encoded_slashes                                = undef,
-  Optional[String] $passenger_app_log_file                                          = undef,
-  Optional[Boolean] $passenger_debugger                                             = undef,
-  Optional[Integer] $passenger_lve_min_uid                                          = undef,
-  $add_default_charset                                                              = undef,
-  $modsec_disable_vhost                                                             = undef,
-  Optional[Variant[Hash, Array]] $modsec_disable_ids                                = undef,
-  $modsec_disable_ips                                                               = undef,
-  Optional[Variant[Hash, Array]] $modsec_disable_msgs                               = undef,
-  Optional[Variant[Hash, Array]] $modsec_disable_tags                               = undef,
-  $modsec_body_limit                                                                = undef,
-  $jk_mounts                                                                        = undef,
-  Boolean $auth_kerb                                                                = false,
-  $krb_method_negotiate                                                             = 'on',
-  $krb_method_k5passwd                                                              = 'on',
-  $krb_authoritative                                                                = 'on',
-  $krb_auth_realms                                                                  = [],
-  $krb_5keytab                                                                      = undef,
-  $krb_local_user_mapping                                                           = undef,
-  $krb_verify_kdc                                                                   = 'on',
-  $krb_servicename                                                                  = 'HTTP',
-  $krb_save_credentials                                                             = 'off',
-  Optional[Enum['on', 'off']] $keepalive                                            = undef,
-  $keepalive_timeout                                                                = undef,
-  $max_keepalive_requests                                                           = undef,
-  $cas_attribute_prefix                                                             = undef,
-  $cas_attribute_delimiter                                                          = undef,
-  $cas_root_proxied_as                                                              = undef,
-  $cas_scrub_request_headers                                                        = undef,
-  $cas_sso_enabled                                                                  = undef,
-  $cas_login_url                                                                    = undef,
-  $cas_validate_url                                                                 = undef,
-  $cas_validate_saml                                                                = undef,
-  $cas_cookie_path                                                                  = undef,
-  Optional[String] $shib_compat_valid_user                                          = undef,
-  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name        = undef,
-  Optional[Variant[String,Array[String]]] $comment                                  = undef,
-  Hash $define                                                                      = {},
-  Boolean $auth_oidc                                                                = false,
-  Optional[Apache::OIDCSettings] $oidc_settings                                     = undef,
-  Optional[Variant[Boolean,String]] $mdomain                                        = undef,
-  Optional[Variant[String[1],Array[String[1]]]] $userdir                            = undef,
+  Optional[Variant[String,Boolean]] $modsec_audit_log                                 = undef,
+  Optional[String] $modsec_audit_log_file                                             = undef,
+  Optional[String] $modsec_audit_log_pipe                                             = undef,
+  Variant[Array[Hash],String] $error_documents                                        = [],
+  Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource         = undef,
+  Optional[String] $scriptalias                                                       = undef,
+  Array[Hash] $scriptaliases                                                          = [],
+  Optional[Integer] $limitreqfieldsize                                                = undef,
+  Optional[Integer] $limitreqfields                                                   = undef,
+  Optional[Integer] $limitreqline                                                     = undef,
+  Optional[Integer] $limitreqbody                                                     = undef,
+  Optional[String] $proxy_dest                                                        = undef,
+  Optional[String] $proxy_dest_match                                                  = undef,
+  Optional[String] $proxy_dest_reverse_match                                          = undef,
+  Optional[Variant[Array[Hash],Hash]] $proxy_pass                                     = undef,
+  Optional[Variant[Array[Hash],Hash]] $proxy_pass_match                               = undef,
+  Boolean $proxy_requests                                                             = false,
+  String $suphp_addhandler                                                            = $apache::params::suphp_addhandler,
+  Enum['on', 'off'] $suphp_engine                                                     = $apache::params::suphp_engine,
+  Optional[String] $suphp_configpath                                                  = $apache::params::suphp_configpath,
+  Hash $php_flags                                                                     = {},
+  Hash $php_values                                                                    = {},
+  Variant[Array[String],Hash] $php_admin_flags                                        = {},
+  Variant[Array[String],Hash] $php_admin_values                                       = {},
+  Variant[Array[String],String] $no_proxy_uris                                        = [],
+  Variant[Array[String],String] $no_proxy_uris_match                                  = [],
+  Boolean $proxy_preserve_host                                                        = false,
+  Optional[Variant[String,Boolean]] $proxy_add_headers                                = undef,
+  Boolean $proxy_error_override                                                       = false,
+  Variant[String,Array[String]] $redirect_source                                       = '/',
+  Optional[Variant[Array[String],String]] $redirect_dest                              = undef,
+  Optional[Variant[Array[String],String]] $redirect_status                            = undef,
+  Optional[Variant[Array[String],String]] $redirectmatch_status                       = undef,
+  Optional[Variant[Array[String],String]] $redirectmatch_regexp                       = undef,
+  Optional[Variant[Array[String],String]] $redirectmatch_dest                         = undef,
+  Optional[String] $headers                                                           = undef,
+  Optional[Array[String]] $request_headers                                            = undef,
+  Optional[Array[String]] $filters                                                    = undef,
+  Optional[Array] $rewrites                                                           = undef,
+  Optional[String] $rewrite_base                                                      = undef,
+  Optional[Variant[Array[String],String]] $rewrite_rule                               = undef,
+  Optional[Variant[Array[String],String]] $rewrite_cond                               = undef,
+  Boolean $rewrite_inherit                                                            = false,
+  Variant[Array[String],String] $setenv                                               = [],
+  Variant[Array[String],String] $setenvif                                             = [],
+  Variant[Array[String],String] $setenvifnocase                                       = [],
+  Variant[Array[String],String] $block                                                = [],
+  Enum['absent', 'present'] $ensure                                                   = 'present',
+  Optional[String] $wsgi_application_group                                            = undef,
+  Optional[Variant[String,Hash]] $wsgi_daemon_process                                 = undef,
+  Optional[Hash] $wsgi_daemon_process_options                                         = undef,
+  Optional[String] $wsgi_import_script                                                = undef,
+  Optional[Hash] $wsgi_import_script_options                                          = undef,
+  Optional[String] $wsgi_process_group                                                = undef,
+  Optional[Hash] $wsgi_script_aliases_match                                           = undef,
+  Optional[Hash] $wsgi_script_aliases                                                 = undef,
+  Optional[Enum['on', 'off', 'On', 'Off']] $wsgi_pass_authorization                   = undef,
+  Optional[Enum['On', 'Off']] $wsgi_chunked_request                                   = undef,
+  Optional[String] $custom_fragment                                                   = undef,
+  Optional[Hash] $itk                                                                 = undef,
+  Optional[String] $action                                                            = undef,
+  Optional[String] $fastcgi_server                                                    = undef,
+  Optional[String] $fastcgi_socket                                                    = undef,
+  Optional[String] $fastcgi_dir                                                       = undef,
+  Optional[Variant[Integer,String]] $fastcgi_idle_timeout                             = undef,
+  Variant[Array[String],String] $additional_includes                                  = [],
+  Boolean $use_optional_includes                                                      = $apache::use_optional_includes,
+  Optional[String] $apache_version                                                    = $apache::apache_version,
+  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                      = undef,
+  Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                             = undef,
+
+  Optional[Boolean] $h2_copy_files                                                    = undef,
+  Optional[Boolean] $h2_direct                                                        = undef,
+  Optional[Boolean] $h2_early_hints                                                   = undef,
+  Optional[Integer] $h2_max_session_streams                                           = undef,
+  Optional[Boolean] $h2_modern_tls_only                                               = undef,
+  Optional[Boolean] $h2_push                                                          = undef,
+  Optional[Integer] $h2_push_diary_size                                               = undef,
+  Array[String]     $h2_push_priority                                                 = [],
+  Array[String]     $h2_push_resource                                                 = [],
+  Optional[Boolean] $h2_serialize_headers                                             = undef,
+  Optional[Integer] $h2_stream_max_mem_size                                           = undef,
+  Optional[Integer] $h2_tls_cool_down_secs                                            = undef,
+  Optional[Integer] $h2_tls_warm_up_size                                              = undef,
+  Optional[Boolean] $h2_upgrade                                                       = undef,
+  Optional[Integer] $h2_window_size                                                   = undef,
+
+  Optional[Boolean] $passenger_enabled                                                = undef,
+  Optional[String] $passenger_base_uri                                                = undef,
+  Optional[Stdlib::Absolutepath] $passenger_ruby                                      = undef,
+  Optional[Stdlib::Absolutepath] $passenger_python                                    = undef,
+  Optional[Stdlib::Absolutepath] $passenger_nodejs                                    = undef,
+  Optional[String] $passenger_meteor_app_settings                                     = undef,
+  Optional[String] $passenger_app_env                                                 = undef,
+  Optional[Stdlib::Absolutepath] $passenger_app_root                                  = undef,
+  Optional[String] $passenger_app_group_name                                          = undef,
+  Optional[String] $passenger_app_start_command                                       = undef,
+  Optional[Enum['meteor', 'node', 'rack', 'wsgi']] $passenger_app_type                = undef,
+  Optional[String] $passenger_startup_file                                            = undef,
+  Optional[String] $passenger_restart_dir                                             = undef,
+  Optional[Enum['direct', 'smart']] $passenger_spawn_method                           = undef,
+  Optional[Boolean] $passenger_load_shell_envvars                                     = undef,
+  Optional[Boolean] $passenger_preload_bundler                                        = undef,
+  Optional[Boolean] $passenger_rolling_restarts                                       = undef,
+  Optional[Boolean] $passenger_resist_deployment_errors                               = undef,
+  Optional[String] $passenger_user                                                    = undef,
+  Optional[String] $passenger_group                                                   = undef,
+  Optional[Boolean] $passenger_friendly_error_pages                                   = undef,
+  Optional[Integer] $passenger_min_instances                                          = undef,
+  Optional[Integer] $passenger_max_instances                                          = undef,
+  Optional[Integer] $passenger_max_preloader_idle_time                                = undef,
+  Optional[Integer] $passenger_force_max_concurrent_requests_per_process              = undef,
+  Optional[Integer] $passenger_start_timeout                                          = undef,
+  Optional[Enum['process', 'thread']] $passenger_concurrency_model                    = undef,
+  Optional[Integer] $passenger_thread_count                                           = undef,
+  Optional[Integer] $passenger_max_requests                                           = undef,
+  Optional[Integer] $passenger_max_request_time                                       = undef,
+  Optional[Integer] $passenger_memory_limit                                           = undef,
+  Optional[Integer] $passenger_stat_throttle_rate                                     = undef,
+  Optional[Variant[String,Array[String]]] $passenger_pre_start                        = undef,
+  Optional[Boolean] $passenger_high_performance                                       = undef,
+  Optional[Boolean] $passenger_buffer_upload                                          = undef,
+  Optional[Boolean] $passenger_buffer_response                                        = undef,
+  Optional[Boolean] $passenger_error_override                                         = undef,
+  Optional[Integer] $passenger_max_request_queue_size                                 = undef,
+  Optional[Integer] $passenger_max_request_queue_time                                 = undef,
+  Optional[Boolean] $passenger_sticky_sessions                                        = undef,
+  Optional[String] $passenger_sticky_sessions_cookie_name                             = undef,
+  Optional[String] $passenger_sticky_sessions_cookie_attributes                       = undef,
+  Optional[Boolean] $passenger_allow_encoded_slashes                                  = undef,
+  Optional[String] $passenger_app_log_file                                            = undef,
+  Optional[Boolean] $passenger_debugger                                               = undef,
+  Optional[Integer] $passenger_lve_min_uid                                            = undef,
+  Optional[String] $add_default_charset                                               = undef,
+  Boolean $modsec_disable_vhost                                                       = false,
+  Optional[Variant[Hash, Array]] $modsec_disable_ids                                  = undef,
+  Optional[Array[String]] $modsec_disable_ips                                         = undef,
+  Optional[Variant[Hash, Array]] $modsec_disable_msgs                                 = undef,
+  Optional[Variant[Hash, Array]] $modsec_disable_tags                                 = undef,
+  Optional[String] $modsec_body_limit                                                 = undef,
+  Optional[Array[Hash]] $jk_mounts                                                    = undef,
+  Boolean $auth_kerb                                                                  = false,
+  Enum['on', 'off'] $krb_method_negotiate                                             = 'on',
+  Enum['on', 'off'] $krb_method_k5passwd                                              = 'on',
+  Enum['on', 'off'] $krb_authoritative                                                = 'on',
+  Array[String] $krb_auth_realms                                                      = [],
+  Optional[String] $krb_5keytab                                                       = undef,
+  Optional[Enum['on', 'off']] $krb_local_user_mapping                                 = undef,
+  Enum['on', 'off'] $krb_verify_kdc                                                   = 'on',
+  String $krb_servicename                                                             = 'HTTP',
+  Enum['on', 'off'] $krb_save_credentials                                             = 'off',
+  Optional[Enum['on', 'off']] $keepalive                                              = undef,
+  Optional[Variant[Integer,String]] $keepalive_timeout                                = undef,
+  Optional[Variant[Integer,String]] $max_keepalive_requests                           = undef,
+  Optional[String] $cas_attribute_prefix                                              = undef,
+  Optional[String] $cas_attribute_delimiter                                           = undef,
+  Optional[String] $cas_root_proxied_as                                               = undef,
+  Boolean $cas_scrub_request_headers                                                  = false,
+  Boolean $cas_sso_enabled                                                            = false,
+  Optional[String] $cas_login_url                                                     = undef,
+  Optional[String] $cas_validate_url                                                  = undef,
+  Boolean $cas_validate_saml                                                          = false,
+  Optional[String] $cas_cookie_path                                                   = undef,
+  Optional[String] $shib_compat_valid_user                                            = undef,
+  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name          = undef,
+  Optional[Variant[String,Array[String]]] $comment                                    = undef,
+  Hash $define                                                                        = {},
+  Boolean $auth_oidc                                                                  = false,
+  Optional[Apache::OIDCSettings] $oidc_settings                                       = undef,
+  Optional[Variant[Boolean,String]] $mdomain                                          = undef,
+  Optional[Variant[String[1],Array[String[1]]]] $userdir                              = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index 966f7bba54..3e6d261b08 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -16,10 +16,10 @@
 #   Specifies whether to validate the configuration file before notifying the Apache service.
 #
 define apache::vhost::custom (
-  $content,
-  $ensure = 'present',
-  Variant[Integer,String,Boolean] $priority = '25',
-  $verify_config = true,
+  String $content,
+  String $ensure                    = 'present',
+  Variant[Integer,String] $priority = '25',
+  Boolean $verify_config            = true,
 ) {
   include apache
 
diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
index 459839de0a..fa5ea36ab1 100644
--- a/manifests/vhost/fragment.pp
+++ b/manifests/vhost/fragment.pp
@@ -14,6 +14,9 @@
 # @param order
 #   The order to insert the fragment at
 #
+# @param port
+#   The port to use
+#
 # @example With a vhost without priority
 #   include apache
 #   apache::vhost { 'myvhost':
@@ -55,10 +58,10 @@
 #
 define apache::vhost::fragment (
   String[1] $vhost,
-  Optional[Integer[0]] $port = undef,
+  Optional[Integer[0]] $port                          = undef,
   Optional[Variant[Integer,String,Boolean]] $priority = undef,
-  Optional[String] $content = undef,
-  Integer[0] $order = 900,
+  Optional[String] $content                           = undef,
+  Integer[0] $order                                   = 900,
 ) {
   # This copies the logic from apache::vhost
   if $priority {
diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp
index 6d0fcf27f2..a212a5c31a 100644
--- a/manifests/vhosts.pp
+++ b/manifests/vhosts.pp
@@ -19,7 +19,7 @@
 #   `apache::vhost` defined type's parameters.
 #
 class apache::vhosts (
-  $vhosts = {},
+  Hash $vhosts = {},
 ) {
   include apache
   create_resources('apache::vhost', $vhosts)

From 7a042d57bb3c9408dc2e737672af331667742064 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Mon, 30 May 2022 09:38:43 +0100
Subject: [PATCH 1923/2267] (maint) Remove legacy facts from
 spec_helper_local.rb shared contexts

---
 spec/spec_helper_local.rb | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 3fa4f831a2..059d7281c1 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -60,13 +60,6 @@
 shared_context 'Fedora 28' do
   let :facts do
     {
-      # Legacy
-      id: 'root',
-      osfamily: 'RedHat',
-      operatingsystem: 'Fedora',
-      operatingsystemrelease: '28',
-      operatingsystemmajrelease: '28',
-      # Modern
       kernel: 'Linux',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       os: {
@@ -87,12 +80,6 @@
 shared_context 'FreeBSD 9' do
   let :facts do
     {
-      # Legacy
-      osfamily: 'FreeBSD',
-      operatingsystemrelease: '9',
-      operatingsystem: 'FreeBSD',
-      id: 'root',
-      # Modern
       kernel: 'FreeBSD',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       os: {
@@ -112,12 +99,6 @@
 shared_context 'FreeBSD 10' do
   let :facts do
     {
-      # Legacy
-      id: 'root',
-      osfamily: 'FreeBSD',
-      operatingsystem: 'FreeBSD',
-      operatingsystemrelease: '10',
-      # Modern
       kernel: 'FreeBSD',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       os: {
@@ -137,13 +118,6 @@
 shared_context 'Gentoo' do
   let :facts do
     {
-      # Legacy
-      id: 'root',
-      osfamily: 'Gentoo',
-      operatingsystem: 'Gentoo',
-      operatingsystemrelease: '2.7',
-      operatingsystemmajrelease: '2.7',
-      # Modern
       kernel: 'Linux',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin',
       os: {
@@ -164,10 +138,6 @@
 shared_context 'Darwin' do
   let :facts do
     {
-      # Legacy
-      osfamily: 'Darwin',
-      operatingsystemrelease: '13.1.0',
-      # Modern
       os: {
         family: 'Darwin',
         release: {
@@ -181,12 +151,6 @@
 shared_context 'Unsupported OS' do
   let :facts do
     {
-      # Legacy
-      osfamily: 'Magic',
-      operatingsystemrelease: '0',
-      operatingsystem: 'Magic',
-      id: 'root',
-      # Modern
       kernel: 'Linux',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       os: {

From a4c753aede2fe35a98330e0cf4358a2d7164a816 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Mon, 30 May 2022 11:16:34 +0100
Subject: [PATCH 1924/2267] (maint) Add override_facts method to
 spec_helper_local.rb

---
 spec/classes/mod/jk_spec.rb         |  4 ++--
 spec/classes/mod/proxy_html_spec.rb | 10 ++------
 spec/spec_helper_local.rb           | 36 +++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index ba22f9e6d9..767ace9f7b 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -67,7 +67,7 @@
     include_examples 'Debian 11'
 
     context 'with only required facts and default parameters' do
-      let(:facts) { super().merge(networking: { ip: default_ip }) }
+      let(:facts) { override_facts(super(), networking: { ip: default_ip }) }
       let(:pre_condition) do
         'include apache'
       end
@@ -102,7 +102,7 @@
     end
 
     context 'with required facts' do
-      let(:facts) { super().merge(networking: { ip: default_ip }) }
+      let(:facts) { override_facts(super(), networking: { ip: default_ip }) }
 
       context 'and default parameters' do
         let(:mod_dir) { mod_dir }
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 50fde8d158..43f96c35b1 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -19,19 +19,13 @@
     include_examples 'Debian 11'
 
     context 'on i386' do
-      let(:facts) do
-        super().merge(os: { family: 'Debian', name: 'Debian', release: { full: '11', major: '11' }, hardware: 'i686', },
-                      architecture: 'i386')
-      end
+      let(:facts) { override_facts(super(), os: { hardware: 'i386' }) }
 
       it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
       it_behaves_like 'debian', ['/usr/lib/i386-linux-gnu/libxml2.so.2']
     end
     context 'on x64' do
-      let(:facts) do
-        super().merge(os: { family: 'Debian', name: 'Debian', release: { full: '11', major: '11' }, hardware: 'x86_64', },
-                      architecture: 'amd64')
-      end
+      let(:facts) { override_facts(super(), os: { architecture: 'x86_64' }) }
 
       it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
       it_behaves_like 'debian', ['/usr/lib/x86_64-linux-gnu/libxml2.so.2']
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 059d7281c1..ace0d54447 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -170,3 +170,39 @@
 shared_context 'SLES 12' do
   let(:facts) { on_supported_os['sles-12-x86_64'] }
 end
+
+# Override facts
+# Taken from: https://github.com/voxpupuli/voxpupuli-test/blob/master/lib/voxpupuli/test/facts.rb
+#
+# This doesn't use deep_merge because that's highly unpredictable. It can merge
+# nested hashes in place, modifying the original. It's also unable to override
+# true to false.
+#
+# A deep copy is obtained by using Marshal so it can be modified in place. Then
+# it recursively overrides values. If the result is a hash, it's recursed into.
+#
+# A typical example:
+#
+# let(:facts) do
+#   override_facts(super(), os: {'selinux' => {'enabled' => false}})
+# end
+def override_facts(base_facts, **overrides)
+  facts = Marshal.load(Marshal.dump(base_facts))
+  apply_overrides!(facts, overrides, false)
+  facts
+end
+
+# A private helper to override_facts
+def apply_overrides!(facts, overrides, enforce_strings)
+  overrides.each do |key, value|
+    # Nested facts are strings
+    key = key.to_s if enforce_strings
+
+    if value.is_a?(Hash)
+      facts[key] = {} unless facts.key?(key)
+      apply_overrides!(facts[key], value, true)
+    else
+      facts[key] = value
+    end
+  end
+end

From a1c95aa864e8955398627beec759f59466ede4c3 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 7 Jun 2022 10:58:06 +0100
Subject: [PATCH 1925/2267] (syntax) Additional syntax fixes

---
 manifests/custom_config.pp | 24 +++++++--------
 manifests/mod/authn_dbd.pp | 14 ++++-----
 manifests/mod/event.pp     | 24 +++++++--------
 manifests/mod/itk.pp       | 12 ++++----
 manifests/mod/pagespeed.pp | 30 +++++++++----------
 manifests/mod/prefork.pp   |  2 +-
 manifests/mod/security.pp  | 60 +++++++++++++++++++-------------------
 manifests/vhost/custom.pp  |  6 ++--
 8 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 6a348b128a..dea32f7a65 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -49,18 +49,18 @@
 #   show_diff property for configuration file resource
 #
 define apache::custom_config (
-  Enum['absent', 'present'] $ensure = 'present',
-  String $confdir                   = $apache::confd_dir,
-  Optional[String] $content         = undef,
-  Variant[String,Boolean] $priority = '25',
-  Optional[String] $source          = undef,
-  String $verify_command            = $apache::params::verify_command,
-  Boolean $verify_config            = true,
-  Optional[String] $filename        = undef,
-  Optional[String] $owner           = undef,
-  Optional[String] $group           = undef,
-  Optional[String] $file_mode       = undef,
-  Boolean $show_diff                = true,
+  Enum['absent', 'present'] $ensure         = 'present',
+  String $confdir                           = $apache::confd_dir,
+  Optional[String] $content                 = undef,
+  Variant[Integer,String,Boolean] $priority = '25',
+  Optional[String] $source                  = undef,
+  String $verify_command                    = $apache::params::verify_command,
+  Boolean $verify_config                    = true,
+  Optional[String] $filename                = undef,
+  Optional[String] $owner                   = undef,
+  Optional[String] $group                   = undef,
+  Optional[String] $file_mode               = undef,
+  Boolean $show_diff                        = true,
 ) {
   if $content and $source {
     fail('Only one of $content and $source can be specified.')
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
index 77c091fe73..73e06952fe 100644
--- a/manifests/mod/authn_dbd.pp
+++ b/manifests/mod/authn_dbd.pp
@@ -29,13 +29,13 @@
 #
 class apache::mod::authn_dbd (
   Optional[String] $authn_dbd_params,
-  String $authn_dbd_dbdriver        = 'mysql',
-  Optional[String] $authn_dbd_query = undef,
-  String $authn_dbd_min             = '4',
-  String $authn_dbd_max             = '20',
-  String $authn_dbd_keep            = '8',
-  String $authn_dbd_exptime         = '300',
-  Optional[String] $authn_dbd_alias = undef,
+  String $authn_dbd_dbdriver                  = 'mysql',
+  Optional[String] $authn_dbd_query           = undef,
+  Variant[String,Integer] $authn_dbd_min      = '4',
+  Variant[String,Integer]  $authn_dbd_max     = '20',
+  Variant[String,Integer]  $authn_dbd_keep    = '8',
+  Variant[String,Integer]  $authn_dbd_exptime = '300',
+  Optional[String] $authn_dbd_alias           = undef,
 ) inherits apache::params {
   include apache
   include apache::mod::dbd
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index fc624b5f10..56c3c2b14f 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -47,18 +47,18 @@
 # @see https://httpd.apache.org/docs/current/mod/event.html for additional documentation.
 # @note Unsupported platforms: SLES: all
 class apache::mod::event (
-  Variant[String,Boolean] $startservers                       = '2',
-  Variant[String,Boolean] $maxclients                         = '150',
-  Optional[Variant[String,Boolean]] $maxrequestworkers        = undef,
-  Variant[String,Boolean] $minsparethreads                    = '25',
-  Variant[String,Boolean] $maxsparethreads                    = '75',
-  Variant[String,Boolean] $threadsperchild                    = '25',
-  Variant[String,Boolean] $maxrequestsperchild                = '0',
-  Optional[Variant[String,Boolean]] $maxconnectionsperchild   = undef,
-  Variant[String,Boolean] $serverlimit                        = '25',
-  Optional[String] $apache_version                            = undef,
-  Variant[String,Boolean]  $threadlimit                       = '64',
-  Variant[String,Boolean]  $listenbacklog                     = '511',
+  Variant[String,Integer,Boolean] $startservers                     = '2',
+  Variant[String,Integer,Boolean] $maxclients                       = '150',
+  Optional[Variant[String,Integer,Boolean]] $maxrequestworkers      = undef,
+  Variant[String,Integer,Boolean] $minsparethreads                  = '25',
+  Variant[String,Integer,Boolean] $maxsparethreads                  = '75',
+  Variant[String,Integer,Boolean] $threadsperchild                  = '25',
+  Variant[String,Integer,Boolean] $maxrequestsperchild              = '0',
+  Optional[Variant[String,Integer,Boolean]] $maxconnectionsperchild = undef,
+  Variant[String,Integer,Boolean] $serverlimit                      = '25',
+  Optional[String] $apache_version                                  = undef,
+  Variant[String,Integer,Boolean]  $threadlimit                     = '64',
+  Variant[String,Integer,Boolean]  $listenbacklog                   = '511',
 ) {
   include apache
 
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 16dbdce51f..b903f6bd38 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -30,12 +30,12 @@
 # @see http://mpm-itk.sesse.net for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8; SLES: all
 class apache::mod::itk (
-  String $startservers                                  = '8',
-  String $minspareservers                               = '5',
-  String $maxspareservers                               = '20',
-  String $serverlimit                                   = '256',
-  String $maxclients                                    = '256',
-  String $maxrequestsperchild                           = '4000',
+  Variant[String,Integer] $startservers                 = '8',
+  Variant[String,Integer] $minspareservers              = '5',
+  Variant[String,Integer] $maxspareservers              = '20',
+  Variant[String,Integer] $serverlimit                  = '256',
+  Variant[String,Integer] $maxclients                   = '256',
+  Variant[String,Integer] $maxrequestsperchild          = '4000',
   Optional[Variant[Boolean,String]] $enablecapabilities = undef,
   Optional[String] $apache_version                      = undef,
 ) {
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index f0fa0cf3b9..43b6e4153a 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -168,21 +168,21 @@
   Array $forbid_filters                         = [],
   Integer $rewrite_deadline_per_flush_ms        = 10,
   Optional[String] $additional_domains          = undef,
-  Integer$file_cache_size_kb                    = 102400,
-  Integer$file_cache_clean_interval_ms          = 3600000,
-  Integer$lru_cache_per_process                 = 1024,
-  Integer$lru_cache_byte_limit                  = 16384,
-  Integer$css_flatten_max_bytes                 = 2048,
-  Integer$css_inline_max_bytes                  = 2048,
-  Integer$css_image_inline_max_bytes            = 2048,
-  Integer$image_inline_max_bytes                = 2048,
-  Integer$js_inline_max_bytes                   = 2048,
-  Integer$css_outline_min_bytes                 = 3000,
-  Integer$js_outline_min_bytes                  = 3000,
-  Integer$inode_limit                           = 500000,
-  Integer$image_max_rewrites_at_once            = 8,
-  Integer$num_rewrite_threads                   = 4,
-  Integer$num_expensive_rewrite_threads         = 4,
+  Integer $file_cache_size_kb                   = 102400,
+  Integer $file_cache_clean_interval_ms         = 3600000,
+  Integer $lru_cache_per_process                = 1024,
+  Integer $lru_cache_byte_limit                 = 16384,
+  Integer $css_flatten_max_bytes                = 2048,
+  Integer $css_inline_max_bytes                 = 2048,
+  Integer $css_image_inline_max_bytes           = 2048,
+  Integer $image_inline_max_bytes               = 2048,
+  Integer $js_inline_max_bytes                  = 2048,
+  Integer $css_outline_min_bytes                = 3000,
+  Integer $js_outline_min_bytes                 = 3000,
+  Integer $inode_limit                          = 500000,
+  Integer $image_max_rewrites_at_once           = 8,
+  Integer $num_rewrite_threads                  = 4,
+  Integer $num_expensive_rewrite_threads        = 4,
   String $collect_statistics                    = 'on',
   String $statistics_logging                    = 'on',
   Array $allow_view_stats                       = [],
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 0b8557d866..bffaf86ba7 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -43,7 +43,7 @@
   Variant[Integer,String] $maxrequestsperchild              = '4000',
   Optional[Variant[Integer,String]] $maxconnectionsperchild = undef,
   Optional[String] $apache_version                          = undef,
-  String $listenbacklog                                     = '511'
+  Variant[String,Integer] $listenbacklog                    = '511'
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 8fbd7abdfc..da78ddc120 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -94,36 +94,36 @@
 # @see https://github.com/SpiderLabs/ModSecurity/wiki for additional documentation.
 #
 class apache::mod::security (
-  String $logroot                           = $apache::params::logroot,
-  Integer $version                          = $apache::params::modsec_version,
-  Optional[String] $crs_package             = $apache::params::modsec_crs_package,
-  Array[String] $activated_rules            = $apache::params::modsec_default_rules,
-  Boolean $custom_rules                     = $apache::params::modsec_custom_rules,
-  Optional[Array[String]] $custom_rules_set = $apache::params::modsec_custom_rules_set,
-  String $modsec_dir                        = $apache::params::modsec_dir,
-  String $modsec_secruleengine              = $apache::params::modsec_secruleengine,
-  String $audit_log_relevant_status         = '^(?:5|4(?!04))',
-  String $audit_log_parts                   = $apache::params::modsec_audit_log_parts,
-  String $audit_log_type                    = $apache::params::modsec_audit_log_type,
-  Optional[String] $audit_log_storage_dir   = undef,
-  Integer $secpcrematchlimit                = $apache::params::secpcrematchlimit,
-  Integer $secpcrematchlimitrecursion       = $apache::params::secpcrematchlimitrecursion,
-  String $allowed_methods                   = 'GET HEAD POST OPTIONS',
-  String $content_types                     = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
-  String $restricted_extensions             = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
-  String $restricted_headers                = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
-  String $secdefaultaction                  = 'deny',
-  String $inbound_anomaly_threshold         = '5',
-  String $outbound_anomaly_threshold        = '4',
-  String $critical_anomaly_score            = '5',
-  String $error_anomaly_score               = '4',
-  String $warning_anomaly_score             = '3',
-  String $notice_anomaly_score              = '2',
-  String $secrequestmaxnumargs              = '255',
-  String $secrequestbodylimit               = '13107200',
-  String $secrequestbodynofileslimit        = '131072',
-  String $secrequestbodyinmemorylimit       = '131072',
-  Boolean $manage_security_crs              = true,
+  String $logroot                                       = $apache::params::logroot,
+  Integer $version                                      = $apache::params::modsec_version,
+  Optional[String] $crs_package                         = $apache::params::modsec_crs_package,
+  Array[String] $activated_rules                        = $apache::params::modsec_default_rules,
+  Boolean $custom_rules                                 = $apache::params::modsec_custom_rules,
+  Optional[Array[String]] $custom_rules_set             = $apache::params::modsec_custom_rules_set,
+  String $modsec_dir                                    = $apache::params::modsec_dir,
+  String $modsec_secruleengine                          = $apache::params::modsec_secruleengine,
+  String $audit_log_relevant_status                     = '^(?:5|4(?!04))',
+  String $audit_log_parts                               = $apache::params::modsec_audit_log_parts,
+  String $audit_log_type                                = $apache::params::modsec_audit_log_type,
+  Optional[String] $audit_log_storage_dir               = undef,
+  Integer $secpcrematchlimit                            = $apache::params::secpcrematchlimit,
+  Integer $secpcrematchlimitrecursion                   = $apache::params::secpcrematchlimitrecursion,
+  String $allowed_methods                               = 'GET HEAD POST OPTIONS',
+  String $content_types                                 = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
+  String $restricted_extensions                         = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
+  String $restricted_headers                            = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
+  String $secdefaultaction                              = 'deny',
+  Variant[String,Integer] $inbound_anomaly_threshold    = '5',
+  Variant[String,Integer] $outbound_anomaly_threshold   = '4',
+  Variant[String,Integer] $critical_anomaly_score       = '5',
+  Variant[String,Integer] $error_anomaly_score          = '4',
+  Variant[String,Integer] $warning_anomaly_score        = '3',
+  Variant[String,Integer] $notice_anomaly_score         = '2',
+  Variant[String,Integer] $secrequestmaxnumargs         = '255',
+  Variant[String,Integer] $secrequestbodylimit          = '13107200',
+  Variant[String,Integer] $secrequestbodynofileslimit   = '131072',
+  Variant[String,Integer] $secrequestbodyinmemorylimit  = '131072',
+  Boolean $manage_security_crs                          = true,
 ) inherits apache::params {
   include apache
 
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index 3e6d261b08..8f4143bcfe 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -17,9 +17,9 @@
 #
 define apache::vhost::custom (
   String $content,
-  String $ensure                    = 'present',
-  Variant[Integer,String] $priority = '25',
-  Boolean $verify_config            = true,
+  String $ensure                            = 'present',
+  Variant[Integer,String,Boolean] $priority = '25',
+  Boolean $verify_config                    = true,
 ) {
   include apache
 

From 9d089b1849893fabdc4898fddf08c57986c79ece Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Tue, 7 Jun 2022 17:24:49 +0200
Subject: [PATCH 1926/2267] Let limitreqfieldsize and limitreqfields be
 integers

We have run with `limitreqfieldsize` and `limitreqfields` be integers these values as
integers for a long time.

Checking

* https://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize
* https://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfields

these are indeed integers.
---
 manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 1d9af55a8f..ccf4157222 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -520,8 +520,8 @@
   String $keepalive                                                     = $apache::params::keepalive,
   Variant[Integer,String] $keepalive_timeout                            = $apache::params::keepalive_timeout,
   Variant[Integer,String] $max_keepalive_requests                       = $apache::params::max_keepalive_requests,
-  String $limitreqfieldsize                                             = '8190',
-  String $limitreqfields                                                = '100',
+  Variant[Integer,String] $limitreqfieldsize                            = '8190',
+  Variant[Integer,String] $limitreqfields                               = '100',
   String $logroot                                                       = $apache::params::logroot,
   Optional[String] $logroot_mode                                        = $apache::params::logroot_mode,
   Apache::LogLevel $log_level                                           = $apache::params::log_level,

From 7f797cccf319175ff17fa2f4331cff71df8dfad7 Mon Sep 17 00:00:00 2001
From: canth1 <calebanthony1@hotmail.com>
Date: Tue, 7 Jun 2022 09:56:54 -0600
Subject: [PATCH 1927/2267] -Fix unit test errors

---
 spec/defines/vhost_spec.rb | 58 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 45bc4286af..13849fe4c7 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -252,37 +252,37 @@
                   'passenger_app_log_file'                              => '/tmp/app.log',
                   'passenger_debugger'                                  => false,
                   'gssapi'                                              => {
-                    acceptor_name            => '{HOSTNAME}',
-                    allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
-                    basic_auth               => true,
-                    basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
-                    basic_ticket_timeout     => 300,
-                    connection_bound         => true,
-                    cred_store               => {
-                      ccache        => ['/path/to/directory'],
-                      client_keytab => ['/path/to/example.keytab'],
-                      keytab        => ['/path/to/example.keytab'],
+                    'acceptor_name'            => '{HOSTNAME}',
+                    'allowed_mech'             => ['krb5', 'iakerb', 'ntlmssp'],
+                    'basic_auth'               => true,
+                    'basic_auth_mech'          => ['krb5', 'iakerb', 'ntlmssp'],
+                    'basic_ticket_timeout'     => 300,
+                    'connection_bound'         => true,
+                    'cred_store'               => {
+                      'ccache'        => ['/path/to/directory'],
+                      'client_keytab' => ['/path/to/example.keytab'],
+                      'keytab'        => ['/path/to/example.keytab'],
                     },
-                    deleg_ccache_dir         => '/path/to/directory',
-                    deleg_ccache_env_var     => 'KRB5CCNAME',
-                    deleg_ccache_perms       => {
-                      mode => '0600',
-                      uid  => 'example-user',
-                      gid  => 'example-group',
+                    'deleg_ccache_dir'         => '/path/to/directory',
+                    'deleg_ccache_env_var'     => 'KRB5CCNAME',
+                    'deleg_ccache_perms'       => {
+                      'mode' => '0600',
+                      'uid'  => 'example-user',
+                      'gid'  => 'example-group',
                     },
-                    deleg_ccache_unique      => true,
-                    impersonate              => true,
-                    local_name               => true,
-                    name_attributes          => 'json',
-                    negotiate_once           => true,
-                    publish_errors           => true,
-                    publish_mech             => true,
-                    required_name_attributes =>	'auth-indicators=high',
-                    session_key              => 'file:/path/to/example.key',
-                    signal_persistent_auth   => true,
-                    ssl_only                 => true,
-                    use_s4u2_proxy           => true,
-                    use_sessions             => true,
+                    'deleg_ccache_unique'      => true,
+                    'impersonate'              => true,
+                    'local_name'               => true,
+                    'name_attributes'          => 'json',
+                    'negotiate_once'           => true,
+                    'publish_errors'           => true,
+                    'publish_mech'             => true,
+                    'required_name_attributes' =>	'auth-indicators=high',
+                    'session_key'              => 'file:/path/to/example.key',
+                    'signal_persistent_auth'   => true,
+                    'ssl_only'                 => true,
+                    'use_s4u2_proxy'           => true,
+                    'use_sessions'             => true,
                   },
                 },
                 {

From 64455df8c3fec10a901478b999b2c66e1c3737ae Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 9 Jun 2022 10:09:19 +0100
Subject: [PATCH 1928/2267] Update $timeout to `Variant[Integer,String]`

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index ccf4157222..9a48af21ad 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -491,7 +491,7 @@
   Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert     = undef,
   Optional[String] $ldap_trusted_mode                                   = undef,
   Boolean $error_documents                                              = false,
-  String $timeout                                                       = '60',
+  Variant[Integer,String] $timeout                                      = '60',
   String $httpd_dir                                                     = $apache::params::httpd_dir,
   String $server_root                                                   = $apache::params::server_root,
   String $conf_dir                                                      = $apache::params::conf_dir,

From aed37c091fbed091b33b376dada9eeae8618a3a8 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 9 Jun 2022 12:56:01 +0200
Subject: [PATCH 1929/2267] Acceptance tests: Migrate to puppet/epel

stahnma/epel was transferred to puppet/epel. However, version 4.0.0
drops EL6 support (while adding EL9 support) so a conditional is added.
The API is the same so the later code can be used on both. This
conditional limits module installation to Red Hat-based OSes which makes
sure it truly is a soft dependency on other operating systems.

It also removes the EPEL setup in mod_authnz_ldap tests since EPEL
should always be available after it's being set up in the acceptance
helper.
---
 spec/acceptance/mod_authnz_ldap_spec.rb |  9 ---------
 spec/spec_helper_acceptance_local.rb    | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb
index ef59b6a5b0..82615ab624 100644
--- a/spec/acceptance/mod_authnz_ldap_spec.rb
+++ b/spec/acceptance/mod_authnz_ldap_spec.rb
@@ -6,12 +6,6 @@
 # We need to restrict this test to RHEL 7.x, 8.x derived OSs as there are too many unique
 # dependency issues to solve on all supported platforms.
 describe 'apache::mod::authnz_ldap', if: mod_supported_on_platform?('apache::mod::authnz_ldap') do
-  before(:each) do
-    if os[:family] == 'redhat'
-      run_shell('yum clean all') # To clear some issues when configuring EPEL / Optional repos
-      run_shell('dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y') if os[:release].to_i == 8
-    end
-  end
   context 'Default mod_authnz_ldap module installation' do
     pp = if run_shell("grep 'Oracle Linux Server' /etc/os-release", expect_failures: true).exit_status == 0
            <<-MANIFEST
@@ -27,9 +21,6 @@ class { 'apache::mod::authnz_ldap': }
       MANIFEST
          else
            <<-MANIFEST
-        package { 'epel-release':
-          ensure => present,
-        }
         class { 'apache': }
         class { 'apache::mod::authnz_ldap': }
         MANIFEST
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index e42aa4fe56..98ee764d3d 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -33,10 +33,18 @@ def print_parsing_errors
     c.filter_run_excluding ipv6: true
   end
   c.before :suite do
-    # Make sure selinux is disabled so the tests work.
-    LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if %r{redhat|oracle}.match?(os[:family])
+    if %r{redhat|oracle}.match?(os[:family])
+      # Make sure selinux is disabled so the tests work.
+      LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true)
+
+      # Version 4.0.0 drops EL6 support
+      if os[:release].to_i <= 6
+        LitmusHelper.instance.run_shell('puppet module install --version 3.1.0 puppet/epel')
+      else
+        LitmusHelper.instance.run_shell('puppet module install puppet/epel')
+      end
+    end
 
-    LitmusHelper.instance.run_shell('puppet module install stahnma/epel')
     pp = <<-PUPPETCODE
     # needed by tests
     package { 'curl':
@@ -49,6 +57,7 @@ def print_parsing_errors
       }
     }
     if $::osfamily == 'RedHat' {
+      # EPEL < 7 is EOL and removed from the official mirror network
       if $::operatingsystemmajrelease == '5' or $::operatingsystemmajrelease == '6'{
         class { 'epel':
           epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",

From f8c944904710166f0a2cd19f85082f39c8ff4a70 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 9 Jun 2022 13:04:08 +0200
Subject: [PATCH 1930/2267] Acceptance tests: Stop using EPEL 7 on EL8

Fixes: cd81ee3c04ee419731483a0b23a59de6659e3382
---
 spec/spec_helper_acceptance_local.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 98ee764d3d..5ea10c10e8 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -63,12 +63,6 @@ class { 'epel':
           epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
           epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
         }
-      } elsif $::operatingsystemmajrelease == '8' {
-          class { 'epel':
-                os_maj_release => "7",
-                epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
-                epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
-          }
       } else {
         class { 'epel': }
       }

From 5bb00280cb76e0ce2ec9803a6b36548baf6beab6 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 15 Jun 2022 09:13:23 +0100
Subject: [PATCH 1931/2267] (MODULES-11329) Typo fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e444c5c617..a9f9e89f48 100755
--- a/README.md
+++ b/README.md
@@ -729,7 +729,7 @@ apache::vhost { 'www':
 }
 ```
 
-Please note you have to adjust the second ProxyPassMatch parameter to you docroot value (here `/var/www/html/`).
+Please note you have to adjust the second ProxyPassMatch parameter to your docroot value (here `/var/www/html/`).
 
 #### Other OSes
 

From 2f6f6f3fd2425a978c5507651d042cd600bc6cd5 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 15 Jun 2022 13:44:27 +0200
Subject: [PATCH 1932/2267] Make headers and request_headers arrays

They now both only accept arrays of non-empty strings. The default is
set to an empty array, which behaves as if it's not set.
---
 manifests/vhost.pp                 | 19 ++++++++-----------
 spec/defines/vhost_spec.rb         |  2 +-
 templates/vhost/_header.erb        |  8 +++-----
 templates/vhost/_requestheader.erb |  8 +++-----
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ad0c312146..80dfd7d16c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1853,8 +1853,8 @@
   Optional[Variant[Array[String],String]] $redirectmatch_status                       = undef,
   Optional[Variant[Array[String],String]] $redirectmatch_regexp                       = undef,
   Optional[Variant[Array[String],String]] $redirectmatch_dest                         = undef,
-  Optional[String] $headers                                                           = undef,
-  Optional[Array[String]] $request_headers                                            = undef,
+  Array[String[1]] $headers                                                           = [],
+  Array[String[1]] $request_headers                                                   = [],
   Optional[Array[String]] $filters                                                    = undef,
   Optional[Array] $rewrites                                                           = undef,
   Optional[String] $rewrite_base                                                      = undef,
@@ -2259,13 +2259,6 @@
     }
   }
 
-  # Check if mod_headers is required to process $headers/$request_headers
-  if $headers or $request_headers {
-    if ! defined(Class['apache::mod::headers']) {
-      include apache::mod::headers
-    }
-  }
-
   # Check if mod_filter is required to process $filters
   if $filters {
     if ! defined(Class['apache::mod::filter']) {
@@ -2534,7 +2527,9 @@
 
   # Template uses:
   # - $headers
-  if $headers and ! empty($headers) {
+  if ! empty($headers) and $ensure == 'present' {
+    include apache::mod::headers
+
     concat::fragment { "${name}-header":
       target  => "${priority_real}${filename}.conf",
       order   => 140,
@@ -2544,7 +2539,9 @@
 
   # Template uses:
   # - $request_headers
-  if $request_headers and ! empty($request_headers) {
+  if ! empty($request_headers) and $ensure == 'present' {
+    include apache::mod::headers
+
     concat::fragment { "${name}-requestheader":
       target  => "${priority_real}${filename}.conf",
       order   => 150,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f79fb4065e..f455fd5f75 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -385,7 +385,7 @@
               'redirectmatch_status'        => ['404'],
               'redirectmatch_regexp'        => ['\.git$'],
               'redirectmatch_dest'          => ['http://www.example.com'],
-              'headers'                     => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+              'headers'                     => ['Set X-Robots-Tag "noindex, noarchive, nosnippet"'],
               'request_headers'             => ['append MirrorID "mirror 12"'],
               'rewrites'                    => [
                 {
diff --git a/templates/vhost/_header.erb b/templates/vhost/_header.erb
index c0f68c8257..54f84cac5a 100644
--- a/templates/vhost/_header.erb
+++ b/templates/vhost/_header.erb
@@ -1,10 +1,8 @@
-<% if @headers and ! @headers.empty? -%>
+<% unless @headers.empty? -%>
 
   ## Header rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header
-  <%- Array(@headers).each do |header_statement| -%>
-    <%- if header_statement != '' -%>
+  ## as per http://httpd.apache.org/docs/2.4/mod/mod_headers.html#header
+  <%- @headers.each do |header_statement| -%>
   Header <%= header_statement %>
-    <%- end -%>
   <%- end -%>
 <% end -%>
diff --git a/templates/vhost/_requestheader.erb b/templates/vhost/_requestheader.erb
index 9f175052b5..56ee68b299 100644
--- a/templates/vhost/_requestheader.erb
+++ b/templates/vhost/_requestheader.erb
@@ -1,10 +1,8 @@
-<% if @request_headers and ! @request_headers.empty? -%>
+<% unless @request_headers.empty? -%>
 
   ## Request header rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-  <%- Array(@request_headers).each do |request_statement| -%>
-    <%- if request_statement != '' -%>
+  ## as per http://httpd.apache.org/docs/2.4/mod/mod_headers.html#requestheader
+  <%- @request_headers.each do |request_statement| -%>
   RequestHeader <%= request_statement %>
-    <%- end -%>
   <%- end -%>
 <% end -%>

From d00aabb0c196962c3cf078394f7b5ff7d9fe9104 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 15 Jun 2022 14:06:03 +0200
Subject: [PATCH 1933/2267] Stricter data type on apache::vhost::filters

This was previously filtered out but it's best if the information simply
never is entered in the first place.

The include is also simplified and only applied if the vhost is present.
---
 manifests/vhost.pp           | 13 ++++---------
 templates/vhost/_filters.erb |  6 ++----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 80dfd7d16c..531bed1584 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1855,7 +1855,7 @@
   Optional[Variant[Array[String],String]] $redirectmatch_dest                         = undef,
   Array[String[1]] $headers                                                           = [],
   Array[String[1]] $request_headers                                                   = [],
-  Optional[Array[String]] $filters                                                    = undef,
+  Array[String[1]] $filters                                                           = [],
   Optional[Array] $rewrites                                                           = undef,
   Optional[String] $rewrite_base                                                      = undef,
   Optional[Variant[Array[String],String]] $rewrite_rule                               = undef,
@@ -2259,13 +2259,6 @@
     }
   }
 
-  # Check if mod_filter is required to process $filters
-  if $filters {
-    if ! defined(Class['apache::mod::filter']) {
-      include apache::mod::filter
-    }
-  }
-
   # Check if mod_env is required and not yet loaded.
   # create an expression to simplify the conditional check
   $use_env_mod = $setenv and ! empty($setenv)
@@ -2906,7 +2899,9 @@
 
   # Template uses:
   # - $filters
-  if $filters and ! empty($filters) {
+  if ! empty($filters) and $ensure == 'present' {
+    include apache::mod::filter
+
     concat::fragment { "${name}-filters":
       target  => "${priority_real}${filename}.conf",
       order   => 330,
diff --git a/templates/vhost/_filters.erb b/templates/vhost/_filters.erb
index b862597349..bb36fc3914 100644
--- a/templates/vhost/_filters.erb
+++ b/templates/vhost/_filters.erb
@@ -1,10 +1,8 @@
-<% if @filters and ! @filters.empty? -%>
+<% unless @filters.empty? -%>
 
   ## Filter module rules
   ## as per http://httpd.apache.org/docs/2.2/mod/mod_filter.html
-  <%- Array(@filters).each do |filter| -%>
-    <%- if filter != '' -%>
+  <%- @filters.each do |filter| -%>
   <%= filter %>
-    <%- end -%>
   <%- end -%>
 <% end -%>

From 7b22dae24ff4a04f9258362f90bf6a2151c24a23 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 15 Jun 2022 14:07:35 +0200
Subject: [PATCH 1934/2267] Stricter data types on apache::vhost::rewrite*

Ideally a Struct would be used instead of Hash for $rewrites, but this
is a closer description of the real data type.
---
 manifests/vhost.pp           | 26 +++++++-------------------
 spec/defines/vhost_spec.rb   |  2 +-
 templates/vhost/_rewrite.erb |  6 ++----
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 531bed1584..79aa2c3feb 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1856,10 +1856,10 @@
   Array[String[1]] $headers                                                           = [],
   Array[String[1]] $request_headers                                                   = [],
   Array[String[1]] $filters                                                           = [],
-  Optional[Array] $rewrites                                                           = undef,
-  Optional[String] $rewrite_base                                                      = undef,
-  Optional[Variant[Array[String],String]] $rewrite_rule                               = undef,
-  Optional[Variant[Array[String],String]] $rewrite_cond                               = undef,
+  Array[Hash] $rewrites                                                               = [],
+  Optional[String[1]] $rewrite_base                                                   = undef,
+  Optional[String[1]] $rewrite_rule                                                   = undef,
+  Array[String[1]] $rewrite_cond                                                      = [],
   Boolean $rewrite_inherit                                                            = false,
   Variant[Array[String],String] $setenv                                               = [],
   Variant[Array[String],String] $setenvif                                             = [],
@@ -1997,13 +1997,6 @@
 
   $apache_name = $apache::apache_name
 
-  if $rewrites {
-    unless empty($rewrites) {
-      $rewrites_flattened = delete_undef_values(flatten([$rewrites]))
-      assert_type(Array[Hash], $rewrites_flattened)
-    }
-  }
-
   # Input validation begins
 
   if $access_log_file and $access_log_pipe {
@@ -2225,13 +2218,6 @@
     }
   }
 
-  # Load mod_rewrite if needed and not yet loaded
-  if $rewrites or $rewrite_cond {
-    if ! defined(Class['apache::mod::rewrite']) {
-      include apache::mod::rewrite
-    }
-  }
-
   # Load mod_alias if needed and not yet loaded
   if ($scriptalias or $scriptaliases != [])
   or ($aliases and $aliases != [])
@@ -2603,7 +2589,9 @@
   # - $rewrite_rule
   # - $rewrite_cond
   # - $rewrite_map
-  if $rewrites or $rewrite_rule {
+  if (! empty($rewrites) or $rewrite_rule) and $ensure == 'present' {
+    include apache::mod::rewrite
+
     concat::fragment { "${name}-rewrite":
       target  => "${priority_real}${filename}.conf",
       order   => 190,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f455fd5f75..3a408977cc 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -403,7 +403,7 @@
               ],
               'rewrite_base'                => '/',
               'rewrite_rule'                => '^index\.html$ welcome.html',
-              'rewrite_cond'                => '%{HTTP_USER_AGENT} ^MSIE',
+              'rewrite_cond'                => ['%{HTTP_USER_AGENT} ^MSIE'],
               'rewrite_inherit'             => true,
               'setenv'                      => ['FOO=/bin/true'],
               'setenvif'                    => 'Request_URI "\.gif$" object_is_image=gif',
diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index 282733757c..f4ac5a3174 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -8,7 +8,7 @@
   RewriteBase <%= @rewrite_base %>
   <%- end -%>
 
-  <%- [@rewrites].flatten.compact.each do |rewrite_details| -%>
+  <%- @rewrites.each do |rewrite_details| -%>
     <%- if rewrite_details['comment'] -%>
   #<%= rewrite_details['comment'] %>
     <%- end -%>
@@ -44,10 +44,8 @@
   <%- if @rewrite_base -%>
   RewriteBase <%= @rewrite_base %>
   <%- end -%>
-  <%- if @rewrite_cond -%>
-    <%- Array(@rewrite_cond).each do |cond| -%>
+    <%- @rewrite_cond.each do |cond| -%>
   RewriteCond <%= cond %>
-    <%- end -%>
   <%- end -%>
   RewriteRule <%= @rewrite_rule %>
 <%- end -%>

From 56c9e1e9021570b7d6ba4a28a41b07bc987a3a5b Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 15 Jun 2022 14:15:54 +0200
Subject: [PATCH 1935/2267] Stricter data type on apache::vhost::access_logs

This always required an array of hashes and closer matches the actual
behavior.

It also fixes the check on the template use by checking the correct
variable. bb96180f62a1897a9f81dfb6a821f2f10c9bdfd3 broke this.

Fixes: bb96180f62a1897a9f81dfb6a821f2f10c9bdfd3
---
 manifests/vhost.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 79aa2c3feb..6f503f12d6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1800,7 +1800,7 @@
   Variant[Boolean,String] $access_log_syslog                                          = false,
   Variant[Boolean,String] $access_log_format                                          = false,
   Variant[Boolean,String] $access_log_env_var                                         = false,
-  Optional[Array] $access_logs                                                        = undef,
+  Optional[Array[Hash]] $access_logs                                                  = undef,
   Boolean $use_servername_for_filenames                                               = false,
   Boolean $use_port_for_filenames                                                     = false,
   Optional[Variant[Array[Hash],Hash,String]] $aliases                                 = undef,
@@ -2134,6 +2134,8 @@
     }]
   } elsif $access_logs {
     $_access_logs = $access_logs
+  } else {
+    $_access_logs = []
   }
 
   if $error_log_file {
@@ -2459,13 +2461,12 @@
   }
 
   # Template uses:
-  # - $access_log
+  # - $_access_logs
   # - $_access_log_env_var
   # - $access_log_destination
   # - $_access_log_format
   # - $_access_log_env_var
-  # - $access_logs
-  if $access_log or $access_logs {
+  if !empty($_access_logs) {
     concat::fragment { "${name}-access_log":
       target  => "${priority_real}${filename}.conf",
       order   => 100,

From bcd35a7657a5a1ed2509a2482875b6853c53600c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 15 Jun 2022 14:22:39 +0200
Subject: [PATCH 1936/2267] Stricter data type on
 apache::vhost::modsec_disable_ips

---
 manifests/vhost.pp            | 4 ++--
 templates/vhost/_security.erb | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 6f503f12d6..e4fa1b2177 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1954,7 +1954,7 @@
   Optional[String] $add_default_charset                                               = undef,
   Boolean $modsec_disable_vhost                                                       = false,
   Optional[Variant[Hash, Array]] $modsec_disable_ids                                  = undef,
-  Optional[Array[String]] $modsec_disable_ips                                         = undef,
+  Array[String[1]] $modsec_disable_ips                                                = [],
   Optional[Variant[Hash, Array]] $modsec_disable_msgs                                 = undef,
   Optional[Variant[Hash, Array]] $modsec_disable_tags                                 = undef,
   Optional[String] $modsec_body_limit                                                 = undef,
@@ -2878,7 +2878,7 @@
   # - $modsec_disable_tags
   # - $modsec_body_limit
   # - $modsec_audit_log_destination
-  if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination {
+  if $modsec_disable_vhost or $modsec_disable_ids or !empty($modsec_disable_ips) or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination {
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
       order   => 320,
diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
index dc35c78af1..a7e02e6c59 100644
--- a/templates/vhost/_security.erb
+++ b/templates/vhost/_security.erb
@@ -14,9 +14,8 @@
   </LocationMatch>
 <%   end -%>
 <% end -%>
-<% ips = Array(@modsec_disable_ips).join(',') %>
-<% if ips != '' %>
-  SecRule REMOTE_ADDR "<%= ips %>" "nolog,allow,id:1234123455"
+<% unless @modsec_disable_ips.empty? %>
+  SecRule REMOTE_ADDR "<%= @modsec_disable_ips.join(',') %>" "nolog,allow,id:1234123455"
   SecAction  "phase:2,pass,nolog,id:1234123456"
 <% end -%>
 <% if @_modsec_disable_msgs.is_a?(Hash) -%>

From 8c515509cca881411c3f927d9cd6117a3cead092 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 15 Jun 2022 14:30:07 +0200
Subject: [PATCH 1937/2267] Stricter data type on apache::vhost::jk_mounts

This also pulls in mod_jk if needed.
---
 manifests/vhost.pp             | 6 ++++--
 templates/vhost/_jk_mounts.erb | 8 +++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e4fa1b2177..a92331f68d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1958,7 +1958,7 @@
   Optional[Variant[Hash, Array]] $modsec_disable_msgs                                 = undef,
   Optional[Variant[Hash, Array]] $modsec_disable_tags                                 = undef,
   Optional[String] $modsec_body_limit                                                 = undef,
-  Optional[Array[Hash]] $jk_mounts                                                    = undef,
+  Array[Hash] $jk_mounts                                                              = [],
   Boolean $auth_kerb                                                                  = false,
   Enum['on', 'off'] $krb_method_negotiate                                             = 'on',
   Enum['on', 'off'] $krb_method_k5passwd                                              = 'on',
@@ -2900,7 +2900,9 @@
 
   # Template uses:
   # - $jk_mounts
-  if $jk_mounts and ! empty($jk_mounts) {
+  if !empty($jk_mounts) and $ensure == 'present' {
+    include apache::mod::jk
+
     concat::fragment { "${name}-jk_mounts":
       target  => "${priority_real}${filename}.conf",
       order   => 340,
diff --git a/templates/vhost/_jk_mounts.erb b/templates/vhost/_jk_mounts.erb
index 8cb1d116bb..3bd5a721a6 100644
--- a/templates/vhost/_jk_mounts.erb
+++ b/templates/vhost/_jk_mounts.erb
@@ -1,12 +1,10 @@
-<% if @jk_mounts and not @jk_mounts.empty? -%>
+<% unless @jk_mounts.empty? -%>
 
   <%- @jk_mounts.each do |jk| -%>
-    <%- if jk.is_a?(Hash) -%>
-      <%- if jk.has_key?('mount') and jk.has_key?('worker') -%>
+    <%- if jk.has_key?('mount') and jk.has_key?('worker') -%>
   JkMount   <%= jk['mount'] %> <%= jk['worker'] %>
-      <%- elsif jk.has_key?('unmount') and jk.has_key?('worker') -%>
+    <%- elsif jk.has_key?('unmount') and jk.has_key?('worker') -%>
   JkUnMount <%= jk['unmount'] %> <%= jk['worker'] %>
-      <%- end -%>
     <%- end -%>
   <%- end -%>
 <% end -%>

From a18271b8658d3a0d9db61601c5d96333c48b3f2c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 11:37:46 +0200
Subject: [PATCH 1938/2267] Use a stricter data type on apache::vhost::aliases

This also implements a real test on the rendered template. It appears it
was passing in something invalid ever since it was introduced in
f1d64a0a0b71af0102d10da69e333aa9ac5a15f5.

The test block is moved because Rubocop didn't quite understand it
otherwise.
---
 manifests/vhost.pp                   |  7 ++++---
 spec/acceptance/default_mods_spec.rb | 20 ++++++++++++--------
 spec/defines/vhost_spec.rb           | 13 +++++++++++--
 templates/vhost/_aliases.erb         | 14 ++++++--------
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a92331f68d..42f43a7a3e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1803,7 +1803,7 @@
   Optional[Array[Hash]] $access_logs                                                  = undef,
   Boolean $use_servername_for_filenames                                               = false,
   Boolean $use_port_for_filenames                                                     = false,
-  Optional[Variant[Array[Hash],Hash,String]] $aliases                                 = undef,
+  Array[Hash[String[1], String[1]]] $aliases                                          = [],
   Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                    = undef,
   Boolean $error_log                                                                  = true,
   Optional[String] $error_log_file                                                    = undef,
@@ -2222,7 +2222,6 @@
 
   # Load mod_alias if needed and not yet loaded
   if ($scriptalias or $scriptaliases != [])
-  or ($aliases and $aliases != [])
   or ($redirect_source and $redirect_dest)
   or ($redirectmatch_regexp or $redirectmatch_status or $redirectmatch_dest) {
     if ! defined(Class['apache::mod::alias'])  and ($ensure == 'present') {
@@ -2376,7 +2375,9 @@
 
   # Template uses:
   # - $aliases
-  if $aliases and ! empty($aliases) {
+  if ! empty($aliases) and $ensure == 'present' {
+    include apache::mod::alias
+
     concat::fragment { "${name}-aliases":
       target  => "${priority_real}${filename}.conf",
       order   => 20,
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index fa5a6beabe..8e38d98f0f 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -38,10 +38,12 @@ class { 'apache':
           }
           apache::vhost { 'defaults.example.com':
             docroot     => '#{apache_hash['doc_root']}/defaults',
-            aliases     => {
-              alias => '/css',
-              path  => '#{apache_hash['doc_root']}/css',
-            },
+            aliases     => [
+              {
+                alias => '/css',
+                path  => '#{apache_hash['doc_root']}/css',
+              },
+            ],
             directories => [
             {
                 'path'            => "#{apache_hash['doc_root']}/admin",
@@ -76,10 +78,12 @@ class { 'apache':
         }
         apache::vhost { 'defaults.example.com':
           docroot => '#{apache_hash['doc_root']}/defaults',
-          aliases => {
-            alias => '/css',
-            path  => '#{apache_hash['doc_root']}/css',
-          },
+          aliases => [
+            {
+              alias => '/css',
+              path  => '#{apache_hash['doc_root']}/css',
+            },
+          ],
           setenv  => 'TEST1 one',
         }
       MANIFEST
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3a408977cc..190915b050 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -104,12 +104,17 @@
               'logroot_owner'               => 'root',
               'logroot_group'               => 'root',
               'log_level'                   => 'crit',
+              'aliases'                     => [
+                {
+                  'alias' => '/image',
+                  'path'  => '/rspec/image',
+                },
+              ],
               'access_log'                  => false,
               'access_log_file'             => 'httpd_access_log',
               'access_log_syslog'           => true,
               'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
               'access_log_env_var'          => '',
-              'aliases'                     => '/image',
               'directories'                 => [
                 {
                   'path'     => '/var/www/files',
@@ -619,7 +624,11 @@
             )
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-aliases').with(
+              content: %r{^\s+Alias /image "/rspec/image"$},
+            )
+          }
           it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
diff --git a/templates/vhost/_aliases.erb b/templates/vhost/_aliases.erb
index f9771bc728..29b3e9961d 100644
--- a/templates/vhost/_aliases.erb
+++ b/templates/vhost/_aliases.erb
@@ -1,16 +1,14 @@
-<% if @aliases and ! @aliases.empty? -%>
   ## Alias declarations for resources outside the DocumentRoot
-  <%- [@aliases].flatten.compact.each do |alias_statement| -%>
-    <%- if alias_statement["path"] != '' -%>
-      <%- if alias_statement["alias"] and alias_statement["alias"] != '' -%>
+  <%- @aliases.each do |alias_statement| -%>
+    <%- if alias_statement["path"] -%>
+      <%- if alias_statement["alias"] -%>
   Alias <%= alias_statement["alias"] %> "<%= alias_statement["path"] %>"
-      <%- elsif alias_statement["aliasmatch"] and alias_statement["aliasmatch"] != '' -%>
+      <%- elsif alias_statement["aliasmatch"] -%>
   AliasMatch <%= alias_statement["aliasmatch"] %> "<%= alias_statement["path"] %>"
-      <%- elsif alias_statement["scriptalias"] and alias_statement["scriptalias"] != '' -%>
+      <%- elsif alias_statement["scriptalias"] -%>
   ScriptAlias <%= alias_statement["scriptalias"] %> "<%= alias_statement["path"] %>"
-      <%- elsif alias_statement["scriptaliasmatch"] and alias_statement["scriptaliasmatch"] != '' -%>
+      <%- elsif alias_statement["scriptaliasmatch"] -%>
   ScriptAliasMatch <%= alias_statement["scriptaliasmatch"] %> "<%= alias_statement["path"] %>"
       <%- end -%>
     <%- end -%>
   <%- end -%>
-<% end -%>

From d44b683063f9e8a05730820017ea0867592c0d3c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 11:43:12 +0200
Subject: [PATCH 1939/2267] Correct parameter alignment

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 42f43a7a3e..d3769b3874 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1847,7 +1847,7 @@
   Boolean $proxy_preserve_host                                                        = false,
   Optional[Variant[String,Boolean]] $proxy_add_headers                                = undef,
   Boolean $proxy_error_override                                                       = false,
-  Variant[String,Array[String]] $redirect_source                                       = '/',
+  Variant[String,Array[String]] $redirect_source                                      = '/',
   Optional[Variant[Array[String],String]] $redirect_dest                              = undef,
   Optional[Variant[Array[String],String]] $redirect_status                            = undef,
   Optional[Variant[Array[String],String]] $redirectmatch_status                       = undef,

From 09727b34fbaadd55d07b529ae1c227f08d00b3e9 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 11:46:20 +0200
Subject: [PATCH 1940/2267] Localize apache::mod::alias inclusion in vhost.pp

---
 manifests/vhost.pp         | 17 ++++++-----------
 spec/defines/vhost_spec.rb | 16 ++++------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d3769b3874..dec95526f9 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2220,15 +2220,6 @@
     }
   }
 
-  # Load mod_alias if needed and not yet loaded
-  if ($scriptalias or $scriptaliases != [])
-  or ($redirect_source and $redirect_dest)
-  or ($redirectmatch_regexp or $redirectmatch_status or $redirectmatch_dest) {
-    if ! defined(Class['apache::mod::alias'])  and ($ensure == 'present') {
-      include apache::mod::alias
-    }
-  }
-
   # Load mod_proxy if needed and not yet loaded
   if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match) {
     if ! defined(Class['apache::mod::proxy']) {
@@ -2577,7 +2568,9 @@
   # - $redirectmatch_status_a
   # - $redirectmatch_regexp_a
   # - $redirectmatch_dest
-  if ($redirect_source and $redirect_dest) or ($redirectmatch_regexp and $redirectmatch_dest) {
+  if (($redirect_source and $redirect_dest) or ($redirectmatch_regexp and $redirectmatch_dest)) and $ensure == 'present' {
+    include apache::mod::alias
+
     concat::fragment { "${name}-redirect":
       target  => "${priority_real}${filename}.conf",
       order   => 180,
@@ -2604,7 +2597,9 @@
   # Template uses:
   # - $scriptaliases
   # - $scriptalias
-  if ( $scriptalias or $scriptaliases != []) {
+  if ($scriptalias or !empty($scriptaliases)) and $ensure == 'present' {
+    include apache::mod::alias
+
     concat::fragment { "${name}-scriptalias":
       target  => "${priority_real}${filename}.conf",
       order   => 200,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 190915b050..891bb52983 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2641,22 +2641,14 @@
           describe 'redirectmatch_*' do
             let(:params) { super().merge(port: '84') }
 
-            context 'status' do
-              let(:params) { super().merge(redirectmatch_status: '404') }
-
-              it { is_expected.to contain_class('apache::mod::alias') }
-            end
-            context 'dest' do
-              let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg') }
-
-              it { is_expected.to contain_class('apache::mod::alias') }
-            end
-            context 'regexp' do
-              let(:params) { super().merge(redirectmatch_regexp: "(.*)\.gif$") }
+            context 'dest and regexp' do
+              let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg', redirectmatch_regexp: "(.*)\.gif$") }
 
+              it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
               it { is_expected.to contain_class('apache::mod::alias') }
             end
             context 'none' do
+              it { is_expected.not_to contain_concat__fragment('rspec.example.com-redirect') }
               it { is_expected.not_to contain_class('apache::mod::alias') }
             end
           end

From ff409d41565b4af69cfc4ea44982030918c15209 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 11:47:47 +0200
Subject: [PATCH 1941/2267] Localize apache::mod::proxy inclusion in vhost.pp

---
 manifests/vhost.pp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index dec95526f9..bbfeba2c91 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2220,16 +2220,6 @@
     }
   }
 
-  # Load mod_proxy if needed and not yet loaded
-  if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match) {
-    if ! defined(Class['apache::mod::proxy']) {
-      include apache::mod::proxy
-    }
-    if ! defined(Class['apache::mod::proxy_http']) {
-      include apache::mod::proxy_http
-    }
-  }
-
   # Load mod_fastcgi if needed and not yet loaded
   if $fastcgi_server and $fastcgi_socket {
     if ! defined(Class['apache::mod::fastcgi']) {
@@ -2547,7 +2537,10 @@
   # - $proxy_preserve_host
   # - $proxy_add_headers
   # - $no_proxy_uris
-  if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host {
+  if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host) and $ensure == 'present' {
+    include apache::mod::proxy
+    include apache::mod::proxy_http
+
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}${filename}.conf",
       order   => 170,

From 0df379d6f691f47c8f75d83eafac9b55f8c5f16c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 11:48:56 +0200
Subject: [PATCH 1942/2267] Localize apache::mod::fastcgi inclusion in vhost.pp

---
 manifests/vhost.pp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bbfeba2c91..692c51ef4d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2220,13 +2220,6 @@
     }
   }
 
-  # Load mod_fastcgi if needed and not yet loaded
-  if $fastcgi_server and $fastcgi_socket {
-    if ! defined(Class['apache::mod::fastcgi']) {
-      include apache::mod::fastcgi
-    }
-  }
-
   # Check if mod_env is required and not yet loaded.
   # create an expression to simplify the conditional check
   $use_env_mod = $setenv and ! empty($setenv)
@@ -2752,7 +2745,9 @@
   # - $fastcgi_dir
   # - $fastcgi_idle_timeout
   # - $apache_version
-  if $fastcgi_server or $fastcgi_dir {
+  if ($fastcgi_server or $fastcgi_dir) and $ensure == 'present' {
+    include apache::mod::fastcgi
+
     concat::fragment { "${name}-fastcgi":
       target  => "${priority_real}${filename}.conf",
       order   => 280,

From 0be7b8d0c0876380b4a3f5df670a069df25e0f25 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:00:09 +0200
Subject: [PATCH 1943/2267] Localize apache::mod::vhost_alias inclusion in
 vhost.pp

This is now only included if docroot evaluates to true. The template
does suggest that it should be `($docroot or $virtual_docroot)` but this
remains compatible with the previous code.
---
 manifests/vhost.pp         | 10 +++++-----
 spec/defines/vhost_spec.rb |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 692c51ef4d..75f885b107 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2039,10 +2039,6 @@
     include apache::mod::auth_openidc
   }
 
-  if $virtual_docroot {
-    include apache::mod::vhost_alias
-  }
-
   if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
     include apache::mod::wsgi
   }
@@ -2339,7 +2335,11 @@
   # - $virtual_docroot
   # - $virtual_use_default_docroot
   # - $docroot
-  if $docroot {
+  if $docroot and $ensure == 'present' {
+    if $virtual_docroot {
+      include apache::mod::vhost_alias
+    }
+
     concat::fragment { "${name}-docroot":
       target  => "${priority_real}${filename}.conf",
       order   => 10,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 891bb52983..f0efb63f4f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2118,7 +2118,7 @@
             is_expected.to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-aliases') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-fallbackresource') }

From 770ce8beec5e75598fc3b2cb2b09a6095720f790 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:04:34 +0200
Subject: [PATCH 1944/2267] Localize apache::mod::wsgi inclusion in vhost.pp

---
 manifests/vhost.pp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 75f885b107..967a6cd852 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2039,10 +2039,6 @@
     include apache::mod::auth_openidc
   }
 
-  if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
-    include apache::mod::wsgi
-  }
-
   if $suexec_user_group {
     include apache::mod::suexec
   }
@@ -2721,7 +2717,9 @@
   if $wsgi_daemon_process_options {
     deprecation('apache::vhost::wsgi_daemon_process_options', 'This parameter is deprecated. Please add values inside Hash `wsgi_daemon_process`.')
   }
-  if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
+  if ($wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization) and $ensure == 'present' {
+    include apache::mod::wsgi
+
     concat::fragment { "${name}-wsgi":
       target  => "${priority_real}${filename}.conf",
       order   => 260,

From 3013ebb731e69f212dea7e328b831a0157197a5f Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:05:27 +0200
Subject: [PATCH 1945/2267] Localize apache::mod::suexec inclusion in vhost.pp

---
 manifests/vhost.pp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 967a6cd852..c2bf82db9d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2039,10 +2039,6 @@
     include apache::mod::auth_openidc
   }
 
-  if $suexec_user_group {
-    include apache::mod::suexec
-  }
-
   if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
     include apache::mod::passenger
   }
@@ -2755,7 +2751,9 @@
 
   # Template uses:
   # - $suexec_user_group
-  if $suexec_user_group {
+  if $suexec_user_group and $ensure == 'present' {
+    include apache::mod::suexec
+
     concat::fragment { "${name}-suexec":
       target  => "${priority_real}${filename}.conf",
       order   => 290,

From bc0891de30dbb8940e02a457974050fbff4f519c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:06:37 +0200
Subject: [PATCH 1946/2267] Localize apache::mod::passenger inclusion in
 vhost.pp

---
 manifests/vhost.pp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index c2bf82db9d..d5a420932f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2039,10 +2039,6 @@
     include apache::mod::auth_openidc
   }
 
-  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
-    include apache::mod::passenger
-  }
-
   # Configure the defaultness of a vhost
   if $priority {
     $priority_real = "${priority}-"
@@ -2832,7 +2828,9 @@
   # - $passenger_max_requests
   # - $passenger_max_request_time
   # - $passenger_memory_limit
-  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
+  if ($passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef) and $ensure == 'present' {
+    include apache::mod::passenger
+
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,

From e9e39d763ad93e4690e56da0aa16e7abeed350a4 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:08:16 +0200
Subject: [PATCH 1947/2267] Localize apache::mod::auth_kerb inclusion in
 vhost.pp

---
 manifests/vhost.pp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d5a420932f..65679c95dd 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2031,10 +2031,6 @@
     }
   }
 
-  if $auth_kerb and $ensure == 'present' {
-    include apache::mod::auth_kerb
-  }
-
   if $auth_oidc and $ensure == 'present' {
     include apache::mod::auth_openidc
   }
@@ -2655,7 +2651,9 @@
   # - $krb_auth_realms
   # - $krb_5keytab
   # - $krb_local_user_mapping
-  if $auth_kerb {
+  if $auth_kerb and $ensure == 'present' {
+    include apache::mod::auth_kerb
+
     concat::fragment { "${name}-auth_kerb":
       target  => "${priority_real}${filename}.conf",
       order   => 230,

From fd969b85b7c7e0f55be2f8871f9907499442e997 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:08:50 +0200
Subject: [PATCH 1948/2267] Localize apache::mod::auth_openidc inclusion in
 vhost.pp

---
 manifests/vhost.pp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 65679c95dd..a551a5f0ae 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2031,10 +2031,6 @@
     }
   }
 
-  if $auth_oidc and $ensure == 'present' {
-    include apache::mod::auth_openidc
-  }
-
   # Configure the defaultness of a vhost
   if $priority {
     $priority_real = "${priority}-"
@@ -2921,7 +2917,9 @@
   # Template uses:
   # - $auth_oidc
   # - $oidc_settings
-  if $auth_oidc {
+  if $auth_oidc and $ensure == 'present' {
+    include apache::mod::auth_openidc
+
     concat::fragment { "${name}-auth_oidc":
       target  => "${priority_real}${filename}.conf",
       order   => 360,

From b19a09e289844975c1da900915cb3d5fe9b61ccf Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:10:12 +0200
Subject: [PATCH 1949/2267] Localize apache::mod::ssl inclusion in vhost.pp

The apache::mod::mime inclusion is dropped since apache::mod::ssl
already includes it (since fc8fee7ef3d91e8c4ec2fcc2e19e6ad4cb46028e) and
apache/vhost/_ssl.erb does not use AddType.
---
 manifests/vhost.pp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a551a5f0ae..2eef19fe3e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2013,12 +2013,6 @@
 
   # Input validation ends
 
-  if $ssl and $ensure == 'present' {
-    include apache::mod::ssl
-    # Required for the AddType lines.
-    include apache::mod::mime
-  }
-
   if $ssl_honorcipherorder =~ Boolean or $ssl_honorcipherorder == undef {
     $_ssl_honorcipherorder = $ssl_honorcipherorder
   } else {
@@ -2614,6 +2608,8 @@
   # - $ssl_stapling
   # - $apache_version
   if $ssl and $ensure == 'present' {
+    include apache::mod::ssl
+
     concat::fragment { "${name}-ssl":
       target  => "${priority_real}${filename}.conf",
       order   => 230,

From 3b6c262066f180147189961f6f8de3893942dc11 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 11:51:52 +0200
Subject: [PATCH 1950/2267] Clean up inclusion of mod::env and mod::setenvif

There is no need to check if the variables are true because the data
type doesn't allow anything that evaluates to false. The logic to
include it is also moved to the template which makes it easier to
follow the logic.

The same is applied to the template.
---
 manifests/vhost.pp          | 29 ++++++++++-------------------
 templates/vhost/_setenv.erb |  6 +++---
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 2eef19fe3e..4ca35e60f3 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2190,24 +2190,6 @@
     }
   }
 
-  # Check if mod_env is required and not yet loaded.
-  # create an expression to simplify the conditional check
-  $use_env_mod = $setenv and ! empty($setenv)
-  if ($use_env_mod) {
-    if ! defined(Class['apache::mod::env']) {
-      include apache::mod::env
-    }
-  }
-  # Check if mod_setenvif is required and not yet loaded.
-  # create an expression to simplify the conditional check
-  $use_setenvif_mod = ($setenvif and ! empty($setenvif)) or ($setenvifnocase and ! empty($setenvifnocase))
-
-  if ($use_setenvif_mod) {
-    if ! defined(Class['apache::mod::setenvif']) {
-      include apache::mod::setenvif
-    }
-  }
-
   ## Create a default directory list if none defined
   if $directories {
     $_directories = $directories
@@ -2580,7 +2562,16 @@
   # Template uses:
   # - $setenv
   # - $setenvif
-  if ($use_env_mod or $use_setenvif_mod) {
+  $use_env_mod = !empty($setenv)
+  $use_setenvif_mod = !empty($setenvif) or !empty($setenvifnocase)
+  if ($use_env_mod or $use_setenvif_mod) and $ensure == 'present' {
+    if $use_env_mod {
+      include apache::mod::env
+    }
+    if $use_setenvif_mod {
+      include apache::mod::setenvif
+    }
+
     concat::fragment { "${name}-setenv":
       target  => "${priority_real}${filename}.conf",
       order   => 220,
diff --git a/templates/vhost/_setenv.erb b/templates/vhost/_setenv.erb
index 476a6b19ca..0bcbc1bd57 100644
--- a/templates/vhost/_setenv.erb
+++ b/templates/vhost/_setenv.erb
@@ -1,16 +1,16 @@
-<% if @setenv and ! @setenv.empty? -%>
+<% unless @setenv.empty? -%>
 
   ## SetEnv/SetEnvIf for environment variables
   <%- Array(@setenv).each do |envvar| -%>
   SetEnv <%= envvar %>
   <%- end -%>
 <% end -%>
-<% if @setenvif and ! @setenvif.empty? -%>
+<% unless @setenvif.empty? -%>
   <%- Array(@setenvif).each do |envifvar| -%>
   SetEnvIf <%= envifvar %>
   <%- end -%>
 <% end -%>
-<% if @setenvifnocase and ! @setenvifnocase.empty? -%>
+<% unless @setenvifnocase.empty? -%>
   <%- Array(@setenvifnocase).each do |envifncvar| -%>
   SetEnvIfNoCase <%= envifncvar %>
   <%- end -%>

From 2817713e68e53bc7406974adc0799848c4684e22 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 11:54:58 +0200
Subject: [PATCH 1951/2267] Simplify scriptalias template

The data type only allows an array for scriptaliases so there is no need
to check for the type. It is also checked at in vhost.pp that the value
is set so there's no need to repeat that logic in the template.
---
 templates/vhost/_scriptalias.erb | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index bb4f6b316e..ffa69f932e 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -1,17 +1,8 @@
-<%- if @scriptaliases.is_a?(Array) -%>
-<%-  aliases = @scriptaliases -%>
-<%- elsif @scriptaliases.is_a?(Hash) -%>
-<%-  aliases = [@scriptaliases] -%>
-<%- else -%>
-<%-  # Nothing to do with any other data type -%>
-<%-  aliases = [] -%>
-<%- end -%>
-<%- if @scriptalias or !aliases.empty? -%>
+<%- aliases = @scriptaliases -%>
   ## Script alias directives
-<%# Combine scriptalais and scriptaliases into a single data structure -%>
+<%# Combine scriptalias and scriptaliases into a single data structure -%>
 <%# for backward compatibility and ease of implementation -%>
 <%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%>
-<%- aliases.flatten.compact! -%>
 <%- aliases.each do |salias| -%>
   <%- if salias["path"] != '' -%>
     <%- if salias["alias"] and salias["alias"] != '' -%>
@@ -21,4 +12,3 @@
     <%- end -%>
   <%- end -%>
 <%- end -%>
-<%- end -%>

From e10459d431b5998f85a8e404d10dee2269b44445 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:15:50 +0200
Subject: [PATCH 1952/2267] Simplify apache::vhost::serveraliases logic

The data type does not allow a value that evaluates to false so no need
ot check for it.
---
 manifests/vhost.pp               | 2 +-
 templates/vhost/_serveralias.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 4ca35e60f3..c9c700ddbd 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2551,7 +2551,7 @@
 
   # Template uses:
   # - $serveraliases
-  if $serveraliases and ! empty($serveraliases) {
+  if ! empty($serveraliases) and $ensure == 'present' {
     concat::fragment { "${name}-serveralias":
       target  => "${priority_real}${filename}.conf",
       order   => 210,
diff --git a/templates/vhost/_serveralias.erb b/templates/vhost/_serveralias.erb
index e08a55e328..ef8bec8554 100644
--- a/templates/vhost/_serveralias.erb
+++ b/templates/vhost/_serveralias.erb
@@ -1,4 +1,4 @@
-<% if @serveraliases and ! @serveraliases.empty? -%>
+<% unless @serveraliases.empty? -%>
 
   ## Server aliases
   <%- Array(@serveraliases).each do |serveralias| -%>

From f496d762a8bf75e3872597a7caa8faa451d3117f Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:19:00 +0200
Subject: [PATCH 1953/2267] Document uses of $mdomain

Fixes: 2349ba7f35442493d29a08676382044aebaa6eae
---
 manifests/vhost.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index c9c700ddbd..0a14a4dc74 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2281,6 +2281,7 @@
   # - $protocols
   # - $protocols_honor_order
   # - $apache_version
+  # - $mdomain
   concat::fragment { "${name}-apache-header":
     target  => "${priority_real}${filename}.conf",
     order   => 0,
@@ -2598,6 +2599,7 @@
   # - $ssl_openssl_conf_cmd
   # - $ssl_stapling
   # - $apache_version
+  # - $mdomain
   if $ssl and $ensure == 'present' {
     include apache::mod::ssl
 

From 3262f233479c4f83a1a624fd9b173031ad83d950 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:20:06 +0200
Subject: [PATCH 1954/2267] Only include modules if ensure is present

---
 manifests/vhost.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0a14a4dc74..c9e4873ec0 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2740,7 +2740,7 @@
     }
   }
 
-  if $h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef {
+  if ($h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef) and $ensure == 'present' {
     include apache::mod::http2
 
     concat::fragment { "${name}-http2":
@@ -2750,13 +2750,13 @@
     }
   }
 
-  if $mdomain {
+  if $mdomain and $ensure == 'present' {
     include apache::mod::md
   }
 
   # Template uses:
   # - $userdir
-  if $userdir {
+  if $userdir and $ensure == 'present' {
     include apache::mod::userdir
 
     concat::fragment { "${name}-userdir":

From 602ebd1b74dc50a0d9de4d20743c87906a0f7f7e Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 29 Jun 2022 12:05:16 +0200
Subject: [PATCH 1955/2267] Group assertions in vhost spec

This uses chaining to remove a lot of separate expectations. The big
benefit is that it's a lot quicker to run and if one thing fails (like
the whole catalog fails to compile) there is just a single error for the
fragment rather than one for each test. It's also a lot shorter.
---
 spec/defines/vhost_spec.rb | 1450 ++++++++----------------------------
 1 file changed, 299 insertions(+), 1151 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f0efb63f4f..44e6da9c66 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -602,1123 +602,318 @@
                                                                                     'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf")
             }
           end
-          it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{^\s+LimitRequestFieldSize 8190$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{^\s+LimitRequestFields 100$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{^\s+LimitRequestLine 8190$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{^\s+LimitRequestBody 0$},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-aliases').with(
-              content: %r{^\s+Alias /image "/rspec/image"$},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<Proxy "\*">$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Include\s'\/custom\/path\/includes'$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Include\s'\/custom\/path\/another_includes'$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+H2CopyFiles\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+H2PushResource\s/foo.css$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+H2PushResource\s/foo.js$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require valid-user$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require all denied$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require all granted$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<RequireAll>$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<\/RequireAll>$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require all-valid1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require all-valid2$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<RequireNone>$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<\/RequireNone>$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require none-valid1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require none-valid2$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<RequireAny>$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<\/RequireAny>$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require any-valid1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Require any-valid2$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+LDAPReferrals off$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+ProxyPass http://backend-b/ retry=0 timeout=5 noquery interpolate$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+ProxyPassMatch http://backend-b/ retry=0 timeout=5 noquery interpolate$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+IndexOptions\sFancyIndexing$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+IndexStyleSheet\s'\/styles\/style\.css'$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+DirectoryIndex\sdisabled$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+SetOutputFilter\soutput_filter$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+SetInputFilter\sinput_filter$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<Limit GET HEAD>$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>}m,
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+<LimitExcept GET HEAD>$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/LimitExcept>}m,
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+Dav\sfilesystem$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+DavDepthInfinity\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+DavMinTimeout\s600$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerEnabled\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerBaseURI\s/app$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerRuby\s/path/to/ruby$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerPython\s/path/to/python$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerNodejs\s/path/to/nodejs$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerMeteorAppSettings\s/path/to/file\.json$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerAppEnv\sdemo$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerAppRoot\s/var/www/node-app$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerAppGroupName\sfoo_bar$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerAppType\snode$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerStartupFile\sstart\.js$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerRestartDir\stemp$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerPreloadBundler\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerRollingRestarts\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerResistDeploymentErrors\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerUser\snodeuser$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerGroup\snodegroup$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerFriendlyErrorPages\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerMinInstances\s7$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerMaxInstances\s9$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s12$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerStartTimeout\s10$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerConcurrencyModel\sthread$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerThreadCount\s20$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerMaxRequests\s2000$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerMaxRequestTime\s1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerMemoryLimit\s32$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerHighPerformance\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerBufferUpload\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerBufferResponse\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerErrorOverride\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerMaxRequestQueueSize\s120$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerMaxRequestQueueTime\s5$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerStickySessions\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerStickySessionsCookieName\s_delicious_cookie$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerAllowEncodedSlashes\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+PassengerDebugger\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiAcceptorName\s{HOSTNAME}$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiAllowedMech\skrb5$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiAllowedMech\siakerb$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiAllowedMech\sntlmssp$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiBasicAuth\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiBasicAuthMech\skrb5$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiBasicAuthMech\siakerb$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiBasicAuthMech\sntlmssp$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiBasicTicketTimeout\s300$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiConnectionBound\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiCredStore\sccache:FILE:/path/to/directory$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiCredStore\sclient_keytab:/path/to/example\.keytab$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiCredStore\skeytab:/path/to/example\.keytab$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiDelegCcacheDir\s/path/to/directory$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiDelegCcacheEnvVar\sKRB5CCNAME$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiDelegCcachePerms\smode:0600\suid:example-user\sgid:example-group$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiDelegCcacheUnique\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiImpersonate\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiLocalName\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiNameAttributes\sjson$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiNegotiateOnce\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiPublishErrors\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiPublishMech\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiRequiredNameAttributes\s"auth-indicators=high"$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiSessionKey\sfile:/path/to/example\.key$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiSignalPersistentAuth\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiSSLonly\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiUseS4U2Proxy\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+GssapiUseSessions\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+SSLVerifyClient\soptional$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-              content: %r{^\s+SSLVerifyDepth\s10$},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-logging')
-              .with_content(%r{^\s+ErrorLogFormat "\[%t\] \[%l\] %7F: %E: \[client\\ %a\] %M% ,\\ referer\\ %\{Referer\}i"$})
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
-          it { is_expected.not_to contain_concat__fragment('rspec.example.com-access_log') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{retry=0},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{timeout=5},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{SetEnv force-proxy-request-1.0 1},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{SetEnv proxy-nokeepalive 1},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{noquery interpolate},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{ProxyPreserveHost On},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{ProxyAddHeaders On},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{ProxyPassReverseCookiePath\s+\/a\s+http:\/\/},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
-              content: %r{^\s+RewriteOptions Inherit$},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-              %r{SetEnv FOO=/bin/true},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-              %r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content(
-              %r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
-              content: %r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
-              content: %r{^\s+SSLHonorCipherOrder\s+Off$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-ssl').with(
-              content: %r{^\s+SSLUserName\s+SSL_CLIENT_S_DN_CN$},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-              content: %r{^\s+SSLProxyEngine On$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-              content: %r{^\s+SSLProxyCheckPeerCN\s+on$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-              content: %r{^\s+SSLProxyCheckPeerName\s+on$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-              content: %r{^\s+SSLProxyCheckPeerExpire\s+on$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-              content: %r{^\s+SSLProxyCipherSuite\s+HIGH$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with(
-              content: %r{^\s+SSLProxyProtocol\s+TLSv1.2$},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
-              content: %r{^\s+FilterDeclare COMPRESS$},
-            )
-          }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
-          it { is_expected.not_to contain_concat__fragment('rspec.example.com-security') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
-              content: %r{^\s+JkMount\s+\/\*\s+tcnode1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with(
-              content: %r{^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-              content: %r{^\s+KrbMethodNegotiate\soff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-              content: %r{^\s+KrbAuthoritative\soff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-              content: %r{^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-              content: %r{^\s+Krb5Keytab\s\/tmp\/keytab5$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-              content: %r{^\s+KrbLocalUserMapping\soff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-              content: %r{^\s+KrbServiceName\sHTTP$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-              content: %r{^\s+KrbSaveCredentials\soff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
-              content: %r{^\s+KrbVerifyKDC\son$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
-              content: %r{^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-              content: %r{^\s+KeepAlive\son$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-              content: %r{^\s+KeepAliveTimeout\s100$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with(
-              content: %r{^\s+MaxKeepAliveRequests\s1000$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{^\s+Protocols\sh2 http/1.1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{^\s+ProtocolsHonorOrder\sOn$},
-            )
-          }
-
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2CopyFiles\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2Direct\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2EarlyHints\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2MaxSessionStreams\s100$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2ModernTLSOnly\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2Push\sOn$},
-            )
-          }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2PushDiarySize\s256$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header')
+              .with_content(%r{^\s+LimitRequestFieldSize 8190$})
+              .with_content(%r{^\s+LimitRequestFields 100$})
+              .with_content(%r{^\s+LimitRequestLine 8190$})
+              .with_content(%r{^\s+LimitRequestBody 0$})
           }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2PushPriority\sapplication/json 32$},
+            is_expected.to contain_concat__fragment('rspec.example.com-aliases').with(
+              content: %r{^\s+Alias /image "/rspec/image"$},
             )
           }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2PushResource\s/css/main.css$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-directories')
+              .with_content(%r{^\s+<Proxy "\*">$})
+              .with_content(%r{^\s+Include\s'\/custom\/path\/includes'$})
+              .with_content(%r{^\s+Include\s'\/custom\/path\/another_includes'$})
+              .with_content(%r{^\s+H2CopyFiles\sOn$})
+              .with_content(%r{^\s+H2PushResource\s/foo.css$})
+              .with_content(%r{^\s+H2PushResource\s/foo.js$})
+              .with_content(%r{^\s+Require valid-user$})
+              .with_content(%r{^\s+Require all denied$})
+              .with_content(%r{^\s+Require all granted$})
+              .with_content(%r{^\s+<RequireAll>$})
+              .with_content(%r{^\s+<\/RequireAll>$})
+              .with_content(%r{^\s+Require all-valid1$})
+              .with_content(%r{^\s+Require all-valid2$})
+              .with_content(%r{^\s+<RequireNone>$})
+              .with_content(%r{^\s+<\/RequireNone>$})
+              .with_content(%r{^\s+Require none-valid1$})
+              .with_content(%r{^\s+Require none-valid2$})
+              .with_content(%r{^\s+<RequireAny>$})
+              .with_content(%r{^\s+<\/RequireAny>$})
+              .with_content(%r{^\s+Require any-valid1$})
+              .with_content(%r{^\s+Require any-valid2$})
+              .with_content(%r{^\s+LDAPReferrals off$})
+              .with_content(%r{^\s+ProxyPass http://backend-b/ retry=0 timeout=5 noquery interpolate$})
+              .with_content(%r{^\s+ProxyPassMatch http://backend-b/ retry=0 timeout=5 noquery interpolate$})
+              .with_content(%r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$})
+              .with_content(%r{^\s+IndexOptions\sFancyIndexing$})
+              .with_content(%r{^\s+IndexStyleSheet\s'\/styles\/style\.css'$})
+              .with_content(%r{^\s+DirectoryIndex\sdisabled$})
+              .with_content(%r{^\s+SetOutputFilter\soutput_filter$})
+              .with_content(%r{^\s+SetInputFilter\sinput_filter$})
+              .with_content(%r{^\s+<Limit GET HEAD>$})
+              .with_content(%r{\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>}m)
+              .with_content(%r{^\s+<LimitExcept GET HEAD>$})
+              .with_content(%r{\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/LimitExcept>}m)
+              .with_content(%r{^\s+Dav\sfilesystem$})
+              .with_content(%r{^\s+DavDepthInfinity\sOn$})
+              .with_content(%r{^\s+DavMinTimeout\s600$})
+              .with_content(%r{^\s+PassengerEnabled\sOn$})
+              .with_content(%r{^\s+PassengerBaseURI\s/app$})
+              .with_content(%r{^\s+PassengerRuby\s/path/to/ruby$})
+              .with_content(%r{^\s+PassengerPython\s/path/to/python$})
+              .with_content(%r{^\s+PassengerNodejs\s/path/to/nodejs$})
+              .with_content(%r{^\s+PassengerMeteorAppSettings\s/path/to/file\.json$})
+              .with_content(%r{^\s+PassengerAppEnv\sdemo$})
+              .with_content(%r{^\s+PassengerAppRoot\s/var/www/node-app$})
+              .with_content(%r{^\s+PassengerAppGroupName\sfoo_bar$})
+              .with_content(%r{^\s+PassengerAppType\snode$})
+              .with_content(%r{^\s+PassengerStartupFile\sstart\.js$})
+              .with_content(%r{^\s+PassengerRestartDir\stemp$})
+              .with_content(%r{^\s+PassengerLoadShellEnvvars\sOff$})
+              .with_content(%r{^\s+PassengerPreloadBundler\sOff$})
+              .with_content(%r{^\s+PassengerRollingRestarts\sOff$})
+              .with_content(%r{^\s+PassengerResistDeploymentErrors\sOff$})
+              .with_content(%r{^\s+PassengerUser\snodeuser$})
+              .with_content(%r{^\s+PassengerGroup\snodegroup$})
+              .with_content(%r{^\s+PassengerFriendlyErrorPages\sOn$})
+              .with_content(%r{^\s+PassengerMinInstances\s7$})
+              .with_content(%r{^\s+PassengerMaxInstances\s9$})
+              .with_content(%r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s12$})
+              .with_content(%r{^\s+PassengerStartTimeout\s10$})
+              .with_content(%r{^\s+PassengerConcurrencyModel\sthread$})
+              .with_content(%r{^\s+PassengerThreadCount\s20$})
+              .with_content(%r{^\s+PassengerMaxRequests\s2000$})
+              .with_content(%r{^\s+PassengerMaxRequestTime\s1$})
+              .with_content(%r{^\s+PassengerMemoryLimit\s32$})
+              .with_content(%r{^\s+PassengerHighPerformance\sOff$})
+              .with_content(%r{^\s+PassengerBufferUpload\sOff$})
+              .with_content(%r{^\s+PassengerBufferResponse\sOff$})
+              .with_content(%r{^\s+PassengerErrorOverride\sOff$})
+              .with_content(%r{^\s+PassengerMaxRequestQueueSize\s120$})
+              .with_content(%r{^\s+PassengerMaxRequestQueueTime\s5$})
+              .with_content(%r{^\s+PassengerStickySessions\sOn$})
+              .with_content(%r{^\s+PassengerStickySessionsCookieName\s_delicious_cookie$})
+              .with_content(%r{^\s+PassengerAllowEncodedSlashes\sOff$})
+              .with_content(%r{^\s+PassengerDebugger\sOff$})
+              .with_content(%r{^\s+GssapiAcceptorName\s{HOSTNAME}$})
+              .with_content(%r{^\s+GssapiAllowedMech\skrb5$})
+              .with_content(%r{^\s+GssapiAllowedMech\siakerb$})
+              .with_content(%r{^\s+GssapiAllowedMech\sntlmssp$})
+              .with_content(%r{^\s+GssapiBasicAuth\sOn$})
+              .with_content(%r{^\s+GssapiBasicAuthMech\skrb5$})
+              .with_content(%r{^\s+GssapiBasicAuthMech\siakerb$})
+              .with_content(%r{^\s+GssapiBasicAuthMech\sntlmssp$})
+              .with_content(%r{^\s+GssapiBasicTicketTimeout\s300$})
+              .with_content(%r{^\s+GssapiConnectionBound\sOn$})
+              .with_content(%r{^\s+GssapiCredStore\sccache:FILE:/path/to/directory$})
+              .with_content(%r{^\s+GssapiCredStore\sclient_keytab:/path/to/example\.keytab$})
+              .with_content(%r{^\s+GssapiCredStore\skeytab:/path/to/example\.keytab$})
+              .with_content(%r{^\s+GssapiDelegCcacheDir\s/path/to/directory$})
+              .with_content(%r{^\s+GssapiDelegCcacheEnvVar\sKRB5CCNAME$})
+              .with_content(%r{^\s+GssapiDelegCcachePerms\smode:0600\suid:example-user\sgid:example-group$})
+              .with_content(%r{^\s+GssapiDelegCcacheUnique\sOn$})
+              .with_content(%r{^\s+GssapiImpersonate\sOn$})
+              .with_content(%r{^\s+GssapiLocalName\sOn$})
+              .with_content(%r{^\s+GssapiNameAttributes\sjson$})
+              .with_content(%r{^\s+GssapiNegotiateOnce\sOn$})
+              .with_content(%r{^\s+GssapiPublishErrors\sOn$})
+              .with_content(%r{^\s+GssapiPublishMech\sOn$})
+              .with_content(%r{^\s+GssapiRequiredNameAttributes\s"auth-indicators=high"$})
+              .with_content(%r{^\s+GssapiSessionKey\sfile:/path/to/example\.key$})
+              .with_content(%r{^\s+GssapiSignalPersistentAuth\sOn$})
+              .with_content(%r{^\s+GssapiSSLonly\sOn$})
+              .with_content(%r{^\s+GssapiUseS4U2Proxy\sOn$})
+              .with_content(%r{^\s+GssapiUseSessions\sOn$})
+              .with_content(%r{^\s+SSLVerifyClient\soptional$})
+              .with_content(%r{^\s+SSLVerifyDepth\s10$})
           }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2PushResource\s/js/main.js$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-logging')
+              .with_content(%r{^\s+ErrorLogFormat "\[%t\] \[%l\] %7F: %E: \[client\\ %a\] %M% ,\\ referer\\ %\{Referer\}i"$})
           }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-access_log') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2SerializeHeaders\sOff$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-proxy')
+              .with_content(%r{retry=0})
+              .with_content(%r{timeout=5})
+              .with_content(%r{SetEnv force-proxy-request-1.0 1})
+              .with_content(%r{SetEnv proxy-nokeepalive 1})
+              .with_content(%r{noquery interpolate})
+              .with_content(%r{ProxyPreserveHost On})
+              .with_content(%r{ProxyAddHeaders On})
+              .with_content(%r{ProxyPassReverseCookiePath\s+\/a\s+http:\/\/})
+              .with_content(%r{ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo})
           }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2StreamMaxMemSize\s65536$},
+            is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
+              content: %r{^\s+RewriteOptions Inherit$},
             )
           }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2TLSCoolDownSecs\s1$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-setenv')
+              .with_content(%r{SetEnv FOO=/bin/true})
+              .with_content(%r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif})
+              .with_content(%r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true})
           }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2TLSWarmUpSize\s1048576$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-ssl')
+              .with_content(%r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$})
+              .with_content(%r{^\s+SSLHonorCipherOrder\s+Off$})
+              .with_content(%r{^\s+SSLUserName\s+SSL_CLIENT_S_DN_CN$})
           }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2Upgrade\sOn$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy')
+              .with_content(%r{^\s+SSLProxyEngine On$})
+              .with_content(%r{^\s+SSLProxyCheckPeerCN\s+on$})
+              .with_content(%r{^\s+SSLProxyCheckPeerName\s+on$})
+              .with_content(%r{^\s+SSLProxyCheckPeerExpire\s+on$})
+              .with_content(%r{^\s+SSLProxyCipherSuite\s+HIGH$})
+              .with_content(%r{^\s+SSLProxyProtocol\s+TLSv1.2$})
           }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2').with(
-              content: %r{^\s+H2WindowSize\s65535$},
+            is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
+              content: %r{^\s+FilterDeclare COMPRESS$},
             )
           }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-security') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerEnabled\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerBaseURI\s/app$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerPython\s/usr/local/bin/python$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerNodejs\s/usr/bin/node$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMeteorAppSettings\s/path/to/some/file.json$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerAppEnv\stest$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerAppRoot\s/usr/share/myapp$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerAppGroupName\sapp_customer$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerAppType\srack$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerStartupFile\sbin/www$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerRestartDir\stmp$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerSpawnMethod\sdirect$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerLoadShellEnvvars\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerPreloadBundler\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerRollingRestarts\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerResistDeploymentErrors\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerUser\ssandbox$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerGroup\ssandbox$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerFriendlyErrorPages\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMinInstances\s1$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMaxInstances\s30$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMaxPreloaderIdleTime\s600$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s10$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerStartTimeout\s600$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerConcurrencyModel\sthread$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerThreadCount\s5$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMaxRequests\s1000$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMaxRequestTime\s2$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMemoryLimit\s64$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerStatThrottleRate\s5$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-file_footer').with(
-              content: %r{^PassengerPreStart\shttp://localhost/myapp$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerHighPerformance\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerBufferUpload\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerBufferResponse\sOff$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerErrorOverride\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMaxRequestQueueSize\s10$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerMaxRequestQueueTime\s2$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerStickySessions\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerStickySessionsCookieName\s_nom_nom_nom$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerAllowEncodedSlashes\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerDebugger\sOn$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger').with(
-              content: %r{^\s+PassengerLveMinUid\s500$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
-              content: %r{^\s+OIDCProviderMetadataURL\shttps:\/\/login.example.com\/\.well-known\/openid-configuration$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
-              content: %r{^\s+OIDCClientID\stest$},
-            )
-          }
-          it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
-              content: %r{^\s+OIDCRedirectURI\shttps:\/\/login\.example.com\/redirect_uri$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-file_footer')
+              .with_content(%r{^PassengerPreStart\shttp://localhost/myapp$})
           }
+
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
-              content: %r{^\s+OIDCProviderTokenEndpointAuth\sclient_secret_basic$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts')
+              .with_content(%r{^\s+JkMount\s+\/\*\s+tcnode1$})
+              .with_content(%r{^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$})
           }
+
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
-              content: %r{^\s+OIDCRemoteUserClaim\ssub$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb')
+              .with_content(%r{^\s+KrbMethodNegotiate\soff$})
+              .with_content(%r{^\s+KrbAuthoritative\soff$})
+              .with_content(%r{^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$})
+              .with_content(%r{^\s+Krb5Keytab\s\/tmp\/keytab5$})
+              .with_content(%r{^\s+KrbLocalUserMapping\soff$})
+              .with_content(%r{^\s+KrbServiceName\sHTTP$})
+              .with_content(%r{^\s+KrbSaveCredentials\soff$})
+              .with_content(%r{^\s+KrbVerifyKDC\son$})
           }
+
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
-              content: %r{^\s+OIDCClientSecret\saae053a9-4abf-4824-8956-e94b2af335c8$},
+            is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
+              content: %r{^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$},
             )
           }
+
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
-              content: %r{^\s+OIDCCryptoPassphrase\s4ad1bb46-9979-450e-ae58-c696967df3cd$},
-            )
+            is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options')
+              .with_content(%r{^\s+KeepAlive\son$})
+              .with_content(%r{^\s+KeepAliveTimeout\s100$})
+              .with_content(%r{^\s+MaxKeepAliveRequests\s1000$})
+          }
+
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-apache-header')
+              .with_content(%r{^\s+Protocols\sh2 http/1.1$})
+              .with_content(%r{^\s+ProtocolsHonorOrder\sOn$})
+          }
+
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-http2')
+              .with_content(%r{^\s+H2CopyFiles\sOff$})
+              .with_content(%r{^\s+H2Direct\sOn$})
+              .with_content(%r{^\s+H2EarlyHints\sOff$})
+              .with_content(%r{^\s+H2MaxSessionStreams\s100$})
+              .with_content(%r{^\s+H2ModernTLSOnly\sOn$})
+              .with_content(%r{^\s+H2Push\sOn$})
+              .with_content(%r{^\s+H2PushDiarySize\s256$})
+              .with_content(%r{^\s+H2PushPriority\sapplication/json 32$})
+              .with_content(%r{^\s+H2PushResource\s/css/main.css$})
+              .with_content(%r{^\s+H2PushResource\s/js/main.js$})
+              .with_content(%r{^\s+H2SerializeHeaders\sOff$})
+              .with_content(%r{^\s+H2StreamMaxMemSize\s65536$})
+              .with_content(%r{^\s+H2TLSCoolDownSecs\s1$})
+              .with_content(%r{^\s+H2TLSWarmUpSize\s1048576$})
+              .with_content(%r{^\s+H2Upgrade\sOn$})
+              .with_content(%r{^\s+H2WindowSize\s65535$})
+          }
+
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-passenger')
+              .with_content(%r{^\s+PassengerEnabled\sOff$})
+              .with_content(%r{^\s+PassengerBaseURI\s/app$})
+              .with_content(%r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$})
+              .with_content(%r{^\s+PassengerPython\s/usr/local/bin/python$})
+              .with_content(%r{^\s+PassengerNodejs\s/usr/bin/node$})
+              .with_content(%r{^\s+PassengerMeteorAppSettings\s/path/to/some/file.json$})
+              .with_content(%r{^\s+PassengerAppEnv\stest$})
+              .with_content(%r{^\s+PassengerAppRoot\s/usr/share/myapp$})
+              .with_content(%r{^\s+PassengerAppGroupName\sapp_customer$})
+              .with_content(%r{^\s+PassengerAppType\srack$})
+              .with_content(%r{^\s+PassengerStartupFile\sbin/www$})
+              .with_content(%r{^\s+PassengerRestartDir\stmp$})
+              .with_content(%r{^\s+PassengerSpawnMethod\sdirect$})
+              .with_content(%r{^\s+PassengerLoadShellEnvvars\sOff$})
+              .with_content(%r{^\s+PassengerPreloadBundler\sOff$})
+              .with_content(%r{^\s+PassengerRollingRestarts\sOff$})
+              .with_content(%r{^\s+PassengerResistDeploymentErrors\sOn$})
+              .with_content(%r{^\s+PassengerUser\ssandbox$})
+              .with_content(%r{^\s+PassengerGroup\ssandbox$})
+              .with_content(%r{^\s+PassengerFriendlyErrorPages\sOff$})
+              .with_content(%r{^\s+PassengerMinInstances\s1$})
+              .with_content(%r{^\s+PassengerMaxInstances\s30$})
+              .with_content(%r{^\s+PassengerMaxPreloaderIdleTime\s600$})
+              .with_content(%r{^\s+PassengerForceMaxConcurrentRequestsPerProcess\s10$})
+              .with_content(%r{^\s+PassengerStartTimeout\s600$})
+              .with_content(%r{^\s+PassengerConcurrencyModel\sthread$})
+              .with_content(%r{^\s+PassengerThreadCount\s5$})
+              .with_content(%r{^\s+PassengerMaxRequests\s1000$})
+              .with_content(%r{^\s+PassengerMaxRequestTime\s2$})
+              .with_content(%r{^\s+PassengerMemoryLimit\s64$})
+              .with_content(%r{^\s+PassengerStatThrottleRate\s5$})
+              .with_content(%r{^\s+PassengerHighPerformance\sOn$})
+              .with_content(%r{^\s+PassengerBufferUpload\sOff$})
+              .with_content(%r{^\s+PassengerBufferResponse\sOff$})
+              .with_content(%r{^\s+PassengerErrorOverride\sOn$})
+              .with_content(%r{^\s+PassengerMaxRequestQueueSize\s10$})
+              .with_content(%r{^\s+PassengerMaxRequestQueueTime\s2$})
+              .with_content(%r{^\s+PassengerStickySessions\sOn$})
+              .with_content(%r{^\s+PassengerStickySessionsCookieName\s_nom_nom_nom$})
+              .with_content(%r{^\s+PassengerAllowEncodedSlashes\sOn$})
+              .with_content(%r{^\s+PassengerDebugger\sOn$})
+              .with_content(%r{^\s+PassengerLveMinUid\s500$})
+          }
+
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc')
+              .with_content(%r{^\s+OIDCProviderMetadataURL\shttps:\/\/login.example.com\/\.well-known\/openid-configuration$})
+              .with_content(%r{^\s+OIDCClientID\stest$})
+              .with_content(%r{^\s+OIDCRedirectURI\shttps:\/\/login\.example.com\/redirect_uri$})
+              .with_content(%r{^\s+OIDCProviderTokenEndpointAuth\sclient_secret_basic$})
+              .with_content(%r{^\s+OIDCRemoteUserClaim\ssub$})
+              .with_content(%r{^\s+OIDCClientSecret\saae053a9-4abf-4824-8956-e94b2af335c8$})
+              .with_content(%r{^\s+OIDCCryptoPassphrase\s4ad1bb46-9979-450e-ae58-c696967df3cd$})
           }
+
           it { is_expected.to contain_class('apache::mod::md') }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
@@ -2129,44 +1324,15 @@
              (facts[:os]['name'] == 'Amazon') ||
              (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-                content: %r{^\s+Allow from 127\.0\.0\.1$},
-              )
-            }
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-                content: %r{^\s+Allow from 127\.0\.0\.2$},
-              )
-            }
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-                content: %r{^\s+Allow from 127\.0\.0\.5$},
-              )
-            }
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-                content: %r{^\s+Deny from 127\.0\.0\.3$},
-              )
-            }
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-                content: %r{^\s+Deny from 127\.0\.0\.4$},
-              )
-            }
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-                content: %r{^\s+Deny from all$},
-              )
-            }
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-                content: %r{^\s+Satisfy any$},
-              )
-            }
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
-                content: %r{^\s+Order deny,allow$},
-              )
+              is_expected.to contain_concat__fragment('rspec.example.com-directories')
+                .with_content(%r{^\s+Allow from 127\.0\.0\.1$})
+                .with_content(%r{^\s+Allow from 127\.0\.0\.2$})
+                .with_content(%r{^\s+Allow from 127\.0\.0\.5$})
+                .with_content(%r{^\s+Deny from 127\.0\.0\.3$})
+                .with_content(%r{^\s+Deny from 127\.0\.0\.4$})
+                .with_content(%r{^\s+Deny from all$})
+                .with_content(%r{^\s+Satisfy any$})
+                .with_content(%r{^\s+Order deny,allow$})
             }
           end
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-additional_includes') }
@@ -2486,33 +1652,12 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
-                content: %r{^\s+ErrorLogFormat "\[%\{uc\}t\] \[%-m:%-l\] \[R:%L\] \[C:%\{C\}L\] %7F: %E: %M"$},
-              )
-            }
-
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
-                content: %r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] Request %k on C:%\{c\}L pid:%P tid:%T"$},
-              )
-            }
-
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
-                content: %r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] UA:'%\+\{User-Agent\}i'"$},
-              )
-            }
-
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
-                content: %r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] Referer:'%\+\{Referer\}i'"$},
-              )
-            }
-
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
-                content: %r{^\s+ErrorLogFormat connection "\[%\{uc\}t\] \[C:%\{c\}L\] local\\ %a remote\\ %A"$},
-              )
+              is_expected.to contain_concat__fragment('rspec.example.com-logging')
+                .with_content(%r{^\s+ErrorLogFormat "\[%\{uc\}t\] \[%-m:%-l\] \[R:%L\] \[C:%\{C\}L\] %7F: %E: %M"$})
+                .with_content(%r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] Request %k on C:%\{c\}L pid:%P tid:%T"$})
+                .with_content(%r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] UA:'%\+\{User-Agent\}i'"$})
+                .with_content(%r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] Referer:'%\+\{Referer\}i'"$})
+                .with_content(%r{^\s+ErrorLogFormat connection "\[%\{uc\}t\] \[C:%\{c\}L\] local\\ %a remote\\ %A"$})
             }
           end
         end # error logs format
@@ -2604,7 +1749,6 @@
 
             it { is_expected.to compile }
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
-            it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
             # this works only with apache 2.4 and newer
             if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i > 6) ||
                (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i > 11)
@@ -2613,6 +1757,8 @@
                   content: %r{^\s+Require all granted$},
                 )
               }
+            else
+              it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
             end
           end
           context 'require unmanaged' do
@@ -2631,7 +1777,6 @@
 
             it { is_expected.to compile }
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
-            it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
             it {
               is_expected.not_to contain_concat__fragment('rspec.example.com-directories').with(
                 content: %r{^\s+Require all granted$},
@@ -2716,8 +1861,11 @@
               ],
             )
 
-            it { is_expected.to contain_concat__fragment('rspec.example.com-apache-userdir').with(content: %r{^\s+UserDir disabled$}) }
-            it { is_expected.to contain_concat__fragment('rspec.example.com-apache-userdir').with(content: %r{^\s+UUserDir enabled bob$}) }
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-apache-userdir')
+                .with(content: %r{^\s+UserDir disabled$})
+                .with(content: %r{^\s+UUserDir enabled bob$})
+            }
           end
         end
       end

From 43505ac7dbe9dd9f6f770261a020add4e5915d48 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 28 Jun 2022 16:07:07 +0200
Subject: [PATCH 1956/2267] Correct whitespacing in gssapi parameter
 documentation

Fixes: 891fdaf24992e0e96b0ae14e2eca8f1991db373a
---
 manifests/vhost.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index c9e4873ec0..bfb0d8cdf0 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1455,8 +1455,8 @@
 #   ```
 # 
 # @param gssapi
-#  Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
-#  ```puppet
+#   Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
+#   ```puppet
 #   include apache::mod::auth_gssapi
 #   apache::vhost { 'sample.example.net':
 #     docroot     => '/path/to/directory',

From 4f55588ad4e4fa4f04951076677420c9cbef0dc4 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 28 Jun 2022 16:10:29 +0200
Subject: [PATCH 1957/2267] Remove whitespace after parameter documentation

---
 manifests/vhost.pp | 290 ++++++++++++++++++++++-----------------------
 1 file changed, 145 insertions(+), 145 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bfb0d8cdf0..d5aa692678 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -32,20 +32,20 @@
 #
 # @param access_log
 #   Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
-# 
+#
 # @param access_log_env_var
 #   Specifies that only requests with particular environment variables be logged.
-# 
+#
 # @param access_log_file
 #   Sets the filename of the `*_access.log` placed in `logroot`. Given a virtual host ---for 
 #   instance, example.com--- it defaults to 'example.com_ssl.log' for 
 #   [SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and 
 #   `example.com_access.log` for unencrypted virtual hosts.
-# 
+#
 # @param access_log_format
 #   Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the 
 #   access log.
-# 
+#
 # @param access_log_pipe
 #   Specifies a pipe where Apache sends access log messages.
 #
@@ -55,21 +55,21 @@
 # @param access_logs
 #   Allows you to give a hash that specifies the state of each of the `access_log_*` 
 #   directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
-# 
+#
 # @param add_default_charset
 #   Sets a default media charset value for the `AddDefaultCharset` directive, which is 
 #   added to `text/plain` and `text/html` responses.
-# 
+#
 # @param add_listen
 #   Determines whether the virtual host creates a `Listen` statement.<br />
 #   Setting `add_listen` to `false` prevents the virtual host from creating a `Listen` 
 #   statement. This is important when combining virtual hosts that aren't passed an `ip` 
 #   parameter with those that are.
-# 
+#
 # @param use_optional_includes
 #   Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for 
 #   `additional_includes` in Apache 2.4 or newer.
-# 
+#
 # @param aliases
 #   Passes a list of [hashes][hash] to the virtual host to create `Alias`, `AliasMatch`, 
 #   `ScriptAlias` or `ScriptAliasMatch` directives as per the `mod_alias` documentation.<br />
@@ -107,44 +107,44 @@
 #   If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias` 
 #   directive might not be able to honor the `PassengerEnabled => off` statement. See 
 #   [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
-# 
+#
 # @param allow_encoded_slashes
 #   Sets the `AllowEncodedSlashes` declaration for the virtual host, overriding the server 
 #   default. This modifies the virtual host responses to URLs with `\` and `/` characters. The 
 #   default setting omits the declaration from the server configuration and selects the 
 #   Apache default setting of `Off`.
-# 
+#
 # @param block
 #   Specifies the list of things to which Apache blocks access. Valid options are: `scm` (which 
 #   blocks web access to `.svn`), `.git`, and `.bzr` directories.
-# 
+#
 # @param cas_attribute_prefix
 #   Adds a header with the value of this header being the attribute values when SAML 
 #   validation is enabled.
-# 
+#
 # @param cas_attribute_delimiter
 #   Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
-# 
+#
 # @param cas_login_url
 #   Sets the URL to which the module redirects users when they attempt to access a 
 #   CAS-protected resource and don't have an active session.
-# 
+#
 # @param cas_root_proxied_as
 #   Sets the URL end users see when access to this Apache server is proxied per vhost. 
 #   This URL should not include a trailing slash.
-# 
+#
 # @param cas_scrub_request_headers
 #   Remove inbound request headers that may have special meaning within mod_auth_cas.
-# 
+#
 # @param cas_sso_enabled
 #   Enables experimental support for single sign out (may mangle POST data).
-# 
+#
 # @param cas_validate_saml
 #   Parse response from CAS server for SAML.
-# 
+#
 # @param cas_validate_url
 #   Sets the URL to use when validating a client-presented ticket in an HTTP query string.
-# 
+#
 # @param cas_cookie_path
 #   Sets the location where information on the current session should be stored. This should
 #   be writable by the web server only.
@@ -162,49 +162,49 @@
 #     "Frontend domain: x.example.org",
 #   ]
 #   ```
-# 
+#
 # @param default_vhost
 #   Sets a given `apache::vhost` defined type as the default to serve requests that do not 
 #   match any other `apache::vhost` defined types.
-# 
+#
 # @param directoryindex
 #   Sets the list of resources to look for when a client requests an index of the directory 
 #   by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive 
 #   documentation for details.
-# 
+#
 # @param docroot
 #   **Required**.<br />
 #   Sets the `DocumentRoot` location, from which Apache serves files.<br />
 #   If `docroot` and `manage_docroot` are both set to `false`, no `DocumentRoot` will be set 
 #   and the accompanying `<Directory /path/to/directory>` block will not be created.
-# 
+#
 # @param docroot_group
 #   Sets group access to the `docroot` directory.
-# 
+#
 # @param docroot_owner
 #   Sets individual user access to the `docroot` directory.
-# 
+#
 # @param docroot_mode
 #   Sets access permissions for the `docroot` directory, in numeric notation.
-# 
+#
 # @param manage_docroot
 #   Determines whether Puppet manages the `docroot` directory.
-# 
+#
 # @param error_log
 #   Specifies whether `*_error.log` directives should be configured.
-# 
+#
 # @param error_log_file
 #   Points the virtual host's error logs to a `*_error.log` file. If this parameter is 
 #   undefined, Puppet checks for values in `error_log_pipe`, then `error_log_syslog`.<br />
 #   If none of these parameters is set, given a virtual host `example.com`, Puppet defaults 
 #   to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and 
 #   `$logroot/example.com_error.log` for non-SSL virtual hosts.
-# 
+#
 # @param error_log_pipe
 #   Specifies a pipe to send error log messages to.<br />
 #   This parameter has no effect if the `error_log_file` parameter has a value. If neither 
 #   this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
-# 
+#
 # @param error_log_syslog
 #   Determines whether to send all error log messages to syslog.
 #   This parameter has no effect if either of the `error_log_file` or `error_log_pipe` 
@@ -228,7 +228,7 @@
 #     ],
 #   }
 #   ```
-# 
+#
 # @param error_documents
 #   A list of hashes which can be used to override the 
 #   [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) 
@@ -242,28 +242,28 @@
 #     ],
 #   }
 #   ```
-# 
+#
 # @param ensure
 #   Specifies if the virtual host is present or absent.<br />
-# 
+#
 # @param fallbackresource
 #   Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) 
 #   directive, which specifies an action to take for any URL that doesn't map to anything in 
 #   your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin 
 #   with a `/` or be `disabled`.
-# 
+#
 # @param fastcgi_server
 #   Specify an external FastCGI server to manage a connection to.
-# 
+#
 # @param fastcgi_socket
 #   Specify the socket that will be used to communicate with an external FastCGI server.
-# 
+#
 # @param fastcgi_idle_timeout
 #   If using fastcgi, this option sets the timeout for the server to respond.
-# 
+#
 # @param fastcgi_dir
 #   Specify an internal FastCGI directory that is to be managed.
-# 
+#
 # @param filters
 #   [Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, 
 #   context-sensitive configuration of output content filters.
@@ -277,86 +277,86 @@
 #     ],
 #   }
 #   ```
-# 
+#
 # @param h2_copy_files
 #   Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
 #   directive which influences how the requestion process pass files to the main connection.
-# 
+#
 # @param h2_direct
 #   Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
 #   directive which toggles the usage of the HTTP/2 Direct Mode.
-# 
+#
 # @param h2_early_hints
 #   Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2earlyhints)
 #   directive which controls if HTTP status 103 interim responses are forwarded to
 #   the client or not.
-# 
+#
 # @param h2_max_session_streams
 #   Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2maxsessionstreams)
 #   directive which sets the maximum number of active streams per HTTP/2 session
 #   that the server allows.
-# 
+#
 # @param h2_modern_tls_only
 #   Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
 #   directive which toggles the security checks on HTTP/2 connections in TLS mode.
-# 
+#
 # @param h2_push
 #   Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
 #   directive which toggles the usage of the HTTP/2 server push protocol feature.
-# 
+#
 # @param h2_push_diary_size
 #   Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushdiarysize)
 #   directive which toggles the maximum number of HTTP/2 server pushes that are
 #   remembered per HTTP/2 connection.
-# 
+#
 # @param h2_push_priority
 #   Sets the [H2PushPriority](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushpriority)
 #   directive which defines the priority handling of pushed responses based on the
 #   content-type of the response.
-# 
+#
 # @param h2_push_resource
 #   Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource)
 #   directive which declares resources for early pushing to the client.
-# 
+#
 # @param h2_serialize_headers
 #   Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
 #   directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
 #   format for processing by httpd core.
-# 
+#
 # @param h2_stream_max_mem_size
 #   Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
 #   directive which sets the maximum number of outgoing data bytes buffered in
 #   memory for an active stream.
-# 
+#
 # @param h2_tls_cool_down_secs
 #   Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
 #   directive which sets the number of seconds of idle time on a TLS connection
 #   before the TLS write size falls back to a small (~1300 bytes) length.
-# 
+#
 # @param h2_tls_warm_up_size
 #   Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlswarmupsize)
 #   directive which sets the number of bytes to be sent in small TLS records (~1300
 #   bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
-# 
+#
 # @param h2_upgrade
 #   Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2upgrade)
 #   directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
 #   to HTTP/2.
-# 
+#
 # @param h2_window_size
 #   Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2windowsize)
 #   directive which sets the size of the window that is used for flow control from
 #   client to server and limits the amount of data the server has to buffer.
-# 
+#
 # @param ip
 #   Sets the IP address the virtual host listens on. By default, uses Apache's default behavior 
 #   of listening on all IPs.
-# 
+#
 # @param ip_based
 #   Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual 
 #   host. This parameter inhibits the creation of a NameVirtualHost directive, since those are 
 #   used to funnel requests to name-based virtual hosts.
-# 
+#
 # @param itk
 #   Configures [ITK](http://mpm-itk.sesse.net/) in a hash.<br />
 #   Usage typically looks something like:
@@ -377,11 +377,11 @@
 #   * `nice`
 #   * `limituidrange` (Linux 3.5.0 or newer)
 #   * `limitgidrange` (Linux 3.5.0 or newer)
-# 
+#
 # @param action
 #   Specifies whether you wish to configure mod_actions action directive which will
 #   activate cgi-script when triggered by a request.
-# 
+#
 # @param jk_mounts
 #   Sets up a virtual host with `JkMount` and `JkUnMount` directives to handle the paths 
 #   for URL mapping between Tomcat and Apache.<br />
@@ -396,29 +396,29 @@
 #     ],
 #   }
 #   ```
-# 
+#
 # @param http_protocol_options
 #   Specifies the strictness of HTTP protocol checks.
-# 
+#
 # @param keepalive
 #   Determines whether to enable persistent HTTP connections with the `KeepAlive` directive 
 #   for the virtual host. By default, the global, server-wide `KeepAlive` setting is in effect.<br />
 #   Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options 
 #   for the virtual host.
-# 
+#
 # @param keepalive_timeout
 #   Sets the `KeepAliveTimeout` directive for the virtual host, which determines the amount 
 #   of time to wait for subsequent requests on a persistent HTTP connection. By default, the 
 #   global, server-wide `KeepAlive` setting is in effect.<br />
 #   This parameter is only relevant if either the global, server-wide `keepalive` parameter or 
 #   the per-vhost `keepalive` parameter is enabled.
-# 
+#
 # @param max_keepalive_requests
 #   Limits the number of requests allowed per connection to the virtual host. By default,  
 #   the global, server-wide `KeepAlive` setting is in effect.<br />
 #   This parameter is only relevant if either the global, server-wide `keepalive` parameter or 
 #   the per-vhost `keepalive` parameter is enabled.
-# 
+#
 # @param auth_kerb
 #   Enable `mod_auth_kerb` parameters for a virtual host.<br />
 #   Usage typically looks like:
@@ -436,62 +436,62 @@
 #     },
 #   }
 #   ```
-# 
+#
 # @param krb_method_negotiate
 #   Determines whether to use the Negotiate method.
-# 
+#
 # @param krb_method_k5passwd
 #   Determines whether to use password-based authentication for Kerberos v5.
-# 
+#
 # @param krb_authoritative
 #   If set to `off`, authentication controls can be passed on to another module.
-# 
+#
 # @param krb_auth_realms
 #   Specifies an array of Kerberos realms to use for authentication.
-# 
+#
 # @param krb_5keytab
 #   Specifies the Kerberos v5 keytab file's location.
-# 
+#
 # @param krb_local_user_mapping
 #   Strips @REALM from usernames for further use.
-# 
+#
 # @param krb_verify_kdc
 #   This option can be used to disable the verification tickets against local keytab to prevent 
 #   KDC spoofing attacks.
-# 
+#
 # @param krb_servicename
 #   Specifies the service name that will be used by Apache for authentication. Corresponding 
 #   key of this name must be stored in the keytab.
-# 
+#
 # @param krb_save_credentials
 #   This option enables credential saving functionality.
-# 
+#
 # @param logroot
 #   Specifies the location of the virtual host's logfiles.
-# 
+#
 # @param logroot_ensure
 #   Determines whether or not to remove the logroot directory for a virtual host.
-# 
+#
 # @param logroot_mode
 #   Overrides the mode the logroot directory is set to. Do *not* grant write access to the 
 #   directory the logs are stored in without being aware of the consequences; for more 
 #   information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
-# 
+#
 # @param logroot_owner
 #   Sets individual user access to the logroot directory.
-# 
+#
 # @param logroot_group
 #   Sets group access to the `logroot` directory.
-# 
+#
 # @param log_level
 #   Specifies the verbosity of the error log.
-# 
+#
 # @param modsec_body_limit
 #   Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
-# 
+#
 # @param modsec_disable_vhost
 #   Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
-# 
+#
 # @param modsec_disable_ids
 #   Removes `mod_security` IDs from the virtual host.<br />
 #   Also takes a hash allowing removal of an ID from a specific location.
@@ -500,16 +500,16 @@
 #     modsec_disable_ids => [ 90015, 90016 ],
 #   }
 #   ```
-# 
+#
 #   ``` puppet
 #   apache::vhost { 'sample.example.net':
 #     modsec_disable_ids => { '/location1' => [ 90015, 90016 ] },
 #   }
 #   ```
-# 
+#
 # @param modsec_disable_ips
 #   Specifies an array of IP addresses to exclude from `mod_security` rule matching.
-# 
+#
 # @param modsec_disable_msgs
 #   Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing 
 #   removal of an Msg from a specific location.
@@ -523,7 +523,7 @@
 #     modsec_disable_msgs => { '/location1' => ['Blind SQL Injection Attack', 'Session Fixation Attack'] },
 #   }
 #   ```
-# 
+#
 # @param modsec_disable_tags
 #   Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing 
 #   removal of an Tag from a specific location.
@@ -537,14 +537,14 @@
 #     modsec_disable_tags => { '/location1' => ['WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS'] },
 #   }
 #   ```
-# 
+#
 # @param modsec_audit_log_file
 #   If set, it is relative to `logroot`.<br />
 #   One of the parameters that determines how to send `mod_security` audit 
 #   log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
 #   If none of those parameters are set, the global audit log is used 
 #   (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
-# 
+#
 # @param modsec_audit_log_pipe
 #   If `modsec_audit_log_pipe` is set, it should start with a pipe. Example 
 #   `|/path/to/mlogc /path/to/mlogc.conf`.<br />
@@ -552,7 +552,7 @@
 #   log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).
 #   If none of those parameters are set, the global audit log is used 
 #   (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
-# 
+#
 # @param modsec_audit_log
 #   If `modsec_audit_log` is `true`, given a virtual host ---for instance, example.com--- it 
 #   defaults to `example.com\_security\_ssl.log` for SSL-encrypted virtual hosts 
@@ -561,28 +561,28 @@
 #   log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).<br />
 #   If none of those parameters are set, the global audit log is used 
 #   (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
-# 
+#
 # @param no_proxy_uris
 #   Specifies URLs you do not want to proxy. This parameter is meant to be used in combination 
 #   with [`proxy_dest`](#proxy_dest).
-# 
+#
 # @param no_proxy_uris_match
 #   This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
-# 
+#
 # @param proxy_preserve_host
 #   Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost).<br />
 #   Setting this parameter to `true` enables the `Host:` line from an incoming request to be 
 #   proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
-# 
+#
 # @param proxy_add_headers
 #   Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders).<br />
 #   This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For, 
 #   X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
-# 
+#
 # @param proxy_error_override
 #   Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). 
 #   This directive controls whether Apache should override error pages for proxied content.
-# 
+#
 # @param options
 #   Sets the [`Options`](https://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. For example:
 #   ``` puppet
@@ -593,7 +593,7 @@
 #   ```
 #   > **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options', 
 #   'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
-# 
+#
 # @param override
 #   Sets the overrides for the specified virtual host. Accepts an array of 
 #   [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
@@ -613,41 +613,41 @@
 #   ```
 #   > **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) 
 #   using the PassengerEnabled directive with the PassengerHighPerformance directive.
-# 
+#
 # @param passenger_base_uri
 #   Sets [PassengerBaseURI](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbase_rui),
 #    to specify that the given URI is a distinct application served by Passenger.
-# 
+#
 # @param passenger_ruby
 #   Sets [PassengerRuby](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerruby),
 #   specifying the Ruby interpreter to use when serving the relevant web applications.
-# 
+#
 # @param passenger_python
 #   Sets [PassengerPython](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpython),
 #   specifying the Python interpreter to use when serving the relevant web applications.
-# 
+#
 # @param passenger_nodejs
 #   Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengernodejs),
 #   specifying Node.js command to use when serving the relevant web applications.
-# 
+#
 # @param passenger_meteor_app_settings
 #   Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermeteorappsettings),
 #   specifying a JSON file with settings for the application when using a Meteor 
 #   application in non-bundled mode.
-# 
+#
 # @param passenger_app_env
 #   Sets [PassengerAppEnv](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappenv),
 #   the environment for the Passenger application. If not specified, defaults to the global 
 #   setting or 'production'.
-# 
+#
 # @param passenger_app_root
 #   Sets [PassengerRoot](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapproot),
 #   the location of the Passenger application root if different from the DocumentRoot.
-# 
+#
 # @param passenger_app_group_name
 #   Sets [PassengerAppGroupName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappgroupname),
 #    the name of the application group that the current application should belong to.
-# 
+#
 # @param passenger_app_start_command
 #   Sets [PassengerAppStartCommand](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappstartcommand),
 #    how Passenger should start your app on a specific port.
@@ -655,19 +655,19 @@
 # @param passenger_app_type
 #   Sets [PassengerAppType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapptype),
 #    to force Passenger to recognize the application as a specific type.
-# 
+#
 # @param passenger_startup_file
 #   Sets the [PassengerStartupFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstartupfile),
 #   path. This path is relative to the application root.
-# 
+#
 # @param passenger_restart_dir
 #   Sets the [PassengerRestartDir](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrestartdir),
 #    to customize the directory in which `restart.txt` is searched for.
-# 
+#
 # @param passenger_spawn_method
 #   Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerspawnmethod),
 #   whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
-# 
+#
 # @param passenger_load_shell_envvars
 #   Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
 #   to enable or disable the loading of shell environment variables before spawning the application.
@@ -675,118 +675,118 @@
 # @param passenger_preload_bundler
 #   Sets [PassengerPreloadBundler](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpreloadbundler),
 #   to enable or disable the loading of bundler before loading the application.
-# 
+#
 # @param passenger_rolling_restarts
 #   Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
 #   to enable or disable support for zero-downtime application restarts through `restart.txt`.
-# 
+#
 # @param passenger_resist_deployment_errors
 #   Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerresistdeploymenterrors),
 #   to enable or disable resistance against deployment errors.
-# 
+#
 # @param passenger_user
 #   Sets [PassengerUser](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeruser),
 #   the running user for sandboxing applications.
-# 
+#
 # @param passenger_group
 #   Sets [PassengerGroup](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengergroup),
 #   the running group for sandboxing applications.
-# 
+#
 # @param passenger_friendly_error_pages
 #   Sets [PassengerFriendlyErrorPages](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerfriendlyerrorpages),
 #   which can display friendly error pages whenever an application fails to start. This 
 #   friendly error page presents the startup error message, some suggestions for solving 
 #   the problem, a backtrace and a dump of the environment variables.
-# 
+#
 # @param passenger_min_instances
 #   Sets [PassengerMinInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermininstances),
 #   the minimum number of application processes to run.
-# 
+#
 # @param passenger_max_instances
 #   Sets [PassengerMaxInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxinstances),
 #   the maximum number of application processes to run.
-# 
+#
 # @param passenger_max_preloader_idle_time
 #   Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxpreloaderidletime),
 #   the maximum amount of time the preloader waits before shutting down an idle process.
-# 
+#
 # @param passenger_force_max_concurrent_requests_per_process
 #   Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerforcemaxconcurrentrequestsperprocess),
 #   the maximum amount of concurrent requests the application can handle per process.
-# 
+#
 # @param passenger_start_timeout
 #   Sets [PassengerStartTimeout](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstarttimeout),
 #   the timeout for the application startup.
-# 
+#
 # @param passenger_concurrency_model
 #   Sets [PassengerConcurrencyModel](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerconcurrencyodel),
 #   to specify the I/O concurrency model that should be used for Ruby application processes. 
 #   Passenger supports two concurrency models:<br />
 #   * `process` - single-threaded, multi-processed I/O concurrency.
 #   * `thread` - multi-threaded, multi-processed I/O concurrency.
-# 
+#
 # @param passenger_thread_count
 #   Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerthreadcount),
 #   the number of threads that Passenger should spawn per Ruby application process.<br />
 #   This option only has effect if PassengerConcurrencyModel is `thread`.
-# 
+#
 # @param passenger_max_requests
 #   Sets [PassengerMaxRequests](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequests),
 #   the maximum number of requests an application process will process.
-# 
+#
 # @param passenger_max_request_time
 #   Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequesttime),
 #   the maximum amount of time, in seconds, that an application process may take to 
 #   process a request.
-# 
+#
 # @param passenger_memory_limit
 #   Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermemorylimit),
 #   the maximum amount of memory that an application process may use, in megabytes.
-# 
+#
 # @param passenger_stat_throttle_rate
 #   Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstatthrottlerate),
 #   to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
-# 
+#
 # @param passenger_pre_start
 #   Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
 #   the URL of the application if pre-starting is required.
-# 
+#
 # @param passenger_high_performance
 #   Sets [PassengerHighPerformance](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerhighperformance),
 #   to enhance performance in return for reduced compatibility.
-# 
+#
 # @param passenger_buffer_upload
 #   Sets [PassengerBufferUpload](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferupload),
 #   to buffer HTTP client request bodies before they are sent to the application.
-# 
+#
 # @param passenger_buffer_response
 #   Sets [PassengerBufferResponse](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferresponse),
 #   to buffer Happlication-generated responses.
-# 
+#
 # @param passenger_error_override
 #   Sets [PassengerErrorOverride](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengererroroverride),
 #   to specify whether Apache will intercept and handle response with HTTP status codes of
 #   400 and higher.
-# 
+#
 # @param passenger_max_request_queue_size
 #   Sets [PassengerMaxRequestQueueSize](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuesize),
 #   to specify the maximum amount of requests that are allowed to queue whenever the maximum
 #   concurrent request limit is reached. If the queue is already at this specified limit, then 
 #   Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
 #   A value of 0 means that the queue size is unbounded.
-# 
+#
 # @param passenger_max_request_queue_time
 #   Sets [PassengerMaxRequestQueueTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequestqueuetime),
 #   to specify the maximum amount of time that requests are allowed to stay in the queue 
 #   whenever the maximum concurrent request limit is reached. If a request reaches this specified 
 #   limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
 #   A value of 0 means that the queue time is unbounded.
-# 
+#
 # @param passenger_sticky_sessions
 #   Sets [PassengerStickySessions](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessions),
 #   to specify that, whenever possible, all requests sent by a client will be routed to the same 
 #   originating application process.
-# 
+#
 # @param passenger_sticky_sessions_cookie_name
 #   Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookiename),
 #   to specify the name of the sticky sessions cookie.
@@ -794,12 +794,12 @@
 # @param passenger_sticky_sessions_cookie_attributes
 #   Sets [PassengerStickySessionsCookieAttributes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookieattributes),
 #   the attributes of the sticky sessions cookie.
-# 
+#
 # @param passenger_allow_encoded_slashes
 #   Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerallowencodedslashes),
 #   to allow URLs with encoded slashes. Please note that this feature will not work properly
 #   unless Apache's `AllowEncodedSlashes` is also enabled.
-# 
+#
 # @param passenger_app_log_file
 #   Sets [PassengerAppLogFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapplogfile),
 #   app specific messages logged to a different file in addition to Passenger log file.
@@ -807,12 +807,12 @@
 # @param passenger_debugger
 #   Sets [PassengerDebugger](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerdebugger),
 #   to turn support for Ruby application debugging on or off. 
-# 
+#
 # @param passenger_lve_min_uid
 #   Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerlveminuid),
 #   to only allow the spawning of application processes with UIDs equal to, or higher than, this 
 #   specified value on LVE-enabled kernels.
-# 
+#
 # @param php_values
 #   Allows per-virtual host setting [`php_value`s](http://php.net/manual/en/configuration.changes.php). 
 #   These flags or values can be overwritten by a user or an application.
@@ -1056,11 +1056,11 @@
 #   The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase)
 #   specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
 #   that substitue a relative path.
-# 
+#
 # @param rewrite_rule
 #   The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
 #   allows the user to define the rules that will be used by the rewrite engine.
-# 
+#
 # @param rewrite_cond
 #   The parameter [`rewrite_cond`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritecond)
 #   defines a rule condition, that when satisfied will implement that rule within the 
@@ -1151,7 +1151,7 @@
 # @param suexec_user_group
 #   Allows the spcification of user and group execution privileges for CGI programs through
 #   inclusion of the `mod_suexec` module.
-# 
+#
 # @param suphp_addhandler
 #   Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
 #   working together with suphp_configpath and suphp_engine.<br />
@@ -1223,7 +1223,7 @@
 #     serveraliases   => ['*.loc',],
 #   }
 #   ```
-# 
+#
 # @param virtual_use_default_docroot
 #   By default, when using `virtual_docroot`, the value of `docroot` is ignored. Setting this
 #   to `true` will mean both directives will be added to the configuration.
@@ -1321,7 +1321,7 @@
 #   This directive is similar to `wsgi_script_aliases`, but makes use of regular expressions
 #   in place of simple prefix matching.<br />
 #   For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
-# 
+#
 # @param wsgi_pass_authorization
 #   Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 #   wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
@@ -1413,7 +1413,7 @@
 #     },
 #   }
 #   ```
-# 
+#
 # @param shib_compat_valid_user
 #   Default is Off, matching the behavior prior to this command's existence. Addresses a conflict 
 #   when using Shibboleth in conjunction with other auth/auth modules by restoring `standard` 
@@ -1453,7 +1453,7 @@
 #     ],
 #   }
 #   ```
-# 
+#
 # @param gssapi
 #   Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
 #   ```puppet
@@ -1669,7 +1669,7 @@
 # @param use_canonical_name
 #   Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
 #   which allows you to configure how the server determines it's own name and port.
-# 
+#
 # @param define
 #   this lets you define configuration variables inside a vhost using [`Define`](https://httpd.apache.org/docs/2.4/mod/core.html#define),
 #   these can then be used to replace configuration values. All Defines are Undefined at the end of the VirtualHost.

From ee2e723fb238584cd36e553578a453f0d7aa3c8f Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 28 Jun 2022 11:16:43 +0200
Subject: [PATCH 1958/2267] Sort expected contained classes alphabetically

This makes it easier to see if a mod is present.
---
 spec/defines/vhost_spec.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 44e6da9c66..87708bb6cc 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -572,24 +572,24 @@
           it { is_expected.to contain_file('rspec.example.com_ssl_key') }
           it { is_expected.to contain_file('rspec.example.com_ssl_chain') }
           it { is_expected.to contain_file('rspec.example.com_ssl_foo.crl') }
-          it { is_expected.to contain_class('apache::mod::mime') }
-          it { is_expected.to contain_class('apache::mod::vhost_alias') }
-          it { is_expected.to contain_class('apache::mod::wsgi') }
-          it { is_expected.to contain_class('apache::mod::suexec') }
-          it { is_expected.to contain_class('apache::mod::passenger') }
           it {
             is_expected.to contain_file('/var/www/logs').with('ensure' => 'directory',
                                                               'mode' => '0600')
           }
-          it { is_expected.to contain_class('apache::mod::rewrite') }
           it { is_expected.to contain_class('apache::mod::alias') }
-          it { is_expected.to contain_class('apache::mod::proxy') }
-          it { is_expected.to contain_class('apache::mod::proxy_http') }
+          it { is_expected.to contain_class('apache::mod::env') }
           it { is_expected.to contain_class('apache::mod::fastcgi') }
-          it { is_expected.to contain_class('apache::mod::headers') }
           it { is_expected.to contain_class('apache::mod::filter') }
-          it { is_expected.to contain_class('apache::mod::env') }
+          it { is_expected.to contain_class('apache::mod::headers') }
+          it { is_expected.to contain_class('apache::mod::mime') }
+          it { is_expected.to contain_class('apache::mod::passenger') }
+          it { is_expected.to contain_class('apache::mod::proxy') }
+          it { is_expected.to contain_class('apache::mod::proxy_http') }
+          it { is_expected.to contain_class('apache::mod::rewrite') }
           it { is_expected.to contain_class('apache::mod::setenvif') }
+          it { is_expected.to contain_class('apache::mod::suexec') }
+          it { is_expected.to contain_class('apache::mod::vhost_alias') }
+          it { is_expected.to contain_class('apache::mod::wsgi') }
           it {
             is_expected.to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
                                                                             'mode'    => '0644',

From 614578a686fd3dce01dee98a3926f67bee3e9f45 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 29 Jun 2022 14:10:38 +0200
Subject: [PATCH 1959/2267] Move Apache 2.2 access parameter to their own test

The previous location was testing it on a vhost that's absent. This is
now testing it on the very complex test where it's present. This is
important because in the future the whole directories concat fragment
isn't rendered on absent vhosts.
---
 spec/defines/vhost_spec.rb | 79 ++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 34 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 87708bb6cc..e8114ee390 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1269,23 +1269,6 @@
               'manage_docroot'  => true,
               'logroot'         => '/tmp/logroot',
               'logroot_ensure'  => 'absent',
-              'directories'     => [
-                {
-                  'path'     => '/var/www/files',
-                  'provider' => 'files',
-                  'allow'    => ['from 127.0.0.1', 'from 127.0.0.2'],
-                  'deny'     => ['from 127.0.0.3', 'from 127.0.0.4'],
-                  'satisfy'  => 'any',
-                },
-                {
-                  'path'     => '/var/www/foo',
-                  'provider' => 'files',
-                  'allow'    => 'from 127.0.0.5',
-                  'deny'     => 'from all',
-                  'order'    => 'deny,allow',
-                },
-              ],
-
             }
           end
 
@@ -1318,23 +1301,6 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-fallbackresource') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-          # the following style is only present on Apache 2.2
-          # That is used in SLES 11, RHEL6, Amazon Linux
-          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
-             (facts[:os]['name'] == 'Amazon') ||
-             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories')
-                .with_content(%r{^\s+Allow from 127\.0\.0\.1$})
-                .with_content(%r{^\s+Allow from 127\.0\.0\.2$})
-                .with_content(%r{^\s+Allow from 127\.0\.0\.5$})
-                .with_content(%r{^\s+Deny from 127\.0\.0\.3$})
-                .with_content(%r{^\s+Deny from 127\.0\.0\.4$})
-                .with_content(%r{^\s+Deny from all$})
-                .with_content(%r{^\s+Satisfy any$})
-                .with_content(%r{^\s+Order deny,allow$})
-            }
-          end
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-additional_includes') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
@@ -1761,6 +1727,51 @@
               it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
             end
           end
+
+          # the following style is only present on Apache 2.2
+          # That is used in SLES 11, RHEL6, Amazon Linux
+          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
+             (facts[:os]['name'] == 'Amazon') ||
+             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
+            context 'apache 2.2 access controls on directories' do
+              let :params do
+                {
+                  'docroot'         => '/var/www/foo',
+                  'directories'     => [
+                    {
+                      'path'     => '/var/www/foo',
+                      'provider' => 'files',
+                      'allow'    => 'from 127.0.0.5',
+                      'deny'     => 'from all',
+                      'order'    => 'deny,allow',
+                    },
+                    {
+                      'path'     => '/var/www/protected-files',
+                      'provider' => 'files',
+                      'allow'    => ['from 127.0.0.1', 'from 127.0.0.2'],
+                      'deny'     => ['from 127.0.0.3', 'from 127.0.0.4'],
+                      'satisfy'  => 'any',
+                    },
+                  ],
+                }
+              end
+
+              it { is_expected.to compile }
+              it { is_expected.to contain_concat('25-rspec.example.com.conf') }
+              it {
+                is_expected.to contain_concat__fragment('rspec.example.com-directories')
+                  .with_content(%r{^\s+Allow from 127\.0\.0\.1$})
+                  .with_content(%r{^\s+Allow from 127\.0\.0\.2$})
+                  .with_content(%r{^\s+Allow from 127\.0\.0\.5$})
+                  .with_content(%r{^\s+Deny from 127\.0\.0\.3$})
+                  .with_content(%r{^\s+Deny from 127\.0\.0\.4$})
+                  .with_content(%r{^\s+Deny from all$})
+                  .with_content(%r{^\s+Satisfy any$})
+                  .with_content(%r{^\s+Order deny,allow$})
+              }
+            end
+          end
+
           context 'require unmanaged' do
             let :params do
               {

From fb0d0782d8221741474f8170dacf522f6ce32b69 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 29 Jun 2022 16:03:31 +0200
Subject: [PATCH 1960/2267] Run vhost tests on all supported OSes

This splits off the fastcgi tests to its own case with proper
conditionals. This allows testing the entire define on all supported
operating system versions.

FastCGI is actually unavailable on all supported Debian versions, rather
than just Ubuntu so those are skipped as well.
---
 spec/defines/vhost_spec.rb | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index e8114ee390..67737ff09b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -5,11 +5,6 @@
 describe 'apache::vhost', type: :define do
   describe 'os-independent items' do
     on_supported_os.each do |os, facts|
-      # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Ubuntu 18.04
-      next if facts[:os]['release']['major'] == '18.04' || facts[:os]['release']['major'] == '20.04'
-      next if (facts[:os]['release']['major'] == '7' || facts[:os]['release']['major'] == '8') && facts[:os]['family']['RedHat']
-      # next if facts[:os]['name'] == 'SLES'
-
       apache_name = case facts[:os]['family']
                     when 'RedHat'
                       'httpd'
@@ -46,7 +41,7 @@
           it { is_expected.to contain_class('apache::params') }
           it { is_expected.to contain_apache__listen(params[:port]) }
           # namebased virualhost is only created on apache 2.2 and older
-          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 8) ||
+          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
              (facts[:os]['name'] == 'Amazon') ||
              (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
             it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
@@ -441,10 +436,6 @@
               },
               'wsgi_chunked_request'        => 'On',
               'action'                      => 'foo',
-              'fastcgi_server'              => 'localhost',
-              'fastcgi_socket'              => '/tmp/fastcgi.socket',
-              'fastcgi_dir'                 => '/tmp',
-              'fastcgi_idle_timeout'        => '120',
               'additional_includes'         => '/custom/path/includes',
               'apache_version'              => '2.4',
               'use_optional_includes'       => true,
@@ -578,7 +569,6 @@
           }
           it { is_expected.to contain_class('apache::mod::alias') }
           it { is_expected.to contain_class('apache::mod::env') }
-          it { is_expected.to contain_class('apache::mod::fastcgi') }
           it { is_expected.to contain_class('apache::mod::filter') }
           it { is_expected.to contain_class('apache::mod::headers') }
           it { is_expected.to contain_class('apache::mod::mime') }
@@ -788,7 +778,6 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
@@ -1772,6 +1761,25 @@
             end
           end
 
+          # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu
+          unless facts[:os]['family'] || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
+            describe 'fastcgi options' do
+              let :params do
+                {
+                  'docroot'              => '/var/www/foo',
+                  'fastcgi_server'       => 'localhost',
+                  'fastcgi_socket'       => '/tmp/fastcgi.socket',
+                  'fastcgi_dir'          => '/tmp',
+                  'fastcgi_idle_timeout' => '120',
+                }
+              end
+
+              it { is_expected.to compile }
+              it { is_expected.to contain_class('apache::mod::fastcgi') }
+              it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
+            end
+          end
+
           context 'require unmanaged' do
             let :params do
               {

From 78d5640a58a2712f5995d840bc0c166ad2b227ee Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 30 Jun 2022 10:15:18 +0100
Subject: [PATCH 1961/2267] (maint) Fix compare in defines/vhost_spec.rb

---
 spec/defines/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 67737ff09b..eab020c6f4 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1762,7 +1762,7 @@
           end
 
           # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu
-          unless facts[:os]['family'] || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
+          unless facts[:os]['family'] == 'Debian' || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
             describe 'fastcgi options' do
               let :params do
                 {

From 44eb382fbf69b81b0f9426697b49cfb1be3f978e Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:43:41 +0200
Subject: [PATCH 1962/2267] Properly require proxy mods

This ensures the proxy module is always loaded at the right time.
---
 manifests/mod/proxy_ajp.pp      | 2 +-
 manifests/mod/proxy_balancer.pp | 6 ++----
 manifests/mod/proxy_connect.pp  | 2 +-
 manifests/mod/proxy_fcgi.pp     | 2 +-
 manifests/mod/proxy_html.pp     | 4 ++--
 manifests/mod/proxy_http.pp     | 2 +-
 manifests/mod/proxy_wstunnel.pp | 4 ++--
 manifests/vhost.pp              | 1 -
 8 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/manifests/mod/proxy_ajp.pp b/manifests/mod/proxy_ajp.pp
index ff14f0a0b4..66b520c397 100644
--- a/manifests/mod/proxy_ajp.pp
+++ b/manifests/mod/proxy_ajp.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html for additional documentation.
 #
 class apache::mod::proxy_ajp {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_ajp']
+  require apache::mod::proxy
   ::apache::mod { 'proxy_ajp': }
 }
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 74f35ba46e..1616f69d84 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -21,14 +21,12 @@
   Array $allow_from                  = ['127.0.0.1','::1'],
   Optional[String] $apache_version   = $apache::apache_version,
 ) {
-  include apache::mod::proxy
-  include apache::mod::proxy_http
+  require apache::mod::proxy
+  require apache::mod::proxy_http
   if versioncmp($apache_version, '2.4') >= 0 {
     ::apache::mod { 'slotmem_shm': }
   }
 
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_balancer']
-  Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_balancer']
   ::apache::mod { 'proxy_balancer': }
   if $manager {
     include apache::mod::status
diff --git a/manifests/mod/proxy_connect.pp b/manifests/mod/proxy_connect.pp
index 5ece8d4666..5134639700 100644
--- a/manifests/mod/proxy_connect.pp
+++ b/manifests/mod/proxy_connect.pp
@@ -4,6 +4,6 @@
 #
 class apache::mod::proxy_connect {
   include apache
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_connect']
+  require apache::mod::proxy
   apache::mod { 'proxy_connect': }
 }
diff --git a/manifests/mod/proxy_fcgi.pp b/manifests/mod/proxy_fcgi.pp
index 3196f5b68d..467bdbef3e 100644
--- a/manifests/mod/proxy_fcgi.pp
+++ b/manifests/mod/proxy_fcgi.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html for additional documentation.
 #
 class apache::mod::proxy_fcgi {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_fcgi']
+  require apache::mod::proxy
   ::apache::mod { 'proxy_fcgi': }
 }
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 881d7e87b3..da57b5dbcf 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -5,8 +5,8 @@
 #
 class apache::mod::proxy_html {
   include apache
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_html']
-  Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_html']
+  require apache::mod::proxy
+  require apache::mod::proxy_http
 
   # Add libxml2
   case $facts['os']['family'] {
diff --git a/manifests/mod/proxy_http.pp b/manifests/mod/proxy_http.pp
index 76b7667ea2..54ad8af43c 100644
--- a/manifests/mod/proxy_http.pp
+++ b/manifests/mod/proxy_http.pp
@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_http.html for additional documentation.
 #
 class apache::mod::proxy_http {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_http']
+  require apache::mod::proxy
   ::apache::mod { 'proxy_http': }
 }
diff --git a/manifests/mod/proxy_wstunnel.pp b/manifests/mod/proxy_wstunnel.pp
index 1d12c6b465..c57db79387 100644
--- a/manifests/mod/proxy_wstunnel.pp
+++ b/manifests/mod/proxy_wstunnel.pp
@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html for additional documentation.
 #
 class apache::mod::proxy_wstunnel {
-  include apache, apache::mod::proxy
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_wstunnel']
+  include apache
+  require apache::mod::proxy
   ::apache::mod { 'proxy_wstunnel': }
 }
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d5aa692678..5aa736d5bc 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2488,7 +2488,6 @@
   # - $proxy_add_headers
   # - $no_proxy_uris
   if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host) and $ensure == 'present' {
-    include apache::mod::proxy
     include apache::mod::proxy_http
 
     concat::fragment { "${name}-proxy":

From c1a95383a49801585cdfd37938719040b505794d Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 28 Jun 2022 15:58:02 +0200
Subject: [PATCH 1963/2267] Factor out mod_authz_groupfile to its own class

This makes it easier to run with default mods disabled while still using
this mod.
---
 manifests/default_mods.pp                |  3 +--
 manifests/mod/authz_groupfile.pp         |  9 +++++++++
 spec/classes/mod/authz_groupfile_spec.rb | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 manifests/mod/authz_groupfile.pp
 create mode 100644 spec/classes/mod/authz_groupfile_spec.rb

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 083f1bccd3..68bf56ac53 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -157,8 +157,7 @@
     }
 
     include apache::mod::authz_user
-
-    ::apache::mod { 'authz_groupfile': }
+    include apache::mod::authz_groupfile
     include apache::mod::env
   } elsif $mods {
     ::apache::default_mods::load { $mods: }
diff --git a/manifests/mod/authz_groupfile.pp b/manifests/mod/authz_groupfile.pp
new file mode 100644
index 0000000000..7bf0e795fd
--- /dev/null
+++ b/manifests/mod/authz_groupfile.pp
@@ -0,0 +1,9 @@
+# @summary
+#   Installs `mod_authz_groupfile`
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html for additional documentation.
+#
+class apache::mod::authz_groupfile {
+  include apache
+  apache::mod { 'authz_groupfile': }
+}
diff --git a/spec/classes/mod/authz_groupfile_spec.rb b/spec/classes/mod/authz_groupfile_spec.rb
new file mode 100644
index 0000000000..dbab5e7392
--- /dev/null
+++ b/spec/classes/mod/authz_groupfile_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::authz_groupfile' do
+  it_behaves_like 'a mod class, without including apache'
+
+  context 'default configuration with parameters' do
+    context 'on a Debian OS' do
+      include_examples 'Debian 11'
+
+      it { is_expected.to contain_apache__mod('authz_groupfile') }
+    end
+  end
+end

From de70a475309bd07ff2605a17ad786d06062558e0 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:34:46 +0200
Subject: [PATCH 1964/2267] Tighten apache::vhost::directories parameter

This tightens the data type to a simple array of hashes (as the
parameter documentation suggests). This allows the logic to be simpler.
Because of this, it is now fairly easy to include the correct modules if
needed. Some options are implemented but there are more which could be
automatically included.
---
 manifests/vhost.pp               | 56 +++++++++++++++++++-------------
 spec/acceptance/vhost_spec.rb    |  5 ++-
 templates/vhost/_directories.erb |  4 +--
 3 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5aa736d5bc..21a531f7f9 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -428,12 +428,14 @@
 #     krb_method_negotiate   => 'on',
 #     krb_auth_realms        => ['EXAMPLE.ORG'],
 #     krb_local_user_mapping => 'on',
-#     directories            => {
-#       path         => '/var/www/html',
-#       auth_name    => 'Kerberos Login',
-#       auth_type    => 'Kerberos',
-#       auth_require => 'valid-user',
-#     },
+#     directories            => [
+#       {
+#         path         => '/var/www/html',
+#         auth_name    => 'Kerberos Login',
+#         auth_type    => 'Kerberos',
+#         auth_require => 'valid-user',
+#       },
+#     ],
 #   }
 #   ```
 #
@@ -1163,9 +1165,12 @@
 #     suphp_addhandler => 'x-httpd-php',
 #     suphp_engine     => 'on',
 #     suphp_configpath => '/etc/php5/apache2',
-#     directories      => { path => '/home/appuser/myphpapp',
-#       'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-#     }
+#     directories      => [
+#       {
+#         'path'  => '/home/appuser/myphpapp',
+#         'suphp' => { user => 'myappuser', group => 'myappgroup' },
+#       },
+#     ],
 #   }
 #   ```
 #
@@ -1180,9 +1185,12 @@
 #     suphp_addhandler => 'x-httpd-php',
 #     suphp_engine     => 'on',
 #     suphp_configpath => '/etc/php5/apache2',
-#     directories      => { path => '/home/appuser/myphpapp',
-#       'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-#     }
+#     directories      => [
+#       {
+#         'path'  => '/home/appuser/myphpapp',
+#         'suphp' => { user => 'myappuser', group => 'myappgroup' },
+#       },
+#     ],
 #   }
 #   ```
 #
@@ -1197,9 +1205,12 @@
 #     suphp_addhandler => 'x-httpd-php',
 #     suphp_engine     => 'on',
 #     suphp_configpath => '/etc/php5/apache2',
-#     directories      => { path => '/home/appuser/myphpapp',
-#       'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-#     }
+#     directories      => [
+#       {
+#         'path'  => '/home/appuser/myphpapp',
+#         'suphp' => { user => 'myappuser', group => 'myappgroup' },
+#       },
+#     ],
 #   }
 #   ```
 #
@@ -1407,10 +1418,12 @@
 #   ``` puppet
 #   apache::vhost { 'sample.example.net':
 #     docroot     => '/path/to/directory',
-#     directories => {
-#       path    => '/path/to/directory',
-#       headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-#     },
+#     directories => [
+#       {
+#         path    => '/path/to/directory',
+#         headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
+#       },
+#     ],
 #   }
 #   ```
 #
@@ -1457,7 +1470,6 @@
 # @param gssapi
 #   Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
 #   ```puppet
-#   include apache::mod::auth_gssapi
 #   apache::vhost { 'sample.example.net':
 #     docroot     => '/path/to/directory',
 #     directories => [
@@ -1804,7 +1816,7 @@
   Boolean $use_servername_for_filenames                                               = false,
   Boolean $use_port_for_filenames                                                     = false,
   Array[Hash[String[1], String[1]]] $aliases                                          = [],
-  Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                    = undef,
+  Optional[Array[Hash]] $directories                                                  = undef,
   Boolean $error_log                                                                  = true,
   Optional[String] $error_log_file                                                    = undef,
   Optional[String] $error_log_pipe                                                    = undef,
@@ -2353,7 +2365,7 @@
   # - $apache_version
   # - $suphp_engine
   # - $shibboleth_enabled
-  if $_directories and ! empty($_directories) {
+  if $_directories and ! empty($_directories) and $ensure == 'present' {
     concat::fragment { "${name}-directories":
       target  => "${priority_real}${filename}.conf",
       order   => 60,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index a5b54f635d..b2dcc11f11 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -327,7 +327,7 @@ class { 'apache': }
         class { 'apache': }
 
         if versioncmp($apache_version, '2.4') >= 0 {
-          $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
+          $_files_match_directory = [{ 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }]
         } else {
           $_files_match_directory = [
             { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' },
@@ -338,8 +338,7 @@ class { 'apache': }
         $_directories = [
           { 'path' => '/var/www/files', },
           { 'path' => '/foo/', 'provider' => 'location', 'directoryindex' => 'notindex.html', },
-          $_files_match_directory,
-        ]
+        ] + $_files_match_directory
 
         apache::vhost { 'files.example.net':
           docroot     => '/var/www/files',
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 4b5a7523f4..406dd24828 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -1,8 +1,7 @@
-<% if @_directories and ! @_directories.empty? -%>
 
   <%- scope.setvar('_template_scope', {}) -%>
   ## Directories, there should at least be a declaration for <%= @docroot %>
-  <%- [@_directories].flatten.compact.each do |directory| -%>
+  <%- @_directories.each do |directory| -%>
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
         <%- scope.function_warning(["Apache::Vhost: Using allow is deprecated in your Apache version"]) -%>
@@ -520,4 +519,3 @@
   </<%= provider %>>
     <%- end -%>
   <%- end -%>
-<%- end -%>

From 040eab99941978665c4ebe37e0932470d8627918 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 22 Jun 2022 12:34:46 +0200
Subject: [PATCH 1965/2267] Automatically include modules used in vhost
 directories

The data passed to the directories parameter of apache::vhost often
implies a module should be present. This change inspects the passed data
and automatically includes modules if needed. This makes it easier to
use via Hiera while disabling all default mods.

Because of this change one acceptance test becomes obsolete: it no
longer fails and just works.
---
 manifests/vhost.pp                   | 34 +++++++++++++++++++++++
 spec/acceptance/default_mods_spec.rb | 41 ----------------------------
 spec/defines/vhost_spec.rb           | 10 ++++++-
 3 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 21a531f7f9..09c3100a6e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2366,6 +2366,40 @@
   # - $suphp_engine
   # - $shibboleth_enabled
   if $_directories and ! empty($_directories) and $ensure == 'present' {
+    $_directories.each |Hash $directory| {
+      if 'auth_basic_authoritative' in $directory or 'auth_basic_fake' in $directory or 'auth_basic_provider' in $directory {
+        include apache::mod::auth_basic
+      }
+
+      if 'auth_user_file' in $directory {
+        include apache::mod::authn_file
+      }
+
+      if 'auth_group_file' in $directory {
+        include apache::mod::authz_groupfile
+      }
+
+      if 'gssapi' in $directory {
+        include apache::mod::auth_gssapi
+      }
+
+      if $directory['provider'] and $directory['provider'] =~ 'location' and ('proxy_pass' in $directory or 'proxy_pass_match' in $directory) {
+        include apache::mod::proxy_http
+      }
+
+      if 'request_headers' in $directory {
+        include apache::mod::headers
+      }
+
+      if 'rewrites' in $directory {
+        include apache::mod::rewrite
+      }
+
+      if 'setenv' in $directory {
+        include apache::mod::env
+      }
+    }
+
     concat::fragment { "${name}-directories":
       target  => "${priority_real}${filename}.conf",
       order   => 60,
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 8e38d98f0f..1694b94c92 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -22,47 +22,6 @@ class { 'apache':
     end
   end
 
-  unless os[:family] == 'sles' && os[:release].to_i >= 12
-    describe 'no default mods and failing' do
-      before :all do
-        pp = <<-PP
-        include apache::params
-        class { 'apache': default_mods => false, service_ensure => stopped, }
-        PP
-        apply_manifest(pp)
-      end
-      # Using puppet_apply as a helper
-      pp = <<-MANIFEST
-          class { 'apache':
-            default_mods => false,
-          }
-          apache::vhost { 'defaults.example.com':
-            docroot     => '#{apache_hash['doc_root']}/defaults',
-            aliases     => [
-              {
-                alias => '/css',
-                path  => '#{apache_hash['doc_root']}/css',
-              },
-            ],
-            directories => [
-            {
-                'path'            => "#{apache_hash['doc_root']}/admin",
-                'auth_basic_fake' => 'demo demopass',
-              }
-            ],
-            setenv      => 'TEST1 one',
-          }
-      MANIFEST
-      it 'applies with errors' do
-        apply_manifest(pp, expect_failures: true)
-      end
-    end
-
-    describe service(apache_hash['service_name']) do
-      it { is_expected.not_to be_running }
-    end
-  end
-
   describe 'alternative default mods' do
     # Using puppet_apply as a helper
     let(:pp) do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index eab020c6f4..eaa3af9946 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -194,6 +194,10 @@
                   'path'                => '/',
                   'provider'            => 'location',
                   'auth_ldap_referrals' => 'off',
+                  'auth_basic_fake'     => 'demo demopass',
+                  'auth_user_file'      => '/path/to/authz_user_file',
+                  'auth_group_file'     => '/path/to/authz_group_file',
+                  'setenv'              => ['SPECIAL_PATH /foo/bin'],
                 },
                 {
                   'path'       => '/proxy',
@@ -568,6 +572,10 @@
                                                               'mode' => '0600')
           }
           it { is_expected.to contain_class('apache::mod::alias') }
+          it { is_expected.to contain_class('apache::mod::auth_basic') }
+          it { is_expected.to contain_class('apache::mod::authn_file') }
+          it { is_expected.to contain_class('apache::mod::authz_groupfile') }
+          it { is_expected.to contain_class('apache::mod::auth_gssapi') }
           it { is_expected.to contain_class('apache::mod::env') }
           it { is_expected.to contain_class('apache::mod::filter') }
           it { is_expected.to contain_class('apache::mod::headers') }
@@ -1289,7 +1297,7 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-aliases') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-fallbackresource') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-directories') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-additional_includes') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }

From 801e0d8fab579d76d8965b1709e211106828ebdc Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 31 May 2022 16:25:28 +0100
Subject: [PATCH 1966/2267] (GH-cat-12) Add Support for Redhat 9

---
 metadata.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 374fcc6fba..1a9268dd7d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -23,7 +23,8 @@
       "operatingsystemrelease": [
         "6",
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {

From edbdb65b06418779aa30ebe6cf0948007cc51a29 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Mon, 4 Jul 2022 12:06:45 +0100
Subject: [PATCH 1967/2267] (GH-cat-12) Fixes for RedHat 9

---
 manifests/mod/authnz_ldap.pp              |  2 +-
 manifests/mod/itk.pp                      |  2 +-
 manifests/mod/ldap.pp                     |  2 +-
 manifests/params.pp                       |  1 +
 spec/acceptance/apache_parameters_spec.rb |  7 ++-
 spec/acceptance/apache_ssl_spec.rb        |  2 +-
 spec/acceptance/class_spec.rb             |  7 ++-
 spec/acceptance/default_mods_spec.rb      |  2 -
 spec/acceptance/mod_php_spec.rb           |  6 ++-
 spec/acceptance/prefork_worker_spec.rb    |  1 -
 spec/acceptance/vhost_spec.rb             |  8 ++--
 spec/classes/mod/php_spec.rb              | 58 +++++++++++++++++------
 spec/defines/fastcgi_server_spec.rb       |  4 +-
 13 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index 4c00ceb917..c12a0869e3 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -8,7 +8,7 @@
 #   The name of the ldap package.
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html for additional documentation.
-# @note Unsupported platforms: RedHat: 6, 8; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
+# @note Unsupported platforms: RedHat: 6, 8, 9; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
 class apache::mod::authnz_ldap (
   Boolean $verify_server_cert     = true,
   Optional[String] $package_name  = undef,
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index b903f6bd38..eb4285fb00 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -28,7 +28,7 @@
 #   Used to verify that the Apache version you have requested is compatible with the module.
 # 
 # @see http://mpm-itk.sesse.net for additional documentation.
-# @note Unsupported platforms: CentOS: 8; RedHat: 8; SLES: all
+# @note Unsupported platforms: CentOS: 8; RedHat: 8, 9; SLES: all
 class apache::mod::itk (
   Variant[String,Integer] $startservers                 = '8',
   Variant[String,Integer] $minspareservers              = '5',
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 9fc2dabac0..2677c392fe 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -47,7 +47,7 @@
 #   }
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_ldap.html for additional documentation.
-# @note Unsupported platforms: CentOS: 8; RedHat: 8
+# @note Unsupported platforms: CentOS: 8; RedHat: 8, 9
 class apache::mod::ldap (
   Optional[String] $apache_version                 = undef,
   Optional[String] $package_name                   = undef,
diff --git a/manifests/params.pp b/manifests/params.pp
index c610e1c0b1..27a4a06b71 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -204,6 +204,7 @@
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
     $php_version = $facts['os']['release']['major'] ? {
+      '9'     => '8', # RedHat9
       '8'     => '7', # RedHat8
       default => '5', # RedHat5, RedHat6, RedHat7
     }
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 6a06d24e37..aba05beca6 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -430,11 +430,10 @@ class { 'apache':
       pp = <<-MANIFEST
           if $::osfamily == 'RedHat' and "$::selinux" == "true" {
             $semanage_package = $::operatingsystemmajrelease ? {
-              '5'     => 'policycoreutils',
-              '8'     => 'policycoreutils-python-utils',
-              default => 'policycoreutils-python',
+              '6'     => 'policycoreutils-python',
+              '7'     => 'policycoreutils-python',
+              default => 'policycoreutils-python-utils',
             }
-
             package { $semanage_package: ensure => installed }
             exec { 'set_apache_defaults':
               command => 'semanage fcontext -a -t httpd_log_t "/apache_spec(/.*)?"',
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 3d0fa0a000..c13ae260af 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -23,7 +23,7 @@ class { 'apache':
 
     describe file("#{apache_hash['mod_ssl_dir']}/ssl.conf") do
       it { is_expected.to be_file }
-      if os[:family].include?('redhat') && os[:release].to_i == 8
+      if os[:family].include?('redhat') && os[:release].to_i >= 8
         it { is_expected.to contain 'SSLProtocol all' }
       else
         it { is_expected.to contain 'SSLProtocol all -SSLv2 -SSLv3' }
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 8ef6f09f19..ad7b2c07b9 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -43,11 +43,10 @@
       <<-MANIFEST
         if $::osfamily == 'RedHat' and "$::selinux" == "true" {
           $semanage_package = $::operatingsystemmajrelease ? {
-            '5'     => 'policycoreutils',
-            '8'     => 'policycoreutils-python-utils',
-            default => 'policycoreutils-python',
+            '6'     => 'policycoreutils-python',
+            '7'     => 'policycoreutils-python',
+            default => 'policycoreutils-python-utils',
           }
-
           package { $semanage_package: ensure => installed }
           exec { 'set_apache_defaults':
             command     => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 1694b94c92..83872c634b 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -4,7 +4,6 @@
 apache_hash = apache_settings_hash
 describe 'apache::default_mods class' do
   describe 'no default mods' do
-    # Using puppet_apply as a helper
     let(:pp) do
       <<-MANIFEST
         class { 'apache':
@@ -23,7 +22,6 @@ class { 'apache':
   end
 
   describe 'alternative default mods' do
-    # Using puppet_apply as a helper
     let(:pp) do
       <<-MANIFEST
         class { 'apache':
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 40009e562d..bc610c7be2 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -44,7 +44,11 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
-    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8\b}
+    elsif os[:family] == 'redhat' && os[:release] =~ %r{^(9)\b}
+      describe file("#{apache_hash['mod_dir']}/php.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'redhat' && os[:release] =~ %r{^(8)\b}
       describe file("#{apache_hash['mod_dir']}/php7.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index 8cf1fcd657..1c23a07f05 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -47,7 +47,6 @@ class { 'apache':
 
   describe 'apache::mod::prefork class' do
     describe 'running puppet code' do
-      # Using puppet_apply as a helper
       let(:pp) do
         <<-MANIFEEST
           class { 'apache':
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index b2dcc11f11..8742e74826 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -51,7 +51,7 @@ class { 'apache': }
     end
   end
 
-  context 'default vhost with ssl', unless: (os[:family].include?('redhat') && os[:release].to_i == 8) do
+  context 'default vhost with ssl', unless: (os[:family].include?('redhat') && os[:release].to_i >= 8) do
     pp = <<-MANIFEST
       file { '#{apache_hash['run_dir']}':
         ensure  => 'directory',
@@ -1188,9 +1188,9 @@ class { 'apache::mod::wsgi': }
     pp = <<-MANIFEST
       if $::osfamily == 'RedHat' and "$::selinux" == "true" {
         $semanage_package = $::operatingsystemmajrelease ? {
-          '5'     => 'policycoreutils',
-          '8'     => 'policycoreutils-python-utils',
-          default => 'policycoreutils-python',
+          '6'     => 'policycoreutils-python',
+          '7'     => 'policycoreutils-python',
+          default => 'policycoreutils-python-utils',
         }
         package { $semanage_package: ensure => installed }
         exec { 'set_apache_defaults':
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 353a94f91a..ffd4f4a950 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -100,10 +100,17 @@
             end
 
             it { is_expected.to contain_class('apache::params') }
-            it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
-            it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
+            it { is_expected.to contain_package('php') }
+            if facts[:os]['release']['major'].to_i < 8
+              it { is_expected.to contain_apache__mod('php5') }
+              it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
+            elsif facts[:os]['release']['major'].to_i == 8
+              it { is_expected.to contain_apache__mod('php7') }
+              it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
+            elsif facts[:os]['release']['major'].to_i >= 9
+              it { is_expected.to contain_apache__mod('php') }
+              it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+            end
           end
           context 'with alternative package name' do
             let :pre_condition do
@@ -123,8 +130,17 @@
               { path: 'alternative-path' }
             end
 
-            it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module alternative-path\n") } if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module alternative-path\n") } if facts[:os]['release']['major'].to_i >= 8
+            it { is_expected.to contain_package('php') }
+            if facts[:os]['release']['major'].to_i < 8
+              it { is_expected.to contain_apache__mod('php5') }
+              it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module alternative-path\n") }
+            elsif facts[:os]['release']['major'].to_i == 8
+              it { is_expected.to contain_apache__mod('php7') }
+              it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module alternative-path\n") }
+            elsif facts[:os]['release']['major'].to_i >= 9
+              it { is_expected.to contain_apache__mod('php') }
+              it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module alternative-path\n") }
+            end
           end
           context 'with alternative extensions' do
             let :pre_condition do
@@ -157,10 +173,17 @@
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
-            it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
-            it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
+            it { is_expected.to contain_package('php') }
+            if facts[:os]['release']['major'].to_i < 8
+              it { is_expected.to contain_apache__mod('php5') }
+              it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
+            elsif facts[:os]['release']['major'].to_i == 8
+              it { is_expected.to contain_apache__mod('php7') }
+              it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
+            elsif facts[:os]['release']['major'].to_i >= 9
+              it { is_expected.to contain_apache__mod('php') }
+              it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+            end
           end
           context 'with mpm_module => itk' do
             let :pre_condition do
@@ -169,10 +192,17 @@
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::itk') }
-            it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
-            it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
+            it { is_expected.to contain_package('php') }
+            if facts[:os]['release']['major'].to_i < 8
+              it { is_expected.to contain_apache__mod('php5') }
+              it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
+            elsif facts[:os]['release']['major'].to_i == 8
+              it { is_expected.to contain_apache__mod('php7') }
+              it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
+            elsif facts[:os]['release']['major'].to_i >= 9
+              it { is_expected.to contain_apache__mod('php') }
+              it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+            end
           end
         end
       when 'FreeBSD'
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
index 44ba4dd8d9..8ddf52f516 100644
--- a/spec/defines/fastcgi_server_spec.rb
+++ b/spec/defines/fastcgi_server_spec.rb
@@ -11,8 +11,8 @@
   end
 
   on_supported_os.each do |os, facts|
-    next if facts[:os]['release']['major'] == '18.04' || facts[:os]['release']['major'] == '20.04'
-    next if (facts[:os]['release']['major'] == '7' || facts[:os]['release']['major'] == '8') && facts[:os]['family']['RedHat']
+    next if facts[:os]['name'] == 'Ubuntu'
+    next if facts[:os]['release']['major'] != '6' && facts[:os]['family']['RedHat']
     context "on #{os} " do
       let :facts do
         facts

From 12a3a364c1ce44bb795767ab0820719cc143cde7 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 14 Jul 2022 15:39:48 +0100
Subject: [PATCH 1968/2267] (GH-2261) Temporary test exclusion

Test's have been temporarily excluded on Redhat 9 pending completion of: https://github.com/puppetlabs/puppetlabs-apache/issues/2261
---
 spec/acceptance/mod_php_spec.rb | 173 ++++++++++++++++----------------
 1 file changed, 88 insertions(+), 85 deletions(-)

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index bc610c7be2..558156c3fc 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -3,98 +3,101 @@
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 
-describe 'apache::mod::php class', if: mod_supported_on_platform?('apache::mod::php') do
-  context 'default php config' do
-    pp = <<-MANIFEST
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::php': }
-        apache::vhost { 'php.example.com':
-          port    => '80',
-          docroot => '#{apache_hash['doc_root']}/php',
-        }
-        host { 'php.example.com': ip => '127.0.0.1', }
-        file { '#{apache_hash['doc_root']}/php/index.php':
-          ensure  => file,
-          content => "<?php phpinfo(); ?>\\n",
-        }
-    MANIFEST
-    it 'succeeds in puppeting php' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    if os[:family] == 'debian' && os[:release] =~ %r{^9\.}
-      describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
-      end
-    elsif os[:family] == 'debian' && os[:release] =~ %r{^10\.}
-      describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
-      end
-    elsif os[:family] == 'debian' && os[:release] =~ %r{^11\.}
-      describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
-      end
-    elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
-      describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
-      end
-    elsif os[:family] == 'ubuntu' && os[:release] == '20.04'
-      describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
-      end
-    elsif os[:family] == 'redhat' && os[:release] =~ %r{^(9)\b}
-      describe file("#{apache_hash['mod_dir']}/php.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
+# Temporary exclusion pending resolution of https://github.com/puppetlabs/puppetlabs-apache/issues/2261
+unless os[:family] == 'redhat' && os[:release].to_i == 9
+  describe 'apache::mod::php class', if: mod_supported_on_platform?('apache::mod::php') do
+    context 'default php config' do
+      pp = <<-MANIFEST
+          class { 'apache':
+            mpm_module => 'prefork',
+          }
+          class { 'apache::mod::php': }
+          apache::vhost { 'php.example.com':
+            port    => '80',
+            docroot => '#{apache_hash['doc_root']}/php',
+          }
+          host { 'php.example.com': ip => '127.0.0.1', }
+          file { '#{apache_hash['doc_root']}/php/index.php':
+            ensure  => file,
+            content => "<?php phpinfo(); ?>\\n",
+          }
+      MANIFEST
+      it 'succeeds in puppeting php' do
+        apply_manifest(pp, catch_failures: true)
       end
-    elsif os[:family] == 'redhat' && os[:release] =~ %r{^(8)\b}
-      describe file("#{apache_hash['mod_dir']}/php7.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
-      end
-    elsif os[:family] == 'sles' && os[:release].to_i >= 15
-      describe file("#{apache_hash['mod_dir']}/php7.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
-      end
-    else
-      describe file("#{apache_hash['mod_dir']}/php5.conf") do
-        it { is_expected.to contain 'DirectoryIndex index.php' }
+
+      if os[:family] == 'debian' && os[:release] =~ %r{^9\.}
+        describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
+      elsif os[:family] == 'debian' && os[:release] =~ %r{^10\.}
+        describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
+      elsif os[:family] == 'debian' && os[:release] =~ %r{^11\.}
+        describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
+      elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
+        describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
+      elsif os[:family] == 'ubuntu' && os[:release] == '20.04'
+        describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
+      elsif os[:family] == 'redhat' && os[:release] =~ %r{^(9)\b}
+        describe file("#{apache_hash['mod_dir']}/php.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
+      elsif os[:family] == 'redhat' && os[:release] =~ %r{^(8)\b}
+        describe file("#{apache_hash['mod_dir']}/php7.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
+      elsif os[:family] == 'sles' && os[:release].to_i >= 15
+        describe file("#{apache_hash['mod_dir']}/php7.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
+      else
+        describe file("#{apache_hash['mod_dir']}/php5.conf") do
+          it { is_expected.to contain 'DirectoryIndex index.php' }
+        end
       end
     end
-  end
 
-  context 'custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value' do
-    pp = <<-MANIFEST
-        class { 'apache':
-          mpm_module => 'prefork',
+    context 'custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value' do
+      pp = <<-MANIFEST
+          class { 'apache':
+            mpm_module => 'prefork',
+          }
+          class { 'apache::mod::php':
+          extensions => ['.php','.php5'],
         }
-         class { 'apache::mod::php':
-         extensions => ['.php','.php5'],
-       }
 
-        apache::vhost { 'php.example.com':
-          port             => '80',
-          docroot          => '#{apache_hash['doc_root']}/php',
-          php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
-          php_flags        => { 'display_errors' => 'on', },
-          php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
-          php_admin_flags  => { 'engine' => 'on', },
-        }
-        host { 'php.example.com': ip => '127.0.0.1', }
-        file { '#{apache_hash['doc_root']}/php/index.php5':
-          ensure  => file,
-          content => "<?php phpinfo(); ?>\\n",
-        }
-    MANIFEST
-    it 'succeeds in puppeting php' do
-      apply_manifest(pp, catch_failures: true)
-    end
+          apache::vhost { 'php.example.com':
+            port             => '80',
+            docroot          => '#{apache_hash['doc_root']}/php',
+            php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
+            php_flags        => { 'display_errors' => 'on', },
+            php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
+            php_admin_flags  => { 'engine' => 'on', },
+          }
+          host { 'php.example.com': ip => '127.0.0.1', }
+          file { '#{apache_hash['doc_root']}/php/index.php5':
+            ensure  => file,
+            content => "<?php phpinfo(); ?>\\n",
+          }
+      MANIFEST
+      it 'succeeds in puppeting php' do
+        apply_manifest(pp, catch_failures: true)
+      end
 
-    describe file("#{apache_hash['vhost_dir']}/25-php.example.com.conf") do
-      it { is_expected.to contain '  php_flag display_errors on' }
-      it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
-      it { is_expected.to contain '  php_admin_flag engine on' }
-      it { is_expected.to contain '  php_admin_value open_basedir /var/www/php/:/usr/share/pear/' }
+      describe file("#{apache_hash['vhost_dir']}/25-php.example.com.conf") do
+        it { is_expected.to contain '  php_flag display_errors on' }
+        it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
+        it { is_expected.to contain '  php_admin_flag engine on' }
+        it { is_expected.to contain '  php_admin_value open_basedir /var/www/php/:/usr/share/pear/' }
+      end
     end
   end
 end

From 75f6854d92dba25dfcf8bcc6da2ccee72e2e337c Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@betadots.de>
Date: Fri, 18 Feb 2022 13:46:01 +0100
Subject: [PATCH 1969/2267] Allow additional settings for GSSAPI in Vhost

Adding config items:
- allowedmech
- authname
- authtype
- basicauth
---
 manifests/vhost.pp          | 2 ++
 spec/defines/vhost_spec.rb  | 2 ++
 templates/vhost/_gssapi.epp | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 09c3100a6e..b309940d91 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1477,6 +1477,8 @@
 #         gssapi => {
 #           acceptor_name            => '{HOSTNAME}',
 #           allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
+#           authname                 => 'Kerberos 5',
+#           authtype                 => 'GSSAPI',
 #           basic_auth               => true,
 #           basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
 #           basic_ticket_timeout     => 300,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index eaa3af9946..37e3110a0c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -273,6 +273,8 @@
                   'gssapi'                                              => {
                     'acceptor_name'            => '{HOSTNAME}',
                     'allowed_mech'             => ['krb5', 'iakerb', 'ntlmssp'],
+                    'authname'                 => 'Kerberos 5',
+                    'authtype'                 => 'GSSAPI',
                     'basic_auth'               => true,
                     'basic_auth_mech'          => ['krb5', 'iakerb', 'ntlmssp'],
                     'basic_ticket_timeout'     => 300,
diff --git a/templates/vhost/_gssapi.epp b/templates/vhost/_gssapi.epp
index 87a755a6b9..f775e54126 100644
--- a/templates/vhost/_gssapi.epp
+++ b/templates/vhost/_gssapi.epp
@@ -5,6 +5,8 @@
   Optional[Boolean]                                       $basic_auth = undef,
   Optional[Array[Enum['krb5','iakerb','ntlmssp']]]        $basic_auth_mech = undef,
   Optional[[Integer[1]]]                                  $basic_ticket_timeout = undef,
+  Optional[String[1]]                                     $authname = undef,
+  Optional[String[1]]                                     $authtype = undef,
   Optional[Boolean]                                       $connection_bound = undef,
   Optional[Struct[{
     Optional['ccache']        => Array[Stdlib::Unixpath],
@@ -42,6 +44,12 @@
     GssapiAllowedMech <%= $mech %>
   <%- } -%>
 <%- } -%>
+<%- if $authname { -%>
+    AuthName "<%= $authname %>"
+<%- } -%>
+<%- if $authtype { -%>
+    AuthType <%= $authtype %>
+<%- } -%>
 <%- if $basic_auth { -%>
     GssapiBasicAuth On
 <%- } -%>

From b7e5e3c50451dc816011b6530cbe79be1ab72e81 Mon Sep 17 00:00:00 2001
From: Yan Zhan <yanzhan2@illinois.edu>
Date: Mon, 18 Jul 2022 08:36:56 -0500
Subject: [PATCH 1970/2267] Fix pattern for OIDCScope and OIDCPathScope (#2262)

---
 types/oidcsettings.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 9c07e42345..51933c7023 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -17,7 +17,7 @@
     Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderBackChannelLogoutSupported']      => Enum['On','Off'],
     Optional['ProviderRegistrationEndpointJson']        => String,
-    Optional['Scope']                                   => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
+    Optional['Scope']                                   => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['SSLValidateServer']                       => Enum['On','Off'],
     Optional['UserInfoRefreshInterval']                 => Integer,
@@ -83,7 +83,7 @@
     Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
     Optional['HTMLErrorTemplate']                       => String,
     Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
-    Optional['PathScope']                               => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
+    Optional['PathScope']                               => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['PathAuthRequestParams']                   => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['IDTokenIatSlack']                         => Integer,
     Optional['ClaimPrefix']                             => String,

From 35800a2545f998116ee9b3b45657aaefe4535b04 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 20 Jul 2022 15:31:16 +0200
Subject: [PATCH 1971/2267] Drop suphp support

suphp was discontinued in 2013. At this point nobody should use it
anymore.
---
 README.md                            | 32 ------------
 manifests/mod/suphp.pp               | 23 ---------
 manifests/params.pp                  | 19 -------
 manifests/vhost.pp                   | 76 ----------------------------
 spec/acceptance/vhost_spec.rb        | 23 ---------
 spec/classes/mod/suphp_spec.rb       | 18 -------
 spec/defines/vhost_spec.rb           |  7 +--
 spec/spec_helper_acceptance_local.rb |  4 --
 templates/mod/suphp.conf.erb         | 19 -------
 templates/vhost/_directories.erb     |  3 --
 templates/vhost/_suphp.erb           | 11 ----
 11 files changed, 1 insertion(+), 234 deletions(-)
 delete mode 100644 manifests/mod/suphp.pp
 delete mode 100644 spec/classes/mod/suphp_spec.rb
 delete mode 100644 templates/mod/suphp.conf.erb
 delete mode 100644 templates/vhost/_suphp.erb

diff --git a/README.md b/README.md
index a9f9e89f48..421f9af426 100755
--- a/README.md
+++ b/README.md
@@ -65,7 +65,6 @@
 [`apache::mod::shib`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodshib
 [`apache::mod::ssl`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodssl
 [`apache::mod::status`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodstatus
-[`apache::mod::suphp`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodsuphp
 [`apache::mod::userdir`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoduserdir
 [`apache::mod::worker`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodworker
 [`apache::mod::wsgi`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodwsgi
@@ -243,10 +242,6 @@
 [`ssl_compression`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_compression
 [`ssl_key`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_key
 [`StartServers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#startservers
-[suPHP]: http://www.suphp.org/Home.html
-[`suphp_addhandler`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#suphp_addhandler
-[`suphp_configpath`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#suphp_configpath
-[`suphp_engine`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#suphp_engine
 [supported operating system]: https://forge.puppet.com/supported#puppet-supported-modules-compatibility-matrix
 
 [`ThreadLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit
@@ -506,33 +501,6 @@ apache::vhost { 'subdomain.loc':
 
 #### Configuring virtual hosts for apps and processors
 
-To set up a virtual host with [suPHP][], use the following parameters:
-
-* [`suphp_engine`][], to enable the suPHP engine.
-* [`suphp_addhandler`][], to define a MIME type.
-* [`suphp_configpath`][], to set which path suPHP passes to the PHP interpreter.
-* [`directories`][], to configure Directory, File, and Location directive blocks.
-
-For example:
-
-``` puppet
-apache::vhost { 'suphp.example.com':
-  port             => '80',
-  docroot          => '/home/appuser/myphpapp',
-  suphp_addhandler => 'x-httpd-php',
-  suphp_engine     => 'on',
-  suphp_configpath => '/etc/php5/apache2',
-  directories      => [
-    { 'path'  => '/home/appuser/myphpapp',
-      'suphp' => {
-        user  => 'myappuser',
-        group => 'myappgroup',
-      },
-    },
-  ],
-}
-```
-
 To configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) for [Python][] applications, use the `wsgi` set of parameters:
 
 ``` puppet
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
deleted file mode 100644
index ae88413215..0000000000
--- a/manifests/mod/suphp.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# @summary
-#   Installs `mod_suphp`.
-#
-# @see https://www.suphp.org/DocumentationView.html?file=apache/INSTALL for additional documentation.
-#
-class apache::mod::suphp (
-) {
-  if $facts['os']['family'] == 'Debian' {
-    fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
-  }
-  include apache
-  ::apache::mod { 'suphp': }
-
-  file { 'suphp.conf':
-    ensure  => file,
-    path    => "${apache::mod_dir}/suphp.conf",
-    mode    => $apache::file_mode,
-    content => template('apache/mod/suphp.conf.erb'),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
-    notify  => Class['apache::service'],
-  }
-}
diff --git a/manifests/params.pp b/manifests/params.pp
index 27a4a06b71..d937a3965c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -88,9 +88,6 @@
     $passenger_root       = undef
     $passenger_ruby       = undef
     $passenger_default_ruby = undef
-    $suphp_addhandler     = 'php5-script'
-    $suphp_engine         = 'off'
-    $suphp_configpath     = undef
     $php_version          = $apache::version::scl_php_version
     $mod_packages         = {
       'authnz_ldap' => "${_scl_httpd_name}-mod_ldap",
@@ -200,9 +197,6 @@
     $passenger_root       = undef
     $passenger_ruby       = undef
     $passenger_default_ruby = undef
-    $suphp_addhandler     = 'php5-script'
-    $suphp_engine         = 'off'
-    $suphp_configpath     = undef
     $php_version = $facts['os']['release']['major'] ? {
       '9'     => '8', # RedHat9
       '8'     => '7', # RedHat8
@@ -261,7 +255,6 @@
         default => 'python3-mod_wsgi', # RedHat8+
       },
       'dav_svn'               => 'mod_dav_svn',
-      'suphp'                 => 'mod_suphp',
       'xsendfile'             => 'mod_xsendfile',
       'nss'                   => 'mod_nss',
       'shib2'                 => 'shibboleth',
@@ -359,9 +352,6 @@
     $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
     $ssl_sessioncache    = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
-    $suphp_addhandler    = 'x-httpd-php'
-    $suphp_engine        = 'off'
-    $suphp_configpath    = '/etc/php5/apache2'
     if ($facts['os']['name'] == 'Ubuntu') or ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') < 0) {
       $php_version = $facts['os']['release']['major'] ? {
         '9'     => '7.0', # Debian Stretch
@@ -527,9 +517,6 @@
     $passenger_root   = '/usr/local/lib/ruby/gems/2.0/gems/passenger-4.0.58'
     $passenger_ruby   = '/usr/local/bin/ruby'
     $passenger_default_ruby = undef
-    $suphp_addhandler = 'php5-script'
-    $suphp_engine     = 'off'
-    $suphp_configpath = undef
     $php_version      = '5'
     $mod_packages     = {
       # NOTE: I list here only modules that are not included in www/apache24
@@ -600,9 +587,6 @@
     $passenger_conf_file = 'passenger.conf'
     $passenger_conf_package_file = undef
     $passenger_default_ruby = undef
-    $suphp_addhandler = 'x-httpd-php'
-    $suphp_engine     = 'off'
-    $suphp_configpath = '/etc/php5/apache2'
     $php_version      = '5'
     $mod_packages     = {
       # NOTE: I list here only modules that are not included in www-servers/apache
@@ -672,10 +656,7 @@
       $default_ssl_key     = '/etc/apache2/ssl.key/default-server.key'
       $php_version         = '7'
     }
-    $suphp_configpath    = "/etc/php${php_version}/apache2"
     $ssl_sessioncache    = '/var/lib/apache2/ssl_scache(512000)'
-    $suphp_addhandler    = 'x-httpd-php'
-    $suphp_engine        = 'off'
     if versioncmp($facts['os']['release']['major'], '11') < 0 or versioncmp($facts['os']['release']['major'], '12') >= 0 {
       $mod_packages = {
         'auth_kerb'   => 'apache2-mod_auth_kerb',
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b309940d91..9b8ddbeb5f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1154,66 +1154,6 @@
 #   Allows the spcification of user and group execution privileges for CGI programs through
 #   inclusion of the `mod_suexec` module.
 #
-# @param suphp_addhandler
-#   Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-#   working together with suphp_configpath and suphp_engine.<br />
-#   An example virtual host configuration with suPHP:
-#   ``` puppet
-#   apache::vhost { 'suphp.example.com':
-#     port             => '80',
-#     docroot          => '/home/appuser/myphpapp',
-#     suphp_addhandler => 'x-httpd-php',
-#     suphp_engine     => 'on',
-#     suphp_configpath => '/etc/php5/apache2',
-#     directories      => [
-#       {
-#         'path'  => '/home/appuser/myphpapp',
-#         'suphp' => { user => 'myappuser', group => 'myappgroup' },
-#       },
-#     ],
-#   }
-#   ```
-#
-# @param suphp_configpath
-#   Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-#   working together with suphp_addhandler and suphp_engine.<br />
-#   An example virtual host configuration with suPHP:
-#   ``` puppet
-#   apache::vhost { 'suphp.example.com':
-#     port             => '80',
-#     docroot          => '/home/appuser/myphpapp',
-#     suphp_addhandler => 'x-httpd-php',
-#     suphp_engine     => 'on',
-#     suphp_configpath => '/etc/php5/apache2',
-#     directories      => [
-#       {
-#         'path'  => '/home/appuser/myphpapp',
-#         'suphp' => { user => 'myappuser', group => 'myappgroup' },
-#       },
-#     ],
-#   }
-#   ```
-#
-# @param suphp_engine
-#   Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-#   working together with suphp_configpath and suphp_addhandler.<br />
-#   An example virtual host configuration with suPHP:
-#   ``` puppet
-#   apache::vhost { 'suphp.example.com':
-#     port             => '80',
-#     docroot          => '/home/appuser/myphpapp',
-#     suphp_addhandler => 'x-httpd-php',
-#     suphp_engine     => 'on',
-#     suphp_configpath => '/etc/php5/apache2',
-#     directories      => [
-#       {
-#         'path'  => '/home/appuser/myphpapp',
-#         'suphp' => { user => 'myappuser', group => 'myappgroup' },
-#       },
-#     ],
-#   }
-#   ```
-#
 # @param vhost_name
 #   Enables name-based virtual hosting. If no IP is passed to the virtual host, but the 
 #   virtual host is assigned a port, then the virtual host name is `vhost_name:port`. 
@@ -1849,9 +1789,6 @@
   Optional[Variant[Array[Hash],Hash]] $proxy_pass                                     = undef,
   Optional[Variant[Array[Hash],Hash]] $proxy_pass_match                               = undef,
   Boolean $proxy_requests                                                             = false,
-  String $suphp_addhandler                                                            = $apache::params::suphp_addhandler,
-  Enum['on', 'off'] $suphp_engine                                                     = $apache::params::suphp_engine,
-  Optional[String] $suphp_configpath                                                  = $apache::params::suphp_configpath,
   Hash $php_flags                                                                     = {},
   Hash $php_values                                                                    = {},
   Variant[Array[String],Hash] $php_admin_flags                                        = {},
@@ -2365,7 +2302,6 @@
   # - $_directories
   # - $docroot
   # - $apache_version
-  # - $suphp_engine
   # - $shibboleth_enabled
   if $_directories and ! empty($_directories) and $ensure == 'present' {
     $_directories.each |Hash $directory| {
@@ -2693,18 +2629,6 @@
     }
   }
 
-  # Template uses:
-  # - $suphp_engine
-  # - $suphp_addhandler
-  # - $suphp_configpath
-  if $suphp_engine == 'on' {
-    concat::fragment { "${name}-suphp":
-      target  => "${priority_real}${filename}.conf",
-      order   => 240,
-      content => template('apache/vhost/_suphp.erb'),
-    }
-  }
-
   # Template uses:
   # - $php_values
   # - $php_flags
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 8742e74826..7874557be2 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1082,29 +1082,6 @@ class { 'apache': }
     end
   end
 
-  describe 'suphp' do
-    pp = <<-MANIFEST
-      class { 'apache': service_ensure => stopped, }
-      host { 'test.server': ip => '127.0.0.1' }
-      apache::vhost { 'test.server':
-        docroot          => '/tmp',
-        suphp_addhandler => '#{apache_hash['suphp_handler']}',
-        suphp_engine     => 'on',
-        suphp_configpath => '#{apache_hash['suphp_configpath']}',
-      }
-    MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: true)
-    end
-
-    describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain "suPHP_AddHandler #{apache_hash['suphp_handler']}" }
-      it { is_expected.to contain 'suPHP_Engine on' }
-      it { is_expected.to contain "suPHP_ConfigPath \"#{apache_hash['suphp_configpath']}\"" }
-    end
-  end
-
   describe 'directory rewrite rules' do
     pp = <<-MANIFEST
       class { 'apache': }
diff --git a/spec/classes/mod/suphp_spec.rb b/spec/classes/mod/suphp_spec.rb
deleted file mode 100644
index 4e8a7548db..0000000000
--- a/spec/classes/mod/suphp_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'apache::mod::suphp', type: :class do
-  on_supported_os.each do |os, facts|
-    # suphp has been declared EOL and is no longer supported on any Debian module that we test on
-    next unless facts[:os]['family'] == 'RedHat'
-    context "on #{os} " do
-      let :facts do
-        facts
-      end
-
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_package('mod_suphp') }
-    end
-  end
-end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 37e3110a0c..3508a08999 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -375,9 +375,6 @@
                 },
               ],
               'proxy_requests'              => false,
-              'suphp_addhandler'            => 'foo',
-              'suphp_engine'                => 'on',
-              'suphp_configpath'            => '/var/www/html',
               'php_admin_flags'             => ['foo', 'bar'],
               'php_admin_values'            => ['true', 'false'],
               'no_proxy_uris'               => '/foo',
@@ -777,7 +774,6 @@
               .with_content(%r{^\s+SSLProxyCipherSuite\s+HIGH$})
               .with_content(%r{^\s+SSLProxyProtocol\s+TLSv1.2$})
           }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
           it {
@@ -1315,7 +1311,6 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-setenv') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
-          it { is_expected.not_to contain_concat__fragment('rspec.example.com-suphp') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-php_admin') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-header') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-requestheader') }
@@ -1634,7 +1629,7 @@
           end
 
           [
-            'ensure', 'suphp_engine', 'ip_based', 'access_log', 'error_log',
+            'ensure', 'ip_based', 'access_log', 'error_log',
             'ssl', 'default_vhost', 'ssl_proxyengine', 'rewrites', 'suexec_user_group',
             'wsgi_script_alias', 'wsgi_daemon_process_options',
             'wsgi_import_script_alias', 'itk', 'logroot_ensure', 'log_level',
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 5ea10c10e8..95152b6557 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -100,8 +100,6 @@ def apache_settings_hash
     apache['service_name']     = 'httpd'
     apache['package_name']     = 'httpd'
     apache['error_log']        = 'error_log'
-    apache['suphp_handler']    = 'php5-script'
-    apache['suphp_configpath'] = 'undef'
     if operatingsystemrelease >= 8 && osfamily == 'redhat'
       apache['version']     = '2.4'
       apache['mod_dir']     = '/etc/httpd/conf.modules.d'
@@ -132,8 +130,6 @@ def apache_settings_hash
     apache['service_name']     = 'apache2'
     apache['package_name']     = 'apache2'
     apache['error_log']        = 'error.log'
-    apache['suphp_handler']    = 'x-httpd-php'
-    apache['suphp_configpath'] = '/etc/php5/apache2'
     apache['version']          = '2.4'
     apache['mod_ssl_dir']      = apache['mod_dir']
   when 'freebsd'
diff --git a/templates/mod/suphp.conf.erb b/templates/mod/suphp.conf.erb
deleted file mode 100644
index 95fbf97c78..0000000000
--- a/templates/mod/suphp.conf.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<IfModule mod_suphp.c>
-    AddType application/x-httpd-suphp .php .php3 .php4 .php5 .phtml
-    suPHP_AddHandler application/x-httpd-suphp
-
-    <Directory />
-        suPHP_Engine on
-    </Directory>
-
-    # By default, disable suPHP for debian packaged web applications as files
-    # are owned by root and cannot be executed by suPHP because of min_uid.
-    <Directory /usr/share>
-        suPHP_Engine off
-    </Directory>
-
-# # Use a specific php config file (a dir which contains a php.ini file)
-#       suPHP_ConfigPath /etc/php4/cgi/suphp/
-# # Tells mod_suphp NOT to handle requests with the type <mime-type>.
-#       suPHP_RemoveHandler <mime-type>
-</IfModule>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 406dd24828..b33301023c 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -347,9 +347,6 @@
     SSLVerifyDepth <%= directory['ssl_verify_depth'] %>
     <%- end -%>
     <%- end -%>
-    <%- if directory['suphp'] and @suphp_engine == 'on' -%>
-    suPHP_UserGroup <%= directory['suphp']['user'] %> <%= directory['suphp']['group'] %>
-    <%- end -%>
     <%- if directory['fcgiwrapper'] -%>
     FcgidWrapper <%= directory['fcgiwrapper']['command'] %> <%= directory['fcgiwrapper']['suffix'] %> <%= directory['fcgiwrapper']['virtual'] %>
     <%- end -%>
diff --git a/templates/vhost/_suphp.erb b/templates/vhost/_suphp.erb
deleted file mode 100644
index e394b6f94a..0000000000
--- a/templates/vhost/_suphp.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% if @suphp_engine == 'on' -%>
-  <%- if @suphp_addhandler -%>
-  suPHP_AddHandler <%= @suphp_addhandler %>
-  <%- end -%>
-  <%- if @suphp_engine -%>
-  suPHP_Engine <%= @suphp_engine %>
-  <%- end -%>
-  <%- if @suphp_configpath -%>
-  suPHP_ConfigPath "<%= @suphp_configpath %>"
-  <%- end -%>
-<% end -%>

From 436308d52bb49190ef458851bc2e845807c3d756 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 28 Jul 2022 10:47:20 +0200
Subject: [PATCH 1972/2267] Define apache_name via a let block

Defining variables in rspec is dangerous since they end up being defined
on classes. That means that in a for loop it may end up being defined as
the last running version. A let block provides proper variable scoping.

This wasn't a problem until fb0d0782d8221741474f8170dacf522f6ce32b69
where it ran spec tests on all operating systems. Then it became
dependent on the order of the supported operating systems.

Fixes: fb0d0782d8221741474f8170dacf522f6ce32b69
---
 spec/defines/vhost_spec.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3508a08999..459de02a5b 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -5,14 +5,7 @@
 describe 'apache::vhost', type: :define do
   describe 'os-independent items' do
     on_supported_os.each do |os, facts|
-      apache_name = case facts[:os]['family']
-                    when 'RedHat'
-                      'httpd'
-                    when 'Debian'
-                      'apache2'
-                    else
-                      'apache2'
-                    end
+      let(:apache_name) { facts[:os]['family'] == 'RedHat' ? 'httpd' : 'apache2' }
 
       let :pre_condition do
         "class {'apache': default_vhost => false, default_mods => false, vhost_enable_dir => '/etc/#{apache_name}/sites-enabled'}"

From 4bba02cf00131604b9c620d02a3cd23cc6fc0943 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 28 Jul 2022 11:46:27 +0200
Subject: [PATCH 1973/2267] Do not shadow facts variable in vhost spec tests

This properly separates the os_facts variable from the facts let block,
according to current best practices.
---
 spec/defines/vhost_spec.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 459de02a5b..d92d116918 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::vhost', type: :define do
   describe 'os-independent items' do
-    on_supported_os.each do |os, facts|
+    on_supported_os.each do |os, os_facts|
       let(:apache_name) { facts[:os]['family'] == 'RedHat' ? 'httpd' : 'apache2' }
 
       let :pre_condition do
@@ -24,7 +24,7 @@
 
       context "on #{os} " do
         let :facts do
-          facts
+          os_facts
         end
 
         describe 'basic assumptions' do
@@ -34,9 +34,9 @@
           it { is_expected.to contain_class('apache::params') }
           it { is_expected.to contain_apache__listen(params[:port]) }
           # namebased virualhost is only created on apache 2.2 and older
-          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
-             (facts[:os]['name'] == 'Amazon') ||
-             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
+          if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) ||
+             (os_facts[:os]['name'] == 'Amazon') ||
+             (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12)
             it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
           end
         end
@@ -586,7 +586,7 @@
                                                                             'require' => 'Package[httpd]',
                                                                             'notify'  => 'Class[Apache::Service]')
           }
-          if facts[:os]['release']['major'].to_i >= 18 && facts[:os]['name'] == 'Ubuntu'
+          if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu'
             it {
               is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
                                                                                     'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf")
@@ -1703,8 +1703,8 @@
             it { is_expected.to compile }
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
             # this works only with apache 2.4 and newer
-            if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i > 6) ||
-               (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i > 11)
+            if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) ||
+               (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11)
               it {
                 is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
                   content: %r{^\s+Require all granted$},
@@ -1717,9 +1717,9 @@
 
           # the following style is only present on Apache 2.2
           # That is used in SLES 11, RHEL6, Amazon Linux
-          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
-             (facts[:os]['name'] == 'Amazon') ||
-             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
+          if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) ||
+             (os_facts[:os]['name'] == 'Amazon') ||
+             (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12)
             context 'apache 2.2 access controls on directories' do
               let :params do
                 {
@@ -1760,7 +1760,7 @@
           end
 
           # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu
-          unless facts[:os]['family'] == 'Debian' || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
+          unless os_facts[:os]['family'] == 'Debian' || (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i >= 7)
             describe 'fastcgi options' do
               let :params do
                 {

From f41251e336fa3e7c31c19968ccee74121cf71e47 Mon Sep 17 00:00:00 2001
From: Cocker Koch <github@cocker.cc>
Date: Thu, 9 Jun 2022 16:02:19 +0200
Subject: [PATCH 1974/2267] Narrow down Datatypes

- use Datatypes from Stdlib, particularly a Port now only accepts Stdlib::Port
- use Variant[Integer, Pattern[/^[0-9]+$/]] where Strings represent Integers
---
 .puppet-lint.rc                           |   1 +
 .sync.yml                                 |   1 +
 README.md                                 |  56 +++----
 REFERENCE.md                              | 172 ++++++++++----------
 examples/vhost.pp                         |  60 +++----
 examples/vhost_proxypass.pp               |   8 +-
 examples/vhost_ssl.pp                     |   4 +-
 examples/vhosts_without_listen.pp         |  12 +-
 manifests/balancer.pp                     |   6 +-
 manifests/balancermember.pp               |   4 +-
 manifests/custom_config.pp                |  24 +--
 manifests/default_mods.pp                 |   8 +-
 manifests/fastcgi/server.pp               |  14 +-
 manifests/init.pp                         | 183 +++++++++++-----------
 manifests/mod/alias.pp                    |   2 +-
 manifests/mod/auth_cas.pp                 |   2 +-
 manifests/mod/auth_mellon.pp              |  14 +-
 manifests/mod/auth_openidc.pp             |   3 +-
 manifests/mod/authn_dbd.pp                |  14 +-
 manifests/mod/authnz_ldap.pp              |   4 +-
 manifests/mod/cluster.pp                  |  16 +-
 manifests/mod/deflate.pp                  |   2 +-
 manifests/mod/disk_cache.pp               |   6 +-
 manifests/mod/event.pp                    |  26 +--
 manifests/mod/geoip.pp                    |  16 +-
 manifests/mod/info.pp                     |   8 +-
 manifests/mod/itk.pp                      |  16 +-
 manifests/mod/jk.pp                       |  10 +-
 manifests/mod/ldap.pp                     |  32 ++--
 manifests/mod/nss.pp                      |   8 +-
 manifests/mod/pagespeed.pp                |  70 ++++-----
 manifests/mod/passenger.pp                |  40 ++---
 manifests/mod/peruser.pp                  |  16 +-
 manifests/mod/php.pp                      |  20 +--
 manifests/mod/prefork.pp                  |  20 +--
 manifests/mod/proxy_balancer.pp           |   8 +-
 manifests/mod/reqtimeout.pp               |   2 +-
 manifests/mod/rpaf.pp                     |   4 +-
 manifests/mod/security.pp                 |  26 +--
 manifests/mod/shib.pp                     |   8 +-
 manifests/mod/ssl.pp                      |  10 +-
 manifests/mod/status.pp                   |   2 +-
 manifests/mod/worker.pp                   |  20 +--
 manifests/mod/wsgi.pp                     |  16 +-
 manifests/mpm.pp                          |   4 +-
 manifests/mpm/disable_mpm_event.pp        |   1 +
 manifests/mpm/disable_mpm_prefork.pp      |   1 +
 manifests/mpm/disable_mpm_worker.pp       |   1 +
 manifests/peruser/multiplexer.pp          |   6 +-
 manifests/security/rule_link.pp           |   2 +-
 manifests/service.pp                      |  10 +-
 manifests/vhost.pp                        | 178 +++++++++++----------
 manifests/vhost/custom.pp                 |   6 +-
 manifests/vhost/fragment.pp               |  16 +-
 manifests/vhost/proxy.pp                  |  30 ++--
 manifests/vhosts.pp                       |   2 +-
 spec/acceptance/apache_parameters_spec.rb |   8 +-
 spec/acceptance/apache_ssl_spec.rb        |   4 +-
 spec/acceptance/mod_php_spec.rb           |   4 +-
 spec/acceptance/vhost_spec.rb             |  28 ++--
 spec/acceptance/vhosts_spec.rb            |   4 +-
 spec/classes/mod/auth_mellon_spec.rb      |  20 +--
 spec/classes/mod/event_spec.rb            |  40 ++---
 spec/classes/mod/ldap_spec.rb             |  10 +-
 spec/classes/mod/passenger_spec.rb        |  13 +-
 spec/classes/mod/prefork_spec.rb          |   4 +-
 spec/classes/mod/ssl_spec.rb              |   2 +-
 spec/classes/vhosts_spec.rb               |   4 +-
 spec/defines/custom_config_spec.rb        |   2 +-
 spec/defines/vhost_fragment_spec.rb       |   6 +-
 spec/defines/vhost_proxy_spec.rb          |   2 +-
 spec/defines/vhost_spec.rb                |  58 +++----
 types/oidcsettings.pp                     |  66 ++++----
 types/servertokens.pp                     |   4 +
 types/vhost/proxypass.pp                  |  38 +++--
 75 files changed, 800 insertions(+), 768 deletions(-)
 create mode 100644 types/servertokens.pp

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index 6d61fb07e3..1a73fe3400 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,2 +1,3 @@
 --relative
 --no-anchor_resource-check
+--no-140chars-check
diff --git a/.sync.yml b/.sync.yml
index 0ec6e5c8dd..354e9e1eac 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -38,3 +38,4 @@ changelog_since_tag: "3.2.0"
 Rakefile:
   extra_disabled_lint_checks:
     - anchor_resource
+    - 140chars
diff --git a/README.md b/README.md
index 421f9af426..9237db0d8f 100755
--- a/README.md
+++ b/README.md
@@ -316,7 +316,7 @@ When you declare this class with the default options, the module:
 
 - Installs the appropriate Apache software package and [required Apache modules][`default_mods`] for your operating system.
 - Places the required configuration files in a directory, with the [default location][`conf_dir`] Depends on operating system.
-- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
+- Configures the server with a default virtual host and standard port (80) and address ('\*') bindings.
 - Creates a document root directory Depends on operating system, typically `/var/www`.
 - Starts the Apache service.
 
@@ -345,7 +345,7 @@ To configure basic [name-based virtual hosts][], specify the [`port`][] and [`do
 
 ``` puppet
 apache::vhost { 'vhost.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/vhost',
 }
 ```
@@ -358,7 +358,7 @@ To configure user and group ownership for `docroot`, use the [`docroot_owner`][]
 
 ``` puppet
 apache::vhost { 'user.example.com':
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/user',
   docroot_owner => 'www-data',
   docroot_group => 'www-data',
@@ -367,11 +367,11 @@ apache::vhost { 'user.example.com':
 
 #### Configuring virtual hosts with SSL
 
-To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accommodate HTTPS requests:
+To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of 443, to accommodate HTTPS requests:
 
 ``` puppet
 apache::vhost { 'ssl.example.com':
-  port    => '443',
+  port    => 443,
   docroot => '/var/www/ssl',
   ssl     => true,
 }
@@ -381,7 +381,7 @@ To configure a virtual host to use SSL and specific SSL certificates, use the pa
 
 ``` puppet
 apache::vhost { 'cert.example.com':
-  port     => '443',
+  port     => 443,
   docroot  => '/var/www/cert',
   ssl      => true,
   ssl_cert => '/etc/ssl/fourth.example.com.cert',
@@ -395,14 +395,14 @@ To configure a mix of SSL and unencrypted virtual hosts at the same domain, decl
 # The non-ssl virtual host
 apache::vhost { 'mix.example.com non-ssl':
   servername => 'mix.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/mix',
 }
 
 # The SSL virtual host at the same domain
 apache::vhost { 'mix.example.com ssl':
   servername => 'mix.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/mix',
   ssl        => true,
 }
@@ -413,7 +413,7 @@ To configure a virtual host to redirect unencrypted connections to SSL, declare
 ``` puppet
 apache::vhost { 'redirect.example.com non-ssl':
   servername      => 'redirect.example.com',
-  port            => '80',
+  port            => 80,
   docroot         => '/var/www/redirect',
   redirect_status => 'permanent',
   redirect_dest   => 'https://redirect.example.com/'
@@ -421,7 +421,7 @@ apache::vhost { 'redirect.example.com non-ssl':
 
 apache::vhost { 'redirect.example.com ssl':
   servername => 'redirect.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/redirect',
   ssl        => true,
 }
@@ -434,7 +434,7 @@ Virtual hosts listen on all IP addresses ('\*') by default. To configure the vir
 ``` puppet
 apache::vhost { 'ip.example.com':
   ip      => '127.0.0.1',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/ip',
 }
 ```
@@ -444,7 +444,7 @@ You can also configure more than one IP address per virtual host by using an arr
 ``` puppet
 apache::vhost { 'ip.example.com':
   ip      => ['127.0.0.1','169.254.1.1'],
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/ip',
 }
 ```
@@ -454,7 +454,7 @@ You can configure multiple ports per virtual host by using an array of ports for
 ``` puppet
 apache::vhost { 'ip.example.com':
   ip      => ['127.0.0.1'],
-  port    => ['80','8080']
+  port    => [80, 8080]
   docroot => '/var/www/ip',
 }
 ```
@@ -467,7 +467,7 @@ apache::vhost { 'aliases.example.com':
     'aliases.example.org',
     'aliases.example.net',
   ],
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/aliases',
 }
 ```
@@ -477,7 +477,7 @@ To set up a virtual host with a wildcard alias for the subdomain mapped to a dir
 ``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
-  port            => '80',
+  port            => 80,
   virtual_docroot => '/var/www/%-2+',
   docroot         => '/var/www',
   serveraliases   => ['*.loc',],
@@ -488,7 +488,7 @@ To configure a virtual host with [filter rules][], pass the filter directives as
 
 ``` puppet
 apache::vhost { 'subdomain.loc':
-  port    => '80',
+  port    => 80,
   filters => [
     'FilterDeclare  COMPRESS',
     'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html',
@@ -505,13 +505,13 @@ To configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) f
 
 ``` puppet
 apache::vhost { 'wsgi.example.com':
-  port                        => '80',
+  port                        => 80,
   docroot                     => '/var/www/pythonapp',
   wsgi_application_group      => '%{GLOBAL}',
   wsgi_daemon_process         => 'wsgi',
   wsgi_daemon_process_options => {
-    processes    => '2',
-    threads      => '15',
+    processes    => 2,
+    threads      => 15,
     display-name => '%{GROUP}',
   },
   wsgi_import_script          => '/var/www/demo.wsgi',
@@ -528,7 +528,7 @@ As of Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement
 
 ``` puppet
 apache::vhost { 'wordpress.example.com':
-  port             => '80',
+  port             => 80,
   docroot          => '/var/www/wordpress',
   fallbackresource => '/index.php',
 }
@@ -540,7 +540,7 @@ To configure a virtual host with a designated directory for [Common Gateway Inte
 
 ``` puppet
 apache::vhost { 'cgi.example.com':
-  port        => '80',
+  port        => 80,
   docroot     => '/var/www/cgi',
   scriptalias => '/usr/lib/cgi-bin',
 }
@@ -550,7 +550,7 @@ To configure a virtual host for [Rack][], use the [`rack_base_uri`][] parameter:
 
 ``` puppet
 apache::vhost { 'rack.example.com':
-  port           => '80',
+  port           => 80,
   docroot        => '/var/www/rack',
   rack_base_uri => ['/rackapp1', '/rackapp2'],
 }
@@ -590,7 +590,7 @@ In this example, we add two IP-based virtual hosts on an IP address (in this exa
 apache::vhost { 'The first IP-based virtual host, non-ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
-  port       => '80',
+  port       => 80,
   ip_based   => true,
   docroot    => '/var/www/first',
 }
@@ -598,7 +598,7 @@ apache::vhost { 'The first IP-based virtual host, non-ssl':
 apache::vhost { 'The first IP-based vhost, ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
-  port       => '443',
+  port       => 443,
   ip_based   => true,
   docroot    => '/var/www/first-ssl',
   ssl        => true,
@@ -610,13 +610,13 @@ Next, we add two name-based virtual hosts listening on a second IP address (10.0
 ``` puppet
 apache::vhost { 'second.example.com':
   ip      => '10.0.0.20',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/second',
 }
 
 apache::vhost { 'third.example.com':
   ip      => '10.0.0.20',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/third',
 }
 ```
@@ -625,13 +625,13 @@ To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, yo
 
 ``` puppet
 apache::vhost { 'fourth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fourth',
   add_listen => false,
 }
 
 apache::vhost { 'fifth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fifth',
   add_listen => false,
 }
diff --git a/REFERENCE.md b/REFERENCE.md
index 0c030b4697..02ef6f1dca 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -940,7 +940,7 @@ Data type: `Any`
 Sets Apache's `TimeOut` directive, which defines the number of seconds Apache waits for
 certain events before failing a request.
 
-Default value: `'60'`
+Default value: `60`
 
 ##### <a name="trace_enable"></a>`trace_enable`
 
@@ -1075,7 +1075,7 @@ abnormal client request behavior, which may be useful for avoiding some forms of
 denial-of-service attacks. The value should be increased if normal clients see an error
 response from the server that indicates too many fields were sent in the request.
 
-Default value: `'100'`
+Default value: `100`
 
 ##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
 
@@ -1084,7 +1084,7 @@ Data type: `Any`
 The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 be allowed within a request header.
 
-Default value: `'8190'`
+Default value: `8190`
 
 ##### <a name="ip"></a>`ip`
 
@@ -1669,7 +1669,7 @@ Data type: `Any`
 
 Set the minimum number of connections per process.
 
-Default value: `'4'`
+Default value: `4`
 
 ##### <a name="authn_dbd_max"></a>`authn_dbd_max`
 
@@ -1677,7 +1677,7 @@ Data type: `Any`
 
 Set the maximum number of connections per process.
 
-Default value: `'20'`
+Default value: `20`
 
 ##### <a name="authn_dbd_keep"></a>`authn_dbd_keep`
 
@@ -1685,7 +1685,7 @@ Data type: `Any`
 
 Set the maximum number of connections per process to be sustained.
 
-Default value: `'8'`
+Default value: `8`
 
 ##### <a name="authn_dbd_exptime"></a>`authn_dbd_exptime`
 
@@ -1694,7 +1694,7 @@ Data type: `Any`
 Set the time to keep idle connections alive when the number of
 connections specified in DBDKeep has been exceeded.
 
-Default value: `'300'`
+Default value: `300`
 
 ##### <a name="authn_dbd_alias"></a>`authn_dbd_alias`
 
@@ -1906,7 +1906,7 @@ Data type: `Any`
 
 mod_cluster listen port.
 
-Default value: `'6666'`
+Default value: `6666`
 
 ##### <a name="keep_alive_timeout"></a>`keep_alive_timeout`
 
@@ -2250,7 +2250,7 @@ Data type: `Any`
 Sets the number of child server processes created at startup, via the module's `StartServers` directive. Setting this to `false`
 removes the parameter.
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -2258,7 +2258,7 @@ Data type: `Any`
 
 Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
 
-Default value: `'150'`
+Default value: `150`
 
 ##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
@@ -2275,7 +2275,7 @@ Data type: `Any`
 
 Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Setting this to `false` removes the parameters.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="maxsparethreads"></a>`maxsparethreads`
 
@@ -2283,7 +2283,7 @@ Data type: `Any`
 
 Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Setting this to `false` removes the parameters.
 
-Default value: `'75'`
+Default value: `75`
 
 ##### <a name="threadsperchild"></a>`threadsperchild`
 
@@ -2291,7 +2291,7 @@ Data type: `Any`
 
 Number of threads created by each child process.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
@@ -2299,7 +2299,7 @@ Data type: `Any`
 
 Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
 
-Default value: `'0'`
+Default value: `0`
 
 ##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
@@ -2315,7 +2315,7 @@ Data type: `Any`
 
 Limits the configurable number of processes via the `ServerLimit` directive. Setting this to `false` removes the parameter.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="apache_version"></a>`apache_version`
 
@@ -2331,7 +2331,7 @@ Data type: `Any`
 
 Limits the number of event threads via the module's `ThreadLimit` directive. Setting this to `false` removes the parameter.
 
-Default value: `'64'`
+Default value: `64`
 
 ##### <a name="listenbacklog"></a>`listenbacklog`
 
@@ -2340,7 +2340,7 @@ Data type: `Any`
 Sets the maximum length of the pending connections queue via the module's `ListenBackLog` directive. Setting this to `false` removes
 the parameter.
 
-Default value: `'511'`
+Default value: `511`
 
 ### <a name="apachemodexpires"></a>`apache::mod::expires`
 
@@ -2900,7 +2900,7 @@ Data type: `Any`
 
 Number of child server processes created on startup.
 
-Default value: `'8'`
+Default value: `8`
 
 ##### <a name="minspareservers"></a>`minspareservers`
 
@@ -2908,7 +2908,7 @@ Data type: `Any`
 
 Minimum number of idle child server processes.
 
-Default value: `'5'`
+Default value: `5`
 
 ##### <a name="maxspareservers"></a>`maxspareservers`
 
@@ -2916,7 +2916,7 @@ Data type: `Any`
 
 Maximum number of idle child server processes.
 
-Default value: `'20'`
+Default value: `20`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
@@ -2924,7 +2924,7 @@ Data type: `Any`
 
 Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache httpd process.
 
-Default value: `'256'`
+Default value: `256`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -2932,7 +2932,7 @@ Data type: `Any`
 
 Limit on the number of simultaneous requests that will be served.
 
-Default value: `'256'`
+Default value: `256`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
@@ -2940,7 +2940,7 @@ Data type: `Any`
 
 Limit on the number of connections that an individual child server process will handle.
 
-Default value: `'4000'`
+Default value: `4000`
 
 ##### <a name="enablecapabilities"></a>`enablecapabilities`
 
@@ -3408,7 +3408,7 @@ Puppet file:
 ```
 $workers_file_content = {
   worker_lists    => ['status', 'some_name,other_name'],
-  worker_maintain => '60',
+  worker_maintain => 60,
   some_name       => {
     comment          => 'Optional comment',
     type             => 'ajp13',
@@ -3488,11 +3488,11 @@ class { 'apache::mod::ldap':
   ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
   ldap_trusted_global_cert_type => 'CA_DER',
   ldap_trusted_mode             => 'TLS',
-  ldap_shared_cache_size        => '500000',
-  ldap_cache_entries            => '1024',
-  ldap_cache_ttl                => '600',
-  ldap_opcache_entries          => '1024',
-  ldap_opcache_ttl              => '600',
+  ldap_shared_cache_size        => 500000,
+  ldap_cache_entries            => 1024,
+  ldap_cache_ttl                => 600,
+  ldap_opcache_entries          => 1024,
+  ldap_opcache_ttl              => 600,
 }
 ```
 
@@ -5290,7 +5290,7 @@ Data type: `Any`
 
 
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="minprocessors"></a>`minprocessors`
 
@@ -5298,7 +5298,7 @@ Data type: `Any`
 
 
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="maxprocessors"></a>`maxprocessors`
 
@@ -5306,7 +5306,7 @@ Data type: `Any`
 
 
 
-Default value: `'10'`
+Default value: `10`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -5314,7 +5314,7 @@ Data type: `Any`
 
 
 
-Default value: `'150'`
+Default value: `150`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
@@ -5322,7 +5322,7 @@ Data type: `Any`
 
 
 
-Default value: `'1000'`
+Default value: `1000`
 
 ##### <a name="idletimeout"></a>`idletimeout`
 
@@ -5330,7 +5330,7 @@ Data type: `Any`
 
 
 
-Default value: `'120'`
+Default value: `120`
 
 ##### <a name="expiretimeout"></a>`expiretimeout`
 
@@ -5338,7 +5338,7 @@ Data type: `Any`
 
 
 
-Default value: `'120'`
+Default value: `120`
 
 ##### <a name="keepalive"></a>`keepalive`
 
@@ -5478,7 +5478,7 @@ Data type: `Any`
 
 Number of child server processes created at startup.
 
-Default value: `'8'`
+Default value: `8`
 
 ##### <a name="minspareservers"></a>`minspareservers`
 
@@ -5486,7 +5486,7 @@ Data type: `Any`
 
 Minimum number of idle child server processes.
 
-Default value: `'5'`
+Default value: `5`
 
 ##### <a name="maxspareservers"></a>`maxspareservers`
 
@@ -5494,7 +5494,7 @@ Data type: `Any`
 
 Maximum number of idle child server processes.
 
-Default value: `'20'`
+Default value: `20`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
@@ -5502,7 +5502,7 @@ Data type: `Any`
 
 Upper limit on configurable number of processes.
 
-Default value: `'256'`
+Default value: `256`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -5510,7 +5510,7 @@ Data type: `Any`
 
 Old alias for MaxRequestWorkers.
 
-Default value: `'256'`
+Default value: `256`
 
 ##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
@@ -5526,7 +5526,7 @@ Data type: `Any`
 
 Old alias for MaxConnectionsPerChild.
 
-Default value: `'4000'`
+Default value: `4000`
 
 ##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
@@ -5550,7 +5550,7 @@ Data type: `Any`
 
 Maximum length of the queue of pending connections.
 
-Default value: `'511'`
+Default value: `511`
 
 ### <a name="apachemodproxy"></a>`apache::mod::proxy`
 
@@ -6159,7 +6159,7 @@ Data type: `Any`
 
 Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
-Default value: `'5'`
+Default value: `5`
 
 ##### <a name="outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
 
@@ -6167,7 +6167,7 @@ Data type: `Any`
 
 Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
-Default value: `'4'`
+Default value: `4`
 
 ##### <a name="critical_anomaly_score"></a>`critical_anomaly_score`
 
@@ -6175,7 +6175,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a critical severity.
 
-Default value: `'5'`
+Default value: `5`
 
 ##### <a name="error_anomaly_score"></a>`error_anomaly_score`
 
@@ -6183,7 +6183,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a error severity.
 
-Default value: `'4'`
+Default value: `4`
 
 ##### <a name="warning_anomaly_score"></a>`warning_anomaly_score`
 
@@ -6191,7 +6191,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a warning severity.
 
-Default value: `'3'`
+Default value: `3`
 
 ##### <a name="notice_anomaly_score"></a>`notice_anomaly_score`
 
@@ -6199,7 +6199,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a notice severity.
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="secrequestmaxnumargs"></a>`secrequestmaxnumargs`
 
@@ -6207,7 +6207,7 @@ Data type: `Any`
 
 Sets the maximum number of arguments in the request.
 
-Default value: `'255'`
+Default value: `255`
 
 ##### <a name="secrequestbodylimit"></a>`secrequestbodylimit`
 
@@ -6215,7 +6215,7 @@ Data type: `Any`
 
 Sets the maximum request body size ModSecurity will accept for buffering.
 
-Default value: `'13107200'`
+Default value: `13107200`
 
 ##### <a name="secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
 
@@ -6224,7 +6224,7 @@ Data type: `Any`
 Configures the maximum request body size ModSecurity will accept for buffering, excluding the size of any files being transported
 in the request.
 
-Default value: `'131072'`
+Default value: `131072`
 
 ##### <a name="secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
 
@@ -6232,7 +6232,7 @@ Data type: `Any`
 
 Configures the maximum request body size that ModSecurity will store in memory.
 
-Default value: `'131072'`
+Default value: `131072`
 
 ##### <a name="manage_security_crs"></a>`manage_security_crs`
 
@@ -6481,7 +6481,7 @@ Data type: `Any`
 
 Pseudo Random Number Generator (PRNG) seeding source.
 
-Default value: `'512'`
+Default value: `512`
 
 ##### <a name="ssl_sessioncache"></a>`ssl_sessioncache`
 
@@ -6497,7 +6497,7 @@ Data type: `Any`
 
 Number of seconds before an SSL session expires in the Session Cache.
 
-Default value: `'300'`
+Default value: `300`
 
 ##### <a name="ssl_stapling"></a>`ssl_stapling`
 
@@ -6850,7 +6850,7 @@ Data type: `Any`
 
 The number of child server processes created on startup
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -6860,7 +6860,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.
 
-Default value: `'150'`
+Default value: `150`
 
 ##### <a name="minsparethreads"></a>`minsparethreads`
 
@@ -6868,7 +6868,7 @@ Data type: `Any`
 
 Minimum number of idle threads to handle request spikes.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="maxsparethreads"></a>`maxsparethreads`
 
@@ -6876,7 +6876,7 @@ Data type: `Any`
 
 Maximum number of idle threads.
 
-Default value: `'75'`
+Default value: `75`
 
 ##### <a name="threadsperchild"></a>`threadsperchild`
 
@@ -6884,7 +6884,7 @@ Data type: `Any`
 
 The number of threads created by each child process.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
@@ -6894,7 +6894,7 @@ Limit on the number of connectiojns an individual child server
 process will handle. This is the old name and is still supported. The new
 name is MaxConnectionsPerChild as of 2.3.9+.
 
-Default value: `'0'`
+Default value: `0`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
@@ -6906,7 +6906,7 @@ and ThreadsPerChild settings require more than 16 server processes
 number of server processes required by what you may want for
 MaxRequestWorkers and ThreadsPerChild.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="threadlimit"></a>`threadlimit`
 
@@ -6915,7 +6915,7 @@ Data type: `Any`
 This directive sets the maximum configured value for
 ThreadsPerChild for the lifetime of the Apache httpd process.
 
-Default value: `'64'`
+Default value: `64`
 
 ##### <a name="listenbacklog"></a>`listenbacklog`
 
@@ -6923,7 +6923,7 @@ Data type: `Any`
 
 Maximum length of the queue of pending connections.
 
-Default value: `'511'`
+Default value: `511`
 
 ##### <a name="apache_version"></a>`apache_version`
 
@@ -7055,7 +7055,7 @@ class { 'apache::vhosts':
   vhosts => {
     'custom_vhost_1' => {
       'docroot' => '/var/www/custom_vhost_1',
-      'port'    => '81',
+      'port'    => 81,
     },
   },
 }
@@ -7284,7 +7284,7 @@ Sets the configuration file's priority by prefixing its filename with this param
 numeric value, as Apache processes configuration files in alphanumeric order.<br />
 To omit the priority prefix in the configuration file's name, set this parameter to `false`.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="source"></a>`source`
 
@@ -9416,7 +9416,7 @@ If nothing matches the priority, the first name-based virtual host is used. Like
 passing a higher priority causes the alphabetically first name-based virtual host to be
 used if no other names match.<br />
 > **Note:** You should not need to use this parameter. However, if you do use it, be
-aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
+aware that the `default_vhost` parameter for `apache::vhost` passes a priority of 15.<br />
 To omit the priority prefix in file names, pass a priority of `false`.
 
 Default value: ``undef``
@@ -9463,7 +9463,7 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
     { 'path' => '/d', 'url' => 'http://backend-a/d',
-      'params' => { 'retry' => '0', 'timeout' => '5' }, },
+      'params' => { 'retry' => 0, 'timeout' => 5 }, },
     { 'path' => '/e', 'url' => 'http://backend-a/e',
       'keywords' => ['nocanon', 'interpolate'] },
     { 'path' => '/f', 'url' => 'http://backend-f/',
@@ -9561,7 +9561,7 @@ and redirectmatch_dest.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
   ...
-  redirectmatch_status => ['404','404'],
+  redirectmatch_status => ['404', '404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
@@ -9579,7 +9579,7 @@ and redirectmatch_dest.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
   ...
-  redirectmatch_status => ['404','404'],
+  redirectmatch_status => ['404', '404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
@@ -9597,7 +9597,7 @@ and redirectmatch_regexp.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
   ...
-  redirectmatch_status => ['404','404'],
+  redirectmatch_status => ['404', '404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
@@ -9875,7 +9875,7 @@ working together with suphp_configpath and suphp_engine.<br />
 An example virtual host configuration with suPHP:
 ``` puppet
 apache::vhost { 'suphp.example.com':
-  port             => '80',
+  port             => 80,
   docroot          => '/home/appuser/myphpapp',
   suphp_addhandler => 'x-httpd-php',
   suphp_engine     => 'on',
@@ -9897,7 +9897,7 @@ working together with suphp_addhandler and suphp_engine.<br />
 An example virtual host configuration with suPHP:
 ``` puppet
 apache::vhost { 'suphp.example.com':
-  port             => '80',
+  port             => 80,
   docroot          => '/home/appuser/myphpapp',
   suphp_addhandler => 'x-httpd-php',
   suphp_engine     => 'on',
@@ -9919,7 +9919,7 @@ working together with suphp_configpath and suphp_addhandler.<br />
 An example virtual host configuration with suPHP:
 ``` puppet
 apache::vhost { 'suphp.example.com':
-  port             => '80',
+  port             => 80,
   docroot          => '/home/appuser/myphpapp',
   suphp_addhandler => 'x-httpd-php',
   suphp_engine     => 'on',
@@ -9954,7 +9954,7 @@ set for `docroot` in the manifest. See [`virtual_use_default_docroot`](#virtual_
 ``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
-  port            => '80',
+  port            => 80,
   virtual_docroot => '/var/www/%-2+',
   docroot         => '/var/www',
   serveraliases   => ['*.loc',],
@@ -9972,7 +9972,7 @@ to `true` will mean both directives will be added to the configuration.
 ``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name                  => '*',
-  port                        => '80',
+  port                        => 80,
   virtual_docroot             => '/var/www/%-2+',
   docroot                     => '/var/www',
   virtual_use_default_docroot => true,
@@ -9994,12 +9994,12 @@ A hash that sets the name of the WSGI daemon, accepting
 An example virtual host configuration with WSGI:
 ``` puppet
 apache::vhost { 'wsgi.example.com':
-  port                        => '80',
+  port                        => 80,
   docroot                     => '/var/www/pythonapp',
   wsgi_daemon_process         => 'wsgi',
   wsgi_daemon_process_options =>
-    { processes    => '2',
-      threads      => '15',
+    { processes    => 2,
+      threads      => 15,
       display-name => '%{GROUP}',
     },
   wsgi_process_group          => 'wsgi',
@@ -10853,7 +10853,7 @@ Data type: `Any`
 
 Sets the relative load order for Apache HTTPD VirtualHost configuration files.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="verify_config"></a>`verify_config`
 
@@ -10886,11 +10886,11 @@ apache::vhost::fragment { 'myfragment':
 ```puppet
 include apache
 apache::vhost { 'myvhost':
-  priority => '42',
+  priority => 42,
 }
 apache::vhost::fragment { 'myfragment':
   vhost    => 'myvhost',
-  priority => '42',
+  priority => 42,
   content  => '# Foo',
 }
 ```
@@ -10904,7 +10904,7 @@ apache::vhost { 'myvhost':
 }
 apache::vhost::fragment { 'myfragment':
   vhost    => 'myvhost',
-  priority => '10', # default_vhost implies priority 10
+  priority => 10, # default_vhost implies priority 10
   content  => '# Foo',
 }
 ```
@@ -10915,7 +10915,7 @@ apache::vhost::fragment { 'myfragment':
 include apache
 apache::vhost::fragment { 'myfragment':
   vhost    => 'default',
-  priority => '15',
+  priority => 15,
   content  => '# Foo',
 }
 ```
@@ -11278,8 +11278,8 @@ Struct[{
     Optional['StateTimeout']                            => Integer,
     Optional['ScrubRequestHeaders']                     => Enum['On','Off'],
     Optional['OutgoingProxy']                           => String,
-    Optional['UnAuthAction']                            => Enum['auth','pass','401','410'],
-    Optional['UnAuthzAction']                           => Enum['401','403','auth'],
+    Optional['UnAuthAction']                            => Enum['auth','pass','401', '410'],
+    Optional['UnAuthzAction']                           => Enum['401', '403', 'auth'],
     Optional['PreservePost']                            => Enum['On','Off'],
     Optional['PassRefreshToken']                        => Enum['On','Off'],
     Optional['RequestObject']                           => String,
diff --git a/examples/vhost.pp b/examples/vhost.pp
index c0813d1608..306866b6ba 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -9,13 +9,13 @@
 
 # Most basic vhost
 apache::vhost { 'first.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/first',
 }
 
 # Vhost with different docroot owner/group/mode
 apache::vhost { 'second.example.com':
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/second',
   docroot_owner => 'third',
   docroot_group => 'third',
@@ -24,21 +24,21 @@
 
 # Vhost with serveradmin
 apache::vhost { 'third.example.com':
-  port        => '80',
+  port        => 80,
   docroot     => '/var/www/third',
   serveradmin => 'admin@example.com',
 }
 
 # Vhost with ssl (uses default ssl certs)
 apache::vhost { 'ssl.example.com':
-  port    => '443',
+  port    => 443,
   docroot => '/var/www/ssl',
   ssl     => true,
 }
 
 # Vhost with ssl and specific ssl certs
 apache::vhost { 'fourth.example.com':
-  port     => '443',
+  port     => 443,
   docroot  => '/var/www/fourth',
   ssl      => true,
   ssl_cert => '/etc/ssl/fourth.example.com.cert',
@@ -48,7 +48,7 @@
 # Vhost with english title and servername parameter
 apache::vhost { 'The fifth vhost':
   servername => 'fifth.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fifth',
 }
 
@@ -58,13 +58,13 @@
     'sixth.example.org',
     'sixth.example.net',
   ],
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/fifth',
 }
 
 # Vhost with alternate options
 apache::vhost { 'seventh.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/seventh',
   options => [
     'Indexes',
@@ -74,14 +74,14 @@
 
 # Vhost with AllowOverride for .htaccess
 apache::vhost { 'eighth.example.com':
-  port     => '80',
+  port     => 80,
   docroot  => '/var/www/eighth',
   override => 'All',
 }
 
 # Vhost with access and error logs disabled
 apache::vhost { 'ninth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/ninth',
   access_log => false,
   error_log  => false,
@@ -89,7 +89,7 @@
 
 # Vhost with custom access and error logs and logroot
 apache::vhost { 'tenth.example.com':
-  port            => '80',
+  port            => 80,
   docroot         => '/var/www/tenth',
   access_log_file => 'tenth_vhost.log',
   error_log_file  => 'tenth_vhost_error.log',
@@ -98,14 +98,14 @@
 
 # Vhost with a cgi-bin
 apache::vhost { 'eleventh.example.com':
-  port        => '80',
+  port        => 80,
   docroot     => '/var/www/eleventh',
   scriptalias => '/usr/lib/cgi-bin',
 }
 
 # Vhost with a proxypass configuration
 apache::vhost { 'twelfth.example.com':
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/twelfth',
   proxy_dest    => 'http://internal.example.com:8080/twelfth',
   no_proxy_uris => ['/login','/logout'],
@@ -113,7 +113,7 @@
 
 # Vhost to redirect /login and /logout
 apache::vhost { 'thirteenth.example.com':
-  port            => '80',
+  port            => 80,
   docroot         => '/var/www/thirteenth',
   redirect_source => [
     '/login',
@@ -127,7 +127,7 @@
 
 # Vhost to permamently redirect
 apache::vhost { 'fourteenth.example.com':
-  port            => '80',
+  port            => 80,
   docroot         => '/var/www/fourteenth',
   redirect_source => '/blog',
   redirect_dest   => 'http://blog.example.com',
@@ -136,7 +136,7 @@
 
 # Vhost with a rack configuration
 apache::vhost { 'fifteenth.example.com':
-  port           => '80',
+  port           => 80,
   docroot        => '/var/www/fifteenth',
   rack_base_uris => ['/rackapp1', '/rackapp2'],
 }
@@ -144,7 +144,7 @@
 # Vhost to redirect non-ssl to ssl
 apache::vhost { 'sixteenth.example.com non-ssl':
   servername => 'sixteenth.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/sixteenth',
   rewrites   => [
     {
@@ -158,7 +158,7 @@
 # Rewrite a URL to lower case
 apache::vhost { 'sixteenth.example.com non-ssl':
   servername => 'sixteenth.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/sixteenth',
   rewrites   => [
     { comment      => 'Rewrite to lower case',
@@ -171,7 +171,7 @@
 
 apache::vhost { 'sixteenth.example.com ssl':
   servername => 'sixteenth.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/sixteenth',
   ssl        => true,
 }
@@ -179,41 +179,41 @@
 # Vhost to redirect non-ssl to ssl using old rewrite method
 apache::vhost { 'sixteenth.example.com non-ssl old rewrite':
   servername   => 'sixteenth.example.com',
-  port         => '80',
+  port         => 80,
   docroot      => '/var/www/sixteenth',
   rewrite_cond => '%{HTTPS} off',
   rewrite_rule => '(.*) https://%{HTTP_HOST}%{REQUEST_URI}',
 }
 apache::vhost { 'sixteenth.example.com ssl old rewrite':
   servername => 'sixteenth.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/sixteenth',
   ssl        => true,
 }
 
 # Vhost to block repository files
 apache::vhost { 'seventeenth.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/seventeenth',
   block   => 'scm',
 }
 
 # Vhost with special environment variables
 apache::vhost { 'eighteenth.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/eighteenth',
   setenv  => ['SPECIAL_PATH /foo/bin','KILROY was_here'],
 }
 
 apache::vhost { 'nineteenth.example.com':
-  port     => '80',
+  port     => 80,
   docroot  => '/var/www/nineteenth',
   setenvif => 'Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1',
 }
 
 # Vhost with additional include files
 apache::vhost { 'twentyieth.example.com':
-  port                => '80',
+  port                => 80,
   docroot             => '/var/www/twelfth',
   additional_includes => ['/tmp/proxy_group_a','/tmp/proxy_group_b'],
 }
@@ -222,7 +222,7 @@
 # http://example.com.loc => /var/www/example.com
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
-  port            => '80',
+  port            => 80,
   virtual_docroot => '/var/www/%-2+',
   docroot         => '/var/www',
   serveraliases   => ['*.loc',],
@@ -230,9 +230,9 @@
 
 # Vhost with SSL (SSLProtocol, SSLCipherSuite & SSLHonorCipherOrder from default)
 apache::vhost { 'securedomain.com':
-  priority   => '10',
+  priority   => 10,
   vhost_name => 'www.securedomain.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/secure',
   ssl        => true,
   ssl_cert   => '/etc/ssl/securedomain.cert',
@@ -243,14 +243,14 @@
 
 # Vhost with access log environment variables writing control
 apache::vhost { 'twentyfirst.example.com':
-  port               => '80',
+  port               => 80,
   docroot            => '/var/www/twentyfirst',
   access_log_env_var => 'admin',
 }
 
 # Vhost with a passenger_base configuration
 apache::vhost { 'twentysecond.example.com':
-  port           => '80',
+  port           => 80,
   docroot        => '/var/www/twentysecond',
   rack_base_uris => ['/passengerapp1', '/passengerapp2'],
 }
diff --git a/examples/vhost_proxypass.pp b/examples/vhost_proxypass.pp
index ca9c57dff5..9cd0a18559 100644
--- a/examples/vhost_proxypass.pp
+++ b/examples/vhost_proxypass.pp
@@ -28,8 +28,8 @@
       'path'   => '/second',
       'url'    => 'http://localhost:8080/second',
       'params' => {
-        'retry'   => '0',
-        'timeout' => '5',
+        'retry'   => 0,
+        'timeout' => 5,
       }
     },
   ],
@@ -57,8 +57,8 @@
       'path'     => '/fourth',
       'url'      => 'http://localhost:8080/fourth',
       'params'   => {
-        'retry'   => '0',
-        'timeout' => '5',
+        'retry'   => 0,
+        'timeout' => 5,
       },
       'keywords' => ['noquery', 'interpolate']
     },
diff --git a/examples/vhost_ssl.pp b/examples/vhost_ssl.pp
index 8e7a2b279e..83584e73ce 100644
--- a/examples/vhost_ssl.pp
+++ b/examples/vhost_ssl.pp
@@ -10,14 +10,14 @@
 # Non-ssl vhost
 apache::vhost { 'first.example.com non-ssl':
   servername => 'first.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/first',
 }
 
 # SSL vhost at the same domain
 apache::vhost { 'first.example.com ssl':
   servername => 'first.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/first',
   ssl        => true,
 }
diff --git a/examples/vhosts_without_listen.pp b/examples/vhosts_without_listen.pp
index d42118bc2c..1ccb7f41ae 100644
--- a/examples/vhosts_without_listen.pp
+++ b/examples/vhosts_without_listen.pp
@@ -12,14 +12,14 @@
 apache::vhost { 'The first IP-based vhost, non-ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
-  port       => '80',
+  port       => 80,
   ip_based   => true,
   docroot    => '/var/www/first',
 }
 apache::vhost { 'The first IP-based vhost, ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
-  port       => '443',
+  port       => 443,
   ip_based   => true,
   docroot    => '/var/www/first-ssl',
   ssl        => true,
@@ -28,12 +28,12 @@
 # Two name-based vhost listening on 10.0.0.20
 apache::vhost { 'second.example.com':
   ip      => '10.0.0.20',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/second',
 }
 apache::vhost { 'third.example.com':
   ip      => '10.0.0.20',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/third',
 }
 
@@ -41,12 +41,12 @@
 # `add_listen => 'false'` to disable declaring "Listen 80" which will conflict
 # with the IP-based preceeding vhosts.
 apache::vhost { 'fourth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fourth',
   add_listen => false,
 }
 apache::vhost { 'fifth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fifth',
   add_listen => false,
 }
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index b67e10b0d7..71fdd81c6d 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -46,7 +46,7 @@
   Hash $proxy_set = {},
   Boolean $collect_exported = true,
   Optional[String] $target = undef,
-  Array $options = [],
+  Array[Pattern[/=/]] $options = [],
 ) {
   include apache::mod::proxy_balancer
 
@@ -73,8 +73,8 @@
   }
 
   concat { "apache_balancer_${name}":
-    owner  => '0',
-    group  => '0',
+    owner  => 0,
+    group  => 0,
     path   => $_target,
     mode   => $apache::file_mode,
     notify => Class['Apache::Service'],
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 29126ee043..fc4b6067d8 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -40,8 +40,8 @@
 #
 define apache::balancermember (
   String $balancer_cluster,
-  String $url = "http://${$facts['networking']['fqdn']}/",
-  Array $options = [],
+  Stdlib::HTTPUrl $url = "http://${$facts['networking']['fqdn']}/",
+  Array $options       = [],
 ) {
   concat::fragment { "BalancerMember ${name}":
     target  => "apache_balancer_${balancer_cluster}",
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index dea32f7a65..48d39a2d27 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -49,18 +49,18 @@
 #   show_diff property for configuration file resource
 #
 define apache::custom_config (
-  Enum['absent', 'present'] $ensure         = 'present',
-  String $confdir                           = $apache::confd_dir,
-  Optional[String] $content                 = undef,
-  Variant[Integer,String,Boolean] $priority = '25',
-  Optional[String] $source                  = undef,
-  String $verify_command                    = $apache::params::verify_command,
-  Boolean $verify_config                    = true,
-  Optional[String] $filename                = undef,
-  Optional[String] $owner                   = undef,
-  Optional[String] $group                   = undef,
-  Optional[String] $file_mode               = undef,
-  Boolean $show_diff                        = true,
+  Enum['absent', 'present'] $ensure     = 'present',
+  Stdlib::Absolutepath $confdir         = $apache::confd_dir,
+  Optional[String] $content             = undef,
+  Variant[Integer, Boolean] $priority   = 25,
+  Optional[String] $source              = undef,
+  String $verify_command                = $apache::params::verify_command,
+  Boolean $verify_config                = true,
+  Optional[String] $filename            = undef,
+  Optional[String] $owner               = undef,
+  Optional[String] $group               = undef,
+  Optional[Stdlib::Filemode] $file_mode = undef,
+  Boolean $show_diff                    = true,
 ) {
   if $content and $source {
     fail('Only one of $content and $source can be specified.')
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 68bf56ac53..edf18b350d 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -3,10 +3,10 @@
 #
 # @api private
 class apache::default_mods (
-  Boolean $all                                  = true,
-  Optional[Variant[Array[String],String]] $mods = undef,
-  String $apache_version                        = $apache::apache_version,
-  Boolean $use_systemd                          = $apache::use_systemd,
+  Boolean $all                                   = true,
+  Optional[Variant[Array[String], String]] $mods = undef,
+  String $apache_version                         = $apache::apache_version,
+  Boolean $use_systemd                           = $apache::use_systemd,
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index 3e6af87af2..df7e5ce004 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -32,13 +32,13 @@
 #   Sets a header for the server
 #
 define apache::fastcgi::server (
-  String $host                  = '127.0.0.1:9000',
-  Integer $timeout              = 15,
-  Boolean $flush                = false,
-  String $faux_path             = "/var/www/${name}.fcgi",
-  String $fcgi_alias            = "/${name}.fcgi",
-  String $file_type             = 'application/x-httpd-php',
-  Optional[String] $pass_header = undef,
+  String $host                    = '127.0.0.1:9000',
+  Integer $timeout                = 15,
+  Boolean $flush                  = false,
+  Stdlib::Absolutepath $faux_path = "/var/www/${name}.fcgi",
+  Stdlib::Unixpath $fcgi_alias    = "/${name}.fcgi",
+  String $file_type               = 'application/x-httpd-php',
+  Optional[String] $pass_header   = undef,
 ) {
   include apache::mod::fastcgi
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 9a48af21ad..02f51dc7a3 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -461,94 +461,93 @@
 #   Specifies any idditional Internet media (mime) types that you wish to be configured.
 # 
 class apache (
-  String $apache_name                                                   = $apache::params::apache_name,
-  String $service_name                                                  = $apache::params::service_name,
-  Variant[Array,Boolean] $default_mods                                  = true,
-  Boolean $default_vhost                                                = true,
-  Optional[String] $default_charset                                     = undef,
-  Boolean $default_confd_files                                          = true,
-  Boolean $default_ssl_vhost                                            = false,
-  String $default_ssl_cert                                              = $apache::params::default_ssl_cert,
-  String $default_ssl_key                                               = $apache::params::default_ssl_key,
-  Optional[String] $default_ssl_chain                                   = undef,
-  Optional[String] $default_ssl_ca                                      = undef,
-  Optional[String] $default_ssl_crl_path                                = undef,
-  Optional[String] $default_ssl_crl                                     = undef,
-  Optional[String] $default_ssl_crl_check                               = undef,
-  Boolean $default_ssl_reload_on_change                                 = false,
-  String $default_type                                                  = 'none',
-  Optional[Variant[Array,String]] $dev_packages                         = $apache::params::dev_packages,
-  Optional[String] $ip                                                  = undef,
-  Boolean $service_enable                                               = true,
-  Boolean $service_manage                                               = true,
-  Variant[Boolean,String] $service_ensure                               = 'running',
-  Optional[String] $service_restart                                     = undef,
-  Boolean $purge_configs                                                = true,
-  Optional[Boolean] $purge_vhost_dir                                    = undef,
-  Boolean $purge_vdir                                                   = false,
-  String $serveradmin                                                   = 'root@localhost',
-  Enum['On', 'Off', 'on', 'off'] $sendfile                              = 'On',
-  Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert     = undef,
-  Optional[String] $ldap_trusted_mode                                   = undef,
-  Boolean $error_documents                                              = false,
-  Variant[Integer,String] $timeout                                      = '60',
-  String $httpd_dir                                                     = $apache::params::httpd_dir,
-  String $server_root                                                   = $apache::params::server_root,
-  String $conf_dir                                                      = $apache::params::conf_dir,
-  String $confd_dir                                                     = $apache::params::confd_dir,
-  Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups  = $apache::params::hostname_lookups,
-  Optional[String] $conf_enabled                                        = $apache::params::conf_enabled,
-  String $vhost_dir                                                     = $apache::params::vhost_dir,
-  Optional[String] $vhost_enable_dir                                    = $apache::params::vhost_enable_dir,
-  Hash $mod_libs                                                        = $apache::params::mod_libs,
-  Hash $mod_packages                                                    = $apache::params::mod_packages,
-  String $vhost_include_pattern                                         = $apache::params::vhost_include_pattern,
-  String $mod_dir                                                       = $apache::params::mod_dir,
-  Optional[String] $mod_enable_dir                                      = $apache::params::mod_enable_dir,
-  Variant[Boolean,String] $mpm_module                                   = $apache::params::mpm_module,
-  String $lib_path                                                      = $apache::params::lib_path,
-  String $conf_template                                                 = $apache::params::conf_template,
-  Optional[String] $servername                                          = $apache::params::servername,
-  String $pidfile                                                       = $apache::params::pidfile,
-  Optional[Stdlib::Absolutepath] $rewrite_lock                          = undef,
-  Boolean $manage_user                                                  = true,
-  Boolean $manage_group                                                 = true,
-  String $user                                                          = $apache::params::user,
-  String $group                                                         = $apache::params::group,
-  Optional[String] $http_protocol_options                               = $apache::params::http_protocol_options,
-  Array $supplementary_groups                                           = [],
-  String $keepalive                                                     = $apache::params::keepalive,
-  Variant[Integer,String] $keepalive_timeout                            = $apache::params::keepalive_timeout,
-  Variant[Integer,String] $max_keepalive_requests                       = $apache::params::max_keepalive_requests,
-  Variant[Integer,String] $limitreqfieldsize                            = '8190',
-  Variant[Integer,String] $limitreqfields                               = '100',
-  String $logroot                                                       = $apache::params::logroot,
-  Optional[String] $logroot_mode                                        = $apache::params::logroot_mode,
-  Apache::LogLevel $log_level                                           = $apache::params::log_level,
-  Hash $log_formats                                                     = {},
-  Optional[String] $ssl_file                                            = undef,
-  String $ports_file                                                    = $apache::params::ports_file,
-  String $docroot                                                       = $apache::params::docroot,
-  String $apache_version                                                = $apache::version::default,
-  String $server_tokens                                                 = 'Prod',
-  String $server_signature                                              = 'On',
-  String $trace_enable                                                  = 'On',
-  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes        = undef,
-  Optional[String] $file_e_tag                                          = undef,
-  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]
-  $use_canonical_name                                                   = undef,
-  String $package_ensure                                                = 'installed',
-  Boolean $use_optional_includes                                        = $apache::params::use_optional_includes,
-  Boolean $use_systemd                                                  = $apache::params::use_systemd,
-  Hash $mime_types_additional                                           = $apache::params::mime_types_additional,
-  String $file_mode                                                     = $apache::params::file_mode,
-  Array $root_directory_options                                         = $apache::params::root_directory_options,
-  Boolean $root_directory_secured                                       = false,
-  String $error_log                                                     = $apache::params::error_log,
-  String $scriptalias                                                   = $apache::params::scriptalias,
-  String $access_log_file                                               = $apache::params::access_log_file,
-  Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                = [],
-  Optional[Boolean] $protocols_honor_order                       = undef,
+  String $apache_name                                                        = $apache::params::apache_name,
+  String $service_name                                                       = $apache::params::service_name,
+  Variant[Array, Boolean] $default_mods                                      = true,
+  Boolean $default_vhost                                                     = true,
+  Optional[String] $default_charset                                          = undef,
+  Boolean $default_confd_files                                               = true,
+  Boolean $default_ssl_vhost                                                 = false,
+  Stdlib::Absolutepath $default_ssl_cert                                     = $apache::params::default_ssl_cert,
+  Stdlib::Absolutepath $default_ssl_key                                      = $apache::params::default_ssl_key,
+  Optional[Stdlib::Absolutepath] $default_ssl_chain                          = undef,
+  Optional[Stdlib::Absolutepath] $default_ssl_ca                             = undef,
+  Optional[Stdlib::Absolutepath] $default_ssl_crl_path                       = undef,
+  Optional[Stdlib::Absolutepath] $default_ssl_crl                            = undef,
+  Optional[String] $default_ssl_crl_check                                    = undef,
+  Boolean $default_ssl_reload_on_change                                      = false,
+  String $default_type                                                       = 'none',
+  Optional[Variant[Array, String]] $dev_packages                             = $apache::params::dev_packages,
+  Optional[String] $ip                                                       = undef,
+  Boolean $service_enable                                                    = true,
+  Boolean $service_manage                                                    = true,
+  Variant[Stdlib::Ensure::Service, Boolean] $service_ensure                  = 'running',
+  Optional[String] $service_restart                                          = undef,
+  Boolean $purge_configs                                                     = true,
+  Optional[Boolean] $purge_vhost_dir                                         = undef,
+  Boolean $purge_vdir                                                        = false,
+  String $serveradmin                                                        = 'root@localhost',
+  Enum['On', 'Off', 'on', 'off'] $sendfile                                   = 'On',
+  Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert          = undef,
+  Optional[String] $ldap_trusted_mode                                        = undef,
+  Boolean $error_documents                                                   = false,
+  Integer[0] $timeout                                                        = 60,
+  Stdlib::Absolutepath $httpd_dir                                            = $apache::params::httpd_dir,
+  Stdlib::Absolutepath $server_root                                          = $apache::params::server_root,
+  Stdlib::Absolutepath $conf_dir                                             = $apache::params::conf_dir,
+  Stdlib::Absolutepath $confd_dir                                            = $apache::params::confd_dir,
+  Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups       = $apache::params::hostname_lookups,
+  Optional[Stdlib::Absolutepath] $conf_enabled                               = $apache::params::conf_enabled,
+  Stdlib::Absolutepath $vhost_dir                                            = $apache::params::vhost_dir,
+  Optional[Stdlib::Absolutepath] $vhost_enable_dir                           = $apache::params::vhost_enable_dir,
+  Hash $mod_libs                                                             = $apache::params::mod_libs,
+  Hash $mod_packages                                                         = $apache::params::mod_packages,
+  String $vhost_include_pattern                                              = $apache::params::vhost_include_pattern,
+  Stdlib::Absolutepath $mod_dir                                              = $apache::params::mod_dir,
+  Optional[Stdlib::Absolutepath] $mod_enable_dir                             = $apache::params::mod_enable_dir,
+  Variant[Boolean, String] $mpm_module                                       = $apache::params::mpm_module,
+  String $lib_path                                                           = $apache::params::lib_path,
+  String $conf_template                                                      = $apache::params::conf_template,
+  Optional[String] $servername                                               = $apache::params::servername,
+  String $pidfile                                                            = $apache::params::pidfile,
+  Optional[Stdlib::Absolutepath] $rewrite_lock                               = undef,
+  Boolean $manage_user                                                       = true,
+  Boolean $manage_group                                                      = true,
+  String $user                                                               = $apache::params::user,
+  String $group                                                              = $apache::params::group,
+  Optional[String] $http_protocol_options                                    = $apache::params::http_protocol_options,
+  Array $supplementary_groups                                                = [],
+  Enum['On', 'Off'] $keepalive                                               = $apache::params::keepalive,
+  Integer $keepalive_timeout                                                 = $apache::params::keepalive_timeout,
+  Integer $max_keepalive_requests                                            = $apache::params::max_keepalive_requests,
+  Integer $limitreqfieldsize                                                 = 8190,
+  Integer $limitreqfields                                                    = 100,
+  Stdlib::Absolutepath $logroot                                              = $apache::params::logroot,
+  Optional[Stdlib::Filemode] $logroot_mode                                   = $apache::params::logroot_mode,
+  Apache::LogLevel $log_level                                                = $apache::params::log_level,
+  Hash $log_formats                                                          = {},
+  Optional[String] $ssl_file                                                 = undef,
+  Stdlib::Absolutepath $ports_file                                           = $apache::params::ports_file,
+  Stdlib::Absolutepath $docroot                                              = $apache::params::docroot,
+  String $apache_version                                                     = $apache::version::default,
+  Apache::ServerTokens $server_tokens                                        = 'Prod',
+  Variant[Enum['On', 'Off'], String] $server_signature                       = 'On',
+  Enum['On', 'Off', 'extended'] $trace_enable                                = 'On',
+  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes             = undef,
+  Optional[String] $file_e_tag                                               = undef,
+  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name = undef,
+  String $package_ensure                                                     = 'installed',
+  Boolean $use_optional_includes                                             = $apache::params::use_optional_includes,
+  Boolean $use_systemd                                                       = $apache::params::use_systemd,
+  Hash $mime_types_additional                                                = $apache::params::mime_types_additional,
+  Stdlib::Filemode $file_mode                                                = $apache::params::file_mode,
+  Array $root_directory_options                                              = $apache::params::root_directory_options,
+  Boolean $root_directory_secured                                            = false,
+  String $error_log                                                          = $apache::params::error_log,
+  String $scriptalias                                                        = $apache::params::scriptalias,
+  String $access_log_file                                                    = $apache::params::access_log_file,
+  Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                            = [],
+  Optional[Boolean] $protocols_honor_order                                   = undef,
 ) inherits apache::params {
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
@@ -825,12 +824,12 @@
 
     ::apache::vhost { 'default':
       ensure                       => $default_vhost_ensure,
-      port                         => '80',
+      port                         => 80,
       docroot                      => $docroot,
       scriptalias                  => $scriptalias,
       serveradmin                  => $serveradmin,
       access_log_file              => $access_log_file,
-      priority                     => '15',
+      priority                     => 15,
       ip                           => $ip,
       logroot_mode                 => $logroot_mode,
       manage_docroot               => $default_vhost,
@@ -843,13 +842,13 @@
     }
     ::apache::vhost { 'default-ssl':
       ensure                       => $default_ssl_vhost_ensure,
-      port                         => '443',
+      port                         => 443,
       ssl                          => true,
       docroot                      => $docroot,
       scriptalias                  => $scriptalias,
       serveradmin                  => $serveradmin,
       access_log_file              => $ssl_access_log_file,
-      priority                     => '15',
+      priority                     => 15,
       ip                           => $ip,
       logroot_mode                 => $logroot_mode,
       manage_docroot               => $default_ssl_vhost,
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 5271e8f2f8..79e5ec0da9 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -25,7 +25,7 @@
   Optional[String] $apache_version  = undef,
   String $icons_options             = 'Indexes MultiViews',
   # set icons_path to false to disable the alias
-  String $icons_path                = $apache::params::alias_icons_path,
+  Stdlib::Absolutepath $icons_path  = $apache::params::alias_icons_path,
   String $icons_prefix              = $apache::params::icons_prefix
 ) inherits apache::params {
   include apache
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index a85b9d3763..17df090237 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -88,7 +88,7 @@
   String $cas_login_url,
   String $cas_validate_url,
   String $cas_cookie_path                     = $apache::params::cas_cookie_path,
-  String $cas_cookie_path_mode                = '0750',
+  Stdlib::Filemode $cas_cookie_path_mode      = '0750',
   Integer $cas_version                        = 2,
   String $cas_debug                           = 'Off',
   Optional[String] $cas_validate_server       = undef,
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index d98a4ea3eb..81693d7d04 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -25,13 +25,13 @@
 # @see https://github.com/Uninett/mod_auth_mellon for additional documentation.
 #
 class apache::mod::auth_mellon (
-  Optional[Variant[String,Integer]] $mellon_cache_size  = $apache::params::mellon_cache_size,
-  Optional[String] $mellon_lock_file                    = $apache::params::mellon_lock_file,
-  Optional[String] $mellon_post_directory     = $apache::params::mellon_post_directory,
-  Optional[String] $mellon_cache_entry_size   = undef,
-  Optional[String] $mellon_post_ttl           = undef,
-  Optional[String] $mellon_post_size          = undef,
-  Optional[String] $mellon_post_count         = undef
+  Optional[Integer] $mellon_cache_size                  = $apache::params::mellon_cache_size,
+  Optional[Stdlib::Absolutepath] $mellon_lock_file      = $apache::params::mellon_lock_file,
+  Optional[Stdlib::Absolutepath] $mellon_post_directory = $apache::params::mellon_post_directory,
+  Optional[Integer] $mellon_cache_entry_size            = undef,
+  Optional[Integer] $mellon_post_ttl                    = undef,
+  Optional[Integer] $mellon_post_size                   = undef,
+  Optional[Integer] $mellon_post_count                  = undef
 ) inherits apache::params {
   include apache
   ::apache::mod { 'auth_mellon': }
diff --git a/manifests/mod/auth_openidc.pp b/manifests/mod/auth_openidc.pp
index 7311759323..7fa75b8303 100644
--- a/manifests/mod/auth_openidc.pp
+++ b/manifests/mod/auth_openidc.pp
@@ -3,8 +3,7 @@
 # 
 # @see https://github.com/zmartzone/mod_auth_openidc for additional documentation.
 #
-class apache::mod::auth_openidc (
-) inherits apache::params {
+class apache::mod::auth_openidc inherits apache::params {
   include apache
   include apache::mod::authz_user
   apache::mod { 'auth_openidc': }
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
index 73e06952fe..d775183ddd 100644
--- a/manifests/mod/authn_dbd.pp
+++ b/manifests/mod/authn_dbd.pp
@@ -29,13 +29,13 @@
 #
 class apache::mod::authn_dbd (
   Optional[String] $authn_dbd_params,
-  String $authn_dbd_dbdriver                  = 'mysql',
-  Optional[String] $authn_dbd_query           = undef,
-  Variant[String,Integer] $authn_dbd_min      = '4',
-  Variant[String,Integer]  $authn_dbd_max     = '20',
-  Variant[String,Integer]  $authn_dbd_keep    = '8',
-  Variant[String,Integer]  $authn_dbd_exptime = '300',
-  Optional[String] $authn_dbd_alias           = undef,
+  String $authn_dbd_dbdriver         = 'mysql',
+  Optional[String] $authn_dbd_query  = undef,
+  Integer $authn_dbd_min             = 4,
+  Integer $authn_dbd_max             = 20,
+  Integer $authn_dbd_keep            = 8,
+  Integer $authn_dbd_exptime         = 300,
+  Optional[String] $authn_dbd_alias  = undef,
 ) inherits apache::params {
   include apache
   include apache::mod::dbd
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index c12a0869e3..ab3ab0502c 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -10,8 +10,8 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html for additional documentation.
 # @note Unsupported platforms: RedHat: 6, 8, 9; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
 class apache::mod::authnz_ldap (
-  Boolean $verify_server_cert     = true,
-  Optional[String] $package_name  = undef,
+  Boolean $verify_server_cert    = true,
+  Optional[String] $package_name = undef,
 ) {
   include apache
   include 'apache::mod::ldap'
diff --git a/manifests/mod/cluster.pp b/manifests/mod/cluster.pp
index 2cc920b9a1..44eeef43be 100644
--- a/manifests/mod/cluster.pp
+++ b/manifests/mod/cluster.pp
@@ -51,15 +51,15 @@
 class apache::mod::cluster (
   String $allowed_network,
   String $balancer_name,
-  String $ip,
+  Stdlib::IP::Address $ip,
   String $version,
-  Boolean $enable_mcpm_receive          = true,
-  String $port                          = '6666',
-  Integer $keep_alive_timeout           = 60,
-  String $manager_allowed_network       = '127.0.0.1',
-  Integer $max_keep_alive_requests      = 0,
-  Boolean $server_advertise             = true,
-  Optional[String] $advertise_frequency = undef,
+  Boolean $enable_mcpm_receive                 = true,
+  Stdlib::Port $port                           = 6666,
+  Integer $keep_alive_timeout                  = 60,
+  Stdlib::IP::Address $manager_allowed_network = '127.0.0.1',
+  Integer $max_keep_alive_requests             = 0,
+  Boolean $server_advertise                    = true,
+  Optional[String] $advertise_frequency        = undef,
 ) {
   include apache
 
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 0d0180050c..c5a6aaac8a 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -17,7 +17,7 @@
     'application/rss+xml',
     'application/json',
   ],
-  Hash $notes = {
+  Hash $notes          = {
     'Input'  => 'instream',
     'Output' => 'outstream',
     'Ratio'  => 'ratio',
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 044de457d1..0ae3cd4261 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -23,9 +23,9 @@
 # @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation.
 #
 class apache::mod::disk_cache (
-  Optional[String] $cache_root            = undef,
-  Optional[String] $cache_ignore_headers  = undef,
-  Boolean $default_cache_enable           = true,
+  Optional[Stdlib::Absolutepath] $cache_root = undef,
+  Optional[String] $cache_ignore_headers     = undef,
+  Boolean $default_cache_enable              = true,
 ) {
   include apache
   if $cache_root {
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 56c3c2b14f..20464fe051 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -47,18 +47,18 @@
 # @see https://httpd.apache.org/docs/current/mod/event.html for additional documentation.
 # @note Unsupported platforms: SLES: all
 class apache::mod::event (
-  Variant[String,Integer,Boolean] $startservers                     = '2',
-  Variant[String,Integer,Boolean] $maxclients                       = '150',
-  Optional[Variant[String,Integer,Boolean]] $maxrequestworkers      = undef,
-  Variant[String,Integer,Boolean] $minsparethreads                  = '25',
-  Variant[String,Integer,Boolean] $maxsparethreads                  = '75',
-  Variant[String,Integer,Boolean] $threadsperchild                  = '25',
-  Variant[String,Integer,Boolean] $maxrequestsperchild              = '0',
-  Optional[Variant[String,Integer,Boolean]] $maxconnectionsperchild = undef,
-  Variant[String,Integer,Boolean] $serverlimit                      = '25',
-  Optional[String] $apache_version                                  = undef,
-  Variant[String,Integer,Boolean]  $threadlimit                     = '64',
-  Variant[String,Integer,Boolean]  $listenbacklog                   = '511',
+  Variant[Integer, Boolean] $startservers                     = 2,
+  Variant[Integer, Boolean] $maxclients                       = 150,
+  Optional[Variant[Integer, Boolean]] $maxrequestworkers      = undef,
+  Variant[Integer, Boolean] $minsparethreads                  = 25,
+  Variant[Integer, Boolean] $maxsparethreads                  = 75,
+  Variant[Integer, Boolean] $threadsperchild                  = 25,
+  Variant[Integer, Boolean] $maxrequestsperchild              = 0,
+  Optional[Variant[Integer, Boolean]] $maxconnectionsperchild = undef,
+  Variant[Integer, Boolean] $serverlimit                      = 25,
+  Optional[String] $apache_version                            = undef,
+  Variant[Integer, Boolean]  $threadlimit                     = 64,
+  Variant[Integer, Boolean]  $listenbacklog                   = 511,
 ) {
   include apache
 
@@ -107,7 +107,7 @@
         }
       }
     }
-    'debian','freebsd' : {
+    'debian', 'freebsd' : {
       apache::mpm { 'event':
         apache_version => $_apache_version,
       }
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index cacf29af23..42050df5cd 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -28,14 +28,14 @@
 # @see https://dev.maxmind.com/geoip/legacy/mod_geoip2 for additional documentation.
 #
 class apache::mod::geoip (
-  Boolean $enable                               = false,
-  String $db_file                               = '/usr/share/GeoIP/GeoIP.dat',
-  String $flag                                  = 'Standard',
-  String $output                                = 'All',
-  Optional[String] $enable_utf8                 = undef,
-  Optional[String] $scan_proxy_headers          = undef,
-  Optional[String] $scan_proxy_header_field     = undef,
-  Optional[String] $use_last_xforwarededfor_ip  = undef,
+  Boolean $enable                              = false,
+  Stdlib::Absolutepath $db_file                = '/usr/share/GeoIP/GeoIP.dat',
+  String $flag                                 = 'Standard',
+  String $output                               = 'All',
+  Optional[String] $enable_utf8                = undef,
+  Optional[String] $scan_proxy_headers         = undef,
+  Optional[String] $scan_proxy_header_field    = undef,
+  Optional[String] $use_last_xforwarededfor_ip = undef,
 ) {
   include apache
   ::apache::mod { 'geoip': }
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 487f764276..abb5bb6404 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -17,10 +17,10 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_info.html for additional documentation.
 #
 class apache::mod::info (
-  Array[String] $allow_from         = ['127.0.0.1','::1'],
-  Optional[String] $apache_version  = undef,
-  Boolean $restrict_access          = true,
-  String $info_path                 = '/server-info',
+  Array[Stdlib::IP::Address] $allow_from = ['127.0.0.1', '::1'],
+  Optional[String] $apache_version       = undef,
+  Boolean $restrict_access               = true,
+  Stdlib::Unixpath $info_path            = '/server-info',
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index eb4285fb00..393e03150d 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -30,14 +30,14 @@
 # @see http://mpm-itk.sesse.net for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8, 9; SLES: all
 class apache::mod::itk (
-  Variant[String,Integer] $startservers                 = '8',
-  Variant[String,Integer] $minspareservers              = '5',
-  Variant[String,Integer] $maxspareservers              = '20',
-  Variant[String,Integer] $serverlimit                  = '256',
-  Variant[String,Integer] $maxclients                   = '256',
-  Variant[String,Integer] $maxrequestsperchild          = '4000',
-  Optional[Variant[Boolean,String]] $enablecapabilities = undef,
-  Optional[String] $apache_version                      = undef,
+  Integer $startservers                                  = 8,
+  Integer $minspareservers                               = 5,
+  Integer $maxspareservers                               = 20,
+  Integer $serverlimit                                   = 256,
+  Integer $maxclients                                    = 256,
+  Integer $maxrequestsperchild                           = 4000,
+  Optional[Variant[Boolean, String]] $enablecapabilities = undef,
+  Optional[String] $apache_version                       = undef,
 ) {
   include apache
 
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 8f9a596dc1..a169b366f5 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -180,8 +180,8 @@
 #   Puppet file:
 #   ```
 #   $workers_file_content = {
-#     worker_lists    => ['status', 'some_name,other_name'],
-#     worker_maintain => '60',
+#     worker_lists    => ['status', 'some_name, other_name'],
+#     worker_maintain => 60,
 #     some_name       => {
 #       comment          => 'Optional comment',
 #       type             => 'ajp13',
@@ -271,13 +271,13 @@
 #
 class apache::mod::jk (
   # Binding to mod_jk
-  Optional[String] $ip                          = undef,
-  Integer          $port                        = 80,
+  Optional[Stdlib::IP::Address] $ip             = undef,
+  Stdlib::Port     $port                        = 80,
   Boolean          $add_listen                  = true,
   # Conf file content
   Optional[String] $workers_file                = undef,
   Hash $worker_property                         = {},
-  Optional[String] $logroot                     = undef,
+  Optional[Stdlib::Absolutepath] $logroot       = undef,
   String $shm_file                              = 'jk-runtime-status',
   Optional[String] $shm_size                    = undef,
   Optional[String] $mount_file                  = undef,
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 2677c392fe..14dcd7048b 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -39,27 +39,27 @@
 #     ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
 #     ldap_trusted_global_cert_type => 'CA_DER',
 #     ldap_trusted_mode             => 'TLS',
-#     ldap_shared_cache_size        => '500000',
-#     ldap_cache_entries            => '1024',
-#     ldap_cache_ttl                => '600',
-#     ldap_opcache_entries          => '1024',
-#     ldap_opcache_ttl              => '600',
+#     ldap_shared_cache_size        => 500000,
+#     ldap_cache_entries            => 1024,
+#     ldap_cache_ttl                => 600,
+#     ldap_opcache_entries          => 1024,
+#     ldap_opcache_ttl              => 600,
 #   }
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_ldap.html for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8, 9
 class apache::mod::ldap (
-  Optional[String] $apache_version                 = undef,
-  Optional[String] $package_name                   = undef,
-  Optional[String] $ldap_trusted_global_cert_file  = undef,
-  String $ldap_trusted_global_cert_type            = 'CA_BASE64',
-  Optional[String] $ldap_shared_cache_size         = undef,
-  Optional[String] $ldap_cache_entries             = undef,
-  Optional[String] $ldap_cache_ttl                 = undef,
-  Optional[String] $ldap_opcache_entries           = undef,
-  Optional[String] $ldap_opcache_ttl               = undef,
-  Optional[String] $ldap_trusted_mode              = undef,
-  String $ldap_path                                = '/ldap-status',
+  Optional[String] $apache_version                = undef,
+  Optional[String] $package_name                  = undef,
+  Optional[String] $ldap_trusted_global_cert_file = undef,
+  String $ldap_trusted_global_cert_type           = 'CA_BASE64',
+  Optional[Integer] $ldap_shared_cache_size       = undef,
+  Optional[Integer] $ldap_cache_entries           = undef,
+  Optional[Integer] $ldap_cache_ttl               = undef,
+  Optional[Integer] $ldap_opcache_entries         = undef,
+  Optional[Integer] $ldap_opcache_ttl             = undef,
+  Optional[String] $ldap_trusted_mode             = undef,
+  String $ldap_path                               = '/ldap-status',
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index c7660cd262..028bbeeb96 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -16,10 +16,10 @@
 # @see https://pagure.io/mod_nss for additional documentation.
 #
 class apache::mod::nss (
-  String $transfer_log          = "${apache::params::logroot}/access.log",
-  String $error_log             = "${apache::params::logroot}/error.log",
-  Optional[String] $passwd_file = undef,
-  Integer $port                 = 8443,
+  Stdlib::Absolutepath $transfer_log = "${apache::params::logroot}/access.log",
+  Stdlib::Absolutepath $error_log    = "${apache::params::logroot}/error.log",
+  Optional[String] $passwd_file      = undef,
+  Stdlib::Port $port                 = 8443,
 ) {
   include apache
   include apache::mod::mime
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index 43b6e4153a..117d8fb887 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -157,41 +157,41 @@
 # @see https://developers.google.com/speed/pagespeed/module/ for additional documentation.
 #
 class apache::mod::pagespeed (
-  String $inherit_vhost_config                  = 'on',
-  Boolean $filter_xhtml                         = false,
-  String $cache_path                            = '/var/cache/mod_pagespeed/',
-  String $log_dir                               = '/var/log/pagespeed',
-  Array $memcache_servers                       = [],
-  String $rewrite_level                         = 'CoreFilters',
-  Array $disable_filters                        = [],
-  Array $enable_filters                         = [],
-  Array $forbid_filters                         = [],
-  Integer $rewrite_deadline_per_flush_ms        = 10,
-  Optional[String] $additional_domains          = undef,
-  Integer $file_cache_size_kb                   = 102400,
-  Integer $file_cache_clean_interval_ms         = 3600000,
-  Integer $lru_cache_per_process                = 1024,
-  Integer $lru_cache_byte_limit                 = 16384,
-  Integer $css_flatten_max_bytes                = 2048,
-  Integer $css_inline_max_bytes                 = 2048,
-  Integer $css_image_inline_max_bytes           = 2048,
-  Integer $image_inline_max_bytes               = 2048,
-  Integer $js_inline_max_bytes                  = 2048,
-  Integer $css_outline_min_bytes                = 3000,
-  Integer $js_outline_min_bytes                 = 3000,
-  Integer $inode_limit                          = 500000,
-  Integer $image_max_rewrites_at_once           = 8,
-  Integer $num_rewrite_threads                  = 4,
-  Integer $num_expensive_rewrite_threads        = 4,
-  String $collect_statistics                    = 'on',
-  String $statistics_logging                    = 'on',
-  Array $allow_view_stats                       = [],
-  Array $allow_pagespeed_console                = [],
-  Array $allow_pagespeed_message                = [],
-  Integer $message_buffer_size                  = 100000,
-  Variant[Array,Hash] $additional_configuration = {},
-  Optional[String] $apache_version              = undef,
-  Optional[String] $package_ensure              = undef,
+  String $inherit_vhost_config                   = 'on',
+  Boolean $filter_xhtml                          = false,
+  Stdlib::Absolutepath $cache_path               = '/var/cache/mod_pagespeed/',
+  Stdlib::Absolutepath $log_dir                  = '/var/log/pagespeed',
+  Array $memcache_servers                        = [],
+  String $rewrite_level                          = 'CoreFilters',
+  Array $disable_filters                         = [],
+  Array $enable_filters                          = [],
+  Array $forbid_filters                          = [],
+  Integer $rewrite_deadline_per_flush_ms         = 10,
+  Optional[String] $additional_domains           = undef,
+  Integer $file_cache_size_kb                    = 102400,
+  Integer $file_cache_clean_interval_ms          = 3600000,
+  Integer $lru_cache_per_process                 = 1024,
+  Integer $lru_cache_byte_limit                  = 16384,
+  Integer $css_flatten_max_bytes                 = 2048,
+  Integer $css_inline_max_bytes                  = 2048,
+  Integer $css_image_inline_max_bytes            = 2048,
+  Integer $image_inline_max_bytes                = 2048,
+  Integer $js_inline_max_bytes                   = 2048,
+  Integer $css_outline_min_bytes                 = 3000,
+  Integer $js_outline_min_bytes                  = 3000,
+  Integer $inode_limit                           = 500000,
+  Integer $image_max_rewrites_at_once            = 8,
+  Integer $num_rewrite_threads                   = 4,
+  Integer $num_expensive_rewrite_threads         = 4,
+  String $collect_statistics                     = 'on',
+  String $statistics_logging                     = 'on',
+  Array $allow_view_stats                        = [],
+  Array $allow_pagespeed_console                 = [],
+  Array $allow_pagespeed_message                 = [],
+  Integer $message_buffer_size                   = 100000,
+  Variant[Array, Hash] $additional_configuration = {},
+  Optional[String] $apache_version               = undef,
+  Optional[String] $package_ensure               = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 9892ac9573..1b0047ed90 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -341,7 +341,7 @@
   Optional[String] $passenger_concurrency_model                                              = undef,
   String $passenger_conf_file                                                                = $apache::params::passenger_conf_file,
   Optional[String] $passenger_conf_package_file                                              = $apache::params::passenger_conf_package_file,
-  Optional[String] $passenger_data_buffer_dir                                                = undef,
+  Optional[Stdlib::Absolutepath] $passenger_data_buffer_dir                                  = undef,
   Optional[String] $passenger_debug_log_file                                                 = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_debugger                               = undef,
   Optional[String] $passenger_default_group                                                  = undef,
@@ -354,7 +354,7 @@
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_error_override                         = undef,
   Optional[String] $passenger_file_descriptor_log_file                                       = undef,
   Optional[String] $passenger_fly_with                                                       = undef,
-  Optional[Variant[Integer,String]] $passenger_force_max_concurrent_requests_per_process     = undef,
+  Optional[Variant[Integer, String]] $passenger_force_max_concurrent_requests_per_process    = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_friendly_error_pages                   = undef,
   Optional[String] $passenger_group                                                          = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_high_performance                       = undef,
@@ -363,41 +363,41 @@
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_load_shell_envvars                     = undef,
   Optional[Boolean] $passenger_preload_bundler                                               = undef,
   Optional[Stdlib::Absolutepath] $passenger_log_file                                         = undef,
-  Optional[Variant[Integer,String]] $passenger_log_level                                     = undef,
-  Optional[Variant[Integer,String]] $passenger_lve_min_uid                                   = undef,
-  Optional[Variant[Integer,String]] $passenger_max_instances                                 = undef,
-  Optional[Variant[Integer,String]] $passenger_max_instances_per_app                         = undef,
-  Optional[Variant[Integer,String]] $passenger_max_pool_size                                 = undef,
-  Optional[Variant[Integer,String]] $passenger_max_preloader_idle_time                       = undef,
-  Optional[Variant[Integer,String]] $passenger_max_request_queue_size                        = undef,
-  Optional[Variant[Integer,String]] $passenger_max_request_time                              = undef,
-  Optional[Variant[Integer,String]] $passenger_max_requests                                  = undef,
-  Optional[Variant[Integer,String]] $passenger_memory_limit                                  = undef,
+  Optional[Integer] $passenger_log_level                                                     = undef,
+  Optional[Integer] $passenger_lve_min_uid                                                   = undef,
+  Optional[Integer] $passenger_max_instances                                                 = undef,
+  Optional[Integer] $passenger_max_instances_per_app                                         = undef,
+  Optional[Integer] $passenger_max_pool_size                                                 = undef,
+  Optional[Integer] $passenger_max_preloader_idle_time                                       = undef,
+  Optional[Integer] $passenger_max_request_queue_size                                        = undef,
+  Optional[Integer] $passenger_max_request_time                                              = undef,
+  Optional[Integer] $passenger_max_requests                                                  = undef,
+  Optional[Integer] $passenger_memory_limit                                                  = undef,
   Optional[String] $passenger_meteor_app_settings                                            = undef,
-  Optional[Variant[Integer,String]] $passenger_min_instances                                 = undef,
+  Optional[Integer] $passenger_min_instances                                                 = undef,
   Optional[String] $passenger_nodejs                                                         = undef,
-  Optional[Variant[Integer,String]] $passenger_pool_idle_time                                = undef,
-  Optional[Variant[String,Array[String]]] $passenger_pre_start                               = undef,
+  Optional[Integer] $passenger_pool_idle_time                                                = undef,
+  Optional[Variant[String, Array[String]]] $passenger_pre_start                              = undef,
   Optional[String] $passenger_python                                                         = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resist_deployment_errors               = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resolve_symlinks_in_document_root      = undef,
-  Optional[Variant[Integer,String]] $passenger_response_buffer_high_watermark                = undef,
+  Optional[Variant[Integer, String]] $passenger_response_buffer_high_watermark               = undef,
   Optional[String] $passenger_restart_dir                                                    = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_rolling_restarts                       = undef,
   Optional[String] $passenger_root                                                           = $apache::params::passenger_root,
   Optional[String] $passenger_ruby                                                           = $apache::params::passenger_ruby,
   Optional[String] $passenger_security_update_check_proxy                                    = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_show_version_in_header                 = undef,
-  Optional[Variant[Integer,String]] $passenger_socket_backlog                                = undef,
+  Optional[Variant[Integer, String]] $passenger_socket_backlog                               = undef,
   Optional[String] $passenger_spawn_dir                                                      = undef,
   Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method     = undef,
-  Optional[Variant[Integer,String]] $passenger_start_timeout                                 = undef,
+  Optional[Integer] $passenger_start_timeout                                                 = undef,
   Optional[String] $passenger_startup_file                                                   = undef,
-  Optional[Variant[Integer,String]] $passenger_stat_throttle_rate                            = undef,
+  Optional[Integer] $passenger_stat_throttle_rate                                            = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_sticky_sessions                        = undef,
   Optional[String] $passenger_sticky_sessions_cookie_name                                    = undef,
   Optional[String] $passenger_sticky_sessions_cookie_attributes                              = undef,
-  Optional[Variant[Integer,String]] $passenger_thread_count                                  = undef,
+  Optional[Integer] $passenger_thread_count                                                  = undef,
   Optional[String] $passenger_use_global_queue                                               = undef,
   Optional[String] $passenger_user                                                           = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_user_switching                         = undef,
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 22e9d0f627..85573e67a0 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -22,14 +22,14 @@
 # @param keepalive
 # 
 class apache::mod::peruser (
-  Variant[Integer,String] $minspareprocessors   = '2',
-  Variant[Integer,String] $minprocessors        = '2',
-  Variant[Integer,String] $maxprocessors        = '10',
-  Variant[Integer,String] $maxclients           = '150',
-  Variant[Integer,String] $maxrequestsperchild  = '1000',
-  Variant[Integer,String] $idletimeout          = '120',
-  Variant[Integer,String] $expiretimeout        = '120',
-  String $keepalive                             = 'Off',
+  Integer $minspareprocessors  = 2,
+  Integer $minprocessors       = 2,
+  Integer $maxprocessors       = 10,
+  Integer $maxclients          = 150,
+  Integer $maxrequestsperchild = 1000,
+  Integer $idletimeout         = 120,
+  Integer $expiretimeout       = 120,
+  Enum['On', 'Off'] $keepalive = 'Off',
 ) {
   include apache
   case $facts['os']['family'] {
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index cb12eab092..844b207094 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -26,16 +26,16 @@
 # @param libphp_prefix
 #
 class apache::mod::php (
-  Optional[String] $package_name  = undef,
-  String $package_ensure          = 'present',
-  Optional[String] $path          = undef,
-  Array $extensions               = ['.php'],
-  Optional[String] $content       = undef,
-  String $template                = 'apache/mod/php.conf.erb',
-  Optional[String] $source        = undef,
-  Optional[String] $root_group    = $apache::params::root_group,
-  Optional[String] $php_version   = $apache::params::php_version,
-  String $libphp_prefix           = 'libphp'
+  Optional[String] $package_name = undef,
+  String $package_ensure         = 'present',
+  Optional[String] $path         = undef,
+  Array $extensions              = ['.php'],
+  Optional[String] $content      = undef,
+  String $template               = 'apache/mod/php.conf.erb',
+  Optional[String] $source       = undef,
+  Optional[String] $root_group   = $apache::params::root_group,
+  Optional[String] $php_version  = $apache::params::php_version,
+  String $libphp_prefix          = 'libphp'
 ) inherits apache::params {
   include apache
   if (versioncmp($php_version, '8') < 0) {
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index bffaf86ba7..f58c7007ef 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -34,16 +34,16 @@
 # @see https://httpd.apache.org/docs/current/mod/prefork.html for additional documentation.
 #
 class apache::mod::prefork (
-  Variant[Integer,String] $startservers                     = '8',
-  Variant[Integer,String] $minspareservers                  = '5',
-  Variant[Integer,String] $maxspareservers                  = '20',
-  Variant[Integer,String] $serverlimit                      = '256',
-  Variant[Integer,String] $maxclients                       = '256',
-  Optional[Variant[Integer,String]] $maxrequestworkers      = undef,
-  Variant[Integer,String] $maxrequestsperchild              = '4000',
-  Optional[Variant[Integer,String]] $maxconnectionsperchild = undef,
-  Optional[String] $apache_version                          = undef,
-  Variant[String,Integer] $listenbacklog                    = '511'
+  Integer $startservers                     = 8,
+  Integer $minspareservers                  = 5,
+  Integer $maxspareservers                  = 20,
+  Integer $serverlimit                      = 256,
+  Integer $maxclients                       = 256,
+  Optional[Integer] $maxrequestworkers      = undef,
+  Integer $maxrequestsperchild              = 4000,
+  Optional[Integer] $maxconnectionsperchild = undef,
+  Optional[String] $apache_version          = undef,
+  Integer $listenbacklog                    = 511
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 1616f69d84..de7947a4fc 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -16,10 +16,10 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html for additional documentation.
 #
 class apache::mod::proxy_balancer (
-  Boolean $manager                   = false,
-  Stdlib::Absolutepath $manager_path = '/balancer-manager',
-  Array $allow_from                  = ['127.0.0.1','::1'],
-  Optional[String] $apache_version   = $apache::apache_version,
+  Boolean $manager                       = false,
+  Stdlib::Unixpath $manager_path         = '/balancer-manager',
+  Array[Stdlib::IP::Address] $allow_from = ['127.0.0.1', '::1'],
+  Optional[String] $apache_version       = $apache::apache_version,
 ) {
   require apache::mod::proxy
   require apache::mod::proxy_http
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index fc64cfbfc8..3e303b67e3 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html for additional documentation.
 #
 class apache::mod::reqtimeout (
-  Variant[Array[String],String] $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
+  Variant[Array[String], String] $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
 ) {
   include apache
   ::apache::mod { 'reqtimeout': }
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index 7fa97b132b..8cc8717d91 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -16,8 +16,8 @@
 # @see https://github.com/gnif/mod_rpaf for additional documentation.
 #
 class apache::mod::rpaf (
-  Variant[Boolean,String] $sethostname  = true,
-  Array[String] $proxy_ips              = ['127.0.0.1'],
+  Variant[Boolean, String] $sethostname = true,
+  Array[Stdlib::IP::Address] $proxy_ips = ['127.0.0.1'],
   String $header                        = 'X-Forwarded-For',
   String $template                      = 'apache/mod/rpaf.conf.erb'
 ) {
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index da78ddc120..f1bcdbcd71 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -94,18 +94,18 @@
 # @see https://github.com/SpiderLabs/ModSecurity/wiki for additional documentation.
 #
 class apache::mod::security (
-  String $logroot                                       = $apache::params::logroot,
+  Stdlib::Absolutepath $logroot                         = $apache::params::logroot,
   Integer $version                                      = $apache::params::modsec_version,
   Optional[String] $crs_package                         = $apache::params::modsec_crs_package,
   Array[String] $activated_rules                        = $apache::params::modsec_default_rules,
   Boolean $custom_rules                                 = $apache::params::modsec_custom_rules,
   Optional[Array[String]] $custom_rules_set             = $apache::params::modsec_custom_rules_set,
-  String $modsec_dir                                    = $apache::params::modsec_dir,
+  Stdlib::Absolutepath $modsec_dir                      = $apache::params::modsec_dir,
   String $modsec_secruleengine                          = $apache::params::modsec_secruleengine,
   String $audit_log_relevant_status                     = '^(?:5|4(?!04))',
   String $audit_log_parts                               = $apache::params::modsec_audit_log_parts,
   String $audit_log_type                                = $apache::params::modsec_audit_log_type,
-  Optional[String] $audit_log_storage_dir               = undef,
+  Optional[Stdlib::Absolutepath] $audit_log_storage_dir = undef,
   Integer $secpcrematchlimit                            = $apache::params::secpcrematchlimit,
   Integer $secpcrematchlimitrecursion                   = $apache::params::secpcrematchlimitrecursion,
   String $allowed_methods                               = 'GET HEAD POST OPTIONS',
@@ -113,16 +113,16 @@
   String $restricted_extensions                         = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
   String $restricted_headers                            = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
   String $secdefaultaction                              = 'deny',
-  Variant[String,Integer] $inbound_anomaly_threshold    = '5',
-  Variant[String,Integer] $outbound_anomaly_threshold   = '4',
-  Variant[String,Integer] $critical_anomaly_score       = '5',
-  Variant[String,Integer] $error_anomaly_score          = '4',
-  Variant[String,Integer] $warning_anomaly_score        = '3',
-  Variant[String,Integer] $notice_anomaly_score         = '2',
-  Variant[String,Integer] $secrequestmaxnumargs         = '255',
-  Variant[String,Integer] $secrequestbodylimit          = '13107200',
-  Variant[String,Integer] $secrequestbodynofileslimit   = '131072',
-  Variant[String,Integer] $secrequestbodyinmemorylimit  = '131072',
+  Integer $inbound_anomaly_threshold                    = 5,
+  Integer $outbound_anomaly_threshold                   = 4,
+  Integer $critical_anomaly_score                       = 5,
+  Integer $error_anomaly_score                          = 4,
+  Integer $warning_anomaly_score                        = 3,
+  Integer $notice_anomaly_score                         = 2,
+  Integer $secrequestmaxnumargs                         = 255,
+  Integer $secrequestbodylimit                          = 13107200,
+  Integer $secrequestbodynofileslimit                   = 131072,
+  Integer $secrequestbodyinmemorylimit                  = 131072,
   Boolean $manage_security_crs                          = true,
 ) inherits apache::params {
   include apache
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index ea94344a87..1bcbe327c4 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -24,10 +24,10 @@
 # @see https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig for additional documentation.
 # @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Debian: 7, 8; Ubuntu: all; OracleLinux: all
 class apache::mod::shib (
-  Boolean $suppress_warning       = false,
-  Optional[String] $mod_full_path = undef,
-  Optional[String] $package_name  = undef,
-  Optional[String] $mod_lib       = undef,
+  Boolean $suppress_warning                     = false,
+  Optional[Stdlib::Absolutepath] $mod_full_path = undef,
+  Optional[String] $package_name                = undef,
+  Optional[String] $mod_lib                     = undef,
 ) {
   include apache
   if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 27d8bac601..c91fb3fb33 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -92,17 +92,17 @@
   String $ssl_cryptodevice                                  = 'builtin',
   Array[String] $ssl_options                                = ['StdEnvVars'],
   Optional[String] $ssl_openssl_conf_cmd                    = undef,
-  Optional[String] $ssl_cert                                = undef,
-  Optional[String] $ssl_key                                 = undef,
-  Optional[String] $ssl_ca                                  = undef,
+  Optional[Stdlib::Absolutepath] $ssl_cert                  = undef,
+  Optional[Stdlib::Absolutepath] $ssl_key                   = undef,
+  Optional[Stdlib::Absolutepath] $ssl_ca                    = undef,
   String $ssl_cipher                                        = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
   Array[String] $ssl_protocol                               = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
   String $ssl_pass_phrase_dialog                            = 'builtin',
-  Variant[Integer,String] $ssl_random_seed_bytes            = '512',
+  Integer $ssl_random_seed_bytes                            = 512,
   String $ssl_sessioncache                                  = $apache::params::ssl_sessioncache,
-  Variant[Integer,String] $ssl_sessioncachetimeout          = '300',
+  Integer $ssl_sessioncachetimeout                          = 300,
   Boolean $ssl_stapling                                     = false,
   Optional[String] $stapling_cache                          = undef,
   Optional[Boolean] $ssl_stapling_return_errors             = undef,
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 4cd4c144a4..d9c741c23e 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -50,7 +50,7 @@
   ::apache::mod { 'status': }
 
   # Defaults for "Allow from" or "Require" directives
-  $allow_defaults = ['127.0.0.1','::1']
+  $allow_defaults = ['127.0.0.1', '::1']
   $requires_defaults = 'ip 127.0.0.1 ::1'
 
   # Template uses $allow_from, $extended_status, $_apache_version, $status_path
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 898c184d15..2b1ca24fe4 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -43,16 +43,16 @@
 # @see https://httpd.apache.org/docs/current/mod/worker.html for additional documentation.
 #
 class apache::mod::worker (
-  Variant[Integer,String] $startservers        = '2',
-  Variant[Integer,String] $maxclients          = '150',
-  Variant[Integer,String] $minsparethreads     = '25',
-  Variant[Integer,String] $maxsparethreads     = '75',
-  Variant[Integer,String] $threadsperchild     = '25',
-  Variant[Integer,String] $maxrequestsperchild = '0',
-  Variant[Integer,String] $serverlimit         = '25',
-  Variant[Integer,String] $threadlimit         = '64',
-  Variant[Integer,String] $listenbacklog       = '511',
-  Optional[String] $apache_version             = undef,
+  Integer $startservers            = 2,
+  Integer $maxclients              = 150,
+  Integer $minsparethreads         = 25,
+  Integer $maxsparethreads         = 75,
+  Integer $threadsperchild         = 25,
+  Integer $maxrequestsperchild     = 0,
+  Integer $serverlimit             = 25,
+  Integer $threadlimit             = 64,
+  Integer $listenbacklog           = 511,
+  Optional[String] $apache_version = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index d582702273..404df2381a 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -28,14 +28,14 @@
 # @see https://github.com/GrahamDumpleton/mod_wsgi for additional documentation.
 # @note Unsupported platforms: SLES: all; RedHat: all; CentOS: all; OracleLinux: all; Scientific: all
 class apache::mod::wsgi (
-  Optional[String] $wsgi_restrict_embedded                = undef,
-  Optional[String] $wsgi_socket_prefix                    = $apache::params::wsgi_socket_prefix,
-  Optional[String] $wsgi_python_path                      = undef,
-  Optional[String] $wsgi_python_home                      = undef,
-  Optional[Variant[Integer,String]] $wsgi_python_optimize = undef,
-  Optional[String] $wsgi_application_group                = undef,
-  Optional[String] $package_name                          = undef,
-  Optional[String] $mod_path                              = undef,
+  Optional[String] $wsgi_restrict_embedded         = undef,
+  Optional[String] $wsgi_socket_prefix             = $apache::params::wsgi_socket_prefix,
+  Optional[Stdlib::Absolutepath] $wsgi_python_path = undef,
+  Optional[Stdlib::Absolutepath] $wsgi_python_home = undef,
+  Optional[Integer] $wsgi_python_optimize          = undef,
+  Optional[String] $wsgi_application_group         = undef,
+  Optional[String] $package_name                   = undef,
+  Optional[String] $mod_path                       = undef,
 ) inherits apache::params {
   include apache
   if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) {
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 8d76fa796a..eb802889d9 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -2,8 +2,8 @@
 #
 # @api private
 define apache::mpm (
-  String $lib_path                  = $apache::lib_path,
-  Optional[String] $apache_version  = $apache::apache_version,
+  String $lib_path                 = $apache::lib_path,
+  Optional[String] $apache_version = $apache::apache_version,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
index 8c47576a79..7aee630507 100644
--- a/manifests/mpm/disable_mpm_event.pp
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -1,3 +1,4 @@
+# @summary disable Apache-Module event
 class apache::mpm::disable_mpm_event {
   exec { '/usr/sbin/a2dismod event':
     onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/event.load",
diff --git a/manifests/mpm/disable_mpm_prefork.pp b/manifests/mpm/disable_mpm_prefork.pp
index ea67edbdb5..9653b831cc 100644
--- a/manifests/mpm/disable_mpm_prefork.pp
+++ b/manifests/mpm/disable_mpm_prefork.pp
@@ -1,3 +1,4 @@
+# @summary disable Apache-Module prefork
 class apache::mpm::disable_mpm_prefork {
   exec { '/usr/sbin/a2dismod prefork':
     onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/prefork.load",
diff --git a/manifests/mpm/disable_mpm_worker.pp b/manifests/mpm/disable_mpm_worker.pp
index 4156d8438b..6b7411d1de 100644
--- a/manifests/mpm/disable_mpm_worker.pp
+++ b/manifests/mpm/disable_mpm_worker.pp
@@ -1,3 +1,4 @@
+# @summary disable Apache-Module worker
 class apache::mpm::disable_mpm_worker {
   exec { '/usr/sbin/a2dismod worker':
     onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/worker.load",
diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
index b8b271e306..c09189de13 100644
--- a/manifests/peruser/multiplexer.pp
+++ b/manifests/peruser/multiplexer.pp
@@ -5,9 +5,9 @@
 #
 # @api private
 define apache::peruser::multiplexer (
-  String $user            = $apache::user,
-  String $group           = $apache::group,
-  Optional[String] $file  = undef,
+  String $user           = $apache::user,
+  String $group          = $apache::group,
+  Optional[String] $file = undef,
 ) {
   if ! $file {
     $filename = "${name}.conf"
diff --git a/manifests/security/rule_link.pp b/manifests/security/rule_link.pp
index a3f70b1095..59cd8dee8f 100644
--- a/manifests/security/rule_link.pp
+++ b/manifests/security/rule_link.pp
@@ -2,7 +2,7 @@
 #   Links the activated_rules from `apache::mod::security` to the respective CRS rules on disk.
 #
 # @api private
-define apache::security::rule_link () {
+define apache::security::rule_link {
   $parts = split($title, '/')
   $filename = $parts[-1]
 
diff --git a/manifests/service.pp b/manifests/service.pp
index 6e5ce53d9f..914b45ba9c 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -3,11 +3,11 @@
 #
 # @api private
 class apache::service (
-  String $service_name                    = $apache::params::service_name,
-  Boolean $service_enable                 = true,
-  Variant[Boolean,String] $service_ensure = 'running',
-  Boolean $service_manage                 = true,
-  Optional[String] $service_restart       = undef
+  String $service_name                     = $apache::params::service_name,
+  Boolean $service_enable                  = true,
+  Variant[Boolean, String] $service_ensure = 'running',
+  Boolean $service_manage                  = true,
+  Optional[String] $service_restart        = undef
 ) {
   # The base class must be included first because parameter defaults depend on it
   if ! defined(Class['apache::params']) {
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9b8ddbeb5f..58d8fb9799 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -31,8 +31,8 @@
 #   Apache's version number as a string, such as '2.2' or '2.4'.
 #
 # @param access_log
-#   Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
-#
+#   Determines whether to configure `*_access.log` directives (`*_file`, `*_pipe`, or `*_syslog`).
+# 
 # @param access_log_env_var
 #   Specifies that only requests with particular environment variables be logged.
 #
@@ -590,7 +590,7 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     options => ['Indexes','FollowSymLinks','MultiViews'],
+#     options => ['Indexes', 'FollowSymLinks', 'MultiViews'],
 #   }
 #   ```
 #   > **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options', 
@@ -846,7 +846,7 @@
 #   passing a higher priority causes the alphabetically first name-based virtual host to be 
 #   used if no other names match.<br />
 #   > **Note:** You should not need to use this parameter. However, if you do use it, be 
-#   aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
+#   aware that the `default_vhost` parameter for `apache::vhost` passes a priority of 15.<br />
 #   To omit the priority prefix in file names, pass a priority of `false`.
 #
 # @param protocols
@@ -873,11 +873,11 @@
 #       { 'path' => '/l', 'url' => 'http://backend-xy',
 #         'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
 #       { 'path' => '/d', 'url' => 'http://backend-a/d',
-#         'params' => { 'retry' => '0', 'timeout' => '5' }, },
+#         'params' => { 'retry' => 0, 'timeout' => 5 }, },
 #       { 'path' => '/e', 'url' => 'http://backend-a/e',
 #         'keywords' => ['nocanon', 'interpolate'] },
 #       { 'path' => '/f', 'url' => 'http://backend-f/',
-#         'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+#         'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1']},
 #       { 'path' => '/g', 'url' => 'http://backend-g/',
 #         'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
 #       { 'path' => '/h', 'url' => 'http://backend-h/h',
@@ -915,8 +915,8 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirect_source => ['/images','/downloads'],
-#     redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+#     redirect_source => ['/images', '/downloads'],
+#     redirect_dest   => ['http://img.example.com/', 'http://downloads.example.com/'],
 #   }
 #   ```
 #
@@ -925,7 +925,7 @@
 #   ``` puppet
 #     apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirect_status => ['temp','permanent'],
+#     redirect_status => ['temp', 'permanent'],
 #   }
 #   ```
 #
@@ -936,9 +936,9 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirectmatch_status => ['404','404'],
-#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#     redirectmatch_status => ['404', '404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 #   }
 #   ```
 #
@@ -949,9 +949,9 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirectmatch_status => ['404','404'],
-#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#     redirectmatch_status => ['404', '404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 #   }
 #   ```
 #
@@ -962,9 +962,9 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirectmatch_status => ['404','404'],
-#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#     redirectmatch_status => ['404', '404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 #   }
 #   ```
 #
@@ -1168,7 +1168,7 @@
 #   ``` puppet
 #   apache::vhost { 'subdomain.loc':
 #     vhost_name      => '*',
-#     port            => '80',
+#     port            => 80,
 #     virtual_docroot => '/var/www/%-2+',
 #     docroot         => '/var/www',
 #     serveraliases   => ['*.loc',],
@@ -1181,7 +1181,7 @@
 #   ``` puppet
 #   apache::vhost { 'subdomain.loc':
 #     vhost_name                  => '*',
-#     port                        => '80',
+#     port                        => 80,
 #     virtual_docroot             => '/var/www/%-2+',
 #     docroot                     => '/var/www',
 #     virtual_use_default_docroot => true,
@@ -1198,12 +1198,12 @@
 #   An example virtual host configuration with WSGI:
 #   ``` puppet
 #   apache::vhost { 'wsgi.example.com':
-#     port                        => '80',
+#     port                        => 80,
 #     docroot                     => '/var/www/pythonapp',
 #     wsgi_daemon_process         => 'wsgi',
 #     wsgi_daemon_process_options =>
-#       { processes    => '2',
-#         threads      => '15',
+#       { processes    => 2,
+#         threads      => 15,
 #         display-name => '%{GROUP}',
 #       },
 #     wsgi_process_group          => 'wsgi',
@@ -1407,7 +1407,10 @@
 #   }
 #   ```
 #
+# TODO: check, if this Documentation is obsolete
+# lint:ignore:parameter_documentation
 # @param gssapi
+# lint:endignore
 #   Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
 #   ```puppet
 #   apache::vhost { 'sample.example.net':
@@ -1688,72 +1691,77 @@
 #   Instances of apache::mod::userdir
 #
 define apache::vhost (
-  Variant[Boolean,String] $docroot,
+  Variant[Stdlib::Absolutepath, Boolean] $docroot,
   Boolean $manage_docroot                                                             = true,
-  Variant[Boolean,String] $virtual_docroot                                            = false,
+  Variant[Stdlib::Absolutepath, Boolean] $virtual_docroot                             = false,
   Boolean $virtual_use_default_docroot                                                = false,
-  Optional[Variant[Array[Integer],Array[String],Integer,String]] $port                = undef,
-  Optional[Variant[Array[String],String]] $ip                                         = undef,
+  Optional[Variant[Array[Stdlib::Port], Stdlib::Port]] $port                          = undef,
+  Optional[
+    Variant[
+      Array[Variant[Stdlib::IP::Address, Enum['*']]],
+      Variant[Stdlib::IP::Address, Enum['*']]
+    ]
+  ] $ip                                                                               = undef,
   Boolean $ip_based                                                                   = false,
   Boolean $add_listen                                                                 = true,
   String $docroot_owner                                                               = 'root',
   String $docroot_group                                                               = $apache::params::root_group,
-  Optional[Variant[Integer,String]] $docroot_mode                                     = undef,
+  Optional[Stdlib::Filemode] $docroot_mode                                            = undef,
   Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                                     = [],
   Optional[Boolean] $protocols_honor_order                                            = undef,
   Optional[String] $serveradmin                                                       = undef,
   Boolean $ssl                                                                        = false,
-  Optional[String] $ssl_cert                                                          = $apache::default_ssl_cert,
-  Optional[String] $ssl_key                                                           = $apache::default_ssl_key,
-  Optional[String] $ssl_chain                                                         = $apache::default_ssl_chain,
-  Optional[String] $ssl_ca                                                            = $apache::default_ssl_ca,
-  Optional[String] $ssl_crl_path                                                      = $apache::default_ssl_crl_path,
-  Optional[String] $ssl_crl                                                           = $apache::default_ssl_crl,
+  Optional[Stdlib::Absolutepath] $ssl_cert                                            = $apache::default_ssl_cert,
+  Optional[Stdlib::Absolutepath] $ssl_key                                             = $apache::default_ssl_key,
+  Optional[Stdlib::Absolutepath] $ssl_chain                                           = $apache::default_ssl_chain,
+  Optional[Stdlib::Absolutepath] $ssl_ca                                              = $apache::default_ssl_ca,
+  Optional[Stdlib::Absolutepath] $ssl_crl_path                                        = $apache::default_ssl_crl_path,
+  Optional[Stdlib::Absolutepath] $ssl_crl                                             = $apache::default_ssl_crl,
   Optional[String] $ssl_crl_check                                                     = $apache::default_ssl_crl_check,
-  Optional[String] $ssl_certs_dir                                                     = $apache::params::ssl_certs_dir,
+  Optional[Stdlib::Absolutepath] $ssl_certs_dir                                       = $apache::params::ssl_certs_dir,
   Boolean $ssl_reload_on_change                                                       = $apache::default_ssl_reload_on_change,
-  Optional[Variant[Array[String],String]] $ssl_protocol                               = undef,
-  Optional[Variant[Array[String],String]] $ssl_cipher                                 = undef,
+  Optional[Variant[Array[String], String]] $ssl_protocol                              = undef,
+  Optional[Variant[Array[String], String]] $ssl_cipher                                = undef,
   Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder       = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client  = undef,
-  Optional[Variant[Integer,String]] $ssl_verify_depth                                 = undef,
+  Optional[Integer] $ssl_verify_depth                                                 = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify   = undef,
   Optional[Integer[0]] $ssl_proxy_verify_depth                                        = undef,
-  Optional[String] $ssl_proxy_ca_cert                                                 = undef,
+  Optional[Stdlib::Absolutepath] $ssl_proxy_ca_cert                                   = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn                                = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                              = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                            = undef,
-  Optional[String] $ssl_proxy_machine_cert                                            = undef,
-  Optional[String] $ssl_proxy_machine_cert_chain                                      = undef,
+  Optional[Stdlib::Absolutepath] $ssl_proxy_machine_cert                              = undef,
+  Optional[Stdlib::Absolutepath] $ssl_proxy_machine_cert_chain                        = undef,
   Optional[String] $ssl_proxy_cipher_suite                                            = undef,
   Optional[String] $ssl_proxy_protocol                                                = undef,
-  Optional[Variant[Array[String],String]] $ssl_options                                = undef,
+  Optional[Variant[Array[String], String]] $ssl_options                               = undef,
   Optional[String] $ssl_openssl_conf_cmd                                              = undef,
   Boolean $ssl_proxyengine                                                            = false,
   Optional[Boolean] $ssl_stapling                                                     = undef,
-  Optional[Variant[Integer,String]] $ssl_stapling_timeout                             = undef,
+  Optional[Integer] $ssl_stapling_timeout                                             = undef,
   Optional[Enum['on', 'off']] $ssl_stapling_return_errors                             = undef,
   Optional[String] $ssl_user_name                                                     = undef,
-  Optional[Variant[Integer,String,Boolean]] $priority                                 = undef,
+  Optional[Variant[Integer, Boolean]] $priority                                       = undef,
   Boolean $default_vhost                                                              = false,
   Optional[String] $servername                                                        = $name,
-  Variant[Array[String],String] $serveraliases                                        = [],
-  Array[String] $options                                                              = ['Indexes','FollowSymLinks','MultiViews'],
+  Variant[Array[String], String] $serveraliases                                       = [],
+  Array[String] $options                                                              = ['Indexes', 'FollowSymLinks', 'MultiViews'],
   Array[String] $override                                                             = ['None'],
   Optional[String] $directoryindex                                                    = undef,
   String $vhost_name                                                                  = '*',
-  String $logroot                                                                     = $apache::logroot,
+  Stdlib::Absolutepath $logroot                                                       = $apache::logroot,
   Enum['directory', 'absent'] $logroot_ensure                                         = 'directory',
-  Optional[String] $logroot_mode                                                      = undef,
+  Optional[Stdlib::Filemode] $logroot_mode                                            = undef,
   Optional[String] $logroot_owner                                                     = undef,
   Optional[String] $logroot_group                                                     = undef,
   Optional[Apache::LogLevel] $log_level                                               = undef,
   Boolean $access_log                                                                 = true,
-  Variant[Boolean,String] $access_log_file                                            = false,
-  Variant[Boolean,String] $access_log_pipe                                            = false,
-  Variant[Boolean,String] $access_log_syslog                                          = false,
-  Variant[Boolean,String] $access_log_format                                          = false,
-  Variant[Boolean,String] $access_log_env_var                                         = false,
+  Optional[String[1]] $access_log_file                                                = undef,
+  Optional[String[1]] $access_log_pipe                                                = undef,
+  Optional[Variant[String, Boolean]] $access_log_syslog                               = undef,
+  Optional[String[1]] $access_log_format                                              = undef,
+  Optional[Variant[Boolean, String]] $access_log_env_var                              = undef,
   Optional[Array[Hash]] $access_logs                                                  = undef,
   Boolean $use_servername_for_filenames                                               = false,
   Boolean $use_port_for_filenames                                                     = false,
@@ -1762,7 +1770,7 @@
   Boolean $error_log                                                                  = true,
   Optional[String] $error_log_file                                                    = undef,
   Optional[String] $error_log_pipe                                                    = undef,
-  Optional[Variant[String,Boolean]] $error_log_syslog                                 = undef,
+  Optional[Variant[String, Boolean]] $error_log_syslog                                = undef,
   Optional[
     Array[
       Variant[
@@ -1770,12 +1778,12 @@
         Hash[String, Enum['connection', 'request']]
       ]
     ]
-  ]       $error_log_format                                                           = undef,
+  ] $error_log_format                                                                 = undef,
   Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]] $http_protocol_options = undef,
-  Optional[Variant[String,Boolean]] $modsec_audit_log                                 = undef,
+  Optional[Variant[String, Boolean]] $modsec_audit_log                                = undef,
   Optional[String] $modsec_audit_log_file                                             = undef,
   Optional[String] $modsec_audit_log_pipe                                             = undef,
-  Variant[Array[Hash],String] $error_documents                                        = [],
+  Variant[Array[Hash], String] $error_documents                                       = [],
   Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource         = undef,
   Optional[String] $scriptalias                                                       = undef,
   Array[Hash] $scriptaliases                                                          = [],
@@ -1786,39 +1794,39 @@
   Optional[String] $proxy_dest                                                        = undef,
   Optional[String] $proxy_dest_match                                                  = undef,
   Optional[String] $proxy_dest_reverse_match                                          = undef,
-  Optional[Variant[Array[Hash],Hash]] $proxy_pass                                     = undef,
-  Optional[Variant[Array[Hash],Hash]] $proxy_pass_match                               = undef,
+  Optional[Variant[Array[Hash], Hash]] $proxy_pass                                    = undef,
+  Optional[Variant[Array[Hash], Hash]] $proxy_pass_match                              = undef,
   Boolean $proxy_requests                                                             = false,
   Hash $php_flags                                                                     = {},
   Hash $php_values                                                                    = {},
-  Variant[Array[String],Hash] $php_admin_flags                                        = {},
-  Variant[Array[String],Hash] $php_admin_values                                       = {},
-  Variant[Array[String],String] $no_proxy_uris                                        = [],
-  Variant[Array[String],String] $no_proxy_uris_match                                  = [],
+  Variant[Array[String], Hash] $php_admin_flags                                       = {},
+  Variant[Array[String], Hash] $php_admin_values                                      = {},
+  Variant[Array[String], String] $no_proxy_uris                                       = [],
+  Variant[Array[String], String] $no_proxy_uris_match                                 = [],
   Boolean $proxy_preserve_host                                                        = false,
-  Optional[Variant[String,Boolean]] $proxy_add_headers                                = undef,
+  Optional[Variant[String, Boolean]] $proxy_add_headers                               = undef,
   Boolean $proxy_error_override                                                       = false,
-  Variant[String,Array[String]] $redirect_source                                      = '/',
-  Optional[Variant[Array[String],String]] $redirect_dest                              = undef,
-  Optional[Variant[Array[String],String]] $redirect_status                            = undef,
-  Optional[Variant[Array[String],String]] $redirectmatch_status                       = undef,
-  Optional[Variant[Array[String],String]] $redirectmatch_regexp                       = undef,
-  Optional[Variant[Array[String],String]] $redirectmatch_dest                         = undef,
+  Variant[String, Array[String]] $redirect_source                                     = '/',
+  Optional[Variant[Array[String], String]] $redirect_dest                             = undef,
+  Optional[Variant[Array[String], String]] $redirect_status                           = undef,
+  Optional[Variant[Array[String], String]] $redirectmatch_status                      = undef,
+  Optional[Variant[Array[String], String]] $redirectmatch_regexp                      = undef,
+  Optional[Variant[Array[String], String]] $redirectmatch_dest                        = undef,
   Array[String[1]] $headers                                                           = [],
   Array[String[1]] $request_headers                                                   = [],
   Array[String[1]] $filters                                                           = [],
   Array[Hash] $rewrites                                                               = [],
   Optional[String[1]] $rewrite_base                                                   = undef,
-  Optional[String[1]] $rewrite_rule                                                   = undef,
+  Optional[Variant[Array[String[1]], String[1]]] $rewrite_rule                        = undef,
   Array[String[1]] $rewrite_cond                                                      = [],
   Boolean $rewrite_inherit                                                            = false,
-  Variant[Array[String],String] $setenv                                               = [],
-  Variant[Array[String],String] $setenvif                                             = [],
-  Variant[Array[String],String] $setenvifnocase                                       = [],
-  Variant[Array[String],String] $block                                                = [],
+  Variant[Array[String], String] $setenv                                              = [],
+  Variant[Array[String], String] $setenvif                                            = [],
+  Variant[Array[String], String] $setenvifnocase                                      = [],
+  Variant[Array[String], String] $block                                               = [],
   Enum['absent', 'present'] $ensure                                                   = 'present',
   Optional[String] $wsgi_application_group                                            = undef,
-  Optional[Variant[String,Hash]] $wsgi_daemon_process                                 = undef,
+  Optional[Variant[String, Hash]] $wsgi_daemon_process                                = undef,
   Optional[Hash] $wsgi_daemon_process_options                                         = undef,
   Optional[String] $wsgi_import_script                                                = undef,
   Optional[Hash] $wsgi_import_script_options                                          = undef,
@@ -1833,8 +1841,8 @@
   Optional[String] $fastcgi_server                                                    = undef,
   Optional[String] $fastcgi_socket                                                    = undef,
   Optional[String] $fastcgi_dir                                                       = undef,
-  Optional[Variant[Integer,String]] $fastcgi_idle_timeout                             = undef,
-  Variant[Array[String],String] $additional_includes                                  = [],
+  Optional[Integer] $fastcgi_idle_timeout                                             = undef,
+  Variant[Array[String], String] $additional_includes                                 = [],
   Boolean $use_optional_includes                                                      = $apache::use_optional_includes,
   Optional[String] $apache_version                                                    = $apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                      = undef,
@@ -1888,7 +1896,7 @@
   Optional[Integer] $passenger_max_request_time                                       = undef,
   Optional[Integer] $passenger_memory_limit                                           = undef,
   Optional[Integer] $passenger_stat_throttle_rate                                     = undef,
-  Optional[Variant[String,Array[String]]] $passenger_pre_start                        = undef,
+  Optional[Variant[String, Array[String]]] $passenger_pre_start                       = undef,
   Optional[Boolean] $passenger_high_performance                                       = undef,
   Optional[Boolean] $passenger_buffer_upload                                          = undef,
   Optional[Boolean] $passenger_buffer_response                                        = undef,
@@ -1921,8 +1929,8 @@
   String $krb_servicename                                                             = 'HTTP',
   Enum['on', 'off'] $krb_save_credentials                                             = 'off',
   Optional[Enum['on', 'off']] $keepalive                                              = undef,
-  Optional[Variant[Integer,String]] $keepalive_timeout                                = undef,
-  Optional[Variant[Integer,String]] $max_keepalive_requests                           = undef,
+  Optional[Variant[Integer, String]] $keepalive_timeout                               = undef,
+  Optional[Variant[Integer, String]] $max_keepalive_requests                          = undef,
   Optional[String] $cas_attribute_prefix                                              = undef,
   Optional[String] $cas_attribute_delimiter                                           = undef,
   Optional[String] $cas_root_proxied_as                                               = undef,
@@ -1934,12 +1942,12 @@
   Optional[String] $cas_cookie_path                                                   = undef,
   Optional[String] $shib_compat_valid_user                                            = undef,
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name          = undef,
-  Optional[Variant[String,Array[String]]] $comment                                    = undef,
+  Optional[Variant[String, Array[String]]] $comment                                   = undef,
   Hash $define                                                                        = {},
   Boolean $auth_oidc                                                                  = false,
   Optional[Apache::OIDCSettings] $oidc_settings                                       = undef,
-  Optional[Variant[Boolean,String]] $mdomain                                          = undef,
-  Optional[Variant[String[1],Array[String[1]]]] $userdir                              = undef,
+  Optional[Variant[Boolean, String]] $mdomain                                         = undef,
+  Optional[Variant[String[1], Array[String[1]]]] $userdir                             = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -2117,7 +2125,7 @@
   } else {
     if $port {
       $listen_addr_port = $port
-      $nvh_addr_port = prefix(any2array($port),"${vhost_name}:")
+      $nvh_addr_port = prefix(any2array($port), "${vhost_name}:")
     } else {
       $listen_addr_port = undef
       $nvh_addr_port = $name
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index 8f4143bcfe..4e208d578d 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -17,9 +17,9 @@
 #
 define apache::vhost::custom (
   String $content,
-  String $ensure                            = 'present',
-  Variant[Integer,String,Boolean] $priority = '25',
-  Boolean $verify_config                    = true,
+  String $ensure                      = 'present',
+  Variant[Integer, Boolean] $priority = 25,
+  Boolean $verify_config              = true,
 ) {
   include apache
 
diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
index fa5ea36ab1..e29d637d21 100644
--- a/manifests/vhost/fragment.pp
+++ b/manifests/vhost/fragment.pp
@@ -29,11 +29,11 @@
 # @example With a vhost with priority
 #   include apache
 #   apache::vhost { 'myvhost':
-#     priority => '42',
+#     priority => 42,
 #   }
 #   apache::vhost::fragment { 'myfragment':
 #     vhost    => 'myvhost',
-#     priority => '42',
+#     priority => 42,
 #     content  => '# Foo',
 #   }
 #
@@ -44,7 +44,7 @@
 #   }
 #   apache::vhost::fragment { 'myfragment':
 #     vhost    => 'myvhost',
-#     priority => '10', # default_vhost implies priority 10
+#     priority => 10, # default_vhost implies priority 10
 #     content  => '# Foo',
 #   }
 #
@@ -52,16 +52,16 @@
 #   include apache
 #   apache::vhost::fragment { 'myfragment':
 #     vhost    => 'default',
-#     priority => '15',
+#     priority => 15,
 #     content  => '# Foo',
 #   }
 #
 define apache::vhost::fragment (
   String[1] $vhost,
-  Optional[Integer[0]] $port                          = undef,
-  Optional[Variant[Integer,String,Boolean]] $priority = undef,
-  Optional[String] $content                           = undef,
-  Integer[0] $order                                   = 900,
+  Optional[Stdlib::Port] $port                  = undef,
+  Optional[Variant[Integer, Boolean]] $priority = undef,
+  Optional[String] $content                     = undef,
+  Integer[0] $order                             = 900,
 ) {
   # This copies the logic from apache::vhost
   if $priority {
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 0faca113a1..6ae89d41f1 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -92,11 +92,11 @@
 #       { 'path' => '/l', 'url' => 'http://backend-xy',
 #         'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
 #       { 'path' => '/d', 'url' => 'http://backend-a/d',
-#         'params' => { 'retry' => '0', 'timeout' => '5' }, },
+#         'params' => { 'retry' => 0, 'timeout' => 5 }, },
 #       { 'path' => '/e', 'url' => 'http://backend-a/e',
 #         'keywords' => ['nocanon', 'interpolate'] },
 #       { 'path' => '/f', 'url' => 'http://backend-f/',
-#         'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+#         'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1']},
 #       { 'path' => '/g', 'url' => 'http://backend-g/',
 #         'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
 #       { 'path' => '/h', 'url' => 'http://backend-h/h',
@@ -106,20 +106,20 @@
 #
 define apache::vhost::proxy (
   String[1] $vhost,
-  Optional[Variant[Integer,String,Boolean]] $priority = undef,
-  Integer[0] $order = 170,
-  Optional[Stdlib::Port] $port = undef,
-  Optional[String[1]] $proxy_dest = undef,
-  Optional[String[1]] $proxy_dest_match = undef,
-  Optional[String[1]] $proxy_dest_reverse_match = undef,
-  Variant[Array[String[1]], String[1]] $no_proxy_uris = [],
-  Variant[Array[String[1]], String[1]] $no_proxy_uris_match = [],
-  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass = undef,
+  Optional[Variant[Integer, Boolean]] $priority               = undef,
+  Integer[0] $order                                           = 170,
+  Optional[Stdlib::Port] $port                                = undef,
+  Optional[String[1]] $proxy_dest                             = undef,
+  Optional[String[1]] $proxy_dest_match                       = undef,
+  Optional[String[1]] $proxy_dest_reverse_match               = undef,
+  Variant[Array[String[1]], String[1]] $no_proxy_uris         = [],
+  Variant[Array[String[1]], String[1]] $no_proxy_uris_match   = [],
+  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass       = undef,
   Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass_match = undef,
-  Boolean $proxy_requests = false,
-  Boolean $proxy_preserve_host = false,
-  Optional[Boolean] $proxy_add_headers = undef,
-  Boolean $proxy_error_override = false,
+  Boolean $proxy_requests                                     = false,
+  Boolean $proxy_preserve_host                                = false,
+  Optional[Boolean] $proxy_add_headers                        = undef,
+  Boolean $proxy_error_override                               = false,
 ) {
   include apache::mod::proxy
   include apache::mod::proxy_http
diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp
index a212a5c31a..9ac49abaa3 100644
--- a/manifests/vhosts.pp
+++ b/manifests/vhosts.pp
@@ -9,7 +9,7 @@
 #     vhosts => {
 #       'custom_vhost_1' => {
 #         'docroot' => '/var/www/custom_vhost_1',
-#         'port'    => '81',
+#         'port'    => 81,
 #       },
 #     },
 #   }
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index aba05beca6..44c2884511 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -222,7 +222,7 @@ class { 'apache':
   describe 'timeout' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': timeout => '1234' }"
+        pp = "class { 'apache': timeout => 1234 }"
         apply_manifest(pp, catch_failures: true)
       end
     end
@@ -384,7 +384,7 @@ class { 'apache':
   describe 'keepalive' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': keepalive => 'Off', keepalive_timeout => '30', max_keepalive_requests => '200' }"
+        pp = "class { 'apache': keepalive => 'Off', keepalive_timeout => 30, max_keepalive_requests => 200 }"
         apply_manifest(pp, catch_failures: true)
       end
     end
@@ -400,7 +400,7 @@ class { 'apache':
   describe 'limitrequestfieldsize' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': limitreqfieldsize => '16830' }"
+        pp = "class { 'apache': limitreqfieldsize => 16830 }"
         apply_manifest(pp, catch_failures: true)
       end
     end
@@ -414,7 +414,7 @@ class { 'apache':
   describe 'limitrequestfields' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': limitreqfields => '120' }"
+        pp = "class { 'apache': limitreqfields => 120 }"
         apply_manifest(pp, catch_failures: true)
       end
     end
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index c13ae260af..0b69febec7 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -79,7 +79,7 @@ class { 'apache':
           ssl_cipher           => 'test',
           ssl_honorcipherorder => true,
           ssl_verify_client    => 'require',
-          ssl_verify_depth     => 'test',
+          ssl_verify_depth     => 1,
           ssl_options          => ['test', 'test1'],
           ssl_proxyengine      => true,
           ssl_proxy_protocol   => 'TLSv1.2',
@@ -103,7 +103,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLCipherSuite          test' }
       it { is_expected.to contain 'SSLHonorCipherOrder     On' }
       it { is_expected.to contain 'SSLVerifyClient         require' }
-      it { is_expected.to contain 'SSLVerifyDepth          test' }
+      it { is_expected.to contain 'SSLVerifyDepth          1' }
       it { is_expected.to contain 'SSLOptions test test1' }
       if apache_hash['version'] == '2.4'
         it { is_expected.to contain 'SSLCARevocationCheck    chain flag' }
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 558156c3fc..cc8ee4b9fa 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -13,7 +13,7 @@ class { 'apache':
           }
           class { 'apache::mod::php': }
           apache::vhost { 'php.example.com':
-            port    => '80',
+            port    => 80,
             docroot => '#{apache_hash['doc_root']}/php',
           }
           host { 'php.example.com': ip => '127.0.0.1', }
@@ -75,7 +75,7 @@ class { 'apache::mod::php':
         }
 
           apache::vhost { 'php.example.com':
-            port             => '80',
+            port             => 80,
             docroot          => '#{apache_hash['doc_root']}/php',
             php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
             php_flags        => { 'display_errors' => 'on', },
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 7874557be2..109dc9da81 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -86,7 +86,7 @@ class { 'apache': }
       }
 
       apache::vhost { 'first.example.com':
-        port    => '80',
+        port    => 80,
         docroot => '/var/www/first',
         require => File['/var/www'],
       }
@@ -105,7 +105,7 @@ class { 'apache': }
     pp = <<-MANIFEST
       class { 'apache': }
       apache::vhost { 'proxy.example.com':
-        port    => '80',
+        port    => 80,
         docroot => '/var/www/proxy',
         proxy_pass => [
           { 'path' => '/foo', 'url' => 'http://backend-foo/'},
@@ -133,7 +133,7 @@ class { 'apache': }
     pp = <<-MANIFEST
       class { 'apache': }
       apache::vhost { 'proxy.example.com':
-        port    => '80',
+        port    => 80,
         docroot => '#{apache_hash['doc_root']}/proxy',
         proxy_pass_match => [
           { 'path' => '/foo', 'url' => 'http://backend-foo/'},
@@ -163,7 +163,7 @@ class { 'apache':
         default_vhost => false,
       }
       apache::vhost { 'example.com':
-        port     => ['80', '8080'],
+        port     => [80, 8080],
         ip       => ['127.0.0.1','127.0.0.2'],
         ip_based => true,
         docroot  => '/var/www/html',
@@ -232,7 +232,7 @@ class { 'apache':
         default_vhost  => false,
       }
       apache::vhost { 'example.com':
-        port           => '80',
+        port           => 80,
         ip             => '::1',
         ip_based       => true,
         docroot        => '/var/www/html',
@@ -512,7 +512,7 @@ class { 'apache': }
       apache::vhost { 'virt.example.com':
         vhost_name      => '*',
         serveraliases   => '*virt.example.com',
-        port            => '80',
+        port            => 80,
         docroot         => '/var/www/virt',
         virtual_docroot => '/var/www/virt/%1',
       }
@@ -552,12 +552,12 @@ class { 'apache': default_vhost => false, }
         apache::vhost { 'localhost':
           docroot => '/var/www/local',
           ip      => '127.0.0.1',
-          port    => '8888',
+          port    => 8888,
         }
         apache::listen { '*:80': }
         apache::vhost { 'proxy.example.com':
           docroot    => '/var/www',
-          port       => '80',
+          port       => 80,
           add_listen => false,
           proxy_pass => {
             'path' => '/',
@@ -597,12 +597,12 @@ class { 'apache': default_vhost => false, }
         apache::vhost { 'localhost':
           docroot => '/var/www/local',
           ip      => '127.0.0.1',
-          port    => '8888',
+          port    => 8888,
         }
         apache::listen { '*:80': }
         apache::vhost { 'proxy.example.com':
           docroot    => '/var/www',
-          port       => '80',
+          port       => 80,
           add_listen => false,
           proxy_pass_match => {
             'path' => '/',
@@ -690,7 +690,7 @@ class { 'apache': default_vhost => false }
       apache::listen { '81': }
       apache::vhost { 'testlisten.server':
         docroot    => '/tmp',
-        port       => '80',
+        port       => 80,
         add_listen => false,
         servername => 'testlisten.server',
       }
@@ -1134,7 +1134,7 @@ class { 'apache::mod::wsgi': }
         docroot                     => '/tmp',
         wsgi_application_group      => '%{GLOBAL}',
         wsgi_daemon_process         => { 'wsgi' => { 'python-home' => '/usr' }, 'foo' => {} },
-        wsgi_daemon_process_options => {processes => '2'},
+        wsgi_daemon_process_options => {processes => 2},
         wsgi_import_script          => '/test1',
         wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
         wsgi_process_group          => 'nobody',
@@ -1207,7 +1207,7 @@ class { 'apache': }
       class { 'apache': }
       class { 'apache::mod::shib': }
       apache::vhost { 'test.server':
-        port    => '80',
+        port    => 80,
         docroot => '/var/www/html',
         shib_compat_valid_user => 'On'
       }
@@ -1227,7 +1227,7 @@ class { 'apache::mod::shib': }
     pp = <<-MANIFEST
         class { 'apache': }
         apache::vhost { 'test.server':
-          port    => '80',
+          port    => 80,
           docroot => '/var/www/html',
           auth_oidc     => true,
           oidc_settings => {
diff --git a/spec/acceptance/vhosts_spec.rb b/spec/acceptance/vhosts_spec.rb
index 90dc8c99f4..1048c2074b 100644
--- a/spec/acceptance/vhosts_spec.rb
+++ b/spec/acceptance/vhosts_spec.rb
@@ -9,11 +9,11 @@ class { 'apache::vhosts':
           vhosts => {
             'custom_vhost_1' => {
                 'docroot' => '/var/www/custom_vhost_1',
-                'port' => '81',
+                'port' => 81,
             },
             'custom_vhost_2' => {
                 'docroot' => '/var/www/custom_vhost_2',
-                'port' => '82',
+                'port' => 82,
             },
           },
         }
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index c1ccd4b23a..bdd06059c1 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -16,13 +16,13 @@
     end
     describe 'with parameters' do
       let :params do
-        { mellon_cache_size: '200',
-          mellon_cache_entry_size: '2010',
+        { mellon_cache_size: 200,
+          mellon_cache_entry_size: 2010,
           mellon_lock_file: '/tmp/junk',
           mellon_post_directory: '/tmp/post',
-          mellon_post_ttl: '5',
-          mellon_post_size: '8',
-          mellon_post_count: '10' }
+          mellon_post_ttl: 5,
+          mellon_post_size: 8,
+          mellon_post_count: 10 }
       end
 
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheSize\s+200$}) }
@@ -45,13 +45,13 @@
     end
     describe 'with parameters' do
       let :params do
-        { mellon_cache_size: '200',
-          mellon_cache_entry_size: '2010',
+        { mellon_cache_size: 200,
+          mellon_cache_entry_size: 2010,
           mellon_lock_file: '/tmp/junk',
           mellon_post_directory: '/tmp/post',
-          mellon_post_ttl: '5',
-          mellon_post_size: '8',
-          mellon_post_count: '10' }
+          mellon_post_ttl: 5,
+          mellon_post_size: 8,
+          mellon_post_count: 10 }
       end
 
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheSize\s+200$}) }
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 572baefe5d..05d7b57bb8 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -32,17 +32,17 @@
     context 'Test mpm_event new params' do
       let :params do
         {
-          serverlimit: '0',
-          startservers: '1',
-          maxclients: '2',
-          minsparethreads: '3',
-          maxsparethreads: '4',
-          threadsperchild: '5',
-          maxrequestsperchild: '6',
-          threadlimit: '7',
-          listenbacklog: '8',
-          maxrequestworkers: '9',
-          maxconnectionsperchild: '10',
+          serverlimit: 0,
+          startservers: 1,
+          maxclients: 2,
+          minsparethreads: 3,
+          maxsparethreads: 4,
+          threadsperchild: 5,
+          maxrequestsperchild: 6,
+          threadlimit: 7,
+          listenbacklog: 8,
+          maxrequestworkers: 9,
+          maxconnectionsperchild: 10,
         }
       end
 
@@ -62,15 +62,15 @@
     context 'Test mpm_event old style params' do
       let :params do
         {
-          serverlimit: '0',
-          startservers: '1',
-          maxclients: '2',
-          minsparethreads: '3',
-          maxsparethreads: '4',
-          threadsperchild: '5',
-          maxrequestsperchild: '6',
-          threadlimit: '7',
-          listenbacklog: '8',
+          serverlimit: 0,
+          startservers: 1,
+          maxclients: 2,
+          minsparethreads: 3,
+          maxsparethreads: 4,
+          threadsperchild: 5,
+          maxrequestsperchild: 6,
+          threadlimit: 7,
+          listenbacklog: 8,
           maxrequestworkers: :undef,
           maxconnectionsperchild: :undef,
         }
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 934b62da8f..2b965bb33c 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -28,11 +28,11 @@
           ldap_trusted_global_cert_file: 'ca.pem',
           ldap_trusted_global_cert_type: 'CA_DER',
           ldap_trusted_mode: 'TLS',
-          ldap_shared_cache_size: '500000',
-          ldap_cache_entries: '1024',
-          ldap_cache_ttl: '600',
-          ldap_opcache_entries: '1024',
-          ldap_opcache_ttl: '600',
+          ldap_shared_cache_size: 500_000,
+          ldap_cache_entries: 1024,
+          ldap_cache_ttl: 600,
+          ldap_opcache_entries: 1024,
+          ldap_opcache_ttl: 600,
           ldap_path: '/custom-ldap-status',
         }
       end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 0925696ce6..80e56ca08c 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -135,7 +135,7 @@
                   it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} "#{valid_value}"$}) }
                 end
               end
-            when 'URI', 'String', 'Integer'
+            when 'URI', 'String'
               valid_config_values = ['some_value_for_you']
               valid_config_values.each do |valid_value|
                 describe "with #{puppetized_config_option} => #{valid_value}" do
@@ -143,6 +143,17 @@
                     { puppetized_config_option.to_sym => valid_value }
                   end
 
+                  it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'Integer'
+              valid_config_values = [4711]
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => #{valid_value}" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
                   it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
                 end
               end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 51eb8c0904..9a8afd9462 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -67,8 +67,8 @@
       let :params do
         {
           apache_version: '2.4',
-          maxrequestworkers: '512',
-          maxconnectionsperchild: '4000',
+          maxrequestworkers: 512,
+          maxconnectionsperchild: 4000,
         }
       end
 
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index d1c1ef8ff8..9f6b660000 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -253,7 +253,7 @@
     context 'setting ssl_random_seed_bytes' do
       let :params do
         {
-          ssl_random_seed_bytes: '1024',
+          ssl_random_seed_bytes: 1024,
         }
       end
 
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
index 42a5ed9002..2c75ea69c7 100644
--- a/spec/classes/vhosts_spec.rb
+++ b/spec/classes/vhosts_spec.rb
@@ -12,11 +12,11 @@
           vhosts: {
             'custom_vhost_1' => {
               'docroot' => '/var/www/custom_vhost_1',
-              'port' => '81',
+              'port' => 81,
             },
             'custom_vhost_2' => {
               'docroot' => '/var/www/custom_vhost_2',
-              'port' => '82',
+              'port' => 82,
             },
           },
         }
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 2e31b1f790..c10564a3e3 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -41,7 +41,7 @@
     let :params do
       {
         'confdir'        => '/dne',
-        'priority'       => '30',
+        'priority'       => 30,
         'source'         => 'puppet:///modules/apache/test',
         'verify_command' => '/bin/true',
       }
diff --git a/spec/defines/vhost_fragment_spec.rb b/spec/defines/vhost_fragment_spec.rb
index af042e4de0..c5aac54c96 100644
--- a/spec/defines/vhost_fragment_spec.rb
+++ b/spec/defines/vhost_fragment_spec.rb
@@ -15,7 +15,7 @@
           {
             vhost: 'default',
             port: 80,
-            priority: '15',
+            priority: 15,
           }
         end
 
@@ -74,13 +74,13 @@
         end
 
         context 'with priority => 42' do
-          let(:params) { super().merge(priority: '42') }
+          let(:params) { super().merge(priority: 42) }
           let(:pre_condition) do
             <<-PUPPET
             include apache
             apache::vhost { 'custom':
               docroot  => '/path/to/docroot',
-              priority => '42',
+              priority => 42,
             }
             PUPPET
           end
diff --git a/spec/defines/vhost_proxy_spec.rb b/spec/defines/vhost_proxy_spec.rb
index 57a5477147..fbdf642386 100644
--- a/spec/defines/vhost_proxy_spec.rb
+++ b/spec/defines/vhost_proxy_spec.rb
@@ -15,7 +15,7 @@
           {
             vhost: 'default',
             port: 80,
-            priority: '15',
+            priority: 15,
           }
         end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index d92d116918..30a3754efd 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -18,7 +18,7 @@
       let :default_params do
         {
           docroot: '/rspec/docroot',
-          port: '84',
+          port: 84,
         }
       end
 
@@ -47,7 +47,7 @@
               'manage_docroot'              => false,
               'virtual_docroot'             => true,
               'virtual_use_default_docroot' => false,
-              'port'                        => '8080',
+              'port'                        => 8080,
               'ip'                          => '127.0.0.1',
               'ip_based'                    => true,
               'add_listen'                  => false,
@@ -66,7 +66,7 @@
               'ssl_cipher'                  => 'HIGH',
               'ssl_honorcipherorder'        => 'Off',
               'ssl_verify_client'           => 'optional',
-              'ssl_verify_depth'            => '3',
+              'ssl_verify_depth'            => 3,
               'ssl_options'                 => '+ExportCertData',
               'ssl_openssl_conf_cmd'        => 'DHParameters "foo.pem"',
               'ssl_proxy_verify'            => 'require',
@@ -78,7 +78,7 @@
               'ssl_proxy_protocol'          => 'TLSv1.2',
               'ssl_user_name'               => 'SSL_CLIENT_S_DN_CN',
               'ssl_reload_on_change'        => true,
-              'priority'                    => '30',
+              'priority'                    => 30,
               'default_vhost'               => true,
               'servername'                  => 'example.com',
               'serveraliases'               => ['test-example.com'],
@@ -174,7 +174,7 @@
                 { 'path'               => '/var/www/dav',
                   'dav'                => 'filesystem',
                   'dav_depth_infinity' => true,
-                  'dav_min_timeout'    => '600' },
+                  'dav_min_timeout'    => 600 },
                 {
                   'path'             => '/var/www/http2',
                   'h2_copy_files'    => true,
@@ -200,8 +200,8 @@
                       'url'             => 'http://backend-b/',
                       'keywords'        => ['noquery', 'interpolate'],
                       'params' => {
-                        'retry'   => '0',
-                        'timeout' => '5',
+                        'retry'   => 0,
+                        'timeout' => 5,
                       },
                     },
                   ],
@@ -214,8 +214,8 @@
                       'url'             => 'http://backend-b/',
                       'keywords'        => ['noquery', 'interpolate'],
                       'params' => {
-                        'retry'   => '0',
-                        'timeout' => '5',
+                        'retry'   => 0,
+                        'timeout' => 5,
                       },
                     },
                   ],
@@ -304,7 +304,7 @@
                   'provider'          => 'location',
                   'ssl_options'       => ['+ExportCertData', '+StdEnvVars'],
                   'ssl_verify_client' => 'optional',
-                  'ssl_verify_depth'  => '10',
+                  'ssl_verify_depth'  => 10,
                 },
               ],
               'error_log'                   => false,
@@ -347,8 +347,8 @@
                     },
                   ],
                   'params' => {
-                    'retry'   => '0',
-                    'timeout' => '5',
+                    'retry'   => 0,
+                    'timeout' => 5,
                   },
                   'setenv'   => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
                 },
@@ -361,8 +361,8 @@
                   'no_proxy_uris'       => ['/a/foo', '/a/bar'],
                   'no_proxy_uris_match' => ['/a/foomatch'],
                   'params' => {
-                    'retry'   => '0',
-                    'timeout' => '5',
+                    'retry'   => 0,
+                    'timeout' => 5,
                   },
                   'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
                 },
@@ -408,8 +408,8 @@
               'wsgi_application_group'      => '%{GLOBAL}',
               'wsgi_daemon_process'         => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
               'wsgi_daemon_process_options' => {
-                'processes'    => '2',
-                'threads'      => '15',
+                'processes'    => 2,
+                'threads'      => 15,
                 'display-name' => '%{GROUP}',
               },
               'wsgi_import_script'          => '/var/www/demo.wsgi',
@@ -520,8 +520,8 @@
               'krb_local_user_mapping'      => 'off',
               'http_protocol_options' => 'Strict LenientMethods Allow0.9',
               'keepalive'                   => 'on',
-              'keepalive_timeout'           => '100',
-              'max_keepalive_requests'      => '1000',
+              'keepalive_timeout'           => 100,
+              'max_keepalive_requests'      => 1000,
               'protocols'                   => ['h2', 'http/1.1'],
               'protocols_honor_order'       => true,
               'auth_oidc'                   => true,
@@ -912,7 +912,7 @@
         context 'vhost with scheme and port in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => '80',
+              'port'                          => 80,
               'ip'                            => '127.0.0.1',
               'ip_based'                      => true,
               'servername'                    => 'https://www.example.com:443',
@@ -936,7 +936,7 @@
         context 'vhost with scheme in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => '80',
+              'port'                          => 80,
               'ip'                            => '127.0.0.1',
               'ip_based'                      => true,
               'servername'                    => 'https://www.example.com',
@@ -960,7 +960,7 @@
         context 'vhost with port in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => '80',
+              'port'                          => 80,
               'ip'                            => '127.0.0.1',
               'ip_based'                      => true,
               'servername'                    => 'www.example.com:443',
@@ -984,7 +984,7 @@
         context 'vhost with servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => '80',
+              'port'                          => 80,
               'ip'                            => '127.0.0.1',
               'ip_based'                      => true,
               'servername'                    => 'www.example.com',
@@ -1008,7 +1008,7 @@
         context 'vhost with multiple ip addresses' do
           let :params do
             {
-              'port'                        => '80',
+              'port'                        => 80,
               'ip'                          => ['127.0.0.1', '::1'],
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1033,7 +1033,7 @@
         context 'vhost with multiple ports' do
           let :params do
             {
-              'port'                        => ['80', '8080'],
+              'port'                        => [80, 8080],
               'ip'                          => '127.0.0.1',
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1058,7 +1058,7 @@
         context 'vhost with multiple ip addresses, multiple ports' do
           let :params do
             {
-              'port'                        => ['80', '8080'],
+              'port'                        => [80, 8080],
               'ip'                          => ['127.0.0.1', '::1'],
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1087,7 +1087,7 @@
         context 'vhost with ipv6 address' do
           let :params do
             {
-              'port'                        => '80',
+              'port'                        => 80,
               'ip'                          => '::1',
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1110,7 +1110,7 @@
         context 'vhost with wildcard ip address' do
           let :params do
             {
-              'port'                        => '80',
+              'port'                        => 80,
               'ip'                          => '*',
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1768,7 +1768,7 @@
                   'fastcgi_server'       => 'localhost',
                   'fastcgi_socket'       => '/tmp/fastcgi.socket',
                   'fastcgi_dir'          => '/tmp',
-                  'fastcgi_idle_timeout' => '120',
+                  'fastcgi_idle_timeout' => 120,
                 }
               end
 
@@ -1801,7 +1801,7 @@
             }
           end
           describe 'redirectmatch_*' do
-            let(:params) { super().merge(port: '84') }
+            let(:params) { super().merge(port: 84) }
 
             context 'dest and regexp' do
               let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg', redirectmatch_regexp: "(.*)\.gif$") }
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 9c07e42345..e8b4806651 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -1,7 +1,7 @@
 # https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 type Apache::OIDCSettings = Struct[
   {
-    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl,Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
+    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
     Optional['CryptoPassphrase']                        => String,
     Optional['MetadataDir']                             => String,
     Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,
@@ -9,80 +9,80 @@
     Optional['ProviderAuthorizationEndpoint']           => Stdlib::HTTPSUrl,
     Optional['ProviderJwksUri']                         => Stdlib::HTTPSUrl,
     Optional['ProviderTokenEndpoint']                   => Stdlib::HTTPSUrl,
-    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','none'],
+    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'none'],
     Optional['ProviderTokenEndpointParams']             => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['ProviderUserInfoEndpoint']                => Stdlib::HTTPSUrl,
     Optional['ProviderCheckSessionIFrame']              => Stdlib::HTTPSUrl,
     Optional['ProviderEndSessionEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
-    Optional['ProviderBackChannelLogoutSupported']      => Enum['On','Off'],
+    Optional['ProviderBackChannelLogoutSupported']      => Enum['On', 'Off'],
     Optional['ProviderRegistrationEndpointJson']        => String,
     Optional['Scope']                                   => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
     Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['SSLValidateServer']                       => Enum['On','Off'],
+    Optional['SSLValidateServer']                       => Enum['On', 'Off'],
     Optional['UserInfoRefreshInterval']                 => Integer,
     Optional['JWKSRefreshInterval']                     => Integer,
-    Optional['UserInfoTokenMethod']                     => Enum['authz_header','post_param'],
-    Optional['ProviderAuthRequestMethod']               => Enum['GET','POST'],
+    Optional['UserInfoTokenMethod']                     => Enum['authz_header', 'post_param'],
+    Optional['ProviderAuthRequestMethod']               => Enum['GET', 'POST'],
     Optional['PublicKeyFiles']                          => String,
-    Optional['ResponseType']                            => Enum['code','id_token','id_token token','code id_token','code token','code id_token token'],
-    Optional['ResponseMode']                            => Enum['fragment','query','form_post'],
+    Optional['ResponseType']                            => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
+    Optional['ResponseMode']                            => Enum['fragment', 'query', 'form_post'],
     Optional['ClientID']                                => String,
     Optional['ClientSecret']                            => String,
     Optional['ClientTokenEndpointCert']                 => String,
     Optional['ClientTokenEndpointKey']                  => String,
     Optional['ClientName']                              => String,
     Optional['ClientContact']                           => String,
-    Optional['PKCDMethod']                              => Enum['plain','S256','referred_tb'],
-    Optional['TokenBindingPolicy']                      => Enum['disabled','optional','required','enforced'],
+    Optional['PKCDMethod']                              => Enum['plain', 'S256', 'referred_tb'],
+    Optional['TokenBindingPolicy']                      => Enum['disabled', 'optional', 'required', 'enforced'],
     Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
-    Optional['IDTokenSignedResponseAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
-    Optional['UserInfoSignedResposeAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
-    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
-    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
+    Optional['IDTokenSignedResponseAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['UserInfoSignedResposeAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
     Optional['OAuthServerMetadataURL']                  => Stdlib::HTTPSUrl,
     Optional['AuthIntrospectionEndpoint']               => Stdlib::HTTPSUrl,
     Optional['OAuthClientID']                           => String,
     Optional['OAuthClientSecret']                       => String,
-    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','bearer_access_token','none'],
+    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
     Optional['OAuthIntrospectionClientAuthBearerToken'] => String,
     Optional['OAuthIntrospectionEndpointCert']          => String,
     Optional['OAuthIntrospectionEndpointKey']           => String,
-    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST','GET'],
+    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']        => String,
     Optional['OAuthTokenExpiryClaim']                   => Pattern[/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/],
-    Optional['OAuthSSLValidateServer']                  => Enum['On','Off'],
+    Optional['OAuthSSLValidateServer']                  => Enum['On', 'Off'],
     Optional['OAuthVerifySharedKeys']                   => String,
     Optional['OAuthVerifyCertFiles']                    => String,
     Optional['OAuthVerifyJwksUri']                      => Stdlib::HTTPSUrl,
     Optional['OAuthRemoteUserClaim']                    => String,
     Optional['OAuthAcceptTokenAs']                      => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
-    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled','optional','required','enforced'],
+    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled', 'optional', 'required', 'enforced'],
     Optional['Cookie']                                  => String,
     Optional['SessionCookieChunkSize']                  => Integer,
-    Optional['CookieHTTPOnly']                          => Enum['On','Off'],
-    Optional['CookieSameSite']                          => Enum['On','Off'],
+    Optional['CookieHTTPOnly']                          => Enum['On', 'Off'],
+    Optional['CookieSameSite']                          => Enum['On', 'Off'],
     Optional['PassCookies']                             => String,
     Optional['StripCookies']                            => String,
     Optional['StateMaxNumberOfCookies']                 => Pattern[/^[0-9]+\s(false|true)$/],
     Optional['SessionInactivityTimeout']                => Integer,
     Optional['SessionMaxDuration']                      => Integer,
     Optional['SessionType']                             => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/],
-    Optional['SessionCacheFallbackToCookie']            => Enum['On','Off'],
-    Optional['CacheType']                               => Enum['shm','memcache','file','redis'],
-    Optional['CacheEncrypt']                            => Enum['On','Off'],
+    Optional['SessionCacheFallbackToCookie']            => Enum['On', 'Off'],
+    Optional['CacheType']                               => Enum['shm', 'memcache', 'file', 'redis'],
+    Optional['CacheEncrypt']                            => Enum['On', 'Off'],
     Optional['CacheShmMax']                             => Integer,
     Optional['CacheShmEntrySizeMax']                    => Integer,
     Optional['CacheFileCleanInterval']                  => Integer,
     Optional['MemCacheServers']                         => String,
     Optional['RedisCacheServer']                        => String,
     Optional['RedisCachePassword']                      => String,
-    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
     Optional['HTMLErrorTemplate']                       => String,
-    Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
     Optional['PathScope']                               => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
     Optional['PathAuthRequestParams']                   => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['IDTokenIatSlack']                         => Integer,
@@ -91,17 +91,17 @@
     Optional['RemoteUserClaim']                         => String,
     Optional['PassIDTokenAs']                           => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                          => Pattern[/^((claims|json|jwt)\s?)+$/],
-    Optional['PassClaimsAs']                            => Enum['none','headers','environment','both'],
+    Optional['PassClaimsAs']                            => Enum['none', 'headers', 'environment', 'both'],
     Optional['AuthNHeader']                             => String,
     Optional['HTTPTimeoutLong']                         => Integer,
     Optional['HTTPTimeoutShort']                        => Integer,
     Optional['StateTimeout']                            => Integer,
-    Optional['ScrubRequestHeaders']                     => Enum['On','Off'],
+    Optional['ScrubRequestHeaders']                     => Enum['On', 'Off'],
     Optional['OutgoingProxy']                           => String,
-    Optional['UnAuthAction']                            => Enum['auth','pass','401','410'],
-    Optional['UnAuthzAction']                           => Enum['401','403','auth'],
-    Optional['PreservePost']                            => Enum['On','Off'],
-    Optional['PassRefreshToken']                        => Enum['On','Off'],
+    Optional['UnAuthAction']                            => Enum['auth', 'pass', '401', '410'],
+    Optional['UnAuthzAction']                           => Enum['401', '403', 'auth'],
+    Optional['PreservePost']                            => Enum['On', 'Off'],
+    Optional['PassRefreshToken']                        => Enum['On', 'Off'],
     Optional['RequestObject']                           => String,
     Optional['ProviderMetadataRefreshInterval']         => Integer,
     Optional['InfoHook']                                => Pattern[/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/],
diff --git a/types/servertokens.pp b/types/servertokens.pp
new file mode 100644
index 0000000000..4e2171f71e
--- /dev/null
+++ b/types/servertokens.pp
@@ -0,0 +1,4 @@
+# @summary A string that conforms to the Apache `ServerTokens` syntax.
+#
+# @see https://httpd.apache.org/docs/2.4/mod/core.html#servertokens
+type Apache::ServerTokens = Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']
diff --git a/types/vhost/proxypass.pp b/types/vhost/proxypass.pp
index d2d9729349..c02ae12821 100644
--- a/types/vhost/proxypass.pp
+++ b/types/vhost/proxypass.pp
@@ -63,7 +63,7 @@
 #
 # @example With mod_proxy environment variables
 #   { 'path' => '/f', 'url' => 'http://backend-f/',
-#     'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'], }
+#     'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'], }
 #
 # @example With ProxyPassReverseCookieDomain and ProxyPassReverseCookiePath
 #   { 'path' => '/g', 'url' => 'http://backend-g/',
@@ -75,18 +75,24 @@
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
 #
-type Apache::Vhost::ProxyPass = Struct[{
-  path                          => String[1],
-  url                           => String[1],
-  Optional[params]              => Hash[String[1], Variant[String[1], Integer]],
-  Optional[keywords]            => Array[String[1]],
-  Optional[reverse_cookies]     => Array[Struct[{
-    url    => String[1],
-    path   => Optional[String[1]],
-    domain => Optional[String[1]],
-  }]],
-  Optional[reverse_urls]        => Array[String[1]],
-  Optional[setenv]              => Array[String[1]],
-  Optional[no_proxy_uris]       => Array[String[1]],
-  Optional[no_proxy_uris_match] => Array[String[1]],
-}]
+type Apache::Vhost::ProxyPass = Struct[
+  {
+    path                          => String[1],
+    url                           => String[1],
+    Optional[params]              => Hash[String[1], Variant[String[1], Integer]],
+    Optional[keywords]            => Array[String[1]],
+    Optional[reverse_cookies]     => Array[
+      Struct[
+        {
+          url    => String[1],
+          path   => Optional[String[1]],
+          domain => Optional[String[1]],
+        }
+      ]
+    ],
+    Optional[reverse_urls]        => Array[String[1]],
+    Optional[setenv]              => Array[String[1]],
+    Optional[no_proxy_uris]       => Array[String[1]],
+    Optional[no_proxy_uris_match] => Array[String[1]],
+  }
+]

From dfd45368eee5f4df472090a07245604f3b18db31 Mon Sep 17 00:00:00 2001
From: Andreas Paul <xorpaul@gmail.com>
Date: Thu, 28 Jul 2022 14:32:45 +0200
Subject: [PATCH 1975/2267] support lbmethod modules

---
 manifests/mod/lbmethod_bybusyness.pp | 19 +++++++++++++++++++
 manifests/mod/lbmethod_byrequests.pp | 19 +++++++++++++++++++
 manifests/mod/lbmethod_bytraffic.pp  | 19 +++++++++++++++++++
 manifests/mod/lbmethod_heartbeat.pp  | 19 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 manifests/mod/lbmethod_bybusyness.pp
 create mode 100644 manifests/mod/lbmethod_byrequests.pp
 create mode 100644 manifests/mod/lbmethod_bytraffic.pp
 create mode 100644 manifests/mod/lbmethod_heartbeat.pp

diff --git a/manifests/mod/lbmethod_bybusyness.pp b/manifests/mod/lbmethod_bybusyness.pp
new file mode 100644
index 0000000000..8578e95111
--- /dev/null
+++ b/manifests/mod/lbmethod_bybusyness.pp
@@ -0,0 +1,19 @@
+# @summary
+#   Installs `lbmethod_bybusyness`.
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bybusyness.html for additional documentation.
+#
+class apache::mod::lbmethod_bybusyness (
+  Optional[String] $apache_version   = $apache::apache_version,
+) {
+  require apache::mod::proxy_balancer
+
+  if versioncmp($apache_version, '2.3') >= 0 {
+    apache::mod { 'lbmethod_bybusyness': }
+  } else {
+    fail('Unsuported version for mod lbmethod_bybusyness')
+  }
+}
diff --git a/manifests/mod/lbmethod_byrequests.pp b/manifests/mod/lbmethod_byrequests.pp
new file mode 100644
index 0000000000..012df4fbcb
--- /dev/null
+++ b/manifests/mod/lbmethod_byrequests.pp
@@ -0,0 +1,19 @@
+# @summary
+#   Installs `lbmethod_byrequests`.
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_byrequests.html for additional documentation.
+#
+class apache::mod::lbmethod_byrequests (
+  Optional[String] $apache_version   = $apache::apache_version,
+) {
+  require apache::mod::proxy_balancer
+
+  if versioncmp($apache_version, '2.3') >= 0 {
+    apache::mod { 'lbmethod_byrequests': }
+  } else {
+    fail('Unsuported version for mod lbmethod_byrequests')
+  }
+}
diff --git a/manifests/mod/lbmethod_bytraffic.pp b/manifests/mod/lbmethod_bytraffic.pp
new file mode 100644
index 0000000000..058c630aef
--- /dev/null
+++ b/manifests/mod/lbmethod_bytraffic.pp
@@ -0,0 +1,19 @@
+# @summary
+#   Installs `lbmethod_bytraffic`.
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bytraffic.html for additional documentation.
+#
+class apache::mod::lbmethod_bytraffic (
+  Optional[String] $apache_version   = $apache::apache_version,
+) {
+  require apache::mod::proxy_balancer
+
+  if versioncmp($apache_version, '2.3') >= 0 {
+    apache::mod { 'lbmethod_bytraffic': }
+  } else {
+    fail('Unsuported version for mod lbmethod_bytraffic')
+  }
+}
diff --git a/manifests/mod/lbmethod_heartbeat.pp b/manifests/mod/lbmethod_heartbeat.pp
new file mode 100644
index 0000000000..aa859d3a57
--- /dev/null
+++ b/manifests/mod/lbmethod_heartbeat.pp
@@ -0,0 +1,19 @@
+# @summary
+#   Installs `lbmethod_heartbeat`.
+# 
+# @param apache_version
+#   Version of Apache to install module on.
+# 
+# @see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_heartbeat.html for additional documentation.
+#
+class apache::mod::lbmethod_heartbeat (
+  Optional[String] $apache_version   = $apache::apache_version,
+) {
+  require apache::mod::proxy_balancer
+
+  if versioncmp($apache_version, '2.3') >= 0 {
+    apache::mod { 'lbmethod_heartbeat': }
+  } else {
+    fail('Unsuported version for mod lbmethod_heartbeat')
+  }
+}

From 84940eaf74e66974266b27332397916585291252 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 28 Jul 2022 11:52:20 +0200
Subject: [PATCH 1976/2267] Drop mod_fastcgi support

mod_fastcgi isn't part of EL7 and beyond, nor in any current Debian
release. That's because upstream is dead. It also isn't part of RHEL
itself and EPEL 6 is dead. Removing it from the codebase simplifies it.
---
 README.md                           |  52 ---------------
 manifests/mod/fastcgi.pp            |  35 ----------
 manifests/params.pp                 |  13 ----
 manifests/vhost.pp                  |  32 ---------
 spec/classes/mod/fastcgi_spec.rb    |  42 ------------
 spec/defines/fastcgi_server_spec.rb | 100 ----------------------------
 spec/defines/vhost_spec.rb          |  20 ------
 templates/mod/fastcgi.conf.erb      |   8 ---
 templates/vhost/_fastcgi.erb        |  23 -------
 9 files changed, 325 deletions(-)
 delete mode 100644 manifests/mod/fastcgi.pp
 delete mode 100644 spec/classes/mod/fastcgi_spec.rb
 delete mode 100644 spec/defines/fastcgi_server_spec.rb
 delete mode 100644 templates/mod/fastcgi.conf.erb
 delete mode 100644 templates/vhost/_fastcgi.erb

diff --git a/README.md b/README.md
index 9237db0d8f..e38b2a2478 100755
--- a/README.md
+++ b/README.md
@@ -14,7 +14,6 @@
 [Installing Apache modules]: #installing-apache-modules
 [Installing arbitrary modules]: #installing-arbitrary-modules
 [Installing specific modules]: #installing-specific-modules
-[Configuring FastCGI servers]: #configuring-fastcgi-servers-to-handle-php-files
 [Load balancing examples]: #load-balancing-examples
 [apache affects]: #what-the-apache-module-affects
 
@@ -34,7 +33,6 @@
 [`apache_version`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apache_version
 [`apache::balancer`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancer
 [`apache::balancermember`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancermember
-[`apache::fastcgi::server`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachefastcgiserver
 [`apache::mod`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemod
 [`apache::mod::<MODULE NAME>`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#public-classes
 [`apache::mod::alias`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodalias
@@ -110,7 +108,6 @@
 [`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus
 
 [Facter]: http://docs.puppet.com/facter/
-[FastCGI]: https://fast-cgi.github.io/
 [FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
 [`fallbackresource`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#fallbackresource
 [`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag
@@ -272,7 +269,6 @@
     - [Beginning with Apache - Installation][Beginning with Apache]
 3. [Usage - The classes and defined types available for configuration][Usage]
     - [Configuring virtual hosts - Examples to help get started][Configuring virtual hosts]
-    - [Configuring FastCGI servers to handle PHP files][Configuring FastCGI servers]
     - [Load balancing with exported and non-exported resources][Load balancing examples]
 4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
 5. [Limitations - OS compatibility, etc.][Limitations]
@@ -676,54 +672,6 @@ apache::mod { 'mod_authnz_external': }
 
 There are several optional parameters you can specify when defining Apache modules this way. See the [defined type's reference][`apache::mod`] for details.
 
-<a id="configuring-fastcgi-servers-to-handle-php-files"></a>
-### Configuring FastCGI servers to handle PHP files
-
-#### FastCGI on Ubuntu 18.04
-
-On Ubuntu 18.04, `mod_fastcgi` is no longer supported. So considering:
-
-* an Apache Vhost with docroot set to `/var/www/html`
-* a FastCGI server listening on `127.0.0.1:9000`
-
-you can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
-
-``` puppet
-apache::vhost { 'www':
-  ...
-  docroot         => '/var/www/html/',
-  custom_fragment => 'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/var/www/html/$1',
-  ...
-}
-```
-
-Please note you have to adjust the second ProxyPassMatch parameter to your docroot value (here `/var/www/html/`).
-
-#### Other OSes
-
-Add the [`apache::fastcgi::server`][] defined type to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
-
-``` puppet
-apache::fastcgi::server { 'php':
-  host       => '127.0.0.1:9000',
-  timeout    => 15,
-  flush      => false,
-  faux_path  => '/var/www/php.fcgi',
-  fcgi_alias => '/php.fcgi',
-  file_type  => 'application/x-httpd-php'
-}
-```
-
-You can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
-
-``` puppet
-apache::vhost { 'www':
-  ...
-  custom_fragment => 'AddType application/x-httpd-php .php'
-  ...
-}
-```
-
 <a id="load-balancing-examples"></a> 
 ### Load balancing examples
 
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
deleted file mode 100644
index a6de34fb0a..0000000000
--- a/manifests/mod/fastcgi.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# @summary
-#   Installs `mod_fastcgi`.
-# 
-# @see https://github.com/FastCGI-Archives/mod_fastcgi for additional documentation.
-#
-class apache::mod::fastcgi {
-  include apache
-  if ($facts['os']['family'] == 'Redhat' and versioncmp($facts['os']['release']['major'], '7') >= 0) {
-    fail('mod_fastcgi is no longer supported on el7 and above.')
-  }
-  if ($facts['os']['name'] == 'Ubuntu') {
-    fail('mod_fastcgi is no longer supported on Ubuntu 18.04 and above. Please use mod_proxy_fcgi')
-  }
-  # Debian specifies it's fastcgi lib path, but RedHat uses the default value
-  # with no config file
-  $fastcgi_lib_path = $apache::params::fastcgi_lib_path
-
-  ::apache::mod { 'fastcgi': }
-
-  if $fastcgi_lib_path {
-    # Template uses:
-    # - $fastcgi_server
-    # - $fastcgi_socket
-    # - $fastcgi_dir
-    file { 'fastcgi.conf':
-      ensure  => file,
-      path    => "${apache::mod_dir}/fastcgi.conf",
-      mode    => $apache::file_mode,
-      content => template('apache/mod/fastcgi.conf.erb'),
-      require => Exec["mkdir ${apache::mod_dir}"],
-      before  => File[$apache::mod_dir],
-      notify  => Class['apache::service'],
-    }
-  }
-}
diff --git a/manifests/params.pp b/manifests/params.pp
index d937a3965c..d5ff15195f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -103,7 +103,6 @@
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = "${httpd_root}/var/www/html"
@@ -214,11 +213,6 @@
         default => 'mod_ldap',
       },
       'authnz_pam'            => 'mod_authnz_pam',
-      'fastcgi'               => $facts['os']['release']['major'] ? {
-        '5'     => 'mod_fastcgi',
-        '6'     => 'mod_fastcgi',
-        default => undef,
-      },
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',
@@ -272,7 +266,6 @@
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
@@ -368,7 +361,6 @@
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-mod-svn',
-        'fastcgi'               => 'libapache2-mod-fastcgi',
         'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
@@ -399,7 +391,6 @@
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-mod-svn',
-        'fastcgi'               => 'libapache2-mod-fastcgi',
         'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
@@ -435,7 +426,6 @@
     $keepalive              = 'On'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
@@ -546,7 +536,6 @@
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef # TODO: revisit
     $mime_support_package = 'misc/mime-support'
     $mime_types_config    = '/usr/local/etc/mime.types'
     $wsgi_socket_prefix   = undef
@@ -613,7 +602,6 @@
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef # TODO: revisit
     $mime_support_package = 'app-misc/mime-types'
     $mime_types_config    = '/etc/mime.types'
     $wsgi_socket_prefix   = undef
@@ -689,7 +677,6 @@
     $keepalive              = 'On'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'aaa_base'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/srv/www'
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 58d8fb9799..f56b7331be 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -252,18 +252,6 @@
 #   your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin 
 #   with a `/` or be `disabled`.
 #
-# @param fastcgi_server
-#   Specify an external FastCGI server to manage a connection to.
-#
-# @param fastcgi_socket
-#   Specify the socket that will be used to communicate with an external FastCGI server.
-#
-# @param fastcgi_idle_timeout
-#   If using fastcgi, this option sets the timeout for the server to respond.
-#
-# @param fastcgi_dir
-#   Specify an internal FastCGI directory that is to be managed.
-#
 # @param filters
 #   [Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, 
 #   context-sensitive configuration of output content filters.
@@ -1838,10 +1826,6 @@
   Optional[String] $custom_fragment                                                   = undef,
   Optional[Hash] $itk                                                                 = undef,
   Optional[String] $action                                                            = undef,
-  Optional[String] $fastcgi_server                                                    = undef,
-  Optional[String] $fastcgi_socket                                                    = undef,
-  Optional[String] $fastcgi_dir                                                       = undef,
-  Optional[Integer] $fastcgi_idle_timeout                                             = undef,
   Variant[Array[String], String] $additional_includes                                 = [],
   Boolean $use_optional_includes                                                      = $apache::use_optional_includes,
   Optional[String] $apache_version                                                    = $apache::apache_version,
@@ -2691,22 +2675,6 @@
     }
   }
 
-  # Template uses:
-  # - $fastcgi_server
-  # - $fastcgi_socket
-  # - $fastcgi_dir
-  # - $fastcgi_idle_timeout
-  # - $apache_version
-  if ($fastcgi_server or $fastcgi_dir) and $ensure == 'present' {
-    include apache::mod::fastcgi
-
-    concat::fragment { "${name}-fastcgi":
-      target  => "${priority_real}${filename}.conf",
-      order   => 280,
-      content => template('apache/vhost/_fastcgi.erb'),
-    }
-  }
-
   # Template uses:
   # - $suexec_user_group
   if $suexec_user_group and $ensure == 'present' {
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
deleted file mode 100644
index 4cd6c9c419..0000000000
--- a/spec/classes/mod/fastcgi_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'apache::mod::fastcgi', type: :class do
-  on_supported_os.each do |os, facts|
-    context "on #{os} " do
-      let :facts do
-        facts
-      end
-
-      context 'with all defaults' do
-        case facts[:os]['name']
-        when 'Debian'
-          it { is_expected.to compile.with_all_deps }
-          it { is_expected.to contain_class('apache::params') }
-          it { is_expected.to contain_apache__mod('fastcgi') }
-          it { is_expected.to contain_package('libapache2-mod-fastcgi') }
-          it { is_expected.to contain_file('fastcgi.conf') }
-        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'Rocky', 'AlmaLinux'
-          if facts[:os]['release']['major'].to_i < 7
-            it { is_expected.to compile.with_all_deps }
-            it { is_expected.to contain_class('apache::params') }
-            it { is_expected.to contain_apache__mod('fastcgi') }
-            it { is_expected.to contain_package('mod_fastcgi') }
-            it { is_expected.not_to contain_file('fastcgi.conf') }
-          else
-            it { is_expected.not_to compile }
-          end
-        when 'Ubuntu'
-          if facts[:os]['release']['major'].to_i < 18
-            it { is_expected.to compile.with_all_deps }
-          else
-            it { is_expected.not_to compile }
-          end
-        else
-          it { is_expected.to compile.with_all_deps }
-        end
-      end
-    end
-  end
-end
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
deleted file mode 100644
index 8ddf52f516..0000000000
--- a/spec/defines/fastcgi_server_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'apache::fastcgi::server', type: :define do
-  let :pre_condition do
-    'include apache'
-  end
-  let :title do
-    'www'
-  end
-
-  on_supported_os.each do |os, facts|
-    next if facts[:os]['name'] == 'Ubuntu'
-    next if facts[:os]['release']['major'] != '6' && facts[:os]['family']['RedHat']
-    context "on #{os} " do
-      let :facts do
-        facts
-      end
-
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::fastcgi') }
-      case facts[:os]['family']
-      when 'RedHat'
-        it {
-          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-            ensure: 'file',
-            path: "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf",
-          )
-        }
-      when 'Debian', 'Gentoo'
-        it {
-          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-            ensure: 'file',
-            path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
-          )
-        }
-      when 'FreeBSD'
-        it {
-          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-            ensure: 'file',
-            path: "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf",
-          )
-        }
-      end
-
-      describe 'os-independent items' do
-        describe '.conf content using TCP communication' do
-          let :params do
-            {
-              host: '127.0.0.1:9001',
-              timeout: 30,
-              flush: true,
-              faux_path: '/var/www/php-www.fcgi',
-              fcgi_alias: '/php-www.fcgi',
-              file_type: 'application/x-httpd-php',
-              pass_header: 'Authorization',
-            }
-          end
-          let :expected do
-# rubocop:disable Layout/IndentationWidth : Changes to the indent causes test failures.
-'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -host 127.0.0.1:9001 -pass-header Authorization
-Alias /php-www.fcgi /var/www/php-www.fcgi
-Action application/x-httpd-php /php-www.fcgi
-'
-            # rubocop:enable Layout/IndentationWidth
-          end
-
-          it do
-            is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
-          end
-        end
-        describe '.conf content using socket communication' do
-          let :params do
-            {
-              host: '/var/run/fcgi.sock',
-              timeout: 30,
-              flush: true,
-              faux_path: '/var/www/php-www.fcgi',
-              fcgi_alias: '/php-www.fcgi',
-              file_type: 'application/x-httpd-php',
-            }
-          end
-          let :expected do
-# rubocop:disable Layout/IndentationWidth : Changes to the indent causes test failures.
-'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -socket /var/run/fcgi.sock
-Alias /php-www.fcgi /var/www/php-www.fcgi
-Action application/x-httpd-php /php-www.fcgi
-'
-            # rubocop:enable Layout/IndentationWidth
-          end
-
-          it do
-            is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 30a3754efd..9d59e9d2bf 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1309,7 +1309,6 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-requestheader') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-wsgi') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-custom_fragment') }
-          it { is_expected.not_to contain_concat__fragment('rspec.example.com-fastcgi') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-suexec') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-charsets') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-limits') }
@@ -1759,25 +1758,6 @@
             end
           end
 
-          # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu
-          unless os_facts[:os]['family'] == 'Debian' || (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i >= 7)
-            describe 'fastcgi options' do
-              let :params do
-                {
-                  'docroot'              => '/var/www/foo',
-                  'fastcgi_server'       => 'localhost',
-                  'fastcgi_socket'       => '/tmp/fastcgi.socket',
-                  'fastcgi_dir'          => '/tmp',
-                  'fastcgi_idle_timeout' => 120,
-                }
-              end
-
-              it { is_expected.to compile }
-              it { is_expected.to contain_class('apache::mod::fastcgi') }
-              it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
-            end
-          end
-
           context 'require unmanaged' do
             let :params do
               {
diff --git a/templates/mod/fastcgi.conf.erb b/templates/mod/fastcgi.conf.erb
deleted file mode 100644
index 93c8d86ab0..0000000000
--- a/templates/mod/fastcgi.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# The Fastcgi Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
-<IfModule mod_fastcgi.c>
-  <FilesMatch ".+(\.fcgi)$">
-    SetHandler fastcgi-script
-  </FilesMatch>
-  FastCgiIpcDir "<%= @fastcgi_lib_path %>"
-</IfModule>
diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
deleted file mode 100644
index b4718391b7..0000000000
--- a/templates/vhost/_fastcgi.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% if @fastcgi_server -%>
-
-  FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket -%>
-<%   unless @fastcgi_idle_timeout.nil? %> -idle-timeout <%= @fastcgi_idle_timeout %><% end %>
-<% end -%>
-<% if @fastcgi_dir -%>
-
-  <Directory "<%= @fastcgi_dir %>">
-    Options +ExecCGI
-    AllowOverride All
-    SetHandler fastcgi-script
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all granted
-  <%- else -%>
-    Order allow,deny
-    Allow From All
-  <%- end -%>
-    AuthBasicAuthoritative Off
-  </Directory>
-
-  AllowEncodedSlashes On
-  ServerSignature Off
-<% end -%>

From 1d521221afa78275e06a74b78ec1a15d31c09c05 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Fri, 29 Jul 2022 11:05:10 +0200
Subject: [PATCH 1977/2267] Remove duplicate SecDefaultAction in CRS template

---
 templates/mod/security_crs.conf.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 1f05ee5b5a..0b5d91f629 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -93,8 +93,8 @@
 # - In Apache, you can use ErrorDocument to show a friendly error page or
 #   perform a redirect: https://httpd.apache.org/docs/2.4/custom-error.html
 #
-SecDefaultAction "phase:1,log,auditlog,pass"
-SecDefaultAction "phase:2,log,auditlog,pass"
+# SecDefaultAction "phase:1,log,auditlog,pass"
+# SecDefaultAction "phase:2,log,auditlog,pass"
 
 # Example: Anomaly Scoring mode, log only to ModSecurity audit log
 # - By default, offending requests are blocked with an error 403 response.

From ee02164976b13414a0d20261f7dc017cc38dc6ad Mon Sep 17 00:00:00 2001
From: Andreas Paul <xorpaul@gmail.com>
Date: Fri, 29 Jul 2022 14:54:49 +0200
Subject: [PATCH 1978/2267] add tests for lbmethod modules

---
 spec/classes/mod/lbmethod_bybusyness.rb | 38 +++++++++++++++++++++++++
 spec/classes/mod/lbmethod_byrequests.rb | 38 +++++++++++++++++++++++++
 spec/classes/mod/lbmethod_bytraffic.rb  | 38 +++++++++++++++++++++++++
 spec/classes/mod/lbmethod_heartbeat.rb  | 38 +++++++++++++++++++++++++
 4 files changed, 152 insertions(+)
 create mode 100644 spec/classes/mod/lbmethod_bybusyness.rb
 create mode 100644 spec/classes/mod/lbmethod_byrequests.rb
 create mode 100644 spec/classes/mod/lbmethod_bytraffic.rb
 create mode 100644 spec/classes/mod/lbmethod_heartbeat.rb

diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb
new file mode 100644
index 0000000000..94c24ad495
--- /dev/null
+++ b/spec/classes/mod/lbmethod_bybusyness.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::lbmethod_byrequests', type: :class do
+  context 'on a Debian OS' do
+    include_examples 'Debian 11'
+
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+      }
+    end
+  end
+  context 'on a RedHat OS' do
+    include_examples 'RedHat 6'
+
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+      }
+    end
+  end
+end
diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb
new file mode 100644
index 0000000000..94c24ad495
--- /dev/null
+++ b/spec/classes/mod/lbmethod_byrequests.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::lbmethod_byrequests', type: :class do
+  context 'on a Debian OS' do
+    include_examples 'Debian 11'
+
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+      }
+    end
+  end
+  context 'on a RedHat OS' do
+    include_examples 'RedHat 6'
+
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+      }
+    end
+  end
+end
diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb
new file mode 100644
index 0000000000..94c24ad495
--- /dev/null
+++ b/spec/classes/mod/lbmethod_bytraffic.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::lbmethod_byrequests', type: :class do
+  context 'on a Debian OS' do
+    include_examples 'Debian 11'
+
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+      }
+    end
+  end
+  context 'on a RedHat OS' do
+    include_examples 'RedHat 6'
+
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+      }
+    end
+  end
+end
diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb
new file mode 100644
index 0000000000..94c24ad495
--- /dev/null
+++ b/spec/classes/mod/lbmethod_heartbeat.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::lbmethod_byrequests', type: :class do
+  context 'on a Debian OS' do
+    include_examples 'Debian 11'
+
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+      }
+    end
+  end
+  context 'on a RedHat OS' do
+    include_examples 'RedHat 6'
+
+    context 'with Apache version >= 2.4' do
+      let :params do
+        {
+          apache_version: '2.4',
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+      }
+    end
+  end
+end

From 8674fad50950a8136ede004aab68e696166621c6 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Fri, 29 Jul 2022 12:34:11 +0200
Subject: [PATCH 1979/2267] Allow configuring CRS paranoia level

---
 manifests/mod/security.pp           | 15 +++++++++++++++
 templates/mod/security_crs.conf.erb | 28 ++++++++++++++--------------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index f1bcdbcd71..2faa4cfc1f 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -75,6 +75,13 @@
 # @param notice_anomaly_score
 #   Sets the Anomaly Score for rules assigned with a notice severity.
 # 
+# @param paranoia_level
+#   Sets the paranoia level in the OWASP ModSecurity Core Rule Set.
+# 
+# @param executing_paranoia_level
+#   Sets the executing paranoia level in the OWASP ModSecurity Core Rule Set.
+#   The default is equal to, and cannot be lower than, $paranoia_level.
+# 
 # @param secrequestmaxnumargs
 #   Sets the maximum number of arguments in the request.
 # 
@@ -123,6 +130,8 @@
   Integer $secrequestbodylimit                          = 13107200,
   Integer $secrequestbodynofileslimit                   = 131072,
   Integer $secrequestbodyinmemorylimit                  = 131072,
+  Integer[1,4] $paranoia_level                          = 1,
+  Integer[1,4] $executing_paranoia_level                = $paranoia_level,
   Boolean $manage_security_crs                          = true,
 ) inherits apache::params {
   include apache
@@ -140,6 +149,10 @@
     fail('SLES 10 is not currently supported.')
   }
 
+  if ($executing_paranoia_level < $paranoia_level) {
+    fail('Executing paranoia level cannot be lower than paranoia level')
+  }
+
   case $version {
     1: {
       $mod_name = 'security'
@@ -248,6 +261,8 @@
     # - $notice_anomaly_score
     # - $inbound_anomaly_threshold
     # - $outbound_anomaly_threshold
+    # - $paranoia_level
+    # - $executing_paranoia_level
     # - $allowed_methods
     # - $content_types
     # - $restricted_extensions
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 1f05ee5b5a..b3cdf5a5bd 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -175,13 +175,13 @@ SecDefaultAction "phase:2,<%= @_secdefaultaction -%>"
 #
 # Uncomment this rule to change the default:
 #
-#SecAction \
-#  "id:900000,\
-#   phase:1,\
-#   nolog,\
-#   pass,\
-#   t:none,\
-#   setvar:tx.paranoia_level=1"
+SecAction \
+  "id:900000,\
+   phase:1,\
+   nolog,\
+   pass,\
+   t:none,\
+   setvar:tx.paranoia_level=<%= @paranoia_level -%>"
 
 
 # It is possible to execute rules from a higher paranoia level but not include
@@ -201,13 +201,13 @@ SecDefaultAction "phase:2,<%= @_secdefaultaction -%>"
 # level results in a performance impact that is equally high as setting
 # tx.paranoia_level to said level.
 #
-#SecAction \
-#  "id:900001,\
-#   phase:1,\
-#   nolog,\
-#   pass,\
-#   t:none,\
-#   setvar:tx.executing_paranoia_level=1"
+SecAction \
+  "id:900001,\
+   phase:1,\
+   nolog,\
+   pass,\
+   t:none,\
+   setvar:tx.executing_paranoia_level=<%= @executing_paranoia_level -%>"
 
 
 #

From c38aac1d3d4512cf46b5591a5f43b40034a1bc8f Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Mon, 1 Aug 2022 17:32:23 +0200
Subject: [PATCH 1980/2267] Add tests for CRS paranoia level

---
 spec/classes/mod/security_spec.rb | 58 +++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index d562d754cf..dd96379a9b 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -130,6 +130,35 @@
             }
             it { is_expected.to contain_file('/etc/httpd/modsecurity.d/custom_rules/custom_01_rules.conf').with_content %r{^\s*.*"id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"$} }
           end
+
+          describe 'with CRS parameters' do
+            let :params do
+              {
+                paranoia_level: 1,
+                executing_paranoia_level: 2,
+              }
+            end
+
+            it {
+              is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                %r{^SecAction \\\n\s+\"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
+              is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                %r{^SecAction \\\n\s+\"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=2"$}
+            }
+          end
+
+          describe 'with invalid CRS parameters' do
+            let :params do
+              {
+                paranoia_level: 2,
+                executing_paranoia_level: 1,
+              }
+            end
+
+            it {
+              is_expected.to compile.and_raise_error(%r{Executing paranoia level cannot be lower than paranoia level})
+            }
+          end
         end
       when 'Debian'
         context 'on Debian based systems' do
@@ -259,6 +288,35 @@
               )
             }
           end
+
+          describe 'with CRS parameters' do
+            let :params do
+              {
+                paranoia_level: 1,
+                executing_paranoia_level: 1,
+              }
+            end
+
+            it {
+              is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
+                %r{^SecAction \\\n\s+\"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
+              is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
+                %r{^SecAction \\\n\s+\"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=1"$}
+            }
+          end
+
+          describe 'with invalid CRS parameters' do
+            let :params do
+              {
+                paranoia_level: 2,
+                executing_paranoia_level: 1,
+              }
+            end
+
+            it {
+              is_expected.to compile.and_raise_error(%r{Executing paranoia level cannot be lower than paranoia level})
+            }
+          end
         end
       end
     end

From 8a5c3bc3de2119502eb7d5383599724a68bfa5db Mon Sep 17 00:00:00 2001
From: Yan Zhan <yanzhan2@illinois.edu>
Date: Mon, 1 Aug 2022 10:38:02 -0500
Subject: [PATCH 1981/2267] Merge branch 'puppetlabs:main' into main

---
 .puppet-lint.rc                           |   1 +
 .sync.yml                                 |   1 +
 README.md                                 | 108 +++--------
 REFERENCE.md                              | 172 +++++++++---------
 examples/vhost.pp                         |  60 +++----
 examples/vhost_proxypass.pp               |   8 +-
 examples/vhost_ssl.pp                     |   4 +-
 examples/vhosts_without_listen.pp         |  12 +-
 manifests/balancer.pp                     |   6 +-
 manifests/balancermember.pp               |   4 +-
 manifests/custom_config.pp                |  24 +--
 manifests/default_mods.pp                 |   8 +-
 manifests/fastcgi/server.pp               |  14 +-
 manifests/init.pp                         | 183 ++++++++++---------
 manifests/mod/alias.pp                    |   2 +-
 manifests/mod/auth_cas.pp                 |   2 +-
 manifests/mod/auth_mellon.pp              |  14 +-
 manifests/mod/auth_openidc.pp             |   3 +-
 manifests/mod/authn_dbd.pp                |  14 +-
 manifests/mod/authnz_ldap.pp              |   4 +-
 manifests/mod/cluster.pp                  |  16 +-
 manifests/mod/deflate.pp                  |   2 +-
 manifests/mod/disk_cache.pp               |   6 +-
 manifests/mod/event.pp                    |  26 +--
 manifests/mod/fastcgi.pp                  |  35 ----
 manifests/mod/geoip.pp                    |  16 +-
 manifests/mod/info.pp                     |   8 +-
 manifests/mod/itk.pp                      |  16 +-
 manifests/mod/jk.pp                       |  10 +-
 manifests/mod/ldap.pp                     |  32 ++--
 manifests/mod/nss.pp                      |   8 +-
 manifests/mod/pagespeed.pp                |  70 ++++----
 manifests/mod/passenger.pp                |  40 ++---
 manifests/mod/peruser.pp                  |  16 +-
 manifests/mod/php.pp                      |  20 +--
 manifests/mod/prefork.pp                  |  20 +--
 manifests/mod/proxy_balancer.pp           |   8 +-
 manifests/mod/reqtimeout.pp               |   2 +-
 manifests/mod/rpaf.pp                     |   4 +-
 manifests/mod/security.pp                 |  26 +--
 manifests/mod/shib.pp                     |   8 +-
 manifests/mod/ssl.pp                      |  10 +-
 manifests/mod/status.pp                   |   2 +-
 manifests/mod/worker.pp                   |  20 +--
 manifests/mod/wsgi.pp                     |  16 +-
 manifests/mpm.pp                          |   4 +-
 manifests/mpm/disable_mpm_event.pp        |   1 +
 manifests/mpm/disable_mpm_prefork.pp      |   1 +
 manifests/mpm/disable_mpm_worker.pp       |   1 +
 manifests/params.pp                       |  13 --
 manifests/peruser/multiplexer.pp          |   6 +-
 manifests/security/rule_link.pp           |   2 +-
 manifests/service.pp                      |  10 +-
 manifests/vhost.pp                        | 208 ++++++++++------------
 manifests/vhost/custom.pp                 |   6 +-
 manifests/vhost/fragment.pp               |  16 +-
 manifests/vhost/proxy.pp                  |  30 ++--
 manifests/vhosts.pp                       |   2 +-
 spec/acceptance/apache_parameters_spec.rb |   8 +-
 spec/acceptance/apache_ssl_spec.rb        |   4 +-
 spec/acceptance/mod_php_spec.rb           |   4 +-
 spec/acceptance/vhost_spec.rb             |  28 +--
 spec/acceptance/vhosts_spec.rb            |   4 +-
 spec/classes/mod/auth_mellon_spec.rb      |  20 +--
 spec/classes/mod/event_spec.rb            |  40 ++---
 spec/classes/mod/fastcgi_spec.rb          |  42 -----
 spec/classes/mod/ldap_spec.rb             |  10 +-
 spec/classes/mod/passenger_spec.rb        |  13 +-
 spec/classes/mod/prefork_spec.rb          |   4 +-
 spec/classes/mod/ssl_spec.rb              |   2 +-
 spec/classes/vhosts_spec.rb               |   4 +-
 spec/defines/custom_config_spec.rb        |   2 +-
 spec/defines/fastcgi_server_spec.rb       | 100 -----------
 spec/defines/vhost_fragment_spec.rb       |   6 +-
 spec/defines/vhost_proxy_spec.rb          |   2 +-
 spec/defines/vhost_spec.rb                | 107 +++++------
 templates/mod/fastcgi.conf.erb            |   8 -
 templates/mod/security_crs.conf.erb       |   4 +-
 templates/vhost/_fastcgi.erb              |  23 ---
 types/oidcsettings.pp                     |  64 +++----
 types/servertokens.pp                     |   4 +
 types/vhost/proxypass.pp                  |  38 ++--
 82 files changed, 811 insertions(+), 1111 deletions(-)
 delete mode 100644 manifests/mod/fastcgi.pp
 delete mode 100644 spec/classes/mod/fastcgi_spec.rb
 delete mode 100644 spec/defines/fastcgi_server_spec.rb
 delete mode 100644 templates/mod/fastcgi.conf.erb
 delete mode 100644 templates/vhost/_fastcgi.erb
 create mode 100644 types/servertokens.pp

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index 6d61fb07e3..1a73fe3400 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,2 +1,3 @@
 --relative
 --no-anchor_resource-check
+--no-140chars-check
diff --git a/.sync.yml b/.sync.yml
index 0ec6e5c8dd..354e9e1eac 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -38,3 +38,4 @@ changelog_since_tag: "3.2.0"
 Rakefile:
   extra_disabled_lint_checks:
     - anchor_resource
+    - 140chars
diff --git a/README.md b/README.md
index 421f9af426..e38b2a2478 100755
--- a/README.md
+++ b/README.md
@@ -14,7 +14,6 @@
 [Installing Apache modules]: #installing-apache-modules
 [Installing arbitrary modules]: #installing-arbitrary-modules
 [Installing specific modules]: #installing-specific-modules
-[Configuring FastCGI servers]: #configuring-fastcgi-servers-to-handle-php-files
 [Load balancing examples]: #load-balancing-examples
 [apache affects]: #what-the-apache-module-affects
 
@@ -34,7 +33,6 @@
 [`apache_version`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apache_version
 [`apache::balancer`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancer
 [`apache::balancermember`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancermember
-[`apache::fastcgi::server`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachefastcgiserver
 [`apache::mod`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemod
 [`apache::mod::<MODULE NAME>`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#public-classes
 [`apache::mod::alias`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodalias
@@ -110,7 +108,6 @@
 [`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus
 
 [Facter]: http://docs.puppet.com/facter/
-[FastCGI]: https://fast-cgi.github.io/
 [FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
 [`fallbackresource`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#fallbackresource
 [`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag
@@ -272,7 +269,6 @@
     - [Beginning with Apache - Installation][Beginning with Apache]
 3. [Usage - The classes and defined types available for configuration][Usage]
     - [Configuring virtual hosts - Examples to help get started][Configuring virtual hosts]
-    - [Configuring FastCGI servers to handle PHP files][Configuring FastCGI servers]
     - [Load balancing with exported and non-exported resources][Load balancing examples]
 4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
 5. [Limitations - OS compatibility, etc.][Limitations]
@@ -316,7 +312,7 @@ When you declare this class with the default options, the module:
 
 - Installs the appropriate Apache software package and [required Apache modules][`default_mods`] for your operating system.
 - Places the required configuration files in a directory, with the [default location][`conf_dir`] Depends on operating system.
-- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
+- Configures the server with a default virtual host and standard port (80) and address ('\*') bindings.
 - Creates a document root directory Depends on operating system, typically `/var/www`.
 - Starts the Apache service.
 
@@ -345,7 +341,7 @@ To configure basic [name-based virtual hosts][], specify the [`port`][] and [`do
 
 ``` puppet
 apache::vhost { 'vhost.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/vhost',
 }
 ```
@@ -358,7 +354,7 @@ To configure user and group ownership for `docroot`, use the [`docroot_owner`][]
 
 ``` puppet
 apache::vhost { 'user.example.com':
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/user',
   docroot_owner => 'www-data',
   docroot_group => 'www-data',
@@ -367,11 +363,11 @@ apache::vhost { 'user.example.com':
 
 #### Configuring virtual hosts with SSL
 
-To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accommodate HTTPS requests:
+To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of 443, to accommodate HTTPS requests:
 
 ``` puppet
 apache::vhost { 'ssl.example.com':
-  port    => '443',
+  port    => 443,
   docroot => '/var/www/ssl',
   ssl     => true,
 }
@@ -381,7 +377,7 @@ To configure a virtual host to use SSL and specific SSL certificates, use the pa
 
 ``` puppet
 apache::vhost { 'cert.example.com':
-  port     => '443',
+  port     => 443,
   docroot  => '/var/www/cert',
   ssl      => true,
   ssl_cert => '/etc/ssl/fourth.example.com.cert',
@@ -395,14 +391,14 @@ To configure a mix of SSL and unencrypted virtual hosts at the same domain, decl
 # The non-ssl virtual host
 apache::vhost { 'mix.example.com non-ssl':
   servername => 'mix.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/mix',
 }
 
 # The SSL virtual host at the same domain
 apache::vhost { 'mix.example.com ssl':
   servername => 'mix.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/mix',
   ssl        => true,
 }
@@ -413,7 +409,7 @@ To configure a virtual host to redirect unencrypted connections to SSL, declare
 ``` puppet
 apache::vhost { 'redirect.example.com non-ssl':
   servername      => 'redirect.example.com',
-  port            => '80',
+  port            => 80,
   docroot         => '/var/www/redirect',
   redirect_status => 'permanent',
   redirect_dest   => 'https://redirect.example.com/'
@@ -421,7 +417,7 @@ apache::vhost { 'redirect.example.com non-ssl':
 
 apache::vhost { 'redirect.example.com ssl':
   servername => 'redirect.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/redirect',
   ssl        => true,
 }
@@ -434,7 +430,7 @@ Virtual hosts listen on all IP addresses ('\*') by default. To configure the vir
 ``` puppet
 apache::vhost { 'ip.example.com':
   ip      => '127.0.0.1',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/ip',
 }
 ```
@@ -444,7 +440,7 @@ You can also configure more than one IP address per virtual host by using an arr
 ``` puppet
 apache::vhost { 'ip.example.com':
   ip      => ['127.0.0.1','169.254.1.1'],
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/ip',
 }
 ```
@@ -454,7 +450,7 @@ You can configure multiple ports per virtual host by using an array of ports for
 ``` puppet
 apache::vhost { 'ip.example.com':
   ip      => ['127.0.0.1'],
-  port    => ['80','8080']
+  port    => [80, 8080]
   docroot => '/var/www/ip',
 }
 ```
@@ -467,7 +463,7 @@ apache::vhost { 'aliases.example.com':
     'aliases.example.org',
     'aliases.example.net',
   ],
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/aliases',
 }
 ```
@@ -477,7 +473,7 @@ To set up a virtual host with a wildcard alias for the subdomain mapped to a dir
 ``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
-  port            => '80',
+  port            => 80,
   virtual_docroot => '/var/www/%-2+',
   docroot         => '/var/www',
   serveraliases   => ['*.loc',],
@@ -488,7 +484,7 @@ To configure a virtual host with [filter rules][], pass the filter directives as
 
 ``` puppet
 apache::vhost { 'subdomain.loc':
-  port    => '80',
+  port    => 80,
   filters => [
     'FilterDeclare  COMPRESS',
     'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html',
@@ -505,13 +501,13 @@ To configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) f
 
 ``` puppet
 apache::vhost { 'wsgi.example.com':
-  port                        => '80',
+  port                        => 80,
   docroot                     => '/var/www/pythonapp',
   wsgi_application_group      => '%{GLOBAL}',
   wsgi_daemon_process         => 'wsgi',
   wsgi_daemon_process_options => {
-    processes    => '2',
-    threads      => '15',
+    processes    => 2,
+    threads      => 15,
     display-name => '%{GROUP}',
   },
   wsgi_import_script          => '/var/www/demo.wsgi',
@@ -528,7 +524,7 @@ As of Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement
 
 ``` puppet
 apache::vhost { 'wordpress.example.com':
-  port             => '80',
+  port             => 80,
   docroot          => '/var/www/wordpress',
   fallbackresource => '/index.php',
 }
@@ -540,7 +536,7 @@ To configure a virtual host with a designated directory for [Common Gateway Inte
 
 ``` puppet
 apache::vhost { 'cgi.example.com':
-  port        => '80',
+  port        => 80,
   docroot     => '/var/www/cgi',
   scriptalias => '/usr/lib/cgi-bin',
 }
@@ -550,7 +546,7 @@ To configure a virtual host for [Rack][], use the [`rack_base_uri`][] parameter:
 
 ``` puppet
 apache::vhost { 'rack.example.com':
-  port           => '80',
+  port           => 80,
   docroot        => '/var/www/rack',
   rack_base_uri => ['/rackapp1', '/rackapp2'],
 }
@@ -590,7 +586,7 @@ In this example, we add two IP-based virtual hosts on an IP address (in this exa
 apache::vhost { 'The first IP-based virtual host, non-ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
-  port       => '80',
+  port       => 80,
   ip_based   => true,
   docroot    => '/var/www/first',
 }
@@ -598,7 +594,7 @@ apache::vhost { 'The first IP-based virtual host, non-ssl':
 apache::vhost { 'The first IP-based vhost, ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
-  port       => '443',
+  port       => 443,
   ip_based   => true,
   docroot    => '/var/www/first-ssl',
   ssl        => true,
@@ -610,13 +606,13 @@ Next, we add two name-based virtual hosts listening on a second IP address (10.0
 ``` puppet
 apache::vhost { 'second.example.com':
   ip      => '10.0.0.20',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/second',
 }
 
 apache::vhost { 'third.example.com':
   ip      => '10.0.0.20',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/third',
 }
 ```
@@ -625,13 +621,13 @@ To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, yo
 
 ``` puppet
 apache::vhost { 'fourth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fourth',
   add_listen => false,
 }
 
 apache::vhost { 'fifth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fifth',
   add_listen => false,
 }
@@ -676,54 +672,6 @@ apache::mod { 'mod_authnz_external': }
 
 There are several optional parameters you can specify when defining Apache modules this way. See the [defined type's reference][`apache::mod`] for details.
 
-<a id="configuring-fastcgi-servers-to-handle-php-files"></a>
-### Configuring FastCGI servers to handle PHP files
-
-#### FastCGI on Ubuntu 18.04
-
-On Ubuntu 18.04, `mod_fastcgi` is no longer supported. So considering:
-
-* an Apache Vhost with docroot set to `/var/www/html`
-* a FastCGI server listening on `127.0.0.1:9000`
-
-you can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
-
-``` puppet
-apache::vhost { 'www':
-  ...
-  docroot         => '/var/www/html/',
-  custom_fragment => 'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/var/www/html/$1',
-  ...
-}
-```
-
-Please note you have to adjust the second ProxyPassMatch parameter to your docroot value (here `/var/www/html/`).
-
-#### Other OSes
-
-Add the [`apache::fastcgi::server`][] defined type to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
-
-``` puppet
-apache::fastcgi::server { 'php':
-  host       => '127.0.0.1:9000',
-  timeout    => 15,
-  flush      => false,
-  faux_path  => '/var/www/php.fcgi',
-  fcgi_alias => '/php.fcgi',
-  file_type  => 'application/x-httpd-php'
-}
-```
-
-You can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
-
-``` puppet
-apache::vhost { 'www':
-  ...
-  custom_fragment => 'AddType application/x-httpd-php .php'
-  ...
-}
-```
-
 <a id="load-balancing-examples"></a> 
 ### Load balancing examples
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 0c030b4697..02ef6f1dca 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -940,7 +940,7 @@ Data type: `Any`
 Sets Apache's `TimeOut` directive, which defines the number of seconds Apache waits for
 certain events before failing a request.
 
-Default value: `'60'`
+Default value: `60`
 
 ##### <a name="trace_enable"></a>`trace_enable`
 
@@ -1075,7 +1075,7 @@ abnormal client request behavior, which may be useful for avoiding some forms of
 denial-of-service attacks. The value should be increased if normal clients see an error
 response from the server that indicates too many fields were sent in the request.
 
-Default value: `'100'`
+Default value: `100`
 
 ##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
 
@@ -1084,7 +1084,7 @@ Data type: `Any`
 The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 be allowed within a request header.
 
-Default value: `'8190'`
+Default value: `8190`
 
 ##### <a name="ip"></a>`ip`
 
@@ -1669,7 +1669,7 @@ Data type: `Any`
 
 Set the minimum number of connections per process.
 
-Default value: `'4'`
+Default value: `4`
 
 ##### <a name="authn_dbd_max"></a>`authn_dbd_max`
 
@@ -1677,7 +1677,7 @@ Data type: `Any`
 
 Set the maximum number of connections per process.
 
-Default value: `'20'`
+Default value: `20`
 
 ##### <a name="authn_dbd_keep"></a>`authn_dbd_keep`
 
@@ -1685,7 +1685,7 @@ Data type: `Any`
 
 Set the maximum number of connections per process to be sustained.
 
-Default value: `'8'`
+Default value: `8`
 
 ##### <a name="authn_dbd_exptime"></a>`authn_dbd_exptime`
 
@@ -1694,7 +1694,7 @@ Data type: `Any`
 Set the time to keep idle connections alive when the number of
 connections specified in DBDKeep has been exceeded.
 
-Default value: `'300'`
+Default value: `300`
 
 ##### <a name="authn_dbd_alias"></a>`authn_dbd_alias`
 
@@ -1906,7 +1906,7 @@ Data type: `Any`
 
 mod_cluster listen port.
 
-Default value: `'6666'`
+Default value: `6666`
 
 ##### <a name="keep_alive_timeout"></a>`keep_alive_timeout`
 
@@ -2250,7 +2250,7 @@ Data type: `Any`
 Sets the number of child server processes created at startup, via the module's `StartServers` directive. Setting this to `false`
 removes the parameter.
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -2258,7 +2258,7 @@ Data type: `Any`
 
 Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
 
-Default value: `'150'`
+Default value: `150`
 
 ##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
@@ -2275,7 +2275,7 @@ Data type: `Any`
 
 Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Setting this to `false` removes the parameters.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="maxsparethreads"></a>`maxsparethreads`
 
@@ -2283,7 +2283,7 @@ Data type: `Any`
 
 Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Setting this to `false` removes the parameters.
 
-Default value: `'75'`
+Default value: `75`
 
 ##### <a name="threadsperchild"></a>`threadsperchild`
 
@@ -2291,7 +2291,7 @@ Data type: `Any`
 
 Number of threads created by each child process.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
@@ -2299,7 +2299,7 @@ Data type: `Any`
 
 Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
 
-Default value: `'0'`
+Default value: `0`
 
 ##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
@@ -2315,7 +2315,7 @@ Data type: `Any`
 
 Limits the configurable number of processes via the `ServerLimit` directive. Setting this to `false` removes the parameter.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="apache_version"></a>`apache_version`
 
@@ -2331,7 +2331,7 @@ Data type: `Any`
 
 Limits the number of event threads via the module's `ThreadLimit` directive. Setting this to `false` removes the parameter.
 
-Default value: `'64'`
+Default value: `64`
 
 ##### <a name="listenbacklog"></a>`listenbacklog`
 
@@ -2340,7 +2340,7 @@ Data type: `Any`
 Sets the maximum length of the pending connections queue via the module's `ListenBackLog` directive. Setting this to `false` removes
 the parameter.
 
-Default value: `'511'`
+Default value: `511`
 
 ### <a name="apachemodexpires"></a>`apache::mod::expires`
 
@@ -2900,7 +2900,7 @@ Data type: `Any`
 
 Number of child server processes created on startup.
 
-Default value: `'8'`
+Default value: `8`
 
 ##### <a name="minspareservers"></a>`minspareservers`
 
@@ -2908,7 +2908,7 @@ Data type: `Any`
 
 Minimum number of idle child server processes.
 
-Default value: `'5'`
+Default value: `5`
 
 ##### <a name="maxspareservers"></a>`maxspareservers`
 
@@ -2916,7 +2916,7 @@ Data type: `Any`
 
 Maximum number of idle child server processes.
 
-Default value: `'20'`
+Default value: `20`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
@@ -2924,7 +2924,7 @@ Data type: `Any`
 
 Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache httpd process.
 
-Default value: `'256'`
+Default value: `256`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -2932,7 +2932,7 @@ Data type: `Any`
 
 Limit on the number of simultaneous requests that will be served.
 
-Default value: `'256'`
+Default value: `256`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
@@ -2940,7 +2940,7 @@ Data type: `Any`
 
 Limit on the number of connections that an individual child server process will handle.
 
-Default value: `'4000'`
+Default value: `4000`
 
 ##### <a name="enablecapabilities"></a>`enablecapabilities`
 
@@ -3408,7 +3408,7 @@ Puppet file:
 ```
 $workers_file_content = {
   worker_lists    => ['status', 'some_name,other_name'],
-  worker_maintain => '60',
+  worker_maintain => 60,
   some_name       => {
     comment          => 'Optional comment',
     type             => 'ajp13',
@@ -3488,11 +3488,11 @@ class { 'apache::mod::ldap':
   ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
   ldap_trusted_global_cert_type => 'CA_DER',
   ldap_trusted_mode             => 'TLS',
-  ldap_shared_cache_size        => '500000',
-  ldap_cache_entries            => '1024',
-  ldap_cache_ttl                => '600',
-  ldap_opcache_entries          => '1024',
-  ldap_opcache_ttl              => '600',
+  ldap_shared_cache_size        => 500000,
+  ldap_cache_entries            => 1024,
+  ldap_cache_ttl                => 600,
+  ldap_opcache_entries          => 1024,
+  ldap_opcache_ttl              => 600,
 }
 ```
 
@@ -5290,7 +5290,7 @@ Data type: `Any`
 
 
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="minprocessors"></a>`minprocessors`
 
@@ -5298,7 +5298,7 @@ Data type: `Any`
 
 
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="maxprocessors"></a>`maxprocessors`
 
@@ -5306,7 +5306,7 @@ Data type: `Any`
 
 
 
-Default value: `'10'`
+Default value: `10`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -5314,7 +5314,7 @@ Data type: `Any`
 
 
 
-Default value: `'150'`
+Default value: `150`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
@@ -5322,7 +5322,7 @@ Data type: `Any`
 
 
 
-Default value: `'1000'`
+Default value: `1000`
 
 ##### <a name="idletimeout"></a>`idletimeout`
 
@@ -5330,7 +5330,7 @@ Data type: `Any`
 
 
 
-Default value: `'120'`
+Default value: `120`
 
 ##### <a name="expiretimeout"></a>`expiretimeout`
 
@@ -5338,7 +5338,7 @@ Data type: `Any`
 
 
 
-Default value: `'120'`
+Default value: `120`
 
 ##### <a name="keepalive"></a>`keepalive`
 
@@ -5478,7 +5478,7 @@ Data type: `Any`
 
 Number of child server processes created at startup.
 
-Default value: `'8'`
+Default value: `8`
 
 ##### <a name="minspareservers"></a>`minspareservers`
 
@@ -5486,7 +5486,7 @@ Data type: `Any`
 
 Minimum number of idle child server processes.
 
-Default value: `'5'`
+Default value: `5`
 
 ##### <a name="maxspareservers"></a>`maxspareservers`
 
@@ -5494,7 +5494,7 @@ Data type: `Any`
 
 Maximum number of idle child server processes.
 
-Default value: `'20'`
+Default value: `20`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
@@ -5502,7 +5502,7 @@ Data type: `Any`
 
 Upper limit on configurable number of processes.
 
-Default value: `'256'`
+Default value: `256`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -5510,7 +5510,7 @@ Data type: `Any`
 
 Old alias for MaxRequestWorkers.
 
-Default value: `'256'`
+Default value: `256`
 
 ##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
@@ -5526,7 +5526,7 @@ Data type: `Any`
 
 Old alias for MaxConnectionsPerChild.
 
-Default value: `'4000'`
+Default value: `4000`
 
 ##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
@@ -5550,7 +5550,7 @@ Data type: `Any`
 
 Maximum length of the queue of pending connections.
 
-Default value: `'511'`
+Default value: `511`
 
 ### <a name="apachemodproxy"></a>`apache::mod::proxy`
 
@@ -6159,7 +6159,7 @@ Data type: `Any`
 
 Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
-Default value: `'5'`
+Default value: `5`
 
 ##### <a name="outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
 
@@ -6167,7 +6167,7 @@ Data type: `Any`
 
 Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
-Default value: `'4'`
+Default value: `4`
 
 ##### <a name="critical_anomaly_score"></a>`critical_anomaly_score`
 
@@ -6175,7 +6175,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a critical severity.
 
-Default value: `'5'`
+Default value: `5`
 
 ##### <a name="error_anomaly_score"></a>`error_anomaly_score`
 
@@ -6183,7 +6183,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a error severity.
 
-Default value: `'4'`
+Default value: `4`
 
 ##### <a name="warning_anomaly_score"></a>`warning_anomaly_score`
 
@@ -6191,7 +6191,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a warning severity.
 
-Default value: `'3'`
+Default value: `3`
 
 ##### <a name="notice_anomaly_score"></a>`notice_anomaly_score`
 
@@ -6199,7 +6199,7 @@ Data type: `Any`
 
 Sets the Anomaly Score for rules assigned with a notice severity.
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="secrequestmaxnumargs"></a>`secrequestmaxnumargs`
 
@@ -6207,7 +6207,7 @@ Data type: `Any`
 
 Sets the maximum number of arguments in the request.
 
-Default value: `'255'`
+Default value: `255`
 
 ##### <a name="secrequestbodylimit"></a>`secrequestbodylimit`
 
@@ -6215,7 +6215,7 @@ Data type: `Any`
 
 Sets the maximum request body size ModSecurity will accept for buffering.
 
-Default value: `'13107200'`
+Default value: `13107200`
 
 ##### <a name="secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
 
@@ -6224,7 +6224,7 @@ Data type: `Any`
 Configures the maximum request body size ModSecurity will accept for buffering, excluding the size of any files being transported
 in the request.
 
-Default value: `'131072'`
+Default value: `131072`
 
 ##### <a name="secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
 
@@ -6232,7 +6232,7 @@ Data type: `Any`
 
 Configures the maximum request body size that ModSecurity will store in memory.
 
-Default value: `'131072'`
+Default value: `131072`
 
 ##### <a name="manage_security_crs"></a>`manage_security_crs`
 
@@ -6481,7 +6481,7 @@ Data type: `Any`
 
 Pseudo Random Number Generator (PRNG) seeding source.
 
-Default value: `'512'`
+Default value: `512`
 
 ##### <a name="ssl_sessioncache"></a>`ssl_sessioncache`
 
@@ -6497,7 +6497,7 @@ Data type: `Any`
 
 Number of seconds before an SSL session expires in the Session Cache.
 
-Default value: `'300'`
+Default value: `300`
 
 ##### <a name="ssl_stapling"></a>`ssl_stapling`
 
@@ -6850,7 +6850,7 @@ Data type: `Any`
 
 The number of child server processes created on startup
 
-Default value: `'2'`
+Default value: `2`
 
 ##### <a name="maxclients"></a>`maxclients`
 
@@ -6860,7 +6860,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.
 
-Default value: `'150'`
+Default value: `150`
 
 ##### <a name="minsparethreads"></a>`minsparethreads`
 
@@ -6868,7 +6868,7 @@ Data type: `Any`
 
 Minimum number of idle threads to handle request spikes.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="maxsparethreads"></a>`maxsparethreads`
 
@@ -6876,7 +6876,7 @@ Data type: `Any`
 
 Maximum number of idle threads.
 
-Default value: `'75'`
+Default value: `75`
 
 ##### <a name="threadsperchild"></a>`threadsperchild`
 
@@ -6884,7 +6884,7 @@ Data type: `Any`
 
 The number of threads created by each child process.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
@@ -6894,7 +6894,7 @@ Limit on the number of connectiojns an individual child server
 process will handle. This is the old name and is still supported. The new
 name is MaxConnectionsPerChild as of 2.3.9+.
 
-Default value: `'0'`
+Default value: `0`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
@@ -6906,7 +6906,7 @@ and ThreadsPerChild settings require more than 16 server processes
 number of server processes required by what you may want for
 MaxRequestWorkers and ThreadsPerChild.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="threadlimit"></a>`threadlimit`
 
@@ -6915,7 +6915,7 @@ Data type: `Any`
 This directive sets the maximum configured value for
 ThreadsPerChild for the lifetime of the Apache httpd process.
 
-Default value: `'64'`
+Default value: `64`
 
 ##### <a name="listenbacklog"></a>`listenbacklog`
 
@@ -6923,7 +6923,7 @@ Data type: `Any`
 
 Maximum length of the queue of pending connections.
 
-Default value: `'511'`
+Default value: `511`
 
 ##### <a name="apache_version"></a>`apache_version`
 
@@ -7055,7 +7055,7 @@ class { 'apache::vhosts':
   vhosts => {
     'custom_vhost_1' => {
       'docroot' => '/var/www/custom_vhost_1',
-      'port'    => '81',
+      'port'    => 81,
     },
   },
 }
@@ -7284,7 +7284,7 @@ Sets the configuration file's priority by prefixing its filename with this param
 numeric value, as Apache processes configuration files in alphanumeric order.<br />
 To omit the priority prefix in the configuration file's name, set this parameter to `false`.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="source"></a>`source`
 
@@ -9416,7 +9416,7 @@ If nothing matches the priority, the first name-based virtual host is used. Like
 passing a higher priority causes the alphabetically first name-based virtual host to be
 used if no other names match.<br />
 > **Note:** You should not need to use this parameter. However, if you do use it, be
-aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
+aware that the `default_vhost` parameter for `apache::vhost` passes a priority of 15.<br />
 To omit the priority prefix in file names, pass a priority of `false`.
 
 Default value: ``undef``
@@ -9463,7 +9463,7 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/l', 'url' => 'http://backend-xy',
       'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
     { 'path' => '/d', 'url' => 'http://backend-a/d',
-      'params' => { 'retry' => '0', 'timeout' => '5' }, },
+      'params' => { 'retry' => 0, 'timeout' => 5 }, },
     { 'path' => '/e', 'url' => 'http://backend-a/e',
       'keywords' => ['nocanon', 'interpolate'] },
     { 'path' => '/f', 'url' => 'http://backend-f/',
@@ -9561,7 +9561,7 @@ and redirectmatch_dest.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
   ...
-  redirectmatch_status => ['404','404'],
+  redirectmatch_status => ['404', '404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
@@ -9579,7 +9579,7 @@ and redirectmatch_dest.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
   ...
-  redirectmatch_status => ['404','404'],
+  redirectmatch_status => ['404', '404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
@@ -9597,7 +9597,7 @@ and redirectmatch_regexp.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
   ...
-  redirectmatch_status => ['404','404'],
+  redirectmatch_status => ['404', '404'],
   redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
   redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
 }
@@ -9875,7 +9875,7 @@ working together with suphp_configpath and suphp_engine.<br />
 An example virtual host configuration with suPHP:
 ``` puppet
 apache::vhost { 'suphp.example.com':
-  port             => '80',
+  port             => 80,
   docroot          => '/home/appuser/myphpapp',
   suphp_addhandler => 'x-httpd-php',
   suphp_engine     => 'on',
@@ -9897,7 +9897,7 @@ working together with suphp_addhandler and suphp_engine.<br />
 An example virtual host configuration with suPHP:
 ``` puppet
 apache::vhost { 'suphp.example.com':
-  port             => '80',
+  port             => 80,
   docroot          => '/home/appuser/myphpapp',
   suphp_addhandler => 'x-httpd-php',
   suphp_engine     => 'on',
@@ -9919,7 +9919,7 @@ working together with suphp_configpath and suphp_addhandler.<br />
 An example virtual host configuration with suPHP:
 ``` puppet
 apache::vhost { 'suphp.example.com':
-  port             => '80',
+  port             => 80,
   docroot          => '/home/appuser/myphpapp',
   suphp_addhandler => 'x-httpd-php',
   suphp_engine     => 'on',
@@ -9954,7 +9954,7 @@ set for `docroot` in the manifest. See [`virtual_use_default_docroot`](#virtual_
 ``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
-  port            => '80',
+  port            => 80,
   virtual_docroot => '/var/www/%-2+',
   docroot         => '/var/www',
   serveraliases   => ['*.loc',],
@@ -9972,7 +9972,7 @@ to `true` will mean both directives will be added to the configuration.
 ``` puppet
 apache::vhost { 'subdomain.loc':
   vhost_name                  => '*',
-  port                        => '80',
+  port                        => 80,
   virtual_docroot             => '/var/www/%-2+',
   docroot                     => '/var/www',
   virtual_use_default_docroot => true,
@@ -9994,12 +9994,12 @@ A hash that sets the name of the WSGI daemon, accepting
 An example virtual host configuration with WSGI:
 ``` puppet
 apache::vhost { 'wsgi.example.com':
-  port                        => '80',
+  port                        => 80,
   docroot                     => '/var/www/pythonapp',
   wsgi_daemon_process         => 'wsgi',
   wsgi_daemon_process_options =>
-    { processes    => '2',
-      threads      => '15',
+    { processes    => 2,
+      threads      => 15,
       display-name => '%{GROUP}',
     },
   wsgi_process_group          => 'wsgi',
@@ -10853,7 +10853,7 @@ Data type: `Any`
 
 Sets the relative load order for Apache HTTPD VirtualHost configuration files.
 
-Default value: `'25'`
+Default value: `25`
 
 ##### <a name="verify_config"></a>`verify_config`
 
@@ -10886,11 +10886,11 @@ apache::vhost::fragment { 'myfragment':
 ```puppet
 include apache
 apache::vhost { 'myvhost':
-  priority => '42',
+  priority => 42,
 }
 apache::vhost::fragment { 'myfragment':
   vhost    => 'myvhost',
-  priority => '42',
+  priority => 42,
   content  => '# Foo',
 }
 ```
@@ -10904,7 +10904,7 @@ apache::vhost { 'myvhost':
 }
 apache::vhost::fragment { 'myfragment':
   vhost    => 'myvhost',
-  priority => '10', # default_vhost implies priority 10
+  priority => 10, # default_vhost implies priority 10
   content  => '# Foo',
 }
 ```
@@ -10915,7 +10915,7 @@ apache::vhost::fragment { 'myfragment':
 include apache
 apache::vhost::fragment { 'myfragment':
   vhost    => 'default',
-  priority => '15',
+  priority => 15,
   content  => '# Foo',
 }
 ```
@@ -11278,8 +11278,8 @@ Struct[{
     Optional['StateTimeout']                            => Integer,
     Optional['ScrubRequestHeaders']                     => Enum['On','Off'],
     Optional['OutgoingProxy']                           => String,
-    Optional['UnAuthAction']                            => Enum['auth','pass','401','410'],
-    Optional['UnAuthzAction']                           => Enum['401','403','auth'],
+    Optional['UnAuthAction']                            => Enum['auth','pass','401', '410'],
+    Optional['UnAuthzAction']                           => Enum['401', '403', 'auth'],
     Optional['PreservePost']                            => Enum['On','Off'],
     Optional['PassRefreshToken']                        => Enum['On','Off'],
     Optional['RequestObject']                           => String,
diff --git a/examples/vhost.pp b/examples/vhost.pp
index c0813d1608..306866b6ba 100644
--- a/examples/vhost.pp
+++ b/examples/vhost.pp
@@ -9,13 +9,13 @@
 
 # Most basic vhost
 apache::vhost { 'first.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/first',
 }
 
 # Vhost with different docroot owner/group/mode
 apache::vhost { 'second.example.com':
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/second',
   docroot_owner => 'third',
   docroot_group => 'third',
@@ -24,21 +24,21 @@
 
 # Vhost with serveradmin
 apache::vhost { 'third.example.com':
-  port        => '80',
+  port        => 80,
   docroot     => '/var/www/third',
   serveradmin => 'admin@example.com',
 }
 
 # Vhost with ssl (uses default ssl certs)
 apache::vhost { 'ssl.example.com':
-  port    => '443',
+  port    => 443,
   docroot => '/var/www/ssl',
   ssl     => true,
 }
 
 # Vhost with ssl and specific ssl certs
 apache::vhost { 'fourth.example.com':
-  port     => '443',
+  port     => 443,
   docroot  => '/var/www/fourth',
   ssl      => true,
   ssl_cert => '/etc/ssl/fourth.example.com.cert',
@@ -48,7 +48,7 @@
 # Vhost with english title and servername parameter
 apache::vhost { 'The fifth vhost':
   servername => 'fifth.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fifth',
 }
 
@@ -58,13 +58,13 @@
     'sixth.example.org',
     'sixth.example.net',
   ],
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/fifth',
 }
 
 # Vhost with alternate options
 apache::vhost { 'seventh.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/seventh',
   options => [
     'Indexes',
@@ -74,14 +74,14 @@
 
 # Vhost with AllowOverride for .htaccess
 apache::vhost { 'eighth.example.com':
-  port     => '80',
+  port     => 80,
   docroot  => '/var/www/eighth',
   override => 'All',
 }
 
 # Vhost with access and error logs disabled
 apache::vhost { 'ninth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/ninth',
   access_log => false,
   error_log  => false,
@@ -89,7 +89,7 @@
 
 # Vhost with custom access and error logs and logroot
 apache::vhost { 'tenth.example.com':
-  port            => '80',
+  port            => 80,
   docroot         => '/var/www/tenth',
   access_log_file => 'tenth_vhost.log',
   error_log_file  => 'tenth_vhost_error.log',
@@ -98,14 +98,14 @@
 
 # Vhost with a cgi-bin
 apache::vhost { 'eleventh.example.com':
-  port        => '80',
+  port        => 80,
   docroot     => '/var/www/eleventh',
   scriptalias => '/usr/lib/cgi-bin',
 }
 
 # Vhost with a proxypass configuration
 apache::vhost { 'twelfth.example.com':
-  port          => '80',
+  port          => 80,
   docroot       => '/var/www/twelfth',
   proxy_dest    => 'http://internal.example.com:8080/twelfth',
   no_proxy_uris => ['/login','/logout'],
@@ -113,7 +113,7 @@
 
 # Vhost to redirect /login and /logout
 apache::vhost { 'thirteenth.example.com':
-  port            => '80',
+  port            => 80,
   docroot         => '/var/www/thirteenth',
   redirect_source => [
     '/login',
@@ -127,7 +127,7 @@
 
 # Vhost to permamently redirect
 apache::vhost { 'fourteenth.example.com':
-  port            => '80',
+  port            => 80,
   docroot         => '/var/www/fourteenth',
   redirect_source => '/blog',
   redirect_dest   => 'http://blog.example.com',
@@ -136,7 +136,7 @@
 
 # Vhost with a rack configuration
 apache::vhost { 'fifteenth.example.com':
-  port           => '80',
+  port           => 80,
   docroot        => '/var/www/fifteenth',
   rack_base_uris => ['/rackapp1', '/rackapp2'],
 }
@@ -144,7 +144,7 @@
 # Vhost to redirect non-ssl to ssl
 apache::vhost { 'sixteenth.example.com non-ssl':
   servername => 'sixteenth.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/sixteenth',
   rewrites   => [
     {
@@ -158,7 +158,7 @@
 # Rewrite a URL to lower case
 apache::vhost { 'sixteenth.example.com non-ssl':
   servername => 'sixteenth.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/sixteenth',
   rewrites   => [
     { comment      => 'Rewrite to lower case',
@@ -171,7 +171,7 @@
 
 apache::vhost { 'sixteenth.example.com ssl':
   servername => 'sixteenth.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/sixteenth',
   ssl        => true,
 }
@@ -179,41 +179,41 @@
 # Vhost to redirect non-ssl to ssl using old rewrite method
 apache::vhost { 'sixteenth.example.com non-ssl old rewrite':
   servername   => 'sixteenth.example.com',
-  port         => '80',
+  port         => 80,
   docroot      => '/var/www/sixteenth',
   rewrite_cond => '%{HTTPS} off',
   rewrite_rule => '(.*) https://%{HTTP_HOST}%{REQUEST_URI}',
 }
 apache::vhost { 'sixteenth.example.com ssl old rewrite':
   servername => 'sixteenth.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/sixteenth',
   ssl        => true,
 }
 
 # Vhost to block repository files
 apache::vhost { 'seventeenth.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/seventeenth',
   block   => 'scm',
 }
 
 # Vhost with special environment variables
 apache::vhost { 'eighteenth.example.com':
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/eighteenth',
   setenv  => ['SPECIAL_PATH /foo/bin','KILROY was_here'],
 }
 
 apache::vhost { 'nineteenth.example.com':
-  port     => '80',
+  port     => 80,
   docroot  => '/var/www/nineteenth',
   setenvif => 'Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1',
 }
 
 # Vhost with additional include files
 apache::vhost { 'twentyieth.example.com':
-  port                => '80',
+  port                => 80,
   docroot             => '/var/www/twelfth',
   additional_includes => ['/tmp/proxy_group_a','/tmp/proxy_group_b'],
 }
@@ -222,7 +222,7 @@
 # http://example.com.loc => /var/www/example.com
 apache::vhost { 'subdomain.loc':
   vhost_name      => '*',
-  port            => '80',
+  port            => 80,
   virtual_docroot => '/var/www/%-2+',
   docroot         => '/var/www',
   serveraliases   => ['*.loc',],
@@ -230,9 +230,9 @@
 
 # Vhost with SSL (SSLProtocol, SSLCipherSuite & SSLHonorCipherOrder from default)
 apache::vhost { 'securedomain.com':
-  priority   => '10',
+  priority   => 10,
   vhost_name => 'www.securedomain.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/secure',
   ssl        => true,
   ssl_cert   => '/etc/ssl/securedomain.cert',
@@ -243,14 +243,14 @@
 
 # Vhost with access log environment variables writing control
 apache::vhost { 'twentyfirst.example.com':
-  port               => '80',
+  port               => 80,
   docroot            => '/var/www/twentyfirst',
   access_log_env_var => 'admin',
 }
 
 # Vhost with a passenger_base configuration
 apache::vhost { 'twentysecond.example.com':
-  port           => '80',
+  port           => 80,
   docroot        => '/var/www/twentysecond',
   rack_base_uris => ['/passengerapp1', '/passengerapp2'],
 }
diff --git a/examples/vhost_proxypass.pp b/examples/vhost_proxypass.pp
index ca9c57dff5..9cd0a18559 100644
--- a/examples/vhost_proxypass.pp
+++ b/examples/vhost_proxypass.pp
@@ -28,8 +28,8 @@
       'path'   => '/second',
       'url'    => 'http://localhost:8080/second',
       'params' => {
-        'retry'   => '0',
-        'timeout' => '5',
+        'retry'   => 0,
+        'timeout' => 5,
       }
     },
   ],
@@ -57,8 +57,8 @@
       'path'     => '/fourth',
       'url'      => 'http://localhost:8080/fourth',
       'params'   => {
-        'retry'   => '0',
-        'timeout' => '5',
+        'retry'   => 0,
+        'timeout' => 5,
       },
       'keywords' => ['noquery', 'interpolate']
     },
diff --git a/examples/vhost_ssl.pp b/examples/vhost_ssl.pp
index 8e7a2b279e..83584e73ce 100644
--- a/examples/vhost_ssl.pp
+++ b/examples/vhost_ssl.pp
@@ -10,14 +10,14 @@
 # Non-ssl vhost
 apache::vhost { 'first.example.com non-ssl':
   servername => 'first.example.com',
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/first',
 }
 
 # SSL vhost at the same domain
 apache::vhost { 'first.example.com ssl':
   servername => 'first.example.com',
-  port       => '443',
+  port       => 443,
   docroot    => '/var/www/first',
   ssl        => true,
 }
diff --git a/examples/vhosts_without_listen.pp b/examples/vhosts_without_listen.pp
index d42118bc2c..1ccb7f41ae 100644
--- a/examples/vhosts_without_listen.pp
+++ b/examples/vhosts_without_listen.pp
@@ -12,14 +12,14 @@
 apache::vhost { 'The first IP-based vhost, non-ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
-  port       => '80',
+  port       => 80,
   ip_based   => true,
   docroot    => '/var/www/first',
 }
 apache::vhost { 'The first IP-based vhost, ssl':
   servername => 'first.example.com',
   ip         => '10.0.0.10',
-  port       => '443',
+  port       => 443,
   ip_based   => true,
   docroot    => '/var/www/first-ssl',
   ssl        => true,
@@ -28,12 +28,12 @@
 # Two name-based vhost listening on 10.0.0.20
 apache::vhost { 'second.example.com':
   ip      => '10.0.0.20',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/second',
 }
 apache::vhost { 'third.example.com':
   ip      => '10.0.0.20',
-  port    => '80',
+  port    => 80,
   docroot => '/var/www/third',
 }
 
@@ -41,12 +41,12 @@
 # `add_listen => 'false'` to disable declaring "Listen 80" which will conflict
 # with the IP-based preceeding vhosts.
 apache::vhost { 'fourth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fourth',
   add_listen => false,
 }
 apache::vhost { 'fifth.example.com':
-  port       => '80',
+  port       => 80,
   docroot    => '/var/www/fifth',
   add_listen => false,
 }
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index b67e10b0d7..71fdd81c6d 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -46,7 +46,7 @@
   Hash $proxy_set = {},
   Boolean $collect_exported = true,
   Optional[String] $target = undef,
-  Array $options = [],
+  Array[Pattern[/=/]] $options = [],
 ) {
   include apache::mod::proxy_balancer
 
@@ -73,8 +73,8 @@
   }
 
   concat { "apache_balancer_${name}":
-    owner  => '0',
-    group  => '0',
+    owner  => 0,
+    group  => 0,
     path   => $_target,
     mode   => $apache::file_mode,
     notify => Class['Apache::Service'],
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index 29126ee043..fc4b6067d8 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -40,8 +40,8 @@
 #
 define apache::balancermember (
   String $balancer_cluster,
-  String $url = "http://${$facts['networking']['fqdn']}/",
-  Array $options = [],
+  Stdlib::HTTPUrl $url = "http://${$facts['networking']['fqdn']}/",
+  Array $options       = [],
 ) {
   concat::fragment { "BalancerMember ${name}":
     target  => "apache_balancer_${balancer_cluster}",
diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index dea32f7a65..48d39a2d27 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -49,18 +49,18 @@
 #   show_diff property for configuration file resource
 #
 define apache::custom_config (
-  Enum['absent', 'present'] $ensure         = 'present',
-  String $confdir                           = $apache::confd_dir,
-  Optional[String] $content                 = undef,
-  Variant[Integer,String,Boolean] $priority = '25',
-  Optional[String] $source                  = undef,
-  String $verify_command                    = $apache::params::verify_command,
-  Boolean $verify_config                    = true,
-  Optional[String] $filename                = undef,
-  Optional[String] $owner                   = undef,
-  Optional[String] $group                   = undef,
-  Optional[String] $file_mode               = undef,
-  Boolean $show_diff                        = true,
+  Enum['absent', 'present'] $ensure     = 'present',
+  Stdlib::Absolutepath $confdir         = $apache::confd_dir,
+  Optional[String] $content             = undef,
+  Variant[Integer, Boolean] $priority   = 25,
+  Optional[String] $source              = undef,
+  String $verify_command                = $apache::params::verify_command,
+  Boolean $verify_config                = true,
+  Optional[String] $filename            = undef,
+  Optional[String] $owner               = undef,
+  Optional[String] $group               = undef,
+  Optional[Stdlib::Filemode] $file_mode = undef,
+  Boolean $show_diff                    = true,
 ) {
   if $content and $source {
     fail('Only one of $content and $source can be specified.')
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 68bf56ac53..edf18b350d 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -3,10 +3,10 @@
 #
 # @api private
 class apache::default_mods (
-  Boolean $all                                  = true,
-  Optional[Variant[Array[String],String]] $mods = undef,
-  String $apache_version                        = $apache::apache_version,
-  Boolean $use_systemd                          = $apache::use_systemd,
+  Boolean $all                                   = true,
+  Optional[Variant[Array[String], String]] $mods = undef,
+  String $apache_version                         = $apache::apache_version,
+  Boolean $use_systemd                           = $apache::use_systemd,
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index 3e6af87af2..df7e5ce004 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -32,13 +32,13 @@
 #   Sets a header for the server
 #
 define apache::fastcgi::server (
-  String $host                  = '127.0.0.1:9000',
-  Integer $timeout              = 15,
-  Boolean $flush                = false,
-  String $faux_path             = "/var/www/${name}.fcgi",
-  String $fcgi_alias            = "/${name}.fcgi",
-  String $file_type             = 'application/x-httpd-php',
-  Optional[String] $pass_header = undef,
+  String $host                    = '127.0.0.1:9000',
+  Integer $timeout                = 15,
+  Boolean $flush                  = false,
+  Stdlib::Absolutepath $faux_path = "/var/www/${name}.fcgi",
+  Stdlib::Unixpath $fcgi_alias    = "/${name}.fcgi",
+  String $file_type               = 'application/x-httpd-php',
+  Optional[String] $pass_header   = undef,
 ) {
   include apache::mod::fastcgi
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 9a48af21ad..02f51dc7a3 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -461,94 +461,93 @@
 #   Specifies any idditional Internet media (mime) types that you wish to be configured.
 # 
 class apache (
-  String $apache_name                                                   = $apache::params::apache_name,
-  String $service_name                                                  = $apache::params::service_name,
-  Variant[Array,Boolean] $default_mods                                  = true,
-  Boolean $default_vhost                                                = true,
-  Optional[String] $default_charset                                     = undef,
-  Boolean $default_confd_files                                          = true,
-  Boolean $default_ssl_vhost                                            = false,
-  String $default_ssl_cert                                              = $apache::params::default_ssl_cert,
-  String $default_ssl_key                                               = $apache::params::default_ssl_key,
-  Optional[String] $default_ssl_chain                                   = undef,
-  Optional[String] $default_ssl_ca                                      = undef,
-  Optional[String] $default_ssl_crl_path                                = undef,
-  Optional[String] $default_ssl_crl                                     = undef,
-  Optional[String] $default_ssl_crl_check                               = undef,
-  Boolean $default_ssl_reload_on_change                                 = false,
-  String $default_type                                                  = 'none',
-  Optional[Variant[Array,String]] $dev_packages                         = $apache::params::dev_packages,
-  Optional[String] $ip                                                  = undef,
-  Boolean $service_enable                                               = true,
-  Boolean $service_manage                                               = true,
-  Variant[Boolean,String] $service_ensure                               = 'running',
-  Optional[String] $service_restart                                     = undef,
-  Boolean $purge_configs                                                = true,
-  Optional[Boolean] $purge_vhost_dir                                    = undef,
-  Boolean $purge_vdir                                                   = false,
-  String $serveradmin                                                   = 'root@localhost',
-  Enum['On', 'Off', 'on', 'off'] $sendfile                              = 'On',
-  Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert     = undef,
-  Optional[String] $ldap_trusted_mode                                   = undef,
-  Boolean $error_documents                                              = false,
-  Variant[Integer,String] $timeout                                      = '60',
-  String $httpd_dir                                                     = $apache::params::httpd_dir,
-  String $server_root                                                   = $apache::params::server_root,
-  String $conf_dir                                                      = $apache::params::conf_dir,
-  String $confd_dir                                                     = $apache::params::confd_dir,
-  Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups  = $apache::params::hostname_lookups,
-  Optional[String] $conf_enabled                                        = $apache::params::conf_enabled,
-  String $vhost_dir                                                     = $apache::params::vhost_dir,
-  Optional[String] $vhost_enable_dir                                    = $apache::params::vhost_enable_dir,
-  Hash $mod_libs                                                        = $apache::params::mod_libs,
-  Hash $mod_packages                                                    = $apache::params::mod_packages,
-  String $vhost_include_pattern                                         = $apache::params::vhost_include_pattern,
-  String $mod_dir                                                       = $apache::params::mod_dir,
-  Optional[String] $mod_enable_dir                                      = $apache::params::mod_enable_dir,
-  Variant[Boolean,String] $mpm_module                                   = $apache::params::mpm_module,
-  String $lib_path                                                      = $apache::params::lib_path,
-  String $conf_template                                                 = $apache::params::conf_template,
-  Optional[String] $servername                                          = $apache::params::servername,
-  String $pidfile                                                       = $apache::params::pidfile,
-  Optional[Stdlib::Absolutepath] $rewrite_lock                          = undef,
-  Boolean $manage_user                                                  = true,
-  Boolean $manage_group                                                 = true,
-  String $user                                                          = $apache::params::user,
-  String $group                                                         = $apache::params::group,
-  Optional[String] $http_protocol_options                               = $apache::params::http_protocol_options,
-  Array $supplementary_groups                                           = [],
-  String $keepalive                                                     = $apache::params::keepalive,
-  Variant[Integer,String] $keepalive_timeout                            = $apache::params::keepalive_timeout,
-  Variant[Integer,String] $max_keepalive_requests                       = $apache::params::max_keepalive_requests,
-  Variant[Integer,String] $limitreqfieldsize                            = '8190',
-  Variant[Integer,String] $limitreqfields                               = '100',
-  String $logroot                                                       = $apache::params::logroot,
-  Optional[String] $logroot_mode                                        = $apache::params::logroot_mode,
-  Apache::LogLevel $log_level                                           = $apache::params::log_level,
-  Hash $log_formats                                                     = {},
-  Optional[String] $ssl_file                                            = undef,
-  String $ports_file                                                    = $apache::params::ports_file,
-  String $docroot                                                       = $apache::params::docroot,
-  String $apache_version                                                = $apache::version::default,
-  String $server_tokens                                                 = 'Prod',
-  String $server_signature                                              = 'On',
-  String $trace_enable                                                  = 'On',
-  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes        = undef,
-  Optional[String] $file_e_tag                                          = undef,
-  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]
-  $use_canonical_name                                                   = undef,
-  String $package_ensure                                                = 'installed',
-  Boolean $use_optional_includes                                        = $apache::params::use_optional_includes,
-  Boolean $use_systemd                                                  = $apache::params::use_systemd,
-  Hash $mime_types_additional                                           = $apache::params::mime_types_additional,
-  String $file_mode                                                     = $apache::params::file_mode,
-  Array $root_directory_options                                         = $apache::params::root_directory_options,
-  Boolean $root_directory_secured                                       = false,
-  String $error_log                                                     = $apache::params::error_log,
-  String $scriptalias                                                   = $apache::params::scriptalias,
-  String $access_log_file                                               = $apache::params::access_log_file,
-  Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                = [],
-  Optional[Boolean] $protocols_honor_order                       = undef,
+  String $apache_name                                                        = $apache::params::apache_name,
+  String $service_name                                                       = $apache::params::service_name,
+  Variant[Array, Boolean] $default_mods                                      = true,
+  Boolean $default_vhost                                                     = true,
+  Optional[String] $default_charset                                          = undef,
+  Boolean $default_confd_files                                               = true,
+  Boolean $default_ssl_vhost                                                 = false,
+  Stdlib::Absolutepath $default_ssl_cert                                     = $apache::params::default_ssl_cert,
+  Stdlib::Absolutepath $default_ssl_key                                      = $apache::params::default_ssl_key,
+  Optional[Stdlib::Absolutepath] $default_ssl_chain                          = undef,
+  Optional[Stdlib::Absolutepath] $default_ssl_ca                             = undef,
+  Optional[Stdlib::Absolutepath] $default_ssl_crl_path                       = undef,
+  Optional[Stdlib::Absolutepath] $default_ssl_crl                            = undef,
+  Optional[String] $default_ssl_crl_check                                    = undef,
+  Boolean $default_ssl_reload_on_change                                      = false,
+  String $default_type                                                       = 'none',
+  Optional[Variant[Array, String]] $dev_packages                             = $apache::params::dev_packages,
+  Optional[String] $ip                                                       = undef,
+  Boolean $service_enable                                                    = true,
+  Boolean $service_manage                                                    = true,
+  Variant[Stdlib::Ensure::Service, Boolean] $service_ensure                  = 'running',
+  Optional[String] $service_restart                                          = undef,
+  Boolean $purge_configs                                                     = true,
+  Optional[Boolean] $purge_vhost_dir                                         = undef,
+  Boolean $purge_vdir                                                        = false,
+  String $serveradmin                                                        = 'root@localhost',
+  Enum['On', 'Off', 'on', 'off'] $sendfile                                   = 'On',
+  Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert          = undef,
+  Optional[String] $ldap_trusted_mode                                        = undef,
+  Boolean $error_documents                                                   = false,
+  Integer[0] $timeout                                                        = 60,
+  Stdlib::Absolutepath $httpd_dir                                            = $apache::params::httpd_dir,
+  Stdlib::Absolutepath $server_root                                          = $apache::params::server_root,
+  Stdlib::Absolutepath $conf_dir                                             = $apache::params::conf_dir,
+  Stdlib::Absolutepath $confd_dir                                            = $apache::params::confd_dir,
+  Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups       = $apache::params::hostname_lookups,
+  Optional[Stdlib::Absolutepath] $conf_enabled                               = $apache::params::conf_enabled,
+  Stdlib::Absolutepath $vhost_dir                                            = $apache::params::vhost_dir,
+  Optional[Stdlib::Absolutepath] $vhost_enable_dir                           = $apache::params::vhost_enable_dir,
+  Hash $mod_libs                                                             = $apache::params::mod_libs,
+  Hash $mod_packages                                                         = $apache::params::mod_packages,
+  String $vhost_include_pattern                                              = $apache::params::vhost_include_pattern,
+  Stdlib::Absolutepath $mod_dir                                              = $apache::params::mod_dir,
+  Optional[Stdlib::Absolutepath] $mod_enable_dir                             = $apache::params::mod_enable_dir,
+  Variant[Boolean, String] $mpm_module                                       = $apache::params::mpm_module,
+  String $lib_path                                                           = $apache::params::lib_path,
+  String $conf_template                                                      = $apache::params::conf_template,
+  Optional[String] $servername                                               = $apache::params::servername,
+  String $pidfile                                                            = $apache::params::pidfile,
+  Optional[Stdlib::Absolutepath] $rewrite_lock                               = undef,
+  Boolean $manage_user                                                       = true,
+  Boolean $manage_group                                                      = true,
+  String $user                                                               = $apache::params::user,
+  String $group                                                              = $apache::params::group,
+  Optional[String] $http_protocol_options                                    = $apache::params::http_protocol_options,
+  Array $supplementary_groups                                                = [],
+  Enum['On', 'Off'] $keepalive                                               = $apache::params::keepalive,
+  Integer $keepalive_timeout                                                 = $apache::params::keepalive_timeout,
+  Integer $max_keepalive_requests                                            = $apache::params::max_keepalive_requests,
+  Integer $limitreqfieldsize                                                 = 8190,
+  Integer $limitreqfields                                                    = 100,
+  Stdlib::Absolutepath $logroot                                              = $apache::params::logroot,
+  Optional[Stdlib::Filemode] $logroot_mode                                   = $apache::params::logroot_mode,
+  Apache::LogLevel $log_level                                                = $apache::params::log_level,
+  Hash $log_formats                                                          = {},
+  Optional[String] $ssl_file                                                 = undef,
+  Stdlib::Absolutepath $ports_file                                           = $apache::params::ports_file,
+  Stdlib::Absolutepath $docroot                                              = $apache::params::docroot,
+  String $apache_version                                                     = $apache::version::default,
+  Apache::ServerTokens $server_tokens                                        = 'Prod',
+  Variant[Enum['On', 'Off'], String] $server_signature                       = 'On',
+  Enum['On', 'Off', 'extended'] $trace_enable                                = 'On',
+  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes             = undef,
+  Optional[String] $file_e_tag                                               = undef,
+  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name = undef,
+  String $package_ensure                                                     = 'installed',
+  Boolean $use_optional_includes                                             = $apache::params::use_optional_includes,
+  Boolean $use_systemd                                                       = $apache::params::use_systemd,
+  Hash $mime_types_additional                                                = $apache::params::mime_types_additional,
+  Stdlib::Filemode $file_mode                                                = $apache::params::file_mode,
+  Array $root_directory_options                                              = $apache::params::root_directory_options,
+  Boolean $root_directory_secured                                            = false,
+  String $error_log                                                          = $apache::params::error_log,
+  String $scriptalias                                                        = $apache::params::scriptalias,
+  String $access_log_file                                                    = $apache::params::access_log_file,
+  Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                            = [],
+  Optional[Boolean] $protocols_honor_order                                   = undef,
 ) inherits apache::params {
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
@@ -825,12 +824,12 @@
 
     ::apache::vhost { 'default':
       ensure                       => $default_vhost_ensure,
-      port                         => '80',
+      port                         => 80,
       docroot                      => $docroot,
       scriptalias                  => $scriptalias,
       serveradmin                  => $serveradmin,
       access_log_file              => $access_log_file,
-      priority                     => '15',
+      priority                     => 15,
       ip                           => $ip,
       logroot_mode                 => $logroot_mode,
       manage_docroot               => $default_vhost,
@@ -843,13 +842,13 @@
     }
     ::apache::vhost { 'default-ssl':
       ensure                       => $default_ssl_vhost_ensure,
-      port                         => '443',
+      port                         => 443,
       ssl                          => true,
       docroot                      => $docroot,
       scriptalias                  => $scriptalias,
       serveradmin                  => $serveradmin,
       access_log_file              => $ssl_access_log_file,
-      priority                     => '15',
+      priority                     => 15,
       ip                           => $ip,
       logroot_mode                 => $logroot_mode,
       manage_docroot               => $default_ssl_vhost,
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 5271e8f2f8..79e5ec0da9 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -25,7 +25,7 @@
   Optional[String] $apache_version  = undef,
   String $icons_options             = 'Indexes MultiViews',
   # set icons_path to false to disable the alias
-  String $icons_path                = $apache::params::alias_icons_path,
+  Stdlib::Absolutepath $icons_path  = $apache::params::alias_icons_path,
   String $icons_prefix              = $apache::params::icons_prefix
 ) inherits apache::params {
   include apache
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index a85b9d3763..17df090237 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -88,7 +88,7 @@
   String $cas_login_url,
   String $cas_validate_url,
   String $cas_cookie_path                     = $apache::params::cas_cookie_path,
-  String $cas_cookie_path_mode                = '0750',
+  Stdlib::Filemode $cas_cookie_path_mode      = '0750',
   Integer $cas_version                        = 2,
   String $cas_debug                           = 'Off',
   Optional[String] $cas_validate_server       = undef,
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index d98a4ea3eb..81693d7d04 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -25,13 +25,13 @@
 # @see https://github.com/Uninett/mod_auth_mellon for additional documentation.
 #
 class apache::mod::auth_mellon (
-  Optional[Variant[String,Integer]] $mellon_cache_size  = $apache::params::mellon_cache_size,
-  Optional[String] $mellon_lock_file                    = $apache::params::mellon_lock_file,
-  Optional[String] $mellon_post_directory     = $apache::params::mellon_post_directory,
-  Optional[String] $mellon_cache_entry_size   = undef,
-  Optional[String] $mellon_post_ttl           = undef,
-  Optional[String] $mellon_post_size          = undef,
-  Optional[String] $mellon_post_count         = undef
+  Optional[Integer] $mellon_cache_size                  = $apache::params::mellon_cache_size,
+  Optional[Stdlib::Absolutepath] $mellon_lock_file      = $apache::params::mellon_lock_file,
+  Optional[Stdlib::Absolutepath] $mellon_post_directory = $apache::params::mellon_post_directory,
+  Optional[Integer] $mellon_cache_entry_size            = undef,
+  Optional[Integer] $mellon_post_ttl                    = undef,
+  Optional[Integer] $mellon_post_size                   = undef,
+  Optional[Integer] $mellon_post_count                  = undef
 ) inherits apache::params {
   include apache
   ::apache::mod { 'auth_mellon': }
diff --git a/manifests/mod/auth_openidc.pp b/manifests/mod/auth_openidc.pp
index 7311759323..7fa75b8303 100644
--- a/manifests/mod/auth_openidc.pp
+++ b/manifests/mod/auth_openidc.pp
@@ -3,8 +3,7 @@
 # 
 # @see https://github.com/zmartzone/mod_auth_openidc for additional documentation.
 #
-class apache::mod::auth_openidc (
-) inherits apache::params {
+class apache::mod::auth_openidc inherits apache::params {
   include apache
   include apache::mod::authz_user
   apache::mod { 'auth_openidc': }
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
index 73e06952fe..d775183ddd 100644
--- a/manifests/mod/authn_dbd.pp
+++ b/manifests/mod/authn_dbd.pp
@@ -29,13 +29,13 @@
 #
 class apache::mod::authn_dbd (
   Optional[String] $authn_dbd_params,
-  String $authn_dbd_dbdriver                  = 'mysql',
-  Optional[String] $authn_dbd_query           = undef,
-  Variant[String,Integer] $authn_dbd_min      = '4',
-  Variant[String,Integer]  $authn_dbd_max     = '20',
-  Variant[String,Integer]  $authn_dbd_keep    = '8',
-  Variant[String,Integer]  $authn_dbd_exptime = '300',
-  Optional[String] $authn_dbd_alias           = undef,
+  String $authn_dbd_dbdriver         = 'mysql',
+  Optional[String] $authn_dbd_query  = undef,
+  Integer $authn_dbd_min             = 4,
+  Integer $authn_dbd_max             = 20,
+  Integer $authn_dbd_keep            = 8,
+  Integer $authn_dbd_exptime         = 300,
+  Optional[String] $authn_dbd_alias  = undef,
 ) inherits apache::params {
   include apache
   include apache::mod::dbd
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index c12a0869e3..ab3ab0502c 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -10,8 +10,8 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html for additional documentation.
 # @note Unsupported platforms: RedHat: 6, 8, 9; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
 class apache::mod::authnz_ldap (
-  Boolean $verify_server_cert     = true,
-  Optional[String] $package_name  = undef,
+  Boolean $verify_server_cert    = true,
+  Optional[String] $package_name = undef,
 ) {
   include apache
   include 'apache::mod::ldap'
diff --git a/manifests/mod/cluster.pp b/manifests/mod/cluster.pp
index 2cc920b9a1..44eeef43be 100644
--- a/manifests/mod/cluster.pp
+++ b/manifests/mod/cluster.pp
@@ -51,15 +51,15 @@
 class apache::mod::cluster (
   String $allowed_network,
   String $balancer_name,
-  String $ip,
+  Stdlib::IP::Address $ip,
   String $version,
-  Boolean $enable_mcpm_receive          = true,
-  String $port                          = '6666',
-  Integer $keep_alive_timeout           = 60,
-  String $manager_allowed_network       = '127.0.0.1',
-  Integer $max_keep_alive_requests      = 0,
-  Boolean $server_advertise             = true,
-  Optional[String] $advertise_frequency = undef,
+  Boolean $enable_mcpm_receive                 = true,
+  Stdlib::Port $port                           = 6666,
+  Integer $keep_alive_timeout                  = 60,
+  Stdlib::IP::Address $manager_allowed_network = '127.0.0.1',
+  Integer $max_keep_alive_requests             = 0,
+  Boolean $server_advertise                    = true,
+  Optional[String] $advertise_frequency        = undef,
 ) {
   include apache
 
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index 0d0180050c..c5a6aaac8a 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -17,7 +17,7 @@
     'application/rss+xml',
     'application/json',
   ],
-  Hash $notes = {
+  Hash $notes          = {
     'Input'  => 'instream',
     'Output' => 'outstream',
     'Ratio'  => 'ratio',
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 044de457d1..0ae3cd4261 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -23,9 +23,9 @@
 # @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation.
 #
 class apache::mod::disk_cache (
-  Optional[String] $cache_root            = undef,
-  Optional[String] $cache_ignore_headers  = undef,
-  Boolean $default_cache_enable           = true,
+  Optional[Stdlib::Absolutepath] $cache_root = undef,
+  Optional[String] $cache_ignore_headers     = undef,
+  Boolean $default_cache_enable              = true,
 ) {
   include apache
   if $cache_root {
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 56c3c2b14f..20464fe051 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -47,18 +47,18 @@
 # @see https://httpd.apache.org/docs/current/mod/event.html for additional documentation.
 # @note Unsupported platforms: SLES: all
 class apache::mod::event (
-  Variant[String,Integer,Boolean] $startservers                     = '2',
-  Variant[String,Integer,Boolean] $maxclients                       = '150',
-  Optional[Variant[String,Integer,Boolean]] $maxrequestworkers      = undef,
-  Variant[String,Integer,Boolean] $minsparethreads                  = '25',
-  Variant[String,Integer,Boolean] $maxsparethreads                  = '75',
-  Variant[String,Integer,Boolean] $threadsperchild                  = '25',
-  Variant[String,Integer,Boolean] $maxrequestsperchild              = '0',
-  Optional[Variant[String,Integer,Boolean]] $maxconnectionsperchild = undef,
-  Variant[String,Integer,Boolean] $serverlimit                      = '25',
-  Optional[String] $apache_version                                  = undef,
-  Variant[String,Integer,Boolean]  $threadlimit                     = '64',
-  Variant[String,Integer,Boolean]  $listenbacklog                   = '511',
+  Variant[Integer, Boolean] $startservers                     = 2,
+  Variant[Integer, Boolean] $maxclients                       = 150,
+  Optional[Variant[Integer, Boolean]] $maxrequestworkers      = undef,
+  Variant[Integer, Boolean] $minsparethreads                  = 25,
+  Variant[Integer, Boolean] $maxsparethreads                  = 75,
+  Variant[Integer, Boolean] $threadsperchild                  = 25,
+  Variant[Integer, Boolean] $maxrequestsperchild              = 0,
+  Optional[Variant[Integer, Boolean]] $maxconnectionsperchild = undef,
+  Variant[Integer, Boolean] $serverlimit                      = 25,
+  Optional[String] $apache_version                            = undef,
+  Variant[Integer, Boolean]  $threadlimit                     = 64,
+  Variant[Integer, Boolean]  $listenbacklog                   = 511,
 ) {
   include apache
 
@@ -107,7 +107,7 @@
         }
       }
     }
-    'debian','freebsd' : {
+    'debian', 'freebsd' : {
       apache::mpm { 'event':
         apache_version => $_apache_version,
       }
diff --git a/manifests/mod/fastcgi.pp b/manifests/mod/fastcgi.pp
deleted file mode 100644
index a6de34fb0a..0000000000
--- a/manifests/mod/fastcgi.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# @summary
-#   Installs `mod_fastcgi`.
-# 
-# @see https://github.com/FastCGI-Archives/mod_fastcgi for additional documentation.
-#
-class apache::mod::fastcgi {
-  include apache
-  if ($facts['os']['family'] == 'Redhat' and versioncmp($facts['os']['release']['major'], '7') >= 0) {
-    fail('mod_fastcgi is no longer supported on el7 and above.')
-  }
-  if ($facts['os']['name'] == 'Ubuntu') {
-    fail('mod_fastcgi is no longer supported on Ubuntu 18.04 and above. Please use mod_proxy_fcgi')
-  }
-  # Debian specifies it's fastcgi lib path, but RedHat uses the default value
-  # with no config file
-  $fastcgi_lib_path = $apache::params::fastcgi_lib_path
-
-  ::apache::mod { 'fastcgi': }
-
-  if $fastcgi_lib_path {
-    # Template uses:
-    # - $fastcgi_server
-    # - $fastcgi_socket
-    # - $fastcgi_dir
-    file { 'fastcgi.conf':
-      ensure  => file,
-      path    => "${apache::mod_dir}/fastcgi.conf",
-      mode    => $apache::file_mode,
-      content => template('apache/mod/fastcgi.conf.erb'),
-      require => Exec["mkdir ${apache::mod_dir}"],
-      before  => File[$apache::mod_dir],
-      notify  => Class['apache::service'],
-    }
-  }
-}
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index cacf29af23..42050df5cd 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -28,14 +28,14 @@
 # @see https://dev.maxmind.com/geoip/legacy/mod_geoip2 for additional documentation.
 #
 class apache::mod::geoip (
-  Boolean $enable                               = false,
-  String $db_file                               = '/usr/share/GeoIP/GeoIP.dat',
-  String $flag                                  = 'Standard',
-  String $output                                = 'All',
-  Optional[String] $enable_utf8                 = undef,
-  Optional[String] $scan_proxy_headers          = undef,
-  Optional[String] $scan_proxy_header_field     = undef,
-  Optional[String] $use_last_xforwarededfor_ip  = undef,
+  Boolean $enable                              = false,
+  Stdlib::Absolutepath $db_file                = '/usr/share/GeoIP/GeoIP.dat',
+  String $flag                                 = 'Standard',
+  String $output                               = 'All',
+  Optional[String] $enable_utf8                = undef,
+  Optional[String] $scan_proxy_headers         = undef,
+  Optional[String] $scan_proxy_header_field    = undef,
+  Optional[String] $use_last_xforwarededfor_ip = undef,
 ) {
   include apache
   ::apache::mod { 'geoip': }
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 487f764276..abb5bb6404 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -17,10 +17,10 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_info.html for additional documentation.
 #
 class apache::mod::info (
-  Array[String] $allow_from         = ['127.0.0.1','::1'],
-  Optional[String] $apache_version  = undef,
-  Boolean $restrict_access          = true,
-  String $info_path                 = '/server-info',
+  Array[Stdlib::IP::Address] $allow_from = ['127.0.0.1', '::1'],
+  Optional[String] $apache_version       = undef,
+  Boolean $restrict_access               = true,
+  Stdlib::Unixpath $info_path            = '/server-info',
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index eb4285fb00..393e03150d 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -30,14 +30,14 @@
 # @see http://mpm-itk.sesse.net for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8, 9; SLES: all
 class apache::mod::itk (
-  Variant[String,Integer] $startservers                 = '8',
-  Variant[String,Integer] $minspareservers              = '5',
-  Variant[String,Integer] $maxspareservers              = '20',
-  Variant[String,Integer] $serverlimit                  = '256',
-  Variant[String,Integer] $maxclients                   = '256',
-  Variant[String,Integer] $maxrequestsperchild          = '4000',
-  Optional[Variant[Boolean,String]] $enablecapabilities = undef,
-  Optional[String] $apache_version                      = undef,
+  Integer $startservers                                  = 8,
+  Integer $minspareservers                               = 5,
+  Integer $maxspareservers                               = 20,
+  Integer $serverlimit                                   = 256,
+  Integer $maxclients                                    = 256,
+  Integer $maxrequestsperchild                           = 4000,
+  Optional[Variant[Boolean, String]] $enablecapabilities = undef,
+  Optional[String] $apache_version                       = undef,
 ) {
   include apache
 
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index 8f9a596dc1..a169b366f5 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -180,8 +180,8 @@
 #   Puppet file:
 #   ```
 #   $workers_file_content = {
-#     worker_lists    => ['status', 'some_name,other_name'],
-#     worker_maintain => '60',
+#     worker_lists    => ['status', 'some_name, other_name'],
+#     worker_maintain => 60,
 #     some_name       => {
 #       comment          => 'Optional comment',
 #       type             => 'ajp13',
@@ -271,13 +271,13 @@
 #
 class apache::mod::jk (
   # Binding to mod_jk
-  Optional[String] $ip                          = undef,
-  Integer          $port                        = 80,
+  Optional[Stdlib::IP::Address] $ip             = undef,
+  Stdlib::Port     $port                        = 80,
   Boolean          $add_listen                  = true,
   # Conf file content
   Optional[String] $workers_file                = undef,
   Hash $worker_property                         = {},
-  Optional[String] $logroot                     = undef,
+  Optional[Stdlib::Absolutepath] $logroot       = undef,
   String $shm_file                              = 'jk-runtime-status',
   Optional[String] $shm_size                    = undef,
   Optional[String] $mount_file                  = undef,
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 2677c392fe..14dcd7048b 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -39,27 +39,27 @@
 #     ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt',
 #     ldap_trusted_global_cert_type => 'CA_DER',
 #     ldap_trusted_mode             => 'TLS',
-#     ldap_shared_cache_size        => '500000',
-#     ldap_cache_entries            => '1024',
-#     ldap_cache_ttl                => '600',
-#     ldap_opcache_entries          => '1024',
-#     ldap_opcache_ttl              => '600',
+#     ldap_shared_cache_size        => 500000,
+#     ldap_cache_entries            => 1024,
+#     ldap_cache_ttl                => 600,
+#     ldap_opcache_entries          => 1024,
+#     ldap_opcache_ttl              => 600,
 #   }
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_ldap.html for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8, 9
 class apache::mod::ldap (
-  Optional[String] $apache_version                 = undef,
-  Optional[String] $package_name                   = undef,
-  Optional[String] $ldap_trusted_global_cert_file  = undef,
-  String $ldap_trusted_global_cert_type            = 'CA_BASE64',
-  Optional[String] $ldap_shared_cache_size         = undef,
-  Optional[String] $ldap_cache_entries             = undef,
-  Optional[String] $ldap_cache_ttl                 = undef,
-  Optional[String] $ldap_opcache_entries           = undef,
-  Optional[String] $ldap_opcache_ttl               = undef,
-  Optional[String] $ldap_trusted_mode              = undef,
-  String $ldap_path                                = '/ldap-status',
+  Optional[String] $apache_version                = undef,
+  Optional[String] $package_name                  = undef,
+  Optional[String] $ldap_trusted_global_cert_file = undef,
+  String $ldap_trusted_global_cert_type           = 'CA_BASE64',
+  Optional[Integer] $ldap_shared_cache_size       = undef,
+  Optional[Integer] $ldap_cache_entries           = undef,
+  Optional[Integer] $ldap_cache_ttl               = undef,
+  Optional[Integer] $ldap_opcache_entries         = undef,
+  Optional[Integer] $ldap_opcache_ttl             = undef,
+  Optional[String] $ldap_trusted_mode             = undef,
+  String $ldap_path                               = '/ldap-status',
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index c7660cd262..028bbeeb96 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -16,10 +16,10 @@
 # @see https://pagure.io/mod_nss for additional documentation.
 #
 class apache::mod::nss (
-  String $transfer_log          = "${apache::params::logroot}/access.log",
-  String $error_log             = "${apache::params::logroot}/error.log",
-  Optional[String] $passwd_file = undef,
-  Integer $port                 = 8443,
+  Stdlib::Absolutepath $transfer_log = "${apache::params::logroot}/access.log",
+  Stdlib::Absolutepath $error_log    = "${apache::params::logroot}/error.log",
+  Optional[String] $passwd_file      = undef,
+  Stdlib::Port $port                 = 8443,
 ) {
   include apache
   include apache::mod::mime
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index 43b6e4153a..117d8fb887 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -157,41 +157,41 @@
 # @see https://developers.google.com/speed/pagespeed/module/ for additional documentation.
 #
 class apache::mod::pagespeed (
-  String $inherit_vhost_config                  = 'on',
-  Boolean $filter_xhtml                         = false,
-  String $cache_path                            = '/var/cache/mod_pagespeed/',
-  String $log_dir                               = '/var/log/pagespeed',
-  Array $memcache_servers                       = [],
-  String $rewrite_level                         = 'CoreFilters',
-  Array $disable_filters                        = [],
-  Array $enable_filters                         = [],
-  Array $forbid_filters                         = [],
-  Integer $rewrite_deadline_per_flush_ms        = 10,
-  Optional[String] $additional_domains          = undef,
-  Integer $file_cache_size_kb                   = 102400,
-  Integer $file_cache_clean_interval_ms         = 3600000,
-  Integer $lru_cache_per_process                = 1024,
-  Integer $lru_cache_byte_limit                 = 16384,
-  Integer $css_flatten_max_bytes                = 2048,
-  Integer $css_inline_max_bytes                 = 2048,
-  Integer $css_image_inline_max_bytes           = 2048,
-  Integer $image_inline_max_bytes               = 2048,
-  Integer $js_inline_max_bytes                  = 2048,
-  Integer $css_outline_min_bytes                = 3000,
-  Integer $js_outline_min_bytes                 = 3000,
-  Integer $inode_limit                          = 500000,
-  Integer $image_max_rewrites_at_once           = 8,
-  Integer $num_rewrite_threads                  = 4,
-  Integer $num_expensive_rewrite_threads        = 4,
-  String $collect_statistics                    = 'on',
-  String $statistics_logging                    = 'on',
-  Array $allow_view_stats                       = [],
-  Array $allow_pagespeed_console                = [],
-  Array $allow_pagespeed_message                = [],
-  Integer $message_buffer_size                  = 100000,
-  Variant[Array,Hash] $additional_configuration = {},
-  Optional[String] $apache_version              = undef,
-  Optional[String] $package_ensure              = undef,
+  String $inherit_vhost_config                   = 'on',
+  Boolean $filter_xhtml                          = false,
+  Stdlib::Absolutepath $cache_path               = '/var/cache/mod_pagespeed/',
+  Stdlib::Absolutepath $log_dir                  = '/var/log/pagespeed',
+  Array $memcache_servers                        = [],
+  String $rewrite_level                          = 'CoreFilters',
+  Array $disable_filters                         = [],
+  Array $enable_filters                          = [],
+  Array $forbid_filters                          = [],
+  Integer $rewrite_deadline_per_flush_ms         = 10,
+  Optional[String] $additional_domains           = undef,
+  Integer $file_cache_size_kb                    = 102400,
+  Integer $file_cache_clean_interval_ms          = 3600000,
+  Integer $lru_cache_per_process                 = 1024,
+  Integer $lru_cache_byte_limit                  = 16384,
+  Integer $css_flatten_max_bytes                 = 2048,
+  Integer $css_inline_max_bytes                  = 2048,
+  Integer $css_image_inline_max_bytes            = 2048,
+  Integer $image_inline_max_bytes                = 2048,
+  Integer $js_inline_max_bytes                   = 2048,
+  Integer $css_outline_min_bytes                 = 3000,
+  Integer $js_outline_min_bytes                  = 3000,
+  Integer $inode_limit                           = 500000,
+  Integer $image_max_rewrites_at_once            = 8,
+  Integer $num_rewrite_threads                   = 4,
+  Integer $num_expensive_rewrite_threads         = 4,
+  String $collect_statistics                     = 'on',
+  String $statistics_logging                     = 'on',
+  Array $allow_view_stats                        = [],
+  Array $allow_pagespeed_console                 = [],
+  Array $allow_pagespeed_message                 = [],
+  Integer $message_buffer_size                   = 100000,
+  Variant[Array, Hash] $additional_configuration = {},
+  Optional[String] $apache_version               = undef,
+  Optional[String] $package_ensure               = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 9892ac9573..1b0047ed90 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -341,7 +341,7 @@
   Optional[String] $passenger_concurrency_model                                              = undef,
   String $passenger_conf_file                                                                = $apache::params::passenger_conf_file,
   Optional[String] $passenger_conf_package_file                                              = $apache::params::passenger_conf_package_file,
-  Optional[String] $passenger_data_buffer_dir                                                = undef,
+  Optional[Stdlib::Absolutepath] $passenger_data_buffer_dir                                  = undef,
   Optional[String] $passenger_debug_log_file                                                 = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_debugger                               = undef,
   Optional[String] $passenger_default_group                                                  = undef,
@@ -354,7 +354,7 @@
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_error_override                         = undef,
   Optional[String] $passenger_file_descriptor_log_file                                       = undef,
   Optional[String] $passenger_fly_with                                                       = undef,
-  Optional[Variant[Integer,String]] $passenger_force_max_concurrent_requests_per_process     = undef,
+  Optional[Variant[Integer, String]] $passenger_force_max_concurrent_requests_per_process    = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_friendly_error_pages                   = undef,
   Optional[String] $passenger_group                                                          = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_high_performance                       = undef,
@@ -363,41 +363,41 @@
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_load_shell_envvars                     = undef,
   Optional[Boolean] $passenger_preload_bundler                                               = undef,
   Optional[Stdlib::Absolutepath] $passenger_log_file                                         = undef,
-  Optional[Variant[Integer,String]] $passenger_log_level                                     = undef,
-  Optional[Variant[Integer,String]] $passenger_lve_min_uid                                   = undef,
-  Optional[Variant[Integer,String]] $passenger_max_instances                                 = undef,
-  Optional[Variant[Integer,String]] $passenger_max_instances_per_app                         = undef,
-  Optional[Variant[Integer,String]] $passenger_max_pool_size                                 = undef,
-  Optional[Variant[Integer,String]] $passenger_max_preloader_idle_time                       = undef,
-  Optional[Variant[Integer,String]] $passenger_max_request_queue_size                        = undef,
-  Optional[Variant[Integer,String]] $passenger_max_request_time                              = undef,
-  Optional[Variant[Integer,String]] $passenger_max_requests                                  = undef,
-  Optional[Variant[Integer,String]] $passenger_memory_limit                                  = undef,
+  Optional[Integer] $passenger_log_level                                                     = undef,
+  Optional[Integer] $passenger_lve_min_uid                                                   = undef,
+  Optional[Integer] $passenger_max_instances                                                 = undef,
+  Optional[Integer] $passenger_max_instances_per_app                                         = undef,
+  Optional[Integer] $passenger_max_pool_size                                                 = undef,
+  Optional[Integer] $passenger_max_preloader_idle_time                                       = undef,
+  Optional[Integer] $passenger_max_request_queue_size                                        = undef,
+  Optional[Integer] $passenger_max_request_time                                              = undef,
+  Optional[Integer] $passenger_max_requests                                                  = undef,
+  Optional[Integer] $passenger_memory_limit                                                  = undef,
   Optional[String] $passenger_meteor_app_settings                                            = undef,
-  Optional[Variant[Integer,String]] $passenger_min_instances                                 = undef,
+  Optional[Integer] $passenger_min_instances                                                 = undef,
   Optional[String] $passenger_nodejs                                                         = undef,
-  Optional[Variant[Integer,String]] $passenger_pool_idle_time                                = undef,
-  Optional[Variant[String,Array[String]]] $passenger_pre_start                               = undef,
+  Optional[Integer] $passenger_pool_idle_time                                                = undef,
+  Optional[Variant[String, Array[String]]] $passenger_pre_start                              = undef,
   Optional[String] $passenger_python                                                         = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resist_deployment_errors               = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resolve_symlinks_in_document_root      = undef,
-  Optional[Variant[Integer,String]] $passenger_response_buffer_high_watermark                = undef,
+  Optional[Variant[Integer, String]] $passenger_response_buffer_high_watermark               = undef,
   Optional[String] $passenger_restart_dir                                                    = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_rolling_restarts                       = undef,
   Optional[String] $passenger_root                                                           = $apache::params::passenger_root,
   Optional[String] $passenger_ruby                                                           = $apache::params::passenger_ruby,
   Optional[String] $passenger_security_update_check_proxy                                    = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_show_version_in_header                 = undef,
-  Optional[Variant[Integer,String]] $passenger_socket_backlog                                = undef,
+  Optional[Variant[Integer, String]] $passenger_socket_backlog                               = undef,
   Optional[String] $passenger_spawn_dir                                                      = undef,
   Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method     = undef,
-  Optional[Variant[Integer,String]] $passenger_start_timeout                                 = undef,
+  Optional[Integer] $passenger_start_timeout                                                 = undef,
   Optional[String] $passenger_startup_file                                                   = undef,
-  Optional[Variant[Integer,String]] $passenger_stat_throttle_rate                            = undef,
+  Optional[Integer] $passenger_stat_throttle_rate                                            = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_sticky_sessions                        = undef,
   Optional[String] $passenger_sticky_sessions_cookie_name                                    = undef,
   Optional[String] $passenger_sticky_sessions_cookie_attributes                              = undef,
-  Optional[Variant[Integer,String]] $passenger_thread_count                                  = undef,
+  Optional[Integer] $passenger_thread_count                                                  = undef,
   Optional[String] $passenger_use_global_queue                                               = undef,
   Optional[String] $passenger_user                                                           = undef,
   Optional[Enum['on', 'off', 'On', 'Off']] $passenger_user_switching                         = undef,
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 22e9d0f627..85573e67a0 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -22,14 +22,14 @@
 # @param keepalive
 # 
 class apache::mod::peruser (
-  Variant[Integer,String] $minspareprocessors   = '2',
-  Variant[Integer,String] $minprocessors        = '2',
-  Variant[Integer,String] $maxprocessors        = '10',
-  Variant[Integer,String] $maxclients           = '150',
-  Variant[Integer,String] $maxrequestsperchild  = '1000',
-  Variant[Integer,String] $idletimeout          = '120',
-  Variant[Integer,String] $expiretimeout        = '120',
-  String $keepalive                             = 'Off',
+  Integer $minspareprocessors  = 2,
+  Integer $minprocessors       = 2,
+  Integer $maxprocessors       = 10,
+  Integer $maxclients          = 150,
+  Integer $maxrequestsperchild = 1000,
+  Integer $idletimeout         = 120,
+  Integer $expiretimeout       = 120,
+  Enum['On', 'Off'] $keepalive = 'Off',
 ) {
   include apache
   case $facts['os']['family'] {
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index cb12eab092..844b207094 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -26,16 +26,16 @@
 # @param libphp_prefix
 #
 class apache::mod::php (
-  Optional[String] $package_name  = undef,
-  String $package_ensure          = 'present',
-  Optional[String] $path          = undef,
-  Array $extensions               = ['.php'],
-  Optional[String] $content       = undef,
-  String $template                = 'apache/mod/php.conf.erb',
-  Optional[String] $source        = undef,
-  Optional[String] $root_group    = $apache::params::root_group,
-  Optional[String] $php_version   = $apache::params::php_version,
-  String $libphp_prefix           = 'libphp'
+  Optional[String] $package_name = undef,
+  String $package_ensure         = 'present',
+  Optional[String] $path         = undef,
+  Array $extensions              = ['.php'],
+  Optional[String] $content      = undef,
+  String $template               = 'apache/mod/php.conf.erb',
+  Optional[String] $source       = undef,
+  Optional[String] $root_group   = $apache::params::root_group,
+  Optional[String] $php_version  = $apache::params::php_version,
+  String $libphp_prefix          = 'libphp'
 ) inherits apache::params {
   include apache
   if (versioncmp($php_version, '8') < 0) {
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index bffaf86ba7..f58c7007ef 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -34,16 +34,16 @@
 # @see https://httpd.apache.org/docs/current/mod/prefork.html for additional documentation.
 #
 class apache::mod::prefork (
-  Variant[Integer,String] $startservers                     = '8',
-  Variant[Integer,String] $minspareservers                  = '5',
-  Variant[Integer,String] $maxspareservers                  = '20',
-  Variant[Integer,String] $serverlimit                      = '256',
-  Variant[Integer,String] $maxclients                       = '256',
-  Optional[Variant[Integer,String]] $maxrequestworkers      = undef,
-  Variant[Integer,String] $maxrequestsperchild              = '4000',
-  Optional[Variant[Integer,String]] $maxconnectionsperchild = undef,
-  Optional[String] $apache_version                          = undef,
-  Variant[String,Integer] $listenbacklog                    = '511'
+  Integer $startservers                     = 8,
+  Integer $minspareservers                  = 5,
+  Integer $maxspareservers                  = 20,
+  Integer $serverlimit                      = 256,
+  Integer $maxclients                       = 256,
+  Optional[Integer] $maxrequestworkers      = undef,
+  Integer $maxrequestsperchild              = 4000,
+  Optional[Integer] $maxconnectionsperchild = undef,
+  Optional[String] $apache_version          = undef,
+  Integer $listenbacklog                    = 511
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 1616f69d84..de7947a4fc 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -16,10 +16,10 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html for additional documentation.
 #
 class apache::mod::proxy_balancer (
-  Boolean $manager                   = false,
-  Stdlib::Absolutepath $manager_path = '/balancer-manager',
-  Array $allow_from                  = ['127.0.0.1','::1'],
-  Optional[String] $apache_version   = $apache::apache_version,
+  Boolean $manager                       = false,
+  Stdlib::Unixpath $manager_path         = '/balancer-manager',
+  Array[Stdlib::IP::Address] $allow_from = ['127.0.0.1', '::1'],
+  Optional[String] $apache_version       = $apache::apache_version,
 ) {
   require apache::mod::proxy
   require apache::mod::proxy_http
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index fc64cfbfc8..3e303b67e3 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -7,7 +7,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html for additional documentation.
 #
 class apache::mod::reqtimeout (
-  Variant[Array[String],String] $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
+  Variant[Array[String], String] $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
 ) {
   include apache
   ::apache::mod { 'reqtimeout': }
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index 7fa97b132b..8cc8717d91 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -16,8 +16,8 @@
 # @see https://github.com/gnif/mod_rpaf for additional documentation.
 #
 class apache::mod::rpaf (
-  Variant[Boolean,String] $sethostname  = true,
-  Array[String] $proxy_ips              = ['127.0.0.1'],
+  Variant[Boolean, String] $sethostname = true,
+  Array[Stdlib::IP::Address] $proxy_ips = ['127.0.0.1'],
   String $header                        = 'X-Forwarded-For',
   String $template                      = 'apache/mod/rpaf.conf.erb'
 ) {
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index da78ddc120..f1bcdbcd71 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -94,18 +94,18 @@
 # @see https://github.com/SpiderLabs/ModSecurity/wiki for additional documentation.
 #
 class apache::mod::security (
-  String $logroot                                       = $apache::params::logroot,
+  Stdlib::Absolutepath $logroot                         = $apache::params::logroot,
   Integer $version                                      = $apache::params::modsec_version,
   Optional[String] $crs_package                         = $apache::params::modsec_crs_package,
   Array[String] $activated_rules                        = $apache::params::modsec_default_rules,
   Boolean $custom_rules                                 = $apache::params::modsec_custom_rules,
   Optional[Array[String]] $custom_rules_set             = $apache::params::modsec_custom_rules_set,
-  String $modsec_dir                                    = $apache::params::modsec_dir,
+  Stdlib::Absolutepath $modsec_dir                      = $apache::params::modsec_dir,
   String $modsec_secruleengine                          = $apache::params::modsec_secruleengine,
   String $audit_log_relevant_status                     = '^(?:5|4(?!04))',
   String $audit_log_parts                               = $apache::params::modsec_audit_log_parts,
   String $audit_log_type                                = $apache::params::modsec_audit_log_type,
-  Optional[String] $audit_log_storage_dir               = undef,
+  Optional[Stdlib::Absolutepath] $audit_log_storage_dir = undef,
   Integer $secpcrematchlimit                            = $apache::params::secpcrematchlimit,
   Integer $secpcrematchlimitrecursion                   = $apache::params::secpcrematchlimitrecursion,
   String $allowed_methods                               = 'GET HEAD POST OPTIONS',
@@ -113,16 +113,16 @@
   String $restricted_extensions                         = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
   String $restricted_headers                            = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
   String $secdefaultaction                              = 'deny',
-  Variant[String,Integer] $inbound_anomaly_threshold    = '5',
-  Variant[String,Integer] $outbound_anomaly_threshold   = '4',
-  Variant[String,Integer] $critical_anomaly_score       = '5',
-  Variant[String,Integer] $error_anomaly_score          = '4',
-  Variant[String,Integer] $warning_anomaly_score        = '3',
-  Variant[String,Integer] $notice_anomaly_score         = '2',
-  Variant[String,Integer] $secrequestmaxnumargs         = '255',
-  Variant[String,Integer] $secrequestbodylimit          = '13107200',
-  Variant[String,Integer] $secrequestbodynofileslimit   = '131072',
-  Variant[String,Integer] $secrequestbodyinmemorylimit  = '131072',
+  Integer $inbound_anomaly_threshold                    = 5,
+  Integer $outbound_anomaly_threshold                   = 4,
+  Integer $critical_anomaly_score                       = 5,
+  Integer $error_anomaly_score                          = 4,
+  Integer $warning_anomaly_score                        = 3,
+  Integer $notice_anomaly_score                         = 2,
+  Integer $secrequestmaxnumargs                         = 255,
+  Integer $secrequestbodylimit                          = 13107200,
+  Integer $secrequestbodynofileslimit                   = 131072,
+  Integer $secrequestbodyinmemorylimit                  = 131072,
   Boolean $manage_security_crs                          = true,
 ) inherits apache::params {
   include apache
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index ea94344a87..1bcbe327c4 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -24,10 +24,10 @@
 # @see https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig for additional documentation.
 # @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Debian: 7, 8; Ubuntu: all; OracleLinux: all
 class apache::mod::shib (
-  Boolean $suppress_warning       = false,
-  Optional[String] $mod_full_path = undef,
-  Optional[String] $package_name  = undef,
-  Optional[String] $mod_lib       = undef,
+  Boolean $suppress_warning                     = false,
+  Optional[Stdlib::Absolutepath] $mod_full_path = undef,
+  Optional[String] $package_name                = undef,
+  Optional[String] $mod_lib                     = undef,
 ) {
   include apache
   if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 27d8bac601..c91fb3fb33 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -92,17 +92,17 @@
   String $ssl_cryptodevice                                  = 'builtin',
   Array[String] $ssl_options                                = ['StdEnvVars'],
   Optional[String] $ssl_openssl_conf_cmd                    = undef,
-  Optional[String] $ssl_cert                                = undef,
-  Optional[String] $ssl_key                                 = undef,
-  Optional[String] $ssl_ca                                  = undef,
+  Optional[Stdlib::Absolutepath] $ssl_cert                  = undef,
+  Optional[Stdlib::Absolutepath] $ssl_key                   = undef,
+  Optional[Stdlib::Absolutepath] $ssl_ca                    = undef,
   String $ssl_cipher                                        = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
   Array[String] $ssl_protocol                               = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
   String $ssl_pass_phrase_dialog                            = 'builtin',
-  Variant[Integer,String] $ssl_random_seed_bytes            = '512',
+  Integer $ssl_random_seed_bytes                            = 512,
   String $ssl_sessioncache                                  = $apache::params::ssl_sessioncache,
-  Variant[Integer,String] $ssl_sessioncachetimeout          = '300',
+  Integer $ssl_sessioncachetimeout                          = 300,
   Boolean $ssl_stapling                                     = false,
   Optional[String] $stapling_cache                          = undef,
   Optional[Boolean] $ssl_stapling_return_errors             = undef,
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 4cd4c144a4..d9c741c23e 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -50,7 +50,7 @@
   ::apache::mod { 'status': }
 
   # Defaults for "Allow from" or "Require" directives
-  $allow_defaults = ['127.0.0.1','::1']
+  $allow_defaults = ['127.0.0.1', '::1']
   $requires_defaults = 'ip 127.0.0.1 ::1'
 
   # Template uses $allow_from, $extended_status, $_apache_version, $status_path
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 898c184d15..2b1ca24fe4 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -43,16 +43,16 @@
 # @see https://httpd.apache.org/docs/current/mod/worker.html for additional documentation.
 #
 class apache::mod::worker (
-  Variant[Integer,String] $startservers        = '2',
-  Variant[Integer,String] $maxclients          = '150',
-  Variant[Integer,String] $minsparethreads     = '25',
-  Variant[Integer,String] $maxsparethreads     = '75',
-  Variant[Integer,String] $threadsperchild     = '25',
-  Variant[Integer,String] $maxrequestsperchild = '0',
-  Variant[Integer,String] $serverlimit         = '25',
-  Variant[Integer,String] $threadlimit         = '64',
-  Variant[Integer,String] $listenbacklog       = '511',
-  Optional[String] $apache_version             = undef,
+  Integer $startservers            = 2,
+  Integer $maxclients              = 150,
+  Integer $minsparethreads         = 25,
+  Integer $maxsparethreads         = 75,
+  Integer $threadsperchild         = 25,
+  Integer $maxrequestsperchild     = 0,
+  Integer $serverlimit             = 25,
+  Integer $threadlimit             = 64,
+  Integer $listenbacklog           = 511,
+  Optional[String] $apache_version = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index d582702273..404df2381a 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -28,14 +28,14 @@
 # @see https://github.com/GrahamDumpleton/mod_wsgi for additional documentation.
 # @note Unsupported platforms: SLES: all; RedHat: all; CentOS: all; OracleLinux: all; Scientific: all
 class apache::mod::wsgi (
-  Optional[String] $wsgi_restrict_embedded                = undef,
-  Optional[String] $wsgi_socket_prefix                    = $apache::params::wsgi_socket_prefix,
-  Optional[String] $wsgi_python_path                      = undef,
-  Optional[String] $wsgi_python_home                      = undef,
-  Optional[Variant[Integer,String]] $wsgi_python_optimize = undef,
-  Optional[String] $wsgi_application_group                = undef,
-  Optional[String] $package_name                          = undef,
-  Optional[String] $mod_path                              = undef,
+  Optional[String] $wsgi_restrict_embedded         = undef,
+  Optional[String] $wsgi_socket_prefix             = $apache::params::wsgi_socket_prefix,
+  Optional[Stdlib::Absolutepath] $wsgi_python_path = undef,
+  Optional[Stdlib::Absolutepath] $wsgi_python_home = undef,
+  Optional[Integer] $wsgi_python_optimize          = undef,
+  Optional[String] $wsgi_application_group         = undef,
+  Optional[String] $package_name                   = undef,
+  Optional[String] $mod_path                       = undef,
 ) inherits apache::params {
   include apache
   if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) {
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 8d76fa796a..eb802889d9 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -2,8 +2,8 @@
 #
 # @api private
 define apache::mpm (
-  String $lib_path                  = $apache::lib_path,
-  Optional[String] $apache_version  = $apache::apache_version,
+  String $lib_path                 = $apache::lib_path,
+  Optional[String] $apache_version = $apache::apache_version,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
index 8c47576a79..7aee630507 100644
--- a/manifests/mpm/disable_mpm_event.pp
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -1,3 +1,4 @@
+# @summary disable Apache-Module event
 class apache::mpm::disable_mpm_event {
   exec { '/usr/sbin/a2dismod event':
     onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/event.load",
diff --git a/manifests/mpm/disable_mpm_prefork.pp b/manifests/mpm/disable_mpm_prefork.pp
index ea67edbdb5..9653b831cc 100644
--- a/manifests/mpm/disable_mpm_prefork.pp
+++ b/manifests/mpm/disable_mpm_prefork.pp
@@ -1,3 +1,4 @@
+# @summary disable Apache-Module prefork
 class apache::mpm::disable_mpm_prefork {
   exec { '/usr/sbin/a2dismod prefork':
     onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/prefork.load",
diff --git a/manifests/mpm/disable_mpm_worker.pp b/manifests/mpm/disable_mpm_worker.pp
index 4156d8438b..6b7411d1de 100644
--- a/manifests/mpm/disable_mpm_worker.pp
+++ b/manifests/mpm/disable_mpm_worker.pp
@@ -1,3 +1,4 @@
+# @summary disable Apache-Module worker
 class apache::mpm::disable_mpm_worker {
   exec { '/usr/sbin/a2dismod worker':
     onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/worker.load",
diff --git a/manifests/params.pp b/manifests/params.pp
index d937a3965c..d5ff15195f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -103,7 +103,6 @@
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = "${httpd_root}/var/www/html"
@@ -214,11 +213,6 @@
         default => 'mod_ldap',
       },
       'authnz_pam'            => 'mod_authnz_pam',
-      'fastcgi'               => $facts['os']['release']['major'] ? {
-        '5'     => 'mod_fastcgi',
-        '6'     => 'mod_fastcgi',
-        default => undef,
-      },
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',
@@ -272,7 +266,6 @@
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
@@ -368,7 +361,6 @@
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-mod-svn',
-        'fastcgi'               => 'libapache2-mod-fastcgi',
         'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
@@ -399,7 +391,6 @@
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-mod-svn',
-        'fastcgi'               => 'libapache2-mod-fastcgi',
         'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
@@ -435,7 +426,6 @@
     $keepalive              = 'On'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
@@ -546,7 +536,6 @@
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef # TODO: revisit
     $mime_support_package = 'misc/mime-support'
     $mime_types_config    = '/usr/local/etc/mime.types'
     $wsgi_socket_prefix   = undef
@@ -613,7 +602,6 @@
     $keepalive            = 'On'
     $keepalive_timeout    = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef # TODO: revisit
     $mime_support_package = 'app-misc/mime-types'
     $mime_types_config    = '/etc/mime.types'
     $wsgi_socket_prefix   = undef
@@ -689,7 +677,6 @@
     $keepalive              = 'On'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
-    $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'aaa_base'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/srv/www'
diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
index b8b271e306..c09189de13 100644
--- a/manifests/peruser/multiplexer.pp
+++ b/manifests/peruser/multiplexer.pp
@@ -5,9 +5,9 @@
 #
 # @api private
 define apache::peruser::multiplexer (
-  String $user            = $apache::user,
-  String $group           = $apache::group,
-  Optional[String] $file  = undef,
+  String $user           = $apache::user,
+  String $group          = $apache::group,
+  Optional[String] $file = undef,
 ) {
   if ! $file {
     $filename = "${name}.conf"
diff --git a/manifests/security/rule_link.pp b/manifests/security/rule_link.pp
index a3f70b1095..59cd8dee8f 100644
--- a/manifests/security/rule_link.pp
+++ b/manifests/security/rule_link.pp
@@ -2,7 +2,7 @@
 #   Links the activated_rules from `apache::mod::security` to the respective CRS rules on disk.
 #
 # @api private
-define apache::security::rule_link () {
+define apache::security::rule_link {
   $parts = split($title, '/')
   $filename = $parts[-1]
 
diff --git a/manifests/service.pp b/manifests/service.pp
index 6e5ce53d9f..914b45ba9c 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -3,11 +3,11 @@
 #
 # @api private
 class apache::service (
-  String $service_name                    = $apache::params::service_name,
-  Boolean $service_enable                 = true,
-  Variant[Boolean,String] $service_ensure = 'running',
-  Boolean $service_manage                 = true,
-  Optional[String] $service_restart       = undef
+  String $service_name                     = $apache::params::service_name,
+  Boolean $service_enable                  = true,
+  Variant[Boolean, String] $service_ensure = 'running',
+  Boolean $service_manage                  = true,
+  Optional[String] $service_restart        = undef
 ) {
   # The base class must be included first because parameter defaults depend on it
   if ! defined(Class['apache::params']) {
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9b8ddbeb5f..f56b7331be 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -31,8 +31,8 @@
 #   Apache's version number as a string, such as '2.2' or '2.4'.
 #
 # @param access_log
-#   Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
-#
+#   Determines whether to configure `*_access.log` directives (`*_file`, `*_pipe`, or `*_syslog`).
+# 
 # @param access_log_env_var
 #   Specifies that only requests with particular environment variables be logged.
 #
@@ -252,18 +252,6 @@
 #   your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin 
 #   with a `/` or be `disabled`.
 #
-# @param fastcgi_server
-#   Specify an external FastCGI server to manage a connection to.
-#
-# @param fastcgi_socket
-#   Specify the socket that will be used to communicate with an external FastCGI server.
-#
-# @param fastcgi_idle_timeout
-#   If using fastcgi, this option sets the timeout for the server to respond.
-#
-# @param fastcgi_dir
-#   Specify an internal FastCGI directory that is to be managed.
-#
 # @param filters
 #   [Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, 
 #   context-sensitive configuration of output content filters.
@@ -590,7 +578,7 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     options => ['Indexes','FollowSymLinks','MultiViews'],
+#     options => ['Indexes', 'FollowSymLinks', 'MultiViews'],
 #   }
 #   ```
 #   > **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options', 
@@ -846,7 +834,7 @@
 #   passing a higher priority causes the alphabetically first name-based virtual host to be 
 #   used if no other names match.<br />
 #   > **Note:** You should not need to use this parameter. However, if you do use it, be 
-#   aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.<br />
+#   aware that the `default_vhost` parameter for `apache::vhost` passes a priority of 15.<br />
 #   To omit the priority prefix in file names, pass a priority of `false`.
 #
 # @param protocols
@@ -873,11 +861,11 @@
 #       { 'path' => '/l', 'url' => 'http://backend-xy',
 #         'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
 #       { 'path' => '/d', 'url' => 'http://backend-a/d',
-#         'params' => { 'retry' => '0', 'timeout' => '5' }, },
+#         'params' => { 'retry' => 0, 'timeout' => 5 }, },
 #       { 'path' => '/e', 'url' => 'http://backend-a/e',
 #         'keywords' => ['nocanon', 'interpolate'] },
 #       { 'path' => '/f', 'url' => 'http://backend-f/',
-#         'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+#         'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1']},
 #       { 'path' => '/g', 'url' => 'http://backend-g/',
 #         'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
 #       { 'path' => '/h', 'url' => 'http://backend-h/h',
@@ -915,8 +903,8 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirect_source => ['/images','/downloads'],
-#     redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+#     redirect_source => ['/images', '/downloads'],
+#     redirect_dest   => ['http://img.example.com/', 'http://downloads.example.com/'],
 #   }
 #   ```
 #
@@ -925,7 +913,7 @@
 #   ``` puppet
 #     apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirect_status => ['temp','permanent'],
+#     redirect_status => ['temp', 'permanent'],
 #   }
 #   ```
 #
@@ -936,9 +924,9 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirectmatch_status => ['404','404'],
-#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#     redirectmatch_status => ['404', '404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 #   }
 #   ```
 #
@@ -949,9 +937,9 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirectmatch_status => ['404','404'],
-#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#     redirectmatch_status => ['404', '404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 #   }
 #   ```
 #
@@ -962,9 +950,9 @@
 #   ``` puppet
 #   apache::vhost { 'site.name.fdqn':
 #     ...
-#     redirectmatch_status => ['404','404'],
-#     redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-#     redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+#     redirectmatch_status => ['404', '404'],
+#     redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+#     redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 #   }
 #   ```
 #
@@ -1168,7 +1156,7 @@
 #   ``` puppet
 #   apache::vhost { 'subdomain.loc':
 #     vhost_name      => '*',
-#     port            => '80',
+#     port            => 80,
 #     virtual_docroot => '/var/www/%-2+',
 #     docroot         => '/var/www',
 #     serveraliases   => ['*.loc',],
@@ -1181,7 +1169,7 @@
 #   ``` puppet
 #   apache::vhost { 'subdomain.loc':
 #     vhost_name                  => '*',
-#     port                        => '80',
+#     port                        => 80,
 #     virtual_docroot             => '/var/www/%-2+',
 #     docroot                     => '/var/www',
 #     virtual_use_default_docroot => true,
@@ -1198,12 +1186,12 @@
 #   An example virtual host configuration with WSGI:
 #   ``` puppet
 #   apache::vhost { 'wsgi.example.com':
-#     port                        => '80',
+#     port                        => 80,
 #     docroot                     => '/var/www/pythonapp',
 #     wsgi_daemon_process         => 'wsgi',
 #     wsgi_daemon_process_options =>
-#       { processes    => '2',
-#         threads      => '15',
+#       { processes    => 2,
+#         threads      => 15,
 #         display-name => '%{GROUP}',
 #       },
 #     wsgi_process_group          => 'wsgi',
@@ -1407,7 +1395,10 @@
 #   }
 #   ```
 #
+# TODO: check, if this Documentation is obsolete
+# lint:ignore:parameter_documentation
 # @param gssapi
+# lint:endignore
 #   Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
 #   ```puppet
 #   apache::vhost { 'sample.example.net':
@@ -1688,72 +1679,77 @@
 #   Instances of apache::mod::userdir
 #
 define apache::vhost (
-  Variant[Boolean,String] $docroot,
+  Variant[Stdlib::Absolutepath, Boolean] $docroot,
   Boolean $manage_docroot                                                             = true,
-  Variant[Boolean,String] $virtual_docroot                                            = false,
+  Variant[Stdlib::Absolutepath, Boolean] $virtual_docroot                             = false,
   Boolean $virtual_use_default_docroot                                                = false,
-  Optional[Variant[Array[Integer],Array[String],Integer,String]] $port                = undef,
-  Optional[Variant[Array[String],String]] $ip                                         = undef,
+  Optional[Variant[Array[Stdlib::Port], Stdlib::Port]] $port                          = undef,
+  Optional[
+    Variant[
+      Array[Variant[Stdlib::IP::Address, Enum['*']]],
+      Variant[Stdlib::IP::Address, Enum['*']]
+    ]
+  ] $ip                                                                               = undef,
   Boolean $ip_based                                                                   = false,
   Boolean $add_listen                                                                 = true,
   String $docroot_owner                                                               = 'root',
   String $docroot_group                                                               = $apache::params::root_group,
-  Optional[Variant[Integer,String]] $docroot_mode                                     = undef,
+  Optional[Stdlib::Filemode] $docroot_mode                                            = undef,
   Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                                     = [],
   Optional[Boolean] $protocols_honor_order                                            = undef,
   Optional[String] $serveradmin                                                       = undef,
   Boolean $ssl                                                                        = false,
-  Optional[String] $ssl_cert                                                          = $apache::default_ssl_cert,
-  Optional[String] $ssl_key                                                           = $apache::default_ssl_key,
-  Optional[String] $ssl_chain                                                         = $apache::default_ssl_chain,
-  Optional[String] $ssl_ca                                                            = $apache::default_ssl_ca,
-  Optional[String] $ssl_crl_path                                                      = $apache::default_ssl_crl_path,
-  Optional[String] $ssl_crl                                                           = $apache::default_ssl_crl,
+  Optional[Stdlib::Absolutepath] $ssl_cert                                            = $apache::default_ssl_cert,
+  Optional[Stdlib::Absolutepath] $ssl_key                                             = $apache::default_ssl_key,
+  Optional[Stdlib::Absolutepath] $ssl_chain                                           = $apache::default_ssl_chain,
+  Optional[Stdlib::Absolutepath] $ssl_ca                                              = $apache::default_ssl_ca,
+  Optional[Stdlib::Absolutepath] $ssl_crl_path                                        = $apache::default_ssl_crl_path,
+  Optional[Stdlib::Absolutepath] $ssl_crl                                             = $apache::default_ssl_crl,
   Optional[String] $ssl_crl_check                                                     = $apache::default_ssl_crl_check,
-  Optional[String] $ssl_certs_dir                                                     = $apache::params::ssl_certs_dir,
+  Optional[Stdlib::Absolutepath] $ssl_certs_dir                                       = $apache::params::ssl_certs_dir,
   Boolean $ssl_reload_on_change                                                       = $apache::default_ssl_reload_on_change,
-  Optional[Variant[Array[String],String]] $ssl_protocol                               = undef,
-  Optional[Variant[Array[String],String]] $ssl_cipher                                 = undef,
+  Optional[Variant[Array[String], String]] $ssl_protocol                              = undef,
+  Optional[Variant[Array[String], String]] $ssl_cipher                                = undef,
   Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder       = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client  = undef,
-  Optional[Variant[Integer,String]] $ssl_verify_depth                                 = undef,
+  Optional[Integer] $ssl_verify_depth                                                 = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify   = undef,
   Optional[Integer[0]] $ssl_proxy_verify_depth                                        = undef,
-  Optional[String] $ssl_proxy_ca_cert                                                 = undef,
+  Optional[Stdlib::Absolutepath] $ssl_proxy_ca_cert                                   = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn                                = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                              = undef,
   Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                            = undef,
-  Optional[String] $ssl_proxy_machine_cert                                            = undef,
-  Optional[String] $ssl_proxy_machine_cert_chain                                      = undef,
+  Optional[Stdlib::Absolutepath] $ssl_proxy_machine_cert                              = undef,
+  Optional[Stdlib::Absolutepath] $ssl_proxy_machine_cert_chain                        = undef,
   Optional[String] $ssl_proxy_cipher_suite                                            = undef,
   Optional[String] $ssl_proxy_protocol                                                = undef,
-  Optional[Variant[Array[String],String]] $ssl_options                                = undef,
+  Optional[Variant[Array[String], String]] $ssl_options                               = undef,
   Optional[String] $ssl_openssl_conf_cmd                                              = undef,
   Boolean $ssl_proxyengine                                                            = false,
   Optional[Boolean] $ssl_stapling                                                     = undef,
-  Optional[Variant[Integer,String]] $ssl_stapling_timeout                             = undef,
+  Optional[Integer] $ssl_stapling_timeout                                             = undef,
   Optional[Enum['on', 'off']] $ssl_stapling_return_errors                             = undef,
   Optional[String] $ssl_user_name                                                     = undef,
-  Optional[Variant[Integer,String,Boolean]] $priority                                 = undef,
+  Optional[Variant[Integer, Boolean]] $priority                                       = undef,
   Boolean $default_vhost                                                              = false,
   Optional[String] $servername                                                        = $name,
-  Variant[Array[String],String] $serveraliases                                        = [],
-  Array[String] $options                                                              = ['Indexes','FollowSymLinks','MultiViews'],
+  Variant[Array[String], String] $serveraliases                                       = [],
+  Array[String] $options                                                              = ['Indexes', 'FollowSymLinks', 'MultiViews'],
   Array[String] $override                                                             = ['None'],
   Optional[String] $directoryindex                                                    = undef,
   String $vhost_name                                                                  = '*',
-  String $logroot                                                                     = $apache::logroot,
+  Stdlib::Absolutepath $logroot                                                       = $apache::logroot,
   Enum['directory', 'absent'] $logroot_ensure                                         = 'directory',
-  Optional[String] $logroot_mode                                                      = undef,
+  Optional[Stdlib::Filemode] $logroot_mode                                            = undef,
   Optional[String] $logroot_owner                                                     = undef,
   Optional[String] $logroot_group                                                     = undef,
   Optional[Apache::LogLevel] $log_level                                               = undef,
   Boolean $access_log                                                                 = true,
-  Variant[Boolean,String] $access_log_file                                            = false,
-  Variant[Boolean,String] $access_log_pipe                                            = false,
-  Variant[Boolean,String] $access_log_syslog                                          = false,
-  Variant[Boolean,String] $access_log_format                                          = false,
-  Variant[Boolean,String] $access_log_env_var                                         = false,
+  Optional[String[1]] $access_log_file                                                = undef,
+  Optional[String[1]] $access_log_pipe                                                = undef,
+  Optional[Variant[String, Boolean]] $access_log_syslog                               = undef,
+  Optional[String[1]] $access_log_format                                              = undef,
+  Optional[Variant[Boolean, String]] $access_log_env_var                              = undef,
   Optional[Array[Hash]] $access_logs                                                  = undef,
   Boolean $use_servername_for_filenames                                               = false,
   Boolean $use_port_for_filenames                                                     = false,
@@ -1762,7 +1758,7 @@
   Boolean $error_log                                                                  = true,
   Optional[String] $error_log_file                                                    = undef,
   Optional[String] $error_log_pipe                                                    = undef,
-  Optional[Variant[String,Boolean]] $error_log_syslog                                 = undef,
+  Optional[Variant[String, Boolean]] $error_log_syslog                                = undef,
   Optional[
     Array[
       Variant[
@@ -1770,12 +1766,12 @@
         Hash[String, Enum['connection', 'request']]
       ]
     ]
-  ]       $error_log_format                                                           = undef,
+  ] $error_log_format                                                                 = undef,
   Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]] $http_protocol_options = undef,
-  Optional[Variant[String,Boolean]] $modsec_audit_log                                 = undef,
+  Optional[Variant[String, Boolean]] $modsec_audit_log                                = undef,
   Optional[String] $modsec_audit_log_file                                             = undef,
   Optional[String] $modsec_audit_log_pipe                                             = undef,
-  Variant[Array[Hash],String] $error_documents                                        = [],
+  Variant[Array[Hash], String] $error_documents                                       = [],
   Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource         = undef,
   Optional[String] $scriptalias                                                       = undef,
   Array[Hash] $scriptaliases                                                          = [],
@@ -1786,39 +1782,39 @@
   Optional[String] $proxy_dest                                                        = undef,
   Optional[String] $proxy_dest_match                                                  = undef,
   Optional[String] $proxy_dest_reverse_match                                          = undef,
-  Optional[Variant[Array[Hash],Hash]] $proxy_pass                                     = undef,
-  Optional[Variant[Array[Hash],Hash]] $proxy_pass_match                               = undef,
+  Optional[Variant[Array[Hash], Hash]] $proxy_pass                                    = undef,
+  Optional[Variant[Array[Hash], Hash]] $proxy_pass_match                              = undef,
   Boolean $proxy_requests                                                             = false,
   Hash $php_flags                                                                     = {},
   Hash $php_values                                                                    = {},
-  Variant[Array[String],Hash] $php_admin_flags                                        = {},
-  Variant[Array[String],Hash] $php_admin_values                                       = {},
-  Variant[Array[String],String] $no_proxy_uris                                        = [],
-  Variant[Array[String],String] $no_proxy_uris_match                                  = [],
+  Variant[Array[String], Hash] $php_admin_flags                                       = {},
+  Variant[Array[String], Hash] $php_admin_values                                      = {},
+  Variant[Array[String], String] $no_proxy_uris                                       = [],
+  Variant[Array[String], String] $no_proxy_uris_match                                 = [],
   Boolean $proxy_preserve_host                                                        = false,
-  Optional[Variant[String,Boolean]] $proxy_add_headers                                = undef,
+  Optional[Variant[String, Boolean]] $proxy_add_headers                               = undef,
   Boolean $proxy_error_override                                                       = false,
-  Variant[String,Array[String]] $redirect_source                                      = '/',
-  Optional[Variant[Array[String],String]] $redirect_dest                              = undef,
-  Optional[Variant[Array[String],String]] $redirect_status                            = undef,
-  Optional[Variant[Array[String],String]] $redirectmatch_status                       = undef,
-  Optional[Variant[Array[String],String]] $redirectmatch_regexp                       = undef,
-  Optional[Variant[Array[String],String]] $redirectmatch_dest                         = undef,
+  Variant[String, Array[String]] $redirect_source                                     = '/',
+  Optional[Variant[Array[String], String]] $redirect_dest                             = undef,
+  Optional[Variant[Array[String], String]] $redirect_status                           = undef,
+  Optional[Variant[Array[String], String]] $redirectmatch_status                      = undef,
+  Optional[Variant[Array[String], String]] $redirectmatch_regexp                      = undef,
+  Optional[Variant[Array[String], String]] $redirectmatch_dest                        = undef,
   Array[String[1]] $headers                                                           = [],
   Array[String[1]] $request_headers                                                   = [],
   Array[String[1]] $filters                                                           = [],
   Array[Hash] $rewrites                                                               = [],
   Optional[String[1]] $rewrite_base                                                   = undef,
-  Optional[String[1]] $rewrite_rule                                                   = undef,
+  Optional[Variant[Array[String[1]], String[1]]] $rewrite_rule                        = undef,
   Array[String[1]] $rewrite_cond                                                      = [],
   Boolean $rewrite_inherit                                                            = false,
-  Variant[Array[String],String] $setenv                                               = [],
-  Variant[Array[String],String] $setenvif                                             = [],
-  Variant[Array[String],String] $setenvifnocase                                       = [],
-  Variant[Array[String],String] $block                                                = [],
+  Variant[Array[String], String] $setenv                                              = [],
+  Variant[Array[String], String] $setenvif                                            = [],
+  Variant[Array[String], String] $setenvifnocase                                      = [],
+  Variant[Array[String], String] $block                                               = [],
   Enum['absent', 'present'] $ensure                                                   = 'present',
   Optional[String] $wsgi_application_group                                            = undef,
-  Optional[Variant[String,Hash]] $wsgi_daemon_process                                 = undef,
+  Optional[Variant[String, Hash]] $wsgi_daemon_process                                = undef,
   Optional[Hash] $wsgi_daemon_process_options                                         = undef,
   Optional[String] $wsgi_import_script                                                = undef,
   Optional[Hash] $wsgi_import_script_options                                          = undef,
@@ -1830,11 +1826,7 @@
   Optional[String] $custom_fragment                                                   = undef,
   Optional[Hash] $itk                                                                 = undef,
   Optional[String] $action                                                            = undef,
-  Optional[String] $fastcgi_server                                                    = undef,
-  Optional[String] $fastcgi_socket                                                    = undef,
-  Optional[String] $fastcgi_dir                                                       = undef,
-  Optional[Variant[Integer,String]] $fastcgi_idle_timeout                             = undef,
-  Variant[Array[String],String] $additional_includes                                  = [],
+  Variant[Array[String], String] $additional_includes                                 = [],
   Boolean $use_optional_includes                                                      = $apache::use_optional_includes,
   Optional[String] $apache_version                                                    = $apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                      = undef,
@@ -1888,7 +1880,7 @@
   Optional[Integer] $passenger_max_request_time                                       = undef,
   Optional[Integer] $passenger_memory_limit                                           = undef,
   Optional[Integer] $passenger_stat_throttle_rate                                     = undef,
-  Optional[Variant[String,Array[String]]] $passenger_pre_start                        = undef,
+  Optional[Variant[String, Array[String]]] $passenger_pre_start                       = undef,
   Optional[Boolean] $passenger_high_performance                                       = undef,
   Optional[Boolean] $passenger_buffer_upload                                          = undef,
   Optional[Boolean] $passenger_buffer_response                                        = undef,
@@ -1921,8 +1913,8 @@
   String $krb_servicename                                                             = 'HTTP',
   Enum['on', 'off'] $krb_save_credentials                                             = 'off',
   Optional[Enum['on', 'off']] $keepalive                                              = undef,
-  Optional[Variant[Integer,String]] $keepalive_timeout                                = undef,
-  Optional[Variant[Integer,String]] $max_keepalive_requests                           = undef,
+  Optional[Variant[Integer, String]] $keepalive_timeout                               = undef,
+  Optional[Variant[Integer, String]] $max_keepalive_requests                          = undef,
   Optional[String] $cas_attribute_prefix                                              = undef,
   Optional[String] $cas_attribute_delimiter                                           = undef,
   Optional[String] $cas_root_proxied_as                                               = undef,
@@ -1934,12 +1926,12 @@
   Optional[String] $cas_cookie_path                                                   = undef,
   Optional[String] $shib_compat_valid_user                                            = undef,
   Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name          = undef,
-  Optional[Variant[String,Array[String]]] $comment                                    = undef,
+  Optional[Variant[String, Array[String]]] $comment                                   = undef,
   Hash $define                                                                        = {},
   Boolean $auth_oidc                                                                  = false,
   Optional[Apache::OIDCSettings] $oidc_settings                                       = undef,
-  Optional[Variant[Boolean,String]] $mdomain                                          = undef,
-  Optional[Variant[String[1],Array[String[1]]]] $userdir                              = undef,
+  Optional[Variant[Boolean, String]] $mdomain                                         = undef,
+  Optional[Variant[String[1], Array[String[1]]]] $userdir                             = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -2117,7 +2109,7 @@
   } else {
     if $port {
       $listen_addr_port = $port
-      $nvh_addr_port = prefix(any2array($port),"${vhost_name}:")
+      $nvh_addr_port = prefix(any2array($port), "${vhost_name}:")
     } else {
       $listen_addr_port = undef
       $nvh_addr_port = $name
@@ -2683,22 +2675,6 @@
     }
   }
 
-  # Template uses:
-  # - $fastcgi_server
-  # - $fastcgi_socket
-  # - $fastcgi_dir
-  # - $fastcgi_idle_timeout
-  # - $apache_version
-  if ($fastcgi_server or $fastcgi_dir) and $ensure == 'present' {
-    include apache::mod::fastcgi
-
-    concat::fragment { "${name}-fastcgi":
-      target  => "${priority_real}${filename}.conf",
-      order   => 280,
-      content => template('apache/vhost/_fastcgi.erb'),
-    }
-  }
-
   # Template uses:
   # - $suexec_user_group
   if $suexec_user_group and $ensure == 'present' {
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index 8f4143bcfe..4e208d578d 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -17,9 +17,9 @@
 #
 define apache::vhost::custom (
   String $content,
-  String $ensure                            = 'present',
-  Variant[Integer,String,Boolean] $priority = '25',
-  Boolean $verify_config                    = true,
+  String $ensure                      = 'present',
+  Variant[Integer, Boolean] $priority = 25,
+  Boolean $verify_config              = true,
 ) {
   include apache
 
diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
index fa5ea36ab1..e29d637d21 100644
--- a/manifests/vhost/fragment.pp
+++ b/manifests/vhost/fragment.pp
@@ -29,11 +29,11 @@
 # @example With a vhost with priority
 #   include apache
 #   apache::vhost { 'myvhost':
-#     priority => '42',
+#     priority => 42,
 #   }
 #   apache::vhost::fragment { 'myfragment':
 #     vhost    => 'myvhost',
-#     priority => '42',
+#     priority => 42,
 #     content  => '# Foo',
 #   }
 #
@@ -44,7 +44,7 @@
 #   }
 #   apache::vhost::fragment { 'myfragment':
 #     vhost    => 'myvhost',
-#     priority => '10', # default_vhost implies priority 10
+#     priority => 10, # default_vhost implies priority 10
 #     content  => '# Foo',
 #   }
 #
@@ -52,16 +52,16 @@
 #   include apache
 #   apache::vhost::fragment { 'myfragment':
 #     vhost    => 'default',
-#     priority => '15',
+#     priority => 15,
 #     content  => '# Foo',
 #   }
 #
 define apache::vhost::fragment (
   String[1] $vhost,
-  Optional[Integer[0]] $port                          = undef,
-  Optional[Variant[Integer,String,Boolean]] $priority = undef,
-  Optional[String] $content                           = undef,
-  Integer[0] $order                                   = 900,
+  Optional[Stdlib::Port] $port                  = undef,
+  Optional[Variant[Integer, Boolean]] $priority = undef,
+  Optional[String] $content                     = undef,
+  Integer[0] $order                             = 900,
 ) {
   # This copies the logic from apache::vhost
   if $priority {
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 0faca113a1..6ae89d41f1 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -92,11 +92,11 @@
 #       { 'path' => '/l', 'url' => 'http://backend-xy',
 #         'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
 #       { 'path' => '/d', 'url' => 'http://backend-a/d',
-#         'params' => { 'retry' => '0', 'timeout' => '5' }, },
+#         'params' => { 'retry' => 0, 'timeout' => 5 }, },
 #       { 'path' => '/e', 'url' => 'http://backend-a/e',
 #         'keywords' => ['nocanon', 'interpolate'] },
 #       { 'path' => '/f', 'url' => 'http://backend-f/',
-#         'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+#         'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1']},
 #       { 'path' => '/g', 'url' => 'http://backend-g/',
 #         'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
 #       { 'path' => '/h', 'url' => 'http://backend-h/h',
@@ -106,20 +106,20 @@
 #
 define apache::vhost::proxy (
   String[1] $vhost,
-  Optional[Variant[Integer,String,Boolean]] $priority = undef,
-  Integer[0] $order = 170,
-  Optional[Stdlib::Port] $port = undef,
-  Optional[String[1]] $proxy_dest = undef,
-  Optional[String[1]] $proxy_dest_match = undef,
-  Optional[String[1]] $proxy_dest_reverse_match = undef,
-  Variant[Array[String[1]], String[1]] $no_proxy_uris = [],
-  Variant[Array[String[1]], String[1]] $no_proxy_uris_match = [],
-  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass = undef,
+  Optional[Variant[Integer, Boolean]] $priority               = undef,
+  Integer[0] $order                                           = 170,
+  Optional[Stdlib::Port] $port                                = undef,
+  Optional[String[1]] $proxy_dest                             = undef,
+  Optional[String[1]] $proxy_dest_match                       = undef,
+  Optional[String[1]] $proxy_dest_reverse_match               = undef,
+  Variant[Array[String[1]], String[1]] $no_proxy_uris         = [],
+  Variant[Array[String[1]], String[1]] $no_proxy_uris_match   = [],
+  Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass       = undef,
   Optional[Array[Apache::Vhost::ProxyPass]] $proxy_pass_match = undef,
-  Boolean $proxy_requests = false,
-  Boolean $proxy_preserve_host = false,
-  Optional[Boolean] $proxy_add_headers = undef,
-  Boolean $proxy_error_override = false,
+  Boolean $proxy_requests                                     = false,
+  Boolean $proxy_preserve_host                                = false,
+  Optional[Boolean] $proxy_add_headers                        = undef,
+  Boolean $proxy_error_override                               = false,
 ) {
   include apache::mod::proxy
   include apache::mod::proxy_http
diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp
index a212a5c31a..9ac49abaa3 100644
--- a/manifests/vhosts.pp
+++ b/manifests/vhosts.pp
@@ -9,7 +9,7 @@
 #     vhosts => {
 #       'custom_vhost_1' => {
 #         'docroot' => '/var/www/custom_vhost_1',
-#         'port'    => '81',
+#         'port'    => 81,
 #       },
 #     },
 #   }
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index aba05beca6..44c2884511 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -222,7 +222,7 @@ class { 'apache':
   describe 'timeout' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': timeout => '1234' }"
+        pp = "class { 'apache': timeout => 1234 }"
         apply_manifest(pp, catch_failures: true)
       end
     end
@@ -384,7 +384,7 @@ class { 'apache':
   describe 'keepalive' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': keepalive => 'Off', keepalive_timeout => '30', max_keepalive_requests => '200' }"
+        pp = "class { 'apache': keepalive => 'Off', keepalive_timeout => 30, max_keepalive_requests => 200 }"
         apply_manifest(pp, catch_failures: true)
       end
     end
@@ -400,7 +400,7 @@ class { 'apache':
   describe 'limitrequestfieldsize' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': limitreqfieldsize => '16830' }"
+        pp = "class { 'apache': limitreqfieldsize => 16830 }"
         apply_manifest(pp, catch_failures: true)
       end
     end
@@ -414,7 +414,7 @@ class { 'apache':
   describe 'limitrequestfields' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': limitreqfields => '120' }"
+        pp = "class { 'apache': limitreqfields => 120 }"
         apply_manifest(pp, catch_failures: true)
       end
     end
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index c13ae260af..0b69febec7 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -79,7 +79,7 @@ class { 'apache':
           ssl_cipher           => 'test',
           ssl_honorcipherorder => true,
           ssl_verify_client    => 'require',
-          ssl_verify_depth     => 'test',
+          ssl_verify_depth     => 1,
           ssl_options          => ['test', 'test1'],
           ssl_proxyengine      => true,
           ssl_proxy_protocol   => 'TLSv1.2',
@@ -103,7 +103,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLCipherSuite          test' }
       it { is_expected.to contain 'SSLHonorCipherOrder     On' }
       it { is_expected.to contain 'SSLVerifyClient         require' }
-      it { is_expected.to contain 'SSLVerifyDepth          test' }
+      it { is_expected.to contain 'SSLVerifyDepth          1' }
       it { is_expected.to contain 'SSLOptions test test1' }
       if apache_hash['version'] == '2.4'
         it { is_expected.to contain 'SSLCARevocationCheck    chain flag' }
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 558156c3fc..cc8ee4b9fa 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -13,7 +13,7 @@ class { 'apache':
           }
           class { 'apache::mod::php': }
           apache::vhost { 'php.example.com':
-            port    => '80',
+            port    => 80,
             docroot => '#{apache_hash['doc_root']}/php',
           }
           host { 'php.example.com': ip => '127.0.0.1', }
@@ -75,7 +75,7 @@ class { 'apache::mod::php':
         }
 
           apache::vhost { 'php.example.com':
-            port             => '80',
+            port             => 80,
             docroot          => '#{apache_hash['doc_root']}/php',
             php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
             php_flags        => { 'display_errors' => 'on', },
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 7874557be2..109dc9da81 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -86,7 +86,7 @@ class { 'apache': }
       }
 
       apache::vhost { 'first.example.com':
-        port    => '80',
+        port    => 80,
         docroot => '/var/www/first',
         require => File['/var/www'],
       }
@@ -105,7 +105,7 @@ class { 'apache': }
     pp = <<-MANIFEST
       class { 'apache': }
       apache::vhost { 'proxy.example.com':
-        port    => '80',
+        port    => 80,
         docroot => '/var/www/proxy',
         proxy_pass => [
           { 'path' => '/foo', 'url' => 'http://backend-foo/'},
@@ -133,7 +133,7 @@ class { 'apache': }
     pp = <<-MANIFEST
       class { 'apache': }
       apache::vhost { 'proxy.example.com':
-        port    => '80',
+        port    => 80,
         docroot => '#{apache_hash['doc_root']}/proxy',
         proxy_pass_match => [
           { 'path' => '/foo', 'url' => 'http://backend-foo/'},
@@ -163,7 +163,7 @@ class { 'apache':
         default_vhost => false,
       }
       apache::vhost { 'example.com':
-        port     => ['80', '8080'],
+        port     => [80, 8080],
         ip       => ['127.0.0.1','127.0.0.2'],
         ip_based => true,
         docroot  => '/var/www/html',
@@ -232,7 +232,7 @@ class { 'apache':
         default_vhost  => false,
       }
       apache::vhost { 'example.com':
-        port           => '80',
+        port           => 80,
         ip             => '::1',
         ip_based       => true,
         docroot        => '/var/www/html',
@@ -512,7 +512,7 @@ class { 'apache': }
       apache::vhost { 'virt.example.com':
         vhost_name      => '*',
         serveraliases   => '*virt.example.com',
-        port            => '80',
+        port            => 80,
         docroot         => '/var/www/virt',
         virtual_docroot => '/var/www/virt/%1',
       }
@@ -552,12 +552,12 @@ class { 'apache': default_vhost => false, }
         apache::vhost { 'localhost':
           docroot => '/var/www/local',
           ip      => '127.0.0.1',
-          port    => '8888',
+          port    => 8888,
         }
         apache::listen { '*:80': }
         apache::vhost { 'proxy.example.com':
           docroot    => '/var/www',
-          port       => '80',
+          port       => 80,
           add_listen => false,
           proxy_pass => {
             'path' => '/',
@@ -597,12 +597,12 @@ class { 'apache': default_vhost => false, }
         apache::vhost { 'localhost':
           docroot => '/var/www/local',
           ip      => '127.0.0.1',
-          port    => '8888',
+          port    => 8888,
         }
         apache::listen { '*:80': }
         apache::vhost { 'proxy.example.com':
           docroot    => '/var/www',
-          port       => '80',
+          port       => 80,
           add_listen => false,
           proxy_pass_match => {
             'path' => '/',
@@ -690,7 +690,7 @@ class { 'apache': default_vhost => false }
       apache::listen { '81': }
       apache::vhost { 'testlisten.server':
         docroot    => '/tmp',
-        port       => '80',
+        port       => 80,
         add_listen => false,
         servername => 'testlisten.server',
       }
@@ -1134,7 +1134,7 @@ class { 'apache::mod::wsgi': }
         docroot                     => '/tmp',
         wsgi_application_group      => '%{GLOBAL}',
         wsgi_daemon_process         => { 'wsgi' => { 'python-home' => '/usr' }, 'foo' => {} },
-        wsgi_daemon_process_options => {processes => '2'},
+        wsgi_daemon_process_options => {processes => 2},
         wsgi_import_script          => '/test1',
         wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
         wsgi_process_group          => 'nobody',
@@ -1207,7 +1207,7 @@ class { 'apache': }
       class { 'apache': }
       class { 'apache::mod::shib': }
       apache::vhost { 'test.server':
-        port    => '80',
+        port    => 80,
         docroot => '/var/www/html',
         shib_compat_valid_user => 'On'
       }
@@ -1227,7 +1227,7 @@ class { 'apache::mod::shib': }
     pp = <<-MANIFEST
         class { 'apache': }
         apache::vhost { 'test.server':
-          port    => '80',
+          port    => 80,
           docroot => '/var/www/html',
           auth_oidc     => true,
           oidc_settings => {
diff --git a/spec/acceptance/vhosts_spec.rb b/spec/acceptance/vhosts_spec.rb
index 90dc8c99f4..1048c2074b 100644
--- a/spec/acceptance/vhosts_spec.rb
+++ b/spec/acceptance/vhosts_spec.rb
@@ -9,11 +9,11 @@ class { 'apache::vhosts':
           vhosts => {
             'custom_vhost_1' => {
                 'docroot' => '/var/www/custom_vhost_1',
-                'port' => '81',
+                'port' => 81,
             },
             'custom_vhost_2' => {
                 'docroot' => '/var/www/custom_vhost_2',
-                'port' => '82',
+                'port' => 82,
             },
           },
         }
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index c1ccd4b23a..bdd06059c1 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -16,13 +16,13 @@
     end
     describe 'with parameters' do
       let :params do
-        { mellon_cache_size: '200',
-          mellon_cache_entry_size: '2010',
+        { mellon_cache_size: 200,
+          mellon_cache_entry_size: 2010,
           mellon_lock_file: '/tmp/junk',
           mellon_post_directory: '/tmp/post',
-          mellon_post_ttl: '5',
-          mellon_post_size: '8',
-          mellon_post_count: '10' }
+          mellon_post_ttl: 5,
+          mellon_post_size: 8,
+          mellon_post_count: 10 }
       end
 
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheSize\s+200$}) }
@@ -45,13 +45,13 @@
     end
     describe 'with parameters' do
       let :params do
-        { mellon_cache_size: '200',
-          mellon_cache_entry_size: '2010',
+        { mellon_cache_size: 200,
+          mellon_cache_entry_size: 2010,
           mellon_lock_file: '/tmp/junk',
           mellon_post_directory: '/tmp/post',
-          mellon_post_ttl: '5',
-          mellon_post_size: '8',
-          mellon_post_count: '10' }
+          mellon_post_ttl: 5,
+          mellon_post_size: 8,
+          mellon_post_count: 10 }
       end
 
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheSize\s+200$}) }
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 572baefe5d..05d7b57bb8 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -32,17 +32,17 @@
     context 'Test mpm_event new params' do
       let :params do
         {
-          serverlimit: '0',
-          startservers: '1',
-          maxclients: '2',
-          minsparethreads: '3',
-          maxsparethreads: '4',
-          threadsperchild: '5',
-          maxrequestsperchild: '6',
-          threadlimit: '7',
-          listenbacklog: '8',
-          maxrequestworkers: '9',
-          maxconnectionsperchild: '10',
+          serverlimit: 0,
+          startservers: 1,
+          maxclients: 2,
+          minsparethreads: 3,
+          maxsparethreads: 4,
+          threadsperchild: 5,
+          maxrequestsperchild: 6,
+          threadlimit: 7,
+          listenbacklog: 8,
+          maxrequestworkers: 9,
+          maxconnectionsperchild: 10,
         }
       end
 
@@ -62,15 +62,15 @@
     context 'Test mpm_event old style params' do
       let :params do
         {
-          serverlimit: '0',
-          startservers: '1',
-          maxclients: '2',
-          minsparethreads: '3',
-          maxsparethreads: '4',
-          threadsperchild: '5',
-          maxrequestsperchild: '6',
-          threadlimit: '7',
-          listenbacklog: '8',
+          serverlimit: 0,
+          startservers: 1,
+          maxclients: 2,
+          minsparethreads: 3,
+          maxsparethreads: 4,
+          threadsperchild: 5,
+          maxrequestsperchild: 6,
+          threadlimit: 7,
+          listenbacklog: 8,
           maxrequestworkers: :undef,
           maxconnectionsperchild: :undef,
         }
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
deleted file mode 100644
index 4cd6c9c419..0000000000
--- a/spec/classes/mod/fastcgi_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'apache::mod::fastcgi', type: :class do
-  on_supported_os.each do |os, facts|
-    context "on #{os} " do
-      let :facts do
-        facts
-      end
-
-      context 'with all defaults' do
-        case facts[:os]['name']
-        when 'Debian'
-          it { is_expected.to compile.with_all_deps }
-          it { is_expected.to contain_class('apache::params') }
-          it { is_expected.to contain_apache__mod('fastcgi') }
-          it { is_expected.to contain_package('libapache2-mod-fastcgi') }
-          it { is_expected.to contain_file('fastcgi.conf') }
-        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'Rocky', 'AlmaLinux'
-          if facts[:os]['release']['major'].to_i < 7
-            it { is_expected.to compile.with_all_deps }
-            it { is_expected.to contain_class('apache::params') }
-            it { is_expected.to contain_apache__mod('fastcgi') }
-            it { is_expected.to contain_package('mod_fastcgi') }
-            it { is_expected.not_to contain_file('fastcgi.conf') }
-          else
-            it { is_expected.not_to compile }
-          end
-        when 'Ubuntu'
-          if facts[:os]['release']['major'].to_i < 18
-            it { is_expected.to compile.with_all_deps }
-          else
-            it { is_expected.not_to compile }
-          end
-        else
-          it { is_expected.to compile.with_all_deps }
-        end
-      end
-    end
-  end
-end
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 934b62da8f..2b965bb33c 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -28,11 +28,11 @@
           ldap_trusted_global_cert_file: 'ca.pem',
           ldap_trusted_global_cert_type: 'CA_DER',
           ldap_trusted_mode: 'TLS',
-          ldap_shared_cache_size: '500000',
-          ldap_cache_entries: '1024',
-          ldap_cache_ttl: '600',
-          ldap_opcache_entries: '1024',
-          ldap_opcache_ttl: '600',
+          ldap_shared_cache_size: 500_000,
+          ldap_cache_entries: 1024,
+          ldap_cache_ttl: 600,
+          ldap_opcache_entries: 1024,
+          ldap_opcache_ttl: 600,
           ldap_path: '/custom-ldap-status',
         }
       end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 0925696ce6..80e56ca08c 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -135,7 +135,7 @@
                   it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} "#{valid_value}"$}) }
                 end
               end
-            when 'URI', 'String', 'Integer'
+            when 'URI', 'String'
               valid_config_values = ['some_value_for_you']
               valid_config_values.each do |valid_value|
                 describe "with #{puppetized_config_option} => #{valid_value}" do
@@ -143,6 +143,17 @@
                     { puppetized_config_option.to_sym => valid_value }
                   end
 
+                  it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
+                end
+              end
+            when 'Integer'
+              valid_config_values = [4711]
+              valid_config_values.each do |valid_value|
+                describe "with #{puppetized_config_option} => #{valid_value}" do
+                  let :params do
+                    { puppetized_config_option.to_sym => valid_value }
+                  end
+
                   it { is_expected.to contain_file('passenger.conf').with_content(%r{^  #{config_hash[:pass_opt]} #{valid_value}$}) }
                 end
               end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 51eb8c0904..9a8afd9462 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -67,8 +67,8 @@
       let :params do
         {
           apache_version: '2.4',
-          maxrequestworkers: '512',
-          maxconnectionsperchild: '4000',
+          maxrequestworkers: 512,
+          maxconnectionsperchild: 4000,
         }
       end
 
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index d1c1ef8ff8..9f6b660000 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -253,7 +253,7 @@
     context 'setting ssl_random_seed_bytes' do
       let :params do
         {
-          ssl_random_seed_bytes: '1024',
+          ssl_random_seed_bytes: 1024,
         }
       end
 
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
index 42a5ed9002..2c75ea69c7 100644
--- a/spec/classes/vhosts_spec.rb
+++ b/spec/classes/vhosts_spec.rb
@@ -12,11 +12,11 @@
           vhosts: {
             'custom_vhost_1' => {
               'docroot' => '/var/www/custom_vhost_1',
-              'port' => '81',
+              'port' => 81,
             },
             'custom_vhost_2' => {
               'docroot' => '/var/www/custom_vhost_2',
-              'port' => '82',
+              'port' => 82,
             },
           },
         }
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 2e31b1f790..c10564a3e3 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -41,7 +41,7 @@
     let :params do
       {
         'confdir'        => '/dne',
-        'priority'       => '30',
+        'priority'       => 30,
         'source'         => 'puppet:///modules/apache/test',
         'verify_command' => '/bin/true',
       }
diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb
deleted file mode 100644
index 8ddf52f516..0000000000
--- a/spec/defines/fastcgi_server_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'apache::fastcgi::server', type: :define do
-  let :pre_condition do
-    'include apache'
-  end
-  let :title do
-    'www'
-  end
-
-  on_supported_os.each do |os, facts|
-    next if facts[:os]['name'] == 'Ubuntu'
-    next if facts[:os]['release']['major'] != '6' && facts[:os]['family']['RedHat']
-    context "on #{os} " do
-      let :facts do
-        facts
-      end
-
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::fastcgi') }
-      case facts[:os]['family']
-      when 'RedHat'
-        it {
-          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-            ensure: 'file',
-            path: "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf",
-          )
-        }
-      when 'Debian', 'Gentoo'
-        it {
-          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-            ensure: 'file',
-            path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
-          )
-        }
-      when 'FreeBSD'
-        it {
-          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-            ensure: 'file',
-            path: "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf",
-          )
-        }
-      end
-
-      describe 'os-independent items' do
-        describe '.conf content using TCP communication' do
-          let :params do
-            {
-              host: '127.0.0.1:9001',
-              timeout: 30,
-              flush: true,
-              faux_path: '/var/www/php-www.fcgi',
-              fcgi_alias: '/php-www.fcgi',
-              file_type: 'application/x-httpd-php',
-              pass_header: 'Authorization',
-            }
-          end
-          let :expected do
-# rubocop:disable Layout/IndentationWidth : Changes to the indent causes test failures.
-'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -host 127.0.0.1:9001 -pass-header Authorization
-Alias /php-www.fcgi /var/www/php-www.fcgi
-Action application/x-httpd-php /php-www.fcgi
-'
-            # rubocop:enable Layout/IndentationWidth
-          end
-
-          it do
-            is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
-          end
-        end
-        describe '.conf content using socket communication' do
-          let :params do
-            {
-              host: '/var/run/fcgi.sock',
-              timeout: 30,
-              flush: true,
-              faux_path: '/var/www/php-www.fcgi',
-              fcgi_alias: '/php-www.fcgi',
-              file_type: 'application/x-httpd-php',
-            }
-          end
-          let :expected do
-# rubocop:disable Layout/IndentationWidth : Changes to the indent causes test failures.
-'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -socket /var/run/fcgi.sock
-Alias /php-www.fcgi /var/www/php-www.fcgi
-Action application/x-httpd-php /php-www.fcgi
-'
-            # rubocop:enable Layout/IndentationWidth
-          end
-
-          it do
-            is_expected.to contain_file('fastcgi-pool-www.conf').with_content(expected)
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/defines/vhost_fragment_spec.rb b/spec/defines/vhost_fragment_spec.rb
index af042e4de0..c5aac54c96 100644
--- a/spec/defines/vhost_fragment_spec.rb
+++ b/spec/defines/vhost_fragment_spec.rb
@@ -15,7 +15,7 @@
           {
             vhost: 'default',
             port: 80,
-            priority: '15',
+            priority: 15,
           }
         end
 
@@ -74,13 +74,13 @@
         end
 
         context 'with priority => 42' do
-          let(:params) { super().merge(priority: '42') }
+          let(:params) { super().merge(priority: 42) }
           let(:pre_condition) do
             <<-PUPPET
             include apache
             apache::vhost { 'custom':
               docroot  => '/path/to/docroot',
-              priority => '42',
+              priority => 42,
             }
             PUPPET
           end
diff --git a/spec/defines/vhost_proxy_spec.rb b/spec/defines/vhost_proxy_spec.rb
index 57a5477147..fbdf642386 100644
--- a/spec/defines/vhost_proxy_spec.rb
+++ b/spec/defines/vhost_proxy_spec.rb
@@ -15,7 +15,7 @@
           {
             vhost: 'default',
             port: 80,
-            priority: '15',
+            priority: 15,
           }
         end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 3508a08999..9d59e9d2bf 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -4,15 +4,8 @@
 
 describe 'apache::vhost', type: :define do
   describe 'os-independent items' do
-    on_supported_os.each do |os, facts|
-      apache_name = case facts[:os]['family']
-                    when 'RedHat'
-                      'httpd'
-                    when 'Debian'
-                      'apache2'
-                    else
-                      'apache2'
-                    end
+    on_supported_os.each do |os, os_facts|
+      let(:apache_name) { facts[:os]['family'] == 'RedHat' ? 'httpd' : 'apache2' }
 
       let :pre_condition do
         "class {'apache': default_vhost => false, default_mods => false, vhost_enable_dir => '/etc/#{apache_name}/sites-enabled'}"
@@ -25,13 +18,13 @@
       let :default_params do
         {
           docroot: '/rspec/docroot',
-          port: '84',
+          port: 84,
         }
       end
 
       context "on #{os} " do
         let :facts do
-          facts
+          os_facts
         end
 
         describe 'basic assumptions' do
@@ -41,9 +34,9 @@
           it { is_expected.to contain_class('apache::params') }
           it { is_expected.to contain_apache__listen(params[:port]) }
           # namebased virualhost is only created on apache 2.2 and older
-          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
-             (facts[:os]['name'] == 'Amazon') ||
-             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
+          if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) ||
+             (os_facts[:os]['name'] == 'Amazon') ||
+             (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12)
             it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
           end
         end
@@ -54,7 +47,7 @@
               'manage_docroot'              => false,
               'virtual_docroot'             => true,
               'virtual_use_default_docroot' => false,
-              'port'                        => '8080',
+              'port'                        => 8080,
               'ip'                          => '127.0.0.1',
               'ip_based'                    => true,
               'add_listen'                  => false,
@@ -73,7 +66,7 @@
               'ssl_cipher'                  => 'HIGH',
               'ssl_honorcipherorder'        => 'Off',
               'ssl_verify_client'           => 'optional',
-              'ssl_verify_depth'            => '3',
+              'ssl_verify_depth'            => 3,
               'ssl_options'                 => '+ExportCertData',
               'ssl_openssl_conf_cmd'        => 'DHParameters "foo.pem"',
               'ssl_proxy_verify'            => 'require',
@@ -85,7 +78,7 @@
               'ssl_proxy_protocol'          => 'TLSv1.2',
               'ssl_user_name'               => 'SSL_CLIENT_S_DN_CN',
               'ssl_reload_on_change'        => true,
-              'priority'                    => '30',
+              'priority'                    => 30,
               'default_vhost'               => true,
               'servername'                  => 'example.com',
               'serveraliases'               => ['test-example.com'],
@@ -181,7 +174,7 @@
                 { 'path'               => '/var/www/dav',
                   'dav'                => 'filesystem',
                   'dav_depth_infinity' => true,
-                  'dav_min_timeout'    => '600' },
+                  'dav_min_timeout'    => 600 },
                 {
                   'path'             => '/var/www/http2',
                   'h2_copy_files'    => true,
@@ -207,8 +200,8 @@
                       'url'             => 'http://backend-b/',
                       'keywords'        => ['noquery', 'interpolate'],
                       'params' => {
-                        'retry'   => '0',
-                        'timeout' => '5',
+                        'retry'   => 0,
+                        'timeout' => 5,
                       },
                     },
                   ],
@@ -221,8 +214,8 @@
                       'url'             => 'http://backend-b/',
                       'keywords'        => ['noquery', 'interpolate'],
                       'params' => {
-                        'retry'   => '0',
-                        'timeout' => '5',
+                        'retry'   => 0,
+                        'timeout' => 5,
                       },
                     },
                   ],
@@ -311,7 +304,7 @@
                   'provider'          => 'location',
                   'ssl_options'       => ['+ExportCertData', '+StdEnvVars'],
                   'ssl_verify_client' => 'optional',
-                  'ssl_verify_depth'  => '10',
+                  'ssl_verify_depth'  => 10,
                 },
               ],
               'error_log'                   => false,
@@ -354,8 +347,8 @@
                     },
                   ],
                   'params' => {
-                    'retry'   => '0',
-                    'timeout' => '5',
+                    'retry'   => 0,
+                    'timeout' => 5,
                   },
                   'setenv'   => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
                 },
@@ -368,8 +361,8 @@
                   'no_proxy_uris'       => ['/a/foo', '/a/bar'],
                   'no_proxy_uris_match' => ['/a/foomatch'],
                   'params' => {
-                    'retry'   => '0',
-                    'timeout' => '5',
+                    'retry'   => 0,
+                    'timeout' => 5,
                   },
                   'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
                 },
@@ -415,8 +408,8 @@
               'wsgi_application_group'      => '%{GLOBAL}',
               'wsgi_daemon_process'         => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
               'wsgi_daemon_process_options' => {
-                'processes'    => '2',
-                'threads'      => '15',
+                'processes'    => 2,
+                'threads'      => 15,
                 'display-name' => '%{GROUP}',
               },
               'wsgi_import_script'          => '/var/www/demo.wsgi',
@@ -527,8 +520,8 @@
               'krb_local_user_mapping'      => 'off',
               'http_protocol_options' => 'Strict LenientMethods Allow0.9',
               'keepalive'                   => 'on',
-              'keepalive_timeout'           => '100',
-              'max_keepalive_requests'      => '1000',
+              'keepalive_timeout'           => 100,
+              'max_keepalive_requests'      => 1000,
               'protocols'                   => ['h2', 'http/1.1'],
               'protocols_honor_order'       => true,
               'auth_oidc'                   => true,
@@ -593,7 +586,7 @@
                                                                             'require' => 'Package[httpd]',
                                                                             'notify'  => 'Class[Apache::Service]')
           }
-          if facts[:os]['release']['major'].to_i >= 18 && facts[:os]['name'] == 'Ubuntu'
+          if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu'
             it {
               is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
                                                                                     'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf")
@@ -919,7 +912,7 @@
         context 'vhost with scheme and port in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => '80',
+              'port'                          => 80,
               'ip'                            => '127.0.0.1',
               'ip_based'                      => true,
               'servername'                    => 'https://www.example.com:443',
@@ -943,7 +936,7 @@
         context 'vhost with scheme in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => '80',
+              'port'                          => 80,
               'ip'                            => '127.0.0.1',
               'ip_based'                      => true,
               'servername'                    => 'https://www.example.com',
@@ -967,7 +960,7 @@
         context 'vhost with port in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => '80',
+              'port'                          => 80,
               'ip'                            => '127.0.0.1',
               'ip_based'                      => true,
               'servername'                    => 'www.example.com:443',
@@ -991,7 +984,7 @@
         context 'vhost with servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => '80',
+              'port'                          => 80,
               'ip'                            => '127.0.0.1',
               'ip_based'                      => true,
               'servername'                    => 'www.example.com',
@@ -1015,7 +1008,7 @@
         context 'vhost with multiple ip addresses' do
           let :params do
             {
-              'port'                        => '80',
+              'port'                        => 80,
               'ip'                          => ['127.0.0.1', '::1'],
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1040,7 +1033,7 @@
         context 'vhost with multiple ports' do
           let :params do
             {
-              'port'                        => ['80', '8080'],
+              'port'                        => [80, 8080],
               'ip'                          => '127.0.0.1',
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1065,7 +1058,7 @@
         context 'vhost with multiple ip addresses, multiple ports' do
           let :params do
             {
-              'port'                        => ['80', '8080'],
+              'port'                        => [80, 8080],
               'ip'                          => ['127.0.0.1', '::1'],
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1094,7 +1087,7 @@
         context 'vhost with ipv6 address' do
           let :params do
             {
-              'port'                        => '80',
+              'port'                        => 80,
               'ip'                          => '::1',
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1117,7 +1110,7 @@
         context 'vhost with wildcard ip address' do
           let :params do
             {
-              'port'                        => '80',
+              'port'                        => 80,
               'ip'                          => '*',
               'ip_based'                    => true,
               'servername'                  => 'example.com',
@@ -1316,7 +1309,6 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-requestheader') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-wsgi') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-custom_fragment') }
-          it { is_expected.not_to contain_concat__fragment('rspec.example.com-fastcgi') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-suexec') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-charsets') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-limits') }
@@ -1710,8 +1702,8 @@
             it { is_expected.to compile }
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
             # this works only with apache 2.4 and newer
-            if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i > 6) ||
-               (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i > 11)
+            if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) ||
+               (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11)
               it {
                 is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
                   content: %r{^\s+Require all granted$},
@@ -1724,9 +1716,9 @@
 
           # the following style is only present on Apache 2.2
           # That is used in SLES 11, RHEL6, Amazon Linux
-          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
-             (facts[:os]['name'] == 'Amazon') ||
-             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
+          if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) ||
+             (os_facts[:os]['name'] == 'Amazon') ||
+             (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12)
             context 'apache 2.2 access controls on directories' do
               let :params do
                 {
@@ -1766,25 +1758,6 @@
             end
           end
 
-          # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu
-          unless facts[:os]['family'] == 'Debian' || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
-            describe 'fastcgi options' do
-              let :params do
-                {
-                  'docroot'              => '/var/www/foo',
-                  'fastcgi_server'       => 'localhost',
-                  'fastcgi_socket'       => '/tmp/fastcgi.socket',
-                  'fastcgi_dir'          => '/tmp',
-                  'fastcgi_idle_timeout' => '120',
-                }
-              end
-
-              it { is_expected.to compile }
-              it { is_expected.to contain_class('apache::mod::fastcgi') }
-              it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') }
-            end
-          end
-
           context 'require unmanaged' do
             let :params do
               {
@@ -1808,7 +1781,7 @@
             }
           end
           describe 'redirectmatch_*' do
-            let(:params) { super().merge(port: '84') }
+            let(:params) { super().merge(port: 84) }
 
             context 'dest and regexp' do
               let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg', redirectmatch_regexp: "(.*)\.gif$") }
diff --git a/templates/mod/fastcgi.conf.erb b/templates/mod/fastcgi.conf.erb
deleted file mode 100644
index 93c8d86ab0..0000000000
--- a/templates/mod/fastcgi.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# The Fastcgi Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
-<IfModule mod_fastcgi.c>
-  <FilesMatch ".+(\.fcgi)$">
-    SetHandler fastcgi-script
-  </FilesMatch>
-  FastCgiIpcDir "<%= @fastcgi_lib_path %>"
-</IfModule>
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 1f05ee5b5a..0b5d91f629 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -93,8 +93,8 @@
 # - In Apache, you can use ErrorDocument to show a friendly error page or
 #   perform a redirect: https://httpd.apache.org/docs/2.4/custom-error.html
 #
-SecDefaultAction "phase:1,log,auditlog,pass"
-SecDefaultAction "phase:2,log,auditlog,pass"
+# SecDefaultAction "phase:1,log,auditlog,pass"
+# SecDefaultAction "phase:2,log,auditlog,pass"
 
 # Example: Anomaly Scoring mode, log only to ModSecurity audit log
 # - By default, offending requests are blocked with an error 403 response.
diff --git a/templates/vhost/_fastcgi.erb b/templates/vhost/_fastcgi.erb
deleted file mode 100644
index b4718391b7..0000000000
--- a/templates/vhost/_fastcgi.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% if @fastcgi_server -%>
-
-  FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket -%>
-<%   unless @fastcgi_idle_timeout.nil? %> -idle-timeout <%= @fastcgi_idle_timeout %><% end %>
-<% end -%>
-<% if @fastcgi_dir -%>
-
-  <Directory "<%= @fastcgi_dir %>">
-    Options +ExecCGI
-    AllowOverride All
-    SetHandler fastcgi-script
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all granted
-  <%- else -%>
-    Order allow,deny
-    Allow From All
-  <%- end -%>
-    AuthBasicAuthoritative Off
-  </Directory>
-
-  AllowEncodedSlashes On
-  ServerSignature Off
-<% end -%>
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 51933c7023..88219f7669 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -1,7 +1,7 @@
 # https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 type Apache::OIDCSettings = Struct[
   {
-    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl,Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
+    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
     Optional['CryptoPassphrase']                        => String,
     Optional['MetadataDir']                             => String,
     Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,
@@ -9,78 +9,78 @@
     Optional['ProviderAuthorizationEndpoint']           => Stdlib::HTTPSUrl,
     Optional['ProviderJwksUri']                         => Stdlib::HTTPSUrl,
     Optional['ProviderTokenEndpoint']                   => Stdlib::HTTPSUrl,
-    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','none'],
+    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'none'],
     Optional['ProviderTokenEndpointParams']             => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['ProviderUserInfoEndpoint']                => Stdlib::HTTPSUrl,
     Optional['ProviderCheckSessionIFrame']              => Stdlib::HTTPSUrl,
     Optional['ProviderEndSessionEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
-    Optional['ProviderBackChannelLogoutSupported']      => Enum['On','Off'],
+    Optional['ProviderBackChannelLogoutSupported']      => Enum['On', 'Off'],
     Optional['ProviderRegistrationEndpointJson']        => String,
     Optional['Scope']                                   => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['SSLValidateServer']                       => Enum['On','Off'],
+    Optional['SSLValidateServer']                       => Enum['On', 'Off'],
     Optional['UserInfoRefreshInterval']                 => Integer,
     Optional['JWKSRefreshInterval']                     => Integer,
-    Optional['UserInfoTokenMethod']                     => Enum['authz_header','post_param'],
-    Optional['ProviderAuthRequestMethod']               => Enum['GET','POST'],
+    Optional['UserInfoTokenMethod']                     => Enum['authz_header', 'post_param'],
+    Optional['ProviderAuthRequestMethod']               => Enum['GET', 'POST'],
     Optional['PublicKeyFiles']                          => String,
-    Optional['ResponseType']                            => Enum['code','id_token','id_token token','code id_token','code token','code id_token token'],
-    Optional['ResponseMode']                            => Enum['fragment','query','form_post'],
+    Optional['ResponseType']                            => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
+    Optional['ResponseMode']                            => Enum['fragment', 'query', 'form_post'],
     Optional['ClientID']                                => String,
     Optional['ClientSecret']                            => String,
     Optional['ClientTokenEndpointCert']                 => String,
     Optional['ClientTokenEndpointKey']                  => String,
     Optional['ClientName']                              => String,
     Optional['ClientContact']                           => String,
-    Optional['PKCDMethod']                              => Enum['plain','S256','referred_tb'],
-    Optional['TokenBindingPolicy']                      => Enum['disabled','optional','required','enforced'],
+    Optional['PKCDMethod']                              => Enum['plain', 'S256', 'referred_tb'],
+    Optional['TokenBindingPolicy']                      => Enum['disabled', 'optional', 'required', 'enforced'],
     Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
-    Optional['IDTokenSignedResponseAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
-    Optional['UserInfoSignedResposeAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
-    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
-    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
+    Optional['IDTokenSignedResponseAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['UserInfoSignedResposeAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
     Optional['OAuthServerMetadataURL']                  => Stdlib::HTTPSUrl,
     Optional['AuthIntrospectionEndpoint']               => Stdlib::HTTPSUrl,
     Optional['OAuthClientID']                           => String,
     Optional['OAuthClientSecret']                       => String,
-    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','bearer_access_token','none'],
+    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
     Optional['OAuthIntrospectionClientAuthBearerToken'] => String,
     Optional['OAuthIntrospectionEndpointCert']          => String,
     Optional['OAuthIntrospectionEndpointKey']           => String,
-    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST','GET'],
+    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']        => String,
     Optional['OAuthTokenExpiryClaim']                   => Pattern[/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/],
-    Optional['OAuthSSLValidateServer']                  => Enum['On','Off'],
+    Optional['OAuthSSLValidateServer']                  => Enum['On', 'Off'],
     Optional['OAuthVerifySharedKeys']                   => String,
     Optional['OAuthVerifyCertFiles']                    => String,
     Optional['OAuthVerifyJwksUri']                      => Stdlib::HTTPSUrl,
     Optional['OAuthRemoteUserClaim']                    => String,
     Optional['OAuthAcceptTokenAs']                      => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
-    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled','optional','required','enforced'],
+    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled', 'optional', 'required', 'enforced'],
     Optional['Cookie']                                  => String,
     Optional['SessionCookieChunkSize']                  => Integer,
-    Optional['CookieHTTPOnly']                          => Enum['On','Off'],
-    Optional['CookieSameSite']                          => Enum['On','Off'],
+    Optional['CookieHTTPOnly']                          => Enum['On', 'Off'],
+    Optional['CookieSameSite']                          => Enum['On', 'Off'],
     Optional['PassCookies']                             => String,
     Optional['StripCookies']                            => String,
     Optional['StateMaxNumberOfCookies']                 => Pattern[/^[0-9]+\s(false|true)$/],
     Optional['SessionInactivityTimeout']                => Integer,
     Optional['SessionMaxDuration']                      => Integer,
     Optional['SessionType']                             => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/],
-    Optional['SessionCacheFallbackToCookie']            => Enum['On','Off'],
-    Optional['CacheType']                               => Enum['shm','memcache','file','redis'],
-    Optional['CacheEncrypt']                            => Enum['On','Off'],
+    Optional['SessionCacheFallbackToCookie']            => Enum['On', 'Off'],
+    Optional['CacheType']                               => Enum['shm', 'memcache', 'file', 'redis'],
+    Optional['CacheEncrypt']                            => Enum['On', 'Off'],
     Optional['CacheShmMax']                             => Integer,
     Optional['CacheShmEntrySizeMax']                    => Integer,
     Optional['CacheFileCleanInterval']                  => Integer,
     Optional['MemCacheServers']                         => String,
     Optional['RedisCacheServer']                        => String,
     Optional['RedisCachePassword']                      => String,
-    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
     Optional['HTMLErrorTemplate']                       => String,
     Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
     Optional['PathScope']                               => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
@@ -91,17 +91,17 @@
     Optional['RemoteUserClaim']                         => String,
     Optional['PassIDTokenAs']                           => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                          => Pattern[/^((claims|json|jwt)\s?)+$/],
-    Optional['PassClaimsAs']                            => Enum['none','headers','environment','both'],
+    Optional['PassClaimsAs']                            => Enum['none', 'headers', 'environment', 'both'],
     Optional['AuthNHeader']                             => String,
     Optional['HTTPTimeoutLong']                         => Integer,
     Optional['HTTPTimeoutShort']                        => Integer,
     Optional['StateTimeout']                            => Integer,
-    Optional['ScrubRequestHeaders']                     => Enum['On','Off'],
+    Optional['ScrubRequestHeaders']                     => Enum['On', 'Off'],
     Optional['OutgoingProxy']                           => String,
-    Optional['UnAuthAction']                            => Enum['auth','pass','401','410'],
-    Optional['UnAuthzAction']                           => Enum['401','403','auth'],
-    Optional['PreservePost']                            => Enum['On','Off'],
-    Optional['PassRefreshToken']                        => Enum['On','Off'],
+    Optional['UnAuthAction']                            => Enum['auth', 'pass', '401', '410'],
+    Optional['UnAuthzAction']                           => Enum['401', '403', 'auth'],
+    Optional['PreservePost']                            => Enum['On', 'Off'],
+    Optional['PassRefreshToken']                        => Enum['On', 'Off'],
     Optional['RequestObject']                           => String,
     Optional['ProviderMetadataRefreshInterval']         => Integer,
     Optional['InfoHook']                                => Pattern[/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/],
diff --git a/types/servertokens.pp b/types/servertokens.pp
new file mode 100644
index 0000000000..4e2171f71e
--- /dev/null
+++ b/types/servertokens.pp
@@ -0,0 +1,4 @@
+# @summary A string that conforms to the Apache `ServerTokens` syntax.
+#
+# @see https://httpd.apache.org/docs/2.4/mod/core.html#servertokens
+type Apache::ServerTokens = Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']
diff --git a/types/vhost/proxypass.pp b/types/vhost/proxypass.pp
index d2d9729349..c02ae12821 100644
--- a/types/vhost/proxypass.pp
+++ b/types/vhost/proxypass.pp
@@ -63,7 +63,7 @@
 #
 # @example With mod_proxy environment variables
 #   { 'path' => '/f', 'url' => 'http://backend-f/',
-#     'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'], }
+#     'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'], }
 #
 # @example With ProxyPassReverseCookieDomain and ProxyPassReverseCookiePath
 #   { 'path' => '/g', 'url' => 'http://backend-g/',
@@ -75,18 +75,24 @@
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
 #
-type Apache::Vhost::ProxyPass = Struct[{
-  path                          => String[1],
-  url                           => String[1],
-  Optional[params]              => Hash[String[1], Variant[String[1], Integer]],
-  Optional[keywords]            => Array[String[1]],
-  Optional[reverse_cookies]     => Array[Struct[{
-    url    => String[1],
-    path   => Optional[String[1]],
-    domain => Optional[String[1]],
-  }]],
-  Optional[reverse_urls]        => Array[String[1]],
-  Optional[setenv]              => Array[String[1]],
-  Optional[no_proxy_uris]       => Array[String[1]],
-  Optional[no_proxy_uris_match] => Array[String[1]],
-}]
+type Apache::Vhost::ProxyPass = Struct[
+  {
+    path                          => String[1],
+    url                           => String[1],
+    Optional[params]              => Hash[String[1], Variant[String[1], Integer]],
+    Optional[keywords]            => Array[String[1]],
+    Optional[reverse_cookies]     => Array[
+      Struct[
+        {
+          url    => String[1],
+          path   => Optional[String[1]],
+          domain => Optional[String[1]],
+        }
+      ]
+    ],
+    Optional[reverse_urls]        => Array[String[1]],
+    Optional[setenv]              => Array[String[1]],
+    Optional[no_proxy_uris]       => Array[String[1]],
+    Optional[no_proxy_uris_match] => Array[String[1]],
+  }
+]

From 8eafd5d2407d9de8bdc4b3722d55946d2c86f305 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Fri, 29 Jul 2022 15:57:38 +0200
Subject: [PATCH 1982/2267] Allow overriding CRS anomaly threshold per vhost

---
 manifests/vhost.pp            | 16 +++++++++++++++-
 templates/vhost/_security.erb | 10 ++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f56b7331be..423ecbea73 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -552,6 +552,16 @@
 #   If none of those parameters are set, the global audit log is used 
 #   (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 #
+# @param modsec_inbound_anomaly_threshold
+#   Override the global scoring threshold level of the inbound blocking rules
+#   for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
+#   Set.
+#
+# @param modsec_outbound_anomaly_threshold
+#   Override the global scoring threshold level of the outbound blocking rules
+#   for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
+#   Set.
+#
 # @param no_proxy_uris
 #   Specifies URLs you do not want to proxy. This parameter is meant to be used in combination 
 #   with [`proxy_dest`](#proxy_dest).
@@ -1901,6 +1911,8 @@
   Optional[Variant[Hash, Array]] $modsec_disable_msgs                                 = undef,
   Optional[Variant[Hash, Array]] $modsec_disable_tags                                 = undef,
   Optional[String] $modsec_body_limit                                                 = undef,
+  Optional[Integer[1, default]] $modsec_inbound_anomaly_threshold                     = undef,
+  Optional[Integer[1, default]] $modsec_outbound_anomaly_threshold                    = undef,
   Array[Hash] $jk_mounts                                                              = [],
   Boolean $auth_kerb                                                                  = false,
   Enum['on', 'off'] $krb_method_negotiate                                             = 'on',
@@ -2786,7 +2798,9 @@
   # - $modsec_disable_tags
   # - $modsec_body_limit
   # - $modsec_audit_log_destination
-  if $modsec_disable_vhost or $modsec_disable_ids or !empty($modsec_disable_ips) or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination {
+  # - $modsec_inbound_anomaly_threshold
+  # - $modsec_outbound_anomaly_threshold
+  if $modsec_disable_vhost or $modsec_disable_ids or !empty($modsec_disable_ips) or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination or ($modsec_inbound_anomaly_threshold and $modsec_outbound_anomaly_threshold) {
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
       order   => 320,
diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
index a7e02e6c59..7dbb7494d5 100644
--- a/templates/vhost/_security.erb
+++ b/templates/vhost/_security.erb
@@ -39,4 +39,14 @@
 <% if @modsec_body_limit -%>
   SecRequestBodyLimit <%= @modsec_body_limit %>
 <% end -%>
+<% if @modsec_inbound_anomaly_threshold and @modsec_outbound_anomaly_threshold -%>
+  SecAction \
+   "id:900110,\
+    phase:1,\
+    nolog,\
+    pass,\
+    t:none,\
+    setvar:tx.inbound_anomaly_score_threshold=<%= @modsec_inbound_anomaly_threshold -%>, \
+    setvar:tx.outbound_anomaly_score_threshold=<%= @modsec_outbound_anomaly_threshold -%>"
+<% end -%>
 </IfModule>

From 38a3873a6c481eae3f5fc479a00cb23e5de78318 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Mon, 1 Aug 2022 21:47:31 +0200
Subject: [PATCH 1983/2267] Add tests for CRS anomaly threshold per vhost

---
 spec/defines/vhost_spec.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9d59e9d2bf..300250e974 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1202,6 +1202,33 @@
             )
           }
         end
+
+        context 'modsec_anomaly_threshold' do
+          let :params do
+            {
+              'docroot'                           => '/rspec/docroot',
+              'modsec_inbound_anomaly_threshold'  => 10_000,
+              'modsec_outbound_anomaly_threshold' => 10_000,
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+              content: %r{
+                ^\s+SecAction\ \\\n
+                \s+\"id:900110,\\\n
+                \s+phase:1,\\\n
+                \s+nolog,\\\n
+                \s+pass,\\\n
+                \s+t:none,\\\n
+                \s+setvar:tx.inbound_anomaly_score_threshold=10000,\ \\\n
+                \s+setvar:tx.outbound_anomaly_score_threshold=10000"$
+              }x,
+            )
+          }
+        end
+
         context 'set only aliases' do
           let :params do
             {

From c11ab1fdce6ab11cbcb1d55deadf1531191c9e35 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 2 Aug 2022 00:16:07 +0200
Subject: [PATCH 1984/2267] Allow vhosts to have a string priority again

In f41251e336fa3e7c31c19968ccee74121cf71e47 the type was narrowed to no
longer allow strings, but this can cause problems.

Sorting is alphabetical and you need to format it for the correct
sorting. So to make sure 2 loads before 10 you need to format it as 02.
While the vhost can do some printf style magic to change 2 to 02, it
must then also know what the highest number is. Otherwise 100 is sorted
before 20. By allowing strings, you allow the caller to fix this.

A type alias is introduced to reduce duplication and make it easier to
track.

Fixes: f41251e336fa3e7c31c19968ccee74121cf71e47
---
 manifests/vhost.pp                       |  2 +-
 manifests/vhost/custom.pp                |  2 +-
 manifests/vhost/fragment.pp              |  2 +-
 manifests/vhost/proxy.pp                 |  2 +-
 spec/type_aliases/vhost_priority_spec.rb | 23 +++++++++++++++++++++++
 types/vhost/priority.pp                  |  2 ++
 6 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 spec/type_aliases/vhost_priority_spec.rb
 create mode 100644 types/vhost/priority.pp

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f56b7331be..c0fc87e6e3 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1730,7 +1730,7 @@
   Optional[Integer] $ssl_stapling_timeout                                             = undef,
   Optional[Enum['on', 'off']] $ssl_stapling_return_errors                             = undef,
   Optional[String] $ssl_user_name                                                     = undef,
-  Optional[Variant[Integer, Boolean]] $priority                                       = undef,
+  Optional[Apache::Vhost::Priority] $priority                                         = undef,
   Boolean $default_vhost                                                              = false,
   Optional[String] $servername                                                        = $name,
   Variant[Array[String], String] $serveraliases                                       = [],
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
index 4e208d578d..30cd17938f 100644
--- a/manifests/vhost/custom.pp
+++ b/manifests/vhost/custom.pp
@@ -18,7 +18,7 @@
 define apache::vhost::custom (
   String $content,
   String $ensure                      = 'present',
-  Variant[Integer, Boolean] $priority = 25,
+  Apache::Vhost::Priority $priority   = 25,
   Boolean $verify_config              = true,
 ) {
   include apache
diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
index e29d637d21..f88ef3aead 100644
--- a/manifests/vhost/fragment.pp
+++ b/manifests/vhost/fragment.pp
@@ -59,7 +59,7 @@
 define apache::vhost::fragment (
   String[1] $vhost,
   Optional[Stdlib::Port] $port                  = undef,
-  Optional[Variant[Integer, Boolean]] $priority = undef,
+  Optional[Apache::Vhost::Priority] $priority   = undef,
   Optional[String] $content                     = undef,
   Integer[0] $order                             = 900,
 ) {
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 6ae89d41f1..f3766d6900 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -106,7 +106,7 @@
 #
 define apache::vhost::proxy (
   String[1] $vhost,
-  Optional[Variant[Integer, Boolean]] $priority               = undef,
+  Optional[Apache::Vhost::Priority] $priority                 = undef,
   Integer[0] $order                                           = 170,
   Optional[Stdlib::Port] $port                                = undef,
   Optional[String[1]] $proxy_dest                             = undef,
diff --git a/spec/type_aliases/vhost_priority_spec.rb b/spec/type_aliases/vhost_priority_spec.rb
new file mode 100644
index 0000000000..fba8cebdfb
--- /dev/null
+++ b/spec/type_aliases/vhost_priority_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Apache::Vhost::Priority' do
+  # Pattern
+  it { is_expected.to allow_value('10') }
+  it { is_expected.to allow_value('010') }
+  it { is_expected.not_to allow_value('') }
+  it { is_expected.not_to allow_value('a') }
+  it { is_expected.not_to allow_value('a1') }
+  it { is_expected.not_to allow_value('1a') }
+
+  # Integer
+  it { is_expected.to allow_value(0) }
+  it { is_expected.to allow_value(1) }
+
+  # Boolean
+  it { is_expected.to allow_value(true) } # Technically an illegal value
+  it { is_expected.to allow_value(false) }
+
+  it { is_expected.not_to allow_value(nil) }
+end
diff --git a/types/vhost/priority.pp b/types/vhost/priority.pp
new file mode 100644
index 0000000000..36222eea70
--- /dev/null
+++ b/types/vhost/priority.pp
@@ -0,0 +1,2 @@
+# @summary The priority on vhost
+type Apache::Vhost::Priority = Variant[Pattern[/^\d+$/], Integer, Boolean]

From a4340dbaf66eacbb6d2a40ff5c9dedef81a479b4 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Fri, 29 Jul 2022 13:40:33 +0200
Subject: [PATCH 1985/2267] Allow configuring SecRequestBodyAccess

---
 manifests/mod/security.pp       | 5 +++++
 templates/mod/security.conf.erb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 2faa4cfc1f..d049087668 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -95,6 +95,9 @@
 # @param secrequestbodyinmemorylimit
 #   Configures the maximum request body size that ModSecurity will store in memory.
 # 
+# @param secrequestbodyaccess
+#   Toggle SecRequestBodyAccess On or Off
+# 
 # @param manage_security_crs
 #   Toggles whether to manage ModSecurity Core Rule Set 
 #
@@ -132,6 +135,7 @@
   Integer $secrequestbodyinmemorylimit                  = 131072,
   Integer[1,4] $paranoia_level                          = 1,
   Integer[1,4] $executing_paranoia_level                = $paranoia_level,
+  Enum['On', 'Off'] $secrequestbodyaccess               = 'On',
   Boolean $manage_security_crs                          = true,
 ) inherits apache::params {
   include apache
@@ -197,6 +201,7 @@
   # - secrequestbodylimit
   # - secrequestbodynofileslimit
   # - secrequestbodyinmemorylimit
+  # - secrequestbodyaccess
   file { 'security.conf':
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 0302cebf36..622a6f890e 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -1,7 +1,7 @@
 <IfModule mod_security2.c>
     # Default recommended configuration
     SecRuleEngine <%= @modsec_secruleengine %>
-    SecRequestBodyAccess On
+    SecRequestBodyAccess <%= @secrequestbodyaccess %>
   <%- if @custom_rules -%>
     Include <%= @modsec_dir %>/custom_rules/*.conf
   <%- end -%>

From 9aecf77bcff6cbe24c1918827e83606286235646 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Fri, 29 Jul 2022 13:41:06 +0200
Subject: [PATCH 1986/2267] Allow configuring SecResponseBodyAccess

---
 manifests/mod/security.pp       | 5 +++++
 templates/mod/security.conf.erb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index d049087668..14596193a0 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -98,6 +98,9 @@
 # @param secrequestbodyaccess
 #   Toggle SecRequestBodyAccess On or Off
 # 
+# @param secresponsebodyaccess
+#   Toggle SecResponseBodyAccess On or Off
+# 
 # @param manage_security_crs
 #   Toggles whether to manage ModSecurity Core Rule Set 
 #
@@ -136,6 +139,7 @@
   Integer[1,4] $paranoia_level                          = 1,
   Integer[1,4] $executing_paranoia_level                = $paranoia_level,
   Enum['On', 'Off'] $secrequestbodyaccess               = 'On',
+  Enum['On', 'Off'] $secresponsebodyaccess              = 'Off',
   Boolean $manage_security_crs                          = true,
 ) inherits apache::params {
   include apache
@@ -202,6 +206,7 @@
   # - secrequestbodynofileslimit
   # - secrequestbodyinmemorylimit
   # - secrequestbodyaccess
+  # - secresponsebodyaccess
   file { 'security.conf':
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 622a6f890e..db04b89338 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -40,7 +40,7 @@
     SecRule TX:/^MSC_/ "!@streq 0" \
       "id:'200004',phase:2,t:none,deny,msg:'ModSecurity internal error flagged: %{MATCHED_VAR_NAME}'"
 
-    SecResponseBodyAccess Off
+    SecResponseBodyAccess <%= @secresponsebodyaccess %>
     SecResponseBodyMimeType text/plain text/html text/xml
     SecResponseBodyLimit 524288
     SecResponseBodyLimitAction ProcessPartial

From e3f10c89cf31fdb0c09566362732f5afa7503c0f Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Mon, 1 Aug 2022 20:48:43 +0200
Subject: [PATCH 1987/2267] Add tests for SecBodyAccess params

---
 spec/classes/mod/security_spec.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index dd96379a9b..e773388922 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -79,6 +79,8 @@
                 audit_log_type: 'Concurrent',
                 audit_log_storage_dir: '/var/log/httpd/audit',
                 secdefaultaction: 'deny,status:406,nolog,auditlog',
+                secrequestbodyaccess: 'Off',
+                secresponsebodyaccess: 'On',
               }
             end
 
@@ -86,6 +88,8 @@
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogType Concurrent$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyAccess Off$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyAccess On$} }
             it { is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
             it {
               is_expected.to contain_file('bar.conf').with(
@@ -227,6 +231,8 @@
                 audit_log_type: 'Concurrent',
                 audit_log_storage_dir: '/var/log/httpd/audit',
                 secdefaultaction: 'deny,status:406,nolog,auditlog',
+                secrequestbodyaccess: 'Off',
+                secresponsebodyaccess: 'On',
               }
             end
 
@@ -235,6 +241,8 @@
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
+              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyAccess Off$} }
+              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyAccess On$} }
               it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
               it {
                 is_expected.to contain_file('bar.conf').with(

From c582f70610a50a5d87655b948fb0c360afd3a3f8 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Fri, 29 Jul 2022 16:49:35 +0200
Subject: [PATCH 1988/2267] Allow overriding CRS allowed HTTP methods per vhost

---
 manifests/vhost.pp            | 7 ++++++-
 templates/vhost/_security.erb | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d35e7a97e3..03c9465119 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -562,6 +562,9 @@
 #   for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
 #   Set.
 #
+# @param modsec_allowed_methods
+#   Override global allowed methods. A space-separated list of allowed HTTP methods.
+#
 # @param no_proxy_uris
 #   Specifies URLs you do not want to proxy. This parameter is meant to be used in combination 
 #   with [`proxy_dest`](#proxy_dest).
@@ -1913,6 +1916,7 @@
   Optional[String] $modsec_body_limit                                                 = undef,
   Optional[Integer[1, default]] $modsec_inbound_anomaly_threshold                     = undef,
   Optional[Integer[1, default]] $modsec_outbound_anomaly_threshold                    = undef,
+  Optional[String] $modsec_allowed_methods                                            = undef,
   Array[Hash] $jk_mounts                                                              = [],
   Boolean $auth_kerb                                                                  = false,
   Enum['on', 'off'] $krb_method_negotiate                                             = 'on',
@@ -2800,7 +2804,8 @@
   # - $modsec_audit_log_destination
   # - $modsec_inbound_anomaly_threshold
   # - $modsec_outbound_anomaly_threshold
-  if $modsec_disable_vhost or $modsec_disable_ids or !empty($modsec_disable_ips) or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination or ($modsec_inbound_anomaly_threshold and $modsec_outbound_anomaly_threshold) {
+  # - $modsec_allowed_methods
+  if $modsec_disable_vhost or $modsec_disable_ids or !empty($modsec_disable_ips) or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination or ($modsec_inbound_anomaly_threshold and $modsec_outbound_anomaly_threshold) or $modsec_allowed_methods {
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
       order   => 320,
diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
index 7dbb7494d5..0d804d683c 100644
--- a/templates/vhost/_security.erb
+++ b/templates/vhost/_security.erb
@@ -49,4 +49,13 @@
     setvar:tx.inbound_anomaly_score_threshold=<%= @modsec_inbound_anomaly_threshold -%>, \
     setvar:tx.outbound_anomaly_score_threshold=<%= @modsec_outbound_anomaly_threshold -%>"
 <% end -%>
+<% if @modsec_allowed_methods -%>
+  SecAction \
+   "id:900200,\
+    phase:1,\
+    nolog,\
+    pass,\
+    t:none,\
+    setvar:'tx.allowed_methods=<%= @modsec_allowed_methods -%>'"
+<% end -%>
 </IfModule>

From 54d08fa454a628945010b5ce96b25d3cbca97444 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Mon, 1 Aug 2022 22:42:43 +0200
Subject: [PATCH 1989/2267] Add tests for CRS allowed HTTP methods per vhost

---
 spec/defines/vhost_spec.rb | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 300250e974..74020b9da3 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1229,6 +1229,29 @@
           }
         end
 
+        context 'modsec_allowed_methods' do
+          let :params do
+            {
+              'docroot'                => '/rspec/docroot',
+              'modsec_allowed_methods' => 'GET HEAD POST OPTIONS',
+            }
+          end
+
+          it { is_expected.to compile }
+          it {
+            is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+              content: %r{
+              ^\s+SecAction\ \\\n
+              \s+\"id:900200,\\\n
+              \s+phase:1,\\\n
+              \s+nolog,\\\n\s+pass,\\\n
+              \s+t:none,\\\n
+              \s+setvar:'tx.allowed_methods=GET\ HEAD\ POST\ OPTIONS'"$
+              }x,
+            )
+          }
+        end
+
         context 'set only aliases' do
           let :params do
             {

From 51bc232f618fc4a50c75a3f077a9aa800c8080b3 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 4 Aug 2022 14:28:28 +0200
Subject: [PATCH 1990/2267] Declare mod_php unsupported on EL9

EL 9 doesn't ship mod_php, so this is uninstallable. By making it a
required parameter (which effectively was already the case) and setting
the version to undef the catalog fails to compile by default. This still
allows users to set it if they build a mod_php somehow.

EL 9 users should use php-fpm instead.

Fixes: edbdb65b06418779aa30ebe6cf0948007cc51a29
---
 manifests/mod/php.pp            |   7 +-
 manifests/params.pp             |   2 +-
 spec/acceptance/mod_php_spec.rb | 169 ++++++++++++++--------------
 spec/classes/mod/php_spec.rb    | 191 ++++++++++++++++----------------
 4 files changed, 186 insertions(+), 183 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 844b207094..57cabb489d 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -21,10 +21,11 @@
 #   UNIX group of the root user
 #
 # @param php_version
-#   The php version
+#   The php version. This is a required parameter, but optional allows showing a clear error message
 #
 # @param libphp_prefix
 #
+# @note Unsupported platforms: RedHat: 9
 class apache::mod::php (
   Optional[String] $package_name = undef,
   String $package_ensure         = 'present',
@@ -37,6 +38,10 @@
   Optional[String] $php_version  = $apache::params::php_version,
   String $libphp_prefix          = 'libphp'
 ) inherits apache::params {
+  unless $php_version {
+    fail("${facts['os']['name']} ${facts['os']['release']['major']} does not support mod_php")
+  }
+
   include apache
   if (versioncmp($php_version, '8') < 0) {
     $mod = "php${php_version}"
diff --git a/manifests/params.pp b/manifests/params.pp
index d5ff15195f..7cdca1f83d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -197,7 +197,7 @@
     $passenger_ruby       = undef
     $passenger_default_ruby = undef
     $php_version = $facts['os']['release']['major'] ? {
-      '9'     => '8', # RedHat9
+      '9'     => undef, # RedHat 9 doesn't ship mod_php
       '8'     => '7', # RedHat8
       default => '5', # RedHat5, RedHat6, RedHat7
     }
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index cc8ee4b9fa..28dc692b7a 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -3,101 +3,94 @@
 require 'spec_helper_acceptance'
 apache_hash = apache_settings_hash
 
-# Temporary exclusion pending resolution of https://github.com/puppetlabs/puppetlabs-apache/issues/2261
-unless os[:family] == 'redhat' && os[:release].to_i == 9
-  describe 'apache::mod::php class', if: mod_supported_on_platform?('apache::mod::php') do
-    context 'default php config' do
-      pp = <<-MANIFEST
-          class { 'apache':
-            mpm_module => 'prefork',
-          }
-          class { 'apache::mod::php': }
-          apache::vhost { 'php.example.com':
-            port    => 80,
-            docroot => '#{apache_hash['doc_root']}/php',
-          }
-          host { 'php.example.com': ip => '127.0.0.1', }
-          file { '#{apache_hash['doc_root']}/php/index.php':
-            ensure  => file,
-            content => "<?php phpinfo(); ?>\\n",
-          }
-      MANIFEST
-      it 'succeeds in puppeting php' do
-        apply_manifest(pp, catch_failures: true)
-      end
+describe 'apache::mod::php class', if: mod_supported_on_platform?('apache::mod::php') do
+  context 'default php config' do
+    pp = <<-MANIFEST
+        class { 'apache':
+          mpm_module => 'prefork',
+        }
+        class { 'apache::mod::php': }
+        apache::vhost { 'php.example.com':
+          port    => 80,
+          docroot => '#{apache_hash['doc_root']}/php',
+        }
+        host { 'php.example.com': ip => '127.0.0.1', }
+        file { '#{apache_hash['doc_root']}/php/index.php':
+          ensure  => file,
+          content => "<?php phpinfo(); ?>\\n",
+        }
+    MANIFEST
+    it 'succeeds in puppeting php' do
+      apply_manifest(pp, catch_failures: true)
+    end
 
-      if os[:family] == 'debian' && os[:release] =~ %r{^9\.}
-        describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'debian' && os[:release] =~ %r{^10\.}
-        describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'debian' && os[:release] =~ %r{^11\.}
-        describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
-        describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'ubuntu' && os[:release] == '20.04'
-        describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'redhat' && os[:release] =~ %r{^(9)\b}
-        describe file("#{apache_hash['mod_dir']}/php.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'redhat' && os[:release] =~ %r{^(8)\b}
-        describe file("#{apache_hash['mod_dir']}/php7.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      elsif os[:family] == 'sles' && os[:release].to_i >= 15
-        describe file("#{apache_hash['mod_dir']}/php7.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
-      else
-        describe file("#{apache_hash['mod_dir']}/php5.conf") do
-          it { is_expected.to contain 'DirectoryIndex index.php' }
-        end
+    if os[:family] == 'debian' && os[:release] =~ %r{^9\.}
+      describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'debian' && os[:release] =~ %r{^10\.}
+      describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'debian' && os[:release] =~ %r{^11\.}
+      describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
+      describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'ubuntu' && os[:release] == '20.04'
+      describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'redhat' && os[:release] =~ %r{^(8)\b}
+      describe file("#{apache_hash['mod_dir']}/php7.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    elsif os[:family] == 'sles' && os[:release].to_i >= 15
+      describe file("#{apache_hash['mod_dir']}/php7.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
+    else
+      describe file("#{apache_hash['mod_dir']}/php5.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
       end
     end
+  end
 
-    context 'custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value' do
-      pp = <<-MANIFEST
-          class { 'apache':
-            mpm_module => 'prefork',
-          }
-          class { 'apache::mod::php':
-          extensions => ['.php','.php5'],
+  context 'custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value' do
+    pp = <<-MANIFEST
+        class { 'apache':
+          mpm_module => 'prefork',
         }
+        class { 'apache::mod::php':
+        extensions => ['.php','.php5'],
+      }
 
-          apache::vhost { 'php.example.com':
-            port             => 80,
-            docroot          => '#{apache_hash['doc_root']}/php',
-            php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
-            php_flags        => { 'display_errors' => 'on', },
-            php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
-            php_admin_flags  => { 'engine' => 'on', },
-          }
-          host { 'php.example.com': ip => '127.0.0.1', }
-          file { '#{apache_hash['doc_root']}/php/index.php5':
-            ensure  => file,
-            content => "<?php phpinfo(); ?>\\n",
-          }
-      MANIFEST
-      it 'succeeds in puppeting php' do
-        apply_manifest(pp, catch_failures: true)
-      end
+        apache::vhost { 'php.example.com':
+          port             => 80,
+          docroot          => '#{apache_hash['doc_root']}/php',
+          php_values       => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', },
+          php_flags        => { 'display_errors' => 'on', },
+          php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
+          php_admin_flags  => { 'engine' => 'on', },
+        }
+        host { 'php.example.com': ip => '127.0.0.1', }
+        file { '#{apache_hash['doc_root']}/php/index.php5':
+          ensure  => file,
+          content => "<?php phpinfo(); ?>\\n",
+        }
+    MANIFEST
+    it 'succeeds in puppeting php' do
+      apply_manifest(pp, catch_failures: true)
+    end
 
-      describe file("#{apache_hash['vhost_dir']}/25-php.example.com.conf") do
-        it { is_expected.to contain '  php_flag display_errors on' }
-        it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
-        it { is_expected.to contain '  php_admin_flag engine on' }
-        it { is_expected.to contain '  php_admin_value open_basedir /var/www/php/:/usr/share/pear/' }
-      end
+    describe file("#{apache_hash['vhost_dir']}/25-php.example.com.conf") do
+      it { is_expected.to contain '  php_flag display_errors on' }
+      it { is_expected.to contain '  php_value include_path ".:/usr/share/pear:/usr/bin/php"' }
+      it { is_expected.to contain '  php_admin_flag engine on' }
+      it { is_expected.to contain '  php_admin_value open_basedir /var/www/php/:/usr/share/pear/' }
     end
   end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index ffd4f4a950..4b5b8c8a69 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -93,115 +93,120 @@
           end
         end
       when 'RedHat'
-        describe 'on a RedHat OS' do
-          context 'with default params' do
-            let :pre_condition do
-              'class { "apache": }'
-            end
+        case facts[:os]['release']['major']
+        when '9'
+          it { is_expected.to compile.and_raise_error(%r{RedHat 9 does not support mod_php}) }
+        else
+          describe 'on a RedHat OS' do
+            context 'with default params' do
+              let :pre_condition do
+                'class { "apache": }'
+              end
 
-            it { is_expected.to contain_class('apache::params') }
-            it { is_expected.to contain_package('php') }
-            if facts[:os]['release']['major'].to_i < 8
-              it { is_expected.to contain_apache__mod('php5') }
-              it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
-            elsif facts[:os]['release']['major'].to_i == 8
-              it { is_expected.to contain_apache__mod('php7') }
-              it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
-            elsif facts[:os]['release']['major'].to_i >= 9
-              it { is_expected.to contain_apache__mod('php') }
-              it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
-            end
-          end
-          context 'with alternative package name' do
-            let :pre_condition do
-              'class { "apache": }'
-            end
-            let :params do
-              { package_name: 'php54' }
+              it { is_expected.to contain_class('apache::params') }
+              it { is_expected.to contain_package('php') }
+              if facts[:os]['release']['major'].to_i < 8
+                it { is_expected.to contain_apache__mod('php5') }
+                it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
+              elsif facts[:os]['release']['major'].to_i == 8
+                it { is_expected.to contain_apache__mod('php7') }
+                it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
+              elsif facts[:os]['release']['major'].to_i >= 9
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+              end
             end
+            context 'with alternative package name' do
+              let :pre_condition do
+                'class { "apache": }'
+              end
+              let :params do
+                { package_name: 'php54' }
+              end
 
-            it { is_expected.to contain_package('php54') }
-          end
-          context 'with alternative path' do
-            let :pre_condition do
-              'class { "apache": }'
-            end
-            let :params do
-              { path: 'alternative-path' }
+              it { is_expected.to contain_package('php54') }
             end
+            context 'with alternative path' do
+              let :pre_condition do
+                'class { "apache": }'
+              end
+              let :params do
+                { path: 'alternative-path' }
+              end
 
-            it { is_expected.to contain_package('php') }
-            if facts[:os]['release']['major'].to_i < 8
-              it { is_expected.to contain_apache__mod('php5') }
-              it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module alternative-path\n") }
-            elsif facts[:os]['release']['major'].to_i == 8
-              it { is_expected.to contain_apache__mod('php7') }
-              it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module alternative-path\n") }
-            elsif facts[:os]['release']['major'].to_i >= 9
-              it { is_expected.to contain_apache__mod('php') }
-              it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module alternative-path\n") }
-            end
-          end
-          context 'with alternative extensions' do
-            let :pre_condition do
-              'class { "apache": }'
-            end
-            let :params do
-              {
-                extensions: ['.php', '.php5'],
-              }
+              it { is_expected.to contain_package('php') }
+              if facts[:os]['release']['major'].to_i < 8
+                it { is_expected.to contain_apache__mod('php5') }
+                it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module alternative-path\n") }
+              elsif facts[:os]['release']['major'].to_i == 8
+                it { is_expected.to contain_apache__mod('php7') }
+                it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module alternative-path\n") }
+              elsif facts[:os]['release']['major'].to_i >= 9
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module alternative-path\n") }
+              end
             end
-
-            it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) } if facts[:os]['release']['major'].to_i < 8
-          end
-          if facts[:os]['release']['major'].to_i > 5
-            context 'with specific version' do
+            context 'with alternative extensions' do
               let :pre_condition do
                 'class { "apache": }'
               end
               let :params do
-                { package_ensure: '5.3.13' }
+                {
+                  extensions: ['.php', '.php5'],
+                }
               end
 
-              it {
-                is_expected.to contain_package('php').with(
-                  ensure: '5.3.13',
-                )
-              }
+              it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) } if facts[:os]['release']['major'].to_i < 8
             end
-          end
-          context 'with mpm_module => prefork' do
-            it { is_expected.to contain_class('apache::params') }
-            it { is_expected.to contain_class('apache::mod::prefork') }
-            it { is_expected.to contain_package('php') }
-            if facts[:os]['release']['major'].to_i < 8
-              it { is_expected.to contain_apache__mod('php5') }
-              it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
-            elsif facts[:os]['release']['major'].to_i == 8
-              it { is_expected.to contain_apache__mod('php7') }
-              it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
-            elsif facts[:os]['release']['major'].to_i >= 9
-              it { is_expected.to contain_apache__mod('php') }
-              it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+            if facts[:os]['release']['major'].to_i > 5
+              context 'with specific version' do
+                let :pre_condition do
+                  'class { "apache": }'
+                end
+                let :params do
+                  { package_ensure: '5.3.13' }
+                end
+
+                it {
+                  is_expected.to contain_package('php').with(
+                    ensure: '5.3.13',
+                  )
+                }
+              end
             end
-          end
-          context 'with mpm_module => itk' do
-            let :pre_condition do
-              'class { "apache": mpm_module => itk, }'
+            context 'with mpm_module => prefork' do
+              it { is_expected.to contain_class('apache::params') }
+              it { is_expected.to contain_class('apache::mod::prefork') }
+              it { is_expected.to contain_package('php') }
+              if facts[:os]['release']['major'].to_i < 8
+                it { is_expected.to contain_apache__mod('php5') }
+                it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
+              elsif facts[:os]['release']['major'].to_i == 8
+                it { is_expected.to contain_apache__mod('php7') }
+                it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
+              elsif facts[:os]['release']['major'].to_i >= 9
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+              end
             end
+            context 'with mpm_module => itk' do
+              let :pre_condition do
+                'class { "apache": mpm_module => itk, }'
+              end
 
-            it { is_expected.to contain_class('apache::params') }
-            it { is_expected.to contain_class('apache::mod::itk') }
-            it { is_expected.to contain_package('php') }
-            if facts[:os]['release']['major'].to_i < 8
-              it { is_expected.to contain_apache__mod('php5') }
-              it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
-            elsif facts[:os]['release']['major'].to_i == 8
-              it { is_expected.to contain_apache__mod('php7') }
-              it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
-            elsif facts[:os]['release']['major'].to_i >= 9
-              it { is_expected.to contain_apache__mod('php') }
-              it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+              it { is_expected.to contain_class('apache::params') }
+              it { is_expected.to contain_class('apache::mod::itk') }
+              it { is_expected.to contain_package('php') }
+              if facts[:os]['release']['major'].to_i < 8
+                it { is_expected.to contain_apache__mod('php5') }
+                it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
+              elsif facts[:os]['release']['major'].to_i == 8
+                it { is_expected.to contain_apache__mod('php7') }
+                it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
+              elsif facts[:os]['release']['major'].to_i >= 9
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+              end
             end
           end
         end

From 9ee1236d722ecc6f2aebaa69ef215ca0ca457dc6 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Mon, 8 Aug 2022 17:40:00 +0100
Subject: [PATCH 1991/2267] Release prep v8.0.0

---
 CHANGELOG.md  | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 metadata.json |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ee7a7855b..ed5ac8baca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v8.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.0.0) (2022-08-08)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v7.0.0...v8.0.0)
+
+### Changed
+
+- Drop mod\_fastcgi support [\#2267](https://github.com/puppetlabs/puppetlabs-apache/pull/2267) ([ekohl](https://github.com/ekohl))
+- Drop suphp support [\#2263](https://github.com/puppetlabs/puppetlabs-apache/pull/2263) ([ekohl](https://github.com/ekohl))
+- Use a stricter data type on apache::vhost::aliases [\#2253](https://github.com/puppetlabs/puppetlabs-apache/pull/2253) ([ekohl](https://github.com/ekohl))
+- Narrow down Datatypes [\#2245](https://github.com/puppetlabs/puppetlabs-apache/pull/2245) ([cocker-cc](https://github.com/cocker-cc))
+- \(GH-cat-9\) Update module to match current syntax standard [\#2235](https://github.com/puppetlabs/puppetlabs-apache/pull/2235) ([david22swan](https://github.com/david22swan))
+- Drop Apache 2.0 compatibility code [\#2226](https://github.com/puppetlabs/puppetlabs-apache/pull/2226) ([ekohl](https://github.com/ekohl))
+- \(GH-iac-334\) Remove code specific to unsupported OSs [\#2223](https://github.com/puppetlabs/puppetlabs-apache/pull/2223) ([david22swan](https://github.com/david22swan))
+- Remove warnings and plans to change vhost default naming [\#2202](https://github.com/puppetlabs/puppetlabs-apache/pull/2202) ([ekohl](https://github.com/ekohl))
+- Update modsec crs config and template [\#2197](https://github.com/puppetlabs/puppetlabs-apache/pull/2197) ([henkworks](https://github.com/henkworks))
+
+### Added
+
+- Allow overriding CRS allowed HTTP methods per vhost [\#2274](https://github.com/puppetlabs/puppetlabs-apache/pull/2274) ([Vincevrp](https://github.com/Vincevrp))
+- Allow overriding CRS anomaly threshold per vhost [\#2273](https://github.com/puppetlabs/puppetlabs-apache/pull/2273) ([Vincevrp](https://github.com/Vincevrp))
+-  Allow configuring SecRequestBodyAccess and SecResponseBodyAccess [\#2272](https://github.com/puppetlabs/puppetlabs-apache/pull/2272) ([Vincevrp](https://github.com/Vincevrp))
+- Allow configuring CRS paranoia level [\#2270](https://github.com/puppetlabs/puppetlabs-apache/pull/2270) ([Vincevrp](https://github.com/Vincevrp))
+- Automatically include modules used in vhost directories [\#2255](https://github.com/puppetlabs/puppetlabs-apache/pull/2255) ([ekohl](https://github.com/ekohl))
+- Clean up includes and templates in vhost.pp [\#2254](https://github.com/puppetlabs/puppetlabs-apache/pull/2254) ([ekohl](https://github.com/ekohl))
+- pdksync - \(GH-cat-12\) Add Support for Redhat 9 [\#2239](https://github.com/puppetlabs/puppetlabs-apache/pull/2239) ([david22swan](https://github.com/david22swan))
+- Add support for PassengerPreloadBundler [\#2233](https://github.com/puppetlabs/puppetlabs-apache/pull/2233) ([smortex](https://github.com/smortex))
+- apache::vhost ProxyPassMatch in Location containers [\#2222](https://github.com/puppetlabs/puppetlabs-apache/pull/2222) ([skylar2-uw](https://github.com/skylar2-uw))
+- Allow additional settings for GSSAPI in Vhost [\#2215](https://github.com/puppetlabs/puppetlabs-apache/pull/2215) ([tuxmea](https://github.com/tuxmea))
+- mod\_auth\_gssapi: Add support for every configuration directive [\#2214](https://github.com/puppetlabs/puppetlabs-apache/pull/2214) ([canth1](https://github.com/canth1))
+- mod\_auth\_gssapi: Add support for `GssapiBasicAuth`. [\#2212](https://github.com/puppetlabs/puppetlabs-apache/pull/2212) ([olifre](https://github.com/olifre))
+- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#2200](https://github.com/puppetlabs/puppetlabs-apache/pull/2200) ([david22swan](https://github.com/david22swan))
+- Add support for setting UserDir in Virual Hosts [\#2192](https://github.com/puppetlabs/puppetlabs-apache/pull/2192) ([smortex](https://github.com/smortex))
+- Add an apache::vhost::proxy define [\#2169](https://github.com/puppetlabs/puppetlabs-apache/pull/2169) ([wbclark](https://github.com/wbclark))
+
+### Fixed
+
+- Disable mod\_php on EL9 [\#2277](https://github.com/puppetlabs/puppetlabs-apache/pull/2277) ([ekohl](https://github.com/ekohl))
+- Allow vhosts to have a string priority again [\#2275](https://github.com/puppetlabs/puppetlabs-apache/pull/2275) ([ekohl](https://github.com/ekohl))
+- Remove duplicate SecDefaultAction in CRS template [\#2271](https://github.com/puppetlabs/puppetlabs-apache/pull/2271) ([Vincevrp](https://github.com/Vincevrp))
+- Better data types on apache::vhost parameters [\#2252](https://github.com/puppetlabs/puppetlabs-apache/pull/2252) ([ekohl](https://github.com/ekohl))
+- Update $timeout to `Variant[Integer,String]` [\#2242](https://github.com/puppetlabs/puppetlabs-apache/pull/2242) ([david22swan](https://github.com/david22swan))
+- Let limitreqfieldsize and limitreqfields be integers [\#2240](https://github.com/puppetlabs/puppetlabs-apache/pull/2240) ([traylenator](https://github.com/traylenator))
+- Drop support for Fedora \< 18 [\#2238](https://github.com/puppetlabs/puppetlabs-apache/pull/2238) ([ekohl](https://github.com/ekohl))
+- Restructure MPM disabling [\#2227](https://github.com/puppetlabs/puppetlabs-apache/pull/2227) ([ekohl](https://github.com/ekohl))
+- pdksync - \(GH-iac-334\) Remove Support for Ubuntu 16.04 [\#2220](https://github.com/puppetlabs/puppetlabs-apache/pull/2220) ([david22swan](https://github.com/david22swan))
+- Drop Apache 2.2 support with Gentoo [\#2216](https://github.com/puppetlabs/puppetlabs-apache/pull/2216) ([ekohl](https://github.com/ekohl))
+- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#2213](https://github.com/puppetlabs/puppetlabs-apache/pull/2213) ([david22swan](https://github.com/david22swan))
+
 ## [v7.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v7.0.0) (2021-10-11)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.1...v7.0.0)
diff --git a/metadata.json b/metadata.json
index 1a9268dd7d..3e4db76803 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From ba1f793ec5e5c5ff685fa9961c379a58f320bfc2 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Mon, 8 Aug 2022 17:41:56 +0100
Subject: [PATCH 1992/2267] REFERENCE.md update

---
 REFERENCE.md | 2826 ++++++++++++++++++++++++++++----------------------
 1 file changed, 1573 insertions(+), 1253 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 02ef6f1dca..0b17ba9f4f 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -25,6 +25,7 @@
 * [`apache::mod::authnz_ldap`](#apachemodauthnz_ldap): Installs `mod_authnz_ldap`.
 * [`apache::mod::authnz_pam`](#apachemodauthnz_pam): Installs `mod_authnz_pam`.
 * [`apache::mod::authz_default`](#apachemodauthz_default): Installs and configures `mod_authz_default`.
+* [`apache::mod::authz_groupfile`](#apachemodauthz_groupfile): Installs `mod_authz_groupfile`
 * [`apache::mod::authz_user`](#apachemodauthz_user): Installs `mod_authz_user`
 * [`apache::mod::autoindex`](#apachemodautoindex): Installs `mod_autoindex`
 * [`apache::mod::cache`](#apachemodcache): Installs `mod_cache`
@@ -45,7 +46,6 @@
 * [`apache::mod::event`](#apachemodevent): Installs and configures `mod_event`.
 * [`apache::mod::expires`](#apachemodexpires): Installs and configures `mod_expires`.
 * [`apache::mod::ext_filter`](#apachemodext_filter): Installs and configures `mod_ext_filter`.
-* [`apache::mod::fastcgi`](#apachemodfastcgi): Installs `mod_fastcgi`.
 * [`apache::mod::fcgid`](#apachemodfcgid): Installs and configures `mod_fcgid`.
 * [`apache::mod::filter`](#apachemodfilter): Installs `mod_filter`.
 * [`apache::mod::geoip`](#apachemodgeoip): Installs and configures `mod_geoip`.
@@ -64,7 +64,12 @@
 * [`apache::mod::mime_magic`](#apachemodmime_magic): Installs and configures `mod_mime_magic`.
 * [`apache::mod::negotiation`](#apachemodnegotiation): Installs and configures `mod_negotiation`.
 * [`apache::mod::nss`](#apachemodnss): Installs and configures `mod_nss`.
-* [`apache::mod::pagespeed`](#apachemodpagespeed): Installs and configures `mod_pagespeed`.
+* [`apache::mod::pagespeed`](#apachemodpagespeed): Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
+
+This module does *not* manage the software repositories needed to automatically install the
+mod-pagespeed-stable package. The module does however require that the package be installed,
+or be installable using the system's default package provider.  You should ensure that this
+pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
 * [`apache::mod::passenger`](#apachemodpassenger): Installs `mod_pasenger`.
 * [`apache::mod::perl`](#apachemodperl): Installs `mod_perl`.
 * [`apache::mod::peruser`](#apachemodperuser): Installs `mod_peruser`.
@@ -91,7 +96,6 @@
 * [`apache::mod::ssl`](#apachemodssl): Installs `mod_ssl`.
 * [`apache::mod::status`](#apachemodstatus): Installs and configures `mod_status`.
 * [`apache::mod::suexec`](#apachemodsuexec): Installs `mod_suexec`.
-* [`apache::mod::suphp`](#apachemodsuphp): Installs `mod_suphp`.
 * [`apache::mod::userdir`](#apachemoduserdir): Installs and configures `mod_userdir`.
 * [`apache::mod::version`](#apachemodversion): Installs `mod_version`.
 * [`apache::mod::vhost_alias`](#apachemodvhost_alias): Installs Apache `mod_vhost_alias`.
@@ -99,9 +103,9 @@
 * [`apache::mod::worker`](#apachemodworker): Installs and manages the MPM `worker`.
 * [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
 * [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
-* [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event)
-* [`apache::mpm::disable_mpm_prefork`](#apachempmdisable_mpm_prefork)
-* [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker)
+* [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event): disable Apache-Module event
+* [`apache::mpm::disable_mpm_prefork`](#apachempmdisable_mpm_prefork): disable Apache-Module prefork
+* [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker): disable Apache-Module worker
 * [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
 
 #### Private Classes
@@ -138,6 +142,7 @@ Apache server's or a virtual host's listening address and port.
 outside of the defaults.
 * [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
 * [`apache::vhost::fragment`](#apachevhostfragment): Define a fragment within a vhost
+* [`apache::vhost::proxy`](#apachevhostproxy): Configure a reverse proxy for a vhost
 
 #### Private Defined types
 
@@ -163,6 +168,9 @@ outside of the defaults.
 
 * [`Apache::LogLevel`](#apacheloglevel): A string that conforms to the Apache `LogLevel` syntax.
 * [`Apache::OIDCSettings`](#apacheoidcsettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
+* [`Apache::ServerTokens`](#apacheservertokens): A string that conforms to the Apache `ServerTokens` syntax.
+* [`Apache::Vhost::Priority`](#apachevhostpriority): The priority on vhost
+* [`Apache::Vhost::ProxyPass`](#apachevhostproxypass): Struct representing reverse proxy configuration for an Apache vhost, used by the Apache::Vhost::Proxy defined resource type.
 
 ### Tasks
 
@@ -293,7 +301,7 @@ Default value: ``undef``
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `String`
 
 Configures module template behavior, package names, and default Apache modules by defining
 the version of Apache to use. We do not recommend manually configuring this parameter
@@ -303,7 +311,7 @@ Default value: `$apache::version::default`
 
 ##### <a name="conf_dir"></a>`conf_dir`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the directory where the Apache server's main configuration file is located.
 
@@ -311,7 +319,7 @@ Default value: `$apache::params::conf_dir`
 
 ##### <a name="conf_template"></a>`conf_template`
 
-Data type: `Any`
+Data type: `String`
 
 Defines the template used for the main Apache configuration file. Modifying this
 parameter is potentially risky, as the apache module is designed to use a minimal
@@ -321,7 +329,7 @@ Default value: `$apache::params::conf_template`
 
 ##### <a name="confd_dir"></a>`confd_dir`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the location of the Apache server's custom configuration directory.
 
@@ -329,7 +337,7 @@ Default value: `$apache::params::confd_dir`
 
 ##### <a name="default_charset"></a>`default_charset`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used as the `AddDefaultCharset` directive in the main configuration file.
 
@@ -348,7 +356,7 @@ Default value: ``true``
 
 ##### <a name="default_mods"></a>`default_mods`
 
-Data type: `Any`
+Data type: `Variant[Array, Boolean]`
 
 Determines whether to configure and enable a set of default Apache modules depending on
 your operating system.<br />
@@ -364,7 +372,7 @@ Default value: ``true``
 
 ##### <a name="default_ssl_ca"></a>`default_ssl_ca`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the default certificate authority for the Apache server.<br />
 Although the default value results in a functioning Apache server, you **must** update
@@ -375,7 +383,7 @@ Default value: ``undef``
 
 ##### <a name="default_ssl_cert"></a>`default_ssl_cert`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the SSL encryption certificate location.<br />
 Although the default value results in a functioning Apache server, you **must** update this
@@ -385,7 +393,7 @@ Default value: `$apache::params::default_ssl_cert`
 
 ##### <a name="default_ssl_chain"></a>`default_ssl_chain`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the default SSL chain location.<br />
 Although this default value results in a functioning Apache server, you **must** update
@@ -395,7 +403,7 @@ Default value: ``undef``
 
 ##### <a name="default_ssl_crl"></a>`default_ssl_crl`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the path of the default certificate revocation list (CRL) file to use.<br />
 Although this default value results in a functioning Apache server, you **must** update
@@ -406,7 +414,7 @@ Default value: ``undef``
 
 ##### <a name="default_ssl_crl_path"></a>`default_ssl_crl_path`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the server's certificate revocation list path, which contains your CRLs.<br />
 Although this default value results in a functioning Apache server, you **must** update
@@ -416,7 +424,7 @@ Default value: ``undef``
 
 ##### <a name="default_ssl_crl_check"></a>`default_ssl_crl_check`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the default certificate revocation check level via the `SSLCARevocationCheck` directive.
 This parameter applies only to Apache 2.4 or higher and is ignored on older versions.<br />
@@ -427,7 +435,7 @@ Default value: ``undef``
 
 ##### <a name="default_ssl_key"></a>`default_ssl_key`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the SSL certificate key file location.
 Although the default values result in a functioning Apache server, you **must** update
@@ -467,7 +475,7 @@ Default value: ``false``
 
 ##### <a name="default_type"></a>`default_type`
 
-Data type: `Any`
+Data type: `String`
 
 _Apache 2.2 only_. Sets the MIME `content-type` sent if the server cannot otherwise
 determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and
@@ -489,7 +497,7 @@ Default value: ``true``
 
 ##### <a name="dev_packages"></a>`dev_packages`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array, String]]`
 
 Configures a specific dev package to use.<br />
 For example, using httpd 2.4 from the IUS yum repo:<br />
@@ -505,7 +513,7 @@ Default value: `$apache::params::dev_packages`
 
 ##### <a name="docroot"></a>`docroot`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the default `DocumentRoot` location.
 
@@ -513,7 +521,7 @@ Default value: `$apache::params::docroot`
 
 ##### <a name="error_documents"></a>`error_documents`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Determines whether to enable [custom error documents](https://httpd.apache.org/docs/current/custom-error.html) on the Apache server.
 
@@ -521,7 +529,7 @@ Default value: ``false``
 
 ##### <a name="group"></a>`group`
 
-Data type: `Any`
+Data type: `String`
 
 Sets the group ID that owns any Apache processes spawned to answer requests.<br />
 By default, Puppet attempts to manage this group as a resource under the `apache`
@@ -536,7 +544,7 @@ Default value: `$apache::params::group`
 
 ##### <a name="httpd_dir"></a>`httpd_dir`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the Apache server's base configuration directory. This is useful for specially
 repackaged Apache server builds but might have unintended consequences when combined
@@ -546,7 +554,7 @@ Default value: `$apache::params::httpd_dir`
 
 ##### <a name="http_protocol_options"></a>`http_protocol_options`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the strictness of HTTP protocol checks.<br />
 Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`,
@@ -556,7 +564,7 @@ Default value: `$apache::params::http_protocol_options`
 
 ##### <a name="keepalive"></a>`keepalive`
 
-Data type: `Any`
+Data type: `Enum['On', 'Off']`
 
 Determines whether to enable persistent HTTP connections with the `KeepAlive` directive.
 If you set this to `On`, use the `keepalive_timeout` and `max_keepalive_requests` parameters
@@ -566,7 +574,7 @@ Default value: `$apache::params::keepalive`
 
 ##### <a name="keepalive_timeout"></a>`keepalive_timeout`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the `KeepAliveTimeout` directive, which determines the amount of time the Apache
 server waits for subsequent requests on a persistent HTTP connection. This parameter is
@@ -576,7 +584,7 @@ Default value: `$apache::params::keepalive_timeout`
 
 ##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
 
-Data type: `Any`
+Data type: `Integer`
 
 Limits the number of requests allowed per connection when the `keepalive` parameter is enabled.
 
@@ -594,7 +602,7 @@ Default value: `$apache::params::hostname_lookups`
 
 ##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The following modes are supported:
 
@@ -608,7 +616,7 @@ Default value: ``undef``
 
 ##### <a name="ldap_verify_server_cert"></a>`ldap_verify_server_cert`
 
-Data type: `Any`
+Data type: `Optional[Enum['On', 'Off', 'on', 'off']]`
 
 Specifies whether to force the verification of a server certificate when establishing an SSL
 connection to the LDAP server.
@@ -618,7 +626,7 @@ Default value: ``undef``
 
 ##### <a name="lib_path"></a>`lib_path`
 
-Data type: `Any`
+Data type: `String`
 
 Specifies the location whereApache module files are stored.<br />
 > **Note**: Do not configure this parameter manually without special reason.
@@ -636,7 +644,7 @@ Default value: `$apache::params::log_level`
 
 ##### <a name="log_formats"></a>`log_formats`
 
-Data type: `Any`
+Data type: `Hash`
 
 Define additional `LogFormat` directives. Values: A hash, such as:
 ``` puppet
@@ -656,7 +664,7 @@ Default value: `{}`
 
 ##### <a name="logroot"></a>`logroot`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Changes the directory of Apache log files for the virtual host.
 
@@ -664,7 +672,7 @@ Default value: `$apache::params::logroot`
 
 ##### <a name="logroot_mode"></a>`logroot_mode`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Filemode]`
 
 Overrides the default `logroot` directory's mode.<br />
 > **Note**: Do _not_ grant write access to the directory where the logs are stored
@@ -686,7 +694,7 @@ Default value: ``true``
 
 ##### <a name="supplementary_groups"></a>`supplementary_groups`
 
-Data type: `Any`
+Data type: `Array`
 
 A list of groups to which the user belongs. These groups are in addition to the primary group.<br />
 Notice: This option only has an effect when `manage_user` is set to true.
@@ -706,7 +714,7 @@ Default value: ``true``
 
 ##### <a name="mod_dir"></a>`mod_dir`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets where Puppet places configuration files for your Apache modules.
 
@@ -714,7 +722,7 @@ Default value: `$apache::params::mod_dir`
 
 ##### <a name="mod_libs"></a>`mod_libs`
 
-Data type: `Any`
+Data type: `Hash`
 
 Allows the user to override default module library names.
 ```puppet
@@ -730,7 +738,7 @@ Default value: `$apache::params::mod_libs`
 
 ##### <a name="mod_packages"></a>`mod_packages`
 
-Data type: `Any`
+Data type: `Hash`
 
 Allows the user to override default module package names.
 ```puppet
@@ -746,7 +754,7 @@ Default value: `$apache::params::mod_packages`
 
 ##### <a name="mpm_module"></a>`mpm_module`
 
-Data type: `Any`
+Data type: `Variant[Boolean, String]`
 
 Determines which [multi-processing module](https://httpd.apache.org/docs/current/mpm.html) (MPM) is loaded and configured for the
 HTTPD process. Valid values are: `event`, `itk`, `peruser`, `prefork`, `worker` or `false`.<br />
@@ -761,7 +769,7 @@ Default value: `$apache::params::mpm_module`
 
 ##### <a name="package_ensure"></a>`package_ensure`
 
-Data type: `Any`
+Data type: `String`
 
 Controls the `package` resource's `ensure` attribute. Valid values are: `absent`, `installed`
 (or equivalent `present`), or a version string.
@@ -770,7 +778,7 @@ Default value: `'installed'`
 
 ##### <a name="pidfile"></a>`pidfile`
 
-Data type: `Any`
+Data type: `String`
 
 Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm.
 
@@ -778,7 +786,7 @@ Default value: `$apache::params::pidfile`
 
 ##### <a name="ports_file"></a>`ports_file`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the path to the file containing Apache ports configuration.
 
@@ -804,7 +812,7 @@ Default value: ``undef``
 
 ##### <a name="purge_configs"></a>`purge_configs`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Removes all other Apache configs and virtual hosts.<br />
 Setting this to `false` is a stopgap measure to allow the apache module to coexist with
@@ -815,7 +823,7 @@ Default value: ``true``
 
 ##### <a name="purge_vhost_dir"></a>`purge_vhost_dir`
 
-Data type: `Any`
+Data type: `Optional[Boolean]`
 
 If the `vhost_dir` parameter's value differs from the `confd_dir` parameter's, this parameter
 determines whether Puppet removes any configurations inside `vhost_dir` that are _not_ managed
@@ -846,7 +854,7 @@ Default value: `'On'`
 
 ##### <a name="serveradmin"></a>`serveradmin`
 
-Data type: `Any`
+Data type: `String`
 
 Sets the Apache server administrator's contact information via Apache's `ServerAdmin` directive.
 
@@ -854,7 +862,7 @@ Default value: `'root@localhost'`
 
 ##### <a name="servername"></a>`servername`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the Apache server name via Apache's `ServerName` directive.
 Setting to `false` will not set ServerName at all.
@@ -863,7 +871,7 @@ Default value: `$apache::params::servername`
 
 ##### <a name="server_root"></a>`server_root`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the Apache server's root directory via Apache's `ServerRoot` directive.
 
@@ -871,7 +879,7 @@ Default value: `$apache::params::server_root`
 
 ##### <a name="server_signature"></a>`server_signature`
 
-Data type: `Any`
+Data type: `Variant[Enum['On', 'Off'], String]`
 
 Configures a trailing footer line to display at the bottom of server-generated documents,
 such as error documents and output of certain Apache modules, via Apache's `ServerSignature`
@@ -881,7 +889,7 @@ Default value: `'On'`
 
 ##### <a name="server_tokens"></a>`server_tokens`
 
-Data type: `Any`
+Data type: `Apache::ServerTokens`
 
 Controls how much information Apache sends to the browser about itself and the operating
 system, via Apache's `ServerTokens` directive.
@@ -898,7 +906,7 @@ Default value: ``true``
 
 ##### <a name="service_ensure"></a>`service_ensure`
 
-Data type: `Any`
+Data type: `Variant[Stdlib::Ensure::Service, Boolean]`
 
 Determines whether Puppet should make sure the service is running.
 Valid values are: `true` (or `running`) or `false` (or `stopped`).<br />
@@ -910,7 +918,7 @@ Default value: `'running'`
 
 ##### <a name="service_name"></a>`service_name`
 
-Data type: `Any`
+Data type: `String`
 
 Sets the name of the Apache service.
 
@@ -926,7 +934,7 @@ Default value: ``true``
 
 ##### <a name="service_restart"></a>`service_restart`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Determines whether Puppet should use a specific command to restart the HTTPD service.
 Values: a command to restart the Apache service.
@@ -935,7 +943,7 @@ Default value: ``undef``
 
 ##### <a name="timeout"></a>`timeout`
 
-Data type: `Any`
+Data type: `Integer[0]`
 
 Sets Apache's `TimeOut` directive, which defines the number of seconds Apache waits for
 certain events before failing a request.
@@ -944,7 +952,7 @@ Default value: `60`
 
 ##### <a name="trace_enable"></a>`trace_enable`
 
-Data type: `Any`
+Data type: `Enum['On', 'Off', 'extended']`
 
 Controls how Apache handles `TRACE` requests (per RFC 2616) via the `TraceEnable` directive.
 
@@ -962,7 +970,7 @@ Default value: ``undef``
 
 ##### <a name="use_systemd"></a>`use_systemd`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Controls whether the systemd module should be installed on Centos 7 servers, this is
 especially useful if using custom-built RPMs.
@@ -971,7 +979,7 @@ Default value: `$apache::params::use_systemd`
 
 ##### <a name="file_mode"></a>`file_mode`
 
-Data type: `Any`
+Data type: `Stdlib::Filemode`
 
 Sets the desired permissions mode for config files.
 Valid values are: a string, with permissions mode in symbolic or numeric notation.
@@ -980,7 +988,7 @@ Default value: `$apache::params::file_mode`
 
 ##### <a name="root_directory_options"></a>`root_directory_options`
 
-Data type: `Any`
+Data type: `Array`
 
 Array of the desired options for the `/` directory in httpd.conf.
 
@@ -1000,7 +1008,7 @@ Default value: ``false``
 
 ##### <a name="vhost_dir"></a>`vhost_dir`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Changes your virtual host configuration files' location.
 
@@ -1008,7 +1016,7 @@ Default value: `$apache::params::vhost_dir`
 
 ##### <a name="vhost_include_pattern"></a>`vhost_include_pattern`
 
-Data type: `Any`
+Data type: `String`
 
 Defines the pattern for files included from the `vhost_dir`.
 If set to a value like `[^.#]\*.conf[^~]` to make sure that files accidentally created in
@@ -1021,7 +1029,7 @@ Default value: `$apache::params::vhost_include_pattern`
 
 ##### <a name="user"></a>`user`
 
-Data type: `Any`
+Data type: `String`
 
 Changes the user that Apache uses to answer requests. Apache's parent process continues
 to run as root, but child processes access resources as the user defined by this parameter.
@@ -1031,7 +1039,7 @@ Default value: `$apache::params::user`
 
 ##### <a name="apache_name"></a>`apache_name`
 
-Data type: `Any`
+Data type: `String`
 
 The name of the Apache package to install. If you are using a non-standard Apache package
 you might need to override the default setting.<br />
@@ -1041,7 +1049,7 @@ Default value: `$apache::params::apache_name`
 
 ##### <a name="error_log"></a>`error_log`
 
-Data type: `Any`
+Data type: `String`
 
 The name of the error log file for the main server instance. If the string starts with
 `/`, `|`, or `syslog`: the full path is set. Otherwise, the filename  is prefixed with
@@ -1051,7 +1059,7 @@ Default value: `$apache::params::error_log`
 
 ##### <a name="scriptalias"></a>`scriptalias`
 
-Data type: `Any`
+Data type: `String`
 
 Directory to use for global script alias
 
@@ -1059,7 +1067,7 @@ Default value: `$apache::params::scriptalias`
 
 ##### <a name="access_log_file"></a>`access_log_file`
 
-Data type: `Any`
+Data type: `String`
 
 The name of the access log file for the main server instance.
 
@@ -1067,7 +1075,7 @@ Default value: `$apache::params::access_log_file`
 
 ##### <a name="limitreqfields"></a>`limitreqfields`
 
-Data type: `Any`
+Data type: `Integer`
 
 The `limitreqfields` parameter sets the maximum number of request header fields in
 an HTTP request. This directive gives the server administrator greater control over
@@ -1079,7 +1087,7 @@ Default value: `100`
 
 ##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
 
-Data type: `Any`
+Data type: `Integer`
 
 The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 be allowed within a request header.
@@ -1088,7 +1096,7 @@ Default value: `8190`
 
 ##### <a name="ip"></a>`ip`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the ip address
 
@@ -1096,16 +1104,16 @@ Default value: ``undef``
 
 ##### <a name="purge_vdir"></a>`purge_vdir`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Removes all other Apache configs and virtual hosts.<br />
-> **Note**: This parameter is deprecated in favor of the `purge_config` parameter.<br />
+> **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.<br />
 
 Default value: ``false``
 
 ##### <a name="conf_enabled"></a>`conf_enabled`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.
 
@@ -1113,7 +1121,7 @@ Default value: `$apache::params::conf_enabled`
 
 ##### <a name="vhost_enable_dir"></a>`vhost_enable_dir`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Set's whether the vhost definitions will be stored in sites-availible and if
 they will be symlinked to and from sites-enabled.
@@ -1122,7 +1130,7 @@ Default value: `$apache::params::vhost_enable_dir`
 
 ##### <a name="mod_enable_dir"></a>`mod_enable_dir`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Set's whether the mods-enabled directory should be managed.
 
@@ -1130,7 +1138,7 @@ Default value: `$apache::params::mod_enable_dir`
 
 ##### <a name="ssl_file"></a>`ssl_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This parameter allows you to set an ssl.conf file to be managed in order to implement
 an SSL Certificate.
@@ -1139,7 +1147,7 @@ Default value: ``undef``
 
 ##### <a name="file_e_tag"></a>`file_e_tag`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the server default for the `FileETag` declaration, which modifies the response header
 field for static files.
@@ -1157,7 +1165,7 @@ Default value: `$apache::params::use_optional_includes`
 
 ##### <a name="mime_types_additional"></a>`mime_types_additional`
 
-Data type: `Any`
+Data type: `Hash`
 
 Specifies any idditional Internet media (mime) types that you wish to be configured.
 
@@ -1195,12 +1203,11 @@ The following parameters are available in the `apache::mod::alias` class:
 * [`apache_version`](#apache_version)
 * [`icons_options`](#icons_options)
 * [`icons_path`](#icons_path)
-* [`icons_path`](#icons_path)
 * [`icons_prefix`](#icons_prefix)
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The version of Apache, if not set will be retrieved from the init class.
 
@@ -1208,7 +1215,7 @@ Default value: ``undef``
 
 ##### <a name="icons_options"></a>`icons_options`
 
-Data type: `Any`
+Data type: `String`
 
 Disables directory listings for the icons directory, via Apache [Options](https://httpd.apache.org/docs/current/mod/core.html#options)
 directive.
@@ -1217,27 +1224,22 @@ Default value: `'Indexes MultiViews'`
 
 ##### <a name="icons_path"></a>`icons_path`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the local path for an /icons/ Alias. Default depends on operating system:
 - Debian: /usr/share/apache2/icons
 - FreeBSD: /usr/local/www/apache24/icons
 - Gentoo: /var/www/icons
 - Red Hat: /var/www/icons, except on Apache 2.4, where it's /usr/share/httpd/icons
-
-Default value: `$apache::params::alias_icons_path`
-
-##### <a name="icons_path"></a>`icons_path`
-
-Change the alias for /icons/.
+Set to 'false' to disable the alias
 
 Default value: `$apache::params::alias_icons_path`
 
 ##### <a name="icons_prefix"></a>`icons_prefix`
 
-Data type: `Any`
-
+Data type: `String`
 
+Change the alias for /icons/.
 
 Default value: `$apache::params::icons_prefix`
 
@@ -1280,7 +1282,8 @@ The following parameters are available in the `apache::mod::auth_cas` class:
 * [`cas_version`](#cas_version)
 * [`cas_debug`](#cas_debug)
 * [`cas_validate_server`](#cas_validate_server)
-* [`cas_validatedepth`](#cas_validatedepth)
+* [`cas_validate_depth`](#cas_validate_depth)
+* [`cas_certificate_path`](#cas_certificate_path)
 * [`cas_proxy_validate_url`](#cas_proxy_validate_url)
 * [`cas_root_proxied_as`](#cas_root_proxied_as)
 * [`cas_cookie_entropy`](#cas_cookie_entropy)
@@ -1296,8 +1299,6 @@ The following parameters are available in the `apache::mod::auth_cas` class:
 * [`cas_attribute_delimiter`](#cas_attribute_delimiter)
 * [`cas_scrub_request_headers`](#cas_scrub_request_headers)
 * [`suppress_warning`](#suppress_warning)
-* [`cas_validate_depth`](#cas_validate_depth)
-* [`cas_certificate_path`](#cas_certificate_path)
 
 ##### <a name="cas_login_url"></a>`cas_login_url`
 
@@ -1323,7 +1324,7 @@ Default value: `$apache::params::cas_cookie_path`
 
 ##### <a name="cas_cookie_path_mode"></a>`cas_cookie_path_mode`
 
-Data type: `Any`
+Data type: `Stdlib::Filemode`
 
 The mode of cas_cookie_path.
 
@@ -1331,7 +1332,7 @@ Default value: `'0750'`
 
 ##### <a name="cas_version"></a>`cas_version`
 
-Data type: `Any`
+Data type: `Integer`
 
 The version of the CAS protocol to adhere to.
 
@@ -1339,7 +1340,7 @@ Default value: `2`
 
 ##### <a name="cas_debug"></a>`cas_debug`
 
-Data type: `Any`
+Data type: `String`
 
 Whether to enable or disable debug mode.
 
@@ -1347,20 +1348,32 @@ Default value: `'Off'`
 
 ##### <a name="cas_validate_server"></a>`cas_validate_server`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Whether to validate the presented certificate. This has been deprecated and
 removed from Version 1.1-RC1 onward.
 
 Default value: ``undef``
 
-##### <a name="cas_validatedepth"></a>`cas_validatedepth`
+##### <a name="cas_validate_depth"></a>`cas_validate_depth`
+
+Data type: `Optional[String]`
 
 The maximum depth for chained certificate validation.
 
+Default value: ``undef``
+
+##### <a name="cas_certificate_path"></a>`cas_certificate_path`
+
+Data type: `Optional[String]`
+
+The path leading to the certificate
+
+Default value: ``undef``
+
 ##### <a name="cas_proxy_validate_url"></a>`cas_proxy_validate_url`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The URL to use when performing a proxy validation.
 
@@ -1368,7 +1381,7 @@ Default value: ``undef``
 
 ##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
@@ -1377,7 +1390,7 @@ Default value: ``undef``
 
 ##### <a name="cas_cookie_entropy"></a>`cas_cookie_entropy`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 When creating a local session, this many random bytes are used to create a unique
 session identifier.
@@ -1386,7 +1399,7 @@ Default value: ``undef``
 
 ##### <a name="cas_timeout"></a>`cas_timeout`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The hard limit, in seconds, for a mod_auth_cas session.
 
@@ -1394,7 +1407,7 @@ Default value: ``undef``
 
 ##### <a name="cas_idle_timeout"></a>`cas_idle_timeout`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The limit, in seconds, of how long a mod_auth_cas session can be idle.
 
@@ -1402,7 +1415,7 @@ Default value: ``undef``
 
 ##### <a name="cas_cache_clean_interval"></a>`cas_cache_clean_interval`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The minimum amount of time that must pass inbetween cache cleanings.
 
@@ -1410,7 +1423,7 @@ Default value: ``undef``
 
 ##### <a name="cas_cookie_domain"></a>`cas_cookie_domain`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The value for the 'Domain=' parameter in the Set-Cookie header.
 
@@ -1418,7 +1431,7 @@ Default value: ``undef``
 
 ##### <a name="cas_cookie_http_only"></a>`cas_cookie_http_only`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Setting this flag prevents the mod_auth_cas cookies from being accessed by
 client side Javascript.
@@ -1427,7 +1440,7 @@ Default value: ``undef``
 
 ##### <a name="cas_authoritative"></a>`cas_authoritative`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Determines whether an optional authorization directive is authoritative and thus binding.
 
@@ -1435,7 +1448,7 @@ Default value: ``undef``
 
 ##### <a name="cas_validate_saml"></a>`cas_validate_saml`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Parse response from CAS server for SAML.
 
@@ -1443,7 +1456,7 @@ Default value: ``undef``
 
 ##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Enables experimental support for single sign out (may mangle POST data).
 
@@ -1451,7 +1464,7 @@ Default value: ``undef``
 
 ##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
@@ -1460,7 +1473,7 @@ Default value: ``undef``
 
 ##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
@@ -1468,7 +1481,7 @@ Default value: ``undef``
 
 ##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
@@ -1476,28 +1489,12 @@ Default value: ``undef``
 
 ##### <a name="suppress_warning"></a>`suppress_warning`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Suppress warning about being on RedHat (mod_auth_cas package is now available in epel-testing repo).
 
 Default value: ``false``
 
-##### <a name="cas_validate_depth"></a>`cas_validate_depth`
-
-Data type: `Any`
-
-
-
-Default value: ``undef``
-
-##### <a name="cas_certificate_path"></a>`cas_certificate_path`
-
-Data type: `Any`
-
-
-
-Default value: ``undef``
-
 ### <a name="apachemodauth_gssapi"></a>`apache::mod::auth_gssapi`
 
 Installs `mod_auth_gsappi`.
@@ -1536,7 +1533,7 @@ The following parameters are available in the `apache::mod::auth_mellon` class:
 
 ##### <a name="mellon_cache_size"></a>`mellon_cache_size`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Maximum number of sessions which can be active at once.
 
@@ -1544,7 +1541,7 @@ Default value: `$apache::params::mellon_cache_size`
 
 ##### <a name="mellon_lock_file"></a>`mellon_lock_file`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Full path to a file used for synchronizing access to the session data.
 
@@ -1552,7 +1549,7 @@ Default value: `$apache::params::mellon_lock_file`
 
 ##### <a name="mellon_post_directory"></a>`mellon_post_directory`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Full path of a directory where POST requests are saved during authentication.
 
@@ -1560,7 +1557,7 @@ Default value: `$apache::params::mellon_post_directory`
 
 ##### <a name="mellon_cache_entry_size"></a>`mellon_cache_entry_size`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Maximum size for a single session entry in bytes.
 
@@ -1568,7 +1565,7 @@ Default value: ``undef``
 
 ##### <a name="mellon_post_ttl"></a>`mellon_post_ttl`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Delay in seconds before a saved POST request can be flushed.
 
@@ -1576,7 +1573,7 @@ Default value: ``undef``
 
 ##### <a name="mellon_post_size"></a>`mellon_post_size`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Maximum size for saved POST requests.
 
@@ -1584,7 +1581,7 @@ Default value: ``undef``
 
 ##### <a name="mellon_post_count"></a>`mellon_post_count`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Maximum amount of saved POST requests.
 
@@ -1614,7 +1611,7 @@ The following parameters are available in the `apache::mod::authn_core` class:
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The version of apache being run.
 
@@ -1643,13 +1640,13 @@ The following parameters are available in the `apache::mod::authn_dbd` class:
 
 ##### <a name="authn_dbd_params"></a>`authn_dbd_params`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The params needed for the mod to function.
 
 ##### <a name="authn_dbd_dbdriver"></a>`authn_dbd_dbdriver`
 
-Data type: `Any`
+Data type: `String`
 
 Selects an apr_dbd driver by name.
 
@@ -1657,7 +1654,7 @@ Default value: `'mysql'`
 
 ##### <a name="authn_dbd_query"></a>`authn_dbd_query`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -1665,7 +1662,7 @@ Default value: ``undef``
 
 ##### <a name="authn_dbd_min"></a>`authn_dbd_min`
 
-Data type: `Any`
+Data type: `Integer`
 
 Set the minimum number of connections per process.
 
@@ -1673,7 +1670,7 @@ Default value: `4`
 
 ##### <a name="authn_dbd_max"></a>`authn_dbd_max`
 
-Data type: `Any`
+Data type: `Integer`
 
 Set the maximum number of connections per process.
 
@@ -1681,7 +1678,7 @@ Default value: `20`
 
 ##### <a name="authn_dbd_keep"></a>`authn_dbd_keep`
 
-Data type: `Any`
+Data type: `Integer`
 
 Set the maximum number of connections per process to be sustained.
 
@@ -1689,7 +1686,7 @@ Default value: `8`
 
 ##### <a name="authn_dbd_exptime"></a>`authn_dbd_exptime`
 
-Data type: `Any`
+Data type: `Integer`
 
 Set the time to keep idle connections alive when the number of
 connections specified in DBDKeep has been exceeded.
@@ -1698,7 +1695,7 @@ Default value: `300`
 
 ##### <a name="authn_dbd_alias"></a>`authn_dbd_alias`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets an alias for `AuthnProvider.
 
@@ -1716,7 +1713,7 @@ Installs `mod_authn_file`.
 
 Installs `mod_authnz_ldap`.
 
-* **Note** Unsupported platforms: RedHat: 6, 8; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
+* **Note** Unsupported platforms: RedHat: 6, 8, 9; CentOS: 6, 8; OracleLinux: 6, 8; Ubuntu: all; Debian: all; SLES: all
 
 * **See also**
   * https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html
@@ -1739,7 +1736,7 @@ Default value: ``true``
 
 ##### <a name="package_name"></a>`package_name`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The name of the ldap package.
 
@@ -1769,12 +1766,20 @@ The following parameters are available in the `apache::mod::authz_default` class
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
+### <a name="apachemodauthz_groupfile"></a>`apache::mod::authz_groupfile`
+
+Installs `mod_authz_groupfile`
+
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html
+    * for additional documentation.
+
 ### <a name="apachemodauthz_user"></a>`apache::mod::authz_user`
 
 Installs `mod_authz_user`
@@ -1799,9 +1804,9 @@ The following parameters are available in the `apache::mod::autoindex` class:
 
 ##### <a name="icons_prefix"></a>`icons_prefix`
 
-Data type: `Any`
-
+Data type: `String`
 
+Change the alias for /icons/.
 
 Default value: `$apache::params::icons_prefix`
 
@@ -1870,31 +1875,31 @@ The following parameters are available in the `apache::mod::cluster` class:
 
 ##### <a name="allowed_network"></a>`allowed_network`
 
-Data type: `Any`
+Data type: `String`
 
 Balanced members network.
 
 ##### <a name="balancer_name"></a>`balancer_name`
 
-Data type: `Any`
+Data type: `String`
 
 Name of balancer.
 
 ##### <a name="ip"></a>`ip`
 
-Data type: `Any`
+Data type: `Stdlib::IP::Address`
 
 Specifies the IP address to listen to.
 
 ##### <a name="version"></a>`version`
 
-Data type: `Any`
+Data type: `String`
 
 Specifies the mod_cluster version. Version 1.3.0 or greater is required for httpd 2.4.
 
 ##### <a name="enable_mcpm_receive"></a>`enable_mcpm_receive`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Whether MCPM should be enabled.
 
@@ -1902,7 +1907,7 @@ Default value: ``true``
 
 ##### <a name="port"></a>`port`
 
-Data type: `Any`
+Data type: `Stdlib::Port`
 
 mod_cluster listen port.
 
@@ -1910,7 +1915,7 @@ Default value: `6666`
 
 ##### <a name="keep_alive_timeout"></a>`keep_alive_timeout`
 
-Data type: `Any`
+Data type: `Integer`
 
 Specifies how long Apache should wait for a request, in seconds.
 
@@ -1918,7 +1923,7 @@ Default value: `60`
 
 ##### <a name="manager_allowed_network"></a>`manager_allowed_network`
 
-Data type: `Any`
+Data type: `Stdlib::IP::Address`
 
 Whether to allow the network to access the mod_cluster_manager.
 
@@ -1926,7 +1931,7 @@ Default value: `'127.0.0.1'`
 
 ##### <a name="max_keep_alive_requests"></a>`max_keep_alive_requests`
 
-Data type: `Any`
+Data type: `Integer`
 
 Maximum number of requests kept alive.
 
@@ -1934,7 +1939,7 @@ Default value: `0`
 
 ##### <a name="server_advertise"></a>`server_advertise`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Whether the server should advertise.
 
@@ -1942,7 +1947,7 @@ Default value: ``true``
 
 ##### <a name="advertise_frequency"></a>`advertise_frequency`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the interval between advertise messages in seconds.
 
@@ -1964,7 +1969,7 @@ The following parameters are available in the `apache::mod::data` class:
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
@@ -2002,7 +2007,7 @@ The following parameters are available in the `apache::mod::dav_svn` class:
 
 ##### <a name="authz_svn_enabled"></a>`authz_svn_enabled`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Specifies whether to install Apache mod_authz_svn
 
@@ -2016,16 +2021,6 @@ Installs `mod_dbd`.
   * https://httpd.apache.org/docs/current/mod/mod_dbd.html
     * for additional documentation.
 
-#### Parameters
-
-The following parameters are available in the `apache::mod::dbd` class:
-
-* [`apache_version`](#apache_version)
-
-##### <a name="apache_version"></a>`apache_version`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
 ### <a name="apachemoddeflate"></a>`apache::mod::deflate`
 
 Installs and configures `mod_deflate`.
@@ -2043,7 +2038,7 @@ The following parameters are available in the `apache::mod::deflate` class:
 
 ##### <a name="types"></a>`types`
 
-Data type: `Any`
+Data type: `Array[String]`
 
 An array of MIME types to be deflated. See https://www.iana.org/assignments/media-types/media-types.xhtml.
 
@@ -2057,7 +2052,7 @@ Default value: `[
 
 ##### <a name="notes"></a>`notes`
 
-Data type: `Any`
+Data type: `Hash`
 
 A Hash where the key represents the type and the value represents the note name.
 
@@ -2088,29 +2083,31 @@ DirectoryIndex statements in a vhost configuration
 
 The following parameters are available in the `apache::mod::dir` class:
 
-* [`types`](#types)
-* [`indexes`](#indexes)
 * [`dir`](#dir)
+* [`indexes`](#indexes)
 
-##### <a name="types"></a>`types`
-
-Specifies the text-based content types to compress.
-
-##### <a name="indexes"></a>`indexes`
+##### <a name="dir"></a>`dir`
 
-Data type: `Array[String]`
+Data type: `String`
 
-Provides a string for the DirectoryIndex directive
 
-Default value: `['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml']`
 
-##### <a name="dir"></a>`dir`
+Default value: `'public_html'`
 
-Data type: `Any`
+##### <a name="indexes"></a>`indexes`
 
+Data type: `Array[String]`
 
+Provides a string for the DirectoryIndex directive
 
-Default value: `'public_html'`
+Default value: `[
+    'index.html',
+    'index.html.var',
+    'index.cgi',
+    'index.pl',
+    'index.php',
+    'index.xhtml',
+  ]`
 
 ### <a name="apachemoddisk_cache"></a>`apache::mod::disk_cache`
 
@@ -2132,7 +2129,7 @@ The following parameters are available in the `apache::mod::disk_cache` class:
 
 ##### <a name="cache_root"></a>`cache_root`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Defines the name of the directory on the disk to contain cache files.
 Default depends on the Apache version and operating system:
@@ -2145,7 +2142,7 @@ Default value: ``undef``
 
 ##### <a name="cache_ignore_headers"></a>`cache_ignore_headers`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies HTTP header(s) that should not be stored in the cache.
 
@@ -2245,7 +2242,7 @@ The following parameters are available in the `apache::mod::event` class:
 
 ##### <a name="startservers"></a>`startservers`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Sets the number of child server processes created at startup, via the module's `StartServers` directive. Setting this to `false`
 removes the parameter.
@@ -2254,7 +2251,7 @@ Default value: `2`
 
 ##### <a name="maxclients"></a>`maxclients`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
 
@@ -2262,7 +2259,7 @@ Default value: `150`
 
 ##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
-Data type: `Any`
+Data type: `Optional[Variant[Integer, Boolean]]`
 
 Sets the maximum number of connections Apache can simultaneously process, via the module's `MaxRequestWorkers` directive. Setting
 these to `false` removes the parameters.
@@ -2271,7 +2268,7 @@ Default value: ``undef``
 
 ##### <a name="minsparethreads"></a>`minsparethreads`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Setting this to `false` removes the parameters.
 
@@ -2279,7 +2276,7 @@ Default value: `25`
 
 ##### <a name="maxsparethreads"></a>`maxsparethreads`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Setting this to `false` removes the parameters.
 
@@ -2287,7 +2284,7 @@ Default value: `75`
 
 ##### <a name="threadsperchild"></a>`threadsperchild`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Number of threads created by each child process.
 
@@ -2295,7 +2292,7 @@ Default value: `25`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
 
@@ -2303,7 +2300,7 @@ Default value: `0`
 
 ##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
-Data type: `Any`
+Data type: `Optional[Variant[Integer, Boolean]]`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
@@ -2311,7 +2308,7 @@ Default value: ``undef``
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Limits the configurable number of processes via the `ServerLimit` directive. Setting this to `false` removes the parameter.
 
@@ -2319,7 +2316,7 @@ Default value: `25`
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
@@ -2327,7 +2324,7 @@ Default value: ``undef``
 
 ##### <a name="threadlimit"></a>`threadlimit`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Limits the number of event threads via the module's `ThreadLimit` directive. Setting this to `false` removes the parameter.
 
@@ -2335,7 +2332,7 @@ Default value: `64`
 
 ##### <a name="listenbacklog"></a>`listenbacklog`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Sets the maximum length of the pending connections queue via the module's `ListenBackLog` directive. Setting this to `false` removes
 the parameter.
@@ -2360,7 +2357,7 @@ The following parameters are available in the `apache::mod::expires` class:
 
 ##### <a name="expires_active"></a>`expires_active`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Enables generation of Expires headers.
 
@@ -2368,7 +2365,7 @@ Default value: ``true``
 
 ##### <a name="expires_default"></a>`expires_default`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the default algorithm for calculating expiration time using ExpiresByType syntax or interval syntax.
 
@@ -2376,7 +2373,7 @@ Default value: ``undef``
 
 ##### <a name="expires_by_type"></a>`expires_by_type`
 
-Data type: `Any`
+Data type: `Optional[Array[Hash]]`
 
 Describes a set of [MIME content-types](https://www.iana.org/assignments/media-types/media-types.xhtml) and their expiration
 times. This should be used as an array of Hashes, with each Hash's key a valid MIME content-type (i.e. 'text/json') and its
@@ -2419,14 +2416,6 @@ Hash of filter names and their parameters.
 
 Default value: ``undef``
 
-### <a name="apachemodfastcgi"></a>`apache::mod::fastcgi`
-
-Installs `mod_fastcgi`.
-
-* **See also**
-  * https://github.com/FastCGI-Archives/mod_fastcgi
-    * for additional documentation.
-
 ### <a name="apachemodfcgid"></a>`apache::mod::fcgid`
 
 loaded first; Puppet will not automatically enable it if you set the fcgiwrapper parameter in apache::vhost.
@@ -2470,28 +2459,19 @@ class { 'apache::mod::fcgid':
 
 The following parameters are available in the `apache::mod::fcgid` class:
 
-* [`expires_active`](#expires_active)
-* [`expires_default`](#expires_default)
-* [`expires_by_type`](#expires_by_type)
 * [`options`](#options)
 
-##### <a name="expires_active"></a>`expires_active`
-
-Enables generation of Expires headers.
-
-##### <a name="expires_default"></a>`expires_default`
-
-Default algorithm for calculating expiration time.
-
-##### <a name="expires_by_type"></a>`expires_by_type`
-
-Value of the Expires header configured by MIME type.
-
 ##### <a name="options"></a>`options`
 
-Data type: `Any`
-
+Data type: `Hash`
 
+A hash used to parameterize the availible options:
+expires_active
+  Enables generation of Expires headers.
+expires_default
+  Default algorithm for calculating expiration time.
+expires_by_type
+  Value of the Expires header configured by MIME type.
 
 Default value: `{}`
 
@@ -2521,13 +2501,12 @@ The following parameters are available in the `apache::mod::geoip` class:
 * [`output`](#output)
 * [`enable_utf8`](#enable_utf8)
 * [`scan_proxy_headers`](#scan_proxy_headers)
-* [`scan_proxy_headers_field`](#scan_proxy_headers_field)
-* [`use_last_xforwarededfor_ip`](#use_last_xforwarededfor_ip)
 * [`scan_proxy_header_field`](#scan_proxy_header_field)
+* [`use_last_xforwarededfor_ip`](#use_last_xforwarededfor_ip)
 
 ##### <a name="enable"></a>`enable`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Toggles whether to enable geoip.
 
@@ -2535,7 +2514,7 @@ Default value: ``false``
 
 ##### <a name="db_file"></a>`db_file`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Path to database for GeoIP to use.
 
@@ -2543,7 +2522,7 @@ Default value: `'/usr/share/GeoIP/GeoIP.dat'`
 
 ##### <a name="flag"></a>`flag`
 
-Data type: `Any`
+Data type: `String`
 
 Caching directive to use. Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'.
 
@@ -2551,7 +2530,7 @@ Default value: `'Standard'`
 
 ##### <a name="output"></a>`output`
 
-Data type: `Any`
+Data type: `String`
 
 Output variable locations. Values: 'All', 'Env', 'Request', 'Notes'.
 
@@ -2559,7 +2538,7 @@ Default value: `'All'`
 
 ##### <a name="enable_utf8"></a>`enable_utf8`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Changes the output from ISO88591 (Latin1) to UTF8.
 
@@ -2567,29 +2546,25 @@ Default value: ``undef``
 
 ##### <a name="scan_proxy_headers"></a>`scan_proxy_headers`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Enables the GeoIPScanProxyHeaders option.
 
 Default value: ``undef``
 
-##### <a name="scan_proxy_headers_field"></a>`scan_proxy_headers_field`
-
-Specifies the header mod_geoip uses to determine the client's IP address.
-
-##### <a name="use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
+##### <a name="scan_proxy_header_field"></a>`scan_proxy_header_field`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
-Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
+Specifies the header mod_geoip uses to determine the client's IP address.
 
 Default value: ``undef``
 
-##### <a name="scan_proxy_header_field"></a>`scan_proxy_header_field`
-
-Data type: `Any`
+##### <a name="use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
 
+Data type: `Optional[String]`
 
+Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
 
 Default value: ``undef``
 
@@ -2601,16 +2576,6 @@ Installs and configures `mod_headers`.
   * https://httpd.apache.org/docs/current/mod/mod_headers.html
     * for additional documentation.
 
-#### Parameters
-
-The following parameters are available in the `apache::mod::headers` class:
-
-* [`apache_version`](#apache_version)
-
-##### <a name="apache_version"></a>`apache_version`
-
-Version of Apache to install module on.
-
 ### <a name="apachemodhttp2"></a>`apache::mod::http2`
 
 Installs and configures `mod_http2`.
@@ -2633,7 +2598,7 @@ The following parameters are available in the `apache::mod::http2` class:
 * [`h2_modern_tls_only`](#h2_modern_tls_only)
 * [`h2_push`](#h2_push)
 * [`h2_push_diary_size`](#h2_push_diary_size)
-* [`h2_priority`](#h2_priority)
+* [`h2_push_priority`](#h2_push_priority)
 * [`h2_push_resource`](#h2_push_resource)
 * [`h2_serialize_headers`](#h2_serialize_headers)
 * [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
@@ -2642,7 +2607,6 @@ The following parameters are available in the `apache::mod::http2` class:
 * [`h2_upgrade`](#h2_upgrade)
 * [`h2_window_size`](#h2_window_size)
 * [`apache_version`](#apache_version)
-* [`h2_push_priority`](#h2_push_priority)
 
 ##### <a name="h2_copy_files"></a>`h2_copy_files`
 
@@ -2724,10 +2688,14 @@ Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 conne
 
 Default value: ``undef``
 
-##### <a name="h2_priority"></a>`h2_priority`
+##### <a name="h2_push_priority"></a>`h2_push_priority`
+
+Data type: `Array[String]`
 
 Require HTTP/2 connections to be "modern TLS" only
 
+Default value: `[]`
+
 ##### <a name="h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
@@ -2797,14 +2765,6 @@ Version of Apache to install module on.
 
 Default value: ``undef``
 
-##### <a name="h2_push_priority"></a>`h2_push_priority`
-
-Data type: `Array[String]`
-
-
-
-Default value: `[]`
-
 ### <a name="apachemodinclude"></a>`apache::mod::include`
 
 Installs `mod_include`.
@@ -2832,15 +2792,15 @@ The following parameters are available in the `apache::mod::info` class:
 
 ##### <a name="allow_from"></a>`allow_from`
 
-Data type: `Any`
+Data type: `Array[Stdlib::IP::Address]`
 
 Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 
-Default value: `['127.0.0.1','::1']`
+Default value: `['127.0.0.1', '::1']`
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
@@ -2848,7 +2808,7 @@ Default value: ``undef``
 
 ##### <a name="restrict_access"></a>`restrict_access`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Toggles whether to restrict access to info path. If `false`, the `allow_from` allowlist is ignored and any IP address can
 access the info path.
@@ -2857,7 +2817,7 @@ Default value: ``true``
 
 ##### <a name="info_path"></a>`info_path`
 
-Data type: `Any`
+Data type: `Stdlib::Unixpath`
 
 Path on server to file containing server configuration information.
 
@@ -2875,7 +2835,7 @@ Installs `mod_intercept_form_submit`.
 
 Installs MPM `mod_itk`.
 
-* **Note** Unsupported platforms: CentOS: 8; RedHat: 8; SLES: all
+* **Note** Unsupported platforms: CentOS: 8; RedHat: 8, 9; SLES: all
 
 * **See also**
   * http://mpm-itk.sesse.net
@@ -2896,7 +2856,7 @@ The following parameters are available in the `apache::mod::itk` class:
 
 ##### <a name="startservers"></a>`startservers`
 
-Data type: `Any`
+Data type: `Integer`
 
 Number of child server processes created on startup.
 
@@ -2904,7 +2864,7 @@ Default value: `8`
 
 ##### <a name="minspareservers"></a>`minspareservers`
 
-Data type: `Any`
+Data type: `Integer`
 
 Minimum number of idle child server processes.
 
@@ -2912,7 +2872,7 @@ Default value: `5`
 
 ##### <a name="maxspareservers"></a>`maxspareservers`
 
-Data type: `Any`
+Data type: `Integer`
 
 Maximum number of idle child server processes.
 
@@ -2920,7 +2880,7 @@ Default value: `20`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
-Data type: `Any`
+Data type: `Integer`
 
 Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache httpd process.
 
@@ -2928,7 +2888,7 @@ Default value: `256`
 
 ##### <a name="maxclients"></a>`maxclients`
 
-Data type: `Any`
+Data type: `Integer`
 
 Limit on the number of simultaneous requests that will be served.
 
@@ -2936,7 +2896,7 @@ Default value: `256`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
-Data type: `Any`
+Data type: `Integer`
 
 Limit on the number of connections that an individual child server process will handle.
 
@@ -2944,7 +2904,7 @@ Default value: `4000`
 
 ##### <a name="enablecapabilities"></a>`enablecapabilities`
 
-Data type: `Any`
+Data type: `Optional[Variant[Boolean, String]]`
 
 Drop most root capabilities in the parent process, and instead run as the user given by the User/Group directives with some extra
 capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor
@@ -2954,7 +2914,7 @@ Default value: ``undef``
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -3049,13 +3009,13 @@ The following parameters are available in the `apache::mod::jk` class:
 * [`options`](#options)
 * [`env_var`](#env_var)
 * [`strip_session`](#strip_session)
+* [`location_list`](#location_list)
 * [`workers_file_content`](#workers_file_content)
 * [`mount_file_content`](#mount_file_content)
-* [`location_list`](#location_list)
 
 ##### <a name="ip"></a>`ip`
 
-Data type: `Optional[String]`
+Data type: `Optional[Stdlib::IP::Address]`
 
 IP for binding to mod_jk. Useful when the binding address is not the primary network interface IP.
 
@@ -3063,7 +3023,7 @@ Default value: ``undef``
 
 ##### <a name="port"></a>`port`
 
-Data type: `Integer`
+Data type: `Stdlib::Port`
 
 Port for binding to mod_jk. Useful when something else, like a reverse proxy or cache, is receiving requests at port 80, then
 needs to forward them to Apache at a different port.
@@ -3082,7 +3042,7 @@ Default value: ``true``
 
 ##### <a name="workers_file"></a>`workers_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The name of a worker file for the Tomcat servlet containers.
 
@@ -3090,7 +3050,7 @@ Default value: ``undef``
 
 ##### <a name="worker_property"></a>`worker_property`
 
-Data type: `Any`
+Data type: `Hash`
 
 Enables setting worker properties inside Apache configuration file.
 
@@ -3098,7 +3058,7 @@ Default value: `{}`
 
 ##### <a name="logroot"></a>`logroot`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 The base directory for shm_file and log_file is determined by the logroot parameter. If unspecified, defaults to
 apache::params::logroot. The default logroot is sane enough therefore it is not recommended to override it.
@@ -3107,7 +3067,7 @@ Default value: ``undef``
 
 ##### <a name="shm_file"></a>`shm_file`
 
-Data type: `Any`
+Data type: `String`
 
 Shared memory file name.
 
@@ -3115,7 +3075,7 @@ Default value: `'jk-runtime-status'`
 
 ##### <a name="shm_size"></a>`shm_size`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Size of the shared memory file name.
 
@@ -3123,7 +3083,7 @@ Default value: ``undef``
 
 ##### <a name="mount_file"></a>`mount_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 File containing multiple mappings from a context to a Tomcat worker.
 
@@ -3131,7 +3091,7 @@ Default value: ``undef``
 
 ##### <a name="mount_file_reload"></a>`mount_file_reload`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This directive configures the reload check interval in seconds.
 
@@ -3139,7 +3099,7 @@ Default value: ``undef``
 
 ##### <a name="mount"></a>`mount`
 
-Data type: `Any`
+Data type: `Hash`
 
 A mount point from a context to a Tomcat worker.
 
@@ -3147,7 +3107,7 @@ Default value: `{}`
 
 ##### <a name="un_mount"></a>`un_mount`
 
-Data type: `Any`
+Data type: `Hash`
 
 An exclusion mount point from a context to a Tomcat worker.
 
@@ -3155,7 +3115,7 @@ Default value: `{}`
 
 ##### <a name="auto_alias"></a>`auto_alias`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Automatically Alias webapp context directories into the Apache document space
 
@@ -3163,7 +3123,7 @@ Default value: ``undef``
 
 ##### <a name="mount_copy"></a>`mount_copy`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 If this directive is set to "On" in some virtual server, the mounts from the global server will be copied
 to this virtual server, more precisely all mounts defined by JkMount or JkUnMount.
@@ -3172,7 +3132,7 @@ Default value: ``undef``
 
 ##### <a name="worker_indicator"></a>`worker_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable that can be used to set worker names in combination with SetHandler
 jakarta-servlet.
@@ -3181,7 +3141,7 @@ Default value: ``undef``
 
 ##### <a name="watchdog_interval"></a>`watchdog_interval`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 This directive configures the watchdog thread interval in seconds.
 
@@ -3189,7 +3149,7 @@ Default value: ``undef``
 
 ##### <a name="log_file"></a>`log_file`
 
-Data type: `Any`
+Data type: `String`
 
 Full or server relative path to the mod_jk log file.
 
@@ -3197,7 +3157,7 @@ Default value: `'mod_jk.log'`
 
 ##### <a name="log_level"></a>`log_level`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The mod_jk log level, can be debug, info, warn error or trace.
 
@@ -3205,7 +3165,7 @@ Default value: ``undef``
 
 ##### <a name="log_stamp_format"></a>`log_stamp_format`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The mod_jk date log format, using an extended strftime syntax.
 
@@ -3213,7 +3173,7 @@ Default value: ``undef``
 
 ##### <a name="request_log_format"></a>`request_log_format`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Request log format string.
 
@@ -3221,7 +3181,7 @@ Default value: ``undef``
 
 ##### <a name="extract_ssl"></a>`extract_ssl`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Turns on SSL processing and information gathering by mod_jk.
 
@@ -3229,7 +3189,7 @@ Default value: ``undef``
 
 ##### <a name="https_indicator"></a>`https_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL indication.
 
@@ -3237,7 +3197,7 @@ Default value: ``undef``
 
 ##### <a name="sslprotocol_indicator"></a>`sslprotocol_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains the SSL protocol name.
 
@@ -3245,7 +3205,7 @@ Default value: ``undef``
 
 ##### <a name="certs_indicator"></a>`certs_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL client certificates.
 
@@ -3253,7 +3213,7 @@ Default value: ``undef``
 
 ##### <a name="cipher_indicator"></a>`cipher_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL client cipher.
 
@@ -3261,7 +3221,7 @@ Default value: ``undef``
 
 ##### <a name="certchain_prefix"></a>`certchain_prefix`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment (prefix) that contains SSL client chain certificates.
 
@@ -3269,7 +3229,7 @@ Default value: ``undef``
 
 ##### <a name="session_indicator"></a>`session_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL session.
 
@@ -3277,7 +3237,7 @@ Default value: ``undef``
 
 ##### <a name="keysize_indicator"></a>`keysize_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL key size in use.
 
@@ -3285,7 +3245,7 @@ Default value: ``undef``
 
 ##### <a name="local_name_indicator"></a>`local_name_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local name.
 
@@ -3293,7 +3253,7 @@ Default value: ``undef``
 
 ##### <a name="ignore_cl_indicator"></a>`ignore_cl_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which forces to ignore an existing Content-Length request header.
 
@@ -3301,7 +3261,7 @@ Default value: ``undef``
 
 ##### <a name="local_addr_indicator"></a>`local_addr_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local IP address.
 
@@ -3309,7 +3269,7 @@ Default value: ``undef``
 
 ##### <a name="local_port_indicator"></a>`local_port_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local port.
 
@@ -3317,7 +3277,7 @@ Default value: ``undef``
 
 ##### <a name="remote_host_indicator"></a>`remote_host_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) host name.
 
@@ -3325,7 +3285,7 @@ Default value: ``undef``
 
 ##### <a name="remote_addr_indicator"></a>`remote_addr_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
@@ -3333,7 +3293,7 @@ Default value: ``undef``
 
 ##### <a name="remote_port_indicator"></a>`remote_port_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
@@ -3341,7 +3301,7 @@ Default value: ``undef``
 
 ##### <a name="remote_user_indicator"></a>`remote_user_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded user name.
 
@@ -3349,7 +3309,7 @@ Default value: ``undef``
 
 ##### <a name="auth_type_indicator"></a>`auth_type_indicator`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded authentication type.
 
@@ -3357,7 +3317,7 @@ Default value: ``undef``
 
 ##### <a name="options"></a>`options`
 
-Data type: `Any`
+Data type: `Array`
 
 Set one of more options to configure the mod_jk module.
 
@@ -3365,7 +3325,7 @@ Default value: `[]`
 
 ##### <a name="env_var"></a>`env_var`
 
-Data type: `Any`
+Data type: `Hash`
 
 Adds a name and an optional default value of environment variable that should be sent to servlet-engine as a request attribute.
 
@@ -3373,16 +3333,49 @@ Default value: `{}`
 
 ##### <a name="strip_session"></a>`strip_session`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 If this directive is set to On in some virtual server, the session IDs ;jsessionid=... will be removed for URLs which are not
 forwarded but instead are handled by the local server.
 
 Default value: ``undef``
 
-##### <a name="workers_file_content"></a>`workers_file_content`
+##### <a name="location_list"></a>`location_list`
 
-Data type: `Any`
+Data type: `Array`
+
+Global locations for mod_jk are defined in array location_list.
+Each array item is a hash with quoted* property name as key and value as value itself.
+You can define a comment in a special 'comment' key
+
+Example:
+<Location /jkstatus/>
+  # Configures jkstatus
+  JkMount status
+  Order deny,allow
+  Deny from all
+  Allow from 127.0.0.1
+</Location>
+
+Is defined as:
+location_list = [
+  {
+    'Location'   => '/jkstatus/',
+    'Comment'    => 'Configures jkstatus',
+    'JkMount'    => 'status',
+    'Order'      => 'deny,allow',
+    'Deny from'  => 'all',
+    'Allow from' => '127.0.0.1',
+  },
+]
+* Keys must be quoted to allow arbitrary case and/or multi-word keys
+(BTW, note the case of 'Location' and 'Comment' keys)
+
+Default value: `[]`
+
+##### <a name="workers_file_content"></a>`workers_file_content`
+
+Data type: `Hash`
 
 Each directive has the format worker.<Worker name>.<Property>=<Value>. This maps as a hash of hashes, where the outer hash specifies
 workers, and each inner hash specifies each worker properties and values. Plus, there are two global directives, 'worker.list' and
@@ -3407,7 +3400,7 @@ worker.other_name.socket_keepalive=false
 Puppet file:
 ```
 $workers_file_content = {
-  worker_lists    => ['status', 'some_name,other_name'],
+  worker_lists    => ['status', 'some_name, other_name'],
   worker_maintain => 60,
   some_name       => {
     comment          => 'Optional comment',
@@ -3426,7 +3419,7 @@ Default value: `{}`
 
 ##### <a name="mount_file_content"></a>`mount_file_content`
 
-Data type: `Any`
+Data type: `Hash`
 
 Each directive has the format <URI> = <Worker name>. This maps as a hash of hashes, where the outer hash specifies workers, and
 each inner hash contains two items:
@@ -3461,19 +3454,11 @@ $mount_file_content = {
 
 Default value: `{}`
 
-##### <a name="location_list"></a>`location_list`
-
-Data type: `Any`
-
-
-
-Default value: `[]`
-
 ### <a name="apachemodldap"></a>`apache::mod::ldap`
 
 Installs and configures `mod_ldap`.
 
-* **Note** Unsupported platforms: CentOS: 8; RedHat: 8
+* **Note** Unsupported platforms: CentOS: 8; RedHat: 8, 9
 
 * **See also**
   * https://httpd.apache.org/docs/current/mod/mod_ldap.html
@@ -3514,7 +3499,7 @@ The following parameters are available in the `apache::mod::ldap` class:
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -3522,7 +3507,7 @@ Default value: ``undef``
 
 ##### <a name="package_name"></a>`package_name`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the custom package name.
 
@@ -3530,7 +3515,7 @@ Default value: ``undef``
 
 ##### <a name="ldap_trusted_global_cert_file"></a>`ldap_trusted_global_cert_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the file or database containing global trusted Certificate Authority or global client certificates.
 
@@ -3538,7 +3523,7 @@ Default value: ``undef``
 
 ##### <a name="ldap_trusted_global_cert_type"></a>`ldap_trusted_global_cert_type`
 
-Data type: `Optional[String]`
+Data type: `String`
 
 Sets the certificate parameter of the global trusted Certificate Authority or global client certificates.
 
@@ -3546,7 +3531,7 @@ Default value: `'CA_BASE64'`
 
 ##### <a name="ldap_shared_cache_size"></a>`ldap_shared_cache_size`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Size in bytes of the shared-memory cache
 
@@ -3554,7 +3539,7 @@ Default value: ``undef``
 
 ##### <a name="ldap_cache_entries"></a>`ldap_cache_entries`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Maximum number of entries in the primary LDAP cache
 
@@ -3562,7 +3547,7 @@ Default value: ``undef``
 
 ##### <a name="ldap_cache_ttl"></a>`ldap_cache_ttl`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Time that cached items remain valid (in seconds).
 
@@ -3570,7 +3555,7 @@ Default value: ``undef``
 
 ##### <a name="ldap_opcache_entries"></a>`ldap_opcache_entries`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Number of entries used to cache LDAP compare operations
 
@@ -3578,7 +3563,7 @@ Default value: ``undef``
 
 ##### <a name="ldap_opcache_ttl"></a>`ldap_opcache_ttl`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Time that entries in the operation cache remain valid (in seconds).
 
@@ -3586,7 +3571,7 @@ Default value: ``undef``
 
 ##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
 
@@ -3905,7 +3890,7 @@ The following parameters are available in the `apache::mod::mime` class:
 
 ##### <a name="mime_support_package"></a>`mime_support_package`
 
-Data type: `Any`
+Data type: `String`
 
 Name of the MIME package to be installed.
 
@@ -3913,7 +3898,7 @@ Default value: `$apache::params::mime_support_package`
 
 ##### <a name="mime_types_config"></a>`mime_types_config`
 
-Data type: `Any`
+Data type: `String`
 
 The location of the mime.types file.
 
@@ -3921,7 +3906,7 @@ Default value: `$apache::params::mime_types_config`
 
 ##### <a name="mime_types_additional"></a>`mime_types_additional`
 
-Data type: `Any`
+Data type: `Optional[Hash]`
 
 List of additional MIME types to include.
 
@@ -3943,7 +3928,7 @@ The following parameters are available in the `apache::mod::mime_magic` class:
 
 ##### <a name="magic_file"></a>`magic_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Enable MIME-type determination based on file contents using the specified magic file.
 
@@ -3996,26 +3981,29 @@ Installs and configures `mod_nss`.
 The following parameters are available in the `apache::mod::nss` class:
 
 * [`transfer_log`](#transfer_log)
-* [`error_Log`](#error_Log)
+* [`error_log`](#error_log)
 * [`passwd_file`](#passwd_file)
 * [`port`](#port)
-* [`error_log`](#error_log)
 
 ##### <a name="transfer_log"></a>`transfer_log`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Path to `access.log`.
 
 Default value: `"${apache::params::logroot}/access.log"`
 
-##### <a name="error_Log"></a>`error_Log`
+##### <a name="error_log"></a>`error_log`
+
+Data type: `Stdlib::Absolutepath`
 
 Path to `error.log`
 
+Default value: `"${apache::params::logroot}/error.log"`
+
 ##### <a name="passwd_file"></a>`passwd_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Path to file containing token passwords used for NSSPassPhraseDialog.
 
@@ -4023,34 +4011,73 @@ Default value: ``undef``
 
 ##### <a name="port"></a>`port`
 
-Data type: `Any`
+Data type: `Stdlib::Port`
 
 Sets the SSL port that should be used by mod_nss.
 
 Default value: `8443`
 
-##### <a name="error_log"></a>`error_log`
-
-Data type: `Any`
-
+### <a name="apachemodpagespeed"></a>`apache::mod::pagespeed`
 
+Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
 
-Default value: `"${apache::params::logroot}/error.log"`
+This module does *not* manage the software repositories needed to automatically install the
+mod-pagespeed-stable package. The module does however require that the package be installed,
+or be installable using the system's default package provider.  You should ensure that this
+pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
 
-### <a name="apachemodpagespeed"></a>`apache::mod::pagespeed`
+* **Note** Verify that your system is compatible with the latest Google Pagespeed requirements.
 
 Although this apache module requires the mod-pagespeed-stable package, Puppet does not manage the software repositories required to
 automatically install the package. If you declare this class when the package is either not installed or not available to your
 package manager, your Puppet run will fail.
 
-* **TODO** Add docs
-
-* **Note** Verify that your system is compatible with the latest Google Pagespeed requirements.
-
 * **See also**
   * https://developers.google.com/speed/pagespeed/module/
     * for additional documentation.
 
+#### Examples
+
+##### 
+
+```puppet
+class { 'apache::mod::pagespeed':
+  inherit_vhost_config          => 'on',
+  filter_xhtml                  => false,
+  cache_path                    => '/var/cache/mod_pagespeed/',
+  log_dir                       => '/var/log/pagespeed',
+  memache_servers               => [],
+  rewrite_level                 => 'CoreFilters',
+  disable_filters               => [],
+  enable_filters                => [],
+  forbid_filters                => [],
+  rewrite_deadline_per_flush_ms => 10,
+  additional_domains            => undef,
+  file_cache_size_kb            => 102400,
+  file_cache_clean_interval_ms  => 3600000,
+  lru_cache_per_process         => 1024,
+  lru_cache_byte_limit          => 16384,
+  css_flatten_max_bytes         => 2048,
+  css_inline_max_bytes          => 2048,
+  css_image_inline_max_bytes    => 2048,
+  image_inline_max_bytes        => 2048,
+  js_inline_max_bytes           => 2048,
+  css_outline_min_bytes         => 3000,
+  js_outline_min_bytes          => 3000,
+  inode_limit                   => 500000,
+  image_max_rewrites_at_once    => 8,
+  num_rewrite_threads           => 4,
+  num_expensive_rewrite_threads => 4,
+  collect_statistics            => 'on',
+  statistics_logging            => 'on',
+  allow_view_stats              => [],
+  allow_pagespeed_console       => [],
+  allow_pagespeed_message       => [],
+  message_buffer_size           => 100000,
+  additional_configuration      => { }
+}
+```
+
 #### Parameters
 
 The following parameters are available in the `apache::mod::pagespeed` class:
@@ -4093,39 +4120,39 @@ The following parameters are available in the `apache::mod::pagespeed` class:
 
 ##### <a name="inherit_vhost_config"></a>`inherit_vhost_config`
 
-Data type: `Any`
-
+Data type: `String`
 
+Whether or not to inherit the vhost config
 
 Default value: `'on'`
 
 ##### <a name="filter_xhtml"></a>`filter_xhtml`
 
-Data type: `Any`
-
+Data type: `Boolean`
 
+Whether to filter by xhtml
 
 Default value: ``false``
 
 ##### <a name="cache_path"></a>`cache_path`
 
-Data type: `Any`
-
+Data type: `Stdlib::Absolutepath`
 
+Where to cache any files
 
 Default value: `'/var/cache/mod_pagespeed/'`
 
 ##### <a name="log_dir"></a>`log_dir`
 
-Data type: `Any`
-
+Data type: `Stdlib::Absolutepath`
 
+The log directory
 
 Default value: `'/var/log/pagespeed'`
 
 ##### <a name="memcache_servers"></a>`memcache_servers`
 
-Data type: `Any`
+Data type: `Array`
 
 
 
@@ -4133,207 +4160,210 @@ Default value: `[]`
 
 ##### <a name="rewrite_level"></a>`rewrite_level`
 
-Data type: `Any`
-
+Data type: `String`
 
+The inbuilt filter level to be used.
+Can be `PassThrough`, `CoreFilters` or `OptimizeForBandwidth`.
 
 Default value: `'CoreFilters'`
 
 ##### <a name="disable_filters"></a>`disable_filters`
 
-Data type: `Any`
-
+Data type: `Array`
 
+An array of filters that you wish to disable
 
 Default value: `[]`
 
 ##### <a name="enable_filters"></a>`enable_filters`
 
-Data type: `Any`
-
+Data type: `Array`
 
+An array of filters that you wish to enable
 
 Default value: `[]`
 
 ##### <a name="forbid_filters"></a>`forbid_filters`
 
-Data type: `Any`
-
+Data type: `Array`
 
+An array of filters that you wish to forbid
 
 Default value: `[]`
 
 ##### <a name="rewrite_deadline_per_flush_ms"></a>`rewrite_deadline_per_flush_ms`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+How long to wait after attempting to rewrite an uncache/expired resource.
 
 Default value: `10`
 
 ##### <a name="additional_domains"></a>`additional_domains`
 
-Data type: `Any`
-
+Data type: `Optional[String]`
 
+Any additional domains that PageSpeed should optimize resources from.
 
 Default value: ``undef``
 
 ##### <a name="file_cache_size_kb"></a>`file_cache_size_kb`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum size of the cache
 
 Default value: `102400`
 
 ##### <a name="file_cache_clean_interval_ms"></a>`file_cache_clean_interval_ms`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The interval between which the cache is cleaned
 
 Default value: `3600000`
 
 ##### <a name="lru_cache_per_process"></a>`lru_cache_per_process`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The amount of memory dedcated to each process
 
 Default value: `1024`
 
 ##### <a name="lru_cache_byte_limit"></a>`lru_cache_byte_limit`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+How large a cache entry the cache will accept
 
 Default value: `16384`
 
 ##### <a name="css_flatten_max_bytes"></a>`css_flatten_max_bytes`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum size in bytes of the flattened CSS
 
 Default value: `2048`
 
 ##### <a name="css_inline_max_bytes"></a>`css_inline_max_bytes`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum size in bytes of any image that will be inlined into CSS
 
 Default value: `2048`
 
 ##### <a name="css_image_inline_max_bytes"></a>`css_image_inline_max_bytes`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum size in bytes of any image that will be inlined into an HTML file
 
 Default value: `2048`
 
 ##### <a name="image_inline_max_bytes"></a>`image_inline_max_bytes`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum size in bytes of any inlined CSS file
 
 Default value: `2048`
 
 ##### <a name="js_inline_max_bytes"></a>`js_inline_max_bytes`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum size in bytes of any inlined JavaScript file
 
 Default value: `2048`
 
 ##### <a name="css_outline_min_bytes"></a>`css_outline_min_bytes`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The minimum size in bytes for a CSS file to qualify as an outline
 
 Default value: `3000`
 
 ##### <a name="js_outline_min_bytes"></a>`js_outline_min_bytes`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The minimum size in bytes for a JavaScript file to qualify as an outline
 
 Default value: `3000`
 
 ##### <a name="inode_limit"></a>`inode_limit`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The file cache inode limit
 
 Default value: `500000`
 
 ##### <a name="image_max_rewrites_at_once"></a>`image_max_rewrites_at_once`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum number of images to optimize concurrently
 
 Default value: `8`
 
 ##### <a name="num_rewrite_threads"></a>`num_rewrite_threads`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The amount of threads to use for rewrite at one time
+These threads are used for short, latency-sensitive work.
 
 Default value: `4`
 
 ##### <a name="num_expensive_rewrite_threads"></a>`num_expensive_rewrite_threads`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The amount of threads to use for rewrite at one time
+These threads are used for full optimization.
 
 Default value: `4`
 
 ##### <a name="collect_statistics"></a>`collect_statistics`
 
-Data type: `Any`
-
+Data type: `String`
 
+Whether to collect cross-process statistics
 
 Default value: `'on'`
 
 ##### <a name="statistics_logging"></a>`statistics_logging`
 
-Data type: `Any`
-
+Data type: `String`
 
+Whether graphs should be drawn from collected statistics
 
 Default value: `'on'`
 
 ##### <a name="allow_view_stats"></a>`allow_view_stats`
 
-Data type: `Any`
-
+Data type: `Array`
 
+What sources should be allowed to view the resultant graph
 
 Default value: `[]`
 
 ##### <a name="allow_pagespeed_console"></a>`allow_pagespeed_console`
 
-Data type: `Any`
-
+Data type: `Array`
 
+What sources to draw the graphs from
 
 Default value: `[]`
 
 ##### <a name="allow_pagespeed_message"></a>`allow_pagespeed_message`
 
-Data type: `Any`
+Data type: `Array`
 
 
 
@@ -4341,23 +4371,23 @@ Default value: `[]`
 
 ##### <a name="message_buffer_size"></a>`message_buffer_size`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The amount of bytes to allocate as a buffer to hold recent log messages
 
 Default value: `100000`
 
 ##### <a name="additional_configuration"></a>`additional_configuration`
 
-Data type: `Any`
-
+Data type: `Variant[Array, Hash]`
 
+Any additional configuration no included as it's own option
 
 Default value: `{}`
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -4365,7 +4395,7 @@ Default value: ``undef``
 
 ##### <a name="package_ensure"></a>`package_ensure`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -4402,6 +4432,7 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`mod_package_ensure`](#mod_package_ensure)
 * [`mod_path`](#mod_path)
 * [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
+* [`passenger_anonymous_telemetry_proxy`](#passenger_anonymous_telemetry_proxy)
 * [`passenger_app_env`](#passenger_app_env)
 * [`passenger_app_group_name`](#passenger_app_group_name)
 * [`passenger_app_root`](#passenger_app_root)
@@ -4418,6 +4449,8 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`passenger_default_group`](#passenger_default_group)
 * [`passenger_default_ruby`](#passenger_default_ruby)
 * [`passenger_default_user`](#passenger_default_user)
+* [`passenger_disable_anonymous_telemetry`](#passenger_disable_anonymous_telemetry)
+* [`passenger_disable_log_prefix`](#passenger_disable_log_prefix)
 * [`passenger_disable_security_update_check`](#passenger_disable_security_update_check)
 * [`passenger_enabled`](#passenger_enabled)
 * [`passenger_error_override`](#passenger_error_override)
@@ -4430,6 +4463,7 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`passenger_installed_version`](#passenger_installed_version)
 * [`passenger_instance_registry_dir`](#passenger_instance_registry_dir)
 * [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
+* [`passenger_preload_bundler`](#passenger_preload_bundler)
 * [`passenger_log_file`](#passenger_log_file)
 * [`passenger_log_level`](#passenger_log_level)
 * [`passenger_lve_min_uid`](#passenger_lve_min_uid)
@@ -4457,12 +4491,14 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`passenger_security_update_check_proxy`](#passenger_security_update_check_proxy)
 * [`passenger_show_version_in_header`](#passenger_show_version_in_header)
 * [`passenger_socket_backlog`](#passenger_socket_backlog)
+* [`passenger_spawn_dir`](#passenger_spawn_dir)
 * [`passenger_spawn_method`](#passenger_spawn_method)
 * [`passenger_start_timeout`](#passenger_start_timeout)
 * [`passenger_startup_file`](#passenger_startup_file)
 * [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
 * [`passenger_sticky_sessions`](#passenger_sticky_sessions)
 * [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
+* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
 * [`passenger_thread_count`](#passenger_thread_count)
 * [`passenger_use_global_queue`](#passenger_use_global_queue)
 * [`passenger_user`](#passenger_user)
@@ -4483,15 +4519,10 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`rails_spawn_method`](#rails_spawn_method)
 * [`rails_user_switching`](#rails_user_switching)
 * [`wsgi_auto_detect`](#wsgi_auto_detect)
-* [`passenger_anonymous_telemetry_proxy`](#passenger_anonymous_telemetry_proxy)
-* [`passenger_disable_anonymous_telemetry`](#passenger_disable_anonymous_telemetry)
-* [`passenger_disable_log_prefix`](#passenger_disable_log_prefix)
-* [`passenger_spawn_dir`](#passenger_spawn_dir)
-* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
 
 ##### <a name="manage_repo"></a>`manage_repo`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Toggle whether to manage yum repo if on a RedHat node.
 
@@ -4499,7 +4530,7 @@ Default value: ``true``
 
 ##### <a name="mod_id"></a>`mod_id`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the package id.
 
@@ -4507,7 +4538,7 @@ Default value: ``undef``
 
 ##### <a name="mod_lib"></a>`mod_lib`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
@@ -4515,7 +4546,7 @@ Default value: ``undef``
 
 ##### <a name="mod_lib_path"></a>`mod_lib_path`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter overrides
 this value.
@@ -4524,7 +4555,7 @@ Default value: ``undef``
 
 ##### <a name="mod_package"></a>`mod_package`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the module package to install.
 
@@ -4532,7 +4563,7 @@ Default value: ``undef``
 
 ##### <a name="mod_package_ensure"></a>`mod_package_ensure`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Determines whether Puppet ensures the module should be installed.
 
@@ -4540,7 +4571,7 @@ Default value: ``undef``
 
 ##### <a name="mod_path"></a>`mod_path`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
@@ -4548,15 +4579,23 @@ Default value: ``undef``
 
 ##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
 
 Default value: ``undef``
 
+##### <a name="passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
+
+Data type: `Optional[String]`
+
+Set an intermediate proxy for the Passenger anonymous telemetry reporting.
+
+Default value: ``undef``
+
 ##### <a name="passenger_app_env"></a>`passenger_app_env`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This option sets, for the current application, the value of the following environment variables:
 - RAILS_ENV
@@ -4569,7 +4608,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the name of the application group that the current application should belong to.
 
@@ -4577,7 +4616,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_app_root"></a>`passenger_app_root`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Path to the application root which allows access independent from the DocumentRoot.
 
@@ -4585,7 +4624,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_app_type"></a>`passenger_app_type`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the type of the application. If you set this option, then you must also set PassengerAppRoot, otherwise Passenger will
 not properly recognize your application.
@@ -4594,7 +4633,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_base_uri"></a>`passenger_base_uri`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to specify that the given URI is an distinct application that should be served by Passenger.
 
@@ -4602,7 +4641,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggle whether application-generated responses are buffered by Apache. Buffering will happen in memory.
 
@@ -4610,7 +4649,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggle whether HTTP client request bodies are buffered before they are sent to the application.
 
@@ -4618,7 +4657,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the I/O concurrency model that should be used for Ruby application processes.
 
@@ -4626,7 +4665,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_conf_file"></a>`passenger_conf_file`
 
-Data type: `Any`
+Data type: `String`
 
 
 
@@ -4634,7 +4673,7 @@ Default value: `$apache::params::passenger_conf_file`
 
 ##### <a name="passenger_conf_package_file"></a>`passenger_conf_package_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -4642,7 +4681,7 @@ Default value: `$apache::params::passenger_conf_package_file`
 
 ##### <a name="passenger_data_buffer_dir"></a>`passenger_data_buffer_dir`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the directory in which to store data buffers.
 
@@ -4650,7 +4689,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_debug_log_file"></a>`passenger_debug_log_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -4658,7 +4697,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_debugger"></a>`passenger_debugger`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Turns support for Ruby application debugging on or off.
 
@@ -4666,7 +4705,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_default_group"></a>`passenger_default_group`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Allows you to specify the group that applications must run as, if user switching fails or is disabled.
 
@@ -4674,7 +4713,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_default_ruby"></a>`passenger_default_ruby`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 File path to desired ruby interpreter to use by default.
 
@@ -4682,24 +4721,40 @@ Default value: `$apache::params::passenger_default_ruby`
 
 ##### <a name="passenger_default_user"></a>`passenger_default_user`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Allows you to specify the user that applications must run as, if user switching fails or is disabled.
 
 Default value: ``undef``
 
-##### <a name="passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
+##### <a name="passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
 
-Data type: `Any`
+Data type: `Optional[Boolean]`
 
-Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
-security updates that might be available.
+Whether or not to disable the Passenger anonymous telemetry reporting.
+
+Default value: ``undef``
+
+##### <a name="passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
+
+Data type: `Optional[Boolean]`
+
+Whether to stop Passenger from prefixing logs when they are written to a log file.
+
+Default value: ``undef``
+
+##### <a name="passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
+
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+
+Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
+security updates that might be available.
 
 Default value: ``undef``
 
 ##### <a name="passenger_enabled"></a>`passenger_enabled`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether Passenger should be enabled for that particular context.
 
@@ -4707,7 +4762,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_error_override"></a>`passenger_error_override`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher.
 
@@ -4715,7 +4770,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_file_descriptor_log_file"></a>`passenger_file_descriptor_log_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Log file descriptor debug tracing messages to the given file.
 
@@ -4723,7 +4778,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_fly_with"></a>`passenger_fly_with`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Enables the Flying Passenger mode, and configures Apache to connect to the Flying Passenger daemon that's listening on the
 given socket filename.
@@ -4732,7 +4787,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
-Data type: `Any`
+Data type: `Optional[Variant[Integer, String]]`
 
 Use this option to tell Passenger how many concurrent requests the application can handle per process.
 
@@ -4740,7 +4795,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether Passenger should display friendly error pages whenever an application fails to start.
 
@@ -4748,7 +4803,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_group"></a>`passenger_group`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Allows you to override that behavior and explicitly set a group to run the web application as, regardless of the ownership of the
 startup file.
@@ -4757,7 +4812,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_high_performance"></a>`passenger_high_performance`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether to enable PassengerHighPerformance which will make Passenger will be a little faster, in return for reduced
 compatibility with other Apache modules.
@@ -4766,7 +4821,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_installed_version"></a>`passenger_installed_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -4774,7 +4829,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_instance_registry_dir"></a>`passenger_instance_registry_dir`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the directory that Passenger should use for registering its current instance.
 
@@ -4782,12 +4837,20 @@ Default value: ``undef``
 
 ##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Enables or disables the loading of shell environment variables before spawning the application.
 
 Default value: ``undef``
 
+##### <a name="passenger_preload_bundler"></a>`passenger_preload_bundler`
+
+Data type: `Optional[Boolean]`
+
+Enables or disables loading bundler before loading your Ruby app.
+
+Default value: ``undef``
+
 ##### <a name="passenger_log_file"></a>`passenger_log_file`
 
 Data type: `Optional[Stdlib::Absolutepath]`
@@ -4798,7 +4861,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_log_level"></a>`passenger_log_level`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Specifies how much information Passenger should log to its log file. A higher log level value means that more
 information will be logged.
@@ -4807,7 +4870,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 When using Passenger on a LVE-enabled kernel, a security check (enter) is run for spawning application processes. This options
 tells the check to only allow processes with UIDs equal to, or higher than, the specified value.
@@ -4816,7 +4879,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_max_instances"></a>`passenger_max_instances`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist for an application.
 
@@ -4824,7 +4887,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_max_instances_per_app"></a>`passenger_max_instances_per_app`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist for a single application.
 
@@ -4832,7 +4895,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_max_pool_size"></a>`passenger_max_pool_size`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist.
 
@@ -4840,7 +4903,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Set the preloader's idle timeout, in seconds. A value of 0 means that it should never idle timeout.
 
@@ -4848,7 +4911,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Specifies the maximum size for the queue of all incoming requests.
 
@@ -4856,7 +4919,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 The maximum amount of time, in seconds, that an application process may take to process a request.
 
@@ -4864,7 +4927,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_max_requests"></a>`passenger_max_requests`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 The maximum number of requests an application process will process.
 
@@ -4872,7 +4935,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 The maximum amount of memory that an application process may use, in megabytes.
 
@@ -4880,7 +4943,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 When using a Meteor application in non-bundled mode, use this option to specify a JSON file with settings for the application.
 
@@ -4888,7 +4951,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_min_instances"></a>`passenger_min_instances`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Specifies the minimum number of application processes that should exist for a given application.
 
@@ -4896,7 +4959,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_nodejs"></a>`passenger_nodejs`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the Node.js command to use for serving Node.js web applications.
 
@@ -4904,7 +4967,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_pool_idle_time"></a>`passenger_pool_idle_time`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 The maximum number of seconds that an application process may be idle.
 
@@ -4912,7 +4975,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_pre_start"></a>`passenger_pre_start`
 
-Data type: `Optional[Variant[String,Array[String]]]`
+Data type: `Optional[Variant[String, Array[String]]]`
 
 URL of the web application you want to pre-start.
 
@@ -4920,7 +4983,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_python"></a>`passenger_python`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the Python interpreter to use for serving Python web applications.
 
@@ -4928,7 +4991,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Enables or disables resistance against deployment errors.
 
@@ -4936,7 +4999,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_resolve_symlinks_in_document_root"></a>`passenger_resolve_symlinks_in_document_root`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 This option is no longer available in version 5.2.0. Switch to PassengerAppRoot if you are setting the application root via a
 document root containing symlinks.
@@ -4945,7 +5008,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_response_buffer_high_watermark"></a>`passenger_response_buffer_high_watermark`
 
-Data type: `Any`
+Data type: `Optional[Variant[Integer, String]]`
 
 Configures the maximum size of the real-time disk-backed response buffering system.
 
@@ -4953,7 +5016,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Path to directory containing restart.txt file. Can be either absolute or relative.
 
@@ -4961,7 +5024,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Enables or disables support for zero-downtime application restarts through restart.txt.
 
@@ -4969,7 +5032,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_root"></a>`passenger_root`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Refers to the location to the Passenger root directory, or to a location configuration file.
 
@@ -4977,7 +5040,7 @@ Default value: `$apache::params::passenger_root`
 
 ##### <a name="passenger_ruby"></a>`passenger_ruby`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the Ruby interpreter to use for serving Ruby web applications.
 
@@ -4985,7 +5048,7 @@ Default value: `$apache::params::passenger_ruby`
 
 ##### <a name="passenger_security_update_check_proxy"></a>`passenger_security_update_check_proxy`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Allows use of an intermediate proxy for the Passenger security update check.
 
@@ -4993,7 +5056,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_show_version_in_header"></a>`passenger_show_version_in_header`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggle whether Passenger will output its version number in the X-Powered-By header in all Passenger-served requests:
 
@@ -5001,12 +5064,20 @@ Default value: ``undef``
 
 ##### <a name="passenger_socket_backlog"></a>`passenger_socket_backlog`
 
-Data type: `Any`
+Data type: `Optional[Variant[Integer, String]]`
 
 This option can be raised if Apache manages to overflow the backlog queue.
 
 Default value: ``undef``
 
+##### <a name="passenger_spawn_dir"></a>`passenger_spawn_dir`
+
+Data type: `Optional[String]`
+
+The directory in which Passenger will record progress during startup
+
+Default value: ``undef``
+
 ##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']]`
@@ -5017,7 +5088,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Specifies a timeout for the startup of application processes.
 
@@ -5025,7 +5096,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_startup_file"></a>`passenger_startup_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the startup file that Passenger should use when loading the application.
 
@@ -5033,7 +5104,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Setting this option to a value of x means that certain filesystem checks will be performed at most once every x seconds.
 
@@ -5041,7 +5112,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether all requests that a client sends will be routed to the same originating application process, whenever possible.
 
@@ -5049,15 +5120,23 @@ Default value: ``undef``
 
 ##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the name of the sticky sessions cookie.
 
 Default value: ``undef``
 
+##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
+
+Data type: `Optional[String]`
+
+Sets the attributes of the sticky sessions cookie.
+
+Default value: ``undef``
+
 ##### <a name="passenger_thread_count"></a>`passenger_thread_count`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Specifies the number of threads that Passenger should spawn per Ruby application process.
 
@@ -5065,7 +5144,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_use_global_queue"></a>`passenger_use_global_queue`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 N/A.
 
@@ -5073,7 +5152,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_user"></a>`passenger_user`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Allows you to override that behavior and explicitly set a user to run the web application as, regardless of the ownership of the
 startup file.
@@ -5082,7 +5161,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_user_switching"></a>`passenger_user_switching`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether to attempt to enable user account sandboxing, also known as user switching.
 
@@ -5090,7 +5169,7 @@ Default value: ``undef``
 
 ##### <a name="rack_auto_detect"></a>`rack_auto_detect`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
@@ -5098,7 +5177,7 @@ Default value: ``undef``
 
 ##### <a name="rack_autodetect"></a>`rack_autodetect`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
@@ -5106,7 +5185,7 @@ Default value: ``undef``
 
 ##### <a name="rack_base_uri"></a>`rack_base_uri`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
@@ -5114,7 +5193,7 @@ Default value: ``undef``
 
 ##### <a name="rack_env"></a>`rack_env`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Alias for PassengerAppEnv.
 
@@ -5122,7 +5201,7 @@ Default value: ``undef``
 
 ##### <a name="rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This option doesn't do anything anymore since version 4.0.0.
 
@@ -5130,7 +5209,7 @@ Default value: ``undef``
 
 ##### <a name="rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
 
@@ -5138,7 +5217,7 @@ Default value: ``undef``
 
 ##### <a name="rails_auto_detect"></a>`rails_auto_detect`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
@@ -5146,7 +5225,7 @@ Default value: ``undef``
 
 ##### <a name="rails_autodetect"></a>`rails_autodetect`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
@@ -5154,7 +5233,7 @@ Default value: ``undef``
 
 ##### <a name="rails_base_uri"></a>`rails_base_uri`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
@@ -5162,7 +5241,7 @@ Default value: ``undef``
 
 ##### <a name="rails_default_user"></a>`rails_default_user`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerDefaultUser
 
@@ -5170,7 +5249,7 @@ Default value: ``undef``
 
 ##### <a name="rails_env"></a>`rails_env`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Alias for PassengerAppEnv.
 
@@ -5178,7 +5257,7 @@ Default value: ``undef``
 
 ##### <a name="rails_framework_spawner_idle_time"></a>`rails_framework_spawner_idle_time`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed
 altogether. You should use smart spawning instead.
@@ -5187,7 +5266,7 @@ Default value: ``undef``
 
 ##### <a name="rails_ruby"></a>`rails_ruby`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerRuby.
 
@@ -5195,7 +5274,7 @@ Default value: ``undef``
 
 ##### <a name="rails_spawn_method"></a>`rails_spawn_method`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
 
@@ -5203,7 +5282,7 @@ Default value: ``undef``
 
 ##### <a name="rails_user_switching"></a>`rails_user_switching`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerUserSwitching.
 
@@ -5211,49 +5290,9 @@ Default value: ``undef``
 
 ##### <a name="wsgi_auto_detect"></a>`wsgi_auto_detect`
 
-Data type: `Any`
-
-This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-
-Default value: ``undef``
-
-##### <a name="passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
-
-Data type: `Optional[String]`
-
-
-
-Default value: ``undef``
-
-##### <a name="passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
-
-Data type: `Optional[Boolean]`
-
-
-
-Default value: ``undef``
-
-##### <a name="passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
-
-Data type: `Optional[Boolean]`
-
-
-
-Default value: ``undef``
-
-##### <a name="passenger_spawn_dir"></a>`passenger_spawn_dir`
-
-Data type: `Optional[String]`
-
-
-
-Default value: ``undef``
-
-##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
-
 Data type: `Optional[String]`
 
-
+This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
 Default value: ``undef``
 
@@ -5269,8 +5308,6 @@ Installs `mod_perl`.
 
 Installs `mod_peruser`.
 
-* **TODO** Add docs
-
 #### Parameters
 
 The following parameters are available in the `apache::mod::peruser` class:
@@ -5286,7 +5323,7 @@ The following parameters are available in the `apache::mod::peruser` class:
 
 ##### <a name="minspareprocessors"></a>`minspareprocessors`
 
-Data type: `Any`
+Data type: `Integer`
 
 
 
@@ -5294,39 +5331,39 @@ Default value: `2`
 
 ##### <a name="minprocessors"></a>`minprocessors`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The minimum amount of processors
 
 Default value: `2`
 
 ##### <a name="maxprocessors"></a>`maxprocessors`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum amount of processors
 
 Default value: `10`
 
 ##### <a name="maxclients"></a>`maxclients`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum amount of clients
 
 Default value: `150`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
-Data type: `Any`
-
+Data type: `Integer`
 
+The maximum amount of requests per child
 
 Default value: `1000`
 
 ##### <a name="idletimeout"></a>`idletimeout`
 
-Data type: `Any`
+Data type: `Integer`
 
 
 
@@ -5334,7 +5371,7 @@ Default value: `120`
 
 ##### <a name="expiretimeout"></a>`expiretimeout`
 
-Data type: `Any`
+Data type: `Integer`
 
 
 
@@ -5342,7 +5379,7 @@ Default value: `120`
 
 ##### <a name="keepalive"></a>`keepalive`
 
-Data type: `Any`
+Data type: `Enum['On', 'Off']`
 
 
 
@@ -5352,7 +5389,7 @@ Default value: `'Off'`
 
 Installs `mod_php`.
 
-* **TODO** Add docs
+* **Note** Unsupported platforms: RedHat: 9
 
 #### Parameters
 
@@ -5371,23 +5408,23 @@ The following parameters are available in the `apache::mod::php` class:
 
 ##### <a name="package_name"></a>`package_name`
 
-Data type: `Any`
-
+Data type: `Optional[String]`
 
+The package name
 
 Default value: ``undef``
 
 ##### <a name="package_ensure"></a>`package_ensure`
 
-Data type: `Any`
-
+Data type: `String`
 
+Whether the package is `present` or `absent`
 
 Default value: `'present'`
 
 ##### <a name="path"></a>`path`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -5403,7 +5440,7 @@ Default value: `['.php']`
 
 ##### <a name="content"></a>`content`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -5411,7 +5448,7 @@ Default value: ``undef``
 
 ##### <a name="template"></a>`template`
 
-Data type: `Any`
+Data type: `String`
 
 
 
@@ -5419,7 +5456,7 @@ Default value: `'apache/mod/php.conf.erb'`
 
 ##### <a name="source"></a>`source`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 
 
@@ -5427,23 +5464,23 @@ Default value: ``undef``
 
 ##### <a name="root_group"></a>`root_group`
 
-Data type: `Any`
-
+Data type: `Optional[String]`
 
+UNIX group of the root user
 
 Default value: `$apache::params::root_group`
 
 ##### <a name="php_version"></a>`php_version`
 
-Data type: `Any`
-
+Data type: `Optional[String]`
 
+The php version. This is a required parameter, but optional allows showing a clear error message
 
 Default value: `$apache::params::php_version`
 
 ##### <a name="libphp_prefix"></a>`libphp_prefix`
 
-Data type: `Any`
+Data type: `String`
 
 
 
@@ -5474,7 +5511,7 @@ The following parameters are available in the `apache::mod::prefork` class:
 
 ##### <a name="startservers"></a>`startservers`
 
-Data type: `Any`
+Data type: `Integer`
 
 Number of child server processes created at startup.
 
@@ -5482,7 +5519,7 @@ Default value: `8`
 
 ##### <a name="minspareservers"></a>`minspareservers`
 
-Data type: `Any`
+Data type: `Integer`
 
 Minimum number of idle child server processes.
 
@@ -5490,7 +5527,7 @@ Default value: `5`
 
 ##### <a name="maxspareservers"></a>`maxspareservers`
 
-Data type: `Any`
+Data type: `Integer`
 
 Maximum number of idle child server processes.
 
@@ -5498,7 +5535,7 @@ Default value: `20`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
-Data type: `Any`
+Data type: `Integer`
 
 Upper limit on configurable number of processes.
 
@@ -5506,7 +5543,7 @@ Default value: `256`
 
 ##### <a name="maxclients"></a>`maxclients`
 
-Data type: `Any`
+Data type: `Integer`
 
 Old alias for MaxRequestWorkers.
 
@@ -5514,7 +5551,7 @@ Default value: `256`
 
 ##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Maximum number of connections that will be processed simultaneously.
 
@@ -5522,7 +5559,7 @@ Default value: ``undef``
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
-Data type: `Any`
+Data type: `Integer`
 
 Old alias for MaxConnectionsPerChild.
 
@@ -5530,7 +5567,7 @@ Default value: `4000`
 
 ##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
@@ -5538,7 +5575,7 @@ Default value: ``undef``
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -5546,7 +5583,7 @@ Default value: ``undef``
 
 ##### <a name="listenbacklog"></a>`listenbacklog`
 
-Data type: `Any`
+Data type: `Integer`
 
 Maximum length of the queue of pending connections.
 
@@ -5574,7 +5611,7 @@ The following parameters are available in the `apache::mod::proxy` class:
 
 ##### <a name="proxy_requests"></a>`proxy_requests`
 
-Data type: `Any`
+Data type: `String`
 
 Enables forward (standard) proxy requests.
 
@@ -5582,7 +5619,7 @@ Default value: `'Off'`
 
 ##### <a name="allow_from"></a>`allow_from`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 List of IPs allowed to access proxy.
 
@@ -5590,7 +5627,7 @@ Default value: ``undef``
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -5598,7 +5635,7 @@ Default value: ``undef``
 
 ##### <a name="package_name"></a>`package_name`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the proxy package to install.
 
@@ -5606,7 +5643,7 @@ Default value: ``undef``
 
 ##### <a name="proxy_via"></a>`proxy_via`
 
-Data type: `Any`
+Data type: `String`
 
 Set local IP address for outgoing proxy connections.
 
@@ -5614,7 +5651,7 @@ Default value: `'On'`
 
 ##### <a name="proxy_timeout"></a>`proxy_timeout`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Network timeout for proxied requests.
 
@@ -5622,7 +5659,7 @@ Default value: ``undef``
 
 ##### <a name="proxy_iobuffersize"></a>`proxy_iobuffersize`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Set the size of internal data throughput buffer
 
@@ -5649,10 +5686,9 @@ Installs and configures `mod_proxy_balancer`.
 The following parameters are available in the `apache::mod::proxy_balancer` class:
 
 * [`manager`](#manager)
-* [`maanger_path`](#maanger_path)
+* [`manager_path`](#manager_path)
 * [`allow_from`](#allow_from)
 * [`apache_version`](#apache_version)
-* [`manager_path`](#manager_path)
 
 ##### <a name="manager"></a>`manager`
 
@@ -5662,34 +5698,30 @@ Toggle whether to enable balancer manager support.
 
 Default value: ``false``
 
-##### <a name="maanger_path"></a>`maanger_path`
+##### <a name="manager_path"></a>`manager_path`
+
+Data type: `Stdlib::Unixpath`
 
 Server relative path to balancer manager.
 
+Default value: `'/balancer-manager'`
+
 ##### <a name="allow_from"></a>`allow_from`
 
-Data type: `Array`
+Data type: `Array[Stdlib::IP::Address]`
 
 List of IPs from which the balancer manager can be accessed.
 
-Default value: `['127.0.0.1','::1']`
+Default value: `['127.0.0.1', '::1']`
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-##### <a name="manager_path"></a>`manager_path`
-
-Data type: `Stdlib::Absolutepath`
-
-
-
-Default value: `'/balancer-manager'`
-
 ### <a name="apachemodproxy_connect"></a>`apache::mod::proxy_connect`
 
 Installs `mod_proxy_connect`.
@@ -5698,20 +5730,6 @@ Installs `mod_proxy_connect`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html
     * for additional documentation.
 
-#### Parameters
-
-The following parameters are available in the `apache::mod::proxy_connect` class:
-
-* [`apache_version`](#apache_version)
-
-##### <a name="apache_version"></a>`apache_version`
-
-Data type: `Any`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: ``undef``
-
 ### <a name="apachemodproxy_fcgi"></a>`apache::mod::proxy_fcgi`
 
 Installs `mod_proxy_fcgi`.
@@ -5910,7 +5928,7 @@ The following parameters are available in the `apache::mod::reqtimeout` class:
 
 ##### <a name="timeouts"></a>`timeouts`
 
-Data type: `Any`
+Data type: `Variant[Array[String], String]`
 
 List of timeouts and data rates for receiving requests.
 
@@ -5943,7 +5961,7 @@ The following parameters are available in the `apache::mod::rpaf` class:
 
 ##### <a name="sethostname"></a>`sethostname`
 
-Data type: `Any`
+Data type: `Variant[Boolean, String]`
 
 Toggles whether to update vhost name so ServerName and ServerAlias work.
 
@@ -5951,7 +5969,7 @@ Default value: ``true``
 
 ##### <a name="proxy_ips"></a>`proxy_ips`
 
-Data type: `Any`
+Data type: `Array[Stdlib::IP::Address]`
 
 List of IPs & bitmasked subnets to adjust requests for
 
@@ -5959,7 +5977,7 @@ Default value: `['127.0.0.1']`
 
 ##### <a name="header"></a>`header`
 
-Data type: `Any`
+Data type: `String`
 
 Header to use for the real IP address.
 
@@ -5967,7 +5985,7 @@ Default value: `'X-Forwarded-For'`
 
 ##### <a name="template"></a>`template`
 
-Data type: `Any`
+Data type: `String`
 
 Path to template to use for configuring mod_rpaf.
 
@@ -5989,6 +6007,8 @@ The following parameters are available in the `apache::mod::security` class:
 * [`logroot`](#logroot)
 * [`crs_package`](#crs_package)
 * [`activated_rules`](#activated_rules)
+* [`custom_rules`](#custom_rules)
+* [`custom_rules_set`](#custom_rules_set)
 * [`modsec_dir`](#modsec_dir)
 * [`modsec_secruleengine`](#modsec_secruleengine)
 * [`audit_log_relevant_status`](#audit_log_relevant_status)
@@ -6008,17 +6028,19 @@ The following parameters are available in the `apache::mod::security` class:
 * [`error_anomaly_score`](#error_anomaly_score)
 * [`warning_anomaly_score`](#warning_anomaly_score)
 * [`notice_anomaly_score`](#notice_anomaly_score)
+* [`paranoia_level`](#paranoia_level)
+* [`executing_paranoia_level`](#executing_paranoia_level)
 * [`secrequestmaxnumargs`](#secrequestmaxnumargs)
 * [`secrequestbodylimit`](#secrequestbodylimit)
 * [`secrequestbodynofileslimit`](#secrequestbodynofileslimit)
 * [`secrequestbodyinmemorylimit`](#secrequestbodyinmemorylimit)
+* [`secrequestbodyaccess`](#secrequestbodyaccess)
+* [`secresponsebodyaccess`](#secresponsebodyaccess)
 * [`manage_security_crs`](#manage_security_crs)
-* [`custom_rules`](#custom_rules)
-* [`custom_rules_set`](#custom_rules_set)
 
 ##### <a name="version"></a>`version`
 
-Data type: `Any`
+Data type: `Integer`
 
 Manage mod_security or mod_security2
 
@@ -6026,7 +6048,7 @@ Default value: `$apache::params::modsec_version`
 
 ##### <a name="logroot"></a>`logroot`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Configures the location of audit and debug logs.
 
@@ -6034,7 +6056,7 @@ Default value: `$apache::params::logroot`
 
 ##### <a name="crs_package"></a>`crs_package`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of package that installs CRS rules.
 
@@ -6042,15 +6064,31 @@ Default value: `$apache::params::modsec_crs_package`
 
 ##### <a name="activated_rules"></a>`activated_rules`
 
-Data type: `Any`
+Data type: `Array[String]`
 
 An array of rules from the modsec_crs_path or absolute to activate via symlinks.
 
 Default value: `$apache::params::modsec_default_rules`
 
+##### <a name="custom_rules"></a>`custom_rules`
+
+Data type: `Boolean`
+
+
+
+Default value: `$apache::params::modsec_custom_rules`
+
+##### <a name="custom_rules_set"></a>`custom_rules_set`
+
+Data type: `Optional[Array[String]]`
+
+
+
+Default value: `$apache::params::modsec_custom_rules_set`
+
 ##### <a name="modsec_dir"></a>`modsec_dir`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Defines the path where Puppet installs the modsec configuration and activated rules links.
 
@@ -6058,7 +6096,7 @@ Default value: `$apache::params::modsec_dir`
 
 ##### <a name="modsec_secruleengine"></a>`modsec_secruleengine`
 
-Data type: `Any`
+Data type: `String`
 
 Configures the rules engine.
 
@@ -6066,7 +6104,7 @@ Default value: `$apache::params::modsec_secruleengine`
 
 ##### <a name="audit_log_relevant_status"></a>`audit_log_relevant_status`
 
-Data type: `Any`
+Data type: `String`
 
 Configures which response status code is to be considered relevant for the purpose of audit logging.
 
@@ -6074,7 +6112,7 @@ Default value: `'^(?:5|4(?!04))'`
 
 ##### <a name="audit_log_parts"></a>`audit_log_parts`
 
-Data type: `Any`
+Data type: `String`
 
 Defines which parts of each transaction are going to be recorded in the audit log. Each part is assigned a single letter; when a
 letter appears in the list then the equivalent part will be recorded.
@@ -6083,7 +6121,7 @@ Default value: `$apache::params::modsec_audit_log_parts`
 
 ##### <a name="audit_log_type"></a>`audit_log_type`
 
-Data type: `Any`
+Data type: `String`
 
 Defines the type of audit logging mechanism to be used.
 
@@ -6091,7 +6129,7 @@ Default value: `$apache::params::modsec_audit_log_type`
 
 ##### <a name="audit_log_storage_dir"></a>`audit_log_storage_dir`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.
 
@@ -6099,7 +6137,7 @@ Default value: ``undef``
 
 ##### <a name="secpcrematchlimit"></a>`secpcrematchlimit`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the match limit in the PCRE library.
 
@@ -6107,7 +6145,7 @@ Default value: `$apache::params::secpcrematchlimit`
 
 ##### <a name="secpcrematchlimitrecursion"></a>`secpcrematchlimitrecursion`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the match limit recursion in the PCRE library.
 
@@ -6115,7 +6153,7 @@ Default value: `$apache::params::secpcrematchlimitrecursion`
 
 ##### <a name="allowed_methods"></a>`allowed_methods`
 
-Data type: `Any`
+Data type: `String`
 
 A space-separated list of allowed HTTP methods.
 
@@ -6123,7 +6161,7 @@ Default value: `'GET HEAD POST OPTIONS'`
 
 ##### <a name="content_types"></a>`content_types`
 
-Data type: `Any`
+Data type: `String`
 
 A list of one or more allowed MIME types.
 
@@ -6131,7 +6169,7 @@ Default value: `'application/x-www-form-urlencoded|multipart/form-data|text/xml|
 
 ##### <a name="restricted_extensions"></a>`restricted_extensions`
 
-Data type: `Any`
+Data type: `String`
 
 A space-sparated list of prohibited file extensions.
 
@@ -6139,7 +6177,7 @@ Default value: `'.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg
 
 ##### <a name="restricted_headers"></a>`restricted_headers`
 
-Data type: `Any`
+Data type: `String`
 
 A list of restricted headers separated by slashes and spaces.
 
@@ -6147,7 +6185,7 @@ Default value: `'/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /vi
 
 ##### <a name="secdefaultaction"></a>`secdefaultaction`
 
-Data type: `Any`
+Data type: `String`
 
 Defines the default list of actions, which will be inherited by the rules in the same configuration context.
 
@@ -6155,7 +6193,7 @@ Default value: `'deny'`
 
 ##### <a name="inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
@@ -6163,7 +6201,7 @@ Default value: `5`
 
 ##### <a name="outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set.
 
@@ -6171,7 +6209,7 @@ Default value: `4`
 
 ##### <a name="critical_anomaly_score"></a>`critical_anomaly_score`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the Anomaly Score for rules assigned with a critical severity.
 
@@ -6179,7 +6217,7 @@ Default value: `5`
 
 ##### <a name="error_anomaly_score"></a>`error_anomaly_score`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the Anomaly Score for rules assigned with a error severity.
 
@@ -6187,7 +6225,7 @@ Default value: `4`
 
 ##### <a name="warning_anomaly_score"></a>`warning_anomaly_score`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the Anomaly Score for rules assigned with a warning severity.
 
@@ -6195,15 +6233,32 @@ Default value: `3`
 
 ##### <a name="notice_anomaly_score"></a>`notice_anomaly_score`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the Anomaly Score for rules assigned with a notice severity.
 
 Default value: `2`
 
+##### <a name="paranoia_level"></a>`paranoia_level`
+
+Data type: `Integer[1,4]`
+
+Sets the paranoia level in the OWASP ModSecurity Core Rule Set.
+
+Default value: `1`
+
+##### <a name="executing_paranoia_level"></a>`executing_paranoia_level`
+
+Data type: `Integer[1,4]`
+
+Sets the executing paranoia level in the OWASP ModSecurity Core Rule Set.
+The default is equal to, and cannot be lower than, $paranoia_level.
+
+Default value: `$paranoia_level`
+
 ##### <a name="secrequestmaxnumargs"></a>`secrequestmaxnumargs`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the maximum number of arguments in the request.
 
@@ -6211,7 +6266,7 @@ Default value: `255`
 
 ##### <a name="secrequestbodylimit"></a>`secrequestbodylimit`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the maximum request body size ModSecurity will accept for buffering.
 
@@ -6219,7 +6274,7 @@ Default value: `13107200`
 
 ##### <a name="secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
 
-Data type: `Any`
+Data type: `Integer`
 
 Configures the maximum request body size ModSecurity will accept for buffering, excluding the size of any files being transported
 in the request.
@@ -6228,35 +6283,35 @@ Default value: `131072`
 
 ##### <a name="secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
 
-Data type: `Any`
+Data type: `Integer`
 
 Configures the maximum request body size that ModSecurity will store in memory.
 
 Default value: `131072`
 
-##### <a name="manage_security_crs"></a>`manage_security_crs`
-
-Data type: `Any`
-
-Toggles whether to manage ModSecurity Core Rule Set
+##### <a name="secrequestbodyaccess"></a>`secrequestbodyaccess`
 
-Default value: ``true``
+Data type: `Enum['On', 'Off']`
 
-##### <a name="custom_rules"></a>`custom_rules`
+Toggle SecRequestBodyAccess On or Off
 
-Data type: `Any`
+Default value: `'On'`
 
+##### <a name="secresponsebodyaccess"></a>`secresponsebodyaccess`
 
+Data type: `Enum['On', 'Off']`
 
-Default value: `$apache::params::modsec_custom_rules`
+Toggle SecResponseBodyAccess On or Off
 
-##### <a name="custom_rules_set"></a>`custom_rules_set`
+Default value: `'Off'`
 
-Data type: `Any`
+##### <a name="manage_security_crs"></a>`manage_security_crs`
 
+Data type: `Boolean`
 
+Toggles whether to manage ModSecurity Core Rule Set
 
-Default value: `$apache::params::modsec_custom_rules_set`
+Default value: ``true``
 
 ### <a name="apachemodsetenvif"></a>`apache::mod::setenvif`
 
@@ -6289,7 +6344,7 @@ The following parameters are available in the `apache::mod::shib` class:
 
 ##### <a name="suppress_warning"></a>`suppress_warning`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Toggles whether to trigger warning on RedHat nodes.
 
@@ -6297,7 +6352,7 @@ Default value: ``false``
 
 ##### <a name="mod_full_path"></a>`mod_full_path`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
@@ -6305,7 +6360,7 @@ Default value: ``undef``
 
 ##### <a name="package_name"></a>`package_name`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Name of the Shibboleth package to be installed.
 
@@ -6313,7 +6368,7 @@ Default value: ``undef``
 
 ##### <a name="mod_lib"></a>`mod_lib`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
 overrides this value.
@@ -6353,6 +6408,7 @@ apache::vhost to true.
 The following parameters are available in the `apache::mod::ssl` class:
 
 * [`ssl_compression`](#ssl_compression)
+* [`ssl_sessiontickets`](#ssl_sessiontickets)
 * [`ssl_cryptodevice`](#ssl_cryptodevice)
 * [`ssl_options`](#ssl_options)
 * [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
@@ -6368,13 +6424,12 @@ The following parameters are available in the `apache::mod::ssl` class:
 * [`ssl_sessioncache`](#ssl_sessioncache)
 * [`ssl_sessioncachetimeout`](#ssl_sessioncachetimeout)
 * [`ssl_stapling`](#ssl_stapling)
+* [`stapling_cache`](#stapling_cache)
 * [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
 * [`ssl_mutex`](#ssl_mutex)
 * [`ssl_reload_on_change`](#ssl_reload_on_change)
 * [`apache_version`](#apache_version)
 * [`package_name`](#package_name)
-* [`ssl_sessiontickets`](#ssl_sessiontickets)
-* [`stapling_cache`](#stapling_cache)
 
 ##### <a name="ssl_compression"></a>`ssl_compression`
 
@@ -6384,9 +6439,17 @@ Enable compression on the SSL level.
 
 Default value: ``false``
 
+##### <a name="ssl_sessiontickets"></a>`ssl_sessiontickets`
+
+Data type: `Optional[Boolean]`
+
+Enable or disable use of TLS session tickets
+
+Default value: ``undef``
+
 ##### <a name="ssl_cryptodevice"></a>`ssl_cryptodevice`
 
-Data type: `Any`
+Data type: `String`
 
 Enable use of a cryptographic hardware accelerator.
 
@@ -6394,7 +6457,7 @@ Default value: `'builtin'`
 
 ##### <a name="ssl_options"></a>`ssl_options`
 
-Data type: `Any`
+Data type: `Array[String]`
 
 Configure various SSL engine run-time options.
 
@@ -6402,7 +6465,7 @@ Default value: `['StdEnvVars']`
 
 ##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Configure OpenSSL parameters through its SSL_CONF API.
 
@@ -6410,7 +6473,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_cert"></a>`ssl_cert`
 
-Data type: `Optional[String]`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Path to server PEM-encoded X.509 certificate data file.
 
@@ -6418,7 +6481,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_key"></a>`ssl_key`
 
-Data type: `Optional[String]`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Path to server PEM-encoded private key file
 
@@ -6426,7 +6489,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_ca"></a>`ssl_ca`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 File of concatenated PEM-encoded CA Certificates for Client Auth.
 
@@ -6434,7 +6497,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_cipher"></a>`ssl_cipher`
 
-Data type: `Any`
+Data type: `String`
 
 Cipher Suite available for negotiation in SSL handshake.
 
@@ -6450,7 +6513,7 @@ Default value: ``true``
 
 ##### <a name="ssl_protocol"></a>`ssl_protocol`
 
-Data type: `Any`
+Data type: `Array[String]`
 
 Configure usable SSL/TLS protocol versions.
 Default based on the OS:
@@ -6469,7 +6532,7 @@ Default value: `[]`
 
 ##### <a name="ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
 
-Data type: `Any`
+Data type: `String`
 
 Type of pass phrase dialog for encrypted private keys.
 
@@ -6477,7 +6540,7 @@ Default value: `'builtin'`
 
 ##### <a name="ssl_random_seed_bytes"></a>`ssl_random_seed_bytes`
 
-Data type: `Any`
+Data type: `Integer`
 
 Pseudo Random Number Generator (PRNG) seeding source.
 
@@ -6493,7 +6556,7 @@ Default value: `$apache::params::ssl_sessioncache`
 
 ##### <a name="ssl_sessioncachetimeout"></a>`ssl_sessioncachetimeout`
 
-Data type: `Any`
+Data type: `Integer`
 
 Number of seconds before an SSL session expires in the Session Cache.
 
@@ -6507,6 +6570,15 @@ Enable stapling of OCSP responses in the TLS handshake.
 
 Default value: ``false``
 
+##### <a name="stapling_cache"></a>`stapling_cache`
+
+Data type: `Optional[String]`
+
+Configures the cache used to store OCSP responses which get included in
+the TLS handshake if SSLUseStapling is enabled.
+
+Default value: ``undef``
+
 ##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Optional[Boolean]`
@@ -6517,7 +6589,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_mutex"></a>`ssl_mutex`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Configures mutex mechanism and lock file directory for all or specified mutexes.
 Default based on the OS and/or Apache version:
@@ -6537,7 +6609,7 @@ Default value: ``false``
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -6545,25 +6617,9 @@ Default value: ``undef``
 
 ##### <a name="package_name"></a>`package_name`
 
-Data type: `Any`
-
-Name of ssl package to install.
-
-Default value: ``undef``
-
-##### <a name="ssl_sessiontickets"></a>`ssl_sessiontickets`
-
-Data type: `Optional[Boolean]`
-
-
-
-Default value: ``undef``
-
-##### <a name="stapling_cache"></a>`stapling_cache`
-
 Data type: `Optional[String]`
 
-
+Name of ssl package to install.
 
 Default value: ``undef``
 
@@ -6636,7 +6692,7 @@ Default value: `'On'`
 
 ##### <a name="status_path"></a>`status_path`
 
-Data type: `Any`
+Data type: `String`
 
 Path assigned to the Location directive which defines the URL to access the server status.
 
@@ -6644,7 +6700,7 @@ Default value: `'/server-status'`
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -6658,14 +6714,6 @@ Installs `mod_suexec`.
   * https://httpd.apache.org/docs/current/mod/mod_suexec.html
     * for additional documentation.
 
-### <a name="apachemodsuphp"></a>`apache::mod::suphp`
-
-Installs `mod_suphp`.
-
-* **See also**
-  * https://www.suphp.org/DocumentationView.html?file=apache/INSTALL
-    * for additional documentation.
-
 ### <a name="apachemoduserdir"></a>`apache::mod::userdir`
 
 Installs and configures `mod_userdir`.
@@ -6691,7 +6739,7 @@ The following parameters are available in the `apache::mod::userdir` class:
 
 ##### <a name="home"></a>`home`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 *Deprecated* Path to system home directory.
 
@@ -6699,7 +6747,7 @@ Default value: ``undef``
 
 ##### <a name="dir"></a>`dir`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 *Deprecated* Path from user's home directory to public directory.
 
@@ -6715,7 +6763,7 @@ Default value: ``undef``
 
 ##### <a name="disable_root"></a>`disable_root`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Toggles whether to allow use of root directory.
 
@@ -6723,7 +6771,7 @@ Default value: ``true``
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -6731,7 +6779,7 @@ Default value: ``undef``
 
 ##### <a name="path"></a>`path`
 
-Data type: `Any`
+Data type: `String`
 
 Path to directory or pattern from which to find user-specific directories.
 
@@ -6739,7 +6787,7 @@ Default value: `'/home/*/public_html'`
 
 ##### <a name="overrides"></a>`overrides`
 
-Data type: `Any`
+Data type: `Array[String]`
 
 Array of directives that are allowed in .htaccess files.
 
@@ -6747,7 +6795,7 @@ Default value: `['FileInfo', 'AuthConfig', 'Limit', 'Indexes']`
 
 ##### <a name="options"></a>`options`
 
-Data type: `Any`
+Data type: `Array[String]`
 
 Configures what features are available in a particular directory.
 
@@ -6755,7 +6803,7 @@ Default value: `['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExe
 
 ##### <a name="unmanaged_path"></a>`unmanaged_path`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Toggles whether to manage path in userdir.conf
 
@@ -6763,7 +6811,7 @@ Default value: ``false``
 
 ##### <a name="custom_fragment"></a>`custom_fragment`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Custom configuration to be added to userdir.conf
 
@@ -6785,7 +6833,7 @@ The following parameters are available in the `apache::mod::version` class:
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -6846,7 +6894,7 @@ The following parameters are available in the `apache::mod::worker` class:
 
 ##### <a name="startservers"></a>`startservers`
 
-Data type: `Any`
+Data type: `Integer`
 
 The number of child server processes created on startup
 
@@ -6854,7 +6902,7 @@ Default value: `2`
 
 ##### <a name="maxclients"></a>`maxclients`
 
-Data type: `Any`
+Data type: `Integer`
 
 The max number of simultaneous requests that will be served.
 This is the old name and is still supported. The new name is
@@ -6864,7 +6912,7 @@ Default value: `150`
 
 ##### <a name="minsparethreads"></a>`minsparethreads`
 
-Data type: `Any`
+Data type: `Integer`
 
 Minimum number of idle threads to handle request spikes.
 
@@ -6872,7 +6920,7 @@ Default value: `25`
 
 ##### <a name="maxsparethreads"></a>`maxsparethreads`
 
-Data type: `Any`
+Data type: `Integer`
 
 Maximum number of idle threads.
 
@@ -6880,7 +6928,7 @@ Default value: `75`
 
 ##### <a name="threadsperchild"></a>`threadsperchild`
 
-Data type: `Any`
+Data type: `Integer`
 
 The number of threads created by each child process.
 
@@ -6888,7 +6936,7 @@ Default value: `25`
 
 ##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
-Data type: `Any`
+Data type: `Integer`
 
 Limit on the number of connectiojns an individual child server
 process will handle. This is the old name and is still supported. The new
@@ -6898,7 +6946,7 @@ Default value: `0`
 
 ##### <a name="serverlimit"></a>`serverlimit`
 
-Data type: `Any`
+Data type: `Integer`
 
 With worker, use this directive only if your MaxRequestWorkers
 and ThreadsPerChild settings require more than 16 server processes
@@ -6910,7 +6958,7 @@ Default value: `25`
 
 ##### <a name="threadlimit"></a>`threadlimit`
 
-Data type: `Any`
+Data type: `Integer`
 
 This directive sets the maximum configured value for
 ThreadsPerChild for the lifetime of the Apache httpd process.
@@ -6919,7 +6967,7 @@ Default value: `64`
 
 ##### <a name="listenbacklog"></a>`listenbacklog`
 
-Data type: `Any`
+Data type: `Integer`
 
 Maximum length of the queue of pending connections.
 
@@ -6927,7 +6975,7 @@ Default value: `511`
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
@@ -6958,7 +7006,7 @@ The following parameters are available in the `apache::mod::wsgi` class:
 
 ##### <a name="wsgi_restrict_embedded"></a>`wsgi_restrict_embedded`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Enable restrictions on use of embedded mode.
 
@@ -6966,7 +7014,7 @@ Default value: ``undef``
 
 ##### <a name="wsgi_socket_prefix"></a>`wsgi_socket_prefix`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Configure directory to use for daemon sockets.
 
@@ -6974,7 +7022,7 @@ Default value: `$apache::params::wsgi_socket_prefix`
 
 ##### <a name="wsgi_python_path"></a>`wsgi_python_path`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Additional directories to search for Python modules.
 
@@ -6982,7 +7030,7 @@ Default value: ``undef``
 
 ##### <a name="wsgi_python_home"></a>`wsgi_python_home`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Absolute path to Python prefix/exec_prefix directories.
 
@@ -6990,7 +7038,7 @@ Default value: ``undef``
 
 ##### <a name="wsgi_python_optimize"></a>`wsgi_python_optimize`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Enables basic Python optimisation features.
 
@@ -6998,7 +7046,7 @@ Default value: ``undef``
 
 ##### <a name="wsgi_application_group"></a>`wsgi_application_group`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets which application group WSGI application belongs to.
 
@@ -7006,7 +7054,7 @@ Default value: ``undef``
 
 ##### <a name="package_name"></a>`package_name`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Names of package that installs mod_wsgi.
 
@@ -7014,7 +7062,7 @@ Default value: ``undef``
 
 ##### <a name="mod_path"></a>`mod_path`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Defines the path to the mod_wsgi shared object (.so) file.
 
@@ -7030,15 +7078,15 @@ Installs `mod_xsendfile`.
 
 ### <a name="apachempmdisable_mpm_event"></a>`apache::mpm::disable_mpm_event`
 
-The apache::mpm::disable_mpm_event class.
+disable Apache-Module event
 
 ### <a name="apachempmdisable_mpm_prefork"></a>`apache::mpm::disable_mpm_prefork`
 
-The apache::mpm::disable_mpm_prefork class.
+disable Apache-Module prefork
 
 ### <a name="apachempmdisable_mpm_worker"></a>`apache::mpm::disable_mpm_worker`
 
-The apache::mpm::disable_mpm_worker class.
+disable Apache-Module worker
 
 ### <a name="apachevhosts"></a>`apache::vhosts`
 
@@ -7069,7 +7117,7 @@ The following parameters are available in the `apache::vhosts` class:
 
 ##### <a name="vhosts"></a>`vhosts`
 
-Data type: `Any`
+Data type: `Hash`
 
 A hash, where the key represents the name and the value represents a hash of
 `apache::vhost` defined type's parameters.
@@ -7115,7 +7163,7 @@ This name is also used in the name of the conf.d file
 
 ##### <a name="proxy_set"></a>`proxy_set`
 
-Data type: `Any`
+Data type: `Hash`
 
 Configures key-value pairs to be used as a ProxySet lines in the configuration.
 
@@ -7123,7 +7171,7 @@ Default value: `{}`
 
 ##### <a name="target"></a>`target`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 The path to the file the balancer definition will be written in.
 
@@ -7131,7 +7179,7 @@ Default value: ``undef``
 
 ##### <a name="collect_exported"></a>`collect_exported`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Determines whether to use exported resources.<br />
 If you statically declare all of your backend servers, set this parameter to false to rely
@@ -7148,7 +7196,7 @@ Default value: ``true``
 
 ##### <a name="options"></a>`options`
 
-Data type: `Any`
+Data type: `Array[Pattern[/=/]]`
 
 Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)
 after the balancer URL, and accepts any key-value pairs available to `ProxyPass`.
@@ -7199,22 +7247,22 @@ fragment name.
 
 ##### <a name="balancer_cluster"></a>`balancer_cluster`
 
-Data type: `Any`
+Data type: `String`
 
 The apache service's instance name (or, the title of the apache::balancer
 resource). This must match up with a declared apache::balancer resource.
 
 ##### <a name="url"></a>`url`
 
-Data type: `Any`
+Data type: `Stdlib::HTTPUrl`
 
 The url used to contact the balancer member server.
 
-Default value: `"http://${::fqdn}/"`
+Default value: `"http://${$facts['networking']['fqdn']}/"`
 
 ##### <a name="options"></a>`options`
 
-Data type: `Any`
+Data type: `Array`
 
 Specifies an array of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)
 after the URL, and accepts any key-value pairs available to `ProxyPass`.
@@ -7253,7 +7301,7 @@ Default value: `'present'`
 
 ##### <a name="confdir"></a>`confdir`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Sets the directory in which Puppet places configuration files.
 
@@ -7261,7 +7309,7 @@ Default value: `$apache::confd_dir`
 
 ##### <a name="content"></a>`content`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the configuration file's content. The `content` and `source` parameters are exclusive
 of each other.
@@ -7270,7 +7318,7 @@ Default value: ``undef``
 
 ##### <a name="filename"></a>`filename`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the name of the file under `confdir` in which Puppet stores the configuration.
 
@@ -7278,7 +7326,7 @@ Default value: ``undef``
 
 ##### <a name="priority"></a>`priority`
 
-Data type: `Any`
+Data type: `Variant[Integer, Boolean]`
 
 Sets the configuration file's priority by prefixing its filename with this parameter's
 numeric value, as Apache processes configuration files in alphanumeric order.<br />
@@ -7288,7 +7336,7 @@ Default value: `25`
 
 ##### <a name="source"></a>`source`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Points to the configuration file's source. The `content` and `source` parameters are
 exclusive of each other.
@@ -7297,7 +7345,7 @@ Default value: ``undef``
 
 ##### <a name="verify_command"></a>`verify_command`
 
-Data type: `Any`
+Data type: `String`
 
 Specifies the command Puppet uses to verify the configuration file. Use a fully qualified
 command.<br />
@@ -7317,7 +7365,7 @@ Default value: ``true``
 
 ##### <a name="owner"></a>`owner`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 File owner of configuration file
 
@@ -7325,7 +7373,7 @@ Default value: ``undef``
 
 ##### <a name="group"></a>`group`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 File group of configuration file
 
@@ -7333,7 +7381,7 @@ Default value: ``undef``
 
 ##### <a name="file_mode"></a>`file_mode`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Filemode]`
 
 File mode of configuration file
 
@@ -7366,7 +7414,7 @@ The following parameters are available in the `apache::fastcgi::server` defined
 
 ##### <a name="host"></a>`host`
 
-Data type: `Any`
+Data type: `String`
 
 Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
 
@@ -7374,7 +7422,7 @@ Default value: `'127.0.0.1:9000'`
 
 ##### <a name="timeout"></a>`timeout`
 
-Data type: `Any`
+Data type: `Integer`
 
 Sets the number of seconds a [FastCGI](http://www.fastcgi.com/) application can be inactive before aborting the
 request and logging the event at the error LogLevel. The inactivity timer applies only as
@@ -7387,7 +7435,7 @@ Default value: `15`
 
 ##### <a name="flush"></a>`flush`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Forces `mod_fastcgi` to write to the client as data is received from the
 application. By default, `mod_fastcgi` buffers data in order to free the application
@@ -7397,7 +7445,7 @@ Default value: ``false``
 
 ##### <a name="faux_path"></a>`faux_path`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Apache has FastCGI handle URIs that resolve to this filename. The path set in this
 parameter does not have to exist in the local filesystem.
@@ -7406,7 +7454,7 @@ Default value: `"/var/www/${name}.fcgi"`
 
 ##### <a name="fcgi_alias"></a>`fcgi_alias`
 
-Data type: `Any`
+Data type: `Stdlib::Unixpath`
 
 Internally links actions with the FastCGI server. This alias must be unique.
 
@@ -7414,7 +7462,7 @@ Default value: `"/${name}.fcgi"`
 
 ##### <a name="file_type"></a>`file_type`
 
-Data type: `Any`
+Data type: `String`
 
 Sets the MIME `content-type` of the file to be processed by the FastCGI server.
 
@@ -7422,9 +7470,9 @@ Default value: `'application/x-httpd-php'`
 
 ##### <a name="pass_header"></a>`pass_header`
 
-Data type: `Any`
-
+Data type: `Optional[String]`
 
+Sets a header for the server
 
 Default value: ``undef``
 
@@ -7453,7 +7501,7 @@ The following parameters are available in the `apache::mod` defined type:
 
 ##### <a name="package"></a>`package`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 **Required**.<br />
 Names the package Puppet uses to install the Apache module.
@@ -7462,7 +7510,7 @@ Default value: ``undef``
 
 ##### <a name="package_ensure"></a>`package_ensure`
 
-Data type: `Any`
+Data type: `String`
 
 Determines whether Puppet ensures the Apache module should be installed.
 
@@ -7470,7 +7518,7 @@ Default value: `'present'`
 
 ##### <a name="lib"></a>`lib`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
@@ -7478,7 +7526,7 @@ Default value: ``undef``
 
 ##### <a name="lib_path"></a>`lib_path`
 
-Data type: `Any`
+Data type: `String`
 
 Specifies a path to the module's libraries. Do not manually set this parameter
 without special reason. The `path` parameter overrides this value.
@@ -7487,7 +7535,7 @@ Default value: `$apache::lib_path`
 
 ##### <a name="loadfile_name"></a>`loadfile_name`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the filename for the module's `LoadFile` directive, which can also set
 the module load order as Apache processes them in alphanumeric order.
@@ -7496,7 +7544,7 @@ Default value: ``undef``
 
 ##### <a name="id"></a>`id`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the package id
 
@@ -7504,7 +7552,7 @@ Default value: ``undef``
 
 ##### <a name="loadfiles"></a>`loadfiles`
 
-Data type: `Any`
+Data type: `Optional[Array]`
 
 Specifies an array of `LoadFile` directives.
 
@@ -7512,7 +7560,7 @@ Default value: ``undef``
 
 ##### <a name="path"></a>`path`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
@@ -7545,6 +7593,55 @@ override `Apache::Vhost['default']`  or `Apache::Vhost['default-ssl]` resources.
 workaround is to create a vhost named something else, such as `my default`, and ensure that the
 `default` and `default_ssl` vhosts are set to `false`:
 
+TODO: check, if this Documentation is obsolete
+lint:ignore:parameter_documentation
+lint:endignore
+  Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
+  ```puppet
+  apache::vhost { 'sample.example.net':
+    docroot     => '/path/to/directory',
+    directories => [
+      { path   => '/path/to/different/dir',
+        gssapi => {
+          acceptor_name            => '{HOSTNAME}',
+          allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
+          authname                 => 'Kerberos 5',
+          authtype                 => 'GSSAPI',
+          basic_auth               => true,
+          basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
+          basic_ticket_timeout     => 300,
+          connection_bound         => true,
+          cred_store               => {
+            ccache        => ['/path/to/directory'],
+            client_keytab => ['/path/to/example.keytab'],
+            keytab        => ['/path/to/example.keytab'],
+          },
+          deleg_ccache_dir         => '/path/to/directory',
+          deleg_ccache_env_var     => 'KRB5CCNAME',
+          deleg_ccache_perms       => {
+            mode => '0600',
+            uid  => 'example-user',
+            gid  => 'example-group',
+          },
+          deleg_ccache_unique      => true,
+          impersonate              => true,
+          local_name               => true,
+          name_attributes          => 'json',
+          negotiate_once           => true,
+          publish_errors           => true,
+          publish_mech             => true,
+          required_name_attributes =>	'auth-indicators=high',
+          session_key              => 'file:/path/to/example.key',
+          signal_persistent_auth   => true,
+          ssl_only                 => true,
+          use_s4u2_proxy           => true,
+          use_sessions             => true,
+        }
+      },
+    ],
+  }
+  ```
+
 #### Examples
 
 ##### 
@@ -7571,7 +7668,6 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`add_default_charset`](#add_default_charset)
 * [`add_listen`](#add_listen)
 * [`use_optional_includes`](#use_optional_includes)
-* [`additional_includes`](#additional_includes)
 * [`aliases`](#aliases)
 * [`allow_encoded_slashes`](#allow_encoded_slashes)
 * [`block`](#block)
@@ -7585,7 +7681,6 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`cas_validate_url`](#cas_validate_url)
 * [`cas_cookie_path`](#cas_cookie_path)
 * [`comment`](#comment)
-* [`custom_fragment`](#custom_fragment)
 * [`default_vhost`](#default_vhost)
 * [`directoryindex`](#directoryindex)
 * [`docroot`](#docroot)
@@ -7601,10 +7696,6 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`error_documents`](#error_documents)
 * [`ensure`](#ensure)
 * [`fallbackresource`](#fallbackresource)
-* [`fastcgi_server`](#fastcgi_server)
-* [`fastcgi_socket`](#fastcgi_socket)
-* [`fastcgi_idle_timeout`](#fastcgi_idle_timeout)
-* [`fastcgi_dir`](#fastcgi_dir)
 * [`filters`](#filters)
 * [`h2_copy_files`](#h2_copy_files)
 * [`h2_direct`](#h2_direct)
@@ -7621,7 +7712,6 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
 * [`h2_upgrade`](#h2_upgrade)
 * [`h2_window_size`](#h2_window_size)
-* [`headers`](#headers)
 * [`ip`](#ip)
 * [`ip_based`](#ip_based)
 * [`itk`](#itk)
@@ -7656,6 +7746,9 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`modsec_audit_log_file`](#modsec_audit_log_file)
 * [`modsec_audit_log_pipe`](#modsec_audit_log_pipe)
 * [`modsec_audit_log`](#modsec_audit_log)
+* [`modsec_inbound_anomaly_threshold`](#modsec_inbound_anomaly_threshold)
+* [`modsec_outbound_anomaly_threshold`](#modsec_outbound_anomaly_threshold)
+* [`modsec_allowed_methods`](#modsec_allowed_methods)
 * [`no_proxy_uris`](#no_proxy_uris)
 * [`no_proxy_uris_match`](#no_proxy_uris_match)
 * [`proxy_preserve_host`](#proxy_preserve_host)
@@ -7678,6 +7771,7 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`passenger_restart_dir`](#passenger_restart_dir)
 * [`passenger_spawn_method`](#passenger_spawn_method)
 * [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
+* [`passenger_preload_bundler`](#passenger_preload_bundler)
 * [`passenger_rolling_restarts`](#passenger_rolling_restarts)
 * [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
 * [`passenger_user`](#passenger_user)
@@ -7742,9 +7836,6 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`setenvif`](#setenvif)
 * [`setenvifnocase`](#setenvifnocase)
 * [`suexec_user_group`](#suexec_user_group)
-* [`suphp_addhandler`](#suphp_addhandler)
-* [`suphp_configpath`](#suphp_configpath)
-* [`suphp_engine`](#suphp_engine)
 * [`vhost_name`](#vhost_name)
 * [`virtual_docroot`](#virtual_docroot)
 * [`virtual_use_default_docroot`](#virtual_use_default_docroot)
@@ -7760,11 +7851,7 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`wsgi_pass_authorization`](#wsgi_pass_authorization)
 * [`directories`](#directories)
 * [`custom_fragment`](#custom_fragment)
-* [`error_documents`](#error_documents)
-* [`h2_copy_files`](#h2_copy_files)
-* [`h2_push_resource`](#h2_push_resource)
 * [`headers`](#headers)
-* [`options`](#options)
 * [`shib_compat_valid_user`](#shib_compat_valid_user)
 * [`ssl_options`](#ssl_options)
 * [`additional_includes`](#additional_includes)
@@ -7793,7 +7880,6 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`ssl_proxy_check_peer_cn`](#ssl_proxy_check_peer_cn)
 * [`ssl_proxy_check_peer_name`](#ssl_proxy_check_peer_name)
 * [`ssl_proxy_check_peer_expire`](#ssl_proxy_check_peer_expire)
-* [`ssl_options`](#ssl_options)
 * [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
 * [`ssl_proxyengine`](#ssl_proxyengine)
 * [`ssl_stapling`](#ssl_stapling)
@@ -7809,17 +7895,15 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`limitreqfieldsize`](#limitreqfieldsize)
 * [`limitreqline`](#limitreqline)
 * [`limitreqbody`](#limitreqbody)
-* [`$use_servername_for_filenames`](#$use_servername_for_filenames)
-* [`$use_port_for_filenames`](#$use_port_for_filenames)
-* [`$mdomain`](#$mdomain)
 * [`use_servername_for_filenames`](#use_servername_for_filenames)
 * [`use_port_for_filenames`](#use_port_for_filenames)
-* [`proxy_requests`](#proxy_requests)
 * [`mdomain`](#mdomain)
+* [`proxy_requests`](#proxy_requests)
+* [`userdir`](#userdir)
 
 ##### <a name="apache_version"></a>`apache_version`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Apache's version number as a string, such as '2.2' or '2.4'.
 
@@ -7829,57 +7913,57 @@ Default value: `$apache::apache_version`
 
 Data type: `Boolean`
 
-Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`).
+Determines whether to configure `*_access.log` directives (`*_file`, `*_pipe`, or `*_syslog`).
 
 Default value: ``true``
 
 ##### <a name="access_log_env_var"></a>`access_log_env_var`
 
-Data type: `Any`
+Data type: `Optional[Variant[Boolean, String]]`
 
 Specifies that only requests with particular environment variables be logged.
 
-Default value: ``false``
+Default value: ``undef``
 
 ##### <a name="access_log_file"></a>`access_log_file`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 Sets the filename of the `*_access.log` placed in `logroot`. Given a virtual host ---for
 instance, example.com--- it defaults to 'example.com_ssl.log' for
 [SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
 `example.com_access.log` for unencrypted virtual hosts.
 
-Default value: ``false``
+Default value: ``undef``
 
 ##### <a name="access_log_format"></a>`access_log_format`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the
 access log.
 
-Default value: ``false``
+Default value: ``undef``
 
 ##### <a name="access_log_pipe"></a>`access_log_pipe`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 Specifies a pipe where Apache sends access log messages.
 
-Default value: ``false``
+Default value: ``undef``
 
 ##### <a name="access_log_syslog"></a>`access_log_syslog`
 
-Data type: `Any`
+Data type: `Optional[Variant[String, Boolean]]`
 
 Sends all access log messages to syslog.
 
-Default value: ``false``
+Default value: ``undef``
 
 ##### <a name="access_logs"></a>`access_logs`
 
-Data type: `Optional[Array]`
+Data type: `Optional[Array[Hash]]`
 
 Allows you to give a hash that specifies the state of each of the `access_log_*`
 directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
@@ -7888,7 +7972,7 @@ Default value: ``undef``
 
 ##### <a name="add_default_charset"></a>`add_default_charset`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets a default media charset value for the `AddDefaultCharset` directive, which is
 added to `text/plain` and `text/html` responses.
@@ -7897,7 +7981,7 @@ Default value: ``undef``
 
 ##### <a name="add_listen"></a>`add_listen`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Determines whether the virtual host creates a `Listen` statement.<br />
 Setting `add_listen` to `false` prevents the virtual host from creating a `Listen`
@@ -7908,26 +7992,16 @@ Default value: ``true``
 
 ##### <a name="use_optional_includes"></a>`use_optional_includes`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Specifies whether Apache uses the `IncludeOptional` directive instead of `Include` for
 `additional_includes` in Apache 2.4 or newer.
 
 Default value: `$apache::use_optional_includes`
 
-##### <a name="additional_includes"></a>`additional_includes`
-
-Data type: `Any`
-
-Specifies paths to additional static, virtual host-specific Apache configuration files.
-You can use this parameter to implement a unique, custom configuration not supported by
-this module.
-
-Default value: `[]`
-
 ##### <a name="aliases"></a>`aliases`
 
-Data type: `Any`
+Data type: `Array[Hash[String[1], String[1]]]`
 
 Passes a list of [hashes][hash] to the virtual host to create `Alias`, `AliasMatch`,
 `ScriptAlias` or `ScriptAliasMatch` directives as per the `mod_alias` documentation.<br />
@@ -7966,7 +8040,7 @@ If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`,
 directive might not be able to honor the `PassengerEnabled => off` statement. See
 [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
 
-Default value: ``undef``
+Default value: `[]`
 
 ##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
 
@@ -7981,7 +8055,7 @@ Default value: ``undef``
 
 ##### <a name="block"></a>`block`
 
-Data type: `Any`
+Data type: `Variant[Array[String], String]`
 
 Specifies the list of things to which Apache blocks access. Valid options are: `scm` (which
 blocks web access to `.svn`), `.git`, and `.bzr` directories.
@@ -7990,7 +8064,7 @@ Default value: `[]`
 
 ##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
@@ -7999,7 +8073,7 @@ Default value: ``undef``
 
 ##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
@@ -8007,7 +8081,7 @@ Default value: ``undef``
 
 ##### <a name="cas_login_url"></a>`cas_login_url`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
@@ -8016,7 +8090,7 @@ Default value: ``undef``
 
 ##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
@@ -8025,31 +8099,31 @@ Default value: ``undef``
 
 ##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: ``undef``
+Default value: ``false``
 
 ##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: ``undef``
+Default value: ``false``
 
 ##### <a name="cas_validate_saml"></a>`cas_validate_saml`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Parse response from CAS server for SAML.
 
-Default value: ``undef``
+Default value: ``false``
 
 ##### <a name="cas_validate_url"></a>`cas_validate_url`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
@@ -8057,7 +8131,7 @@ Default value: ``undef``
 
 ##### <a name="cas_cookie_path"></a>`cas_cookie_path`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the location where information on the current session should be stored. This should
 be writable by the web server only.
@@ -8066,7 +8140,7 @@ Default value: ``undef``
 
 ##### <a name="comment"></a>`comment`
 
-Data type: `Optional[Variant[String,Array[String]]]`
+Data type: `Optional[Variant[String, Array[String]]]`
 
 Adds comments to the header of the configuration file. Pass as string or an array of strings.
 For example:
@@ -8083,15 +8157,6 @@ comment => [
 
 Default value: ``undef``
 
-##### <a name="custom_fragment"></a>`custom_fragment`
-
-Data type: `Optional[String]`
-
-Passes a string of custom configuration directives to place at the end of the virtual
-host configuration.
-
-Default value: ``undef``
-
 ##### <a name="default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
@@ -8103,17 +8168,17 @@ Default value: ``false``
 
 ##### <a name="directoryindex"></a>`directoryindex`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the list of resources to look for when a client requests an index of the directory
 by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive
 documentation for details.
 
-Default value: `''`
+Default value: ``undef``
 
 ##### <a name="docroot"></a>`docroot`
 
-Data type: `Variant[Boolean,String]`
+Data type: `Variant[Stdlib::Absolutepath, Boolean]`
 
 **Required**.<br />
 Sets the `DocumentRoot` location, from which Apache serves files.<br />
@@ -8122,7 +8187,7 @@ and the accompanying `<Directory /path/to/directory>` block will not be created.
 
 ##### <a name="docroot_group"></a>`docroot_group`
 
-Data type: `Any`
+Data type: `String`
 
 Sets group access to the `docroot` directory.
 
@@ -8130,7 +8195,7 @@ Default value: `$apache::params::root_group`
 
 ##### <a name="docroot_owner"></a>`docroot_owner`
 
-Data type: `Any`
+Data type: `String`
 
 Sets individual user access to the `docroot` directory.
 
@@ -8138,7 +8203,7 @@ Default value: `'root'`
 
 ##### <a name="docroot_mode"></a>`docroot_mode`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Filemode]`
 
 Sets access permissions for the `docroot` directory, in numeric notation.
 
@@ -8146,7 +8211,7 @@ Default value: ``undef``
 
 ##### <a name="manage_docroot"></a>`manage_docroot`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Determines whether Puppet manages the `docroot` directory.
 
@@ -8162,7 +8227,7 @@ Default value: ``true``
 
 ##### <a name="error_log_file"></a>`error_log_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Points the virtual host's error logs to a `*_error.log` file. If this parameter is
 undefined, Puppet checks for values in `error_log_pipe`, then `error_log_syslog`.<br />
@@ -8174,7 +8239,7 @@ Default value: ``undef``
 
 ##### <a name="error_log_pipe"></a>`error_log_pipe`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies a pipe to send error log messages to.<br />
 This parameter has no effect if the `error_log_file` parameter has a value. If neither
@@ -8184,7 +8249,7 @@ Default value: ``undef``
 
 ##### <a name="error_log_syslog"></a>`error_log_syslog`
 
-Data type: `Any`
+Data type: `Optional[Variant[String, Boolean]]`
 
 Determines whether to send all error log messages to syslog.
 This parameter has no effect if either of the `error_log_file` or `error_log_pipe`
@@ -8225,7 +8290,7 @@ Default value: ``undef``
 
 ##### <a name="error_documents"></a>`error_documents`
 
-Data type: `Any`
+Data type: `Variant[Array[Hash], String]`
 
 A list of hashes which can be used to override the
 [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)
@@ -8261,41 +8326,9 @@ with a `/` or be `disabled`.
 
 Default value: ``undef``
 
-##### <a name="fastcgi_server"></a>`fastcgi_server`
-
-Data type: `Any`
-
-Specify an external FastCGI server to manage a connection to.
-
-Default value: ``undef``
-
-##### <a name="fastcgi_socket"></a>`fastcgi_socket`
-
-Data type: `Any`
-
-Specify the socket that will be used to communicate with an external FastCGI server.
-
-Default value: ``undef``
-
-##### <a name="fastcgi_idle_timeout"></a>`fastcgi_idle_timeout`
-
-Data type: `Any`
-
-If using fastcgi, this option sets the timeout for the server to respond.
-
-Default value: ``undef``
-
-##### <a name="fastcgi_dir"></a>`fastcgi_dir`
-
-Data type: `Any`
-
-Specify an internal FastCGI directory that is to be managed.
-
-Default value: ``undef``
-
 ##### <a name="filters"></a>`filters`
 
-Data type: `Any`
+Data type: `Array[String[1]]`
 
 [Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart,
 context-sensitive configuration of output content filters.
@@ -8310,7 +8343,7 @@ apache::vhost { "$::fqdn":
 }
 ```
 
-Default value: ``undef``
+Default value: `[]`
 
 ##### <a name="h2_copy_files"></a>`h2_copy_files`
 
@@ -8457,18 +8490,14 @@ client to server and limits the amount of data the server has to buffer.
 
 Default value: ``undef``
 
-##### <a name="headers"></a>`headers`
-
-Data type: `Any`
-
-Adds lines to replace, merge, or remove response headers. See
-[Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information.
-
-Default value: ``undef``
-
 ##### <a name="ip"></a>`ip`
 
-Data type: `Any`
+Data type: `Optional[
+    Variant[
+      Array[Variant[Stdlib::IP::Address, Enum['*']]],
+      Variant[Stdlib::IP::Address, Enum['*']]
+    ]
+  ]`
 
 Sets the IP address the virtual host listens on. By default, uses Apache's default behavior
 of listening on all IPs.
@@ -8513,7 +8542,7 @@ Default value: ``undef``
 
 ##### <a name="action"></a>`action`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies whether you wish to configure mod_actions action directive which will
 activate cgi-script when triggered by a request.
@@ -8522,7 +8551,7 @@ Default value: ``undef``
 
 ##### <a name="jk_mounts"></a>`jk_mounts`
 
-Data type: `Any`
+Data type: `Array[Hash]`
 
 Sets up a virtual host with `JkMount` and `JkUnMount` directives to handle the paths
 for URL mapping between Tomcat and Apache.<br />
@@ -8538,7 +8567,7 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `[]`
 
 ##### <a name="http_protocol_options"></a>`http_protocol_options`
 
@@ -8561,7 +8590,7 @@ Default value: ``undef``
 
 ##### <a name="keepalive_timeout"></a>`keepalive_timeout`
 
-Data type: `Any`
+Data type: `Optional[Variant[Integer, String]]`
 
 Sets the `KeepAliveTimeout` directive for the virtual host, which determines the amount
 of time to wait for subsequent requests on a persistent HTTP connection. By default, the
@@ -8573,7 +8602,7 @@ Default value: ``undef``
 
 ##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
 
-Data type: `Any`
+Data type: `Optional[Variant[Integer, String]]`
 
 Limits the number of requests allowed per connection to the virtual host. By default,
 the global, server-wide `KeepAlive` setting is in effect.<br />
@@ -8594,12 +8623,14 @@ apache::vhost { 'sample.example.net':
   krb_method_negotiate   => 'on',
   krb_auth_realms        => ['EXAMPLE.ORG'],
   krb_local_user_mapping => 'on',
-  directories            => {
-    path         => '/var/www/html',
-    auth_name    => 'Kerberos Login',
-    auth_type    => 'Kerberos',
-    auth_require => 'valid-user',
-  },
+  directories            => [
+    {
+      path         => '/var/www/html',
+      auth_name    => 'Kerberos Login',
+      auth_type    => 'Kerberos',
+      auth_require => 'valid-user',
+    },
+  ],
 }
 ```
 
@@ -8607,7 +8638,7 @@ Default value: ``false``
 
 ##### <a name="krb_method_negotiate"></a>`krb_method_negotiate`
 
-Data type: `Any`
+Data type: `Enum['on', 'off']`
 
 Determines whether to use the Negotiate method.
 
@@ -8615,7 +8646,7 @@ Default value: `'on'`
 
 ##### <a name="krb_method_k5passwd"></a>`krb_method_k5passwd`
 
-Data type: `Any`
+Data type: `Enum['on', 'off']`
 
 Determines whether to use password-based authentication for Kerberos v5.
 
@@ -8623,7 +8654,7 @@ Default value: `'on'`
 
 ##### <a name="krb_authoritative"></a>`krb_authoritative`
 
-Data type: `Any`
+Data type: `Enum['on', 'off']`
 
 If set to `off`, authentication controls can be passed on to another module.
 
@@ -8631,7 +8662,7 @@ Default value: `'on'`
 
 ##### <a name="krb_auth_realms"></a>`krb_auth_realms`
 
-Data type: `Any`
+Data type: `Array[String]`
 
 Specifies an array of Kerberos realms to use for authentication.
 
@@ -8639,7 +8670,7 @@ Default value: `[]`
 
 ##### <a name="krb_5keytab"></a>`krb_5keytab`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the Kerberos v5 keytab file's location.
 
@@ -8647,7 +8678,7 @@ Default value: ``undef``
 
 ##### <a name="krb_local_user_mapping"></a>`krb_local_user_mapping`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off']]`
 
 Strips @REALM from usernames for further use.
 
@@ -8655,7 +8686,7 @@ Default value: ``undef``
 
 ##### <a name="krb_verify_kdc"></a>`krb_verify_kdc`
 
-Data type: `Any`
+Data type: `Enum['on', 'off']`
 
 This option can be used to disable the verification tickets against local keytab to prevent
 KDC spoofing attacks.
@@ -8664,7 +8695,7 @@ Default value: `'on'`
 
 ##### <a name="krb_servicename"></a>`krb_servicename`
 
-Data type: `Any`
+Data type: `String`
 
 Specifies the service name that will be used by Apache for authentication. Corresponding
 key of this name must be stored in the keytab.
@@ -8673,7 +8704,7 @@ Default value: `'HTTP'`
 
 ##### <a name="krb_save_credentials"></a>`krb_save_credentials`
 
-Data type: `Any`
+Data type: `Enum['on', 'off']`
 
 This option enables credential saving functionality.
 
@@ -8681,7 +8712,7 @@ Default value: `'off'`
 
 ##### <a name="logroot"></a>`logroot`
 
-Data type: `Any`
+Data type: `Stdlib::Absolutepath`
 
 Specifies the location of the virtual host's logfiles.
 
@@ -8697,7 +8728,7 @@ Default value: `'directory'`
 
 ##### <a name="logroot_mode"></a>`logroot_mode`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Filemode]`
 
 Overrides the mode the logroot directory is set to. Do *not* grant write access to the
 directory the logs are stored in without being aware of the consequences; for more
@@ -8707,7 +8738,7 @@ Default value: ``undef``
 
 ##### <a name="logroot_owner"></a>`logroot_owner`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets individual user access to the logroot directory.
 
@@ -8715,7 +8746,7 @@ Default value: ``undef``
 
 ##### <a name="logroot_group"></a>`logroot_group`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets group access to the `logroot` directory.
 
@@ -8731,7 +8762,7 @@ Default value: ``undef``
 
 ##### <a name="modsec_body_limit"></a>`modsec_body_limit`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
 
@@ -8739,11 +8770,11 @@ Default value: ``undef``
 
 ##### <a name="modsec_disable_vhost"></a>`modsec_disable_vhost`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
 
-Default value: ``undef``
+Default value: ``false``
 
 ##### <a name="modsec_disable_ids"></a>`modsec_disable_ids`
 
@@ -8767,11 +8798,11 @@ Default value: ``undef``
 
 ##### <a name="modsec_disable_ips"></a>`modsec_disable_ips`
 
-Data type: `Any`
+Data type: `Array[String[1]]`
 
 Specifies an array of IP addresses to exclude from `mod_security` rule matching.
 
-Default value: ``undef``
+Default value: `[]`
 
 ##### <a name="modsec_disable_msgs"></a>`modsec_disable_msgs`
 
@@ -8813,7 +8844,7 @@ Default value: ``undef``
 
 ##### <a name="modsec_audit_log_file"></a>`modsec_audit_log_file`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 If set, it is relative to `logroot`.<br />
 One of the parameters that determines how to send `mod_security` audit
@@ -8825,7 +8856,7 @@ Default value: ``undef``
 
 ##### <a name="modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 If `modsec_audit_log_pipe` is set, it should start with a pipe. Example
 `|/path/to/mlogc /path/to/mlogc.conf`.<br />
@@ -8838,7 +8869,7 @@ Default value: ``undef``
 
 ##### <a name="modsec_audit_log"></a>`modsec_audit_log`
 
-Data type: `Any`
+Data type: `Optional[Variant[String, Boolean]]`
 
 If `modsec_audit_log` is `true`, given a virtual host ---for instance, example.com--- it
 defaults to `example.com\_security\_ssl.log` for SSL-encrypted virtual hosts
@@ -8850,9 +8881,37 @@ If none of those parameters are set, the global audit log is used
 
 Default value: ``undef``
 
+##### <a name="modsec_inbound_anomaly_threshold"></a>`modsec_inbound_anomaly_threshold`
+
+Data type: `Optional[Integer[1, default]]`
+
+Override the global scoring threshold level of the inbound blocking rules
+for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
+Set.
+
+Default value: ``undef``
+
+##### <a name="modsec_outbound_anomaly_threshold"></a>`modsec_outbound_anomaly_threshold`
+
+Data type: `Optional[Integer[1, default]]`
+
+Override the global scoring threshold level of the outbound blocking rules
+for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
+Set.
+
+Default value: ``undef``
+
+##### <a name="modsec_allowed_methods"></a>`modsec_allowed_methods`
+
+Data type: `Optional[String]`
+
+Override global allowed methods. A space-separated list of allowed HTTP methods.
+
+Default value: ``undef``
+
 ##### <a name="no_proxy_uris"></a>`no_proxy_uris`
 
-Data type: `Any`
+Data type: `Variant[Array[String], String]`
 
 Specifies URLs you do not want to proxy. This parameter is meant to be used in combination
 with [`proxy_dest`](#proxy_dest).
@@ -8861,7 +8920,7 @@ Default value: `[]`
 
 ##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
 
-Data type: `Any`
+Data type: `Variant[Array[String], String]`
 
 This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
@@ -8869,7 +8928,7 @@ Default value: `[]`
 
 ##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost).<br />
 Setting this parameter to `true` enables the `Host:` line from an incoming request to be
@@ -8879,7 +8938,7 @@ Default value: ``false``
 
 ##### <a name="proxy_add_headers"></a>`proxy_add_headers`
 
-Data type: `Any`
+Data type: `Optional[Variant[String, Boolean]]`
 
 Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders).<br />
 This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For,
@@ -8889,7 +8948,7 @@ Default value: ``undef``
 
 ##### <a name="proxy_error_override"></a>`proxy_error_override`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride).
 This directive controls whether Apache should override error pages for proxied content.
@@ -8898,23 +8957,23 @@ Default value: ``false``
 
 ##### <a name="options"></a>`options`
 
-Data type: `Any`
+Data type: `Array[String]`
 
-Sets the `Options` for the specified virtual host. For example:
+Sets the [`Options`](https://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. For example:
 ``` puppet
 apache::vhost { 'site.name.fdqn':
   ...
-  options => ['Indexes','FollowSymLinks','MultiViews'],
+  options => ['Indexes', 'FollowSymLinks', 'MultiViews'],
 }
 ```
 > **Note**: If you use the `directories` parameter of `apache::vhost`, 'Options',
 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
 
-Default value: `['Indexes','FollowSymLinks','MultiViews']`
+Default value: `['Indexes', 'FollowSymLinks', 'MultiViews']`
 
 ##### <a name="override"></a>`override`
 
-Data type: `Any`
+Data type: `Array[String]`
 
 Sets the overrides for the specified virtual host. Accepts an array of
 [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments.
@@ -9070,6 +9129,15 @@ to enable or disable the loading of shell environment variables before spawning
 
 Default value: ``undef``
 
+##### <a name="passenger_preload_bundler"></a>`passenger_preload_bundler`
+
+Data type: `Optional[Boolean]`
+
+Sets [PassengerPreloadBundler](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpreloadbundler),
+to enable or disable the loading of bundler before loading the application.
+
+Default value: ``undef``
+
 ##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
 Data type: `Optional[Boolean]`
@@ -9223,7 +9291,7 @@ Default value: ``undef``
 
 ##### <a name="passenger_pre_start"></a>`passenger_pre_start`
 
-Data type: `Optional[Variant[String,Array[String]]]`
+Data type: `Optional[Variant[String, Array[String]]]`
 
 Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
 the URL of the application if pre-starting is required.
@@ -9359,7 +9427,7 @@ Default value: ``undef``
 
 ##### <a name="php_values"></a>`php_values`
 
-Data type: `Any`
+Data type: `Hash`
 
 Allows per-virtual host setting [`php_value`s](http://php.net/manual/en/configuration.changes.php).
 These flags or values can be overwritten by a user or an application.
@@ -9372,7 +9440,7 @@ Default value: `{}`
 
 ##### <a name="php_flags"></a>`php_flags`
 
-Data type: `Any`
+Data type: `Hash`
 
 Allows per-virtual host setting [`php_flags\``](http://php.net/manual/en/configuration.changes.php).
 These flags or values can be overwritten by a user or an application.
@@ -9381,7 +9449,7 @@ Default value: `{}`
 
 ##### <a name="php_admin_values"></a>`php_admin_values`
 
-Data type: `Any`
+Data type: `Variant[Array[String], Hash]`
 
 Allows per-virtual host setting [`php_admin_value`](http://php.net/manual/en/configuration.changes.php).
 These flags or values cannot be overwritten by a user or an application.
@@ -9390,7 +9458,7 @@ Default value: `{}`
 
 ##### <a name="php_admin_flags"></a>`php_admin_flags`
 
-Data type: `Any`
+Data type: `Variant[Array[String], Hash]`
 
 Allows per-virtual host setting [`php_admin_flag`](http://php.net/manual/en/configuration.changes.php).
 These flags or values cannot be overwritten by a user or an application.
@@ -9399,7 +9467,7 @@ Default value: `{}`
 
 ##### <a name="port"></a>`port`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[Stdlib::Port], Stdlib::Port]]`
 
 Sets the port the host is configured on. The module's defaults ensure the host listens
 on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only
@@ -9409,7 +9477,7 @@ Default value: ``undef``
 
 ##### <a name="priority"></a>`priority`
 
-Data type: `Any`
+Data type: `Optional[Apache::Vhost::Priority]`
 
 Sets the relative load-order for Apache HTTPD VirtualHost configuration files.<br />
 If nothing matches the priority, the first name-based virtual host is used. Likewise,
@@ -9441,7 +9509,7 @@ Default value: ``undef``
 
 ##### <a name="proxy_dest"></a>`proxy_dest`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
 
@@ -9449,7 +9517,7 @@ Default value: ``undef``
 
 ##### <a name="proxy_pass"></a>`proxy_pass`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[Hash], Hash]]`
 
 Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)
 configuration. Optionally, parameters can be added as an array.
@@ -9467,7 +9535,7 @@ apache::vhost { 'site.name.fdqn':
     { 'path' => '/e', 'url' => 'http://backend-a/e',
       'keywords' => ['nocanon', 'interpolate'] },
     { 'path' => '/f', 'url' => 'http://backend-f/',
-      'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
+      'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1']},
     { 'path' => '/g', 'url' => 'http://backend-g/',
       'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
     { 'path' => '/h', 'url' => 'http://backend-h/h',
@@ -9484,7 +9552,7 @@ Default value: ``undef``
 
 ##### <a name="proxy_dest_match"></a>`proxy_dest_match`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 This directive is equivalent to `proxy_dest`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
@@ -9494,7 +9562,7 @@ Default value: ``undef``
 
 ##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
 [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
@@ -9504,7 +9572,7 @@ Default value: ``undef``
 
 ##### <a name="proxy_pass_match"></a>`proxy_pass_match`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[Hash], Hash]]`
 
 This directive is equivalent to `proxy_pass`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
@@ -9514,7 +9582,7 @@ Default value: ``undef``
 
 ##### <a name="redirect_dest"></a>`redirect_dest`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies the address to redirect to.
 
@@ -9522,7 +9590,7 @@ Default value: ``undef``
 
 ##### <a name="redirect_source"></a>`redirect_source`
 
-Data type: `Any`
+Data type: `Variant[String, Array[String]]`
 
 Specifies the source URIs that redirect to the destination specified in `redirect_dest`.
 If more than one item for redirect is supplied, the source and destination must be the same
@@ -9530,8 +9598,8 @@ length, and the items are order-dependent.
 ``` puppet
 apache::vhost { 'site.name.fdqn':
   ...
-  redirect_source => ['/images','/downloads'],
-  redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
+  redirect_source => ['/images', '/downloads'],
+  redirect_dest   => ['http://img.example.com/', 'http://downloads.example.com/'],
 }
 ```
 
@@ -9539,13 +9607,13 @@ Default value: `'/'`
 
 ##### <a name="redirect_status"></a>`redirect_status`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies the status to append to the redirect.
 ``` puppet
   apache::vhost { 'site.name.fdqn':
   ...
-  redirect_status => ['temp','permanent'],
+  redirect_status => ['temp', 'permanent'],
 }
 ```
 
@@ -9553,7 +9621,7 @@ Default value: ``undef``
 
 ##### <a name="redirectmatch_regexp"></a>`redirectmatch_regexp`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String], String]]`
 
 Determines which server status should be raised for a given regular expression
 and where to forward the user to. Entered as an array alongside redirectmatch_status
@@ -9562,8 +9630,8 @@ and redirectmatch_dest.
 apache::vhost { 'site.name.fdqn':
   ...
   redirectmatch_status => ['404', '404'],
-  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+  redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 }
 ```
 
@@ -9571,7 +9639,7 @@ Default value: ``undef``
 
 ##### <a name="redirectmatch_status"></a>`redirectmatch_status`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String], String]]`
 
 Determines which server status should be raised for a given regular expression
 and where to forward the user to. Entered as an array alongside redirectmatch_regexp
@@ -9580,8 +9648,8 @@ and redirectmatch_dest.
 apache::vhost { 'site.name.fdqn':
   ...
   redirectmatch_status => ['404', '404'],
-  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+  redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 }
 ```
 
@@ -9589,7 +9657,7 @@ Default value: ``undef``
 
 ##### <a name="redirectmatch_dest"></a>`redirectmatch_dest`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String], String]]`
 
 Determines which server status should be raised for a given regular expression
 and where to forward the user to. Entered as an array alongside redirectmatch_status
@@ -9598,8 +9666,8 @@ and redirectmatch_regexp.
 apache::vhost { 'site.name.fdqn':
   ...
   redirectmatch_status => ['404', '404'],
-  redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-  redirectmatch_dest => ['http://www.example.com/$1','http://www.example.com/$2'],
+  redirectmatch_regexp => ['\.git(/.*|$)/', '\.svn(/.*|$)'],
+  redirectmatch_dest => ['http://www.example.com/$1', 'http://www.example.com/$2'],
 }
 ```
 
@@ -9607,7 +9675,7 @@ Default value: ``undef``
 
 ##### <a name="request_headers"></a>`request_headers`
 
-Data type: `Any`
+Data type: `Array[String[1]]`
 
 Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader)
 in various ways, including adding additional request headers, removing request headers,
@@ -9622,11 +9690,11 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `[]`
 
 ##### <a name="rewrites"></a>`rewrites`
 
-Data type: `Optional[Array]`
+Data type: `Array[Hash]`
 
 Creates URL rewrite rules. Expects an array of hashes.<br />
 Valid Hash keys include `comment`, `rewrite_base`, `rewrite_cond`, `rewrite_rule`
@@ -9699,11 +9767,11 @@ for more details on what is possible with rewrite rules and conditions.<br />
 and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather
 than setting the rewrites in the virtual host's directories.
 
-Default value: ``undef``
+Default value: `[]`
 
 ##### <a name="rewrite_base"></a>`rewrite_base`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase)
 specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
@@ -9713,7 +9781,7 @@ Default value: ``undef``
 
 ##### <a name="rewrite_rule"></a>`rewrite_rule`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String[1]], String[1]]]`
 
 The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
 allows the user to define the rules that will be used by the rewrite engine.
@@ -9722,17 +9790,17 @@ Default value: ``undef``
 
 ##### <a name="rewrite_cond"></a>`rewrite_cond`
 
-Data type: `Any`
+Data type: `Array[String[1]]`
 
 The parameter [`rewrite_cond`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritecond)
 defines a rule condition, that when satisfied will implement that rule within the
 rewrite engine.
 
-Default value: ``undef``
+Default value: `[]`
 
 ##### <a name="rewrite_inherit"></a>`rewrite_inherit`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Determines whether the virtual host inherits global rewrite rules.<br />
 Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or
@@ -9762,7 +9830,7 @@ Default value: ``false``
 
 ##### <a name="scriptalias"></a>`scriptalias`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
 '/usr/scripts'.
@@ -9771,7 +9839,7 @@ Default value: ``undef``
 
 ##### <a name="scriptaliases"></a>`scriptaliases`
 
-Data type: `Any`
+Data type: `Array[Hash]`
 
 > **Note**: This parameter is deprecated in favor of the `aliases` parameter.<br />
 Passes an array of hashes to the virtual host to create either ScriptAlias or
@@ -9804,7 +9872,7 @@ Default value: `[]`
 
 ##### <a name="serveradmin"></a>`serveradmin`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Specifies the email address Apache displays when it renders one of its error pages.
 
@@ -9812,7 +9880,7 @@ Default value: ``undef``
 
 ##### <a name="serveraliases"></a>`serveraliases`
 
-Data type: `Any`
+Data type: `Variant[Array[String], String]`
 
 Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias)
 of the site.
@@ -9821,7 +9889,7 @@ Default value: `[]`
 
 ##### <a name="servername"></a>`servername`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the servername corresponding to the hostname you connect to the virtual host at.
 
@@ -9829,7 +9897,7 @@ Default value: `$name`
 
 ##### <a name="setenv"></a>`setenv`
 
-Data type: `Any`
+Data type: `Variant[Array[String], String]`
 
 Used by HTTPD to set environment variables for virtual hosts.<br />
 Example:
@@ -9843,7 +9911,7 @@ Default value: `[]`
 
 ##### <a name="setenvif"></a>`setenvif`
 
-Data type: `Any`
+Data type: `Variant[Array[String], String]`
 
 Used by HTTPD to conditionally set environment variables for virtual hosts.
 
@@ -9851,7 +9919,7 @@ Default value: `[]`
 
 ##### <a name="setenvifnocase"></a>`setenvifnocase`
 
-Data type: `Any`
+Data type: `Variant[Array[String], String]`
 
 Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching).
 
@@ -9866,75 +9934,9 @@ inclusion of the `mod_suexec` module.
 
 Default value: ``undef``
 
-##### <a name="suphp_addhandler"></a>`suphp_addhandler`
-
-Data type: `Any`
-
-Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-working together with suphp_configpath and suphp_engine.<br />
-An example virtual host configuration with suPHP:
-``` puppet
-apache::vhost { 'suphp.example.com':
-  port             => 80,
-  docroot          => '/home/appuser/myphpapp',
-  suphp_addhandler => 'x-httpd-php',
-  suphp_engine     => 'on',
-  suphp_configpath => '/etc/php5/apache2',
-  directories      => { path => '/home/appuser/myphpapp',
-    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-  }
-}
-```
-
-Default value: `$apache::params::suphp_addhandler`
-
-##### <a name="suphp_configpath"></a>`suphp_configpath`
-
-Data type: `Any`
-
-Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-working together with suphp_addhandler and suphp_engine.<br />
-An example virtual host configuration with suPHP:
-``` puppet
-apache::vhost { 'suphp.example.com':
-  port             => 80,
-  docroot          => '/home/appuser/myphpapp',
-  suphp_addhandler => 'x-httpd-php',
-  suphp_engine     => 'on',
-  suphp_configpath => '/etc/php5/apache2',
-  directories      => { path => '/home/appuser/myphpapp',
-    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-  }
-}
-```
-
-Default value: `$apache::params::suphp_configpath`
-
-##### <a name="suphp_engine"></a>`suphp_engine`
-
-Data type: `Enum['on', 'off']`
-
-Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)
-working together with suphp_configpath and suphp_addhandler.<br />
-An example virtual host configuration with suPHP:
-``` puppet
-apache::vhost { 'suphp.example.com':
-  port             => 80,
-  docroot          => '/home/appuser/myphpapp',
-  suphp_addhandler => 'x-httpd-php',
-  suphp_engine     => 'on',
-  suphp_configpath => '/etc/php5/apache2',
-  directories      => { path => '/home/appuser/myphpapp',
-    'suphp'        => { user => 'myappuser', group => 'myappgroup' },
-  }
-}
-```
-
-Default value: `$apache::params::suphp_engine`
-
 ##### <a name="vhost_name"></a>`vhost_name`
 
-Data type: `Any`
+Data type: `String`
 
 Enables name-based virtual hosting. If no IP is passed to the virtual host, but the
 virtual host is assigned a port, then the virtual host name is `vhost_name:port`.
@@ -9945,7 +9947,7 @@ Default value: `'*'`
 
 ##### <a name="virtual_docroot"></a>`virtual_docroot`
 
-Data type: `Any`
+Data type: `Variant[Stdlib::Absolutepath, Boolean]`
 
 Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the
 same name. For example, `http://example.com` would map to `/var/www/example.com`.
@@ -9965,7 +9967,7 @@ Default value: ``false``
 
 ##### <a name="virtual_use_default_docroot"></a>`virtual_use_default_docroot`
 
-Data type: `Any`
+Data type: `Boolean`
 
 By default, when using `virtual_docroot`, the value of `docroot` is ignored. Setting this
 to `true` will mean both directives will be added to the configuration.
@@ -9984,7 +9986,7 @@ Default value: ``false``
 
 ##### <a name="wsgi_daemon_process"></a>`wsgi_daemon_process`
 
-Data type: `Optional[Variant[String,Hash]]`
+Data type: `Optional[Variant[String, Hash]]`
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 wsgi_daemon_process_options, wsgi_process_group,
@@ -10023,7 +10025,7 @@ Default value: ``undef``
 
 ##### <a name="wsgi_application_group"></a>`wsgi_application_group`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
@@ -10037,7 +10039,7 @@ Default value: ``undef``
 
 ##### <a name="wsgi_import_script"></a>`wsgi_import_script`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
@@ -10062,7 +10064,7 @@ Default value: ``undef``
 
 ##### <a name="wsgi_chunked_request"></a>`wsgi_chunked_request`
 
-Data type: `Any`
+Data type: `Optional[Enum['On', 'Off']]`
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
@@ -10076,7 +10078,7 @@ Default value: ``undef``
 
 ##### <a name="wsgi_process_group"></a>`wsgi_process_group`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 wsgi_daemon_process, wsgi_daemon_process_options,
@@ -10124,7 +10126,7 @@ Default value: ``undef``
 
 ##### <a name="directories"></a>`directories`
 
-Data type: `Optional[Variant[Hash, Array[Variant[Array,Hash]]]]`
+Data type: `Optional[Array[Hash]]`
 
 The `directories` parameter within the `apache::vhost` class passes an array of hashes
 to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory),
@@ -10139,6 +10141,8 @@ The `provider` key is optional. If missing, this key defaults to `directory`.
  Values: `directory`, `files`, `proxy`, `location`, `directorymatch`, `filesmatch`,
 `proxymatch` or `locationmatch`. If you set `provider` to `directorymatch`, it
 uses the keyword `DirectoryMatch` in the Apache config file.<br />
+proxy_pass and proxy_pass_match are supported like their parameters to apache::vhost, and will
+be rendered without their path parameter as this will be inherited from the Location/LocationMatch container.
 An example use of `directories`:
 ``` puppet
 apache::vhost { 'files.example.net':
@@ -10175,6 +10179,8 @@ Default value: ``undef``
 
 ##### <a name="custom_fragment"></a>`custom_fragment`
 
+Data type: `Optional[String]`
+
 Pass a string of custom configuration directives to be placed at the end of the directory
 configuration.
 ``` puppet
@@ -10202,71 +10208,24 @@ ProxyStatus On',
 
 Default value: ``undef``
 
-##### <a name="error_documents"></a>`error_documents`
-
-An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)
-settings for the directory.
-``` puppet
-apache::vhost { 'sample.example.net':
-  directories => [
-    { path            => '/srv/www',
-      error_documents => [
-        { 'error_code' => '503',
-          'document'   => '/service-unavail',
-        },
-      ],
-    },
-  ],
-}
-```
-
-Default value: `[]`
-
-##### <a name="h2_copy_files"></a>`h2_copy_files`
-
-Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles) directive.<br />
-Note that you must declare `class {'apache::mod::http2': }` before using this directive.
-
-Default value: ``undef``
-
-##### <a name="h2_push_resource"></a>`h2_push_resource`
-
-Sets the [H2PushResource](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2pushresource) directive.<br />
-Note that you must declare `class {'apache::mod::http2': }` before using this directive.
-
-Default value: `[]`
-
 ##### <a name="headers"></a>`headers`
 
-Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
-``` puppet
-apache::vhost { 'sample.example.net':
-  docroot     => '/path/to/directory',
-  directories => {
-    path    => '/path/to/directory',
-    headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-  },
-}
-```
-
-Default value: ``undef``
-
-##### <a name="options"></a>`options`
+Data type: `Array[String[1]]`
 
-Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the
-given Directory block.
+Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
 ``` puppet
 apache::vhost { 'sample.example.net':
   docroot     => '/path/to/directory',
   directories => [
-    { path    => '/path/to/directory',
-      options => ['Indexes','FollowSymLinks','MultiViews'],
+    {
+      path    => '/path/to/directory',
+      headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
     },
   ],
 }
 ```
 
-Default value: `['Indexes','FollowSymLinks','MultiViews']`
+Default value: `[]`
 
 ##### <a name="shib_compat_valid_user"></a>`shib_compat_valid_user`
 
@@ -10283,7 +10242,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_options"></a>`ssl_options`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String], String]]`
 
 String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions),
 which configure SSL engine run-time options. This handler takes precedence over SSLOptions
@@ -10306,6 +10265,8 @@ Default value: ``undef``
 
 ##### <a name="additional_includes"></a>`additional_includes`
 
+Data type: `Variant[Array[String], String]`
+
 Specifies paths to additional static, specific Apache configuration files in virtual
 host directories.
 ``` puppet
@@ -10323,22 +10284,7 @@ Default value: `[]`
 
 ##### <a name="gssapi"></a>`gssapi`
 
-Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
-```puppet
- include apache::mod::auth_gssapi
- apache::vhost { 'sample.example.net':
-   docroot     => '/path/to/directory',
-   directories => [
-     { path   => '/path/to/different/dir',
-       gssapi => {
-         credstore => 'keytab:/foo/bar.keytab',
-         localname => 'Off',
-         sslonly   => 'On',
-       }
-     },
-   ],
- }
- ```
+
 
 ##### <a name="ssl"></a>`ssl`
 
@@ -10350,7 +10296,7 @@ Default value: ``false``
 
 ##### <a name="ssl_ca"></a>`ssl_ca`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the SSL certificate authority to be used to verify client certificates used
 for authentication.
@@ -10359,7 +10305,7 @@ Default value: `$apache::default_ssl_ca`
 
 ##### <a name="ssl_cert"></a>`ssl_cert`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the SSL certification.
 
@@ -10367,7 +10313,7 @@ Default value: `$apache::default_ssl_cert`
 
 ##### <a name="ssl_protocol"></a>`ssl_protocol`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol).
 Expects an array or space separated string of accepted protocols.
@@ -10376,7 +10322,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_cipher"></a>`ssl_cipher`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
 
@@ -10394,7 +10340,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_certs_dir"></a>`ssl_certs_dir`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the location of the SSL certification directory to verify client certs.
 
@@ -10402,7 +10348,7 @@ Default value: `$apache::params::ssl_certs_dir`
 
 ##### <a name="ssl_chain"></a>`ssl_chain`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the SSL chain. This default works out of the box, but it must be updated in
 the base `apache` class with your specific certificate information before being used in
@@ -10412,7 +10358,7 @@ Default value: `$apache::default_ssl_chain`
 
 ##### <a name="ssl_crl"></a>`ssl_crl`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the certificate revocation list to use. (This default works out of the box but
 must be updated in the base `apache` class with your specific certificate information
@@ -10422,7 +10368,7 @@ Default value: `$apache::default_ssl_crl`
 
 ##### <a name="ssl_crl_path"></a>`ssl_crl_path`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the location of the certificate revocation list to verify certificates for
 client authentication with. (This default works out of the box but must be updated in
@@ -10433,7 +10379,7 @@ Default value: `$apache::default_ssl_crl_path`
 
 ##### <a name="ssl_crl_check"></a>`ssl_crl_check`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck)
 for ssl client authentication. The default works out of the box but must be specified when
@@ -10444,7 +10390,7 @@ Default value: `$apache::default_ssl_crl_check`
 
 ##### <a name="ssl_key"></a>`ssl_key`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the SSL key.<br />
 Defaults are based on your operating system. Default work out of the box but must be
@@ -10470,7 +10416,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_verify_depth"></a>`ssl_verify_depth`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth)
 directive, which specifies the maximum depth of CA certificates in client certificate
@@ -10487,7 +10433,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol)
 directive, which controls which SSL protocol flavors `mod_ssl` should use when establishing
@@ -10521,7 +10467,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)
 directive, which controls cipher suites supported for ssl proxy traffic.
@@ -10530,7 +10476,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile)
 directive, which specifies an all-in-one file where you can assemble the Certificates
@@ -10542,7 +10488,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile)
 directive, which specifies an all-in-one file where you keep the certs and keys used
@@ -10559,7 +10505,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
 
-Data type: `Any`
+Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the [SSLProxyMachineCertificateChainFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatechainfile)
 directive, which specifies an all-in-one file where you keep the certificate chain for
@@ -10601,31 +10547,9 @@ or not.
 
 Default value: ``undef``
 
-##### <a name="ssl_options"></a>`ssl_options`
-
-Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)
-directive, which configures various SSL engine run-time options. This is the global
-setting for the given virtual host and can be a string or an array.<br />
-A string:
-``` puppet
-apache::vhost { 'sample.example.net':
-  ...
-  ssl_options => '+ExportCertData',
-}
-```
-An array:
-``` puppet
-apache::vhost { 'sample.example.net':
-  ...
-  ssl_options => ['+StrictRequire', '+ExportCertData'],
-}
-```
-
-Default value: ``undef``
-
 ##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
-Data type: `Any`
+Data type: `Optional[String]`
 
 Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)
 directive, which provides direct configuration of OpenSSL parameters.
@@ -10652,7 +10576,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_stapling_timeout"></a>`ssl_stapling_timeout`
 
-Data type: `Any`
+Data type: `Optional[Integer]`
 
 Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
@@ -10661,7 +10585,7 @@ Default value: ``undef``
 
 ##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
-Data type: `Any`
+Data type: `Optional[Enum['on', 'off']]`
 
 Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
@@ -10768,14 +10692,20 @@ instead of servicing the request.
 
 Default value: ``undef``
 
-##### <a name="$use_servername_for_filenames"></a>`$use_servername_for_filenames`
+##### <a name="use_servername_for_filenames"></a>`use_servername_for_filenames`
+
+Data type: `Boolean`
 
 When set to true, default log / config file names will be derived from the sanitized
 value of the $servername parameter.
 When set to false (default), the existing behaviour of using the $name parameter
 will remain.
 
-##### <a name="$use_port_for_filenames"></a>`$use_port_for_filenames`
+Default value: ``false``
+
+##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
+
+Data type: `Boolean`
 
 When set to true and use_servername_for_filenames is also set to true, default log /
 config file names will be derived from the sanitized value of both the $servername and
@@ -10783,40 +10713,30 @@ $port parameters.
 When set to false (default), the port is not included in the file names and may lead to
 duplicate declarations if two virtual hosts use the same domain.
 
-##### <a name="$mdomain"></a>`$mdomain`
+Default value: ``false``
+
+##### <a name="mdomain"></a>`mdomain`
+
+Data type: `Optional[Variant[Boolean, String]]`
 
 All the names in the list are managed as one Managed Domain (MD). mod_md will request
 one single certificate that is valid for all these names.
 
-##### <a name="use_servername_for_filenames"></a>`use_servername_for_filenames`
-
-Data type: `Optional[Boolean]`
-
-
-
-Default value: ``false``
-
-##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
-
-Data type: `Optional[Boolean]`
-
-
-
-Default value: ``false``
+Default value: ``undef``
 
 ##### <a name="proxy_requests"></a>`proxy_requests`
 
 Data type: `Boolean`
 
-
+Whether to accept proxy requests
 
 Default value: ``false``
 
-##### <a name="mdomain"></a>`mdomain`
-
-Data type: `Optional[Variant[Boolean,String]]`
+##### <a name="userdir"></a>`userdir`
 
+Data type: `Optional[Variant[String[1], Array[String[1]]]]`
 
+Instances of apache::mod::userdir
 
 Default value: ``undef``
 
@@ -10835,13 +10755,13 @@ The following parameters are available in the `apache::vhost::custom` defined ty
 
 ##### <a name="content"></a>`content`
 
-Data type: `Any`
+Data type: `String`
 
 Sets the configuration file's content.
 
 ##### <a name="ensure"></a>`ensure`
 
-Data type: `Any`
+Data type: `String`
 
 Specifies if the virtual host file is present or absent.
 
@@ -10849,7 +10769,7 @@ Default value: `'present'`
 
 ##### <a name="priority"></a>`priority`
 
-Data type: `Any`
+Data type: `Apache::Vhost::Priority`
 
 Sets the relative load order for Apache HTTPD VirtualHost configuration files.
 
@@ -10857,7 +10777,7 @@ Default value: `25`
 
 ##### <a name="verify_config"></a>`verify_config`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
@@ -10938,7 +10858,7 @@ The title of the vhost resource to append to
 
 ##### <a name="priority"></a>`priority`
 
-Data type: `Any`
+Data type: `Optional[Apache::Vhost::Priority]`
 
 Set the priority to match the one `apache::vhost` sets. This must match the
 one `apache::vhost` sets or else the concat fragment won't be found.
@@ -10964,12 +10884,221 @@ Default value: `900`
 
 ##### <a name="port"></a>`port`
 
-Data type: `Optional[Integer[0]]`
+Data type: `Optional[Stdlib::Port]`
+
+The port to use
+
+Default value: ``undef``
+
+### <a name="apachevhostproxy"></a>`apache::vhost::proxy`
+
+Configure a reverse proxy for a vhost
+
+#### Examples
+
+##### Simple configuration proxying "/" but not "/admin"
+
+```puppet
+include apache
+apache::vhost { 'basic-proxy-vhost':
+}
+apache::vhost::proxy { 'proxy-to-backend-server':
+  vhost => 'basic-proxy-vhost',
+  proxy_dest => 'http://backend-server/',
+  no_proxy_uris => '/admin',
+}
+```
+
+##### Granular configuration using `Apache::Vhost::ProxyPass` data type
+
+```puppet
+include apache
+apache::vhost { 'myvhost':
+}
+apache::vhost::proxy { 'myvhost-proxy':
+  vhost      => 'myvhost',
+  proxy_pass => [
+    { 'path' => '/a', 'url' => 'http://backend-a/' },
+    { 'path' => '/b', 'url' => 'http://backend-b/' },
+    { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}},
+    { 'path' => '/l', 'url' => 'http://backend-xy',
+      'reverse_urls' => ['http://backend-x', 'http://backend-y'] },
+    { 'path' => '/d', 'url' => 'http://backend-a/d',
+      'params' => { 'retry' => 0, 'timeout' => 5 }, },
+    { 'path' => '/e', 'url' => 'http://backend-a/e',
+      'keywords' => ['nocanon', 'interpolate'] },
+    { 'path' => '/f', 'url' => 'http://backend-f/',
+      'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1']},
+    { 'path' => '/g', 'url' => 'http://backend-g/',
+      'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
+    { 'path' => '/h', 'url' => 'http://backend-h/h',
+      'no_proxy_uris' => ['/h/admin', '/h/server-status'] },
+  ],
+}
+```
+
+#### Parameters
+
+The following parameters are available in the `apache::vhost::proxy` defined type:
+
+* [`vhost`](#vhost)
+* [`priority`](#priority)
+* [`order`](#order)
+* [`port`](#port)
+* [`proxy_dest`](#proxy_dest)
+* [`proxy_dest_match`](#proxy_dest_match)
+* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
+* [`no_proxy_uris`](#no_proxy_uris)
+* [`no_proxy_uris_match`](#no_proxy_uris_match)
+* [`proxy_pass`](#proxy_pass)
+* [`proxy_pass_match`](#proxy_pass_match)
+* [`proxy_requests`](#proxy_requests)
+* [`proxy_preserve_host`](#proxy_preserve_host)
+* [`proxy_add_headers`](#proxy_add_headers)
+* [`proxy_error_override`](#proxy_error_override)
+
+##### <a name="vhost"></a>`vhost`
+
+Data type: `String[1]`
+
+The title of the vhost resource to which reverse proxy configuration will
+be appended.
+
+##### <a name="priority"></a>`priority`
+
+Data type: `Optional[Apache::Vhost::Priority]`
+
+Set the priority to match the one `apache::vhost` sets. This must match the
+one `apache::vhost` sets or else the vhost's `concat` resource won't be found.
+
+Default value: ``undef``
+
+##### <a name="order"></a>`order`
+
+Data type: `Integer[0]`
+
+The order in which the `concat::fragment` containing the proxy configuration
+will be inserted. Useful when multiple fragments will be attached to a single
+vhost's configuration.
+
+Default value: `170`
+
+##### <a name="port"></a>`port`
+
+Data type: `Optional[Stdlib::Port]`
+
+Set the port to match the one `apache::vhost` sets. This must match the one
+`apache::vhost` sets or else the vhost's `concat` resource won't be found.
+
+Default value: ``undef``
+
+##### <a name="proxy_dest"></a>`proxy_dest`
+
+Data type: `Optional[String[1]]`
+
+Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration for the `/` path.
+
+Default value: ``undef``
+
+##### <a name="proxy_dest_match"></a>`proxy_dest_match`
+
+Data type: `Optional[String[1]]`
+
+This directive is equivalent to `proxy_dest`, but takes regular expressions, see
+[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+for details.
+
+Default value: ``undef``
+
+##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
+
+Data type: `Optional[String[1]]`
+
+Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
+[ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
+for details.
+
+Default value: ``undef``
+
+##### <a name="no_proxy_uris"></a>`no_proxy_uris`
+
+Data type: `Variant[Array[String[1]], String[1]]`
+
+Paths to be excluded from reverse proxying. Only valid when already using `proxy_dest`
+or `proxy_dest_match` to map the `/` path, otherwise it will be absent in the final
+vhost configuration file. In that case, instead add `no_proxy_uris => [uri1, uri2, ...]`
+to the `Apache::Vhost::ProxyPass` definitions passed via the `proxy_pass` parameter.
+See examples for this class, or refer to documentation for the `Apache::Vhost::ProxyPass`
+data type. This configuration uses the [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) directive with `!`.
+
+Default value: `[]`
+
+##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
+
+Data type: `Variant[Array[String[1]], String[1]]`
+
+This directive is equivalent to `no_proxy_uris` but takes regular expressions,
+as it instead uses [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch).
+
+Default value: `[]`
 
+##### <a name="proxy_pass"></a>`proxy_pass`
 
+Data type: `Optional[Array[Apache::Vhost::ProxyPass]]`
+
+Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)
+configuration.
+See the documentation for the Apache::Vhost::ProxyPass data type for a detailed
+description of the structure including optional parameters.
 
 Default value: ``undef``
 
+##### <a name="proxy_pass_match"></a>`proxy_pass_match`
+
+Data type: `Optional[Array[Apache::Vhost::ProxyPass]]`
+
+This directive is equivalent to `proxy_pass`, but takes regular expressions, see
+[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
+for details.
+
+Default value: ``undef``
+
+##### <a name="proxy_requests"></a>`proxy_requests`
+
+Data type: `Boolean`
+
+Enables forward (standard) proxy requests. See [ProxyRequests](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests) for details.
+
+Default value: ``false``
+
+##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
+
+Data type: `Boolean`
+
+When enabled, pass the `Host:` line from the incoming request to the proxied host.
+See [ProxyPreserveHost](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost) for details.
+
+Default value: ``false``
+
+##### <a name="proxy_add_headers"></a>`proxy_add_headers`
+
+Data type: `Optional[Boolean]`
+
+Add X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Server HTTP headers.
+See [ProxyAddHeaders](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders) for details.
+
+Default value: ``undef``
+
+##### <a name="proxy_error_override"></a>`proxy_error_override`
+
+Data type: `Boolean`
+
+Override error pages from the proxied host. The current Puppet implementation
+supports enabling or disabling the directive, but not specifying a custom list
+of status codes. See [ProxyErrorOverride](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride) for details.
+
+Default value: ``false``
+
 ## Resource types
 
 ### <a name="a2mod"></a>`a2mod`
@@ -11181,7 +11310,7 @@ Alias of
 
 ```puppet
 Struct[{
-    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl,Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
+    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
     Optional['CryptoPassphrase']                        => String,
     Optional['MetadataDir']                             => String,
     Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,
@@ -11189,80 +11318,80 @@ Struct[{
     Optional['ProviderAuthorizationEndpoint']           => Stdlib::HTTPSUrl,
     Optional['ProviderJwksUri']                         => Stdlib::HTTPSUrl,
     Optional['ProviderTokenEndpoint']                   => Stdlib::HTTPSUrl,
-    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','none'],
+    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'none'],
     Optional['ProviderTokenEndpointParams']             => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['ProviderUserInfoEndpoint']                => Stdlib::HTTPSUrl,
     Optional['ProviderCheckSessionIFrame']              => Stdlib::HTTPSUrl,
     Optional['ProviderEndSessionEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
-    Optional['ProviderBackChannelLogoutSupported']      => Enum['On','Off'],
+    Optional['ProviderBackChannelLogoutSupported']      => Enum['On', 'Off'],
     Optional['ProviderRegistrationEndpointJson']        => String,
     Optional['Scope']                                   => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
     Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['SSLValidateServer']                       => Enum['On','Off'],
+    Optional['SSLValidateServer']                       => Enum['On', 'Off'],
     Optional['UserInfoRefreshInterval']                 => Integer,
     Optional['JWKSRefreshInterval']                     => Integer,
-    Optional['UserInfoTokenMethod']                     => Enum['authz_header','post_param'],
-    Optional['ProviderAuthRequestMethod']               => Enum['GET','POST'],
+    Optional['UserInfoTokenMethod']                     => Enum['authz_header', 'post_param'],
+    Optional['ProviderAuthRequestMethod']               => Enum['GET', 'POST'],
     Optional['PublicKeyFiles']                          => String,
-    Optional['ResponseType']                            => Enum['code','id_token','id_token token','code id_token','code token','code id_token token'],
-    Optional['ResponseMode']                            => Enum['fragment','query','form_post'],
+    Optional['ResponseType']                            => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
+    Optional['ResponseMode']                            => Enum['fragment', 'query', 'form_post'],
     Optional['ClientID']                                => String,
     Optional['ClientSecret']                            => String,
     Optional['ClientTokenEndpointCert']                 => String,
     Optional['ClientTokenEndpointKey']                  => String,
     Optional['ClientName']                              => String,
     Optional['ClientContact']                           => String,
-    Optional['PKCDMethod']                              => Enum['plain','S256','referred_tb'],
-    Optional['TokenBindingPolicy']                      => Enum['disabled','optional','required','enforced'],
+    Optional['PKCDMethod']                              => Enum['plain', 'S256', 'referred_tb'],
+    Optional['TokenBindingPolicy']                      => Enum['disabled', 'optional', 'required', 'enforced'],
     Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
-    Optional['IDTokenSignedResponseAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
-    Optional['UserInfoSignedResposeAlg']                => Enum['RS256','RS384','RS512','PS256','PS384','PS512','HS256','HS384','HS512','ES256','ES384','ES512'],
-    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5','A128KW','A256KW','RSA-OAEP'],
-    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256','A256CBC-HS512','A256GCM'],
+    Optional['IDTokenSignedResponseAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['UserInfoSignedResposeAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
     Optional['OAuthServerMetadataURL']                  => Stdlib::HTTPSUrl,
     Optional['AuthIntrospectionEndpoint']               => Stdlib::HTTPSUrl,
     Optional['OAuthClientID']                           => String,
     Optional['OAuthClientSecret']                       => String,
-    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic','client_secret_post','client_secret_jwt','private_key_jwt','bearer_access_token','none'],
+    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
     Optional['OAuthIntrospectionClientAuthBearerToken'] => String,
     Optional['OAuthIntrospectionEndpointCert']          => String,
     Optional['OAuthIntrospectionEndpointKey']           => String,
-    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST','GET'],
+    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']        => String,
     Optional['OAuthTokenExpiryClaim']                   => Pattern[/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/],
-    Optional['OAuthSSLValidateServer']                  => Enum['On','Off'],
+    Optional['OAuthSSLValidateServer']                  => Enum['On', 'Off'],
     Optional['OAuthVerifySharedKeys']                   => String,
     Optional['OAuthVerifyCertFiles']                    => String,
     Optional['OAuthVerifyJwksUri']                      => Stdlib::HTTPSUrl,
     Optional['OAuthRemoteUserClaim']                    => String,
     Optional['OAuthAcceptTokenAs']                      => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
-    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled','optional','required','enforced'],
+    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled', 'optional', 'required', 'enforced'],
     Optional['Cookie']                                  => String,
     Optional['SessionCookieChunkSize']                  => Integer,
-    Optional['CookieHTTPOnly']                          => Enum['On','Off'],
-    Optional['CookieSameSite']                          => Enum['On','Off'],
+    Optional['CookieHTTPOnly']                          => Enum['On', 'Off'],
+    Optional['CookieSameSite']                          => Enum['On', 'Off'],
     Optional['PassCookies']                             => String,
     Optional['StripCookies']                            => String,
     Optional['StateMaxNumberOfCookies']                 => Pattern[/^[0-9]+\s(false|true)$/],
     Optional['SessionInactivityTimeout']                => Integer,
     Optional['SessionMaxDuration']                      => Integer,
     Optional['SessionType']                             => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/],
-    Optional['SessionCacheFallbackToCookie']            => Enum['On','Off'],
-    Optional['CacheType']                               => Enum['shm','memcache','file','redis'],
-    Optional['CacheEncrypt']                            => Enum['On','Off'],
+    Optional['SessionCacheFallbackToCookie']            => Enum['On', 'Off'],
+    Optional['CacheType']                               => Enum['shm', 'memcache', 'file', 'redis'],
+    Optional['CacheEncrypt']                            => Enum['On', 'Off'],
     Optional['CacheShmMax']                             => Integer,
     Optional['CacheShmEntrySizeMax']                    => Integer,
     Optional['CacheFileCleanInterval']                  => Integer,
     Optional['MemCacheServers']                         => String,
     Optional['RedisCacheServer']                        => String,
     Optional['RedisCachePassword']                      => String,
-    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
     Optional['HTMLErrorTemplate']                       => String,
-    Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl,Stdlib::HttpUrl],
+    Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
     Optional['PathScope']                               => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
     Optional['PathAuthRequestParams']                   => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['IDTokenIatSlack']                         => Integer,
@@ -11271,17 +11400,17 @@ Struct[{
     Optional['RemoteUserClaim']                         => String,
     Optional['PassIDTokenAs']                           => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                          => Pattern[/^((claims|json|jwt)\s?)+$/],
-    Optional['PassClaimsAs']                            => Enum['none','headers','environment','both'],
+    Optional['PassClaimsAs']                            => Enum['none', 'headers', 'environment', 'both'],
     Optional['AuthNHeader']                             => String,
     Optional['HTTPTimeoutLong']                         => Integer,
     Optional['HTTPTimeoutShort']                        => Integer,
     Optional['StateTimeout']                            => Integer,
-    Optional['ScrubRequestHeaders']                     => Enum['On','Off'],
+    Optional['ScrubRequestHeaders']                     => Enum['On', 'Off'],
     Optional['OutgoingProxy']                           => String,
-    Optional['UnAuthAction']                            => Enum['auth','pass','401', '410'],
+    Optional['UnAuthAction']                            => Enum['auth', 'pass', '401', '410'],
     Optional['UnAuthzAction']                           => Enum['401', '403', 'auth'],
-    Optional['PreservePost']                            => Enum['On','Off'],
-    Optional['PassRefreshToken']                        => Enum['On','Off'],
+    Optional['PreservePost']                            => Enum['On', 'Off'],
+    Optional['PassRefreshToken']                        => Enum['On', 'Off'],
     Optional['RequestObject']                           => String,
     Optional['ProviderMetadataRefreshInterval']         => Integer,
     Optional['InfoHook']                                => Pattern[/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/],
@@ -11291,6 +11420,197 @@ Struct[{
   }]
 ```
 
+### <a name="apacheservertokens"></a>`Apache::ServerTokens`
+
+A string that conforms to the Apache `ServerTokens` syntax.
+
+* **See also**
+  * https://httpd.apache.org/docs/2.4/mod/core.html#servertokens
+
+Alias of
+
+```puppet
+Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']
+```
+
+### <a name="apachevhostpriority"></a>`Apache::Vhost::Priority`
+
+The priority on vhost
+
+Alias of
+
+```puppet
+Variant[Pattern[/^\d+$/], Integer, Boolean]
+```
+
+### <a name="apachevhostproxypass"></a>`Apache::Vhost::ProxyPass`
+
+host context. Because the implementation uses SetEnv, you must `include apache::mod::env`;
+for the same reason, this cannot set the newer `no-proxy` environment variable, which
+would require an implementation using SetEnvIf.
+
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/mod_proxy.html
+  * for additional documentation.
+
+#### Examples
+
+##### Basic example
+
+```puppet
+{ 'path' => '/a', 'url' => 'http://backend-a/', }
+```
+
+##### With parameters
+
+```puppet
+{ 'path' => '/b', 'url' => 'http://backend-a/b',
+  'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300,}, }
+```
+
+##### With ProxyPassReverse
+
+```puppet
+{ 'path' => '/l', 'url' => 'http://backend-xy',
+  'reverse_urls' => ['http://backend-x', 'http://backend-y'], }
+```
+
+##### With additional keywords
+
+```puppet
+{ 'path' => '/e', 'url' => 'http://backend-a/e',
+  'keywords' => ['nocanon', 'interpolate'], }
+```
+
+##### With mod_proxy environment variables
+
+```puppet
+{ 'path' => '/f', 'url' => 'http://backend-f/',
+  'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'], }
+```
+
+##### With ProxyPassReverseCookieDomain and ProxyPassReverseCookiePath
+
+```puppet
+{ 'path' => '/g', 'url' => 'http://backend-g/',
+  'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',}], }
+```
+
+##### With exclusions
+
+```puppet
+{ 'path' => '/h', 'url' => 'http://backend-h/h',
+  'no_proxy_uris' => ['/h/admin', '/h/server-status'], }
+```
+
+Alias of
+
+```puppet
+Struct[{
+    path                          => String[1],
+    url                           => String[1],
+    Optional[params]              => Hash[String[1], Variant[String[1], Integer]],
+    Optional[keywords]            => Array[String[1]],
+    Optional[reverse_cookies]     => Array[
+      Struct[
+        {
+          url    => String[1],
+          path   => Optional[String[1]],
+          domain => Optional[String[1]],
+        }
+      ]
+    ],
+    Optional[reverse_urls]        => Array[String[1]],
+    Optional[setenv]              => Array[String[1]],
+    Optional[no_proxy_uris]       => Array[String[1]],
+    Optional[no_proxy_uris_match] => Array[String[1]],
+  }]
+```
+
+#### Parameters
+
+The following parameters are available in the `Apache::Vhost::ProxyPass` data type:
+
+* [`path`](#path)
+* [`url`](#url)
+* [`params`](#params)
+* [`reverse_urls`](#reverse_urls)
+* [`reverse_cookies`](#reverse_cookies)
+* [`keywords`](#keywords)
+* [`setenv`](#setenv)
+* [`no_proxy_uris`](#no_proxy_uris)
+* [`no_proxy_uris_match`](#no_proxy_uris_match)
+
+##### <a name="path"></a>`path`
+
+Data type: `String[1]`
+
+The virtual path on the local server to map.
+
+##### <a name="url"></a>`url`
+
+Data type: `String[1]`
+
+The URL to which the path and its children will be mapped.
+
+##### <a name="params"></a>`params`
+
+Data type: `Optional[Hash]`
+
+Optional [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) key-value parameters, such as connection settings.
+
+##### <a name="reverse_urls"></a>`reverse_urls`
+
+Data type: `Array[String[1]]`
+
+Optional (but usually recommended) URLs for [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) configuration.
+Allows Apache to adjust certain headers on HTTP redirect responses, to prevent
+redirects on the back-end from bypassing the reverse proxy.
+
+##### <a name="reverse_cookies"></a>`reverse_cookies`
+
+Data type: `Optional[Array[Hash]]`
+
+Optional Array of Hashes, each representing a ProxyPassReverseCookieDomain or
+ProxyPassReverseCookiePath configuration. These are similar to ProxyPassReverse but
+operate on Domain or Path strings respectively in Set-Cookie headers. Each Hash
+must contain one `url => value` pair, and exactly one `path => value` or `domain => value`
+pair, representing the internal domain or internal path.
+
+Options:
+
+* **:url** `String[1]`: Required partial URL representing public domain or public path.
+* **:path** `Optional[String[1]]`: Internal path for [ProxyPassReverseCookiePath](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiepath) configuration.
+* **:domain** `Optional[String[1]]`: Internal domain for [ProxyPassReverseCookieDomain](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiedomain) configuration.
+
+##### <a name="keywords"></a>`keywords`
+
+Data type: `Optional[Array[String[1]]]`
+
+Array of optional keywords such as `nocanon`, `interpolate`, or `noquery` supported
+by [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) (refer
+to subsection under heading "Additional ProxyPass Keywords").
+
+##### <a name="setenv"></a>`setenv`
+
+Data type: `Optional[Array[String[1]]]`
+
+Optional Array of Strings of the form "${env_var_name} ${value}".
+Uses [SetEnv](https://httpd.apache.org/docs/current/mod/mod_env.html#setenv) to make [Protocol Adjustments](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) to mod_proxy in the virtual
+
+##### <a name="no_proxy_uris"></a>`no_proxy_uris`
+
+Data type: `Optional[Array[String[1]]]`
+
+Optional Array of paths to exclude from proxying, using the `!` directive to [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass).
+
+##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
+
+Data type: `Optional[Array[String[1]]]`
+
+Similar to `no_proxy_uris` but uses [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) to allow regular
+expressions.
+
 ## Tasks
 
 ### <a name="init"></a>`init`

From b43350c03dfd764ea4b39e23631eef5fa2c0c253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=B6rner?= <optins@web.de>
Date: Tue, 9 Aug 2022 19:14:50 +0200
Subject: [PATCH 1993/2267] Allow custom_config to have a string priority again

In f41251e the type was narrowed to no
longer allow strings, but this can cause problems.

Sorting is alphabetical and you need to format it for the correct
sorting. So to make sure 2 loads before 10 you need to format it as 02.
While the vhost can do some printf style magic to change 2 to 02, it
must then also know what the highest number is. Otherwise 100 is sorted
before 20. By allowing strings, you allow the caller to fix this.

A type alias is introduced to reduce duplication and make it easier to
track.

Fixes: f41251e
---
 manifests/custom_config.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 48d39a2d27..8c9e6ebb84 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -52,7 +52,7 @@
   Enum['absent', 'present'] $ensure     = 'present',
   Stdlib::Absolutepath $confdir         = $apache::confd_dir,
   Optional[String] $content             = undef,
-  Variant[Integer, Boolean] $priority   = 25,
+  Apache::Vhost::Priority $priority     = 25,
   Optional[String] $source              = undef,
   String $verify_command                = $apache::params::verify_command,
   Boolean $verify_config                = true,

From 52371a97c9a5826e8c3685acdb04580974c1e12a Mon Sep 17 00:00:00 2001
From: Matthias Hensler <matthias@wspse.de>
Date: Wed, 10 Aug 2022 09:40:19 +0200
Subject: [PATCH 1994/2267] fix duplicate definition of auth_basic-mod

PR 2252 breaks the usage of auth_basic in a vhost, because the module is
declared twice:

Error: Could not retrieve catalog from remote server: Error 500 on SERVER: Server Error: Evaluation Error: Error while evaluating a Resource Statement, Evaluation Error: Error while evaluating a Resource Statement, Duplicate declaration: Apache::Mod[auth_basic] is already declared at (file: /etc/puppetlabs/code/environments/module_updates/modules/apache/manifests/default_mods.pp, line: 142); cannot redeclare (file: /etc/puppetlabs/code/environments/module_updates/modules/apache/manifests/mod/auth_basic.pp, line: 7) (file: /etc/puppetlabs/code/environments/module_updates/modules/apache/manifests/mod/auth_basic.pp, line: 7, column: 3) (file: /etc/puppetlabs/code/environments/module_updates/site-modules/rx_apache/manifests/vhost.pp, line: 336) on node ...

fix it by including the appropriate class in defaults_mods, instead of
just defining the module
---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index edf18b350d..22ee2c95eb 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -139,7 +139,7 @@
     include apache::mod::mime
     include apache::mod::negotiation
     include apache::mod::setenvif
-    ::apache::mod { 'auth_basic': }
+    include apache::mod::auth_basic
 
     if versioncmp($apache_version, '2.4') >= 0 {
       # filter is needed by mod_deflate

From 985d959e84fc519d4b674292d7e4882c07abaafd Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 10 Aug 2022 13:53:45 +0200
Subject: [PATCH 1995/2267] Include apache::mod::authn_core in every auth mod

The authn_core module is needed for AuthType, which is needed to select
a specific auth. While modules may load without them, it's unlikely to
work in practice.

This is only relevant when default mods are disabled since authn_core is
a default module.
---
 manifests/mod/auth_basic.pp           | 1 +
 manifests/mod/auth_cas.pp             | 1 +
 manifests/mod/auth_mellon.pp          | 1 +
 manifests/mod/auth_openidc.pp         | 1 +
 spec/classes/mod/auth_cas_spec.rb     | 3 +++
 spec/classes/mod/auth_gssapi_spec.rb  | 4 ++++
 spec/classes/mod/auth_kerb_spec.rb    | 5 +++++
 spec/classes/mod/auth_mellon_spec.rb  | 2 ++
 spec/classes/mod/auth_openidc_spec.rb | 9 +++++++++
 9 files changed, 27 insertions(+)

diff --git a/manifests/mod/auth_basic.pp b/manifests/mod/auth_basic.pp
index cb2d1313c9..d247929394 100644
--- a/manifests/mod/auth_basic.pp
+++ b/manifests/mod/auth_basic.pp
@@ -4,5 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_auth_basic.html for additional documentation.
 #
 class apache::mod::auth_basic {
+  include apache::mod::authn_core
   ::apache::mod { 'auth_basic': }
 }
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 17df090237..db0320f305 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -115,6 +115,7 @@
   }
 
   include apache
+  include apache::mod::authn_core
   ::apache::mod { 'auth_cas': }
 
   file { $cas_cookie_path:
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index 81693d7d04..dd40bf03b4 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -34,6 +34,7 @@
   Optional[Integer] $mellon_post_count                  = undef
 ) inherits apache::params {
   include apache
+  include apache::mod::authn_core
   ::apache::mod { 'auth_mellon': }
 
   # Template uses
diff --git a/manifests/mod/auth_openidc.pp b/manifests/mod/auth_openidc.pp
index 7fa75b8303..8807be31bd 100644
--- a/manifests/mod/auth_openidc.pp
+++ b/manifests/mod/auth_openidc.pp
@@ -5,6 +5,7 @@
 #
 class apache::mod::auth_openidc inherits apache::params {
   include apache
+  include apache::mod::authn_core
   include apache::mod::authz_user
   apache::mod { 'auth_openidc': }
 }
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index 717dd58c0e..405a814a31 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -27,6 +27,7 @@
       include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_cas') }
       it { is_expected.to contain_package('libapache2-mod-auth-cas') }
       it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/apache2/mods-available/auth_cas.conf') }
@@ -36,6 +37,7 @@
       include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_cas') }
       it { is_expected.to contain_package('mod_auth_cas') }
       it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
@@ -50,6 +52,7 @@
       include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_cas') }
       it { is_expected.to contain_package('mod_auth_cas') }
       it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
index c8efd071d0..1d07cbf178 100644
--- a/spec/classes/mod/auth_gssapi_spec.rb
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -10,6 +10,7 @@
       include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('libapache2-mod-auth-gssapi') }
     end
@@ -17,6 +18,7 @@
       include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('mod_auth_gssapi') }
     end
@@ -24,6 +26,7 @@
       include_examples 'FreeBSD 9'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('www/mod_auth_gssapi') }
     end
@@ -31,6 +34,7 @@
       include_examples 'Gentoo'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('www-apache/mod_auth_gssapi') }
     end
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index d5fef032c0..26c732a050 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -10,6 +10,7 @@
       include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
     end
@@ -17,6 +18,7 @@
       include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('mod_auth_kerb') }
     end
@@ -24,6 +26,7 @@
       include_examples 'FreeBSD 9'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('www/mod_auth_kerb2') }
     end
@@ -31,6 +34,7 @@
       include_examples 'Gentoo'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('www-apache/mod_auth_kerb') }
     end
@@ -49,6 +53,7 @@ class { 'apache':
         MANIFEST
       end
 
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('httpd24-mod_auth_kerb') }
       it { is_expected.not_to contain_package('mod_auth_kerb') }
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index bdd06059c1..1c490ea6c2 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -9,6 +9,7 @@
     include_examples 'Debian 11'
 
     describe 'with no parameters' do
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_mellon') }
       it { is_expected.to contain_package('libapache2-mod-auth-mellon') }
       it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
@@ -38,6 +39,7 @@
     include_examples 'RedHat 6'
 
     describe 'with no parameters' do
+      it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_mellon') }
       it { is_expected.to contain_package('mod_auth_mellon') }
       it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') }
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index dd40e83c5f..8e8c6b8b9b 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -10,6 +10,8 @@
       include_examples 'Debian 11'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
+      it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('libapache2-mod-auth-openidc') }
     end
@@ -17,6 +19,8 @@
       include_examples 'RedHat 6'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
+      it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('mod_auth_openidc') }
     end
@@ -24,6 +28,8 @@
       include_examples 'FreeBSD 9'
 
       it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
+      it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('www/mod_auth_openidc') }
     end
@@ -42,6 +48,9 @@ class { 'apache':
         MANIFEST
       end
 
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::authn_core') }
+      it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('httpd24-mod_auth_openidc') }
       it { is_expected.not_to contain_package('mod_auth_openidc') }

From 8417c0b123ade9a0c6abaa92c08792e32f2ac5d2 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 9 Aug 2022 12:09:47 +0200
Subject: [PATCH 1996/2267] Manage DNF module for mod_auth_openidc

On EL 8 mod_auth_openidc is in a DNF module that must be enabled.
Otherwise the package is uninstallable. This is verified by adding an
acceptance test for the class.

The inheritance on apache::params is removed since it was redundant.
That is only needed if a class parameter uses apache::params.

$oidc_settings on apache::vhost is changed to have a default. The
template expects one and With that it's impossible to miscompile. The
alternative is to implement a fail() inside the code if it is empty, but
this provides some safety.
---
 manifests/mod/auth_openidc.pp         | 23 ++++++++++++++++++--
 manifests/vhost.pp                    |  2 +-
 spec/acceptance/auth_openidc_spec.rb  | 31 +++++++++++++++++++++++++++
 spec/classes/mod/auth_openidc_spec.rb | 25 +++++++++++++++------
 4 files changed, 72 insertions(+), 9 deletions(-)
 create mode 100644 spec/acceptance/auth_openidc_spec.rb

diff --git a/manifests/mod/auth_openidc.pp b/manifests/mod/auth_openidc.pp
index 8807be31bd..341360bdaf 100644
--- a/manifests/mod/auth_openidc.pp
+++ b/manifests/mod/auth_openidc.pp
@@ -1,11 +1,30 @@
 # @summary
 #   Installs and configures `mod_auth_openidc`.
-# 
+#
+# @param manage_dnf_module Whether to manage the DNF module
+# @param dnf_module_ensure The DNF module name to ensure. Only relevant if manage_dnf_module is set to true.
+# @param dnf_module_name The DNF module name to manage. Only relevant if manage_dnf_module is set to true.
+#
 # @see https://github.com/zmartzone/mod_auth_openidc for additional documentation.
+# @note Unsupported platforms: OracleLinux: 6; RedHat: 6; Scientific: 6; SLES: all
 #
-class apache::mod::auth_openidc inherits apache::params {
+class apache::mod::auth_openidc (
+  Boolean $manage_dnf_module = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8',
+  String[1] $dnf_module_ensure = 'present',
+  String[1] $dnf_module_name = 'mod_auth_openidc',
+) {
   include apache
   include apache::mod::authn_core
   include apache::mod::authz_user
+
   apache::mod { 'auth_openidc': }
+
+  if $manage_dnf_module {
+    package { 'dnf-module-mod_auth_openidc':
+      ensure   => $dnf_module_ensure,
+      name     => $dnf_module_name,
+      provider => 'dnfmodule',
+      before   => Apache::Mod['auth_openidc'],
+    }
+  }
 }
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 03c9465119..e1f1bc4857 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1945,7 +1945,7 @@
   Optional[Variant[String, Array[String]]] $comment                                   = undef,
   Hash $define                                                                        = {},
   Boolean $auth_oidc                                                                  = false,
-  Optional[Apache::OIDCSettings] $oidc_settings                                       = undef,
+  Apache::OIDCSettings $oidc_settings                                                 = {},
   Optional[Variant[Boolean, String]] $mdomain                                         = undef,
   Optional[Variant[String[1], Array[String[1]]]] $userdir                             = undef,
 ) {
diff --git a/spec/acceptance/auth_openidc_spec.rb b/spec/acceptance/auth_openidc_spec.rb
new file mode 100644
index 0000000000..e61c92ac71
--- /dev/null
+++ b/spec/acceptance/auth_openidc_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper_acceptance'
+
+describe 'apache::mod::auth_openidc', if: mod_supported_on_platform?('apache::mod::auth_openidc') do
+  pp = <<-MANIFEST
+    include apache
+    apache::vhost { 'example.com':
+      docroot       => '/var/www/example.com',
+      port          => 80,
+      auth_oidc     => true,
+      oidc_settings => {
+        'ProviderMetadataURL'       => 'https://login.example.com/.well-known/openid-configuration',
+        'ClientID'                  => 'test',
+        'RedirectURI'               => 'https://login.example.com/redirect_uri',
+        'ProviderTokenEndpointAuth' => 'client_secret_basic',
+        'RemoteUserClaim'           => 'sub',
+        'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
+        'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd',
+       },
+    }
+  MANIFEST
+
+  it 'succeeds in configuring a virtual host using mod_auth_openidc' do
+    apply_manifest(pp, catch_failures: true)
+  end
+
+  it 'is idempotent' do
+    apply_manifest(pp, catch_changes: true)
+  end
+end
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index 8e8c6b8b9b..4825783b00 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -9,29 +9,43 @@
     context 'on a Debian OS', :compile do
       include_examples 'Debian 11'
 
-      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('libapache2-mod-auth-openidc') }
+      it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
     end
-    context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+    context 'on RedHat 7', :compile do
+      include_examples 'RedHat 7'
 
-      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('mod_auth_openidc') }
+      it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
+    end
+    context 'on RedHat 8', :compile do
+      include_examples 'RedHat 8'
+
+      it { is_expected.to contain_class('apache::mod::authn_core') }
+      it { is_expected.to contain_class('apache::mod::authz_user') }
+      it { is_expected.to contain_apache__mod('auth_openidc') }
+      it { is_expected.to contain_package('mod_auth_openidc') }
+      it do
+        is_expected.to contain_package('dnf-module-mod_auth_openidc')
+          .with_ensure('present')
+          .with_name('mod_auth_openidc')
+          .that_comes_before('Package[mod_auth_openidc]')
+      end
     end
     context 'on a FreeBSD OS', :compile do
       include_examples 'FreeBSD 9'
 
-      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('www/mod_auth_openidc') }
+      it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
     end
   end
   context 'overriding mod_packages' do
@@ -48,7 +62,6 @@ class { 'apache':
         MANIFEST
       end
 
-      it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }

From 9044b4c4c78cda5ea7fed22338e481c4e569c169 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 5 Aug 2022 14:21:11 +0200
Subject: [PATCH 1997/2267] Remove auth_kerb and nss from Debian Bullseye

libapache2-mod-auth-kerb is unavailable in Debian Bullseye[1]
libapache2-mod-auth-kerb was removed in Debian Buster[2]

[1]: https://packages.debian.org/buster/libapache2-mod-auth-kerb
[2]: https://packages.debian.org/stretch/libapache2-mod-nss
---
 manifests/params.pp                | 2 --
 spec/classes/mod/auth_kerb_spec.rb | 2 +-
 spec/spec_helper_local.rb          | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 7cdca1f83d..05efdfec5d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -385,7 +385,6 @@
       $mod_packages = {
         'apreq2'                => 'libapache2-mod-apreq2',
         'auth_cas'              => 'libapache2-mod-auth-cas',
-        'auth_kerb'             => 'libapache2-mod-auth-kerb',
         'auth_openidc'          => 'libapache2-mod-auth-openidc',
         'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
@@ -396,7 +395,6 @@
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
         'jk'                    => 'libapache2-mod-jk',
         'lookup_identity'       => 'libapache2-mod-lookup-identity',
-        'nss'                   => 'libapache2-mod-nss',
         'pagespeed'             => 'mod-pagespeed-stable',
         'passenger'             => 'libapache2-mod-passenger',
         'perl'                  => 'libapache2-mod-perl2',
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index d5fef032c0..56d4a3775b 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 11'
+      include_examples 'Debian 10'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_kerb') }
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index ace0d54447..43da2b68fa 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -37,6 +37,10 @@
   let(:facts) { on_supported_os['debian-10-x86_64'] }
 end
 
+shared_context 'Debian 10' do
+  let(:facts) { on_supported_os['debian-10-x86_64'] }
+end
+
 shared_context 'Debian 11' do
   let(:facts) { on_supported_os['debian-11-x86_64'] }
 end

From 0f3c2d86a74b8855f5a7083985ac13d3461eaa0e Mon Sep 17 00:00:00 2001
From: Hans Moulron <hans.moulron@francetv.fr>
Date: Thu, 11 Aug 2022 15:57:21 +0200
Subject: [PATCH 1998/2267] add possibility to set icons_path to false so no
 alias will be set for it

---
 manifests/mod/alias.pp         |  8 ++++----
 spec/classes/mod/alias_spec.rb | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 79e5ec0da9..1bc2064112 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -22,11 +22,11 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_alias.html for additional documentation.
 #
 class apache::mod::alias (
-  Optional[String] $apache_version  = undef,
-  String $icons_options             = 'Indexes MultiViews',
+  Optional[String] $apache_version                   = undef,
+  String $icons_options                              = 'Indexes MultiViews',
   # set icons_path to false to disable the alias
-  Stdlib::Absolutepath $icons_path  = $apache::params::alias_icons_path,
-  String $icons_prefix              = $apache::params::icons_prefix
+  Variant[Boolean, Stdlib::Absolutepath] $icons_path = $apache::params::alias_icons_path,
+  String $icons_prefix                               = $apache::params::icons_prefix
 ) inherits apache::params {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 8ddb9ef971..94f7bcc3b5 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -60,6 +60,21 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/apache-icons\/ "\/usr\/share\/httpd\/icons\/"}) }
     end
+    context 'with icons path as false', :compile do
+      let :pre_condition do
+        'class { apache: default_mods => false }'
+      end
+      let :params do
+        {
+          'icons_path' => false,
+        }
+      end
+
+      include_examples 'RedHat 7'
+
+      it { is_expected.to contain_apache__mod('alias') }
+      it { is_expected.not_to contain_file('alias.conf') }
+    end
     context 'on a FreeBSD OS', :compile do
       include_examples 'FreeBSD 10'
 

From b3ef2041967acbf7bdce407e19515d5ede7dfaa2 Mon Sep 17 00:00:00 2001
From: Steve Mokris <steve@kosada.com>
Date: Thu, 11 Aug 2022 16:49:01 -0400
Subject: [PATCH 1999/2267] Fix deprecation warning about performing a regex
 comparison on a hash

---
 templates/vhost/_require.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_require.erb b/templates/vhost/_require.erb
index 9ad7805393..abc97873ba 100644
--- a/templates/vhost/_require.erb
+++ b/templates/vhost/_require.erb
@@ -1,6 +1,6 @@
 <%- _item = scope.lookupvar('_template_scope')[:item] -%>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  <%- if _item['require'] && _item['require'] != '' && _item['require'] !~ /unmanaged/i -%>
+  <%- if _item['require'] && !(_item['require'].is_a?(String) && (_item['require'] == '' || _item['require'] =~ /unmanaged/i)) -%>
     <%- if _item['require'].is_a?(Hash) -%>
       <%- case _item['require']['enforce'].downcase
           when 'all','none','any' then -%>

From 5243360897528db2accecd07da2ddaca793d3ace Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mon, 15 Aug 2022 13:35:42 +0200
Subject: [PATCH 2000/2267] Allow integers for timeouts

Timeouts are more naturally written as integers, allow them.
---
 manifests/mod/auth_cas.pp         | 44 +++++++++++++++----------------
 manifests/mod/proxy.pp            | 14 +++++-----
 spec/classes/mod/auth_cas_spec.rb |  6 +++++
 spec/classes/mod/proxy_spec.rb    | 25 ++++++++++++++++++
 4 files changed, 60 insertions(+), 29 deletions(-)
 create mode 100644 spec/classes/mod/proxy_spec.rb

diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index db0320f305..0e4127c947 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -87,28 +87,28 @@
 class apache::mod::auth_cas (
   String $cas_login_url,
   String $cas_validate_url,
-  String $cas_cookie_path                     = $apache::params::cas_cookie_path,
-  Stdlib::Filemode $cas_cookie_path_mode      = '0750',
-  Integer $cas_version                        = 2,
-  String $cas_debug                           = 'Off',
-  Optional[String] $cas_validate_server       = undef,
-  Optional[String] $cas_validate_depth        = undef,
-  Optional[String] $cas_certificate_path      = undef,
-  Optional[String] $cas_proxy_validate_url    = undef,
-  Optional[String] $cas_root_proxied_as       = undef,
-  Optional[String] $cas_cookie_entropy        = undef,
-  Optional[String] $cas_timeout               = undef,
-  Optional[String] $cas_idle_timeout          = undef,
-  Optional[String] $cas_cache_clean_interval  = undef,
-  Optional[String] $cas_cookie_domain         = undef,
-  Optional[String] $cas_cookie_http_only      = undef,
-  Optional[String] $cas_authoritative         = undef,
-  Optional[String] $cas_validate_saml         = undef,
-  Optional[String] $cas_sso_enabled           = undef,
-  Optional[String] $cas_attribute_prefix      = undef,
-  Optional[String] $cas_attribute_delimiter   = undef,
-  Optional[String] $cas_scrub_request_headers = undef,
-  Boolean $suppress_warning                   = false,
+  String $cas_cookie_path                                = $apache::params::cas_cookie_path,
+  Stdlib::Filemode $cas_cookie_path_mode                 = '0750',
+  Integer $cas_version                                   = 2,
+  String $cas_debug                                      = 'Off',
+  Optional[String] $cas_validate_server                  = undef,
+  Optional[String] $cas_validate_depth                   = undef,
+  Optional[String] $cas_certificate_path                 = undef,
+  Optional[String] $cas_proxy_validate_url               = undef,
+  Optional[String] $cas_root_proxied_as                  = undef,
+  Optional[String] $cas_cookie_entropy                   = undef,
+  Optional[Variant[Integer[0],String]] $cas_timeout      = undef,
+  Optional[Variant[Integer[0],String]] $cas_idle_timeout = undef,
+  Optional[String] $cas_cache_clean_interval             = undef,
+  Optional[String] $cas_cookie_domain                    = undef,
+  Optional[String] $cas_cookie_http_only                 = undef,
+  Optional[String] $cas_authoritative                    = undef,
+  Optional[String] $cas_validate_saml                    = undef,
+  Optional[String] $cas_sso_enabled                      = undef,
+  Optional[String] $cas_attribute_prefix                 = undef,
+  Optional[String] $cas_attribute_delimiter              = undef,
+  Optional[String] $cas_scrub_request_headers            = undef,
+  Boolean $suppress_warning                              = false,
 ) inherits apache::params {
   if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 642577ce93..35c44c22c7 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -25,13 +25,13 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
 #
 class apache::mod::proxy (
-  String $proxy_requests               = 'Off',
-  Optional[String] $allow_from         = undef,
-  Optional[String] $apache_version     = undef,
-  Optional[String] $package_name       = undef,
-  String $proxy_via                    = 'On',
-  Optional[String] $proxy_timeout      = undef,
-  Optional[String] $proxy_iobuffersize = undef,
+  String $proxy_requests                              = 'Off',
+  Optional[String] $allow_from                        = undef,
+  Optional[String] $apache_version                    = undef,
+  Optional[String] $package_name                      = undef,
+  String $proxy_via                                   = 'On',
+  Optional[Variant[Integer[0],String]] $proxy_timeout = undef,
+  Optional[String] $proxy_iobuffersize                = undef,
 ) {
   include apache
   $_proxy_timeout = $apache::timeout
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index 405a814a31..720999f816 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -20,6 +20,8 @@
       {
         cas_login_url: 'https://cas.example.com/login',
         cas_validate_url: 'https://cas.example.com/validate',
+        cas_timeout: 1234,
+        cas_idle_timeout: 4321,
       }
     end
 
@@ -32,6 +34,8 @@
       it { is_expected.to contain_package('libapache2-mod-auth-cas') }
       it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/apache2/mods-available/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/apache2/mod_auth_cas/').with_owner('www-data') }
+      it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASTimeout 1234}) }
+      it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
     end
     context 'on a RedHat OS', :compile do
       include_examples 'RedHat 6'
@@ -42,6 +46,8 @@
       it { is_expected.to contain_package('mod_auth_cas') }
       it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
+      it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASTimeout 1234}) }
+      it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
     end
 
     context 'vhost setup', :compile do
diff --git a/spec/classes/mod/proxy_spec.rb b/spec/classes/mod/proxy_spec.rb
new file mode 100644
index 0000000000..841dd3833a
--- /dev/null
+++ b/spec/classes/mod/proxy_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::proxy', type: :class do
+  it_behaves_like 'a mod class, without including apache'
+
+  on_supported_os.each do |os, os_facts|
+    context "On #{os}" do
+      let :facts do
+        os_facts
+      end
+
+      it { is_expected.to contain_file('proxy.conf').with_content(%r{ProxyRequests Off}) }
+      it { is_expected.to contain_file('proxy.conf').without_content(%r{ProxyTimeout}) }
+      context 'with parameters set' do
+        let(:params) do
+          { proxy_timeout: 12_345 }
+        end
+
+        it { is_expected.to contain_file('proxy.conf').with_content(%r{ProxyTimeout 12345}) }
+      end
+    end
+  end
+end

From 58078cc63d0035f5f98946c3eb3a9ed0a1cb35a5 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 4 Aug 2022 11:28:39 +0100
Subject: [PATCH 2001/2267] (GH-cat-11) Certify Support for Ubuntu 22.04

---
 metadata.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 3e4db76803..11602cea03 100644
--- a/metadata.json
+++ b/metadata.json
@@ -67,7 +67,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     },
     {

From f9710ef7c089b2d304fa9910d7be8cc9f081d00f Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 17 Aug 2022 17:23:49 +0100
Subject: [PATCH 2002/2267] Update for Ubuntu 22.04

---
 manifests/mod/php.pp            | 16 ++++++++--------
 manifests/params.pp             | 20 ++++++++++----------
 spec/acceptance/mod_php_spec.rb |  4 ++++
 spec/classes/mod/php_spec.rb    | 16 ++++++++--------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 57cabb489d..f1c1bba12e 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -43,10 +43,11 @@
   }
 
   include apache
-  if (versioncmp($php_version, '8') < 0) {
-    $mod = "php${php_version}"
-  } else {
+  # RedHat + PHP 8 drop the major version in apache module name.
+  if ($facts['os']['family'] == 'RedHat') and (versioncmp($php_version, '8') >= 0) {
     $mod = 'php'
+  } else {
+    $mod = "php${php_version}"
   }
 
   if $apache::version::scl_httpd_version == undef and $apache::version::scl_php_version != undef {
@@ -92,12 +93,11 @@
   $_php_version_no_dot = regsubst($php_version, '\.', '')
   if $apache::version::scl_httpd_version {
     $_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
+  } elsif ($facts['os']['family'] == 'RedHat') and ($_php_major == 8) {
+    # RedHat + PHP 8 drop the major version in apache module name.
+    $_lib = "${libphp_prefix}.so"
   } else {
-    # Controls php version and libphp prefix
-    $_lib = $_php_major ? {
-      '8'     => "${libphp_prefix}.so",
-      default => "${libphp_prefix}${php_version}.so",
-    }
+    $_lib = "${libphp_prefix}${php_version}.so"
   }
   $_module_id = $_php_major ? {
     '5'     => 'php5_module',
diff --git a/manifests/params.pp b/manifests/params.pp
index 05efdfec5d..90fb7b57c3 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -345,13 +345,16 @@
     $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
     $ssl_sessioncache    = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
-    if ($facts['os']['name'] == 'Ubuntu') or ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') < 0) {
-      $php_version = $facts['os']['release']['major'] ? {
-        '9'     => '7.0', # Debian Stretch
-        '10'    => '7.3', # Debian Buster
-        '20.04' => '7.4', # Ubuntu Foccal Fossal
-        default => '7.2', # Ubuntu Bionic, Cosmic and Disco
-      }
+    $php_version = $facts['os']['release']['major'] ? {
+      '9'     => '7.0', # Debian Stretch
+      '10'    => '7.3', # Debian Buster
+      '11'    => '7.4', # Debian Bullseye
+      '20.04' => '7.4', # Ubuntu Foccal Fossal
+      '22.04' => '8.1', # Ubuntu Jammy
+      default => '7.2', # Ubuntu Bionic, Cosmic and Disco
+    }
+    if (($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22.04') < 0) or
+    ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') < 0)) {
       $mod_packages = {
         'apreq2'                => 'libapache2-mod-apreq2',
         'auth_cas'              => 'libapache2-mod-auth-cas',
@@ -379,9 +382,6 @@
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
     } else {
-      $php_version = $facts['os']['release']['major'] ? {
-        default => '7.4', # Debian Bullseye
-      }
       $mod_packages = {
         'apreq2'                => 'libapache2-mod-apreq2',
         'auth_cas'              => 'libapache2-mod-auth-cas',
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 28dc692b7a..c6323e74ab 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -44,6 +44,10 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
+    elsif os[:family] == 'ubuntu' && os[:release] == '22.04'
+      describe file("#{apache_hash['mod_dir']}/php8.1.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
     elsif os[:family] == 'redhat' && os[:release] =~ %r{^(8)\b}
       describe file("#{apache_hash['mod_dir']}/php7.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 4b5b8c8a69..9a0920091e 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -40,16 +40,16 @@
                 )
               }
 
-              context 'with experimental php8.0' do
+              context 'with php8.0' do
                 let :params do
                   { php_version: '8.0' }
                 end
 
-                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_apache__mod('php8.0') }
                 it { is_expected.to contain_package('libapache2-mod-php8.0') }
                 it {
-                  is_expected.to contain_file('php.load').with(
-                    content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
+                  is_expected.to contain_file('php8.0.load').with(
+                    content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
                   )
                 }
               end
@@ -64,16 +64,16 @@
                 )
               }
 
-              context 'with experimental php8.0' do
+              context 'with php8.0' do
                 let :params do
                   { php_version: '8.0' }
                 end
 
-                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_apache__mod('php8.0') }
                 it { is_expected.to contain_package('libapache2-mod-php8.0') }
                 it {
-                  is_expected.to contain_file('php.load').with(
-                    content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
+                  is_expected.to contain_file('php8.0.load').with(
+                    content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
                   )
                 }
               end

From 9674a9d62716657c06dcad98858b6dac8188b329 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Thu, 18 Aug 2022 12:28:35 +0000
Subject: [PATCH 2003/2267] Release prep v8.1.0

---
 CHANGELOG.md  | 19 ++++++++++++++++++-
 REFERENCE.md  | 48 +++++++++++++++++++++++++++++++++++++++++-------
 metadata.json |  2 +-
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed5ac8baca..feec528821 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,24 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v8.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.0.0) (2022-08-08)
+## [v8.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.1.0) (2022-08-18)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.0.0...v8.1.0)
+
+### Added
+
+- Manage DNF module for mod\_auth\_openidc [\#2283](https://github.com/puppetlabs/puppetlabs-apache/pull/2283) ([ekohl](https://github.com/ekohl))
+- pdksync - \(GH-cat-11\) Certify Support for Ubuntu 22.04 [\#2276](https://github.com/puppetlabs/puppetlabs-apache/pull/2276) ([david22swan](https://github.com/david22swan))
+
+### Fixed
+
+- Allow integers for timeouts [\#2294](https://github.com/puppetlabs/puppetlabs-apache/pull/2294) ([traylenator](https://github.com/traylenator))
+- Allow setting icons\_path to false so no alias will be set for it [\#2292](https://github.com/puppetlabs/puppetlabs-apache/pull/2292) ([Zarne](https://github.com/Zarne))
+- fix duplicate definition of auth\_basic-mod [\#2287](https://github.com/puppetlabs/puppetlabs-apache/pull/2287) ([sircubbi](https://github.com/sircubbi))
+- Allow custom\_config to have a string priority again [\#2284](https://github.com/puppetlabs/puppetlabs-apache/pull/2284) ([martin-koerner](https://github.com/martin-koerner))
+- Remove auth\_kerb and nss from Debian Bullseye [\#2281](https://github.com/puppetlabs/puppetlabs-apache/pull/2281) ([ekohl](https://github.com/ekohl))
+
+## [v8.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.0.0) (2022-08-09)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v7.0.0...v8.0.0)
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 0b17ba9f4f..600e8e11de 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1224,7 +1224,7 @@ Default value: `'Indexes MultiViews'`
 
 ##### <a name="icons_path"></a>`icons_path`
 
-Data type: `Stdlib::Absolutepath`
+Data type: `Variant[Boolean, Stdlib::Absolutepath]`
 
 Sets the local path for an /icons/ Alias. Default depends on operating system:
 - Debian: /usr/share/apache2/icons
@@ -1399,7 +1399,7 @@ Default value: ``undef``
 
 ##### <a name="cas_timeout"></a>`cas_timeout`
 
-Data type: `Optional[String]`
+Data type: `Optional[Variant[Integer[0],String]]`
 
 The hard limit, in seconds, for a mod_auth_cas session.
 
@@ -1407,7 +1407,7 @@ Default value: ``undef``
 
 ##### <a name="cas_idle_timeout"></a>`cas_idle_timeout`
 
-Data type: `Optional[String]`
+Data type: `Optional[Variant[Integer[0],String]]`
 
 The limit, in seconds, of how long a mod_auth_cas session can be idle.
 
@@ -1591,10 +1591,44 @@ Default value: ``undef``
 
 Installs and configures `mod_auth_openidc`.
 
+* **Note** Unsupported platforms: OracleLinux: 6; RedHat: 6; Scientific: 6; SLES: all
+
 * **See also**
   * https://github.com/zmartzone/mod_auth_openidc
     * for additional documentation.
 
+#### Parameters
+
+The following parameters are available in the `apache::mod::auth_openidc` class:
+
+* [`manage_dnf_module`](#manage_dnf_module)
+* [`dnf_module_ensure`](#dnf_module_ensure)
+* [`dnf_module_name`](#dnf_module_name)
+
+##### <a name="manage_dnf_module"></a>`manage_dnf_module`
+
+Data type: `Boolean`
+
+Whether to manage the DNF module
+
+Default value: `and`
+
+##### <a name="dnf_module_ensure"></a>`dnf_module_ensure`
+
+Data type: `String[1]`
+
+The DNF module name to ensure. Only relevant if manage_dnf_module is set to true.
+
+Default value: `'present'`
+
+##### <a name="dnf_module_name"></a>`dnf_module_name`
+
+Data type: `String[1]`
+
+The DNF module name to manage. Only relevant if manage_dnf_module is set to true.
+
+Default value: `'mod_auth_openidc'`
+
 ### <a name="apachemodauthn_core"></a>`apache::mod::authn_core`
 
 Installs `mod_authn_core`.
@@ -5651,7 +5685,7 @@ Default value: `'On'`
 
 ##### <a name="proxy_timeout"></a>`proxy_timeout`
 
-Data type: `Optional[String]`
+Data type: `Optional[Variant[Integer[0],String]]`
 
 Network timeout for proxied requests.
 
@@ -7326,7 +7360,7 @@ Default value: ``undef``
 
 ##### <a name="priority"></a>`priority`
 
-Data type: `Variant[Integer, Boolean]`
+Data type: `Apache::Vhost::Priority`
 
 Sets the configuration file's priority by prefixing its filename with this parameter's
 numeric value, as Apache processes configuration files in alphanumeric order.<br />
@@ -10636,11 +10670,11 @@ Default value: ``false``
 
 ##### <a name="oidc_settings"></a>`oidc_settings`
 
-Data type: `Optional[Apache::OIDCSettings]`
+Data type: `Apache::OIDCSettings`
 
 An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf].
 
-Default value: ``undef``
+Default value: `{}`
 
 ##### <a name="limitreqfields"></a>`limitreqfields`
 
diff --git a/metadata.json b/metadata.json
index 11602cea03..857ec4d146 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 92c47e144fc07a98b706a00d9dc41654b681794b Mon Sep 17 00:00:00 2001
From: canth1 <71357932+canth1@users.noreply.github.com>
Date: Mon, 22 Aug 2022 03:50:14 -0600
Subject: [PATCH 2004/2267] (GH-2285) Add support for all proxy schemes, not
 just https://

This commit fixes GH-2285 by supporting all mod_proxy schemes according to the documentation here:

https://httpd.apache.org/docs/2.4/mod/mod_proxy.html

Type alias `modproxyprotocol` created in order to keep the code neat.
---
 manifests/balancermember.pp        |  2 +-
 spec/type_aliases/modproxy_spec.rb | 20 ++++++++++++++++++++
 types/modproxyprotocol.pp          |  3 +++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 spec/type_aliases/modproxy_spec.rb
 create mode 100644 types/modproxyprotocol.pp

diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index fc4b6067d8..efafd3b53a 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -40,7 +40,7 @@
 #
 define apache::balancermember (
   String $balancer_cluster,
-  Stdlib::HTTPUrl $url = "http://${$facts['networking']['fqdn']}/",
+  Apache::ModProxyProtocol $url = "http://${$facts['networking']['fqdn']}/",
   Array $options       = [],
 ) {
   concat::fragment { "BalancerMember ${name}":
diff --git a/spec/type_aliases/modproxy_spec.rb b/spec/type_aliases/modproxy_spec.rb
new file mode 100644
index 0000000000..a655e2517a
--- /dev/null
+++ b/spec/type_aliases/modproxy_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'Apache::ModProxyProtocol' do
+  [
+    'ajp://www.example.com',
+    'fcgi://www.example.com',
+    'ftp://www.example.com',
+    'h2://www.example.com',
+    'h2c://www.example.com',
+    'http://www.example.com',
+    'https://www.example.com',
+    'scgi://www.example.com',
+    'uwsgi://www.example.com',
+    'ws://www.example.com',
+    'wss://www.example.com',
+    'unix:/path/to/unix.socket',
+  ].each do |allowed_value|
+    it { is_expected.to allow_value(allowed_value) }
+  end
+end
diff --git a/types/modproxyprotocol.pp b/types/modproxyprotocol.pp
new file mode 100644
index 0000000000..bbb2330b98
--- /dev/null
+++ b/types/modproxyprotocol.pp
@@ -0,0 +1,3 @@
+# @summary Supported protocols / schemes by mod_proxy
+# @see https://httpd.apache.org/docs/2.4/mod/mod_proxy.html
+type Apache::ModProxyProtocol = Pattern[/(\A(ajp|fcgi|ftp|h2c?|https?|scgi|uwsgi|wss?):\/\/.+\z)/, /(\Aunix:\/([^\n\/\0]+\/*)*\z)/]

From f9d79d193a1a13f640e6e20b8f05ecc5c1ef6391 Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Fri, 5 Aug 2022 13:46:13 +0200
Subject: [PATCH 2005/2267] Parameterize CRS DOS protection

---
 manifests/mod/security.pp           | 25 ++++++++++++++++++++++
 spec/classes/mod/security_spec.rb   | 32 +++++++++++++++++++++++++++++
 templates/mod/security_crs.conf.erb |  9 ++++----
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 14596193a0..f67f421fba 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -104,7 +104,24 @@
 # @param manage_security_crs
 #   Toggles whether to manage ModSecurity Core Rule Set 
 #
+# @param enable_dos_protection
+#   Toggles the optional OWASP ModSecurity Core Rule Set DOS protection rule
+#   (rule id 900700)
+#
+# @param dos_burst_time_slice
+#   Configures time in which a burst is measured for the OWASP ModSecurity Core Rule Set DOS protection rule
+#   (rule id 900700)
+#
+# @param dos_counter_threshold
+#   Configures the amount of requests that can be made within dos_burst_time_slice before it is considered a burst in
+#   the OWASP ModSecurity Core Rule Set DOS protection rule (rule id 900700)
+#
+# @param dos_block_timeout
+#   Configures how long the client should be blocked when the dos_counter_threshold is exceeded in the OWASP
+#   ModSecurity Core Rule Set DOS protection rule (rule id 900700)
+#
 # @see https://github.com/SpiderLabs/ModSecurity/wiki for additional documentation.
+# @see https://coreruleset.org/docs/ for addional documentation
 #
 class apache::mod::security (
   Stdlib::Absolutepath $logroot                         = $apache::params::logroot,
@@ -141,6 +158,10 @@
   Enum['On', 'Off'] $secrequestbodyaccess               = 'On',
   Enum['On', 'Off'] $secresponsebodyaccess              = 'Off',
   Boolean $manage_security_crs                          = true,
+  Boolean $enable_dos_protection                        = true,
+  Integer[1, default] $dos_burst_time_slice             = 60,
+  Integer[1, default] $dos_counter_threshold            = 100,
+  Integer[1, default] $dos_block_timeout                = 600,
 ) inherits apache::params {
   include apache
 
@@ -278,6 +299,10 @@
     # - $restricted_extensions
     # - $restricted_headers
     # - $secrequestmaxnumargs
+    # - $enable_dos_protection
+    # - $dos_burst_time_slice
+    # - $dos_counter_threshold
+    # - $dos_block_timeout
     file { "${modsec_dir}/security_crs.conf":
       ensure  => file,
       content => template('apache/mod/security_crs.conf.erb'),
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index e773388922..ff6b9a9aed 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -140,6 +140,10 @@
               {
                 paranoia_level: 1,
                 executing_paranoia_level: 2,
+                enable_dos_protection: true,
+                dos_burst_time_slice: 30,
+                dos_counter_threshold: 120,
+                dos_block_timeout: 300,
               }
             end
 
@@ -148,6 +152,18 @@
                 %r{^SecAction \\\n\s+\"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
               is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
                 %r{^SecAction \\\n\s+\"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=2"$}
+              is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                %r{
+                  ^SecAction\ \\\n
+                  \s+\"id:900700,\\\n
+                  \s+phase:1,\\\n
+                  \s+nolog,\\\n
+                  \s+pass,\\\n
+                  \s+t:none,\\\n
+                  \s+setvar:'tx.dos_burst_time_slice=30',\\\n
+                  \s+setvar:'tx.dos_counter_threshold=120',\\\n
+                  \s+setvar:'tx.dos_block_timeout=300'"$
+              }x
             }
           end
 
@@ -302,6 +318,10 @@
               {
                 paranoia_level: 1,
                 executing_paranoia_level: 1,
+                enable_dos_protection: true,
+                dos_burst_time_slice: 30,
+                dos_counter_threshold: 120,
+                dos_block_timeout: 300,
               }
             end
 
@@ -310,6 +330,18 @@
                 %r{^SecAction \\\n\s+\"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
               is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
                 %r{^SecAction \\\n\s+\"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=1"$}
+              is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
+                %r{
+                  ^SecAction\ \\\n
+                  \s+\"id:900700,\\\n
+                  \s+phase:1,\\\n
+                  \s+nolog,\\\n
+                  \s+pass,\\\n
+                  \s+t:none,\\\n
+                  \s+setvar:'tx.dos_burst_time_slice=30',\\\n
+                  \s+setvar:'tx.dos_counter_threshold=120',\\\n
+                  \s+setvar:'tx.dos_block_timeout=300'"$
+              }x
             }
           end
 
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index e6520b788a..cf8962f3f4 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -714,16 +714,17 @@ SecAction \
 #
 # Uncomment this rule to use this feature:
 #
+<% if @enable_dos_protection -%>
 SecAction \
  "id:900700,\
   phase:1,\
   nolog,\
   pass,\
   t:none,\
-  setvar:'tx.dos_burst_time_slice=60',\
-  setvar:'tx.dos_counter_threshold=100',\
-  setvar:'tx.dos_block_timeout=600'"
-
+  setvar:'tx.dos_burst_time_slice=<%= @dos_burst_time_slice %>',\
+  setvar:'tx.dos_counter_threshold=<%= @dos_counter_threshold %>',\
+  setvar:'tx.dos_block_timeout=<%= @dos_block_timeout %>'"
+<% end -%>
 
 #
 # -- [[ Check UTF-8 encoding ]] ------------------------------------------------

From d5048b527bbf096003b0eee32c46a83b8e72b30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=B6rner?= <martin.koerner@gmail.com>
Date: Tue, 6 Sep 2022 15:05:12 +0200
Subject: [PATCH 2006/2267] Allow RewriteInherit with empty rewrites

There might be cases where you exclusively want to inherit RewriteRules from e.g. global scope without specifying vHost-specific rewrites - which is now allowed.
---
 manifests/vhost.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index e1f1bc4857..01aaee946f 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2514,11 +2514,12 @@
 
   # Template uses:
   # - $rewrites
+  # - $rewrite_inherit
   # - $rewrite_base
   # - $rewrite_rule
   # - $rewrite_cond
   # - $rewrite_map
-  if (! empty($rewrites) or $rewrite_rule) and $ensure == 'present' {
+  if (! empty($rewrites) or $rewrite_rule or $rewrite_inherit) and $ensure == 'present' {
     include apache::mod::rewrite
 
     concat::fragment { "${name}-rewrite":

From 1572f133c4d3a0fad162e8375244b0507db1b23d Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Tue, 6 Sep 2022 15:41:41 +0200
Subject: [PATCH 2007/2267] Add tests for proxy_dest_reverse_match

Add some tests for apache::vhost::proxy_dest_reverse_match which
were not present.
---
 spec/defines/vhost_spec.rb | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 74020b9da3..3b102d613c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1287,7 +1287,8 @@
             ).with_content(%r{## Proxy rules})
           }
         end
-        context 'proxy_dest_match' do
+
+        context 'proxy_dest_match and no proxy_dest_reverse_match' do
           let :params do
             {
               'docroot'          => '/rspec/docroot',
@@ -1296,7 +1297,24 @@
           end
 
           it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{## Proxy rules}) }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyPassMatch\s+/\s+//}) }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyPassReverse\s+/\s+/}) }
+        end
+
+        context 'proxy_dest_match and proxy_dest_reverse_match' do
+          let :params do
+            {
+              'docroot'                  => '/rspec/docroot',
+              'proxy_dest_match'         => '/',
+              'proxy_dest_reverse_match' => 'http://localhost:8180',
+            }
+          end
+
+          it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{## Proxy rules}) }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyPassMatch\s+/\s+//}) }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyPassReverse\s+/\s+http://localhost:8180/}) }
         end
+
         context 'not everything can be set together...' do
           let :params do
             {

From c1b61e939b02f622ae2dbecba5297051af0d68e6 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 7 Sep 2022 13:38:46 +0200
Subject: [PATCH 2008/2267] Simplify the logic in _require.erb

If we take the expression:

    !(_item['require'] && _item['require'] != '') && _item['require'] !~ /unmanaged/i && !(_item['auth_require'])

This is hard to read, but equal to:

    (!_item['require'] || _item['require'] == '') && _item['require'] !~ /unmanaged/i && !(_item['auth_require'])

This makes it easier to see that item must be `nil` or `''`. Those will
never match `/unmanaged/i` so it can be simplified to:

    (!_item['require'] || _item['require'] == '') && !(_item['auth_require'])

Just before it is a block that already checks the last section, so it
can be reduced to an elsif on that block.
---
 templates/vhost/_require.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/vhost/_require.erb b/templates/vhost/_require.erb
index 9ad7805393..ba1347d19b 100644
--- a/templates/vhost/_require.erb
+++ b/templates/vhost/_require.erb
@@ -20,8 +20,7 @@
   <%- end -%>
   <%- if _item['auth_require'] -%>
     Require <%= _item['auth_require'] %>
-  <%- end -%>
-  <%- if !(_item['require'] && _item['require'] != '') && _item['require'] !~ /unmanaged/i && !(_item['auth_require']) -%>
+  <%- elsif !_item['require'] || _item['require'] == '' -%>
     Require all granted
   <%- end -%>
 <%- else -%>

From 9671f3d859e62764c63cdb9c91846ba3ef71aadf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=B6rner?= <martin.koerner@gmail.com>
Date: Wed, 7 Sep 2022 20:01:53 +0200
Subject: [PATCH 2009/2267] Add test for rewrite_inherit with empty rewrites

---
 spec/defines/vhost_spec.rb | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 74020b9da3..4be981796f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1690,10 +1690,33 @@
             it { is_expected.to raise_error(Puppet::Error) }
           end
           context 'empty rewrites' do
-            let(:params) { super().merge('rewrites' => []) }
+            let(:params) {
+              super().merge(
+                'rewrite_inherit' => false,
+                'rewrites' => []
+              )
+            }
 
-            it { is_expected.to compile }
+            it { 
+              is_expected.to compile
+              is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
+            }            
+          end
+          context 'empty rewrites_with_rewrite_inherit' do
+            let(:params) {
+              super().merge(
+                'rewrite_inherit' => true,
+                'rewrites' => []
+              )
+            }
+  
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
+                content: %r{^\s+RewriteOptions Inherit$},
+              )
+            }
           end
+
           context 'bad error_log_format flag' do
             let :params do
               super().merge(

From 71a94c742766a4da87470c3bed47448c82c008f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=B6rner?= <martin.koerner@gmail.com>
Date: Wed, 7 Sep 2022 20:24:05 +0200
Subject: [PATCH 2010/2267] Fix RuboCop issues

---
 spec/defines/vhost_spec.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 4be981796f..ce975cfe4f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1690,26 +1690,26 @@
             it { is_expected.to raise_error(Puppet::Error) }
           end
           context 'empty rewrites' do
-            let(:params) {
+            let(:params) do
               super().merge(
                 'rewrite_inherit' => false,
-                'rewrites' => []
+                'rewrites' => [],
               )
-            }
+            end
 
-            it { 
+            it {
               is_expected.to compile
               is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
-            }            
+            }
           end
           context 'empty rewrites_with_rewrite_inherit' do
-            let(:params) {
+            let(:params) do
               super().merge(
                 'rewrite_inherit' => true,
-                'rewrites' => []
+                'rewrites' => [],
               )
-            }
-  
+            end
+
             it {
               is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
                 content: %r{^\s+RewriteOptions Inherit$},

From 632a969d4b45337ab102ea840f485b7dfd2d300c Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 9 Sep 2022 10:57:12 +0100
Subject: [PATCH 2011/2267] (maint) Add variable manage_vhost_enable_dir

Additional variable added at request of community to allow for `vhost_enable_dir` to be disabled on Debian systems.
Due to the way in which aid variable inherits from the params manifest, simply setting it to `undef` does not work as when this is done it's logic assumes it should inherit from the default params value.
---
 manifests/init.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 02f51dc7a3..361d0d77a3 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -439,8 +439,11 @@
 #   Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.
 # 
 # @param vhost_enable_dir
-#   Set's whether the vhost definitions will be stored in sites-availible and if
+#   Set's the vhost definitions which will be stored in sites-availible and if
 #   they will be symlinked to and from sites-enabled.
+# 
+# @param manage_vhost_enable_dir
+#   Overides the vhost_enable_dir inherited parameters and allows it to be disabled
 #
 # @param mod_enable_dir
 #   Set's whether the mods-enabled directory should be managed.
@@ -500,6 +503,7 @@
   Optional[Stdlib::Absolutepath] $conf_enabled                               = $apache::params::conf_enabled,
   Stdlib::Absolutepath $vhost_dir                                            = $apache::params::vhost_dir,
   Optional[Stdlib::Absolutepath] $vhost_enable_dir                           = $apache::params::vhost_enable_dir,
+  Boolean $manage_vhost_enable_dir                                           = true,
   Hash $mod_libs                                                             = $apache::params::mod_libs,
   Hash $mod_packages                                                         = $apache::params::mod_packages,
   String $vhost_include_pattern                                              = $apache::params::vhost_include_pattern,
@@ -703,7 +707,7 @@
     }
   }
 
-  if $vhost_enable_dir and ! defined(File[$vhost_enable_dir]) {
+  if $vhost_enable_dir and ! defined(File[$vhost_enable_dir]) and $manage_vhost_enable_dir {
     $vhost_load_dir = $vhost_enable_dir
     exec { "mkdir ${vhost_load_dir}":
       creates => $vhost_load_dir,

From a0d18a87331cdc2828c6afdd70093b9933d61f51 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:37:11 +0000
Subject: [PATCH 2012/2267] Release prep v8.2.0

---
 CHANGELOG.md  | 17 ++++++++++++
 REFERENCE.md  | 73 ++++++++++++++++++++++++++++++++++++++++++++++++---
 metadata.json |  2 +-
 3 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index feec528821..5b3a318a56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v8.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.0) (2022-09-13)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.1.0...v8.2.0)
+
+### Added
+
+- Allow RewriteInherit with empty rewrites [\#2301](https://github.com/puppetlabs/puppetlabs-apache/pull/2301) ([martin-koerner](https://github.com/martin-koerner))
+- Add support for all proxy schemes, not just https:// [\#2289](https://github.com/puppetlabs/puppetlabs-apache/pull/2289) ([canth1](https://github.com/canth1))
+- Parameterize CRS DOS protection [\#2280](https://github.com/puppetlabs/puppetlabs-apache/pull/2280) ([Vincevrp](https://github.com/Vincevrp))
+- Allow multiple scopes for Scope in Apache::OIDCSettings [\#2265](https://github.com/puppetlabs/puppetlabs-apache/pull/2265) ([jjackzhn](https://github.com/jjackzhn))
+
+### Fixed
+
+- \(maint\) Add variable manage\_vhost\_enable\_dir [\#2309](https://github.com/puppetlabs/puppetlabs-apache/pull/2309) ([david22swan](https://github.com/david22swan))
+- Simplify the logic in \_require.erb [\#2303](https://github.com/puppetlabs/puppetlabs-apache/pull/2303) ([ekohl](https://github.com/ekohl))
+- Fix deprecation warning about performing a regex comparison on a hash [\#2293](https://github.com/puppetlabs/puppetlabs-apache/pull/2293) ([smokris](https://github.com/smokris))
+
 ## [v8.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.1.0) (2022-08-18)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.0.0...v8.1.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 600e8e11de..167e7ff966 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -167,6 +167,7 @@ outside of the defaults.
 ### Data types
 
 * [`Apache::LogLevel`](#apacheloglevel): A string that conforms to the Apache `LogLevel` syntax.
+* [`Apache::ModProxyProtocol`](#apachemodproxyprotocol): Supported protocols / schemes by mod_proxy
 * [`Apache::OIDCSettings`](#apacheoidcsettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 * [`Apache::ServerTokens`](#apacheservertokens): A string that conforms to the Apache `ServerTokens` syntax.
 * [`Apache::Vhost::Priority`](#apachevhostpriority): The priority on vhost
@@ -283,6 +284,7 @@ The following parameters are available in the `apache` class:
 * [`purge_vdir`](#purge_vdir)
 * [`conf_enabled`](#conf_enabled)
 * [`vhost_enable_dir`](#vhost_enable_dir)
+* [`manage_vhost_enable_dir`](#manage_vhost_enable_dir)
 * [`mod_enable_dir`](#mod_enable_dir)
 * [`ssl_file`](#ssl_file)
 * [`file_e_tag`](#file_e_tag)
@@ -1123,11 +1125,19 @@ Default value: `$apache::params::conf_enabled`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
-Set's whether the vhost definitions will be stored in sites-availible and if
+Set's the vhost definitions which will be stored in sites-availible and if
 they will be symlinked to and from sites-enabled.
 
 Default value: `$apache::params::vhost_enable_dir`
 
+##### <a name="manage_vhost_enable_dir"></a>`manage_vhost_enable_dir`
+
+Data type: `Boolean`
+
+Overides the vhost_enable_dir inherited parameters and allows it to be disabled
+
+Default value: ``true``
+
 ##### <a name="mod_enable_dir"></a>`mod_enable_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
@@ -6032,6 +6042,8 @@ Installs and configures `mod_security`.
 * **See also**
   * https://github.com/SpiderLabs/ModSecurity/wiki
     * for additional documentation.
+  * https://coreruleset.org/docs/
+    * for addional documentation
 
 #### Parameters
 
@@ -6071,6 +6083,10 @@ The following parameters are available in the `apache::mod::security` class:
 * [`secrequestbodyaccess`](#secrequestbodyaccess)
 * [`secresponsebodyaccess`](#secresponsebodyaccess)
 * [`manage_security_crs`](#manage_security_crs)
+* [`enable_dos_protection`](#enable_dos_protection)
+* [`dos_burst_time_slice`](#dos_burst_time_slice)
+* [`dos_counter_threshold`](#dos_counter_threshold)
+* [`dos_block_timeout`](#dos_block_timeout)
 
 ##### <a name="version"></a>`version`
 
@@ -6347,6 +6363,42 @@ Toggles whether to manage ModSecurity Core Rule Set
 
 Default value: ``true``
 
+##### <a name="enable_dos_protection"></a>`enable_dos_protection`
+
+Data type: `Boolean`
+
+Toggles the optional OWASP ModSecurity Core Rule Set DOS protection rule
+(rule id 900700)
+
+Default value: ``true``
+
+##### <a name="dos_burst_time_slice"></a>`dos_burst_time_slice`
+
+Data type: `Integer[1, default]`
+
+Configures time in which a burst is measured for the OWASP ModSecurity Core Rule Set DOS protection rule
+(rule id 900700)
+
+Default value: `60`
+
+##### <a name="dos_counter_threshold"></a>`dos_counter_threshold`
+
+Data type: `Integer[1, default]`
+
+Configures the amount of requests that can be made within dos_burst_time_slice before it is considered a burst in
+the OWASP ModSecurity Core Rule Set DOS protection rule (rule id 900700)
+
+Default value: `100`
+
+##### <a name="dos_block_timeout"></a>`dos_block_timeout`
+
+Data type: `Integer[1, default]`
+
+Configures how long the client should be blocked when the dos_counter_threshold is exceeded in the OWASP
+ModSecurity Core Rule Set DOS protection rule (rule id 900700)
+
+Default value: `600`
+
 ### <a name="apachemodsetenvif"></a>`apache::mod::setenvif`
 
 Installs `mod_setenvif`.
@@ -7288,7 +7340,7 @@ resource). This must match up with a declared apache::balancer resource.
 
 ##### <a name="url"></a>`url`
 
-Data type: `Stdlib::HTTPUrl`
+Data type: `Apache::ModProxyProtocol`
 
 The url used to contact the balancer member server.
 
@@ -11336,6 +11388,19 @@ Alias of
 Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
 ```
 
+### <a name="apachemodproxyprotocol"></a>`Apache::ModProxyProtocol`
+
+Supported protocols / schemes by mod_proxy
+
+* **See also**
+  * https://httpd.apache.org/docs/2.4/mod/mod_proxy.html
+
+Alias of
+
+```puppet
+Pattern[/(\A(ajp|fcgi|ftp|h2c?|https?|scgi|uwsgi|wss?):\/\/.+\z)/, /(\Aunix:\/([^\n\/\0]+\/*)*\z)/]
+```
+
 ### <a name="apacheoidcsettings"></a>`Apache::OIDCSettings`
 
 https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
@@ -11360,7 +11425,7 @@ Struct[{
     Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderBackChannelLogoutSupported']      => Enum['On', 'Off'],
     Optional['ProviderRegistrationEndpointJson']        => String,
-    Optional['Scope']                                   => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
+    Optional['Scope']                                   => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['SSLValidateServer']                       => Enum['On', 'Off'],
     Optional['UserInfoRefreshInterval']                 => Integer,
@@ -11426,7 +11491,7 @@ Struct[{
     Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
     Optional['HTMLErrorTemplate']                       => String,
     Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
-    Optional['PathScope']                               => Pattern[/^[A-Za-z0-9\-\._\s]+$/],
+    Optional['PathScope']                               => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['PathAuthRequestParams']                   => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['IDTokenIatSlack']                         => Integer,
     Optional['ClaimPrefix']                             => String,
diff --git a/metadata.json b/metadata.json
index 857ec4d146..d24f84e355 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From d9ba8d33f8df53237f7d6ebdfbea617bb931273f Mon Sep 17 00:00:00 2001
From: bovy89 <bovy89@gmail.com>
Date: Tue, 13 Sep 2022 11:18:57 +0200
Subject: [PATCH 2013/2267] fix directory empty options if an empty array is
 being used

Signed-off-by: bovy89 <bovy89@gmail.com>
---
 spec/acceptance/vhost_spec.rb    | 8 ++++++++
 templates/vhost/_directories.erb | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 109dc9da81..e3b5f3883d 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -859,6 +859,10 @@ class { 'apache': }
         docroot    => '/tmp',
         options    => ['Indexes','FollowSymLinks', 'ExecCGI'],
       }
+      apache::vhost { 'test.empty_options':
+        docroot    => '/tmp',
+        options    => [],
+      }
     MANIFEST
     it 'applies cleanly' do
       apply_manifest(pp, catch_failures: true)
@@ -949,6 +953,10 @@ class { 'apache': }
       it { is_expected.to be_file }
       it { is_expected.to contain 'Options Indexes FollowSymLinks ExecCGI' }
     end
+    describe file("#{apache_hash['vhost_dir']}/25-test.empty_options.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.not_to contain 'Options' }
+    end
   end
 
   context 'when a manifest defines $servername' do
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index b33301023c..137ef7eabc 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -37,7 +37,7 @@
     <%- if ! directory['geoip_enable'].nil? -%>
     GeoIPEnable <%= scope.call_function('apache::bool2httpd', [directory['geoip_enable']]) %>
     <%- end -%>
-    <%- if directory['options'] -%>
+    <%- if directory['options'] && Array(directory['options']).any? -%>
     Options <%= Array(directory['options']).join(' ') %>
     <%- end -%>
     <%- if provider == 'Directory' -%>

From 01099a710268e4c1ae5c85dd6f0779e1646a4e74 Mon Sep 17 00:00:00 2001
From: John Doe <john.doe@puppet.com>
Date: Wed, 14 Sep 2022 13:39:58 +0100
Subject: [PATCH 2014/2267] (MAINT) Refactoring OSs based on puppet agent docs

Prior to this commit the metadata.json file for this module listed OSs that are not supported by puppet agent as supported.
This commit aims to refactor the metadata.json file to only list OSs that are supported by puppet agent.

The list of supported OSs can be found here:
https://puppet.com/docs/pe/2021.7/supported_operating_systems.html
---
 metadata.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index d24f84e355..7a14657a9e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -30,8 +30,7 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
-        "8"
+        "7"
       ]
     },
     {

From 314d5fbae179b68d6b20321cc5d1681493cb3c8a Mon Sep 17 00:00:00 2001
From: jordanbreenpuppet <112936862+jordanbreenpuppet@users.noreply.github.com>
Date: Tue, 20 Sep 2022 14:48:43 +0100
Subject: [PATCH 2015/2267] Revert "(MAINT) Removing support for CentOS 8"

---
 metadata.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 7a14657a9e..d24f84e355 100644
--- a/metadata.json
+++ b/metadata.json
@@ -30,7 +30,8 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {

From 419078920b03900979e3d4b6a893c55f17a03b56 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 13 Sep 2022 17:28:55 +0100
Subject: [PATCH 2016/2267] (maint) Codebase Hardening

Changes made to ensure that no malformed commands are passed through to the system.
---
 manifests/custom_config.pp           |  5 +++--
 manifests/init.pp                    | 10 ++++++++++
 manifests/mpm/disable_mpm_event.pp   | 19 ++++++++++++++-----
 manifests/mpm/disable_mpm_prefork.pp |  5 ++++-
 manifests/mpm/disable_mpm_worker.pp  |  5 ++++-
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 8c9e6ebb84..ab0ff1e2a6 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -115,9 +115,10 @@
       require     => Anchor['::apache::modules_set_up'],
     }
 
+    $remove_command = ['/bin/rm', shell_escape(join([$confdir, $_filename], '/'))]
     exec { "remove ${name} if invalid":
-      command     => "/bin/rm ${confdir}/${_filename}",
-      unless      => $verify_command,
+      command     => $remove_command,
+      unless      => [$verify_command],
       subscribe   => File["apache_${name}"],
       refreshonly => true,
     }
diff --git a/manifests/init.pp b/manifests/init.pp
index 361d0d77a3..50155fa885 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -635,7 +635,9 @@
     path => '/bin:/sbin:/usr/bin:/usr/sbin',
   }
 
+  $confd_command = ['mkdir', $confd_dir]
   exec { "mkdir ${confd_dir}":
+    command => $confd_command,
     creates => $confd_dir,
     require => Package['httpd'],
   }
@@ -660,7 +662,9 @@
   }
 
   if ! defined(File[$mod_dir]) {
+    $mod_command = ['mkdir', $mod_dir]
     exec { "mkdir ${mod_dir}":
+      command => $mod_command,
       creates => $mod_dir,
       require => Package['httpd'],
     }
@@ -678,7 +682,9 @@
 
   if $mod_enable_dir and ! defined(File[$mod_enable_dir]) {
     $mod_load_dir = $mod_enable_dir
+    $mod_enable_command = ['mkdir', $mod_enable_dir]
     exec { "mkdir ${mod_enable_dir}":
+      command => $mod_enable_command,
       creates => $mod_enable_dir,
       require => Package['httpd'],
     }
@@ -694,7 +700,9 @@
   }
 
   if ! defined(File[$vhost_dir]) {
+    $vhost_command = ['mkdir', $vhost_dir]
     exec { "mkdir ${vhost_dir}":
+      command => $vhost_command,
       creates => $vhost_dir,
       require => Package['httpd'],
     }
@@ -709,7 +717,9 @@
 
   if $vhost_enable_dir and ! defined(File[$vhost_enable_dir]) and $manage_vhost_enable_dir {
     $vhost_load_dir = $vhost_enable_dir
+    $vhost_load_command = ['mkdir', $vhost_load_dir]
     exec { "mkdir ${vhost_load_dir}":
+      command => $vhost_load_command,
       creates => $vhost_load_dir,
       require => Package['httpd'],
     }
diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
index 7aee630507..90a4829e18 100644
--- a/manifests/mpm/disable_mpm_event.pp
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -1,19 +1,28 @@
 # @summary disable Apache-Module event
 class apache::mpm::disable_mpm_event {
+  $event_command = ['/usr/sbin/a2dismod', 'event']
+  $event_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event.load'],'/'))]
   exec { '/usr/sbin/a2dismod event':
-    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/event.load",
+    command => $event_command,
+    onlyif  => $event_onlyif,
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
+
+  $event_load_command = ['/bin/rm', shell_escape(join([$apache::mod_enable_dir, 'event_event.load'],'/'))]
+  $event_load_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event_event.load'],'/'))]
   exec { 'remove distribution event load file':
-    command => "/bin/rm ${apache::mod_enable_dir}/mpm_event.load",
-    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.load",
+    command => $event_load_command,
+    onlyif  => $event_load_onlyif,
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
+
+  $event_conf_command = ['/bin/rm', shell_escape(join([$apache::mod_enable_dir, 'event_event.conf'],'/'))]
+  $event_conf_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event_event.conf'],'/'))]
   exec { 'remove distribution event conf file':
-    command => "/bin/rm ${apache::mod_enable_dir}/mpm_event.conf",
-    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/mpm_event.conf",
+    command => $event_conf_command,
+    onlyif  => $event_conf_onlyif,
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
diff --git a/manifests/mpm/disable_mpm_prefork.pp b/manifests/mpm/disable_mpm_prefork.pp
index 9653b831cc..f79d76d0a4 100644
--- a/manifests/mpm/disable_mpm_prefork.pp
+++ b/manifests/mpm/disable_mpm_prefork.pp
@@ -1,7 +1,10 @@
 # @summary disable Apache-Module prefork
 class apache::mpm::disable_mpm_prefork {
+  $prefork_command = ['/usr/sbin/a2dismod', 'prefork']
+  $prefork_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'prefork.load'],'/'))]
   exec { '/usr/sbin/a2dismod prefork':
-    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/prefork.load",
+    command => $prefork_command,
+    onlyif  => $prefork_onlyif,
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
diff --git a/manifests/mpm/disable_mpm_worker.pp b/manifests/mpm/disable_mpm_worker.pp
index 6b7411d1de..1f7cd875d8 100644
--- a/manifests/mpm/disable_mpm_worker.pp
+++ b/manifests/mpm/disable_mpm_worker.pp
@@ -1,7 +1,10 @@
 # @summary disable Apache-Module worker
 class apache::mpm::disable_mpm_worker {
+  $worker_command = ['/usr/sbin/a2dismod', 'worker']
+  $worker_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'worker.load'],'/'))]
   exec { '/usr/sbin/a2dismod worker':
-    onlyif  => "/usr/bin/test -e ${apache::mod_enable_dir}/worker.load",
+    command => $worker_command,
+    onlyif  => $worker_onlyif,
     require => Package['httpd'],
     before  => Class['apache::service'],
   }

From 2dc32cc3d5d13e1f78f034befcc60bec15e98af6 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 14 Sep 2022 16:10:58 +0100
Subject: [PATCH 2017/2267] (maint) Corrective changes

- Fixes made to spec tests
- onlyif commands corrected
- remove unnecessary shell_escapes
- variable used in place of replicated assignment
- $_file_path neatened
---
 manifests/custom_config.pp           |  5 +++--
 manifests/mpm/disable_mpm_event.pp   | 10 +++++-----
 manifests/mpm/disable_mpm_prefork.pp |  2 +-
 manifests/mpm/disable_mpm_worker.pp  |  2 +-
 spec/defines/custom_config_spec.rb   |  8 ++++----
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index ab0ff1e2a6..47e924dbbd 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -90,11 +90,12 @@
     $notifies = undef
   }
 
+  $_file_path = "${confdir}/${_filename}"
   $_file_mode = pick($file_mode, $apache::file_mode)
 
   file { "apache_${name}":
     ensure    => $ensure,
-    path      => "${confdir}/${_filename}",
+    path      => $_file_path,
     owner     => $owner,
     group     => $group,
     mode      => $_file_mode,
@@ -115,7 +116,7 @@
       require     => Anchor['::apache::modules_set_up'],
     }
 
-    $remove_command = ['/bin/rm', shell_escape(join([$confdir, $_filename], '/'))]
+    $remove_command = ['/bin/rm', $_file_path]
     exec { "remove ${name} if invalid":
       command     => $remove_command,
       unless      => [$verify_command],
diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
index 90a4829e18..7e85b02667 100644
--- a/manifests/mpm/disable_mpm_event.pp
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -1,7 +1,7 @@
 # @summary disable Apache-Module event
 class apache::mpm::disable_mpm_event {
   $event_command = ['/usr/sbin/a2dismod', 'event']
-  $event_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event.load'],'/'))]
+  $event_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event.load'],'/')]]
   exec { '/usr/sbin/a2dismod event':
     command => $event_command,
     onlyif  => $event_onlyif,
@@ -9,8 +9,8 @@
     before  => Class['apache::service'],
   }
 
-  $event_load_command = ['/bin/rm', shell_escape(join([$apache::mod_enable_dir, 'event_event.load'],'/'))]
-  $event_load_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event_event.load'],'/'))]
+  $event_load_command = ['/bin/rm', join([$apache::mod_enable_dir, 'event_event.load'],'/')]
+  $event_load_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event_event.load'],'/')]]
   exec { 'remove distribution event load file':
     command => $event_load_command,
     onlyif  => $event_load_onlyif,
@@ -18,8 +18,8 @@
     before  => Class['apache::service'],
   }
 
-  $event_conf_command = ['/bin/rm', shell_escape(join([$apache::mod_enable_dir, 'event_event.conf'],'/'))]
-  $event_conf_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event_event.conf'],'/'))]
+  $event_conf_command = ['/bin/rm', join([$apache::mod_enable_dir, 'event_event.conf'],'/')]
+  $event_conf_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event_event.conf'],'/')]]
   exec { 'remove distribution event conf file':
     command => $event_conf_command,
     onlyif  => $event_conf_onlyif,
diff --git a/manifests/mpm/disable_mpm_prefork.pp b/manifests/mpm/disable_mpm_prefork.pp
index f79d76d0a4..1488276915 100644
--- a/manifests/mpm/disable_mpm_prefork.pp
+++ b/manifests/mpm/disable_mpm_prefork.pp
@@ -1,7 +1,7 @@
 # @summary disable Apache-Module prefork
 class apache::mpm::disable_mpm_prefork {
   $prefork_command = ['/usr/sbin/a2dismod', 'prefork']
-  $prefork_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'prefork.load'],'/'))]
+  $prefork_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'prefork.load'],'/')]]
   exec { '/usr/sbin/a2dismod prefork':
     command => $prefork_command,
     onlyif  => $prefork_onlyif,
diff --git a/manifests/mpm/disable_mpm_worker.pp b/manifests/mpm/disable_mpm_worker.pp
index 1f7cd875d8..7da4a92ace 100644
--- a/manifests/mpm/disable_mpm_worker.pp
+++ b/manifests/mpm/disable_mpm_worker.pp
@@ -1,7 +1,7 @@
 # @summary disable Apache-Module worker
 class apache::mpm::disable_mpm_worker {
   $worker_command = ['/usr/sbin/a2dismod', 'worker']
-  $worker_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'worker.load'],'/'))]
+  $worker_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'worker.load'],'/')]]
   exec { '/usr/sbin/a2dismod worker':
     command => $worker_command,
     onlyif  => $worker_onlyif,
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index c10564a3e3..3235753a1e 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -21,14 +21,14 @@
 
     it {
       is_expected.to contain_exec('syntax verification for rspec')
-        .with('refreshonly' => 'true', 'command' => '/usr/sbin/apachectl -t')
+        .with('refreshonly' => 'true', 'command' => ['/usr/sbin/apachectl -t'])
         .that_subscribes_to('File[apache_rspec]')
         .that_notifies('Class[Apache::Service]')
         .that_comes_before('Exec[remove rspec if invalid]')
     }
     it {
       is_expected.to contain_exec('remove rspec if invalid')
-        .with('unless' => '/usr/sbin/apachectl -t', 'refreshonly' => 'true')
+        .with('unless' => ['/usr/sbin/apachectl -t'], 'refreshonly' => 'true')
         .that_subscribes_to('File[apache_rspec]')
     }
     it {
@@ -51,8 +51,8 @@
       is_expected.to contain_exec('syntax verification for rspec').with('command' => '/bin/true')
     }
     it {
-      is_expected.to contain_exec('remove rspec if invalid').with('command' => '/bin/rm /dne/30-rspec.conf',
-                                                                  'unless' => '/bin/true')
+      is_expected.to contain_exec('remove rspec if invalid').with('command' => ['/bin/rm', '/dne/30-rspec.conf'],
+                                                                  'unless' => ['/bin/true'])
     }
     it {
       is_expected.to contain_file('apache_rspec')

From a565ea97609979f7ccbc407534a553def0e865d8 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 20 Sep 2022 16:45:02 +0100
Subject: [PATCH 2018/2267] (maint) Update $verify_command type

The unless variable in an exec manifest, which $verify_command is directly passed too, accepts either an Array or and Array of Arrays as input.
Updating the variables type and default values to match this.
In the case where it is passed a String it proceeds to wrap it in an Array and then treat it as such.
---
 manifests/custom_config.pp         | 27 +++++++++++++++------------
 manifests/params.pp                |  8 ++++----
 spec/defines/custom_config_spec.rb | 10 +++++-----
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index 47e924dbbd..edc8630f77 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -32,6 +32,9 @@
 #   This parameter is used only if the `verify_config` parameter's value is `true`. If the 
 #   `verify_command` fails, the Puppet run deletes the configuration file and raises an error, 
 #   but does not notify the Apache service.
+#   Command can be passed through as either a String, i.e. `'/usr/sbin/apache2ctl -t'`
+#   An array, i.e. `['/usr/sbin/apache2ctl', '-t']`
+#   Or an array of arrays with each one having to pass succesfully, i.e. `[['/usr/sbin/apache2ctl', '-t'], '/usr/sbin/apache2ctl -t']`
 #
 # @param verify_config
 #   Specifies whether to validate the configuration file before notifying the Apache service.
@@ -49,18 +52,18 @@
 #   show_diff property for configuration file resource
 #
 define apache::custom_config (
-  Enum['absent', 'present'] $ensure     = 'present',
-  Stdlib::Absolutepath $confdir         = $apache::confd_dir,
-  Optional[String] $content             = undef,
-  Apache::Vhost::Priority $priority     = 25,
-  Optional[String] $source              = undef,
-  String $verify_command                = $apache::params::verify_command,
-  Boolean $verify_config                = true,
-  Optional[String] $filename            = undef,
-  Optional[String] $owner               = undef,
-  Optional[String] $group               = undef,
-  Optional[Stdlib::Filemode] $file_mode = undef,
-  Boolean $show_diff                    = true,
+  Enum['absent', 'present'] $ensure                                    = 'present',
+  Stdlib::Absolutepath $confdir                                        = $apache::confd_dir,
+  Optional[String] $content                                            = undef,
+  Apache::Vhost::Priority $priority                                    = 25,
+  Optional[String] $source                                             = undef,
+  Variant[String, Array[String], Array[Array[String]]] $verify_command = $apache::params::verify_command,
+  Boolean $verify_config                                               = true,
+  Optional[String] $filename                                           = undef,
+  Optional[String] $owner                                              = undef,
+  Optional[String] $group                                              = undef,
+  Optional[Stdlib::Filemode] $file_mode                                = undef,
+  Boolean $show_diff                                                   = true,
 ) {
   if $content and $source {
     fail('Only one of $content and $source can be specified.')
diff --git a/manifests/params.pp b/manifests/params.pp
index 90fb7b57c3..1a3a4fc21a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -713,13 +713,13 @@
   }
 
   if $facts['os']['name'] == 'SLES' {
-    $verify_command = '/usr/sbin/apache2ctl -t'
+    $verify_command = ['/usr/sbin/apache2ctl', '-t']
   } elsif $facts['os']['name'] == 'FreeBSD' {
-    $verify_command = '/usr/local/sbin/apachectl -t'
+    $verify_command = ['/usr/local/sbin/apachectl', '-t']
   } elsif ($apache::version::scl_httpd_version) {
-    $verify_command = "/opt/rh/${_scl_httpd_name}/root/usr/sbin/apachectl -t"
+    $verify_command = ["/opt/rh/${_scl_httpd_name}/root/usr/sbin/apachectl", '-t']
   } else {
-    $verify_command = '/usr/sbin/apachectl -t'
+    $verify_command = ['/usr/sbin/apachectl', '-t']
   }
 
   if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') >= 0 {
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 3235753a1e..9963d6bd2c 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -21,14 +21,14 @@
 
     it {
       is_expected.to contain_exec('syntax verification for rspec')
-        .with('refreshonly' => 'true', 'command' => ['/usr/sbin/apachectl -t'])
+        .with('refreshonly' => 'true', 'command' => ['/usr/sbin/apachectl', '-t'])
         .that_subscribes_to('File[apache_rspec]')
         .that_notifies('Class[Apache::Service]')
         .that_comes_before('Exec[remove rspec if invalid]')
     }
     it {
       is_expected.to contain_exec('remove rspec if invalid')
-        .with('unless' => ['/usr/sbin/apachectl -t'], 'refreshonly' => 'true')
+        .with('unless' => [['/usr/sbin/apachectl', '-t']], 'refreshonly' => 'true')
         .that_subscribes_to('File[apache_rspec]')
     }
     it {
@@ -43,16 +43,16 @@
         'confdir'        => '/dne',
         'priority'       => 30,
         'source'         => 'puppet:///modules/apache/test',
-        'verify_command' => '/bin/true',
+        'verify_command' => ['/bin/true'],
       }
     end
 
     it {
-      is_expected.to contain_exec('syntax verification for rspec').with('command' => '/bin/true')
+      is_expected.to contain_exec('syntax verification for rspec').with('command' => ['/bin/true'])
     }
     it {
       is_expected.to contain_exec('remove rspec if invalid').with('command' => ['/bin/rm', '/dne/30-rspec.conf'],
-                                                                  'unless' => ['/bin/true'])
+                                                                  'unless' => [['/bin/true']])
     }
     it {
       is_expected.to contain_file('apache_rspec')

From 956889e738945492c4c35e42890587f09625bd96 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Mon, 26 Sep 2022 17:57:17 +0000
Subject: [PATCH 2019/2267] Release prep v8.2.1

---
 CHANGELOG.md  | 9 +++++++++
 REFERENCE.md  | 5 ++++-
 metadata.json | 2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b3a318a56..80df5663a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v8.2.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.1) (2022-09-26)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.2.0...v8.2.1)
+
+### Fixed
+
+- \(MAINT\) Removing support for CentOS 8 [\#2314](https://github.com/puppetlabs/puppetlabs-apache/pull/2314) ([jordanbreen28](https://github.com/jordanbreen28))
+- \(maint\) Codebase Hardening [\#2313](https://github.com/puppetlabs/puppetlabs-apache/pull/2313) ([david22swan](https://github.com/david22swan))
+
 ## [v8.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.0) (2022-09-13)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.1.0...v8.2.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 167e7ff966..509712b5a1 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -7431,13 +7431,16 @@ Default value: ``undef``
 
 ##### <a name="verify_command"></a>`verify_command`
 
-Data type: `String`
+Data type: `Variant[String, Array[String], Array[Array[String]]]`
 
 Specifies the command Puppet uses to verify the configuration file. Use a fully qualified
 command.<br />
 This parameter is used only if the `verify_config` parameter's value is `true`. If the
 `verify_command` fails, the Puppet run deletes the configuration file and raises an error,
 but does not notify the Apache service.
+Command can be passed through as either a String, i.e. `'/usr/sbin/apache2ctl -t'`
+An array, i.e. `['/usr/sbin/apache2ctl', '-t']`
+Or an array of arrays with each one having to pass succesfully, i.e. `[['/usr/sbin/apache2ctl', '-t'], '/usr/sbin/apache2ctl -t']`
 
 Default value: `$apache::params::verify_command`
 
diff --git a/metadata.json b/metadata.json
index d24f84e355..3a690c55c1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 42bc295ad7e6c56f05b58e70771249ac9299f6eb Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 27 Sep 2022 10:45:27 +0100
Subject: [PATCH 2020/2267] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80df5663a2..eee7150a66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- \(MAINT\) Removing support for CentOS 8 [\#2314](https://github.com/puppetlabs/puppetlabs-apache/pull/2314) ([jordanbreen28](https://github.com/jordanbreen28))
 - \(maint\) Codebase Hardening [\#2313](https://github.com/puppetlabs/puppetlabs-apache/pull/2313) ([david22swan](https://github.com/david22swan))
 
 ## [v8.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.0) (2022-09-13)

From 9e5b88ddc7d3b2bc6530364b0569abd64595c3ed Mon Sep 17 00:00:00 2001
From: jordanbreen28 <jordan.breen@perforce.com>
Date: Wed, 5 Oct 2022 10:03:43 +0100
Subject: [PATCH 2021/2267] Dropping Debian 9 Support

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 3a690c55c1..790026b113 100644
--- a/metadata.json
+++ b/metadata.json
@@ -51,7 +51,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9",
         "10",
         "11"
       ]

From f1ace962c967731b7becd535a1dcbace8aabb937 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 6 Oct 2022 09:52:38 +0100
Subject: [PATCH 2022/2267] (PDKSync) Removal of puppet_module_gems

---
 Gemfile       | 33 +++++++++++++++++++--------------
 Rakefile      |  1 +
 metadata.json |  4 ++--
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index a9c4bb530f..26dd2db9ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,23 +13,28 @@ def location_for(place_or_version, fake_version = nil)
   end
 end
 
-ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
-minor_version = ruby_version_segments[0..1].join('.')
-
 group :development do
-  gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "voxpupuli-puppet-lint-plugins", '>= 3.0',                 require: false
-  gem "github_changelog_generator",                              require: false
+  gem "json", '~> 2.0',                                require: false
+  gem "voxpupuli-puppet-lint-plugins", '~> 3.0',       require: false
+  gem "facterdb", '~> 1.18',                           require: false
+  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0',     require: false
+  gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
+  gem "rspec-puppet-facts", '~> 2.0',                  require: false
+  gem "codecov", '~> 0.2',                             require: false
+  gem "dependency_checker", '~> 0.2',                  require: false
+  gem "parallel_tests", '~> 3.4',                      require: false
+  gem "pry", '~> 0.10',                                require: false
+  gem "simplecov-console", '~> 0.5',                   require: false
+  gem "puppet-debugger", '~> 1.0',                     require: false
+  gem "rubocop", '= 1.6.1',                            require: false
+  gem "rubocop-performance", '= 1.9.1',                require: false
+  gem "rubocop-rspec", '= 2.0.1',                      require: false
+  gem "rb-readline", '= 0.5.5',                        require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator",                    require: false
 end
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
-  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
+  gem "serverspec", '~> 2.41',    require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index a959c34a12..47ff253418 100644
--- a/Rakefile
+++ b/Rakefile
@@ -43,6 +43,7 @@ end
 
 PuppetLint.configuration.send('disable_relative')
 PuppetLint.configuration.send('disable_anchor_resource')
+PuppetLint.configuration.send('disable_140chars')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
diff --git a/metadata.json b/metadata.json
index 790026b113..b75d340784 100644
--- a/metadata.json
+++ b/metadata.json
@@ -90,7 +90,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "2.4.0",
+  "pdk-version": "2.5.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "2.5.0-0-g369d483"
+  "template-ref": "tags/2.6.0-0-gd0490b9"
 }

From 787dae31d2681b392d0bee3fdb80265883f4dc06 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 7 Oct 2022 10:00:44 +0100
Subject: [PATCH 2023/2267] (CONT-189) Remove support for RedHat6

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index b75d340784..d15913f6d8 100644
--- a/metadata.json
+++ b/metadata.json
@@ -21,7 +21,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8",
         "9"

From 89b795c0b83b95cad6b0b30cf4fb4ae0d191b3af Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 7 Oct 2022 10:01:54 +0100
Subject: [PATCH 2024/2267] (CONT-189) Remove support for OracleLinux6

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index d15913f6d8..de02633b9f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -36,7 +36,6 @@
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "6",
         "7"
       ]
     },

From 7feab0903e0d8f728c098dd75fa527edeeecd66b Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 7 Oct 2022 10:02:36 +0100
Subject: [PATCH 2025/2267] (CONT-189) Remove support for Scientific6

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index de02633b9f..ea786eacde 100644
--- a/metadata.json
+++ b/metadata.json
@@ -42,7 +42,6 @@
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "6",
         "7"
       ]
     },

From 359a589d82b3e2fd2aa3789ac4cd2b770c7b63b4 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 7 Oct 2022 15:31:26 +0100
Subject: [PATCH 2026/2267] (CONT-189) Remove RHEL 6 from Spec tests

---
 spec/classes/apache_spec.rb                   |  2 +-
 spec/classes/mod/alias_spec.rb                |  6 --
 spec/classes/mod/auth_cas_spec.rb             |  8 +--
 spec/classes/mod/auth_gssapi_spec.rb          |  2 +-
 spec/classes/mod/auth_kerb_spec.rb            |  4 +-
 spec/classes/mod/auth_mellon_spec.rb          |  4 +-
 spec/classes/mod/auth_openidc_spec.rb         |  2 +-
 spec/classes/mod/authn_dbd_spec.rb            |  4 +-
 spec/classes/mod/cluster_spec.rb              | 23 -------
 spec/classes/mod/dav_svn_spec.rb              |  2 +-
 spec/classes/mod/deflate_spec.rb              |  4 +-
 spec/classes/mod/dev_spec.rb                  |  2 +-
 spec/classes/mod/dir_spec.rb                  |  2 +-
 spec/classes/mod/disk_cache_spec.rb           |  4 +-
 spec/classes/mod/event_spec.rb                |  6 +-
 spec/classes/mod/ext_filter_spec.rb           |  4 +-
 spec/classes/mod/fcgid_spec.rb                | 38 -----------
 spec/classes/mod/info_spec.rb                 | 68 +------------------
 .../classes/mod/intercept_form_submit_spec.rb |  2 +-
 spec/classes/mod/itk_spec.rb                  |  8 +--
 spec/classes/mod/jk_spec.rb                   |  6 +-
 spec/classes/mod/ldap_spec.rb                 |  2 +-
 spec/classes/mod/lookup_identity.rb           |  2 +-
 spec/classes/mod/mime_magic_spec.rb           |  4 +-
 spec/classes/mod/mime_spec.rb                 |  4 +-
 spec/classes/mod/pagespeed_spec.rb            |  2 +-
 spec/classes/mod/perl_spec.rb                 |  2 +-
 spec/classes/mod/prefork_spec.rb              | 14 ++--
 spec/classes/mod/proxy_balancer_spec.rb       |  2 +-
 spec/classes/mod/proxy_html_spec.rb           |  2 +-
 spec/classes/mod/python_spec.rb               |  6 +-
 spec/classes/mod/reqtimeout_spec.rb           |  2 +-
 spec/classes/mod/shib_spec.rb                 |  2 +-
 spec/classes/mod/speling_spec.rb              |  2 +-
 spec/classes/mod/ssl_spec.rb                  | 25 +------
 spec/classes/mod/status_spec.rb               | 29 ++------
 spec/classes/mod/worker_spec.rb               | 48 ++++++-------
 spec/classes/mod/wsgi_spec.rb                 | 12 +---
 spec/classes/vhosts_spec.rb                   |  2 +-
 spec/defines/mod_spec.rb                      |  4 +-
 spec/defines/vhost_custom_spec.rb             |  2 +-
 spec/spec_helper_local.rb                     |  4 --
 42 files changed, 94 insertions(+), 279 deletions(-)

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index dc27f1e5e3..4d392a1384 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -725,7 +725,7 @@
     }
   end
   context 'on all OSes' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'with a custom apache_name parameter' do
       let :params do
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 94f7bcc3b5..38d4207739 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -12,12 +12,6 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
     end
-    context 'on a RedHat 6-based OS', :compile do
-      include_examples 'RedHat 6'
-
-      it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/var\/www\/icons\/"}) }
-    end
     context 'on a RedHat 7-based OS', :compile do
       include_examples 'RedHat 7'
 
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index 720999f816..9d615e5a10 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -38,13 +38,13 @@
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_cas') }
       it { is_expected.to contain_package('mod_auth_cas') }
-      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
+      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.modules.d/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASTimeout 1234}) }
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
@@ -55,13 +55,13 @@
         "class { 'apache': } apache::vhost { 'test.server': docroot => '/var/www/html', cas_root_proxied_as => 'http://test.server', cas_cookie_path => '/my/cas/path'} "
       end
 
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_cas') }
       it { is_expected.to contain_package('mod_auth_cas') }
-      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
+      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.modules.d/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
       it {
         is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASRootProxiedAs http://test.server$})
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
index 1d07cbf178..3f67969747 100644
--- a/spec/classes/mod/auth_gssapi_spec.rb
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -15,7 +15,7 @@
       it { is_expected.to contain_package('libapache2-mod-auth-gssapi') }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 4ca48e7473..867a5b36d5 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -15,7 +15,7 @@
       it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
@@ -41,7 +41,7 @@
   end
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
       let :pre_condition do
         <<-MANIFEST
         include apache::params
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index 1c490ea6c2..ffeb0e6b58 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -36,13 +36,13 @@
     end
   end
   context 'default configuration with parameters on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_mellon') }
       it { is_expected.to contain_package('mod_auth_mellon') }
-      it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') }
+      it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.modules.d/auth_mellon.conf') }
       it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") }
     end
     describe 'with parameters' do
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index 4825783b00..24f6228731 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -50,7 +50,7 @@
   end
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
       let :pre_condition do
         <<-MANIFEST
         include apache::params
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
index 78674161fd..4dca262247 100644
--- a/spec/classes/mod/authn_dbd_spec.rb
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -32,12 +32,12 @@
     end
 
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('authn_dbd') }
       it { is_expected.to contain_apache__mod('dbd') }
-      it { is_expected.to contain_file('authn_dbd.conf').with_path('/etc/httpd/conf.d/authn_dbd.conf') }
+      it { is_expected.to contain_file('authn_dbd.conf').with_path('/etc/httpd/conf.modules.d/authn_dbd.conf') }
     end
   end
 end
diff --git a/spec/classes/mod/cluster_spec.rb b/spec/classes/mod/cluster_spec.rb
index bf2ac85bf0..88783d5fb4 100644
--- a/spec/classes/mod/cluster_spec.rb
+++ b/spec/classes/mod/cluster_spec.rb
@@ -48,27 +48,4 @@
 
     it { is_expected.to contain_file('cluster.conf') }
   end
-
-  context 'on a RedHat OS Release 6 with mod version < 1.3.0' do
-    include_examples 'RedHat 6'
-
-    let(:params) do
-      {
-        allowed_network: '172.17.0',
-        balancer_name: 'mycluster',
-        ip: '172.17.0.1',
-        version: '1.2.0',
-      }
-    end
-
-    it { is_expected.to contain_class('apache') }
-    it { is_expected.to contain_apache__mod('proxy') }
-    it { is_expected.to contain_apache__mod('proxy_ajp') }
-    it { is_expected.to contain_apache__mod('manager') }
-    it { is_expected.to contain_apache__mod('proxy_cluster') }
-    it { is_expected.to contain_apache__mod('advertise') }
-    it { is_expected.to contain_apache__mod('slotmem') }
-
-    it { is_expected.to contain_file('cluster.conf') }
-  end
 end
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index e30744e801..273c603d05 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -28,7 +28,7 @@
       end
     end
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 242ee2f25d..96ecaa0f82 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -53,12 +53,12 @@ def general_deflate_specs
     end
 
     context 'on a RedHat OS with default params' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       # Load the more generic tests for this context
       general_deflate_specs
 
-      it { is_expected.to contain_file('deflate.conf').with_path('/etc/httpd/conf.d/deflate.conf') }
+      it { is_expected.to contain_file('deflate.conf').with_path('/etc/httpd/conf.modules.d/deflate.conf') }
     end
 
     context 'On a FreeBSD OS with default params' do
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
index 53a61148c6..4df6caa9cd 100644
--- a/spec/classes/mod/dev_spec.rb
+++ b/spec/classes/mod/dev_spec.rb
@@ -11,7 +11,7 @@
 
   it_behaves_like 'a mod class, without including apache'
 
-  ['RedHat 6', 'Debian 11', 'FreeBSD 9'].each do |os|
+  ['RedHat 8', 'Debian 11', 'FreeBSD 9'].each do |os|
     context "on a #{os} OS" do
       include_examples os
 
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 9b9ccc3049..21df7e29cb 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::dir', type: :class do
-  ['Debian 11', 'RedHat 6', 'FreeBSD 9', 'Gentoo'].each do |os|
+  ['Debian 11', 'RedHat 8', 'FreeBSD 9', 'Gentoo'].each do |os|
     context "default configuration with parameters on #{os}" do
       include_examples os
 
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index dc0dc589cd..7164c424e8 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -102,8 +102,8 @@
     end
   end
 
-  context 'on a RedHat 6-based OS' do
-    include_examples 'RedHat 6'
+  context 'on a RedHat 8-based OS' do
+    include_examples 'RedHat 8'
 
     let(:params) do
       {
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 05d7b57bb8..4ef8179545 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -147,7 +147,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'with Apache version >= 2.4' do
       let :params do
@@ -160,10 +160,10 @@
       it { is_expected.not_to contain_apache__mod('worker') }
       it { is_expected.not_to contain_apache__mod('prefork') }
 
-      it { is_expected.to contain_file('/etc/httpd/conf.d/event.conf').with_ensure('file') }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/event.conf').with_ensure('file') }
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.d/event.load').with('ensure' => 'file',
+        is_expected.to contain_file('/etc/httpd/conf.modules.d/event.load').with('ensure' => 'file',
                                                                          'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
       }
     end
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index 7933211cb6..f75b87686c 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -22,7 +22,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('ext_filter') }
@@ -34,7 +34,7 @@
                                'filtB' => 'input=C cmd="C"' }  }
       end
 
-      it { is_expected.to contain_file('ext_filter.conf').with_path('/etc/httpd/conf.d/ext_filter.conf') }
+      it { is_expected.to contain_file('ext_filter.conf').with_path('/etc/httpd/conf.modules.d/ext_filter.conf') }
       it { is_expected.to contain_file('ext_filter.conf').with_content(%r{^ExtFilterDefine\s+filtA\s+input=A output=B$}) }
       it { is_expected.to contain_file('ext_filter.conf').with_content(%r{^ExtFilterDefine\s+filtB\s+input=C cmd="C"$}) }
     end
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index bc6e76dbc1..341a2d986e 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -15,44 +15,6 @@
     it { is_expected.to contain_package('libapache2-mod-fcgid') }
   end
 
-  context 'on a RHEL6' do
-    include_examples 'RedHat 6'
-
-    describe 'without parameters' do
-      it { is_expected.to contain_class('apache::params') }
-      it {
-        is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
-      }
-      it { is_expected.to contain_package('mod_fcgid') }
-    end
-
-    describe 'with parameters' do
-      let :params do
-        {
-          options: {
-            'FcgidIPCDir'               => '/var/run/fcgidsock',
-            'SharememPath'              => '/var/run/fcgid_shm',
-            'FcgidMinProcessesPerClass' => '0',
-            'AddHandler'                => 'fcgid-script .fcgi',
-          },
-        }
-      end
-
-      expected = [
-        '<IfModule mod_fcgid.c>',
-        '  AddHandler fcgid-script .fcgi',
-        '  FcgidIPCDir /var/run/fcgidsock',
-        '  FcgidMinProcessesPerClass 0',
-        '  SharememPath /var/run/fcgid_shm',
-        '</IfModule>',
-      ]
-      it 'contains the correct config' do
-        content = catalogue.resource('file', 'fcgid.conf').send(:parameters)[:content]
-        expect(content.split("\n").reject { |c| c =~ %r{(^#|^$)} }).to eq(expected)
-      end
-    end
-  end
-
   context 'on RHEL7' do
     include_examples 'RedHat 7'
 
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 2d85bc3007..4ced2ad674 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -2,68 +2,6 @@
 
 require 'spec_helper'
 
-# This function is called inside the OS specific contexts
-def general_info_specs_apache22
-  it { is_expected.to contain_apache__mod('info') }
-
-  context 'passing no parameters' do
-    expected = "<Location /server-info>\n"\
-               "    SetHandler server-info\n"\
-               "    Order deny,allow\n"\
-               "    Deny from all\n"\
-               "    Allow from 127.0.0.1\n"\
-               "    Allow from ::1\n"\
-               "</Location>\n"
-    it { is_expected.to contain_file('info.conf').with_content(expected) }
-  end
-  context 'passing restrict_access => false' do
-    let :params do
-      {
-        restrict_access: false,
-      }
-    end
-
-    it {
-      is_expected.to contain_file('info.conf').with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "</Location>\n",
-      )
-    }
-  end
-  context "passing allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']" do
-    let :params do
-      { allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'] }
-    end
-
-    expected = "<Location /server-info>\n"\
-               "    SetHandler server-info\n"\
-               "    Order deny,allow\n"\
-               "    Deny from all\n"\
-               "    Allow from 10.10.1.2\n"\
-               "    Allow from 192.168.1.2\n"\
-               "    Allow from 127.0.0.1\n"\
-               "</Location>\n"
-    it { is_expected.to contain_file('info.conf').with_content(expected) }
-  end
-  context 'passing both restrict_access and allow_from' do
-    let :params do
-      {
-        restrict_access: false,
-        allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'],
-      }
-    end
-
-    it {
-      is_expected.to contain_file('info.conf').with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "</Location>\n",
-      )
-    }
-  end
-end
-
 def general_info_specs_apache24
   it { is_expected.to contain_apache__mod('info') }
 
@@ -140,14 +78,14 @@ def general_info_specs_apache24
   end
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     # Load the more generic tests for this context
-    general_info_specs_apache22
+    general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
-                                                    path: '/etc/httpd/conf.d/info.conf')
+                                                    path: '/etc/httpd/conf.modules.d/info.conf')
     }
   end
 
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
index 651150fbc0..1618b138e5 100644
--- a/spec/classes/mod/intercept_form_submit_spec.rb
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -15,7 +15,7 @@
     end # Debian
 
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_intercept_form_submit') }
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 20819e9d75..f981e8310f 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -70,11 +70,11 @@
   end
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
-    it { is_expected.to contain_file('/etc/httpd/conf.d/itk.conf').with_ensure('file') }
+    it { is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.conf').with_ensure('file') }
     it { is_expected.to contain_package('httpd-itk') }
 
     context 'with Apache version < 2.4' do
@@ -111,7 +111,7 @@
       end
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.d/itk.load').with('ensure' => 'file',
+        is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.load').with('ensure' => 'file',
                                                                        'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
       }
     end
@@ -127,7 +127,7 @@
         }
       end
 
-      it { is_expected.to contain_file('/etc/httpd/conf.d/itk.conf').with_content(%r{EnableCapabilities  Off}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.conf').with_content(%r{EnableCapabilities  Off}) }
     end
   end
   context 'on a FreeBSD OS' do
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 767ace9f7b..05e92e02a9 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -90,8 +90,8 @@
     end
   end
 
-  context 'RHEL 6' do
-    include_examples 'RedHat 6'
+  context 'RHEL 8' do
+    include_examples 'RedHat 8'
     let(:pre_condition) do
       'include apache'
     end
@@ -107,7 +107,7 @@
       context 'and default parameters' do
         let(:mod_dir) { mod_dir }
 
-        mod_dir = '/etc/httpd/conf.d'
+        mod_dir = '/etc/httpd/conf.modules.d'
 
         it_behaves_like 'minimal resources', mod_dir
         it_behaves_like 'specific workers_file', mod_dir
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 2b965bb33c..9fb165fdd4 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -55,7 +55,7 @@
   end # Debian
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::mod::ldap') }
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
index 30353cf3b7..320d1843cc 100644
--- a/spec/classes/mod/lookup_identity.rb
+++ b/spec/classes/mod/lookup_identity.rb
@@ -15,7 +15,7 @@
     end # Debian
 
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_lookup_identity') }
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index a66a683fd1..8bc07b89f3 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -44,7 +44,7 @@ def general_mime_magic_specs
   end
 
   context 'on a RedHat OS with default params' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     general_mime_magic_specs
 
@@ -54,6 +54,6 @@ def general_mime_magic_specs
       )
     end
 
-    it { is_expected.to contain_file('mime_magic.conf').with_path('/etc/httpd/conf.d/mime_magic.conf') }
+    it { is_expected.to contain_file('mime_magic.conf').with_path('/etc/httpd/conf.modules.d/mime_magic.conf') }
   end
 end
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 88bc648178..0891059f02 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -26,10 +26,10 @@ def general_mime_specs
   end
 
   context 'on a RedHat OS with default params', :compile do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     general_mime_specs
 
-    it { is_expected.to contain_file('mime.conf').with_path('/etc/httpd/conf.d/mime.conf') }
+    it { is_expected.to contain_file('mime.conf').with_path('/etc/httpd/conf.modules.d/mime.conf') }
   end
 end
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
index a9e9d95c57..9890db02b9 100644
--- a/spec/classes/mod/pagespeed_spec.rb
+++ b/spec/classes/mod/pagespeed_spec.rb
@@ -28,7 +28,7 @@
   end
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('pagespeed') }
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index 84d8cb9898..c59f2bf2ac 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -12,7 +12,7 @@
     it { is_expected.to contain_package('libapache2-mod-perl2') }
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 9a8afd9462..d0c7fdfac2 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -43,11 +43,11 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
-    it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').with_ensure('file') }
+    it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').with_ensure('file') }
 
     context 'with Apache version < 2.4' do
       let :params do
@@ -59,8 +59,8 @@
       it {
         is_expected.to contain_file_line('/etc/sysconfig/httpd prefork enable').with('require' => 'Package[httpd]')
       }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').without('content' => %r{MaxRequestWorkers}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').without('content' => %r{MaxConnectionsPerChild}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').without('content' => %r{MaxRequestWorkers}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').without('content' => %r{MaxConnectionsPerChild}) }
     end
 
     context 'with Apache version >= 2.4' do
@@ -75,11 +75,11 @@
       it { is_expected.not_to contain_apache__mod('event') }
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.d/prefork.load').with('ensure' => 'file',
+        is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',
                                                                            'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
       }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').without('content' => %r{MaxClients}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/prefork.conf').without('content' => %r{MaxRequestsPerChild}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').without('content' => %r{MaxClients}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').without('content' => %r{MaxRequestsPerChild}) }
     end
   end
   context 'on a FreeBSD OS' do
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index 5ba4e4a4f7..0b28526926 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -33,7 +33,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
     end
 
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_apache__mod('proxy_balancer') }
 
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 43f96c35b1..e40f5e18d7 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -33,7 +33,7 @@
   end
 
   context 'on a RedHat OS', :compile do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 5c7d024c03..4dbefd1bed 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -13,19 +13,19 @@
     it { is_expected.to contain_package('libapache2-mod-python') }
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('python') }
     it { is_expected.to contain_package('mod_python') }
-    it { is_expected.to contain_file('python.load').with_path('/etc/httpd/conf.d/python.load') }
+    it { is_expected.to contain_file('python.load').with_path('/etc/httpd/conf.modules.d/python.load') }
 
     describe 'with loadfile_name specified' do
       let :params do
         { loadfile_name: 'FooBar' }
       end
 
-      it { is_expected.to contain_file('FooBar').with_path('/etc/httpd/conf.d/FooBar') }
+      it { is_expected.to contain_file('FooBar').with_path('/etc/httpd/conf.modules.d/FooBar') }
     end
   end
   context 'on a FreeBSD OS' do
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index aee45edfd1..9cf449c3cf 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -32,7 +32,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index f9e0442921..a1f25afb33 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -12,7 +12,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('shib2').with_id('mod_shib') }
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
index 5f4e18c5af..1ba5bf0389 100644
--- a/spec/classes/mod/speling_spec.rb
+++ b/spec/classes/mod/speling_spec.rb
@@ -11,7 +11,7 @@
   end
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_apache__mod('speling') }
   end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 9f6b660000..a16b4c95a8 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -11,15 +11,6 @@
   end
 
   context 'on a RedHat' do
-    context '6 OS' do
-      include_examples 'RedHat 6'
-
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('ssl') }
-      it { is_expected.to contain_package('mod_ssl') }
-      it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.d/ssl.conf') }
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv2 -SSLv3}) }
-    end
     context '8 OS' do
       include_examples 'RedHat 8'
 
@@ -29,18 +20,6 @@
       it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.modules.d/ssl.conf') }
       it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all}) }
     end
-    context '6 OS with a custom package_name parameter' do
-      include_examples 'RedHat 6'
-      let :params do
-        { package_name: 'httpd24-mod_ssl' }
-      end
-
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_apache__mod('ssl') }
-      it { is_expected.to contain_package('httpd24-mod_ssl') }
-      it { is_expected.not_to contain_package('mod_ssl') }
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/cache/mod_ssl/scache\(512000\)"$}) }
-    end
 
     context '7 OS with custom directories for PR#1635' do
       include_examples 'RedHat 7'
@@ -91,7 +70,7 @@
   end
   # Template config doesn't vary by distro
   context 'on all distros' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'not setting ssl_pass_phrase_dialog' do
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLPassPhraseDialog builtin$}) }
@@ -277,7 +256,7 @@
         }
       end
 
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLMutex posixsem$}) }
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  Mutex posixsem$}) }
     end
     context 'setting ssl_sessioncache' do
       let :params do
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 1b8740a174..37a6451d2f 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -2,27 +2,6 @@
 
 require 'spec_helper'
 
-# Helper function for testing the contents of `status.conf`
-# Apache < 2.4
-shared_examples 'status_conf_spec' do |allow_from, extended_status, status_path|
-  expected =
-    "<Location #{status_path}>\n"\
-    "    SetHandler server-status\n"\
-    "    Order deny,allow\n"\
-    "    Deny from all\n"\
-    "    Allow from #{Array(allow_from).join(' ')}\n"\
-    "</Location>\n"\
-    "ExtendedStatus #{extended_status}\n"\
-    "\n"\
-    "<IfModule mod_proxy.c>\n"\
-    "    # Show Proxy LoadBalancer status in mod_status\n"\
-    "    ProxyStatus On\n"\
-    "</IfModule>\n"
-  it('status conf') do
-    is_expected.to contain_file('status.conf').with_content(expected)
-  end
-end
-
 # Apache >= 2.4
 def require_directives(requires)
   if requires == :undef
@@ -147,15 +126,15 @@ def require_directives(requires)
       end
     end
 
-    context 'on a RedHat 6 OS' do
-      include_examples 'RedHat 6'
+    context 'on a RedHat 8 OS' do
+      include_examples 'RedHat 8'
 
       context 'with default params' do
         it { is_expected.to contain_apache__mod('status') }
 
-        include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
+        include_examples 'status_conf_spec_require', 'ip 127.0.0.1 ::1', 'On', '/server-status'
 
-        it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.d/status.conf') }
+        it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
       end
     end
 
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 8d2c32d9ac..aaed242378 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -43,11 +43,11 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
-    it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with_ensure('file') }
+    it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with_ensure('file') }
 
     context 'with Apache version < 2.4' do
       let :params do
@@ -71,7 +71,7 @@
       it { is_expected.not_to contain_apache__mod('event') }
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.d/worker.load').with('ensure' => 'file',
+        is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',
                                                                           'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
       }
     end
@@ -93,19 +93,19 @@
 
   # Template config doesn't vary by distro
   context 'on all distros' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'defaults' do
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ServerLimit\s+25$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+StartServers\s+2$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxClients\s+150$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+25$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+75$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ThreadsPerChild\s+25$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxRequestsPerChild\s+0$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ThreadLimit\s+64$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s*ListenBacklog\s*511}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ServerLimit\s+25$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+StartServers\s+2$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxClients\s+150$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+25$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+75$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ThreadsPerChild\s+25$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxRequestsPerChild\s+0$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ThreadLimit\s+64$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s*ListenBacklog\s*511}) }
     end
 
     context 'setting params' do
@@ -123,16 +123,16 @@
         }
       end
 
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ServerLimit\s+10$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+StartServers\s+11$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxClients\s+12$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+13$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+14$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ThreadsPerChild\s+15$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+MaxRequestsPerChild\s+16$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s+ThreadLimit\s+17$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.d/worker.conf').with(content: %r{^\s*ListenBacklog\s*8}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ServerLimit\s+10$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+StartServers\s+11$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxClients\s+12$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+13$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+14$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ThreadsPerChild\s+15$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxRequestsPerChild\s+16$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ThreadLimit\s+17$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s*ListenBacklog\s*8}) }
     end
   end
 end
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 4b3081dc9b..95d10625d6 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -16,19 +16,9 @@
     it { is_expected.to contain_package('libapache2-mod-wsgi-py3') }
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
-
-    it { is_expected.to contain_class('apache::params') }
-    it {
-      is_expected.to contain_class('apache::mod::wsgi').with(
-        'wsgi_socket_prefix' => '/var/run/wsgi',
-      )
-    }
-    it { is_expected.to contain_package('mod_wsgi') }
+    include_examples 'RedHat 8'
 
     context 'on RHEL8' do
-      include_examples 'RedHat 8'
-
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module modules/mod_wsgi_python3.so}) }
       it { is_expected.to contain_package('python3-mod_wsgi') }
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
index 2c75ea69c7..01ae1848c3 100644
--- a/spec/classes/vhosts_spec.rb
+++ b/spec/classes/vhosts_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::vhosts', type: :class do
   context 'on all OSes' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'with custom vhosts parameter' do
       let :params do
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index f873b0cf6c..a510cd564c 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -12,12 +12,12 @@
   end
 
   context 'on a RedHat osfamily' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     describe 'for non-special modules' do
       it { is_expected.to contain_class('apache::params') }
       it 'manages the module load file' do
-        is_expected.to contain_file('spec_m.load').with(path: '/etc/httpd/conf.d/spec_m.load',
+        is_expected.to contain_file('spec_m.load').with(path: '/etc/httpd/conf.modules.d/spec_m.load',
                                                         content: "LoadModule spec_m_module modules/mod_spec_m.so\n",
                                                         owner: 'root',
                                                         group: 'root',
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 9409ed61b6..43a0ab25e3 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -14,7 +14,7 @@
 
   describe 'os-dependent items' do
     context 'on RedHat based systems' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to compile }
     end
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 43da2b68fa..2f252c8e84 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -49,10 +49,6 @@
   let(:facts) { on_supported_os['ubuntu-18.04-x86_64'] }
 end
 
-shared_context 'RedHat 6' do
-  let(:facts) { on_supported_os['redhat-6-x86_64'] }
-end
-
 shared_context 'RedHat 7' do
   let(:facts) { on_supported_os['redhat-7-x86_64'] }
 end

From 0bb5ca9584c5adb56cf74926ecc8f3438551759a Mon Sep 17 00:00:00 2001
From: spolat <sinan.polat@doculayer.com>
Date: Wed, 12 Oct 2022 12:29:43 +0200
Subject: [PATCH 2027/2267] Fix RedHat + PHP 8 libphp file

---
 manifests/mod/php.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index f1c1bba12e..1f5f241eb0 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -93,7 +93,7 @@
   $_php_version_no_dot = regsubst($php_version, '\.', '')
   if $apache::version::scl_httpd_version {
     $_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
-  } elsif ($facts['os']['family'] == 'RedHat') and ($_php_major == 8) {
+  } elsif ($facts['os']['family'] == 'RedHat') and (versioncmp($php_version, '8') >= 0) {
     # RedHat + PHP 8 drop the major version in apache module name.
     $_lib = "${libphp_prefix}.so"
   } else {

From d970f15fee1e2ce35bc9c16fd0031c99a33ad1cf Mon Sep 17 00:00:00 2001
From: jordanbreen28 <jordan.breen@perforce.com>
Date: Thu, 13 Oct 2022 10:53:08 +0100
Subject: [PATCH 2028/2267] (CONT-173) - Updating deprecated facter instances

Prior to this commit, this module contained instances of Facter::Util::Resolution.execute and Facter::Util::Resolution.which, which are deprecated.
This commit aims to replace these exec helpers with their supported Facter::Core::Execution counterparts.

This commit:
- Replaced all Facter::Util::Resolution instances with Facter::Core::Execution
---
 lib/facter/apache_version.rb                     | 16 ++++++++--------
 .../unit/facter/util/fact_apache_version_spec.rb |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
index bb16670dbf..36a316f441 100644
--- a/lib/facter/apache_version.rb
+++ b/lib/facter/apache_version.rb
@@ -5,17 +5,17 @@
   setcode do
     apache_version = nil
 
-    if Facter::Util::Resolution.which('httpd')
-      apache_version = Facter::Util::Resolution.exec('httpd -V 2>&1')
+    if Facter::Core::Execution.which('httpd')
+      apache_version = Facter::Core::Execution.execute('httpd -V 2>&1')
       Facter.debug "Matching httpd '#{apache_version}'"
-    elsif Facter::Util::Resolution.which('apache2')
-      apache_version = Facter::Util::Resolution.exec('apache2 -V 2>&1')
+    elsif Facter::Core::Execution.which('apache2')
+      apache_version = Facter::Core::Execution.execute('apache2 -V 2>&1')
       Facter.debug "Matching apache2 '#{apache_version}'"
-    elsif Facter::Util::Resolution.which('apachectl')
-      apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')
+    elsif Facter::Core::Execution.which('apachectl')
+      apache_version = Facter::Core::Execution.execute('apachectl -v 2>&1')
       Facter.debug "Matching apachectl '#{apache_version}'"
-    elsif Facter::Util::Resolution.which('apache2ctl')
-      apache_version = Facter::Util::Resolution.exec('apache2ctl -v 2>&1')
+    elsif Facter::Core::Execution.which('apache2ctl')
+      apache_version = Facter::Core::Execution.execute('apache2ctl -v 2>&1')
       Facter.debug "Matching apache2ctl '#{apache_version}'"
     end
 
diff --git a/spec/unit/facter/util/fact_apache_version_spec.rb b/spec/unit/facter/util/fact_apache_version_spec.rb
index da4d3f5ec8..061c21adf5 100644
--- a/spec/unit/facter/util/fact_apache_version_spec.rb
+++ b/spec/unit/facter/util/fact_apache_version_spec.rb
@@ -10,8 +10,8 @@
     context 'with value' do
       before :each do
         allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-        expect(Facter::Util::Resolution).to receive(:which).with('httpd') { true }
-        expect(Facter::Util::Resolution).to receive(:exec).with('httpd -V 2>&1') {
+        expect(Facter::Core::Execution).to receive(:which).with('httpd') { true }
+        expect(Facter::Core::Execution).to receive(:execute).with('httpd -V 2>&1') {
           'Server version: Apache/2.4.16 (Unix)
            Server built:   Jul 31 2015 15:53:26'
         }
@@ -26,8 +26,8 @@
     context 'with value' do
       before :each do
         allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-        expect(Facter::Util::Resolution).to receive(:which).with('httpd') { true }
-        expect(Facter::Util::Resolution).to receive(:exec).with('httpd -V 2>&1') {
+        expect(Facter::Core::Execution).to receive(:which).with('httpd') { true }
+        expect(Facter::Core::Execution).to receive(:execute).with('httpd -V 2>&1') {
           'Server version: Apache/2.4.6 ()
            Server built:   Nov 21 2015 05:34:59'
         }

From 6fa784a66061551e844203f17ad9367f7ad41d4b Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 13 Oct 2022 20:07:59 +0200
Subject: [PATCH 2029/2267] Automatically enable mod_http2 if needed

Following https://httpd.apache.org/docs/current/howto/http2.html the
first step is to load the http2 module. By inspecting the protocols
argument users can enable HTTP/2 via Hiera.
---
 manifests/init.pp  | 4 ++++
 manifests/vhost.pp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 50155fa885..e7640476b7 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -827,6 +827,10 @@
       include "::apache::mod::${mpm_module}"
     }
 
+    if 'h2' in $protocols or 'h2c' in $protocols {
+      include apache::mod::http2
+    }
+
     $default_vhost_ensure = $default_vhost ? {
       true  => 'present',
       false => 'absent'
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 01aaee946f..a4db687704 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2704,7 +2704,7 @@
     }
   }
 
-  if ($h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef) and $ensure == 'present' {
+  if ('h2' in $protocols or 'h2c' in $protocols or $h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef) and $ensure == 'present' {
     include apache::mod::http2
 
     concat::fragment { "${name}-http2":

From 4f217f4e980fa14a032d53bbedf5e981fe82b08c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 20 Oct 2022 21:49:17 +0200
Subject: [PATCH 2030/2267] Make serveradmin an optional parameter and use it

Since fc6cced03e60c5a78bceb006dd4267fc37f54959 the parameter no longer
ends up in the main configuration. It was still used in
apache::mod::shib until 049fd54b57e8a4f28ceeea4888456eafe1509fa1. Since
then it's been unused.

This changes it to an optional non-empty string which means it doesn't
change the default config, but still allows users to set the ServerAdmin
in the main Apache config.

Fixes: fc6cced03e60c5a78bceb006dd4267fc37f54959
---
 manifests/init.pp           |  2 +-
 spec/classes/apache_spec.rb | 11 +++++++++++
 templates/httpd.conf.erb    |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 50155fa885..ee0ed738ec 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -489,7 +489,7 @@
   Boolean $purge_configs                                                     = true,
   Optional[Boolean] $purge_vhost_dir                                         = undef,
   Boolean $purge_vdir                                                        = false,
-  String $serveradmin                                                        = 'root@localhost',
+  Optional[String[1]] $serveradmin                                           = undef,
   Enum['On', 'Off', 'on', 'off'] $sendfile                                   = 'On',
   Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert          = undef,
   Optional[String] $ldap_trusted_mode                                        = undef,
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 4d392a1384..56529c7dac 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -39,6 +39,7 @@
         'purge' => 'false'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+    it { is_expected.to contain_file('/etc/apache2/apache2.conf').without_content(%r{ServerAdmin}) }
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
@@ -83,6 +84,16 @@
       it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
     end
 
+    context 'with serveradmin' do
+      let(:params) do
+        {
+          serveradmin: 'admin@example.com',
+        }
+      end
+
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^ServerAdmin admin@example\.com$} }
+    end
+
     context 'when specifying slash encoding behaviour' do
       let :params do
         { allow_encoded_slashes: 'nodecode' }
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index b19d8da813..7577b3bb72 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -5,6 +5,9 @@ TraceEnable <%= scope.call_function('apache::bool2httpd', [@trace_enable]) %>
 
 ServerName "<%= @servername %>"
 ServerRoot "<%= @server_root %>"
+<%- if @serveradmin -%>
+ServerAdmin <%= @serveradmin %>
+<%- end -%>
 PidFile <%= @pidfile %>
 Timeout <%= @timeout %>
 KeepAlive <%= @keepalive %>

From 4bd6143eba4bf58eabdcd0044bc0e3eadb1400b9 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 13 Oct 2022 14:18:22 +0200
Subject: [PATCH 2031/2267] Support setting SSLProxyCipherSuite on mod_ssl

While it is a parameter for apache::vhost, this allows setting it server
wide just like SSLCipherSuite.
---
 manifests/mod/ssl.pp         |  4 ++++
 spec/classes/mod/ssl_spec.rb | 18 ++++++++++++++++--
 templates/mod/ssl.conf.erb   |  3 +++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index c91fb3fb33..5007f40f24 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -40,6 +40,9 @@
 # @param ssl_proxy_protocol
 #   Configure usable SSL protocol flavors for proxy usage.
 #
+# @param ssl_proxy_cipher_suite
+#   Configure usable SSL ciphers for proxy usage. Equivalent to ssl_cipher but for proxy connections.
+#
 # @param ssl_pass_phrase_dialog
 #   Type of pass phrase dialog for encrypted private keys.
 #
@@ -99,6 +102,7 @@
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
   Array[String] $ssl_protocol                               = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
+  Optional[String[1]] $ssl_proxy_cipher_suite               = undef,
   String $ssl_pass_phrase_dialog                            = 'builtin',
   Integer $ssl_random_seed_bytes                            = 512,
   String $ssl_sessioncache                                  = $apache::params::ssl_sessioncache,
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index a16b4c95a8..5dfa853fe8 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -17,8 +17,22 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('ssl') }
       it { is_expected.to contain_package('mod_ssl') }
-      it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.modules.d/ssl.conf') }
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all}) }
+      it {
+        is_expected.to contain_file('ssl.conf')
+          .with_path('/etc/httpd/conf.modules.d/ssl.conf')
+          .with_content(%r{SSLProtocol all})
+          .without_content(%r{SSLProxyCipherSuite})
+      }
+
+      context 'with ssl_proxy_cipher_suite' do
+        let(:params) do
+          {
+            ssl_proxy_cipher_suite: 'PROFILE=system',
+          }
+        end
+
+        it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProxyCipherSuite PROFILE=system}) }
+      end
     end
 
     context '7 OS with custom directories for PR#1635' do
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 94dc7bb829..9644c24319 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -44,6 +44,9 @@
 <% if not @ssl_proxy_protocol.empty? -%>
   SSLProxyProtocol <%= @ssl_proxy_protocol.compact.join(' ') %>
 <% end -%>
+<% if @ssl_proxy_cipher_suite -%>
+  SSLProxyCipherSuite <%= @ssl_proxy_cipher_suite %>
+<% end -%>
 <% if @ssl_options -%>
   SSLOptions <%= @ssl_options.compact.join(' ') %>
 <% end -%>

From b3b9a82f50442c9d197ee8c30cb3df286d7eb099 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 25 Oct 2022 15:14:06 +0200
Subject: [PATCH 2032/2267] Allow ssl_protocol to be empty

On EL8+ the default ssl.conf file doesn't specify SSLProtocol at all,
which implies using the system profile where it can be changed. This
changes the template to deal with ssl_protocol set to an empty array,
which was previously generating invalid syntax anyway.
---
 spec/classes/mod/ssl_spec.rb | 10 ++++++++++
 templates/mod/ssl.conf.erb   |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 5dfa853fe8..4bb3b270fa 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -33,6 +33,16 @@
 
         it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProxyCipherSuite PROFILE=system}) }
       end
+
+      context 'with empty ssl_protocol' do
+        let(:params) do
+          {
+            ssl_protocol: [],
+          }
+        end
+
+        it { is_expected.to contain_file('ssl.conf').without_content(%r{SSLProtocol}) }
+      end
     end
 
     context '7 OS with custom directories for PR#1635' do
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 9644c24319..aec5b15a7c 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -40,7 +40,9 @@
   SSLStaplingCache "shmcb:<%= @_stapling_cache %>"
 <% end -%>
   SSLCipherSuite <%= @ssl_cipher %>
+<% if not @ssl_protocol.empty? -%>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
+<% end -%>
 <% if not @ssl_proxy_protocol.empty? -%>
   SSLProxyProtocol <%= @ssl_proxy_protocol.compact.join(' ') %>
 <% end -%>

From 8fbf28bd40987cd7a23d1b19ace9226d7ad8a79a Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 13 Oct 2022 19:17:58 +0200
Subject: [PATCH 2033/2267] Match EL8 crypto defaults

On EL8+ OpenSSL is patched to support a unified crypto policy. This is
also the default when installing mod_ssl. Users of RHEL Insights will
also receive warnings when the defaults differ.
---
 manifests/mod/ssl.pp               | 4 ++--
 manifests/params.pp                | 7 ++++++-
 spec/acceptance/apache_ssl_spec.rb | 2 +-
 spec/classes/mod/ssl_spec.rb       | 9 +++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 5007f40f24..2ee58dd2a9 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -98,11 +98,11 @@
   Optional[Stdlib::Absolutepath] $ssl_cert                  = undef,
   Optional[Stdlib::Absolutepath] $ssl_key                   = undef,
   Optional[Stdlib::Absolutepath] $ssl_ca                    = undef,
-  String $ssl_cipher                                        = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES',
+  String $ssl_cipher                                        = $apache::params::ssl_cipher,
   Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
   Array[String] $ssl_protocol                               = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
-  Optional[String[1]] $ssl_proxy_cipher_suite               = undef,
+  Optional[String[1]] $ssl_proxy_cipher_suite               = $apache::params::ssl_proxy_cipher_suite,
   String $ssl_pass_phrase_dialog                            = 'builtin',
   Integer $ssl_random_seed_bytes                            = 512,
   String $ssl_sessioncache                                  = $apache::params::ssl_sessioncache,
diff --git a/manifests/params.pp b/manifests/params.pp
index 1a3a4fc21a..31172affea 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -723,8 +723,13 @@
   }
 
   if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') >= 0 {
-    $ssl_protocol = ['all'] # Implementations of the SSLv2 and SSLv3 protocol versions have been removed from OpenSSL (and hence mod_ssl) because these are no longer considered secure. For additional documentation https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/setting-apache-web-server_deploying-different-types-of-servers
+    # Use OpenSSL system profile. See update-crypto-policies(8) for more details
+    $ssl_protocol = []
+    $ssl_cipher = 'PROFILE=SYSTEM'
+    $ssl_proxy_cipher_suite = 'PROFILE=SYSTEM'
   } else {
     $ssl_protocol = ['all', '-SSLv2', '-SSLv3']
+    $ssl_cipher = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES'
+    $ssl_proxy_cipher_suite = undef
   }
 }
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 0b69febec7..ff2507e25c 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -24,7 +24,7 @@ class { 'apache':
     describe file("#{apache_hash['mod_ssl_dir']}/ssl.conf") do
       it { is_expected.to be_file }
       if os[:family].include?('redhat') && os[:release].to_i >= 8
-        it { is_expected.to contain 'SSLProtocol all' }
+        it { is_expected.not_to contain 'SSLProtocol' }
       else
         it { is_expected.to contain 'SSLProtocol all -SSLv2 -SSLv3' }
       end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 4bb3b270fa..12f057c738 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -20,18 +20,19 @@
       it {
         is_expected.to contain_file('ssl.conf')
           .with_path('/etc/httpd/conf.modules.d/ssl.conf')
-          .with_content(%r{SSLProtocol all})
-          .without_content(%r{SSLProxyCipherSuite})
+          .without_content(%r{SSLProtocol})
+          .with_content(%r{^  SSLCipherSuite PROFILE=SYSTEM$})
+          .with_content(%r{^  SSLProxyCipherSuite PROFILE=SYSTEM$})
       }
 
       context 'with ssl_proxy_cipher_suite' do
         let(:params) do
           {
-            ssl_proxy_cipher_suite: 'PROFILE=system',
+            ssl_proxy_cipher_suite: 'HIGH',
           }
         end
 
-        it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProxyCipherSuite PROFILE=system}) }
+        it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProxyCipherSuite HIGH}) }
       end
 
       context 'with empty ssl_protocol' do

From 0ee981939f29b3e1dd4b5e856121b1cdd2465d5b Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 26 Oct 2022 17:44:28 +0200
Subject: [PATCH 2034/2267] Extract acceptance node setup to a separate file

This makes it easier to maintain. You get proper syntax highlighting in
your editor and can even lint it. This also converts some shell lines to
pure Puppet. This reduces the need for large local
spec_helper_acceptance modifications. The pattern is copied from
voxpupuli-acceptance where the beaker setup automatically detects if the
file is present and applies it.

It does drop EL6 EPEL support, following
4922544709313e0b7d176013e6f8118b85fdf96a.
---
 spec/setup_acceptance_node.pp        | 36 ++++++++++++++++++++++++
 spec/spec_helper_acceptance_local.rb | 42 ++--------------------------
 2 files changed, 38 insertions(+), 40 deletions(-)
 create mode 100644 spec/setup_acceptance_node.pp

diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
new file mode 100644
index 0000000000..51a7cb6b2a
--- /dev/null
+++ b/spec/setup_acceptance_node.pp
@@ -0,0 +1,36 @@
+# needed by tests
+package { 'curl':
+  ensure => 'latest',
+}
+
+case $facts['os']['family'] {
+  'SLES', 'SUSE': {
+    # needed for netstat, for serverspec checks
+    package { 'net-tools-deprecated':
+      ensure => 'latest',
+    }
+  }
+  'RedHat': {
+    # Make sure selinux is disabled so the tests work.
+    if $facts['os']['selinux']['enabled'] {
+      exec { 'setenforce 0':
+        path => $facts['path'],
+      }
+    }
+
+    if versioncmp($facts['os']['release']['major'], '8') >= 0 {
+      package { 'iproute':
+        ensure => installed,
+      }
+    }
+    include epel
+  }
+  'Debian': {
+    if $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') >= 0 {
+      # Ensure ipv6 is enabled on our Debian 11 Docker boxes
+      exec { 'sysctl -w net.ipv6.conf.all.disable_ipv6=0':
+        path => $facts['path'],
+      }
+    }
+  }
+}
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 95152b6557..f5eb0e59d9 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -34,48 +34,10 @@ def print_parsing_errors
   end
   c.before :suite do
     if %r{redhat|oracle}.match?(os[:family])
-      # Make sure selinux is disabled so the tests work.
-      LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true)
-
-      # Version 4.0.0 drops EL6 support
-      if os[:release].to_i <= 6
-        LitmusHelper.instance.run_shell('puppet module install --version 3.1.0 puppet/epel')
-      else
-        LitmusHelper.instance.run_shell('puppet module install puppet/epel')
-      end
+      LitmusHelper.instance.run_shell('puppet module install puppet/epel')
     end
 
-    pp = <<-PUPPETCODE
-    # needed by tests
-    package { 'curl':
-      ensure   => 'latest',
-    }
-    # needed for netstat, for serverspec checks
-    if $::osfamily == 'SLES' or $::osfamily == 'SUSE' {
-      package { 'net-tools-deprecated':
-        ensure   => 'latest',
-      }
-    }
-    if $::osfamily == 'RedHat' {
-      # EPEL < 7 is EOL and removed from the official mirror network
-      if $::operatingsystemmajrelease == '5' or $::operatingsystemmajrelease == '6'{
-        class { 'epel':
-          epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
-          epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
-        }
-      } else {
-        class { 'epel': }
-      }
-    }
-    PUPPETCODE
-    LitmusHelper.instance.apply_manifest(pp)
-
-    # Ensure ipv6 is enabled on our Debian 11 Docker boxes
-    LitmusHelper.instance.run_shell('sysctl -w net.ipv6.conf.all.disable_ipv6=0') if %r{debian}.match?(os[:family]) && os[:release].to_f == 11
-
-    # Install iproute on AlmaLinux
-    # Package is used to check if ports are listening
-    LitmusHelper.instance.run_shell('sudo dnf install iproute -y') if %r{redhat}.match?(os[:family]) && os[:release].to_f >= 8
+    LitmusHelper.instance.apply_manifest(File.read(File.join(__dir__, 'setup_acceptance_node.pp')))
   end
 
   c.after :suite do

From 67a8a1799ee7c9a82027425eed0b24ce0802cc3f Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 13 Oct 2022 19:26:22 +0200
Subject: [PATCH 2035/2267] Update Debian SSL protocols and ciphers to match
 defaults

Debian 10 and Ubuntu 18.04 (oldest of supported Debian-based distros)
default to these values. This gives a safer out-of-the-box experience.
---
 manifests/params.pp                | 4 ++++
 spec/acceptance/apache_ssl_spec.rb | 2 ++
 spec/classes/mod/ssl_spec.rb       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 31172affea..642734738b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -727,6 +727,10 @@
     $ssl_protocol = []
     $ssl_cipher = 'PROFILE=SYSTEM'
     $ssl_proxy_cipher_suite = 'PROFILE=SYSTEM'
+  } elsif $facts['os']['family'] == 'Debian' {
+    $ssl_protocol = ['all', '-SSLv3']
+    $ssl_cipher = 'HIGH:!aNULL'
+    $ssl_proxy_cipher_suite = undef
   } else {
     $ssl_protocol = ['all', '-SSLv2', '-SSLv3']
     $ssl_cipher = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES'
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index ff2507e25c..5e1c5909b6 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -25,6 +25,8 @@ class { 'apache':
       it { is_expected.to be_file }
       if os[:family].include?('redhat') && os[:release].to_i >= 8
         it { is_expected.not_to contain 'SSLProtocol' }
+      elsif ['debian', 'ubuntu'].include?(os[:family])
+        it { is_expected.to contain 'SSLProtocol all -SSLv3' }
       else
         it { is_expected.to contain 'SSLProtocol all -SSLv2 -SSLv3' }
       end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 12f057c738..0e562c4b69 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -69,7 +69,7 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('ssl') }
     it { is_expected.not_to contain_package('libapache2-mod-ssl') }
-    it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv2 -SSLv3}) }
+    it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv3}) }
   end
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'

From 7e6c9f87a79a4b5ddcd2c9fab18c3969e25952e6 Mon Sep 17 00:00:00 2001
From: spolat <sinan86polat@gmail.com>
Date: Wed, 26 Oct 2022 22:18:32 +0200
Subject: [PATCH 2036/2267] Add support for php8.0 with RHEL 8

---
 spec/classes/mod/php_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 9a0920091e..41516acf61 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -111,6 +111,15 @@
               elsif facts[:os]['release']['major'].to_i == 8
                 it { is_expected.to contain_apache__mod('php7') }
                 it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
+
+                context 'with php8.0' do
+                  let :params do
+                    { php_version: '8.0' }
+                  end
+
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+              end
               elsif facts[:os]['release']['major'].to_i >= 9
                 it { is_expected.to contain_apache__mod('php') }
                 it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }

From 8064505f41b10375963dd86a87b27a1a3fe7ac41 Mon Sep 17 00:00:00 2001
From: spolat <sinan86polat@gmail.com>
Date: Thu, 27 Oct 2022 21:33:26 +0200
Subject: [PATCH 2037/2267] Add support for php8.0 with RHEL 8

---
 spec/classes/mod/php_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 41516acf61..440d3ac64a 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -119,7 +119,7 @@
 
                 it { is_expected.to contain_apache__mod('php') }
                 it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
-              end
+                end
               elsif facts[:os]['release']['major'].to_i >= 9
                 it { is_expected.to contain_apache__mod('php') }
                 it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }

From a2c891ef52e66bec954887411a92ac5d686f133d Mon Sep 17 00:00:00 2001
From: Sinan Polat <sinan86polat@gmail.com>
Date: Thu, 27 Oct 2022 21:56:39 +0200
Subject: [PATCH 2038/2267] Add support for php8.0 with RHEL 8

Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
---
 spec/classes/mod/php_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 440d3ac64a..0a8a6b3b9c 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -117,8 +117,8 @@
                     { php_version: '8.0' }
                   end
 
-                it { is_expected.to contain_apache__mod('php') }
-                it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+                  it { is_expected.to contain_apache__mod('php') }
+                  it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
                 end
               elsif facts[:os]['release']['major'].to_i >= 9
                 it { is_expected.to contain_apache__mod('php') }

From 5973fa8e0a8a1c080e00e2a843ec6520b23694d7 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Fri, 28 Oct 2022 13:34:18 +0000
Subject: [PATCH 2039/2267] Release prep v8.3.0

---
 CHANGELOG.md  | 19 ++++++++++++++++++-
 REFERENCE.md  | 15 ++++++++++++---
 metadata.json |  2 +-
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee7150a66..46abdd7a7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,24 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v8.2.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.1) (2022-09-26)
+## [v8.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.3.0) (2022-10-28)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.2.1...v8.3.0)
+
+### Added
+
+- Automatically enable mod\_http2 if needed [\#2337](https://github.com/puppetlabs/puppetlabs-apache/pull/2337) ([ekohl](https://github.com/ekohl))
+- Update EL8+ and Debian SSL defaults [\#2336](https://github.com/puppetlabs/puppetlabs-apache/pull/2336) ([ekohl](https://github.com/ekohl))
+- Support setting SSLProxyCipherSuite on mod\_ssl [\#2335](https://github.com/puppetlabs/puppetlabs-apache/pull/2335) ([ekohl](https://github.com/ekohl))
+
+### Fixed
+
+- Make serveradmin an optional parameter and use it [\#2338](https://github.com/puppetlabs/puppetlabs-apache/pull/2338) ([ekohl](https://github.com/ekohl))
+- pdksync - \(CONT-189\) Remove support for RedHat6 / OracleLinux6 / Scientific6 [\#2326](https://github.com/puppetlabs/puppetlabs-apache/pull/2326) ([david22swan](https://github.com/david22swan))
+- pdksync - \(CONT-130\) Dropping Support for Debian 9 [\#2322](https://github.com/puppetlabs/puppetlabs-apache/pull/2322) ([jordanbreen28](https://github.com/jordanbreen28))
+- fix directory empty options if an empty array is being used [\#2312](https://github.com/puppetlabs/puppetlabs-apache/pull/2312) ([bovy89](https://github.com/bovy89))
+
+## [v8.2.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.1) (2022-09-27)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.2.0...v8.2.1)
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 509712b5a1..8eae31100f 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -856,11 +856,11 @@ Default value: `'On'`
 
 ##### <a name="serveradmin"></a>`serveradmin`
 
-Data type: `String`
+Data type: `Optional[String[1]]`
 
 Sets the Apache server administrator's contact information via Apache's `ServerAdmin` directive.
 
-Default value: `'root@localhost'`
+Default value: ``undef``
 
 ##### <a name="servername"></a>`servername`
 
@@ -6505,6 +6505,7 @@ The following parameters are available in the `apache::mod::ssl` class:
 * [`ssl_honorcipherorder`](#ssl_honorcipherorder)
 * [`ssl_protocol`](#ssl_protocol)
 * [`ssl_proxy_protocol`](#ssl_proxy_protocol)
+* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
 * [`ssl_pass_phrase_dialog`](#ssl_pass_phrase_dialog)
 * [`ssl_random_seed_bytes`](#ssl_random_seed_bytes)
 * [`ssl_sessioncache`](#ssl_sessioncache)
@@ -6587,7 +6588,7 @@ Data type: `String`
 
 Cipher Suite available for negotiation in SSL handshake.
 
-Default value: `'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES'`
+Default value: `$apache::params::ssl_cipher`
 
 ##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
@@ -6616,6 +6617,14 @@ Configure usable SSL protocol flavors for proxy usage.
 
 Default value: `[]`
 
+##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
+
+Data type: `Optional[String[1]]`
+
+Configure usable SSL ciphers for proxy usage. Equivalent to ssl_cipher but for proxy connections.
+
+Default value: `$apache::params::ssl_proxy_cipher_suite`
+
 ##### <a name="ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
 
 Data type: `String`
diff --git a/metadata.json b/metadata.json
index ea786eacde..43b66a58a4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "8.2.1",
+  "version": "8.3.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 102d45988b380a9e925ca2688c77920c4a54e169 Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Thu, 29 Oct 2020 14:03:45 +0100
Subject: [PATCH 2040/2267] add maxrequestworkers parameter for mpm_worker
 module

---
 manifests/mod/worker.pp       | 1 +
 templates/mod/worker.conf.erb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 2b1ca24fe4..139ee354eb 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -53,6 +53,7 @@
   Integer $threadlimit             = 64,
   Integer $listenbacklog           = 511,
   Optional[String] $apache_version = undef,
+  Optional[Integer] $maxrequestworkers = undef,
 ) {
   include apache
   $_apache_version = pick($apache_version, $apache::apache_version)
diff --git a/templates/mod/worker.conf.erb b/templates/mod/worker.conf.erb
index 8ad6451c75..5158a1b050 100644
--- a/templates/mod/worker.conf.erb
+++ b/templates/mod/worker.conf.erb
@@ -8,4 +8,7 @@
   ThreadsPerChild     <%= @threadsperchild %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
   ListenBacklog       <%= @listenbacklog %>
+  <%- if @maxrequestworkers -%>
+  MaxRequestWorkers   <%= @maxrequestworkers %>
+  <%- end -%>
 </IfModule>

From a6a70b471a6ea3fd36bbb97d7241c5ac1a2c5850 Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Sun, 30 Oct 2022 13:21:09 +0100
Subject: [PATCH 2041/2267] add logic to ignore maxclients if maxrequestworkers
 is set

---
 manifests/mod/worker.pp       | 5 +++++
 templates/mod/worker.conf.erb | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 139ee354eb..669beb257e 100644
--- a/manifests/mod/worker.pp
+++ b/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 (
diff --git a/templates/mod/worker.conf.erb b/templates/mod/worker.conf.erb
index 5158a1b050..cc8912ac25 100644
--- a/templates/mod/worker.conf.erb
+++ b/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>

From 246617ff582d6b514ab76b5fb59256649ec9d00a Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Mon, 7 Nov 2022 13:39:57 +0100
Subject: [PATCH 2042/2267] add spec test for MaxRequestWorkers

---
 spec/classes/mod/worker_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index aaed242378..5fafac88ac 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -113,7 +113,7 @@
         {
           serverlimit: 10,
           startservers: 11,
-          maxclients: 12,
+          maxrequestworkers: 12,
           minsparethreads: 13,
           maxsparethreads: 14,
           threadsperchild: 15,
@@ -126,7 +126,8 @@
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ServerLimit\s+10$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+StartServers\s+11$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxClients\s+12$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').without(content: %r{^\s+MaxClients}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxRequestWorkers\s+12$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+13$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+14$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ThreadsPerChild\s+15$}) }

From 58e3a351b0b6ccc62ee03d46977c70239d7df22b Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Mon, 7 Nov 2022 14:48:10 +0100
Subject: [PATCH 2043/2267] fix typo

---
 manifests/mod/worker.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 669beb257e..652f9606d0 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -8,7 +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.
+#   If maxrequestworkers is set, this value is ignored.
 #
 # @param minsparethreads
 #   Minimum number of idle threads to handle request spikes.

From eb5b4c04e42c1711ef5d851e493a76ea4420ba63 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 14 Nov 2022 12:30:57 +0100
Subject: [PATCH 2044/2267] Declare minimum Puppet version to be 6.24.0

In a565ea97609979f7ccbc407534a553def0e865d8 the commands are passed as
an array, but this feature was only introduced in Puppet 6.24.0[1]. This
raises the minimum version to match, since it's no longer possible to
use the module on anything older.

[1]: https://puppet.com/docs/puppet/6/release_notes_puppet.html#enhancements_puppet_x-7-9-0-PUP-5704

Fixes: a565ea97609979f7ccbc407534a553def0e865d8
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 43b66a58a4..536a80a5b4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -83,7 +83,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 6.0.0 < 8.0.0"
+      "version_requirement": ">= 6.24.0 < 8.0.0"
     }
   ],
   "description": "Module for Apache configuration",

From c729f84cf70952600b857362e89b6a7a19cd49a4 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Mon, 14 Nov 2022 21:04:50 +0000
Subject: [PATCH 2045/2267] Release prep v8.4.0

---
 CHANGELOG.md  |  14 +++++++
 REFERENCE.md  | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++
 metadata.json |   2 +-
 3 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46abdd7a7b..50c9245fd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v8.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.4.0) (2022-11-14)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.3.0...v8.4.0)
+
+### Added
+
+- add maxrequestworkers parameter for mpm\_worker module [\#2331](https://github.com/puppetlabs/puppetlabs-apache/pull/2331) ([trefzer](https://github.com/trefzer))
+- support lbmethod modules [\#2268](https://github.com/puppetlabs/puppetlabs-apache/pull/2268) ([xorpaul](https://github.com/xorpaul))
+
+### Fixed
+
+- Declare minimum Puppet version to be 6.24.0 [\#2342](https://github.com/puppetlabs/puppetlabs-apache/pull/2342) ([ekohl](https://github.com/ekohl))
+- Fix RedHat + PHP 8 libphp file [\#2333](https://github.com/puppetlabs/puppetlabs-apache/pull/2333) ([polatsinan](https://github.com/polatsinan))
+
 ## [v8.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.3.0) (2022-10-28)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.2.1...v8.3.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 8eae31100f..6eda79e72d 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -56,6 +56,10 @@
 * [`apache::mod::intercept_form_submit`](#apachemodintercept_form_submit): Installs `mod_intercept_form_submit`.
 * [`apache::mod::itk`](#apachemoditk): Installs MPM `mod_itk`.
 * [`apache::mod::jk`](#apachemodjk): Installs `mod_jk`.
+* [`apache::mod::lbmethod_bybusyness`](#apachemodlbmethod_bybusyness): Installs `lbmethod_bybusyness`.
+* [`apache::mod::lbmethod_byrequests`](#apachemodlbmethod_byrequests): Installs `lbmethod_byrequests`.
+* [`apache::mod::lbmethod_bytraffic`](#apachemodlbmethod_bytraffic): Installs `lbmethod_bytraffic`.
+* [`apache::mod::lbmethod_heartbeat`](#apachemodlbmethod_heartbeat): Installs `lbmethod_heartbeat`.
 * [`apache::mod::ldap`](#apachemodldap): Installs and configures `mod_ldap`.
 * [`apache::mod::lookup_identity`](#apachemodlookup_identity): Installs `mod_lookup_identity`
 * [`apache::mod::macro`](#apachemodmacro): Installs `mod_macro`.
@@ -3498,6 +3502,94 @@ $mount_file_content = {
 
 Default value: `{}`
 
+### <a name="apachemodlbmethod_bybusyness"></a>`apache::mod::lbmethod_bybusyness`
+
+Installs `lbmethod_bybusyness`.
+
+* **See also**
+  * https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bybusyness.html
+    * for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::lbmethod_bybusyness` class:
+
+* [`apache_version`](#apache_version)
+
+##### <a name="apache_version"></a>`apache_version`
+
+Data type: `Optional[String]`
+
+Version of Apache to install module on.
+
+Default value: `$apache::apache_version`
+
+### <a name="apachemodlbmethod_byrequests"></a>`apache::mod::lbmethod_byrequests`
+
+Installs `lbmethod_byrequests`.
+
+* **See also**
+  * https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_byrequests.html
+    * for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::lbmethod_byrequests` class:
+
+* [`apache_version`](#apache_version)
+
+##### <a name="apache_version"></a>`apache_version`
+
+Data type: `Optional[String]`
+
+Version of Apache to install module on.
+
+Default value: `$apache::apache_version`
+
+### <a name="apachemodlbmethod_bytraffic"></a>`apache::mod::lbmethod_bytraffic`
+
+Installs `lbmethod_bytraffic`.
+
+* **See also**
+  * https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bytraffic.html
+    * for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::lbmethod_bytraffic` class:
+
+* [`apache_version`](#apache_version)
+
+##### <a name="apache_version"></a>`apache_version`
+
+Data type: `Optional[String]`
+
+Version of Apache to install module on.
+
+Default value: `$apache::apache_version`
+
+### <a name="apachemodlbmethod_heartbeat"></a>`apache::mod::lbmethod_heartbeat`
+
+Installs `lbmethod_heartbeat`.
+
+* **See also**
+  * https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_heartbeat.html
+    * for additional documentation.
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::lbmethod_heartbeat` class:
+
+* [`apache_version`](#apache_version)
+
+##### <a name="apache_version"></a>`apache_version`
+
+Data type: `Optional[String]`
+
+Version of Apache to install module on.
+
+Default value: `$apache::apache_version`
+
 ### <a name="apachemodldap"></a>`apache::mod::ldap`
 
 Installs and configures `mod_ldap`.
@@ -6986,6 +7078,7 @@ The following parameters are available in the `apache::mod::worker` class:
 * [`threadlimit`](#threadlimit)
 * [`listenbacklog`](#listenbacklog)
 * [`apache_version`](#apache_version)
+* [`maxrequestworkers`](#maxrequestworkers)
 
 ##### <a name="startservers"></a>`startservers`
 
@@ -7002,6 +7095,7 @@ Data type: `Integer`
 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 maxrequestworkers is set, this value is ignored.
 
 Default value: `150`
 
@@ -7076,6 +7170,15 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: ``undef``
 
+##### <a name="maxrequestworkers"></a>`maxrequestworkers`
+
+Data type: `Optional[Integer]`
+
+Maximum number of connections that will be processed simultaneously
+if set, maxclients is ignored
+
+Default value: ``undef``
+
 ### <a name="apachemodwsgi"></a>`apache::mod::wsgi`
 
 Installs and configures `mod_wsgi`.
diff --git a/metadata.json b/metadata.json
index 536a80a5b4..83e8137051 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From cd9673bdf1b2302d2f1338f3ccfd195b72f2c4c0 Mon Sep 17 00:00:00 2001
From: mdklapwijk <not@home.now>
Date: Wed, 26 Oct 2022 11:42:39 +0200
Subject: [PATCH 2046/2267] - remove _module from apache::mod::unique_id name.

---
 manifests/mod/security.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index f67f421fba..6610d9754c 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -200,7 +200,7 @@
     lib => 'mod_security2.so',
   }
 
-  ::apache::mod { 'unique_id_module':
+  ::apache::mod { 'unique_id':
     id  => 'unique_id_module',
     lib => 'mod_unique_id.so',
   }

From 547cbd5f259015b78dd8b02ad35f6a51ded2dd5b Mon Sep 17 00:00:00 2001
From: "M.D. Klapwijk" <m.d.klapwijk@linuxvoid.org>
Date: Tue, 22 Nov 2022 08:24:59 +0100
Subject: [PATCH 2047/2267] fix spec test

---
 spec/classes/mod/security_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index ff6b9a9aed..8a6de00593 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -19,7 +19,7 @@
             )
           }
           it {
-            is_expected.to contain_apache__mod('unique_id_module').with(
+            is_expected.to contain_apache__mod('unique_id').with(
               id: 'unique_id_module',
               lib: 'mod_unique_id.so',
             )
@@ -189,7 +189,7 @@
             )
           }
           it {
-            is_expected.to contain_apache__mod('unique_id_module').with(
+            is_expected.to contain_apache__mod('unique_id').with(
               id: 'unique_id_module',
               lib: 'mod_unique_id.so',
             )

From 12ab304c29c14393a383d8ee82840d22a50ffd3d Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 1 Sep 2021 11:04:01 +0200
Subject: [PATCH 2048/2267] Clean up SELinux handling in acceptance testing.

This attempts to unify SELinux handling in the tests. It moves the
package installation to the acceptance spec helper to reduce
duplication. It then makes the set_apache_defaults line idempotent and
restorecon_apache correctly chained. This works around [PUP-10548] which
is that Puppet doesn't reload file contexts within a run. That means it
must first create the file(s) and then run restorecon to get correct
contexts.

[PUP-10548]: https://tickets.puppetlabs.com/browse/PUP-10548
---
 spec/acceptance/apache_parameters_spec.rb | 28 ++++++++++-------------
 spec/acceptance/class_spec.rb             | 22 +++++++-----------
 spec/acceptance/vhost_spec.rb             | 27 ++++++++++------------
 spec/setup_acceptance_node.pp             | 11 +++++++++
 4 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 44c2884511..f0ffa8ec2f 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -428,34 +428,30 @@ class { 'apache':
   describe 'logging' do
     describe 'setup' do
       pp = <<-MANIFEST
-          if $::osfamily == 'RedHat' and "$::selinux" == "true" {
-            $semanage_package = $::operatingsystemmajrelease ? {
-              '6'     => 'policycoreutils-python',
-              '7'     => 'policycoreutils-python',
-              default => 'policycoreutils-python-utils',
-            }
-            package { $semanage_package: ensure => installed }
+          if $facts['osfamily'] == 'RedHat' and $facts['selinux'] {
             exec { 'set_apache_defaults':
-              command => 'semanage fcontext -a -t httpd_log_t "/apache_spec(/.*)?"',
+              command => 'semanage fcontext -a -t httpd_log_t "/apache_spec/logs(/.*)?"',
+              unless  => 'semanage fcontext --list | grep /apache_spec/logs | grep httpd_log_t',
               path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-              require => Package[$semanage_package],
             }
             exec { 'restorecon_apache':
-              command => 'restorecon -Rv /apache_spec',
-              path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-              before  => Service['httpd'],
-              require => Class['apache'],
+              command     => 'restorecon -Rv /apache_spec',
+              path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
+              before      => Service['httpd'],
+              require     => [File['/apache_spec'], Class['apache']],
+              subscribe   => Exec['set_apache_defaults'],
+              refreshonly => true,
             }
           }
-          file { '/apache_spec': ensure => directory, }
-          class { 'apache': logroot => '/apache_spec' }
+          file { ['/apache_spec', '/apache_spec/logs']: ensure => directory, }
+          class { 'apache': logroot => '/apache_spec/logs' }
       MANIFEST
       it 'applies cleanly' do
         apply_manifest(pp, catch_failures: true)
       end
     end
 
-    describe file("/apache_spec/#{apache_hash['error_log']}") do
+    describe file("/apache_spec/logs/#{apache_hash['error_log']}") do
       it { is_expected.to be_file }
     end
   end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index ad7b2c07b9..fa9d3a2f74 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -41,30 +41,24 @@
   context 'custom site/mod dir parameters' do
     let(:pp) do
       <<-MANIFEST
-        if $::osfamily == 'RedHat' and "$::selinux" == "true" {
-          $semanage_package = $::operatingsystemmajrelease ? {
-            '6'     => 'policycoreutils-python',
-            '7'     => 'policycoreutils-python',
-            default => 'policycoreutils-python-utils',
-          }
-          package { $semanage_package: ensure => installed }
+        if $facts['osfamily'] == 'RedHat' and $facts['selinux'] {
           exec { 'set_apache_defaults':
-            command     => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-            path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
-            subscribe   => Package[$semanage_package],
-            refreshonly => true,
+            command => 'semanage fcontext --add -t httpd_config_t "/apache_spec/apache_custom(/.*)?"',
+            unless  => 'semanage fcontext --list | grep /apache_spec/apache_custom | grep httpd_config_t',
+            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
           }
           exec { 'restorecon_apache':
             command     => 'restorecon -Rv /apache_spec',
             path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
             before      => Service['httpd'],
-            require     => Class['apache'],
+            require     => [File['/apache_spec/apache_custom'], Class['apache']],
             subscribe   => Exec['set_apache_defaults'],
             refreshonly => true,
           }
         }
-        file { '/apache_spec': ensure => directory, }
-        file { '/apache_spec/apache_custom': ensure => directory, }
+        file { ['/apache_spec', '/apache_spec/apache_custom']:
+          ensure => directory,
+        }
         class { 'apache':
           mod_dir   => '/apache_spec/apache_custom/mods',
           vhost_dir => '/apache_spec/apache_custom/vhosts',
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e3b5f3883d..3c8ef66df8 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1171,36 +1171,33 @@ class { 'apache::mod::wsgi': }
 
   describe 'additional_includes' do
     pp = <<-MANIFEST
-      if $::osfamily == 'RedHat' and "$::selinux" == "true" {
-        $semanage_package = $::operatingsystemmajrelease ? {
-          '6'     => 'policycoreutils-python',
-          '7'     => 'policycoreutils-python',
-          default => 'policycoreutils-python-utils',
-        }
-        package { $semanage_package: ensure => installed }
+      if $facts['osfamily'] == 'RedHat' and $facts['selinux'] {
         exec { 'set_apache_defaults':
-          command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
+          command => 'semanage fcontext --add -t httpd_sys_content_t "/apache_spec/docroot(/.*)?"',
+          unless  => 'semanage fcontext --list | grep /apache_spec/docroot | grep httpd_sys_content_t',
           path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package[$semanage_package],
         }
         exec { 'restorecon_apache':
           command => 'restorecon -Rv /apache_spec',
           path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
-          require => Class['apache'],
+          before      => Service['httpd'],
+          require     => [File['/apache_spec/include'], Class['apache']],
+          subscribe   => Exec['set_apache_defaults'],
+          refreshonly => true,
         }
       }
       class { 'apache': }
       host { 'test.server': ip => '127.0.0.1' }
-      file { '/apache_spec': ensure => directory, }
+      file { ['/apache_spec', '/apache_spec/docroot']: ensure => directory, }
       file { '/apache_spec/include': ensure => present, content => '#additional_includes' }
       apache::vhost { 'test.server':
-        docroot             => '/apache_spec',
+        docroot             => '/apache_spec/docroot',
         additional_includes => '/apache_spec/include',
       }
     MANIFEST
-    it 'applies cleanly' do
-      apply_manifest(pp, catch_failures: false)
+
+    it 'behaves idempotently' do
+      idempotent_apply(pp)
     end
 
     describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
index 51a7cb6b2a..a785707638 100644
--- a/spec/setup_acceptance_node.pp
+++ b/spec/setup_acceptance_node.pp
@@ -18,6 +18,17 @@
       }
     }
 
+    if $facts['selinux'] {
+      $semanage_package = $facts['os']['release']['major'] ? {
+        '6'     => 'policycoreutils-python',
+        '7'     => 'policycoreutils-python',
+        default => 'policycoreutils-python-utils',
+      }
+      package { $semanage_package:
+        ensure => installed,
+      }
+    }
+
     if versioncmp($facts['os']['release']['major'], '8') >= 0 {
       package { 'iproute':
         ensure => installed,

From 08fd949f8f0a18d7753d01d4bc9b595ebf8e9be9 Mon Sep 17 00:00:00 2001
From: Stefan Nicola <stefan.nicola@ahrefs.com>
Date: Fri, 2 Dec 2022 09:15:28 +0000
Subject: [PATCH 2049/2267] add LimitRequestLine parameter

---
 manifests/init.pp                         |  4 ++++
 spec/acceptance/apache_parameters_spec.rb | 16 ++++++++++++++++
 templates/httpd.conf.erb                  |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index d1e1960c76..8010f1690e 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -428,6 +428,9 @@
 #   The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 #   be allowed within a request header.
 #
+# @param limitreqline
+#   The 'limitreqline' parameter sets the limit on the allowed size of a client's HTTP request-line
+#
 # @param ip
 #   Specifies the ip address
 #
@@ -526,6 +529,7 @@
   Integer $max_keepalive_requests                                            = $apache::params::max_keepalive_requests,
   Integer $limitreqfieldsize                                                 = 8190,
   Integer $limitreqfields                                                    = 100,
+  Optional[Integer] $limitreqline                                            = undef,
   Stdlib::Absolutepath $logroot                                              = $apache::params::logroot,
   Optional[Stdlib::Filemode] $logroot_mode                                   = $apache::params::logroot_mode,
   Apache::LogLevel $log_level                                                = $apache::params::log_level,
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 44c2884511..bb2219dd48 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -566,6 +566,22 @@ class { 'apache':
     end
   end
 
+  describe 'limitreqline' do
+    pp = <<-MANIFEST
+        class { 'apache':
+          limitreqline => '8190',
+        }
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    describe file(apache_hash['conf_file']) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'LimitRequestLine 8190' }
+    end
+  end
+
   describe 'file_e_tag' do
     pp = <<-MANIFEST
         class { 'apache':
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 7577b3bb72..2d8f95ef49 100755
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -15,6 +15,9 @@ MaxKeepAliveRequests <%= @max_keepalive_requests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
 LimitRequestFieldSize <%= @limitreqfieldsize %>
 LimitRequestFields <%= @limitreqfields %>
+<% if @limitreqline -%>
+LimitRequestLine <%= @limitreqline %>
+<% end -%>
 <%# Actually >= 2.4.24, but the minor version is not provided -%>
 <%- if @http_protocol_options and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 HttpProtocolOptions <%= @http_protocol_options %>

From 1eb13d255a6fe27008316d4103bcb843ddc302ba Mon Sep 17 00:00:00 2001
From: Stefan Nicola <stefan.nicola@ahrefs.com>
Date: Fri, 2 Dec 2022 10:45:13 +0000
Subject: [PATCH 2050/2267] fix typo

---
 spec/acceptance/apache_parameters_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index bb2219dd48..ef6a315251 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -569,7 +569,7 @@ class { 'apache':
   describe 'limitreqline' do
     pp = <<-MANIFEST
         class { 'apache':
-          limitreqline => '8190',
+          limitreqline => 8190,
         }
     MANIFEST
     it 'applys cleanly' do

From 2fa1fd474a0537c38eca370307053502f1864fdb Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 2 Dec 2022 21:05:40 +0100
Subject: [PATCH 2051/2267] Remove executable bit from various files

---
 README.md                | 0
 manifests/init.pp        | 0
 templates/httpd.conf.erb | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 README.md
 mode change 100755 => 100644 manifests/init.pp
 mode change 100755 => 100644 templates/httpd.conf.erb

diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/manifests/init.pp b/manifests/init.pp
old mode 100755
new mode 100644
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
old mode 100755
new mode 100644

From 17976023391553b6202cbcab34a72b55680c58ca Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 6 Dec 2022 11:24:28 +0100
Subject: [PATCH 2052/2267] disable::mpm_event: Fix module deactivation

there were a few things broken:
* a2dismod was called with the wrong module name. at least on apache
  2.4.54 on Debian 11 it is named mpm_event, not event
* the paths to the files were wrong
* a2dismod already purges the .load and .conf file, the exec resources
  are not required (even then a file resource would probably be cleaner
  to purge them)
* Apache needs to be reloaded, so just running this priot to
  apache2::service isn't enough, it needs to be a notify

This initially worked but was changed from mpm_event to event in
https://github.com/puppetlabs/puppetlabs-apache/pull/1961. Then it was
fixed in https://github.com/puppetlabs/puppetlabs-apache/pull/2034 by
adding the exec resources, but the actual a2dismod was still broken.
---
 manifests/mpm/disable_mpm_event.pp | 26 ++++----------------------
 spec/classes/apache_spec.rb        |  2 +-
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/manifests/mpm/disable_mpm_event.pp b/manifests/mpm/disable_mpm_event.pp
index 7e85b02667..faa04cfe8f 100644
--- a/manifests/mpm/disable_mpm_event.pp
+++ b/manifests/mpm/disable_mpm_event.pp
@@ -1,29 +1,11 @@
 # @summary disable Apache-Module event
 class apache::mpm::disable_mpm_event {
-  $event_command = ['/usr/sbin/a2dismod', 'event']
-  $event_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event.load'],'/')]]
-  exec { '/usr/sbin/a2dismod event':
+  $event_command = ['/usr/sbin/a2dismod', 'mpm_event']
+  $event_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'mpm_event.load'],'/')]]
+  exec { '/usr/sbin/a2dismod mpm_event':
     command => $event_command,
     onlyif  => $event_onlyif,
     require => Package['httpd'],
-    before  => Class['apache::service'],
-  }
-
-  $event_load_command = ['/bin/rm', join([$apache::mod_enable_dir, 'event_event.load'],'/')]
-  $event_load_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event_event.load'],'/')]]
-  exec { 'remove distribution event load file':
-    command => $event_load_command,
-    onlyif  => $event_load_onlyif,
-    require => Package['httpd'],
-    before  => Class['apache::service'],
-  }
-
-  $event_conf_command = ['/bin/rm', join([$apache::mod_enable_dir, 'event_event.conf'],'/')]
-  $event_conf_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event_event.conf'],'/')]]
-  exec { 'remove distribution event conf file':
-    command => $event_conf_command,
-    onlyif  => $event_conf_onlyif,
-    require => Package['httpd'],
-    before  => Class['apache::service'],
+    notify  => Class['apache::service'],
   }
 }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 56529c7dac..46f7ff8a38 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -248,7 +248,7 @@
         { mpm_module: 'worker' }
       end
 
-      it { is_expected.to contain_exec('/usr/sbin/a2dismod event') }
+      it { is_expected.to contain_exec('/usr/sbin/a2dismod mpm_event') }
       it { is_expected.to contain_exec('/usr/sbin/a2dismod prefork') }
     end
 

From e2ae89895dc271b22a0653f7e483abe75088fe58 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 6 Dec 2022 12:46:07 +0100
Subject: [PATCH 2053/2267] Drop deprecated a2mod type/providers

This type is deprecated, so it should be removed. I raise this PR so we
won't forget to remove it. Please wait with merging until a new major
release is planned.
---
 lib/puppet/provider/a2mod/a2mod.rb      |  37 -----
 lib/puppet/provider/a2mod/gentoo.rb     | 116 ---------------
 lib/puppet/provider/a2mod/modfix.rb     |  13 --
 lib/puppet/provider/a2mod/redhat.rb     |  62 --------
 lib/puppet/type/a2mod.rb                |  30 ----
 spec/unit/provider/a2mod/gentoo_spec.rb | 179 ------------------------
 6 files changed, 437 deletions(-)
 delete mode 100644 lib/puppet/provider/a2mod/a2mod.rb
 delete mode 100644 lib/puppet/provider/a2mod/gentoo.rb
 delete mode 100644 lib/puppet/provider/a2mod/modfix.rb
 delete mode 100644 lib/puppet/provider/a2mod/redhat.rb
 delete mode 100644 lib/puppet/type/a2mod.rb
 delete mode 100644 spec/unit/provider/a2mod/gentoo_spec.rb

diff --git a/lib/puppet/provider/a2mod/a2mod.rb b/lib/puppet/provider/a2mod/a2mod.rb
deleted file mode 100644
index 3330fd5dcc..0000000000
--- a/lib/puppet/provider/a2mod/a2mod.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'puppet/provider/a2mod'
-
-Puppet::Type.type(:a2mod).provide(:a2mod, parent: Puppet::Provider::A2mod) do
-  desc 'Manage Apache 2 modules on Debian and Ubuntu'
-
-  optional_commands encmd: 'a2enmod'
-  optional_commands discmd: 'a2dismod'
-  commands apache2ctl: 'apache2ctl'
-
-  confine osfamily: :debian
-  defaultfor operatingsystem: [:debian, :ubuntu]
-
-  def self.instances
-    modules = apache2ctl('-M').lines.map { |line|
-      m = line.match(%r{(\w+)_module \(shared\)$})
-      m[1] if m
-    }.compact
-
-    modules.map do |mod|
-      new(
-        name: mod,
-        ensure: :present,
-        provider: :a2mod,
-      )
-    end
-  end
-
-  def create
-    encmd resource[:name]
-  end
-
-  def destroy
-    discmd resource[:name]
-  end
-end
diff --git a/lib/puppet/provider/a2mod/gentoo.rb b/lib/puppet/provider/a2mod/gentoo.rb
deleted file mode 100644
index c53fbd5b6e..0000000000
--- a/lib/puppet/provider/a2mod/gentoo.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-# frozen_string_literal: true
-
-require 'puppet/util/filetype'
-Puppet::Type.type(:a2mod).provide(:gentoo, parent: Puppet::Provider) do
-  desc 'Manage Apache 2 modules on Gentoo'
-
-  confine operatingsystem: :gentoo
-  defaultfor operatingsystem: :gentoo
-
-  attr_accessor :property_hash
-
-  def create
-    @property_hash[:ensure] = :present
-  end
-
-  def exists?
-    (!@property_hash[:ensure].nil? && @property_hash[:ensure] == :present)
-  end
-
-  def destroy
-    @property_hash[:ensure] = :absent
-  end
-
-  def flush
-    self.class.flush
-  end
-
-  class << self
-    attr_reader :conf_file
-  end
-
-  def self.clear
-    @mod_resources = []
-    @modules       = []
-    @other_args    = ''
-  end
-
-  def self.initvars
-    @conf_file     = '/etc/conf.d/apache2'
-    @filetype      = Puppet::Util::FileType.filetype(:flat).new(conf_file)
-    @mod_resources = []
-    @modules       = []
-    @other_args    = ''
-  end
-
-  initvars
-
-  # Retrieve an array of all existing modules
-  def self.modules
-    if @modules.length <= 0
-      # Locate the APACHE_OPTS variable
-      records = filetype.read.split(%r{\n})
-      apache2_opts = records.grep(%r{^\s*APACHE2_OPTS=}).first
-
-      # Extract all defines
-      @modules << Regexp.last_match(1).downcase while apache2_opts.sub!(%r{-D\s+(\w+)}, '')
-
-      # Hang on to any remaining options.
-      if apache2_opts =~ %r{APACHE2_OPTS="(.+)"}
-        @other_args = Regexp.last_match(1).strip
-      end
-
-      @modules.sort!.uniq!
-    end
-
-    @modules
-  end
-
-  def self.prefetch(resources = {})
-    # Match resources with existing providers
-    instances.each do |provider|
-      resource = resources[provider.name]
-      if resource
-        resource.provider = provider
-      end
-    end
-
-    # Store all resources using this provider for flushing
-    resources.each do |_name, resource|
-      @mod_resources << resource
-    end
-  end
-
-  def self.instances
-    modules.map { |mod| new(name: mod, provider: :gentoo, ensure: :present) }
-  end
-
-  def self.flush
-    mod_list       = modules
-    mods_to_remove = @mod_resources.select { |mod| mod.should(:ensure) == :absent }.map { |mod| mod[:name] }
-    mods_to_add    = @mod_resources.select { |mod| mod.should(:ensure) == :present }.map { |mod| mod[:name] }
-
-    mod_list -= mods_to_remove
-    mod_list += mods_to_add
-    mod_list.sort!.uniq!
-
-    return unless modules != mod_list
-
-    opts = @other_args + ' '
-    opts << mod_list.map { |mod| "-D #{mod.upcase}" }.join(' ')
-    opts.strip!
-    opts.gsub!(%r{\s+}, ' ')
-
-    apache2_opts = %(APACHE2_OPTS="#{opts}")
-    Puppet.debug("Writing back \"#{apache2_opts}\" to #{conf_file}")
-
-    records = filetype.read.split(%r{\n})
-
-    opts_index = records.find_index { |i| i.match(%r{^\s*APACHE2_OPTS}) }
-    records[opts_index] = apache2_opts
-
-    filetype.backup
-    filetype.write(records.join("\n"))
-    @modules = mod_list
-  end
-end
diff --git a/lib/puppet/provider/a2mod/modfix.rb b/lib/puppet/provider/a2mod/modfix.rb
deleted file mode 100644
index 755c927e45..0000000000
--- a/lib/puppet/provider/a2mod/modfix.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-Puppet::Type.type(:a2mod).provide :modfix do
-  desc "Dummy provider for A2mod.
-  Fake nil resources when there is no crontab binary available. Allows
-  puppetd to run on a bootstrapped machine before a Cron package has been
-  installed. Workaround for: http://projects.puppetlabs.com/issues/2384
-  "
-
-  def self.instances
-    []
-  end
-end
diff --git a/lib/puppet/provider/a2mod/redhat.rb b/lib/puppet/provider/a2mod/redhat.rb
deleted file mode 100644
index 149a7b909b..0000000000
--- a/lib/puppet/provider/a2mod/redhat.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'puppet/provider/a2mod'
-
-Puppet::Type.type(:a2mod).provide(:redhat, parent: Puppet::Provider::A2mod) do
-  desc 'Manage Apache 2 modules on RedHat family OSs'
-
-  commands apachectl: 'apachectl'
-
-  confine osfamily: :redhat
-  defaultfor osfamily: :redhat
-
-  require 'pathname'
-
-  # modpath: Path to default apache modules directory /etc/httpd/mod.d
-  # modfile: Path to module load configuration file; Default: resides under modpath directory
-  # libfile: Path to actual apache module library. Added in modfile LoadModule
-
-  attr_accessor :modfile, :libfile
-  class << self
-    attr_accessor :modpath
-    def preinit
-      @modpath = '/etc/httpd/mod.d'
-    end
-  end
-
-  preinit
-
-  def create
-    File.open(modfile, 'w') do |f|
-      f.puts "LoadModule #{resource[:identifier]} #{libfile}"
-    end
-  end
-
-  def destroy
-    File.delete(modfile)
-  end
-
-  def self.instances
-    modules = apachectl('-M').lines.map { |line|
-      m = line.match(%r{(\w+)_module \(shared\)$})
-      m[1] if m
-    }.compact
-
-    modules.map do |mod|
-      new(
-        name: mod,
-        ensure: :present,
-        provider: :redhat,
-      )
-    end
-  end
-
-  def modfile
-    "#{self.class.modpath}/#{resource[:name]}.load"
-  end
-
-  # Set libfile path: If absolute path is passed, then maintain it. Else, make it default from 'modules' dir.
-  def libfile
-    Pathname.new(resource[:lib]).absolute? ? resource[:lib] : "modules/#{resource[:lib]}"
-  end
-end
diff --git a/lib/puppet/type/a2mod.rb b/lib/puppet/type/a2mod.rb
deleted file mode 100644
index da04d7f4d8..0000000000
--- a/lib/puppet/type/a2mod.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-Puppet::Type.newtype(:a2mod) do
-  @doc = 'Manage Apache 2 modules'
-
-  ensurable
-
-  newparam(:name) do
-    Puppet.warning 'The a2mod provider is deprecated, please use apache::mod instead'
-    desc 'The name of the module to be managed'
-
-    isnamevar
-  end
-
-  newparam(:lib) do
-    desc 'The name of the .so library to be loaded'
-
-    defaultto { "mod_#{@resource[:name]}.so" }
-  end
-
-  newparam(:identifier) do
-    desc 'Module identifier string used by LoadModule. Default: module-name_module'
-
-    # http://httpd.apache.org/docs/2.2/mod/module-dict.html#ModuleIdentifier
-
-    defaultto { "#{resource[:name]}_module" }
-  end
-
-  autorequire(:package) { catalog.resource(:package, 'httpd') }
-end
diff --git a/spec/unit/provider/a2mod/gentoo_spec.rb b/spec/unit/provider/a2mod/gentoo_spec.rb
deleted file mode 100644
index 2fb48f34a1..0000000000
--- a/spec/unit/provider/a2mod/gentoo_spec.rb
+++ /dev/null
@@ -1,179 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-provider_class = Puppet::Type.type(:a2mod).provider(:gentoo)
-
-describe provider_class do
-  before :each do
-    provider_class.clear
-  end
-
-  [:conf_file, :instances, :modules, :initvars, :conf_file, :clear].each do |method|
-    it "responds to the class method #{method}" do
-      expect(provider_class).to respond_to(method)
-    end
-  end
-  describe 'when fetching modules' do
-    let(:filetype) do
-      double
-    end
-
-    it 'returns a sorted array of the defined parameters' do
-      expect(filetype).to receive(:read).and_return(%(APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n))
-      expect(provider_class).to receive(:filetype) { filetype }
-
-      expect(provider_class.modules).to eq(['bar', 'baz', 'foo'])
-    end
-
-    it 'caches the module list' do
-      expect(filetype).to receive(:read).once { %(APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n) } # rubocop:disable Lint/AmbiguousBlockAssociation
-      expect(provider_class).to receive(:filetype).once { filetype } # rubocop:disable Lint/AmbiguousBlockAssociation
-
-      2.times { expect(provider_class.modules).to eq(['bar', 'baz', 'foo']) }
-    end
-
-    it 'normalizes parameters' do
-      expect(filetype).to receive(:read).and_return(%(APACHE2_OPTS="-D FOO -D BAR -D BAR"\n))
-      expect(provider_class).to receive(:filetype) { filetype }
-      expect(provider_class.modules).to eq(['bar', 'foo'])
-    end
-  end
-
-  describe 'when prefetching' do
-    it 'matches providers to resources' do
-      provider = instance_double('ssl_provider', name: 'ssl')
-      resource = instance_double('ssl_resource')
-      expect(resource).to receive(:provider=).with(provider)
-
-      expect(provider_class).to receive(:instances) { [provider] }
-      provider_class.prefetch('ssl' => resource)
-    end
-  end
-  describe 'when flushing' do
-    let(:filetype) { double }
-    let(:info) { double }
-    let(:mpm) { double }
-    let(:ssl) { double }
-
-    before :each do
-      allow(filetype).to receive(:backup)
-      allow(provider_class).to receive(:filetype).at_least(:once) { filetype }
-
-      allow(info).to receive(:[]).with(:name) { 'info' }
-      allow(info).to receive(:provider=)
-
-      allow(mpm).to receive(:[]).with(:name) { 'mpm' }
-      allow(mpm).to receive(:provider=)
-
-      allow(ssl).to receive(:[]).with(:name) { 'ssl' }
-      allow(ssl).to receive(:provider=)
-    end
-    it 'adds modules whose ensure is present' do
-      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
-      expect(filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO"))
-
-      allow(info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => info)
-
-      provider_class.flush
-    end
-    it 'removes modules whose ensure is present' do
-      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO") }
-      expect(filetype).to receive(:write).with(%(APACHE2_OPTS=""))
-
-      allow(info).to receive(:should).with(:ensure) { :absent }
-      allow(info).to receive(:provider=)
-      provider_class.prefetch('info' => info)
-
-      provider_class.flush
-    end
-
-    it 'does not modify providers without resources' do
-      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-D INFO -D MPM") }
-      expect(filetype).to receive(:write).with(%(APACHE2_OPTS="-D MPM -D SSL"))
-
-      allow(info).to receive(:should).with(:ensure) { :absent }
-      provider_class.prefetch('info' => info)
-
-      allow(ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => ssl)
-
-      provider_class.flush
-    end
-
-    it 'writes the modules in sorted order' do
-      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
-      expect(filetype).to receive(:write).with(%(APACHE2_OPTS="-D INFO -D MPM -D SSL"))
-
-      allow(mpm).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('mpm' => mpm)
-      allow(info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => info)
-      allow(ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => ssl)
-
-      provider_class.flush
-    end
-
-    it 'writes the records back once' do
-      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
-      expect(filetype).to receive(:write).once.with(%(APACHE2_OPTS="-D INFO -D SSL"))
-
-      allow(info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => info)
-
-      allow(ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => ssl)
-
-      provider_class.flush
-    end
-
-    it 'onlies modify the line containing APACHE2_OPTS' do
-      expect(filetype).to receive(:read).at_least(:once) { %(# Comment\nAPACHE2_OPTS=""\n# Another comment) }
-      expect(filetype).to receive(:write).once.with(%(# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment))
-
-      allow(info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => info)
-      provider_class.flush
-    end
-
-    it 'restores any arbitrary arguments' do
-      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-Y -D MPM -X") }
-      expect(filetype).to receive(:write).once.with(%(APACHE2_OPTS="-Y -X -D INFO -D MPM"))
-
-      allow(info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => info)
-      provider_class.flush
-    end
-
-    it 'backups the file once if changes were made' do
-      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="") }
-      expect(filetype).to receive(:write).once.with(%(APACHE2_OPTS="-D INFO -D SSL"))
-
-      allow(info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => info)
-
-      allow(ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => ssl)
-
-      expect(filetype).to receive(:backup)
-
-      provider_class.flush
-    end
-
-    it 'does not write the file or run backups if no changes were made' do
-      expect(filetype).to receive(:read).at_least(:once) { %(APACHE2_OPTS="-X -D INFO -D SSL -Y") }
-      expect(filetype).to receive(:write).never
-
-      allow(info).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('info' => info)
-
-      allow(ssl).to receive(:should).with(:ensure) { :present }
-      provider_class.prefetch('ssl' => ssl)
-
-      expect(filetype).to receive(:backup).never
-      provider_class.flush
-    end
-  end
-end

From c277277b3c7052100fb3d1b30d2a25f7c753dc86 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:06:20 +0000
Subject: [PATCH 2054/2267] Release prep v8.5.0

---
 CHANGELOG.md  |   15 +-
 REFERENCE.md  | 5351 +++++++++++++++++++++++++------------------------
 metadata.json |    2 +-
 3 files changed, 2699 insertions(+), 2669 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50c9245fd4..1c3ebdc9b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,20 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v8.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.4.0) (2022-11-14)
+## [v8.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.5.0) (2022-12-06)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.4.0...v8.5.0)
+
+### Added
+
+- add LimitRequestLine parameter [\#2345](https://github.com/puppetlabs/puppetlabs-apache/pull/2345) ([stefan-ahrefs](https://github.com/stefan-ahrefs))
+
+### Fixed
+
+- disable::mpm\_event: Fix module deactivation [\#2349](https://github.com/puppetlabs/puppetlabs-apache/pull/2349) ([bastelfreak](https://github.com/bastelfreak))
+- remove \_module from apache::mod::unique\_id name. [\#2339](https://github.com/puppetlabs/puppetlabs-apache/pull/2339) ([mdklapwijk](https://github.com/mdklapwijk))
+
+## [v8.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.4.0) (2022-11-15)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.3.0...v8.4.0)
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 6eda79e72d..d18d6e0380 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -9,108 +9,108 @@
 #### Public Classes
 
 * [`apache`](#apache): Guides the basic setup and installation of Apache on your system.
-* [`apache::dev`](#apachedev): Installs Apache development libraries.
-* [`apache::mod::actions`](#apachemodactions): Installs Apache mod_actions
-* [`apache::mod::alias`](#apachemodalias): Installs and configures `mod_alias`.
-* [`apache::mod::apreq2`](#apachemodapreq2): Installs `mod_apreq2`.
-* [`apache::mod::auth_basic`](#apachemodauth_basic): Installs `mod_auth_basic`
-* [`apache::mod::auth_cas`](#apachemodauth_cas): Installs and configures `mod_auth_cas`.
-* [`apache::mod::auth_gssapi`](#apachemodauth_gssapi): Installs `mod_auth_gsappi`.
-* [`apache::mod::auth_kerb`](#apachemodauth_kerb): Installs `mod_auth_kerb`
-* [`apache::mod::auth_mellon`](#apachemodauth_mellon): Installs and configures `mod_auth_mellon`.
-* [`apache::mod::auth_openidc`](#apachemodauth_openidc): Installs and configures `mod_auth_openidc`.
-* [`apache::mod::authn_core`](#apachemodauthn_core): Installs `mod_authn_core`.
-* [`apache::mod::authn_dbd`](#apachemodauthn_dbd): Installs `mod_authn_dbd`.
-* [`apache::mod::authn_file`](#apachemodauthn_file): Installs `mod_authn_file`.
-* [`apache::mod::authnz_ldap`](#apachemodauthnz_ldap): Installs `mod_authnz_ldap`.
-* [`apache::mod::authnz_pam`](#apachemodauthnz_pam): Installs `mod_authnz_pam`.
-* [`apache::mod::authz_default`](#apachemodauthz_default): Installs and configures `mod_authz_default`.
-* [`apache::mod::authz_groupfile`](#apachemodauthz_groupfile): Installs `mod_authz_groupfile`
-* [`apache::mod::authz_user`](#apachemodauthz_user): Installs `mod_authz_user`
-* [`apache::mod::autoindex`](#apachemodautoindex): Installs `mod_autoindex`
-* [`apache::mod::cache`](#apachemodcache): Installs `mod_cache`
-* [`apache::mod::cgi`](#apachemodcgi): Installs `mod_cgi`.
-* [`apache::mod::cgid`](#apachemodcgid): Installs `mod_cgid`.
-* [`apache::mod::cluster`](#apachemodcluster): Installs `mod_cluster`.
-* [`apache::mod::data`](#apachemoddata): Installs and configures `mod_data`.
-* [`apache::mod::dav`](#apachemoddav): Installs `mod_dav`.
-* [`apache::mod::dav_fs`](#apachemoddav_fs): Installs `mod_dav_fs`.
-* [`apache::mod::dav_svn`](#apachemoddav_svn): Installs and configures `mod_dav_svn`.
-* [`apache::mod::dbd`](#apachemoddbd): Installs `mod_dbd`.
-* [`apache::mod::deflate`](#apachemoddeflate): Installs and configures `mod_deflate`.
-* [`apache::mod::dev`](#apachemoddev): Installs `mod_dev`.
-* [`apache::mod::dir`](#apachemoddir): Installs and configures `mod_dir`.
-* [`apache::mod::disk_cache`](#apachemoddisk_cache): Installs and configures `mod_disk_cache`.
-* [`apache::mod::dumpio`](#apachemoddumpio): Installs and configures `mod_dumpio`.
-* [`apache::mod::env`](#apachemodenv): Installs `mod_env`.
-* [`apache::mod::event`](#apachemodevent): Installs and configures `mod_event`.
-* [`apache::mod::expires`](#apachemodexpires): Installs and configures `mod_expires`.
-* [`apache::mod::ext_filter`](#apachemodext_filter): Installs and configures `mod_ext_filter`.
-* [`apache::mod::fcgid`](#apachemodfcgid): Installs and configures `mod_fcgid`.
-* [`apache::mod::filter`](#apachemodfilter): Installs `mod_filter`.
-* [`apache::mod::geoip`](#apachemodgeoip): Installs and configures `mod_geoip`.
-* [`apache::mod::headers`](#apachemodheaders): Installs and configures `mod_headers`.
-* [`apache::mod::http2`](#apachemodhttp2): Installs and configures `mod_http2`.
-* [`apache::mod::include`](#apachemodinclude): Installs `mod_include`.
-* [`apache::mod::info`](#apachemodinfo): Installs and configures `mod_info`.
-* [`apache::mod::intercept_form_submit`](#apachemodintercept_form_submit): Installs `mod_intercept_form_submit`.
-* [`apache::mod::itk`](#apachemoditk): Installs MPM `mod_itk`.
-* [`apache::mod::jk`](#apachemodjk): Installs `mod_jk`.
-* [`apache::mod::lbmethod_bybusyness`](#apachemodlbmethod_bybusyness): Installs `lbmethod_bybusyness`.
-* [`apache::mod::lbmethod_byrequests`](#apachemodlbmethod_byrequests): Installs `lbmethod_byrequests`.
-* [`apache::mod::lbmethod_bytraffic`](#apachemodlbmethod_bytraffic): Installs `lbmethod_bytraffic`.
-* [`apache::mod::lbmethod_heartbeat`](#apachemodlbmethod_heartbeat): Installs `lbmethod_heartbeat`.
-* [`apache::mod::ldap`](#apachemodldap): Installs and configures `mod_ldap`.
-* [`apache::mod::lookup_identity`](#apachemodlookup_identity): Installs `mod_lookup_identity`
-* [`apache::mod::macro`](#apachemodmacro): Installs `mod_macro`.
-* [`apache::mod::md`](#apachemodmd): Installs and configures `mod_md`.
-* [`apache::mod::mime`](#apachemodmime): Installs and configures `mod_mime`.
-* [`apache::mod::mime_magic`](#apachemodmime_magic): Installs and configures `mod_mime_magic`.
-* [`apache::mod::negotiation`](#apachemodnegotiation): Installs and configures `mod_negotiation`.
-* [`apache::mod::nss`](#apachemodnss): Installs and configures `mod_nss`.
-* [`apache::mod::pagespeed`](#apachemodpagespeed): Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
+* [`apache::dev`](#apache--dev): Installs Apache development libraries.
+* [`apache::mod::actions`](#apache--mod--actions): Installs Apache mod_actions
+* [`apache::mod::alias`](#apache--mod--alias): Installs and configures `mod_alias`.
+* [`apache::mod::apreq2`](#apache--mod--apreq2): Installs `mod_apreq2`.
+* [`apache::mod::auth_basic`](#apache--mod--auth_basic): Installs `mod_auth_basic`
+* [`apache::mod::auth_cas`](#apache--mod--auth_cas): Installs and configures `mod_auth_cas`.
+* [`apache::mod::auth_gssapi`](#apache--mod--auth_gssapi): Installs `mod_auth_gsappi`.
+* [`apache::mod::auth_kerb`](#apache--mod--auth_kerb): Installs `mod_auth_kerb`
+* [`apache::mod::auth_mellon`](#apache--mod--auth_mellon): Installs and configures `mod_auth_mellon`.
+* [`apache::mod::auth_openidc`](#apache--mod--auth_openidc): Installs and configures `mod_auth_openidc`.
+* [`apache::mod::authn_core`](#apache--mod--authn_core): Installs `mod_authn_core`.
+* [`apache::mod::authn_dbd`](#apache--mod--authn_dbd): Installs `mod_authn_dbd`.
+* [`apache::mod::authn_file`](#apache--mod--authn_file): Installs `mod_authn_file`.
+* [`apache::mod::authnz_ldap`](#apache--mod--authnz_ldap): Installs `mod_authnz_ldap`.
+* [`apache::mod::authnz_pam`](#apache--mod--authnz_pam): Installs `mod_authnz_pam`.
+* [`apache::mod::authz_default`](#apache--mod--authz_default): Installs and configures `mod_authz_default`.
+* [`apache::mod::authz_groupfile`](#apache--mod--authz_groupfile): Installs `mod_authz_groupfile`
+* [`apache::mod::authz_user`](#apache--mod--authz_user): Installs `mod_authz_user`
+* [`apache::mod::autoindex`](#apache--mod--autoindex): Installs `mod_autoindex`
+* [`apache::mod::cache`](#apache--mod--cache): Installs `mod_cache`
+* [`apache::mod::cgi`](#apache--mod--cgi): Installs `mod_cgi`.
+* [`apache::mod::cgid`](#apache--mod--cgid): Installs `mod_cgid`.
+* [`apache::mod::cluster`](#apache--mod--cluster): Installs `mod_cluster`.
+* [`apache::mod::data`](#apache--mod--data): Installs and configures `mod_data`.
+* [`apache::mod::dav`](#apache--mod--dav): Installs `mod_dav`.
+* [`apache::mod::dav_fs`](#apache--mod--dav_fs): Installs `mod_dav_fs`.
+* [`apache::mod::dav_svn`](#apache--mod--dav_svn): Installs and configures `mod_dav_svn`.
+* [`apache::mod::dbd`](#apache--mod--dbd): Installs `mod_dbd`.
+* [`apache::mod::deflate`](#apache--mod--deflate): Installs and configures `mod_deflate`.
+* [`apache::mod::dev`](#apache--mod--dev): Installs `mod_dev`.
+* [`apache::mod::dir`](#apache--mod--dir): Installs and configures `mod_dir`.
+* [`apache::mod::disk_cache`](#apache--mod--disk_cache): Installs and configures `mod_disk_cache`.
+* [`apache::mod::dumpio`](#apache--mod--dumpio): Installs and configures `mod_dumpio`.
+* [`apache::mod::env`](#apache--mod--env): Installs `mod_env`.
+* [`apache::mod::event`](#apache--mod--event): Installs and configures `mod_event`.
+* [`apache::mod::expires`](#apache--mod--expires): Installs and configures `mod_expires`.
+* [`apache::mod::ext_filter`](#apache--mod--ext_filter): Installs and configures `mod_ext_filter`.
+* [`apache::mod::fcgid`](#apache--mod--fcgid): Installs and configures `mod_fcgid`.
+* [`apache::mod::filter`](#apache--mod--filter): Installs `mod_filter`.
+* [`apache::mod::geoip`](#apache--mod--geoip): Installs and configures `mod_geoip`.
+* [`apache::mod::headers`](#apache--mod--headers): Installs and configures `mod_headers`.
+* [`apache::mod::http2`](#apache--mod--http2): Installs and configures `mod_http2`.
+* [`apache::mod::include`](#apache--mod--include): Installs `mod_include`.
+* [`apache::mod::info`](#apache--mod--info): Installs and configures `mod_info`.
+* [`apache::mod::intercept_form_submit`](#apache--mod--intercept_form_submit): Installs `mod_intercept_form_submit`.
+* [`apache::mod::itk`](#apache--mod--itk): Installs MPM `mod_itk`.
+* [`apache::mod::jk`](#apache--mod--jk): Installs `mod_jk`.
+* [`apache::mod::lbmethod_bybusyness`](#apache--mod--lbmethod_bybusyness): Installs `lbmethod_bybusyness`.
+* [`apache::mod::lbmethod_byrequests`](#apache--mod--lbmethod_byrequests): Installs `lbmethod_byrequests`.
+* [`apache::mod::lbmethod_bytraffic`](#apache--mod--lbmethod_bytraffic): Installs `lbmethod_bytraffic`.
+* [`apache::mod::lbmethod_heartbeat`](#apache--mod--lbmethod_heartbeat): Installs `lbmethod_heartbeat`.
+* [`apache::mod::ldap`](#apache--mod--ldap): Installs and configures `mod_ldap`.
+* [`apache::mod::lookup_identity`](#apache--mod--lookup_identity): Installs `mod_lookup_identity`
+* [`apache::mod::macro`](#apache--mod--macro): Installs `mod_macro`.
+* [`apache::mod::md`](#apache--mod--md): Installs and configures `mod_md`.
+* [`apache::mod::mime`](#apache--mod--mime): Installs and configures `mod_mime`.
+* [`apache::mod::mime_magic`](#apache--mod--mime_magic): Installs and configures `mod_mime_magic`.
+* [`apache::mod::negotiation`](#apache--mod--negotiation): Installs and configures `mod_negotiation`.
+* [`apache::mod::nss`](#apache--mod--nss): Installs and configures `mod_nss`.
+* [`apache::mod::pagespeed`](#apache--mod--pagespeed): Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
 
 This module does *not* manage the software repositories needed to automatically install the
 mod-pagespeed-stable package. The module does however require that the package be installed,
 or be installable using the system's default package provider.  You should ensure that this
 pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
-* [`apache::mod::passenger`](#apachemodpassenger): Installs `mod_pasenger`.
-* [`apache::mod::perl`](#apachemodperl): Installs `mod_perl`.
-* [`apache::mod::peruser`](#apachemodperuser): Installs `mod_peruser`.
-* [`apache::mod::php`](#apachemodphp): Installs `mod_php`.
-* [`apache::mod::prefork`](#apachemodprefork): Installs and configures MPM `prefork`.
-* [`apache::mod::proxy`](#apachemodproxy): Installs and configures `mod_proxy`.
-* [`apache::mod::proxy_ajp`](#apachemodproxy_ajp): Installs `mod_proxy_ajp`.
-* [`apache::mod::proxy_balancer`](#apachemodproxy_balancer): Installs and configures `mod_proxy_balancer`.
-* [`apache::mod::proxy_connect`](#apachemodproxy_connect): Installs `mod_proxy_connect`.
-* [`apache::mod::proxy_fcgi`](#apachemodproxy_fcgi): Installs `mod_proxy_fcgi`.
-* [`apache::mod::proxy_html`](#apachemodproxy_html): Installs `mod_proxy_html`.
-* [`apache::mod::proxy_http`](#apachemodproxy_http): Installs `mod_proxy_http`.
-* [`apache::mod::proxy_wstunnel`](#apachemodproxy_wstunnel): Installs `mod_proxy_wstunnel`.
-* [`apache::mod::python`](#apachemodpython): Installs and configures `mod_python`.
-* [`apache::mod::remoteip`](#apachemodremoteip): Installs and configures `mod_remoteip`.
-* [`apache::mod::reqtimeout`](#apachemodreqtimeout): Installs and configures `mod_reqtimeout`.
-* [`apache::mod::rewrite`](#apachemodrewrite): Installs `mod_rewrite`.
-* [`apache::mod::rpaf`](#apachemodrpaf): Installs and configures `mod_rpaf`.
-* [`apache::mod::security`](#apachemodsecurity): Installs and configures `mod_security`.
-* [`apache::mod::setenvif`](#apachemodsetenvif): Installs `mod_setenvif`.
-* [`apache::mod::shib`](#apachemodshib): Installs and configures `mod_shib`.
-* [`apache::mod::socache_shmcb`](#apachemodsocache_shmcb): Installs `mod_socache_shmcb`.
-* [`apache::mod::speling`](#apachemodspeling): Installs `mod_spelling`.
-* [`apache::mod::ssl`](#apachemodssl): Installs `mod_ssl`.
-* [`apache::mod::status`](#apachemodstatus): Installs and configures `mod_status`.
-* [`apache::mod::suexec`](#apachemodsuexec): Installs `mod_suexec`.
-* [`apache::mod::userdir`](#apachemoduserdir): Installs and configures `mod_userdir`.
-* [`apache::mod::version`](#apachemodversion): Installs `mod_version`.
-* [`apache::mod::vhost_alias`](#apachemodvhost_alias): Installs Apache `mod_vhost_alias`.
-* [`apache::mod::watchdog`](#apachemodwatchdog): Installs and configures `mod_watchdog`.
-* [`apache::mod::worker`](#apachemodworker): Installs and manages the MPM `worker`.
-* [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
-* [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
-* [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event): disable Apache-Module event
-* [`apache::mpm::disable_mpm_prefork`](#apachempmdisable_mpm_prefork): disable Apache-Module prefork
-* [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker): disable Apache-Module worker
-* [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
+* [`apache::mod::passenger`](#apache--mod--passenger): Installs `mod_pasenger`.
+* [`apache::mod::perl`](#apache--mod--perl): Installs `mod_perl`.
+* [`apache::mod::peruser`](#apache--mod--peruser): Installs `mod_peruser`.
+* [`apache::mod::php`](#apache--mod--php): Installs `mod_php`.
+* [`apache::mod::prefork`](#apache--mod--prefork): Installs and configures MPM `prefork`.
+* [`apache::mod::proxy`](#apache--mod--proxy): Installs and configures `mod_proxy`.
+* [`apache::mod::proxy_ajp`](#apache--mod--proxy_ajp): Installs `mod_proxy_ajp`.
+* [`apache::mod::proxy_balancer`](#apache--mod--proxy_balancer): Installs and configures `mod_proxy_balancer`.
+* [`apache::mod::proxy_connect`](#apache--mod--proxy_connect): Installs `mod_proxy_connect`.
+* [`apache::mod::proxy_fcgi`](#apache--mod--proxy_fcgi): Installs `mod_proxy_fcgi`.
+* [`apache::mod::proxy_html`](#apache--mod--proxy_html): Installs `mod_proxy_html`.
+* [`apache::mod::proxy_http`](#apache--mod--proxy_http): Installs `mod_proxy_http`.
+* [`apache::mod::proxy_wstunnel`](#apache--mod--proxy_wstunnel): Installs `mod_proxy_wstunnel`.
+* [`apache::mod::python`](#apache--mod--python): Installs and configures `mod_python`.
+* [`apache::mod::remoteip`](#apache--mod--remoteip): Installs and configures `mod_remoteip`.
+* [`apache::mod::reqtimeout`](#apache--mod--reqtimeout): Installs and configures `mod_reqtimeout`.
+* [`apache::mod::rewrite`](#apache--mod--rewrite): Installs `mod_rewrite`.
+* [`apache::mod::rpaf`](#apache--mod--rpaf): Installs and configures `mod_rpaf`.
+* [`apache::mod::security`](#apache--mod--security): Installs and configures `mod_security`.
+* [`apache::mod::setenvif`](#apache--mod--setenvif): Installs `mod_setenvif`.
+* [`apache::mod::shib`](#apache--mod--shib): Installs and configures `mod_shib`.
+* [`apache::mod::socache_shmcb`](#apache--mod--socache_shmcb): Installs `mod_socache_shmcb`.
+* [`apache::mod::speling`](#apache--mod--speling): Installs `mod_spelling`.
+* [`apache::mod::ssl`](#apache--mod--ssl): Installs `mod_ssl`.
+* [`apache::mod::status`](#apache--mod--status): Installs and configures `mod_status`.
+* [`apache::mod::suexec`](#apache--mod--suexec): Installs `mod_suexec`.
+* [`apache::mod::userdir`](#apache--mod--userdir): Installs and configures `mod_userdir`.
+* [`apache::mod::version`](#apache--mod--version): Installs `mod_version`.
+* [`apache::mod::vhost_alias`](#apache--mod--vhost_alias): Installs Apache `mod_vhost_alias`.
+* [`apache::mod::watchdog`](#apache--mod--watchdog): Installs and configures `mod_watchdog`.
+* [`apache::mod::worker`](#apache--mod--worker): Installs and manages the MPM `worker`.
+* [`apache::mod::wsgi`](#apache--mod--wsgi): Installs and configures `mod_wsgi`.
+* [`apache::mod::xsendfile`](#apache--mod--xsendfile): Installs `mod_xsendfile`.
+* [`apache::mpm::disable_mpm_event`](#apache--mpm--disable_mpm_event): disable Apache-Module event
+* [`apache::mpm::disable_mpm_prefork`](#apache--mpm--disable_mpm_prefork): disable Apache-Module prefork
+* [`apache::mpm::disable_mpm_worker`](#apache--mpm--disable_mpm_worker): disable Apache-Module worker
+* [`apache::vhosts`](#apache--vhosts): Creates `apache::vhost` defined types.
 
 #### Private Classes
 
@@ -131,22 +131,22 @@ pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet
 
 #### Public Defined types
 
-* [`apache::balancer`](#apachebalancer): This type will create an apache balancer cluster file inside the conf.d
+* [`apache::balancer`](#apache--balancer): This type will create an apache balancer cluster file inside the conf.d
 directory.
-* [`apache::balancermember`](#apachebalancermember): Defines members of `mod_proxy_balancer`
-* [`apache::custom_config`](#apachecustom_config): Adds a custom configuration file to the Apache server's `conf.d` directory.
-* [`apache::fastcgi::server`](#apachefastcgiserver): Defines one or more external FastCGI servers to handle specific file types. Use this
+* [`apache::balancermember`](#apache--balancermember): Defines members of `mod_proxy_balancer`
+* [`apache::custom_config`](#apache--custom_config): Adds a custom configuration file to the Apache server's `conf.d` directory.
+* [`apache::fastcgi::server`](#apache--fastcgi--server): Defines one or more external FastCGI servers to handle specific file types. Use this
 defined type with `mod_fastcgi`.
-* [`apache::listen`](#apachelisten): Adds `Listen` directives to `ports.conf` that define the
+* [`apache::listen`](#apache--listen): Adds `Listen` directives to `ports.conf` that define the
 Apache server's or a virtual host's listening address and port.
-* [`apache::mod`](#apachemod): Installs packages for an Apache module that doesn't have a corresponding
+* [`apache::mod`](#apache--mod): Installs packages for an Apache module that doesn't have a corresponding
 `apache::mod::<MODULE NAME>` class.
-* [`apache::namevirtualhost`](#apachenamevirtualhost): Enables name-based virtual hosts
-* [`apache::vhost`](#apachevhost): Allows specialised configurations for virtual hosts that possess requirements
+* [`apache::namevirtualhost`](#apache--namevirtualhost): Enables name-based virtual hosts
+* [`apache::vhost`](#apache--vhost): Allows specialised configurations for virtual hosts that possess requirements
 outside of the defaults.
-* [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
-* [`apache::vhost::fragment`](#apachevhostfragment): Define a fragment within a vhost
-* [`apache::vhost::proxy`](#apachevhostproxy): Configure a reverse proxy for a vhost
+* [`apache::vhost::custom`](#apache--vhost--custom): A wrapper around the `apache::custom_config` defined type.
+* [`apache::vhost::fragment`](#apache--vhost--fragment): Define a fragment within a vhost
+* [`apache::vhost::proxy`](#apache--vhost--proxy): Configure a reverse proxy for a vhost
 
 #### Private Defined types
 
@@ -162,20 +162,20 @@ outside of the defaults.
 
 ### Functions
 
-* [`apache::apache_pw_hash`](#apacheapache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
-* [`apache::bool2httpd`](#apachebool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
-* [`apache::pw_hash`](#apachepw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
+* [`apache::apache_pw_hash`](#apache--apache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
+* [`apache::bool2httpd`](#apache--bool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
+* [`apache::pw_hash`](#apache--pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
 * [`apache_pw_hash`](#apache_pw_hash): DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
 * [`bool2httpd`](#bool2httpd): DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
 
 ### Data types
 
-* [`Apache::LogLevel`](#apacheloglevel): A string that conforms to the Apache `LogLevel` syntax.
-* [`Apache::ModProxyProtocol`](#apachemodproxyprotocol): Supported protocols / schemes by mod_proxy
-* [`Apache::OIDCSettings`](#apacheoidcsettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
-* [`Apache::ServerTokens`](#apacheservertokens): A string that conforms to the Apache `ServerTokens` syntax.
-* [`Apache::Vhost::Priority`](#apachevhostpriority): The priority on vhost
-* [`Apache::Vhost::ProxyPass`](#apachevhostproxypass): Struct representing reverse proxy configuration for an Apache vhost, used by the Apache::Vhost::Proxy defined resource type.
+* [`Apache::LogLevel`](#Apache--LogLevel): A string that conforms to the Apache `LogLevel` syntax.
+* [`Apache::ModProxyProtocol`](#Apache--ModProxyProtocol): Supported protocols / schemes by mod_proxy
+* [`Apache::OIDCSettings`](#Apache--OIDCSettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
+* [`Apache::ServerTokens`](#Apache--ServerTokens): A string that conforms to the Apache `ServerTokens` syntax.
+* [`Apache::Vhost::Priority`](#Apache--Vhost--Priority): The priority on vhost
+* [`Apache::Vhost::ProxyPass`](#Apache--Vhost--ProxyPass): Struct representing reverse proxy configuration for an Apache vhost, used by the Apache::Vhost::Proxy defined resource type.
 
 ### Tasks
 
@@ -206,96 +206,97 @@ class { 'apache': }
 
 The following parameters are available in the `apache` class:
 
-* [`allow_encoded_slashes`](#allow_encoded_slashes)
-* [`apache_version`](#apache_version)
-* [`conf_dir`](#conf_dir)
-* [`conf_template`](#conf_template)
-* [`confd_dir`](#confd_dir)
-* [`default_charset`](#default_charset)
-* [`default_confd_files`](#default_confd_files)
-* [`default_mods`](#default_mods)
-* [`default_ssl_ca`](#default_ssl_ca)
-* [`default_ssl_cert`](#default_ssl_cert)
-* [`default_ssl_chain`](#default_ssl_chain)
-* [`default_ssl_crl`](#default_ssl_crl)
-* [`default_ssl_crl_path`](#default_ssl_crl_path)
-* [`default_ssl_crl_check`](#default_ssl_crl_check)
-* [`default_ssl_key`](#default_ssl_key)
-* [`default_ssl_reload_on_change`](#default_ssl_reload_on_change)
-* [`default_ssl_vhost`](#default_ssl_vhost)
-* [`default_type`](#default_type)
-* [`default_vhost`](#default_vhost)
-* [`dev_packages`](#dev_packages)
-* [`docroot`](#docroot)
-* [`error_documents`](#error_documents)
-* [`group`](#group)
-* [`httpd_dir`](#httpd_dir)
-* [`http_protocol_options`](#http_protocol_options)
-* [`keepalive`](#keepalive)
-* [`keepalive_timeout`](#keepalive_timeout)
-* [`max_keepalive_requests`](#max_keepalive_requests)
-* [`hostname_lookups`](#hostname_lookups)
-* [`ldap_trusted_mode`](#ldap_trusted_mode)
-* [`ldap_verify_server_cert`](#ldap_verify_server_cert)
-* [`lib_path`](#lib_path)
-* [`log_level`](#log_level)
-* [`log_formats`](#log_formats)
-* [`logroot`](#logroot)
-* [`logroot_mode`](#logroot_mode)
-* [`manage_group`](#manage_group)
-* [`supplementary_groups`](#supplementary_groups)
-* [`manage_user`](#manage_user)
-* [`mod_dir`](#mod_dir)
-* [`mod_libs`](#mod_libs)
-* [`mod_packages`](#mod_packages)
-* [`mpm_module`](#mpm_module)
-* [`package_ensure`](#package_ensure)
-* [`pidfile`](#pidfile)
-* [`ports_file`](#ports_file)
-* [`protocols`](#protocols)
-* [`protocols_honor_order`](#protocols_honor_order)
-* [`purge_configs`](#purge_configs)
-* [`purge_vhost_dir`](#purge_vhost_dir)
-* [`rewrite_lock`](#rewrite_lock)
-* [`sendfile`](#sendfile)
-* [`serveradmin`](#serveradmin)
-* [`servername`](#servername)
-* [`server_root`](#server_root)
-* [`server_signature`](#server_signature)
-* [`server_tokens`](#server_tokens)
-* [`service_enable`](#service_enable)
-* [`service_ensure`](#service_ensure)
-* [`service_name`](#service_name)
-* [`service_manage`](#service_manage)
-* [`service_restart`](#service_restart)
-* [`timeout`](#timeout)
-* [`trace_enable`](#trace_enable)
-* [`use_canonical_name`](#use_canonical_name)
-* [`use_systemd`](#use_systemd)
-* [`file_mode`](#file_mode)
-* [`root_directory_options`](#root_directory_options)
-* [`root_directory_secured`](#root_directory_secured)
-* [`vhost_dir`](#vhost_dir)
-* [`vhost_include_pattern`](#vhost_include_pattern)
-* [`user`](#user)
-* [`apache_name`](#apache_name)
-* [`error_log`](#error_log)
-* [`scriptalias`](#scriptalias)
-* [`access_log_file`](#access_log_file)
-* [`limitreqfields`](#limitreqfields)
-* [`limitreqfieldsize`](#limitreqfieldsize)
-* [`ip`](#ip)
-* [`purge_vdir`](#purge_vdir)
-* [`conf_enabled`](#conf_enabled)
-* [`vhost_enable_dir`](#vhost_enable_dir)
-* [`manage_vhost_enable_dir`](#manage_vhost_enable_dir)
-* [`mod_enable_dir`](#mod_enable_dir)
-* [`ssl_file`](#ssl_file)
-* [`file_e_tag`](#file_e_tag)
-* [`use_optional_includes`](#use_optional_includes)
-* [`mime_types_additional`](#mime_types_additional)
-
-##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
+* [`allow_encoded_slashes`](#-apache--allow_encoded_slashes)
+* [`apache_version`](#-apache--apache_version)
+* [`conf_dir`](#-apache--conf_dir)
+* [`conf_template`](#-apache--conf_template)
+* [`confd_dir`](#-apache--confd_dir)
+* [`default_charset`](#-apache--default_charset)
+* [`default_confd_files`](#-apache--default_confd_files)
+* [`default_mods`](#-apache--default_mods)
+* [`default_ssl_ca`](#-apache--default_ssl_ca)
+* [`default_ssl_cert`](#-apache--default_ssl_cert)
+* [`default_ssl_chain`](#-apache--default_ssl_chain)
+* [`default_ssl_crl`](#-apache--default_ssl_crl)
+* [`default_ssl_crl_path`](#-apache--default_ssl_crl_path)
+* [`default_ssl_crl_check`](#-apache--default_ssl_crl_check)
+* [`default_ssl_key`](#-apache--default_ssl_key)
+* [`default_ssl_reload_on_change`](#-apache--default_ssl_reload_on_change)
+* [`default_ssl_vhost`](#-apache--default_ssl_vhost)
+* [`default_type`](#-apache--default_type)
+* [`default_vhost`](#-apache--default_vhost)
+* [`dev_packages`](#-apache--dev_packages)
+* [`docroot`](#-apache--docroot)
+* [`error_documents`](#-apache--error_documents)
+* [`group`](#-apache--group)
+* [`httpd_dir`](#-apache--httpd_dir)
+* [`http_protocol_options`](#-apache--http_protocol_options)
+* [`keepalive`](#-apache--keepalive)
+* [`keepalive_timeout`](#-apache--keepalive_timeout)
+* [`max_keepalive_requests`](#-apache--max_keepalive_requests)
+* [`hostname_lookups`](#-apache--hostname_lookups)
+* [`ldap_trusted_mode`](#-apache--ldap_trusted_mode)
+* [`ldap_verify_server_cert`](#-apache--ldap_verify_server_cert)
+* [`lib_path`](#-apache--lib_path)
+* [`log_level`](#-apache--log_level)
+* [`log_formats`](#-apache--log_formats)
+* [`logroot`](#-apache--logroot)
+* [`logroot_mode`](#-apache--logroot_mode)
+* [`manage_group`](#-apache--manage_group)
+* [`supplementary_groups`](#-apache--supplementary_groups)
+* [`manage_user`](#-apache--manage_user)
+* [`mod_dir`](#-apache--mod_dir)
+* [`mod_libs`](#-apache--mod_libs)
+* [`mod_packages`](#-apache--mod_packages)
+* [`mpm_module`](#-apache--mpm_module)
+* [`package_ensure`](#-apache--package_ensure)
+* [`pidfile`](#-apache--pidfile)
+* [`ports_file`](#-apache--ports_file)
+* [`protocols`](#-apache--protocols)
+* [`protocols_honor_order`](#-apache--protocols_honor_order)
+* [`purge_configs`](#-apache--purge_configs)
+* [`purge_vhost_dir`](#-apache--purge_vhost_dir)
+* [`rewrite_lock`](#-apache--rewrite_lock)
+* [`sendfile`](#-apache--sendfile)
+* [`serveradmin`](#-apache--serveradmin)
+* [`servername`](#-apache--servername)
+* [`server_root`](#-apache--server_root)
+* [`server_signature`](#-apache--server_signature)
+* [`server_tokens`](#-apache--server_tokens)
+* [`service_enable`](#-apache--service_enable)
+* [`service_ensure`](#-apache--service_ensure)
+* [`service_name`](#-apache--service_name)
+* [`service_manage`](#-apache--service_manage)
+* [`service_restart`](#-apache--service_restart)
+* [`timeout`](#-apache--timeout)
+* [`trace_enable`](#-apache--trace_enable)
+* [`use_canonical_name`](#-apache--use_canonical_name)
+* [`use_systemd`](#-apache--use_systemd)
+* [`file_mode`](#-apache--file_mode)
+* [`root_directory_options`](#-apache--root_directory_options)
+* [`root_directory_secured`](#-apache--root_directory_secured)
+* [`vhost_dir`](#-apache--vhost_dir)
+* [`vhost_include_pattern`](#-apache--vhost_include_pattern)
+* [`user`](#-apache--user)
+* [`apache_name`](#-apache--apache_name)
+* [`error_log`](#-apache--error_log)
+* [`scriptalias`](#-apache--scriptalias)
+* [`access_log_file`](#-apache--access_log_file)
+* [`limitreqfields`](#-apache--limitreqfields)
+* [`limitreqfieldsize`](#-apache--limitreqfieldsize)
+* [`limitreqline`](#-apache--limitreqline)
+* [`ip`](#-apache--ip)
+* [`purge_vdir`](#-apache--purge_vdir)
+* [`conf_enabled`](#-apache--conf_enabled)
+* [`vhost_enable_dir`](#-apache--vhost_enable_dir)
+* [`manage_vhost_enable_dir`](#-apache--manage_vhost_enable_dir)
+* [`mod_enable_dir`](#-apache--mod_enable_dir)
+* [`ssl_file`](#-apache--ssl_file)
+* [`file_e_tag`](#-apache--file_e_tag)
+* [`use_optional_includes`](#-apache--use_optional_includes)
+* [`mime_types_additional`](#-apache--mime_types_additional)
+
+##### <a name="-apache--allow_encoded_slashes"></a>`allow_encoded_slashes`
 
 Data type: `Optional[Enum['on', 'off', 'nodecode']]`
 
@@ -303,9 +304,9 @@ Sets the server default for the `AllowEncodedSlashes` declaration, which modifie
 responses to URLs containing '\' and '/' characters. If not specified, this parameter omits
 the declaration from the server's configuration and uses Apache's default setting of 'off'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--apache_version"></a>`apache_version`
 
 Data type: `String`
 
@@ -315,7 +316,7 @@ without reason.
 
 Default value: `$apache::version::default`
 
-##### <a name="conf_dir"></a>`conf_dir`
+##### <a name="-apache--conf_dir"></a>`conf_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -323,7 +324,7 @@ Sets the directory where the Apache server's main configuration file is located.
 
 Default value: `$apache::params::conf_dir`
 
-##### <a name="conf_template"></a>`conf_template`
+##### <a name="-apache--conf_template"></a>`conf_template`
 
 Data type: `String`
 
@@ -333,7 +334,7 @@ configuration file customized by `conf.d` entries.
 
 Default value: `$apache::params::conf_template`
 
-##### <a name="confd_dir"></a>`confd_dir`
+##### <a name="-apache--confd_dir"></a>`confd_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -341,15 +342,15 @@ Sets the location of the Apache server's custom configuration directory.
 
 Default value: `$apache::params::confd_dir`
 
-##### <a name="default_charset"></a>`default_charset`
+##### <a name="-apache--default_charset"></a>`default_charset`
 
 Data type: `Optional[String]`
 
 Used as the `AddDefaultCharset` directive in the main configuration file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_confd_files"></a>`default_confd_files`
+##### <a name="-apache--default_confd_files"></a>`default_confd_files`
 
 Data type: `Boolean`
 
@@ -358,9 +359,9 @@ in the directory defined by the `confd_dir` parameter. These configuration files
 correspond to what is typically installed with the Apache package on the server's
 operating system.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="default_mods"></a>`default_mods`
+##### <a name="-apache--default_mods"></a>`default_mods`
 
 Data type: `Variant[Array, Boolean]`
 
@@ -374,9 +375,9 @@ the values of `apache_version` and `mpm_module` parameters. Because these lists
 modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
 If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="default_ssl_ca"></a>`default_ssl_ca`
+##### <a name="-apache--default_ssl_ca"></a>`default_ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -385,9 +386,9 @@ Although the default value results in a functioning Apache server, you **must**
 this parameter with your certificate authority information before deploying this server in
 a production environment.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_cert"></a>`default_ssl_cert`
+##### <a name="-apache--default_ssl_cert"></a>`default_ssl_cert`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -397,7 +398,7 @@ parameter with your certificate location before deploying this server in a produ
 
 Default value: `$apache::params::default_ssl_cert`
 
-##### <a name="default_ssl_chain"></a>`default_ssl_chain`
+##### <a name="-apache--default_ssl_chain"></a>`default_ssl_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -405,9 +406,9 @@ Sets the default SSL chain location.<br />
 Although this default value results in a functioning Apache server, you **must** update
 this parameter with your SSL chain before deploying this server in a production environment.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_crl"></a>`default_ssl_crl`
+##### <a name="-apache--default_ssl_crl"></a>`default_ssl_crl`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -416,9 +417,9 @@ Although this default value results in a functioning Apache server, you **must**
 this parameter with the CRL file path before deploying this server in a production
 environment. You can use this parameter with or in place of the `default_ssl_crl_path`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_crl_path"></a>`default_ssl_crl_path`
+##### <a name="-apache--default_ssl_crl_path"></a>`default_ssl_crl_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -426,9 +427,9 @@ Sets the server's certificate revocation list path, which contains your CRLs.<br
 Although this default value results in a functioning Apache server, you **must** update
 this parameter with the CRL file path before deploying this server in a production environment.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_crl_check"></a>`default_ssl_crl_check`
+##### <a name="-apache--default_ssl_crl_check"></a>`default_ssl_crl_check`
 
 Data type: `Optional[String]`
 
@@ -437,9 +438,9 @@ This parameter applies only to Apache 2.4 or higher and is ignored on older vers
 Although this default value results in a functioning Apache server, you **must** specify
 this parameter when using certificate revocation lists in a production environment.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_key"></a>`default_ssl_key`
+##### <a name="-apache--default_ssl_key"></a>`default_ssl_key`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -450,15 +451,15 @@ environment.
 
 Default value: `$apache::params::default_ssl_key`
 
-##### <a name="default_ssl_reload_on_change"></a>`default_ssl_reload_on_change`
+##### <a name="-apache--default_ssl_reload_on_change"></a>`default_ssl_reload_on_change`
 
 Data type: `Boolean`
 
 Enable reloading of apache if the content of ssl files have changed.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="default_ssl_vhost"></a>`default_ssl_vhost`
+##### <a name="-apache--default_ssl_vhost"></a>`default_ssl_vhost`
 
 Data type: `Boolean`
 
@@ -477,9 +478,9 @@ apache::vhost { 'default-ssl':
 ```
 **Note**: SSL virtual hosts only respond to HTTPS queries.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="default_type"></a>`default_type`
+##### <a name="-apache--default_type"></a>`default_type`
 
 Data type: `String`
 
@@ -489,7 +490,7 @@ newer, and is only for backwards compatibility in configuration files.
 
 Default value: `'none'`
 
-##### <a name="default_vhost"></a>`default_vhost`
+##### <a name="-apache--default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
 
@@ -499,9 +500,9 @@ value to `false`.<br />
 > **Note**: Apache will not start without at least one virtual host. If you set this
 to `false` you must configure a virtual host elsewhere.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="dev_packages"></a>`dev_packages`
+##### <a name="-apache--dev_packages"></a>`dev_packages`
 
 Data type: `Optional[Variant[Array, String]]`
 
@@ -517,7 +518,7 @@ class { 'apache':
 
 Default value: `$apache::params::dev_packages`
 
-##### <a name="docroot"></a>`docroot`
+##### <a name="-apache--docroot"></a>`docroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -525,15 +526,15 @@ Sets the default `DocumentRoot` location.
 
 Default value: `$apache::params::docroot`
 
-##### <a name="error_documents"></a>`error_documents`
+##### <a name="-apache--error_documents"></a>`error_documents`
 
 Data type: `Boolean`
 
 Determines whether to enable [custom error documents](https://httpd.apache.org/docs/current/custom-error.html) on the Apache server.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="group"></a>`group`
+##### <a name="-apache--group"></a>`group`
 
 Data type: `String`
 
@@ -548,7 +549,7 @@ process.
 
 Default value: `$apache::params::group`
 
-##### <a name="httpd_dir"></a>`httpd_dir`
+##### <a name="-apache--httpd_dir"></a>`httpd_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -558,7 +559,7 @@ with the default distribution packages.
 
 Default value: `$apache::params::httpd_dir`
 
-##### <a name="http_protocol_options"></a>`http_protocol_options`
+##### <a name="-apache--http_protocol_options"></a>`http_protocol_options`
 
 Data type: `Optional[String]`
 
@@ -568,7 +569,7 @@ Valid options: any sequence of the following alternative values: `Strict` or `Un
 
 Default value: `$apache::params::http_protocol_options`
 
-##### <a name="keepalive"></a>`keepalive`
+##### <a name="-apache--keepalive"></a>`keepalive`
 
 Data type: `Enum['On', 'Off']`
 
@@ -578,7 +579,7 @@ to set relevant options.<br />
 
 Default value: `$apache::params::keepalive`
 
-##### <a name="keepalive_timeout"></a>`keepalive_timeout`
+##### <a name="-apache--keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Integer`
 
@@ -588,7 +589,7 @@ only relevant if the `keepalive` parameter is enabled.
 
 Default value: `$apache::params::keepalive_timeout`
 
-##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
+##### <a name="-apache--max_keepalive_requests"></a>`max_keepalive_requests`
 
 Data type: `Integer`
 
@@ -596,7 +597,7 @@ Limits the number of requests allowed per connection when the `keepalive` parame
 
 Default value: `$apache::params::max_keepalive_requests`
 
-##### <a name="hostname_lookups"></a>`hostname_lookups`
+##### <a name="-apache--hostname_lookups"></a>`hostname_lookups`
 
 Data type: `Enum['Off', 'On', 'Double', 'off', 'on', 'double']`
 
@@ -606,7 +607,7 @@ CGIs/SSIs in REMOTE_HOST.<br />
 
 Default value: `$apache::params::hostname_lookups`
 
-##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
+##### <a name="-apache--ldap_trusted_mode"></a>`ldap_trusted_mode`
 
 Data type: `Optional[String]`
 
@@ -618,9 +619,9 @@ The following modes are supported:
 Not all LDAP toolkits support all the above modes. An error message will be logged at
 runtime if a mode is not supported, and the connection to the LDAP server will fail.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_verify_server_cert"></a>`ldap_verify_server_cert`
+##### <a name="-apache--ldap_verify_server_cert"></a>`ldap_verify_server_cert`
 
 Data type: `Optional[Enum['On', 'Off', 'on', 'off']]`
 
@@ -628,9 +629,9 @@ Specifies whether to force the verification of a server certificate when establi
 connection to the LDAP server.
 On|Off
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="lib_path"></a>`lib_path`
+##### <a name="-apache--lib_path"></a>`lib_path`
 
 Data type: `String`
 
@@ -639,7 +640,7 @@ Specifies the location whereApache module files are stored.<br />
 
 Default value: `$apache::params::lib_path`
 
-##### <a name="log_level"></a>`log_level`
+##### <a name="-apache--log_level"></a>`log_level`
 
 Data type: `Apache::LogLevel`
 
@@ -648,7 +649,7 @@ which adjusts the verbosity of the messages recorded in the error logs.
 
 Default value: `$apache::params::log_level`
 
-##### <a name="log_formats"></a>`log_formats`
+##### <a name="-apache--log_formats"></a>`log_formats`
 
 Data type: `Hash`
 
@@ -668,7 +669,7 @@ If your `log_formats` parameter contains one of those, it will be overwritten wi
 
 Default value: `{}`
 
-##### <a name="logroot"></a>`logroot`
+##### <a name="-apache--logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -676,7 +677,7 @@ Changes the directory of Apache log files for the virtual host.
 
 Default value: `$apache::params::logroot`
 
-##### <a name="logroot_mode"></a>`logroot_mode`
+##### <a name="-apache--logroot_mode"></a>`logroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
@@ -687,7 +688,7 @@ for details.
 
 Default value: `$apache::params::logroot_mode`
 
-##### <a name="manage_group"></a>`manage_group`
+##### <a name="-apache--manage_group"></a>`manage_group`
 
 Data type: `Boolean`
 
@@ -696,9 +697,9 @@ If you have a group created from another Puppet module that you want to use to r
 set this to `false`. Without this parameter, attempting to use a previously established
 group results in a duplicate resource error.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="supplementary_groups"></a>`supplementary_groups`
+##### <a name="-apache--supplementary_groups"></a>`supplementary_groups`
 
 Data type: `Array`
 
@@ -707,7 +708,7 @@ Notice: This option only has an effect when `manage_user` is set to true.
 
 Default value: `[]`
 
-##### <a name="manage_user"></a>`manage_user`
+##### <a name="-apache--manage_user"></a>`manage_user`
 
 Data type: `Boolean`
 
@@ -716,9 +717,9 @@ This is for instances when you have a user, created from another Puppet module,
 to use to run Apache. Without this parameter, attempting to use a previously established
 user would result in a duplicate resource error.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="mod_dir"></a>`mod_dir`
+##### <a name="-apache--mod_dir"></a>`mod_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -726,7 +727,7 @@ Sets where Puppet places configuration files for your Apache modules.
 
 Default value: `$apache::params::mod_dir`
 
-##### <a name="mod_libs"></a>`mod_libs`
+##### <a name="-apache--mod_libs"></a>`mod_libs`
 
 Data type: `Hash`
 
@@ -742,7 +743,7 @@ class { 'apache':
 
 Default value: `$apache::params::mod_libs`
 
-##### <a name="mod_packages"></a>`mod_packages`
+##### <a name="-apache--mod_packages"></a>`mod_packages`
 
 Data type: `Hash`
 
@@ -758,7 +759,7 @@ class { 'apache':
 
 Default value: `$apache::params::mod_packages`
 
-##### <a name="mpm_module"></a>`mpm_module`
+##### <a name="-apache--mpm_module"></a>`mpm_module`
 
 Data type: `Variant[Boolean, String]`
 
@@ -773,7 +774,7 @@ You must set this to `false` to explicitly declare the following classes with cu
 
 Default value: `$apache::params::mpm_module`
 
-##### <a name="package_ensure"></a>`package_ensure`
+##### <a name="-apache--package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -782,7 +783,7 @@ Controls the `package` resource's `ensure` attribute. Valid values are: `absent`
 
 Default value: `'installed'`
 
-##### <a name="pidfile"></a>`pidfile`
+##### <a name="-apache--pidfile"></a>`pidfile`
 
 Data type: `String`
 
@@ -790,7 +791,7 @@ Allows settting a custom location for the pid file. Useful if using a custom-bui
 
 Default value: `$apache::params::pidfile`
 
-##### <a name="ports_file"></a>`ports_file`
+##### <a name="-apache--ports_file"></a>`ports_file`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -798,7 +799,7 @@ Sets the path to the file containing Apache ports configuration.
 
 Default value: `$apache::params::ports_file`
 
-##### <a name="protocols"></a>`protocols`
+##### <a name="-apache--protocols"></a>`protocols`
 
 Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
@@ -807,16 +808,16 @@ directive, which lists available protocols for the server.
 
 Default value: `[]`
 
-##### <a name="protocols_honor_order"></a>`protocols_honor_order`
+##### <a name="-apache--protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
 Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
 directive which determines whether the order of Protocols sets precedence during negotiation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="purge_configs"></a>`purge_configs`
+##### <a name="-apache--purge_configs"></a>`purge_configs`
 
 Data type: `Boolean`
 
@@ -825,9 +826,9 @@ Setting this to `false` is a stopgap measure to allow the apache module to coexi
 existing or unmanaged configurations. We recommend moving your configuration to resources
 within this module. For virtual host configurations, see `purge_vhost_dir`.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="purge_vhost_dir"></a>`purge_vhost_dir`
+##### <a name="-apache--purge_vhost_dir"></a>`purge_vhost_dir`
 
 Data type: `Optional[Boolean]`
 
@@ -837,9 +838,9 @@ by Puppet.<br />
 Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to
 coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rewrite_lock"></a>`rewrite_lock`
+##### <a name="-apache--rewrite_lock"></a>`rewrite_lock`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -847,9 +848,9 @@ Allows setting a custom location for a rewrite lock - considered best practice i
 a RewriteMap of type prg in the `rewrites` parameter of your virtual host. This parameter
 only applies to Apache version 2.2 or lower and is ignored on newer versions.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="sendfile"></a>`sendfile`
+##### <a name="-apache--sendfile"></a>`sendfile`
 
 Data type: `Enum['On', 'Off', 'on', 'off']`
 
@@ -858,15 +859,15 @@ Forces Apache to use the Linux kernel's `sendfile` support to serve static files
 
 Default value: `'On'`
 
-##### <a name="serveradmin"></a>`serveradmin`
+##### <a name="-apache--serveradmin"></a>`serveradmin`
 
 Data type: `Optional[String[1]]`
 
 Sets the Apache server administrator's contact information via Apache's `ServerAdmin` directive.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="servername"></a>`servername`
+##### <a name="-apache--servername"></a>`servername`
 
 Data type: `Optional[String]`
 
@@ -875,7 +876,7 @@ Setting to `false` will not set ServerName at all.
 
 Default value: `$apache::params::servername`
 
-##### <a name="server_root"></a>`server_root`
+##### <a name="-apache--server_root"></a>`server_root`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -883,7 +884,7 @@ Sets the Apache server's root directory via Apache's `ServerRoot` directive.
 
 Default value: `$apache::params::server_root`
 
-##### <a name="server_signature"></a>`server_signature`
+##### <a name="-apache--server_signature"></a>`server_signature`
 
 Data type: `Variant[Enum['On', 'Off'], String]`
 
@@ -893,7 +894,7 @@ directive. Valid values are: `On` or `Off`.
 
 Default value: `'On'`
 
-##### <a name="server_tokens"></a>`server_tokens`
+##### <a name="-apache--server_tokens"></a>`server_tokens`
 
 Data type: `Apache::ServerTokens`
 
@@ -902,15 +903,15 @@ system, via Apache's `ServerTokens` directive.
 
 Default value: `'Prod'`
 
-##### <a name="service_enable"></a>`service_enable`
+##### <a name="-apache--service_enable"></a>`service_enable`
 
 Data type: `Boolean`
 
 Determines whether Puppet enables the Apache HTTPD service when the system is booted.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="service_ensure"></a>`service_ensure`
+##### <a name="-apache--service_ensure"></a>`service_ensure`
 
 Data type: `Variant[Stdlib::Ensure::Service, Boolean]`
 
@@ -922,7 +923,7 @@ application, such as Pacemaker.<br />
 
 Default value: `'running'`
 
-##### <a name="service_name"></a>`service_name`
+##### <a name="-apache--service_name"></a>`service_name`
 
 Data type: `String`
 
@@ -930,24 +931,24 @@ Sets the name of the Apache service.
 
 Default value: `$apache::params::service_name`
 
-##### <a name="service_manage"></a>`service_manage`
+##### <a name="-apache--service_manage"></a>`service_manage`
 
 Data type: `Boolean`
 
 Determines whether Puppet manages the HTTPD service's state.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="service_restart"></a>`service_restart`
+##### <a name="-apache--service_restart"></a>`service_restart`
 
 Data type: `Optional[String]`
 
 Determines whether Puppet should use a specific command to restart the HTTPD service.
 Values: a command to restart the Apache service.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="timeout"></a>`timeout`
+##### <a name="-apache--timeout"></a>`timeout`
 
 Data type: `Integer[0]`
 
@@ -956,7 +957,7 @@ certain events before failing a request.
 
 Default value: `60`
 
-##### <a name="trace_enable"></a>`trace_enable`
+##### <a name="-apache--trace_enable"></a>`trace_enable`
 
 Data type: `Enum['On', 'Off', 'extended']`
 
@@ -964,7 +965,7 @@ Controls how Apache handles `TRACE` requests (per RFC 2616) via the `TraceEnable
 
 Default value: `'On'`
 
-##### <a name="use_canonical_name"></a>`use_canonical_name`
+##### <a name="-apache--use_canonical_name"></a>`use_canonical_name`
 
 Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
 
@@ -972,9 +973,9 @@ Controls Apache's `UseCanonicalName` directive which controls how Apache handles
 self-referential URLs. If not specified, this parameter omits the declaration from the
 server's configuration and uses Apache's default setting of 'off'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="use_systemd"></a>`use_systemd`
+##### <a name="-apache--use_systemd"></a>`use_systemd`
 
 Data type: `Boolean`
 
@@ -983,7 +984,7 @@ especially useful if using custom-built RPMs.
 
 Default value: `$apache::params::use_systemd`
 
-##### <a name="file_mode"></a>`file_mode`
+##### <a name="-apache--file_mode"></a>`file_mode`
 
 Data type: `Stdlib::Filemode`
 
@@ -992,7 +993,7 @@ Valid values are: a string, with permissions mode in symbolic or numeric notatio
 
 Default value: `$apache::params::file_mode`
 
-##### <a name="root_directory_options"></a>`root_directory_options`
+##### <a name="-apache--root_directory_options"></a>`root_directory_options`
 
 Data type: `Array`
 
@@ -1000,7 +1001,7 @@ Array of the desired options for the `/` directory in httpd.conf.
 
 Default value: `$apache::params::root_directory_options`
 
-##### <a name="root_directory_secured"></a>`root_directory_secured`
+##### <a name="-apache--root_directory_secured"></a>`root_directory_secured`
 
 Data type: `Boolean`
 
@@ -1010,9 +1011,9 @@ allows access to all resources that are missing a more specific access policy. A
 used to allow access to these resources (for example, in a directory block using the
 `directories` parameter).
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="vhost_dir"></a>`vhost_dir`
+##### <a name="-apache--vhost_dir"></a>`vhost_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -1020,7 +1021,7 @@ Changes your virtual host configuration files' location.
 
 Default value: `$apache::params::vhost_dir`
 
-##### <a name="vhost_include_pattern"></a>`vhost_include_pattern`
+##### <a name="-apache--vhost_include_pattern"></a>`vhost_include_pattern`
 
 Data type: `String`
 
@@ -1033,7 +1034,7 @@ files ending in `.conf`.
 
 Default value: `$apache::params::vhost_include_pattern`
 
-##### <a name="user"></a>`user`
+##### <a name="-apache--user"></a>`user`
 
 Data type: `String`
 
@@ -1043,7 +1044,7 @@ To prevent Puppet from managing the user, set the `manage_user` parameter to `fa
 
 Default value: `$apache::params::user`
 
-##### <a name="apache_name"></a>`apache_name`
+##### <a name="-apache--apache_name"></a>`apache_name`
 
 Data type: `String`
 
@@ -1053,7 +1054,7 @@ For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::s
 
 Default value: `$apache::params::apache_name`
 
-##### <a name="error_log"></a>`error_log`
+##### <a name="-apache--error_log"></a>`error_log`
 
 Data type: `String`
 
@@ -1063,7 +1064,7 @@ The name of the error log file for the main server instance. If the string start
 
 Default value: `$apache::params::error_log`
 
-##### <a name="scriptalias"></a>`scriptalias`
+##### <a name="-apache--scriptalias"></a>`scriptalias`
 
 Data type: `String`
 
@@ -1071,7 +1072,7 @@ Directory to use for global script alias
 
 Default value: `$apache::params::scriptalias`
 
-##### <a name="access_log_file"></a>`access_log_file`
+##### <a name="-apache--access_log_file"></a>`access_log_file`
 
 Data type: `String`
 
@@ -1079,7 +1080,7 @@ The name of the access log file for the main server instance.
 
 Default value: `$apache::params::access_log_file`
 
-##### <a name="limitreqfields"></a>`limitreqfields`
+##### <a name="-apache--limitreqfields"></a>`limitreqfields`
 
 Data type: `Integer`
 
@@ -1091,7 +1092,7 @@ response from the server that indicates too many fields were sent in the request
 
 Default value: `100`
 
-##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
+##### <a name="-apache--limitreqfieldsize"></a>`limitreqfieldsize`
 
 Data type: `Integer`
 
@@ -1100,24 +1101,32 @@ be allowed within a request header.
 
 Default value: `8190`
 
-##### <a name="ip"></a>`ip`
+##### <a name="-apache--limitreqline"></a>`limitreqline`
+
+Data type: `Optional[Integer]`
+
+The 'limitreqline' parameter sets the limit on the allowed size of a client's HTTP request-line
+
+Default value: `undef`
+
+##### <a name="-apache--ip"></a>`ip`
 
 Data type: `Optional[String]`
 
 Specifies the ip address
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="purge_vdir"></a>`purge_vdir`
+##### <a name="-apache--purge_vdir"></a>`purge_vdir`
 
 Data type: `Boolean`
 
 Removes all other Apache configs and virtual hosts.<br />
 > **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.<br />
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="conf_enabled"></a>`conf_enabled`
+##### <a name="-apache--conf_enabled"></a>`conf_enabled`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1125,7 +1134,7 @@ Whether the additional config files in `/etc/apache2/conf-enabled` should be man
 
 Default value: `$apache::params::conf_enabled`
 
-##### <a name="vhost_enable_dir"></a>`vhost_enable_dir`
+##### <a name="-apache--vhost_enable_dir"></a>`vhost_enable_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1134,15 +1143,15 @@ they will be symlinked to and from sites-enabled.
 
 Default value: `$apache::params::vhost_enable_dir`
 
-##### <a name="manage_vhost_enable_dir"></a>`manage_vhost_enable_dir`
+##### <a name="-apache--manage_vhost_enable_dir"></a>`manage_vhost_enable_dir`
 
 Data type: `Boolean`
 
 Overides the vhost_enable_dir inherited parameters and allows it to be disabled
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="mod_enable_dir"></a>`mod_enable_dir`
+##### <a name="-apache--mod_enable_dir"></a>`mod_enable_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1150,25 +1159,25 @@ Set's whether the mods-enabled directory should be managed.
 
 Default value: `$apache::params::mod_enable_dir`
 
-##### <a name="ssl_file"></a>`ssl_file`
+##### <a name="-apache--ssl_file"></a>`ssl_file`
 
 Data type: `Optional[String]`
 
 This parameter allows you to set an ssl.conf file to be managed in order to implement
 an SSL Certificate.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="file_e_tag"></a>`file_e_tag`
+##### <a name="-apache--file_e_tag"></a>`file_e_tag`
 
 Data type: `Optional[String]`
 
 Sets the server default for the `FileETag` declaration, which modifies the response header
 field for static files.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="use_optional_includes"></a>`use_optional_includes`
+##### <a name="-apache--use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Boolean`
 
@@ -1177,7 +1186,7 @@ Specifies whether Apache uses the `IncludeOptional` directive instead of `Includ
 
 Default value: `$apache::params::use_optional_includes`
 
-##### <a name="mime_types_additional"></a>`mime_types_additional`
+##### <a name="-apache--mime_types_additional"></a>`mime_types_additional`
 
 Data type: `Hash`
 
@@ -1185,7 +1194,7 @@ Specifies any idditional Internet media (mime) types that you wish to be configu
 
 Default value: `$apache::params::mime_types_additional`
 
-### <a name="apachedev"></a>`apache::dev`
+### <a name="apache--dev"></a>`apache::dev`
 
 The libraries installed depends on the `dev_packages` parameter of the `apache::params`
 class, based on your operating system:
@@ -1194,7 +1203,7 @@ class, based on your operating system:
 - **Gentoo**: `undef`.
 - **Red Hat**: `httpd-devel`.
 
-### <a name="apachemodactions"></a>`apache::mod::actions`
+### <a name="apache--mod--actions"></a>`apache::mod::actions`
 
 Installs Apache mod_actions
 
@@ -1202,7 +1211,7 @@ Installs Apache mod_actions
   * https://httpd.apache.org/docs/current/mod/mod_actions.html
     * for additional documentation.
 
-### <a name="apachemodalias"></a>`apache::mod::alias`
+### <a name="apache--mod--alias"></a>`apache::mod::alias`
 
 Installs and configures `mod_alias`.
 
@@ -1214,20 +1223,20 @@ Installs and configures `mod_alias`.
 
 The following parameters are available in the `apache::mod::alias` class:
 
-* [`apache_version`](#apache_version)
-* [`icons_options`](#icons_options)
-* [`icons_path`](#icons_path)
-* [`icons_prefix`](#icons_prefix)
+* [`apache_version`](#-apache--mod--alias--apache_version)
+* [`icons_options`](#-apache--mod--alias--icons_options)
+* [`icons_path`](#-apache--mod--alias--icons_path)
+* [`icons_prefix`](#-apache--mod--alias--icons_prefix)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--alias--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 The version of Apache, if not set will be retrieved from the init class.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="icons_options"></a>`icons_options`
+##### <a name="-apache--mod--alias--icons_options"></a>`icons_options`
 
 Data type: `String`
 
@@ -1236,7 +1245,7 @@ directive.
 
 Default value: `'Indexes MultiViews'`
 
-##### <a name="icons_path"></a>`icons_path`
+##### <a name="-apache--mod--alias--icons_path"></a>`icons_path`
 
 Data type: `Variant[Boolean, Stdlib::Absolutepath]`
 
@@ -1249,7 +1258,7 @@ Set to 'false' to disable the alias
 
 Default value: `$apache::params::alias_icons_path`
 
-##### <a name="icons_prefix"></a>`icons_prefix`
+##### <a name="-apache--mod--alias--icons_prefix"></a>`icons_prefix`
 
 Data type: `String`
 
@@ -1257,7 +1266,7 @@ Change the alias for /icons/.
 
 Default value: `$apache::params::icons_prefix`
 
-### <a name="apachemodapreq2"></a>`apache::mod::apreq2`
+### <a name="apache--mod--apreq2"></a>`apache::mod::apreq2`
 
 Installs `mod_apreq2`.
 
@@ -1267,7 +1276,7 @@ Installs `mod_apreq2`.
   * http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html
     * for additional documentation.
 
-### <a name="apachemodauth_basic"></a>`apache::mod::auth_basic`
+### <a name="apache--mod--auth_basic"></a>`apache::mod::auth_basic`
 
 Installs `mod_auth_basic`
 
@@ -1275,7 +1284,7 @@ Installs `mod_auth_basic`
   * https://httpd.apache.org/docs/current/mod/mod_auth_basic.html
     * for additional documentation.
 
-### <a name="apachemodauth_cas"></a>`apache::mod::auth_cas`
+### <a name="apache--mod--auth_cas"></a>`apache::mod::auth_cas`
 
 Installs and configures `mod_auth_cas`.
 
@@ -1289,45 +1298,45 @@ Installs and configures `mod_auth_cas`.
 
 The following parameters are available in the `apache::mod::auth_cas` class:
 
-* [`cas_login_url`](#cas_login_url)
-* [`cas_validate_url`](#cas_validate_url)
-* [`cas_cookie_path`](#cas_cookie_path)
-* [`cas_cookie_path_mode`](#cas_cookie_path_mode)
-* [`cas_version`](#cas_version)
-* [`cas_debug`](#cas_debug)
-* [`cas_validate_server`](#cas_validate_server)
-* [`cas_validate_depth`](#cas_validate_depth)
-* [`cas_certificate_path`](#cas_certificate_path)
-* [`cas_proxy_validate_url`](#cas_proxy_validate_url)
-* [`cas_root_proxied_as`](#cas_root_proxied_as)
-* [`cas_cookie_entropy`](#cas_cookie_entropy)
-* [`cas_timeout`](#cas_timeout)
-* [`cas_idle_timeout`](#cas_idle_timeout)
-* [`cas_cache_clean_interval`](#cas_cache_clean_interval)
-* [`cas_cookie_domain`](#cas_cookie_domain)
-* [`cas_cookie_http_only`](#cas_cookie_http_only)
-* [`cas_authoritative`](#cas_authoritative)
-* [`cas_validate_saml`](#cas_validate_saml)
-* [`cas_sso_enabled`](#cas_sso_enabled)
-* [`cas_attribute_prefix`](#cas_attribute_prefix)
-* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
-* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
-* [`suppress_warning`](#suppress_warning)
-
-##### <a name="cas_login_url"></a>`cas_login_url`
+* [`cas_login_url`](#-apache--mod--auth_cas--cas_login_url)
+* [`cas_validate_url`](#-apache--mod--auth_cas--cas_validate_url)
+* [`cas_cookie_path`](#-apache--mod--auth_cas--cas_cookie_path)
+* [`cas_cookie_path_mode`](#-apache--mod--auth_cas--cas_cookie_path_mode)
+* [`cas_version`](#-apache--mod--auth_cas--cas_version)
+* [`cas_debug`](#-apache--mod--auth_cas--cas_debug)
+* [`cas_validate_server`](#-apache--mod--auth_cas--cas_validate_server)
+* [`cas_validate_depth`](#-apache--mod--auth_cas--cas_validate_depth)
+* [`cas_certificate_path`](#-apache--mod--auth_cas--cas_certificate_path)
+* [`cas_proxy_validate_url`](#-apache--mod--auth_cas--cas_proxy_validate_url)
+* [`cas_root_proxied_as`](#-apache--mod--auth_cas--cas_root_proxied_as)
+* [`cas_cookie_entropy`](#-apache--mod--auth_cas--cas_cookie_entropy)
+* [`cas_timeout`](#-apache--mod--auth_cas--cas_timeout)
+* [`cas_idle_timeout`](#-apache--mod--auth_cas--cas_idle_timeout)
+* [`cas_cache_clean_interval`](#-apache--mod--auth_cas--cas_cache_clean_interval)
+* [`cas_cookie_domain`](#-apache--mod--auth_cas--cas_cookie_domain)
+* [`cas_cookie_http_only`](#-apache--mod--auth_cas--cas_cookie_http_only)
+* [`cas_authoritative`](#-apache--mod--auth_cas--cas_authoritative)
+* [`cas_validate_saml`](#-apache--mod--auth_cas--cas_validate_saml)
+* [`cas_sso_enabled`](#-apache--mod--auth_cas--cas_sso_enabled)
+* [`cas_attribute_prefix`](#-apache--mod--auth_cas--cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#-apache--mod--auth_cas--cas_attribute_delimiter)
+* [`cas_scrub_request_headers`](#-apache--mod--auth_cas--cas_scrub_request_headers)
+* [`suppress_warning`](#-apache--mod--auth_cas--suppress_warning)
+
+##### <a name="-apache--mod--auth_cas--cas_login_url"></a>`cas_login_url`
 
 Data type: `String`
 
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
 
-##### <a name="cas_validate_url"></a>`cas_validate_url`
+##### <a name="-apache--mod--auth_cas--cas_validate_url"></a>`cas_validate_url`
 
 Data type: `String`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
-##### <a name="cas_cookie_path"></a>`cas_cookie_path`
+##### <a name="-apache--mod--auth_cas--cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `String`
 
@@ -1336,7 +1345,7 @@ be writable by the web server only.
 
 Default value: `$apache::params::cas_cookie_path`
 
-##### <a name="cas_cookie_path_mode"></a>`cas_cookie_path_mode`
+##### <a name="-apache--mod--auth_cas--cas_cookie_path_mode"></a>`cas_cookie_path_mode`
 
 Data type: `Stdlib::Filemode`
 
@@ -1344,7 +1353,7 @@ The mode of cas_cookie_path.
 
 Default value: `'0750'`
 
-##### <a name="cas_version"></a>`cas_version`
+##### <a name="-apache--mod--auth_cas--cas_version"></a>`cas_version`
 
 Data type: `Integer`
 
@@ -1352,7 +1361,7 @@ The version of the CAS protocol to adhere to.
 
 Default value: `2`
 
-##### <a name="cas_debug"></a>`cas_debug`
+##### <a name="-apache--mod--auth_cas--cas_debug"></a>`cas_debug`
 
 Data type: `String`
 
@@ -1360,156 +1369,156 @@ Whether to enable or disable debug mode.
 
 Default value: `'Off'`
 
-##### <a name="cas_validate_server"></a>`cas_validate_server`
+##### <a name="-apache--mod--auth_cas--cas_validate_server"></a>`cas_validate_server`
 
 Data type: `Optional[String]`
 
 Whether to validate the presented certificate. This has been deprecated and
 removed from Version 1.1-RC1 onward.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_validate_depth"></a>`cas_validate_depth`
+##### <a name="-apache--mod--auth_cas--cas_validate_depth"></a>`cas_validate_depth`
 
 Data type: `Optional[String]`
 
 The maximum depth for chained certificate validation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_certificate_path"></a>`cas_certificate_path`
+##### <a name="-apache--mod--auth_cas--cas_certificate_path"></a>`cas_certificate_path`
 
 Data type: `Optional[String]`
 
 The path leading to the certificate
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_proxy_validate_url"></a>`cas_proxy_validate_url`
+##### <a name="-apache--mod--auth_cas--cas_proxy_validate_url"></a>`cas_proxy_validate_url`
 
 Data type: `Optional[String]`
 
 The URL to use when performing a proxy validation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
+##### <a name="-apache--mod--auth_cas--cas_root_proxied_as"></a>`cas_root_proxied_as`
 
 Data type: `Optional[String]`
 
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cookie_entropy"></a>`cas_cookie_entropy`
+##### <a name="-apache--mod--auth_cas--cas_cookie_entropy"></a>`cas_cookie_entropy`
 
 Data type: `Optional[String]`
 
 When creating a local session, this many random bytes are used to create a unique
 session identifier.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_timeout"></a>`cas_timeout`
+##### <a name="-apache--mod--auth_cas--cas_timeout"></a>`cas_timeout`
 
 Data type: `Optional[Variant[Integer[0],String]]`
 
 The hard limit, in seconds, for a mod_auth_cas session.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_idle_timeout"></a>`cas_idle_timeout`
+##### <a name="-apache--mod--auth_cas--cas_idle_timeout"></a>`cas_idle_timeout`
 
 Data type: `Optional[Variant[Integer[0],String]]`
 
 The limit, in seconds, of how long a mod_auth_cas session can be idle.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cache_clean_interval"></a>`cas_cache_clean_interval`
+##### <a name="-apache--mod--auth_cas--cas_cache_clean_interval"></a>`cas_cache_clean_interval`
 
 Data type: `Optional[String]`
 
 The minimum amount of time that must pass inbetween cache cleanings.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cookie_domain"></a>`cas_cookie_domain`
+##### <a name="-apache--mod--auth_cas--cas_cookie_domain"></a>`cas_cookie_domain`
 
 Data type: `Optional[String]`
 
 The value for the 'Domain=' parameter in the Set-Cookie header.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cookie_http_only"></a>`cas_cookie_http_only`
+##### <a name="-apache--mod--auth_cas--cas_cookie_http_only"></a>`cas_cookie_http_only`
 
 Data type: `Optional[String]`
 
 Setting this flag prevents the mod_auth_cas cookies from being accessed by
 client side Javascript.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_authoritative"></a>`cas_authoritative`
+##### <a name="-apache--mod--auth_cas--cas_authoritative"></a>`cas_authoritative`
 
 Data type: `Optional[String]`
 
 Determines whether an optional authorization directive is authoritative and thus binding.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_validate_saml"></a>`cas_validate_saml`
+##### <a name="-apache--mod--auth_cas--cas_validate_saml"></a>`cas_validate_saml`
 
 Data type: `Optional[String]`
 
 Parse response from CAS server for SAML.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
+##### <a name="-apache--mod--auth_cas--cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Optional[String]`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
+##### <a name="-apache--mod--auth_cas--cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Optional[String]`
 
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
+##### <a name="-apache--mod--auth_cas--cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Optional[String]`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
+##### <a name="-apache--mod--auth_cas--cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
 Data type: `Optional[String]`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="suppress_warning"></a>`suppress_warning`
+##### <a name="-apache--mod--auth_cas--suppress_warning"></a>`suppress_warning`
 
 Data type: `Boolean`
 
 Suppress warning about being on RedHat (mod_auth_cas package is now available in epel-testing repo).
 
-Default value: ``false``
+Default value: `false`
 
-### <a name="apachemodauth_gssapi"></a>`apache::mod::auth_gssapi`
+### <a name="apache--mod--auth_gssapi"></a>`apache::mod::auth_gssapi`
 
 Installs `mod_auth_gsappi`.
 
@@ -1517,7 +1526,7 @@ Installs `mod_auth_gsappi`.
   * https://github.com/modauthgssapi/mod_auth_gssapi
     * for additional documentation.
 
-### <a name="apachemodauth_kerb"></a>`apache::mod::auth_kerb`
+### <a name="apache--mod--auth_kerb"></a>`apache::mod::auth_kerb`
 
 Installs `mod_auth_kerb`
 
@@ -1525,7 +1534,7 @@ Installs `mod_auth_kerb`
   * http://modauthkerb.sourceforge.net
     * for additional documentation.
 
-### <a name="apachemodauth_mellon"></a>`apache::mod::auth_mellon`
+### <a name="apache--mod--auth_mellon"></a>`apache::mod::auth_mellon`
 
 Installs and configures `mod_auth_mellon`.
 
@@ -1537,15 +1546,15 @@ Installs and configures `mod_auth_mellon`.
 
 The following parameters are available in the `apache::mod::auth_mellon` class:
 
-* [`mellon_cache_size`](#mellon_cache_size)
-* [`mellon_lock_file`](#mellon_lock_file)
-* [`mellon_post_directory`](#mellon_post_directory)
-* [`mellon_cache_entry_size`](#mellon_cache_entry_size)
-* [`mellon_post_ttl`](#mellon_post_ttl)
-* [`mellon_post_size`](#mellon_post_size)
-* [`mellon_post_count`](#mellon_post_count)
+* [`mellon_cache_size`](#-apache--mod--auth_mellon--mellon_cache_size)
+* [`mellon_lock_file`](#-apache--mod--auth_mellon--mellon_lock_file)
+* [`mellon_post_directory`](#-apache--mod--auth_mellon--mellon_post_directory)
+* [`mellon_cache_entry_size`](#-apache--mod--auth_mellon--mellon_cache_entry_size)
+* [`mellon_post_ttl`](#-apache--mod--auth_mellon--mellon_post_ttl)
+* [`mellon_post_size`](#-apache--mod--auth_mellon--mellon_post_size)
+* [`mellon_post_count`](#-apache--mod--auth_mellon--mellon_post_count)
 
-##### <a name="mellon_cache_size"></a>`mellon_cache_size`
+##### <a name="-apache--mod--auth_mellon--mellon_cache_size"></a>`mellon_cache_size`
 
 Data type: `Optional[Integer]`
 
@@ -1553,7 +1562,7 @@ Maximum number of sessions which can be active at once.
 
 Default value: `$apache::params::mellon_cache_size`
 
-##### <a name="mellon_lock_file"></a>`mellon_lock_file`
+##### <a name="-apache--mod--auth_mellon--mellon_lock_file"></a>`mellon_lock_file`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1561,7 +1570,7 @@ Full path to a file used for synchronizing access to the session data.
 
 Default value: `$apache::params::mellon_lock_file`
 
-##### <a name="mellon_post_directory"></a>`mellon_post_directory`
+##### <a name="-apache--mod--auth_mellon--mellon_post_directory"></a>`mellon_post_directory`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1569,39 +1578,39 @@ Full path of a directory where POST requests are saved during authentication.
 
 Default value: `$apache::params::mellon_post_directory`
 
-##### <a name="mellon_cache_entry_size"></a>`mellon_cache_entry_size`
+##### <a name="-apache--mod--auth_mellon--mellon_cache_entry_size"></a>`mellon_cache_entry_size`
 
 Data type: `Optional[Integer]`
 
 Maximum size for a single session entry in bytes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mellon_post_ttl"></a>`mellon_post_ttl`
+##### <a name="-apache--mod--auth_mellon--mellon_post_ttl"></a>`mellon_post_ttl`
 
 Data type: `Optional[Integer]`
 
 Delay in seconds before a saved POST request can be flushed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mellon_post_size"></a>`mellon_post_size`
+##### <a name="-apache--mod--auth_mellon--mellon_post_size"></a>`mellon_post_size`
 
 Data type: `Optional[Integer]`
 
 Maximum size for saved POST requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mellon_post_count"></a>`mellon_post_count`
+##### <a name="-apache--mod--auth_mellon--mellon_post_count"></a>`mellon_post_count`
 
 Data type: `Optional[Integer]`
 
 Maximum amount of saved POST requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodauth_openidc"></a>`apache::mod::auth_openidc`
+### <a name="apache--mod--auth_openidc"></a>`apache::mod::auth_openidc`
 
 Installs and configures `mod_auth_openidc`.
 
@@ -1615,19 +1624,19 @@ Installs and configures `mod_auth_openidc`.
 
 The following parameters are available in the `apache::mod::auth_openidc` class:
 
-* [`manage_dnf_module`](#manage_dnf_module)
-* [`dnf_module_ensure`](#dnf_module_ensure)
-* [`dnf_module_name`](#dnf_module_name)
+* [`manage_dnf_module`](#-apache--mod--auth_openidc--manage_dnf_module)
+* [`dnf_module_ensure`](#-apache--mod--auth_openidc--dnf_module_ensure)
+* [`dnf_module_name`](#-apache--mod--auth_openidc--dnf_module_name)
 
-##### <a name="manage_dnf_module"></a>`manage_dnf_module`
+##### <a name="-apache--mod--auth_openidc--manage_dnf_module"></a>`manage_dnf_module`
 
 Data type: `Boolean`
 
 Whether to manage the DNF module
 
-Default value: `and`
+Default value: `$facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8'`
 
-##### <a name="dnf_module_ensure"></a>`dnf_module_ensure`
+##### <a name="-apache--mod--auth_openidc--dnf_module_ensure"></a>`dnf_module_ensure`
 
 Data type: `String[1]`
 
@@ -1635,7 +1644,7 @@ The DNF module name to ensure. Only relevant if manage_dnf_module is set to true
 
 Default value: `'present'`
 
-##### <a name="dnf_module_name"></a>`dnf_module_name`
+##### <a name="-apache--mod--auth_openidc--dnf_module_name"></a>`dnf_module_name`
 
 Data type: `String[1]`
 
@@ -1643,7 +1652,7 @@ The DNF module name to manage. Only relevant if manage_dnf_module is set to true
 
 Default value: `'mod_auth_openidc'`
 
-### <a name="apachemodauthn_core"></a>`apache::mod::authn_core`
+### <a name="apache--mod--authn_core"></a>`apache::mod::authn_core`
 
 Installs `mod_authn_core`.
 
@@ -1655,9 +1664,9 @@ Installs `mod_authn_core`.
 
 The following parameters are available in the `apache::mod::authn_core` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--authn_core--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--authn_core--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -1665,7 +1674,7 @@ The version of apache being run.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodauthn_dbd"></a>`apache::mod::authn_dbd`
+### <a name="apache--mod--authn_dbd"></a>`apache::mod::authn_dbd`
 
 Installs `mod_authn_dbd`.
 
@@ -1677,22 +1686,22 @@ Installs `mod_authn_dbd`.
 
 The following parameters are available in the `apache::mod::authn_dbd` class:
 
-* [`authn_dbd_params`](#authn_dbd_params)
-* [`authn_dbd_dbdriver`](#authn_dbd_dbdriver)
-* [`authn_dbd_query`](#authn_dbd_query)
-* [`authn_dbd_min`](#authn_dbd_min)
-* [`authn_dbd_max`](#authn_dbd_max)
-* [`authn_dbd_keep`](#authn_dbd_keep)
-* [`authn_dbd_exptime`](#authn_dbd_exptime)
-* [`authn_dbd_alias`](#authn_dbd_alias)
+* [`authn_dbd_params`](#-apache--mod--authn_dbd--authn_dbd_params)
+* [`authn_dbd_dbdriver`](#-apache--mod--authn_dbd--authn_dbd_dbdriver)
+* [`authn_dbd_query`](#-apache--mod--authn_dbd--authn_dbd_query)
+* [`authn_dbd_min`](#-apache--mod--authn_dbd--authn_dbd_min)
+* [`authn_dbd_max`](#-apache--mod--authn_dbd--authn_dbd_max)
+* [`authn_dbd_keep`](#-apache--mod--authn_dbd--authn_dbd_keep)
+* [`authn_dbd_exptime`](#-apache--mod--authn_dbd--authn_dbd_exptime)
+* [`authn_dbd_alias`](#-apache--mod--authn_dbd--authn_dbd_alias)
 
-##### <a name="authn_dbd_params"></a>`authn_dbd_params`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_params"></a>`authn_dbd_params`
 
 Data type: `Optional[String]`
 
 The params needed for the mod to function.
 
-##### <a name="authn_dbd_dbdriver"></a>`authn_dbd_dbdriver`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_dbdriver"></a>`authn_dbd_dbdriver`
 
 Data type: `String`
 
@@ -1700,15 +1709,15 @@ Selects an apr_dbd driver by name.
 
 Default value: `'mysql'`
 
-##### <a name="authn_dbd_query"></a>`authn_dbd_query`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_query"></a>`authn_dbd_query`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="authn_dbd_min"></a>`authn_dbd_min`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_min"></a>`authn_dbd_min`
 
 Data type: `Integer`
 
@@ -1716,7 +1725,7 @@ Set the minimum number of connections per process.
 
 Default value: `4`
 
-##### <a name="authn_dbd_max"></a>`authn_dbd_max`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_max"></a>`authn_dbd_max`
 
 Data type: `Integer`
 
@@ -1724,7 +1733,7 @@ Set the maximum number of connections per process.
 
 Default value: `20`
 
-##### <a name="authn_dbd_keep"></a>`authn_dbd_keep`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_keep"></a>`authn_dbd_keep`
 
 Data type: `Integer`
 
@@ -1732,7 +1741,7 @@ Set the maximum number of connections per process to be sustained.
 
 Default value: `8`
 
-##### <a name="authn_dbd_exptime"></a>`authn_dbd_exptime`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_exptime"></a>`authn_dbd_exptime`
 
 Data type: `Integer`
 
@@ -1741,15 +1750,15 @@ connections specified in DBDKeep has been exceeded.
 
 Default value: `300`
 
-##### <a name="authn_dbd_alias"></a>`authn_dbd_alias`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_alias"></a>`authn_dbd_alias`
 
 Data type: `Optional[String]`
 
 Sets an alias for `AuthnProvider.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodauthn_file"></a>`apache::mod::authn_file`
+### <a name="apache--mod--authn_file"></a>`apache::mod::authn_file`
 
 Installs `mod_authn_file`.
 
@@ -1757,7 +1766,7 @@ Installs `mod_authn_file`.
   * https://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
     * for additional documentation.
 
-### <a name="apachemodauthnz_ldap"></a>`apache::mod::authnz_ldap`
+### <a name="apache--mod--authnz_ldap"></a>`apache::mod::authnz_ldap`
 
 Installs `mod_authnz_ldap`.
 
@@ -1771,26 +1780,26 @@ Installs `mod_authnz_ldap`.
 
 The following parameters are available in the `apache::mod::authnz_ldap` class:
 
-* [`verify_server_cert`](#verify_server_cert)
-* [`package_name`](#package_name)
+* [`verify_server_cert`](#-apache--mod--authnz_ldap--verify_server_cert)
+* [`package_name`](#-apache--mod--authnz_ldap--package_name)
 
-##### <a name="verify_server_cert"></a>`verify_server_cert`
+##### <a name="-apache--mod--authnz_ldap--verify_server_cert"></a>`verify_server_cert`
 
 Data type: `Boolean`
 
 Whether to force te verification of a server cert or not.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--authnz_ldap--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 The name of the ldap package.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodauthnz_pam"></a>`apache::mod::authnz_pam`
+### <a name="apache--mod--authnz_pam"></a>`apache::mod::authnz_pam`
 
 Installs `mod_authnz_pam`.
 
@@ -1798,7 +1807,7 @@ Installs `mod_authnz_pam`.
   * https://www.adelton.com/apache/mod_authnz_pam
     * for additional documentation.
 
-### <a name="apachemodauthz_default"></a>`apache::mod::authz_default`
+### <a name="apache--mod--authz_default"></a>`apache::mod::authz_default`
 
 Installs and configures `mod_authz_default`.
 
@@ -1810,9 +1819,9 @@ Installs and configures `mod_authz_default`.
 
 The following parameters are available in the `apache::mod::authz_default` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--authz_default--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--authz_default--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -1820,7 +1829,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodauthz_groupfile"></a>`apache::mod::authz_groupfile`
+### <a name="apache--mod--authz_groupfile"></a>`apache::mod::authz_groupfile`
 
 Installs `mod_authz_groupfile`
 
@@ -1828,7 +1837,7 @@ Installs `mod_authz_groupfile`
   * https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html
     * for additional documentation.
 
-### <a name="apachemodauthz_user"></a>`apache::mod::authz_user`
+### <a name="apache--mod--authz_user"></a>`apache::mod::authz_user`
 
 Installs `mod_authz_user`
 
@@ -1836,7 +1845,7 @@ Installs `mod_authz_user`
   * https://httpd.apache.org/docs/current/mod/mod_authz_user.html
     * for additional documentation.
 
-### <a name="apachemodautoindex"></a>`apache::mod::autoindex`
+### <a name="apache--mod--autoindex"></a>`apache::mod::autoindex`
 
 Installs `mod_autoindex`
 
@@ -1848,9 +1857,9 @@ Installs `mod_autoindex`
 
 The following parameters are available in the `apache::mod::autoindex` class:
 
-* [`icons_prefix`](#icons_prefix)
+* [`icons_prefix`](#-apache--mod--autoindex--icons_prefix)
 
-##### <a name="icons_prefix"></a>`icons_prefix`
+##### <a name="-apache--mod--autoindex--icons_prefix"></a>`icons_prefix`
 
 Data type: `String`
 
@@ -1858,7 +1867,7 @@ Change the alias for /icons/.
 
 Default value: `$apache::params::icons_prefix`
 
-### <a name="apachemodcache"></a>`apache::mod::cache`
+### <a name="apache--mod--cache"></a>`apache::mod::cache`
 
 Installs `mod_cache`
 
@@ -1866,7 +1875,7 @@ Installs `mod_cache`
   * https://httpd.apache.org/docs/current/mod/mod_cache.html
     * for additional documentation.
 
-### <a name="apachemodcgi"></a>`apache::mod::cgi`
+### <a name="apache--mod--cgi"></a>`apache::mod::cgi`
 
 Installs `mod_cgi`.
 
@@ -1874,14 +1883,14 @@ Installs `mod_cgi`.
   * https://httpd.apache.org/docs/current/mod/mod_cgi.html
     * for additional documentation.
 
-### <a name="apachemodcgid"></a>`apache::mod::cgid`
+### <a name="apache--mod--cgid"></a>`apache::mod::cgid`
 
 Installs `mod_cgid`.
 
 * **See also**
   * https://httpd.apache.org/docs/current/mod/mod_cgid.html
 
-### <a name="apachemodcluster"></a>`apache::mod::cluster`
+### <a name="apache--mod--cluster"></a>`apache::mod::cluster`
 
 Installs `mod_cluster`.
 
@@ -1909,51 +1918,51 @@ class { '::apache::mod::cluster':
 
 The following parameters are available in the `apache::mod::cluster` class:
 
-* [`allowed_network`](#allowed_network)
-* [`balancer_name`](#balancer_name)
-* [`ip`](#ip)
-* [`version`](#version)
-* [`enable_mcpm_receive`](#enable_mcpm_receive)
-* [`port`](#port)
-* [`keep_alive_timeout`](#keep_alive_timeout)
-* [`manager_allowed_network`](#manager_allowed_network)
-* [`max_keep_alive_requests`](#max_keep_alive_requests)
-* [`server_advertise`](#server_advertise)
-* [`advertise_frequency`](#advertise_frequency)
+* [`allowed_network`](#-apache--mod--cluster--allowed_network)
+* [`balancer_name`](#-apache--mod--cluster--balancer_name)
+* [`ip`](#-apache--mod--cluster--ip)
+* [`version`](#-apache--mod--cluster--version)
+* [`enable_mcpm_receive`](#-apache--mod--cluster--enable_mcpm_receive)
+* [`port`](#-apache--mod--cluster--port)
+* [`keep_alive_timeout`](#-apache--mod--cluster--keep_alive_timeout)
+* [`manager_allowed_network`](#-apache--mod--cluster--manager_allowed_network)
+* [`max_keep_alive_requests`](#-apache--mod--cluster--max_keep_alive_requests)
+* [`server_advertise`](#-apache--mod--cluster--server_advertise)
+* [`advertise_frequency`](#-apache--mod--cluster--advertise_frequency)
 
-##### <a name="allowed_network"></a>`allowed_network`
+##### <a name="-apache--mod--cluster--allowed_network"></a>`allowed_network`
 
 Data type: `String`
 
 Balanced members network.
 
-##### <a name="balancer_name"></a>`balancer_name`
+##### <a name="-apache--mod--cluster--balancer_name"></a>`balancer_name`
 
 Data type: `String`
 
 Name of balancer.
 
-##### <a name="ip"></a>`ip`
+##### <a name="-apache--mod--cluster--ip"></a>`ip`
 
 Data type: `Stdlib::IP::Address`
 
 Specifies the IP address to listen to.
 
-##### <a name="version"></a>`version`
+##### <a name="-apache--mod--cluster--version"></a>`version`
 
 Data type: `String`
 
 Specifies the mod_cluster version. Version 1.3.0 or greater is required for httpd 2.4.
 
-##### <a name="enable_mcpm_receive"></a>`enable_mcpm_receive`
+##### <a name="-apache--mod--cluster--enable_mcpm_receive"></a>`enable_mcpm_receive`
 
 Data type: `Boolean`
 
 Whether MCPM should be enabled.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--mod--cluster--port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -1961,7 +1970,7 @@ mod_cluster listen port.
 
 Default value: `6666`
 
-##### <a name="keep_alive_timeout"></a>`keep_alive_timeout`
+##### <a name="-apache--mod--cluster--keep_alive_timeout"></a>`keep_alive_timeout`
 
 Data type: `Integer`
 
@@ -1969,7 +1978,7 @@ Specifies how long Apache should wait for a request, in seconds.
 
 Default value: `60`
 
-##### <a name="manager_allowed_network"></a>`manager_allowed_network`
+##### <a name="-apache--mod--cluster--manager_allowed_network"></a>`manager_allowed_network`
 
 Data type: `Stdlib::IP::Address`
 
@@ -1977,7 +1986,7 @@ Whether to allow the network to access the mod_cluster_manager.
 
 Default value: `'127.0.0.1'`
 
-##### <a name="max_keep_alive_requests"></a>`max_keep_alive_requests`
+##### <a name="-apache--mod--cluster--max_keep_alive_requests"></a>`max_keep_alive_requests`
 
 Data type: `Integer`
 
@@ -1985,23 +1994,23 @@ Maximum number of requests kept alive.
 
 Default value: `0`
 
-##### <a name="server_advertise"></a>`server_advertise`
+##### <a name="-apache--mod--cluster--server_advertise"></a>`server_advertise`
 
 Data type: `Boolean`
 
 Whether the server should advertise.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="advertise_frequency"></a>`advertise_frequency`
+##### <a name="-apache--mod--cluster--advertise_frequency"></a>`advertise_frequency`
 
 Data type: `Optional[String]`
 
 Sets the interval between advertise messages in seconds.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemoddata"></a>`apache::mod::data`
+### <a name="apache--mod--data"></a>`apache::mod::data`
 
 Installs and configures `mod_data`.
 
@@ -2013,17 +2022,17 @@ Installs and configures `mod_data`.
 
 The following parameters are available in the `apache::mod::data` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--data--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--data--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemoddav"></a>`apache::mod::dav`
+### <a name="apache--mod--dav"></a>`apache::mod::dav`
 
 Installs `mod_dav`.
 
@@ -2031,7 +2040,7 @@ Installs `mod_dav`.
   * https://httpd.apache.org/docs/current/mod/mod_dav.html
     * for additional documentation.
 
-### <a name="apachemoddav_fs"></a>`apache::mod::dav_fs`
+### <a name="apache--mod--dav_fs"></a>`apache::mod::dav_fs`
 
 Installs `mod_dav_fs`.
 
@@ -2039,7 +2048,7 @@ Installs `mod_dav_fs`.
   * https://httpd.apache.org/docs/current/mod/mod_dav_fs.html
     * for additional documentation.
 
-### <a name="apachemoddav_svn"></a>`apache::mod::dav_svn`
+### <a name="apache--mod--dav_svn"></a>`apache::mod::dav_svn`
 
 Installs and configures `mod_dav_svn`.
 
@@ -2051,17 +2060,17 @@ Installs and configures `mod_dav_svn`.
 
 The following parameters are available in the `apache::mod::dav_svn` class:
 
-* [`authz_svn_enabled`](#authz_svn_enabled)
+* [`authz_svn_enabled`](#-apache--mod--dav_svn--authz_svn_enabled)
 
-##### <a name="authz_svn_enabled"></a>`authz_svn_enabled`
+##### <a name="-apache--mod--dav_svn--authz_svn_enabled"></a>`authz_svn_enabled`
 
 Data type: `Boolean`
 
 Specifies whether to install Apache mod_authz_svn
 
-Default value: ``false``
+Default value: `false`
 
-### <a name="apachemoddbd"></a>`apache::mod::dbd`
+### <a name="apache--mod--dbd"></a>`apache::mod::dbd`
 
 Installs `mod_dbd`.
 
@@ -2069,7 +2078,7 @@ Installs `mod_dbd`.
   * https://httpd.apache.org/docs/current/mod/mod_dbd.html
     * for additional documentation.
 
-### <a name="apachemoddeflate"></a>`apache::mod::deflate`
+### <a name="apache--mod--deflate"></a>`apache::mod::deflate`
 
 Installs and configures `mod_deflate`.
 
@@ -2081,42 +2090,50 @@ Installs and configures `mod_deflate`.
 
 The following parameters are available in the `apache::mod::deflate` class:
 
-* [`types`](#types)
-* [`notes`](#notes)
+* [`types`](#-apache--mod--deflate--types)
+* [`notes`](#-apache--mod--deflate--notes)
 
-##### <a name="types"></a>`types`
+##### <a name="-apache--mod--deflate--types"></a>`types`
 
 Data type: `Array[String]`
 
 An array of MIME types to be deflated. See https://www.iana.org/assignments/media-types/media-types.xhtml.
 
-Default value: `[
+Default value:
+
+```puppet
+[
     'text/html text/plain text/xml',
     'text/css',
     'application/x-javascript application/javascript application/ecmascript',
     'application/rss+xml',
     'application/json',
-  ]`
+  ]
+```
 
-##### <a name="notes"></a>`notes`
+##### <a name="-apache--mod--deflate--notes"></a>`notes`
 
 Data type: `Hash`
 
 A Hash where the key represents the type and the value represents the note name.
 
-Default value: `{
+Default value:
+
+```puppet
+{
     'Input'  => 'instream',
     'Output' => 'outstream',
     'Ratio'  => 'ratio',
-  }`
+  }
+```
 
-### <a name="apachemoddev"></a>`apache::mod::dev`
+### <a name="apache--mod--dev"></a>`apache::mod::dev`
 
 Installs `mod_dev`.
 
 * **Note** This module is deprecated. Please use `apache::dev`.
 
-### <a name="apachemoddir"></a>`apache::mod::dir`
+### <a name="apache--mod--dir"></a>`apache::mod::dir`
 
 Installs and configures `mod_dir`.
 
@@ -2131,10 +2148,10 @@ DirectoryIndex statements in a vhost configuration
 
 The following parameters are available in the `apache::mod::dir` class:
 
-* [`dir`](#dir)
-* [`indexes`](#indexes)
+* [`dir`](#-apache--mod--dir--dir)
+* [`indexes`](#-apache--mod--dir--indexes)
 
-##### <a name="dir"></a>`dir`
+##### <a name="-apache--mod--dir--dir"></a>`dir`
 
 Data type: `String`
 
@@ -2142,22 +2159,26 @@ Data type: `String`
 
 Default value: `'public_html'`
 
-##### <a name="indexes"></a>`indexes`
+##### <a name="-apache--mod--dir--indexes"></a>`indexes`
 
 Data type: `Array[String]`
 
 Provides a string for the DirectoryIndex directive
 
-Default value: `[
+Default value:
+
+```puppet
+[
     'index.html',
     'index.html.var',
     'index.cgi',
     'index.pl',
     'index.php',
     'index.xhtml',
-  ]`
+  ]
+```
 
-### <a name="apachemoddisk_cache"></a>`apache::mod::disk_cache`
+### <a name="apache--mod--disk_cache"></a>`apache::mod::disk_cache`
 
 Installs and configures `mod_disk_cache`.
 
@@ -2171,11 +2192,11 @@ Installs and configures `mod_disk_cache`.
 
 The following parameters are available in the `apache::mod::disk_cache` class:
 
-* [`cache_root`](#cache_root)
-* [`cache_ignore_headers`](#cache_ignore_headers)
-* [`default_cache_enable`](#default_cache_enable)
+* [`cache_root`](#-apache--mod--disk_cache--cache_root)
+* [`cache_ignore_headers`](#-apache--mod--disk_cache--cache_ignore_headers)
+* [`default_cache_enable`](#-apache--mod--disk_cache--default_cache_enable)
 
-##### <a name="cache_root"></a>`cache_root`
+##### <a name="-apache--mod--disk_cache--cache_root"></a>`cache_root`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -2186,17 +2207,17 @@ Default depends on the Apache version and operating system:
 - Red Hat, Apache 2.4: /var/cache/httpd/proxy
 - Red Hat, Apache 2.2: /var/cache/mod_proxy
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cache_ignore_headers"></a>`cache_ignore_headers`
+##### <a name="-apache--mod--disk_cache--cache_ignore_headers"></a>`cache_ignore_headers`
 
 Data type: `Optional[String]`
 
 Specifies HTTP header(s) that should not be stored in the cache.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_cache_enable"></a>`default_cache_enable`
+##### <a name="-apache--mod--disk_cache--default_cache_enable"></a>`default_cache_enable`
 
 Data type: `Boolean`
 
@@ -2204,9 +2225,9 @@ Default value is true, which enables "CacheEnable disk /" in disk_cache.conf for
 every request to apache by default for every vhost. If set to false the default cache all behaviour is supressed.
 You can then control this behaviour in individual vhosts by explicitly defining CacheEnable.
 
-Default value: ``true``
+Default value: `true`
 
-### <a name="apachemoddumpio"></a>`apache::mod::dumpio`
+### <a name="apache--mod--dumpio"></a>`apache::mod::dumpio`
 
 Installs and configures `mod_dumpio`.
 
@@ -2233,10 +2254,10 @@ class{'apache::mod::dumpio':
 
 The following parameters are available in the `apache::mod::dumpio` class:
 
-* [`dump_io_input`](#dump_io_input)
-* [`dump_io_output`](#dump_io_output)
+* [`dump_io_input`](#-apache--mod--dumpio--dump_io_input)
+* [`dump_io_output`](#-apache--mod--dumpio--dump_io_output)
 
-##### <a name="dump_io_input"></a>`dump_io_input`
+##### <a name="-apache--mod--dumpio--dump_io_input"></a>`dump_io_input`
 
 Data type: `Enum['Off', 'On', 'off', 'on']`
 
@@ -2244,7 +2265,7 @@ Dump all input data to the error log
 
 Default value: `'Off'`
 
-##### <a name="dump_io_output"></a>`dump_io_output`
+##### <a name="-apache--mod--dumpio--dump_io_output"></a>`dump_io_output`
 
 Data type: `Enum['Off', 'On', 'off', 'on']`
 
@@ -2252,7 +2273,7 @@ Dump all output data to the error log
 
 Default value: `'Off'`
 
-### <a name="apachemodenv"></a>`apache::mod::env`
+### <a name="apache--mod--env"></a>`apache::mod::env`
 
 Installs `mod_env`.
 
@@ -2260,7 +2281,7 @@ Installs `mod_env`.
   * https://httpd.apache.org/docs/current/mod/mod_env.html
     * for additional documentation.
 
-### <a name="apachemodevent"></a>`apache::mod::event`
+### <a name="apache--mod--event"></a>`apache::mod::event`
 
 Installs and configures `mod_event`.
 
@@ -2275,20 +2296,20 @@ apache::mod::worker on the same server.
 
 The following parameters are available in the `apache::mod::event` class:
 
-* [`startservers`](#startservers)
-* [`maxclients`](#maxclients)
-* [`maxrequestworkers`](#maxrequestworkers)
-* [`minsparethreads`](#minsparethreads)
-* [`maxsparethreads`](#maxsparethreads)
-* [`threadsperchild`](#threadsperchild)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`maxconnectionsperchild`](#maxconnectionsperchild)
-* [`serverlimit`](#serverlimit)
-* [`apache_version`](#apache_version)
-* [`threadlimit`](#threadlimit)
-* [`listenbacklog`](#listenbacklog)
-
-##### <a name="startservers"></a>`startservers`
+* [`startservers`](#-apache--mod--event--startservers)
+* [`maxclients`](#-apache--mod--event--maxclients)
+* [`maxrequestworkers`](#-apache--mod--event--maxrequestworkers)
+* [`minsparethreads`](#-apache--mod--event--minsparethreads)
+* [`maxsparethreads`](#-apache--mod--event--maxsparethreads)
+* [`threadsperchild`](#-apache--mod--event--threadsperchild)
+* [`maxrequestsperchild`](#-apache--mod--event--maxrequestsperchild)
+* [`maxconnectionsperchild`](#-apache--mod--event--maxconnectionsperchild)
+* [`serverlimit`](#-apache--mod--event--serverlimit)
+* [`apache_version`](#-apache--mod--event--apache_version)
+* [`threadlimit`](#-apache--mod--event--threadlimit)
+* [`listenbacklog`](#-apache--mod--event--listenbacklog)
+
+##### <a name="-apache--mod--event--startservers"></a>`startservers`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2297,7 +2318,7 @@ removes the parameter.
 
 Default value: `2`
 
-##### <a name="maxclients"></a>`maxclients`
+##### <a name="-apache--mod--event--maxclients"></a>`maxclients`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2305,16 +2326,16 @@ Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
 
 Default value: `150`
 
-##### <a name="maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="-apache--mod--event--maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Optional[Variant[Integer, Boolean]]`
 
 Sets the maximum number of connections Apache can simultaneously process, via the module's `MaxRequestWorkers` directive. Setting
 these to `false` removes the parameters.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="minsparethreads"></a>`minsparethreads`
+##### <a name="-apache--mod--event--minsparethreads"></a>`minsparethreads`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2322,7 +2343,7 @@ Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Se
 
 Default value: `25`
 
-##### <a name="maxsparethreads"></a>`maxsparethreads`
+##### <a name="-apache--mod--event--maxsparethreads"></a>`maxsparethreads`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2330,7 +2351,7 @@ Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Se
 
 Default value: `75`
 
-##### <a name="threadsperchild"></a>`threadsperchild`
+##### <a name="-apache--mod--event--threadsperchild"></a>`threadsperchild`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2338,7 +2359,7 @@ Number of threads created by each child process.
 
 Default value: `25`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--event--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2346,15 +2367,15 @@ Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
 
 Default value: `0`
 
-##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
+##### <a name="-apache--mod--event--maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Optional[Variant[Integer, Boolean]]`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="serverlimit"></a>`serverlimit`
+##### <a name="-apache--mod--event--serverlimit"></a>`serverlimit`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2362,15 +2383,15 @@ Limits the configurable number of processes via the `ServerLimit` directive. Set
 
 Default value: `25`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--event--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="threadlimit"></a>`threadlimit`
+##### <a name="-apache--mod--event--threadlimit"></a>`threadlimit`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2378,7 +2399,7 @@ Limits the number of event threads via the module's `ThreadLimit` directive. Set
 
 Default value: `64`
 
-##### <a name="listenbacklog"></a>`listenbacklog`
+##### <a name="-apache--mod--event--listenbacklog"></a>`listenbacklog`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2387,7 +2408,7 @@ the parameter.
 
 Default value: `511`
 
-### <a name="apachemodexpires"></a>`apache::mod::expires`
+### <a name="apache--mod--expires"></a>`apache::mod::expires`
 
 Installs and configures `mod_expires`.
 
@@ -2399,27 +2420,27 @@ Installs and configures `mod_expires`.
 
 The following parameters are available in the `apache::mod::expires` class:
 
-* [`expires_active`](#expires_active)
-* [`expires_default`](#expires_default)
-* [`expires_by_type`](#expires_by_type)
+* [`expires_active`](#-apache--mod--expires--expires_active)
+* [`expires_default`](#-apache--mod--expires--expires_default)
+* [`expires_by_type`](#-apache--mod--expires--expires_by_type)
 
-##### <a name="expires_active"></a>`expires_active`
+##### <a name="-apache--mod--expires--expires_active"></a>`expires_active`
 
 Data type: `Boolean`
 
 Enables generation of Expires headers.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="expires_default"></a>`expires_default`
+##### <a name="-apache--mod--expires--expires_default"></a>`expires_default`
 
 Data type: `Optional[String]`
 
 Specifies the default algorithm for calculating expiration time using ExpiresByType syntax or interval syntax.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="expires_by_type"></a>`expires_by_type`
+##### <a name="-apache--mod--expires--expires_by_type"></a>`expires_by_type`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -2427,9 +2448,9 @@ Describes a set of [MIME content-types](https://www.iana.org/assignments/media-t
 times. This should be used as an array of Hashes, with each Hash's key a valid MIME content-type (i.e. 'text/json') and its
 value following valid interval syntax.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodext_filter"></a>`apache::mod::ext_filter`
+### <a name="apache--mod--ext_filter"></a>`apache::mod::ext_filter`
 
 Installs and configures `mod_ext_filter`.
 
@@ -2454,17 +2475,17 @@ class { 'apache::mod::ext_filter':
 
 The following parameters are available in the `apache::mod::ext_filter` class:
 
-* [`ext_filter_define`](#ext_filter_define)
+* [`ext_filter_define`](#-apache--mod--ext_filter--ext_filter_define)
 
-##### <a name="ext_filter_define"></a>`ext_filter_define`
+##### <a name="-apache--mod--ext_filter--ext_filter_define"></a>`ext_filter_define`
 
 Data type: `Optional[Hash]`
 
 Hash of filter names and their parameters.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodfcgid"></a>`apache::mod::fcgid`
+### <a name="apache--mod--fcgid"></a>`apache::mod::fcgid`
 
 loaded first; Puppet will not automatically enable it if you set the fcgiwrapper parameter in apache::vhost.
   include apache::mod::fcgid
@@ -2507,9 +2528,9 @@ class { 'apache::mod::fcgid':
 
 The following parameters are available in the `apache::mod::fcgid` class:
 
-* [`options`](#options)
+* [`options`](#-apache--mod--fcgid--options)
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--mod--fcgid--options"></a>`options`
 
 Data type: `Hash`
 
@@ -2523,7 +2544,7 @@ expires_by_type
 
 Default value: `{}`
 
-### <a name="apachemodfilter"></a>`apache::mod::filter`
+### <a name="apache--mod--filter"></a>`apache::mod::filter`
 
 Installs `mod_filter`.
 
@@ -2531,7 +2552,7 @@ Installs `mod_filter`.
   * https://httpd.apache.org/docs/current/mod/mod_filter.html
     * for additional documentation.
 
-### <a name="apachemodgeoip"></a>`apache::mod::geoip`
+### <a name="apache--mod--geoip"></a>`apache::mod::geoip`
 
 Installs and configures `mod_geoip`.
 
@@ -2543,24 +2564,24 @@ Installs and configures `mod_geoip`.
 
 The following parameters are available in the `apache::mod::geoip` class:
 
-* [`enable`](#enable)
-* [`db_file`](#db_file)
-* [`flag`](#flag)
-* [`output`](#output)
-* [`enable_utf8`](#enable_utf8)
-* [`scan_proxy_headers`](#scan_proxy_headers)
-* [`scan_proxy_header_field`](#scan_proxy_header_field)
-* [`use_last_xforwarededfor_ip`](#use_last_xforwarededfor_ip)
+* [`enable`](#-apache--mod--geoip--enable)
+* [`db_file`](#-apache--mod--geoip--db_file)
+* [`flag`](#-apache--mod--geoip--flag)
+* [`output`](#-apache--mod--geoip--output)
+* [`enable_utf8`](#-apache--mod--geoip--enable_utf8)
+* [`scan_proxy_headers`](#-apache--mod--geoip--scan_proxy_headers)
+* [`scan_proxy_header_field`](#-apache--mod--geoip--scan_proxy_header_field)
+* [`use_last_xforwarededfor_ip`](#-apache--mod--geoip--use_last_xforwarededfor_ip)
 
-##### <a name="enable"></a>`enable`
+##### <a name="-apache--mod--geoip--enable"></a>`enable`
 
 Data type: `Boolean`
 
 Toggles whether to enable geoip.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="db_file"></a>`db_file`
+##### <a name="-apache--mod--geoip--db_file"></a>`db_file`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -2568,7 +2589,7 @@ Path to database for GeoIP to use.
 
 Default value: `'/usr/share/GeoIP/GeoIP.dat'`
 
-##### <a name="flag"></a>`flag`
+##### <a name="-apache--mod--geoip--flag"></a>`flag`
 
 Data type: `String`
 
@@ -2576,7 +2597,7 @@ Caching directive to use. Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'St
 
 Default value: `'Standard'`
 
-##### <a name="output"></a>`output`
+##### <a name="-apache--mod--geoip--output"></a>`output`
 
 Data type: `String`
 
@@ -2584,39 +2605,39 @@ Output variable locations. Values: 'All', 'Env', 'Request', 'Notes'.
 
 Default value: `'All'`
 
-##### <a name="enable_utf8"></a>`enable_utf8`
+##### <a name="-apache--mod--geoip--enable_utf8"></a>`enable_utf8`
 
 Data type: `Optional[String]`
 
 Changes the output from ISO88591 (Latin1) to UTF8.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="scan_proxy_headers"></a>`scan_proxy_headers`
+##### <a name="-apache--mod--geoip--scan_proxy_headers"></a>`scan_proxy_headers`
 
 Data type: `Optional[String]`
 
 Enables the GeoIPScanProxyHeaders option.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="scan_proxy_header_field"></a>`scan_proxy_header_field`
+##### <a name="-apache--mod--geoip--scan_proxy_header_field"></a>`scan_proxy_header_field`
 
 Data type: `Optional[String]`
 
 Specifies the header mod_geoip uses to determine the client's IP address.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
+##### <a name="-apache--mod--geoip--use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
 
 Data type: `Optional[String]`
 
 Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodheaders"></a>`apache::mod::headers`
+### <a name="apache--mod--headers"></a>`apache::mod::headers`
 
 Installs and configures `mod_headers`.
 
@@ -2624,7 +2645,7 @@ Installs and configures `mod_headers`.
   * https://httpd.apache.org/docs/current/mod/mod_headers.html
     * for additional documentation.
 
-### <a name="apachemodhttp2"></a>`apache::mod::http2`
+### <a name="apache--mod--http2"></a>`apache::mod::http2`
 
 Installs and configures `mod_http2`.
 
@@ -2636,107 +2657,107 @@ Installs and configures `mod_http2`.
 
 The following parameters are available in the `apache::mod::http2` class:
 
-* [`h2_copy_files`](#h2_copy_files)
-* [`h2_direct`](#h2_direct)
-* [`h2_early_hints`](#h2_early_hints)
-* [`h2_max_session_streams`](#h2_max_session_streams)
-* [`h2_max_worker_idle_seconds`](#h2_max_worker_idle_seconds)
-* [`h2_max_workers`](#h2_max_workers)
-* [`h2_min_workers`](#h2_min_workers)
-* [`h2_modern_tls_only`](#h2_modern_tls_only)
-* [`h2_push`](#h2_push)
-* [`h2_push_diary_size`](#h2_push_diary_size)
-* [`h2_push_priority`](#h2_push_priority)
-* [`h2_push_resource`](#h2_push_resource)
-* [`h2_serialize_headers`](#h2_serialize_headers)
-* [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
-* [`h2_tls_cool_down_secs`](#h2_tls_cool_down_secs)
-* [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
-* [`h2_upgrade`](#h2_upgrade)
-* [`h2_window_size`](#h2_window_size)
-* [`apache_version`](#apache_version)
-
-##### <a name="h2_copy_files"></a>`h2_copy_files`
+* [`h2_copy_files`](#-apache--mod--http2--h2_copy_files)
+* [`h2_direct`](#-apache--mod--http2--h2_direct)
+* [`h2_early_hints`](#-apache--mod--http2--h2_early_hints)
+* [`h2_max_session_streams`](#-apache--mod--http2--h2_max_session_streams)
+* [`h2_max_worker_idle_seconds`](#-apache--mod--http2--h2_max_worker_idle_seconds)
+* [`h2_max_workers`](#-apache--mod--http2--h2_max_workers)
+* [`h2_min_workers`](#-apache--mod--http2--h2_min_workers)
+* [`h2_modern_tls_only`](#-apache--mod--http2--h2_modern_tls_only)
+* [`h2_push`](#-apache--mod--http2--h2_push)
+* [`h2_push_diary_size`](#-apache--mod--http2--h2_push_diary_size)
+* [`h2_push_priority`](#-apache--mod--http2--h2_push_priority)
+* [`h2_push_resource`](#-apache--mod--http2--h2_push_resource)
+* [`h2_serialize_headers`](#-apache--mod--http2--h2_serialize_headers)
+* [`h2_stream_max_mem_size`](#-apache--mod--http2--h2_stream_max_mem_size)
+* [`h2_tls_cool_down_secs`](#-apache--mod--http2--h2_tls_cool_down_secs)
+* [`h2_tls_warm_up_size`](#-apache--mod--http2--h2_tls_warm_up_size)
+* [`h2_upgrade`](#-apache--mod--http2--h2_upgrade)
+* [`h2_window_size`](#-apache--mod--http2--h2_window_size)
+* [`apache_version`](#-apache--mod--http2--apache_version)
+
+##### <a name="-apache--mod--http2--h2_copy_files"></a>`h2_copy_files`
 
 Data type: `Optional[Boolean]`
 
 Determine file handling in responses.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_direct"></a>`h2_direct`
+##### <a name="-apache--mod--http2--h2_direct"></a>`h2_direct`
 
 Data type: `Optional[Boolean]`
 
 H2 Direct Protocol Switch.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_early_hints"></a>`h2_early_hints`
+##### <a name="-apache--mod--http2--h2_early_hints"></a>`h2_early_hints`
 
 Data type: `Optional[Boolean]`
 
 Determine sending of 103 status codes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
+##### <a name="-apache--mod--http2--h2_max_session_streams"></a>`h2_max_session_streams`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of active streams per HTTP/2 session.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_max_worker_idle_seconds"></a>`h2_max_worker_idle_seconds`
+##### <a name="-apache--mod--http2--h2_max_worker_idle_seconds"></a>`h2_max_worker_idle_seconds`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of seconds h2 workers remain idle until shut down.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_max_workers"></a>`h2_max_workers`
+##### <a name="-apache--mod--http2--h2_max_workers"></a>`h2_max_workers`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of worker threads to use per child process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_min_workers"></a>`h2_min_workers`
+##### <a name="-apache--mod--http2--h2_min_workers"></a>`h2_min_workers`
 
 Data type: `Optional[Integer]`
 
 Sets minimal number of worker threads to use per child process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
+##### <a name="-apache--mod--http2--h2_modern_tls_only"></a>`h2_modern_tls_only`
 
 Data type: `Optional[Boolean]`
 
 Toggles the security checks on HTTP/2 connections in TLS mode
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push"></a>`h2_push`
+##### <a name="-apache--mod--http2--h2_push"></a>`h2_push`
 
 Data type: `Optional[Boolean]`
 
 Toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
+##### <a name="-apache--mod--http2--h2_push_diary_size"></a>`h2_push_diary_size`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push_priority"></a>`h2_push_priority`
+##### <a name="-apache--mod--http2--h2_push_priority"></a>`h2_push_priority`
 
 Data type: `Array[String]`
 
@@ -2744,7 +2765,7 @@ Require HTTP/2 connections to be "modern TLS" only
 
 Default value: `[]`
 
-##### <a name="h2_push_resource"></a>`h2_push_resource`
+##### <a name="-apache--mod--http2--h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
 
@@ -2753,67 +2774,67 @@ via this directive
 
 Default value: `[]`
 
-##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
+##### <a name="-apache--mod--http2--h2_serialize_headers"></a>`h2_serialize_headers`
 
 Data type: `Optional[Boolean]`
 
 Toggles if HTTP/2 requests shall be serialized in HTTP/1.1 format for processing by httpd
 core or if received binary data shall be passed into the request_recs directly.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
+##### <a name="-apache--mod--http2--h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
 Data type: `Optional[Integer]`
 
 Sets the maximum number of outgoing data bytes buffered in memory for an active streams.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
+##### <a name="-apache--mod--http2--h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
 Data type: `Optional[Integer]`
 
 Sets the number of seconds of idle time on a TLS connection before the TLS write size falls
 back to small (~1300 bytes) length.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
+##### <a name="-apache--mod--http2--h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
 Data type: `Optional[Integer]`
 
 Sets the number of bytes to be sent in small TLS records (~1300 bytes) until doing maximum
 sized writes (16k) on https: HTTP/2 connections.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_upgrade"></a>`h2_upgrade`
+##### <a name="-apache--mod--http2--h2_upgrade"></a>`h2_upgrade`
 
 Data type: `Optional[Boolean]`
 
 Toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_window_size"></a>`h2_window_size`
+##### <a name="-apache--mod--http2--h2_window_size"></a>`h2_window_size`
 
 Data type: `Optional[Integer]`
 
 Sets the size of the window that is used for flow control from client to server and limits
 the amount of data the server has to buffer.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--http2--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodinclude"></a>`apache::mod::include`
+### <a name="apache--mod--include"></a>`apache::mod::include`
 
 Installs `mod_include`.
 
@@ -2821,7 +2842,7 @@ Installs `mod_include`.
   * https://httpd.apache.org/docs/current/mod/mod_include.html
     * for additional documentation.
 
-### <a name="apachemodinfo"></a>`apache::mod::info`
+### <a name="apache--mod--info"></a>`apache::mod::info`
 
 Installs and configures `mod_info`.
 
@@ -2833,12 +2854,12 @@ Installs and configures `mod_info`.
 
 The following parameters are available in the `apache::mod::info` class:
 
-* [`allow_from`](#allow_from)
-* [`apache_version`](#apache_version)
-* [`restrict_access`](#restrict_access)
-* [`info_path`](#info_path)
+* [`allow_from`](#-apache--mod--info--allow_from)
+* [`apache_version`](#-apache--mod--info--apache_version)
+* [`restrict_access`](#-apache--mod--info--restrict_access)
+* [`info_path`](#-apache--mod--info--info_path)
 
-##### <a name="allow_from"></a>`allow_from`
+##### <a name="-apache--mod--info--allow_from"></a>`allow_from`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -2846,24 +2867,24 @@ Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 
 Default value: `['127.0.0.1', '::1']`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--info--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Version of Apache to install module on.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="restrict_access"></a>`restrict_access`
+##### <a name="-apache--mod--info--restrict_access"></a>`restrict_access`
 
 Data type: `Boolean`
 
 Toggles whether to restrict access to info path. If `false`, the `allow_from` allowlist is ignored and any IP address can
 access the info path.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="info_path"></a>`info_path`
+##### <a name="-apache--mod--info--info_path"></a>`info_path`
 
 Data type: `Stdlib::Unixpath`
 
@@ -2871,7 +2892,7 @@ Path on server to file containing server configuration information.
 
 Default value: `'/server-info'`
 
-### <a name="apachemodintercept_form_submit"></a>`apache::mod::intercept_form_submit`
+### <a name="apache--mod--intercept_form_submit"></a>`apache::mod::intercept_form_submit`
 
 Installs `mod_intercept_form_submit`.
 
@@ -2879,7 +2900,7 @@ Installs `mod_intercept_form_submit`.
   * https://www.adelton.com/apache/mod_intercept_form_submit
     * for additional documentation.
 
-### <a name="apachemoditk"></a>`apache::mod::itk`
+### <a name="apache--mod--itk"></a>`apache::mod::itk`
 
 Installs MPM `mod_itk`.
 
@@ -2893,16 +2914,16 @@ Installs MPM `mod_itk`.
 
 The following parameters are available in the `apache::mod::itk` class:
 
-* [`startservers`](#startservers)
-* [`minspareservers`](#minspareservers)
-* [`maxspareservers`](#maxspareservers)
-* [`serverlimit`](#serverlimit)
-* [`maxclients`](#maxclients)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`enablecapabilities`](#enablecapabilities)
-* [`apache_version`](#apache_version)
+* [`startservers`](#-apache--mod--itk--startservers)
+* [`minspareservers`](#-apache--mod--itk--minspareservers)
+* [`maxspareservers`](#-apache--mod--itk--maxspareservers)
+* [`serverlimit`](#-apache--mod--itk--serverlimit)
+* [`maxclients`](#-apache--mod--itk--maxclients)
+* [`maxrequestsperchild`](#-apache--mod--itk--maxrequestsperchild)
+* [`enablecapabilities`](#-apache--mod--itk--enablecapabilities)
+* [`apache_version`](#-apache--mod--itk--apache_version)
 
-##### <a name="startservers"></a>`startservers`
+##### <a name="-apache--mod--itk--startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -2910,7 +2931,7 @@ Number of child server processes created on startup.
 
 Default value: `8`
 
-##### <a name="minspareservers"></a>`minspareservers`
+##### <a name="-apache--mod--itk--minspareservers"></a>`minspareservers`
 
 Data type: `Integer`
 
@@ -2918,7 +2939,7 @@ Minimum number of idle child server processes.
 
 Default value: `5`
 
-##### <a name="maxspareservers"></a>`maxspareservers`
+##### <a name="-apache--mod--itk--maxspareservers"></a>`maxspareservers`
 
 Data type: `Integer`
 
@@ -2926,7 +2947,7 @@ Maximum number of idle child server processes.
 
 Default value: `20`
 
-##### <a name="serverlimit"></a>`serverlimit`
+##### <a name="-apache--mod--itk--serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -2934,7 +2955,7 @@ Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache
 
 Default value: `256`
 
-##### <a name="maxclients"></a>`maxclients`
+##### <a name="-apache--mod--itk--maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -2942,7 +2963,7 @@ Limit on the number of simultaneous requests that will be served.
 
 Default value: `256`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--itk--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -2950,7 +2971,7 @@ Limit on the number of connections that an individual child server process will
 
 Default value: `4000`
 
-##### <a name="enablecapabilities"></a>`enablecapabilities`
+##### <a name="-apache--mod--itk--enablecapabilities"></a>`enablecapabilities`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
@@ -2958,17 +2979,17 @@ Drop most root capabilities in the parent process, and instead run as the user g
 capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor
 capabilities, such as NFS.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--itk--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodjk"></a>`apache::mod::jk`
+### <a name="apache--mod--jk"></a>`apache::mod::jk`
 
 Installs `mod_jk`.
 
@@ -3017,59 +3038,59 @@ class { '::apache::mod::jk':
 
 The following parameters are available in the `apache::mod::jk` class:
 
-* [`ip`](#ip)
-* [`port`](#port)
-* [`add_listen`](#add_listen)
-* [`workers_file`](#workers_file)
-* [`worker_property`](#worker_property)
-* [`logroot`](#logroot)
-* [`shm_file`](#shm_file)
-* [`shm_size`](#shm_size)
-* [`mount_file`](#mount_file)
-* [`mount_file_reload`](#mount_file_reload)
-* [`mount`](#mount)
-* [`un_mount`](#un_mount)
-* [`auto_alias`](#auto_alias)
-* [`mount_copy`](#mount_copy)
-* [`worker_indicator`](#worker_indicator)
-* [`watchdog_interval`](#watchdog_interval)
-* [`log_file`](#log_file)
-* [`log_level`](#log_level)
-* [`log_stamp_format`](#log_stamp_format)
-* [`request_log_format`](#request_log_format)
-* [`extract_ssl`](#extract_ssl)
-* [`https_indicator`](#https_indicator)
-* [`sslprotocol_indicator`](#sslprotocol_indicator)
-* [`certs_indicator`](#certs_indicator)
-* [`cipher_indicator`](#cipher_indicator)
-* [`certchain_prefix`](#certchain_prefix)
-* [`session_indicator`](#session_indicator)
-* [`keysize_indicator`](#keysize_indicator)
-* [`local_name_indicator`](#local_name_indicator)
-* [`ignore_cl_indicator`](#ignore_cl_indicator)
-* [`local_addr_indicator`](#local_addr_indicator)
-* [`local_port_indicator`](#local_port_indicator)
-* [`remote_host_indicator`](#remote_host_indicator)
-* [`remote_addr_indicator`](#remote_addr_indicator)
-* [`remote_port_indicator`](#remote_port_indicator)
-* [`remote_user_indicator`](#remote_user_indicator)
-* [`auth_type_indicator`](#auth_type_indicator)
-* [`options`](#options)
-* [`env_var`](#env_var)
-* [`strip_session`](#strip_session)
-* [`location_list`](#location_list)
-* [`workers_file_content`](#workers_file_content)
-* [`mount_file_content`](#mount_file_content)
-
-##### <a name="ip"></a>`ip`
+* [`ip`](#-apache--mod--jk--ip)
+* [`port`](#-apache--mod--jk--port)
+* [`add_listen`](#-apache--mod--jk--add_listen)
+* [`workers_file`](#-apache--mod--jk--workers_file)
+* [`worker_property`](#-apache--mod--jk--worker_property)
+* [`logroot`](#-apache--mod--jk--logroot)
+* [`shm_file`](#-apache--mod--jk--shm_file)
+* [`shm_size`](#-apache--mod--jk--shm_size)
+* [`mount_file`](#-apache--mod--jk--mount_file)
+* [`mount_file_reload`](#-apache--mod--jk--mount_file_reload)
+* [`mount`](#-apache--mod--jk--mount)
+* [`un_mount`](#-apache--mod--jk--un_mount)
+* [`auto_alias`](#-apache--mod--jk--auto_alias)
+* [`mount_copy`](#-apache--mod--jk--mount_copy)
+* [`worker_indicator`](#-apache--mod--jk--worker_indicator)
+* [`watchdog_interval`](#-apache--mod--jk--watchdog_interval)
+* [`log_file`](#-apache--mod--jk--log_file)
+* [`log_level`](#-apache--mod--jk--log_level)
+* [`log_stamp_format`](#-apache--mod--jk--log_stamp_format)
+* [`request_log_format`](#-apache--mod--jk--request_log_format)
+* [`extract_ssl`](#-apache--mod--jk--extract_ssl)
+* [`https_indicator`](#-apache--mod--jk--https_indicator)
+* [`sslprotocol_indicator`](#-apache--mod--jk--sslprotocol_indicator)
+* [`certs_indicator`](#-apache--mod--jk--certs_indicator)
+* [`cipher_indicator`](#-apache--mod--jk--cipher_indicator)
+* [`certchain_prefix`](#-apache--mod--jk--certchain_prefix)
+* [`session_indicator`](#-apache--mod--jk--session_indicator)
+* [`keysize_indicator`](#-apache--mod--jk--keysize_indicator)
+* [`local_name_indicator`](#-apache--mod--jk--local_name_indicator)
+* [`ignore_cl_indicator`](#-apache--mod--jk--ignore_cl_indicator)
+* [`local_addr_indicator`](#-apache--mod--jk--local_addr_indicator)
+* [`local_port_indicator`](#-apache--mod--jk--local_port_indicator)
+* [`remote_host_indicator`](#-apache--mod--jk--remote_host_indicator)
+* [`remote_addr_indicator`](#-apache--mod--jk--remote_addr_indicator)
+* [`remote_port_indicator`](#-apache--mod--jk--remote_port_indicator)
+* [`remote_user_indicator`](#-apache--mod--jk--remote_user_indicator)
+* [`auth_type_indicator`](#-apache--mod--jk--auth_type_indicator)
+* [`options`](#-apache--mod--jk--options)
+* [`env_var`](#-apache--mod--jk--env_var)
+* [`strip_session`](#-apache--mod--jk--strip_session)
+* [`location_list`](#-apache--mod--jk--location_list)
+* [`workers_file_content`](#-apache--mod--jk--workers_file_content)
+* [`mount_file_content`](#-apache--mod--jk--mount_file_content)
+
+##### <a name="-apache--mod--jk--ip"></a>`ip`
 
 Data type: `Optional[Stdlib::IP::Address]`
 
 IP for binding to mod_jk. Useful when the binding address is not the primary network interface IP.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--mod--jk--port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -3078,7 +3099,7 @@ needs to forward them to Apache at a different port.
 
 Default value: `80`
 
-##### <a name="add_listen"></a>`add_listen`
+##### <a name="-apache--mod--jk--add_listen"></a>`add_listen`
 
 Data type: `Boolean`
 
@@ -3086,17 +3107,17 @@ Defines if a Listen directive according to parameters ip and port (see below), s
 and redirect to mod_jk. Useful when another Listen directive, like Listen *:<Port> or Listen <Port>, can conflict with the one
 necessary for mod_jk binding.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="workers_file"></a>`workers_file`
+##### <a name="-apache--mod--jk--workers_file"></a>`workers_file`
 
 Data type: `Optional[String]`
 
 The name of a worker file for the Tomcat servlet containers.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="worker_property"></a>`worker_property`
+##### <a name="-apache--mod--jk--worker_property"></a>`worker_property`
 
 Data type: `Hash`
 
@@ -3104,16 +3125,16 @@ Enables setting worker properties inside Apache configuration file.
 
 Default value: `{}`
 
-##### <a name="logroot"></a>`logroot`
+##### <a name="-apache--mod--jk--logroot"></a>`logroot`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 The base directory for shm_file and log_file is determined by the logroot parameter. If unspecified, defaults to
 apache::params::logroot. The default logroot is sane enough therefore it is not recommended to override it.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="shm_file"></a>`shm_file`
+##### <a name="-apache--mod--jk--shm_file"></a>`shm_file`
 
 Data type: `String`
 
@@ -3121,31 +3142,31 @@ Shared memory file name.
 
 Default value: `'jk-runtime-status'`
 
-##### <a name="shm_size"></a>`shm_size`
+##### <a name="-apache--mod--jk--shm_size"></a>`shm_size`
 
 Data type: `Optional[String]`
 
 Size of the shared memory file name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mount_file"></a>`mount_file`
+##### <a name="-apache--mod--jk--mount_file"></a>`mount_file`
 
 Data type: `Optional[String]`
 
 File containing multiple mappings from a context to a Tomcat worker.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mount_file_reload"></a>`mount_file_reload`
+##### <a name="-apache--mod--jk--mount_file_reload"></a>`mount_file_reload`
 
 Data type: `Optional[String]`
 
 This directive configures the reload check interval in seconds.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mount"></a>`mount`
+##### <a name="-apache--mod--jk--mount"></a>`mount`
 
 Data type: `Hash`
 
@@ -3153,7 +3174,7 @@ A mount point from a context to a Tomcat worker.
 
 Default value: `{}`
 
-##### <a name="un_mount"></a>`un_mount`
+##### <a name="-apache--mod--jk--un_mount"></a>`un_mount`
 
 Data type: `Hash`
 
@@ -3161,41 +3182,41 @@ An exclusion mount point from a context to a Tomcat worker.
 
 Default value: `{}`
 
-##### <a name="auto_alias"></a>`auto_alias`
+##### <a name="-apache--mod--jk--auto_alias"></a>`auto_alias`
 
 Data type: `Optional[String]`
 
 Automatically Alias webapp context directories into the Apache document space
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mount_copy"></a>`mount_copy`
+##### <a name="-apache--mod--jk--mount_copy"></a>`mount_copy`
 
 Data type: `Optional[String]`
 
 If this directive is set to "On" in some virtual server, the mounts from the global server will be copied
 to this virtual server, more precisely all mounts defined by JkMount or JkUnMount.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="worker_indicator"></a>`worker_indicator`
+##### <a name="-apache--mod--jk--worker_indicator"></a>`worker_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that can be used to set worker names in combination with SetHandler
 jakarta-servlet.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="watchdog_interval"></a>`watchdog_interval`
+##### <a name="-apache--mod--jk--watchdog_interval"></a>`watchdog_interval`
 
 Data type: `Optional[Integer]`
 
 This directive configures the watchdog thread interval in seconds.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="log_file"></a>`log_file`
+##### <a name="-apache--mod--jk--log_file"></a>`log_file`
 
 Data type: `String`
 
@@ -3203,167 +3224,167 @@ Full or server relative path to the mod_jk log file.
 
 Default value: `'mod_jk.log'`
 
-##### <a name="log_level"></a>`log_level`
+##### <a name="-apache--mod--jk--log_level"></a>`log_level`
 
 Data type: `Optional[String]`
 
 The mod_jk log level, can be debug, info, warn error or trace.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="log_stamp_format"></a>`log_stamp_format`
+##### <a name="-apache--mod--jk--log_stamp_format"></a>`log_stamp_format`
 
 Data type: `Optional[String]`
 
 The mod_jk date log format, using an extended strftime syntax.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="request_log_format"></a>`request_log_format`
+##### <a name="-apache--mod--jk--request_log_format"></a>`request_log_format`
 
 Data type: `Optional[String]`
 
 Request log format string.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="extract_ssl"></a>`extract_ssl`
+##### <a name="-apache--mod--jk--extract_ssl"></a>`extract_ssl`
 
 Data type: `Optional[String]`
 
 Turns on SSL processing and information gathering by mod_jk.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="https_indicator"></a>`https_indicator`
+##### <a name="-apache--mod--jk--https_indicator"></a>`https_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL indication.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="sslprotocol_indicator"></a>`sslprotocol_indicator`
+##### <a name="-apache--mod--jk--sslprotocol_indicator"></a>`sslprotocol_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains the SSL protocol name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="certs_indicator"></a>`certs_indicator`
+##### <a name="-apache--mod--jk--certs_indicator"></a>`certs_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL client certificates.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cipher_indicator"></a>`cipher_indicator`
+##### <a name="-apache--mod--jk--cipher_indicator"></a>`cipher_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL client cipher.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="certchain_prefix"></a>`certchain_prefix`
+##### <a name="-apache--mod--jk--certchain_prefix"></a>`certchain_prefix`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment (prefix) that contains SSL client chain certificates.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="session_indicator"></a>`session_indicator`
+##### <a name="-apache--mod--jk--session_indicator"></a>`session_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL session.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="keysize_indicator"></a>`keysize_indicator`
+##### <a name="-apache--mod--jk--keysize_indicator"></a>`keysize_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL key size in use.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="local_name_indicator"></a>`local_name_indicator`
+##### <a name="-apache--mod--jk--local_name_indicator"></a>`local_name_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ignore_cl_indicator"></a>`ignore_cl_indicator`
+##### <a name="-apache--mod--jk--ignore_cl_indicator"></a>`ignore_cl_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which forces to ignore an existing Content-Length request header.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="local_addr_indicator"></a>`local_addr_indicator`
+##### <a name="-apache--mod--jk--local_addr_indicator"></a>`local_addr_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local IP address.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="local_port_indicator"></a>`local_port_indicator`
+##### <a name="-apache--mod--jk--local_port_indicator"></a>`local_port_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local port.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="remote_host_indicator"></a>`remote_host_indicator`
+##### <a name="-apache--mod--jk--remote_host_indicator"></a>`remote_host_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) host name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="remote_addr_indicator"></a>`remote_addr_indicator`
+##### <a name="-apache--mod--jk--remote_addr_indicator"></a>`remote_addr_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="remote_port_indicator"></a>`remote_port_indicator`
+##### <a name="-apache--mod--jk--remote_port_indicator"></a>`remote_port_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="remote_user_indicator"></a>`remote_user_indicator`
+##### <a name="-apache--mod--jk--remote_user_indicator"></a>`remote_user_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded user name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="auth_type_indicator"></a>`auth_type_indicator`
+##### <a name="-apache--mod--jk--auth_type_indicator"></a>`auth_type_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded authentication type.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--mod--jk--options"></a>`options`
 
 Data type: `Array`
 
@@ -3371,7 +3392,7 @@ Set one of more options to configure the mod_jk module.
 
 Default value: `[]`
 
-##### <a name="env_var"></a>`env_var`
+##### <a name="-apache--mod--jk--env_var"></a>`env_var`
 
 Data type: `Hash`
 
@@ -3379,16 +3400,16 @@ Adds a name and an optional default value of environment variable that should be
 
 Default value: `{}`
 
-##### <a name="strip_session"></a>`strip_session`
+##### <a name="-apache--mod--jk--strip_session"></a>`strip_session`
 
 Data type: `Optional[String]`
 
 If this directive is set to On in some virtual server, the session IDs ;jsessionid=... will be removed for URLs which are not
 forwarded but instead are handled by the local server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="location_list"></a>`location_list`
+##### <a name="-apache--mod--jk--location_list"></a>`location_list`
 
 Data type: `Array`
 
@@ -3421,7 +3442,7 @@ location_list = [
 
 Default value: `[]`
 
-##### <a name="workers_file_content"></a>`workers_file_content`
+##### <a name="-apache--mod--jk--workers_file_content"></a>`workers_file_content`
 
 Data type: `Hash`
 
@@ -3465,7 +3486,7 @@ $workers_file_content = {
 
 Default value: `{}`
 
-##### <a name="mount_file_content"></a>`mount_file_content`
+##### <a name="-apache--mod--jk--mount_file_content"></a>`mount_file_content`
 
 Data type: `Hash`
 
@@ -3502,7 +3523,7 @@ $mount_file_content = {
 
 Default value: `{}`
 
-### <a name="apachemodlbmethod_bybusyness"></a>`apache::mod::lbmethod_bybusyness`
+### <a name="apache--mod--lbmethod_bybusyness"></a>`apache::mod::lbmethod_bybusyness`
 
 Installs `lbmethod_bybusyness`.
 
@@ -3514,9 +3535,9 @@ Installs `lbmethod_bybusyness`.
 
 The following parameters are available in the `apache::mod::lbmethod_bybusyness` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--lbmethod_bybusyness--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--lbmethod_bybusyness--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3524,7 +3545,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodlbmethod_byrequests"></a>`apache::mod::lbmethod_byrequests`
+### <a name="apache--mod--lbmethod_byrequests"></a>`apache::mod::lbmethod_byrequests`
 
 Installs `lbmethod_byrequests`.
 
@@ -3536,9 +3557,9 @@ Installs `lbmethod_byrequests`.
 
 The following parameters are available in the `apache::mod::lbmethod_byrequests` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--lbmethod_byrequests--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--lbmethod_byrequests--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3546,7 +3567,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodlbmethod_bytraffic"></a>`apache::mod::lbmethod_bytraffic`
+### <a name="apache--mod--lbmethod_bytraffic"></a>`apache::mod::lbmethod_bytraffic`
 
 Installs `lbmethod_bytraffic`.
 
@@ -3558,9 +3579,9 @@ Installs `lbmethod_bytraffic`.
 
 The following parameters are available in the `apache::mod::lbmethod_bytraffic` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--lbmethod_bytraffic--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--lbmethod_bytraffic--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3568,7 +3589,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodlbmethod_heartbeat"></a>`apache::mod::lbmethod_heartbeat`
+### <a name="apache--mod--lbmethod_heartbeat"></a>`apache::mod::lbmethod_heartbeat`
 
 Installs `lbmethod_heartbeat`.
 
@@ -3580,9 +3601,9 @@ Installs `lbmethod_heartbeat`.
 
 The following parameters are available in the `apache::mod::lbmethod_heartbeat` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--lbmethod_heartbeat--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--lbmethod_heartbeat--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3590,7 +3611,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodldap"></a>`apache::mod::ldap`
+### <a name="apache--mod--ldap"></a>`apache::mod::ldap`
 
 Installs and configures `mod_ldap`.
 
@@ -3621,43 +3642,43 @@ class { 'apache::mod::ldap':
 
 The following parameters are available in the `apache::mod::ldap` class:
 
-* [`apache_version`](#apache_version)
-* [`package_name`](#package_name)
-* [`ldap_trusted_global_cert_file`](#ldap_trusted_global_cert_file)
-* [`ldap_trusted_global_cert_type`](#ldap_trusted_global_cert_type)
-* [`ldap_shared_cache_size`](#ldap_shared_cache_size)
-* [`ldap_cache_entries`](#ldap_cache_entries)
-* [`ldap_cache_ttl`](#ldap_cache_ttl)
-* [`ldap_opcache_entries`](#ldap_opcache_entries)
-* [`ldap_opcache_ttl`](#ldap_opcache_ttl)
-* [`ldap_trusted_mode`](#ldap_trusted_mode)
-* [`ldap_path`](#ldap_path)
+* [`apache_version`](#-apache--mod--ldap--apache_version)
+* [`package_name`](#-apache--mod--ldap--package_name)
+* [`ldap_trusted_global_cert_file`](#-apache--mod--ldap--ldap_trusted_global_cert_file)
+* [`ldap_trusted_global_cert_type`](#-apache--mod--ldap--ldap_trusted_global_cert_type)
+* [`ldap_shared_cache_size`](#-apache--mod--ldap--ldap_shared_cache_size)
+* [`ldap_cache_entries`](#-apache--mod--ldap--ldap_cache_entries)
+* [`ldap_cache_ttl`](#-apache--mod--ldap--ldap_cache_ttl)
+* [`ldap_opcache_entries`](#-apache--mod--ldap--ldap_opcache_entries)
+* [`ldap_opcache_ttl`](#-apache--mod--ldap--ldap_opcache_ttl)
+* [`ldap_trusted_mode`](#-apache--mod--ldap--ldap_trusted_mode)
+* [`ldap_path`](#-apache--mod--ldap--ldap_path)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--ldap--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--ldap--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Specifies the custom package name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_trusted_global_cert_file"></a>`ldap_trusted_global_cert_file`
+##### <a name="-apache--mod--ldap--ldap_trusted_global_cert_file"></a>`ldap_trusted_global_cert_file`
 
 Data type: `Optional[String]`
 
 Sets the file or database containing global trusted Certificate Authority or global client certificates.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_trusted_global_cert_type"></a>`ldap_trusted_global_cert_type`
+##### <a name="-apache--mod--ldap--ldap_trusted_global_cert_type"></a>`ldap_trusted_global_cert_type`
 
 Data type: `String`
 
@@ -3665,55 +3686,55 @@ Sets the certificate parameter of the global trusted Certificate Authority or gl
 
 Default value: `'CA_BASE64'`
 
-##### <a name="ldap_shared_cache_size"></a>`ldap_shared_cache_size`
+##### <a name="-apache--mod--ldap--ldap_shared_cache_size"></a>`ldap_shared_cache_size`
 
 Data type: `Optional[Integer]`
 
 Size in bytes of the shared-memory cache
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_cache_entries"></a>`ldap_cache_entries`
+##### <a name="-apache--mod--ldap--ldap_cache_entries"></a>`ldap_cache_entries`
 
 Data type: `Optional[Integer]`
 
 Maximum number of entries in the primary LDAP cache
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_cache_ttl"></a>`ldap_cache_ttl`
+##### <a name="-apache--mod--ldap--ldap_cache_ttl"></a>`ldap_cache_ttl`
 
 Data type: `Optional[Integer]`
 
 Time that cached items remain valid (in seconds).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_opcache_entries"></a>`ldap_opcache_entries`
+##### <a name="-apache--mod--ldap--ldap_opcache_entries"></a>`ldap_opcache_entries`
 
 Data type: `Optional[Integer]`
 
 Number of entries used to cache LDAP compare operations
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_opcache_ttl"></a>`ldap_opcache_ttl`
+##### <a name="-apache--mod--ldap--ldap_opcache_ttl"></a>`ldap_opcache_ttl`
 
 Data type: `Optional[Integer]`
 
 Time that entries in the operation cache remain valid (in seconds).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
+##### <a name="-apache--mod--ldap--ldap_trusted_mode"></a>`ldap_trusted_mode`
 
 Data type: `Optional[String]`
 
 Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_path"></a>`ldap_path`
+##### <a name="-apache--mod--ldap--ldap_path"></a>`ldap_path`
 
 Data type: `String`
 
@@ -3721,7 +3742,7 @@ The server location of the ldap status page.
 
 Default value: `'/ldap-status'`
 
-### <a name="apachemodlookup_identity"></a>`apache::mod::lookup_identity`
+### <a name="apache--mod--lookup_identity"></a>`apache::mod::lookup_identity`
 
 Installs `mod_lookup_identity`
 
@@ -3729,7 +3750,7 @@ Installs `mod_lookup_identity`
   * https://www.adelton.com/apache/mod_lookup_identity
     * for additional documentation.
 
-### <a name="apachemodmacro"></a>`apache::mod::macro`
+### <a name="apache--mod--macro"></a>`apache::mod::macro`
 
 Installs `mod_macro`.
 
@@ -3737,7 +3758,7 @@ Installs `mod_macro`.
   * https://httpd.apache.org/docs/current/mod/mod_macro.html
     * for additional documentation.
 
-### <a name="apachemodmd"></a>`apache::mod::md`
+### <a name="apache--mod--md"></a>`apache::mod::md`
 
 Installs and configures `mod_md`.
 
@@ -3751,264 +3772,264 @@ Installs and configures `mod_md`.
 
 The following parameters are available in the `apache::mod::md` class:
 
-* [`md_activation_delay`](#md_activation_delay)
-* [`md_base_server`](#md_base_server)
-* [`md_ca_challenges`](#md_ca_challenges)
-* [`md_certificate_agreement`](#md_certificate_agreement)
-* [`md_certificate_authority`](#md_certificate_authority)
-* [`md_certificate_check`](#md_certificate_check)
-* [`md_certificate_monitor`](#md_certificate_monitor)
-* [`md_certificate_protocol`](#md_certificate_protocol)
-* [`md_certificate_status`](#md_certificate_status)
-* [`md_challenge_dns01`](#md_challenge_dns01)
-* [`md_contact_email`](#md_contact_email)
-* [`md_http_proxy`](#md_http_proxy)
-* [`md_members`](#md_members)
-* [`md_message_cmd`](#md_message_cmd)
-* [`md_must_staple`](#md_must_staple)
-* [`md_notify_cmd`](#md_notify_cmd)
-* [`md_port_map`](#md_port_map)
-* [`md_private_keys`](#md_private_keys)
-* [`md_renew_mode`](#md_renew_mode)
-* [`md_renew_window`](#md_renew_window)
-* [`md_require_https`](#md_require_https)
-* [`md_server_status`](#md_server_status)
-* [`md_staple_others`](#md_staple_others)
-* [`md_stapling`](#md_stapling)
-* [`md_stapling_keep_response`](#md_stapling_keep_response)
-* [`md_stapling_renew_window`](#md_stapling_renew_window)
-* [`md_store_dir`](#md_store_dir)
-* [`md_warn_window`](#md_warn_window)
-
-##### <a name="md_activation_delay"></a>`md_activation_delay`
+* [`md_activation_delay`](#-apache--mod--md--md_activation_delay)
+* [`md_base_server`](#-apache--mod--md--md_base_server)
+* [`md_ca_challenges`](#-apache--mod--md--md_ca_challenges)
+* [`md_certificate_agreement`](#-apache--mod--md--md_certificate_agreement)
+* [`md_certificate_authority`](#-apache--mod--md--md_certificate_authority)
+* [`md_certificate_check`](#-apache--mod--md--md_certificate_check)
+* [`md_certificate_monitor`](#-apache--mod--md--md_certificate_monitor)
+* [`md_certificate_protocol`](#-apache--mod--md--md_certificate_protocol)
+* [`md_certificate_status`](#-apache--mod--md--md_certificate_status)
+* [`md_challenge_dns01`](#-apache--mod--md--md_challenge_dns01)
+* [`md_contact_email`](#-apache--mod--md--md_contact_email)
+* [`md_http_proxy`](#-apache--mod--md--md_http_proxy)
+* [`md_members`](#-apache--mod--md--md_members)
+* [`md_message_cmd`](#-apache--mod--md--md_message_cmd)
+* [`md_must_staple`](#-apache--mod--md--md_must_staple)
+* [`md_notify_cmd`](#-apache--mod--md--md_notify_cmd)
+* [`md_port_map`](#-apache--mod--md--md_port_map)
+* [`md_private_keys`](#-apache--mod--md--md_private_keys)
+* [`md_renew_mode`](#-apache--mod--md--md_renew_mode)
+* [`md_renew_window`](#-apache--mod--md--md_renew_window)
+* [`md_require_https`](#-apache--mod--md--md_require_https)
+* [`md_server_status`](#-apache--mod--md--md_server_status)
+* [`md_staple_others`](#-apache--mod--md--md_staple_others)
+* [`md_stapling`](#-apache--mod--md--md_stapling)
+* [`md_stapling_keep_response`](#-apache--mod--md--md_stapling_keep_response)
+* [`md_stapling_renew_window`](#-apache--mod--md--md_stapling_renew_window)
+* [`md_store_dir`](#-apache--mod--md--md_store_dir)
+* [`md_warn_window`](#-apache--mod--md--md_warn_window)
+
+##### <a name="-apache--mod--md--md_activation_delay"></a>`md_activation_delay`
 
 Data type: `Optional[String]`
 
 -
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_base_server"></a>`md_base_server`
+##### <a name="-apache--mod--md--md_base_server"></a>`md_base_server`
 
 Data type: `Optional[Enum['on', 'off']]`
 
 Control if base server may be managed or only virtual hosts.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_ca_challenges"></a>`md_ca_challenges`
+##### <a name="-apache--mod--md--md_ca_challenges"></a>`md_ca_challenges`
 
 Data type: `Optional[Array[Enum['dns-01', 'http-01', 'tls-alpn-01']]]`
 
 Type of ACME challenge used to prove domain ownership.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_agreement"></a>`md_certificate_agreement`
+##### <a name="-apache--mod--md--md_certificate_agreement"></a>`md_certificate_agreement`
 
 Data type: `Optional[Enum['accepted']]`
 
 You confirm that you accepted the Terms of Service of the Certificate
 Authority.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_authority"></a>`md_certificate_authority`
+##### <a name="-apache--mod--md--md_certificate_authority"></a>`md_certificate_authority`
 
 Data type: `Optional[Stdlib::HTTPUrl]`
 
 The URL of the ACME Certificate Authority service.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_check"></a>`md_certificate_check`
+##### <a name="-apache--mod--md--md_certificate_check"></a>`md_certificate_check`
 
 Data type: `Optional[String]`
 
 -
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_monitor"></a>`md_certificate_monitor`
+##### <a name="-apache--mod--md--md_certificate_monitor"></a>`md_certificate_monitor`
 
 Data type: `Optional[String]`
 
 The URL of a certificate log monitor.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_protocol"></a>`md_certificate_protocol`
+##### <a name="-apache--mod--md--md_certificate_protocol"></a>`md_certificate_protocol`
 
 Data type: `Optional[Enum['ACME']]`
 
 The protocol to use with the Certificate Authority.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_status"></a>`md_certificate_status`
+##### <a name="-apache--mod--md--md_certificate_status"></a>`md_certificate_status`
 
 Data type: `Optional[Enum['on', 'off']]`
 
 Exposes public certificate information in JSON.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_challenge_dns01"></a>`md_challenge_dns01`
+##### <a name="-apache--mod--md--md_challenge_dns01"></a>`md_challenge_dns01`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Define a program to be called when the `dns-01` challenge needs to be
 setup/torn down.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_contact_email"></a>`md_contact_email`
+##### <a name="-apache--mod--md--md_contact_email"></a>`md_contact_email`
 
 Data type: `Optional[String]`
 
 The ACME protocol requires you to give a contact url when you sign up.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_http_proxy"></a>`md_http_proxy`
+##### <a name="-apache--mod--md--md_http_proxy"></a>`md_http_proxy`
 
 Data type: `Optional[Stdlib::HTTPUrl]`
 
 Define a proxy for outgoing connections.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_members"></a>`md_members`
+##### <a name="-apache--mod--md--md_members"></a>`md_members`
 
 Data type: `Optional[Enum['auto', 'manual']]`
 
 Control if the alias domain names are automatically added.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_message_cmd"></a>`md_message_cmd`
+##### <a name="-apache--mod--md--md_message_cmd"></a>`md_message_cmd`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Handle events for Manage Domains.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_must_staple"></a>`md_must_staple`
+##### <a name="-apache--mod--md--md_must_staple"></a>`md_must_staple`
 
 Data type: `Optional[Enum['on', 'off']]`
 
 Control if new certificates carry the OCSP Must Staple flag.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_notify_cmd"></a>`md_notify_cmd`
+##### <a name="-apache--mod--md--md_notify_cmd"></a>`md_notify_cmd`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Run a program when a Managed Domain is ready.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_port_map"></a>`md_port_map`
+##### <a name="-apache--mod--md--md_port_map"></a>`md_port_map`
 
 Data type: `Optional[String]`
 
 Map external to internal ports for domain ownership verification.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_private_keys"></a>`md_private_keys`
+##### <a name="-apache--mod--md--md_private_keys"></a>`md_private_keys`
 
 Data type: `Optional[String]`
 
 Set type and size of the private keys generated.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_renew_mode"></a>`md_renew_mode`
+##### <a name="-apache--mod--md--md_renew_mode"></a>`md_renew_mode`
 
 Data type: `Optional[Enum['always', 'auto', 'manual']]`
 
 Controls if certificates shall be renewed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_renew_window"></a>`md_renew_window`
+##### <a name="-apache--mod--md--md_renew_window"></a>`md_renew_window`
 
 Data type: `Optional[String]`
 
 Control when a certificate will be renewed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_require_https"></a>`md_require_https`
+##### <a name="-apache--mod--md--md_require_https"></a>`md_require_https`
 
 Data type: `Optional[Enum['off', 'permanent', 'temporary']]`
 
 Redirects http: traffic to https: for Managed Domains.
 An http: Virtual Host must nevertheless be setup for that domain.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_server_status"></a>`md_server_status`
+##### <a name="-apache--mod--md--md_server_status"></a>`md_server_status`
 
 Data type: `Optional[Enum['on', 'off']]`
 
 Control if Managed Domain information is added to server-status.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_staple_others"></a>`md_staple_others`
+##### <a name="-apache--mod--md--md_staple_others"></a>`md_staple_others`
 
 Data type: `Optional[Enum['on', 'off']]`
 
 Enable stapling for certificates not managed by mod_md.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_stapling"></a>`md_stapling`
+##### <a name="-apache--mod--md--md_stapling"></a>`md_stapling`
 
 Data type: `Optional[Enum['on', 'off']]`
 
 Enable stapling for all or a particular MDomain.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_stapling_keep_response"></a>`md_stapling_keep_response`
+##### <a name="-apache--mod--md--md_stapling_keep_response"></a>`md_stapling_keep_response`
 
 Data type: `Optional[String]`
 
 Controls when old responses should be removed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_stapling_renew_window"></a>`md_stapling_renew_window`
+##### <a name="-apache--mod--md--md_stapling_renew_window"></a>`md_stapling_renew_window`
 
 Data type: `Optional[String]`
 
 Control when the stapling responses will be renewed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_store_dir"></a>`md_store_dir`
+##### <a name="-apache--mod--md--md_store_dir"></a>`md_store_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path on the local file system to store the Managed Domains data.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_warn_window"></a>`md_warn_window`
+##### <a name="-apache--mod--md--md_warn_window"></a>`md_warn_window`
 
 Data type: `Optional[String]`
 
 Define the time window when you want to be warned about an expiring
 certificate.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodmime"></a>`apache::mod::mime`
+### <a name="apache--mod--mime"></a>`apache::mod::mime`
 
 Installs and configures `mod_mime`.
 
@@ -4020,11 +4041,11 @@ Installs and configures `mod_mime`.
 
 The following parameters are available in the `apache::mod::mime` class:
 
-* [`mime_support_package`](#mime_support_package)
-* [`mime_types_config`](#mime_types_config)
-* [`mime_types_additional`](#mime_types_additional)
+* [`mime_support_package`](#-apache--mod--mime--mime_support_package)
+* [`mime_types_config`](#-apache--mod--mime--mime_types_config)
+* [`mime_types_additional`](#-apache--mod--mime--mime_types_additional)
 
-##### <a name="mime_support_package"></a>`mime_support_package`
+##### <a name="-apache--mod--mime--mime_support_package"></a>`mime_support_package`
 
 Data type: `String`
 
@@ -4032,7 +4053,7 @@ Name of the MIME package to be installed.
 
 Default value: `$apache::params::mime_support_package`
 
-##### <a name="mime_types_config"></a>`mime_types_config`
+##### <a name="-apache--mod--mime--mime_types_config"></a>`mime_types_config`
 
 Data type: `String`
 
@@ -4040,15 +4061,15 @@ The location of the mime.types file.
 
 Default value: `$apache::params::mime_types_config`
 
-##### <a name="mime_types_additional"></a>`mime_types_additional`
+##### <a name="-apache--mod--mime--mime_types_additional"></a>`mime_types_additional`
 
 Data type: `Optional[Hash]`
 
 List of additional MIME types to include.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodmime_magic"></a>`apache::mod::mime_magic`
+### <a name="apache--mod--mime_magic"></a>`apache::mod::mime_magic`
 
 Installs and configures `mod_mime_magic`.
 
@@ -4060,17 +4081,17 @@ Installs and configures `mod_mime_magic`.
 
 The following parameters are available in the `apache::mod::mime_magic` class:
 
-* [`magic_file`](#magic_file)
+* [`magic_file`](#-apache--mod--mime_magic--magic_file)
 
-##### <a name="magic_file"></a>`magic_file`
+##### <a name="-apache--mod--mime_magic--magic_file"></a>`magic_file`
 
 Data type: `Optional[String]`
 
 Enable MIME-type determination based on file contents using the specified magic file.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodnegotiation"></a>`apache::mod::negotiation`
+### <a name="apache--mod--negotiation"></a>`apache::mod::negotiation`
 
 Installs and configures `mod_negotiation`.
 
@@ -4082,10 +4103,10 @@ Installs and configures `mod_negotiation`.
 
 The following parameters are available in the `apache::mod::negotiation` class:
 
-* [`force_language_priority`](#force_language_priority)
-* [`language_priority`](#language_priority)
+* [`force_language_priority`](#-apache--mod--negotiation--force_language_priority)
+* [`language_priority`](#-apache--mod--negotiation--language_priority)
 
-##### <a name="force_language_priority"></a>`force_language_priority`
+##### <a name="-apache--mod--negotiation--force_language_priority"></a>`force_language_priority`
 
 Data type: `Variant[Array[String], String]`
 
@@ -4093,18 +4114,22 @@ Action to take if a single acceptable document is not found.
 
 Default value: `'Prefer Fallback'`
 
-##### <a name="language_priority"></a>`language_priority`
+##### <a name="-apache--mod--negotiation--language_priority"></a>`language_priority`
 
 Data type: `Variant[Array[String], String]`
 
 The precedence of language variants for cases where the client does not express a preference.
 
-Default value: `['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+Default value:
+
+```puppet
+['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
     'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
     'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
-  'zh-TW']`
+  'zh-TW']
+```
 
-### <a name="apachemodnss"></a>`apache::mod::nss`
+### <a name="apache--mod--nss"></a>`apache::mod::nss`
 
 Installs and configures `mod_nss`.
 
@@ -4116,12 +4141,12 @@ Installs and configures `mod_nss`.
 
 The following parameters are available in the `apache::mod::nss` class:
 
-* [`transfer_log`](#transfer_log)
-* [`error_log`](#error_log)
-* [`passwd_file`](#passwd_file)
-* [`port`](#port)
+* [`transfer_log`](#-apache--mod--nss--transfer_log)
+* [`error_log`](#-apache--mod--nss--error_log)
+* [`passwd_file`](#-apache--mod--nss--passwd_file)
+* [`port`](#-apache--mod--nss--port)
 
-##### <a name="transfer_log"></a>`transfer_log`
+##### <a name="-apache--mod--nss--transfer_log"></a>`transfer_log`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4129,7 +4154,7 @@ Path to `access.log`.
 
 Default value: `"${apache::params::logroot}/access.log"`
 
-##### <a name="error_log"></a>`error_log`
+##### <a name="-apache--mod--nss--error_log"></a>`error_log`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4137,15 +4162,15 @@ Path to `error.log`
 
 Default value: `"${apache::params::logroot}/error.log"`
 
-##### <a name="passwd_file"></a>`passwd_file`
+##### <a name="-apache--mod--nss--passwd_file"></a>`passwd_file`
 
 Data type: `Optional[String]`
 
 Path to file containing token passwords used for NSSPassPhraseDialog.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--mod--nss--port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -4153,7 +4178,7 @@ Sets the SSL port that should be used by mod_nss.
 
 Default value: `8443`
 
-### <a name="apachemodpagespeed"></a>`apache::mod::pagespeed`
+### <a name="apache--mod--pagespeed"></a>`apache::mod::pagespeed`
 
 Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
 
@@ -4218,43 +4243,43 @@ class { 'apache::mod::pagespeed':
 
 The following parameters are available in the `apache::mod::pagespeed` class:
 
-* [`inherit_vhost_config`](#inherit_vhost_config)
-* [`filter_xhtml`](#filter_xhtml)
-* [`cache_path`](#cache_path)
-* [`log_dir`](#log_dir)
-* [`memcache_servers`](#memcache_servers)
-* [`rewrite_level`](#rewrite_level)
-* [`disable_filters`](#disable_filters)
-* [`enable_filters`](#enable_filters)
-* [`forbid_filters`](#forbid_filters)
-* [`rewrite_deadline_per_flush_ms`](#rewrite_deadline_per_flush_ms)
-* [`additional_domains`](#additional_domains)
-* [`file_cache_size_kb`](#file_cache_size_kb)
-* [`file_cache_clean_interval_ms`](#file_cache_clean_interval_ms)
-* [`lru_cache_per_process`](#lru_cache_per_process)
-* [`lru_cache_byte_limit`](#lru_cache_byte_limit)
-* [`css_flatten_max_bytes`](#css_flatten_max_bytes)
-* [`css_inline_max_bytes`](#css_inline_max_bytes)
-* [`css_image_inline_max_bytes`](#css_image_inline_max_bytes)
-* [`image_inline_max_bytes`](#image_inline_max_bytes)
-* [`js_inline_max_bytes`](#js_inline_max_bytes)
-* [`css_outline_min_bytes`](#css_outline_min_bytes)
-* [`js_outline_min_bytes`](#js_outline_min_bytes)
-* [`inode_limit`](#inode_limit)
-* [`image_max_rewrites_at_once`](#image_max_rewrites_at_once)
-* [`num_rewrite_threads`](#num_rewrite_threads)
-* [`num_expensive_rewrite_threads`](#num_expensive_rewrite_threads)
-* [`collect_statistics`](#collect_statistics)
-* [`statistics_logging`](#statistics_logging)
-* [`allow_view_stats`](#allow_view_stats)
-* [`allow_pagespeed_console`](#allow_pagespeed_console)
-* [`allow_pagespeed_message`](#allow_pagespeed_message)
-* [`message_buffer_size`](#message_buffer_size)
-* [`additional_configuration`](#additional_configuration)
-* [`apache_version`](#apache_version)
-* [`package_ensure`](#package_ensure)
-
-##### <a name="inherit_vhost_config"></a>`inherit_vhost_config`
+* [`inherit_vhost_config`](#-apache--mod--pagespeed--inherit_vhost_config)
+* [`filter_xhtml`](#-apache--mod--pagespeed--filter_xhtml)
+* [`cache_path`](#-apache--mod--pagespeed--cache_path)
+* [`log_dir`](#-apache--mod--pagespeed--log_dir)
+* [`memcache_servers`](#-apache--mod--pagespeed--memcache_servers)
+* [`rewrite_level`](#-apache--mod--pagespeed--rewrite_level)
+* [`disable_filters`](#-apache--mod--pagespeed--disable_filters)
+* [`enable_filters`](#-apache--mod--pagespeed--enable_filters)
+* [`forbid_filters`](#-apache--mod--pagespeed--forbid_filters)
+* [`rewrite_deadline_per_flush_ms`](#-apache--mod--pagespeed--rewrite_deadline_per_flush_ms)
+* [`additional_domains`](#-apache--mod--pagespeed--additional_domains)
+* [`file_cache_size_kb`](#-apache--mod--pagespeed--file_cache_size_kb)
+* [`file_cache_clean_interval_ms`](#-apache--mod--pagespeed--file_cache_clean_interval_ms)
+* [`lru_cache_per_process`](#-apache--mod--pagespeed--lru_cache_per_process)
+* [`lru_cache_byte_limit`](#-apache--mod--pagespeed--lru_cache_byte_limit)
+* [`css_flatten_max_bytes`](#-apache--mod--pagespeed--css_flatten_max_bytes)
+* [`css_inline_max_bytes`](#-apache--mod--pagespeed--css_inline_max_bytes)
+* [`css_image_inline_max_bytes`](#-apache--mod--pagespeed--css_image_inline_max_bytes)
+* [`image_inline_max_bytes`](#-apache--mod--pagespeed--image_inline_max_bytes)
+* [`js_inline_max_bytes`](#-apache--mod--pagespeed--js_inline_max_bytes)
+* [`css_outline_min_bytes`](#-apache--mod--pagespeed--css_outline_min_bytes)
+* [`js_outline_min_bytes`](#-apache--mod--pagespeed--js_outline_min_bytes)
+* [`inode_limit`](#-apache--mod--pagespeed--inode_limit)
+* [`image_max_rewrites_at_once`](#-apache--mod--pagespeed--image_max_rewrites_at_once)
+* [`num_rewrite_threads`](#-apache--mod--pagespeed--num_rewrite_threads)
+* [`num_expensive_rewrite_threads`](#-apache--mod--pagespeed--num_expensive_rewrite_threads)
+* [`collect_statistics`](#-apache--mod--pagespeed--collect_statistics)
+* [`statistics_logging`](#-apache--mod--pagespeed--statistics_logging)
+* [`allow_view_stats`](#-apache--mod--pagespeed--allow_view_stats)
+* [`allow_pagespeed_console`](#-apache--mod--pagespeed--allow_pagespeed_console)
+* [`allow_pagespeed_message`](#-apache--mod--pagespeed--allow_pagespeed_message)
+* [`message_buffer_size`](#-apache--mod--pagespeed--message_buffer_size)
+* [`additional_configuration`](#-apache--mod--pagespeed--additional_configuration)
+* [`apache_version`](#-apache--mod--pagespeed--apache_version)
+* [`package_ensure`](#-apache--mod--pagespeed--package_ensure)
+
+##### <a name="-apache--mod--pagespeed--inherit_vhost_config"></a>`inherit_vhost_config`
 
 Data type: `String`
 
@@ -4262,15 +4287,15 @@ Whether or not to inherit the vhost config
 
 Default value: `'on'`
 
-##### <a name="filter_xhtml"></a>`filter_xhtml`
+##### <a name="-apache--mod--pagespeed--filter_xhtml"></a>`filter_xhtml`
 
 Data type: `Boolean`
 
 Whether to filter by xhtml
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="cache_path"></a>`cache_path`
+##### <a name="-apache--mod--pagespeed--cache_path"></a>`cache_path`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4278,7 +4303,7 @@ Where to cache any files
 
 Default value: `'/var/cache/mod_pagespeed/'`
 
-##### <a name="log_dir"></a>`log_dir`
+##### <a name="-apache--mod--pagespeed--log_dir"></a>`log_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4286,7 +4311,7 @@ The log directory
 
 Default value: `'/var/log/pagespeed'`
 
-##### <a name="memcache_servers"></a>`memcache_servers`
+##### <a name="-apache--mod--pagespeed--memcache_servers"></a>`memcache_servers`
 
 Data type: `Array`
 
@@ -4294,7 +4319,7 @@ Data type: `Array`
 
 Default value: `[]`
 
-##### <a name="rewrite_level"></a>`rewrite_level`
+##### <a name="-apache--mod--pagespeed--rewrite_level"></a>`rewrite_level`
 
 Data type: `String`
 
@@ -4303,7 +4328,7 @@ Can be `PassThrough`, `CoreFilters` or `OptimizeForBandwidth`.
 
 Default value: `'CoreFilters'`
 
-##### <a name="disable_filters"></a>`disable_filters`
+##### <a name="-apache--mod--pagespeed--disable_filters"></a>`disable_filters`
 
 Data type: `Array`
 
@@ -4311,7 +4336,7 @@ An array of filters that you wish to disable
 
 Default value: `[]`
 
-##### <a name="enable_filters"></a>`enable_filters`
+##### <a name="-apache--mod--pagespeed--enable_filters"></a>`enable_filters`
 
 Data type: `Array`
 
@@ -4319,7 +4344,7 @@ An array of filters that you wish to enable
 
 Default value: `[]`
 
-##### <a name="forbid_filters"></a>`forbid_filters`
+##### <a name="-apache--mod--pagespeed--forbid_filters"></a>`forbid_filters`
 
 Data type: `Array`
 
@@ -4327,7 +4352,7 @@ An array of filters that you wish to forbid
 
 Default value: `[]`
 
-##### <a name="rewrite_deadline_per_flush_ms"></a>`rewrite_deadline_per_flush_ms`
+##### <a name="-apache--mod--pagespeed--rewrite_deadline_per_flush_ms"></a>`rewrite_deadline_per_flush_ms`
 
 Data type: `Integer`
 
@@ -4335,15 +4360,15 @@ How long to wait after attempting to rewrite an uncache/expired resource.
 
 Default value: `10`
 
-##### <a name="additional_domains"></a>`additional_domains`
+##### <a name="-apache--mod--pagespeed--additional_domains"></a>`additional_domains`
 
 Data type: `Optional[String]`
 
 Any additional domains that PageSpeed should optimize resources from.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="file_cache_size_kb"></a>`file_cache_size_kb`
+##### <a name="-apache--mod--pagespeed--file_cache_size_kb"></a>`file_cache_size_kb`
 
 Data type: `Integer`
 
@@ -4351,7 +4376,7 @@ The maximum size of the cache
 
 Default value: `102400`
 
-##### <a name="file_cache_clean_interval_ms"></a>`file_cache_clean_interval_ms`
+##### <a name="-apache--mod--pagespeed--file_cache_clean_interval_ms"></a>`file_cache_clean_interval_ms`
 
 Data type: `Integer`
 
@@ -4359,7 +4384,7 @@ The interval between which the cache is cleaned
 
 Default value: `3600000`
 
-##### <a name="lru_cache_per_process"></a>`lru_cache_per_process`
+##### <a name="-apache--mod--pagespeed--lru_cache_per_process"></a>`lru_cache_per_process`
 
 Data type: `Integer`
 
@@ -4367,7 +4392,7 @@ The amount of memory dedcated to each process
 
 Default value: `1024`
 
-##### <a name="lru_cache_byte_limit"></a>`lru_cache_byte_limit`
+##### <a name="-apache--mod--pagespeed--lru_cache_byte_limit"></a>`lru_cache_byte_limit`
 
 Data type: `Integer`
 
@@ -4375,7 +4400,7 @@ How large a cache entry the cache will accept
 
 Default value: `16384`
 
-##### <a name="css_flatten_max_bytes"></a>`css_flatten_max_bytes`
+##### <a name="-apache--mod--pagespeed--css_flatten_max_bytes"></a>`css_flatten_max_bytes`
 
 Data type: `Integer`
 
@@ -4383,7 +4408,7 @@ The maximum size in bytes of the flattened CSS
 
 Default value: `2048`
 
-##### <a name="css_inline_max_bytes"></a>`css_inline_max_bytes`
+##### <a name="-apache--mod--pagespeed--css_inline_max_bytes"></a>`css_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4391,7 +4416,7 @@ The maximum size in bytes of any image that will be inlined into CSS
 
 Default value: `2048`
 
-##### <a name="css_image_inline_max_bytes"></a>`css_image_inline_max_bytes`
+##### <a name="-apache--mod--pagespeed--css_image_inline_max_bytes"></a>`css_image_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4399,7 +4424,7 @@ The maximum size in bytes of any image that will be inlined into an HTML file
 
 Default value: `2048`
 
-##### <a name="image_inline_max_bytes"></a>`image_inline_max_bytes`
+##### <a name="-apache--mod--pagespeed--image_inline_max_bytes"></a>`image_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4407,7 +4432,7 @@ The maximum size in bytes of any inlined CSS file
 
 Default value: `2048`
 
-##### <a name="js_inline_max_bytes"></a>`js_inline_max_bytes`
+##### <a name="-apache--mod--pagespeed--js_inline_max_bytes"></a>`js_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4415,7 +4440,7 @@ The maximum size in bytes of any inlined JavaScript file
 
 Default value: `2048`
 
-##### <a name="css_outline_min_bytes"></a>`css_outline_min_bytes`
+##### <a name="-apache--mod--pagespeed--css_outline_min_bytes"></a>`css_outline_min_bytes`
 
 Data type: `Integer`
 
@@ -4423,7 +4448,7 @@ The minimum size in bytes for a CSS file to qualify as an outline
 
 Default value: `3000`
 
-##### <a name="js_outline_min_bytes"></a>`js_outline_min_bytes`
+##### <a name="-apache--mod--pagespeed--js_outline_min_bytes"></a>`js_outline_min_bytes`
 
 Data type: `Integer`
 
@@ -4431,7 +4456,7 @@ The minimum size in bytes for a JavaScript file to qualify as an outline
 
 Default value: `3000`
 
-##### <a name="inode_limit"></a>`inode_limit`
+##### <a name="-apache--mod--pagespeed--inode_limit"></a>`inode_limit`
 
 Data type: `Integer`
 
@@ -4439,7 +4464,7 @@ The file cache inode limit
 
 Default value: `500000`
 
-##### <a name="image_max_rewrites_at_once"></a>`image_max_rewrites_at_once`
+##### <a name="-apache--mod--pagespeed--image_max_rewrites_at_once"></a>`image_max_rewrites_at_once`
 
 Data type: `Integer`
 
@@ -4447,7 +4472,7 @@ The maximum number of images to optimize concurrently
 
 Default value: `8`
 
-##### <a name="num_rewrite_threads"></a>`num_rewrite_threads`
+##### <a name="-apache--mod--pagespeed--num_rewrite_threads"></a>`num_rewrite_threads`
 
 Data type: `Integer`
 
@@ -4456,7 +4481,7 @@ These threads are used for short, latency-sensitive work.
 
 Default value: `4`
 
-##### <a name="num_expensive_rewrite_threads"></a>`num_expensive_rewrite_threads`
+##### <a name="-apache--mod--pagespeed--num_expensive_rewrite_threads"></a>`num_expensive_rewrite_threads`
 
 Data type: `Integer`
 
@@ -4465,7 +4490,7 @@ These threads are used for full optimization.
 
 Default value: `4`
 
-##### <a name="collect_statistics"></a>`collect_statistics`
+##### <a name="-apache--mod--pagespeed--collect_statistics"></a>`collect_statistics`
 
 Data type: `String`
 
@@ -4473,7 +4498,7 @@ Whether to collect cross-process statistics
 
 Default value: `'on'`
 
-##### <a name="statistics_logging"></a>`statistics_logging`
+##### <a name="-apache--mod--pagespeed--statistics_logging"></a>`statistics_logging`
 
 Data type: `String`
 
@@ -4481,7 +4506,7 @@ Whether graphs should be drawn from collected statistics
 
 Default value: `'on'`
 
-##### <a name="allow_view_stats"></a>`allow_view_stats`
+##### <a name="-apache--mod--pagespeed--allow_view_stats"></a>`allow_view_stats`
 
 Data type: `Array`
 
@@ -4489,7 +4514,7 @@ What sources should be allowed to view the resultant graph
 
 Default value: `[]`
 
-##### <a name="allow_pagespeed_console"></a>`allow_pagespeed_console`
+##### <a name="-apache--mod--pagespeed--allow_pagespeed_console"></a>`allow_pagespeed_console`
 
 Data type: `Array`
 
@@ -4497,7 +4522,7 @@ What sources to draw the graphs from
 
 Default value: `[]`
 
-##### <a name="allow_pagespeed_message"></a>`allow_pagespeed_message`
+##### <a name="-apache--mod--pagespeed--allow_pagespeed_message"></a>`allow_pagespeed_message`
 
 Data type: `Array`
 
@@ -4505,7 +4530,7 @@ Data type: `Array`
 
 Default value: `[]`
 
-##### <a name="message_buffer_size"></a>`message_buffer_size`
+##### <a name="-apache--mod--pagespeed--message_buffer_size"></a>`message_buffer_size`
 
 Data type: `Integer`
 
@@ -4513,7 +4538,7 @@ The amount of bytes to allocate as a buffer to hold recent log messages
 
 Default value: `100000`
 
-##### <a name="additional_configuration"></a>`additional_configuration`
+##### <a name="-apache--mod--pagespeed--additional_configuration"></a>`additional_configuration`
 
 Data type: `Variant[Array, Hash]`
 
@@ -4521,23 +4546,23 @@ Any additional configuration no included as it's own option
 
 Default value: `{}`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--pagespeed--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_ensure"></a>`package_ensure`
+##### <a name="-apache--mod--pagespeed--package_ensure"></a>`package_ensure`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodpassenger"></a>`apache::mod::passenger`
+### <a name="apache--mod--passenger"></a>`apache::mod::passenger`
 
 The current set of server configurations settings were taken directly from the Passenger Reference. To enable deprecation warnings
 and removal failure messages, set the passenger_installed_version to the version number installed on the server.
@@ -4560,176 +4585,176 @@ There are also several undocumented settings.
 
 The following parameters are available in the `apache::mod::passenger` class:
 
-* [`manage_repo`](#manage_repo)
-* [`mod_id`](#mod_id)
-* [`mod_lib`](#mod_lib)
-* [`mod_lib_path`](#mod_lib_path)
-* [`mod_package`](#mod_package)
-* [`mod_package_ensure`](#mod_package_ensure)
-* [`mod_path`](#mod_path)
-* [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
-* [`passenger_anonymous_telemetry_proxy`](#passenger_anonymous_telemetry_proxy)
-* [`passenger_app_env`](#passenger_app_env)
-* [`passenger_app_group_name`](#passenger_app_group_name)
-* [`passenger_app_root`](#passenger_app_root)
-* [`passenger_app_type`](#passenger_app_type)
-* [`passenger_base_uri`](#passenger_base_uri)
-* [`passenger_buffer_response`](#passenger_buffer_response)
-* [`passenger_buffer_upload`](#passenger_buffer_upload)
-* [`passenger_concurrency_model`](#passenger_concurrency_model)
-* [`passenger_conf_file`](#passenger_conf_file)
-* [`passenger_conf_package_file`](#passenger_conf_package_file)
-* [`passenger_data_buffer_dir`](#passenger_data_buffer_dir)
-* [`passenger_debug_log_file`](#passenger_debug_log_file)
-* [`passenger_debugger`](#passenger_debugger)
-* [`passenger_default_group`](#passenger_default_group)
-* [`passenger_default_ruby`](#passenger_default_ruby)
-* [`passenger_default_user`](#passenger_default_user)
-* [`passenger_disable_anonymous_telemetry`](#passenger_disable_anonymous_telemetry)
-* [`passenger_disable_log_prefix`](#passenger_disable_log_prefix)
-* [`passenger_disable_security_update_check`](#passenger_disable_security_update_check)
-* [`passenger_enabled`](#passenger_enabled)
-* [`passenger_error_override`](#passenger_error_override)
-* [`passenger_file_descriptor_log_file`](#passenger_file_descriptor_log_file)
-* [`passenger_fly_with`](#passenger_fly_with)
-* [`passenger_force_max_concurrent_requests_per_process`](#passenger_force_max_concurrent_requests_per_process)
-* [`passenger_friendly_error_pages`](#passenger_friendly_error_pages)
-* [`passenger_group`](#passenger_group)
-* [`passenger_high_performance`](#passenger_high_performance)
-* [`passenger_installed_version`](#passenger_installed_version)
-* [`passenger_instance_registry_dir`](#passenger_instance_registry_dir)
-* [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
-* [`passenger_preload_bundler`](#passenger_preload_bundler)
-* [`passenger_log_file`](#passenger_log_file)
-* [`passenger_log_level`](#passenger_log_level)
-* [`passenger_lve_min_uid`](#passenger_lve_min_uid)
-* [`passenger_max_instances`](#passenger_max_instances)
-* [`passenger_max_instances_per_app`](#passenger_max_instances_per_app)
-* [`passenger_max_pool_size`](#passenger_max_pool_size)
-* [`passenger_max_preloader_idle_time`](#passenger_max_preloader_idle_time)
-* [`passenger_max_request_queue_size`](#passenger_max_request_queue_size)
-* [`passenger_max_request_time`](#passenger_max_request_time)
-* [`passenger_max_requests`](#passenger_max_requests)
-* [`passenger_memory_limit`](#passenger_memory_limit)
-* [`passenger_meteor_app_settings`](#passenger_meteor_app_settings)
-* [`passenger_min_instances`](#passenger_min_instances)
-* [`passenger_nodejs`](#passenger_nodejs)
-* [`passenger_pool_idle_time`](#passenger_pool_idle_time)
-* [`passenger_pre_start`](#passenger_pre_start)
-* [`passenger_python`](#passenger_python)
-* [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
-* [`passenger_resolve_symlinks_in_document_root`](#passenger_resolve_symlinks_in_document_root)
-* [`passenger_response_buffer_high_watermark`](#passenger_response_buffer_high_watermark)
-* [`passenger_restart_dir`](#passenger_restart_dir)
-* [`passenger_rolling_restarts`](#passenger_rolling_restarts)
-* [`passenger_root`](#passenger_root)
-* [`passenger_ruby`](#passenger_ruby)
-* [`passenger_security_update_check_proxy`](#passenger_security_update_check_proxy)
-* [`passenger_show_version_in_header`](#passenger_show_version_in_header)
-* [`passenger_socket_backlog`](#passenger_socket_backlog)
-* [`passenger_spawn_dir`](#passenger_spawn_dir)
-* [`passenger_spawn_method`](#passenger_spawn_method)
-* [`passenger_start_timeout`](#passenger_start_timeout)
-* [`passenger_startup_file`](#passenger_startup_file)
-* [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
-* [`passenger_sticky_sessions`](#passenger_sticky_sessions)
-* [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
-* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
-* [`passenger_thread_count`](#passenger_thread_count)
-* [`passenger_use_global_queue`](#passenger_use_global_queue)
-* [`passenger_user`](#passenger_user)
-* [`passenger_user_switching`](#passenger_user_switching)
-* [`rack_auto_detect`](#rack_auto_detect)
-* [`rack_autodetect`](#rack_autodetect)
-* [`rack_base_uri`](#rack_base_uri)
-* [`rack_env`](#rack_env)
-* [`rails_allow_mod_rewrite`](#rails_allow_mod_rewrite)
-* [`rails_app_spawner_idle_time`](#rails_app_spawner_idle_time)
-* [`rails_auto_detect`](#rails_auto_detect)
-* [`rails_autodetect`](#rails_autodetect)
-* [`rails_base_uri`](#rails_base_uri)
-* [`rails_default_user`](#rails_default_user)
-* [`rails_env`](#rails_env)
-* [`rails_framework_spawner_idle_time`](#rails_framework_spawner_idle_time)
-* [`rails_ruby`](#rails_ruby)
-* [`rails_spawn_method`](#rails_spawn_method)
-* [`rails_user_switching`](#rails_user_switching)
-* [`wsgi_auto_detect`](#wsgi_auto_detect)
-
-##### <a name="manage_repo"></a>`manage_repo`
+* [`manage_repo`](#-apache--mod--passenger--manage_repo)
+* [`mod_id`](#-apache--mod--passenger--mod_id)
+* [`mod_lib`](#-apache--mod--passenger--mod_lib)
+* [`mod_lib_path`](#-apache--mod--passenger--mod_lib_path)
+* [`mod_package`](#-apache--mod--passenger--mod_package)
+* [`mod_package_ensure`](#-apache--mod--passenger--mod_package_ensure)
+* [`mod_path`](#-apache--mod--passenger--mod_path)
+* [`passenger_allow_encoded_slashes`](#-apache--mod--passenger--passenger_allow_encoded_slashes)
+* [`passenger_anonymous_telemetry_proxy`](#-apache--mod--passenger--passenger_anonymous_telemetry_proxy)
+* [`passenger_app_env`](#-apache--mod--passenger--passenger_app_env)
+* [`passenger_app_group_name`](#-apache--mod--passenger--passenger_app_group_name)
+* [`passenger_app_root`](#-apache--mod--passenger--passenger_app_root)
+* [`passenger_app_type`](#-apache--mod--passenger--passenger_app_type)
+* [`passenger_base_uri`](#-apache--mod--passenger--passenger_base_uri)
+* [`passenger_buffer_response`](#-apache--mod--passenger--passenger_buffer_response)
+* [`passenger_buffer_upload`](#-apache--mod--passenger--passenger_buffer_upload)
+* [`passenger_concurrency_model`](#-apache--mod--passenger--passenger_concurrency_model)
+* [`passenger_conf_file`](#-apache--mod--passenger--passenger_conf_file)
+* [`passenger_conf_package_file`](#-apache--mod--passenger--passenger_conf_package_file)
+* [`passenger_data_buffer_dir`](#-apache--mod--passenger--passenger_data_buffer_dir)
+* [`passenger_debug_log_file`](#-apache--mod--passenger--passenger_debug_log_file)
+* [`passenger_debugger`](#-apache--mod--passenger--passenger_debugger)
+* [`passenger_default_group`](#-apache--mod--passenger--passenger_default_group)
+* [`passenger_default_ruby`](#-apache--mod--passenger--passenger_default_ruby)
+* [`passenger_default_user`](#-apache--mod--passenger--passenger_default_user)
+* [`passenger_disable_anonymous_telemetry`](#-apache--mod--passenger--passenger_disable_anonymous_telemetry)
+* [`passenger_disable_log_prefix`](#-apache--mod--passenger--passenger_disable_log_prefix)
+* [`passenger_disable_security_update_check`](#-apache--mod--passenger--passenger_disable_security_update_check)
+* [`passenger_enabled`](#-apache--mod--passenger--passenger_enabled)
+* [`passenger_error_override`](#-apache--mod--passenger--passenger_error_override)
+* [`passenger_file_descriptor_log_file`](#-apache--mod--passenger--passenger_file_descriptor_log_file)
+* [`passenger_fly_with`](#-apache--mod--passenger--passenger_fly_with)
+* [`passenger_force_max_concurrent_requests_per_process`](#-apache--mod--passenger--passenger_force_max_concurrent_requests_per_process)
+* [`passenger_friendly_error_pages`](#-apache--mod--passenger--passenger_friendly_error_pages)
+* [`passenger_group`](#-apache--mod--passenger--passenger_group)
+* [`passenger_high_performance`](#-apache--mod--passenger--passenger_high_performance)
+* [`passenger_installed_version`](#-apache--mod--passenger--passenger_installed_version)
+* [`passenger_instance_registry_dir`](#-apache--mod--passenger--passenger_instance_registry_dir)
+* [`passenger_load_shell_envvars`](#-apache--mod--passenger--passenger_load_shell_envvars)
+* [`passenger_preload_bundler`](#-apache--mod--passenger--passenger_preload_bundler)
+* [`passenger_log_file`](#-apache--mod--passenger--passenger_log_file)
+* [`passenger_log_level`](#-apache--mod--passenger--passenger_log_level)
+* [`passenger_lve_min_uid`](#-apache--mod--passenger--passenger_lve_min_uid)
+* [`passenger_max_instances`](#-apache--mod--passenger--passenger_max_instances)
+* [`passenger_max_instances_per_app`](#-apache--mod--passenger--passenger_max_instances_per_app)
+* [`passenger_max_pool_size`](#-apache--mod--passenger--passenger_max_pool_size)
+* [`passenger_max_preloader_idle_time`](#-apache--mod--passenger--passenger_max_preloader_idle_time)
+* [`passenger_max_request_queue_size`](#-apache--mod--passenger--passenger_max_request_queue_size)
+* [`passenger_max_request_time`](#-apache--mod--passenger--passenger_max_request_time)
+* [`passenger_max_requests`](#-apache--mod--passenger--passenger_max_requests)
+* [`passenger_memory_limit`](#-apache--mod--passenger--passenger_memory_limit)
+* [`passenger_meteor_app_settings`](#-apache--mod--passenger--passenger_meteor_app_settings)
+* [`passenger_min_instances`](#-apache--mod--passenger--passenger_min_instances)
+* [`passenger_nodejs`](#-apache--mod--passenger--passenger_nodejs)
+* [`passenger_pool_idle_time`](#-apache--mod--passenger--passenger_pool_idle_time)
+* [`passenger_pre_start`](#-apache--mod--passenger--passenger_pre_start)
+* [`passenger_python`](#-apache--mod--passenger--passenger_python)
+* [`passenger_resist_deployment_errors`](#-apache--mod--passenger--passenger_resist_deployment_errors)
+* [`passenger_resolve_symlinks_in_document_root`](#-apache--mod--passenger--passenger_resolve_symlinks_in_document_root)
+* [`passenger_response_buffer_high_watermark`](#-apache--mod--passenger--passenger_response_buffer_high_watermark)
+* [`passenger_restart_dir`](#-apache--mod--passenger--passenger_restart_dir)
+* [`passenger_rolling_restarts`](#-apache--mod--passenger--passenger_rolling_restarts)
+* [`passenger_root`](#-apache--mod--passenger--passenger_root)
+* [`passenger_ruby`](#-apache--mod--passenger--passenger_ruby)
+* [`passenger_security_update_check_proxy`](#-apache--mod--passenger--passenger_security_update_check_proxy)
+* [`passenger_show_version_in_header`](#-apache--mod--passenger--passenger_show_version_in_header)
+* [`passenger_socket_backlog`](#-apache--mod--passenger--passenger_socket_backlog)
+* [`passenger_spawn_dir`](#-apache--mod--passenger--passenger_spawn_dir)
+* [`passenger_spawn_method`](#-apache--mod--passenger--passenger_spawn_method)
+* [`passenger_start_timeout`](#-apache--mod--passenger--passenger_start_timeout)
+* [`passenger_startup_file`](#-apache--mod--passenger--passenger_startup_file)
+* [`passenger_stat_throttle_rate`](#-apache--mod--passenger--passenger_stat_throttle_rate)
+* [`passenger_sticky_sessions`](#-apache--mod--passenger--passenger_sticky_sessions)
+* [`passenger_sticky_sessions_cookie_name`](#-apache--mod--passenger--passenger_sticky_sessions_cookie_name)
+* [`passenger_sticky_sessions_cookie_attributes`](#-apache--mod--passenger--passenger_sticky_sessions_cookie_attributes)
+* [`passenger_thread_count`](#-apache--mod--passenger--passenger_thread_count)
+* [`passenger_use_global_queue`](#-apache--mod--passenger--passenger_use_global_queue)
+* [`passenger_user`](#-apache--mod--passenger--passenger_user)
+* [`passenger_user_switching`](#-apache--mod--passenger--passenger_user_switching)
+* [`rack_auto_detect`](#-apache--mod--passenger--rack_auto_detect)
+* [`rack_autodetect`](#-apache--mod--passenger--rack_autodetect)
+* [`rack_base_uri`](#-apache--mod--passenger--rack_base_uri)
+* [`rack_env`](#-apache--mod--passenger--rack_env)
+* [`rails_allow_mod_rewrite`](#-apache--mod--passenger--rails_allow_mod_rewrite)
+* [`rails_app_spawner_idle_time`](#-apache--mod--passenger--rails_app_spawner_idle_time)
+* [`rails_auto_detect`](#-apache--mod--passenger--rails_auto_detect)
+* [`rails_autodetect`](#-apache--mod--passenger--rails_autodetect)
+* [`rails_base_uri`](#-apache--mod--passenger--rails_base_uri)
+* [`rails_default_user`](#-apache--mod--passenger--rails_default_user)
+* [`rails_env`](#-apache--mod--passenger--rails_env)
+* [`rails_framework_spawner_idle_time`](#-apache--mod--passenger--rails_framework_spawner_idle_time)
+* [`rails_ruby`](#-apache--mod--passenger--rails_ruby)
+* [`rails_spawn_method`](#-apache--mod--passenger--rails_spawn_method)
+* [`rails_user_switching`](#-apache--mod--passenger--rails_user_switching)
+* [`wsgi_auto_detect`](#-apache--mod--passenger--wsgi_auto_detect)
+
+##### <a name="-apache--mod--passenger--manage_repo"></a>`manage_repo`
 
 Data type: `Boolean`
 
 Toggle whether to manage yum repo if on a RedHat node.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="mod_id"></a>`mod_id`
+##### <a name="-apache--mod--passenger--mod_id"></a>`mod_id`
 
 Data type: `Optional[String]`
 
 Specifies the package id.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_lib"></a>`mod_lib`
+##### <a name="-apache--mod--passenger--mod_lib"></a>`mod_lib`
 
 Data type: `Optional[String]`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_lib_path"></a>`mod_lib_path`
+##### <a name="-apache--mod--passenger--mod_lib_path"></a>`mod_lib_path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter overrides
 this value.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_package"></a>`mod_package`
+##### <a name="-apache--mod--passenger--mod_package"></a>`mod_package`
 
 Data type: `Optional[String]`
 
 Name of the module package to install.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_package_ensure"></a>`mod_package_ensure`
+##### <a name="-apache--mod--passenger--mod_package_ensure"></a>`mod_package_ensure`
 
 Data type: `Optional[String]`
 
 Determines whether Puppet ensures the module should be installed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_path"></a>`mod_path`
+##### <a name="-apache--mod--passenger--mod_path"></a>`mod_path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
+##### <a name="-apache--mod--passenger--passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
+##### <a name="-apache--mod--passenger--passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
 
 Data type: `Optional[String]`
 
 Set an intermediate proxy for the Passenger anonymous telemetry reporting.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_env"></a>`passenger_app_env`
+##### <a name="-apache--mod--passenger--passenger_app_env"></a>`passenger_app_env`
 
 Data type: `Optional[String]`
 
@@ -4740,66 +4765,66 @@ This option sets, for the current application, the value of the following enviro
 - NODE_ENV
 - PASSENGER_APP_ENV
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
+##### <a name="-apache--mod--passenger--passenger_app_group_name"></a>`passenger_app_group_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the application group that the current application should belong to.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_root"></a>`passenger_app_root`
+##### <a name="-apache--mod--passenger--passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Optional[String]`
 
 Path to the application root which allows access independent from the DocumentRoot.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_type"></a>`passenger_app_type`
+##### <a name="-apache--mod--passenger--passenger_app_type"></a>`passenger_app_type`
 
 Data type: `Optional[String]`
 
 Specifies the type of the application. If you set this option, then you must also set PassengerAppRoot, otherwise Passenger will
 not properly recognize your application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_base_uri"></a>`passenger_base_uri`
+##### <a name="-apache--mod--passenger--passenger_base_uri"></a>`passenger_base_uri`
 
 Data type: `Optional[String]`
 
 Used to specify that the given URI is an distinct application that should be served by Passenger.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
+##### <a name="-apache--mod--passenger--passenger_buffer_response"></a>`passenger_buffer_response`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggle whether application-generated responses are buffered by Apache. Buffering will happen in memory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
+##### <a name="-apache--mod--passenger--passenger_buffer_upload"></a>`passenger_buffer_upload`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggle whether HTTP client request bodies are buffered before they are sent to the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
+##### <a name="-apache--mod--passenger--passenger_concurrency_model"></a>`passenger_concurrency_model`
 
 Data type: `Optional[String]`
 
 Specifies the I/O concurrency model that should be used for Ruby application processes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_conf_file"></a>`passenger_conf_file`
+##### <a name="-apache--mod--passenger--passenger_conf_file"></a>`passenger_conf_file`
 
 Data type: `String`
 
@@ -4807,7 +4832,7 @@ Data type: `String`
 
 Default value: `$apache::params::passenger_conf_file`
 
-##### <a name="passenger_conf_package_file"></a>`passenger_conf_package_file`
+##### <a name="-apache--mod--passenger--passenger_conf_package_file"></a>`passenger_conf_package_file`
 
 Data type: `Optional[String]`
 
@@ -4815,39 +4840,39 @@ Data type: `Optional[String]`
 
 Default value: `$apache::params::passenger_conf_package_file`
 
-##### <a name="passenger_data_buffer_dir"></a>`passenger_data_buffer_dir`
+##### <a name="-apache--mod--passenger--passenger_data_buffer_dir"></a>`passenger_data_buffer_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the directory in which to store data buffers.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_debug_log_file"></a>`passenger_debug_log_file`
+##### <a name="-apache--mod--passenger--passenger_debug_log_file"></a>`passenger_debug_log_file`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_debugger"></a>`passenger_debugger`
+##### <a name="-apache--mod--passenger--passenger_debugger"></a>`passenger_debugger`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Turns support for Ruby application debugging on or off.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_default_group"></a>`passenger_default_group`
+##### <a name="-apache--mod--passenger--passenger_default_group"></a>`passenger_default_group`
 
 Data type: `Optional[String]`
 
 Allows you to specify the group that applications must run as, if user switching fails or is disabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_default_ruby"></a>`passenger_default_ruby`
+##### <a name="-apache--mod--passenger--passenger_default_ruby"></a>`passenger_default_ruby`
 
 Data type: `Optional[String]`
 
@@ -4855,318 +4880,318 @@ File path to desired ruby interpreter to use by default.
 
 Default value: `$apache::params::passenger_default_ruby`
 
-##### <a name="passenger_default_user"></a>`passenger_default_user`
+##### <a name="-apache--mod--passenger--passenger_default_user"></a>`passenger_default_user`
 
 Data type: `Optional[String]`
 
 Allows you to specify the user that applications must run as, if user switching fails or is disabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
+##### <a name="-apache--mod--passenger--passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
 
 Data type: `Optional[Boolean]`
 
 Whether or not to disable the Passenger anonymous telemetry reporting.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
+##### <a name="-apache--mod--passenger--passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
 
 Data type: `Optional[Boolean]`
 
 Whether to stop Passenger from prefixing logs when they are written to a log file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
+##### <a name="-apache--mod--passenger--passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
 security updates that might be available.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_enabled"></a>`passenger_enabled`
+##### <a name="-apache--mod--passenger--passenger_enabled"></a>`passenger_enabled`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether Passenger should be enabled for that particular context.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_error_override"></a>`passenger_error_override`
+##### <a name="-apache--mod--passenger--passenger_error_override"></a>`passenger_error_override`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_file_descriptor_log_file"></a>`passenger_file_descriptor_log_file`
+##### <a name="-apache--mod--passenger--passenger_file_descriptor_log_file"></a>`passenger_file_descriptor_log_file`
 
 Data type: `Optional[String]`
 
 Log file descriptor debug tracing messages to the given file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_fly_with"></a>`passenger_fly_with`
+##### <a name="-apache--mod--passenger--passenger_fly_with"></a>`passenger_fly_with`
 
 Data type: `Optional[String]`
 
 Enables the Flying Passenger mode, and configures Apache to connect to the Flying Passenger daemon that's listening on the
 given socket filename.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
+##### <a name="-apache--mod--passenger--passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 Use this option to tell Passenger how many concurrent requests the application can handle per process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
+##### <a name="-apache--mod--passenger--passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether Passenger should display friendly error pages whenever an application fails to start.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_group"></a>`passenger_group`
+##### <a name="-apache--mod--passenger--passenger_group"></a>`passenger_group`
 
 Data type: `Optional[String]`
 
 Allows you to override that behavior and explicitly set a group to run the web application as, regardless of the ownership of the
 startup file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_high_performance"></a>`passenger_high_performance`
+##### <a name="-apache--mod--passenger--passenger_high_performance"></a>`passenger_high_performance`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether to enable PassengerHighPerformance which will make Passenger will be a little faster, in return for reduced
 compatibility with other Apache modules.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_installed_version"></a>`passenger_installed_version`
+##### <a name="-apache--mod--passenger--passenger_installed_version"></a>`passenger_installed_version`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_instance_registry_dir"></a>`passenger_instance_registry_dir`
+##### <a name="-apache--mod--passenger--passenger_instance_registry_dir"></a>`passenger_instance_registry_dir`
 
 Data type: `Optional[String]`
 
 Specifies the directory that Passenger should use for registering its current instance.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
+##### <a name="-apache--mod--passenger--passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Enables or disables the loading of shell environment variables before spawning the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_preload_bundler"></a>`passenger_preload_bundler`
+##### <a name="-apache--mod--passenger--passenger_preload_bundler"></a>`passenger_preload_bundler`
 
 Data type: `Optional[Boolean]`
 
 Enables or disables loading bundler before loading your Ruby app.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_log_file"></a>`passenger_log_file`
+##### <a name="-apache--mod--passenger--passenger_log_file"></a>`passenger_log_file`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 File path to log file. By default Passenger log messages are written to the Apache global error log.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_log_level"></a>`passenger_log_level`
+##### <a name="-apache--mod--passenger--passenger_log_level"></a>`passenger_log_level`
 
 Data type: `Optional[Integer]`
 
 Specifies how much information Passenger should log to its log file. A higher log level value means that more
 information will be logged.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
+##### <a name="-apache--mod--passenger--passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
 When using Passenger on a LVE-enabled kernel, a security check (enter) is run for spawning application processes. This options
 tells the check to only allow processes with UIDs equal to, or higher than, the specified value.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_instances"></a>`passenger_max_instances`
+##### <a name="-apache--mod--passenger--passenger_max_instances"></a>`passenger_max_instances`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist for an application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_instances_per_app"></a>`passenger_max_instances_per_app`
+##### <a name="-apache--mod--passenger--passenger_max_instances_per_app"></a>`passenger_max_instances_per_app`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist for a single application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_pool_size"></a>`passenger_max_pool_size`
+##### <a name="-apache--mod--passenger--passenger_max_pool_size"></a>`passenger_max_pool_size`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
+##### <a name="-apache--mod--passenger--passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
 Data type: `Optional[Integer]`
 
 Set the preloader's idle timeout, in seconds. A value of 0 means that it should never idle timeout.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
+##### <a name="-apache--mod--passenger--passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
 Data type: `Optional[Integer]`
 
 Specifies the maximum size for the queue of all incoming requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
+##### <a name="-apache--mod--passenger--passenger_max_request_time"></a>`passenger_max_request_time`
 
 Data type: `Optional[Integer]`
 
 The maximum amount of time, in seconds, that an application process may take to process a request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_requests"></a>`passenger_max_requests`
+##### <a name="-apache--mod--passenger--passenger_max_requests"></a>`passenger_max_requests`
 
 Data type: `Optional[Integer]`
 
 The maximum number of requests an application process will process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
+##### <a name="-apache--mod--passenger--passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Optional[Integer]`
 
 The maximum amount of memory that an application process may use, in megabytes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
+##### <a name="-apache--mod--passenger--passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
 Data type: `Optional[String]`
 
 When using a Meteor application in non-bundled mode, use this option to specify a JSON file with settings for the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_min_instances"></a>`passenger_min_instances`
+##### <a name="-apache--mod--passenger--passenger_min_instances"></a>`passenger_min_instances`
 
 Data type: `Optional[Integer]`
 
 Specifies the minimum number of application processes that should exist for a given application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_nodejs"></a>`passenger_nodejs`
+##### <a name="-apache--mod--passenger--passenger_nodejs"></a>`passenger_nodejs`
 
 Data type: `Optional[String]`
 
 Specifies the Node.js command to use for serving Node.js web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_pool_idle_time"></a>`passenger_pool_idle_time`
+##### <a name="-apache--mod--passenger--passenger_pool_idle_time"></a>`passenger_pool_idle_time`
 
 Data type: `Optional[Integer]`
 
 The maximum number of seconds that an application process may be idle.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_pre_start"></a>`passenger_pre_start`
+##### <a name="-apache--mod--passenger--passenger_pre_start"></a>`passenger_pre_start`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
 URL of the web application you want to pre-start.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_python"></a>`passenger_python`
+##### <a name="-apache--mod--passenger--passenger_python"></a>`passenger_python`
 
 Data type: `Optional[String]`
 
 Specifies the Python interpreter to use for serving Python web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
+##### <a name="-apache--mod--passenger--passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Enables or disables resistance against deployment errors.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_resolve_symlinks_in_document_root"></a>`passenger_resolve_symlinks_in_document_root`
+##### <a name="-apache--mod--passenger--passenger_resolve_symlinks_in_document_root"></a>`passenger_resolve_symlinks_in_document_root`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 This option is no longer available in version 5.2.0. Switch to PassengerAppRoot if you are setting the application root via a
 document root containing symlinks.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_response_buffer_high_watermark"></a>`passenger_response_buffer_high_watermark`
+##### <a name="-apache--mod--passenger--passenger_response_buffer_high_watermark"></a>`passenger_response_buffer_high_watermark`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 Configures the maximum size of the real-time disk-backed response buffering system.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
+##### <a name="-apache--mod--passenger--passenger_restart_dir"></a>`passenger_restart_dir`
 
 Data type: `Optional[String]`
 
 Path to directory containing restart.txt file. Can be either absolute or relative.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
+##### <a name="-apache--mod--passenger--passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Enables or disables support for zero-downtime application restarts through restart.txt.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_root"></a>`passenger_root`
+##### <a name="-apache--mod--passenger--passenger_root"></a>`passenger_root`
 
 Data type: `Optional[String]`
 
@@ -5174,7 +5199,7 @@ Refers to the location to the Passenger root directory, or to a location configu
 
 Default value: `$apache::params::passenger_root`
 
-##### <a name="passenger_ruby"></a>`passenger_ruby`
+##### <a name="-apache--mod--passenger--passenger_ruby"></a>`passenger_ruby`
 
 Data type: `Optional[String]`
 
@@ -5182,257 +5207,257 @@ Specifies the Ruby interpreter to use for serving Ruby web applications.
 
 Default value: `$apache::params::passenger_ruby`
 
-##### <a name="passenger_security_update_check_proxy"></a>`passenger_security_update_check_proxy`
+##### <a name="-apache--mod--passenger--passenger_security_update_check_proxy"></a>`passenger_security_update_check_proxy`
 
 Data type: `Optional[String]`
 
 Allows use of an intermediate proxy for the Passenger security update check.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_show_version_in_header"></a>`passenger_show_version_in_header`
+##### <a name="-apache--mod--passenger--passenger_show_version_in_header"></a>`passenger_show_version_in_header`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggle whether Passenger will output its version number in the X-Powered-By header in all Passenger-served requests:
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_socket_backlog"></a>`passenger_socket_backlog`
+##### <a name="-apache--mod--passenger--passenger_socket_backlog"></a>`passenger_socket_backlog`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 This option can be raised if Apache manages to overflow the backlog queue.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_spawn_dir"></a>`passenger_spawn_dir`
+##### <a name="-apache--mod--passenger--passenger_spawn_dir"></a>`passenger_spawn_dir`
 
 Data type: `Optional[String]`
 
 The directory in which Passenger will record progress during startup
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
+##### <a name="-apache--mod--passenger--passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']]`
 
 Controls whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
+##### <a name="-apache--mod--passenger--passenger_start_timeout"></a>`passenger_start_timeout`
 
 Data type: `Optional[Integer]`
 
 Specifies a timeout for the startup of application processes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_startup_file"></a>`passenger_startup_file`
+##### <a name="-apache--mod--passenger--passenger_startup_file"></a>`passenger_startup_file`
 
 Data type: `Optional[String]`
 
 Specifies the startup file that Passenger should use when loading the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
+##### <a name="-apache--mod--passenger--passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
 Data type: `Optional[Integer]`
 
 Setting this option to a value of x means that certain filesystem checks will be performed at most once every x seconds.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
+##### <a name="-apache--mod--passenger--passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether all requests that a client sends will be routed to the same originating application process, whenever possible.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
+##### <a name="-apache--mod--passenger--passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the sticky sessions cookie.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
+##### <a name="-apache--mod--passenger--passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
 Sets the attributes of the sticky sessions cookie.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_thread_count"></a>`passenger_thread_count`
+##### <a name="-apache--mod--passenger--passenger_thread_count"></a>`passenger_thread_count`
 
 Data type: `Optional[Integer]`
 
 Specifies the number of threads that Passenger should spawn per Ruby application process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_use_global_queue"></a>`passenger_use_global_queue`
+##### <a name="-apache--mod--passenger--passenger_use_global_queue"></a>`passenger_use_global_queue`
 
 Data type: `Optional[String]`
 
 N/A.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_user"></a>`passenger_user`
+##### <a name="-apache--mod--passenger--passenger_user"></a>`passenger_user`
 
 Data type: `Optional[String]`
 
 Allows you to override that behavior and explicitly set a user to run the web application as, regardless of the ownership of the
 startup file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_user_switching"></a>`passenger_user_switching`
+##### <a name="-apache--mod--passenger--passenger_user_switching"></a>`passenger_user_switching`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
 Toggles whether to attempt to enable user account sandboxing, also known as user switching.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rack_auto_detect"></a>`rack_auto_detect`
+##### <a name="-apache--mod--passenger--rack_auto_detect"></a>`rack_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rack_autodetect"></a>`rack_autodetect`
+##### <a name="-apache--mod--passenger--rack_autodetect"></a>`rack_autodetect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rack_base_uri"></a>`rack_base_uri`
+##### <a name="-apache--mod--passenger--rack_base_uri"></a>`rack_base_uri`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rack_env"></a>`rack_env`
+##### <a name="-apache--mod--passenger--rack_env"></a>`rack_env`
 
 Data type: `Optional[String]`
 
 Alias for PassengerAppEnv.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
+##### <a name="-apache--mod--passenger--rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
 
 Data type: `Optional[String]`
 
 This option doesn't do anything anymore since version 4.0.0.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
+##### <a name="-apache--mod--passenger--rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_auto_detect"></a>`rails_auto_detect`
+##### <a name="-apache--mod--passenger--rails_auto_detect"></a>`rails_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_autodetect"></a>`rails_autodetect`
+##### <a name="-apache--mod--passenger--rails_autodetect"></a>`rails_autodetect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_base_uri"></a>`rails_base_uri`
+##### <a name="-apache--mod--passenger--rails_base_uri"></a>`rails_base_uri`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_default_user"></a>`rails_default_user`
+##### <a name="-apache--mod--passenger--rails_default_user"></a>`rails_default_user`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerDefaultUser
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_env"></a>`rails_env`
+##### <a name="-apache--mod--passenger--rails_env"></a>`rails_env`
 
 Data type: `Optional[String]`
 
 Alias for PassengerAppEnv.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_framework_spawner_idle_time"></a>`rails_framework_spawner_idle_time`
+##### <a name="-apache--mod--passenger--rails_framework_spawner_idle_time"></a>`rails_framework_spawner_idle_time`
 
 Data type: `Optional[String]`
 
 This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed
 altogether. You should use smart spawning instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_ruby"></a>`rails_ruby`
+##### <a name="-apache--mod--passenger--rails_ruby"></a>`rails_ruby`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerRuby.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_spawn_method"></a>`rails_spawn_method`
+##### <a name="-apache--mod--passenger--rails_spawn_method"></a>`rails_spawn_method`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_user_switching"></a>`rails_user_switching`
+##### <a name="-apache--mod--passenger--rails_user_switching"></a>`rails_user_switching`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerUserSwitching.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_auto_detect"></a>`wsgi_auto_detect`
+##### <a name="-apache--mod--passenger--wsgi_auto_detect"></a>`wsgi_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodperl"></a>`apache::mod::perl`
+### <a name="apache--mod--perl"></a>`apache::mod::perl`
 
 Installs `mod_perl`.
 
@@ -5440,7 +5465,7 @@ Installs `mod_perl`.
   * https://perl.apache.org
     * for additional documentation.
 
-### <a name="apachemodperuser"></a>`apache::mod::peruser`
+### <a name="apache--mod--peruser"></a>`apache::mod::peruser`
 
 Installs `mod_peruser`.
 
@@ -5448,16 +5473,16 @@ Installs `mod_peruser`.
 
 The following parameters are available in the `apache::mod::peruser` class:
 
-* [`minspareprocessors`](#minspareprocessors)
-* [`minprocessors`](#minprocessors)
-* [`maxprocessors`](#maxprocessors)
-* [`maxclients`](#maxclients)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`idletimeout`](#idletimeout)
-* [`expiretimeout`](#expiretimeout)
-* [`keepalive`](#keepalive)
+* [`minspareprocessors`](#-apache--mod--peruser--minspareprocessors)
+* [`minprocessors`](#-apache--mod--peruser--minprocessors)
+* [`maxprocessors`](#-apache--mod--peruser--maxprocessors)
+* [`maxclients`](#-apache--mod--peruser--maxclients)
+* [`maxrequestsperchild`](#-apache--mod--peruser--maxrequestsperchild)
+* [`idletimeout`](#-apache--mod--peruser--idletimeout)
+* [`expiretimeout`](#-apache--mod--peruser--expiretimeout)
+* [`keepalive`](#-apache--mod--peruser--keepalive)
 
-##### <a name="minspareprocessors"></a>`minspareprocessors`
+##### <a name="-apache--mod--peruser--minspareprocessors"></a>`minspareprocessors`
 
 Data type: `Integer`
 
@@ -5465,7 +5490,7 @@ Data type: `Integer`
 
 Default value: `2`
 
-##### <a name="minprocessors"></a>`minprocessors`
+##### <a name="-apache--mod--peruser--minprocessors"></a>`minprocessors`
 
 Data type: `Integer`
 
@@ -5473,7 +5498,7 @@ The minimum amount of processors
 
 Default value: `2`
 
-##### <a name="maxprocessors"></a>`maxprocessors`
+##### <a name="-apache--mod--peruser--maxprocessors"></a>`maxprocessors`
 
 Data type: `Integer`
 
@@ -5481,7 +5506,7 @@ The maximum amount of processors
 
 Default value: `10`
 
-##### <a name="maxclients"></a>`maxclients`
+##### <a name="-apache--mod--peruser--maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -5489,7 +5514,7 @@ The maximum amount of clients
 
 Default value: `150`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--peruser--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -5497,7 +5522,7 @@ The maximum amount of requests per child
 
 Default value: `1000`
 
-##### <a name="idletimeout"></a>`idletimeout`
+##### <a name="-apache--mod--peruser--idletimeout"></a>`idletimeout`
 
 Data type: `Integer`
 
@@ -5505,7 +5530,7 @@ Data type: `Integer`
 
 Default value: `120`
 
-##### <a name="expiretimeout"></a>`expiretimeout`
+##### <a name="-apache--mod--peruser--expiretimeout"></a>`expiretimeout`
 
 Data type: `Integer`
 
@@ -5513,7 +5538,7 @@ Data type: `Integer`
 
 Default value: `120`
 
-##### <a name="keepalive"></a>`keepalive`
+##### <a name="-apache--mod--peruser--keepalive"></a>`keepalive`
 
 Data type: `Enum['On', 'Off']`
 
@@ -5521,7 +5546,7 @@ Data type: `Enum['On', 'Off']`
 
 Default value: `'Off'`
 
-### <a name="apachemodphp"></a>`apache::mod::php`
+### <a name="apache--mod--php"></a>`apache::mod::php`
 
 Installs `mod_php`.
 
@@ -5531,26 +5556,26 @@ Installs `mod_php`.
 
 The following parameters are available in the `apache::mod::php` class:
 
-* [`package_name`](#package_name)
-* [`package_ensure`](#package_ensure)
-* [`path`](#path)
-* [`extensions`](#extensions)
-* [`content`](#content)
-* [`template`](#template)
-* [`source`](#source)
-* [`root_group`](#root_group)
-* [`php_version`](#php_version)
-* [`libphp_prefix`](#libphp_prefix)
+* [`package_name`](#-apache--mod--php--package_name)
+* [`package_ensure`](#-apache--mod--php--package_ensure)
+* [`path`](#-apache--mod--php--path)
+* [`extensions`](#-apache--mod--php--extensions)
+* [`content`](#-apache--mod--php--content)
+* [`template`](#-apache--mod--php--template)
+* [`source`](#-apache--mod--php--source)
+* [`root_group`](#-apache--mod--php--root_group)
+* [`php_version`](#-apache--mod--php--php_version)
+* [`libphp_prefix`](#-apache--mod--php--libphp_prefix)
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--php--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 The package name
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_ensure"></a>`package_ensure`
+##### <a name="-apache--mod--php--package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -5558,15 +5583,15 @@ Whether the package is `present` or `absent`
 
 Default value: `'present'`
 
-##### <a name="path"></a>`path`
+##### <a name="-apache--mod--php--path"></a>`path`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="extensions"></a>`extensions`
+##### <a name="-apache--mod--php--extensions"></a>`extensions`
 
 Data type: `Array`
 
@@ -5574,15 +5599,15 @@ Data type: `Array`
 
 Default value: `['.php']`
 
-##### <a name="content"></a>`content`
+##### <a name="-apache--mod--php--content"></a>`content`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="template"></a>`template`
+##### <a name="-apache--mod--php--template"></a>`template`
 
 Data type: `String`
 
@@ -5590,15 +5615,15 @@ Data type: `String`
 
 Default value: `'apache/mod/php.conf.erb'`
 
-##### <a name="source"></a>`source`
+##### <a name="-apache--mod--php--source"></a>`source`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="root_group"></a>`root_group`
+##### <a name="-apache--mod--php--root_group"></a>`root_group`
 
 Data type: `Optional[String]`
 
@@ -5606,7 +5631,7 @@ UNIX group of the root user
 
 Default value: `$apache::params::root_group`
 
-##### <a name="php_version"></a>`php_version`
+##### <a name="-apache--mod--php--php_version"></a>`php_version`
 
 Data type: `Optional[String]`
 
@@ -5614,7 +5639,7 @@ The php version. This is a required parameter, but optional allows showing a cle
 
 Default value: `$apache::params::php_version`
 
-##### <a name="libphp_prefix"></a>`libphp_prefix`
+##### <a name="-apache--mod--php--libphp_prefix"></a>`libphp_prefix`
 
 Data type: `String`
 
@@ -5622,7 +5647,7 @@ Data type: `String`
 
 Default value: `'libphp'`
 
-### <a name="apachemodprefork"></a>`apache::mod::prefork`
+### <a name="apache--mod--prefork"></a>`apache::mod::prefork`
 
 Installs and configures MPM `prefork`.
 
@@ -5634,18 +5659,18 @@ Installs and configures MPM `prefork`.
 
 The following parameters are available in the `apache::mod::prefork` class:
 
-* [`startservers`](#startservers)
-* [`minspareservers`](#minspareservers)
-* [`maxspareservers`](#maxspareservers)
-* [`serverlimit`](#serverlimit)
-* [`maxclients`](#maxclients)
-* [`maxrequestworkers`](#maxrequestworkers)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`maxconnectionsperchild`](#maxconnectionsperchild)
-* [`apache_version`](#apache_version)
-* [`listenbacklog`](#listenbacklog)
+* [`startservers`](#-apache--mod--prefork--startservers)
+* [`minspareservers`](#-apache--mod--prefork--minspareservers)
+* [`maxspareservers`](#-apache--mod--prefork--maxspareservers)
+* [`serverlimit`](#-apache--mod--prefork--serverlimit)
+* [`maxclients`](#-apache--mod--prefork--maxclients)
+* [`maxrequestworkers`](#-apache--mod--prefork--maxrequestworkers)
+* [`maxrequestsperchild`](#-apache--mod--prefork--maxrequestsperchild)
+* [`maxconnectionsperchild`](#-apache--mod--prefork--maxconnectionsperchild)
+* [`apache_version`](#-apache--mod--prefork--apache_version)
+* [`listenbacklog`](#-apache--mod--prefork--listenbacklog)
 
-##### <a name="startservers"></a>`startservers`
+##### <a name="-apache--mod--prefork--startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -5653,7 +5678,7 @@ Number of child server processes created at startup.
 
 Default value: `8`
 
-##### <a name="minspareservers"></a>`minspareservers`
+##### <a name="-apache--mod--prefork--minspareservers"></a>`minspareservers`
 
 Data type: `Integer`
 
@@ -5661,7 +5686,7 @@ Minimum number of idle child server processes.
 
 Default value: `5`
 
-##### <a name="maxspareservers"></a>`maxspareservers`
+##### <a name="-apache--mod--prefork--maxspareservers"></a>`maxspareservers`
 
 Data type: `Integer`
 
@@ -5669,7 +5694,7 @@ Maximum number of idle child server processes.
 
 Default value: `20`
 
-##### <a name="serverlimit"></a>`serverlimit`
+##### <a name="-apache--mod--prefork--serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -5677,7 +5702,7 @@ Upper limit on configurable number of processes.
 
 Default value: `256`
 
-##### <a name="maxclients"></a>`maxclients`
+##### <a name="-apache--mod--prefork--maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -5685,15 +5710,15 @@ Old alias for MaxRequestWorkers.
 
 Default value: `256`
 
-##### <a name="maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="-apache--mod--prefork--maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Optional[Integer]`
 
 Maximum number of connections that will be processed simultaneously.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--prefork--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -5701,23 +5726,23 @@ Old alias for MaxConnectionsPerChild.
 
 Default value: `4000`
 
-##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
+##### <a name="-apache--mod--prefork--maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Optional[Integer]`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--prefork--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="listenbacklog"></a>`listenbacklog`
+##### <a name="-apache--mod--prefork--listenbacklog"></a>`listenbacklog`
 
 Data type: `Integer`
 
@@ -5725,7 +5750,7 @@ Maximum length of the queue of pending connections.
 
 Default value: `511`
 
-### <a name="apachemodproxy"></a>`apache::mod::proxy`
+### <a name="apache--mod--proxy"></a>`apache::mod::proxy`
 
 Installs and configures `mod_proxy`.
 
@@ -5737,15 +5762,15 @@ Installs and configures `mod_proxy`.
 
 The following parameters are available in the `apache::mod::proxy` class:
 
-* [`proxy_requests`](#proxy_requests)
-* [`allow_from`](#allow_from)
-* [`apache_version`](#apache_version)
-* [`package_name`](#package_name)
-* [`proxy_via`](#proxy_via)
-* [`proxy_timeout`](#proxy_timeout)
-* [`proxy_iobuffersize`](#proxy_iobuffersize)
+* [`proxy_requests`](#-apache--mod--proxy--proxy_requests)
+* [`allow_from`](#-apache--mod--proxy--allow_from)
+* [`apache_version`](#-apache--mod--proxy--apache_version)
+* [`package_name`](#-apache--mod--proxy--package_name)
+* [`proxy_via`](#-apache--mod--proxy--proxy_via)
+* [`proxy_timeout`](#-apache--mod--proxy--proxy_timeout)
+* [`proxy_iobuffersize`](#-apache--mod--proxy--proxy_iobuffersize)
 
-##### <a name="proxy_requests"></a>`proxy_requests`
+##### <a name="-apache--mod--proxy--proxy_requests"></a>`proxy_requests`
 
 Data type: `String`
 
@@ -5753,31 +5778,31 @@ Enables forward (standard) proxy requests.
 
 Default value: `'Off'`
 
-##### <a name="allow_from"></a>`allow_from`
+##### <a name="-apache--mod--proxy--allow_from"></a>`allow_from`
 
 Data type: `Optional[String]`
 
 List of IPs allowed to access proxy.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--proxy--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--proxy--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of the proxy package to install.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_via"></a>`proxy_via`
+##### <a name="-apache--mod--proxy--proxy_via"></a>`proxy_via`
 
 Data type: `String`
 
@@ -5785,23 +5810,23 @@ Set local IP address for outgoing proxy connections.
 
 Default value: `'On'`
 
-##### <a name="proxy_timeout"></a>`proxy_timeout`
+##### <a name="-apache--mod--proxy--proxy_timeout"></a>`proxy_timeout`
 
 Data type: `Optional[Variant[Integer[0],String]]`
 
 Network timeout for proxied requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_iobuffersize"></a>`proxy_iobuffersize`
+##### <a name="-apache--mod--proxy--proxy_iobuffersize"></a>`proxy_iobuffersize`
 
 Data type: `Optional[String]`
 
 Set the size of internal data throughput buffer
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodproxy_ajp"></a>`apache::mod::proxy_ajp`
+### <a name="apache--mod--proxy_ajp"></a>`apache::mod::proxy_ajp`
 
 Installs `mod_proxy_ajp`.
 
@@ -5809,7 +5834,7 @@ Installs `mod_proxy_ajp`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html
     * for additional documentation.
 
-### <a name="apachemodproxy_balancer"></a>`apache::mod::proxy_balancer`
+### <a name="apache--mod--proxy_balancer"></a>`apache::mod::proxy_balancer`
 
 Installs and configures `mod_proxy_balancer`.
 
@@ -5821,20 +5846,20 @@ Installs and configures `mod_proxy_balancer`.
 
 The following parameters are available in the `apache::mod::proxy_balancer` class:
 
-* [`manager`](#manager)
-* [`manager_path`](#manager_path)
-* [`allow_from`](#allow_from)
-* [`apache_version`](#apache_version)
+* [`manager`](#-apache--mod--proxy_balancer--manager)
+* [`manager_path`](#-apache--mod--proxy_balancer--manager_path)
+* [`allow_from`](#-apache--mod--proxy_balancer--allow_from)
+* [`apache_version`](#-apache--mod--proxy_balancer--apache_version)
 
-##### <a name="manager"></a>`manager`
+##### <a name="-apache--mod--proxy_balancer--manager"></a>`manager`
 
 Data type: `Boolean`
 
 Toggle whether to enable balancer manager support.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="manager_path"></a>`manager_path`
+##### <a name="-apache--mod--proxy_balancer--manager_path"></a>`manager_path`
 
 Data type: `Stdlib::Unixpath`
 
@@ -5842,7 +5867,7 @@ Server relative path to balancer manager.
 
 Default value: `'/balancer-manager'`
 
-##### <a name="allow_from"></a>`allow_from`
+##### <a name="-apache--mod--proxy_balancer--allow_from"></a>`allow_from`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -5850,7 +5875,7 @@ List of IPs from which the balancer manager can be accessed.
 
 Default value: `['127.0.0.1', '::1']`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--proxy_balancer--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -5858,7 +5883,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodproxy_connect"></a>`apache::mod::proxy_connect`
+### <a name="apache--mod--proxy_connect"></a>`apache::mod::proxy_connect`
 
 Installs `mod_proxy_connect`.
 
@@ -5866,7 +5891,7 @@ Installs `mod_proxy_connect`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html
     * for additional documentation.
 
-### <a name="apachemodproxy_fcgi"></a>`apache::mod::proxy_fcgi`
+### <a name="apache--mod--proxy_fcgi"></a>`apache::mod::proxy_fcgi`
 
 Installs `mod_proxy_fcgi`.
 
@@ -5874,7 +5899,7 @@ Installs `mod_proxy_fcgi`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html
     * for additional documentation.
 
-### <a name="apachemodproxy_html"></a>`apache::mod::proxy_html`
+### <a name="apache--mod--proxy_html"></a>`apache::mod::proxy_html`
 
 Installs `mod_proxy_html`.
 
@@ -5882,7 +5907,7 @@ Installs `mod_proxy_html`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_html.html
     * for additional documentation.
 
-### <a name="apachemodproxy_http"></a>`apache::mod::proxy_http`
+### <a name="apache--mod--proxy_http"></a>`apache::mod::proxy_http`
 
 Installs `mod_proxy_http`.
 
@@ -5890,7 +5915,7 @@ Installs `mod_proxy_http`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_http.html
     * for additional documentation.
 
-### <a name="apachemodproxy_wstunnel"></a>`apache::mod::proxy_wstunnel`
+### <a name="apache--mod--proxy_wstunnel"></a>`apache::mod::proxy_wstunnel`
 
 Installs `mod_proxy_wstunnel`.
 
@@ -5898,7 +5923,7 @@ Installs `mod_proxy_wstunnel`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html
     * for additional documentation.
 
-### <a name="apachemodpython"></a>`apache::mod::python`
+### <a name="apache--mod--python"></a>`apache::mod::python`
 
 Installs and configures `mod_python`.
 
@@ -5910,17 +5935,17 @@ Installs and configures `mod_python`.
 
 The following parameters are available in the `apache::mod::python` class:
 
-* [`loadfile_name`](#loadfile_name)
+* [`loadfile_name`](#-apache--mod--python--loadfile_name)
 
-##### <a name="loadfile_name"></a>`loadfile_name`
+##### <a name="-apache--mod--python--loadfile_name"></a>`loadfile_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the configuration file that is used to load the python module.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodremoteip"></a>`apache::mod::remoteip`
+### <a name="apache--mod--remoteip"></a>`apache::mod::remoteip`
 
 Installs and configures `mod_remoteip`.
 
@@ -5933,19 +5958,19 @@ Installs and configures `mod_remoteip`.
 
 The following parameters are available in the `apache::mod::remoteip` class:
 
-* [`header`](#header)
-* [`internal_proxy`](#internal_proxy)
-* [`proxy_ips`](#proxy_ips)
-* [`internal_proxy_list`](#internal_proxy_list)
-* [`proxies_header`](#proxies_header)
-* [`proxy_protocol`](#proxy_protocol)
-* [`proxy_protocol_exceptions`](#proxy_protocol_exceptions)
-* [`trusted_proxy`](#trusted_proxy)
-* [`trusted_proxy_ips`](#trusted_proxy_ips)
-* [`trusted_proxy_list`](#trusted_proxy_list)
-* [`apache_version`](#apache_version)
+* [`header`](#-apache--mod--remoteip--header)
+* [`internal_proxy`](#-apache--mod--remoteip--internal_proxy)
+* [`proxy_ips`](#-apache--mod--remoteip--proxy_ips)
+* [`internal_proxy_list`](#-apache--mod--remoteip--internal_proxy_list)
+* [`proxies_header`](#-apache--mod--remoteip--proxies_header)
+* [`proxy_protocol`](#-apache--mod--remoteip--proxy_protocol)
+* [`proxy_protocol_exceptions`](#-apache--mod--remoteip--proxy_protocol_exceptions)
+* [`trusted_proxy`](#-apache--mod--remoteip--trusted_proxy)
+* [`trusted_proxy_ips`](#-apache--mod--remoteip--trusted_proxy_ips)
+* [`trusted_proxy_list`](#-apache--mod--remoteip--trusted_proxy_list)
+* [`apache_version`](#-apache--mod--remoteip--apache_version)
 
-##### <a name="header"></a>`header`
+##### <a name="-apache--mod--remoteip--header"></a>`header`
 
 Data type: `String`
 
@@ -5953,7 +5978,7 @@ The header field in which `mod_remoteip` will look for the useragent IP.
 
 Default value: `'X-Forwarded-For'`
 
-##### <a name="internal_proxy"></a>`internal_proxy`
+##### <a name="-apache--mod--remoteip--internal_proxy"></a>`internal_proxy`
 
 Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
@@ -5962,17 +5987,17 @@ valid value inside specified header. Unlike the `$trusted_proxy_ips`
 parameter, any IP address (including private addresses) presented by these
 proxies will trusted by `mod_remoteip`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_ips"></a>`proxy_ips`
+##### <a name="-apache--mod--remoteip--proxy_ips"></a>`proxy_ips`
 
 Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
 *Deprecated*: use `$internal_proxy` instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="internal_proxy_list"></a>`internal_proxy_list`
+##### <a name="-apache--mod--remoteip--internal_proxy_list"></a>`internal_proxy_list`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -5980,9 +6005,9 @@ The path to a file containing a list of IP addresses, IP blocks or hostname
 that are trusted to set a valid value inside the specified header. See
 `$internal_proxy` for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxies_header"></a>`proxies_header`
+##### <a name="-apache--mod--remoteip--proxies_header"></a>`proxies_header`
 
 Data type: `Optional[String]`
 
@@ -5990,27 +6015,27 @@ A header into which `mod_remoteip` will collect a list of all of the
 intermediate client IP addresses trusted to resolve the useragent IP of the
 request (e.g. `X-Forwarded-By`).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_protocol"></a>`proxy_protocol`
+##### <a name="-apache--mod--remoteip--proxy_protocol"></a>`proxy_protocol`
 
 Data type: `Boolean`
 
 Wether or not to enable the PROXY protocol header handling. If enabled
 upstream clients must set the header every time they open a connection.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
+##### <a name="-apache--mod--remoteip--proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
 
 Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
 
 A list of IP address or IP blocks that are not required to use the PROXY
 protocol.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="trusted_proxy"></a>`trusted_proxy`
+##### <a name="-apache--mod--remoteip--trusted_proxy"></a>`trusted_proxy`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
@@ -6019,17 +6044,17 @@ valid value inside the specified header. Unlike the `$proxy_ips` parameter,
 any private IP presented by these proxies will be disgarded by
 `mod_remoteip`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="trusted_proxy_ips"></a>`trusted_proxy_ips`
+##### <a name="-apache--mod--remoteip--trusted_proxy_ips"></a>`trusted_proxy_ips`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
 *Deprecated*: use `$trusted_proxy` instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="trusted_proxy_list"></a>`trusted_proxy_list`
+##### <a name="-apache--mod--remoteip--trusted_proxy_list"></a>`trusted_proxy_list`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -6037,18 +6062,18 @@ The path to a file containing a list of IP addresses, IP blocks or hostname
 that are trusted to set a valid value inside the specified header. See
 `$trusted_proxy` for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--remoteip--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 A version string used to validate that your apache version supports
 `mod_remoteip`. If not specified, `$::apache::apache_version` is used.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodreqtimeout"></a>`apache::mod::reqtimeout`
+### <a name="apache--mod--reqtimeout"></a>`apache::mod::reqtimeout`
 
 Installs and configures `mod_reqtimeout`.
 
@@ -6060,9 +6085,9 @@ Installs and configures `mod_reqtimeout`.
 
 The following parameters are available in the `apache::mod::reqtimeout` class:
 
-* [`timeouts`](#timeouts)
+* [`timeouts`](#-apache--mod--reqtimeout--timeouts)
 
-##### <a name="timeouts"></a>`timeouts`
+##### <a name="-apache--mod--reqtimeout--timeouts"></a>`timeouts`
 
 Data type: `Variant[Array[String], String]`
 
@@ -6070,7 +6095,7 @@ List of timeouts and data rates for receiving requests.
 
 Default value: `['header=20-40,minrate=500', 'body=10,minrate=500']`
 
-### <a name="apachemodrewrite"></a>`apache::mod::rewrite`
+### <a name="apache--mod--rewrite"></a>`apache::mod::rewrite`
 
 Installs `mod_rewrite`.
 
@@ -6078,7 +6103,7 @@ Installs `mod_rewrite`.
   * https://httpd.apache.org/docs/current/mod/mod_rewrite.html
     * for additional documentation.
 
-### <a name="apachemodrpaf"></a>`apache::mod::rpaf`
+### <a name="apache--mod--rpaf"></a>`apache::mod::rpaf`
 
 Installs and configures `mod_rpaf`.
 
@@ -6090,20 +6115,20 @@ Installs and configures `mod_rpaf`.
 
 The following parameters are available in the `apache::mod::rpaf` class:
 
-* [`sethostname`](#sethostname)
-* [`proxy_ips`](#proxy_ips)
-* [`header`](#header)
-* [`template`](#template)
+* [`sethostname`](#-apache--mod--rpaf--sethostname)
+* [`proxy_ips`](#-apache--mod--rpaf--proxy_ips)
+* [`header`](#-apache--mod--rpaf--header)
+* [`template`](#-apache--mod--rpaf--template)
 
-##### <a name="sethostname"></a>`sethostname`
+##### <a name="-apache--mod--rpaf--sethostname"></a>`sethostname`
 
 Data type: `Variant[Boolean, String]`
 
 Toggles whether to update vhost name so ServerName and ServerAlias work.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="proxy_ips"></a>`proxy_ips`
+##### <a name="-apache--mod--rpaf--proxy_ips"></a>`proxy_ips`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -6111,7 +6136,7 @@ List of IPs & bitmasked subnets to adjust requests for
 
 Default value: `['127.0.0.1']`
 
-##### <a name="header"></a>`header`
+##### <a name="-apache--mod--rpaf--header"></a>`header`
 
 Data type: `String`
 
@@ -6119,7 +6144,7 @@ Header to use for the real IP address.
 
 Default value: `'X-Forwarded-For'`
 
-##### <a name="template"></a>`template`
+##### <a name="-apache--mod--rpaf--template"></a>`template`
 
 Data type: `String`
 
@@ -6127,7 +6152,7 @@ Path to template to use for configuring mod_rpaf.
 
 Default value: `'apache/mod/rpaf.conf.erb'`
 
-### <a name="apachemodsecurity"></a>`apache::mod::security`
+### <a name="apache--mod--security"></a>`apache::mod::security`
 
 Installs and configures `mod_security`.
 
@@ -6141,46 +6166,46 @@ Installs and configures `mod_security`.
 
 The following parameters are available in the `apache::mod::security` class:
 
-* [`version`](#version)
-* [`logroot`](#logroot)
-* [`crs_package`](#crs_package)
-* [`activated_rules`](#activated_rules)
-* [`custom_rules`](#custom_rules)
-* [`custom_rules_set`](#custom_rules_set)
-* [`modsec_dir`](#modsec_dir)
-* [`modsec_secruleengine`](#modsec_secruleengine)
-* [`audit_log_relevant_status`](#audit_log_relevant_status)
-* [`audit_log_parts`](#audit_log_parts)
-* [`audit_log_type`](#audit_log_type)
-* [`audit_log_storage_dir`](#audit_log_storage_dir)
-* [`secpcrematchlimit`](#secpcrematchlimit)
-* [`secpcrematchlimitrecursion`](#secpcrematchlimitrecursion)
-* [`allowed_methods`](#allowed_methods)
-* [`content_types`](#content_types)
-* [`restricted_extensions`](#restricted_extensions)
-* [`restricted_headers`](#restricted_headers)
-* [`secdefaultaction`](#secdefaultaction)
-* [`inbound_anomaly_threshold`](#inbound_anomaly_threshold)
-* [`outbound_anomaly_threshold`](#outbound_anomaly_threshold)
-* [`critical_anomaly_score`](#critical_anomaly_score)
-* [`error_anomaly_score`](#error_anomaly_score)
-* [`warning_anomaly_score`](#warning_anomaly_score)
-* [`notice_anomaly_score`](#notice_anomaly_score)
-* [`paranoia_level`](#paranoia_level)
-* [`executing_paranoia_level`](#executing_paranoia_level)
-* [`secrequestmaxnumargs`](#secrequestmaxnumargs)
-* [`secrequestbodylimit`](#secrequestbodylimit)
-* [`secrequestbodynofileslimit`](#secrequestbodynofileslimit)
-* [`secrequestbodyinmemorylimit`](#secrequestbodyinmemorylimit)
-* [`secrequestbodyaccess`](#secrequestbodyaccess)
-* [`secresponsebodyaccess`](#secresponsebodyaccess)
-* [`manage_security_crs`](#manage_security_crs)
-* [`enable_dos_protection`](#enable_dos_protection)
-* [`dos_burst_time_slice`](#dos_burst_time_slice)
-* [`dos_counter_threshold`](#dos_counter_threshold)
-* [`dos_block_timeout`](#dos_block_timeout)
-
-##### <a name="version"></a>`version`
+* [`version`](#-apache--mod--security--version)
+* [`logroot`](#-apache--mod--security--logroot)
+* [`crs_package`](#-apache--mod--security--crs_package)
+* [`activated_rules`](#-apache--mod--security--activated_rules)
+* [`custom_rules`](#-apache--mod--security--custom_rules)
+* [`custom_rules_set`](#-apache--mod--security--custom_rules_set)
+* [`modsec_dir`](#-apache--mod--security--modsec_dir)
+* [`modsec_secruleengine`](#-apache--mod--security--modsec_secruleengine)
+* [`audit_log_relevant_status`](#-apache--mod--security--audit_log_relevant_status)
+* [`audit_log_parts`](#-apache--mod--security--audit_log_parts)
+* [`audit_log_type`](#-apache--mod--security--audit_log_type)
+* [`audit_log_storage_dir`](#-apache--mod--security--audit_log_storage_dir)
+* [`secpcrematchlimit`](#-apache--mod--security--secpcrematchlimit)
+* [`secpcrematchlimitrecursion`](#-apache--mod--security--secpcrematchlimitrecursion)
+* [`allowed_methods`](#-apache--mod--security--allowed_methods)
+* [`content_types`](#-apache--mod--security--content_types)
+* [`restricted_extensions`](#-apache--mod--security--restricted_extensions)
+* [`restricted_headers`](#-apache--mod--security--restricted_headers)
+* [`secdefaultaction`](#-apache--mod--security--secdefaultaction)
+* [`inbound_anomaly_threshold`](#-apache--mod--security--inbound_anomaly_threshold)
+* [`outbound_anomaly_threshold`](#-apache--mod--security--outbound_anomaly_threshold)
+* [`critical_anomaly_score`](#-apache--mod--security--critical_anomaly_score)
+* [`error_anomaly_score`](#-apache--mod--security--error_anomaly_score)
+* [`warning_anomaly_score`](#-apache--mod--security--warning_anomaly_score)
+* [`notice_anomaly_score`](#-apache--mod--security--notice_anomaly_score)
+* [`paranoia_level`](#-apache--mod--security--paranoia_level)
+* [`executing_paranoia_level`](#-apache--mod--security--executing_paranoia_level)
+* [`secrequestmaxnumargs`](#-apache--mod--security--secrequestmaxnumargs)
+* [`secrequestbodylimit`](#-apache--mod--security--secrequestbodylimit)
+* [`secrequestbodynofileslimit`](#-apache--mod--security--secrequestbodynofileslimit)
+* [`secrequestbodyinmemorylimit`](#-apache--mod--security--secrequestbodyinmemorylimit)
+* [`secrequestbodyaccess`](#-apache--mod--security--secrequestbodyaccess)
+* [`secresponsebodyaccess`](#-apache--mod--security--secresponsebodyaccess)
+* [`manage_security_crs`](#-apache--mod--security--manage_security_crs)
+* [`enable_dos_protection`](#-apache--mod--security--enable_dos_protection)
+* [`dos_burst_time_slice`](#-apache--mod--security--dos_burst_time_slice)
+* [`dos_counter_threshold`](#-apache--mod--security--dos_counter_threshold)
+* [`dos_block_timeout`](#-apache--mod--security--dos_block_timeout)
+
+##### <a name="-apache--mod--security--version"></a>`version`
 
 Data type: `Integer`
 
@@ -6188,7 +6213,7 @@ Manage mod_security or mod_security2
 
 Default value: `$apache::params::modsec_version`
 
-##### <a name="logroot"></a>`logroot`
+##### <a name="-apache--mod--security--logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -6196,7 +6221,7 @@ Configures the location of audit and debug logs.
 
 Default value: `$apache::params::logroot`
 
-##### <a name="crs_package"></a>`crs_package`
+##### <a name="-apache--mod--security--crs_package"></a>`crs_package`
 
 Data type: `Optional[String]`
 
@@ -6204,7 +6229,7 @@ Name of package that installs CRS rules.
 
 Default value: `$apache::params::modsec_crs_package`
 
-##### <a name="activated_rules"></a>`activated_rules`
+##### <a name="-apache--mod--security--activated_rules"></a>`activated_rules`
 
 Data type: `Array[String]`
 
@@ -6212,7 +6237,7 @@ An array of rules from the modsec_crs_path or absolute to activate via symlinks.
 
 Default value: `$apache::params::modsec_default_rules`
 
-##### <a name="custom_rules"></a>`custom_rules`
+##### <a name="-apache--mod--security--custom_rules"></a>`custom_rules`
 
 Data type: `Boolean`
 
@@ -6220,7 +6245,7 @@ Data type: `Boolean`
 
 Default value: `$apache::params::modsec_custom_rules`
 
-##### <a name="custom_rules_set"></a>`custom_rules_set`
+##### <a name="-apache--mod--security--custom_rules_set"></a>`custom_rules_set`
 
 Data type: `Optional[Array[String]]`
 
@@ -6228,7 +6253,7 @@ Data type: `Optional[Array[String]]`
 
 Default value: `$apache::params::modsec_custom_rules_set`
 
-##### <a name="modsec_dir"></a>`modsec_dir`
+##### <a name="-apache--mod--security--modsec_dir"></a>`modsec_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -6236,7 +6261,7 @@ Defines the path where Puppet installs the modsec configuration and activated ru
 
 Default value: `$apache::params::modsec_dir`
 
-##### <a name="modsec_secruleengine"></a>`modsec_secruleengine`
+##### <a name="-apache--mod--security--modsec_secruleengine"></a>`modsec_secruleengine`
 
 Data type: `String`
 
@@ -6244,7 +6269,7 @@ Configures the rules engine.
 
 Default value: `$apache::params::modsec_secruleengine`
 
-##### <a name="audit_log_relevant_status"></a>`audit_log_relevant_status`
+##### <a name="-apache--mod--security--audit_log_relevant_status"></a>`audit_log_relevant_status`
 
 Data type: `String`
 
@@ -6252,7 +6277,7 @@ Configures which response status code is to be considered relevant for the purpo
 
 Default value: `'^(?:5|4(?!04))'`
 
-##### <a name="audit_log_parts"></a>`audit_log_parts`
+##### <a name="-apache--mod--security--audit_log_parts"></a>`audit_log_parts`
 
 Data type: `String`
 
@@ -6261,7 +6286,7 @@ letter appears in the list then the equivalent part will be recorded.
 
 Default value: `$apache::params::modsec_audit_log_parts`
 
-##### <a name="audit_log_type"></a>`audit_log_type`
+##### <a name="-apache--mod--security--audit_log_type"></a>`audit_log_type`
 
 Data type: `String`
 
@@ -6269,15 +6294,15 @@ Defines the type of audit logging mechanism to be used.
 
 Default value: `$apache::params::modsec_audit_log_type`
 
-##### <a name="audit_log_storage_dir"></a>`audit_log_storage_dir`
+##### <a name="-apache--mod--security--audit_log_storage_dir"></a>`audit_log_storage_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="secpcrematchlimit"></a>`secpcrematchlimit`
+##### <a name="-apache--mod--security--secpcrematchlimit"></a>`secpcrematchlimit`
 
 Data type: `Integer`
 
@@ -6285,7 +6310,7 @@ Sets the match limit in the PCRE library.
 
 Default value: `$apache::params::secpcrematchlimit`
 
-##### <a name="secpcrematchlimitrecursion"></a>`secpcrematchlimitrecursion`
+##### <a name="-apache--mod--security--secpcrematchlimitrecursion"></a>`secpcrematchlimitrecursion`
 
 Data type: `Integer`
 
@@ -6293,7 +6318,7 @@ Sets the match limit recursion in the PCRE library.
 
 Default value: `$apache::params::secpcrematchlimitrecursion`
 
-##### <a name="allowed_methods"></a>`allowed_methods`
+##### <a name="-apache--mod--security--allowed_methods"></a>`allowed_methods`
 
 Data type: `String`
 
@@ -6301,7 +6326,7 @@ A space-separated list of allowed HTTP methods.
 
 Default value: `'GET HEAD POST OPTIONS'`
 
-##### <a name="content_types"></a>`content_types`
+##### <a name="-apache--mod--security--content_types"></a>`content_types`
 
 Data type: `String`
 
@@ -6309,7 +6334,7 @@ A list of one or more allowed MIME types.
 
 Default value: `'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'`
 
-##### <a name="restricted_extensions"></a>`restricted_extensions`
+##### <a name="-apache--mod--security--restricted_extensions"></a>`restricted_extensions`
 
 Data type: `String`
 
@@ -6317,7 +6342,7 @@ A space-sparated list of prohibited file extensions.
 
 Default value: `'.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'`
 
-##### <a name="restricted_headers"></a>`restricted_headers`
+##### <a name="-apache--mod--security--restricted_headers"></a>`restricted_headers`
 
 Data type: `String`
 
@@ -6325,7 +6350,7 @@ A list of restricted headers separated by slashes and spaces.
 
 Default value: `'/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'`
 
-##### <a name="secdefaultaction"></a>`secdefaultaction`
+##### <a name="-apache--mod--security--secdefaultaction"></a>`secdefaultaction`
 
 Data type: `String`
 
@@ -6333,7 +6358,7 @@ Defines the default list of actions, which will be inherited by the rules in the
 
 Default value: `'deny'`
 
-##### <a name="inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
+##### <a name="-apache--mod--security--inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
 
 Data type: `Integer`
 
@@ -6341,7 +6366,7 @@ Sets the scoring threshold level of the inbound blocking rules for the Collabora
 
 Default value: `5`
 
-##### <a name="outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
+##### <a name="-apache--mod--security--outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
 
 Data type: `Integer`
 
@@ -6349,7 +6374,7 @@ Sets the scoring threshold level of the outbound blocking rules for the Collabor
 
 Default value: `4`
 
-##### <a name="critical_anomaly_score"></a>`critical_anomaly_score`
+##### <a name="-apache--mod--security--critical_anomaly_score"></a>`critical_anomaly_score`
 
 Data type: `Integer`
 
@@ -6357,7 +6382,7 @@ Sets the Anomaly Score for rules assigned with a critical severity.
 
 Default value: `5`
 
-##### <a name="error_anomaly_score"></a>`error_anomaly_score`
+##### <a name="-apache--mod--security--error_anomaly_score"></a>`error_anomaly_score`
 
 Data type: `Integer`
 
@@ -6365,7 +6390,7 @@ Sets the Anomaly Score for rules assigned with a error severity.
 
 Default value: `4`
 
-##### <a name="warning_anomaly_score"></a>`warning_anomaly_score`
+##### <a name="-apache--mod--security--warning_anomaly_score"></a>`warning_anomaly_score`
 
 Data type: `Integer`
 
@@ -6373,7 +6398,7 @@ Sets the Anomaly Score for rules assigned with a warning severity.
 
 Default value: `3`
 
-##### <a name="notice_anomaly_score"></a>`notice_anomaly_score`
+##### <a name="-apache--mod--security--notice_anomaly_score"></a>`notice_anomaly_score`
 
 Data type: `Integer`
 
@@ -6381,7 +6406,7 @@ Sets the Anomaly Score for rules assigned with a notice severity.
 
 Default value: `2`
 
-##### <a name="paranoia_level"></a>`paranoia_level`
+##### <a name="-apache--mod--security--paranoia_level"></a>`paranoia_level`
 
 Data type: `Integer[1,4]`
 
@@ -6389,7 +6414,7 @@ Sets the paranoia level in the OWASP ModSecurity Core Rule Set.
 
 Default value: `1`
 
-##### <a name="executing_paranoia_level"></a>`executing_paranoia_level`
+##### <a name="-apache--mod--security--executing_paranoia_level"></a>`executing_paranoia_level`
 
 Data type: `Integer[1,4]`
 
@@ -6398,7 +6423,7 @@ The default is equal to, and cannot be lower than, $paranoia_level.
 
 Default value: `$paranoia_level`
 
-##### <a name="secrequestmaxnumargs"></a>`secrequestmaxnumargs`
+##### <a name="-apache--mod--security--secrequestmaxnumargs"></a>`secrequestmaxnumargs`
 
 Data type: `Integer`
 
@@ -6406,7 +6431,7 @@ Sets the maximum number of arguments in the request.
 
 Default value: `255`
 
-##### <a name="secrequestbodylimit"></a>`secrequestbodylimit`
+##### <a name="-apache--mod--security--secrequestbodylimit"></a>`secrequestbodylimit`
 
 Data type: `Integer`
 
@@ -6414,7 +6439,7 @@ Sets the maximum request body size ModSecurity will accept for buffering.
 
 Default value: `13107200`
 
-##### <a name="secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
+##### <a name="-apache--mod--security--secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
 
 Data type: `Integer`
 
@@ -6423,7 +6448,7 @@ in the request.
 
 Default value: `131072`
 
-##### <a name="secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
+##### <a name="-apache--mod--security--secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
 
 Data type: `Integer`
 
@@ -6431,7 +6456,7 @@ Configures the maximum request body size that ModSecurity will store in memory.
 
 Default value: `131072`
 
-##### <a name="secrequestbodyaccess"></a>`secrequestbodyaccess`
+##### <a name="-apache--mod--security--secrequestbodyaccess"></a>`secrequestbodyaccess`
 
 Data type: `Enum['On', 'Off']`
 
@@ -6439,7 +6464,7 @@ Toggle SecRequestBodyAccess On or Off
 
 Default value: `'On'`
 
-##### <a name="secresponsebodyaccess"></a>`secresponsebodyaccess`
+##### <a name="-apache--mod--security--secresponsebodyaccess"></a>`secresponsebodyaccess`
 
 Data type: `Enum['On', 'Off']`
 
@@ -6447,24 +6472,24 @@ Toggle SecResponseBodyAccess On or Off
 
 Default value: `'Off'`
 
-##### <a name="manage_security_crs"></a>`manage_security_crs`
+##### <a name="-apache--mod--security--manage_security_crs"></a>`manage_security_crs`
 
 Data type: `Boolean`
 
 Toggles whether to manage ModSecurity Core Rule Set
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="enable_dos_protection"></a>`enable_dos_protection`
+##### <a name="-apache--mod--security--enable_dos_protection"></a>`enable_dos_protection`
 
 Data type: `Boolean`
 
 Toggles the optional OWASP ModSecurity Core Rule Set DOS protection rule
 (rule id 900700)
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="dos_burst_time_slice"></a>`dos_burst_time_slice`
+##### <a name="-apache--mod--security--dos_burst_time_slice"></a>`dos_burst_time_slice`
 
 Data type: `Integer[1, default]`
 
@@ -6473,7 +6498,7 @@ Configures time in which a burst is measured for the OWASP ModSecurity Core Rule
 
 Default value: `60`
 
-##### <a name="dos_counter_threshold"></a>`dos_counter_threshold`
+##### <a name="-apache--mod--security--dos_counter_threshold"></a>`dos_counter_threshold`
 
 Data type: `Integer[1, default]`
 
@@ -6482,7 +6507,7 @@ the OWASP ModSecurity Core Rule Set DOS protection rule (rule id 900700)
 
 Default value: `100`
 
-##### <a name="dos_block_timeout"></a>`dos_block_timeout`
+##### <a name="-apache--mod--security--dos_block_timeout"></a>`dos_block_timeout`
 
 Data type: `Integer[1, default]`
 
@@ -6491,7 +6516,7 @@ ModSecurity Core Rule Set DOS protection rule (rule id 900700)
 
 Default value: `600`
 
-### <a name="apachemodsetenvif"></a>`apache::mod::setenvif`
+### <a name="apache--mod--setenvif"></a>`apache::mod::setenvif`
 
 Installs `mod_setenvif`.
 
@@ -6499,7 +6524,7 @@ Installs `mod_setenvif`.
   * https://httpd.apache.org/docs/current/mod/mod_setenvif.html
     * for additional documentation.
 
-### <a name="apachemodshib"></a>`apache::mod::shib`
+### <a name="apache--mod--shib"></a>`apache::mod::shib`
 
 This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
 can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
@@ -6515,45 +6540,45 @@ See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/
 
 The following parameters are available in the `apache::mod::shib` class:
 
-* [`suppress_warning`](#suppress_warning)
-* [`mod_full_path`](#mod_full_path)
-* [`package_name`](#package_name)
-* [`mod_lib`](#mod_lib)
+* [`suppress_warning`](#-apache--mod--shib--suppress_warning)
+* [`mod_full_path`](#-apache--mod--shib--mod_full_path)
+* [`package_name`](#-apache--mod--shib--package_name)
+* [`mod_lib`](#-apache--mod--shib--mod_lib)
 
-##### <a name="suppress_warning"></a>`suppress_warning`
+##### <a name="-apache--mod--shib--suppress_warning"></a>`suppress_warning`
 
 Data type: `Boolean`
 
 Toggles whether to trigger warning on RedHat nodes.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="mod_full_path"></a>`mod_full_path`
+##### <a name="-apache--mod--shib--mod_full_path"></a>`mod_full_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--shib--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of the Shibboleth package to be installed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_lib"></a>`mod_lib`
+##### <a name="-apache--mod--shib--mod_lib"></a>`mod_lib`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
 overrides this value.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodsocache_shmcb"></a>`apache::mod::socache_shmcb`
+### <a name="apache--mod--socache_shmcb"></a>`apache::mod::socache_shmcb`
 
 Installs `mod_socache_shmcb`.
 
@@ -6561,7 +6586,7 @@ Installs `mod_socache_shmcb`.
   * https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html
     * for additional documentation.
 
-### <a name="apachemodspeling"></a>`apache::mod::speling`
+### <a name="apache--mod--speling"></a>`apache::mod::speling`
 
 Installs `mod_spelling`.
 
@@ -6569,7 +6594,7 @@ Installs `mod_spelling`.
   * https://httpd.apache.org/docs/current/mod/mod_speling.html
     * for additional documentation.
 
-### <a name="apachemodssl"></a>`apache::mod::ssl`
+### <a name="apache--mod--ssl"></a>`apache::mod::ssl`
 
 On most operating systems, the ssl.conf is placed in the module configuration directory. On Red Hat based operating systems, this
 file is placed in /etc/httpd/conf.d, the same location in which the RPM stores the configuration.
@@ -6585,48 +6610,48 @@ apache::vhost to true.
 
 The following parameters are available in the `apache::mod::ssl` class:
 
-* [`ssl_compression`](#ssl_compression)
-* [`ssl_sessiontickets`](#ssl_sessiontickets)
-* [`ssl_cryptodevice`](#ssl_cryptodevice)
-* [`ssl_options`](#ssl_options)
-* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
-* [`ssl_cert`](#ssl_cert)
-* [`ssl_key`](#ssl_key)
-* [`ssl_ca`](#ssl_ca)
-* [`ssl_cipher`](#ssl_cipher)
-* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
-* [`ssl_protocol`](#ssl_protocol)
-* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
-* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
-* [`ssl_pass_phrase_dialog`](#ssl_pass_phrase_dialog)
-* [`ssl_random_seed_bytes`](#ssl_random_seed_bytes)
-* [`ssl_sessioncache`](#ssl_sessioncache)
-* [`ssl_sessioncachetimeout`](#ssl_sessioncachetimeout)
-* [`ssl_stapling`](#ssl_stapling)
-* [`stapling_cache`](#stapling_cache)
-* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
-* [`ssl_mutex`](#ssl_mutex)
-* [`ssl_reload_on_change`](#ssl_reload_on_change)
-* [`apache_version`](#apache_version)
-* [`package_name`](#package_name)
-
-##### <a name="ssl_compression"></a>`ssl_compression`
+* [`ssl_compression`](#-apache--mod--ssl--ssl_compression)
+* [`ssl_sessiontickets`](#-apache--mod--ssl--ssl_sessiontickets)
+* [`ssl_cryptodevice`](#-apache--mod--ssl--ssl_cryptodevice)
+* [`ssl_options`](#-apache--mod--ssl--ssl_options)
+* [`ssl_openssl_conf_cmd`](#-apache--mod--ssl--ssl_openssl_conf_cmd)
+* [`ssl_cert`](#-apache--mod--ssl--ssl_cert)
+* [`ssl_key`](#-apache--mod--ssl--ssl_key)
+* [`ssl_ca`](#-apache--mod--ssl--ssl_ca)
+* [`ssl_cipher`](#-apache--mod--ssl--ssl_cipher)
+* [`ssl_honorcipherorder`](#-apache--mod--ssl--ssl_honorcipherorder)
+* [`ssl_protocol`](#-apache--mod--ssl--ssl_protocol)
+* [`ssl_proxy_protocol`](#-apache--mod--ssl--ssl_proxy_protocol)
+* [`ssl_proxy_cipher_suite`](#-apache--mod--ssl--ssl_proxy_cipher_suite)
+* [`ssl_pass_phrase_dialog`](#-apache--mod--ssl--ssl_pass_phrase_dialog)
+* [`ssl_random_seed_bytes`](#-apache--mod--ssl--ssl_random_seed_bytes)
+* [`ssl_sessioncache`](#-apache--mod--ssl--ssl_sessioncache)
+* [`ssl_sessioncachetimeout`](#-apache--mod--ssl--ssl_sessioncachetimeout)
+* [`ssl_stapling`](#-apache--mod--ssl--ssl_stapling)
+* [`stapling_cache`](#-apache--mod--ssl--stapling_cache)
+* [`ssl_stapling_return_errors`](#-apache--mod--ssl--ssl_stapling_return_errors)
+* [`ssl_mutex`](#-apache--mod--ssl--ssl_mutex)
+* [`ssl_reload_on_change`](#-apache--mod--ssl--ssl_reload_on_change)
+* [`apache_version`](#-apache--mod--ssl--apache_version)
+* [`package_name`](#-apache--mod--ssl--package_name)
+
+##### <a name="-apache--mod--ssl--ssl_compression"></a>`ssl_compression`
 
 Data type: `Boolean`
 
 Enable compression on the SSL level.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="ssl_sessiontickets"></a>`ssl_sessiontickets`
+##### <a name="-apache--mod--ssl--ssl_sessiontickets"></a>`ssl_sessiontickets`
 
 Data type: `Optional[Boolean]`
 
 Enable or disable use of TLS session tickets
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_cryptodevice"></a>`ssl_cryptodevice`
+##### <a name="-apache--mod--ssl--ssl_cryptodevice"></a>`ssl_cryptodevice`
 
 Data type: `String`
 
@@ -6634,7 +6659,7 @@ Enable use of a cryptographic hardware accelerator.
 
 Default value: `'builtin'`
 
-##### <a name="ssl_options"></a>`ssl_options`
+##### <a name="-apache--mod--ssl--ssl_options"></a>`ssl_options`
 
 Data type: `Array[String]`
 
@@ -6642,39 +6667,39 @@ Configure various SSL engine run-time options.
 
 Default value: `['StdEnvVars']`
 
-##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
+##### <a name="-apache--mod--ssl--ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Optional[String]`
 
 Configure OpenSSL parameters through its SSL_CONF API.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_cert"></a>`ssl_cert`
+##### <a name="-apache--mod--ssl--ssl_cert"></a>`ssl_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path to server PEM-encoded X.509 certificate data file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_key"></a>`ssl_key`
+##### <a name="-apache--mod--ssl--ssl_key"></a>`ssl_key`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path to server PEM-encoded private key file
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_ca"></a>`ssl_ca`
+##### <a name="-apache--mod--ssl--ssl_ca"></a>`ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 File of concatenated PEM-encoded CA Certificates for Client Auth.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_cipher"></a>`ssl_cipher`
+##### <a name="-apache--mod--ssl--ssl_cipher"></a>`ssl_cipher`
 
 Data type: `String`
 
@@ -6682,15 +6707,15 @@ Cipher Suite available for negotiation in SSL handshake.
 
 Default value: `$apache::params::ssl_cipher`
 
-##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
+##### <a name="-apache--mod--ssl--ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
 Data type: `Variant[Boolean, Enum['on', 'off']]`
 
 Option to prefer the server's cipher preference order.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="ssl_protocol"></a>`ssl_protocol`
+##### <a name="-apache--mod--ssl--ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Array[String]`
 
@@ -6701,7 +6726,7 @@ Default based on the OS:
 
 Default value: `$apache::params::ssl_protocol`
 
-##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
+##### <a name="-apache--mod--ssl--ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Array`
 
@@ -6709,7 +6734,7 @@ Configure usable SSL protocol flavors for proxy usage.
 
 Default value: `[]`
 
-##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
+##### <a name="-apache--mod--ssl--ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
 Data type: `Optional[String[1]]`
 
@@ -6717,7 +6742,7 @@ Configure usable SSL ciphers for proxy usage. Equivalent to ssl_cipher but for p
 
 Default value: `$apache::params::ssl_proxy_cipher_suite`
 
-##### <a name="ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
+##### <a name="-apache--mod--ssl--ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
 
 Data type: `String`
 
@@ -6725,7 +6750,7 @@ Type of pass phrase dialog for encrypted private keys.
 
 Default value: `'builtin'`
 
-##### <a name="ssl_random_seed_bytes"></a>`ssl_random_seed_bytes`
+##### <a name="-apache--mod--ssl--ssl_random_seed_bytes"></a>`ssl_random_seed_bytes`
 
 Data type: `Integer`
 
@@ -6733,7 +6758,7 @@ Pseudo Random Number Generator (PRNG) seeding source.
 
 Default value: `512`
 
-##### <a name="ssl_sessioncache"></a>`ssl_sessioncache`
+##### <a name="-apache--mod--ssl--ssl_sessioncache"></a>`ssl_sessioncache`
 
 Data type: `String`
 
@@ -6741,7 +6766,7 @@ Configures the storage type of the global/inter-process SSL Session Cache
 
 Default value: `$apache::params::ssl_sessioncache`
 
-##### <a name="ssl_sessioncachetimeout"></a>`ssl_sessioncachetimeout`
+##### <a name="-apache--mod--ssl--ssl_sessioncachetimeout"></a>`ssl_sessioncachetimeout`
 
 Data type: `Integer`
 
@@ -6749,32 +6774,32 @@ Number of seconds before an SSL session expires in the Session Cache.
 
 Default value: `300`
 
-##### <a name="ssl_stapling"></a>`ssl_stapling`
+##### <a name="-apache--mod--ssl--ssl_stapling"></a>`ssl_stapling`
 
 Data type: `Boolean`
 
 Enable stapling of OCSP responses in the TLS handshake.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="stapling_cache"></a>`stapling_cache`
+##### <a name="-apache--mod--ssl--stapling_cache"></a>`stapling_cache`
 
 Data type: `Optional[String]`
 
 Configures the cache used to store OCSP responses which get included in
 the TLS handshake if SSLUseStapling is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
+##### <a name="-apache--mod--ssl--ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Optional[Boolean]`
 
 Pass stapling related OCSP errors on to client.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_mutex"></a>`ssl_mutex`
+##### <a name="-apache--mod--ssl--ssl_mutex"></a>`ssl_mutex`
 
 Data type: `Optional[String]`
 
@@ -6784,33 +6809,33 @@ Default based on the OS and/or Apache version:
 - Debian/Ubuntu + Apache >= 2.4: 'default'.
 - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_reload_on_change"></a>`ssl_reload_on_change`
+##### <a name="-apache--mod--ssl--ssl_reload_on_change"></a>`ssl_reload_on_change`
 
 Data type: `Boolean`
 
 Enable reloading of apache if the content of ssl files have changed. It only affects ssl files configured here and not vhost ones.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--ssl--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--ssl--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of ssl package to install.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodstatus"></a>`apache::mod::status`
+### <a name="apache--mod--status"></a>`apache::mod::status`
 
 Installs and configures `mod_status`.
 
@@ -6833,13 +6858,13 @@ class { 'apache::mod::status':
 
 The following parameters are available in the `apache::mod::status` class:
 
-* [`allow_from`](#allow_from)
-* [`requires`](#requires)
-* [`extended_status`](#extended_status)
-* [`status_path`](#status_path)
-* [`apache_version`](#apache_version)
+* [`allow_from`](#-apache--mod--status--allow_from)
+* [`requires`](#-apache--mod--status--requires)
+* [`extended_status`](#-apache--mod--status--extended_status)
+* [`status_path`](#-apache--mod--status--status_path)
+* [`apache_version`](#-apache--mod--status--apache_version)
 
-##### <a name="allow_from"></a>`allow_from`
+##### <a name="-apache--mod--status--allow_from"></a>`allow_from`
 
 Data type: `Optional[Array]`
 
@@ -6847,9 +6872,9 @@ Array of hosts, ip addresses, partial network numbers or networks, in CIDR notat
 /server-status URL.  Defaults to ['127.0.0.1', '::1'].
 > Creates Apache < 2.4 directive "Allow from".
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="requires"></a>`requires`
+##### <a name="-apache--mod--status--requires"></a>`requires`
 
 Data type: `Optional[Variant[String, Array, Hash]]`
 
@@ -6867,9 +6892,9 @@ A Variant type that can be:
     Optional - If unspecified, "Require" directives follow current flow
 > Creates Apache >= 2.4 directives "Require"
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="extended_status"></a>`extended_status`
+##### <a name="-apache--mod--status--extended_status"></a>`extended_status`
 
 Data type: `Enum['On', 'Off', 'on', 'off']`
 
@@ -6877,7 +6902,7 @@ Determines whether to track extended status information for each request, via th
 
 Default value: `'On'`
 
-##### <a name="status_path"></a>`status_path`
+##### <a name="-apache--mod--status--status_path"></a>`status_path`
 
 Data type: `String`
 
@@ -6885,15 +6910,15 @@ Path assigned to the Location directive which defines the URL to access the serv
 
 Default value: `'/server-status'`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--status--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodsuexec"></a>`apache::mod::suexec`
+### <a name="apache--mod--suexec"></a>`apache::mod::suexec`
 
 Installs `mod_suexec`.
 
@@ -6901,7 +6926,7 @@ Installs `mod_suexec`.
   * https://httpd.apache.org/docs/current/mod/mod_suexec.html
     * for additional documentation.
 
-### <a name="apachemoduserdir"></a>`apache::mod::userdir`
+### <a name="apache--mod--userdir"></a>`apache::mod::userdir`
 
 Installs and configures `mod_userdir`.
 
@@ -6913,58 +6938,58 @@ Installs and configures `mod_userdir`.
 
 The following parameters are available in the `apache::mod::userdir` class:
 
-* [`home`](#home)
-* [`dir`](#dir)
-* [`userdir`](#userdir)
-* [`disable_root`](#disable_root)
-* [`apache_version`](#apache_version)
-* [`path`](#path)
-* [`overrides`](#overrides)
-* [`options`](#options)
-* [`unmanaged_path`](#unmanaged_path)
-* [`custom_fragment`](#custom_fragment)
+* [`home`](#-apache--mod--userdir--home)
+* [`dir`](#-apache--mod--userdir--dir)
+* [`userdir`](#-apache--mod--userdir--userdir)
+* [`disable_root`](#-apache--mod--userdir--disable_root)
+* [`apache_version`](#-apache--mod--userdir--apache_version)
+* [`path`](#-apache--mod--userdir--path)
+* [`overrides`](#-apache--mod--userdir--overrides)
+* [`options`](#-apache--mod--userdir--options)
+* [`unmanaged_path`](#-apache--mod--userdir--unmanaged_path)
+* [`custom_fragment`](#-apache--mod--userdir--custom_fragment)
 
-##### <a name="home"></a>`home`
+##### <a name="-apache--mod--userdir--home"></a>`home`
 
 Data type: `Optional[String]`
 
 *Deprecated* Path to system home directory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="dir"></a>`dir`
+##### <a name="-apache--mod--userdir--dir"></a>`dir`
 
 Data type: `Optional[String]`
 
 *Deprecated* Path from user's home directory to public directory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="userdir"></a>`userdir`
+##### <a name="-apache--mod--userdir--userdir"></a>`userdir`
 
 Data type: `Optional[String[1]]`
 
 Path or directory name to be used as the UserDir.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="disable_root"></a>`disable_root`
+##### <a name="-apache--mod--userdir--disable_root"></a>`disable_root`
 
 Data type: `Boolean`
 
 Toggles whether to allow use of root directory.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--userdir--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="path"></a>`path`
+##### <a name="-apache--mod--userdir--path"></a>`path`
 
 Data type: `String`
 
@@ -6972,7 +6997,7 @@ Path to directory or pattern from which to find user-specific directories.
 
 Default value: `'/home/*/public_html'`
 
-##### <a name="overrides"></a>`overrides`
+##### <a name="-apache--mod--userdir--overrides"></a>`overrides`
 
 Data type: `Array[String]`
 
@@ -6980,7 +7005,7 @@ Array of directives that are allowed in .htaccess files.
 
 Default value: `['FileInfo', 'AuthConfig', 'Limit', 'Indexes']`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--mod--userdir--options"></a>`options`
 
 Data type: `Array[String]`
 
@@ -6988,23 +7013,23 @@ Configures what features are available in a particular directory.
 
 Default value: `['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec']`
 
-##### <a name="unmanaged_path"></a>`unmanaged_path`
+##### <a name="-apache--mod--userdir--unmanaged_path"></a>`unmanaged_path`
 
 Data type: `Boolean`
 
 Toggles whether to manage path in userdir.conf
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="custom_fragment"></a>`custom_fragment`
+##### <a name="-apache--mod--userdir--custom_fragment"></a>`custom_fragment`
 
 Data type: `Optional[String]`
 
 Custom configuration to be added to userdir.conf
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodversion"></a>`apache::mod::version`
+### <a name="apache--mod--version"></a>`apache::mod::version`
 
 Installs `mod_version`.
 
@@ -7016,9 +7041,9 @@ Installs `mod_version`.
 
 The following parameters are available in the `apache::mod::version` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--version--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--version--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -7026,7 +7051,7 @@ Used to verify that the Apache version you have requested is compatible with the
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodvhost_alias"></a>`apache::mod::vhost_alias`
+### <a name="apache--mod--vhost_alias"></a>`apache::mod::vhost_alias`
 
 Installs Apache `mod_vhost_alias`.
 
@@ -7034,7 +7059,7 @@ Installs Apache `mod_vhost_alias`.
   * https://httpd.apache.org/docs/current/mod/mod_vhost_alias.html
     * for additional documentation.
 
-### <a name="apachemodwatchdog"></a>`apache::mod::watchdog`
+### <a name="apache--mod--watchdog"></a>`apache::mod::watchdog`
 
 Installs and configures `mod_watchdog`.
 
@@ -7046,17 +7071,17 @@ Installs and configures `mod_watchdog`.
 
 The following parameters are available in the `apache::mod::watchdog` class:
 
-* [`watchdog_interval`](#watchdog_interval)
+* [`watchdog_interval`](#-apache--mod--watchdog--watchdog_interval)
 
-##### <a name="watchdog_interval"></a>`watchdog_interval`
+##### <a name="-apache--mod--watchdog--watchdog_interval"></a>`watchdog_interval`
 
 Data type: `Optional[Integer]`
 
 Sets the interval at which the watchdog_step hook runs.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodworker"></a>`apache::mod::worker`
+### <a name="apache--mod--worker"></a>`apache::mod::worker`
 
 Installs and manages the MPM `worker`.
 
@@ -7068,19 +7093,19 @@ Installs and manages the MPM `worker`.
 
 The following parameters are available in the `apache::mod::worker` class:
 
-* [`startservers`](#startservers)
-* [`maxclients`](#maxclients)
-* [`minsparethreads`](#minsparethreads)
-* [`maxsparethreads`](#maxsparethreads)
-* [`threadsperchild`](#threadsperchild)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`serverlimit`](#serverlimit)
-* [`threadlimit`](#threadlimit)
-* [`listenbacklog`](#listenbacklog)
-* [`apache_version`](#apache_version)
-* [`maxrequestworkers`](#maxrequestworkers)
+* [`startservers`](#-apache--mod--worker--startservers)
+* [`maxclients`](#-apache--mod--worker--maxclients)
+* [`minsparethreads`](#-apache--mod--worker--minsparethreads)
+* [`maxsparethreads`](#-apache--mod--worker--maxsparethreads)
+* [`threadsperchild`](#-apache--mod--worker--threadsperchild)
+* [`maxrequestsperchild`](#-apache--mod--worker--maxrequestsperchild)
+* [`serverlimit`](#-apache--mod--worker--serverlimit)
+* [`threadlimit`](#-apache--mod--worker--threadlimit)
+* [`listenbacklog`](#-apache--mod--worker--listenbacklog)
+* [`apache_version`](#-apache--mod--worker--apache_version)
+* [`maxrequestworkers`](#-apache--mod--worker--maxrequestworkers)
 
-##### <a name="startservers"></a>`startservers`
+##### <a name="-apache--mod--worker--startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -7088,7 +7113,7 @@ The number of child server processes created on startup
 
 Default value: `2`
 
-##### <a name="maxclients"></a>`maxclients`
+##### <a name="-apache--mod--worker--maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -7099,7 +7124,7 @@ If maxrequestworkers is set, this value is ignored.
 
 Default value: `150`
 
-##### <a name="minsparethreads"></a>`minsparethreads`
+##### <a name="-apache--mod--worker--minsparethreads"></a>`minsparethreads`
 
 Data type: `Integer`
 
@@ -7107,7 +7132,7 @@ Minimum number of idle threads to handle request spikes.
 
 Default value: `25`
 
-##### <a name="maxsparethreads"></a>`maxsparethreads`
+##### <a name="-apache--mod--worker--maxsparethreads"></a>`maxsparethreads`
 
 Data type: `Integer`
 
@@ -7115,7 +7140,7 @@ Maximum number of idle threads.
 
 Default value: `75`
 
-##### <a name="threadsperchild"></a>`threadsperchild`
+##### <a name="-apache--mod--worker--threadsperchild"></a>`threadsperchild`
 
 Data type: `Integer`
 
@@ -7123,7 +7148,7 @@ The number of threads created by each child process.
 
 Default value: `25`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--worker--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -7133,7 +7158,7 @@ name is MaxConnectionsPerChild as of 2.3.9+.
 
 Default value: `0`
 
-##### <a name="serverlimit"></a>`serverlimit`
+##### <a name="-apache--mod--worker--serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -7145,7 +7170,7 @@ MaxRequestWorkers and ThreadsPerChild.
 
 Default value: `25`
 
-##### <a name="threadlimit"></a>`threadlimit`
+##### <a name="-apache--mod--worker--threadlimit"></a>`threadlimit`
 
 Data type: `Integer`
 
@@ -7154,7 +7179,7 @@ ThreadsPerChild for the lifetime of the Apache httpd process.
 
 Default value: `64`
 
-##### <a name="listenbacklog"></a>`listenbacklog`
+##### <a name="-apache--mod--worker--listenbacklog"></a>`listenbacklog`
 
 Data type: `Integer`
 
@@ -7162,24 +7187,24 @@ Maximum length of the queue of pending connections.
 
 Default value: `511`
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--worker--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
 Used to verify that the Apache version you have requested is compatible with the module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="-apache--mod--worker--maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Optional[Integer]`
 
 Maximum number of connections that will be processed simultaneously
 if set, maxclients is ignored
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodwsgi"></a>`apache::mod::wsgi`
+### <a name="apache--mod--wsgi"></a>`apache::mod::wsgi`
 
 Installs and configures `mod_wsgi`.
 
@@ -7193,24 +7218,24 @@ Installs and configures `mod_wsgi`.
 
 The following parameters are available in the `apache::mod::wsgi` class:
 
-* [`wsgi_restrict_embedded`](#wsgi_restrict_embedded)
-* [`wsgi_socket_prefix`](#wsgi_socket_prefix)
-* [`wsgi_python_path`](#wsgi_python_path)
-* [`wsgi_python_home`](#wsgi_python_home)
-* [`wsgi_python_optimize`](#wsgi_python_optimize)
-* [`wsgi_application_group`](#wsgi_application_group)
-* [`package_name`](#package_name)
-* [`mod_path`](#mod_path)
+* [`wsgi_restrict_embedded`](#-apache--mod--wsgi--wsgi_restrict_embedded)
+* [`wsgi_socket_prefix`](#-apache--mod--wsgi--wsgi_socket_prefix)
+* [`wsgi_python_path`](#-apache--mod--wsgi--wsgi_python_path)
+* [`wsgi_python_home`](#-apache--mod--wsgi--wsgi_python_home)
+* [`wsgi_python_optimize`](#-apache--mod--wsgi--wsgi_python_optimize)
+* [`wsgi_application_group`](#-apache--mod--wsgi--wsgi_application_group)
+* [`package_name`](#-apache--mod--wsgi--package_name)
+* [`mod_path`](#-apache--mod--wsgi--mod_path)
 
-##### <a name="wsgi_restrict_embedded"></a>`wsgi_restrict_embedded`
+##### <a name="-apache--mod--wsgi--wsgi_restrict_embedded"></a>`wsgi_restrict_embedded`
 
 Data type: `Optional[String]`
 
 Enable restrictions on use of embedded mode.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_socket_prefix"></a>`wsgi_socket_prefix`
+##### <a name="-apache--mod--wsgi--wsgi_socket_prefix"></a>`wsgi_socket_prefix`
 
 Data type: `Optional[String]`
 
@@ -7218,55 +7243,55 @@ Configure directory to use for daemon sockets.
 
 Default value: `$apache::params::wsgi_socket_prefix`
 
-##### <a name="wsgi_python_path"></a>`wsgi_python_path`
+##### <a name="-apache--mod--wsgi--wsgi_python_path"></a>`wsgi_python_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Additional directories to search for Python modules.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_python_home"></a>`wsgi_python_home`
+##### <a name="-apache--mod--wsgi--wsgi_python_home"></a>`wsgi_python_home`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Absolute path to Python prefix/exec_prefix directories.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_python_optimize"></a>`wsgi_python_optimize`
+##### <a name="-apache--mod--wsgi--wsgi_python_optimize"></a>`wsgi_python_optimize`
 
 Data type: `Optional[Integer]`
 
 Enables basic Python optimisation features.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_application_group"></a>`wsgi_application_group`
+##### <a name="-apache--mod--wsgi--wsgi_application_group"></a>`wsgi_application_group`
 
 Data type: `Optional[String]`
 
 Sets which application group WSGI application belongs to.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--wsgi--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Names of package that installs mod_wsgi.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_path"></a>`mod_path`
+##### <a name="-apache--mod--wsgi--mod_path"></a>`mod_path`
 
 Data type: `Optional[String]`
 
 Defines the path to the mod_wsgi shared object (.so) file.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodxsendfile"></a>`apache::mod::xsendfile`
+### <a name="apache--mod--xsendfile"></a>`apache::mod::xsendfile`
 
 Installs `mod_xsendfile`.
 
@@ -7274,19 +7299,19 @@ Installs `mod_xsendfile`.
   * https://tn123.org/mod_xsendfile/
     * for additional documentation.
 
-### <a name="apachempmdisable_mpm_event"></a>`apache::mpm::disable_mpm_event`
+### <a name="apache--mpm--disable_mpm_event"></a>`apache::mpm::disable_mpm_event`
 
 disable Apache-Module event
 
-### <a name="apachempmdisable_mpm_prefork"></a>`apache::mpm::disable_mpm_prefork`
+### <a name="apache--mpm--disable_mpm_prefork"></a>`apache::mpm::disable_mpm_prefork`
 
 disable Apache-Module prefork
 
-### <a name="apachempmdisable_mpm_worker"></a>`apache::mpm::disable_mpm_worker`
+### <a name="apache--mpm--disable_mpm_worker"></a>`apache::mpm::disable_mpm_worker`
 
 disable Apache-Module worker
 
-### <a name="apachevhosts"></a>`apache::vhosts`
+### <a name="apache--vhosts"></a>`apache::vhosts`
 
 host parameters or Configuring virtual hosts in the README section.
 
@@ -7311,9 +7336,9 @@ class { 'apache::vhosts':
 
 The following parameters are available in the `apache::vhosts` class:
 
-* [`vhosts`](#vhosts)
+* [`vhosts`](#-apache--vhosts--vhosts)
 
-##### <a name="vhosts"></a>`vhosts`
+##### <a name="-apache--vhosts--vhosts"></a>`vhosts`
 
 Data type: `Hash`
 
@@ -7324,7 +7349,7 @@ Default value: `{}`
 
 ## Defined types
 
-### <a name="apachebalancer"></a>`apache::balancer`
+### <a name="apache--balancer"></a>`apache::balancer`
 
 Each balancer cluster needs one or more balancer members (that can
 be declared with the apache::balancermember defined resource type). Using
@@ -7348,18 +7373,18 @@ apache::balancer { 'puppet00': }
 
 The following parameters are available in the `apache::balancer` defined type:
 
-* [`name`](#name)
-* [`proxy_set`](#proxy_set)
-* [`target`](#target)
-* [`collect_exported`](#collect_exported)
-* [`options`](#options)
+* [`name`](#-apache--balancer--name)
+* [`proxy_set`](#-apache--balancer--proxy_set)
+* [`target`](#-apache--balancer--target)
+* [`collect_exported`](#-apache--balancer--collect_exported)
+* [`options`](#-apache--balancer--options)
 
-##### <a name="name"></a>`name`
+##### <a name="-apache--balancer--name"></a>`name`
 
 The namevar of the defined resource type is the balancer clusters name.<br />
 This name is also used in the name of the conf.d file
 
-##### <a name="proxy_set"></a>`proxy_set`
+##### <a name="-apache--balancer--proxy_set"></a>`proxy_set`
 
 Data type: `Hash`
 
@@ -7367,15 +7392,15 @@ Configures key-value pairs to be used as a ProxySet lines in the configuration.
 
 Default value: `{}`
 
-##### <a name="target"></a>`target`
+##### <a name="-apache--balancer--target"></a>`target`
 
 Data type: `Optional[String]`
 
 The path to the file the balancer definition will be written in.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="collect_exported"></a>`collect_exported`
+##### <a name="-apache--balancer--collect_exported"></a>`collect_exported`
 
 Data type: `Boolean`
 
@@ -7390,9 +7415,9 @@ If you don't use exported resources, a single Puppet run configures all balancer
 you use exported resources, Puppet has to run on the balanced nodes first, then run on the
 balancer.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--balancer--options"></a>`options`
 
 Data type: `Array[Pattern[/=/]]`
 
@@ -7401,7 +7426,7 @@ after the balancer URL, and accepts any key-value pairs available to `ProxyPass`
 
 Default value: `[]`
 
-### <a name="apachebalancermember"></a>`apache::balancermember`
+### <a name="apache--balancermember"></a>`apache::balancermember`
 
 Sets up a balancer member inside a listening service configuration block in
 the load balancer's `apache.cfg`.
@@ -7433,24 +7458,24 @@ from all balancer members.
 
 The following parameters are available in the `apache::balancermember` defined type:
 
-* [`name`](#name)
-* [`balancer_cluster`](#balancer_cluster)
-* [`url`](#url)
-* [`options`](#options)
+* [`name`](#-apache--balancermember--name)
+* [`balancer_cluster`](#-apache--balancermember--balancer_cluster)
+* [`url`](#-apache--balancermember--url)
+* [`options`](#-apache--balancermember--options)
 
-##### <a name="name"></a>`name`
+##### <a name="-apache--balancermember--name"></a>`name`
 
 The title of the resource is arbitrary and only utilized in the concat
 fragment name.
 
-##### <a name="balancer_cluster"></a>`balancer_cluster`
+##### <a name="-apache--balancermember--balancer_cluster"></a>`balancer_cluster`
 
 Data type: `String`
 
 The apache service's instance name (or, the title of the apache::balancer
 resource). This must match up with a declared apache::balancer resource.
 
-##### <a name="url"></a>`url`
+##### <a name="-apache--balancermember--url"></a>`url`
 
 Data type: `Apache::ModProxyProtocol`
 
@@ -7458,7 +7483,7 @@ The url used to contact the balancer member server.
 
 Default value: `"http://${$facts['networking']['fqdn']}/"`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--balancermember--options"></a>`options`
 
 Data type: `Array`
 
@@ -7467,7 +7492,7 @@ after the URL, and accepts any key-value pairs available to `ProxyPass`.
 
 Default value: `[]`
 
-### <a name="apachecustom_config"></a>`apache::custom_config`
+### <a name="apache--custom_config"></a>`apache::custom_config`
 
 If the file is invalid and this defined type's `verify_config` parameter's value is
 `true`, Puppet throws an error during a Puppet run.
@@ -7476,20 +7501,20 @@ If the file is invalid and this defined type's `verify_config` parameter's value
 
 The following parameters are available in the `apache::custom_config` defined type:
 
-* [`ensure`](#ensure)
-* [`confdir`](#confdir)
-* [`content`](#content)
-* [`filename`](#filename)
-* [`priority`](#priority)
-* [`source`](#source)
-* [`verify_command`](#verify_command)
-* [`verify_config`](#verify_config)
-* [`owner`](#owner)
-* [`group`](#group)
-* [`file_mode`](#file_mode)
-* [`show_diff`](#show_diff)
-
-##### <a name="ensure"></a>`ensure`
+* [`ensure`](#-apache--custom_config--ensure)
+* [`confdir`](#-apache--custom_config--confdir)
+* [`content`](#-apache--custom_config--content)
+* [`filename`](#-apache--custom_config--filename)
+* [`priority`](#-apache--custom_config--priority)
+* [`source`](#-apache--custom_config--source)
+* [`verify_command`](#-apache--custom_config--verify_command)
+* [`verify_config`](#-apache--custom_config--verify_config)
+* [`owner`](#-apache--custom_config--owner)
+* [`group`](#-apache--custom_config--group)
+* [`file_mode`](#-apache--custom_config--file_mode)
+* [`show_diff`](#-apache--custom_config--show_diff)
+
+##### <a name="-apache--custom_config--ensure"></a>`ensure`
 
 Data type: `Enum['absent', 'present']`
 
@@ -7497,7 +7522,7 @@ Specifies whether the configuration file should be present.
 
 Default value: `'present'`
 
-##### <a name="confdir"></a>`confdir`
+##### <a name="-apache--custom_config--confdir"></a>`confdir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -7505,24 +7530,24 @@ Sets the directory in which Puppet places configuration files.
 
 Default value: `$apache::confd_dir`
 
-##### <a name="content"></a>`content`
+##### <a name="-apache--custom_config--content"></a>`content`
 
 Data type: `Optional[String]`
 
 Sets the configuration file's content. The `content` and `source` parameters are exclusive
 of each other.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="filename"></a>`filename`
+##### <a name="-apache--custom_config--filename"></a>`filename`
 
 Data type: `Optional[String]`
 
 Sets the name of the file under `confdir` in which Puppet stores the configuration.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--custom_config--priority"></a>`priority`
 
 Data type: `Apache::Vhost::Priority`
 
@@ -7532,16 +7557,16 @@ To omit the priority prefix in the configuration file's name, set this parameter
 
 Default value: `25`
 
-##### <a name="source"></a>`source`
+##### <a name="-apache--custom_config--source"></a>`source`
 
 Data type: `Optional[String]`
 
 Points to the configuration file's source. The `content` and `source` parameters are
 exclusive of each other.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="verify_command"></a>`verify_command`
+##### <a name="-apache--custom_config--verify_command"></a>`verify_command`
 
 Data type: `Variant[String, Array[String], Array[Array[String]]]`
 
@@ -7556,47 +7581,47 @@ Or an array of arrays with each one having to pass succesfully, i.e. `[['/usr/sb
 
 Default value: `$apache::params::verify_command`
 
-##### <a name="verify_config"></a>`verify_config`
+##### <a name="-apache--custom_config--verify_config"></a>`verify_config`
 
 Data type: `Boolean`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="owner"></a>`owner`
+##### <a name="-apache--custom_config--owner"></a>`owner`
 
 Data type: `Optional[String]`
 
 File owner of configuration file
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="group"></a>`group`
+##### <a name="-apache--custom_config--group"></a>`group`
 
 Data type: `Optional[String]`
 
 File group of configuration file
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="file_mode"></a>`file_mode`
+##### <a name="-apache--custom_config--file_mode"></a>`file_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
 File mode of configuration file
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="show_diff"></a>`show_diff`
+##### <a name="-apache--custom_config--show_diff"></a>`show_diff`
 
 Data type: `Boolean`
 
 show_diff property for configuration file resource
 
-Default value: ``true``
+Default value: `true`
 
-### <a name="apachefastcgiserver"></a>`apache::fastcgi::server`
+### <a name="apache--fastcgi--server"></a>`apache::fastcgi::server`
 
 Defines one or more external FastCGI servers to handle specific file types. Use this
 defined type with `mod_fastcgi`.
@@ -7605,15 +7630,15 @@ defined type with `mod_fastcgi`.
 
 The following parameters are available in the `apache::fastcgi::server` defined type:
 
-* [`host`](#host)
-* [`timeout`](#timeout)
-* [`flush`](#flush)
-* [`faux_path`](#faux_path)
-* [`fcgi_alias`](#fcgi_alias)
-* [`file_type`](#file_type)
-* [`pass_header`](#pass_header)
+* [`host`](#-apache--fastcgi--server--host)
+* [`timeout`](#-apache--fastcgi--server--timeout)
+* [`flush`](#-apache--fastcgi--server--flush)
+* [`faux_path`](#-apache--fastcgi--server--faux_path)
+* [`fcgi_alias`](#-apache--fastcgi--server--fcgi_alias)
+* [`file_type`](#-apache--fastcgi--server--file_type)
+* [`pass_header`](#-apache--fastcgi--server--pass_header)
 
-##### <a name="host"></a>`host`
+##### <a name="-apache--fastcgi--server--host"></a>`host`
 
 Data type: `String`
 
@@ -7621,7 +7646,7 @@ Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
 
 Default value: `'127.0.0.1:9000'`
 
-##### <a name="timeout"></a>`timeout`
+##### <a name="-apache--fastcgi--server--timeout"></a>`timeout`
 
 Data type: `Integer`
 
@@ -7634,7 +7659,7 @@ the client (the response is buffered), the timeout does not apply.
 
 Default value: `15`
 
-##### <a name="flush"></a>`flush`
+##### <a name="-apache--fastcgi--server--flush"></a>`flush`
 
 Data type: `Boolean`
 
@@ -7642,9 +7667,9 @@ Forces `mod_fastcgi` to write to the client as data is received from the
 application. By default, `mod_fastcgi` buffers data in order to free the application
 as quickly as possible.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="faux_path"></a>`faux_path`
+##### <a name="-apache--fastcgi--server--faux_path"></a>`faux_path`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -7653,7 +7678,7 @@ parameter does not have to exist in the local filesystem.
 
 Default value: `"/var/www/${name}.fcgi"`
 
-##### <a name="fcgi_alias"></a>`fcgi_alias`
+##### <a name="-apache--fastcgi--server--fcgi_alias"></a>`fcgi_alias`
 
 Data type: `Stdlib::Unixpath`
 
@@ -7661,7 +7686,7 @@ Internally links actions with the FastCGI server. This alias must be unique.
 
 Default value: `"/${name}.fcgi"`
 
-##### <a name="file_type"></a>`file_type`
+##### <a name="-apache--fastcgi--server--file_type"></a>`file_type`
 
 Data type: `String`
 
@@ -7669,20 +7694,20 @@ Sets the MIME `content-type` of the file to be processed by the FastCGI server.
 
 Default value: `'application/x-httpd-php'`
 
-##### <a name="pass_header"></a>`pass_header`
+##### <a name="-apache--fastcgi--server--pass_header"></a>`pass_header`
 
 Data type: `Optional[String]`
 
 Sets a header for the server
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachelisten"></a>`apache::listen`
+### <a name="apache--listen"></a>`apache::listen`
 
 The `apache::vhost` class uses this defined type, and titles take the form
 `<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
 
-### <a name="apachemod"></a>`apache::mod`
+### <a name="apache--mod"></a>`apache::mod`
 
 Checks for or places the module's default configuration files in the Apache server's
 `module` and `enable` directories. The default locations depend on your operating system.
@@ -7691,25 +7716,25 @@ Checks for or places the module's default configuration files in the Apache serv
 
 The following parameters are available in the `apache::mod` defined type:
 
-* [`package`](#package)
-* [`package_ensure`](#package_ensure)
-* [`lib`](#lib)
-* [`lib_path`](#lib_path)
-* [`loadfile_name`](#loadfile_name)
-* [`id`](#id)
-* [`loadfiles`](#loadfiles)
-* [`path`](#path)
+* [`package`](#-apache--mod--package)
+* [`package_ensure`](#-apache--mod--package_ensure)
+* [`lib`](#-apache--mod--lib)
+* [`lib_path`](#-apache--mod--lib_path)
+* [`loadfile_name`](#-apache--mod--loadfile_name)
+* [`id`](#-apache--mod--id)
+* [`loadfiles`](#-apache--mod--loadfiles)
+* [`path`](#-apache--mod--path)
 
-##### <a name="package"></a>`package`
+##### <a name="-apache--mod--package"></a>`package`
 
 Data type: `Optional[String]`
 
 **Required**.<br />
 Names the package Puppet uses to install the Apache module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_ensure"></a>`package_ensure`
+##### <a name="-apache--mod--package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -7717,15 +7742,15 @@ Determines whether Puppet ensures the Apache module should be installed.
 
 Default value: `'present'`
 
-##### <a name="lib"></a>`lib`
+##### <a name="-apache--mod--lib"></a>`lib`
 
 Data type: `Optional[String]`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="lib_path"></a>`lib_path`
+##### <a name="-apache--mod--lib_path"></a>`lib_path`
 
 Data type: `String`
 
@@ -7734,46 +7759,46 @@ without special reason. The `path` parameter overrides this value.
 
 Default value: `$apache::lib_path`
 
-##### <a name="loadfile_name"></a>`loadfile_name`
+##### <a name="-apache--mod--loadfile_name"></a>`loadfile_name`
 
 Data type: `Optional[String]`
 
 Sets the filename for the module's `LoadFile` directive, which can also set
 the module load order as Apache processes them in alphanumeric order.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="id"></a>`id`
+##### <a name="-apache--mod--id"></a>`id`
 
 Data type: `Optional[String]`
 
 Specifies the package id
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="loadfiles"></a>`loadfiles`
+##### <a name="-apache--mod--loadfiles"></a>`loadfiles`
 
 Data type: `Optional[Array]`
 
 Specifies an array of `LoadFile` directives.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="path"></a>`path`
+##### <a name="-apache--mod--path"></a>`path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachenamevirtualhost"></a>`apache::namevirtualhost`
+### <a name="apache--namevirtualhost"></a>`apache::namevirtualhost`
 
 Adds all related directives to the `ports.conf` file in the Apache HTTPD configuration
 directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`,
 `\<IP\>`, or `\<IP\>:\<PORT\>`.
 
-### <a name="apachevhost"></a>`apache::vhost`
+### <a name="apache--vhost"></a>`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` being a defined resource type, which allows Apache
@@ -7858,251 +7883,251 @@ class { 'apache':
 
 The following parameters are available in the `apache::vhost` defined type:
 
-* [`apache_version`](#apache_version)
-* [`access_log`](#access_log)
-* [`access_log_env_var`](#access_log_env_var)
-* [`access_log_file`](#access_log_file)
-* [`access_log_format`](#access_log_format)
-* [`access_log_pipe`](#access_log_pipe)
-* [`access_log_syslog`](#access_log_syslog)
-* [`access_logs`](#access_logs)
-* [`add_default_charset`](#add_default_charset)
-* [`add_listen`](#add_listen)
-* [`use_optional_includes`](#use_optional_includes)
-* [`aliases`](#aliases)
-* [`allow_encoded_slashes`](#allow_encoded_slashes)
-* [`block`](#block)
-* [`cas_attribute_prefix`](#cas_attribute_prefix)
-* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
-* [`cas_login_url`](#cas_login_url)
-* [`cas_root_proxied_as`](#cas_root_proxied_as)
-* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
-* [`cas_sso_enabled`](#cas_sso_enabled)
-* [`cas_validate_saml`](#cas_validate_saml)
-* [`cas_validate_url`](#cas_validate_url)
-* [`cas_cookie_path`](#cas_cookie_path)
-* [`comment`](#comment)
-* [`default_vhost`](#default_vhost)
-* [`directoryindex`](#directoryindex)
-* [`docroot`](#docroot)
-* [`docroot_group`](#docroot_group)
-* [`docroot_owner`](#docroot_owner)
-* [`docroot_mode`](#docroot_mode)
-* [`manage_docroot`](#manage_docroot)
-* [`error_log`](#error_log)
-* [`error_log_file`](#error_log_file)
-* [`error_log_pipe`](#error_log_pipe)
-* [`error_log_syslog`](#error_log_syslog)
-* [`error_log_format`](#error_log_format)
-* [`error_documents`](#error_documents)
-* [`ensure`](#ensure)
-* [`fallbackresource`](#fallbackresource)
-* [`filters`](#filters)
-* [`h2_copy_files`](#h2_copy_files)
-* [`h2_direct`](#h2_direct)
-* [`h2_early_hints`](#h2_early_hints)
-* [`h2_max_session_streams`](#h2_max_session_streams)
-* [`h2_modern_tls_only`](#h2_modern_tls_only)
-* [`h2_push`](#h2_push)
-* [`h2_push_diary_size`](#h2_push_diary_size)
-* [`h2_push_priority`](#h2_push_priority)
-* [`h2_push_resource`](#h2_push_resource)
-* [`h2_serialize_headers`](#h2_serialize_headers)
-* [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
-* [`h2_tls_cool_down_secs`](#h2_tls_cool_down_secs)
-* [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
-* [`h2_upgrade`](#h2_upgrade)
-* [`h2_window_size`](#h2_window_size)
-* [`ip`](#ip)
-* [`ip_based`](#ip_based)
-* [`itk`](#itk)
-* [`action`](#action)
-* [`jk_mounts`](#jk_mounts)
-* [`http_protocol_options`](#http_protocol_options)
-* [`keepalive`](#keepalive)
-* [`keepalive_timeout`](#keepalive_timeout)
-* [`max_keepalive_requests`](#max_keepalive_requests)
-* [`auth_kerb`](#auth_kerb)
-* [`krb_method_negotiate`](#krb_method_negotiate)
-* [`krb_method_k5passwd`](#krb_method_k5passwd)
-* [`krb_authoritative`](#krb_authoritative)
-* [`krb_auth_realms`](#krb_auth_realms)
-* [`krb_5keytab`](#krb_5keytab)
-* [`krb_local_user_mapping`](#krb_local_user_mapping)
-* [`krb_verify_kdc`](#krb_verify_kdc)
-* [`krb_servicename`](#krb_servicename)
-* [`krb_save_credentials`](#krb_save_credentials)
-* [`logroot`](#logroot)
-* [`logroot_ensure`](#logroot_ensure)
-* [`logroot_mode`](#logroot_mode)
-* [`logroot_owner`](#logroot_owner)
-* [`logroot_group`](#logroot_group)
-* [`log_level`](#log_level)
-* [`modsec_body_limit`](#modsec_body_limit)
-* [`modsec_disable_vhost`](#modsec_disable_vhost)
-* [`modsec_disable_ids`](#modsec_disable_ids)
-* [`modsec_disable_ips`](#modsec_disable_ips)
-* [`modsec_disable_msgs`](#modsec_disable_msgs)
-* [`modsec_disable_tags`](#modsec_disable_tags)
-* [`modsec_audit_log_file`](#modsec_audit_log_file)
-* [`modsec_audit_log_pipe`](#modsec_audit_log_pipe)
-* [`modsec_audit_log`](#modsec_audit_log)
-* [`modsec_inbound_anomaly_threshold`](#modsec_inbound_anomaly_threshold)
-* [`modsec_outbound_anomaly_threshold`](#modsec_outbound_anomaly_threshold)
-* [`modsec_allowed_methods`](#modsec_allowed_methods)
-* [`no_proxy_uris`](#no_proxy_uris)
-* [`no_proxy_uris_match`](#no_proxy_uris_match)
-* [`proxy_preserve_host`](#proxy_preserve_host)
-* [`proxy_add_headers`](#proxy_add_headers)
-* [`proxy_error_override`](#proxy_error_override)
-* [`options`](#options)
-* [`override`](#override)
-* [`passenger_enabled`](#passenger_enabled)
-* [`passenger_base_uri`](#passenger_base_uri)
-* [`passenger_ruby`](#passenger_ruby)
-* [`passenger_python`](#passenger_python)
-* [`passenger_nodejs`](#passenger_nodejs)
-* [`passenger_meteor_app_settings`](#passenger_meteor_app_settings)
-* [`passenger_app_env`](#passenger_app_env)
-* [`passenger_app_root`](#passenger_app_root)
-* [`passenger_app_group_name`](#passenger_app_group_name)
-* [`passenger_app_start_command`](#passenger_app_start_command)
-* [`passenger_app_type`](#passenger_app_type)
-* [`passenger_startup_file`](#passenger_startup_file)
-* [`passenger_restart_dir`](#passenger_restart_dir)
-* [`passenger_spawn_method`](#passenger_spawn_method)
-* [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
-* [`passenger_preload_bundler`](#passenger_preload_bundler)
-* [`passenger_rolling_restarts`](#passenger_rolling_restarts)
-* [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
-* [`passenger_user`](#passenger_user)
-* [`passenger_group`](#passenger_group)
-* [`passenger_friendly_error_pages`](#passenger_friendly_error_pages)
-* [`passenger_min_instances`](#passenger_min_instances)
-* [`passenger_max_instances`](#passenger_max_instances)
-* [`passenger_max_preloader_idle_time`](#passenger_max_preloader_idle_time)
-* [`passenger_force_max_concurrent_requests_per_process`](#passenger_force_max_concurrent_requests_per_process)
-* [`passenger_start_timeout`](#passenger_start_timeout)
-* [`passenger_concurrency_model`](#passenger_concurrency_model)
-* [`passenger_thread_count`](#passenger_thread_count)
-* [`passenger_max_requests`](#passenger_max_requests)
-* [`passenger_max_request_time`](#passenger_max_request_time)
-* [`passenger_memory_limit`](#passenger_memory_limit)
-* [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
-* [`passenger_pre_start`](#passenger_pre_start)
-* [`passenger_high_performance`](#passenger_high_performance)
-* [`passenger_buffer_upload`](#passenger_buffer_upload)
-* [`passenger_buffer_response`](#passenger_buffer_response)
-* [`passenger_error_override`](#passenger_error_override)
-* [`passenger_max_request_queue_size`](#passenger_max_request_queue_size)
-* [`passenger_max_request_queue_time`](#passenger_max_request_queue_time)
-* [`passenger_sticky_sessions`](#passenger_sticky_sessions)
-* [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
-* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
-* [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
-* [`passenger_app_log_file`](#passenger_app_log_file)
-* [`passenger_debugger`](#passenger_debugger)
-* [`passenger_lve_min_uid`](#passenger_lve_min_uid)
-* [`php_values`](#php_values)
-* [`php_flags`](#php_flags)
-* [`php_admin_values`](#php_admin_values)
-* [`php_admin_flags`](#php_admin_flags)
-* [`port`](#port)
-* [`priority`](#priority)
-* [`protocols`](#protocols)
-* [`protocols_honor_order`](#protocols_honor_order)
-* [`proxy_dest`](#proxy_dest)
-* [`proxy_pass`](#proxy_pass)
-* [`proxy_dest_match`](#proxy_dest_match)
-* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
-* [`proxy_pass_match`](#proxy_pass_match)
-* [`redirect_dest`](#redirect_dest)
-* [`redirect_source`](#redirect_source)
-* [`redirect_status`](#redirect_status)
-* [`redirectmatch_regexp`](#redirectmatch_regexp)
-* [`redirectmatch_status`](#redirectmatch_status)
-* [`redirectmatch_dest`](#redirectmatch_dest)
-* [`request_headers`](#request_headers)
-* [`rewrites`](#rewrites)
-* [`rewrite_base`](#rewrite_base)
-* [`rewrite_rule`](#rewrite_rule)
-* [`rewrite_cond`](#rewrite_cond)
-* [`rewrite_inherit`](#rewrite_inherit)
-* [`scriptalias`](#scriptalias)
-* [`scriptaliases`](#scriptaliases)
-* [`serveradmin`](#serveradmin)
-* [`serveraliases`](#serveraliases)
-* [`servername`](#servername)
-* [`setenv`](#setenv)
-* [`setenvif`](#setenvif)
-* [`setenvifnocase`](#setenvifnocase)
-* [`suexec_user_group`](#suexec_user_group)
-* [`vhost_name`](#vhost_name)
-* [`virtual_docroot`](#virtual_docroot)
-* [`virtual_use_default_docroot`](#virtual_use_default_docroot)
-* [`wsgi_daemon_process`](#wsgi_daemon_process)
-* [`wsgi_daemon_process_options`](#wsgi_daemon_process_options)
-* [`wsgi_application_group`](#wsgi_application_group)
-* [`wsgi_import_script`](#wsgi_import_script)
-* [`wsgi_import_script_options`](#wsgi_import_script_options)
-* [`wsgi_chunked_request`](#wsgi_chunked_request)
-* [`wsgi_process_group`](#wsgi_process_group)
-* [`wsgi_script_aliases`](#wsgi_script_aliases)
-* [`wsgi_script_aliases_match`](#wsgi_script_aliases_match)
-* [`wsgi_pass_authorization`](#wsgi_pass_authorization)
-* [`directories`](#directories)
-* [`custom_fragment`](#custom_fragment)
-* [`headers`](#headers)
-* [`shib_compat_valid_user`](#shib_compat_valid_user)
-* [`ssl_options`](#ssl_options)
-* [`additional_includes`](#additional_includes)
-* [`gssapi`](#gssapi)
-* [`ssl`](#ssl)
-* [`ssl_ca`](#ssl_ca)
-* [`ssl_cert`](#ssl_cert)
-* [`ssl_protocol`](#ssl_protocol)
-* [`ssl_cipher`](#ssl_cipher)
-* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
-* [`ssl_certs_dir`](#ssl_certs_dir)
-* [`ssl_chain`](#ssl_chain)
-* [`ssl_crl`](#ssl_crl)
-* [`ssl_crl_path`](#ssl_crl_path)
-* [`ssl_crl_check`](#ssl_crl_check)
-* [`ssl_key`](#ssl_key)
-* [`ssl_verify_client`](#ssl_verify_client)
-* [`ssl_verify_depth`](#ssl_verify_depth)
-* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
-* [`ssl_proxy_verify`](#ssl_proxy_verify)
-* [`ssl_proxy_verify_depth`](#ssl_proxy_verify_depth)
-* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
-* [`ssl_proxy_ca_cert`](#ssl_proxy_ca_cert)
-* [`ssl_proxy_machine_cert`](#ssl_proxy_machine_cert)
-* [`ssl_proxy_machine_cert_chain`](#ssl_proxy_machine_cert_chain)
-* [`ssl_proxy_check_peer_cn`](#ssl_proxy_check_peer_cn)
-* [`ssl_proxy_check_peer_name`](#ssl_proxy_check_peer_name)
-* [`ssl_proxy_check_peer_expire`](#ssl_proxy_check_peer_expire)
-* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
-* [`ssl_proxyengine`](#ssl_proxyengine)
-* [`ssl_stapling`](#ssl_stapling)
-* [`ssl_stapling_timeout`](#ssl_stapling_timeout)
-* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
-* [`ssl_user_name`](#ssl_user_name)
-* [`ssl_reload_on_change`](#ssl_reload_on_change)
-* [`use_canonical_name`](#use_canonical_name)
-* [`define`](#define)
-* [`auth_oidc`](#auth_oidc)
-* [`oidc_settings`](#oidc_settings)
-* [`limitreqfields`](#limitreqfields)
-* [`limitreqfieldsize`](#limitreqfieldsize)
-* [`limitreqline`](#limitreqline)
-* [`limitreqbody`](#limitreqbody)
-* [`use_servername_for_filenames`](#use_servername_for_filenames)
-* [`use_port_for_filenames`](#use_port_for_filenames)
-* [`mdomain`](#mdomain)
-* [`proxy_requests`](#proxy_requests)
-* [`userdir`](#userdir)
-
-##### <a name="apache_version"></a>`apache_version`
+* [`apache_version`](#-apache--vhost--apache_version)
+* [`access_log`](#-apache--vhost--access_log)
+* [`access_log_env_var`](#-apache--vhost--access_log_env_var)
+* [`access_log_file`](#-apache--vhost--access_log_file)
+* [`access_log_format`](#-apache--vhost--access_log_format)
+* [`access_log_pipe`](#-apache--vhost--access_log_pipe)
+* [`access_log_syslog`](#-apache--vhost--access_log_syslog)
+* [`access_logs`](#-apache--vhost--access_logs)
+* [`add_default_charset`](#-apache--vhost--add_default_charset)
+* [`add_listen`](#-apache--vhost--add_listen)
+* [`use_optional_includes`](#-apache--vhost--use_optional_includes)
+* [`aliases`](#-apache--vhost--aliases)
+* [`allow_encoded_slashes`](#-apache--vhost--allow_encoded_slashes)
+* [`block`](#-apache--vhost--block)
+* [`cas_attribute_prefix`](#-apache--vhost--cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#-apache--vhost--cas_attribute_delimiter)
+* [`cas_login_url`](#-apache--vhost--cas_login_url)
+* [`cas_root_proxied_as`](#-apache--vhost--cas_root_proxied_as)
+* [`cas_scrub_request_headers`](#-apache--vhost--cas_scrub_request_headers)
+* [`cas_sso_enabled`](#-apache--vhost--cas_sso_enabled)
+* [`cas_validate_saml`](#-apache--vhost--cas_validate_saml)
+* [`cas_validate_url`](#-apache--vhost--cas_validate_url)
+* [`cas_cookie_path`](#-apache--vhost--cas_cookie_path)
+* [`comment`](#-apache--vhost--comment)
+* [`default_vhost`](#-apache--vhost--default_vhost)
+* [`directoryindex`](#-apache--vhost--directoryindex)
+* [`docroot`](#-apache--vhost--docroot)
+* [`docroot_group`](#-apache--vhost--docroot_group)
+* [`docroot_owner`](#-apache--vhost--docroot_owner)
+* [`docroot_mode`](#-apache--vhost--docroot_mode)
+* [`manage_docroot`](#-apache--vhost--manage_docroot)
+* [`error_log`](#-apache--vhost--error_log)
+* [`error_log_file`](#-apache--vhost--error_log_file)
+* [`error_log_pipe`](#-apache--vhost--error_log_pipe)
+* [`error_log_syslog`](#-apache--vhost--error_log_syslog)
+* [`error_log_format`](#-apache--vhost--error_log_format)
+* [`error_documents`](#-apache--vhost--error_documents)
+* [`ensure`](#-apache--vhost--ensure)
+* [`fallbackresource`](#-apache--vhost--fallbackresource)
+* [`filters`](#-apache--vhost--filters)
+* [`h2_copy_files`](#-apache--vhost--h2_copy_files)
+* [`h2_direct`](#-apache--vhost--h2_direct)
+* [`h2_early_hints`](#-apache--vhost--h2_early_hints)
+* [`h2_max_session_streams`](#-apache--vhost--h2_max_session_streams)
+* [`h2_modern_tls_only`](#-apache--vhost--h2_modern_tls_only)
+* [`h2_push`](#-apache--vhost--h2_push)
+* [`h2_push_diary_size`](#-apache--vhost--h2_push_diary_size)
+* [`h2_push_priority`](#-apache--vhost--h2_push_priority)
+* [`h2_push_resource`](#-apache--vhost--h2_push_resource)
+* [`h2_serialize_headers`](#-apache--vhost--h2_serialize_headers)
+* [`h2_stream_max_mem_size`](#-apache--vhost--h2_stream_max_mem_size)
+* [`h2_tls_cool_down_secs`](#-apache--vhost--h2_tls_cool_down_secs)
+* [`h2_tls_warm_up_size`](#-apache--vhost--h2_tls_warm_up_size)
+* [`h2_upgrade`](#-apache--vhost--h2_upgrade)
+* [`h2_window_size`](#-apache--vhost--h2_window_size)
+* [`ip`](#-apache--vhost--ip)
+* [`ip_based`](#-apache--vhost--ip_based)
+* [`itk`](#-apache--vhost--itk)
+* [`action`](#-apache--vhost--action)
+* [`jk_mounts`](#-apache--vhost--jk_mounts)
+* [`http_protocol_options`](#-apache--vhost--http_protocol_options)
+* [`keepalive`](#-apache--vhost--keepalive)
+* [`keepalive_timeout`](#-apache--vhost--keepalive_timeout)
+* [`max_keepalive_requests`](#-apache--vhost--max_keepalive_requests)
+* [`auth_kerb`](#-apache--vhost--auth_kerb)
+* [`krb_method_negotiate`](#-apache--vhost--krb_method_negotiate)
+* [`krb_method_k5passwd`](#-apache--vhost--krb_method_k5passwd)
+* [`krb_authoritative`](#-apache--vhost--krb_authoritative)
+* [`krb_auth_realms`](#-apache--vhost--krb_auth_realms)
+* [`krb_5keytab`](#-apache--vhost--krb_5keytab)
+* [`krb_local_user_mapping`](#-apache--vhost--krb_local_user_mapping)
+* [`krb_verify_kdc`](#-apache--vhost--krb_verify_kdc)
+* [`krb_servicename`](#-apache--vhost--krb_servicename)
+* [`krb_save_credentials`](#-apache--vhost--krb_save_credentials)
+* [`logroot`](#-apache--vhost--logroot)
+* [`logroot_ensure`](#-apache--vhost--logroot_ensure)
+* [`logroot_mode`](#-apache--vhost--logroot_mode)
+* [`logroot_owner`](#-apache--vhost--logroot_owner)
+* [`logroot_group`](#-apache--vhost--logroot_group)
+* [`log_level`](#-apache--vhost--log_level)
+* [`modsec_body_limit`](#-apache--vhost--modsec_body_limit)
+* [`modsec_disable_vhost`](#-apache--vhost--modsec_disable_vhost)
+* [`modsec_disable_ids`](#-apache--vhost--modsec_disable_ids)
+* [`modsec_disable_ips`](#-apache--vhost--modsec_disable_ips)
+* [`modsec_disable_msgs`](#-apache--vhost--modsec_disable_msgs)
+* [`modsec_disable_tags`](#-apache--vhost--modsec_disable_tags)
+* [`modsec_audit_log_file`](#-apache--vhost--modsec_audit_log_file)
+* [`modsec_audit_log_pipe`](#-apache--vhost--modsec_audit_log_pipe)
+* [`modsec_audit_log`](#-apache--vhost--modsec_audit_log)
+* [`modsec_inbound_anomaly_threshold`](#-apache--vhost--modsec_inbound_anomaly_threshold)
+* [`modsec_outbound_anomaly_threshold`](#-apache--vhost--modsec_outbound_anomaly_threshold)
+* [`modsec_allowed_methods`](#-apache--vhost--modsec_allowed_methods)
+* [`no_proxy_uris`](#-apache--vhost--no_proxy_uris)
+* [`no_proxy_uris_match`](#-apache--vhost--no_proxy_uris_match)
+* [`proxy_preserve_host`](#-apache--vhost--proxy_preserve_host)
+* [`proxy_add_headers`](#-apache--vhost--proxy_add_headers)
+* [`proxy_error_override`](#-apache--vhost--proxy_error_override)
+* [`options`](#-apache--vhost--options)
+* [`override`](#-apache--vhost--override)
+* [`passenger_enabled`](#-apache--vhost--passenger_enabled)
+* [`passenger_base_uri`](#-apache--vhost--passenger_base_uri)
+* [`passenger_ruby`](#-apache--vhost--passenger_ruby)
+* [`passenger_python`](#-apache--vhost--passenger_python)
+* [`passenger_nodejs`](#-apache--vhost--passenger_nodejs)
+* [`passenger_meteor_app_settings`](#-apache--vhost--passenger_meteor_app_settings)
+* [`passenger_app_env`](#-apache--vhost--passenger_app_env)
+* [`passenger_app_root`](#-apache--vhost--passenger_app_root)
+* [`passenger_app_group_name`](#-apache--vhost--passenger_app_group_name)
+* [`passenger_app_start_command`](#-apache--vhost--passenger_app_start_command)
+* [`passenger_app_type`](#-apache--vhost--passenger_app_type)
+* [`passenger_startup_file`](#-apache--vhost--passenger_startup_file)
+* [`passenger_restart_dir`](#-apache--vhost--passenger_restart_dir)
+* [`passenger_spawn_method`](#-apache--vhost--passenger_spawn_method)
+* [`passenger_load_shell_envvars`](#-apache--vhost--passenger_load_shell_envvars)
+* [`passenger_preload_bundler`](#-apache--vhost--passenger_preload_bundler)
+* [`passenger_rolling_restarts`](#-apache--vhost--passenger_rolling_restarts)
+* [`passenger_resist_deployment_errors`](#-apache--vhost--passenger_resist_deployment_errors)
+* [`passenger_user`](#-apache--vhost--passenger_user)
+* [`passenger_group`](#-apache--vhost--passenger_group)
+* [`passenger_friendly_error_pages`](#-apache--vhost--passenger_friendly_error_pages)
+* [`passenger_min_instances`](#-apache--vhost--passenger_min_instances)
+* [`passenger_max_instances`](#-apache--vhost--passenger_max_instances)
+* [`passenger_max_preloader_idle_time`](#-apache--vhost--passenger_max_preloader_idle_time)
+* [`passenger_force_max_concurrent_requests_per_process`](#-apache--vhost--passenger_force_max_concurrent_requests_per_process)
+* [`passenger_start_timeout`](#-apache--vhost--passenger_start_timeout)
+* [`passenger_concurrency_model`](#-apache--vhost--passenger_concurrency_model)
+* [`passenger_thread_count`](#-apache--vhost--passenger_thread_count)
+* [`passenger_max_requests`](#-apache--vhost--passenger_max_requests)
+* [`passenger_max_request_time`](#-apache--vhost--passenger_max_request_time)
+* [`passenger_memory_limit`](#-apache--vhost--passenger_memory_limit)
+* [`passenger_stat_throttle_rate`](#-apache--vhost--passenger_stat_throttle_rate)
+* [`passenger_pre_start`](#-apache--vhost--passenger_pre_start)
+* [`passenger_high_performance`](#-apache--vhost--passenger_high_performance)
+* [`passenger_buffer_upload`](#-apache--vhost--passenger_buffer_upload)
+* [`passenger_buffer_response`](#-apache--vhost--passenger_buffer_response)
+* [`passenger_error_override`](#-apache--vhost--passenger_error_override)
+* [`passenger_max_request_queue_size`](#-apache--vhost--passenger_max_request_queue_size)
+* [`passenger_max_request_queue_time`](#-apache--vhost--passenger_max_request_queue_time)
+* [`passenger_sticky_sessions`](#-apache--vhost--passenger_sticky_sessions)
+* [`passenger_sticky_sessions_cookie_name`](#-apache--vhost--passenger_sticky_sessions_cookie_name)
+* [`passenger_sticky_sessions_cookie_attributes`](#-apache--vhost--passenger_sticky_sessions_cookie_attributes)
+* [`passenger_allow_encoded_slashes`](#-apache--vhost--passenger_allow_encoded_slashes)
+* [`passenger_app_log_file`](#-apache--vhost--passenger_app_log_file)
+* [`passenger_debugger`](#-apache--vhost--passenger_debugger)
+* [`passenger_lve_min_uid`](#-apache--vhost--passenger_lve_min_uid)
+* [`php_values`](#-apache--vhost--php_values)
+* [`php_flags`](#-apache--vhost--php_flags)
+* [`php_admin_values`](#-apache--vhost--php_admin_values)
+* [`php_admin_flags`](#-apache--vhost--php_admin_flags)
+* [`port`](#-apache--vhost--port)
+* [`priority`](#-apache--vhost--priority)
+* [`protocols`](#-apache--vhost--protocols)
+* [`protocols_honor_order`](#-apache--vhost--protocols_honor_order)
+* [`proxy_dest`](#-apache--vhost--proxy_dest)
+* [`proxy_pass`](#-apache--vhost--proxy_pass)
+* [`proxy_dest_match`](#-apache--vhost--proxy_dest_match)
+* [`proxy_dest_reverse_match`](#-apache--vhost--proxy_dest_reverse_match)
+* [`proxy_pass_match`](#-apache--vhost--proxy_pass_match)
+* [`redirect_dest`](#-apache--vhost--redirect_dest)
+* [`redirect_source`](#-apache--vhost--redirect_source)
+* [`redirect_status`](#-apache--vhost--redirect_status)
+* [`redirectmatch_regexp`](#-apache--vhost--redirectmatch_regexp)
+* [`redirectmatch_status`](#-apache--vhost--redirectmatch_status)
+* [`redirectmatch_dest`](#-apache--vhost--redirectmatch_dest)
+* [`request_headers`](#-apache--vhost--request_headers)
+* [`rewrites`](#-apache--vhost--rewrites)
+* [`rewrite_base`](#-apache--vhost--rewrite_base)
+* [`rewrite_rule`](#-apache--vhost--rewrite_rule)
+* [`rewrite_cond`](#-apache--vhost--rewrite_cond)
+* [`rewrite_inherit`](#-apache--vhost--rewrite_inherit)
+* [`scriptalias`](#-apache--vhost--scriptalias)
+* [`scriptaliases`](#-apache--vhost--scriptaliases)
+* [`serveradmin`](#-apache--vhost--serveradmin)
+* [`serveraliases`](#-apache--vhost--serveraliases)
+* [`servername`](#-apache--vhost--servername)
+* [`setenv`](#-apache--vhost--setenv)
+* [`setenvif`](#-apache--vhost--setenvif)
+* [`setenvifnocase`](#-apache--vhost--setenvifnocase)
+* [`suexec_user_group`](#-apache--vhost--suexec_user_group)
+* [`vhost_name`](#-apache--vhost--vhost_name)
+* [`virtual_docroot`](#-apache--vhost--virtual_docroot)
+* [`virtual_use_default_docroot`](#-apache--vhost--virtual_use_default_docroot)
+* [`wsgi_daemon_process`](#-apache--vhost--wsgi_daemon_process)
+* [`wsgi_daemon_process_options`](#-apache--vhost--wsgi_daemon_process_options)
+* [`wsgi_application_group`](#-apache--vhost--wsgi_application_group)
+* [`wsgi_import_script`](#-apache--vhost--wsgi_import_script)
+* [`wsgi_import_script_options`](#-apache--vhost--wsgi_import_script_options)
+* [`wsgi_chunked_request`](#-apache--vhost--wsgi_chunked_request)
+* [`wsgi_process_group`](#-apache--vhost--wsgi_process_group)
+* [`wsgi_script_aliases`](#-apache--vhost--wsgi_script_aliases)
+* [`wsgi_script_aliases_match`](#-apache--vhost--wsgi_script_aliases_match)
+* [`wsgi_pass_authorization`](#-apache--vhost--wsgi_pass_authorization)
+* [`directories`](#-apache--vhost--directories)
+* [`custom_fragment`](#-apache--vhost--custom_fragment)
+* [`headers`](#-apache--vhost--headers)
+* [`shib_compat_valid_user`](#-apache--vhost--shib_compat_valid_user)
+* [`ssl_options`](#-apache--vhost--ssl_options)
+* [`additional_includes`](#-apache--vhost--additional_includes)
+* [`gssapi`](#-apache--vhost--gssapi)
+* [`ssl`](#-apache--vhost--ssl)
+* [`ssl_ca`](#-apache--vhost--ssl_ca)
+* [`ssl_cert`](#-apache--vhost--ssl_cert)
+* [`ssl_protocol`](#-apache--vhost--ssl_protocol)
+* [`ssl_cipher`](#-apache--vhost--ssl_cipher)
+* [`ssl_honorcipherorder`](#-apache--vhost--ssl_honorcipherorder)
+* [`ssl_certs_dir`](#-apache--vhost--ssl_certs_dir)
+* [`ssl_chain`](#-apache--vhost--ssl_chain)
+* [`ssl_crl`](#-apache--vhost--ssl_crl)
+* [`ssl_crl_path`](#-apache--vhost--ssl_crl_path)
+* [`ssl_crl_check`](#-apache--vhost--ssl_crl_check)
+* [`ssl_key`](#-apache--vhost--ssl_key)
+* [`ssl_verify_client`](#-apache--vhost--ssl_verify_client)
+* [`ssl_verify_depth`](#-apache--vhost--ssl_verify_depth)
+* [`ssl_proxy_protocol`](#-apache--vhost--ssl_proxy_protocol)
+* [`ssl_proxy_verify`](#-apache--vhost--ssl_proxy_verify)
+* [`ssl_proxy_verify_depth`](#-apache--vhost--ssl_proxy_verify_depth)
+* [`ssl_proxy_cipher_suite`](#-apache--vhost--ssl_proxy_cipher_suite)
+* [`ssl_proxy_ca_cert`](#-apache--vhost--ssl_proxy_ca_cert)
+* [`ssl_proxy_machine_cert`](#-apache--vhost--ssl_proxy_machine_cert)
+* [`ssl_proxy_machine_cert_chain`](#-apache--vhost--ssl_proxy_machine_cert_chain)
+* [`ssl_proxy_check_peer_cn`](#-apache--vhost--ssl_proxy_check_peer_cn)
+* [`ssl_proxy_check_peer_name`](#-apache--vhost--ssl_proxy_check_peer_name)
+* [`ssl_proxy_check_peer_expire`](#-apache--vhost--ssl_proxy_check_peer_expire)
+* [`ssl_openssl_conf_cmd`](#-apache--vhost--ssl_openssl_conf_cmd)
+* [`ssl_proxyengine`](#-apache--vhost--ssl_proxyengine)
+* [`ssl_stapling`](#-apache--vhost--ssl_stapling)
+* [`ssl_stapling_timeout`](#-apache--vhost--ssl_stapling_timeout)
+* [`ssl_stapling_return_errors`](#-apache--vhost--ssl_stapling_return_errors)
+* [`ssl_user_name`](#-apache--vhost--ssl_user_name)
+* [`ssl_reload_on_change`](#-apache--vhost--ssl_reload_on_change)
+* [`use_canonical_name`](#-apache--vhost--use_canonical_name)
+* [`define`](#-apache--vhost--define)
+* [`auth_oidc`](#-apache--vhost--auth_oidc)
+* [`oidc_settings`](#-apache--vhost--oidc_settings)
+* [`limitreqfields`](#-apache--vhost--limitreqfields)
+* [`limitreqfieldsize`](#-apache--vhost--limitreqfieldsize)
+* [`limitreqline`](#-apache--vhost--limitreqline)
+* [`limitreqbody`](#-apache--vhost--limitreqbody)
+* [`use_servername_for_filenames`](#-apache--vhost--use_servername_for_filenames)
+* [`use_port_for_filenames`](#-apache--vhost--use_port_for_filenames)
+* [`mdomain`](#-apache--vhost--mdomain)
+* [`proxy_requests`](#-apache--vhost--proxy_requests)
+* [`userdir`](#-apache--vhost--userdir)
+
+##### <a name="-apache--vhost--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -8110,23 +8135,23 @@ Apache's version number as a string, such as '2.2' or '2.4'.
 
 Default value: `$apache::apache_version`
 
-##### <a name="access_log"></a>`access_log`
+##### <a name="-apache--vhost--access_log"></a>`access_log`
 
 Data type: `Boolean`
 
 Determines whether to configure `*_access.log` directives (`*_file`, `*_pipe`, or `*_syslog`).
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="access_log_env_var"></a>`access_log_env_var`
+##### <a name="-apache--vhost--access_log_env_var"></a>`access_log_env_var`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
 Specifies that only requests with particular environment variables be logged.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_log_file"></a>`access_log_file`
+##### <a name="-apache--vhost--access_log_file"></a>`access_log_file`
 
 Data type: `Optional[String[1]]`
 
@@ -8135,52 +8160,52 @@ instance, example.com--- it defaults to 'example.com_ssl.log' for
 [SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
 `example.com_access.log` for unencrypted virtual hosts.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_log_format"></a>`access_log_format`
+##### <a name="-apache--vhost--access_log_format"></a>`access_log_format`
 
 Data type: `Optional[String[1]]`
 
 Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the
 access log.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_log_pipe"></a>`access_log_pipe`
+##### <a name="-apache--vhost--access_log_pipe"></a>`access_log_pipe`
 
 Data type: `Optional[String[1]]`
 
 Specifies a pipe where Apache sends access log messages.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_log_syslog"></a>`access_log_syslog`
+##### <a name="-apache--vhost--access_log_syslog"></a>`access_log_syslog`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
 Sends all access log messages to syslog.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_logs"></a>`access_logs`
+##### <a name="-apache--vhost--access_logs"></a>`access_logs`
 
 Data type: `Optional[Array[Hash]]`
 
 Allows you to give a hash that specifies the state of each of the `access_log_*`
 directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="add_default_charset"></a>`add_default_charset`
+##### <a name="-apache--vhost--add_default_charset"></a>`add_default_charset`
 
 Data type: `Optional[String]`
 
 Sets a default media charset value for the `AddDefaultCharset` directive, which is
 added to `text/plain` and `text/html` responses.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="add_listen"></a>`add_listen`
+##### <a name="-apache--vhost--add_listen"></a>`add_listen`
 
 Data type: `Boolean`
 
@@ -8189,9 +8214,9 @@ Setting `add_listen` to `false` prevents the virtual host from creating a `Liste
 statement. This is important when combining virtual hosts that aren't passed an `ip`
 parameter with those that are.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="use_optional_includes"></a>`use_optional_includes`
+##### <a name="-apache--vhost--use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Boolean`
 
@@ -8200,7 +8225,7 @@ Specifies whether Apache uses the `IncludeOptional` directive instead of `Includ
 
 Default value: `$apache::use_optional_includes`
 
-##### <a name="aliases"></a>`aliases`
+##### <a name="-apache--vhost--aliases"></a>`aliases`
 
 Data type: `Array[Hash[String[1], String[1]]]`
 
@@ -8243,7 +8268,7 @@ directive might not be able to honor the `PassengerEnabled => off` statement. Se
 
 Default value: `[]`
 
-##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
+##### <a name="-apache--vhost--allow_encoded_slashes"></a>`allow_encoded_slashes`
 
 Data type: `Optional[Enum['on', 'off', 'nodecode']]`
 
@@ -8252,9 +8277,9 @@ default. This modifies the virtual host responses to URLs with `\` and `/` chara
 default setting omits the declaration from the server configuration and selects the
 Apache default setting of `Off`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="block"></a>`block`
+##### <a name="-apache--vhost--block"></a>`block`
 
 Data type: `Variant[Array[String], String]`
 
@@ -8263,83 +8288,83 @@ blocks web access to `.svn`), `.git`, and `.bzr` directories.
 
 Default value: `[]`
 
-##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
+##### <a name="-apache--vhost--cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Optional[String]`
 
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
+##### <a name="-apache--vhost--cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Optional[String]`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_login_url"></a>`cas_login_url`
+##### <a name="-apache--vhost--cas_login_url"></a>`cas_login_url`
 
 Data type: `Optional[String]`
 
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
+##### <a name="-apache--vhost--cas_root_proxied_as"></a>`cas_root_proxied_as`
 
 Data type: `Optional[String]`
 
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
+##### <a name="-apache--vhost--cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
 Data type: `Boolean`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
+##### <a name="-apache--vhost--cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Boolean`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="cas_validate_saml"></a>`cas_validate_saml`
+##### <a name="-apache--vhost--cas_validate_saml"></a>`cas_validate_saml`
 
 Data type: `Boolean`
 
 Parse response from CAS server for SAML.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="cas_validate_url"></a>`cas_validate_url`
+##### <a name="-apache--vhost--cas_validate_url"></a>`cas_validate_url`
 
 Data type: `Optional[String]`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cookie_path"></a>`cas_cookie_path`
+##### <a name="-apache--vhost--cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `Optional[String]`
 
 Sets the location where information on the current session should be stored. This should
 be writable by the web server only.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="comment"></a>`comment`
+##### <a name="-apache--vhost--comment"></a>`comment`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
@@ -8356,18 +8381,18 @@ comment => [
 ]
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_vhost"></a>`default_vhost`
+##### <a name="-apache--vhost--default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
 
 Sets a given `apache::vhost` defined type as the default to serve requests that do not
 match any other `apache::vhost` defined types.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="directoryindex"></a>`directoryindex`
+##### <a name="-apache--vhost--directoryindex"></a>`directoryindex`
 
 Data type: `Optional[String]`
 
@@ -8375,9 +8400,9 @@ Sets the list of resources to look for when a client requests an index of the di
 by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive
 documentation for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="docroot"></a>`docroot`
+##### <a name="-apache--vhost--docroot"></a>`docroot`
 
 Data type: `Variant[Stdlib::Absolutepath, Boolean]`
 
@@ -8386,7 +8411,7 @@ Sets the `DocumentRoot` location, from which Apache serves files.<br />
 If `docroot` and `manage_docroot` are both set to `false`, no `DocumentRoot` will be set
 and the accompanying `<Directory /path/to/directory>` block will not be created.
 
-##### <a name="docroot_group"></a>`docroot_group`
+##### <a name="-apache--vhost--docroot_group"></a>`docroot_group`
 
 Data type: `String`
 
@@ -8394,7 +8419,7 @@ Sets group access to the `docroot` directory.
 
 Default value: `$apache::params::root_group`
 
-##### <a name="docroot_owner"></a>`docroot_owner`
+##### <a name="-apache--vhost--docroot_owner"></a>`docroot_owner`
 
 Data type: `String`
 
@@ -8402,31 +8427,31 @@ Sets individual user access to the `docroot` directory.
 
 Default value: `'root'`
 
-##### <a name="docroot_mode"></a>`docroot_mode`
+##### <a name="-apache--vhost--docroot_mode"></a>`docroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
 Sets access permissions for the `docroot` directory, in numeric notation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="manage_docroot"></a>`manage_docroot`
+##### <a name="-apache--vhost--manage_docroot"></a>`manage_docroot`
 
 Data type: `Boolean`
 
 Determines whether Puppet manages the `docroot` directory.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="error_log"></a>`error_log`
+##### <a name="-apache--vhost--error_log"></a>`error_log`
 
 Data type: `Boolean`
 
 Specifies whether `*_error.log` directives should be configured.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="error_log_file"></a>`error_log_file`
+##### <a name="-apache--vhost--error_log_file"></a>`error_log_file`
 
 Data type: `Optional[String]`
 
@@ -8436,9 +8461,9 @@ If none of these parameters is set, given a virtual host `example.com`, Puppet d
 to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and
 `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="error_log_pipe"></a>`error_log_pipe`
+##### <a name="-apache--vhost--error_log_pipe"></a>`error_log_pipe`
 
 Data type: `Optional[String]`
 
@@ -8446,9 +8471,9 @@ Specifies a pipe to send error log messages to.<br />
 This parameter has no effect if the `error_log_file` parameter has a value. If neither
 this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="error_log_syslog"></a>`error_log_syslog`
+##### <a name="-apache--vhost--error_log_syslog"></a>`error_log_syslog`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -8458,18 +8483,22 @@ parameters has a value. If none of these parameters has a value, given a virtual
 `example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual
 hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="error_log_format"></a>`error_log_format`
+##### <a name="-apache--vhost--error_log_format"></a>`error_log_format`
 
-Data type: `Optional[
+Data type:
+
+```puppet
+Optional[
     Array[
       Variant[
         String,
         Hash[String, Enum['connection', 'request']]
       ]
     ]
-  ]`
+  ]
+```
 
 Sets the [ErrorLogFormat](https://httpd.apache.org/docs/current/mod/core.html#errorlogformat)
 format specification for error log entries inside virtual host
@@ -8487,9 +8516,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="error_documents"></a>`error_documents`
+##### <a name="-apache--vhost--error_documents"></a>`error_documents`
 
 Data type: `Variant[Array[Hash], String]`
 
@@ -8508,7 +8537,7 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="ensure"></a>`ensure`
+##### <a name="-apache--vhost--ensure"></a>`ensure`
 
 Data type: `Enum['absent', 'present']`
 
@@ -8516,7 +8545,7 @@ Specifies if the virtual host is present or absent.<br />
 
 Default value: `'present'`
 
-##### <a name="fallbackresource"></a>`fallbackresource`
+##### <a name="-apache--vhost--fallbackresource"></a>`fallbackresource`
 
 Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
 
@@ -8525,9 +8554,9 @@ directive, which specifies an action to take for any URL that doesn't map to any
 your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin
 with a `/` or be `disabled`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="filters"></a>`filters`
+##### <a name="-apache--vhost--filters"></a>`filters`
 
 Data type: `Array[String[1]]`
 
@@ -8546,25 +8575,25 @@ apache::vhost { "$::fqdn":
 
 Default value: `[]`
 
-##### <a name="h2_copy_files"></a>`h2_copy_files`
+##### <a name="-apache--vhost--h2_copy_files"></a>`h2_copy_files`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
 directive which influences how the requestion process pass files to the main connection.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_direct"></a>`h2_direct`
+##### <a name="-apache--vhost--h2_direct"></a>`h2_direct`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
 directive which toggles the usage of the HTTP/2 Direct Mode.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_early_hints"></a>`h2_early_hints`
+##### <a name="-apache--vhost--h2_early_hints"></a>`h2_early_hints`
 
 Data type: `Optional[Boolean]`
 
@@ -8572,9 +8601,9 @@ Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html
 directive which controls if HTTP status 103 interim responses are forwarded to
 the client or not.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
+##### <a name="-apache--vhost--h2_max_session_streams"></a>`h2_max_session_streams`
 
 Data type: `Optional[Integer]`
 
@@ -8582,27 +8611,27 @@ Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_htt
 directive which sets the maximum number of active streams per HTTP/2 session
 that the server allows.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
+##### <a name="-apache--vhost--h2_modern_tls_only"></a>`h2_modern_tls_only`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
 directive which toggles the security checks on HTTP/2 connections in TLS mode.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push"></a>`h2_push`
+##### <a name="-apache--vhost--h2_push"></a>`h2_push`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
 directive which toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
+##### <a name="-apache--vhost--h2_push_diary_size"></a>`h2_push_diary_size`
 
 Data type: `Optional[Integer]`
 
@@ -8610,9 +8639,9 @@ Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.h
 directive which toggles the maximum number of HTTP/2 server pushes that are
 remembered per HTTP/2 connection.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push_priority"></a>`h2_push_priority`
+##### <a name="-apache--vhost--h2_push_priority"></a>`h2_push_priority`
 
 Data type: `Array[String]`
 
@@ -8622,7 +8651,7 @@ content-type of the response.
 
 Default value: `[]`
 
-##### <a name="h2_push_resource"></a>`h2_push_resource`
+##### <a name="-apache--vhost--h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
 
@@ -8631,7 +8660,7 @@ directive which declares resources for early pushing to the client.
 
 Default value: `[]`
 
-##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
+##### <a name="-apache--vhost--h2_serialize_headers"></a>`h2_serialize_headers`
 
 Data type: `Optional[Boolean]`
 
@@ -8639,9 +8668,9 @@ Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http
 directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
 format for processing by httpd core.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
+##### <a name="-apache--vhost--h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
 Data type: `Optional[Integer]`
 
@@ -8649,9 +8678,9 @@ Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http
 directive which sets the maximum number of outgoing data bytes buffered in
 memory for an active stream.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
+##### <a name="-apache--vhost--h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
 Data type: `Optional[Integer]`
 
@@ -8659,9 +8688,9 @@ Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2
 directive which sets the number of seconds of idle time on a TLS connection
 before the TLS write size falls back to a small (~1300 bytes) length.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
+##### <a name="-apache--vhost--h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
 Data type: `Optional[Integer]`
 
@@ -8669,9 +8698,9 @@ Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.h
 directive which sets the number of bytes to be sent in small TLS records (~1300
 bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_upgrade"></a>`h2_upgrade`
+##### <a name="-apache--vhost--h2_upgrade"></a>`h2_upgrade`
 
 Data type: `Optional[Boolean]`
 
@@ -8679,9 +8708,9 @@ Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2
 directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
 to HTTP/2.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_window_size"></a>`h2_window_size`
+##### <a name="-apache--vhost--h2_window_size"></a>`h2_window_size`
 
 Data type: `Optional[Integer]`
 
@@ -8689,23 +8718,27 @@ Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html
 directive which sets the size of the window that is used for flow control from
 client to server and limits the amount of data the server has to buffer.
 
-Default value: ``undef``
+Default value: `undef`
+
+##### <a name="-apache--vhost--ip"></a>`ip`
 
-##### <a name="ip"></a>`ip`
+Data type:
 
-Data type: `Optional[
+```puppet
+Optional[
     Variant[
       Array[Variant[Stdlib::IP::Address, Enum['*']]],
       Variant[Stdlib::IP::Address, Enum['*']]
     ]
-  ]`
+  ]
+```
 
 Sets the IP address the virtual host listens on. By default, uses Apache's default behavior
 of listening on all IPs.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ip_based"></a>`ip_based`
+##### <a name="-apache--vhost--ip_based"></a>`ip_based`
 
 Data type: `Boolean`
 
@@ -8713,9 +8746,9 @@ Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html
 host. This parameter inhibits the creation of a NameVirtualHost directive, since those are
 used to funnel requests to name-based virtual hosts.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="itk"></a>`itk`
+##### <a name="-apache--vhost--itk"></a>`itk`
 
 Data type: `Optional[Hash]`
 
@@ -8739,18 +8772,18 @@ Valid values are: a hash, which can include the keys:
 * `limituidrange` (Linux 3.5.0 or newer)
 * `limitgidrange` (Linux 3.5.0 or newer)
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="action"></a>`action`
+##### <a name="-apache--vhost--action"></a>`action`
 
 Data type: `Optional[String]`
 
 Specifies whether you wish to configure mod_actions action directive which will
 activate cgi-script when triggered by a request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="jk_mounts"></a>`jk_mounts`
+##### <a name="-apache--vhost--jk_mounts"></a>`jk_mounts`
 
 Data type: `Array[Hash]`
 
@@ -8770,15 +8803,15 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="http_protocol_options"></a>`http_protocol_options`
+##### <a name="-apache--vhost--http_protocol_options"></a>`http_protocol_options`
 
 Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
 
 Specifies the strictness of HTTP protocol checks.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="keepalive"></a>`keepalive`
+##### <a name="-apache--vhost--keepalive"></a>`keepalive`
 
 Data type: `Optional[Enum['on', 'off']]`
 
@@ -8787,9 +8820,9 @@ for the virtual host. By default, the global, server-wide `KeepAlive` setting is
 Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options
 for the virtual host.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="keepalive_timeout"></a>`keepalive_timeout`
+##### <a name="-apache--vhost--keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Optional[Variant[Integer, String]]`
 
@@ -8799,9 +8832,9 @@ global, server-wide `KeepAlive` setting is in effect.<br />
 This parameter is only relevant if either the global, server-wide `keepalive` parameter or
 the per-vhost `keepalive` parameter is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
+##### <a name="-apache--vhost--max_keepalive_requests"></a>`max_keepalive_requests`
 
 Data type: `Optional[Variant[Integer, String]]`
 
@@ -8810,9 +8843,9 @@ the global, server-wide `KeepAlive` setting is in effect.<br />
 This parameter is only relevant if either the global, server-wide `keepalive` parameter or
 the per-vhost `keepalive` parameter is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="auth_kerb"></a>`auth_kerb`
+##### <a name="-apache--vhost--auth_kerb"></a>`auth_kerb`
 
 Data type: `Boolean`
 
@@ -8835,9 +8868,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="krb_method_negotiate"></a>`krb_method_negotiate`
+##### <a name="-apache--vhost--krb_method_negotiate"></a>`krb_method_negotiate`
 
 Data type: `Enum['on', 'off']`
 
@@ -8845,7 +8878,7 @@ Determines whether to use the Negotiate method.
 
 Default value: `'on'`
 
-##### <a name="krb_method_k5passwd"></a>`krb_method_k5passwd`
+##### <a name="-apache--vhost--krb_method_k5passwd"></a>`krb_method_k5passwd`
 
 Data type: `Enum['on', 'off']`
 
@@ -8853,7 +8886,7 @@ Determines whether to use password-based authentication for Kerberos v5.
 
 Default value: `'on'`
 
-##### <a name="krb_authoritative"></a>`krb_authoritative`
+##### <a name="-apache--vhost--krb_authoritative"></a>`krb_authoritative`
 
 Data type: `Enum['on', 'off']`
 
@@ -8861,7 +8894,7 @@ If set to `off`, authentication controls can be passed on to another module.
 
 Default value: `'on'`
 
-##### <a name="krb_auth_realms"></a>`krb_auth_realms`
+##### <a name="-apache--vhost--krb_auth_realms"></a>`krb_auth_realms`
 
 Data type: `Array[String]`
 
@@ -8869,23 +8902,23 @@ Specifies an array of Kerberos realms to use for authentication.
 
 Default value: `[]`
 
-##### <a name="krb_5keytab"></a>`krb_5keytab`
+##### <a name="-apache--vhost--krb_5keytab"></a>`krb_5keytab`
 
 Data type: `Optional[String]`
 
 Specifies the Kerberos v5 keytab file's location.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="krb_local_user_mapping"></a>`krb_local_user_mapping`
+##### <a name="-apache--vhost--krb_local_user_mapping"></a>`krb_local_user_mapping`
 
 Data type: `Optional[Enum['on', 'off']]`
 
 Strips @REALM from usernames for further use.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="krb_verify_kdc"></a>`krb_verify_kdc`
+##### <a name="-apache--vhost--krb_verify_kdc"></a>`krb_verify_kdc`
 
 Data type: `Enum['on', 'off']`
 
@@ -8894,7 +8927,7 @@ KDC spoofing attacks.
 
 Default value: `'on'`
 
-##### <a name="krb_servicename"></a>`krb_servicename`
+##### <a name="-apache--vhost--krb_servicename"></a>`krb_servicename`
 
 Data type: `String`
 
@@ -8903,7 +8936,7 @@ key of this name must be stored in the keytab.
 
 Default value: `'HTTP'`
 
-##### <a name="krb_save_credentials"></a>`krb_save_credentials`
+##### <a name="-apache--vhost--krb_save_credentials"></a>`krb_save_credentials`
 
 Data type: `Enum['on', 'off']`
 
@@ -8911,7 +8944,7 @@ This option enables credential saving functionality.
 
 Default value: `'off'`
 
-##### <a name="logroot"></a>`logroot`
+##### <a name="-apache--vhost--logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -8919,7 +8952,7 @@ Specifies the location of the virtual host's logfiles.
 
 Default value: `$apache::logroot`
 
-##### <a name="logroot_ensure"></a>`logroot_ensure`
+##### <a name="-apache--vhost--logroot_ensure"></a>`logroot_ensure`
 
 Data type: `Enum['directory', 'absent']`
 
@@ -8927,7 +8960,7 @@ Determines whether or not to remove the logroot directory for a virtual host.
 
 Default value: `'directory'`
 
-##### <a name="logroot_mode"></a>`logroot_mode`
+##### <a name="-apache--vhost--logroot_mode"></a>`logroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
@@ -8935,49 +8968,49 @@ Overrides the mode the logroot directory is set to. Do *not* grant write access
 directory the logs are stored in without being aware of the consequences; for more
 information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="logroot_owner"></a>`logroot_owner`
+##### <a name="-apache--vhost--logroot_owner"></a>`logroot_owner`
 
 Data type: `Optional[String]`
 
 Sets individual user access to the logroot directory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="logroot_group"></a>`logroot_group`
+##### <a name="-apache--vhost--logroot_group"></a>`logroot_group`
 
 Data type: `Optional[String]`
 
 Sets group access to the `logroot` directory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="log_level"></a>`log_level`
+##### <a name="-apache--vhost--log_level"></a>`log_level`
 
 Data type: `Optional[Apache::LogLevel]`
 
 Specifies the verbosity of the error log.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_body_limit"></a>`modsec_body_limit`
+##### <a name="-apache--vhost--modsec_body_limit"></a>`modsec_body_limit`
 
 Data type: `Optional[String]`
 
 Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_disable_vhost"></a>`modsec_disable_vhost`
+##### <a name="-apache--vhost--modsec_disable_vhost"></a>`modsec_disable_vhost`
 
 Data type: `Boolean`
 
 Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="modsec_disable_ids"></a>`modsec_disable_ids`
+##### <a name="-apache--vhost--modsec_disable_ids"></a>`modsec_disable_ids`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8995,9 +9028,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_disable_ips"></a>`modsec_disable_ips`
+##### <a name="-apache--vhost--modsec_disable_ips"></a>`modsec_disable_ips`
 
 Data type: `Array[String[1]]`
 
@@ -9005,7 +9038,7 @@ Specifies an array of IP addresses to exclude from `mod_security` rule matching.
 
 Default value: `[]`
 
-##### <a name="modsec_disable_msgs"></a>`modsec_disable_msgs`
+##### <a name="-apache--vhost--modsec_disable_msgs"></a>`modsec_disable_msgs`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -9022,9 +9055,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_disable_tags"></a>`modsec_disable_tags`
+##### <a name="-apache--vhost--modsec_disable_tags"></a>`modsec_disable_tags`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -9041,9 +9074,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_audit_log_file"></a>`modsec_audit_log_file`
+##### <a name="-apache--vhost--modsec_audit_log_file"></a>`modsec_audit_log_file`
 
 Data type: `Optional[String]`
 
@@ -9053,9 +9086,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
+##### <a name="-apache--vhost--modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
 
 Data type: `Optional[String]`
 
@@ -9066,9 +9099,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_audit_log"></a>`modsec_audit_log`
+##### <a name="-apache--vhost--modsec_audit_log"></a>`modsec_audit_log`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -9080,9 +9113,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_inbound_anomaly_threshold"></a>`modsec_inbound_anomaly_threshold`
+##### <a name="-apache--vhost--modsec_inbound_anomaly_threshold"></a>`modsec_inbound_anomaly_threshold`
 
 Data type: `Optional[Integer[1, default]]`
 
@@ -9090,9 +9123,9 @@ Override the global scoring threshold level of the inbound blocking rules
 for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
 Set.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_outbound_anomaly_threshold"></a>`modsec_outbound_anomaly_threshold`
+##### <a name="-apache--vhost--modsec_outbound_anomaly_threshold"></a>`modsec_outbound_anomaly_threshold`
 
 Data type: `Optional[Integer[1, default]]`
 
@@ -9100,17 +9133,17 @@ Override the global scoring threshold level of the outbound blocking rules
 for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
 Set.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_allowed_methods"></a>`modsec_allowed_methods`
+##### <a name="-apache--vhost--modsec_allowed_methods"></a>`modsec_allowed_methods`
 
 Data type: `Optional[String]`
 
 Override global allowed methods. A space-separated list of allowed HTTP methods.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="-apache--vhost--no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9119,7 +9152,7 @@ with [`proxy_dest`](#proxy_dest).
 
 Default value: `[]`
 
-##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="-apache--vhost--no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9127,7 +9160,7 @@ This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
 Default value: `[]`
 
-##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
+##### <a name="-apache--vhost--proxy_preserve_host"></a>`proxy_preserve_host`
 
 Data type: `Boolean`
 
@@ -9135,9 +9168,9 @@ Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod
 Setting this parameter to `true` enables the `Host:` line from an incoming request to be
 proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="proxy_add_headers"></a>`proxy_add_headers`
+##### <a name="-apache--vhost--proxy_add_headers"></a>`proxy_add_headers`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -9145,18 +9178,18 @@ Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/m
 This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For,
 X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_error_override"></a>`proxy_error_override`
+##### <a name="-apache--vhost--proxy_error_override"></a>`proxy_error_override`
 
 Data type: `Boolean`
 
 Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride).
 This directive controls whether Apache should override error pages for proxied content.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--vhost--options"></a>`options`
 
 Data type: `Array[String]`
 
@@ -9172,7 +9205,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `['Indexes', 'FollowSymLinks', 'MultiViews']`
 
-##### <a name="override"></a>`override`
+##### <a name="-apache--vhost--override"></a>`override`
 
 Data type: `Array[String]`
 
@@ -9181,7 +9214,7 @@ Sets the overrides for the specified virtual host. Accepts an array of
 
 Default value: `['None']`
 
-##### <a name="passenger_enabled"></a>`passenger_enabled`
+##### <a name="-apache--vhost--passenger_enabled"></a>`passenger_enabled`
 
 Data type: `Optional[Boolean]`
 
@@ -9200,45 +9233,45 @@ apache::vhost { 'sample.example.net':
 > **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)
 using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_base_uri"></a>`passenger_base_uri`
+##### <a name="-apache--vhost--passenger_base_uri"></a>`passenger_base_uri`
 
 Data type: `Optional[String]`
 
 Sets [PassengerBaseURI](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbase_rui),
  to specify that the given URI is a distinct application served by Passenger.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_ruby"></a>`passenger_ruby`
+##### <a name="-apache--vhost--passenger_ruby"></a>`passenger_ruby`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerRuby](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerruby),
 specifying the Ruby interpreter to use when serving the relevant web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_python"></a>`passenger_python`
+##### <a name="-apache--vhost--passenger_python"></a>`passenger_python`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerPython](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpython),
 specifying the Python interpreter to use when serving the relevant web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_nodejs"></a>`passenger_nodejs`
+##### <a name="-apache--vhost--passenger_nodejs"></a>`passenger_nodejs`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengernodejs),
 specifying Node.js command to use when serving the relevant web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
+##### <a name="-apache--vhost--passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
 Data type: `Optional[String]`
 
@@ -9246,9 +9279,9 @@ Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/docs/referenc
 specifying a JSON file with settings for the application when using a Meteor
 application in non-bundled mode.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_env"></a>`passenger_app_env`
+##### <a name="-apache--vhost--passenger_app_env"></a>`passenger_app_env`
 
 Data type: `Optional[String]`
 
@@ -9256,126 +9289,126 @@ Sets [PassengerAppEnv](https://www.phusionpassenger.com/docs/references/config_r
 the environment for the Passenger application. If not specified, defaults to the global
 setting or 'production'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_root"></a>`passenger_app_root`
+##### <a name="-apache--vhost--passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerRoot](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapproot),
 the location of the Passenger application root if different from the DocumentRoot.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
+##### <a name="-apache--vhost--passenger_app_group_name"></a>`passenger_app_group_name`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppGroupName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappgroupname),
  the name of the application group that the current application should belong to.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_start_command"></a>`passenger_app_start_command`
+##### <a name="-apache--vhost--passenger_app_start_command"></a>`passenger_app_start_command`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppStartCommand](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappstartcommand),
  how Passenger should start your app on a specific port.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_type"></a>`passenger_app_type`
+##### <a name="-apache--vhost--passenger_app_type"></a>`passenger_app_type`
 
 Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
 Sets [PassengerAppType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapptype),
  to force Passenger to recognize the application as a specific type.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_startup_file"></a>`passenger_startup_file`
+##### <a name="-apache--vhost--passenger_startup_file"></a>`passenger_startup_file`
 
 Data type: `Optional[String]`
 
 Sets the [PassengerStartupFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstartupfile),
 path. This path is relative to the application root.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
+##### <a name="-apache--vhost--passenger_restart_dir"></a>`passenger_restart_dir`
 
 Data type: `Optional[String]`
 
 Sets the [PassengerRestartDir](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrestartdir),
  to customize the directory in which `restart.txt` is searched for.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
+##### <a name="-apache--vhost--passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['direct', 'smart']]`
 
 Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerspawnmethod),
 whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
+##### <a name="-apache--vhost--passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
 to enable or disable the loading of shell environment variables before spawning the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_preload_bundler"></a>`passenger_preload_bundler`
+##### <a name="-apache--vhost--passenger_preload_bundler"></a>`passenger_preload_bundler`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerPreloadBundler](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpreloadbundler),
 to enable or disable the loading of bundler before loading the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
+##### <a name="-apache--vhost--passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
 to enable or disable support for zero-downtime application restarts through `restart.txt`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
+##### <a name="-apache--vhost--passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerresistdeploymenterrors),
 to enable or disable resistance against deployment errors.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_user"></a>`passenger_user`
+##### <a name="-apache--vhost--passenger_user"></a>`passenger_user`
 
 Data type: `Optional[String]`
 
 Sets [PassengerUser](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeruser),
 the running user for sandboxing applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_group"></a>`passenger_group`
+##### <a name="-apache--vhost--passenger_group"></a>`passenger_group`
 
 Data type: `Optional[String]`
 
 Sets [PassengerGroup](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengergroup),
 the running group for sandboxing applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
+##### <a name="-apache--vhost--passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
 Data type: `Optional[Boolean]`
 
@@ -9384,54 +9417,54 @@ which can display friendly error pages whenever an application fails to start. T
 friendly error page presents the startup error message, some suggestions for solving
 the problem, a backtrace and a dump of the environment variables.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_min_instances"></a>`passenger_min_instances`
+##### <a name="-apache--vhost--passenger_min_instances"></a>`passenger_min_instances`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMinInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermininstances),
 the minimum number of application processes to run.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_instances"></a>`passenger_max_instances`
+##### <a name="-apache--vhost--passenger_max_instances"></a>`passenger_max_instances`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxinstances),
 the maximum number of application processes to run.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
+##### <a name="-apache--vhost--passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxpreloaderidletime),
 the maximum amount of time the preloader waits before shutting down an idle process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
+##### <a name="-apache--vhost--passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerforcemaxconcurrentrequestsperprocess),
 the maximum amount of concurrent requests the application can handle per process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
+##### <a name="-apache--vhost--passenger_start_timeout"></a>`passenger_start_timeout`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerStartTimeout](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstarttimeout),
 the timeout for the application startup.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
+##### <a name="-apache--vhost--passenger_concurrency_model"></a>`passenger_concurrency_model`
 
 Data type: `Optional[Enum['process', 'thread']]`
 
@@ -9441,9 +9474,9 @@ Passenger supports two concurrency models:<br />
 * `process` - single-threaded, multi-processed I/O concurrency.
 * `thread` - multi-threaded, multi-processed I/O concurrency.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_thread_count"></a>`passenger_thread_count`
+##### <a name="-apache--vhost--passenger_thread_count"></a>`passenger_thread_count`
 
 Data type: `Optional[Integer]`
 
@@ -9451,18 +9484,18 @@ Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/con
 the number of threads that Passenger should spawn per Ruby application process.<br />
 This option only has effect if PassengerConcurrencyModel is `thread`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_requests"></a>`passenger_max_requests`
+##### <a name="-apache--vhost--passenger_max_requests"></a>`passenger_max_requests`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxRequests](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequests),
 the maximum number of requests an application process will process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
+##### <a name="-apache--vhost--passenger_max_request_time"></a>`passenger_max_request_time`
 
 Data type: `Optional[Integer]`
 
@@ -9470,63 +9503,63 @@ Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/docs/references/
 the maximum amount of time, in seconds, that an application process may take to
 process a request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
+##### <a name="-apache--vhost--passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermemorylimit),
 the maximum amount of memory that an application process may use, in megabytes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
+##### <a name="-apache--vhost--passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstatthrottlerate),
 to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_pre_start"></a>`passenger_pre_start`
+##### <a name="-apache--vhost--passenger_pre_start"></a>`passenger_pre_start`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
 Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
 the URL of the application if pre-starting is required.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_high_performance"></a>`passenger_high_performance`
+##### <a name="-apache--vhost--passenger_high_performance"></a>`passenger_high_performance`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerHighPerformance](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerhighperformance),
 to enhance performance in return for reduced compatibility.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
+##### <a name="-apache--vhost--passenger_buffer_upload"></a>`passenger_buffer_upload`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerBufferUpload](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferupload),
 to buffer HTTP client request bodies before they are sent to the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
+##### <a name="-apache--vhost--passenger_buffer_response"></a>`passenger_buffer_response`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerBufferResponse](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferresponse),
 to buffer Happlication-generated responses.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_error_override"></a>`passenger_error_override`
+##### <a name="-apache--vhost--passenger_error_override"></a>`passenger_error_override`
 
 Data type: `Optional[Boolean]`
 
@@ -9534,9 +9567,9 @@ Sets [PassengerErrorOverride](https://www.phusionpassenger.com/docs/references/c
 to specify whether Apache will intercept and handle response with HTTP status codes of
 400 and higher.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
+##### <a name="-apache--vhost--passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
 Data type: `Optional[Integer]`
 
@@ -9546,9 +9579,9 @@ concurrent request limit is reached. If the queue is already at this specified l
 Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
 A value of 0 means that the queue size is unbounded.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
+##### <a name="-apache--vhost--passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
 
 Data type: `Optional[Integer]`
 
@@ -9558,9 +9591,9 @@ whenever the maximum concurrent request limit is reached. If a request reaches t
 limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
 A value of 0 means that the queue time is unbounded.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
+##### <a name="-apache--vhost--passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
 Data type: `Optional[Boolean]`
 
@@ -9568,27 +9601,27 @@ Sets [PassengerStickySessions](https://www.phusionpassenger.com/docs/references/
 to specify that, whenever possible, all requests sent by a client will be routed to the same
 originating application process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
+##### <a name="-apache--vhost--passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
 Data type: `Optional[String]`
 
 Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookiename),
 to specify the name of the sticky sessions cookie.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
+##### <a name="-apache--vhost--passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
 Sets [PassengerStickySessionsCookieAttributes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookieattributes),
 the attributes of the sticky sessions cookie.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
+##### <a name="-apache--vhost--passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
 Data type: `Optional[Boolean]`
 
@@ -9596,27 +9629,27 @@ Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/docs/refere
 to allow URLs with encoded slashes. Please note that this feature will not work properly
 unless Apache's `AllowEncodedSlashes` is also enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_log_file"></a>`passenger_app_log_file`
+##### <a name="-apache--vhost--passenger_app_log_file"></a>`passenger_app_log_file`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppLogFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapplogfile),
 app specific messages logged to a different file in addition to Passenger log file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_debugger"></a>`passenger_debugger`
+##### <a name="-apache--vhost--passenger_debugger"></a>`passenger_debugger`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerDebugger](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerdebugger),
 to turn support for Ruby application debugging on or off.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
+##### <a name="-apache--vhost--passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
@@ -9624,9 +9657,9 @@ Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/confi
 to only allow the spawning of application processes with UIDs equal to, or higher than, this
 specified value on LVE-enabled kernels.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="php_values"></a>`php_values`
+##### <a name="-apache--vhost--php_values"></a>`php_values`
 
 Data type: `Hash`
 
@@ -9639,7 +9672,7 @@ Within a vhost declaration:
 
 Default value: `{}`
 
-##### <a name="php_flags"></a>`php_flags`
+##### <a name="-apache--vhost--php_flags"></a>`php_flags`
 
 Data type: `Hash`
 
@@ -9648,7 +9681,7 @@ These flags or values can be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="php_admin_values"></a>`php_admin_values`
+##### <a name="-apache--vhost--php_admin_values"></a>`php_admin_values`
 
 Data type: `Variant[Array[String], Hash]`
 
@@ -9657,7 +9690,7 @@ These flags or values cannot be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="php_admin_flags"></a>`php_admin_flags`
+##### <a name="-apache--vhost--php_admin_flags"></a>`php_admin_flags`
 
 Data type: `Variant[Array[String], Hash]`
 
@@ -9666,7 +9699,7 @@ These flags or values cannot be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--vhost--port"></a>`port`
 
 Data type: `Optional[Variant[Array[Stdlib::Port], Stdlib::Port]]`
 
@@ -9674,9 +9707,9 @@ Sets the port the host is configured on. The module's defaults ensure the host l
 on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only
 listens on the port set in this parameter.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--vhost--priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
@@ -9688,9 +9721,9 @@ used if no other names match.<br />
 aware that the `default_vhost` parameter for `apache::vhost` passes a priority of 15.<br />
 To omit the priority prefix in file names, pass a priority of `false`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="protocols"></a>`protocols`
+##### <a name="-apache--vhost--protocols"></a>`protocols`
 
 Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
@@ -9699,24 +9732,24 @@ directive, which lists available protocols for the virutal host.
 
 Default value: `[]`
 
-##### <a name="protocols_honor_order"></a>`protocols_honor_order`
+##### <a name="-apache--vhost--protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
 Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
 directive which determines wether the order of Protocols sets precedence during negotiation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest"></a>`proxy_dest`
+##### <a name="-apache--vhost--proxy_dest"></a>`proxy_dest`
 
 Data type: `Optional[String]`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_pass"></a>`proxy_pass`
+##### <a name="-apache--vhost--proxy_pass"></a>`proxy_pass`
 
 Data type: `Optional[Variant[Array[Hash], Hash]]`
 
@@ -9749,9 +9782,9 @@ apache::vhost { 'site.name.fdqn':
 * `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
 * `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest_match"></a>`proxy_dest_match`
+##### <a name="-apache--vhost--proxy_dest_match"></a>`proxy_dest_match`
 
 Data type: `Optional[String]`
 
@@ -9759,9 +9792,9 @@ This directive is equivalent to `proxy_dest`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
+##### <a name="-apache--vhost--proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
 Data type: `Optional[String]`
 
@@ -9769,9 +9802,9 @@ Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
 [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_pass_match"></a>`proxy_pass_match`
+##### <a name="-apache--vhost--proxy_pass_match"></a>`proxy_pass_match`
 
 Data type: `Optional[Variant[Array[Hash], Hash]]`
 
@@ -9779,17 +9812,17 @@ This directive is equivalent to `proxy_pass`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirect_dest"></a>`redirect_dest`
+##### <a name="-apache--vhost--redirect_dest"></a>`redirect_dest`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies the address to redirect to.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirect_source"></a>`redirect_source`
+##### <a name="-apache--vhost--redirect_source"></a>`redirect_source`
 
 Data type: `Variant[String, Array[String]]`
 
@@ -9806,7 +9839,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `'/'`
 
-##### <a name="redirect_status"></a>`redirect_status`
+##### <a name="-apache--vhost--redirect_status"></a>`redirect_status`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9818,9 +9851,9 @@ Specifies the status to append to the redirect.
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirectmatch_regexp"></a>`redirectmatch_regexp`
+##### <a name="-apache--vhost--redirectmatch_regexp"></a>`redirectmatch_regexp`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9836,9 +9869,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirectmatch_status"></a>`redirectmatch_status`
+##### <a name="-apache--vhost--redirectmatch_status"></a>`redirectmatch_status`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9854,9 +9887,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirectmatch_dest"></a>`redirectmatch_dest`
+##### <a name="-apache--vhost--redirectmatch_dest"></a>`redirectmatch_dest`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9872,9 +9905,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="request_headers"></a>`request_headers`
+##### <a name="-apache--vhost--request_headers"></a>`request_headers`
 
 Data type: `Array[String[1]]`
 
@@ -9893,7 +9926,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `[]`
 
-##### <a name="rewrites"></a>`rewrites`
+##### <a name="-apache--vhost--rewrites"></a>`rewrites`
 
 Data type: `Array[Hash]`
 
@@ -9970,7 +10003,7 @@ than setting the rewrites in the virtual host's directories.
 
 Default value: `[]`
 
-##### <a name="rewrite_base"></a>`rewrite_base`
+##### <a name="-apache--vhost--rewrite_base"></a>`rewrite_base`
 
 Data type: `Optional[String[1]]`
 
@@ -9978,18 +10011,18 @@ The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rew
 specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
 that substitue a relative path.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rewrite_rule"></a>`rewrite_rule`
+##### <a name="-apache--vhost--rewrite_rule"></a>`rewrite_rule`
 
 Data type: `Optional[Variant[Array[String[1]], String[1]]]`
 
 The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
 allows the user to define the rules that will be used by the rewrite engine.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rewrite_cond"></a>`rewrite_cond`
+##### <a name="-apache--vhost--rewrite_cond"></a>`rewrite_cond`
 
 Data type: `Array[String[1]]`
 
@@ -9999,7 +10032,7 @@ rewrite engine.
 
 Default value: `[]`
 
-##### <a name="rewrite_inherit"></a>`rewrite_inherit`
+##### <a name="-apache--vhost--rewrite_inherit"></a>`rewrite_inherit`
 
 Data type: `Boolean`
 
@@ -10027,18 +10060,18 @@ RewriteOptions Inherit
 Refer to the official [`mod_rewrite`](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)
 documentation, section "Rewriting in Virtual Hosts".
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="scriptalias"></a>`scriptalias`
+##### <a name="-apache--vhost--scriptalias"></a>`scriptalias`
 
 Data type: `Optional[String]`
 
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
 '/usr/scripts'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="scriptaliases"></a>`scriptaliases`
+##### <a name="-apache--vhost--scriptaliases"></a>`scriptaliases`
 
 Data type: `Array[Hash]`
 
@@ -10071,15 +10104,15 @@ before more general ones to avoid shadowing.
 
 Default value: `[]`
 
-##### <a name="serveradmin"></a>`serveradmin`
+##### <a name="-apache--vhost--serveradmin"></a>`serveradmin`
 
 Data type: `Optional[String]`
 
 Specifies the email address Apache displays when it renders one of its error pages.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="serveraliases"></a>`serveraliases`
+##### <a name="-apache--vhost--serveraliases"></a>`serveraliases`
 
 Data type: `Variant[Array[String], String]`
 
@@ -10088,7 +10121,7 @@ of the site.
 
 Default value: `[]`
 
-##### <a name="servername"></a>`servername`
+##### <a name="-apache--vhost--servername"></a>`servername`
 
 Data type: `Optional[String]`
 
@@ -10096,7 +10129,7 @@ Sets the servername corresponding to the hostname you connect to the virtual hos
 
 Default value: `$name`
 
-##### <a name="setenv"></a>`setenv`
+##### <a name="-apache--vhost--setenv"></a>`setenv`
 
 Data type: `Variant[Array[String], String]`
 
@@ -10110,7 +10143,7 @@ apache::vhost { 'setenv.example.com':
 
 Default value: `[]`
 
-##### <a name="setenvif"></a>`setenvif`
+##### <a name="-apache--vhost--setenvif"></a>`setenvif`
 
 Data type: `Variant[Array[String], String]`
 
@@ -10118,7 +10151,7 @@ Used by HTTPD to conditionally set environment variables for virtual hosts.
 
 Default value: `[]`
 
-##### <a name="setenvifnocase"></a>`setenvifnocase`
+##### <a name="-apache--vhost--setenvifnocase"></a>`setenvifnocase`
 
 Data type: `Variant[Array[String], String]`
 
@@ -10126,16 +10159,16 @@ Used by HTTPD to conditionally set environment variables for virtual hosts (case
 
 Default value: `[]`
 
-##### <a name="suexec_user_group"></a>`suexec_user_group`
+##### <a name="-apache--vhost--suexec_user_group"></a>`suexec_user_group`
 
 Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 
 Allows the spcification of user and group execution privileges for CGI programs through
 inclusion of the `mod_suexec` module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="vhost_name"></a>`vhost_name`
+##### <a name="-apache--vhost--vhost_name"></a>`vhost_name`
 
 Data type: `String`
 
@@ -10146,7 +10179,7 @@ title of the resource.
 
 Default value: `'*'`
 
-##### <a name="virtual_docroot"></a>`virtual_docroot`
+##### <a name="-apache--vhost--virtual_docroot"></a>`virtual_docroot`
 
 Data type: `Variant[Stdlib::Absolutepath, Boolean]`
 
@@ -10164,9 +10197,9 @@ apache::vhost { 'subdomain.loc':
 }
 ```
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="virtual_use_default_docroot"></a>`virtual_use_default_docroot`
+##### <a name="-apache--vhost--virtual_use_default_docroot"></a>`virtual_use_default_docroot`
 
 Data type: `Boolean`
 
@@ -10183,9 +10216,9 @@ apache::vhost { 'subdomain.loc':
 }
 ```
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="wsgi_daemon_process"></a>`wsgi_daemon_process`
+##### <a name="-apache--vhost--wsgi_daemon_process"></a>`wsgi_daemon_process`
 
 Data type: `Optional[Variant[String, Hash]]`
 
@@ -10211,9 +10244,9 @@ apache::vhost { 'wsgi.example.com':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
+##### <a name="-apache--vhost--wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
 
 Data type: `Optional[Hash]`
 
@@ -10222,9 +10255,9 @@ wsgi_daemon_process, wsgi_process_group,
 wsgi_script_aliases and wsgi_pass_authorization.<br />
 Sets the group ID that the virtual host runs under.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_application_group"></a>`wsgi_application_group`
+##### <a name="-apache--vhost--wsgi_application_group"></a>`wsgi_application_group`
 
 Data type: `Optional[String]`
 
@@ -10236,9 +10269,9 @@ thus allowing you to specify which application group the WSGI application belong
 with all WSGI applications within the same group executing within the context of the
 same Python sub interpreter.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_import_script"></a>`wsgi_import_script`
+##### <a name="-apache--vhost--wsgi_import_script"></a>`wsgi_import_script`
 
 Data type: `Optional[String]`
 
@@ -10248,9 +10281,9 @@ and wsgi_pass_authorization.<br />
 This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
 which can be used in order to specify a script file to be loaded upon a process starting.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_import_script_options"></a>`wsgi_import_script_options`
+##### <a name="-apache--vhost--wsgi_import_script_options"></a>`wsgi_import_script_options`
 
 Data type: `Optional[Hash]`
 
@@ -10261,9 +10294,9 @@ This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readth
 which can be used in order to specify a script file to be loaded upon a process starting.<br />
 Specifies the process and aplication groups of the script.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_chunked_request"></a>`wsgi_chunked_request`
+##### <a name="-apache--vhost--wsgi_chunked_request"></a>`wsgi_chunked_request`
 
 Data type: `Optional[Enum['On', 'Off']]`
 
@@ -10275,9 +10308,9 @@ allowing you to enable support for chunked request content.<br />
 WSGI is technically incapable of supporting chunked request content without all chunked
 request content having first been read in and buffered.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_process_group"></a>`wsgi_process_group`
+##### <a name="-apache--vhost--wsgi_process_group"></a>`wsgi_process_group`
 
 Data type: `Optional[String]`
 
@@ -10286,9 +10319,9 @@ wsgi_daemon_process, wsgi_daemon_process_options,
 wsgi_script_aliases and wsgi_pass_authorization.<br />
 Requires a hash of web paths to filesystem `.wsgi paths/`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_script_aliases"></a>`wsgi_script_aliases`
+##### <a name="-apache--vhost--wsgi_script_aliases"></a>`wsgi_script_aliases`
 
 Data type: `Optional[Hash]`
 
@@ -10298,9 +10331,9 @@ and wsgi_pass_authorization.<br />
 Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
 For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
+##### <a name="-apache--vhost--wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
 
 Data type: `Optional[Hash]`
 
@@ -10312,9 +10345,9 @@ This directive is similar to `wsgi_script_aliases`, but makes use of regular exp
 in place of simple prefix matching.<br />
 For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_pass_authorization"></a>`wsgi_pass_authorization`
+##### <a name="-apache--vhost--wsgi_pass_authorization"></a>`wsgi_pass_authorization`
 
 Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
 
@@ -10323,9 +10356,9 @@ wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
 wsgi_script_aliases.<br />
 Enables support for chunked requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="directories"></a>`directories`
+##### <a name="-apache--vhost--directories"></a>`directories`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -10376,9 +10409,9 @@ apache::vhost { 'sample.example.net':
 Any handlers you do not set in these hashes are considered `undefined` within Puppet and
 are not added to the virtual host, resulting in the module using their default values.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="custom_fragment"></a>`custom_fragment`
+##### <a name="-apache--vhost--custom_fragment"></a>`custom_fragment`
 
 Data type: `Optional[String]`
 
@@ -10407,9 +10440,9 @@ ProxyStatus On',
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="headers"></a>`headers`
+##### <a name="-apache--vhost--headers"></a>`headers`
 
 Data type: `Array[String[1]]`
 
@@ -10428,7 +10461,7 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="shib_compat_valid_user"></a>`shib_compat_valid_user`
+##### <a name="-apache--vhost--shib_compat_valid_user"></a>`shib_compat_valid_user`
 
 Data type: `Optional[String]`
 
@@ -10439,9 +10472,9 @@ Apache behavior when processing the `valid-user` and `user` Require rules. See t
 and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess)
 topic for more details. This key is disabled if `apache::mod::shib` is not defined.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_options"></a>`ssl_options`
+##### <a name="-apache--vhost--ssl_options"></a>`ssl_options`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -10462,9 +10495,9 @@ apache::vhost { 'secure.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="additional_includes"></a>`additional_includes`
+##### <a name="-apache--vhost--additional_includes"></a>`additional_includes`
 
 Data type: `Variant[Array[String], String]`
 
@@ -10483,19 +10516,19 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="gssapi"></a>`gssapi`
+##### <a name="-apache--vhost--gssapi"></a>`gssapi`
 
 
 
-##### <a name="ssl"></a>`ssl`
+##### <a name="-apache--vhost--ssl"></a>`ssl`
 
 Data type: `Boolean`
 
 Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="ssl_ca"></a>`ssl_ca`
+##### <a name="-apache--vhost--ssl_ca"></a>`ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10504,7 +10537,7 @@ for authentication.
 
 Default value: `$apache::default_ssl_ca`
 
-##### <a name="ssl_cert"></a>`ssl_cert`
+##### <a name="-apache--vhost--ssl_cert"></a>`ssl_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10512,24 +10545,24 @@ Specifies the SSL certification.
 
 Default value: `$apache::default_ssl_cert`
 
-##### <a name="ssl_protocol"></a>`ssl_protocol`
+##### <a name="-apache--vhost--ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol).
 Expects an array or space separated string of accepted protocols.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_cipher"></a>`ssl_cipher`
+##### <a name="-apache--vhost--ssl_cipher"></a>`ssl_cipher`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
+##### <a name="-apache--vhost--ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
 Data type: `Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef]`
 
@@ -10537,9 +10570,9 @@ Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.htm
 to cause Apache to use the server's preferred order of ciphers rather than the client's
 preferred order.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_certs_dir"></a>`ssl_certs_dir`
+##### <a name="-apache--vhost--ssl_certs_dir"></a>`ssl_certs_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10547,7 +10580,7 @@ Specifies the location of the SSL certification directory to verify client certs
 
 Default value: `$apache::params::ssl_certs_dir`
 
-##### <a name="ssl_chain"></a>`ssl_chain`
+##### <a name="-apache--vhost--ssl_chain"></a>`ssl_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10557,7 +10590,7 @@ production.
 
 Default value: `$apache::default_ssl_chain`
 
-##### <a name="ssl_crl"></a>`ssl_crl`
+##### <a name="-apache--vhost--ssl_crl"></a>`ssl_crl`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10567,7 +10600,7 @@ before being used in production.)
 
 Default value: `$apache::default_ssl_crl`
 
-##### <a name="ssl_crl_path"></a>`ssl_crl_path`
+##### <a name="-apache--vhost--ssl_crl_path"></a>`ssl_crl_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10578,7 +10611,7 @@ production.)
 
 Default value: `$apache::default_ssl_crl_path`
 
-##### <a name="ssl_crl_check"></a>`ssl_crl_check`
+##### <a name="-apache--vhost--ssl_crl_check"></a>`ssl_crl_check`
 
 Data type: `Optional[String]`
 
@@ -10589,7 +10622,7 @@ older versions.
 
 Default value: `$apache::default_ssl_crl_check`
 
-##### <a name="ssl_key"></a>`ssl_key`
+##### <a name="-apache--vhost--ssl_key"></a>`ssl_key`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10600,7 +10633,7 @@ being used in production.
 
 Default value: `$apache::default_ssl_key`
 
-##### <a name="ssl_verify_client"></a>`ssl_verify_client`
+##### <a name="-apache--vhost--ssl_verify_client"></a>`ssl_verify_client`
 
 Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
@@ -10613,9 +10646,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_verify_depth"></a>`ssl_verify_depth`
+##### <a name="-apache--vhost--ssl_verify_depth"></a>`ssl_verify_depth`
 
 Data type: `Optional[Integer]`
 
@@ -10630,9 +10663,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
+##### <a name="-apache--vhost--ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Optional[String]`
 
@@ -10641,9 +10674,9 @@ directive, which controls which SSL protocol flavors `mod_ssl` should use when e
 its server environment for proxy. It connects to servers using only one of the provided
 protocols.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_verify"></a>`ssl_proxy_verify`
+##### <a name="-apache--vhost--ssl_proxy_verify"></a>`ssl_proxy_verify`
 
 Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
@@ -10651,9 +10684,9 @@ Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html
 directive, which configures certificate verification of the remote server when a proxy is
 configured to forward requests to a remote SSL server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
+##### <a name="-apache--vhost--ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
 
 Data type: `Optional[Integer[0]]`
 
@@ -10664,18 +10697,18 @@ A depth of 0 means that only self-signed remote server certificates are accepted
 the default depth of 1 means the remote server certificate can be self-signed or
 signed by a CA that is directly known to the server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
+##### <a name="-apache--vhost--ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
 Data type: `Optional[String]`
 
 Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)
 directive, which controls cipher suites supported for ssl proxy traffic.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
+##### <a name="-apache--vhost--ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10685,9 +10718,9 @@ of Certification Authorities (CA) whose remote servers you deal with. These are
 for Remote Server Authentication. This file should be a concatenation of the PEM-encoded
 certificate files in order of preference.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
+##### <a name="-apache--vhost--ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10702,9 +10735,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
+##### <a name="-apache--vhost--ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10716,9 +10749,9 @@ client certificates. This referenced file is simply the concatenation of the var
 PEM-encoded certificate files. Upon startup, each client certificate configured will be
 examined and a chain of trust will be constructed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
+##### <a name="-apache--vhost--ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
 
 Data type: `Optional[Enum['on', 'off']]`
 
@@ -10726,9 +10759,9 @@ Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl
 directive, which specifies whether the remote server certificate's CN field is compared
 against the hostname of the request URL.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
+##### <a name="-apache--vhost--ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
 
 Data type: `Optional[Enum['on', 'off']]`
 
@@ -10736,9 +10769,9 @@ Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_s
 directive, which specifies whether the remote server certificate's CN field is compared
 against the hostname of the request URL.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
+##### <a name="-apache--vhost--ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
 
 Data type: `Optional[Enum['on', 'off']]`
 
@@ -10746,26 +10779,26 @@ Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod
 directive, which specifies whether the remote server certificate is checked for expiration
 or not.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
+##### <a name="-apache--vhost--ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Optional[String]`
 
 Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)
 directive, which provides direct configuration of OpenSSL parameters.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxyengine"></a>`ssl_proxyengine`
+##### <a name="-apache--vhost--ssl_proxyengine"></a>`ssl_proxyengine`
 
 Data type: `Boolean`
 
 Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="ssl_stapling"></a>`ssl_stapling`
+##### <a name="-apache--vhost--ssl_stapling"></a>`ssl_stapling`
 
 Data type: `Optional[Boolean]`
 
@@ -10773,35 +10806,35 @@ Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/cu
 By default, uses what is set globally.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_stapling_timeout"></a>`ssl_stapling_timeout`
+##### <a name="-apache--vhost--ssl_stapling_timeout"></a>`ssl_stapling_timeout`
 
 Data type: `Optional[Integer]`
 
 Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
+##### <a name="-apache--vhost--ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Optional[Enum['on', 'off']]`
 
 Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_user_name"></a>`ssl_user_name`
+##### <a name="-apache--vhost--ssl_user_name"></a>`ssl_user_name`
 
 Data type: `Optional[String]`
 
 Sets the [SSLUserName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusername) directive.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_reload_on_change"></a>`ssl_reload_on_change`
+##### <a name="-apache--vhost--ssl_reload_on_change"></a>`ssl_reload_on_change`
 
 Data type: `Boolean`
 
@@ -10809,16 +10842,16 @@ Enable reloading of apache if the content of ssl files have changed.
 
 Default value: `$apache::default_ssl_reload_on_change`
 
-##### <a name="use_canonical_name"></a>`use_canonical_name`
+##### <a name="-apache--vhost--use_canonical_name"></a>`use_canonical_name`
 
 Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
 
 Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
 which allows you to configure how the server determines it's own name and port.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="define"></a>`define`
+##### <a name="-apache--vhost--define"></a>`define`
 
 Data type: `Hash`
 
@@ -10827,15 +10860,15 @@ these can then be used to replace configuration values. All Defines are Undefine
 
 Default value: `{}`
 
-##### <a name="auth_oidc"></a>`auth_oidc`
+##### <a name="-apache--vhost--auth_oidc"></a>`auth_oidc`
 
 Data type: `Boolean`
 
 Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="oidc_settings"></a>`oidc_settings`
+##### <a name="-apache--vhost--oidc_settings"></a>`oidc_settings`
 
 Data type: `Apache::OIDCSettings`
 
@@ -10843,7 +10876,7 @@ An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://gi
 
 Default value: `{}`
 
-##### <a name="limitreqfields"></a>`limitreqfields`
+##### <a name="-apache--vhost--limitreqfields"></a>`limitreqfields`
 
 Data type: `Optional[Integer]`
 
@@ -10853,18 +10886,18 @@ abnormal client request behavior, which may be useful for avoiding some forms of
 denial-of-service attacks. The value should be increased if normal clients see an error
 response from the server that indicates too many fields were sent in the request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
+##### <a name="-apache--vhost--limitreqfieldsize"></a>`limitreqfieldsize`
 
 Data type: `Optional[Integer]`
 
 The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 be allowed within a request header.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="limitreqline"></a>`limitreqline`
+##### <a name="-apache--vhost--limitreqline"></a>`limitreqline`
 
 Data type: `Optional[Integer]`
 
@@ -10878,9 +10911,9 @@ allowed for a request on the server. A server needs this value to be large
 enough to hold any of its resource names, including any information that might
 be passed in the query part of a GET request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="limitreqbody"></a>`limitreqbody`
+##### <a name="-apache--vhost--limitreqbody"></a>`limitreqbody`
 
 Data type: `Optional[Integer]`
 
@@ -10891,9 +10924,9 @@ directive is given (server, per-directory, per-file or per-location). If the
 client request exceeds that limit, the server will return an error response
 instead of servicing the request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="use_servername_for_filenames"></a>`use_servername_for_filenames`
+##### <a name="-apache--vhost--use_servername_for_filenames"></a>`use_servername_for_filenames`
 
 Data type: `Boolean`
 
@@ -10902,9 +10935,9 @@ value of the $servername parameter.
 When set to false (default), the existing behaviour of using the $name parameter
 will remain.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
+##### <a name="-apache--vhost--use_port_for_filenames"></a>`use_port_for_filenames`
 
 Data type: `Boolean`
 
@@ -10914,34 +10947,34 @@ $port parameters.
 When set to false (default), the port is not included in the file names and may lead to
 duplicate declarations if two virtual hosts use the same domain.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="mdomain"></a>`mdomain`
+##### <a name="-apache--vhost--mdomain"></a>`mdomain`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
 All the names in the list are managed as one Managed Domain (MD). mod_md will request
 one single certificate that is valid for all these names.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_requests"></a>`proxy_requests`
+##### <a name="-apache--vhost--proxy_requests"></a>`proxy_requests`
 
 Data type: `Boolean`
 
 Whether to accept proxy requests
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="userdir"></a>`userdir`
+##### <a name="-apache--vhost--userdir"></a>`userdir`
 
 Data type: `Optional[Variant[String[1], Array[String[1]]]]`
 
 Instances of apache::mod::userdir
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachevhostcustom"></a>`apache::vhost::custom`
+### <a name="apache--vhost--custom"></a>`apache::vhost::custom`
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
 
@@ -10949,18 +10982,18 @@ The `apache::vhost::custom` defined type is a thin wrapper around the `apache::c
 
 The following parameters are available in the `apache::vhost::custom` defined type:
 
-* [`content`](#content)
-* [`ensure`](#ensure)
-* [`priority`](#priority)
-* [`verify_config`](#verify_config)
+* [`content`](#-apache--vhost--custom--content)
+* [`ensure`](#-apache--vhost--custom--ensure)
+* [`priority`](#-apache--vhost--custom--priority)
+* [`verify_config`](#-apache--vhost--custom--verify_config)
 
-##### <a name="content"></a>`content`
+##### <a name="-apache--vhost--custom--content"></a>`content`
 
 Data type: `String`
 
 Sets the configuration file's content.
 
-##### <a name="ensure"></a>`ensure`
+##### <a name="-apache--vhost--custom--ensure"></a>`ensure`
 
 Data type: `String`
 
@@ -10968,7 +11001,7 @@ Specifies if the virtual host file is present or absent.
 
 Default value: `'present'`
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--vhost--custom--priority"></a>`priority`
 
 Data type: `Apache::Vhost::Priority`
 
@@ -10976,15 +11009,15 @@ Sets the relative load order for Apache HTTPD VirtualHost configuration files.
 
 Default value: `25`
 
-##### <a name="verify_config"></a>`verify_config`
+##### <a name="-apache--vhost--custom--verify_config"></a>`verify_config`
 
 Data type: `Boolean`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Default value: ``true``
+Default value: `true`
 
-### <a name="apachevhostfragment"></a>`apache::vhost::fragment`
+### <a name="apache--vhost--fragment"></a>`apache::vhost::fragment`
 
 Define a fragment within a vhost
 
@@ -11045,37 +11078,37 @@ apache::vhost::fragment { 'myfragment':
 
 The following parameters are available in the `apache::vhost::fragment` defined type:
 
-* [`vhost`](#vhost)
-* [`priority`](#priority)
-* [`content`](#content)
-* [`order`](#order)
-* [`port`](#port)
+* [`vhost`](#-apache--vhost--fragment--vhost)
+* [`priority`](#-apache--vhost--fragment--priority)
+* [`content`](#-apache--vhost--fragment--content)
+* [`order`](#-apache--vhost--fragment--order)
+* [`port`](#-apache--vhost--fragment--port)
 
-##### <a name="vhost"></a>`vhost`
+##### <a name="-apache--vhost--fragment--vhost"></a>`vhost`
 
 Data type: `String[1]`
 
 The title of the vhost resource to append to
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--vhost--fragment--priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
 Set the priority to match the one `apache::vhost` sets. This must match the
 one `apache::vhost` sets or else the concat fragment won't be found.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="content"></a>`content`
+##### <a name="-apache--vhost--fragment--content"></a>`content`
 
 Data type: `Optional[String]`
 
 The content to put in the fragment. Only when it's non-empty the actual
 fragment will be created.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="order"></a>`order`
+##### <a name="-apache--vhost--fragment--order"></a>`order`
 
 Data type: `Integer[0]`
 
@@ -11083,15 +11116,15 @@ The order to insert the fragment at
 
 Default value: `900`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--vhost--fragment--port"></a>`port`
 
 Data type: `Optional[Stdlib::Port]`
 
 The port to use
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachevhostproxy"></a>`apache::vhost::proxy`
+### <a name="apache--vhost--proxy"></a>`apache::vhost::proxy`
 
 Configure a reverse proxy for a vhost
 
@@ -11142,39 +11175,39 @@ apache::vhost::proxy { 'myvhost-proxy':
 
 The following parameters are available in the `apache::vhost::proxy` defined type:
 
-* [`vhost`](#vhost)
-* [`priority`](#priority)
-* [`order`](#order)
-* [`port`](#port)
-* [`proxy_dest`](#proxy_dest)
-* [`proxy_dest_match`](#proxy_dest_match)
-* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
-* [`no_proxy_uris`](#no_proxy_uris)
-* [`no_proxy_uris_match`](#no_proxy_uris_match)
-* [`proxy_pass`](#proxy_pass)
-* [`proxy_pass_match`](#proxy_pass_match)
-* [`proxy_requests`](#proxy_requests)
-* [`proxy_preserve_host`](#proxy_preserve_host)
-* [`proxy_add_headers`](#proxy_add_headers)
-* [`proxy_error_override`](#proxy_error_override)
-
-##### <a name="vhost"></a>`vhost`
+* [`vhost`](#-apache--vhost--proxy--vhost)
+* [`priority`](#-apache--vhost--proxy--priority)
+* [`order`](#-apache--vhost--proxy--order)
+* [`port`](#-apache--vhost--proxy--port)
+* [`proxy_dest`](#-apache--vhost--proxy--proxy_dest)
+* [`proxy_dest_match`](#-apache--vhost--proxy--proxy_dest_match)
+* [`proxy_dest_reverse_match`](#-apache--vhost--proxy--proxy_dest_reverse_match)
+* [`no_proxy_uris`](#-apache--vhost--proxy--no_proxy_uris)
+* [`no_proxy_uris_match`](#-apache--vhost--proxy--no_proxy_uris_match)
+* [`proxy_pass`](#-apache--vhost--proxy--proxy_pass)
+* [`proxy_pass_match`](#-apache--vhost--proxy--proxy_pass_match)
+* [`proxy_requests`](#-apache--vhost--proxy--proxy_requests)
+* [`proxy_preserve_host`](#-apache--vhost--proxy--proxy_preserve_host)
+* [`proxy_add_headers`](#-apache--vhost--proxy--proxy_add_headers)
+* [`proxy_error_override`](#-apache--vhost--proxy--proxy_error_override)
+
+##### <a name="-apache--vhost--proxy--vhost"></a>`vhost`
 
 Data type: `String[1]`
 
 The title of the vhost resource to which reverse proxy configuration will
 be appended.
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--vhost--proxy--priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
 Set the priority to match the one `apache::vhost` sets. This must match the
 one `apache::vhost` sets or else the vhost's `concat` resource won't be found.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="order"></a>`order`
+##### <a name="-apache--vhost--proxy--order"></a>`order`
 
 Data type: `Integer[0]`
 
@@ -11184,24 +11217,24 @@ vhost's configuration.
 
 Default value: `170`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--vhost--proxy--port"></a>`port`
 
 Data type: `Optional[Stdlib::Port]`
 
 Set the port to match the one `apache::vhost` sets. This must match the one
 `apache::vhost` sets or else the vhost's `concat` resource won't be found.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest"></a>`proxy_dest`
+##### <a name="-apache--vhost--proxy--proxy_dest"></a>`proxy_dest`
 
 Data type: `Optional[String[1]]`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration for the `/` path.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest_match"></a>`proxy_dest_match`
+##### <a name="-apache--vhost--proxy--proxy_dest_match"></a>`proxy_dest_match`
 
 Data type: `Optional[String[1]]`
 
@@ -11209,9 +11242,9 @@ This directive is equivalent to `proxy_dest`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
+##### <a name="-apache--vhost--proxy--proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
 Data type: `Optional[String[1]]`
 
@@ -11219,9 +11252,9 @@ Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
 [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="-apache--vhost--proxy--no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Variant[Array[String[1]], String[1]]`
 
@@ -11234,7 +11267,7 @@ data type. This configuration uses the [ProxyPass](https://httpd.apache.org/docs
 
 Default value: `[]`
 
-##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="-apache--vhost--proxy--no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Variant[Array[String[1]], String[1]]`
 
@@ -11243,7 +11276,7 @@ as it instead uses [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mo
 
 Default value: `[]`
 
-##### <a name="proxy_pass"></a>`proxy_pass`
+##### <a name="-apache--vhost--proxy--proxy_pass"></a>`proxy_pass`
 
 Data type: `Optional[Array[Apache::Vhost::ProxyPass]]`
 
@@ -11252,9 +11285,9 @@ configuration.
 See the documentation for the Apache::Vhost::ProxyPass data type for a detailed
 description of the structure including optional parameters.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_pass_match"></a>`proxy_pass_match`
+##### <a name="-apache--vhost--proxy--proxy_pass_match"></a>`proxy_pass_match`
 
 Data type: `Optional[Array[Apache::Vhost::ProxyPass]]`
 
@@ -11262,35 +11295,35 @@ This directive is equivalent to `proxy_pass`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_requests"></a>`proxy_requests`
+##### <a name="-apache--vhost--proxy--proxy_requests"></a>`proxy_requests`
 
 Data type: `Boolean`
 
 Enables forward (standard) proxy requests. See [ProxyRequests](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests) for details.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
+##### <a name="-apache--vhost--proxy--proxy_preserve_host"></a>`proxy_preserve_host`
 
 Data type: `Boolean`
 
 When enabled, pass the `Host:` line from the incoming request to the proxied host.
 See [ProxyPreserveHost](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost) for details.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="proxy_add_headers"></a>`proxy_add_headers`
+##### <a name="-apache--vhost--proxy--proxy_add_headers"></a>`proxy_add_headers`
 
 Data type: `Optional[Boolean]`
 
 Add X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Server HTTP headers.
 See [ProxyAddHeaders](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders) for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_error_override"></a>`proxy_error_override`
+##### <a name="-apache--vhost--proxy--proxy_error_override"></a>`proxy_error_override`
 
 Data type: `Boolean`
 
@@ -11298,7 +11331,7 @@ Override error pages from the proxied host. The current Puppet implementation
 supports enabling or disabling the directive, but not specifying a custom list
 of status codes. See [ProxyErrorOverride](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride) for details.
 
-Default value: ``false``
+Default value: `false`
 
 ## Resource types
 
@@ -11322,33 +11355,33 @@ Default value: `present`
 
 The following parameters are available in the `a2mod` type.
 
-* [`identifier`](#identifier)
-* [`lib`](#lib)
-* [`name`](#name)
-* [`provider`](#provider)
+* [`identifier`](#-a2mod--identifier)
+* [`lib`](#-a2mod--lib)
+* [`name`](#-a2mod--name)
+* [`provider`](#-a2mod--provider)
 
-##### <a name="identifier"></a>`identifier`
+##### <a name="-a2mod--identifier"></a>`identifier`
 
 Module identifier string used by LoadModule. Default: module-name_module
 
-##### <a name="lib"></a>`lib`
+##### <a name="-a2mod--lib"></a>`lib`
 
 The name of the .so library to be loaded
 
-##### <a name="name"></a>`name`
+##### <a name="-a2mod--name"></a>`name`
 
 namevar
 
 The name of the module to be managed
 
-##### <a name="provider"></a>`provider`
+##### <a name="-a2mod--provider"></a>`provider`
 
 The specific backend to use for this `a2mod` resource. You will seldom need to specify this --- Puppet will usually
 discover the appropriate provider for your platform.
 
 ## Functions
 
-### <a name="apacheapache_pw_hash"></a>`apache::apache_pw_hash`
+### <a name="apache--apache_pw_hash"></a>`apache::apache_pw_hash`
 
 Type: Ruby 4.x API
 
@@ -11366,7 +11399,7 @@ Data type: `Any`
 
 
 
-### <a name="apachebool2httpd"></a>`apache::bool2httpd`
+### <a name="apache--bool2httpd"></a>`apache::bool2httpd`
 
 Type: Ruby 4.x API
 
@@ -11411,7 +11444,7 @@ Data type: `Any`
 
 The value to be converted into a string.
 
-### <a name="apachepw_hash"></a>`apache::pw_hash`
+### <a name="apache--pw_hash"></a>`apache::pw_hash`
 
 Type: Ruby 4.x API
 
@@ -11469,7 +11502,7 @@ Data type: `Any`
 
 ## Data types
 
-### <a name="apacheloglevel"></a>`Apache::LogLevel`
+### <a name="Apache--LogLevel"></a>`Apache::LogLevel`
 
 A string that conforms to the Apache `LogLevel` syntax.
 Different levels can be specified for individual apache modules.
@@ -11497,26 +11530,18 @@ The levels are (in order of decreasing significance):
 * **See also**
   * https://httpd.apache.org/docs/current/mod/core.html#loglevel
 
-Alias of
+Alias of `Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]`
 
-```puppet
-Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
-```
-
-### <a name="apachemodproxyprotocol"></a>`Apache::ModProxyProtocol`
+### <a name="Apache--ModProxyProtocol"></a>`Apache::ModProxyProtocol`
 
 Supported protocols / schemes by mod_proxy
 
 * **See also**
   * https://httpd.apache.org/docs/2.4/mod/mod_proxy.html
 
-Alias of
-
-```puppet
-Pattern[/(\A(ajp|fcgi|ftp|h2c?|https?|scgi|uwsgi|wss?):\/\/.+\z)/, /(\Aunix:\/([^\n\/\0]+\/*)*\z)/]
-```
+Alias of `Pattern[/(\A(ajp|fcgi|ftp|h2c?|https?|scgi|uwsgi|wss?):\/\/.+\z)/, /(\Aunix:\/([^\n\/\0]+\/*)*\z)/]`
 
-### <a name="apacheoidcsettings"></a>`Apache::OIDCSettings`
+### <a name="Apache--OIDCSettings"></a>`Apache::OIDCSettings`
 
 https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 
@@ -11634,30 +11659,22 @@ Struct[{
   }]
 ```
 
-### <a name="apacheservertokens"></a>`Apache::ServerTokens`
+### <a name="Apache--ServerTokens"></a>`Apache::ServerTokens`
 
 A string that conforms to the Apache `ServerTokens` syntax.
 
 * **See also**
   * https://httpd.apache.org/docs/2.4/mod/core.html#servertokens
 
-Alias of
+Alias of `Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']`
 
-```puppet
-Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']
-```
-
-### <a name="apachevhostpriority"></a>`Apache::Vhost::Priority`
+### <a name="Apache--Vhost--Priority"></a>`Apache::Vhost::Priority`
 
 The priority on vhost
 
-Alias of
-
-```puppet
-Variant[Pattern[/^\d+$/], Integer, Boolean]
-```
+Alias of `Variant[Pattern[/^\d+$/], Integer, Boolean]`
 
-### <a name="apachevhostproxypass"></a>`Apache::Vhost::ProxyPass`
+### <a name="Apache--Vhost--ProxyPass"></a>`Apache::Vhost::ProxyPass`
 
 host context. Because the implementation uses SetEnv, you must `include apache::mod::env`;
 for the same reason, this cannot set the newer `no-proxy` environment variable, which
@@ -11745,35 +11762,35 @@ Struct[{
 
 The following parameters are available in the `Apache::Vhost::ProxyPass` data type:
 
-* [`path`](#path)
-* [`url`](#url)
-* [`params`](#params)
-* [`reverse_urls`](#reverse_urls)
-* [`reverse_cookies`](#reverse_cookies)
-* [`keywords`](#keywords)
-* [`setenv`](#setenv)
-* [`no_proxy_uris`](#no_proxy_uris)
-* [`no_proxy_uris_match`](#no_proxy_uris_match)
+* [`path`](#-Apache--Vhost--ProxyPass--path)
+* [`url`](#-Apache--Vhost--ProxyPass--url)
+* [`params`](#-Apache--Vhost--ProxyPass--params)
+* [`reverse_urls`](#-Apache--Vhost--ProxyPass--reverse_urls)
+* [`reverse_cookies`](#-Apache--Vhost--ProxyPass--reverse_cookies)
+* [`keywords`](#-Apache--Vhost--ProxyPass--keywords)
+* [`setenv`](#-Apache--Vhost--ProxyPass--setenv)
+* [`no_proxy_uris`](#-Apache--Vhost--ProxyPass--no_proxy_uris)
+* [`no_proxy_uris_match`](#-Apache--Vhost--ProxyPass--no_proxy_uris_match)
 
-##### <a name="path"></a>`path`
+##### <a name="-Apache--Vhost--ProxyPass--path"></a>`path`
 
 Data type: `String[1]`
 
 The virtual path on the local server to map.
 
-##### <a name="url"></a>`url`
+##### <a name="-Apache--Vhost--ProxyPass--url"></a>`url`
 
 Data type: `String[1]`
 
 The URL to which the path and its children will be mapped.
 
-##### <a name="params"></a>`params`
+##### <a name="-Apache--Vhost--ProxyPass--params"></a>`params`
 
 Data type: `Optional[Hash]`
 
 Optional [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) key-value parameters, such as connection settings.
 
-##### <a name="reverse_urls"></a>`reverse_urls`
+##### <a name="-Apache--Vhost--ProxyPass--reverse_urls"></a>`reverse_urls`
 
 Data type: `Array[String[1]]`
 
@@ -11781,7 +11798,7 @@ Optional (but usually recommended) URLs for [ProxyPassReverse](https://httpd.apa
 Allows Apache to adjust certain headers on HTTP redirect responses, to prevent
 redirects on the back-end from bypassing the reverse proxy.
 
-##### <a name="reverse_cookies"></a>`reverse_cookies`
+##### <a name="-Apache--Vhost--ProxyPass--reverse_cookies"></a>`reverse_cookies`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -11797,7 +11814,7 @@ Options:
 * **:path** `Optional[String[1]]`: Internal path for [ProxyPassReverseCookiePath](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiepath) configuration.
 * **:domain** `Optional[String[1]]`: Internal domain for [ProxyPassReverseCookieDomain](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiedomain) configuration.
 
-##### <a name="keywords"></a>`keywords`
+##### <a name="-Apache--Vhost--ProxyPass--keywords"></a>`keywords`
 
 Data type: `Optional[Array[String[1]]]`
 
@@ -11805,20 +11822,20 @@ Array of optional keywords such as `nocanon`, `interpolate`, or `noquery` suppor
 by [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) (refer
 to subsection under heading "Additional ProxyPass Keywords").
 
-##### <a name="setenv"></a>`setenv`
+##### <a name="-Apache--Vhost--ProxyPass--setenv"></a>`setenv`
 
 Data type: `Optional[Array[String[1]]]`
 
 Optional Array of Strings of the form "${env_var_name} ${value}".
 Uses [SetEnv](https://httpd.apache.org/docs/current/mod/mod_env.html#setenv) to make [Protocol Adjustments](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) to mod_proxy in the virtual
 
-##### <a name="no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="-Apache--Vhost--ProxyPass--no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Optional[Array[String[1]]]`
 
 Optional Array of paths to exclude from proxying, using the `!` directive to [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass).
 
-##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="-Apache--Vhost--ProxyPass--no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Optional[Array[String[1]]]`
 
diff --git a/metadata.json b/metadata.json
index 83e8137051..c755fa85b7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 36898de271135937dec146a12f21919a0492f9bc Mon Sep 17 00:00:00 2001
From: Vincevrp <vince@vince.sh>
Date: Wed, 7 Dec 2022 14:38:29 +0100
Subject: [PATCH 2055/2267] Parameterize SecRequestBodyLimitAction and
 SecResponseBodyLimitAction

---
 manifests/mod/security.pp         | 88 ++++++++++++++++++-------------
 spec/classes/mod/security_spec.rb |  8 +++
 templates/mod/security.conf.erb   |  4 +-
 3 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 6610d9754c..9c407c4e4e 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -98,8 +98,16 @@
 # @param secrequestbodyaccess
 #   Toggle SecRequestBodyAccess On or Off
 # 
+# @param secrequestbodylimitaction
+#   Controls what happens once a request body limit, configured with
+#   SecRequestBodyLimit, is encountered
+# 
 # @param secresponsebodyaccess
 #   Toggle SecResponseBodyAccess On or Off
+#
+# @param secresponsebodylimitaction
+#   Controls what happens once a response body limit, configured with
+#   SecResponseBodyLimitAction, is encountered. 
 # 
 # @param manage_security_crs
 #   Toggles whether to manage ModSecurity Core Rule Set 
@@ -124,44 +132,46 @@
 # @see https://coreruleset.org/docs/ for addional documentation
 #
 class apache::mod::security (
-  Stdlib::Absolutepath $logroot                         = $apache::params::logroot,
-  Integer $version                                      = $apache::params::modsec_version,
-  Optional[String] $crs_package                         = $apache::params::modsec_crs_package,
-  Array[String] $activated_rules                        = $apache::params::modsec_default_rules,
-  Boolean $custom_rules                                 = $apache::params::modsec_custom_rules,
-  Optional[Array[String]] $custom_rules_set             = $apache::params::modsec_custom_rules_set,
-  Stdlib::Absolutepath $modsec_dir                      = $apache::params::modsec_dir,
-  String $modsec_secruleengine                          = $apache::params::modsec_secruleengine,
-  String $audit_log_relevant_status                     = '^(?:5|4(?!04))',
-  String $audit_log_parts                               = $apache::params::modsec_audit_log_parts,
-  String $audit_log_type                                = $apache::params::modsec_audit_log_type,
-  Optional[Stdlib::Absolutepath] $audit_log_storage_dir = undef,
-  Integer $secpcrematchlimit                            = $apache::params::secpcrematchlimit,
-  Integer $secpcrematchlimitrecursion                   = $apache::params::secpcrematchlimitrecursion,
-  String $allowed_methods                               = 'GET HEAD POST OPTIONS',
-  String $content_types                                 = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
-  String $restricted_extensions                         = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
-  String $restricted_headers                            = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
-  String $secdefaultaction                              = 'deny',
-  Integer $inbound_anomaly_threshold                    = 5,
-  Integer $outbound_anomaly_threshold                   = 4,
-  Integer $critical_anomaly_score                       = 5,
-  Integer $error_anomaly_score                          = 4,
-  Integer $warning_anomaly_score                        = 3,
-  Integer $notice_anomaly_score                         = 2,
-  Integer $secrequestmaxnumargs                         = 255,
-  Integer $secrequestbodylimit                          = 13107200,
-  Integer $secrequestbodynofileslimit                   = 131072,
-  Integer $secrequestbodyinmemorylimit                  = 131072,
-  Integer[1,4] $paranoia_level                          = 1,
-  Integer[1,4] $executing_paranoia_level                = $paranoia_level,
-  Enum['On', 'Off'] $secrequestbodyaccess               = 'On',
-  Enum['On', 'Off'] $secresponsebodyaccess              = 'Off',
-  Boolean $manage_security_crs                          = true,
-  Boolean $enable_dos_protection                        = true,
-  Integer[1, default] $dos_burst_time_slice             = 60,
-  Integer[1, default] $dos_counter_threshold            = 100,
-  Integer[1, default] $dos_block_timeout                = 600,
+  Stdlib::Absolutepath $logroot                                = $apache::params::logroot,
+  Integer $version                                             = $apache::params::modsec_version,
+  Optional[String] $crs_package                                = $apache::params::modsec_crs_package,
+  Array[String] $activated_rules                               = $apache::params::modsec_default_rules,
+  Boolean $custom_rules                                        = $apache::params::modsec_custom_rules,
+  Optional[Array[String]] $custom_rules_set                    = $apache::params::modsec_custom_rules_set,
+  Stdlib::Absolutepath $modsec_dir                             = $apache::params::modsec_dir,
+  String $modsec_secruleengine                                 = $apache::params::modsec_secruleengine,
+  String $audit_log_relevant_status                            = '^(?:5|4(?!04))',
+  String $audit_log_parts                                      = $apache::params::modsec_audit_log_parts,
+  String $audit_log_type                                       = $apache::params::modsec_audit_log_type,
+  Optional[Stdlib::Absolutepath] $audit_log_storage_dir        = undef,
+  Integer $secpcrematchlimit                                   = $apache::params::secpcrematchlimit,
+  Integer $secpcrematchlimitrecursion                          = $apache::params::secpcrematchlimitrecursion,
+  String $allowed_methods                                      = 'GET HEAD POST OPTIONS',
+  String $content_types                                        = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
+  String $restricted_extensions                                = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
+  String $restricted_headers                                   = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
+  String $secdefaultaction                                     = 'deny',
+  Integer $inbound_anomaly_threshold                           = 5,
+  Integer $outbound_anomaly_threshold                          = 4,
+  Integer $critical_anomaly_score                              = 5,
+  Integer $error_anomaly_score                                 = 4,
+  Integer $warning_anomaly_score                               = 3,
+  Integer $notice_anomaly_score                                = 2,
+  Integer $secrequestmaxnumargs                                = 255,
+  Integer $secrequestbodylimit                                 = 13107200,
+  Integer $secrequestbodynofileslimit                          = 131072,
+  Integer $secrequestbodyinmemorylimit                         = 131072,
+  Integer[1,4] $paranoia_level                                 = 1,
+  Integer[1,4] $executing_paranoia_level                       = $paranoia_level,
+  Enum['On', 'Off'] $secrequestbodyaccess                      = 'On',
+  Enum['On', 'Off'] $secresponsebodyaccess                     = 'Off',
+  Enum['Reject', 'ProcessPartial'] $secrequestbodylimitaction  = 'Reject',
+  Enum['Reject', 'ProcessPartial'] $secresponsebodylimitaction = 'ProcessPartial',
+  Boolean $manage_security_crs                                 = true,
+  Boolean $enable_dos_protection                               = true,
+  Integer[1, default] $dos_burst_time_slice                    = 60,
+  Integer[1, default] $dos_counter_threshold                   = 100,
+  Integer[1, default] $dos_block_timeout                       = 600,
 ) inherits apache::params {
   include apache
 
@@ -228,6 +238,8 @@
   # - secrequestbodyinmemorylimit
   # - secrequestbodyaccess
   # - secresponsebodyaccess
+  # - secrequestbodylimitaction
+  # - secresponsebodylimitaction
   file { 'security.conf':
     ensure  => file,
     content => template('apache/mod/security.conf.erb'),
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 8a6de00593..72c959cb7a 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -81,6 +81,8 @@
                 secdefaultaction: 'deny,status:406,nolog,auditlog',
                 secrequestbodyaccess: 'Off',
                 secresponsebodyaccess: 'On',
+                secrequestbodylimitaction: 'ProcessPartial',
+                secresponsebodylimitaction: 'Reject',
               }
             end
 
@@ -90,6 +92,8 @@
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyAccess Off$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyAccess On$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyLimitAction ProcessPartial$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyLimitAction Reject$} }
             it { is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
             it {
               is_expected.to contain_file('bar.conf').with(
@@ -249,6 +253,8 @@
                 secdefaultaction: 'deny,status:406,nolog,auditlog',
                 secrequestbodyaccess: 'Off',
                 secresponsebodyaccess: 'On',
+                secrequestbodylimitaction: 'ProcessPartial',
+                secresponsebodylimitaction: 'Reject',
               }
             end
 
@@ -259,6 +265,8 @@
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyAccess Off$} }
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyAccess On$} }
+              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyLimitAction ProcessPartial$} }
+              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyLimitAction Reject$} }
               it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
               it {
                 is_expected.to contain_file('bar.conf').with(
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index db04b89338..ec520751cc 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -10,7 +10,7 @@
     SecRequestBodyLimit <%= @secrequestbodylimit %>
     SecRequestBodyNoFilesLimit <%= @secrequestbodynofileslimit %>
     SecRequestBodyInMemoryLimit <%= @secrequestbodyinmemorylimit %>
-    SecRequestBodyLimitAction Reject
+    SecRequestBodyLimitAction <%= @secrequestbodylimitaction %>
     SecRule REQBODY_ERROR "!@eq 0" \
       "id:'200001', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2"
     SecRule MULTIPART_STRICT_ERROR "!@eq 0" \
@@ -43,7 +43,7 @@
     SecResponseBodyAccess <%= @secresponsebodyaccess %>
     SecResponseBodyMimeType text/plain text/html text/xml
     SecResponseBodyLimit 524288
-    SecResponseBodyLimitAction ProcessPartial
+    SecResponseBodyLimitAction <%= @secresponsebodylimitaction %>
     SecDebugLogLevel 0
     SecAuditEngine RelevantOnly
     SecAuditLogRelevantStatus "<%= @audit_log_relevant_status %>"

From 29e69afe0a8e93ef8dbded854594ca6d1e7a93b9 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sun, 11 Dec 2022 23:02:43 +0100
Subject: [PATCH 2056/2267] fix mod_proxy_html on FreeBSD

The files are already included in the base port/package, the separate
port was EOLed in 2018:
https://www.freshports.org/www/mod_proxy_html
---
 manifests/params.pp                 | 1 -
 spec/classes/mod/proxy_html_spec.rb | 1 -
 2 files changed, 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 642734738b..6e6870a6ab 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -519,7 +519,6 @@
       'passenger'   => 'www/rubygem-passenger',
       'perl'        => 'www/mod_perl2',
       'phpXXX'      => 'www/mod_phpXXX',
-      'proxy_html'  => 'www/mod_proxy_html',
       'python'      => 'www/mod_python3',
       'wsgi'        => 'www/mod_wsgi',
       'dav_svn'     => 'devel/subversion',
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index e40f5e18d7..2122193990 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -46,7 +46,6 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
     it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
-    it { is_expected.to contain_package('www/mod_proxy_html') }
   end
   context 'on a Gentoo OS', :compile do
     include_examples 'Gentoo'

From 773ad0143d6ce4483b3b72ba9697a4ef6c911d6e Mon Sep 17 00:00:00 2001
From: Craig Gumbley <craiggumbley@gmail.com>
Date: Tue, 13 Dec 2022 10:00:14 +0000
Subject: [PATCH 2057/2267] (MAINT) Remove stalebot workflow

---
 .github/workflows/stale.yml | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index 26d7e5b1f8..0000000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Audit aging issues/PRs
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  audit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/stale@v3
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-issue-stale: 90
-        days-before-pr-stale: 60
-        days-before-pr-close: 7
-        stale-issue-message: |
-          Hello! 👋
-
-          This issue has been open for a while and has had no recent activity. We've labelled it with `attention-needed` so that we can get a clear view of which issues need our attention.
-
-          If you are waiting on a response from us we will try and address your comments on a future Community Day.
-
-          Alternatively, if it is no longer relevant to you please close the issue with a comment.
-        stale-issue-label: 'attention-needed'
-        stale-pr-message: |
-          Hello! 👋
-
-          This pull request has been open for a while and has had no recent activity. We've labelled it with `attention-needed` so that we can get a clear view of which PRs need our attention.
-
-          If you are waiting on a response from us we will try and address your comments on a future Community Day.
-
-          Alternatively, if it is no longer relevant to you please close the PR with a comment. 
-          
-          Please note that if a pull request receives no update for 7 after it has been labelled, it will be closed. We are always happy to re-open pull request if they have been closed in error.
-        stale-pr-label: 'attention-needed'

From cedd45b63be89ea54bd2a596e6cd3a3f60d4faf8 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 10 Oct 2022 22:04:02 +0200
Subject: [PATCH 2058/2267] Drop Apache 2.2 support

---
 README.md                                     |   1 -
 lib/facter/apache_version.rb                  |  29 ---
 manifests/balancer.pp                         |  14 +-
 manifests/default_mods.pp                     |  77 +++----
 manifests/init.pp                             |  26 +--
 manifests/mod.pp                              |   7 +-
 manifests/mod/alias.pp                        |   7 +-
 manifests/mod/authn_core.pp                   |  11 +-
 manifests/mod/authz_default.pp                |  17 --
 manifests/mod/data.pp                         |  11 +-
 manifests/mod/disk_cache.pp                   |  24 +-
 manifests/mod/event.pp                        |  26 +--
 manifests/mod/http2.pp                        |   6 -
 manifests/mod/info.pp                         |   7 +-
 manifests/mod/itk.pp                          |  36 +--
 manifests/mod/ldap.pp                         |   6 -
 manifests/mod/pagespeed.pp                    |  11 +-
 manifests/mod/prefork.pp                      |  39 +---
 manifests/mod/proxy.pp                        |   9 +-
 manifests/mod/proxy_balancer.pp               |   9 +-
 manifests/mod/proxy_html.pp                   |   4 +-
 manifests/mod/remoteip.pp                     |  10 -
 manifests/mod/ssl.pp                          |  40 +---
 manifests/mod/status.pp                       |  18 +-
 manifests/mod/userdir.pp                      |   7 +-
 manifests/mod/version.pp                      |  17 --
 manifests/mod/worker.pp                       |  41 +---
 manifests/mpm.pp                              | 105 ++++-----
 manifests/params.pp                           |  52 +----
 manifests/version.pp                          |  33 ---
 manifests/vhost.pp                            |  40 +---
 spec/acceptance/class_spec.rb                 |  14 --
 spec/acceptance/vhost_spec.rb                 |   9 +-
 spec/classes/apache_spec.rb                   | 150 +------------
 spec/classes/mod/data_spec.rb                 |  11 -
 spec/classes/mod/disk_cache_spec.rb           | 209 ++++--------------
 spec/classes/mod/event_spec.rb                |  67 ++----
 spec/classes/mod/http2_spec.rb                |   2 -
 spec/classes/mod/itk_spec.rb                  |  84 +------
 spec/classes/mod/prefork_spec.rb              |  70 +-----
 spec/classes/mod/remoteip_spec.rb             |  10 -
 spec/classes/mod/ssl_spec.rb                  |  63 +-----
 spec/classes/mod/status_spec.rb               |  26 +--
 spec/classes/mod/worker_spec.rb               |  68 +-----
 spec/defines/balancer_spec.rb                 |   7 +-
 spec/defines/vhost_spec.rb                    |  69 ------
 spec/spec_helper_local.rb                     |   1 +
 .../facter/util/fact_apache_version_spec.rb   |  40 ----
 templates/httpd.conf.erb                      |  45 +---
 templates/mod/_require.erb                    |  10 +-
 templates/mod/alias.conf.erb                  |   5 -
 templates/mod/event.conf.erb                  |   4 -
 templates/mod/http2.conf.erb                  |  40 ++--
 templates/mod/info.conf.erb                   |  13 --
 templates/mod/itk.conf.erb                    |   2 +-
 templates/mod/ldap.conf.erb                   |   7 -
 templates/mod/pagespeed.conf.erb              |  15 --
 templates/mod/proxy.conf.erb                  |   8 +-
 templates/mod/proxy_balancer.conf.erb         |   8 +-
 templates/mod/security.conf.erb               |   5 -
 templates/mod/ssl.conf.erb                    |  14 +-
 templates/mod/status.conf.erb                 |   4 -
 templates/mod/userdir.conf.erb                |  10 -
 templates/mod/worker.conf.erb                 |   6 +-
 templates/vhost/_additional_includes.erb      |   2 +-
 templates/vhost/_block.erb                    |   4 -
 templates/vhost/_directories.erb              |  14 --
 templates/vhost/_file_header.erb              |  13 +-
 templates/vhost/_http2.erb                    |  40 ++--
 templates/vhost/_logging.erb                  |   4 +-
 templates/vhost/_require.erb                  |  45 +---
 templates/vhost/_ssl.erb                      |   8 +-
 72 files changed, 277 insertions(+), 1689 deletions(-)
 delete mode 100644 lib/facter/apache_version.rb
 delete mode 100644 manifests/mod/authz_default.pp
 delete mode 100644 manifests/mod/version.pp
 delete mode 100644 spec/unit/facter/util/fact_apache_version_spec.rb

diff --git a/README.md b/README.md
index e38b2a2478..206b1d2092 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,6 @@
 [aliased servers]: https://httpd.apache.org/docs/current/urlmapping.html
 [`AllowEncodedSlashes`]: https://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes
 [`apache`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apache
-[`apache_version`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apache_version
 [`apache::balancer`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancer
 [`apache::balancermember`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancermember
 [`apache::mod`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemod
diff --git a/lib/facter/apache_version.rb b/lib/facter/apache_version.rb
deleted file mode 100644
index 36a316f441..0000000000
--- a/lib/facter/apache_version.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-Facter.add(:apache_version) do
-  confine kernel: ['FreeBSD', 'Linux']
-  setcode do
-    apache_version = nil
-
-    if Facter::Core::Execution.which('httpd')
-      apache_version = Facter::Core::Execution.execute('httpd -V 2>&1')
-      Facter.debug "Matching httpd '#{apache_version}'"
-    elsif Facter::Core::Execution.which('apache2')
-      apache_version = Facter::Core::Execution.execute('apache2 -V 2>&1')
-      Facter.debug "Matching apache2 '#{apache_version}'"
-    elsif Facter::Core::Execution.which('apachectl')
-      apache_version = Facter::Core::Execution.execute('apachectl -v 2>&1')
-      Facter.debug "Matching apachectl '#{apache_version}'"
-    elsif Facter::Core::Execution.which('apache2ctl')
-      apache_version = Facter::Core::Execution.execute('apache2ctl -v 2>&1')
-      Facter.debug "Matching apache2ctl '#{apache_version}'"
-    end
-
-    unless apache_version.nil?
-      match = %r{^Server version: Apache\/(\d+.\d+(.\d+)?)}.match(apache_version)
-      unless match.nil?
-        match[1]
-      end
-    end
-  end
-end
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
index 71fdd81c6d..fdaf7b23cc 100644
--- a/manifests/balancer.pp
+++ b/manifests/balancer.pp
@@ -50,15 +50,13 @@
 ) {
   include apache::mod::proxy_balancer
 
-  if versioncmp($apache::mod::proxy_balancer::apache_version, '2.4') >= 0 {
-    $lbmethod = $proxy_set['lbmethod'] ? {
-      undef   => 'byrequests',
-      default => $proxy_set['lbmethod'],
-    }
-    ensure_resource('apache::mod', "lbmethod_${lbmethod}", {
-        'loadfile_name' => "proxy_balancer_lbmethod_${lbmethod}.load"
-    })
+  $lbmethod = $proxy_set['lbmethod'] ? {
+    undef   => 'byrequests',
+    default => $proxy_set['lbmethod'],
   }
+  ensure_resource('apache::mod', "lbmethod_${lbmethod}", {
+      'loadfile_name' => "proxy_balancer_lbmethod_${lbmethod}.load"
+  })
 
   if $target {
     $_target = $target
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 22ee2c95eb..a6dfd368cf 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -5,7 +5,6 @@
 class apache::default_mods (
   Boolean $all                                   = true,
   Optional[Variant[Array[String], String]] $mods = undef,
-  String $apache_version                         = $apache::apache_version,
   Boolean $use_systemd                           = $apache::use_systemd,
 ) {
   # These are modules required to run the default configuration.
@@ -14,19 +13,13 @@
   case $facts['os']['family'] {
     'redhat': {
       ::apache::mod { 'log_config': }
-      if versioncmp($apache_version, '2.4') >= 0 {
-        # Lets fork it
-        # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if ( !($facts['os']['family'] == 'redhat' and versioncmp($facts['os']['release']['major'], '7') == -1) and !($facts['os']['name'] == 'Amazon') ) {
-          if ($use_systemd) {
-            ::apache::mod { 'systemd': }
-          }
-        }
-        if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['full'] == '2') {
-          ::apache::mod { 'systemd': }
-        }
-        ::apache::mod { 'unixd': }
+      if $facts['os']['name'] != 'Amazon' and $use_systemd {
+        ::apache::mod { 'systemd': }
       }
+      if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['full'] == '2') {
+        ::apache::mod { 'systemd': }
+      }
+      ::apache::mod { 'unixd': }
     }
     'freebsd': {
       ::apache::mod { 'log_config': }
@@ -49,9 +42,6 @@
       'debian': {
         include apache::mod::authn_core
         include apache::mod::reqtimeout
-        if versioncmp($apache_version, '2.4') < 0 {
-          ::apache::mod { 'authn_alias': }
-        }
       }
       'redhat': {
         include apache::mod::actions
@@ -63,7 +53,6 @@
         include apache::mod::rewrite
         include apache::mod::speling
         include apache::mod::suexec
-        include apache::mod::version
         include apache::mod::vhost_alias
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
@@ -75,11 +64,6 @@
         ::apache::mod { 'logio': }
         ::apache::mod { 'substitute': }
         ::apache::mod { 'usertrack': }
-
-        if versioncmp($apache_version, '2.4') < 0 {
-          ::apache::mod { 'authn_alias': }
-          ::apache::mod { 'authn_default': }
-        }
       }
       'freebsd': {
         include apache::mod::actions
@@ -92,7 +76,6 @@
         include apache::mod::reqtimeout
         include apache::mod::rewrite
         include apache::mod::userdir
-        include apache::mod::version
         include apache::mod::vhost_alias
         include apache::mod::speling
         include apache::mod::filter
@@ -141,45 +124,37 @@
     include apache::mod::setenvif
     include apache::mod::auth_basic
 
-    if versioncmp($apache_version, '2.4') >= 0 {
-      # filter is needed by mod_deflate
-      include apache::mod::filter
+    # filter is needed by mod_deflate
+    include apache::mod::filter
 
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
-
-      # lots of stuff seems to break without access_compat
-      ::apache::mod { 'access_compat': }
-    } else {
-      include apache::mod::authz_default
+    # authz_core is needed for 'Require' directive
+    ::apache::mod { 'authz_core':
+      id => 'authz_core_module',
     }
 
+    # lots of stuff seems to break without access_compat
+    ::apache::mod { 'access_compat': }
+
     include apache::mod::authz_user
     include apache::mod::authz_groupfile
     include apache::mod::env
   } elsif $mods {
     ::apache::default_mods::load { $mods: }
 
-    if versioncmp($apache_version, '2.4') >= 0 {
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
-
-      # filter is needed by mod_deflate
-      include apache::mod::filter
+    # authz_core is needed for 'Require' directive
+    ::apache::mod { 'authz_core':
+      id => 'authz_core_module',
     }
-  } else {
-    if versioncmp($apache_version, '2.4') >= 0 {
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
 
-      # filter is needed by mod_deflate
-      include apache::mod::filter
+    # filter is needed by mod_deflate
+    include apache::mod::filter
+  } else {
+    # authz_core is needed for 'Require' directive
+    ::apache::mod { 'authz_core':
+      id => 'authz_core_module',
     }
+
+    # filter is needed by mod_deflate
+    include apache::mod::filter
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 8010f1690e..a7c6f10319 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,11 +16,6 @@
 #   responses to URLs containing '\' and '/' characters. If not specified, this parameter omits 
 #   the declaration from the server's configuration and uses Apache's default setting of 'off'.
 #
-# @param apache_version
-#   Configures module template behavior, package names, and default Apache modules by defining 
-#   the version of Apache to use. We do not recommend manually configuring this parameter 
-#   without reason.
-#
 # @param conf_dir
 #   Sets the directory where the Apache server's main configuration file is located.
 #
@@ -48,7 +43,7 @@
 #   on your operating system, and you can declare any other modules separately using the 
 #   `apache::mod::<MODULE NAME>` class or `apache::mod` defined type.<br />
 #   If `true`, Puppet installs additional modules, depending on the operating system and 
-#   the values of `apache_version` and `mpm_module` parameters. Because these lists of 
+#   the value of the `mpm_module` parameter. Because these lists of 
 #   modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
 #   If this parameter contains an array, Puppet instead enables all passed Apache modules.
 #
@@ -307,11 +302,6 @@
 #   Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to 
 #   coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 #
-# @param rewrite_lock
-#   Allows setting a custom location for a rewrite lock - considered best practice if using 
-#   a RewriteMap of type prg in the `rewrites` parameter of your virtual host. This parameter 
-#   only applies to Apache version 2.2 or lower and is ignored on newer versions.
-#
 # @param sendfile
 #   Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the 
 #   `EnableSendfile` directive.
@@ -512,12 +502,11 @@
   String $vhost_include_pattern                                              = $apache::params::vhost_include_pattern,
   Stdlib::Absolutepath $mod_dir                                              = $apache::params::mod_dir,
   Optional[Stdlib::Absolutepath] $mod_enable_dir                             = $apache::params::mod_enable_dir,
-  Variant[Boolean, String] $mpm_module                                       = $apache::params::mpm_module,
+  Variant[Boolean, Enum['event', 'itk', 'peruser', 'prefork', 'worker']] $mpm_module = $apache::params::mpm_module,
   String $lib_path                                                           = $apache::params::lib_path,
   String $conf_template                                                      = $apache::params::conf_template,
   Optional[String] $servername                                               = $apache::params::servername,
   String $pidfile                                                            = $apache::params::pidfile,
-  Optional[Stdlib::Absolutepath] $rewrite_lock                               = undef,
   Boolean $manage_user                                                       = true,
   Boolean $manage_group                                                      = true,
   String $user                                                               = $apache::params::user,
@@ -537,7 +526,6 @@
   Optional[String] $ssl_file                                                 = undef,
   Stdlib::Absolutepath $ports_file                                           = $apache::params::ports_file,
   Stdlib::Absolutepath $docroot                                              = $apache::params::docroot,
-  String $apache_version                                                     = $apache::version::default,
   Apache::ServerTokens $server_tokens                                        = 'Prod',
   Variant[Enum['On', 'Off'], String] $server_signature                       = 'On',
   Enum['On', 'Off', 'extended'] $trace_enable                                = 'On',
@@ -557,11 +545,6 @@
   Array[Enum['h2', 'h2c', 'http/1.1']] $protocols                            = [],
   Optional[Boolean] $protocols_honor_order                                   = undef,
 ) inherits apache::params {
-  $valid_mpms_re = $apache_version ? {
-    '2.4'   => '(event|itk|peruser|prefork|worker)',
-    default => '(event|itk|prefork|worker)'
-  }
-
   if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7' {
     # On redhat 7 the ssl.conf lives in /etc/httpd/conf.d (the confd_dir)
     # when all other module configs live in /etc/httpd/conf.modules.d (the
@@ -578,10 +561,6 @@
     }
   }
 
-  if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans
-    assert_type(Pattern[$valid_mpms_re], $mpm_module)
-  }
-
   # NOTE: on FreeBSD it's mpm module's responsibility to install httpd package.
   # NOTE: the same strategy may be introduced for other OSes. For this, you
   # should delete the 'if' block below and modify all MPM modules' manifests
@@ -802,7 +781,6 @@
     # - $server_tokens
     # - $server_signature
     # - $trace_enable
-    # - $rewrite_lock
     # - $root_directory_secured
     file { "${apache::conf_dir}/${apache::params::conf_file}":
       ensure  => file,
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 8118a55d54..7d354f87e7 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -84,12 +84,7 @@
   if $package {
     $_package = $package
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
-    if ($apache::apache_version == '2.4' and $facts['os']['name'] =~ /^[Aa]mazon$/ and $facts['os']['release']['major'] != '2') {
-      # On amazon linux we need to prefix our package name with mod24 instead of mod to support apache 2.4
-      $_package = regsubst($mod_packages[$mod],'^(mod_)?(.*)','mod24_\2')
-    } else {
-      $_package = $mod_packages[$mod]
-    }
+    $_package = $mod_packages[$mod]
   } else {
     $_package = undef
   }
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 1bc2064112..4c10a72c3b 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -1,9 +1,6 @@
 # @summary
 #   Installs and configures `mod_alias`.
 # 
-# @param apache_version
-#   The version of Apache, if not set will be retrieved from the init class.
-# 
 # @param icons_options
 #   Disables directory listings for the icons directory, via Apache [Options](https://httpd.apache.org/docs/current/mod/core.html#options)
 #   directive.
@@ -22,17 +19,15 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_alias.html for additional documentation.
 #
 class apache::mod::alias (
-  Optional[String] $apache_version                   = undef,
   String $icons_options                              = 'Indexes MultiViews',
   # set icons_path to false to disable the alias
   Variant[Boolean, Stdlib::Absolutepath] $icons_path = $apache::params::alias_icons_path,
   String $icons_prefix                               = $apache::params::icons_prefix
 ) inherits apache::params {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
   apache::mod { 'alias': }
 
-  # Template uses $icons_path, $_apache_version
+  # Template uses $icons_path
   if $icons_path {
     file { 'alias.conf':
       ensure  => file,
diff --git a/manifests/mod/authn_core.pp b/manifests/mod/authn_core.pp
index 6bbfc4aea1..06977ea6f0 100644
--- a/manifests/mod/authn_core.pp
+++ b/manifests/mod/authn_core.pp
@@ -1,15 +1,8 @@
 # @summary
 #   Installs `mod_authn_core`.
 # 
-# @param apache_version
-#   The version of apache being run.
-# 
 # @see https://httpd.apache.org/docs/current/mod/mod_authn_core.html for additional documentation.
 #
-class apache::mod::authn_core (
-  Optional[String] $apache_version = $apache::apache_version
-) {
-  if versioncmp($apache_version, '2.4') >= 0 {
-    ::apache::mod { 'authn_core': }
-  }
+class apache::mod::authn_core {
+  ::apache::mod { 'authn_core': }
 }
diff --git a/manifests/mod/authz_default.pp b/manifests/mod/authz_default.pp
deleted file mode 100644
index ba886c2587..0000000000
--- a/manifests/mod/authz_default.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# @summary
-#   Installs and configures `mod_authz_default`.
-# 
-# @param apache_version
-#   Version of Apache to install module on.
-#
-# @see https://httpd.apache.org/docs/current/mod/mod_authz_default.html for additional documentation.
-#
-class apache::mod::authz_default (
-  Optional[String] $apache_version = $apache::apache_version
-) {
-  if versioncmp($apache_version, '2.4') >= 0 {
-    warning('apache::mod::authz_default has been removed in Apache 2.4')
-  } else {
-    ::apache::mod { 'authz_default': }
-  }
-}
diff --git a/manifests/mod/data.pp b/manifests/mod/data.pp
index 3dd63ea9fd..7cff7d8f09 100644
--- a/manifests/mod/data.pp
+++ b/manifests/mod/data.pp
@@ -1,18 +1,9 @@
 # @summary
 #   Installs and configures `mod_data`.
 # 
-# @param apache_version
-#   Version of Apache to install module on.
-# 
 # @see https://httpd.apache.org/docs/current/mod/mod_data.html for additional documentation.
 #
-class apache::mod::data (
-  Optional[String] $apache_version = undef,
-) {
+class apache::mod::data {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
-  if versioncmp($_apache_version, '2.3') < 0 {
-    fail('mod_data is only available in Apache 2.3 and later')
-  }
   ::apache::mod { 'data': }
 }
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 0ae3cd4261..17ea3ebfa4 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -6,8 +6,7 @@
 #   Default depends on the Apache version and operating system:
 #   - Debian: /var/cache/apache2/mod_cache_disk
 #   - FreeBSD: /var/cache/mod_cache_disk
-#   - Red Hat, Apache 2.4: /var/cache/httpd/proxy
-#   - Red Hat, Apache 2.2: /var/cache/mod_proxy
+#   - Red Hat: /var/cache/httpd/proxy
 #
 # @param cache_ignore_headers
 #   Specifies HTTP header(s) that should not be stored in the cache.
@@ -18,9 +17,9 @@
 #   You can then control this behaviour in individual vhosts by explicitly defining CacheEnable.
 #
 # @note
-#   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
+#   On Apache 2.4, mod_cache_disk installed.
 #
-# @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation.
+# @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation.
 #
 class apache::mod::disk_cache (
   Optional[Stdlib::Absolutepath] $cache_root = undef,
@@ -30,28 +29,15 @@
   include apache
   if $cache_root {
     $_cache_root = $cache_root
-  }
-  elsif versioncmp($apache::apache_version, '2.4') >= 0 {
+  } else {
     $_cache_root = $facts['os']['family'] ? {
       'debian'  => '/var/cache/apache2/mod_cache_disk',
       'redhat'  => '/var/cache/httpd/proxy',
       'freebsd' => '/var/cache/mod_cache_disk',
     }
   }
-  else {
-    $_cache_root = $facts['os']['family'] ? {
-      'debian'  => '/var/cache/apache2/mod_disk_cache',
-      'redhat'  => '/var/cache/mod_proxy',
-      'freebsd' => '/var/cache/mod_disk_cache',
-    }
-  }
 
-  if versioncmp($apache::apache_version, '2.4') >= 0 {
-    apache::mod { 'cache_disk': }
-  }
-  else {
-    apache::mod { 'disk_cache': }
-  }
+  apache::mod { 'cache_disk': }
 
   Class['apache::mod::cache'] -> Class['apache::mod::disk_cache']
 
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 20464fe051..4a27e479bd 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -5,9 +5,6 @@
 #   Sets the number of child server processes created at startup, via the module's `StartServers` directive. Setting this to `false` 
 #   removes the parameter.
 #
-# @param maxclients
-#   Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
-#
 # @param maxrequestworkers
 #   Sets the maximum number of connections Apache can simultaneously process, via the module's `MaxRequestWorkers` directive. Setting 
 #   these to `false` removes the parameters.
@@ -21,18 +18,12 @@
 # @param threadsperchild
 #   Number of threads created by each child process.
 #
-# @param maxrequestsperchild
-#   Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
-#
 # @param maxconnectionsperchild
 #   Limit on the number of connections that an individual child server will handle during its life.
 #
 # @param serverlimit
 #   Limits the configurable number of processes via the `ServerLimit` directive. Setting this to `false` removes the parameter.
 #
-# @param apache_version
-#   Version of Apache to install module on.
-#
 # @param threadlimit
 #    Limits the number of event threads via the module's `ThreadLimit` directive. Setting this to `false` removes the parameter.
 #
@@ -48,22 +39,17 @@
 # @note Unsupported platforms: SLES: all
 class apache::mod::event (
   Variant[Integer, Boolean] $startservers                     = 2,
-  Variant[Integer, Boolean] $maxclients                       = 150,
   Optional[Variant[Integer, Boolean]] $maxrequestworkers      = undef,
   Variant[Integer, Boolean] $minsparethreads                  = 25,
   Variant[Integer, Boolean] $maxsparethreads                  = 75,
   Variant[Integer, Boolean] $threadsperchild                  = 25,
-  Variant[Integer, Boolean] $maxrequestsperchild              = 0,
   Optional[Variant[Integer, Boolean]] $maxconnectionsperchild = undef,
   Variant[Integer, Boolean] $serverlimit                      = 25,
-  Optional[String] $apache_version                            = undef,
   Variant[Integer, Boolean]  $threadlimit                     = 64,
   Variant[Integer, Boolean]  $listenbacklog                   = 511,
 ) {
   include apache
 
-  $_apache_version = pick($apache_version, $apache::apache_version)
-
   if defined(Class['apache::mod::itk']) {
     fail('May not include both apache::mod::event and apache::mod::itk on the same node')
   }
@@ -84,11 +70,9 @@
 
   # Template uses:
   # - $startservers
-  # - $maxclients
   # - $minsparethreads
   # - $maxsparethreads
   # - $threadsperchild
-  # - $maxrequestsperchild
   # - $serverlimit
   file { "${apache::mod_dir}/event.conf":
     ensure  => file,
@@ -100,16 +84,8 @@
   }
 
   case $facts['os']['family'] {
-    'redhat': {
-      if versioncmp($_apache_version, '2.4') >= 0 {
-        apache::mpm { 'event':
-          apache_version => $_apache_version,
-        }
-      }
-    }
-    'debian', 'freebsd' : {
+    'redhat', 'debian', 'freebsd' : {
       apache::mpm { 'event':
-        apache_version => $_apache_version,
       }
     }
     'gentoo': {
diff --git a/manifests/mod/http2.pp b/manifests/mod/http2.pp
index c5d6549419..54323a67bf 100644
--- a/manifests/mod/http2.pp
+++ b/manifests/mod/http2.pp
@@ -60,9 +60,6 @@
 #   Sets the size of the window that is used for flow control from client to server and limits 
 #   the amount of data the server has to buffer. 
 # 
-# @param apache_version
-#   Version of Apache to install module on.
-# 
 # @see https://httpd.apache.org/docs/current/mod/mod_http2.html for additional documentation.
 #
 class apache::mod::http2 (
@@ -84,13 +81,10 @@
   Optional[Integer] $h2_tls_warm_up_size        = undef,
   Optional[Boolean] $h2_upgrade                 = undef,
   Optional[Integer] $h2_window_size             = undef,
-  Optional[String]  $apache_version             = undef,
 ) {
   include apache
   apache::mod { 'http2': }
 
-  $_apache_version = pick($apache_version, $apache::apache_version)
-
   file { 'http2.conf':
     ensure  => file,
     content => template('apache/mod/http2.conf.erb'),
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index abb5bb6404..0735a5fc47 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -4,9 +4,6 @@
 # @param allow_from
 #   Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 # 
-# @param apache_version
-#   Version of Apache to install module on.
-# 
 # @param restrict_access
 #   Toggles whether to restrict access to info path. If `false`, the `allow_from` allowlist is ignored and any IP address can
 #   access the info path.
@@ -18,12 +15,10 @@
 #
 class apache::mod::info (
   Array[Stdlib::IP::Address] $allow_from = ['127.0.0.1', '::1'],
-  Optional[String] $apache_version       = undef,
   Boolean $restrict_access               = true,
   Stdlib::Unixpath $info_path            = '/server-info',
 ) {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
 
   if $facts['os']['family'] == 'Suse' {
     if defined(Class['apache::mod::worker']) {
@@ -38,7 +33,7 @@
     ::apache::mod { 'info': }
   }
 
-  # Template uses $allow_from, $_apache_version
+  # Template uses $allow_from
   file { 'info.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/info.conf",
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 393e03150d..5d67e52a79 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -24,9 +24,6 @@
 #   capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor 
 #   capabilities, such as NFS.
 #
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-# 
 # @see http://mpm-itk.sesse.net for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8, 9; SLES: all
 class apache::mod::itk (
@@ -37,32 +34,23 @@
   Integer $maxclients                                    = 256,
   Integer $maxrequestsperchild                           = 4000,
   Optional[Variant[Boolean, String]] $enablecapabilities = undef,
-  Optional[String] $apache_version                       = undef,
 ) {
   include apache
 
-  $_apache_version = pick($apache_version, $apache::apache_version)
-
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::itk and apache::mod::event on the same node')
   }
   if defined(Class['apache::mod::peruser']) {
     fail('May not include both apache::mod::itk and apache::mod::peruser on the same node')
   }
-  if versioncmp($_apache_version, '2.4') < 0 {
+  # prefork is a requirement for itk in 2.4; except on FreeBSD and Gentoo, which are special
+  if $facts['os']['family'] =~ /^(FreeBSD|Gentoo)/ {
     if defined(Class['apache::mod::prefork']) {
       fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
     }
   } else {
-    # prefork is a requirement for itk in 2.4; except on FreeBSD and Gentoo, which are special
-    if $facts['os']['family'] =~ /^(FreeBSD|Gentoo)/ {
-      if defined(Class['apache::mod::prefork']) {
-        fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
-      }
-    } else {
-      if ! defined(Class['apache::mod::prefork']) {
-        include apache::mod::prefork
-      }
+    if ! defined(Class['apache::mod::prefork']) {
+      include apache::mod::prefork
     }
   }
   if defined(Class['apache::mod::worker']) {
@@ -95,25 +83,11 @@
       package { 'httpd-itk':
         ensure => present,
       }
-      if versioncmp($_apache_version, '2.4') >= 0 {
-        ::apache::mpm { 'itk':
-          apache_version => $_apache_version,
-        }
-      }
-      else {
-        file_line { '/etc/sysconfig/httpd itk enable':
-          ensure  => present,
-          path    => '/etc/sysconfig/httpd',
-          line    => 'HTTPD=/usr/sbin/httpd.itk',
-          match   => '#?HTTPD=/usr/sbin/httpd.itk',
-          require => Package['httpd'],
-          notify  => Class['apache::service'],
-        }
+      ::apache::mpm { 'itk':
       }
     }
     'debian', 'freebsd': {
       apache::mpm { 'itk':
-        apache_version => $_apache_version,
       }
     }
     'gentoo': {
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index 14dcd7048b..e800bc7396 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -1,9 +1,6 @@
 # @summary
 #   Installs and configures `mod_ldap`.
 # 
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-# 
 # @param package_name
 #   Specifies the custom package name.
 # 
@@ -49,7 +46,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_ldap.html for additional documentation.
 # @note Unsupported platforms: CentOS: 8; RedHat: 8, 9
 class apache::mod::ldap (
-  Optional[String] $apache_version                = undef,
   Optional[String] $package_name                  = undef,
   Optional[String] $ldap_trusted_global_cert_file = undef,
   String $ldap_trusted_global_cert_type           = 'CA_BASE64',
@@ -62,11 +58,9 @@
   String $ldap_path                               = '/ldap-status',
 ) {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'ldap':
     package => $package_name,
   }
-  # Template uses $_apache_version
   file { 'ldap.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/ldap.conf",
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index 117d8fb887..2ea329aa43 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -106,8 +106,6 @@
 # @param additional_configuration
 #   Any additional configuration no included as it's own option
 #
-# @param apache_version
-#
 # @param package_ensure
 #
 # @example
@@ -190,22 +188,15 @@
   Array $allow_pagespeed_message                 = [],
   Integer $message_buffer_size                   = 100000,
   Variant[Array, Hash] $additional_configuration = {},
-  Optional[String] $apache_version               = undef,
   Optional[String] $package_ensure               = undef,
 ) {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
-  $_lib = $_apache_version ? {
-    '2.4'   => 'mod_pagespeed_ap24.so',
-    default => undef
-  }
 
   apache::mod { 'pagespeed':
-    lib            => $_lib,
+    lib            => 'mod_pagespeed_ap24.so',
     package_ensure => $package_ensure,
   }
 
-  # Template uses $_apache_version
   file { 'pagespeed.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/pagespeed.conf",
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index f58c7007ef..bca367bfb1 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -25,9 +25,6 @@
 # @param maxconnectionsperchild
 #   Limit on the number of connections that an individual child server will handle during its life.
 #
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-#
 # @param listenbacklog
 #   Maximum length of the queue of pending connections.
 # 
@@ -42,19 +39,12 @@
   Optional[Integer] $maxrequestworkers      = undef,
   Integer $maxrequestsperchild              = 4000,
   Optional[Integer] $maxconnectionsperchild = undef,
-  Optional[String] $apache_version          = undef,
   Integer $listenbacklog                    = 511
 ) {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
   }
-  if versioncmp($_apache_version, '2.4') < 0 {
-    if defined(Class['apache::mod::itk']) {
-      fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
-    }
-  }
   if defined(Class['apache::mod::peruser']) {
     fail('May not include both apache::mod::prefork and apache::mod::peruser on the same node')
   }
@@ -62,14 +52,6 @@
     fail('May not include both apache::mod::prefork and apache::mod::worker on the same node')
   }
 
-  if versioncmp($_apache_version, '2.3.13') < 0 {
-    if $maxrequestworkers == undef {
-      warning("For newer versions of Apache, \$maxclients is deprecated, please use \$maxrequestworkers.")
-    } elsif $maxconnectionsperchild == undef {
-      warning("For newer versions of Apache, \$maxrequestsperchild is deprecated, please use \$maxconnectionsperchild.")
-    }
-  }
-
   File {
     owner => 'root',
     group => $apache::params::root_group,
@@ -94,31 +76,12 @@
   }
 
   case $facts['os']['family'] {
-    'redhat': {
-      if versioncmp($_apache_version, '2.4') >= 0 {
-        ::apache::mpm { 'prefork':
-          apache_version => $_apache_version,
-        }
-      }
-      else {
-        file_line { '/etc/sysconfig/httpd prefork enable':
-          ensure  => present,
-          path    => '/etc/sysconfig/httpd',
-          line    => '#HTTPD=/usr/sbin/httpd.worker',
-          match   => '#?HTTPD=/usr/sbin/httpd.worker',
-          require => Package['httpd'],
-          notify  => Class['apache::service'],
-        }
-      }
-    }
-    'debian', 'freebsd': {
+    'redhat', 'debian', 'freebsd': {
       ::apache::mpm { 'prefork':
-        apache_version => $_apache_version,
       }
     }
     'Suse': {
       ::apache::mpm { 'prefork':
-        apache_version => $apache_version,
         lib_path       => '/usr/lib64/apache2-prefork',
       }
     }
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 35c44c22c7..a124fe9d24 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -7,9 +7,6 @@
 # @param allow_from
 #   List of IPs allowed to access proxy.
 #
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-#
 # @param package_name
 #   Name of the proxy package to install.
 #
@@ -26,8 +23,7 @@
 #
 class apache::mod::proxy (
   String $proxy_requests                              = 'Off',
-  Optional[String] $allow_from                        = undef,
-  Optional[String] $apache_version                    = undef,
+  Optional[Stdlib::IP::Address] $allow_from           = undef,
   Optional[String] $package_name                      = undef,
   String $proxy_via                                   = 'On',
   Optional[Variant[Integer[0],String]] $proxy_timeout = undef,
@@ -35,11 +31,10 @@
 ) {
   include apache
   $_proxy_timeout = $apache::timeout
-  $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'proxy':
     package => $package_name,
   }
-  # Template uses $proxy_requests, $_apache_version
+  # Template uses $proxy_requests
   file { 'proxy.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/proxy.conf",
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index de7947a4fc..65f136b6fa 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -10,23 +10,16 @@
 # @param allow_from
 #   List of IPs from which the balancer manager can be accessed.
 #
-# @param apache_version
-#   Version of Apache to install module on.
-# 
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html for additional documentation.
 #
 class apache::mod::proxy_balancer (
   Boolean $manager                       = false,
   Stdlib::Unixpath $manager_path         = '/balancer-manager',
   Array[Stdlib::IP::Address] $allow_from = ['127.0.0.1', '::1'],
-  Optional[String] $apache_version       = $apache::apache_version,
 ) {
   require apache::mod::proxy
   require apache::mod::proxy_http
-  if versioncmp($apache_version, '2.4') >= 0 {
-    ::apache::mod { 'slotmem_shm': }
-  }
-
+  ::apache::mod { 'slotmem_shm': }
   ::apache::mod { 'proxy_balancer': }
   if $manager {
     include apache::mod::status
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index da57b5dbcf..54f49f7b54 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -36,9 +36,7 @@
           $loadfiles = ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"]
         }
       }
-      if versioncmp($apache::apache_version, '2.4') >= 0 {
-        ::apache::mod { 'xml2enc': }
-      }
+      ::apache::mod { 'xml2enc': }
     }
     default: {}
   }
diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index addc966fa8..e20eec5def 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -47,10 +47,6 @@
 #   that are trusted to set a valid value inside the specified header. See
 #   `$trusted_proxy` for details.
 #
-# @param apache_version
-#   A version string used to validate that your apache version supports
-#   `mod_remoteip`. If not specified, `$::apache::apache_version` is used.
-#
 # @see https://httpd.apache.org/docs/current/mod/mod_remoteip.html for additional documentation.
 #
 class apache::mod::remoteip (
@@ -64,15 +60,9 @@
   Optional[Array[Stdlib::Host]]                              $trusted_proxy             = undef,
   Optional[Array[Stdlib::Host]]                              $trusted_proxy_ips         = undef,
   Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,
-  Optional[String]                                           $apache_version            = undef,
 ) {
   include apache
 
-  $_apache_version = pick($apache_version, $apache::apache_version)
-  if versioncmp($_apache_version, '2.4') < 0 {
-    fail('mod_remoteip is only available in Apache 2.4')
-  }
-
   if $proxy_ips {
     deprecation('apache::mod::remoteip::proxy_ips', 'This parameter is deprecated, please use `internal_proxy`.')
     $_internal_proxy = $proxy_ips
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 2ee58dd2a9..f17a940188 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -75,9 +75,6 @@
 # @param ssl_reload_on_change
 #   Enable reloading of apache if the content of ssl files have changed. It only affects ssl files configured here and not vhost ones.
 #
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-#
 # @param package_name
 #   Name of ssl package to install.
 #
@@ -110,42 +107,12 @@
   Boolean $ssl_stapling                                     = false,
   Optional[String] $stapling_cache                          = undef,
   Optional[Boolean] $ssl_stapling_return_errors             = undef,
-  Optional[String] $ssl_mutex                               = undef,
+  String $ssl_mutex                                         = 'default',
   Boolean $ssl_reload_on_change                             = false,
-  Optional[String] $apache_version                          = undef,
   Optional[String] $package_name                            = undef,
 ) inherits apache::params {
   include apache
   include apache::mod::mime
-  $_apache_version = pick($apache_version, $apache::apache_version)
-  if $ssl_mutex {
-    $_ssl_mutex = $ssl_mutex
-  } else {
-    case $facts['os']['family'] {
-      'debian': {
-        if versioncmp($_apache_version, '2.4') >= 0 {
-          $_ssl_mutex = 'default'
-        } else {
-          $_ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex"
-        }
-      }
-      'redhat': {
-        $_ssl_mutex = 'default'
-      }
-      'freebsd': {
-        $_ssl_mutex = 'default'
-      }
-      'gentoo': {
-        $_ssl_mutex = 'default'
-      }
-      'Suse': {
-        $_ssl_mutex = 'default'
-      }
-      default: {
-        fail("Unsupported osfamily ${$facts['os']['family']}, please explicitly pass in \$ssl_mutex")
-      }
-    }
-  }
 
   if $ssl_honorcipherorder =~ Boolean {
     $_ssl_honorcipherorder = $ssl_honorcipherorder
@@ -185,9 +152,7 @@
     }
   }
 
-  if versioncmp($_apache_version, '2.4') >= 0 {
-    include apache::mod::socache_shmcb
-  }
+  include apache::mod::socache_shmcb
 
   if $ssl_reload_on_change {
     [$ssl_cert, $ssl_key, $ssl_ca].each |$ssl_file| {
@@ -222,7 +187,6 @@
   # $ssl_mutex
   # $ssl_random_seed_bytes
   # $ssl_sessioncachetimeout
-  # $_apache_version
   file { 'ssl.conf':
     ensure  => file,
     path    => $apache::_ssl_file,
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index d9c741c23e..37b138a0a3 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -1,11 +1,6 @@
 # @summary
 #   Installs and configures `mod_status`.
 #
-# @param allow_from
-#   Array of hosts, ip addresses, partial network numbers or networks, in CIDR notation specifying what hosts can view the special
-#   /server-status URL.  Defaults to ['127.0.0.1', '::1']. 
-#   > Creates Apache < 2.4 directive "Allow from".
-#
 # @param requires
 #   A Variant type that can be:
 #   - String with:
@@ -19,7 +14,6 @@
 #     - 'enforce' - Value => String 'Any', 'All' or 'None'
 #       This encloses "Require" directives in "<Require(Any|All|None)>" block
 #       Optional - If unspecified, "Require" directives follow current flow
-#   > Creates Apache >= 2.4 directives "Require"
 #
 # @param extended_status
 #   Determines whether to track extended status information for each request, via the ExtendedStatus directive.
@@ -27,33 +21,25 @@
 # @param status_path 
 #   Path assigned to the Location directive which defines the URL to access the server status.
 #
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-#
 # @example
 #   # Simple usage allowing access from localhost and a private subnet
 #   class { 'apache::mod::status':
-#     $allow_from => ['127.0.0.1', '10.10.10.10/24'],
+#     $requires => 'ip 127.0.0.1 ::1 10.10.10.10/24',
 #   }
 #
 # @see http://httpd.apache.org/docs/current/mod/mod_status.html for additional documentation.
 #
 class apache::mod::status (
-  Optional[Array] $allow_from                      = undef,
   Optional[Variant[String, Array, Hash]] $requires = undef,
   Enum['On', 'Off', 'on', 'off'] $extended_status  = 'On',
-  Optional[String] $apache_version                 = undef,
   String $status_path                              = '/server-status',
 ) inherits apache::params {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'status': }
 
-  # Defaults for "Allow from" or "Require" directives
-  $allow_defaults = ['127.0.0.1', '::1']
   $requires_defaults = 'ip 127.0.0.1 ::1'
 
-  # Template uses $allow_from, $extended_status, $_apache_version, $status_path
+  # Template uses $extended_status, $status_path
   file { 'status.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/status.conf",
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index c26c33c200..ffd7942b06 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -13,9 +13,6 @@
 # @param disable_root
 #   Toggles whether to allow use of root directory.
 # 
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-# 
 # @param path
 #   Path to directory or pattern from which to find user-specific directories.
 # 
@@ -38,7 +35,6 @@
   Optional[String] $dir             = undef,
   Optional[String[1]] $userdir      = undef,
   Boolean $disable_root             = true,
-  Optional[String] $apache_version  = undef,
   String $path                      = '/home/*/public_html',
   Array[String] $overrides          = ['FileInfo', 'AuthConfig', 'Limit', 'Indexes'],
   Array[String] $options            = ['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec'],
@@ -46,7 +42,6 @@
   Optional[String] $custom_fragment = undef,
 ) {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
 
   if $home or $dir {
     $_home = $home ? {
@@ -67,7 +62,7 @@
 
   ::apache::mod { 'userdir': }
 
-  # Template uses $home, $dir, $disable_root, $_apache_version
+  # Template uses $home, $dir, $disable_root
   file { 'userdir.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/userdir.conf",
diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
deleted file mode 100644
index 212ef4a7bd..0000000000
--- a/manifests/mod/version.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# @summary
-#   Installs `mod_version`.
-# 
-# @param apache_version
-#   Used to verify that the Apache version you have requested is compatible with the module.
-# 
-# @see https://httpd.apache.org/docs/current/mod/mod_version.html for additional documentation.
-#
-class apache::mod::version (
-  Optional[String] $apache_version = $apache::apache_version
-) {
-  if ($facts['os']['family'] == 'debian' and versioncmp($apache_version, '2.4') >= 0) {
-    warning("${module_name}: module version_module is built-in and can't be loaded")
-  } else {
-    ::apache::mod { 'version': }
-  }
-}
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 652f9606d0..ef6a97d7b2 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -4,12 +4,6 @@
 # @param startservers
 #   The number of child server processes created on startup
 #
-# @param maxclients
-#   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 maxrequestworkers is set, this value is ignored.
-#
 # @param minsparethreads
 #   Minimum number of idle threads to handle request spikes.
 #
@@ -38,18 +32,13 @@
 # @param listenbacklog
 #    Maximum length of the queue of pending connections.
 #
-# @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 (
   Integer $startservers            = 2,
-  Integer $maxclients              = 150,
   Integer $minsparethreads         = 25,
   Integer $maxsparethreads         = 75,
   Integer $threadsperchild         = 25,
@@ -57,11 +46,9 @@
   Integer $serverlimit             = 25,
   Integer $threadlimit             = 64,
   Integer $listenbacklog           = 511,
-  Optional[String] $apache_version = undef,
-  Optional[Integer] $maxrequestworkers = undef,
+  Integer $maxrequestworkers       = 150,
 ) {
   include apache
-  $_apache_version = pick($apache_version, $apache::apache_version)
 
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::worker and apache::mod::event on the same node')
@@ -83,7 +70,7 @@
 
   # Template uses:
   # - $startservers
-  # - $maxclients
+  # - $maxrequestworkers
   # - $minsparethreads
   # - $maxsparethreads
   # - $threadsperchild
@@ -100,33 +87,13 @@
   }
 
   case $facts['os']['family'] {
-    'redhat': {
-      if versioncmp($_apache_version, '2.4') >= 0 {
-        ::apache::mpm { 'worker':
-          apache_version => $_apache_version,
-        }
-      }
-      else {
-        file_line { '/etc/sysconfig/httpd worker enable':
-          ensure  => present,
-          path    => '/etc/sysconfig/httpd',
-          line    => 'HTTPD=/usr/sbin/httpd.worker',
-          match   => '#?HTTPD=/usr/sbin/httpd.worker',
-          require => Package['httpd'],
-          notify  => Class['apache::service'],
-        }
-      }
-    }
-
-    'debian', 'freebsd': {
+    'redhat', 'debian', 'freebsd': {
       ::apache::mpm { 'worker':
-        apache_version => $_apache_version,
       }
     }
     'Suse': {
       ::apache::mpm { 'worker':
-        apache_version => $apache_version,
-        lib_path       => '/usr/lib64/apache2-worker',
+        lib_path => '/usr/lib64/apache2-worker',
       }
     }
 
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index eb802889d9..24cef5608c 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -3,7 +3,6 @@
 # @api private
 define apache::mpm (
   String $lib_path                 = $apache::lib_path,
-  Optional[String] $apache_version = $apache::apache_version,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
@@ -18,32 +17,28 @@
 
   if $facts['os']['family'] == 'Suse' {
     #mpms on Suse 12 don't use .so libraries so create a placeholder load file
-    if versioncmp($apache_version, '2.4') >= 0 {
-      file { "${mod_dir}/${mpm}.load":
-        ensure  => file,
-        path    => "${mod_dir}/${mpm}.load",
-        content => '',
-        require => [
-          Package['httpd'],
-          Exec["mkdir ${mod_dir}"],
-        ],
-        before  => File[$mod_dir],
-        notify  => Class['apache::service'],
-      }
+    file { "${mod_dir}/${mpm}.load":
+      ensure  => file,
+      path    => "${mod_dir}/${mpm}.load",
+      content => '',
+      require => [
+        Package['httpd'],
+        Exec["mkdir ${mod_dir}"],
+      ],
+      before  => File[$mod_dir],
+      notify  => Class['apache::service'],
     }
   } else {
-    if versioncmp($apache_version, '2.4') >= 0 {
-      file { "${mod_dir}/${mpm}.load":
-        ensure  => file,
-        path    => "${mod_dir}/${mpm}.load",
-        content => "LoadModule ${_id} ${_path}\n",
-        require => [
-          Package['httpd'],
-          Exec["mkdir ${mod_dir}"],
-        ],
-        before  => File[$mod_dir],
-        notify  => Class['apache::service'],
-      }
+    file { "${mod_dir}/${mpm}.load":
+      ensure  => file,
+      path    => "${mod_dir}/${mpm}.load",
+      content => "LoadModule ${_id} ${_path}\n",
+      require => [
+        Package['httpd'],
+        Exec["mkdir ${mod_dir}"],
+      ],
+      before  => File[$mod_dir],
+      notify  => Class['apache::service'],
     }
   }
 
@@ -57,30 +52,20 @@
         notify  => Class['apache::service'],
       }
 
-      if versioncmp($apache_version, '2.4') >= 0 {
-        file { "${apache::mod_enable_dir}/${mpm}.load":
-          ensure  => link,
-          target  => "${apache::mod_dir}/${mpm}.load",
-          require => Exec["mkdir ${apache::mod_enable_dir}"],
-          before  => File[$apache::mod_enable_dir],
-          notify  => Class['apache::service'],
-        }
+      file { "${apache::mod_enable_dir}/${mpm}.load":
+        ensure  => link,
+        target  => "${apache::mod_dir}/${mpm}.load",
+        require => Exec["mkdir ${apache::mod_enable_dir}"],
+        before  => File[$apache::mod_enable_dir],
+        notify  => Class['apache::service'],
+      }
 
-        if $mpm == 'itk' {
-          file { "${lib_path}/mod_mpm_itk.so":
-            ensure  => link,
-            target  => "${lib_path}/mpm_itk.so",
-            require => Package['httpd'],
-            before  => Class['apache::service'],
-          }
-        }
-      } else {
-        package { "apache2-mpm-${mpm}":
-          ensure => present,
-          before => [
-            Class['apache::service'],
-            File[$apache::mod_enable_dir],
-          ],
+      if $mpm == 'itk' {
+        file { "${lib_path}/mod_mpm_itk.so":
+          ensure  => link,
+          target  => "${lib_path}/mpm_itk.so",
+          require => Package['httpd'],
+          before  => Class['apache::service'],
         }
       }
 
@@ -127,20 +112,18 @@
         notify  => Class['apache::service'],
       }
 
-      if versioncmp($apache_version, '2.4') >= 0 {
-        file { "${apache::mod_enable_dir}/${mpm}.load":
-          ensure  => link,
-          target  => "${apache::mod_dir}/${mpm}.load",
-          require => Exec["mkdir ${apache::mod_enable_dir}"],
-          before  => File[$apache::mod_enable_dir],
-          notify  => Class['apache::service'],
-        }
+      file { "${apache::mod_enable_dir}/${mpm}.load":
+        ensure  => link,
+        target  => "${apache::mod_dir}/${mpm}.load",
+        require => Exec["mkdir ${apache::mod_enable_dir}"],
+        before  => File[$apache::mod_enable_dir],
+        notify  => Class['apache::service'],
+      }
 
-        if $mpm == 'itk' {
-          file { "${lib_path}/mod_mpm_itk.so":
-            ensure => link,
-            target => "${lib_path}/mpm_itk.so",
-          }
+      if $mpm == 'itk' {
+        file { "${lib_path}/mod_mpm_itk.so":
+          ensure => link,
+          target => "${lib_path}/mpm_itk.so",
         }
       }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 6e6870a6ab..1d2068ad68 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -64,10 +64,7 @@
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
     $puppet_ssl_dir       = "${httpd_dir}/puppet_ssl"
-    $mod_dir              = $facts['os']['release']['major'] ? {
-      '7'     => "${httpd_dir}/conf.modules.d",
-      default => "${httpd_dir}/conf.d",
-    }
+    $mod_dir              = "${httpd_dir}/conf.modules.d"
     $mod_enable_dir       = undef
     $vhost_dir            = "${httpd_dir}/conf.d"
     $vhost_enable_dir     = undef
@@ -106,14 +103,8 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = "${httpd_root}/var/www/html"
-    $alias_icons_path     = $facts['os']['release']['major'] ? {
-      '7'     => "${httpd_root}/usr/share/httpd/icons",
-      default => '/var/www/icons',
-    }
-    $error_documents_path = $facts['os']['release']['major'] ? {
-      '7'     => "${httpd_root}/usr/share/httpd/error",
-      default => '/var/www/error'
-    }
+    $alias_icons_path     = "${httpd_root}/usr/share/httpd/icons"
+    $error_documents_path = "${httpd_root}/usr/share/httpd/error"
     if $facts['os']['family'] == 'RedHat' {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
@@ -168,15 +159,7 @@
     $confd_dir            = "${httpd_dir}/conf.d"
     $puppet_ssl_dir       = "${httpd_dir}/puppet_ssl"
     $conf_enabled         = undef
-    if $facts['os']['name'] =~ /^[Aa]mazon$/ and $facts['os']['release']['major'] == '2' {
-      # Amazon Linux 2 uses the /conf.modules.d/ dir
-      $mod_dir            = "${httpd_dir}/conf.modules.d"
-    } else {
-      $mod_dir              = $facts['os']['release']['major'] ? {
-        '6'     => "${httpd_dir}/conf.d",
-        default => "${httpd_dir}/conf.modules.d",
-      }
-    }
+    $mod_dir              = "${httpd_dir}/conf.modules.d"
     $mod_enable_dir       = undef
     $vhost_dir            = "${httpd_dir}/conf.d"
     $vhost_enable_dir     = undef
@@ -208,19 +191,12 @@
       'auth_gssapi'           => 'mod_auth_gssapi',
       'auth_mellon'           => 'mod_auth_mellon',
       'auth_openidc'          => 'mod_auth_openidc',
-      'authnz_ldap'           => $facts['os']['release']['major'] ? {
-        '6'     => 'mod_authz_ldap',
-        default => 'mod_ldap',
-      },
+      'authnz_ldap'           => 'mod_ldap',
       'authnz_pam'            => 'mod_authnz_pam',
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
       'intercept_form_submit' => 'mod_intercept_form_submit',
-      'ldap'                  => $facts['os']['release']['major'] ? {
-        '5'     => undef,
-        '6'     => undef,
-        default => 'mod_ldap',
-      },
+      'ldap'                  => 'mod_ldap',
       'lookup_identity'       => 'mod_lookup_identity',
       'md'                    => 'mod_md',
       'pagespeed'             => 'mod-pagespeed-stable',
@@ -230,10 +206,6 @@
       # https://www.phusionpassenger.com/library/install/apache/install/oss/el7/
       'passenger'             => 'mod_passenger',
       'perl'                  => 'mod_perl',
-      'php5'                  => $facts['os']['release']['major'] ? {
-        '5'     => 'php53',
-        default => 'php',
-      },
       'phpXXX'                => 'php',
       'proxy_html'            => 'mod_proxy_html',
       'python'                => 'mod_python',
@@ -244,7 +216,6 @@
       'shibboleth'            => 'shibboleth',
       'ssl'                   => 'mod_ssl',
       'wsgi'                  => $facts['os']['release']['major'] ? {
-        '6'     => 'mod_wsgi',         # RedHat6
         '7'     => 'mod_wsgi',         # RedHat7
         default => 'python3-mod_wsgi', # RedHat8+
       },
@@ -256,7 +227,6 @@
     $mod_libs             = {
       'nss' => 'libmodnss.so',
       'wsgi'                  => $facts['os']['release']['major'] ? {
-        '6'     => 'mod_wsgi.so',
         '7'     => 'mod_wsgi.so',
         default => 'mod_wsgi_python3.so',
       },
@@ -269,14 +239,8 @@
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
     $docroot              = '/var/www/html'
-    $alias_icons_path     = $facts['os']['release']['major'] ? {
-      '6'     => '/var/www/icons',
-      default => '/usr/share/httpd/icons',
-    }
-    $error_documents_path = $facts['os']['release']['major'] ? {
-      '6'     => '/var/www/error',
-      default => '/usr/share/httpd/error',
-    }
+    $alias_icons_path     = '/usr/share/httpd/icons'
+    $error_documents_path = '/usr/share/httpd/error'
     if $facts['os']['family'] == 'RedHat' {
       $wsgi_socket_prefix = '/var/run/wsgi'
     } else {
diff --git a/manifests/version.pp b/manifests/version.pp
index 2bd69b6842..8f96503045 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -6,37 +6,4 @@
   Optional[String] $scl_httpd_version = undef,
   Optional[String] $scl_php_version   = undef,
 ) {
-  case $facts['os']['family'] {
-    'RedHat': {
-      if $scl_httpd_version {
-        $default = $scl_httpd_version
-      }
-      elsif ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] == '2') {
-        $default = '2.4'
-      } elsif $facts['os']['name'] == 'Fedora' or versioncmp($facts['os']['release']['major'], '7') >= 0 {
-        $default = '2.4'
-      } else {
-        $default = '2.2'
-      }
-    }
-    'Debian': {
-      $default = '2.4'
-    }
-    'FreeBSD': {
-      $default = '2.4'
-    }
-    'Gentoo': {
-      $default = '2.4'
-    }
-    'Suse': {
-      if ($facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['major'], '12') >= 0) or ($facts['os']['name'] == 'OpenSuSE' and versioncmp($facts['os']['release']['major'], '42') >= 0) {
-        $default = '2.4'
-      } else {
-        $default = '2.2'
-      }
-    }
-    default: {
-      fail("Class['apache::version']: Unsupported osfamily: ${$facts['os']['family']}")
-    }
-  }
 }
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a4db687704..2eeacb1f68 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -27,9 +27,6 @@
 #     default_ssl_vhost => false,
 #   }
 #
-# @param apache_version
-#   Apache's version number as a string, such as '2.2' or '2.4'.
-#
 # @param access_log
 #   Determines whether to configure `*_access.log` directives (`*_file`, `*_pipe`, or `*_syslog`).
 # 
@@ -1841,7 +1838,6 @@
   Optional[String] $action                                                            = undef,
   Variant[Array[String], String] $additional_includes                                 = [],
   Boolean $use_optional_includes                                                      = $apache::use_optional_includes,
-  Optional[String] $apache_version                                                    = $apache::apache_version,
   Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                      = undef,
   Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                             = undef,
 
@@ -2086,13 +2082,6 @@
     }
   }
 
-  if versioncmp($apache_version, '2.4') >= 0 {
-    $error_log_format24 = $error_log_format
-  }
-  else {
-    $error_log_format24 = undef
-  }
-
   if $modsec_audit_log == false {
     $modsec_audit_log_destination = undef
   } elsif $modsec_audit_log_file {
@@ -2143,36 +2132,19 @@
       ensure_resource('apache::listen', $listen_addr_port)
     }
   }
-  if ! $ip_based {
-    if $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) {
-      ensure_resource('apache::namevirtualhost', $nvh_addr_port)
-    }
-  }
 
   ## Create a default directory list if none defined
   if $directories {
     $_directories = $directories
   } elsif $docroot {
-    $_directory = {
+    $_directories = [{
       provider       => 'directory',
       path           => $docroot,
       options        => $options,
       allow_override => $override,
       directoryindex => $directoryindex,
-    }
-
-    if versioncmp($apache_version, '2.4') >= 0 {
-      $_directory_version = {
-        require => 'all granted',
-      }
-    } else {
-      $_directory_version = {
-        order => 'allow,deny',
-        allow => 'from all',
-      }
-    }
-
-    $_directories = [merge($_directory, $_directory_version)]
+      require        => 'all granted',
+    }]
   } else {
     $_directories = undef
   }
@@ -2239,7 +2211,6 @@
   # - $serveradmin
   # - $protocols
   # - $protocols_honor_order
-  # - $apache_version
   # - $mdomain
   concat::fragment { "${name}-apache-header":
     target  => "${priority_real}${filename}.conf",
@@ -2309,7 +2280,6 @@
   # Template uses:
   # - $_directories
   # - $docroot
-  # - $apache_version
   # - $shibboleth_enabled
   if $_directories and ! empty($_directories) and $ensure == 'present' {
     $_directories.each |Hash $directory| {
@@ -2365,7 +2335,7 @@
 
   # Template uses:
   # - $error_log
-  # - $error_log_format24
+  # - $error_log_format
   # - $log_level
   # - $error_log_destination
   # - $log_level
@@ -2410,7 +2380,6 @@
 
   # Template uses:
   # - $block
-  # - $apache_version
   if $block and ! empty($block) {
     concat::fragment { "${name}-block":
       target  => "${priority_real}${filename}.conf",
@@ -2590,7 +2559,6 @@
   # - $ssl_options
   # - $ssl_openssl_conf_cmd
   # - $ssl_stapling
-  # - $apache_version
   # - $mdomain
   if $ssl and $ensure == 'present' {
     include apache::mod::ssl
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index fa9d3a2f74..d87a9744e4 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -10,20 +10,6 @@
       idempotent_apply(pp)
     end
 
-    describe 'apache_version fact' do
-      let(:result) do
-        apply_manifest('include apache', catch_failures: true)
-        version_check_pp = <<-MANIFEST
-        notice("apache_version = >${apache_version}<")
-        MANIFEST
-        apply_manifest(version_check_pp, catch_failures: true)
-      end
-
-      it {
-        expect(result.stdout).to match(%r{apache_version = >#{apache_hash['version']}.*<})
-      }
-    end
-
     describe package(apache_hash['package_name']) do
       it { is_expected.to be_installed }
     end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 3c8ef66df8..fd412d9fff 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -326,14 +326,7 @@ class { 'apache': }
       pp_one = <<-MANIFEST
         class { 'apache': }
 
-        if versioncmp($apache_version, '2.4') >= 0 {
-          $_files_match_directory = [{ 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }]
-        } else {
-          $_files_match_directory = [
-            { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' },
-            { 'path' => '/bar/bar.html', 'provider' => 'location', allow => [ 'from 127.0.0.1', ] },
-          ]
-        }
+        $_files_match_directory = [{ 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }]
 
         $_directories = [
           { 'path' => '/var/www/files', },
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 46f7ff8a38..0d5cda12ae 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -65,18 +65,9 @@
       it { is_expected.not_to contain_file("#{modname}.conf symlink") }
     end
 
-    context 'with Apache version < 2.4' do
-      let :params do
-        { apache_version: '2.2' }
-      end
-
-      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
-    end
-
-    context 'with Apache version >= 2.4' do
+    context 'with use_optional_includes' do
       let :params do
         {
-          apache_version: '2.4',
           use_optional_includes: true,
         }
       end
@@ -156,35 +147,6 @@
       }
     end
 
-    describe "Check default type with Apache version < 2.2 when default_type => 'none'" do
-      let :params do
-        {
-          apache_version: '2.2',
-          default_type: 'none',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^DefaultType none$} }
-    end
-    describe "Check default type with Apache version < 2.2 when default_type => 'text/plain'" do
-      let :params do
-        {
-          apache_version: '2.2',
-          default_type: 'text/plain',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^DefaultType text/plain$} }
-    end
-
-    describe 'Check default type with Apache version >= 2.4' do
-      let :params do
-        { apache_version: '2.4' }
-      end
-
-      it { is_expected.to contain_file('/etc/apache2/apache2.conf').without_content %r{^DefaultType [.]*$} }
-    end
-
     describe "Don't create user resource when parameter manage_user is false" do
       let :params do
         { manage_user: false }
@@ -343,69 +305,18 @@
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end
-    describe 'Alternate confd/mod/vhosts directory with Apache version < 2.4' do
-      let :params do
-        {
-          vhost_dir: '/etc/httpd/site.d',
-          confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
-          apache_version: '2.2',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
-    end
-    describe 'Alternate confd/mod/vhosts directory with Apache version >= 2.4' do
+    describe 'Alternate confd/mod/vhosts directory' do
       let :params do
         {
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
           mod_dir: '/etc/httpd/mod.d',
-          apache_version: '2.4',
           use_optional_includes: true,
         }
       end
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
     end
-    describe 'Alternate confd/mod/vhosts directory with Apache version < 2.4' do
-      let :params do
-        {
-          vhost_dir: '/etc/httpd/site.d',
-          confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
-          apache_version: '2.2',
-          rewrite_lock: '/var/lock/subsys/rewrite-lock',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^RewriteLock /var/lock/subsys/rewrite-lock$} }
-    end
-    describe 'Alternate confd/mod/vhosts directory with Apache version < 2.4' do
-      let :params do
-        {
-          vhost_dir: '/etc/httpd/site.d',
-          confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
-          apache_version: '2.2',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').without_content %r{^RewriteLock [.]*$} }
-    end
-    describe 'Alternate confd/mod/vhosts directory with Apache version >= 2.4' do
-      let :params do
-        {
-          vhost_dir: '/etc/httpd/site.d',
-          confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
-          apache_version: '2.4',
-          rewrite_lock: '/var/lock/subsys/rewrite-lock',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').without_content %r{^RewriteLock [.]*$} }
-    end
     describe 'Alternate confd/mod/vhosts directory when specifying slash encoding behaviour' do
       let :params do
         {
@@ -431,44 +342,6 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^AddDefaultCharset none$} }
     end
-    describe "Alternate confd/mod/vhosts directory with Apache version < 2.4 when default_type => 'none'" do
-      let :params do
-        {
-          vhost_dir: '/etc/httpd/site.d',
-          confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
-          apache_version: '2.2',
-          default_type: 'none',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^DefaultType none$} }
-    end
-    describe "Alternate confd/mod/vhosts directory with Apache version < 2.4 when default_type => 'text/plain'" do
-      let :params do
-        {
-          vhost_dir: '/etc/httpd/site.d',
-          confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
-          apache_version: '2.2',
-          default_type: 'text/plain',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^DefaultType text/plain$} }
-    end
-    describe 'Alternate confd/mod/vhosts directory with Apache version >= 2.4' do
-      let :params do
-        {
-          vhost_dir: '/etc/httpd/site.d',
-          confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
-          apache_version: '2.4',
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').without_content %r{^DefaultType [.]*$} }
-    end
 
     describe 'Alternate conf directory' do
       let :params do
@@ -639,12 +512,6 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^HostnameLookups Double\n} }
     end
-
-    context 'on Fedora 28' do
-      include_examples 'Fedora 28'
-
-      it { is_expected.to contain_class('apache').with_apache_version('2.4') }
-    end
   end
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 10'
@@ -774,20 +641,9 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options -Indexes -FollowSymLinks} }
     end
-    context 'with a custom root_directory_secured parameter and Apache < 2.4' do
-      let :params do
-        {
-          apache_version: '2.2',
-          root_directory_secured: true,
-        }
-      end
-
-      it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Order deny,allow\n\s+Deny from all} }
-    end
-    context 'with a custom root_directory_secured parameter and Apache >= 2.4' do
+    context 'with a custom root_directory_secured parameter' do
       let :params do
         {
-          apache_version: '2.4',
           root_directory_secured: true,
         }
       end
diff --git a/spec/classes/mod/data_spec.rb b/spec/classes/mod/data_spec.rb
index 52a19f057d..6456104120 100644
--- a/spec/classes/mod/data_spec.rb
+++ b/spec/classes/mod/data_spec.rb
@@ -5,18 +5,7 @@
 describe 'apache::mod::data', type: :class do
   context 'on a Debian OS' do
     include_examples 'Debian 11'
-    let :params do
-      { apache_version: '2.4' }
-    end
 
     it { is_expected.to contain_apache__mod('data') }
-
-    describe 'with Apache version < 2.3' do
-      let :params do
-        { apache_version: '2.2' }
-      end
-
-      it { is_expected.to compile.and_raise_error(%r{mod_data is only available in Apache 2.3 and later}) }
-    end
   end
 end
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 7164c424e8..d7dd466829 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -12,50 +12,22 @@
       }
     end
 
-    context 'with Apache version < 2.4' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.2",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_apache__mod('disk_cache') }
-      it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }
-    end
-    context 'with Apache version >= 2.4' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache__mod('cache_disk') }
-      it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }
-    end
+    let :pre_condition do
+      'class{ "apache":
+        default_mods   => ["cache"],
+        mod_dir        => "/tmp/junk",
+       }'
+    end
+
+    it { is_expected.to compile }
+    it { is_expected.to contain_class('apache::mod::disk_cache') }
+    it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+    it { is_expected.to contain_apache__mod('cache_disk') }
+    it {
+      is_expected.to contain_file('disk_cache.conf')
+        .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+    }
     context 'with $default_cache_enable = false' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
       let(:params) { { 'default_cache_enable' => false } }
 
       it { is_expected.to compile }
@@ -68,14 +40,6 @@
       }
     end
     context 'with $default_cache_enable = true' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
       let(:params) { { 'default_cache_enable' => true } }
 
       it { is_expected.to compile }
@@ -88,14 +52,6 @@
       }
     end
     context 'with $default_cache_enable = foo' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
       it { is_expected.not_to compile }
@@ -111,45 +67,20 @@
       }
     end
 
-    context 'with Apache version < 2.4' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.2",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
-      it { is_expected.to contain_apache__mod('disk_cache') }
-      it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }
+    let :pre_condition do
+      'class{ "apache":
+        default_mods   => ["cache"],
+        mod_dir        => "/tmp/junk",
+       }'
     end
-    context 'with Apache version >= 2.4' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
 
-      it { is_expected.to contain_apache__mod('cache_disk') }
-      it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }
-    end
-    context 'with $default_cache_enable = false' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
+    it { is_expected.to contain_apache__mod('cache_disk') }
+    it {
+      is_expected.to contain_file('disk_cache.conf')
+        .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+    }
 
+    context 'with $default_cache_enable = false' do
       let(:params) { { 'default_cache_enable' => false } }
 
       it { is_expected.to compile }
@@ -162,14 +93,6 @@
       }
     end
     context 'with $default_cache_enable = true' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
       let(:params) { { 'default_cache_enable' => true } }
 
       it { is_expected.to compile }
@@ -182,14 +105,6 @@
       }
     end
     context 'with $default_cache_enable = foo' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
       it { is_expected.not_to compile }
@@ -204,51 +119,23 @@
       }
     end
 
-    context 'with Apache version < 2.4' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.2",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
-      it { is_expected.to compile }
-      it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache__mod('disk_cache') }
-      it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }
+    let :pre_condition do
+      'class{ "apache":
+        default_mods   => ["cache"],
+        mod_dir        => "/tmp/junk",
+       }'
     end
-    context 'with Apache version >= 2.4' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
 
-      it { is_expected.to compile }
-      it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
-      it { is_expected.to contain_apache__mod('cache_disk') }
-      it {
-        is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
-      }
-    end
-    context 'with $default_cache_enable = false' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
+    it { is_expected.to compile }
+    it { is_expected.to contain_class('apache::mod::disk_cache') }
+    it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+    it { is_expected.to contain_apache__mod('cache_disk') }
+    it {
+      is_expected.to contain_file('disk_cache.conf')
+        .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+    }
 
+    context 'with $default_cache_enable = false' do
       let(:params) { { 'default_cache_enable' => false } }
 
       it { is_expected.to compile }
@@ -261,14 +148,6 @@
       }
     end
     context 'with $default_cache_enable = true' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
       let(:params) { { 'default_cache_enable' => true } }
 
       it { is_expected.to compile }
@@ -281,14 +160,6 @@
       }
     end
     context 'with $default_cache_enable = foo' do
-      let :pre_condition do
-        'class{ "apache":
-          apache_version => "2.4",
-          default_mods   => ["cache"],
-          mod_dir        => "/tmp/junk",
-         }'
-      end
-
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
       it { is_expected.not_to compile }
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 4ef8179545..2099bd5530 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -34,11 +34,9 @@
         {
           serverlimit: 0,
           startservers: 1,
-          maxclients: 2,
           minsparethreads: 3,
           maxsparethreads: 4,
           threadsperchild: 5,
-          maxrequestsperchild: 6,
           threadlimit: 7,
           listenbacklog: 8,
           maxrequestworkers: 9,
@@ -48,11 +46,9 @@
 
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ServerLimit\s*0}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*StartServers\s*1}) }
-      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxClients}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MinSpareThreads\s*3}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxSpareThreads\s*4}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ThreadsPerChild\s*5}) }
-      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxRequestsPerChild}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ThreadLimit\s*7}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ListenBacklog\s*8}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxRequestWorkers\s*9}) }
@@ -64,11 +60,9 @@
         {
           serverlimit: 0,
           startservers: 1,
-          maxclients: 2,
           minsparethreads: 3,
           maxsparethreads: 4,
           threadsperchild: 5,
-          maxrequestsperchild: 6,
           threadlimit: 7,
           listenbacklog: 8,
           maxrequestworkers: :undef,
@@ -78,11 +72,9 @@
 
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ServerLimit\s*0}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*StartServers\s*1}) }
-      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxClients\s*2}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MinSpareThreads\s*3}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxSpareThreads\s*4}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ThreadsPerChild\s*5}) }
-      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*MaxRequestsPerChild\s*6}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ThreadLimit\s*7}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').with_content(%r{^\s*ListenBacklog\s*8}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxRequestWorkers}) }
@@ -94,11 +86,9 @@
         {
           serverlimit: false,
           startservers: false,
-          maxclients: false,
           minsparethreads: false,
           maxsparethreads: false,
           threadsperchild: false,
-          maxrequestsperchild: false,
           threadlimit: false,
           listenbacklog: false,
           maxrequestworkers: false,
@@ -108,64 +98,33 @@
 
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*ServerLimit}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*StartServers}) }
-      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxClients}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MinSpareThreads}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxSpareThreads}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*ThreadsPerChild}) }
-      it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxRequestsPerChild}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*ThreadLimit}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*ListenBacklog}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxRequestWorkers}) }
       it { is_expected.to contain_file('/etc/apache2/mods-available/event.conf').with_ensure('file').without_content(%r{^\s*MaxConnectionsPerChild}) }
     end
 
-    context 'with Apache version < 2.4' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it { is_expected.not_to contain_file('/etc/apache2/mods-available/event.load') }
-      it { is_expected.not_to contain_file('/etc/apache2/mods-enabled/event.load') }
-
-      it { is_expected.to contain_package('apache2-mpm-event') }
-    end
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
-      it {
-        is_expected.to contain_file('/etc/apache2/mods-available/event.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n")
-      }
-      it { is_expected.to contain_file('/etc/apache2/mods-enabled/event.load').with_ensure('link') }
-    end
+    it {
+      is_expected.to contain_file('/etc/apache2/mods-available/event.load').with('ensure' => 'file',
+                                                                                 'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n")
+    }
+    it { is_expected.to contain_file('/etc/apache2/mods-enabled/event.load').with_ensure('link') }
   end
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.not_to contain_apache__mod('worker') }
-      it { is_expected.not_to contain_apache__mod('prefork') }
+    it { is_expected.to contain_class('apache::params') }
+    it { is_expected.not_to contain_apache__mod('worker') }
+    it { is_expected.not_to contain_apache__mod('prefork') }
 
-      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/event.conf').with_ensure('file') }
+    it { is_expected.to contain_file('/etc/httpd/conf.modules.d/event.conf').with_ensure('file') }
 
-      it {
-        is_expected.to contain_file('/etc/httpd/conf.modules.d/event.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
-      }
-    end
+    it {
+      is_expected.to contain_file('/etc/httpd/conf.modules.d/event.load').with('ensure' => 'file',
+                                                                       'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
+    }
   end
 end
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
index 347dcccad7..530ef32c35 100644
--- a/spec/classes/mod/http2_spec.rb
+++ b/spec/classes/mod/http2_spec.rb
@@ -49,8 +49,6 @@
           h2_tls_warm_up_size: 0,
           h2_upgrade: false,
           h2_window_size: 128_000,
-
-          apache_version: '2.4',
         }
       end
 
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index f981e8310f..3348a4e094 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -15,55 +15,21 @@
     it { is_expected.to contain_file('/etc/apache2/mods-available/itk.conf').with_ensure('file') }
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/itk.conf').with_ensure('link') }
 
-    context 'with Apache version < 2.4' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.load') }
-      it { is_expected.not_to contain_file('/etc/apache2/mods-enabled/itk.load') }
-
-      it { is_expected.to contain_package('apache2-mpm-itk') }
-    end
-    context 'with Apache version < 2.4 with enablecapabilities set' do
-      let :params do
-        {
-          apache_version: '2.2',
-          enablecapabilities: true,
-        }
-      end
-
-      it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.conf').with_content(%r{EnableCapabilities}) }
-    end
-
-    context 'with Apache version >= 2.4' do
+    context 'with prefork mpm' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
 
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
       it {
         is_expected.to contain_file('/etc/apache2/mods-available/itk.load').with('ensure' => 'file',
                                                                                  'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n")
       }
       it { is_expected.to contain_file('/etc/apache2/mods-enabled/itk.load').with_ensure('link') }
     end
-    context 'with Apache version >= 2.4 with enablecapabilities not set' do
+    context 'with enablecapabilities not set' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
 
       it { is_expected.not_to contain_file('/etc/apache2/mods-available/itk.conf').with_content(%r{EnableCapabilities}) }
     end
@@ -77,52 +43,23 @@
     it { is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.conf').with_ensure('file') }
     it { is_expected.to contain_package('httpd-itk') }
 
-    context 'with Apache version < 2.4' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it {
-        is_expected.to contain_file_line('/etc/sysconfig/httpd itk enable').with('require' => 'Package[httpd]')
-      }
-    end
-    context 'with Apache version < 2.4 with enablecapabilities set' do
-      let :params do
-        {
-          apache_version: '2.2',
-          enablecapabilities: 'On',
-        }
-      end
-
-      it { is_expected.not_to contain_file('/etc/httpd/conf.d/itk.conf').with_content(%r{EnableCapabilities}) }
-    end
-
-    context 'with Apache version >= 2.4' do
+    context 'with prefork mpm' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
 
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.load').with('ensure' => 'file',
                                                                        'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
       }
     end
-    context 'with Apache version >= 2.4 with enablecapabilities set' do
+    context 'with enablecapabilities set' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
 
       let :params do
         {
-          apache_version: '2.4',
           enablecapabilities: false,
         }
       end
@@ -143,20 +80,9 @@
     it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_ensure('file') }
     it { is_expected.to contain_package('www/mod_mpm_itk') }
 
-    context 'with Apache version < 2.4 with enablecapabilities not set' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it { is_expected.not_to contain_file('/usr/local/etc/apache24/Modules/itk.conf').with_content(%r{EnableCapabilities}) }
-    end
-
-    context 'with Apache version >= 2.4 with enablecapabilities set' do
+    context 'with enablecapabilities set' do
       let :params do
         {
-          apache_version: '2.4',
           enablecapabilities: true,
         }
       end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index d0c7fdfac2..fa3739239c 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -15,72 +15,22 @@
     it { is_expected.to contain_file('/etc/apache2/mods-available/prefork.conf').with_ensure('file') }
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.conf').with_ensure('link') }
 
-    context 'with Apache version < 2.4' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it { is_expected.not_to contain_file('/etc/apache2/mods-available/prefork.load') }
-      it { is_expected.not_to contain_file('/etc/apache2/mods-enabled/prefork.load') }
-
-      it { is_expected.to contain_package('apache2-mpm-prefork') }
-    end
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
-      it {
-        is_expected.to contain_file('/etc/apache2/mods-available/prefork.load').with('ensure' => 'file',
-                                                                                     'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n")
-      }
-      it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.load').with_ensure('link') }
-    end
+    it {
+      is_expected.to contain_file('/etc/apache2/mods-available/prefork.load').with('ensure' => 'file',
+                                                                                   'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n")
+    }
+    it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.load').with_ensure('link') }
   end
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
-    it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').with_ensure('file') }
-
-    context 'with Apache version < 2.4' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it {
-        is_expected.to contain_file_line('/etc/sysconfig/httpd prefork enable').with('require' => 'Package[httpd]')
-      }
-      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').without('content' => %r{MaxRequestWorkers}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').without('content' => %r{MaxConnectionsPerChild}) }
-    end
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4',
-          maxrequestworkers: 512,
-          maxconnectionsperchild: 4000,
-        }
-      end
-
-      it { is_expected.not_to contain_apache__mod('event') }
-
-      it {
-        is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',
-                                                                           'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
-      }
-      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').without('content' => %r{MaxClients}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.conf').without('content' => %r{MaxRequestsPerChild}) }
-    end
+    it { is_expected.not_to contain_apache__mod('event') }
+    it {
+      is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',
+                                                                         'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
+    }
   end
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index 694989549c..aab4d1478d 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -5,9 +5,6 @@
 describe 'apache::mod::remoteip', type: :class do
   context 'on a Debian OS' do
     include_examples 'Debian 11'
-    let :params do
-      { apache_version: '2.4' }
-    end
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('remoteip') }
@@ -104,12 +101,5 @@
 
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPProxyProtocolExceptions fd00:fd00:fd00:2000::/64$}) }
     end
-    describe 'with Apache version < 2.4' do
-      let :params do
-        { apache_version: '2.2' }
-      end
-
-      it { is_expected.to compile.and_raise_error(%r{mod_remoteip is only available in Apache 2.4}) }
-    end
   end
 end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 0e562c4b69..ff1e3ee31b 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -143,49 +143,13 @@
       it { is_expected.to contain_file('_etc_pki_some_path_localhost.crt') }
     end
 
-    context 'with Apache version < 2.4 - ssl_compression with default value' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLCompression Off$}) }
-    end
-    context 'with Apache version < 2.4 - setting ssl_compression to true' do
-      let :params do
-        {
-          apache_version: '2.2',
-          ssl_compression: true,
-        }
-      end
-
-      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLCompression On$}) }
-    end
-    context 'with Apache version < 2.4 - setting ssl_stapling to true' do
-      let :params do
-        {
-          apache_version: '2.2',
-          ssl_stapling: true,
-        }
-      end
-
-      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLUseStapling}) }
-    end
-
-    context 'with Apache version >= 2.4 - ssl_compression with default value' do
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
+    context 'with default values' do
       it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLCompression Off$}) }
+      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets (Off|On)$}) }
     end
-    context 'with Apache version >= 2.4' do
+    context 'with ssl_compression set to true' do
       let :params do
         {
-          apache_version: '2.4',
           ssl_compression: true,
         }
       end
@@ -193,19 +157,9 @@
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLCompression On$}) }
     end
 
-    context 'with Apache version >= 2.4 - ssl_sessiontickets with default value' do
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
-      it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets (Off|On)$}) }
-    end
-    context 'with Apache version >= 2.4 - setting ssl_sessiontickets to false' do
+    context 'with ssl_sessiontickets set to false' do
       let :params do
         {
-          apache_version: '2.4',
           ssl_sessiontickets: false,
         }
       end
@@ -213,30 +167,27 @@
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets Off$}) }
     end
 
-    context 'with Apache version >= 2.4 - setting ssl_stapling to true' do
+    context 'with ssl_stapling set to true' do
       let :params do
         {
-          apache_version: '2.4',
           ssl_stapling: true,
         }
       end
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLUseStapling On$}) }
     end
-    context 'with Apache version >= 2.4 - setting ssl_stapling_return_errors to true' do
+    context 'with ssl_stapling_return_errors set to true' do
       let :params do
         {
-          apache_version: '2.4',
           ssl_stapling_return_errors: true,
         }
       end
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLStaplingReturnResponderErrors On$}) }
     end
-    context 'with Apache version >= 2.4 - setting stapling_cache' do
+    context 'with stapling_cache' do
       let :params do
         {
-          apache_version: '2.4',
           stapling_cache: '/tmp/customstaplingcache(51200)',
         }
       end
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 37a6451d2f..eebe8746c2 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -2,7 +2,6 @@
 
 require 'spec_helper'
 
-# Apache >= 2.4
 def require_directives(requires)
   if requires == :undef
     "    Require ip 127.0.0.1 ::1\n"
@@ -66,10 +65,9 @@ def require_directives(requires)
         }
       end
 
-      context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do
+      context "with custom parameters $extended_status => 'Off', $status_path => '/custom-status'" do
         let :params do
           {
-            allow_from: ['10.10.10.10', '11.11.11.11'],
             extended_status: 'Off',
             status_path: '/custom-status',
           }
@@ -77,27 +75,7 @@ def require_directives(requires)
 
         it { is_expected.to compile }
 
-        include_examples 'status_conf_spec_require', 'ip 10.10.10.10 11.11.11.11', 'Off', '/custom-status'
-      end
-
-      context "with valid parameter type $allow_from => ['10.10.10.10']" do
-        let :params do
-          { allow_from: ['10.10.10.10'] }
-        end
-
-        it 'expects to succeed array validation' do
-          is_expected.to compile
-        end
-      end
-
-      context "with invalid parameter type $allow_from => '10.10.10.10'" do
-        let :params do
-          { allow_from: '10.10.10.10' }
-        end
-
-        it 'expects to fail array validation' do
-          is_expected.to compile.and_raise_error(%r{allow_from})
-        end
+        include_examples 'status_conf_spec_require', 'ip 127.0.0.1 ::1', 'Off', '/custom-status'
       end
 
       # Only On or Off are valid options
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 5fafac88ac..5f01385fd8 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -13,68 +13,21 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
     it { is_expected.to contain_file('/etc/apache2/mods-available/worker.conf').with_ensure('file') }
-    it { is_expected.to contain_file('/etc/apache2/mods-enabled/worker.conf').with_ensure('link') }
-
-    context 'with Apache version < 2.4' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it { is_expected.not_to contain_file('/etc/apache2/mods-available/worker.load') }
-      it { is_expected.not_to contain_file('/etc/apache2/mods-enabled/worker.load') }
-
-      it { is_expected.to contain_package('apache2-mpm-worker') }
-    end
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
-      it {
-        is_expected.to contain_file('/etc/apache2/mods-available/worker.load').with('ensure' => 'file',
-                                                                                    'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n")
-      }
-      it { is_expected.to contain_file('/etc/apache2/mods-enabled/worker.load').with_ensure('link') }
-    end
+    it {
+      is_expected.to contain_file('/etc/apache2/mods-available/worker.load').with('ensure' => 'file',
+                                                                                  'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n")
+    }
   end
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
-    it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with_ensure('file') }
-
-    context 'with Apache version < 2.4' do
-      let :params do
-        {
-          apache_version: '2.2',
-        }
-      end
-
-      it {
-        is_expected.to contain_file_line('/etc/sysconfig/httpd worker enable').with('require' => 'Package[httpd]')
-      }
-    end
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4',
-        }
-      end
-
-      it { is_expected.not_to contain_apache__mod('event') }
-
-      it {
-        is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',
-                                                                          'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
-      }
-    end
+    it { is_expected.not_to contain_apache__mod('event') }
+    it {
+      is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',
+                                                                        'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
+    }
   end
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
@@ -99,7 +52,7 @@
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ServerLimit\s+25$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+StartServers\s+2$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxClients\s+150$}) }
+      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxRequestWorkers\s+150$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+25$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+75$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ThreadsPerChild\s+25$}) }
@@ -126,7 +79,6 @@
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^<IfModule mpm_worker_module>$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+ServerLimit\s+10$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+StartServers\s+11$}) }
-      it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').without(content: %r{^\s+MaxClients}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxRequestWorkers\s+12$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MinSpareThreads\s+13$}) }
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.conf').with(content: %r{^\s+MaxSpareThreads\s+14$}) }
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index b9cdaae69c..3b2078aae6 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -55,12 +55,7 @@
     }
   end
 
-  describe 'with lbmethod and with apache::mod::proxy_balancer::apache_version set' do
-    let :pre_condition do
-      'class{"apache::mod::proxy_balancer":
-          apache_version => "2.4"
-       }'
-    end
+  describe 'with lbmethod set' do
     let :params do
       {
         proxy_set: {
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 156ed3e4f5..6986aa2c87 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -33,12 +33,6 @@
           it { is_expected.to contain_class('apache') }
           it { is_expected.to contain_class('apache::params') }
           it { is_expected.to contain_apache__listen(params[:port]) }
-          # namebased virualhost is only created on apache 2.2 and older
-          if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) ||
-             (os_facts[:os]['name'] == 'Amazon') ||
-             (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12)
-            it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
-          end
         end
         context 'set everything!' do
           let :params do
@@ -433,7 +427,6 @@
               'wsgi_chunked_request'        => 'On',
               'action'                      => 'foo',
               'additional_includes'         => '/custom/path/includes',
-              'apache_version'              => '2.4',
               'use_optional_includes'       => true,
               'suexec_user_group'           => 'root root',
               'allow_encoded_slashes'       => 'nodecode',
@@ -1625,26 +1618,10 @@
           end
         end # access logs
         describe 'error logs format' do
-          context 'on Apache 2.2' do
-            let(:params) do
-              {
-                'docroot'         => '/rspec/docroot',
-                'apache_version'  => '2.2',
-                'error_log_format' => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
-              }
-            end
-
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-logging')
-                .without_content(%r{ErrorLogFormat})
-            }
-          end
-
           context 'single log format directive as a string' do
             let(:params) do
               {
                 'docroot'          => '/rspec/docroot',
-                'apache_version'   => '2.4',
                 'error_log_format' => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
               }
             end
@@ -1660,7 +1637,6 @@
             let(:params) do
               {
                 'docroot'          => '/rspec/docroot',
-                'apache_version'   => '2.4',
                 'error_log_format' => [
                   '[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M',
                   { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' },
@@ -1792,7 +1768,6 @@
 
             it { is_expected.to compile }
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
-            # this works only with apache 2.4 and newer
             if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) ||
                (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11)
               it {
@@ -1805,50 +1780,6 @@
             end
           end
 
-          # the following style is only present on Apache 2.2
-          # That is used in SLES 11, RHEL6, Amazon Linux
-          if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) ||
-             (os_facts[:os]['name'] == 'Amazon') ||
-             (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12)
-            context 'apache 2.2 access controls on directories' do
-              let :params do
-                {
-                  'docroot'         => '/var/www/foo',
-                  'directories'     => [
-                    {
-                      'path'     => '/var/www/foo',
-                      'provider' => 'files',
-                      'allow'    => 'from 127.0.0.5',
-                      'deny'     => 'from all',
-                      'order'    => 'deny,allow',
-                    },
-                    {
-                      'path'     => '/var/www/protected-files',
-                      'provider' => 'files',
-                      'allow'    => ['from 127.0.0.1', 'from 127.0.0.2'],
-                      'deny'     => ['from 127.0.0.3', 'from 127.0.0.4'],
-                      'satisfy'  => 'any',
-                    },
-                  ],
-                }
-              end
-
-              it { is_expected.to compile }
-              it { is_expected.to contain_concat('25-rspec.example.com.conf') }
-              it {
-                is_expected.to contain_concat__fragment('rspec.example.com-directories')
-                  .with_content(%r{^\s+Allow from 127\.0\.0\.1$})
-                  .with_content(%r{^\s+Allow from 127\.0\.0\.2$})
-                  .with_content(%r{^\s+Allow from 127\.0\.0\.5$})
-                  .with_content(%r{^\s+Deny from 127\.0\.0\.3$})
-                  .with_content(%r{^\s+Deny from 127\.0\.0\.4$})
-                  .with_content(%r{^\s+Deny from all$})
-                  .with_content(%r{^\s+Satisfy any$})
-                  .with_content(%r{^\s+Order deny,allow$})
-              }
-            end
-          end
-
           context 'require unmanaged' do
             let :params do
               {
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 2f252c8e84..a7211b68bb 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -140,6 +140,7 @@
     {
       os: {
         family: 'Darwin',
+        name: 'Darwin',
         release: {
           full: '13.1.0',
         },
diff --git a/spec/unit/facter/util/fact_apache_version_spec.rb b/spec/unit/facter/util/fact_apache_version_spec.rb
deleted file mode 100644
index 061c21adf5..0000000000
--- a/spec/unit/facter/util/fact_apache_version_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Facter::Util::Fact do
-  before(:each) do
-    Facter.clear
-  end
-  describe 'apache_version' do
-    context 'with value' do
-      before :each do
-        allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-        expect(Facter::Core::Execution).to receive(:which).with('httpd') { true }
-        expect(Facter::Core::Execution).to receive(:execute).with('httpd -V 2>&1') {
-          'Server version: Apache/2.4.16 (Unix)
-           Server built:   Jul 31 2015 15:53:26'
-        }
-      end
-      it do
-        expect(Facter.fact(:apache_version).value).to eq('2.4.16')
-      end
-    end
-  end
-
-  describe 'apache_version with empty OS' do
-    context 'with value' do
-      before :each do
-        allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-        expect(Facter::Core::Execution).to receive(:which).with('httpd') { true }
-        expect(Facter::Core::Execution).to receive(:execute).with('httpd -V 2>&1') {
-          'Server version: Apache/2.4.6 ()
-           Server built:   Nov 21 2015 05:34:59'
-        }
-      end
-      it do
-        expect(Facter.fact(:apache_version).value).to eq('2.4.6')
-      end
-    end
-  end
-end
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
index 2d8f95ef49..4a26d41a73 100644
--- a/templates/httpd.conf.erb
+++ b/templates/httpd.conf.erb
@@ -18,23 +18,15 @@ LimitRequestFields <%= @limitreqfields %>
 <% if @limitreqline -%>
 LimitRequestLine <%= @limitreqline %>
 <% end -%>
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<%- if @http_protocol_options and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+<%- if @http_protocol_options -%>
 HttpProtocolOptions <%= @http_protocol_options %>
 <%- end -%>
 
-<%# Actually >= 2.4.17, but the minor version is not provided -%>
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  <%- unless @protocols.empty? -%>
+<%- unless @protocols.empty? -%>
 Protocols <%= @protocols.join(' ') %>
-  <%- end -%>
-  <%- unless @protocols_honor_order.nil? -%>
-ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %>
-  <%- end -%>
 <%- end -%>
-
-<%- if @rewrite_lock and scope.function_versioncmp([@apache_version, '2.2']) <= 0 -%>
-RewriteLock <%= @rewrite_lock %>
+<%- unless @protocols_honor_order.nil? -%>
+ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %>
 <%- end -%>
 
 User <%= @user %>
@@ -42,25 +34,14 @@ Group <%= @group %>
 
 AccessFileName .htaccess
 <FilesMatch "^\.ht">
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require all denied
-<%- else -%>
-     Order allow,deny
-     Deny from all
-     Satisfy all
-<%- end -%>
 </FilesMatch>
 
 <Directory />
   Options <%= Array(@root_directory_options).join(' ') %>
   AllowOverride None
 <%- if @root_directory_secured -%>
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   Require all denied
-<%- else -%>
-  Order deny,allow
-  Deny from all
-<%- end -%>
 <%- end -%>
 </Directory>
 
@@ -68,9 +49,6 @@ AccessFileName .htaccess
 AddDefaultCharset <%= @default_charset %>
 <% end -%>
 
-<%- if scope.function_versioncmp([@apache_version, '2.4']) < 0 -%>
-DefaultType <%= @default_type %>
-<%- end -%>
 HostnameLookups <%= @hostname_lookups %>
 <%- if /^[|\/]/.match(@error_log) || /^syslog:/.match(@error_log) -%>
 ErrorLog "<%= @error_log %>"
@@ -125,20 +103,12 @@ LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>
 
-<%- if @conf_enabled and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+<%- if @conf_enabled -%>
 IncludeOptional "<%= @conf_enabled %>/*.conf"
 <%- end -%>
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @confd_dir %>/*.conf"
-<%- else -%>
-Include "<%= @confd_dir %>/*.conf"
-<%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
-<%- else -%>
-Include "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
-<%- end -%>
 <% end -%>
 <% if @ldap_verify_server_cert -%>
 LDAPVerifyServerCert <%= @ldap_verify_server_cert %>
@@ -156,12 +126,7 @@ Alias /error/ "<%= @error_documents_path %>/"
   Options IncludesNoExec
   AddOutputFilter Includes html
   AddHandler type-map var
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
   Require all granted
-<%- else -%>
-  Order allow,deny
-  Allow from all
-<%- end -%>
   LanguagePriority en cs de es fr it nl sv pt-br ro
   ForceLanguagePriority Prefer Fallback
 </Directory>
diff --git a/templates/mod/_require.erb b/templates/mod/_require.erb
index d55e312e9d..404dcc4c26 100644
--- a/templates/mod/_require.erb
+++ b/templates/mod/_require.erb
@@ -1,12 +1,4 @@
-<% if @requires != nil -%>
-  <%- _requires = @requires -%>
-<% elsif @allow_from != nil and ! @allow_from.empty? -%>
-  <%- scope.function_warning(["Class #{@title}: Using Allow is deprecated in Apache #{@_apache_version}"]) -%>
-  <%- _requires = 'ip ' + Array(@allow_from).join(" ") -%>
-<% else -%>
-  <%- _requires = @requires_defaults -%>
-<% end -%>
-<%-# -%>
+<% _requires = @requires != nil ? @requires : @requires_defaults -%>
 <% if _requires.is_a?(String) -%>
   <%- if ! ['', 'unmanaged'].include?_requires.downcase -%>
     Require <%= _requires %>
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
index 313fdf9d1a..e56a105c8c 100644
--- a/templates/mod/alias.conf.erb
+++ b/templates/mod/alias.conf.erb
@@ -3,11 +3,6 @@ Alias /<%= @icons_prefix %>/ "<%= @icons_path %>/"
 <Directory "<%= @icons_path %>">
     Options <%= @icons_options %>
     AllowOverride None
-<%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require all granted
-<%- else -%>
-     Order allow,deny
-     Allow from all
-<%- end -%>
 </Directory>
 </IfModule>
diff --git a/templates/mod/event.conf.erb b/templates/mod/event.conf.erb
index bca707c932..82cfae822a 100644
--- a/templates/mod/event.conf.erb
+++ b/templates/mod/event.conf.erb
@@ -7,8 +7,6 @@
   <%- end -%>
   <%- if @maxrequestworkers -%>
   MaxRequestWorkers      <%= @maxrequestworkers %>
-  <%- elsif @maxclients -%>
-  MaxClients             <%= @maxclients %>
   <%- end -%>
   <%- if @minsparethreads -%>
   MinSpareThreads        <%= @minsparethreads %>
@@ -21,8 +19,6 @@
   <%- end -%>
   <%- if @maxconnectionsperchild -%>
   MaxConnectionsPerChild <%= @maxconnectionsperchild %>
-  <%- elsif @maxrequestsperchild -%>
-  MaxRequestsPerChild    <%= @maxrequestsperchild %>
   <%- end -%>
   <%- if @threadlimit -%>
   ThreadLimit            <%= @threadlimit %>
diff --git a/templates/mod/http2.conf.erb b/templates/mod/http2.conf.erb
index 4839013680..5aa5fa2386 100644
--- a/templates/mod/http2.conf.erb
+++ b/templates/mod/http2.conf.erb
@@ -1,15 +1,13 @@
 # The http2 Apache module configuration file is being
 # managed by Puppet and changes will be overwritten.
 
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<% if !@h2_copy_files.nil? && scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
+<% if !@h2_copy_files.nil? -%>
 H2CopyFiles <%= scope.call_function('apache::bool2httpd', [@h2_copy_files]) %>
 <% end -%>
 <% unless @h2_direct.nil? -%>
 H2Direct <%= scope.call_function('apache::bool2httpd', [@h2_direct]) %>
 <% end -%>
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<% if !@h2_early_hints.nil? && scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
+<% if !@h2_early_hints.nil? -%>
 H2EarlyHints <%= scope.call_function('apache::bool2httpd', [@h2_early_hints]) %>
 <% end -%>
 <% unless @h2_max_session_streams.nil? -%>
@@ -24,39 +22,33 @@ H2MaxWorkers <%= @h2_max_workers %>
 <% unless @h2_min_workers.nil? -%>
 H2MinWorkers <%= @h2_min_workers %>
 <% end -%>
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
-    <%- unless @h2_modern_tls_only.nil? -%>
+<%- unless @h2_modern_tls_only.nil? -%>
 H2ModernTLSOnly <%= scope.call_function('apache::bool2httpd', [@h2_modern_tls_only]) %>
-    <%- end -%>
-    <%- unless @h2_push.nil? -%>
+<%- end -%>
+<%- unless @h2_push.nil? -%>
 H2Push <%= scope.call_function('apache::bool2httpd', [@h2_push]) %>
-    <%- end -%>
-    <%- unless @h2_push_diary_size.nil? -%>
+<%- end -%>
+<%- unless @h2_push_diary_size.nil? -%>
 H2PushDiarySize <%= @h2_push_diary_size %>
-    <%- end -%>
-    <%- @h2_push_priority.each do |expr| -%>
+<%- end -%>
+<%- @h2_push_priority.each do |expr| -%>
 H2PushPriority <%= expr %>
-    <%- end -%>
-    <%- @h2_push_resource.each do |expr| -%>
+<%- end -%>
+<%- @h2_push_resource.each do |expr| -%>
 H2PushResource <%= expr %>
-    <%- end -%>
-<% end -%>
+<%- end -%>
 <% unless @h2_serialize_headers.nil? -%>
 H2SerializeHeaders <%= scope.call_function('apache::bool2httpd', [@h2_serialize_headers]) %>
 <% end -%>
 <% unless @h2_stream_max_mem_size.nil? -%>
 H2StreamMaxMemSize <%= @h2_stream_max_mem_size %>
 <% end -%>
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
-    <%- unless @h2_tls_cool_down_secs.nil? -%>
+<%- unless @h2_tls_cool_down_secs.nil? -%>
 H2TLSCoolDownSecs <%= @h2_tls_cool_down_secs %>
-    <%- end -%>
-    <%- unless @h2_tls_warm_up_size.nil? -%>
+<%- end -%>
+<%- unless @h2_tls_warm_up_size.nil? -%>
 H2TLSWarmUpSize <%= @h2_tls_warm_up_size %>
-    <%- end -%>
-<% end -%>
+<%- end -%>
 <% unless @h2_upgrade.nil? -%>
 H2Upgrade <%= scope.call_function('apache::bool2httpd', [@h2_upgrade]) %>
 <% end -%>
diff --git a/templates/mod/info.conf.erb b/templates/mod/info.conf.erb
index c661a23ab5..26acb1ab11 100644
--- a/templates/mod/info.conf.erb
+++ b/templates/mod/info.conf.erb
@@ -1,19 +1,6 @@
 <Location <%= @info_path %>>
     SetHandler server-info
 <%- if @restrict_access -%>
-  <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip <%= Array(@allow_from).join(" ") %>
-  <%- else -%>
-    Order deny,allow
-    Deny from all
-    <%- if @allow_from and ! @allow_from.empty? -%>
-      <%- @allow_from.each do |allowed| -%>
-    Allow from <%= allowed %>
-      <%- end -%>
-    <%- else -%>
-    Allow from 127.0.0.1
-    Allow from ::1
-    <%- end -%>
-  <%- end -%>
 <%- end -%>
 </Location>
diff --git a/templates/mod/itk.conf.erb b/templates/mod/itk.conf.erb
index 4abade8fb5..4e2284a5e8 100644
--- a/templates/mod/itk.conf.erb
+++ b/templates/mod/itk.conf.erb
@@ -5,7 +5,7 @@
   ServerLimit         <%= @serverlimit %>
   MaxClients          <%= @maxclients %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
-  <%- if (not @enablecapabilities.nil?) && (scope.function_versioncmp([@_apache_version, '2.4']) >= 0) -%>
+  <%- unless @enablecapabilities.nil? -%>
   EnableCapabilities  <%= scope.call_function('apache::bool2httpd', [@enablecapabilities]) %>
   <%- end -%>
 </IfModule>
diff --git a/templates/mod/ldap.conf.erb b/templates/mod/ldap.conf.erb
index 7c2dac5e98..d4ccac43df 100644
--- a/templates/mod/ldap.conf.erb
+++ b/templates/mod/ldap.conf.erb
@@ -1,13 +1,6 @@
 <Location <%= @ldap_path %>>
     SetHandler ldap-status
-    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1 ::1
-    Satisfy all
-    <%- end -%>
 </Location>
 <% if @ldap_trusted_global_cert_file -%>
 LDAPTrustedGlobalCert <%= @ldap_trusted_global_cert_type %> <%= @ldap_trusted_global_cert_file %>
diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
index 56e72fe29d..c99e3b4992 100644
--- a/templates/mod/pagespeed.conf.erb
+++ b/templates/mod/pagespeed.conf.erb
@@ -61,35 +61,20 @@ ModPagespeedStatistics <%= @collect_statistics %>
     # statistics.  This might be appropriate in an experimental setup or
     # if the Apache server is protected by a reverse proxy that will
     # filter URLs in some fashion.
-    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
-    <%- end -%>
     SetHandler mod_pagespeed_statistics
 </Location>
 
 ModPagespeedStatisticsLogging <%= @statistics_logging %>
 <Location /pagespeed_console>
-    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
-    <%- end -%>
     SetHandler pagespeed_console
 </Location>
 
 ModPagespeedMessageBufferSize <%= @message_buffer_size %>
 
 <Location /mod_pagespeed_message>
-    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
     Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
-    <%- end -%>
     SetHandler mod_pagespeed_message
 </Location>
 
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index 76968cb6fe..eb6c02ea38 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -10,13 +10,7 @@
 
   <% if @proxy_requests != 'Off' or ( @allow_from and ! @allow_from.empty? ) -%>
   <Proxy *>
-    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
-    <%- end -%>
+    Require ip <%= @allow_from.join(" ") %>
   </Proxy>
   <% end -%>
 
diff --git a/templates/mod/proxy_balancer.conf.erb b/templates/mod/proxy_balancer.conf.erb
index c1f37be8e4..43a4611ddf 100644
--- a/templates/mod/proxy_balancer.conf.erb
+++ b/templates/mod/proxy_balancer.conf.erb
@@ -1,10 +1,4 @@
 <Location <%= @manager_path %>>
     SetHandler balancer-manager
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
-    <%- end -%>
+    Require ip <%= @allow_from.join(" ") %>
 </Location>
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index ec520751cc..08724d010e 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -76,11 +76,6 @@
     SecUploadKeepFiles Off
 
     # ModSecurity Core Rules Set configuration
-<%- if scope.function_versioncmp([scope.lookupvar('::apache::apache_version'), '2.4']) >= 0 -%>
     IncludeOptional <%= @modsec_dir %>/*.conf
     IncludeOptional <%= @modsec_dir %>/activated_rules/*.conf
-<%- else -%>
-    Include <%= @modsec_dir %>/*.conf
-    Include <%= @modsec_dir %>/activated_rules/*.conf
-<%- end -%>
 </IfModule>
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index aec5b15a7c..33a4c6feda 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -10,16 +10,12 @@
   SSLPassPhraseDialog <%= @ssl_pass_phrase_dialog %>
   SSLSessionCache "shmcb:<%= @ssl_sessioncache %>"
   SSLSessionCacheTimeout <%= @ssl_sessioncachetimeout %>
-  <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
-  Mutex <%= @_ssl_mutex %>
-    <%- if @ssl_compression -%>
+  Mutex <%= @ssl_mutex %>
+  <%- if @ssl_compression -%>
   SSLCompression <%= scope.call_function('apache::bool2httpd', [@ssl_compression]) %>
-    <%- end -%>
-    <%- unless @ssl_sessiontickets.nil? -%>
+  <%- end -%>
+  <%- unless @ssl_sessiontickets.nil? -%>
   SSLSessionTickets <%= scope.call_function('apache::bool2httpd', [@ssl_sessiontickets]) %>
-    <%- end -%>
-  <%- else -%>
-  SSLMutex <%= @_ssl_mutex %>
   <%- end -%>
   SSLCryptoDevice <%= @ssl_cryptodevice %>
   SSLHonorCipherOrder <%= scope.call_function('apache::bool2httpd', [@_ssl_honorcipherorder]) %>
@@ -32,13 +28,11 @@
   <%- if @ssl_ca -%>
   SSLCACertificateFile    "<%= @ssl_ca %>"
   <%- end -%>
-<% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
   SSLUseStapling <%= scope.call_function('apache::bool2httpd', [@ssl_stapling]) %>
   <%- if not @ssl_stapling_return_errors.nil? -%>
   SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
   SSLStaplingCache "shmcb:<%= @_stapling_cache %>"
-<% end -%>
   SSLCipherSuite <%= @ssl_cipher %>
 <% if not @ssl_protocol.empty? -%>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
diff --git a/templates/mod/status.conf.erb b/templates/mod/status.conf.erb
index 28cc55b4f7..ba5f17647c 100644
--- a/templates/mod/status.conf.erb
+++ b/templates/mod/status.conf.erb
@@ -4,11 +4,7 @@
     <%-# "scope.function_template(["apache/mod/<Template>"])" -%>
     <%-# with: -%>
     <%-# "scope.call_function('template', ["apache/mod/<Template>"])" -%>
-    <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
 <%= scope.function_template(["apache/mod/_require.erb"]) -%>
-    <%- else -%>
-<%= scope.function_template(["apache/mod/_allow.erb"]) -%>
-    <%- end -%>
 </Location>
 ExtendedStatus <%= @extended_status %>
 
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
index 1ef99f69f2..a1a6c51f90 100644
--- a/templates/mod/userdir.conf.erb
+++ b/templates/mod/userdir.conf.erb
@@ -9,20 +9,10 @@
     AllowOverride <%= @overrides.join(' ') %>
     Options <%= @options.join(' ') %>
     <Limit GET POST OPTIONS>
-      <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
       Require all granted
-      <%- else -%>
-      Order allow,deny
-      Allow from all
-      <%- end -%>
     </Limit>
     <LimitExcept GET POST OPTIONS>
-      <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%>
       Require all granted
-      <%- else -%>
-      Order allow,deny
-      Allow from all
-      <%- end -%>
     </LimitExcept>
   </Directory>
 <%- end -%>
diff --git a/templates/mod/worker.conf.erb b/templates/mod/worker.conf.erb
index cc8912ac25..ca6e4f159b 100644
--- a/templates/mod/worker.conf.erb
+++ b/templates/mod/worker.conf.erb
@@ -7,9 +7,5 @@
   ThreadsPerChild     <%= @threadsperchild %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
   ListenBacklog       <%= @listenbacklog %>
-  <%- if @maxrequestworkers -%>
-  MaxRequestWorkers      <%= @maxrequestworkers %>
-  <%- elsif @maxclients -%>
-  MaxClients             <%= @maxclients %>
-  <%- end -%>
+  MaxRequestWorkers   <%= @maxrequestworkers %>
 </IfModule>
diff --git a/templates/vhost/_additional_includes.erb b/templates/vhost/_additional_includes.erb
index a07bb81125..79b37b398c 100644
--- a/templates/vhost/_additional_includes.erb
+++ b/templates/vhost/_additional_includes.erb
@@ -1,7 +1,7 @@
 <% Array(@additional_includes).each do |include| -%>
 
   ## Load additional static includes
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%>
+<%- if @use_optional_includes -%>
   IncludeOptional "<%= include %>"
 <%- else -%>
   Include "<%= include %>"
diff --git a/templates/vhost/_block.erb b/templates/vhost/_block.erb
index b07f685e42..9532a073b8 100644
--- a/templates/vhost/_block.erb
+++ b/templates/vhost/_block.erb
@@ -4,11 +4,7 @@
 <% if @block.include? 'scm' -%>
   # Block access to SCM directories.
   <DirectoryMatch .*\.(svn|git|bzr|hg|ht)/.*>
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
     Require all denied
-  <%- else -%>
-    Deny From All
-  <%- end -%>
   </DirectoryMatch>
 <% end -%>
 <% end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 137ef7eabc..0fbf1da85f 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -2,20 +2,6 @@
   <%- scope.setvar('_template_scope', {}) -%>
   ## Directories, there should at least be a declaration for <%= @docroot %>
   <%- @_directories.each do |directory| -%>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
-        <%- scope.function_warning(["Apache::Vhost: Using allow is deprecated in your Apache version"]) -%>
-      <%- end -%>
-      <%- if directory['deny'] and ! [ false, 'false', '' ].include?(directory['deny']) -%>
-        <%- scope.function_warning(["Apache::Vhost: Using deny is deprecated in your Apache version"]) -%>
-      <%- end -%>
-      <%- if directory['order'] and ! [ false, 'false', '' ].include?(directory['order']) -%>
-        <%- scope.function_warning(["Apache::Vhost: Using order is deprecated in your Apache version"]) -%>
-      <%- end -%>
-      <%- if directory['satisfy'] and ! [ false, 'false', '' ].include?(directory['satisfy']) -%>
-        <%- scope.function_warning(["Apache::Vhost: Using satisfy is deprecated in your Apache version"]) -%>
-      <%- end -%>
-    <%- end -%>
     <%- if directory['path'] and directory['path'] != '' -%>
       <%- if directory['provider'] and directory['provider'].match('(directory|location|files|proxy)') -%>
         <%- if /^(.*)match$/ =~ directory['provider'] -%>
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
index 6920f3e92a..a9c7dcf9e2 100644
--- a/templates/vhost/_file_header.erb
+++ b/templates/vhost/_file_header.erb
@@ -22,15 +22,12 @@ MDomain <%= @servername %>
 <% if @serveradmin -%>
   ServerAdmin <%= @serveradmin %>
 <% end -%>
-<%# Actually >= 2.4.17, but the minor version is not provided -%>
-<% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  <%- unless @protocols.empty? -%>
+<%- unless @protocols.empty? -%>
   Protocols <%= @protocols.join(' ') %>
-  <%- end -%>
-  <%- unless @protocols_honor_order.nil? -%>
+<%- end -%>
+<%- unless @protocols_honor_order.nil? -%>
   ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %>
-  <%- end -%>
-<% end -%>
+<%- end -%>
 <% if @limitreqfieldsize -%>
   LimitRequestFieldSize <%= @limitreqfieldsize %>
 <% end -%>
@@ -42,4 +39,4 @@ MDomain <%= @servername %>
 <% end -%>
 <% if @limitreqbody -%>
   LimitRequestBody <%= @limitreqbody %>
-<% end -%>
\ No newline at end of file
+<% end -%>
diff --git a/templates/vhost/_http2.erb b/templates/vhost/_http2.erb
index 54110c95a9..063a89043f 100644
--- a/templates/vhost/_http2.erb
+++ b/templates/vhost/_http2.erb
@@ -1,50 +1,42 @@
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<% if !@h2_copy_files.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+<% if !@h2_copy_files.nil? -%>
   H2CopyFiles <%= scope.call_function('apache::bool2httpd', [@h2_copy_files]) %>
 <% end -%>
 <% unless @h2_direct.nil? -%>
   H2Direct <%= scope.call_function('apache::bool2httpd', [@h2_direct]) %>
 <% end -%>
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<% if !@h2_early_hints.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+<% if !@h2_early_hints.nil? -%>
   H2EarlyHints <%= scope.call_function('apache::bool2httpd', [@h2_early_hints]) %>
 <% end -%>
 <% unless @h2_max_session_streams.nil? -%>
   H2MaxSessionStreams <%= @h2_max_session_streams %>
 <% end -%>
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    <%- unless @h2_modern_tls_only.nil? -%>
+<%- unless @h2_modern_tls_only.nil? -%>
   H2ModernTLSOnly <%= scope.call_function('apache::bool2httpd', [@h2_modern_tls_only]) %>
-    <%- end -%>
-    <%- unless @h2_push.nil? -%>
+<%- end -%>
+<%- unless @h2_push.nil? -%>
   H2Push <%= scope.call_function('apache::bool2httpd', [@h2_push]) %>
-    <%- end -%>
-    <%- unless @h2_push_diary_size.nil? -%>
+<%- end -%>
+<%- unless @h2_push_diary_size.nil? -%>
   H2PushDiarySize <%= @h2_push_diary_size %>
-    <%- end -%>
-    <%- @h2_push_priority.each do |expr| -%>
+<%- end -%>
+<%- @h2_push_priority.each do |expr| -%>
   H2PushPriority <%= expr %>
-    <%- end -%>
-    <%- @h2_push_resource.each do |expr| -%>
+<%- end -%>
+<%- @h2_push_resource.each do |expr| -%>
   H2PushResource <%= expr %>
-    <%- end -%>
-<% end -%>
+<%- end -%>
 <% unless @h2_serialize_headers.nil? -%>
   H2SerializeHeaders <%= scope.call_function('apache::bool2httpd', [@h2_serialize_headers]) %>
 <% end -%>
 <% unless @h2_stream_max_mem_size.nil? -%>
   H2StreamMaxMemSize <%= @h2_stream_max_mem_size %>
 <% end -%>
-<%# Actually >= 2.4.24, but the minor version is not provided -%>
-<% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    <%- unless @h2_tls_cool_down_secs.nil? -%>
+<%- unless @h2_tls_cool_down_secs.nil? -%>
   H2TLSCoolDownSecs <%= @h2_tls_cool_down_secs %>
-    <%- end -%>
-    <%- unless @h2_tls_warm_up_size.nil? -%>
+<%- end -%>
+<%- unless @h2_tls_warm_up_size.nil? -%>
   H2TLSWarmUpSize <%= @h2_tls_warm_up_size %>
-    <%- end -%>
-<% end -%>
+<%- end -%>
 <% unless @h2_upgrade.nil? -%>
   H2Upgrade <%= scope.call_function('apache::bool2httpd', [@h2_upgrade]) %>
 <% end -%>
diff --git a/templates/vhost/_logging.erb b/templates/vhost/_logging.erb
index b41c85cc5b..91c328046b 100644
--- a/templates/vhost/_logging.erb
+++ b/templates/vhost/_logging.erb
@@ -8,8 +8,8 @@
 <% if @log_level -%>
   LogLevel <%= @log_level %>
 <% end -%>
-<% if @error_log_format24 -%>
-  <%- @error_log_format24.each do |lfmt| -%>
+<% if @error_log_format -%>
+  <%- @error_log_format.each do |lfmt| -%>
     <%- if lfmt.is_a?(Hash) -%>
       <%- lfmt.each do |fmt, flag| -%>
   ErrorLogFormat <%= flag %> "<%= fmt %>"
diff --git a/templates/vhost/_require.erb b/templates/vhost/_require.erb
index 73a3c4d008..96f840c156 100644
--- a/templates/vhost/_require.erb
+++ b/templates/vhost/_require.erb
@@ -1,6 +1,5 @@
 <%- _item = scope.lookupvar('_template_scope')[:item] -%>
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  <%- if _item['require'] && !(_item['require'].is_a?(String) && (_item['require'] == '' || _item['require'] =~ /unmanaged/i)) -%>
+<%- if _item['require'] && !(_item['require'].is_a?(String) && (_item['require'] == '' || _item['require'] =~ /unmanaged/i)) -%>
     <%- if _item['require'].is_a?(Hash) -%>
       <%- case _item['require']['enforce'].downcase
           when 'all','none','any' then -%>
@@ -17,45 +16,9 @@
     Require <%= req %>
       <%- end -%>
     <%- end -%>
-  <%- end -%>
-  <%- if _item['auth_require'] -%>
+<%- end -%>
+<%- if _item['auth_require'] -%>
     Require <%= _item['auth_require'] %>
-  <%- elsif !_item['require'] || _item['require'] == '' -%>
+<%- elsif !_item['require'] || _item['require'] == '' -%>
     Require all granted
-  <%- end -%>
-<%- else -%>
-  <%- if _item['auth_require'] -%>
-    Require <%= _item['auth_require'] %>
-  <%- end -%>
-  <%- if _item['order'] and _item['order'] != '' -%>
-    Order <%= Array(_item['order']).join(',') %>
-  <%- else -%>
-    Order allow,deny
-  <%- end -%>
-  <%- if _item['deny'] and ! [ false, 'false', '' ].include?(_item['deny']) -%>
-    <%- if _item['deny'].kind_of?(Array) -%>
-      <%- Array(_item['deny']).each do |restrict| -%>
-    Deny <%=  restrict %>
-      <%- end -%>
-    <%- else -%>
-    Deny <%= _item['deny'] %>
-    <%- end -%>
-  <%- end -%>
-  <%- if _item['allow'] and ! [ false, 'false', '' ].include?(_item['allow']) -%>
-    <%- if _item['allow'].kind_of?(Array) -%>
-      <%- Array(_item['allow']).each do |access| -%>
-    Allow <%=  access %>
-    <%- end -%>
-  <%- else -%>
-    Allow <%= _item['allow'] %>
-  <%- end -%>
-  <%- elsif [ 'from all', 'from All' ].include?(_item['deny']) -%>
-  <%- elsif ! _item['deny'] and [ false, 'false', '' ].include?(_item['allow']) -%>
-    Deny from all
-  <%- else -%>
-    Allow from all
-  <%- end -%>
-  <%- if _item['satisfy'] and _item['satisfy'] != '' -%>
-    Satisfy <%= _item['satisfy'] %>
-  <%- end -%>
 <%- end -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 7cab18de89..89a264d50f 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -36,7 +36,7 @@
   <%- if @ssl_crl -%>
   SSLCARevocationFile     "<%= @ssl_crl %>"
   <%- end -%>
-  <%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- if @ssl_crl_check -%>
   SSLCARevocationCheck    <%= @ssl_crl_check %>
   <%- end -%>
   <%- if @ssl_options -%>
@@ -45,13 +45,13 @@
   <%- if @ssl_openssl_conf_cmd -%>
   SSLOpenSSLConfCmd       <%= @ssl_openssl_conf_cmd %>
   <%- end -%>
-  <%- if (not @ssl_stapling.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
+  <%- unless @ssl_stapling.nil? -%>
   SSLUseStapling <%= scope.call_function('apache::bool2httpd', [@ssl_stapling]) %>
   <%- end -%>
-  <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+  <%- if @ssl_stapling_timeout -%>
   SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
   <%- end -%>
-  <%- if (not @ssl_stapling_return_errors.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
+  <%- unless @ssl_stapling_return_errors.nil? -%>
   SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
   <%- if @ssl_user_name -%>

From 69002d2eb155724c77fa14633a787b0bfb9f0028 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Wed, 14 Dec 2022 17:13:16 +0000
Subject: [PATCH 2059/2267] Release prep v8.6.0

---
 CHANGELOG.md  | 12 ++++++++++++
 REFERENCE.md  | 20 ++++++++++++++++++++
 metadata.json |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c3ebdc9b8..80899c8714 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v8.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.6.0) (2022-12-14)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.5.0...v8.6.0)
+
+### Added
+
+- Parameterize SecRequestBodyLimitAction and SecResponseBodyLimitAction [\#2353](https://github.com/puppetlabs/puppetlabs-apache/pull/2353) ([Vincevrp](https://github.com/Vincevrp))
+
+### Fixed
+
+- fix mod\_proxy\_html on FreeBSD [\#2355](https://github.com/puppetlabs/puppetlabs-apache/pull/2355) ([fraenki](https://github.com/fraenki))
+
 ## [v8.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.5.0) (2022-12-06)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.4.0...v8.5.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index d18d6e0380..778c9d2f2b 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6198,7 +6198,9 @@ The following parameters are available in the `apache::mod::security` class:
 * [`secrequestbodynofileslimit`](#-apache--mod--security--secrequestbodynofileslimit)
 * [`secrequestbodyinmemorylimit`](#-apache--mod--security--secrequestbodyinmemorylimit)
 * [`secrequestbodyaccess`](#-apache--mod--security--secrequestbodyaccess)
+* [`secrequestbodylimitaction`](#-apache--mod--security--secrequestbodylimitaction)
 * [`secresponsebodyaccess`](#-apache--mod--security--secresponsebodyaccess)
+* [`secresponsebodylimitaction`](#-apache--mod--security--secresponsebodylimitaction)
 * [`manage_security_crs`](#-apache--mod--security--manage_security_crs)
 * [`enable_dos_protection`](#-apache--mod--security--enable_dos_protection)
 * [`dos_burst_time_slice`](#-apache--mod--security--dos_burst_time_slice)
@@ -6464,6 +6466,15 @@ Toggle SecRequestBodyAccess On or Off
 
 Default value: `'On'`
 
+##### <a name="-apache--mod--security--secrequestbodylimitaction"></a>`secrequestbodylimitaction`
+
+Data type: `Enum['Reject', 'ProcessPartial']`
+
+Controls what happens once a request body limit, configured with
+SecRequestBodyLimit, is encountered
+
+Default value: `'Reject'`
+
 ##### <a name="-apache--mod--security--secresponsebodyaccess"></a>`secresponsebodyaccess`
 
 Data type: `Enum['On', 'Off']`
@@ -6472,6 +6483,15 @@ Toggle SecResponseBodyAccess On or Off
 
 Default value: `'Off'`
 
+##### <a name="-apache--mod--security--secresponsebodylimitaction"></a>`secresponsebodylimitaction`
+
+Data type: `Enum['Reject', 'ProcessPartial']`
+
+Controls what happens once a response body limit, configured with
+SecResponseBodyLimitAction, is encountered.
+
+Default value: `'ProcessPartial'`
+
 ##### <a name="-apache--mod--security--manage_security_crs"></a>`manage_security_crs`
 
 Data type: `Boolean`
diff --git a/metadata.json b/metadata.json
index c755fa85b7..f4beda7e0a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 29bd2e019da1e981e09afc7ba33e4e963b7a8760 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 15 Dec 2022 09:41:45 +0000
Subject: [PATCH 2060/2267] (GH-2291) Further refine types

---
 manifests/mod/auth_cas.pp | 44 +++++++++++++++++++--------------------
 manifests/mod/proxy.pp    | 12 +++++------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 0e4127c947..16801328e0 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -87,28 +87,28 @@
 class apache::mod::auth_cas (
   String $cas_login_url,
   String $cas_validate_url,
-  String $cas_cookie_path                                = $apache::params::cas_cookie_path,
-  Stdlib::Filemode $cas_cookie_path_mode                 = '0750',
-  Integer $cas_version                                   = 2,
-  String $cas_debug                                      = 'Off',
-  Optional[String] $cas_validate_server                  = undef,
-  Optional[String] $cas_validate_depth                   = undef,
-  Optional[String] $cas_certificate_path                 = undef,
-  Optional[String] $cas_proxy_validate_url               = undef,
-  Optional[String] $cas_root_proxied_as                  = undef,
-  Optional[String] $cas_cookie_entropy                   = undef,
-  Optional[Variant[Integer[0],String]] $cas_timeout      = undef,
-  Optional[Variant[Integer[0],String]] $cas_idle_timeout = undef,
-  Optional[String] $cas_cache_clean_interval             = undef,
-  Optional[String] $cas_cookie_domain                    = undef,
-  Optional[String] $cas_cookie_http_only                 = undef,
-  Optional[String] $cas_authoritative                    = undef,
-  Optional[String] $cas_validate_saml                    = undef,
-  Optional[String] $cas_sso_enabled                      = undef,
-  Optional[String] $cas_attribute_prefix                 = undef,
-  Optional[String] $cas_attribute_delimiter              = undef,
-  Optional[String] $cas_scrub_request_headers            = undef,
-  Boolean $suppress_warning                              = false,
+  String $cas_cookie_path                     = $apache::params::cas_cookie_path,
+  Stdlib::Filemode $cas_cookie_path_mode      = '0750',
+  Integer $cas_version                        = 2,
+  String $cas_debug                           = 'Off',
+  Optional[String] $cas_validate_server       = undef,
+  Optional[String] $cas_validate_depth        = undef,
+  Optional[String] $cas_certificate_path      = undef,
+  Optional[String] $cas_proxy_validate_url    = undef,
+  Optional[String] $cas_root_proxied_as       = undef,
+  Optional[String] $cas_cookie_entropy        = undef,
+  Optional[Integer[0]] $cas_timeout           = undef,
+  Optional[Integer[0]] $cas_idle_timeout      = undef,
+  Optional[String] $cas_cache_clean_interval  = undef,
+  Optional[String] $cas_cookie_domain         = undef,
+  Optional[String] $cas_cookie_http_only      = undef,
+  Optional[String] $cas_authoritative         = undef,
+  Optional[String] $cas_validate_saml         = undef,
+  Optional[String] $cas_sso_enabled           = undef,
+  Optional[String] $cas_attribute_prefix      = undef,
+  Optional[String] $cas_attribute_delimiter   = undef,
+  Optional[String] $cas_scrub_request_headers = undef,
+  Boolean $suppress_warning                   = false,
 ) inherits apache::params {
   if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index a124fe9d24..3bd356f85f 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -22,12 +22,12 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
 #
 class apache::mod::proxy (
-  String $proxy_requests                              = 'Off',
-  Optional[Stdlib::IP::Address] $allow_from           = undef,
-  Optional[String] $package_name                      = undef,
-  String $proxy_via                                   = 'On',
-  Optional[Variant[Integer[0],String]] $proxy_timeout = undef,
-  Optional[String] $proxy_iobuffersize                = undef,
+  String $proxy_requests                    = 'Off',
+  Optional[Stdlib::IP::Address] $allow_from = undef,
+  Optional[String] $package_name            = undef,
+  String $proxy_via                         = 'On',
+  Optional[Integer[0]] $proxy_timeout       = undef,
+  Optional[String] $proxy_iobuffersize      = undef,
 ) {
   include apache
   $_proxy_timeout = $apache::timeout

From 6130c0e9ddb8bc0d50d69d49b545f34c2762430a Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Thu, 15 Dec 2022 14:50:13 +0000
Subject: [PATCH 2061/2267] Release prep v9.0.0

---
 CHANGELOG.md  |  10 ++
 REFERENCE.md  | 363 ++------------------------------------------------
 metadata.json |   2 +-
 3 files changed, 25 insertions(+), 350 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80899c8714..0bfe48aac6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v9.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.0) (2022-12-15)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.6.0...v9.0.0)
+
+### Changed
+
+- \(GH-2291\) Further refine types [\#2359](https://github.com/puppetlabs/puppetlabs-apache/pull/2359) ([david22swan](https://github.com/david22swan))
+- Drop deprecated a2mod type/providers [\#2350](https://github.com/puppetlabs/puppetlabs-apache/pull/2350) ([bastelfreak](https://github.com/bastelfreak))
+- Drop Apache 2.2 support [\#2329](https://github.com/puppetlabs/puppetlabs-apache/pull/2329) ([ekohl](https://github.com/ekohl))
+
 ## [v8.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.6.0) (2022-12-14)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.5.0...v8.6.0)
diff --git a/REFERENCE.md b/REFERENCE.md
index 778c9d2f2b..019020f285 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -24,7 +24,6 @@
 * [`apache::mod::authn_file`](#apache--mod--authn_file): Installs `mod_authn_file`.
 * [`apache::mod::authnz_ldap`](#apache--mod--authnz_ldap): Installs `mod_authnz_ldap`.
 * [`apache::mod::authnz_pam`](#apache--mod--authnz_pam): Installs `mod_authnz_pam`.
-* [`apache::mod::authz_default`](#apache--mod--authz_default): Installs and configures `mod_authz_default`.
 * [`apache::mod::authz_groupfile`](#apache--mod--authz_groupfile): Installs `mod_authz_groupfile`
 * [`apache::mod::authz_user`](#apache--mod--authz_user): Installs `mod_authz_user`
 * [`apache::mod::autoindex`](#apache--mod--autoindex): Installs `mod_autoindex`
@@ -101,7 +100,6 @@ pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet
 * [`apache::mod::status`](#apache--mod--status): Installs and configures `mod_status`.
 * [`apache::mod::suexec`](#apache--mod--suexec): Installs `mod_suexec`.
 * [`apache::mod::userdir`](#apache--mod--userdir): Installs and configures `mod_userdir`.
-* [`apache::mod::version`](#apache--mod--version): Installs `mod_version`.
 * [`apache::mod::vhost_alias`](#apache--mod--vhost_alias): Installs Apache `mod_vhost_alias`.
 * [`apache::mod::watchdog`](#apache--mod--watchdog): Installs and configures `mod_watchdog`.
 * [`apache::mod::worker`](#apache--mod--worker): Installs and manages the MPM `worker`.
@@ -156,10 +154,6 @@ outside of the defaults.
 * `apache::peruser::processor`: Enables the `Peruser` module for FreeBSD only.
 * `apache::security::rule_link`: Links the activated_rules from `apache::mod::security` to the respective CRS rules on disk.
 
-### Resource types
-
-* [`a2mod`](#a2mod): Manage Apache 2 modules
-
 ### Functions
 
 * [`apache::apache_pw_hash`](#apache--apache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
@@ -207,7 +201,6 @@ class { 'apache': }
 The following parameters are available in the `apache` class:
 
 * [`allow_encoded_slashes`](#-apache--allow_encoded_slashes)
-* [`apache_version`](#-apache--apache_version)
 * [`conf_dir`](#-apache--conf_dir)
 * [`conf_template`](#-apache--conf_template)
 * [`confd_dir`](#-apache--confd_dir)
@@ -256,7 +249,6 @@ The following parameters are available in the `apache` class:
 * [`protocols_honor_order`](#-apache--protocols_honor_order)
 * [`purge_configs`](#-apache--purge_configs)
 * [`purge_vhost_dir`](#-apache--purge_vhost_dir)
-* [`rewrite_lock`](#-apache--rewrite_lock)
 * [`sendfile`](#-apache--sendfile)
 * [`serveradmin`](#-apache--serveradmin)
 * [`servername`](#-apache--servername)
@@ -306,16 +298,6 @@ the declaration from the server's configuration and uses Apache's default settin
 
 Default value: `undef`
 
-##### <a name="-apache--apache_version"></a>`apache_version`
-
-Data type: `String`
-
-Configures module template behavior, package names, and default Apache modules by defining
-the version of Apache to use. We do not recommend manually configuring this parameter
-without reason.
-
-Default value: `$apache::version::default`
-
 ##### <a name="-apache--conf_dir"></a>`conf_dir`
 
 Data type: `Stdlib::Absolutepath`
@@ -371,7 +353,7 @@ If `false`, Puppet includes only the Apache modules required to make the HTTP da
 on your operating system, and you can declare any other modules separately using the
 `apache::mod::<MODULE NAME>` class or `apache::mod` defined type.<br />
 If `true`, Puppet installs additional modules, depending on the operating system and
-the values of `apache_version` and `mpm_module` parameters. Because these lists of
+the value of the `mpm_module` parameter. Because these lists of
 modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
 If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
@@ -761,7 +743,7 @@ Default value: `$apache::params::mod_packages`
 
 ##### <a name="-apache--mpm_module"></a>`mpm_module`
 
-Data type: `Variant[Boolean, String]`
+Data type: `Variant[Boolean, Enum['event', 'itk', 'peruser', 'prefork', 'worker']]`
 
 Determines which [multi-processing module](https://httpd.apache.org/docs/current/mpm.html) (MPM) is loaded and configured for the
 HTTPD process. Valid values are: `event`, `itk`, `peruser`, `prefork`, `worker` or `false`.<br />
@@ -840,16 +822,6 @@ coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
 Default value: `undef`
 
-##### <a name="-apache--rewrite_lock"></a>`rewrite_lock`
-
-Data type: `Optional[Stdlib::Absolutepath]`
-
-Allows setting a custom location for a rewrite lock - considered best practice if using
-a RewriteMap of type prg in the `rewrites` parameter of your virtual host. This parameter
-only applies to Apache version 2.2 or lower and is ignored on newer versions.
-
-Default value: `undef`
-
 ##### <a name="-apache--sendfile"></a>`sendfile`
 
 Data type: `Enum['On', 'Off', 'on', 'off']`
@@ -1223,19 +1195,10 @@ Installs and configures `mod_alias`.
 
 The following parameters are available in the `apache::mod::alias` class:
 
-* [`apache_version`](#-apache--mod--alias--apache_version)
 * [`icons_options`](#-apache--mod--alias--icons_options)
 * [`icons_path`](#-apache--mod--alias--icons_path)
 * [`icons_prefix`](#-apache--mod--alias--icons_prefix)
 
-##### <a name="-apache--mod--alias--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-The version of Apache, if not set will be retrieved from the init class.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--alias--icons_options"></a>`icons_options`
 
 Data type: `String`
@@ -1422,7 +1385,7 @@ Default value: `undef`
 
 ##### <a name="-apache--mod--auth_cas--cas_timeout"></a>`cas_timeout`
 
-Data type: `Optional[Variant[Integer[0],String]]`
+Data type: `Optional[Integer[0]]`
 
 The hard limit, in seconds, for a mod_auth_cas session.
 
@@ -1430,7 +1393,7 @@ Default value: `undef`
 
 ##### <a name="-apache--mod--auth_cas--cas_idle_timeout"></a>`cas_idle_timeout`
 
-Data type: `Optional[Variant[Integer[0],String]]`
+Data type: `Optional[Integer[0]]`
 
 The limit, in seconds, of how long a mod_auth_cas session can be idle.
 
@@ -1660,20 +1623,6 @@ Installs `mod_authn_core`.
   * https://httpd.apache.org/docs/current/mod/mod_authn_core.html
     * for additional documentation.
 
-#### Parameters
-
-The following parameters are available in the `apache::mod::authn_core` class:
-
-* [`apache_version`](#-apache--mod--authn_core--apache_version)
-
-##### <a name="-apache--mod--authn_core--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-The version of apache being run.
-
-Default value: `$apache::apache_version`
-
 ### <a name="apache--mod--authn_dbd"></a>`apache::mod::authn_dbd`
 
 Installs `mod_authn_dbd`.
@@ -1807,28 +1756,6 @@ Installs `mod_authnz_pam`.
   * https://www.adelton.com/apache/mod_authnz_pam
     * for additional documentation.
 
-### <a name="apache--mod--authz_default"></a>`apache::mod::authz_default`
-
-Installs and configures `mod_authz_default`.
-
-* **See also**
-  * https://httpd.apache.org/docs/current/mod/mod_authz_default.html
-    * for additional documentation.
-
-#### Parameters
-
-The following parameters are available in the `apache::mod::authz_default` class:
-
-* [`apache_version`](#-apache--mod--authz_default--apache_version)
-
-##### <a name="-apache--mod--authz_default--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Version of Apache to install module on.
-
-Default value: `$apache::apache_version`
-
 ### <a name="apache--mod--authz_groupfile"></a>`apache::mod::authz_groupfile`
 
 Installs `mod_authz_groupfile`
@@ -2018,20 +1945,6 @@ Installs and configures `mod_data`.
   * https://httpd.apache.org/docs/current/mod/mod_data.html
     * for additional documentation.
 
-#### Parameters
-
-The following parameters are available in the `apache::mod::data` class:
-
-* [`apache_version`](#-apache--mod--data--apache_version)
-
-##### <a name="-apache--mod--data--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Version of Apache to install module on.
-
-Default value: `undef`
-
 ### <a name="apache--mod--dav"></a>`apache::mod::dav`
 
 Installs `mod_dav`.
@@ -2182,10 +2095,10 @@ Default value:
 
 Installs and configures `mod_disk_cache`.
 
-* **Note** Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
+* **Note** On Apache 2.4, mod_cache_disk installed.
 
 * **See also**
-  * https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
+  * https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html
     * for additional documentation.
 
 #### Parameters
@@ -2204,8 +2117,7 @@ Defines the name of the directory on the disk to contain cache files.
 Default depends on the Apache version and operating system:
 - Debian: /var/cache/apache2/mod_cache_disk
 - FreeBSD: /var/cache/mod_cache_disk
-- Red Hat, Apache 2.4: /var/cache/httpd/proxy
-- Red Hat, Apache 2.2: /var/cache/mod_proxy
+- Red Hat: /var/cache/httpd/proxy
 
 Default value: `undef`
 
@@ -2297,15 +2209,12 @@ apache::mod::worker on the same server.
 The following parameters are available in the `apache::mod::event` class:
 
 * [`startservers`](#-apache--mod--event--startservers)
-* [`maxclients`](#-apache--mod--event--maxclients)
 * [`maxrequestworkers`](#-apache--mod--event--maxrequestworkers)
 * [`minsparethreads`](#-apache--mod--event--minsparethreads)
 * [`maxsparethreads`](#-apache--mod--event--maxsparethreads)
 * [`threadsperchild`](#-apache--mod--event--threadsperchild)
-* [`maxrequestsperchild`](#-apache--mod--event--maxrequestsperchild)
 * [`maxconnectionsperchild`](#-apache--mod--event--maxconnectionsperchild)
 * [`serverlimit`](#-apache--mod--event--serverlimit)
-* [`apache_version`](#-apache--mod--event--apache_version)
 * [`threadlimit`](#-apache--mod--event--threadlimit)
 * [`listenbacklog`](#-apache--mod--event--listenbacklog)
 
@@ -2318,14 +2227,6 @@ removes the parameter.
 
 Default value: `2`
 
-##### <a name="-apache--mod--event--maxclients"></a>`maxclients`
-
-Data type: `Variant[Integer, Boolean]`
-
-Apache 2.3.12 or older alias for the `MaxRequestWorkers` directive.
-
-Default value: `150`
-
 ##### <a name="-apache--mod--event--maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Optional[Variant[Integer, Boolean]]`
@@ -2359,14 +2260,6 @@ Number of threads created by each child process.
 
 Default value: `25`
 
-##### <a name="-apache--mod--event--maxrequestsperchild"></a>`maxrequestsperchild`
-
-Data type: `Variant[Integer, Boolean]`
-
-Apache 2.3.8 or older alias for the `MaxConnectionsPerChild` directive.
-
-Default value: `0`
-
 ##### <a name="-apache--mod--event--maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Optional[Variant[Integer, Boolean]]`
@@ -2383,14 +2276,6 @@ Limits the configurable number of processes via the `ServerLimit` directive. Set
 
 Default value: `25`
 
-##### <a name="-apache--mod--event--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Version of Apache to install module on.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--event--threadlimit"></a>`threadlimit`
 
 Data type: `Variant[Integer, Boolean]`
@@ -2675,7 +2560,6 @@ The following parameters are available in the `apache::mod::http2` class:
 * [`h2_tls_warm_up_size`](#-apache--mod--http2--h2_tls_warm_up_size)
 * [`h2_upgrade`](#-apache--mod--http2--h2_upgrade)
 * [`h2_window_size`](#-apache--mod--http2--h2_window_size)
-* [`apache_version`](#-apache--mod--http2--apache_version)
 
 ##### <a name="-apache--mod--http2--h2_copy_files"></a>`h2_copy_files`
 
@@ -2826,14 +2710,6 @@ the amount of data the server has to buffer.
 
 Default value: `undef`
 
-##### <a name="-apache--mod--http2--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Version of Apache to install module on.
-
-Default value: `undef`
-
 ### <a name="apache--mod--include"></a>`apache::mod::include`
 
 Installs `mod_include`.
@@ -2855,7 +2731,6 @@ Installs and configures `mod_info`.
 The following parameters are available in the `apache::mod::info` class:
 
 * [`allow_from`](#-apache--mod--info--allow_from)
-* [`apache_version`](#-apache--mod--info--apache_version)
 * [`restrict_access`](#-apache--mod--info--restrict_access)
 * [`info_path`](#-apache--mod--info--info_path)
 
@@ -2867,14 +2742,6 @@ Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 
 Default value: `['127.0.0.1', '::1']`
 
-##### <a name="-apache--mod--info--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Version of Apache to install module on.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--info--restrict_access"></a>`restrict_access`
 
 Data type: `Boolean`
@@ -2921,7 +2788,6 @@ The following parameters are available in the `apache::mod::itk` class:
 * [`maxclients`](#-apache--mod--itk--maxclients)
 * [`maxrequestsperchild`](#-apache--mod--itk--maxrequestsperchild)
 * [`enablecapabilities`](#-apache--mod--itk--enablecapabilities)
-* [`apache_version`](#-apache--mod--itk--apache_version)
 
 ##### <a name="-apache--mod--itk--startservers"></a>`startservers`
 
@@ -2981,14 +2847,6 @@ capabilities, such as NFS.
 
 Default value: `undef`
 
-##### <a name="-apache--mod--itk--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `undef`
-
 ### <a name="apache--mod--jk"></a>`apache::mod::jk`
 
 Installs `mod_jk`.
@@ -3642,7 +3500,6 @@ class { 'apache::mod::ldap':
 
 The following parameters are available in the `apache::mod::ldap` class:
 
-* [`apache_version`](#-apache--mod--ldap--apache_version)
 * [`package_name`](#-apache--mod--ldap--package_name)
 * [`ldap_trusted_global_cert_file`](#-apache--mod--ldap--ldap_trusted_global_cert_file)
 * [`ldap_trusted_global_cert_type`](#-apache--mod--ldap--ldap_trusted_global_cert_type)
@@ -3654,14 +3511,6 @@ The following parameters are available in the `apache::mod::ldap` class:
 * [`ldap_trusted_mode`](#-apache--mod--ldap--ldap_trusted_mode)
 * [`ldap_path`](#-apache--mod--ldap--ldap_path)
 
-##### <a name="-apache--mod--ldap--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--ldap--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
@@ -4276,7 +4125,6 @@ The following parameters are available in the `apache::mod::pagespeed` class:
 * [`allow_pagespeed_message`](#-apache--mod--pagespeed--allow_pagespeed_message)
 * [`message_buffer_size`](#-apache--mod--pagespeed--message_buffer_size)
 * [`additional_configuration`](#-apache--mod--pagespeed--additional_configuration)
-* [`apache_version`](#-apache--mod--pagespeed--apache_version)
 * [`package_ensure`](#-apache--mod--pagespeed--package_ensure)
 
 ##### <a name="-apache--mod--pagespeed--inherit_vhost_config"></a>`inherit_vhost_config`
@@ -4546,14 +4394,6 @@ Any additional configuration no included as it's own option
 
 Default value: `{}`
 
-##### <a name="-apache--mod--pagespeed--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--pagespeed--package_ensure"></a>`package_ensure`
 
 Data type: `Optional[String]`
@@ -5667,7 +5507,6 @@ The following parameters are available in the `apache::mod::prefork` class:
 * [`maxrequestworkers`](#-apache--mod--prefork--maxrequestworkers)
 * [`maxrequestsperchild`](#-apache--mod--prefork--maxrequestsperchild)
 * [`maxconnectionsperchild`](#-apache--mod--prefork--maxconnectionsperchild)
-* [`apache_version`](#-apache--mod--prefork--apache_version)
 * [`listenbacklog`](#-apache--mod--prefork--listenbacklog)
 
 ##### <a name="-apache--mod--prefork--startservers"></a>`startservers`
@@ -5734,14 +5573,6 @@ Limit on the number of connections that an individual child server will handle d
 
 Default value: `undef`
 
-##### <a name="-apache--mod--prefork--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--prefork--listenbacklog"></a>`listenbacklog`
 
 Data type: `Integer`
@@ -5764,7 +5595,6 @@ The following parameters are available in the `apache::mod::proxy` class:
 
 * [`proxy_requests`](#-apache--mod--proxy--proxy_requests)
 * [`allow_from`](#-apache--mod--proxy--allow_from)
-* [`apache_version`](#-apache--mod--proxy--apache_version)
 * [`package_name`](#-apache--mod--proxy--package_name)
 * [`proxy_via`](#-apache--mod--proxy--proxy_via)
 * [`proxy_timeout`](#-apache--mod--proxy--proxy_timeout)
@@ -5780,20 +5610,12 @@ Default value: `'Off'`
 
 ##### <a name="-apache--mod--proxy--allow_from"></a>`allow_from`
 
-Data type: `Optional[String]`
+Data type: `Optional[Stdlib::IP::Address]`
 
 List of IPs allowed to access proxy.
 
 Default value: `undef`
 
-##### <a name="-apache--mod--proxy--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--proxy--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
@@ -5812,7 +5634,7 @@ Default value: `'On'`
 
 ##### <a name="-apache--mod--proxy--proxy_timeout"></a>`proxy_timeout`
 
-Data type: `Optional[Variant[Integer[0],String]]`
+Data type: `Optional[Integer[0]]`
 
 Network timeout for proxied requests.
 
@@ -5849,7 +5671,6 @@ The following parameters are available in the `apache::mod::proxy_balancer` clas
 * [`manager`](#-apache--mod--proxy_balancer--manager)
 * [`manager_path`](#-apache--mod--proxy_balancer--manager_path)
 * [`allow_from`](#-apache--mod--proxy_balancer--allow_from)
-* [`apache_version`](#-apache--mod--proxy_balancer--apache_version)
 
 ##### <a name="-apache--mod--proxy_balancer--manager"></a>`manager`
 
@@ -5875,14 +5696,6 @@ List of IPs from which the balancer manager can be accessed.
 
 Default value: `['127.0.0.1', '::1']`
 
-##### <a name="-apache--mod--proxy_balancer--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Version of Apache to install module on.
-
-Default value: `$apache::apache_version`
-
 ### <a name="apache--mod--proxy_connect"></a>`apache::mod::proxy_connect`
 
 Installs `mod_proxy_connect`.
@@ -5968,7 +5781,6 @@ The following parameters are available in the `apache::mod::remoteip` class:
 * [`trusted_proxy`](#-apache--mod--remoteip--trusted_proxy)
 * [`trusted_proxy_ips`](#-apache--mod--remoteip--trusted_proxy_ips)
 * [`trusted_proxy_list`](#-apache--mod--remoteip--trusted_proxy_list)
-* [`apache_version`](#-apache--mod--remoteip--apache_version)
 
 ##### <a name="-apache--mod--remoteip--header"></a>`header`
 
@@ -6064,15 +5876,6 @@ that are trusted to set a valid value inside the specified header. See
 
 Default value: `undef`
 
-##### <a name="-apache--mod--remoteip--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-A version string used to validate that your apache version supports
-`mod_remoteip`. If not specified, `$::apache::apache_version` is used.
-
-Default value: `undef`
-
 ### <a name="apache--mod--reqtimeout"></a>`apache::mod::reqtimeout`
 
 Installs and configures `mod_reqtimeout`.
@@ -6652,7 +6455,6 @@ The following parameters are available in the `apache::mod::ssl` class:
 * [`ssl_stapling_return_errors`](#-apache--mod--ssl--ssl_stapling_return_errors)
 * [`ssl_mutex`](#-apache--mod--ssl--ssl_mutex)
 * [`ssl_reload_on_change`](#-apache--mod--ssl--ssl_reload_on_change)
-* [`apache_version`](#-apache--mod--ssl--apache_version)
 * [`package_name`](#-apache--mod--ssl--package_name)
 
 ##### <a name="-apache--mod--ssl--ssl_compression"></a>`ssl_compression`
@@ -6821,7 +6623,7 @@ Default value: `undef`
 
 ##### <a name="-apache--mod--ssl--ssl_mutex"></a>`ssl_mutex`
 
-Data type: `Optional[String]`
+Data type: `String`
 
 Configures mutex mechanism and lock file directory for all or specified mutexes.
 Default based on the OS and/or Apache version:
@@ -6829,7 +6631,7 @@ Default based on the OS and/or Apache version:
 - Debian/Ubuntu + Apache >= 2.4: 'default'.
 - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
 
-Default value: `undef`
+Default value: `'default'`
 
 ##### <a name="-apache--mod--ssl--ssl_reload_on_change"></a>`ssl_reload_on_change`
 
@@ -6839,14 +6641,6 @@ Enable reloading of apache if the content of ssl files have changed. It only aff
 
 Default value: `false`
 
-##### <a name="-apache--mod--ssl--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--ssl--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
@@ -6870,7 +6664,7 @@ Installs and configures `mod_status`.
 ```puppet
 # Simple usage allowing access from localhost and a private subnet
 class { 'apache::mod::status':
-  $allow_from => ['127.0.0.1', '10.10.10.10/24'],
+  $requires => 'ip 127.0.0.1 ::1 10.10.10.10/24',
 }
 ```
 
@@ -6878,21 +6672,9 @@ class { 'apache::mod::status':
 
 The following parameters are available in the `apache::mod::status` class:
 
-* [`allow_from`](#-apache--mod--status--allow_from)
 * [`requires`](#-apache--mod--status--requires)
 * [`extended_status`](#-apache--mod--status--extended_status)
 * [`status_path`](#-apache--mod--status--status_path)
-* [`apache_version`](#-apache--mod--status--apache_version)
-
-##### <a name="-apache--mod--status--allow_from"></a>`allow_from`
-
-Data type: `Optional[Array]`
-
-Array of hosts, ip addresses, partial network numbers or networks, in CIDR notation specifying what hosts can view the special
-/server-status URL.  Defaults to ['127.0.0.1', '::1'].
-> Creates Apache < 2.4 directive "Allow from".
-
-Default value: `undef`
 
 ##### <a name="-apache--mod--status--requires"></a>`requires`
 
@@ -6910,7 +6692,6 @@ A Variant type that can be:
   - 'enforce' - Value => String 'Any', 'All' or 'None'
     This encloses "Require" directives in "<Require(Any|All|None)>" block
     Optional - If unspecified, "Require" directives follow current flow
-> Creates Apache >= 2.4 directives "Require"
 
 Default value: `undef`
 
@@ -6930,14 +6711,6 @@ Path assigned to the Location directive which defines the URL to access the serv
 
 Default value: `'/server-status'`
 
-##### <a name="-apache--mod--status--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `undef`
-
 ### <a name="apache--mod--suexec"></a>`apache::mod::suexec`
 
 Installs `mod_suexec`.
@@ -6962,7 +6735,6 @@ The following parameters are available in the `apache::mod::userdir` class:
 * [`dir`](#-apache--mod--userdir--dir)
 * [`userdir`](#-apache--mod--userdir--userdir)
 * [`disable_root`](#-apache--mod--userdir--disable_root)
-* [`apache_version`](#-apache--mod--userdir--apache_version)
 * [`path`](#-apache--mod--userdir--path)
 * [`overrides`](#-apache--mod--userdir--overrides)
 * [`options`](#-apache--mod--userdir--options)
@@ -7001,14 +6773,6 @@ Toggles whether to allow use of root directory.
 
 Default value: `true`
 
-##### <a name="-apache--mod--userdir--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--userdir--path"></a>`path`
 
 Data type: `String`
@@ -7049,28 +6813,6 @@ Custom configuration to be added to userdir.conf
 
 Default value: `undef`
 
-### <a name="apache--mod--version"></a>`apache::mod::version`
-
-Installs `mod_version`.
-
-* **See also**
-  * https://httpd.apache.org/docs/current/mod/mod_version.html
-    * for additional documentation.
-
-#### Parameters
-
-The following parameters are available in the `apache::mod::version` class:
-
-* [`apache_version`](#-apache--mod--version--apache_version)
-
-##### <a name="-apache--mod--version--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `$apache::apache_version`
-
 ### <a name="apache--mod--vhost_alias"></a>`apache::mod::vhost_alias`
 
 Installs Apache `mod_vhost_alias`.
@@ -7114,7 +6856,6 @@ Installs and manages the MPM `worker`.
 The following parameters are available in the `apache::mod::worker` class:
 
 * [`startservers`](#-apache--mod--worker--startservers)
-* [`maxclients`](#-apache--mod--worker--maxclients)
 * [`minsparethreads`](#-apache--mod--worker--minsparethreads)
 * [`maxsparethreads`](#-apache--mod--worker--maxsparethreads)
 * [`threadsperchild`](#-apache--mod--worker--threadsperchild)
@@ -7122,7 +6863,6 @@ The following parameters are available in the `apache::mod::worker` class:
 * [`serverlimit`](#-apache--mod--worker--serverlimit)
 * [`threadlimit`](#-apache--mod--worker--threadlimit)
 * [`listenbacklog`](#-apache--mod--worker--listenbacklog)
-* [`apache_version`](#-apache--mod--worker--apache_version)
 * [`maxrequestworkers`](#-apache--mod--worker--maxrequestworkers)
 
 ##### <a name="-apache--mod--worker--startservers"></a>`startservers`
@@ -7133,17 +6873,6 @@ The number of child server processes created on startup
 
 Default value: `2`
 
-##### <a name="-apache--mod--worker--maxclients"></a>`maxclients`
-
-Data type: `Integer`
-
-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 maxrequestworkers is set, this value is ignored.
-
-Default value: `150`
-
 ##### <a name="-apache--mod--worker--minsparethreads"></a>`minsparethreads`
 
 Data type: `Integer`
@@ -7207,22 +6936,13 @@ Maximum length of the queue of pending connections.
 
 Default value: `511`
 
-##### <a name="-apache--mod--worker--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Used to verify that the Apache version you have requested is compatible with the module.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--worker--maxrequestworkers"></a>`maxrequestworkers`
 
-Data type: `Optional[Integer]`
+Data type: `Integer`
 
 Maximum number of connections that will be processed simultaneously
-if set, maxclients is ignored
 
-Default value: `undef`
+Default value: `150`
 
 ### <a name="apache--mod--wsgi"></a>`apache::mod::wsgi`
 
@@ -7903,7 +7623,6 @@ class { 'apache':
 
 The following parameters are available in the `apache::vhost` defined type:
 
-* [`apache_version`](#-apache--vhost--apache_version)
 * [`access_log`](#-apache--vhost--access_log)
 * [`access_log_env_var`](#-apache--vhost--access_log_env_var)
 * [`access_log_file`](#-apache--vhost--access_log_file)
@@ -8147,14 +7866,6 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`proxy_requests`](#-apache--vhost--proxy_requests)
 * [`userdir`](#-apache--vhost--userdir)
 
-##### <a name="-apache--vhost--apache_version"></a>`apache_version`
-
-Data type: `Optional[String]`
-
-Apache's version number as a string, such as '2.2' or '2.4'.
-
-Default value: `$apache::apache_version`
-
 ##### <a name="-apache--vhost--access_log"></a>`access_log`
 
 Data type: `Boolean`
@@ -11353,52 +11064,6 @@ of status codes. See [ProxyErrorOverride](https://httpd.apache.org/docs/current/
 
 Default value: `false`
 
-## Resource types
-
-### <a name="a2mod"></a>`a2mod`
-
-Manage Apache 2 modules
-
-#### Properties
-
-The following properties are available in the `a2mod` type.
-
-##### `ensure`
-
-Valid values: `present`, `absent`
-
-The basic property that the resource should be in.
-
-Default value: `present`
-
-#### Parameters
-
-The following parameters are available in the `a2mod` type.
-
-* [`identifier`](#-a2mod--identifier)
-* [`lib`](#-a2mod--lib)
-* [`name`](#-a2mod--name)
-* [`provider`](#-a2mod--provider)
-
-##### <a name="-a2mod--identifier"></a>`identifier`
-
-Module identifier string used by LoadModule. Default: module-name_module
-
-##### <a name="-a2mod--lib"></a>`lib`
-
-The name of the .so library to be loaded
-
-##### <a name="-a2mod--name"></a>`name`
-
-namevar
-
-The name of the module to be managed
-
-##### <a name="-a2mod--provider"></a>`provider`
-
-The specific backend to use for this `a2mod` resource. You will seldom need to specify this --- Puppet will usually
-discover the appropriate provider for your platform.
-
 ## Functions
 
 ### <a name="apache--apache_pw_hash"></a>`apache::apache_pw_hash`
diff --git a/metadata.json b/metadata.json
index f4beda7e0a..ee192ae625 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "8.6.0",
+  "version": "9.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 175d6d4e513f632bce60b7a07b9ec199b5ee4fbd Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 21 Dec 2022 10:11:14 +0000
Subject: [PATCH 2062/2267] (CONT-406) Fix for RHEL 7 compatibility

A previous PR had updated the security_crs.comf.erb file to a more modern version, however this has rendered it incompatible with RHEL 7.
This PR introduces and if to solve the issue.

Also includes a quick fix to remove legacy facts from a template file.
---
 templates/mod/security.conf.erb     |   4 +-
 templates/mod/security_crs.conf.erb | 439 ++++++++++++++++++++++++++++
 2 files changed, 441 insertions(+), 2 deletions(-)

diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 08724d010e..42e6fe27d3 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -54,13 +54,13 @@
     <%- end -%>
     SecArgumentSeparator &
     SecCookieFormat 0
-<%- if scope.lookupvar('::osfamily') == 'Debian' -%>
+<%- if scope['os::family'] == 'Debian' -%>
     SecDebugLog <%= @logroot %>/modsec_debug.log
     SecAuditLog <%= @logroot %>/modsec_audit.log
     SecTmpDir /var/cache/modsecurity
     SecDataDir /var/cache/modsecurity
     SecUploadDir /var/cache/modsecurity
-<%- elsif scope.lookupvar('::osfamily') == 'Suse' -%>
+<%- elsif scope['os::family'] == 'Suse' -%>
     SecDebugLog /var/log/apache2/modsec_debug.log
     SecAuditLog /var/log/apache2/modsec_audit.log
     SecTmpDir /var/lib/mod_security
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index cf8962f3f4..939e9f3a5c 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -1,3 +1,440 @@
+<% if scope['os::family'] == 'Redhat' and scope['os::release::major'].to_i <= 7 -%>
+# ---------------------------------------------------------------
+# Core ModSecurity Rule Set ver.2.2.9
+# Copyright (C) 2006-2012 Trustwave All rights reserved.
+#
+# The OWASP ModSecurity Core Rule Set is distributed under 
+# Apache Software License (ASL) version 2
+# Please see the enclosed LICENCE file for full details.
+# ---------------------------------------------------------------
+
+
+#
+# -- [[ Recommended Base Configuration ]] ------------------------------------------------- 
+#
+# The configuration directives/settings in this file are used to control
+# the OWASP ModSecurity CRS. These settings do **NOT** configure the main
+# ModSecurity settings such as:
+# 
+# - SecRuleEngine
+# - SecRequestBodyAccess
+# - SecAuditEngine
+# - SecDebugLog
+#
+# You should use the modsecurity.conf-recommended file that comes with the
+# ModSecurity source code archive.
+#
+# Ref: https://github.com/SpiderLabs/ModSecurity/blob/master/modsecurity.conf-recommended 
+#
+
+
+#
+# -- [[ Rule Version ]] -------------------------------------------------------------------
+#
+# Rule version data is added to the "Producer" line of Section H of the Audit log:
+#
+# - Producer: ModSecurity for Apache/2.7.0-rc1 (http://www.modsecurity.org/); OWASP_CRS/2.2.4.
+#
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecComponentSignature 
+#
+SecComponentSignature "OWASP_CRS/2.2.9"
+
+
+#
+# -- [[ Modes of Operation: Self-Contained vs. Collaborative Detection ]] -----------------
+#
+# Each detection rule uses the "block" action which will inherit the SecDefaultAction
+# specified below.  Your settings here will determine which mode of operation you use.
+#
+# -- [[ Self-Contained Mode ]] --
+# Rules inherit the "deny" disruptive action.  The first rule that matches will block.
+#
+# -- [[ Collaborative Detection Mode ]] --
+# This is a "delayed blocking" mode of operation where each matching rule will inherit
+# the "pass" action and will only contribute to anomaly scores.  Transactional blocking
+# can be applied 
+#
+# -- [[ Alert Logging Control ]] --
+# You have three options -
+#
+# - To log to both the Apache error_log and ModSecurity audit_log file use: "log"
+# - To log *only* to the ModSecurity audit_log file use: "nolog,auditlog"
+# - To log *only* to the Apache error_log file use: "log,noauditlog"
+#
+# Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecDefaultAction 
+#
+SecDefaultAction "phase:1,<%= @_secdefaultaction -%>"
+SecDefaultAction "phase:2,<%= @_secdefaultaction -%>"
+
+#
+# -- [[ Collaborative Detection Severity Levels ]] ----------------------------------------
+#
+# These are the default scoring points for each severity level.  You may
+# adjust these to you liking.  These settings will be used in macro expansion
+# in the rules to increment the anomaly scores when rules match.
+#
+# These are the default Severity ratings (with anomaly scores) of the individual rules -
+#
+#    - 2: Critical - Anomaly Score of 5.
+#         Is the highest severity level possible without correlation.  It is
+#         normally generated by the web attack rules (40 level files).
+#    - 3: Error - Anomaly Score of 4.
+#         Is generated mostly from outbound leakage rules (50 level files).
+#    - 4: Warning - Anomaly Score of 3.
+#         Is generated by malicious client rules (35 level files).
+#    - 5: Notice - Anomaly Score of 2.
+#         Is generated by the Protocol policy and anomaly files.
+#
+SecAction \
+  "id:'900001', \
+  phase:1, \
+  t:none, \
+  setvar:tx.critical_anomaly_score=<%= @critical_anomaly_score -%>, \
+  setvar:tx.error_anomaly_score=<%= @error_anomaly_score -%>, \
+  setvar:tx.warning_anomaly_score=<%= @warning_anomaly_score -%>, \
+  setvar:tx.notice_anomaly_score=<%= @notice_anomaly_score -%>, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Collaborative Detection Scoring Initialization and Threshold Levels ]] ------------------------------
+#
+# These variables are used in macro expansion in the 49 inbound blocking and 59
+# outbound blocking files.
+#
+# **MUST HAVE** ModSecurity v2.5.12 or higher to use macro expansion in numeric
+# operators.  If you have an earlier version, edit the 49/59 files directly to
+# set the appropriate anomaly score levels.
+#
+# You should set the score level (rule 900003) to the proper threshold you 
+# would prefer.  If set to "5" it will work similarly to previous Mod CRS rules
+# and will create an event in the error_log file if there are any rules that
+# match.  If you would like to lessen the number of events generated in the 
+# error_log file, you should increase the anomaly score threshold to something 
+# like "20".  This would only generate an event in the error_log file if there
+# are multiple lower severity rule matches or if any 1 higher severity item matches.
+#
+SecAction \
+  "id:'900002', \
+  phase:1, \
+  t:none, \
+  setvar:tx.anomaly_score=0, \
+  setvar:tx.sql_injection_score=0, \
+  setvar:tx.xss_score=0, \
+  setvar:tx.inbound_anomaly_score=0, \
+  setvar:tx.outbound_anomaly_score=0, \
+  nolog, \
+  pass"
+
+
+SecAction \
+  "id:'900003', \
+  phase:1, \
+  t:none, \
+  setvar:tx.inbound_anomaly_score_level=<%= @inbound_anomaly_threshold -%>, \
+  setvar:tx.outbound_anomaly_score_level=<%= @outbound_anomaly_threshold -%>, \
+  nolog, \
+  pass"
+
+
+# 
+# -- [[ Collaborative Detection Blocking ]] -----------------------------------------------
+#
+# This is a collaborative detection mode where each rule will increment an overall
+# anomaly score for the transaction. The scores are then evaluated in the following files:
+#
+# Inbound anomaly score - checked in the modsecurity_crs_49_inbound_blocking.conf file
+# Outbound anomaly score - checked in the modsecurity_crs_59_outbound_blocking.conf file
+#
+# If you want to use anomaly scoring mode, then uncomment this line.
+#
+SecAction \
+  "id:'900004', \
+  phase:1, \
+  t:none, \
+  setvar:tx.anomaly_score_blocking=<%= @anomaly_score_blocking -%>, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ GeoIP Database ]] -----------------------------------------------------------------
+#
+# There are some rulesets that need to inspect the GEO data of the REMOTE_ADDR data.
+# 
+# You must first download the MaxMind GeoIP Lite City DB -
+#
+#       http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+#
+# You then need to define the proper path for the SecGeoLookupDb directive
+#
+# Ref: http://blog.spiderlabs.com/2010/10/detecting-malice-with-modsecurity-geolocation-data.html
+# Ref: http://blog.spiderlabs.com/2010/11/detecting-malice-with-modsecurity-ip-forensics.html
+#
+#SecGeoLookupDb /opt/modsecurity/lib/GeoLiteCity.dat
+
+#
+# -- [[ Regression Testing Mode ]] --------------------------------------------------------
+#
+# If you are going to run the regression testing mode, you should uncomment the
+# following rule. It will enable DetectionOnly mode for the SecRuleEngine and
+# will enable Response Header tagging so that the client testing script can see
+# which rule IDs have matched.
+#
+# You must specify the your source IP address where you will be running the tests
+# from.
+#
+#SecRule REMOTE_ADDR "@ipMatch 192.168.1.100" \
+  "id:'900005', \
+  phase:1, \
+  t:none, \
+  ctl:ruleEngine=DetectionOnly, \
+  setvar:tx.regression_testing=1, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ HTTP Policy Settings ]] ----------------------------------------------------------
+#
+# Set the following policy settings here and they will be propagated to the 23 rules
+# file (modsecurity_common_23_request_limits.conf) by using macro expansion.  
+# If you run into false positives, you can adjust the settings here.
+#
+# Only the max number of args is uncommented by default as there are a high rate
+# of false positives.  Uncomment the items you wish to set.
+# 
+#
+# -- Maximum number of arguments in request limited
+SecAction \
+  "id:'900006', \
+  phase:1, \
+  t:none, \
+  setvar:tx.max_num_args=<%= @secrequestmaxnumargs %>, \
+  nolog, \
+  pass"
+
+#
+# -- Limit argument name length
+#SecAction \
+  "id:'900007', \
+  phase:1, \
+  t:none, \
+  setvar:tx.arg_name_length=100, \
+  nolog, \
+  pass"
+
+#
+# -- Limit value name length
+#SecAction \
+  "id:'900008', \
+  phase:1, \
+  t:none, \
+  setvar:tx.arg_length=400, \
+  nolog, \
+  pass"
+
+#
+# -- Limit arguments total length
+#SecAction \
+  "id:'900009', \
+  phase:1, \
+  t:none, \
+  setvar:tx.total_arg_length=64000, \
+  nolog, \
+  pass"
+
+#
+# -- Individual file size is limited
+#SecAction \
+  "id:'900010', \
+  phase:1, \
+  t:none, \
+  setvar:tx.max_file_size=1048576, \
+  nolog, \
+  pass"
+
+#
+# -- Combined file size is limited
+#SecAction \
+  "id:'900011', \
+  phase:1, \
+  t:none, \
+  setvar:tx.combined_file_sizes=1048576, \
+  nolog, \
+  pass"
+
+
+#
+# Set the following policy settings here and they will be propagated to the 30 rules
+# file (modsecurity_crs_30_http_policy.conf) by using macro expansion.  
+# If you run into false positves, you can adjust the settings here.
+#
+SecAction \
+  "id:'900012', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.allowed_methods=<%= @allowed_methods -%>', \
+  setvar:'tx.allowed_request_content_type=<%= @content_types -%>', \
+  setvar:'tx.allowed_http_versions=HTTP/0.9 HTTP/1.0 HTTP/1.1', \
+  setvar:'tx.restricted_extensions=<%= @restricted_extensions -%>', \
+  setvar:'tx.restricted_headers=<%= @restricted_headers -%>', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Content Security Policy (CSP) Settings ]] -----------------------------------------
+#
+# The purpose of these settings is to send CSP response headers to
+# Mozilla FireFox users so that you can enforce how dynamic content
+# is used. CSP usage helps to prevent XSS attacks against your users.
+#  
+# Reference Link:
+#
+#	https://developer.mozilla.org/en/Security/CSP
+#
+# Uncomment this SecAction line if you want use CSP enforcement.
+# You need to set the appropriate directives and settings for your site/domain and
+# and activate the CSP file in the experimental_rules directory.
+# 
+# Ref: http://blog.spiderlabs.com/2011/04/modsecurity-advanced-topic-of-the-week-integrating-content-security-policy-csp.html
+#
+#SecAction \
+  "id:'900013', \
+  phase:1, \
+  t:none, \
+  setvar:tx.csp_report_only=1, \
+  setvar:tx.csp_report_uri=/csp_violation_report, \
+  setenv:'csp_policy=allow \'self\'; img-src *.yoursite.com; media-src *.yoursite.com; style-src *.yoursite.com; frame-ancestors *.yoursite.com; script-src *.yoursite.com; report-uri %{tx.csp_report_uri}', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Brute Force Protection ]] ---------------------------------------------------------
+#
+# If you are using the Brute Force Protection rule set, then uncomment the following
+# lines and set the following variables:
+# - Protected URLs: resources to protect (e.g. login pages) - set to your login page
+# - Burst Time Slice Interval: time interval window to monitor for bursts
+# - Request Threshold: request # threshold to trigger a burst
+# - Block Period: temporary block timeout
+#
+#SecAction \
+  "id:'900014', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.brute_force_protected_urls=#/login.jsp# #/partner_login.php#', \
+  setvar:'tx.brute_force_burst_time_slice=60', \
+  setvar:'tx.brute_force_counter_threshold=10', \
+  setvar:'tx.brute_force_block_timeout=300', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ DoS Protection ]] ----------------------------------------------------------------
+#
+# If you are using the DoS Protection rule set, then uncomment the following
+# lines and set the following variables:
+# - Burst Time Slice Interval: time interval window to monitor for bursts
+# - Request Threshold: request # threshold to trigger a burst
+# - Block Period: temporary block timeout
+#
+SecAction \
+  "id:'900015', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.dos_burst_time_slice=60', \
+  setvar:'tx.dos_counter_threshold=100', \
+  setvar:'tx.dos_block_timeout=600', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Check UTF enconding ]] -----------------------------------------------------------
+#
+# We only want to apply this check if UTF-8 encoding is actually used by the site, otherwise
+# it will result in false positives.
+#
+# Uncomment this line if your site uses UTF8 encoding
+#SecAction \
+  "id:'900016', \
+  phase:1, \
+  t:none, \
+  setvar:tx.crs_validate_utf8_encoding=1, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Enable XML Body Parsing ]] -------------------------------------------------------
+#
+# The rules in this file will trigger the XML parser upon an XML request
+#
+# Initiate XML Processor in case of xml content-type
+#
+SecRule REQUEST_HEADERS:Content-Type "text/xml" \
+  "id:'900017', \
+  phase:1, \
+  t:none,t:lowercase, \
+  nolog, \
+  pass, \
+  chain"
+	SecRule REQBODY_PROCESSOR "!@streq XML" \
+	  "ctl:requestBodyProcessor=XML"
+
+
+#
+# -- [[ Global and IP Collections ]] -----------------------------------------------------
+#
+# Create both Global and IP collections for rules to use
+# There are some CRS rules that assume that these two collections
+# have already been initiated.
+#
+SecRule REQUEST_HEADERS:User-Agent "^(.*)$" \
+  "id:'900018', \
+  phase:1, \
+  t:none,t:sha1,t:hexEncode, \
+  setvar:tx.ua_hash=%{matched_var}, \
+  nolog, \
+  pass"
+
+
+SecRule REQUEST_HEADERS:x-forwarded-for "^\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b" \
+  "id:'900019', \
+  phase:1, \
+  t:none, \
+  capture, \
+  setvar:tx.real_ip=%{tx.1}, \
+  nolog, \
+  pass"
+
+
+SecRule &TX:REAL_IP "!@eq 0" \
+  "id:'900020', \
+  phase:1, \
+  t:none, \
+  initcol:global=global, \
+  initcol:ip=%{tx.real_ip}_%{tx.ua_hash}, \
+  nolog, \
+  pass"
+
+
+SecRule &TX:REAL_IP "@eq 0" \
+  "id:'900021', \
+  phase:1, \
+  t:none, \
+  initcol:global=global, \
+  initcol:ip=%{remote_addr}_%{tx.ua_hash}, \
+  setvar:tx.real_ip=%{remote_addr}, \
+  nolog, \
+  pass"
+<% else -%>
 # ------------------------------------------------------------------------
 # OWASP ModSecurity Core Rule Set ver.3.3.2
 # Copyright (c) 2006-2020 Trustwave and contributors. All rights reserved.
@@ -830,3 +1267,5 @@ SecAction \
     pass,\
     t:none,\
     setvar:tx.crs_setup_version=332"
+<% end -%>
+

From 4d0f319d79d4dc8d8eb08269fd3075489d9c947f Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Wed, 21 Dec 2022 20:41:47 +0000
Subject: [PATCH 2063/2267] Release prep v9.0.1

---
 CHANGELOG.md  | 8 ++++++++
 metadata.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bfe48aac6..3492515cbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v9.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.1) (2022-12-21)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.0.0...v9.0.1)
+
+### Fixed
+
+- \(CONT-406\) Fix for RHEL 7 compatibility [\#2362](https://github.com/puppetlabs/puppetlabs-apache/pull/2362) ([david22swan](https://github.com/david22swan))
+
 ## [v9.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.0) (2022-12-15)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.6.0...v9.0.0)
diff --git a/metadata.json b/metadata.json
index ee192ae625..e2fb27de45 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From cd935a594b6cc2495f382851651c14f3b9545a25 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 10 Jan 2023 13:28:33 +0100
Subject: [PATCH 2064/2267] vhost: Make ProxyAddHeaders configureable

It's a valid usecase to set ProxyAddHeaders to Off. That's currently
only possible when other proxy settings are configured as well. It needs
to be independant.
---
 manifests/vhost.pp         |   2 +-
 spec/defines/vhost_spec.rb | 107 +++++++++++++++++++++++++++++++++++++
 templates/vhost/_proxy.erb |   2 +-
 3 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 2eeacb1f68..b31fb5e0cb 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2448,7 +2448,7 @@
   # - $proxy_preserve_host
   # - $proxy_add_headers
   # - $no_proxy_uris
-  if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host) and $ensure == 'present' {
+  if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host or ($proxy_add_headers =~ NotUndef)) and $ensure == 'present' {
     include apache::mod::proxy_http
 
     concat::fragment { "${name}-proxy":
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 6986aa2c87..a92d7084cf 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -902,6 +902,113 @@
             )
           }
         end
+        context 'vhost with proxy_add_headers true' do
+          let :params do
+            {
+              'docroot'                     => '/var/www/foo',
+              'manage_docroot'              => false,
+              'virtual_docroot'             => true,
+              'virtual_use_default_docroot' => false,
+              'port'                        => 8080,
+              'ip'                          => '127.0.0.1',
+              'ip_based'                    => true,
+              'add_listen'                  => false,
+              'serveradmin'                 => 'foo@localhost',
+              'priority'                    => 30,
+              'default_vhost'               => true,
+              'servername'                  => 'example.com',
+              'serveraliases'               => ['test-example.com'],
+              'options'                     => ['MultiView'],
+              'override'                    => ['All'],
+              'directoryindex'              => 'index.html',
+              'vhost_name'                  => 'test',
+              'proxy_add_headers'           => true,
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyAddHeaders On}) }
+        end
+        context 'vhost with proxy_add_headers false' do
+          let :params do
+            {
+              'docroot'                     => '/var/www/foo',
+              'manage_docroot'              => false,
+              'virtual_docroot'             => true,
+              'virtual_use_default_docroot' => false,
+              'port'                        => 8080,
+              'ip'                          => '127.0.0.1',
+              'ip_based'                    => true,
+              'add_listen'                  => false,
+              'serveradmin'                 => 'foo@localhost',
+              'priority'                    => 30,
+              'default_vhost'               => true,
+              'servername'                  => 'example.com',
+              'serveraliases'               => ['test-example.com'],
+              'options'                     => ['MultiView'],
+              'override'                    => ['All'],
+              'directoryindex'              => 'index.html',
+              'vhost_name'                  => 'test',
+              'proxy_add_headers'           => false,
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyAddHeaders Off}) }
+        end
+        context 'vhost without proxy' do
+          let :params do
+            {
+              'docroot'                     => '/var/www/foo',
+              'manage_docroot'              => false,
+              'virtual_docroot'             => true,
+              'virtual_use_default_docroot' => false,
+              'port'                        => 8080,
+              'ip'                          => '127.0.0.1',
+              'ip_based'                    => true,
+              'add_listen'                  => false,
+              'serveradmin'                 => 'foo@localhost',
+              'priority'                    => 30,
+              'default_vhost'               => true,
+              'servername'                  => 'example.com',
+              'serveraliases'               => ['test-example.com'],
+              'options'                     => ['MultiView'],
+              'override'                    => ['All'],
+              'directoryindex'              => 'index.html',
+              'vhost_name'                  => 'test',
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-proxy') }
+        end
+        context 'vhost without proxy_add_headers' do
+          let :params do
+            {
+              'docroot'                     => '/var/www/foo',
+              'manage_docroot'              => false,
+              'virtual_docroot'             => true,
+              'virtual_use_default_docroot' => false,
+              'port'                        => 8080,
+              'ip'                          => '127.0.0.1',
+              'ip_based'                    => true,
+              'add_listen'                  => false,
+              'serveradmin'                 => 'foo@localhost',
+              'priority'                    => 30,
+              'default_vhost'               => true,
+              'servername'                  => 'example.com',
+              'serveraliases'               => ['test-example.com'],
+              'options'                     => ['MultiView'],
+              'override'                    => ['All'],
+              'directoryindex'              => 'index.html',
+              'vhost_name'                  => 'test',
+              'proxy_preserve_host'         => true,
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.not_to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyAddHeaders}) }
+        end
         context 'vhost with scheme and port in servername and use_servername_for_filenames' do
           let :params do
             {
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index feee7d8e1c..266eff2676 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -1,4 +1,4 @@
-<% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match -%>
+<% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match or defined?(@proxy_add_headers) -%>
 
   ## Proxy rules
 <% if @proxy_requests -%>

From 3f6e5ee2fc93e5d890b7fb02ca19c8943d4762c3 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 10 Jan 2023 13:35:49 +0100
Subject: [PATCH 2065/2267] please puppet-lint

---
 manifests/vhost.pp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index b31fb5e0cb..459f1c4493 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2137,14 +2137,16 @@
   if $directories {
     $_directories = $directories
   } elsif $docroot {
-    $_directories = [{
-      provider       => 'directory',
-      path           => $docroot,
-      options        => $options,
-      allow_override => $override,
-      directoryindex => $directoryindex,
-      require        => 'all granted',
-    }]
+    $_directories = [
+      {
+        provider       => 'directory',
+        path           => $docroot,
+        options        => $options,
+        allow_override => $override,
+        directoryindex => $directoryindex,
+        require        => 'all granted',
+      }
+    ]
   } else {
     $_directories = undef
   }

From 6e4e1e6d4bc33fd50b311d4a7c6cd4211fd9db7f Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 23 Nov 2022 13:01:10 +0100
Subject: [PATCH 2066/2267] Simplify templates by reusing bool2httpd

---
 templates/mod/authnz_ldap.conf.erb |  6 +-----
 templates/mod/rpaf.conf.erb        |  6 +-----
 templates/vhost/_proxy.erb         | 18 +++---------------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/templates/mod/authnz_ldap.conf.erb b/templates/mod/authnz_ldap.conf.erb
index ed1334ec27..6f60adec24 100644
--- a/templates/mod/authnz_ldap.conf.erb
+++ b/templates/mod/authnz_ldap.conf.erb
@@ -1,5 +1 @@
-<% if @verify_server_cert == true -%>
-LDAPVerifyServerCert On
-<% else -%>
-LDAPVerifyServerCert Off
-<% end -%>
+LDAPVerifyServerCert <%= scope.call_function('apache::bool2httpd', [@verify_server_cert]) %>
diff --git a/templates/mod/rpaf.conf.erb b/templates/mod/rpaf.conf.erb
index 56e2398b55..a8e6e98b3f 100644
--- a/templates/mod/rpaf.conf.erb
+++ b/templates/mod/rpaf.conf.erb
@@ -3,11 +3,7 @@ RPAFenable On
 # RPAFsethostname will, when enabled, take the incoming X-Host header and
 # update the virtual host settings accordingly. This allows to have the same
 # hostnames as in the "real" configuration for the forwarding proxy.
-<% if @sethostname -%>
-RPAFsethostname On
-<% else -%>
-RPAFsethostname Off
-<% end -%>
+RPAFsethostname <%= scope.call_function('apache::bool2httpd', [@sethostname]) %>
 # Which IPs are forwarding requests to us
 RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %>
 # Setting RPAFheader allows you to change the header name to parse from the
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index feee7d8e1c..d9b3c63b7b 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -1,23 +1,11 @@
 <% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match -%>
 
   ## Proxy rules
-<% if @proxy_requests -%>
-  ProxyRequests On
-<% else -%>
-  ProxyRequests Off
-<%- end -%>
-<%- end -%>
-<% if @proxy_preserve_host -%>
-  ProxyPreserveHost On
-<% else -%>
-  ProxyPreserveHost Off
+  ProxyRequests <%= scope.call_function('apache::bool2httpd', @proxy_requests) %>
 <%- end -%>
+  ProxyPreserveHost <%= scope.call_function('apache::bool2httpd', @proxy_preserve_host) %>
 <%- if defined?(@proxy_add_headers) -%>
-  <%- if @proxy_add_headers -%>
-  ProxyAddHeaders On
-  <%- else -%>
-  ProxyAddHeaders Off
-  <%- end -%>
+  ProxyAddHeaders <%= scope.call_function('apache::bool2httpd', @proxy_add_headers) %>
 <%- end -%>
 <% if @proxy_error_override -%>
   ProxyErrorOverride On

From 489b33ebee162174e54f6d22f66a1e5c258e544a Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Fri, 13 Jan 2023 11:51:57 +0000
Subject: [PATCH 2067/2267] (MAINT) Replace IAC Team with CAT Team

Prior to this commit the old team was being referenced.

This commit brings the documentation in line with the team that now supports it.
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 206b1d2092..3efeb02d8d 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@
 [Hash]: https://docs.puppet.com/puppet/latest/lang_data_hash.html
 [`HttpProtocolOptions`]: http://httpd.apache.org/docs/current/mod/core.html#httpprotocoloptions
 
-[IAC Team]: https://puppetlabs.github.io/iac/
+[CAT Team]: https://puppetlabs.github.io/content-and-tooling-team/
 [`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional
 [`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include
 [interval syntax]: https://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn
@@ -904,6 +904,6 @@ When set, all exclusions will be ignored.
 #### Test Support Lifecycle
 The puppetlabs-apache module supports a large number of compatible platforms and [Apache Modules][Apache modules].
 As a result, Apache Module tests can fail because a package or package dependency has been removed from a Linux distribution repository.
-The [IAC Team][IAC Team] will try to resolve these issues and keep instructions updated, but due to limited resources this won’t always be possible.
+The [CAT Team][CAT Team] will try to resolve these issues and keep instructions updated, but due to limited resources this won’t always be possible.
 In these cases, we will exclude test(s) from certain platforms.
-As always, we welcome help from our community members, and the IAC team is here to assist and answer questions.
+As always, we welcome help from our community members, and the CAT(Content & Tooling) team is here to assist and answer questions.

From 0b705447b935375dc88c55217ebd2fa656b9fa80 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 23 Nov 2022 13:05:25 +0100
Subject: [PATCH 2068/2267] Simplify hash iteration

It's valid to call .sort on a hash and it'll sort by key. This means you
don't need to perform an additional lookup when iterating and makes the
code more readable.
---
 templates/mod/ext_filter.conf.erb |  6 ++----
 templates/vhost/_directories.erb  |  2 +-
 templates/vhost/_proxy.erb        |  4 ++--
 templates/vhost/_wsgi.erb         | 16 ++++++++--------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/templates/mod/ext_filter.conf.erb b/templates/mod/ext_filter.conf.erb
index 67f98fd4c7..620f2bca97 100644
--- a/templates/mod/ext_filter.conf.erb
+++ b/templates/mod/ext_filter.conf.erb
@@ -1,6 +1,4 @@
 # mod_ext_filter definitions
-<%- if @ext_filter_define.length >= 1 -%>
-<%- @ext_filter_define.keys.sort.each do |name| -%>
-ExtFilterDefine <%= name %> <%= @ext_filter_define[name] %>
-<%- end -%>
+<%- @ext_filter_define.sort.each do |name, value| -%>
+ExtFilterDefine <%= name %> <%= value %>
 <%- end -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 0fbf1da85f..3c890423fb 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -464,7 +464,7 @@
       <%- directory_proxy_pass.flatten.compact.each do |proxy| -%>
     <%= proxy_pass -%> <%= proxy['url'] -%>
         <%- if proxy['params'] -%>
-          <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
+          <%- proxy['params'].sort.each do |key, value| -%> <%= key %>=<%= value -%>
           <%- end -%>
         <%- end -%>
         <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb
index 5626872c7a..aeb2bb9323 100644
--- a/templates/vhost/_proxy.erb
+++ b/templates/vhost/_proxy.erb
@@ -19,7 +19,7 @@
   <%- end -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
-    <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
+    <%- proxy['params'].sort.each do |key, value| -%> <%= key %>=<%= value -%>
     <%- end -%>
   <%- end -%>
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
@@ -56,7 +56,7 @@
   <%- end -%>
   ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
-    <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
+    <%- proxy['params'].sort.each do |key, value| -%> <%= key %>=<%= value -%>
     <%- end -%>
   <%- end -%>
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
index fdc8141700..775ae0fe48 100644
--- a/templates/vhost/_wsgi.erb
+++ b/templates/vhost/_wsgi.erb
@@ -25,19 +25,19 @@
   WSGIProcessGroup <%= @wsgi_process_group %>
 <% end -%>
 <% if @wsgi_script_aliases_match and ! @wsgi_script_aliases_match.empty? -%>
-  <%- @wsgi_script_aliases_match.keys.sort.reverse.each do |key| -%>
-    <%- if key != '' and @wsgi_script_aliases_match[key] != ''-%>
-  WSGIScriptAliasMatch <%= key %> "<%= @wsgi_script_aliases_match[key] %>"
+  <%- @wsgi_script_aliases_match.sort.reverse.each do |key, value| -%>
+    <%- if key != '' and value != ''-%>
+  WSGIScriptAliasMatch <%= key %> "<%= value %>"
     <%- end -%>
   <%- end -%>
 <% end -%>
 <% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
-  <%- @wsgi_script_aliases.keys.sort.reverse.each do |key| -%>
-    <%- if key != '' and @wsgi_script_aliases[key] != ''-%>
-      <%- if @wsgi_script_aliases[key].is_a? Array -%>
-  WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key].join(' ') %>
+  <%- @wsgi_script_aliases.sort.reverse.each do |key, value| -%>
+    <%- if key != '' and value != ''-%>
+      <%- if value.is_a? Array -%>
+  WSGIScriptAlias <%= key %> <%= value.join(' ') %>
       <%- else -%>
-  WSGIScriptAlias <%= key %> "<%= @wsgi_script_aliases[key] %>"
+  WSGIScriptAlias <%= key %> "<%= value %>"
       <%- end -%>
     <%- end -%>
   <%- end -%>

From c36e4b802be0e5379610f2c3e44fd6d1c35f860f Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 17 Jan 2023 18:02:53 +0000
Subject: [PATCH 2069/2267] (CONT-494) Pin github_changelog_generator gem
 version

---
 .sync.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.sync.yml b/.sync.yml
index 354e9e1eac..8559b22568 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -10,6 +10,7 @@ Gemfile:
   optional:
     ":development":
     - gem: github_changelog_generator
+      version: '= 1.15.2'
 spec/spec_helper.rb:
   mock_with: ":rspec"
   coverage_report: true

From 10852a8061dc8e849c0bdc49e415f86f9741c0f4 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 17 Jan 2023 18:12:30 +0000
Subject: [PATCH 2070/2267] (CONT-494) PDK Update

---
 Gemfile       | 10 +++++++---
 metadata.json |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 26dd2db9ce..a84b5ee829 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,8 +14,12 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 group :development do
-  gem "json", '~> 2.0',                                require: false
-  gem "voxpupuli-puppet-lint-plugins", '~> 3.0',       require: false
+  gem "json", '= 2.1.0',                               require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                               require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                               require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                               require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                               require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 3.1',       require: false
   gem "facterdb", '~> 1.18',                           require: false
   gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0',     require: false
   gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
@@ -30,7 +34,7 @@ group :development do
   gem "rubocop-performance", '= 1.9.1',                require: false
   gem "rubocop-rspec", '= 2.0.1',                      require: false
   gem "rb-readline", '= 0.5.5',                        require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator",                    require: false
+  gem "github_changelog_generator", '= 1.15.2',        require: false
 end
 group :system_tests do
   gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
diff --git a/metadata.json b/metadata.json
index e2fb27de45..91f9b3c400 100644
--- a/metadata.json
+++ b/metadata.json
@@ -89,5 +89,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "2.5.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "tags/2.6.0-0-gd0490b9"
+  "template-ref": "2.7.1-0-g9a16c87"
 }

From 90f4fb6e2be69241bb4c1675342b7d012dd4fa5c Mon Sep 17 00:00:00 2001
From: Tim 'bastelfreak' Meusel <tim@bastelfreak.de>
Date: Tue, 31 Jan 2023 11:04:38 +0100
Subject: [PATCH 2071/2267] (#2371) security.conf: Test for SecTmpDir

---
 spec/classes/mod/security_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 72c959cb7a..df846a46dd 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -10,6 +10,13 @@
       end
 
       case facts[:os]['family']
+      when 'Suse'
+        context 'on Suse based systems' do
+          it {
+            is_expected.to contain_file('security.conf')
+              .with_content(%r{^\s+SecTmpDir /var/lib/mod_security$})
+          }
+        end
       when 'RedHat'
         context 'on RedHat based systems' do
           it {
@@ -42,6 +49,7 @@
               .with_content(%r{^\s+SecAuditLogType Serial$})
               .with_content(%r{^\s+SecDebugLog /var/log/httpd/modsec_debug.log$})
               .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$})
+              .with_content(%r{^\s+SecTmpDir /var/lib/mod_security$})
           }
           it {
             is_expected.to contain_file('/etc/httpd/modsecurity.d').with(
@@ -211,6 +219,7 @@
               .with_content(%r{^\s+SecAuditLogType Serial$})
               .with_content(%r{^\s+SecDebugLog /var/log/apache2/modsec_debug.log$})
               .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$})
+              .with_content(%r{^\s+SecTmpDir /var/cache/modsecurity$})
           }
           it {
             is_expected.to contain_file('/etc/modsecurity').with(

From 36ae12d9f446d8d84e110f2e113f244e22cfbb7d Mon Sep 17 00:00:00 2001
From: Tim 'bastelfreak' Meusel <tim@bastelfreak.de>
Date: Tue, 31 Jan 2023 11:11:08 +0100
Subject: [PATCH 2072/2267] (#2371) security{,_crs}.conf: switch to structured
 facts

175d6d4e513f632bce60b7a07b9ec199b5ee4fbd broke the template. This commit
switches to proper structured facts.
---
 templates/mod/security.conf.erb     | 4 ++--
 templates/mod/security_crs.conf.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.erb
index 42e6fe27d3..a305e10cb3 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.erb
@@ -54,13 +54,13 @@
     <%- end -%>
     SecArgumentSeparator &
     SecCookieFormat 0
-<%- if scope['os::family'] == 'Debian' -%>
+<%- if scope['facts']['os']['family'] == 'Debian' -%>
     SecDebugLog <%= @logroot %>/modsec_debug.log
     SecAuditLog <%= @logroot %>/modsec_audit.log
     SecTmpDir /var/cache/modsecurity
     SecDataDir /var/cache/modsecurity
     SecUploadDir /var/cache/modsecurity
-<%- elsif scope['os::family'] == 'Suse' -%>
+<%- elsif scope['facts']['os']['family'] == 'Suse' -%>
     SecDebugLog /var/log/apache2/modsec_debug.log
     SecAuditLog /var/log/apache2/modsec_audit.log
     SecTmpDir /var/lib/mod_security
diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index 939e9f3a5c..c05e173849 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -1,4 +1,4 @@
-<% if scope['os::family'] == 'Redhat' and scope['os::release::major'].to_i <= 7 -%>
+<% if scope['facts']['os']['family'] == 'Redhat' and scope['facts']['os']['release']['major'].to_i <= 7 -%>
 # ---------------------------------------------------------------
 # Core ModSecurity Rule Set ver.2.2.9
 # Copyright (C) 2006-2012 Trustwave All rights reserved.

From 9ce75928771187ca7b12f334ebfdea7fb5d8ede6 Mon Sep 17 00:00:00 2001
From: Tim 'bastelfreak' Meusel <tim@bastelfreak.de>
Date: Tue, 31 Jan 2023 11:44:04 +0100
Subject: [PATCH 2073/2267] (#2374) Suse: Switch modsec_default_rules to array

This fixes #2374. The issue was discovered in #2373 while fixing #2371.
---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 1d2068ad68..fbdeb0401e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -651,7 +651,7 @@
     $modsec_version       = 1
     $modsec_crs_package   = undef
     $modsec_crs_path      = undef
-    $modsec_default_rules = undef
+    $modsec_default_rules = []
     $modsec_dir           = '/etc/apache2/modsecurity'
     $secpcrematchlimit = 1500
     $secpcrematchlimitrecursion = 1500

From 82a621043e224c0651846e1769d0e60a08e69ff7 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 31 Jan 2023 14:00:29 +0000
Subject: [PATCH 2074/2267] (MAINT) - update pdk release image

---
 .github/workflows/auto_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index f4aed440e5..f0d7aa4414 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -34,7 +34,7 @@ jobs:
         persist-credentials: false
 
     - name: "PDK Release prep"
-      uses: docker://puppet/iac_release:ci
+      uses: docker://puppet/pdk:2.6.1.0
       with:
         args: 'release prep --force'
       env:

From 77d9b5ff2909b2c72cb509a898e637f62bc1e2c7 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:26:00 +0000
Subject: [PATCH 2075/2267] Release prep v9.1.0

---
 CHANGELOG.md  | 41 ++++++++++++++++++++++++++++-------------
 metadata.json |  2 +-
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3492515cbe..22fbfdab89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,23 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v9.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.1) (2022-12-21)
+## [v9.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.0) (2023-01-31)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.0.1...v9.1.0)
+
+### Added
+
+- vhost: Make ProxyAddHeaders configureable [\#2365](https://github.com/puppetlabs/puppetlabs-apache/pull/2365) ([bastelfreak](https://github.com/bastelfreak))
+
+### Fixed
+
+- \(\#2374\) Suse: Switch modsec\_default\_rules to array  [\#2375](https://github.com/puppetlabs/puppetlabs-apache/pull/2375) ([bastelfreak](https://github.com/bastelfreak))
+-  security{,\_crs}.conf: switch to structured facts [\#2373](https://github.com/puppetlabs/puppetlabs-apache/pull/2373) ([bastelfreak](https://github.com/bastelfreak))
+- Simplify templates by reusing bool2httpd [\#2366](https://github.com/puppetlabs/puppetlabs-apache/pull/2366) ([ekohl](https://github.com/ekohl))
+- disable::mpm\_event: Fix module deactivation [\#2349](https://github.com/puppetlabs/puppetlabs-apache/pull/2349) ([bastelfreak](https://github.com/bastelfreak))
+- Simplify templates by reusing methods [\#2344](https://github.com/puppetlabs/puppetlabs-apache/pull/2344) ([ekohl](https://github.com/ekohl))
+
+## [v9.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.1) (2022-12-22)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.0.0...v9.0.1)
 
@@ -42,7 +58,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- disable::mpm\_event: Fix module deactivation [\#2349](https://github.com/puppetlabs/puppetlabs-apache/pull/2349) ([bastelfreak](https://github.com/bastelfreak))
 - remove \_module from apache::mod::unique\_id name. [\#2339](https://github.com/puppetlabs/puppetlabs-apache/pull/2339) ([mdklapwijk](https://github.com/mdklapwijk))
 
 ## [v8.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.4.0) (2022-11-15)
@@ -72,7 +87,6 @@ All notable changes to this project will be documented in this file. The format
 ### Fixed
 
 - Make serveradmin an optional parameter and use it [\#2338](https://github.com/puppetlabs/puppetlabs-apache/pull/2338) ([ekohl](https://github.com/ekohl))
-- pdksync - \(CONT-189\) Remove support for RedHat6 / OracleLinux6 / Scientific6 [\#2326](https://github.com/puppetlabs/puppetlabs-apache/pull/2326) ([david22swan](https://github.com/david22swan))
 - pdksync - \(CONT-130\) Dropping Support for Debian 9 [\#2322](https://github.com/puppetlabs/puppetlabs-apache/pull/2322) ([jordanbreen28](https://github.com/jordanbreen28))
 - fix directory empty options if an empty array is being used [\#2312](https://github.com/puppetlabs/puppetlabs-apache/pull/2312) ([bovy89](https://github.com/bovy89))
 
@@ -82,6 +96,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
+- pdksync - \(CONT-189\) Remove support for RedHat6 / OracleLinux6 / Scientific6 [\#2326](https://github.com/puppetlabs/puppetlabs-apache/pull/2326) ([david22swan](https://github.com/david22swan))
 - \(maint\) Codebase Hardening [\#2313](https://github.com/puppetlabs/puppetlabs-apache/pull/2313) ([david22swan](https://github.com/david22swan))
 
 ## [v8.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.0) (2022-09-13)
@@ -158,7 +173,7 @@ All notable changes to this project will be documented in this file. The format
 - Allow vhosts to have a string priority again [\#2275](https://github.com/puppetlabs/puppetlabs-apache/pull/2275) ([ekohl](https://github.com/ekohl))
 - Remove duplicate SecDefaultAction in CRS template [\#2271](https://github.com/puppetlabs/puppetlabs-apache/pull/2271) ([Vincevrp](https://github.com/Vincevrp))
 - Better data types on apache::vhost parameters [\#2252](https://github.com/puppetlabs/puppetlabs-apache/pull/2252) ([ekohl](https://github.com/ekohl))
-- Update $timeout to `Variant[Integer,String]` [\#2242](https://github.com/puppetlabs/puppetlabs-apache/pull/2242) ([david22swan](https://github.com/david22swan))
+- Update $timeout to `Variant\[Integer,String\]` [\#2242](https://github.com/puppetlabs/puppetlabs-apache/pull/2242) ([david22swan](https://github.com/david22swan))
 - Let limitreqfieldsize and limitreqfields be integers [\#2240](https://github.com/puppetlabs/puppetlabs-apache/pull/2240) ([traylenator](https://github.com/traylenator))
 - Drop support for Fedora \< 18 [\#2238](https://github.com/puppetlabs/puppetlabs-apache/pull/2238) ([ekohl](https://github.com/ekohl))
 - Restructure MPM disabling [\#2227](https://github.com/puppetlabs/puppetlabs-apache/pull/2227) ([ekohl](https://github.com/ekohl))
@@ -178,13 +193,13 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 - pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#2196](https://github.com/puppetlabs/puppetlabs-apache/pull/2196) ([david22swan](https://github.com/david22swan))
-- Allow `docroot` with `mod_vhost_alias` `virtual_docroot` [\#2195](https://github.com/puppetlabs/puppetlabs-apache/pull/2195) ([yakatz](https://github.com/yakatz))
+- Allow `docroot` with `mod\_vhost\_alias` `virtual\_docroot` [\#2195](https://github.com/puppetlabs/puppetlabs-apache/pull/2195) ([yakatz](https://github.com/yakatz))
 
 ### Fixed
 
 - Restore Ubuntu 14.04 support in suphp [\#2193](https://github.com/puppetlabs/puppetlabs-apache/pull/2193) ([ekohl](https://github.com/ekohl))
 - add double quote on scope parameter [\#2191](https://github.com/puppetlabs/puppetlabs-apache/pull/2191) ([aba-rechsteiner](https://github.com/aba-rechsteiner))
-- Debian 11: fix typo in `versioncmp()` / set default php to 7.4 [\#2186](https://github.com/puppetlabs/puppetlabs-apache/pull/2186) ([bastelfreak](https://github.com/bastelfreak))
+- Debian 11: fix typo in `versioncmp\(\)` / set default php to 7.4 [\#2186](https://github.com/puppetlabs/puppetlabs-apache/pull/2186) ([bastelfreak](https://github.com/bastelfreak))
 
 ## [v6.5.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.1) (2021-08-25)
 
@@ -225,10 +240,6 @@ All notable changes to this project will be documented in this file. The format
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/kps_ssl_reload_and_cache_disk_combined_tag...v6.3.0)
 
-### Added
-
-- The default disk\_cache.conf.erb caches everything.  [\#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
-
 ### Fixed
 
 - Update the default version of Apache for Amazon Linux 2 [\#2158](https://github.com/puppetlabs/puppetlabs-apache/pull/2158) ([turnopil](https://github.com/turnopil))
@@ -238,6 +249,10 @@ All notable changes to this project will be documented in this file. The format
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.2.0...kps_ssl_reload_and_cache_disk_combined_tag)
 
+### Added
+
+- The default disk\_cache.conf.erb caches everything.  [\#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
+
 ## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) (2021-05-24)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.1.0...v6.2.0)
@@ -304,7 +319,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Added
 
-- \(MODULES-10887\) Set `use_servername_for_filenames` for defaults [\#2103](https://github.com/puppetlabs/puppetlabs-apache/pull/2103) ([towo](https://github.com/towo))
+- \(MODULES-10887\) Set `use\_servername\_for\_filenames` for defaults [\#2103](https://github.com/puppetlabs/puppetlabs-apache/pull/2103) ([towo](https://github.com/towo))
 - pdksync - \(feat\) Add support for Puppet 7 [\#2101](https://github.com/puppetlabs/puppetlabs-apache/pull/2101) ([daianamezdrea](https://github.com/daianamezdrea))
 - \(feat\) Add support for apreq2 MOD on Debian 9, 10 [\#2085](https://github.com/puppetlabs/puppetlabs-apache/pull/2085) ([TigerKriika](https://github.com/TigerKriika))
 
@@ -355,8 +370,8 @@ All notable changes to this project will be documented in this file. The format
 
 - Allow IPv6 CIDRs for proxy\_protocol\_exceptions in mod remoteip [\#2033](https://github.com/puppetlabs/puppetlabs-apache/pull/2033) ([thechristschn](https://github.com/thechristschn))
 - \(IAC-746\) - Add ubuntu 20.04 support [\#2032](https://github.com/puppetlabs/puppetlabs-apache/pull/2032) ([david22swan](https://github.com/david22swan))
-- Replace legacy `bool2httpd()` function with shim [\#2025](https://github.com/puppetlabs/puppetlabs-apache/pull/2025) ([alexjfisher](https://github.com/alexjfisher))
-- Tidy up `pw_hash` function [\#2024](https://github.com/puppetlabs/puppetlabs-apache/pull/2024) ([alexjfisher](https://github.com/alexjfisher))
+- Replace legacy `bool2httpd\(\)` function with shim [\#2025](https://github.com/puppetlabs/puppetlabs-apache/pull/2025) ([alexjfisher](https://github.com/alexjfisher))
+- Tidy up `pw\_hash` function [\#2024](https://github.com/puppetlabs/puppetlabs-apache/pull/2024) ([alexjfisher](https://github.com/alexjfisher))
 - Replace validate\_apache\_loglevel\(\) with data type [\#2023](https://github.com/puppetlabs/puppetlabs-apache/pull/2023) ([alexjfisher](https://github.com/alexjfisher))
 - Add ProxyIOBufferSize option [\#2014](https://github.com/puppetlabs/puppetlabs-apache/pull/2014) ([jplindquist](https://github.com/jplindquist))
 - Add support for SetInputFilter directive [\#2007](https://github.com/puppetlabs/puppetlabs-apache/pull/2007) ([HoucemEddine](https://github.com/HoucemEddine))
diff --git a/metadata.json b/metadata.json
index 91f9b3c400..0c040f333c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 86d7b6db4fb58eac3d0d930cee930fee5a487cc1 Mon Sep 17 00:00:00 2001
From: Paula Muir <paula@puppet.com>
Date: Wed, 1 Feb 2023 11:52:46 +0000
Subject: [PATCH 2076/2267] Adding mend file

---
 .github/workflows/mend.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/workflows/mend.yml

diff --git a/.github/workflows/mend.yml b/.github/workflows/mend.yml
new file mode 100644
index 0000000000..b4100a5af0
--- /dev/null
+++ b/.github/workflows/mend.yml
@@ -0,0 +1,15 @@
+name: "mend"
+
+on:
+  pull_request:
+    branches:
+      - "main"
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+
+  mend:
+    uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@main"
+    secrets: "inherit"

From 5bc78790153c72aff81e4ab0439c8d0c573505b5 Mon Sep 17 00:00:00 2001
From: qstorm <gihub@nesk.org>
Date: Thu, 2 Feb 2023 14:07:02 +0100
Subject: [PATCH 2077/2267] Adding mod_version module to be activated by
 default

---
 manifests/mod/version.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 manifests/mod/version.pp

diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
new file mode 100644
index 0000000000..5ea6bd5508
--- /dev/null
+++ b/manifests/mod/version.pp
@@ -0,0 +1,12 @@
+# @summary
+#   Installs `mod_version`.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_version.html for additional documentation.
+#
+class apache::mod::version {
+  if $facts['os']['family'] == 'debian' {
+    warning("${module_name}: module version_module is built-in and can't be loaded")
+  } else {
+    ::apache::mod { 'version': }
+  }
+}

From 4760f7e169e8fc0f2c3f3346a86fb9ae950df147 Mon Sep 17 00:00:00 2001
From: qstorm <gihub@nesk.org>
Date: Fri, 3 Feb 2023 07:57:20 +0100
Subject: [PATCH 2078/2267] Adding mod_version to default modules

---
 manifests/default_mods.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index a6dfd368cf..efa1596ec6 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -53,6 +53,7 @@
         include apache::mod::rewrite
         include apache::mod::speling
         include apache::mod::suexec
+        include apache::mod::version
         include apache::mod::vhost_alias
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
@@ -70,15 +71,16 @@
         include apache::mod::authn_core
         include apache::mod::cache
         include apache::mod::disk_cache
+        include apache::mod::filter
         include apache::mod::headers
         include apache::mod::info
         include apache::mod::mime_magic
         include apache::mod::reqtimeout
         include apache::mod::rewrite
+        include apache::mod::speling
         include apache::mod::userdir
+        include apache::mod::version
         include apache::mod::vhost_alias
-        include apache::mod::speling
-        include apache::mod::filter
 
         ::apache::mod { 'asis': }
         ::apache::mod { 'auth_digest': }

From d8c7c324090686573be895e282f12cee3ab56fa5 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 2 Feb 2023 14:40:44 +0000
Subject: [PATCH 2079/2267] (BugFix) Update OS Family comparison to correctly
 match

---
 templates/mod/security_crs.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/security_crs.conf.erb b/templates/mod/security_crs.conf.erb
index c05e173849..fb8dbff146 100644
--- a/templates/mod/security_crs.conf.erb
+++ b/templates/mod/security_crs.conf.erb
@@ -1,4 +1,4 @@
-<% if scope['facts']['os']['family'] == 'Redhat' and scope['facts']['os']['release']['major'].to_i <= 7 -%>
+<% if scope['facts']['os']['family'] == 'RedHat' and scope['facts']['os']['release']['major'].to_i <= 7 -%>
 # ---------------------------------------------------------------
 # Core ModSecurity Rule Set ver.2.2.9
 # Copyright (C) 2006-2012 Trustwave All rights reserved.

From 314268fa3f37a95a54fc9273f3a707b1eda93ae1 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 2 Feb 2023 16:07:01 +0000
Subject: [PATCH 2080/2267] (maint) Correct unit test

---
 spec/classes/mod/security_spec.rb | 54 ++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index df846a46dd..143208c42e 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -159,24 +159,42 @@
               }
             end
 
-            it {
-              is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
-                %r{^SecAction \\\n\s+\"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
-              is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
-                %r{^SecAction \\\n\s+\"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=2"$}
-              is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
-                %r{
-                  ^SecAction\ \\\n
-                  \s+\"id:900700,\\\n
-                  \s+phase:1,\\\n
-                  \s+nolog,\\\n
-                  \s+pass,\\\n
-                  \s+t:none,\\\n
-                  \s+setvar:'tx.dos_burst_time_slice=30',\\\n
-                  \s+setvar:'tx.dos_counter_threshold=120',\\\n
-                  \s+setvar:'tx.dos_block_timeout=300'"$
-              }x
-            }
+            if facts[:os]['release']['major'].to_i < 8 && facts[:os]['family'] == 'RedHat'
+              it {
+                is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                  %r{
+                    ^SecAction\ \\\n
+                    \ \ "id:'900001',\ \\\n
+                    \ \ phase:1,\ \\\n
+                    \ \ t:none,\ \\\n
+                    \ \ setvar:tx.critical_anomaly_score=5,\ \\\n
+                    \ \ setvar:tx.error_anomaly_score=4,\ \\\n
+                    \ \ setvar:tx.warning_anomaly_score=3,\ \\\n
+                    \ \ setvar:tx.notice_anomaly_score=2,\ \\\n
+                    \ \ nolog,\ \\\n
+                    \ \ pass"$
+                }x
+              }
+            else
+              it {
+                is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                  %r{^SecAction \\\n\s+\"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
+                is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                  %r{^SecAction \\\n\s+\"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=2"$}
+                is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                  %r{
+                    ^SecAction\ \\\n
+                    \s+\"id:900700,\\\n
+                    \s+phase:1,\\\n
+                    \s+nolog,\\\n
+                    \s+pass,\\\n
+                    \s+t:none,\\\n
+                    \s+setvar:'tx.dos_burst_time_slice=30',\\\n
+                    \s+setvar:'tx.dos_counter_threshold=120',\\\n
+                    \s+setvar:'tx.dos_block_timeout=300'"$
+                }x
+              }
+            end
           end
 
           describe 'with invalid CRS parameters' do

From 3c97527758fc170d7294070ab11ceed0a7f61fa2 Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Fri, 3 Feb 2023 15:03:41 +0000
Subject: [PATCH 2081/2267] Release prep v9.1.1

---
 CHANGELOG.md  | 15 ++++++++++++---
 REFERENCE.md  |  9 +++++++++
 metadata.json |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22fbfdab89..b9075e3b42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v9.1.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.1) (2023-02-03)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.0...v9.1.1)
+
+### Fixed
+
+- \(BugFix\) Update OS Family comparison to correctly match [\#2381](https://github.com/puppetlabs/puppetlabs-apache/pull/2381) ([david22swan](https://github.com/david22swan))
+- Adding mod\_version module to be activated by default [\#2380](https://github.com/puppetlabs/puppetlabs-apache/pull/2380) ([Q-Storm](https://github.com/Q-Storm))
+
 ## [v9.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.0) (2023-01-31)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.0.1...v9.1.0)
@@ -15,7 +24,6 @@ All notable changes to this project will be documented in this file. The format
 - \(\#2374\) Suse: Switch modsec\_default\_rules to array  [\#2375](https://github.com/puppetlabs/puppetlabs-apache/pull/2375) ([bastelfreak](https://github.com/bastelfreak))
 -  security{,\_crs}.conf: switch to structured facts [\#2373](https://github.com/puppetlabs/puppetlabs-apache/pull/2373) ([bastelfreak](https://github.com/bastelfreak))
 - Simplify templates by reusing bool2httpd [\#2366](https://github.com/puppetlabs/puppetlabs-apache/pull/2366) ([ekohl](https://github.com/ekohl))
-- disable::mpm\_event: Fix module deactivation [\#2349](https://github.com/puppetlabs/puppetlabs-apache/pull/2349) ([bastelfreak](https://github.com/bastelfreak))
 - Simplify templates by reusing methods [\#2344](https://github.com/puppetlabs/puppetlabs-apache/pull/2344) ([ekohl](https://github.com/ekohl))
 
 ## [v9.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.1) (2022-12-22)
@@ -58,6 +66,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
+- disable::mpm\_event: Fix module deactivation [\#2349](https://github.com/puppetlabs/puppetlabs-apache/pull/2349) ([bastelfreak](https://github.com/bastelfreak))
 - remove \_module from apache::mod::unique\_id name. [\#2339](https://github.com/puppetlabs/puppetlabs-apache/pull/2339) ([mdklapwijk](https://github.com/mdklapwijk))
 
 ## [v8.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.4.0) (2022-11-15)
@@ -87,6 +96,7 @@ All notable changes to this project will be documented in this file. The format
 ### Fixed
 
 - Make serveradmin an optional parameter and use it [\#2338](https://github.com/puppetlabs/puppetlabs-apache/pull/2338) ([ekohl](https://github.com/ekohl))
+- pdksync - \(CONT-189\) Remove support for RedHat6 / OracleLinux6 / Scientific6 [\#2326](https://github.com/puppetlabs/puppetlabs-apache/pull/2326) ([david22swan](https://github.com/david22swan))
 - pdksync - \(CONT-130\) Dropping Support for Debian 9 [\#2322](https://github.com/puppetlabs/puppetlabs-apache/pull/2322) ([jordanbreen28](https://github.com/jordanbreen28))
 - fix directory empty options if an empty array is being used [\#2312](https://github.com/puppetlabs/puppetlabs-apache/pull/2312) ([bovy89](https://github.com/bovy89))
 
@@ -96,7 +106,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- pdksync - \(CONT-189\) Remove support for RedHat6 / OracleLinux6 / Scientific6 [\#2326](https://github.com/puppetlabs/puppetlabs-apache/pull/2326) ([david22swan](https://github.com/david22swan))
 - \(maint\) Codebase Hardening [\#2313](https://github.com/puppetlabs/puppetlabs-apache/pull/2313) ([david22swan](https://github.com/david22swan))
 
 ## [v8.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.0) (2022-09-13)
@@ -179,7 +188,6 @@ All notable changes to this project will be documented in this file. The format
 - Restructure MPM disabling [\#2227](https://github.com/puppetlabs/puppetlabs-apache/pull/2227) ([ekohl](https://github.com/ekohl))
 - pdksync - \(GH-iac-334\) Remove Support for Ubuntu 16.04 [\#2220](https://github.com/puppetlabs/puppetlabs-apache/pull/2220) ([david22swan](https://github.com/david22swan))
 - Drop Apache 2.2 support with Gentoo [\#2216](https://github.com/puppetlabs/puppetlabs-apache/pull/2216) ([ekohl](https://github.com/ekohl))
-- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#2213](https://github.com/puppetlabs/puppetlabs-apache/pull/2213) ([david22swan](https://github.com/david22swan))
 
 ## [v7.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v7.0.0) (2021-10-11)
 
@@ -197,6 +205,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
+- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#2213](https://github.com/puppetlabs/puppetlabs-apache/pull/2213) ([david22swan](https://github.com/david22swan))
 - Restore Ubuntu 14.04 support in suphp [\#2193](https://github.com/puppetlabs/puppetlabs-apache/pull/2193) ([ekohl](https://github.com/ekohl))
 - add double quote on scope parameter [\#2191](https://github.com/puppetlabs/puppetlabs-apache/pull/2191) ([aba-rechsteiner](https://github.com/aba-rechsteiner))
 - Debian 11: fix typo in `versioncmp\(\)` / set default php to 7.4 [\#2186](https://github.com/puppetlabs/puppetlabs-apache/pull/2186) ([bastelfreak](https://github.com/bastelfreak))
diff --git a/REFERENCE.md b/REFERENCE.md
index 019020f285..2d59bd1165 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -100,6 +100,7 @@ pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet
 * [`apache::mod::status`](#apache--mod--status): Installs and configures `mod_status`.
 * [`apache::mod::suexec`](#apache--mod--suexec): Installs `mod_suexec`.
 * [`apache::mod::userdir`](#apache--mod--userdir): Installs and configures `mod_userdir`.
+* [`apache::mod::version`](#apache--mod--version): Installs `mod_version`.
 * [`apache::mod::vhost_alias`](#apache--mod--vhost_alias): Installs Apache `mod_vhost_alias`.
 * [`apache::mod::watchdog`](#apache--mod--watchdog): Installs and configures `mod_watchdog`.
 * [`apache::mod::worker`](#apache--mod--worker): Installs and manages the MPM `worker`.
@@ -6813,6 +6814,14 @@ Custom configuration to be added to userdir.conf
 
 Default value: `undef`
 
+### <a name="apache--mod--version"></a>`apache::mod::version`
+
+Installs `mod_version`.
+
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/mod_version.html
+    * for additional documentation.
+
 ### <a name="apache--mod--vhost_alias"></a>`apache::mod::vhost_alias`
 
 Installs Apache `mod_vhost_alias`.
diff --git a/metadata.json b/metadata.json
index 0c040f333c..b355cfd243 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "9.1.0",
+  "version": "9.1.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 631f7fb46274006919381e95e31e3799895677c4 Mon Sep 17 00:00:00 2001
From: Greg Cox <gcox@mozilla.com>
Date: Sat, 14 Jan 2023 20:11:27 +0000
Subject: [PATCH 2082/2267] Suppress bad Directory comment when DocumentRoot is
 not set.

It's valid for a DocumentRoot to be missing (docroot => false).
However, in the directories section, this leads to a confusing message:
"## Directories, there should at least be a declaration for false"
---
 templates/vhost/_directories.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 3c890423fb..b63b7ff49f 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -1,6 +1,10 @@
 
   <%- scope.setvar('_template_scope', {}) -%>
+  <%- if @docroot -%>
   ## Directories, there should at least be a declaration for <%= @docroot %>
+  <%- else -%>
+  ## Directories
+  <%- end -%>
   <%- @_directories.each do |directory| -%>
     <%- if directory['path'] and directory['path'] != '' -%>
       <%- if directory['provider'] and directory['provider'].match('(directory|location|files|proxy)') -%>

From 113ecc03dfc986f3764a2836fe50227c5fc84253 Mon Sep 17 00:00:00 2001
From: Greg Cox <gcox@mozilla.com>
Date: Wed, 8 Feb 2023 00:15:09 +0000
Subject: [PATCH 2083/2267] Fix example code for apache::vhost::php_values

The `php_values` parameter requires a Hash, but gives examples from the ~v7 era when other values were allowed.
---
 REFERENCE.md       | 2 +-
 manifests/vhost.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 2d59bd1165..59cd06c4af 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -9407,7 +9407,7 @@ Allows per-virtual host setting [`php_value`s](http://php.net/manual/en/configur
 These flags or values can be overwritten by a user or an application.
 Within a vhost declaration:
 ``` puppet
-  php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
+  php_values    => { 'include_path' => '.:/usr/local/example-app/include' },
 ```
 
 Default value: `{}`
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 459f1c4493..ae99f4545e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -818,7 +818,7 @@
 #   These flags or values can be overwritten by a user or an application.
 #   Within a vhost declaration:
 #   ``` puppet
-#     php_values    => [ 'include_path ".:/usr/local/example-app/include"' ],
+#     php_values    => { 'include_path' => '.:/usr/local/example-app/include' },
 #   ```
 #
 # @param php_flags

From 4a884c7ce5c47de0ebd681245b812a6cfd3405aa Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Wed, 12 Oct 2022 09:12:43 +0200
Subject: [PATCH 2084/2267] fix rewrite rules being ignored

In 7b22dae the default value for $rewrites was changed
from undef to [] in manifests/vhost.pp. This results
in templates_vhost/_rewrite.erb always evaluating to
false (boolean check on an empty array variable is
still true) unless $rewrites is explicitly set to undef.
This results in the content of $rewrite_rule being ignored.

closes: #2318
---
 templates/vhost/_rewrite.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index f4ac5a3174..10fd989972 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -1,4 +1,4 @@
-<%- if @rewrites -%>
+<%- if @rewrite_inherit or not @rewrites.empty? -%>
   ## Rewrite rules
   RewriteEngine On
   <%- if @rewrite_inherit -%>
@@ -38,7 +38,7 @@
   <%- end -%>
 <%- end -%>
 <%# reverse compatibility -%>
-<% if @rewrite_rule and !@rewrites -%>
+<% if @rewrite_rule and @rewrites.empty? -%>
   ## Rewrite rules
   RewriteEngine On
   <%- if @rewrite_base -%>

From c25a58ab3df83d694a2e4ae4ab61d96388269512 Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Mon, 7 Nov 2022 15:28:03 +0100
Subject: [PATCH 2085/2267] add rspec tests

---
 spec/defines/vhost_spec.rb | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index a92d7084cf..cb9aa01fb0 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -379,7 +379,7 @@
               'request_headers'             => ['append MirrorID "mirror 12"'],
               'rewrites'                    => [
                 {
-                  'rewrite_rule' => ['^index\.html$ welcome.html'],
+                  'rewrite_rule' => ['^index\.html$ rewrites.html'],
                 },
               ],
               'filters' => [
@@ -733,8 +733,11 @@
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
-              content: %r{^\s+RewriteOptions Inherit$},
+            is_expected.to contain_concat__fragment('rspec.example.com-rewrite')
+              .with_content(%r{^\s+RewriteEngine On$})
+              .with_content(%r{^\s+RewriteOptions Inherit$})
+              .with_content(%r{^\s+RewriteBase /})
+              .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
             )
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
@@ -1812,9 +1815,25 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
-                content: %r{^\s+RewriteOptions Inherit$},
+              is_expected.to contain_concat__fragment('rspec.example.com-rewrite')
+                .with_content(%r{^\s+RewriteOptions Inherit$})
+                .with_content(%r{^\s+RewriteEngine On$})
+                .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
+            }
+          end
+          context 'empty rewrites_without_rewrite_inherit' do
+            let(:params) do
+              super().merge(
+                'rewrite_inherit' => false,
+                'rewrites' => [],
               )
+            end
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-rewrite')
+                .with_content(%r{^\s+RewriteEngine On$})
+                .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
+                .without( content: %r{^\s+RewriteOptions Inherit$})
             }
           end
 

From faeac60ab7e6e775ef7d9bb57c945ffba5ac4c81 Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Wed, 8 Feb 2023 11:52:40 +0100
Subject: [PATCH 2086/2267] use ! instead of not

---
 templates/vhost/_rewrite.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index 10fd989972..4e2bd10485 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -1,4 +1,4 @@
-<%- if @rewrite_inherit or not @rewrites.empty? -%>
+<%- if @rewrite_inherit or !@rewrites.empty? -%>
   ## Rewrite rules
   RewriteEngine On
   <%- if @rewrite_inherit -%>

From 6c0267ee89fe9af08c5b8ad0c75722b6cea1cd9a Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Wed, 8 Feb 2023 12:21:38 +0100
Subject: [PATCH 2087/2267] fix superflous ')'

---
 spec/defines/vhost_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index cb9aa01fb0..f445040456 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -738,7 +738,6 @@
               .with_content(%r{^\s+RewriteOptions Inherit$})
               .with_content(%r{^\s+RewriteBase /})
               .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
-            )
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }

From 33027f856975dfa06d6b8b99602f96f0d59edae9 Mon Sep 17 00:00:00 2001
From: Paul Barton <pbarton@gmail.com>
Date: Wed, 8 Feb 2023 06:36:47 -0600
Subject: [PATCH 2088/2267] Fixes mod::proxy allow_from parameter inconsistency
 #2352

apache::mod::proxy allowed Stdlib::IP::Address as a class parameter, but
proxy.conf.erb assumed it was an array.
---
 REFERENCE.md                 | 4 ++--
 manifests/mod/proxy.pp       | 4 ++--
 templates/mod/proxy.conf.erb | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 2d59bd1165..2c384f811b 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5611,9 +5611,9 @@ Default value: `'Off'`
 
 ##### <a name="-apache--mod--proxy--allow_from"></a>`allow_from`
 
-Data type: `Optional[Stdlib::IP::Address]`
+Data type: `Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]]`
 
-List of IPs allowed to access proxy.
+IP address or list of IPs allowed to access proxy.
 
 Default value: `undef`
 
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index 3bd356f85f..f8dc5c5143 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -5,7 +5,7 @@
 #   Enables forward (standard) proxy requests.
 #
 # @param allow_from
-#   List of IPs allowed to access proxy.
+#   IP address or list of IPs allowed to access proxy.
 #
 # @param package_name
 #   Name of the proxy package to install.
@@ -23,7 +23,7 @@
 #
 class apache::mod::proxy (
   String $proxy_requests                    = 'Off',
-  Optional[Stdlib::IP::Address] $allow_from = undef,
+  Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]] $allow_from = undef,
   Optional[String] $package_name            = undef,
   String $proxy_via                         = 'On',
   Optional[Integer[0]] $proxy_timeout       = undef,
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
index eb6c02ea38..f1b62f41dc 100644
--- a/templates/mod/proxy.conf.erb
+++ b/templates/mod/proxy.conf.erb
@@ -10,7 +10,11 @@
 
   <% if @proxy_requests != 'Off' or ( @allow_from and ! @allow_from.empty? ) -%>
   <Proxy *>
+    <%- if @allow_from.is_a? Array -%>
     Require ip <%= @allow_from.join(" ") %>
+    <%- else -%>
+    Require ip <%= @allow_from %>
+    <%- end -%>
   </Proxy>
   <% end -%>
 

From 21c9091dad544a1101a995c90e04a35e20ea5bae Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Wed, 8 Feb 2023 13:57:07 +0100
Subject: [PATCH 2089/2267] fix 'Space inside parentheses'

---
 spec/defines/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f445040456..23e52104c1 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1832,7 +1832,7 @@
               is_expected.to contain_concat__fragment('rspec.example.com-rewrite')
                 .with_content(%r{^\s+RewriteEngine On$})
                 .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
-                .without( content: %r{^\s+RewriteOptions Inherit$})
+                .without(content: %r{^\s+RewriteOptions Inherit$})
             }
           end
 

From a0580b59552c20e24247a5064a22fe55a36140ba Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Wed, 8 Feb 2023 14:35:19 +0100
Subject: [PATCH 2090/2267] fix spec test add missing negation of test

---
 spec/defines/vhost_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 23e52104c1..df95706ecf 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1814,7 +1814,7 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-rewrite')
+              is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
                 .with_content(%r{^\s+RewriteOptions Inherit$})
                 .with_content(%r{^\s+RewriteEngine On$})
                 .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
@@ -1829,7 +1829,7 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-rewrite')
+              is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
                 .with_content(%r{^\s+RewriteEngine On$})
                 .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
                 .without(content: %r{^\s+RewriteOptions Inherit$})

From 2aa768962418877885d2343b56a095b0811b1832 Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Wed, 8 Feb 2023 15:38:08 +0100
Subject: [PATCH 2091/2267] escape special chars in regex spec tests

---
 spec/defines/vhost_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index df95706ecf..b99f7b61b3 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -379,7 +379,7 @@
               'request_headers'             => ['append MirrorID "mirror 12"'],
               'rewrites'                    => [
                 {
-                  'rewrite_rule' => ['^index\.html$ rewrites.html'],
+                  'rewrite_rule' => ['^index.html$ rewrites.html'],
                 },
               ],
               'filters' => [
@@ -392,7 +392,7 @@
                 'FilterProtocol COMPRESS  DEFLATE change=yes;byteranges=no',
               ],
               'rewrite_base'                => '/',
-              'rewrite_rule'                => '^index\.html$ welcome.html',
+              'rewrite_rule'                => '^index.html$ welcome.html',
               'rewrite_cond'                => ['%{HTTP_USER_AGENT} ^MSIE'],
               'rewrite_inherit'             => true,
               'setenv'                      => ['FOO=/bin/true'],
@@ -737,7 +737,7 @@
               .with_content(%r{^\s+RewriteEngine On$})
               .with_content(%r{^\s+RewriteOptions Inherit$})
               .with_content(%r{^\s+RewriteBase /})
-              .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
+              .with_content(%r{^\s+RewriteRule \^index\.html\$ rewrites.html$})
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
@@ -1817,7 +1817,7 @@
               is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
                 .with_content(%r{^\s+RewriteOptions Inherit$})
                 .with_content(%r{^\s+RewriteEngine On$})
-                .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
+                .with_content(%r{^\s+RewriteRule \^index\.html\$ welcome.html$})
             }
           end
           context 'empty rewrites_without_rewrite_inherit' do
@@ -1831,7 +1831,7 @@
             it {
               is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
                 .with_content(%r{^\s+RewriteEngine On$})
-                .with_content(%r{^\s+RewriteRule ^index\.html$ welcome.html$})
+                .with_content(%r{^\s+RewriteRule \^index\.html\$ welcome.html$})
                 .without(content: %r{^\s+RewriteOptions Inherit$})
             }
           end

From 290e0963d60a6eef622b320f39b35478f0f7698b Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 9 Feb 2023 17:47:58 +0000
Subject: [PATCH 2092/2267] (BUGFIX) Update to ensure correct facter
 comparisons

Ensuring that the correct values are compared against facter, there seem to be many cases where lowercase has been used in place of uppercase.
---
 manifests/default_confd_files.pp |  2 +-
 manifests/default_mods.pp        | 12 ++++++------
 manifests/init.pp                |  8 ++++----
 manifests/mod.pp                 |  2 +-
 manifests/mod/cgid.pp            |  4 ++--
 manifests/mod/dav_fs.pp          |  4 ++--
 manifests/mod/disk_cache.pp      |  6 +++---
 manifests/mod/event.pp           |  4 ++--
 manifests/mod/itk.pp             |  6 +++---
 manifests/mod/peruser.pp         |  4 ++--
 manifests/mod/prefork.pp         |  4 ++--
 manifests/mod/ssl.pp             |  8 ++++----
 manifests/mod/version.pp         |  2 +-
 manifests/mod/worker.pp          |  4 ++--
 manifests/mpm.pp                 |  8 ++++----
 15 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
index a92c53a26e..08808b35c4 100644
--- a/manifests/default_confd_files.pp
+++ b/manifests/default_confd_files.pp
@@ -8,7 +8,7 @@
   # The rest of the conf.d/* files only get loaded if we want them
   if $all {
     case $facts['os']['family'] {
-      'freebsd': {
+      'FreeBSD': {
         include apache::confd::no_accf
       }
       default: {
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index efa1596ec6..42e2a44a5e 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -11,7 +11,7 @@
   # They are not configurable at this time, so we just include
   # them to make sure it works.
   case $facts['os']['family'] {
-    'redhat': {
+    'RedHat': {
       ::apache::mod { 'log_config': }
       if $facts['os']['name'] != 'Amazon' and $use_systemd {
         ::apache::mod { 'systemd': }
@@ -21,7 +21,7 @@
       }
       ::apache::mod { 'unixd': }
     }
-    'freebsd': {
+    'FreeBSD': {
       ::apache::mod { 'log_config': }
       ::apache::mod { 'unixd': }
     }
@@ -31,7 +31,7 @@
     default: {}
   }
   case $facts['os']['family'] {
-    'gentoo': {}
+    'Gentoo': {}
     default: {
       ::apache::mod { 'authz_host': }
     }
@@ -39,11 +39,11 @@
   # The rest of the modules only get loaded if we want all modules enabled
   if $all {
     case $facts['os']['family'] {
-      'debian': {
+      'Debian': {
         include apache::mod::authn_core
         include apache::mod::reqtimeout
       }
-      'redhat': {
+      'RedHat': {
         include apache::mod::actions
         include apache::mod::authn_core
         include apache::mod::cache
@@ -66,7 +66,7 @@
         ::apache::mod { 'substitute': }
         ::apache::mod { 'usertrack': }
       }
-      'freebsd': {
+      'FreeBSD': {
         include apache::mod::actions
         include apache::mod::authn_core
         include apache::mod::cache
diff --git a/manifests/init.pp b/manifests/init.pp
index a7c6f10319..b230bdb789 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -546,7 +546,7 @@
   Optional[Boolean] $protocols_honor_order                                   = undef,
 ) inherits apache::params {
   if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7' {
-    # On redhat 7 the ssl.conf lives in /etc/httpd/conf.d (the confd_dir)
+    # On RedHat 7 the ssl.conf lives in /etc/httpd/conf.d (the confd_dir)
     # when all other module configs live in /etc/httpd/conf.modules.d (the
     # mod_dir). On all other platforms and versions, ssl.conf lives in the
     # mod_dir. This should maintain the expected location of ssl.conf
@@ -731,7 +731,7 @@
   }
 
   if $apache::conf_dir and $apache::params::conf_file {
-    if $facts['os']['family'] == 'gentoo' {
+    if $facts['os']['family'] == 'Gentoo' {
       $error_documents_path = '/usr/share/apache2/error'
       if $default_mods =~ Array {
         if defined('apache::mod::ssl') {
@@ -755,7 +755,7 @@
     }
 
     $apxs_workaround = $facts['os']['family'] ? {
-      'freebsd' => true,
+      'FreeBSD' => true,
       default   => false
     }
 
@@ -837,7 +837,7 @@
       use_port_for_filenames       => true,
     }
     $ssl_access_log_file = $facts['os']['family'] ? {
-      'freebsd' => $access_log_file,
+      'FreeBSD' => $access_log_file,
       default   => "ssl_${access_log_file}",
     }
     ::apache::vhost { 'default-ssl':
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 7d354f87e7..92fbc9528e 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -94,7 +94,7 @@
     # ordering, we ensure that our version of httpd.conf is reverted after
     # the module gets installed.
     $package_before = $facts['os']['family'] ? {
-      'freebsd' => [
+      'FreeBSD' => [
         File[$_loadfile_name],
         File["${apache::conf_dir}/${apache::params::conf_file}"]
       ],
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index 90ad2c56f3..de3469ba64 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -19,8 +19,8 @@
   # Debian specifies it's cgid sock path, but RedHat uses the default value
   # with no config file
   $cgisock_path = $facts['os']['family'] ? {
-    'debian'  => "\${APACHE_RUN_DIR}/cgisock",
-    'freebsd' => 'cgisock',
+    'Debian'  => "\${APACHE_RUN_DIR}/cgisock",
+    'FreeBSD' => 'cgisock',
     default   => undef,
   }
 
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index e944bcd0b9..387a47468e 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -6,8 +6,8 @@
 class apache::mod::dav_fs {
   include apache
   $dav_lock = $facts['os']['family'] ? {
-    'debian'  => "\${APACHE_LOCK_DIR}/DAVLock",
-    'freebsd' => '/usr/local/var/DavLock',
+    'Debian'  => "\${APACHE_LOCK_DIR}/DAVLock",
+    'FreeBSD' => '/usr/local/var/DavLock',
     default   => '/var/lib/dav/lockdb',
   }
 
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 17ea3ebfa4..c0f4b787cf 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -31,9 +31,9 @@
     $_cache_root = $cache_root
   } else {
     $_cache_root = $facts['os']['family'] ? {
-      'debian'  => '/var/cache/apache2/mod_cache_disk',
-      'redhat'  => '/var/cache/httpd/proxy',
-      'freebsd' => '/var/cache/mod_cache_disk',
+      'Debian'  => '/var/cache/apache2/mod_cache_disk',
+      'RedHat'  => '/var/cache/httpd/proxy',
+      'FreeBSD' => '/var/cache/mod_cache_disk',
     }
   }
 
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 4a27e479bd..3852e6e0c6 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -84,11 +84,11 @@
   }
 
   case $facts['os']['family'] {
-    'redhat', 'debian', 'freebsd' : {
+    'RedHat', 'Debian', 'FreeBSD' : {
       apache::mpm { 'event':
       }
     }
-    'gentoo': {
+    'Gentoo': {
       ::portage::makeconf { 'apache2_mpms':
         content => 'event',
       }
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index 5d67e52a79..e7143b489c 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -79,18 +79,18 @@
   }
 
   case $facts['os']['family'] {
-    'redhat': {
+    'RedHat': {
       package { 'httpd-itk':
         ensure => present,
       }
       ::apache::mpm { 'itk':
       }
     }
-    'debian', 'freebsd': {
+    'Debian', 'FreeBSD': {
       apache::mpm { 'itk':
       }
     }
-    'gentoo': {
+    'Gentoo': {
       ::portage::makeconf { 'apache2_mpms':
         content => 'itk',
       }
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 85573e67a0..5f46bbe066 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -33,11 +33,11 @@
 ) {
   include apache
   case $facts['os']['family'] {
-    'freebsd' : {
+    'FreeBSD' : {
       fail("Unsupported osfamily ${$facts['os']['family']}")
     }
     default: {
-      if $facts['os']['family'] == 'gentoo' {
+      if $facts['os']['family'] == 'Gentoo' {
         ::portage::makeconf { 'apache2_mpms':
           content => 'peruser',
         }
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index bca367bfb1..5319fce608 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -76,7 +76,7 @@
   }
 
   case $facts['os']['family'] {
-    'redhat', 'debian', 'freebsd': {
+    'RedHat', 'Debian', 'FreeBSD': {
       ::apache::mpm { 'prefork':
       }
     }
@@ -85,7 +85,7 @@
         lib_path       => '/usr/lib64/apache2-prefork',
       }
     }
-    'gentoo': {
+    'Gentoo': {
       ::portage::makeconf { 'apache2_mpms':
         content => 'prefork',
       }
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index f17a940188..4f14eb2495 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -126,10 +126,10 @@
 
   if $stapling_cache =~ Undef {
     $_stapling_cache = $facts['os']['family'] ? {
-      'debian'  => "\${APACHE_RUN_DIR}/ocsp(32768)",
-      'redhat'  => '/run/httpd/ssl_stapling(32768)',
-      'freebsd' => '/var/run/ssl_stapling(32768)',
-      'gentoo'  => '/var/run/ssl_stapling(32768)',
+      'Debian'  => "\${APACHE_RUN_DIR}/ocsp(32768)",
+      'RedHat'  => '/run/httpd/ssl_stapling(32768)',
+      'FreeBSD' => '/var/run/ssl_stapling(32768)',
+      'Gentoo'  => '/var/run/ssl_stapling(32768)',
       'Suse'    => '/var/lib/apache2/ssl_stapling(32768)',
     }
   } else {
diff --git a/manifests/mod/version.pp b/manifests/mod/version.pp
index 5ea6bd5508..4885578bc2 100644
--- a/manifests/mod/version.pp
+++ b/manifests/mod/version.pp
@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_version.html for additional documentation.
 #
 class apache::mod::version {
-  if $facts['os']['family'] == 'debian' {
+  if $facts['os']['family'] == 'Debian' {
     warning("${module_name}: module version_module is built-in and can't be loaded")
   } else {
     ::apache::mod { 'version': }
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index ef6a97d7b2..995737f246 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -87,7 +87,7 @@
   }
 
   case $facts['os']['family'] {
-    'redhat', 'debian', 'freebsd': {
+    'RedHat', 'Debian', 'FreeBSD': {
       ::apache::mpm { 'worker':
       }
     }
@@ -97,7 +97,7 @@
       }
     }
 
-    'gentoo': {
+    'Gentoo': {
       ::portage::makeconf { 'apache2_mpms':
         content => 'worker',
       }
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
index 24cef5608c..d4b15853d2 100644
--- a/manifests/mpm.pp
+++ b/manifests/mpm.pp
@@ -43,7 +43,7 @@
   }
 
   case $facts['os']['family'] {
-    'debian': {
+    'Debian': {
       file { "${apache::mod_enable_dir}/${mpm}.conf":
         ensure  => link,
         target  => "${apache::mod_dir}/${mpm}.conf",
@@ -92,15 +92,15 @@
       }
     }
 
-    'freebsd': {
+    'FreeBSD': {
       class { 'apache::package':
         mpm_module => $mpm,
       }
     }
-    'gentoo': {
+    'Gentoo': {
       # so we don't fail
     }
-    'redhat': {
+    'RedHat': {
       # so we don't fail
     }
     'Suse': {

From cd1119c19fdfe91cb68ec33b12634be09b2349bb Mon Sep 17 00:00:00 2001
From: GitHub Action <puppetlabs@users.noreply.github.com>
Date: Fri, 10 Feb 2023 13:25:26 +0000
Subject: [PATCH 2093/2267] Release prep v9.1.2

---
 CHANGELOG.md  | 18 +++++++++++++++---
 metadata.json |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9075e3b42..30b90cf87d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v9.1.2](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.2) (2023-02-10)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.1...v9.1.2)
+
+### Fixed
+
+- \(BUGFIX\) Update to ensure correct facter comparisons [\#2387](https://github.com/puppetlabs/puppetlabs-apache/pull/2387) ([david22swan](https://github.com/david22swan))
+- Fixes mod::proxy allow\_from parameter inconsistency \#2352 [\#2385](https://github.com/puppetlabs/puppetlabs-apache/pull/2385) ([pebtron](https://github.com/pebtron))
+- Fix example code for apache::vhost::php\_values [\#2384](https://github.com/puppetlabs/puppetlabs-apache/pull/2384) ([gcoxmoz](https://github.com/gcoxmoz))
+- Suppress bad Directory comment when DocumentRoot is not set [\#2368](https://github.com/puppetlabs/puppetlabs-apache/pull/2368) ([gcoxmoz](https://github.com/gcoxmoz))
+- fix rewrite rules being ignored [\#2330](https://github.com/puppetlabs/puppetlabs-apache/pull/2330) ([trefzer](https://github.com/trefzer))
+
 ## [v9.1.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.1) (2023-02-03)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.0...v9.1.1)
@@ -188,6 +200,7 @@ All notable changes to this project will be documented in this file. The format
 - Restructure MPM disabling [\#2227](https://github.com/puppetlabs/puppetlabs-apache/pull/2227) ([ekohl](https://github.com/ekohl))
 - pdksync - \(GH-iac-334\) Remove Support for Ubuntu 16.04 [\#2220](https://github.com/puppetlabs/puppetlabs-apache/pull/2220) ([david22swan](https://github.com/david22swan))
 - Drop Apache 2.2 support with Gentoo [\#2216](https://github.com/puppetlabs/puppetlabs-apache/pull/2216) ([ekohl](https://github.com/ekohl))
+- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#2213](https://github.com/puppetlabs/puppetlabs-apache/pull/2213) ([david22swan](https://github.com/david22swan))
 
 ## [v7.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v7.0.0) (2021-10-11)
 
@@ -205,7 +218,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#2213](https://github.com/puppetlabs/puppetlabs-apache/pull/2213) ([david22swan](https://github.com/david22swan))
 - Restore Ubuntu 14.04 support in suphp [\#2193](https://github.com/puppetlabs/puppetlabs-apache/pull/2193) ([ekohl](https://github.com/ekohl))
 - add double quote on scope parameter [\#2191](https://github.com/puppetlabs/puppetlabs-apache/pull/2191) ([aba-rechsteiner](https://github.com/aba-rechsteiner))
 - Debian 11: fix typo in `versioncmp\(\)` / set default php to 7.4 [\#2186](https://github.com/puppetlabs/puppetlabs-apache/pull/2186) ([bastelfreak](https://github.com/bastelfreak))
@@ -336,7 +348,6 @@ All notable changes to this project will be documented in this file. The format
 
 - \(fix\) Convert unnecessary multi line warnings to single lines [\#2104](https://github.com/puppetlabs/puppetlabs-apache/pull/2104) ([rj667](https://github.com/rj667))
 - Fix bool2httpd function call for older ruby versions [\#2102](https://github.com/puppetlabs/puppetlabs-apache/pull/2102) ([carabasdaniel](https://github.com/carabasdaniel))
-- Use Ruby 2.7 compatible string matching [\#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
 
 ## [v5.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.7.0) (2020-11-24)
 
@@ -369,6 +380,7 @@ All notable changes to this project will be documented in this file. The format
 
 - make apache::mod::fcgid redhat 8 compatible [\#2071](https://github.com/puppetlabs/puppetlabs-apache/pull/2071) ([creativefre](https://github.com/creativefre))
 - pdksync - \(feat\) - Removal of inappropriate terminology [\#2062](https://github.com/puppetlabs/puppetlabs-apache/pull/2062) ([pmcmaw](https://github.com/pmcmaw))
+- Use Ruby 2.7 compatible string matching [\#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
 - Use python3-mod\_wsgi instead of mod\_wsgi on CentOS8 [\#2052](https://github.com/puppetlabs/puppetlabs-apache/pull/2052) ([kajinamit](https://github.com/kajinamit))
 
 ## [v5.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.5.0) (2020-07-03)
@@ -524,6 +536,7 @@ All notable changes to this project will be documented in this file. The format
 
 - \(MODULES-5990\) - conf-enabled defaulted to undef [\#1869](https://github.com/puppetlabs/puppetlabs-apache/pull/1869) ([david22swan](https://github.com/david22swan))
 - pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#1866](https://github.com/puppetlabs/puppetlabs-apache/pull/1866) ([tphoney](https://github.com/tphoney))
+- \(FM-7605\) - Disabling conf\_enabled on Ubuntu 18.04  by default as it conflicts with Shibboleth causing errors with apache2. [\#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
 
 ## [3.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.5.0) (2018-12-17)
 
@@ -538,7 +551,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- \(FM-7605\) - Disabling conf\_enabled on Ubuntu 18.04  by default as it conflicts with Shibboleth causing errors with apache2. [\#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
 - \(MODULES-8429\) Update GPG key for phusion passenger [\#1848](https://github.com/puppetlabs/puppetlabs-apache/pull/1848) ([abottchen](https://github.com/abottchen))
 - Fix default vhost priority in readme [\#1843](https://github.com/puppetlabs/puppetlabs-apache/pull/1843) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
 - fix apache::mod::jk example typo and add link for more info [\#1812](https://github.com/puppetlabs/puppetlabs-apache/pull/1812) ([xorpaul](https://github.com/xorpaul))
diff --git a/metadata.json b/metadata.json
index b355cfd243..afd4e50622 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "9.1.1",
+  "version": "9.1.2",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 3efb9d594bcf71ad229ff2f2fbbd650791579bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E1=B4=80=CA=99=C9=AA=E1=B4=87=C9=B4=20W=E1=B4=87=CA=80?=
 =?UTF-8?q?=C9=B4=CA=9F=C9=AA?= <github@faxmodem.org>
Date: Thu, 16 Feb 2023 15:21:08 +0100
Subject: [PATCH 2094/2267] Fix typo in help text

---
 manifests/mod/status.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index 37b138a0a3..ac95caf5a9 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -24,7 +24,7 @@
 # @example
 #   # Simple usage allowing access from localhost and a private subnet
 #   class { 'apache::mod::status':
-#     $requires => 'ip 127.0.0.1 ::1 10.10.10.10/24',
+#     requires => 'ip 127.0.0.1 ::1 10.10.10.10/24',
 #   }
 #
 # @see http://httpd.apache.org/docs/current/mod/mod_status.html for additional documentation.

From 7d6c11ca3ec7a013a9ac9f0b6162d846a81f0d42 Mon Sep 17 00:00:00 2001
From: dpavlotzky <david@pavlotzky.nl>
Date: Wed, 8 Mar 2023 09:13:19 +0100
Subject: [PATCH 2095/2267] #2391 Accept Sensitive type in addition to String
 type

Accept Sensitive type in addition to String type for apache::custom_config::content
---
 manifests/custom_config.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp
index edc8630f77..b138a01a9b 100644
--- a/manifests/custom_config.pp
+++ b/manifests/custom_config.pp
@@ -54,7 +54,7 @@
 define apache::custom_config (
   Enum['absent', 'present'] $ensure                                    = 'present',
   Stdlib::Absolutepath $confdir                                        = $apache::confd_dir,
-  Optional[String] $content                                            = undef,
+  Optional[Variant[Sensitive, String]] $content                        = undef,
   Apache::Vhost::Priority $priority                                    = 25,
   Optional[String] $source                                             = undef,
   Variant[String, Array[String], Array[Array[String]]] $verify_command = $apache::params::verify_command,

From 52908a2a298e282d07d3a21315beac2a79e07110 Mon Sep 17 00:00:00 2001
From: Gavin Patton <gavin.patton@puppet.com>
Date: Wed, 22 Mar 2023 06:22:27 +0000
Subject: [PATCH 2096/2267] "This change pins the puppetlabs-puppet_agent
 module to v4.12.1. Previosuly the fixutre was configured to pull from main.
 Given the recent changes when moving towards puppet8 main is unsafe."

---
 .fixtures.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index c7abf0e1ab..1fd983cde0 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -4,7 +4,9 @@ fixtures:
     facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
     portage: "https://github.com/gentoo/puppet-portage.git"
     provision: 'https://github.com/puppetlabs/provision.git'
-    puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
+    puppet_agent:
+      repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
+      ref: v4.12.1
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     yumrepo_core: 
       repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git"

From d18c247135ffbcfd78fc107cf0645a478b60f89f Mon Sep 17 00:00:00 2001
From: jordanbreen28 <jordan.breen@perforce.com>
Date: Thu, 23 Mar 2023 09:50:26 +0000
Subject: [PATCH 2097/2267] (CONT-229) - Implement reusable workflows

---
 .github/workflows/auto_release.yml |  87 +-----------
 .github/workflows/ci.yml           |  21 +++
 .github/workflows/nightly.yml      | 207 ++---------------------------
 .github/workflows/pr_test.yml      | 185 --------------------------
 .github/workflows/release.yml      |  44 +-----
 .github/workflows/spec.yml         | 126 ------------------
 6 files changed, 39 insertions(+), 631 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/pr_test.yml
 delete mode 100644 .github/workflows/spec.yml

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index f0d7aa4414..d6270c56fe 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -3,88 +3,7 @@ name: "Auto release"
 on:
   workflow_dispatch:
 
-env:
-  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6 
-  HONEYCOMB_DATASET: litmus tests
-  CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
 jobs:
-  auto_release:
-    name: "Automatic release prep"
-    runs-on: ubuntu-20.04
-
-    steps:
-    
-    - name: "Honeycomb: Start recording"
-      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
-      with:
-        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
-        dataset: ${{ env.HONEYCOMB_DATASET }}
-        job-status: ${{ job.status }}
-
-    - name: "Honeycomb: start first step"
-      run: |
-        echo STEP_ID="auto-release" >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-    - name: "Checkout Source"
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
-    - name: "PDK Release prep"
-      uses: docker://puppet/pdk:2.6.1.0
-      with:
-        args: 'release prep --force'
-      env:
-        CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: "Get Version"
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      id: gv
-      run: |
-        echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
-
-    - name: "Check if a release is necessary"
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      id: check
-      run: |
-        git diff --quiet CHANGELOG.md && echo "::set-output name=release::false" || echo "::set-output name=release::true"
-
-    - name: "Commit changes"
-      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
-      run: |
-        git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
-        git config --local user.name "GitHub Action"
-        git add .
-        git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
-
-    - name: Create Pull Request
-      id: cpr
-      uses: puppetlabs/peter-evans-create-pull-request@v3
-      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
-        branch: "release-prep"
-        delete-branch: true
-        title: "Release prep v${{ steps.gv.outputs.ver }}"
-        body: |
-          Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}. 
-          Please verify before merging:
-          - [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
-          - [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
-          - [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
-        labels: "maintenance"
-
-    - name: PR outputs
-      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
-      run: |
-        echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
-        echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
- 
-    - name: "Honeycomb: Record finish step"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'
+  release_prep:
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
+    secrets: "inherit"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..e6dd8d7bc0
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,21 @@
+name: "ci"
+
+on:
+  pull_request:
+    branches:
+      - "main"
+  workflow_dispatch:
+    
+jobs:
+  Spec:
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
+    with:
+      runs_on: "ubuntu-20.04"
+    secrets: "inherit"
+
+  Acceptance:
+    needs: Spec
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
+    with:
+      runs_on: "ubuntu-20.04"
+    secrets: "inherit"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 42816e7de7..8ea551fa5d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -2,203 +2,20 @@ name: "nightly"
 
 on:
   schedule:
-    - cron: '0 0 * * *'
-
-
-env:
-  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
-  HONEYCOMB_DATASET: litmus tests
+    - cron: "0 0 * * *"
+  workflow_dispatch:
 
 jobs:
-  setup_matrix:
-    if: ${{ github.repository_owner == 'puppetlabs' }}
-    name: "Setup Test Matrix"
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.get-matrix.outputs.matrix }}
-
-    steps:
-     
-    - name: "Honeycomb: Start recording"
-      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
-      with:
-        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
-        dataset: ${{ env.HONEYCOMB_DATASET }}
-        job-status: ${{ job.status }}
+  Spec:
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
+    with:
+      runs_on: "ubuntu-20.04"
+    secrets: "inherit"
 
-    - name: "Honeycomb: Start first step"
-      run: |
-        echo STEP_ID=setup-environment >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-    - name: Checkout Source
-      uses: actions/checkout@v2
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-
-    - name: Activate Ruby 2.7
-      uses: ruby/setup-ruby@v1
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      with:
-        ruby-version: "2.7"
-        bundler-cache: true
-
-    - name: Print bundle environment
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      run: |
-        echo ::group::bundler environment
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
-        echo ::endgroup::
-   
-    - name: "Honeycomb: Record Setup Environment time"
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-    - name: Setup Acceptance Test Matrix
-      id: get-matrix
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      run: |
-        if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 
-        else
-          echo  "::set-output name=matrix::{}"
-        fi
-  
-    - name: "Honeycomb: Record Setup Test Matrix time"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
   Acceptance:
-    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
-    needs:
-      - setup_matrix
-
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
-
-    env:
-      BUILDEVENT_FILE: '../buildevents.txt'
-
-    steps:
-    - run: |
-        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
-        echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
-        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
-
-
-    - name: "Honeycomb: Start recording"
-      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
-      with:
-        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
-        dataset: ${{ env.HONEYCOMB_DATASET }}
-        job-status: ${{ job.status }}
-        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
-
-    - name: "Honeycomb: start first step"
-      run: |
-        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Checkout Source
-      uses: actions/checkout@v2
-
-    - name: Activate Ruby 2.7
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "2.7"
-        bundler-cache: true
-
-    - name: Print bundle environment
-      run: |
-        echo ::group::bundler environment
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
-        echo ::endgroup::
-
-    - name: "Honeycomb: Record Setup Environment time"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Provision test environment
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
-        echo ::group::=== REQUEST ===
-        cat request.json || true
-        echo
-        echo ::endgroup::
-        echo ::group::=== INVENTORY ===
-        if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
-        then
-          FILE='spec/fixtures/litmus_inventory.yaml'
-        elif [ -f 'inventory.yaml' ];
-        then
-          FILE='inventory.yaml'
-        fi
-        sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
-        echo ::endgroup::
-
-    - name: Install agent
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
-
-    - name: Install module
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
-
-    - name: "Honeycomb: Record deployment times"
-      if: ${{ always() }}
-      run: |
-        echo ::group::honeycomb step
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-        echo ::endgroup::
-
-    - name: Run acceptance tests
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
-
-    - name: "Honeycomb: Record acceptance testing times"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Remove test environment
-      if: ${{ always() }}
-      continue-on-error: true
-      run: |
-        if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
-          buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
-          echo ::group::=== REQUEST ===
-          cat request.json || true
-          echo
-          echo ::endgroup::
-        fi
-
-    - name: "Honeycomb: Record removal times"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
+    needs: Spec
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
+    with:
+      runs_on: "ubuntu-20.04"
+    secrets: "inherit"
 
-  slack-workflow-status:
-    if: ${{ github.repository_owner == 'puppetlabs' }}
-    name: Post Workflow Status To Slack
-    needs:
-      - Acceptance
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Slack Workflow Notification
-        uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
-        with:
-          # Required Input
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
-          # Optional Input
-          channel: '#team-cat-bots'
-          name: 'GABot'
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
deleted file mode 100644
index fd310e6561..0000000000
--- a/.github/workflows/pr_test.yml
+++ /dev/null
@@ -1,185 +0,0 @@
-name: "PR Testing"
-
-on: [pull_request]
-
-
-env:
- 
-  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
-  HONEYCOMB_DATASET: litmus tests
-
-jobs:
-  setup_matrix:
-    name: "Setup Test Matrix"
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.get-matrix.outputs.matrix }}
-
-    steps:
-    
-    - name: "Honeycomb: Start recording"
-      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
-      with:
-        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
-        dataset: ${{ env.HONEYCOMB_DATASET }}
-        job-status: ${{ job.status }}
-
-    - name: "Honeycomb: Start first step"
-      run: |
-        echo STEP_ID=setup-environment >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-    - name: Checkout Source
-      uses: actions/checkout@v2
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-
-    - name: Activate Ruby 2.7
-      uses: ruby/setup-ruby@v1
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      with:
-        ruby-version: "2.7"
-        bundler-cache: true
-
-    - name: Print bundle environment
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      run: |
-        echo ::group::bundler environment
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
-        echo ::endgroup::
-  
-    - name: "Honeycomb: Record Setup Environment time"
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-    - name: Run validation steps
-      run: |
-        bundle exec rake validate
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-
-    - name: Setup Acceptance Test Matrix
-      id: get-matrix
-      run: |
-        if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 
-        else
-          echo  "::set-output name=matrix::{}"
-        fi
- 
-    - name: "Honeycomb: Record Setup Test Matrix time"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
-  Acceptance:
-    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
-    needs:
-      - setup_matrix
-    if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
-
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
-
-    env:
-      BUILDEVENT_FILE: '../buildevents.txt'
-
-    steps:
-    - run: |
-        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
-        echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
-        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
- 
-    - name: "Honeycomb: Start recording"
-      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
-      with:
-        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
-        dataset: ${{ env.HONEYCOMB_DATASET }}
-        job-status: ${{ job.status }}
-        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
-
-    - name: "Honeycomb: start first step"
-      run: |
-        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-    - name: Checkout Source
-      uses: actions/checkout@v2
-
-    - name: Activate Ruby 2.7
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "2.7"
-        bundler-cache: true
-
-    - name: Print bundle environment
-      run: |
-        echo ::group::bundler environment
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
-        echo ::endgroup::
- 
-    - name: "Honeycomb: Record Setup Environment time"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-    - name: Provision test environment
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
-        echo ::group::=== REQUEST ===
-        cat request.json || true
-        echo
-        echo ::endgroup::
-        echo ::group::=== INVENTORY ===
-        if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
-        then
-          FILE='spec/fixtures/litmus_inventory.yaml'
-        elif [ -f 'inventory.yaml' ];
-        then
-          FILE='inventory.yaml'
-        fi
-        sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
-        echo ::endgroup::
-
-    - name: Install agent
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
-
-    - name: Install module
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
- 
-    - name: "Honeycomb: Record deployment times"
-      if: ${{ always() }}
-      run: |
-        echo ::group::honeycomb step
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-        echo ::endgroup::
-    - name: Run acceptance tests
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
- 
-    - name: "Honeycomb: Record acceptance testing times"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-    - name: Remove test environment
-      if: ${{ always() }}
-      continue-on-error: true
-      run: |
-        if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
-          buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
-          echo ::group::=== REQUEST ===
-          cat request.json || true
-          echo
-          echo ::endgroup::
-        fi
- 
-    - name: "Honeycomb: Record removal times"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1509f6e91f..0b7b8a05dd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,44 +4,6 @@ on:
   workflow_dispatch:
   
 jobs:
-  create-github-release:
-    name: Deploy GitHub Release
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.ref }}
-          clean: true
-          fetch-depth: 0
-      - name: Get Version
-        id: gv
-        run: |
-          echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
-      - name: Create Release
-        uses: actions/create-release@v1
-        id: create_release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: "v${{ steps.gv.outputs.ver }}"
-          draft: false
-          prerelease: false
-
-  deploy-forge:
-    name: Deploy to Forge
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.ref }}
-          clean: true
-      - name: "PDK Build"
-        uses: docker://puppet/pdk:nightly
-        with:
-          args: 'build'
-      - name: "Push to Forge"
-        uses: docker://puppet/pdk:nightly
-        with:
-          args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'
+  release: 
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
+    secrets: "inherit"
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
deleted file mode 100644
index 6c1ae10d8c..0000000000
--- a/.github/workflows/spec.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-name: "Spec Tests"
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-  pull_request:
-
-
-env:
-  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
-  HONEYCOMB_DATASET: litmus tests
-
-jobs:
-  setup_matrix:
-    name: "Setup Test Matrix"
-    runs-on: ubuntu-20.04
-    outputs:
-      spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
-
-    steps:
-    
-      - name: "Honeycomb: Start recording"
-        uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
-        with:
-          apikey: ${{ env.HONEYCOMB_WRITEKEY }}
-          dataset: ${{ env.HONEYCOMB_DATASET }}
-          job-status: ${{ job.status }}
-
-      - name: "Honeycomb: Start first step"
-        run: |
-          echo STEP_ID=setup-environment >> $GITHUB_ENV
-          echo STEP_START=$(date +%s) >> $GITHUB_ENV
-      - name: Checkout Source
-        uses: actions/checkout@v2
-        if: ${{ github.repository_owner == 'puppetlabs' }}
-
-      - name: Activate Ruby 2.7
-        uses: ruby/setup-ruby@v1
-        if: ${{ github.repository_owner == 'puppetlabs' }}
-        with:
-          ruby-version: "2.7"
-          bundler-cache: true
-
-      - name: Print bundle environment
-        if: ${{ github.repository_owner == 'puppetlabs' }}
-        run: |
-          echo ::group::bundler environment
-          buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
-          echo ::endgroup::
-      - name: "Honeycomb: Record Setup Environment time"
-        if: ${{ github.repository_owner == 'puppetlabs' }}
-        run: |
-          buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-          echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
-          echo STEP_START=$(date +%s) >> $GITHUB_ENV
-      - name: Run Static & Syntax Tests
-        if: ${{ github.repository_owner == 'puppetlabs' }}
-        run: |
-          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
-
-      - name: Setup Spec Test Matrix
-        id: get-matrix
-        run: |
-          if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-            buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
-          else
-            echo  "::set-output name=spec_matrix::{}"
-          fi
-      - name: "Honeycomb: Record Setup Test Matrix time"
-        if: ${{ always() }}
-        run: |
-          buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
-  Spec:
-    name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
-    needs:
-      - setup_matrix
-    if: ${{ needs.setup_matrix.outputs.spec_matrix != '{}' }}
-
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix: ${{fromJson(needs.setup_matrix.outputs.spec_matrix)}}
-
-    env:
-      BUILDEVENT_FILE: '../buildevents.txt'
-      PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
-      FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
-
-    steps:
-      - run: |
-          echo "SANITIZED_PUPPET_VERSION=$(echo '${{ matrix.puppet_version }}' | sed 's/~> //g')" >> $GITHUB_ENV
-
-      - run: |
-          echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
-      - name: "Honeycomb: Start first step"
-        run: |
-          echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
-          echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-      - name: "Honeycomb: Start recording"
-        uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
-        with:
-          apikey: ${{ env.HONEYCOMB_WRITEKEY }}
-          dataset: ${{ env.HONEYCOMB_DATASET }}
-          job-status: ${{ job.status }}
-          matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
-      - name: Checkout Source
-        uses: actions/checkout@v2
-
-      - name: "Activate Ruby ${{ matrix.ruby_version }}"
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{matrix.ruby_version}}
-          bundler-cache: true
-
-      - name: Print bundle environment
-        run: |
-          echo ::group::bundler environment
-          buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
-          echo ::endgroup::
-
-
-      - name: Run parallel_spec tests
-        run: |
-          buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec

From ac00b9403268a62a7162fc2ed781c8865eba4cad Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 28 Mar 2023 11:17:33 +0100
Subject: [PATCH 2098/2267] (CONT-826) Temporarily pin puppet_litmus to 0.34.6
 or less

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index a84b5ee829..1881afe150 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,8 +37,8 @@ group :development do
   gem "github_changelog_generator", '= 1.15.2',        require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
-  gem "serverspec", '~> 2.41',    require: false
+  gem "puppet_litmus", '<= 0.34.6', require: false, platforms: [:ruby]
+  gem "serverspec", '~> 2.41',      require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

From 8ae2476d877e7dbeadd503ac33590003c0203634 Mon Sep 17 00:00:00 2001
From: jordanbreen28 <jordan.breen@perforce.com>
Date: Wed, 5 Apr 2023 10:48:57 +0100
Subject: [PATCH 2099/2267] (CONT-844) - Update .sync.yml

---
 .sync.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 8559b22568..44bb97480d 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -18,21 +18,18 @@ spec/spec_helper.rb:
   unmanaged: false
 .gitpod.yml:
   unmanaged: false
-.github/workflows/nightly.yml:
-  unmanaged: false
-.github/workflows/pr_test.yml:
-  unmanaged: false
 .github/workflows/auto_release.yml:
   unmanaged: false
+.github/workflows/ci.yml:
+  unmanaged: true
+.github/workflows/nightly.yml:
+  unmanaged: true
+.github/workflows/release.yml:
+  unmanaged: false
 Rakefile:
   changelog_max_issues: 500
   extras:
     "FastGettext.default_text_domain = 'default-text-domain'"
-.github/workflows/spec.yml:
-  checks: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
-  unmanaged: false
-.github/workflows/release.yml:
-  unmanaged: false
 .travis.yml:
   delete: true
 changelog_since_tag: "3.2.0"

From ac72eacb4ba21127dd305fd92488df148fd849fb Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Tue, 18 Apr 2023 16:09:48 +0100
Subject: [PATCH 2100/2267] (CONT-772) PDK update

---
 .devcontainer/devcontainer.json |  2 +-
 Gemfile                         | 46 ++++++++++++++++-----------------
 Rakefile                        |  1 -
 metadata.json                   |  4 +--
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fe7a8b12b9..cdd65d220a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
 	"settings": {
 		"terminal.integrated.profiles.linux": {
 			"bash": {
-				"path": "bash",
+				"path": "bash"
 			}
 		}
 	},
diff --git a/Gemfile b/Gemfile
index 1881afe150..8456bee1c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,31 +14,31 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 group :development do
-  gem "json", '= 2.1.0',                               require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.3.0',                               require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.5.1',                               require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.1',                               require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.3',                               require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "voxpupuli-puppet-lint-plugins", '~> 3.1',       require: false
-  gem "facterdb", '~> 1.18',                           require: false
-  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0',     require: false
-  gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
-  gem "rspec-puppet-facts", '~> 2.0',                  require: false
-  gem "codecov", '~> 0.2',                             require: false
-  gem "dependency_checker", '~> 0.2',                  require: false
-  gem "parallel_tests", '~> 3.4',                      require: false
-  gem "pry", '~> 0.10',                                require: false
-  gem "simplecov-console", '~> 0.5',                   require: false
-  gem "puppet-debugger", '~> 1.0',                     require: false
-  gem "rubocop", '= 1.6.1',                            require: false
-  gem "rubocop-performance", '= 1.9.1',                require: false
-  gem "rubocop-rspec", '= 2.0.1',                      require: false
-  gem "rb-readline", '= 0.5.5',                        require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator", '= 1.15.2',        require: false
+  gem "json", '= 2.1.0',                           require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                           require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                           require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                           require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                           require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 4.0',   require: false
+  gem "facterdb", '~> 1.18',                       require: false
+  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
+  gem "puppetlabs_spec_helper", '~> 5.0',          require: false
+  gem "rspec-puppet-facts", '~> 2.0',              require: false
+  gem "codecov", '~> 0.2',                         require: false
+  gem "dependency_checker", '~> 0.2',              require: false
+  gem "parallel_tests", '= 3.12.1',                require: false
+  gem "pry", '~> 0.10',                            require: false
+  gem "simplecov-console", '~> 0.5',               require: false
+  gem "puppet-debugger", '~> 1.0',                 require: false
+  gem "rubocop", '= 1.6.1',                        require: false
+  gem "rubocop-performance", '= 1.9.1',            require: false
+  gem "rubocop-rspec", '= 2.0.1',                  require: false
+  gem "rb-readline", '= 0.5.5',                    require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator", '= 1.15.2',    require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '<= 0.34.6', require: false, platforms: [:ruby]
-  gem "serverspec", '~> 2.41',      require: false
+  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
+  gem "serverspec", '~> 2.41',    require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 47ff253418..3cf60463bd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,6 @@ require 'bundler'
 require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
 require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
 
diff --git a/metadata.json b/metadata.json
index afd4e50622..a53eb9a96a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -87,7 +87,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "2.5.0",
+  "pdk-version": "2.7.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "2.7.1-0-g9a16c87"
+  "template-ref": "heads/main-0-ge5b0114"
 }

From 8faf4c180bca38322174454c7597cb46876a1b32 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Tue, 18 Apr 2023 16:18:25 +0100
Subject: [PATCH 2101/2267] (CONT-772) Update fixtures.yml

---
 .fixtures.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 1fd983cde0..37bc6910f9 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -6,7 +6,7 @@ fixtures:
     provision: 'https://github.com/puppetlabs/provision.git'
     puppet_agent:
       repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
-      ref: v4.12.1
+      ref: v4.13.0
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     yumrepo_core: 
       repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git"

From 8070478d41a8c2f3a912b05904ac77a0b08bbe04 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Tue, 18 Apr 2023 16:20:20 +0100
Subject: [PATCH 2102/2267] (CONT-772) Update metadata.json and Gemfile

---
 Gemfile       | 6 +++---
 metadata.json | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8456bee1c3..7fad5040d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,9 +30,9 @@ group :development do
   gem "pry", '~> 0.10',                            require: false
   gem "simplecov-console", '~> 0.5',               require: false
   gem "puppet-debugger", '~> 1.0',                 require: false
-  gem "rubocop", '= 1.6.1',                        require: false
-  gem "rubocop-performance", '= 1.9.1',            require: false
-  gem "rubocop-rspec", '= 2.0.1',                  require: false
+  gem "rubocop", '~> 1.48.1',                      require: false
+  gem "rubocop-performance", '~> 1.16',            require: false
+  gem "rubocop-rspec", '~> 2.19',                  require: false
   gem "rb-readline", '= 0.5.5',                    require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator", '= 1.15.2',    require: false
 end
diff --git a/metadata.json b/metadata.json
index a53eb9a96a..faee22da85 100644
--- a/metadata.json
+++ b/metadata.json
@@ -14,7 +14,7 @@
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 2.2.1 < 8.0.0"
+      "version_requirement": ">= 2.2.1 < 9.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -83,7 +83,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 6.24.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "description": "Module for Apache configuration",

From 6b72635accfa6a135af0bc3f5f8ebc09b9f0ca6f Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Tue, 18 Apr 2023 16:26:10 +0100
Subject: [PATCH 2103/2267] (CONT-772) Configure rubocop

---
 .rubocop.yml       | 443 +--------------------------------------------
 .rubocop_todo.yml  | 399 ++++++++++++++++++++++++++++++++++++++--
 manifests/vhost.pp |   2 +-
 3 files changed, 394 insertions(+), 450 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index a886d8dbfe..0d076d68c8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,10 @@ require:
 - rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.5'
+  NewCops: enable
+  TargetRubyVersion: '2.7'
+  ExtraDetails: true
+  DisplayStyleGuide: true
   Include:
   - "**/*.rb"
   Exclude:
@@ -80,441 +83,5 @@ Style/Documentation:
   - spec/**/*
 Style/WordArray:
   EnforcedStyle: brackets
-Performance/AncestorsInclude:
-  Enabled: true
-Performance/BigDecimalWithNumericArgument:
-  Enabled: true
-Performance/BlockGivenWithExplicitBlock:
-  Enabled: true
-Performance/CaseWhenSplat:
-  Enabled: true
-Performance/ConstantRegexp:
-  Enabled: true
-Performance/MethodObjectAsBlock:
-  Enabled: true
-Performance/RedundantSortBlock:
-  Enabled: true
-Performance/RedundantStringChars:
-  Enabled: true
-Performance/ReverseFirst:
-  Enabled: true
-Performance/SortReverse:
-  Enabled: true
-Performance/Squeeze:
-  Enabled: true
-Performance/StringInclude:
-  Enabled: true
-Performance/Sum:
-  Enabled: true
-Style/CollectionMethods:
-  Enabled: true
-Style/MethodCalledOnDoEndBlock:
-  Enabled: true
-Style/StringMethods:
-  Enabled: true
-Bundler/InsecureProtocolSource:
-  Enabled: false
-Gemspec/DuplicatedAssignment:
-  Enabled: false
-Gemspec/OrderedDependencies:
-  Enabled: false
-Gemspec/RequiredRubyVersion:
-  Enabled: false
-Gemspec/RubyVersionGlobalsUsage:
-  Enabled: false
-Layout/ArgumentAlignment:
-  Enabled: false
-Layout/BeginEndAlignment:
-  Enabled: false
-Layout/ClosingHeredocIndentation:
-  Enabled: false
-Layout/EmptyComment:
-  Enabled: false
-Layout/EmptyLineAfterGuardClause:
-  Enabled: false
-Layout/EmptyLinesAroundArguments:
-  Enabled: false
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: false
-Layout/EndOfLine:
-  Enabled: false
-Layout/FirstArgumentIndentation:
-  Enabled: false
-Layout/HashAlignment:
-  Enabled: false
-Layout/HeredocIndentation:
-  Enabled: false
-Layout/LeadingEmptyLines:
-  Enabled: false
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: false
-Layout/SpaceInsideArrayLiteralBrackets:
-  Enabled: false
-Layout/SpaceInsideReferenceBrackets:
-  Enabled: false
-Lint/BigDecimalNew:
-  Enabled: false
-Lint/BooleanSymbol:
-  Enabled: false
-Lint/ConstantDefinitionInBlock:
-  Enabled: false
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: false
-Lint/DisjunctiveAssignmentInConstructor:
-  Enabled: false
-Lint/DuplicateElsifCondition:
-  Enabled: false
-Lint/DuplicateRequire:
-  Enabled: false
-Lint/DuplicateRescueException:
-  Enabled: false
-Lint/EmptyConditionalBody:
-  Enabled: false
-Lint/EmptyFile:
-  Enabled: false
-Lint/ErbNewArguments:
-  Enabled: false
-Lint/FloatComparison:
-  Enabled: false
-Lint/HashCompareByIdentity:
-  Enabled: false
-Lint/IdentityComparison:
-  Enabled: false
-Lint/InterpolationCheck:
-  Enabled: false
-Lint/MissingCopEnableDirective:
-  Enabled: false
-Lint/MixedRegexpCaptureTypes:
-  Enabled: false
-Lint/NestedPercentLiteral:
-  Enabled: false
-Lint/NonDeterministicRequireOrder:
-  Enabled: false
-Lint/OrderedMagicComments:
-  Enabled: false
-Lint/OutOfRangeRegexpRef:
-  Enabled: false
-Lint/RaiseException:
-  Enabled: false
-Lint/RedundantCopEnableDirective:
-  Enabled: false
-Lint/RedundantRequireStatement:
-  Enabled: false
-Lint/RedundantSafeNavigation:
-  Enabled: false
-Lint/RedundantWithIndex:
-  Enabled: false
-Lint/RedundantWithObject:
-  Enabled: false
-Lint/RegexpAsCondition:
-  Enabled: false
-Lint/ReturnInVoidContext:
-  Enabled: false
-Lint/SafeNavigationConsistency:
-  Enabled: false
-Lint/SafeNavigationWithEmpty:
-  Enabled: false
-Lint/SelfAssignment:
-  Enabled: false
-Lint/SendWithMixinArgument:
-  Enabled: false
-Lint/ShadowedArgument:
-  Enabled: false
-Lint/StructNewOverride:
-  Enabled: false
-Lint/ToJSON:
-  Enabled: false
-Lint/TopLevelReturnWithArgument:
-  Enabled: false
-Lint/TrailingCommaInAttributeDeclaration:
-  Enabled: false
-Lint/UnreachableLoop:
-  Enabled: false
-Lint/UriEscapeUnescape:
-  Enabled: false
-Lint/UriRegexp:
-  Enabled: false
-Lint/UselessMethodDefinition:
-  Enabled: false
-Lint/UselessTimes:
-  Enabled: false
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Enabled: false
-Metrics/BlockNesting:
-  Enabled: false
-Metrics/ClassLength:
-  Enabled: false
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Metrics/ModuleLength:
-  Enabled: false
-Metrics/ParameterLists:
-  Enabled: false
-Metrics/PerceivedComplexity:
-  Enabled: false
-Migration/DepartmentName:
-  Enabled: false
-Naming/AccessorMethodName:
-  Enabled: false
-Naming/BlockParameterName:
-  Enabled: false
-Naming/HeredocDelimiterCase:
-  Enabled: false
-Naming/HeredocDelimiterNaming:
-  Enabled: false
-Naming/MemoizedInstanceVariableName:
-  Enabled: false
 Naming/MethodParameterName:
-  Enabled: false
-Naming/RescuedExceptionsVariableName:
-  Enabled: false
-Naming/VariableNumber:
-  Enabled: false
-Performance/BindCall:
-  Enabled: false
-Performance/DeletePrefix:
-  Enabled: false
-Performance/DeleteSuffix:
-  Enabled: false
-Performance/InefficientHashSearch:
-  Enabled: false
-Performance/UnfreezeString:
-  Enabled: false
-Performance/UriDefaultParser:
-  Enabled: false
-RSpec/Be:
-  Enabled: false
-RSpec/Capybara/CurrentPathExpectation:
-  Enabled: false
-RSpec/Capybara/FeatureMethods:
-  Enabled: false
-RSpec/Capybara/VisibilityMatcher:
-  Enabled: false
-RSpec/ContextMethod:
-  Enabled: false
-RSpec/ContextWording:
-  Enabled: false
-RSpec/DescribeClass:
-  Enabled: false
-RSpec/EmptyHook:
-  Enabled: false
-RSpec/EmptyLineAfterExample:
-  Enabled: false
-RSpec/EmptyLineAfterExampleGroup:
-  Enabled: false
-RSpec/EmptyLineAfterHook:
-  Enabled: false
-RSpec/ExampleLength:
-  Enabled: false
-RSpec/ExampleWithoutDescription:
-  Enabled: false
-RSpec/ExpectChange:
-  Enabled: false
-RSpec/ExpectInHook:
-  Enabled: false
-RSpec/FactoryBot/AttributeDefinedStatically:
-  Enabled: false
-RSpec/FactoryBot/CreateList:
-  Enabled: false
-RSpec/FactoryBot/FactoryClassName:
-  Enabled: false
-RSpec/HooksBeforeExamples:
-  Enabled: false
-RSpec/ImplicitBlockExpectation:
-  Enabled: false
-RSpec/ImplicitSubject:
-  Enabled: false
-RSpec/LeakyConstantDeclaration:
-  Enabled: false
-RSpec/LetBeforeExamples:
-  Enabled: false
-RSpec/MissingExampleGroupArgument:
-  Enabled: false
-RSpec/MultipleExpectations:
-  Enabled: false
-RSpec/MultipleMemoizedHelpers:
-  Enabled: false
-RSpec/MultipleSubjects:
-  Enabled: false
-RSpec/NestedGroups:
-  Enabled: false
-RSpec/PredicateMatcher:
-  Enabled: false
-RSpec/ReceiveCounts:
-  Enabled: false
-RSpec/ReceiveNever:
-  Enabled: false
-RSpec/RepeatedExampleGroupBody:
-  Enabled: false
-RSpec/RepeatedExampleGroupDescription:
-  Enabled: false
-RSpec/RepeatedIncludeExample:
-  Enabled: false
-RSpec/ReturnFromStub:
-  Enabled: false
-RSpec/SharedExamples:
-  Enabled: false
-RSpec/StubbedMock:
-  Enabled: false
-RSpec/UnspecifiedException:
-  Enabled: false
-RSpec/VariableDefinition:
-  Enabled: false
-RSpec/VoidExpect:
-  Enabled: false
-RSpec/Yield:
-  Enabled: false
-Security/Open:
-  Enabled: false
-Style/AccessModifierDeclarations:
-  Enabled: false
-Style/AccessorGrouping:
-  Enabled: false
-Style/AsciiComments:
-  Enabled: false
-Style/BisectedAttrAccessor:
-  Enabled: false
-Style/CaseLikeIf:
-  Enabled: false
-Style/ClassEqualityComparison:
-  Enabled: false
-Style/ColonMethodDefinition:
-  Enabled: false
-Style/CombinableLoops:
-  Enabled: false
-Style/CommentedKeyword:
-  Enabled: false
-Style/Dir:
-  Enabled: false
-Style/DoubleCopDisableDirective:
-  Enabled: false
-Style/EmptyBlockParameter:
-  Enabled: false
-Style/EmptyLambdaParameter:
-  Enabled: false
-Style/Encoding:
-  Enabled: false
-Style/EvalWithLocation:
-  Enabled: false
-Style/ExpandPathArguments:
-  Enabled: false
-Style/ExplicitBlockArgument:
-  Enabled: false
-Style/ExponentialNotation:
-  Enabled: false
-Style/FloatDivision:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false
-Style/GlobalStdStream:
-  Enabled: false
-Style/HashAsLastArrayItem:
-  Enabled: false
-Style/HashLikeCase:
-  Enabled: false
-Style/HashTransformKeys:
-  Enabled: false
-Style/HashTransformValues:
-  Enabled: false
-Style/IfUnlessModifier:
-  Enabled: false
-Style/KeywordParametersOrder:
-  Enabled: false
-Style/MinMax:
-  Enabled: false
-Style/MixinUsage:
-  Enabled: false
-Style/MultilineWhenThen:
-  Enabled: false
-Style/NegatedUnless:
-  Enabled: false
-Style/NumericPredicate:
-  Enabled: false
-Style/OptionalBooleanParameter:
-  Enabled: false
-Style/OrAssignment:
-  Enabled: false
-Style/RandomWithOffset:
-  Enabled: false
-Style/RedundantAssignment:
-  Enabled: false
-Style/RedundantCondition:
-  Enabled: false
-Style/RedundantConditional:
-  Enabled: false
-Style/RedundantFetchBlock:
-  Enabled: false
-Style/RedundantFileExtensionInRequire:
-  Enabled: false
-Style/RedundantRegexpCharacterClass:
-  Enabled: false
-Style/RedundantRegexpEscape:
-  Enabled: false
-Style/RedundantSelfAssignment:
-  Enabled: false
-Style/RedundantSort:
-  Enabled: false
-Style/RescueStandardError:
-  Enabled: false
-Style/SingleArgumentDig:
-  Enabled: false
-Style/SlicingWithRange:
-  Enabled: false
-Style/SoleNestedConditional:
-  Enabled: false
-Style/StderrPuts:
-  Enabled: false
-Style/StringConcatenation:
-  Enabled: false
-Style/Strip:
-  Enabled: false
-Style/SymbolProc:
-  Enabled: false
-Style/TrailingBodyOnClass:
-  Enabled: false
-Style/TrailingBodyOnMethodDefinition:
-  Enabled: false
-Style/TrailingBodyOnModule:
-  Enabled: false
-Style/TrailingCommaInHashLiteral:
-  Enabled: false
-Style/TrailingMethodEndStatement:
-  Enabled: false
-Style/UnpackFirst:
-  Enabled: false
-Lint/DuplicateBranch:
-  Enabled: false
-Lint/DuplicateRegexpCharacterClassElement:
-  Enabled: false
-Lint/EmptyBlock:
-  Enabled: false
-Lint/EmptyClass:
-  Enabled: false
-Lint/NoReturnInBeginEndBlocks:
-  Enabled: false
-Lint/ToEnumArguments:
-  Enabled: false
-Lint/UnexpectedBlockArity:
-  Enabled: false
-Lint/UnmodifiedReduceAccumulator:
-  Enabled: false
-Performance/CollectionLiteralInLoop:
-  Enabled: false
-Style/ArgumentsForwarding:
-  Enabled: false
-Style/CollectionCompact:
-  Enabled: false
-Style/DocumentDynamicEvalDefinition:
-  Enabled: false
-Style/NegatedIfElseCondition:
-  Enabled: false
-Style/NilLambda:
-  Enabled: false
-Style/RedundantArgument:
-  Enabled: false
-Style/SwapValues:
-  Enabled: false
+  AllowedNames: 'is'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9e99e20040..7f466f647b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,18 +1,395 @@
-Style/GlobalVars:
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2023-04-18 15:25:08 UTC using RuboCop version 1.48.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 12
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'spec/classes/mod/event_spec.rb'
+    - 'spec/classes/mod/itk_spec.rb'
+    - 'spec/classes/mod/lbmethod_bybusyness.rb'
+    - 'spec/classes/mod/lbmethod_byrequests.rb'
+    - 'spec/classes/mod/lbmethod_bytraffic.rb'
+    - 'spec/classes/mod/lbmethod_heartbeat.rb'
+    - 'spec/classes/mod/prefork_spec.rb'
+    - 'spec/classes/mod/worker_spec.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+Layout/ClosingHeredocIndentation:
+  Exclude:
+    - 'spec/acceptance/itk_spec.rb'
+    - 'spec/acceptance/mod_authnz_ldap_spec.rb'
+    - 'spec/acceptance/vhost_spec.rb'
+
+# Offense count: 8
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/puppet/functions/apache/bool2httpd.rb'
+    - 'spec/classes/mod/authnz_ldap_spec.rb'
+    - 'spec/spec_helper_acceptance_local.rb'
+    - 'tasks/init.rb'
+    - 'util/apache_mod_platform_support.rb'
+
+# Offense count: 590
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/classes/apache_spec.rb'
+    - 'spec/classes/mod/event_spec.rb'
+    - 'spec/classes/mod/itk_spec.rb'
+    - 'spec/classes/mod/jk_spec.rb'
+    - 'spec/classes/mod/lbmethod_bybusyness.rb'
+    - 'spec/classes/mod/lbmethod_byrequests.rb'
+    - 'spec/classes/mod/lbmethod_bytraffic.rb'
+    - 'spec/classes/mod/lbmethod_heartbeat.rb'
+    - 'spec/classes/mod/prefork_spec.rb'
+    - 'spec/classes/mod/worker_spec.rb'
+    - 'spec/classes/service_spec.rb'
+    - 'spec/defines/custom_config_spec.rb'
+    - 'spec/defines/vhost_spec.rb'
+    - 'util/apache_mod_platform_support.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Layout/HeredocIndentation:
+  Exclude:
+    - 'spec/classes/mod/http2_spec.rb'
+
+# Offense count: 15
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: leading, trailing
+Layout/LineContinuationLeadingSpace:
+  Exclude:
+    - 'spec/classes/mod/info_spec.rb'
+    - 'spec/classes/mod/jk_spec.rb'
+    - 'spec/classes/mod/proxy_balancer_spec.rb'
+    - 'spec/classes/mod/status_spec.rb'
+    - 'spec/util/apache_mod_platform_compatibility_spec.rb'
+
+# Offense count: 52
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: space, no_space
+Layout/LineContinuationSpacing:
+  Exclude:
+    - 'spec/classes/mod/deflate_spec.rb'
+    - 'spec/classes/mod/info_spec.rb'
+    - 'spec/classes/mod/jk_spec.rb'
+    - 'spec/classes/mod/ldap_spec.rb'
+    - 'spec/classes/mod/proxy_balancer_spec.rb'
+    - 'spec/classes/mod/status_spec.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/LineEndStringConcatenationIndentation:
+  Exclude:
+    - 'spec/classes/mod/deflate_spec.rb'
+    - 'spec/classes/mod/info_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'spec/acceptance/mod_php_spec.rb'
+    - 'spec/spec_helper_acceptance_local.rb'
+
+# Offense count: 5
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 126
+
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/CyclomaticComplexity:
+  Max: 13
+
+# Offense count: 7
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Max: 101
+
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/PerceivedComplexity:
+  Max: 13
+
+# Offense count: 2
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'spec/classes/mod/http2_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'spec/spec_helper_acceptance_local.rb'
+    - 'util/apache_mod_platform_support.rb'
+
+# Offense count: 2
+# Configuration parameters: MinSize.
+Performance/CollectionLiteralInLoop:
+  Exclude:
+    - 'spec/classes/mod/passenger_spec.rb'
+    - 'spec/defines/vhost_spec.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'spec/functions/bool2httpd_spec.rb'
+    - 'spec/functions/pw_hash_spec.rb'
+
+# Offense count: 393
+# Configuration parameters: Prefixes, AllowedPatterns.
+# Prefixes: when, with, without
+RSpec/ContextWording:
   Enabled: false
-RSpec/InstanceVariable:
+
+# Offense count: 95
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
   Enabled: false
-RSpec/RepeatedExample:
-  Enabled: false
-RSpec/ExpectInHook:
+
+# Offense count: 239
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowConsecutiveOneLiners.
+RSpec/EmptyLineAfterExample:
   Enabled: false
-RSpec/NamedSubject:
+
+# Offense count: 270
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/EmptyLineAfterExampleGroup:
   Enabled: false
-RSpec/VoidExpect:
+
+# Offense count: 25
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 107
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/ExcessiveDocstringSpacing:
+  Exclude:
+    - 'spec/classes/dev_spec.rb'
+    - 'spec/classes/mod/passenger_spec.rb'
+    - 'spec/classes/mod/php_spec.rb'
+    - 'spec/classes/mod/security_spec.rb'
+    - 'spec/defines/modsec_link_spec.rb'
+    - 'spec/defines/vhost_spec.rb'
+
+# Offense count: 6
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/classes/mod/lbmethod_bybusyness.rb'
+    - 'spec/classes/mod/lbmethod_byrequests.rb'
+    - 'spec/classes/mod/lbmethod_bytraffic.rb'
+    - 'spec/classes/mod/lbmethod_heartbeat.rb'
+    - 'spec/classes/mod/lookup_identity.rb'
+    - 'spec/classes/mod/proxy_wstunnel.rb'
+
+# Offense count: 292
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
+RSpec/ImplicitSubject:
   Enabled: false
-RSpec/AnyInstance:
+
+# Offense count: 16
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/LetBeforeExamples:
+  Exclude:
+    - 'spec/classes/mod/auth_kerb_spec.rb'
+    - 'spec/classes/mod/auth_openidc_spec.rb'
+    - 'spec/classes/mod/cluster_spec.rb'
+    - 'spec/classes/mod/disk_cache_spec.rb'
+    - 'spec/classes/mod/jk_spec.rb'
+    - 'spec/classes/mod/proxy_balancer_spec.rb'
+    - 'spec/classes/mod/ssl_spec.rb'
+    - 'spec/classes/mod/wsgi_spec.rb'
+    - 'spec/classes/service_spec.rb'
+
+# Offense count: 17
+RSpec/MultipleExpectations:
+  Max: 8
+
+# Offense count: 69
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 6
+
+# Offense count: 123
+# Configuration parameters: AllowedGroups.
+RSpec/NestedGroups:
+  Max: 6
+
+# Offense count: 101
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
   Enabled: false
-RSpec/FilePath:
+
+# Offense count: 8
+RSpec/RepeatedExample:
+  Exclude:
+    - 'spec/classes/apache_spec.rb'
+
+# Offense count: 19
+RSpec/RepeatedExampleGroupBody:
+  Exclude:
+    - 'spec/acceptance/apache_parameters_spec.rb'
+    - 'spec/acceptance/apache_ssl_spec.rb'
+    - 'spec/acceptance/vhost_spec.rb'
+    - 'spec/classes/mod/remoteip_spec.rb'
+    - 'spec/functions/pw_hash_spec.rb'
+
+# Offense count: 18
+RSpec/RepeatedExampleGroupDescription:
+  Exclude:
+    - 'spec/acceptance/apache_parameters_spec.rb'
+    - 'spec/acceptance/vhost_spec.rb'
+    - 'spec/classes/apache_spec.rb'
+    - 'spec/classes/mod/security_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/SharedExamples:
+  Exclude:
+    - 'spec/spec_helper_local.rb'
+
+# Offense count: 4
+RSpec/StubbedMock:
+  Exclude:
+    - 'spec/util/apache_mod_platform_compatibility_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: MinBranchesCount.
+Style/CaseLikeIf:
+  Exclude:
+    - 'spec/classes/mod/status_spec.rb'
+
+# Offense count: 12
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/CommentedKeyword:
+  Exclude:
+    - 'spec/classes/mod/authnz_ldap_spec.rb'
+    - 'spec/classes/mod/authnz_pam_spec.rb'
+    - 'spec/classes/mod/intercept_form_submit_spec.rb'
+    - 'spec/classes/mod/ldap_spec.rb'
+    - 'spec/classes/mod/lookup_identity.rb'
+    - 'spec/defines/vhost_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'spec/type_aliases/modproxy_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/GlobalStdStream:
+  Exclude:
+    - 'tasks/init.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/puppet/provider/a2mod.rb'
+    - 'spec/classes/dev_spec.rb'
+    - 'spec/spec_helper_acceptance_local.rb'
+
+# Offense count: 1
+Style/MixinUsage:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Methods.
+Style/RedundantArgument:
+  Exclude:
+    - 'spec/classes/mod/status_spec.rb'
+
+# Offense count: 247
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'spec/classes/apache_spec.rb'
+    - 'spec/classes/mod/alias_spec.rb'
+    - 'spec/classes/mod/auth_mellon_spec.rb'
+    - 'spec/classes/mod/disk_cache_spec.rb'
+    - 'spec/classes/mod/passenger_spec.rb'
+    - 'spec/classes/mod/security_spec.rb'
+    - 'spec/classes/mod/ssl_spec.rb'
+    - 'spec/classes/mod/userdir_spec.rb'
+    - 'spec/classes/mod/wsgi_spec.rb'
+    - 'spec/defines/vhost_spec.rb'
+
+# Offense count: 22
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantStringEscape:
+  Exclude:
+    - 'spec/acceptance/apache_parameters_spec.rb'
+    - 'spec/acceptance/vhost_spec.rb'
+    - 'spec/classes/mod/auth_mellon_spec.rb'
+    - 'spec/defines/vhost_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Style/StderrPuts:
+  Exclude:
+    - 'util/apache_mod_platform_support.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/puppet/functions/apache/pw_hash.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
+# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
+Style/TernaryParentheses:
+  Exclude:
+    - 'spec/defines/vhost_spec.rb'
+
+# Offense count: 259
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInHashLiteral:
   Enabled: false
-RSpec/EmptyExampleGroup:
-   Enabled: false
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ae99f4545e..f598fb3ffd 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2145,7 +2145,7 @@
         allow_override => $override,
         directoryindex => $directoryindex,
         require        => 'all granted',
-      }
+      },
     ]
   } else {
     $_directories = undef

From 367b3186f28f83e0be63ee0eb4e8bf2734c9412e Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Tue, 18 Apr 2023 17:07:52 +0100
Subject: [PATCH 2104/2267] (CONT-772) Addressing legacy fact

---
 spec/acceptance/vhost_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index fd412d9fff..fb0b975bdb 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -10,11 +10,11 @@ class { 'apache':
         default_ssl_vhost => false,
         service_ensure => stopped,
       }
-      if ($::osfamily == 'Suse' and $::operatingsystemrelease < '15') {
+      if ($facts['os']['family'] == 'Suse' and $facts['os']['release']['major'] < '15') {
         exec { '/usr/bin/gensslcert':
           require => Class['apache'],
         }
-      } elsif ($::osfamily == 'Suse' and $::operatingsystemrelease >= '15') {
+      } elsif ($facts['os']['family'] == 'Suse' and $facts['os']['release']['major'] >= '15') {
         # In SLES 15, if not given a name, gensslcert defaults the name to be the hostname
         exec { '/usr/bin/gensslcert -n default':
           require => Class['apache'],

From b8bdb964f9c42d065bbcde68217247fafec64e5d Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Wed, 19 Apr 2023 00:20:02 +0100
Subject: [PATCH 2105/2267] (CONT-772) Removing deprecated test

---
 spec/acceptance/vhost_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index fb0b975bdb..3d21aef1e3 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1135,7 +1135,6 @@ class { 'apache::mod::wsgi': }
         docroot                     => '/tmp',
         wsgi_application_group      => '%{GLOBAL}',
         wsgi_daemon_process         => { 'wsgi' => { 'python-home' => '/usr' }, 'foo' => {} },
-        wsgi_daemon_process_options => {processes => 2},
         wsgi_import_script          => '/test1',
         wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
         wsgi_process_group          => 'nobody',

From 78ef5ef5d9b891b8dc3ac0f3ad3ff21702eba8e0 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Wed, 19 Apr 2023 18:10:37 +0100
Subject: [PATCH 2106/2267] (CONT-772) Correct Layout/HashAlignment

---
 .rubocop_todo.yml                       |   47 +-
 spec/classes/apache_spec.rb             |   24 +-
 spec/classes/mod/event_spec.rb          |    2 +-
 spec/classes/mod/itk_spec.rb            |    2 +-
 spec/classes/mod/jk_spec.rb             |    4 +-
 spec/classes/mod/lbmethod_bybusyness.rb |    4 +-
 spec/classes/mod/lbmethod_byrequests.rb |    4 +-
 spec/classes/mod/lbmethod_bytraffic.rb  |    4 +-
 spec/classes/mod/lbmethod_heartbeat.rb  |    4 +-
 spec/classes/mod/prefork_spec.rb        |    2 +-
 spec/classes/mod/worker_spec.rb         |    2 +-
 spec/classes/service_spec.rb            |   40 +-
 spec/defines/custom_config_spec.rb      |   10 +-
 spec/defines/vhost_spec.rb              | 1078 +++++++++++------------
 util/apache_mod_platform_support.rb     |    4 +-
 15 files changed, 600 insertions(+), 631 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7f466f647b..6eb72d69e8 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,26 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-18 15:25:08 UTC using RuboCop version 1.48.1.
+# on 2023-04-19 16:57:14 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 12
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'spec/classes/mod/event_spec.rb'
-    - 'spec/classes/mod/itk_spec.rb'
-    - 'spec/classes/mod/lbmethod_bybusyness.rb'
-    - 'spec/classes/mod/lbmethod_byrequests.rb'
-    - 'spec/classes/mod/lbmethod_bytraffic.rb'
-    - 'spec/classes/mod/lbmethod_heartbeat.rb'
-    - 'spec/classes/mod/prefork_spec.rb'
-    - 'spec/classes/mod/worker_spec.rb'
-
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
 Layout/ClosingHeredocIndentation:
@@ -39,29 +24,6 @@ Layout/EmptyLineAfterGuardClause:
     - 'tasks/init.rb'
     - 'util/apache_mod_platform_support.rb'
 
-# Offense count: 590
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'spec/classes/apache_spec.rb'
-    - 'spec/classes/mod/event_spec.rb'
-    - 'spec/classes/mod/itk_spec.rb'
-    - 'spec/classes/mod/jk_spec.rb'
-    - 'spec/classes/mod/lbmethod_bybusyness.rb'
-    - 'spec/classes/mod/lbmethod_byrequests.rb'
-    - 'spec/classes/mod/lbmethod_bytraffic.rb'
-    - 'spec/classes/mod/lbmethod_heartbeat.rb'
-    - 'spec/classes/mod/prefork_spec.rb'
-    - 'spec/classes/mod/worker_spec.rb'
-    - 'spec/classes/service_spec.rb'
-    - 'spec/defines/custom_config_spec.rb'
-    - 'spec/defines/vhost_spec.rb'
-    - 'util/apache_mod_platform_support.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Layout/HeredocIndentation:
@@ -102,6 +64,13 @@ Layout/LineEndStringConcatenationIndentation:
     - 'spec/classes/mod/deflate_spec.rb'
     - 'spec/classes/mod/info_spec.rb'
 
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 202
+
 # Offense count: 3
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 0d5cda12ae..595df44056 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -50,13 +50,13 @@
     ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
-          'path'   => "/etc/apache2/mods-available/#{modname}.load",
+          'path' => "/etc/apache2/mods-available/#{modname}.load",
           'ensure' => 'file',
         )
       }
       it {
         is_expected.to contain_file("#{modname}.load symlink").with(
-          'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
+          'path' => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.load",
         )
@@ -121,26 +121,26 @@
     ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
-          'path'   => "/etc/apache2/mods-available/#{modname}.load",
+          'path' => "/etc/apache2/mods-available/#{modname}.load",
           'ensure' => 'file',
         )
       }
       it {
         is_expected.to contain_file("#{modname}.load symlink").with(
-          'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
+          'path' => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.load",
         )
       }
       it {
         is_expected.to contain_file("#{modname}.conf").with(
-          'path'   => "/etc/apache2/mods-available/#{modname}.conf",
+          'path' => "/etc/apache2/mods-available/#{modname}.conf",
           'ensure' => 'file',
         )
       }
       it {
         is_expected.to contain_file("#{modname}.conf symlink").with(
-          'path'   => "/etc/apache2/mods-enabled/#{modname}.conf",
+          'path' => "/etc/apache2/mods-enabled/#{modname}.conf",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.conf",
         )
@@ -167,7 +167,7 @@
     describe 'Add extra LogFormats When parameter log_formats is a hash' do
       let :params do
         { log_formats: {
-          'vhost_common'   => '%v %h %l %u %t "%r" %>s %b',
+          'vhost_common' => '%v %h %l %u %t "%r" %>s %b',
           'vhost_combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
         } }
       end
@@ -179,7 +179,7 @@
     describe 'Override existing LogFormats When parameter log_formats is a hash' do
       let :params do
         { log_formats: {
-          'common'   => '%v %h %l %u %t "%r" %>s %b',
+          'common' => '%v %h %l %u %t "%r" %>s %b',
           'combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
         } }
       end
@@ -548,7 +548,7 @@
     ['auth_basic', 'authn_core', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
-          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
+          'path' => "/usr/local/etc/apache24/Modules/#{modname}.load",
           'ensure' => 'file',
         )
       }
@@ -559,13 +559,13 @@
     ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
-          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
+          'path' => "/usr/local/etc/apache24/Modules/#{modname}.load",
           'ensure' => 'file',
         )
       }
       it {
         is_expected.to contain_file("#{modname}.conf").with(
-          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.conf",
+          'path' => "/usr/local/etc/apache24/Modules/#{modname}.conf",
           'ensure' => 'file',
         )
       }
@@ -615,7 +615,7 @@
       it {
         is_expected.to contain_package('httpd').with(
           'ensure' => 'installed',
-          'name'   => 'httpd24-httpd',
+          'name' => 'httpd24-httpd',
         ).that_notifies('Class[Apache::Service]')
       }
     end
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 2099bd5530..f5f3d4621c 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -124,7 +124,7 @@
 
     it {
       is_expected.to contain_file('/etc/httpd/conf.modules.d/event.load').with('ensure' => 'file',
-                                                                       'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
+                                                                               'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
     }
   end
 end
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 3348a4e094..c9ad07e5b4 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -50,7 +50,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.load').with('ensure' => 'file',
-                                                                       'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
+                                                                               'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
       }
     end
     context 'with enablecapabilities set' do
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 05e92e02a9..158ee18c1a 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -26,12 +26,12 @@
           'worker_a' => {
             'type' => 'ajp13',
             'socket_keepalive' => 'true',
-            'comment'          => 'This is worker A',
+            'comment' => 'This is worker A',
           },
           'worker_b' => {
             'type' => 'ajp13',
             'socket_keepalive' => 'true',
-            'comment'          => 'This is worker B',
+            'comment' => 'This is worker B',
           },
           'worker_maintain' => 40,
           'worker_lists' => ['worker_a,worker_b'],
diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb
index 94c24ad495..22eb0a8bc5 100644
--- a/spec/classes/mod/lbmethod_bybusyness.rb
+++ b/spec/classes/mod/lbmethod_bybusyness.rb
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -31,7 +31,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb
index 94c24ad495..22eb0a8bc5 100644
--- a/spec/classes/mod/lbmethod_byrequests.rb
+++ b/spec/classes/mod/lbmethod_byrequests.rb
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -31,7 +31,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb
index 94c24ad495..22eb0a8bc5 100644
--- a/spec/classes/mod/lbmethod_bytraffic.rb
+++ b/spec/classes/mod/lbmethod_bytraffic.rb
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -31,7 +31,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb
index 94c24ad495..22eb0a8bc5 100644
--- a/spec/classes/mod/lbmethod_heartbeat.rb
+++ b/spec/classes/mod/lbmethod_heartbeat.rb
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -31,7 +31,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index fa3739239c..7cd52100d1 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -29,7 +29,7 @@
     it { is_expected.not_to contain_apache__mod('event') }
     it {
       is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
+                                                                                 'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
     }
   end
   context 'on a FreeBSD OS' do
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 5f01385fd8..25f1ee8b30 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -26,7 +26,7 @@
     it { is_expected.not_to contain_apache__mod('event') }
     it {
       is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',
-                                                                        'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
+                                                                                'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
     }
   end
   context 'on a FreeBSD OS' do
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 5e9aba39f8..1b6b2e4590 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -12,9 +12,9 @@
 
     it {
       is_expected.to contain_service('httpd').with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'true',
+        'name' => 'apache2',
+        'ensure' => 'running',
+        'enable' => 'true',
       )
     }
 
@@ -33,9 +33,9 @@
 
       it {
         is_expected.to contain_service('httpd').with(
-          'name'      => 'apache2',
-          'ensure'    => 'running',
-          'enable'    => 'true',
+          'name' => 'apache2',
+          'ensure' => 'running',
+          'enable' => 'true',
         )
       }
     end
@@ -45,9 +45,9 @@
 
       it {
         is_expected.to contain_service('httpd').with(
-          'name'      => 'apache2',
-          'ensure'    => 'running',
-          'enable'    => 'false',
+          'name' => 'apache2',
+          'ensure' => 'running',
+          'enable' => 'false',
         )
       }
     end
@@ -57,8 +57,8 @@
 
       it {
         is_expected.to contain_service('httpd').with(
-          'ensure'    => 'running',
-          'enable'    => 'true',
+          'ensure' => 'running',
+          'enable' => 'true',
         )
       }
     end
@@ -68,8 +68,8 @@
 
       it {
         is_expected.to contain_service('httpd').with(
-          'ensure'    => 'stopped',
-          'enable'    => 'true',
+          'ensure' => 'stopped',
+          'enable' => 'true',
         )
       }
     end
@@ -100,7 +100,7 @@
     let(:params) do
       {
         'service_ensure' => 'running',
-        'service_name'   => 'httpd',
+        'service_name' => 'httpd',
         'service_manage' => false,
       }
     end
@@ -113,9 +113,9 @@
 
     it {
       is_expected.to contain_service('httpd').with(
-        'name'      => 'apache24',
-        'ensure'    => 'running',
-        'enable'    => 'true',
+        'name' => 'apache24',
+        'ensure' => 'running',
+        'enable' => 'true',
       )
     }
   end
@@ -125,9 +125,9 @@
 
     it {
       is_expected.to contain_service('httpd').with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'true',
+        'name' => 'apache2',
+        'ensure' => 'running',
+        'enable' => 'true',
       )
     }
   end
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 9963d6bd2c..85f03f90c8 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -40,9 +40,9 @@
   context 'set everything with source' do
     let :params do
       {
-        'confdir'        => '/dne',
-        'priority'       => 30,
-        'source'         => 'puppet:///modules/apache/test',
+        'confdir' => '/dne',
+        'priority' => 30,
+        'source' => 'puppet:///modules/apache/test',
         'verify_command' => ['/bin/true'],
       }
     end
@@ -65,7 +65,7 @@
   context 'verify_config => false' do
     let :params do
       {
-        'content'       => '# test',
+        'content' => '# test',
         'verify_config' => false,
       }
     end
@@ -90,7 +90,7 @@
       let :params do
         {
           'content' => 'foo',
-          'source'  => 'bar',
+          'source' => 'bar',
         }
       end
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b99f7b61b3..2de952ccb0 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -37,298 +37,298 @@
         context 'set everything!' do
           let :params do
             {
-              'docroot'                     => '/var/www/foo',
-              'manage_docroot'              => false,
-              'virtual_docroot'             => true,
+              'docroot' => '/var/www/foo',
+              'manage_docroot' => false,
+              'virtual_docroot' => true,
               'virtual_use_default_docroot' => false,
-              'port'                        => 8080,
-              'ip'                          => '127.0.0.1',
-              'ip_based'                    => true,
-              'add_listen'                  => false,
-              'docroot_owner'               => 'user',
-              'docroot_group'               => 'wheel',
-              'docroot_mode'                => '0664',
-              'serveradmin'                 => 'foo@localhost',
-              'ssl'                         => true,
-              'ssl_cert'                    => '/ssl/cert',
-              'ssl_key'                     => '/ssl/key',
-              'ssl_chain'                   => '/ssl/chain',
-              'ssl_crl_path'                => '/ssl/crl',
-              'ssl_crl'                     => '/ssl/foo.crl',
-              'ssl_certs_dir'               => '/ssl/certs',
-              'ssl_protocol'                => 'SSLv2',
-              'ssl_cipher'                  => 'HIGH',
-              'ssl_honorcipherorder'        => 'Off',
-              'ssl_verify_client'           => 'optional',
-              'ssl_verify_depth'            => 3,
-              'ssl_options'                 => '+ExportCertData',
-              'ssl_openssl_conf_cmd'        => 'DHParameters "foo.pem"',
-              'ssl_proxy_verify'            => 'require',
-              'ssl_proxy_check_peer_cn'     => 'on',
-              'ssl_proxy_check_peer_name'   => 'on',
+              'port' => 8080,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'add_listen' => false,
+              'docroot_owner' => 'user',
+              'docroot_group' => 'wheel',
+              'docroot_mode' => '0664',
+              'serveradmin' => 'foo@localhost',
+              'ssl' => true,
+              'ssl_cert' => '/ssl/cert',
+              'ssl_key' => '/ssl/key',
+              'ssl_chain' => '/ssl/chain',
+              'ssl_crl_path' => '/ssl/crl',
+              'ssl_crl' => '/ssl/foo.crl',
+              'ssl_certs_dir' => '/ssl/certs',
+              'ssl_protocol' => 'SSLv2',
+              'ssl_cipher' => 'HIGH',
+              'ssl_honorcipherorder' => 'Off',
+              'ssl_verify_client' => 'optional',
+              'ssl_verify_depth' => 3,
+              'ssl_options' => '+ExportCertData',
+              'ssl_openssl_conf_cmd' => 'DHParameters "foo.pem"',
+              'ssl_proxy_verify' => 'require',
+              'ssl_proxy_check_peer_cn' => 'on',
+              'ssl_proxy_check_peer_name' => 'on',
               'ssl_proxy_check_peer_expire' => 'on',
-              'ssl_proxyengine'             => true,
-              'ssl_proxy_cipher_suite'      => 'HIGH',
-              'ssl_proxy_protocol'          => 'TLSv1.2',
-              'ssl_user_name'               => 'SSL_CLIENT_S_DN_CN',
-              'ssl_reload_on_change'        => true,
-              'priority'                    => 30,
-              'default_vhost'               => true,
-              'servername'                  => 'example.com',
-              'serveraliases'               => ['test-example.com'],
-              'options'                     => ['MultiView'],
-              'override'                    => ['All'],
-              'directoryindex'              => 'index.html',
-              'vhost_name'                  => 'test',
-              'logroot'                     => '/var/www/logs',
-              'logroot_ensure'              => 'directory',
-              'logroot_mode'                => '0600',
-              'logroot_owner'               => 'root',
-              'logroot_group'               => 'root',
-              'log_level'                   => 'crit',
-              'aliases'                     => [
+              'ssl_proxyengine' => true,
+              'ssl_proxy_cipher_suite' => 'HIGH',
+              'ssl_proxy_protocol' => 'TLSv1.2',
+              'ssl_user_name' => 'SSL_CLIENT_S_DN_CN',
+              'ssl_reload_on_change' => true,
+              'priority' => 30,
+              'default_vhost' => true,
+              'servername' => 'example.com',
+              'serveraliases' => ['test-example.com'],
+              'options' => ['MultiView'],
+              'override' => ['All'],
+              'directoryindex' => 'index.html',
+              'vhost_name' => 'test',
+              'logroot' => '/var/www/logs',
+              'logroot_ensure' => 'directory',
+              'logroot_mode' => '0600',
+              'logroot_owner' => 'root',
+              'logroot_group' => 'root',
+              'log_level' => 'crit',
+              'aliases' => [
                 {
                   'alias' => '/image',
-                  'path'  => '/rspec/image',
+                  'path' => '/rspec/image',
                 },
               ],
-              'access_log'                  => false,
-              'access_log_file'             => 'httpd_access_log',
-              'access_log_syslog'           => true,
-              'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
-              'access_log_env_var'          => '',
-              'directories'                 => [
+              'access_log' => false,
+              'access_log_file' => 'httpd_access_log',
+              'access_log_syslog' => true,
+              'access_log_format' => '%h %l %u %t \"%r\" %>s %b',
+              'access_log_env_var' => '',
+              'directories' => [
                 {
-                  'path'     => '/var/www/files',
+                  'path' => '/var/www/files',
                   'provider' => 'files',
-                  'require'  => ['valid-user', 'all denied'],
+                  'require' => ['valid-user', 'all denied'],
                 },
                 {
-                  'path'     => '/var/www/files',
+                  'path' => '/var/www/files',
                   'provider' => 'files',
                   'additional_includes' => ['/custom/path/includes', '/custom/path/another_includes'],
                 },
                 {
-                  'path'     => '/var/www/files',
+                  'path' => '/var/www/files',
                   'provider' => 'files',
-                  'require'  => 'all granted',
+                  'require' => 'all granted',
                 },
                 {
-                  'path'     => '/var/www/files',
+                  'path' => '/var/www/files',
                   'provider' => 'files',
-                  'require'  =>
+                  'require' =>
                   {
-                    'enforce'  => 'all',
+                    'enforce' => 'all',
                     'requires' => ['all-valid1', 'all-valid2'],
                   },
                 },
                 {
-                  'path'     => '/var/www/files',
+                  'path' => '/var/www/files',
                   'provider' => 'files',
-                  'require'  =>
+                  'require' =>
                   {
-                    'enforce'  => 'none',
+                    'enforce' => 'none',
                     'requires' => ['none-valid1', 'none-valid2'],
                   },
                 },
                 {
-                  'path'     => '/var/www/files',
+                  'path' => '/var/www/files',
                   'provider' => 'files',
-                  'require'  =>
+                  'require' =>
                   {
-                    'enforce'  => 'any',
+                    'enforce' => 'any',
                     'requires' => ['any-valid1', 'any-valid2'],
                   },
                 },
                 {
-                  'path'     => '*',
+                  'path' => '*',
                   'provider' => 'proxy',
                 },
-                { 'path'              => '/var/www/files/indexed_directory',
-                  'directoryindex'    => 'disabled',
-                  'options'           => ['Indexes', 'FollowSymLinks', 'MultiViews'],
-                  'index_options'     => ['FancyIndexing'],
+                { 'path' => '/var/www/files/indexed_directory',
+                  'directoryindex' => 'disabled',
+                  'options' => ['Indexes', 'FollowSymLinks', 'MultiViews'],
+                  'index_options' => ['FancyIndexing'],
                   'index_style_sheet' => '/styles/style.css' },
-                { 'path'              => '/var/www/files/output_filtered',
+                { 'path' => '/var/www/files/output_filtered',
                   'set_output_filter' => 'output_filter' },
-                { 'path'              => '/var/www/files/input_filtered',
+                { 'path' => '/var/www/files/input_filtered',
                   'set_input_filter' => 'input_filter' },
-                { 'path'     => '/var/www/files',
+                { 'path' => '/var/www/files',
                   'provider' => 'location',
-                  'limit'    => [
+                  'limit' => [
                     { 'methods' => 'GET HEAD',
                       'require' => ['valid-user'] },
                   ] },
-                { 'path'         => '/var/www/files',
-                  'provider'     => 'location',
+                { 'path' => '/var/www/files',
+                  'provider' => 'location',
                   'limit_except' => [
                     { 'methods' => 'GET HEAD',
                       'require' => ['valid-user'] },
                   ] },
-                { 'path'               => '/var/www/dav',
-                  'dav'                => 'filesystem',
+                { 'path' => '/var/www/dav',
+                  'dav' => 'filesystem',
                   'dav_depth_infinity' => true,
-                  'dav_min_timeout'    => 600 },
+                  'dav_min_timeout' => 600 },
                 {
-                  'path'             => '/var/www/http2',
-                  'h2_copy_files'    => true,
+                  'path' => '/var/www/http2',
+                  'h2_copy_files' => true,
                   'h2_push_resource' => [
                     '/foo.css',
                     '/foo.js',
                   ],
                 },
                 {
-                  'path'                => '/',
-                  'provider'            => 'location',
+                  'path' => '/',
+                  'provider' => 'location',
                   'auth_ldap_referrals' => 'off',
-                  'auth_basic_fake'     => 'demo demopass',
-                  'auth_user_file'      => '/path/to/authz_user_file',
-                  'auth_group_file'     => '/path/to/authz_group_file',
-                  'setenv'              => ['SPECIAL_PATH /foo/bin'],
+                  'auth_basic_fake' => 'demo demopass',
+                  'auth_user_file' => '/path/to/authz_user_file',
+                  'auth_group_file' => '/path/to/authz_group_file',
+                  'setenv' => ['SPECIAL_PATH /foo/bin'],
                 },
                 {
-                  'path'       => '/proxy',
-                  'provider'   => 'location',
+                  'path' => '/proxy',
+                  'provider' => 'location',
                   'proxy_pass' => [
                     {
-                      'url'             => 'http://backend-b/',
-                      'keywords'        => ['noquery', 'interpolate'],
+                      'url' => 'http://backend-b/',
+                      'keywords' => ['noquery', 'interpolate'],
                       'params' => {
-                        'retry'   => 0,
+                        'retry' => 0,
                         'timeout' => 5,
                       },
                     },
                   ],
                 },
                 {
-                  'path'       => '^/proxy',
-                  'provider'   => 'locationmatch',
+                  'path' => '^/proxy',
+                  'provider' => 'locationmatch',
                   'proxy_pass_match' => [
                     {
-                      'url'             => 'http://backend-b/',
-                      'keywords'        => ['noquery', 'interpolate'],
+                      'url' => 'http://backend-b/',
+                      'keywords' => ['noquery', 'interpolate'],
                       'params' => {
-                        'retry'   => 0,
+                        'retry' => 0,
                         'timeout' => 5,
                       },
                     },
                   ],
                 },
                 {
-                  'path'                                                => '/var/www/node-app/public',
-                  'passenger_enabled'                                   => true,
-                  'passenger_base_uri'                                  => '/app',
-                  'passenger_ruby'                                      => '/path/to/ruby',
-                  'passenger_python'                                    => '/path/to/python',
-                  'passenger_nodejs'                                    => '/path/to/nodejs',
-                  'passenger_meteor_app_settings'                       => '/path/to/file.json',
-                  'passenger_app_env'                                   => 'demo',
-                  'passenger_app_root'                                  => '/var/www/node-app',
-                  'passenger_app_group_name'                            => 'foo_bar',
-                  'passenger_app_start_command'                         => 'start-command',
-                  'passenger_app_type'                                  => 'node',
-                  'passenger_startup_file'                              => 'start.js',
-                  'passenger_restart_dir'                               => 'temp',
-                  'passenger_load_shell_envvars'                        => false,
-                  'passenger_preload_bundler'                           => false,
-                  'passenger_rolling_restarts'                          => false,
-                  'passenger_resist_deployment_errors'                  => false,
-                  'passenger_user'                                      => 'nodeuser',
-                  'passenger_group'                                     => 'nodegroup',
-                  'passenger_friendly_error_pages'                      => true,
-                  'passenger_min_instances'                             => 7,
-                  'passenger_max_instances'                             => 9,
+                  'path' => '/var/www/node-app/public',
+                  'passenger_enabled' => true,
+                  'passenger_base_uri' => '/app',
+                  'passenger_ruby' => '/path/to/ruby',
+                  'passenger_python' => '/path/to/python',
+                  'passenger_nodejs' => '/path/to/nodejs',
+                  'passenger_meteor_app_settings' => '/path/to/file.json',
+                  'passenger_app_env' => 'demo',
+                  'passenger_app_root' => '/var/www/node-app',
+                  'passenger_app_group_name' => 'foo_bar',
+                  'passenger_app_start_command' => 'start-command',
+                  'passenger_app_type' => 'node',
+                  'passenger_startup_file' => 'start.js',
+                  'passenger_restart_dir' => 'temp',
+                  'passenger_load_shell_envvars' => false,
+                  'passenger_preload_bundler' => false,
+                  'passenger_rolling_restarts' => false,
+                  'passenger_resist_deployment_errors' => false,
+                  'passenger_user' => 'nodeuser',
+                  'passenger_group' => 'nodegroup',
+                  'passenger_friendly_error_pages' => true,
+                  'passenger_min_instances' => 7,
+                  'passenger_max_instances' => 9,
                   'passenger_force_max_concurrent_requests_per_process' => 12,
-                  'passenger_start_timeout'                             => 10,
-                  'passenger_concurrency_model'                         => 'thread',
-                  'passenger_thread_count'                              => 20,
-                  'passenger_max_requests'                              => 2000,
-                  'passenger_max_request_time'                          => 1,
-                  'passenger_memory_limit'                              => 32,
-                  'passenger_high_performance'                          => false,
-                  'passenger_buffer_upload'                             => false,
-                  'passenger_buffer_response'                           => false,
-                  'passenger_error_override'                            => false,
-                  'passenger_max_request_queue_size'                    => 120,
-                  'passenger_max_request_queue_time'                    => 5,
-                  'passenger_sticky_sessions'                           => true,
-                  'passenger_sticky_sessions_cookie_name'               => '_delicious_cookie',
-                  'passenger_sticky_sessions_cookie_attributes'         => 'SameSite=Lax; Secure;',
-                  'passenger_allow_encoded_slashes'                     => false,
-                  'passenger_app_log_file'                              => '/tmp/app.log',
-                  'passenger_debugger'                                  => false,
-                  'gssapi'                                              => {
-                    'acceptor_name'            => '{HOSTNAME}',
-                    'allowed_mech'             => ['krb5', 'iakerb', 'ntlmssp'],
-                    'authname'                 => 'Kerberos 5',
-                    'authtype'                 => 'GSSAPI',
-                    'basic_auth'               => true,
-                    'basic_auth_mech'          => ['krb5', 'iakerb', 'ntlmssp'],
-                    'basic_ticket_timeout'     => 300,
-                    'connection_bound'         => true,
-                    'cred_store'               => {
-                      'ccache'        => ['/path/to/directory'],
+                  'passenger_start_timeout' => 10,
+                  'passenger_concurrency_model' => 'thread',
+                  'passenger_thread_count' => 20,
+                  'passenger_max_requests' => 2000,
+                  'passenger_max_request_time' => 1,
+                  'passenger_memory_limit' => 32,
+                  'passenger_high_performance' => false,
+                  'passenger_buffer_upload' => false,
+                  'passenger_buffer_response' => false,
+                  'passenger_error_override' => false,
+                  'passenger_max_request_queue_size' => 120,
+                  'passenger_max_request_queue_time' => 5,
+                  'passenger_sticky_sessions' => true,
+                  'passenger_sticky_sessions_cookie_name' => '_delicious_cookie',
+                  'passenger_sticky_sessions_cookie_attributes' => 'SameSite=Lax; Secure;',
+                  'passenger_allow_encoded_slashes' => false,
+                  'passenger_app_log_file' => '/tmp/app.log',
+                  'passenger_debugger' => false,
+                  'gssapi' => {
+                    'acceptor_name' => '{HOSTNAME}',
+                    'allowed_mech' => ['krb5', 'iakerb', 'ntlmssp'],
+                    'authname' => 'Kerberos 5',
+                    'authtype' => 'GSSAPI',
+                    'basic_auth' => true,
+                    'basic_auth_mech' => ['krb5', 'iakerb', 'ntlmssp'],
+                    'basic_ticket_timeout' => 300,
+                    'connection_bound' => true,
+                    'cred_store' => {
+                      'ccache' => ['/path/to/directory'],
                       'client_keytab' => ['/path/to/example.keytab'],
-                      'keytab'        => ['/path/to/example.keytab'],
+                      'keytab' => ['/path/to/example.keytab'],
                     },
-                    'deleg_ccache_dir'         => '/path/to/directory',
-                    'deleg_ccache_env_var'     => 'KRB5CCNAME',
-                    'deleg_ccache_perms'       => {
+                    'deleg_ccache_dir' => '/path/to/directory',
+                    'deleg_ccache_env_var' => 'KRB5CCNAME',
+                    'deleg_ccache_perms' => {
                       'mode' => '0600',
-                      'uid'  => 'example-user',
-                      'gid'  => 'example-group',
+                      'uid' => 'example-user',
+                      'gid' => 'example-group',
                     },
-                    'deleg_ccache_unique'      => true,
-                    'impersonate'              => true,
-                    'local_name'               => true,
-                    'name_attributes'          => 'json',
-                    'negotiate_once'           => true,
-                    'publish_errors'           => true,
-                    'publish_mech'             => true,
+                    'deleg_ccache_unique' => true,
+                    'impersonate' => true,
+                    'local_name' => true,
+                    'name_attributes' => 'json',
+                    'negotiate_once' => true,
+                    'publish_errors' => true,
+                    'publish_mech' => true,
                     'required_name_attributes' =>	'auth-indicators=high',
-                    'session_key'              => 'file:/path/to/example.key',
-                    'signal_persistent_auth'   => true,
-                    'ssl_only'                 => true,
-                    'use_s4u2_proxy'           => true,
-                    'use_sessions'             => true,
+                    'session_key' => 'file:/path/to/example.key',
+                    'signal_persistent_auth' => true,
+                    'ssl_only' => true,
+                    'use_s4u2_proxy' => true,
+                    'use_sessions' => true,
                   },
                 },
                 {
-                  'path'              => '/private_1',
-                  'provider'          => 'location',
-                  'ssl_options'       => ['+ExportCertData', '+StdEnvVars'],
+                  'path' => '/private_1',
+                  'provider' => 'location',
+                  'ssl_options' => ['+ExportCertData', '+StdEnvVars'],
                   'ssl_verify_client' => 'optional',
-                  'ssl_verify_depth'  => 10,
+                  'ssl_verify_depth' => 10,
                 },
               ],
-              'error_log'                   => false,
-              'error_log_file'              => 'httpd_error_log',
-              'error_log_syslog'            => true,
-              'error_log_format'            => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
-              'error_documents'             => 'true',
-              'fallbackresource'            => '/index.php',
-              'scriptalias'                 => '/usr/lib/cgi-bin',
-              'scriptaliases'               => [
+              'error_log' => false,
+              'error_log_file' => 'httpd_error_log',
+              'error_log_syslog' => true,
+              'error_log_format' => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
+              'error_documents' => 'true',
+              'fallbackresource' => '/index.php',
+              'scriptalias' => '/usr/lib/cgi-bin',
+              'scriptaliases' => [
                 {
                   'alias' => '/myscript',
-                  'path'  => '/usr/share/myscript',
+                  'path' => '/usr/share/myscript',
                 },
                 {
                   'aliasmatch' => '^/foo(.*)',
-                  'path'       => '/usr/share/fooscripts$1',
+                  'path' => '/usr/share/fooscripts$1',
                 },
               ],
-              'limitreqfieldsize'           => 8190,
-              'limitreqfields'              => 100,
-              'limitreqline'                => 8190,
-              'limitreqbody'                => 0,
-              'proxy_dest'                  => '/',
-              'proxy_pass'                  => [
+              'limitreqfieldsize' => 8190,
+              'limitreqfields' => 100,
+              'limitreqline' => 8190,
+              'limitreqbody' => 0,
+              'proxy_dest' => '/',
+              'proxy_pass' => [
                 {
-                  'path'            => '/a',
-                  'url'             => 'http://backend-a/',
-                  'keywords'        => ['noquery', 'interpolate'],
-                  'no_proxy_uris'       => ['/a/foo', '/a/bar'],
+                  'path' => '/a',
+                  'url' => 'http://backend-a/',
+                  'keywords' => ['noquery', 'interpolate'],
+                  'no_proxy_uris' => ['/a/foo', '/a/bar'],
                   'no_proxy_uris_match' => ['/a/foomatch'],
                   'reverse_cookies' => [
                     {
@@ -337,47 +337,47 @@
                     },
                     {
                       'domain' => 'foo',
-                      'url'    => 'http://foo',
+                      'url' => 'http://foo',
                     },
                   ],
                   'params' => {
-                    'retry'   => 0,
+                    'retry' => 0,
                     'timeout' => 5,
                   },
-                  'setenv'   => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
+                  'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
                 },
               ],
               'proxy_pass_match' => [
                 {
-                  'path'     => '/a',
-                  'url'      => 'http://backend-a/',
+                  'path' => '/a',
+                  'url' => 'http://backend-a/',
                   'keywords' => ['noquery', 'interpolate'],
-                  'no_proxy_uris'       => ['/a/foo', '/a/bar'],
+                  'no_proxy_uris' => ['/a/foo', '/a/bar'],
                   'no_proxy_uris_match' => ['/a/foomatch'],
                   'params' => {
-                    'retry'   => 0,
+                    'retry' => 0,
                     'timeout' => 5,
                   },
                   'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
                 },
               ],
-              'proxy_requests'              => false,
-              'php_admin_flags'             => ['foo', 'bar'],
-              'php_admin_values'            => ['true', 'false'],
-              'no_proxy_uris'               => '/foo',
-              'no_proxy_uris_match'         => '/foomatch',
-              'proxy_preserve_host'         => true,
-              'proxy_add_headers'           => true,
-              'proxy_error_override'        => true,
-              'redirect_source'             => '/bar',
-              'redirect_dest'               => '/',
-              'redirect_status'             => 'temp',
-              'redirectmatch_status'        => ['404'],
-              'redirectmatch_regexp'        => ['\.git$'],
-              'redirectmatch_dest'          => ['http://www.example.com'],
-              'headers'                     => ['Set X-Robots-Tag "noindex, noarchive, nosnippet"'],
-              'request_headers'             => ['append MirrorID "mirror 12"'],
-              'rewrites'                    => [
+              'proxy_requests' => false,
+              'php_admin_flags' => ['foo', 'bar'],
+              'php_admin_values' => ['true', 'false'],
+              'no_proxy_uris' => '/foo',
+              'no_proxy_uris_match' => '/foomatch',
+              'proxy_preserve_host' => true,
+              'proxy_add_headers' => true,
+              'proxy_error_override' => true,
+              'redirect_source' => '/bar',
+              'redirect_dest' => '/',
+              'redirect_status' => 'temp',
+              'redirectmatch_status' => ['404'],
+              'redirectmatch_regexp' => ['\.git$'],
+              'redirectmatch_dest' => ['http://www.example.com'],
+              'headers' => ['Set X-Robots-Tag "noindex, noarchive, nosnippet"'],
+              'request_headers' => ['append MirrorID "mirror 12"'],
+              'rewrites' => [
                 {
                   'rewrite_rule' => ['^index.html$ rewrites.html'],
                 },
@@ -391,142 +391,142 @@
                 'FilterChain COMPRESS',
                 'FilterProtocol COMPRESS  DEFLATE change=yes;byteranges=no',
               ],
-              'rewrite_base'                => '/',
-              'rewrite_rule'                => '^index.html$ welcome.html',
-              'rewrite_cond'                => ['%{HTTP_USER_AGENT} ^MSIE'],
-              'rewrite_inherit'             => true,
-              'setenv'                      => ['FOO=/bin/true'],
-              'setenvif'                    => 'Request_URI "\.gif$" object_is_image=gif',
-              'setenvifnocase'              => 'REMOTE_ADDR ^127.0.0.1 localhost=true',
-              'block'                       => 'scm',
-              'wsgi_application_group'      => '%{GLOBAL}',
-              'wsgi_daemon_process'         => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
+              'rewrite_base' => '/',
+              'rewrite_rule' => '^index.html$ welcome.html',
+              'rewrite_cond' => ['%{HTTP_USER_AGENT} ^MSIE'],
+              'rewrite_inherit' => true,
+              'setenv' => ['FOO=/bin/true'],
+              'setenvif' => 'Request_URI "\.gif$" object_is_image=gif',
+              'setenvifnocase' => 'REMOTE_ADDR ^127.0.0.1 localhost=true',
+              'block' => 'scm',
+              'wsgi_application_group' => '%{GLOBAL}',
+              'wsgi_daemon_process' => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
               'wsgi_daemon_process_options' => {
-                'processes'    => 2,
-                'threads'      => 15,
+                'processes' => 2,
+                'threads' => 15,
                 'display-name' => '%{GROUP}',
               },
-              'wsgi_import_script'          => '/var/www/demo.wsgi',
-              'wsgi_import_script_options'  => {
-                'process-group'     => 'wsgi',
+              'wsgi_import_script' => '/var/www/demo.wsgi',
+              'wsgi_import_script_options' => {
+                'process-group' => 'wsgi',
                 'application-group' => '%{GLOBAL}',
               },
-              'wsgi_process_group'          => 'wsgi',
-              'wsgi_script_aliases'         => {
+              'wsgi_process_group' => 'wsgi',
+              'wsgi_script_aliases' => {
                 '/' => '/var/www/demo.wsgi',
               },
               'wsgi_script_aliases_match' => {
                 '^/test/(^[/*)' => '/var/www/demo.wsgi',
               },
-              'wsgi_pass_authorization'     => 'On',
-              'custom_fragment'             => '#custom string',
-              'itk'                         => {
-                'user'  => 'someuser',
+              'wsgi_pass_authorization' => 'On',
+              'custom_fragment' => '#custom string',
+              'itk' => {
+                'user' => 'someuser',
                 'group' => 'somegroup',
               },
-              'wsgi_chunked_request'        => 'On',
-              'action'                      => 'foo',
-              'additional_includes'         => '/custom/path/includes',
-              'use_optional_includes'       => true,
-              'suexec_user_group'           => 'root root',
-              'allow_encoded_slashes'       => 'nodecode',
-              'use_canonical_name'          => 'dns',
-
-              'h2_copy_files'               => false,
-              'h2_direct'                   => true,
-              'h2_early_hints'              => false,
-              'h2_max_session_streams'      => 100,
-              'h2_modern_tls_only'          => true,
-              'h2_push'                     => true,
-              'h2_push_diary_size'          => 256,
-              'h2_push_priority'            => [
+              'wsgi_chunked_request' => 'On',
+              'action' => 'foo',
+              'additional_includes' => '/custom/path/includes',
+              'use_optional_includes' => true,
+              'suexec_user_group' => 'root root',
+              'allow_encoded_slashes' => 'nodecode',
+              'use_canonical_name' => 'dns',
+
+              'h2_copy_files' => false,
+              'h2_direct' => true,
+              'h2_early_hints' => false,
+              'h2_max_session_streams' => 100,
+              'h2_modern_tls_only' => true,
+              'h2_push' => true,
+              'h2_push_diary_size' => 256,
+              'h2_push_priority' => [
                 'application/json 32',
               ],
               'h2_push_resource' => [
                 '/css/main.css',
                 '/js/main.js',
               ],
-              'h2_serialize_headers'        => false,
-              'h2_stream_max_mem_size'      => 65_536,
-              'h2_tls_cool_down_secs'       => 1,
-              'h2_tls_warm_up_size'         => 1_048_576,
-              'h2_upgrade'                  => true,
-              'h2_window_size'              => 65_535,
-
-              'passenger_enabled'                     => false,
-              'passenger_base_uri'                    => '/app',
-              'passenger_ruby'                        => '/usr/bin/ruby1.9.1',
-              'passenger_python'                      => '/usr/local/bin/python',
-              'passenger_nodejs'                      => '/usr/bin/node',
-              'passenger_meteor_app_settings'         => '/path/to/some/file.json',
-              'passenger_app_env'                     => 'test',
-              'passenger_app_root'                    => '/usr/share/myapp',
-              'passenger_app_group_name'              => 'app_customer',
-              'passenger_app_start_command'           => 'start-my-app',
-              'passenger_app_type'                    => 'rack',
-              'passenger_startup_file'                => 'bin/www',
-              'passenger_restart_dir'                 => 'tmp',
-              'passenger_spawn_method'                => 'direct',
-              'passenger_load_shell_envvars'          => false,
-              'passenger_preload_bundler'             => false,
-              'passenger_rolling_restarts'            => false,
-              'passenger_resist_deployment_errors'    => true,
-              'passenger_user'                        => 'sandbox',
-              'passenger_group'                       => 'sandbox',
-              'passenger_friendly_error_pages'        => false,
-              'passenger_min_instances'               => 1,
-              'passenger_max_instances'               => 30,
-              'passenger_max_preloader_idle_time'     => 600,
+              'h2_serialize_headers' => false,
+              'h2_stream_max_mem_size' => 65_536,
+              'h2_tls_cool_down_secs' => 1,
+              'h2_tls_warm_up_size' => 1_048_576,
+              'h2_upgrade' => true,
+              'h2_window_size' => 65_535,
+
+              'passenger_enabled' => false,
+              'passenger_base_uri' => '/app',
+              'passenger_ruby' => '/usr/bin/ruby1.9.1',
+              'passenger_python' => '/usr/local/bin/python',
+              'passenger_nodejs' => '/usr/bin/node',
+              'passenger_meteor_app_settings' => '/path/to/some/file.json',
+              'passenger_app_env' => 'test',
+              'passenger_app_root' => '/usr/share/myapp',
+              'passenger_app_group_name' => 'app_customer',
+              'passenger_app_start_command' => 'start-my-app',
+              'passenger_app_type' => 'rack',
+              'passenger_startup_file' => 'bin/www',
+              'passenger_restart_dir' => 'tmp',
+              'passenger_spawn_method' => 'direct',
+              'passenger_load_shell_envvars' => false,
+              'passenger_preload_bundler' => false,
+              'passenger_rolling_restarts' => false,
+              'passenger_resist_deployment_errors' => true,
+              'passenger_user' => 'sandbox',
+              'passenger_group' => 'sandbox',
+              'passenger_friendly_error_pages' => false,
+              'passenger_min_instances' => 1,
+              'passenger_max_instances' => 30,
+              'passenger_max_preloader_idle_time' => 600,
               'passenger_force_max_concurrent_requests_per_process' => 10,
-              'passenger_start_timeout'               => 600,
-              'passenger_concurrency_model'           => 'thread',
-              'passenger_thread_count'                => 5,
-              'passenger_max_requests'                => 1000,
-              'passenger_max_request_time'            => 2,
-              'passenger_memory_limit'                => 64,
-              'passenger_stat_throttle_rate'          => 5,
-              'passenger_pre_start'                   => 'http://localhost/myapp',
-              'passenger_high_performance'            => true,
-              'passenger_buffer_upload'               => false,
-              'passenger_buffer_response'             => false,
-              'passenger_error_override'              => true,
-              'passenger_max_request_queue_size'      => 10,
-              'passenger_max_request_queue_time'      => 2,
-              'passenger_sticky_sessions'             => true,
+              'passenger_start_timeout' => 600,
+              'passenger_concurrency_model' => 'thread',
+              'passenger_thread_count' => 5,
+              'passenger_max_requests' => 1000,
+              'passenger_max_request_time' => 2,
+              'passenger_memory_limit' => 64,
+              'passenger_stat_throttle_rate' => 5,
+              'passenger_pre_start' => 'http://localhost/myapp',
+              'passenger_high_performance' => true,
+              'passenger_buffer_upload' => false,
+              'passenger_buffer_response' => false,
+              'passenger_error_override' => true,
+              'passenger_max_request_queue_size' => 10,
+              'passenger_max_request_queue_time' => 2,
+              'passenger_sticky_sessions' => true,
               'passenger_sticky_sessions_cookie_name' => '_nom_nom_nom',
               'passenger_sticky_sessions_cookie_attributes' => 'Nom=nom; Secure;',
-              'passenger_allow_encoded_slashes'       => true,
-              'passenger_app_log_file'                => '/app/log/file',
-              'passenger_debugger'                    => true,
-              'passenger_lve_min_uid'                 => 500,
-              'add_default_charset'         => 'UTF-8',
-              'jk_mounts'                   => [
+              'passenger_allow_encoded_slashes' => true,
+              'passenger_app_log_file' => '/app/log/file',
+              'passenger_debugger' => true,
+              'passenger_lve_min_uid' => 500,
+              'add_default_charset' => 'UTF-8',
+              'jk_mounts' => [
                 { 'mount'   => '/*',     'worker' => 'tcnode1' },
                 { 'unmount' => '/*.jpg', 'worker' => 'tcnode1' },
               ],
-              'auth_kerb'                   => true,
-              'krb_method_negotiate'        => 'off',
-              'krb_method_k5passwd'         => 'off',
-              'krb_authoritative'           => 'off',
-              'krb_auth_realms'             => ['EXAMPLE.ORG', 'EXAMPLE.NET'],
-              'krb_5keytab'                 => '/tmp/keytab5',
-              'krb_local_user_mapping'      => 'off',
+              'auth_kerb' => true,
+              'krb_method_negotiate' => 'off',
+              'krb_method_k5passwd' => 'off',
+              'krb_authoritative' => 'off',
+              'krb_auth_realms' => ['EXAMPLE.ORG', 'EXAMPLE.NET'],
+              'krb_5keytab' => '/tmp/keytab5',
+              'krb_local_user_mapping' => 'off',
               'http_protocol_options' => 'Strict LenientMethods Allow0.9',
-              'keepalive'                   => 'on',
-              'keepalive_timeout'           => 100,
-              'max_keepalive_requests'      => 1000,
-              'protocols'                   => ['h2', 'http/1.1'],
-              'protocols_honor_order'       => true,
-              'auth_oidc'                   => true,
-              'oidc_settings'               => { 'ProviderMetadataURL'       => 'https://login.example.com/.well-known/openid-configuration',
-                                                 'ClientID'                  => 'test',
-                                                 'RedirectURI'               => 'https://login.example.com/redirect_uri',
-                                                 'ProviderTokenEndpointAuth' => 'client_secret_basic',
-                                                 'RemoteUserClaim'           => 'sub',
-                                                 'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
-                                                 'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
-              'mdomain'                     => 'example.com example.net auto',
-              'userdir'                     => 'disabled',
+              'keepalive' => 'on',
+              'keepalive_timeout' => 100,
+              'max_keepalive_requests' => 1000,
+              'protocols' => ['h2', 'http/1.1'],
+              'protocols_honor_order' => true,
+              'auth_oidc' => true,
+              'oidc_settings' => { 'ProviderMetadataURL' => 'https://login.example.com/.well-known/openid-configuration',
+                                   'ClientID' => 'test',
+                                   'RedirectURI' => 'https://login.example.com/redirect_uri',
+                                   'ProviderTokenEndpointAuth' => 'client_secret_basic',
+                                   'RemoteUserClaim' => 'sub',
+                                   'ClientSecret' => 'aae053a9-4abf-4824-8956-e94b2af335c8',
+                                   'CryptoPassphrase' => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
+              'mdomain' => 'example.com example.net auto',
+              'userdir' => 'disabled',
             }
           end
 
@@ -575,9 +575,9 @@
           it { is_expected.to contain_class('apache::mod::wsgi') }
           it {
             is_expected.to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
-                                                                            'mode'    => '0644',
+                                                                            'mode' => '0644',
                                                                             'require' => 'Package[httpd]',
-                                                                            'notify'  => 'Class[Apache::Service]')
+                                                                            'notify' => 'Class[Apache::Service]')
           }
           if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu'
             it {
@@ -907,24 +907,24 @@
         context 'vhost with proxy_add_headers true' do
           let :params do
             {
-              'docroot'                     => '/var/www/foo',
-              'manage_docroot'              => false,
-              'virtual_docroot'             => true,
+              'docroot' => '/var/www/foo',
+              'manage_docroot' => false,
+              'virtual_docroot' => true,
               'virtual_use_default_docroot' => false,
-              'port'                        => 8080,
-              'ip'                          => '127.0.0.1',
-              'ip_based'                    => true,
-              'add_listen'                  => false,
-              'serveradmin'                 => 'foo@localhost',
-              'priority'                    => 30,
-              'default_vhost'               => true,
-              'servername'                  => 'example.com',
-              'serveraliases'               => ['test-example.com'],
-              'options'                     => ['MultiView'],
-              'override'                    => ['All'],
-              'directoryindex'              => 'index.html',
-              'vhost_name'                  => 'test',
-              'proxy_add_headers'           => true,
+              'port' => 8080,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'add_listen' => false,
+              'serveradmin' => 'foo@localhost',
+              'priority' => 30,
+              'default_vhost' => true,
+              'servername' => 'example.com',
+              'serveraliases' => ['test-example.com'],
+              'options' => ['MultiView'],
+              'override' => ['All'],
+              'directoryindex' => 'index.html',
+              'vhost_name' => 'test',
+              'proxy_add_headers' => true,
             }
           end
 
@@ -934,24 +934,24 @@
         context 'vhost with proxy_add_headers false' do
           let :params do
             {
-              'docroot'                     => '/var/www/foo',
-              'manage_docroot'              => false,
-              'virtual_docroot'             => true,
+              'docroot' => '/var/www/foo',
+              'manage_docroot' => false,
+              'virtual_docroot' => true,
               'virtual_use_default_docroot' => false,
-              'port'                        => 8080,
-              'ip'                          => '127.0.0.1',
-              'ip_based'                    => true,
-              'add_listen'                  => false,
-              'serveradmin'                 => 'foo@localhost',
-              'priority'                    => 30,
-              'default_vhost'               => true,
-              'servername'                  => 'example.com',
-              'serveraliases'               => ['test-example.com'],
-              'options'                     => ['MultiView'],
-              'override'                    => ['All'],
-              'directoryindex'              => 'index.html',
-              'vhost_name'                  => 'test',
-              'proxy_add_headers'           => false,
+              'port' => 8080,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'add_listen' => false,
+              'serveradmin' => 'foo@localhost',
+              'priority' => 30,
+              'default_vhost' => true,
+              'servername' => 'example.com',
+              'serveraliases' => ['test-example.com'],
+              'options' => ['MultiView'],
+              'override' => ['All'],
+              'directoryindex' => 'index.html',
+              'vhost_name' => 'test',
+              'proxy_add_headers' => false,
             }
           end
 
@@ -961,23 +961,23 @@
         context 'vhost without proxy' do
           let :params do
             {
-              'docroot'                     => '/var/www/foo',
-              'manage_docroot'              => false,
-              'virtual_docroot'             => true,
+              'docroot' => '/var/www/foo',
+              'manage_docroot' => false,
+              'virtual_docroot' => true,
               'virtual_use_default_docroot' => false,
-              'port'                        => 8080,
-              'ip'                          => '127.0.0.1',
-              'ip_based'                    => true,
-              'add_listen'                  => false,
-              'serveradmin'                 => 'foo@localhost',
-              'priority'                    => 30,
-              'default_vhost'               => true,
-              'servername'                  => 'example.com',
-              'serveraliases'               => ['test-example.com'],
-              'options'                     => ['MultiView'],
-              'override'                    => ['All'],
-              'directoryindex'              => 'index.html',
-              'vhost_name'                  => 'test',
+              'port' => 8080,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'add_listen' => false,
+              'serveradmin' => 'foo@localhost',
+              'priority' => 30,
+              'default_vhost' => true,
+              'servername' => 'example.com',
+              'serveraliases' => ['test-example.com'],
+              'options' => ['MultiView'],
+              'override' => ['All'],
+              'directoryindex' => 'index.html',
+              'vhost_name' => 'test',
             }
           end
 
@@ -987,24 +987,24 @@
         context 'vhost without proxy_add_headers' do
           let :params do
             {
-              'docroot'                     => '/var/www/foo',
-              'manage_docroot'              => false,
-              'virtual_docroot'             => true,
+              'docroot' => '/var/www/foo',
+              'manage_docroot' => false,
+              'virtual_docroot' => true,
               'virtual_use_default_docroot' => false,
-              'port'                        => 8080,
-              'ip'                          => '127.0.0.1',
-              'ip_based'                    => true,
-              'add_listen'                  => false,
-              'serveradmin'                 => 'foo@localhost',
-              'priority'                    => 30,
-              'default_vhost'               => true,
-              'servername'                  => 'example.com',
-              'serveraliases'               => ['test-example.com'],
-              'options'                     => ['MultiView'],
-              'override'                    => ['All'],
-              'directoryindex'              => 'index.html',
-              'vhost_name'                  => 'test',
-              'proxy_preserve_host'         => true,
+              'port' => 8080,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'add_listen' => false,
+              'serveradmin' => 'foo@localhost',
+              'priority' => 30,
+              'default_vhost' => true,
+              'servername' => 'example.com',
+              'serveraliases' => ['test-example.com'],
+              'options' => ['MultiView'],
+              'override' => ['All'],
+              'directoryindex' => 'index.html',
+              'vhost_name' => 'test',
+              'proxy_preserve_host' => true,
             }
           end
 
@@ -1014,14 +1014,14 @@
         context 'vhost with scheme and port in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => 80,
-              'ip'                            => '127.0.0.1',
-              'ip_based'                      => true,
-              'servername'                    => 'https://www.example.com:443',
-              'docroot'                       => '/var/www/html',
-              'add_listen'                    => true,
-              'ensure'                        => 'present',
-              'use_servername_for_filenames'  => true
+              'port' => 80,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'servername' => 'https://www.example.com:443',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
+              'use_servername_for_filenames' => true
             }
           end
 
@@ -1038,14 +1038,14 @@
         context 'vhost with scheme in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => 80,
-              'ip'                            => '127.0.0.1',
-              'ip_based'                      => true,
-              'servername'                    => 'https://www.example.com',
-              'docroot'                       => '/var/www/html',
-              'add_listen'                    => true,
-              'ensure'                        => 'present',
-              'use_servername_for_filenames'  => true
+              'port' => 80,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'servername' => 'https://www.example.com',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
+              'use_servername_for_filenames' => true
             }
           end
 
@@ -1062,14 +1062,14 @@
         context 'vhost with port in servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => 80,
-              'ip'                            => '127.0.0.1',
-              'ip_based'                      => true,
-              'servername'                    => 'www.example.com:443',
-              'docroot'                       => '/var/www/html',
-              'add_listen'                    => true,
-              'ensure'                        => 'present',
-              'use_servername_for_filenames'  => true
+              'port' => 80,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'servername' => 'www.example.com:443',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
+              'use_servername_for_filenames' => true
             }
           end
 
@@ -1086,14 +1086,14 @@
         context 'vhost with servername and use_servername_for_filenames' do
           let :params do
             {
-              'port'                          => 80,
-              'ip'                            => '127.0.0.1',
-              'ip_based'                      => true,
-              'servername'                    => 'www.example.com',
-              'docroot'                       => '/var/www/html',
-              'add_listen'                    => true,
-              'ensure'                        => 'present',
-              'use_servername_for_filenames'  => true
+              'port' => 80,
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'servername' => 'www.example.com',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
+              'use_servername_for_filenames' => true
             }
           end
 
@@ -1110,13 +1110,13 @@
         context 'vhost with multiple ip addresses' do
           let :params do
             {
-              'port'                        => 80,
-              'ip'                          => ['127.0.0.1', '::1'],
-              'ip_based'                    => true,
-              'servername'                  => 'example.com',
-              'docroot'                     => '/var/www/html',
-              'add_listen'                  => true,
-              'ensure'                      => 'present',
+              'port' => 80,
+              'ip' => ['127.0.0.1', '::1'],
+              'ip_based' => true,
+              'servername' => 'example.com',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
             }
           end
 
@@ -1135,13 +1135,13 @@
         context 'vhost with multiple ports' do
           let :params do
             {
-              'port'                        => [80, 8080],
-              'ip'                          => '127.0.0.1',
-              'ip_based'                    => true,
-              'servername'                  => 'example.com',
-              'docroot'                     => '/var/www/html',
-              'add_listen'                  => true,
-              'ensure'                      => 'present',
+              'port' => [80, 8080],
+              'ip' => '127.0.0.1',
+              'ip_based' => true,
+              'servername' => 'example.com',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
             }
           end
 
@@ -1160,13 +1160,13 @@
         context 'vhost with multiple ip addresses, multiple ports' do
           let :params do
             {
-              'port'                        => [80, 8080],
-              'ip'                          => ['127.0.0.1', '::1'],
-              'ip_based'                    => true,
-              'servername'                  => 'example.com',
-              'docroot'                     => '/var/www/html',
-              'add_listen'                  => true,
-              'ensure'                      => 'present',
+              'port' => [80, 8080],
+              'ip' => ['127.0.0.1', '::1'],
+              'ip_based' => true,
+              'servername' => 'example.com',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
             }
           end
 
@@ -1189,13 +1189,13 @@
         context 'vhost with ipv6 address' do
           let :params do
             {
-              'port'                        => 80,
-              'ip'                          => '::1',
-              'ip_based'                    => true,
-              'servername'                  => 'example.com',
-              'docroot'                     => '/var/www/html',
-              'add_listen'                  => true,
-              'ensure'                      => 'present',
+              'port' => 80,
+              'ip' => '::1',
+              'ip_based' => true,
+              'servername' => 'example.com',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
             }
           end
 
@@ -1212,13 +1212,13 @@
         context 'vhost with wildcard ip address' do
           let :params do
             {
-              'port'                        => 80,
-              'ip'                          => '*',
-              'ip_based'                    => true,
-              'servername'                  => 'example.com',
-              'docroot'                     => '/var/www/html',
-              'add_listen'                  => true,
-              'ensure'                      => 'present',
+              'port' => 80,
+              'ip' => '*',
+              'ip_based' => true,
+              'servername' => 'example.com',
+              'docroot' => '/var/www/html',
+              'add_listen' => true,
+              'ensure' => 'present',
             }
           end
 
@@ -1235,7 +1235,7 @@
         context 'vhost with backwards compatible virtual_docroot' do
           let :params do
             {
-              'docroot'         => '/var/www/html',
+              'docroot' => '/var/www/html',
               'virtual_docroot' => '/var/www/sites/%0',
             }
           end
@@ -1255,9 +1255,9 @@
         context 'vhost with virtual_docroot and docroot' do
           let :params do
             {
-              'docroot'                     => '/var/www/html',
+              'docroot' => '/var/www/html',
               'virtual_use_default_docroot' => true,
-              'virtual_docroot'             => '/var/www/sites/%0',
+              'virtual_docroot' => '/var/www/sites/%0',
             }
           end
 
@@ -1277,7 +1277,7 @@
         context 'modsec_audit_log' do
           let :params do
             {
-              'docroot'          => '/rspec/docroot',
+              'docroot' => '/rspec/docroot',
               'modsec_audit_log' => true,
             }
           end
@@ -1292,7 +1292,7 @@
         context 'modsec_audit_log_file' do
           let :params do
             {
-              'docroot'               => '/rspec/docroot',
+              'docroot' => '/rspec/docroot',
               'modsec_audit_log_file' => 'foo.log',
             }
           end
@@ -1308,8 +1308,8 @@
         context 'modsec_anomaly_threshold' do
           let :params do
             {
-              'docroot'                           => '/rspec/docroot',
-              'modsec_inbound_anomaly_threshold'  => 10_000,
+              'docroot' => '/rspec/docroot',
+              'modsec_inbound_anomaly_threshold' => 10_000,
               'modsec_outbound_anomaly_threshold' => 10_000,
             }
           end
@@ -1334,7 +1334,7 @@
         context 'modsec_allowed_methods' do
           let :params do
             {
-              'docroot'                => '/rspec/docroot',
+              'docroot' => '/rspec/docroot',
               'modsec_allowed_methods' => 'GET HEAD POST OPTIONS',
             }
           end
@@ -1361,7 +1361,7 @@
               'aliases' => [
                 {
                   'alias' => '/alias',
-                  'path'  => '/rspec/docroot',
+                  'path' => '/rspec/docroot',
                 },
               ],
             }
@@ -1375,9 +1375,9 @@
               'docroot' => '/rspec/docroot',
               'proxy_pass_match' => [
                 {
-                  'path'     => '.*',
-                  'url'      => 'http://backend-a/',
-                  'params'   => { 'timeout' => 300 },
+                  'path' => '.*',
+                  'url' => 'http://backend-a/',
+                  'params' => { 'timeout' => 300 },
                 },
               ],
             }
@@ -1393,7 +1393,7 @@
         context 'proxy_dest_match and no proxy_dest_reverse_match' do
           let :params do
             {
-              'docroot'          => '/rspec/docroot',
+              'docroot' => '/rspec/docroot',
               'proxy_dest_match' => '/',
             }
           end
@@ -1406,8 +1406,8 @@
         context 'proxy_dest_match and proxy_dest_reverse_match' do
           let :params do
             {
-              'docroot'                  => '/rspec/docroot',
-              'proxy_dest_match'         => '/',
+              'docroot' => '/rspec/docroot',
+              'proxy_dest_match' => '/',
               'proxy_dest_reverse_match' => 'http://localhost:8180',
             }
           end
@@ -1421,12 +1421,12 @@
           let :params do
             {
               'access_log_pipe' => '/dev/null',
-              'error_log_pipe'  => '/dev/null',
-              'docroot'         => '/var/www/foo',
-              'ensure'          => 'absent',
-              'manage_docroot'  => true,
-              'logroot'         => '/tmp/logroot',
-              'logroot_ensure'  => 'absent',
+              'error_log_pipe' => '/dev/null',
+              'docroot' => '/var/www/foo',
+              'ensure' => 'absent',
+              'manage_docroot' => true,
+              'logroot' => '/tmp/logroot',
+              'logroot_ensure' => 'absent',
             }
           end
 
@@ -1487,8 +1487,8 @@
         context 'wsgi_application_group should set apache::mod::wsgi' do
           let :params do
             {
-              'docroot'                    => '/rspec/docroot',
-              'wsgi_application_group'     => '%{GLOBAL}',
+              'docroot' => '/rspec/docroot',
+              'wsgi_application_group' => '%{GLOBAL}',
             }
           end
 
@@ -1497,7 +1497,7 @@
         context 'wsgi_daemon_process should set apache::mod::wsgi' do
           let :params do
             {
-              'docroot'                    => '/rspec/docroot',
+              'docroot' => '/rspec/docroot',
               'wsgi_daemon_process' => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
             }
           end
@@ -1507,8 +1507,8 @@
         context 'wsgi_import_script on its own should not set apache::mod::wsgi' do
           let :params do
             {
-              'docroot'                    => '/rspec/docroot',
-              'wsgi_import_script'         => '/var/www/demo.wsgi',
+              'docroot' => '/rspec/docroot',
+              'wsgi_import_script' => '/var/www/demo.wsgi',
             }
           end
 
@@ -1519,8 +1519,8 @@
             {
               'docroot' => '/rspec/docroot',
               'wsgi_import_script_options' => {
-                'process-group'           => 'wsgi',
-                'application-group'       => '%{GLOBAL}',
+                'process-group' => 'wsgi',
+                'application-group' => '%{GLOBAL}',
               },
             }
           end
@@ -1530,11 +1530,11 @@
         context 'wsgi_import_script and wsgi_import_script_options should set apache::mod::wsgi' do
           let :params do
             {
-              'docroot'                     => '/rspec/docroot',
-              'wsgi_import_script'          => '/var/www/demo.wsgi',
-              'wsgi_import_script_options'  => {
-                'process-group'           => 'wsgi',
-                'application-group'       => '%{GLOBAL}',
+              'docroot' => '/rspec/docroot',
+              'wsgi_import_script' => '/var/www/demo.wsgi',
+              'wsgi_import_script_options' => {
+                'process-group' => 'wsgi',
+                'application-group' => '%{GLOBAL}',
               },
             }
           end
@@ -1544,8 +1544,8 @@
         context 'wsgi_process_group should set apache::mod::wsgi' do
           let :params do
             {
-              'docroot'                    => '/rspec/docroot',
-              'wsgi_daemon_process'        => 'wsgi',
+              'docroot' => '/rspec/docroot',
+              'wsgi_daemon_process' => 'wsgi',
             }
           end
 
@@ -1554,8 +1554,8 @@
         context 'wsgi_script_aliases with non-empty aliases should set apache::mod::wsgi' do
           let :params do
             {
-              'docroot'                    => '/rspec/docroot',
-              'wsgi_script_aliases'        => {
+              'docroot' => '/rspec/docroot',
+              'wsgi_script_aliases' => {
                 '/' => '/var/www/demo.wsgi',
               },
             }
@@ -1566,8 +1566,8 @@
         context 'wsgi_script_aliases with empty aliases should set apache::mod::wsgi' do
           let :params do
             {
-              'docroot'                    => '/rspec/docroot',
-              'wsgi_script_aliases'        => {},
+              'docroot' => '/rspec/docroot',
+              'wsgi_script_aliases' => {},
             }
           end
 
@@ -1576,8 +1576,8 @@
         context 'wsgi_pass_authorization should set apache::mod::wsgi' do
           let :params do
             {
-              'docroot'                    => '/rspec/docroot',
-              'wsgi_pass_authorization'    => 'On',
+              'docroot' => '/rspec/docroot',
+              'wsgi_pass_authorization' => 'On',
             }
           end
 
@@ -1586,8 +1586,8 @@
         context 'when not setting nor managing the docroot' do
           let :params do
             {
-              'docroot'                     => false,
-              'manage_docroot'              => false,
+              'docroot' => false,
+              'manage_docroot' => false,
             }
           end
 
@@ -1597,8 +1597,8 @@
         context 'ssl_proxyengine without ssl' do
           let :params do
             {
-              'docroot'         => '/rspec/docroot',
-              'ssl'             => false,
+              'docroot' => '/rspec/docroot',
+              'ssl' => false,
               'ssl_proxyengine' => true,
             }
           end
@@ -1610,9 +1610,9 @@
         context 'ssl_proxy_protocol without ssl_proxyengine' do
           let :params do
             {
-              'docroot'            => '/rspec/docroot',
-              'ssl'                => true,
-              'ssl_proxyengine'    => false,
+              'docroot' => '/rspec/docroot',
+              'ssl' => true,
+              'ssl_proxyengine' => false,
               'ssl_proxy_protocol' => 'TLSv1.2',
             }
           end
@@ -1624,8 +1624,8 @@
         context 'ssl_honorcipherorder' do
           let :params do
             {
-              'docroot'            => '/rspec/docroot',
-              'ssl'                => true,
+              'docroot' => '/rspec/docroot',
+              'ssl' => true,
             }
           end
 
@@ -1671,7 +1671,7 @@
           context 'single log file' do
             let(:params) do
               {
-                'docroot'         => '/rspec/docroot',
+                'docroot' => '/rspec/docroot',
                 'access_log_file' => 'my_log_file',
               }
             end
@@ -1685,8 +1685,8 @@
           context 'single log file with environment' do
             let(:params) do
               {
-                'docroot'            => '/rspec/docroot',
-                'access_log_file'    => 'my_log_file',
+                'docroot' => '/rspec/docroot',
+                'access_log_file' => 'my_log_file',
                 'access_log_env_var' => 'prod',
               }
             end
@@ -1700,7 +1700,7 @@
           context 'multiple log files' do
             let(:params) do
               {
-                'docroot'     => '/rspec/docroot',
+                'docroot' => '/rspec/docroot',
                 'access_logs' => [
                   { 'file' => '/tmp/log1', 'env' => 'dev' },
                   { 'file' => 'log2' },
@@ -1730,7 +1730,7 @@
           context 'single log format directive as a string' do
             let(:params) do
               {
-                'docroot'          => '/rspec/docroot',
+                'docroot' => '/rspec/docroot',
                 'error_log_format' => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
               }
             end
@@ -1745,7 +1745,7 @@
           context 'multiple log format directives' do
             let(:params) do
               {
-                'docroot'          => '/rspec/docroot',
+                'docroot' => '/rspec/docroot',
                 'error_log_format' => [
                   '[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M',
                   { '[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T' => 'request' },
@@ -1880,10 +1880,10 @@
           context 'default of require all granted' do
             let :params do
               {
-                'docroot'         => '/var/www/foo',
-                'directories'     => [
+                'docroot' => '/var/www/foo',
+                'directories' => [
                   {
-                    'path'     => '/var/www/foo/files',
+                    'path' => '/var/www/foo/files',
                     'provider' => 'files',
                   },
                 ],
@@ -1908,11 +1908,11 @@
           context 'require unmanaged' do
             let :params do
               {
-                'docroot'         => '/var/www/foo',
-                'directories'     => [
+                'docroot' => '/var/www/foo',
+                'directories' => [
                   {
-                    'path'     => '/var/www/foo',
-                    'require'  => 'unmanaged',
+                    'path' => '/var/www/foo',
+                    'require' => 'unmanaged',
                   },
                 ],
 
@@ -1948,12 +1948,12 @@
               default_params.merge(
                 'auth_oidc' => true,
                 'oidc_settings' => { 'ProviderMetadataURL' => 'https://login.example.com/.well-known/openid-configuration',
-                                     'ClientID'                  => 'test',
-                                     'RedirectURI'               => '/some/valid/relative/uri',
+                                     'ClientID' => 'test',
+                                     'RedirectURI' => '/some/valid/relative/uri',
                                      'ProviderTokenEndpointAuth' => 'client_secret_basic',
-                                     'RemoteUserClaim'           => 'sub',
-                                     'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
-                                     'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
+                                     'RemoteUserClaim' => 'sub',
+                                     'ClientSecret' => 'aae053a9-4abf-4824-8956-e94b2af335c8',
+                                     'CryptoPassphrase' => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
               )
             end
 
@@ -1970,12 +1970,12 @@
               default_params.merge(
                 'auth_oidc' => true,
                 'oidc_settings' => { 'ProviderMetadataURL' => 'https://login.example.com/.well-known/openid-configuration',
-                                     'ClientID'                  => 'test',
-                                     'RedirectURI'               => 'invalid_uri',
+                                     'ClientID' => 'test',
+                                     'RedirectURI' => 'invalid_uri',
                                      'ProviderTokenEndpointAuth' => 'client_secret_basic',
-                                     'RemoteUserClaim'           => 'sub',
-                                     'ClientSecret'              => 'aae053a9-4abf-4824-8956-e94b2af335c8',
-                                     'CryptoPassphrase'          => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
+                                     'RemoteUserClaim' => 'sub',
+                                     'ClientSecret' => 'aae053a9-4abf-4824-8956-e94b2af335c8',
+                                     'CryptoPassphrase' => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
               )
             end
 
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb
index 5c608cf53d..e61196e018 100644
--- a/util/apache_mod_platform_support.rb
+++ b/util/apache_mod_platform_support.rb
@@ -22,8 +22,8 @@
 # ...
 class ApacheModPlatformCompatibility
   ERROR_MSG = {
-    tag_parse:  'OS and version information in incorrect format:',
-    os_parse:   'OS name is not present in metadata.json:',
+    tag_parse: 'OS and version information in incorrect format:',
+    os_parse: 'OS name is not present in metadata.json:',
   }.freeze
 
   def initialize

From 599a9e6125901bb39b8137e5b9ac3731e58c3cd4 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Wed, 19 Apr 2023 18:42:15 +0100
Subject: [PATCH 2107/2267] (CONT-772) Correct cop group 1

---
 .rubocop_todo.yml                             | 51 +---------------
 lib/puppet/functions/apache/bool2httpd.rb     |  1 +
 spec/acceptance/itk_spec.rb                   |  4 +-
 spec/acceptance/mod_authnz_ldap_spec.rb       |  4 +-
 spec/acceptance/vhost_spec.rb                 |  2 +-
 spec/classes/mod/authnz_ldap_spec.rb          |  1 +
 spec/classes/mod/deflate_spec.rb              | 14 ++---
 spec/classes/mod/http2_spec.rb                | 58 +++++++++----------
 spec/classes/mod/info_spec.rb                 | 20 +++----
 spec/classes/mod/jk_spec.rb                   | 38 ++++++------
 spec/classes/mod/lbmethod_bybusyness.rb       |  2 +
 spec/classes/mod/lbmethod_byrequests.rb       |  2 +
 spec/classes/mod/lbmethod_bytraffic.rb        |  2 +
 spec/classes/mod/lbmethod_heartbeat.rb        |  2 +
 spec/classes/mod/ldap_spec.rb                 |  6 +-
 spec/classes/mod/proxy_balancer_spec.rb       |  6 +-
 spec/classes/mod/status_spec.rb               | 20 +++----
 spec/spec_helper_acceptance_local.rb          |  1 +
 .../apache_mod_platform_compatibility_spec.rb |  6 +-
 tasks/init.rb                                 |  1 +
 util/apache_mod_platform_support.rb           |  4 ++
 21 files changed, 106 insertions(+), 139 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6eb72d69e8..ac13bf6a83 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,60 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-19 16:57:14 UTC using RuboCop version 1.48.1.
+# on 2023-04-19 17:41:01 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-Layout/ClosingHeredocIndentation:
-  Exclude:
-    - 'spec/acceptance/itk_spec.rb'
-    - 'spec/acceptance/mod_authnz_ldap_spec.rb'
-    - 'spec/acceptance/vhost_spec.rb'
-
-# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/puppet/functions/apache/bool2httpd.rb'
-    - 'spec/classes/mod/authnz_ldap_spec.rb'
-    - 'spec/spec_helper_acceptance_local.rb'
-    - 'tasks/init.rb'
-    - 'util/apache_mod_platform_support.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Layout/HeredocIndentation:
-  Exclude:
-    - 'spec/classes/mod/http2_spec.rb'
-
-# Offense count: 15
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: leading, trailing
-Layout/LineContinuationLeadingSpace:
-  Exclude:
-    - 'spec/classes/mod/info_spec.rb'
-    - 'spec/classes/mod/jk_spec.rb'
-    - 'spec/classes/mod/proxy_balancer_spec.rb'
-    - 'spec/classes/mod/status_spec.rb'
-    - 'spec/util/apache_mod_platform_compatibility_spec.rb'
-
-# Offense count: 52
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: space, no_space
-Layout/LineContinuationSpacing:
-  Exclude:
-    - 'spec/classes/mod/deflate_spec.rb'
-    - 'spec/classes/mod/info_spec.rb'
-    - 'spec/classes/mod/jk_spec.rb'
-    - 'spec/classes/mod/ldap_spec.rb'
-    - 'spec/classes/mod/proxy_balancer_spec.rb'
-    - 'spec/classes/mod/status_spec.rb'
-
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
diff --git a/lib/puppet/functions/apache/bool2httpd.rb b/lib/puppet/functions/apache/bool2httpd.rb
index 1fb71c590c..b864c8675f 100644
--- a/lib/puppet/functions/apache/bool2httpd.rb
+++ b/lib/puppet/functions/apache/bool2httpd.rb
@@ -21,6 +21,7 @@
   def bool2httpd(arg)
     return 'Off' if arg.nil? || arg == false || matches_string?(arg, %r{false}i) || arg == :undef
     return 'On' if arg == true || matches_string?(arg, %r{true}i)
+
     arg.to_s
   end
 
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index c5ef34b9c4..914cc7aeb5 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -28,13 +28,13 @@ class { 'apache':
               mpm_module => 'prefork',
             }
             class { 'apache::mod::itk': }
-          MANIFEST
+        MANIFEST
       when :itk_only
         <<-MANIFEST
             class { 'apache':
               mpm_module => 'itk',
             }
-          MANIFEST
+        MANIFEST
       end
     end
 
diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb
index 82615ab624..aa92bcf51b 100644
--- a/spec/acceptance/mod_authnz_ldap_spec.rb
+++ b/spec/acceptance/mod_authnz_ldap_spec.rb
@@ -18,12 +18,12 @@
       }
       class { 'apache': }
       class { 'apache::mod::authnz_ldap': }
-      MANIFEST
+           MANIFEST
          else
            <<-MANIFEST
         class { 'apache': }
         class { 'apache::mod::authnz_ldap': }
-        MANIFEST
+           MANIFEST
          end
 
     it 'succeeds in installing the mod_authnz_ldap module' do
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 3d21aef1e3..e10d22dbb2 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -299,7 +299,7 @@ class { 'apache': }
         content => "Hello World\\n",
       }
       host { 'files.example.net': ip => '127.0.0.1', }
-    MANIFEST
+      MANIFEST
     end
 
     describe 'readme example, adapted' do
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index 27f75d66bd..e9b4feeca1 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -34,6 +34,7 @@
   context 'default configuration with parameters on a RedHat OS' do
     on_supported_os.each do |os, os_facts|
       next unless os.start_with?('redhat')
+
       context "On #{os}" do
         let :facts do
           os_facts
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 96ecaa0f82..a3cafcff6c 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -6,13 +6,13 @@
 def general_deflate_specs
   it { is_expected.to contain_apache__mod('deflate') }
 
-  expected = "AddOutputFilterByType DEFLATE application/rss+xml\n"\
-  "AddOutputFilterByType DEFLATE application/x-javascript\n"\
-      "AddOutputFilterByType DEFLATE text/css\n"\
-             "AddOutputFilterByType DEFLATE text/html\n"\
-             "\n"\
-             "DeflateFilterNote Input instream\n"\
-             "DeflateFilterNote Output outstream\n"\
+  expected = "AddOutputFilterByType DEFLATE application/rss+xml\n" \
+  "AddOutputFilterByType DEFLATE application/x-javascript\n" \
+      "AddOutputFilterByType DEFLATE text/css\n" \
+             "AddOutputFilterByType DEFLATE text/html\n" \
+             "\n" \
+             "DeflateFilterNote Input instream\n" \
+             "DeflateFilterNote Output outstream\n" \
              "DeflateFilterNote Ratio ratio\n"
 
   it do
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
index 530ef32c35..3c57e15cc1 100644
--- a/spec/classes/mod/http2_spec.rb
+++ b/spec/classes/mod/http2_spec.rb
@@ -11,11 +11,11 @@
     it { is_expected.to contain_class('apache::mod::http2') }
     context 'with default values' do
       let(:expected_content) do
-        <<EOT
-# The http2 Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
+        <<~EOT
+          # The http2 Apache module configuration file is being
+          # managed by Puppet and changes will be overwritten.
 
-EOT
+        EOT
       end
 
       it { is_expected.to contain_file('http2.conf').with(content: expected_content) }
@@ -53,32 +53,32 @@
       end
 
       let(:expected_content) do
-        <<EOT
-# The http2 Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
+        <<~EOT
+          # The http2 Apache module configuration file is being
+          # managed by Puppet and changes will be overwritten.
 
-H2CopyFiles Off
-H2Direct On
-H2EarlyHints Off
-H2MaxSessionStreams 100
-H2MaxWorkerIdleSeconds 600
-H2MaxWorkers 20
-H2MinWorkers 10
-H2ModernTLSOnly On
-H2Push On
-H2PushDiarySize 256
-H2PushPriority application/json 32
-H2PushPriority image/jpeg before
-H2PushPriority text/css   interleaved
-H2PushResource /xxx.css
-H2PushResource /xxx.js
-H2SerializeHeaders On
-H2StreamMaxMemSize 128000
-H2TLSCoolDownSecs 0
-H2TLSWarmUpSize 0
-H2Upgrade Off
-H2WindowSize 128000
-EOT
+          H2CopyFiles Off
+          H2Direct On
+          H2EarlyHints Off
+          H2MaxSessionStreams 100
+          H2MaxWorkerIdleSeconds 600
+          H2MaxWorkers 20
+          H2MinWorkers 10
+          H2ModernTLSOnly On
+          H2Push On
+          H2PushDiarySize 256
+          H2PushPriority application/json 32
+          H2PushPriority image/jpeg before
+          H2PushPriority text/css   interleaved
+          H2PushResource /xxx.css
+          H2PushResource /xxx.js
+          H2SerializeHeaders On
+          H2StreamMaxMemSize 128000
+          H2TLSCoolDownSecs 0
+          H2TLSWarmUpSize 0
+          H2Upgrade Off
+          H2WindowSize 128000
+        EOT
       end
 
       it { is_expected.to contain_file('http2.conf').with(content: expected_content) }
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 4ced2ad674..b623d4a8d5 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -6,9 +6,9 @@ def general_info_specs_apache24
   it { is_expected.to contain_apache__mod('info') }
 
   context 'passing no parameters' do
-    expected = "<Location /server-info>\n"\
-               "    SetHandler server-info\n"\
-               "    Require ip 127.0.0.1 ::1\n"\
+    expected = "<Location /server-info>\n    " \
+               "SetHandler server-info\n    " \
+               "Require ip 127.0.0.1 ::1\n" \
                "</Location>\n"
     it { is_expected.to contain_file('info.conf').with_content(expected) }
   end
@@ -21,8 +21,8 @@ def general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
+        "<Location /server-info>\n    " \
+        "SetHandler server-info\n" \
         "</Location>\n",
       )
     }
@@ -32,9 +32,9 @@ def general_info_specs_apache24
       { allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'] }
     end
 
-    expected = "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "    Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n"\
+    expected = "<Location /server-info>\n    " \
+        "SetHandler server-info\n    " \
+        "Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n" \
         "</Location>\n"
     it {
       is_expected.to contain_file('info.conf').with_content(expected)
@@ -50,8 +50,8 @@ def general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
+        "<Location /server-info>\n    " \
+        "SetHandler server-info\n" \
         "</Location>\n",
       )
     }
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 158ee18c1a..5830a525dd 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -41,19 +41,19 @@
 
     it { is_expected.to compile }
     it { is_expected.to compile.with_all_deps }
-    expected_content = "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
-                       "# Any manual changes will be overwritten\n"\
-                       "\n"\
-                       "worker.list = worker_a,worker_b\n"\
-                       "\n"\
-                       "worker.maintain = 40\n"\
-                       "\n"\
-                       "# This is worker A\n"\
-                       "worker.worker_a.socket_keepalive=true\n"\
-                       "worker.worker_a.type=ajp13\n"\
-                       "\n"\
-                       "# This is worker B\n"\
-                       "worker.worker_b.socket_keepalive=true\n"\
+    expected_content = "# This file is generated automatically by Puppet - DO NOT EDIT\n" \
+                       "# Any manual changes will be overwritten\n" \
+                       "\n" \
+                       "worker.list = worker_a,worker_b\n" \
+                       "\n" \
+                       "worker.maintain = 40\n" \
+                       "\n" \
+                       "# This is worker A\n" \
+                       "worker.worker_a.socket_keepalive=true\n" \
+                       "worker.worker_a.type=ajp13\n" \
+                       "\n" \
+                       "# This is worker B\n" \
+                       "worker.worker_b.socket_keepalive=true\n" \
                        "worker.worker_b.type=ajp13\n"
     it { is_expected.to contain_file("#{mod_dir}/workers.properties").with_content(expected_content) }
   end
@@ -169,12 +169,12 @@
             )
           end
 
-          expected = "# This file is generated automatically by Puppet - DO NOT EDIT\n"\
-                     "# Any manual changes will be overwritten\n"\
-                     "\n"\
-                     "<IfModule jk_module>\n"\
-                     "  JkShmFile #{paths[:shm_path]}\n"\
-                     "  JkLogFile #{paths[:log_path]}\n"\
+          expected = "# This file is generated automatically by Puppet - DO NOT EDIT\n" \
+                     "# Any manual changes will be overwritten\n" \
+                     "\n" \
+                     "<IfModule jk_module>\n  " \
+                     "JkShmFile #{paths[:shm_path]}\n  " \
+                     "JkLogFile #{paths[:log_path]}\n" \
                      "</IfModule>\n"
           it { is_expected.to contain_file('jk.conf').with_content(expected) }
         end
diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb
index 22eb0a8bc5..49510076de 100644
--- a/spec/classes/mod/lbmethod_bybusyness.rb
+++ b/spec/classes/mod/lbmethod_bybusyness.rb
@@ -14,6 +14,7 @@
       end
 
       it {
+        # rubocop:disable Layout/LineLength
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
@@ -32,6 +33,7 @@
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+        # rubocop:enable Layout/LineLength
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb
index 22eb0a8bc5..49510076de 100644
--- a/spec/classes/mod/lbmethod_byrequests.rb
+++ b/spec/classes/mod/lbmethod_byrequests.rb
@@ -14,6 +14,7 @@
       end
 
       it {
+        # rubocop:disable Layout/LineLength
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
@@ -32,6 +33,7 @@
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+        # rubocop:enable Layout/LineLength
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb
index 22eb0a8bc5..49510076de 100644
--- a/spec/classes/mod/lbmethod_bytraffic.rb
+++ b/spec/classes/mod/lbmethod_bytraffic.rb
@@ -14,6 +14,7 @@
       end
 
       it {
+        # rubocop:disable Layout/LineLength
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
@@ -32,6 +33,7 @@
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+        # rubocop:enable Layout/LineLength
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb
index 22eb0a8bc5..49510076de 100644
--- a/spec/classes/mod/lbmethod_heartbeat.rb
+++ b/spec/classes/mod/lbmethod_heartbeat.rb
@@ -14,6 +14,7 @@
       end
 
       it {
+        # rubocop:disable Layout/LineLength
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
@@ -32,6 +33,7 @@
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+        # rubocop:enable Layout/LineLength
       }
     end
   end
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 9fb165fdd4..3038683586 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -46,9 +46,9 @@
       it { is_expected.to contain_file('ldap.conf').with_content(%r{^LDAPOpCacheTTL 600$}) }
 
       expected_ldap_path_re =
-        "<Location /custom-ldap-status>\n"\
-        "\s*SetHandler ldap-status\n"\
-        ".*\n"\
+        "<Location /custom-ldap-status>\n" \
+        "\s*SetHandler ldap-status\n" \
+        ".*\n" \
         "</Location>\n"
       it { is_expected.to contain_file('ldap.conf').with_content(%r{#{expected_ldap_path_re}}m) }
     end
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index 0b28526926..e5735cafdd 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -4,9 +4,9 @@
 
 # Helper function for testing the contents of `proxy_balancer.conf`
 def balancer_manager_conf_spec(allow_from, manager_path)
-  expected = "<Location #{manager_path}>\n"\
-             "    SetHandler balancer-manager\n"\
-             "    Require ip #{Array(allow_from).join(' ')}\n"\
+  expected = "<Location #{manager_path}>\n    " \
+             "SetHandler balancer-manager\n    " \
+             "Require ip #{Array(allow_from).join(' ')}\n" \
              "</Location>\n"
   it do
     is_expected.to contain_file('proxy_balancer.conf').with_content(expected)
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index eebe8746c2..39111ab6df 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -15,7 +15,7 @@ def require_directives(requires)
     requires.map { |req| "    Require #{req}\n" }.join('')
   elsif requires.is_a?(Hash)
     if requires.key?(:enforce)
-      \
+ \
       "    <Require#{requires[:enforce].capitalize}>\n" + \
         requires[:requires].map { |req| "        Require #{req}\n" }.join('') + \
         "    </Require#{requires[:enforce].capitalize}>\n"
@@ -27,15 +27,15 @@ def require_directives(requires)
 
 shared_examples 'status_conf_spec_require' do |requires, extended_status, status_path|
   expected =
-    "<Location #{status_path}>\n"\
-    "    SetHandler server-status\n"\
-    "#{require_directives(requires)}"\
-    "</Location>\n"\
-    "ExtendedStatus #{extended_status}\n"\
-    "\n"\
-    "<IfModule mod_proxy.c>\n"\
-    "    # Show Proxy LoadBalancer status in mod_status\n"\
-    "    ProxyStatus On\n"\
+    "<Location #{status_path}>\n    " \
+    "SetHandler server-status\n" \
+    "#{require_directives(requires)}" \
+    "</Location>\n" \
+    "ExtendedStatus #{extended_status}\n" \
+    "\n" \
+    "<IfModule mod_proxy.c>\n    " \
+    "# Show Proxy LoadBalancer status in mod_status\n    " \
+    "ProxyStatus On\n" \
     "</IfModule>\n"
   it('status conf require') do
     is_expected.to contain_file('status.conf').with_content(expected)
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index f5eb0e59d9..2cea15fa25 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -151,5 +151,6 @@ def apache_settings_hash
 
 def mod_supported_on_platform?(mod)
   return false if ENV['DISABLE_MOD_TEST_EXCLUSION']
+
   ApacheModTestFilterHelper.instance.mod_supported_on_platform?(mod)
 end
diff --git a/spec/util/apache_mod_platform_compatibility_spec.rb b/spec/util/apache_mod_platform_compatibility_spec.rb
index 3ca5bb7481..356f4a55aa 100644
--- a/spec/util/apache_mod_platform_compatibility_spec.rb
+++ b/spec/util/apache_mod_platform_compatibility_spec.rb
@@ -162,9 +162,9 @@
 
       tag_format_help_msg_txt = ['succint', 'warning']
 
-      expected_stderr_msg = "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n" \
-                            " * #{abc_pp} (line #{abc_pp_error_line}): #{abc_pp_error_type_msg} #{abc_pp_error_detail}\n" \
-                            " * #{def_pp} (line #{def_pp_error_line}): #{def_pp_error_type_msg} #{def_pp_error_detail}\n" \
+      expected_stderr_msg = "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n " \
+                            "* #{abc_pp} (line #{abc_pp_error_line}): #{abc_pp_error_type_msg} #{abc_pp_error_detail}\n " \
+                            "* #{def_pp} (line #{def_pp_error_line}): #{def_pp_error_type_msg} #{def_pp_error_detail}\n" \
                             "#{tag_format_help_msg_txt[0]}\n" \
                             "#{tag_format_help_msg_txt[1]}\n"
 
diff --git a/tasks/init.rb b/tasks/init.rb
index bb82d9aa7e..50f96ce610 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -19,6 +19,7 @@ def service(action, service_name)
   end
   _stdout, stderr, status = Open3.capture3('service', service_name, action)
   raise Puppet::Error, stderr if status != 0
+
   { status: "#{action} successful" }
 end
 
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb
index e61196e018..04d29bbe9d 100644
--- a/util/apache_mod_platform_support.rb
+++ b/util/apache_mod_platform_support.rb
@@ -59,6 +59,7 @@ def initialize(manifest, line_num, error_type, error_detail)
 
   def print_parsing_errors
     return if @manifest_errors.empty?
+
     $stderr.puts "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n"
     @manifest_errors.each do |manifest_error|
       $stderr.puts " * #{manifest_error.manifest} (line #{manifest_error.line_num}): #{ERROR_MSG[manifest_error.error_type]} #{manifest_error.error_detail}"
@@ -107,6 +108,7 @@ def extract_os_ver_pairs(line)
   def process_line(line)
     data = {}
     return data unless %r{@note\sUnsupported\splatforms?:\s?|class\sapache::mod}i.match?(line)
+
     if (match = %r{@note\sUnsupported\splatforms?:\s?(?<os_vers>.*)$}i.match(line))
       data[:type] = :unsupported_platform_declaration
       data[:value] = match[:os_vers]
@@ -125,6 +127,7 @@ def generate_mod_platform_exclusions
         line_num += 1
         data = process_line(line)
         next if data.empty?
+
         if data[:type] == :unsupported_platform_declaration
           platforms_versions = extract_os_ver_pairs(data[:value])
           register_error(manifest, line_num, :tag_parse, line) if platforms_versions.empty?
@@ -144,6 +147,7 @@ def mod_supported_on_platform?(mod)
     return true unless @mod_platform_compatibility_mapping.key? mod
     return true unless @mod_platform_compatibility_mapping[mod].key? @os[:family]
     return false if @mod_platform_compatibility_mapping[mod][@os[:family]] == [0]
+
     !@mod_platform_compatibility_mapping[mod][@os[:family]].include? @os[:release]
   end
 end

From 195dd9dfc5a99a48e149908d583aabe943f3cc27 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 00:25:35 +0100
Subject: [PATCH 2108/2267] (CONT-772) Correct cop group 2

---
 .rubocop_todo.yml                    | 43 +---------------------------
 lib/puppet/provider/a2mod.rb         |  8 ++----
 spec/classes/dev_spec.rb             |  6 ++--
 spec/classes/mod/deflate_spec.rb     |  4 +--
 spec/classes/mod/info_spec.rb        |  6 ++--
 spec/classes/mod/passenger_spec.rb   |  2 +-
 spec/classes/mod/php_spec.rb         |  2 +-
 spec/classes/mod/security_spec.rb    |  2 +-
 spec/defines/modsec_link_spec.rb     |  2 +-
 spec/defines/vhost_spec.rb           |  2 +-
 spec/spec_helper_acceptance_local.rb |  8 ++----
 spec/spec_helper_local.rb            |  2 +-
 12 files changed, 18 insertions(+), 69 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ac13bf6a83..f50c370917 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,27 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-19 17:41:01 UTC using RuboCop version 1.48.1.
+# on 2023-04-19 23:25:24 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/LineEndStringConcatenationIndentation:
-  Exclude:
-    - 'spec/classes/mod/deflate_spec.rb'
-    - 'spec/classes/mod/info_spec.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 202
-
 # Offense count: 3
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
@@ -105,17 +89,6 @@ RSpec/EmptyLineAfterExampleGroup:
 RSpec/ExampleLength:
   Max: 107
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ExcessiveDocstringSpacing:
-  Exclude:
-    - 'spec/classes/dev_spec.rb'
-    - 'spec/classes/mod/passenger_spec.rb'
-    - 'spec/classes/mod/php_spec.rb'
-    - 'spec/classes/mod/security_spec.rb'
-    - 'spec/defines/modsec_link_spec.rb'
-    - 'spec/defines/vhost_spec.rb'
-
 # Offense count: 6
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
@@ -191,12 +164,6 @@ RSpec/RepeatedExampleGroupDescription:
     - 'spec/classes/apache_spec.rb'
     - 'spec/classes/mod/security_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/SharedExamples:
-  Exclude:
-    - 'spec/spec_helper_local.rb'
-
 # Offense count: 4
 RSpec/StubbedMock:
   Exclude:
@@ -234,14 +201,6 @@ Style/GlobalStdStream:
   Exclude:
     - 'tasks/init.rb'
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/puppet/provider/a2mod.rb'
-    - 'spec/classes/dev_spec.rb'
-    - 'spec/spec_helper_acceptance_local.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
diff --git a/lib/puppet/provider/a2mod.rb b/lib/puppet/provider/a2mod.rb
index 7406e01da3..bc0899e2d5 100644
--- a/lib/puppet/provider/a2mod.rb
+++ b/lib/puppet/provider/a2mod.rb
@@ -6,9 +6,7 @@ class Puppet::Provider::A2mod < Puppet::Provider
   def self.prefetch(mods)
     instances.each do |prov|
       mod = mods[prov.name]
-      if mod
-        mod.provider = prov
-      end
+      mod.provider = prov if mod
     end
   end
 
@@ -29,9 +27,7 @@ def properties
   # Returns the properties of the given mod if it exists.
   def query
     self.class.instances.each do |mod|
-      if mod.name == name || mod.name.downcase == name
-        return mod.properties
-      end
+      return mod.properties if mod.name == name || mod.name.downcase == name
     end
     nil
   end
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 96ec70aabc..6fbfa6fab1 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::dev' do
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end
@@ -22,9 +22,7 @@
         when 'Debian'
           it { is_expected.to contain_package('libaprutil1-dev') }
           it { is_expected.to contain_package('libapr1-dev') }
-          if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_package('apache2-prefork-dev') }
-          end
+          it { is_expected.to contain_package('apache2-prefork-dev') } if facts[:os]['release']['major'].to_i < 8
         when 'Ubuntu'
           it { is_expected.to contain_package('apache2-dev') }
         when 'RedHat'
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index a3cafcff6c..9779610c88 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -7,8 +7,8 @@ def general_deflate_specs
   it { is_expected.to contain_apache__mod('deflate') }
 
   expected = "AddOutputFilterByType DEFLATE application/rss+xml\n" \
-  "AddOutputFilterByType DEFLATE application/x-javascript\n" \
-      "AddOutputFilterByType DEFLATE text/css\n" \
+             "AddOutputFilterByType DEFLATE application/x-javascript\n" \
+             "AddOutputFilterByType DEFLATE text/css\n" \
              "AddOutputFilterByType DEFLATE text/html\n" \
              "\n" \
              "DeflateFilterNote Input instream\n" \
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index b623d4a8d5..1bf8138ab2 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -33,9 +33,9 @@ def general_info_specs_apache24
     end
 
     expected = "<Location /server-info>\n    " \
-        "SetHandler server-info\n    " \
-        "Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n" \
-        "</Location>\n"
+               "SetHandler server-info\n    " \
+               "Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n" \
+               "</Location>\n"
     it {
       is_expected.to contain_file('info.conf').with_content(expected)
     }
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 80e56ca08c..34cb7124d6 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::mod::passenger', type: :class do
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 0a8a6b3b9c..0684e2f642 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::mod::php', type: :class do
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 143208c42e..1118cf72dc 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'apache::mod::security', type: :class do
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index 400ae555de..806be9f3d0 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -14,7 +14,7 @@ class { "apache::mod::security": activated_rules => [] }
   end
 
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 2de952ccb0..a52289283d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -22,7 +22,7 @@
         }
       end
 
-      context "on #{os} " do
+      context "on #{os}" do
         let :facts do
           os_facts
         end
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 2cea15fa25..974921d9c6 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -29,13 +29,9 @@ def print_parsing_errors
 
 RSpec.configure do |c|
   # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
-  if ENV['CI'] == 'true'
-    c.filter_run_excluding ipv6: true
-  end
+  c.filter_run_excluding ipv6: true if ENV['CI'] == 'true'
   c.before :suite do
-    if %r{redhat|oracle}.match?(os[:family])
-      LitmusHelper.instance.run_shell('puppet module install puppet/epel')
-    end
+    LitmusHelper.instance.run_shell('puppet module install puppet/epel') if %r{redhat|oracle}.match?(os[:family])
 
     LitmusHelper.instance.apply_manifest(File.read(File.join(__dir__, 'setup_acceptance_node.pp')))
   end
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index a7211b68bb..410c73818e 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -29,7 +29,7 @@
   end
 end
 
-shared_examples :compile, compile: true do
+shared_examples 'compile', compile: true do
   it { is_expected.to compile.with_all_deps }
 end
 

From aace5a83d45e7065237d5b69fa3751c0140c163e Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 09:18:59 +0100
Subject: [PATCH 2109/2267] (CONT-772) Correct Style/TrailingCommaInHashLiteral

---
 .rubocop_todo.yml                             |   7 -
 spec/classes/apache_spec.rb                   |  28 +--
 spec/classes/mod/alias_spec.rb                |   6 +-
 spec/classes/mod/auth_cas_spec.rb             |   4 +-
 spec/classes/mod/authn_dbd_spec.rb            |   4 +-
 spec/classes/mod/cluster_spec.rb              |   4 +-
 spec/classes/mod/dav_svn_spec.rb              |   8 +-
 spec/classes/mod/disk_cache_spec.rb           |   6 +-
 spec/classes/mod/dumpio_spec.rb               |   4 +-
 spec/classes/mod/event_spec.rb                |   6 +-
 spec/classes/mod/expires_spec.rb              |   4 +-
 spec/classes/mod/http2_spec.rb                |   2 +-
 spec/classes/mod/info_spec.rb                 |   4 +-
 spec/classes/mod/itk_spec.rb                  |   4 +-
 spec/classes/mod/jk_spec.rb                   |  22 +--
 spec/classes/mod/lbmethod_bybusyness.rb       |   4 +-
 spec/classes/mod/lbmethod_byrequests.rb       |   4 +-
 spec/classes/mod/lbmethod_bytraffic.rb        |   4 +-
 spec/classes/mod/lbmethod_heartbeat.rb        |   4 +-
 spec/classes/mod/ldap_spec.rb                 |   4 +-
 spec/classes/mod/md_spec.rb                   |   2 +-
 spec/classes/mod/passenger_spec.rb            |  10 +-
 spec/classes/mod/php_spec.rb                  |   8 +-
 spec/classes/mod/proxy_balancer_spec.rb       |   2 +-
 spec/classes/mod/security_spec.rb             |  24 +--
 spec/classes/mod/ssl_spec.rb                  |  42 ++---
 spec/classes/mod/status_spec.rb               |  10 +-
 spec/classes/mod/userdir_spec.rb              |  12 +-
 spec/classes/mod/watchdog_spec.rb             |   2 +-
 spec/classes/mod/worker_spec.rb               |   2 +-
 spec/classes/mod/wsgi_spec.rb                 |   8 +-
 spec/classes/service_spec.rb                  |   2 +-
 spec/classes/vhosts_spec.rb                   |   8 +-
 spec/defines/balancer_spec.rb                 |   8 +-
 spec/defines/balancermember_spec.rb           |   4 +-
 spec/defines/custom_config_spec.rb            |  10 +-
 spec/defines/vhost_custom_spec.rb             |   2 +-
 spec/defines/vhost_fragment_spec.rb           |   4 +-
 spec/defines/vhost_proxy_spec.rb              |   4 +-
 spec/defines/vhost_spec.rb                    | 176 +++++++++---------
 spec/spec_helper.rb                           |   2 +-
 spec/spec_helper_local.rb                     |  46 ++---
 .../apache_mod_platform_compatibility_spec.rb |   2 +-
 util/apache_mod_platform_support.rb           |   2 +-
 44 files changed, 259 insertions(+), 266 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f50c370917..772e71473d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -265,10 +265,3 @@ Style/StringConcatenation:
 Style/TernaryParentheses:
   Exclude:
     - 'spec/defines/vhost_spec.rb'
-
-# Offense count: 259
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Enabled: false
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 595df44056..3fff25d6f0 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -68,7 +68,7 @@
     context 'with use_optional_includes' do
       let :params do
         {
-          use_optional_includes: true,
+          use_optional_includes: true
         }
       end
 
@@ -78,7 +78,7 @@
     context 'with serveradmin' do
       let(:params) do
         {
-          serveradmin: 'admin@example.com',
+          serveradmin: 'admin@example.com'
         }
       end
 
@@ -168,7 +168,7 @@
       let :params do
         { log_formats: {
           'vhost_common' => '%v %h %l %u %t "%r" %>s %b',
-          'vhost_combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
+          'vhost_combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"'
         } }
       end
 
@@ -180,7 +180,7 @@
       let :params do
         { log_formats: {
           'common' => '%v %h %l %u %t "%r" %>s %b',
-          'combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
+          'combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"'
         } }
       end
 
@@ -260,7 +260,7 @@
         {
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
+          mod_dir: '/etc/httpd/mod.d'
         }
       end
 
@@ -311,7 +311,7 @@
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
           mod_dir: '/etc/httpd/mod.d',
-          use_optional_includes: true,
+          use_optional_includes: true
         }
       end
 
@@ -323,7 +323,7 @@
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
           mod_dir: '/etc/httpd/mod.d',
-          allow_encoded_slashes: 'nodecode',
+          allow_encoded_slashes: 'nodecode'
         }
       end
 
@@ -336,7 +336,7 @@
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
           mod_dir: '/etc/httpd/mod.d',
-          default_charset: 'none',
+          default_charset: 'none'
         }
       end
 
@@ -608,7 +608,7 @@
     context 'with a custom apache_name parameter' do
       let :params do
         {
-          apache_name: 'httpd24-httpd',
+          apache_name: 'httpd24-httpd'
         }
       end
 
@@ -622,7 +622,7 @@
     context 'with a custom file_mode parameter' do
       let :params do
         {
-          file_mode: '0640',
+          file_mode: '0640'
         }
       end
 
@@ -635,7 +635,7 @@
     context 'with a custom root_directory_options parameter' do
       let :params do
         {
-          root_directory_options: ['-Indexes', '-FollowSymLinks'],
+          root_directory_options: ['-Indexes', '-FollowSymLinks']
         }
       end
 
@@ -644,7 +644,7 @@
     context 'with a custom root_directory_secured parameter' do
       let :params do
         {
-          root_directory_secured: true,
+          root_directory_secured: true
         }
       end
 
@@ -658,7 +658,7 @@
     context 'without default non-ssl vhost' do
       let :params do
         {
-          default_vhost: false,
+          default_vhost: false
         }
       end
 
@@ -668,7 +668,7 @@
     context 'with default ssl vhost' do
       let :params do
         {
-          default_ssl_vhost: true,
+          default_ssl_vhost: true
         }
       end
 
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index 38d4207739..f350f19507 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -30,7 +30,7 @@
       end
       let :params do
         {
-          'icons_options' => 'foo',
+          'icons_options' => 'foo'
         }
       end
 
@@ -45,7 +45,7 @@
       end
       let :params do
         {
-          'icons_prefix' => 'apache-icons',
+          'icons_prefix' => 'apache-icons'
         }
       end
 
@@ -60,7 +60,7 @@
       end
       let :params do
         {
-          'icons_path' => false,
+          'icons_path' => false
         }
       end
 
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index 9d615e5a10..d42a3cfec5 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -8,7 +8,7 @@
       {
         cas_login_url: 'https://cas.example.com/login',
         cas_validate_url: 'https://cas.example.com/validate',
-        cas_cookie_path: '/var/cache/apache2/mod_auth_cas/',
+        cas_cookie_path: '/var/cache/apache2/mod_auth_cas/'
       }
     end
 
@@ -21,7 +21,7 @@
         cas_login_url: 'https://cas.example.com/login',
         cas_validate_url: 'https://cas.example.com/validate',
         cas_timeout: 1234,
-        cas_idle_timeout: 4321,
+        cas_idle_timeout: 4321
       }
     end
 
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
index 4dca262247..e59e96f235 100644
--- a/spec/classes/mod/authn_dbd_spec.rb
+++ b/spec/classes/mod/authn_dbd_spec.rb
@@ -6,7 +6,7 @@
   context 'default params' do
     let :params do
       {
-        authn_dbd_params: 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
+        authn_dbd_params: 'host=db_host port=3306 user=apache password=###### dbname=apache_auth'
       }
     end
 
@@ -18,7 +18,7 @@
       {
         authn_dbd_params: 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
         authn_dbd_alias: 'db_authn',
-        authn_dbd_query: 'SELECT password FROM authn WHERE username = %s',
+        authn_dbd_query: 'SELECT password FROM authn WHERE username = %s'
       }
     end
 
diff --git a/spec/classes/mod/cluster_spec.rb b/spec/classes/mod/cluster_spec.rb
index 88783d5fb4..0a93fad648 100644
--- a/spec/classes/mod/cluster_spec.rb
+++ b/spec/classes/mod/cluster_spec.rb
@@ -11,7 +11,7 @@
         allowed_network: '172.17.0',
         balancer_name: 'mycluster',
         ip: '172.17.0.1',
-        version: '1.3.0',
+        version: '1.3.0'
       }
     end
 
@@ -34,7 +34,7 @@
         allowed_network: '172.17.0',
         balancer_name: 'mycluster',
         ip: '172.17.0.1',
-        version: '1.3.1',
+        version: '1.3.1'
       }
     end
 
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 273c603d05..ab64e4e251 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -16,7 +16,7 @@
       describe 'with parameters' do
         let :params do
           {
-            'authz_svn_enabled' => true,
+            'authz_svn_enabled' => true
           }
         end
 
@@ -37,7 +37,7 @@
       describe 'with parameters' do
         let :params do
           {
-            'authz_svn_enabled' => true,
+            'authz_svn_enabled' => true
           }
         end
 
@@ -59,7 +59,7 @@
       describe 'with parameters' do
         let :params do
           {
-            'authz_svn_enabled' => true,
+            'authz_svn_enabled' => true
           }
         end
 
@@ -81,7 +81,7 @@
       describe 'with parameters' do
         let :params do
           {
-            'authz_svn_enabled' => true,
+            'authz_svn_enabled' => true
           }
         end
 
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index d7dd466829..1185420ff5 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -8,7 +8,7 @@
 
     let(:params) do
       {
-        cache_ignore_headers: 'Set-Cookie',
+        cache_ignore_headers: 'Set-Cookie'
       }
     end
 
@@ -63,7 +63,7 @@
 
     let(:params) do
       {
-        cache_ignore_headers: 'Set-Cookie',
+        cache_ignore_headers: 'Set-Cookie'
       }
     end
 
@@ -115,7 +115,7 @@
 
     let(:params) do
       {
-        cache_ignore_headers: 'Set-Cookie',
+        cache_ignore_headers: 'Set-Cookie'
       }
     end
 
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
index 884200836c..64e01ed9c5 100644
--- a/spec/classes/mod/dumpio_spec.rb
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -23,7 +23,7 @@
     context 'with dumpio_input set to On' do
       let :params do
         {
-          dump_io_input: 'On',
+          dump_io_input: 'On'
         }
       end
 
@@ -33,7 +33,7 @@
     context 'with dumpio_ouput set to On' do
       let :params do
         {
-          dump_io_output: 'On',
+          dump_io_output: 'On'
         }
       end
 
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index f5f3d4621c..99523e770d 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -40,7 +40,7 @@
           threadlimit: 7,
           listenbacklog: 8,
           maxrequestworkers: 9,
-          maxconnectionsperchild: 10,
+          maxconnectionsperchild: 10
         }
       end
 
@@ -66,7 +66,7 @@
           threadlimit: 7,
           listenbacklog: 8,
           maxrequestworkers: :undef,
-          maxconnectionsperchild: :undef,
+          maxconnectionsperchild: :undef
         }
       end
 
@@ -92,7 +92,7 @@
           threadlimit: false,
           listenbacklog: false,
           maxrequestworkers: false,
-          maxconnectionsperchild: false,
+          maxconnectionsperchild: false
         }
       end
 
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index 759c46ad25..d9dea92e6f 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -17,7 +17,7 @@
     end
     let :params do
       {
-        'expires_default' => 'access plus 1 month',
+        'expires_default' => 'access plus 1 month'
       }
     end
 
@@ -40,7 +40,7 @@
         'expires_by_type' => [
           { 'text/json' => 'mod plus 1 day' },
           { 'text/html' => 'access plus 1 year' },
-        ],
+        ]
       }
     end
 
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
index 3c57e15cc1..3870e3e45e 100644
--- a/spec/classes/mod/http2_spec.rb
+++ b/spec/classes/mod/http2_spec.rb
@@ -48,7 +48,7 @@
           h2_tls_cool_down_secs: 0,
           h2_tls_warm_up_size: 0,
           h2_upgrade: false,
-          h2_window_size: 128_000,
+          h2_window_size: 128_000
         }
       end
 
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 1bf8138ab2..661ec0f3b6 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -15,7 +15,7 @@ def general_info_specs_apache24
   context 'passing restrict_access => false' do
     let :params do
       {
-        restrict_access: false,
+        restrict_access: false
       }
     end
 
@@ -44,7 +44,7 @@ def general_info_specs_apache24
     let :params do
       {
         restrict_access: false,
-        allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'],
+        allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1']
       }
     end
 
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index c9ad07e5b4..0197ddc469 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -60,7 +60,7 @@
 
       let :params do
         {
-          enablecapabilities: false,
+          enablecapabilities: false
         }
       end
 
@@ -83,7 +83,7 @@
     context 'with enablecapabilities set' do
       let :params do
         {
-          enablecapabilities: true,
+          enablecapabilities: true
         }
       end
 
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 5830a525dd..6b3f7ff4b6 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -26,16 +26,16 @@
           'worker_a' => {
             'type' => 'ajp13',
             'socket_keepalive' => 'true',
-            'comment' => 'This is worker A',
+            'comment' => 'This is worker A'
           },
           'worker_b' => {
             'type' => 'ajp13',
             'socket_keepalive' => 'true',
-            'comment' => 'This is worker B',
+            'comment' => 'This is worker B'
           },
           'worker_maintain' => 40,
-          'worker_lists' => ['worker_a,worker_b'],
-        },
+          'worker_lists' => ['worker_a,worker_b']
+        }
       }
     end
 
@@ -73,7 +73,7 @@
       end
       let(:params) do
         {
-          logroot: '/var/log/apache2',
+          logroot: '/var/log/apache2'
         }
       end
       let(:mod_dir) { mod_dir }
@@ -97,7 +97,7 @@
     end
     let(:params) do
       {
-        logroot: '/var/log/httpd',
+        logroot: '/var/log/httpd'
       }
     end
 
@@ -140,26 +140,26 @@
           shm_file: :undef,
           log_file: :undef,
           shm_path: '/var/log/httpd/jk-runtime-status',
-          log_path: '/var/log/httpd/mod_jk.log',
+          log_path: '/var/log/httpd/mod_jk.log'
         },
         relative: {
           shm_file: 'shm_file',
           log_file: 'log_file',
           shm_path: '/var/log/httpd/shm_file',
-          log_path: '/var/log/httpd/log_file',
+          log_path: '/var/log/httpd/log_file'
         },
         absolute: {
           shm_file: '/run/shm_file',
           log_file: '/tmp/log_file',
           shm_path: '/run/shm_file',
-          log_path: '/tmp/log_file',
+          log_path: '/tmp/log_file'
         },
         pipe: {
           shm_file: :undef,
           log_file: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
           shm_path: '/var/log/httpd/jk-runtime-status',
-          log_path: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"',
-        },
+          log_path: '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"'
+        }
       }.each do |option, paths|
         context "#{option} shm_file and log_file paths" do
           let(:params) do
diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb
index 49510076de..d55629bcad 100644
--- a/spec/classes/mod/lbmethod_bybusyness.rb
+++ b/spec/classes/mod/lbmethod_bybusyness.rb
@@ -9,7 +9,7 @@
     context 'with Apache version >= 2.4' do
       let :params do
         {
-          apache_version: '2.4',
+          apache_version: '2.4'
         }
       end
 
@@ -26,7 +26,7 @@
     context 'with Apache version >= 2.4' do
       let :params do
         {
-          apache_version: '2.4',
+          apache_version: '2.4'
         }
       end
 
diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb
index 49510076de..d55629bcad 100644
--- a/spec/classes/mod/lbmethod_byrequests.rb
+++ b/spec/classes/mod/lbmethod_byrequests.rb
@@ -9,7 +9,7 @@
     context 'with Apache version >= 2.4' do
       let :params do
         {
-          apache_version: '2.4',
+          apache_version: '2.4'
         }
       end
 
@@ -26,7 +26,7 @@
     context 'with Apache version >= 2.4' do
       let :params do
         {
-          apache_version: '2.4',
+          apache_version: '2.4'
         }
       end
 
diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb
index 49510076de..d55629bcad 100644
--- a/spec/classes/mod/lbmethod_bytraffic.rb
+++ b/spec/classes/mod/lbmethod_bytraffic.rb
@@ -9,7 +9,7 @@
     context 'with Apache version >= 2.4' do
       let :params do
         {
-          apache_version: '2.4',
+          apache_version: '2.4'
         }
       end
 
@@ -26,7 +26,7 @@
     context 'with Apache version >= 2.4' do
       let :params do
         {
-          apache_version: '2.4',
+          apache_version: '2.4'
         }
       end
 
diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb
index 49510076de..d55629bcad 100644
--- a/spec/classes/mod/lbmethod_heartbeat.rb
+++ b/spec/classes/mod/lbmethod_heartbeat.rb
@@ -9,7 +9,7 @@
     context 'with Apache version >= 2.4' do
       let :params do
         {
-          apache_version: '2.4',
+          apache_version: '2.4'
         }
       end
 
@@ -26,7 +26,7 @@
     context 'with Apache version >= 2.4' do
       let :params do
         {
-          apache_version: '2.4',
+          apache_version: '2.4'
         }
       end
 
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 3038683586..8faa1e0502 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -33,7 +33,7 @@
           ldap_cache_ttl: 600,
           ldap_opcache_entries: 1024,
           ldap_opcache_ttl: 600,
-          ldap_path: '/custom-ldap-status',
+          ldap_path: '/custom-ldap-status'
         }
       end
 
@@ -75,7 +75,7 @@
       let(:params) do
         {
           ldap_trusted_global_cert_file: 'ca.pem',
-          ldap_trusted_global_cert_type: 'CA_DER',
+          ldap_trusted_global_cert_type: 'CA_DER'
         }
       end
 
diff --git a/spec/classes/mod/md_spec.rb b/spec/classes/mod/md_spec.rb
index 738671d04e..495cbfd8f3 100644
--- a/spec/classes/mod/md_spec.rb
+++ b/spec/classes/mod/md_spec.rb
@@ -39,7 +39,7 @@
             'md_stapling_keep_response' => { type: 'Duration', pass_opt: 'MDStaplingKeepResponse' },
             'md_stapling_renew_window' => { type: 'Duration', pass_opt: 'MDStaplingRenewWindow' },
             'md_store_dir' => { type: 'Path', pass_opt: 'MDStoreDir' },
-            'md_warn_window' => { type: 'Duration', pass_opt: 'MDWarnWindow' },
+            'md_warn_window' => { type: 'Duration', pass_opt: 'MDWarnWindow' }
           }
 
           md_options.each do |config_option, config_hash|
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 34cb7124d6..603b1cddb7 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -107,7 +107,7 @@
             'rails_ruby' => { type: 'String', pass_opt: :RailsRuby },
             'rails_spawn_method' => { type: 'String', pass_opt: :RailsSpawnMethod },
             'rails_user_switching' => { type: 'String', pass_opt: :RailsUserSwitching },
-            'wsgi_auto_detect' => { type: 'String', pass_opt: :WsgiAutoDetect },
+            'wsgi_auto_detect' => { type: 'String', pass_opt: :WsgiAutoDetect }
           }
           passenger_config_options.each do |config_option, config_hash|
             puppetized_config_option = config_option
@@ -179,7 +179,7 @@
                   let :expected_value do
                     {
                       true => 'On',
-                      false => 'Off',
+                      false => 'Off'
                     }[valid_value]
                   end
 
@@ -216,7 +216,7 @@
             let :params do
               {
                 passenger_installed_version: '4.0.0',
-                passenger_instance_registry_dir: '/some/path/to/nowhere',
+                passenger_instance_registry_dir: '/some/path/to/nowhere'
               }
             end
 
@@ -227,7 +227,7 @@
             let :params do
               {
                 passenger_installed_version: '5.0.0',
-                rails_autodetect: 'on',
+                rails_autodetect: 'on'
               }
             end
 
@@ -238,7 +238,7 @@
             let :params do
               {
                 passenger_installed_version: '5.0.0',
-                rails_ruby: '/some/path/to/ruby',
+                rails_ruby: '/some/path/to/ruby'
               }
             end
 
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 0684e2f642..789cd31196 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -161,7 +161,7 @@
               end
               let :params do
                 {
-                  extensions: ['.php', '.php5'],
+                  extensions: ['.php', '.php5']
                 }
               end
 
@@ -306,7 +306,7 @@
           let :params do
             {
               template: 'apache/mod/php5.conf.erb',
-              content: 'somecontent',
+              content: 'somecontent'
             }
           end
 
@@ -320,7 +320,7 @@
           let :params do
             {
               template: 'apache/mod/php5.conf.erb',
-              source: 'some-path',
+              source: 'some-path'
             }
           end
 
@@ -334,7 +334,7 @@
           let :params do
             {
               content: 'somecontent',
-              source: 'some-path',
+              source: 'some-path'
             }
           end
 
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index e5735cafdd..e89dce60a1 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -47,7 +47,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
       {
         manager: true,
         allow_from: ['10.10.10.10', '11.11.11.11'],
-        manager_path: '/custom-manager',
+        manager_path: '/custom-manager'
       }
     end
 
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 1118cf72dc..e8b3cc36f8 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -90,7 +90,7 @@
                 secrequestbodyaccess: 'Off',
                 secresponsebodyaccess: 'On',
                 secrequestbodylimitaction: 'ProcessPartial',
-                secresponsebodylimitaction: 'Reject',
+                secresponsebodylimitaction: 'Reject'
               }
             end
 
@@ -113,7 +113,7 @@
           describe 'with other modsec parameters' do
             let :params do
               {
-                manage_security_crs: false,
+                manage_security_crs: false
               }
             end
 
@@ -122,7 +122,7 @@
           describe 'with custom parameters' do
             let :params do
               {
-                custom_rules: false,
+                custom_rules: false
               }
             end
 
@@ -134,7 +134,7 @@
             let :params do
               {
                 custom_rules: true,
-                custom_rules_set: ['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"'],
+                custom_rules_set: ['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"']
               }
             end
 
@@ -155,7 +155,7 @@
                 enable_dos_protection: true,
                 dos_burst_time_slice: 30,
                 dos_counter_threshold: 120,
-                dos_block_timeout: 300,
+                dos_block_timeout: 300
               }
             end
 
@@ -201,7 +201,7 @@
             let :params do
               {
                 paranoia_level: 2,
-                executing_paranoia_level: 1,
+                executing_paranoia_level: 1
               }
             end
 
@@ -281,7 +281,7 @@
                 secrequestbodyaccess: 'Off',
                 secresponsebodyaccess: 'On',
                 secrequestbodylimitaction: 'ProcessPartial',
-                secresponsebodylimitaction: 'Reject',
+                secresponsebodylimitaction: 'Reject'
               }
             end
 
@@ -307,7 +307,7 @@
           describe 'with custom parameters' do
             let :params do
               {
-                custom_rules: false,
+                custom_rules: false
               }
             end
 
@@ -320,7 +320,7 @@
             let :params do
               {
                 custom_rules: true,
-                custom_rules_set: ['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"'],
+                custom_rules_set: ['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"']
               }
             end
 
@@ -336,7 +336,7 @@
           describe 'with mod security version' do
             let :params do
               {
-                version: 2,
+                version: 2
               }
             end
 
@@ -356,7 +356,7 @@
                 enable_dos_protection: true,
                 dos_burst_time_slice: 30,
                 dos_counter_threshold: 120,
-                dos_block_timeout: 300,
+                dos_block_timeout: 300
               }
             end
 
@@ -384,7 +384,7 @@
             let :params do
               {
                 paranoia_level: 2,
-                executing_paranoia_level: 1,
+                executing_paranoia_level: 1
               }
             end
 
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index ff1e3ee31b..82f3922c1a 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -28,7 +28,7 @@
       context 'with ssl_proxy_cipher_suite' do
         let(:params) do
           {
-            ssl_proxy_cipher_suite: 'HIGH',
+            ssl_proxy_cipher_suite: 'HIGH'
           }
         end
 
@@ -38,7 +38,7 @@
       context 'with empty ssl_protocol' do
         let(:params) do
           {
-            ssl_protocol: [],
+            ssl_protocol: []
           }
         end
 
@@ -104,7 +104,7 @@
     context 'setting ssl_cert' do
       let :params do
         {
-          ssl_cert: '/etc/pki/some/path/localhost.crt',
+          ssl_cert: '/etc/pki/some/path/localhost.crt'
         }
       end
 
@@ -114,7 +114,7 @@
     context 'setting ssl_key' do
       let :params do
         {
-          ssl_key: '/etc/pki/some/path/localhost.key',
+          ssl_key: '/etc/pki/some/path/localhost.key'
         }
       end
 
@@ -124,7 +124,7 @@
     context 'setting ssl_ca to a path' do
       let :params do
         {
-          ssl_ca: '/etc/pki/some/path/ca.crt',
+          ssl_ca: '/etc/pki/some/path/ca.crt'
         }
       end
 
@@ -135,7 +135,7 @@
       let :params do
         {
           ssl_cert: '/etc/pki/some/path/localhost.crt',
-          ssl_reload_on_change: true,
+          ssl_reload_on_change: true
         }
       end
 
@@ -150,7 +150,7 @@
     context 'with ssl_compression set to true' do
       let :params do
         {
-          ssl_compression: true,
+          ssl_compression: true
         }
       end
 
@@ -160,7 +160,7 @@
     context 'with ssl_sessiontickets set to false' do
       let :params do
         {
-          ssl_sessiontickets: false,
+          ssl_sessiontickets: false
         }
       end
 
@@ -170,7 +170,7 @@
     context 'with ssl_stapling set to true' do
       let :params do
         {
-          ssl_stapling: true,
+          ssl_stapling: true
         }
       end
 
@@ -179,7 +179,7 @@
     context 'with ssl_stapling_return_errors set to true' do
       let :params do
         {
-          ssl_stapling_return_errors: true,
+          ssl_stapling_return_errors: true
         }
       end
 
@@ -188,7 +188,7 @@
     context 'with stapling_cache' do
       let :params do
         {
-          stapling_cache: '/tmp/customstaplingcache(51200)',
+          stapling_cache: '/tmp/customstaplingcache(51200)'
         }
       end
 
@@ -198,7 +198,7 @@
     context 'setting ssl_pass_phrase_dialog' do
       let :params do
         {
-          ssl_pass_phrase_dialog: 'exec:/path/to/program',
+          ssl_pass_phrase_dialog: 'exec:/path/to/program'
         }
       end
 
@@ -208,7 +208,7 @@
     context 'setting ssl_random_seed_bytes' do
       let :params do
         {
-          ssl_random_seed_bytes: 1024,
+          ssl_random_seed_bytes: 1024
         }
       end
 
@@ -218,7 +218,7 @@
     context 'setting ssl_openssl_conf_cmd' do
       let :params do
         {
-          ssl_openssl_conf_cmd: 'DHParameters "foo.pem"',
+          ssl_openssl_conf_cmd: 'DHParameters "foo.pem"'
         }
       end
 
@@ -228,7 +228,7 @@
     context 'setting ssl_mutex' do
       let :params do
         {
-          ssl_mutex: 'posixsem',
+          ssl_mutex: 'posixsem'
         }
       end
 
@@ -237,7 +237,7 @@
     context 'setting ssl_sessioncache' do
       let :params do
         {
-          ssl_sessioncache: '/tmp/customsessioncache(51200)',
+          ssl_sessioncache: '/tmp/customsessioncache(51200)'
         }
       end
 
@@ -246,7 +246,7 @@
     context 'setting ssl_proxy_protocol' do
       let :params do
         {
-          ssl_proxy_protocol: ['-ALL', '+TLSv1'],
+          ssl_proxy_protocol: ['-ALL', '+TLSv1']
         }
       end
 
@@ -261,7 +261,7 @@
       context 'force on' do
         let :params do
           {
-            ssl_honorcipherorder: true,
+            ssl_honorcipherorder: true
           }
         end
 
@@ -271,7 +271,7 @@
       context 'force off' do
         let :params do
           {
-            ssl_honorcipherorder: false,
+            ssl_honorcipherorder: false
           }
         end
 
@@ -281,7 +281,7 @@
       context 'set on' do
         let :params do
           {
-            ssl_honorcipherorder: 'on',
+            ssl_honorcipherorder: 'on'
           }
         end
 
@@ -291,7 +291,7 @@
       context 'set off' do
         let :params do
           {
-            ssl_honorcipherorder: 'off',
+            ssl_honorcipherorder: 'off'
           }
         end
 
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 39111ab6df..19d4ab7e9a 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -69,7 +69,7 @@ def require_directives(requires)
         let :params do
           {
             extended_status: 'Off',
-            status_path: '/custom-status',
+            status_path: '/custom-status'
           }
         end
 
@@ -130,21 +130,21 @@ def require_directives(requires)
         requires: [
           'ip 10.1',
           'host somehost',
-        ],
+        ]
       },
       enforce: {
         enforce: 'all',
         requires: [
           'ip 127.0.0.1',
           'host localhost',
-        ],
-      },
+        ]
+      }
     }
     valid_requires.each do |req_key, req_value|
       context "with default params and #{req_key} requires" do
         let :params do
           {
-            requires: req_value,
+            requires: req_value
           }
         end
 
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 3449373834..fa6c6af8e2 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -19,7 +19,7 @@
     context 'with dir set to something' do
       let :params do
         {
-          dir: 'hi',
+          dir: 'hi'
         }
       end
 
@@ -29,7 +29,7 @@
     context 'with home set to something' do
       let :params do
         {
-          home: '/u',
+          home: '/u'
         }
       end
 
@@ -39,7 +39,7 @@
     context 'with path set to something' do
       let :params do
         {
-          path: '/home/*/*/public_html',
+          path: '/home/*/*/public_html'
         }
       end
 
@@ -50,7 +50,7 @@
       let :params do
         {
           path: '/home/*/*/public_html',
-          userdir: 'public_html',
+          userdir: 'public_html'
         }
       end
 
@@ -60,7 +60,7 @@
     context 'with unmanaged_path set to true' do
       let :params do
         {
-          unmanaged_path: true,
+          unmanaged_path: true
         }
       end
 
@@ -70,7 +70,7 @@
     context 'with custom_fragment set to something' do
       let :params do
         {
-          custom_fragment: 'custom_test_string',
+          custom_fragment: 'custom_test_string'
         }
       end
 
diff --git a/spec/classes/mod/watchdog_spec.rb b/spec/classes/mod/watchdog_spec.rb
index 648357b879..02acc5fdba 100644
--- a/spec/classes/mod/watchdog_spec.rb
+++ b/spec/classes/mod/watchdog_spec.rb
@@ -24,7 +24,7 @@
       context 'with custom configuration' do
         let(:params) do
           {
-            watchdog_interval: 5,
+            watchdog_interval: 5
           }
         end
 
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 25f1ee8b30..4396aba6dc 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -72,7 +72,7 @@
           threadsperchild: 15,
           maxrequestsperchild: 16,
           threadlimit: 17,
-          listenbacklog: 8,
+          listenbacklog: 8
         }
       end
 
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 95d10625d6..1fcc95789f 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -63,7 +63,7 @@
       let :params do
         {
           package_name: 'mod_wsgi_package',
-          mod_path: '/foo/bar/baz',
+          mod_path: '/foo/bar/baz'
         }
       end
 
@@ -78,7 +78,7 @@
       let :params do
         {
           package_name: 'mod_wsgi_package',
-          mod_path: 'wsgi_mod_name.so',
+          mod_path: 'wsgi_mod_name.so'
         }
       end
 
@@ -91,7 +91,7 @@
     describe 'with package_name but no mod_path' do
       let :params do
         {
-          mod_path: '/foo/bar/baz',
+          mod_path: '/foo/bar/baz'
         }
       end
 
@@ -100,7 +100,7 @@
     describe 'with mod_path but no package_name' do
       let :params do
         {
-          package_name: '/foo/bar/baz',
+          package_name: '/foo/bar/baz'
         }
       end
 
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 1b6b2e4590..2e621b137e 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -101,7 +101,7 @@
       {
         'service_ensure' => 'running',
         'service_name' => 'httpd',
-        'service_manage' => false,
+        'service_manage' => false
       }
     end
 
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
index 01ae1848c3..70f0cae528 100644
--- a/spec/classes/vhosts_spec.rb
+++ b/spec/classes/vhosts_spec.rb
@@ -12,13 +12,13 @@
           vhosts: {
             'custom_vhost_1' => {
               'docroot' => '/var/www/custom_vhost_1',
-              'port' => 81,
+              'port' => 81
             },
             'custom_vhost_2' => {
               'docroot' => '/var/www/custom_vhost_2',
-              'port' => 82,
-            },
-          },
+              'port' => 82
+            }
+          }
         }
       end
 
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index 3b2078aae6..fd299b954a 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -21,7 +21,7 @@
     describe 'accept a target parameter and use it' do
       let :params do
         {
-          target: '/tmp/myapp.conf',
+          target: '/tmp/myapp.conf'
         }
       end
 
@@ -32,7 +32,7 @@
     describe 'accept an options parameter and use it' do
       let :params do
         {
-          options: ['timeout=0', 'nonce=none'],
+          options: ['timeout=0', 'nonce=none']
         }
       end
 
@@ -59,8 +59,8 @@
     let :params do
       {
         proxy_set: {
-          'lbmethod' => 'bytraffic',
-        },
+          'lbmethod' => 'bytraffic'
+        }
       }
     end
 
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 9521d52ee6..aeef4f1cce 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -24,7 +24,7 @@
       {
         options: [],
         url: 'http://127.0.0.1:8080/',
-        balancer_cluster: 'balancer-internal',
+        balancer_cluster: 'balancer-internal'
       }
     end
 
@@ -44,7 +44,7 @@
       {
         options: [],
         url: 'http://127.0.0.1:8080/',
-        balancer_cluster: 'balancername',
+        balancer_cluster: 'balancername'
       }
     end
 
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 85f03f90c8..604ea2f4bd 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -15,7 +15,7 @@
   context 'defaults with content' do
     let :params do
       {
-        'content' => '# Test',
+        'content' => '# Test'
       }
     end
 
@@ -43,7 +43,7 @@
         'confdir' => '/dne',
         'priority' => 30,
         'source' => 'puppet:///modules/apache/test',
-        'verify_command' => ['/bin/true'],
+        'verify_command' => ['/bin/true']
       }
     end
 
@@ -66,7 +66,7 @@
     let :params do
       {
         'content' => '# test',
-        'verify_config' => false,
+        'verify_config' => false
       }
     end
 
@@ -77,7 +77,7 @@
   context 'ensure => absent' do
     let :params do
       {
-        'ensure' => 'absent',
+        'ensure' => 'absent'
       }
     end
 
@@ -90,7 +90,7 @@
       let :params do
         {
           'content' => 'foo',
-          'source' => 'bar',
+          'source' => 'bar'
         }
       end
 
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 43a0ab25e3..a66fcb4752 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -8,7 +8,7 @@
   end
   let(:params) do
     {
-      content: 'foobar',
+      content: 'foobar'
     }
   end
 
diff --git a/spec/defines/vhost_fragment_spec.rb b/spec/defines/vhost_fragment_spec.rb
index c5aac54c96..0352d5c8bb 100644
--- a/spec/defines/vhost_fragment_spec.rb
+++ b/spec/defines/vhost_fragment_spec.rb
@@ -15,7 +15,7 @@
           {
             vhost: 'default',
             port: 80,
-            priority: 15,
+            priority: 15
           }
         end
 
@@ -47,7 +47,7 @@
         let(:params) do
           {
             vhost: 'custom',
-            content: '# Foo',
+            content: '# Foo'
           }
         end
 
diff --git a/spec/defines/vhost_proxy_spec.rb b/spec/defines/vhost_proxy_spec.rb
index fbdf642386..1619a10121 100644
--- a/spec/defines/vhost_proxy_spec.rb
+++ b/spec/defines/vhost_proxy_spec.rb
@@ -15,7 +15,7 @@
           {
             vhost: 'default',
             port: 80,
-            priority: 15,
+            priority: 15
           }
         end
 
@@ -29,7 +29,7 @@
               proxy_pass: [
                 {
                   path: '/',
-                  url: 'http://localhost:8080/',
+                  url: 'http://localhost:8080/'
                 },
               ],
             )
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index a52289283d..f9972f4f43 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -18,7 +18,7 @@
       let :default_params do
         {
           docroot: '/rspec/docroot',
-          port: 84,
+          port: 84
         }
       end
 
@@ -89,7 +89,7 @@
               'aliases' => [
                 {
                   'alias' => '/image',
-                  'path' => '/rspec/image',
+                  'path' => '/rspec/image'
                 },
               ],
               'access_log' => false,
@@ -101,17 +101,17 @@
                 {
                   'path' => '/var/www/files',
                   'provider' => 'files',
-                  'require' => ['valid-user', 'all denied'],
+                  'require' => ['valid-user', 'all denied']
                 },
                 {
                   'path' => '/var/www/files',
                   'provider' => 'files',
-                  'additional_includes' => ['/custom/path/includes', '/custom/path/another_includes'],
+                  'additional_includes' => ['/custom/path/includes', '/custom/path/another_includes']
                 },
                 {
                   'path' => '/var/www/files',
                   'provider' => 'files',
-                  'require' => 'all granted',
+                  'require' => 'all granted'
                 },
                 {
                   'path' => '/var/www/files',
@@ -119,8 +119,8 @@
                   'require' =>
                   {
                     'enforce' => 'all',
-                    'requires' => ['all-valid1', 'all-valid2'],
-                  },
+                    'requires' => ['all-valid1', 'all-valid2']
+                  }
                 },
                 {
                   'path' => '/var/www/files',
@@ -128,8 +128,8 @@
                   'require' =>
                   {
                     'enforce' => 'none',
-                    'requires' => ['none-valid1', 'none-valid2'],
-                  },
+                    'requires' => ['none-valid1', 'none-valid2']
+                  }
                 },
                 {
                   'path' => '/var/www/files',
@@ -137,12 +137,12 @@
                   'require' =>
                   {
                     'enforce' => 'any',
-                    'requires' => ['any-valid1', 'any-valid2'],
-                  },
+                    'requires' => ['any-valid1', 'any-valid2']
+                  }
                 },
                 {
                   'path' => '*',
-                  'provider' => 'proxy',
+                  'provider' => 'proxy'
                 },
                 { 'path' => '/var/www/files/indexed_directory',
                   'directoryindex' => 'disabled',
@@ -175,7 +175,7 @@
                   'h2_push_resource' => [
                     '/foo.css',
                     '/foo.js',
-                  ],
+                  ]
                 },
                 {
                   'path' => '/',
@@ -184,7 +184,7 @@
                   'auth_basic_fake' => 'demo demopass',
                   'auth_user_file' => '/path/to/authz_user_file',
                   'auth_group_file' => '/path/to/authz_group_file',
-                  'setenv' => ['SPECIAL_PATH /foo/bin'],
+                  'setenv' => ['SPECIAL_PATH /foo/bin']
                 },
                 {
                   'path' => '/proxy',
@@ -195,10 +195,10 @@
                       'keywords' => ['noquery', 'interpolate'],
                       'params' => {
                         'retry' => 0,
-                        'timeout' => 5,
-                      },
+                        'timeout' => 5
+                      }
                     },
-                  ],
+                  ]
                 },
                 {
                   'path' => '^/proxy',
@@ -209,10 +209,10 @@
                       'keywords' => ['noquery', 'interpolate'],
                       'params' => {
                         'retry' => 0,
-                        'timeout' => 5,
-                      },
+                        'timeout' => 5
+                      }
                     },
-                  ],
+                  ]
                 },
                 {
                   'path' => '/var/www/node-app/public',
@@ -269,14 +269,14 @@
                     'cred_store' => {
                       'ccache' => ['/path/to/directory'],
                       'client_keytab' => ['/path/to/example.keytab'],
-                      'keytab' => ['/path/to/example.keytab'],
+                      'keytab' => ['/path/to/example.keytab']
                     },
                     'deleg_ccache_dir' => '/path/to/directory',
                     'deleg_ccache_env_var' => 'KRB5CCNAME',
                     'deleg_ccache_perms' => {
                       'mode' => '0600',
                       'uid' => 'example-user',
-                      'gid' => 'example-group',
+                      'gid' => 'example-group'
                     },
                     'deleg_ccache_unique' => true,
                     'impersonate' => true,
@@ -290,15 +290,15 @@
                     'signal_persistent_auth' => true,
                     'ssl_only' => true,
                     'use_s4u2_proxy' => true,
-                    'use_sessions' => true,
-                  },
+                    'use_sessions' => true
+                  }
                 },
                 {
                   'path' => '/private_1',
                   'provider' => 'location',
                   'ssl_options' => ['+ExportCertData', '+StdEnvVars'],
                   'ssl_verify_client' => 'optional',
-                  'ssl_verify_depth' => 10,
+                  'ssl_verify_depth' => 10
                 },
               ],
               'error_log' => false,
@@ -311,11 +311,11 @@
               'scriptaliases' => [
                 {
                   'alias' => '/myscript',
-                  'path' => '/usr/share/myscript',
+                  'path' => '/usr/share/myscript'
                 },
                 {
                   'aliasmatch' => '^/foo(.*)',
-                  'path' => '/usr/share/fooscripts$1',
+                  'path' => '/usr/share/fooscripts$1'
                 },
               ],
               'limitreqfieldsize' => 8190,
@@ -333,18 +333,18 @@
                   'reverse_cookies' => [
                     {
                       'path' => '/a',
-                      'url' => 'http://backend-a/',
+                      'url' => 'http://backend-a/'
                     },
                     {
                       'domain' => 'foo',
-                      'url' => 'http://foo',
+                      'url' => 'http://foo'
                     },
                   ],
                   'params' => {
                     'retry' => 0,
-                    'timeout' => 5,
+                    'timeout' => 5
                   },
-                  'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
+                  'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1']
                 },
               ],
               'proxy_pass_match' => [
@@ -356,9 +356,9 @@
                   'no_proxy_uris_match' => ['/a/foomatch'],
                   'params' => {
                     'retry' => 0,
-                    'timeout' => 5,
+                    'timeout' => 5
                   },
-                  'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
+                  'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1']
                 },
               ],
               'proxy_requests' => false,
@@ -379,7 +379,7 @@
               'request_headers' => ['append MirrorID "mirror 12"'],
               'rewrites' => [
                 {
-                  'rewrite_rule' => ['^index.html$ rewrites.html'],
+                  'rewrite_rule' => ['^index.html$ rewrites.html']
                 },
               ],
               'filters' => [
@@ -404,25 +404,25 @@
               'wsgi_daemon_process_options' => {
                 'processes' => 2,
                 'threads' => 15,
-                'display-name' => '%{GROUP}',
+                'display-name' => '%{GROUP}'
               },
               'wsgi_import_script' => '/var/www/demo.wsgi',
               'wsgi_import_script_options' => {
                 'process-group' => 'wsgi',
-                'application-group' => '%{GLOBAL}',
+                'application-group' => '%{GLOBAL}'
               },
               'wsgi_process_group' => 'wsgi',
               'wsgi_script_aliases' => {
-                '/' => '/var/www/demo.wsgi',
+                '/' => '/var/www/demo.wsgi'
               },
               'wsgi_script_aliases_match' => {
-                '^/test/(^[/*)' => '/var/www/demo.wsgi',
+                '^/test/(^[/*)' => '/var/www/demo.wsgi'
               },
               'wsgi_pass_authorization' => 'On',
               'custom_fragment' => '#custom string',
               'itk' => {
                 'user' => 'someuser',
-                'group' => 'somegroup',
+                'group' => 'somegroup'
               },
               'wsgi_chunked_request' => 'On',
               'action' => 'foo',
@@ -526,7 +526,7 @@
                                    'ClientSecret' => 'aae053a9-4abf-4824-8956-e94b2af335c8',
                                    'CryptoPassphrase' => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
               'mdomain' => 'example.com example.net auto',
-              'userdir' => 'disabled',
+              'userdir' => 'disabled'
             }
           end
 
@@ -924,7 +924,7 @@
               'override' => ['All'],
               'directoryindex' => 'index.html',
               'vhost_name' => 'test',
-              'proxy_add_headers' => true,
+              'proxy_add_headers' => true
             }
           end
 
@@ -951,7 +951,7 @@
               'override' => ['All'],
               'directoryindex' => 'index.html',
               'vhost_name' => 'test',
-              'proxy_add_headers' => false,
+              'proxy_add_headers' => false
             }
           end
 
@@ -977,7 +977,7 @@
               'options' => ['MultiView'],
               'override' => ['All'],
               'directoryindex' => 'index.html',
-              'vhost_name' => 'test',
+              'vhost_name' => 'test'
             }
           end
 
@@ -1004,7 +1004,7 @@
               'override' => ['All'],
               'directoryindex' => 'index.html',
               'vhost_name' => 'test',
-              'proxy_preserve_host' => true,
+              'proxy_preserve_host' => true
             }
           end
 
@@ -1116,7 +1116,7 @@
               'servername' => 'example.com',
               'docroot' => '/var/www/html',
               'add_listen' => true,
-              'ensure' => 'present',
+              'ensure' => 'present'
             }
           end
 
@@ -1141,7 +1141,7 @@
               'servername' => 'example.com',
               'docroot' => '/var/www/html',
               'add_listen' => true,
-              'ensure' => 'present',
+              'ensure' => 'present'
             }
           end
 
@@ -1166,7 +1166,7 @@
               'servername' => 'example.com',
               'docroot' => '/var/www/html',
               'add_listen' => true,
-              'ensure' => 'present',
+              'ensure' => 'present'
             }
           end
 
@@ -1195,7 +1195,7 @@
               'servername' => 'example.com',
               'docroot' => '/var/www/html',
               'add_listen' => true,
-              'ensure' => 'present',
+              'ensure' => 'present'
             }
           end
 
@@ -1218,7 +1218,7 @@
               'servername' => 'example.com',
               'docroot' => '/var/www/html',
               'add_listen' => true,
-              'ensure' => 'present',
+              'ensure' => 'present'
             }
           end
 
@@ -1236,7 +1236,7 @@
           let :params do
             {
               'docroot' => '/var/www/html',
-              'virtual_docroot' => '/var/www/sites/%0',
+              'virtual_docroot' => '/var/www/sites/%0'
             }
           end
 
@@ -1257,7 +1257,7 @@
             {
               'docroot' => '/var/www/html',
               'virtual_use_default_docroot' => true,
-              'virtual_docroot' => '/var/www/sites/%0',
+              'virtual_docroot' => '/var/www/sites/%0'
             }
           end
 
@@ -1278,7 +1278,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'modsec_audit_log' => true,
+              'modsec_audit_log' => true
             }
           end
 
@@ -1293,7 +1293,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'modsec_audit_log_file' => 'foo.log',
+              'modsec_audit_log_file' => 'foo.log'
             }
           end
 
@@ -1310,7 +1310,7 @@
             {
               'docroot' => '/rspec/docroot',
               'modsec_inbound_anomaly_threshold' => 10_000,
-              'modsec_outbound_anomaly_threshold' => 10_000,
+              'modsec_outbound_anomaly_threshold' => 10_000
             }
           end
 
@@ -1335,7 +1335,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'modsec_allowed_methods' => 'GET HEAD POST OPTIONS',
+              'modsec_allowed_methods' => 'GET HEAD POST OPTIONS'
             }
           end
 
@@ -1361,9 +1361,9 @@
               'aliases' => [
                 {
                   'alias' => '/alias',
-                  'path' => '/rspec/docroot',
+                  'path' => '/rspec/docroot'
                 },
-              ],
+              ]
             }
           end
 
@@ -1377,9 +1377,9 @@
                 {
                   'path' => '.*',
                   'url' => 'http://backend-a/',
-                  'params' => { 'timeout' => 300 },
+                  'params' => { 'timeout' => 300 }
                 },
-              ],
+              ]
             }
           end
 
@@ -1394,7 +1394,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'proxy_dest_match' => '/',
+              'proxy_dest_match' => '/'
             }
           end
 
@@ -1408,7 +1408,7 @@
             {
               'docroot' => '/rspec/docroot',
               'proxy_dest_match' => '/',
-              'proxy_dest_reverse_match' => 'http://localhost:8180',
+              'proxy_dest_reverse_match' => 'http://localhost:8180'
             }
           end
 
@@ -1426,7 +1426,7 @@
               'ensure' => 'absent',
               'manage_docroot' => true,
               'logroot' => '/tmp/logroot',
-              'logroot_ensure' => 'absent',
+              'logroot_ensure' => 'absent'
             }
           end
 
@@ -1488,7 +1488,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'wsgi_application_group' => '%{GLOBAL}',
+              'wsgi_application_group' => '%{GLOBAL}'
             }
           end
 
@@ -1498,7 +1498,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'wsgi_daemon_process' => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} },
+              'wsgi_daemon_process' => { 'foo' => { 'python-home' => '/usr' }, 'bar' => {} }
             }
           end
 
@@ -1508,7 +1508,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'wsgi_import_script' => '/var/www/demo.wsgi',
+              'wsgi_import_script' => '/var/www/demo.wsgi'
             }
           end
 
@@ -1520,8 +1520,8 @@
               'docroot' => '/rspec/docroot',
               'wsgi_import_script_options' => {
                 'process-group' => 'wsgi',
-                'application-group' => '%{GLOBAL}',
-              },
+                'application-group' => '%{GLOBAL}'
+              }
             }
           end
 
@@ -1534,8 +1534,8 @@
               'wsgi_import_script' => '/var/www/demo.wsgi',
               'wsgi_import_script_options' => {
                 'process-group' => 'wsgi',
-                'application-group' => '%{GLOBAL}',
-              },
+                'application-group' => '%{GLOBAL}'
+              }
             }
           end
 
@@ -1545,7 +1545,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'wsgi_daemon_process' => 'wsgi',
+              'wsgi_daemon_process' => 'wsgi'
             }
           end
 
@@ -1556,8 +1556,8 @@
             {
               'docroot' => '/rspec/docroot',
               'wsgi_script_aliases' => {
-                '/' => '/var/www/demo.wsgi',
-              },
+                '/' => '/var/www/demo.wsgi'
+              }
             }
           end
 
@@ -1567,7 +1567,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'wsgi_script_aliases' => {},
+              'wsgi_script_aliases' => {}
             }
           end
 
@@ -1577,7 +1577,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'wsgi_pass_authorization' => 'On',
+              'wsgi_pass_authorization' => 'On'
             }
           end
 
@@ -1587,7 +1587,7 @@
           let :params do
             {
               'docroot' => false,
-              'manage_docroot' => false,
+              'manage_docroot' => false
             }
           end
 
@@ -1599,7 +1599,7 @@
             {
               'docroot' => '/rspec/docroot',
               'ssl' => false,
-              'ssl_proxyengine' => true,
+              'ssl_proxyengine' => true
             }
           end
 
@@ -1613,7 +1613,7 @@
               'docroot' => '/rspec/docroot',
               'ssl' => true,
               'ssl_proxyengine' => false,
-              'ssl_proxy_protocol' => 'TLSv1.2',
+              'ssl_proxy_protocol' => 'TLSv1.2'
             }
           end
 
@@ -1625,7 +1625,7 @@
           let :params do
             {
               'docroot' => '/rspec/docroot',
-              'ssl' => true,
+              'ssl' => true
             }
           end
 
@@ -1672,7 +1672,7 @@
             let(:params) do
               {
                 'docroot' => '/rspec/docroot',
-                'access_log_file' => 'my_log_file',
+                'access_log_file' => 'my_log_file'
               }
             end
 
@@ -1687,7 +1687,7 @@
               {
                 'docroot' => '/rspec/docroot',
                 'access_log_file' => 'my_log_file',
-                'access_log_env_var' => 'prod',
+                'access_log_env_var' => 'prod'
               }
             end
 
@@ -1705,7 +1705,7 @@
                   { 'file' => '/tmp/log1', 'env' => 'dev' },
                   { 'file' => 'log2' },
                   { 'syslog' => 'syslog', 'format' => '%h %l' },
-                ],
+                ]
               }
             end
 
@@ -1731,7 +1731,7 @@
             let(:params) do
               {
                 'docroot' => '/rspec/docroot',
-                'error_log_format' => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i'],
+                'error_log_format' => ['[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i']
               }
             end
 
@@ -1752,7 +1752,7 @@
                   { "[%{uc}t] [R:%L] UA:'%+{User-Agent}i'" => 'request' },
                   { "[%{uc}t] [R:%L] Referer:'%+{Referer}i'" => 'request' },
                   { '[%{uc}t] [C:%{c}L] local\ %a remote\ %A' => 'connection' },
-                ],
+                ]
               }
             end
 
@@ -1769,7 +1769,7 @@
         describe 'validation' do
           let(:params) do
             {
-              'docroot' => '/rspec/docroot',
+              'docroot' => '/rspec/docroot'
             }
           end
 
@@ -1884,9 +1884,9 @@
                 'directories' => [
                   {
                     'path' => '/var/www/foo/files',
-                    'provider' => 'files',
+                    'provider' => 'files'
                   },
-                ],
+                ]
 
               }
             end
@@ -1912,9 +1912,9 @@
                 'directories' => [
                   {
                     'path' => '/var/www/foo',
-                    'require' => 'unmanaged',
+                    'require' => 'unmanaged'
                   },
-                ],
+                ]
 
               }
             end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 07db73426e..50071092d7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,7 +13,7 @@
 
 default_facts = {
   puppetversion: Puppet.version,
-  facterversion: Facter.version,
+  facterversion: Facter.version
 }
 
 default_fact_files = [
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 410c73818e..d2c5fc09bf 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -67,12 +67,12 @@
         family: 'Redhat',
         release: {
           major: '28',
-          full: '28',
-        },
+          full: '28'
+        }
       },
       identity: {
-        uid: 'root',
-      },
+        uid: 'root'
+      }
     }
   end
 end
@@ -86,12 +86,12 @@
         name: 'FreeBSD',
         family: 'FreeBSD',
         release: {
-          full: '9',
-        },
+          full: '9'
+        }
       },
       identity: {
-        uid: 'root',
-      },
+        uid: 'root'
+      }
     }
   end
 end
@@ -105,12 +105,12 @@
         name: 'FreeBSD',
         family: 'FreeBSD',
         release: {
-          full: '10',
-        },
+          full: '10'
+        }
       },
       identity: {
-        uid: 'root',
-      },
+        uid: 'root'
+      }
     }
   end
 end
@@ -125,12 +125,12 @@
         family: 'Gentoo',
         release: {
           major: '2.7',
-          full: '2.7',
-        },
+          full: '2.7'
+        }
       },
       identity: {
-        uid: 'root',
-      },
+        uid: 'root'
+      }
     }
   end
 end
@@ -142,9 +142,9 @@
         family: 'Darwin',
         name: 'Darwin',
         release: {
-          full: '13.1.0',
-        },
-      },
+          full: '13.1.0'
+        }
+      }
     }
   end
 end
@@ -158,12 +158,12 @@
         name: 'Magic',
         family: 'Magic',
         release: {
-          full: '0',
-        },
+          full: '0'
+        }
       },
       identity: {
-        uid: 'root',
-      },
+        uid: 'root'
+      }
     }
   end
 end
diff --git a/spec/util/apache_mod_platform_compatibility_spec.rb b/spec/util/apache_mod_platform_compatibility_spec.rb
index 356f4a55aa..f2ab43c297 100644
--- a/spec/util/apache_mod_platform_compatibility_spec.rb
+++ b/spec/util/apache_mod_platform_compatibility_spec.rb
@@ -18,7 +18,7 @@
     'scientific' => [6, 7],
     'debian' => [8, 9, 10],
     'sles' => [11, 12, 15],
-    'ubuntu' => [14, 16, 18],
+    'ubuntu' => [14, 16, 18]
   }
 
   context 'when initialized' do
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb
index 04d29bbe9d..b857126d20 100644
--- a/util/apache_mod_platform_support.rb
+++ b/util/apache_mod_platform_support.rb
@@ -23,7 +23,7 @@
 class ApacheModPlatformCompatibility
   ERROR_MSG = {
     tag_parse: 'OS and version information in incorrect format:',
-    os_parse: 'OS name is not present in metadata.json:',
+    os_parse: 'OS name is not present in metadata.json:'
   }.freeze
 
   def initialize

From 156539ac2a68e977585c0c6d9e047b12d8d2a45b Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 09:21:11 +0100
Subject: [PATCH 2110/2267] (CONT-772) Correct RSpec/EmptyLineAfterExample

---
 .rubocop_todo.yml                             |  4 +-
 spec/acceptance/apache_ssl_spec.rb            |  3 +
 spec/acceptance/vhost_spec.rb                 | 12 ++++
 spec/classes/apache_spec.rb                   | 34 +++++++++++
 spec/classes/dev_spec.rb                      |  2 +
 spec/classes/mod/auth_cas_spec.rb             |  1 +
 spec/classes/mod/auth_openidc_spec.rb         |  1 +
 spec/classes/mod/dav_svn_spec.rb              |  2 +
 spec/classes/mod/deflate_spec.rb              |  1 +
 spec/classes/mod/dir_spec.rb                  |  1 +
 spec/classes/mod/disk_cache_spec.rb           | 10 ++++
 spec/classes/mod/event_spec.rb                |  1 +
 spec/classes/mod/expires_spec.rb              |  2 +
 spec/classes/mod/fcgid_spec.rb                |  8 +++
 spec/classes/mod/http2_spec.rb                |  1 +
 spec/classes/mod/info_spec.rb                 |  1 +
 spec/classes/mod/itk_spec.rb                  |  1 +
 spec/classes/mod/jk_spec.rb                   |  3 +
 spec/classes/mod/mime_magic_spec.rb           |  1 +
 spec/classes/mod/negotiation_spec.rb          |  1 +
 spec/classes/mod/passenger_spec.rb            | 11 ++++
 spec/classes/mod/php_spec.rb                  |  9 +++
 spec/classes/mod/prefork_spec.rb              |  2 +
 spec/classes/mod/proxy_html_spec.rb           |  2 +
 spec/classes/mod/proxy_spec.rb                |  1 +
 spec/classes/mod/remoteip_spec.rb             |  1 +
 spec/classes/mod/rpaf_spec.rb                 |  6 ++
 spec/classes/mod/security_spec.rb             | 20 +++++++
 spec/classes/mod/ssl_spec.rb                  |  1 +
 spec/classes/mod/worker_spec.rb               |  2 +
 spec/classes/mod/wsgi_spec.rb                 |  8 +++
 spec/defines/custom_config_spec.rb            |  4 ++
 spec/defines/mod_spec.rb                      |  5 ++
 spec/defines/modsec_link_spec.rb              |  1 +
 spec/defines/vhost_custom_spec.rb             |  1 +
 spec/defines/vhost_spec.rb                    | 60 +++++++++++++++++++
 spec/functions/bool2httpd_spec.rb             |  4 ++
 .../apache_mod_platform_compatibility_spec.rb | 15 +++++
 38 files changed, 241 insertions(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 772e71473d..d5b76ffbcd 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -76,8 +76,8 @@ RSpec/DescribeClass:
 # Offense count: 239
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Enabled: false
+# RSpec/EmptyLineAfterExample:
+#   Enabled: false
 
 # Offense count: 270
 # This cop supports safe autocorrection (--autocorrect).
diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb
index 5e1c5909b6..08b249c9e4 100644
--- a/spec/acceptance/apache_ssl_spec.rb
+++ b/spec/acceptance/apache_ssl_spec.rb
@@ -23,6 +23,7 @@ class { 'apache':
 
     describe file("#{apache_hash['mod_ssl_dir']}/ssl.conf") do
       it { is_expected.to be_file }
+
       if os[:family].include?('redhat') && os[:release].to_i >= 8
         it { is_expected.not_to contain 'SSLProtocol' }
       elsif ['debian', 'ubuntu'].include?(os[:family])
@@ -40,6 +41,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
       it { is_expected.to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
       it { is_expected.to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
+
       if apache_hash['version'] == '2.4'
         it { is_expected.to contain 'SSLCARevocationCheck    chain' }
       else
@@ -107,6 +109,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLVerifyClient         require' }
       it { is_expected.to contain 'SSLVerifyDepth          1' }
       it { is_expected.to contain 'SSLOptions test test1' }
+
       if apache_hash['version'] == '2.4'
         it { is_expected.to contain 'SSLCARevocationCheck    chain flag' }
       else
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index e10d22dbb2..36faf5b6c7 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -315,6 +315,7 @@ class { 'apache': }
       it 'answers to files.example.net #stdout' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
+
       it 'answers to files.example.net #stderr' do
         result = run_shell('/usr/bin/curl -sSf files.example.net:80/index.html.bak', expect_failures: true)
         expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
@@ -369,14 +370,17 @@ class { 'apache': }
       it 'answers to files.example.net #stdout' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/').stdout).to eq("Hello World\n")
       end
+
       it 'answers to files.example.net #stdout foo' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/foo/').stdout).to eq("Hello Foo\n")
       end
+
       it 'answers to files.example.net #stderr' do
         result = run_shell('/usr/bin/curl -sSf files.example.net:80/private.html', expect_failures: true)
         expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
         expect(result.exit_code).to eq 22
       end
+
       it 'answers to files.example.net #stdout bar' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/bar/bar.html').stdout).to eq("Hello Bar\n")
       end
@@ -411,6 +415,7 @@ class { 'apache': }
       it 'answers to files.example.net #stdout' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
+
       it 'answers to files.example.net #stdout regex' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/server-status?auto').stdout).to match(%r{Scoreboard: })
       end
@@ -576,6 +581,7 @@ class { 'apache': default_vhost => false, }
         expect(r.stdout).to eq("Hello from localhost\n")
       end
     end
+
     it 'gets a response from the back end #exit_code' do
       run_shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.exit_code).to eq(0)
@@ -621,6 +627,7 @@ class { 'apache': default_vhost => false, }
         expect(r.stdout).to eq("Hello from localhost\n")
       end
     end
+
     it 'gets a response from the back end #exit_code' do
       run_shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.exit_code).to eq(0)
@@ -967,6 +974,7 @@ class { 'apache': }
       it 'applies cleanly' do
         _result = apply_manifest(pp, catch_failures: true)
       end
+
       describe file("#{apache_hash['vhost_dir']}/25-test.servername.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain '  ErrorLog "/tmp/test.servername_error.log' }
@@ -986,6 +994,7 @@ class { 'apache': }
       it 'applies cleanly' do
         _result = apply_manifest(pp, catch_failures: true)
       end
+
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain '  ErrorLog "/tmp/test.server_error.log' }
@@ -1147,6 +1156,7 @@ class { 'apache::mod::wsgi': }
       it 'import_script applies cleanly' do
         apply_manifest(pp, catch_failures: true)
       end
+
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
@@ -1212,6 +1222,7 @@ class { 'apache::mod::shib': }
     it 'applies cleanly' do
       apply_manifest(pp, catch_failures: true)
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ShibCompatValidUser On' }
@@ -1241,6 +1252,7 @@ class { 'apache': }
     it 'applys cleanly' do
       apply_manifest(pp, catch_failures: true)
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'OIDCProviderMetadataURL https://login.example.com/.well-known/openid-configuration' }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 3fff25d6f0..f5236e4d7a 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -7,45 +7,54 @@
     include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_package('httpd').with(
         'notify' => 'Class[Apache::Service]',
         'ensure' => 'installed',
       )
     }
+
     it { is_expected.to contain_user('www-data') }
     it { is_expected.to contain_group('www-data') }
     it { is_expected.to contain_class('apache::service') }
+
     it {
       is_expected.to contain_file('/var/www/html').with(
         'ensure' => 'directory',
       )
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/sites-enabled').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/mods-enabled').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/mods-available').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'false'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it { is_expected.to contain_file('/etc/apache2/apache2.conf').without_content(%r{ServerAdmin}) }
+
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
     }
+
     # Assert that load files are placed and symlinked for these mods, but no conf file.
     ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
@@ -54,6 +63,7 @@
           'ensure' => 'file',
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.load symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.load",
@@ -61,6 +71,7 @@
           'target' => "/etc/apache2/mods-available/#{modname}.load",
         )
       }
+
       it { is_expected.not_to contain_file("#{modname}.conf") }
       it { is_expected.not_to contain_file("#{modname}.conf symlink") }
     end
@@ -125,6 +136,7 @@
           'ensure' => 'file',
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.load symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.load",
@@ -132,12 +144,14 @@
           'target' => "/etc/apache2/mods-available/#{modname}.load",
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.conf").with(
           'path' => "/etc/apache2/mods-available/#{modname}.conf",
           'ensure' => 'file',
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.conf symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.conf",
@@ -198,6 +212,7 @@
           is_expected.to contain_file('/etc/apache2/apache2.conf').with_content reg
         end
       end
+
       it 'Not expected to contain' do
         unexpected.each do |reg|
           is_expected.to contain_file('/etc/apache2/apache2.conf').without_content reg
@@ -229,32 +244,38 @@
     include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_package('httpd').with(
         'notify' => 'Class[Apache::Service]',
         'ensure' => 'installed',
       )
     }
+
     it { is_expected.to contain_user('apache') }
     it { is_expected.to contain_group('apache') }
     it { is_expected.to contain_class('apache::service') }
+
     it {
       is_expected.to contain_file('/var/www/html').with(
         'ensure' => 'directory',
       )
     }
+
     it {
       is_expected.to contain_file('/etc/httpd/conf.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_concat('/etc/httpd/conf/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
     }
+
     describe 'Alternate confd/mod/vhosts directory' do
       let :params do
         {
@@ -280,6 +301,7 @@
             "/etc/httpd/mod.d/#{modname}.load",
           )
         }
+
         it {
           is_expected.not_to contain_file("#{modname}.conf").with_path(
             "/etc/httpd/mod.d/#{modname}.conf",
@@ -294,6 +316,7 @@
             "/etc/httpd/mod.d/#{modname}.load",
           )
         }
+
         it {
           is_expected.to contain_file("#{modname}.conf").with_path(
             "/etc/httpd/mod.d/#{modname}.conf",
@@ -521,29 +544,34 @@
     it { is_expected.to contain_user('www') }
     it { is_expected.to contain_group('www') }
     it { is_expected.to contain_class('apache::service') }
+
     it {
       is_expected.to contain_file('/usr/local/www/apache24/data').with(
         'ensure' => 'directory',
       )
     }
+
     it {
       is_expected.to contain_file('/usr/local/etc/apache24/Vhosts').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_file('/usr/local/etc/apache24/Modules').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_concat('/usr/local/etc/apache24/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
     }
+
     # Assert that load files are placed for these mods, but no conf file.
     ['auth_basic', 'authn_core', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
@@ -552,6 +580,7 @@
           'ensure' => 'file',
         )
       }
+
       it { is_expected.not_to contain_file("#{modname}.conf") }
     end
 
@@ -563,6 +592,7 @@
           'ensure' => 'file',
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.conf").with(
           'path' => "/usr/local/etc/apache24/Modules/#{modname}.conf",
@@ -578,23 +608,27 @@
     it { is_expected.to contain_user('apache') }
     it { is_expected.to contain_group('apache') }
     it { is_expected.to contain_class('apache::service') }
+
     it {
       is_expected.to contain_file('/var/www/localhost/htdocs').with(
         'ensure' => 'directory',
       )
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/vhosts.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/modules.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb
index 6fbfa6fab1..1dcafdaeed 100644
--- a/spec/classes/dev_spec.rb
+++ b/spec/classes/dev_spec.rb
@@ -18,10 +18,12 @@
 
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_class('apache::params') }
+
         case facts[:os]['name']
         when 'Debian'
           it { is_expected.to contain_package('libaprutil1-dev') }
           it { is_expected.to contain_package('libapr1-dev') }
+
           it { is_expected.to contain_package('apache2-prefork-dev') } if facts[:os]['release']['major'].to_i < 8
         when 'Ubuntu'
           it { is_expected.to contain_package('apache2-dev') }
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index d42a3cfec5..d9b62dc60f 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -63,6 +63,7 @@
       it { is_expected.to contain_package('mod_auth_cas') }
       it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.modules.d/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
+
       it {
         is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASRootProxiedAs http://test.server$})
         is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASCookiePath /my/cas/path$})
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index 24f6228731..dc00f7d1ef 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -31,6 +31,7 @@
       it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('mod_auth_openidc') }
+
       it do
         is_expected.to contain_package('dnf-module-mod_auth_openidc')
           .with_ensure('present')
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index ab64e4e251..0240db7a09 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -13,6 +13,7 @@
       it { is_expected.to contain_apache__mod('dav_svn') }
       it { is_expected.to contain_package('libapache2-mod-svn') }
       it { is_expected.to contain_file('dav_svn.load').with_content(%r{LoadModule dav_svn_module}) }
+
       describe 'with parameters' do
         let :params do
           {
@@ -34,6 +35,7 @@
       it { is_expected.to contain_apache__mod('dav_svn') }
       it { is_expected.to contain_package('mod_dav_svn') }
       it { is_expected.to contain_file('dav_svn.load').with_content(%r{LoadModule dav_svn_module}) }
+
       describe 'with parameters' do
         let :params do
           {
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 9779610c88..2ee5a6d172 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -46,6 +46,7 @@ def general_deflate_specs
         is_expected.to contain_file('deflate.conf').with(ensure: 'file',
                                                          path: '/etc/apache2/mods-available/deflate.conf')
       }
+
       it {
         is_expected.to contain_file('deflate.conf symlink').with(ensure: 'link',
                                                                  path: '/etc/apache2/mods-enabled/deflate.conf')
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 21df7e29cb..12e5a0826b 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -10,6 +10,7 @@
       context 'passing no parameters' do
         it { is_expected.to contain_class('apache::params') }
         it { is_expected.to contain_apache__mod('dir') }
+
         it do
           is_expected.to contain_file('dir.conf')
             .with_content(%r{^DirectoryIndex })
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 1185420ff5..c889a09952 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -23,10 +23,12 @@
     it { is_expected.to contain_class('apache::mod::disk_cache') }
     it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
     it { is_expected.to contain_apache__mod('cache_disk') }
+
     it {
       is_expected.to contain_file('disk_cache.conf')
         .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
+
     context 'with $default_cache_enable = false' do
       let(:params) { { 'default_cache_enable' => false } }
 
@@ -34,6 +36,7 @@
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
+
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -46,6 +49,7 @@
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
+
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -75,6 +79,7 @@
     end
 
     it { is_expected.to contain_apache__mod('cache_disk') }
+
     it {
       is_expected.to contain_file('disk_cache.conf')
         .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
@@ -87,6 +92,7 @@
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
+
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -99,6 +105,7 @@
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
+
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -130,6 +137,7 @@
     it { is_expected.to contain_class('apache::mod::disk_cache') }
     it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
     it { is_expected.to contain_apache__mod('cache_disk') }
+
     it {
       is_expected.to contain_file('disk_cache.conf')
         .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
@@ -142,6 +150,7 @@
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
+
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -154,6 +163,7 @@
       it { is_expected.to contain_class('apache::mod::disk_cache') }
       it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
+
       it {
         is_expected.to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 99523e770d..3177450456 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -111,6 +111,7 @@
       is_expected.to contain_file('/etc/apache2/mods-available/event.load').with('ensure' => 'file',
                                                                                  'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n")
     }
+
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/event.load').with_ensure('link') }
   end
   context 'on a RedHat OS' do
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index d9dea92e6f..066448ecd2 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -24,6 +24,7 @@
     include_examples 'RedHat 7'
 
     it { is_expected.to contain_apache__mod('expires') }
+
     it {
       is_expected.to contain_file('expires.conf').with_content(
         "ExpiresActive On\n" \
@@ -47,6 +48,7 @@
     include_examples 'RedHat 7'
 
     it { is_expected.to contain_apache__mod('expires') }
+
     it {
       is_expected.to contain_file('expires.conf').with_content(
         "ExpiresActive On\n" \
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 341a2d986e..3adc0cb121 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -9,9 +9,11 @@
     include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
     }
+
     it { is_expected.to contain_package('libapache2-mod-fcgid') }
   end
 
@@ -20,9 +22,11 @@
 
     describe 'without parameters' do
       it { is_expected.to contain_class('apache::params') }
+
       it {
         is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => 'unixd_fcgid.load')
       }
+
       it { is_expected.to contain_package('mod_fcgid') }
     end
   end
@@ -31,9 +35,11 @@
     include_examples 'FreeBSD 10'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => 'unixd_fcgid.load')
     }
+
     it { is_expected.to contain_package('www/mod_fcgid') }
   end
 
@@ -41,9 +47,11 @@
     include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
     }
+
     it { is_expected.to contain_package('www-apache/mod_fcgid') }
   end
 end
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
index 3870e3e45e..3046914d06 100644
--- a/spec/classes/mod/http2_spec.rb
+++ b/spec/classes/mod/http2_spec.rb
@@ -9,6 +9,7 @@
     include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::mod::http2') }
+
     context 'with default values' do
       let(:expected_content) do
         <<~EOT
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 661ec0f3b6..ee4a1abc56 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -71,6 +71,7 @@ def general_info_specs_apache24
       is_expected.to contain_file('info.conf').with(ensure: 'file',
                                                     path: '/etc/apache2/mods-available/info.conf')
     }
+
     it {
       is_expected.to contain_file('info.conf symlink').with(ensure: 'link',
                                                             path: '/etc/apache2/mods-enabled/info.conf')
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 0197ddc469..4a4668dcf3 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -24,6 +24,7 @@
         is_expected.to contain_file('/etc/apache2/mods-available/itk.load').with('ensure' => 'file',
                                                                                  'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n")
       }
+
       it { is_expected.to contain_file('/etc/apache2/mods-enabled/itk.load').with_ensure('link') }
     end
     context 'with enablecapabilities not set' do
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index 6b3f7ff4b6..bfad48533e 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -41,6 +41,7 @@
 
     it { is_expected.to compile }
     it { is_expected.to compile.with_all_deps }
+
     expected_content = "# This file is generated automatically by Puppet - DO NOT EDIT\n" \
                        "# Any manual changes will be overwritten\n" \
                        "\n" \
@@ -84,6 +85,7 @@
       it_behaves_like 'specific workers_file', mod_dir
       it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
       it { is_expected.to contain_package('libapache2-mod-jk') }
+
       it {
         verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
       }
@@ -112,6 +114,7 @@
         it_behaves_like 'minimal resources', mod_dir
         it_behaves_like 'specific workers_file', mod_dir
         it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") }
+
         it {
           verify_contents(catalogue, 'jk.conf', ['<IfModule jk_module>', '</IfModule>'])
         }
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index 8bc07b89f3..d1a5c038d2 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -25,6 +25,7 @@ def general_mime_magic_specs
       is_expected.to contain_file('mime_magic.conf').with(ensure: 'file',
                                                           path: '/etc/apache2/mods-available/mime_magic.conf')
     }
+
     it {
       is_expected.to contain_file('mime_magic.conf symlink').with(ensure: 'link',
                                                                   path: '/etc/apache2/mods-enabled/mime_magic.conf')
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 0f4bd69273..1fccc517e9 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -9,6 +9,7 @@
 
     context 'default params' do
       it { is_expected.to contain_class('apache') }
+
       it do
         is_expected.to contain_file('negotiation.conf').with(ensure: 'file',
                                                              content: 'LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 603b1cddb7..9bd68cfacf 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -15,9 +15,11 @@
           it { is_expected.to contain_class('apache::params') }
           it { is_expected.to contain_apache__mod('passenger') }
           it { is_expected.to contain_package('libapache2-mod-passenger') }
+
           it {
             is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
           }
+
           it {
             is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
           }
@@ -204,9 +206,11 @@
         it { is_expected.to contain_class('apache::params') }
         it { is_expected.to contain_apache__mod('passenger') }
         it { is_expected.to contain_package('libapache2-mod-passenger') }
+
         it {
           is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
         }
+
         it {
           is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
         }
@@ -415,16 +419,21 @@
               it { is_expected.to contain_class('apache::params') }
               it { is_expected.to contain_apache__mod('passenger') }
               it { is_expected.to contain_package('mod_passenger') }
+
               it {
                 is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
               }
+
               it { is_expected.to contain_file('passenger_package.conf').without_content }
               it { is_expected.to contain_file('passenger_package.conf').without_source }
+
               it {
                 is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
               }
+
               it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRoot}) }
               it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
+
               describe "with passenger_root => '/usr/lib/example'" do
                 let :params do
                   { passenger_root: '/usr/lib/example' }
@@ -446,6 +455,7 @@
               it {
                 is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
               }
+
               it {
                 is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
               }
@@ -456,6 +466,7 @@
               it {
                 is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
               }
+
               it {
                 is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
               }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 789cd31196..364f554cdc 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -24,6 +24,7 @@
             context 'on stretch' do
               it { is_expected.to contain_apache__mod('php7.0') }
               it { is_expected.to contain_package('libapache2-mod-php7.0') }
+
               it {
                 is_expected.to contain_file('php7.0.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n",
@@ -34,6 +35,7 @@
             context 'on buster' do
               it { is_expected.to contain_apache__mod('php7.3') }
               it { is_expected.to contain_package('libapache2-mod-php7.3') }
+
               it {
                 is_expected.to contain_file('php7.3.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.3.so\n",
@@ -47,6 +49,7 @@
 
                 it { is_expected.to contain_apache__mod('php8.0') }
                 it { is_expected.to contain_package('libapache2-mod-php8.0') }
+
                 it {
                   is_expected.to contain_file('php8.0.load').with(
                     content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
@@ -58,6 +61,7 @@
             context 'on bullseye' do
               it { is_expected.to contain_apache__mod('php7.4') }
               it { is_expected.to contain_package('libapache2-mod-php7.4') }
+
               it {
                 is_expected.to contain_file('php7.4.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.4.so\n",
@@ -71,6 +75,7 @@
 
                 it { is_expected.to contain_apache__mod('php8.0') }
                 it { is_expected.to contain_package('libapache2-mod-php8.0') }
+
                 it {
                   is_expected.to contain_file('php8.0.load').with(
                     content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
@@ -105,6 +110,7 @@
 
               it { is_expected.to contain_class('apache::params') }
               it { is_expected.to contain_package('php') }
+
               if facts[:os]['release']['major'].to_i < 8
                 it { is_expected.to contain_apache__mod('php5') }
                 it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
@@ -144,6 +150,7 @@
               end
 
               it { is_expected.to contain_package('php') }
+
               if facts[:os]['release']['major'].to_i < 8
                 it { is_expected.to contain_apache__mod('php5') }
                 it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module alternative-path\n") }
@@ -187,6 +194,7 @@
               it { is_expected.to contain_class('apache::params') }
               it { is_expected.to contain_class('apache::mod::prefork') }
               it { is_expected.to contain_package('php') }
+
               if facts[:os]['release']['major'].to_i < 8
                 it { is_expected.to contain_apache__mod('php5') }
                 it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
@@ -206,6 +214,7 @@
               it { is_expected.to contain_class('apache::params') }
               it { is_expected.to contain_class('apache::mod::itk') }
               it { is_expected.to contain_package('php') }
+
               if facts[:os]['release']['major'].to_i < 8
                 it { is_expected.to contain_apache__mod('php5') }
                 it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") }
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 7cd52100d1..b4535a30a2 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -19,6 +19,7 @@
       is_expected.to contain_file('/etc/apache2/mods-available/prefork.load').with('ensure' => 'file',
                                                                                    'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n")
     }
+
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.load').with_ensure('link') }
   end
   context 'on a RedHat OS' do
@@ -27,6 +28,7 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
     it { is_expected.not_to contain_apache__mod('event') }
+
     it {
       is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',
                                                                                  'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 2122193990..346625a5e3 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -22,12 +22,14 @@
       let(:facts) { override_facts(super(), os: { hardware: 'i386' }) }
 
       it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
+
       it_behaves_like 'debian', ['/usr/lib/i386-linux-gnu/libxml2.so.2']
     end
     context 'on x64' do
       let(:facts) { override_facts(super(), os: { architecture: 'x86_64' }) }
 
       it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
+
       it_behaves_like 'debian', ['/usr/lib/x86_64-linux-gnu/libxml2.so.2']
     end
   end
diff --git a/spec/classes/mod/proxy_spec.rb b/spec/classes/mod/proxy_spec.rb
index 841dd3833a..c14240353e 100644
--- a/spec/classes/mod/proxy_spec.rb
+++ b/spec/classes/mod/proxy_spec.rb
@@ -13,6 +13,7 @@
 
       it { is_expected.to contain_file('proxy.conf').with_content(%r{ProxyRequests Off}) }
       it { is_expected.to contain_file('proxy.conf').without_content(%r{ProxyTimeout}) }
+
       context 'with parameters set' do
         let(:params) do
           { proxy_timeout: 12_345 }
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index aab4d1478d..8e929a9d8b 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -8,6 +8,7 @@
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('remoteip') }
+
     it {
       is_expected.to contain_file('remoteip.conf').with('path' => '/etc/apache2/mods-available/remoteip.conf')
     }
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 5506317448..560b82bfe3 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -10,9 +10,11 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
     it { is_expected.to contain_package('libapache2-mod-rpaf') }
+
     it {
       is_expected.to contain_file('rpaf.conf').with('path' => '/etc/apache2/mods-available/rpaf.conf')
     }
+
     it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
 
     describe 'with sethostname => true' do
@@ -43,9 +45,11 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
     it { is_expected.to contain_package('www/mod_rpaf2') }
+
     it {
       is_expected.to contain_file('rpaf.conf').with('path' => '/usr/local/etc/apache24/Modules/rpaf.conf')
     }
+
     it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
 
     describe 'with sethostname => true' do
@@ -76,9 +80,11 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('rpaf') }
     it { is_expected.to contain_package('www-apache/mod_rpaf') }
+
     it {
       is_expected.to contain_file('rpaf.conf').with('path' => '/etc/apache2/modules.d/rpaf.conf')
     }
+
     it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
 
     describe 'with sethostname => true' do
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index e8b3cc36f8..16fdf58630 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -25,6 +25,7 @@
               lib: 'mod_security2.so',
             )
           }
+
           it {
             is_expected.to contain_apache__mod('unique_id').with(
               id: 'unique_id_module',
@@ -51,24 +52,29 @@
               .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$})
               .with_content(%r{^\s+SecTmpDir /var/lib/mod_security$})
           }
+
           it {
             is_expected.to contain_file('/etc/httpd/modsecurity.d').with(
               ensure: 'directory', path: '/etc/httpd/modsecurity.d',
               owner: 'root', group: 'root', mode: '0755'
             )
           }
+
           it {
             is_expected.to contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
               ensure: 'directory', path: '/etc/httpd/modsecurity.d/activated_rules',
               owner: 'apache', group: 'apache'
             )
           }
+
           it {
             is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with(
               path: '/etc/httpd/modsecurity.d/security_crs.conf',
             )
           }
+
           it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+
           it {
             is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
               path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
@@ -103,6 +109,7 @@
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyLimitAction ProcessPartial$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyLimitAction Reject$} }
             it { is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
+
             it {
               is_expected.to contain_file('bar.conf').with(
                 path: '/etc/httpd/modsecurity.d/activated_rules/bar.conf',
@@ -144,6 +151,7 @@
                 owner: 'apache', group: 'apache'
               )
             }
+
             it { is_expected.to contain_file('/etc/httpd/modsecurity.d/custom_rules/custom_01_rules.conf').with_content %r{^\s*.*"id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"$} }
           end
 
@@ -218,18 +226,22 @@
               lib: 'mod_security2.so',
             )
           }
+
           it {
             is_expected.to contain_apache__mod('unique_id').with(
               id: 'unique_id_module',
               lib: 'mod_unique_id.so',
             )
           }
+
           it { is_expected.to contain_package('modsecurity-crs') }
+
           it {
             is_expected.to contain_file('security.conf').with(
               path: '/etc/apache2/mods-available/security.conf',
             )
           }
+
           it {
             is_expected.to contain_file('security.conf')
               .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
@@ -239,26 +251,31 @@
               .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$})
               .with_content(%r{^\s+SecTmpDir /var/cache/modsecurity$})
           }
+
           it {
             is_expected.to contain_file('/etc/modsecurity').with(
               ensure: 'directory', path: '/etc/modsecurity',
               owner: 'root', group: 'root', mode: '0755'
             )
           }
+
           it {
             is_expected.to contain_file('/etc/modsecurity/activated_rules').with(
               ensure: 'directory', path: '/etc/modsecurity/activated_rules',
               owner: 'www-data', group: 'www-data'
             )
           }
+
           it {
             is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with(
               path: '/etc/modsecurity/security_crs.conf',
             )
           }
+
           if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') ||
              (facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian')
             it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+
             it {
               is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
                 path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
@@ -295,6 +312,7 @@
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyLimitAction ProcessPartial$} }
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyLimitAction Reject$} }
               it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
+
               it {
                 is_expected.to contain_file('bar.conf').with(
                   path: '/etc/modsecurity/activated_rules/bar.conf',
@@ -330,6 +348,7 @@
                 owner: 'www-data', group: 'www-data'
               )
             }
+
             it { is_expected.to contain_file('/etc/modsecurity/custom_rules/custom_01_rules.conf').with_content %r{\s*.*"id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"$} }
           end
 
@@ -341,6 +360,7 @@
             end
 
             it { is_expected.to contain_apache__mod('security2') }
+
             it {
               is_expected.to contain_file('security.conf').with(
                 path: '/etc/apache2/mods-available/security2.conf',
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 82f3922c1a..ba4f4a5531 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -17,6 +17,7 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('ssl') }
       it { is_expected.to contain_package('mod_ssl') }
+
       it {
         is_expected.to contain_file('ssl.conf')
           .with_path('/etc/httpd/conf.modules.d/ssl.conf')
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 4396aba6dc..4b776165a7 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -13,6 +13,7 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
     it { is_expected.to contain_file('/etc/apache2/mods-available/worker.conf').with_ensure('file') }
+
     it {
       is_expected.to contain_file('/etc/apache2/mods-available/worker.load').with('ensure' => 'file',
                                                                                   'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n")
@@ -24,6 +25,7 @@
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('worker') }
     it { is_expected.not_to contain_apache__mod('event') }
+
     it {
       is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',
                                                                                 'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 1fcc95789f..2b14895d74 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -8,11 +8,13 @@
     include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_class('apache::mod::wsgi').with(
         'wsgi_socket_prefix' => nil,
       )
     }
+
     it { is_expected.to contain_package('libapache2-mod-wsgi-py3') }
   end
   context 'on a RedHat OS' do
@@ -71,6 +73,7 @@
         is_expected.to contain_apache__mod('wsgi').with('package' => 'mod_wsgi_package',
                                                         'path' => '/foo/bar/baz')
       }
+
       it { is_expected.to contain_package('mod_wsgi_package') }
       it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module /foo/bar/baz}) }
     end
@@ -86,6 +89,7 @@
         is_expected.to contain_apache__mod('wsgi').with('path' => 'modules/wsgi_mod_name.so',
                                                         'package' => 'mod_wsgi_package')
       }
+
       it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module modules/wsgi_mod_name.so}) }
     end
     describe 'with package_name but no mod_path' do
@@ -111,22 +115,26 @@
     include_examples 'FreeBSD 9'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_class('apache::mod::wsgi').with(
         'wsgi_socket_prefix' => nil,
       )
     }
+
     it { is_expected.to contain_package('www/mod_wsgi') }
   end
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_class('apache::mod::wsgi').with(
         'wsgi_socket_prefix' => nil,
       )
     }
+
     it { is_expected.to contain_package('www-apache/mod_wsgi') }
   end
   context 'overriding mod_libs' do
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 604ea2f4bd..0e2a7dc79b 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -26,11 +26,13 @@
         .that_notifies('Class[Apache::Service]')
         .that_comes_before('Exec[remove rspec if invalid]')
     }
+
     it {
       is_expected.to contain_exec('remove rspec if invalid')
         .with('unless' => [['/usr/sbin/apachectl', '-t']], 'refreshonly' => 'true')
         .that_subscribes_to('File[apache_rspec]')
     }
+
     it {
       is_expected.to contain_file('apache_rspec')
         .with('ensure' => 'present', 'content' => '# Test')
@@ -50,10 +52,12 @@
     it {
       is_expected.to contain_exec('syntax verification for rspec').with('command' => ['/bin/true'])
     }
+
     it {
       is_expected.to contain_exec('remove rspec if invalid').with('command' => ['/bin/rm', '/dne/30-rspec.conf'],
                                                                   'unless' => [['/bin/true']])
     }
+
     it {
       is_expected.to contain_file('apache_rspec')
         .that_requires('Package[httpd]')
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index a510cd564c..c1f4bd8a91 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -16,6 +16,7 @@
 
     describe 'for non-special modules' do
       it { is_expected.to contain_class('apache::params') }
+
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(path: '/etc/httpd/conf.modules.d/spec_m.load',
                                                         content: "LoadModule spec_m_module modules/mod_spec_m.so\n",
@@ -53,6 +54,7 @@
 
     describe 'for non-special modules' do
       it { is_expected.to contain_class('apache::params') }
+
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(path: '/etc/apache2/mods-available/spec_m.load',
                                                         content: "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
@@ -60,6 +62,7 @@
                                                         group: 'root',
                                                         mode: '0644')
       end
+
       it 'links the module load file' do
         is_expected.to contain_file('spec_m.load symlink').with(path: '/etc/apache2/mods-enabled/spec_m.load',
                                                                 target: '/etc/apache2/mods-available/spec_m.load',
@@ -75,6 +78,7 @@
 
     describe 'for non-special modules' do
       it { is_expected.to contain_class('apache::params') }
+
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(path: '/usr/local/etc/apache24/Modules/spec_m.load',
                                                         content: "LoadModule spec_m_module /usr/local/libexec/apache24/mod_spec_m.so\n",
@@ -90,6 +94,7 @@
 
     describe 'for non-special modules' do
       it { is_expected.to contain_class('apache::params') }
+
       it 'manages the module load file' do
         is_expected.to contain_file('spec_m.load').with(path: '/etc/apache2/modules.d/spec_m.load',
                                                         content: "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index 806be9f3d0..914741da3e 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -20,6 +20,7 @@ class { "apache::mod::security": activated_rules => [] }
       end
 
       it { is_expected.to compile.with_all_deps }
+
       case facts[:os]['family']
       when 'RedHat'
         it {
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index a66fcb4752..0e32e46d55 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -28,6 +28,7 @@
           path: '/etc/apache2/sites-available/25-rspec.example.com.conf',
         )
       }
+
       it {
         is_expected.to contain_file('25-rspec.example.com.conf symlink').with(
           ensure: 'link',
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f9972f4f43..52bf1bbaa9 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -533,29 +533,35 @@
           it { is_expected.to compile }
           it { is_expected.not_to contain_file('/var/www/foo') }
           it { is_expected.to contain_class('apache::mod::ssl') }
+
           it {
             is_expected.to contain_file('ssl.conf').with(
               content: %r{^\s+SSLHonorCipherOrder On$},
             )
           }
+
           it {
             is_expected.to contain_file('ssl.conf').with(
               content: %r{^\s+SSLPassPhraseDialog builtin$},
             )
           }
+
           it {
             is_expected.to contain_file('ssl.conf').with(
               content: %r{^\s+SSLSessionCacheTimeout 300$},
             )
           }
+
           it { is_expected.to contain_file('rspec.example.com_ssl_cert') }
           it { is_expected.to contain_file('rspec.example.com_ssl_key') }
           it { is_expected.to contain_file('rspec.example.com_ssl_chain') }
           it { is_expected.to contain_file('rspec.example.com_ssl_foo.crl') }
+
           it {
             is_expected.to contain_file('/var/www/logs').with('ensure' => 'directory',
                                                               'mode' => '0600')
           }
+
           it { is_expected.to contain_class('apache::mod::alias') }
           it { is_expected.to contain_class('apache::mod::auth_basic') }
           it { is_expected.to contain_class('apache::mod::authn_file') }
@@ -573,12 +579,14 @@
           it { is_expected.to contain_class('apache::mod::suexec') }
           it { is_expected.to contain_class('apache::mod::vhost_alias') }
           it { is_expected.to contain_class('apache::mod::wsgi') }
+
           it {
             is_expected.to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
                                                                             'mode' => '0644',
                                                                             'require' => 'Package[httpd]',
                                                                             'notify' => 'Class[Apache::Service]')
           }
+
           if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu'
             it {
               is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
@@ -592,14 +600,18 @@
               .with_content(%r{^\s+LimitRequestLine 8190$})
               .with_content(%r{^\s+LimitRequestBody 0$})
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-aliases').with(
               content: %r{^\s+Alias /image "/rspec/image"$},
             )
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories')
               .with_content(%r{^\s+<Proxy "\*">$})
@@ -709,16 +721,20 @@
               .with_content(%r{^\s+SSLVerifyClient\soptional$})
               .with_content(%r{^\s+SSLVerifyDepth\s10$})
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-logging')
               .with_content(%r{^\s+ErrorLogFormat "\[%t\] \[%l\] %7F: %E: \[client\\ %a\] %M% ,\\ referer\\ %\{Referer\}i"$})
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-access_log') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-action') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-block') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-proxy')
               .with_content(%r{retry=0})
@@ -731,7 +747,9 @@
               .with_content(%r{ProxyPassReverseCookiePath\s+\/a\s+http:\/\/})
               .with_content(%r{ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo})
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-rewrite')
               .with_content(%r{^\s+RewriteEngine On$})
@@ -739,20 +757,24 @@
               .with_content(%r{^\s+RewriteBase /})
               .with_content(%r{^\s+RewriteRule \^index\.html\$ rewrites.html$})
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-setenv')
               .with_content(%r{SetEnv FOO=/bin/true})
               .with_content(%r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif})
               .with_content(%r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true})
           }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-ssl')
               .with_content(%r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$})
               .with_content(%r{^\s+SSLHonorCipherOrder\s+Off$})
               .with_content(%r{^\s+SSLUserName\s+SSL_CLIENT_S_DN_CN$})
           }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-sslproxy')
               .with_content(%r{^\s+SSLProxyEngine On$})
@@ -762,13 +784,16 @@
               .with_content(%r{^\s+SSLProxyCipherSuite\s+HIGH$})
               .with_content(%r{^\s+SSLProxyProtocol\s+TLSv1.2$})
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
               content: %r{^\s+FilterDeclare COMPRESS$},
             )
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') }
@@ -898,6 +923,7 @@
           }
 
           it { is_expected.to contain_class('apache::mod::md') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^MDomain example\.com example\.net auto$},
@@ -1026,11 +1052,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+ServerName https:\/\/www\.example\.com:443$},
             )
           }
+
           it {
             is_expected.to contain_concat('25-www.example.com.conf')
           }
@@ -1050,11 +1078,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+ServerName https:\/\/www\.example\.com$},
             )
           }
+
           it {
             is_expected.to contain_concat('25-www.example.com.conf')
           }
@@ -1074,11 +1104,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+ServerName www\.example\.com:443$},
             )
           }
+
           it {
             is_expected.to contain_concat('25-www.example.com.conf')
           }
@@ -1098,11 +1130,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+ServerName www\.example\.com$},
             )
           }
+
           it {
             is_expected.to contain_concat('25-www.example.com.conf')
           }
@@ -1121,11 +1155,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[.\/m]*$},
             )
           }
+
           it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
           it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
           it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
@@ -1146,11 +1182,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[.\/m]*$},
             )
           }
+
           it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
           it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
           it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:80') }
@@ -1171,11 +1209,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[.\/m]*$},
             )
           }
+
           it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') }
           it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') }
           it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
@@ -1200,11 +1240,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[.\/m]*<VirtualHost \[::1\]:80>[.\/m]*$},
             )
           }
+
           it { is_expected.to contain_concat__fragment('Listen [::1]:80') }
           it { is_expected.not_to contain_concat__fragment('NameVirtualHost [::1]:80') }
         end
@@ -1223,11 +1265,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[.\/m]*<VirtualHost \*:80>[.\/m]*$},
             )
           }
+
           it { is_expected.to contain_concat__fragment('Listen *:80') }
           it { is_expected.not_to contain_concat__fragment('NameVirtualHost *:80') }
         end
@@ -1241,11 +1285,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$},
             )
           }
+
           it {
             is_expected.not_to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+DocumentRoot "/var/www/html"$},
@@ -1262,11 +1308,13 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$},
             )
           }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+DocumentRoot "/var/www/html"$},
@@ -1283,6 +1331,7 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{^\s*SecAuditLog "\/var\/log\/#{apache_name}\/rspec\.example\.com_security\.log"$},
@@ -1298,6 +1347,7 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{\s*SecAuditLog "\/var\/log\/#{apache_name}\/foo.log"$},
@@ -1315,6 +1365,7 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{
@@ -1340,6 +1391,7 @@
           end
 
           it { is_expected.to compile }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{
@@ -1447,12 +1499,15 @@
           it { is_expected.not_to contain_file('rspec.example.com_ssl_chain') }
           it { is_expected.not_to contain_file('rspec.example.com_ssl_foo.crl') }
           it { is_expected.to contain_file('/var/www/foo') }
+
           it {
             is_expected.to contain_file('/tmp/logroot').with('ensure' => 'absent')
           }
+
           it {
             is_expected.to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
           }
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-aliases') }
@@ -1714,11 +1769,13 @@
                 content: %r{^\s+CustomLog "\/tmp\/log1"\s+combined\s+env=dev$},
               )
             }
+
             it {
               is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
                 content: %r{^\s+CustomLog "\/var\/log\/#{apache_name}\/log2"\s+combined\s*$},
               )
             }
+
             it {
               is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
                 content: %r{^\s+CustomLog "syslog" "%h %l"\s*$},
@@ -1893,6 +1950,7 @@
 
             it { is_expected.to compile }
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
+
             if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) ||
                (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11)
               it {
@@ -1921,6 +1979,7 @@
 
             it { is_expected.to compile }
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
+
             it {
               is_expected.not_to contain_concat__fragment('rspec.example.com-directories').with(
                 content: %r{^\s+Require all granted$},
@@ -1958,6 +2017,7 @@
             end
 
             it { is_expected.to compile }
+
             it {
               is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
                 content: %r{^\s+OIDCRedirectURI\s/some/valid/relative/uri$},
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
index e3f40af43d..eb7bcf1c28 100644
--- a/spec/functions/bool2httpd_spec.rb
+++ b/spec/functions/bool2httpd_spec.rb
@@ -8,14 +8,18 @@
   it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params(true).and_return('On') }
   it { is_expected.to run.with_params('true').and_return('On') }
+
   it 'expected to return a string "On"' do
     expect(subject.execute(true)).to be_an_instance_of(String)
   end
+
   it { is_expected.to run.with_params(false).and_return('Off') }
   it { is_expected.to run.with_params('false').and_return('Off') }
+
   it 'expected to return a string "Off"' do
     expect(subject.execute(false)).to be_an_instance_of(String)
   end
+
   it { is_expected.to run.with_params('mail').and_return('mail') }
   it { is_expected.to run.with_params(nil).and_return('Off') }
   it { is_expected.to run.with_params(:undef).and_return('Off') }
diff --git a/spec/util/apache_mod_platform_compatibility_spec.rb b/spec/util/apache_mod_platform_compatibility_spec.rb
index f2ab43c297..d2fe142542 100644
--- a/spec/util/apache_mod_platform_compatibility_spec.rb
+++ b/spec/util/apache_mod_platform_compatibility_spec.rb
@@ -27,9 +27,11 @@
       it 'returns an empty hash when given garbage line' do
         expect(ampc.process_line('foobar')).to eq({})
       end
+
       it 'returns a hash with type: :unsupported_platform_declaration and extracted value' do
         expect(ampc.process_line('# @note Unsupported platforms: foobar')).to eq(type: :unsupported_platform_declaration, value: 'foobar')
       end
+
       it 'returns a hash with type: :class_declaration and extracted value' do
         expect(ampc.process_line(foobar_class)).to eq(type: :class_declaration, value: foobar_mod)
       end
@@ -40,27 +42,35 @@
       it 'handles single OS with single Version' do
         expect(ampc.extract_os_ver_pairs('Debian: 5')).to eq('debian' => [5])
       end
+
       it 'handles single OS with multiple Versions' do
         expect(ampc.extract_os_ver_pairs('Debian: 5, 6, 7')).to eq('debian' => [5, 6, 7])
       end
+
       it 'handles multiple OSs with multiple Versions' do
         expect(ampc.extract_os_ver_pairs('Debian: 5, 6, 7; CentOS: 5,6,7')).to eq('debian' => [5, 6, 7], 'centos' => [5, 6, 7])
       end
+
       it 'handles Versions in \d+\.\d+ format' do
         expect(ampc.extract_os_ver_pairs('Ubuntu: 18.04, 20.04')).to eq('ubuntu' => [18, 20])
       end
+
       it 'handles Versions with "SP"' do
         expect(ampc.extract_os_ver_pairs('SLES: 11 SP1, 12')).to eq('sles' => [11, 12])
       end
+
       it 'returns an empty Hash when given data in an entirely invalid format' do
         expect(ampc.extract_os_ver_pairs('foobar')).to eq({})
       end
+
       it 'returns an empty Hash when given data with incorrect OS/Version group separator' do
         expect(ampc.extract_os_ver_pairs('Ubuntu#18.04, 20.04')).to eq({})
       end
+
       it 'returns an empty Hash when given data with incorrect OS + Version separator' do
         expect(ampc.extract_os_ver_pairs('CentOS:7,8#Debian:10,11')).to eq({})
       end
+
       it 'returns an empty Hash when given data with incorrect Version separator' do
         expect(ampc.extract_os_ver_pairs('CentOS:5@6')).to eq({})
       end
@@ -74,6 +84,7 @@
         ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'debian' => [8])
         expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
       end
+
       it 'registers multiple valid unsupported platforms' do
         expect(ampc).to receive(:valid_os?).with('debian').and_return(true)
         expect(ampc).to receive(:valid_os?).with('ubuntu').and_return(true)
@@ -84,6 +95,7 @@
         ampc.register_running_platform(family: 'ubuntu', release: '14.04', arch: 'x86_64')
         expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
       end
+
       it 'registers an :os_parse error when given an invalid platform' do
         expect(ampc).to receive(:valid_os?).with(foobar_linux).and_return(false)
         expect(ampc).to receive(:register_error).with(foobar_pp, 1, :os_parse, foobar_linux)
@@ -130,16 +142,19 @@
         ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'ubuntu' => [0])
         expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
       end
+
       it 'returns false when running on an OS with one specific version incompatible' do
         ampc.register_running_platform(ubuntu_14_04_os)
         ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'ubuntu' => [14])
         expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(false)
       end
+
       it 'returns true when running on an OS with no versions marked as incompatible' do
         ampc.register_running_platform(ubuntu_14_04_os)
         ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'debian' => [6, 7])
         expect(ampc.mod_supported_on_platform?(foobar_mod)).to be(true)
       end
+
       it 'returns true when running on an OS version not marked as incompatible' do
         ampc.register_running_platform(ubuntu_14_04_os)
         ampc.register_unsupported_platforms(foobar_pp, 1, foobar_mod, 'ubuntu' => [16, 18])

From d39da2743ce914b46705ba96c85c42768b33327d Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 09:22:35 +0100
Subject: [PATCH 2111/2267] (CONT-772) Correct RSpec/EmptyLineAfterExampleGroup

---
 .rubocop_todo.yml                         | 11 ------
 spec/acceptance/apache_parameters_spec.rb |  3 ++
 spec/acceptance/vhost_spec.rb             | 22 +++++++++++
 spec/classes/apache_spec.rb               | 23 ++++++++++++
 spec/classes/mod/alias_spec.rb            |  6 +++
 spec/classes/mod/auth_cas_spec.rb         |  1 +
 spec/classes/mod/auth_gssapi_spec.rb      |  3 ++
 spec/classes/mod/auth_kerb_spec.rb        |  4 ++
 spec/classes/mod/auth_mellon_spec.rb      |  3 ++
 spec/classes/mod/auth_openidc_spec.rb     |  4 ++
 spec/classes/mod/dav_svn_spec.rb          |  3 ++
 spec/classes/mod/dir_spec.rb              |  1 +
 spec/classes/mod/disk_cache_spec.rb       |  7 ++++
 spec/classes/mod/dumpio_spec.rb           |  2 +
 spec/classes/mod/event_spec.rb            |  3 ++
 spec/classes/mod/expires_spec.rb          |  2 +
 spec/classes/mod/ext_filter_spec.rb       |  3 ++
 spec/classes/mod/info_spec.rb             |  3 ++
 spec/classes/mod/itk_spec.rb              |  3 ++
 spec/classes/mod/lbmethod_bybusyness.rb   |  1 +
 spec/classes/mod/lbmethod_byrequests.rb   |  1 +
 spec/classes/mod/lbmethod_bytraffic.rb    |  1 +
 spec/classes/mod/lbmethod_heartbeat.rb    |  1 +
 spec/classes/mod/passenger_spec.rb        | 21 +++++++++++
 spec/classes/mod/perl_spec.rb             |  3 ++
 spec/classes/mod/peruser_spec.rb          |  1 +
 spec/classes/mod/php_spec.rb              | 14 +++++++
 spec/classes/mod/prefork_spec.rb          |  3 ++
 spec/classes/mod/proxy_balancer_spec.rb   |  1 +
 spec/classes/mod/proxy_html_spec.rb       |  4 ++
 spec/classes/mod/python_spec.rb           |  3 ++
 spec/classes/mod/remoteip_spec.rb         | 11 ++++++
 spec/classes/mod/reqtimeout_spec.rb       | 11 ++++++
 spec/classes/mod/rpaf_spec.rb             |  8 ++++
 spec/classes/mod/security_spec.rb         |  3 ++
 spec/classes/mod/shib_spec.rb             |  1 +
 spec/classes/mod/ssl_spec.rb              |  7 ++++
 spec/classes/mod/userdir_spec.rb          |  6 +++
 spec/classes/mod/worker_spec.rb           |  3 ++
 spec/classes/mod/wsgi_spec.rb             | 12 ++++++
 spec/defines/balancer_spec.rb             |  3 ++
 spec/defines/balancermember_spec.rb       |  1 +
 spec/defines/custom_config_spec.rb        |  4 ++
 spec/defines/vhost_custom_spec.rb         |  3 ++
 spec/defines/vhost_spec.rb                | 46 +++++++++++++++++++++++
 spec/functions/pw_hash_spec.rb            |  1 +
 46 files changed, 270 insertions(+), 11 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d5b76ffbcd..1ca9313190 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -73,17 +73,6 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 239
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-# RSpec/EmptyLineAfterExample:
-#   Enabled: false
-
-# Offense count: 270
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/EmptyLineAfterExampleGroup:
-  Enabled: false
-
 # Offense count: 25
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 501a4a9baf..1469e9109c 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -16,6 +16,7 @@
       end
     end
   end
+
   describe 'default_confd_files => true' do
     it 'copies conf.d files' do
       pp = "class { 'apache': default_confd_files => true }"
@@ -137,6 +138,7 @@ class { 'apache':
     describe file("#{apache_hash['confd_dir']}/test.conf") do
       it { is_expected.to be_file }
     end
+
     describe file("#{apache_hash['confd_dir']}.vhosts/test.conf") do
       it { is_expected.to be_file }
     end
@@ -161,6 +163,7 @@ class { 'apache':
       describe file("#{apache_hash['confd_dir']}/test.conf") do
         it { is_expected.not_to be_file }
       end
+
       describe file("#{apache_hash['confd_dir']}.vhosts/test.conf") do
         it { is_expected.not_to be_file }
       end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 36faf5b6c7..442fb31e9b 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -653,6 +653,7 @@ class { 'apache': }
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'NameVirtualHost test.server' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ServerName test.server' }
@@ -677,6 +678,7 @@ class { 'apache': }
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'NameVirtualHost test.server' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'ServerName' }
@@ -872,27 +874,33 @@ class { 'apache': }
       it { is_expected.to be_file }
       it { is_expected.to contain 'AssignUserId nobody nobody' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.custom_fragment.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain '#weird test string' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/test.without_priority_prefix.conf") do
       it { is_expected.to be_file }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.ssl_protocol.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
       it { is_expected.to contain 'SSLUserName  *SSL_CLIENT_S_DN_CN' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.block.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain '<DirectoryMatch .*\.(svn|git|bzr|hg|ht)/.*>' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.setenv_setenvif.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SetEnv TEST /test' }
       it { is_expected.to contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.rewrite.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain '#test' }
@@ -900,32 +908,39 @@ class { 'apache': }
       it { is_expected.to contain 'RewriteRule ^index.html$ welcome.html' }
       it { is_expected.to contain 'RewriteMap lc int:tolower' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.request_headers.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'append MirrorID "mirror 12"' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.redirect.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Redirect permanent /images http://test.server/' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.no_proxy_uris.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ProxyPass        http://test2/test !' }
       it { is_expected.to contain 'ProxyPass        / http://test2/' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.proxy.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ProxyPass        / http://testproxy/' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.scriptaliases.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.aliases.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Alias /image "/ftp/pub/image"' }
       it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.access_logs.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'CustomLog "/tmp/log1" combined' }
@@ -933,26 +948,32 @@ class { 'apache': }
       it { is_expected.to contain 'CustomLog "/var/tmp/log3" "%h %l"' }
       it { is_expected.to contain 'CustomLog "syslog" combined' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.access_log_env_var.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'CustomLog "syslog" combined env=admin' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.access_log_format.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'CustomLog "syslog" "%h %l"' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.logroot.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain '  CustomLog "/tmp' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.override.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'AllowOverride All' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.options.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Options Indexes FollowSymLinks ExecCGI' }
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.empty_options.conf") do
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'Options' }
@@ -981,6 +1002,7 @@ class { 'apache': }
         it { is_expected.to contain '  CustomLog "/tmp/test.servername_access.log' }
       end
     end
+
     describe 'when the $use_servername_for_filenames parameter is NOT defined' do
       pp = <<-MANIFEST
           class { 'apache': }
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index f5236e4d7a..0b88dc1d52 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -169,6 +169,7 @@
       it { is_expected.not_to contain_user('www-data') }
       it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^User www-data\n} }
     end
+
     describe "Don't create group resource when parameter manage_group is false" do
       let :params do
         { manage_group: false }
@@ -328,6 +329,7 @@
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end
+
     describe 'Alternate confd/mod/vhosts directory' do
       let :params do
         {
@@ -340,6 +342,7 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
     end
+
     describe 'Alternate confd/mod/vhosts directory when specifying slash encoding behaviour' do
       let :params do
         {
@@ -403,6 +406,7 @@
         end
       end
     end
+
     describe 'Alternate mpm_modules when declaring mpm_module => prefork' do
       let :params do
         { mpm_module: 'prefork' }
@@ -414,6 +418,7 @@
       it { is_expected.not_to contain_class('apache::mod::peruser') }
       it { is_expected.not_to contain_class('apache::mod::worker') }
     end
+
     describe 'Alternate mpm_modules when declaring mpm_module => worker' do
       let :params do
         { mpm_module: 'worker' }
@@ -433,6 +438,7 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^# Security\n} }
     end
+
     describe 'different templates for httpd.conf with non-default' do
       let :params do
         { conf_template: 'site_apache/fake.conf.erb' }
@@ -449,6 +455,7 @@
       it { is_expected.to contain_apache__mod('authz_host') }
       it { is_expected.not_to contain_apache__mod('env') }
     end
+
     describe 'default mods custom' do
       let :params do
         { default_mods: ['info', 'alias', 'mime', 'env', 'setenv', 'expires'] }
@@ -459,6 +466,7 @@
       it { is_expected.to contain_class('apache::mod::info') }
       it { is_expected.to contain_class('apache::mod::mime') }
     end
+
     describe "Don't create user resource when parameter manage_user is false" do
       let :params do
         { manage_user: false }
@@ -467,6 +475,7 @@
       it { is_expected.not_to contain_user('apache') }
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^User apache\n} }
     end
+
     describe "Don't create group resource when parameter manage_group is false" do
       let :params do
         { manage_group: false }
@@ -487,6 +496,7 @@
         }.to raise_error(Puppet::PreformattedError, %r{Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\]}) # rubocop:disable Layout/LineLength
       end
     end
+
     describe 'sendfile On' do
       let :params do
         { sendfile: 'On' }
@@ -494,6 +504,7 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^EnableSendfile On\n} }
     end
+
     describe 'sendfile Off' do
       let :params do
         { sendfile: 'Off' }
@@ -513,6 +524,7 @@
         }.to raise_error(Puppet::Error, %r{Evaluation Error})
       end
     end
+
     describe 'hostname_lookups On' do
       let :params do
         { hostname_lookups: 'On' }
@@ -520,6 +532,7 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^HostnameLookups On\n} }
     end
+
     describe 'hostname_lookups Off' do
       let :params do
         { hostname_lookups: 'Off' }
@@ -536,6 +549,7 @@
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^HostnameLookups Double\n} }
     end
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 10'
 
@@ -601,6 +615,7 @@
       }
     end
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
@@ -636,6 +651,7 @@
       ).that_notifies('Class[Apache::Service]')
     }
   end
+
   context 'on all OSes' do
     include_examples 'RedHat 8'
 
@@ -653,6 +669,7 @@
         ).that_notifies('Class[Apache::Service]')
       }
     end
+
     context 'with a custom file_mode parameter' do
       let :params do
         {
@@ -666,6 +683,7 @@
         )
       }
     end
+
     context 'with a custom root_directory_options parameter' do
       let :params do
         {
@@ -675,6 +693,7 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options -Indexes -FollowSymLinks} }
     end
+
     context 'with a custom root_directory_secured parameter' do
       let :params do
         {
@@ -684,11 +703,13 @@
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Require all denied} }
     end
+
     context 'default vhost defaults' do
       it { is_expected.to contain_apache__vhost('default').with_ensure('present') }
       it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('absent') }
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{Options FollowSymLinks} }
     end
+
     context 'without default non-ssl vhost' do
       let :params do
         {
@@ -699,6 +720,7 @@
       it { is_expected.to contain_apache__vhost('default').with_ensure('absent') }
       it { is_expected.not_to contain_file('/var/www/html') }
     end
+
     context 'with default ssl vhost' do
       let :params do
         {
@@ -710,6 +732,7 @@
       it { is_expected.to contain_file('/var/www/html') }
     end
   end
+
   context 'with unsupported osfamily' do
     include_examples 'Darwin'
 
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index f350f19507..fc17b07fc7 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -12,18 +12,21 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
     end
+
     context 'on a RedHat 7-based OS', :compile do
       include_examples 'RedHat 7'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
     end
+
     context 'on a RedHat 8-based OS', :compile do
       include_examples 'RedHat 8'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
     end
+
     context 'with icons options', :compile do
       let :pre_condition do
         'class { apache: default_mods => false }'
@@ -39,6 +42,7 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Options foo}) }
     end
+
     context 'with icons path change', :compile do
       let :pre_condition do
         'class { apache: default_mods => false }'
@@ -54,6 +58,7 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/apache-icons\/ "\/usr\/share\/httpd\/icons\/"}) }
     end
+
     context 'with icons path as false', :compile do
       let :pre_condition do
         'class { apache: default_mods => false }'
@@ -69,6 +74,7 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.not_to contain_file('alias.conf') }
     end
+
     context 'on a FreeBSD OS', :compile do
       include_examples 'FreeBSD 10'
 
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index d9b62dc60f..8df086e963 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -37,6 +37,7 @@
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASTimeout 1234}) }
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
     end
+
     context 'on a RedHat OS', :compile do
       include_examples 'RedHat 8'
 
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
index 3f67969747..f50d6dd2e4 100644
--- a/spec/classes/mod/auth_gssapi_spec.rb
+++ b/spec/classes/mod/auth_gssapi_spec.rb
@@ -14,6 +14,7 @@
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('libapache2-mod-auth-gssapi') }
     end
+
     context 'on a RedHat OS', :compile do
       include_examples 'RedHat 8'
 
@@ -22,6 +23,7 @@
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('mod_auth_gssapi') }
     end
+
     context 'on a FreeBSD OS', :compile do
       include_examples 'FreeBSD 9'
 
@@ -30,6 +32,7 @@
       it { is_expected.to contain_apache__mod('auth_gssapi') }
       it { is_expected.to contain_package('www/mod_auth_gssapi') }
     end
+
     context 'on a Gentoo OS', :compile do
       include_examples 'Gentoo'
 
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
index 867a5b36d5..84410311bf 100644
--- a/spec/classes/mod/auth_kerb_spec.rb
+++ b/spec/classes/mod/auth_kerb_spec.rb
@@ -14,6 +14,7 @@
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
     end
+
     context 'on a RedHat OS', :compile do
       include_examples 'RedHat 8'
 
@@ -22,6 +23,7 @@
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('mod_auth_kerb') }
     end
+
     context 'on a FreeBSD OS', :compile do
       include_examples 'FreeBSD 9'
 
@@ -30,6 +32,7 @@
       it { is_expected.to contain_apache__mod('auth_kerb') }
       it { is_expected.to contain_package('www/mod_auth_kerb2') }
     end
+
     context 'on a Gentoo OS', :compile do
       include_examples 'Gentoo'
 
@@ -39,6 +42,7 @@
       it { is_expected.to contain_package('www-apache/mod_auth_kerb') }
     end
   end
+
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
       include_examples 'RedHat 8'
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index ffeb0e6b58..bae7936b04 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -15,6 +15,7 @@
       it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
       it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") }
     end
+
     describe 'with parameters' do
       let :params do
         { mellon_cache_size: 200,
@@ -35,6 +36,7 @@
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostCount\s+10$}) }
     end
   end
+
   context 'default configuration with parameters on a RedHat OS' do
     include_examples 'RedHat 8'
 
@@ -45,6 +47,7 @@
       it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.modules.d/auth_mellon.conf') }
       it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") }
     end
+
     describe 'with parameters' do
       let :params do
         { mellon_cache_size: 200,
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index dc00f7d1ef..aac9be28ea 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -15,6 +15,7 @@
       it { is_expected.to contain_package('libapache2-mod-auth-openidc') }
       it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
     end
+
     context 'on RedHat 7', :compile do
       include_examples 'RedHat 7'
 
@@ -24,6 +25,7 @@
       it { is_expected.to contain_package('mod_auth_openidc') }
       it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
     end
+
     context 'on RedHat 8', :compile do
       include_examples 'RedHat 8'
 
@@ -39,6 +41,7 @@
           .that_comes_before('Package[mod_auth_openidc]')
       end
     end
+
     context 'on a FreeBSD OS', :compile do
       include_examples 'FreeBSD 9'
 
@@ -49,6 +52,7 @@
       it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
     end
   end
+
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
       include_examples 'RedHat 8'
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
index 0240db7a09..fadcc69df6 100644
--- a/spec/classes/mod/dav_svn_spec.rb
+++ b/spec/classes/mod/dav_svn_spec.rb
@@ -28,6 +28,7 @@
         it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
       end
     end
+
     context 'on a RedHat OS' do
       include_examples 'RedHat 8'
 
@@ -50,6 +51,7 @@
         it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
       end
     end
+
     context 'on a FreeBSD OS' do
       include_examples 'FreeBSD 9'
 
@@ -72,6 +74,7 @@
         it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
       end
     end
+
     context 'on a Gentoo OS', :compile do
       include_examples 'Gentoo'
 
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 12e5a0826b..96f50fcdea 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -22,6 +22,7 @@
             .with_content(%r{ index\.xhtml$})
         end
       end
+
       context "passing indexes => ['example.txt','fearsome.aspx']" do
         let :params do
           { indexes: ['example.txt', 'fearsome.aspx'] }
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index c889a09952..6666654724 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -42,6 +42,7 @@
           .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
+
     context 'with $default_cache_enable = true' do
       let(:params) { { 'default_cache_enable' => true } }
 
@@ -55,6 +56,7 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
+
     context 'with $default_cache_enable = foo' do
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
@@ -98,6 +100,7 @@
           .with(content: %r{CacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
+
     context 'with $default_cache_enable = true' do
       let(:params) { { 'default_cache_enable' => true } }
 
@@ -111,12 +114,14 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
+
     context 'with $default_cache_enable = foo' do
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
       it { is_expected.not_to compile }
     end
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 10'
 
@@ -156,6 +161,7 @@
           .with(content: %r{CacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
+
     context 'with $default_cache_enable = true' do
       let(:params) { { 'default_cache_enable' => true } }
 
@@ -169,6 +175,7 @@
           .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
+
     context 'with $default_cache_enable = foo' do
       let(:params) { { 'default_cache_enable' => 'foo' } }
 
diff --git a/spec/classes/mod/dumpio_spec.rb b/spec/classes/mod/dumpio_spec.rb
index 64e01ed9c5..218351d5e0 100644
--- a/spec/classes/mod/dumpio_spec.rb
+++ b/spec/classes/mod/dumpio_spec.rb
@@ -20,6 +20,7 @@
       it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOInput\s+"Off"$}) }
       it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOOutput\s+"Off"$}) }
     end
+
     context 'with dumpio_input set to On' do
       let :params do
         {
@@ -30,6 +31,7 @@
       it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOInput\s+"On"$}) }
       it { is_expected.to contain_file('dumpio.conf').with_content(%r{^\s*DumpIOOutput\s+"Off"$}) }
     end
+
     context 'with dumpio_ouput set to On' do
       let :params do
         {
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 3177450456..723c590cad 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -14,6 +14,7 @@
     it { is_expected.not_to contain_apache__mod('event') }
     it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/event.conf').with_ensure('file') }
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
@@ -21,6 +22,7 @@
     it { is_expected.not_to contain_apache__mod('event') }
     it { is_expected.to contain_file('/etc/apache2/modules.d/event.conf').with_ensure('file') }
   end
+
   context 'on a Debian OS' do
     include_examples 'Debian 11'
 
@@ -114,6 +116,7 @@
 
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/event.load').with_ensure('link') }
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index 066448ecd2..c9d3681d93 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -11,6 +11,7 @@
     it { is_expected.to contain_apache__mod('expires') }
     it { is_expected.to contain_file('expires.conf').with(content: %r{ExpiresActive On\n}) }
   end
+
   context 'with expires default', :compile do
     let :pre_condition do
       'class { apache: default_mods => false }'
@@ -32,6 +33,7 @@
       )
     }
   end
+
   context 'with expires by type', :compile do
     let :pre_condition do
       'class { apache: default_mods => false }'
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
index f75b87686c..010639103b 100644
--- a/spec/classes/mod/ext_filter_spec.rb
+++ b/spec/classes/mod/ext_filter_spec.rb
@@ -11,6 +11,7 @@
       it { is_expected.to contain_apache__mod('ext_filter') }
       it { is_expected.not_to contain_file('ext_filter.conf') }
     end
+
     describe 'with parameters' do
       let :params do
         { ext_filter_define: { 'filtA' => 'input=A output=B',
@@ -21,6 +22,7 @@
       it { is_expected.to contain_file('ext_filter.conf').with_content(%r{^ExtFilterDefine\s+filtB\s+input=C cmd="C"$}) }
     end
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
@@ -28,6 +30,7 @@
       it { is_expected.to contain_apache__mod('ext_filter') }
       it { is_expected.not_to contain_file('ext_filter.conf') }
     end
+
     describe 'with parameters' do
       let :params do
         { ext_filter_define: { 'filtA' => 'input=A output=B',
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index ee4a1abc56..88d2b93c01 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -12,6 +12,7 @@ def general_info_specs_apache24
                "</Location>\n"
     it { is_expected.to contain_file('info.conf').with_content(expected) }
   end
+
   context 'passing restrict_access => false' do
     let :params do
       {
@@ -27,6 +28,7 @@ def general_info_specs_apache24
       )
     }
   end
+
   context "passing allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']" do
     let :params do
       { allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'] }
@@ -40,6 +42,7 @@ def general_info_specs_apache24
       is_expected.to contain_file('info.conf').with_content(expected)
     }
   end
+
   context 'passing both restrict_access and allow_from' do
     let :params do
       {
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 4a4668dcf3..45f9b9780f 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -27,6 +27,7 @@
 
       it { is_expected.to contain_file('/etc/apache2/mods-enabled/itk.load').with_ensure('link') }
     end
+
     context 'with enablecapabilities not set' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
@@ -54,6 +55,7 @@
                                                                                'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
       }
     end
+
     context 'with enablecapabilities set' do
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
@@ -68,6 +70,7 @@
       it { is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.conf').with_content(%r{EnableCapabilities  Off}) }
     end
   end
+
   context 'on a FreeBSD OS' do
     let :pre_condition do
       'class { "apache": mpm_module => false, }'
diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb
index d55629bcad..fa3607c7b7 100644
--- a/spec/classes/mod/lbmethod_bybusyness.rb
+++ b/spec/classes/mod/lbmethod_bybusyness.rb
@@ -20,6 +20,7 @@
       }
     end
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 6'
 
diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb
index d55629bcad..fa3607c7b7 100644
--- a/spec/classes/mod/lbmethod_byrequests.rb
+++ b/spec/classes/mod/lbmethod_byrequests.rb
@@ -20,6 +20,7 @@
       }
     end
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 6'
 
diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb
index d55629bcad..fa3607c7b7 100644
--- a/spec/classes/mod/lbmethod_bytraffic.rb
+++ b/spec/classes/mod/lbmethod_bytraffic.rb
@@ -20,6 +20,7 @@
       }
     end
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 6'
 
diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb
index d55629bcad..fa3607c7b7 100644
--- a/spec/classes/mod/lbmethod_heartbeat.rb
+++ b/spec/classes/mod/lbmethod_heartbeat.rb
@@ -20,6 +20,7 @@
       }
     end
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 6'
 
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 9bd68cfacf..5e994b1f6b 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -257,6 +257,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
         end
+
         describe 'with passenger_ruby => /usr/lib/example/ruby' do
           let :params do
             { passenger_ruby: '/usr/lib/example/ruby' }
@@ -264,6 +265,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
         end
+
         describe 'with passenger_default_ruby => /usr/lib/example/ruby1.9.3' do
           let :params do
             { passenger_ruby: '/usr/lib/example/ruby1.9.3' }
@@ -271,6 +273,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
         end
+
         describe 'with passenger_high_performance => on' do
           let :params do
             { passenger_high_performance: 'on' }
@@ -278,6 +281,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerHighPerformance on$}) }
         end
+
         describe 'with passenger_pool_idle_time => 1200' do
           let :params do
             { passenger_pool_idle_time: 1200 }
@@ -285,6 +289,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerPoolIdleTime 1200$}) }
         end
+
         describe 'with passenger_max_request_queue_size => 100' do
           let :params do
             { passenger_max_request_queue_size: 100 }
@@ -300,6 +305,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxRequests 20$}) }
         end
+
         describe 'with passenger_spawn_method => direct' do
           let :params do
             { passenger_spawn_method: 'direct' }
@@ -307,6 +313,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerSpawnMethod direct$}) }
         end
+
         describe 'with passenger_stat_throttle_rate => 10' do
           let :params do
             { passenger_stat_throttle_rate: 10 }
@@ -314,6 +321,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerStatThrottleRate 10$}) }
         end
+
         describe 'with passenger_max_pool_size => 16' do
           let :params do
             { passenger_max_pool_size: 16 }
@@ -321,6 +329,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxPoolSize 16$}) }
         end
+
         describe 'with passenger_min_instances => 5' do
           let :params do
             { passenger_min_instances: 5 }
@@ -328,6 +337,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMinInstances 5$}) }
         end
+
         describe 'with passenger_max_instances_per_app => 8' do
           let :params do
             { passenger_max_instances_per_app: 8 }
@@ -335,6 +345,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxInstancesPerApp 8$}) }
         end
+
         describe 'with rack_autodetect => on' do
           let :params do
             { rack_autodetect: 'on' }
@@ -342,6 +353,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RackAutoDetect on$}) }
         end
+
         describe 'with rails_autodetect => on' do
           let :params do
             { rails_autodetect: 'on' }
@@ -349,6 +361,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RailsAutoDetect on$}) }
         end
+
         describe 'with passenger_use_global_queue => on' do
           let :params do
             { passenger_use_global_queue: 'on' }
@@ -356,6 +369,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerUseGlobalQueue on$}) }
         end
+
         describe "with passenger_app_env => 'foo'" do
           let :params do
             { passenger_app_env: 'foo' }
@@ -363,6 +377,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerAppEnv foo$}) }
         end
+
         describe "with passenger_log_file => '/var/log/apache2/passenger.log'" do
           let :params do
             { passenger_log_file: '/var/log/apache2/passenger.log' }
@@ -370,6 +385,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogFile "/var/log/apache2/passenger.log"$}) }
         end
+
         describe 'with passenger_log_level => 3' do
           let :params do
             { passenger_log_level: 3 }
@@ -377,6 +393,7 @@
 
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerLogLevel 3$}) }
         end
+
         describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
           let :params do
             { mod_path: '/usr/lib/foo/mod_foo.so' }
@@ -384,6 +401,7 @@
 
           it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$}) }
         end
+
         describe "with mod_lib_path => '/usr/lib/foo'" do
           let :params do
             { mod_lib_path: '/usr/lib/foo' }
@@ -391,6 +409,7 @@
 
           it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$}) }
         end
+
         describe "with mod_lib => 'mod_foo.so'" do
           let :params do
             { mod_lib: 'mod_foo.so' }
@@ -398,6 +417,7 @@
 
           it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$}) }
         end
+
         describe "with mod_id => 'mod_foo'" do
           let :params do
             { mod_id: 'mod_foo' }
@@ -441,6 +461,7 @@
 
                 it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRoot "\/usr\/lib\/example"$}) }
               end
+
               describe 'with passenger_ruby => /usr/lib/example/ruby' do
                 let :params do
                   { passenger_ruby: '/usr/lib/example/ruby' }
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
index c59f2bf2ac..ad41e97503 100644
--- a/spec/classes/mod/perl_spec.rb
+++ b/spec/classes/mod/perl_spec.rb
@@ -11,6 +11,7 @@
     it { is_expected.to contain_apache__mod('perl') }
     it { is_expected.to contain_package('libapache2-mod-perl2') }
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
@@ -18,6 +19,7 @@
     it { is_expected.to contain_apache__mod('perl') }
     it { is_expected.to contain_package('mod_perl') }
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
 
@@ -25,6 +27,7 @@
     it { is_expected.to contain_apache__mod('perl') }
     it { is_expected.to contain_package('www/mod_perl2') }
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
diff --git a/spec/classes/mod/peruser_spec.rb b/spec/classes/mod/peruser_spec.rb
index d514238044..b95904a3b9 100644
--- a/spec/classes/mod/peruser_spec.rb
+++ b/spec/classes/mod/peruser_spec.rb
@@ -12,6 +12,7 @@
 
     it { is_expected.to compile.and_raise_error(%r{Unsupported osfamily FreeBSD}) }
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 364f554cdc..3e364adc21 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -19,6 +19,7 @@
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
           end
+
           case facts[:os]['release']['major']
           when '9'
             context 'on stretch' do
@@ -131,6 +132,7 @@
                 it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
               end
             end
+
             context 'with alternative package name' do
               let :pre_condition do
                 'class { "apache": }'
@@ -141,6 +143,7 @@
 
               it { is_expected.to contain_package('php54') }
             end
+
             context 'with alternative path' do
               let :pre_condition do
                 'class { "apache": }'
@@ -162,6 +165,7 @@
                 it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module alternative-path\n") }
               end
             end
+
             context 'with alternative extensions' do
               let :pre_condition do
                 'class { "apache": }'
@@ -174,6 +178,7 @@
 
               it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) } if facts[:os]['release']['major'].to_i < 8
             end
+
             if facts[:os]['release']['major'].to_i > 5
               context 'with specific version' do
                 let :pre_condition do
@@ -206,6 +211,7 @@
                 it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
               end
             end
+
             context 'with mpm_module => itk' do
               let :pre_condition do
                 'class { "apache": mpm_module => itk, }'
@@ -236,6 +242,7 @@
             it { is_expected.to contain_package('www/mod_php5') }
             it { is_expected.to contain_file('php5.load') }
           end
+
           context 'with mpm_module => itk' do
             let :pre_condition do
               'class { "apache": mpm_module => itk, }'
@@ -256,6 +263,7 @@
             it { is_expected.to contain_package('dev-lang/php') }
             it { is_expected.to contain_file('php5.load') }
           end
+
           context 'with mpm_module => itk' do
             let :pre_condition do
               'class { "apache": mpm_module => itk, }'
@@ -289,6 +297,7 @@
             )
           }
         end
+
         context 'with template param' do
           let :params do
             { template: 'apache/mod/php.conf.erb' }
@@ -300,6 +309,7 @@
             )
           }
         end
+
         context 'with source param' do
           let :params do
             { source: 'some-path' }
@@ -311,6 +321,7 @@
             )
           }
         end
+
         context 'content has priority over template' do
           let :params do
             {
@@ -325,6 +336,7 @@
             )
           }
         end
+
         context 'source has priority over template' do
           let :params do
             {
@@ -339,6 +351,7 @@
             )
           }
         end
+
         context 'source has priority over content' do
           let :params do
             {
@@ -353,6 +366,7 @@
             )
           }
         end
+
         context 'with mpm_module => worker' do
           let :pre_condition do
             'class { "apache": mpm_module => worker, }'
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index b4535a30a2..20b416c43a 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -22,6 +22,7 @@
 
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.load').with_ensure('link') }
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
@@ -34,6 +35,7 @@
                                                                                  'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
     }
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
 
@@ -41,6 +43,7 @@
     it { is_expected.not_to contain_apache__mod('prefork') }
     it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/prefork.conf').with_ensure('file') }
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index e89dce60a1..1b03e82590 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -41,6 +41,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
       it { is_expected.not_to contain_file('proxy_balancer.conf symlink') }
     end
   end
+
   context "default configuration with custom parameters $manager => true, $allow_from => ['10.10.10.10','11.11.11.11'], $status_path => '/custom-manager' on a Debian OS" do
     include_examples 'Debian 11'
     let :params do
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
index 346625a5e3..a049f6aa71 100644
--- a/spec/classes/mod/proxy_html_spec.rb
+++ b/spec/classes/mod/proxy_html_spec.rb
@@ -16,6 +16,7 @@
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: loadfiles) }
     end
+
     include_examples 'Debian 11'
 
     context 'on i386' do
@@ -25,6 +26,7 @@
 
       it_behaves_like 'debian', ['/usr/lib/i386-linux-gnu/libxml2.so.2']
     end
+
     context 'on x64' do
       let(:facts) { override_facts(super(), os: { architecture: 'x86_64' }) }
 
@@ -42,6 +44,7 @@
     it { is_expected.to contain_package('mod_proxy_html') }
     it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
   end
+
   context 'on a FreeBSD OS', :compile do
     include_examples 'FreeBSD 9'
 
@@ -49,6 +52,7 @@
     it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
     it { is_expected.to contain_apache__mod('xml2enc').with(loadfiles: nil) }
   end
+
   context 'on a Gentoo OS', :compile do
     include_examples 'Gentoo'
 
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
index 4dbefd1bed..4fe137226c 100644
--- a/spec/classes/mod/python_spec.rb
+++ b/spec/classes/mod/python_spec.rb
@@ -12,6 +12,7 @@
     it { is_expected.to contain_apache__mod('python') }
     it { is_expected.to contain_package('libapache2-mod-python') }
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
@@ -28,6 +29,7 @@
       it { is_expected.to contain_file('FooBar').with_path('/etc/httpd/conf.modules.d/FooBar') }
     end
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
 
@@ -35,6 +37,7 @@
     it { is_expected.to contain_apache__mod('python') }
     it { is_expected.to contain_package('www/mod_python3') }
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index 8e929a9d8b..b89546243d 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -20,6 +20,7 @@
 
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPHeader X-Forwarded-For$}) }
     end
+
     describe 'with internal_proxy => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { internal_proxy: ['10.42.17.8', '10.42.18.99'] }
@@ -28,6 +29,7 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.18.99$}) }
     end
+
     describe 'with IPv4 CIDR in internal_proxy => [ 192.168.1.0/24 ]' do
       let :params do
         { internal_proxy: ['192.168.1.0/24'] }
@@ -35,6 +37,7 @@
 
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 192.168.1.0/24$}) }
     end
+
     describe 'with IPv6 CIDR in internal_proxy => [ fd00:fd00:fd00:2000::/64 ]' do
       let :params do
         { internal_proxy: ['fd00:fd00:fd00:2000::/64'] }
@@ -42,6 +45,7 @@
 
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy fd00:fd00:fd00:2000::/64$}) }
     end
+
     describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
@@ -50,6 +54,7 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 10.42.18.99$}) }
     end
+
     describe 'with IPv4 CIDR in proxy_ips => [ 192.168.1.0/24 ]' do
       let :params do
         { proxy_ips: ['192.168.1.0/24'] }
@@ -57,6 +62,7 @@
 
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy 192.168.1.0/24$}) }
     end
+
     describe 'with IPv6 CIDR in proxy_ips => [ fd00:fd00:fd00:2000::/64 ]' do
       let :params do
         { proxy_ips: ['fd00:fd00:fd00:2000::/64'] }
@@ -64,6 +70,7 @@
 
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPInternalProxy fd00:fd00:fd00:2000::/64$}) }
     end
+
     describe 'with trusted_proxy => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { trusted_proxy: ['10.42.17.8', '10.42.18.99'] }
@@ -72,6 +79,7 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.18.99$}) }
     end
+
     describe 'with trusted_proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { trusted_proxy: ['10.42.17.8', '10.42.18.99'] }
@@ -80,6 +88,7 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPTrustedProxy 10.42.18.99$}) }
     end
+
     describe 'with proxy_protocol_exceptions => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { proxy_protocol_exceptions: ['10.42.17.8', '10.42.18.99'] }
@@ -88,6 +97,7 @@
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPProxyProtocolExceptions 10.42.17.8$}) }
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPProxyProtocolExceptions 10.42.18.99$}) }
     end
+
     describe 'with IPv4 CIDR in proxy_protocol_exceptions => [ 192.168.1.0/24 ]' do
       let :params do
         { proxy_protocol_exceptions: ['192.168.1.0/24'] }
@@ -95,6 +105,7 @@
 
       it { is_expected.to contain_file('remoteip.conf').with_content(%r{^RemoteIPProxyProtocolExceptions 192.168.1.0/24$}) }
     end
+
     describe 'with IPv6 CIDR in proxy_protocol_exceptions => [ fd00:fd00:fd00:2000::/64 ]' do
       let :params do
         { proxy_protocol_exceptions: ['fd00:fd00:fd00:2000::/64'] }
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
index 9cf449c3cf..63b3415fc4 100644
--- a/spec/classes/mod/reqtimeout_spec.rb
+++ b/spec/classes/mod/reqtimeout_spec.rb
@@ -12,6 +12,7 @@
       it { is_expected.to contain_apache__mod('reqtimeout') }
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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'] }
@@ -21,6 +22,7 @@
       it { is_expected.to contain_apache__mod('reqtimeout') }
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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' }
@@ -31,6 +33,7 @@
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^RequestReadTimeout header=20-60,minrate=600$}) }
     end
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
@@ -39,6 +42,7 @@
       it { is_expected.to contain_apache__mod('reqtimeout') }
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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'] }
@@ -48,6 +52,7 @@
       it { is_expected.to contain_apache__mod('reqtimeout') }
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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' }
@@ -58,6 +63,7 @@
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^RequestReadTimeout header=20-60,minrate=600$}) }
     end
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
 
@@ -66,6 +72,7 @@
       it { is_expected.to contain_apache__mod('reqtimeout') }
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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'] }
@@ -75,6 +82,7 @@
       it { is_expected.to contain_apache__mod('reqtimeout') }
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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' }
@@ -85,6 +93,7 @@
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^RequestReadTimeout header=20-60,minrate=600$}) }
     end
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
@@ -93,6 +102,7 @@
       it { is_expected.to contain_apache__mod('reqtimeout') }
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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'] }
@@ -102,6 +112,7 @@
       it { is_expected.to contain_apache__mod('reqtimeout') }
       it { is_expected.to contain_file('reqtimeout.conf').with_content(%r{^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' }
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 560b82bfe3..4de5fb5710 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -24,6 +24,7 @@
 
       it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFsethostname On$}) }
     end
+
     describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
@@ -31,6 +32,7 @@
 
       it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFproxy_ips 10.42.17.8 10.42.18.99$}) }
     end
+
     describe 'with header => X-Real-IP' do
       let :params do
         { header: 'X-Real-IP' }
@@ -39,6 +41,7 @@
       it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFheader X-Real-IP$}) }
     end
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
 
@@ -59,6 +62,7 @@
 
       it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFsethostname On$}) }
     end
+
     describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
@@ -66,6 +70,7 @@
 
       it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFproxy_ips 10.42.17.8 10.42.18.99$}) }
     end
+
     describe 'with header => X-Real-IP' do
       let :params do
         { header: 'X-Real-IP' }
@@ -74,6 +79,7 @@
       it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFheader X-Real-IP$}) }
     end
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
@@ -94,6 +100,7 @@
 
       it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFsethostname On$}) }
     end
+
     describe 'with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]' do
       let :params do
         { proxy_ips: ['10.42.17.8', '10.42.18.99'] }
@@ -101,6 +108,7 @@
 
       it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFproxy_ips 10.42.17.8 10.42.18.99$}) }
     end
+
     describe 'with header => X-Real-IP' do
       let :params do
         { header: 'X-Real-IP' }
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 16fdf58630..f38ac5037c 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -117,6 +117,7 @@
               )
             }
           end
+
           describe 'with other modsec parameters' do
             let :params do
               {
@@ -126,6 +127,7 @@
 
             it { is_expected.not_to contain_file('/etc/httpd/modsecurity.d/security_crs.conf') }
           end
+
           describe 'with custom parameters' do
             let :params do
               {
@@ -137,6 +139,7 @@
               is_expected.not_to contain_file('/etc/httpd/modsecurity.d/custom_rules/custom_01_rules.conf')
             }
           end
+
           describe 'with parameters' do
             let :params do
               {
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
index a1f25afb33..92168a7d56 100644
--- a/spec/classes/mod/shib_spec.rb
+++ b/spec/classes/mod/shib_spec.rb
@@ -11,6 +11,7 @@
       it { is_expected.to contain_apache__mod('shib2').with_id('mod_shib') }
     end
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index ba4f4a5531..f631458edb 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -72,6 +72,7 @@
     it { is_expected.not_to contain_package('libapache2-mod-ssl') }
     it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv3}) }
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
 
@@ -94,6 +95,7 @@
     it { is_expected.to contain_apache__mod('ssl') }
     it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/var/lib/apache2/ssl_scache\(512000\)"$}) }
   end
+
   # Template config doesn't vary by distro
   context 'on all distros' do
     include_examples 'RedHat 8'
@@ -148,6 +150,7 @@
       it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLCompression Off$}) }
       it { is_expected.not_to contain_file('ssl.conf').with_content(%r{^  SSLSessionTickets (Off|On)$}) }
     end
+
     context 'with ssl_compression set to true' do
       let :params do
         {
@@ -177,6 +180,7 @@
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLUseStapling On$}) }
     end
+
     context 'with ssl_stapling_return_errors set to true' do
       let :params do
         {
@@ -186,6 +190,7 @@
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLStaplingReturnResponderErrors On$}) }
     end
+
     context 'with stapling_cache' do
       let :params do
         {
@@ -235,6 +240,7 @@
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  Mutex posixsem$}) }
     end
+
     context 'setting ssl_sessioncache' do
       let :params do
         {
@@ -244,6 +250,7 @@
 
       it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLSessionCache "shmcb:/tmp/customsessioncache\(51200\)"$}) }
     end
+
     context 'setting ssl_proxy_protocol' do
       let :params do
         {
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index fa6c6af8e2..2a721d4b11 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -16,6 +16,7 @@
     context 'default parameters' do
       it { is_expected.to compile }
     end
+
     context 'with dir set to something' do
       let :params do
         {
@@ -26,6 +27,7 @@
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/hi$}) }
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/hi\"\>$}) }
     end
+
     context 'with home set to something' do
       let :params do
         {
@@ -36,6 +38,7 @@
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/u/\*/public_html$}) }
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/u/\*/public_html"\>$}) }
     end
+
     context 'with path set to something' do
       let :params do
         {
@@ -46,6 +49,7 @@
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/\*/public_html$}) }
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/\*/public_html\"\>$}) }
     end
+
     context 'with userdir set to something' do
       let :params do
         {
@@ -57,6 +61,7 @@
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+public_html$}) }
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/\*/public_html\"\>$}) }
     end
+
     context 'with unmanaged_path set to true' do
       let :params do
         {
@@ -67,6 +72,7 @@
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/public_html$}) }
       it { is_expected.not_to contain_file('userdir.conf').with_content(%r{^\s*\<Directory }) }
     end
+
     context 'with custom_fragment set to something' do
       let :params do
         {
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 4b776165a7..8675d9b9fb 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -19,6 +19,7 @@
                                                                                   'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n")
     }
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
@@ -31,6 +32,7 @@
                                                                                 'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
     }
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
 
@@ -38,6 +40,7 @@
     it { is_expected.not_to contain_apache__mod('worker') }
     it { is_expected.to contain_file('/usr/local/etc/apache24/Modules/worker.conf').with_ensure('file') }
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index 2b14895d74..b539500e2f 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -17,6 +17,7 @@
 
     it { is_expected.to contain_package('libapache2-mod-wsgi-py3') }
   end
+
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
 
@@ -33,6 +34,7 @@
 
       it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIRestrictEmbedded On$}) }
     end
+
     describe 'with custom WSGISocketPrefix' do
       let :params do
         { wsgi_socket_prefix: 'run/wsgi' }
@@ -40,6 +42,7 @@
 
       it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGISocketPrefix run\/wsgi$}) }
     end
+
     describe 'with custom WSGIPythonHome' do
       let :params do
         { wsgi_python_home: '/path/to/virtenv' }
@@ -47,6 +50,7 @@
 
       it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIPythonHome "\/path\/to\/virtenv"$}) }
     end
+
     describe 'with custom WSGIApplicationGroup' do
       let :params do
         { wsgi_application_group: '%{GLOBAL}' }
@@ -54,6 +58,7 @@
 
       it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIApplicationGroup "%{GLOBAL}"$}) }
     end
+
     describe 'with custom WSGIPythonOptimize' do
       let :params do
         { wsgi_python_optimize: 1 }
@@ -61,6 +66,7 @@
 
       it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIPythonOptimize 1$}) }
     end
+
     describe 'with custom package_name and mod_path' do
       let :params do
         {
@@ -77,6 +83,7 @@
       it { is_expected.to contain_package('mod_wsgi_package') }
       it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module /foo/bar/baz}) }
     end
+
     describe 'with custom mod_path not containing /' do
       let :params do
         {
@@ -92,6 +99,7 @@
 
       it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module modules/wsgi_mod_name.so}) }
     end
+
     describe 'with package_name but no mod_path' do
       let :params do
         {
@@ -101,6 +109,7 @@
 
       it { is_expected.to compile.and_raise_error(%r{apache::mod::wsgi - both package_name and mod_path must be specified!}) }
     end
+
     describe 'with mod_path but no package_name' do
       let :params do
         {
@@ -111,6 +120,7 @@
       it { is_expected.to compile.and_raise_error(%r{apache::mod::wsgi - both package_name and mod_path must be specified!}) }
     end
   end
+
   context 'on a FreeBSD OS' do
     include_examples 'FreeBSD 9'
 
@@ -124,6 +134,7 @@
 
     it { is_expected.to contain_package('www/mod_wsgi') }
   end
+
   context 'on a Gentoo OS' do
     include_examples 'Gentoo'
 
@@ -137,6 +148,7 @@
 
     it { is_expected.to contain_package('www-apache/mod_wsgi') }
   end
+
   context 'overriding mod_libs' do
     context 'on a RedHat OS', :compile do
       include_examples 'RedHat 8'
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index fd299b954a..aa2dca3225 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -18,6 +18,7 @@
       it { is_expected.to contain_concat('apache_balancer_myapp') }
       it { is_expected.to contain_concat__fragment('00-myapp-header').with_content(%r{^<Proxy balancer://myapp>$}) }
     end
+
     describe 'accept a target parameter and use it' do
       let :params do
         {
@@ -29,6 +30,7 @@
         is_expected.to contain_concat('apache_balancer_myapp').with(path: '/tmp/myapp.conf')
       }
     end
+
     describe 'accept an options parameter and use it' do
       let :params do
         {
@@ -43,6 +45,7 @@
       }
     end
   end
+
   describe 'apache pre_condition with conf_dir set' do
     let :pre_condition do
       'class{"apache":
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index aeef4f1cce..cec2c5c97d 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -30,6 +30,7 @@
 
     it { is_expected.to contain_concat__fragment('BalancerMember http://127.0.0.1:8080/') }
   end
+
   describe 'allows balancermember with a different target' do
     let :pre_condition do
       'include apache
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index 0e2a7dc79b..db695c05f2 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -39,6 +39,7 @@
         .that_requires('Package[httpd]')
     }
   end
+
   context 'set everything with source' do
     let :params do
       {
@@ -66,6 +67,7 @@
               'source' => 'puppet:///modules/apache/test')
     }
   end
+
   context 'verify_config => false' do
     let :params do
       {
@@ -78,6 +80,7 @@
     it { is_expected.not_to contain_exec('remove rspec if invalid') }
     it { is_expected.to contain_file('apache_rspec').that_notifies('Class[Apache::Service]') }
   end
+
   context 'ensure => absent' do
     let :params do
       {
@@ -89,6 +92,7 @@
     it { is_expected.not_to contain_exec('remove rspec if invalid') }
     it { is_expected.to contain_file('apache_rspec').with('ensure' => 'absent') }
   end
+
   describe 'validation' do
     context 'both content and source' do
       let :params do
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index 0e32e46d55..ffd6aca080 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -18,6 +18,7 @@
 
       it { is_expected.to compile }
     end
+
     context 'on Debian based systems' do
       include_examples 'Debian 11'
 
@@ -37,6 +38,7 @@
         )
       }
     end
+
     context 'on FreeBSD systems' do
       include_examples 'FreeBSD 9'
 
@@ -48,6 +50,7 @@
         )
       }
     end
+
     context 'on Gentoo systems' do
       include_examples 'Gentoo'
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 52bf1bbaa9..9fb5031987 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -34,6 +34,7 @@
           it { is_expected.to contain_class('apache::params') }
           it { is_expected.to contain_apache__listen(params[:port]) }
         end
+
         context 'set everything!' do
           let :params do
             {
@@ -930,6 +931,7 @@
             )
           }
         end
+
         context 'vhost with proxy_add_headers true' do
           let :params do
             {
@@ -957,6 +959,7 @@
           it { is_expected.to compile }
           it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyAddHeaders On}) }
         end
+
         context 'vhost with proxy_add_headers false' do
           let :params do
             {
@@ -984,6 +987,7 @@
           it { is_expected.to compile }
           it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyAddHeaders Off}) }
         end
+
         context 'vhost without proxy' do
           let :params do
             {
@@ -1010,6 +1014,7 @@
           it { is_expected.to compile }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-proxy') }
         end
+
         context 'vhost without proxy_add_headers' do
           let :params do
             {
@@ -1037,6 +1042,7 @@
           it { is_expected.to compile }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-proxy').with_content(%r{ProxyAddHeaders}) }
         end
+
         context 'vhost with scheme and port in servername and use_servername_for_filenames' do
           let :params do
             {
@@ -1063,6 +1069,7 @@
             is_expected.to contain_concat('25-www.example.com.conf')
           }
         end
+
         context 'vhost with scheme in servername and use_servername_for_filenames' do
           let :params do
             {
@@ -1089,6 +1096,7 @@
             is_expected.to contain_concat('25-www.example.com.conf')
           }
         end
+
         context 'vhost with port in servername and use_servername_for_filenames' do
           let :params do
             {
@@ -1115,6 +1123,7 @@
             is_expected.to contain_concat('25-www.example.com.conf')
           }
         end
+
         context 'vhost with servername and use_servername_for_filenames' do
           let :params do
             {
@@ -1141,6 +1150,7 @@
             is_expected.to contain_concat('25-www.example.com.conf')
           }
         end
+
         context 'vhost with multiple ip addresses' do
           let :params do
             {
@@ -1298,6 +1308,7 @@
             )
           }
         end
+
         context 'vhost with virtual_docroot and docroot' do
           let :params do
             {
@@ -1338,6 +1349,7 @@
             )
           }
         end
+
         context 'modsec_audit_log_file' do
           let :params do
             {
@@ -1421,6 +1433,7 @@
 
           it { is_expected.to contain_class('apache::mod::alias') }
         end
+
         context 'proxy_pass_match' do
           let :params do
             {
@@ -1539,6 +1552,7 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-limits') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
         end
+
         context 'wsgi_application_group should set apache::mod::wsgi' do
           let :params do
             {
@@ -1549,6 +1563,7 @@
 
           it { is_expected.to contain_class('apache::mod::wsgi') }
         end
+
         context 'wsgi_daemon_process should set apache::mod::wsgi' do
           let :params do
             {
@@ -1559,6 +1574,7 @@
 
           it { is_expected.to contain_class('apache::mod::wsgi') }
         end
+
         context 'wsgi_import_script on its own should not set apache::mod::wsgi' do
           let :params do
             {
@@ -1569,6 +1585,7 @@
 
           it { is_expected.not_to contain_class('apache::mod::wsgi') }
         end
+
         context 'wsgi_import_script_options on its own should not set apache::mod::wsgi' do
           let :params do
             {
@@ -1582,6 +1599,7 @@
 
           it { is_expected.not_to contain_class('apache::mod::wsgi') }
         end
+
         context 'wsgi_import_script and wsgi_import_script_options should set apache::mod::wsgi' do
           let :params do
             {
@@ -1596,6 +1614,7 @@
 
           it { is_expected.to contain_class('apache::mod::wsgi') }
         end
+
         context 'wsgi_process_group should set apache::mod::wsgi' do
           let :params do
             {
@@ -1606,6 +1625,7 @@
 
           it { is_expected.to contain_class('apache::mod::wsgi') }
         end
+
         context 'wsgi_script_aliases with non-empty aliases should set apache::mod::wsgi' do
           let :params do
             {
@@ -1618,6 +1638,7 @@
 
           it { is_expected.to contain_class('apache::mod::wsgi') }
         end
+
         context 'wsgi_script_aliases with empty aliases should set apache::mod::wsgi' do
           let :params do
             {
@@ -1628,6 +1649,7 @@
 
           it { is_expected.not_to contain_class('apache::mod::wsgi') }
         end
+
         context 'wsgi_pass_authorization should set apache::mod::wsgi' do
           let :params do
             {
@@ -1638,6 +1660,7 @@
 
           it { is_expected.to contain_class('apache::mod::wsgi') }
         end
+
         context 'when not setting nor managing the docroot' do
           let :params do
             {
@@ -1649,6 +1672,7 @@
           it { is_expected.to compile }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
         end
+
         context 'ssl_proxyengine without ssl' do
           let :params do
             {
@@ -1662,6 +1686,7 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') }
         end
+
         context 'ssl_proxy_protocol without ssl_proxyengine' do
           let :params do
             {
@@ -1676,6 +1701,7 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') }
         end
+
         context 'ssl_honorcipherorder' do
           let :params do
             {
@@ -1697,6 +1723,7 @@
             it { is_expected.to compile }
             it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+On$}) }
           end
+
           context 'ssl_honorcipherorder true' do
             let :params do
               super().merge({ 'ssl_honorcipherorder' => true })
@@ -1705,6 +1732,7 @@
             it { is_expected.to compile }
             it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+On$}) }
           end
+
           context 'ssl_honorcipherorder off' do
             let :params do
               super().merge({ 'ssl_honorcipherorder' => 'off' })
@@ -1713,6 +1741,7 @@
             it { is_expected.to compile }
             it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+Off$}) }
           end
+
           context 'ssl_honorcipherorder false' do
             let :params do
               super().merge({ 'ssl_honorcipherorder' => false })
@@ -1722,6 +1751,7 @@
             it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with_content(%r{^\s*SSLHonorCipherOrder\s+Off$}) }
           end
         end
+
         describe 'access logs' do
           context 'single log file' do
             let(:params) do
@@ -1737,6 +1767,7 @@
               )
             }
           end
+
           context 'single log file with environment' do
             let(:params) do
               {
@@ -1752,6 +1783,7 @@
               )
             }
           end
+
           context 'multiple log files' do
             let(:params) do
               {
@@ -1783,6 +1815,7 @@
             }
           end
         end # access logs
+
         describe 'error logs format' do
           context 'single log format directive as a string' do
             let(:params) do
@@ -1823,6 +1856,7 @@
             }
           end
         end # error logs format
+
         describe 'validation' do
           let(:params) do
             {
@@ -1849,6 +1883,7 @@
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
+
           context 'empty rewrites' do
             let(:params) do
               super().merge(
@@ -1862,6 +1897,7 @@
               is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
             }
           end
+
           context 'empty rewrites_with_rewrite_inherit' do
             let(:params) do
               super().merge(
@@ -1877,6 +1913,7 @@
                 .with_content(%r{^\s+RewriteRule \^index\.html\$ welcome.html$})
             }
           end
+
           context 'empty rewrites_without_rewrite_inherit' do
             let(:params) do
               super().merge(
@@ -1904,6 +1941,7 @@
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
+
           context 'access_log_file and access_log_pipe' do
             let :params do
               super().merge(
@@ -1914,6 +1952,7 @@
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
+
           context 'error_log_file and error_log_pipe' do
             let :params do
               super().merge(
@@ -1924,16 +1963,19 @@
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
+
           context 'bad custom_fragment' do
             let(:params) { super().merge('custom_fragment' => true) }
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
+
           context 'bad access_logs' do
             let(:params) { super().merge('access_logs' => '/var/log/somewhere') }
 
             it { is_expected.to raise_error(Puppet::Error) }
           end
+
           context 'default of require all granted' do
             let :params do
               {
@@ -1986,6 +2028,7 @@
               )
             }
           end
+
           describe 'redirectmatch_*' do
             let(:params) { super().merge(port: 84) }
 
@@ -1995,12 +2038,14 @@
               it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
               it { is_expected.to contain_class('apache::mod::alias') }
             end
+
             context 'none' do
               it { is_expected.not_to contain_concat__fragment('rspec.example.com-redirect') }
               it { is_expected.not_to contain_class('apache::mod::alias') }
             end
           end
         end
+
         context 'oidc_settings RedirectURL' do
           describe 'with VALID relative URI' do
             let :params do
@@ -2042,6 +2087,7 @@
             it { is_expected.not_to compile }
           end
         end
+
         context 'mdomain' do
           let :params do
             default_params.merge(
diff --git a/spec/functions/pw_hash_spec.rb b/spec/functions/pw_hash_spec.rb
index 5faf7d43e9..40674aa890 100644
--- a/spec/functions/pw_hash_spec.rb
+++ b/spec/functions/pw_hash_spec.rb
@@ -20,6 +20,7 @@
     describe 'apache_pw_hash', type: :puppet_function do
       it_behaves_like 'apache::pw_hash function'
     end
+
     describe 'apache::apache_pw_hash', type: :puppet_function do
       it_behaves_like 'apache::pw_hash function'
     end

From ac31ad56db5c1c3aaa10c4e541c10cafc223b83e Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 09:28:46 +0100
Subject: [PATCH 2112/2267] (CONT-772) Correct cop group 3

---
 .rubocop_todo.yml                         | 35 ++---------------------
 spec/acceptance/apache_parameters_spec.rb |  4 +--
 spec/acceptance/vhost_spec.rb             | 12 ++++----
 spec/classes/mod/auth_mellon_spec.rb      |  2 +-
 spec/defines/vhost_spec.rb                |  4 +--
 spec/spec_helper.rb                       |  2 +-
 util/apache_mod_platform_support.rb       |  6 ++--
 7 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1ca9313190..a5be54e7ee 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-19 23:25:24 UTC using RuboCop version 1.48.1.
+# on 2023-04-20 08:33:47 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -98,7 +98,7 @@ RSpec/ImplicitSubject:
   Enabled: false
 
 # Offense count: 16
-# This cop supports safe autocorrection (--autocorrect).
+# This cop supports safe autocorrection.
 RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/classes/mod/auth_kerb_spec.rb'
@@ -217,40 +217,9 @@ Style/RedundantRegexpEscape:
     - 'spec/classes/mod/wsgi_spec.rb'
     - 'spec/defines/vhost_spec.rb'
 
-# Offense count: 22
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantStringEscape:
-  Exclude:
-    - 'spec/acceptance/apache_parameters_spec.rb'
-    - 'spec/acceptance/vhost_spec.rb'
-    - 'spec/classes/mod/auth_mellon_spec.rb'
-    - 'spec/defines/vhost_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/StderrPuts:
-  Exclude:
-    - 'util/apache_mod_platform_support.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'lib/puppet/functions/apache/pw_hash.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'spec/defines/vhost_spec.rb'
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 1469e9109c..28ba8f547f 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -367,8 +367,8 @@ class { 'apache':
       pp = <<-MANIFEST
           class { 'apache':
             log_formats => {
-              'vhost_common'   => '%v %h %l %u %t \\\"%r\\\" %>s %b',
-              'vhost_combined' => '%v %h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\"',
+              'vhost_common'   => '%v %h %l %u %t \\"%r\\" %>s %b',
+              'vhost_combined' => '%v %h %l %u %t \\"%r\\" %>s %b \\"%{Referer}i\\" \\"%{User-agent}i\\"',
             }
           }
       MANIFEST
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 442fb31e9b..da2867d162 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -125,7 +125,7 @@ class { 'apache': }
       it { is_expected.to contain 'ProxyPreserveHost On' }
       it { is_expected.to contain 'ProxyErrorOverride On' }
       it { is_expected.not_to contain 'ProxyAddHeaders' }
-      it { is_expected.not_to contain "<Proxy \*>" }
+      it { is_expected.not_to contain '<Proxy *>' }
     end
   end
 
@@ -153,7 +153,7 @@ class { 'apache': }
       it { is_expected.to contain 'ProxyPreserveHost On' }
       it { is_expected.to contain 'ProxyErrorOverride On' }
       it { is_expected.not_to contain 'ProxyAddHeaders' }
-      it { is_expected.not_to contain "<Proxy \*>" }
+      it { is_expected.not_to contain '<Proxy *>' }
     end
   end
 
@@ -276,9 +276,9 @@ class { 'apache':
       class { 'apache': }
 
       if versioncmp('#{apache_hash['version']}', '2.4') >= 0 {
-        $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
+        $_files_match_directory = { 'path' => '(.swp|.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
       } else {
-        $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
+        $_files_match_directory = { 'path' => '(.swp|.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
       }
 
       $_directories = [
@@ -785,14 +785,14 @@ class { 'apache': }
       apache::vhost { 'test.setenv_setenvif':
         docroot  => '/tmp',
         setenv   => ['TEST /test'],
-        setenvif => ['Request_URI "\.gif$" object_is_image=gif']
+        setenvif => ['Request_URI ".gif$" object_is_image=gif']
       }
       apache::vhost { 'test.rewrite':
         docroot          => '/tmp',
         rewrites => [
           { comment => 'test',
             rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
-            rewrite_rule => ['^index\.html$ welcome.html'],
+            rewrite_rule => ['^index.html$ welcome.html'],
             rewrite_map  => ['lc int:tolower'],
           }
         ],
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index bae7936b04..99e01afe7f 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -13,7 +13,7 @@
       it { is_expected.to contain_apache__mod('auth_mellon') }
       it { is_expected.to contain_package('libapache2-mod-auth-mellon') }
       it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
-      it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"/var/cache/apache2/mod_auth_mellon/\"\n") }
     end
 
     describe 'with parameters' do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9fb5031987..852ca622c1 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -5,7 +5,7 @@
 describe 'apache::vhost', type: :define do
   describe 'os-independent items' do
     on_supported_os.each do |os, os_facts|
-      let(:apache_name) { facts[:os]['family'] == 'RedHat' ? 'httpd' : 'apache2' }
+      let(:apache_name) { (facts[:os]['family'] == 'RedHat') ? 'httpd' : 'apache2' }
 
       let :pre_condition do
         "class {'apache': default_vhost => false, default_mods => false, vhost_enable_dir => '/etc/#{apache_name}/sites-enabled'}"
@@ -2033,7 +2033,7 @@
             let(:params) { super().merge(port: 84) }
 
             context 'dest and regexp' do
-              let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg', redirectmatch_regexp: "(.*)\.gif$") }
+              let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg', redirectmatch_regexp: '(.*).gif$') }
 
               it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
               it { is_expected.to contain_class('apache::mod::alias') }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 50071092d7..c6e5525752 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,7 +26,7 @@
 
   begin
     default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
-  rescue => e
+  rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
 end
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb
index b857126d20..0add6f0e0b 100644
--- a/util/apache_mod_platform_support.rb
+++ b/util/apache_mod_platform_support.rb
@@ -60,12 +60,12 @@ def initialize(manifest, line_num, error_type, error_detail)
   def print_parsing_errors
     return if @manifest_errors.empty?
 
-    $stderr.puts "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n"
+    warn "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n"
     @manifest_errors.each do |manifest_error|
-      $stderr.puts " * #{manifest_error.manifest} (line #{manifest_error.line_num}): #{ERROR_MSG[manifest_error.error_type]} #{manifest_error.error_detail}"
+      warn " * #{manifest_error.manifest} (line #{manifest_error.line_num}): #{ERROR_MSG[manifest_error.error_type]} #{manifest_error.error_detail}"
     end
     File.readlines('util/_resources/tag_format_help_msg.txt').each do |line|
-      $stderr.puts line
+      warn line
     end
   end
 

From 80810695e1f78e8c5a0b5289645d61e627a3ed91 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 10:35:21 +0100
Subject: [PATCH 2113/2267] (CONT-772) Correct Style/RedundantRegexpEscape

---
 .rubocop_todo.yml                    | 15 -------
 spec/classes/apache_spec.rb          | 14 +++----
 spec/classes/mod/alias_spec.rb       | 10 ++---
 spec/classes/mod/auth_mellon_spec.rb |  8 ++--
 spec/classes/mod/disk_cache_spec.rb  | 18 ++++-----
 spec/classes/mod/passenger_spec.rb   | 12 +++---
 spec/classes/mod/security_spec.rb    | 12 +++---
 spec/classes/mod/ssl_spec.rb         |  2 +-
 spec/classes/mod/userdir_spec.rb     | 10 ++---
 spec/classes/mod/wsgi_spec.rb        |  4 +-
 spec/defines/vhost_spec.rb           | 58 ++++++++++++++--------------
 11 files changed, 74 insertions(+), 89 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a5be54e7ee..985a71166c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -202,21 +202,6 @@ Style/RedundantArgument:
   Exclude:
     - 'spec/classes/mod/status_spec.rb'
 
-# Offense count: 247
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpEscape:
-  Exclude:
-    - 'spec/classes/apache_spec.rb'
-    - 'spec/classes/mod/alias_spec.rb'
-    - 'spec/classes/mod/auth_mellon_spec.rb'
-    - 'spec/classes/mod/disk_cache_spec.rb'
-    - 'spec/classes/mod/passenger_spec.rb'
-    - 'spec/classes/mod/security_spec.rb'
-    - 'spec/classes/mod/ssl_spec.rb'
-    - 'spec/classes/mod/userdir_spec.rb'
-    - 'spec/classes/mod/wsgi_spec.rb'
-    - 'spec/defines/vhost_spec.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 0b88dc1d52..7fbe1c14fe 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -187,8 +187,8 @@
         } }
       end
 
-      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
-      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" vhost_combined\n} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^LogFormat "%v %h %l %u %t "%r" %>s %b" vhost_common\n} }
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^LogFormat "%v %h %l %u %t "%r" %>s %b "%\{Referer\}i" "%\{User-agent\}i"" vhost_combined\n} }
     end
 
     describe 'Override existing LogFormats When parameter log_formats is a hash' do
@@ -200,13 +200,13 @@
       end
 
       expected = [
-        %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n},
-        %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n},
-        %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n},
+        %r{^LogFormat "%v %h %l %u %t "%r" %>s %b" common\n},
+        %r{^LogFormat "%v %h %l %u %t "%r" %>s %b" common\n},
+        %r{^LogFormat "%v %h %l %u %t "%r" %>s %b "%\{Referer\}i" "%\{User-agent\}i"" combined\n},
       ]
       unexpected = [
-        %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n},
-        %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n},
+        %r{^LogFormat "%h %l %u %t "%r" %>s %b "%\{Referer\}i" "%\{User-agent\}i"" combined\n},
+        %r{^LogFormat "%h %l %u %t "%r" %>s %b "%\{Referer\}i" "%\{User-agent\}i"" combined\n},
       ]
       it 'Expected to contain' do
         expected.each do |reg|
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
index fc17b07fc7..cdaeba7ba2 100644
--- a/spec/classes/mod/alias_spec.rb
+++ b/spec/classes/mod/alias_spec.rb
@@ -10,21 +10,21 @@
       include_examples 'Debian 11'
 
       it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /icons/ "/usr/share/apache2/icons/"}) }
     end
 
     context 'on a RedHat 7-based OS', :compile do
       include_examples 'RedHat 7'
 
       it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /icons/ "/usr/share/httpd/icons/"}) }
     end
 
     context 'on a RedHat 8-based OS', :compile do
       include_examples 'RedHat 8'
 
       it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"}) }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /icons/ "/usr/share/httpd/icons/"}) }
     end
 
     context 'with icons options', :compile do
@@ -56,7 +56,7 @@
       include_examples 'RedHat 7'
 
       it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/apache-icons\/ "\/usr\/share\/httpd\/icons\/"}) }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /apache-icons/ "/usr/share/httpd/icons/"}) }
     end
 
     context 'with icons path as false', :compile do
@@ -79,7 +79,7 @@
       include_examples 'FreeBSD 10'
 
       it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/local\/www\/apache24\/icons\/"}) }
+      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /icons/ "/usr/local/www/apache24/icons/"}) }
     end
   end
 end
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
index 99e01afe7f..22f496fe95 100644
--- a/spec/classes/mod/auth_mellon_spec.rb
+++ b/spec/classes/mod/auth_mellon_spec.rb
@@ -29,8 +29,8 @@
 
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheSize\s+200$}) }
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheEntrySize\s+2010$}) }
-      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonLockFile\s+"\/tmp\/junk"$}) }
-      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostDirectory\s+"\/tmp\/post"$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonLockFile\s+"/tmp/junk"$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostDirectory\s+"/tmp/post"$}) }
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostTTL\s+5$}) }
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostSize\s+8$}) }
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostCount\s+10$}) }
@@ -61,8 +61,8 @@
 
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheSize\s+200$}) }
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonCacheEntrySize\s+2010$}) }
-      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonLockFile\s+"\/tmp\/junk"$}) }
-      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostDirectory\s+"\/tmp\/post"$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonLockFile\s+"/tmp/junk"$}) }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostDirectory\s+"/tmp/post"$}) }
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostTTL\s+5$}) }
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostSize\s+8$}) }
       it { is_expected.to contain_file('auth_mellon.conf').with_content(%r{^MellonPostCount\s+10$}) }
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 6666654724..40fcd67fba 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -26,7 +26,7 @@
 
     it {
       is_expected.to contain_file('disk_cache.conf')
-        .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+        .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
     context 'with $default_cache_enable = false' do
@@ -39,7 +39,7 @@
 
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
 
@@ -53,7 +53,7 @@
 
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
 
@@ -84,7 +84,7 @@
 
     it {
       is_expected.to contain_file('disk_cache.conf')
-        .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+        .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
     context 'with $default_cache_enable = false' do
@@ -97,7 +97,7 @@
 
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
 
@@ -111,7 +111,7 @@
 
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
 
@@ -145,7 +145,7 @@
 
     it {
       is_expected.to contain_file('disk_cache.conf')
-        .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
+        .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
     context 'with $default_cache_enable = false' do
@@ -158,7 +158,7 @@
 
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
 
@@ -172,7 +172,7 @@
 
       it {
         is_expected.to contain_file('disk_cache.conf')
-          .with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
+          .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
 
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 5e994b1f6b..f12cbe3258 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -399,7 +399,7 @@
             { mod_path: '/usr/lib/foo/mod_foo.so' }
           end
 
-          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$}) }
+          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module /usr/lib/foo/mod_foo\.so$}) }
         end
 
         describe "with mod_lib_path => '/usr/lib/foo'" do
@@ -407,7 +407,7 @@
             { mod_lib_path: '/usr/lib/foo' }
           end
 
-          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$}) }
+          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module /usr/lib/foo/mod_passenger\.so$}) }
         end
 
         describe "with mod_lib => 'mod_foo.so'" do
@@ -415,7 +415,7 @@
             { mod_lib: 'mod_foo.so' }
           end
 
-          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$}) }
+          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule passenger_module /usr/lib/apache2/modules/mod_foo\.so$}) }
         end
 
         describe "with mod_id => 'mod_foo'" do
@@ -423,7 +423,7 @@
             { mod_id: 'mod_foo' }
           end
 
-          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$}) }
+          it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo /usr/lib/apache2/modules/mod_passenger\.so$}) }
         end
 
         context 'with defaults' do
@@ -459,7 +459,7 @@
                   { passenger_root: '/usr/lib/example' }
                 end
 
-                it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRoot "\/usr\/lib\/example"$}) }
+                it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRoot "/usr/lib/example"$}) }
               end
 
               describe 'with passenger_ruby => /usr/lib/example/ruby' do
@@ -467,7 +467,7 @@
                   { passenger_ruby: '/usr/lib/example/ruby' }
                 end
 
-                it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRuby "\/usr\/lib\/example\/ruby"$}) }
+                it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerRuby "/usr/lib/example/ruby"$}) }
               end
             end
           when '7'
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index f38ac5037c..5ad45531ad 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -189,13 +189,13 @@
             else
               it {
                 is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
-                  %r{^SecAction \\\n\s+\"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
+                  %r{^SecAction \\\n\s+"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
                 is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
-                  %r{^SecAction \\\n\s+\"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=2"$}
+                  %r{^SecAction \\\n\s+"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=2"$}
                 is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
                   %r{
                     ^SecAction\ \\\n
-                    \s+\"id:900700,\\\n
+                    \s+"id:900700,\\\n
                     \s+phase:1,\\\n
                     \s+nolog,\\\n
                     \s+pass,\\\n
@@ -385,13 +385,13 @@
 
             it {
               is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
-                %r{^SecAction \\\n\s+\"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
+                %r{^SecAction \\\n\s+"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
               is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
-                %r{^SecAction \\\n\s+\"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=1"$}
+                %r{^SecAction \\\n\s+"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=1"$}
               is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
                 %r{
                   ^SecAction\ \\\n
-                  \s+\"id:900700,\\\n
+                  \s+"id:900700,\\\n
                   \s+phase:1,\\\n
                   \s+nolog,\\\n
                   \s+pass,\\\n
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index f631458edb..056179cc92 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -208,7 +208,7 @@
         }
       end
 
-      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLPassPhraseDialog exec:\/path\/to\/program$}) }
+      it { is_expected.to contain_file('ssl.conf').with_content(%r{^  SSLPassPhraseDialog exec:/path/to/program$}) }
     end
 
     context 'setting ssl_random_seed_bytes' do
diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index 2a721d4b11..cad5269ad7 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -25,7 +25,7 @@
       end
 
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/hi$}) }
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/hi\"\>$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*<Directory\s+"/home/\*/hi">$}) }
     end
 
     context 'with home set to something' do
@@ -36,7 +36,7 @@
       end
 
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/u/\*/public_html$}) }
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/u/\*/public_html"\>$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*<Directory\s+"/u/\*/public_html">$}) }
     end
 
     context 'with path set to something' do
@@ -47,7 +47,7 @@
       end
 
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/\*/public_html$}) }
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/\*/public_html\"\>$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*<Directory\s+"/home/\*/\*/public_html">$}) }
     end
 
     context 'with userdir set to something' do
@@ -59,7 +59,7 @@
       end
 
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+public_html$}) }
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/\*/public_html\"\>$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*<Directory\s+"/home/\*/\*/public_html">$}) }
     end
 
     context 'with unmanaged_path set to true' do
@@ -70,7 +70,7 @@
       end
 
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/public_html$}) }
-      it { is_expected.not_to contain_file('userdir.conf').with_content(%r{^\s*\<Directory }) }
+      it { is_expected.not_to contain_file('userdir.conf').with_content(%r{^\s*<Directory }) }
     end
 
     context 'with custom_fragment set to something' do
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index b539500e2f..e0d785dfed 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -40,7 +40,7 @@
         { wsgi_socket_prefix: 'run/wsgi' }
       end
 
-      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGISocketPrefix run\/wsgi$}) }
+      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGISocketPrefix run/wsgi$}) }
     end
 
     describe 'with custom WSGIPythonHome' do
@@ -48,7 +48,7 @@
         { wsgi_python_home: '/path/to/virtenv' }
       end
 
-      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIPythonHome "\/path\/to\/virtenv"$}) }
+      it { is_expected.to contain_file('wsgi.conf').with_content(%r{^  WSGIPythonHome "/path/to/virtenv"$}) }
     end
 
     describe 'with custom WSGIApplicationGroup' do
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 852ca622c1..9ba566bfa9 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -616,8 +616,8 @@
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories')
               .with_content(%r{^\s+<Proxy "\*">$})
-              .with_content(%r{^\s+Include\s'\/custom\/path\/includes'$})
-              .with_content(%r{^\s+Include\s'\/custom\/path\/another_includes'$})
+              .with_content(%r{^\s+Include\s'/custom/path/includes'$})
+              .with_content(%r{^\s+Include\s'/custom/path/another_includes'$})
               .with_content(%r{^\s+H2CopyFiles\sOn$})
               .with_content(%r{^\s+H2PushResource\s/foo.css$})
               .with_content(%r{^\s+H2PushResource\s/foo.js$})
@@ -625,15 +625,15 @@
               .with_content(%r{^\s+Require all denied$})
               .with_content(%r{^\s+Require all granted$})
               .with_content(%r{^\s+<RequireAll>$})
-              .with_content(%r{^\s+<\/RequireAll>$})
+              .with_content(%r{^\s+</RequireAll>$})
               .with_content(%r{^\s+Require all-valid1$})
               .with_content(%r{^\s+Require all-valid2$})
               .with_content(%r{^\s+<RequireNone>$})
-              .with_content(%r{^\s+<\/RequireNone>$})
+              .with_content(%r{^\s+</RequireNone>$})
               .with_content(%r{^\s+Require none-valid1$})
               .with_content(%r{^\s+Require none-valid2$})
               .with_content(%r{^\s+<RequireAny>$})
-              .with_content(%r{^\s+<\/RequireAny>$})
+              .with_content(%r{^\s+</RequireAny>$})
               .with_content(%r{^\s+Require any-valid1$})
               .with_content(%r{^\s+Require any-valid2$})
               .with_content(%r{^\s+LDAPReferrals off$})
@@ -641,14 +641,14 @@
               .with_content(%r{^\s+ProxyPassMatch http://backend-b/ retry=0 timeout=5 noquery interpolate$})
               .with_content(%r{^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$})
               .with_content(%r{^\s+IndexOptions\sFancyIndexing$})
-              .with_content(%r{^\s+IndexStyleSheet\s'\/styles\/style\.css'$})
+              .with_content(%r{^\s+IndexStyleSheet\s'/styles/style\.css'$})
               .with_content(%r{^\s+DirectoryIndex\sdisabled$})
               .with_content(%r{^\s+SetOutputFilter\soutput_filter$})
               .with_content(%r{^\s+SetInputFilter\sinput_filter$})
               .with_content(%r{^\s+<Limit GET HEAD>$})
-              .with_content(%r{\s+<Limit GET HEAD>\s*Require valid-user\s*<\/Limit>}m)
+              .with_content(%r{\s+<Limit GET HEAD>\s*Require valid-user\s*</Limit>}m)
               .with_content(%r{^\s+<LimitExcept GET HEAD>$})
-              .with_content(%r{\s+<LimitExcept GET HEAD>\s*Require valid-user\s*<\/LimitExcept>}m)
+              .with_content(%r{\s+<LimitExcept GET HEAD>\s*Require valid-user\s*</LimitExcept>}m)
               .with_content(%r{^\s+Dav\sfilesystem$})
               .with_content(%r{^\s+DavDepthInfinity\sOn$})
               .with_content(%r{^\s+DavMinTimeout\s600$})
@@ -745,8 +745,8 @@
               .with_content(%r{noquery interpolate})
               .with_content(%r{ProxyPreserveHost On})
               .with_content(%r{ProxyAddHeaders On})
-              .with_content(%r{ProxyPassReverseCookiePath\s+\/a\s+http:\/\/})
-              .with_content(%r{ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo})
+              .with_content(%r{ProxyPassReverseCookiePath\s+/a\s+http://})
+              .with_content(%r{ProxyPassReverseCookieDomain\s+foo\s+http://foo})
           }
 
           it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
@@ -811,8 +811,8 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts')
-              .with_content(%r{^\s+JkMount\s+\/\*\s+tcnode1$})
-              .with_content(%r{^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$})
+              .with_content(%r{^\s+JkMount\s+/\*\s+tcnode1$})
+              .with_content(%r{^\s+JkUnMount\s+/\*\.jpg\s+tcnode1$})
           }
 
           it {
@@ -820,7 +820,7 @@
               .with_content(%r{^\s+KrbMethodNegotiate\soff$})
               .with_content(%r{^\s+KrbAuthoritative\soff$})
               .with_content(%r{^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$})
-              .with_content(%r{^\s+Krb5Keytab\s\/tmp\/keytab5$})
+              .with_content(%r{^\s+Krb5Keytab\s/tmp/keytab5$})
               .with_content(%r{^\s+KrbLocalUserMapping\soff$})
               .with_content(%r{^\s+KrbServiceName\sHTTP$})
               .with_content(%r{^\s+KrbSaveCredentials\soff$})
@@ -914,9 +914,9 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc')
-              .with_content(%r{^\s+OIDCProviderMetadataURL\shttps:\/\/login.example.com\/\.well-known\/openid-configuration$})
+              .with_content(%r{^\s+OIDCProviderMetadataURL\shttps://login.example.com/\.well-known/openid-configuration$})
               .with_content(%r{^\s+OIDCClientID\stest$})
-              .with_content(%r{^\s+OIDCRedirectURI\shttps:\/\/login\.example.com\/redirect_uri$})
+              .with_content(%r{^\s+OIDCRedirectURI\shttps://login\.example.com/redirect_uri$})
               .with_content(%r{^\s+OIDCProviderTokenEndpointAuth\sclient_secret_basic$})
               .with_content(%r{^\s+OIDCRemoteUserClaim\ssub$})
               .with_content(%r{^\s+OIDCClientSecret\saae053a9-4abf-4824-8956-e94b2af335c8$})
@@ -1061,7 +1061,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{^\s+ServerName https:\/\/www\.example\.com:443$},
+              content: %r{^\s+ServerName https://www\.example\.com:443$},
             )
           }
 
@@ -1088,7 +1088,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{^\s+ServerName https:\/\/www\.example\.com$},
+              content: %r{^\s+ServerName https://www\.example\.com$},
             )
           }
 
@@ -1168,7 +1168,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[.\/m]*$},
+              content: %r{[./m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[./m]*$},
             )
           }
 
@@ -1195,7 +1195,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[.\/m]*$},
+              content: %r{[./m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[./m]*$},
             )
           }
 
@@ -1222,7 +1222,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{[.\/m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[.\/m]*$},
+              content: %r{[./m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[./m]*$},
             )
           }
 
@@ -1253,7 +1253,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{[.\/m]*<VirtualHost \[::1\]:80>[.\/m]*$},
+              content: %r{[./m]*<VirtualHost \[::1\]:80>[./m]*$},
             )
           }
 
@@ -1278,7 +1278,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
-              content: %r{[.\/m]*<VirtualHost \*:80>[.\/m]*$},
+              content: %r{[./m]*<VirtualHost \*:80>[./m]*$},
             )
           }
 
@@ -1345,7 +1345,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-security').with(
-              content: %r{^\s*SecAuditLog "\/var\/log\/#{apache_name}\/rspec\.example\.com_security\.log"$},
+              content: %r{^\s*SecAuditLog "/var/log/#{apache_name}/rspec\.example\.com_security\.log"$},
             )
           }
         end
@@ -1362,7 +1362,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-security').with(
-              content: %r{\s*SecAuditLog "\/var\/log\/#{apache_name}\/foo.log"$},
+              content: %r{\s*SecAuditLog "/var/log/#{apache_name}/foo.log"$},
             )
           }
         end
@@ -1382,7 +1382,7 @@
             is_expected.to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{
                 ^\s+SecAction\ \\\n
-                \s+\"id:900110,\\\n
+                \s+"id:900110,\\\n
                 \s+phase:1,\\\n
                 \s+nolog,\\\n
                 \s+pass,\\\n
@@ -1408,7 +1408,7 @@
             is_expected.to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{
               ^\s+SecAction\ \\\n
-              \s+\"id:900200,\\\n
+              \s+"id:900200,\\\n
               \s+phase:1,\\\n
               \s+nolog,\\\n\s+pass,\\\n
               \s+t:none,\\\n
@@ -1450,7 +1450,7 @@
 
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
-              %r{ProxyPassMatch .* http:\/\/backend-a\/ timeout=300},
+              %r{ProxyPassMatch .* http://backend-a/ timeout=300},
             ).with_content(%r{## Proxy rules})
           }
         end
@@ -1798,13 +1798,13 @@
 
             it {
               is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-                content: %r{^\s+CustomLog "\/tmp\/log1"\s+combined\s+env=dev$},
+                content: %r{^\s+CustomLog "/tmp/log1"\s+combined\s+env=dev$},
               )
             }
 
             it {
               is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
-                content: %r{^\s+CustomLog "\/var\/log\/#{apache_name}\/log2"\s+combined\s*$},
+                content: %r{^\s+CustomLog "/var/log/#{apache_name}/log2"\s+combined\s*$},
               )
             }
 

From 55fa371d64d74db755d44ed5678d67e8cd058f58 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 11:23:59 +0100
Subject: [PATCH 2114/2267] (CONT-772) Correct RSpec/ImplicitSubject

---
 .rubocop_todo.yml                       |  17 ++-
 spec/classes/apache_spec.rb             |  80 ++++++-------
 spec/classes/mod/auth_cas_spec.rb       |   4 +-
 spec/classes/mod/auth_openidc_spec.rb   |   2 +-
 spec/classes/mod/authnz_ldap_spec.rb    |   4 +-
 spec/classes/mod/deflate_spec.rb        |  18 +--
 spec/classes/mod/dir_spec.rb            |   2 +-
 spec/classes/mod/disk_cache_spec.rb     |  18 +--
 spec/classes/mod/event_spec.rb          |   8 +-
 spec/classes/mod/expires_spec.rb        |   4 +-
 spec/classes/mod/fcgid_spec.rb          |   8 +-
 spec/classes/mod/info_spec.rb           |  26 ++---
 spec/classes/mod/itk_spec.rb            |   8 +-
 spec/classes/mod/lbmethod_bybusyness.rb |   8 +-
 spec/classes/mod/lbmethod_byrequests.rb |   8 +-
 spec/classes/mod/lbmethod_bytraffic.rb  |   8 +-
 spec/classes/mod/lbmethod_heartbeat.rb  |   8 +-
 spec/classes/mod/mime_magic_spec.rb     |  14 +--
 spec/classes/mod/mime_spec.rb           |   8 +-
 spec/classes/mod/negotiation_spec.rb    |  12 +-
 spec/classes/mod/passenger_spec.rb      |  20 ++--
 spec/classes/mod/php_spec.rb            |  28 ++---
 spec/classes/mod/prefork_spec.rb        |   8 +-
 spec/classes/mod/proxy_balancer_spec.rb |   2 +-
 spec/classes/mod/remoteip_spec.rb       |   2 +-
 spec/classes/mod/rpaf_spec.rb           |   6 +-
 spec/classes/mod/security_spec.rb       |  66 +++++------
 spec/classes/mod/ssl_spec.rb            |   2 +-
 spec/classes/mod/status_spec.rb         |  22 ++--
 spec/classes/mod/worker_spec.rb         |   8 +-
 spec/classes/mod/wsgi_spec.rb           |  14 +--
 spec/classes/service_spec.rb            |  18 +--
 spec/defines/balancer_spec.rb           |   6 +-
 spec/defines/balancermember_spec.rb     |   2 +-
 spec/defines/custom_config_spec.rb      |  14 +--
 spec/defines/mod_spec.rb                |  52 ++++-----
 spec/defines/modsec_link_spec.rb        |   4 +-
 spec/defines/vhost_custom_spec.rb       |   8 +-
 spec/defines/vhost_fragment_spec.rb     |  30 ++---
 spec/defines/vhost_proxy_spec.rb        |   6 +-
 spec/defines/vhost_spec.rb              | 142 ++++++++++++------------
 41 files changed, 362 insertions(+), 363 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 985a71166c..02032729a4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-20 08:33:47 UTC using RuboCop version 1.48.1.
+# on 2023-04-20 10:23:43 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -90,15 +90,8 @@ RSpec/FilePath:
     - 'spec/classes/mod/lookup_identity.rb'
     - 'spec/classes/mod/proxy_wstunnel.rb'
 
-# Offense count: 292
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
-RSpec/ImplicitSubject:
-  Enabled: false
-
 # Offense count: 16
-# This cop supports safe autocorrection.
+# This cop supports safe autocorrection (--autocorrect).
 RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/classes/mod/auth_kerb_spec.rb'
@@ -120,6 +113,12 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 6
 
+# Offense count: 291
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
+  Enabled: false
+
 # Offense count: 123
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 7fbe1c14fe..c1b8262459 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -9,7 +9,7 @@
     it { is_expected.to contain_class('apache::params') }
 
     it {
-      is_expected.to contain_package('httpd').with(
+      expect(subject).to contain_package('httpd').with(
         'notify' => 'Class[Apache::Service]',
         'ensure' => 'installed',
       )
@@ -20,27 +20,27 @@
     it { is_expected.to contain_class('apache::service') }
 
     it {
-      is_expected.to contain_file('/var/www/html').with(
+      expect(subject).to contain_file('/var/www/html').with(
         'ensure' => 'directory',
       )
     }
 
     it {
-      is_expected.to contain_file('/etc/apache2/sites-enabled').with(
+      expect(subject).to contain_file('/etc/apache2/sites-enabled').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
 
     it {
-      is_expected.to contain_file('/etc/apache2/mods-enabled').with(
+      expect(subject).to contain_file('/etc/apache2/mods-enabled').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
 
     it {
-      is_expected.to contain_file('/etc/apache2/mods-available').with(
+      expect(subject).to contain_file('/etc/apache2/mods-available').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'false'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
@@ -49,7 +49,7 @@
     it { is_expected.to contain_file('/etc/apache2/apache2.conf').without_content(%r{ServerAdmin}) }
 
     it {
-      is_expected.to contain_concat('/etc/apache2/ports.conf').with(
+      expect(subject).to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
@@ -58,14 +58,14 @@
     # Assert that load files are placed and symlinked for these mods, but no conf file.
     ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
-        is_expected.to contain_file("#{modname}.load").with(
+        expect(subject).to contain_file("#{modname}.load").with(
           'path' => "/etc/apache2/mods-available/#{modname}.load",
           'ensure' => 'file',
         )
       }
 
       it {
-        is_expected.to contain_file("#{modname}.load symlink").with(
+        expect(subject).to contain_file("#{modname}.load symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.load",
@@ -131,14 +131,14 @@
     # Assert that both load files and conf files are placed and symlinked for these mods
     ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
       it {
-        is_expected.to contain_file("#{modname}.load").with(
+        expect(subject).to contain_file("#{modname}.load").with(
           'path' => "/etc/apache2/mods-available/#{modname}.load",
           'ensure' => 'file',
         )
       }
 
       it {
-        is_expected.to contain_file("#{modname}.load symlink").with(
+        expect(subject).to contain_file("#{modname}.load symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.load",
@@ -146,14 +146,14 @@
       }
 
       it {
-        is_expected.to contain_file("#{modname}.conf").with(
+        expect(subject).to contain_file("#{modname}.conf").with(
           'path' => "/etc/apache2/mods-available/#{modname}.conf",
           'ensure' => 'file',
         )
       }
 
       it {
-        is_expected.to contain_file("#{modname}.conf symlink").with(
+        expect(subject).to contain_file("#{modname}.conf symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.conf",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.conf",
@@ -210,13 +210,13 @@
       ]
       it 'Expected to contain' do
         expected.each do |reg|
-          is_expected.to contain_file('/etc/apache2/apache2.conf').with_content reg
+          expect(subject).to contain_file('/etc/apache2/apache2.conf').with_content reg
         end
       end
 
       it 'Not expected to contain' do
         unexpected.each do |reg|
-          is_expected.to contain_file('/etc/apache2/apache2.conf').without_content reg
+          expect(subject).to contain_file('/etc/apache2/apache2.conf').without_content reg
         end
       end
     end
@@ -234,7 +234,7 @@
       include_examples 'Ubuntu 18.04'
 
       it {
-        is_expected.to contain_file('/var/www/html').with(
+        expect(subject).to contain_file('/var/www/html').with(
           'ensure' => 'directory',
         )
       }
@@ -247,7 +247,7 @@
     it { is_expected.to contain_class('apache::params') }
 
     it {
-      is_expected.to contain_package('httpd').with(
+      expect(subject).to contain_package('httpd').with(
         'notify' => 'Class[Apache::Service]',
         'ensure' => 'installed',
       )
@@ -258,20 +258,20 @@
     it { is_expected.to contain_class('apache::service') }
 
     it {
-      is_expected.to contain_file('/var/www/html').with(
+      expect(subject).to contain_file('/var/www/html').with(
         'ensure' => 'directory',
       )
     }
 
     it {
-      is_expected.to contain_file('/etc/httpd/conf.d').with(
+      expect(subject).to contain_file('/etc/httpd/conf.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
 
     it {
-      is_expected.to contain_concat('/etc/httpd/conf/ports.conf').with(
+      expect(subject).to contain_concat('/etc/httpd/conf/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
@@ -288,7 +288,7 @@
 
       ['mod.d', 'site.d', 'conf.d'].each do |dir|
         it {
-          is_expected.to contain_file("/etc/httpd/#{dir}").with(
+          expect(subject).to contain_file("/etc/httpd/#{dir}").with(
             'ensure' => 'directory', 'recurse' => 'true',
             'purge' => 'true'
           ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
@@ -298,13 +298,13 @@
       # Assert that load files are placed for these mods, but no conf file.
       ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
         it {
-          is_expected.to contain_file("#{modname}.load").with_path(
+          expect(subject).to contain_file("#{modname}.load").with_path(
             "/etc/httpd/mod.d/#{modname}.load",
           )
         }
 
         it {
-          is_expected.not_to contain_file("#{modname}.conf").with_path(
+          expect(subject).not_to contain_file("#{modname}.conf").with_path(
             "/etc/httpd/mod.d/#{modname}.conf",
           )
         }
@@ -313,13 +313,13 @@
       # Assert that both load files and conf files are placed for these mods
       ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
         it {
-          is_expected.to contain_file("#{modname}.load").with_path(
+          expect(subject).to contain_file("#{modname}.load").with_path(
             "/etc/httpd/mod.d/#{modname}.load",
           )
         }
 
         it {
-          is_expected.to contain_file("#{modname}.conf").with_path(
+          expect(subject).to contain_file("#{modname}.conf").with_path(
             "/etc/httpd/mod.d/#{modname}.conf",
           )
         }
@@ -375,7 +375,7 @@
       end
 
       it {
-        is_expected.to contain_file('/opt/rh/root/etc/httpd/conf/httpd.conf').with(
+        expect(subject).to contain_file('/opt/rh/root/etc/httpd/conf/httpd.conf').with(
           'ensure' => 'file',
         ).that_notifies('Class[Apache::Service]').that_requires(['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'])
       }
@@ -387,7 +387,7 @@
       end
 
       it {
-        is_expected.to contain_file('/etc/httpd/special_conf.d').with(
+        expect(subject).to contain_file('/etc/httpd/special_conf.d').with(
           'ensure' => 'directory', 'recurse' => 'true',
           'purge' => 'true'
         ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
@@ -402,7 +402,7 @@
       unexpected = ['apache::mod::event', 'apache::mod::itk', 'apache::mod::peruser', 'apache::mod::prefork', 'apache::mod::worker']
       it 'does not declare mpm modules' do
         unexpected.each do |not_expect|
-          is_expected.not_to contain_class(not_expect)
+          expect(subject).not_to contain_class(not_expect)
         end
       end
     end
@@ -560,27 +560,27 @@
     it { is_expected.to contain_class('apache::service') }
 
     it {
-      is_expected.to contain_file('/usr/local/www/apache24/data').with(
+      expect(subject).to contain_file('/usr/local/www/apache24/data').with(
         'ensure' => 'directory',
       )
     }
 
     it {
-      is_expected.to contain_file('/usr/local/etc/apache24/Vhosts').with(
+      expect(subject).to contain_file('/usr/local/etc/apache24/Vhosts').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
 
     it {
-      is_expected.to contain_file('/usr/local/etc/apache24/Modules').with(
+      expect(subject).to contain_file('/usr/local/etc/apache24/Modules').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
 
     it {
-      is_expected.to contain_concat('/usr/local/etc/apache24/ports.conf').with(
+      expect(subject).to contain_concat('/usr/local/etc/apache24/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
@@ -589,7 +589,7 @@
     # Assert that load files are placed for these mods, but no conf file.
     ['auth_basic', 'authn_core', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
-        is_expected.to contain_file("#{modname}.load").with(
+        expect(subject).to contain_file("#{modname}.load").with(
           'path' => "/usr/local/etc/apache24/Modules/#{modname}.load",
           'ensure' => 'file',
         )
@@ -601,14 +601,14 @@
     # Assert that both load files and conf files are placed for these mods
     ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
       it {
-        is_expected.to contain_file("#{modname}.load").with(
+        expect(subject).to contain_file("#{modname}.load").with(
           'path' => "/usr/local/etc/apache24/Modules/#{modname}.load",
           'ensure' => 'file',
         )
       }
 
       it {
-        is_expected.to contain_file("#{modname}.conf").with(
+        expect(subject).to contain_file("#{modname}.conf").with(
           'path' => "/usr/local/etc/apache24/Modules/#{modname}.conf",
           'ensure' => 'file',
         )
@@ -625,27 +625,27 @@
     it { is_expected.to contain_class('apache::service') }
 
     it {
-      is_expected.to contain_file('/var/www/localhost/htdocs').with(
+      expect(subject).to contain_file('/var/www/localhost/htdocs').with(
         'ensure' => 'directory',
       )
     }
 
     it {
-      is_expected.to contain_file('/etc/apache2/vhosts.d').with(
+      expect(subject).to contain_file('/etc/apache2/vhosts.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
 
     it {
-      is_expected.to contain_file('/etc/apache2/modules.d').with(
+      expect(subject).to contain_file('/etc/apache2/modules.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
 
     it {
-      is_expected.to contain_concat('/etc/apache2/ports.conf').with(
+      expect(subject).to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
@@ -663,7 +663,7 @@
       end
 
       it {
-        is_expected.to contain_package('httpd').with(
+        expect(subject).to contain_package('httpd').with(
           'ensure' => 'installed',
           'name' => 'httpd24-httpd',
         ).that_notifies('Class[Apache::Service]')
@@ -678,7 +678,7 @@
       end
 
       it {
-        is_expected.to contain_concat('/etc/httpd/conf/ports.conf').with(
+        expect(subject).to contain_concat('/etc/httpd/conf/ports.conf').with(
           'mode' => '0640',
         )
       }
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
index 8df086e963..9b053f3de2 100644
--- a/spec/classes/mod/auth_cas_spec.rb
+++ b/spec/classes/mod/auth_cas_spec.rb
@@ -66,8 +66,8 @@
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
 
       it {
-        is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASRootProxiedAs http://test.server$})
-        is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASCookiePath /my/cas/path$})
+        expect(subject).to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASRootProxiedAs http://test.server$})
+        expect(subject).to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASCookiePath /my/cas/path$})
       }
     end
   end
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
index aac9be28ea..ed0ad42cfd 100644
--- a/spec/classes/mod/auth_openidc_spec.rb
+++ b/spec/classes/mod/auth_openidc_spec.rb
@@ -35,7 +35,7 @@
       it { is_expected.to contain_package('mod_auth_openidc') }
 
       it do
-        is_expected.to contain_package('dnf-module-mod_auth_openidc')
+        expect(subject).to contain_package('dnf-module-mod_auth_openidc')
           .with_ensure('present')
           .with_name('mod_auth_openidc')
           .that_comes_before('Package[mod_auth_openidc]')
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index e9b4feeca1..f76ac9c4b4 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -26,7 +26,7 @@
       let(:params) { { verify_server_cert: 'wrong' } }
 
       it 'raises an error' do
-        is_expected.to compile.and_raise_error(%r{parameter 'verify_server_cert' expects a Boolean value, got String})
+        expect(subject).to compile.and_raise_error(%r{parameter 'verify_server_cert' expects a Boolean value, got String})
       end
     end
   end # Debian
@@ -64,7 +64,7 @@
           let(:params) { { verify_server_cert: 'wrong' } }
 
           it 'raises an error' do
-            is_expected.to compile.and_raise_error(%r{parameter 'verify_server_cert' expects a Boolean value, got String})
+            expect(subject).to compile.and_raise_error(%r{parameter 'verify_server_cert' expects a Boolean value, got String})
           end
         end
 
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
index 2ee5a6d172..045a3cd04b 100644
--- a/spec/classes/mod/deflate_spec.rb
+++ b/spec/classes/mod/deflate_spec.rb
@@ -16,7 +16,7 @@ def general_deflate_specs
              "DeflateFilterNote Ratio ratio\n"
 
   it do
-    is_expected.to contain_file('deflate.conf').with_content(expected)
+    expect(subject).to contain_file('deflate.conf').with_content(expected)
   end
 end
 
@@ -43,13 +43,13 @@ def general_deflate_specs
       general_deflate_specs
 
       it {
-        is_expected.to contain_file('deflate.conf').with(ensure: 'file',
-                                                         path: '/etc/apache2/mods-available/deflate.conf')
+        expect(subject).to contain_file('deflate.conf').with(ensure: 'file',
+                                                             path: '/etc/apache2/mods-available/deflate.conf')
       }
 
       it {
-        is_expected.to contain_file('deflate.conf symlink').with(ensure: 'link',
-                                                                 path: '/etc/apache2/mods-enabled/deflate.conf')
+        expect(subject).to contain_file('deflate.conf symlink').with(ensure: 'link',
+                                                                     path: '/etc/apache2/mods-enabled/deflate.conf')
       }
     end
 
@@ -69,8 +69,8 @@ def general_deflate_specs
       general_deflate_specs
 
       it {
-        is_expected.to contain_file('deflate.conf').with(ensure: 'file',
-                                                         path: '/usr/local/etc/apache24/Modules/deflate.conf')
+        expect(subject).to contain_file('deflate.conf').with(ensure: 'file',
+                                                             path: '/usr/local/etc/apache24/Modules/deflate.conf')
       }
     end
 
@@ -81,8 +81,8 @@ def general_deflate_specs
       general_deflate_specs
 
       it {
-        is_expected.to contain_file('deflate.conf').with(ensure: 'file',
-                                                         path: '/etc/apache2/modules.d/deflate.conf')
+        expect(subject).to contain_file('deflate.conf').with(ensure: 'file',
+                                                             path: '/etc/apache2/modules.d/deflate.conf')
       }
     end
   end
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
index 96f50fcdea..f76404eda5 100644
--- a/spec/classes/mod/dir_spec.rb
+++ b/spec/classes/mod/dir_spec.rb
@@ -12,7 +12,7 @@
         it { is_expected.to contain_apache__mod('dir') }
 
         it do
-          is_expected.to contain_file('dir.conf')
+          expect(subject).to contain_file('dir.conf')
             .with_content(%r{^DirectoryIndex })
             .with_content(%r{ index\.html })
             .with_content(%r{ index\.html\.var })
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index 40fcd67fba..ce840bdcf6 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -25,7 +25,7 @@
     it { is_expected.to contain_apache__mod('cache_disk') }
 
     it {
-      is_expected.to contain_file('disk_cache.conf')
+      expect(subject).to contain_file('disk_cache.conf')
         .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
@@ -38,7 +38,7 @@
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        is_expected.to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -52,7 +52,7 @@
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        is_expected.to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -83,7 +83,7 @@
     it { is_expected.to contain_apache__mod('cache_disk') }
 
     it {
-      is_expected.to contain_file('disk_cache.conf')
+      expect(subject).to contain_file('disk_cache.conf')
         .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
@@ -96,7 +96,7 @@
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        is_expected.to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -110,7 +110,7 @@
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        is_expected.to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -144,7 +144,7 @@
     it { is_expected.to contain_apache__mod('cache_disk') }
 
     it {
-      is_expected.to contain_file('disk_cache.conf')
+      expect(subject).to contain_file('disk_cache.conf')
         .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
@@ -157,7 +157,7 @@
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        is_expected.to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('disk_cache.conf')
           .with(content: %r{CacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -171,7 +171,7 @@
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        is_expected.to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('disk_cache.conf')
           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
index 723c590cad..39d83ae992 100644
--- a/spec/classes/mod/event_spec.rb
+++ b/spec/classes/mod/event_spec.rb
@@ -110,8 +110,8 @@
     end
 
     it {
-      is_expected.to contain_file('/etc/apache2/mods-available/event.load').with('ensure' => 'file',
-                                                                                 'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n")
+      expect(subject).to contain_file('/etc/apache2/mods-available/event.load').with('ensure' => 'file',
+                                                                                     'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n")
     }
 
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/event.load').with_ensure('link') }
@@ -127,8 +127,8 @@
     it { is_expected.to contain_file('/etc/httpd/conf.modules.d/event.conf').with_ensure('file') }
 
     it {
-      is_expected.to contain_file('/etc/httpd/conf.modules.d/event.load').with('ensure' => 'file',
-                                                                               'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
+      expect(subject).to contain_file('/etc/httpd/conf.modules.d/event.load').with('ensure' => 'file',
+                                                                                   'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
     }
   end
 end
diff --git a/spec/classes/mod/expires_spec.rb b/spec/classes/mod/expires_spec.rb
index c9d3681d93..e9b201a79d 100644
--- a/spec/classes/mod/expires_spec.rb
+++ b/spec/classes/mod/expires_spec.rb
@@ -27,7 +27,7 @@
     it { is_expected.to contain_apache__mod('expires') }
 
     it {
-      is_expected.to contain_file('expires.conf').with_content(
+      expect(subject).to contain_file('expires.conf').with_content(
         "ExpiresActive On\n" \
         "ExpiresDefault \"access plus 1 month\"\n",
       )
@@ -52,7 +52,7 @@
     it { is_expected.to contain_apache__mod('expires') }
 
     it {
-      is_expected.to contain_file('expires.conf').with_content(
+      expect(subject).to contain_file('expires.conf').with_content(
         "ExpiresActive On\n" \
         "ExpiresByType text/json \"mod plus 1 day\"\n" \
         "ExpiresByType text/html \"access plus 1 year\"\n",
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
index 3adc0cb121..7121d4984d 100644
--- a/spec/classes/mod/fcgid_spec.rb
+++ b/spec/classes/mod/fcgid_spec.rb
@@ -11,7 +11,7 @@
     it { is_expected.to contain_class('apache::params') }
 
     it {
-      is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
+      expect(subject).to contain_apache__mod('fcgid').with('loadfile_name' => nil)
     }
 
     it { is_expected.to contain_package('libapache2-mod-fcgid') }
@@ -24,7 +24,7 @@
       it { is_expected.to contain_class('apache::params') }
 
       it {
-        is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => 'unixd_fcgid.load')
+        expect(subject).to contain_apache__mod('fcgid').with('loadfile_name' => 'unixd_fcgid.load')
       }
 
       it { is_expected.to contain_package('mod_fcgid') }
@@ -37,7 +37,7 @@
     it { is_expected.to contain_class('apache::params') }
 
     it {
-      is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => 'unixd_fcgid.load')
+      expect(subject).to contain_apache__mod('fcgid').with('loadfile_name' => 'unixd_fcgid.load')
     }
 
     it { is_expected.to contain_package('www/mod_fcgid') }
@@ -49,7 +49,7 @@
     it { is_expected.to contain_class('apache::params') }
 
     it {
-      is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
+      expect(subject).to contain_apache__mod('fcgid').with('loadfile_name' => nil)
     }
 
     it { is_expected.to contain_package('www-apache/mod_fcgid') }
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
index 88d2b93c01..b683c51241 100644
--- a/spec/classes/mod/info_spec.rb
+++ b/spec/classes/mod/info_spec.rb
@@ -21,7 +21,7 @@ def general_info_specs_apache24
     end
 
     it {
-      is_expected.to contain_file('info.conf').with_content(
+      expect(subject).to contain_file('info.conf').with_content(
         "<Location /server-info>\n    " \
         "SetHandler server-info\n" \
         "</Location>\n",
@@ -39,7 +39,7 @@ def general_info_specs_apache24
                "Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n" \
                "</Location>\n"
     it {
-      is_expected.to contain_file('info.conf').with_content(expected)
+      expect(subject).to contain_file('info.conf').with_content(expected)
     }
   end
 
@@ -52,7 +52,7 @@ def general_info_specs_apache24
     end
 
     it {
-      is_expected.to contain_file('info.conf').with_content(
+      expect(subject).to contain_file('info.conf').with_content(
         "<Location /server-info>\n    " \
         "SetHandler server-info\n" \
         "</Location>\n",
@@ -71,13 +71,13 @@ def general_info_specs_apache24
     general_info_specs_apache24
 
     it {
-      is_expected.to contain_file('info.conf').with(ensure: 'file',
-                                                    path: '/etc/apache2/mods-available/info.conf')
+      expect(subject).to contain_file('info.conf').with(ensure: 'file',
+                                                        path: '/etc/apache2/mods-available/info.conf')
     }
 
     it {
-      is_expected.to contain_file('info.conf symlink').with(ensure: 'link',
-                                                            path: '/etc/apache2/mods-enabled/info.conf')
+      expect(subject).to contain_file('info.conf symlink').with(ensure: 'link',
+                                                                path: '/etc/apache2/mods-enabled/info.conf')
     }
   end
 
@@ -88,8 +88,8 @@ def general_info_specs_apache24
     general_info_specs_apache24
 
     it {
-      is_expected.to contain_file('info.conf').with(ensure: 'file',
-                                                    path: '/etc/httpd/conf.modules.d/info.conf')
+      expect(subject).to contain_file('info.conf').with(ensure: 'file',
+                                                        path: '/etc/httpd/conf.modules.d/info.conf')
     }
   end
 
@@ -100,8 +100,8 @@ def general_info_specs_apache24
     general_info_specs_apache24
 
     it {
-      is_expected.to contain_file('info.conf').with(ensure: 'file',
-                                                    path: '/usr/local/etc/apache24/Modules/info.conf')
+      expect(subject).to contain_file('info.conf').with(ensure: 'file',
+                                                        path: '/usr/local/etc/apache24/Modules/info.conf')
     }
   end
 
@@ -112,8 +112,8 @@ def general_info_specs_apache24
     general_info_specs_apache24
 
     it {
-      is_expected.to contain_file('info.conf').with(ensure: 'file',
-                                                    path: '/etc/apache2/modules.d/info.conf')
+      expect(subject).to contain_file('info.conf').with(ensure: 'file',
+                                                        path: '/etc/apache2/modules.d/info.conf')
     }
   end
 end
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
index 45f9b9780f..2ecf14f76f 100644
--- a/spec/classes/mod/itk_spec.rb
+++ b/spec/classes/mod/itk_spec.rb
@@ -21,8 +21,8 @@
       end
 
       it {
-        is_expected.to contain_file('/etc/apache2/mods-available/itk.load').with('ensure' => 'file',
-                                                                                 'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n")
+        expect(subject).to contain_file('/etc/apache2/mods-available/itk.load').with('ensure' => 'file',
+                                                                                     'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n")
       }
 
       it { is_expected.to contain_file('/etc/apache2/mods-enabled/itk.load').with_ensure('link') }
@@ -51,8 +51,8 @@
       end
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.load').with('ensure' => 'file',
-                                                                               'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
+        expect(subject).to contain_file('/etc/httpd/conf.modules.d/itk.load').with('ensure' => 'file',
+                                                                                   'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
       }
     end
 
diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb
index fa3607c7b7..8e26df19a7 100644
--- a/spec/classes/mod/lbmethod_bybusyness.rb
+++ b/spec/classes/mod/lbmethod_bybusyness.rb
@@ -15,8 +15,8 @@
 
       it {
         # rubocop:disable Layout/LineLength
-        is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+        expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -32,8 +32,8 @@
       end
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+        expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                                   'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
         # rubocop:enable Layout/LineLength
       }
     end
diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb
index fa3607c7b7..8e26df19a7 100644
--- a/spec/classes/mod/lbmethod_byrequests.rb
+++ b/spec/classes/mod/lbmethod_byrequests.rb
@@ -15,8 +15,8 @@
 
       it {
         # rubocop:disable Layout/LineLength
-        is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+        expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -32,8 +32,8 @@
       end
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+        expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                                   'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
         # rubocop:enable Layout/LineLength
       }
     end
diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb
index fa3607c7b7..8e26df19a7 100644
--- a/spec/classes/mod/lbmethod_bytraffic.rb
+++ b/spec/classes/mod/lbmethod_bytraffic.rb
@@ -15,8 +15,8 @@
 
       it {
         # rubocop:disable Layout/LineLength
-        is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+        expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -32,8 +32,8 @@
       end
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+        expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                                   'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
         # rubocop:enable Layout/LineLength
       }
     end
diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb
index fa3607c7b7..8e26df19a7 100644
--- a/spec/classes/mod/lbmethod_heartbeat.rb
+++ b/spec/classes/mod/lbmethod_heartbeat.rb
@@ -15,8 +15,8 @@
 
       it {
         # rubocop:disable Layout/LineLength
-        is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+        expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -32,8 +32,8 @@
       end
 
       it {
-        is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+        expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
+                                                                                                   'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
         # rubocop:enable Layout/LineLength
       }
     end
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
index d1a5c038d2..12da4510f9 100644
--- a/spec/classes/mod/mime_magic_spec.rb
+++ b/spec/classes/mod/mime_magic_spec.rb
@@ -16,19 +16,19 @@ def general_mime_magic_specs
     general_mime_magic_specs
 
     it do
-      is_expected.to contain_file('mime_magic.conf').with_content(
+      expect(subject).to contain_file('mime_magic.conf').with_content(
         "MIMEMagicFile \"/etc/apache2/magic\"\n",
       )
     end
 
     it {
-      is_expected.to contain_file('mime_magic.conf').with(ensure: 'file',
-                                                          path: '/etc/apache2/mods-available/mime_magic.conf')
+      expect(subject).to contain_file('mime_magic.conf').with(ensure: 'file',
+                                                              path: '/etc/apache2/mods-available/mime_magic.conf')
     }
 
     it {
-      is_expected.to contain_file('mime_magic.conf symlink').with(ensure: 'link',
-                                                                  path: '/etc/apache2/mods-enabled/mime_magic.conf')
+      expect(subject).to contain_file('mime_magic.conf symlink').with(ensure: 'link',
+                                                                      path: '/etc/apache2/mods-enabled/mime_magic.conf')
     }
 
     context 'with magic_file => /tmp/Debian_magic' do
@@ -37,7 +37,7 @@ def general_mime_magic_specs
       end
 
       it do
-        is_expected.to contain_file('mime_magic.conf').with_content(
+        expect(subject).to contain_file('mime_magic.conf').with_content(
           "MIMEMagicFile \"/tmp/Debian_magic\"\n",
         )
       end
@@ -50,7 +50,7 @@ def general_mime_magic_specs
     general_mime_magic_specs
 
     it do
-      is_expected.to contain_file('mime_magic.conf').with_content(
+      expect(subject).to contain_file('mime_magic.conf').with_content(
         "MIMEMagicFile \"/etc/httpd/conf/magic\"\n",
       )
     end
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
index 0891059f02..483e9b5989 100644
--- a/spec/classes/mod/mime_spec.rb
+++ b/spec/classes/mod/mime_spec.rb
@@ -7,10 +7,10 @@ def general_mime_specs
   it { is_expected.to contain_apache__mod('mime') }
 
   it do
-    is_expected.to contain_file('mime.conf').with_content(%r{AddHandler type-map var})
-    is_expected.to contain_file('mime.conf').with_content(%r{ddOutputFilter INCLUDES .shtml})
-    is_expected.to contain_file('mime.conf').with_content(%r{AddType text/html .shtml})
-    is_expected.to contain_file('mime.conf').with_content(%r{AddType application/x-compress .Z})
+    expect(subject).to contain_file('mime.conf').with_content(%r{AddHandler type-map var})
+    expect(subject).to contain_file('mime.conf').with_content(%r{ddOutputFilter INCLUDES .shtml})
+    expect(subject).to contain_file('mime.conf').with_content(%r{AddType text/html .shtml})
+    expect(subject).to contain_file('mime.conf').with_content(%r{AddType application/x-compress .Z})
   end
 end
 
diff --git a/spec/classes/mod/negotiation_spec.rb b/spec/classes/mod/negotiation_spec.rb
index 1fccc517e9..dc0074fe2a 100644
--- a/spec/classes/mod/negotiation_spec.rb
+++ b/spec/classes/mod/negotiation_spec.rb
@@ -11,8 +11,8 @@
       it { is_expected.to contain_class('apache') }
 
       it do
-        is_expected.to contain_file('negotiation.conf').with(ensure: 'file',
-                                                             content: 'LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+        expect(subject).to contain_file('negotiation.conf').with(ensure: 'file',
+                                                                 content: 'LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
 ForceLanguagePriority Prefer Fallback
 ')
       end
@@ -24,8 +24,8 @@
       end
 
       it do
-        is_expected.to contain_file('negotiation.conf').with(ensure: 'file',
-                                                             content: %r{^ForceLanguagePriority Prefer$})
+        expect(subject).to contain_file('negotiation.conf').with(ensure: 'file',
+                                                                 content: %r{^ForceLanguagePriority Prefer$})
       end
     end
 
@@ -35,8 +35,8 @@
       end
 
       it do
-        is_expected.to contain_file('negotiation.conf').with(ensure: 'file',
-                                                             content: %r{^LanguagePriority en es$})
+        expect(subject).to contain_file('negotiation.conf').with(ensure: 'file',
+                                                                 content: %r{^LanguagePriority en es$})
       end
     end
   end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index f12cbe3258..2805e8c53c 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -17,11 +17,11 @@
           it { is_expected.to contain_package('libapache2-mod-passenger') }
 
           it {
-            is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
+            expect(subject).to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
           }
 
           it {
-            is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
+            expect(subject).to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
           }
 
           passenger_config_options = {
@@ -208,11 +208,11 @@
         it { is_expected.to contain_package('libapache2-mod-passenger') }
 
         it {
-          is_expected.to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
+          expect(subject).to contain_file('zpassenger.load').with('path' => '/etc/apache2/mods-available/zpassenger.load')
         }
 
         it {
-          is_expected.to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
+          expect(subject).to contain_file('passenger.conf').with('path' => '/etc/apache2/mods-available/passenger.conf')
         }
 
         context 'passenger config with passenger_installed_version set', test: true do
@@ -441,14 +441,14 @@
               it { is_expected.to contain_package('mod_passenger') }
 
               it {
-                is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
+                expect(subject).to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
               }
 
               it { is_expected.to contain_file('passenger_package.conf').without_content }
               it { is_expected.to contain_file('passenger_package.conf').without_source }
 
               it {
-                is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
+                expect(subject).to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
               }
 
               it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRoot}) }
@@ -474,22 +474,22 @@
 
             context 'on EL7' do
               it {
-                is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
+                expect(subject).to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
               }
 
               it {
-                is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
+                expect(subject).to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
               }
             end
           when '8'
 
             context 'on EL8' do
               it {
-                is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
+                expect(subject).to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
               }
 
               it {
-                is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
+                expect(subject).to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
               }
             end
           end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 3e364adc21..67e7d86b76 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -27,7 +27,7 @@
               it { is_expected.to contain_package('libapache2-mod-php7.0') }
 
               it {
-                is_expected.to contain_file('php7.0.load').with(
+                expect(subject).to contain_file('php7.0.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n",
                 )
               }
@@ -38,7 +38,7 @@
               it { is_expected.to contain_package('libapache2-mod-php7.3') }
 
               it {
-                is_expected.to contain_file('php7.3.load').with(
+                expect(subject).to contain_file('php7.3.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.3.so\n",
                 )
               }
@@ -52,7 +52,7 @@
                 it { is_expected.to contain_package('libapache2-mod-php8.0') }
 
                 it {
-                  is_expected.to contain_file('php8.0.load').with(
+                  expect(subject).to contain_file('php8.0.load').with(
                     content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
                   )
                 }
@@ -64,7 +64,7 @@
               it { is_expected.to contain_package('libapache2-mod-php7.4') }
 
               it {
-                is_expected.to contain_file('php7.4.load').with(
+                expect(subject).to contain_file('php7.4.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.4.so\n",
                 )
               }
@@ -78,7 +78,7 @@
                 it { is_expected.to contain_package('libapache2-mod-php8.0') }
 
                 it {
-                  is_expected.to contain_file('php8.0.load').with(
+                  expect(subject).to contain_file('php8.0.load').with(
                     content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
                   )
                 }
@@ -91,7 +91,7 @@
               end
 
               it {
-                is_expected.to contain_file('php7.2.conf').with(
+                expect(subject).to contain_file('php7.2.conf').with(
                   content: 'somecontent',
                 )
               }
@@ -189,7 +189,7 @@
                 end
 
                 it {
-                  is_expected.to contain_package('php').with(
+                  expect(subject).to contain_package('php').with(
                     ensure: '5.3.13',
                   )
                 }
@@ -292,7 +292,7 @@
           end
 
           it {
-            is_expected.to contain_file('php5.conf').with(
+            expect(subject).to contain_file('php5.conf').with(
               content: 'somecontent',
             )
           }
@@ -304,7 +304,7 @@
           end
 
           it {
-            is_expected.to contain_file('php5.conf').with(
+            expect(subject).to contain_file('php5.conf').with(
               content: %r{^# PHP is an HTML-embedded scripting language which attempts to make it},
             )
           }
@@ -316,7 +316,7 @@
           end
 
           it {
-            is_expected.to contain_file('php5.conf').with(
+            expect(subject).to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
@@ -331,7 +331,7 @@
           end
 
           it {
-            is_expected.to contain_file('php5.conf').with(
+            expect(subject).to contain_file('php5.conf').with(
               content: 'somecontent',
             )
           }
@@ -346,7 +346,7 @@
           end
 
           it {
-            is_expected.to contain_file('php5.conf').with(
+            expect(subject).to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
@@ -361,7 +361,7 @@
           end
 
           it {
-            is_expected.to contain_file('php5.conf').with(
+            expect(subject).to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
@@ -373,7 +373,7 @@
           end
 
           it 'raises an error' do
-            is_expected.to compile.and_raise_error(%r{mpm_module => 'prefork' or mpm_module => 'itk'})
+            expect(subject).to compile.and_raise_error(%r{mpm_module => 'prefork' or mpm_module => 'itk'})
           end
         end
       end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
index 20b416c43a..0ebe44794a 100644
--- a/spec/classes/mod/prefork_spec.rb
+++ b/spec/classes/mod/prefork_spec.rb
@@ -16,8 +16,8 @@
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.conf').with_ensure('link') }
 
     it {
-      is_expected.to contain_file('/etc/apache2/mods-available/prefork.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n")
+      expect(subject).to contain_file('/etc/apache2/mods-available/prefork.load').with('ensure' => 'file',
+                                                                                       'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n")
     }
 
     it { is_expected.to contain_file('/etc/apache2/mods-enabled/prefork.load').with_ensure('link') }
@@ -31,8 +31,8 @@
     it { is_expected.not_to contain_apache__mod('event') }
 
     it {
-      is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',
-                                                                                 'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
+      expect(subject).to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',
+                                                                                     'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
     }
   end
 
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
index 1b03e82590..d43cecd7fd 100644
--- a/spec/classes/mod/proxy_balancer_spec.rb
+++ b/spec/classes/mod/proxy_balancer_spec.rb
@@ -9,7 +9,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
              "Require ip #{Array(allow_from).join(' ')}\n" \
              "</Location>\n"
   it do
-    is_expected.to contain_file('proxy_balancer.conf').with_content(expected)
+    expect(subject).to contain_file('proxy_balancer.conf').with_content(expected)
   end
 end
 
diff --git a/spec/classes/mod/remoteip_spec.rb b/spec/classes/mod/remoteip_spec.rb
index b89546243d..2ab7ee72aa 100644
--- a/spec/classes/mod/remoteip_spec.rb
+++ b/spec/classes/mod/remoteip_spec.rb
@@ -10,7 +10,7 @@
     it { is_expected.to contain_apache__mod('remoteip') }
 
     it {
-      is_expected.to contain_file('remoteip.conf').with('path' => '/etc/apache2/mods-available/remoteip.conf')
+      expect(subject).to contain_file('remoteip.conf').with('path' => '/etc/apache2/mods-available/remoteip.conf')
     }
 
     describe 'with header X-Forwarded-For' do
diff --git a/spec/classes/mod/rpaf_spec.rb b/spec/classes/mod/rpaf_spec.rb
index 4de5fb5710..27b1dfdf93 100644
--- a/spec/classes/mod/rpaf_spec.rb
+++ b/spec/classes/mod/rpaf_spec.rb
@@ -12,7 +12,7 @@
     it { is_expected.to contain_package('libapache2-mod-rpaf') }
 
     it {
-      is_expected.to contain_file('rpaf.conf').with('path' => '/etc/apache2/mods-available/rpaf.conf')
+      expect(subject).to contain_file('rpaf.conf').with('path' => '/etc/apache2/mods-available/rpaf.conf')
     }
 
     it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
@@ -50,7 +50,7 @@
     it { is_expected.to contain_package('www/mod_rpaf2') }
 
     it {
-      is_expected.to contain_file('rpaf.conf').with('path' => '/usr/local/etc/apache24/Modules/rpaf.conf')
+      expect(subject).to contain_file('rpaf.conf').with('path' => '/usr/local/etc/apache24/Modules/rpaf.conf')
     }
 
     it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
@@ -88,7 +88,7 @@
     it { is_expected.to contain_package('www-apache/mod_rpaf') }
 
     it {
-      is_expected.to contain_file('rpaf.conf').with('path' => '/etc/apache2/modules.d/rpaf.conf')
+      expect(subject).to contain_file('rpaf.conf').with('path' => '/etc/apache2/modules.d/rpaf.conf')
     }
 
     it { is_expected.to contain_file('rpaf.conf').with_content(%r{^RPAFenable On$}) }
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index 5ad45531ad..cd01d3a067 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -13,21 +13,21 @@
       when 'Suse'
         context 'on Suse based systems' do
           it {
-            is_expected.to contain_file('security.conf')
+            expect(subject).to contain_file('security.conf')
               .with_content(%r{^\s+SecTmpDir /var/lib/mod_security$})
           }
         end
       when 'RedHat'
         context 'on RedHat based systems' do
           it {
-            is_expected.to contain_apache__mod('security').with(
+            expect(subject).to contain_apache__mod('security').with(
               id: 'security2_module',
               lib: 'mod_security2.so',
             )
           }
 
           it {
-            is_expected.to contain_apache__mod('unique_id').with(
+            expect(subject).to contain_apache__mod('unique_id').with(
               id: 'unique_id_module',
               lib: 'mod_unique_id.so',
             )
@@ -37,14 +37,14 @@
 
           if (facts[:os]['release']['major'].to_i > 6 && facts[:os]['release']['major'].to_i <= 7) || (facts[:os]['release']['major'].to_i >= 8)
             it {
-              is_expected.to contain_file('security.conf').with(
+              expect(subject).to contain_file('security.conf').with(
                 path: '/etc/httpd/conf.modules.d/security.conf',
               )
             }
           end
 
           it {
-            is_expected.to contain_file('security.conf')
+            expect(subject).to contain_file('security.conf')
               .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
               .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
               .with_content(%r{^\s+SecAuditLogType Serial$})
@@ -54,21 +54,21 @@
           }
 
           it {
-            is_expected.to contain_file('/etc/httpd/modsecurity.d').with(
+            expect(subject).to contain_file('/etc/httpd/modsecurity.d').with(
               ensure: 'directory', path: '/etc/httpd/modsecurity.d',
               owner: 'root', group: 'root', mode: '0755'
             )
           }
 
           it {
-            is_expected.to contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
+            expect(subject).to contain_file('/etc/httpd/modsecurity.d/activated_rules').with(
               ensure: 'directory', path: '/etc/httpd/modsecurity.d/activated_rules',
               owner: 'apache', group: 'apache'
             )
           }
 
           it {
-            is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with(
+            expect(subject).to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with(
               path: '/etc/httpd/modsecurity.d/security_crs.conf',
             )
           }
@@ -76,7 +76,7 @@
           it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
 
           it {
-            is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+            expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
               path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
               target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
             )
@@ -111,7 +111,7 @@
             it { is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
 
             it {
-              is_expected.to contain_file('bar.conf').with(
+              expect(subject).to contain_file('bar.conf').with(
                 path: '/etc/httpd/modsecurity.d/activated_rules/bar.conf',
                 target: '/tmp/foo/bar.conf',
               )
@@ -136,7 +136,7 @@
             end
 
             it {
-              is_expected.not_to contain_file('/etc/httpd/modsecurity.d/custom_rules/custom_01_rules.conf')
+              expect(subject).not_to contain_file('/etc/httpd/modsecurity.d/custom_rules/custom_01_rules.conf')
             }
           end
 
@@ -149,7 +149,7 @@
             end
 
             it {
-              is_expected.to contain_file('/etc/httpd/modsecurity.d/custom_rules').with(
+              expect(subject).to contain_file('/etc/httpd/modsecurity.d/custom_rules').with(
                 ensure: 'directory', path: '/etc/httpd/modsecurity.d/custom_rules',
                 owner: 'apache', group: 'apache'
               )
@@ -172,7 +172,7 @@
 
             if facts[:os]['release']['major'].to_i < 8 && facts[:os]['family'] == 'RedHat'
               it {
-                is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                expect(subject).to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
                   %r{
                     ^SecAction\ \\\n
                     \ \ "id:'900001',\ \\\n
@@ -188,11 +188,11 @@
               }
             else
               it {
-                is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                expect(subject).to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
                   %r{^SecAction \\\n\s+"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
-                is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                expect(subject).to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
                   %r{^SecAction \\\n\s+"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=2"$}
-                is_expected.to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
+                expect(subject).to contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content \
                   %r{
                     ^SecAction\ \\\n
                     \s+"id:900700,\\\n
@@ -217,21 +217,21 @@
             end
 
             it {
-              is_expected.to compile.and_raise_error(%r{Executing paranoia level cannot be lower than paranoia level})
+              expect(subject).to compile.and_raise_error(%r{Executing paranoia level cannot be lower than paranoia level})
             }
           end
         end
       when 'Debian'
         context 'on Debian based systems' do
           it {
-            is_expected.to contain_apache__mod('security').with(
+            expect(subject).to contain_apache__mod('security').with(
               id: 'security2_module',
               lib: 'mod_security2.so',
             )
           }
 
           it {
-            is_expected.to contain_apache__mod('unique_id').with(
+            expect(subject).to contain_apache__mod('unique_id').with(
               id: 'unique_id_module',
               lib: 'mod_unique_id.so',
             )
@@ -240,13 +240,13 @@
           it { is_expected.to contain_package('modsecurity-crs') }
 
           it {
-            is_expected.to contain_file('security.conf').with(
+            expect(subject).to contain_file('security.conf').with(
               path: '/etc/apache2/mods-available/security.conf',
             )
           }
 
           it {
-            is_expected.to contain_file('security.conf')
+            expect(subject).to contain_file('security.conf')
               .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})
               .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$})
               .with_content(%r{^\s+SecAuditLogType Serial$})
@@ -256,21 +256,21 @@
           }
 
           it {
-            is_expected.to contain_file('/etc/modsecurity').with(
+            expect(subject).to contain_file('/etc/modsecurity').with(
               ensure: 'directory', path: '/etc/modsecurity',
               owner: 'root', group: 'root', mode: '0755'
             )
           }
 
           it {
-            is_expected.to contain_file('/etc/modsecurity/activated_rules').with(
+            expect(subject).to contain_file('/etc/modsecurity/activated_rules').with(
               ensure: 'directory', path: '/etc/modsecurity/activated_rules',
               owner: 'www-data', group: 'www-data'
             )
           }
 
           it {
-            is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with(
+            expect(subject).to contain_file('/etc/modsecurity/security_crs.conf').with(
               path: '/etc/modsecurity/security_crs.conf',
             )
           }
@@ -280,7 +280,7 @@
             it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
 
             it {
-              is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+              expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
                 path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
                 target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
               )
@@ -317,7 +317,7 @@
               it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
 
               it {
-                is_expected.to contain_file('bar.conf').with(
+                expect(subject).to contain_file('bar.conf').with(
                   path: '/etc/modsecurity/activated_rules/bar.conf',
                   target: '/tmp/foo/bar.conf',
                 )
@@ -333,7 +333,7 @@
             end
 
             it {
-              is_expected.not_to contain_file('/etc/modsecurity/custom_rules/custom_01_rules.conf')
+              expect(subject).not_to contain_file('/etc/modsecurity/custom_rules/custom_01_rules.conf')
             }
           end
 
@@ -346,7 +346,7 @@
             end
 
             it {
-              is_expected.to contain_file('/etc/modsecurity/custom_rules').with(
+              expect(subject).to contain_file('/etc/modsecurity/custom_rules').with(
                 ensure: 'directory', path: '/etc/modsecurity/custom_rules',
                 owner: 'www-data', group: 'www-data'
               )
@@ -365,7 +365,7 @@
             it { is_expected.to contain_apache__mod('security2') }
 
             it {
-              is_expected.to contain_file('security.conf').with(
+              expect(subject).to contain_file('security.conf').with(
                 path: '/etc/apache2/mods-available/security2.conf',
               )
             }
@@ -384,11 +384,11 @@
             end
 
             it {
-              is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
+              expect(subject).to contain_file('/etc/modsecurity/security_crs.conf').with_content \
                 %r{^SecAction \\\n\s+"id:900000,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.paranoia_level=1"$}
-              is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
+              expect(subject).to contain_file('/etc/modsecurity/security_crs.conf').with_content \
                 %r{^SecAction \\\n\s+"id:900001,\\\n\s+phase:1,\\\n\s+nolog,\\\n\s+pass,\\\n\s+t:none,\\\n\s+setvar:tx.executing_paranoia_level=1"$}
-              is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content \
+              expect(subject).to contain_file('/etc/modsecurity/security_crs.conf').with_content \
                 %r{
                   ^SecAction\ \\\n
                   \s+"id:900700,\\\n
@@ -412,7 +412,7 @@
             end
 
             it {
-              is_expected.to compile.and_raise_error(%r{Executing paranoia level cannot be lower than paranoia level})
+              expect(subject).to compile.and_raise_error(%r{Executing paranoia level cannot be lower than paranoia level})
             }
           end
         end
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index 056179cc92..d54be82016 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -19,7 +19,7 @@
       it { is_expected.to contain_package('mod_ssl') }
 
       it {
-        is_expected.to contain_file('ssl.conf')
+        expect(subject).to contain_file('ssl.conf')
           .with_path('/etc/httpd/conf.modules.d/ssl.conf')
           .without_content(%r{SSLProtocol})
           .with_content(%r{^  SSLCipherSuite PROFILE=SYSTEM$})
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index 19d4ab7e9a..ce8fd5149b 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -38,7 +38,7 @@ def require_directives(requires)
     "ProxyStatus On\n" \
     "</IfModule>\n"
   it('status conf require') do
-    is_expected.to contain_file('status.conf').with_content(expected)
+    expect(subject).to contain_file('status.conf').with_content(expected)
   end
 end
 
@@ -55,13 +55,13 @@ def require_directives(requires)
         include_examples 'status_conf_spec_require', 'ip 127.0.0.1 ::1', 'On', '/server-status'
 
         it {
-          is_expected.to contain_file('status.conf').with(ensure: 'file',
-                                                          path: '/etc/apache2/mods-available/status.conf')
+          expect(subject).to contain_file('status.conf').with(ensure: 'file',
+                                                              path: '/etc/apache2/mods-available/status.conf')
         }
 
         it {
-          is_expected.to contain_file('status.conf symlink').with(ensure: 'link',
-                                                                  path: '/etc/apache2/mods-enabled/status.conf')
+          expect(subject).to contain_file('status.conf symlink').with(ensure: 'link',
+                                                                      path: '/etc/apache2/mods-enabled/status.conf')
         }
       end
 
@@ -86,7 +86,7 @@ def require_directives(requires)
           end
 
           it 'expects to succeed regular expression validation' do
-            is_expected.to compile
+            expect(subject).to compile
           end
         end
       end
@@ -98,7 +98,7 @@ def require_directives(requires)
           end
 
           it 'expects to fail regular expression validation' do
-            is_expected.to compile.and_raise_error(%r{extended_status})
+            expect(subject).to compile.and_raise_error(%r{extended_status})
           end
         end
       end
@@ -156,13 +156,13 @@ def require_directives(requires)
           include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
 
           it {
-            is_expected.to contain_file('status.conf').with(ensure: 'file',
-                                                            path: '/etc/apache2/mods-available/status.conf')
+            expect(subject).to contain_file('status.conf').with(ensure: 'file',
+                                                                path: '/etc/apache2/mods-available/status.conf')
           }
 
           it {
-            is_expected.to contain_file('status.conf symlink').with(ensure: 'link',
-                                                                    path: '/etc/apache2/mods-enabled/status.conf')
+            expect(subject).to contain_file('status.conf symlink').with(ensure: 'link',
+                                                                        path: '/etc/apache2/mods-enabled/status.conf')
           }
         end
 
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
index 8675d9b9fb..3377c9fd2f 100644
--- a/spec/classes/mod/worker_spec.rb
+++ b/spec/classes/mod/worker_spec.rb
@@ -15,8 +15,8 @@
     it { is_expected.to contain_file('/etc/apache2/mods-available/worker.conf').with_ensure('file') }
 
     it {
-      is_expected.to contain_file('/etc/apache2/mods-available/worker.load').with('ensure' => 'file',
-                                                                                  'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n")
+      expect(subject).to contain_file('/etc/apache2/mods-available/worker.load').with('ensure' => 'file',
+                                                                                      'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n")
     }
   end
 
@@ -28,8 +28,8 @@
     it { is_expected.not_to contain_apache__mod('event') }
 
     it {
-      is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',
-                                                                                'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
+      expect(subject).to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',
+                                                                                    'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
     }
   end
 
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
index e0d785dfed..d3f9ff24f1 100644
--- a/spec/classes/mod/wsgi_spec.rb
+++ b/spec/classes/mod/wsgi_spec.rb
@@ -10,7 +10,7 @@
     it { is_expected.to contain_class('apache::params') }
 
     it {
-      is_expected.to contain_class('apache::mod::wsgi').with(
+      expect(subject).to contain_class('apache::mod::wsgi').with(
         'wsgi_socket_prefix' => nil,
       )
     }
@@ -76,8 +76,8 @@
       end
 
       it {
-        is_expected.to contain_apache__mod('wsgi').with('package' => 'mod_wsgi_package',
-                                                        'path' => '/foo/bar/baz')
+        expect(subject).to contain_apache__mod('wsgi').with('package' => 'mod_wsgi_package',
+                                                            'path' => '/foo/bar/baz')
       }
 
       it { is_expected.to contain_package('mod_wsgi_package') }
@@ -93,8 +93,8 @@
       end
 
       it {
-        is_expected.to contain_apache__mod('wsgi').with('path' => 'modules/wsgi_mod_name.so',
-                                                        'package' => 'mod_wsgi_package')
+        expect(subject).to contain_apache__mod('wsgi').with('path' => 'modules/wsgi_mod_name.so',
+                                                            'package' => 'mod_wsgi_package')
       }
 
       it { is_expected.to contain_file('wsgi.load').with_content(%r{LoadModule wsgi_module modules/wsgi_mod_name.so}) }
@@ -127,7 +127,7 @@
     it { is_expected.to contain_class('apache::params') }
 
     it {
-      is_expected.to contain_class('apache::mod::wsgi').with(
+      expect(subject).to contain_class('apache::mod::wsgi').with(
         'wsgi_socket_prefix' => nil,
       )
     }
@@ -141,7 +141,7 @@
     it { is_expected.to contain_class('apache::params') }
 
     it {
-      is_expected.to contain_class('apache::mod::wsgi').with(
+      expect(subject).to contain_class('apache::mod::wsgi').with(
         'wsgi_socket_prefix' => nil,
       )
     }
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
index 2e621b137e..85a03fbb40 100644
--- a/spec/classes/service_spec.rb
+++ b/spec/classes/service_spec.rb
@@ -11,7 +11,7 @@
     include_examples 'Debian 11'
 
     it {
-      is_expected.to contain_service('httpd').with(
+      expect(subject).to contain_service('httpd').with(
         'name' => 'apache2',
         'ensure' => 'running',
         'enable' => 'true',
@@ -22,7 +22,7 @@
       let(:params) { { service_name: 'foo' } }
 
       it {
-        is_expected.to contain_service('httpd').with(
+        expect(subject).to contain_service('httpd').with(
           'name' => 'foo',
         )
       }
@@ -32,7 +32,7 @@
       let(:params) { { service_enable: true } }
 
       it {
-        is_expected.to contain_service('httpd').with(
+        expect(subject).to contain_service('httpd').with(
           'name' => 'apache2',
           'ensure' => 'running',
           'enable' => 'true',
@@ -44,7 +44,7 @@
       let(:params) { { service_enable: false } }
 
       it {
-        is_expected.to contain_service('httpd').with(
+        expect(subject).to contain_service('httpd').with(
           'name' => 'apache2',
           'ensure' => 'running',
           'enable' => 'false',
@@ -56,7 +56,7 @@
       let(:params) { { service_ensure: 'running' } }
 
       it {
-        is_expected.to contain_service('httpd').with(
+        expect(subject).to contain_service('httpd').with(
           'ensure' => 'running',
           'enable' => 'true',
         )
@@ -67,7 +67,7 @@
       let(:params) { { service_ensure: 'stopped' } }
 
       it {
-        is_expected.to contain_service('httpd').with(
+        expect(subject).to contain_service('httpd').with(
           'ensure' => 'stopped',
           'enable' => 'true',
         )
@@ -88,7 +88,7 @@
       let(:params) { { service_restart: '/usr/sbin/apachectl graceful' } }
 
       it {
-        is_expected.to contain_service('httpd').with(
+        expect(subject).to contain_service('httpd').with(
           'restart' => '/usr/sbin/apachectl graceful',
         )
       }
@@ -112,7 +112,7 @@
     include_examples 'FreeBSD 9'
 
     it {
-      is_expected.to contain_service('httpd').with(
+      expect(subject).to contain_service('httpd').with(
         'name' => 'apache24',
         'ensure' => 'running',
         'enable' => 'true',
@@ -124,7 +124,7 @@
     include_examples 'Gentoo'
 
     it {
-      is_expected.to contain_service('httpd').with(
+      expect(subject).to contain_service('httpd').with(
         'name' => 'apache2',
         'ensure' => 'running',
         'enable' => 'true',
diff --git a/spec/defines/balancer_spec.rb b/spec/defines/balancer_spec.rb
index aa2dca3225..5626cff603 100644
--- a/spec/defines/balancer_spec.rb
+++ b/spec/defines/balancer_spec.rb
@@ -27,7 +27,7 @@
       end
 
       it {
-        is_expected.to contain_concat('apache_balancer_myapp').with(path: '/tmp/myapp.conf')
+        expect(subject).to contain_concat('apache_balancer_myapp').with(path: '/tmp/myapp.conf')
       }
     end
 
@@ -39,7 +39,7 @@
       end
 
       it {
-        is_expected.to contain_concat__fragment('00-myapp-header').with_content(
+        expect(subject).to contain_concat__fragment('00-myapp-header').with_content(
           %r{^<Proxy balancer://myapp timeout=0 nonce=none>$},
         )
       }
@@ -54,7 +54,7 @@
     end
 
     it {
-      is_expected.to contain_concat('apache_balancer_myapp').with(path: '/junk/path/balancer_myapp.conf')
+      expect(subject).to contain_concat('apache_balancer_myapp').with(path: '/junk/path/balancer_myapp.conf')
     }
   end
 
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index cec2c5c97d..acd06c1be6 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -50,7 +50,7 @@
     end
 
     it {
-      is_expected.to contain_concat__fragment('BalancerMember http://127.0.0.1:8080/').with(target: 'apache_balancer_balancername')
+      expect(subject).to contain_concat__fragment('BalancerMember http://127.0.0.1:8080/').with(target: 'apache_balancer_balancername')
     }
   end
 end
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
index db695c05f2..89ef1f1611 100644
--- a/spec/defines/custom_config_spec.rb
+++ b/spec/defines/custom_config_spec.rb
@@ -20,7 +20,7 @@
     end
 
     it {
-      is_expected.to contain_exec('syntax verification for rspec')
+      expect(subject).to contain_exec('syntax verification for rspec')
         .with('refreshonly' => 'true', 'command' => ['/usr/sbin/apachectl', '-t'])
         .that_subscribes_to('File[apache_rspec]')
         .that_notifies('Class[Apache::Service]')
@@ -28,13 +28,13 @@
     }
 
     it {
-      is_expected.to contain_exec('remove rspec if invalid')
+      expect(subject).to contain_exec('remove rspec if invalid')
         .with('unless' => [['/usr/sbin/apachectl', '-t']], 'refreshonly' => 'true')
         .that_subscribes_to('File[apache_rspec]')
     }
 
     it {
-      is_expected.to contain_file('apache_rspec')
+      expect(subject).to contain_file('apache_rspec')
         .with('ensure' => 'present', 'content' => '# Test')
         .that_requires('Package[httpd]')
     }
@@ -51,16 +51,16 @@
     end
 
     it {
-      is_expected.to contain_exec('syntax verification for rspec').with('command' => ['/bin/true'])
+      expect(subject).to contain_exec('syntax verification for rspec').with('command' => ['/bin/true'])
     }
 
     it {
-      is_expected.to contain_exec('remove rspec if invalid').with('command' => ['/bin/rm', '/dne/30-rspec.conf'],
-                                                                  'unless' => [['/bin/true']])
+      expect(subject).to contain_exec('remove rspec if invalid').with('command' => ['/bin/rm', '/dne/30-rspec.conf'],
+                                                                      'unless' => [['/bin/true']])
     }
 
     it {
-      is_expected.to contain_file('apache_rspec')
+      expect(subject).to contain_file('apache_rspec')
         .that_requires('Package[httpd]')
         .with('path' => '/dne/30-rspec.conf',
               'ensure' => 'present',
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
index c1f4bd8a91..dc7ddde243 100644
--- a/spec/defines/mod_spec.rb
+++ b/spec/defines/mod_spec.rb
@@ -18,11 +18,11 @@
       it { is_expected.to contain_class('apache::params') }
 
       it 'manages the module load file' do
-        is_expected.to contain_file('spec_m.load').with(path: '/etc/httpd/conf.modules.d/spec_m.load',
-                                                        content: "LoadModule spec_m_module modules/mod_spec_m.so\n",
-                                                        owner: 'root',
-                                                        group: 'root',
-                                                        mode: '0644')
+        expect(subject).to contain_file('spec_m.load').with(path: '/etc/httpd/conf.modules.d/spec_m.load',
+                                                            content: "LoadModule spec_m_module modules/mod_spec_m.so\n",
+                                                            owner: 'root',
+                                                            group: 'root',
+                                                            mode: '0644')
       end
     end
 
@@ -32,7 +32,7 @@
       end
 
       it 'manages the module load file' do
-        is_expected.to contain_file('spec_m.load').with(mode: '0640')
+        expect(subject).to contain_file('spec_m.load').with(mode: '0640')
       end
     end
 
@@ -56,19 +56,19 @@
       it { is_expected.to contain_class('apache::params') }
 
       it 'manages the module load file' do
-        is_expected.to contain_file('spec_m.load').with(path: '/etc/apache2/mods-available/spec_m.load',
-                                                        content: "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
-                                                        owner: 'root',
-                                                        group: 'root',
-                                                        mode: '0644')
+        expect(subject).to contain_file('spec_m.load').with(path: '/etc/apache2/mods-available/spec_m.load',
+                                                            content: "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
+                                                            owner: 'root',
+                                                            group: 'root',
+                                                            mode: '0644')
       end
 
       it 'links the module load file' do
-        is_expected.to contain_file('spec_m.load symlink').with(path: '/etc/apache2/mods-enabled/spec_m.load',
-                                                                target: '/etc/apache2/mods-available/spec_m.load',
-                                                                owner: 'root',
-                                                                group: 'root',
-                                                                mode: '0644')
+        expect(subject).to contain_file('spec_m.load symlink').with(path: '/etc/apache2/mods-enabled/spec_m.load',
+                                                                    target: '/etc/apache2/mods-available/spec_m.load',
+                                                                    owner: 'root',
+                                                                    group: 'root',
+                                                                    mode: '0644')
       end
     end
   end
@@ -80,11 +80,11 @@
       it { is_expected.to contain_class('apache::params') }
 
       it 'manages the module load file' do
-        is_expected.to contain_file('spec_m.load').with(path: '/usr/local/etc/apache24/Modules/spec_m.load',
-                                                        content: "LoadModule spec_m_module /usr/local/libexec/apache24/mod_spec_m.so\n",
-                                                        owner: 'root',
-                                                        group: 'wheel',
-                                                        mode: '0644')
+        expect(subject).to contain_file('spec_m.load').with(path: '/usr/local/etc/apache24/Modules/spec_m.load',
+                                                            content: "LoadModule spec_m_module /usr/local/libexec/apache24/mod_spec_m.so\n",
+                                                            owner: 'root',
+                                                            group: 'wheel',
+                                                            mode: '0644')
       end
     end
   end
@@ -96,11 +96,11 @@
       it { is_expected.to contain_class('apache::params') }
 
       it 'manages the module load file' do
-        is_expected.to contain_file('spec_m.load').with(path: '/etc/apache2/modules.d/spec_m.load',
-                                                        content: "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
-                                                        owner: 'root',
-                                                        group: 'wheel',
-                                                        mode: '0644')
+        expect(subject).to contain_file('spec_m.load').with(path: '/etc/apache2/modules.d/spec_m.load',
+                                                            content: "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
+                                                            owner: 'root',
+                                                            group: 'wheel',
+                                                            mode: '0644')
       end
     end
   end
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index 914741da3e..ec9f161e7a 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -24,14 +24,14 @@ class { "apache::mod::security": activated_rules => [] }
       case facts[:os]['family']
       when 'RedHat'
         it {
-          is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+          expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
             path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
             target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
           )
         }
       when 'Debian'
         it {
-          is_expected.to contain_file('modsecurity_35_bad_robots.data').with(
+          expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
             path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
             target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
           )
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
index ffd6aca080..627afa29d1 100644
--- a/spec/defines/vhost_custom_spec.rb
+++ b/spec/defines/vhost_custom_spec.rb
@@ -23,7 +23,7 @@
       include_examples 'Debian 11'
 
       it {
-        is_expected.to contain_file('apache_rspec.example.com').with(
+        expect(subject).to contain_file('apache_rspec.example.com').with(
           ensure: 'present',
           content: 'foobar',
           path: '/etc/apache2/sites-available/25-rspec.example.com.conf',
@@ -31,7 +31,7 @@
       }
 
       it {
-        is_expected.to contain_file('25-rspec.example.com.conf symlink').with(
+        expect(subject).to contain_file('25-rspec.example.com.conf symlink').with(
           ensure: 'link',
           path: '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
           target: '/etc/apache2/sites-available/25-rspec.example.com.conf',
@@ -43,7 +43,7 @@
       include_examples 'FreeBSD 9'
 
       it {
-        is_expected.to contain_file('apache_rspec.example.com').with(
+        expect(subject).to contain_file('apache_rspec.example.com').with(
           ensure: 'present',
           content: 'foobar',
           path: '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf',
@@ -55,7 +55,7 @@
       include_examples 'Gentoo'
 
       it {
-        is_expected.to contain_file('apache_rspec.example.com').with(
+        expect(subject).to contain_file('apache_rspec.example.com').with(
           ensure: 'present',
           content: 'foobar',
           path: '/etc/apache2/vhosts.d/25-rspec.example.com.conf',
diff --git a/spec/defines/vhost_fragment_spec.rb b/spec/defines/vhost_fragment_spec.rb
index 0352d5c8bb..36aecc8c15 100644
--- a/spec/defines/vhost_fragment_spec.rb
+++ b/spec/defines/vhost_fragment_spec.rb
@@ -23,9 +23,9 @@
           let(:params) { super().merge(content: '# Foo') }
 
           it 'creates a vhost concat fragment' do
-            is_expected.to compile.with_all_deps
-            is_expected.to contain_concat('15-default-80.conf')
-            is_expected.to create_concat__fragment('default-myfragment')
+            expect(subject).to compile.with_all_deps
+            expect(subject).to contain_concat('15-default-80.conf')
+            expect(subject).to create_concat__fragment('default-myfragment')
               .with_target('15-default-80.conf')
               .with_order(900)
               .with_content('# Foo')
@@ -36,9 +36,9 @@
           let(:params) { super().merge(content: '') }
 
           it 'does not create a vhost concat fragment' do
-            is_expected.to compile.with_all_deps
-            is_expected.to contain_concat('15-default-80.conf')
-            is_expected.not_to contain_concat__fragment('default-myfragment')
+            expect(subject).to compile.with_all_deps
+            expect(subject).to contain_concat('15-default-80.conf')
+            expect(subject).not_to contain_concat__fragment('default-myfragment')
           end
         end
       end
@@ -64,9 +64,9 @@
           end
 
           it 'creates a vhost concat fragment' do
-            is_expected.to compile.with_all_deps
-            is_expected.to contain_concat('custom.conf')
-            is_expected.to create_concat__fragment('custom-myfragment')
+            expect(subject).to compile.with_all_deps
+            expect(subject).to contain_concat('custom.conf')
+            expect(subject).to create_concat__fragment('custom-myfragment')
               .with_target('custom.conf')
               .with_order(900)
               .with_content('# Foo')
@@ -86,9 +86,9 @@
           end
 
           it 'creates a vhost concat fragment' do
-            is_expected.to compile.with_all_deps
-            is_expected.to contain_concat('42-custom.conf')
-            is_expected.to create_concat__fragment('custom-myfragment')
+            expect(subject).to compile.with_all_deps
+            expect(subject).to contain_concat('42-custom.conf')
+            expect(subject).to create_concat__fragment('custom-myfragment')
               .with_target('42-custom.conf')
               .with_order(900)
               .with_content('# Foo')
@@ -106,9 +106,9 @@
           end
 
           it 'creates a vhost concat fragment' do
-            is_expected.to compile.with_all_deps
-            is_expected.to contain_concat('25-custom.conf')
-            is_expected.to create_concat__fragment('custom-myfragment')
+            expect(subject).to compile.with_all_deps
+            expect(subject).to contain_concat('25-custom.conf')
+            expect(subject).to create_concat__fragment('custom-myfragment')
               .with_target('25-custom.conf')
               .with_order(900)
               .with_content('# Foo')
diff --git a/spec/defines/vhost_proxy_spec.rb b/spec/defines/vhost_proxy_spec.rb
index 1619a10121..b7b5c75c31 100644
--- a/spec/defines/vhost_proxy_spec.rb
+++ b/spec/defines/vhost_proxy_spec.rb
@@ -36,9 +36,9 @@
           end
 
           it 'creates a concat fragment' do
-            is_expected.to compile.with_all_deps
-            is_expected.to contain_concat('15-default-80.conf')
-            is_expected.to create_concat__fragment('default-myproxy-proxy')
+            expect(subject).to compile.with_all_deps
+            expect(subject).to contain_concat('15-default-80.conf')
+            expect(subject).to create_concat__fragment('default-myproxy-proxy')
               .with_target('15-default-80.conf')
               .with_order(170)
               .with_content(
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9ba566bfa9..64872cac07 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -536,19 +536,19 @@
           it { is_expected.to contain_class('apache::mod::ssl') }
 
           it {
-            is_expected.to contain_file('ssl.conf').with(
+            expect(subject).to contain_file('ssl.conf').with(
               content: %r{^\s+SSLHonorCipherOrder On$},
             )
           }
 
           it {
-            is_expected.to contain_file('ssl.conf').with(
+            expect(subject).to contain_file('ssl.conf').with(
               content: %r{^\s+SSLPassPhraseDialog builtin$},
             )
           }
 
           it {
-            is_expected.to contain_file('ssl.conf').with(
+            expect(subject).to contain_file('ssl.conf').with(
               content: %r{^\s+SSLSessionCacheTimeout 300$},
             )
           }
@@ -559,8 +559,8 @@
           it { is_expected.to contain_file('rspec.example.com_ssl_foo.crl') }
 
           it {
-            is_expected.to contain_file('/var/www/logs').with('ensure' => 'directory',
-                                                              'mode' => '0600')
+            expect(subject).to contain_file('/var/www/logs').with('ensure' => 'directory',
+                                                                  'mode' => '0600')
           }
 
           it { is_expected.to contain_class('apache::mod::alias') }
@@ -582,20 +582,20 @@
           it { is_expected.to contain_class('apache::mod::wsgi') }
 
           it {
-            is_expected.to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
-                                                                            'mode' => '0644',
-                                                                            'require' => 'Package[httpd]',
-                                                                            'notify' => 'Class[Apache::Service]')
+            expect(subject).to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
+                                                                                'mode' => '0644',
+                                                                                'require' => 'Package[httpd]',
+                                                                                'notify' => 'Class[Apache::Service]')
           }
 
           if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu'
             it {
-              is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
-                                                                                    'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf")
+              expect(subject).to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
+                                                                                        'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf")
             }
           end
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header')
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header')
               .with_content(%r{^\s+LimitRequestFieldSize 8190$})
               .with_content(%r{^\s+LimitRequestFields 100$})
               .with_content(%r{^\s+LimitRequestLine 8190$})
@@ -605,7 +605,7 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-aliases').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-aliases').with(
               content: %r{^\s+Alias /image "/rspec/image"$},
             )
           }
@@ -614,7 +614,7 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-directories')
+            expect(subject).to contain_concat__fragment('rspec.example.com-directories')
               .with_content(%r{^\s+<Proxy "\*">$})
               .with_content(%r{^\s+Include\s'/custom/path/includes'$})
               .with_content(%r{^\s+Include\s'/custom/path/another_includes'$})
@@ -726,7 +726,7 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-logging')
+            expect(subject).to contain_concat__fragment('rspec.example.com-logging')
               .with_content(%r{^\s+ErrorLogFormat "\[%t\] \[%l\] %7F: %E: \[client\\ %a\] %M% ,\\ referer\\ %\{Referer\}i"$})
           }
 
@@ -737,7 +737,7 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy')
+            expect(subject).to contain_concat__fragment('rspec.example.com-proxy')
               .with_content(%r{retry=0})
               .with_content(%r{timeout=5})
               .with_content(%r{SetEnv force-proxy-request-1.0 1})
@@ -752,7 +752,7 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-rewrite')
+            expect(subject).to contain_concat__fragment('rspec.example.com-rewrite')
               .with_content(%r{^\s+RewriteEngine On$})
               .with_content(%r{^\s+RewriteOptions Inherit$})
               .with_content(%r{^\s+RewriteBase /})
@@ -763,21 +763,21 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-setenv')
+            expect(subject).to contain_concat__fragment('rspec.example.com-setenv')
               .with_content(%r{SetEnv FOO=/bin/true})
               .with_content(%r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif})
               .with_content(%r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true})
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-ssl')
+            expect(subject).to contain_concat__fragment('rspec.example.com-ssl')
               .with_content(%r{^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$})
               .with_content(%r{^\s+SSLHonorCipherOrder\s+Off$})
               .with_content(%r{^\s+SSLUserName\s+SSL_CLIENT_S_DN_CN$})
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-sslproxy')
+            expect(subject).to contain_concat__fragment('rspec.example.com-sslproxy')
               .with_content(%r{^\s+SSLProxyEngine On$})
               .with_content(%r{^\s+SSLProxyCheckPeerCN\s+on$})
               .with_content(%r{^\s+SSLProxyCheckPeerName\s+on$})
@@ -790,7 +790,7 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-header') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-filters').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-filters').with(
               content: %r{^\s+FilterDeclare COMPRESS$},
             )
           }
@@ -805,18 +805,18 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-security') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-file_footer')
+            expect(subject).to contain_concat__fragment('rspec.example.com-file_footer')
               .with_content(%r{^PassengerPreStart\shttp://localhost/myapp$})
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts')
+            expect(subject).to contain_concat__fragment('rspec.example.com-jk_mounts')
               .with_content(%r{^\s+JkMount\s+/\*\s+tcnode1$})
               .with_content(%r{^\s+JkUnMount\s+/\*\.jpg\s+tcnode1$})
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb')
+            expect(subject).to contain_concat__fragment('rspec.example.com-auth_kerb')
               .with_content(%r{^\s+KrbMethodNegotiate\soff$})
               .with_content(%r{^\s+KrbAuthoritative\soff$})
               .with_content(%r{^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$})
@@ -828,26 +828,26 @@
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-http_protocol_options').with(
               content: %r{^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$},
             )
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options')
+            expect(subject).to contain_concat__fragment('rspec.example.com-keepalive_options')
               .with_content(%r{^\s+KeepAlive\son$})
               .with_content(%r{^\s+KeepAliveTimeout\s100$})
               .with_content(%r{^\s+MaxKeepAliveRequests\s1000$})
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header')
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header')
               .with_content(%r{^\s+Protocols\sh2 http/1.1$})
               .with_content(%r{^\s+ProtocolsHonorOrder\sOn$})
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-http2')
+            expect(subject).to contain_concat__fragment('rspec.example.com-http2')
               .with_content(%r{^\s+H2CopyFiles\sOff$})
               .with_content(%r{^\s+H2Direct\sOn$})
               .with_content(%r{^\s+H2EarlyHints\sOff$})
@@ -867,7 +867,7 @@
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-passenger')
+            expect(subject).to contain_concat__fragment('rspec.example.com-passenger')
               .with_content(%r{^\s+PassengerEnabled\sOff$})
               .with_content(%r{^\s+PassengerBaseURI\s/app$})
               .with_content(%r{^\s+PassengerRuby\s/usr/bin/ruby1\.9\.1$})
@@ -913,7 +913,7 @@
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc')
+            expect(subject).to contain_concat__fragment('rspec.example.com-auth_oidc')
               .with_content(%r{^\s+OIDCProviderMetadataURL\shttps://login.example.com/\.well-known/openid-configuration$})
               .with_content(%r{^\s+OIDCClientID\stest$})
               .with_content(%r{^\s+OIDCRedirectURI\shttps://login\.example.com/redirect_uri$})
@@ -926,7 +926,7 @@
           it { is_expected.to contain_class('apache::mod::md') }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^MDomain example\.com example\.net auto$},
             )
           }
@@ -1060,13 +1060,13 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+ServerName https://www\.example\.com:443$},
             )
           }
 
           it {
-            is_expected.to contain_concat('25-www.example.com.conf')
+            expect(subject).to contain_concat('25-www.example.com.conf')
           }
         end
 
@@ -1087,13 +1087,13 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+ServerName https://www\.example\.com$},
             )
           }
 
           it {
-            is_expected.to contain_concat('25-www.example.com.conf')
+            expect(subject).to contain_concat('25-www.example.com.conf')
           }
         end
 
@@ -1114,13 +1114,13 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+ServerName www\.example\.com:443$},
             )
           }
 
           it {
-            is_expected.to contain_concat('25-www.example.com.conf')
+            expect(subject).to contain_concat('25-www.example.com.conf')
           }
         end
 
@@ -1141,13 +1141,13 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^\s+ServerName www\.example\.com$},
             )
           }
 
           it {
-            is_expected.to contain_concat('25-www.example.com.conf')
+            expect(subject).to contain_concat('25-www.example.com.conf')
           }
         end
 
@@ -1167,7 +1167,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[./m]*<VirtualHost 127.0.0.1:80 \[::1\]:80>[./m]*$},
             )
           }
@@ -1194,7 +1194,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[./m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080>[./m]*$},
             )
           }
@@ -1221,7 +1221,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[./m]*<VirtualHost 127.0.0.1:80 127.0.0.1:8080 \[::1\]:80 \[::1\]:8080>[./m]*$},
             )
           }
@@ -1252,7 +1252,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[./m]*<VirtualHost \[::1\]:80>[./m]*$},
             )
           }
@@ -1277,7 +1277,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{[./m]*<VirtualHost \*:80>[./m]*$},
             )
           }
@@ -1297,13 +1297,13 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$},
             )
           }
 
           it {
-            is_expected.not_to contain_concat__fragment('rspec.example.com-docroot').with(
+            expect(subject).not_to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+DocumentRoot "/var/www/html"$},
             )
           }
@@ -1321,13 +1321,13 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$},
             )
           }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-docroot').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-docroot').with(
               content: %r{^\s+DocumentRoot "/var/www/html"$},
             )
           }
@@ -1344,7 +1344,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{^\s*SecAuditLog "/var/log/#{apache_name}/rspec\.example\.com_security\.log"$},
             )
           }
@@ -1361,7 +1361,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{\s*SecAuditLog "/var/log/#{apache_name}/foo.log"$},
             )
           }
@@ -1379,7 +1379,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{
                 ^\s+SecAction\ \\\n
                 \s+"id:900110,\\\n
@@ -1405,7 +1405,7 @@
           it { is_expected.to compile }
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-security').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-security').with(
               content: %r{
               ^\s+SecAction\ \\\n
               \s+"id:900200,\\\n
@@ -1449,7 +1449,7 @@
           end
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(
+            expect(subject).to contain_concat__fragment('rspec.example.com-proxy').with_content(
               %r{ProxyPassMatch .* http://backend-a/ timeout=300},
             ).with_content(%r{## Proxy rules})
           }
@@ -1514,11 +1514,11 @@
           it { is_expected.to contain_file('/var/www/foo') }
 
           it {
-            is_expected.to contain_file('/tmp/logroot').with('ensure' => 'absent')
+            expect(subject).to contain_file('/tmp/logroot').with('ensure' => 'absent')
           }
 
           it {
-            is_expected.to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
+            expect(subject).to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
           }
 
           it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
@@ -1762,7 +1762,7 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+              expect(subject).to contain_concat__fragment('rspec.example.com-access_log').with(
                 content: %r{^\s+CustomLog.*my_log_file" combined\s*$},
               )
             }
@@ -1778,7 +1778,7 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+              expect(subject).to contain_concat__fragment('rspec.example.com-access_log').with(
                 content: %r{^\s+CustomLog.*my_log_file" combined\s+env=prod$},
               )
             }
@@ -1797,19 +1797,19 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+              expect(subject).to contain_concat__fragment('rspec.example.com-access_log').with(
                 content: %r{^\s+CustomLog "/tmp/log1"\s+combined\s+env=dev$},
               )
             }
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+              expect(subject).to contain_concat__fragment('rspec.example.com-access_log').with(
                 content: %r{^\s+CustomLog "/var/log/#{apache_name}/log2"\s+combined\s*$},
               )
             }
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-access_log').with(
+              expect(subject).to contain_concat__fragment('rspec.example.com-access_log').with(
                 content: %r{^\s+CustomLog "syslog" "%h %l"\s*$},
               )
             }
@@ -1826,7 +1826,7 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-logging').with(
+              expect(subject).to contain_concat__fragment('rspec.example.com-logging').with(
                 content: %r{^\s+ErrorLogFormat "\[%t\] \[%l\] %7F: %E: \[client\\ %a\] %M% ,\\ referer\\ %\{Referer\}i"$},
               )
             }
@@ -1847,7 +1847,7 @@
             end
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-logging')
+              expect(subject).to contain_concat__fragment('rspec.example.com-logging')
                 .with_content(%r{^\s+ErrorLogFormat "\[%\{uc\}t\] \[%-m:%-l\] \[R:%L\] \[C:%\{C\}L\] %7F: %E: %M"$})
                 .with_content(%r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] Request %k on C:%\{c\}L pid:%P tid:%T"$})
                 .with_content(%r{^\s+ErrorLogFormat request "\[%\{uc\}t\] \[R:%L\] UA:'%\+\{User-Agent\}i'"$})
@@ -1893,8 +1893,8 @@
             end
 
             it {
-              is_expected.to compile
-              is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
+              expect(subject).to compile
+              expect(subject).not_to contain_concat__fragment('rspec.example.com-rewrite')
             }
           end
 
@@ -1907,7 +1907,7 @@
             end
 
             it {
-              is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
+              expect(subject).not_to contain_concat__fragment('rspec.example.com-rewrite')
                 .with_content(%r{^\s+RewriteOptions Inherit$})
                 .with_content(%r{^\s+RewriteEngine On$})
                 .with_content(%r{^\s+RewriteRule \^index\.html\$ welcome.html$})
@@ -1923,7 +1923,7 @@
             end
 
             it {
-              is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
+              expect(subject).not_to contain_concat__fragment('rspec.example.com-rewrite')
                 .with_content(%r{^\s+RewriteEngine On$})
                 .with_content(%r{^\s+RewriteRule \^index\.html\$ welcome.html$})
                 .without(content: %r{^\s+RewriteOptions Inherit$})
@@ -1996,7 +1996,7 @@
             if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) ||
                (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11)
               it {
-                is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+                expect(subject).to contain_concat__fragment('rspec.example.com-directories').with(
                   content: %r{^\s+Require all granted$},
                 )
               }
@@ -2023,7 +2023,7 @@
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
 
             it {
-              is_expected.not_to contain_concat__fragment('rspec.example.com-directories').with(
+              expect(subject).not_to contain_concat__fragment('rspec.example.com-directories').with(
                 content: %r{^\s+Require all granted$},
               )
             }
@@ -2064,7 +2064,7 @@
             it { is_expected.to compile }
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-auth_oidc').with(
+              expect(subject).to contain_concat__fragment('rspec.example.com-auth_oidc').with(
                 content: %r{^\s+OIDCRedirectURI\s/some/valid/relative/uri$},
               )
             }
@@ -2096,7 +2096,7 @@
           end
 
           it {
-            is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with(
+            expect(subject).to contain_concat__fragment('rspec.example.com-apache-header').with(
               content: %r{^MDomain rspec.example.com$},
             )
           }
@@ -2112,7 +2112,7 @@
             )
 
             it {
-              is_expected.to contain_concat__fragment('rspec.example.com-apache-userdir')
+              expect(subject).to contain_concat__fragment('rspec.example.com-apache-userdir')
                 .with(content: %r{^\s+UserDir disabled$})
                 .with(content: %r{^\s+UUserDir enabled bob$})
             }

From 40c8edd2660f802fb2f86ab3fd258426d26a1008 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 13:37:35 +0100
Subject: [PATCH 2115/2267] (CONT-772) Unsage correct cop group

---
 .rubocop_todo.yml                             | 48 +------------------
 lib/puppet/functions/apache/pw_hash.rb        |  2 +-
 spec/classes/mod/authnz_ldap_spec.rb          |  4 +-
 spec/classes/mod/authnz_pam_spec.rb           |  4 +-
 .../classes/mod/intercept_form_submit_spec.rb |  4 +-
 spec/classes/mod/ldap_spec.rb                 |  4 +-
 spec/classes/mod/lookup_identity.rb           |  4 +-
 spec/classes/mod/status_spec.rb               | 15 +++---
 spec/defines/vhost_spec.rb                    |  4 +-
 spec/type_aliases/modproxy_spec.rb            |  2 +
 tasks/init.rb                                 |  2 +-
 11 files changed, 25 insertions(+), 68 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 02032729a4..14a17e6d77 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -91,7 +91,7 @@ RSpec/FilePath:
     - 'spec/classes/mod/proxy_wstunnel.rb'
 
 # Offense count: 16
-# This cop supports safe autocorrection (--autocorrect).
+# This cop supports safe autocorrection.
 RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/classes/mod/auth_kerb_spec.rb'
@@ -157,53 +157,7 @@ RSpec/StubbedMock:
   Exclude:
     - 'spec/util/apache_mod_platform_compatibility_spec.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: MinBranchesCount.
-Style/CaseLikeIf:
-  Exclude:
-    - 'spec/classes/mod/status_spec.rb'
-
-# Offense count: 12
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/CommentedKeyword:
-  Exclude:
-    - 'spec/classes/mod/authnz_ldap_spec.rb'
-    - 'spec/classes/mod/authnz_pam_spec.rb'
-    - 'spec/classes/mod/intercept_form_submit_spec.rb'
-    - 'spec/classes/mod/ldap_spec.rb'
-    - 'spec/classes/mod/lookup_identity.rb'
-    - 'spec/defines/vhost_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'spec/type_aliases/modproxy_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
-  Exclude:
-    - 'tasks/init.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Methods.
-Style/RedundantArgument:
-  Exclude:
-    - 'spec/classes/mod/status_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/puppet/functions/apache/pw_hash.rb'
diff --git a/lib/puppet/functions/apache/pw_hash.rb b/lib/puppet/functions/apache/pw_hash.rb
index c56e916b9e..6a1630b546 100644
--- a/lib/puppet/functions/apache/pw_hash.rb
+++ b/lib/puppet/functions/apache/pw_hash.rb
@@ -18,6 +18,6 @@
 
   def apache_pw_hash(password)
     require 'base64'
-    '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
+    "{SHA}#{Base64.strict_encode64(Digest::SHA1.digest(password))}"
   end
 end
diff --git a/spec/classes/mod/authnz_ldap_spec.rb b/spec/classes/mod/authnz_ldap_spec.rb
index f76ac9c4b4..f672c4a573 100644
--- a/spec/classes/mod/authnz_ldap_spec.rb
+++ b/spec/classes/mod/authnz_ldap_spec.rb
@@ -29,7 +29,7 @@
         expect(subject).to compile.and_raise_error(%r{parameter 'verify_server_cert' expects a Boolean value, got String})
       end
     end
-  end # Debian
+  end
 
   context 'default configuration with parameters on a RedHat OS' do
     on_supported_os.each do |os, os_facts|
@@ -81,5 +81,5 @@
         end
       end
     end
-  end # Redhat
+  end
 end
diff --git a/spec/classes/mod/authnz_pam_spec.rb b/spec/classes/mod/authnz_pam_spec.rb
index 6fb9a6a697..c97574878e 100644
--- a/spec/classes/mod/authnz_pam_spec.rb
+++ b/spec/classes/mod/authnz_pam_spec.rb
@@ -12,7 +12,7 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-authnz-pam') }
       it { is_expected.to contain_apache__mod('authnz_pam') }
-    end # Debian
+    end
 
     context 'on a RedHat OS' do
       include_examples 'RedHat 8'
@@ -20,6 +20,6 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_authnz_pam') }
       it { is_expected.to contain_apache__mod('authnz_pam') }
-    end # Redhat
+    end
   end
 end
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
index 1618b138e5..2e12c182b3 100644
--- a/spec/classes/mod/intercept_form_submit_spec.rb
+++ b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -12,7 +12,7 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-intercept-form-submit') }
       it { is_expected.to contain_apache__mod('intercept_form_submit') }
-    end # Debian
+    end
 
     context 'on a RedHat OS' do
       include_examples 'RedHat 8'
@@ -20,6 +20,6 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_intercept_form_submit') }
       it { is_expected.to contain_apache__mod('intercept_form_submit') }
-    end # Redhat
+    end
   end
 end
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
index 8faa1e0502..15c160d44a 100644
--- a/spec/classes/mod/ldap_spec.rb
+++ b/spec/classes/mod/ldap_spec.rb
@@ -52,7 +52,7 @@
         "</Location>\n"
       it { is_expected.to contain_file('ldap.conf').with_content(%r{#{expected_ldap_path_re}}m) }
     end
-  end # Debian
+  end
 
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
@@ -93,5 +93,5 @@
 
       it { is_expected.to contain_package('httpd24-mod_ldap') }
     end
-  end # Redhat
+  end
 end
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
index 320d1843cc..9cfeaf469d 100644
--- a/spec/classes/mod/lookup_identity.rb
+++ b/spec/classes/mod/lookup_identity.rb
@@ -12,7 +12,7 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-lookup-identity') }
       it { is_expected.to contain_apache__mod('lookup_identity') }
-    end # Debian
+    end
 
     context 'on a RedHat OS' do
       include_examples 'RedHat 8'
@@ -20,6 +20,6 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_lookup_identity') }
       it { is_expected.to contain_apache__mod('lookup_identity') }
-    end # Redhat
+    end
   end
 end
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
index ce8fd5149b..5e1a52cd2d 100644
--- a/spec/classes/mod/status_spec.rb
+++ b/spec/classes/mod/status_spec.rb
@@ -3,24 +3,25 @@
 require 'spec_helper'
 
 def require_directives(requires)
-  if requires == :undef
+  case requires
+  when :undef
     "    Require ip 127.0.0.1 ::1\n"
-  elsif requires.is_a?(String)
+  when String
     if ['', 'unmanaged'].include? requires.downcase
       ''
     else
       "    Require #{requires}\n"
     end
-  elsif requires.is_a?(Array)
-    requires.map { |req| "    Require #{req}\n" }.join('')
-  elsif requires.is_a?(Hash)
+  when Array
+    requires.map { |req| "    Require #{req}\n" }.join
+  when Hash
     if requires.key?(:enforce)
  \
       "    <Require#{requires[:enforce].capitalize}>\n" + \
-        requires[:requires].map { |req| "        Require #{req}\n" }.join('') + \
+        requires[:requires].map { |req| "        Require #{req}\n" }.join + \
         "    </Require#{requires[:enforce].capitalize}>\n"
     else
-      requires[:requires].map { |req| "    Require #{req}\n" }.join('')
+      requires[:requires].map { |req| "    Require #{req}\n" }.join
     end
   end
 end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 64872cac07..c267ef936d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -1814,7 +1814,7 @@
               )
             }
           end
-        end # access logs
+        end
 
         describe 'error logs format' do
           context 'single log format directive as a string' do
@@ -1855,7 +1855,7 @@
                 .with_content(%r{^\s+ErrorLogFormat connection "\[%\{uc\}t\] \[C:%\{c\}L\] local\\ %a remote\\ %A"$})
             }
           end
-        end # error logs format
+        end
 
         describe 'validation' do
           let(:params) do
diff --git a/spec/type_aliases/modproxy_spec.rb b/spec/type_aliases/modproxy_spec.rb
index a655e2517a..ab7c1bcf1a 100644
--- a/spec/type_aliases/modproxy_spec.rb
+++ b/spec/type_aliases/modproxy_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Apache::ModProxyProtocol' do
diff --git a/tasks/init.rb b/tasks/init.rb
index 50f96ce610..caf5b58843 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -23,7 +23,7 @@ def service(action, service_name)
   { status: "#{action} successful" }
 end
 
-params = JSON.parse(STDIN.read)
+params = JSON.parse($stdin.read)
 action = params['action']
 service_name = params['service_name']
 

From c6b6f7c6e31324e1a210cd55b6a77bfd5b9174ec Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Thu, 20 Apr 2023 15:17:02 +0100
Subject: [PATCH 2116/2267] Release prep Apache v9.1.3

Minor release before merging the Puppet 8 major update.
---
 CHANGELOG.md  | 9 +++++++++
 metadata.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30b90cf87d..db451f4a59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v9.1.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.3) - 2023-04-20
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.2...v9.1.3)
+
+### Fixed
+
+- #2391 Allow Sensitive type in addition to String type [#2392](https://github.com/puppetlabs/puppetlabs-apache/pull/2392) ([dpavlotzky](https://github.com/dpavlotzky))
+
+
 ## [v9.1.2](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.2) (2023-02-10)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.1...v9.1.2)
diff --git a/metadata.json b/metadata.json
index afd4e50622..9bc7957c24 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "9.1.2",
+  "version": "9.1.3",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 462a98eb38f52d17af3e415810ce401d8dcba677 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Fri, 21 Apr 2023 11:02:04 +0100
Subject: [PATCH 2117/2267] (CONT-772) Manual correct Style/MixinUsage

---
 .rubocop_todo.yml   | 5 -----
 spec/spec_helper.rb | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 14a17e6d77..7295fd9d68 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -156,8 +156,3 @@ RSpec/RepeatedExampleGroupDescription:
 RSpec/StubbedMock:
   Exclude:
     - 'spec/util/apache_mod_platform_compatibility_spec.rb'
-
-# Offense count: 1
-Style/MixinUsage:
-  Exclude:
-    - 'spec/spec_helper.rb'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c6e5525752..1a8b68bde8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,7 +9,7 @@
 
 require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 
-include RspecPuppetFacts
+include RspecPuppetFacts # rubocop:disable Style/MixinUsage
 
 default_facts = {
   puppetversion: Puppet.version,

From 6977122ea527a6a20bd3a91797dff6a7fd7745a0 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Fri, 21 Apr 2023 10:32:53 +0000
Subject: [PATCH 2118/2267] Release prep v10.0.0

---
 CHANGELOG.md  | 26 ++++++++++++++++----------
 REFERENCE.md  |  4 ++--
 metadata.json |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db451f4a59..8c1694139f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,21 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v9.1.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.3) - 2023-04-20
+## [v10.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v10.0.0) (2023-04-21)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.3...v10.0.0)
+
+### Changed
+
+- \(CONT-772\) Puppet 8 support / Drop Puppet 6 [\#2405](https://github.com/puppetlabs/puppetlabs-apache/pull/2405) ([LukasAud](https://github.com/LukasAud))
+
+## [v9.1.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.3) (2023-04-20)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.2...v9.1.3)
 
 ### Fixed
 
-- #2391 Allow Sensitive type in addition to String type [#2392](https://github.com/puppetlabs/puppetlabs-apache/pull/2392) ([dpavlotzky](https://github.com/dpavlotzky))
-
+- \#2391 Allow Sensitive type in addition to String type [\#2392](https://github.com/puppetlabs/puppetlabs-apache/pull/2392) ([dpavlotzky](https://github.com/dpavlotzky))
 
 ## [v9.1.2](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.2) (2023-02-10)
 
@@ -65,6 +72,10 @@ All notable changes to this project will be documented in this file. The format
 - Drop deprecated a2mod type/providers [\#2350](https://github.com/puppetlabs/puppetlabs-apache/pull/2350) ([bastelfreak](https://github.com/bastelfreak))
 - Drop Apache 2.2 support [\#2329](https://github.com/puppetlabs/puppetlabs-apache/pull/2329) ([ekohl](https://github.com/ekohl))
 
+### Fixed
+
+- fix mod\_proxy\_html on FreeBSD [\#2355](https://github.com/puppetlabs/puppetlabs-apache/pull/2355) ([fraenki](https://github.com/fraenki))
+
 ## [v8.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.6.0) (2022-12-14)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.5.0...v8.6.0)
@@ -73,10 +84,6 @@ All notable changes to this project will be documented in this file. The format
 
 - Parameterize SecRequestBodyLimitAction and SecResponseBodyLimitAction [\#2353](https://github.com/puppetlabs/puppetlabs-apache/pull/2353) ([Vincevrp](https://github.com/Vincevrp))
 
-### Fixed
-
-- fix mod\_proxy\_html on FreeBSD [\#2355](https://github.com/puppetlabs/puppetlabs-apache/pull/2355) ([fraenki](https://github.com/fraenki))
-
 ## [v8.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.5.0) (2022-12-06)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.4.0...v8.5.0)
@@ -357,6 +364,7 @@ All notable changes to this project will be documented in this file. The format
 
 - \(fix\) Convert unnecessary multi line warnings to single lines [\#2104](https://github.com/puppetlabs/puppetlabs-apache/pull/2104) ([rj667](https://github.com/rj667))
 - Fix bool2httpd function call for older ruby versions [\#2102](https://github.com/puppetlabs/puppetlabs-apache/pull/2102) ([carabasdaniel](https://github.com/carabasdaniel))
+- Use Ruby 2.7 compatible string matching [\#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
 
 ## [v5.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.7.0) (2020-11-24)
 
@@ -389,7 +397,6 @@ All notable changes to this project will be documented in this file. The format
 
 - make apache::mod::fcgid redhat 8 compatible [\#2071](https://github.com/puppetlabs/puppetlabs-apache/pull/2071) ([creativefre](https://github.com/creativefre))
 - pdksync - \(feat\) - Removal of inappropriate terminology [\#2062](https://github.com/puppetlabs/puppetlabs-apache/pull/2062) ([pmcmaw](https://github.com/pmcmaw))
-- Use Ruby 2.7 compatible string matching [\#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
 - Use python3-mod\_wsgi instead of mod\_wsgi on CentOS8 [\#2052](https://github.com/puppetlabs/puppetlabs-apache/pull/2052) ([kajinamit](https://github.com/kajinamit))
 
 ## [v5.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.5.0) (2020-07-03)
@@ -545,7 +552,6 @@ All notable changes to this project will be documented in this file. The format
 
 - \(MODULES-5990\) - conf-enabled defaulted to undef [\#1869](https://github.com/puppetlabs/puppetlabs-apache/pull/1869) ([david22swan](https://github.com/david22swan))
 - pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#1866](https://github.com/puppetlabs/puppetlabs-apache/pull/1866) ([tphoney](https://github.com/tphoney))
-- \(FM-7605\) - Disabling conf\_enabled on Ubuntu 18.04  by default as it conflicts with Shibboleth causing errors with apache2. [\#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
 
 ## [3.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.5.0) (2018-12-17)
 
@@ -560,6 +566,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
+- \(FM-7605\) - Disabling conf\_enabled on Ubuntu 18.04  by default as it conflicts with Shibboleth causing errors with apache2. [\#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
 - \(MODULES-8429\) Update GPG key for phusion passenger [\#1848](https://github.com/puppetlabs/puppetlabs-apache/pull/1848) ([abottchen](https://github.com/abottchen))
 - Fix default vhost priority in readme [\#1843](https://github.com/puppetlabs/puppetlabs-apache/pull/1843) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
 - fix apache::mod::jk example typo and add link for more info [\#1812](https://github.com/puppetlabs/puppetlabs-apache/pull/1812) ([xorpaul](https://github.com/xorpaul))
@@ -588,7 +595,6 @@ All notable changes to this project will be documented in this file. The format
 - pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1821](https://github.com/puppetlabs/puppetlabs-apache/pull/1821) ([pmcmaw](https://github.com/pmcmaw))
 - Add support for ProxyTimeout [\#1805](https://github.com/puppetlabs/puppetlabs-apache/pull/1805) ([agoodno](https://github.com/agoodno))
 - \(MODULES-7343\) - Allow overrides by adding mod\_libs in apache class [\#1800](https://github.com/puppetlabs/puppetlabs-apache/pull/1800) ([karelyatin](https://github.com/karelyatin))
-- Rework passenger VHost and Directories [\#1778](https://github.com/puppetlabs/puppetlabs-apache/pull/1778) ([smortex](https://github.com/smortex))
 
 ### Fixed
 
diff --git a/REFERENCE.md b/REFERENCE.md
index fd8b28a19b..517d707b54 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6665,7 +6665,7 @@ Installs and configures `mod_status`.
 ```puppet
 # Simple usage allowing access from localhost and a private subnet
 class { 'apache::mod::status':
-  $requires => 'ip 127.0.0.1 ::1 10.10.10.10/24',
+  requires => 'ip 127.0.0.1 ::1 10.10.10.10/24',
 }
 ```
 
@@ -7281,7 +7281,7 @@ Default value: `$apache::confd_dir`
 
 ##### <a name="-apache--custom_config--content"></a>`content`
 
-Data type: `Optional[String]`
+Data type: `Optional[Variant[Sensitive, String]]`
 
 Sets the configuration file's content. The `content` and `source` parameters are exclusive
 of each other.
diff --git a/metadata.json b/metadata.json
index 94af5b9602..bceb5aba40 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "9.1.3",
+  "version": "10.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From bb215d0900e778796f9307a5f960db4f58c9ec94 Mon Sep 17 00:00:00 2001
From: Georgi Georgiev <georgi.georgiev@japannext.co.jp>
Date: Fri, 14 Apr 2023 17:59:57 +0900
Subject: [PATCH 2119/2267] Add the missing mod_authnz_ldap parameters

This is the full list from https://httpd.apache.org/docs/2.4/mod/mod_authnz_ldap.html

Following the current style of CamelCase -> snake_case
---
 templates/vhost/_directories.erb | 60 ++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index b63b7ff49f..f4eb945042 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -305,6 +305,66 @@
     <%- if directory['auth_ldap_group_attribute_is_dn'] == 'on' -%>
     AuthLDAPGroupAttributeIsDN On
     <%- end -%>
+    <%- if directory['auth_ldap_initial_bind_pattern'] -%>
+    AuthLDAPInitialBindPattern <%= directory['auth_ldap_initial_bind_pattern'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_bind_as_user'] == 'off' -%>
+    AuthLDAPInitialBindAsUser Off
+    <%- end -%>
+    <%- if directory['auth_ldap_bind_as_user'] == 'on' -%>
+    AuthLDAPInitialBindAsUser On
+    <%- end -%>
+    <%- if directory['auth_ldap_compare_as_user'] == 'off' -%>
+    AuthLDAPCompareAsUser Off
+    <%- end -%>
+    <%- if directory['auth_ldap_compare_as_user'] == 'on' -%>
+    AuthLDAPCompareAsUser On
+    <%- end -%>
+    <%- if directory['auth_ldap_search_as_user'] == 'off' -%>
+    AuthLDAPSearchAsUser Off
+    <%- end -%>
+    <%- if directory['auth_ldap_search_as_user'] == 'on' -%>
+    AuthLDAPSearchAsUser On
+    <%- end -%>
+    <%- if directory['auth_ldap_bind_authoritative'] == 'off' -%>
+    AuthLDAPBindAuthoritative Off
+    <%- end -%>
+    <%- if directory['auth_ldap_bind_authoritative'] == 'on' -%>
+    AuthLDAPBindAuthoritative On
+    <%- end -%>
+    <%- if directory['auth_ldap_authorize_prefix'] -%>
+    AuthLDAPAuthorizePrefix <%= directory['auth_ldap_authorize_prefix'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_charset_config'] -%>
+    AuthLDAPCharsetConfig <%= directory['auth_ldap_charset_config'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_compare_dn_on_server'] == 'off' -%>
+    AuthLDAPCompareDNOnServer Off
+    <%- end -%>
+    <%- if directory['auth_ldap_compare_dn_on_server'] == 'on' -%>
+    AuthLDAPCompareDNOnServer On
+    <%- end -%>
+    <%- if directory['auth_ldap_dereference_aliases'] -%>
+    AuthLDAPDereferenceAliases <%= directory['auth_ldap_dereference_aliases'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_max_sub_group_depth'] -%>
+    AuthLDAPMaxSubGroupDepth <%= directory['auth_ldap_max_sub_group_depth'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_remote_user_attribute'] -%>
+    AuthLDAPRemoteUserAttribute <%= directory['auth_ldap_remote_user_attribute'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_remote_user_is_dn'] == 'off' -%>
+    AuthLDAPRemoteUserIsDN Off
+    <%- end -%>
+    <%- if directory['auth_ldap_remote_user_is_dn'] == 'on' -%>
+    AuthLDAPRemoteUserIsDN On
+    <%- end -%>
+    <%- if directory['auth_ldap_sub_group_attribute'] -%>
+    AuthLDAPSubGroupAttribute <%= directory['auth_ldap_sub_group_attribute'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_sub_group_class'] -%>
+    AuthLDAPSubGroupClass <%= directory['auth_ldap_sub_group_class'] %>
+    <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>
     <%- end -%>

From c99d969a45ac10911270c97a72a2c20ec5ede603 Mon Sep 17 00:00:00 2001
From: Georgi Georgiev <georgi.georgiev@japannext.co.jp>
Date: Thu, 20 Apr 2023 15:03:02 +0900
Subject: [PATCH 2120/2267] Simplify the syntax for boolean arguments

As suggested by @ekohl during review.
---
 templates/vhost/_directories.erb | 49 +++++++++-----------------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index f4eb945042..7447e48e1b 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -299,38 +299,23 @@
     AuthLDAPGroupAttribute <%= groupattr %>
       <%- end -%>
     <%- end -%>
-    <%- if directory['auth_ldap_group_attribute_is_dn'] == 'off' -%>
-    AuthLDAPGroupAttributeIsDN Off
-    <%- end -%>
-    <%- if directory['auth_ldap_group_attribute_is_dn'] == 'on' -%>
-    AuthLDAPGroupAttributeIsDN On
+    <%- unless directory['auth_ldap_group_attribute_is_dn'].nil? -%>
+    AuthLDAPGroupAttributeIsDN <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_group_attribute_is_dn'] ]) %>
     <%- end -%>
     <%- if directory['auth_ldap_initial_bind_pattern'] -%>
     AuthLDAPInitialBindPattern <%= directory['auth_ldap_initial_bind_pattern'] %>
     <%- end -%>
-    <%- if directory['auth_ldap_bind_as_user'] == 'off' -%>
-    AuthLDAPInitialBindAsUser Off
-    <%- end -%>
-    <%- if directory['auth_ldap_bind_as_user'] == 'on' -%>
-    AuthLDAPInitialBindAsUser On
-    <%- end -%>
-    <%- if directory['auth_ldap_compare_as_user'] == 'off' -%>
-    AuthLDAPCompareAsUser Off
-    <%- end -%>
-    <%- if directory['auth_ldap_compare_as_user'] == 'on' -%>
-    AuthLDAPCompareAsUser On
+    <%- unless directory['auth_ldap_bind_as_user'].nil? -%>
+    AuthLDAPInitialBindAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_bind_as_user'] ]) %>
     <%- end -%>
-    <%- if directory['auth_ldap_search_as_user'] == 'off' -%>
-    AuthLDAPSearchAsUser Off
+    <%- unless directory['auth_ldap_compare_as_user'].nil? -%>
+    AuthLDAPCompareAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_compare_as_user'] ]) %>
     <%- end -%>
-    <%- if directory['auth_ldap_search_as_user'] == 'on' -%>
-    AuthLDAPSearchAsUser On
+    <%- unless directory['auth_ldap_search_as_user'].nil? -%>
+    AuthLDAPSearchAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_search_as_user'] ]) %>
     <%- end -%>
-    <%- if directory['auth_ldap_bind_authoritative'] == 'off' -%>
-    AuthLDAPBindAuthoritative Off
-    <%- end -%>
-    <%- if directory['auth_ldap_bind_authoritative'] == 'on' -%>
-    AuthLDAPBindAuthoritative On
+    <%- unless directory['auth_ldap_bind_authoritative'].nil? -%>
+    AuthLDAPBindAuthoritative <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_bind_authoritative'] ]) %>
     <%- end -%>
     <%- if directory['auth_ldap_authorize_prefix'] -%>
     AuthLDAPAuthorizePrefix <%= directory['auth_ldap_authorize_prefix'] %>
@@ -338,11 +323,8 @@
     <%- if directory['auth_ldap_charset_config'] -%>
     AuthLDAPCharsetConfig <%= directory['auth_ldap_charset_config'] %>
     <%- end -%>
-    <%- if directory['auth_ldap_compare_dn_on_server'] == 'off' -%>
-    AuthLDAPCompareDNOnServer Off
-    <%- end -%>
-    <%- if directory['auth_ldap_compare_dn_on_server'] == 'on' -%>
-    AuthLDAPCompareDNOnServer On
+    <%- unless directory['auth_ldap_compare_dn_on_server'].nil? -%>
+    AuthLDAPCompareDNOnServer <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_compare_dn_on_server'] ]) %>
     <%- end -%>
     <%- if directory['auth_ldap_dereference_aliases'] -%>
     AuthLDAPDereferenceAliases <%= directory['auth_ldap_dereference_aliases'] %>
@@ -353,11 +335,8 @@
     <%- if directory['auth_ldap_remote_user_attribute'] -%>
     AuthLDAPRemoteUserAttribute <%= directory['auth_ldap_remote_user_attribute'] %>
     <%- end -%>
-    <%- if directory['auth_ldap_remote_user_is_dn'] == 'off' -%>
-    AuthLDAPRemoteUserIsDN Off
-    <%- end -%>
-    <%- if directory['auth_ldap_remote_user_is_dn'] == 'on' -%>
-    AuthLDAPRemoteUserIsDN On
+    <%- unless directory['auth_ldap_remote_user_is_dn'].nil? -%>
+    AuthLDAPRemoteUserIsDN <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_remote_user_is_dn'] ]) %>
     <%- end -%>
     <%- if directory['auth_ldap_sub_group_attribute'] -%>
     AuthLDAPSubGroupAttribute <%= directory['auth_ldap_sub_group_attribute'] %>

From 8c8e529bc402331c8b14ae87fe3b43dcd5f4351c Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Wed, 26 Apr 2023 20:20:19 +0200
Subject: [PATCH 2121/2267] Remove has_key usage

In the next puppetlabs-stdlib major version this function will be dropped.
Native Puppet is used instead.

https://github.com/puppetlabs/puppetlabs-stdlib/pull/1319 broke this
---
 manifests/mod.pp     | 4 ++--
 manifests/mod/jk.pp  | 2 +-
 manifests/mod/php.pp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/mod.pp b/manifests/mod.pp
index 92fbc9528e..9c9b26c39c 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -54,7 +54,7 @@
   $mod_libs = $apache::mod_libs
   if $lib {
     $_lib = $lib
-  } elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack
+  } elsif $mod in $mod_libs { # 2.6 compatibility hack
     $_lib = $mod_libs[$mod]
   } else {
     $_lib = "mod_${mod}.so"
@@ -83,7 +83,7 @@
   $mod_packages = $apache::mod_packages
   if $package {
     $_package = $package
-  } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
+  } elsif $mod in $mod_packages { # 2.6 compatibility hack
     $_package = $mod_packages[$mod]
   } else {
     $_package = undef
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index a169b366f5..b288fe64c0 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -329,7 +329,7 @@
 
   # Ensure that we are not using variables with the typo fixed by MODULES-6225
   # anymore:
-  if !empty($workers_file_content) and has_key($workers_file_content, 'worker_mantain') {
+  if !empty($workers_file_content) and 'worker_mantain' in $workers_file_content {
     fail('Please replace $workers_file_content[\'worker_mantain\'] by $workers_file_content[\'worker_maintain\']. See MODULES-6225 for details.')
   }
 
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 1f5f241eb0..940e7b30d1 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -81,9 +81,9 @@
   $mod_packages = $apache::mod_packages
   if $package_name {
     $_package_name = $package_name
-  } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
+  } elsif $mod in $mod_packages { # 2.6 compatibility hack
     $_package_name = $mod_packages[$mod]
-  } elsif has_key($mod_packages, 'phpXXX') { # 2.6 compatibility hack
+  } elsif 'phpXXX' in $mod_packages { # 2.6 compatibility hack
     $_package_name = regsubst($mod_packages['phpXXX'], 'XXX', $php_version)
   } else {
     $_package_name = undef

From 500c65747aa37c6b1830ccd158333ee552b9da95 Mon Sep 17 00:00:00 2001
From: jordanbreen28 <jordan.breen@perforce.com>
Date: Mon, 15 May 2023 14:17:42 +0100
Subject: [PATCH 2122/2267] (CONT-930) - Roll out new changelog generator

---
 .github/workflows/auto_release.yml |  9 ---------
 .github/workflows/release_prep.yml | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 .github/workflows/auto_release.yml
 create mode 100644 .github/workflows/release_prep.yml

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
deleted file mode 100644
index d6270c56fe..0000000000
--- a/.github/workflows/auto_release.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: "Auto release"
-
-on:
-  workflow_dispatch:
-
-jobs:
-  release_prep:
-    uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
-    secrets: "inherit"
diff --git a/.github/workflows/release_prep.yml b/.github/workflows/release_prep.yml
new file mode 100644
index 0000000000..bb0b7acce1
--- /dev/null
+++ b/.github/workflows/release_prep.yml
@@ -0,0 +1,15 @@
+name: "Release Prep"
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Module version to be released. Must be a valid semver string. (1.2.3)"
+        required: true
+
+jobs:
+  release_prep:
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
+    with:
+      version: "${{ github.event.inputs.version }}"
+    secrets: "inherit"

From f3f60ed16e360379039fc8bf529af6e8e22b2801 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Tue, 23 May 2023 16:16:22 +0530
Subject: [PATCH 2123/2267] (CONT-1001) Add litmus ~> 1.0

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7fad5040d0..ea113b0c78 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ group :development do
   gem "github_changelog_generator", '= 1.15.2',    require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
+  gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
   gem "serverspec", '~> 2.41',    require: false
 end
 

From 068fe84b64de6685db5582ec4bda84124598b7cd Mon Sep 17 00:00:00 2001
From: chrisongthb <chri.s@mailbox.org>
Date: Wed, 12 Apr 2023 15:22:15 +0200
Subject: [PATCH 2124/2267] Add required package for kerberos auth on jammy

---
 manifests/params.pp | 127 ++++++++++++++++++++++++++------------------
 1 file changed, 76 insertions(+), 51 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index fbdeb0401e..a34f4f1851 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -317,60 +317,85 @@
       '22.04' => '8.1', # Ubuntu Jammy
       default => '7.2', # Ubuntu Bionic, Cosmic and Disco
     }
-    if (($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22.04') < 0) or
-    ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') < 0)) {
-      $mod_packages = {
-        'apreq2'                => 'libapache2-mod-apreq2',
-        'auth_cas'              => 'libapache2-mod-auth-cas',
-        'auth_kerb'             => 'libapache2-mod-auth-kerb',
-        'auth_openidc'          => 'libapache2-mod-auth-openidc',
-        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
-        'auth_mellon'           => 'libapache2-mod-auth-mellon',
-        'authnz_pam'            => 'libapache2-mod-authnz-pam',
-        'dav_svn'               => 'libapache2-mod-svn',
-        'fcgid'                 => 'libapache2-mod-fcgid',
-        'geoip'                 => 'libapache2-mod-geoip',
-        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
-        'jk'                    => 'libapache2-mod-jk',
-        'lookup_identity'       => 'libapache2-mod-lookup-identity',
-        'nss'                   => 'libapache2-mod-nss',
-        'pagespeed'             => 'mod-pagespeed-stable',
-        'passenger'             => 'libapache2-mod-passenger',
-        'perl'                  => 'libapache2-mod-perl2',
-        'phpXXX'                => 'libapache2-mod-phpXXX',
-        'python'                => 'libapache2-mod-python',
-        'rpaf'                  => 'libapache2-mod-rpaf',
-        'security'              => 'libapache2-mod-security2',
-        'shib2'                 => 'libapache2-mod-shib2',
-        'wsgi'                  => 'libapache2-mod-wsgi',
-        'xsendfile'             => 'libapache2-mod-xsendfile',
+    $_base_mod_packages = {
+      'apreq2'                => 'libapache2-mod-apreq2',
+      'auth_cas'              => 'libapache2-mod-auth-cas',
+      'auth_openidc'          => 'libapache2-mod-auth-openidc',
+      'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
+      'auth_mellon'           => 'libapache2-mod-auth-mellon',
+      'authnz_pam'            => 'libapache2-mod-authnz-pam',
+      'dav_svn'               => 'libapache2-mod-svn',
+      'fcgid'                 => 'libapache2-mod-fcgid',
+      'geoip'                 => 'libapache2-mod-geoip',
+      'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
+      'jk'                    => 'libapache2-mod-jk',
+      'lookup_identity'       => 'libapache2-mod-lookup-identity',
+      'pagespeed'             => 'mod-pagespeed-stable',
+      'passenger'             => 'libapache2-mod-passenger',
+      'perl'                  => 'libapache2-mod-perl2',
+      'phpXXX'                => 'libapache2-mod-phpXXX',
+      'python'                => 'libapache2-mod-python',
+      'rpaf'                  => 'libapache2-mod-rpaf',
+      'security'              => 'libapache2-mod-security2',
+      'xsendfile'             => 'libapache2-mod-xsendfile',
+    }
+    $_os_mod_packages = case $facts['os']['name'] {
+      'Debian': {
+        case $facts['os']['release']['major'] {
+          '9': {
+            {
+              'auth_kerb' => 'libapache2-mod-auth-kerb',
+              'nss'       => 'libapache2-mod-nss',
+              'shib2'     => 'libapache2-mod-shib2',
+              'wsgi'      => 'libapache2-mod-wsgi',
+            }
+          }
+          '10': {
+            {
+              'auth_kerb' => 'libapache2-mod-auth-kerb',
+              'shib2'     => 'libapache2-mod-shib2',
+              'wsgi'      => 'libapache2-mod-wsgi',
+            }
+          }
+          default: {
+            {
+              'shib2' => 'libapache2-mod-shib',
+              'wsgi'  => 'libapache2-mod-wsgi-py3',
+            }
+          }
+        }
       }
-    } else {
-      $mod_packages = {
-        'apreq2'                => 'libapache2-mod-apreq2',
-        'auth_cas'              => 'libapache2-mod-auth-cas',
-        'auth_openidc'          => 'libapache2-mod-auth-openidc',
-        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
-        'auth_mellon'           => 'libapache2-mod-auth-mellon',
-        'authnz_pam'            => 'libapache2-mod-authnz-pam',
-        'dav_svn'               => 'libapache2-mod-svn',
-        'fcgid'                 => 'libapache2-mod-fcgid',
-        'geoip'                 => 'libapache2-mod-geoip',
-        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
-        'jk'                    => 'libapache2-mod-jk',
-        'lookup_identity'       => 'libapache2-mod-lookup-identity',
-        'pagespeed'             => 'mod-pagespeed-stable',
-        'passenger'             => 'libapache2-mod-passenger',
-        'perl'                  => 'libapache2-mod-perl2',
-        'phpXXX'                => 'libapache2-mod-phpXXX',
-        'python'                => 'libapache2-mod-python',
-        'rpaf'                  => 'libapache2-mod-rpaf',
-        'security'              => 'libapache2-mod-security2',
-        'shib2'                 => 'libapache2-mod-shib',
-        'wsgi'                  => 'libapache2-mod-wsgi-py3',
-        'xsendfile'             => 'libapache2-mod-xsendfile',
+      'Ubuntu': {
+        case $facts['os']['release']['major'] {
+          '18.04': {
+            {
+              'auth_kerb' => 'libapache2-mod-auth-kerb',
+              'nss'       => 'libapache2-mod-nss',
+              'shib2'     => 'libapache2-mod-shib2',
+              'wsgi'      => 'libapache2-mod-wsgi',
+            }
+          }
+          '20.04': {
+            {
+              'auth_kerb' => 'libapache2-mod-auth-kerb',
+              'shib2'     => 'libapache2-mod-shib2',
+              'wsgi'      => 'libapache2-mod-wsgi',
+            }
+          }
+          default: {
+            {
+              'auth_kerb' => 'libapache2-mod-auth-kerb',
+              'shib2'     => 'libapache2-mod-shib',
+              'wsgi'      => 'libapache2-mod-wsgi-py3',
+            }
+          }
+        }
+      }
+      default: {
+        {}
       }
     }
+    $mod_packages = $_base_mod_packages + $_os_mod_packages
 
     $error_log           = 'error.log'
     $scriptalias         = '/usr/lib/cgi-bin'

From e82440f545eef0cfe6d9eeabcb3dfd22a0cecda4 Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Tue, 30 May 2023 17:13:13 +0100
Subject: [PATCH 2125/2267] (CONT-1028) - Update Stdlib upper limit dependency

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index bceb5aba40..d3b6b7f1f1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 9.0.0"
+      "version_requirement": ">= 4.13.1 < 10.0.0"
     },
     {
       "name": "puppetlabs/concat",

From 1200a0bfbf029225d224edd3a8f76e959611eedd Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Thu, 8 Jun 2023 18:31:48 +0530
Subject: [PATCH 2126/2267] (CONT-577) - allow deferred function for
 password/secret

---
 manifests/vhost.pp             | 18 ++++++++++++++++--
 templates/vhost/_auth_kerb.epp | 32 ++++++++++++++++++++++++++++++++
 templates/vhost/_auth_kerb.erb | 32 --------------------------------
 templates/vhost/_auth_oidc.epp |  5 +++++
 templates/vhost/_auth_oidc.erb |  5 -----
 5 files changed, 53 insertions(+), 39 deletions(-)
 create mode 100644 templates/vhost/_auth_kerb.epp
 delete mode 100644 templates/vhost/_auth_kerb.erb
 create mode 100644 templates/vhost/_auth_oidc.epp
 delete mode 100644 templates/vhost/_auth_oidc.erb

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index f598fb3ffd..af172bcba9 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2604,7 +2604,18 @@
     concat::fragment { "${name}-auth_kerb":
       target  => "${priority_real}${filename}.conf",
       order   => 230,
-      content => template('apache/vhost/_auth_kerb.erb'),
+      content => stdlib::deferrable_epp('apache/vhost/_auth_kerb.epp', {
+          'auth_kerb'              => $auth_kerb,
+          'krb_method_negotiate'   => $krb_method_negotiate,
+          'krb_method_k5passwd'    => Deferred('sprintf', [$krb_method_k5passwd]),
+          'krb_authoritative'      => $krb_authoritative,
+          'krb_auth_realms'        => $krb_auth_realms,
+          'krb_5keytab'            => $krb_5keytab,
+          'krb_local_user_mapping' => $krb_local_user_mapping,
+          'krb_verify_kdc'         => $krb_verify_kdc,
+          'krb_servicename'        => $krb_servicename,
+          'krb_save_credentials'   => $krb_save_credentials,
+      }),
     }
   }
 
@@ -2849,7 +2860,10 @@
     concat::fragment { "${name}-auth_oidc":
       target  => "${priority_real}${filename}.conf",
       order   => 360,
-      content => template('apache/vhost/_auth_oidc.erb'),
+      content => stdlib::deferrable_epp('apache/vhost/_auth_oidc.epp', {
+          'auth_oidc'     => $auth_oidc,
+          'oidc_settings' => $oidc_settings,
+      }),
     }
   }
 
diff --git a/templates/vhost/_auth_kerb.epp b/templates/vhost/_auth_kerb.epp
new file mode 100644
index 0000000000..e77dcc6a16
--- /dev/null
+++ b/templates/vhost/_auth_kerb.epp
@@ -0,0 +1,32 @@
+<% if $auth_kerb { -%>
+
+  ## Kerberos directives
+  <%- if $krb_method_negotiate { -%>
+  KrbMethodNegotiate <%= $krb_method_negotiate %>
+  <%- } -%>
+  <%- if $krb_method_k5passwd { -%>
+  KrbMethodK5Passwd <%= $krb_method_k5passwd %>
+  <%- } -%>
+  <%- if $krb_authoritative { -%>
+  KrbAuthoritative <%= $krb_authoritative %>
+  <%- } -%>
+  <%- if $krb_auth_realms and $krb_auth_realms.length >= 1 { -%>
+  KrbAuthRealms <%= $krb_auth_realms.join(' ') %>
+  <%- } -%>
+  <%- if $krb_5keytab { -%>
+  Krb5Keytab <%= $krb_5keytab %>
+  <%- } -%>
+  <%- if $krb_local_user_mapping { -%>
+  KrbLocalUserMapping <%= $krb_local_user_mapping %>
+  <%- } -%>
+  <%- if $krb_verify_kdc { -%>
+  KrbVerifyKDC <%= $krb_verify_kdc %>
+  <%- } -%>
+  <%- if $krb_servicename { -%>
+  KrbServiceName <%= $krb_servicename %>
+  <%- } -%>
+  <%- if $krb_save_credentials { -%>
+  KrbSaveCredentials <%= $krb_save_credentials -%>
+  <%- } -%>
+
+<% } -%>
diff --git a/templates/vhost/_auth_kerb.erb b/templates/vhost/_auth_kerb.erb
deleted file mode 100644
index 97f4c1fc69..0000000000
--- a/templates/vhost/_auth_kerb.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<% if @auth_kerb -%>
-
-  ## Kerberos directives
-  <%- if @krb_method_negotiate -%>
-  KrbMethodNegotiate <%= @krb_method_negotiate %>
-  <%- end -%>
-  <%- if @krb_method_k5passwd -%>
-  KrbMethodK5Passwd <%= @krb_method_k5passwd %>
-  <%- end -%>
-  <%- if @krb_authoritative -%>
-  KrbAuthoritative <%= @krb_authoritative %>
-  <%- end -%>
-  <%- if @krb_auth_realms and @krb_auth_realms.length >= 1 -%>
-  KrbAuthRealms <%= @krb_auth_realms.join(' ') %>
-  <%- end -%>
-  <%- if @krb_5keytab -%>
-  Krb5Keytab <%= @krb_5keytab %>
-  <%- end -%>
-  <%- if @krb_local_user_mapping -%>
-  KrbLocalUserMapping <%= @krb_local_user_mapping %>
-  <%- end -%>
-  <%- if @krb_verify_kdc -%>
-  KrbVerifyKDC <%= @krb_verify_kdc %>
-  <%- end -%>
-  <%- if @krb_servicename -%>
-  KrbServiceName <%= @krb_servicename %>
-  <%- end -%>
-  <%- if @krb_save_credentials -%>
-  KrbSaveCredentials <%= @krb_save_credentials -%>
-  <%- end -%>
-
-<% end -%>
diff --git a/templates/vhost/_auth_oidc.epp b/templates/vhost/_auth_oidc.epp
new file mode 100644
index 0000000000..94a7b8c97a
--- /dev/null
+++ b/templates/vhost/_auth_oidc.epp
@@ -0,0 +1,5 @@
+<% if $auth_oidc { -%>
+<% $oidc_settings.map |Any $key, Any $value| { %>
+  OIDC<%= $key %> <% if $key == 'Scope' { -%>"<%= $value -%>"<% } else { -%><%= $value -%><% }-%>
+<% } %>
+<% } -%>
diff --git a/templates/vhost/_auth_oidc.erb b/templates/vhost/_auth_oidc.erb
deleted file mode 100644
index 196e172c1d..0000000000
--- a/templates/vhost/_auth_oidc.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if @auth_oidc -%>
-<% @oidc_settings.each do |key, value| %>
-  OIDC<%= key %> <% if key == 'Scope' -%>"<%= value -%>"<% else -%><%= value -%><% end-%>
-<% end %>
-<% end -%>

From 27630721437293d10da225497df76a24138d8862 Mon Sep 17 00:00:00 2001
From: Ben Ford <ben.ford@puppetlabs.com>
Date: Tue, 30 May 2023 14:28:57 -0700
Subject: [PATCH 2127/2267] Update CODEOWNERS

Adding Trusted Contributors to the CODEOWNERS will allow them to meet our branch protection rules and merge pull requests. If you would rather keep that privilege for your own team, then you can decline this PR.
---
 CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index a5d109e998..08a57dbb42 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
 # Setting ownership to the modules team
-* @puppetlabs/modules
+* @puppetlabs/modules @bastelfreak @ekohl @smortex

From 59fb882c81070bf6bd00fb7b317cc7274b64f70c Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Mon, 5 Jun 2023 12:37:27 +0200
Subject: [PATCH 2128/2267] use a dedicated Enum type for On/Off and accept
 lower case too

---
 manifests/init.pp           | 16 ++++++++--------
 manifests/mod/dumpio.pp     |  4 ++--
 manifests/mod/md.pp         | 12 ++++++------
 manifests/mod/passenger.pp  | 32 ++++++++++++++++----------------
 manifests/mod/peruser.pp    |  2 +-
 manifests/mod/security.pp   |  4 ++--
 manifests/mod/ssl.pp        |  4 +++-
 manifests/mod/status.pp     |  2 +-
 manifests/vhost.pp          | 32 ++++++++++++++++----------------
 spec/classes/apache_spec.rb |  2 +-
 types/onoff.pp              |  2 ++
 11 files changed, 58 insertions(+), 54 deletions(-)
 create mode 100644 types/onoff.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index b230bdb789..582b4ddac9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -483,8 +483,8 @@
   Optional[Boolean] $purge_vhost_dir                                         = undef,
   Boolean $purge_vdir                                                        = false,
   Optional[String[1]] $serveradmin                                           = undef,
-  Enum['On', 'Off', 'on', 'off'] $sendfile                                   = 'On',
-  Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert          = undef,
+  Apache::OnOff $sendfile                                                    = 'On',
+  Optional[Apache::OnOff] $ldap_verify_server_cert                           = undef,
   Optional[String] $ldap_trusted_mode                                        = undef,
   Boolean $error_documents                                                   = false,
   Integer[0] $timeout                                                        = 60,
@@ -492,7 +492,7 @@
   Stdlib::Absolutepath $server_root                                          = $apache::params::server_root,
   Stdlib::Absolutepath $conf_dir                                             = $apache::params::conf_dir,
   Stdlib::Absolutepath $confd_dir                                            = $apache::params::confd_dir,
-  Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups       = $apache::params::hostname_lookups,
+  Variant[Apache::OnOff, Enum['Double', 'double']] $hostname_lookups         = $apache::params::hostname_lookups,
   Optional[Stdlib::Absolutepath] $conf_enabled                               = $apache::params::conf_enabled,
   Stdlib::Absolutepath $vhost_dir                                            = $apache::params::vhost_dir,
   Optional[Stdlib::Absolutepath] $vhost_enable_dir                           = $apache::params::vhost_enable_dir,
@@ -513,7 +513,7 @@
   String $group                                                              = $apache::params::group,
   Optional[String] $http_protocol_options                                    = $apache::params::http_protocol_options,
   Array $supplementary_groups                                                = [],
-  Enum['On', 'Off'] $keepalive                                               = $apache::params::keepalive,
+  Apache::OnOff $keepalive                                                   = $apache::params::keepalive,
   Integer $keepalive_timeout                                                 = $apache::params::keepalive_timeout,
   Integer $max_keepalive_requests                                            = $apache::params::max_keepalive_requests,
   Integer $limitreqfieldsize                                                 = 8190,
@@ -527,11 +527,11 @@
   Stdlib::Absolutepath $ports_file                                           = $apache::params::ports_file,
   Stdlib::Absolutepath $docroot                                              = $apache::params::docroot,
   Apache::ServerTokens $server_tokens                                        = 'Prod',
-  Variant[Enum['On', 'Off'], String] $server_signature                       = 'On',
-  Enum['On', 'Off', 'extended'] $trace_enable                                = 'On',
-  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes             = undef,
+  Variant[Apache::OnOff, String] $server_signature                           = 'On',
+  Variant[Apache::OnOff, Enum['extended']] $trace_enable                     = 'On',
+  Optional[Variant[Apache::OnOff, Enum['nodecode']]] $allow_encoded_slashes  = undef,
   Optional[String] $file_e_tag                                               = undef,
-  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name = undef,
+  Optional[Variant[Apache::OnOff, Enum['DNS', 'dns']]] $use_canonical_name   = undef,
   String $package_ensure                                                     = 'installed',
   Boolean $use_optional_includes                                             = $apache::params::use_optional_includes,
   Boolean $use_systemd                                                       = $apache::params::use_systemd,
diff --git a/manifests/mod/dumpio.pp b/manifests/mod/dumpio.pp
index df892a919e..4246356822 100644
--- a/manifests/mod/dumpio.pp
+++ b/manifests/mod/dumpio.pp
@@ -20,8 +20,8 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_dumpio.html for additional documentation.
 #
 class apache::mod::dumpio (
-  Enum['Off', 'On', 'off', 'on'] $dump_io_input  = 'Off',
-  Enum['Off', 'On', 'off', 'on'] $dump_io_output = 'Off',
+  Apache::OnOff $dump_io_input  = 'Off',
+  Apache::OnOff $dump_io_output = 'Off',
 ) {
   include apache
 
diff --git a/manifests/mod/md.pp b/manifests/mod/md.pp
index d8847ed67f..d51e5b8c41 100644
--- a/manifests/mod/md.pp
+++ b/manifests/mod/md.pp
@@ -94,29 +94,29 @@
 # @note Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
 class apache::mod::md (
   Optional[String]                                          $md_activation_delay       = undef,
-  Optional[Enum['on', 'off']]                               $md_base_server            = undef,
+  Optional[Apache::OnOff]                                   $md_base_server            = undef,
   Optional[Array[Enum['dns-01', 'http-01', 'tls-alpn-01']]] $md_ca_challenges          = undef,
   Optional[Enum['accepted']]                                $md_certificate_agreement  = undef,
   Optional[Stdlib::HTTPUrl]                                 $md_certificate_authority  = undef,
   Optional[String]                                          $md_certificate_check      = undef, # undocumented
   Optional[String]                                          $md_certificate_monitor    = undef,
   Optional[Enum['ACME']]                                    $md_certificate_protocol   = undef,
-  Optional[Enum['on', 'off']]                               $md_certificate_status     = undef,
+  Optional[Apache::OnOff]                                   $md_certificate_status     = undef,
   Optional[Stdlib::Absolutepath]                            $md_challenge_dns01        = undef,
   Optional[String]                                          $md_contact_email          = undef,
   Optional[Stdlib::HTTPUrl]                                 $md_http_proxy             = undef,
   Optional[Enum['auto', 'manual']]                          $md_members                = undef,
   Optional[Stdlib::Absolutepath]                            $md_message_cmd            = undef,
-  Optional[Enum['on', 'off']]                               $md_must_staple            = undef,
+  Optional[Apache::OnOff]                                   $md_must_staple            = undef,
   Optional[Stdlib::Absolutepath]                            $md_notify_cmd             = undef,
   Optional[String]                                          $md_port_map               = undef,
   Optional[String]                                          $md_private_keys           = undef,
   Optional[Enum['always', 'auto', 'manual']]                $md_renew_mode             = undef,
   Optional[String]                                          $md_renew_window           = undef,
   Optional[Enum['off', 'permanent', 'temporary']]           $md_require_https          = undef,
-  Optional[Enum['on', 'off']]                               $md_server_status          = undef,
-  Optional[Enum['on', 'off']]                               $md_staple_others          = undef,
-  Optional[Enum['on', 'off']]                               $md_stapling               = undef,
+  Optional[Apache::OnOff]                                   $md_server_status          = undef,
+  Optional[Apache::OnOff]                                   $md_staple_others          = undef,
+  Optional[Apache::OnOff]                                   $md_stapling               = undef,
   Optional[String]                                          $md_stapling_keep_response = undef,
   Optional[String]                                          $md_stapling_renew_window  = undef,
   Optional[Stdlib::Absolutepath]                            $md_store_dir              = undef,
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 1b0047ed90..eca8c0e0d4 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -329,38 +329,38 @@
   Optional[String] $mod_package                                                              = undef,
   Optional[String] $mod_package_ensure                                                       = undef,
   Optional[String] $mod_path                                                                 = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_allow_encoded_slashes                  = undef,
+  Optional[Apache::OnOff] $passenger_allow_encoded_slashes                                   = undef,
   Optional[String] $passenger_anonymous_telemetry_proxy                                      = undef,
   Optional[String] $passenger_app_env                                                        = undef,
   Optional[String] $passenger_app_group_name                                                 = undef,
   Optional[String] $passenger_app_root                                                       = undef,
   Optional[String] $passenger_app_type                                                       = undef,
   Optional[String] $passenger_base_uri                                                       = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_buffer_response                        = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_buffer_upload                          = undef,
+  Optional[Apache::OnOff] $passenger_buffer_response                                         = undef,
+  Optional[Apache::OnOff] $passenger_buffer_upload                                           = undef,
   Optional[String] $passenger_concurrency_model                                              = undef,
   String $passenger_conf_file                                                                = $apache::params::passenger_conf_file,
   Optional[String] $passenger_conf_package_file                                              = $apache::params::passenger_conf_package_file,
   Optional[Stdlib::Absolutepath] $passenger_data_buffer_dir                                  = undef,
   Optional[String] $passenger_debug_log_file                                                 = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_debugger                               = undef,
+  Optional[Apache::OnOff] $passenger_debugger                                                = undef,
   Optional[String] $passenger_default_group                                                  = undef,
   Optional[String] $passenger_default_ruby                                                   = $apache::params::passenger_default_ruby,
   Optional[String] $passenger_default_user                                                   = undef,
   Optional[Boolean] $passenger_disable_anonymous_telemetry                                   = undef,
   Optional[Boolean] $passenger_disable_log_prefix                                            = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_disable_security_update_check          = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_enabled                                = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_error_override                         = undef,
+  Optional[Apache::OnOff] $passenger_disable_security_update_check                           = undef,
+  Optional[Apache::OnOff] $passenger_enabled                                                 = undef,
+  Optional[Apache::OnOff] $passenger_error_override                                          = undef,
   Optional[String] $passenger_file_descriptor_log_file                                       = undef,
   Optional[String] $passenger_fly_with                                                       = undef,
   Optional[Variant[Integer, String]] $passenger_force_max_concurrent_requests_per_process    = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_friendly_error_pages                   = undef,
+  Optional[Apache::OnOff] $passenger_friendly_error_pages                                    = undef,
   Optional[String] $passenger_group                                                          = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_high_performance                       = undef,
+  Optional[Apache::OnOff] $passenger_high_performance                                        = undef,
   Optional[String] $passenger_installed_version                                              = undef,
   Optional[String] $passenger_instance_registry_dir                                          = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_load_shell_envvars                     = undef,
+  Optional[Apache::OnOff] $passenger_load_shell_envvars                                      = undef,
   Optional[Boolean] $passenger_preload_bundler                                               = undef,
   Optional[Stdlib::Absolutepath] $passenger_log_file                                         = undef,
   Optional[Integer] $passenger_log_level                                                     = undef,
@@ -379,28 +379,28 @@
   Optional[Integer] $passenger_pool_idle_time                                                = undef,
   Optional[Variant[String, Array[String]]] $passenger_pre_start                              = undef,
   Optional[String] $passenger_python                                                         = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resist_deployment_errors               = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resolve_symlinks_in_document_root      = undef,
+  Optional[Apache::OnOff] $passenger_resist_deployment_errors                                = undef,
+  Optional[Apache::OnOff] $passenger_resolve_symlinks_in_document_root                       = undef,
   Optional[Variant[Integer, String]] $passenger_response_buffer_high_watermark               = undef,
   Optional[String] $passenger_restart_dir                                                    = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_rolling_restarts                       = undef,
+  Optional[Apache::OnOff] $passenger_rolling_restarts                                        = undef,
   Optional[String] $passenger_root                                                           = $apache::params::passenger_root,
   Optional[String] $passenger_ruby                                                           = $apache::params::passenger_ruby,
   Optional[String] $passenger_security_update_check_proxy                                    = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_show_version_in_header                 = undef,
+  Optional[Apache::OnOff] $passenger_show_version_in_header                                  = undef,
   Optional[Variant[Integer, String]] $passenger_socket_backlog                               = undef,
   Optional[String] $passenger_spawn_dir                                                      = undef,
   Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method     = undef,
   Optional[Integer] $passenger_start_timeout                                                 = undef,
   Optional[String] $passenger_startup_file                                                   = undef,
   Optional[Integer] $passenger_stat_throttle_rate                                            = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_sticky_sessions                        = undef,
+  Optional[Apache::OnOff] $passenger_sticky_sessions                                         = undef,
   Optional[String] $passenger_sticky_sessions_cookie_name                                    = undef,
   Optional[String] $passenger_sticky_sessions_cookie_attributes                              = undef,
   Optional[Integer] $passenger_thread_count                                                  = undef,
   Optional[String] $passenger_use_global_queue                                               = undef,
   Optional[String] $passenger_user                                                           = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $passenger_user_switching                         = undef,
+  Optional[Apache::OnOff] $passenger_user_switching                                          = undef,
   Optional[String] $rack_auto_detect                                                         = undef,
   Optional[String] $rack_autodetect                                                          = undef,
   Optional[String] $rack_base_uri                                                            = undef,
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index 5f46bbe066..dc5049d4ba 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -29,7 +29,7 @@
   Integer $maxrequestsperchild = 1000,
   Integer $idletimeout         = 120,
   Integer $expiretimeout       = 120,
-  Enum['On', 'Off'] $keepalive = 'Off',
+  Apache::OnOff $keepalive     = 'Off',
 ) {
   include apache
   case $facts['os']['family'] {
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 9c407c4e4e..0ebe2d8ec5 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -163,8 +163,8 @@
   Integer $secrequestbodyinmemorylimit                         = 131072,
   Integer[1,4] $paranoia_level                                 = 1,
   Integer[1,4] $executing_paranoia_level                       = $paranoia_level,
-  Enum['On', 'Off'] $secrequestbodyaccess                      = 'On',
-  Enum['On', 'Off'] $secresponsebodyaccess                     = 'Off',
+  Apache::OnOff $secrequestbodyaccess                          = 'On',
+  Apache::OnOff $secresponsebodyaccess                         = 'Off',
   Enum['Reject', 'ProcessPartial'] $secrequestbodylimitaction  = 'Reject',
   Enum['Reject', 'ProcessPartial'] $secresponsebodylimitaction = 'ProcessPartial',
   Boolean $manage_security_crs                                 = true,
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 4f14eb2495..83aca77834 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -96,7 +96,7 @@
   Optional[Stdlib::Absolutepath] $ssl_key                   = undef,
   Optional[Stdlib::Absolutepath] $ssl_ca                    = undef,
   String $ssl_cipher                                        = $apache::params::ssl_cipher,
-  Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
+  Variant[Boolean, Apache::OnOff] $ssl_honorcipherorder     = true,
   Array[String] $ssl_protocol                               = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
   Optional[String[1]] $ssl_proxy_cipher_suite               = $apache::params::ssl_proxy_cipher_suite,
@@ -119,7 +119,9 @@
   } else {
     $_ssl_honorcipherorder = $ssl_honorcipherorder ? {
       'on'    => true,
+      'On'    => true,
       'off'   => false,
+      'Off'   => false,
       default => true,
     }
   }
diff --git a/manifests/mod/status.pp b/manifests/mod/status.pp
index ac95caf5a9..cd6416fe73 100644
--- a/manifests/mod/status.pp
+++ b/manifests/mod/status.pp
@@ -31,7 +31,7 @@
 #
 class apache::mod::status (
   Optional[Variant[String, Array, Hash]] $requires = undef,
-  Enum['On', 'Off', 'on', 'off'] $extended_status  = 'On',
+  Apache::OnOff $extended_status                   = 'On',
   String $status_path                              = '/server-status',
 ) inherits apache::params {
   include apache
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index af172bcba9..13d348bb1b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1720,15 +1720,15 @@
   Boolean $ssl_reload_on_change                                                       = $apache::default_ssl_reload_on_change,
   Optional[Variant[Array[String], String]] $ssl_protocol                              = undef,
   Optional[Variant[Array[String], String]] $ssl_cipher                                = undef,
-  Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder       = undef,
+  Variant[Boolean, Apache::OnOff, Undef] $ssl_honorcipherorder                        = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client  = undef,
   Optional[Integer] $ssl_verify_depth                                                 = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify   = undef,
   Optional[Integer[0]] $ssl_proxy_verify_depth                                        = undef,
   Optional[Stdlib::Absolutepath] $ssl_proxy_ca_cert                                   = undef,
-  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn                                = undef,
-  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name                              = undef,
-  Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire                            = undef,
+  Optional[Apache::OnOff] $ssl_proxy_check_peer_cn                                    = undef,
+  Optional[Apache::OnOff] $ssl_proxy_check_peer_name                                  = undef,
+  Optional[Apache::OnOff] $ssl_proxy_check_peer_expire                                = undef,
   Optional[Stdlib::Absolutepath] $ssl_proxy_machine_cert                              = undef,
   Optional[Stdlib::Absolutepath] $ssl_proxy_machine_cert_chain                        = undef,
   Optional[String] $ssl_proxy_cipher_suite                                            = undef,
@@ -1738,7 +1738,7 @@
   Boolean $ssl_proxyengine                                                            = false,
   Optional[Boolean] $ssl_stapling                                                     = undef,
   Optional[Integer] $ssl_stapling_timeout                                             = undef,
-  Optional[Enum['on', 'off']] $ssl_stapling_return_errors                             = undef,
+  Optional[Apache::OnOff] $ssl_stapling_return_errors                                 = undef,
   Optional[String] $ssl_user_name                                                     = undef,
   Optional[Apache::Vhost::Priority] $priority                                         = undef,
   Boolean $default_vhost                                                              = false,
@@ -1831,14 +1831,14 @@
   Optional[String] $wsgi_process_group                                                = undef,
   Optional[Hash] $wsgi_script_aliases_match                                           = undef,
   Optional[Hash] $wsgi_script_aliases                                                 = undef,
-  Optional[Enum['on', 'off', 'On', 'Off']] $wsgi_pass_authorization                   = undef,
-  Optional[Enum['On', 'Off']] $wsgi_chunked_request                                   = undef,
+  Optional[Apache::OnOff] $wsgi_pass_authorization                                    = undef,
+  Optional[Apache::OnOff] $wsgi_chunked_request                                       = undef,
   Optional[String] $custom_fragment                                                   = undef,
   Optional[Hash] $itk                                                                 = undef,
   Optional[String] $action                                                            = undef,
   Variant[Array[String], String] $additional_includes                                 = [],
   Boolean $use_optional_includes                                                      = $apache::use_optional_includes,
-  Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes                      = undef,
+  Optional[Variant[Apache::OnOff, Enum['nodecode']]] $allow_encoded_slashes           = undef,
   Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group                             = undef,
 
   Optional[Boolean] $h2_copy_files                                                    = undef,
@@ -1915,16 +1915,16 @@
   Optional[String] $modsec_allowed_methods                                            = undef,
   Array[Hash] $jk_mounts                                                              = [],
   Boolean $auth_kerb                                                                  = false,
-  Enum['on', 'off'] $krb_method_negotiate                                             = 'on',
-  Enum['on', 'off'] $krb_method_k5passwd                                              = 'on',
-  Enum['on', 'off'] $krb_authoritative                                                = 'on',
+  Apache::OnOff $krb_method_negotiate                                                 = 'on',
+  Apache::OnOff $krb_method_k5passwd                                                  = 'on',
+  Apache::OnOff $krb_authoritative                                                    = 'on',
   Array[String] $krb_auth_realms                                                      = [],
   Optional[String] $krb_5keytab                                                       = undef,
-  Optional[Enum['on', 'off']] $krb_local_user_mapping                                 = undef,
-  Enum['on', 'off'] $krb_verify_kdc                                                   = 'on',
+  Optional[Apache::OnOff] $krb_local_user_mapping                                     = undef,
+  Apache::OnOff $krb_verify_kdc                                                       = 'on',
   String $krb_servicename                                                             = 'HTTP',
-  Enum['on', 'off'] $krb_save_credentials                                             = 'off',
-  Optional[Enum['on', 'off']] $keepalive                                              = undef,
+  Apache::OnOff $krb_save_credentials                                                 = 'off',
+  Optional[Apache::OnOff] $keepalive                                                  = undef,
   Optional[Variant[Integer, String]] $keepalive_timeout                               = undef,
   Optional[Variant[Integer, String]] $max_keepalive_requests                          = undef,
   Optional[String] $cas_attribute_prefix                                              = undef,
@@ -1937,7 +1937,7 @@
   Boolean $cas_validate_saml                                                          = false,
   Optional[String] $cas_cookie_path                                                   = undef,
   Optional[String] $shib_compat_valid_user                                            = undef,
-  Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name          = undef,
+  Optional[Variant[Apache::OnOff, Enum['DNS', 'dns']]] $use_canonical_name            = undef,
   Optional[Variant[String, Array[String]]] $comment                                   = undef,
   Hash $define                                                                        = {},
   Boolean $auth_oidc                                                                  = false,
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index c1b8262459..336f980c92 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -493,7 +493,7 @@
       it 'fails' do
         expect {
           catalogue
-        }.to raise_error(Puppet::PreformattedError, %r{Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\]}) # rubocop:disable Layout/LineLength
+        }.to raise_error(Puppet::PreformattedError, %r{Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Apache::OnOff = Enum\['Off', 'On', 'off', 'on'\]}) # rubocop:disable Layout/LineLength
       end
     end
 
diff --git a/types/onoff.pp b/types/onoff.pp
new file mode 100644
index 0000000000..b7aa15faa4
--- /dev/null
+++ b/types/onoff.pp
@@ -0,0 +1,2 @@
+# @summary A string that is accepted in Apache config to turn something on or off
+type Apache::OnOff = Enum['On', 'on', 'Off', 'off']

From 04a49a968efa6b2ae8324bcf7c5383bc7c259440 Mon Sep 17 00:00:00 2001
From: Malik Parvez <84777619+malikparvez@users.noreply.github.com>
Date: Thu, 15 Jun 2023 16:09:35 +0530
Subject: [PATCH 2129/2267] (CONT-990) - Community Pull Requests template

---
 .github/pull_request_template.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000..e3a97007e3
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,15 @@
+## Summary
+Provide a detailed description of all the changes present in this pull request.
+
+## Additional Context
+Add any additional context about the problem here. 
+- [ ] Root cause and the steps to reproduce. (If applicable)
+- [ ] Thought process behind the implementation.
+
+## Related Issues (if any)
+Mention any related issues or pull requests.
+
+## Checklist
+- [ ] 🟢 Spec tests.
+- [ ] 🟢 Acceptance tests.
+- [ ] Manually verified. (For example `puppet apply`)
\ No newline at end of file

From dc1c7edf8452ad6b800599e68db2a68708f3d66a Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Thu, 15 Jun 2023 15:09:31 +0000
Subject: [PATCH 2130/2267] Release prep v10.1.0

---
 CHANGELOG.md  | 2844 +++++++++++++++++++++++++------------------------
 metadata.json |    2 +-
 2 files changed, 1465 insertions(+), 1381 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c1694139f..438700dc0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,1697 +1,1781 @@
-# Change log
+<!-- markdownlint-disable MD024 -->
+# Changelog
 
-All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
+All notable changes to this project will be documented in this file.
 
-## [v10.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v10.0.0) (2023-04-21)
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
+
+## [v10.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v10.1.0) - 2023-06-15
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v10.0.0...v10.1.0)
+
+### Added
+
+- (CONT-577) - allow deferred function for password/secret [#2419](https://github.com/puppetlabs/puppetlabs-apache/pull/2419) ([Ramesh7](https://github.com/Ramesh7))
+- use a dedicated Enum type for On/Off and accept lower case too [#2415](https://github.com/puppetlabs/puppetlabs-apache/pull/2415) ([evgeni](https://github.com/evgeni))
+- pdksync - (MAINT) - Allow Stdlib 9.x [#2413](https://github.com/puppetlabs/puppetlabs-apache/pull/2413) ([LukasAud](https://github.com/LukasAud))
+
+### Fixed
+
+- Remove has_key usage [#2408](https://github.com/puppetlabs/puppetlabs-apache/pull/2408) ([evgeni](https://github.com/evgeni))
+
+## [v10.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v10.0.0) - 2023-04-21
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.3...v10.0.0)
 
 ### Changed
+- (CONT-772) Puppet 8 support / Drop Puppet 6 [#2405](https://github.com/puppetlabs/puppetlabs-apache/pull/2405) ([LukasAud](https://github.com/LukasAud))
 
-- \(CONT-772\) Puppet 8 support / Drop Puppet 6 [\#2405](https://github.com/puppetlabs/puppetlabs-apache/pull/2405) ([LukasAud](https://github.com/LukasAud))
-
-## [v9.1.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.3) (2023-04-20)
+## [v9.1.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.3) - 2023-04-20
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.2...v9.1.3)
 
 ### Fixed
 
-- \#2391 Allow Sensitive type in addition to String type [\#2392](https://github.com/puppetlabs/puppetlabs-apache/pull/2392) ([dpavlotzky](https://github.com/dpavlotzky))
+- #2391 Allow Sensitive type in addition to String type [#2392](https://github.com/puppetlabs/puppetlabs-apache/pull/2392) ([dpavlotzky](https://github.com/dpavlotzky))
 
-## [v9.1.2](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.2) (2023-02-10)
+## [v9.1.2](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.2) - 2023-02-10
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.1...v9.1.2)
 
 ### Fixed
 
-- \(BUGFIX\) Update to ensure correct facter comparisons [\#2387](https://github.com/puppetlabs/puppetlabs-apache/pull/2387) ([david22swan](https://github.com/david22swan))
-- Fixes mod::proxy allow\_from parameter inconsistency \#2352 [\#2385](https://github.com/puppetlabs/puppetlabs-apache/pull/2385) ([pebtron](https://github.com/pebtron))
-- Fix example code for apache::vhost::php\_values [\#2384](https://github.com/puppetlabs/puppetlabs-apache/pull/2384) ([gcoxmoz](https://github.com/gcoxmoz))
-- Suppress bad Directory comment when DocumentRoot is not set [\#2368](https://github.com/puppetlabs/puppetlabs-apache/pull/2368) ([gcoxmoz](https://github.com/gcoxmoz))
-- fix rewrite rules being ignored [\#2330](https://github.com/puppetlabs/puppetlabs-apache/pull/2330) ([trefzer](https://github.com/trefzer))
+- (BUGFIX) Update to ensure correct facter comparisons [#2387](https://github.com/puppetlabs/puppetlabs-apache/pull/2387) ([david22swan](https://github.com/david22swan))
+- Fixes mod::proxy allow_from parameter inconsistency #2352 [#2385](https://github.com/puppetlabs/puppetlabs-apache/pull/2385) ([pebtron](https://github.com/pebtron))
+- Fix example code for apache::vhost::php_values [#2384](https://github.com/puppetlabs/puppetlabs-apache/pull/2384) ([gcoxmoz](https://github.com/gcoxmoz))
+- Suppress bad Directory comment when DocumentRoot is not set [#2368](https://github.com/puppetlabs/puppetlabs-apache/pull/2368) ([gcoxmoz](https://github.com/gcoxmoz))
+- fix rewrite rules being ignored [#2330](https://github.com/puppetlabs/puppetlabs-apache/pull/2330) ([trefzer](https://github.com/trefzer))
 
-## [v9.1.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.1) (2023-02-03)
+## [v9.1.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.1) - 2023-02-03
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.0...v9.1.1)
 
 ### Fixed
 
-- \(BugFix\) Update OS Family comparison to correctly match [\#2381](https://github.com/puppetlabs/puppetlabs-apache/pull/2381) ([david22swan](https://github.com/david22swan))
-- Adding mod\_version module to be activated by default [\#2380](https://github.com/puppetlabs/puppetlabs-apache/pull/2380) ([Q-Storm](https://github.com/Q-Storm))
+- (BugFix) Update OS Family comparison to correctly match [#2381](https://github.com/puppetlabs/puppetlabs-apache/pull/2381) ([david22swan](https://github.com/david22swan))
+- Adding mod_version module to be activated by default [#2380](https://github.com/puppetlabs/puppetlabs-apache/pull/2380) ([Q-Storm](https://github.com/Q-Storm))
 
-## [v9.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.0) (2023-01-31)
+## [v9.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.0) - 2023-01-31
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.0.1...v9.1.0)
 
 ### Added
 
-- vhost: Make ProxyAddHeaders configureable [\#2365](https://github.com/puppetlabs/puppetlabs-apache/pull/2365) ([bastelfreak](https://github.com/bastelfreak))
+- vhost: Make ProxyAddHeaders configureable [#2365](https://github.com/puppetlabs/puppetlabs-apache/pull/2365) ([bastelfreak](https://github.com/bastelfreak))
 
 ### Fixed
 
-- \(\#2374\) Suse: Switch modsec\_default\_rules to array  [\#2375](https://github.com/puppetlabs/puppetlabs-apache/pull/2375) ([bastelfreak](https://github.com/bastelfreak))
--  security{,\_crs}.conf: switch to structured facts [\#2373](https://github.com/puppetlabs/puppetlabs-apache/pull/2373) ([bastelfreak](https://github.com/bastelfreak))
-- Simplify templates by reusing bool2httpd [\#2366](https://github.com/puppetlabs/puppetlabs-apache/pull/2366) ([ekohl](https://github.com/ekohl))
-- Simplify templates by reusing methods [\#2344](https://github.com/puppetlabs/puppetlabs-apache/pull/2344) ([ekohl](https://github.com/ekohl))
+- (#2374) Suse: Switch modsec_default_rules to array  [#2375](https://github.com/puppetlabs/puppetlabs-apache/pull/2375) ([bastelfreak](https://github.com/bastelfreak))
+-  security{,_crs}.conf: switch to structured facts [#2373](https://github.com/puppetlabs/puppetlabs-apache/pull/2373) ([bastelfreak](https://github.com/bastelfreak))
+- Simplify templates by reusing bool2httpd [#2366](https://github.com/puppetlabs/puppetlabs-apache/pull/2366) ([ekohl](https://github.com/ekohl))
+- Simplify templates by reusing methods [#2344](https://github.com/puppetlabs/puppetlabs-apache/pull/2344) ([ekohl](https://github.com/ekohl))
 
-## [v9.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.1) (2022-12-22)
+## [v9.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.1) - 2022-12-22
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.0.0...v9.0.1)
 
 ### Fixed
 
-- \(CONT-406\) Fix for RHEL 7 compatibility [\#2362](https://github.com/puppetlabs/puppetlabs-apache/pull/2362) ([david22swan](https://github.com/david22swan))
+- (CONT-406) Fix for RHEL 7 compatibility [#2362](https://github.com/puppetlabs/puppetlabs-apache/pull/2362) ([david22swan](https://github.com/david22swan))
 
-## [v9.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.0) (2022-12-15)
+## [v9.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.0.0) - 2022-12-15
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.6.0...v9.0.0)
 
 ### Changed
+- (GH-2291) Further refine types [#2359](https://github.com/puppetlabs/puppetlabs-apache/pull/2359) ([david22swan](https://github.com/david22swan))
+- Drop deprecated a2mod type/providers [#2350](https://github.com/puppetlabs/puppetlabs-apache/pull/2350) ([bastelfreak](https://github.com/bastelfreak))
+- Drop Apache 2.2 support [#2329](https://github.com/puppetlabs/puppetlabs-apache/pull/2329) ([ekohl](https://github.com/ekohl))
 
-- \(GH-2291\) Further refine types [\#2359](https://github.com/puppetlabs/puppetlabs-apache/pull/2359) ([david22swan](https://github.com/david22swan))
-- Drop deprecated a2mod type/providers [\#2350](https://github.com/puppetlabs/puppetlabs-apache/pull/2350) ([bastelfreak](https://github.com/bastelfreak))
-- Drop Apache 2.2 support [\#2329](https://github.com/puppetlabs/puppetlabs-apache/pull/2329) ([ekohl](https://github.com/ekohl))
-
-### Fixed
-
-- fix mod\_proxy\_html on FreeBSD [\#2355](https://github.com/puppetlabs/puppetlabs-apache/pull/2355) ([fraenki](https://github.com/fraenki))
-
-## [v8.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.6.0) (2022-12-14)
+## [v8.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.6.0) - 2022-12-14
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.5.0...v8.6.0)
 
 ### Added
 
-- Parameterize SecRequestBodyLimitAction and SecResponseBodyLimitAction [\#2353](https://github.com/puppetlabs/puppetlabs-apache/pull/2353) ([Vincevrp](https://github.com/Vincevrp))
+- Parameterize SecRequestBodyLimitAction and SecResponseBodyLimitAction [#2353](https://github.com/puppetlabs/puppetlabs-apache/pull/2353) ([Vincevrp](https://github.com/Vincevrp))
+
+### Fixed
+
+- fix mod_proxy_html on FreeBSD [#2355](https://github.com/puppetlabs/puppetlabs-apache/pull/2355) ([fraenki](https://github.com/fraenki))
+- disable::mpm_event: Fix module deactivation [#2349](https://github.com/puppetlabs/puppetlabs-apache/pull/2349) ([bastelfreak](https://github.com/bastelfreak))
 
-## [v8.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.5.0) (2022-12-06)
+## [v8.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.5.0) - 2022-12-06
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.4.0...v8.5.0)
 
 ### Added
 
-- add LimitRequestLine parameter [\#2345](https://github.com/puppetlabs/puppetlabs-apache/pull/2345) ([stefan-ahrefs](https://github.com/stefan-ahrefs))
+- add LimitRequestLine parameter [#2345](https://github.com/puppetlabs/puppetlabs-apache/pull/2345) ([stefan-ahrefs](https://github.com/stefan-ahrefs))
 
 ### Fixed
 
-- disable::mpm\_event: Fix module deactivation [\#2349](https://github.com/puppetlabs/puppetlabs-apache/pull/2349) ([bastelfreak](https://github.com/bastelfreak))
-- remove \_module from apache::mod::unique\_id name. [\#2339](https://github.com/puppetlabs/puppetlabs-apache/pull/2339) ([mdklapwijk](https://github.com/mdklapwijk))
+- remove _module from apache::mod::unique_id name. [#2339](https://github.com/puppetlabs/puppetlabs-apache/pull/2339) ([mdklapwijk](https://github.com/mdklapwijk))
 
-## [v8.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.4.0) (2022-11-15)
+## [v8.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.4.0) - 2022-11-15
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.3.0...v8.4.0)
 
 ### Added
 
-- add maxrequestworkers parameter for mpm\_worker module [\#2331](https://github.com/puppetlabs/puppetlabs-apache/pull/2331) ([trefzer](https://github.com/trefzer))
-- support lbmethod modules [\#2268](https://github.com/puppetlabs/puppetlabs-apache/pull/2268) ([xorpaul](https://github.com/xorpaul))
+- add maxrequestworkers parameter for mpm_worker module [#2331](https://github.com/puppetlabs/puppetlabs-apache/pull/2331) ([trefzer](https://github.com/trefzer))
+- support lbmethod modules [#2268](https://github.com/puppetlabs/puppetlabs-apache/pull/2268) ([xorpaul](https://github.com/xorpaul))
 
 ### Fixed
 
-- Declare minimum Puppet version to be 6.24.0 [\#2342](https://github.com/puppetlabs/puppetlabs-apache/pull/2342) ([ekohl](https://github.com/ekohl))
-- Fix RedHat + PHP 8 libphp file [\#2333](https://github.com/puppetlabs/puppetlabs-apache/pull/2333) ([polatsinan](https://github.com/polatsinan))
+- Declare minimum Puppet version to be 6.24.0 [#2342](https://github.com/puppetlabs/puppetlabs-apache/pull/2342) ([ekohl](https://github.com/ekohl))
+- Fix RedHat + PHP 8 libphp file [#2333](https://github.com/puppetlabs/puppetlabs-apache/pull/2333) ([polatsinan](https://github.com/polatsinan))
 
-## [v8.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.3.0) (2022-10-28)
+## [v8.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.3.0) - 2022-10-28
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.2.1...v8.3.0)
 
 ### Added
 
-- Automatically enable mod\_http2 if needed [\#2337](https://github.com/puppetlabs/puppetlabs-apache/pull/2337) ([ekohl](https://github.com/ekohl))
-- Update EL8+ and Debian SSL defaults [\#2336](https://github.com/puppetlabs/puppetlabs-apache/pull/2336) ([ekohl](https://github.com/ekohl))
-- Support setting SSLProxyCipherSuite on mod\_ssl [\#2335](https://github.com/puppetlabs/puppetlabs-apache/pull/2335) ([ekohl](https://github.com/ekohl))
+- Automatically enable mod_http2 if needed [#2337](https://github.com/puppetlabs/puppetlabs-apache/pull/2337) ([ekohl](https://github.com/ekohl))
+- Update EL8+ and Debian SSL defaults [#2336](https://github.com/puppetlabs/puppetlabs-apache/pull/2336) ([ekohl](https://github.com/ekohl))
+- Support setting SSLProxyCipherSuite on mod_ssl [#2335](https://github.com/puppetlabs/puppetlabs-apache/pull/2335) ([ekohl](https://github.com/ekohl))
 
 ### Fixed
 
-- Make serveradmin an optional parameter and use it [\#2338](https://github.com/puppetlabs/puppetlabs-apache/pull/2338) ([ekohl](https://github.com/ekohl))
-- pdksync - \(CONT-189\) Remove support for RedHat6 / OracleLinux6 / Scientific6 [\#2326](https://github.com/puppetlabs/puppetlabs-apache/pull/2326) ([david22swan](https://github.com/david22swan))
-- pdksync - \(CONT-130\) Dropping Support for Debian 9 [\#2322](https://github.com/puppetlabs/puppetlabs-apache/pull/2322) ([jordanbreen28](https://github.com/jordanbreen28))
-- fix directory empty options if an empty array is being used [\#2312](https://github.com/puppetlabs/puppetlabs-apache/pull/2312) ([bovy89](https://github.com/bovy89))
+- Make serveradmin an optional parameter and use it [#2338](https://github.com/puppetlabs/puppetlabs-apache/pull/2338) ([ekohl](https://github.com/ekohl))
+- pdksync - (CONT-189) Remove support for RedHat6 / OracleLinux6 / Scientific6 [#2326](https://github.com/puppetlabs/puppetlabs-apache/pull/2326) ([david22swan](https://github.com/david22swan))
+- pdksync - (CONT-130) Dropping Support for Debian 9 [#2322](https://github.com/puppetlabs/puppetlabs-apache/pull/2322) ([jordanbreen28](https://github.com/jordanbreen28))
+- fix directory empty options if an empty array is being used [#2312](https://github.com/puppetlabs/puppetlabs-apache/pull/2312) ([bovy89](https://github.com/bovy89))
 
-## [v8.2.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.1) (2022-09-27)
+## [v8.2.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.1) - 2022-09-27
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.2.0...v8.2.1)
 
 ### Fixed
 
-- \(maint\) Codebase Hardening [\#2313](https://github.com/puppetlabs/puppetlabs-apache/pull/2313) ([david22swan](https://github.com/david22swan))
+- (maint) Codebase Hardening [#2313](https://github.com/puppetlabs/puppetlabs-apache/pull/2313) ([david22swan](https://github.com/david22swan))
 
-## [v8.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.0) (2022-09-13)
+## [v8.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.2.0) - 2022-09-13
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.1.0...v8.2.0)
 
 ### Added
 
-- Allow RewriteInherit with empty rewrites [\#2301](https://github.com/puppetlabs/puppetlabs-apache/pull/2301) ([martin-koerner](https://github.com/martin-koerner))
-- Add support for all proxy schemes, not just https:// [\#2289](https://github.com/puppetlabs/puppetlabs-apache/pull/2289) ([canth1](https://github.com/canth1))
-- Parameterize CRS DOS protection [\#2280](https://github.com/puppetlabs/puppetlabs-apache/pull/2280) ([Vincevrp](https://github.com/Vincevrp))
-- Allow multiple scopes for Scope in Apache::OIDCSettings [\#2265](https://github.com/puppetlabs/puppetlabs-apache/pull/2265) ([jjackzhn](https://github.com/jjackzhn))
+- Allow RewriteInherit with empty rewrites [#2301](https://github.com/puppetlabs/puppetlabs-apache/pull/2301) ([martin-koerner](https://github.com/martin-koerner))
+- Add support for all proxy schemes, not just https:// [#2289](https://github.com/puppetlabs/puppetlabs-apache/pull/2289) ([canth1](https://github.com/canth1))
+- Parameterize CRS DOS protection [#2280](https://github.com/puppetlabs/puppetlabs-apache/pull/2280) ([Vincevrp](https://github.com/Vincevrp))
+- Allow multiple scopes for Scope in Apache::OIDCSettings [#2265](https://github.com/puppetlabs/puppetlabs-apache/pull/2265) ([jjackzhn](https://github.com/jjackzhn))
 
 ### Fixed
 
-- \(maint\) Add variable manage\_vhost\_enable\_dir [\#2309](https://github.com/puppetlabs/puppetlabs-apache/pull/2309) ([david22swan](https://github.com/david22swan))
-- Simplify the logic in \_require.erb [\#2303](https://github.com/puppetlabs/puppetlabs-apache/pull/2303) ([ekohl](https://github.com/ekohl))
-- Fix deprecation warning about performing a regex comparison on a hash [\#2293](https://github.com/puppetlabs/puppetlabs-apache/pull/2293) ([smokris](https://github.com/smokris))
+- (maint) Add variable manage_vhost_enable_dir [#2309](https://github.com/puppetlabs/puppetlabs-apache/pull/2309) ([david22swan](https://github.com/david22swan))
+- Simplify the logic in _require.erb [#2303](https://github.com/puppetlabs/puppetlabs-apache/pull/2303) ([ekohl](https://github.com/ekohl))
+- Fix deprecation warning about performing a regex comparison on a hash [#2293](https://github.com/puppetlabs/puppetlabs-apache/pull/2293) ([smokris](https://github.com/smokris))
 
-## [v8.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.1.0) (2022-08-18)
+## [v8.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.1.0) - 2022-08-18
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.0.0...v8.1.0)
 
 ### Added
 
-- Manage DNF module for mod\_auth\_openidc [\#2283](https://github.com/puppetlabs/puppetlabs-apache/pull/2283) ([ekohl](https://github.com/ekohl))
-- pdksync - \(GH-cat-11\) Certify Support for Ubuntu 22.04 [\#2276](https://github.com/puppetlabs/puppetlabs-apache/pull/2276) ([david22swan](https://github.com/david22swan))
+- Manage DNF module for mod_auth_openidc [#2283](https://github.com/puppetlabs/puppetlabs-apache/pull/2283) ([ekohl](https://github.com/ekohl))
+- pdksync - (GH-cat-11) Certify Support for Ubuntu 22.04 [#2276](https://github.com/puppetlabs/puppetlabs-apache/pull/2276) ([david22swan](https://github.com/david22swan))
 
 ### Fixed
 
-- Allow integers for timeouts [\#2294](https://github.com/puppetlabs/puppetlabs-apache/pull/2294) ([traylenator](https://github.com/traylenator))
-- Allow setting icons\_path to false so no alias will be set for it [\#2292](https://github.com/puppetlabs/puppetlabs-apache/pull/2292) ([Zarne](https://github.com/Zarne))
-- fix duplicate definition of auth\_basic-mod [\#2287](https://github.com/puppetlabs/puppetlabs-apache/pull/2287) ([sircubbi](https://github.com/sircubbi))
-- Allow custom\_config to have a string priority again [\#2284](https://github.com/puppetlabs/puppetlabs-apache/pull/2284) ([martin-koerner](https://github.com/martin-koerner))
-- Remove auth\_kerb and nss from Debian Bullseye [\#2281](https://github.com/puppetlabs/puppetlabs-apache/pull/2281) ([ekohl](https://github.com/ekohl))
+- Allow integers for timeouts [#2294](https://github.com/puppetlabs/puppetlabs-apache/pull/2294) ([traylenator](https://github.com/traylenator))
+- Allow setting icons_path to false so no alias will be set for it [#2292](https://github.com/puppetlabs/puppetlabs-apache/pull/2292) ([Zarne](https://github.com/Zarne))
+- fix duplicate definition of auth_basic-mod [#2287](https://github.com/puppetlabs/puppetlabs-apache/pull/2287) ([sircubbi](https://github.com/sircubbi))
+- Allow custom_config to have a string priority again [#2284](https://github.com/puppetlabs/puppetlabs-apache/pull/2284) ([martin-koerner](https://github.com/martin-koerner))
+- Remove auth_kerb and nss from Debian Bullseye [#2281](https://github.com/puppetlabs/puppetlabs-apache/pull/2281) ([ekohl](https://github.com/ekohl))
 
-## [v8.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.0.0) (2022-08-09)
+## [v8.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.0.0) - 2022-08-09
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v7.0.0...v8.0.0)
 
+### Added
+
+- Allow overriding CRS allowed HTTP methods per vhost [#2274](https://github.com/puppetlabs/puppetlabs-apache/pull/2274) ([Vincevrp](https://github.com/Vincevrp))
+- Allow overriding CRS anomaly threshold per vhost [#2273](https://github.com/puppetlabs/puppetlabs-apache/pull/2273) ([Vincevrp](https://github.com/Vincevrp))
+-  Allow configuring SecRequestBodyAccess and SecResponseBodyAccess [#2272](https://github.com/puppetlabs/puppetlabs-apache/pull/2272) ([Vincevrp](https://github.com/Vincevrp))
+- Allow configuring CRS paranoia level [#2270](https://github.com/puppetlabs/puppetlabs-apache/pull/2270) ([Vincevrp](https://github.com/Vincevrp))
+- Automatically include modules used in vhost directories [#2255](https://github.com/puppetlabs/puppetlabs-apache/pull/2255) ([ekohl](https://github.com/ekohl))
+- Clean up includes and templates in vhost.pp [#2254](https://github.com/puppetlabs/puppetlabs-apache/pull/2254) ([ekohl](https://github.com/ekohl))
+- pdksync - (GH-cat-12) Add Support for Redhat 9 [#2239](https://github.com/puppetlabs/puppetlabs-apache/pull/2239) ([david22swan](https://github.com/david22swan))
+- Add support for PassengerPreloadBundler [#2233](https://github.com/puppetlabs/puppetlabs-apache/pull/2233) ([smortex](https://github.com/smortex))
+- apache::vhost ProxyPassMatch in Location containers [#2222](https://github.com/puppetlabs/puppetlabs-apache/pull/2222) ([skylar2-uw](https://github.com/skylar2-uw))
+- Allow additional settings for GSSAPI in Vhost [#2215](https://github.com/puppetlabs/puppetlabs-apache/pull/2215) ([tuxmea](https://github.com/tuxmea))
+- mod_auth_gssapi: Add support for every configuration directive [#2214](https://github.com/puppetlabs/puppetlabs-apache/pull/2214) ([canth1](https://github.com/canth1))
+- mod_auth_gssapi: Add support for `GssapiBasicAuth`. [#2212](https://github.com/puppetlabs/puppetlabs-apache/pull/2212) ([olifre](https://github.com/olifre))
+- pdksync - (IAC-1753) - Add Support for AlmaLinux 8 [#2200](https://github.com/puppetlabs/puppetlabs-apache/pull/2200) ([david22swan](https://github.com/david22swan))
+- Add support for setting UserDir in Virual Hosts [#2192](https://github.com/puppetlabs/puppetlabs-apache/pull/2192) ([smortex](https://github.com/smortex))
+- Add an apache::vhost::proxy define [#2169](https://github.com/puppetlabs/puppetlabs-apache/pull/2169) ([wbclark](https://github.com/wbclark))
+
 ### Changed
+- Drop mod_fastcgi support [#2267](https://github.com/puppetlabs/puppetlabs-apache/pull/2267) ([ekohl](https://github.com/ekohl))
+- Drop suphp support [#2263](https://github.com/puppetlabs/puppetlabs-apache/pull/2263) ([ekohl](https://github.com/ekohl))
+- Use a stricter data type on apache::vhost::aliases [#2253](https://github.com/puppetlabs/puppetlabs-apache/pull/2253) ([ekohl](https://github.com/ekohl))
+- Narrow down Datatypes [#2245](https://github.com/puppetlabs/puppetlabs-apache/pull/2245) ([cocker-cc](https://github.com/cocker-cc))
+- (GH-cat-9) Update module to match current syntax standard [#2235](https://github.com/puppetlabs/puppetlabs-apache/pull/2235) ([david22swan](https://github.com/david22swan))
+- Drop Apache 2.0 compatibility code [#2226](https://github.com/puppetlabs/puppetlabs-apache/pull/2226) ([ekohl](https://github.com/ekohl))
+- (GH-iac-334) Remove code specific to unsupported OSs [#2223](https://github.com/puppetlabs/puppetlabs-apache/pull/2223) ([david22swan](https://github.com/david22swan))
+- Remove warnings and plans to change vhost default naming [#2202](https://github.com/puppetlabs/puppetlabs-apache/pull/2202) ([ekohl](https://github.com/ekohl))
+- Update modsec crs config and template [#2197](https://github.com/puppetlabs/puppetlabs-apache/pull/2197) ([henkworks](https://github.com/henkworks))
 
-- Drop mod\_fastcgi support [\#2267](https://github.com/puppetlabs/puppetlabs-apache/pull/2267) ([ekohl](https://github.com/ekohl))
-- Drop suphp support [\#2263](https://github.com/puppetlabs/puppetlabs-apache/pull/2263) ([ekohl](https://github.com/ekohl))
-- Use a stricter data type on apache::vhost::aliases [\#2253](https://github.com/puppetlabs/puppetlabs-apache/pull/2253) ([ekohl](https://github.com/ekohl))
-- Narrow down Datatypes [\#2245](https://github.com/puppetlabs/puppetlabs-apache/pull/2245) ([cocker-cc](https://github.com/cocker-cc))
-- \(GH-cat-9\) Update module to match current syntax standard [\#2235](https://github.com/puppetlabs/puppetlabs-apache/pull/2235) ([david22swan](https://github.com/david22swan))
-- Drop Apache 2.0 compatibility code [\#2226](https://github.com/puppetlabs/puppetlabs-apache/pull/2226) ([ekohl](https://github.com/ekohl))
-- \(GH-iac-334\) Remove code specific to unsupported OSs [\#2223](https://github.com/puppetlabs/puppetlabs-apache/pull/2223) ([david22swan](https://github.com/david22swan))
-- Remove warnings and plans to change vhost default naming [\#2202](https://github.com/puppetlabs/puppetlabs-apache/pull/2202) ([ekohl](https://github.com/ekohl))
-- Update modsec crs config and template [\#2197](https://github.com/puppetlabs/puppetlabs-apache/pull/2197) ([henkworks](https://github.com/henkworks))
-
-### Added
-
-- Allow overriding CRS allowed HTTP methods per vhost [\#2274](https://github.com/puppetlabs/puppetlabs-apache/pull/2274) ([Vincevrp](https://github.com/Vincevrp))
-- Allow overriding CRS anomaly threshold per vhost [\#2273](https://github.com/puppetlabs/puppetlabs-apache/pull/2273) ([Vincevrp](https://github.com/Vincevrp))
--  Allow configuring SecRequestBodyAccess and SecResponseBodyAccess [\#2272](https://github.com/puppetlabs/puppetlabs-apache/pull/2272) ([Vincevrp](https://github.com/Vincevrp))
-- Allow configuring CRS paranoia level [\#2270](https://github.com/puppetlabs/puppetlabs-apache/pull/2270) ([Vincevrp](https://github.com/Vincevrp))
-- Automatically include modules used in vhost directories [\#2255](https://github.com/puppetlabs/puppetlabs-apache/pull/2255) ([ekohl](https://github.com/ekohl))
-- Clean up includes and templates in vhost.pp [\#2254](https://github.com/puppetlabs/puppetlabs-apache/pull/2254) ([ekohl](https://github.com/ekohl))
-- pdksync - \(GH-cat-12\) Add Support for Redhat 9 [\#2239](https://github.com/puppetlabs/puppetlabs-apache/pull/2239) ([david22swan](https://github.com/david22swan))
-- Add support for PassengerPreloadBundler [\#2233](https://github.com/puppetlabs/puppetlabs-apache/pull/2233) ([smortex](https://github.com/smortex))
-- apache::vhost ProxyPassMatch in Location containers [\#2222](https://github.com/puppetlabs/puppetlabs-apache/pull/2222) ([skylar2-uw](https://github.com/skylar2-uw))
-- Allow additional settings for GSSAPI in Vhost [\#2215](https://github.com/puppetlabs/puppetlabs-apache/pull/2215) ([tuxmea](https://github.com/tuxmea))
-- mod\_auth\_gssapi: Add support for every configuration directive [\#2214](https://github.com/puppetlabs/puppetlabs-apache/pull/2214) ([canth1](https://github.com/canth1))
-- mod\_auth\_gssapi: Add support for `GssapiBasicAuth`. [\#2212](https://github.com/puppetlabs/puppetlabs-apache/pull/2212) ([olifre](https://github.com/olifre))
-- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#2200](https://github.com/puppetlabs/puppetlabs-apache/pull/2200) ([david22swan](https://github.com/david22swan))
-- Add support for setting UserDir in Virual Hosts [\#2192](https://github.com/puppetlabs/puppetlabs-apache/pull/2192) ([smortex](https://github.com/smortex))
-- Add an apache::vhost::proxy define [\#2169](https://github.com/puppetlabs/puppetlabs-apache/pull/2169) ([wbclark](https://github.com/wbclark))
-
-### Fixed
-
-- Disable mod\_php on EL9 [\#2277](https://github.com/puppetlabs/puppetlabs-apache/pull/2277) ([ekohl](https://github.com/ekohl))
-- Allow vhosts to have a string priority again [\#2275](https://github.com/puppetlabs/puppetlabs-apache/pull/2275) ([ekohl](https://github.com/ekohl))
-- Remove duplicate SecDefaultAction in CRS template [\#2271](https://github.com/puppetlabs/puppetlabs-apache/pull/2271) ([Vincevrp](https://github.com/Vincevrp))
-- Better data types on apache::vhost parameters [\#2252](https://github.com/puppetlabs/puppetlabs-apache/pull/2252) ([ekohl](https://github.com/ekohl))
-- Update $timeout to `Variant\[Integer,String\]` [\#2242](https://github.com/puppetlabs/puppetlabs-apache/pull/2242) ([david22swan](https://github.com/david22swan))
-- Let limitreqfieldsize and limitreqfields be integers [\#2240](https://github.com/puppetlabs/puppetlabs-apache/pull/2240) ([traylenator](https://github.com/traylenator))
-- Drop support for Fedora \< 18 [\#2238](https://github.com/puppetlabs/puppetlabs-apache/pull/2238) ([ekohl](https://github.com/ekohl))
-- Restructure MPM disabling [\#2227](https://github.com/puppetlabs/puppetlabs-apache/pull/2227) ([ekohl](https://github.com/ekohl))
-- pdksync - \(GH-iac-334\) Remove Support for Ubuntu 16.04 [\#2220](https://github.com/puppetlabs/puppetlabs-apache/pull/2220) ([david22swan](https://github.com/david22swan))
-- Drop Apache 2.2 support with Gentoo [\#2216](https://github.com/puppetlabs/puppetlabs-apache/pull/2216) ([ekohl](https://github.com/ekohl))
-- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#2213](https://github.com/puppetlabs/puppetlabs-apache/pull/2213) ([david22swan](https://github.com/david22swan))
-
-## [v7.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v7.0.0) (2021-10-11)
+### Fixed
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.1...v7.0.0)
+- Disable mod_php on EL9 [#2277](https://github.com/puppetlabs/puppetlabs-apache/pull/2277) ([ekohl](https://github.com/ekohl))
+- Allow vhosts to have a string priority again [#2275](https://github.com/puppetlabs/puppetlabs-apache/pull/2275) ([ekohl](https://github.com/ekohl))
+- Remove duplicate SecDefaultAction in CRS template [#2271](https://github.com/puppetlabs/puppetlabs-apache/pull/2271) ([Vincevrp](https://github.com/Vincevrp))
+- Better data types on apache::vhost parameters [#2252](https://github.com/puppetlabs/puppetlabs-apache/pull/2252) ([ekohl](https://github.com/ekohl))
+- Update $timeout to `Variant[Integer,String]` [#2242](https://github.com/puppetlabs/puppetlabs-apache/pull/2242) ([david22swan](https://github.com/david22swan))
+- Let limitreqfieldsize and limitreqfields be integers [#2240](https://github.com/puppetlabs/puppetlabs-apache/pull/2240) ([traylenator](https://github.com/traylenator))
+- Drop support for Fedora < 18 [#2238](https://github.com/puppetlabs/puppetlabs-apache/pull/2238) ([ekohl](https://github.com/ekohl))
+- Restructure MPM disabling [#2227](https://github.com/puppetlabs/puppetlabs-apache/pull/2227) ([ekohl](https://github.com/ekohl))
+- pdksync - (GH-iac-334) Remove Support for Ubuntu 16.04 [#2220](https://github.com/puppetlabs/puppetlabs-apache/pull/2220) ([david22swan](https://github.com/david22swan))
+- Drop Apache 2.2 support with Gentoo [#2216](https://github.com/puppetlabs/puppetlabs-apache/pull/2216) ([ekohl](https://github.com/ekohl))
+- pdksync - (IAC-1787) Remove Support for CentOS 6 [#2213](https://github.com/puppetlabs/puppetlabs-apache/pull/2213) ([david22swan](https://github.com/david22swan))
 
-### Changed
+## [v7.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v7.0.0) - 2021-10-11
 
-- Drop Debian \< 8 and Ubuntu \< 14.04 code [\#2189](https://github.com/puppetlabs/puppetlabs-apache/pull/2189) ([ekohl](https://github.com/ekohl))
-- Drop support and compatibility for Debian \< 9 and Ubuntu \< 16.04 [\#2123](https://github.com/puppetlabs/puppetlabs-apache/pull/2123) ([ekohl](https://github.com/ekohl))
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.1...v7.0.0)
 
 ### Added
 
-- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#2196](https://github.com/puppetlabs/puppetlabs-apache/pull/2196) ([david22swan](https://github.com/david22swan))
-- Allow `docroot` with `mod\_vhost\_alias` `virtual\_docroot` [\#2195](https://github.com/puppetlabs/puppetlabs-apache/pull/2195) ([yakatz](https://github.com/yakatz))
+- pdksync - (IAC-1751) - Add Support for Rocky 8 [#2196](https://github.com/puppetlabs/puppetlabs-apache/pull/2196) ([david22swan](https://github.com/david22swan))
+- Allow `docroot` with `mod_vhost_alias` `virtual_docroot` [#2195](https://github.com/puppetlabs/puppetlabs-apache/pull/2195) ([yakatz](https://github.com/yakatz))
+
+### Changed
+- Drop Debian < 8 and Ubuntu < 14.04 code [#2189](https://github.com/puppetlabs/puppetlabs-apache/pull/2189) ([ekohl](https://github.com/ekohl))
+- Drop support and compatibility for Debian < 9 and Ubuntu < 16.04 [#2123](https://github.com/puppetlabs/puppetlabs-apache/pull/2123) ([ekohl](https://github.com/ekohl))
 
 ### Fixed
 
-- Restore Ubuntu 14.04 support in suphp [\#2193](https://github.com/puppetlabs/puppetlabs-apache/pull/2193) ([ekohl](https://github.com/ekohl))
-- add double quote on scope parameter [\#2191](https://github.com/puppetlabs/puppetlabs-apache/pull/2191) ([aba-rechsteiner](https://github.com/aba-rechsteiner))
-- Debian 11: fix typo in `versioncmp\(\)` / set default php to 7.4 [\#2186](https://github.com/puppetlabs/puppetlabs-apache/pull/2186) ([bastelfreak](https://github.com/bastelfreak))
+- Restore Ubuntu 14.04 support in suphp [#2193](https://github.com/puppetlabs/puppetlabs-apache/pull/2193) ([ekohl](https://github.com/ekohl))
+- add double quote on scope parameter [#2191](https://github.com/puppetlabs/puppetlabs-apache/pull/2191) ([aba-rechsteiner](https://github.com/aba-rechsteiner))
+- Debian 11: fix typo in `versioncmp()` / set default php to 7.4 [#2186](https://github.com/puppetlabs/puppetlabs-apache/pull/2186) ([bastelfreak](https://github.com/bastelfreak))
 
-## [v6.5.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.1) (2021-08-25)
+## [v6.5.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.1) - 2021-08-25
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.0...v6.5.1)
 
 ### Fixed
 
-- \(maint\) Allow stdlib 8.0.0 [\#2184](https://github.com/puppetlabs/puppetlabs-apache/pull/2184) ([smortex](https://github.com/smortex))
+- (maint) Allow stdlib 8.0.0 [#2184](https://github.com/puppetlabs/puppetlabs-apache/pull/2184) ([smortex](https://github.com/smortex))
 
-## [v6.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.0) (2021-08-24)
+## [v6.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.5.0) - 2021-08-24
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.4.0...v6.5.0)
 
 ### Added
 
-- pdksync - \(IAC-1709\) - Add Support for Debian 11 [\#2180](https://github.com/puppetlabs/puppetlabs-apache/pull/2180) ([david22swan](https://github.com/david22swan))
+- pdksync - (IAC-1709) - Add Support for Debian 11 [#2180](https://github.com/puppetlabs/puppetlabs-apache/pull/2180) ([david22swan](https://github.com/david22swan))
 
-## [v6.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.4.0) (2021-08-02)
+## [v6.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.4.0) - 2021-08-02
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.3.1...v6.4.0)
 
 ### Added
 
-- \(MODULES-11075\) Improve future version handling for RHEL [\#2174](https://github.com/puppetlabs/puppetlabs-apache/pull/2174) ([mwhahaha](https://github.com/mwhahaha))
-- Allow custom userdir directives [\#2164](https://github.com/puppetlabs/puppetlabs-apache/pull/2164) ([hunner](https://github.com/hunner))
-- Add feature to reload apache service when content of ssl files has changed [\#2157](https://github.com/puppetlabs/puppetlabs-apache/pull/2157) ([timdeluxe](https://github.com/timdeluxe))
+- (MODULES-11075) Improve future version handling for RHEL [#2174](https://github.com/puppetlabs/puppetlabs-apache/pull/2174) ([mwhahaha](https://github.com/mwhahaha))
+- Allow custom userdir directives [#2164](https://github.com/puppetlabs/puppetlabs-apache/pull/2164) ([hunner](https://github.com/hunner))
+- Add feature to reload apache service when content of ssl files has changed [#2157](https://github.com/puppetlabs/puppetlabs-apache/pull/2157) ([timdeluxe](https://github.com/timdeluxe))
 
-## [v6.3.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.1) (2021-07-22)
+## [v6.3.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.1) - 2021-07-22
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.3.0...v6.3.1)
 
 ### Fixed
 
-- \(MODULES-10899\) Load php module with the right libphp file [\#2166](https://github.com/puppetlabs/puppetlabs-apache/pull/2166) ([sheenaajay](https://github.com/sheenaajay))
-- \(maint\) Fix puppet-strings docs on apache::vhost [\#2165](https://github.com/puppetlabs/puppetlabs-apache/pull/2165) ([ekohl](https://github.com/ekohl))
+- (MODULES-10899) Load php module with the right libphp file [#2166](https://github.com/puppetlabs/puppetlabs-apache/pull/2166) ([sheenaajay](https://github.com/sheenaajay))
+- (maint) Fix puppet-strings docs on apache::vhost [#2165](https://github.com/puppetlabs/puppetlabs-apache/pull/2165) ([ekohl](https://github.com/ekohl))
 
-## [v6.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.0) (2021-06-22)
+## [v6.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.3.0) - 2021-06-22
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/kps_ssl_reload_and_cache_disk_combined_tag...v6.3.0)
 
 ### Fixed
 
-- Update the default version of Apache for Amazon Linux 2 [\#2158](https://github.com/puppetlabs/puppetlabs-apache/pull/2158) ([turnopil](https://github.com/turnopil))
-- Only warn about servername logging if relevant [\#2154](https://github.com/puppetlabs/puppetlabs-apache/pull/2154) ([ekohl](https://github.com/ekohl))
+- Update the default version of Apache for Amazon Linux 2 [#2158](https://github.com/puppetlabs/puppetlabs-apache/pull/2158) ([turnopil](https://github.com/turnopil))
+- Only warn about servername logging if relevant [#2154](https://github.com/puppetlabs/puppetlabs-apache/pull/2154) ([ekohl](https://github.com/ekohl))
 
-## [kps_ssl_reload_and_cache_disk_combined_tag](https://github.com/puppetlabs/puppetlabs-apache/tree/kps_ssl_reload_and_cache_disk_combined_tag) (2021-06-14)
+## [kps_ssl_reload_and_cache_disk_combined_tag](https://github.com/puppetlabs/puppetlabs-apache/tree/kps_ssl_reload_and_cache_disk_combined_tag) - 2021-06-14
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.2.0...kps_ssl_reload_and_cache_disk_combined_tag)
 
 ### Added
 
-- The default disk\_cache.conf.erb caches everything.  [\#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
+- The default disk_cache.conf.erb caches everything.  [#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
 
-## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) (2021-05-24)
+## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) - 2021-05-24
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.1.0...v6.2.0)
 
 ### Added
 
-- \(MODULES-11068\) Allow apache::vhost ssl\_honorcipherorder to take boolean parameter [\#2152](https://github.com/puppetlabs/puppetlabs-apache/pull/2152) ([davidc](https://github.com/davidc))
+- (MODULES-11068) Allow apache::vhost ssl_honorcipherorder to take boolean parameter [#2152](https://github.com/puppetlabs/puppetlabs-apache/pull/2152) ([davidc](https://github.com/davidc))
 
-## [v6.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.1.0) (2021-05-17)
+## [v6.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.1.0) - 2021-05-17
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.0.1...v6.1.0)
 
 ### Added
 
-- support for uri for severname with use\_servername\_for\_filenames [\#2150](https://github.com/puppetlabs/puppetlabs-apache/pull/2150) ([Zarne](https://github.com/Zarne))
-- \(MODULES-11061\) mod\_security custom rule functionality [\#2145](https://github.com/puppetlabs/puppetlabs-apache/pull/2145) ([k2patel](https://github.com/k2patel))
+- support for uri for severname with use_servername_for_filenames [#2150](https://github.com/puppetlabs/puppetlabs-apache/pull/2150) ([Zarne](https://github.com/Zarne))
+- (MODULES-11061) mod_security custom rule functionality [#2145](https://github.com/puppetlabs/puppetlabs-apache/pull/2145) ([k2patel](https://github.com/k2patel))
 
-## [v6.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.1) (2021-05-10)
+## [v6.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.1) - 2021-05-10
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.0.0...v6.0.1)
 
 ### Fixed
 
-- Fix HEADER\* and README\* wildcards in IndexIgnore [\#2138](https://github.com/puppetlabs/puppetlabs-apache/pull/2138) ([keto](https://github.com/keto))
-- Fix dav\_svn for Debian 10 [\#2135](https://github.com/puppetlabs/puppetlabs-apache/pull/2135) ([martijndegouw](https://github.com/martijndegouw))
+- Fix HEADER* and README* wildcards in IndexIgnore [#2138](https://github.com/puppetlabs/puppetlabs-apache/pull/2138) ([keto](https://github.com/keto))
+- Fix dav_svn for Debian 10 [#2135](https://github.com/puppetlabs/puppetlabs-apache/pull/2135) ([martijndegouw](https://github.com/martijndegouw))
 
-## [v6.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.0) (2021-03-02)
+## [v6.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.0) - 2021-03-02
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.10.0...v6.0.0)
 
 ### Changed
+- pdksync - (MAINT) Remove SLES 11 support [#2132](https://github.com/puppetlabs/puppetlabs-apache/pull/2132) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [#2125](https://github.com/puppetlabs/puppetlabs-apache/pull/2125) ([carabasdaniel](https://github.com/carabasdaniel))
 
-- pdksync - \(MAINT\) Remove SLES 11 support [\#2132](https://github.com/puppetlabs/puppetlabs-apache/pull/2132) ([sanfrancrisko](https://github.com/sanfrancrisko))
-- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [\#2125](https://github.com/puppetlabs/puppetlabs-apache/pull/2125) ([carabasdaniel](https://github.com/carabasdaniel))
-
-## [v5.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.10.0) (2021-02-17)
+## [v5.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.10.0) - 2021-02-17
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.9.0...v5.10.0)
 
 ### Added
 
-- \(IAC-1186\) Add $use\_port\_for\_filenames parameter [\#2122](https://github.com/puppetlabs/puppetlabs-apache/pull/2122) ([smortex](https://github.com/smortex))
+- (IAC-1186) Add $use_port_for_filenames parameter [#2122](https://github.com/puppetlabs/puppetlabs-apache/pull/2122) ([smortex](https://github.com/smortex))
 
 ### Fixed
 
-- \(MODULES-10899\) Handle PHP8 MOD package naming convention changes [\#2121](https://github.com/puppetlabs/puppetlabs-apache/pull/2121) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- (MODULES-10899) Handle PHP8 MOD package naming convention changes [#2121](https://github.com/puppetlabs/puppetlabs-apache/pull/2121) ([sanfrancrisko](https://github.com/sanfrancrisko))
 
-## [v5.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.9.0) (2021-01-25)
+## [v5.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.9.0) - 2021-01-25
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.8.0...v5.9.0)
 
 ### Added
 
-- Add ssl\_user\_name vhost parameter [\#2093](https://github.com/puppetlabs/puppetlabs-apache/pull/2093) ([bodgit](https://github.com/bodgit))
-- Add support for mod\_md [\#2090](https://github.com/puppetlabs/puppetlabs-apache/pull/2090) ([smortex](https://github.com/smortex))
+- Add ssl_user_name vhost parameter [#2093](https://github.com/puppetlabs/puppetlabs-apache/pull/2093) ([bodgit](https://github.com/bodgit))
+- Add support for mod_md [#2090](https://github.com/puppetlabs/puppetlabs-apache/pull/2090) ([smortex](https://github.com/smortex))
 
 ### Fixed
 
-- \(FIX\) Correct PHP packages on Ubuntu 16.04 [\#2111](https://github.com/puppetlabs/puppetlabs-apache/pull/2111) ([ekohl](https://github.com/ekohl))
+- (FIX) Correct PHP packages on Ubuntu 16.04 [#2111](https://github.com/puppetlabs/puppetlabs-apache/pull/2111) ([ekohl](https://github.com/ekohl))
 
-## [v5.8.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.8.0) (2020-12-07)
+## [v5.8.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.8.0) - 2020-12-07
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.7.0...v5.8.0)
 
 ### Added
 
-- \(MODULES-10887\) Set `use\_servername\_for\_filenames` for defaults [\#2103](https://github.com/puppetlabs/puppetlabs-apache/pull/2103) ([towo](https://github.com/towo))
-- pdksync - \(feat\) Add support for Puppet 7 [\#2101](https://github.com/puppetlabs/puppetlabs-apache/pull/2101) ([daianamezdrea](https://github.com/daianamezdrea))
-- \(feat\) Add support for apreq2 MOD on Debian 9, 10 [\#2085](https://github.com/puppetlabs/puppetlabs-apache/pull/2085) ([TigerKriika](https://github.com/TigerKriika))
+- (MODULES-10887) Set `use_servername_for_filenames` for defaults [#2103](https://github.com/puppetlabs/puppetlabs-apache/pull/2103) ([towo](https://github.com/towo))
+- pdksync - (feat) Add support for Puppet 7 [#2101](https://github.com/puppetlabs/puppetlabs-apache/pull/2101) ([daianamezdrea](https://github.com/daianamezdrea))
+- (feat) Add support for apreq2 MOD on Debian 9, 10 [#2085](https://github.com/puppetlabs/puppetlabs-apache/pull/2085) ([TigerKriika](https://github.com/TigerKriika))
 
 ### Fixed
 
-- \(fix\) Convert unnecessary multi line warnings to single lines [\#2104](https://github.com/puppetlabs/puppetlabs-apache/pull/2104) ([rj667](https://github.com/rj667))
-- Fix bool2httpd function call for older ruby versions [\#2102](https://github.com/puppetlabs/puppetlabs-apache/pull/2102) ([carabasdaniel](https://github.com/carabasdaniel))
-- Use Ruby 2.7 compatible string matching [\#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
+- (fix) Convert unnecessary multi line warnings to single lines [#2104](https://github.com/puppetlabs/puppetlabs-apache/pull/2104) ([rj667](https://github.com/rj667))
+- Fix bool2httpd function call for older ruby versions [#2102](https://github.com/puppetlabs/puppetlabs-apache/pull/2102) ([carabasdaniel](https://github.com/carabasdaniel))
 
-## [v5.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.7.0) (2020-11-24)
+## [v5.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.7.0) - 2020-11-24
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.6.0...v5.7.0)
 
 ### Added
 
-- Add cas\_cookie\_path in vhosts [\#2089](https://github.com/puppetlabs/puppetlabs-apache/pull/2089) ([yakatz](https://github.com/yakatz))
-- \(IAC-1186\) Add new $use\_servername\_for\_filenames parameter [\#2086](https://github.com/puppetlabs/puppetlabs-apache/pull/2086) ([sanfrancrisko](https://github.com/sanfrancrisko))
-- Allow relative paths in oidc\_redirect\_uri [\#2082](https://github.com/puppetlabs/puppetlabs-apache/pull/2082) ([sanfrancrisko](https://github.com/sanfrancrisko))
-- Improve SSLVerify options [\#2081](https://github.com/puppetlabs/puppetlabs-apache/pull/2081) ([bovy89](https://github.com/bovy89))
-- Change icon path [\#2079](https://github.com/puppetlabs/puppetlabs-apache/pull/2079) ([yakatz](https://github.com/yakatz))
-- Support mod\_auth\_gssapi parameters [\#2078](https://github.com/puppetlabs/puppetlabs-apache/pull/2078) ([traylenator](https://github.com/traylenator))
-- Add ssl\_proxy\_machine\_cert\_chain param to vhost class [\#2072](https://github.com/puppetlabs/puppetlabs-apache/pull/2072) ([AbelNavarro](https://github.com/AbelNavarro))
+- Add cas_cookie_path in vhosts [#2089](https://github.com/puppetlabs/puppetlabs-apache/pull/2089) ([yakatz](https://github.com/yakatz))
+- (IAC-1186) Add new $use_servername_for_filenames parameter [#2086](https://github.com/puppetlabs/puppetlabs-apache/pull/2086) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- Allow relative paths in oidc_redirect_uri [#2082](https://github.com/puppetlabs/puppetlabs-apache/pull/2082) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- Improve SSLVerify options [#2081](https://github.com/puppetlabs/puppetlabs-apache/pull/2081) ([bovy89](https://github.com/bovy89))
+- Change icon path [#2079](https://github.com/puppetlabs/puppetlabs-apache/pull/2079) ([yakatz](https://github.com/yakatz))
+- Support mod_auth_gssapi parameters [#2078](https://github.com/puppetlabs/puppetlabs-apache/pull/2078) ([traylenator](https://github.com/traylenator))
+- Add ssl_proxy_machine_cert_chain param to vhost class [#2072](https://github.com/puppetlabs/puppetlabs-apache/pull/2072) ([AbelNavarro](https://github.com/AbelNavarro))
 
 ### Fixed
 
-- Use Ruby 2.7 compatible string matching [\#2074](https://github.com/puppetlabs/puppetlabs-apache/pull/2074) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- Use Ruby 2.7 compatible string matching [#2074](https://github.com/puppetlabs/puppetlabs-apache/pull/2074) ([sanfrancrisko](https://github.com/sanfrancrisko))
 
-## [v5.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.6.0) (2020-10-01)
+## [v5.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.6.0) - 2020-10-05
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.5.0...v5.6.0)
 
 ### Added
 
-- Configure default shared lib path for mod\_wsgi on RHEL8 [\#2063](https://github.com/puppetlabs/puppetlabs-apache/pull/2063) ([nbarrientos](https://github.com/nbarrientos))
-- Various enhancements to apache::mod::passenger [\#2058](https://github.com/puppetlabs/puppetlabs-apache/pull/2058) ([smortex](https://github.com/smortex))
+- Configure default shared lib path for mod_wsgi on RHEL8 [#2063](https://github.com/puppetlabs/puppetlabs-apache/pull/2063) ([nbarrientos](https://github.com/nbarrientos))
+- Various enhancements to apache::mod::passenger [#2058](https://github.com/puppetlabs/puppetlabs-apache/pull/2058) ([smortex](https://github.com/smortex))
 
 ### Fixed
 
-- make apache::mod::fcgid redhat 8 compatible [\#2071](https://github.com/puppetlabs/puppetlabs-apache/pull/2071) ([creativefre](https://github.com/creativefre))
-- pdksync - \(feat\) - Removal of inappropriate terminology [\#2062](https://github.com/puppetlabs/puppetlabs-apache/pull/2062) ([pmcmaw](https://github.com/pmcmaw))
-- Use python3-mod\_wsgi instead of mod\_wsgi on CentOS8 [\#2052](https://github.com/puppetlabs/puppetlabs-apache/pull/2052) ([kajinamit](https://github.com/kajinamit))
+- make apache::mod::fcgid redhat 8 compatible [#2071](https://github.com/puppetlabs/puppetlabs-apache/pull/2071) ([creativefre](https://github.com/creativefre))
+- pdksync - (feat) - Removal of inappropriate terminology [#2062](https://github.com/puppetlabs/puppetlabs-apache/pull/2062) ([pmcmaw](https://github.com/pmcmaw))
+- Use Ruby 2.7 compatible string matching [#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
+- Use python3-mod_wsgi instead of mod_wsgi on CentOS8 [#2052](https://github.com/puppetlabs/puppetlabs-apache/pull/2052) ([kajinamit](https://github.com/kajinamit))
 
-## [v5.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.5.0) (2020-07-03)
+## [v5.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.5.0) - 2020-07-03
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.4.0...v5.5.0)
 
 ### Added
 
-- Allow IPv6 CIDRs for proxy\_protocol\_exceptions in mod remoteip [\#2033](https://github.com/puppetlabs/puppetlabs-apache/pull/2033) ([thechristschn](https://github.com/thechristschn))
-- \(IAC-746\) - Add ubuntu 20.04 support [\#2032](https://github.com/puppetlabs/puppetlabs-apache/pull/2032) ([david22swan](https://github.com/david22swan))
-- Replace legacy `bool2httpd\(\)` function with shim [\#2025](https://github.com/puppetlabs/puppetlabs-apache/pull/2025) ([alexjfisher](https://github.com/alexjfisher))
-- Tidy up `pw\_hash` function [\#2024](https://github.com/puppetlabs/puppetlabs-apache/pull/2024) ([alexjfisher](https://github.com/alexjfisher))
-- Replace validate\_apache\_loglevel\(\) with data type [\#2023](https://github.com/puppetlabs/puppetlabs-apache/pull/2023) ([alexjfisher](https://github.com/alexjfisher))
-- Add ProxyIOBufferSize option [\#2014](https://github.com/puppetlabs/puppetlabs-apache/pull/2014) ([jplindquist](https://github.com/jplindquist))
-- Add support for SetInputFilter directive [\#2007](https://github.com/puppetlabs/puppetlabs-apache/pull/2007) ([HoucemEddine](https://github.com/HoucemEddine))
-- \[MODULES-10530\] Add request limiting directives on virtual host level [\#1996](https://github.com/puppetlabs/puppetlabs-apache/pull/1996) ([aursu](https://github.com/aursu))
-- \[MODULES-10528\] Add ErrorLogFormat directive on virtual host level [\#1995](https://github.com/puppetlabs/puppetlabs-apache/pull/1995) ([aursu](https://github.com/aursu))
-- Add template variables and parameters for ModSecurity Audit Logs [\#1988](https://github.com/puppetlabs/puppetlabs-apache/pull/1988) ([jplindquist](https://github.com/jplindquist))
-- \(MODULES-10432\) Add mod\_auth\_openidc support [\#1987](https://github.com/puppetlabs/puppetlabs-apache/pull/1987) ([asieraguado](https://github.com/asieraguado))
+- Allow IPv6 CIDRs for proxy_protocol_exceptions in mod remoteip [#2033](https://github.com/puppetlabs/puppetlabs-apache/pull/2033) ([thechristschn](https://github.com/thechristschn))
+- (IAC-746) - Add ubuntu 20.04 support [#2032](https://github.com/puppetlabs/puppetlabs-apache/pull/2032) ([david22swan](https://github.com/david22swan))
+- Replace legacy `bool2httpd()` function with shim [#2025](https://github.com/puppetlabs/puppetlabs-apache/pull/2025) ([alexjfisher](https://github.com/alexjfisher))
+- Tidy up `pw_hash` function [#2024](https://github.com/puppetlabs/puppetlabs-apache/pull/2024) ([alexjfisher](https://github.com/alexjfisher))
+- Replace validate_apache_loglevel() with data type [#2023](https://github.com/puppetlabs/puppetlabs-apache/pull/2023) ([alexjfisher](https://github.com/alexjfisher))
+- Add ProxyIOBufferSize option [#2014](https://github.com/puppetlabs/puppetlabs-apache/pull/2014) ([jplindquist](https://github.com/jplindquist))
+- Add support for SetInputFilter directive [#2007](https://github.com/puppetlabs/puppetlabs-apache/pull/2007) ([HoucemEddine](https://github.com/HoucemEddine))
+- [MODULES-10530] Add request limiting directives on virtual host level [#1996](https://github.com/puppetlabs/puppetlabs-apache/pull/1996) ([aursu](https://github.com/aursu))
+- [MODULES-10528] Add ErrorLogFormat directive on virtual host level [#1995](https://github.com/puppetlabs/puppetlabs-apache/pull/1995) ([aursu](https://github.com/aursu))
+- Add template variables and parameters for ModSecurity Audit Logs [#1988](https://github.com/puppetlabs/puppetlabs-apache/pull/1988) ([jplindquist](https://github.com/jplindquist))
+- (MODULES-10432) Add mod_auth_openidc support [#1987](https://github.com/puppetlabs/puppetlabs-apache/pull/1987) ([asieraguado](https://github.com/asieraguado))
 
 ### Fixed
 
-- \(MODULES-10712\) Fix mod\_ldap on RH/CentOS 5 and 6 [\#2041](https://github.com/puppetlabs/puppetlabs-apache/pull/2041) ([h-haaks](https://github.com/h-haaks))
-- Update mod\_dir, alias\_icons\_path, error\_documents\_path for CentOS 8 [\#2038](https://github.com/puppetlabs/puppetlabs-apache/pull/2038) ([initrd](https://github.com/initrd))
-- Ensure switching of thread module works on Debian 10 / Ubuntu 20.04 [\#2034](https://github.com/puppetlabs/puppetlabs-apache/pull/2034) ([tuxmea](https://github.com/tuxmea))
-- MODULES-10586 Centos 8: wrong package used to install mod\_authnz\_ldap [\#2021](https://github.com/puppetlabs/puppetlabs-apache/pull/2021) ([farebers](https://github.com/farebers))
-- Re-add package for fcgid on debian/ubuntu machines [\#2006](https://github.com/puppetlabs/puppetlabs-apache/pull/2006) ([vStone](https://github.com/vStone))
-- Use ldap\_trusted\_mode in conditional [\#1999](https://github.com/puppetlabs/puppetlabs-apache/pull/1999) ([dacron](https://github.com/dacron))
-- Typo in oidcsettings.pp [\#1997](https://github.com/puppetlabs/puppetlabs-apache/pull/1997) ([asieraguado](https://github.com/asieraguado))
-- Fix proxy\_html Module to work on Debian 10 [\#1994](https://github.com/puppetlabs/puppetlabs-apache/pull/1994) ([buchstabensalat](https://github.com/buchstabensalat))
-- \(MODULES-10360\) Fix icon paths for RedHat systems [\#1991](https://github.com/puppetlabs/puppetlabs-apache/pull/1991) ([2and3makes23](https://github.com/2and3makes23))
-- SSLProxyEngine on has to be set before any Proxydirective using it [\#1989](https://github.com/puppetlabs/puppetlabs-apache/pull/1989) ([zivis](https://github.com/zivis))
+- (MODULES-10712) Fix mod_ldap on RH/CentOS 5 and 6 [#2041](https://github.com/puppetlabs/puppetlabs-apache/pull/2041) ([h-haaks](https://github.com/h-haaks))
+- Update mod_dir, alias_icons_path, error_documents_path for CentOS 8 [#2038](https://github.com/puppetlabs/puppetlabs-apache/pull/2038) ([initrd](https://github.com/initrd))
+- Ensure switching of thread module works on Debian 10 / Ubuntu 20.04 [#2034](https://github.com/puppetlabs/puppetlabs-apache/pull/2034) ([tuxmea](https://github.com/tuxmea))
+- MODULES-10586 Centos 8: wrong package used to install mod_authnz_ldap [#2021](https://github.com/puppetlabs/puppetlabs-apache/pull/2021) ([farebers](https://github.com/farebers))
+- Re-add package for fcgid on debian/ubuntu machines [#2006](https://github.com/puppetlabs/puppetlabs-apache/pull/2006) ([vStone](https://github.com/vStone))
+- Use ldap_trusted_mode in conditional [#1999](https://github.com/puppetlabs/puppetlabs-apache/pull/1999) ([dacron](https://github.com/dacron))
+- Typo in oidcsettings.pp [#1997](https://github.com/puppetlabs/puppetlabs-apache/pull/1997) ([asieraguado](https://github.com/asieraguado))
+- Fix proxy_html Module to work on Debian 10 [#1994](https://github.com/puppetlabs/puppetlabs-apache/pull/1994) ([buchstabensalat](https://github.com/buchstabensalat))
+- (MODULES-10360) Fix icon paths for RedHat systems [#1991](https://github.com/puppetlabs/puppetlabs-apache/pull/1991) ([2and3makes23](https://github.com/2and3makes23))
+- SSLProxyEngine on has to be set before any Proxydirective using it [#1989](https://github.com/puppetlabs/puppetlabs-apache/pull/1989) ([zivis](https://github.com/zivis))
 
-## [v5.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.4.0) (2020-01-22)
+## [v5.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.4.0) - 2020-01-23
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.3.0...v5.4.0)
 
 ### Added
 
-- Add an apache::vhost::fragment define [\#1980](https://github.com/puppetlabs/puppetlabs-apache/pull/1980) ([ekohl](https://github.com/ekohl))
+- Add an apache::vhost::fragment define [#1980](https://github.com/puppetlabs/puppetlabs-apache/pull/1980) ([ekohl](https://github.com/ekohl))
 
 ### Fixed
 
-- \(MODULES-10391\) ssl\_protocol includes SSLv2 and SSLv3 on all platforms [\#1990](https://github.com/puppetlabs/puppetlabs-apache/pull/1990) ([legooolas](https://github.com/legooolas))
+- (MODULES-10391) ssl_protocol includes SSLv2 and SSLv3 on all platforms [#1990](https://github.com/puppetlabs/puppetlabs-apache/pull/1990) ([legooolas](https://github.com/legooolas))
 
-## [v5.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.3.0) (2019-12-11)
+## [v5.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.3.0) - 2019-12-11
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.2.0...v5.3.0)
 
 ### Added
 
-- \(FM-8672\) - Addition of Support for CentOS 8 [\#1977](https://github.com/puppetlabs/puppetlabs-apache/pull/1977) ([david22swan](https://github.com/david22swan))
-- \(MODULES-9948\) Allow switching of thread modules [\#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
+- (FM-8672) - Addition of Support for CentOS 8 [#1977](https://github.com/puppetlabs/puppetlabs-apache/pull/1977) ([david22swan](https://github.com/david22swan))
+- (MODULES-9948) Allow switching of thread modules [#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
 
 ### Fixed
 
-- Fix newline being added before proxy params [\#1984](https://github.com/puppetlabs/puppetlabs-apache/pull/1984) ([oxc](https://github.com/oxc))
-- When using mod jk, we expect the libapache2-mod-jk package to be installed [\#1979](https://github.com/puppetlabs/puppetlabs-apache/pull/1979) ([tuxmea](https://github.com/tuxmea))
-- move unless into manage\_security\_corerules [\#1976](https://github.com/puppetlabs/puppetlabs-apache/pull/1976) ([SimonHoenscheid](https://github.com/SimonHoenscheid))
-- Change mod\_proxy's ProxyTimeout to follow Apache's global timeout [\#1975](https://github.com/puppetlabs/puppetlabs-apache/pull/1975) ([gcoxmoz](https://github.com/gcoxmoz))
-- \(FM-8721\) fix php version and ssl error on redhat8 [\#1973](https://github.com/puppetlabs/puppetlabs-apache/pull/1973) ([sheenaajay](https://github.com/sheenaajay))
+- Fix newline being added before proxy params [#1984](https://github.com/puppetlabs/puppetlabs-apache/pull/1984) ([oxc](https://github.com/oxc))
+- When using mod jk, we expect the libapache2-mod-jk package to be installed [#1979](https://github.com/puppetlabs/puppetlabs-apache/pull/1979) ([tuxmea](https://github.com/tuxmea))
+- move unless into manage_security_corerules [#1976](https://github.com/puppetlabs/puppetlabs-apache/pull/1976) ([SimonHoenscheid](https://github.com/SimonHoenscheid))
+- Change mod_proxy's ProxyTimeout to follow Apache's global timeout [#1975](https://github.com/puppetlabs/puppetlabs-apache/pull/1975) ([gcoxmoz](https://github.com/gcoxmoz))
+- (FM-8721) fix php version and ssl error on redhat8 [#1973](https://github.com/puppetlabs/puppetlabs-apache/pull/1973) ([sheenaajay](https://github.com/sheenaajay))
 
-## [v5.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.2.0) (2019-11-01)
+## [v5.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.2.0) - 2019-11-01
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.1.0...v5.2.0)
 
 ### Added
 
-- Add parameter version for mod security [\#1953](https://github.com/puppetlabs/puppetlabs-apache/pull/1953) ([tuxmea](https://github.com/tuxmea))
-- add possibility to define variables inside VirtualHost definition [\#1947](https://github.com/puppetlabs/puppetlabs-apache/pull/1947) ([trefzer](https://github.com/trefzer))
+- Add parameter version for mod security [#1953](https://github.com/puppetlabs/puppetlabs-apache/pull/1953) ([tuxmea](https://github.com/tuxmea))
+- add possibility to define variables inside VirtualHost definition [#1947](https://github.com/puppetlabs/puppetlabs-apache/pull/1947) ([trefzer](https://github.com/trefzer))
 
 ### Fixed
 
-- \(FM-8662\) Correction in manifests/mod/ssl.pp for SLES 11 [\#1963](https://github.com/puppetlabs/puppetlabs-apache/pull/1963) ([sanfrancrisko](https://github.com/sanfrancrisko))
-- always quote ExpiresDefault in vhost::directories [\#1958](https://github.com/puppetlabs/puppetlabs-apache/pull/1958) ([evgeni](https://github.com/evgeni))
-- MODULES-9904 Fix lbmethod module load order [\#1956](https://github.com/puppetlabs/puppetlabs-apache/pull/1956) ([optiz0r](https://github.com/optiz0r))
-- Add owner, group, file\_mode and show\_diff to apache::custom\_config [\#1942](https://github.com/puppetlabs/puppetlabs-apache/pull/1942) ([treydock](https://github.com/treydock))
-- Add shibboleth support for Debian 10 [\#1939](https://github.com/puppetlabs/puppetlabs-apache/pull/1939) ([fabbks](https://github.com/fabbks))
+- (FM-8662) Correction in manifests/mod/ssl.pp for SLES 11 [#1963](https://github.com/puppetlabs/puppetlabs-apache/pull/1963) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- always quote ExpiresDefault in vhost::directories [#1958](https://github.com/puppetlabs/puppetlabs-apache/pull/1958) ([evgeni](https://github.com/evgeni))
+- MODULES-9904 Fix lbmethod module load order [#1956](https://github.com/puppetlabs/puppetlabs-apache/pull/1956) ([optiz0r](https://github.com/optiz0r))
+- Add owner, group, file_mode and show_diff to apache::custom_config [#1942](https://github.com/puppetlabs/puppetlabs-apache/pull/1942) ([treydock](https://github.com/treydock))
+- Add shibboleth support for Debian 10 [#1939](https://github.com/puppetlabs/puppetlabs-apache/pull/1939) ([fabbks](https://github.com/fabbks))
 
-## [v5.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.1.0) (2019-09-13)
+## [v5.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.1.0) - 2019-09-13
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.0.0...v5.1.0)
 
 ### Added
 
-- \(FM-8393\) add support on Debian 10 [\#1945](https://github.com/puppetlabs/puppetlabs-apache/pull/1945) ([ThoughtCrhyme](https://github.com/ThoughtCrhyme))
-- FM-8140 Add Redhat 8 support [\#1941](https://github.com/puppetlabs/puppetlabs-apache/pull/1941) ([sheenaajay](https://github.com/sheenaajay))
-- \(FM-8214\) converted to use litmus [\#1938](https://github.com/puppetlabs/puppetlabs-apache/pull/1938) ([tphoney](https://github.com/tphoney))
-- \(MODULES-9668 \) Please make ProxyRequests setting in vhost.pp configurable [\#1935](https://github.com/puppetlabs/puppetlabs-apache/pull/1935) ([aukesj](https://github.com/aukesj))
-- Added unmanaged\_path and custom\_fragment options to userdir [\#1931](https://github.com/puppetlabs/puppetlabs-apache/pull/1931) ([GeorgeCox](https://github.com/GeorgeCox))
-- Add LDAP parameters to httpd.conf [\#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
-- Add LDAPReferrals configuration parameter [\#1928](https://github.com/puppetlabs/puppetlabs-apache/pull/1928) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+- (FM-8393) add support on Debian 10 [#1945](https://github.com/puppetlabs/puppetlabs-apache/pull/1945) ([ThoughtCrhyme](https://github.com/ThoughtCrhyme))
+- FM-8140 Add Redhat 8 support [#1941](https://github.com/puppetlabs/puppetlabs-apache/pull/1941) ([sheenaajay](https://github.com/sheenaajay))
+- (FM-8214) converted to use litmus [#1938](https://github.com/puppetlabs/puppetlabs-apache/pull/1938) ([tphoney](https://github.com/tphoney))
+- (MODULES-9668 ) Please make ProxyRequests setting in vhost.pp configurable [#1935](https://github.com/puppetlabs/puppetlabs-apache/pull/1935) ([aukesj](https://github.com/aukesj))
+- Added unmanaged_path and custom_fragment options to userdir [#1931](https://github.com/puppetlabs/puppetlabs-apache/pull/1931) ([GeorgeCox](https://github.com/GeorgeCox))
+- Add LDAP parameters to httpd.conf [#1930](https://github.com/puppetlabs/puppetlabs-apache/pull/1930) ([daveseff](https://github.com/daveseff))
+- Add LDAPReferrals configuration parameter [#1928](https://github.com/puppetlabs/puppetlabs-apache/pull/1928) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
 
 ### Fixed
 
-- \(MODULES-9104\) Add file\_mode to config files. [\#1922](https://github.com/puppetlabs/puppetlabs-apache/pull/1922) ([stevegarn](https://github.com/stevegarn))
-- \(bugfix\) Add default package name for mod\_ldap [\#1913](https://github.com/puppetlabs/puppetlabs-apache/pull/1913) ([turnopil](https://github.com/turnopil))
-- Remove event mpm when using prefork, worker or itk [\#1905](https://github.com/puppetlabs/puppetlabs-apache/pull/1905) ([tuxmea](https://github.com/tuxmea))
+- (MODULES-9104) Add file_mode to config files. [#1922](https://github.com/puppetlabs/puppetlabs-apache/pull/1922) ([stevegarn](https://github.com/stevegarn))
+- (bugfix) Add default package name for mod_ldap [#1913](https://github.com/puppetlabs/puppetlabs-apache/pull/1913) ([turnopil](https://github.com/turnopil))
+- Remove event mpm when using prefork, worker or itk [#1905](https://github.com/puppetlabs/puppetlabs-apache/pull/1905) ([tuxmea](https://github.com/tuxmea))
 
-## [v5.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.0.0) (2019-05-20)
+## [v5.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.0.0) - 2019-05-20
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.1.0...v5.0.0)
 
+### Added
+
+- (FM-7923) Implement Puppet Strings [#1916](https://github.com/puppetlabs/puppetlabs-apache/pull/1916) ([eimlav](https://github.com/eimlav))
+- Define SCL package name for mod_ldap [#1893](https://github.com/puppetlabs/puppetlabs-apache/pull/1893) ([treydock](https://github.com/treydock))
+
 ### Changed
+- pdksync - (MODULES-8444) - Raise lower Puppet bound [#1908](https://github.com/puppetlabs/puppetlabs-apache/pull/1908) ([david22swan](https://github.com/david22swan))
+
+### Fixed
+
+- (MODULES-9014) Improve SSLSessionTickets handling [#1923](https://github.com/puppetlabs/puppetlabs-apache/pull/1923) ([FredericLespez](https://github.com/FredericLespez))
+- (MODULES-8931) Fix stahnma/epel failures [#1914](https://github.com/puppetlabs/puppetlabs-apache/pull/1914) ([eimlav](https://github.com/eimlav))
+- Fix wsgi_daemon_process to support hash data type [#1884](https://github.com/puppetlabs/puppetlabs-apache/pull/1884) ([mdechiaro](https://github.com/mdechiaro))
 
-- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#1908](https://github.com/puppetlabs/puppetlabs-apache/pull/1908) ([david22swan](https://github.com/david22swan))
+## [4.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.1.0) - 2019-04-05
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.0.0...4.1.0)
 
 ### Added
 
-- \(FM-7923\) Implement Puppet Strings [\#1916](https://github.com/puppetlabs/puppetlabs-apache/pull/1916) ([eimlav](https://github.com/eimlav))
-- Define SCL package name for mod\_ldap [\#1893](https://github.com/puppetlabs/puppetlabs-apache/pull/1893) ([treydock](https://github.com/treydock))
+- (MODULES-7196) Allow setting CASRootProxiedAs per virtualhost (replaces #1857) [#1900](https://github.com/puppetlabs/puppetlabs-apache/pull/1900) ([Lavinia-Dan](https://github.com/Lavinia-Dan))
+- (feat) - Amazon Linux 2 compatibility added [#1898](https://github.com/puppetlabs/puppetlabs-apache/pull/1898) ([david22swan](https://github.com/david22swan))
+- (MODULES-8731) Allow CIDRs for proxy_ips/internal_proxy in remoteip [#1891](https://github.com/puppetlabs/puppetlabs-apache/pull/1891) ([JAORMX](https://github.com/JAORMX))
+- Manage all mod_remoteip parameters supported by Apache [#1882](https://github.com/puppetlabs/puppetlabs-apache/pull/1882) ([johanfleury](https://github.com/johanfleury))
+- MODULES-8541 : Allow HostnameLookups to be modified [#1881](https://github.com/puppetlabs/puppetlabs-apache/pull/1881) ([k2patel](https://github.com/k2patel))
+- Add support for mod_http2 [#1867](https://github.com/puppetlabs/puppetlabs-apache/pull/1867) ([smortex](https://github.com/smortex))
+- Added code to paramertize the libphp prefix [#1852](https://github.com/puppetlabs/puppetlabs-apache/pull/1852) ([grahamuk2018](https://github.com/grahamuk2018))
+- Added WSGI Options WSGIApplicationGroup and WSGIPythonOptimize [#1847](https://github.com/puppetlabs/puppetlabs-apache/pull/1847) ([emetriqLikedeeler](https://github.com/emetriqLikedeeler))
 
 ### Fixed
 
-- \(MODULES-9014\) Improve SSLSessionTickets handling [\#1923](https://github.com/puppetlabs/puppetlabs-apache/pull/1923) ([FredericLespez](https://github.com/FredericLespez))
-- \(MODULES-8931\) Fix stahnma/epel failures [\#1914](https://github.com/puppetlabs/puppetlabs-apache/pull/1914) ([eimlav](https://github.com/eimlav))
-- Fix wsgi\_daemon\_process to support hash data type [\#1884](https://github.com/puppetlabs/puppetlabs-apache/pull/1884) ([mdechiaro](https://github.com/mdechiaro))
+- (bugfix) set kernel for facter version test [#1895](https://github.com/puppetlabs/puppetlabs-apache/pull/1895) ([tphoney](https://github.com/tphoney))
+- (MODULES-5990) - Managing conf_enabled [#1875](https://github.com/puppetlabs/puppetlabs-apache/pull/1875) ([david22swan](https://github.com/david22swan))
 
-## [4.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.1.0) (2019-04-05)
+## [4.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.0.0) - 2019-01-10
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.0.0...4.1.0)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...4.0.0)
 
 ### Added
 
-- \(MODULES-7196\) Allow setting CASRootProxiedAs per virtualhost \(replaces \#1857\) [\#1900](https://github.com/puppetlabs/puppetlabs-apache/pull/1900) ([Lavinia-Dan](https://github.com/Lavinia-Dan))
-- \(feat\) - Amazon Linux 2 compatibility added [\#1898](https://github.com/puppetlabs/puppetlabs-apache/pull/1898) ([david22swan](https://github.com/david22swan))
-- \(MODULES-8731\) Allow CIDRs for proxy\_ips/internal\_proxy in remoteip [\#1891](https://github.com/puppetlabs/puppetlabs-apache/pull/1891) ([JAORMX](https://github.com/JAORMX))
-- Manage all mod\_remoteip parameters supported by Apache [\#1882](https://github.com/puppetlabs/puppetlabs-apache/pull/1882) ([johanfleury](https://github.com/johanfleury))
-- MODULES-8541 : Allow HostnameLookups to be modified [\#1881](https://github.com/puppetlabs/puppetlabs-apache/pull/1881) ([k2patel](https://github.com/k2patel))
-- Add support for mod\_http2 [\#1867](https://github.com/puppetlabs/puppetlabs-apache/pull/1867) ([smortex](https://github.com/smortex))
-- Added code to paramertize the libphp prefix [\#1852](https://github.com/puppetlabs/puppetlabs-apache/pull/1852) ([grahamuk2018](https://github.com/grahamuk2018))
-- Added WSGI Options WSGIApplicationGroup and WSGIPythonOptimize [\#1847](https://github.com/puppetlabs/puppetlabs-apache/pull/1847) ([emetriqLikedeeler](https://github.com/emetriqLikedeeler))
+- (Modules 8141/Modules 8379) - Addition of support for SLES 15 [#1862](https://github.com/puppetlabs/puppetlabs-apache/pull/1862) ([david22swan](https://github.com/david22swan))
+
+### Changed
+- default server_tokens to prod - more secure default [#1746](https://github.com/puppetlabs/puppetlabs-apache/pull/1746) ([juju4](https://github.com/juju4))
 
 ### Fixed
 
-- \(bugfix\) set kernel for facter version test [\#1895](https://github.com/puppetlabs/puppetlabs-apache/pull/1895) ([tphoney](https://github.com/tphoney))
-- \(MODULES-5990\) - Managing conf\_enabled [\#1875](https://github.com/puppetlabs/puppetlabs-apache/pull/1875) ([david22swan](https://github.com/david22swan))
+- (MODULES-5990) - conf-enabled defaulted to undef [#1869](https://github.com/puppetlabs/puppetlabs-apache/pull/1869) ([david22swan](https://github.com/david22swan))
+- pdksync - (FM-7655) Fix rubygems-update for ruby < 2.3 [#1866](https://github.com/puppetlabs/puppetlabs-apache/pull/1866) ([tphoney](https://github.com/tphoney))
 
-## [4.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.0.0) (2019-01-10)
+## [3.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.5.0) - 2018-12-17
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...4.0.0)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.4.0...3.5.0)
+
+### Added
+
+- (MODULES-5990) Addition of 'IncludeOptional conf-enabled/*.conf' to apache2.conf' on Debian Family OS [#1851](https://github.com/puppetlabs/puppetlabs-apache/pull/1851) ([david22swan](https://github.com/david22swan))
+- (MODULES-8107) - Support added for Ubuntu 18.04. [#1850](https://github.com/puppetlabs/puppetlabs-apache/pull/1850) ([david22swan](https://github.com/david22swan))
+- (MODULES-8108) - Support added for Debian 9 [#1849](https://github.com/puppetlabs/puppetlabs-apache/pull/1849) ([david22swan](https://github.com/david22swan))
+- Add option to add comments to the header of a vhost file [#1841](https://github.com/puppetlabs/puppetlabs-apache/pull/1841) ([jovandeginste](https://github.com/jovandeginste))
+- SCL support for httpd and php7.1 [#1822](https://github.com/puppetlabs/puppetlabs-apache/pull/1822) ([mmoll](https://github.com/mmoll))
+
+### Fixed
+
+- (FM-7605) - Disabling conf_enabled on Ubuntu 18.04  by default as it conflicts with Shibboleth causing errors with apache2. [#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
+- (MODULES-8429) Update GPG key for phusion passenger [#1848](https://github.com/puppetlabs/puppetlabs-apache/pull/1848) ([abottchen](https://github.com/abottchen))
+- Fix default vhost priority in readme [#1843](https://github.com/puppetlabs/puppetlabs-apache/pull/1843) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+- fix apache::mod::jk example typo and add link for more info [#1812](https://github.com/puppetlabs/puppetlabs-apache/pull/1812) ([xorpaul](https://github.com/xorpaul))
+- MODULES-7379: Fixing syntax by adding newline [#1803](https://github.com/puppetlabs/puppetlabs-apache/pull/1803) ([wimvr](https://github.com/wimvr))
+- ensure mpm_event is disabled under debian 9 if mpm itk is used [#1766](https://github.com/puppetlabs/puppetlabs-apache/pull/1766) ([zivis](https://github.com/zivis))
+
+## [3.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.4.0) - 2018-09-28
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.3.0...3.4.0)
+
+### Added
+
+- pdksync - (FM-7392) - Puppet 6 Testing Changes [#1838](https://github.com/puppetlabs/puppetlabs-apache/pull/1838) ([pmcmaw](https://github.com/pmcmaw))
+- pdksync - (MODULES-6805) metadata.json shows support for puppet 6 [#1836](https://github.com/puppetlabs/puppetlabs-apache/pull/1836) ([tphoney](https://github.com/tphoney))
+
+### Fixed
+
+- Fix "audit_log_relevant_status" typo in README.md [#1830](https://github.com/puppetlabs/puppetlabs-apache/pull/1830) ([smokris](https://github.com/smokris))
+
+## [3.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.3.0) - 2018-09-12
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.2.0...3.3.0)
+
+### Added
+
+- pdksync - (MODULES-7705) - Bumping stdlib dependency from < 5.0.0 to < 6.0.0 [#1821](https://github.com/puppetlabs/puppetlabs-apache/pull/1821) ([pmcmaw](https://github.com/pmcmaw))
+- Add support for ProxyTimeout [#1805](https://github.com/puppetlabs/puppetlabs-apache/pull/1805) ([agoodno](https://github.com/agoodno))
+- Rework passenger VHost and Directories [#1778](https://github.com/puppetlabs/puppetlabs-apache/pull/1778) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- MODULES-7575 reverse sort the aliases [#1808](https://github.com/puppetlabs/puppetlabs-apache/pull/1808) ([k2patel](https://github.com/k2patel))
+
+## [3.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.2.0) - 2018-06-29
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.1.0...3.2.0)
+
+### Added
+
+- (MODULES-7343) - Allow overrides by adding mod_libs in apache class [#1800](https://github.com/puppetlabs/puppetlabs-apache/pull/1800) ([karelyatin](https://github.com/karelyatin))
+- Allow `apache::mod::passenger::passenger_pre_start` to accept multiple URIs [#1776](https://github.com/puppetlabs/puppetlabs-apache/pull/1776) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- fixes for OpenSUSE ans SLES [#1783](https://github.com/puppetlabs/puppetlabs-apache/pull/1783) ([tuxmea](https://github.com/tuxmea))
+
+## [3.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.1.0) - 2018-03-22
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.0.0...3.1.0)
+
+### Added
+
+- Allow overriding passenger_group in apache::vhost [#1769](https://github.com/puppetlabs/puppetlabs-apache/pull/1769) ([smortex](https://github.com/smortex))
+
+## [3.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.0.0) - 2018-02-20
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.1...3.0.0)
+
+## [2.3.1](https://github.com/puppetlabs/puppetlabs-apache/tree/2.3.1) - 2018-02-02
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.0...2.3.1)
+
+### Added
+
+- Add LimitRequestFields parameter in main configuration [#1742](https://github.com/puppetlabs/puppetlabs-apache/pull/1742) ([geekix](https://github.com/geekix))
+- Add enable capabilities to itk [#1687](https://github.com/puppetlabs/puppetlabs-apache/pull/1687) ([edestecd](https://github.com/edestecd))
+- updated log formats to include client ip [#1686](https://github.com/puppetlabs/puppetlabs-apache/pull/1686) ([tenajsystems](https://github.com/tenajsystems))
+- MODULES-5452 - add $options to `balancer` type [#1668](https://github.com/puppetlabs/puppetlabs-apache/pull/1668) ([cedef](https://github.com/cedef))
+- [Modules 5385] Include support for Apache 2.4 mod_authz_host directives in apache::mod::status [#1667](https://github.com/puppetlabs/puppetlabs-apache/pull/1667) ([EmersonPrado](https://github.com/EmersonPrado))
+- Expose loadfile_name option to mod::python class [#1663](https://github.com/puppetlabs/puppetlabs-apache/pull/1663) ([traylenator](https://github.com/traylenator))
+- Add ShibCompatValidUser option to vhost config [#1657](https://github.com/puppetlabs/puppetlabs-apache/pull/1657) ([mdechiaro](https://github.com/mdechiaro))
+
+### Fixed
+
+- Actually create CASScrubRequestHeaders setting in _auth_cas.erb [#1730](https://github.com/puppetlabs/puppetlabs-apache/pull/1730) ([](https://github.com/))
+- Fix typos [#1728](https://github.com/puppetlabs/puppetlabs-apache/pull/1728) ([hfm](https://github.com/hfm))
+- [MODULES-5644] Package name is libapache2-mpm-itk for Debian 9 [#1724](https://github.com/puppetlabs/puppetlabs-apache/pull/1724) ([zivis](https://github.com/zivis))
+- Fix case of setting apache::mpm_module to false [#1720](https://github.com/puppetlabs/puppetlabs-apache/pull/1720) ([edestecd](https://github.com/edestecd))
+- remoteip: Notify apache::service instead of service['httpd'] [#1684](https://github.com/puppetlabs/puppetlabs-apache/pull/1684) ([sergiik](https://github.com/sergiik))
+
+### Other
+
+- MODULES-6224: rename apache mod ldap file [#1733](https://github.com/puppetlabs/puppetlabs-apache/pull/1733) ([cedef](https://github.com/cedef))
+
+## [2.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/2.3.0) - 2017-10-11
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/2.2.0...2.3.0)
+
+## [2.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/2.2.0) - 2017-10-05
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/2.1.0...2.2.0)
+
+### Added
+
+- (MODULES-2062) updates prefork.conf params for apache 2.4 [#1685](https://github.com/puppetlabs/puppetlabs-apache/pull/1685) ([eputnam](https://github.com/eputnam))
+- MODULES-5426 : Add support for all mod_passenger server config settings	 [#1665](https://github.com/puppetlabs/puppetlabs-apache/pull/1665) ([dacat](https://github.com/dacat))
+
+### Fixed
+
+- Wsgi inclusion [#1702](https://github.com/puppetlabs/puppetlabs-apache/pull/1702) ([willmeek](https://github.com/willmeek))
+- MODULES-5649 Do not install mod_fastcgi on el7 [#1701](https://github.com/puppetlabs/puppetlabs-apache/pull/1701) ([tphoney](https://github.com/tphoney))
+
+## [2.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/2.1.0) - 2017-09-13
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.1...2.1.0)
+
+## [1.11.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.11.1) - 2017-09-13
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...1.11.1)
+
+### Added
+
+- [Modules 5519] Add port parameter in class mod::jk [#1679](https://github.com/puppetlabs/puppetlabs-apache/pull/1679) ([EmersonPrado](https://github.com/EmersonPrado))
+- (MODULES-3942) make sure mod_alias is loaded with redirectmatch [#1675](https://github.com/puppetlabs/puppetlabs-apache/pull/1675) ([eputnam](https://github.com/eputnam))
+- [Modules 5492] - Include treatment for absolute, relative and pipe paths for JkLogFile and JkShmFile for class mod::jk [#1671](https://github.com/puppetlabs/puppetlabs-apache/pull/1671) ([EmersonPrado](https://github.com/EmersonPrado))
+- Replace deprecated type checking with Puppet 4 types [#1670](https://github.com/puppetlabs/puppetlabs-apache/pull/1670) ([ekohl](https://github.com/ekohl))
+- [Modules 4746] Creates class for managing Apache mod_jk connector [#1630](https://github.com/puppetlabs/puppetlabs-apache/pull/1630) ([EmersonPrado](https://github.com/EmersonPrado))
+- Adds apache::mod::macro [#1590](https://github.com/puppetlabs/puppetlabs-apache/pull/1590) ([kyledecot](https://github.com/kyledecot))
+
+### Fixed
+
+- Setup SSL/TLS client auth without overly broad trusts for client certificates [#1680](https://github.com/puppetlabs/puppetlabs-apache/pull/1680) ([epackorigan](https://github.com/epackorigan))
+
+## [2.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/2.0.0) - 2017-07-26
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0)
+
+### Added
+
+- (MODULES-4933) Allow custom UserDir string [#1650](https://github.com/puppetlabs/puppetlabs-apache/pull/1650) ([hunner](https://github.com/hunner))
+- Add proxy_pass in directory template for location context [#1644](https://github.com/puppetlabs/puppetlabs-apache/pull/1644) ([toteva](https://github.com/toteva))
+- Don't install proxy_html package in ubuntu xenial [#1643](https://github.com/puppetlabs/puppetlabs-apache/pull/1643) ([amateo](https://github.com/amateo))
+- (MODULES-5121) Allow ssl.conf to have better defaults [#1636](https://github.com/puppetlabs/puppetlabs-apache/pull/1636) ([hunner](https://github.com/hunner))
+- MODULES-3838 Pass mod_packages through init.pp to allow overrides [#1631](https://github.com/puppetlabs/puppetlabs-apache/pull/1631) ([optiz0r](https://github.com/optiz0r))
+- MODULES-4946 Add HTTP protocol options support [#1629](https://github.com/puppetlabs/puppetlabs-apache/pull/1629) ([dspinellis](https://github.com/dspinellis))
+- Use enclose_ipv6 function from stdlib [#1624](https://github.com/puppetlabs/puppetlabs-apache/pull/1624) ([acritox](https://github.com/acritox))
+- (MODULES-4819) remove include_src parameter from vhost_spec [#1617](https://github.com/puppetlabs/puppetlabs-apache/pull/1617) ([eputnam](https://github.com/eputnam))
+- MODULES-4816 - new param for mod::security class [#1616](https://github.com/puppetlabs/puppetlabs-apache/pull/1616) ([cedef](https://github.com/cedef))
+- Add WSGIRestrictEmbedded to apache::mod::wsgi [#1614](https://github.com/puppetlabs/puppetlabs-apache/pull/1614) ([dsavineau](https://github.com/dsavineau))
+- Enable configuring CA file in ssl.conf [#1612](https://github.com/puppetlabs/puppetlabs-apache/pull/1612) ([JAORMX](https://github.com/JAORMX))
+- MODULES-4737 - Additional class params for mod ssl [#1611](https://github.com/puppetlabs/puppetlabs-apache/pull/1611) ([cedef](https://github.com/cedef))
+- [msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config [#1606](https://github.com/puppetlabs/puppetlabs-apache/pull/1606) ([wilson208](https://github.com/wilson208))
+- Limit except support [#1605](https://github.com/puppetlabs/puppetlabs-apache/pull/1605) ([ffapitalle](https://github.com/ffapitalle))
+- (FM-6116) - Adding POT file for metadata.json [#1604](https://github.com/puppetlabs/puppetlabs-apache/pull/1604) ([pmcmaw](https://github.com/pmcmaw))
+- [MODULES-4528] Replace Puppet.version.to_f version comparison from spec_helper.rb [#1603](https://github.com/puppetlabs/puppetlabs-apache/pull/1603) ([wilson208](https://github.com/wilson208))
+- Add param for AllowOverride in the userdir.conf template [#1602](https://github.com/puppetlabs/puppetlabs-apache/pull/1602) ([dstepe](https://github.com/dstepe))
+- The base tag also needs link rewriting [#1599](https://github.com/puppetlabs/puppetlabs-apache/pull/1599) ([tobixen](https://github.com/tobixen))
+- MODULES-4391 add SSLProxyVerifyDepth and SSLProxyCACertificateFile directives [#1596](https://github.com/puppetlabs/puppetlabs-apache/pull/1596) ([hex2a](https://github.com/hex2a))
+- add parser function apache_pw_hash [#1592](https://github.com/puppetlabs/puppetlabs-apache/pull/1592) ([aptituz](https://github.com/aptituz))
+- Add mod_{authnz_pam,intercept_form_submit,lookup_identity} [#1588](https://github.com/puppetlabs/puppetlabs-apache/pull/1588) ([ekohl](https://github.com/ekohl))
+- Allow multiple ports per vhost [#1583](https://github.com/puppetlabs/puppetlabs-apache/pull/1583) ([tjikkun](https://github.com/tjikkun))
+- Feature/add charset [#1582](https://github.com/puppetlabs/puppetlabs-apache/pull/1582) ([harakiri406](https://github.com/harakiri406))
+- Add FileETag [#1581](https://github.com/puppetlabs/puppetlabs-apache/pull/1581) ([kuchosauronad0](https://github.com/kuchosauronad0))
+- (MODULES-4156) adds RequestHeader directive to vhost template #puppethack [#1573](https://github.com/puppetlabs/puppetlabs-apache/pull/1573) ([eputnam](https://github.com/eputnam))
+- add passenger_max_requests option per vhost [#1517](https://github.com/puppetlabs/puppetlabs-apache/pull/1517) ([pulecp](https://github.com/pulecp))
 
 ### Changed
+- MODULES-4824: Update the version compatibility to >= 4.7.0 < 5.0.0 [#1628](https://github.com/puppetlabs/puppetlabs-apache/pull/1628) ([angrox](https://github.com/angrox))
+- Migrate to puppet4 datatypes [#1621](https://github.com/puppetlabs/puppetlabs-apache/pull/1621) ([bastelfreak](https://github.com/bastelfreak))
+- Set default keepalive to On [#1434](https://github.com/puppetlabs/puppetlabs-apache/pull/1434) ([sathieu](https://github.com/sathieu))
+
+### Fixed
+
+- When absolute path is specified for access_log_file/error_log_file, don't prepend logbase [#1633](https://github.com/puppetlabs/puppetlabs-apache/pull/1633) ([ca-asm](https://github.com/ca-asm))
+- Fix single quoted string [#1623](https://github.com/puppetlabs/puppetlabs-apache/pull/1623) ([lordbink](https://github.com/lordbink))
+- fixed apache group for SUSE/SLES Systems (checked for SLES11/12) [#1613](https://github.com/puppetlabs/puppetlabs-apache/pull/1613) ([pseiler](https://github.com/pseiler))
+- the wsgi_script_aliases need to support array type of value [#1609](https://github.com/puppetlabs/puppetlabs-apache/pull/1609) ([netman2k](https://github.com/netman2k))
+- Fix alignement in vhost.conf [#1607](https://github.com/puppetlabs/puppetlabs-apache/pull/1607) ([sathieu](https://github.com/sathieu))
+- [apache::mod::cgi] Fix: ordering constraint for mod_cgi [#1585](https://github.com/puppetlabs/puppetlabs-apache/pull/1585) ([punycode](https://github.com/punycode))
+- Fix vhost template [#1552](https://github.com/puppetlabs/puppetlabs-apache/pull/1552) ([iamspido](https://github.com/iamspido))
+
+### Other
 
-- default server\_tokens to prod - more secure default [\#1746](https://github.com/puppetlabs/puppetlabs-apache/pull/1746) ([juju4](https://github.com/juju4))
+- Ensure that ProxyPreserveHost is set even when ProxyPass (etc) are not. [#1639](https://github.com/puppetlabs/puppetlabs-apache/pull/1639) ([tpdownes](https://github.com/tpdownes))
+- Added supplementary_groups to the user resource [#1608](https://github.com/puppetlabs/puppetlabs-apache/pull/1608) ([chgarling](https://github.com/chgarling))
+- Modules-4500 Add optional "AdvertiseFrequency" directive in cluster.conf template [#1601](https://github.com/puppetlabs/puppetlabs-apache/pull/1601) ([EmersonPrado](https://github.com/EmersonPrado))
+
+## [1.11.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.11.0) - 2016-12-19
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...1.11.0)
 
 ### Added
 
-- \(Modules 8141/Modules 8379\) - Addition of support for SLES 15 [\#1862](https://github.com/puppetlabs/puppetlabs-apache/pull/1862) ([david22swan](https://github.com/david22swan))
-- SCL support for httpd and php7.1 [\#1822](https://github.com/puppetlabs/puppetlabs-apache/pull/1822) ([mmoll](https://github.com/mmoll))
+- (MODULES-4213) Adds spec test for rewrite_inherit [#1575](https://github.com/puppetlabs/puppetlabs-apache/pull/1575) ([bmjen](https://github.com/bmjen))
+- Add ability to set SSLStaplingReturnResponderErrors on server level [#1571](https://github.com/puppetlabs/puppetlabs-apache/pull/1571) ([tjikkun](https://github.com/tjikkun))
+- (MODULES-4213) Allow global rewrite rules inheritance in vhosts [#1569](https://github.com/puppetlabs/puppetlabs-apache/pull/1569) ([EmersonPrado](https://github.com/EmersonPrado))
+- mod_proxy_balancer manager [#1562](https://github.com/puppetlabs/puppetlabs-apache/pull/1562) ([sathieu](https://github.com/sathieu))
+- Add SSL stapling [#1561](https://github.com/puppetlabs/puppetlabs-apache/pull/1561) ([tjikkun](https://github.com/tjikkun))
+- ModSec debug logs to use apache logroot parameter [#1560](https://github.com/puppetlabs/puppetlabs-apache/pull/1560) ([scottmullaly](https://github.com/scottmullaly))
+- (MODULES-4049) SLES support [#1554](https://github.com/puppetlabs/puppetlabs-apache/pull/1554) ([eputnam](https://github.com/eputnam))
+- Validate wsgi_chunked_request parameter for vhost [#1553](https://github.com/puppetlabs/puppetlabs-apache/pull/1553) ([JAORMX](https://github.com/JAORMX))
+- (MODULES-4048) SLES 10 support [#1551](https://github.com/puppetlabs/puppetlabs-apache/pull/1551) ([eputnam](https://github.com/eputnam))
+- Support Passenger repo on Amazon Linux [#1549](https://github.com/puppetlabs/puppetlabs-apache/pull/1549) ([seefood](https://github.com/seefood))
+- Support parameter PassengerDataBufferDir [#1548](https://github.com/puppetlabs/puppetlabs-apache/pull/1548) ([seefood](https://github.com/seefood))
+- Allow user to specify alternative package and library names for shibboleth module [#1547](https://github.com/puppetlabs/puppetlabs-apache/pull/1547) ([tpdownes](https://github.com/tpdownes))
+- (FM-5739) removes mocha stubbing [#1540](https://github.com/puppetlabs/puppetlabs-apache/pull/1540) ([eputnam](https://github.com/eputnam))
+- Adding requirement for httpd package [#1539](https://github.com/puppetlabs/puppetlabs-apache/pull/1539) ([jplindquist](https://github.com/jplindquist))
+- Update modulesync_config [51f469d] [#1535](https://github.com/puppetlabs/puppetlabs-apache/pull/1535) ([DavidS](https://github.com/DavidS))
+- Allow the proxy_via setting to be configured [#1534](https://github.com/puppetlabs/puppetlabs-apache/pull/1534) ([bmjen](https://github.com/bmjen))
+- The meier move error log to params [#1533](https://github.com/puppetlabs/puppetlabs-apache/pull/1533) ([bmjen](https://github.com/bmjen))
+- Add path to shibboleth lib [#1532](https://github.com/puppetlabs/puppetlabs-apache/pull/1532) ([gvdb1967](https://github.com/gvdb1967))
+- Add rpaf.conf template parameter [#1531](https://github.com/puppetlabs/puppetlabs-apache/pull/1531) ([gvdb1967](https://github.com/gvdb1967))
+- (MODULES-3712) SLES 11 Support [#1528](https://github.com/puppetlabs/puppetlabs-apache/pull/1528) ([eputnam](https://github.com/eputnam))
+- Settings to control modcluster request size [#1527](https://github.com/puppetlabs/puppetlabs-apache/pull/1527) ([lexkastro](https://github.com/lexkastro))
+- Allow no_proxy_uris to be used within proxy_pass [#1524](https://github.com/puppetlabs/puppetlabs-apache/pull/1524) ([df7cb](https://github.com/df7cb))
+- Update modulesync_config [a3fe424] [#1519](https://github.com/puppetlabs/puppetlabs-apache/pull/1519) ([DavidS](https://github.com/DavidS))
+- Update modulesync_config [0d59329] [#1518](https://github.com/puppetlabs/puppetlabs-apache/pull/1518) ([DavidS](https://github.com/DavidS))
+- Add some more passenger params [#1510](https://github.com/puppetlabs/puppetlabs-apache/pull/1510) ([Reamer](https://github.com/Reamer))
+- MODULES-3682 - config of auth_dbd, include dbd, allow AuthnProviderAlias [#1508](https://github.com/puppetlabs/puppetlabs-apache/pull/1508) ([johndixon](https://github.com/johndixon))
+- mod_passenger: PassengerMaxInstancesPerApp option [#1503](https://github.com/puppetlabs/puppetlabs-apache/pull/1503) ([ygt-davidstirling](https://github.com/ygt-davidstirling))
+- add force option to confd file resource [#1502](https://github.com/puppetlabs/puppetlabs-apache/pull/1502) ([martinpfeifer](https://github.com/martinpfeifer))
+- Auto load Apache::Mod[slotmem_shm] and Apache::Mod[lbmethod_byrequest… [#1499](https://github.com/puppetlabs/puppetlabs-apache/pull/1499) ([sathieu](https://github.com/sathieu))
+- Allow to set SecAuditLog [#1490](https://github.com/puppetlabs/puppetlabs-apache/pull/1490) ([sathieu](https://github.com/sathieu))
+- Add wsgi script aliases match [#1485](https://github.com/puppetlabs/puppetlabs-apache/pull/1485) ([tphoney](https://github.com/tphoney))
+- Add cas_cookie_path_mode param [#1475](https://github.com/puppetlabs/puppetlabs-apache/pull/1475) ([edestecd](https://github.com/edestecd))
+- Added support for apache 2.4 on Amazon Linux [#1473](https://github.com/puppetlabs/puppetlabs-apache/pull/1473) ([lotjuh](https://github.com/lotjuh))
+- Add apache::mod::socache_shmcb so it can be included multiple times [#1471](https://github.com/puppetlabs/puppetlabs-apache/pull/1471) ([mpdude](https://github.com/mpdude))
+- Manage default root directory access rights [#1468](https://github.com/puppetlabs/puppetlabs-apache/pull/1468) ([smoeding](https://github.com/smoeding))
+- Add apache::mod::proxy_wstunnel and tests [#1465](https://github.com/puppetlabs/puppetlabs-apache/pull/1465) ([DavidS](https://github.com/DavidS))
+- Add apache::mod::proxy_wstunnel [#1462](https://github.com/puppetlabs/puppetlabs-apache/pull/1462) ([sathieu](https://github.com/sathieu))
+- add additional directories options for LDAP Auth [#1443](https://github.com/puppetlabs/puppetlabs-apache/pull/1443) ([zivis](https://github.com/zivis))
+- Update _block.erb [#1441](https://github.com/puppetlabs/puppetlabs-apache/pull/1441) ([jostmart](https://github.com/jostmart))
+- Wrap mod_security directives in an IfModule [#1423](https://github.com/puppetlabs/puppetlabs-apache/pull/1423) ([kimor79](https://github.com/kimor79))
 
 ### Fixed
 
-- \(MODULES-5990\) - conf-enabled defaulted to undef [\#1869](https://github.com/puppetlabs/puppetlabs-apache/pull/1869) ([david22swan](https://github.com/david22swan))
-- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#1866](https://github.com/puppetlabs/puppetlabs-apache/pull/1866) ([tphoney](https://github.com/tphoney))
+- Fix conditional in vhost ssl template [#1574](https://github.com/puppetlabs/puppetlabs-apache/pull/1574) ([bmjen](https://github.com/bmjen))
+- Avoid relative classname inclusion [#1566](https://github.com/puppetlabs/puppetlabs-apache/pull/1566) ([roidelapluie](https://github.com/roidelapluie))
+- custom facts shouldn't break structured facts [#1565](https://github.com/puppetlabs/puppetlabs-apache/pull/1565) ([igalic](https://github.com/igalic))
+- (#MODULES-3744) Process $crs_package before $modsec_dir [#1563](https://github.com/puppetlabs/puppetlabs-apache/pull/1563) ([EmersonPrado](https://github.com/EmersonPrado))
+- (MODULES-3972) fixes version errors and small fix for suse ssl [#1557](https://github.com/puppetlabs/puppetlabs-apache/pull/1557) ([eputnam](https://github.com/eputnam))
+- Don't fail if first element of  is not an hash before flattening [#1555](https://github.com/puppetlabs/puppetlabs-apache/pull/1555) ([sathieu](https://github.com/sathieu))
+- [MODULES-3548] SLES 12 fix  [#1545](https://github.com/puppetlabs/puppetlabs-apache/pull/1545) ([HelenCampbell](https://github.com/HelenCampbell))
+- Do not set ssl_certs_dir on FreeBSD [#1538](https://github.com/puppetlabs/puppetlabs-apache/pull/1538) ([smortex](https://github.com/smortex))
+- [MODULES-3882] Don't write empty servername for vhost to template [#1526](https://github.com/puppetlabs/puppetlabs-apache/pull/1526) ([JAORMX](https://github.com/JAORMX))
+- Bug - Port numbers must be quoted [#1525](https://github.com/puppetlabs/puppetlabs-apache/pull/1525) ([blackknight36](https://github.com/blackknight36))
+- Fixes spec tests for apache::mod::disk_cache [#1509](https://github.com/puppetlabs/puppetlabs-apache/pull/1509) ([gerhardsam](https://github.com/gerhardsam))
+- Httpoxy fix [#1506](https://github.com/puppetlabs/puppetlabs-apache/pull/1506) ([simonrondelez](https://github.com/simonrondelez))
+- Fix non breaking space (MODULES-3503) [#1489](https://github.com/puppetlabs/puppetlabs-apache/pull/1489) ([Jeoffreybauvin](https://github.com/Jeoffreybauvin))
+- Fix PassengerRoot under Debian stretch [#1478](https://github.com/puppetlabs/puppetlabs-apache/pull/1478) ([sathieu](https://github.com/sathieu))
+- variety of xenial fixes [#1477](https://github.com/puppetlabs/puppetlabs-apache/pull/1477) ([tphoney](https://github.com/tphoney))
+- fix and make 2.4 require docu more readable [#1466](https://github.com/puppetlabs/puppetlabs-apache/pull/1466) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+- apache::balancer now respects apache::confd_dir [#1463](https://github.com/puppetlabs/puppetlabs-apache/pull/1463) ([traylenator](https://github.com/traylenator))
+
+### Other
+
+- Move ssl.conf to main conf directory on EL7 [#1543](https://github.com/puppetlabs/puppetlabs-apache/pull/1543) ([stbenjam](https://github.com/stbenjam))
+- Support the newer mod_auth_cas config options [#1436](https://github.com/puppetlabs/puppetlabs-apache/pull/1436) ([pcfens](https://github.com/pcfens))
+
+## [1.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.10.0) - 2016-05-19
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...1.10.0)
 
-## [3.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.5.0) (2018-12-17)
+### Added
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.4.0...3.5.0)
+- Remove duplicate shib2 hash element [#1458](https://github.com/puppetlabs/puppetlabs-apache/pull/1458) ([domcleal](https://github.com/domcleal))
+- mod_event: parameters can be unset [#1455](https://github.com/puppetlabs/puppetlabs-apache/pull/1455) ([timogoebel](https://github.com/timogoebel))
+- Set DAV parameters in a directory block [#1454](https://github.com/puppetlabs/puppetlabs-apache/pull/1454) ([jonnytdevops](https://github.com/jonnytdevops))
+- Add support for mod_cluster, an httpd-based load balancer. [#1453](https://github.com/puppetlabs/puppetlabs-apache/pull/1453) ([jonnytdevops](https://github.com/jonnytdevops))
+- Only set SSLCompression when it is set to true. [#1452](https://github.com/puppetlabs/puppetlabs-apache/pull/1452) ([buzzdeee](https://github.com/buzzdeee))
+- Add class apache::vhosts to create apache::vhost resources [#1450](https://github.com/puppetlabs/puppetlabs-apache/pull/1450) ([gerhardsam](https://github.com/gerhardsam))
+- Allow setting KeepAlive related options per vhost [#1447](https://github.com/puppetlabs/puppetlabs-apache/pull/1447) ([antaflos](https://github.com/antaflos))
+
+### Fixed
+
+- Set actual path to apachectl on FreeBSD. [#1448](https://github.com/puppetlabs/puppetlabs-apache/pull/1448) ([smortex](https://github.com/smortex))
+- Revert "changed rpaf Configuration Directives: RPAF -> RPAF_" [#1446](https://github.com/puppetlabs/puppetlabs-apache/pull/1446) ([antaflos](https://github.com/antaflos))
+- mod_event: do not set parameters twice [#1445](https://github.com/puppetlabs/puppetlabs-apache/pull/1445) ([timogoebel](https://github.com/timogoebel))
+- setting options-hash in proxy_pass or proxy_match leads to syntax errors in Apache [#1444](https://github.com/puppetlabs/puppetlabs-apache/pull/1444) ([zivis](https://github.com/zivis))
+- Fixed trailing slash in lib_path on Suse [#1429](https://github.com/puppetlabs/puppetlabs-apache/pull/1429) ([OpenCoreCH](https://github.com/OpenCoreCH))
+
+### Other
+
+- Add simple <Limit> support + ProxyAddHeaders [#1427](https://github.com/puppetlabs/puppetlabs-apache/pull/1427) ([costela](https://github.com/costela))
+
+## [1.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.9.0) - 2016-04-21
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...1.9.0)
 
 ### Added
 
-- \(MODULES-5990\) Addition of 'IncludeOptional conf-enabled/\*.conf' to apache2.conf' on Debian Family OS [\#1851](https://github.com/puppetlabs/puppetlabs-apache/pull/1851) ([david22swan](https://github.com/david22swan))
-- \(MODULES-8107\) - Support added for Ubuntu 18.04. [\#1850](https://github.com/puppetlabs/puppetlabs-apache/pull/1850) ([david22swan](https://github.com/david22swan))
-- \(MODULES-8108\) - Support added for Debian 9 [\#1849](https://github.com/puppetlabs/puppetlabs-apache/pull/1849) ([david22swan](https://github.com/david22swan))
-- Add option to add comments to the header of a vhost file [\#1841](https://github.com/puppetlabs/puppetlabs-apache/pull/1841) ([jovandeginste](https://github.com/jovandeginste))
+- Expose verify_config in apache::vhost::custom [#1433](https://github.com/puppetlabs/puppetlabs-apache/pull/1433) ([cmurphy](https://github.com/cmurphy))
+- (MODULES-3140) explicitly rely on hasrestart if no restart command is… [#1432](https://github.com/puppetlabs/puppetlabs-apache/pull/1432) ([DavidS](https://github.com/DavidS))
+- (MODULES-3274) mod-info: specify the info_path [#1431](https://github.com/puppetlabs/puppetlabs-apache/pull/1431) ([DavidS](https://github.com/DavidS))
+- Update to newest modulesync_configs [9ca280f] [#1426](https://github.com/puppetlabs/puppetlabs-apache/pull/1426) ([DavidS](https://github.com/DavidS))
+- Allow for pagespeed mod to automatically be updated to the latest version [#1422](https://github.com/puppetlabs/puppetlabs-apache/pull/1422) ([lymichaels](https://github.com/lymichaels))
+- Allow package names to be specified for mod_proxy, mod_ldap, and mod_authnz_ldap [#1421](https://github.com/puppetlabs/puppetlabs-apache/pull/1421) ([MG2R](https://github.com/MG2R))
+- Add parameter passanger_log_level [#1420](https://github.com/puppetlabs/puppetlabs-apache/pull/1420) ([samuelb](https://github.com/samuelb))
+- add passenger_high_performance on the vhost level [#1419](https://github.com/puppetlabs/puppetlabs-apache/pull/1419) ([timogoebel](https://github.com/timogoebel))
+- Adding SSLProxyCheckPeerExpire support [#1418](https://github.com/puppetlabs/puppetlabs-apache/pull/1418) ([jasonhancock](https://github.com/jasonhancock))
+- MODULES-3212: add parallel_spec option [#1410](https://github.com/puppetlabs/puppetlabs-apache/pull/1410) ([jlambert121](https://github.com/jlambert121))
+- MODULES-1352 : Better support for Apache 2.4 style require directives implementation [#1408](https://github.com/puppetlabs/puppetlabs-apache/pull/1408) ([witjoh](https://github.com/witjoh))
+- Added vhost options SecRuleRemoveByTag and SecRuleRemoveByMsg [#1407](https://github.com/puppetlabs/puppetlabs-apache/pull/1407) ([FlatKey](https://github.com/FlatKey))
+- Configurability of Collaborative Detection Threshold Levels for OWASP Core Rule Set [#1405](https://github.com/puppetlabs/puppetlabs-apache/pull/1405) ([FlatKey](https://github.com/FlatKey))
+- Configurability of SecDefaultAction for OWASP Core Rule Set [#1403](https://github.com/puppetlabs/puppetlabs-apache/pull/1403) ([FlatKey](https://github.com/FlatKey))
+- MODULES-2179: Implement SetEnvIfNoCase [#1402](https://github.com/puppetlabs/puppetlabs-apache/pull/1402) ([jlambert121](https://github.com/jlambert121))
+- Load mod_xml2enc on Apache >= 2.4 on Debian [#1401](https://github.com/puppetlabs/puppetlabs-apache/pull/1401) ([sathieu](https://github.com/sathieu))
+- Take igalic's suggestion to use bool2httpd [#1400](https://github.com/puppetlabs/puppetlabs-apache/pull/1400) ([tpdownes](https://github.com/tpdownes))
+- Move all ensure parameters from concat::fragment to concat [#1396](https://github.com/puppetlabs/puppetlabs-apache/pull/1396) ([domcleal](https://github.com/domcleal))
+- mod_ssl requires mod_mime for AddType directives [#1394](https://github.com/puppetlabs/puppetlabs-apache/pull/1394) ([sathieu](https://github.com/sathieu))
+- (#3139) Add support for PassengerUser [#1391](https://github.com/puppetlabs/puppetlabs-apache/pull/1391) ([Reamer](https://github.com/Reamer))
+- add support for SSLProxyProtocol directive [#1390](https://github.com/puppetlabs/puppetlabs-apache/pull/1390) ([saimonn](https://github.com/saimonn))
+- Add mellon_sp_metadata_file parameter for directory entries [#1389](https://github.com/puppetlabs/puppetlabs-apache/pull/1389) ([jokajak](https://github.com/jokajak))
+- Manage mod dir before things that depend on mods [#1388](https://github.com/puppetlabs/puppetlabs-apache/pull/1388) ([cmurphy](https://github.com/cmurphy))
+- apache::balancer: Add a target parameter to write to a custom path [#1386](https://github.com/puppetlabs/puppetlabs-apache/pull/1386) ([roidelapluie](https://github.com/roidelapluie))
+- Add JkMount/JkUnmount directives to vhost [#1384](https://github.com/puppetlabs/puppetlabs-apache/pull/1384) ([smoeding](https://github.com/smoeding))
+- Remove SSLv3 [#1383](https://github.com/puppetlabs/puppetlabs-apache/pull/1383) ([ghoneycutt](https://github.com/ghoneycutt))
+- include apache, so parsing works [#1380](https://github.com/puppetlabs/puppetlabs-apache/pull/1380) ([tphoney](https://github.com/tphoney))
+- include apache, so parsing works. [#1377](https://github.com/puppetlabs/puppetlabs-apache/pull/1377) ([tphoney](https://github.com/tphoney))
+- mod/ssl: Add option to configure SSL mutex [#1371](https://github.com/puppetlabs/puppetlabs-apache/pull/1371) ([daenney](https://github.com/daenney))
+- support pass-header option in apache::fastcgi::server [#1370](https://github.com/puppetlabs/puppetlabs-apache/pull/1370) ([janschumann](https://github.com/janschumann))
+- Support socket communication option in apache::fastcgi::server [#1368](https://github.com/puppetlabs/puppetlabs-apache/pull/1368) ([janschumann](https://github.com/janschumann))
+- allow include in vhost directory [#1366](https://github.com/puppetlabs/puppetlabs-apache/pull/1366) ([Zarne](https://github.com/Zarne))
+- support Ubuntu xenial (16.04) [#1364](https://github.com/puppetlabs/puppetlabs-apache/pull/1364) ([mmoll](https://github.com/mmoll))
+- changed rpaf Configuration Directives: RPAF -> RPAF_ [#1361](https://github.com/puppetlabs/puppetlabs-apache/pull/1361) ([gvdb1967](https://github.com/gvdb1967))
+- (MODULES-2756) Adding include ::apache so mkdir exec works properly [#1236](https://github.com/puppetlabs/puppetlabs-apache/pull/1236) ([damonconway](https://github.com/damonconway))
 
 ### Fixed
 
-- \(FM-7605\) - Disabling conf\_enabled on Ubuntu 18.04  by default as it conflicts with Shibboleth causing errors with apache2. [\#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
-- \(MODULES-8429\) Update GPG key for phusion passenger [\#1848](https://github.com/puppetlabs/puppetlabs-apache/pull/1848) ([abottchen](https://github.com/abottchen))
-- Fix default vhost priority in readme [\#1843](https://github.com/puppetlabs/puppetlabs-apache/pull/1843) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
-- fix apache::mod::jk example typo and add link for more info [\#1812](https://github.com/puppetlabs/puppetlabs-apache/pull/1812) ([xorpaul](https://github.com/xorpaul))
-- MODULES-7379: Fixing syntax by adding newline [\#1803](https://github.com/puppetlabs/puppetlabs-apache/pull/1803) ([wimvr](https://github.com/wimvr))
-- ensure mpm\_event is disabled under debian 9 if mpm itk is used [\#1766](https://github.com/puppetlabs/puppetlabs-apache/pull/1766) ([zivis](https://github.com/zivis))
+- fix incorrect use of .join() with newlines [#1425](https://github.com/puppetlabs/puppetlabs-apache/pull/1425) ([mpeter](https://github.com/mpeter))
+- SSLCompression directive only available with apache 2.4.3 [#1417](https://github.com/puppetlabs/puppetlabs-apache/pull/1417) ([Reamer](https://github.com/Reamer))
+- Fix in custom fact "apache_version" for OracleLinux. [#1416](https://github.com/puppetlabs/puppetlabs-apache/pull/1416) ([Reamer](https://github.com/Reamer))
+- MODULES-3211: fix broken strict_variable tests [#1414](https://github.com/puppetlabs/puppetlabs-apache/pull/1414) ([jonnytdevops](https://github.com/jonnytdevops))
+- MODULES-3211: fix broken strict_variable tests [#1409](https://github.com/puppetlabs/puppetlabs-apache/pull/1409) ([jlambert121](https://github.com/jlambert121))
+- Fix broken internal link for virtual hosts configuration [#1369](https://github.com/puppetlabs/puppetlabs-apache/pull/1369) ([gerhardsam](https://github.com/gerhardsam))
 
-## [3.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.4.0) (2018-09-27)
+### Other
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.3.0...3.4.0)
+- (MODULES-3218) add auth_merging for directory enteries [#1412](https://github.com/puppetlabs/puppetlabs-apache/pull/1412) ([pyther](https://github.com/pyther))
+- Configurability of Collaborative Detection Severity Levels for OWASP Core Rule Set [#1404](https://github.com/puppetlabs/puppetlabs-apache/pull/1404) ([FlatKey](https://github.com/FlatKey))
+- Fix MODULES-3158 (any string interpreted as SSLCompression on) [#1398](https://github.com/puppetlabs/puppetlabs-apache/pull/1398) ([tpdownes](https://github.com/tpdownes))
+- Allow configuring mod_security's SecAuditLogParts [#1392](https://github.com/puppetlabs/puppetlabs-apache/pull/1392) ([stig](https://github.com/stig))
+- add support for fcgi [#1387](https://github.com/puppetlabs/puppetlabs-apache/pull/1387) ([mlhess](https://github.com/mlhess))
+
+## [1.8.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.8.1) - 2016-02-08
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.0...1.8.1)
 
 ### Added
 
-- pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#1838](https://github.com/puppetlabs/puppetlabs-apache/pull/1838) ([pmcmaw](https://github.com/pmcmaw))
-- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#1836](https://github.com/puppetlabs/puppetlabs-apache/pull/1836) ([tphoney](https://github.com/tphoney))
+- allow status code on redirect match to be optional and not a requirement [#1355](https://github.com/puppetlabs/puppetlabs-apache/pull/1355) ([BigAl](https://github.com/BigAl))
+- Ldap parameters [#1352](https://github.com/puppetlabs/puppetlabs-apache/pull/1352) ([tphoney](https://github.com/tphoney))
+- Add apache_version fact [#1347](https://github.com/puppetlabs/puppetlabs-apache/pull/1347) ([jyaworski](https://github.com/jyaworski))
+- (FM-4049) update to modulesync_configs [#1343](https://github.com/puppetlabs/puppetlabs-apache/pull/1343) ([DavidS](https://github.com/DavidS))
+- Specify owning permissions for logroot directory [#1340](https://github.com/puppetlabs/puppetlabs-apache/pull/1340) ([SlavaValAl](https://github.com/SlavaValAl))
+- add file_mode to mod manifests [#1338](https://github.com/puppetlabs/puppetlabs-apache/pull/1338) ([timogoebel](https://github.com/timogoebel))
+- 	Added support for modsecurity parameter SecPcreMatchLimit and SecPcr… [#1296](https://github.com/puppetlabs/puppetlabs-apache/pull/1296) ([whotwagner](https://github.com/whotwagner))
 
 ### Fixed
 
-- Fix "audit\_log\_relevant\_status" typo in README.md [\#1830](https://github.com/puppetlabs/puppetlabs-apache/pull/1830) ([smokris](https://github.com/smokris))
+- Fix in custom fact "apache_version" for RHEL. [#1360](https://github.com/puppetlabs/puppetlabs-apache/pull/1360) ([BobVincentatNCRdotcom](https://github.com/BobVincentatNCRdotcom))
+- Fix passenger on redhat systems [#1354](https://github.com/puppetlabs/puppetlabs-apache/pull/1354) ([hunner](https://github.com/hunner))
+- ThreadLimit needs to be above MaxClients or it is ignored. https://bz… [#1351](https://github.com/puppetlabs/puppetlabs-apache/pull/1351) ([tphoney](https://github.com/tphoney))
+- Bugfix: require concat, not file [#1350](https://github.com/puppetlabs/puppetlabs-apache/pull/1350) ([BobVincentatNCRdotcom](https://github.com/BobVincentatNCRdotcom))
+- (MODULES-3018) Fixes apache to work correctly with concat. [#1348](https://github.com/puppetlabs/puppetlabs-apache/pull/1348) ([bmjen](https://github.com/bmjen))
+- Fix fcgid.conf on Debian [#1331](https://github.com/puppetlabs/puppetlabs-apache/pull/1331) ([sathieu](https://github.com/sathieu))
+- MODULES-2958 : correct CustomLog syslog entry [#1322](https://github.com/puppetlabs/puppetlabs-apache/pull/1322) ([BigAl](https://github.com/BigAl))
 
-## [3.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.3.0) (2018-09-11)
+### Other
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.2.0...3.3.0)
+- add parameter root_directory_options [#1339](https://github.com/puppetlabs/puppetlabs-apache/pull/1339) ([timogoebel](https://github.com/timogoebel))
+
+## [1.8.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.8.0) - 2016-01-25
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.1...1.8.0)
+
+### Added
+
+- add paramter to set config file permissions [#1333](https://github.com/puppetlabs/puppetlabs-apache/pull/1333) ([timogoebel](https://github.com/timogoebel))
+- (MODULES-2964) Enable PassengerMaxRequestQueueSize to be set [#1323](https://github.com/puppetlabs/puppetlabs-apache/pull/1323) ([traylenator](https://github.com/traylenator))
+- MODULES-2956: Enable options within location block on proxy_match [#1317](https://github.com/puppetlabs/puppetlabs-apache/pull/1317) ([jlambert121](https://github.com/jlambert121))
+- Support itk on redhat [#1316](https://github.com/puppetlabs/puppetlabs-apache/pull/1316) ([edestecd](https://github.com/edestecd))
+- SSLProxyVerify [#1311](https://github.com/puppetlabs/puppetlabs-apache/pull/1311) ([occelebi](https://github.com/occelebi))
+- Add X-Forwarded-For into log_formats defaults [#1308](https://github.com/puppetlabs/puppetlabs-apache/pull/1308) ([mpolenchuk](https://github.com/mpolenchuk))
+- Put headers and request headers before proxy [#1306](https://github.com/puppetlabs/puppetlabs-apache/pull/1306) ([quixoten](https://github.com/quixoten))
+- EL7 uses conf.modules.d directory for modules. [#1305](https://github.com/puppetlabs/puppetlabs-apache/pull/1305) ([jasonhancock](https://github.com/jasonhancock))
+- Support proxy provider for vhost directories. [#1304](https://github.com/puppetlabs/puppetlabs-apache/pull/1304) ([roidelapluie](https://github.com/roidelapluie))
+
+### Fixed
+
+- MODULES-2990: Gentoo - fix module includes in portage::makeconf [#1337](https://github.com/puppetlabs/puppetlabs-apache/pull/1337) ([derdanne](https://github.com/derdanne))
+- fix vhosts listen to wildcard ip [#1335](https://github.com/puppetlabs/puppetlabs-apache/pull/1335) ([timogoebel](https://github.com/timogoebel))
+- fixing apache_parameters_spec.rb [#1330](https://github.com/puppetlabs/puppetlabs-apache/pull/1330) ([tphoney](https://github.com/tphoney))
+- a path is needed for ProxyPassReverse [#1327](https://github.com/puppetlabs/puppetlabs-apache/pull/1327) ([tphoney](https://github.com/tphoney))
+- Fixing error in Amazon $operatingsystem comparison [#1321](https://github.com/puppetlabs/puppetlabs-apache/pull/1321) ([ryno75](https://github.com/ryno75))
+- fix ordering of catalogue for redhat 7 [#1319](https://github.com/puppetlabs/puppetlabs-apache/pull/1319) ([tphoney](https://github.com/tphoney))
+- fix validation error when empty array is passed as rewrites parameter [#1301](https://github.com/puppetlabs/puppetlabs-apache/pull/1301) ([timogoebel](https://github.com/timogoebel))
+- Fix typo with versioncmp [#1299](https://github.com/puppetlabs/puppetlabs-apache/pull/1299) ([pabelanger](https://github.com/pabelanger))
+- enable setting LimitRequestFieldSize globally as it does not actually… [#1293](https://github.com/puppetlabs/puppetlabs-apache/pull/1293) ([KlavsKlavsen](https://github.com/KlavsKlavsen))
+- Fixes paths and packages for the shib2 module on Debian [#1292](https://github.com/puppetlabs/puppetlabs-apache/pull/1292) ([cholyoak](https://github.com/cholyoak))
+- Add ::apache::vhost::custom [#1271](https://github.com/puppetlabs/puppetlabs-apache/pull/1271) ([pabelanger](https://github.com/pabelanger))
+
+### Other
+
+- Support the mod_proxy ProxPassReverseCookieDomain directive   [#1309](https://github.com/puppetlabs/puppetlabs-apache/pull/1309) ([occelebi](https://github.com/occelebi))
+
+## [1.7.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.7.1) - 2015-12-04
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.0...1.7.1)
 
 ### Added
 
-- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1821](https://github.com/puppetlabs/puppetlabs-apache/pull/1821) ([pmcmaw](https://github.com/pmcmaw))
-- Add support for ProxyTimeout [\#1805](https://github.com/puppetlabs/puppetlabs-apache/pull/1805) ([agoodno](https://github.com/agoodno))
-- \(MODULES-7343\) - Allow overrides by adding mod\_libs in apache class [\#1800](https://github.com/puppetlabs/puppetlabs-apache/pull/1800) ([karelyatin](https://github.com/karelyatin))
-
-### Fixed
-
-- MODULES-7575 reverse sort the aliases [\#1808](https://github.com/puppetlabs/puppetlabs-apache/pull/1808) ([k2patel](https://github.com/k2patel))
-- fixes for OpenSUSE ans SLES [\#1783](https://github.com/puppetlabs/puppetlabs-apache/pull/1783) ([tuxmea](https://github.com/tuxmea))
-
-## 3.2.0
-### Summary
-This is a clean release to prepare for several planned backwards incompatible changes.
-
-#### Changed
-- Parameter `passenger_pre_start` has been moved outside of `<VirtualHost>`.
-- Apache version fact has been enabled on FreeBSD.
-- Parameter `ssl_proxyengine` has had it's default changed to false.
-
-#### Added
-- Parameter `passenger_group` can now be set in `apache::vhost`.
-- Multiple `passenger_pre_start` URIs can now be set at once.
-- Manifest `mod::auth_gssapi` has been added to allow the deployment of authorisation with kerberos, through GSSAPI.
-
-#### Removed
-- Scientific 5 and Debian 7 are no longer supported on Apache.
-
-## Supported Release [3.1.0]
-### Summary
-This release includes the module being converted using version 1.4.1 of the PDK. It also includes a couple of additional parameters added.
-
-#### Added
-- Module has been pdk converted with version 1.4.1 ([MODULES-6331](https://tickets.puppet.com/browse/MODULES-6331))
-- Parameter `ssl_cert` to provide a SSLCertificateFile option for use with SSL, optional of type String.
-- Parameter `ssl_key` to provide a SSLCertificateKey option for use with SSL, optional of type String.
-
-#### Fixed
-- Documentation updates.
-- Updates to the Japanese translation based on documentation update.
-
-## Supported Release [3.0.0]
-### Summary
-This major release changes the default value of `keepalive` to `On`. It also includes many other features and bugfixes.
-
-#### Changed
-- Default `apache::keepalive` from `Off` to `On`.
-
-#### Added
-- Class `apache::mod::data`
-- Function `apache::apache_pw_hash` function (puppet 4 port of `apache_pw_hash()`)
-- Function `apache::bool2httpd` function (puppet 4 port of `bool2httpd()`)
-- Function `apache::validate_apache_log_level` function (puppet 4 port of `validate_apache_log_level()`)
-- Parameter `apache::balancer::options` for additional directives.
-- Parameter `apache::limitreqfields` setting the LimitRequestFields directive to 100.
-- Parameter `apache::use_canonical_name` to control how httpd uses self-referential URLs.
-- Parameter `apache::mod::disk_cache::cache_ignore_headers` to ignore cache headers.
-- Parameter `apache::mod::itk::enablecapabilities` to manage ITK capabilities.
-- Parameter `apache::mod::ldap::ldap_trusted_mode` to manage trusted mode.
-- Parameters for `apache::mod::passenger`:
-  - `passenger_allow_encoded_slashes`
-  - `passenger_app_group_name`
-  - `passenger_app_root`
-  - `passenger_app_type`
-  - `passenger_base_uri`
-  - `passenger_buffer_response`
-  - `passenger_buffer_upload`
-  - `passenger_concurrency_model`
-  - `passenger_debug_log_file`
-  - `passenger_debugger`
-  - `passenger_default_group`
-  - `passenger_default_user`
-  - `passenger_disable_security_update_check`
-  - `passenger_enabled`
-  - `passenger_error_override`
-  - `passenger_file_descriptor_log_file`
-  - `passenger_fly_with`
-  - `passenger_force_max_concurrent_requests_per_process`
-  - `passenger_friendly_error_pages`
-  - `passenger_group`
-  - `passenger_installed_version`
-  - `passenger_instance_registry_dir`
-  - `passenger_load_shell_envvars`
-  - `passenger_lve_min_uid`
-  - `passenger_max_instances`
-  - `passenger_max_preloader_idle_time`
-  - `passenger_max_request_time`
-  - `passenger_memory_limit`
-  - `passenger_meteor_app_settings`
-  - `passenger_nodejs`
-  - `passenger_pre_start`
-  - `passenger_python`
-  - `passenger_resist_deployment_errors`
-  - `passenger_resolve_symlinks_in_document_root`
-  - `passenger_response_buffer_high_watermark`
-  - `passenger_restart_dir`
-  - `passenger_rolling_restarts`
-  - `passenger_security_update_check_proxy`
-  - `passenger_show_version_in_header`
-  - `passenger_socket_backlog`
-  - `passenger_start_timeout`
-  - `passenger_startup_file`
-  - `passenger_sticky_sessions`
-  - `passenger_sticky_sessions_cookie_name`
-  - `passenger_thread_count`
-  - `passenger_user`
-  - `passenger_user_switching`
-  - `rack_auto_detect`
-  - `rack_base_uri`
-  - `rack_env`
-  - `rails_allow_mod_rewrite`
-  - `rails_app_spawner_idle_time`
-  - `rails_auto_detect`
-  - `rails_base_uri`
-  - `rails_default_user`
-  - `rails_env`
-  - `rails_framework_spawner_idle_time`
-  - `rails_ruby`
-  - `rails_spawn_method`
-  - `rails_user_switching`
-  - `wsgi_auto_detect`
-- Parameter `apache::mod::prefork::listenbacklog` to set the listen backlog to 511.
-- Parameter `apache::mod::python::loadfile_name` to workaround python.load filename conflicts.
-- Parameter `apache::mod::ssl::ssl_cert` to manage the client auth cert.
-- Parameter `apache::mod::ssl::ssl_key` to manage the client auth key.
-- Parameter `apache::mod::status::requires` as an alternative to `apache::mod::status::allow_from`
-- Parameter `apache::vhost::ssl_proxy_cipher_suite` to manage that directive.
-- Parameter `apache::vhost::shib_compat_valid_user` to manage that directive.
-- Parameter `apache::vhost::use_canonical_name` to manage that directive.
-- Parameter value `mellon_session_length` for `apache::vhost::directories`
-
-### Fixed
-- `apache_version` is confined to just Linux to avoid erroring on AIX.
-- Parameter `apache::mod::jk::workers_file_content` docs typo of "mantain" instead of maintain.
-- Deduplicate `apache::mod::ldap` managing `File['ldap.conf']` to avoid resource conflicts.
-- ITK package name on Debian 9
-- Dav_svn package for SLES
-- Log client IP instead of loadbalancer IP when behind a loadbalancer.
-- `apache::mod::remoteip` now notifies the `Class['apache::service']` class instead of `Service['httpd']` to avoid restarting the service when `apache::service_manage` is false.
-- `apache::vhost::cas_scrub_request_headers` actually manages the directive.
-
-## Supported Release [2.3.1]
-### Summary
-This release fixes CVE-2018-6508 which is a potential arbitrary code execution via tasks.
-
-### Fixed
-- Fix init task for arbitrary remote code
-
-## Supported Release [2.3.0]
-### Summary
-This is a feature release. It includes a task that will reload the apache service.
-
-#### Added
-- Add a task that allows the reloading of the Apache service.
-
-## Supported Release [2.2.0]
-### Summary
-This is a maintainence and feature release. It will include updates to translations in Japanese, some maintainence and adding `PassengerSpawnMethod` to vhost.
-
-#### Added
-- `PassengerSpawnMethod` added to `vhost`.
-
-#### Changed
-- Improve version match fact for `apache_version`
-- Update to prefork.conf params for Apache 2.4
-- Updates to `CONTRIBUTING.md`
-- Do not install mod_fastcgi on el7
-- Include mod_wsgi when using wsgi options
-
-## Supported Release [2.1.0]
-### Summary
-This is a feature release including a security patch (CVE-2017-2299)
-
-#### Added
-- `apache::mod::jk` class for managing the mod_jk connector
-- `apache_pw_hash` function
-- the ProxyPass directive in location contexts
-- more Puppet 4 type validation
-- `apache::mod::macro` class for managing mod_macro
-
-#### Changed
-- $ssl_certs_dir default to `undef` for all platorms
-- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check`
-
-#### Fixed
-- issue where mod_alias was not being loaded when RedirectMatch* directives were being used ([MODULES-3942](https://tickets.puppet.com/browse/MODULES-3942))
-- issue with `$directories` parameter in `apache::vhost`
-- issue in UserDir template where the UserDir path did not match the Directory path
-- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory**
-
-#### Removed
-- support for EOL platforms: Ubuntu 10.04, 12.04 and Debian 6 (Squeeze)
-
-## Supported Release [2.0.0]
-### Summary
-Major release **removing Puppet 3 support** and other backwards-incompatible changes.
-
-#### Added
-- support for FileETag directive configurable with the `file_e_tag` parameter
-- ability to configure multiple ports per vhost
-- RequestHeader directive to vhost template ([MODULES-4156](https://tickets.puppet.com/browse/MODULES-4156))
-- customizability for AllowOverride directive in userdir.conf ([MODULES-4516](https://tickets.puppet.com/browse/MODULES-4516))
-- AdvertiseFrequency directive for cluster.conf ([MODULES-4500](https://tickets.puppet.com/browse/MODULES-4500))
-- `ssl_proxy_protocol` and `ssl_sessioncache` parameters for mod::ssl ([MODULES-4737](https://tickets.puppet.com/browse/MODULES-4737))
-- SSLCACertificateFile directive in ssl.conf configurable with `ssl_ca` parameter
-- mod::authnz_pam 
-- mod::intercept_form_submit 
-- mod::lookup_identity
-- Suse compatibility for mod::proxy_html
-- support for AddCharset directive configurable with `add_charset` parameter
-- support for SSLProxyVerifyDepth and SSLProxyCACertificateFile directives configurable with `ssl_proxy_verify_depth` and `ssl_proxy_ca_cert` respectively
-- `manage_security_crs` parameter for mod::security
-- support for LimitExcept directive configurable with `limit_except` parameter
-- support for WSGIRestrictEmbedded directive configurable with `wsgi_restrict_embedded` parameter
-- support for custom UserDir path ([MODULES-4933](https://tickets.puppet.com/browse/MODULES-4933))
-- support for PassengerMaxRequests directive configurable with `passenger_max_requests`
-- option to override module package names with `mod_packages` parameter ([MODULES-3838](https://tickets.puppet.com/browse/MODULES-3838))
-
-#### Removed
-- enclose_ipv6 as it was added to puppetlabs-stdlib
-- deprecated `$verifyServerCert` parameter from the `apache::mod::authnz_ldap` class ([MODULES-4445](https://tickets.puppet.com/browse/MODULES-4445))
-
-#### Changed
-- `keepalive` default to 'On' from 'Off'
-- Puppet version compatibility to ">= 4.7.0 < 6.0.0"
-- puppetlabs-stdlib dependency to ">= 4.12.0 < 5.0.0"
-- `ssl_cipher` to explicitly disable 3DES because of Sweet32
-
-#### Fixed
-- various issues in the vhost template
-- use of deprecated `include_src` parameter in vhost_spec
-- management of ssl.conf on RedHat systems
-- various SLES/Suse params
-- mod::cgi ordering for FreeBSD
-- issue where ProxyPreserveHost could not be set without other Proxy* directives
-- the module attempting to install proxy_html on Ubuntu Xenial and Debian Stretch
-
-## Supported Release [1.11.1]
-#### Summary
-This is a security patch release (CVE-2017-2299). These changes are also in version 2.1.0 and higher.
-
-#### Changed
-- $ssl_certs_dir default to `undef` for all platorms
-- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check`
-
-#### Fixed
-- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory** ([MODULES-5471](https://tickets.puppet.com/browse/MODULES-5471))
-
-## Supported Release [1.11.0]
-### Summary
-This release adds SLES12 Support and many more features and bugfixes.
-
-#### Features
-- (MODULES-4049) Adds SLES 12 Support
-- Adds additional directories options for LDAP Auth
-  - `auth_ldap_url`
-  - `auth_ldap_bind_dn`
-  - `auth_ldap_bind_password`
-  - `auth_ldap_group_attribute`
-  - `auth_ldap_group_attribute_is_dn`
-- Allows `mod_event` parameters to be unset
-- Allows management of default root directory access rights
-- Adds class `apache::vhosts` to create apache::vhost resources
-- Adds class `apache::mod::proxy_wstunnel`
-- Adds class `apache::mod::dumpio`
-- Adds class `apache::mod::socache_shmcb`
-- Adds class `apache::mod::authn_dbd`
-- Adds support for apache 2.4 on Amazon Linux
-- Support the newer `mod_auth_cas` config options
-- Adds `wsgi_script_aliases_match` parameter to `apache::vhost`
-- Allow to override all SecDefaultAction attributes
-- Add audit_log_relevant_status parameter to apache::mod::security
-- Allow absolute path to $apache::mod::security::activated_rules
-- Allow setting SecAuditLog
-- Adds `passenger_max_instances_per_app` to `mod::passenger`
-- Allow the proxy_via setting to be configured
-- Allow no_proxy_uris to be used within proxy_pass
-- Add rpaf.conf template parameter to `mod::rpaf`
-- Allow user to specify alternative package and library names for shibboleth module
-- Allows configuration of shibboleth lib path
-- Adds parameter `passenger_data_buffer_dir` to `mod::passenger`
-- Adds SSL stapling 
-- Allows use of `balance_manager` with `mod_proxy_balancer`
-- Raises lower bound of `stdlib` dependency to version 4.2
-- Adds support for Passenger repo on Amazon Linux
-- Add ability to set SSLStaplingReturnResponderErrors on server level 
-- (MODULES-4213) Allow global rewrite rules inheritance in vhosts
-- Moves `mod_env` to its own class and load it when required
-
-#### Bugfixes
-- Deny access to .ht and .hg, which are created by mercurial hg.
-- Instead of failing, include apache::mod::prefork in manifests/mod/itk.pp instead.
-- Only set SSLCompression when it is set to true.
-- Remove duplicate shib2 hash element
-- (MODULES-3388) Include mpm_module classes instead of class declaration
-- Updates `apache::balancer` to respect `apache::confd_dir`
-- Wrap mod_security directives in an IfModule
-- Fixes to various mods for Ubuntu Xenial
-- Fix /etc/modsecurity perms to match package
-- Fix PassengerRoot under Debian stretch
-- (MODULES-3476) Updates regex in apache_version custom fact to work with EL5
-- Dont sql_injection_attacks.data
-- Add force option to confd file resource to purge directory without warnings
-- Patch httpoxy through mod_security
-- Fixes config ordering of IncludeOptional
-- Fixes bug where port numbers were unquoted
-- Fixes bug where empty servername for vhost were written to template
-- Auto-load `slotmem_shm` and `lbmethod_byrequests` with `proxy_balancer` on 2.4
-- Simplify MPM setup on FreeBSD
-- Adds requirement for httpd package
-- Do not set ssl_certs_dir on FreeBSD
-- Fixes bug that produces a duplicate `Listen 443` after a package update on EL7
-- Fixes bug where custom facts break structured facts
-- Avoid relative classname inclusion
-- Fixes a failure in `vhost` if the first element of `$rewrites` is not a hash
-- (MODULES-3744) Process $crs_package before $modsec_dir
-- (MODULES-1491) Adds `::apache` include to mods that need it
-
-## Supported Release [1.10.0]
-#### Summary
-This release fixes backwards compatibility bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature.
-
-#### Features
-- Allow setting KeepAlive related options per vhost
-  - `apache::vhost::keepalive`
-  - `apache::vhost::keepalive_timeout`
-  - `apache::vhost::max_keepalive_requests`
-- Adds new class `apache::mod::cluster`
-
-#### Bugfixes
-- MODULES-2890: Allow php_version != 5
-- MODULES-2890: mod::php: Explicit test on jessie
-- MODULES-2890: Fix PHP on Debian stretch and Ubuntu Xenial
-- MODULES-2890: Fix mod_php SetHandler and cleanup
-- Fixed trailing slash in lib_path on Suse
-- Revert "MODULES-2956: Enable options within location block on proxy_match". Bug introduced in release 1.9.0.
-- Revert "changed rpaf Configuration Directives: RPAF -> RPAF_". Bug introduced in release 1.9.0.
-- Set actual path to apachectl on FreeBSD. Fixes snippets verification.
-
-## Supported Release [1.9.0] [DELETED]
-#### Features
-- Added `apache_version` fact
-- Added `apache::balancer::target` attribute
-- Added `apache::fastcgi::server::pass_header` attribute
-- Added ability for `apache::fastcgi::server::host` using sockets
-- Added `apache::root_directory_options` attribute
-- Added for `apache::mod::ldap`:
-  - `ldap_shared_cache_size`
-  - `ldap_cache_entries`
-  - `ldap_cache_ttl`
-  - `ldap_opcache_entries`
-  - `ldap_opcache_ttl`
-- Added `apache::mod::pagespeed::package_ensure` attribute
-- Added `apache::mod::passenger` attributes:
-  - `passenger_log_level`
-  - `manage_repo`
-- Added upstream repo for `apache::mod::passenger`
-- Added `apache::mod::proxy_fcgi` class
-- Added `apache::mod::security` attributes:
-  - `audit_log_parts`
-  - `secpcrematchlimit`
-  - `secpcrematchlimitrecursion`
-  - `secdefaultaction`
-  - `anomaly_score_blocking`
-  - `inbound_anomaly_threshold`
-  - `outbound_anomaly_threshold`
-- Added `apache::mod::ssl` attributes:
-  - `ssl_mutex`
-  - `apache_version`
-- Added ubuntu 16.04 support
-- Added `apache::mod::authnz_ldap::package_name` attribute
-- Added `apache::mod::ldap::package_name` attribute
-- Added `apache::mod::proxy::package_name` attribute
-- Added `apache::vhost` attributes:
-  - `ssl_proxy_check_peen_expire`
-  - `ssl_proxy_protocol`
-  - `logroot_owner`
-  - `logroot_group`
-  - `setenvifnocase`
-  - `passenger_user`
-  - `passenger_high_performance`
-  - `jk_mounts`
-  - `fastcgi_idle_timeout`
-  - `modsec_disable_msgs`
-  - `modsec_disable_tags`
-- Added ability for 2.4-style `RequireAll|RequireNone|RequireAny` directory permissions
-- Added ability for includes in vhost directory
-- Added directory values:
-  - `AuthMerging`
-  - `MellonSPMetadataFile`
-- Adds Configurability of Collaborative Detection Severity Levels for OWASP Core Rule Set to `apache::mod::security` class
-  - `critical_anomaly_score`
-  - `error_anomaly_score`
-  - `warning_anomaly_score`
-  - `notice_anomaly_score`
-- Adds ability to configure `info_path` in `apache::mod::info` class
-- Adds ability to configure `verify_config` in `apache::vhost::custom`
-
-#### Bugfixes
-- Fixed apache mod setup for event/worker failing syntax
-- Fixed concat deprecation warnings
-- Fixed pagespeed mod
-- Fixed service restart on mod update
-- Fixed mod dir purging to happen after package installs
-- Fixed various `apache::mod::*` file modes
-- Fixed `apache::mod::authnz_ldap` parameter `verifyServerCert` to be `verify_server_cert`
-- Fixed loadfile name in `apache::mod::fcgid`
-- Fixed `apache::mod::remoteip` to fail on apache < 2.4 (because it is not available)
-- Fixed `apache::mod::ssl::ssl_honorcipherorder` interpolation
-- Lint fixes
-- Strict variable fixes
-- Fixed `apache::vhost` attribute `redirectmatch_status` to be optional
-- Fixed SSLv3 on by default in mod\_nss
-- Fixed mod\_rpaf directive names in template
-- Fixed mod\_worker needing MaxClients with ThreadLimit
-- Fixed quoting on vhost php\_value
-- Fixed xml2enc for proxy\_html on debian
-- Fixed a problem where the apache service restarts too fast
-
-## Supported Release [1.8.1]
-### Summary
-This release includes bug fixes and a documentation update.
-
-#### Bugfixes
-- Fixes a bug that occurs when using the module in combination with puppetlabs-concat 2.x.
-- Fixes a bug where passenger.conf was vulnerable to purging.
-- Removes the pin of the concat module dependency.
-
-## Supported Release [1.8.0]
-### Summary
-This release includes a lot of bug fixes and feature updates, including support for Debian 8, as well as many test improvements.
-
-#### Features
-- Debian 8 Support.
-- Added the 'file_mode' property to allow a custom permission setting for config files.
-- Enable 'PassengerMaxRequestQueueSize' to be set for mod_passenger.
-- MODULES-2956: Enable options within location block on proxy_match.
-- Support itk on redhat.
-- Support the mod_ssl SSLProxyVerify directive.
-- Support ProxPassReverseCookieDomain directive (mod_proxy).
-- Support proxy provider for vhost directories.
-- Added new 'apache::vhost::custom' resource.
-
-#### Bugfixes
-- Fixed ProxyPassReverse configuration.
-- Fixed error in Amazon operatingsystem detection.
-- Fixed mod_security catalog ordering issues for RedHat 7.
-- Fixed paths and packages for the shib2 apache module on Debian pre Jessie.
-- Fixed EL7 directory path for apache modules.
-- Fixed validation error when empty array is passed for the rewrites parameter.
-- Idempotency fixes with regards to '::apache::mod_enable_dir'.
-- ITK fixes.
-- (MODULES-2865) fix $mpm_module logic for 'false'.
-- Set SSLProxy directives even if ssl is false, due to issue with RewriteRules and ProxyPass directives.
-- Enable setting LimitRequestFieldSize globally, and remove it from vhost.
-
-#### Improvements
-- apache::mod::php now uses FilesMatch to configure the php handler. This is following the recommended upstream configuration guidelines (http://php.net/manual/en/install.unix.apache2.php#example-20) and distribution's default config (e.g.: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/php5/vivid/view/head:/debian/php5.conf). It avoids inadvertently exposing the PHP handler to executing uploads with names like 'file.php.jpg', but might impact setups with unusual requirements.
-- Improved compatibility for Gentoo.
-- Vhosts can now be supplied with a wildcard listen value.
-- Numerous test improvements.
-- Removed workarounds for https://bz.apache.org/bugzilla/show_bug.cgi?id=38864 as the issues have been fixed in Apache.
-- Documentation updates.
-- Ensureed order of ProxyPass and ProxyPassMatch parameters.
-- Ensure that ProxyPreserveHost is set to off mode explicitly if not set in manifest.
-- Put headers and request headers before proxy with regards to template generation.
-- Added X-Forwarded-For into log_formats defaults.
-- (MODULES-2703) Allow mod pagespeed to take an array of lines as additional_configuration.
-
-## Supported Release [1.7.1]
-###Summary
-
-Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
-
-## Supported Release [1.7.0]
-### Summary
-This release includes many new features and bugfixes. There are test, documentation and misc improvements.
-
-#### Features
-- allow groups with - like vhost-users 
-- ability to enable/disable the secruleengine through a parameter
-- add mod_auth_kerb parameters to vhost
-- client auth for reverse proxy
-- support for mod_auth_mellon
-- change SSLProtocol in apache::vhost to be space separated
-- RewriteLock support
-
-#### Bugfixes
-- fix apache::mod::cgid so it can be used with the event MPM 
-- load unixd before fcgid on all operating systems
-- fixes conditional in vhost aliases
-- corrects mod_cgid worker/event defaults
-- ProxyPassMatch parameters were ending up on a newline
-- catch that mod_authz_default has been removed in Apache 2.4
-- mod::ssl fails on SLES
-- fix typo of MPM_PREFORK for FreeBSD package install 
-- install all modules before adding custom configs
-- fix acceptance testing for SSLProtocol behaviour for real
-- fix ordering issue with conf_file and ports_file 
-
-#### Known Issues
-- mod_passenger is having issues installing on Redhat/Centos 6, This is due to package dependency issues.
-
-#### Improvements
-- added docs for forcetype directive
-- removes ruby 1.8.7 from the travisci test matrix
-- readme reorganisation, minor fixups
-- support the mod_proxy ProxyPassReverseCookiePath directive
-- the purge_vhost_configs parameter is actually called purge_vhost_dir
-- add ListenBacklog for mod worker
-- deflate application/json by default 
-- install mod_authn_alias as default mod in debian for apache < 2.4
-- optionally set LimitRequestFieldSize on an apache::vhost
-- add SecUploadDir parameter to support file uploads with mod_security
-- optionally set parameters for mod_ext_filter module
-- allow SetOutputFilter to be set on a directory
-- RC4 is deprecated
-- allow empty docroot
-- add option to configure the include pattern for the vhost_enable dir
-- allow multiple IP addresses per vhost
-- default document root update for Ubuntu 14.04 and Debian 8 
-
-## Supported Release [1.6.0]
-### Summary
-This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds.
-
-#### Features
-- Add `scan_proxy_header_field` parameter to `apache::mod::geoip`
-- Add `ssl_openssl_conf_cmd` parameter to `apache::vhost` and `apache::mod::ssl`
-- Add `filters` parameter to `apache::vhost`
-
-#### Bugfixes
-- Test updates
-- Do not use systemd on Amazon Linux
-- Add missing docs for `timeout` parameter (MODULES-2148)
-
-## Supported Release [1.5.0]
-### Summary
-This release primarily adds Suse compatibility. It also adds a handful of other
-parameters for greater configuration control.
-
-#### Features
-- Add `apache::lib_path` parameter
-- Add `apache::service_restart` parameter
-- Add `apache::vhost::geoip_enable` parameter
-- Add `apache::mod::geoip` class
-- Add `apache::mod::remoteip` class
-- Add parameters to `apache::mod::expires` class
-- Add `index_style_sheet` handling to `apache::vhost::directories`
-- Add some compatibility for SLES 11
-- Add `apache::mod::ssl::ssl_sessioncachetimeout` parameter
-- Add `apache::mod::ssl::ssl_cryptodevice` parameter
-- Add `apache::mod::ssl::ssl_honorcipherorder` parameter
-- Add `apache::mod::userdir::options` parameter
-
-#### Bugfixes
-- Document `apache::user` parameter
-- Document `apache::group` parameter
-- Fix apache::dev on FreeBSD
-- Fix proxy\_connect on apache >= 2.2
-- Validate log levels better
-- Fix `apache::apache_name` for package and vhost
-- Fix Debian Jessie mod\_prefork package name
-- Fix alias module being declared even when vhost is absent
-- Fix proxy\_pass\_match handling in vhost's proxy template
-- Fix userdir access permissions
-- Fix issue where the module was trying to use systemd on Amazon Linux.
-
-## Supported Release [1.4.1]
-
-This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module.
-
-## Supported Release [1.4.0]
-###Summary
-
-This release fixes the issue where the docroot was still managed even if the default vhosts were disabled and has many other features and bugfixes including improved support for 'deny' and 'require' as arrays in the 'directories' parameter under `apache::vhost`
-
-#### Features
-- New parameters to `apache`
-  - `default_charset`
-  - `default_type`
-- New parameters to `apache::vhost`
-  - `proxy_error_override`
-  - `passenger_app_env` (MODULES-1776)
-  - `proxy_dest_match`
-  - `proxy_dest_reverse_match`
-  - `proxy_pass_match`
-  - `no_proxy_uris_match`
-- New parameters to `apache::mod::passenger`
-  - `passenger_app_env`
-  - `passenger_min_instances`
-- New parameter to `apache::mod::alias`
-  - `icons_options`
-- New classes added under `apache::mod::*`
-  - `authn_file`
-  - `authz_default`
-  - `authz_user`
-- Added support for 'deny' as an array in 'directories' under `apache::vhost`
-- Added support for RewriteMap
-- Improved support for FreeBSD. (Note: If using apache < 2.4.12, see the discussion [here](https://github.com/puppetlabs/puppetlabs-apache/pull/1030))
-- Added check for deprecated options in directories and fail when they are unsupported
-- Added gentoo compatibility
-- Added proper array support for `require` in the `directories` parameter in `apache::vhost`
-- Added support for `setenv` inside proxy locations
-
-### Bugfixes
-- Fix issue in `apache::vhost` that was preventing the scriptalias fragment from being included (MODULES-1784)
-- Install required `mod_ldap` package for EL7 (MODULES-1779)
-- Change default value of `maxrequestworkers` in `apache::mod::event` to be a multiple of the default `ThreadsPerChild` of 25.
-- Use the correct `mod_prefork` package name for trusty and jessie
-- Don't manage docroot when default vhosts are disabled
-- Ensure resources notify `Class['Apache::Service']` instead of `Service['httpd']` (MODULES-1829)
-- Change the loadfile name for `mod_passenger` so `mod_proxy` will load by default before `mod_passenger`
-- Remove old Debian work-around that removed `passenger_extra.conf`
-
-## Supported Release [1.3.0]
-### Summary
-
-This release has many new features and bugfixes, including the ability to optionally not trigger service restarts on config changes.
-
-#### Features
-- New parameters - `apache`
-  - `service_manage`
-  - `use_optional_includes`
-- New parameters - `apache::service`
-  - `service_manage`
-- New parameters - `apache::vhost`
-  - `access_logs`
-  - `php_flags`
-  - `php_values`
-  - `modsec_disable_vhost`
-  - `modsec_disable_ids`
-  - `modsec_disable_ips`
-  - `modsec_body_limit`
-- Improved FreeBSD support
-- Add ability to omit priority prefix if `$priority` is set to false
-- Add `apache::security::rule_link` define
-- Improvements to `apache::mod::*`
-  - Add `apache::mod::auth_cas` class
-  - Add `threadlimit`, `listenbacklog`, `maxrequestworkers`, `maxconnectionsperchild` parameters to `apache::mod::event`
-  - Add `apache::mod::filter` class
-  - Add `root_group` to `apache::mod::php`
-  - Add `apache::mod::proxy_connect` class
-  - Add `apache::mod::security` class
-  - Add `ssl_pass_phrase_dialog` and `ssl_random_seed_bytes` parameters to `apache::mod::ssl` (MODULES-1719)
-  - Add `status_path` parameter to `apache::mod::status`
-  - Add `apache_version` parameter to `apache::mod::version`
-  - Add `package_name` and `mod_path` parameters to `apache::mod::wsgi` (MODULES-1458)
-- Improved SCL support
-  - Add support for specifying the docroot
-- Updated `_directories.erb` to add support for SetEnv
-- Support multiple access log directives (MODULES-1382)
-- Add passenger support for Debian Jessie
-- Add support for not having puppet restart the apache service (MODULES-1559)
-
-#### Bugfixes
-- For apache 2.4 `mod_itk` requires `mod_prefork` (MODULES-825)
-- Allow SSLCACertificatePath to be unset in `apache::vhost` (MODULES-1457)
-- Load fcgid after unixd on RHEL7
-- Allow disabling default vhost for Apache 2.4
-- Test fixes
-- `mod_version` is now built-in (MODULES-1446)
-- Sort LogFormats for idempotency
-- `allow_encoded_slashes` was omitted from `apache::vhost`
-- Fix documentation bug (MODULES-1403, MODULES-1510)
-- Sort `wsgi_script_aliases` for idempotency (MODULES-1384)
-- lint fixes
-- Fix automatic version detection for Debian Jessie
-- Fix error docs and icons path for RHEL7-based systems (MODULES-1554)
-- Sort php_* hashes for idempotency (MODULES-1680)
-- Ensure `mod::setenvif` is included if needed (MODULES-1696)
-- Fix indentation in `vhost/_directories.erb` template (MODULES-1688)
-- Create symlinks on all distros if `vhost_enable_dir` is specified
-
-## Supported Release [1.2.0]
-### Summary
-
-This release features many improvements and bugfixes, including several new defines, a reworking of apache::vhost for more extensibility, and many new parameters for more customization. This release also includes improved support for strict variables and the future parser.
-
-#### Features
-- Convert apache::vhost to use concat for easier extensions
-- Test improvements
-- Synchronize files with modulesync
-- Strict variable and future parser support
-- Added apache::custom_config defined type to allow validation of configs before they are created
-- Added bool2httpd function to convert true/false to apache 'On' and 'Off'. Intended for internal use in the module.
-- Improved SCL support
-  - allow overriding of the mod_ssl package name
-- Add support for reverse_urls/ProxyPassReverse in apache::vhost
-- Add satisfy directive in apache::vhost::directories
-- Add apache::fastcgi::server defined type
-- New parameters - apache
-  - allow_encoded_slashes
-  - apache_name
-  - conf_dir
-  - default_ssl_crl_check
-  - docroot
-  - logroot_mode
-  - purge_vhost_dir
-- New parameters - apache::vhost
-  - add_default_charset
-  - allow_encoded_slashes
-  - logroot_ensure
-  - logroot_mode
-  - manage_docroot
-  - passenger_app_root
-  - passenger_min_instances
-  - passenger_pre_start
-  - passenger_ruby
-  - passenger_start_timeout
-  - proxy_preserve_host
-  - proxy_requests
-  - redirectmatch_dest
-  - ssl_crl_check
-  - wsgi_chunked_request
-  - wsgi_pass_authorization
-- Add support for ScriptAlias and ScriptAliasMatch in the apache::vhost::aliases parameter
-- Add support for rewrites in the apache::vhost::directories parameter
-- If the service_ensure parameter in apache::service is set to anything other than true, false, running, or stopped, ensure will not be passed to the service resource, allowing for the service to not be managed by puppet
-- Turn of SSLv3 by default
-- Improvements to apache::mod*
-  - Add restrict_access parameter to apache::mod::info
-  - Add force_language_priority and language_priority parameters to apache::mod::negotiation
-  - Add threadlimit parameter to apache::mod::worker
-  - Add content, template, and source parameters to apache::mod::php
-  - Add mod_authz_svn support via the authz_svn_enabled parameter in apache::mod::dav_svn
-  - Add loadfile_name parameter to apache::mod
-  - Add apache::mod::deflate class
-  - Add options parameter to apache::mod::fcgid
-  - Add timeouts parameter to apache::mod::reqtimeout
-  - Add apache::mod::shib
-  - Add apache_version parameter to apache::mod::ldap
-  - Add magic_file parameter to apache::mod::mime_magic
-  - Add apache_version parameter to apache::mod::pagespeed
-  - Add passenger_default_ruby parameter to apache::mod::passenger
-  - Add content, template, and source parameters to apache::mod::php
-  - Add apache_version parameter to apache::mod::proxy
-  - Add loadfiles parameter to apache::mod::proxy_html
-  - Add ssl_protocol and package_name parameters to apache::mod::ssl
-  - Add apache_version parameter to apache::mod::status
-  - Add apache_version parameter to apache::mod::userdir
-  - Add apache::mod::version class
-
-#### Bugfixes
-- Set osfamily defaults for wsgi_socket_prefix
-- Support multiple balancermembers with the same url
-- Validate apache::vhost::custom_fragment
-- Add support for itk with mod_php
-- Allow apache::vhost::ssl_certs_dir to not be set
-- Improved passenger support for Debian
-- Improved 2.4 support without mod_access_compat
-- Support for more than one 'Allow from'-directive in _directories.erb
-- Don't load systemd on Amazon linux based on CentOS6 with apache 2.4
-- Fix missing newline in ModPagespeed filter and memcached servers directive
-- Use interpolated strings instead of numbers where required by future parser
-- Make auth_require take precedence over default with apache 2.4
-- Lint fixes
-- Set default for php_admin_flags and php_admin_values to be empty hash instead of empty array
-- Correct typo in mod::pagespeed
-- spec_helper fixes
-- Install mod packages before dealing with the configuration
-- Use absolute scope to check class definition in apache::mod::php
-- Fix dependency loop in apache::vhost
-- Properly scope variables in the inline template in apache::balancer
-- Documentation clarification, typos, and formatting
-- Set apache::mod::ssl::ssl_mutex to default for debian on apache >= 2.4
-- Strict variables fixes
-- Add authn_core mode to Ubuntu trusty defaults
-- Keep default loadfile for authz_svn on Debian
-- Remove '.conf' from the site-include regexp for better Ubuntu/Debian support
-- Load unixd before fcgid for EL7
-- Fix RedirectMatch rules
-- Fix misleading error message in apache::version
-
-#### Known Bugs
-* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
-* SLES is unsupported.
-
-## Supported Release [1.1.1]
-### Summary
-
-This release merely updates metadata.json so the module can be uninstalled and
-upgraded via the puppet module command.
-
-## Supported Release [1.1.0]
-
-### Summary
-
-This release primarily focuses on extending the httpd 2.4 support, tested
-through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger 
-4 support, as well as several new modules and important bugfixes.
-
-#### Features
-
-- Add support for RHEL7 and Ubuntu 14.04
-- More complete apache24 support
-- Passenger 4 support
-- Add support for max_keepalive_requests and log_formats parameters
-- Add mod_pagespeed support
-- Add mod_speling support
-- Added several parameters for mod_passenger
-- Added ssl_cipher parameter to apache::mod::ssl
-- Improved examples in documentation
-- Added docroot_mode, action, and suexec_user_group parameters to apache::vhost
-- Add support for custom extensions for mod_php
-- Improve proxy_html support for Debian
-
-#### Bugfixes
-
-- Remove NameVirtualHost directive for apache >= 2.4
-- Order proxy_set option so it doesn't change between runs
-- Fix inverted SSL compression
-- Fix missing ensure on concat::fragment resources
-- Fix bad dependencies in apache::mod and apache::mod::mime
-
-#### Known Bugs
-* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
-* SLES is unsupported.
-
-## Supported Release [1.0.1]
-### Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-#### Features
-#### Bugfixes
-#### Known Bugs
-* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
-* SLES is unsupported.
- 
-## Supported Release [1.0.0]
-### Summary
-
-This is a supported release. This release introduces Apache 2.4 support for
-Debian and RHEL based osfamilies.
-
-#### Features
-
-- Add apache24 support
-- Add rewrite_base functionality to rewrites
-- Updated README documentation
-- Add WSGIApplicationGroup and WSGIImportScript directives
-
-#### Bugfixes
-
-- Replace mutating hashes with merge() for Puppet 3.5
-- Fix WSGI import_script and mod_ssl issues on Lucid
-
-#### Known Bugs
-* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
-* SLES is unsupported.
-
----
-
-## Supported Release [0.11.0]
-### Summary:
-
-This release adds preliminary support for Windows compatibility and multiple rewrite support.
-
-#### Backwards-incompatible Changes:
-
-- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
-  and will be removed in a future release.
-
-#### Features:
-
-- add Match directive
-- quote paths for windows compatibility
-- add auth_group_file option to README.md
-- allow AuthGroupFile directive for vhosts
-- Support Header directives in vhost context
-- Don't purge mods-available dir when separate enable dir is used
-- Fix the servername used in log file name
-- Added support for mod_include
-- Remove index parameters.
-- Support environment variable control for CustomLog
-- added redirectmatch support
-- Setting up the ability to do multiple rewrites and conditions.
-- Convert spec tests to beaker.
-- Support php_admin_(flag|value)s
-
-#### Bugfixes:
-
-- directories are either a Hash or an Array of Hashes
-- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
-- (docs) Update list of `apache::mod::[name]` classes
-- (docs) Fix apache::namevirtualhost example call style
-- Fix $ports_file reference in apache::listen.
-- Fix $ports_file reference in Namevirtualhost.
-
-
-## Supported Release [0.10.0]
-### Summary:
-
-This release adds FreeBSD osfamily support and various other improvements to some mods.
-
-#### Features:
-
-- Add suPHP_UserGroup directive to directory context
-- Add support for ScriptAliasMatch directives
-- Set SSLOptions StdEnvVars in server context
-- No implicit <Directory> entry for ScriptAlias path
-- Add support for overriding ErrorDocument
-- Add support for AliasMatch directives
-- Disable default "allow from all" in vhost-directories
-- Add WSGIPythonPath as an optional parameter to mod_wsgi. 
-- Add mod_rpaf support
-- Add directives: IndexOptions, IndexOrderDefault
-- Add ability to include additional external configurations in vhost
-- need to use the provider variable not the provider key value from the directory hash for matches
-- Support for FreeBSD and few other features
-- Add new params to apache::mod::mime class
-- Allow apache::mod to specify module id and path
-- added $server_root parameter
-- Add Allow and ExtendedStatus support to mod_status
-- Expand vhost/_directories.pp directive support
-- Add initial support for nss module (no directives in vhost template yet)
-- added peruser and event mpms
-- added $service_name parameter
-- add parameter for TraceEnable
-- Make LogLevel configurable for server and vhost
-- Add documentation about $ip
-- Add ability to pass ip (instead of wildcard) in default vhost files
-
-#### Bugfixes:
-
-- Don't listen on port or set NameVirtualHost for non-existent vhost
-- only apply Directory defaults when provider is a directory
-- Working mod_authnz_ldap support on Debian/Ubuntu
-
-## Supported Release [0.9.0]
-### Summary:
-This release adds more parameters to the base apache class and apache defined
-resource to make the module more flexible. It also adds or enhances SuPHP,
-WSGI, and Passenger mod support, and support for the ITK mpm module.
-
-#### Backwards-incompatible Changes:
-- Remove many default mods that are not normally needed.
-- Remove `rewrite_base` `apache::vhost` parameter; did not work anyway.
-- Specify dependencies on stdlib >=2.4.0 (this was already the case, but
-making explicit)
-- Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod`
-defined resource.
-
-#### Features:
-- `apache` class
-  - Add `httpd_dir` parameter to change the location of the configuration
-  files.
-  - Add `logroot` parameter to change the logroot
-  - Add `ports_file` parameter to changes the `ports.conf` file location
-  - Add `keepalive` parameter to enable persistent connections
-  - Add `keepalive_timeout` parameter to change the timeout
-  - Update `default_mods` to be able to take an array of mods to enable.
-- `apache::vhost`
-  - Add `wsgi_daemon_process`, `wsgi_daemon_process_options`,
-  `wsgi_process_group`, and `wsgi_script_aliases` parameters for per-vhost
-  WSGI configuration.
-  - Add `access_log_syslog` parameter to enable syslogging.
-  - Add `error_log_syslog` parameter to enable syslogging of errors.
-  - Add `directories` hash parameter. Please see README for documentation.
-  - Add `sslproxyengine` parameter to enable SSLProxyEngine
-  - Add `suphp_addhandler`, `suphp_engine`, and `suphp_configpath` for
-  configuring SuPHP.
-  - Add `custom_fragment` parameter to allow for arbitrary apache
-  configuration injection. (Feature pull requests are prefered over using
-  this, but it is available in a pinch.)
-- Add `apache::mod::suphp` class for configuring SuPHP.
-- Add `apache::mod::itk` class for configuring ITK mpm module.
-- Update `apache::mod::wsgi` class for global WSGI configuration with
-`wsgi_socket_prefix` and `wsgi_python_home` parameters.
-- Add README.passenger.md to document the `apache::mod::passenger` usage.
-Added `passenger_high_performance`, `passenger_pool_idle_time`,
-`passenger_max_requests`, `passenger_stat_throttle_rate`, `rack_autodetect`,
-and `rails_autodetect` parameters.
-- Separate the httpd service resource into a new `apache::service` class for
-dependency chaining of `Class['apache'] -> <resource> ~>
-Class['apache::service']`
-- Added `apache::mod::proxy_balancer` class for `apache::balancer`
-
-#### Bugfixes:
-- Change dependency to puppetlabs-concat
-- Fix ruby 1.9 bug for `a2mod`
-- Change servername to be `$::hostname` if there is no `$::fqdn`
-- Make `/etc/ssl/certs` the default ssl certs directory for RedHat non-5.
-- Make `php` the default php package for RedHat non-5.
-- Made `aliases` able to take a single alias hash instead of requiring an
-array.
-
-## Supported Release [0.8.1]
-#### Bugfixes:
-- Update `apache::mpm_module` detection for worker/prefork
-- Update `apache::mod::cgi` and `apache::mod::cgid` detection for
-worker/prefork
-
-## Supported Release [0.8.0]
-#### Features:
-- Add `servername` parameter to `apache` class
-- Add `proxy_set` parameter to `apache::balancer` define
-
-#### Bugfixes:
-- Fix ordering for multiple `apache::balancer` clusters
-- Fix symlinking for sites-available on Debian-based OSs
-- Fix dependency ordering for recursive confdir management
-- Fix `apache::mod::*` to notify the service on config change
-- Documentation updates
-
-## Supported Release [0.7.0]
-#### Changes:
-- Essentially rewrite the module -- too many to list
-- `apache::vhost` has many abilities -- see README.md for details
-- `apache::mod::*` classes provide httpd mod-loading capabilities
-- `apache` base class is much more configurable
-
-#### Bugfixes:
-- Many. And many more to come
-
-## Supported Release [0.6.0]
-- update travis tests (add more supported versions)
-- add access log_parameter
-- make purging of vhost dir configurable
-
-## Supported Release [0.4.0]
-#### Changes:
-- `include apache` is now required when using `apache::mod::*`
-
-#### Bugfixes:
-- Fix syntax for validate_re
-- Fix formatting in vhost template
-- Fix spec tests such that they pass
-
-## Supported Release [0.0.4]
-* e62e362 Fix broken tests for ssl, vhost, vhost::*
-* 42c6363 Changes to match style guide and pass puppet-lint without error
-* 42bc8ba changed name => path for file resources in order to name namevar by it's name
-* 72e13de One end too much
-* 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
-* 273f94d fix tests
-* a35ede5 (#13860) Make a2enmod/a2dismo commands optional
-* 98d774e (#13860) Autorequire Package['httpd']
-* 05fcec5 (#13073) Add missing puppet spec tests
-* 541afda (#6899) Remove virtual a2mod definition
-* 976cb69 (#13072) Move mod python and wsgi package names to params
-* 323915a (#13060) Add .gitignore to repo
-* fdf40af (#13060) Remove pkg directory from source tree
-* fd90015 Add LICENSE file and update the ModuleFile
-* d3d0d23 Re-enable local php class
-* d7516c7 Make management of firewalls configurable for vhosts
-* 60f83ba Explicitly lookup scope of apache_name in templates.
-* f4d287f (#12581) Add explicit ordering for vdir directory
-* 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
-* a776a8b (#11071) Fix to work with latest firewall module
-* 2b79e8b (#11070) Add support for Scientific Linux
-* 405b3e9 Fix for a2mod
-* 57b9048 Commit apache::vhost::redirect Manifest
-* 8862d01 Commit apache::vhost::proxy Manifest
-* d5c1fd0 Commit apache::mod::wsgi Manifest
-* a825ac7 Commit apache::mod::python Manifest
-* b77062f Commit Templates
-* 9a51b4a Vhost File Declarations
-* 6cf7312 Defaults for Parameters
-* 6a5b11a Ensure installed
-* f672e46 a2mod fix
-* 8a56ee9 add pthon support to apache
-
-[3.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/3.1.0...3.2.0
-[3.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/3.0.0...3.1.0
-[3.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.1...3.0.0
-[2.3.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.3.0...2.3.1
-[2.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.2.0...2.3.0
-[2.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.1.0...2.2.0
-[2.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...2.1.0
-[2.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0
-[1.11.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...1.11.1
-[1.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...1.11.0
-[1.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...1.10.0
-[1.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...1.9.0
-[1.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.0...1.8.1
-[1.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.1...1.8.0
-[1.7.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.0...1.7.1
-[1.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.6.0...1.7.0
-[1.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.5.0...1.6.0
-[1.5.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.1...1.5.0
-[1.4.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.0...1.4.1
-[1.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.3.0...1.4.0
-[1.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.2.0...1.3.0
-[1.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.1...1.2.0
-[1.1.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.0...1.1.1
-[1.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.1...1.1.0
-[1.0.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.0...1.0.1
-[1.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.11.0...1.0.0
-[0.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...0.11.0
-[0.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...0.10.0
-[0.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...0.9.0
-[0.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.8.0...0.8.1
-[0.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.7.0...0.8.0
-[0.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.6.0...0.7.0
-[0.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.5.0-rc1...0.6.0
-[0.5.0-rc1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.4.0...0.5.0-rc1
-[0.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.3.0...0.4.0
-[0.0.4]:https://github.com/puppetlabs/puppetlabs-apache/commits/0.0.4
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
+- (MODULES-2682, FM-3919) Use more FilesMatch [#1280](https://github.com/puppetlabs/puppetlabs-apache/pull/1280) ([DavidS](https://github.com/DavidS))
+- (MODULES-2682) Update Apache Configuration to use FilesMatch instead … [#1277](https://github.com/puppetlabs/puppetlabs-apache/pull/1277) ([DavidS](https://github.com/DavidS))
+- (MODULES-2703) Allow mod pagespeed to take an array of lines as additional_configuration [#1276](https://github.com/puppetlabs/puppetlabs-apache/pull/1276) ([DavidS](https://github.com/DavidS))
+- add ability to overide file name generation in custom_config [#1270](https://github.com/puppetlabs/puppetlabs-apache/pull/1270) ([karmix](https://github.com/karmix))
+- (MODULES-2834) Support SSLProxyCheckPeerCN and SSLProxyCheckPeerName … [#1268](https://github.com/puppetlabs/puppetlabs-apache/pull/1268) ([traylenator](https://github.com/traylenator))
+- Leave require directive unmanaged [#1267](https://github.com/puppetlabs/puppetlabs-apache/pull/1267) ([robertvargason](https://github.com/robertvargason))
+- Added support for LDAPTrustedGlobalCert option to apache::mod::ldap [#1262](https://github.com/puppetlabs/puppetlabs-apache/pull/1262) ([lukebigum](https://github.com/lukebigum))
+
+### Fixed
+
+- (MODULES-2200, MODULES-2865) fix ITK configuration on Ubuntu [#1288](https://github.com/puppetlabs/puppetlabs-apache/pull/1288) ([bmjen](https://github.com/bmjen))
+- (MODULES-2773) Duplicate Entries in Spec Files [#1278](https://github.com/puppetlabs/puppetlabs-apache/pull/1278) ([DavidS](https://github.com/DavidS))
+- (MODULES-2863) Set SSLProxy directives even if ssl is false [#1274](https://github.com/puppetlabs/puppetlabs-apache/pull/1274) ([ckaenzig](https://github.com/ckaenzig))
+
+## [1.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.7.0) - 2015-11-17
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.6.0...1.7.0)
+
+### Added
+
+- Add support for changing mod_nss listen port (vol 2) [#1260](https://github.com/puppetlabs/puppetlabs-apache/pull/1260) ([rexcze-zz](https://github.com/rexcze-zz))
+- (MODULES-2811) Add missing helper lines to spec files [#1256](https://github.com/puppetlabs/puppetlabs-apache/pull/1256) ([alexharv074](https://github.com/alexharv074))
+- Add missing parameters in mod_auth_kerb [#1255](https://github.com/puppetlabs/puppetlabs-apache/pull/1255) ([olivierHa](https://github.com/olivierHa))
+- (MODULES-2764) Enclose IPv6 addresses in square brackets [#1248](https://github.com/puppetlabs/puppetlabs-apache/pull/1248) ([Benedikt1992](https://github.com/Benedikt1992))
+- (MODULES-2757) Adding if around ServerName in template [#1237](https://github.com/puppetlabs/puppetlabs-apache/pull/1237) ([damonconway](https://github.com/damonconway))
+- (MODULES-2651) Default document root update for Ubuntu 14.04 and Debian 8 [#1235](https://github.com/puppetlabs/puppetlabs-apache/pull/1235) ([abednarik](https://github.com/abednarik))
+- Update mime.conf.erb to support dynamic AddHandler AddType AddOutputF… [#1232](https://github.com/puppetlabs/puppetlabs-apache/pull/1232) ([prabin5](https://github.com/prabin5))
+- #2544 Allow multiple IP addresses per vhost [#1229](https://github.com/puppetlabs/puppetlabs-apache/pull/1229) ([Benedikt1992](https://github.com/Benedikt1992))
+- RewriteLock support [#1228](https://github.com/puppetlabs/puppetlabs-apache/pull/1228) ([wickedOne](https://github.com/wickedOne))
+- (MODULES-2120) Allow empty docroot [#1224](https://github.com/puppetlabs/puppetlabs-apache/pull/1224) ([DavidS](https://github.com/DavidS))
+- Add option to configure the include pattern for the vhost_enable dir [#1223](https://github.com/puppetlabs/puppetlabs-apache/pull/1223) ([DavidS](https://github.com/DavidS))
+- (MODULES-2120) Allow empty docroot [#1222](https://github.com/puppetlabs/puppetlabs-apache/pull/1222) ([yakatz](https://github.com/yakatz))
+- Install all modules before adding custom configs [#1221](https://github.com/puppetlabs/puppetlabs-apache/pull/1221) ([mpdude](https://github.com/mpdude))
+- (#2673) Adding dev_packages to apache class. Allows use of httpd24u-d… [#1218](https://github.com/puppetlabs/puppetlabs-apache/pull/1218) ([damonconway](https://github.com/damonconway))
+- Change SSLProtocol in apache::vhost to be space separated [#1216](https://github.com/puppetlabs/puppetlabs-apache/pull/1216) ([bmfurtado](https://github.com/bmfurtado))
+- (MODULES-2649) Allow SetOutputFilter to be set on a directory. [#1214](https://github.com/puppetlabs/puppetlabs-apache/pull/1214) ([traylenator](https://github.com/traylenator))
+- (MODULES-2647) Optinally set parameters for mod_ext_filter module [#1213](https://github.com/puppetlabs/puppetlabs-apache/pull/1213) ([traylenator](https://github.com/traylenator))
+- (MODULES-2622) add SecUploadDir parameter to support file uploads with mod_security [#1210](https://github.com/puppetlabs/puppetlabs-apache/pull/1210) ([jlambert121](https://github.com/jlambert121))
+- (MODULES-2616) Optionally set LimitRequestFieldSize on an apache::vhost [#1208](https://github.com/puppetlabs/puppetlabs-apache/pull/1208) ([traylenator](https://github.com/traylenator))
+- also install mod_authn_alias as default mod in debian for apache < 2.4 [#1205](https://github.com/puppetlabs/puppetlabs-apache/pull/1205) ([zivis](https://github.com/zivis))
+- Add an option to configure PassengerLogFile [#1194](https://github.com/puppetlabs/puppetlabs-apache/pull/1194) ([igalic](https://github.com/igalic))
+- (MODULES-2458) Support for mod_auth_mellon. [#1189](https://github.com/puppetlabs/puppetlabs-apache/pull/1189) ([traylenator](https://github.com/traylenator))
+- Add ListenBacklog for mod worker (MODULES-2432) [#1185](https://github.com/puppetlabs/puppetlabs-apache/pull/1185) ([mwhahaha](https://github.com/mwhahaha))
+- (MODULES-2419) - Add mod_auth_kerb parameters to vhost [#1183](https://github.com/puppetlabs/puppetlabs-apache/pull/1183) ([traylenator](https://github.com/traylenator))
+- Support the mod_proxy ProxyPassReverseCookiePath directive [#1180](https://github.com/puppetlabs/puppetlabs-apache/pull/1180) ([roidelapluie](https://github.com/roidelapluie))
+- Adding use_optional_includes parameter to vhost define. [#1162](https://github.com/puppetlabs/puppetlabs-apache/pull/1162) ([cropalato](https://github.com/cropalato))
+- mod_passenger: Allow setting PassengerSpawnMethod [#1158](https://github.com/puppetlabs/puppetlabs-apache/pull/1158) ([wubr](https://github.com/wubr))
+- Feature/master/passengerbaseuri [#1152](https://github.com/puppetlabs/puppetlabs-apache/pull/1152) ([aronymous](https://github.com/aronymous))
+
+### Fixed
+
+- (MODULES-2813) Fix deprecation warning in spec_helper.rb [#1258](https://github.com/puppetlabs/puppetlabs-apache/pull/1258) ([alexharv074](https://github.com/alexharv074))
+- (MODULES-2812) Fix deprecation warning in service_spec.rb [#1257](https://github.com/puppetlabs/puppetlabs-apache/pull/1257) ([alexharv074](https://github.com/alexharv074))
+- Fix typo about dynamic AddHandler/AddType [#1254](https://github.com/puppetlabs/puppetlabs-apache/pull/1254) ([olivierHa](https://github.com/olivierHa))
+- reduce constraints on regex to fix pe tests [#1231](https://github.com/puppetlabs/puppetlabs-apache/pull/1231) ([tphoney](https://github.com/tphoney))
+- Fix ordering issue with conf_file and ports_file [#1230](https://github.com/puppetlabs/puppetlabs-apache/pull/1230) ([MasonM](https://github.com/MasonM))
+- (MODULES-2655) Fix acceptance testing for SSLProtocol behaviour for real [#1226](https://github.com/puppetlabs/puppetlabs-apache/pull/1226) ([DavidS](https://github.com/DavidS))
+- Multiple fixes [#1225](https://github.com/puppetlabs/puppetlabs-apache/pull/1225) ([DavidS](https://github.com/DavidS))
+- Fix typo of MPM_PREFORK for FreeBSD package install [#1200](https://github.com/puppetlabs/puppetlabs-apache/pull/1200) ([edmundcraske](https://github.com/edmundcraske))
+- Deflate "application/json" by default [#1198](https://github.com/puppetlabs/puppetlabs-apache/pull/1198) ([leopoiroux](https://github.com/leopoiroux))
+- MODULES-2513 mod::ssl fails on SLES [#1195](https://github.com/puppetlabs/puppetlabs-apache/pull/1195) ([ngrossmann](https://github.com/ngrossmann))
+- Catch that mod_authz_default has been removed in Apache 2.4 [#1193](https://github.com/puppetlabs/puppetlabs-apache/pull/1193) ([mpdude](https://github.com/mpdude))
+- MODULES-2439 - ProxyPassMatch parameters were ending up on a newline [#1190](https://github.com/puppetlabs/puppetlabs-apache/pull/1190) ([underscorgan](https://github.com/underscorgan))
+- The purge_vhost_configs parameter is actually called purge_vhost_dir [#1184](https://github.com/puppetlabs/puppetlabs-apache/pull/1184) ([mpdude](https://github.com/mpdude))
+- corrects mod_cgid worker/event defaults [#1182](https://github.com/puppetlabs/puppetlabs-apache/pull/1182) ([bmjen](https://github.com/bmjen))
+- fixes conditional in vhost aliases [#1181](https://github.com/puppetlabs/puppetlabs-apache/pull/1181) ([bmjen](https://github.com/bmjen))
+- load unixd before fcgid on all operating systems (see #879) [#1178](https://github.com/puppetlabs/puppetlabs-apache/pull/1178) ([sethlyons](https://github.com/sethlyons))
+- Fix apache::mod::cgid so it can be used with the event MPM [#1175](https://github.com/puppetlabs/puppetlabs-apache/pull/1175) ([MasonM](https://github.com/MasonM))
+- Fix _proxy.erb for SetEnv within ProxyMatch. [#1156](https://github.com/puppetlabs/puppetlabs-apache/pull/1156) ([dconry](https://github.com/dconry))
+- mod::alias should be included when the aliases parameter is used [#1155](https://github.com/puppetlabs/puppetlabs-apache/pull/1155) ([pcfens](https://github.com/pcfens))
+- Fix: missing package for mod_geoip on Debian systems [#1148](https://github.com/puppetlabs/puppetlabs-apache/pull/1148) ([olivierHa](https://github.com/olivierHa))
+
+### Other
+
+- Client auth for reverse proxy [#1188](https://github.com/puppetlabs/puppetlabs-apache/pull/1188) ([holtwilkins](https://github.com/holtwilkins))
+- Add support for user modifiable installation of mod_systemd and pidfile locations: [#1159](https://github.com/puppetlabs/puppetlabs-apache/pull/1159) ([vamegh](https://github.com/vamegh))
+
+## [1.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.6.0) - 2015-07-30
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.5.0...1.6.0)
+
+### Added
+
+- [#puppethack] Adding ability to enable/disable the secruleengine through a parameter [#1168](https://github.com/puppetlabs/puppetlabs-apache/pull/1168) ([igalic](https://github.com/igalic))
+- add possibility to set icons_path to false so no alias will be set for it [#1160](https://github.com/puppetlabs/puppetlabs-apache/pull/1160) ([tjikkun](https://github.com/tjikkun))
+- Add ssl_openssl_conf_cmd param (apache::mod::ssl and apache::vhost) [#1127](https://github.com/puppetlabs/puppetlabs-apache/pull/1127) ([tmuellerleile](https://github.com/tmuellerleile))
+
+### Fixed
+
+- fixes timing of mod_security tests for aio [#1165](https://github.com/puppetlabs/puppetlabs-apache/pull/1165) ([bmjen](https://github.com/bmjen))
+- Debian 7 acceptance test fix [#1161](https://github.com/puppetlabs/puppetlabs-apache/pull/1161) ([bmjen](https://github.com/bmjen))
+- Fix test condition for proxy directives. [#1145](https://github.com/puppetlabs/puppetlabs-apache/pull/1145) ([jonnytdevops](https://github.com/jonnytdevops))
+
+### Other
+
+- apache::vhost filter support [#1143](https://github.com/puppetlabs/puppetlabs-apache/pull/1143) ([BIAndrews](https://github.com/BIAndrews))
+- Add the ability to specify GeoIPScanProxyHeaderField for mod_geoip [#1128](https://github.com/puppetlabs/puppetlabs-apache/pull/1128) ([dgarbus](https://github.com/dgarbus))
+
+## [1.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.5.0) - 2015-06-16
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.1...1.5.0)
+
+### Added
+
+- Add the helper to install puppet/pe/puppet-agent [#1140](https://github.com/puppetlabs/puppetlabs-apache/pull/1140) ([hunner](https://github.com/hunner))
+- Updated travisci file to remove allow_failures for Puppet 4 [#1135](https://github.com/puppetlabs/puppetlabs-apache/pull/1135) ([jonnytdevops](https://github.com/jonnytdevops))
+- Add changelog for 1.5.0 relesase [#1132](https://github.com/puppetlabs/puppetlabs-apache/pull/1132) ([hunner](https://github.com/hunner))
+- Support puppetlabs-concat 2.x [#1126](https://github.com/puppetlabs/puppetlabs-apache/pull/1126) ([domcleal](https://github.com/domcleal))
+- Add basic initial support for SLES 11 [#1121](https://github.com/puppetlabs/puppetlabs-apache/pull/1121) ([carroarmato0](https://github.com/carroarmato0))
+- Modulesync updates [#1117](https://github.com/puppetlabs/puppetlabs-apache/pull/1117) ([underscorgan](https://github.com/underscorgan))
+- MODULES-1968 - Update the template to warn if using deprecated options [#1113](https://github.com/puppetlabs/puppetlabs-apache/pull/1113) ([underscorgan](https://github.com/underscorgan))
+- check if ensure present before including alias module [#1102](https://github.com/puppetlabs/puppetlabs-apache/pull/1102) ([maneeshmp](https://github.com/maneeshmp))
+
+### Fixed
+
+- Fixes acceptance tests [#1141](https://github.com/puppetlabs/puppetlabs-apache/pull/1141) ([bmjen](https://github.com/bmjen))
+- Incorrect date in the changelog [#1134](https://github.com/puppetlabs/puppetlabs-apache/pull/1134) ([underscorgan](https://github.com/underscorgan))
+- Do not offload overriding LogFormats to httpd [#1096](https://github.com/puppetlabs/puppetlabs-apache/pull/1096) ([igalic](https://github.com/igalic))
+
+### Other
+
+- Added the ability to define the IndexStyleSheet setting for a directory [#1124](https://github.com/puppetlabs/puppetlabs-apache/pull/1124) ([genebean](https://github.com/genebean))
+
+## [1.4.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.4.1) - 2015-04-28
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.0...1.4.1)
+
+### Added
+
+- (#1971) new $service_restart parameter to influence httpd. [#1107](https://github.com/puppetlabs/puppetlabs-apache/pull/1107) ([traylenator](https://github.com/traylenator))
+- unify log_level checking and allow trace1-8 levels [#1097](https://github.com/puppetlabs/puppetlabs-apache/pull/1097) ([mrgum](https://github.com/mrgum))
+- (BKR-147) add Gemfile setting for BEAKER_VERSION for puppet... [#1085](https://github.com/puppetlabs/puppetlabs-apache/pull/1085) ([anodelman](https://github.com/anodelman))
+- MODULES-1789 add initial mod_geoip support [#1083](https://github.com/puppetlabs/puppetlabs-apache/pull/1083) ([roman-mueller](https://github.com/roman-mueller))
+- Allow settings to be overridden as parameters to apache::mod::ssl [#1079](https://github.com/puppetlabs/puppetlabs-apache/pull/1079) ([roman-mueller](https://github.com/roman-mueller))
+- add section for FreeBSD limitations [#1078](https://github.com/puppetlabs/puppetlabs-apache/pull/1078) ([sethlyons](https://github.com/sethlyons))
+- Make Options directive configurable for mod userdir [#1077](https://github.com/puppetlabs/puppetlabs-apache/pull/1077) ([frenkel](https://github.com/frenkel))
+- allow acess to userdirs again [#1071](https://github.com/puppetlabs/puppetlabs-apache/pull/1071) ([niklas](https://github.com/niklas))
+- add parameters to configure expires globally [#1063](https://github.com/puppetlabs/puppetlabs-apache/pull/1063) ([igalic](https://github.com/igalic))
+
+### Fixed
+
+- (MODULES-1874) Fix proxy_connect module on apache >= 2.2 [#1093](https://github.com/puppetlabs/puppetlabs-apache/pull/1093) ([ckaenzig](https://github.com/ckaenzig))
+- Fix remoteip unit test for rspec-puppet 2 [#1091](https://github.com/puppetlabs/puppetlabs-apache/pull/1091) ([cmurphy](https://github.com/cmurphy))
+- fix typo [#1082](https://github.com/puppetlabs/puppetlabs-apache/pull/1082) ([kgeis](https://github.com/kgeis))
+- Fixes/apache name [#1070](https://github.com/puppetlabs/puppetlabs-apache/pull/1070) ([stevenpost](https://github.com/stevenpost))
+- Remoteip module [#1065](https://github.com/puppetlabs/puppetlabs-apache/pull/1065) ([igalic](https://github.com/igalic))
+
+### Other
+
+- Fixed setting multiple env_var in a location block for proxy pass. [#1086](https://github.com/puppetlabs/puppetlabs-apache/pull/1086) ([btreecat](https://github.com/btreecat))
+- make $lib_path configurable [#1057](https://github.com/puppetlabs/puppetlabs-apache/pull/1057) ([fraenki](https://github.com/fraenki))
+
+## [1.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.4.0) - 2015-03-17
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.3.0...1.4.0)
+
+### Added
+
+- Give a lower priority to mod_passenger [#1072](https://github.com/puppetlabs/puppetlabs-apache/pull/1072) ([underscorgan](https://github.com/underscorgan))
+- Apache - mod_passenger: allow setting PassengerMinInstances [#1067](https://github.com/puppetlabs/puppetlabs-apache/pull/1067) ([stevenpost](https://github.com/stevenpost))
+- Apache: allow setting the default type [#1064](https://github.com/puppetlabs/puppetlabs-apache/pull/1064) ([stevenpost](https://github.com/stevenpost))
+- Allow setting environment variables inside the proxy locations [#1061](https://github.com/puppetlabs/puppetlabs-apache/pull/1061) ([stevenpost](https://github.com/stevenpost))
+- give a lower priority to mod_passenger [#1060](https://github.com/puppetlabs/puppetlabs-apache/pull/1060) ([stevenpost](https://github.com/stevenpost))
+- Added missing comma in the aliases example section [#1058](https://github.com/puppetlabs/puppetlabs-apache/pull/1058) ([jeremycline](https://github.com/jeremycline))
+- Adds the AddDefaultCharset option [#1053](https://github.com/puppetlabs/puppetlabs-apache/pull/1053) ([stevenpost](https://github.com/stevenpost))
+- add proper array support for require [#1047](https://github.com/puppetlabs/puppetlabs-apache/pull/1047) ([underscorgan](https://github.com/underscorgan))
+- make icons directorylisting configurable [#1046](https://github.com/puppetlabs/puppetlabs-apache/pull/1046) ([underscorgan](https://github.com/underscorgan))
+- Allow includes necessary for basic authentication [#1045](https://github.com/puppetlabs/puppetlabs-apache/pull/1045) ([underscorgan](https://github.com/underscorgan))
+- MODULES-1779 install package mod_ldap on CentOS 7 [#1038](https://github.com/puppetlabs/puppetlabs-apache/pull/1038) ([roman-mueller](https://github.com/roman-mueller))
+- Add support for Passenger's PassengerAppEnv setting [#1034](https://github.com/puppetlabs/puppetlabs-apache/pull/1034) ([liff](https://github.com/liff))
+- MODULES-1622: Allow multiple Deny directives in a directory [#985](https://github.com/puppetlabs/puppetlabs-apache/pull/985) ([roman-mueller](https://github.com/roman-mueller))
+- MODULES-1581: Gentoo compatibility [#957](https://github.com/puppetlabs/puppetlabs-apache/pull/957) ([derdanne](https://github.com/derdanne))
+
+### Fixed
+
+- Revert "Supersede ssl_random_seed_bytes with ssl_random_seeds option to ... [#1073](https://github.com/puppetlabs/puppetlabs-apache/pull/1073) ([underscorgan](https://github.com/underscorgan))
+- Apache: add support for the ProxyPassMatch directive [#1069](https://github.com/puppetlabs/puppetlabs-apache/pull/1069) ([stevenpost](https://github.com/stevenpost))
+- Remove Debian workaround as it broke Red Hat systems [#1062](https://github.com/puppetlabs/puppetlabs-apache/pull/1062) ([stevenpost](https://github.com/stevenpost))
+- Fix typo in fallbackresource [#1055](https://github.com/puppetlabs/puppetlabs-apache/pull/1055) ([jbx](https://github.com/jbx))
+- Ensure resources notify Apache::Service class [#1054](https://github.com/puppetlabs/puppetlabs-apache/pull/1054) ([butlern](https://github.com/butlern))
+- Style fix [#1052](https://github.com/puppetlabs/puppetlabs-apache/pull/1052) ([stevenpost](https://github.com/stevenpost))
+- Don't manage docroot when default vhosts are disabled [#1050](https://github.com/puppetlabs/puppetlabs-apache/pull/1050) ([underscorgan](https://github.com/underscorgan))
+- include mod_filter when needed instead of instantiating it [#1049](https://github.com/puppetlabs/puppetlabs-apache/pull/1049) ([sethlyons](https://github.com/sethlyons))
+- Corrected error in documentation for ssl_protocol and ssl_cipher. [#1044](https://github.com/puppetlabs/puppetlabs-apache/pull/1044) ([tdiscuit](https://github.com/tdiscuit))
+- Fixed vhost proxy_pass params documentation [#1043](https://github.com/puppetlabs/puppetlabs-apache/pull/1043) ([grafjo](https://github.com/grafjo))
+- (#1391) Correct Debian jessie mod_prefork dev package name [#1042](https://github.com/puppetlabs/puppetlabs-apache/pull/1042) ([sathieu](https://github.com/sathieu))
+- Fixes #880 - (MODULES-1391) Correct Ubuntu Trusty mod_prefork package name [#1041](https://github.com/puppetlabs/puppetlabs-apache/pull/1041) ([underscorgan](https://github.com/underscorgan))
+- Fixed default mpm_event config warning [#1039](https://github.com/puppetlabs/puppetlabs-apache/pull/1039) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+- fix bug in scriptalias code that keeps scriptalias from beeing included in default vhost [#1035](https://github.com/puppetlabs/puppetlabs-apache/pull/1035) ([haraldsk](https://github.com/haraldsk))
+- Fixed an order of operations issue in the test that caused some weird behavior when apache would delay or not restart and added a check with timeout to ensure proper wait [#1032](https://github.com/puppetlabs/puppetlabs-apache/pull/1032) ([cyberious](https://github.com/cyberious))
+- SuPHP acceptance fixes?, chasing the test bug that is timing [#1031](https://github.com/puppetlabs/puppetlabs-apache/pull/1031) ([cyberious](https://github.com/cyberious))
+- ssl.pp: Fixed indent. [#1026](https://github.com/puppetlabs/puppetlabs-apache/pull/1026) ([jpds-zz](https://github.com/jpds-zz))
+- our templates are horrible, we should fix it [#1025](https://github.com/puppetlabs/puppetlabs-apache/pull/1025) ([igalic](https://github.com/igalic))
+
+### Other
+
+- MODULES-1784 check for deprecated options and fail when they are unsupported [#1036](https://github.com/puppetlabs/puppetlabs-apache/pull/1036) ([roman-mueller](https://github.com/roman-mueller))
+
+## [1.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.3.0) - 2015-02-17
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.2.0...1.3.0)
+
+### Added
+
+- Concat started using a new fact [#1012](https://github.com/puppetlabs/puppetlabs-apache/pull/1012) ([underscorgan](https://github.com/underscorgan))
+- (MODULES-1719) Add parameter for SSLRandomSeed bytes [#1007](https://github.com/puppetlabs/puppetlabs-apache/pull/1007) ([hunner](https://github.com/hunner))
+- MODULES-1744: use bool2httpd for server_signature and trace_enable [#1006](https://github.com/puppetlabs/puppetlabs-apache/pull/1006) ([jlambert121](https://github.com/jlambert121))
+- add configuration options to mod_security [#997](https://github.com/puppetlabs/puppetlabs-apache/pull/997) ([jlambert121](https://github.com/jlambert121))
+- MODULES-1696: ensure mod::setenvif is included if needed [#995](https://github.com/puppetlabs/puppetlabs-apache/pull/995) ([jlambert121](https://github.com/jlambert121))
+- MODULES-1680 - sort php_* hashes for idempotency [#994](https://github.com/puppetlabs/puppetlabs-apache/pull/994) ([underscorgan](https://github.com/underscorgan))
+- modules-1559 Apache module no service refresh [#993](https://github.com/puppetlabs/puppetlabs-apache/pull/993) ([tphoney](https://github.com/tphoney))
+- Add RewriteMap support [#990](https://github.com/puppetlabs/puppetlabs-apache/pull/990) ([soerenbe](https://github.com/soerenbe))
+- add passenger support for Debian/jessie [#976](https://github.com/puppetlabs/puppetlabs-apache/pull/976) ([mmoll](https://github.com/mmoll))
+- Add IntelliJ files to the ignore list [#970](https://github.com/puppetlabs/puppetlabs-apache/pull/970) ([cmurphy](https://github.com/cmurphy))
+- MODULES-1586: Set uid/gid when creating user/group resources [#962](https://github.com/puppetlabs/puppetlabs-apache/pull/962) ([rnelson0](https://github.com/rnelson0))
+- acceptance: add test for actual port [#959](https://github.com/puppetlabs/puppetlabs-apache/pull/959) ([DavidS](https://github.com/DavidS))
+- MODULES-1382: support multiple access log directives [#951](https://github.com/puppetlabs/puppetlabs-apache/pull/951) ([jlambert121](https://github.com/jlambert121))
+- add mod_security apache module [#948](https://github.com/puppetlabs/puppetlabs-apache/pull/948) ([jlambert121](https://github.com/jlambert121))
+- Add metadata summary per FM-1523 [#942](https://github.com/puppetlabs/puppetlabs-apache/pull/942) ([lrnrthr](https://github.com/lrnrthr))
+- Add configurable options for mpm_event [#939](https://github.com/puppetlabs/puppetlabs-apache/pull/939) ([stumped2](https://github.com/stumped2))
+- Add support for SSLPassPhraseDialog [#938](https://github.com/puppetlabs/puppetlabs-apache/pull/938) ([dteirney](https://github.com/dteirney))
+- Updated _directories.erb to add support for 'SetEnv' [#934](https://github.com/puppetlabs/puppetlabs-apache/pull/934) ([muresan](https://github.com/muresan))
+- 'allow_encoded_slashes' vhost parameter was omitted [#931](https://github.com/puppetlabs/puppetlabs-apache/pull/931) ([antoineco](https://github.com/antoineco))
+- Add $status_path parameter to change mod_status url [#930](https://github.com/puppetlabs/puppetlabs-apache/pull/930) ([atxulo](https://github.com/atxulo))
+- Add support for mod_auth_cas module configuration [#923](https://github.com/puppetlabs/puppetlabs-apache/pull/923) ([pcfens](https://github.com/pcfens))
+- Modules-1458 mod_wsgi package and module name/path [#915](https://github.com/puppetlabs/puppetlabs-apache/pull/915) ([jantman](https://github.com/jantman))
+- Implement php_value and php_flag [#906](https://github.com/puppetlabs/puppetlabs-apache/pull/906) ([jweisner](https://github.com/jweisner))
+
+### Fixed
+
+- Fixup 928 - optionally omit priority [#1014](https://github.com/puppetlabs/puppetlabs-apache/pull/1014) ([underscorgan](https://github.com/underscorgan))
+- FM-2140 - Fix for suphp test [#1011](https://github.com/puppetlabs/puppetlabs-apache/pull/1011) ([underscorgan](https://github.com/underscorgan))
+- Fix for PR 845 [#1010](https://github.com/puppetlabs/puppetlabs-apache/pull/1010) ([underscorgan](https://github.com/underscorgan))
+- ssl_protocol expects a string, not an array. [#1009](https://github.com/puppetlabs/puppetlabs-apache/pull/1009) ([sathieu](https://github.com/sathieu))
+- Fix license for forge linting. [#1008](https://github.com/puppetlabs/puppetlabs-apache/pull/1008) ([big-samantha](https://github.com/big-samantha))
+- Symlinks on all distros [#1000](https://github.com/puppetlabs/puppetlabs-apache/pull/1000) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+- MODULES-1684: Specify mod_proxy_connect module for Apache >= 2.3.5 [#987](https://github.com/puppetlabs/puppetlabs-apache/pull/987) ([holser](https://github.com/holser))
+- fix versioncmp test in mod::alias [#984](https://github.com/puppetlabs/puppetlabs-apache/pull/984) ([jlambert121](https://github.com/jlambert121))
+- MODULES-1688: fix indenting in vhost/_directories.erb template [#980](https://github.com/puppetlabs/puppetlabs-apache/pull/980) ([jlambert121](https://github.com/jlambert121))
+- fix apache_version for Debian >7 [#975](https://github.com/puppetlabs/puppetlabs-apache/pull/975) ([mmoll](https://github.com/mmoll))
+- Strict variable fix [#974](https://github.com/puppetlabs/puppetlabs-apache/pull/974) ([underscorgan](https://github.com/underscorgan))
+- $::selinux is a bool, not a string [#971](https://github.com/puppetlabs/puppetlabs-apache/pull/971) ([underscorgan](https://github.com/underscorgan))
+- Even more mod_security test fixes [#969](https://github.com/puppetlabs/puppetlabs-apache/pull/969) ([underscorgan](https://github.com/underscorgan))
+- Paths should be different for all deb based OSes [#965](https://github.com/puppetlabs/puppetlabs-apache/pull/965) ([underscorgan](https://github.com/underscorgan))
+- Fixes version automatic detection for debian jessie; [#964](https://github.com/puppetlabs/puppetlabs-apache/pull/964) ([Zouuup](https://github.com/Zouuup))
+- Fix tests from #948 [#963](https://github.com/puppetlabs/puppetlabs-apache/pull/963) ([underscorgan](https://github.com/underscorgan))
+- Fix apache::mod::version title [#960](https://github.com/puppetlabs/puppetlabs-apache/pull/960) ([sathieu](https://github.com/sathieu))
+- Fix linting errors [#953](https://github.com/puppetlabs/puppetlabs-apache/pull/953) ([nibalizer](https://github.com/nibalizer))
+- Fix uninitialized variable lint [#947](https://github.com/puppetlabs/puppetlabs-apache/pull/947) ([justinstoller](https://github.com/justinstoller))
+- Modules 825 - apache2.4 - mod_itk dependency fix  [#944](https://github.com/puppetlabs/puppetlabs-apache/pull/944) ([valeriominetti](https://github.com/valeriominetti))
+- MODULES-1384 - idempotency for wsgi_script_aliases [#936](https://github.com/puppetlabs/puppetlabs-apache/pull/936) ([underscorgan](https://github.com/underscorgan))
+- MODULES-1403 - fix doc bug [#935](https://github.com/puppetlabs/puppetlabs-apache/pull/935) ([underscorgan](https://github.com/underscorgan))
+
+### Other
+
+- ssl.pp: Allow setting of SSLRandomSeed option. [#1001](https://github.com/puppetlabs/puppetlabs-apache/pull/1001) ([jpds-zz](https://github.com/jpds-zz))
+
+## [1.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.2.0) - 2014-11-11
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.1...1.2.0)
+
+### Added
+
+- Poodle [#917](https://github.com/puppetlabs/puppetlabs-apache/pull/917) ([igalic](https://github.com/igalic))
+- Support parameters along with proxy_pass now w/ tests [#914](https://github.com/puppetlabs/puppetlabs-apache/pull/914) ([tfhartmann](https://github.com/tfhartmann))
+- Add params to proxy_pass in vhost [#910](https://github.com/puppetlabs/puppetlabs-apache/pull/910) ([mkobel](https://github.com/mkobel))
+- allow disabling default vhosts under 2.4 [#909](https://github.com/puppetlabs/puppetlabs-apache/pull/909) ([igalic](https://github.com/igalic))
+- MODULES-1446: mod_version is now builtin [#908](https://github.com/puppetlabs/puppetlabs-apache/pull/908) ([igalic](https://github.com/igalic))
+- Allow specifying all alias directives in `aliases` [#901](https://github.com/puppetlabs/puppetlabs-apache/pull/901) ([antaflos](https://github.com/antaflos))
+- Add parameter for AddDefaultCharset virtual host directive [#898](https://github.com/puppetlabs/puppetlabs-apache/pull/898) ([domcleal](https://github.com/domcleal))
+- Add Passenger related parameters to vhost [#894](https://github.com/puppetlabs/puppetlabs-apache/pull/894) ([domcleal](https://github.com/domcleal))
+- (#1423) Added the WSGIChunkedRequest directive to vhost [#890](https://github.com/puppetlabs/puppetlabs-apache/pull/890) ([retr0h](https://github.com/retr0h))
+- Remove deprecated concat::setup class [#884](https://github.com/puppetlabs/puppetlabs-apache/pull/884) ([blkperl](https://github.com/blkperl))
+- Modules 1396 redirect match rules do not work in the apache module [#881](https://github.com/puppetlabs/puppetlabs-apache/pull/881) ([Matoch](https://github.com/Matoch))
+- Need fcgid to load after unixd on RHEL7 [#879](https://github.com/puppetlabs/puppetlabs-apache/pull/879) ([underscorgan](https://github.com/underscorgan))
+- Add support to set SSLCARevocationCheck on Apache 2.4 [#866](https://github.com/puppetlabs/puppetlabs-apache/pull/866) ([domcleal](https://github.com/domcleal))
+- (PUP-3242) Setting up mod_shib [#850](https://github.com/puppetlabs/puppetlabs-apache/pull/850) ([Aethylred](https://github.com/Aethylred))
+- force class definition checks to use absolute scope [#833](https://github.com/puppetlabs/puppetlabs-apache/pull/833) ([GeoffWilliams](https://github.com/GeoffWilliams))
+- Added missing syntax highlight to 1st apache::mod::php example [#832](https://github.com/puppetlabs/puppetlabs-apache/pull/832) ([thatgraemeguy](https://github.com/thatgraemeguy))
+- Allow multiple balancermember with the same url [#830](https://github.com/puppetlabs/puppetlabs-apache/pull/830) ([roidelapluie](https://github.com/roidelapluie))
+- add sort to LogFormats to ensure consistency between runs [#829](https://github.com/puppetlabs/puppetlabs-apache/pull/829) ([tjikkun](https://github.com/tjikkun))
+- Add missing kernel fact [#827](https://github.com/puppetlabs/puppetlabs-apache/pull/827) ([underscorgan](https://github.com/underscorgan))
+- Add --relative flag [#826](https://github.com/puppetlabs/puppetlabs-apache/pull/826) ([underscorgan](https://github.com/underscorgan))
+- Convert apache::vhost to use concat fragments. [#825](https://github.com/puppetlabs/puppetlabs-apache/pull/825) ([underscorgan](https://github.com/underscorgan))
+- Finish SCL support for RHEL/CentOS 6 [#821](https://github.com/puppetlabs/puppetlabs-apache/pull/821) ([smerrill](https://github.com/smerrill))
+- Allow overriding the detected $apache_name. [#819](https://github.com/puppetlabs/puppetlabs-apache/pull/819) ([smerrill](https://github.com/smerrill))
+- Allow other manifests to define ::apache::mod{ 'ssl': }. [#818](https://github.com/puppetlabs/puppetlabs-apache/pull/818) ([smerrill](https://github.com/smerrill))
+- Call @proxy_set insteat of proxy_set in inline_template [#816](https://github.com/puppetlabs/puppetlabs-apache/pull/816) ([roidelapluie](https://github.com/roidelapluie))
+- Call install_* methods only once in spec_helper_acceptance [#815](https://github.com/puppetlabs/puppetlabs-apache/pull/815) ([justinstoller](https://github.com/justinstoller))
+- Add a validate_string check for custom_fragment. [#812](https://github.com/puppetlabs/puppetlabs-apache/pull/812) ([underscorgan](https://github.com/underscorgan))
+- ssl mutex directory needs to be set for Debian [#810](https://github.com/puppetlabs/puppetlabs-apache/pull/810) ([jtreminio](https://github.com/jtreminio))
+- Support itk with mod php [#808](https://github.com/puppetlabs/puppetlabs-apache/pull/808) ([corvus-ch](https://github.com/corvus-ch))
+- Exposed $logroot_mode in init.pp [#807](https://github.com/puppetlabs/puppetlabs-apache/pull/807) ([Ginja](https://github.com/Ginja))
+- introduce flag to manage the docroot [#802](https://github.com/puppetlabs/puppetlabs-apache/pull/802) ([igalic](https://github.com/igalic))
+- Add authn_core mod to ubuntu trusty defaults [#800](https://github.com/puppetlabs/puppetlabs-apache/pull/800) ([jestallin](https://github.com/jestallin))
+- Allow to set multiple ProxyPassReverse directives [#793](https://github.com/puppetlabs/puppetlabs-apache/pull/793) ([roidelapluie](https://github.com/roidelapluie))
+- configure timeouts for apache::mod::reqtimeout [#792](https://github.com/puppetlabs/puppetlabs-apache/pull/792) ([roidelapluie](https://github.com/roidelapluie))
+- Add deflate params: types, notes [#785](https://github.com/puppetlabs/puppetlabs-apache/pull/785) ([JCotton1123](https://github.com/JCotton1123))
+- Add regex validation to wsgi_pass_authorization [#775](https://github.com/puppetlabs/puppetlabs-apache/pull/775) ([ekohl](https://github.com/ekohl))
+- Add options to mod info [#717](https://github.com/puppetlabs/puppetlabs-apache/pull/717) ([genebean](https://github.com/genebean))
+
+### Fixed
+
+- Update the test to match the fix from yesterday [#924](https://github.com/puppetlabs/puppetlabs-apache/pull/924) ([underscorgan](https://github.com/underscorgan))
+- Fixes indentation of versioncmp [#922](https://github.com/puppetlabs/puppetlabs-apache/pull/922) ([saz](https://github.com/saz))
+- Relying on missing fact [#921](https://github.com/puppetlabs/puppetlabs-apache/pull/921) ([underscorgan](https://github.com/underscorgan))
+- wsgi_chunked_request doesn't work on lucid [#919](https://github.com/puppetlabs/puppetlabs-apache/pull/919) ([underscorgan](https://github.com/underscorgan))
+- (MODULES-1457) apache::vhost: SSLCACertificatePath can't be unset [#913](https://github.com/puppetlabs/puppetlabs-apache/pull/913) ([vinzent](https://github.com/vinzent))
+- passenger concat needs to be wrapped in a check [#912](https://github.com/puppetlabs/puppetlabs-apache/pull/912) ([pdxfixit](https://github.com/pdxfixit))
+- Fix authnz_ldap package name on el7 [#911](https://github.com/puppetlabs/puppetlabs-apache/pull/911) ([mcanevet](https://github.com/mcanevet))
+- Fix misleading error message [#893](https://github.com/puppetlabs/puppetlabs-apache/pull/893) ([DavidS](https://github.com/DavidS))
+- Fix Shib setting rules. [#888](https://github.com/puppetlabs/puppetlabs-apache/pull/888) ([halfninja](https://github.com/halfninja))
+- ScriptAlias needs to come before Alias. [#882](https://github.com/puppetlabs/puppetlabs-apache/pull/882) ([daveseff](https://github.com/daveseff))
+- Fix vhost and mod_passenger tests on deb7 [#876](https://github.com/puppetlabs/puppetlabs-apache/pull/876) ([underscorgan](https://github.com/underscorgan))
+- Fix dav_svn for debian 6 [#874](https://github.com/puppetlabs/puppetlabs-apache/pull/874) ([underscorgan](https://github.com/underscorgan))
+- Fix custom_config check for ubuntu precise. [#873](https://github.com/puppetlabs/puppetlabs-apache/pull/873) ([underscorgan](https://github.com/underscorgan))
+- Revert "Fix duplicate declarations when puppet manages logroot for vhost... [#869](https://github.com/puppetlabs/puppetlabs-apache/pull/869) ([underscorgan](https://github.com/underscorgan))
+- (FM-1913) fix passenger tests on EL derivatives [#861](https://github.com/puppetlabs/puppetlabs-apache/pull/861) ([justinstoller](https://github.com/justinstoller))
+- Change $port to interpolated string "${port}" to fix "Cannot use Fixnu... [#856](https://github.com/puppetlabs/puppetlabs-apache/pull/856) ([misterdorm](https://github.com/misterdorm))
+- Modules-1294 Fix Auth_Require bug with directories [#855](https://github.com/puppetlabs/puppetlabs-apache/pull/855) ([cyberious](https://github.com/cyberious))
+- Fix correct type for php_admin and sort hash [#851](https://github.com/puppetlabs/puppetlabs-apache/pull/851) ([olivierHa](https://github.com/olivierHa))
+- Revert "strict_variables fix" -- accidentally merged onto 1.1.x [#847](https://github.com/puppetlabs/puppetlabs-apache/pull/847) ([igalic](https://github.com/igalic))
+- Fix issue with puppet_module_install, removed and using updated method f... [#846](https://github.com/puppetlabs/puppetlabs-apache/pull/846) ([cyberious](https://github.com/cyberious))
+- Fix formatting of sethandler description [#842](https://github.com/puppetlabs/puppetlabs-apache/pull/842) ([antaflos](https://github.com/antaflos))
+- Fix some Puppet Lint errors [#840](https://github.com/puppetlabs/puppetlabs-apache/pull/840) ([baurmatt](https://github.com/baurmatt))
+- Ensure that mod packages are installed before conf [#837](https://github.com/puppetlabs/puppetlabs-apache/pull/837) ([bodepd](https://github.com/bodepd))
+- Add defined type for handling custom configs [#836](https://github.com/puppetlabs/puppetlabs-apache/pull/836) ([underscorgan](https://github.com/underscorgan))
+- Typefix [#828](https://github.com/puppetlabs/puppetlabs-apache/pull/828) ([setola](https://github.com/setola))
+- Fix dependency loop in vhost [#820](https://github.com/puppetlabs/puppetlabs-apache/pull/820) ([underscorgan](https://github.com/underscorgan))
+- Fixing warning in rake validate [#809](https://github.com/puppetlabs/puppetlabs-apache/pull/809) ([underscorgan](https://github.com/underscorgan))
+- fix for #802: when !manage_docroot, don't require it [#806](https://github.com/puppetlabs/puppetlabs-apache/pull/806) ([igalic](https://github.com/igalic))
+- Fix strict variables [#804](https://github.com/puppetlabs/puppetlabs-apache/pull/804) ([hunner](https://github.com/hunner))
+- Changes $alias to $fcgi_alias to prevent Puppet complaining about using that name [#781](https://github.com/puppetlabs/puppetlabs-apache/pull/781) ([jtreminio](https://github.com/jtreminio))
+
+## [1.1.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.1.1) - 2014-07-18
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.0...1.1.1)
+
+## [1.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.1.0) - 2014-07-09
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.1...1.1.0)
+
+### Added
+
+- Allow ssl_certs_dir to be unset. [#787](https://github.com/puppetlabs/puppetlabs-apache/pull/787) ([tdb](https://github.com/tdb))
+- Add param to ctrl purging of vhost dir [#786](https://github.com/puppetlabs/puppetlabs-apache/pull/786) ([JCotton1123](https://github.com/JCotton1123))
+- Adds @ to faux_path template variable [#780](https://github.com/puppetlabs/puppetlabs-apache/pull/780) ([jtreminio](https://github.com/jtreminio))
+- Start synchronizing module files [#774](https://github.com/puppetlabs/puppetlabs-apache/pull/774) ([cmurphy](https://github.com/cmurphy))
+- Add DeflateFilterNote directives [#761](https://github.com/puppetlabs/puppetlabs-apache/pull/761) ([bodgit](https://github.com/bodgit))
+- add logroot_mode parameter [#760](https://github.com/puppetlabs/puppetlabs-apache/pull/760) ([nbeernink](https://github.com/nbeernink))
+- MODULES-957: Add more Apache 2.4 conditional blocks to configuration templates [#756](https://github.com/puppetlabs/puppetlabs-apache/pull/756) ([pcfens](https://github.com/pcfens))
+- MODULES-1065: Add ThreadLimit to mod::worker [#755](https://github.com/puppetlabs/puppetlabs-apache/pull/755) ([jlambert121](https://github.com/jlambert121))
+- Add the Satisfy parameter to the directory fragment. [#752](https://github.com/puppetlabs/puppetlabs-apache/pull/752) ([Arakmar](https://github.com/Arakmar))
+- Add package parameters to the dav_svn mod. [#750](https://github.com/puppetlabs/puppetlabs-apache/pull/750) ([Arakmar](https://github.com/Arakmar))
+- Provide configuration file for php module [#744](https://github.com/puppetlabs/puppetlabs-apache/pull/744) ([amateo](https://github.com/amateo))
+- MODULES-956 Added loadfile_name parameter to apache::mod. [#737](https://github.com/puppetlabs/puppetlabs-apache/pull/737) ([underscorgan](https://github.com/underscorgan))
+- Add a nodeset for Ubuntu 14.04. [#719](https://github.com/puppetlabs/puppetlabs-apache/pull/719) ([underscorgan](https://github.com/underscorgan))
+- Add fcgid options [#716](https://github.com/puppetlabs/puppetlabs-apache/pull/716) ([ekohl](https://github.com/ekohl))
+- Add specs for #689 [#715](https://github.com/puppetlabs/puppetlabs-apache/pull/715) ([hunner](https://github.com/hunner))
+- Use access_compat on 2.4, and update pagespeed to load the correct modul... [#714](https://github.com/puppetlabs/puppetlabs-apache/pull/714) ([underscorgan](https://github.com/underscorgan))
+- Add suexec support [#712](https://github.com/puppetlabs/puppetlabs-apache/pull/712) ([ekohl](https://github.com/ekohl))
+-  Configure Passenger in separate .conf file on Debian so PassengerRoot isn't lost [#711](https://github.com/puppetlabs/puppetlabs-apache/pull/711) ([GregSutcliffe](https://github.com/GregSutcliffe))
+- Don't include the NameVirtualHost directives in apache >= 2.4, and add t... [#708](https://github.com/puppetlabs/puppetlabs-apache/pull/708) ([underscorgan](https://github.com/underscorgan))
+- Add fastcgi external server defined type [#704](https://github.com/puppetlabs/puppetlabs-apache/pull/704) ([JCotton1123](https://github.com/JCotton1123))
+- turning MaxKeepAliveRequests into a variable [#703](https://github.com/puppetlabs/puppetlabs-apache/pull/703) ([attachmentgenie](https://github.com/attachmentgenie))
+- add docroot_mode parameter to vhost [#697](https://github.com/puppetlabs/puppetlabs-apache/pull/697) ([ckaenzig](https://github.com/ckaenzig))
+- Added support for SVN authentication (mod_authz_svn) [#696](https://github.com/puppetlabs/puppetlabs-apache/pull/696) ([baurmatt](https://github.com/baurmatt))
+- Added WSGIPassAuthorization option to vhost. [#694](https://github.com/puppetlabs/puppetlabs-apache/pull/694) ([Conzar](https://github.com/Conzar))
+- Allow Apache service not to be managed by Puppet [#690](https://github.com/puppetlabs/puppetlabs-apache/pull/690) ([arnoudj](https://github.com/arnoudj))
+- ssl tweaks [#688](https://github.com/puppetlabs/puppetlabs-apache/pull/688) ([sdague](https://github.com/sdague))
+- Enable overriding mod-level parameters for apache::mod::passenger [#687](https://github.com/puppetlabs/puppetlabs-apache/pull/687) ([jonoterc](https://github.com/jonoterc))
+- Add extra parameters to mod::php [#684](https://github.com/puppetlabs/puppetlabs-apache/pull/684) ([nbeernink](https://github.com/nbeernink))
+- A first stab at extending LogFormats [#682](https://github.com/puppetlabs/puppetlabs-apache/pull/682) ([igalic](https://github.com/igalic))
+- Add support for mod_speling [#652](https://github.com/puppetlabs/puppetlabs-apache/pull/652) ([rchouinard](https://github.com/rchouinard))
+- Add support for Google's mod_pagespeed [#650](https://github.com/puppetlabs/puppetlabs-apache/pull/650) ([pcfens](https://github.com/pcfens))
+- Add support for SetHandler directive [#604](https://github.com/puppetlabs/puppetlabs-apache/pull/604) ([bodgit](https://github.com/bodgit))
+
+### Fixed
+
+- Fix passenger repo on Scientific linux [#749](https://github.com/puppetlabs/puppetlabs-apache/pull/749) ([hunner](https://github.com/hunner))
+- Mod pagespeed fix [#740](https://github.com/puppetlabs/puppetlabs-apache/pull/740) ([underscorgan](https://github.com/underscorgan))
+- Mod rewrite duplicate error [#739](https://github.com/puppetlabs/puppetlabs-apache/pull/739) ([xavierleune](https://github.com/xavierleune))
+- Fix lib path for Ubuntu 10.04. [#727](https://github.com/puppetlabs/puppetlabs-apache/pull/727) ([underscorgan](https://github.com/underscorgan))
+- Fix module usage with strict_variables [#721](https://github.com/puppetlabs/puppetlabs-apache/pull/721) ([mcanevet](https://github.com/mcanevet))
+- Fix platform for centos-6.5 [#710](https://github.com/puppetlabs/puppetlabs-apache/pull/710) ([ekohl](https://github.com/ekohl))
+- order proxy_set option so it doesn't change between runs [#701](https://github.com/puppetlabs/puppetlabs-apache/pull/701) ([tjikkun](https://github.com/tjikkun))
+- fix missing comma in sample config [#683](https://github.com/puppetlabs/puppetlabs-apache/pull/683) ([sdague](https://github.com/sdague))
+- fix missing ensure on concat::fragment resources [#681](https://github.com/puppetlabs/puppetlabs-apache/pull/681) ([jfroche](https://github.com/jfroche))
+- Apache version in Ubuntu 13.10 is 2.4 [#672](https://github.com/puppetlabs/puppetlabs-apache/pull/672) ([carlossg](https://github.com/carlossg))
+- lint fixes [#671](https://github.com/puppetlabs/puppetlabs-apache/pull/671) ([carlossg](https://github.com/carlossg))
+- Include mod wsgi when wsgi_daemon_process is given [#664](https://github.com/puppetlabs/puppetlabs-apache/pull/664) ([ekohl](https://github.com/ekohl))
+- apache::mod::mime does not compile due to wrong file dependency [#627](https://github.com/puppetlabs/puppetlabs-apache/pull/627) ([carlossg](https://github.com/carlossg))
+
+### Other
+
+- mod_proxy_html failing in Debian [#673](https://github.com/puppetlabs/puppetlabs-apache/pull/673) ([carlossg](https://github.com/carlossg))
+
+## [1.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.0.1) - 2014-03-04
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.0...1.0.1)
+
+### Fixed
+
+- Replace the symlink with the actual file to resolve a PMT issue. [#665](https://github.com/puppetlabs/puppetlabs-apache/pull/665) ([apenney](https://github.com/apenney))
+
+## [1.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.0.0) - 2014-03-03
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.11.0...1.0.0)
+
+### Added
+
+- Modifying hierarchy of the Version/Params to fix AWS AMI [#651](https://github.com/puppetlabs/puppetlabs-apache/pull/651) ([jrnt30](https://github.com/jrnt30))
+- Windows, Suse, Solaris, and AIX are not supported. [#644](https://github.com/puppetlabs/puppetlabs-apache/pull/644) ([hunner](https://github.com/hunner))
+- Add rewrite_base functionality to rewrites [#631](https://github.com/puppetlabs/puppetlabs-apache/pull/631) ([hunner](https://github.com/hunner))
+- Array/Hash mutating operations deprecated [#625](https://github.com/puppetlabs/puppetlabs-apache/pull/625) ([domcleal](https://github.com/domcleal))
+- Create user/group instead of using existing ones [#619](https://github.com/puppetlabs/puppetlabs-apache/pull/619) ([hunner](https://github.com/hunner))
+- Allow custom gemsource [#617](https://github.com/puppetlabs/puppetlabs-apache/pull/617) ([hunner](https://github.com/hunner))
+- Ensure socache_shmcb is enabled on all Apache 2.4 OSes [#612](https://github.com/puppetlabs/puppetlabs-apache/pull/612) ([domcleal](https://github.com/domcleal))
+- Add WSGIApplicationGroup and WSGIImportScript directives [#606](https://github.com/puppetlabs/puppetlabs-apache/pull/606) ([bodgit](https://github.com/bodgit))
+
+### Changed
+- Metadata [#661](https://github.com/puppetlabs/puppetlabs-apache/pull/661) ([apenney](https://github.com/apenney))
+- Apache2.4 support [#552](https://github.com/puppetlabs/puppetlabs-apache/pull/552) ([scottasmith](https://github.com/scottasmith))
+
+### Fixed
+
+- Add in missing fields to work around a Puppet bug. [#663](https://github.com/puppetlabs/puppetlabs-apache/pull/663) ([apenney](https://github.com/apenney))
+- Adds "Release Notes/Known Bugs" to Changelog, updates file format to markdown, standardizes the format of previous entries [#660](https://github.com/puppetlabs/puppetlabs-apache/pull/660) ([lrnrthr](https://github.com/lrnrthr))
+- Checking the stderr wasn't specified correctly [#646](https://github.com/puppetlabs/puppetlabs-apache/pull/646) ([hunner](https://github.com/hunner))
+- Fix WSGI import_script and mod_ssl issues on Lucid [#645](https://github.com/puppetlabs/puppetlabs-apache/pull/645) ([hunner](https://github.com/hunner))
+- The vagrant user doesn't exist on non-vagrant machines [#616](https://github.com/puppetlabs/puppetlabs-apache/pull/616) ([hunner](https://github.com/hunner))
+- Lint fixes [#614](https://github.com/puppetlabs/puppetlabs-apache/pull/614) ([justinstoller](https://github.com/justinstoller))
+- Proxy pass reverse fix [#613](https://github.com/puppetlabs/puppetlabs-apache/pull/613) ([dteirney](https://github.com/dteirney))
+- templates/vhost/_proxy.erb misconfigures ProxyPassReverse [#602](https://github.com/puppetlabs/puppetlabs-apache/pull/602) ([jrwilk01](https://github.com/jrwilk01))
+
+### Other
+
+- Added in mod_actions to the repo so it may be used. [#591](https://github.com/puppetlabs/puppetlabs-apache/pull/591) ([typhonius](https://github.com/typhonius))
+
+## [0.11.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.11.0) - 2014-02-05
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.10.0...0.11.0)
+
+### Added
+
+- Implement *Match methods for directory providers [#597](https://github.com/puppetlabs/puppetlabs-apache/pull/597) ([scottasmith](https://github.com/scottasmith))
+- allow AuthGroupFile directive for vhosts [#589](https://github.com/puppetlabs/puppetlabs-apache/pull/589) ([doc75](https://github.com/doc75))
+- Support Header directives in vhost context [#575](https://github.com/puppetlabs/puppetlabs-apache/pull/575) ([antaflos](https://github.com/antaflos))
+- quote paths for windows compatability [#567](https://github.com/puppetlabs/puppetlabs-apache/pull/567) ([jlambert121](https://github.com/jlambert121))
+- Update alias.pp to let users of Amazon Linux use the module [#545](https://github.com/puppetlabs/puppetlabs-apache/pull/545) ([mattboston](https://github.com/mattboston))
+- Update init.pp to allow for support for Amazon Linux [#544](https://github.com/puppetlabs/puppetlabs-apache/pull/544) ([mattboston](https://github.com/mattboston))
+- Added support for mod_include [#543](https://github.com/puppetlabs/puppetlabs-apache/pull/543) ([derJD](https://github.com/derJD))
+- Pass this through to directories. [#539](https://github.com/puppetlabs/puppetlabs-apache/pull/539) ([apenney](https://github.com/apenney))
+- Support environment variable control for CustomLog [#527](https://github.com/puppetlabs/puppetlabs-apache/pull/527) ([chieping](https://github.com/chieping))
+- added redirectmatch support [#521](https://github.com/puppetlabs/puppetlabs-apache/pull/521) ([pablokbs](https://github.com/pablokbs))
+- Convert spec tests to beaker [#518](https://github.com/puppetlabs/puppetlabs-apache/pull/518) ([hunner](https://github.com/hunner))
+- Setting up the ability to do multiple rewrites and conditions. Allowing ... [#517](https://github.com/puppetlabs/puppetlabs-apache/pull/517) ([amvapor](https://github.com/amvapor))
+- Support php_admin_(flag|value)s [#481](https://github.com/puppetlabs/puppetlabs-apache/pull/481) ([igalic](https://github.com/igalic))
+
+### Fixed
+
+- Fix typos in templates/vhost/_itk.erb [#601](https://github.com/puppetlabs/puppetlabs-apache/pull/601) ([hunner](https://github.com/hunner))
+- Change serveradmin default to undef [#599](https://github.com/puppetlabs/puppetlabs-apache/pull/599) ([hunner](https://github.com/hunner))
+- Delete this key, mistakenly added. [#582](https://github.com/puppetlabs/puppetlabs-apache/pull/582) ([apenney](https://github.com/apenney))
+- fix puppet-lint errors [#571](https://github.com/puppetlabs/puppetlabs-apache/pull/571) ([robbyt](https://github.com/robbyt))
+- Don't purge mods-available dir when separate enable dir is used [#561](https://github.com/puppetlabs/puppetlabs-apache/pull/561) ([domcleal](https://github.com/domcleal))
+- Fix the servername used in log file name [#547](https://github.com/puppetlabs/puppetlabs-apache/pull/547) ([xcompass](https://github.com/xcompass))
+- make sure that directories are actually a Hash [#536](https://github.com/puppetlabs/puppetlabs-apache/pull/536) ([igalic](https://github.com/igalic))
+- Fix rspec-puppet deprecation warnings [#534](https://github.com/puppetlabs/puppetlabs-apache/pull/534) ([blkperl](https://github.com/blkperl))
+- Fix $ports_file reference in Namevirtualhost. [#532](https://github.com/puppetlabs/puppetlabs-apache/pull/532) ([apenney](https://github.com/apenney))
+
+## [0.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.10.0) - 2013-12-05
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.9.0...0.10.0)
+
+### Added
+
+- Make LogLevel configurable for server [#516](https://github.com/puppetlabs/puppetlabs-apache/pull/516) ([antaflos](https://github.com/antaflos))
+- Make LogLevel configurable for vhost [#513](https://github.com/puppetlabs/puppetlabs-apache/pull/513) ([antaflos](https://github.com/antaflos))
+- Add ability to pass ip (instead of wildcard) in default vhost files [#509](https://github.com/puppetlabs/puppetlabs-apache/pull/509) ([tampakrap](https://github.com/tampakrap))
+- add parameter for TraceEnable [#508](https://github.com/puppetlabs/puppetlabs-apache/pull/508) ([mmoll](https://github.com/mmoll))
+- Add support for ScriptAliasMatch directives [#502](https://github.com/puppetlabs/puppetlabs-apache/pull/502) ([antaflos](https://github.com/antaflos))
+- Remove eronous duplication of ForceType [#501](https://github.com/puppetlabs/puppetlabs-apache/pull/501) ([igalic](https://github.com/igalic))
+- Add support for overriding ErrorDocument [#498](https://github.com/puppetlabs/puppetlabs-apache/pull/498) ([igalic](https://github.com/igalic))
+- Add suPHP_UserGroup directive to directory context [#497](https://github.com/puppetlabs/puppetlabs-apache/pull/497) ([igalic](https://github.com/igalic))
+- Working mod_authnz_ldap support on Debian/Ubuntu [#496](https://github.com/puppetlabs/puppetlabs-apache/pull/496) ([antaflos](https://github.com/antaflos))
+- Set SSLOptions StdEnvVars in server context [#490](https://github.com/puppetlabs/puppetlabs-apache/pull/490) ([igalic](https://github.com/igalic))
+- Mod rpaf support (with FreeBSD support) [#471](https://github.com/puppetlabs/puppetlabs-apache/pull/471) ([ptomulik](https://github.com/ptomulik))
+- Don't listen on port or set NameVirtualHost for non-existent vhost [#470](https://github.com/puppetlabs/puppetlabs-apache/pull/470) ([antaflos](https://github.com/antaflos))
+- Adding support for another mod_wsgi parameter [#458](https://github.com/puppetlabs/puppetlabs-apache/pull/458) ([ksexton](https://github.com/ksexton))
+- Add ability to include additional external configurations in vhost [#457](https://github.com/puppetlabs/puppetlabs-apache/pull/457) ([alnewkirk](https://github.com/alnewkirk))
+- Add new params to apache::mod::mime class [#447](https://github.com/puppetlabs/puppetlabs-apache/pull/447) ([ptomulik](https://github.com/ptomulik))
+- Add Allow and ExtendedStatus support to mod_status (rebase of #419) [#446](https://github.com/puppetlabs/puppetlabs-apache/pull/446) ([dbeckham](https://github.com/dbeckham))
+- Allow apache::mod to specify module id and path [#445](https://github.com/puppetlabs/puppetlabs-apache/pull/445) ([ptomulik](https://github.com/ptomulik))
+- added $server_root parameter [#443](https://github.com/puppetlabs/puppetlabs-apache/pull/443) ([ptomulik](https://github.com/ptomulik))
+- More vhost directives, only add AllowOverride default for directory container [#438](https://github.com/puppetlabs/puppetlabs-apache/pull/438) ([TrevorBramble](https://github.com/TrevorBramble))
+- Peruser event [#437](https://github.com/puppetlabs/puppetlabs-apache/pull/437) ([ptomulik](https://github.com/ptomulik))
+- Added $service_name parameter [#436](https://github.com/puppetlabs/puppetlabs-apache/pull/436) ([ptomulik](https://github.com/ptomulik))
+- add $root_group parameter [#435](https://github.com/puppetlabs/puppetlabs-apache/pull/435) ([ptomulik](https://github.com/ptomulik))
+- ensure default vhost config files are removed when false [#433](https://github.com/puppetlabs/puppetlabs-apache/pull/433) ([jlambert121](https://github.com/jlambert121))
+- allow allow_from to be set for mod_status [#432](https://github.com/puppetlabs/puppetlabs-apache/pull/432) ([jlambert121](https://github.com/jlambert121))
+- Add support for nss module [#426](https://github.com/puppetlabs/puppetlabs-apache/pull/426) ([jonathanunderwood](https://github.com/jonathanunderwood))
+- satisfy mod_php inter-module dependencies [#422](https://github.com/puppetlabs/puppetlabs-apache/pull/422) ([igalic](https://github.com/igalic))
+- Remove AllowOverride header for non-directories [#420](https://github.com/puppetlabs/puppetlabs-apache/pull/420) ([mvschaik](https://github.com/mvschaik))
+- Don't set `Allow from all` by default for apache::vhost::directories [#416](https://github.com/puppetlabs/puppetlabs-apache/pull/416) ([RPDiep](https://github.com/RPDiep))
+- Enable support for mod_authnz_ldap [#404](https://github.com/puppetlabs/puppetlabs-apache/pull/404) ([jlambert121](https://github.com/jlambert121))
+- FM-103: Add metadata.json to all modules. [#401](https://github.com/puppetlabs/puppetlabs-apache/pull/401) ([apenney](https://github.com/apenney))
+- Add basic support for mod_proxy_ajp [#398](https://github.com/puppetlabs/puppetlabs-apache/pull/398) ([croddy](https://github.com/croddy))
+- (#368) Add scriptaliases parameter for multiple script aliases  [#394](https://github.com/puppetlabs/puppetlabs-apache/pull/394) ([jlambert121](https://github.com/jlambert121))
+- Add SSLVerifyClient, SSLVerifyDepth, SSLOptions to vhost configuration [#391](https://github.com/puppetlabs/puppetlabs-apache/pull/391) ([mwhahaha](https://github.com/mwhahaha))
+- mod_fastcgi [#390](https://github.com/puppetlabs/puppetlabs-apache/pull/390) ([jlambert121](https://github.com/jlambert121))
+- Add support for DirectoryIndex tag. [#389](https://github.com/puppetlabs/puppetlabs-apache/pull/389) ([arnoudj](https://github.com/arnoudj))
+- Added passenger_use_global_queue option [#388](https://github.com/puppetlabs/puppetlabs-apache/pull/388) ([xorpaul](https://github.com/xorpaul))
+- Ability to define service_enable and service_ensure independently [#387](https://github.com/puppetlabs/puppetlabs-apache/pull/387) ([xorpaul](https://github.com/xorpaul))
+- Support FallbackResource (httpd >= 2.2.16) [#383](https://github.com/puppetlabs/puppetlabs-apache/pull/383) ([igalic](https://github.com/igalic))
+- Added a parameter that allow to precise package ensure [#382](https://github.com/puppetlabs/puppetlabs-apache/pull/382) ([godp1301](https://github.com/godp1301))
+- Added 2 parameters to control the creation of user and group resources [#381](https://github.com/puppetlabs/puppetlabs-apache/pull/381) ([slamont](https://github.com/slamont))
+- Remove vhost symlink if ensure != present. [#380](https://github.com/puppetlabs/puppetlabs-apache/pull/380) ([pataquets](https://github.com/pataquets))
+- Added apache::mod::mime to support SSL module. [#379](https://github.com/puppetlabs/puppetlabs-apache/pull/379) ([blewa](https://github.com/blewa))
+- SSLProtocol, SSLCipherSuite, SSLHonorCipherOrder support in the SSL section [#378](https://github.com/puppetlabs/puppetlabs-apache/pull/378) ([AlexRRR](https://github.com/AlexRRR))
+- Add 'Timeout' core directive. [#367](https://github.com/puppetlabs/puppetlabs-apache/pull/367) ([pataquets](https://github.com/pataquets))
+- Add conditional <IfModule> directive to alias_module template. [#366](https://github.com/puppetlabs/puppetlabs-apache/pull/366) ([pataquets](https://github.com/pataquets))
+- Convert sendfile param to string from bool. [#365](https://github.com/puppetlabs/puppetlabs-apache/pull/365) ([razorsedge](https://github.com/razorsedge))
+- Add support for DirectoryIndex tag described here: [#359](https://github.com/puppetlabs/puppetlabs-apache/pull/359) ([faisal-memon](https://github.com/faisal-memon))
+- Enable support for mod_authnz_ldap [#356](https://github.com/puppetlabs/puppetlabs-apache/pull/356) ([jbartko](https://github.com/jbartko))
+- apache::mod::expires class for easy including [#352](https://github.com/puppetlabs/puppetlabs-apache/pull/352) ([kitchen](https://github.com/kitchen))
+- Remove default <proxy *> block [#345](https://github.com/puppetlabs/puppetlabs-apache/pull/345) ([igalic](https://github.com/igalic))
+- Add configuration options for ServerTokens and ServerSignature [#344](https://github.com/puppetlabs/puppetlabs-apache/pull/344) ([xstasi](https://github.com/xstasi))
+- Support for FreeBSD and few other features (reworked PR #264). [#342](https://github.com/puppetlabs/puppetlabs-apache/pull/342) ([ptomulik](https://github.com/ptomulik))
+- Allow specifying "ensure" parameter in apache::mod::php [#338](https://github.com/puppetlabs/puppetlabs-apache/pull/338) ([MasonM](https://github.com/MasonM))
+- allow to choose the mpm_event mod from the init.pp [#323](https://github.com/puppetlabs/puppetlabs-apache/pull/323) ([mhellmic](https://github.com/mhellmic))
+- adopt a more stable proxy configuration [#306](https://github.com/puppetlabs/puppetlabs-apache/pull/306) ([igalic](https://github.com/igalic))
+
+### Fixed
+
+- Add support for AliasMatch directives [#483](https://github.com/puppetlabs/puppetlabs-apache/pull/483) ([antaflos](https://github.com/antaflos))
+- Fix directory fragment not setting AllowOverride [#455](https://github.com/puppetlabs/puppetlabs-apache/pull/455) ([Aethylred](https://github.com/Aethylred))
+- Revert unnecessary `$default_ssl_vhost` validation change. [#453](https://github.com/puppetlabs/puppetlabs-apache/pull/453) ([dbeckham](https://github.com/dbeckham))
+- Workaround for apxs-loaded modules [#444](https://github.com/puppetlabs/puppetlabs-apache/pull/444) ([ptomulik](https://github.com/ptomulik))
+- vhost directories fix [#434](https://github.com/puppetlabs/puppetlabs-apache/pull/434) ([kgeis](https://github.com/kgeis))
+- Checked that Package declaration has not been defined yet. Fixes #424 [#425](https://github.com/puppetlabs/puppetlabs-apache/pull/425) ([jtreminio](https://github.com/jtreminio))
+- Correct broken mime_magic config for Debian - Squashed commit for #418 [#421](https://github.com/puppetlabs/puppetlabs-apache/pull/421) ([dbeckham](https://github.com/dbeckham))
+- default_mods now pulls in mod_rewrite correctly [#415](https://github.com/puppetlabs/puppetlabs-apache/pull/415) ([justinclayton](https://github.com/justinclayton))
+- Calling apache::mod::rewrite instead of Apache::Mod class directly. Fixe... [#412](https://github.com/puppetlabs/puppetlabs-apache/pull/412) ([jtreminio](https://github.com/jtreminio))
+- Correct incorrect expects and init race condition [#405](https://github.com/puppetlabs/puppetlabs-apache/pull/405) ([hunner](https://github.com/hunner))
+- Fix for https://github.com/puppetlabs/puppetlabs-apache/issues/248 [#392](https://github.com/puppetlabs/puppetlabs-apache/pull/392) ([greglarkin](https://github.com/greglarkin))
+- EL5 and EL6 both use /etc/pki/tls/certs. [#384](https://github.com/puppetlabs/puppetlabs-apache/pull/384) ([razorsedge](https://github.com/razorsedge))
+- Fix invalid variable name in itk mod [#362](https://github.com/puppetlabs/puppetlabs-apache/pull/362) ([blkperl](https://github.com/blkperl))
+- Fix for issue #358. Including apache::mod::proxy and apache::mod::proxy_h... [#360](https://github.com/puppetlabs/puppetlabs-apache/pull/360) ([bmurtagh](https://github.com/bmurtagh))
+- fix exception types in some specs [#350](https://github.com/puppetlabs/puppetlabs-apache/pull/350) ([ptomulik](https://github.com/ptomulik))
+
+### Other
+
+- No implicit <Directory> entry for ScriptAlias path [#488](https://github.com/puppetlabs/puppetlabs-apache/pull/488) ([antaflos](https://github.com/antaflos))
+
+## [0.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.9.0) - 2013-09-06
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.8.1...0.9.0)
+
+### Added
+
+- Add header support to the apache::vhost::directories parameter [#334](https://github.com/puppetlabs/puppetlabs-apache/pull/334) ([hunner](https://github.com/hunner))
+- Support all kinds of httpd directories. [#331](https://github.com/puppetlabs/puppetlabs-apache/pull/331) ([igalic](https://github.com/igalic))
+- Add wsgi_daemon_process_options parameter to vhost [#330](https://github.com/puppetlabs/puppetlabs-apache/pull/330) ([blkperl](https://github.com/blkperl))
+- Add deprecation warning for a2mod [#329](https://github.com/puppetlabs/puppetlabs-apache/pull/329) ([blkperl](https://github.com/blkperl))
+- Add syslog support for vhosts [#324](https://github.com/puppetlabs/puppetlabs-apache/pull/324) ([mkoderer](https://github.com/mkoderer))
+- Add suphp mod [#322](https://github.com/puppetlabs/puppetlabs-apache/pull/322) ([blkperl](https://github.com/blkperl))
+- Service class [#321](https://github.com/puppetlabs/puppetlabs-apache/pull/321) ([hunner](https://github.com/hunner))
+- remove servername_real [#320](https://github.com/puppetlabs/puppetlabs-apache/pull/320) ([kitchen](https://github.com/kitchen))
+- Add WSGI params to apache::vhost [#319](https://github.com/puppetlabs/puppetlabs-apache/pull/319) ([blkperl](https://github.com/blkperl))
+- Add WSGIPythonHome param to apache::mod::wsgi [#318](https://github.com/puppetlabs/puppetlabs-apache/pull/318) ([blkperl](https://github.com/blkperl))
+- Add build status png [#316](https://github.com/puppetlabs/puppetlabs-apache/pull/316) ([blkperl](https://github.com/blkperl))
+- make default mods configurable [#314](https://github.com/puppetlabs/puppetlabs-apache/pull/314) ([igalic](https://github.com/igalic))
+- Add KeepAliveTimeout parameter [#313](https://github.com/puppetlabs/puppetlabs-apache/pull/313) ([jjtorroglosa](https://github.com/jjtorroglosa))
+- if facter can not determine the fqdn, use the hostname fact [#308](https://github.com/puppetlabs/puppetlabs-apache/pull/308) ([jonmosco](https://github.com/jonmosco))
+- Add stuff to use ITK on Debian [#304](https://github.com/puppetlabs/puppetlabs-apache/pull/304) ([kumy](https://github.com/kumy))
+- Allow configuration of WSGISocketPrefix [#296](https://github.com/puppetlabs/puppetlabs-apache/pull/296) ([stdietrich](https://github.com/stdietrich))
+- Add the custom_fragement to the directories hash [#290](https://github.com/puppetlabs/puppetlabs-apache/pull/290) ([booo](https://github.com/booo))
+- Auth [#289](https://github.com/puppetlabs/puppetlabs-apache/pull/289) ([booo](https://github.com/booo))
+- Update apache::params for Amazon Linux [#288](https://github.com/puppetlabs/puppetlabs-apache/pull/288) ([hunner](https://github.com/hunner))
+- Add `httpd_dir` parameter to the base class for custom builds [#287](https://github.com/puppetlabs/puppetlabs-apache/pull/287) ([hunner](https://github.com/hunner))
+- Add KeepAlive parameter [#280](https://github.com/puppetlabs/puppetlabs-apache/pull/280) ([thegriglat](https://github.com/thegriglat))
+- (#272) Add parameter sslproxyengine to vhost.pp [#273](https://github.com/puppetlabs/puppetlabs-apache/pull/273) ([mattthias](https://github.com/mattthias))
+- Add auth_basic_file and auth_basic_name support to vhost directories [#240](https://github.com/puppetlabs/puppetlabs-apache/pull/240) ([ezheidtmann](https://github.com/ezheidtmann))
+- Passenger tuning with the apache::mod::passenger class [#146](https://github.com/puppetlabs/puppetlabs-apache/pull/146) ([Aethylred](https://github.com/Aethylred))
+
+### Fixed
+
+- Fixed failing itk system spec on RedHat [#351](https://github.com/puppetlabs/puppetlabs-apache/pull/351) ([ptomulik](https://github.com/ptomulik))
+- Fix failing itk system spec on RedHat [#349](https://github.com/puppetlabs/puppetlabs-apache/pull/349) ([blkperl](https://github.com/blkperl))
+- Fix apache::default_mods loading [#348](https://github.com/puppetlabs/puppetlabs-apache/pull/348) ([hunner](https://github.com/hunner))
+- Fix hash ordering on 1.8.7 for #330 [#335](https://github.com/puppetlabs/puppetlabs-apache/pull/335) ([hunner](https://github.com/hunner))
+- Fix parameters that take hash or array of hashes [#327](https://github.com/puppetlabs/puppetlabs-apache/pull/327) ([hunner](https://github.com/hunner))
+- Fix a2mod ruby19 bug [#315](https://github.com/puppetlabs/puppetlabs-apache/pull/315) ([blkperl](https://github.com/blkperl))
+- Fix stdlib requirements [#311](https://github.com/puppetlabs/puppetlabs-apache/pull/311) ([hunner](https://github.com/hunner))
+- The * needs to be escaped for grep to pass [#309](https://github.com/puppetlabs/puppetlabs-apache/pull/309) ([hunner](https://github.com/hunner))
+- Fix rewrite_base [#307](https://github.com/puppetlabs/puppetlabs-apache/pull/307) ([ekohl](https://github.com/ekohl))
+- Fixes Issue #291 - created apache::mod::proxy_balancer [#292](https://github.com/puppetlabs/puppetlabs-apache/pull/292) ([benhocker](https://github.com/benhocker))
+- (#278) Ports file attempted to be created before Apache installed [#279](https://github.com/puppetlabs/puppetlabs-apache/pull/279) ([jtreminio](https://github.com/jtreminio))
+
+## [0.8.1](https://github.com/puppetlabs/puppetlabs-apache/tree/0.8.1) - 2013-07-26
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.8.0...0.8.1)
+
+### Added
+
+- Use a more specific match for changing worker/prefork [#263](https://github.com/puppetlabs/puppetlabs-apache/pull/263) ([hunner](https://github.com/hunner))
+
+## [0.8.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.8.0) - 2013-07-17
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.7.0...0.8.0)
+
+### Added
+
+- make directories examples real puppet DSL [#253](https://github.com/puppetlabs/puppetlabs-apache/pull/253) ([richardc](https://github.com/richardc))
+- add proxy_set option to balancer [#252](https://github.com/puppetlabs/puppetlabs-apache/pull/252) ([tjikkun](https://github.com/tjikkun))
+- Add severname parameter to httpd.conf [#251](https://github.com/puppetlabs/puppetlabs-apache/pull/251) ([blkperl](https://github.com/blkperl))
+- make fragment names unique to support multiple balancerclusters [#249](https://github.com/puppetlabs/puppetlabs-apache/pull/249) ([tjikkun](https://github.com/tjikkun))
+
+### Fixed
+
+- Issue 230 specifiy that: The apache::mod::* classes that have .conf file [#250](https://github.com/puppetlabs/puppetlabs-apache/pull/250) ([gehel](https://github.com/gehel))
+- Sites symlinks [#235](https://github.com/puppetlabs/puppetlabs-apache/pull/235) ([hunner](https://github.com/hunner))
+
+## [0.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.7.0) - 2013-07-09
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.6.0...0.7.0)
+
+### Added
+
+- Added an 'h' in a typo on default_ssl_vost  [#243](https://github.com/puppetlabs/puppetlabs-apache/pull/243) ([Wesseldr](https://github.com/Wesseldr))
+- Add balancermember define [#238](https://github.com/puppetlabs/puppetlabs-apache/pull/238) ([tjikkun](https://github.com/tjikkun))
+- Updating for puppet lint [#236](https://github.com/puppetlabs/puppetlabs-apache/pull/236) ([hunner](https://github.com/hunner))
+- Add posibility to set VirtualDocumentRoot [#234](https://github.com/puppetlabs/puppetlabs-apache/pull/234) ([hunner](https://github.com/hunner))
+- Remove firewall resource [#229](https://github.com/puppetlabs/puppetlabs-apache/pull/229) ([hunner](https://github.com/hunner))
+- Add @ to cgisock_path [#227](https://github.com/puppetlabs/puppetlabs-apache/pull/227) ([hunner](https://github.com/hunner))
+- Adding extra vhost rspec-server tests [#226](https://github.com/puppetlabs/puppetlabs-apache/pull/226) ([hunner](https://github.com/hunner))
+- Support for mod_xsendfile [#224](https://github.com/puppetlabs/puppetlabs-apache/pull/224) ([bmurtagh](https://github.com/bmurtagh))
+- Adding rspec-system tests for apache::vhost [#217](https://github.com/puppetlabs/puppetlabs-apache/pull/217) ([hunner](https://github.com/hunner))
+- Remove array key assignment [#215](https://github.com/puppetlabs/puppetlabs-apache/pull/215) ([hunner](https://github.com/hunner))
+- Adding support for mod_dav_svn [#214](https://github.com/puppetlabs/puppetlabs-apache/pull/214) ([hunner](https://github.com/hunner))
+- Add vhost Alias and Directory declarations [#212](https://github.com/puppetlabs/puppetlabs-apache/pull/212) ([Aethylred](https://github.com/Aethylred))
+- This allows an override of the default DirectoryIndex directive [#211](https://github.com/puppetlabs/puppetlabs-apache/pull/211) ([Aethylred](https://github.com/Aethylred))
+- Move user and group into class parameters. [#210](https://github.com/puppetlabs/puppetlabs-apache/pull/210) ([sfozz](https://github.com/sfozz))
+- Add $conf_template in order to override the default template. [#200](https://github.com/puppetlabs/puppetlabs-apache/pull/200) ([apenney](https://github.com/apenney))
+- Add proxy_pass parameter [#193](https://github.com/puppetlabs/puppetlabs-apache/pull/193) ([tjikkun](https://github.com/tjikkun))
+- Move 'ServerLimit' line in worker.erb [#191](https://github.com/puppetlabs/puppetlabs-apache/pull/191) ([trlinkin](https://github.com/trlinkin))
+- Add Validation and rspec tests for $error_log [#186](https://github.com/puppetlabs/puppetlabs-apache/pull/186) ([trlinkin](https://github.com/trlinkin))
+- Refactor vhost logformat [#184](https://github.com/puppetlabs/puppetlabs-apache/pull/184) ([trlinkin](https://github.com/trlinkin))
+- Add a2mod instances method on Debian [#133](https://github.com/puppetlabs/puppetlabs-apache/pull/133) ([hunner](https://github.com/hunner))
+- Added apache::mod::rewrite class. [#128](https://github.com/puppetlabs/puppetlabs-apache/pull/128) ([Stubbs](https://github.com/Stubbs))
+- Added apache::mod::shib to configure Shibboleth Service Providers [#96](https://github.com/puppetlabs/puppetlabs-apache/pull/96) ([Aethylred](https://github.com/Aethylred))
+
+### Changed
+- Refactor module [#182](https://github.com/puppetlabs/puppetlabs-apache/pull/182) ([hunner](https://github.com/hunner))
+
+### Fixed
+
+- Fix directories template fragment [#233](https://github.com/puppetlabs/puppetlabs-apache/pull/233) ([hunner](https://github.com/hunner))
+- Update apache::mod::php's error message to be correct [#232](https://github.com/puppetlabs/puppetlabs-apache/pull/232) ([hunner](https://github.com/hunner))
+- Incorrect php .so [#225](https://github.com/puppetlabs/puppetlabs-apache/pull/225) ([hunner](https://github.com/hunner))
+- Only 0 (no changes) and 2 (successful) are valid exit codes [#222](https://github.com/puppetlabs/puppetlabs-apache/pull/222) ([hunner](https://github.com/hunner))
+- fix variables for latest puppet [#208](https://github.com/puppetlabs/puppetlabs-apache/pull/208) ([pronix](https://github.com/pronix))
+- Unable to use proxy because of the default deny all [#203](https://github.com/puppetlabs/puppetlabs-apache/pull/203) ([gregswift](https://github.com/gregswift))
+- Fix mod::prefork dependencies [#188](https://github.com/puppetlabs/puppetlabs-apache/pull/188) ([nanliu](https://github.com/nanliu))
+
+## [0.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.6.0) - 2013-03-28
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.5.0-rc1...0.6.0)
+
+### Added
+
+- Restrict the versions and add 3.1 [#159](https://github.com/puppetlabs/puppetlabs-apache/pull/159) ([richardc](https://github.com/richardc))
+- Enable puppet 3.0.1 in travis.yml [#143](https://github.com/puppetlabs/puppetlabs-apache/pull/143) ([blkperl](https://github.com/blkperl))
+- Add parameter for purging vdir [#139](https://github.com/puppetlabs/puppetlabs-apache/pull/139) ([mjanser](https://github.com/mjanser))
+
+## [0.5.0-rc1](https://github.com/puppetlabs/puppetlabs-apache/tree/0.5.0-rc1) - 2012-12-01
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.4.0...0.5.0-rc1)
+
+### Added
+
+- Passenger support [#112](https://github.com/puppetlabs/puppetlabs-apache/pull/112) ([antaflos](https://github.com/antaflos))
+- Accept service_enable parameter to install without running at boot [#108](https://github.com/puppetlabs/puppetlabs-apache/pull/108) ([rwstauner](https://github.com/rwstauner))
+- Ability to enable/disable "EnableSendFile" from base class call. [#105](https://github.com/puppetlabs/puppetlabs-apache/pull/105) ([obokaman-com](https://github.com/obokaman-com))
+- Include apache::params in apache::mod::php [#102](https://github.com/puppetlabs/puppetlabs-apache/pull/102) ([reidmv](https://github.com/reidmv))
+- Allow overriding servername in apache::vhost::redirect [#101](https://github.com/puppetlabs/puppetlabs-apache/pull/101) ([cdelston](https://github.com/cdelston))
+- Added rspec tests for apache::mod define [#100](https://github.com/puppetlabs/puppetlabs-apache/pull/100) ([knowshan](https://github.com/knowshan))
+- Allow custom library paths and module identifier names [#97](https://github.com/puppetlabs/puppetlabs-apache/pull/97) ([knowshan](https://github.com/knowshan))
+
+### Fixed
+
+- ssl_path is not set for vhost-proxy [#106](https://github.com/puppetlabs/puppetlabs-apache/pull/106) ([carlossg](https://github.com/carlossg))
+- `$servername` is ignored by `apache::vhost::proxy` [#95](https://github.com/puppetlabs/puppetlabs-apache/pull/95) ([hunner](https://github.com/hunner))
+- servername is ignored by apache::vhost::proxy [#94](https://github.com/puppetlabs/puppetlabs-apache/pull/94) ([cyberwolf](https://github.com/cyberwolf))
+
+## [0.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.4.0) - 2012-08-24
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.3.0...0.4.0)
+
+### Fixed
+
+- Fix vhost template [#88](https://github.com/puppetlabs/puppetlabs-apache/pull/88) ([hunner](https://github.com/hunner))
+- Fixed syntax of validate_re function. [#87](https://github.com/puppetlabs/puppetlabs-apache/pull/87) ([martasd](https://github.com/martasd))
+- Fixed formatting in vhost template. [#86](https://github.com/puppetlabs/puppetlabs-apache/pull/86) ([martasd](https://github.com/martasd))
+- Fix failing spec tests [#83](https://github.com/puppetlabs/puppetlabs-apache/pull/83) ([hunner](https://github.com/hunner))
+
+## [0.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.3.0) - 2012-08-22
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.2.2...0.3.0)
+
+### Added
+
+- Update reference to deprecated apache::php [#85](https://github.com/puppetlabs/puppetlabs-apache/pull/85) ([philsturgeon](https://github.com/philsturgeon))
+- (#16064) Make config files RedHat-compatible [#84](https://github.com/puppetlabs/puppetlabs-apache/pull/84) ([hakamadare](https://github.com/hakamadare))
+- Add dependency for package httpd before creating mod.d [#80](https://github.com/puppetlabs/puppetlabs-apache/pull/80) ([hunner](https://github.com/hunner))
+- Docroot owner [#79](https://github.com/puppetlabs/puppetlabs-apache/pull/79) ([hunner](https://github.com/hunner))
+- Add ssl mod [#78](https://github.com/puppetlabs/puppetlabs-apache/pull/78) ([hunner](https://github.com/hunner))
+
+## [0.2.2](https://github.com/puppetlabs/puppetlabs-apache/tree/0.2.2) - 2012-08-15
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.2.1...0.2.2)
+
+### Added
+
+- Remove apache::mod::mem_cache from apache::mod::default [#76](https://github.com/puppetlabs/puppetlabs-apache/pull/76) ([hunner](https://github.com/hunner))
+
+## [0.2.1](https://github.com/puppetlabs/puppetlabs-apache/tree/0.2.1) - 2012-08-15
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.2.0...0.2.1)
+
+### Added
+
+- Remove apache::mod::file_cache from apache::mod::default [#75](https://github.com/puppetlabs/puppetlabs-apache/pull/75) ([hunner](https://github.com/hunner))
+- mod.pp: we should make sure the package is present before enabling the module [#73](https://github.com/puppetlabs/puppetlabs-apache/pull/73) ([wulff](https://github.com/wulff))
+
+### Fixed
+
+- mod.pp: we should make sure the package is present before enabling the module [#74](https://github.com/puppetlabs/puppetlabs-apache/pull/74) ([hunner](https://github.com/hunner))
+
+## [0.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.2.0) - 2012-08-13
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.1.2...0.2.0)
+
+### Added
+
+- Add server_admin parameter to the apache base class [#71](https://github.com/puppetlabs/puppetlabs-apache/pull/71) ([hunner](https://github.com/hunner))
+- Add apache::mod::proxy_html [#70](https://github.com/puppetlabs/puppetlabs-apache/pull/70) ([hunner](https://github.com/hunner))
+- Add mod templates [#69](https://github.com/puppetlabs/puppetlabs-apache/pull/69) ([hunner](https://github.com/hunner))
+- Add mod lib parameter [#68](https://github.com/puppetlabs/puppetlabs-apache/pull/68) ([hunner](https://github.com/hunner))
+- Split the userdir module out of the default list and template UserDir [#66](https://github.com/puppetlabs/puppetlabs-apache/pull/66) ([hunner](https://github.com/hunner))
+
+### Fixed
+
+- Bugfix: apache::mod::auth_basic is a class [#67](https://github.com/puppetlabs/puppetlabs-apache/pull/67) ([hunner](https://github.com/hunner))
+
+## [0.1.2](https://github.com/puppetlabs/puppetlabs-apache/tree/0.1.2) - 2012-08-09
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.1.1...0.1.2)
+
+### Added
+
+- Adding template for httpd.conf and default mods [#62](https://github.com/puppetlabs/puppetlabs-apache/pull/62) ([hunner](https://github.com/hunner))
+
+## [0.1.1](https://github.com/puppetlabs/puppetlabs-apache/tree/0.1.1) - 2012-08-07
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.1.0...0.1.1)
+
+### Added
+
+- Ensure proxy mods are loaded by vhost::proxy [#61](https://github.com/puppetlabs/puppetlabs-apache/pull/61) ([hunner](https://github.com/hunner))
+- Use $osfamily instead of $operatingsystem [#59](https://github.com/puppetlabs/puppetlabs-apache/pull/59) ([hunner](https://github.com/hunner))
+
+## [0.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.1.0) - 2012-08-07
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.0.4...0.1.0)
+
+### Added
+
+- Make the serveradmin vhost parameter optional [#55](https://github.com/puppetlabs/puppetlabs-apache/pull/55) ([inkblot](https://github.com/inkblot))
+- Modified vhost type to use ensure_resource [#54](https://github.com/puppetlabs/puppetlabs-apache/pull/54) ([jtopjian](https://github.com/jtopjian))
+- Addition of mod_auth_kerb mod, params & tests [#49](https://github.com/puppetlabs/puppetlabs-apache/pull/49) ([bendylan](https://github.com/bendylan))
+- Amazon Linux support [#48](https://github.com/puppetlabs/puppetlabs-apache/pull/48) ([EricKnecht](https://github.com/EricKnecht))
+- Added  to enable the user to specify the status of the vhost. [#47](https://github.com/puppetlabs/puppetlabs-apache/pull/47) ([martasd](https://github.com/martasd))
+- Add no_proxy_uris param to apache::vhost::proxy [#46](https://github.com/puppetlabs/puppetlabs-apache/pull/46) ([sorenisanerd](https://github.com/sorenisanerd))
+- Changed to match parameter name 'mod_python_package' [#44](https://github.com/puppetlabs/puppetlabs-apache/pull/44) ([argybarg](https://github.com/argybarg))
+- Add Listen statement to vhost template [#41](https://github.com/puppetlabs/puppetlabs-apache/pull/41) ([glarizza](https://github.com/glarizza))
+- virtualhost logroot location [#32](https://github.com/puppetlabs/puppetlabs-apache/pull/32) ([akumria](https://github.com/akumria))
+- (#15008) enable AllowOverride setting in vhost [#30](https://github.com/puppetlabs/puppetlabs-apache/pull/30) ([hakamadare](https://github.com/hakamadare))
+- (#11816) Added gentoo a2mod provider. [#8](https://github.com/puppetlabs/puppetlabs-apache/pull/8) ([adrienthebo](https://github.com/adrienthebo))
+
+### Fixed
+
+- Remove single quoted variable declaration [#42](https://github.com/puppetlabs/puppetlabs-apache/pull/42) ([glarizza](https://github.com/glarizza))
+- Syntax fixes [#35](https://github.com/puppetlabs/puppetlabs-apache/pull/35) ([akumria](https://github.com/akumria))
+- Fix Modulefile & CHANGELOG [#28](https://github.com/puppetlabs/puppetlabs-apache/pull/28) ([ryanycoleman](https://github.com/ryanycoleman))
+
+## [0.0.4](https://github.com/puppetlabs/puppetlabs-apache/tree/0.0.4) - 2012-05-08
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/35721a3f352531f53264fb08f2d4a7f7bab11712...0.0.4)
diff --git a/metadata.json b/metadata.json
index d3b6b7f1f1..0d2b19c41c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 5227621b9d8e43e32146bf9b7166e690c6f28c91 Mon Sep 17 00:00:00 2001
From: Simon Hoenscheid <simon@hoenscheid-itconsulting.com>
Date: Thu, 8 Jun 2023 23:05:56 +0200
Subject: [PATCH 2131/2267] fix ssl_ciphers array behavior

---
 templates/vhost/_ssl.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 89a264d50f..4fed7b9e19 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -13,7 +13,11 @@
   SSLProtocol             <%= [@ssl_protocol].flatten.compact.join(' ') %>
   <%- end -%>
   <%- if @ssl_cipher -%>
+  <%- if @ssl_cipher.kind_of?(String) -%>
   SSLCipherSuite          <%= @ssl_cipher %>
+  <%- else -%>
+  SSLCipherSuite          <%= @ssl_cipher.flatten.compact.join(':') %>
+  <%- end -%>
   <%- end -%>
   <%- if not @ssl_honorcipherorder.nil? -%>
   SSLHonorCipherOrder     <%= scope.call_function('apache::bool2httpd', [@_ssl_honorcipherorder]) %>

From 9ef091968a67423986aadd91647c37e20479d3d8 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Wed, 21 Jun 2023 08:54:26 +0200
Subject: [PATCH 2132/2267] puppetlabs/concat: Allow 9.x

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 0d2b19c41c..0f29d77618 100644
--- a/metadata.json
+++ b/metadata.json
@@ -14,7 +14,7 @@
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 2.2.1 < 9.0.0"
+      "version_requirement": ">= 2.2.1 < 10.0.0"
     }
   ],
   "operatingsystem_support": [

From 803fe1d52e40046898338ad1c8800e88966af1af Mon Sep 17 00:00:00 2001
From: Lukas Audzevicius <laudzevicius24@hotmail.com>
Date: Wed, 21 Jun 2023 13:20:20 +0100
Subject: [PATCH 2133/2267] (Maint) Addressing Selinux legacy facts

A commit to address forgotten selinux facts present in the acceptance
test files.
---
 spec/acceptance/apache_parameters_spec.rb | 2 +-
 spec/acceptance/class_spec.rb             | 2 +-
 spec/acceptance/vhost_spec.rb             | 2 +-
 spec/setup_acceptance_node.pp             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 28ba8f547f..2e57b32388 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -431,7 +431,7 @@ class { 'apache':
   describe 'logging' do
     describe 'setup' do
       pp = <<-MANIFEST
-          if $facts['osfamily'] == 'RedHat' and $facts['selinux'] {
+          if $facts['os']['family'] == 'RedHat' and $facts['os']['selinux']['enabled'] {
             exec { 'set_apache_defaults':
               command => 'semanage fcontext -a -t httpd_log_t "/apache_spec/logs(/.*)?"',
               unless  => 'semanage fcontext --list | grep /apache_spec/logs | grep httpd_log_t',
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index d87a9744e4..e1ce12f132 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -27,7 +27,7 @@
   context 'custom site/mod dir parameters' do
     let(:pp) do
       <<-MANIFEST
-        if $facts['osfamily'] == 'RedHat' and $facts['selinux'] {
+        if $facts['os']['family'] == 'RedHat' and $facts['os']['selinux']['enabled'] {
           exec { 'set_apache_defaults':
             command => 'semanage fcontext --add -t httpd_config_t "/apache_spec/apache_custom(/.*)?"',
             unless  => 'semanage fcontext --list | grep /apache_spec/apache_custom | grep httpd_config_t',
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index da2867d162..33ef85e21e 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1195,7 +1195,7 @@ class { 'apache::mod::wsgi': }
 
   describe 'additional_includes' do
     pp = <<-MANIFEST
-      if $facts['osfamily'] == 'RedHat' and $facts['selinux'] {
+      if $facts['os']['family'] == 'RedHat' and $facts['os']['selinux']['enabled'] {
         exec { 'set_apache_defaults':
           command => 'semanage fcontext --add -t httpd_sys_content_t "/apache_spec/docroot(/.*)?"',
           unless  => 'semanage fcontext --list | grep /apache_spec/docroot | grep httpd_sys_content_t',
diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
index a785707638..1a50f70a7d 100644
--- a/spec/setup_acceptance_node.pp
+++ b/spec/setup_acceptance_node.pp
@@ -18,7 +18,7 @@
       }
     }
 
-    if $facts['selinux'] {
+    if $facts['os']['selinux']['enabled'] {
       $semanage_package = $facts['os']['release']['major'] ? {
         '6'     => 'policycoreutils-python',
         '7'     => 'policycoreutils-python',

From 71233062af0dcc0e50f418e8754037d9a34f84ad Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 8 Mar 2023 20:45:58 +0100
Subject: [PATCH 2134/2267] Add a class test for mod_proxy_http

---
 spec/classes/mod/proxy_http_spec.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 spec/classes/mod/proxy_http_spec.rb

diff --git a/spec/classes/mod/proxy_http_spec.rb b/spec/classes/mod/proxy_http_spec.rb
new file mode 100644
index 0000000000..85a63317a2
--- /dev/null
+++ b/spec/classes/mod/proxy_http_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::proxy_http' do
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+
+      it { is_expected.to compile.with_all_deps }
+      it { is_expected.to contain_class('apache::mod::proxy') }
+      it { is_expected.to contain_apache__mod('proxy_http') }
+    end
+  end
+end

From ee65e31d439441207858407f85f75a8a1fcae9b5 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 8 Mar 2023 20:50:26 +0100
Subject: [PATCH 2135/2267] Correct test description to match the content

Fixes: b376826e763598538b7b3c4e182661a8c1bf0900
---
 spec/defines/vhost_proxy_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/defines/vhost_proxy_spec.rb b/spec/defines/vhost_proxy_spec.rb
index b7b5c75c31..574fc96232 100644
--- a/spec/defines/vhost_proxy_spec.rb
+++ b/spec/defines/vhost_proxy_spec.rb
@@ -23,7 +23,7 @@
           it { is_expected.to compile.and_raise_error(%r{At least one of}) }
         end
 
-        context 'with proxy_dest' do
+        context 'with proxy_pass' do
           let(:params) do
             super().merge(
               proxy_pass: [

From d6f9d344252719805778df0c0b29c977f3d5fe7d Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 8 Mar 2023 20:50:59 +0100
Subject: [PATCH 2136/2267] Enhance test to ensure it tests for classes to be
 present

---
 spec/defines/vhost_proxy_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/defines/vhost_proxy_spec.rb b/spec/defines/vhost_proxy_spec.rb
index 574fc96232..09fdd739cf 100644
--- a/spec/defines/vhost_proxy_spec.rb
+++ b/spec/defines/vhost_proxy_spec.rb
@@ -37,6 +37,8 @@
 
           it 'creates a concat fragment' do
             expect(subject).to compile.with_all_deps
+            expect(subject).to contain_class('apache::mod::proxy')
+            expect(subject).to contain_class('apache::mod::proxy_http')
             expect(subject).to contain_concat('15-default-80.conf')
             expect(subject).to create_concat__fragment('default-myproxy-proxy')
               .with_target('15-default-80.conf')

From 1769dbd5f9cda669e7f54d34470a584e8d6f2a60 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 8 Mar 2023 20:51:33 +0100
Subject: [PATCH 2137/2267] Add mod_proxy_http2 support

This adds a module class to include the Apache module. For every vhost
it also inspects the configured proxy if the module is required.
---
 manifests/mod/proxy_http2.pp         |  9 +++++
 manifests/vhost.pp                   | 25 ++++++++++++++
 manifests/vhost/proxy.pp             | 10 ++++++
 spec/classes/mod/proxy_http2_spec.rb | 15 +++++++++
 spec/defines/vhost_proxy_spec.rb     | 50 ++++++++++++++++++++++++++++
 5 files changed, 109 insertions(+)
 create mode 100644 manifests/mod/proxy_http2.pp
 create mode 100644 spec/classes/mod/proxy_http2_spec.rb

diff --git a/manifests/mod/proxy_http2.pp b/manifests/mod/proxy_http2.pp
new file mode 100644
index 0000000000..a5368004bb
--- /dev/null
+++ b/manifests/mod/proxy_http2.pp
@@ -0,0 +1,9 @@
+# @summary
+#   Installs `mod_proxy_http2`.
+#
+# @see https://httpd.apache.org/docs/current/mod/mod_proxy_http2.html for additional documentation.
+#
+class apache::mod::proxy_http2 {
+  require apache::mod::proxy
+  apache::mod { 'proxy_http2': }
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 13d348bb1b..ba11a68413 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2303,6 +2303,21 @@
 
       if $directory['provider'] and $directory['provider'] =~ 'location' and ('proxy_pass' in $directory or 'proxy_pass_match' in $directory) {
         include apache::mod::proxy_http
+
+        # To match processing in templates/vhost/_directories.erb
+        if $directory['proxy_pass_match'] {
+          Array($directory['proxy_pass_match']).each |$proxy| {
+            if $proxy['url'] =~ /"h2c?:\/\// {
+              include apache::mod::proxy_http2
+            }
+          }
+        } elsif $directory['proxy_pass'] {
+          Array($directory['proxy_pass']).each |$proxy| {
+            if $proxy['url'] =~ /"h2c?:\/\// {
+              include apache::mod::proxy_http2
+            }
+          }
+        }
       }
 
       if 'request_headers' in $directory {
@@ -2453,6 +2468,16 @@
   if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host or ($proxy_add_headers =~ NotUndef)) and $ensure == 'present' {
     include apache::mod::proxy_http
 
+    # To match processing in templates/vhost/_proxy.erb
+    if $proxy_dest =~ Pattern[/^h2c?:\/\//] or $proxy_dest_match =~ Pattern[/^h2c?:\/\//] {
+      include apache::mod::proxy_http2
+    }
+    [$proxy_pass, $proxy_pass_match].flatten.each |$proxy| {
+      if $proxy and $proxy['url'] =~ Pattern[/^h2c?:\/\//] {
+        include apache::mod::proxy_http2
+      }
+    }
+
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}${filename}.conf",
       order   => 170,
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index f3766d6900..89a885d175 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -124,6 +124,16 @@
   include apache::mod::proxy
   include apache::mod::proxy_http
 
+  # To match processing in templates/vhost/_proxy.erb
+  if $proxy_dest =~ Pattern[/^h2c?:\/\//] or $proxy_dest_match =~ Pattern[/^h2c?:\/\//] {
+    include apache::mod::proxy_http2
+  }
+  [$proxy_pass, $proxy_pass_match].flatten.each |$proxy| {
+    if $proxy and $proxy['url'] =~ Pattern[/^h2c?:\/\//] {
+      include apache::mod::proxy_http2
+    }
+  }
+
   unless $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match {
     fail('At least one of proxy_dest, proxy_pass, proxy_pass_match or proxy_dest_match must be given')
   }
diff --git a/spec/classes/mod/proxy_http2_spec.rb b/spec/classes/mod/proxy_http2_spec.rb
new file mode 100644
index 0000000000..c353048b22
--- /dev/null
+++ b/spec/classes/mod/proxy_http2_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::proxy_http2' do
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+
+      it { is_expected.to compile.with_all_deps }
+      it { is_expected.to contain_class('apache::mod::proxy') }
+      it { is_expected.to contain_apache__mod('proxy_http2') }
+    end
+  end
+end
diff --git a/spec/defines/vhost_proxy_spec.rb b/spec/defines/vhost_proxy_spec.rb
index 09fdd739cf..191f4c5c68 100644
--- a/spec/defines/vhost_proxy_spec.rb
+++ b/spec/defines/vhost_proxy_spec.rb
@@ -53,6 +53,56 @@
                 CONTENT
               )
           end
+
+          context 'with HTTP/2 proxy_dest URL' do
+            let(:params) do
+              super().merge(proxy_dest: 'h2://localhost:8080/')
+            end
+
+            it { is_expected.to compile.with_all_deps }
+            it { is_expected.to contain_class('apache::mod::proxy_http2') }
+          end
+
+          context 'with HTTP/2 proxy_dest_match URL' do
+            let(:params) do
+              super().merge(proxy_dest_match: 'h2://localhost:8080/')
+            end
+
+            it { is_expected.to compile.with_all_deps }
+            it { is_expected.to contain_class('apache::mod::proxy_http2') }
+          end
+
+          context 'with HTTP/2 proxy_pass URL' do
+            let(:params) do
+              super().merge(
+                proxy_pass: [
+                  {
+                    path: '/',
+                    url: 'h2://localhost:8080/'
+                  },
+                ],
+              )
+            end
+
+            it { is_expected.to compile.with_all_deps }
+            it { is_expected.to contain_class('apache::mod::proxy_http2') }
+          end
+
+          context 'with HTTP/2 proxy_pass_match URL' do
+            let(:params) do
+              super().merge(
+                proxy_pass_match: [
+                  {
+                    path: '/',
+                    url: 'h2://localhost:8080/'
+                  },
+                ],
+              )
+            end
+
+            it { is_expected.to compile.with_all_deps }
+            it { is_expected.to contain_class('apache::mod::proxy_http2') }
+          end
         end
       end
     end

From 6ca4154237e5e870009fa5c8060b0faf71d7c6b9 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Thu, 29 Jun 2023 15:30:24 +0530
Subject: [PATCH 2138/2267] (MAINT) Updating mod_package for SUSE

---
 manifests/mod/php.pp          | 10 ++++++++++
 spec/setup_acceptance_node.pp |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 940e7b30d1..38124d12c3 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -106,6 +106,16 @@
   }
 
   if $facts['os']['name'] == 'SLES' {
+    # Enable legacy repo to install apache2-mod_php7 package
+    # if SUSE OS major version is >= 15 and minor version is > 3
+    if ($_package_name == 'apache2-mod_php7' and versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
+      exec { 'enable legacy repos':
+        path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+        command => 'SUSEConnect --product sle-module-legacy/15.4/x86_64',
+        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.4/x86_64',
+      }
+    }
+
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
index 1a50f70a7d..d8637aa083 100644
--- a/spec/setup_acceptance_node.pp
+++ b/spec/setup_acceptance_node.pp
@@ -5,6 +5,15 @@
 
 case $facts['os']['family'] {
   'SLES', 'SUSE': {
+    # Enable legacy repo to install net-tools-deprecated package
+    # If SUSE OS major version is >= 15 and minor version is > 3
+    if (versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
+      exec { 'enable legacy repos':
+        path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
+        command => 'SUSEConnect --product sle-module-legacy/15.4/x86_64',
+        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.4/x86_64',
+      }
+    }
     # needed for netstat, for serverspec checks
     package { 'net-tools-deprecated':
       ensure => 'latest',

From 9bd5bd6d6595b5c67d6e2df4b8102c1deeab5f35 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Fri, 30 Jun 2023 08:24:46 +0000
Subject: [PATCH 2139/2267] Release prep v10.1.1

---
 CHANGELOG.md  | 100 +++++++++++++++++---------------------------------
 metadata.json |   2 +-
 2 files changed, 34 insertions(+), 68 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 438700dc0a..6d510db004 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v10.1.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v10.1.1) - 2023-06-30
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v10.1.0...v10.1.1)
+
+### Added
+
+- Add mod_proxy_http2 support [#2393](https://github.com/puppetlabs/puppetlabs-apache/pull/2393) ([ekohl](https://github.com/ekohl))
+
+### Fixed
+
+- puppetlabs/concat: Allow 9.x [#2426](https://github.com/puppetlabs/puppetlabs-apache/pull/2426) ([bastelfreak](https://github.com/bastelfreak))
+- fix ssl_ciphers array behavior [#2421](https://github.com/puppetlabs/puppetlabs-apache/pull/2421) ([SimonHoenscheid](https://github.com/SimonHoenscheid))
+
 ## [v10.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v10.1.0) - 2023-06-15
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v10.0.0...v10.1.0)
@@ -657,10 +670,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Fix case of setting apache::mpm_module to false [#1720](https://github.com/puppetlabs/puppetlabs-apache/pull/1720) ([edestecd](https://github.com/edestecd))
 - remoteip: Notify apache::service instead of service['httpd'] [#1684](https://github.com/puppetlabs/puppetlabs-apache/pull/1684) ([sergiik](https://github.com/sergiik))
 
-### Other
-
-- MODULES-6224: rename apache mod ldap file [#1733](https://github.com/puppetlabs/puppetlabs-apache/pull/1733) ([cedef](https://github.com/cedef))
-
 ## [2.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/2.3.0) - 2017-10-11
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/2.2.0...2.3.0)
@@ -718,11 +727,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Add WSGIRestrictEmbedded to apache::mod::wsgi [#1614](https://github.com/puppetlabs/puppetlabs-apache/pull/1614) ([dsavineau](https://github.com/dsavineau))
 - Enable configuring CA file in ssl.conf [#1612](https://github.com/puppetlabs/puppetlabs-apache/pull/1612) ([JAORMX](https://github.com/JAORMX))
 - MODULES-4737 - Additional class params for mod ssl [#1611](https://github.com/puppetlabs/puppetlabs-apache/pull/1611) ([cedef](https://github.com/cedef))
+- Added supplementary_groups to the user resource [#1608](https://github.com/puppetlabs/puppetlabs-apache/pull/1608) ([chgarling](https://github.com/chgarling))
 - [msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config [#1606](https://github.com/puppetlabs/puppetlabs-apache/pull/1606) ([wilson208](https://github.com/wilson208))
 - Limit except support [#1605](https://github.com/puppetlabs/puppetlabs-apache/pull/1605) ([ffapitalle](https://github.com/ffapitalle))
 - (FM-6116) - Adding POT file for metadata.json [#1604](https://github.com/puppetlabs/puppetlabs-apache/pull/1604) ([pmcmaw](https://github.com/pmcmaw))
 - [MODULES-4528] Replace Puppet.version.to_f version comparison from spec_helper.rb [#1603](https://github.com/puppetlabs/puppetlabs-apache/pull/1603) ([wilson208](https://github.com/wilson208))
 - Add param for AllowOverride in the userdir.conf template [#1602](https://github.com/puppetlabs/puppetlabs-apache/pull/1602) ([dstepe](https://github.com/dstepe))
+- Modules-4500 Add optional "AdvertiseFrequency" directive in cluster.conf template [#1601](https://github.com/puppetlabs/puppetlabs-apache/pull/1601) ([EmersonPrado](https://github.com/EmersonPrado))
 - The base tag also needs link rewriting [#1599](https://github.com/puppetlabs/puppetlabs-apache/pull/1599) ([tobixen](https://github.com/tobixen))
 - MODULES-4391 add SSLProxyVerifyDepth and SSLProxyCACertificateFile directives [#1596](https://github.com/puppetlabs/puppetlabs-apache/pull/1596) ([hex2a](https://github.com/hex2a))
 - add parser function apache_pw_hash [#1592](https://github.com/puppetlabs/puppetlabs-apache/pull/1592) ([aptituz](https://github.com/aptituz))
@@ -740,6 +751,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
+- Ensure that ProxyPreserveHost is set even when ProxyPass (etc) are not. [#1639](https://github.com/puppetlabs/puppetlabs-apache/pull/1639) ([tpdownes](https://github.com/tpdownes))
 - When absolute path is specified for access_log_file/error_log_file, don't prepend logbase [#1633](https://github.com/puppetlabs/puppetlabs-apache/pull/1633) ([ca-asm](https://github.com/ca-asm))
 - Fix single quoted string [#1623](https://github.com/puppetlabs/puppetlabs-apache/pull/1623) ([lordbink](https://github.com/lordbink))
 - fixed apache group for SUSE/SLES Systems (checked for SLES11/12) [#1613](https://github.com/puppetlabs/puppetlabs-apache/pull/1613) ([pseiler](https://github.com/pseiler))
@@ -748,12 +760,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - [apache::mod::cgi] Fix: ordering constraint for mod_cgi [#1585](https://github.com/puppetlabs/puppetlabs-apache/pull/1585) ([punycode](https://github.com/punycode))
 - Fix vhost template [#1552](https://github.com/puppetlabs/puppetlabs-apache/pull/1552) ([iamspido](https://github.com/iamspido))
 
-### Other
-
-- Ensure that ProxyPreserveHost is set even when ProxyPass (etc) are not. [#1639](https://github.com/puppetlabs/puppetlabs-apache/pull/1639) ([tpdownes](https://github.com/tpdownes))
-- Added supplementary_groups to the user resource [#1608](https://github.com/puppetlabs/puppetlabs-apache/pull/1608) ([chgarling](https://github.com/chgarling))
-- Modules-4500 Add optional "AdvertiseFrequency" directive in cluster.conf template [#1601](https://github.com/puppetlabs/puppetlabs-apache/pull/1601) ([EmersonPrado](https://github.com/EmersonPrado))
-
 ## [1.11.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.11.0) - 2016-12-19
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...1.11.0)
@@ -799,6 +805,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Add apache::mod::proxy_wstunnel [#1462](https://github.com/puppetlabs/puppetlabs-apache/pull/1462) ([sathieu](https://github.com/sathieu))
 - add additional directories options for LDAP Auth [#1443](https://github.com/puppetlabs/puppetlabs-apache/pull/1443) ([zivis](https://github.com/zivis))
 - Update _block.erb [#1441](https://github.com/puppetlabs/puppetlabs-apache/pull/1441) ([jostmart](https://github.com/jostmart))
+- Support the newer mod_auth_cas config options [#1436](https://github.com/puppetlabs/puppetlabs-apache/pull/1436) ([pcfens](https://github.com/pcfens))
 - Wrap mod_security directives in an IfModule [#1423](https://github.com/puppetlabs/puppetlabs-apache/pull/1423) ([kimor79](https://github.com/kimor79))
 
 ### Fixed
@@ -810,6 +817,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - (MODULES-3972) fixes version errors and small fix for suse ssl [#1557](https://github.com/puppetlabs/puppetlabs-apache/pull/1557) ([eputnam](https://github.com/eputnam))
 - Don't fail if first element of  is not an hash before flattening [#1555](https://github.com/puppetlabs/puppetlabs-apache/pull/1555) ([sathieu](https://github.com/sathieu))
 - [MODULES-3548] SLES 12 fix  [#1545](https://github.com/puppetlabs/puppetlabs-apache/pull/1545) ([HelenCampbell](https://github.com/HelenCampbell))
+- Move ssl.conf to main conf directory on EL7 [#1543](https://github.com/puppetlabs/puppetlabs-apache/pull/1543) ([stbenjam](https://github.com/stbenjam))
 - Do not set ssl_certs_dir on FreeBSD [#1538](https://github.com/puppetlabs/puppetlabs-apache/pull/1538) ([smortex](https://github.com/smortex))
 - [MODULES-3882] Don't write empty servername for vhost to template [#1526](https://github.com/puppetlabs/puppetlabs-apache/pull/1526) ([JAORMX](https://github.com/JAORMX))
 - Bug - Port numbers must be quoted [#1525](https://github.com/puppetlabs/puppetlabs-apache/pull/1525) ([blackknight36](https://github.com/blackknight36))
@@ -821,11 +829,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - fix and make 2.4 require docu more readable [#1466](https://github.com/puppetlabs/puppetlabs-apache/pull/1466) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
 - apache::balancer now respects apache::confd_dir [#1463](https://github.com/puppetlabs/puppetlabs-apache/pull/1463) ([traylenator](https://github.com/traylenator))
 
-### Other
-
-- Move ssl.conf to main conf directory on EL7 [#1543](https://github.com/puppetlabs/puppetlabs-apache/pull/1543) ([stbenjam](https://github.com/stbenjam))
-- Support the newer mod_auth_cas config options [#1436](https://github.com/puppetlabs/puppetlabs-apache/pull/1436) ([pcfens](https://github.com/pcfens))
-
 ## [1.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.10.0) - 2016-05-19
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...1.10.0)
@@ -847,9 +850,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - mod_event: do not set parameters twice [#1445](https://github.com/puppetlabs/puppetlabs-apache/pull/1445) ([timogoebel](https://github.com/timogoebel))
 - setting options-hash in proxy_pass or proxy_match leads to syntax errors in Apache [#1444](https://github.com/puppetlabs/puppetlabs-apache/pull/1444) ([zivis](https://github.com/zivis))
 - Fixed trailing slash in lib_path on Suse [#1429](https://github.com/puppetlabs/puppetlabs-apache/pull/1429) ([OpenCoreCH](https://github.com/OpenCoreCH))
-
-### Other
-
 - Add simple <Limit> support + ProxyAddHeaders [#1427](https://github.com/puppetlabs/puppetlabs-apache/pull/1427) ([costela](https://github.com/costela))
 
 ## [1.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.9.0) - 2016-04-21
@@ -867,20 +867,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Add parameter passanger_log_level [#1420](https://github.com/puppetlabs/puppetlabs-apache/pull/1420) ([samuelb](https://github.com/samuelb))
 - add passenger_high_performance on the vhost level [#1419](https://github.com/puppetlabs/puppetlabs-apache/pull/1419) ([timogoebel](https://github.com/timogoebel))
 - Adding SSLProxyCheckPeerExpire support [#1418](https://github.com/puppetlabs/puppetlabs-apache/pull/1418) ([jasonhancock](https://github.com/jasonhancock))
+- (MODULES-3218) add auth_merging for directory enteries [#1412](https://github.com/puppetlabs/puppetlabs-apache/pull/1412) ([pyther](https://github.com/pyther))
 - MODULES-3212: add parallel_spec option [#1410](https://github.com/puppetlabs/puppetlabs-apache/pull/1410) ([jlambert121](https://github.com/jlambert121))
 - MODULES-1352 : Better support for Apache 2.4 style require directives implementation [#1408](https://github.com/puppetlabs/puppetlabs-apache/pull/1408) ([witjoh](https://github.com/witjoh))
 - Added vhost options SecRuleRemoveByTag and SecRuleRemoveByMsg [#1407](https://github.com/puppetlabs/puppetlabs-apache/pull/1407) ([FlatKey](https://github.com/FlatKey))
 - Configurability of Collaborative Detection Threshold Levels for OWASP Core Rule Set [#1405](https://github.com/puppetlabs/puppetlabs-apache/pull/1405) ([FlatKey](https://github.com/FlatKey))
+- Configurability of Collaborative Detection Severity Levels for OWASP Core Rule Set [#1404](https://github.com/puppetlabs/puppetlabs-apache/pull/1404) ([FlatKey](https://github.com/FlatKey))
 - Configurability of SecDefaultAction for OWASP Core Rule Set [#1403](https://github.com/puppetlabs/puppetlabs-apache/pull/1403) ([FlatKey](https://github.com/FlatKey))
 - MODULES-2179: Implement SetEnvIfNoCase [#1402](https://github.com/puppetlabs/puppetlabs-apache/pull/1402) ([jlambert121](https://github.com/jlambert121))
 - Load mod_xml2enc on Apache >= 2.4 on Debian [#1401](https://github.com/puppetlabs/puppetlabs-apache/pull/1401) ([sathieu](https://github.com/sathieu))
 - Take igalic's suggestion to use bool2httpd [#1400](https://github.com/puppetlabs/puppetlabs-apache/pull/1400) ([tpdownes](https://github.com/tpdownes))
 - Move all ensure parameters from concat::fragment to concat [#1396](https://github.com/puppetlabs/puppetlabs-apache/pull/1396) ([domcleal](https://github.com/domcleal))
 - mod_ssl requires mod_mime for AddType directives [#1394](https://github.com/puppetlabs/puppetlabs-apache/pull/1394) ([sathieu](https://github.com/sathieu))
+- Allow configuring mod_security's SecAuditLogParts [#1392](https://github.com/puppetlabs/puppetlabs-apache/pull/1392) ([stig](https://github.com/stig))
 - (#3139) Add support for PassengerUser [#1391](https://github.com/puppetlabs/puppetlabs-apache/pull/1391) ([Reamer](https://github.com/Reamer))
 - add support for SSLProxyProtocol directive [#1390](https://github.com/puppetlabs/puppetlabs-apache/pull/1390) ([saimonn](https://github.com/saimonn))
 - Add mellon_sp_metadata_file parameter for directory entries [#1389](https://github.com/puppetlabs/puppetlabs-apache/pull/1389) ([jokajak](https://github.com/jokajak))
 - Manage mod dir before things that depend on mods [#1388](https://github.com/puppetlabs/puppetlabs-apache/pull/1388) ([cmurphy](https://github.com/cmurphy))
+- add support for fcgi [#1387](https://github.com/puppetlabs/puppetlabs-apache/pull/1387) ([mlhess](https://github.com/mlhess))
 - apache::balancer: Add a target parameter to write to a custom path [#1386](https://github.com/puppetlabs/puppetlabs-apache/pull/1386) ([roidelapluie](https://github.com/roidelapluie))
 - Add JkMount/JkUnmount directives to vhost [#1384](https://github.com/puppetlabs/puppetlabs-apache/pull/1384) ([smoeding](https://github.com/smoeding))
 - Remove SSLv3 [#1383](https://github.com/puppetlabs/puppetlabs-apache/pull/1383) ([ghoneycutt](https://github.com/ghoneycutt))
@@ -901,15 +905,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Fix in custom fact "apache_version" for OracleLinux. [#1416](https://github.com/puppetlabs/puppetlabs-apache/pull/1416) ([Reamer](https://github.com/Reamer))
 - MODULES-3211: fix broken strict_variable tests [#1414](https://github.com/puppetlabs/puppetlabs-apache/pull/1414) ([jonnytdevops](https://github.com/jonnytdevops))
 - MODULES-3211: fix broken strict_variable tests [#1409](https://github.com/puppetlabs/puppetlabs-apache/pull/1409) ([jlambert121](https://github.com/jlambert121))
-- Fix broken internal link for virtual hosts configuration [#1369](https://github.com/puppetlabs/puppetlabs-apache/pull/1369) ([gerhardsam](https://github.com/gerhardsam))
-
-### Other
-
-- (MODULES-3218) add auth_merging for directory enteries [#1412](https://github.com/puppetlabs/puppetlabs-apache/pull/1412) ([pyther](https://github.com/pyther))
-- Configurability of Collaborative Detection Severity Levels for OWASP Core Rule Set [#1404](https://github.com/puppetlabs/puppetlabs-apache/pull/1404) ([FlatKey](https://github.com/FlatKey))
 - Fix MODULES-3158 (any string interpreted as SSLCompression on) [#1398](https://github.com/puppetlabs/puppetlabs-apache/pull/1398) ([tpdownes](https://github.com/tpdownes))
-- Allow configuring mod_security's SecAuditLogParts [#1392](https://github.com/puppetlabs/puppetlabs-apache/pull/1392) ([stig](https://github.com/stig))
-- add support for fcgi [#1387](https://github.com/puppetlabs/puppetlabs-apache/pull/1387) ([mlhess](https://github.com/mlhess))
+- Fix broken internal link for virtual hosts configuration [#1369](https://github.com/puppetlabs/puppetlabs-apache/pull/1369) ([gerhardsam](https://github.com/gerhardsam))
 
 ## [1.8.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.8.1) - 2016-02-08
 
@@ -935,10 +932,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Fix fcgid.conf on Debian [#1331](https://github.com/puppetlabs/puppetlabs-apache/pull/1331) ([sathieu](https://github.com/sathieu))
 - MODULES-2958 : correct CustomLog syslog entry [#1322](https://github.com/puppetlabs/puppetlabs-apache/pull/1322) ([BigAl](https://github.com/BigAl))
 
-### Other
-
-- add parameter root_directory_options [#1339](https://github.com/puppetlabs/puppetlabs-apache/pull/1339) ([timogoebel](https://github.com/timogoebel))
-
 ## [1.8.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.8.0) - 2016-01-25
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.1...1.8.0)
@@ -950,6 +943,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - MODULES-2956: Enable options within location block on proxy_match [#1317](https://github.com/puppetlabs/puppetlabs-apache/pull/1317) ([jlambert121](https://github.com/jlambert121))
 - Support itk on redhat [#1316](https://github.com/puppetlabs/puppetlabs-apache/pull/1316) ([edestecd](https://github.com/edestecd))
 - SSLProxyVerify [#1311](https://github.com/puppetlabs/puppetlabs-apache/pull/1311) ([occelebi](https://github.com/occelebi))
+- Support the mod_proxy ProxPassReverseCookieDomain directive   [#1309](https://github.com/puppetlabs/puppetlabs-apache/pull/1309) ([occelebi](https://github.com/occelebi))
 - Add X-Forwarded-For into log_formats defaults [#1308](https://github.com/puppetlabs/puppetlabs-apache/pull/1308) ([mpolenchuk](https://github.com/mpolenchuk))
 - Put headers and request headers before proxy [#1306](https://github.com/puppetlabs/puppetlabs-apache/pull/1306) ([quixoten](https://github.com/quixoten))
 - EL7 uses conf.modules.d directory for modules. [#1305](https://github.com/puppetlabs/puppetlabs-apache/pull/1305) ([jasonhancock](https://github.com/jasonhancock))
@@ -969,10 +963,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Fixes paths and packages for the shib2 module on Debian [#1292](https://github.com/puppetlabs/puppetlabs-apache/pull/1292) ([cholyoak](https://github.com/cholyoak))
 - Add ::apache::vhost::custom [#1271](https://github.com/puppetlabs/puppetlabs-apache/pull/1271) ([pabelanger](https://github.com/pabelanger))
 
-### Other
-
-- Support the mod_proxy ProxPassReverseCookieDomain directive   [#1309](https://github.com/puppetlabs/puppetlabs-apache/pull/1309) ([occelebi](https://github.com/occelebi))
-
 ## [1.7.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.7.1) - 2015-12-04
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.0...1.7.1)
@@ -1021,10 +1011,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - also install mod_authn_alias as default mod in debian for apache < 2.4 [#1205](https://github.com/puppetlabs/puppetlabs-apache/pull/1205) ([zivis](https://github.com/zivis))
 - Add an option to configure PassengerLogFile [#1194](https://github.com/puppetlabs/puppetlabs-apache/pull/1194) ([igalic](https://github.com/igalic))
 - (MODULES-2458) Support for mod_auth_mellon. [#1189](https://github.com/puppetlabs/puppetlabs-apache/pull/1189) ([traylenator](https://github.com/traylenator))
+- Client auth for reverse proxy [#1188](https://github.com/puppetlabs/puppetlabs-apache/pull/1188) ([holtwilkins](https://github.com/holtwilkins))
 - Add ListenBacklog for mod worker (MODULES-2432) [#1185](https://github.com/puppetlabs/puppetlabs-apache/pull/1185) ([mwhahaha](https://github.com/mwhahaha))
 - (MODULES-2419) - Add mod_auth_kerb parameters to vhost [#1183](https://github.com/puppetlabs/puppetlabs-apache/pull/1183) ([traylenator](https://github.com/traylenator))
 - Support the mod_proxy ProxyPassReverseCookiePath directive [#1180](https://github.com/puppetlabs/puppetlabs-apache/pull/1180) ([roidelapluie](https://github.com/roidelapluie))
 - Adding use_optional_includes parameter to vhost define. [#1162](https://github.com/puppetlabs/puppetlabs-apache/pull/1162) ([cropalato](https://github.com/cropalato))
+- Add support for user modifiable installation of mod_systemd and pidfile locations: [#1159](https://github.com/puppetlabs/puppetlabs-apache/pull/1159) ([vamegh](https://github.com/vamegh))
 - mod_passenger: Allow setting PassengerSpawnMethod [#1158](https://github.com/puppetlabs/puppetlabs-apache/pull/1158) ([wubr](https://github.com/wubr))
 - Feature/master/passengerbaseuri [#1152](https://github.com/puppetlabs/puppetlabs-apache/pull/1152) ([aronymous](https://github.com/aronymous))
 
@@ -1051,11 +1043,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - mod::alias should be included when the aliases parameter is used [#1155](https://github.com/puppetlabs/puppetlabs-apache/pull/1155) ([pcfens](https://github.com/pcfens))
 - Fix: missing package for mod_geoip on Debian systems [#1148](https://github.com/puppetlabs/puppetlabs-apache/pull/1148) ([olivierHa](https://github.com/olivierHa))
 
-### Other
-
-- Client auth for reverse proxy [#1188](https://github.com/puppetlabs/puppetlabs-apache/pull/1188) ([holtwilkins](https://github.com/holtwilkins))
-- Add support for user modifiable installation of mod_systemd and pidfile locations: [#1159](https://github.com/puppetlabs/puppetlabs-apache/pull/1159) ([vamegh](https://github.com/vamegh))
-
 ## [1.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.6.0) - 2015-07-30
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.5.0...1.6.0)
@@ -1087,6 +1074,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Updated travisci file to remove allow_failures for Puppet 4 [#1135](https://github.com/puppetlabs/puppetlabs-apache/pull/1135) ([jonnytdevops](https://github.com/jonnytdevops))
 - Add changelog for 1.5.0 relesase [#1132](https://github.com/puppetlabs/puppetlabs-apache/pull/1132) ([hunner](https://github.com/hunner))
 - Support puppetlabs-concat 2.x [#1126](https://github.com/puppetlabs/puppetlabs-apache/pull/1126) ([domcleal](https://github.com/domcleal))
+- Added the ability to define the IndexStyleSheet setting for a directory [#1124](https://github.com/puppetlabs/puppetlabs-apache/pull/1124) ([genebean](https://github.com/genebean))
 - Add basic initial support for SLES 11 [#1121](https://github.com/puppetlabs/puppetlabs-apache/pull/1121) ([carroarmato0](https://github.com/carroarmato0))
 - Modulesync updates [#1117](https://github.com/puppetlabs/puppetlabs-apache/pull/1117) ([underscorgan](https://github.com/underscorgan))
 - MODULES-1968 - Update the template to warn if using deprecated options [#1113](https://github.com/puppetlabs/puppetlabs-apache/pull/1113) ([underscorgan](https://github.com/underscorgan))
@@ -1098,10 +1086,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Incorrect date in the changelog [#1134](https://github.com/puppetlabs/puppetlabs-apache/pull/1134) ([underscorgan](https://github.com/underscorgan))
 - Do not offload overriding LogFormats to httpd [#1096](https://github.com/puppetlabs/puppetlabs-apache/pull/1096) ([igalic](https://github.com/igalic))
 
-### Other
-
-- Added the ability to define the IndexStyleSheet setting for a directory [#1124](https://github.com/puppetlabs/puppetlabs-apache/pull/1124) ([genebean](https://github.com/genebean))
-
 ## [1.4.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.4.1) - 2015-04-28
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.0...1.4.1)
@@ -1117,20 +1101,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Make Options directive configurable for mod userdir [#1077](https://github.com/puppetlabs/puppetlabs-apache/pull/1077) ([frenkel](https://github.com/frenkel))
 - allow acess to userdirs again [#1071](https://github.com/puppetlabs/puppetlabs-apache/pull/1071) ([niklas](https://github.com/niklas))
 - add parameters to configure expires globally [#1063](https://github.com/puppetlabs/puppetlabs-apache/pull/1063) ([igalic](https://github.com/igalic))
+- make $lib_path configurable [#1057](https://github.com/puppetlabs/puppetlabs-apache/pull/1057) ([fraenki](https://github.com/fraenki))
 
 ### Fixed
 
 - (MODULES-1874) Fix proxy_connect module on apache >= 2.2 [#1093](https://github.com/puppetlabs/puppetlabs-apache/pull/1093) ([ckaenzig](https://github.com/ckaenzig))
 - Fix remoteip unit test for rspec-puppet 2 [#1091](https://github.com/puppetlabs/puppetlabs-apache/pull/1091) ([cmurphy](https://github.com/cmurphy))
+- Fixed setting multiple env_var in a location block for proxy pass. [#1086](https://github.com/puppetlabs/puppetlabs-apache/pull/1086) ([btreecat](https://github.com/btreecat))
 - fix typo [#1082](https://github.com/puppetlabs/puppetlabs-apache/pull/1082) ([kgeis](https://github.com/kgeis))
 - Fixes/apache name [#1070](https://github.com/puppetlabs/puppetlabs-apache/pull/1070) ([stevenpost](https://github.com/stevenpost))
 - Remoteip module [#1065](https://github.com/puppetlabs/puppetlabs-apache/pull/1065) ([igalic](https://github.com/igalic))
 
-### Other
-
-- Fixed setting multiple env_var in a location block for proxy pass. [#1086](https://github.com/puppetlabs/puppetlabs-apache/pull/1086) ([btreecat](https://github.com/btreecat))
-- make $lib_path configurable [#1057](https://github.com/puppetlabs/puppetlabs-apache/pull/1057) ([fraenki](https://github.com/fraenki))
-
 ## [1.4.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.4.0) - 2015-03-17
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.3.0...1.4.0)
@@ -1167,16 +1148,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - (#1391) Correct Debian jessie mod_prefork dev package name [#1042](https://github.com/puppetlabs/puppetlabs-apache/pull/1042) ([sathieu](https://github.com/sathieu))
 - Fixes #880 - (MODULES-1391) Correct Ubuntu Trusty mod_prefork package name [#1041](https://github.com/puppetlabs/puppetlabs-apache/pull/1041) ([underscorgan](https://github.com/underscorgan))
 - Fixed default mpm_event config warning [#1039](https://github.com/puppetlabs/puppetlabs-apache/pull/1039) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
+- MODULES-1784 check for deprecated options and fail when they are unsupported [#1036](https://github.com/puppetlabs/puppetlabs-apache/pull/1036) ([roman-mueller](https://github.com/roman-mueller))
 - fix bug in scriptalias code that keeps scriptalias from beeing included in default vhost [#1035](https://github.com/puppetlabs/puppetlabs-apache/pull/1035) ([haraldsk](https://github.com/haraldsk))
 - Fixed an order of operations issue in the test that caused some weird behavior when apache would delay or not restart and added a check with timeout to ensure proper wait [#1032](https://github.com/puppetlabs/puppetlabs-apache/pull/1032) ([cyberious](https://github.com/cyberious))
 - SuPHP acceptance fixes?, chasing the test bug that is timing [#1031](https://github.com/puppetlabs/puppetlabs-apache/pull/1031) ([cyberious](https://github.com/cyberious))
 - ssl.pp: Fixed indent. [#1026](https://github.com/puppetlabs/puppetlabs-apache/pull/1026) ([jpds-zz](https://github.com/jpds-zz))
 - our templates are horrible, we should fix it [#1025](https://github.com/puppetlabs/puppetlabs-apache/pull/1025) ([igalic](https://github.com/igalic))
 
-### Other
-
-- MODULES-1784 check for deprecated options and fail when they are unsupported [#1036](https://github.com/puppetlabs/puppetlabs-apache/pull/1036) ([roman-mueller](https://github.com/roman-mueller))
-
 ## [1.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.3.0) - 2015-02-17
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.2.0...1.3.0)
@@ -1186,6 +1164,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Concat started using a new fact [#1012](https://github.com/puppetlabs/puppetlabs-apache/pull/1012) ([underscorgan](https://github.com/underscorgan))
 - (MODULES-1719) Add parameter for SSLRandomSeed bytes [#1007](https://github.com/puppetlabs/puppetlabs-apache/pull/1007) ([hunner](https://github.com/hunner))
 - MODULES-1744: use bool2httpd for server_signature and trace_enable [#1006](https://github.com/puppetlabs/puppetlabs-apache/pull/1006) ([jlambert121](https://github.com/jlambert121))
+- ssl.pp: Allow setting of SSLRandomSeed option. [#1001](https://github.com/puppetlabs/puppetlabs-apache/pull/1001) ([jpds-zz](https://github.com/jpds-zz))
 - add configuration options to mod_security [#997](https://github.com/puppetlabs/puppetlabs-apache/pull/997) ([jlambert121](https://github.com/jlambert121))
 - MODULES-1696: ensure mod::setenvif is included if needed [#995](https://github.com/puppetlabs/puppetlabs-apache/pull/995) ([jlambert121](https://github.com/jlambert121))
 - MODULES-1680 - sort php_* hashes for idempotency [#994](https://github.com/puppetlabs/puppetlabs-apache/pull/994) ([underscorgan](https://github.com/underscorgan))
@@ -1232,10 +1211,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - MODULES-1384 - idempotency for wsgi_script_aliases [#936](https://github.com/puppetlabs/puppetlabs-apache/pull/936) ([underscorgan](https://github.com/underscorgan))
 - MODULES-1403 - fix doc bug [#935](https://github.com/puppetlabs/puppetlabs-apache/pull/935) ([underscorgan](https://github.com/underscorgan))
 
-### Other
-
-- ssl.pp: Allow setting of SSLRandomSeed option. [#1001](https://github.com/puppetlabs/puppetlabs-apache/pull/1001) ([jpds-zz](https://github.com/jpds-zz))
-
 ## [1.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.2.0) - 2014-11-11
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.1...1.2.0)
@@ -1367,15 +1342,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - order proxy_set option so it doesn't change between runs [#701](https://github.com/puppetlabs/puppetlabs-apache/pull/701) ([tjikkun](https://github.com/tjikkun))
 - fix missing comma in sample config [#683](https://github.com/puppetlabs/puppetlabs-apache/pull/683) ([sdague](https://github.com/sdague))
 - fix missing ensure on concat::fragment resources [#681](https://github.com/puppetlabs/puppetlabs-apache/pull/681) ([jfroche](https://github.com/jfroche))
+- mod_proxy_html failing in Debian [#673](https://github.com/puppetlabs/puppetlabs-apache/pull/673) ([carlossg](https://github.com/carlossg))
 - Apache version in Ubuntu 13.10 is 2.4 [#672](https://github.com/puppetlabs/puppetlabs-apache/pull/672) ([carlossg](https://github.com/carlossg))
 - lint fixes [#671](https://github.com/puppetlabs/puppetlabs-apache/pull/671) ([carlossg](https://github.com/carlossg))
 - Include mod wsgi when wsgi_daemon_process is given [#664](https://github.com/puppetlabs/puppetlabs-apache/pull/664) ([ekohl](https://github.com/ekohl))
 - apache::mod::mime does not compile due to wrong file dependency [#627](https://github.com/puppetlabs/puppetlabs-apache/pull/627) ([carlossg](https://github.com/carlossg))
 
-### Other
-
-- mod_proxy_html failing in Debian [#673](https://github.com/puppetlabs/puppetlabs-apache/pull/673) ([carlossg](https://github.com/carlossg))
-
 ## [1.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/1.0.1) - 2014-03-04
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.0...1.0.1)
@@ -1413,9 +1385,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Lint fixes [#614](https://github.com/puppetlabs/puppetlabs-apache/pull/614) ([justinstoller](https://github.com/justinstoller))
 - Proxy pass reverse fix [#613](https://github.com/puppetlabs/puppetlabs-apache/pull/613) ([dteirney](https://github.com/dteirney))
 - templates/vhost/_proxy.erb misconfigures ProxyPassReverse [#602](https://github.com/puppetlabs/puppetlabs-apache/pull/602) ([jrwilk01](https://github.com/jrwilk01))
-
-### Other
-
 - Added in mod_actions to the repo so it may be used. [#591](https://github.com/puppetlabs/puppetlabs-apache/pull/591) ([typhonius](https://github.com/typhonius))
 
 ## [0.11.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.11.0) - 2014-02-05
@@ -1514,6 +1483,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
+- No implicit <Directory> entry for ScriptAlias path [#488](https://github.com/puppetlabs/puppetlabs-apache/pull/488) ([antaflos](https://github.com/antaflos))
 - Add support for AliasMatch directives [#483](https://github.com/puppetlabs/puppetlabs-apache/pull/483) ([antaflos](https://github.com/antaflos))
 - Fix directory fragment not setting AllowOverride [#455](https://github.com/puppetlabs/puppetlabs-apache/pull/455) ([Aethylred](https://github.com/Aethylred))
 - Revert unnecessary `$default_ssl_vhost` validation change. [#453](https://github.com/puppetlabs/puppetlabs-apache/pull/453) ([dbeckham](https://github.com/dbeckham))
@@ -1530,10 +1500,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Fix for issue #358. Including apache::mod::proxy and apache::mod::proxy_h... [#360](https://github.com/puppetlabs/puppetlabs-apache/pull/360) ([bmurtagh](https://github.com/bmurtagh))
 - fix exception types in some specs [#350](https://github.com/puppetlabs/puppetlabs-apache/pull/350) ([ptomulik](https://github.com/ptomulik))
 
-### Other
-
-- No implicit <Directory> entry for ScriptAlias path [#488](https://github.com/puppetlabs/puppetlabs-apache/pull/488) ([antaflos](https://github.com/antaflos))
-
 ## [0.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/0.9.0) - 2013-09-06
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.8.1...0.9.0)
diff --git a/metadata.json b/metadata.json
index 0f29d77618..e58dc3fb9b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "10.1.0",
+  "version": "10.1.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 8d4cf9f5f9c0f2df36040f3b0e2bc137bec8cf8b Mon Sep 17 00:00:00 2001
From: jordanbreen28 <jordan.breen@perforce.com>
Date: Mon, 17 Jul 2023 15:36:54 +0100
Subject: [PATCH 2140/2267] (maint) - remove legacy default facts

---
 spec/default_facts.yml | 7 ++++---
 spec/spec_helper.rb    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index f777abfc99..3346c394df 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,7 +2,8 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-ipaddress: "172.16.254.254"
-ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
+networking:
+  ip: "172.16.254.254"
+  ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
+  mac: "AA:AA:AA:AA:AA:AA"
 is_pe: false
-macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1a8b68bde8..a30389731e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,11 +9,11 @@
 
 require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 
-include RspecPuppetFacts # rubocop:disable Style/MixinUsage
+include RspecPuppetFacts
 
 default_facts = {
   puppetversion: Puppet.version,
-  facterversion: Facter.version
+  facterversion: Facter.version,
 }
 
 default_fact_files = [
@@ -25,7 +25,7 @@
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
+    default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
   rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end

From 0b9b94806908d484bcaef1422ea8501d404fdb38 Mon Sep 17 00:00:00 2001
From: jordanbreen28 <jordan.breen@perforce.com>
Date: Mon, 17 Jul 2023 15:37:02 +0100
Subject: [PATCH 2141/2267] (maint) - PDK Update

---
 .gitignore          |  2 +-
 .pdkignore          |  8 ++------
 Gemfile             | 45 +++++++++++++++++++++++----------------------
 Rakefile            |  8 ++++----
 metadata.json       |  4 ++--
 spec/spec_helper.rb |  4 ++--
 6 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 988dcbbe62..3f1551212b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/
+/spec/fixtures/modules/*
 /tmp/
 /vendor/
 /convert_report.txt
diff --git a/.pdkignore b/.pdkignore
index c538bea8bd..584438f9a0 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -16,7 +16,7 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/
+/spec/fixtures/modules/*
 /tmp/
 /vendor/
 /convert_report.txt
@@ -26,20 +26,16 @@
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
-/appveyor.yml
-/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
 /.gitignore
-/.gitlab-ci.yml
 /.pdkignore
 /.puppet-lint.rc
 /Rakefile
 /rakelib/
 /.rspec
-/.rubocop.yml
-/.travis.yml
+/..yml
 /.yardopts
 /spec/
 /.vscode/
diff --git a/Gemfile b/Gemfile
index ea113b0c78..91a389e8e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,31 +14,32 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 group :development do
-  gem "json", '= 2.1.0',                           require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.3.0',                           require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.5.1',                           require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.1',                           require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.3',                           require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "voxpupuli-puppet-lint-plugins", '~> 4.0',   require: false
-  gem "facterdb", '~> 1.18',                       require: false
-  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
-  gem "puppetlabs_spec_helper", '~> 5.0',          require: false
-  gem "rspec-puppet-facts", '~> 2.0',              require: false
-  gem "codecov", '~> 0.2',                         require: false
-  gem "dependency_checker", '~> 0.2',              require: false
-  gem "parallel_tests", '= 3.12.1',                require: false
-  gem "pry", '~> 0.10',                            require: false
-  gem "simplecov-console", '~> 0.5',               require: false
-  gem "puppet-debugger", '~> 1.0',                 require: false
-  gem "rubocop", '~> 1.48.1',                      require: false
-  gem "rubocop-performance", '~> 1.16',            require: false
-  gem "rubocop-rspec", '~> 2.19',                  require: false
-  gem "rb-readline", '= 0.5.5',                    require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator", '= 1.15.2',    require: false
+  gem "json", '= 2.1.0',                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                         require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                         require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                         require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "racc", '~> 1.4.0',                        require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
+  gem "facterdb", '~> 1.18',                     require: false
+  gem "metadata-json-lint", '~> 3.0',            require: false
+  gem "puppetlabs_spec_helper", '~> 6.0',        require: false
+  gem "rspec-puppet-facts", '~> 2.0',            require: false
+  gem "codecov", '~> 0.2',                       require: false
+  gem "dependency_checker", '~> 1.0.0',          require: false
+  gem "parallel_tests", '= 3.12.1',              require: false
+  gem "pry", '~> 0.10',                          require: false
+  gem "simplecov-console", '~> 0.5',             require: false
+  gem "puppet-debugger", '~> 1.0',               require: false
+  gem "rubocop", '= 1.48.1',                     require: false
+  gem "rubocop-performance", '= 1.16.0',         require: false
+  gem "rubocop-rspec", '= 2.19.0',               require: false
+  gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator", '= 1.15.2',  require: false
 end
 group :system_tests do
   gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
-  gem "serverspec", '~> 2.41',    require: false
+  gem "serverspec", '~> 2.41',   require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 3cf60463bd..f761e13c04 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require 'bundler'
-require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
+require 'puppet_litmus/rake_tasks' if Gem.loaded_specs.key? 'puppet_litmus'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
-require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
+require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'
+require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
@@ -45,7 +45,7 @@ PuppetLint.configuration.send('disable_anchor_resource')
 PuppetLint.configuration.send('disable_140chars')
 
 
-if Bundler.rubygems.find_name('github_changelog_generator').any?
+if Gem.loaded_specs.key? 'github_changelog_generator'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
     config.user = "#{changelog_user}"
diff --git a/metadata.json b/metadata.json
index e58dc3fb9b..6a49d16645 100644
--- a/metadata.json
+++ b/metadata.json
@@ -87,7 +87,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "2.7.1",
+  "pdk-version": "3.0.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-ge5b0114"
+  "template-ref": "heads/main-0-g9ab5b49"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a30389731e..9573c5a401 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,11 +9,11 @@
 
 require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 
-include RspecPuppetFacts
+include RspecPuppetFacts # rubocop:disable Style/MixinUsage
 
 default_facts = {
   puppetversion: Puppet.version,
-  facterversion: Facter.version,
+  facterversion: Facter.version
 }
 
 default_fact_files = [

From 7dc5858b6f4312a397ce69dff68ebfe6bcc0b5a0 Mon Sep 17 00:00:00 2001
From: Malik Parvez <84777619+malikparvez@users.noreply.github.com>
Date: Mon, 17 Jul 2023 21:36:00 +0530
Subject: [PATCH 2142/2267] CONT-1219 : fail ci for puppetlabs members if no
 label

---
 .github/workflows/labeller.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
index 5434d3fff3..aa34247aff 100644
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -1,22 +1,27 @@
-name: community-labeller
+name: Labeller
 
 on:
   issues:
     types:
       - opened
+      - labeled
+      - unlabeled
   pull_request_target:
     types:
       - opened
+      - labeled
+      - unlabeled
 
 jobs:
   label:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: puppetlabs/community-labeller@v0
+      - uses: puppetlabs/community-labeller@v1.0.1
         name: Label issues or pull requests
         with:
           label_name: community
           label_color: '5319e7'
           org_membership: puppetlabs
-          token: ${{ secrets.IAC_COMMUNITY_LABELER }}
+          fail_if_member: 'true'
+          token: ${{ secrets.IAC_COMMUNITY_LABELER }}
\ No newline at end of file

From 09254f43d9a10b344e2ac4c570618816c4441171 Mon Sep 17 00:00:00 2001
From: Malik Parvez <84777619+malikparvez@users.noreply.github.com>
Date: Mon, 17 Jul 2023 21:45:49 +0530
Subject: [PATCH 2143/2267] CONT-1219 : fail ci for puppetlabs members if no
 label

---
 .github/workflows/labeller.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
index aa34247aff..ee149bf525 100644
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -24,4 +24,4 @@ jobs:
           label_color: '5319e7'
           org_membership: puppetlabs
           fail_if_member: 'true'
-          token: ${{ secrets.IAC_COMMUNITY_LABELER }}
\ No newline at end of file
+          token: ${{ secrets.IAC_COMMUNITY_LABELER }}

From 8cd6c14331f1a187c5b552f95ce396f9e8b48712 Mon Sep 17 00:00:00 2001
From: Ian <i.collins-248@kent.ac.uk>
Date: Mon, 12 Jun 2023 11:17:51 +0100
Subject: [PATCH 2144/2267] Add MellonSetEnv support

---
 templates/vhost/_directories.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index b63b7ff49f..f699e61fd4 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -428,6 +428,11 @@
       <%- if directory['mellon_idp_metadata_file'] -%>
     MellonIDPMetadataFile "<%= directory['mellon_idp_metadata_file'] %>"
       <%- end -%>
+      <%- if directory['mellon_set_env'] -%>
+        <%- directory['mellon_set_env'].each do |key, value| -%>
+    MellonSetEnv "<%= key %>" "<%= value %>"
+        <%- end -%>
+      <%- end -%>
       <%- if directory['mellon_set_env_no_prefix'] -%>
         <%- directory['mellon_set_env_no_prefix'].each do |key, value| -%>
     MellonSetEnvNoPrefix "<%= key %>" "<%= value %>"

From 57dd96c89c8ce8bfbcf95d8e1f67c85a69d39567 Mon Sep 17 00:00:00 2001
From: Ian <i.collins-248@kent.ac.uk>
Date: Wed, 12 Jul 2023 09:09:15 +0100
Subject: [PATCH 2145/2267] Add Mellon unit tests

---
 spec/defines/vhost_spec.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index c267ef936d..e8e50c6424 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -301,6 +301,21 @@
                   'ssl_verify_client' => 'optional',
                   'ssl_verify_depth' => 10
                 },
+                {
+                  'path' => '/private_2',
+                  'provider' => 'location',
+                  'mellon_enable' => 'auth',
+                  'mellon_sp_private_key_file' => '/etc/httpd/mellon/example.com_mellon.key',
+                  'mellon_sp_cert_file' => '/etc/httpd/mellon/example.com_mellon.crt',
+                  'mellon_sp_metadata_file' => '/etc/httpd/mellon/example.com_sp_mellon.xml',
+                  'mellon_idp_metadata_file' => '/etc/httpd/mellon/example.com_idp_mellon.xml',
+                  'mellon_set_env' => { 'isMemberOf' => 'urn:oid:1.3.6.1.4.1.5923.1.5.1.1' },
+                  'mellon_set_env_no_prefix' => { 'isMemberOf' => 'urn:oid:1.3.6.1.4.1.5923.1.5.1.1' },
+                  'mellon_user' => 'urn:oid:0.9.2342.19200300.100.1.1',
+                  'mellon_saml_response_dump' => 'Off',
+                  'mellon_cond' => ['isMemberOf "cn=example-access,ou=Groups,o=example,o=com" [MAP]'],
+                  'mellon_session_length' => '300'
+                },
               ],
               'error_log' => false,
               'error_log_file' => 'httpd_error_log',
@@ -721,6 +736,16 @@
               .with_content(%r{^\s+GssapiUseSessions\sOn$})
               .with_content(%r{^\s+SSLVerifyClient\soptional$})
               .with_content(%r{^\s+SSLVerifyDepth\s10$})
+              .with_content(%r{^\s+MellonEnable\s"auth"$})
+              .with_content(%r{^\s+MellonSPPrivateKeyFile\s"/etc/httpd/mellon/example\.com_mellon\.key"$})
+              .with_content(%r{^\s+MellonSPCertFile\s"/etc/httpd/mellon/example\.com_mellon\.crt"$})
+              .with_content(%r{^\s+MellonSPMetadataFile\s"/etc/httpd/mellon/example\.com_sp_mellon\.xml"$})
+              .with_content(%r{^\s+MellonIDPMetadataFile\s"/etc/httpd/mellon/example\.com_idp_mellon\.xml"$})
+              .with_content(%r{^\s+MellonSetEnv\s"isMemberOf"\s"urn:oid:1\.3\.6\.1\.4\.1\.5923\.1\.5\.1\.1"$})
+              .with_content(%r{^\s+MellonSetEnvNoPrefix\s"isMemberOf"\s"urn:oid:1\.3\.6\.1\.4\.1\.5923\.1\.5\.1\.1"$})
+              .with_content(%r{^\s+MellonUser\s"urn:oid:0\.9\.2342\.19200300\.100\.1\.1"$})
+              .with_content(%r{^\s+MellonCond\sisMemberOf\s"cn=example-access,ou=Groups,o=example,o=com"\s\[MAP\]$})
+              .with_content(%r{^\s+MellonSessionLength\s"300"$})
           }
 
           it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }

From 6de78a4b6eb03be4707287793ddeac12abfab481 Mon Sep 17 00:00:00 2001
From: Ian <i.collins-248@kent.ac.uk>
Date: Thu, 13 Jul 2023 08:20:03 +0100
Subject: [PATCH 2146/2267] disable RSpec/ExampleLength for examples to stop ci
 failure

---
 spec/defines/vhost_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index e8e50c6424..9b5c4e8166 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -628,6 +628,7 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
 
+          # rubocop:disable RSpec/ExampleLength
           it {
             expect(subject).to contain_concat__fragment('rspec.example.com-directories')
               .with_content(%r{^\s+<Proxy "\*">$})
@@ -747,6 +748,7 @@
               .with_content(%r{^\s+MellonCond\sisMemberOf\s"cn=example-access,ou=Groups,o=example,o=com"\s\[MAP\]$})
               .with_content(%r{^\s+MellonSessionLength\s"300"$})
           }
+          # rubocop:enable RSpec/ExampleLength
 
           it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
 

From f7877891d5bef6068caf3a43a4dc4ee0acbe0c00 Mon Sep 17 00:00:00 2001
From: praj1001 <134480625+praj1001@users.noreply.github.com>
Date: Fri, 28 Jul 2023 11:53:15 +0530
Subject: [PATCH 2147/2267] changed sle legacy module

---
 manifests/mod/php.pp          | 4 ++--
 spec/setup_acceptance_node.pp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 38124d12c3..2d10e02b4b 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -111,8 +111,8 @@
     if ($_package_name == 'apache2-mod_php7' and versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
       exec { 'enable legacy repos':
         path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-        command => 'SUSEConnect --product sle-module-legacy/15.4/x86_64',
-        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.4/x86_64',
+        command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',
+        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.5/x86_64',
       }
     }
 
diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
index d8637aa083..6f3150006c 100644
--- a/spec/setup_acceptance_node.pp
+++ b/spec/setup_acceptance_node.pp
@@ -10,8 +10,8 @@
     if (versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
       exec { 'enable legacy repos':
         path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-        command => 'SUSEConnect --product sle-module-legacy/15.4/x86_64',
-        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.4/x86_64',
+        command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',
+        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.5/x86_64',
       }
     }
     # needed for netstat, for serverspec checks

From 6afaac76de4d93804690c0bcb1ca42a7d3006d58 Mon Sep 17 00:00:00 2001
From: Robin Kraft <r.kraft@babiel.com>
Date: Thu, 3 Aug 2023 13:54:43 +0200
Subject: [PATCH 2148/2267] feat: add Debian12 Compability

---
 manifests/params.pp             |  1 +
 metadata.json                   |  3 ++-
 spec/acceptance/mod_php_spec.rb |  4 ++++
 spec/classes/mod/php_spec.rb    | 11 +++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index fbdeb0401e..d540992c0c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -313,6 +313,7 @@
       '9'     => '7.0', # Debian Stretch
       '10'    => '7.3', # Debian Buster
       '11'    => '7.4', # Debian Bullseye
+      '12'    => '8.2', # Debian Bookworm
       '20.04' => '7.4', # Ubuntu Foccal Fossal
       '22.04' => '8.1', # Ubuntu Jammy
       default => '7.2', # Ubuntu Bionic, Cosmic and Disco
diff --git a/metadata.json b/metadata.json
index 6a49d16645..2e67b598a1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -49,7 +49,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index c6323e74ab..5c9f41e21f 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -36,6 +36,10 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
+    elsif os[:family] == 'debian' && os[:release] =~ %r{^12\.}
+      describe file("#{apache_hash['mod_dir']}/php8.2.conf") do
+        it { is_expected.to contain 'DirectoryIndex index.php' }
+      end
     elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
       describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 67e7d86b76..ad5b0a9429 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -84,6 +84,17 @@
                 }
               end
             end
+          when '12'
+            context 'on bookworm' do
+              it { is_expected.to contain_apache__mod('php8.2') }
+              it { is_expected.to contain_package('libapache2-mod-php8.2') }
+
+              it {
+                expect(subject).to contain_file('php8.2.load').with(
+                  content: "LoadModule php8_module /usr/lib/apache2/modules/libphp8.2.so\n",
+                )
+              }
+            end
           when '18.04'
             context 'on bionic' do
               let :params do

From 17edc32ced95cbff62bd5d3551530a558d168f1e Mon Sep 17 00:00:00 2001
From: Gavin Patton <gavin.patton@puppet.com>
Date: Thu, 10 Aug 2023 12:20:01 +0100
Subject: [PATCH 2149/2267] (CAT-343) Audit modules and tools for references to
 travis. Removed all needless references to travis.

---
 provision.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/provision.yaml b/provision.yaml
index e3cd932962..267e3b47b7 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -8,26 +8,26 @@ vagrant:
   images:
   - centos/7
   - generic/ubuntu1804
-travis_deb:
+docker_deb:
   provisioner: docker
   images:
   - litmusimage/debian:8
   - litmusimage/debian:9
   - litmusimage/debian:10
-travis_ub_6:
+docker_ub_6:
   provisioner: docker
   images:
   - litmusimage/ubuntu:14.04
   - litmusimage/ubuntu:16.04
   - litmusimage/ubuntu:18.04
   - litmusimage/ubuntu:20.04
-travis_el7:
+docker_el7:
   provisioner: docker
   images:
   - litmusimage/centos:7
   - litmusimage/oraclelinux:7
   - litmusimage/scientificlinux:7
-travis_el8:
+docker_el8:
   provisioner: docker
   images:
   - litmusimage/centos:8

From 8acbad42d05ff050ccf9304aff2ccc974db574ff Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Thu, 10 Aug 2023 10:47:46 +0530
Subject: [PATCH 2150/2267] (CAT-1281) - Support to add cipher with respective
 ssl protocol

---
 README.md                    | 17 +++++++++++++++++
 manifests/mod/ssl.pp         |  2 +-
 manifests/vhost.pp           |  2 +-
 spec/classes/mod/ssl_spec.rb | 14 ++++++++++++++
 templates/mod/ssl.conf.erb   |  6 ++++++
 templates/vhost/_ssl.erb     |  4 ++++
 6 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3efeb02d8d..0df2fd1c6b 100644
--- a/README.md
+++ b/README.md
@@ -236,6 +236,7 @@
 [`ssl`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl
 [`ssl_cert`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_cert
 [`ssl_compression`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_compression
+[`ssl_cipher`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_compression
 [`ssl_key`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#ssl_key
 [`StartServers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#startservers
 [supported operating system]: https://forge.puppet.com/supported#puppet-supported-modules-compatibility-matrix
@@ -657,6 +658,22 @@ class { 'apache::mod::ssl':
 }
 ```
 
+You can pass the SSL Ciphers to override the default ciphers.
+```puppet
+class { 'apache::mod::ssl':
+  ssl_cipher => 'PROFILE=SYSTEM',
+}
+```
+
+You can also pass the different [`ssl_cipher`][] for different SSL protocols. This allows you to fine-tune the ciphers based on the specific SSL/TLS protocol version being used. 
+```puppet
+class { 'apache::mod::ssl':
+  ssl_cipher => {
+    'TLSv1.1' => 'RSA:!EXP:!NULL:+HIGH:+MEDIUM'
+  },
+}
+```
+
 Note that some modules have prerequisites, which are documented in their references under [`apache::mod::<MODULE NAME>`][].
 
 #### Installing arbitrary modules
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 83aca77834..1b8f1beca6 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -95,7 +95,7 @@
   Optional[Stdlib::Absolutepath] $ssl_cert                  = undef,
   Optional[Stdlib::Absolutepath] $ssl_key                   = undef,
   Optional[Stdlib::Absolutepath] $ssl_ca                    = undef,
-  String $ssl_cipher                                        = $apache::params::ssl_cipher,
+  Variant[String, Hash[String[1], String[1]]] $ssl_cipher   = $apache::params::ssl_cipher,
   Variant[Boolean, Apache::OnOff] $ssl_honorcipherorder     = true,
   Array[String] $ssl_protocol                               = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ba11a68413..783bd925bb 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1719,7 +1719,7 @@
   Optional[Stdlib::Absolutepath] $ssl_certs_dir                                       = $apache::params::ssl_certs_dir,
   Boolean $ssl_reload_on_change                                                       = $apache::default_ssl_reload_on_change,
   Optional[Variant[Array[String], String]] $ssl_protocol                              = undef,
-  Optional[Variant[Array[String], String]] $ssl_cipher                                = undef,
+  Optional[Variant[Array[String], String, Hash[String[1], String[1]]]] $ssl_cipher   = undef,
   Variant[Boolean, Apache::OnOff, Undef] $ssl_honorcipherorder                        = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client  = undef,
   Optional[Integer] $ssl_verify_depth                                                 = undef,
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
index d54be82016..a424c3ee06 100644
--- a/spec/classes/mod/ssl_spec.rb
+++ b/spec/classes/mod/ssl_spec.rb
@@ -45,6 +45,20 @@
 
         it { is_expected.to contain_file('ssl.conf').without_content(%r{SSLProtocol}) }
       end
+
+      context 'ciphers with ssl_protocol' do
+        let(:params) do
+          {
+            ssl_cipher: {
+              'TLSv1.1' => 'RSA:!EXP:!NULL:+HIGH:+MEDIUM',
+              'TLSv1.2' => 'RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW'
+            }
+          }
+        end
+
+        it { is_expected.to contain_file('ssl.conf').without_content(%r{  SSLCipherSuite TLSv1.1 RSA:!EXP:!NULL:+HIGH:+MEDIUM}) }
+        it { is_expected.to contain_file('ssl.conf').without_content(%r{  SSLCipherSuite TLSv1.2 RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW}) }
+      end
     end
 
     context '7 OS with custom directories for PR#1635' do
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
index 33a4c6feda..6d021f331d 100644
--- a/templates/mod/ssl.conf.erb
+++ b/templates/mod/ssl.conf.erb
@@ -33,7 +33,13 @@
   SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
   SSLStaplingCache "shmcb:<%= @_stapling_cache %>"
+  <%- if @ssl_cipher.kind_of?(Hash) -%>
+    <%- @ssl_cipher.map do |protocol, cipher| -%>
+  SSLCipherSuite <%= protocol %> <%= cipher %>
+    <%- end -%>
+  <%- else -%>
   SSLCipherSuite <%= @ssl_cipher %>
+  <%- end -%>
 <% if not @ssl_protocol.empty? -%>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
 <% end -%>
diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
index 4fed7b9e19..11bcf6d0b6 100644
--- a/templates/vhost/_ssl.erb
+++ b/templates/vhost/_ssl.erb
@@ -15,6 +15,10 @@
   <%- if @ssl_cipher -%>
   <%- if @ssl_cipher.kind_of?(String) -%>
   SSLCipherSuite          <%= @ssl_cipher %>
+  <%- elsif @ssl_cipher.kind_of?(Hash) -%>
+    <%- @ssl_cipher.map do |protocol, cipher| -%>
+  SSLCipherSuite <%= protocol %> <%= cipher%>
+    <%- end -%>
   <%- else -%>
   SSLCipherSuite          <%= @ssl_cipher.flatten.compact.join(':') %>
   <%- end -%>

From 0ceeb04cad81a48233ae5ff62c505cb32403649b Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Fri, 11 Aug 2023 13:51:09 +0530
Subject: [PATCH 2151/2267] Addressing review comments

---
 manifests/mod/ssl.pp | 2 +-
 manifests/vhost.pp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 1b8f1beca6..6dd52013ef 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -95,7 +95,7 @@
   Optional[Stdlib::Absolutepath] $ssl_cert                  = undef,
   Optional[Stdlib::Absolutepath] $ssl_key                   = undef,
   Optional[Stdlib::Absolutepath] $ssl_ca                    = undef,
-  Variant[String, Hash[String[1], String[1]]] $ssl_cipher   = $apache::params::ssl_cipher,
+  Variant[String[1], Hash[String[1], String[1]]] $ssl_cipher   = $apache::params::ssl_cipher,
   Variant[Boolean, Apache::OnOff] $ssl_honorcipherorder     = true,
   Array[String] $ssl_protocol                               = $apache::params::ssl_protocol,
   Array $ssl_proxy_protocol                                 = [],
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 783bd925bb..160d96f8be 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1719,7 +1719,7 @@
   Optional[Stdlib::Absolutepath] $ssl_certs_dir                                       = $apache::params::ssl_certs_dir,
   Boolean $ssl_reload_on_change                                                       = $apache::default_ssl_reload_on_change,
   Optional[Variant[Array[String], String]] $ssl_protocol                              = undef,
-  Optional[Variant[Array[String], String, Hash[String[1], String[1]]]] $ssl_cipher   = undef,
+  Optional[Variant[Array[String], String[1], Hash[String[1], String[1]]]] $ssl_cipher = undef,
   Variant[Boolean, Apache::OnOff, Undef] $ssl_honorcipherorder                        = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client  = undef,
   Optional[Integer] $ssl_verify_depth                                                 = undef,

From 12ffca650595bc88d94422e10787333bcdda28a3 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Sat, 12 Aug 2023 18:31:00 +0530
Subject: [PATCH 2152/2267] Addressing review comments

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 160d96f8be..3b9bca577d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1719,7 +1719,7 @@
   Optional[Stdlib::Absolutepath] $ssl_certs_dir                                       = $apache::params::ssl_certs_dir,
   Boolean $ssl_reload_on_change                                                       = $apache::default_ssl_reload_on_change,
   Optional[Variant[Array[String], String]] $ssl_protocol                              = undef,
-  Optional[Variant[Array[String], String[1], Hash[String[1], String[1]]]] $ssl_cipher = undef,
+  Optional[Variant[Array[String[1]], String[1], Hash[String[1], String[1]]]] $ssl_cipher = undef,
   Variant[Boolean, Apache::OnOff, Undef] $ssl_honorcipherorder                        = undef,
   Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client  = undef,
   Optional[Integer] $ssl_verify_depth                                                 = undef,

From 0f06f1be0260d635e2be22857b82cb00f588f461 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Fri, 11 Aug 2023 13:42:50 +0530
Subject: [PATCH 2153/2267] (CAT-1283) - Enable forensic module

---
 manifests/default_mods.pp             |  1 +
 manifests/mod/log_forensic.pp         |  9 +++++++++
 spec/classes/mod/log_forensic_spec.rb | 16 ++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 manifests/mod/log_forensic.pp
 create mode 100644 spec/classes/mod/log_forensic_spec.rb

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 42e2a44a5e..7463c0504f 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -125,6 +125,7 @@
     include apache::mod::negotiation
     include apache::mod::setenvif
     include apache::mod::auth_basic
+    include apache::mod::log_forensic
 
     # filter is needed by mod_deflate
     include apache::mod::filter
diff --git a/manifests/mod/log_forensic.pp b/manifests/mod/log_forensic.pp
new file mode 100644
index 0000000000..df0f0dbddf
--- /dev/null
+++ b/manifests/mod/log_forensic.pp
@@ -0,0 +1,9 @@
+# @summary
+#   Installs `mod_log_forensic`
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_log_forensic.html for additional documentation.
+#
+class apache::mod::log_forensic {
+  include apache
+  apache::mod { 'log_forensic': }
+}
diff --git a/spec/classes/mod/log_forensic_spec.rb b/spec/classes/mod/log_forensic_spec.rb
new file mode 100644
index 0000000000..e869a55ba6
--- /dev/null
+++ b/spec/classes/mod/log_forensic_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::log_forensic', type: :class do
+  ['Debian 11', 'RedHat 8'].each do |os|
+    context "on a #{os} OS" do
+      include_examples os
+
+      it { is_expected.to contain_class('apache::params') }
+      it { is_expected.to contain_class('apache::mod::log_forensic') }
+      it { is_expected.to contain_apache__mod('log_forensic') }
+      it { is_expected.to contain_file('log_forensic.load').with_content(%r{LoadModule log_forensic_module}) }
+    end
+  end
+end

From 186c729cdfd04a0f7d4c047fa78ab216c97e10ff Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 18 Aug 2023 14:12:37 +0200
Subject: [PATCH 2154/2267] Raise Puppet lower bound to >= 7.9.0

Similar to eb5b4c04e42c1711ef5d851e493a76ea4420ba63 this module uses
PUP-5704[1] which was only introduced in Puppet 7.9.0.

[1]: https://www.puppet.com/docs/puppet/7/release_notes_puppet.html#enhancements_puppet_x-7-9-0-PUP-5704

Fixes: 8070478d41a8c2f3a912b05904ac77a0b08bbe04 ("(CONT-772) Update metadata.json and Gemfile")
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 6a49d16645..3451c94ea0 100644
--- a/metadata.json
+++ b/metadata.json
@@ -83,7 +83,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 9.0.0"
+      "version_requirement": ">= 7.9.0 < 9.0.0"
     }
   ],
   "description": "Module for Apache configuration",

From 862b10d5459698eb463bd8a046ce6bb69a561e17 Mon Sep 17 00:00:00 2001
From: Malik Parvez <84777619+malikparvez@users.noreply.github.com>
Date: Mon, 4 Sep 2023 10:12:50 +0530
Subject: [PATCH 2155/2267] CAT-1366 : Fix issue url from old jira to github

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 6a49d16645..ae5f7ec688 100644
--- a/metadata.json
+++ b/metadata.json
@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-apache",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
-  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "issues_url": "https://github.com/puppetlabs/puppetlabs-apache/issues",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",

From 3339242f8037eb35e70fbbe264404ae2be543386 Mon Sep 17 00:00:00 2001
From: Malik Parvez <84777619+malikparvez@users.noreply.github.com>
Date: Mon, 4 Sep 2023 10:12:50 +0530
Subject: [PATCH 2156/2267] (CAT-1348)-Conversion of erb to epp templates
 except mod or vhost directory

---
 manifests/confd/no_accf.pp                    |   2 +-
 manifests/fastcgi/server.pp                   |  13 +-
 manifests/init.pp                             |  51 +++++-
 manifests/listen.pp                           |   2 +-
 manifests/namevirtualhost.pp                  |   2 +-
 manifests/params.pp                           |  12 +-
 readmes/README_ja_JP.md                       |   2 +-
 spec/acceptance/apache_parameters_spec.rb     |   8 +-
 spec/classes/apache_spec.rb                   |   4 +-
 .../{fake.conf.erb => fake.conf.epp}          |   0
 .../{no-accf.conf.erb => no-accf.conf.epp}    |   0
 templates/fastcgi/server.epp                  |  24 +++
 templates/httpd.conf.epp                      | 151 ++++++++++++++++++
 templates/httpd.conf.erb                      | 151 ------------------
 templates/{listen.erb => listen.epp}          |   2 +-
 ...amevirtualhost.erb => namevirtualhost.epp} |   2 +-
 .../{ports_header.erb => ports_header.epp}    |   0
 17 files changed, 254 insertions(+), 172 deletions(-)
 rename spec/fixtures/site_apache/templates/{fake.conf.erb => fake.conf.epp} (100%)
 rename templates/confd/{no-accf.conf.erb => no-accf.conf.epp} (100%)
 create mode 100644 templates/fastcgi/server.epp
 create mode 100644 templates/httpd.conf.epp
 delete mode 100644 templates/httpd.conf.erb
 rename templates/{listen.erb => listen.epp} (73%)
 rename templates/{namevirtualhost.erb => namevirtualhost.epp} (77%)
 rename templates/{ports_header.erb => ports_header.epp} (100%)

diff --git a/manifests/confd/no_accf.pp b/manifests/confd/no_accf.pp
index 024a088a96..d4436e3b53 100644
--- a/manifests/confd/no_accf.pp
+++ b/manifests/confd/no_accf.pp
@@ -7,7 +7,7 @@
   file { 'no-accf.conf':
     ensure  => 'file',
     path    => "${apache::confd_dir}/no-accf.conf",
-    content => template('apache/confd/no-accf.conf.erb'),
+    content => epp('apache/confd/no-accf.conf.epp'),
     require => Exec["mkdir ${apache::confd_dir}"],
     before  => File[$apache::confd_dir],
   }
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
index df7e5ce004..7f7900b328 100644
--- a/manifests/fastcgi/server.pp
+++ b/manifests/fastcgi/server.pp
@@ -48,13 +48,24 @@
     $socket = $host
   }
 
+  $parameters = {
+    'timeout'     => $timeout,
+    'flush'       => $flush,
+    'socket'      => $socket,
+    'host'        => $host,
+    'pass_header' => $pass_header,
+    'faux_path'   => $faux_path,
+    'fcgi_alias'  => $fcgi_alias,
+    'file_type'   => $file_type,
+  }
+
   file { "fastcgi-pool-${name}.conf":
     ensure  => file,
     path    => "${apache::confd_dir}/fastcgi-pool-${name}.conf",
     owner   => 'root',
     group   => $apache::params::root_group,
     mode    => $apache::file_mode,
-    content => template('apache/fastcgi/server.erb'),
+    content => epp('apache/fastcgi/server.epp', $parameters),
     require => Exec["mkdir ${apache::confd_dir}"],
     before  => File[$apache::confd_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/init.pp b/manifests/init.pp
index 582b4ddac9..55ef9954e0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -727,7 +727,7 @@
   }
   concat::fragment { 'Apache ports header':
     target  => $ports_file,
-    content => template('apache/ports_header.erb'),
+    content => epp('apache/ports_header.epp'),
   }
 
   if $apache::conf_dir and $apache::params::conf_file {
@@ -782,10 +782,57 @@
     # - $server_signature
     # - $trace_enable
     # - $root_directory_secured
+    $parameters = {
+      'server_tokens'           => $server_tokens,
+      'server_signature'        => $server_signature,
+      'trace_enable'            => $trace_enable,
+      'servername'              => $servername,
+      'server_root'             => $server_root,
+      'serveradmin'             => $serveradmin,
+      'pidfile'                 => $pidfile,
+      'timeout'                 => $timeout,
+      'keepalive'               => $keepalive,
+      'max_keepalive_requests'  => $max_keepalive_requests,
+      'keepalive_timeout'       => $keepalive_timeout,
+      'limitreqfieldsize'       => $limitreqfieldsize,
+      'limitreqfields'          => $limitreqfields,
+      'limitreqline'            => $limitreqline,
+      'http_protocol_options'   => $http_protocol_options,
+      'protocols'               => $protocols,
+      'protocols_honor_order'   => $protocols_honor_order,
+      'user'                    => $user,
+      'group'                   => $group,
+      'root_directory_options'  => $root_directory_options,
+      'root_directory_secured'  => $root_directory_secured,
+      'default_charset'         => $default_charset,
+      'hostname_lookups'        => $hostname_lookups,
+      'error_log'               => $error_log,
+      'logroot'                 => $logroot,
+      'log_level'               => $log_level,
+      'sendfile'                => $sendfile,
+      'allow_encoded_slashes'   => $allow_encoded_slashes,
+      'file_e_tag'              => $file_e_tag,
+      'use_canonical_name'      => $use_canonical_name,
+      'apxs_workaround'         => $apxs_workaround,
+      'mod_load_dir'            => $mod_load_dir,
+      'confd_dir'               => $confd_dir,
+      'vhost_load_dir'          => $vhost_load_dir,
+      'vhost_include_pattern'   => $vhost_include_pattern,
+      'ports_file'              => $ports_file,
+      'log_formats'             => $log_formats,
+      'conf_enabled'            => $conf_enabled,
+      'ldap_verify_server_cert' => $ldap_verify_server_cert,
+      'ldap_trusted_mode'       => $ldap_trusted_mode,
+      'error_documents'         => $error_documents,
+      'error_documents_path'    => $error_documents_path,
+    }
+
+    notice $conf_template
+
     file { "${apache::conf_dir}/${apache::params::conf_file}":
       ensure  => file,
       mode    => $apache::file_mode,
-      content => template($conf_template),
+      content => epp($conf_template, $parameters),
       notify  => Class['Apache::Service'],
       require => [Package['httpd'], Concat[$ports_file]],
     }
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 3eb60baad8..ad9844a09d 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -10,6 +10,6 @@
   # Template uses: $listen_addr_port
   concat::fragment { "Listen ${listen_addr_port}":
     target  => $apache::ports_file,
-    content => template('apache/listen.erb'),
+    content => epp('apache/listen.epp', { 'listen_addr_port' => $listen_addr_port }),
   }
 }
diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp
index 246df53dd8..b2a3d22a67 100644
--- a/manifests/namevirtualhost.pp
+++ b/manifests/namevirtualhost.pp
@@ -10,6 +10,6 @@
   # Template uses: $addr_port
   concat::fragment { "NameVirtualHost ${addr_port}":
     target  => $apache::ports_file,
-    content => template('apache/namevirtualhost.erb'),
+    content => epp('apache/namevirtualhost.epp', { 'addr_port' => $addr_port }),
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index fbdeb0401e..e3c5b14466 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -95,7 +95,7 @@
     $mod_libs             = {
       'nss' => 'libmodnss.so',
     }
-    $conf_template        = 'apache/httpd.conf.erb'
+    $conf_template        = 'apache/httpd.conf.epp'
     $http_protocol_options  = undef
     $keepalive            = 'On'
     $keepalive_timeout    = 15
@@ -231,7 +231,7 @@
         default => 'mod_wsgi_python3.so',
       },
     }
-    $conf_template        = 'apache/httpd.conf.erb'
+    $conf_template        = 'apache/httpd.conf.epp'
     $http_protocol_options  = undef
     $keepalive            = 'On'
     $keepalive_timeout    = 15
@@ -383,7 +383,7 @@
     $mod_libs             = {
       'shib2' => $shib2_lib,
     }
-    $conf_template          = 'apache/httpd.conf.erb'
+    $conf_template          = 'apache/httpd.conf.epp'
     $http_protocol_options  = undef
     $keepalive              = 'On'
     $keepalive_timeout      = 15
@@ -492,7 +492,7 @@
     }
     $mod_libs         = {
     }
-    $conf_template        = 'apache/httpd.conf.erb'
+    $conf_template        = 'apache/httpd.conf.epp'
     $http_protocol_options = undef
     $keepalive            = 'On'
     $keepalive_timeout    = 15
@@ -558,7 +558,7 @@
     }
     $mod_libs         = {
     }
-    $conf_template        = 'apache/httpd.conf.erb'
+    $conf_template        = 'apache/httpd.conf.epp'
     $http_protocol_options = undef
     $keepalive            = 'On'
     $keepalive_timeout    = 15
@@ -633,7 +633,7 @@
       'security'       => '/usr/lib64/apache2/mod_security2.so',
       'php53'          => '/usr/lib64/apache2/mod_php5.so',
     }
-    $conf_template          = 'apache/httpd.conf.erb'
+    $conf_template          = 'apache/httpd.conf.epp'
     $http_protocol_options  = undef
     $keepalive              = 'On'
     $keepalive_timeout      = 15
diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 22fbebcc14..c4731bf1c6 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -883,7 +883,7 @@ Apacheサーバのメイン設定ファイルを置くディレクトリを設
 
 メインのApache設定ファイルで使用される[テンプレート][]を定義します。apacheモジュールは、`conf.d`エントリによりカスタマイズされた最小限の設定ファイルを使用するように設計されているため、このパラメータの変更には潜在的なリスクが伴います。
 
-デフォルト値: `apache/httpd.conf.erb`。
+デフォルト値: `apache/httpd.conf.epp`。
 
 ##### `confd_dir`
 
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index 2e57b32388..27a8d1681e 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -11,7 +11,7 @@
     end
 
     if os[:family] == 'freebsd'
-      describe file("#{apache_hash['confd_dir']}/no-accf.conf.erb") do
+      describe file("#{apache_hash['confd_dir']}/no-accf.conf.epp") do
         it { is_expected.not_to be_file }
       end
     end
@@ -24,7 +24,7 @@
     end
 
     if os[:family] == 'freebsd'
-      describe file("#{apache_hash['confd_dir']}/no-accf.conf.erb") do
+      describe file("#{apache_hash['confd_dir']}/no-accf.conf.epp") do
         it { is_expected.to be_file }
       end
     end
@@ -310,9 +310,9 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
   describe 'conf_template' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }"
+        pp = "class { 'apache': conf_template => 'another/test.conf.epp', service_ensure => stopped }"
         run_shell('mkdir -p /etc/puppetlabs/code/environments/production/modules/another/templates')
-        run_shell("echo 'testcontent' >>  /etc/puppetlabs/code/environments/production/modules/another/templates/test.conf.erb")
+        run_shell("echo 'testcontent' >>  /etc/puppetlabs/code/environments/production/modules/another/templates/test.conf.epp")
         apply_manifest(pp, catch_failures: true)
       end
     end
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
index 336f980c92..f7ff3b7581 100644
--- a/spec/classes/apache_spec.rb
+++ b/spec/classes/apache_spec.rb
@@ -433,7 +433,7 @@
 
     describe 'different templates for httpd.conf with default' do
       let :params do
-        { conf_template: 'apache/httpd.conf.erb' }
+        { conf_template: 'apache/httpd.conf.epp' }
       end
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^# Security\n} }
@@ -441,7 +441,7 @@
 
     describe 'different templates for httpd.conf with non-default' do
       let :params do
-        { conf_template: 'site_apache/fake.conf.erb' }
+        { conf_template: 'site_apache/fake.conf.epp' }
       end
 
       it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Fake template for rspec.$} }
diff --git a/spec/fixtures/site_apache/templates/fake.conf.erb b/spec/fixtures/site_apache/templates/fake.conf.epp
similarity index 100%
rename from spec/fixtures/site_apache/templates/fake.conf.erb
rename to spec/fixtures/site_apache/templates/fake.conf.epp
diff --git a/templates/confd/no-accf.conf.erb b/templates/confd/no-accf.conf.epp
similarity index 100%
rename from templates/confd/no-accf.conf.erb
rename to templates/confd/no-accf.conf.epp
diff --git a/templates/fastcgi/server.epp b/templates/fastcgi/server.epp
new file mode 100644
index 0000000000..50bd052a2f
--- /dev/null
+++ b/templates/fastcgi/server.epp
@@ -0,0 +1,24 @@
+<%
+  $timeout_updated = " -idle-timeout #{$timeout}"
+
+  if $flush {
+    $flush_updated = " -flush"
+  } else {
+    $flush_updated = ""
+  }    
+  if $socket {
+    $host_or_socket = " -socket #{$socket}"
+  } else {
+    $host_or_socket = " -host #{$host}"
+  }    
+  if $pass_header and !$pass_header.empty {
+    $pass_header_updated = " -pass-header #{$pass_header}"
+  } else {
+    $pass_header_updated = ""
+  }
+    
+  $options = $timeout_updated + $flush_updated + $host_or_socket + $pass_header_updated
+-%>
+FastCGIExternalServer <%= $faux_path %><%= $options %>
+Alias <%= $fcgi_alias %> <%= $faux_path %>
+Action <%= $file_type %> <%= $fcgi_alias %>
diff --git a/templates/httpd.conf.epp b/templates/httpd.conf.epp
new file mode 100644
index 0000000000..53d7e8ab2c
--- /dev/null
+++ b/templates/httpd.conf.epp
@@ -0,0 +1,151 @@
+# Security
+ServerTokens <%= $server_tokens %>
+ServerSignature <%= apache::bool2httpd($server_signature) %>
+TraceEnable <%= apache::bool2httpd($trace_enable) %>
+
+ServerName "<%= $servername %>"
+ServerRoot "<%= $server_root %>"
+<%- if $serveradmin { -%>
+ServerAdmin <%= $serveradmin %>
+<%- } -%>
+PidFile <%= $pidfile %>
+Timeout <%= $timeout %>
+KeepAlive <%= $keepalive %>
+MaxKeepAliveRequests <%= $max_keepalive_requests %>
+KeepAliveTimeout <%= $keepalive_timeout %>
+LimitRequestFieldSize <%= $limitreqfieldsize %>
+LimitRequestFields <%= $limitreqfields %>
+<% if $limitreqline { -%>
+LimitRequestLine <%= $limitreqline %>
+<% } -%>
+<%- if $http_protocol_options { -%>
+HttpProtocolOptions <%= $http_protocol_options %>
+<%- } -%>
+
+<%- unless $protocols.empty { -%>
+Protocols <%= $protocols.join(' ') %>
+<%- } -%>
+<%- if $protocols_honor_order { -%>
+ProtocolsHonorOrder <%= apache::bool2httpd($protocols_honor_order) %>
+<%- } -%>
+
+User <%= $user %>
+Group <%= $group %>
+
+AccessFileName .htaccess
+<FilesMatch "^\.ht">
+    Require all denied
+</FilesMatch>
+
+<Directory />
+  Options <%= Array($root_directory_options).join(' ') %>
+  AllowOverride None
+<%- if $root_directory_secured { -%>
+  Require all denied
+<%- } -%>
+</Directory>
+
+<% if $default_charset { -%>
+AddDefaultCharset <%= $default_charset %>
+<% } -%>
+
+HostnameLookups <%= $hostname_lookups %>
+<%- if $error_log.match(/^[|\/]/) or $error_log.match(/^syslog:/) { -%>
+ErrorLog "<%= $error_log %>"
+<%- }else { -%>
+ErrorLog "<%= $logroot %>/<%= $error_log %>"
+<% } -%>
+LogLevel <%= $log_level %>
+EnableSendfile <%= $sendfile %>
+<%- if $allow_encoded_slashes { -%>
+AllowEncodedSlashes <%= $allow_encoded_slashes %>
+<%- } -%>
+<%- if $file_e_tag { -%>
+FileETag <%= $file_e_tag %>
+<%- } -%>
+<%- if $use_canonical_name { -%>
+UseCanonicalName <%= $use_canonical_name %>
+<%- } -%>
+
+#Listen 80
+
+<% if $apxs_workaround { -%>
+# Workaround: without this hack apxs would be confused about where to put
+# LoadModule directives and fail entire procedure of apache package
+# installation/reinstallation. This problem was observed on FreeBSD (apache22).
+#LoadModule fake_module libexec/apache22/mod_fake.so
+<% } -%>
+
+Include "<%= $mod_load_dir %>/*.load"
+<% if $mod_load_dir != $confd_dir and $mod_load_dir != $vhost_load_dir { -%>
+Include "<%= $mod_load_dir %>/*.conf"
+<% } -%>
+Include "<%= $ports_file %>"
+
+<% unless $log_formats['combined'] { -%>
+LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+<% } -%>
+<% unless $log_formats['common'] { -%>
+LogFormat "%a %l %u %t \"%r\" %>s %b" common
+<% } -%>
+<% unless $log_formats['referer'] { -%>
+LogFormat "%{Referer}i -> %U" referer
+<% } -%>
+<% unless $log_formats['agent'] { -%>
+LogFormat "%{User-agent}i" agent
+<% } -%>
+<% unless $log_formats['forwarded'] { -%>
+LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
+<% } -%>
+<% if $log_formats and !$log_formats.empty { -%>
+  <%- $log_formats.convert_to(Array).sort.each |$values| { -%>
+LogFormat "<%= $values[1] -%>" <%= $values[0] %>
+  <%- } -%>
+<% } -%>
+
+<%- if $conf_enabled { -%>
+IncludeOptional "<%= $conf_enabled %>/*.conf"
+<%- } -%>
+IncludeOptional "<%= $confd_dir %>/*.conf"
+<% if $vhost_load_dir != $confd_dir { -%>
+IncludeOptional "<%= $vhost_load_dir %>/<%= $vhost_include_pattern %>"
+<% } -%>
+<% if $ldap_verify_server_cert { -%>
+LDAPVerifyServerCert <%= $ldap_verify_server_cert %>
+<% } -%>
+<% if $ldap_trusted_mode { -%>
+LDAPTrustedMode <%= $ldap_trusted_mode %>
+<% } -%>
+
+<% if $error_documents { -%>
+# /usr/share/apache2/error on debian
+Alias /error/ "<%=$error_documents_path %>/"
+
+<Directory "<%= $error_documents_path %>">
+  AllowOverride None
+  Options IncludesNoExec
+  AddOutputFilter Includes html
+  AddHandler type-map var
+  Require all granted
+  LanguagePriority en cs de es fr it nl sv pt-br ro
+  ForceLanguagePriority Prefer Fallback
+</Directory>
+
+ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+ErrorDocument 410 /error/HTTP_GONE.html.var
+ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+<% } -%>
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
deleted file mode 100644
index 4a26d41a73..0000000000
--- a/templates/httpd.conf.erb
+++ /dev/null
@@ -1,151 +0,0 @@
-# Security
-ServerTokens <%= @server_tokens %>
-ServerSignature <%= scope.call_function('apache::bool2httpd', [@server_signature]) %>
-TraceEnable <%= scope.call_function('apache::bool2httpd', [@trace_enable]) %>
-
-ServerName "<%= @servername %>"
-ServerRoot "<%= @server_root %>"
-<%- if @serveradmin -%>
-ServerAdmin <%= @serveradmin %>
-<%- end -%>
-PidFile <%= @pidfile %>
-Timeout <%= @timeout %>
-KeepAlive <%= @keepalive %>
-MaxKeepAliveRequests <%= @max_keepalive_requests %>
-KeepAliveTimeout <%= @keepalive_timeout %>
-LimitRequestFieldSize <%= @limitreqfieldsize %>
-LimitRequestFields <%= @limitreqfields %>
-<% if @limitreqline -%>
-LimitRequestLine <%= @limitreqline %>
-<% end -%>
-<%- if @http_protocol_options -%>
-HttpProtocolOptions <%= @http_protocol_options %>
-<%- end -%>
-
-<%- unless @protocols.empty? -%>
-Protocols <%= @protocols.join(' ') %>
-<%- end -%>
-<%- unless @protocols_honor_order.nil? -%>
-ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %>
-<%- end -%>
-
-User <%= @user %>
-Group <%= @group %>
-
-AccessFileName .htaccess
-<FilesMatch "^\.ht">
-    Require all denied
-</FilesMatch>
-
-<Directory />
-  Options <%= Array(@root_directory_options).join(' ') %>
-  AllowOverride None
-<%- if @root_directory_secured -%>
-  Require all denied
-<%- end -%>
-</Directory>
-
-<% if @default_charset -%>
-AddDefaultCharset <%= @default_charset %>
-<% end -%>
-
-HostnameLookups <%= @hostname_lookups %>
-<%- if /^[|\/]/.match(@error_log) || /^syslog:/.match(@error_log) -%>
-ErrorLog "<%= @error_log %>"
-<%- else -%>
-ErrorLog "<%= @logroot %>/<%= @error_log %>"
-<%- end -%>
-LogLevel <%= @log_level %>
-EnableSendfile <%= @sendfile %>
-<%- if @allow_encoded_slashes -%>
-AllowEncodedSlashes <%= @allow_encoded_slashes %>
-<%- end -%>
-<%- if @file_e_tag -%>
-FileETag <%= @file_e_tag %>
-<%- end -%>
-<%- if @use_canonical_name -%>
-UseCanonicalName <%= @use_canonical_name %>
-<%- end -%>
-
-#Listen 80
-
-<% if @apxs_workaround -%>
-# Workaround: without this hack apxs would be confused about where to put
-# LoadModule directives and fail entire procedure of apache package
-# installation/reinstallation. This problem was observed on FreeBSD (apache22).
-#LoadModule fake_module libexec/apache22/mod_fake.so
-<% end -%>
-
-Include "<%= @mod_load_dir %>/*.load"
-<% if @mod_load_dir != @confd_dir and @mod_load_dir != @vhost_load_dir -%>
-Include "<%= @mod_load_dir %>/*.conf"
-<% end -%>
-Include "<%= @ports_file %>"
-
-<% unless @log_formats.has_key?('combined') -%>
-LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-<% end -%>
-<% unless @log_formats.has_key?('common') -%>
-LogFormat "%a %l %u %t \"%r\" %>s %b" common
-<% end -%>
-<% unless @log_formats.has_key?('referer') -%>
-LogFormat "%{Referer}i -> %U" referer
-<% end -%>
-<% unless @log_formats.has_key?('agent') -%>
-LogFormat "%{User-agent}i" agent
-<% end -%>
-<% unless @log_formats.has_key?('forwarded') -%>
-LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
-<% end -%>
-<% if @log_formats and !@log_formats.empty? -%>
-  <%- @log_formats.sort.each do |nickname,format| -%>
-LogFormat "<%= format -%>" <%= nickname %>
-  <%- end -%>
-<% end -%>
-
-<%- if @conf_enabled -%>
-IncludeOptional "<%= @conf_enabled %>/*.conf"
-<%- end -%>
-IncludeOptional "<%= @confd_dir %>/*.conf"
-<% if @vhost_load_dir != @confd_dir -%>
-IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
-<% end -%>
-<% if @ldap_verify_server_cert -%>
-LDAPVerifyServerCert <%= @ldap_verify_server_cert %>
-<% end -%>
-<% if @ldap_trusted_mode -%>
-LDAPTrustedMode <%= @ldap_trusted_mode %>
-<% end -%>
-
-<% if @error_documents -%>
-# /usr/share/apache2/error on debian
-Alias /error/ "<%= @error_documents_path %>/"
-
-<Directory "<%= @error_documents_path %>">
-  AllowOverride None
-  Options IncludesNoExec
-  AddOutputFilter Includes html
-  AddHandler type-map var
-  Require all granted
-  LanguagePriority en cs de es fr it nl sv pt-br ro
-  ForceLanguagePriority Prefer Fallback
-</Directory>
-
-ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-ErrorDocument 410 /error/HTTP_GONE.html.var
-ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-<% end -%>
diff --git a/templates/listen.erb b/templates/listen.epp
similarity index 73%
rename from templates/listen.erb
rename to templates/listen.epp
index 8fc871b0ad..5b9035ae7e 100644
--- a/templates/listen.erb
+++ b/templates/listen.epp
@@ -3,4 +3,4 @@
   - <ipv4>:<port>
   - [<ipv6]:<port>
 -%>
-Listen <%= @listen_addr_port %>
+Listen <%= $listen_addr_port %>
diff --git a/templates/namevirtualhost.erb b/templates/namevirtualhost.epp
similarity index 77%
rename from templates/namevirtualhost.erb
rename to templates/namevirtualhost.epp
index cf767680fc..2cd7631ee0 100644
--- a/templates/namevirtualhost.erb
+++ b/templates/namevirtualhost.epp
@@ -5,4 +5,4 @@
   - <ip>
   - <ip>:<port>
 -%>
-NameVirtualHost <%= @addr_port %>
+NameVirtualHost <%= $addr_port %>
diff --git a/templates/ports_header.erb b/templates/ports_header.epp
similarity index 100%
rename from templates/ports_header.erb
rename to templates/ports_header.epp

From 66b0584c00a74688940a6f2c05ae01020465aece Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Thu, 7 Sep 2023 13:40:02 +0530
Subject: [PATCH 2157/2267] CAT-1285 - RHEL-8 mode security CRS fix

---
 manifests/params.pp                  | 157 +++++++++++++++++++--------
 spec/acceptance/mod_security_spec.rb |  31 ++++++
 spec/classes/mod/security_spec.rb    |  25 +++--
 spec/defines/modsec_link_spec.rb     |  21 +++-
 4 files changed, 175 insertions(+), 59 deletions(-)
 create mode 100644 spec/acceptance/mod_security_spec.rb

diff --git a/manifests/params.pp b/manifests/params.pp
index e3c5b14466..9e3478c244 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -116,33 +116,40 @@
     $mellon_post_directory = undef
     $modsec_version       = 1
     $modsec_crs_package   = 'mod_security_crs'
-    $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
     $secpcrematchlimit = 1500
     $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
-    $modsec_default_rules = [
-      'base_rules/modsecurity_35_bad_robots.data',
-      'base_rules/modsecurity_35_scanners.data',
-      'base_rules/modsecurity_40_generic_attacks.data',
-      'base_rules/modsecurity_50_outbound.data',
-      'base_rules/modsecurity_50_outbound_malware.data',
-      'base_rules/modsecurity_crs_20_protocol_violations.conf',
-      'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
-      'base_rules/modsecurity_crs_23_request_limits.conf',
-      'base_rules/modsecurity_crs_30_http_policy.conf',
-      'base_rules/modsecurity_crs_35_bad_robots.conf',
-      'base_rules/modsecurity_crs_40_generic_attacks.conf',
-      'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
-      'base_rules/modsecurity_crs_41_xss_attacks.conf',
-      'base_rules/modsecurity_crs_42_tight_security.conf',
-      'base_rules/modsecurity_crs_45_trojans.conf',
-      'base_rules/modsecurity_crs_47_common_exceptions.conf',
-      'base_rules/modsecurity_crs_49_inbound_blocking.conf',
-      'base_rules/modsecurity_crs_50_outbound.conf',
-      'base_rules/modsecurity_crs_59_outbound_blocking.conf',
-      'base_rules/modsecurity_crs_60_correlation.conf',
-    ]
+    if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '7') <= 0 {
+      $modsec_crs_path      = '/usr/lib/modsecurity.d'
+      $modsec_default_rules = [
+        'base_rules/modsecurity_35_bad_robots.data',
+        'base_rules/modsecurity_35_scanners.data',
+        'base_rules/modsecurity_40_generic_attacks.data',
+        'base_rules/modsecurity_50_outbound.data',
+        'base_rules/modsecurity_50_outbound_malware.data',
+        'base_rules/modsecurity_crs_20_protocol_violations.conf',
+        'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
+        'base_rules/modsecurity_crs_23_request_limits.conf',
+        'base_rules/modsecurity_crs_30_http_policy.conf',
+        'base_rules/modsecurity_crs_35_bad_robots.conf',
+        'base_rules/modsecurity_crs_40_generic_attacks.conf',
+        'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
+        'base_rules/modsecurity_crs_41_xss_attacks.conf',
+        'base_rules/modsecurity_crs_42_tight_security.conf',
+        'base_rules/modsecurity_crs_45_trojans.conf',
+        'base_rules/modsecurity_crs_47_common_exceptions.conf',
+        'base_rules/modsecurity_crs_49_inbound_blocking.conf',
+        'base_rules/modsecurity_crs_50_outbound.conf',
+        'base_rules/modsecurity_crs_59_outbound_blocking.conf',
+        'base_rules/modsecurity_crs_60_correlation.conf',
+      ]
+    } else {
+      $modsec_crs_path      = '/usr/share/mod_modsecurity_crs'
+      $modsec_default_rules = [
+        'rules/crawlers-user-agents.data',
+      ]
+    }
     $error_log           = 'error_log'
     $scriptalias         = "${httpd_root}/var/www/cgi-bin"
     $access_log_file     = 'access_log'
@@ -252,33 +259,91 @@
     $mellon_post_directory = undef
     $modsec_version       = 1
     $modsec_crs_package   = 'mod_security_crs'
-    $modsec_crs_path      = '/usr/lib/modsecurity.d'
     $modsec_dir           = '/etc/httpd/modsecurity.d'
     $secpcrematchlimit = 1500
     $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
-    $modsec_default_rules = [
-      'base_rules/modsecurity_35_bad_robots.data',
-      'base_rules/modsecurity_35_scanners.data',
-      'base_rules/modsecurity_40_generic_attacks.data',
-      'base_rules/modsecurity_50_outbound.data',
-      'base_rules/modsecurity_50_outbound_malware.data',
-      'base_rules/modsecurity_crs_20_protocol_violations.conf',
-      'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
-      'base_rules/modsecurity_crs_23_request_limits.conf',
-      'base_rules/modsecurity_crs_30_http_policy.conf',
-      'base_rules/modsecurity_crs_35_bad_robots.conf',
-      'base_rules/modsecurity_crs_40_generic_attacks.conf',
-      'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
-      'base_rules/modsecurity_crs_41_xss_attacks.conf',
-      'base_rules/modsecurity_crs_42_tight_security.conf',
-      'base_rules/modsecurity_crs_45_trojans.conf',
-      'base_rules/modsecurity_crs_47_common_exceptions.conf',
-      'base_rules/modsecurity_crs_49_inbound_blocking.conf',
-      'base_rules/modsecurity_crs_50_outbound.conf',
-      'base_rules/modsecurity_crs_59_outbound_blocking.conf',
-      'base_rules/modsecurity_crs_60_correlation.conf',
-    ]
+    if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '7') <= 0 {
+      $modsec_crs_path      = '/usr/lib/modsecurity.d'
+      $modsec_default_rules = [
+        'base_rules/modsecurity_35_bad_robots.data',
+        'base_rules/modsecurity_35_scanners.data',
+        'base_rules/modsecurity_40_generic_attacks.data',
+        'base_rules/modsecurity_50_outbound.data',
+        'base_rules/modsecurity_50_outbound_malware.data',
+        'base_rules/modsecurity_crs_20_protocol_violations.conf',
+        'base_rules/modsecurity_crs_21_protocol_anomalies.conf',
+        'base_rules/modsecurity_crs_23_request_limits.conf',
+        'base_rules/modsecurity_crs_30_http_policy.conf',
+        'base_rules/modsecurity_crs_35_bad_robots.conf',
+        'base_rules/modsecurity_crs_40_generic_attacks.conf',
+        'base_rules/modsecurity_crs_41_sql_injection_attacks.conf',
+        'base_rules/modsecurity_crs_41_xss_attacks.conf',
+        'base_rules/modsecurity_crs_42_tight_security.conf',
+        'base_rules/modsecurity_crs_45_trojans.conf',
+        'base_rules/modsecurity_crs_47_common_exceptions.conf',
+        'base_rules/modsecurity_crs_49_inbound_blocking.conf',
+        'base_rules/modsecurity_crs_50_outbound.conf',
+        'base_rules/modsecurity_crs_59_outbound_blocking.conf',
+        'base_rules/modsecurity_crs_60_correlation.conf',
+      ]
+    } else {
+      $modsec_crs_path      = '/usr/share/mod_modsecurity_crs'
+      $modsec_default_rules = [
+        'rules/crawlers-user-agents.data',
+        'rules/iis-errors.data',
+        'rules/java-classes.data',
+        'rules/java-code-leakages.data',
+        'rules/java-errors.data',
+        'rules/lfi-os-files.data',
+        'rules/php-config-directives.data',
+        'rules/php-errors.data',
+        'rules/php-function-names-933150.data',
+        'rules/php-function-names-933151.data',
+        'rules/php-variables.data',
+        'rules/REQUEST-901-INITIALIZATION.conf',
+        'rules/REQUEST-903.9001-DRUPAL-EXCLUSION-RULES.conf',
+        'rules/REQUEST-903.9002-WORDPRESS-EXCLUSION-RULES.conf',
+        'rules/REQUEST-903.9003-NEXTCLOUD-EXCLUSION-RULES.conf',
+        'rules/REQUEST-903.9004-DOKUWIKI-EXCLUSION-RULES.conf',
+        'rules/REQUEST-903.9005-CPANEL-EXCLUSION-RULES.conf',
+        'rules/REQUEST-903.9006-XENFORO-EXCLUSION-RULES.conf',
+        'rules/REQUEST-905-COMMON-EXCEPTIONS.conf',
+        'rules/REQUEST-910-IP-REPUTATION.conf',
+        'rules/REQUEST-911-METHOD-ENFORCEMENT.conf',
+        'rules/REQUEST-912-DOS-PROTECTION.conf',
+        'rules/REQUEST-913-SCANNER-DETECTION.conf',
+        'rules/REQUEST-920-PROTOCOL-ENFORCEMENT.conf',
+        'rules/REQUEST-921-PROTOCOL-ATTACK.conf',
+        'rules/REQUEST-922-MULTIPART-ATTACK.conf',
+        'rules/REQUEST-930-APPLICATION-ATTACK-LFI.conf',
+        'rules/REQUEST-931-APPLICATION-ATTACK-RFI.conf',
+        'rules/REQUEST-932-APPLICATION-ATTACK-RCE.conf',
+        'rules/REQUEST-933-APPLICATION-ATTACK-PHP.conf',
+        'rules/REQUEST-934-APPLICATION-ATTACK-NODEJS.conf',
+        'rules/REQUEST-941-APPLICATION-ATTACK-XSS.conf',
+        'rules/REQUEST-942-APPLICATION-ATTACK-SQLI.conf',
+        'rules/REQUEST-943-APPLICATION-ATTACK-SESSION-FIXATION.conf',
+        'rules/REQUEST-944-APPLICATION-ATTACK-JAVA.conf',
+        'rules/REQUEST-949-BLOCKING-EVALUATION.conf',
+        'rules/RESPONSE-950-DATA-LEAKAGES.conf',
+        'rules/RESPONSE-951-DATA-LEAKAGES-SQL.conf',
+        'rules/RESPONSE-952-DATA-LEAKAGES-JAVA.conf',
+        'rules/RESPONSE-953-DATA-LEAKAGES-PHP.conf',
+        'rules/RESPONSE-954-DATA-LEAKAGES-IIS.conf',
+        'rules/RESPONSE-959-BLOCKING-EVALUATION.conf',
+        'rules/RESPONSE-980-CORRELATION.conf',
+        'rules/restricted-files.data',
+        'rules/restricted-upload.data',
+        'rules/scanners-headers.data',
+        'rules/scanners-urls.data',
+        'rules/scanners-user-agents.data',
+        'rules/scripting-user-agents.data',
+        'rules/sql-errors.data',
+        'rules/unix-shell.data',
+        'rules/windows-powershell-commands.data',
+      ]
+    }
     $error_log           = 'error_log'
     $scriptalias         = '/var/www/cgi-bin'
     $access_log_file     = 'access_log'
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
new file mode 100644
index 0000000000..dedab8e505
--- /dev/null
+++ b/spec/acceptance/mod_security_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper_acceptance'
+apache_hash = apache_settings_hash
+
+describe 'apache::mod::security class', if: mod_supported_on_platform?('apache::mod::security') do
+  context 'default mod security config' do
+    pp = <<-MANIFEST
+        class { 'apache': }
+        class { 'apache::mod::security': }
+    MANIFEST
+    it 'succeeds in puppeting mod security' do
+      apply_manifest(pp, catch_failures: true)
+    end
+  end
+
+  context 'with vhost config' do
+    pp = <<-MANIFEST
+        class { 'apache': }
+        class { 'apache::mod::security': }
+        apache::vhost { 'modsecurity.example.com':
+          port    => 80,
+          docroot => '#{apache_hash['doc_root']}',
+        }
+        host { 'modsecurity.example.com': ip => '127.0.0.1', }
+    MANIFEST
+    it 'succeeds in puppeting mod security' do
+      apply_manifest(pp, catch_failures: true)
+    end
+  end
+end
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index cd01d3a067..b6d34663bd 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -73,14 +73,25 @@
             )
           }
 
-          it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
+          if facts[:os]['release']['major'].to_i <= 7
+            it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
 
-          it {
-            expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
-              path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
-              target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
-            )
-          }
+            it {
+              expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
+                path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+                target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
+              )
+            }
+          else
+            it { is_expected.to contain_apache__security__rule_link('rules/crawlers-user-agents.data') }
+
+            it {
+              expect(subject).to contain_file('crawlers-user-agents.data').with(
+                path: '/etc/httpd/modsecurity.d/activated_rules/crawlers-user-agents.data',
+                target: '/usr/share/mod_modsecurity_crs/rules/crawlers-user-agents.data',
+              )
+            }
+          end
 
           describe 'with parameters' do
             let :params do
diff --git a/spec/defines/modsec_link_spec.rb b/spec/defines/modsec_link_spec.rb
index ec9f161e7a..6671790590 100644
--- a/spec/defines/modsec_link_spec.rb
+++ b/spec/defines/modsec_link_spec.rb
@@ -23,12 +23,21 @@ class { "apache::mod::security": activated_rules => [] }
 
       case facts[:os]['family']
       when 'RedHat'
-        it {
-          expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
-            path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
-            target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
-          )
-        }
+        if facts[:os]['release']['major'].to_i <= 7
+          it {
+            expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
+              path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+              target: '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data',
+            )
+          }
+        else
+          it {
+            expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
+              path: '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data',
+              target: '/usr/share/mod_modsecurity_crs/base_rules/modsecurity_35_bad_robots.data',
+            )
+          }
+        end
       when 'Debian'
         it {
           expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(

From df6862a512f7b0ea0b551da97b2e3aca5762d441 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 12 Sep 2023 14:09:01 +0200
Subject: [PATCH 2158/2267] Simplify data types and array handling

The type Stdlib::Host includes Stdlib::IP::Address, so the variant is
redundant. There's also no way to pass nested arrays so flatten is not
needed.
---
 manifests/mod/remoteip.pp       |  6 +++---
 templates/mod/remoteip.conf.epp | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index e20eec5def..f110630938 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -51,12 +51,12 @@
 #
 class apache::mod::remoteip (
   String                                                     $header                    = 'X-Forwarded-For',
-  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $internal_proxy            = undef,
-  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $proxy_ips                 = undef,
+  Optional[Array[Stdlib::IP::Address]]                       $internal_proxy            = undef,
+  Optional[Array[Stdlib::IP::Address]]                       $proxy_ips                 = undef,
   Optional[Stdlib::Absolutepath]                             $internal_proxy_list       = undef,
   Optional[String]                                           $proxies_header            = undef,
   Boolean                                                    $proxy_protocol            = false,
-  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $proxy_protocol_exceptions = undef,
+  Optional[Array[Stdlib::IP::Address]]                       $proxy_protocol_exceptions = undef,
   Optional[Array[Stdlib::Host]]                              $trusted_proxy             = undef,
   Optional[Array[Stdlib::Host]]                              $trusted_proxy_ips         = undef,
   Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,
diff --git a/templates/mod/remoteip.conf.epp b/templates/mod/remoteip.conf.epp
index 6f47939793..439de12f68 100644
--- a/templates/mod/remoteip.conf.epp
+++ b/templates/mod/remoteip.conf.epp
@@ -1,10 +1,10 @@
 <%- |
   String                                                     $header,
-  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $internal_proxy            = undef,
+  Optional[Array[Stdlib::Host]]                              $internal_proxy            = undef,
   Optional[Stdlib::Absolutepath]                             $internal_proxy_list       = undef,
   Optional[String]                                           $proxies_header            = undef,
   Boolean                                                    $proxy_protocol            = undef,
-  Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $proxy_protocol_exceptions = undef,
+  Optional[Array[Stdlib::Host]]                              $proxy_protocol_exceptions = undef,
   Optional[Array[Stdlib::IP::Address]]                       $trusted_proxy             = undef,
   Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,
 | -%>
@@ -14,7 +14,7 @@ RemoteIPHeader <%= $header %>
 <%- if $internal_proxy { -%>
 # Declare client intranet IP addresses trusted to present
 # the RemoteIPHeader value
-<%-   [$internal_proxy].flatten.each |$proxy| { -%>
+<%-   $internal_proxy.each |$proxy| { -%>
 RemoteIPInternalProxy <%= $proxy %>
 <%-   } -%>
 <%- } -%>
@@ -33,7 +33,7 @@ RemoteIPProxyProtocol On
 <%- } -%>
 
 <%- if $proxy_protocol_exceptions { -%>
-<%-   [$proxy_protocol_exceptions].flatten.each |$exception| { -%>
+<%-   $proxy_protocol_exceptions.each |$exception| { -%>
 RemoteIPProxyProtocolExceptions <%= $exception %>
 <%-   } -%>
 <%- } -%>
@@ -41,7 +41,7 @@ RemoteIPProxyProtocolExceptions <%= $exception %>
 <%- if $trusted_proxy { -%>
 # Declare client intranet IP addresses trusted to present
 # the RemoteIPHeader value
-  <%- [$trusted_proxy].flatten.each |$proxy| { -%>
+  <%- $trusted_proxy.each |$proxy| { -%>
 RemoteIPTrustedProxy <%= $proxy %>
   <%- } -%>
 <%- } -%>

From d420ce76879d07600e6efdee68cf7901a9439707 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 12 Sep 2023 19:09:11 +0200
Subject: [PATCH 2159/2267] Fix remoteip data types

Fixes: df6862a512f7b0ea0b551da97b2e3aca5762d441 ("Simplify data types and array handling")
---
 manifests/mod/remoteip.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/remoteip.pp b/manifests/mod/remoteip.pp
index f110630938..9435e00f20 100644
--- a/manifests/mod/remoteip.pp
+++ b/manifests/mod/remoteip.pp
@@ -51,12 +51,12 @@
 #
 class apache::mod::remoteip (
   String                                                     $header                    = 'X-Forwarded-For',
-  Optional[Array[Stdlib::IP::Address]]                       $internal_proxy            = undef,
-  Optional[Array[Stdlib::IP::Address]]                       $proxy_ips                 = undef,
+  Optional[Array[Stdlib::Host]]                              $internal_proxy            = undef,
+  Optional[Array[Stdlib::Host]]                              $proxy_ips                 = undef,
   Optional[Stdlib::Absolutepath]                             $internal_proxy_list       = undef,
   Optional[String]                                           $proxies_header            = undef,
   Boolean                                                    $proxy_protocol            = false,
-  Optional[Array[Stdlib::IP::Address]]                       $proxy_protocol_exceptions = undef,
+  Optional[Array[Stdlib::Host]]                              $proxy_protocol_exceptions = undef,
   Optional[Array[Stdlib::Host]]                              $trusted_proxy             = undef,
   Optional[Array[Stdlib::Host]]                              $trusted_proxy_ips         = undef,
   Optional[Stdlib::Absolutepath]                             $trusted_proxy_list        = undef,

From 6df36dfcd7308be4a35225450b28d75613d90011 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Wed, 13 Sep 2023 08:41:12 +0530
Subject: [PATCH 2160/2267] (CAT-1308) Improving documentation for default mods
 override

---
 REFERENCE.md              | 11 +++++++++--
 manifests/default_mods.pp |  6 +++---
 manifests/init.pp         |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 517d707b54..b758385acf 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -346,7 +346,7 @@ Default value: `true`
 
 ##### <a name="-apache--default_mods"></a>`default_mods`
 
-Data type: `Variant[Array, Boolean]`
+Data type: `Variant[Array[String[1]], Boolean]`
 
 Determines whether to configure and enable a set of default Apache modules depending on
 your operating system.<br />
@@ -356,7 +356,14 @@ on your operating system, and you can declare any other modules separately using
 If `true`, Puppet installs additional modules, depending on the operating system and
 the value of the `mpm_module` parameter. Because these lists of
 modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
-If this parameter contains an array, Puppet instead enables all passed Apache modules.
+If this parameter contains an array, Puppet will enable all the Apache modules passed in it.
+Passing the values as an array of strings provides the flexibility to override the default mods and install modules defined in `$default_mods`.
+For example, with array of string:<br />
+```puppet
+class { 'apache':
+  default_mods => ['cache', 'info', 'mime_magic']
+}
+```
 
 Default value: `true`
 
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 7463c0504f..40a69bc89a 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -3,9 +3,9 @@
 #
 # @api private
 class apache::default_mods (
-  Boolean $all                                   = true,
-  Optional[Variant[Array[String], String]] $mods = undef,
-  Boolean $use_systemd                           = $apache::use_systemd,
+  Boolean $all                                         = true,
+  Optional[Variant[Array[String[1]], String[1]]] $mods = undef,
+  Boolean $use_systemd                                 = $apache::use_systemd,
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
diff --git a/manifests/init.pp b/manifests/init.pp
index 55ef9954e0..dc23d7ab68 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -459,7 +459,7 @@
 class apache (
   String $apache_name                                                        = $apache::params::apache_name,
   String $service_name                                                       = $apache::params::service_name,
-  Variant[Array, Boolean] $default_mods                                      = true,
+  Variant[Array[String[1]], Boolean] $default_mods                           = true,
   Boolean $default_vhost                                                     = true,
   Optional[String] $default_charset                                          = undef,
   Boolean $default_confd_files                                               = true,

From f3af13f5019f320b1e51897102e59a628871759a Mon Sep 17 00:00:00 2001
From: mxwasilewski <Marcin.Wasilewski@IGT.com>
Date: Fri, 24 Mar 2023 16:16:53 +0100
Subject: [PATCH 2161/2267] strickter loglevel syntax verification

---
 spec/type_aliases/loglevel_spec.rb | 2 ++
 types/loglevel.pp                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb
index 265ecc8e61..4307ad8ce2 100644
--- a/spec/type_aliases/loglevel_spec.rb
+++ b/spec/type_aliases/loglevel_spec.rb
@@ -10,6 +10,7 @@
     'warn mod_ssl.c:info',
     'warn ssl_module:info',
     'trace4',
+    'ssl:info',
   ].each do |allowed_value|
     it { is_expected.to allow_value(allowed_value) }
   end
@@ -19,6 +20,7 @@
     '',
     [],
     ['info'],
+    'thisiswarning',
   ].each do |invalid_value|
     it { is_expected.not_to allow_value(invalid_value) }
   end
diff --git a/types/loglevel.pp b/types/loglevel.pp
index 3d45adab39..dedfeee7f6 100644
--- a/types/loglevel.pp
+++ b/types/loglevel.pp
@@ -24,4 +24,4 @@
 # * `trace8`
 #
 # @see https://httpd.apache.org/docs/current/mod/core.html#loglevel
-type Apache::LogLevel = Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
+type Apache::LogLevel = Pattern[/\A(([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])\W*)+\Z/]

From 30b738c6300cc2c7f947fa48c01adb57fc9d7470 Mon Sep 17 00:00:00 2001
From: igt-marcin-wasilewski
 <90308695+igt-marcin-wasilewski@users.noreply.github.com>
Date: Thu, 15 Jun 2023 08:37:35 +0200
Subject: [PATCH 2162/2267] Update loglevel_spec.rb

---
 spec/type_aliases/loglevel_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb
index 4307ad8ce2..0580094219 100644
--- a/spec/type_aliases/loglevel_spec.rb
+++ b/spec/type_aliases/loglevel_spec.rb
@@ -21,6 +21,7 @@
     [],
     ['info'],
     'thisiswarning',
+    'errorerror',
   ].each do |invalid_value|
     it { is_expected.not_to allow_value(invalid_value) }
   end

From ffdc076a5b7d41fe221cba21636fe226054d781a Mon Sep 17 00:00:00 2001
From: igt-marcin-wasilewski
 <90308695+igt-marcin-wasilewski@users.noreply.github.com>
Date: Thu, 15 Jun 2023 08:38:00 +0200
Subject: [PATCH 2163/2267] Update types/loglevel.pp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Romain Tartière <romain@blogreen.org>
---
 types/loglevel.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/loglevel.pp b/types/loglevel.pp
index dedfeee7f6..d4950b14c0 100644
--- a/types/loglevel.pp
+++ b/types/loglevel.pp
@@ -24,4 +24,4 @@
 # * `trace8`
 #
 # @see https://httpd.apache.org/docs/current/mod/core.html#loglevel
-type Apache::LogLevel = Pattern[/\A(([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])\W*)+\Z/]
+type Apache::LogLevel = Pattern[/\A([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])(\s+([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8]))*\Z/]

From c8062b4102192b3b0b9ae0864498c96ad49796ff Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Wed, 13 Sep 2023 15:32:47 +0530
Subject: [PATCH 2164/2267] (CAT-1417) Nested require support for authz_core
 mod

---
 .rubocop_todo.yml                             |    5 +
 README.md                                     |    2 +
 REFERENCE.md                                  | 5485 +++++++++--------
 .../functions/apache/authz_core_config.rb     |   78 +
 manifests/default_mods.pp                     |   12 +-
 manifests/mod/authz_core.pp                   |    8 +
 manifests/vhost.pp                            |   27 +
 spec/functions/authz_core_config_spec.rb      |   53 +
 templates/vhost/_authz_core.epp               |    3 +
 templates/vhost/_directories.erb              |    3 +
 10 files changed, 3000 insertions(+), 2676 deletions(-)
 create mode 100644 lib/puppet/functions/apache/authz_core_config.rb
 create mode 100644 manifests/mod/authz_core.pp
 create mode 100644 spec/functions/authz_core_config_spec.rb
 create mode 100644 templates/vhost/_authz_core.epp

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7295fd9d68..7d247b81e7 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -156,3 +156,8 @@ RSpec/RepeatedExampleGroupDescription:
 RSpec/StubbedMock:
   Exclude:
     - 'spec/util/apache_mod_platform_compatibility_spec.rb'
+
+# Offense count: 1
+Metrics/BlockLength:
+  Exclude:
+    - 'lib/puppet/functions/apache/authz_core_config.rb'
diff --git a/README.md b/README.md
index 0df2fd1c6b..5cabff0831 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@
 [`apache::mod::auth_mellon`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauth_mellon
 [`apache::mod::authn_dbd`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauthn_dbd
 [`apache::mod::authnz_ldap`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauthnz_ldap
+[`apache::mod::authz_core`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauthz_core
 [`apache::mod::cluster`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodcluster
 [`apache::mod::data]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoddata
 [`apache::mod::disk_cache`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoddisk_cache
@@ -157,6 +158,7 @@
 [`mod_authnz_external`]: https://github.com/phokz/mod-auth-external
 [`mod_auth_dbd`]: http://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
 [`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
+[`mod_authz_core`]: https://httpd.apache.org/docs/current/mod/mod_authz_core.html
 [`mod_dbd`]: http://httpd.apache.org/docs/current/mod/mod_dbd.html
 [`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
 [`mod_dumpio`]: https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
diff --git a/REFERENCE.md b/REFERENCE.md
index b758385acf..de492908db 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -9,107 +9,110 @@
 #### Public Classes
 
 * [`apache`](#apache): Guides the basic setup and installation of Apache on your system.
-* [`apache::dev`](#apache--dev): Installs Apache development libraries.
-* [`apache::mod::actions`](#apache--mod--actions): Installs Apache mod_actions
-* [`apache::mod::alias`](#apache--mod--alias): Installs and configures `mod_alias`.
-* [`apache::mod::apreq2`](#apache--mod--apreq2): Installs `mod_apreq2`.
-* [`apache::mod::auth_basic`](#apache--mod--auth_basic): Installs `mod_auth_basic`
-* [`apache::mod::auth_cas`](#apache--mod--auth_cas): Installs and configures `mod_auth_cas`.
-* [`apache::mod::auth_gssapi`](#apache--mod--auth_gssapi): Installs `mod_auth_gsappi`.
-* [`apache::mod::auth_kerb`](#apache--mod--auth_kerb): Installs `mod_auth_kerb`
-* [`apache::mod::auth_mellon`](#apache--mod--auth_mellon): Installs and configures `mod_auth_mellon`.
-* [`apache::mod::auth_openidc`](#apache--mod--auth_openidc): Installs and configures `mod_auth_openidc`.
-* [`apache::mod::authn_core`](#apache--mod--authn_core): Installs `mod_authn_core`.
-* [`apache::mod::authn_dbd`](#apache--mod--authn_dbd): Installs `mod_authn_dbd`.
-* [`apache::mod::authn_file`](#apache--mod--authn_file): Installs `mod_authn_file`.
-* [`apache::mod::authnz_ldap`](#apache--mod--authnz_ldap): Installs `mod_authnz_ldap`.
-* [`apache::mod::authnz_pam`](#apache--mod--authnz_pam): Installs `mod_authnz_pam`.
-* [`apache::mod::authz_groupfile`](#apache--mod--authz_groupfile): Installs `mod_authz_groupfile`
-* [`apache::mod::authz_user`](#apache--mod--authz_user): Installs `mod_authz_user`
-* [`apache::mod::autoindex`](#apache--mod--autoindex): Installs `mod_autoindex`
-* [`apache::mod::cache`](#apache--mod--cache): Installs `mod_cache`
-* [`apache::mod::cgi`](#apache--mod--cgi): Installs `mod_cgi`.
-* [`apache::mod::cgid`](#apache--mod--cgid): Installs `mod_cgid`.
-* [`apache::mod::cluster`](#apache--mod--cluster): Installs `mod_cluster`.
-* [`apache::mod::data`](#apache--mod--data): Installs and configures `mod_data`.
-* [`apache::mod::dav`](#apache--mod--dav): Installs `mod_dav`.
-* [`apache::mod::dav_fs`](#apache--mod--dav_fs): Installs `mod_dav_fs`.
-* [`apache::mod::dav_svn`](#apache--mod--dav_svn): Installs and configures `mod_dav_svn`.
-* [`apache::mod::dbd`](#apache--mod--dbd): Installs `mod_dbd`.
-* [`apache::mod::deflate`](#apache--mod--deflate): Installs and configures `mod_deflate`.
-* [`apache::mod::dev`](#apache--mod--dev): Installs `mod_dev`.
-* [`apache::mod::dir`](#apache--mod--dir): Installs and configures `mod_dir`.
-* [`apache::mod::disk_cache`](#apache--mod--disk_cache): Installs and configures `mod_disk_cache`.
-* [`apache::mod::dumpio`](#apache--mod--dumpio): Installs and configures `mod_dumpio`.
-* [`apache::mod::env`](#apache--mod--env): Installs `mod_env`.
-* [`apache::mod::event`](#apache--mod--event): Installs and configures `mod_event`.
-* [`apache::mod::expires`](#apache--mod--expires): Installs and configures `mod_expires`.
-* [`apache::mod::ext_filter`](#apache--mod--ext_filter): Installs and configures `mod_ext_filter`.
-* [`apache::mod::fcgid`](#apache--mod--fcgid): Installs and configures `mod_fcgid`.
-* [`apache::mod::filter`](#apache--mod--filter): Installs `mod_filter`.
-* [`apache::mod::geoip`](#apache--mod--geoip): Installs and configures `mod_geoip`.
-* [`apache::mod::headers`](#apache--mod--headers): Installs and configures `mod_headers`.
-* [`apache::mod::http2`](#apache--mod--http2): Installs and configures `mod_http2`.
-* [`apache::mod::include`](#apache--mod--include): Installs `mod_include`.
-* [`apache::mod::info`](#apache--mod--info): Installs and configures `mod_info`.
-* [`apache::mod::intercept_form_submit`](#apache--mod--intercept_form_submit): Installs `mod_intercept_form_submit`.
-* [`apache::mod::itk`](#apache--mod--itk): Installs MPM `mod_itk`.
-* [`apache::mod::jk`](#apache--mod--jk): Installs `mod_jk`.
-* [`apache::mod::lbmethod_bybusyness`](#apache--mod--lbmethod_bybusyness): Installs `lbmethod_bybusyness`.
-* [`apache::mod::lbmethod_byrequests`](#apache--mod--lbmethod_byrequests): Installs `lbmethod_byrequests`.
-* [`apache::mod::lbmethod_bytraffic`](#apache--mod--lbmethod_bytraffic): Installs `lbmethod_bytraffic`.
-* [`apache::mod::lbmethod_heartbeat`](#apache--mod--lbmethod_heartbeat): Installs `lbmethod_heartbeat`.
-* [`apache::mod::ldap`](#apache--mod--ldap): Installs and configures `mod_ldap`.
-* [`apache::mod::lookup_identity`](#apache--mod--lookup_identity): Installs `mod_lookup_identity`
-* [`apache::mod::macro`](#apache--mod--macro): Installs `mod_macro`.
-* [`apache::mod::md`](#apache--mod--md): Installs and configures `mod_md`.
-* [`apache::mod::mime`](#apache--mod--mime): Installs and configures `mod_mime`.
-* [`apache::mod::mime_magic`](#apache--mod--mime_magic): Installs and configures `mod_mime_magic`.
-* [`apache::mod::negotiation`](#apache--mod--negotiation): Installs and configures `mod_negotiation`.
-* [`apache::mod::nss`](#apache--mod--nss): Installs and configures `mod_nss`.
-* [`apache::mod::pagespeed`](#apache--mod--pagespeed): Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
+* [`apache::dev`](#apachedev): Installs Apache development libraries.
+* [`apache::mod::actions`](#apachemodactions): Installs Apache mod_actions
+* [`apache::mod::alias`](#apachemodalias): Installs and configures `mod_alias`.
+* [`apache::mod::apreq2`](#apachemodapreq2): Installs `mod_apreq2`.
+* [`apache::mod::auth_basic`](#apachemodauth_basic): Installs `mod_auth_basic`
+* [`apache::mod::auth_cas`](#apachemodauth_cas): Installs and configures `mod_auth_cas`.
+* [`apache::mod::auth_gssapi`](#apachemodauth_gssapi): Installs `mod_auth_gsappi`.
+* [`apache::mod::auth_kerb`](#apachemodauth_kerb): Installs `mod_auth_kerb`
+* [`apache::mod::auth_mellon`](#apachemodauth_mellon): Installs and configures `mod_auth_mellon`.
+* [`apache::mod::auth_openidc`](#apachemodauth_openidc): Installs and configures `mod_auth_openidc`.
+* [`apache::mod::authn_core`](#apachemodauthn_core): Installs `mod_authn_core`.
+* [`apache::mod::authn_dbd`](#apachemodauthn_dbd): Installs `mod_authn_dbd`.
+* [`apache::mod::authn_file`](#apachemodauthn_file): Installs `mod_authn_file`.
+* [`apache::mod::authnz_ldap`](#apachemodauthnz_ldap): Installs `mod_authnz_ldap`.
+* [`apache::mod::authnz_pam`](#apachemodauthnz_pam): Installs `mod_authnz_pam`.
+* [`apache::mod::authz_core`](#apachemodauthz_core): Installs `mod_authz_core`.
+* [`apache::mod::authz_groupfile`](#apachemodauthz_groupfile): Installs `mod_authz_groupfile`
+* [`apache::mod::authz_user`](#apachemodauthz_user): Installs `mod_authz_user`
+* [`apache::mod::autoindex`](#apachemodautoindex): Installs `mod_autoindex`
+* [`apache::mod::cache`](#apachemodcache): Installs `mod_cache`
+* [`apache::mod::cgi`](#apachemodcgi): Installs `mod_cgi`.
+* [`apache::mod::cgid`](#apachemodcgid): Installs `mod_cgid`.
+* [`apache::mod::cluster`](#apachemodcluster): Installs `mod_cluster`.
+* [`apache::mod::data`](#apachemoddata): Installs and configures `mod_data`.
+* [`apache::mod::dav`](#apachemoddav): Installs `mod_dav`.
+* [`apache::mod::dav_fs`](#apachemoddav_fs): Installs `mod_dav_fs`.
+* [`apache::mod::dav_svn`](#apachemoddav_svn): Installs and configures `mod_dav_svn`.
+* [`apache::mod::dbd`](#apachemoddbd): Installs `mod_dbd`.
+* [`apache::mod::deflate`](#apachemoddeflate): Installs and configures `mod_deflate`.
+* [`apache::mod::dev`](#apachemoddev): Installs `mod_dev`.
+* [`apache::mod::dir`](#apachemoddir): Installs and configures `mod_dir`.
+* [`apache::mod::disk_cache`](#apachemoddisk_cache): Installs and configures `mod_disk_cache`.
+* [`apache::mod::dumpio`](#apachemoddumpio): Installs and configures `mod_dumpio`.
+* [`apache::mod::env`](#apachemodenv): Installs `mod_env`.
+* [`apache::mod::event`](#apachemodevent): Installs and configures `mod_event`.
+* [`apache::mod::expires`](#apachemodexpires): Installs and configures `mod_expires`.
+* [`apache::mod::ext_filter`](#apachemodext_filter): Installs and configures `mod_ext_filter`.
+* [`apache::mod::fcgid`](#apachemodfcgid): Installs and configures `mod_fcgid`.
+* [`apache::mod::filter`](#apachemodfilter): Installs `mod_filter`.
+* [`apache::mod::geoip`](#apachemodgeoip): Installs and configures `mod_geoip`.
+* [`apache::mod::headers`](#apachemodheaders): Installs and configures `mod_headers`.
+* [`apache::mod::http2`](#apachemodhttp2): Installs and configures `mod_http2`.
+* [`apache::mod::include`](#apachemodinclude): Installs `mod_include`.
+* [`apache::mod::info`](#apachemodinfo): Installs and configures `mod_info`.
+* [`apache::mod::intercept_form_submit`](#apachemodintercept_form_submit): Installs `mod_intercept_form_submit`.
+* [`apache::mod::itk`](#apachemoditk): Installs MPM `mod_itk`.
+* [`apache::mod::jk`](#apachemodjk): Installs `mod_jk`.
+* [`apache::mod::lbmethod_bybusyness`](#apachemodlbmethod_bybusyness): Installs `lbmethod_bybusyness`.
+* [`apache::mod::lbmethod_byrequests`](#apachemodlbmethod_byrequests): Installs `lbmethod_byrequests`.
+* [`apache::mod::lbmethod_bytraffic`](#apachemodlbmethod_bytraffic): Installs `lbmethod_bytraffic`.
+* [`apache::mod::lbmethod_heartbeat`](#apachemodlbmethod_heartbeat): Installs `lbmethod_heartbeat`.
+* [`apache::mod::ldap`](#apachemodldap): Installs and configures `mod_ldap`.
+* [`apache::mod::log_forensic`](#apachemodlog_forensic): Installs `mod_log_forensic`
+* [`apache::mod::lookup_identity`](#apachemodlookup_identity): Installs `mod_lookup_identity`
+* [`apache::mod::macro`](#apachemodmacro): Installs `mod_macro`.
+* [`apache::mod::md`](#apachemodmd): Installs and configures `mod_md`.
+* [`apache::mod::mime`](#apachemodmime): Installs and configures `mod_mime`.
+* [`apache::mod::mime_magic`](#apachemodmime_magic): Installs and configures `mod_mime_magic`.
+* [`apache::mod::negotiation`](#apachemodnegotiation): Installs and configures `mod_negotiation`.
+* [`apache::mod::nss`](#apachemodnss): Installs and configures `mod_nss`.
+* [`apache::mod::pagespeed`](#apachemodpagespeed): Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
 
 This module does *not* manage the software repositories needed to automatically install the
 mod-pagespeed-stable package. The module does however require that the package be installed,
 or be installable using the system's default package provider.  You should ensure that this
 pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
-* [`apache::mod::passenger`](#apache--mod--passenger): Installs `mod_pasenger`.
-* [`apache::mod::perl`](#apache--mod--perl): Installs `mod_perl`.
-* [`apache::mod::peruser`](#apache--mod--peruser): Installs `mod_peruser`.
-* [`apache::mod::php`](#apache--mod--php): Installs `mod_php`.
-* [`apache::mod::prefork`](#apache--mod--prefork): Installs and configures MPM `prefork`.
-* [`apache::mod::proxy`](#apache--mod--proxy): Installs and configures `mod_proxy`.
-* [`apache::mod::proxy_ajp`](#apache--mod--proxy_ajp): Installs `mod_proxy_ajp`.
-* [`apache::mod::proxy_balancer`](#apache--mod--proxy_balancer): Installs and configures `mod_proxy_balancer`.
-* [`apache::mod::proxy_connect`](#apache--mod--proxy_connect): Installs `mod_proxy_connect`.
-* [`apache::mod::proxy_fcgi`](#apache--mod--proxy_fcgi): Installs `mod_proxy_fcgi`.
-* [`apache::mod::proxy_html`](#apache--mod--proxy_html): Installs `mod_proxy_html`.
-* [`apache::mod::proxy_http`](#apache--mod--proxy_http): Installs `mod_proxy_http`.
-* [`apache::mod::proxy_wstunnel`](#apache--mod--proxy_wstunnel): Installs `mod_proxy_wstunnel`.
-* [`apache::mod::python`](#apache--mod--python): Installs and configures `mod_python`.
-* [`apache::mod::remoteip`](#apache--mod--remoteip): Installs and configures `mod_remoteip`.
-* [`apache::mod::reqtimeout`](#apache--mod--reqtimeout): Installs and configures `mod_reqtimeout`.
-* [`apache::mod::rewrite`](#apache--mod--rewrite): Installs `mod_rewrite`.
-* [`apache::mod::rpaf`](#apache--mod--rpaf): Installs and configures `mod_rpaf`.
-* [`apache::mod::security`](#apache--mod--security): Installs and configures `mod_security`.
-* [`apache::mod::setenvif`](#apache--mod--setenvif): Installs `mod_setenvif`.
-* [`apache::mod::shib`](#apache--mod--shib): Installs and configures `mod_shib`.
-* [`apache::mod::socache_shmcb`](#apache--mod--socache_shmcb): Installs `mod_socache_shmcb`.
-* [`apache::mod::speling`](#apache--mod--speling): Installs `mod_spelling`.
-* [`apache::mod::ssl`](#apache--mod--ssl): Installs `mod_ssl`.
-* [`apache::mod::status`](#apache--mod--status): Installs and configures `mod_status`.
-* [`apache::mod::suexec`](#apache--mod--suexec): Installs `mod_suexec`.
-* [`apache::mod::userdir`](#apache--mod--userdir): Installs and configures `mod_userdir`.
-* [`apache::mod::version`](#apache--mod--version): Installs `mod_version`.
-* [`apache::mod::vhost_alias`](#apache--mod--vhost_alias): Installs Apache `mod_vhost_alias`.
-* [`apache::mod::watchdog`](#apache--mod--watchdog): Installs and configures `mod_watchdog`.
-* [`apache::mod::worker`](#apache--mod--worker): Installs and manages the MPM `worker`.
-* [`apache::mod::wsgi`](#apache--mod--wsgi): Installs and configures `mod_wsgi`.
-* [`apache::mod::xsendfile`](#apache--mod--xsendfile): Installs `mod_xsendfile`.
-* [`apache::mpm::disable_mpm_event`](#apache--mpm--disable_mpm_event): disable Apache-Module event
-* [`apache::mpm::disable_mpm_prefork`](#apache--mpm--disable_mpm_prefork): disable Apache-Module prefork
-* [`apache::mpm::disable_mpm_worker`](#apache--mpm--disable_mpm_worker): disable Apache-Module worker
-* [`apache::vhosts`](#apache--vhosts): Creates `apache::vhost` defined types.
+* [`apache::mod::passenger`](#apachemodpassenger): Installs `mod_pasenger`.
+* [`apache::mod::perl`](#apachemodperl): Installs `mod_perl`.
+* [`apache::mod::peruser`](#apachemodperuser): Installs `mod_peruser`.
+* [`apache::mod::php`](#apachemodphp): Installs `mod_php`.
+* [`apache::mod::prefork`](#apachemodprefork): Installs and configures MPM `prefork`.
+* [`apache::mod::proxy`](#apachemodproxy): Installs and configures `mod_proxy`.
+* [`apache::mod::proxy_ajp`](#apachemodproxy_ajp): Installs `mod_proxy_ajp`.
+* [`apache::mod::proxy_balancer`](#apachemodproxy_balancer): Installs and configures `mod_proxy_balancer`.
+* [`apache::mod::proxy_connect`](#apachemodproxy_connect): Installs `mod_proxy_connect`.
+* [`apache::mod::proxy_fcgi`](#apachemodproxy_fcgi): Installs `mod_proxy_fcgi`.
+* [`apache::mod::proxy_html`](#apachemodproxy_html): Installs `mod_proxy_html`.
+* [`apache::mod::proxy_http`](#apachemodproxy_http): Installs `mod_proxy_http`.
+* [`apache::mod::proxy_http2`](#apachemodproxy_http2): Installs `mod_proxy_http2`.
+* [`apache::mod::proxy_wstunnel`](#apachemodproxy_wstunnel): Installs `mod_proxy_wstunnel`.
+* [`apache::mod::python`](#apachemodpython): Installs and configures `mod_python`.
+* [`apache::mod::remoteip`](#apachemodremoteip): Installs and configures `mod_remoteip`.
+* [`apache::mod::reqtimeout`](#apachemodreqtimeout): Installs and configures `mod_reqtimeout`.
+* [`apache::mod::rewrite`](#apachemodrewrite): Installs `mod_rewrite`.
+* [`apache::mod::rpaf`](#apachemodrpaf): Installs and configures `mod_rpaf`.
+* [`apache::mod::security`](#apachemodsecurity): Installs and configures `mod_security`.
+* [`apache::mod::setenvif`](#apachemodsetenvif): Installs `mod_setenvif`.
+* [`apache::mod::shib`](#apachemodshib): Installs and configures `mod_shib`.
+* [`apache::mod::socache_shmcb`](#apachemodsocache_shmcb): Installs `mod_socache_shmcb`.
+* [`apache::mod::speling`](#apachemodspeling): Installs `mod_spelling`.
+* [`apache::mod::ssl`](#apachemodssl): Installs `mod_ssl`.
+* [`apache::mod::status`](#apachemodstatus): Installs and configures `mod_status`.
+* [`apache::mod::suexec`](#apachemodsuexec): Installs `mod_suexec`.
+* [`apache::mod::userdir`](#apachemoduserdir): Installs and configures `mod_userdir`.
+* [`apache::mod::version`](#apachemodversion): Installs `mod_version`.
+* [`apache::mod::vhost_alias`](#apachemodvhost_alias): Installs Apache `mod_vhost_alias`.
+* [`apache::mod::watchdog`](#apachemodwatchdog): Installs and configures `mod_watchdog`.
+* [`apache::mod::worker`](#apachemodworker): Installs and manages the MPM `worker`.
+* [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
+* [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
+* [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event): disable Apache-Module event
+* [`apache::mpm::disable_mpm_prefork`](#apachempmdisable_mpm_prefork): disable Apache-Module prefork
+* [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker): disable Apache-Module worker
+* [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
 
 #### Private Classes
 
@@ -130,22 +133,22 @@ pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet
 
 #### Public Defined types
 
-* [`apache::balancer`](#apache--balancer): This type will create an apache balancer cluster file inside the conf.d
+* [`apache::balancer`](#apachebalancer): This type will create an apache balancer cluster file inside the conf.d
 directory.
-* [`apache::balancermember`](#apache--balancermember): Defines members of `mod_proxy_balancer`
-* [`apache::custom_config`](#apache--custom_config): Adds a custom configuration file to the Apache server's `conf.d` directory.
-* [`apache::fastcgi::server`](#apache--fastcgi--server): Defines one or more external FastCGI servers to handle specific file types. Use this
+* [`apache::balancermember`](#apachebalancermember): Defines members of `mod_proxy_balancer`
+* [`apache::custom_config`](#apachecustom_config): Adds a custom configuration file to the Apache server's `conf.d` directory.
+* [`apache::fastcgi::server`](#apachefastcgiserver): Defines one or more external FastCGI servers to handle specific file types. Use this
 defined type with `mod_fastcgi`.
-* [`apache::listen`](#apache--listen): Adds `Listen` directives to `ports.conf` that define the
+* [`apache::listen`](#apachelisten): Adds `Listen` directives to `ports.conf` that define the
 Apache server's or a virtual host's listening address and port.
-* [`apache::mod`](#apache--mod): Installs packages for an Apache module that doesn't have a corresponding
+* [`apache::mod`](#apachemod): Installs packages for an Apache module that doesn't have a corresponding
 `apache::mod::<MODULE NAME>` class.
-* [`apache::namevirtualhost`](#apache--namevirtualhost): Enables name-based virtual hosts
-* [`apache::vhost`](#apache--vhost): Allows specialised configurations for virtual hosts that possess requirements
+* [`apache::namevirtualhost`](#apachenamevirtualhost): Enables name-based virtual hosts
+* [`apache::vhost`](#apachevhost): Allows specialised configurations for virtual hosts that possess requirements
 outside of the defaults.
-* [`apache::vhost::custom`](#apache--vhost--custom): A wrapper around the `apache::custom_config` defined type.
-* [`apache::vhost::fragment`](#apache--vhost--fragment): Define a fragment within a vhost
-* [`apache::vhost::proxy`](#apache--vhost--proxy): Configure a reverse proxy for a vhost
+* [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
+* [`apache::vhost::fragment`](#apachevhostfragment): Define a fragment within a vhost
+* [`apache::vhost::proxy`](#apachevhostproxy): Configure a reverse proxy for a vhost
 
 #### Private Defined types
 
@@ -157,20 +160,22 @@ outside of the defaults.
 
 ### Functions
 
-* [`apache::apache_pw_hash`](#apache--apache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
-* [`apache::bool2httpd`](#apache--bool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
-* [`apache::pw_hash`](#apache--pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
+* [`apache::apache_pw_hash`](#apacheapache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
+* [`apache::authz_core_config`](#apacheauthz_core_config): Function to generate the authz_core configuration directives.
+* [`apache::bool2httpd`](#apachebool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
+* [`apache::pw_hash`](#apachepw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
 * [`apache_pw_hash`](#apache_pw_hash): DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
 * [`bool2httpd`](#bool2httpd): DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
 
 ### Data types
 
-* [`Apache::LogLevel`](#Apache--LogLevel): A string that conforms to the Apache `LogLevel` syntax.
-* [`Apache::ModProxyProtocol`](#Apache--ModProxyProtocol): Supported protocols / schemes by mod_proxy
-* [`Apache::OIDCSettings`](#Apache--OIDCSettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
-* [`Apache::ServerTokens`](#Apache--ServerTokens): A string that conforms to the Apache `ServerTokens` syntax.
-* [`Apache::Vhost::Priority`](#Apache--Vhost--Priority): The priority on vhost
-* [`Apache::Vhost::ProxyPass`](#Apache--Vhost--ProxyPass): Struct representing reverse proxy configuration for an Apache vhost, used by the Apache::Vhost::Proxy defined resource type.
+* [`Apache::LogLevel`](#apacheloglevel): A string that conforms to the Apache `LogLevel` syntax.
+* [`Apache::ModProxyProtocol`](#apachemodproxyprotocol): Supported protocols / schemes by mod_proxy
+* [`Apache::OIDCSettings`](#apacheoidcsettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
+* [`Apache::OnOff`](#apacheonoff): A string that is accepted in Apache config to turn something on or off
+* [`Apache::ServerTokens`](#apacheservertokens): A string that conforms to the Apache `ServerTokens` syntax.
+* [`Apache::Vhost::Priority`](#apachevhostpriority): The priority on vhost
+* [`Apache::Vhost::ProxyPass`](#apachevhostproxypass): Struct representing reverse proxy configuration for an Apache vhost, used by the Apache::Vhost::Proxy defined resource type.
 
 ### Tasks
 
@@ -201,105 +206,105 @@ class { 'apache': }
 
 The following parameters are available in the `apache` class:
 
-* [`allow_encoded_slashes`](#-apache--allow_encoded_slashes)
-* [`conf_dir`](#-apache--conf_dir)
-* [`conf_template`](#-apache--conf_template)
-* [`confd_dir`](#-apache--confd_dir)
-* [`default_charset`](#-apache--default_charset)
-* [`default_confd_files`](#-apache--default_confd_files)
-* [`default_mods`](#-apache--default_mods)
-* [`default_ssl_ca`](#-apache--default_ssl_ca)
-* [`default_ssl_cert`](#-apache--default_ssl_cert)
-* [`default_ssl_chain`](#-apache--default_ssl_chain)
-* [`default_ssl_crl`](#-apache--default_ssl_crl)
-* [`default_ssl_crl_path`](#-apache--default_ssl_crl_path)
-* [`default_ssl_crl_check`](#-apache--default_ssl_crl_check)
-* [`default_ssl_key`](#-apache--default_ssl_key)
-* [`default_ssl_reload_on_change`](#-apache--default_ssl_reload_on_change)
-* [`default_ssl_vhost`](#-apache--default_ssl_vhost)
-* [`default_type`](#-apache--default_type)
-* [`default_vhost`](#-apache--default_vhost)
-* [`dev_packages`](#-apache--dev_packages)
-* [`docroot`](#-apache--docroot)
-* [`error_documents`](#-apache--error_documents)
-* [`group`](#-apache--group)
-* [`httpd_dir`](#-apache--httpd_dir)
-* [`http_protocol_options`](#-apache--http_protocol_options)
-* [`keepalive`](#-apache--keepalive)
-* [`keepalive_timeout`](#-apache--keepalive_timeout)
-* [`max_keepalive_requests`](#-apache--max_keepalive_requests)
-* [`hostname_lookups`](#-apache--hostname_lookups)
-* [`ldap_trusted_mode`](#-apache--ldap_trusted_mode)
-* [`ldap_verify_server_cert`](#-apache--ldap_verify_server_cert)
-* [`lib_path`](#-apache--lib_path)
-* [`log_level`](#-apache--log_level)
-* [`log_formats`](#-apache--log_formats)
-* [`logroot`](#-apache--logroot)
-* [`logroot_mode`](#-apache--logroot_mode)
-* [`manage_group`](#-apache--manage_group)
-* [`supplementary_groups`](#-apache--supplementary_groups)
-* [`manage_user`](#-apache--manage_user)
-* [`mod_dir`](#-apache--mod_dir)
-* [`mod_libs`](#-apache--mod_libs)
-* [`mod_packages`](#-apache--mod_packages)
-* [`mpm_module`](#-apache--mpm_module)
-* [`package_ensure`](#-apache--package_ensure)
-* [`pidfile`](#-apache--pidfile)
-* [`ports_file`](#-apache--ports_file)
-* [`protocols`](#-apache--protocols)
-* [`protocols_honor_order`](#-apache--protocols_honor_order)
-* [`purge_configs`](#-apache--purge_configs)
-* [`purge_vhost_dir`](#-apache--purge_vhost_dir)
-* [`sendfile`](#-apache--sendfile)
-* [`serveradmin`](#-apache--serveradmin)
-* [`servername`](#-apache--servername)
-* [`server_root`](#-apache--server_root)
-* [`server_signature`](#-apache--server_signature)
-* [`server_tokens`](#-apache--server_tokens)
-* [`service_enable`](#-apache--service_enable)
-* [`service_ensure`](#-apache--service_ensure)
-* [`service_name`](#-apache--service_name)
-* [`service_manage`](#-apache--service_manage)
-* [`service_restart`](#-apache--service_restart)
-* [`timeout`](#-apache--timeout)
-* [`trace_enable`](#-apache--trace_enable)
-* [`use_canonical_name`](#-apache--use_canonical_name)
-* [`use_systemd`](#-apache--use_systemd)
-* [`file_mode`](#-apache--file_mode)
-* [`root_directory_options`](#-apache--root_directory_options)
-* [`root_directory_secured`](#-apache--root_directory_secured)
-* [`vhost_dir`](#-apache--vhost_dir)
-* [`vhost_include_pattern`](#-apache--vhost_include_pattern)
-* [`user`](#-apache--user)
-* [`apache_name`](#-apache--apache_name)
-* [`error_log`](#-apache--error_log)
-* [`scriptalias`](#-apache--scriptalias)
-* [`access_log_file`](#-apache--access_log_file)
-* [`limitreqfields`](#-apache--limitreqfields)
-* [`limitreqfieldsize`](#-apache--limitreqfieldsize)
-* [`limitreqline`](#-apache--limitreqline)
-* [`ip`](#-apache--ip)
-* [`purge_vdir`](#-apache--purge_vdir)
-* [`conf_enabled`](#-apache--conf_enabled)
-* [`vhost_enable_dir`](#-apache--vhost_enable_dir)
-* [`manage_vhost_enable_dir`](#-apache--manage_vhost_enable_dir)
-* [`mod_enable_dir`](#-apache--mod_enable_dir)
-* [`ssl_file`](#-apache--ssl_file)
-* [`file_e_tag`](#-apache--file_e_tag)
-* [`use_optional_includes`](#-apache--use_optional_includes)
-* [`mime_types_additional`](#-apache--mime_types_additional)
-
-##### <a name="-apache--allow_encoded_slashes"></a>`allow_encoded_slashes`
-
-Data type: `Optional[Enum['on', 'off', 'nodecode']]`
+* [`allow_encoded_slashes`](#allow_encoded_slashes)
+* [`conf_dir`](#conf_dir)
+* [`conf_template`](#conf_template)
+* [`confd_dir`](#confd_dir)
+* [`default_charset`](#default_charset)
+* [`default_confd_files`](#default_confd_files)
+* [`default_mods`](#default_mods)
+* [`default_ssl_ca`](#default_ssl_ca)
+* [`default_ssl_cert`](#default_ssl_cert)
+* [`default_ssl_chain`](#default_ssl_chain)
+* [`default_ssl_crl`](#default_ssl_crl)
+* [`default_ssl_crl_path`](#default_ssl_crl_path)
+* [`default_ssl_crl_check`](#default_ssl_crl_check)
+* [`default_ssl_key`](#default_ssl_key)
+* [`default_ssl_reload_on_change`](#default_ssl_reload_on_change)
+* [`default_ssl_vhost`](#default_ssl_vhost)
+* [`default_type`](#default_type)
+* [`default_vhost`](#default_vhost)
+* [`dev_packages`](#dev_packages)
+* [`docroot`](#docroot)
+* [`error_documents`](#error_documents)
+* [`group`](#group)
+* [`httpd_dir`](#httpd_dir)
+* [`http_protocol_options`](#http_protocol_options)
+* [`keepalive`](#keepalive)
+* [`keepalive_timeout`](#keepalive_timeout)
+* [`max_keepalive_requests`](#max_keepalive_requests)
+* [`hostname_lookups`](#hostname_lookups)
+* [`ldap_trusted_mode`](#ldap_trusted_mode)
+* [`ldap_verify_server_cert`](#ldap_verify_server_cert)
+* [`lib_path`](#lib_path)
+* [`log_level`](#log_level)
+* [`log_formats`](#log_formats)
+* [`logroot`](#logroot)
+* [`logroot_mode`](#logroot_mode)
+* [`manage_group`](#manage_group)
+* [`supplementary_groups`](#supplementary_groups)
+* [`manage_user`](#manage_user)
+* [`mod_dir`](#mod_dir)
+* [`mod_libs`](#mod_libs)
+* [`mod_packages`](#mod_packages)
+* [`mpm_module`](#mpm_module)
+* [`package_ensure`](#package_ensure)
+* [`pidfile`](#pidfile)
+* [`ports_file`](#ports_file)
+* [`protocols`](#protocols)
+* [`protocols_honor_order`](#protocols_honor_order)
+* [`purge_configs`](#purge_configs)
+* [`purge_vhost_dir`](#purge_vhost_dir)
+* [`sendfile`](#sendfile)
+* [`serveradmin`](#serveradmin)
+* [`servername`](#servername)
+* [`server_root`](#server_root)
+* [`server_signature`](#server_signature)
+* [`server_tokens`](#server_tokens)
+* [`service_enable`](#service_enable)
+* [`service_ensure`](#service_ensure)
+* [`service_name`](#service_name)
+* [`service_manage`](#service_manage)
+* [`service_restart`](#service_restart)
+* [`timeout`](#timeout)
+* [`trace_enable`](#trace_enable)
+* [`use_canonical_name`](#use_canonical_name)
+* [`use_systemd`](#use_systemd)
+* [`file_mode`](#file_mode)
+* [`root_directory_options`](#root_directory_options)
+* [`root_directory_secured`](#root_directory_secured)
+* [`vhost_dir`](#vhost_dir)
+* [`vhost_include_pattern`](#vhost_include_pattern)
+* [`user`](#user)
+* [`apache_name`](#apache_name)
+* [`error_log`](#error_log)
+* [`scriptalias`](#scriptalias)
+* [`access_log_file`](#access_log_file)
+* [`limitreqfields`](#limitreqfields)
+* [`limitreqfieldsize`](#limitreqfieldsize)
+* [`limitreqline`](#limitreqline)
+* [`ip`](#ip)
+* [`purge_vdir`](#purge_vdir)
+* [`conf_enabled`](#conf_enabled)
+* [`vhost_enable_dir`](#vhost_enable_dir)
+* [`manage_vhost_enable_dir`](#manage_vhost_enable_dir)
+* [`mod_enable_dir`](#mod_enable_dir)
+* [`ssl_file`](#ssl_file)
+* [`file_e_tag`](#file_e_tag)
+* [`use_optional_includes`](#use_optional_includes)
+* [`mime_types_additional`](#mime_types_additional)
+
+##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
+
+Data type: `Optional[Variant[Apache::OnOff, Enum['nodecode']]]`
 
 Sets the server default for the `AllowEncodedSlashes` declaration, which modifies the
 responses to URLs containing '\' and '/' characters. If not specified, this parameter omits
 the declaration from the server's configuration and uses Apache's default setting of 'off'.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--conf_dir"></a>`conf_dir`
+##### <a name="conf_dir"></a>`conf_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -307,7 +312,7 @@ Sets the directory where the Apache server's main configuration file is located.
 
 Default value: `$apache::params::conf_dir`
 
-##### <a name="-apache--conf_template"></a>`conf_template`
+##### <a name="conf_template"></a>`conf_template`
 
 Data type: `String`
 
@@ -317,7 +322,7 @@ configuration file customized by `conf.d` entries.
 
 Default value: `$apache::params::conf_template`
 
-##### <a name="-apache--confd_dir"></a>`confd_dir`
+##### <a name="confd_dir"></a>`confd_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -325,15 +330,15 @@ Sets the location of the Apache server's custom configuration directory.
 
 Default value: `$apache::params::confd_dir`
 
-##### <a name="-apache--default_charset"></a>`default_charset`
+##### <a name="default_charset"></a>`default_charset`
 
 Data type: `Optional[String]`
 
 Used as the `AddDefaultCharset` directive in the main configuration file.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--default_confd_files"></a>`default_confd_files`
+##### <a name="default_confd_files"></a>`default_confd_files`
 
 Data type: `Boolean`
 
@@ -342,9 +347,9 @@ in the directory defined by the `confd_dir` parameter. These configuration files
 correspond to what is typically installed with the Apache package on the server's
 operating system.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--default_mods"></a>`default_mods`
+##### <a name="default_mods"></a>`default_mods`
 
 Data type: `Variant[Array[String[1]], Boolean]`
 
@@ -356,18 +361,11 @@ on your operating system, and you can declare any other modules separately using
 If `true`, Puppet installs additional modules, depending on the operating system and
 the value of the `mpm_module` parameter. Because these lists of
 modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
-If this parameter contains an array, Puppet will enable all the Apache modules passed in it.
-Passing the values as an array of strings provides the flexibility to override the default mods and install modules defined in `$default_mods`.
-For example, with array of string:<br />
-```puppet
-class { 'apache':
-  default_mods => ['cache', 'info', 'mime_magic']
-}
-```
+If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--default_ssl_ca"></a>`default_ssl_ca`
+##### <a name="default_ssl_ca"></a>`default_ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -376,9 +374,9 @@ Although the default value results in a functioning Apache server, you **must**
 this parameter with your certificate authority information before deploying this server in
 a production environment.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--default_ssl_cert"></a>`default_ssl_cert`
+##### <a name="default_ssl_cert"></a>`default_ssl_cert`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -388,7 +386,7 @@ parameter with your certificate location before deploying this server in a produ
 
 Default value: `$apache::params::default_ssl_cert`
 
-##### <a name="-apache--default_ssl_chain"></a>`default_ssl_chain`
+##### <a name="default_ssl_chain"></a>`default_ssl_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -396,9 +394,9 @@ Sets the default SSL chain location.<br />
 Although this default value results in a functioning Apache server, you **must** update
 this parameter with your SSL chain before deploying this server in a production environment.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--default_ssl_crl"></a>`default_ssl_crl`
+##### <a name="default_ssl_crl"></a>`default_ssl_crl`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -407,9 +405,9 @@ Although this default value results in a functioning Apache server, you **must**
 this parameter with the CRL file path before deploying this server in a production
 environment. You can use this parameter with or in place of the `default_ssl_crl_path`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--default_ssl_crl_path"></a>`default_ssl_crl_path`
+##### <a name="default_ssl_crl_path"></a>`default_ssl_crl_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -417,9 +415,9 @@ Sets the server's certificate revocation list path, which contains your CRLs.<br
 Although this default value results in a functioning Apache server, you **must** update
 this parameter with the CRL file path before deploying this server in a production environment.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--default_ssl_crl_check"></a>`default_ssl_crl_check`
+##### <a name="default_ssl_crl_check"></a>`default_ssl_crl_check`
 
 Data type: `Optional[String]`
 
@@ -428,9 +426,9 @@ This parameter applies only to Apache 2.4 or higher and is ignored on older vers
 Although this default value results in a functioning Apache server, you **must** specify
 this parameter when using certificate revocation lists in a production environment.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--default_ssl_key"></a>`default_ssl_key`
+##### <a name="default_ssl_key"></a>`default_ssl_key`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -441,15 +439,15 @@ environment.
 
 Default value: `$apache::params::default_ssl_key`
 
-##### <a name="-apache--default_ssl_reload_on_change"></a>`default_ssl_reload_on_change`
+##### <a name="default_ssl_reload_on_change"></a>`default_ssl_reload_on_change`
 
 Data type: `Boolean`
 
 Enable reloading of apache if the content of ssl files have changed.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--default_ssl_vhost"></a>`default_ssl_vhost`
+##### <a name="default_ssl_vhost"></a>`default_ssl_vhost`
 
 Data type: `Boolean`
 
@@ -468,9 +466,9 @@ apache::vhost { 'default-ssl':
 ```
 **Note**: SSL virtual hosts only respond to HTTPS queries.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--default_type"></a>`default_type`
+##### <a name="default_type"></a>`default_type`
 
 Data type: `String`
 
@@ -480,7 +478,7 @@ newer, and is only for backwards compatibility in configuration files.
 
 Default value: `'none'`
 
-##### <a name="-apache--default_vhost"></a>`default_vhost`
+##### <a name="default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
 
@@ -490,9 +488,9 @@ value to `false`.<br />
 > **Note**: Apache will not start without at least one virtual host. If you set this
 to `false` you must configure a virtual host elsewhere.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--dev_packages"></a>`dev_packages`
+##### <a name="dev_packages"></a>`dev_packages`
 
 Data type: `Optional[Variant[Array, String]]`
 
@@ -508,7 +506,7 @@ class { 'apache':
 
 Default value: `$apache::params::dev_packages`
 
-##### <a name="-apache--docroot"></a>`docroot`
+##### <a name="docroot"></a>`docroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -516,15 +514,15 @@ Sets the default `DocumentRoot` location.
 
 Default value: `$apache::params::docroot`
 
-##### <a name="-apache--error_documents"></a>`error_documents`
+##### <a name="error_documents"></a>`error_documents`
 
 Data type: `Boolean`
 
 Determines whether to enable [custom error documents](https://httpd.apache.org/docs/current/custom-error.html) on the Apache server.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--group"></a>`group`
+##### <a name="group"></a>`group`
 
 Data type: `String`
 
@@ -539,7 +537,7 @@ process.
 
 Default value: `$apache::params::group`
 
-##### <a name="-apache--httpd_dir"></a>`httpd_dir`
+##### <a name="httpd_dir"></a>`httpd_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -549,7 +547,7 @@ with the default distribution packages.
 
 Default value: `$apache::params::httpd_dir`
 
-##### <a name="-apache--http_protocol_options"></a>`http_protocol_options`
+##### <a name="http_protocol_options"></a>`http_protocol_options`
 
 Data type: `Optional[String]`
 
@@ -559,9 +557,9 @@ Valid options: any sequence of the following alternative values: `Strict` or `Un
 
 Default value: `$apache::params::http_protocol_options`
 
-##### <a name="-apache--keepalive"></a>`keepalive`
+##### <a name="keepalive"></a>`keepalive`
 
-Data type: `Enum['On', 'Off']`
+Data type: `Apache::OnOff`
 
 Determines whether to enable persistent HTTP connections with the `KeepAlive` directive.
 If you set this to `On`, use the `keepalive_timeout` and `max_keepalive_requests` parameters
@@ -569,7 +567,7 @@ to set relevant options.<br />
 
 Default value: `$apache::params::keepalive`
 
-##### <a name="-apache--keepalive_timeout"></a>`keepalive_timeout`
+##### <a name="keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Integer`
 
@@ -579,7 +577,7 @@ only relevant if the `keepalive` parameter is enabled.
 
 Default value: `$apache::params::keepalive_timeout`
 
-##### <a name="-apache--max_keepalive_requests"></a>`max_keepalive_requests`
+##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
 
 Data type: `Integer`
 
@@ -587,9 +585,9 @@ Limits the number of requests allowed per connection when the `keepalive` parame
 
 Default value: `$apache::params::max_keepalive_requests`
 
-##### <a name="-apache--hostname_lookups"></a>`hostname_lookups`
+##### <a name="hostname_lookups"></a>`hostname_lookups`
 
-Data type: `Enum['Off', 'On', 'Double', 'off', 'on', 'double']`
+Data type: `Variant[Apache::OnOff, Enum['Double', 'double']]`
 
 This directive enables DNS lookups so that host names can be logged and passed to
 CGIs/SSIs in REMOTE_HOST.<br />
@@ -597,7 +595,7 @@ CGIs/SSIs in REMOTE_HOST.<br />
 
 Default value: `$apache::params::hostname_lookups`
 
-##### <a name="-apache--ldap_trusted_mode"></a>`ldap_trusted_mode`
+##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
 
 Data type: `Optional[String]`
 
@@ -609,19 +607,19 @@ The following modes are supported:
 Not all LDAP toolkits support all the above modes. An error message will be logged at
 runtime if a mode is not supported, and the connection to the LDAP server will fail.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--ldap_verify_server_cert"></a>`ldap_verify_server_cert`
+##### <a name="ldap_verify_server_cert"></a>`ldap_verify_server_cert`
 
-Data type: `Optional[Enum['On', 'Off', 'on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Specifies whether to force the verification of a server certificate when establishing an SSL
 connection to the LDAP server.
 On|Off
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--lib_path"></a>`lib_path`
+##### <a name="lib_path"></a>`lib_path`
 
 Data type: `String`
 
@@ -630,7 +628,7 @@ Specifies the location whereApache module files are stored.<br />
 
 Default value: `$apache::params::lib_path`
 
-##### <a name="-apache--log_level"></a>`log_level`
+##### <a name="log_level"></a>`log_level`
 
 Data type: `Apache::LogLevel`
 
@@ -639,7 +637,7 @@ which adjusts the verbosity of the messages recorded in the error logs.
 
 Default value: `$apache::params::log_level`
 
-##### <a name="-apache--log_formats"></a>`log_formats`
+##### <a name="log_formats"></a>`log_formats`
 
 Data type: `Hash`
 
@@ -659,7 +657,7 @@ If your `log_formats` parameter contains one of those, it will be overwritten wi
 
 Default value: `{}`
 
-##### <a name="-apache--logroot"></a>`logroot`
+##### <a name="logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -667,7 +665,7 @@ Changes the directory of Apache log files for the virtual host.
 
 Default value: `$apache::params::logroot`
 
-##### <a name="-apache--logroot_mode"></a>`logroot_mode`
+##### <a name="logroot_mode"></a>`logroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
@@ -678,7 +676,7 @@ for details.
 
 Default value: `$apache::params::logroot_mode`
 
-##### <a name="-apache--manage_group"></a>`manage_group`
+##### <a name="manage_group"></a>`manage_group`
 
 Data type: `Boolean`
 
@@ -687,9 +685,9 @@ If you have a group created from another Puppet module that you want to use to r
 set this to `false`. Without this parameter, attempting to use a previously established
 group results in a duplicate resource error.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--supplementary_groups"></a>`supplementary_groups`
+##### <a name="supplementary_groups"></a>`supplementary_groups`
 
 Data type: `Array`
 
@@ -698,7 +696,7 @@ Notice: This option only has an effect when `manage_user` is set to true.
 
 Default value: `[]`
 
-##### <a name="-apache--manage_user"></a>`manage_user`
+##### <a name="manage_user"></a>`manage_user`
 
 Data type: `Boolean`
 
@@ -707,9 +705,9 @@ This is for instances when you have a user, created from another Puppet module,
 to use to run Apache. Without this parameter, attempting to use a previously established
 user would result in a duplicate resource error.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod_dir"></a>`mod_dir`
+##### <a name="mod_dir"></a>`mod_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -717,7 +715,7 @@ Sets where Puppet places configuration files for your Apache modules.
 
 Default value: `$apache::params::mod_dir`
 
-##### <a name="-apache--mod_libs"></a>`mod_libs`
+##### <a name="mod_libs"></a>`mod_libs`
 
 Data type: `Hash`
 
@@ -733,7 +731,7 @@ class { 'apache':
 
 Default value: `$apache::params::mod_libs`
 
-##### <a name="-apache--mod_packages"></a>`mod_packages`
+##### <a name="mod_packages"></a>`mod_packages`
 
 Data type: `Hash`
 
@@ -749,7 +747,7 @@ class { 'apache':
 
 Default value: `$apache::params::mod_packages`
 
-##### <a name="-apache--mpm_module"></a>`mpm_module`
+##### <a name="mpm_module"></a>`mpm_module`
 
 Data type: `Variant[Boolean, Enum['event', 'itk', 'peruser', 'prefork', 'worker']]`
 
@@ -764,7 +762,7 @@ You must set this to `false` to explicitly declare the following classes with cu
 
 Default value: `$apache::params::mpm_module`
 
-##### <a name="-apache--package_ensure"></a>`package_ensure`
+##### <a name="package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -773,7 +771,7 @@ Controls the `package` resource's `ensure` attribute. Valid values are: `absent`
 
 Default value: `'installed'`
 
-##### <a name="-apache--pidfile"></a>`pidfile`
+##### <a name="pidfile"></a>`pidfile`
 
 Data type: `String`
 
@@ -781,7 +779,7 @@ Allows settting a custom location for the pid file. Useful if using a custom-bui
 
 Default value: `$apache::params::pidfile`
 
-##### <a name="-apache--ports_file"></a>`ports_file`
+##### <a name="ports_file"></a>`ports_file`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -789,7 +787,7 @@ Sets the path to the file containing Apache ports configuration.
 
 Default value: `$apache::params::ports_file`
 
-##### <a name="-apache--protocols"></a>`protocols`
+##### <a name="protocols"></a>`protocols`
 
 Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
@@ -798,16 +796,16 @@ directive, which lists available protocols for the server.
 
 Default value: `[]`
 
-##### <a name="-apache--protocols_honor_order"></a>`protocols_honor_order`
+##### <a name="protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
 Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
 directive which determines whether the order of Protocols sets precedence during negotiation.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--purge_configs"></a>`purge_configs`
+##### <a name="purge_configs"></a>`purge_configs`
 
 Data type: `Boolean`
 
@@ -816,9 +814,9 @@ Setting this to `false` is a stopgap measure to allow the apache module to coexi
 existing or unmanaged configurations. We recommend moving your configuration to resources
 within this module. For virtual host configurations, see `purge_vhost_dir`.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--purge_vhost_dir"></a>`purge_vhost_dir`
+##### <a name="purge_vhost_dir"></a>`purge_vhost_dir`
 
 Data type: `Optional[Boolean]`
 
@@ -828,26 +826,26 @@ by Puppet.<br />
 Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to
 coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--sendfile"></a>`sendfile`
+##### <a name="sendfile"></a>`sendfile`
 
-Data type: `Enum['On', 'Off', 'on', 'off']`
+Data type: `Apache::OnOff`
 
 Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the
 `EnableSendfile` directive.
 
 Default value: `'On'`
 
-##### <a name="-apache--serveradmin"></a>`serveradmin`
+##### <a name="serveradmin"></a>`serveradmin`
 
 Data type: `Optional[String[1]]`
 
 Sets the Apache server administrator's contact information via Apache's `ServerAdmin` directive.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--servername"></a>`servername`
+##### <a name="servername"></a>`servername`
 
 Data type: `Optional[String]`
 
@@ -856,7 +854,7 @@ Setting to `false` will not set ServerName at all.
 
 Default value: `$apache::params::servername`
 
-##### <a name="-apache--server_root"></a>`server_root`
+##### <a name="server_root"></a>`server_root`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -864,9 +862,9 @@ Sets the Apache server's root directory via Apache's `ServerRoot` directive.
 
 Default value: `$apache::params::server_root`
 
-##### <a name="-apache--server_signature"></a>`server_signature`
+##### <a name="server_signature"></a>`server_signature`
 
-Data type: `Variant[Enum['On', 'Off'], String]`
+Data type: `Variant[Apache::OnOff, String]`
 
 Configures a trailing footer line to display at the bottom of server-generated documents,
 such as error documents and output of certain Apache modules, via Apache's `ServerSignature`
@@ -874,7 +872,7 @@ directive. Valid values are: `On` or `Off`.
 
 Default value: `'On'`
 
-##### <a name="-apache--server_tokens"></a>`server_tokens`
+##### <a name="server_tokens"></a>`server_tokens`
 
 Data type: `Apache::ServerTokens`
 
@@ -883,15 +881,15 @@ system, via Apache's `ServerTokens` directive.
 
 Default value: `'Prod'`
 
-##### <a name="-apache--service_enable"></a>`service_enable`
+##### <a name="service_enable"></a>`service_enable`
 
 Data type: `Boolean`
 
 Determines whether Puppet enables the Apache HTTPD service when the system is booted.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--service_ensure"></a>`service_ensure`
+##### <a name="service_ensure"></a>`service_ensure`
 
 Data type: `Variant[Stdlib::Ensure::Service, Boolean]`
 
@@ -903,7 +901,7 @@ application, such as Pacemaker.<br />
 
 Default value: `'running'`
 
-##### <a name="-apache--service_name"></a>`service_name`
+##### <a name="service_name"></a>`service_name`
 
 Data type: `String`
 
@@ -911,24 +909,24 @@ Sets the name of the Apache service.
 
 Default value: `$apache::params::service_name`
 
-##### <a name="-apache--service_manage"></a>`service_manage`
+##### <a name="service_manage"></a>`service_manage`
 
 Data type: `Boolean`
 
 Determines whether Puppet manages the HTTPD service's state.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--service_restart"></a>`service_restart`
+##### <a name="service_restart"></a>`service_restart`
 
 Data type: `Optional[String]`
 
 Determines whether Puppet should use a specific command to restart the HTTPD service.
 Values: a command to restart the Apache service.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--timeout"></a>`timeout`
+##### <a name="timeout"></a>`timeout`
 
 Data type: `Integer[0]`
 
@@ -937,25 +935,25 @@ certain events before failing a request.
 
 Default value: `60`
 
-##### <a name="-apache--trace_enable"></a>`trace_enable`
+##### <a name="trace_enable"></a>`trace_enable`
 
-Data type: `Enum['On', 'Off', 'extended']`
+Data type: `Variant[Apache::OnOff, Enum['extended']]`
 
 Controls how Apache handles `TRACE` requests (per RFC 2616) via the `TraceEnable` directive.
 
 Default value: `'On'`
 
-##### <a name="-apache--use_canonical_name"></a>`use_canonical_name`
+##### <a name="use_canonical_name"></a>`use_canonical_name`
 
-Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
+Data type: `Optional[Variant[Apache::OnOff, Enum['DNS', 'dns']]]`
 
 Controls Apache's `UseCanonicalName` directive which controls how Apache handles
 self-referential URLs. If not specified, this parameter omits the declaration from the
 server's configuration and uses Apache's default setting of 'off'.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--use_systemd"></a>`use_systemd`
+##### <a name="use_systemd"></a>`use_systemd`
 
 Data type: `Boolean`
 
@@ -964,7 +962,7 @@ especially useful if using custom-built RPMs.
 
 Default value: `$apache::params::use_systemd`
 
-##### <a name="-apache--file_mode"></a>`file_mode`
+##### <a name="file_mode"></a>`file_mode`
 
 Data type: `Stdlib::Filemode`
 
@@ -973,7 +971,7 @@ Valid values are: a string, with permissions mode in symbolic or numeric notatio
 
 Default value: `$apache::params::file_mode`
 
-##### <a name="-apache--root_directory_options"></a>`root_directory_options`
+##### <a name="root_directory_options"></a>`root_directory_options`
 
 Data type: `Array`
 
@@ -981,7 +979,7 @@ Array of the desired options for the `/` directory in httpd.conf.
 
 Default value: `$apache::params::root_directory_options`
 
-##### <a name="-apache--root_directory_secured"></a>`root_directory_secured`
+##### <a name="root_directory_secured"></a>`root_directory_secured`
 
 Data type: `Boolean`
 
@@ -991,9 +989,9 @@ allows access to all resources that are missing a more specific access policy. A
 used to allow access to these resources (for example, in a directory block using the
 `directories` parameter).
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost_dir"></a>`vhost_dir`
+##### <a name="vhost_dir"></a>`vhost_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -1001,7 +999,7 @@ Changes your virtual host configuration files' location.
 
 Default value: `$apache::params::vhost_dir`
 
-##### <a name="-apache--vhost_include_pattern"></a>`vhost_include_pattern`
+##### <a name="vhost_include_pattern"></a>`vhost_include_pattern`
 
 Data type: `String`
 
@@ -1014,7 +1012,7 @@ files ending in `.conf`.
 
 Default value: `$apache::params::vhost_include_pattern`
 
-##### <a name="-apache--user"></a>`user`
+##### <a name="user"></a>`user`
 
 Data type: `String`
 
@@ -1024,7 +1022,7 @@ To prevent Puppet from managing the user, set the `manage_user` parameter to `fa
 
 Default value: `$apache::params::user`
 
-##### <a name="-apache--apache_name"></a>`apache_name`
+##### <a name="apache_name"></a>`apache_name`
 
 Data type: `String`
 
@@ -1034,7 +1032,7 @@ For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::s
 
 Default value: `$apache::params::apache_name`
 
-##### <a name="-apache--error_log"></a>`error_log`
+##### <a name="error_log"></a>`error_log`
 
 Data type: `String`
 
@@ -1044,7 +1042,7 @@ The name of the error log file for the main server instance. If the string start
 
 Default value: `$apache::params::error_log`
 
-##### <a name="-apache--scriptalias"></a>`scriptalias`
+##### <a name="scriptalias"></a>`scriptalias`
 
 Data type: `String`
 
@@ -1052,7 +1050,7 @@ Directory to use for global script alias
 
 Default value: `$apache::params::scriptalias`
 
-##### <a name="-apache--access_log_file"></a>`access_log_file`
+##### <a name="access_log_file"></a>`access_log_file`
 
 Data type: `String`
 
@@ -1060,7 +1058,7 @@ The name of the access log file for the main server instance.
 
 Default value: `$apache::params::access_log_file`
 
-##### <a name="-apache--limitreqfields"></a>`limitreqfields`
+##### <a name="limitreqfields"></a>`limitreqfields`
 
 Data type: `Integer`
 
@@ -1072,7 +1070,7 @@ response from the server that indicates too many fields were sent in the request
 
 Default value: `100`
 
-##### <a name="-apache--limitreqfieldsize"></a>`limitreqfieldsize`
+##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
 
 Data type: `Integer`
 
@@ -1081,32 +1079,32 @@ be allowed within a request header.
 
 Default value: `8190`
 
-##### <a name="-apache--limitreqline"></a>`limitreqline`
+##### <a name="limitreqline"></a>`limitreqline`
 
 Data type: `Optional[Integer]`
 
 The 'limitreqline' parameter sets the limit on the allowed size of a client's HTTP request-line
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--ip"></a>`ip`
+##### <a name="ip"></a>`ip`
 
 Data type: `Optional[String]`
 
 Specifies the ip address
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--purge_vdir"></a>`purge_vdir`
+##### <a name="purge_vdir"></a>`purge_vdir`
 
 Data type: `Boolean`
 
 Removes all other Apache configs and virtual hosts.<br />
 > **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.<br />
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--conf_enabled"></a>`conf_enabled`
+##### <a name="conf_enabled"></a>`conf_enabled`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1114,7 +1112,7 @@ Whether the additional config files in `/etc/apache2/conf-enabled` should be man
 
 Default value: `$apache::params::conf_enabled`
 
-##### <a name="-apache--vhost_enable_dir"></a>`vhost_enable_dir`
+##### <a name="vhost_enable_dir"></a>`vhost_enable_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1123,15 +1121,15 @@ they will be symlinked to and from sites-enabled.
 
 Default value: `$apache::params::vhost_enable_dir`
 
-##### <a name="-apache--manage_vhost_enable_dir"></a>`manage_vhost_enable_dir`
+##### <a name="manage_vhost_enable_dir"></a>`manage_vhost_enable_dir`
 
 Data type: `Boolean`
 
 Overides the vhost_enable_dir inherited parameters and allows it to be disabled
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod_enable_dir"></a>`mod_enable_dir`
+##### <a name="mod_enable_dir"></a>`mod_enable_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1139,25 +1137,25 @@ Set's whether the mods-enabled directory should be managed.
 
 Default value: `$apache::params::mod_enable_dir`
 
-##### <a name="-apache--ssl_file"></a>`ssl_file`
+##### <a name="ssl_file"></a>`ssl_file`
 
 Data type: `Optional[String]`
 
 This parameter allows you to set an ssl.conf file to be managed in order to implement
 an SSL Certificate.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--file_e_tag"></a>`file_e_tag`
+##### <a name="file_e_tag"></a>`file_e_tag`
 
 Data type: `Optional[String]`
 
 Sets the server default for the `FileETag` declaration, which modifies the response header
 field for static files.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--use_optional_includes"></a>`use_optional_includes`
+##### <a name="use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Boolean`
 
@@ -1166,7 +1164,7 @@ Specifies whether Apache uses the `IncludeOptional` directive instead of `Includ
 
 Default value: `$apache::params::use_optional_includes`
 
-##### <a name="-apache--mime_types_additional"></a>`mime_types_additional`
+##### <a name="mime_types_additional"></a>`mime_types_additional`
 
 Data type: `Hash`
 
@@ -1174,7 +1172,7 @@ Specifies any idditional Internet media (mime) types that you wish to be configu
 
 Default value: `$apache::params::mime_types_additional`
 
-### <a name="apache--dev"></a>`apache::dev`
+### <a name="apachedev"></a>`apache::dev`
 
 The libraries installed depends on the `dev_packages` parameter of the `apache::params`
 class, based on your operating system:
@@ -1183,7 +1181,7 @@ class, based on your operating system:
 - **Gentoo**: `undef`.
 - **Red Hat**: `httpd-devel`.
 
-### <a name="apache--mod--actions"></a>`apache::mod::actions`
+### <a name="apachemodactions"></a>`apache::mod::actions`
 
 Installs Apache mod_actions
 
@@ -1191,7 +1189,7 @@ Installs Apache mod_actions
   * https://httpd.apache.org/docs/current/mod/mod_actions.html
     * for additional documentation.
 
-### <a name="apache--mod--alias"></a>`apache::mod::alias`
+### <a name="apachemodalias"></a>`apache::mod::alias`
 
 Installs and configures `mod_alias`.
 
@@ -1203,11 +1201,11 @@ Installs and configures `mod_alias`.
 
 The following parameters are available in the `apache::mod::alias` class:
 
-* [`icons_options`](#-apache--mod--alias--icons_options)
-* [`icons_path`](#-apache--mod--alias--icons_path)
-* [`icons_prefix`](#-apache--mod--alias--icons_prefix)
+* [`icons_options`](#icons_options)
+* [`icons_path`](#icons_path)
+* [`icons_prefix`](#icons_prefix)
 
-##### <a name="-apache--mod--alias--icons_options"></a>`icons_options`
+##### <a name="icons_options"></a>`icons_options`
 
 Data type: `String`
 
@@ -1216,7 +1214,7 @@ directive.
 
 Default value: `'Indexes MultiViews'`
 
-##### <a name="-apache--mod--alias--icons_path"></a>`icons_path`
+##### <a name="icons_path"></a>`icons_path`
 
 Data type: `Variant[Boolean, Stdlib::Absolutepath]`
 
@@ -1229,7 +1227,7 @@ Set to 'false' to disable the alias
 
 Default value: `$apache::params::alias_icons_path`
 
-##### <a name="-apache--mod--alias--icons_prefix"></a>`icons_prefix`
+##### <a name="icons_prefix"></a>`icons_prefix`
 
 Data type: `String`
 
@@ -1237,7 +1235,7 @@ Change the alias for /icons/.
 
 Default value: `$apache::params::icons_prefix`
 
-### <a name="apache--mod--apreq2"></a>`apache::mod::apreq2`
+### <a name="apachemodapreq2"></a>`apache::mod::apreq2`
 
 Installs `mod_apreq2`.
 
@@ -1247,7 +1245,7 @@ Installs `mod_apreq2`.
   * http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html
     * for additional documentation.
 
-### <a name="apache--mod--auth_basic"></a>`apache::mod::auth_basic`
+### <a name="apachemodauth_basic"></a>`apache::mod::auth_basic`
 
 Installs `mod_auth_basic`
 
@@ -1255,7 +1253,7 @@ Installs `mod_auth_basic`
   * https://httpd.apache.org/docs/current/mod/mod_auth_basic.html
     * for additional documentation.
 
-### <a name="apache--mod--auth_cas"></a>`apache::mod::auth_cas`
+### <a name="apachemodauth_cas"></a>`apache::mod::auth_cas`
 
 Installs and configures `mod_auth_cas`.
 
@@ -1269,45 +1267,45 @@ Installs and configures `mod_auth_cas`.
 
 The following parameters are available in the `apache::mod::auth_cas` class:
 
-* [`cas_login_url`](#-apache--mod--auth_cas--cas_login_url)
-* [`cas_validate_url`](#-apache--mod--auth_cas--cas_validate_url)
-* [`cas_cookie_path`](#-apache--mod--auth_cas--cas_cookie_path)
-* [`cas_cookie_path_mode`](#-apache--mod--auth_cas--cas_cookie_path_mode)
-* [`cas_version`](#-apache--mod--auth_cas--cas_version)
-* [`cas_debug`](#-apache--mod--auth_cas--cas_debug)
-* [`cas_validate_server`](#-apache--mod--auth_cas--cas_validate_server)
-* [`cas_validate_depth`](#-apache--mod--auth_cas--cas_validate_depth)
-* [`cas_certificate_path`](#-apache--mod--auth_cas--cas_certificate_path)
-* [`cas_proxy_validate_url`](#-apache--mod--auth_cas--cas_proxy_validate_url)
-* [`cas_root_proxied_as`](#-apache--mod--auth_cas--cas_root_proxied_as)
-* [`cas_cookie_entropy`](#-apache--mod--auth_cas--cas_cookie_entropy)
-* [`cas_timeout`](#-apache--mod--auth_cas--cas_timeout)
-* [`cas_idle_timeout`](#-apache--mod--auth_cas--cas_idle_timeout)
-* [`cas_cache_clean_interval`](#-apache--mod--auth_cas--cas_cache_clean_interval)
-* [`cas_cookie_domain`](#-apache--mod--auth_cas--cas_cookie_domain)
-* [`cas_cookie_http_only`](#-apache--mod--auth_cas--cas_cookie_http_only)
-* [`cas_authoritative`](#-apache--mod--auth_cas--cas_authoritative)
-* [`cas_validate_saml`](#-apache--mod--auth_cas--cas_validate_saml)
-* [`cas_sso_enabled`](#-apache--mod--auth_cas--cas_sso_enabled)
-* [`cas_attribute_prefix`](#-apache--mod--auth_cas--cas_attribute_prefix)
-* [`cas_attribute_delimiter`](#-apache--mod--auth_cas--cas_attribute_delimiter)
-* [`cas_scrub_request_headers`](#-apache--mod--auth_cas--cas_scrub_request_headers)
-* [`suppress_warning`](#-apache--mod--auth_cas--suppress_warning)
-
-##### <a name="-apache--mod--auth_cas--cas_login_url"></a>`cas_login_url`
+* [`cas_login_url`](#cas_login_url)
+* [`cas_validate_url`](#cas_validate_url)
+* [`cas_cookie_path`](#cas_cookie_path)
+* [`cas_cookie_path_mode`](#cas_cookie_path_mode)
+* [`cas_version`](#cas_version)
+* [`cas_debug`](#cas_debug)
+* [`cas_validate_server`](#cas_validate_server)
+* [`cas_validate_depth`](#cas_validate_depth)
+* [`cas_certificate_path`](#cas_certificate_path)
+* [`cas_proxy_validate_url`](#cas_proxy_validate_url)
+* [`cas_root_proxied_as`](#cas_root_proxied_as)
+* [`cas_cookie_entropy`](#cas_cookie_entropy)
+* [`cas_timeout`](#cas_timeout)
+* [`cas_idle_timeout`](#cas_idle_timeout)
+* [`cas_cache_clean_interval`](#cas_cache_clean_interval)
+* [`cas_cookie_domain`](#cas_cookie_domain)
+* [`cas_cookie_http_only`](#cas_cookie_http_only)
+* [`cas_authoritative`](#cas_authoritative)
+* [`cas_validate_saml`](#cas_validate_saml)
+* [`cas_sso_enabled`](#cas_sso_enabled)
+* [`cas_attribute_prefix`](#cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
+* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
+* [`suppress_warning`](#suppress_warning)
+
+##### <a name="cas_login_url"></a>`cas_login_url`
 
 Data type: `String`
 
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
 
-##### <a name="-apache--mod--auth_cas--cas_validate_url"></a>`cas_validate_url`
+##### <a name="cas_validate_url"></a>`cas_validate_url`
 
 Data type: `String`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
-##### <a name="-apache--mod--auth_cas--cas_cookie_path"></a>`cas_cookie_path`
+##### <a name="cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `String`
 
@@ -1316,7 +1314,7 @@ be writable by the web server only.
 
 Default value: `$apache::params::cas_cookie_path`
 
-##### <a name="-apache--mod--auth_cas--cas_cookie_path_mode"></a>`cas_cookie_path_mode`
+##### <a name="cas_cookie_path_mode"></a>`cas_cookie_path_mode`
 
 Data type: `Stdlib::Filemode`
 
@@ -1324,7 +1322,7 @@ The mode of cas_cookie_path.
 
 Default value: `'0750'`
 
-##### <a name="-apache--mod--auth_cas--cas_version"></a>`cas_version`
+##### <a name="cas_version"></a>`cas_version`
 
 Data type: `Integer`
 
@@ -1332,7 +1330,7 @@ The version of the CAS protocol to adhere to.
 
 Default value: `2`
 
-##### <a name="-apache--mod--auth_cas--cas_debug"></a>`cas_debug`
+##### <a name="cas_debug"></a>`cas_debug`
 
 Data type: `String`
 
@@ -1340,156 +1338,156 @@ Whether to enable or disable debug mode.
 
 Default value: `'Off'`
 
-##### <a name="-apache--mod--auth_cas--cas_validate_server"></a>`cas_validate_server`
+##### <a name="cas_validate_server"></a>`cas_validate_server`
 
 Data type: `Optional[String]`
 
 Whether to validate the presented certificate. This has been deprecated and
 removed from Version 1.1-RC1 onward.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_validate_depth"></a>`cas_validate_depth`
+##### <a name="cas_validate_depth"></a>`cas_validate_depth`
 
 Data type: `Optional[String]`
 
 The maximum depth for chained certificate validation.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_certificate_path"></a>`cas_certificate_path`
+##### <a name="cas_certificate_path"></a>`cas_certificate_path`
 
 Data type: `Optional[String]`
 
 The path leading to the certificate
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_proxy_validate_url"></a>`cas_proxy_validate_url`
+##### <a name="cas_proxy_validate_url"></a>`cas_proxy_validate_url`
 
 Data type: `Optional[String]`
 
 The URL to use when performing a proxy validation.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_root_proxied_as"></a>`cas_root_proxied_as`
+##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
 
 Data type: `Optional[String]`
 
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_cookie_entropy"></a>`cas_cookie_entropy`
+##### <a name="cas_cookie_entropy"></a>`cas_cookie_entropy`
 
 Data type: `Optional[String]`
 
 When creating a local session, this many random bytes are used to create a unique
 session identifier.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_timeout"></a>`cas_timeout`
+##### <a name="cas_timeout"></a>`cas_timeout`
 
 Data type: `Optional[Integer[0]]`
 
 The hard limit, in seconds, for a mod_auth_cas session.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_idle_timeout"></a>`cas_idle_timeout`
+##### <a name="cas_idle_timeout"></a>`cas_idle_timeout`
 
 Data type: `Optional[Integer[0]]`
 
 The limit, in seconds, of how long a mod_auth_cas session can be idle.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_cache_clean_interval"></a>`cas_cache_clean_interval`
+##### <a name="cas_cache_clean_interval"></a>`cas_cache_clean_interval`
 
 Data type: `Optional[String]`
 
 The minimum amount of time that must pass inbetween cache cleanings.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_cookie_domain"></a>`cas_cookie_domain`
+##### <a name="cas_cookie_domain"></a>`cas_cookie_domain`
 
 Data type: `Optional[String]`
 
 The value for the 'Domain=' parameter in the Set-Cookie header.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_cookie_http_only"></a>`cas_cookie_http_only`
+##### <a name="cas_cookie_http_only"></a>`cas_cookie_http_only`
 
 Data type: `Optional[String]`
 
 Setting this flag prevents the mod_auth_cas cookies from being accessed by
 client side Javascript.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_authoritative"></a>`cas_authoritative`
+##### <a name="cas_authoritative"></a>`cas_authoritative`
 
 Data type: `Optional[String]`
 
 Determines whether an optional authorization directive is authoritative and thus binding.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_validate_saml"></a>`cas_validate_saml`
+##### <a name="cas_validate_saml"></a>`cas_validate_saml`
 
 Data type: `Optional[String]`
 
 Parse response from CAS server for SAML.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_sso_enabled"></a>`cas_sso_enabled`
+##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Optional[String]`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_attribute_prefix"></a>`cas_attribute_prefix`
+##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Optional[String]`
 
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_attribute_delimiter"></a>`cas_attribute_delimiter`
+##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Optional[String]`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--cas_scrub_request_headers"></a>`cas_scrub_request_headers`
+##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
 Data type: `Optional[String]`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_cas--suppress_warning"></a>`suppress_warning`
+##### <a name="suppress_warning"></a>`suppress_warning`
 
 Data type: `Boolean`
 
 Suppress warning about being on RedHat (mod_auth_cas package is now available in epel-testing repo).
 
-Default value: `false`
+Default value: ``false``
 
-### <a name="apache--mod--auth_gssapi"></a>`apache::mod::auth_gssapi`
+### <a name="apachemodauth_gssapi"></a>`apache::mod::auth_gssapi`
 
 Installs `mod_auth_gsappi`.
 
@@ -1497,7 +1495,7 @@ Installs `mod_auth_gsappi`.
   * https://github.com/modauthgssapi/mod_auth_gssapi
     * for additional documentation.
 
-### <a name="apache--mod--auth_kerb"></a>`apache::mod::auth_kerb`
+### <a name="apachemodauth_kerb"></a>`apache::mod::auth_kerb`
 
 Installs `mod_auth_kerb`
 
@@ -1505,7 +1503,7 @@ Installs `mod_auth_kerb`
   * http://modauthkerb.sourceforge.net
     * for additional documentation.
 
-### <a name="apache--mod--auth_mellon"></a>`apache::mod::auth_mellon`
+### <a name="apachemodauth_mellon"></a>`apache::mod::auth_mellon`
 
 Installs and configures `mod_auth_mellon`.
 
@@ -1517,15 +1515,15 @@ Installs and configures `mod_auth_mellon`.
 
 The following parameters are available in the `apache::mod::auth_mellon` class:
 
-* [`mellon_cache_size`](#-apache--mod--auth_mellon--mellon_cache_size)
-* [`mellon_lock_file`](#-apache--mod--auth_mellon--mellon_lock_file)
-* [`mellon_post_directory`](#-apache--mod--auth_mellon--mellon_post_directory)
-* [`mellon_cache_entry_size`](#-apache--mod--auth_mellon--mellon_cache_entry_size)
-* [`mellon_post_ttl`](#-apache--mod--auth_mellon--mellon_post_ttl)
-* [`mellon_post_size`](#-apache--mod--auth_mellon--mellon_post_size)
-* [`mellon_post_count`](#-apache--mod--auth_mellon--mellon_post_count)
+* [`mellon_cache_size`](#mellon_cache_size)
+* [`mellon_lock_file`](#mellon_lock_file)
+* [`mellon_post_directory`](#mellon_post_directory)
+* [`mellon_cache_entry_size`](#mellon_cache_entry_size)
+* [`mellon_post_ttl`](#mellon_post_ttl)
+* [`mellon_post_size`](#mellon_post_size)
+* [`mellon_post_count`](#mellon_post_count)
 
-##### <a name="-apache--mod--auth_mellon--mellon_cache_size"></a>`mellon_cache_size`
+##### <a name="mellon_cache_size"></a>`mellon_cache_size`
 
 Data type: `Optional[Integer]`
 
@@ -1533,7 +1531,7 @@ Maximum number of sessions which can be active at once.
 
 Default value: `$apache::params::mellon_cache_size`
 
-##### <a name="-apache--mod--auth_mellon--mellon_lock_file"></a>`mellon_lock_file`
+##### <a name="mellon_lock_file"></a>`mellon_lock_file`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1541,7 +1539,7 @@ Full path to a file used for synchronizing access to the session data.
 
 Default value: `$apache::params::mellon_lock_file`
 
-##### <a name="-apache--mod--auth_mellon--mellon_post_directory"></a>`mellon_post_directory`
+##### <a name="mellon_post_directory"></a>`mellon_post_directory`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1549,39 +1547,39 @@ Full path of a directory where POST requests are saved during authentication.
 
 Default value: `$apache::params::mellon_post_directory`
 
-##### <a name="-apache--mod--auth_mellon--mellon_cache_entry_size"></a>`mellon_cache_entry_size`
+##### <a name="mellon_cache_entry_size"></a>`mellon_cache_entry_size`
 
 Data type: `Optional[Integer]`
 
 Maximum size for a single session entry in bytes.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_mellon--mellon_post_ttl"></a>`mellon_post_ttl`
+##### <a name="mellon_post_ttl"></a>`mellon_post_ttl`
 
 Data type: `Optional[Integer]`
 
 Delay in seconds before a saved POST request can be flushed.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_mellon--mellon_post_size"></a>`mellon_post_size`
+##### <a name="mellon_post_size"></a>`mellon_post_size`
 
 Data type: `Optional[Integer]`
 
 Maximum size for saved POST requests.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--auth_mellon--mellon_post_count"></a>`mellon_post_count`
+##### <a name="mellon_post_count"></a>`mellon_post_count`
 
 Data type: `Optional[Integer]`
 
 Maximum amount of saved POST requests.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--auth_openidc"></a>`apache::mod::auth_openidc`
+### <a name="apachemodauth_openidc"></a>`apache::mod::auth_openidc`
 
 Installs and configures `mod_auth_openidc`.
 
@@ -1595,19 +1593,19 @@ Installs and configures `mod_auth_openidc`.
 
 The following parameters are available in the `apache::mod::auth_openidc` class:
 
-* [`manage_dnf_module`](#-apache--mod--auth_openidc--manage_dnf_module)
-* [`dnf_module_ensure`](#-apache--mod--auth_openidc--dnf_module_ensure)
-* [`dnf_module_name`](#-apache--mod--auth_openidc--dnf_module_name)
+* [`manage_dnf_module`](#manage_dnf_module)
+* [`dnf_module_ensure`](#dnf_module_ensure)
+* [`dnf_module_name`](#dnf_module_name)
 
-##### <a name="-apache--mod--auth_openidc--manage_dnf_module"></a>`manage_dnf_module`
+##### <a name="manage_dnf_module"></a>`manage_dnf_module`
 
 Data type: `Boolean`
 
 Whether to manage the DNF module
 
-Default value: `$facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8'`
+Default value: `and`
 
-##### <a name="-apache--mod--auth_openidc--dnf_module_ensure"></a>`dnf_module_ensure`
+##### <a name="dnf_module_ensure"></a>`dnf_module_ensure`
 
 Data type: `String[1]`
 
@@ -1615,7 +1613,7 @@ The DNF module name to ensure. Only relevant if manage_dnf_module is set to true
 
 Default value: `'present'`
 
-##### <a name="-apache--mod--auth_openidc--dnf_module_name"></a>`dnf_module_name`
+##### <a name="dnf_module_name"></a>`dnf_module_name`
 
 Data type: `String[1]`
 
@@ -1623,7 +1621,7 @@ The DNF module name to manage. Only relevant if manage_dnf_module is set to true
 
 Default value: `'mod_auth_openidc'`
 
-### <a name="apache--mod--authn_core"></a>`apache::mod::authn_core`
+### <a name="apachemodauthn_core"></a>`apache::mod::authn_core`
 
 Installs `mod_authn_core`.
 
@@ -1631,7 +1629,7 @@ Installs `mod_authn_core`.
   * https://httpd.apache.org/docs/current/mod/mod_authn_core.html
     * for additional documentation.
 
-### <a name="apache--mod--authn_dbd"></a>`apache::mod::authn_dbd`
+### <a name="apachemodauthn_dbd"></a>`apache::mod::authn_dbd`
 
 Installs `mod_authn_dbd`.
 
@@ -1643,22 +1641,22 @@ Installs `mod_authn_dbd`.
 
 The following parameters are available in the `apache::mod::authn_dbd` class:
 
-* [`authn_dbd_params`](#-apache--mod--authn_dbd--authn_dbd_params)
-* [`authn_dbd_dbdriver`](#-apache--mod--authn_dbd--authn_dbd_dbdriver)
-* [`authn_dbd_query`](#-apache--mod--authn_dbd--authn_dbd_query)
-* [`authn_dbd_min`](#-apache--mod--authn_dbd--authn_dbd_min)
-* [`authn_dbd_max`](#-apache--mod--authn_dbd--authn_dbd_max)
-* [`authn_dbd_keep`](#-apache--mod--authn_dbd--authn_dbd_keep)
-* [`authn_dbd_exptime`](#-apache--mod--authn_dbd--authn_dbd_exptime)
-* [`authn_dbd_alias`](#-apache--mod--authn_dbd--authn_dbd_alias)
+* [`authn_dbd_params`](#authn_dbd_params)
+* [`authn_dbd_dbdriver`](#authn_dbd_dbdriver)
+* [`authn_dbd_query`](#authn_dbd_query)
+* [`authn_dbd_min`](#authn_dbd_min)
+* [`authn_dbd_max`](#authn_dbd_max)
+* [`authn_dbd_keep`](#authn_dbd_keep)
+* [`authn_dbd_exptime`](#authn_dbd_exptime)
+* [`authn_dbd_alias`](#authn_dbd_alias)
 
-##### <a name="-apache--mod--authn_dbd--authn_dbd_params"></a>`authn_dbd_params`
+##### <a name="authn_dbd_params"></a>`authn_dbd_params`
 
 Data type: `Optional[String]`
 
 The params needed for the mod to function.
 
-##### <a name="-apache--mod--authn_dbd--authn_dbd_dbdriver"></a>`authn_dbd_dbdriver`
+##### <a name="authn_dbd_dbdriver"></a>`authn_dbd_dbdriver`
 
 Data type: `String`
 
@@ -1666,15 +1664,15 @@ Selects an apr_dbd driver by name.
 
 Default value: `'mysql'`
 
-##### <a name="-apache--mod--authn_dbd--authn_dbd_query"></a>`authn_dbd_query`
+##### <a name="authn_dbd_query"></a>`authn_dbd_query`
 
 Data type: `Optional[String]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--authn_dbd--authn_dbd_min"></a>`authn_dbd_min`
+##### <a name="authn_dbd_min"></a>`authn_dbd_min`
 
 Data type: `Integer`
 
@@ -1682,7 +1680,7 @@ Set the minimum number of connections per process.
 
 Default value: `4`
 
-##### <a name="-apache--mod--authn_dbd--authn_dbd_max"></a>`authn_dbd_max`
+##### <a name="authn_dbd_max"></a>`authn_dbd_max`
 
 Data type: `Integer`
 
@@ -1690,7 +1688,7 @@ Set the maximum number of connections per process.
 
 Default value: `20`
 
-##### <a name="-apache--mod--authn_dbd--authn_dbd_keep"></a>`authn_dbd_keep`
+##### <a name="authn_dbd_keep"></a>`authn_dbd_keep`
 
 Data type: `Integer`
 
@@ -1698,7 +1696,7 @@ Set the maximum number of connections per process to be sustained.
 
 Default value: `8`
 
-##### <a name="-apache--mod--authn_dbd--authn_dbd_exptime"></a>`authn_dbd_exptime`
+##### <a name="authn_dbd_exptime"></a>`authn_dbd_exptime`
 
 Data type: `Integer`
 
@@ -1707,15 +1705,15 @@ connections specified in DBDKeep has been exceeded.
 
 Default value: `300`
 
-##### <a name="-apache--mod--authn_dbd--authn_dbd_alias"></a>`authn_dbd_alias`
+##### <a name="authn_dbd_alias"></a>`authn_dbd_alias`
 
 Data type: `Optional[String]`
 
 Sets an alias for `AuthnProvider.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--authn_file"></a>`apache::mod::authn_file`
+### <a name="apachemodauthn_file"></a>`apache::mod::authn_file`
 
 Installs `mod_authn_file`.
 
@@ -1723,7 +1721,7 @@ Installs `mod_authn_file`.
   * https://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
     * for additional documentation.
 
-### <a name="apache--mod--authnz_ldap"></a>`apache::mod::authnz_ldap`
+### <a name="apachemodauthnz_ldap"></a>`apache::mod::authnz_ldap`
 
 Installs `mod_authnz_ldap`.
 
@@ -1737,26 +1735,26 @@ Installs `mod_authnz_ldap`.
 
 The following parameters are available in the `apache::mod::authnz_ldap` class:
 
-* [`verify_server_cert`](#-apache--mod--authnz_ldap--verify_server_cert)
-* [`package_name`](#-apache--mod--authnz_ldap--package_name)
+* [`verify_server_cert`](#verify_server_cert)
+* [`package_name`](#package_name)
 
-##### <a name="-apache--mod--authnz_ldap--verify_server_cert"></a>`verify_server_cert`
+##### <a name="verify_server_cert"></a>`verify_server_cert`
 
 Data type: `Boolean`
 
 Whether to force te verification of a server cert or not.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--authnz_ldap--package_name"></a>`package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 The name of the ldap package.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--authnz_pam"></a>`apache::mod::authnz_pam`
+### <a name="apachemodauthnz_pam"></a>`apache::mod::authnz_pam`
 
 Installs `mod_authnz_pam`.
 
@@ -1764,7 +1762,15 @@ Installs `mod_authnz_pam`.
   * https://www.adelton.com/apache/mod_authnz_pam
     * for additional documentation.
 
-### <a name="apache--mod--authz_groupfile"></a>`apache::mod::authz_groupfile`
+### <a name="apachemodauthz_core"></a>`apache::mod::authz_core`
+
+Installs `mod_authz_core`.
+
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/mod_authz_core.html
+    * for additional documentation.
+
+### <a name="apachemodauthz_groupfile"></a>`apache::mod::authz_groupfile`
 
 Installs `mod_authz_groupfile`
 
@@ -1772,7 +1778,7 @@ Installs `mod_authz_groupfile`
   * https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html
     * for additional documentation.
 
-### <a name="apache--mod--authz_user"></a>`apache::mod::authz_user`
+### <a name="apachemodauthz_user"></a>`apache::mod::authz_user`
 
 Installs `mod_authz_user`
 
@@ -1780,7 +1786,7 @@ Installs `mod_authz_user`
   * https://httpd.apache.org/docs/current/mod/mod_authz_user.html
     * for additional documentation.
 
-### <a name="apache--mod--autoindex"></a>`apache::mod::autoindex`
+### <a name="apachemodautoindex"></a>`apache::mod::autoindex`
 
 Installs `mod_autoindex`
 
@@ -1792,9 +1798,9 @@ Installs `mod_autoindex`
 
 The following parameters are available in the `apache::mod::autoindex` class:
 
-* [`icons_prefix`](#-apache--mod--autoindex--icons_prefix)
+* [`icons_prefix`](#icons_prefix)
 
-##### <a name="-apache--mod--autoindex--icons_prefix"></a>`icons_prefix`
+##### <a name="icons_prefix"></a>`icons_prefix`
 
 Data type: `String`
 
@@ -1802,7 +1808,7 @@ Change the alias for /icons/.
 
 Default value: `$apache::params::icons_prefix`
 
-### <a name="apache--mod--cache"></a>`apache::mod::cache`
+### <a name="apachemodcache"></a>`apache::mod::cache`
 
 Installs `mod_cache`
 
@@ -1810,7 +1816,7 @@ Installs `mod_cache`
   * https://httpd.apache.org/docs/current/mod/mod_cache.html
     * for additional documentation.
 
-### <a name="apache--mod--cgi"></a>`apache::mod::cgi`
+### <a name="apachemodcgi"></a>`apache::mod::cgi`
 
 Installs `mod_cgi`.
 
@@ -1818,14 +1824,14 @@ Installs `mod_cgi`.
   * https://httpd.apache.org/docs/current/mod/mod_cgi.html
     * for additional documentation.
 
-### <a name="apache--mod--cgid"></a>`apache::mod::cgid`
+### <a name="apachemodcgid"></a>`apache::mod::cgid`
 
 Installs `mod_cgid`.
 
 * **See also**
   * https://httpd.apache.org/docs/current/mod/mod_cgid.html
 
-### <a name="apache--mod--cluster"></a>`apache::mod::cluster`
+### <a name="apachemodcluster"></a>`apache::mod::cluster`
 
 Installs `mod_cluster`.
 
@@ -1853,51 +1859,51 @@ class { '::apache::mod::cluster':
 
 The following parameters are available in the `apache::mod::cluster` class:
 
-* [`allowed_network`](#-apache--mod--cluster--allowed_network)
-* [`balancer_name`](#-apache--mod--cluster--balancer_name)
-* [`ip`](#-apache--mod--cluster--ip)
-* [`version`](#-apache--mod--cluster--version)
-* [`enable_mcpm_receive`](#-apache--mod--cluster--enable_mcpm_receive)
-* [`port`](#-apache--mod--cluster--port)
-* [`keep_alive_timeout`](#-apache--mod--cluster--keep_alive_timeout)
-* [`manager_allowed_network`](#-apache--mod--cluster--manager_allowed_network)
-* [`max_keep_alive_requests`](#-apache--mod--cluster--max_keep_alive_requests)
-* [`server_advertise`](#-apache--mod--cluster--server_advertise)
-* [`advertise_frequency`](#-apache--mod--cluster--advertise_frequency)
+* [`allowed_network`](#allowed_network)
+* [`balancer_name`](#balancer_name)
+* [`ip`](#ip)
+* [`version`](#version)
+* [`enable_mcpm_receive`](#enable_mcpm_receive)
+* [`port`](#port)
+* [`keep_alive_timeout`](#keep_alive_timeout)
+* [`manager_allowed_network`](#manager_allowed_network)
+* [`max_keep_alive_requests`](#max_keep_alive_requests)
+* [`server_advertise`](#server_advertise)
+* [`advertise_frequency`](#advertise_frequency)
 
-##### <a name="-apache--mod--cluster--allowed_network"></a>`allowed_network`
+##### <a name="allowed_network"></a>`allowed_network`
 
 Data type: `String`
 
 Balanced members network.
 
-##### <a name="-apache--mod--cluster--balancer_name"></a>`balancer_name`
+##### <a name="balancer_name"></a>`balancer_name`
 
 Data type: `String`
 
 Name of balancer.
 
-##### <a name="-apache--mod--cluster--ip"></a>`ip`
+##### <a name="ip"></a>`ip`
 
 Data type: `Stdlib::IP::Address`
 
 Specifies the IP address to listen to.
 
-##### <a name="-apache--mod--cluster--version"></a>`version`
+##### <a name="version"></a>`version`
 
 Data type: `String`
 
 Specifies the mod_cluster version. Version 1.3.0 or greater is required for httpd 2.4.
 
-##### <a name="-apache--mod--cluster--enable_mcpm_receive"></a>`enable_mcpm_receive`
+##### <a name="enable_mcpm_receive"></a>`enable_mcpm_receive`
 
 Data type: `Boolean`
 
 Whether MCPM should be enabled.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--cluster--port"></a>`port`
+##### <a name="port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -1905,7 +1911,7 @@ mod_cluster listen port.
 
 Default value: `6666`
 
-##### <a name="-apache--mod--cluster--keep_alive_timeout"></a>`keep_alive_timeout`
+##### <a name="keep_alive_timeout"></a>`keep_alive_timeout`
 
 Data type: `Integer`
 
@@ -1913,7 +1919,7 @@ Specifies how long Apache should wait for a request, in seconds.
 
 Default value: `60`
 
-##### <a name="-apache--mod--cluster--manager_allowed_network"></a>`manager_allowed_network`
+##### <a name="manager_allowed_network"></a>`manager_allowed_network`
 
 Data type: `Stdlib::IP::Address`
 
@@ -1921,7 +1927,7 @@ Whether to allow the network to access the mod_cluster_manager.
 
 Default value: `'127.0.0.1'`
 
-##### <a name="-apache--mod--cluster--max_keep_alive_requests"></a>`max_keep_alive_requests`
+##### <a name="max_keep_alive_requests"></a>`max_keep_alive_requests`
 
 Data type: `Integer`
 
@@ -1929,23 +1935,23 @@ Maximum number of requests kept alive.
 
 Default value: `0`
 
-##### <a name="-apache--mod--cluster--server_advertise"></a>`server_advertise`
+##### <a name="server_advertise"></a>`server_advertise`
 
 Data type: `Boolean`
 
 Whether the server should advertise.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--cluster--advertise_frequency"></a>`advertise_frequency`
+##### <a name="advertise_frequency"></a>`advertise_frequency`
 
 Data type: `Optional[String]`
 
 Sets the interval between advertise messages in seconds.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--data"></a>`apache::mod::data`
+### <a name="apachemoddata"></a>`apache::mod::data`
 
 Installs and configures `mod_data`.
 
@@ -1953,7 +1959,7 @@ Installs and configures `mod_data`.
   * https://httpd.apache.org/docs/current/mod/mod_data.html
     * for additional documentation.
 
-### <a name="apache--mod--dav"></a>`apache::mod::dav`
+### <a name="apachemoddav"></a>`apache::mod::dav`
 
 Installs `mod_dav`.
 
@@ -1961,7 +1967,7 @@ Installs `mod_dav`.
   * https://httpd.apache.org/docs/current/mod/mod_dav.html
     * for additional documentation.
 
-### <a name="apache--mod--dav_fs"></a>`apache::mod::dav_fs`
+### <a name="apachemoddav_fs"></a>`apache::mod::dav_fs`
 
 Installs `mod_dav_fs`.
 
@@ -1969,7 +1975,7 @@ Installs `mod_dav_fs`.
   * https://httpd.apache.org/docs/current/mod/mod_dav_fs.html
     * for additional documentation.
 
-### <a name="apache--mod--dav_svn"></a>`apache::mod::dav_svn`
+### <a name="apachemoddav_svn"></a>`apache::mod::dav_svn`
 
 Installs and configures `mod_dav_svn`.
 
@@ -1981,17 +1987,17 @@ Installs and configures `mod_dav_svn`.
 
 The following parameters are available in the `apache::mod::dav_svn` class:
 
-* [`authz_svn_enabled`](#-apache--mod--dav_svn--authz_svn_enabled)
+* [`authz_svn_enabled`](#authz_svn_enabled)
 
-##### <a name="-apache--mod--dav_svn--authz_svn_enabled"></a>`authz_svn_enabled`
+##### <a name="authz_svn_enabled"></a>`authz_svn_enabled`
 
 Data type: `Boolean`
 
 Specifies whether to install Apache mod_authz_svn
 
-Default value: `false`
+Default value: ``false``
 
-### <a name="apache--mod--dbd"></a>`apache::mod::dbd`
+### <a name="apachemoddbd"></a>`apache::mod::dbd`
 
 Installs `mod_dbd`.
 
@@ -1999,7 +2005,7 @@ Installs `mod_dbd`.
   * https://httpd.apache.org/docs/current/mod/mod_dbd.html
     * for additional documentation.
 
-### <a name="apache--mod--deflate"></a>`apache::mod::deflate`
+### <a name="apachemoddeflate"></a>`apache::mod::deflate`
 
 Installs and configures `mod_deflate`.
 
@@ -2011,50 +2017,42 @@ Installs and configures `mod_deflate`.
 
 The following parameters are available in the `apache::mod::deflate` class:
 
-* [`types`](#-apache--mod--deflate--types)
-* [`notes`](#-apache--mod--deflate--notes)
+* [`types`](#types)
+* [`notes`](#notes)
 
-##### <a name="-apache--mod--deflate--types"></a>`types`
+##### <a name="types"></a>`types`
 
 Data type: `Array[String]`
 
 An array of MIME types to be deflated. See https://www.iana.org/assignments/media-types/media-types.xhtml.
 
-Default value:
-
-```puppet
-[
+Default value: `[
     'text/html text/plain text/xml',
     'text/css',
     'application/x-javascript application/javascript application/ecmascript',
     'application/rss+xml',
     'application/json',
-  ]
-```
+  ]`
 
-##### <a name="-apache--mod--deflate--notes"></a>`notes`
+##### <a name="notes"></a>`notes`
 
 Data type: `Hash`
 
 A Hash where the key represents the type and the value represents the note name.
 
-Default value:
-
-```puppet
-{
+Default value: `{
     'Input'  => 'instream',
     'Output' => 'outstream',
     'Ratio'  => 'ratio',
-  }
-```
+  }`
 
-### <a name="apache--mod--dev"></a>`apache::mod::dev`
+### <a name="apachemoddev"></a>`apache::mod::dev`
 
 Installs `mod_dev`.
 
 * **Note** This module is deprecated. Please use `apache::dev`.
 
-### <a name="apache--mod--dir"></a>`apache::mod::dir`
+### <a name="apachemoddir"></a>`apache::mod::dir`
 
 Installs and configures `mod_dir`.
 
@@ -2069,10 +2067,10 @@ DirectoryIndex statements in a vhost configuration
 
 The following parameters are available in the `apache::mod::dir` class:
 
-* [`dir`](#-apache--mod--dir--dir)
-* [`indexes`](#-apache--mod--dir--indexes)
+* [`dir`](#dir)
+* [`indexes`](#indexes)
 
-##### <a name="-apache--mod--dir--dir"></a>`dir`
+##### <a name="dir"></a>`dir`
 
 Data type: `String`
 
@@ -2080,26 +2078,22 @@ Data type: `String`
 
 Default value: `'public_html'`
 
-##### <a name="-apache--mod--dir--indexes"></a>`indexes`
+##### <a name="indexes"></a>`indexes`
 
 Data type: `Array[String]`
 
 Provides a string for the DirectoryIndex directive
 
-Default value:
-
-```puppet
-[
+Default value: `[
     'index.html',
     'index.html.var',
     'index.cgi',
     'index.pl',
     'index.php',
     'index.xhtml',
-  ]
-```
+  ]`
 
-### <a name="apache--mod--disk_cache"></a>`apache::mod::disk_cache`
+### <a name="apachemoddisk_cache"></a>`apache::mod::disk_cache`
 
 Installs and configures `mod_disk_cache`.
 
@@ -2113,11 +2107,11 @@ Installs and configures `mod_disk_cache`.
 
 The following parameters are available in the `apache::mod::disk_cache` class:
 
-* [`cache_root`](#-apache--mod--disk_cache--cache_root)
-* [`cache_ignore_headers`](#-apache--mod--disk_cache--cache_ignore_headers)
-* [`default_cache_enable`](#-apache--mod--disk_cache--default_cache_enable)
+* [`cache_root`](#cache_root)
+* [`cache_ignore_headers`](#cache_ignore_headers)
+* [`default_cache_enable`](#default_cache_enable)
 
-##### <a name="-apache--mod--disk_cache--cache_root"></a>`cache_root`
+##### <a name="cache_root"></a>`cache_root`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -2127,17 +2121,17 @@ Default depends on the Apache version and operating system:
 - FreeBSD: /var/cache/mod_cache_disk
 - Red Hat: /var/cache/httpd/proxy
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--disk_cache--cache_ignore_headers"></a>`cache_ignore_headers`
+##### <a name="cache_ignore_headers"></a>`cache_ignore_headers`
 
 Data type: `Optional[String]`
 
 Specifies HTTP header(s) that should not be stored in the cache.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--disk_cache--default_cache_enable"></a>`default_cache_enable`
+##### <a name="default_cache_enable"></a>`default_cache_enable`
 
 Data type: `Boolean`
 
@@ -2145,9 +2139,9 @@ Default value is true, which enables "CacheEnable disk /" in disk_cache.conf for
 every request to apache by default for every vhost. If set to false the default cache all behaviour is supressed.
 You can then control this behaviour in individual vhosts by explicitly defining CacheEnable.
 
-Default value: `true`
+Default value: ``true``
 
-### <a name="apache--mod--dumpio"></a>`apache::mod::dumpio`
+### <a name="apachemoddumpio"></a>`apache::mod::dumpio`
 
 Installs and configures `mod_dumpio`.
 
@@ -2174,26 +2168,26 @@ class{'apache::mod::dumpio':
 
 The following parameters are available in the `apache::mod::dumpio` class:
 
-* [`dump_io_input`](#-apache--mod--dumpio--dump_io_input)
-* [`dump_io_output`](#-apache--mod--dumpio--dump_io_output)
+* [`dump_io_input`](#dump_io_input)
+* [`dump_io_output`](#dump_io_output)
 
-##### <a name="-apache--mod--dumpio--dump_io_input"></a>`dump_io_input`
+##### <a name="dump_io_input"></a>`dump_io_input`
 
-Data type: `Enum['Off', 'On', 'off', 'on']`
+Data type: `Apache::OnOff`
 
 Dump all input data to the error log
 
 Default value: `'Off'`
 
-##### <a name="-apache--mod--dumpio--dump_io_output"></a>`dump_io_output`
+##### <a name="dump_io_output"></a>`dump_io_output`
 
-Data type: `Enum['Off', 'On', 'off', 'on']`
+Data type: `Apache::OnOff`
 
 Dump all output data to the error log
 
 Default value: `'Off'`
 
-### <a name="apache--mod--env"></a>`apache::mod::env`
+### <a name="apachemodenv"></a>`apache::mod::env`
 
 Installs `mod_env`.
 
@@ -2201,7 +2195,7 @@ Installs `mod_env`.
   * https://httpd.apache.org/docs/current/mod/mod_env.html
     * for additional documentation.
 
-### <a name="apache--mod--event"></a>`apache::mod::event`
+### <a name="apachemodevent"></a>`apache::mod::event`
 
 Installs and configures `mod_event`.
 
@@ -2216,17 +2210,17 @@ apache::mod::worker on the same server.
 
 The following parameters are available in the `apache::mod::event` class:
 
-* [`startservers`](#-apache--mod--event--startservers)
-* [`maxrequestworkers`](#-apache--mod--event--maxrequestworkers)
-* [`minsparethreads`](#-apache--mod--event--minsparethreads)
-* [`maxsparethreads`](#-apache--mod--event--maxsparethreads)
-* [`threadsperchild`](#-apache--mod--event--threadsperchild)
-* [`maxconnectionsperchild`](#-apache--mod--event--maxconnectionsperchild)
-* [`serverlimit`](#-apache--mod--event--serverlimit)
-* [`threadlimit`](#-apache--mod--event--threadlimit)
-* [`listenbacklog`](#-apache--mod--event--listenbacklog)
+* [`startservers`](#startservers)
+* [`maxrequestworkers`](#maxrequestworkers)
+* [`minsparethreads`](#minsparethreads)
+* [`maxsparethreads`](#maxsparethreads)
+* [`threadsperchild`](#threadsperchild)
+* [`maxconnectionsperchild`](#maxconnectionsperchild)
+* [`serverlimit`](#serverlimit)
+* [`threadlimit`](#threadlimit)
+* [`listenbacklog`](#listenbacklog)
 
-##### <a name="-apache--mod--event--startservers"></a>`startservers`
+##### <a name="startservers"></a>`startservers`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2235,16 +2229,16 @@ removes the parameter.
 
 Default value: `2`
 
-##### <a name="-apache--mod--event--maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Optional[Variant[Integer, Boolean]]`
 
 Sets the maximum number of connections Apache can simultaneously process, via the module's `MaxRequestWorkers` directive. Setting
 these to `false` removes the parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--event--minsparethreads"></a>`minsparethreads`
+##### <a name="minsparethreads"></a>`minsparethreads`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2252,7 +2246,7 @@ Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Se
 
 Default value: `25`
 
-##### <a name="-apache--mod--event--maxsparethreads"></a>`maxsparethreads`
+##### <a name="maxsparethreads"></a>`maxsparethreads`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2260,7 +2254,7 @@ Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Se
 
 Default value: `75`
 
-##### <a name="-apache--mod--event--threadsperchild"></a>`threadsperchild`
+##### <a name="threadsperchild"></a>`threadsperchild`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2268,15 +2262,15 @@ Number of threads created by each child process.
 
 Default value: `25`
 
-##### <a name="-apache--mod--event--maxconnectionsperchild"></a>`maxconnectionsperchild`
+##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Optional[Variant[Integer, Boolean]]`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--event--serverlimit"></a>`serverlimit`
+##### <a name="serverlimit"></a>`serverlimit`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2284,7 +2278,7 @@ Limits the configurable number of processes via the `ServerLimit` directive. Set
 
 Default value: `25`
 
-##### <a name="-apache--mod--event--threadlimit"></a>`threadlimit`
+##### <a name="threadlimit"></a>`threadlimit`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2292,7 +2286,7 @@ Limits the number of event threads via the module's `ThreadLimit` directive. Set
 
 Default value: `64`
 
-##### <a name="-apache--mod--event--listenbacklog"></a>`listenbacklog`
+##### <a name="listenbacklog"></a>`listenbacklog`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2301,7 +2295,7 @@ the parameter.
 
 Default value: `511`
 
-### <a name="apache--mod--expires"></a>`apache::mod::expires`
+### <a name="apachemodexpires"></a>`apache::mod::expires`
 
 Installs and configures `mod_expires`.
 
@@ -2313,27 +2307,27 @@ Installs and configures `mod_expires`.
 
 The following parameters are available in the `apache::mod::expires` class:
 
-* [`expires_active`](#-apache--mod--expires--expires_active)
-* [`expires_default`](#-apache--mod--expires--expires_default)
-* [`expires_by_type`](#-apache--mod--expires--expires_by_type)
+* [`expires_active`](#expires_active)
+* [`expires_default`](#expires_default)
+* [`expires_by_type`](#expires_by_type)
 
-##### <a name="-apache--mod--expires--expires_active"></a>`expires_active`
+##### <a name="expires_active"></a>`expires_active`
 
 Data type: `Boolean`
 
 Enables generation of Expires headers.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--expires--expires_default"></a>`expires_default`
+##### <a name="expires_default"></a>`expires_default`
 
 Data type: `Optional[String]`
 
 Specifies the default algorithm for calculating expiration time using ExpiresByType syntax or interval syntax.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--expires--expires_by_type"></a>`expires_by_type`
+##### <a name="expires_by_type"></a>`expires_by_type`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -2341,9 +2335,9 @@ Describes a set of [MIME content-types](https://www.iana.org/assignments/media-t
 times. This should be used as an array of Hashes, with each Hash's key a valid MIME content-type (i.e. 'text/json') and its
 value following valid interval syntax.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--ext_filter"></a>`apache::mod::ext_filter`
+### <a name="apachemodext_filter"></a>`apache::mod::ext_filter`
 
 Installs and configures `mod_ext_filter`.
 
@@ -2368,17 +2362,17 @@ class { 'apache::mod::ext_filter':
 
 The following parameters are available in the `apache::mod::ext_filter` class:
 
-* [`ext_filter_define`](#-apache--mod--ext_filter--ext_filter_define)
+* [`ext_filter_define`](#ext_filter_define)
 
-##### <a name="-apache--mod--ext_filter--ext_filter_define"></a>`ext_filter_define`
+##### <a name="ext_filter_define"></a>`ext_filter_define`
 
 Data type: `Optional[Hash]`
 
 Hash of filter names and their parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--fcgid"></a>`apache::mod::fcgid`
+### <a name="apachemodfcgid"></a>`apache::mod::fcgid`
 
 loaded first; Puppet will not automatically enable it if you set the fcgiwrapper parameter in apache::vhost.
   include apache::mod::fcgid
@@ -2421,9 +2415,9 @@ class { 'apache::mod::fcgid':
 
 The following parameters are available in the `apache::mod::fcgid` class:
 
-* [`options`](#-apache--mod--fcgid--options)
+* [`options`](#options)
 
-##### <a name="-apache--mod--fcgid--options"></a>`options`
+##### <a name="options"></a>`options`
 
 Data type: `Hash`
 
@@ -2437,7 +2431,7 @@ expires_by_type
 
 Default value: `{}`
 
-### <a name="apache--mod--filter"></a>`apache::mod::filter`
+### <a name="apachemodfilter"></a>`apache::mod::filter`
 
 Installs `mod_filter`.
 
@@ -2445,7 +2439,7 @@ Installs `mod_filter`.
   * https://httpd.apache.org/docs/current/mod/mod_filter.html
     * for additional documentation.
 
-### <a name="apache--mod--geoip"></a>`apache::mod::geoip`
+### <a name="apachemodgeoip"></a>`apache::mod::geoip`
 
 Installs and configures `mod_geoip`.
 
@@ -2457,24 +2451,24 @@ Installs and configures `mod_geoip`.
 
 The following parameters are available in the `apache::mod::geoip` class:
 
-* [`enable`](#-apache--mod--geoip--enable)
-* [`db_file`](#-apache--mod--geoip--db_file)
-* [`flag`](#-apache--mod--geoip--flag)
-* [`output`](#-apache--mod--geoip--output)
-* [`enable_utf8`](#-apache--mod--geoip--enable_utf8)
-* [`scan_proxy_headers`](#-apache--mod--geoip--scan_proxy_headers)
-* [`scan_proxy_header_field`](#-apache--mod--geoip--scan_proxy_header_field)
-* [`use_last_xforwarededfor_ip`](#-apache--mod--geoip--use_last_xforwarededfor_ip)
+* [`enable`](#enable)
+* [`db_file`](#db_file)
+* [`flag`](#flag)
+* [`output`](#output)
+* [`enable_utf8`](#enable_utf8)
+* [`scan_proxy_headers`](#scan_proxy_headers)
+* [`scan_proxy_header_field`](#scan_proxy_header_field)
+* [`use_last_xforwarededfor_ip`](#use_last_xforwarededfor_ip)
 
-##### <a name="-apache--mod--geoip--enable"></a>`enable`
+##### <a name="enable"></a>`enable`
 
 Data type: `Boolean`
 
 Toggles whether to enable geoip.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--geoip--db_file"></a>`db_file`
+##### <a name="db_file"></a>`db_file`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -2482,7 +2476,7 @@ Path to database for GeoIP to use.
 
 Default value: `'/usr/share/GeoIP/GeoIP.dat'`
 
-##### <a name="-apache--mod--geoip--flag"></a>`flag`
+##### <a name="flag"></a>`flag`
 
 Data type: `String`
 
@@ -2490,7 +2484,7 @@ Caching directive to use. Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'St
 
 Default value: `'Standard'`
 
-##### <a name="-apache--mod--geoip--output"></a>`output`
+##### <a name="output"></a>`output`
 
 Data type: `String`
 
@@ -2498,39 +2492,39 @@ Output variable locations. Values: 'All', 'Env', 'Request', 'Notes'.
 
 Default value: `'All'`
 
-##### <a name="-apache--mod--geoip--enable_utf8"></a>`enable_utf8`
+##### <a name="enable_utf8"></a>`enable_utf8`
 
 Data type: `Optional[String]`
 
 Changes the output from ISO88591 (Latin1) to UTF8.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--geoip--scan_proxy_headers"></a>`scan_proxy_headers`
+##### <a name="scan_proxy_headers"></a>`scan_proxy_headers`
 
 Data type: `Optional[String]`
 
 Enables the GeoIPScanProxyHeaders option.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--geoip--scan_proxy_header_field"></a>`scan_proxy_header_field`
+##### <a name="scan_proxy_header_field"></a>`scan_proxy_header_field`
 
 Data type: `Optional[String]`
 
 Specifies the header mod_geoip uses to determine the client's IP address.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--geoip--use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
+##### <a name="use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
 
 Data type: `Optional[String]`
 
 Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--headers"></a>`apache::mod::headers`
+### <a name="apachemodheaders"></a>`apache::mod::headers`
 
 Installs and configures `mod_headers`.
 
@@ -2538,7 +2532,7 @@ Installs and configures `mod_headers`.
   * https://httpd.apache.org/docs/current/mod/mod_headers.html
     * for additional documentation.
 
-### <a name="apache--mod--http2"></a>`apache::mod::http2`
+### <a name="apachemodhttp2"></a>`apache::mod::http2`
 
 Installs and configures `mod_http2`.
 
@@ -2550,106 +2544,106 @@ Installs and configures `mod_http2`.
 
 The following parameters are available in the `apache::mod::http2` class:
 
-* [`h2_copy_files`](#-apache--mod--http2--h2_copy_files)
-* [`h2_direct`](#-apache--mod--http2--h2_direct)
-* [`h2_early_hints`](#-apache--mod--http2--h2_early_hints)
-* [`h2_max_session_streams`](#-apache--mod--http2--h2_max_session_streams)
-* [`h2_max_worker_idle_seconds`](#-apache--mod--http2--h2_max_worker_idle_seconds)
-* [`h2_max_workers`](#-apache--mod--http2--h2_max_workers)
-* [`h2_min_workers`](#-apache--mod--http2--h2_min_workers)
-* [`h2_modern_tls_only`](#-apache--mod--http2--h2_modern_tls_only)
-* [`h2_push`](#-apache--mod--http2--h2_push)
-* [`h2_push_diary_size`](#-apache--mod--http2--h2_push_diary_size)
-* [`h2_push_priority`](#-apache--mod--http2--h2_push_priority)
-* [`h2_push_resource`](#-apache--mod--http2--h2_push_resource)
-* [`h2_serialize_headers`](#-apache--mod--http2--h2_serialize_headers)
-* [`h2_stream_max_mem_size`](#-apache--mod--http2--h2_stream_max_mem_size)
-* [`h2_tls_cool_down_secs`](#-apache--mod--http2--h2_tls_cool_down_secs)
-* [`h2_tls_warm_up_size`](#-apache--mod--http2--h2_tls_warm_up_size)
-* [`h2_upgrade`](#-apache--mod--http2--h2_upgrade)
-* [`h2_window_size`](#-apache--mod--http2--h2_window_size)
-
-##### <a name="-apache--mod--http2--h2_copy_files"></a>`h2_copy_files`
+* [`h2_copy_files`](#h2_copy_files)
+* [`h2_direct`](#h2_direct)
+* [`h2_early_hints`](#h2_early_hints)
+* [`h2_max_session_streams`](#h2_max_session_streams)
+* [`h2_max_worker_idle_seconds`](#h2_max_worker_idle_seconds)
+* [`h2_max_workers`](#h2_max_workers)
+* [`h2_min_workers`](#h2_min_workers)
+* [`h2_modern_tls_only`](#h2_modern_tls_only)
+* [`h2_push`](#h2_push)
+* [`h2_push_diary_size`](#h2_push_diary_size)
+* [`h2_push_priority`](#h2_push_priority)
+* [`h2_push_resource`](#h2_push_resource)
+* [`h2_serialize_headers`](#h2_serialize_headers)
+* [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
+* [`h2_tls_cool_down_secs`](#h2_tls_cool_down_secs)
+* [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
+* [`h2_upgrade`](#h2_upgrade)
+* [`h2_window_size`](#h2_window_size)
+
+##### <a name="h2_copy_files"></a>`h2_copy_files`
 
 Data type: `Optional[Boolean]`
 
 Determine file handling in responses.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_direct"></a>`h2_direct`
+##### <a name="h2_direct"></a>`h2_direct`
 
 Data type: `Optional[Boolean]`
 
 H2 Direct Protocol Switch.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_early_hints"></a>`h2_early_hints`
+##### <a name="h2_early_hints"></a>`h2_early_hints`
 
 Data type: `Optional[Boolean]`
 
 Determine sending of 103 status codes.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_max_session_streams"></a>`h2_max_session_streams`
+##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of active streams per HTTP/2 session.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_max_worker_idle_seconds"></a>`h2_max_worker_idle_seconds`
+##### <a name="h2_max_worker_idle_seconds"></a>`h2_max_worker_idle_seconds`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of seconds h2 workers remain idle until shut down.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_max_workers"></a>`h2_max_workers`
+##### <a name="h2_max_workers"></a>`h2_max_workers`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of worker threads to use per child process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_min_workers"></a>`h2_min_workers`
+##### <a name="h2_min_workers"></a>`h2_min_workers`
 
 Data type: `Optional[Integer]`
 
 Sets minimal number of worker threads to use per child process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_modern_tls_only"></a>`h2_modern_tls_only`
+##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
 
 Data type: `Optional[Boolean]`
 
 Toggles the security checks on HTTP/2 connections in TLS mode
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_push"></a>`h2_push`
+##### <a name="h2_push"></a>`h2_push`
 
 Data type: `Optional[Boolean]`
 
 Toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_push_diary_size"></a>`h2_push_diary_size`
+##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_push_priority"></a>`h2_push_priority`
+##### <a name="h2_push_priority"></a>`h2_push_priority`
 
 Data type: `Array[String]`
 
@@ -2657,7 +2651,7 @@ Require HTTP/2 connections to be "modern TLS" only
 
 Default value: `[]`
 
-##### <a name="-apache--mod--http2--h2_push_resource"></a>`h2_push_resource`
+##### <a name="h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
 
@@ -2666,59 +2660,59 @@ via this directive
 
 Default value: `[]`
 
-##### <a name="-apache--mod--http2--h2_serialize_headers"></a>`h2_serialize_headers`
+##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
 
 Data type: `Optional[Boolean]`
 
 Toggles if HTTP/2 requests shall be serialized in HTTP/1.1 format for processing by httpd
 core or if received binary data shall be passed into the request_recs directly.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
+##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
 Data type: `Optional[Integer]`
 
 Sets the maximum number of outgoing data bytes buffered in memory for an active streams.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
+##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
 Data type: `Optional[Integer]`
 
 Sets the number of seconds of idle time on a TLS connection before the TLS write size falls
 back to small (~1300 bytes) length.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
+##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
 Data type: `Optional[Integer]`
 
 Sets the number of bytes to be sent in small TLS records (~1300 bytes) until doing maximum
 sized writes (16k) on https: HTTP/2 connections.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_upgrade"></a>`h2_upgrade`
+##### <a name="h2_upgrade"></a>`h2_upgrade`
 
 Data type: `Optional[Boolean]`
 
 Toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--http2--h2_window_size"></a>`h2_window_size`
+##### <a name="h2_window_size"></a>`h2_window_size`
 
 Data type: `Optional[Integer]`
 
 Sets the size of the window that is used for flow control from client to server and limits
 the amount of data the server has to buffer.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--include"></a>`apache::mod::include`
+### <a name="apachemodinclude"></a>`apache::mod::include`
 
 Installs `mod_include`.
 
@@ -2726,7 +2720,7 @@ Installs `mod_include`.
   * https://httpd.apache.org/docs/current/mod/mod_include.html
     * for additional documentation.
 
-### <a name="apache--mod--info"></a>`apache::mod::info`
+### <a name="apachemodinfo"></a>`apache::mod::info`
 
 Installs and configures `mod_info`.
 
@@ -2738,11 +2732,11 @@ Installs and configures `mod_info`.
 
 The following parameters are available in the `apache::mod::info` class:
 
-* [`allow_from`](#-apache--mod--info--allow_from)
-* [`restrict_access`](#-apache--mod--info--restrict_access)
-* [`info_path`](#-apache--mod--info--info_path)
+* [`allow_from`](#allow_from)
+* [`restrict_access`](#restrict_access)
+* [`info_path`](#info_path)
 
-##### <a name="-apache--mod--info--allow_from"></a>`allow_from`
+##### <a name="allow_from"></a>`allow_from`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -2750,16 +2744,16 @@ Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 
 Default value: `['127.0.0.1', '::1']`
 
-##### <a name="-apache--mod--info--restrict_access"></a>`restrict_access`
+##### <a name="restrict_access"></a>`restrict_access`
 
 Data type: `Boolean`
 
 Toggles whether to restrict access to info path. If `false`, the `allow_from` allowlist is ignored and any IP address can
 access the info path.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--info--info_path"></a>`info_path`
+##### <a name="info_path"></a>`info_path`
 
 Data type: `Stdlib::Unixpath`
 
@@ -2767,7 +2761,7 @@ Path on server to file containing server configuration information.
 
 Default value: `'/server-info'`
 
-### <a name="apache--mod--intercept_form_submit"></a>`apache::mod::intercept_form_submit`
+### <a name="apachemodintercept_form_submit"></a>`apache::mod::intercept_form_submit`
 
 Installs `mod_intercept_form_submit`.
 
@@ -2775,7 +2769,7 @@ Installs `mod_intercept_form_submit`.
   * https://www.adelton.com/apache/mod_intercept_form_submit
     * for additional documentation.
 
-### <a name="apache--mod--itk"></a>`apache::mod::itk`
+### <a name="apachemoditk"></a>`apache::mod::itk`
 
 Installs MPM `mod_itk`.
 
@@ -2789,15 +2783,15 @@ Installs MPM `mod_itk`.
 
 The following parameters are available in the `apache::mod::itk` class:
 
-* [`startservers`](#-apache--mod--itk--startservers)
-* [`minspareservers`](#-apache--mod--itk--minspareservers)
-* [`maxspareservers`](#-apache--mod--itk--maxspareservers)
-* [`serverlimit`](#-apache--mod--itk--serverlimit)
-* [`maxclients`](#-apache--mod--itk--maxclients)
-* [`maxrequestsperchild`](#-apache--mod--itk--maxrequestsperchild)
-* [`enablecapabilities`](#-apache--mod--itk--enablecapabilities)
+* [`startservers`](#startservers)
+* [`minspareservers`](#minspareservers)
+* [`maxspareservers`](#maxspareservers)
+* [`serverlimit`](#serverlimit)
+* [`maxclients`](#maxclients)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`enablecapabilities`](#enablecapabilities)
 
-##### <a name="-apache--mod--itk--startservers"></a>`startservers`
+##### <a name="startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -2805,7 +2799,7 @@ Number of child server processes created on startup.
 
 Default value: `8`
 
-##### <a name="-apache--mod--itk--minspareservers"></a>`minspareservers`
+##### <a name="minspareservers"></a>`minspareservers`
 
 Data type: `Integer`
 
@@ -2813,7 +2807,7 @@ Minimum number of idle child server processes.
 
 Default value: `5`
 
-##### <a name="-apache--mod--itk--maxspareservers"></a>`maxspareservers`
+##### <a name="maxspareservers"></a>`maxspareservers`
 
 Data type: `Integer`
 
@@ -2821,7 +2815,7 @@ Maximum number of idle child server processes.
 
 Default value: `20`
 
-##### <a name="-apache--mod--itk--serverlimit"></a>`serverlimit`
+##### <a name="serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -2829,7 +2823,7 @@ Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache
 
 Default value: `256`
 
-##### <a name="-apache--mod--itk--maxclients"></a>`maxclients`
+##### <a name="maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -2837,7 +2831,7 @@ Limit on the number of simultaneous requests that will be served.
 
 Default value: `256`
 
-##### <a name="-apache--mod--itk--maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -2845,7 +2839,7 @@ Limit on the number of connections that an individual child server process will
 
 Default value: `4000`
 
-##### <a name="-apache--mod--itk--enablecapabilities"></a>`enablecapabilities`
+##### <a name="enablecapabilities"></a>`enablecapabilities`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
@@ -2853,9 +2847,9 @@ Drop most root capabilities in the parent process, and instead run as the user g
 capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor
 capabilities, such as NFS.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--jk"></a>`apache::mod::jk`
+### <a name="apachemodjk"></a>`apache::mod::jk`
 
 Installs `mod_jk`.
 
@@ -2904,59 +2898,59 @@ class { '::apache::mod::jk':
 
 The following parameters are available in the `apache::mod::jk` class:
 
-* [`ip`](#-apache--mod--jk--ip)
-* [`port`](#-apache--mod--jk--port)
-* [`add_listen`](#-apache--mod--jk--add_listen)
-* [`workers_file`](#-apache--mod--jk--workers_file)
-* [`worker_property`](#-apache--mod--jk--worker_property)
-* [`logroot`](#-apache--mod--jk--logroot)
-* [`shm_file`](#-apache--mod--jk--shm_file)
-* [`shm_size`](#-apache--mod--jk--shm_size)
-* [`mount_file`](#-apache--mod--jk--mount_file)
-* [`mount_file_reload`](#-apache--mod--jk--mount_file_reload)
-* [`mount`](#-apache--mod--jk--mount)
-* [`un_mount`](#-apache--mod--jk--un_mount)
-* [`auto_alias`](#-apache--mod--jk--auto_alias)
-* [`mount_copy`](#-apache--mod--jk--mount_copy)
-* [`worker_indicator`](#-apache--mod--jk--worker_indicator)
-* [`watchdog_interval`](#-apache--mod--jk--watchdog_interval)
-* [`log_file`](#-apache--mod--jk--log_file)
-* [`log_level`](#-apache--mod--jk--log_level)
-* [`log_stamp_format`](#-apache--mod--jk--log_stamp_format)
-* [`request_log_format`](#-apache--mod--jk--request_log_format)
-* [`extract_ssl`](#-apache--mod--jk--extract_ssl)
-* [`https_indicator`](#-apache--mod--jk--https_indicator)
-* [`sslprotocol_indicator`](#-apache--mod--jk--sslprotocol_indicator)
-* [`certs_indicator`](#-apache--mod--jk--certs_indicator)
-* [`cipher_indicator`](#-apache--mod--jk--cipher_indicator)
-* [`certchain_prefix`](#-apache--mod--jk--certchain_prefix)
-* [`session_indicator`](#-apache--mod--jk--session_indicator)
-* [`keysize_indicator`](#-apache--mod--jk--keysize_indicator)
-* [`local_name_indicator`](#-apache--mod--jk--local_name_indicator)
-* [`ignore_cl_indicator`](#-apache--mod--jk--ignore_cl_indicator)
-* [`local_addr_indicator`](#-apache--mod--jk--local_addr_indicator)
-* [`local_port_indicator`](#-apache--mod--jk--local_port_indicator)
-* [`remote_host_indicator`](#-apache--mod--jk--remote_host_indicator)
-* [`remote_addr_indicator`](#-apache--mod--jk--remote_addr_indicator)
-* [`remote_port_indicator`](#-apache--mod--jk--remote_port_indicator)
-* [`remote_user_indicator`](#-apache--mod--jk--remote_user_indicator)
-* [`auth_type_indicator`](#-apache--mod--jk--auth_type_indicator)
-* [`options`](#-apache--mod--jk--options)
-* [`env_var`](#-apache--mod--jk--env_var)
-* [`strip_session`](#-apache--mod--jk--strip_session)
-* [`location_list`](#-apache--mod--jk--location_list)
-* [`workers_file_content`](#-apache--mod--jk--workers_file_content)
-* [`mount_file_content`](#-apache--mod--jk--mount_file_content)
-
-##### <a name="-apache--mod--jk--ip"></a>`ip`
+* [`ip`](#ip)
+* [`port`](#port)
+* [`add_listen`](#add_listen)
+* [`workers_file`](#workers_file)
+* [`worker_property`](#worker_property)
+* [`logroot`](#logroot)
+* [`shm_file`](#shm_file)
+* [`shm_size`](#shm_size)
+* [`mount_file`](#mount_file)
+* [`mount_file_reload`](#mount_file_reload)
+* [`mount`](#mount)
+* [`un_mount`](#un_mount)
+* [`auto_alias`](#auto_alias)
+* [`mount_copy`](#mount_copy)
+* [`worker_indicator`](#worker_indicator)
+* [`watchdog_interval`](#watchdog_interval)
+* [`log_file`](#log_file)
+* [`log_level`](#log_level)
+* [`log_stamp_format`](#log_stamp_format)
+* [`request_log_format`](#request_log_format)
+* [`extract_ssl`](#extract_ssl)
+* [`https_indicator`](#https_indicator)
+* [`sslprotocol_indicator`](#sslprotocol_indicator)
+* [`certs_indicator`](#certs_indicator)
+* [`cipher_indicator`](#cipher_indicator)
+* [`certchain_prefix`](#certchain_prefix)
+* [`session_indicator`](#session_indicator)
+* [`keysize_indicator`](#keysize_indicator)
+* [`local_name_indicator`](#local_name_indicator)
+* [`ignore_cl_indicator`](#ignore_cl_indicator)
+* [`local_addr_indicator`](#local_addr_indicator)
+* [`local_port_indicator`](#local_port_indicator)
+* [`remote_host_indicator`](#remote_host_indicator)
+* [`remote_addr_indicator`](#remote_addr_indicator)
+* [`remote_port_indicator`](#remote_port_indicator)
+* [`remote_user_indicator`](#remote_user_indicator)
+* [`auth_type_indicator`](#auth_type_indicator)
+* [`options`](#options)
+* [`env_var`](#env_var)
+* [`strip_session`](#strip_session)
+* [`location_list`](#location_list)
+* [`workers_file_content`](#workers_file_content)
+* [`mount_file_content`](#mount_file_content)
+
+##### <a name="ip"></a>`ip`
 
 Data type: `Optional[Stdlib::IP::Address]`
 
 IP for binding to mod_jk. Useful when the binding address is not the primary network interface IP.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--port"></a>`port`
+##### <a name="port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -2965,7 +2959,7 @@ needs to forward them to Apache at a different port.
 
 Default value: `80`
 
-##### <a name="-apache--mod--jk--add_listen"></a>`add_listen`
+##### <a name="add_listen"></a>`add_listen`
 
 Data type: `Boolean`
 
@@ -2973,17 +2967,17 @@ Defines if a Listen directive according to parameters ip and port (see below), s
 and redirect to mod_jk. Useful when another Listen directive, like Listen *:<Port> or Listen <Port>, can conflict with the one
 necessary for mod_jk binding.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--jk--workers_file"></a>`workers_file`
+##### <a name="workers_file"></a>`workers_file`
 
 Data type: `Optional[String]`
 
 The name of a worker file for the Tomcat servlet containers.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--worker_property"></a>`worker_property`
+##### <a name="worker_property"></a>`worker_property`
 
 Data type: `Hash`
 
@@ -2991,16 +2985,16 @@ Enables setting worker properties inside Apache configuration file.
 
 Default value: `{}`
 
-##### <a name="-apache--mod--jk--logroot"></a>`logroot`
+##### <a name="logroot"></a>`logroot`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 The base directory for shm_file and log_file is determined by the logroot parameter. If unspecified, defaults to
 apache::params::logroot. The default logroot is sane enough therefore it is not recommended to override it.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--shm_file"></a>`shm_file`
+##### <a name="shm_file"></a>`shm_file`
 
 Data type: `String`
 
@@ -3008,31 +3002,31 @@ Shared memory file name.
 
 Default value: `'jk-runtime-status'`
 
-##### <a name="-apache--mod--jk--shm_size"></a>`shm_size`
+##### <a name="shm_size"></a>`shm_size`
 
 Data type: `Optional[String]`
 
 Size of the shared memory file name.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--mount_file"></a>`mount_file`
+##### <a name="mount_file"></a>`mount_file`
 
 Data type: `Optional[String]`
 
 File containing multiple mappings from a context to a Tomcat worker.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--mount_file_reload"></a>`mount_file_reload`
+##### <a name="mount_file_reload"></a>`mount_file_reload`
 
 Data type: `Optional[String]`
 
 This directive configures the reload check interval in seconds.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--mount"></a>`mount`
+##### <a name="mount"></a>`mount`
 
 Data type: `Hash`
 
@@ -3040,7 +3034,7 @@ A mount point from a context to a Tomcat worker.
 
 Default value: `{}`
 
-##### <a name="-apache--mod--jk--un_mount"></a>`un_mount`
+##### <a name="un_mount"></a>`un_mount`
 
 Data type: `Hash`
 
@@ -3048,41 +3042,41 @@ An exclusion mount point from a context to a Tomcat worker.
 
 Default value: `{}`
 
-##### <a name="-apache--mod--jk--auto_alias"></a>`auto_alias`
+##### <a name="auto_alias"></a>`auto_alias`
 
 Data type: `Optional[String]`
 
 Automatically Alias webapp context directories into the Apache document space
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--mount_copy"></a>`mount_copy`
+##### <a name="mount_copy"></a>`mount_copy`
 
 Data type: `Optional[String]`
 
 If this directive is set to "On" in some virtual server, the mounts from the global server will be copied
 to this virtual server, more precisely all mounts defined by JkMount or JkUnMount.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--worker_indicator"></a>`worker_indicator`
+##### <a name="worker_indicator"></a>`worker_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that can be used to set worker names in combination with SetHandler
 jakarta-servlet.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--watchdog_interval"></a>`watchdog_interval`
+##### <a name="watchdog_interval"></a>`watchdog_interval`
 
 Data type: `Optional[Integer]`
 
 This directive configures the watchdog thread interval in seconds.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--log_file"></a>`log_file`
+##### <a name="log_file"></a>`log_file`
 
 Data type: `String`
 
@@ -3090,167 +3084,167 @@ Full or server relative path to the mod_jk log file.
 
 Default value: `'mod_jk.log'`
 
-##### <a name="-apache--mod--jk--log_level"></a>`log_level`
+##### <a name="log_level"></a>`log_level`
 
 Data type: `Optional[String]`
 
 The mod_jk log level, can be debug, info, warn error or trace.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--log_stamp_format"></a>`log_stamp_format`
+##### <a name="log_stamp_format"></a>`log_stamp_format`
 
 Data type: `Optional[String]`
 
 The mod_jk date log format, using an extended strftime syntax.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--request_log_format"></a>`request_log_format`
+##### <a name="request_log_format"></a>`request_log_format`
 
 Data type: `Optional[String]`
 
 Request log format string.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--extract_ssl"></a>`extract_ssl`
+##### <a name="extract_ssl"></a>`extract_ssl`
 
 Data type: `Optional[String]`
 
 Turns on SSL processing and information gathering by mod_jk.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--https_indicator"></a>`https_indicator`
+##### <a name="https_indicator"></a>`https_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL indication.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--sslprotocol_indicator"></a>`sslprotocol_indicator`
+##### <a name="sslprotocol_indicator"></a>`sslprotocol_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains the SSL protocol name.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--certs_indicator"></a>`certs_indicator`
+##### <a name="certs_indicator"></a>`certs_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL client certificates.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--cipher_indicator"></a>`cipher_indicator`
+##### <a name="cipher_indicator"></a>`cipher_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL client cipher.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--certchain_prefix"></a>`certchain_prefix`
+##### <a name="certchain_prefix"></a>`certchain_prefix`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment (prefix) that contains SSL client chain certificates.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--session_indicator"></a>`session_indicator`
+##### <a name="session_indicator"></a>`session_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL session.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--keysize_indicator"></a>`keysize_indicator`
+##### <a name="keysize_indicator"></a>`keysize_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL key size in use.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--local_name_indicator"></a>`local_name_indicator`
+##### <a name="local_name_indicator"></a>`local_name_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local name.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--ignore_cl_indicator"></a>`ignore_cl_indicator`
+##### <a name="ignore_cl_indicator"></a>`ignore_cl_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which forces to ignore an existing Content-Length request header.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--local_addr_indicator"></a>`local_addr_indicator`
+##### <a name="local_addr_indicator"></a>`local_addr_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local IP address.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--local_port_indicator"></a>`local_port_indicator`
+##### <a name="local_port_indicator"></a>`local_port_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local port.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--remote_host_indicator"></a>`remote_host_indicator`
+##### <a name="remote_host_indicator"></a>`remote_host_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) host name.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--remote_addr_indicator"></a>`remote_addr_indicator`
+##### <a name="remote_addr_indicator"></a>`remote_addr_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--remote_port_indicator"></a>`remote_port_indicator`
+##### <a name="remote_port_indicator"></a>`remote_port_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--remote_user_indicator"></a>`remote_user_indicator`
+##### <a name="remote_user_indicator"></a>`remote_user_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded user name.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--auth_type_indicator"></a>`auth_type_indicator`
+##### <a name="auth_type_indicator"></a>`auth_type_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded authentication type.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--options"></a>`options`
+##### <a name="options"></a>`options`
 
 Data type: `Array`
 
@@ -3258,7 +3252,7 @@ Set one of more options to configure the mod_jk module.
 
 Default value: `[]`
 
-##### <a name="-apache--mod--jk--env_var"></a>`env_var`
+##### <a name="env_var"></a>`env_var`
 
 Data type: `Hash`
 
@@ -3266,16 +3260,16 @@ Adds a name and an optional default value of environment variable that should be
 
 Default value: `{}`
 
-##### <a name="-apache--mod--jk--strip_session"></a>`strip_session`
+##### <a name="strip_session"></a>`strip_session`
 
 Data type: `Optional[String]`
 
 If this directive is set to On in some virtual server, the session IDs ;jsessionid=... will be removed for URLs which are not
 forwarded but instead are handled by the local server.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--jk--location_list"></a>`location_list`
+##### <a name="location_list"></a>`location_list`
 
 Data type: `Array`
 
@@ -3308,7 +3302,7 @@ location_list = [
 
 Default value: `[]`
 
-##### <a name="-apache--mod--jk--workers_file_content"></a>`workers_file_content`
+##### <a name="workers_file_content"></a>`workers_file_content`
 
 Data type: `Hash`
 
@@ -3352,7 +3346,7 @@ $workers_file_content = {
 
 Default value: `{}`
 
-##### <a name="-apache--mod--jk--mount_file_content"></a>`mount_file_content`
+##### <a name="mount_file_content"></a>`mount_file_content`
 
 Data type: `Hash`
 
@@ -3389,7 +3383,7 @@ $mount_file_content = {
 
 Default value: `{}`
 
-### <a name="apache--mod--lbmethod_bybusyness"></a>`apache::mod::lbmethod_bybusyness`
+### <a name="apachemodlbmethod_bybusyness"></a>`apache::mod::lbmethod_bybusyness`
 
 Installs `lbmethod_bybusyness`.
 
@@ -3401,9 +3395,9 @@ Installs `lbmethod_bybusyness`.
 
 The following parameters are available in the `apache::mod::lbmethod_bybusyness` class:
 
-* [`apache_version`](#-apache--mod--lbmethod_bybusyness--apache_version)
+* [`apache_version`](#apache_version)
 
-##### <a name="-apache--mod--lbmethod_bybusyness--apache_version"></a>`apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3411,7 +3405,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apache--mod--lbmethod_byrequests"></a>`apache::mod::lbmethod_byrequests`
+### <a name="apachemodlbmethod_byrequests"></a>`apache::mod::lbmethod_byrequests`
 
 Installs `lbmethod_byrequests`.
 
@@ -3423,9 +3417,9 @@ Installs `lbmethod_byrequests`.
 
 The following parameters are available in the `apache::mod::lbmethod_byrequests` class:
 
-* [`apache_version`](#-apache--mod--lbmethod_byrequests--apache_version)
+* [`apache_version`](#apache_version)
 
-##### <a name="-apache--mod--lbmethod_byrequests--apache_version"></a>`apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3433,7 +3427,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apache--mod--lbmethod_bytraffic"></a>`apache::mod::lbmethod_bytraffic`
+### <a name="apachemodlbmethod_bytraffic"></a>`apache::mod::lbmethod_bytraffic`
 
 Installs `lbmethod_bytraffic`.
 
@@ -3445,9 +3439,9 @@ Installs `lbmethod_bytraffic`.
 
 The following parameters are available in the `apache::mod::lbmethod_bytraffic` class:
 
-* [`apache_version`](#-apache--mod--lbmethod_bytraffic--apache_version)
+* [`apache_version`](#apache_version)
 
-##### <a name="-apache--mod--lbmethod_bytraffic--apache_version"></a>`apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3455,7 +3449,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apache--mod--lbmethod_heartbeat"></a>`apache::mod::lbmethod_heartbeat`
+### <a name="apachemodlbmethod_heartbeat"></a>`apache::mod::lbmethod_heartbeat`
 
 Installs `lbmethod_heartbeat`.
 
@@ -3467,9 +3461,9 @@ Installs `lbmethod_heartbeat`.
 
 The following parameters are available in the `apache::mod::lbmethod_heartbeat` class:
 
-* [`apache_version`](#-apache--mod--lbmethod_heartbeat--apache_version)
+* [`apache_version`](#apache_version)
 
-##### <a name="-apache--mod--lbmethod_heartbeat--apache_version"></a>`apache_version`
+##### <a name="apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3477,7 +3471,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apache--mod--ldap"></a>`apache::mod::ldap`
+### <a name="apachemodldap"></a>`apache::mod::ldap`
 
 Installs and configures `mod_ldap`.
 
@@ -3508,34 +3502,34 @@ class { 'apache::mod::ldap':
 
 The following parameters are available in the `apache::mod::ldap` class:
 
-* [`package_name`](#-apache--mod--ldap--package_name)
-* [`ldap_trusted_global_cert_file`](#-apache--mod--ldap--ldap_trusted_global_cert_file)
-* [`ldap_trusted_global_cert_type`](#-apache--mod--ldap--ldap_trusted_global_cert_type)
-* [`ldap_shared_cache_size`](#-apache--mod--ldap--ldap_shared_cache_size)
-* [`ldap_cache_entries`](#-apache--mod--ldap--ldap_cache_entries)
-* [`ldap_cache_ttl`](#-apache--mod--ldap--ldap_cache_ttl)
-* [`ldap_opcache_entries`](#-apache--mod--ldap--ldap_opcache_entries)
-* [`ldap_opcache_ttl`](#-apache--mod--ldap--ldap_opcache_ttl)
-* [`ldap_trusted_mode`](#-apache--mod--ldap--ldap_trusted_mode)
-* [`ldap_path`](#-apache--mod--ldap--ldap_path)
+* [`package_name`](#package_name)
+* [`ldap_trusted_global_cert_file`](#ldap_trusted_global_cert_file)
+* [`ldap_trusted_global_cert_type`](#ldap_trusted_global_cert_type)
+* [`ldap_shared_cache_size`](#ldap_shared_cache_size)
+* [`ldap_cache_entries`](#ldap_cache_entries)
+* [`ldap_cache_ttl`](#ldap_cache_ttl)
+* [`ldap_opcache_entries`](#ldap_opcache_entries)
+* [`ldap_opcache_ttl`](#ldap_opcache_ttl)
+* [`ldap_trusted_mode`](#ldap_trusted_mode)
+* [`ldap_path`](#ldap_path)
 
-##### <a name="-apache--mod--ldap--package_name"></a>`package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Specifies the custom package name.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ldap--ldap_trusted_global_cert_file"></a>`ldap_trusted_global_cert_file`
+##### <a name="ldap_trusted_global_cert_file"></a>`ldap_trusted_global_cert_file`
 
 Data type: `Optional[String]`
 
 Sets the file or database containing global trusted Certificate Authority or global client certificates.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ldap--ldap_trusted_global_cert_type"></a>`ldap_trusted_global_cert_type`
+##### <a name="ldap_trusted_global_cert_type"></a>`ldap_trusted_global_cert_type`
 
 Data type: `String`
 
@@ -3543,55 +3537,55 @@ Sets the certificate parameter of the global trusted Certificate Authority or gl
 
 Default value: `'CA_BASE64'`
 
-##### <a name="-apache--mod--ldap--ldap_shared_cache_size"></a>`ldap_shared_cache_size`
+##### <a name="ldap_shared_cache_size"></a>`ldap_shared_cache_size`
 
 Data type: `Optional[Integer]`
 
 Size in bytes of the shared-memory cache
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ldap--ldap_cache_entries"></a>`ldap_cache_entries`
+##### <a name="ldap_cache_entries"></a>`ldap_cache_entries`
 
 Data type: `Optional[Integer]`
 
 Maximum number of entries in the primary LDAP cache
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ldap--ldap_cache_ttl"></a>`ldap_cache_ttl`
+##### <a name="ldap_cache_ttl"></a>`ldap_cache_ttl`
 
 Data type: `Optional[Integer]`
 
 Time that cached items remain valid (in seconds).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ldap--ldap_opcache_entries"></a>`ldap_opcache_entries`
+##### <a name="ldap_opcache_entries"></a>`ldap_opcache_entries`
 
 Data type: `Optional[Integer]`
 
 Number of entries used to cache LDAP compare operations
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ldap--ldap_opcache_ttl"></a>`ldap_opcache_ttl`
+##### <a name="ldap_opcache_ttl"></a>`ldap_opcache_ttl`
 
 Data type: `Optional[Integer]`
 
 Time that entries in the operation cache remain valid (in seconds).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ldap--ldap_trusted_mode"></a>`ldap_trusted_mode`
+##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
 
 Data type: `Optional[String]`
 
 Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ldap--ldap_path"></a>`ldap_path`
+##### <a name="ldap_path"></a>`ldap_path`
 
 Data type: `String`
 
@@ -3599,7 +3593,15 @@ The server location of the ldap status page.
 
 Default value: `'/ldap-status'`
 
-### <a name="apache--mod--lookup_identity"></a>`apache::mod::lookup_identity`
+### <a name="apachemodlog_forensic"></a>`apache::mod::log_forensic`
+
+Installs `mod_log_forensic`
+
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/mod_log_forensic.html
+    * for additional documentation.
+
+### <a name="apachemodlookup_identity"></a>`apache::mod::lookup_identity`
 
 Installs `mod_lookup_identity`
 
@@ -3607,7 +3609,7 @@ Installs `mod_lookup_identity`
   * https://www.adelton.com/apache/mod_lookup_identity
     * for additional documentation.
 
-### <a name="apache--mod--macro"></a>`apache::mod::macro`
+### <a name="apachemodmacro"></a>`apache::mod::macro`
 
 Installs `mod_macro`.
 
@@ -3615,7 +3617,7 @@ Installs `mod_macro`.
   * https://httpd.apache.org/docs/current/mod/mod_macro.html
     * for additional documentation.
 
-### <a name="apache--mod--md"></a>`apache::mod::md`
+### <a name="apachemodmd"></a>`apache::mod::md`
 
 Installs and configures `mod_md`.
 
@@ -3629,264 +3631,264 @@ Installs and configures `mod_md`.
 
 The following parameters are available in the `apache::mod::md` class:
 
-* [`md_activation_delay`](#-apache--mod--md--md_activation_delay)
-* [`md_base_server`](#-apache--mod--md--md_base_server)
-* [`md_ca_challenges`](#-apache--mod--md--md_ca_challenges)
-* [`md_certificate_agreement`](#-apache--mod--md--md_certificate_agreement)
-* [`md_certificate_authority`](#-apache--mod--md--md_certificate_authority)
-* [`md_certificate_check`](#-apache--mod--md--md_certificate_check)
-* [`md_certificate_monitor`](#-apache--mod--md--md_certificate_monitor)
-* [`md_certificate_protocol`](#-apache--mod--md--md_certificate_protocol)
-* [`md_certificate_status`](#-apache--mod--md--md_certificate_status)
-* [`md_challenge_dns01`](#-apache--mod--md--md_challenge_dns01)
-* [`md_contact_email`](#-apache--mod--md--md_contact_email)
-* [`md_http_proxy`](#-apache--mod--md--md_http_proxy)
-* [`md_members`](#-apache--mod--md--md_members)
-* [`md_message_cmd`](#-apache--mod--md--md_message_cmd)
-* [`md_must_staple`](#-apache--mod--md--md_must_staple)
-* [`md_notify_cmd`](#-apache--mod--md--md_notify_cmd)
-* [`md_port_map`](#-apache--mod--md--md_port_map)
-* [`md_private_keys`](#-apache--mod--md--md_private_keys)
-* [`md_renew_mode`](#-apache--mod--md--md_renew_mode)
-* [`md_renew_window`](#-apache--mod--md--md_renew_window)
-* [`md_require_https`](#-apache--mod--md--md_require_https)
-* [`md_server_status`](#-apache--mod--md--md_server_status)
-* [`md_staple_others`](#-apache--mod--md--md_staple_others)
-* [`md_stapling`](#-apache--mod--md--md_stapling)
-* [`md_stapling_keep_response`](#-apache--mod--md--md_stapling_keep_response)
-* [`md_stapling_renew_window`](#-apache--mod--md--md_stapling_renew_window)
-* [`md_store_dir`](#-apache--mod--md--md_store_dir)
-* [`md_warn_window`](#-apache--mod--md--md_warn_window)
-
-##### <a name="-apache--mod--md--md_activation_delay"></a>`md_activation_delay`
+* [`md_activation_delay`](#md_activation_delay)
+* [`md_base_server`](#md_base_server)
+* [`md_ca_challenges`](#md_ca_challenges)
+* [`md_certificate_agreement`](#md_certificate_agreement)
+* [`md_certificate_authority`](#md_certificate_authority)
+* [`md_certificate_check`](#md_certificate_check)
+* [`md_certificate_monitor`](#md_certificate_monitor)
+* [`md_certificate_protocol`](#md_certificate_protocol)
+* [`md_certificate_status`](#md_certificate_status)
+* [`md_challenge_dns01`](#md_challenge_dns01)
+* [`md_contact_email`](#md_contact_email)
+* [`md_http_proxy`](#md_http_proxy)
+* [`md_members`](#md_members)
+* [`md_message_cmd`](#md_message_cmd)
+* [`md_must_staple`](#md_must_staple)
+* [`md_notify_cmd`](#md_notify_cmd)
+* [`md_port_map`](#md_port_map)
+* [`md_private_keys`](#md_private_keys)
+* [`md_renew_mode`](#md_renew_mode)
+* [`md_renew_window`](#md_renew_window)
+* [`md_require_https`](#md_require_https)
+* [`md_server_status`](#md_server_status)
+* [`md_staple_others`](#md_staple_others)
+* [`md_stapling`](#md_stapling)
+* [`md_stapling_keep_response`](#md_stapling_keep_response)
+* [`md_stapling_renew_window`](#md_stapling_renew_window)
+* [`md_store_dir`](#md_store_dir)
+* [`md_warn_window`](#md_warn_window)
+
+##### <a name="md_activation_delay"></a>`md_activation_delay`
 
 Data type: `Optional[String]`
 
 -
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_base_server"></a>`md_base_server`
+##### <a name="md_base_server"></a>`md_base_server`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Control if base server may be managed or only virtual hosts.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_ca_challenges"></a>`md_ca_challenges`
+##### <a name="md_ca_challenges"></a>`md_ca_challenges`
 
 Data type: `Optional[Array[Enum['dns-01', 'http-01', 'tls-alpn-01']]]`
 
 Type of ACME challenge used to prove domain ownership.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_certificate_agreement"></a>`md_certificate_agreement`
+##### <a name="md_certificate_agreement"></a>`md_certificate_agreement`
 
 Data type: `Optional[Enum['accepted']]`
 
 You confirm that you accepted the Terms of Service of the Certificate
 Authority.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_certificate_authority"></a>`md_certificate_authority`
+##### <a name="md_certificate_authority"></a>`md_certificate_authority`
 
 Data type: `Optional[Stdlib::HTTPUrl]`
 
 The URL of the ACME Certificate Authority service.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_certificate_check"></a>`md_certificate_check`
+##### <a name="md_certificate_check"></a>`md_certificate_check`
 
 Data type: `Optional[String]`
 
 -
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_certificate_monitor"></a>`md_certificate_monitor`
+##### <a name="md_certificate_monitor"></a>`md_certificate_monitor`
 
 Data type: `Optional[String]`
 
 The URL of a certificate log monitor.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_certificate_protocol"></a>`md_certificate_protocol`
+##### <a name="md_certificate_protocol"></a>`md_certificate_protocol`
 
 Data type: `Optional[Enum['ACME']]`
 
 The protocol to use with the Certificate Authority.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_certificate_status"></a>`md_certificate_status`
+##### <a name="md_certificate_status"></a>`md_certificate_status`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Exposes public certificate information in JSON.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_challenge_dns01"></a>`md_challenge_dns01`
+##### <a name="md_challenge_dns01"></a>`md_challenge_dns01`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Define a program to be called when the `dns-01` challenge needs to be
 setup/torn down.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_contact_email"></a>`md_contact_email`
+##### <a name="md_contact_email"></a>`md_contact_email`
 
 Data type: `Optional[String]`
 
 The ACME protocol requires you to give a contact url when you sign up.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_http_proxy"></a>`md_http_proxy`
+##### <a name="md_http_proxy"></a>`md_http_proxy`
 
 Data type: `Optional[Stdlib::HTTPUrl]`
 
 Define a proxy for outgoing connections.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_members"></a>`md_members`
+##### <a name="md_members"></a>`md_members`
 
 Data type: `Optional[Enum['auto', 'manual']]`
 
 Control if the alias domain names are automatically added.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_message_cmd"></a>`md_message_cmd`
+##### <a name="md_message_cmd"></a>`md_message_cmd`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Handle events for Manage Domains.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_must_staple"></a>`md_must_staple`
+##### <a name="md_must_staple"></a>`md_must_staple`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Control if new certificates carry the OCSP Must Staple flag.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_notify_cmd"></a>`md_notify_cmd`
+##### <a name="md_notify_cmd"></a>`md_notify_cmd`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Run a program when a Managed Domain is ready.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_port_map"></a>`md_port_map`
+##### <a name="md_port_map"></a>`md_port_map`
 
 Data type: `Optional[String]`
 
 Map external to internal ports for domain ownership verification.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_private_keys"></a>`md_private_keys`
+##### <a name="md_private_keys"></a>`md_private_keys`
 
 Data type: `Optional[String]`
 
 Set type and size of the private keys generated.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_renew_mode"></a>`md_renew_mode`
+##### <a name="md_renew_mode"></a>`md_renew_mode`
 
 Data type: `Optional[Enum['always', 'auto', 'manual']]`
 
 Controls if certificates shall be renewed.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_renew_window"></a>`md_renew_window`
+##### <a name="md_renew_window"></a>`md_renew_window`
 
 Data type: `Optional[String]`
 
 Control when a certificate will be renewed.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_require_https"></a>`md_require_https`
+##### <a name="md_require_https"></a>`md_require_https`
 
 Data type: `Optional[Enum['off', 'permanent', 'temporary']]`
 
 Redirects http: traffic to https: for Managed Domains.
 An http: Virtual Host must nevertheless be setup for that domain.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_server_status"></a>`md_server_status`
+##### <a name="md_server_status"></a>`md_server_status`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Control if Managed Domain information is added to server-status.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_staple_others"></a>`md_staple_others`
+##### <a name="md_staple_others"></a>`md_staple_others`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Enable stapling for certificates not managed by mod_md.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_stapling"></a>`md_stapling`
+##### <a name="md_stapling"></a>`md_stapling`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Enable stapling for all or a particular MDomain.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_stapling_keep_response"></a>`md_stapling_keep_response`
+##### <a name="md_stapling_keep_response"></a>`md_stapling_keep_response`
 
 Data type: `Optional[String]`
 
 Controls when old responses should be removed.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_stapling_renew_window"></a>`md_stapling_renew_window`
+##### <a name="md_stapling_renew_window"></a>`md_stapling_renew_window`
 
 Data type: `Optional[String]`
 
 Control when the stapling responses will be renewed.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_store_dir"></a>`md_store_dir`
+##### <a name="md_store_dir"></a>`md_store_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path on the local file system to store the Managed Domains data.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--md--md_warn_window"></a>`md_warn_window`
+##### <a name="md_warn_window"></a>`md_warn_window`
 
 Data type: `Optional[String]`
 
 Define the time window when you want to be warned about an expiring
 certificate.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--mime"></a>`apache::mod::mime`
+### <a name="apachemodmime"></a>`apache::mod::mime`
 
 Installs and configures `mod_mime`.
 
@@ -3898,11 +3900,11 @@ Installs and configures `mod_mime`.
 
 The following parameters are available in the `apache::mod::mime` class:
 
-* [`mime_support_package`](#-apache--mod--mime--mime_support_package)
-* [`mime_types_config`](#-apache--mod--mime--mime_types_config)
-* [`mime_types_additional`](#-apache--mod--mime--mime_types_additional)
+* [`mime_support_package`](#mime_support_package)
+* [`mime_types_config`](#mime_types_config)
+* [`mime_types_additional`](#mime_types_additional)
 
-##### <a name="-apache--mod--mime--mime_support_package"></a>`mime_support_package`
+##### <a name="mime_support_package"></a>`mime_support_package`
 
 Data type: `String`
 
@@ -3910,7 +3912,7 @@ Name of the MIME package to be installed.
 
 Default value: `$apache::params::mime_support_package`
 
-##### <a name="-apache--mod--mime--mime_types_config"></a>`mime_types_config`
+##### <a name="mime_types_config"></a>`mime_types_config`
 
 Data type: `String`
 
@@ -3918,15 +3920,15 @@ The location of the mime.types file.
 
 Default value: `$apache::params::mime_types_config`
 
-##### <a name="-apache--mod--mime--mime_types_additional"></a>`mime_types_additional`
+##### <a name="mime_types_additional"></a>`mime_types_additional`
 
 Data type: `Optional[Hash]`
 
 List of additional MIME types to include.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--mime_magic"></a>`apache::mod::mime_magic`
+### <a name="apachemodmime_magic"></a>`apache::mod::mime_magic`
 
 Installs and configures `mod_mime_magic`.
 
@@ -3938,17 +3940,17 @@ Installs and configures `mod_mime_magic`.
 
 The following parameters are available in the `apache::mod::mime_magic` class:
 
-* [`magic_file`](#-apache--mod--mime_magic--magic_file)
+* [`magic_file`](#magic_file)
 
-##### <a name="-apache--mod--mime_magic--magic_file"></a>`magic_file`
+##### <a name="magic_file"></a>`magic_file`
 
 Data type: `Optional[String]`
 
 Enable MIME-type determination based on file contents using the specified magic file.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--negotiation"></a>`apache::mod::negotiation`
+### <a name="apachemodnegotiation"></a>`apache::mod::negotiation`
 
 Installs and configures `mod_negotiation`.
 
@@ -3960,10 +3962,10 @@ Installs and configures `mod_negotiation`.
 
 The following parameters are available in the `apache::mod::negotiation` class:
 
-* [`force_language_priority`](#-apache--mod--negotiation--force_language_priority)
-* [`language_priority`](#-apache--mod--negotiation--language_priority)
+* [`force_language_priority`](#force_language_priority)
+* [`language_priority`](#language_priority)
 
-##### <a name="-apache--mod--negotiation--force_language_priority"></a>`force_language_priority`
+##### <a name="force_language_priority"></a>`force_language_priority`
 
 Data type: `Variant[Array[String], String]`
 
@@ -3971,22 +3973,18 @@ Action to take if a single acceptable document is not found.
 
 Default value: `'Prefer Fallback'`
 
-##### <a name="-apache--mod--negotiation--language_priority"></a>`language_priority`
+##### <a name="language_priority"></a>`language_priority`
 
 Data type: `Variant[Array[String], String]`
 
 The precedence of language variants for cases where the client does not express a preference.
 
-Default value:
-
-```puppet
-['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+Default value: `['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
     'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
     'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
-  'zh-TW']
-```
+  'zh-TW']`
 
-### <a name="apache--mod--nss"></a>`apache::mod::nss`
+### <a name="apachemodnss"></a>`apache::mod::nss`
 
 Installs and configures `mod_nss`.
 
@@ -3998,12 +3996,12 @@ Installs and configures `mod_nss`.
 
 The following parameters are available in the `apache::mod::nss` class:
 
-* [`transfer_log`](#-apache--mod--nss--transfer_log)
-* [`error_log`](#-apache--mod--nss--error_log)
-* [`passwd_file`](#-apache--mod--nss--passwd_file)
-* [`port`](#-apache--mod--nss--port)
+* [`transfer_log`](#transfer_log)
+* [`error_log`](#error_log)
+* [`passwd_file`](#passwd_file)
+* [`port`](#port)
 
-##### <a name="-apache--mod--nss--transfer_log"></a>`transfer_log`
+##### <a name="transfer_log"></a>`transfer_log`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4011,7 +4009,7 @@ Path to `access.log`.
 
 Default value: `"${apache::params::logroot}/access.log"`
 
-##### <a name="-apache--mod--nss--error_log"></a>`error_log`
+##### <a name="error_log"></a>`error_log`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4019,15 +4017,15 @@ Path to `error.log`
 
 Default value: `"${apache::params::logroot}/error.log"`
 
-##### <a name="-apache--mod--nss--passwd_file"></a>`passwd_file`
+##### <a name="passwd_file"></a>`passwd_file`
 
 Data type: `Optional[String]`
 
 Path to file containing token passwords used for NSSPassPhraseDialog.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--nss--port"></a>`port`
+##### <a name="port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -4035,7 +4033,7 @@ Sets the SSL port that should be used by mod_nss.
 
 Default value: `8443`
 
-### <a name="apache--mod--pagespeed"></a>`apache::mod::pagespeed`
+### <a name="apachemodpagespeed"></a>`apache::mod::pagespeed`
 
 Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
 
@@ -4100,42 +4098,42 @@ class { 'apache::mod::pagespeed':
 
 The following parameters are available in the `apache::mod::pagespeed` class:
 
-* [`inherit_vhost_config`](#-apache--mod--pagespeed--inherit_vhost_config)
-* [`filter_xhtml`](#-apache--mod--pagespeed--filter_xhtml)
-* [`cache_path`](#-apache--mod--pagespeed--cache_path)
-* [`log_dir`](#-apache--mod--pagespeed--log_dir)
-* [`memcache_servers`](#-apache--mod--pagespeed--memcache_servers)
-* [`rewrite_level`](#-apache--mod--pagespeed--rewrite_level)
-* [`disable_filters`](#-apache--mod--pagespeed--disable_filters)
-* [`enable_filters`](#-apache--mod--pagespeed--enable_filters)
-* [`forbid_filters`](#-apache--mod--pagespeed--forbid_filters)
-* [`rewrite_deadline_per_flush_ms`](#-apache--mod--pagespeed--rewrite_deadline_per_flush_ms)
-* [`additional_domains`](#-apache--mod--pagespeed--additional_domains)
-* [`file_cache_size_kb`](#-apache--mod--pagespeed--file_cache_size_kb)
-* [`file_cache_clean_interval_ms`](#-apache--mod--pagespeed--file_cache_clean_interval_ms)
-* [`lru_cache_per_process`](#-apache--mod--pagespeed--lru_cache_per_process)
-* [`lru_cache_byte_limit`](#-apache--mod--pagespeed--lru_cache_byte_limit)
-* [`css_flatten_max_bytes`](#-apache--mod--pagespeed--css_flatten_max_bytes)
-* [`css_inline_max_bytes`](#-apache--mod--pagespeed--css_inline_max_bytes)
-* [`css_image_inline_max_bytes`](#-apache--mod--pagespeed--css_image_inline_max_bytes)
-* [`image_inline_max_bytes`](#-apache--mod--pagespeed--image_inline_max_bytes)
-* [`js_inline_max_bytes`](#-apache--mod--pagespeed--js_inline_max_bytes)
-* [`css_outline_min_bytes`](#-apache--mod--pagespeed--css_outline_min_bytes)
-* [`js_outline_min_bytes`](#-apache--mod--pagespeed--js_outline_min_bytes)
-* [`inode_limit`](#-apache--mod--pagespeed--inode_limit)
-* [`image_max_rewrites_at_once`](#-apache--mod--pagespeed--image_max_rewrites_at_once)
-* [`num_rewrite_threads`](#-apache--mod--pagespeed--num_rewrite_threads)
-* [`num_expensive_rewrite_threads`](#-apache--mod--pagespeed--num_expensive_rewrite_threads)
-* [`collect_statistics`](#-apache--mod--pagespeed--collect_statistics)
-* [`statistics_logging`](#-apache--mod--pagespeed--statistics_logging)
-* [`allow_view_stats`](#-apache--mod--pagespeed--allow_view_stats)
-* [`allow_pagespeed_console`](#-apache--mod--pagespeed--allow_pagespeed_console)
-* [`allow_pagespeed_message`](#-apache--mod--pagespeed--allow_pagespeed_message)
-* [`message_buffer_size`](#-apache--mod--pagespeed--message_buffer_size)
-* [`additional_configuration`](#-apache--mod--pagespeed--additional_configuration)
-* [`package_ensure`](#-apache--mod--pagespeed--package_ensure)
-
-##### <a name="-apache--mod--pagespeed--inherit_vhost_config"></a>`inherit_vhost_config`
+* [`inherit_vhost_config`](#inherit_vhost_config)
+* [`filter_xhtml`](#filter_xhtml)
+* [`cache_path`](#cache_path)
+* [`log_dir`](#log_dir)
+* [`memcache_servers`](#memcache_servers)
+* [`rewrite_level`](#rewrite_level)
+* [`disable_filters`](#disable_filters)
+* [`enable_filters`](#enable_filters)
+* [`forbid_filters`](#forbid_filters)
+* [`rewrite_deadline_per_flush_ms`](#rewrite_deadline_per_flush_ms)
+* [`additional_domains`](#additional_domains)
+* [`file_cache_size_kb`](#file_cache_size_kb)
+* [`file_cache_clean_interval_ms`](#file_cache_clean_interval_ms)
+* [`lru_cache_per_process`](#lru_cache_per_process)
+* [`lru_cache_byte_limit`](#lru_cache_byte_limit)
+* [`css_flatten_max_bytes`](#css_flatten_max_bytes)
+* [`css_inline_max_bytes`](#css_inline_max_bytes)
+* [`css_image_inline_max_bytes`](#css_image_inline_max_bytes)
+* [`image_inline_max_bytes`](#image_inline_max_bytes)
+* [`js_inline_max_bytes`](#js_inline_max_bytes)
+* [`css_outline_min_bytes`](#css_outline_min_bytes)
+* [`js_outline_min_bytes`](#js_outline_min_bytes)
+* [`inode_limit`](#inode_limit)
+* [`image_max_rewrites_at_once`](#image_max_rewrites_at_once)
+* [`num_rewrite_threads`](#num_rewrite_threads)
+* [`num_expensive_rewrite_threads`](#num_expensive_rewrite_threads)
+* [`collect_statistics`](#collect_statistics)
+* [`statistics_logging`](#statistics_logging)
+* [`allow_view_stats`](#allow_view_stats)
+* [`allow_pagespeed_console`](#allow_pagespeed_console)
+* [`allow_pagespeed_message`](#allow_pagespeed_message)
+* [`message_buffer_size`](#message_buffer_size)
+* [`additional_configuration`](#additional_configuration)
+* [`package_ensure`](#package_ensure)
+
+##### <a name="inherit_vhost_config"></a>`inherit_vhost_config`
 
 Data type: `String`
 
@@ -4143,15 +4141,15 @@ Whether or not to inherit the vhost config
 
 Default value: `'on'`
 
-##### <a name="-apache--mod--pagespeed--filter_xhtml"></a>`filter_xhtml`
+##### <a name="filter_xhtml"></a>`filter_xhtml`
 
 Data type: `Boolean`
 
 Whether to filter by xhtml
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--pagespeed--cache_path"></a>`cache_path`
+##### <a name="cache_path"></a>`cache_path`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4159,7 +4157,7 @@ Where to cache any files
 
 Default value: `'/var/cache/mod_pagespeed/'`
 
-##### <a name="-apache--mod--pagespeed--log_dir"></a>`log_dir`
+##### <a name="log_dir"></a>`log_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4167,7 +4165,7 @@ The log directory
 
 Default value: `'/var/log/pagespeed'`
 
-##### <a name="-apache--mod--pagespeed--memcache_servers"></a>`memcache_servers`
+##### <a name="memcache_servers"></a>`memcache_servers`
 
 Data type: `Array`
 
@@ -4175,7 +4173,7 @@ Data type: `Array`
 
 Default value: `[]`
 
-##### <a name="-apache--mod--pagespeed--rewrite_level"></a>`rewrite_level`
+##### <a name="rewrite_level"></a>`rewrite_level`
 
 Data type: `String`
 
@@ -4184,7 +4182,7 @@ Can be `PassThrough`, `CoreFilters` or `OptimizeForBandwidth`.
 
 Default value: `'CoreFilters'`
 
-##### <a name="-apache--mod--pagespeed--disable_filters"></a>`disable_filters`
+##### <a name="disable_filters"></a>`disable_filters`
 
 Data type: `Array`
 
@@ -4192,7 +4190,7 @@ An array of filters that you wish to disable
 
 Default value: `[]`
 
-##### <a name="-apache--mod--pagespeed--enable_filters"></a>`enable_filters`
+##### <a name="enable_filters"></a>`enable_filters`
 
 Data type: `Array`
 
@@ -4200,7 +4198,7 @@ An array of filters that you wish to enable
 
 Default value: `[]`
 
-##### <a name="-apache--mod--pagespeed--forbid_filters"></a>`forbid_filters`
+##### <a name="forbid_filters"></a>`forbid_filters`
 
 Data type: `Array`
 
@@ -4208,7 +4206,7 @@ An array of filters that you wish to forbid
 
 Default value: `[]`
 
-##### <a name="-apache--mod--pagespeed--rewrite_deadline_per_flush_ms"></a>`rewrite_deadline_per_flush_ms`
+##### <a name="rewrite_deadline_per_flush_ms"></a>`rewrite_deadline_per_flush_ms`
 
 Data type: `Integer`
 
@@ -4216,15 +4214,15 @@ How long to wait after attempting to rewrite an uncache/expired resource.
 
 Default value: `10`
 
-##### <a name="-apache--mod--pagespeed--additional_domains"></a>`additional_domains`
+##### <a name="additional_domains"></a>`additional_domains`
 
 Data type: `Optional[String]`
 
 Any additional domains that PageSpeed should optimize resources from.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--pagespeed--file_cache_size_kb"></a>`file_cache_size_kb`
+##### <a name="file_cache_size_kb"></a>`file_cache_size_kb`
 
 Data type: `Integer`
 
@@ -4232,7 +4230,7 @@ The maximum size of the cache
 
 Default value: `102400`
 
-##### <a name="-apache--mod--pagespeed--file_cache_clean_interval_ms"></a>`file_cache_clean_interval_ms`
+##### <a name="file_cache_clean_interval_ms"></a>`file_cache_clean_interval_ms`
 
 Data type: `Integer`
 
@@ -4240,7 +4238,7 @@ The interval between which the cache is cleaned
 
 Default value: `3600000`
 
-##### <a name="-apache--mod--pagespeed--lru_cache_per_process"></a>`lru_cache_per_process`
+##### <a name="lru_cache_per_process"></a>`lru_cache_per_process`
 
 Data type: `Integer`
 
@@ -4248,7 +4246,7 @@ The amount of memory dedcated to each process
 
 Default value: `1024`
 
-##### <a name="-apache--mod--pagespeed--lru_cache_byte_limit"></a>`lru_cache_byte_limit`
+##### <a name="lru_cache_byte_limit"></a>`lru_cache_byte_limit`
 
 Data type: `Integer`
 
@@ -4256,7 +4254,7 @@ How large a cache entry the cache will accept
 
 Default value: `16384`
 
-##### <a name="-apache--mod--pagespeed--css_flatten_max_bytes"></a>`css_flatten_max_bytes`
+##### <a name="css_flatten_max_bytes"></a>`css_flatten_max_bytes`
 
 Data type: `Integer`
 
@@ -4264,7 +4262,7 @@ The maximum size in bytes of the flattened CSS
 
 Default value: `2048`
 
-##### <a name="-apache--mod--pagespeed--css_inline_max_bytes"></a>`css_inline_max_bytes`
+##### <a name="css_inline_max_bytes"></a>`css_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4272,7 +4270,7 @@ The maximum size in bytes of any image that will be inlined into CSS
 
 Default value: `2048`
 
-##### <a name="-apache--mod--pagespeed--css_image_inline_max_bytes"></a>`css_image_inline_max_bytes`
+##### <a name="css_image_inline_max_bytes"></a>`css_image_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4280,7 +4278,7 @@ The maximum size in bytes of any image that will be inlined into an HTML file
 
 Default value: `2048`
 
-##### <a name="-apache--mod--pagespeed--image_inline_max_bytes"></a>`image_inline_max_bytes`
+##### <a name="image_inline_max_bytes"></a>`image_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4288,7 +4286,7 @@ The maximum size in bytes of any inlined CSS file
 
 Default value: `2048`
 
-##### <a name="-apache--mod--pagespeed--js_inline_max_bytes"></a>`js_inline_max_bytes`
+##### <a name="js_inline_max_bytes"></a>`js_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4296,7 +4294,7 @@ The maximum size in bytes of any inlined JavaScript file
 
 Default value: `2048`
 
-##### <a name="-apache--mod--pagespeed--css_outline_min_bytes"></a>`css_outline_min_bytes`
+##### <a name="css_outline_min_bytes"></a>`css_outline_min_bytes`
 
 Data type: `Integer`
 
@@ -4304,7 +4302,7 @@ The minimum size in bytes for a CSS file to qualify as an outline
 
 Default value: `3000`
 
-##### <a name="-apache--mod--pagespeed--js_outline_min_bytes"></a>`js_outline_min_bytes`
+##### <a name="js_outline_min_bytes"></a>`js_outline_min_bytes`
 
 Data type: `Integer`
 
@@ -4312,7 +4310,7 @@ The minimum size in bytes for a JavaScript file to qualify as an outline
 
 Default value: `3000`
 
-##### <a name="-apache--mod--pagespeed--inode_limit"></a>`inode_limit`
+##### <a name="inode_limit"></a>`inode_limit`
 
 Data type: `Integer`
 
@@ -4320,7 +4318,7 @@ The file cache inode limit
 
 Default value: `500000`
 
-##### <a name="-apache--mod--pagespeed--image_max_rewrites_at_once"></a>`image_max_rewrites_at_once`
+##### <a name="image_max_rewrites_at_once"></a>`image_max_rewrites_at_once`
 
 Data type: `Integer`
 
@@ -4328,7 +4326,7 @@ The maximum number of images to optimize concurrently
 
 Default value: `8`
 
-##### <a name="-apache--mod--pagespeed--num_rewrite_threads"></a>`num_rewrite_threads`
+##### <a name="num_rewrite_threads"></a>`num_rewrite_threads`
 
 Data type: `Integer`
 
@@ -4337,7 +4335,7 @@ These threads are used for short, latency-sensitive work.
 
 Default value: `4`
 
-##### <a name="-apache--mod--pagespeed--num_expensive_rewrite_threads"></a>`num_expensive_rewrite_threads`
+##### <a name="num_expensive_rewrite_threads"></a>`num_expensive_rewrite_threads`
 
 Data type: `Integer`
 
@@ -4346,7 +4344,7 @@ These threads are used for full optimization.
 
 Default value: `4`
 
-##### <a name="-apache--mod--pagespeed--collect_statistics"></a>`collect_statistics`
+##### <a name="collect_statistics"></a>`collect_statistics`
 
 Data type: `String`
 
@@ -4354,7 +4352,7 @@ Whether to collect cross-process statistics
 
 Default value: `'on'`
 
-##### <a name="-apache--mod--pagespeed--statistics_logging"></a>`statistics_logging`
+##### <a name="statistics_logging"></a>`statistics_logging`
 
 Data type: `String`
 
@@ -4362,7 +4360,7 @@ Whether graphs should be drawn from collected statistics
 
 Default value: `'on'`
 
-##### <a name="-apache--mod--pagespeed--allow_view_stats"></a>`allow_view_stats`
+##### <a name="allow_view_stats"></a>`allow_view_stats`
 
 Data type: `Array`
 
@@ -4370,7 +4368,7 @@ What sources should be allowed to view the resultant graph
 
 Default value: `[]`
 
-##### <a name="-apache--mod--pagespeed--allow_pagespeed_console"></a>`allow_pagespeed_console`
+##### <a name="allow_pagespeed_console"></a>`allow_pagespeed_console`
 
 Data type: `Array`
 
@@ -4378,7 +4376,7 @@ What sources to draw the graphs from
 
 Default value: `[]`
 
-##### <a name="-apache--mod--pagespeed--allow_pagespeed_message"></a>`allow_pagespeed_message`
+##### <a name="allow_pagespeed_message"></a>`allow_pagespeed_message`
 
 Data type: `Array`
 
@@ -4386,7 +4384,7 @@ Data type: `Array`
 
 Default value: `[]`
 
-##### <a name="-apache--mod--pagespeed--message_buffer_size"></a>`message_buffer_size`
+##### <a name="message_buffer_size"></a>`message_buffer_size`
 
 Data type: `Integer`
 
@@ -4394,7 +4392,7 @@ The amount of bytes to allocate as a buffer to hold recent log messages
 
 Default value: `100000`
 
-##### <a name="-apache--mod--pagespeed--additional_configuration"></a>`additional_configuration`
+##### <a name="additional_configuration"></a>`additional_configuration`
 
 Data type: `Variant[Array, Hash]`
 
@@ -4402,15 +4400,15 @@ Any additional configuration no included as it's own option
 
 Default value: `{}`
 
-##### <a name="-apache--mod--pagespeed--package_ensure"></a>`package_ensure`
+##### <a name="package_ensure"></a>`package_ensure`
 
 Data type: `Optional[String]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--passenger"></a>`apache::mod::passenger`
+### <a name="apachemodpassenger"></a>`apache::mod::passenger`
 
 The current set of server configurations settings were taken directly from the Passenger Reference. To enable deprecation warnings
 and removal failure messages, set the passenger_installed_version to the version number installed on the server.
@@ -4433,176 +4431,176 @@ There are also several undocumented settings.
 
 The following parameters are available in the `apache::mod::passenger` class:
 
-* [`manage_repo`](#-apache--mod--passenger--manage_repo)
-* [`mod_id`](#-apache--mod--passenger--mod_id)
-* [`mod_lib`](#-apache--mod--passenger--mod_lib)
-* [`mod_lib_path`](#-apache--mod--passenger--mod_lib_path)
-* [`mod_package`](#-apache--mod--passenger--mod_package)
-* [`mod_package_ensure`](#-apache--mod--passenger--mod_package_ensure)
-* [`mod_path`](#-apache--mod--passenger--mod_path)
-* [`passenger_allow_encoded_slashes`](#-apache--mod--passenger--passenger_allow_encoded_slashes)
-* [`passenger_anonymous_telemetry_proxy`](#-apache--mod--passenger--passenger_anonymous_telemetry_proxy)
-* [`passenger_app_env`](#-apache--mod--passenger--passenger_app_env)
-* [`passenger_app_group_name`](#-apache--mod--passenger--passenger_app_group_name)
-* [`passenger_app_root`](#-apache--mod--passenger--passenger_app_root)
-* [`passenger_app_type`](#-apache--mod--passenger--passenger_app_type)
-* [`passenger_base_uri`](#-apache--mod--passenger--passenger_base_uri)
-* [`passenger_buffer_response`](#-apache--mod--passenger--passenger_buffer_response)
-* [`passenger_buffer_upload`](#-apache--mod--passenger--passenger_buffer_upload)
-* [`passenger_concurrency_model`](#-apache--mod--passenger--passenger_concurrency_model)
-* [`passenger_conf_file`](#-apache--mod--passenger--passenger_conf_file)
-* [`passenger_conf_package_file`](#-apache--mod--passenger--passenger_conf_package_file)
-* [`passenger_data_buffer_dir`](#-apache--mod--passenger--passenger_data_buffer_dir)
-* [`passenger_debug_log_file`](#-apache--mod--passenger--passenger_debug_log_file)
-* [`passenger_debugger`](#-apache--mod--passenger--passenger_debugger)
-* [`passenger_default_group`](#-apache--mod--passenger--passenger_default_group)
-* [`passenger_default_ruby`](#-apache--mod--passenger--passenger_default_ruby)
-* [`passenger_default_user`](#-apache--mod--passenger--passenger_default_user)
-* [`passenger_disable_anonymous_telemetry`](#-apache--mod--passenger--passenger_disable_anonymous_telemetry)
-* [`passenger_disable_log_prefix`](#-apache--mod--passenger--passenger_disable_log_prefix)
-* [`passenger_disable_security_update_check`](#-apache--mod--passenger--passenger_disable_security_update_check)
-* [`passenger_enabled`](#-apache--mod--passenger--passenger_enabled)
-* [`passenger_error_override`](#-apache--mod--passenger--passenger_error_override)
-* [`passenger_file_descriptor_log_file`](#-apache--mod--passenger--passenger_file_descriptor_log_file)
-* [`passenger_fly_with`](#-apache--mod--passenger--passenger_fly_with)
-* [`passenger_force_max_concurrent_requests_per_process`](#-apache--mod--passenger--passenger_force_max_concurrent_requests_per_process)
-* [`passenger_friendly_error_pages`](#-apache--mod--passenger--passenger_friendly_error_pages)
-* [`passenger_group`](#-apache--mod--passenger--passenger_group)
-* [`passenger_high_performance`](#-apache--mod--passenger--passenger_high_performance)
-* [`passenger_installed_version`](#-apache--mod--passenger--passenger_installed_version)
-* [`passenger_instance_registry_dir`](#-apache--mod--passenger--passenger_instance_registry_dir)
-* [`passenger_load_shell_envvars`](#-apache--mod--passenger--passenger_load_shell_envvars)
-* [`passenger_preload_bundler`](#-apache--mod--passenger--passenger_preload_bundler)
-* [`passenger_log_file`](#-apache--mod--passenger--passenger_log_file)
-* [`passenger_log_level`](#-apache--mod--passenger--passenger_log_level)
-* [`passenger_lve_min_uid`](#-apache--mod--passenger--passenger_lve_min_uid)
-* [`passenger_max_instances`](#-apache--mod--passenger--passenger_max_instances)
-* [`passenger_max_instances_per_app`](#-apache--mod--passenger--passenger_max_instances_per_app)
-* [`passenger_max_pool_size`](#-apache--mod--passenger--passenger_max_pool_size)
-* [`passenger_max_preloader_idle_time`](#-apache--mod--passenger--passenger_max_preloader_idle_time)
-* [`passenger_max_request_queue_size`](#-apache--mod--passenger--passenger_max_request_queue_size)
-* [`passenger_max_request_time`](#-apache--mod--passenger--passenger_max_request_time)
-* [`passenger_max_requests`](#-apache--mod--passenger--passenger_max_requests)
-* [`passenger_memory_limit`](#-apache--mod--passenger--passenger_memory_limit)
-* [`passenger_meteor_app_settings`](#-apache--mod--passenger--passenger_meteor_app_settings)
-* [`passenger_min_instances`](#-apache--mod--passenger--passenger_min_instances)
-* [`passenger_nodejs`](#-apache--mod--passenger--passenger_nodejs)
-* [`passenger_pool_idle_time`](#-apache--mod--passenger--passenger_pool_idle_time)
-* [`passenger_pre_start`](#-apache--mod--passenger--passenger_pre_start)
-* [`passenger_python`](#-apache--mod--passenger--passenger_python)
-* [`passenger_resist_deployment_errors`](#-apache--mod--passenger--passenger_resist_deployment_errors)
-* [`passenger_resolve_symlinks_in_document_root`](#-apache--mod--passenger--passenger_resolve_symlinks_in_document_root)
-* [`passenger_response_buffer_high_watermark`](#-apache--mod--passenger--passenger_response_buffer_high_watermark)
-* [`passenger_restart_dir`](#-apache--mod--passenger--passenger_restart_dir)
-* [`passenger_rolling_restarts`](#-apache--mod--passenger--passenger_rolling_restarts)
-* [`passenger_root`](#-apache--mod--passenger--passenger_root)
-* [`passenger_ruby`](#-apache--mod--passenger--passenger_ruby)
-* [`passenger_security_update_check_proxy`](#-apache--mod--passenger--passenger_security_update_check_proxy)
-* [`passenger_show_version_in_header`](#-apache--mod--passenger--passenger_show_version_in_header)
-* [`passenger_socket_backlog`](#-apache--mod--passenger--passenger_socket_backlog)
-* [`passenger_spawn_dir`](#-apache--mod--passenger--passenger_spawn_dir)
-* [`passenger_spawn_method`](#-apache--mod--passenger--passenger_spawn_method)
-* [`passenger_start_timeout`](#-apache--mod--passenger--passenger_start_timeout)
-* [`passenger_startup_file`](#-apache--mod--passenger--passenger_startup_file)
-* [`passenger_stat_throttle_rate`](#-apache--mod--passenger--passenger_stat_throttle_rate)
-* [`passenger_sticky_sessions`](#-apache--mod--passenger--passenger_sticky_sessions)
-* [`passenger_sticky_sessions_cookie_name`](#-apache--mod--passenger--passenger_sticky_sessions_cookie_name)
-* [`passenger_sticky_sessions_cookie_attributes`](#-apache--mod--passenger--passenger_sticky_sessions_cookie_attributes)
-* [`passenger_thread_count`](#-apache--mod--passenger--passenger_thread_count)
-* [`passenger_use_global_queue`](#-apache--mod--passenger--passenger_use_global_queue)
-* [`passenger_user`](#-apache--mod--passenger--passenger_user)
-* [`passenger_user_switching`](#-apache--mod--passenger--passenger_user_switching)
-* [`rack_auto_detect`](#-apache--mod--passenger--rack_auto_detect)
-* [`rack_autodetect`](#-apache--mod--passenger--rack_autodetect)
-* [`rack_base_uri`](#-apache--mod--passenger--rack_base_uri)
-* [`rack_env`](#-apache--mod--passenger--rack_env)
-* [`rails_allow_mod_rewrite`](#-apache--mod--passenger--rails_allow_mod_rewrite)
-* [`rails_app_spawner_idle_time`](#-apache--mod--passenger--rails_app_spawner_idle_time)
-* [`rails_auto_detect`](#-apache--mod--passenger--rails_auto_detect)
-* [`rails_autodetect`](#-apache--mod--passenger--rails_autodetect)
-* [`rails_base_uri`](#-apache--mod--passenger--rails_base_uri)
-* [`rails_default_user`](#-apache--mod--passenger--rails_default_user)
-* [`rails_env`](#-apache--mod--passenger--rails_env)
-* [`rails_framework_spawner_idle_time`](#-apache--mod--passenger--rails_framework_spawner_idle_time)
-* [`rails_ruby`](#-apache--mod--passenger--rails_ruby)
-* [`rails_spawn_method`](#-apache--mod--passenger--rails_spawn_method)
-* [`rails_user_switching`](#-apache--mod--passenger--rails_user_switching)
-* [`wsgi_auto_detect`](#-apache--mod--passenger--wsgi_auto_detect)
-
-##### <a name="-apache--mod--passenger--manage_repo"></a>`manage_repo`
+* [`manage_repo`](#manage_repo)
+* [`mod_id`](#mod_id)
+* [`mod_lib`](#mod_lib)
+* [`mod_lib_path`](#mod_lib_path)
+* [`mod_package`](#mod_package)
+* [`mod_package_ensure`](#mod_package_ensure)
+* [`mod_path`](#mod_path)
+* [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
+* [`passenger_anonymous_telemetry_proxy`](#passenger_anonymous_telemetry_proxy)
+* [`passenger_app_env`](#passenger_app_env)
+* [`passenger_app_group_name`](#passenger_app_group_name)
+* [`passenger_app_root`](#passenger_app_root)
+* [`passenger_app_type`](#passenger_app_type)
+* [`passenger_base_uri`](#passenger_base_uri)
+* [`passenger_buffer_response`](#passenger_buffer_response)
+* [`passenger_buffer_upload`](#passenger_buffer_upload)
+* [`passenger_concurrency_model`](#passenger_concurrency_model)
+* [`passenger_conf_file`](#passenger_conf_file)
+* [`passenger_conf_package_file`](#passenger_conf_package_file)
+* [`passenger_data_buffer_dir`](#passenger_data_buffer_dir)
+* [`passenger_debug_log_file`](#passenger_debug_log_file)
+* [`passenger_debugger`](#passenger_debugger)
+* [`passenger_default_group`](#passenger_default_group)
+* [`passenger_default_ruby`](#passenger_default_ruby)
+* [`passenger_default_user`](#passenger_default_user)
+* [`passenger_disable_anonymous_telemetry`](#passenger_disable_anonymous_telemetry)
+* [`passenger_disable_log_prefix`](#passenger_disable_log_prefix)
+* [`passenger_disable_security_update_check`](#passenger_disable_security_update_check)
+* [`passenger_enabled`](#passenger_enabled)
+* [`passenger_error_override`](#passenger_error_override)
+* [`passenger_file_descriptor_log_file`](#passenger_file_descriptor_log_file)
+* [`passenger_fly_with`](#passenger_fly_with)
+* [`passenger_force_max_concurrent_requests_per_process`](#passenger_force_max_concurrent_requests_per_process)
+* [`passenger_friendly_error_pages`](#passenger_friendly_error_pages)
+* [`passenger_group`](#passenger_group)
+* [`passenger_high_performance`](#passenger_high_performance)
+* [`passenger_installed_version`](#passenger_installed_version)
+* [`passenger_instance_registry_dir`](#passenger_instance_registry_dir)
+* [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
+* [`passenger_preload_bundler`](#passenger_preload_bundler)
+* [`passenger_log_file`](#passenger_log_file)
+* [`passenger_log_level`](#passenger_log_level)
+* [`passenger_lve_min_uid`](#passenger_lve_min_uid)
+* [`passenger_max_instances`](#passenger_max_instances)
+* [`passenger_max_instances_per_app`](#passenger_max_instances_per_app)
+* [`passenger_max_pool_size`](#passenger_max_pool_size)
+* [`passenger_max_preloader_idle_time`](#passenger_max_preloader_idle_time)
+* [`passenger_max_request_queue_size`](#passenger_max_request_queue_size)
+* [`passenger_max_request_time`](#passenger_max_request_time)
+* [`passenger_max_requests`](#passenger_max_requests)
+* [`passenger_memory_limit`](#passenger_memory_limit)
+* [`passenger_meteor_app_settings`](#passenger_meteor_app_settings)
+* [`passenger_min_instances`](#passenger_min_instances)
+* [`passenger_nodejs`](#passenger_nodejs)
+* [`passenger_pool_idle_time`](#passenger_pool_idle_time)
+* [`passenger_pre_start`](#passenger_pre_start)
+* [`passenger_python`](#passenger_python)
+* [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
+* [`passenger_resolve_symlinks_in_document_root`](#passenger_resolve_symlinks_in_document_root)
+* [`passenger_response_buffer_high_watermark`](#passenger_response_buffer_high_watermark)
+* [`passenger_restart_dir`](#passenger_restart_dir)
+* [`passenger_rolling_restarts`](#passenger_rolling_restarts)
+* [`passenger_root`](#passenger_root)
+* [`passenger_ruby`](#passenger_ruby)
+* [`passenger_security_update_check_proxy`](#passenger_security_update_check_proxy)
+* [`passenger_show_version_in_header`](#passenger_show_version_in_header)
+* [`passenger_socket_backlog`](#passenger_socket_backlog)
+* [`passenger_spawn_dir`](#passenger_spawn_dir)
+* [`passenger_spawn_method`](#passenger_spawn_method)
+* [`passenger_start_timeout`](#passenger_start_timeout)
+* [`passenger_startup_file`](#passenger_startup_file)
+* [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
+* [`passenger_sticky_sessions`](#passenger_sticky_sessions)
+* [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
+* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
+* [`passenger_thread_count`](#passenger_thread_count)
+* [`passenger_use_global_queue`](#passenger_use_global_queue)
+* [`passenger_user`](#passenger_user)
+* [`passenger_user_switching`](#passenger_user_switching)
+* [`rack_auto_detect`](#rack_auto_detect)
+* [`rack_autodetect`](#rack_autodetect)
+* [`rack_base_uri`](#rack_base_uri)
+* [`rack_env`](#rack_env)
+* [`rails_allow_mod_rewrite`](#rails_allow_mod_rewrite)
+* [`rails_app_spawner_idle_time`](#rails_app_spawner_idle_time)
+* [`rails_auto_detect`](#rails_auto_detect)
+* [`rails_autodetect`](#rails_autodetect)
+* [`rails_base_uri`](#rails_base_uri)
+* [`rails_default_user`](#rails_default_user)
+* [`rails_env`](#rails_env)
+* [`rails_framework_spawner_idle_time`](#rails_framework_spawner_idle_time)
+* [`rails_ruby`](#rails_ruby)
+* [`rails_spawn_method`](#rails_spawn_method)
+* [`rails_user_switching`](#rails_user_switching)
+* [`wsgi_auto_detect`](#wsgi_auto_detect)
+
+##### <a name="manage_repo"></a>`manage_repo`
 
 Data type: `Boolean`
 
 Toggle whether to manage yum repo if on a RedHat node.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--passenger--mod_id"></a>`mod_id`
+##### <a name="mod_id"></a>`mod_id`
 
 Data type: `Optional[String]`
 
 Specifies the package id.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--mod_lib"></a>`mod_lib`
+##### <a name="mod_lib"></a>`mod_lib`
 
 Data type: `Optional[String]`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--mod_lib_path"></a>`mod_lib_path`
+##### <a name="mod_lib_path"></a>`mod_lib_path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter overrides
 this value.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--mod_package"></a>`mod_package`
+##### <a name="mod_package"></a>`mod_package`
 
 Data type: `Optional[String]`
 
 Name of the module package to install.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--mod_package_ensure"></a>`mod_package_ensure`
+##### <a name="mod_package_ensure"></a>`mod_package_ensure`
 
 Data type: `Optional[String]`
 
 Determines whether Puppet ensures the module should be installed.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--mod_path"></a>`mod_path`
+##### <a name="mod_path"></a>`mod_path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
+##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
+##### <a name="passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
 
 Data type: `Optional[String]`
 
 Set an intermediate proxy for the Passenger anonymous telemetry reporting.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_app_env"></a>`passenger_app_env`
+##### <a name="passenger_app_env"></a>`passenger_app_env`
 
 Data type: `Optional[String]`
 
@@ -4613,66 +4611,66 @@ This option sets, for the current application, the value of the following enviro
 - NODE_ENV
 - PASSENGER_APP_ENV
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_app_group_name"></a>`passenger_app_group_name`
+##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the application group that the current application should belong to.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_app_root"></a>`passenger_app_root`
+##### <a name="passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Optional[String]`
 
 Path to the application root which allows access independent from the DocumentRoot.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_app_type"></a>`passenger_app_type`
+##### <a name="passenger_app_type"></a>`passenger_app_type`
 
 Data type: `Optional[String]`
 
 Specifies the type of the application. If you set this option, then you must also set PassengerAppRoot, otherwise Passenger will
 not properly recognize your application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_base_uri"></a>`passenger_base_uri`
+##### <a name="passenger_base_uri"></a>`passenger_base_uri`
 
 Data type: `Optional[String]`
 
 Used to specify that the given URI is an distinct application that should be served by Passenger.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_buffer_response"></a>`passenger_buffer_response`
+##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggle whether application-generated responses are buffered by Apache. Buffering will happen in memory.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_buffer_upload"></a>`passenger_buffer_upload`
+##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggle whether HTTP client request bodies are buffered before they are sent to the application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_concurrency_model"></a>`passenger_concurrency_model`
+##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
 
 Data type: `Optional[String]`
 
 Specifies the I/O concurrency model that should be used for Ruby application processes.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_conf_file"></a>`passenger_conf_file`
+##### <a name="passenger_conf_file"></a>`passenger_conf_file`
 
 Data type: `String`
 
@@ -4680,7 +4678,7 @@ Data type: `String`
 
 Default value: `$apache::params::passenger_conf_file`
 
-##### <a name="-apache--mod--passenger--passenger_conf_package_file"></a>`passenger_conf_package_file`
+##### <a name="passenger_conf_package_file"></a>`passenger_conf_package_file`
 
 Data type: `Optional[String]`
 
@@ -4688,39 +4686,39 @@ Data type: `Optional[String]`
 
 Default value: `$apache::params::passenger_conf_package_file`
 
-##### <a name="-apache--mod--passenger--passenger_data_buffer_dir"></a>`passenger_data_buffer_dir`
+##### <a name="passenger_data_buffer_dir"></a>`passenger_data_buffer_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the directory in which to store data buffers.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_debug_log_file"></a>`passenger_debug_log_file`
+##### <a name="passenger_debug_log_file"></a>`passenger_debug_log_file`
 
 Data type: `Optional[String]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_debugger"></a>`passenger_debugger`
+##### <a name="passenger_debugger"></a>`passenger_debugger`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Turns support for Ruby application debugging on or off.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_default_group"></a>`passenger_default_group`
+##### <a name="passenger_default_group"></a>`passenger_default_group`
 
 Data type: `Optional[String]`
 
 Allows you to specify the group that applications must run as, if user switching fails or is disabled.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_default_ruby"></a>`passenger_default_ruby`
+##### <a name="passenger_default_ruby"></a>`passenger_default_ruby`
 
 Data type: `Optional[String]`
 
@@ -4728,318 +4726,318 @@ File path to desired ruby interpreter to use by default.
 
 Default value: `$apache::params::passenger_default_ruby`
 
-##### <a name="-apache--mod--passenger--passenger_default_user"></a>`passenger_default_user`
+##### <a name="passenger_default_user"></a>`passenger_default_user`
 
 Data type: `Optional[String]`
 
 Allows you to specify the user that applications must run as, if user switching fails or is disabled.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
+##### <a name="passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
 
 Data type: `Optional[Boolean]`
 
 Whether or not to disable the Passenger anonymous telemetry reporting.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
+##### <a name="passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
 
 Data type: `Optional[Boolean]`
 
 Whether to stop Passenger from prefixing logs when they are written to a log file.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
+##### <a name="passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
 security updates that might be available.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_enabled"></a>`passenger_enabled`
+##### <a name="passenger_enabled"></a>`passenger_enabled`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggles whether Passenger should be enabled for that particular context.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_error_override"></a>`passenger_error_override`
+##### <a name="passenger_error_override"></a>`passenger_error_override`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_file_descriptor_log_file"></a>`passenger_file_descriptor_log_file`
+##### <a name="passenger_file_descriptor_log_file"></a>`passenger_file_descriptor_log_file`
 
 Data type: `Optional[String]`
 
 Log file descriptor debug tracing messages to the given file.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_fly_with"></a>`passenger_fly_with`
+##### <a name="passenger_fly_with"></a>`passenger_fly_with`
 
 Data type: `Optional[String]`
 
 Enables the Flying Passenger mode, and configures Apache to connect to the Flying Passenger daemon that's listening on the
 given socket filename.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
+##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 Use this option to tell Passenger how many concurrent requests the application can handle per process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
+##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggles whether Passenger should display friendly error pages whenever an application fails to start.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_group"></a>`passenger_group`
+##### <a name="passenger_group"></a>`passenger_group`
 
 Data type: `Optional[String]`
 
 Allows you to override that behavior and explicitly set a group to run the web application as, regardless of the ownership of the
 startup file.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_high_performance"></a>`passenger_high_performance`
+##### <a name="passenger_high_performance"></a>`passenger_high_performance`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggles whether to enable PassengerHighPerformance which will make Passenger will be a little faster, in return for reduced
 compatibility with other Apache modules.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_installed_version"></a>`passenger_installed_version`
+##### <a name="passenger_installed_version"></a>`passenger_installed_version`
 
 Data type: `Optional[String]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_instance_registry_dir"></a>`passenger_instance_registry_dir`
+##### <a name="passenger_instance_registry_dir"></a>`passenger_instance_registry_dir`
 
 Data type: `Optional[String]`
 
 Specifies the directory that Passenger should use for registering its current instance.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
+##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Enables or disables the loading of shell environment variables before spawning the application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_preload_bundler"></a>`passenger_preload_bundler`
+##### <a name="passenger_preload_bundler"></a>`passenger_preload_bundler`
 
 Data type: `Optional[Boolean]`
 
 Enables or disables loading bundler before loading your Ruby app.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_log_file"></a>`passenger_log_file`
+##### <a name="passenger_log_file"></a>`passenger_log_file`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 File path to log file. By default Passenger log messages are written to the Apache global error log.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_log_level"></a>`passenger_log_level`
+##### <a name="passenger_log_level"></a>`passenger_log_level`
 
 Data type: `Optional[Integer]`
 
 Specifies how much information Passenger should log to its log file. A higher log level value means that more
 information will be logged.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_lve_min_uid"></a>`passenger_lve_min_uid`
+##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
 When using Passenger on a LVE-enabled kernel, a security check (enter) is run for spawning application processes. This options
 tells the check to only allow processes with UIDs equal to, or higher than, the specified value.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_max_instances"></a>`passenger_max_instances`
+##### <a name="passenger_max_instances"></a>`passenger_max_instances`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist for an application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_max_instances_per_app"></a>`passenger_max_instances_per_app`
+##### <a name="passenger_max_instances_per_app"></a>`passenger_max_instances_per_app`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist for a single application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_max_pool_size"></a>`passenger_max_pool_size`
+##### <a name="passenger_max_pool_size"></a>`passenger_max_pool_size`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
+##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
 Data type: `Optional[Integer]`
 
 Set the preloader's idle timeout, in seconds. A value of 0 means that it should never idle timeout.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
+##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
 Data type: `Optional[Integer]`
 
 Specifies the maximum size for the queue of all incoming requests.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_max_request_time"></a>`passenger_max_request_time`
+##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
 
 Data type: `Optional[Integer]`
 
 The maximum amount of time, in seconds, that an application process may take to process a request.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_max_requests"></a>`passenger_max_requests`
+##### <a name="passenger_max_requests"></a>`passenger_max_requests`
 
 Data type: `Optional[Integer]`
 
 The maximum number of requests an application process will process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_memory_limit"></a>`passenger_memory_limit`
+##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Optional[Integer]`
 
 The maximum amount of memory that an application process may use, in megabytes.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
+##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
 Data type: `Optional[String]`
 
 When using a Meteor application in non-bundled mode, use this option to specify a JSON file with settings for the application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_min_instances"></a>`passenger_min_instances`
+##### <a name="passenger_min_instances"></a>`passenger_min_instances`
 
 Data type: `Optional[Integer]`
 
 Specifies the minimum number of application processes that should exist for a given application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_nodejs"></a>`passenger_nodejs`
+##### <a name="passenger_nodejs"></a>`passenger_nodejs`
 
 Data type: `Optional[String]`
 
 Specifies the Node.js command to use for serving Node.js web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_pool_idle_time"></a>`passenger_pool_idle_time`
+##### <a name="passenger_pool_idle_time"></a>`passenger_pool_idle_time`
 
 Data type: `Optional[Integer]`
 
 The maximum number of seconds that an application process may be idle.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_pre_start"></a>`passenger_pre_start`
+##### <a name="passenger_pre_start"></a>`passenger_pre_start`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
 URL of the web application you want to pre-start.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_python"></a>`passenger_python`
+##### <a name="passenger_python"></a>`passenger_python`
 
 Data type: `Optional[String]`
 
 Specifies the Python interpreter to use for serving Python web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
+##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Enables or disables resistance against deployment errors.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_resolve_symlinks_in_document_root"></a>`passenger_resolve_symlinks_in_document_root`
+##### <a name="passenger_resolve_symlinks_in_document_root"></a>`passenger_resolve_symlinks_in_document_root`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 This option is no longer available in version 5.2.0. Switch to PassengerAppRoot if you are setting the application root via a
 document root containing symlinks.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_response_buffer_high_watermark"></a>`passenger_response_buffer_high_watermark`
+##### <a name="passenger_response_buffer_high_watermark"></a>`passenger_response_buffer_high_watermark`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 Configures the maximum size of the real-time disk-backed response buffering system.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_restart_dir"></a>`passenger_restart_dir`
+##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
 
 Data type: `Optional[String]`
 
 Path to directory containing restart.txt file. Can be either absolute or relative.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_rolling_restarts"></a>`passenger_rolling_restarts`
+##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Enables or disables support for zero-downtime application restarts through restart.txt.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_root"></a>`passenger_root`
+##### <a name="passenger_root"></a>`passenger_root`
 
 Data type: `Optional[String]`
 
@@ -5047,7 +5045,7 @@ Refers to the location to the Passenger root directory, or to a location configu
 
 Default value: `$apache::params::passenger_root`
 
-##### <a name="-apache--mod--passenger--passenger_ruby"></a>`passenger_ruby`
+##### <a name="passenger_ruby"></a>`passenger_ruby`
 
 Data type: `Optional[String]`
 
@@ -5055,257 +5053,257 @@ Specifies the Ruby interpreter to use for serving Ruby web applications.
 
 Default value: `$apache::params::passenger_ruby`
 
-##### <a name="-apache--mod--passenger--passenger_security_update_check_proxy"></a>`passenger_security_update_check_proxy`
+##### <a name="passenger_security_update_check_proxy"></a>`passenger_security_update_check_proxy`
 
 Data type: `Optional[String]`
 
 Allows use of an intermediate proxy for the Passenger security update check.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_show_version_in_header"></a>`passenger_show_version_in_header`
+##### <a name="passenger_show_version_in_header"></a>`passenger_show_version_in_header`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggle whether Passenger will output its version number in the X-Powered-By header in all Passenger-served requests:
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_socket_backlog"></a>`passenger_socket_backlog`
+##### <a name="passenger_socket_backlog"></a>`passenger_socket_backlog`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 This option can be raised if Apache manages to overflow the backlog queue.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_spawn_dir"></a>`passenger_spawn_dir`
+##### <a name="passenger_spawn_dir"></a>`passenger_spawn_dir`
 
 Data type: `Optional[String]`
 
 The directory in which Passenger will record progress during startup
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_spawn_method"></a>`passenger_spawn_method`
+##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']]`
 
 Controls whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_start_timeout"></a>`passenger_start_timeout`
+##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
 
 Data type: `Optional[Integer]`
 
 Specifies a timeout for the startup of application processes.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_startup_file"></a>`passenger_startup_file`
+##### <a name="passenger_startup_file"></a>`passenger_startup_file`
 
 Data type: `Optional[String]`
 
 Specifies the startup file that Passenger should use when loading the application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
+##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
 Data type: `Optional[Integer]`
 
 Setting this option to a value of x means that certain filesystem checks will be performed at most once every x seconds.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_sticky_sessions"></a>`passenger_sticky_sessions`
+##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggles whether all requests that a client sends will be routed to the same originating application process, whenever possible.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
+##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the sticky sessions cookie.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
+##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
 Sets the attributes of the sticky sessions cookie.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_thread_count"></a>`passenger_thread_count`
+##### <a name="passenger_thread_count"></a>`passenger_thread_count`
 
 Data type: `Optional[Integer]`
 
 Specifies the number of threads that Passenger should spawn per Ruby application process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_use_global_queue"></a>`passenger_use_global_queue`
+##### <a name="passenger_use_global_queue"></a>`passenger_use_global_queue`
 
 Data type: `Optional[String]`
 
 N/A.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_user"></a>`passenger_user`
+##### <a name="passenger_user"></a>`passenger_user`
 
 Data type: `Optional[String]`
 
 Allows you to override that behavior and explicitly set a user to run the web application as, regardless of the ownership of the
 startup file.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--passenger_user_switching"></a>`passenger_user_switching`
+##### <a name="passenger_user_switching"></a>`passenger_user_switching`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Toggles whether to attempt to enable user account sandboxing, also known as user switching.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rack_auto_detect"></a>`rack_auto_detect`
+##### <a name="rack_auto_detect"></a>`rack_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rack_autodetect"></a>`rack_autodetect`
+##### <a name="rack_autodetect"></a>`rack_autodetect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rack_base_uri"></a>`rack_base_uri`
+##### <a name="rack_base_uri"></a>`rack_base_uri`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rack_env"></a>`rack_env`
+##### <a name="rack_env"></a>`rack_env`
 
 Data type: `Optional[String]`
 
 Alias for PassengerAppEnv.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
+##### <a name="rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
 
 Data type: `Optional[String]`
 
 This option doesn't do anything anymore since version 4.0.0.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
+##### <a name="rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_auto_detect"></a>`rails_auto_detect`
+##### <a name="rails_auto_detect"></a>`rails_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_autodetect"></a>`rails_autodetect`
+##### <a name="rails_autodetect"></a>`rails_autodetect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_base_uri"></a>`rails_base_uri`
+##### <a name="rails_base_uri"></a>`rails_base_uri`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_default_user"></a>`rails_default_user`
+##### <a name="rails_default_user"></a>`rails_default_user`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerDefaultUser
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_env"></a>`rails_env`
+##### <a name="rails_env"></a>`rails_env`
 
 Data type: `Optional[String]`
 
 Alias for PassengerAppEnv.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_framework_spawner_idle_time"></a>`rails_framework_spawner_idle_time`
+##### <a name="rails_framework_spawner_idle_time"></a>`rails_framework_spawner_idle_time`
 
 Data type: `Optional[String]`
 
 This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed
 altogether. You should use smart spawning instead.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_ruby"></a>`rails_ruby`
+##### <a name="rails_ruby"></a>`rails_ruby`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerRuby.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_spawn_method"></a>`rails_spawn_method`
+##### <a name="rails_spawn_method"></a>`rails_spawn_method`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--rails_user_switching"></a>`rails_user_switching`
+##### <a name="rails_user_switching"></a>`rails_user_switching`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerUserSwitching.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--passenger--wsgi_auto_detect"></a>`wsgi_auto_detect`
+##### <a name="wsgi_auto_detect"></a>`wsgi_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--perl"></a>`apache::mod::perl`
+### <a name="apachemodperl"></a>`apache::mod::perl`
 
 Installs `mod_perl`.
 
@@ -5313,7 +5311,7 @@ Installs `mod_perl`.
   * https://perl.apache.org
     * for additional documentation.
 
-### <a name="apache--mod--peruser"></a>`apache::mod::peruser`
+### <a name="apachemodperuser"></a>`apache::mod::peruser`
 
 Installs `mod_peruser`.
 
@@ -5321,16 +5319,16 @@ Installs `mod_peruser`.
 
 The following parameters are available in the `apache::mod::peruser` class:
 
-* [`minspareprocessors`](#-apache--mod--peruser--minspareprocessors)
-* [`minprocessors`](#-apache--mod--peruser--minprocessors)
-* [`maxprocessors`](#-apache--mod--peruser--maxprocessors)
-* [`maxclients`](#-apache--mod--peruser--maxclients)
-* [`maxrequestsperchild`](#-apache--mod--peruser--maxrequestsperchild)
-* [`idletimeout`](#-apache--mod--peruser--idletimeout)
-* [`expiretimeout`](#-apache--mod--peruser--expiretimeout)
-* [`keepalive`](#-apache--mod--peruser--keepalive)
+* [`minspareprocessors`](#minspareprocessors)
+* [`minprocessors`](#minprocessors)
+* [`maxprocessors`](#maxprocessors)
+* [`maxclients`](#maxclients)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`idletimeout`](#idletimeout)
+* [`expiretimeout`](#expiretimeout)
+* [`keepalive`](#keepalive)
 
-##### <a name="-apache--mod--peruser--minspareprocessors"></a>`minspareprocessors`
+##### <a name="minspareprocessors"></a>`minspareprocessors`
 
 Data type: `Integer`
 
@@ -5338,7 +5336,7 @@ Data type: `Integer`
 
 Default value: `2`
 
-##### <a name="-apache--mod--peruser--minprocessors"></a>`minprocessors`
+##### <a name="minprocessors"></a>`minprocessors`
 
 Data type: `Integer`
 
@@ -5346,7 +5344,7 @@ The minimum amount of processors
 
 Default value: `2`
 
-##### <a name="-apache--mod--peruser--maxprocessors"></a>`maxprocessors`
+##### <a name="maxprocessors"></a>`maxprocessors`
 
 Data type: `Integer`
 
@@ -5354,7 +5352,7 @@ The maximum amount of processors
 
 Default value: `10`
 
-##### <a name="-apache--mod--peruser--maxclients"></a>`maxclients`
+##### <a name="maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -5362,7 +5360,7 @@ The maximum amount of clients
 
 Default value: `150`
 
-##### <a name="-apache--mod--peruser--maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -5370,7 +5368,7 @@ The maximum amount of requests per child
 
 Default value: `1000`
 
-##### <a name="-apache--mod--peruser--idletimeout"></a>`idletimeout`
+##### <a name="idletimeout"></a>`idletimeout`
 
 Data type: `Integer`
 
@@ -5378,7 +5376,7 @@ Data type: `Integer`
 
 Default value: `120`
 
-##### <a name="-apache--mod--peruser--expiretimeout"></a>`expiretimeout`
+##### <a name="expiretimeout"></a>`expiretimeout`
 
 Data type: `Integer`
 
@@ -5386,15 +5384,15 @@ Data type: `Integer`
 
 Default value: `120`
 
-##### <a name="-apache--mod--peruser--keepalive"></a>`keepalive`
+##### <a name="keepalive"></a>`keepalive`
 
-Data type: `Enum['On', 'Off']`
+Data type: `Apache::OnOff`
 
 
 
 Default value: `'Off'`
 
-### <a name="apache--mod--php"></a>`apache::mod::php`
+### <a name="apachemodphp"></a>`apache::mod::php`
 
 Installs `mod_php`.
 
@@ -5404,26 +5402,26 @@ Installs `mod_php`.
 
 The following parameters are available in the `apache::mod::php` class:
 
-* [`package_name`](#-apache--mod--php--package_name)
-* [`package_ensure`](#-apache--mod--php--package_ensure)
-* [`path`](#-apache--mod--php--path)
-* [`extensions`](#-apache--mod--php--extensions)
-* [`content`](#-apache--mod--php--content)
-* [`template`](#-apache--mod--php--template)
-* [`source`](#-apache--mod--php--source)
-* [`root_group`](#-apache--mod--php--root_group)
-* [`php_version`](#-apache--mod--php--php_version)
-* [`libphp_prefix`](#-apache--mod--php--libphp_prefix)
+* [`package_name`](#package_name)
+* [`package_ensure`](#package_ensure)
+* [`path`](#path)
+* [`extensions`](#extensions)
+* [`content`](#content)
+* [`template`](#template)
+* [`source`](#source)
+* [`root_group`](#root_group)
+* [`php_version`](#php_version)
+* [`libphp_prefix`](#libphp_prefix)
 
-##### <a name="-apache--mod--php--package_name"></a>`package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 The package name
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--php--package_ensure"></a>`package_ensure`
+##### <a name="package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -5431,15 +5429,15 @@ Whether the package is `present` or `absent`
 
 Default value: `'present'`
 
-##### <a name="-apache--mod--php--path"></a>`path`
+##### <a name="path"></a>`path`
 
 Data type: `Optional[String]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--php--extensions"></a>`extensions`
+##### <a name="extensions"></a>`extensions`
 
 Data type: `Array`
 
@@ -5447,15 +5445,15 @@ Data type: `Array`
 
 Default value: `['.php']`
 
-##### <a name="-apache--mod--php--content"></a>`content`
+##### <a name="content"></a>`content`
 
 Data type: `Optional[String]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--php--template"></a>`template`
+##### <a name="template"></a>`template`
 
 Data type: `String`
 
@@ -5463,15 +5461,15 @@ Data type: `String`
 
 Default value: `'apache/mod/php.conf.erb'`
 
-##### <a name="-apache--mod--php--source"></a>`source`
+##### <a name="source"></a>`source`
 
 Data type: `Optional[String]`
 
 
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--php--root_group"></a>`root_group`
+##### <a name="root_group"></a>`root_group`
 
 Data type: `Optional[String]`
 
@@ -5479,7 +5477,7 @@ UNIX group of the root user
 
 Default value: `$apache::params::root_group`
 
-##### <a name="-apache--mod--php--php_version"></a>`php_version`
+##### <a name="php_version"></a>`php_version`
 
 Data type: `Optional[String]`
 
@@ -5487,7 +5485,7 @@ The php version. This is a required parameter, but optional allows showing a cle
 
 Default value: `$apache::params::php_version`
 
-##### <a name="-apache--mod--php--libphp_prefix"></a>`libphp_prefix`
+##### <a name="libphp_prefix"></a>`libphp_prefix`
 
 Data type: `String`
 
@@ -5495,7 +5493,7 @@ Data type: `String`
 
 Default value: `'libphp'`
 
-### <a name="apache--mod--prefork"></a>`apache::mod::prefork`
+### <a name="apachemodprefork"></a>`apache::mod::prefork`
 
 Installs and configures MPM `prefork`.
 
@@ -5507,17 +5505,17 @@ Installs and configures MPM `prefork`.
 
 The following parameters are available in the `apache::mod::prefork` class:
 
-* [`startservers`](#-apache--mod--prefork--startservers)
-* [`minspareservers`](#-apache--mod--prefork--minspareservers)
-* [`maxspareservers`](#-apache--mod--prefork--maxspareservers)
-* [`serverlimit`](#-apache--mod--prefork--serverlimit)
-* [`maxclients`](#-apache--mod--prefork--maxclients)
-* [`maxrequestworkers`](#-apache--mod--prefork--maxrequestworkers)
-* [`maxrequestsperchild`](#-apache--mod--prefork--maxrequestsperchild)
-* [`maxconnectionsperchild`](#-apache--mod--prefork--maxconnectionsperchild)
-* [`listenbacklog`](#-apache--mod--prefork--listenbacklog)
+* [`startservers`](#startservers)
+* [`minspareservers`](#minspareservers)
+* [`maxspareservers`](#maxspareservers)
+* [`serverlimit`](#serverlimit)
+* [`maxclients`](#maxclients)
+* [`maxrequestworkers`](#maxrequestworkers)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`maxconnectionsperchild`](#maxconnectionsperchild)
+* [`listenbacklog`](#listenbacklog)
 
-##### <a name="-apache--mod--prefork--startservers"></a>`startservers`
+##### <a name="startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -5525,7 +5523,7 @@ Number of child server processes created at startup.
 
 Default value: `8`
 
-##### <a name="-apache--mod--prefork--minspareservers"></a>`minspareservers`
+##### <a name="minspareservers"></a>`minspareservers`
 
 Data type: `Integer`
 
@@ -5533,7 +5531,7 @@ Minimum number of idle child server processes.
 
 Default value: `5`
 
-##### <a name="-apache--mod--prefork--maxspareservers"></a>`maxspareservers`
+##### <a name="maxspareservers"></a>`maxspareservers`
 
 Data type: `Integer`
 
@@ -5541,7 +5539,7 @@ Maximum number of idle child server processes.
 
 Default value: `20`
 
-##### <a name="-apache--mod--prefork--serverlimit"></a>`serverlimit`
+##### <a name="serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -5549,7 +5547,7 @@ Upper limit on configurable number of processes.
 
 Default value: `256`
 
-##### <a name="-apache--mod--prefork--maxclients"></a>`maxclients`
+##### <a name="maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -5557,15 +5555,15 @@ Old alias for MaxRequestWorkers.
 
 Default value: `256`
 
-##### <a name="-apache--mod--prefork--maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Optional[Integer]`
 
 Maximum number of connections that will be processed simultaneously.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--prefork--maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -5573,15 +5571,15 @@ Old alias for MaxConnectionsPerChild.
 
 Default value: `4000`
 
-##### <a name="-apache--mod--prefork--maxconnectionsperchild"></a>`maxconnectionsperchild`
+##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Optional[Integer]`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--prefork--listenbacklog"></a>`listenbacklog`
+##### <a name="listenbacklog"></a>`listenbacklog`
 
 Data type: `Integer`
 
@@ -5589,7 +5587,7 @@ Maximum length of the queue of pending connections.
 
 Default value: `511`
 
-### <a name="apache--mod--proxy"></a>`apache::mod::proxy`
+### <a name="apachemodproxy"></a>`apache::mod::proxy`
 
 Installs and configures `mod_proxy`.
 
@@ -5601,14 +5599,14 @@ Installs and configures `mod_proxy`.
 
 The following parameters are available in the `apache::mod::proxy` class:
 
-* [`proxy_requests`](#-apache--mod--proxy--proxy_requests)
-* [`allow_from`](#-apache--mod--proxy--allow_from)
-* [`package_name`](#-apache--mod--proxy--package_name)
-* [`proxy_via`](#-apache--mod--proxy--proxy_via)
-* [`proxy_timeout`](#-apache--mod--proxy--proxy_timeout)
-* [`proxy_iobuffersize`](#-apache--mod--proxy--proxy_iobuffersize)
+* [`proxy_requests`](#proxy_requests)
+* [`allow_from`](#allow_from)
+* [`package_name`](#package_name)
+* [`proxy_via`](#proxy_via)
+* [`proxy_timeout`](#proxy_timeout)
+* [`proxy_iobuffersize`](#proxy_iobuffersize)
 
-##### <a name="-apache--mod--proxy--proxy_requests"></a>`proxy_requests`
+##### <a name="proxy_requests"></a>`proxy_requests`
 
 Data type: `String`
 
@@ -5616,23 +5614,23 @@ Enables forward (standard) proxy requests.
 
 Default value: `'Off'`
 
-##### <a name="-apache--mod--proxy--allow_from"></a>`allow_from`
+##### <a name="allow_from"></a>`allow_from`
 
 Data type: `Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]]`
 
 IP address or list of IPs allowed to access proxy.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--proxy--package_name"></a>`package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of the proxy package to install.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--proxy--proxy_via"></a>`proxy_via`
+##### <a name="proxy_via"></a>`proxy_via`
 
 Data type: `String`
 
@@ -5640,23 +5638,23 @@ Set local IP address for outgoing proxy connections.
 
 Default value: `'On'`
 
-##### <a name="-apache--mod--proxy--proxy_timeout"></a>`proxy_timeout`
+##### <a name="proxy_timeout"></a>`proxy_timeout`
 
 Data type: `Optional[Integer[0]]`
 
 Network timeout for proxied requests.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--proxy--proxy_iobuffersize"></a>`proxy_iobuffersize`
+##### <a name="proxy_iobuffersize"></a>`proxy_iobuffersize`
 
 Data type: `Optional[String]`
 
 Set the size of internal data throughput buffer
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--proxy_ajp"></a>`apache::mod::proxy_ajp`
+### <a name="apachemodproxy_ajp"></a>`apache::mod::proxy_ajp`
 
 Installs `mod_proxy_ajp`.
 
@@ -5664,7 +5662,7 @@ Installs `mod_proxy_ajp`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html
     * for additional documentation.
 
-### <a name="apache--mod--proxy_balancer"></a>`apache::mod::proxy_balancer`
+### <a name="apachemodproxy_balancer"></a>`apache::mod::proxy_balancer`
 
 Installs and configures `mod_proxy_balancer`.
 
@@ -5676,19 +5674,19 @@ Installs and configures `mod_proxy_balancer`.
 
 The following parameters are available in the `apache::mod::proxy_balancer` class:
 
-* [`manager`](#-apache--mod--proxy_balancer--manager)
-* [`manager_path`](#-apache--mod--proxy_balancer--manager_path)
-* [`allow_from`](#-apache--mod--proxy_balancer--allow_from)
+* [`manager`](#manager)
+* [`manager_path`](#manager_path)
+* [`allow_from`](#allow_from)
 
-##### <a name="-apache--mod--proxy_balancer--manager"></a>`manager`
+##### <a name="manager"></a>`manager`
 
 Data type: `Boolean`
 
 Toggle whether to enable balancer manager support.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--proxy_balancer--manager_path"></a>`manager_path`
+##### <a name="manager_path"></a>`manager_path`
 
 Data type: `Stdlib::Unixpath`
 
@@ -5696,7 +5694,7 @@ Server relative path to balancer manager.
 
 Default value: `'/balancer-manager'`
 
-##### <a name="-apache--mod--proxy_balancer--allow_from"></a>`allow_from`
+##### <a name="allow_from"></a>`allow_from`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -5704,7 +5702,7 @@ List of IPs from which the balancer manager can be accessed.
 
 Default value: `['127.0.0.1', '::1']`
 
-### <a name="apache--mod--proxy_connect"></a>`apache::mod::proxy_connect`
+### <a name="apachemodproxy_connect"></a>`apache::mod::proxy_connect`
 
 Installs `mod_proxy_connect`.
 
@@ -5712,7 +5710,7 @@ Installs `mod_proxy_connect`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html
     * for additional documentation.
 
-### <a name="apache--mod--proxy_fcgi"></a>`apache::mod::proxy_fcgi`
+### <a name="apachemodproxy_fcgi"></a>`apache::mod::proxy_fcgi`
 
 Installs `mod_proxy_fcgi`.
 
@@ -5720,7 +5718,7 @@ Installs `mod_proxy_fcgi`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html
     * for additional documentation.
 
-### <a name="apache--mod--proxy_html"></a>`apache::mod::proxy_html`
+### <a name="apachemodproxy_html"></a>`apache::mod::proxy_html`
 
 Installs `mod_proxy_html`.
 
@@ -5728,7 +5726,7 @@ Installs `mod_proxy_html`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_html.html
     * for additional documentation.
 
-### <a name="apache--mod--proxy_http"></a>`apache::mod::proxy_http`
+### <a name="apachemodproxy_http"></a>`apache::mod::proxy_http`
 
 Installs `mod_proxy_http`.
 
@@ -5736,7 +5734,15 @@ Installs `mod_proxy_http`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_http.html
     * for additional documentation.
 
-### <a name="apache--mod--proxy_wstunnel"></a>`apache::mod::proxy_wstunnel`
+### <a name="apachemodproxy_http2"></a>`apache::mod::proxy_http2`
+
+Installs `mod_proxy_http2`.
+
+* **See also**
+  * https://httpd.apache.org/docs/current/mod/mod_proxy_http2.html
+    * for additional documentation.
+
+### <a name="apachemodproxy_wstunnel"></a>`apache::mod::proxy_wstunnel`
 
 Installs `mod_proxy_wstunnel`.
 
@@ -5744,7 +5750,7 @@ Installs `mod_proxy_wstunnel`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html
     * for additional documentation.
 
-### <a name="apache--mod--python"></a>`apache::mod::python`
+### <a name="apachemodpython"></a>`apache::mod::python`
 
 Installs and configures `mod_python`.
 
@@ -5756,17 +5762,17 @@ Installs and configures `mod_python`.
 
 The following parameters are available in the `apache::mod::python` class:
 
-* [`loadfile_name`](#-apache--mod--python--loadfile_name)
+* [`loadfile_name`](#loadfile_name)
 
-##### <a name="-apache--mod--python--loadfile_name"></a>`loadfile_name`
+##### <a name="loadfile_name"></a>`loadfile_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the configuration file that is used to load the python module.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--remoteip"></a>`apache::mod::remoteip`
+### <a name="apachemodremoteip"></a>`apache::mod::remoteip`
 
 Installs and configures `mod_remoteip`.
 
@@ -5779,18 +5785,18 @@ Installs and configures `mod_remoteip`.
 
 The following parameters are available in the `apache::mod::remoteip` class:
 
-* [`header`](#-apache--mod--remoteip--header)
-* [`internal_proxy`](#-apache--mod--remoteip--internal_proxy)
-* [`proxy_ips`](#-apache--mod--remoteip--proxy_ips)
-* [`internal_proxy_list`](#-apache--mod--remoteip--internal_proxy_list)
-* [`proxies_header`](#-apache--mod--remoteip--proxies_header)
-* [`proxy_protocol`](#-apache--mod--remoteip--proxy_protocol)
-* [`proxy_protocol_exceptions`](#-apache--mod--remoteip--proxy_protocol_exceptions)
-* [`trusted_proxy`](#-apache--mod--remoteip--trusted_proxy)
-* [`trusted_proxy_ips`](#-apache--mod--remoteip--trusted_proxy_ips)
-* [`trusted_proxy_list`](#-apache--mod--remoteip--trusted_proxy_list)
+* [`header`](#header)
+* [`internal_proxy`](#internal_proxy)
+* [`proxy_ips`](#proxy_ips)
+* [`internal_proxy_list`](#internal_proxy_list)
+* [`proxies_header`](#proxies_header)
+* [`proxy_protocol`](#proxy_protocol)
+* [`proxy_protocol_exceptions`](#proxy_protocol_exceptions)
+* [`trusted_proxy`](#trusted_proxy)
+* [`trusted_proxy_ips`](#trusted_proxy_ips)
+* [`trusted_proxy_list`](#trusted_proxy_list)
 
-##### <a name="-apache--mod--remoteip--header"></a>`header`
+##### <a name="header"></a>`header`
 
 Data type: `String`
 
@@ -5798,26 +5804,26 @@ The header field in which `mod_remoteip` will look for the useragent IP.
 
 Default value: `'X-Forwarded-For'`
 
-##### <a name="-apache--mod--remoteip--internal_proxy"></a>`internal_proxy`
+##### <a name="internal_proxy"></a>`internal_proxy`
 
-Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
+Data type: `Optional[Array[Stdlib::Host]]`
 
 A list of IP addresses, IP blocks or hostname that are trusted to set a
 valid value inside specified header. Unlike the `$trusted_proxy_ips`
 parameter, any IP address (including private addresses) presented by these
 proxies will trusted by `mod_remoteip`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--remoteip--proxy_ips"></a>`proxy_ips`
+##### <a name="proxy_ips"></a>`proxy_ips`
 
-Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
+Data type: `Optional[Array[Stdlib::Host]]`
 
 *Deprecated*: use `$internal_proxy` instead.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--remoteip--internal_proxy_list"></a>`internal_proxy_list`
+##### <a name="internal_proxy_list"></a>`internal_proxy_list`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -5825,9 +5831,9 @@ The path to a file containing a list of IP addresses, IP blocks or hostname
 that are trusted to set a valid value inside the specified header. See
 `$internal_proxy` for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--remoteip--proxies_header"></a>`proxies_header`
+##### <a name="proxies_header"></a>`proxies_header`
 
 Data type: `Optional[String]`
 
@@ -5835,27 +5841,27 @@ A header into which `mod_remoteip` will collect a list of all of the
 intermediate client IP addresses trusted to resolve the useragent IP of the
 request (e.g. `X-Forwarded-By`).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--remoteip--proxy_protocol"></a>`proxy_protocol`
+##### <a name="proxy_protocol"></a>`proxy_protocol`
 
 Data type: `Boolean`
 
 Wether or not to enable the PROXY protocol header handling. If enabled
 upstream clients must set the header every time they open a connection.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--remoteip--proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
+##### <a name="proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
 
-Data type: `Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]]`
+Data type: `Optional[Array[Stdlib::Host]]`
 
 A list of IP address or IP blocks that are not required to use the PROXY
 protocol.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--remoteip--trusted_proxy"></a>`trusted_proxy`
+##### <a name="trusted_proxy"></a>`trusted_proxy`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
@@ -5864,17 +5870,17 @@ valid value inside the specified header. Unlike the `$proxy_ips` parameter,
 any private IP presented by these proxies will be disgarded by
 `mod_remoteip`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--remoteip--trusted_proxy_ips"></a>`trusted_proxy_ips`
+##### <a name="trusted_proxy_ips"></a>`trusted_proxy_ips`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
 *Deprecated*: use `$trusted_proxy` instead.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--remoteip--trusted_proxy_list"></a>`trusted_proxy_list`
+##### <a name="trusted_proxy_list"></a>`trusted_proxy_list`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -5882,9 +5888,9 @@ The path to a file containing a list of IP addresses, IP blocks or hostname
 that are trusted to set a valid value inside the specified header. See
 `$trusted_proxy` for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--reqtimeout"></a>`apache::mod::reqtimeout`
+### <a name="apachemodreqtimeout"></a>`apache::mod::reqtimeout`
 
 Installs and configures `mod_reqtimeout`.
 
@@ -5896,9 +5902,9 @@ Installs and configures `mod_reqtimeout`.
 
 The following parameters are available in the `apache::mod::reqtimeout` class:
 
-* [`timeouts`](#-apache--mod--reqtimeout--timeouts)
+* [`timeouts`](#timeouts)
 
-##### <a name="-apache--mod--reqtimeout--timeouts"></a>`timeouts`
+##### <a name="timeouts"></a>`timeouts`
 
 Data type: `Variant[Array[String], String]`
 
@@ -5906,7 +5912,7 @@ List of timeouts and data rates for receiving requests.
 
 Default value: `['header=20-40,minrate=500', 'body=10,minrate=500']`
 
-### <a name="apache--mod--rewrite"></a>`apache::mod::rewrite`
+### <a name="apachemodrewrite"></a>`apache::mod::rewrite`
 
 Installs `mod_rewrite`.
 
@@ -5914,7 +5920,7 @@ Installs `mod_rewrite`.
   * https://httpd.apache.org/docs/current/mod/mod_rewrite.html
     * for additional documentation.
 
-### <a name="apache--mod--rpaf"></a>`apache::mod::rpaf`
+### <a name="apachemodrpaf"></a>`apache::mod::rpaf`
 
 Installs and configures `mod_rpaf`.
 
@@ -5926,20 +5932,20 @@ Installs and configures `mod_rpaf`.
 
 The following parameters are available in the `apache::mod::rpaf` class:
 
-* [`sethostname`](#-apache--mod--rpaf--sethostname)
-* [`proxy_ips`](#-apache--mod--rpaf--proxy_ips)
-* [`header`](#-apache--mod--rpaf--header)
-* [`template`](#-apache--mod--rpaf--template)
+* [`sethostname`](#sethostname)
+* [`proxy_ips`](#proxy_ips)
+* [`header`](#header)
+* [`template`](#template)
 
-##### <a name="-apache--mod--rpaf--sethostname"></a>`sethostname`
+##### <a name="sethostname"></a>`sethostname`
 
 Data type: `Variant[Boolean, String]`
 
 Toggles whether to update vhost name so ServerName and ServerAlias work.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--rpaf--proxy_ips"></a>`proxy_ips`
+##### <a name="proxy_ips"></a>`proxy_ips`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -5947,7 +5953,7 @@ List of IPs & bitmasked subnets to adjust requests for
 
 Default value: `['127.0.0.1']`
 
-##### <a name="-apache--mod--rpaf--header"></a>`header`
+##### <a name="header"></a>`header`
 
 Data type: `String`
 
@@ -5955,7 +5961,7 @@ Header to use for the real IP address.
 
 Default value: `'X-Forwarded-For'`
 
-##### <a name="-apache--mod--rpaf--template"></a>`template`
+##### <a name="template"></a>`template`
 
 Data type: `String`
 
@@ -5963,7 +5969,7 @@ Path to template to use for configuring mod_rpaf.
 
 Default value: `'apache/mod/rpaf.conf.erb'`
 
-### <a name="apache--mod--security"></a>`apache::mod::security`
+### <a name="apachemodsecurity"></a>`apache::mod::security`
 
 Installs and configures `mod_security`.
 
@@ -5977,48 +5983,48 @@ Installs and configures `mod_security`.
 
 The following parameters are available in the `apache::mod::security` class:
 
-* [`version`](#-apache--mod--security--version)
-* [`logroot`](#-apache--mod--security--logroot)
-* [`crs_package`](#-apache--mod--security--crs_package)
-* [`activated_rules`](#-apache--mod--security--activated_rules)
-* [`custom_rules`](#-apache--mod--security--custom_rules)
-* [`custom_rules_set`](#-apache--mod--security--custom_rules_set)
-* [`modsec_dir`](#-apache--mod--security--modsec_dir)
-* [`modsec_secruleengine`](#-apache--mod--security--modsec_secruleengine)
-* [`audit_log_relevant_status`](#-apache--mod--security--audit_log_relevant_status)
-* [`audit_log_parts`](#-apache--mod--security--audit_log_parts)
-* [`audit_log_type`](#-apache--mod--security--audit_log_type)
-* [`audit_log_storage_dir`](#-apache--mod--security--audit_log_storage_dir)
-* [`secpcrematchlimit`](#-apache--mod--security--secpcrematchlimit)
-* [`secpcrematchlimitrecursion`](#-apache--mod--security--secpcrematchlimitrecursion)
-* [`allowed_methods`](#-apache--mod--security--allowed_methods)
-* [`content_types`](#-apache--mod--security--content_types)
-* [`restricted_extensions`](#-apache--mod--security--restricted_extensions)
-* [`restricted_headers`](#-apache--mod--security--restricted_headers)
-* [`secdefaultaction`](#-apache--mod--security--secdefaultaction)
-* [`inbound_anomaly_threshold`](#-apache--mod--security--inbound_anomaly_threshold)
-* [`outbound_anomaly_threshold`](#-apache--mod--security--outbound_anomaly_threshold)
-* [`critical_anomaly_score`](#-apache--mod--security--critical_anomaly_score)
-* [`error_anomaly_score`](#-apache--mod--security--error_anomaly_score)
-* [`warning_anomaly_score`](#-apache--mod--security--warning_anomaly_score)
-* [`notice_anomaly_score`](#-apache--mod--security--notice_anomaly_score)
-* [`paranoia_level`](#-apache--mod--security--paranoia_level)
-* [`executing_paranoia_level`](#-apache--mod--security--executing_paranoia_level)
-* [`secrequestmaxnumargs`](#-apache--mod--security--secrequestmaxnumargs)
-* [`secrequestbodylimit`](#-apache--mod--security--secrequestbodylimit)
-* [`secrequestbodynofileslimit`](#-apache--mod--security--secrequestbodynofileslimit)
-* [`secrequestbodyinmemorylimit`](#-apache--mod--security--secrequestbodyinmemorylimit)
-* [`secrequestbodyaccess`](#-apache--mod--security--secrequestbodyaccess)
-* [`secrequestbodylimitaction`](#-apache--mod--security--secrequestbodylimitaction)
-* [`secresponsebodyaccess`](#-apache--mod--security--secresponsebodyaccess)
-* [`secresponsebodylimitaction`](#-apache--mod--security--secresponsebodylimitaction)
-* [`manage_security_crs`](#-apache--mod--security--manage_security_crs)
-* [`enable_dos_protection`](#-apache--mod--security--enable_dos_protection)
-* [`dos_burst_time_slice`](#-apache--mod--security--dos_burst_time_slice)
-* [`dos_counter_threshold`](#-apache--mod--security--dos_counter_threshold)
-* [`dos_block_timeout`](#-apache--mod--security--dos_block_timeout)
-
-##### <a name="-apache--mod--security--version"></a>`version`
+* [`version`](#version)
+* [`logroot`](#logroot)
+* [`crs_package`](#crs_package)
+* [`activated_rules`](#activated_rules)
+* [`custom_rules`](#custom_rules)
+* [`custom_rules_set`](#custom_rules_set)
+* [`modsec_dir`](#modsec_dir)
+* [`modsec_secruleengine`](#modsec_secruleengine)
+* [`audit_log_relevant_status`](#audit_log_relevant_status)
+* [`audit_log_parts`](#audit_log_parts)
+* [`audit_log_type`](#audit_log_type)
+* [`audit_log_storage_dir`](#audit_log_storage_dir)
+* [`secpcrematchlimit`](#secpcrematchlimit)
+* [`secpcrematchlimitrecursion`](#secpcrematchlimitrecursion)
+* [`allowed_methods`](#allowed_methods)
+* [`content_types`](#content_types)
+* [`restricted_extensions`](#restricted_extensions)
+* [`restricted_headers`](#restricted_headers)
+* [`secdefaultaction`](#secdefaultaction)
+* [`inbound_anomaly_threshold`](#inbound_anomaly_threshold)
+* [`outbound_anomaly_threshold`](#outbound_anomaly_threshold)
+* [`critical_anomaly_score`](#critical_anomaly_score)
+* [`error_anomaly_score`](#error_anomaly_score)
+* [`warning_anomaly_score`](#warning_anomaly_score)
+* [`notice_anomaly_score`](#notice_anomaly_score)
+* [`paranoia_level`](#paranoia_level)
+* [`executing_paranoia_level`](#executing_paranoia_level)
+* [`secrequestmaxnumargs`](#secrequestmaxnumargs)
+* [`secrequestbodylimit`](#secrequestbodylimit)
+* [`secrequestbodynofileslimit`](#secrequestbodynofileslimit)
+* [`secrequestbodyinmemorylimit`](#secrequestbodyinmemorylimit)
+* [`secrequestbodyaccess`](#secrequestbodyaccess)
+* [`secrequestbodylimitaction`](#secrequestbodylimitaction)
+* [`secresponsebodyaccess`](#secresponsebodyaccess)
+* [`secresponsebodylimitaction`](#secresponsebodylimitaction)
+* [`manage_security_crs`](#manage_security_crs)
+* [`enable_dos_protection`](#enable_dos_protection)
+* [`dos_burst_time_slice`](#dos_burst_time_slice)
+* [`dos_counter_threshold`](#dos_counter_threshold)
+* [`dos_block_timeout`](#dos_block_timeout)
+
+##### <a name="version"></a>`version`
 
 Data type: `Integer`
 
@@ -6026,7 +6032,7 @@ Manage mod_security or mod_security2
 
 Default value: `$apache::params::modsec_version`
 
-##### <a name="-apache--mod--security--logroot"></a>`logroot`
+##### <a name="logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -6034,7 +6040,7 @@ Configures the location of audit and debug logs.
 
 Default value: `$apache::params::logroot`
 
-##### <a name="-apache--mod--security--crs_package"></a>`crs_package`
+##### <a name="crs_package"></a>`crs_package`
 
 Data type: `Optional[String]`
 
@@ -6042,7 +6048,7 @@ Name of package that installs CRS rules.
 
 Default value: `$apache::params::modsec_crs_package`
 
-##### <a name="-apache--mod--security--activated_rules"></a>`activated_rules`
+##### <a name="activated_rules"></a>`activated_rules`
 
 Data type: `Array[String]`
 
@@ -6050,7 +6056,7 @@ An array of rules from the modsec_crs_path or absolute to activate via symlinks.
 
 Default value: `$apache::params::modsec_default_rules`
 
-##### <a name="-apache--mod--security--custom_rules"></a>`custom_rules`
+##### <a name="custom_rules"></a>`custom_rules`
 
 Data type: `Boolean`
 
@@ -6058,7 +6064,7 @@ Data type: `Boolean`
 
 Default value: `$apache::params::modsec_custom_rules`
 
-##### <a name="-apache--mod--security--custom_rules_set"></a>`custom_rules_set`
+##### <a name="custom_rules_set"></a>`custom_rules_set`
 
 Data type: `Optional[Array[String]]`
 
@@ -6066,7 +6072,7 @@ Data type: `Optional[Array[String]]`
 
 Default value: `$apache::params::modsec_custom_rules_set`
 
-##### <a name="-apache--mod--security--modsec_dir"></a>`modsec_dir`
+##### <a name="modsec_dir"></a>`modsec_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -6074,7 +6080,7 @@ Defines the path where Puppet installs the modsec configuration and activated ru
 
 Default value: `$apache::params::modsec_dir`
 
-##### <a name="-apache--mod--security--modsec_secruleengine"></a>`modsec_secruleengine`
+##### <a name="modsec_secruleengine"></a>`modsec_secruleengine`
 
 Data type: `String`
 
@@ -6082,7 +6088,7 @@ Configures the rules engine.
 
 Default value: `$apache::params::modsec_secruleengine`
 
-##### <a name="-apache--mod--security--audit_log_relevant_status"></a>`audit_log_relevant_status`
+##### <a name="audit_log_relevant_status"></a>`audit_log_relevant_status`
 
 Data type: `String`
 
@@ -6090,7 +6096,7 @@ Configures which response status code is to be considered relevant for the purpo
 
 Default value: `'^(?:5|4(?!04))'`
 
-##### <a name="-apache--mod--security--audit_log_parts"></a>`audit_log_parts`
+##### <a name="audit_log_parts"></a>`audit_log_parts`
 
 Data type: `String`
 
@@ -6099,7 +6105,7 @@ letter appears in the list then the equivalent part will be recorded.
 
 Default value: `$apache::params::modsec_audit_log_parts`
 
-##### <a name="-apache--mod--security--audit_log_type"></a>`audit_log_type`
+##### <a name="audit_log_type"></a>`audit_log_type`
 
 Data type: `String`
 
@@ -6107,15 +6113,15 @@ Defines the type of audit logging mechanism to be used.
 
 Default value: `$apache::params::modsec_audit_log_type`
 
-##### <a name="-apache--mod--security--audit_log_storage_dir"></a>`audit_log_storage_dir`
+##### <a name="audit_log_storage_dir"></a>`audit_log_storage_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--security--secpcrematchlimit"></a>`secpcrematchlimit`
+##### <a name="secpcrematchlimit"></a>`secpcrematchlimit`
 
 Data type: `Integer`
 
@@ -6123,7 +6129,7 @@ Sets the match limit in the PCRE library.
 
 Default value: `$apache::params::secpcrematchlimit`
 
-##### <a name="-apache--mod--security--secpcrematchlimitrecursion"></a>`secpcrematchlimitrecursion`
+##### <a name="secpcrematchlimitrecursion"></a>`secpcrematchlimitrecursion`
 
 Data type: `Integer`
 
@@ -6131,7 +6137,7 @@ Sets the match limit recursion in the PCRE library.
 
 Default value: `$apache::params::secpcrematchlimitrecursion`
 
-##### <a name="-apache--mod--security--allowed_methods"></a>`allowed_methods`
+##### <a name="allowed_methods"></a>`allowed_methods`
 
 Data type: `String`
 
@@ -6139,7 +6145,7 @@ A space-separated list of allowed HTTP methods.
 
 Default value: `'GET HEAD POST OPTIONS'`
 
-##### <a name="-apache--mod--security--content_types"></a>`content_types`
+##### <a name="content_types"></a>`content_types`
 
 Data type: `String`
 
@@ -6147,7 +6153,7 @@ A list of one or more allowed MIME types.
 
 Default value: `'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'`
 
-##### <a name="-apache--mod--security--restricted_extensions"></a>`restricted_extensions`
+##### <a name="restricted_extensions"></a>`restricted_extensions`
 
 Data type: `String`
 
@@ -6155,7 +6161,7 @@ A space-sparated list of prohibited file extensions.
 
 Default value: `'.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'`
 
-##### <a name="-apache--mod--security--restricted_headers"></a>`restricted_headers`
+##### <a name="restricted_headers"></a>`restricted_headers`
 
 Data type: `String`
 
@@ -6163,7 +6169,7 @@ A list of restricted headers separated by slashes and spaces.
 
 Default value: `'/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'`
 
-##### <a name="-apache--mod--security--secdefaultaction"></a>`secdefaultaction`
+##### <a name="secdefaultaction"></a>`secdefaultaction`
 
 Data type: `String`
 
@@ -6171,7 +6177,7 @@ Defines the default list of actions, which will be inherited by the rules in the
 
 Default value: `'deny'`
 
-##### <a name="-apache--mod--security--inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
+##### <a name="inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
 
 Data type: `Integer`
 
@@ -6179,7 +6185,7 @@ Sets the scoring threshold level of the inbound blocking rules for the Collabora
 
 Default value: `5`
 
-##### <a name="-apache--mod--security--outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
+##### <a name="outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
 
 Data type: `Integer`
 
@@ -6187,7 +6193,7 @@ Sets the scoring threshold level of the outbound blocking rules for the Collabor
 
 Default value: `4`
 
-##### <a name="-apache--mod--security--critical_anomaly_score"></a>`critical_anomaly_score`
+##### <a name="critical_anomaly_score"></a>`critical_anomaly_score`
 
 Data type: `Integer`
 
@@ -6195,7 +6201,7 @@ Sets the Anomaly Score for rules assigned with a critical severity.
 
 Default value: `5`
 
-##### <a name="-apache--mod--security--error_anomaly_score"></a>`error_anomaly_score`
+##### <a name="error_anomaly_score"></a>`error_anomaly_score`
 
 Data type: `Integer`
 
@@ -6203,7 +6209,7 @@ Sets the Anomaly Score for rules assigned with a error severity.
 
 Default value: `4`
 
-##### <a name="-apache--mod--security--warning_anomaly_score"></a>`warning_anomaly_score`
+##### <a name="warning_anomaly_score"></a>`warning_anomaly_score`
 
 Data type: `Integer`
 
@@ -6211,7 +6217,7 @@ Sets the Anomaly Score for rules assigned with a warning severity.
 
 Default value: `3`
 
-##### <a name="-apache--mod--security--notice_anomaly_score"></a>`notice_anomaly_score`
+##### <a name="notice_anomaly_score"></a>`notice_anomaly_score`
 
 Data type: `Integer`
 
@@ -6219,7 +6225,7 @@ Sets the Anomaly Score for rules assigned with a notice severity.
 
 Default value: `2`
 
-##### <a name="-apache--mod--security--paranoia_level"></a>`paranoia_level`
+##### <a name="paranoia_level"></a>`paranoia_level`
 
 Data type: `Integer[1,4]`
 
@@ -6227,7 +6233,7 @@ Sets the paranoia level in the OWASP ModSecurity Core Rule Set.
 
 Default value: `1`
 
-##### <a name="-apache--mod--security--executing_paranoia_level"></a>`executing_paranoia_level`
+##### <a name="executing_paranoia_level"></a>`executing_paranoia_level`
 
 Data type: `Integer[1,4]`
 
@@ -6236,7 +6242,7 @@ The default is equal to, and cannot be lower than, $paranoia_level.
 
 Default value: `$paranoia_level`
 
-##### <a name="-apache--mod--security--secrequestmaxnumargs"></a>`secrequestmaxnumargs`
+##### <a name="secrequestmaxnumargs"></a>`secrequestmaxnumargs`
 
 Data type: `Integer`
 
@@ -6244,7 +6250,7 @@ Sets the maximum number of arguments in the request.
 
 Default value: `255`
 
-##### <a name="-apache--mod--security--secrequestbodylimit"></a>`secrequestbodylimit`
+##### <a name="secrequestbodylimit"></a>`secrequestbodylimit`
 
 Data type: `Integer`
 
@@ -6252,7 +6258,7 @@ Sets the maximum request body size ModSecurity will accept for buffering.
 
 Default value: `13107200`
 
-##### <a name="-apache--mod--security--secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
+##### <a name="secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
 
 Data type: `Integer`
 
@@ -6261,7 +6267,7 @@ in the request.
 
 Default value: `131072`
 
-##### <a name="-apache--mod--security--secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
+##### <a name="secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
 
 Data type: `Integer`
 
@@ -6269,15 +6275,15 @@ Configures the maximum request body size that ModSecurity will store in memory.
 
 Default value: `131072`
 
-##### <a name="-apache--mod--security--secrequestbodyaccess"></a>`secrequestbodyaccess`
+##### <a name="secrequestbodyaccess"></a>`secrequestbodyaccess`
 
-Data type: `Enum['On', 'Off']`
+Data type: `Apache::OnOff`
 
 Toggle SecRequestBodyAccess On or Off
 
 Default value: `'On'`
 
-##### <a name="-apache--mod--security--secrequestbodylimitaction"></a>`secrequestbodylimitaction`
+##### <a name="secrequestbodylimitaction"></a>`secrequestbodylimitaction`
 
 Data type: `Enum['Reject', 'ProcessPartial']`
 
@@ -6286,15 +6292,15 @@ SecRequestBodyLimit, is encountered
 
 Default value: `'Reject'`
 
-##### <a name="-apache--mod--security--secresponsebodyaccess"></a>`secresponsebodyaccess`
+##### <a name="secresponsebodyaccess"></a>`secresponsebodyaccess`
 
-Data type: `Enum['On', 'Off']`
+Data type: `Apache::OnOff`
 
 Toggle SecResponseBodyAccess On or Off
 
 Default value: `'Off'`
 
-##### <a name="-apache--mod--security--secresponsebodylimitaction"></a>`secresponsebodylimitaction`
+##### <a name="secresponsebodylimitaction"></a>`secresponsebodylimitaction`
 
 Data type: `Enum['Reject', 'ProcessPartial']`
 
@@ -6303,24 +6309,24 @@ SecResponseBodyLimitAction, is encountered.
 
 Default value: `'ProcessPartial'`
 
-##### <a name="-apache--mod--security--manage_security_crs"></a>`manage_security_crs`
+##### <a name="manage_security_crs"></a>`manage_security_crs`
 
 Data type: `Boolean`
 
 Toggles whether to manage ModSecurity Core Rule Set
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--security--enable_dos_protection"></a>`enable_dos_protection`
+##### <a name="enable_dos_protection"></a>`enable_dos_protection`
 
 Data type: `Boolean`
 
 Toggles the optional OWASP ModSecurity Core Rule Set DOS protection rule
 (rule id 900700)
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--security--dos_burst_time_slice"></a>`dos_burst_time_slice`
+##### <a name="dos_burst_time_slice"></a>`dos_burst_time_slice`
 
 Data type: `Integer[1, default]`
 
@@ -6329,7 +6335,7 @@ Configures time in which a burst is measured for the OWASP ModSecurity Core Rule
 
 Default value: `60`
 
-##### <a name="-apache--mod--security--dos_counter_threshold"></a>`dos_counter_threshold`
+##### <a name="dos_counter_threshold"></a>`dos_counter_threshold`
 
 Data type: `Integer[1, default]`
 
@@ -6338,7 +6344,7 @@ the OWASP ModSecurity Core Rule Set DOS protection rule (rule id 900700)
 
 Default value: `100`
 
-##### <a name="-apache--mod--security--dos_block_timeout"></a>`dos_block_timeout`
+##### <a name="dos_block_timeout"></a>`dos_block_timeout`
 
 Data type: `Integer[1, default]`
 
@@ -6347,7 +6353,7 @@ ModSecurity Core Rule Set DOS protection rule (rule id 900700)
 
 Default value: `600`
 
-### <a name="apache--mod--setenvif"></a>`apache::mod::setenvif`
+### <a name="apachemodsetenvif"></a>`apache::mod::setenvif`
 
 Installs `mod_setenvif`.
 
@@ -6355,7 +6361,7 @@ Installs `mod_setenvif`.
   * https://httpd.apache.org/docs/current/mod/mod_setenvif.html
     * for additional documentation.
 
-### <a name="apache--mod--shib"></a>`apache::mod::shib`
+### <a name="apachemodshib"></a>`apache::mod::shib`
 
 This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
 can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
@@ -6371,45 +6377,45 @@ See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/
 
 The following parameters are available in the `apache::mod::shib` class:
 
-* [`suppress_warning`](#-apache--mod--shib--suppress_warning)
-* [`mod_full_path`](#-apache--mod--shib--mod_full_path)
-* [`package_name`](#-apache--mod--shib--package_name)
-* [`mod_lib`](#-apache--mod--shib--mod_lib)
+* [`suppress_warning`](#suppress_warning)
+* [`mod_full_path`](#mod_full_path)
+* [`package_name`](#package_name)
+* [`mod_lib`](#mod_lib)
 
-##### <a name="-apache--mod--shib--suppress_warning"></a>`suppress_warning`
+##### <a name="suppress_warning"></a>`suppress_warning`
 
 Data type: `Boolean`
 
 Toggles whether to trigger warning on RedHat nodes.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--shib--mod_full_path"></a>`mod_full_path`
+##### <a name="mod_full_path"></a>`mod_full_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--shib--package_name"></a>`package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of the Shibboleth package to be installed.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--shib--mod_lib"></a>`mod_lib`
+##### <a name="mod_lib"></a>`mod_lib`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
 overrides this value.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--socache_shmcb"></a>`apache::mod::socache_shmcb`
+### <a name="apachemodsocache_shmcb"></a>`apache::mod::socache_shmcb`
 
 Installs `mod_socache_shmcb`.
 
@@ -6417,7 +6423,7 @@ Installs `mod_socache_shmcb`.
   * https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html
     * for additional documentation.
 
-### <a name="apache--mod--speling"></a>`apache::mod::speling`
+### <a name="apachemodspeling"></a>`apache::mod::speling`
 
 Installs `mod_spelling`.
 
@@ -6425,7 +6431,7 @@ Installs `mod_spelling`.
   * https://httpd.apache.org/docs/current/mod/mod_speling.html
     * for additional documentation.
 
-### <a name="apache--mod--ssl"></a>`apache::mod::ssl`
+### <a name="apachemodssl"></a>`apache::mod::ssl`
 
 On most operating systems, the ssl.conf is placed in the module configuration directory. On Red Hat based operating systems, this
 file is placed in /etc/httpd/conf.d, the same location in which the RPM stores the configuration.
@@ -6441,47 +6447,47 @@ apache::vhost to true.
 
 The following parameters are available in the `apache::mod::ssl` class:
 
-* [`ssl_compression`](#-apache--mod--ssl--ssl_compression)
-* [`ssl_sessiontickets`](#-apache--mod--ssl--ssl_sessiontickets)
-* [`ssl_cryptodevice`](#-apache--mod--ssl--ssl_cryptodevice)
-* [`ssl_options`](#-apache--mod--ssl--ssl_options)
-* [`ssl_openssl_conf_cmd`](#-apache--mod--ssl--ssl_openssl_conf_cmd)
-* [`ssl_cert`](#-apache--mod--ssl--ssl_cert)
-* [`ssl_key`](#-apache--mod--ssl--ssl_key)
-* [`ssl_ca`](#-apache--mod--ssl--ssl_ca)
-* [`ssl_cipher`](#-apache--mod--ssl--ssl_cipher)
-* [`ssl_honorcipherorder`](#-apache--mod--ssl--ssl_honorcipherorder)
-* [`ssl_protocol`](#-apache--mod--ssl--ssl_protocol)
-* [`ssl_proxy_protocol`](#-apache--mod--ssl--ssl_proxy_protocol)
-* [`ssl_proxy_cipher_suite`](#-apache--mod--ssl--ssl_proxy_cipher_suite)
-* [`ssl_pass_phrase_dialog`](#-apache--mod--ssl--ssl_pass_phrase_dialog)
-* [`ssl_random_seed_bytes`](#-apache--mod--ssl--ssl_random_seed_bytes)
-* [`ssl_sessioncache`](#-apache--mod--ssl--ssl_sessioncache)
-* [`ssl_sessioncachetimeout`](#-apache--mod--ssl--ssl_sessioncachetimeout)
-* [`ssl_stapling`](#-apache--mod--ssl--ssl_stapling)
-* [`stapling_cache`](#-apache--mod--ssl--stapling_cache)
-* [`ssl_stapling_return_errors`](#-apache--mod--ssl--ssl_stapling_return_errors)
-* [`ssl_mutex`](#-apache--mod--ssl--ssl_mutex)
-* [`ssl_reload_on_change`](#-apache--mod--ssl--ssl_reload_on_change)
-* [`package_name`](#-apache--mod--ssl--package_name)
-
-##### <a name="-apache--mod--ssl--ssl_compression"></a>`ssl_compression`
+* [`ssl_compression`](#ssl_compression)
+* [`ssl_sessiontickets`](#ssl_sessiontickets)
+* [`ssl_cryptodevice`](#ssl_cryptodevice)
+* [`ssl_options`](#ssl_options)
+* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
+* [`ssl_cert`](#ssl_cert)
+* [`ssl_key`](#ssl_key)
+* [`ssl_ca`](#ssl_ca)
+* [`ssl_cipher`](#ssl_cipher)
+* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
+* [`ssl_protocol`](#ssl_protocol)
+* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
+* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
+* [`ssl_pass_phrase_dialog`](#ssl_pass_phrase_dialog)
+* [`ssl_random_seed_bytes`](#ssl_random_seed_bytes)
+* [`ssl_sessioncache`](#ssl_sessioncache)
+* [`ssl_sessioncachetimeout`](#ssl_sessioncachetimeout)
+* [`ssl_stapling`](#ssl_stapling)
+* [`stapling_cache`](#stapling_cache)
+* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
+* [`ssl_mutex`](#ssl_mutex)
+* [`ssl_reload_on_change`](#ssl_reload_on_change)
+* [`package_name`](#package_name)
+
+##### <a name="ssl_compression"></a>`ssl_compression`
 
 Data type: `Boolean`
 
 Enable compression on the SSL level.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--ssl--ssl_sessiontickets"></a>`ssl_sessiontickets`
+##### <a name="ssl_sessiontickets"></a>`ssl_sessiontickets`
 
 Data type: `Optional[Boolean]`
 
 Enable or disable use of TLS session tickets
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ssl--ssl_cryptodevice"></a>`ssl_cryptodevice`
+##### <a name="ssl_cryptodevice"></a>`ssl_cryptodevice`
 
 Data type: `String`
 
@@ -6489,7 +6495,7 @@ Enable use of a cryptographic hardware accelerator.
 
 Default value: `'builtin'`
 
-##### <a name="-apache--mod--ssl--ssl_options"></a>`ssl_options`
+##### <a name="ssl_options"></a>`ssl_options`
 
 Data type: `Array[String]`
 
@@ -6497,55 +6503,55 @@ Configure various SSL engine run-time options.
 
 Default value: `['StdEnvVars']`
 
-##### <a name="-apache--mod--ssl--ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
+##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Optional[String]`
 
 Configure OpenSSL parameters through its SSL_CONF API.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ssl--ssl_cert"></a>`ssl_cert`
+##### <a name="ssl_cert"></a>`ssl_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path to server PEM-encoded X.509 certificate data file.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ssl--ssl_key"></a>`ssl_key`
+##### <a name="ssl_key"></a>`ssl_key`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path to server PEM-encoded private key file
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ssl--ssl_ca"></a>`ssl_ca`
+##### <a name="ssl_ca"></a>`ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 File of concatenated PEM-encoded CA Certificates for Client Auth.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ssl--ssl_cipher"></a>`ssl_cipher`
+##### <a name="ssl_cipher"></a>`ssl_cipher`
 
-Data type: `String`
+Data type: `Variant[String[1], Hash[String[1], String[1]]]`
 
 Cipher Suite available for negotiation in SSL handshake.
 
 Default value: `$apache::params::ssl_cipher`
 
-##### <a name="-apache--mod--ssl--ssl_honorcipherorder"></a>`ssl_honorcipherorder`
+##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
-Data type: `Variant[Boolean, Enum['on', 'off']]`
+Data type: `Variant[Boolean, Apache::OnOff]`
 
 Option to prefer the server's cipher preference order.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--ssl--ssl_protocol"></a>`ssl_protocol`
+##### <a name="ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Array[String]`
 
@@ -6556,7 +6562,7 @@ Default based on the OS:
 
 Default value: `$apache::params::ssl_protocol`
 
-##### <a name="-apache--mod--ssl--ssl_proxy_protocol"></a>`ssl_proxy_protocol`
+##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Array`
 
@@ -6564,7 +6570,7 @@ Configure usable SSL protocol flavors for proxy usage.
 
 Default value: `[]`
 
-##### <a name="-apache--mod--ssl--ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
+##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
 Data type: `Optional[String[1]]`
 
@@ -6572,7 +6578,7 @@ Configure usable SSL ciphers for proxy usage. Equivalent to ssl_cipher but for p
 
 Default value: `$apache::params::ssl_proxy_cipher_suite`
 
-##### <a name="-apache--mod--ssl--ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
+##### <a name="ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
 
 Data type: `String`
 
@@ -6580,7 +6586,7 @@ Type of pass phrase dialog for encrypted private keys.
 
 Default value: `'builtin'`
 
-##### <a name="-apache--mod--ssl--ssl_random_seed_bytes"></a>`ssl_random_seed_bytes`
+##### <a name="ssl_random_seed_bytes"></a>`ssl_random_seed_bytes`
 
 Data type: `Integer`
 
@@ -6588,7 +6594,7 @@ Pseudo Random Number Generator (PRNG) seeding source.
 
 Default value: `512`
 
-##### <a name="-apache--mod--ssl--ssl_sessioncache"></a>`ssl_sessioncache`
+##### <a name="ssl_sessioncache"></a>`ssl_sessioncache`
 
 Data type: `String`
 
@@ -6596,7 +6602,7 @@ Configures the storage type of the global/inter-process SSL Session Cache
 
 Default value: `$apache::params::ssl_sessioncache`
 
-##### <a name="-apache--mod--ssl--ssl_sessioncachetimeout"></a>`ssl_sessioncachetimeout`
+##### <a name="ssl_sessioncachetimeout"></a>`ssl_sessioncachetimeout`
 
 Data type: `Integer`
 
@@ -6604,32 +6610,32 @@ Number of seconds before an SSL session expires in the Session Cache.
 
 Default value: `300`
 
-##### <a name="-apache--mod--ssl--ssl_stapling"></a>`ssl_stapling`
+##### <a name="ssl_stapling"></a>`ssl_stapling`
 
 Data type: `Boolean`
 
 Enable stapling of OCSP responses in the TLS handshake.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--ssl--stapling_cache"></a>`stapling_cache`
+##### <a name="stapling_cache"></a>`stapling_cache`
 
 Data type: `Optional[String]`
 
 Configures the cache used to store OCSP responses which get included in
 the TLS handshake if SSLUseStapling is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ssl--ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
+##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Optional[Boolean]`
 
 Pass stapling related OCSP errors on to client.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--ssl--ssl_mutex"></a>`ssl_mutex`
+##### <a name="ssl_mutex"></a>`ssl_mutex`
 
 Data type: `String`
 
@@ -6641,23 +6647,23 @@ Default based on the OS and/or Apache version:
 
 Default value: `'default'`
 
-##### <a name="-apache--mod--ssl--ssl_reload_on_change"></a>`ssl_reload_on_change`
+##### <a name="ssl_reload_on_change"></a>`ssl_reload_on_change`
 
 Data type: `Boolean`
 
 Enable reloading of apache if the content of ssl files have changed. It only affects ssl files configured here and not vhost ones.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--ssl--package_name"></a>`package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of ssl package to install.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--status"></a>`apache::mod::status`
+### <a name="apachemodstatus"></a>`apache::mod::status`
 
 Installs and configures `mod_status`.
 
@@ -6680,11 +6686,11 @@ class { 'apache::mod::status':
 
 The following parameters are available in the `apache::mod::status` class:
 
-* [`requires`](#-apache--mod--status--requires)
-* [`extended_status`](#-apache--mod--status--extended_status)
-* [`status_path`](#-apache--mod--status--status_path)
+* [`requires`](#requires)
+* [`extended_status`](#extended_status)
+* [`status_path`](#status_path)
 
-##### <a name="-apache--mod--status--requires"></a>`requires`
+##### <a name="requires"></a>`requires`
 
 Data type: `Optional[Variant[String, Array, Hash]]`
 
@@ -6701,17 +6707,17 @@ A Variant type that can be:
     This encloses "Require" directives in "<Require(Any|All|None)>" block
     Optional - If unspecified, "Require" directives follow current flow
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--status--extended_status"></a>`extended_status`
+##### <a name="extended_status"></a>`extended_status`
 
-Data type: `Enum['On', 'Off', 'on', 'off']`
+Data type: `Apache::OnOff`
 
 Determines whether to track extended status information for each request, via the ExtendedStatus directive.
 
 Default value: `'On'`
 
-##### <a name="-apache--mod--status--status_path"></a>`status_path`
+##### <a name="status_path"></a>`status_path`
 
 Data type: `String`
 
@@ -6719,7 +6725,7 @@ Path assigned to the Location directive which defines the URL to access the serv
 
 Default value: `'/server-status'`
 
-### <a name="apache--mod--suexec"></a>`apache::mod::suexec`
+### <a name="apachemodsuexec"></a>`apache::mod::suexec`
 
 Installs `mod_suexec`.
 
@@ -6727,7 +6733,7 @@ Installs `mod_suexec`.
   * https://httpd.apache.org/docs/current/mod/mod_suexec.html
     * for additional documentation.
 
-### <a name="apache--mod--userdir"></a>`apache::mod::userdir`
+### <a name="apachemoduserdir"></a>`apache::mod::userdir`
 
 Installs and configures `mod_userdir`.
 
@@ -6739,49 +6745,49 @@ Installs and configures `mod_userdir`.
 
 The following parameters are available in the `apache::mod::userdir` class:
 
-* [`home`](#-apache--mod--userdir--home)
-* [`dir`](#-apache--mod--userdir--dir)
-* [`userdir`](#-apache--mod--userdir--userdir)
-* [`disable_root`](#-apache--mod--userdir--disable_root)
-* [`path`](#-apache--mod--userdir--path)
-* [`overrides`](#-apache--mod--userdir--overrides)
-* [`options`](#-apache--mod--userdir--options)
-* [`unmanaged_path`](#-apache--mod--userdir--unmanaged_path)
-* [`custom_fragment`](#-apache--mod--userdir--custom_fragment)
+* [`home`](#home)
+* [`dir`](#dir)
+* [`userdir`](#userdir)
+* [`disable_root`](#disable_root)
+* [`path`](#path)
+* [`overrides`](#overrides)
+* [`options`](#options)
+* [`unmanaged_path`](#unmanaged_path)
+* [`custom_fragment`](#custom_fragment)
 
-##### <a name="-apache--mod--userdir--home"></a>`home`
+##### <a name="home"></a>`home`
 
 Data type: `Optional[String]`
 
 *Deprecated* Path to system home directory.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--userdir--dir"></a>`dir`
+##### <a name="dir"></a>`dir`
 
 Data type: `Optional[String]`
 
 *Deprecated* Path from user's home directory to public directory.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--userdir--userdir"></a>`userdir`
+##### <a name="userdir"></a>`userdir`
 
 Data type: `Optional[String[1]]`
 
 Path or directory name to be used as the UserDir.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--userdir--disable_root"></a>`disable_root`
+##### <a name="disable_root"></a>`disable_root`
 
 Data type: `Boolean`
 
 Toggles whether to allow use of root directory.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--mod--userdir--path"></a>`path`
+##### <a name="path"></a>`path`
 
 Data type: `String`
 
@@ -6789,7 +6795,7 @@ Path to directory or pattern from which to find user-specific directories.
 
 Default value: `'/home/*/public_html'`
 
-##### <a name="-apache--mod--userdir--overrides"></a>`overrides`
+##### <a name="overrides"></a>`overrides`
 
 Data type: `Array[String]`
 
@@ -6797,7 +6803,7 @@ Array of directives that are allowed in .htaccess files.
 
 Default value: `['FileInfo', 'AuthConfig', 'Limit', 'Indexes']`
 
-##### <a name="-apache--mod--userdir--options"></a>`options`
+##### <a name="options"></a>`options`
 
 Data type: `Array[String]`
 
@@ -6805,23 +6811,23 @@ Configures what features are available in a particular directory.
 
 Default value: `['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec']`
 
-##### <a name="-apache--mod--userdir--unmanaged_path"></a>`unmanaged_path`
+##### <a name="unmanaged_path"></a>`unmanaged_path`
 
 Data type: `Boolean`
 
 Toggles whether to manage path in userdir.conf
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--mod--userdir--custom_fragment"></a>`custom_fragment`
+##### <a name="custom_fragment"></a>`custom_fragment`
 
 Data type: `Optional[String]`
 
 Custom configuration to be added to userdir.conf
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--version"></a>`apache::mod::version`
+### <a name="apachemodversion"></a>`apache::mod::version`
 
 Installs `mod_version`.
 
@@ -6829,7 +6835,7 @@ Installs `mod_version`.
   * https://httpd.apache.org/docs/current/mod/mod_version.html
     * for additional documentation.
 
-### <a name="apache--mod--vhost_alias"></a>`apache::mod::vhost_alias`
+### <a name="apachemodvhost_alias"></a>`apache::mod::vhost_alias`
 
 Installs Apache `mod_vhost_alias`.
 
@@ -6837,7 +6843,7 @@ Installs Apache `mod_vhost_alias`.
   * https://httpd.apache.org/docs/current/mod/mod_vhost_alias.html
     * for additional documentation.
 
-### <a name="apache--mod--watchdog"></a>`apache::mod::watchdog`
+### <a name="apachemodwatchdog"></a>`apache::mod::watchdog`
 
 Installs and configures `mod_watchdog`.
 
@@ -6849,17 +6855,17 @@ Installs and configures `mod_watchdog`.
 
 The following parameters are available in the `apache::mod::watchdog` class:
 
-* [`watchdog_interval`](#-apache--mod--watchdog--watchdog_interval)
+* [`watchdog_interval`](#watchdog_interval)
 
-##### <a name="-apache--mod--watchdog--watchdog_interval"></a>`watchdog_interval`
+##### <a name="watchdog_interval"></a>`watchdog_interval`
 
 Data type: `Optional[Integer]`
 
 Sets the interval at which the watchdog_step hook runs.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--worker"></a>`apache::mod::worker`
+### <a name="apachemodworker"></a>`apache::mod::worker`
 
 Installs and manages the MPM `worker`.
 
@@ -6871,17 +6877,17 @@ Installs and manages the MPM `worker`.
 
 The following parameters are available in the `apache::mod::worker` class:
 
-* [`startservers`](#-apache--mod--worker--startservers)
-* [`minsparethreads`](#-apache--mod--worker--minsparethreads)
-* [`maxsparethreads`](#-apache--mod--worker--maxsparethreads)
-* [`threadsperchild`](#-apache--mod--worker--threadsperchild)
-* [`maxrequestsperchild`](#-apache--mod--worker--maxrequestsperchild)
-* [`serverlimit`](#-apache--mod--worker--serverlimit)
-* [`threadlimit`](#-apache--mod--worker--threadlimit)
-* [`listenbacklog`](#-apache--mod--worker--listenbacklog)
-* [`maxrequestworkers`](#-apache--mod--worker--maxrequestworkers)
+* [`startservers`](#startservers)
+* [`minsparethreads`](#minsparethreads)
+* [`maxsparethreads`](#maxsparethreads)
+* [`threadsperchild`](#threadsperchild)
+* [`maxrequestsperchild`](#maxrequestsperchild)
+* [`serverlimit`](#serverlimit)
+* [`threadlimit`](#threadlimit)
+* [`listenbacklog`](#listenbacklog)
+* [`maxrequestworkers`](#maxrequestworkers)
 
-##### <a name="-apache--mod--worker--startservers"></a>`startservers`
+##### <a name="startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -6889,7 +6895,7 @@ The number of child server processes created on startup
 
 Default value: `2`
 
-##### <a name="-apache--mod--worker--minsparethreads"></a>`minsparethreads`
+##### <a name="minsparethreads"></a>`minsparethreads`
 
 Data type: `Integer`
 
@@ -6897,7 +6903,7 @@ Minimum number of idle threads to handle request spikes.
 
 Default value: `25`
 
-##### <a name="-apache--mod--worker--maxsparethreads"></a>`maxsparethreads`
+##### <a name="maxsparethreads"></a>`maxsparethreads`
 
 Data type: `Integer`
 
@@ -6905,7 +6911,7 @@ Maximum number of idle threads.
 
 Default value: `75`
 
-##### <a name="-apache--mod--worker--threadsperchild"></a>`threadsperchild`
+##### <a name="threadsperchild"></a>`threadsperchild`
 
 Data type: `Integer`
 
@@ -6913,7 +6919,7 @@ The number of threads created by each child process.
 
 Default value: `25`
 
-##### <a name="-apache--mod--worker--maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -6923,7 +6929,7 @@ name is MaxConnectionsPerChild as of 2.3.9+.
 
 Default value: `0`
 
-##### <a name="-apache--mod--worker--serverlimit"></a>`serverlimit`
+##### <a name="serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -6935,7 +6941,7 @@ MaxRequestWorkers and ThreadsPerChild.
 
 Default value: `25`
 
-##### <a name="-apache--mod--worker--threadlimit"></a>`threadlimit`
+##### <a name="threadlimit"></a>`threadlimit`
 
 Data type: `Integer`
 
@@ -6944,7 +6950,7 @@ ThreadsPerChild for the lifetime of the Apache httpd process.
 
 Default value: `64`
 
-##### <a name="-apache--mod--worker--listenbacklog"></a>`listenbacklog`
+##### <a name="listenbacklog"></a>`listenbacklog`
 
 Data type: `Integer`
 
@@ -6952,7 +6958,7 @@ Maximum length of the queue of pending connections.
 
 Default value: `511`
 
-##### <a name="-apache--mod--worker--maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Integer`
 
@@ -6960,7 +6966,7 @@ Maximum number of connections that will be processed simultaneously
 
 Default value: `150`
 
-### <a name="apache--mod--wsgi"></a>`apache::mod::wsgi`
+### <a name="apachemodwsgi"></a>`apache::mod::wsgi`
 
 Installs and configures `mod_wsgi`.
 
@@ -6974,24 +6980,24 @@ Installs and configures `mod_wsgi`.
 
 The following parameters are available in the `apache::mod::wsgi` class:
 
-* [`wsgi_restrict_embedded`](#-apache--mod--wsgi--wsgi_restrict_embedded)
-* [`wsgi_socket_prefix`](#-apache--mod--wsgi--wsgi_socket_prefix)
-* [`wsgi_python_path`](#-apache--mod--wsgi--wsgi_python_path)
-* [`wsgi_python_home`](#-apache--mod--wsgi--wsgi_python_home)
-* [`wsgi_python_optimize`](#-apache--mod--wsgi--wsgi_python_optimize)
-* [`wsgi_application_group`](#-apache--mod--wsgi--wsgi_application_group)
-* [`package_name`](#-apache--mod--wsgi--package_name)
-* [`mod_path`](#-apache--mod--wsgi--mod_path)
+* [`wsgi_restrict_embedded`](#wsgi_restrict_embedded)
+* [`wsgi_socket_prefix`](#wsgi_socket_prefix)
+* [`wsgi_python_path`](#wsgi_python_path)
+* [`wsgi_python_home`](#wsgi_python_home)
+* [`wsgi_python_optimize`](#wsgi_python_optimize)
+* [`wsgi_application_group`](#wsgi_application_group)
+* [`package_name`](#package_name)
+* [`mod_path`](#mod_path)
 
-##### <a name="-apache--mod--wsgi--wsgi_restrict_embedded"></a>`wsgi_restrict_embedded`
+##### <a name="wsgi_restrict_embedded"></a>`wsgi_restrict_embedded`
 
 Data type: `Optional[String]`
 
 Enable restrictions on use of embedded mode.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--wsgi--wsgi_socket_prefix"></a>`wsgi_socket_prefix`
+##### <a name="wsgi_socket_prefix"></a>`wsgi_socket_prefix`
 
 Data type: `Optional[String]`
 
@@ -6999,55 +7005,55 @@ Configure directory to use for daemon sockets.
 
 Default value: `$apache::params::wsgi_socket_prefix`
 
-##### <a name="-apache--mod--wsgi--wsgi_python_path"></a>`wsgi_python_path`
+##### <a name="wsgi_python_path"></a>`wsgi_python_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Additional directories to search for Python modules.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--wsgi--wsgi_python_home"></a>`wsgi_python_home`
+##### <a name="wsgi_python_home"></a>`wsgi_python_home`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Absolute path to Python prefix/exec_prefix directories.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--wsgi--wsgi_python_optimize"></a>`wsgi_python_optimize`
+##### <a name="wsgi_python_optimize"></a>`wsgi_python_optimize`
 
 Data type: `Optional[Integer]`
 
 Enables basic Python optimisation features.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--wsgi--wsgi_application_group"></a>`wsgi_application_group`
+##### <a name="wsgi_application_group"></a>`wsgi_application_group`
 
 Data type: `Optional[String]`
 
 Sets which application group WSGI application belongs to.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--wsgi--package_name"></a>`package_name`
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Names of package that installs mod_wsgi.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--wsgi--mod_path"></a>`mod_path`
+##### <a name="mod_path"></a>`mod_path`
 
 Data type: `Optional[String]`
 
 Defines the path to the mod_wsgi shared object (.so) file.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--mod--xsendfile"></a>`apache::mod::xsendfile`
+### <a name="apachemodxsendfile"></a>`apache::mod::xsendfile`
 
 Installs `mod_xsendfile`.
 
@@ -7055,19 +7061,19 @@ Installs `mod_xsendfile`.
   * https://tn123.org/mod_xsendfile/
     * for additional documentation.
 
-### <a name="apache--mpm--disable_mpm_event"></a>`apache::mpm::disable_mpm_event`
+### <a name="apachempmdisable_mpm_event"></a>`apache::mpm::disable_mpm_event`
 
 disable Apache-Module event
 
-### <a name="apache--mpm--disable_mpm_prefork"></a>`apache::mpm::disable_mpm_prefork`
+### <a name="apachempmdisable_mpm_prefork"></a>`apache::mpm::disable_mpm_prefork`
 
 disable Apache-Module prefork
 
-### <a name="apache--mpm--disable_mpm_worker"></a>`apache::mpm::disable_mpm_worker`
+### <a name="apachempmdisable_mpm_worker"></a>`apache::mpm::disable_mpm_worker`
 
 disable Apache-Module worker
 
-### <a name="apache--vhosts"></a>`apache::vhosts`
+### <a name="apachevhosts"></a>`apache::vhosts`
 
 host parameters or Configuring virtual hosts in the README section.
 
@@ -7092,9 +7098,9 @@ class { 'apache::vhosts':
 
 The following parameters are available in the `apache::vhosts` class:
 
-* [`vhosts`](#-apache--vhosts--vhosts)
+* [`vhosts`](#vhosts)
 
-##### <a name="-apache--vhosts--vhosts"></a>`vhosts`
+##### <a name="vhosts"></a>`vhosts`
 
 Data type: `Hash`
 
@@ -7105,7 +7111,7 @@ Default value: `{}`
 
 ## Defined types
 
-### <a name="apache--balancer"></a>`apache::balancer`
+### <a name="apachebalancer"></a>`apache::balancer`
 
 Each balancer cluster needs one or more balancer members (that can
 be declared with the apache::balancermember defined resource type). Using
@@ -7129,18 +7135,18 @@ apache::balancer { 'puppet00': }
 
 The following parameters are available in the `apache::balancer` defined type:
 
-* [`name`](#-apache--balancer--name)
-* [`proxy_set`](#-apache--balancer--proxy_set)
-* [`target`](#-apache--balancer--target)
-* [`collect_exported`](#-apache--balancer--collect_exported)
-* [`options`](#-apache--balancer--options)
+* [`name`](#name)
+* [`proxy_set`](#proxy_set)
+* [`target`](#target)
+* [`collect_exported`](#collect_exported)
+* [`options`](#options)
 
-##### <a name="-apache--balancer--name"></a>`name`
+##### <a name="name"></a>`name`
 
 The namevar of the defined resource type is the balancer clusters name.<br />
 This name is also used in the name of the conf.d file
 
-##### <a name="-apache--balancer--proxy_set"></a>`proxy_set`
+##### <a name="proxy_set"></a>`proxy_set`
 
 Data type: `Hash`
 
@@ -7148,15 +7154,15 @@ Configures key-value pairs to be used as a ProxySet lines in the configuration.
 
 Default value: `{}`
 
-##### <a name="-apache--balancer--target"></a>`target`
+##### <a name="target"></a>`target`
 
 Data type: `Optional[String]`
 
 The path to the file the balancer definition will be written in.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--balancer--collect_exported"></a>`collect_exported`
+##### <a name="collect_exported"></a>`collect_exported`
 
 Data type: `Boolean`
 
@@ -7171,9 +7177,9 @@ If you don't use exported resources, a single Puppet run configures all balancer
 you use exported resources, Puppet has to run on the balanced nodes first, then run on the
 balancer.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--balancer--options"></a>`options`
+##### <a name="options"></a>`options`
 
 Data type: `Array[Pattern[/=/]]`
 
@@ -7182,7 +7188,7 @@ after the balancer URL, and accepts any key-value pairs available to `ProxyPass`
 
 Default value: `[]`
 
-### <a name="apache--balancermember"></a>`apache::balancermember`
+### <a name="apachebalancermember"></a>`apache::balancermember`
 
 Sets up a balancer member inside a listening service configuration block in
 the load balancer's `apache.cfg`.
@@ -7214,24 +7220,24 @@ from all balancer members.
 
 The following parameters are available in the `apache::balancermember` defined type:
 
-* [`name`](#-apache--balancermember--name)
-* [`balancer_cluster`](#-apache--balancermember--balancer_cluster)
-* [`url`](#-apache--balancermember--url)
-* [`options`](#-apache--balancermember--options)
+* [`name`](#name)
+* [`balancer_cluster`](#balancer_cluster)
+* [`url`](#url)
+* [`options`](#options)
 
-##### <a name="-apache--balancermember--name"></a>`name`
+##### <a name="name"></a>`name`
 
 The title of the resource is arbitrary and only utilized in the concat
 fragment name.
 
-##### <a name="-apache--balancermember--balancer_cluster"></a>`balancer_cluster`
+##### <a name="balancer_cluster"></a>`balancer_cluster`
 
 Data type: `String`
 
 The apache service's instance name (or, the title of the apache::balancer
 resource). This must match up with a declared apache::balancer resource.
 
-##### <a name="-apache--balancermember--url"></a>`url`
+##### <a name="url"></a>`url`
 
 Data type: `Apache::ModProxyProtocol`
 
@@ -7239,7 +7245,7 @@ The url used to contact the balancer member server.
 
 Default value: `"http://${$facts['networking']['fqdn']}/"`
 
-##### <a name="-apache--balancermember--options"></a>`options`
+##### <a name="options"></a>`options`
 
 Data type: `Array`
 
@@ -7248,7 +7254,7 @@ after the URL, and accepts any key-value pairs available to `ProxyPass`.
 
 Default value: `[]`
 
-### <a name="apache--custom_config"></a>`apache::custom_config`
+### <a name="apachecustom_config"></a>`apache::custom_config`
 
 If the file is invalid and this defined type's `verify_config` parameter's value is
 `true`, Puppet throws an error during a Puppet run.
@@ -7257,20 +7263,20 @@ If the file is invalid and this defined type's `verify_config` parameter's value
 
 The following parameters are available in the `apache::custom_config` defined type:
 
-* [`ensure`](#-apache--custom_config--ensure)
-* [`confdir`](#-apache--custom_config--confdir)
-* [`content`](#-apache--custom_config--content)
-* [`filename`](#-apache--custom_config--filename)
-* [`priority`](#-apache--custom_config--priority)
-* [`source`](#-apache--custom_config--source)
-* [`verify_command`](#-apache--custom_config--verify_command)
-* [`verify_config`](#-apache--custom_config--verify_config)
-* [`owner`](#-apache--custom_config--owner)
-* [`group`](#-apache--custom_config--group)
-* [`file_mode`](#-apache--custom_config--file_mode)
-* [`show_diff`](#-apache--custom_config--show_diff)
-
-##### <a name="-apache--custom_config--ensure"></a>`ensure`
+* [`ensure`](#ensure)
+* [`confdir`](#confdir)
+* [`content`](#content)
+* [`filename`](#filename)
+* [`priority`](#priority)
+* [`source`](#source)
+* [`verify_command`](#verify_command)
+* [`verify_config`](#verify_config)
+* [`owner`](#owner)
+* [`group`](#group)
+* [`file_mode`](#file_mode)
+* [`show_diff`](#show_diff)
+
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Enum['absent', 'present']`
 
@@ -7278,7 +7284,7 @@ Specifies whether the configuration file should be present.
 
 Default value: `'present'`
 
-##### <a name="-apache--custom_config--confdir"></a>`confdir`
+##### <a name="confdir"></a>`confdir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -7286,24 +7292,24 @@ Sets the directory in which Puppet places configuration files.
 
 Default value: `$apache::confd_dir`
 
-##### <a name="-apache--custom_config--content"></a>`content`
+##### <a name="content"></a>`content`
 
 Data type: `Optional[Variant[Sensitive, String]]`
 
 Sets the configuration file's content. The `content` and `source` parameters are exclusive
 of each other.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--custom_config--filename"></a>`filename`
+##### <a name="filename"></a>`filename`
 
 Data type: `Optional[String]`
 
 Sets the name of the file under `confdir` in which Puppet stores the configuration.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--custom_config--priority"></a>`priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Apache::Vhost::Priority`
 
@@ -7313,16 +7319,16 @@ To omit the priority prefix in the configuration file's name, set this parameter
 
 Default value: `25`
 
-##### <a name="-apache--custom_config--source"></a>`source`
+##### <a name="source"></a>`source`
 
 Data type: `Optional[String]`
 
 Points to the configuration file's source. The `content` and `source` parameters are
 exclusive of each other.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--custom_config--verify_command"></a>`verify_command`
+##### <a name="verify_command"></a>`verify_command`
 
 Data type: `Variant[String, Array[String], Array[Array[String]]]`
 
@@ -7337,47 +7343,47 @@ Or an array of arrays with each one having to pass succesfully, i.e. `[['/usr/sb
 
 Default value: `$apache::params::verify_command`
 
-##### <a name="-apache--custom_config--verify_config"></a>`verify_config`
+##### <a name="verify_config"></a>`verify_config`
 
 Data type: `Boolean`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--custom_config--owner"></a>`owner`
+##### <a name="owner"></a>`owner`
 
 Data type: `Optional[String]`
 
 File owner of configuration file
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--custom_config--group"></a>`group`
+##### <a name="group"></a>`group`
 
 Data type: `Optional[String]`
 
 File group of configuration file
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--custom_config--file_mode"></a>`file_mode`
+##### <a name="file_mode"></a>`file_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
 File mode of configuration file
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--custom_config--show_diff"></a>`show_diff`
+##### <a name="show_diff"></a>`show_diff`
 
 Data type: `Boolean`
 
 show_diff property for configuration file resource
 
-Default value: `true`
+Default value: ``true``
 
-### <a name="apache--fastcgi--server"></a>`apache::fastcgi::server`
+### <a name="apachefastcgiserver"></a>`apache::fastcgi::server`
 
 Defines one or more external FastCGI servers to handle specific file types. Use this
 defined type with `mod_fastcgi`.
@@ -7386,15 +7392,15 @@ defined type with `mod_fastcgi`.
 
 The following parameters are available in the `apache::fastcgi::server` defined type:
 
-* [`host`](#-apache--fastcgi--server--host)
-* [`timeout`](#-apache--fastcgi--server--timeout)
-* [`flush`](#-apache--fastcgi--server--flush)
-* [`faux_path`](#-apache--fastcgi--server--faux_path)
-* [`fcgi_alias`](#-apache--fastcgi--server--fcgi_alias)
-* [`file_type`](#-apache--fastcgi--server--file_type)
-* [`pass_header`](#-apache--fastcgi--server--pass_header)
+* [`host`](#host)
+* [`timeout`](#timeout)
+* [`flush`](#flush)
+* [`faux_path`](#faux_path)
+* [`fcgi_alias`](#fcgi_alias)
+* [`file_type`](#file_type)
+* [`pass_header`](#pass_header)
 
-##### <a name="-apache--fastcgi--server--host"></a>`host`
+##### <a name="host"></a>`host`
 
 Data type: `String`
 
@@ -7402,7 +7408,7 @@ Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
 
 Default value: `'127.0.0.1:9000'`
 
-##### <a name="-apache--fastcgi--server--timeout"></a>`timeout`
+##### <a name="timeout"></a>`timeout`
 
 Data type: `Integer`
 
@@ -7415,7 +7421,7 @@ the client (the response is buffered), the timeout does not apply.
 
 Default value: `15`
 
-##### <a name="-apache--fastcgi--server--flush"></a>`flush`
+##### <a name="flush"></a>`flush`
 
 Data type: `Boolean`
 
@@ -7423,9 +7429,9 @@ Forces `mod_fastcgi` to write to the client as data is received from the
 application. By default, `mod_fastcgi` buffers data in order to free the application
 as quickly as possible.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--fastcgi--server--faux_path"></a>`faux_path`
+##### <a name="faux_path"></a>`faux_path`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -7434,7 +7440,7 @@ parameter does not have to exist in the local filesystem.
 
 Default value: `"/var/www/${name}.fcgi"`
 
-##### <a name="-apache--fastcgi--server--fcgi_alias"></a>`fcgi_alias`
+##### <a name="fcgi_alias"></a>`fcgi_alias`
 
 Data type: `Stdlib::Unixpath`
 
@@ -7442,7 +7448,7 @@ Internally links actions with the FastCGI server. This alias must be unique.
 
 Default value: `"/${name}.fcgi"`
 
-##### <a name="-apache--fastcgi--server--file_type"></a>`file_type`
+##### <a name="file_type"></a>`file_type`
 
 Data type: `String`
 
@@ -7450,20 +7456,20 @@ Sets the MIME `content-type` of the file to be processed by the FastCGI server.
 
 Default value: `'application/x-httpd-php'`
 
-##### <a name="-apache--fastcgi--server--pass_header"></a>`pass_header`
+##### <a name="pass_header"></a>`pass_header`
 
 Data type: `Optional[String]`
 
 Sets a header for the server
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--listen"></a>`apache::listen`
+### <a name="apachelisten"></a>`apache::listen`
 
 The `apache::vhost` class uses this defined type, and titles take the form
 `<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
 
-### <a name="apache--mod"></a>`apache::mod`
+### <a name="apachemod"></a>`apache::mod`
 
 Checks for or places the module's default configuration files in the Apache server's
 `module` and `enable` directories. The default locations depend on your operating system.
@@ -7472,25 +7478,25 @@ Checks for or places the module's default configuration files in the Apache serv
 
 The following parameters are available in the `apache::mod` defined type:
 
-* [`package`](#-apache--mod--package)
-* [`package_ensure`](#-apache--mod--package_ensure)
-* [`lib`](#-apache--mod--lib)
-* [`lib_path`](#-apache--mod--lib_path)
-* [`loadfile_name`](#-apache--mod--loadfile_name)
-* [`id`](#-apache--mod--id)
-* [`loadfiles`](#-apache--mod--loadfiles)
-* [`path`](#-apache--mod--path)
+* [`package`](#package)
+* [`package_ensure`](#package_ensure)
+* [`lib`](#lib)
+* [`lib_path`](#lib_path)
+* [`loadfile_name`](#loadfile_name)
+* [`id`](#id)
+* [`loadfiles`](#loadfiles)
+* [`path`](#path)
 
-##### <a name="-apache--mod--package"></a>`package`
+##### <a name="package"></a>`package`
 
 Data type: `Optional[String]`
 
 **Required**.<br />
 Names the package Puppet uses to install the Apache module.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--package_ensure"></a>`package_ensure`
+##### <a name="package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -7498,15 +7504,15 @@ Determines whether Puppet ensures the Apache module should be installed.
 
 Default value: `'present'`
 
-##### <a name="-apache--mod--lib"></a>`lib`
+##### <a name="lib"></a>`lib`
 
 Data type: `Optional[String]`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--lib_path"></a>`lib_path`
+##### <a name="lib_path"></a>`lib_path`
 
 Data type: `String`
 
@@ -7515,46 +7521,46 @@ without special reason. The `path` parameter overrides this value.
 
 Default value: `$apache::lib_path`
 
-##### <a name="-apache--mod--loadfile_name"></a>`loadfile_name`
+##### <a name="loadfile_name"></a>`loadfile_name`
 
 Data type: `Optional[String]`
 
 Sets the filename for the module's `LoadFile` directive, which can also set
 the module load order as Apache processes them in alphanumeric order.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--id"></a>`id`
+##### <a name="id"></a>`id`
 
 Data type: `Optional[String]`
 
 Specifies the package id
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--loadfiles"></a>`loadfiles`
+##### <a name="loadfiles"></a>`loadfiles`
 
 Data type: `Optional[Array]`
 
 Specifies an array of `LoadFile` directives.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--mod--path"></a>`path`
+##### <a name="path"></a>`path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--namevirtualhost"></a>`apache::namevirtualhost`
+### <a name="apachenamevirtualhost"></a>`apache::namevirtualhost`
 
 Adds all related directives to the `ports.conf` file in the Apache HTTPD configuration
 directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`,
 `\<IP\>`, or `\<IP\>:\<PORT\>`.
 
-### <a name="apache--vhost"></a>`apache::vhost`
+### <a name="apachevhost"></a>`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` being a defined resource type, which allows Apache
@@ -7624,6 +7630,32 @@ lint:endignore
   }
   ```
 
+lint:ignore:parameter_documentation
+lint:endignore
+  Specifies mod_authz_core parameters for particular directories in a virtual host directory
+  ```puppet
+  apache::vhost { 'sample.example.net':
+    docroot     => '/path/to/directory',
+    directories => [
+      { path        => '/path/to/different/dir',
+        authz_core  => {
+          require_all => {
+            'require_any' => {
+              'require' => ['user superadmin'],
+              'require_all' => {
+                'require' => ['group admins', 'ldap-group "cn=Administrators,o=Airius"'],
+              },
+            },
+            'require_none' => {
+              'require' => ['group temps', 'ldap-group "cn=Temporary Employees,o=Airius"']
+            }
+          }
+        }
+      },
+    ],
+  }
+  ```
+
 #### Examples
 
 ##### 
@@ -7639,266 +7671,267 @@ class { 'apache':
 
 The following parameters are available in the `apache::vhost` defined type:
 
-* [`access_log`](#-apache--vhost--access_log)
-* [`access_log_env_var`](#-apache--vhost--access_log_env_var)
-* [`access_log_file`](#-apache--vhost--access_log_file)
-* [`access_log_format`](#-apache--vhost--access_log_format)
-* [`access_log_pipe`](#-apache--vhost--access_log_pipe)
-* [`access_log_syslog`](#-apache--vhost--access_log_syslog)
-* [`access_logs`](#-apache--vhost--access_logs)
-* [`add_default_charset`](#-apache--vhost--add_default_charset)
-* [`add_listen`](#-apache--vhost--add_listen)
-* [`use_optional_includes`](#-apache--vhost--use_optional_includes)
-* [`aliases`](#-apache--vhost--aliases)
-* [`allow_encoded_slashes`](#-apache--vhost--allow_encoded_slashes)
-* [`block`](#-apache--vhost--block)
-* [`cas_attribute_prefix`](#-apache--vhost--cas_attribute_prefix)
-* [`cas_attribute_delimiter`](#-apache--vhost--cas_attribute_delimiter)
-* [`cas_login_url`](#-apache--vhost--cas_login_url)
-* [`cas_root_proxied_as`](#-apache--vhost--cas_root_proxied_as)
-* [`cas_scrub_request_headers`](#-apache--vhost--cas_scrub_request_headers)
-* [`cas_sso_enabled`](#-apache--vhost--cas_sso_enabled)
-* [`cas_validate_saml`](#-apache--vhost--cas_validate_saml)
-* [`cas_validate_url`](#-apache--vhost--cas_validate_url)
-* [`cas_cookie_path`](#-apache--vhost--cas_cookie_path)
-* [`comment`](#-apache--vhost--comment)
-* [`default_vhost`](#-apache--vhost--default_vhost)
-* [`directoryindex`](#-apache--vhost--directoryindex)
-* [`docroot`](#-apache--vhost--docroot)
-* [`docroot_group`](#-apache--vhost--docroot_group)
-* [`docroot_owner`](#-apache--vhost--docroot_owner)
-* [`docroot_mode`](#-apache--vhost--docroot_mode)
-* [`manage_docroot`](#-apache--vhost--manage_docroot)
-* [`error_log`](#-apache--vhost--error_log)
-* [`error_log_file`](#-apache--vhost--error_log_file)
-* [`error_log_pipe`](#-apache--vhost--error_log_pipe)
-* [`error_log_syslog`](#-apache--vhost--error_log_syslog)
-* [`error_log_format`](#-apache--vhost--error_log_format)
-* [`error_documents`](#-apache--vhost--error_documents)
-* [`ensure`](#-apache--vhost--ensure)
-* [`fallbackresource`](#-apache--vhost--fallbackresource)
-* [`filters`](#-apache--vhost--filters)
-* [`h2_copy_files`](#-apache--vhost--h2_copy_files)
-* [`h2_direct`](#-apache--vhost--h2_direct)
-* [`h2_early_hints`](#-apache--vhost--h2_early_hints)
-* [`h2_max_session_streams`](#-apache--vhost--h2_max_session_streams)
-* [`h2_modern_tls_only`](#-apache--vhost--h2_modern_tls_only)
-* [`h2_push`](#-apache--vhost--h2_push)
-* [`h2_push_diary_size`](#-apache--vhost--h2_push_diary_size)
-* [`h2_push_priority`](#-apache--vhost--h2_push_priority)
-* [`h2_push_resource`](#-apache--vhost--h2_push_resource)
-* [`h2_serialize_headers`](#-apache--vhost--h2_serialize_headers)
-* [`h2_stream_max_mem_size`](#-apache--vhost--h2_stream_max_mem_size)
-* [`h2_tls_cool_down_secs`](#-apache--vhost--h2_tls_cool_down_secs)
-* [`h2_tls_warm_up_size`](#-apache--vhost--h2_tls_warm_up_size)
-* [`h2_upgrade`](#-apache--vhost--h2_upgrade)
-* [`h2_window_size`](#-apache--vhost--h2_window_size)
-* [`ip`](#-apache--vhost--ip)
-* [`ip_based`](#-apache--vhost--ip_based)
-* [`itk`](#-apache--vhost--itk)
-* [`action`](#-apache--vhost--action)
-* [`jk_mounts`](#-apache--vhost--jk_mounts)
-* [`http_protocol_options`](#-apache--vhost--http_protocol_options)
-* [`keepalive`](#-apache--vhost--keepalive)
-* [`keepalive_timeout`](#-apache--vhost--keepalive_timeout)
-* [`max_keepalive_requests`](#-apache--vhost--max_keepalive_requests)
-* [`auth_kerb`](#-apache--vhost--auth_kerb)
-* [`krb_method_negotiate`](#-apache--vhost--krb_method_negotiate)
-* [`krb_method_k5passwd`](#-apache--vhost--krb_method_k5passwd)
-* [`krb_authoritative`](#-apache--vhost--krb_authoritative)
-* [`krb_auth_realms`](#-apache--vhost--krb_auth_realms)
-* [`krb_5keytab`](#-apache--vhost--krb_5keytab)
-* [`krb_local_user_mapping`](#-apache--vhost--krb_local_user_mapping)
-* [`krb_verify_kdc`](#-apache--vhost--krb_verify_kdc)
-* [`krb_servicename`](#-apache--vhost--krb_servicename)
-* [`krb_save_credentials`](#-apache--vhost--krb_save_credentials)
-* [`logroot`](#-apache--vhost--logroot)
-* [`logroot_ensure`](#-apache--vhost--logroot_ensure)
-* [`logroot_mode`](#-apache--vhost--logroot_mode)
-* [`logroot_owner`](#-apache--vhost--logroot_owner)
-* [`logroot_group`](#-apache--vhost--logroot_group)
-* [`log_level`](#-apache--vhost--log_level)
-* [`modsec_body_limit`](#-apache--vhost--modsec_body_limit)
-* [`modsec_disable_vhost`](#-apache--vhost--modsec_disable_vhost)
-* [`modsec_disable_ids`](#-apache--vhost--modsec_disable_ids)
-* [`modsec_disable_ips`](#-apache--vhost--modsec_disable_ips)
-* [`modsec_disable_msgs`](#-apache--vhost--modsec_disable_msgs)
-* [`modsec_disable_tags`](#-apache--vhost--modsec_disable_tags)
-* [`modsec_audit_log_file`](#-apache--vhost--modsec_audit_log_file)
-* [`modsec_audit_log_pipe`](#-apache--vhost--modsec_audit_log_pipe)
-* [`modsec_audit_log`](#-apache--vhost--modsec_audit_log)
-* [`modsec_inbound_anomaly_threshold`](#-apache--vhost--modsec_inbound_anomaly_threshold)
-* [`modsec_outbound_anomaly_threshold`](#-apache--vhost--modsec_outbound_anomaly_threshold)
-* [`modsec_allowed_methods`](#-apache--vhost--modsec_allowed_methods)
-* [`no_proxy_uris`](#-apache--vhost--no_proxy_uris)
-* [`no_proxy_uris_match`](#-apache--vhost--no_proxy_uris_match)
-* [`proxy_preserve_host`](#-apache--vhost--proxy_preserve_host)
-* [`proxy_add_headers`](#-apache--vhost--proxy_add_headers)
-* [`proxy_error_override`](#-apache--vhost--proxy_error_override)
-* [`options`](#-apache--vhost--options)
-* [`override`](#-apache--vhost--override)
-* [`passenger_enabled`](#-apache--vhost--passenger_enabled)
-* [`passenger_base_uri`](#-apache--vhost--passenger_base_uri)
-* [`passenger_ruby`](#-apache--vhost--passenger_ruby)
-* [`passenger_python`](#-apache--vhost--passenger_python)
-* [`passenger_nodejs`](#-apache--vhost--passenger_nodejs)
-* [`passenger_meteor_app_settings`](#-apache--vhost--passenger_meteor_app_settings)
-* [`passenger_app_env`](#-apache--vhost--passenger_app_env)
-* [`passenger_app_root`](#-apache--vhost--passenger_app_root)
-* [`passenger_app_group_name`](#-apache--vhost--passenger_app_group_name)
-* [`passenger_app_start_command`](#-apache--vhost--passenger_app_start_command)
-* [`passenger_app_type`](#-apache--vhost--passenger_app_type)
-* [`passenger_startup_file`](#-apache--vhost--passenger_startup_file)
-* [`passenger_restart_dir`](#-apache--vhost--passenger_restart_dir)
-* [`passenger_spawn_method`](#-apache--vhost--passenger_spawn_method)
-* [`passenger_load_shell_envvars`](#-apache--vhost--passenger_load_shell_envvars)
-* [`passenger_preload_bundler`](#-apache--vhost--passenger_preload_bundler)
-* [`passenger_rolling_restarts`](#-apache--vhost--passenger_rolling_restarts)
-* [`passenger_resist_deployment_errors`](#-apache--vhost--passenger_resist_deployment_errors)
-* [`passenger_user`](#-apache--vhost--passenger_user)
-* [`passenger_group`](#-apache--vhost--passenger_group)
-* [`passenger_friendly_error_pages`](#-apache--vhost--passenger_friendly_error_pages)
-* [`passenger_min_instances`](#-apache--vhost--passenger_min_instances)
-* [`passenger_max_instances`](#-apache--vhost--passenger_max_instances)
-* [`passenger_max_preloader_idle_time`](#-apache--vhost--passenger_max_preloader_idle_time)
-* [`passenger_force_max_concurrent_requests_per_process`](#-apache--vhost--passenger_force_max_concurrent_requests_per_process)
-* [`passenger_start_timeout`](#-apache--vhost--passenger_start_timeout)
-* [`passenger_concurrency_model`](#-apache--vhost--passenger_concurrency_model)
-* [`passenger_thread_count`](#-apache--vhost--passenger_thread_count)
-* [`passenger_max_requests`](#-apache--vhost--passenger_max_requests)
-* [`passenger_max_request_time`](#-apache--vhost--passenger_max_request_time)
-* [`passenger_memory_limit`](#-apache--vhost--passenger_memory_limit)
-* [`passenger_stat_throttle_rate`](#-apache--vhost--passenger_stat_throttle_rate)
-* [`passenger_pre_start`](#-apache--vhost--passenger_pre_start)
-* [`passenger_high_performance`](#-apache--vhost--passenger_high_performance)
-* [`passenger_buffer_upload`](#-apache--vhost--passenger_buffer_upload)
-* [`passenger_buffer_response`](#-apache--vhost--passenger_buffer_response)
-* [`passenger_error_override`](#-apache--vhost--passenger_error_override)
-* [`passenger_max_request_queue_size`](#-apache--vhost--passenger_max_request_queue_size)
-* [`passenger_max_request_queue_time`](#-apache--vhost--passenger_max_request_queue_time)
-* [`passenger_sticky_sessions`](#-apache--vhost--passenger_sticky_sessions)
-* [`passenger_sticky_sessions_cookie_name`](#-apache--vhost--passenger_sticky_sessions_cookie_name)
-* [`passenger_sticky_sessions_cookie_attributes`](#-apache--vhost--passenger_sticky_sessions_cookie_attributes)
-* [`passenger_allow_encoded_slashes`](#-apache--vhost--passenger_allow_encoded_slashes)
-* [`passenger_app_log_file`](#-apache--vhost--passenger_app_log_file)
-* [`passenger_debugger`](#-apache--vhost--passenger_debugger)
-* [`passenger_lve_min_uid`](#-apache--vhost--passenger_lve_min_uid)
-* [`php_values`](#-apache--vhost--php_values)
-* [`php_flags`](#-apache--vhost--php_flags)
-* [`php_admin_values`](#-apache--vhost--php_admin_values)
-* [`php_admin_flags`](#-apache--vhost--php_admin_flags)
-* [`port`](#-apache--vhost--port)
-* [`priority`](#-apache--vhost--priority)
-* [`protocols`](#-apache--vhost--protocols)
-* [`protocols_honor_order`](#-apache--vhost--protocols_honor_order)
-* [`proxy_dest`](#-apache--vhost--proxy_dest)
-* [`proxy_pass`](#-apache--vhost--proxy_pass)
-* [`proxy_dest_match`](#-apache--vhost--proxy_dest_match)
-* [`proxy_dest_reverse_match`](#-apache--vhost--proxy_dest_reverse_match)
-* [`proxy_pass_match`](#-apache--vhost--proxy_pass_match)
-* [`redirect_dest`](#-apache--vhost--redirect_dest)
-* [`redirect_source`](#-apache--vhost--redirect_source)
-* [`redirect_status`](#-apache--vhost--redirect_status)
-* [`redirectmatch_regexp`](#-apache--vhost--redirectmatch_regexp)
-* [`redirectmatch_status`](#-apache--vhost--redirectmatch_status)
-* [`redirectmatch_dest`](#-apache--vhost--redirectmatch_dest)
-* [`request_headers`](#-apache--vhost--request_headers)
-* [`rewrites`](#-apache--vhost--rewrites)
-* [`rewrite_base`](#-apache--vhost--rewrite_base)
-* [`rewrite_rule`](#-apache--vhost--rewrite_rule)
-* [`rewrite_cond`](#-apache--vhost--rewrite_cond)
-* [`rewrite_inherit`](#-apache--vhost--rewrite_inherit)
-* [`scriptalias`](#-apache--vhost--scriptalias)
-* [`scriptaliases`](#-apache--vhost--scriptaliases)
-* [`serveradmin`](#-apache--vhost--serveradmin)
-* [`serveraliases`](#-apache--vhost--serveraliases)
-* [`servername`](#-apache--vhost--servername)
-* [`setenv`](#-apache--vhost--setenv)
-* [`setenvif`](#-apache--vhost--setenvif)
-* [`setenvifnocase`](#-apache--vhost--setenvifnocase)
-* [`suexec_user_group`](#-apache--vhost--suexec_user_group)
-* [`vhost_name`](#-apache--vhost--vhost_name)
-* [`virtual_docroot`](#-apache--vhost--virtual_docroot)
-* [`virtual_use_default_docroot`](#-apache--vhost--virtual_use_default_docroot)
-* [`wsgi_daemon_process`](#-apache--vhost--wsgi_daemon_process)
-* [`wsgi_daemon_process_options`](#-apache--vhost--wsgi_daemon_process_options)
-* [`wsgi_application_group`](#-apache--vhost--wsgi_application_group)
-* [`wsgi_import_script`](#-apache--vhost--wsgi_import_script)
-* [`wsgi_import_script_options`](#-apache--vhost--wsgi_import_script_options)
-* [`wsgi_chunked_request`](#-apache--vhost--wsgi_chunked_request)
-* [`wsgi_process_group`](#-apache--vhost--wsgi_process_group)
-* [`wsgi_script_aliases`](#-apache--vhost--wsgi_script_aliases)
-* [`wsgi_script_aliases_match`](#-apache--vhost--wsgi_script_aliases_match)
-* [`wsgi_pass_authorization`](#-apache--vhost--wsgi_pass_authorization)
-* [`directories`](#-apache--vhost--directories)
-* [`custom_fragment`](#-apache--vhost--custom_fragment)
-* [`headers`](#-apache--vhost--headers)
-* [`shib_compat_valid_user`](#-apache--vhost--shib_compat_valid_user)
-* [`ssl_options`](#-apache--vhost--ssl_options)
-* [`additional_includes`](#-apache--vhost--additional_includes)
-* [`gssapi`](#-apache--vhost--gssapi)
-* [`ssl`](#-apache--vhost--ssl)
-* [`ssl_ca`](#-apache--vhost--ssl_ca)
-* [`ssl_cert`](#-apache--vhost--ssl_cert)
-* [`ssl_protocol`](#-apache--vhost--ssl_protocol)
-* [`ssl_cipher`](#-apache--vhost--ssl_cipher)
-* [`ssl_honorcipherorder`](#-apache--vhost--ssl_honorcipherorder)
-* [`ssl_certs_dir`](#-apache--vhost--ssl_certs_dir)
-* [`ssl_chain`](#-apache--vhost--ssl_chain)
-* [`ssl_crl`](#-apache--vhost--ssl_crl)
-* [`ssl_crl_path`](#-apache--vhost--ssl_crl_path)
-* [`ssl_crl_check`](#-apache--vhost--ssl_crl_check)
-* [`ssl_key`](#-apache--vhost--ssl_key)
-* [`ssl_verify_client`](#-apache--vhost--ssl_verify_client)
-* [`ssl_verify_depth`](#-apache--vhost--ssl_verify_depth)
-* [`ssl_proxy_protocol`](#-apache--vhost--ssl_proxy_protocol)
-* [`ssl_proxy_verify`](#-apache--vhost--ssl_proxy_verify)
-* [`ssl_proxy_verify_depth`](#-apache--vhost--ssl_proxy_verify_depth)
-* [`ssl_proxy_cipher_suite`](#-apache--vhost--ssl_proxy_cipher_suite)
-* [`ssl_proxy_ca_cert`](#-apache--vhost--ssl_proxy_ca_cert)
-* [`ssl_proxy_machine_cert`](#-apache--vhost--ssl_proxy_machine_cert)
-* [`ssl_proxy_machine_cert_chain`](#-apache--vhost--ssl_proxy_machine_cert_chain)
-* [`ssl_proxy_check_peer_cn`](#-apache--vhost--ssl_proxy_check_peer_cn)
-* [`ssl_proxy_check_peer_name`](#-apache--vhost--ssl_proxy_check_peer_name)
-* [`ssl_proxy_check_peer_expire`](#-apache--vhost--ssl_proxy_check_peer_expire)
-* [`ssl_openssl_conf_cmd`](#-apache--vhost--ssl_openssl_conf_cmd)
-* [`ssl_proxyengine`](#-apache--vhost--ssl_proxyengine)
-* [`ssl_stapling`](#-apache--vhost--ssl_stapling)
-* [`ssl_stapling_timeout`](#-apache--vhost--ssl_stapling_timeout)
-* [`ssl_stapling_return_errors`](#-apache--vhost--ssl_stapling_return_errors)
-* [`ssl_user_name`](#-apache--vhost--ssl_user_name)
-* [`ssl_reload_on_change`](#-apache--vhost--ssl_reload_on_change)
-* [`use_canonical_name`](#-apache--vhost--use_canonical_name)
-* [`define`](#-apache--vhost--define)
-* [`auth_oidc`](#-apache--vhost--auth_oidc)
-* [`oidc_settings`](#-apache--vhost--oidc_settings)
-* [`limitreqfields`](#-apache--vhost--limitreqfields)
-* [`limitreqfieldsize`](#-apache--vhost--limitreqfieldsize)
-* [`limitreqline`](#-apache--vhost--limitreqline)
-* [`limitreqbody`](#-apache--vhost--limitreqbody)
-* [`use_servername_for_filenames`](#-apache--vhost--use_servername_for_filenames)
-* [`use_port_for_filenames`](#-apache--vhost--use_port_for_filenames)
-* [`mdomain`](#-apache--vhost--mdomain)
-* [`proxy_requests`](#-apache--vhost--proxy_requests)
-* [`userdir`](#-apache--vhost--userdir)
-
-##### <a name="-apache--vhost--access_log"></a>`access_log`
+* [`access_log`](#access_log)
+* [`access_log_env_var`](#access_log_env_var)
+* [`access_log_file`](#access_log_file)
+* [`access_log_format`](#access_log_format)
+* [`access_log_pipe`](#access_log_pipe)
+* [`access_log_syslog`](#access_log_syslog)
+* [`access_logs`](#access_logs)
+* [`add_default_charset`](#add_default_charset)
+* [`add_listen`](#add_listen)
+* [`use_optional_includes`](#use_optional_includes)
+* [`aliases`](#aliases)
+* [`allow_encoded_slashes`](#allow_encoded_slashes)
+* [`block`](#block)
+* [`cas_attribute_prefix`](#cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
+* [`cas_login_url`](#cas_login_url)
+* [`cas_root_proxied_as`](#cas_root_proxied_as)
+* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
+* [`cas_sso_enabled`](#cas_sso_enabled)
+* [`cas_validate_saml`](#cas_validate_saml)
+* [`cas_validate_url`](#cas_validate_url)
+* [`cas_cookie_path`](#cas_cookie_path)
+* [`comment`](#comment)
+* [`default_vhost`](#default_vhost)
+* [`directoryindex`](#directoryindex)
+* [`docroot`](#docroot)
+* [`docroot_group`](#docroot_group)
+* [`docroot_owner`](#docroot_owner)
+* [`docroot_mode`](#docroot_mode)
+* [`manage_docroot`](#manage_docroot)
+* [`error_log`](#error_log)
+* [`error_log_file`](#error_log_file)
+* [`error_log_pipe`](#error_log_pipe)
+* [`error_log_syslog`](#error_log_syslog)
+* [`error_log_format`](#error_log_format)
+* [`error_documents`](#error_documents)
+* [`ensure`](#ensure)
+* [`fallbackresource`](#fallbackresource)
+* [`filters`](#filters)
+* [`h2_copy_files`](#h2_copy_files)
+* [`h2_direct`](#h2_direct)
+* [`h2_early_hints`](#h2_early_hints)
+* [`h2_max_session_streams`](#h2_max_session_streams)
+* [`h2_modern_tls_only`](#h2_modern_tls_only)
+* [`h2_push`](#h2_push)
+* [`h2_push_diary_size`](#h2_push_diary_size)
+* [`h2_push_priority`](#h2_push_priority)
+* [`h2_push_resource`](#h2_push_resource)
+* [`h2_serialize_headers`](#h2_serialize_headers)
+* [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
+* [`h2_tls_cool_down_secs`](#h2_tls_cool_down_secs)
+* [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
+* [`h2_upgrade`](#h2_upgrade)
+* [`h2_window_size`](#h2_window_size)
+* [`ip`](#ip)
+* [`ip_based`](#ip_based)
+* [`itk`](#itk)
+* [`action`](#action)
+* [`jk_mounts`](#jk_mounts)
+* [`http_protocol_options`](#http_protocol_options)
+* [`keepalive`](#keepalive)
+* [`keepalive_timeout`](#keepalive_timeout)
+* [`max_keepalive_requests`](#max_keepalive_requests)
+* [`auth_kerb`](#auth_kerb)
+* [`krb_method_negotiate`](#krb_method_negotiate)
+* [`krb_method_k5passwd`](#krb_method_k5passwd)
+* [`krb_authoritative`](#krb_authoritative)
+* [`krb_auth_realms`](#krb_auth_realms)
+* [`krb_5keytab`](#krb_5keytab)
+* [`krb_local_user_mapping`](#krb_local_user_mapping)
+* [`krb_verify_kdc`](#krb_verify_kdc)
+* [`krb_servicename`](#krb_servicename)
+* [`krb_save_credentials`](#krb_save_credentials)
+* [`logroot`](#logroot)
+* [`logroot_ensure`](#logroot_ensure)
+* [`logroot_mode`](#logroot_mode)
+* [`logroot_owner`](#logroot_owner)
+* [`logroot_group`](#logroot_group)
+* [`log_level`](#log_level)
+* [`modsec_body_limit`](#modsec_body_limit)
+* [`modsec_disable_vhost`](#modsec_disable_vhost)
+* [`modsec_disable_ids`](#modsec_disable_ids)
+* [`modsec_disable_ips`](#modsec_disable_ips)
+* [`modsec_disable_msgs`](#modsec_disable_msgs)
+* [`modsec_disable_tags`](#modsec_disable_tags)
+* [`modsec_audit_log_file`](#modsec_audit_log_file)
+* [`modsec_audit_log_pipe`](#modsec_audit_log_pipe)
+* [`modsec_audit_log`](#modsec_audit_log)
+* [`modsec_inbound_anomaly_threshold`](#modsec_inbound_anomaly_threshold)
+* [`modsec_outbound_anomaly_threshold`](#modsec_outbound_anomaly_threshold)
+* [`modsec_allowed_methods`](#modsec_allowed_methods)
+* [`no_proxy_uris`](#no_proxy_uris)
+* [`no_proxy_uris_match`](#no_proxy_uris_match)
+* [`proxy_preserve_host`](#proxy_preserve_host)
+* [`proxy_add_headers`](#proxy_add_headers)
+* [`proxy_error_override`](#proxy_error_override)
+* [`options`](#options)
+* [`override`](#override)
+* [`passenger_enabled`](#passenger_enabled)
+* [`passenger_base_uri`](#passenger_base_uri)
+* [`passenger_ruby`](#passenger_ruby)
+* [`passenger_python`](#passenger_python)
+* [`passenger_nodejs`](#passenger_nodejs)
+* [`passenger_meteor_app_settings`](#passenger_meteor_app_settings)
+* [`passenger_app_env`](#passenger_app_env)
+* [`passenger_app_root`](#passenger_app_root)
+* [`passenger_app_group_name`](#passenger_app_group_name)
+* [`passenger_app_start_command`](#passenger_app_start_command)
+* [`passenger_app_type`](#passenger_app_type)
+* [`passenger_startup_file`](#passenger_startup_file)
+* [`passenger_restart_dir`](#passenger_restart_dir)
+* [`passenger_spawn_method`](#passenger_spawn_method)
+* [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
+* [`passenger_preload_bundler`](#passenger_preload_bundler)
+* [`passenger_rolling_restarts`](#passenger_rolling_restarts)
+* [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
+* [`passenger_user`](#passenger_user)
+* [`passenger_group`](#passenger_group)
+* [`passenger_friendly_error_pages`](#passenger_friendly_error_pages)
+* [`passenger_min_instances`](#passenger_min_instances)
+* [`passenger_max_instances`](#passenger_max_instances)
+* [`passenger_max_preloader_idle_time`](#passenger_max_preloader_idle_time)
+* [`passenger_force_max_concurrent_requests_per_process`](#passenger_force_max_concurrent_requests_per_process)
+* [`passenger_start_timeout`](#passenger_start_timeout)
+* [`passenger_concurrency_model`](#passenger_concurrency_model)
+* [`passenger_thread_count`](#passenger_thread_count)
+* [`passenger_max_requests`](#passenger_max_requests)
+* [`passenger_max_request_time`](#passenger_max_request_time)
+* [`passenger_memory_limit`](#passenger_memory_limit)
+* [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
+* [`passenger_pre_start`](#passenger_pre_start)
+* [`passenger_high_performance`](#passenger_high_performance)
+* [`passenger_buffer_upload`](#passenger_buffer_upload)
+* [`passenger_buffer_response`](#passenger_buffer_response)
+* [`passenger_error_override`](#passenger_error_override)
+* [`passenger_max_request_queue_size`](#passenger_max_request_queue_size)
+* [`passenger_max_request_queue_time`](#passenger_max_request_queue_time)
+* [`passenger_sticky_sessions`](#passenger_sticky_sessions)
+* [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
+* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
+* [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
+* [`passenger_app_log_file`](#passenger_app_log_file)
+* [`passenger_debugger`](#passenger_debugger)
+* [`passenger_lve_min_uid`](#passenger_lve_min_uid)
+* [`php_values`](#php_values)
+* [`php_flags`](#php_flags)
+* [`php_admin_values`](#php_admin_values)
+* [`php_admin_flags`](#php_admin_flags)
+* [`port`](#port)
+* [`priority`](#priority)
+* [`protocols`](#protocols)
+* [`protocols_honor_order`](#protocols_honor_order)
+* [`proxy_dest`](#proxy_dest)
+* [`proxy_pass`](#proxy_pass)
+* [`proxy_dest_match`](#proxy_dest_match)
+* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
+* [`proxy_pass_match`](#proxy_pass_match)
+* [`redirect_dest`](#redirect_dest)
+* [`redirect_source`](#redirect_source)
+* [`redirect_status`](#redirect_status)
+* [`redirectmatch_regexp`](#redirectmatch_regexp)
+* [`redirectmatch_status`](#redirectmatch_status)
+* [`redirectmatch_dest`](#redirectmatch_dest)
+* [`request_headers`](#request_headers)
+* [`rewrites`](#rewrites)
+* [`rewrite_base`](#rewrite_base)
+* [`rewrite_rule`](#rewrite_rule)
+* [`rewrite_cond`](#rewrite_cond)
+* [`rewrite_inherit`](#rewrite_inherit)
+* [`scriptalias`](#scriptalias)
+* [`scriptaliases`](#scriptaliases)
+* [`serveradmin`](#serveradmin)
+* [`serveraliases`](#serveraliases)
+* [`servername`](#servername)
+* [`setenv`](#setenv)
+* [`setenvif`](#setenvif)
+* [`setenvifnocase`](#setenvifnocase)
+* [`suexec_user_group`](#suexec_user_group)
+* [`vhost_name`](#vhost_name)
+* [`virtual_docroot`](#virtual_docroot)
+* [`virtual_use_default_docroot`](#virtual_use_default_docroot)
+* [`wsgi_daemon_process`](#wsgi_daemon_process)
+* [`wsgi_daemon_process_options`](#wsgi_daemon_process_options)
+* [`wsgi_application_group`](#wsgi_application_group)
+* [`wsgi_import_script`](#wsgi_import_script)
+* [`wsgi_import_script_options`](#wsgi_import_script_options)
+* [`wsgi_chunked_request`](#wsgi_chunked_request)
+* [`wsgi_process_group`](#wsgi_process_group)
+* [`wsgi_script_aliases`](#wsgi_script_aliases)
+* [`wsgi_script_aliases_match`](#wsgi_script_aliases_match)
+* [`wsgi_pass_authorization`](#wsgi_pass_authorization)
+* [`directories`](#directories)
+* [`custom_fragment`](#custom_fragment)
+* [`headers`](#headers)
+* [`shib_compat_valid_user`](#shib_compat_valid_user)
+* [`ssl_options`](#ssl_options)
+* [`additional_includes`](#additional_includes)
+* [`gssapi`](#gssapi)
+* [`authz_core`](#authz_core)
+* [`ssl`](#ssl)
+* [`ssl_ca`](#ssl_ca)
+* [`ssl_cert`](#ssl_cert)
+* [`ssl_protocol`](#ssl_protocol)
+* [`ssl_cipher`](#ssl_cipher)
+* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
+* [`ssl_certs_dir`](#ssl_certs_dir)
+* [`ssl_chain`](#ssl_chain)
+* [`ssl_crl`](#ssl_crl)
+* [`ssl_crl_path`](#ssl_crl_path)
+* [`ssl_crl_check`](#ssl_crl_check)
+* [`ssl_key`](#ssl_key)
+* [`ssl_verify_client`](#ssl_verify_client)
+* [`ssl_verify_depth`](#ssl_verify_depth)
+* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
+* [`ssl_proxy_verify`](#ssl_proxy_verify)
+* [`ssl_proxy_verify_depth`](#ssl_proxy_verify_depth)
+* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
+* [`ssl_proxy_ca_cert`](#ssl_proxy_ca_cert)
+* [`ssl_proxy_machine_cert`](#ssl_proxy_machine_cert)
+* [`ssl_proxy_machine_cert_chain`](#ssl_proxy_machine_cert_chain)
+* [`ssl_proxy_check_peer_cn`](#ssl_proxy_check_peer_cn)
+* [`ssl_proxy_check_peer_name`](#ssl_proxy_check_peer_name)
+* [`ssl_proxy_check_peer_expire`](#ssl_proxy_check_peer_expire)
+* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
+* [`ssl_proxyengine`](#ssl_proxyengine)
+* [`ssl_stapling`](#ssl_stapling)
+* [`ssl_stapling_timeout`](#ssl_stapling_timeout)
+* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
+* [`ssl_user_name`](#ssl_user_name)
+* [`ssl_reload_on_change`](#ssl_reload_on_change)
+* [`use_canonical_name`](#use_canonical_name)
+* [`define`](#define)
+* [`auth_oidc`](#auth_oidc)
+* [`oidc_settings`](#oidc_settings)
+* [`limitreqfields`](#limitreqfields)
+* [`limitreqfieldsize`](#limitreqfieldsize)
+* [`limitreqline`](#limitreqline)
+* [`limitreqbody`](#limitreqbody)
+* [`use_servername_for_filenames`](#use_servername_for_filenames)
+* [`use_port_for_filenames`](#use_port_for_filenames)
+* [`mdomain`](#mdomain)
+* [`proxy_requests`](#proxy_requests)
+* [`userdir`](#userdir)
+
+##### <a name="access_log"></a>`access_log`
 
 Data type: `Boolean`
 
 Determines whether to configure `*_access.log` directives (`*_file`, `*_pipe`, or `*_syslog`).
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--vhost--access_log_env_var"></a>`access_log_env_var`
+##### <a name="access_log_env_var"></a>`access_log_env_var`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
 Specifies that only requests with particular environment variables be logged.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--access_log_file"></a>`access_log_file`
+##### <a name="access_log_file"></a>`access_log_file`
 
 Data type: `Optional[String[1]]`
 
@@ -7907,52 +7940,52 @@ instance, example.com--- it defaults to 'example.com_ssl.log' for
 [SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
 `example.com_access.log` for unencrypted virtual hosts.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--access_log_format"></a>`access_log_format`
+##### <a name="access_log_format"></a>`access_log_format`
 
 Data type: `Optional[String[1]]`
 
 Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the
 access log.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--access_log_pipe"></a>`access_log_pipe`
+##### <a name="access_log_pipe"></a>`access_log_pipe`
 
 Data type: `Optional[String[1]]`
 
 Specifies a pipe where Apache sends access log messages.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--access_log_syslog"></a>`access_log_syslog`
+##### <a name="access_log_syslog"></a>`access_log_syslog`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
 Sends all access log messages to syslog.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--access_logs"></a>`access_logs`
+##### <a name="access_logs"></a>`access_logs`
 
 Data type: `Optional[Array[Hash]]`
 
 Allows you to give a hash that specifies the state of each of the `access_log_*`
 directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--add_default_charset"></a>`add_default_charset`
+##### <a name="add_default_charset"></a>`add_default_charset`
 
 Data type: `Optional[String]`
 
 Sets a default media charset value for the `AddDefaultCharset` directive, which is
 added to `text/plain` and `text/html` responses.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--add_listen"></a>`add_listen`
+##### <a name="add_listen"></a>`add_listen`
 
 Data type: `Boolean`
 
@@ -7961,9 +7994,9 @@ Setting `add_listen` to `false` prevents the virtual host from creating a `Liste
 statement. This is important when combining virtual hosts that aren't passed an `ip`
 parameter with those that are.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--vhost--use_optional_includes"></a>`use_optional_includes`
+##### <a name="use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Boolean`
 
@@ -7972,7 +8005,7 @@ Specifies whether Apache uses the `IncludeOptional` directive instead of `Includ
 
 Default value: `$apache::use_optional_includes`
 
-##### <a name="-apache--vhost--aliases"></a>`aliases`
+##### <a name="aliases"></a>`aliases`
 
 Data type: `Array[Hash[String[1], String[1]]]`
 
@@ -8015,18 +8048,18 @@ directive might not be able to honor the `PassengerEnabled => off` statement. Se
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--allow_encoded_slashes"></a>`allow_encoded_slashes`
+##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
 
-Data type: `Optional[Enum['on', 'off', 'nodecode']]`
+Data type: `Optional[Variant[Apache::OnOff, Enum['nodecode']]]`
 
 Sets the `AllowEncodedSlashes` declaration for the virtual host, overriding the server
 default. This modifies the virtual host responses to URLs with `\` and `/` characters. The
 default setting omits the declaration from the server configuration and selects the
 Apache default setting of `Off`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--block"></a>`block`
+##### <a name="block"></a>`block`
 
 Data type: `Variant[Array[String], String]`
 
@@ -8035,83 +8068,83 @@ blocks web access to `.svn`), `.git`, and `.bzr` directories.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--cas_attribute_prefix"></a>`cas_attribute_prefix`
+##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Optional[String]`
 
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--cas_attribute_delimiter"></a>`cas_attribute_delimiter`
+##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Optional[String]`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--cas_login_url"></a>`cas_login_url`
+##### <a name="cas_login_url"></a>`cas_login_url`
 
 Data type: `Optional[String]`
 
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--cas_root_proxied_as"></a>`cas_root_proxied_as`
+##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
 
 Data type: `Optional[String]`
 
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--cas_scrub_request_headers"></a>`cas_scrub_request_headers`
+##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
 Data type: `Boolean`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--cas_sso_enabled"></a>`cas_sso_enabled`
+##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Boolean`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--cas_validate_saml"></a>`cas_validate_saml`
+##### <a name="cas_validate_saml"></a>`cas_validate_saml`
 
 Data type: `Boolean`
 
 Parse response from CAS server for SAML.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--cas_validate_url"></a>`cas_validate_url`
+##### <a name="cas_validate_url"></a>`cas_validate_url`
 
 Data type: `Optional[String]`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--cas_cookie_path"></a>`cas_cookie_path`
+##### <a name="cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `Optional[String]`
 
 Sets the location where information on the current session should be stored. This should
 be writable by the web server only.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--comment"></a>`comment`
+##### <a name="comment"></a>`comment`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
@@ -8128,18 +8161,18 @@ comment => [
 ]
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--default_vhost"></a>`default_vhost`
+##### <a name="default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
 
 Sets a given `apache::vhost` defined type as the default to serve requests that do not
 match any other `apache::vhost` defined types.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--directoryindex"></a>`directoryindex`
+##### <a name="directoryindex"></a>`directoryindex`
 
 Data type: `Optional[String]`
 
@@ -8147,9 +8180,9 @@ Sets the list of resources to look for when a client requests an index of the di
 by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive
 documentation for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--docroot"></a>`docroot`
+##### <a name="docroot"></a>`docroot`
 
 Data type: `Variant[Stdlib::Absolutepath, Boolean]`
 
@@ -8158,7 +8191,7 @@ Sets the `DocumentRoot` location, from which Apache serves files.<br />
 If `docroot` and `manage_docroot` are both set to `false`, no `DocumentRoot` will be set
 and the accompanying `<Directory /path/to/directory>` block will not be created.
 
-##### <a name="-apache--vhost--docroot_group"></a>`docroot_group`
+##### <a name="docroot_group"></a>`docroot_group`
 
 Data type: `String`
 
@@ -8166,7 +8199,7 @@ Sets group access to the `docroot` directory.
 
 Default value: `$apache::params::root_group`
 
-##### <a name="-apache--vhost--docroot_owner"></a>`docroot_owner`
+##### <a name="docroot_owner"></a>`docroot_owner`
 
 Data type: `String`
 
@@ -8174,31 +8207,31 @@ Sets individual user access to the `docroot` directory.
 
 Default value: `'root'`
 
-##### <a name="-apache--vhost--docroot_mode"></a>`docroot_mode`
+##### <a name="docroot_mode"></a>`docroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
 Sets access permissions for the `docroot` directory, in numeric notation.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--manage_docroot"></a>`manage_docroot`
+##### <a name="manage_docroot"></a>`manage_docroot`
 
 Data type: `Boolean`
 
 Determines whether Puppet manages the `docroot` directory.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--vhost--error_log"></a>`error_log`
+##### <a name="error_log"></a>`error_log`
 
 Data type: `Boolean`
 
 Specifies whether `*_error.log` directives should be configured.
 
-Default value: `true`
+Default value: ``true``
 
-##### <a name="-apache--vhost--error_log_file"></a>`error_log_file`
+##### <a name="error_log_file"></a>`error_log_file`
 
 Data type: `Optional[String]`
 
@@ -8208,9 +8241,9 @@ If none of these parameters is set, given a virtual host `example.com`, Puppet d
 to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and
 `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--error_log_pipe"></a>`error_log_pipe`
+##### <a name="error_log_pipe"></a>`error_log_pipe`
 
 Data type: `Optional[String]`
 
@@ -8218,9 +8251,9 @@ Specifies a pipe to send error log messages to.<br />
 This parameter has no effect if the `error_log_file` parameter has a value. If neither
 this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--error_log_syslog"></a>`error_log_syslog`
+##### <a name="error_log_syslog"></a>`error_log_syslog`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -8230,22 +8263,18 @@ parameters has a value. If none of these parameters has a value, given a virtual
 `example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual
 hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--error_log_format"></a>`error_log_format`
+##### <a name="error_log_format"></a>`error_log_format`
 
-Data type:
-
-```puppet
-Optional[
+Data type: `Optional[
     Array[
       Variant[
         String,
         Hash[String, Enum['connection', 'request']]
       ]
     ]
-  ]
-```
+  ]`
 
 Sets the [ErrorLogFormat](https://httpd.apache.org/docs/current/mod/core.html#errorlogformat)
 format specification for error log entries inside virtual host
@@ -8263,9 +8292,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--error_documents"></a>`error_documents`
+##### <a name="error_documents"></a>`error_documents`
 
 Data type: `Variant[Array[Hash], String]`
 
@@ -8284,7 +8313,7 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--ensure"></a>`ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Enum['absent', 'present']`
 
@@ -8292,7 +8321,7 @@ Specifies if the virtual host is present or absent.<br />
 
 Default value: `'present'`
 
-##### <a name="-apache--vhost--fallbackresource"></a>`fallbackresource`
+##### <a name="fallbackresource"></a>`fallbackresource`
 
 Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
 
@@ -8301,9 +8330,9 @@ directive, which specifies an action to take for any URL that doesn't map to any
 your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin
 with a `/` or be `disabled`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--filters"></a>`filters`
+##### <a name="filters"></a>`filters`
 
 Data type: `Array[String[1]]`
 
@@ -8322,25 +8351,25 @@ apache::vhost { "$::fqdn":
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--h2_copy_files"></a>`h2_copy_files`
+##### <a name="h2_copy_files"></a>`h2_copy_files`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
 directive which influences how the requestion process pass files to the main connection.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_direct"></a>`h2_direct`
+##### <a name="h2_direct"></a>`h2_direct`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
 directive which toggles the usage of the HTTP/2 Direct Mode.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_early_hints"></a>`h2_early_hints`
+##### <a name="h2_early_hints"></a>`h2_early_hints`
 
 Data type: `Optional[Boolean]`
 
@@ -8348,9 +8377,9 @@ Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html
 directive which controls if HTTP status 103 interim responses are forwarded to
 the client or not.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_max_session_streams"></a>`h2_max_session_streams`
+##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
 
 Data type: `Optional[Integer]`
 
@@ -8358,27 +8387,27 @@ Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_htt
 directive which sets the maximum number of active streams per HTTP/2 session
 that the server allows.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_modern_tls_only"></a>`h2_modern_tls_only`
+##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
 directive which toggles the security checks on HTTP/2 connections in TLS mode.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_push"></a>`h2_push`
+##### <a name="h2_push"></a>`h2_push`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
 directive which toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_push_diary_size"></a>`h2_push_diary_size`
+##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
 
 Data type: `Optional[Integer]`
 
@@ -8386,9 +8415,9 @@ Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.h
 directive which toggles the maximum number of HTTP/2 server pushes that are
 remembered per HTTP/2 connection.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_push_priority"></a>`h2_push_priority`
+##### <a name="h2_push_priority"></a>`h2_push_priority`
 
 Data type: `Array[String]`
 
@@ -8398,7 +8427,7 @@ content-type of the response.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--h2_push_resource"></a>`h2_push_resource`
+##### <a name="h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
 
@@ -8407,7 +8436,7 @@ directive which declares resources for early pushing to the client.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--h2_serialize_headers"></a>`h2_serialize_headers`
+##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
 
 Data type: `Optional[Boolean]`
 
@@ -8415,9 +8444,9 @@ Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http
 directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
 format for processing by httpd core.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
+##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
 Data type: `Optional[Integer]`
 
@@ -8425,9 +8454,9 @@ Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http
 directive which sets the maximum number of outgoing data bytes buffered in
 memory for an active stream.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
+##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
 Data type: `Optional[Integer]`
 
@@ -8435,9 +8464,9 @@ Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2
 directive which sets the number of seconds of idle time on a TLS connection
 before the TLS write size falls back to a small (~1300 bytes) length.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
+##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
 Data type: `Optional[Integer]`
 
@@ -8445,9 +8474,9 @@ Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.h
 directive which sets the number of bytes to be sent in small TLS records (~1300
 bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_upgrade"></a>`h2_upgrade`
+##### <a name="h2_upgrade"></a>`h2_upgrade`
 
 Data type: `Optional[Boolean]`
 
@@ -8455,9 +8484,9 @@ Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2
 directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
 to HTTP/2.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--h2_window_size"></a>`h2_window_size`
+##### <a name="h2_window_size"></a>`h2_window_size`
 
 Data type: `Optional[Integer]`
 
@@ -8465,27 +8494,23 @@ Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html
 directive which sets the size of the window that is used for flow control from
 client to server and limits the amount of data the server has to buffer.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ip"></a>`ip`
+##### <a name="ip"></a>`ip`
 
-Data type:
-
-```puppet
-Optional[
+Data type: `Optional[
     Variant[
       Array[Variant[Stdlib::IP::Address, Enum['*']]],
       Variant[Stdlib::IP::Address, Enum['*']]
     ]
-  ]
-```
+  ]`
 
 Sets the IP address the virtual host listens on. By default, uses Apache's default behavior
 of listening on all IPs.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ip_based"></a>`ip_based`
+##### <a name="ip_based"></a>`ip_based`
 
 Data type: `Boolean`
 
@@ -8493,9 +8518,9 @@ Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html
 host. This parameter inhibits the creation of a NameVirtualHost directive, since those are
 used to funnel requests to name-based virtual hosts.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--itk"></a>`itk`
+##### <a name="itk"></a>`itk`
 
 Data type: `Optional[Hash]`
 
@@ -8519,18 +8544,18 @@ Valid values are: a hash, which can include the keys:
 * `limituidrange` (Linux 3.5.0 or newer)
 * `limitgidrange` (Linux 3.5.0 or newer)
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--action"></a>`action`
+##### <a name="action"></a>`action`
 
 Data type: `Optional[String]`
 
 Specifies whether you wish to configure mod_actions action directive which will
 activate cgi-script when triggered by a request.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--jk_mounts"></a>`jk_mounts`
+##### <a name="jk_mounts"></a>`jk_mounts`
 
 Data type: `Array[Hash]`
 
@@ -8550,26 +8575,26 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--http_protocol_options"></a>`http_protocol_options`
+##### <a name="http_protocol_options"></a>`http_protocol_options`
 
 Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
 
 Specifies the strictness of HTTP protocol checks.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--keepalive"></a>`keepalive`
+##### <a name="keepalive"></a>`keepalive`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Determines whether to enable persistent HTTP connections with the `KeepAlive` directive
 for the virtual host. By default, the global, server-wide `KeepAlive` setting is in effect.<br />
 Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options
 for the virtual host.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--keepalive_timeout"></a>`keepalive_timeout`
+##### <a name="keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Optional[Variant[Integer, String]]`
 
@@ -8579,9 +8604,9 @@ global, server-wide `KeepAlive` setting is in effect.<br />
 This parameter is only relevant if either the global, server-wide `keepalive` parameter or
 the per-vhost `keepalive` parameter is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--max_keepalive_requests"></a>`max_keepalive_requests`
+##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
 
 Data type: `Optional[Variant[Integer, String]]`
 
@@ -8590,9 +8615,9 @@ the global, server-wide `KeepAlive` setting is in effect.<br />
 This parameter is only relevant if either the global, server-wide `keepalive` parameter or
 the per-vhost `keepalive` parameter is enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--auth_kerb"></a>`auth_kerb`
+##### <a name="auth_kerb"></a>`auth_kerb`
 
 Data type: `Boolean`
 
@@ -8615,33 +8640,33 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--krb_method_negotiate"></a>`krb_method_negotiate`
+##### <a name="krb_method_negotiate"></a>`krb_method_negotiate`
 
-Data type: `Enum['on', 'off']`
+Data type: `Apache::OnOff`
 
 Determines whether to use the Negotiate method.
 
 Default value: `'on'`
 
-##### <a name="-apache--vhost--krb_method_k5passwd"></a>`krb_method_k5passwd`
+##### <a name="krb_method_k5passwd"></a>`krb_method_k5passwd`
 
-Data type: `Enum['on', 'off']`
+Data type: `Apache::OnOff`
 
 Determines whether to use password-based authentication for Kerberos v5.
 
 Default value: `'on'`
 
-##### <a name="-apache--vhost--krb_authoritative"></a>`krb_authoritative`
+##### <a name="krb_authoritative"></a>`krb_authoritative`
 
-Data type: `Enum['on', 'off']`
+Data type: `Apache::OnOff`
 
 If set to `off`, authentication controls can be passed on to another module.
 
 Default value: `'on'`
 
-##### <a name="-apache--vhost--krb_auth_realms"></a>`krb_auth_realms`
+##### <a name="krb_auth_realms"></a>`krb_auth_realms`
 
 Data type: `Array[String]`
 
@@ -8649,32 +8674,32 @@ Specifies an array of Kerberos realms to use for authentication.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--krb_5keytab"></a>`krb_5keytab`
+##### <a name="krb_5keytab"></a>`krb_5keytab`
 
 Data type: `Optional[String]`
 
 Specifies the Kerberos v5 keytab file's location.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--krb_local_user_mapping"></a>`krb_local_user_mapping`
+##### <a name="krb_local_user_mapping"></a>`krb_local_user_mapping`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Strips @REALM from usernames for further use.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--krb_verify_kdc"></a>`krb_verify_kdc`
+##### <a name="krb_verify_kdc"></a>`krb_verify_kdc`
 
-Data type: `Enum['on', 'off']`
+Data type: `Apache::OnOff`
 
 This option can be used to disable the verification tickets against local keytab to prevent
 KDC spoofing attacks.
 
 Default value: `'on'`
 
-##### <a name="-apache--vhost--krb_servicename"></a>`krb_servicename`
+##### <a name="krb_servicename"></a>`krb_servicename`
 
 Data type: `String`
 
@@ -8683,15 +8708,15 @@ key of this name must be stored in the keytab.
 
 Default value: `'HTTP'`
 
-##### <a name="-apache--vhost--krb_save_credentials"></a>`krb_save_credentials`
+##### <a name="krb_save_credentials"></a>`krb_save_credentials`
 
-Data type: `Enum['on', 'off']`
+Data type: `Apache::OnOff`
 
 This option enables credential saving functionality.
 
 Default value: `'off'`
 
-##### <a name="-apache--vhost--logroot"></a>`logroot`
+##### <a name="logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -8699,7 +8724,7 @@ Specifies the location of the virtual host's logfiles.
 
 Default value: `$apache::logroot`
 
-##### <a name="-apache--vhost--logroot_ensure"></a>`logroot_ensure`
+##### <a name="logroot_ensure"></a>`logroot_ensure`
 
 Data type: `Enum['directory', 'absent']`
 
@@ -8707,7 +8732,7 @@ Determines whether or not to remove the logroot directory for a virtual host.
 
 Default value: `'directory'`
 
-##### <a name="-apache--vhost--logroot_mode"></a>`logroot_mode`
+##### <a name="logroot_mode"></a>`logroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
@@ -8715,49 +8740,49 @@ Overrides the mode the logroot directory is set to. Do *not* grant write access
 directory the logs are stored in without being aware of the consequences; for more
 information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--logroot_owner"></a>`logroot_owner`
+##### <a name="logroot_owner"></a>`logroot_owner`
 
 Data type: `Optional[String]`
 
 Sets individual user access to the logroot directory.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--logroot_group"></a>`logroot_group`
+##### <a name="logroot_group"></a>`logroot_group`
 
 Data type: `Optional[String]`
 
 Sets group access to the `logroot` directory.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--log_level"></a>`log_level`
+##### <a name="log_level"></a>`log_level`
 
 Data type: `Optional[Apache::LogLevel]`
 
 Specifies the verbosity of the error log.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_body_limit"></a>`modsec_body_limit`
+##### <a name="modsec_body_limit"></a>`modsec_body_limit`
 
 Data type: `Optional[String]`
 
 Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_disable_vhost"></a>`modsec_disable_vhost`
+##### <a name="modsec_disable_vhost"></a>`modsec_disable_vhost`
 
 Data type: `Boolean`
 
 Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--modsec_disable_ids"></a>`modsec_disable_ids`
+##### <a name="modsec_disable_ids"></a>`modsec_disable_ids`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8775,9 +8800,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_disable_ips"></a>`modsec_disable_ips`
+##### <a name="modsec_disable_ips"></a>`modsec_disable_ips`
 
 Data type: `Array[String[1]]`
 
@@ -8785,7 +8810,7 @@ Specifies an array of IP addresses to exclude from `mod_security` rule matching.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--modsec_disable_msgs"></a>`modsec_disable_msgs`
+##### <a name="modsec_disable_msgs"></a>`modsec_disable_msgs`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8802,9 +8827,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_disable_tags"></a>`modsec_disable_tags`
+##### <a name="modsec_disable_tags"></a>`modsec_disable_tags`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8821,9 +8846,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_audit_log_file"></a>`modsec_audit_log_file`
+##### <a name="modsec_audit_log_file"></a>`modsec_audit_log_file`
 
 Data type: `Optional[String]`
 
@@ -8833,9 +8858,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
+##### <a name="modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
 
 Data type: `Optional[String]`
 
@@ -8846,9 +8871,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_audit_log"></a>`modsec_audit_log`
+##### <a name="modsec_audit_log"></a>`modsec_audit_log`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -8860,9 +8885,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_inbound_anomaly_threshold"></a>`modsec_inbound_anomaly_threshold`
+##### <a name="modsec_inbound_anomaly_threshold"></a>`modsec_inbound_anomaly_threshold`
 
 Data type: `Optional[Integer[1, default]]`
 
@@ -8870,9 +8895,9 @@ Override the global scoring threshold level of the inbound blocking rules
 for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
 Set.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_outbound_anomaly_threshold"></a>`modsec_outbound_anomaly_threshold`
+##### <a name="modsec_outbound_anomaly_threshold"></a>`modsec_outbound_anomaly_threshold`
 
 Data type: `Optional[Integer[1, default]]`
 
@@ -8880,17 +8905,17 @@ Override the global scoring threshold level of the outbound blocking rules
 for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
 Set.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--modsec_allowed_methods"></a>`modsec_allowed_methods`
+##### <a name="modsec_allowed_methods"></a>`modsec_allowed_methods`
 
 Data type: `Optional[String]`
 
 Override global allowed methods. A space-separated list of allowed HTTP methods.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Variant[Array[String], String]`
 
@@ -8899,7 +8924,7 @@ with [`proxy_dest`](#proxy_dest).
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Variant[Array[String], String]`
 
@@ -8907,7 +8932,7 @@ This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--proxy_preserve_host"></a>`proxy_preserve_host`
+##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
 
 Data type: `Boolean`
 
@@ -8915,9 +8940,9 @@ Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod
 Setting this parameter to `true` enables the `Host:` line from an incoming request to be
 proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--proxy_add_headers"></a>`proxy_add_headers`
+##### <a name="proxy_add_headers"></a>`proxy_add_headers`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -8925,18 +8950,18 @@ Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/m
 This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For,
 X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy_error_override"></a>`proxy_error_override`
+##### <a name="proxy_error_override"></a>`proxy_error_override`
 
 Data type: `Boolean`
 
 Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride).
 This directive controls whether Apache should override error pages for proxied content.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--options"></a>`options`
+##### <a name="options"></a>`options`
 
 Data type: `Array[String]`
 
@@ -8952,7 +8977,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `['Indexes', 'FollowSymLinks', 'MultiViews']`
 
-##### <a name="-apache--vhost--override"></a>`override`
+##### <a name="override"></a>`override`
 
 Data type: `Array[String]`
 
@@ -8961,7 +8986,7 @@ Sets the overrides for the specified virtual host. Accepts an array of
 
 Default value: `['None']`
 
-##### <a name="-apache--vhost--passenger_enabled"></a>`passenger_enabled`
+##### <a name="passenger_enabled"></a>`passenger_enabled`
 
 Data type: `Optional[Boolean]`
 
@@ -8980,45 +9005,45 @@ apache::vhost { 'sample.example.net':
 > **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)
 using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_base_uri"></a>`passenger_base_uri`
+##### <a name="passenger_base_uri"></a>`passenger_base_uri`
 
 Data type: `Optional[String]`
 
 Sets [PassengerBaseURI](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbase_rui),
  to specify that the given URI is a distinct application served by Passenger.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_ruby"></a>`passenger_ruby`
+##### <a name="passenger_ruby"></a>`passenger_ruby`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerRuby](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerruby),
 specifying the Ruby interpreter to use when serving the relevant web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_python"></a>`passenger_python`
+##### <a name="passenger_python"></a>`passenger_python`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerPython](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpython),
 specifying the Python interpreter to use when serving the relevant web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_nodejs"></a>`passenger_nodejs`
+##### <a name="passenger_nodejs"></a>`passenger_nodejs`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengernodejs),
 specifying Node.js command to use when serving the relevant web applications.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
+##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
 Data type: `Optional[String]`
 
@@ -9026,9 +9051,9 @@ Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/docs/referenc
 specifying a JSON file with settings for the application when using a Meteor
 application in non-bundled mode.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_app_env"></a>`passenger_app_env`
+##### <a name="passenger_app_env"></a>`passenger_app_env`
 
 Data type: `Optional[String]`
 
@@ -9036,126 +9061,126 @@ Sets [PassengerAppEnv](https://www.phusionpassenger.com/docs/references/config_r
 the environment for the Passenger application. If not specified, defaults to the global
 setting or 'production'.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_app_root"></a>`passenger_app_root`
+##### <a name="passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerRoot](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapproot),
 the location of the Passenger application root if different from the DocumentRoot.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_app_group_name"></a>`passenger_app_group_name`
+##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppGroupName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappgroupname),
  the name of the application group that the current application should belong to.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_app_start_command"></a>`passenger_app_start_command`
+##### <a name="passenger_app_start_command"></a>`passenger_app_start_command`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppStartCommand](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappstartcommand),
  how Passenger should start your app on a specific port.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_app_type"></a>`passenger_app_type`
+##### <a name="passenger_app_type"></a>`passenger_app_type`
 
 Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
 Sets [PassengerAppType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapptype),
  to force Passenger to recognize the application as a specific type.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_startup_file"></a>`passenger_startup_file`
+##### <a name="passenger_startup_file"></a>`passenger_startup_file`
 
 Data type: `Optional[String]`
 
 Sets the [PassengerStartupFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstartupfile),
 path. This path is relative to the application root.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_restart_dir"></a>`passenger_restart_dir`
+##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
 
 Data type: `Optional[String]`
 
 Sets the [PassengerRestartDir](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrestartdir),
  to customize the directory in which `restart.txt` is searched for.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_spawn_method"></a>`passenger_spawn_method`
+##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['direct', 'smart']]`
 
 Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerspawnmethod),
 whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
+##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
 to enable or disable the loading of shell environment variables before spawning the application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_preload_bundler"></a>`passenger_preload_bundler`
+##### <a name="passenger_preload_bundler"></a>`passenger_preload_bundler`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerPreloadBundler](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpreloadbundler),
 to enable or disable the loading of bundler before loading the application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_rolling_restarts"></a>`passenger_rolling_restarts`
+##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
 to enable or disable support for zero-downtime application restarts through `restart.txt`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
+##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerresistdeploymenterrors),
 to enable or disable resistance against deployment errors.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_user"></a>`passenger_user`
+##### <a name="passenger_user"></a>`passenger_user`
 
 Data type: `Optional[String]`
 
 Sets [PassengerUser](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeruser),
 the running user for sandboxing applications.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_group"></a>`passenger_group`
+##### <a name="passenger_group"></a>`passenger_group`
 
 Data type: `Optional[String]`
 
 Sets [PassengerGroup](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengergroup),
 the running group for sandboxing applications.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
+##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
 Data type: `Optional[Boolean]`
 
@@ -9164,54 +9189,54 @@ which can display friendly error pages whenever an application fails to start. T
 friendly error page presents the startup error message, some suggestions for solving
 the problem, a backtrace and a dump of the environment variables.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_min_instances"></a>`passenger_min_instances`
+##### <a name="passenger_min_instances"></a>`passenger_min_instances`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMinInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermininstances),
 the minimum number of application processes to run.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_max_instances"></a>`passenger_max_instances`
+##### <a name="passenger_max_instances"></a>`passenger_max_instances`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxinstances),
 the maximum number of application processes to run.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
+##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxpreloaderidletime),
 the maximum amount of time the preloader waits before shutting down an idle process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
+##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerforcemaxconcurrentrequestsperprocess),
 the maximum amount of concurrent requests the application can handle per process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_start_timeout"></a>`passenger_start_timeout`
+##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerStartTimeout](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstarttimeout),
 the timeout for the application startup.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_concurrency_model"></a>`passenger_concurrency_model`
+##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
 
 Data type: `Optional[Enum['process', 'thread']]`
 
@@ -9221,9 +9246,9 @@ Passenger supports two concurrency models:<br />
 * `process` - single-threaded, multi-processed I/O concurrency.
 * `thread` - multi-threaded, multi-processed I/O concurrency.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_thread_count"></a>`passenger_thread_count`
+##### <a name="passenger_thread_count"></a>`passenger_thread_count`
 
 Data type: `Optional[Integer]`
 
@@ -9231,18 +9256,18 @@ Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/con
 the number of threads that Passenger should spawn per Ruby application process.<br />
 This option only has effect if PassengerConcurrencyModel is `thread`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_max_requests"></a>`passenger_max_requests`
+##### <a name="passenger_max_requests"></a>`passenger_max_requests`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxRequests](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequests),
 the maximum number of requests an application process will process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_max_request_time"></a>`passenger_max_request_time`
+##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
 
 Data type: `Optional[Integer]`
 
@@ -9250,63 +9275,63 @@ Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/docs/references/
 the maximum amount of time, in seconds, that an application process may take to
 process a request.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_memory_limit"></a>`passenger_memory_limit`
+##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermemorylimit),
 the maximum amount of memory that an application process may use, in megabytes.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
+##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstatthrottlerate),
 to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_pre_start"></a>`passenger_pre_start`
+##### <a name="passenger_pre_start"></a>`passenger_pre_start`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
 Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
 the URL of the application if pre-starting is required.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_high_performance"></a>`passenger_high_performance`
+##### <a name="passenger_high_performance"></a>`passenger_high_performance`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerHighPerformance](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerhighperformance),
 to enhance performance in return for reduced compatibility.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_buffer_upload"></a>`passenger_buffer_upload`
+##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerBufferUpload](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferupload),
 to buffer HTTP client request bodies before they are sent to the application.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_buffer_response"></a>`passenger_buffer_response`
+##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerBufferResponse](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferresponse),
 to buffer Happlication-generated responses.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_error_override"></a>`passenger_error_override`
+##### <a name="passenger_error_override"></a>`passenger_error_override`
 
 Data type: `Optional[Boolean]`
 
@@ -9314,9 +9339,9 @@ Sets [PassengerErrorOverride](https://www.phusionpassenger.com/docs/references/c
 to specify whether Apache will intercept and handle response with HTTP status codes of
 400 and higher.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
+##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
 Data type: `Optional[Integer]`
 
@@ -9326,9 +9351,9 @@ concurrent request limit is reached. If the queue is already at this specified l
 Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
 A value of 0 means that the queue size is unbounded.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
+##### <a name="passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
 
 Data type: `Optional[Integer]`
 
@@ -9338,9 +9363,9 @@ whenever the maximum concurrent request limit is reached. If a request reaches t
 limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
 A value of 0 means that the queue time is unbounded.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_sticky_sessions"></a>`passenger_sticky_sessions`
+##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
 Data type: `Optional[Boolean]`
 
@@ -9348,27 +9373,27 @@ Sets [PassengerStickySessions](https://www.phusionpassenger.com/docs/references/
 to specify that, whenever possible, all requests sent by a client will be routed to the same
 originating application process.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
+##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
 Data type: `Optional[String]`
 
 Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookiename),
 to specify the name of the sticky sessions cookie.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
+##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
 Sets [PassengerStickySessionsCookieAttributes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookieattributes),
 the attributes of the sticky sessions cookie.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
+##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
 Data type: `Optional[Boolean]`
 
@@ -9376,27 +9401,27 @@ Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/docs/refere
 to allow URLs with encoded slashes. Please note that this feature will not work properly
 unless Apache's `AllowEncodedSlashes` is also enabled.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_app_log_file"></a>`passenger_app_log_file`
+##### <a name="passenger_app_log_file"></a>`passenger_app_log_file`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppLogFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapplogfile),
 app specific messages logged to a different file in addition to Passenger log file.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_debugger"></a>`passenger_debugger`
+##### <a name="passenger_debugger"></a>`passenger_debugger`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerDebugger](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerdebugger),
 to turn support for Ruby application debugging on or off.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--passenger_lve_min_uid"></a>`passenger_lve_min_uid`
+##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
@@ -9404,9 +9429,9 @@ Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/confi
 to only allow the spawning of application processes with UIDs equal to, or higher than, this
 specified value on LVE-enabled kernels.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--php_values"></a>`php_values`
+##### <a name="php_values"></a>`php_values`
 
 Data type: `Hash`
 
@@ -9419,7 +9444,7 @@ Within a vhost declaration:
 
 Default value: `{}`
 
-##### <a name="-apache--vhost--php_flags"></a>`php_flags`
+##### <a name="php_flags"></a>`php_flags`
 
 Data type: `Hash`
 
@@ -9428,7 +9453,7 @@ These flags or values can be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="-apache--vhost--php_admin_values"></a>`php_admin_values`
+##### <a name="php_admin_values"></a>`php_admin_values`
 
 Data type: `Variant[Array[String], Hash]`
 
@@ -9437,7 +9462,7 @@ These flags or values cannot be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="-apache--vhost--php_admin_flags"></a>`php_admin_flags`
+##### <a name="php_admin_flags"></a>`php_admin_flags`
 
 Data type: `Variant[Array[String], Hash]`
 
@@ -9446,7 +9471,7 @@ These flags or values cannot be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="-apache--vhost--port"></a>`port`
+##### <a name="port"></a>`port`
 
 Data type: `Optional[Variant[Array[Stdlib::Port], Stdlib::Port]]`
 
@@ -9454,9 +9479,9 @@ Sets the port the host is configured on. The module's defaults ensure the host l
 on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only
 listens on the port set in this parameter.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--priority"></a>`priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
@@ -9468,9 +9493,9 @@ used if no other names match.<br />
 aware that the `default_vhost` parameter for `apache::vhost` passes a priority of 15.<br />
 To omit the priority prefix in file names, pass a priority of `false`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--protocols"></a>`protocols`
+##### <a name="protocols"></a>`protocols`
 
 Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
@@ -9479,24 +9504,24 @@ directive, which lists available protocols for the virutal host.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--protocols_honor_order"></a>`protocols_honor_order`
+##### <a name="protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
 Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
 directive which determines wether the order of Protocols sets precedence during negotiation.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy_dest"></a>`proxy_dest`
+##### <a name="proxy_dest"></a>`proxy_dest`
 
 Data type: `Optional[String]`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy_pass"></a>`proxy_pass`
+##### <a name="proxy_pass"></a>`proxy_pass`
 
 Data type: `Optional[Variant[Array[Hash], Hash]]`
 
@@ -9529,9 +9554,9 @@ apache::vhost { 'site.name.fdqn':
 * `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
 * `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy_dest_match"></a>`proxy_dest_match`
+##### <a name="proxy_dest_match"></a>`proxy_dest_match`
 
 Data type: `Optional[String]`
 
@@ -9539,9 +9564,9 @@ This directive is equivalent to `proxy_dest`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
+##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
 Data type: `Optional[String]`
 
@@ -9549,9 +9574,9 @@ Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
 [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy_pass_match"></a>`proxy_pass_match`
+##### <a name="proxy_pass_match"></a>`proxy_pass_match`
 
 Data type: `Optional[Variant[Array[Hash], Hash]]`
 
@@ -9559,17 +9584,17 @@ This directive is equivalent to `proxy_pass`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--redirect_dest"></a>`redirect_dest`
+##### <a name="redirect_dest"></a>`redirect_dest`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies the address to redirect to.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--redirect_source"></a>`redirect_source`
+##### <a name="redirect_source"></a>`redirect_source`
 
 Data type: `Variant[String, Array[String]]`
 
@@ -9586,7 +9611,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `'/'`
 
-##### <a name="-apache--vhost--redirect_status"></a>`redirect_status`
+##### <a name="redirect_status"></a>`redirect_status`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9598,9 +9623,9 @@ Specifies the status to append to the redirect.
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--redirectmatch_regexp"></a>`redirectmatch_regexp`
+##### <a name="redirectmatch_regexp"></a>`redirectmatch_regexp`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9616,9 +9641,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--redirectmatch_status"></a>`redirectmatch_status`
+##### <a name="redirectmatch_status"></a>`redirectmatch_status`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9634,9 +9659,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--redirectmatch_dest"></a>`redirectmatch_dest`
+##### <a name="redirectmatch_dest"></a>`redirectmatch_dest`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9652,9 +9677,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--request_headers"></a>`request_headers`
+##### <a name="request_headers"></a>`request_headers`
 
 Data type: `Array[String[1]]`
 
@@ -9673,7 +9698,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--rewrites"></a>`rewrites`
+##### <a name="rewrites"></a>`rewrites`
 
 Data type: `Array[Hash]`
 
@@ -9750,7 +9775,7 @@ than setting the rewrites in the virtual host's directories.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--rewrite_base"></a>`rewrite_base`
+##### <a name="rewrite_base"></a>`rewrite_base`
 
 Data type: `Optional[String[1]]`
 
@@ -9758,18 +9783,18 @@ The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rew
 specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
 that substitue a relative path.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--rewrite_rule"></a>`rewrite_rule`
+##### <a name="rewrite_rule"></a>`rewrite_rule`
 
 Data type: `Optional[Variant[Array[String[1]], String[1]]]`
 
 The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
 allows the user to define the rules that will be used by the rewrite engine.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--rewrite_cond"></a>`rewrite_cond`
+##### <a name="rewrite_cond"></a>`rewrite_cond`
 
 Data type: `Array[String[1]]`
 
@@ -9779,7 +9804,7 @@ rewrite engine.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--rewrite_inherit"></a>`rewrite_inherit`
+##### <a name="rewrite_inherit"></a>`rewrite_inherit`
 
 Data type: `Boolean`
 
@@ -9807,18 +9832,18 @@ RewriteOptions Inherit
 Refer to the official [`mod_rewrite`](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)
 documentation, section "Rewriting in Virtual Hosts".
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--scriptalias"></a>`scriptalias`
+##### <a name="scriptalias"></a>`scriptalias`
 
 Data type: `Optional[String]`
 
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
 '/usr/scripts'.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--scriptaliases"></a>`scriptaliases`
+##### <a name="scriptaliases"></a>`scriptaliases`
 
 Data type: `Array[Hash]`
 
@@ -9851,15 +9876,15 @@ before more general ones to avoid shadowing.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--serveradmin"></a>`serveradmin`
+##### <a name="serveradmin"></a>`serveradmin`
 
 Data type: `Optional[String]`
 
 Specifies the email address Apache displays when it renders one of its error pages.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--serveraliases"></a>`serveraliases`
+##### <a name="serveraliases"></a>`serveraliases`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9868,7 +9893,7 @@ of the site.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--servername"></a>`servername`
+##### <a name="servername"></a>`servername`
 
 Data type: `Optional[String]`
 
@@ -9876,7 +9901,7 @@ Sets the servername corresponding to the hostname you connect to the virtual hos
 
 Default value: `$name`
 
-##### <a name="-apache--vhost--setenv"></a>`setenv`
+##### <a name="setenv"></a>`setenv`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9890,7 +9915,7 @@ apache::vhost { 'setenv.example.com':
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--setenvif"></a>`setenvif`
+##### <a name="setenvif"></a>`setenvif`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9898,7 +9923,7 @@ Used by HTTPD to conditionally set environment variables for virtual hosts.
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--setenvifnocase"></a>`setenvifnocase`
+##### <a name="setenvifnocase"></a>`setenvifnocase`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9906,16 +9931,16 @@ Used by HTTPD to conditionally set environment variables for virtual hosts (case
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--suexec_user_group"></a>`suexec_user_group`
+##### <a name="suexec_user_group"></a>`suexec_user_group`
 
 Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 
 Allows the spcification of user and group execution privileges for CGI programs through
 inclusion of the `mod_suexec` module.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--vhost_name"></a>`vhost_name`
+##### <a name="vhost_name"></a>`vhost_name`
 
 Data type: `String`
 
@@ -9926,7 +9951,7 @@ title of the resource.
 
 Default value: `'*'`
 
-##### <a name="-apache--vhost--virtual_docroot"></a>`virtual_docroot`
+##### <a name="virtual_docroot"></a>`virtual_docroot`
 
 Data type: `Variant[Stdlib::Absolutepath, Boolean]`
 
@@ -9944,9 +9969,9 @@ apache::vhost { 'subdomain.loc':
 }
 ```
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--virtual_use_default_docroot"></a>`virtual_use_default_docroot`
+##### <a name="virtual_use_default_docroot"></a>`virtual_use_default_docroot`
 
 Data type: `Boolean`
 
@@ -9963,9 +9988,9 @@ apache::vhost { 'subdomain.loc':
 }
 ```
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--wsgi_daemon_process"></a>`wsgi_daemon_process`
+##### <a name="wsgi_daemon_process"></a>`wsgi_daemon_process`
 
 Data type: `Optional[Variant[String, Hash]]`
 
@@ -9991,9 +10016,9 @@ apache::vhost { 'wsgi.example.com':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
+##### <a name="wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
 
 Data type: `Optional[Hash]`
 
@@ -10002,9 +10027,9 @@ wsgi_daemon_process, wsgi_process_group,
 wsgi_script_aliases and wsgi_pass_authorization.<br />
 Sets the group ID that the virtual host runs under.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_application_group"></a>`wsgi_application_group`
+##### <a name="wsgi_application_group"></a>`wsgi_application_group`
 
 Data type: `Optional[String]`
 
@@ -10016,9 +10041,9 @@ thus allowing you to specify which application group the WSGI application belong
 with all WSGI applications within the same group executing within the context of the
 same Python sub interpreter.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_import_script"></a>`wsgi_import_script`
+##### <a name="wsgi_import_script"></a>`wsgi_import_script`
 
 Data type: `Optional[String]`
 
@@ -10028,9 +10053,9 @@ and wsgi_pass_authorization.<br />
 This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
 which can be used in order to specify a script file to be loaded upon a process starting.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_import_script_options"></a>`wsgi_import_script_options`
+##### <a name="wsgi_import_script_options"></a>`wsgi_import_script_options`
 
 Data type: `Optional[Hash]`
 
@@ -10041,11 +10066,11 @@ This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readth
 which can be used in order to specify a script file to be loaded upon a process starting.<br />
 Specifies the process and aplication groups of the script.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_chunked_request"></a>`wsgi_chunked_request`
+##### <a name="wsgi_chunked_request"></a>`wsgi_chunked_request`
 
-Data type: `Optional[Enum['On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group,
@@ -10055,9 +10080,9 @@ allowing you to enable support for chunked request content.<br />
 WSGI is technically incapable of supporting chunked request content without all chunked
 request content having first been read in and buffered.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_process_group"></a>`wsgi_process_group`
+##### <a name="wsgi_process_group"></a>`wsgi_process_group`
 
 Data type: `Optional[String]`
 
@@ -10066,9 +10091,9 @@ wsgi_daemon_process, wsgi_daemon_process_options,
 wsgi_script_aliases and wsgi_pass_authorization.<br />
 Requires a hash of web paths to filesystem `.wsgi paths/`.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_script_aliases"></a>`wsgi_script_aliases`
+##### <a name="wsgi_script_aliases"></a>`wsgi_script_aliases`
 
 Data type: `Optional[Hash]`
 
@@ -10078,9 +10103,9 @@ and wsgi_pass_authorization.<br />
 Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
 For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
+##### <a name="wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
 
 Data type: `Optional[Hash]`
 
@@ -10092,20 +10117,20 @@ This directive is similar to `wsgi_script_aliases`, but makes use of regular exp
 in place of simple prefix matching.<br />
 For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--wsgi_pass_authorization"></a>`wsgi_pass_authorization`
+##### <a name="wsgi_pass_authorization"></a>`wsgi_pass_authorization`
 
-Data type: `Optional[Enum['on', 'off', 'On', 'Off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside
 wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
 wsgi_script_aliases.<br />
 Enables support for chunked requests.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--directories"></a>`directories`
+##### <a name="directories"></a>`directories`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -10156,9 +10181,9 @@ apache::vhost { 'sample.example.net':
 Any handlers you do not set in these hashes are considered `undefined` within Puppet and
 are not added to the virtual host, resulting in the module using their default values.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--custom_fragment"></a>`custom_fragment`
+##### <a name="custom_fragment"></a>`custom_fragment`
 
 Data type: `Optional[String]`
 
@@ -10187,9 +10212,9 @@ ProxyStatus On',
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--headers"></a>`headers`
+##### <a name="headers"></a>`headers`
 
 Data type: `Array[String[1]]`
 
@@ -10208,7 +10233,7 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--shib_compat_valid_user"></a>`shib_compat_valid_user`
+##### <a name="shib_compat_valid_user"></a>`shib_compat_valid_user`
 
 Data type: `Optional[String]`
 
@@ -10219,9 +10244,9 @@ Apache behavior when processing the `valid-user` and `user` Require rules. See t
 and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess)
 topic for more details. This key is disabled if `apache::mod::shib` is not defined.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_options"></a>`ssl_options`
+##### <a name="ssl_options"></a>`ssl_options`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -10242,9 +10267,9 @@ apache::vhost { 'secure.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--additional_includes"></a>`additional_includes`
+##### <a name="additional_includes"></a>`additional_includes`
 
 Data type: `Variant[Array[String], String]`
 
@@ -10263,19 +10288,23 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--gssapi"></a>`gssapi`
+##### <a name="gssapi"></a>`gssapi`
+
+
+
+##### <a name="authz_core"></a>`authz_core`
 
 
 
-##### <a name="-apache--vhost--ssl"></a>`ssl`
+##### <a name="ssl"></a>`ssl`
 
 Data type: `Boolean`
 
 Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--ssl_ca"></a>`ssl_ca`
+##### <a name="ssl_ca"></a>`ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10284,7 +10313,7 @@ for authentication.
 
 Default value: `$apache::default_ssl_ca`
 
-##### <a name="-apache--vhost--ssl_cert"></a>`ssl_cert`
+##### <a name="ssl_cert"></a>`ssl_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10292,34 +10321,34 @@ Specifies the SSL certification.
 
 Default value: `$apache::default_ssl_cert`
 
-##### <a name="-apache--vhost--ssl_protocol"></a>`ssl_protocol`
+##### <a name="ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol).
 Expects an array or space separated string of accepted protocols.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_cipher"></a>`ssl_cipher`
+##### <a name="ssl_cipher"></a>`ssl_cipher`
 
-Data type: `Optional[Variant[Array[String], String]]`
+Data type: `Optional[Variant[Array[String[1]], String[1], Hash[String[1], String[1]]]]`
 
 Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_honorcipherorder"></a>`ssl_honorcipherorder`
+##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
-Data type: `Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef]`
+Data type: `Variant[Boolean, Apache::OnOff, Undef]`
 
 Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder),
 to cause Apache to use the server's preferred order of ciphers rather than the client's
 preferred order.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_certs_dir"></a>`ssl_certs_dir`
+##### <a name="ssl_certs_dir"></a>`ssl_certs_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10327,7 +10356,7 @@ Specifies the location of the SSL certification directory to verify client certs
 
 Default value: `$apache::params::ssl_certs_dir`
 
-##### <a name="-apache--vhost--ssl_chain"></a>`ssl_chain`
+##### <a name="ssl_chain"></a>`ssl_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10337,7 +10366,7 @@ production.
 
 Default value: `$apache::default_ssl_chain`
 
-##### <a name="-apache--vhost--ssl_crl"></a>`ssl_crl`
+##### <a name="ssl_crl"></a>`ssl_crl`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10347,7 +10376,7 @@ before being used in production.)
 
 Default value: `$apache::default_ssl_crl`
 
-##### <a name="-apache--vhost--ssl_crl_path"></a>`ssl_crl_path`
+##### <a name="ssl_crl_path"></a>`ssl_crl_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10358,7 +10387,7 @@ production.)
 
 Default value: `$apache::default_ssl_crl_path`
 
-##### <a name="-apache--vhost--ssl_crl_check"></a>`ssl_crl_check`
+##### <a name="ssl_crl_check"></a>`ssl_crl_check`
 
 Data type: `Optional[String]`
 
@@ -10369,7 +10398,7 @@ older versions.
 
 Default value: `$apache::default_ssl_crl_check`
 
-##### <a name="-apache--vhost--ssl_key"></a>`ssl_key`
+##### <a name="ssl_key"></a>`ssl_key`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10380,7 +10409,7 @@ being used in production.
 
 Default value: `$apache::default_ssl_key`
 
-##### <a name="-apache--vhost--ssl_verify_client"></a>`ssl_verify_client`
+##### <a name="ssl_verify_client"></a>`ssl_verify_client`
 
 Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
@@ -10393,9 +10422,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_verify_depth"></a>`ssl_verify_depth`
+##### <a name="ssl_verify_depth"></a>`ssl_verify_depth`
 
 Data type: `Optional[Integer]`
 
@@ -10410,9 +10439,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_protocol"></a>`ssl_proxy_protocol`
+##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Optional[String]`
 
@@ -10421,9 +10450,9 @@ directive, which controls which SSL protocol flavors `mod_ssl` should use when e
 its server environment for proxy. It connects to servers using only one of the provided
 protocols.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_verify"></a>`ssl_proxy_verify`
+##### <a name="ssl_proxy_verify"></a>`ssl_proxy_verify`
 
 Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
@@ -10431,9 +10460,9 @@ Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html
 directive, which configures certificate verification of the remote server when a proxy is
 configured to forward requests to a remote SSL server.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
+##### <a name="ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
 
 Data type: `Optional[Integer[0]]`
 
@@ -10444,18 +10473,18 @@ A depth of 0 means that only self-signed remote server certificates are accepted
 the default depth of 1 means the remote server certificate can be self-signed or
 signed by a CA that is directly known to the server.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
+##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
 Data type: `Optional[String]`
 
 Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)
 directive, which controls cipher suites supported for ssl proxy traffic.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
+##### <a name="ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10465,9 +10494,9 @@ of Certification Authorities (CA) whose remote servers you deal with. These are
 for Remote Server Authentication. This file should be a concatenation of the PEM-encoded
 certificate files in order of preference.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
+##### <a name="ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10482,9 +10511,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
+##### <a name="ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10496,56 +10525,56 @@ client certificates. This referenced file is simply the concatenation of the var
 PEM-encoded certificate files. Upon startup, each client certificate configured will be
 examined and a chain of trust will be constructed.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
+##### <a name="ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn)
 directive, which specifies whether the remote server certificate's CN field is compared
 against the hostname of the request URL.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
+##### <a name="ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername)
 directive, which specifies whether the remote server certificate's CN field is compared
 against the hostname of the request URL.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
+##### <a name="ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire)
 directive, which specifies whether the remote server certificate is checked for expiration
 or not.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
+##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Optional[String]`
 
 Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)
 directive, which provides direct configuration of OpenSSL parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_proxyengine"></a>`ssl_proxyengine`
+##### <a name="ssl_proxyengine"></a>`ssl_proxyengine`
 
 Data type: `Boolean`
 
 Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--ssl_stapling"></a>`ssl_stapling`
+##### <a name="ssl_stapling"></a>`ssl_stapling`
 
 Data type: `Optional[Boolean]`
 
@@ -10553,35 +10582,35 @@ Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/cu
 By default, uses what is set globally.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_stapling_timeout"></a>`ssl_stapling_timeout`
+##### <a name="ssl_stapling_timeout"></a>`ssl_stapling_timeout`
 
 Data type: `Optional[Integer]`
 
 Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
+##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
-Data type: `Optional[Enum['on', 'off']]`
+Data type: `Optional[Apache::OnOff]`
 
 Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_user_name"></a>`ssl_user_name`
+##### <a name="ssl_user_name"></a>`ssl_user_name`
 
 Data type: `Optional[String]`
 
 Sets the [SSLUserName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusername) directive.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--ssl_reload_on_change"></a>`ssl_reload_on_change`
+##### <a name="ssl_reload_on_change"></a>`ssl_reload_on_change`
 
 Data type: `Boolean`
 
@@ -10589,16 +10618,16 @@ Enable reloading of apache if the content of ssl files have changed.
 
 Default value: `$apache::default_ssl_reload_on_change`
 
-##### <a name="-apache--vhost--use_canonical_name"></a>`use_canonical_name`
+##### <a name="use_canonical_name"></a>`use_canonical_name`
 
-Data type: `Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']]`
+Data type: `Optional[Variant[Apache::OnOff, Enum['DNS', 'dns']]]`
 
 Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
 which allows you to configure how the server determines it's own name and port.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--define"></a>`define`
+##### <a name="define"></a>`define`
 
 Data type: `Hash`
 
@@ -10607,15 +10636,15 @@ these can then be used to replace configuration values. All Defines are Undefine
 
 Default value: `{}`
 
-##### <a name="-apache--vhost--auth_oidc"></a>`auth_oidc`
+##### <a name="auth_oidc"></a>`auth_oidc`
 
 Data type: `Boolean`
 
 Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--oidc_settings"></a>`oidc_settings`
+##### <a name="oidc_settings"></a>`oidc_settings`
 
 Data type: `Apache::OIDCSettings`
 
@@ -10623,7 +10652,7 @@ An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://gi
 
 Default value: `{}`
 
-##### <a name="-apache--vhost--limitreqfields"></a>`limitreqfields`
+##### <a name="limitreqfields"></a>`limitreqfields`
 
 Data type: `Optional[Integer]`
 
@@ -10633,18 +10662,18 @@ abnormal client request behavior, which may be useful for avoiding some forms of
 denial-of-service attacks. The value should be increased if normal clients see an error
 response from the server that indicates too many fields were sent in the request.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--limitreqfieldsize"></a>`limitreqfieldsize`
+##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
 
 Data type: `Optional[Integer]`
 
 The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 be allowed within a request header.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--limitreqline"></a>`limitreqline`
+##### <a name="limitreqline"></a>`limitreqline`
 
 Data type: `Optional[Integer]`
 
@@ -10658,9 +10687,9 @@ allowed for a request on the server. A server needs this value to be large
 enough to hold any of its resource names, including any information that might
 be passed in the query part of a GET request.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--limitreqbody"></a>`limitreqbody`
+##### <a name="limitreqbody"></a>`limitreqbody`
 
 Data type: `Optional[Integer]`
 
@@ -10671,9 +10700,9 @@ directive is given (server, per-directory, per-file or per-location). If the
 client request exceeds that limit, the server will return an error response
 instead of servicing the request.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--use_servername_for_filenames"></a>`use_servername_for_filenames`
+##### <a name="use_servername_for_filenames"></a>`use_servername_for_filenames`
 
 Data type: `Boolean`
 
@@ -10682,9 +10711,9 @@ value of the $servername parameter.
 When set to false (default), the existing behaviour of using the $name parameter
 will remain.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--use_port_for_filenames"></a>`use_port_for_filenames`
+##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
 
 Data type: `Boolean`
 
@@ -10694,34 +10723,34 @@ $port parameters.
 When set to false (default), the port is not included in the file names and may lead to
 duplicate declarations if two virtual hosts use the same domain.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--mdomain"></a>`mdomain`
+##### <a name="mdomain"></a>`mdomain`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
 All the names in the list are managed as one Managed Domain (MD). mod_md will request
 one single certificate that is valid for all these names.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy_requests"></a>`proxy_requests`
+##### <a name="proxy_requests"></a>`proxy_requests`
 
 Data type: `Boolean`
 
 Whether to accept proxy requests
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--userdir"></a>`userdir`
+##### <a name="userdir"></a>`userdir`
 
 Data type: `Optional[Variant[String[1], Array[String[1]]]]`
 
 Instances of apache::mod::userdir
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--vhost--custom"></a>`apache::vhost::custom`
+### <a name="apachevhostcustom"></a>`apache::vhost::custom`
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
 
@@ -10729,18 +10758,18 @@ The `apache::vhost::custom` defined type is a thin wrapper around the `apache::c
 
 The following parameters are available in the `apache::vhost::custom` defined type:
 
-* [`content`](#-apache--vhost--custom--content)
-* [`ensure`](#-apache--vhost--custom--ensure)
-* [`priority`](#-apache--vhost--custom--priority)
-* [`verify_config`](#-apache--vhost--custom--verify_config)
+* [`content`](#content)
+* [`ensure`](#ensure)
+* [`priority`](#priority)
+* [`verify_config`](#verify_config)
 
-##### <a name="-apache--vhost--custom--content"></a>`content`
+##### <a name="content"></a>`content`
 
 Data type: `String`
 
 Sets the configuration file's content.
 
-##### <a name="-apache--vhost--custom--ensure"></a>`ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `String`
 
@@ -10748,7 +10777,7 @@ Specifies if the virtual host file is present or absent.
 
 Default value: `'present'`
 
-##### <a name="-apache--vhost--custom--priority"></a>`priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Apache::Vhost::Priority`
 
@@ -10756,15 +10785,15 @@ Sets the relative load order for Apache HTTPD VirtualHost configuration files.
 
 Default value: `25`
 
-##### <a name="-apache--vhost--custom--verify_config"></a>`verify_config`
+##### <a name="verify_config"></a>`verify_config`
 
 Data type: `Boolean`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Default value: `true`
+Default value: ``true``
 
-### <a name="apache--vhost--fragment"></a>`apache::vhost::fragment`
+### <a name="apachevhostfragment"></a>`apache::vhost::fragment`
 
 Define a fragment within a vhost
 
@@ -10825,37 +10854,37 @@ apache::vhost::fragment { 'myfragment':
 
 The following parameters are available in the `apache::vhost::fragment` defined type:
 
-* [`vhost`](#-apache--vhost--fragment--vhost)
-* [`priority`](#-apache--vhost--fragment--priority)
-* [`content`](#-apache--vhost--fragment--content)
-* [`order`](#-apache--vhost--fragment--order)
-* [`port`](#-apache--vhost--fragment--port)
+* [`vhost`](#vhost)
+* [`priority`](#priority)
+* [`content`](#content)
+* [`order`](#order)
+* [`port`](#port)
 
-##### <a name="-apache--vhost--fragment--vhost"></a>`vhost`
+##### <a name="vhost"></a>`vhost`
 
 Data type: `String[1]`
 
 The title of the vhost resource to append to
 
-##### <a name="-apache--vhost--fragment--priority"></a>`priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
 Set the priority to match the one `apache::vhost` sets. This must match the
 one `apache::vhost` sets or else the concat fragment won't be found.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--fragment--content"></a>`content`
+##### <a name="content"></a>`content`
 
 Data type: `Optional[String]`
 
 The content to put in the fragment. Only when it's non-empty the actual
 fragment will be created.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--fragment--order"></a>`order`
+##### <a name="order"></a>`order`
 
 Data type: `Integer[0]`
 
@@ -10863,15 +10892,15 @@ The order to insert the fragment at
 
 Default value: `900`
 
-##### <a name="-apache--vhost--fragment--port"></a>`port`
+##### <a name="port"></a>`port`
 
 Data type: `Optional[Stdlib::Port]`
 
 The port to use
 
-Default value: `undef`
+Default value: ``undef``
 
-### <a name="apache--vhost--proxy"></a>`apache::vhost::proxy`
+### <a name="apachevhostproxy"></a>`apache::vhost::proxy`
 
 Configure a reverse proxy for a vhost
 
@@ -10922,39 +10951,39 @@ apache::vhost::proxy { 'myvhost-proxy':
 
 The following parameters are available in the `apache::vhost::proxy` defined type:
 
-* [`vhost`](#-apache--vhost--proxy--vhost)
-* [`priority`](#-apache--vhost--proxy--priority)
-* [`order`](#-apache--vhost--proxy--order)
-* [`port`](#-apache--vhost--proxy--port)
-* [`proxy_dest`](#-apache--vhost--proxy--proxy_dest)
-* [`proxy_dest_match`](#-apache--vhost--proxy--proxy_dest_match)
-* [`proxy_dest_reverse_match`](#-apache--vhost--proxy--proxy_dest_reverse_match)
-* [`no_proxy_uris`](#-apache--vhost--proxy--no_proxy_uris)
-* [`no_proxy_uris_match`](#-apache--vhost--proxy--no_proxy_uris_match)
-* [`proxy_pass`](#-apache--vhost--proxy--proxy_pass)
-* [`proxy_pass_match`](#-apache--vhost--proxy--proxy_pass_match)
-* [`proxy_requests`](#-apache--vhost--proxy--proxy_requests)
-* [`proxy_preserve_host`](#-apache--vhost--proxy--proxy_preserve_host)
-* [`proxy_add_headers`](#-apache--vhost--proxy--proxy_add_headers)
-* [`proxy_error_override`](#-apache--vhost--proxy--proxy_error_override)
-
-##### <a name="-apache--vhost--proxy--vhost"></a>`vhost`
+* [`vhost`](#vhost)
+* [`priority`](#priority)
+* [`order`](#order)
+* [`port`](#port)
+* [`proxy_dest`](#proxy_dest)
+* [`proxy_dest_match`](#proxy_dest_match)
+* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
+* [`no_proxy_uris`](#no_proxy_uris)
+* [`no_proxy_uris_match`](#no_proxy_uris_match)
+* [`proxy_pass`](#proxy_pass)
+* [`proxy_pass_match`](#proxy_pass_match)
+* [`proxy_requests`](#proxy_requests)
+* [`proxy_preserve_host`](#proxy_preserve_host)
+* [`proxy_add_headers`](#proxy_add_headers)
+* [`proxy_error_override`](#proxy_error_override)
+
+##### <a name="vhost"></a>`vhost`
 
 Data type: `String[1]`
 
 The title of the vhost resource to which reverse proxy configuration will
 be appended.
 
-##### <a name="-apache--vhost--proxy--priority"></a>`priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
 Set the priority to match the one `apache::vhost` sets. This must match the
 one `apache::vhost` sets or else the vhost's `concat` resource won't be found.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy--order"></a>`order`
+##### <a name="order"></a>`order`
 
 Data type: `Integer[0]`
 
@@ -10964,24 +10993,24 @@ vhost's configuration.
 
 Default value: `170`
 
-##### <a name="-apache--vhost--proxy--port"></a>`port`
+##### <a name="port"></a>`port`
 
 Data type: `Optional[Stdlib::Port]`
 
 Set the port to match the one `apache::vhost` sets. This must match the one
 `apache::vhost` sets or else the vhost's `concat` resource won't be found.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy--proxy_dest"></a>`proxy_dest`
+##### <a name="proxy_dest"></a>`proxy_dest`
 
 Data type: `Optional[String[1]]`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration for the `/` path.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy--proxy_dest_match"></a>`proxy_dest_match`
+##### <a name="proxy_dest_match"></a>`proxy_dest_match`
 
 Data type: `Optional[String[1]]`
 
@@ -10989,9 +11018,9 @@ This directive is equivalent to `proxy_dest`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy--proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
+##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
 Data type: `Optional[String[1]]`
 
@@ -10999,9 +11028,9 @@ Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
 [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy--no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Variant[Array[String[1]], String[1]]`
 
@@ -11014,7 +11043,7 @@ data type. This configuration uses the [ProxyPass](https://httpd.apache.org/docs
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--proxy--no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Variant[Array[String[1]], String[1]]`
 
@@ -11023,7 +11052,7 @@ as it instead uses [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mo
 
 Default value: `[]`
 
-##### <a name="-apache--vhost--proxy--proxy_pass"></a>`proxy_pass`
+##### <a name="proxy_pass"></a>`proxy_pass`
 
 Data type: `Optional[Array[Apache::Vhost::ProxyPass]]`
 
@@ -11032,9 +11061,9 @@ configuration.
 See the documentation for the Apache::Vhost::ProxyPass data type for a detailed
 description of the structure including optional parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy--proxy_pass_match"></a>`proxy_pass_match`
+##### <a name="proxy_pass_match"></a>`proxy_pass_match`
 
 Data type: `Optional[Array[Apache::Vhost::ProxyPass]]`
 
@@ -11042,35 +11071,35 @@ This directive is equivalent to `proxy_pass`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy--proxy_requests"></a>`proxy_requests`
+##### <a name="proxy_requests"></a>`proxy_requests`
 
 Data type: `Boolean`
 
 Enables forward (standard) proxy requests. See [ProxyRequests](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests) for details.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--proxy--proxy_preserve_host"></a>`proxy_preserve_host`
+##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
 
 Data type: `Boolean`
 
 When enabled, pass the `Host:` line from the incoming request to the proxied host.
 See [ProxyPreserveHost](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost) for details.
 
-Default value: `false`
+Default value: ``false``
 
-##### <a name="-apache--vhost--proxy--proxy_add_headers"></a>`proxy_add_headers`
+##### <a name="proxy_add_headers"></a>`proxy_add_headers`
 
 Data type: `Optional[Boolean]`
 
 Add X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Server HTTP headers.
 See [ProxyAddHeaders](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders) for details.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### <a name="-apache--vhost--proxy--proxy_error_override"></a>`proxy_error_override`
+##### <a name="proxy_error_override"></a>`proxy_error_override`
 
 Data type: `Boolean`
 
@@ -11078,11 +11107,11 @@ Override error pages from the proxied host. The current Puppet implementation
 supports enabling or disabling the directive, but not specifying a custom list
 of status codes. See [ProxyErrorOverride](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride) for details.
 
-Default value: `false`
+Default value: ``false``
 
 ## Functions
 
-### <a name="apache--apache_pw_hash"></a>`apache::apache_pw_hash`
+### <a name="apacheapache_pw_hash"></a>`apache::apache_pw_hash`
 
 Type: Ruby 4.x API
 
@@ -11100,7 +11129,103 @@ Data type: `Any`
 
 
 
-### <a name="apache--bool2httpd"></a>`apache::bool2httpd`
+### <a name="apacheauthz_core_config"></a>`apache::authz_core_config`
+
+Type: Ruby 4.x API
+
+Function to generate the authz_core configuration directives.
+
+#### Examples
+
+##### 
+
+```puppet
+
+arg = {
+  require_all => {
+   'require_any' => {
+     'require' => ['user superadmin'],
+     'require_all' => {
+       'require' => ['group admins'],
+     },
+    },
+   'require_none' => {
+     'require' => ['group temps']
+   }
+  }
+}
+
+apache::bool2httpd(arg)
+returns :
+[
+  "  <RequireAll>",
+  "    <RequireAny>",
+  "      Require user superadmin",
+  "      <RequireAll>",
+  "        Require group admins",
+  "        Require ldap-group \"cn=Administrators,o=Airius\"",
+  "      </RequireAll>",
+  "    </RequireAny>",
+  "    <RequireNone>",
+  "      Require group temps",
+  "      Require ldap-group \"cn=Temporary Employees,o=Airius\"",
+  "    </RequireNone>",
+  "  </RequireAll>"
+]
+```
+
+#### `apache::authz_core_config(Hash $config)`
+
+The apache::authz_core_config function.
+
+Returns: `Array` Returns the authz_core config directives in array.
+
+##### Examples
+
+###### 
+
+```puppet
+
+arg = {
+  require_all => {
+   'require_any' => {
+     'require' => ['user superadmin'],
+     'require_all' => {
+       'require' => ['group admins'],
+     },
+    },
+   'require_none' => {
+     'require' => ['group temps']
+   }
+  }
+}
+
+apache::bool2httpd(arg)
+returns :
+[
+  "  <RequireAll>",
+  "    <RequireAny>",
+  "      Require user superadmin",
+  "      <RequireAll>",
+  "        Require group admins",
+  "        Require ldap-group \"cn=Administrators,o=Airius\"",
+  "      </RequireAll>",
+  "    </RequireAny>",
+  "    <RequireNone>",
+  "      Require group temps",
+  "      Require ldap-group \"cn=Temporary Employees,o=Airius\"",
+  "    </RequireNone>",
+  "  </RequireAll>"
+]
+```
+
+##### `config`
+
+Data type: `Hash`
+
+The input as JSON format.
+
+### <a name="apachebool2httpd"></a>`apache::bool2httpd`
 
 Type: Ruby 4.x API
 
@@ -11145,7 +11270,7 @@ Data type: `Any`
 
 The value to be converted into a string.
 
-### <a name="apache--pw_hash"></a>`apache::pw_hash`
+### <a name="apachepw_hash"></a>`apache::pw_hash`
 
 Type: Ruby 4.x API
 
@@ -11203,7 +11328,7 @@ Data type: `Any`
 
 ## Data types
 
-### <a name="Apache--LogLevel"></a>`Apache::LogLevel`
+### <a name="apacheloglevel"></a>`Apache::LogLevel`
 
 A string that conforms to the Apache `LogLevel` syntax.
 Different levels can be specified for individual apache modules.
@@ -11231,18 +11356,26 @@ The levels are (in order of decreasing significance):
 * **See also**
   * https://httpd.apache.org/docs/current/mod/core.html#loglevel
 
-Alias of `Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]`
+Alias of
+
+```puppet
+Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
+```
 
-### <a name="Apache--ModProxyProtocol"></a>`Apache::ModProxyProtocol`
+### <a name="apachemodproxyprotocol"></a>`Apache::ModProxyProtocol`
 
 Supported protocols / schemes by mod_proxy
 
 * **See also**
   * https://httpd.apache.org/docs/2.4/mod/mod_proxy.html
 
-Alias of `Pattern[/(\A(ajp|fcgi|ftp|h2c?|https?|scgi|uwsgi|wss?):\/\/.+\z)/, /(\Aunix:\/([^\n\/\0]+\/*)*\z)/]`
+Alias of
+
+```puppet
+Pattern[/(\A(ajp|fcgi|ftp|h2c?|https?|scgi|uwsgi|wss?):\/\/.+\z)/, /(\Aunix:\/([^\n\/\0]+\/*)*\z)/]
+```
 
-### <a name="Apache--OIDCSettings"></a>`Apache::OIDCSettings`
+### <a name="apacheoidcsettings"></a>`Apache::OIDCSettings`
 
 https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 
@@ -11360,22 +11493,40 @@ Struct[{
   }]
 ```
 
-### <a name="Apache--ServerTokens"></a>`Apache::ServerTokens`
+### <a name="apacheonoff"></a>`Apache::OnOff`
+
+A string that is accepted in Apache config to turn something on or off
+
+Alias of
+
+```puppet
+Enum['On', 'on', 'Off', 'off']
+```
+
+### <a name="apacheservertokens"></a>`Apache::ServerTokens`
 
 A string that conforms to the Apache `ServerTokens` syntax.
 
 * **See also**
   * https://httpd.apache.org/docs/2.4/mod/core.html#servertokens
 
-Alias of `Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']`
+Alias of
 
-### <a name="Apache--Vhost--Priority"></a>`Apache::Vhost::Priority`
+```puppet
+Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']
+```
+
+### <a name="apachevhostpriority"></a>`Apache::Vhost::Priority`
 
 The priority on vhost
 
-Alias of `Variant[Pattern[/^\d+$/], Integer, Boolean]`
+Alias of
+
+```puppet
+Variant[Pattern[/^\d+$/], Integer, Boolean]
+```
 
-### <a name="Apache--Vhost--ProxyPass"></a>`Apache::Vhost::ProxyPass`
+### <a name="apachevhostproxypass"></a>`Apache::Vhost::ProxyPass`
 
 host context. Because the implementation uses SetEnv, you must `include apache::mod::env`;
 for the same reason, this cannot set the newer `no-proxy` environment variable, which
@@ -11463,35 +11614,35 @@ Struct[{
 
 The following parameters are available in the `Apache::Vhost::ProxyPass` data type:
 
-* [`path`](#-Apache--Vhost--ProxyPass--path)
-* [`url`](#-Apache--Vhost--ProxyPass--url)
-* [`params`](#-Apache--Vhost--ProxyPass--params)
-* [`reverse_urls`](#-Apache--Vhost--ProxyPass--reverse_urls)
-* [`reverse_cookies`](#-Apache--Vhost--ProxyPass--reverse_cookies)
-* [`keywords`](#-Apache--Vhost--ProxyPass--keywords)
-* [`setenv`](#-Apache--Vhost--ProxyPass--setenv)
-* [`no_proxy_uris`](#-Apache--Vhost--ProxyPass--no_proxy_uris)
-* [`no_proxy_uris_match`](#-Apache--Vhost--ProxyPass--no_proxy_uris_match)
+* [`path`](#path)
+* [`url`](#url)
+* [`params`](#params)
+* [`reverse_urls`](#reverse_urls)
+* [`reverse_cookies`](#reverse_cookies)
+* [`keywords`](#keywords)
+* [`setenv`](#setenv)
+* [`no_proxy_uris`](#no_proxy_uris)
+* [`no_proxy_uris_match`](#no_proxy_uris_match)
 
-##### <a name="-Apache--Vhost--ProxyPass--path"></a>`path`
+##### <a name="path"></a>`path`
 
 Data type: `String[1]`
 
 The virtual path on the local server to map.
 
-##### <a name="-Apache--Vhost--ProxyPass--url"></a>`url`
+##### <a name="url"></a>`url`
 
 Data type: `String[1]`
 
 The URL to which the path and its children will be mapped.
 
-##### <a name="-Apache--Vhost--ProxyPass--params"></a>`params`
+##### <a name="params"></a>`params`
 
 Data type: `Optional[Hash]`
 
 Optional [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) key-value parameters, such as connection settings.
 
-##### <a name="-Apache--Vhost--ProxyPass--reverse_urls"></a>`reverse_urls`
+##### <a name="reverse_urls"></a>`reverse_urls`
 
 Data type: `Array[String[1]]`
 
@@ -11499,7 +11650,7 @@ Optional (but usually recommended) URLs for [ProxyPassReverse](https://httpd.apa
 Allows Apache to adjust certain headers on HTTP redirect responses, to prevent
 redirects on the back-end from bypassing the reverse proxy.
 
-##### <a name="-Apache--Vhost--ProxyPass--reverse_cookies"></a>`reverse_cookies`
+##### <a name="reverse_cookies"></a>`reverse_cookies`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -11515,7 +11666,7 @@ Options:
 * **:path** `Optional[String[1]]`: Internal path for [ProxyPassReverseCookiePath](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiepath) configuration.
 * **:domain** `Optional[String[1]]`: Internal domain for [ProxyPassReverseCookieDomain](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiedomain) configuration.
 
-##### <a name="-Apache--Vhost--ProxyPass--keywords"></a>`keywords`
+##### <a name="keywords"></a>`keywords`
 
 Data type: `Optional[Array[String[1]]]`
 
@@ -11523,20 +11674,20 @@ Array of optional keywords such as `nocanon`, `interpolate`, or `noquery` suppor
 by [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) (refer
 to subsection under heading "Additional ProxyPass Keywords").
 
-##### <a name="-Apache--Vhost--ProxyPass--setenv"></a>`setenv`
+##### <a name="setenv"></a>`setenv`
 
 Data type: `Optional[Array[String[1]]]`
 
 Optional Array of Strings of the form "${env_var_name} ${value}".
 Uses [SetEnv](https://httpd.apache.org/docs/current/mod/mod_env.html#setenv) to make [Protocol Adjustments](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) to mod_proxy in the virtual
 
-##### <a name="-Apache--Vhost--ProxyPass--no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Optional[Array[String[1]]]`
 
 Optional Array of paths to exclude from proxying, using the `!` directive to [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass).
 
-##### <a name="-Apache--Vhost--ProxyPass--no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Optional[Array[String[1]]]`
 
diff --git a/lib/puppet/functions/apache/authz_core_config.rb b/lib/puppet/functions/apache/authz_core_config.rb
new file mode 100644
index 0000000000..304ab9d739
--- /dev/null
+++ b/lib/puppet/functions/apache/authz_core_config.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# @summary
+#   Function to generate the authz_core configuration directives.
+#
+Puppet::Functions.create_function(:'apache::authz_core_config') do
+  # @param config
+  #   The input as JSON format.
+  #
+  # @return
+  #   Returns the authz_core config directives in array.
+  #
+  # @example
+  #
+  #    arg = {
+  #      require_all => {
+  #       'require_any' => {
+  #         'require' => ['user superadmin'],
+  #         'require_all' => {
+  #           'require' => ['group admins'],
+  #         },
+  #        },
+  #       'require_none' => {
+  #         'require' => ['group temps']
+  #       }
+  #      }
+  #    }
+  #
+  #    apache::bool2httpd(arg)
+  #    returns :
+  #    [
+  #      "  <RequireAll>",
+  #      "    <RequireAny>",
+  #      "      Require user superadmin",
+  #      "      <RequireAll>",
+  #      "        Require group admins",
+  #      "        Require ldap-group \"cn=Administrators,o=Airius\"",
+  #      "      </RequireAll>",
+  #      "    </RequireAny>",
+  #      "    <RequireNone>",
+  #      "      Require group temps",
+  #      "      Require ldap-group \"cn=Temporary Employees,o=Airius\"",
+  #      "    </RequireNone>",
+  #      "  </RequireAll>"
+  #    ]
+  #
+  dispatch :authz_core_config do
+    param 'Hash', :config
+    return_type 'Array'
+  end
+
+  private
+
+  def build_directive(value)
+    value.split('_').map(&:capitalize).join
+  end
+
+  def authz_core_config(config, count = 1)
+    result_string = []
+    config.map do |key, value|
+      directive = build_directive(key)
+      if value.is_a?(Hash)
+        result_string << spacing("<#{directive}>", count)
+        result_string << authz_core_config(value, count + 1)
+        result_string << spacing("</#{directive}>", count)
+      else
+        value.map do |v|
+          result_string << spacing("#{directive} #{v}", count)
+        end
+      end
+    end
+    result_string.flatten
+  end
+
+  def spacing(string, count)
+    ('  ' * count) + string
+  end
+end
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 40a69bc89a..b03b2660b5 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -131,9 +131,7 @@
     include apache::mod::filter
 
     # authz_core is needed for 'Require' directive
-    ::apache::mod { 'authz_core':
-      id => 'authz_core_module',
-    }
+    include apache::mod::authz_core
 
     # lots of stuff seems to break without access_compat
     ::apache::mod { 'access_compat': }
@@ -145,17 +143,13 @@
     ::apache::default_mods::load { $mods: }
 
     # authz_core is needed for 'Require' directive
-    ::apache::mod { 'authz_core':
-      id => 'authz_core_module',
-    }
+    include apache::mod::authz_core
 
     # filter is needed by mod_deflate
     include apache::mod::filter
   } else {
     # authz_core is needed for 'Require' directive
-    ::apache::mod { 'authz_core':
-      id => 'authz_core_module',
-    }
+    include apache::mod::authz_core
 
     # filter is needed by mod_deflate
     include apache::mod::filter
diff --git a/manifests/mod/authz_core.pp b/manifests/mod/authz_core.pp
new file mode 100644
index 0000000000..26fcb55c9a
--- /dev/null
+++ b/manifests/mod/authz_core.pp
@@ -0,0 +1,8 @@
+# @summary
+#   Installs `mod_authz_core`.
+# 
+# @see https://httpd.apache.org/docs/current/mod/mod_authz_core.html for additional documentation.
+#
+class apache::mod::authz_core {
+  apache::mod { 'authz_core': }
+}
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 3b9bca577d..75e77c2ed1 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1455,6 +1455,33 @@
 #   }
 #   ```
 #
+# lint:ignore:parameter_documentation
+# @param authz_core
+# lint:endignore
+#   Specifies mod_authz_core parameters for particular directories in a virtual host directory
+#   ```puppet
+#   apache::vhost { 'sample.example.net':
+#     docroot     => '/path/to/directory',
+#     directories => [
+#       { path        => '/path/to/different/dir',
+#         authz_core  => {
+#           require_all => {
+#             'require_any' => {
+#               'require' => ['user superadmin'],
+#               'require_all' => {
+#                 'require' => ['group admins', 'ldap-group "cn=Administrators,o=Airius"'],
+#               },
+#             },
+#             'require_none' => {
+#               'require' => ['group temps', 'ldap-group "cn=Temporary Employees,o=Airius"']
+#             }
+#           }
+#         }
+#       },
+#     ],
+#   }
+#   ```
+#
 # @param ssl
 #   Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
 #
diff --git a/spec/functions/authz_core_config_spec.rb b/spec/functions/authz_core_config_spec.rb
new file mode 100644
index 0000000000..068b82a31e
--- /dev/null
+++ b/spec/functions/authz_core_config_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::authz_core_config' do
+  let(:input1) do
+    {
+      'Require' => [
+        'user foo',
+        'user bar',
+      ]
+    }
+  end
+
+  let(:input2) do
+    {
+      'require_all' => {
+        'require_any' => {
+          'require' => ['user superadmin'],
+          'require_all' => {
+            'require' => ['group admins', 'ldap-group "cn=Administrators,o=Airius"']
+          }
+        },
+        'require_none' => {
+          'require' => ['group temps', 'ldap-group "cn=Temporary Employees,o=Airius"']
+        }
+      }
+    }
+  end
+  let(:output2) do
+    [
+      '  <RequireAll>',
+      '    <RequireAny>',
+      '      Require user superadmin',
+      '      <RequireAll>',
+      '        Require group admins',
+      '        Require ldap-group "cn=Administrators,o=Airius"',
+      '      </RequireAll>',
+      '    </RequireAny>',
+      '    <RequireNone>',
+      '      Require group temps',
+      '      Require ldap-group "cn=Temporary Employees,o=Airius"',
+      '    </RequireNone>',
+      '  </RequireAll>',
+    ]
+  end
+
+  it { is_expected.to run.with_params(nil).and_raise_error(StandardError) }
+  it { is_expected.to run.with_params([]).and_raise_error(StandardError) }
+  it { is_expected.to run.with_params({}).and_return([]) }
+  it { is_expected.to run.with_params(input1).and_return(['  Require user foo', '  Require user bar']) }
+  it { is_expected.to run.with_params(input2).and_return(output2) }
+end
diff --git a/templates/vhost/_authz_core.epp b/templates/vhost/_authz_core.epp
new file mode 100644
index 0000000000..fc26470c0b
--- /dev/null
+++ b/templates/vhost/_authz_core.epp
@@ -0,0 +1,3 @@
+<% $authz_core_config.each |$line| { -%>
+    <%= $line %>
+<%- } -%>
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 35189f2369..79f28b2961 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -544,6 +544,9 @@
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>
+    <%- if directory['authz_core'] -%>
+      <%= scope.call_function('epp',["apache/vhost/_authz_core.epp", 'authz_core_config' => scope.call_function('apache::authz_core_config', directory['authz_core'])]) -%>
+    <%- end -%>
     <%- if directory['gssapi'] -%>
       <%= scope.call_function('epp',["apache/vhost/_gssapi.epp", directory['gssapi']]) -%>
     <%- end -%>

From c9cc80d8ee5fb638f06d044ef7aeade3e41e78f1 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Wed, 20 Sep 2023 09:34:32 +0530
Subject: [PATCH 2165/2267] Update manifests/vhost.pp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Romain Tartière <romain@blogreen.org>
---
 REFERENCE.md       | 5376 ++++++++++++++++++++++----------------------
 manifests/vhost.pp |  154 +-
 2 files changed, 2763 insertions(+), 2767 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index de492908db..1b03b5a9b0 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -9,110 +9,110 @@
 #### Public Classes
 
 * [`apache`](#apache): Guides the basic setup and installation of Apache on your system.
-* [`apache::dev`](#apachedev): Installs Apache development libraries.
-* [`apache::mod::actions`](#apachemodactions): Installs Apache mod_actions
-* [`apache::mod::alias`](#apachemodalias): Installs and configures `mod_alias`.
-* [`apache::mod::apreq2`](#apachemodapreq2): Installs `mod_apreq2`.
-* [`apache::mod::auth_basic`](#apachemodauth_basic): Installs `mod_auth_basic`
-* [`apache::mod::auth_cas`](#apachemodauth_cas): Installs and configures `mod_auth_cas`.
-* [`apache::mod::auth_gssapi`](#apachemodauth_gssapi): Installs `mod_auth_gsappi`.
-* [`apache::mod::auth_kerb`](#apachemodauth_kerb): Installs `mod_auth_kerb`
-* [`apache::mod::auth_mellon`](#apachemodauth_mellon): Installs and configures `mod_auth_mellon`.
-* [`apache::mod::auth_openidc`](#apachemodauth_openidc): Installs and configures `mod_auth_openidc`.
-* [`apache::mod::authn_core`](#apachemodauthn_core): Installs `mod_authn_core`.
-* [`apache::mod::authn_dbd`](#apachemodauthn_dbd): Installs `mod_authn_dbd`.
-* [`apache::mod::authn_file`](#apachemodauthn_file): Installs `mod_authn_file`.
-* [`apache::mod::authnz_ldap`](#apachemodauthnz_ldap): Installs `mod_authnz_ldap`.
-* [`apache::mod::authnz_pam`](#apachemodauthnz_pam): Installs `mod_authnz_pam`.
-* [`apache::mod::authz_core`](#apachemodauthz_core): Installs `mod_authz_core`.
-* [`apache::mod::authz_groupfile`](#apachemodauthz_groupfile): Installs `mod_authz_groupfile`
-* [`apache::mod::authz_user`](#apachemodauthz_user): Installs `mod_authz_user`
-* [`apache::mod::autoindex`](#apachemodautoindex): Installs `mod_autoindex`
-* [`apache::mod::cache`](#apachemodcache): Installs `mod_cache`
-* [`apache::mod::cgi`](#apachemodcgi): Installs `mod_cgi`.
-* [`apache::mod::cgid`](#apachemodcgid): Installs `mod_cgid`.
-* [`apache::mod::cluster`](#apachemodcluster): Installs `mod_cluster`.
-* [`apache::mod::data`](#apachemoddata): Installs and configures `mod_data`.
-* [`apache::mod::dav`](#apachemoddav): Installs `mod_dav`.
-* [`apache::mod::dav_fs`](#apachemoddav_fs): Installs `mod_dav_fs`.
-* [`apache::mod::dav_svn`](#apachemoddav_svn): Installs and configures `mod_dav_svn`.
-* [`apache::mod::dbd`](#apachemoddbd): Installs `mod_dbd`.
-* [`apache::mod::deflate`](#apachemoddeflate): Installs and configures `mod_deflate`.
-* [`apache::mod::dev`](#apachemoddev): Installs `mod_dev`.
-* [`apache::mod::dir`](#apachemoddir): Installs and configures `mod_dir`.
-* [`apache::mod::disk_cache`](#apachemoddisk_cache): Installs and configures `mod_disk_cache`.
-* [`apache::mod::dumpio`](#apachemoddumpio): Installs and configures `mod_dumpio`.
-* [`apache::mod::env`](#apachemodenv): Installs `mod_env`.
-* [`apache::mod::event`](#apachemodevent): Installs and configures `mod_event`.
-* [`apache::mod::expires`](#apachemodexpires): Installs and configures `mod_expires`.
-* [`apache::mod::ext_filter`](#apachemodext_filter): Installs and configures `mod_ext_filter`.
-* [`apache::mod::fcgid`](#apachemodfcgid): Installs and configures `mod_fcgid`.
-* [`apache::mod::filter`](#apachemodfilter): Installs `mod_filter`.
-* [`apache::mod::geoip`](#apachemodgeoip): Installs and configures `mod_geoip`.
-* [`apache::mod::headers`](#apachemodheaders): Installs and configures `mod_headers`.
-* [`apache::mod::http2`](#apachemodhttp2): Installs and configures `mod_http2`.
-* [`apache::mod::include`](#apachemodinclude): Installs `mod_include`.
-* [`apache::mod::info`](#apachemodinfo): Installs and configures `mod_info`.
-* [`apache::mod::intercept_form_submit`](#apachemodintercept_form_submit): Installs `mod_intercept_form_submit`.
-* [`apache::mod::itk`](#apachemoditk): Installs MPM `mod_itk`.
-* [`apache::mod::jk`](#apachemodjk): Installs `mod_jk`.
-* [`apache::mod::lbmethod_bybusyness`](#apachemodlbmethod_bybusyness): Installs `lbmethod_bybusyness`.
-* [`apache::mod::lbmethod_byrequests`](#apachemodlbmethod_byrequests): Installs `lbmethod_byrequests`.
-* [`apache::mod::lbmethod_bytraffic`](#apachemodlbmethod_bytraffic): Installs `lbmethod_bytraffic`.
-* [`apache::mod::lbmethod_heartbeat`](#apachemodlbmethod_heartbeat): Installs `lbmethod_heartbeat`.
-* [`apache::mod::ldap`](#apachemodldap): Installs and configures `mod_ldap`.
-* [`apache::mod::log_forensic`](#apachemodlog_forensic): Installs `mod_log_forensic`
-* [`apache::mod::lookup_identity`](#apachemodlookup_identity): Installs `mod_lookup_identity`
-* [`apache::mod::macro`](#apachemodmacro): Installs `mod_macro`.
-* [`apache::mod::md`](#apachemodmd): Installs and configures `mod_md`.
-* [`apache::mod::mime`](#apachemodmime): Installs and configures `mod_mime`.
-* [`apache::mod::mime_magic`](#apachemodmime_magic): Installs and configures `mod_mime_magic`.
-* [`apache::mod::negotiation`](#apachemodnegotiation): Installs and configures `mod_negotiation`.
-* [`apache::mod::nss`](#apachemodnss): Installs and configures `mod_nss`.
-* [`apache::mod::pagespeed`](#apachemodpagespeed): Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
+* [`apache::dev`](#apache--dev): Installs Apache development libraries.
+* [`apache::mod::actions`](#apache--mod--actions): Installs Apache mod_actions
+* [`apache::mod::alias`](#apache--mod--alias): Installs and configures `mod_alias`.
+* [`apache::mod::apreq2`](#apache--mod--apreq2): Installs `mod_apreq2`.
+* [`apache::mod::auth_basic`](#apache--mod--auth_basic): Installs `mod_auth_basic`
+* [`apache::mod::auth_cas`](#apache--mod--auth_cas): Installs and configures `mod_auth_cas`.
+* [`apache::mod::auth_gssapi`](#apache--mod--auth_gssapi): Installs `mod_auth_gsappi`.
+* [`apache::mod::auth_kerb`](#apache--mod--auth_kerb): Installs `mod_auth_kerb`
+* [`apache::mod::auth_mellon`](#apache--mod--auth_mellon): Installs and configures `mod_auth_mellon`.
+* [`apache::mod::auth_openidc`](#apache--mod--auth_openidc): Installs and configures `mod_auth_openidc`.
+* [`apache::mod::authn_core`](#apache--mod--authn_core): Installs `mod_authn_core`.
+* [`apache::mod::authn_dbd`](#apache--mod--authn_dbd): Installs `mod_authn_dbd`.
+* [`apache::mod::authn_file`](#apache--mod--authn_file): Installs `mod_authn_file`.
+* [`apache::mod::authnz_ldap`](#apache--mod--authnz_ldap): Installs `mod_authnz_ldap`.
+* [`apache::mod::authnz_pam`](#apache--mod--authnz_pam): Installs `mod_authnz_pam`.
+* [`apache::mod::authz_core`](#apache--mod--authz_core): Installs `mod_authz_core`.
+* [`apache::mod::authz_groupfile`](#apache--mod--authz_groupfile): Installs `mod_authz_groupfile`
+* [`apache::mod::authz_user`](#apache--mod--authz_user): Installs `mod_authz_user`
+* [`apache::mod::autoindex`](#apache--mod--autoindex): Installs `mod_autoindex`
+* [`apache::mod::cache`](#apache--mod--cache): Installs `mod_cache`
+* [`apache::mod::cgi`](#apache--mod--cgi): Installs `mod_cgi`.
+* [`apache::mod::cgid`](#apache--mod--cgid): Installs `mod_cgid`.
+* [`apache::mod::cluster`](#apache--mod--cluster): Installs `mod_cluster`.
+* [`apache::mod::data`](#apache--mod--data): Installs and configures `mod_data`.
+* [`apache::mod::dav`](#apache--mod--dav): Installs `mod_dav`.
+* [`apache::mod::dav_fs`](#apache--mod--dav_fs): Installs `mod_dav_fs`.
+* [`apache::mod::dav_svn`](#apache--mod--dav_svn): Installs and configures `mod_dav_svn`.
+* [`apache::mod::dbd`](#apache--mod--dbd): Installs `mod_dbd`.
+* [`apache::mod::deflate`](#apache--mod--deflate): Installs and configures `mod_deflate`.
+* [`apache::mod::dev`](#apache--mod--dev): Installs `mod_dev`.
+* [`apache::mod::dir`](#apache--mod--dir): Installs and configures `mod_dir`.
+* [`apache::mod::disk_cache`](#apache--mod--disk_cache): Installs and configures `mod_disk_cache`.
+* [`apache::mod::dumpio`](#apache--mod--dumpio): Installs and configures `mod_dumpio`.
+* [`apache::mod::env`](#apache--mod--env): Installs `mod_env`.
+* [`apache::mod::event`](#apache--mod--event): Installs and configures `mod_event`.
+* [`apache::mod::expires`](#apache--mod--expires): Installs and configures `mod_expires`.
+* [`apache::mod::ext_filter`](#apache--mod--ext_filter): Installs and configures `mod_ext_filter`.
+* [`apache::mod::fcgid`](#apache--mod--fcgid): Installs and configures `mod_fcgid`.
+* [`apache::mod::filter`](#apache--mod--filter): Installs `mod_filter`.
+* [`apache::mod::geoip`](#apache--mod--geoip): Installs and configures `mod_geoip`.
+* [`apache::mod::headers`](#apache--mod--headers): Installs and configures `mod_headers`.
+* [`apache::mod::http2`](#apache--mod--http2): Installs and configures `mod_http2`.
+* [`apache::mod::include`](#apache--mod--include): Installs `mod_include`.
+* [`apache::mod::info`](#apache--mod--info): Installs and configures `mod_info`.
+* [`apache::mod::intercept_form_submit`](#apache--mod--intercept_form_submit): Installs `mod_intercept_form_submit`.
+* [`apache::mod::itk`](#apache--mod--itk): Installs MPM `mod_itk`.
+* [`apache::mod::jk`](#apache--mod--jk): Installs `mod_jk`.
+* [`apache::mod::lbmethod_bybusyness`](#apache--mod--lbmethod_bybusyness): Installs `lbmethod_bybusyness`.
+* [`apache::mod::lbmethod_byrequests`](#apache--mod--lbmethod_byrequests): Installs `lbmethod_byrequests`.
+* [`apache::mod::lbmethod_bytraffic`](#apache--mod--lbmethod_bytraffic): Installs `lbmethod_bytraffic`.
+* [`apache::mod::lbmethod_heartbeat`](#apache--mod--lbmethod_heartbeat): Installs `lbmethod_heartbeat`.
+* [`apache::mod::ldap`](#apache--mod--ldap): Installs and configures `mod_ldap`.
+* [`apache::mod::log_forensic`](#apache--mod--log_forensic): Installs `mod_log_forensic`
+* [`apache::mod::lookup_identity`](#apache--mod--lookup_identity): Installs `mod_lookup_identity`
+* [`apache::mod::macro`](#apache--mod--macro): Installs `mod_macro`.
+* [`apache::mod::md`](#apache--mod--md): Installs and configures `mod_md`.
+* [`apache::mod::mime`](#apache--mod--mime): Installs and configures `mod_mime`.
+* [`apache::mod::mime_magic`](#apache--mod--mime_magic): Installs and configures `mod_mime_magic`.
+* [`apache::mod::negotiation`](#apache--mod--negotiation): Installs and configures `mod_negotiation`.
+* [`apache::mod::nss`](#apache--mod--nss): Installs and configures `mod_nss`.
+* [`apache::mod::pagespeed`](#apache--mod--pagespeed): Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
 
 This module does *not* manage the software repositories needed to automatically install the
 mod-pagespeed-stable package. The module does however require that the package be installed,
 or be installable using the system's default package provider.  You should ensure that this
 pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
-* [`apache::mod::passenger`](#apachemodpassenger): Installs `mod_pasenger`.
-* [`apache::mod::perl`](#apachemodperl): Installs `mod_perl`.
-* [`apache::mod::peruser`](#apachemodperuser): Installs `mod_peruser`.
-* [`apache::mod::php`](#apachemodphp): Installs `mod_php`.
-* [`apache::mod::prefork`](#apachemodprefork): Installs and configures MPM `prefork`.
-* [`apache::mod::proxy`](#apachemodproxy): Installs and configures `mod_proxy`.
-* [`apache::mod::proxy_ajp`](#apachemodproxy_ajp): Installs `mod_proxy_ajp`.
-* [`apache::mod::proxy_balancer`](#apachemodproxy_balancer): Installs and configures `mod_proxy_balancer`.
-* [`apache::mod::proxy_connect`](#apachemodproxy_connect): Installs `mod_proxy_connect`.
-* [`apache::mod::proxy_fcgi`](#apachemodproxy_fcgi): Installs `mod_proxy_fcgi`.
-* [`apache::mod::proxy_html`](#apachemodproxy_html): Installs `mod_proxy_html`.
-* [`apache::mod::proxy_http`](#apachemodproxy_http): Installs `mod_proxy_http`.
-* [`apache::mod::proxy_http2`](#apachemodproxy_http2): Installs `mod_proxy_http2`.
-* [`apache::mod::proxy_wstunnel`](#apachemodproxy_wstunnel): Installs `mod_proxy_wstunnel`.
-* [`apache::mod::python`](#apachemodpython): Installs and configures `mod_python`.
-* [`apache::mod::remoteip`](#apachemodremoteip): Installs and configures `mod_remoteip`.
-* [`apache::mod::reqtimeout`](#apachemodreqtimeout): Installs and configures `mod_reqtimeout`.
-* [`apache::mod::rewrite`](#apachemodrewrite): Installs `mod_rewrite`.
-* [`apache::mod::rpaf`](#apachemodrpaf): Installs and configures `mod_rpaf`.
-* [`apache::mod::security`](#apachemodsecurity): Installs and configures `mod_security`.
-* [`apache::mod::setenvif`](#apachemodsetenvif): Installs `mod_setenvif`.
-* [`apache::mod::shib`](#apachemodshib): Installs and configures `mod_shib`.
-* [`apache::mod::socache_shmcb`](#apachemodsocache_shmcb): Installs `mod_socache_shmcb`.
-* [`apache::mod::speling`](#apachemodspeling): Installs `mod_spelling`.
-* [`apache::mod::ssl`](#apachemodssl): Installs `mod_ssl`.
-* [`apache::mod::status`](#apachemodstatus): Installs and configures `mod_status`.
-* [`apache::mod::suexec`](#apachemodsuexec): Installs `mod_suexec`.
-* [`apache::mod::userdir`](#apachemoduserdir): Installs and configures `mod_userdir`.
-* [`apache::mod::version`](#apachemodversion): Installs `mod_version`.
-* [`apache::mod::vhost_alias`](#apachemodvhost_alias): Installs Apache `mod_vhost_alias`.
-* [`apache::mod::watchdog`](#apachemodwatchdog): Installs and configures `mod_watchdog`.
-* [`apache::mod::worker`](#apachemodworker): Installs and manages the MPM `worker`.
-* [`apache::mod::wsgi`](#apachemodwsgi): Installs and configures `mod_wsgi`.
-* [`apache::mod::xsendfile`](#apachemodxsendfile): Installs `mod_xsendfile`.
-* [`apache::mpm::disable_mpm_event`](#apachempmdisable_mpm_event): disable Apache-Module event
-* [`apache::mpm::disable_mpm_prefork`](#apachempmdisable_mpm_prefork): disable Apache-Module prefork
-* [`apache::mpm::disable_mpm_worker`](#apachempmdisable_mpm_worker): disable Apache-Module worker
-* [`apache::vhosts`](#apachevhosts): Creates `apache::vhost` defined types.
+* [`apache::mod::passenger`](#apache--mod--passenger): Installs `mod_pasenger`.
+* [`apache::mod::perl`](#apache--mod--perl): Installs `mod_perl`.
+* [`apache::mod::peruser`](#apache--mod--peruser): Installs `mod_peruser`.
+* [`apache::mod::php`](#apache--mod--php): Installs `mod_php`.
+* [`apache::mod::prefork`](#apache--mod--prefork): Installs and configures MPM `prefork`.
+* [`apache::mod::proxy`](#apache--mod--proxy): Installs and configures `mod_proxy`.
+* [`apache::mod::proxy_ajp`](#apache--mod--proxy_ajp): Installs `mod_proxy_ajp`.
+* [`apache::mod::proxy_balancer`](#apache--mod--proxy_balancer): Installs and configures `mod_proxy_balancer`.
+* [`apache::mod::proxy_connect`](#apache--mod--proxy_connect): Installs `mod_proxy_connect`.
+* [`apache::mod::proxy_fcgi`](#apache--mod--proxy_fcgi): Installs `mod_proxy_fcgi`.
+* [`apache::mod::proxy_html`](#apache--mod--proxy_html): Installs `mod_proxy_html`.
+* [`apache::mod::proxy_http`](#apache--mod--proxy_http): Installs `mod_proxy_http`.
+* [`apache::mod::proxy_http2`](#apache--mod--proxy_http2): Installs `mod_proxy_http2`.
+* [`apache::mod::proxy_wstunnel`](#apache--mod--proxy_wstunnel): Installs `mod_proxy_wstunnel`.
+* [`apache::mod::python`](#apache--mod--python): Installs and configures `mod_python`.
+* [`apache::mod::remoteip`](#apache--mod--remoteip): Installs and configures `mod_remoteip`.
+* [`apache::mod::reqtimeout`](#apache--mod--reqtimeout): Installs and configures `mod_reqtimeout`.
+* [`apache::mod::rewrite`](#apache--mod--rewrite): Installs `mod_rewrite`.
+* [`apache::mod::rpaf`](#apache--mod--rpaf): Installs and configures `mod_rpaf`.
+* [`apache::mod::security`](#apache--mod--security): Installs and configures `mod_security`.
+* [`apache::mod::setenvif`](#apache--mod--setenvif): Installs `mod_setenvif`.
+* [`apache::mod::shib`](#apache--mod--shib): Installs and configures `mod_shib`.
+* [`apache::mod::socache_shmcb`](#apache--mod--socache_shmcb): Installs `mod_socache_shmcb`.
+* [`apache::mod::speling`](#apache--mod--speling): Installs `mod_spelling`.
+* [`apache::mod::ssl`](#apache--mod--ssl): Installs `mod_ssl`.
+* [`apache::mod::status`](#apache--mod--status): Installs and configures `mod_status`.
+* [`apache::mod::suexec`](#apache--mod--suexec): Installs `mod_suexec`.
+* [`apache::mod::userdir`](#apache--mod--userdir): Installs and configures `mod_userdir`.
+* [`apache::mod::version`](#apache--mod--version): Installs `mod_version`.
+* [`apache::mod::vhost_alias`](#apache--mod--vhost_alias): Installs Apache `mod_vhost_alias`.
+* [`apache::mod::watchdog`](#apache--mod--watchdog): Installs and configures `mod_watchdog`.
+* [`apache::mod::worker`](#apache--mod--worker): Installs and manages the MPM `worker`.
+* [`apache::mod::wsgi`](#apache--mod--wsgi): Installs and configures `mod_wsgi`.
+* [`apache::mod::xsendfile`](#apache--mod--xsendfile): Installs `mod_xsendfile`.
+* [`apache::mpm::disable_mpm_event`](#apache--mpm--disable_mpm_event): disable Apache-Module event
+* [`apache::mpm::disable_mpm_prefork`](#apache--mpm--disable_mpm_prefork): disable Apache-Module prefork
+* [`apache::mpm::disable_mpm_worker`](#apache--mpm--disable_mpm_worker): disable Apache-Module worker
+* [`apache::vhosts`](#apache--vhosts): Creates `apache::vhost` defined types.
 
 #### Private Classes
 
@@ -133,22 +133,22 @@ pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet
 
 #### Public Defined types
 
-* [`apache::balancer`](#apachebalancer): This type will create an apache balancer cluster file inside the conf.d
+* [`apache::balancer`](#apache--balancer): This type will create an apache balancer cluster file inside the conf.d
 directory.
-* [`apache::balancermember`](#apachebalancermember): Defines members of `mod_proxy_balancer`
-* [`apache::custom_config`](#apachecustom_config): Adds a custom configuration file to the Apache server's `conf.d` directory.
-* [`apache::fastcgi::server`](#apachefastcgiserver): Defines one or more external FastCGI servers to handle specific file types. Use this
+* [`apache::balancermember`](#apache--balancermember): Defines members of `mod_proxy_balancer`
+* [`apache::custom_config`](#apache--custom_config): Adds a custom configuration file to the Apache server's `conf.d` directory.
+* [`apache::fastcgi::server`](#apache--fastcgi--server): Defines one or more external FastCGI servers to handle specific file types. Use this
 defined type with `mod_fastcgi`.
-* [`apache::listen`](#apachelisten): Adds `Listen` directives to `ports.conf` that define the
+* [`apache::listen`](#apache--listen): Adds `Listen` directives to `ports.conf` that define the
 Apache server's or a virtual host's listening address and port.
-* [`apache::mod`](#apachemod): Installs packages for an Apache module that doesn't have a corresponding
+* [`apache::mod`](#apache--mod): Installs packages for an Apache module that doesn't have a corresponding
 `apache::mod::<MODULE NAME>` class.
-* [`apache::namevirtualhost`](#apachenamevirtualhost): Enables name-based virtual hosts
-* [`apache::vhost`](#apachevhost): Allows specialised configurations for virtual hosts that possess requirements
+* [`apache::namevirtualhost`](#apache--namevirtualhost): Enables name-based virtual hosts
+* [`apache::vhost`](#apache--vhost): Allows specialised configurations for virtual hosts that possess requirements
 outside of the defaults.
-* [`apache::vhost::custom`](#apachevhostcustom): A wrapper around the `apache::custom_config` defined type.
-* [`apache::vhost::fragment`](#apachevhostfragment): Define a fragment within a vhost
-* [`apache::vhost::proxy`](#apachevhostproxy): Configure a reverse proxy for a vhost
+* [`apache::vhost::custom`](#apache--vhost--custom): A wrapper around the `apache::custom_config` defined type.
+* [`apache::vhost::fragment`](#apache--vhost--fragment): Define a fragment within a vhost
+* [`apache::vhost::proxy`](#apache--vhost--proxy): Configure a reverse proxy for a vhost
 
 #### Private Defined types
 
@@ -160,22 +160,22 @@ outside of the defaults.
 
 ### Functions
 
-* [`apache::apache_pw_hash`](#apacheapache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
-* [`apache::authz_core_config`](#apacheauthz_core_config): Function to generate the authz_core configuration directives.
-* [`apache::bool2httpd`](#apachebool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
-* [`apache::pw_hash`](#apachepw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
+* [`apache::apache_pw_hash`](#apache--apache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
+* [`apache::authz_core_config`](#apache--authz_core_config): Function to generate the authz_core configuration directives.
+* [`apache::bool2httpd`](#apache--bool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
+* [`apache::pw_hash`](#apache--pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
 * [`apache_pw_hash`](#apache_pw_hash): DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
 * [`bool2httpd`](#bool2httpd): DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
 
 ### Data types
 
-* [`Apache::LogLevel`](#apacheloglevel): A string that conforms to the Apache `LogLevel` syntax.
-* [`Apache::ModProxyProtocol`](#apachemodproxyprotocol): Supported protocols / schemes by mod_proxy
-* [`Apache::OIDCSettings`](#apacheoidcsettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
-* [`Apache::OnOff`](#apacheonoff): A string that is accepted in Apache config to turn something on or off
-* [`Apache::ServerTokens`](#apacheservertokens): A string that conforms to the Apache `ServerTokens` syntax.
-* [`Apache::Vhost::Priority`](#apachevhostpriority): The priority on vhost
-* [`Apache::Vhost::ProxyPass`](#apachevhostproxypass): Struct representing reverse proxy configuration for an Apache vhost, used by the Apache::Vhost::Proxy defined resource type.
+* [`Apache::LogLevel`](#Apache--LogLevel): A string that conforms to the Apache `LogLevel` syntax.
+* [`Apache::ModProxyProtocol`](#Apache--ModProxyProtocol): Supported protocols / schemes by mod_proxy
+* [`Apache::OIDCSettings`](#Apache--OIDCSettings): https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
+* [`Apache::OnOff`](#Apache--OnOff): A string that is accepted in Apache config to turn something on or off
+* [`Apache::ServerTokens`](#Apache--ServerTokens): A string that conforms to the Apache `ServerTokens` syntax.
+* [`Apache::Vhost::Priority`](#Apache--Vhost--Priority): The priority on vhost
+* [`Apache::Vhost::ProxyPass`](#Apache--Vhost--ProxyPass): Struct representing reverse proxy configuration for an Apache vhost, used by the Apache::Vhost::Proxy defined resource type.
 
 ### Tasks
 
@@ -206,95 +206,95 @@ class { 'apache': }
 
 The following parameters are available in the `apache` class:
 
-* [`allow_encoded_slashes`](#allow_encoded_slashes)
-* [`conf_dir`](#conf_dir)
-* [`conf_template`](#conf_template)
-* [`confd_dir`](#confd_dir)
-* [`default_charset`](#default_charset)
-* [`default_confd_files`](#default_confd_files)
-* [`default_mods`](#default_mods)
-* [`default_ssl_ca`](#default_ssl_ca)
-* [`default_ssl_cert`](#default_ssl_cert)
-* [`default_ssl_chain`](#default_ssl_chain)
-* [`default_ssl_crl`](#default_ssl_crl)
-* [`default_ssl_crl_path`](#default_ssl_crl_path)
-* [`default_ssl_crl_check`](#default_ssl_crl_check)
-* [`default_ssl_key`](#default_ssl_key)
-* [`default_ssl_reload_on_change`](#default_ssl_reload_on_change)
-* [`default_ssl_vhost`](#default_ssl_vhost)
-* [`default_type`](#default_type)
-* [`default_vhost`](#default_vhost)
-* [`dev_packages`](#dev_packages)
-* [`docroot`](#docroot)
-* [`error_documents`](#error_documents)
-* [`group`](#group)
-* [`httpd_dir`](#httpd_dir)
-* [`http_protocol_options`](#http_protocol_options)
-* [`keepalive`](#keepalive)
-* [`keepalive_timeout`](#keepalive_timeout)
-* [`max_keepalive_requests`](#max_keepalive_requests)
-* [`hostname_lookups`](#hostname_lookups)
-* [`ldap_trusted_mode`](#ldap_trusted_mode)
-* [`ldap_verify_server_cert`](#ldap_verify_server_cert)
-* [`lib_path`](#lib_path)
-* [`log_level`](#log_level)
-* [`log_formats`](#log_formats)
-* [`logroot`](#logroot)
-* [`logroot_mode`](#logroot_mode)
-* [`manage_group`](#manage_group)
-* [`supplementary_groups`](#supplementary_groups)
-* [`manage_user`](#manage_user)
-* [`mod_dir`](#mod_dir)
-* [`mod_libs`](#mod_libs)
-* [`mod_packages`](#mod_packages)
-* [`mpm_module`](#mpm_module)
-* [`package_ensure`](#package_ensure)
-* [`pidfile`](#pidfile)
-* [`ports_file`](#ports_file)
-* [`protocols`](#protocols)
-* [`protocols_honor_order`](#protocols_honor_order)
-* [`purge_configs`](#purge_configs)
-* [`purge_vhost_dir`](#purge_vhost_dir)
-* [`sendfile`](#sendfile)
-* [`serveradmin`](#serveradmin)
-* [`servername`](#servername)
-* [`server_root`](#server_root)
-* [`server_signature`](#server_signature)
-* [`server_tokens`](#server_tokens)
-* [`service_enable`](#service_enable)
-* [`service_ensure`](#service_ensure)
-* [`service_name`](#service_name)
-* [`service_manage`](#service_manage)
-* [`service_restart`](#service_restart)
-* [`timeout`](#timeout)
-* [`trace_enable`](#trace_enable)
-* [`use_canonical_name`](#use_canonical_name)
-* [`use_systemd`](#use_systemd)
-* [`file_mode`](#file_mode)
-* [`root_directory_options`](#root_directory_options)
-* [`root_directory_secured`](#root_directory_secured)
-* [`vhost_dir`](#vhost_dir)
-* [`vhost_include_pattern`](#vhost_include_pattern)
-* [`user`](#user)
-* [`apache_name`](#apache_name)
-* [`error_log`](#error_log)
-* [`scriptalias`](#scriptalias)
-* [`access_log_file`](#access_log_file)
-* [`limitreqfields`](#limitreqfields)
-* [`limitreqfieldsize`](#limitreqfieldsize)
-* [`limitreqline`](#limitreqline)
-* [`ip`](#ip)
-* [`purge_vdir`](#purge_vdir)
-* [`conf_enabled`](#conf_enabled)
-* [`vhost_enable_dir`](#vhost_enable_dir)
-* [`manage_vhost_enable_dir`](#manage_vhost_enable_dir)
-* [`mod_enable_dir`](#mod_enable_dir)
-* [`ssl_file`](#ssl_file)
-* [`file_e_tag`](#file_e_tag)
-* [`use_optional_includes`](#use_optional_includes)
-* [`mime_types_additional`](#mime_types_additional)
-
-##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
+* [`allow_encoded_slashes`](#-apache--allow_encoded_slashes)
+* [`conf_dir`](#-apache--conf_dir)
+* [`conf_template`](#-apache--conf_template)
+* [`confd_dir`](#-apache--confd_dir)
+* [`default_charset`](#-apache--default_charset)
+* [`default_confd_files`](#-apache--default_confd_files)
+* [`default_mods`](#-apache--default_mods)
+* [`default_ssl_ca`](#-apache--default_ssl_ca)
+* [`default_ssl_cert`](#-apache--default_ssl_cert)
+* [`default_ssl_chain`](#-apache--default_ssl_chain)
+* [`default_ssl_crl`](#-apache--default_ssl_crl)
+* [`default_ssl_crl_path`](#-apache--default_ssl_crl_path)
+* [`default_ssl_crl_check`](#-apache--default_ssl_crl_check)
+* [`default_ssl_key`](#-apache--default_ssl_key)
+* [`default_ssl_reload_on_change`](#-apache--default_ssl_reload_on_change)
+* [`default_ssl_vhost`](#-apache--default_ssl_vhost)
+* [`default_type`](#-apache--default_type)
+* [`default_vhost`](#-apache--default_vhost)
+* [`dev_packages`](#-apache--dev_packages)
+* [`docroot`](#-apache--docroot)
+* [`error_documents`](#-apache--error_documents)
+* [`group`](#-apache--group)
+* [`httpd_dir`](#-apache--httpd_dir)
+* [`http_protocol_options`](#-apache--http_protocol_options)
+* [`keepalive`](#-apache--keepalive)
+* [`keepalive_timeout`](#-apache--keepalive_timeout)
+* [`max_keepalive_requests`](#-apache--max_keepalive_requests)
+* [`hostname_lookups`](#-apache--hostname_lookups)
+* [`ldap_trusted_mode`](#-apache--ldap_trusted_mode)
+* [`ldap_verify_server_cert`](#-apache--ldap_verify_server_cert)
+* [`lib_path`](#-apache--lib_path)
+* [`log_level`](#-apache--log_level)
+* [`log_formats`](#-apache--log_formats)
+* [`logroot`](#-apache--logroot)
+* [`logroot_mode`](#-apache--logroot_mode)
+* [`manage_group`](#-apache--manage_group)
+* [`supplementary_groups`](#-apache--supplementary_groups)
+* [`manage_user`](#-apache--manage_user)
+* [`mod_dir`](#-apache--mod_dir)
+* [`mod_libs`](#-apache--mod_libs)
+* [`mod_packages`](#-apache--mod_packages)
+* [`mpm_module`](#-apache--mpm_module)
+* [`package_ensure`](#-apache--package_ensure)
+* [`pidfile`](#-apache--pidfile)
+* [`ports_file`](#-apache--ports_file)
+* [`protocols`](#-apache--protocols)
+* [`protocols_honor_order`](#-apache--protocols_honor_order)
+* [`purge_configs`](#-apache--purge_configs)
+* [`purge_vhost_dir`](#-apache--purge_vhost_dir)
+* [`sendfile`](#-apache--sendfile)
+* [`serveradmin`](#-apache--serveradmin)
+* [`servername`](#-apache--servername)
+* [`server_root`](#-apache--server_root)
+* [`server_signature`](#-apache--server_signature)
+* [`server_tokens`](#-apache--server_tokens)
+* [`service_enable`](#-apache--service_enable)
+* [`service_ensure`](#-apache--service_ensure)
+* [`service_name`](#-apache--service_name)
+* [`service_manage`](#-apache--service_manage)
+* [`service_restart`](#-apache--service_restart)
+* [`timeout`](#-apache--timeout)
+* [`trace_enable`](#-apache--trace_enable)
+* [`use_canonical_name`](#-apache--use_canonical_name)
+* [`use_systemd`](#-apache--use_systemd)
+* [`file_mode`](#-apache--file_mode)
+* [`root_directory_options`](#-apache--root_directory_options)
+* [`root_directory_secured`](#-apache--root_directory_secured)
+* [`vhost_dir`](#-apache--vhost_dir)
+* [`vhost_include_pattern`](#-apache--vhost_include_pattern)
+* [`user`](#-apache--user)
+* [`apache_name`](#-apache--apache_name)
+* [`error_log`](#-apache--error_log)
+* [`scriptalias`](#-apache--scriptalias)
+* [`access_log_file`](#-apache--access_log_file)
+* [`limitreqfields`](#-apache--limitreqfields)
+* [`limitreqfieldsize`](#-apache--limitreqfieldsize)
+* [`limitreqline`](#-apache--limitreqline)
+* [`ip`](#-apache--ip)
+* [`purge_vdir`](#-apache--purge_vdir)
+* [`conf_enabled`](#-apache--conf_enabled)
+* [`vhost_enable_dir`](#-apache--vhost_enable_dir)
+* [`manage_vhost_enable_dir`](#-apache--manage_vhost_enable_dir)
+* [`mod_enable_dir`](#-apache--mod_enable_dir)
+* [`ssl_file`](#-apache--ssl_file)
+* [`file_e_tag`](#-apache--file_e_tag)
+* [`use_optional_includes`](#-apache--use_optional_includes)
+* [`mime_types_additional`](#-apache--mime_types_additional)
+
+##### <a name="-apache--allow_encoded_slashes"></a>`allow_encoded_slashes`
 
 Data type: `Optional[Variant[Apache::OnOff, Enum['nodecode']]]`
 
@@ -302,9 +302,9 @@ Sets the server default for the `AllowEncodedSlashes` declaration, which modifie
 responses to URLs containing '\' and '/' characters. If not specified, this parameter omits
 the declaration from the server's configuration and uses Apache's default setting of 'off'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="conf_dir"></a>`conf_dir`
+##### <a name="-apache--conf_dir"></a>`conf_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -312,7 +312,7 @@ Sets the directory where the Apache server's main configuration file is located.
 
 Default value: `$apache::params::conf_dir`
 
-##### <a name="conf_template"></a>`conf_template`
+##### <a name="-apache--conf_template"></a>`conf_template`
 
 Data type: `String`
 
@@ -322,7 +322,7 @@ configuration file customized by `conf.d` entries.
 
 Default value: `$apache::params::conf_template`
 
-##### <a name="confd_dir"></a>`confd_dir`
+##### <a name="-apache--confd_dir"></a>`confd_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -330,15 +330,15 @@ Sets the location of the Apache server's custom configuration directory.
 
 Default value: `$apache::params::confd_dir`
 
-##### <a name="default_charset"></a>`default_charset`
+##### <a name="-apache--default_charset"></a>`default_charset`
 
 Data type: `Optional[String]`
 
 Used as the `AddDefaultCharset` directive in the main configuration file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_confd_files"></a>`default_confd_files`
+##### <a name="-apache--default_confd_files"></a>`default_confd_files`
 
 Data type: `Boolean`
 
@@ -347,9 +347,9 @@ in the directory defined by the `confd_dir` parameter. These configuration files
 correspond to what is typically installed with the Apache package on the server's
 operating system.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="default_mods"></a>`default_mods`
+##### <a name="-apache--default_mods"></a>`default_mods`
 
 Data type: `Variant[Array[String[1]], Boolean]`
 
@@ -363,9 +363,9 @@ the value of the `mpm_module` parameter. Because these lists of
 modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
 If this parameter contains an array, Puppet instead enables all passed Apache modules.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="default_ssl_ca"></a>`default_ssl_ca`
+##### <a name="-apache--default_ssl_ca"></a>`default_ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -374,9 +374,9 @@ Although the default value results in a functioning Apache server, you **must**
 this parameter with your certificate authority information before deploying this server in
 a production environment.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_cert"></a>`default_ssl_cert`
+##### <a name="-apache--default_ssl_cert"></a>`default_ssl_cert`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -386,7 +386,7 @@ parameter with your certificate location before deploying this server in a produ
 
 Default value: `$apache::params::default_ssl_cert`
 
-##### <a name="default_ssl_chain"></a>`default_ssl_chain`
+##### <a name="-apache--default_ssl_chain"></a>`default_ssl_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -394,9 +394,9 @@ Sets the default SSL chain location.<br />
 Although this default value results in a functioning Apache server, you **must** update
 this parameter with your SSL chain before deploying this server in a production environment.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_crl"></a>`default_ssl_crl`
+##### <a name="-apache--default_ssl_crl"></a>`default_ssl_crl`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -405,9 +405,9 @@ Although this default value results in a functioning Apache server, you **must**
 this parameter with the CRL file path before deploying this server in a production
 environment. You can use this parameter with or in place of the `default_ssl_crl_path`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_crl_path"></a>`default_ssl_crl_path`
+##### <a name="-apache--default_ssl_crl_path"></a>`default_ssl_crl_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -415,9 +415,9 @@ Sets the server's certificate revocation list path, which contains your CRLs.<br
 Although this default value results in a functioning Apache server, you **must** update
 this parameter with the CRL file path before deploying this server in a production environment.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_crl_check"></a>`default_ssl_crl_check`
+##### <a name="-apache--default_ssl_crl_check"></a>`default_ssl_crl_check`
 
 Data type: `Optional[String]`
 
@@ -426,9 +426,9 @@ This parameter applies only to Apache 2.4 or higher and is ignored on older vers
 Although this default value results in a functioning Apache server, you **must** specify
 this parameter when using certificate revocation lists in a production environment.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_ssl_key"></a>`default_ssl_key`
+##### <a name="-apache--default_ssl_key"></a>`default_ssl_key`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -439,15 +439,15 @@ environment.
 
 Default value: `$apache::params::default_ssl_key`
 
-##### <a name="default_ssl_reload_on_change"></a>`default_ssl_reload_on_change`
+##### <a name="-apache--default_ssl_reload_on_change"></a>`default_ssl_reload_on_change`
 
 Data type: `Boolean`
 
 Enable reloading of apache if the content of ssl files have changed.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="default_ssl_vhost"></a>`default_ssl_vhost`
+##### <a name="-apache--default_ssl_vhost"></a>`default_ssl_vhost`
 
 Data type: `Boolean`
 
@@ -466,9 +466,9 @@ apache::vhost { 'default-ssl':
 ```
 **Note**: SSL virtual hosts only respond to HTTPS queries.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="default_type"></a>`default_type`
+##### <a name="-apache--default_type"></a>`default_type`
 
 Data type: `String`
 
@@ -478,7 +478,7 @@ newer, and is only for backwards compatibility in configuration files.
 
 Default value: `'none'`
 
-##### <a name="default_vhost"></a>`default_vhost`
+##### <a name="-apache--default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
 
@@ -488,9 +488,9 @@ value to `false`.<br />
 > **Note**: Apache will not start without at least one virtual host. If you set this
 to `false` you must configure a virtual host elsewhere.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="dev_packages"></a>`dev_packages`
+##### <a name="-apache--dev_packages"></a>`dev_packages`
 
 Data type: `Optional[Variant[Array, String]]`
 
@@ -506,7 +506,7 @@ class { 'apache':
 
 Default value: `$apache::params::dev_packages`
 
-##### <a name="docroot"></a>`docroot`
+##### <a name="-apache--docroot"></a>`docroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -514,15 +514,15 @@ Sets the default `DocumentRoot` location.
 
 Default value: `$apache::params::docroot`
 
-##### <a name="error_documents"></a>`error_documents`
+##### <a name="-apache--error_documents"></a>`error_documents`
 
 Data type: `Boolean`
 
 Determines whether to enable [custom error documents](https://httpd.apache.org/docs/current/custom-error.html) on the Apache server.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="group"></a>`group`
+##### <a name="-apache--group"></a>`group`
 
 Data type: `String`
 
@@ -537,7 +537,7 @@ process.
 
 Default value: `$apache::params::group`
 
-##### <a name="httpd_dir"></a>`httpd_dir`
+##### <a name="-apache--httpd_dir"></a>`httpd_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -547,7 +547,7 @@ with the default distribution packages.
 
 Default value: `$apache::params::httpd_dir`
 
-##### <a name="http_protocol_options"></a>`http_protocol_options`
+##### <a name="-apache--http_protocol_options"></a>`http_protocol_options`
 
 Data type: `Optional[String]`
 
@@ -557,7 +557,7 @@ Valid options: any sequence of the following alternative values: `Strict` or `Un
 
 Default value: `$apache::params::http_protocol_options`
 
-##### <a name="keepalive"></a>`keepalive`
+##### <a name="-apache--keepalive"></a>`keepalive`
 
 Data type: `Apache::OnOff`
 
@@ -567,7 +567,7 @@ to set relevant options.<br />
 
 Default value: `$apache::params::keepalive`
 
-##### <a name="keepalive_timeout"></a>`keepalive_timeout`
+##### <a name="-apache--keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Integer`
 
@@ -577,7 +577,7 @@ only relevant if the `keepalive` parameter is enabled.
 
 Default value: `$apache::params::keepalive_timeout`
 
-##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
+##### <a name="-apache--max_keepalive_requests"></a>`max_keepalive_requests`
 
 Data type: `Integer`
 
@@ -585,7 +585,7 @@ Limits the number of requests allowed per connection when the `keepalive` parame
 
 Default value: `$apache::params::max_keepalive_requests`
 
-##### <a name="hostname_lookups"></a>`hostname_lookups`
+##### <a name="-apache--hostname_lookups"></a>`hostname_lookups`
 
 Data type: `Variant[Apache::OnOff, Enum['Double', 'double']]`
 
@@ -595,7 +595,7 @@ CGIs/SSIs in REMOTE_HOST.<br />
 
 Default value: `$apache::params::hostname_lookups`
 
-##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
+##### <a name="-apache--ldap_trusted_mode"></a>`ldap_trusted_mode`
 
 Data type: `Optional[String]`
 
@@ -607,9 +607,9 @@ The following modes are supported:
 Not all LDAP toolkits support all the above modes. An error message will be logged at
 runtime if a mode is not supported, and the connection to the LDAP server will fail.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_verify_server_cert"></a>`ldap_verify_server_cert`
+##### <a name="-apache--ldap_verify_server_cert"></a>`ldap_verify_server_cert`
 
 Data type: `Optional[Apache::OnOff]`
 
@@ -617,9 +617,9 @@ Specifies whether to force the verification of a server certificate when establi
 connection to the LDAP server.
 On|Off
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="lib_path"></a>`lib_path`
+##### <a name="-apache--lib_path"></a>`lib_path`
 
 Data type: `String`
 
@@ -628,7 +628,7 @@ Specifies the location whereApache module files are stored.<br />
 
 Default value: `$apache::params::lib_path`
 
-##### <a name="log_level"></a>`log_level`
+##### <a name="-apache--log_level"></a>`log_level`
 
 Data type: `Apache::LogLevel`
 
@@ -637,7 +637,7 @@ which adjusts the verbosity of the messages recorded in the error logs.
 
 Default value: `$apache::params::log_level`
 
-##### <a name="log_formats"></a>`log_formats`
+##### <a name="-apache--log_formats"></a>`log_formats`
 
 Data type: `Hash`
 
@@ -657,7 +657,7 @@ If your `log_formats` parameter contains one of those, it will be overwritten wi
 
 Default value: `{}`
 
-##### <a name="logroot"></a>`logroot`
+##### <a name="-apache--logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -665,7 +665,7 @@ Changes the directory of Apache log files for the virtual host.
 
 Default value: `$apache::params::logroot`
 
-##### <a name="logroot_mode"></a>`logroot_mode`
+##### <a name="-apache--logroot_mode"></a>`logroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
@@ -676,7 +676,7 @@ for details.
 
 Default value: `$apache::params::logroot_mode`
 
-##### <a name="manage_group"></a>`manage_group`
+##### <a name="-apache--manage_group"></a>`manage_group`
 
 Data type: `Boolean`
 
@@ -685,9 +685,9 @@ If you have a group created from another Puppet module that you want to use to r
 set this to `false`. Without this parameter, attempting to use a previously established
 group results in a duplicate resource error.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="supplementary_groups"></a>`supplementary_groups`
+##### <a name="-apache--supplementary_groups"></a>`supplementary_groups`
 
 Data type: `Array`
 
@@ -696,7 +696,7 @@ Notice: This option only has an effect when `manage_user` is set to true.
 
 Default value: `[]`
 
-##### <a name="manage_user"></a>`manage_user`
+##### <a name="-apache--manage_user"></a>`manage_user`
 
 Data type: `Boolean`
 
@@ -705,9 +705,9 @@ This is for instances when you have a user, created from another Puppet module,
 to use to run Apache. Without this parameter, attempting to use a previously established
 user would result in a duplicate resource error.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="mod_dir"></a>`mod_dir`
+##### <a name="-apache--mod_dir"></a>`mod_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -715,7 +715,7 @@ Sets where Puppet places configuration files for your Apache modules.
 
 Default value: `$apache::params::mod_dir`
 
-##### <a name="mod_libs"></a>`mod_libs`
+##### <a name="-apache--mod_libs"></a>`mod_libs`
 
 Data type: `Hash`
 
@@ -731,7 +731,7 @@ class { 'apache':
 
 Default value: `$apache::params::mod_libs`
 
-##### <a name="mod_packages"></a>`mod_packages`
+##### <a name="-apache--mod_packages"></a>`mod_packages`
 
 Data type: `Hash`
 
@@ -747,7 +747,7 @@ class { 'apache':
 
 Default value: `$apache::params::mod_packages`
 
-##### <a name="mpm_module"></a>`mpm_module`
+##### <a name="-apache--mpm_module"></a>`mpm_module`
 
 Data type: `Variant[Boolean, Enum['event', 'itk', 'peruser', 'prefork', 'worker']]`
 
@@ -762,7 +762,7 @@ You must set this to `false` to explicitly declare the following classes with cu
 
 Default value: `$apache::params::mpm_module`
 
-##### <a name="package_ensure"></a>`package_ensure`
+##### <a name="-apache--package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -771,7 +771,7 @@ Controls the `package` resource's `ensure` attribute. Valid values are: `absent`
 
 Default value: `'installed'`
 
-##### <a name="pidfile"></a>`pidfile`
+##### <a name="-apache--pidfile"></a>`pidfile`
 
 Data type: `String`
 
@@ -779,7 +779,7 @@ Allows settting a custom location for the pid file. Useful if using a custom-bui
 
 Default value: `$apache::params::pidfile`
 
-##### <a name="ports_file"></a>`ports_file`
+##### <a name="-apache--ports_file"></a>`ports_file`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -787,7 +787,7 @@ Sets the path to the file containing Apache ports configuration.
 
 Default value: `$apache::params::ports_file`
 
-##### <a name="protocols"></a>`protocols`
+##### <a name="-apache--protocols"></a>`protocols`
 
 Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
@@ -796,16 +796,16 @@ directive, which lists available protocols for the server.
 
 Default value: `[]`
 
-##### <a name="protocols_honor_order"></a>`protocols_honor_order`
+##### <a name="-apache--protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
 Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
 directive which determines whether the order of Protocols sets precedence during negotiation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="purge_configs"></a>`purge_configs`
+##### <a name="-apache--purge_configs"></a>`purge_configs`
 
 Data type: `Boolean`
 
@@ -814,9 +814,9 @@ Setting this to `false` is a stopgap measure to allow the apache module to coexi
 existing or unmanaged configurations. We recommend moving your configuration to resources
 within this module. For virtual host configurations, see `purge_vhost_dir`.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="purge_vhost_dir"></a>`purge_vhost_dir`
+##### <a name="-apache--purge_vhost_dir"></a>`purge_vhost_dir`
 
 Data type: `Optional[Boolean]`
 
@@ -826,9 +826,9 @@ by Puppet.<br />
 Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to
 coexist with existing or otherwise unmanaged configurations within `vhost_dir`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="sendfile"></a>`sendfile`
+##### <a name="-apache--sendfile"></a>`sendfile`
 
 Data type: `Apache::OnOff`
 
@@ -837,15 +837,15 @@ Forces Apache to use the Linux kernel's `sendfile` support to serve static files
 
 Default value: `'On'`
 
-##### <a name="serveradmin"></a>`serveradmin`
+##### <a name="-apache--serveradmin"></a>`serveradmin`
 
 Data type: `Optional[String[1]]`
 
 Sets the Apache server administrator's contact information via Apache's `ServerAdmin` directive.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="servername"></a>`servername`
+##### <a name="-apache--servername"></a>`servername`
 
 Data type: `Optional[String]`
 
@@ -854,7 +854,7 @@ Setting to `false` will not set ServerName at all.
 
 Default value: `$apache::params::servername`
 
-##### <a name="server_root"></a>`server_root`
+##### <a name="-apache--server_root"></a>`server_root`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -862,7 +862,7 @@ Sets the Apache server's root directory via Apache's `ServerRoot` directive.
 
 Default value: `$apache::params::server_root`
 
-##### <a name="server_signature"></a>`server_signature`
+##### <a name="-apache--server_signature"></a>`server_signature`
 
 Data type: `Variant[Apache::OnOff, String]`
 
@@ -872,7 +872,7 @@ directive. Valid values are: `On` or `Off`.
 
 Default value: `'On'`
 
-##### <a name="server_tokens"></a>`server_tokens`
+##### <a name="-apache--server_tokens"></a>`server_tokens`
 
 Data type: `Apache::ServerTokens`
 
@@ -881,15 +881,15 @@ system, via Apache's `ServerTokens` directive.
 
 Default value: `'Prod'`
 
-##### <a name="service_enable"></a>`service_enable`
+##### <a name="-apache--service_enable"></a>`service_enable`
 
 Data type: `Boolean`
 
 Determines whether Puppet enables the Apache HTTPD service when the system is booted.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="service_ensure"></a>`service_ensure`
+##### <a name="-apache--service_ensure"></a>`service_ensure`
 
 Data type: `Variant[Stdlib::Ensure::Service, Boolean]`
 
@@ -901,7 +901,7 @@ application, such as Pacemaker.<br />
 
 Default value: `'running'`
 
-##### <a name="service_name"></a>`service_name`
+##### <a name="-apache--service_name"></a>`service_name`
 
 Data type: `String`
 
@@ -909,24 +909,24 @@ Sets the name of the Apache service.
 
 Default value: `$apache::params::service_name`
 
-##### <a name="service_manage"></a>`service_manage`
+##### <a name="-apache--service_manage"></a>`service_manage`
 
 Data type: `Boolean`
 
 Determines whether Puppet manages the HTTPD service's state.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="service_restart"></a>`service_restart`
+##### <a name="-apache--service_restart"></a>`service_restart`
 
 Data type: `Optional[String]`
 
 Determines whether Puppet should use a specific command to restart the HTTPD service.
 Values: a command to restart the Apache service.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="timeout"></a>`timeout`
+##### <a name="-apache--timeout"></a>`timeout`
 
 Data type: `Integer[0]`
 
@@ -935,7 +935,7 @@ certain events before failing a request.
 
 Default value: `60`
 
-##### <a name="trace_enable"></a>`trace_enable`
+##### <a name="-apache--trace_enable"></a>`trace_enable`
 
 Data type: `Variant[Apache::OnOff, Enum['extended']]`
 
@@ -943,7 +943,7 @@ Controls how Apache handles `TRACE` requests (per RFC 2616) via the `TraceEnable
 
 Default value: `'On'`
 
-##### <a name="use_canonical_name"></a>`use_canonical_name`
+##### <a name="-apache--use_canonical_name"></a>`use_canonical_name`
 
 Data type: `Optional[Variant[Apache::OnOff, Enum['DNS', 'dns']]]`
 
@@ -951,9 +951,9 @@ Controls Apache's `UseCanonicalName` directive which controls how Apache handles
 self-referential URLs. If not specified, this parameter omits the declaration from the
 server's configuration and uses Apache's default setting of 'off'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="use_systemd"></a>`use_systemd`
+##### <a name="-apache--use_systemd"></a>`use_systemd`
 
 Data type: `Boolean`
 
@@ -962,7 +962,7 @@ especially useful if using custom-built RPMs.
 
 Default value: `$apache::params::use_systemd`
 
-##### <a name="file_mode"></a>`file_mode`
+##### <a name="-apache--file_mode"></a>`file_mode`
 
 Data type: `Stdlib::Filemode`
 
@@ -971,7 +971,7 @@ Valid values are: a string, with permissions mode in symbolic or numeric notatio
 
 Default value: `$apache::params::file_mode`
 
-##### <a name="root_directory_options"></a>`root_directory_options`
+##### <a name="-apache--root_directory_options"></a>`root_directory_options`
 
 Data type: `Array`
 
@@ -979,7 +979,7 @@ Array of the desired options for the `/` directory in httpd.conf.
 
 Default value: `$apache::params::root_directory_options`
 
-##### <a name="root_directory_secured"></a>`root_directory_secured`
+##### <a name="-apache--root_directory_secured"></a>`root_directory_secured`
 
 Data type: `Boolean`
 
@@ -989,9 +989,9 @@ allows access to all resources that are missing a more specific access policy. A
 used to allow access to these resources (for example, in a directory block using the
 `directories` parameter).
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="vhost_dir"></a>`vhost_dir`
+##### <a name="-apache--vhost_dir"></a>`vhost_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -999,7 +999,7 @@ Changes your virtual host configuration files' location.
 
 Default value: `$apache::params::vhost_dir`
 
-##### <a name="vhost_include_pattern"></a>`vhost_include_pattern`
+##### <a name="-apache--vhost_include_pattern"></a>`vhost_include_pattern`
 
 Data type: `String`
 
@@ -1012,7 +1012,7 @@ files ending in `.conf`.
 
 Default value: `$apache::params::vhost_include_pattern`
 
-##### <a name="user"></a>`user`
+##### <a name="-apache--user"></a>`user`
 
 Data type: `String`
 
@@ -1022,7 +1022,7 @@ To prevent Puppet from managing the user, set the `manage_user` parameter to `fa
 
 Default value: `$apache::params::user`
 
-##### <a name="apache_name"></a>`apache_name`
+##### <a name="-apache--apache_name"></a>`apache_name`
 
 Data type: `String`
 
@@ -1032,7 +1032,7 @@ For CentOS/RHEL Software Collections (SCL), you can also use `apache::version::s
 
 Default value: `$apache::params::apache_name`
 
-##### <a name="error_log"></a>`error_log`
+##### <a name="-apache--error_log"></a>`error_log`
 
 Data type: `String`
 
@@ -1042,7 +1042,7 @@ The name of the error log file for the main server instance. If the string start
 
 Default value: `$apache::params::error_log`
 
-##### <a name="scriptalias"></a>`scriptalias`
+##### <a name="-apache--scriptalias"></a>`scriptalias`
 
 Data type: `String`
 
@@ -1050,7 +1050,7 @@ Directory to use for global script alias
 
 Default value: `$apache::params::scriptalias`
 
-##### <a name="access_log_file"></a>`access_log_file`
+##### <a name="-apache--access_log_file"></a>`access_log_file`
 
 Data type: `String`
 
@@ -1058,7 +1058,7 @@ The name of the access log file for the main server instance.
 
 Default value: `$apache::params::access_log_file`
 
-##### <a name="limitreqfields"></a>`limitreqfields`
+##### <a name="-apache--limitreqfields"></a>`limitreqfields`
 
 Data type: `Integer`
 
@@ -1070,7 +1070,7 @@ response from the server that indicates too many fields were sent in the request
 
 Default value: `100`
 
-##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
+##### <a name="-apache--limitreqfieldsize"></a>`limitreqfieldsize`
 
 Data type: `Integer`
 
@@ -1079,32 +1079,32 @@ be allowed within a request header.
 
 Default value: `8190`
 
-##### <a name="limitreqline"></a>`limitreqline`
+##### <a name="-apache--limitreqline"></a>`limitreqline`
 
 Data type: `Optional[Integer]`
 
 The 'limitreqline' parameter sets the limit on the allowed size of a client's HTTP request-line
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ip"></a>`ip`
+##### <a name="-apache--ip"></a>`ip`
 
 Data type: `Optional[String]`
 
 Specifies the ip address
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="purge_vdir"></a>`purge_vdir`
+##### <a name="-apache--purge_vdir"></a>`purge_vdir`
 
 Data type: `Boolean`
 
 Removes all other Apache configs and virtual hosts.<br />
 > **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.<br />
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="conf_enabled"></a>`conf_enabled`
+##### <a name="-apache--conf_enabled"></a>`conf_enabled`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1112,7 +1112,7 @@ Whether the additional config files in `/etc/apache2/conf-enabled` should be man
 
 Default value: `$apache::params::conf_enabled`
 
-##### <a name="vhost_enable_dir"></a>`vhost_enable_dir`
+##### <a name="-apache--vhost_enable_dir"></a>`vhost_enable_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1121,15 +1121,15 @@ they will be symlinked to and from sites-enabled.
 
 Default value: `$apache::params::vhost_enable_dir`
 
-##### <a name="manage_vhost_enable_dir"></a>`manage_vhost_enable_dir`
+##### <a name="-apache--manage_vhost_enable_dir"></a>`manage_vhost_enable_dir`
 
 Data type: `Boolean`
 
 Overides the vhost_enable_dir inherited parameters and allows it to be disabled
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="mod_enable_dir"></a>`mod_enable_dir`
+##### <a name="-apache--mod_enable_dir"></a>`mod_enable_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1137,25 +1137,25 @@ Set's whether the mods-enabled directory should be managed.
 
 Default value: `$apache::params::mod_enable_dir`
 
-##### <a name="ssl_file"></a>`ssl_file`
+##### <a name="-apache--ssl_file"></a>`ssl_file`
 
 Data type: `Optional[String]`
 
 This parameter allows you to set an ssl.conf file to be managed in order to implement
 an SSL Certificate.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="file_e_tag"></a>`file_e_tag`
+##### <a name="-apache--file_e_tag"></a>`file_e_tag`
 
 Data type: `Optional[String]`
 
 Sets the server default for the `FileETag` declaration, which modifies the response header
 field for static files.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="use_optional_includes"></a>`use_optional_includes`
+##### <a name="-apache--use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Boolean`
 
@@ -1164,7 +1164,7 @@ Specifies whether Apache uses the `IncludeOptional` directive instead of `Includ
 
 Default value: `$apache::params::use_optional_includes`
 
-##### <a name="mime_types_additional"></a>`mime_types_additional`
+##### <a name="-apache--mime_types_additional"></a>`mime_types_additional`
 
 Data type: `Hash`
 
@@ -1172,7 +1172,7 @@ Specifies any idditional Internet media (mime) types that you wish to be configu
 
 Default value: `$apache::params::mime_types_additional`
 
-### <a name="apachedev"></a>`apache::dev`
+### <a name="apache--dev"></a>`apache::dev`
 
 The libraries installed depends on the `dev_packages` parameter of the `apache::params`
 class, based on your operating system:
@@ -1181,7 +1181,7 @@ class, based on your operating system:
 - **Gentoo**: `undef`.
 - **Red Hat**: `httpd-devel`.
 
-### <a name="apachemodactions"></a>`apache::mod::actions`
+### <a name="apache--mod--actions"></a>`apache::mod::actions`
 
 Installs Apache mod_actions
 
@@ -1189,7 +1189,7 @@ Installs Apache mod_actions
   * https://httpd.apache.org/docs/current/mod/mod_actions.html
     * for additional documentation.
 
-### <a name="apachemodalias"></a>`apache::mod::alias`
+### <a name="apache--mod--alias"></a>`apache::mod::alias`
 
 Installs and configures `mod_alias`.
 
@@ -1201,11 +1201,11 @@ Installs and configures `mod_alias`.
 
 The following parameters are available in the `apache::mod::alias` class:
 
-* [`icons_options`](#icons_options)
-* [`icons_path`](#icons_path)
-* [`icons_prefix`](#icons_prefix)
+* [`icons_options`](#-apache--mod--alias--icons_options)
+* [`icons_path`](#-apache--mod--alias--icons_path)
+* [`icons_prefix`](#-apache--mod--alias--icons_prefix)
 
-##### <a name="icons_options"></a>`icons_options`
+##### <a name="-apache--mod--alias--icons_options"></a>`icons_options`
 
 Data type: `String`
 
@@ -1214,7 +1214,7 @@ directive.
 
 Default value: `'Indexes MultiViews'`
 
-##### <a name="icons_path"></a>`icons_path`
+##### <a name="-apache--mod--alias--icons_path"></a>`icons_path`
 
 Data type: `Variant[Boolean, Stdlib::Absolutepath]`
 
@@ -1227,7 +1227,7 @@ Set to 'false' to disable the alias
 
 Default value: `$apache::params::alias_icons_path`
 
-##### <a name="icons_prefix"></a>`icons_prefix`
+##### <a name="-apache--mod--alias--icons_prefix"></a>`icons_prefix`
 
 Data type: `String`
 
@@ -1235,7 +1235,7 @@ Change the alias for /icons/.
 
 Default value: `$apache::params::icons_prefix`
 
-### <a name="apachemodapreq2"></a>`apache::mod::apreq2`
+### <a name="apache--mod--apreq2"></a>`apache::mod::apreq2`
 
 Installs `mod_apreq2`.
 
@@ -1245,7 +1245,7 @@ Installs `mod_apreq2`.
   * http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html
     * for additional documentation.
 
-### <a name="apachemodauth_basic"></a>`apache::mod::auth_basic`
+### <a name="apache--mod--auth_basic"></a>`apache::mod::auth_basic`
 
 Installs `mod_auth_basic`
 
@@ -1253,7 +1253,7 @@ Installs `mod_auth_basic`
   * https://httpd.apache.org/docs/current/mod/mod_auth_basic.html
     * for additional documentation.
 
-### <a name="apachemodauth_cas"></a>`apache::mod::auth_cas`
+### <a name="apache--mod--auth_cas"></a>`apache::mod::auth_cas`
 
 Installs and configures `mod_auth_cas`.
 
@@ -1267,45 +1267,45 @@ Installs and configures `mod_auth_cas`.
 
 The following parameters are available in the `apache::mod::auth_cas` class:
 
-* [`cas_login_url`](#cas_login_url)
-* [`cas_validate_url`](#cas_validate_url)
-* [`cas_cookie_path`](#cas_cookie_path)
-* [`cas_cookie_path_mode`](#cas_cookie_path_mode)
-* [`cas_version`](#cas_version)
-* [`cas_debug`](#cas_debug)
-* [`cas_validate_server`](#cas_validate_server)
-* [`cas_validate_depth`](#cas_validate_depth)
-* [`cas_certificate_path`](#cas_certificate_path)
-* [`cas_proxy_validate_url`](#cas_proxy_validate_url)
-* [`cas_root_proxied_as`](#cas_root_proxied_as)
-* [`cas_cookie_entropy`](#cas_cookie_entropy)
-* [`cas_timeout`](#cas_timeout)
-* [`cas_idle_timeout`](#cas_idle_timeout)
-* [`cas_cache_clean_interval`](#cas_cache_clean_interval)
-* [`cas_cookie_domain`](#cas_cookie_domain)
-* [`cas_cookie_http_only`](#cas_cookie_http_only)
-* [`cas_authoritative`](#cas_authoritative)
-* [`cas_validate_saml`](#cas_validate_saml)
-* [`cas_sso_enabled`](#cas_sso_enabled)
-* [`cas_attribute_prefix`](#cas_attribute_prefix)
-* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
-* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
-* [`suppress_warning`](#suppress_warning)
-
-##### <a name="cas_login_url"></a>`cas_login_url`
+* [`cas_login_url`](#-apache--mod--auth_cas--cas_login_url)
+* [`cas_validate_url`](#-apache--mod--auth_cas--cas_validate_url)
+* [`cas_cookie_path`](#-apache--mod--auth_cas--cas_cookie_path)
+* [`cas_cookie_path_mode`](#-apache--mod--auth_cas--cas_cookie_path_mode)
+* [`cas_version`](#-apache--mod--auth_cas--cas_version)
+* [`cas_debug`](#-apache--mod--auth_cas--cas_debug)
+* [`cas_validate_server`](#-apache--mod--auth_cas--cas_validate_server)
+* [`cas_validate_depth`](#-apache--mod--auth_cas--cas_validate_depth)
+* [`cas_certificate_path`](#-apache--mod--auth_cas--cas_certificate_path)
+* [`cas_proxy_validate_url`](#-apache--mod--auth_cas--cas_proxy_validate_url)
+* [`cas_root_proxied_as`](#-apache--mod--auth_cas--cas_root_proxied_as)
+* [`cas_cookie_entropy`](#-apache--mod--auth_cas--cas_cookie_entropy)
+* [`cas_timeout`](#-apache--mod--auth_cas--cas_timeout)
+* [`cas_idle_timeout`](#-apache--mod--auth_cas--cas_idle_timeout)
+* [`cas_cache_clean_interval`](#-apache--mod--auth_cas--cas_cache_clean_interval)
+* [`cas_cookie_domain`](#-apache--mod--auth_cas--cas_cookie_domain)
+* [`cas_cookie_http_only`](#-apache--mod--auth_cas--cas_cookie_http_only)
+* [`cas_authoritative`](#-apache--mod--auth_cas--cas_authoritative)
+* [`cas_validate_saml`](#-apache--mod--auth_cas--cas_validate_saml)
+* [`cas_sso_enabled`](#-apache--mod--auth_cas--cas_sso_enabled)
+* [`cas_attribute_prefix`](#-apache--mod--auth_cas--cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#-apache--mod--auth_cas--cas_attribute_delimiter)
+* [`cas_scrub_request_headers`](#-apache--mod--auth_cas--cas_scrub_request_headers)
+* [`suppress_warning`](#-apache--mod--auth_cas--suppress_warning)
+
+##### <a name="-apache--mod--auth_cas--cas_login_url"></a>`cas_login_url`
 
 Data type: `String`
 
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
 
-##### <a name="cas_validate_url"></a>`cas_validate_url`
+##### <a name="-apache--mod--auth_cas--cas_validate_url"></a>`cas_validate_url`
 
 Data type: `String`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
-##### <a name="cas_cookie_path"></a>`cas_cookie_path`
+##### <a name="-apache--mod--auth_cas--cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `String`
 
@@ -1314,7 +1314,7 @@ be writable by the web server only.
 
 Default value: `$apache::params::cas_cookie_path`
 
-##### <a name="cas_cookie_path_mode"></a>`cas_cookie_path_mode`
+##### <a name="-apache--mod--auth_cas--cas_cookie_path_mode"></a>`cas_cookie_path_mode`
 
 Data type: `Stdlib::Filemode`
 
@@ -1322,7 +1322,7 @@ The mode of cas_cookie_path.
 
 Default value: `'0750'`
 
-##### <a name="cas_version"></a>`cas_version`
+##### <a name="-apache--mod--auth_cas--cas_version"></a>`cas_version`
 
 Data type: `Integer`
 
@@ -1330,7 +1330,7 @@ The version of the CAS protocol to adhere to.
 
 Default value: `2`
 
-##### <a name="cas_debug"></a>`cas_debug`
+##### <a name="-apache--mod--auth_cas--cas_debug"></a>`cas_debug`
 
 Data type: `String`
 
@@ -1338,156 +1338,156 @@ Whether to enable or disable debug mode.
 
 Default value: `'Off'`
 
-##### <a name="cas_validate_server"></a>`cas_validate_server`
+##### <a name="-apache--mod--auth_cas--cas_validate_server"></a>`cas_validate_server`
 
 Data type: `Optional[String]`
 
 Whether to validate the presented certificate. This has been deprecated and
 removed from Version 1.1-RC1 onward.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_validate_depth"></a>`cas_validate_depth`
+##### <a name="-apache--mod--auth_cas--cas_validate_depth"></a>`cas_validate_depth`
 
 Data type: `Optional[String]`
 
 The maximum depth for chained certificate validation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_certificate_path"></a>`cas_certificate_path`
+##### <a name="-apache--mod--auth_cas--cas_certificate_path"></a>`cas_certificate_path`
 
 Data type: `Optional[String]`
 
 The path leading to the certificate
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_proxy_validate_url"></a>`cas_proxy_validate_url`
+##### <a name="-apache--mod--auth_cas--cas_proxy_validate_url"></a>`cas_proxy_validate_url`
 
 Data type: `Optional[String]`
 
 The URL to use when performing a proxy validation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
+##### <a name="-apache--mod--auth_cas--cas_root_proxied_as"></a>`cas_root_proxied_as`
 
 Data type: `Optional[String]`
 
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cookie_entropy"></a>`cas_cookie_entropy`
+##### <a name="-apache--mod--auth_cas--cas_cookie_entropy"></a>`cas_cookie_entropy`
 
 Data type: `Optional[String]`
 
 When creating a local session, this many random bytes are used to create a unique
 session identifier.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_timeout"></a>`cas_timeout`
+##### <a name="-apache--mod--auth_cas--cas_timeout"></a>`cas_timeout`
 
 Data type: `Optional[Integer[0]]`
 
 The hard limit, in seconds, for a mod_auth_cas session.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_idle_timeout"></a>`cas_idle_timeout`
+##### <a name="-apache--mod--auth_cas--cas_idle_timeout"></a>`cas_idle_timeout`
 
 Data type: `Optional[Integer[0]]`
 
 The limit, in seconds, of how long a mod_auth_cas session can be idle.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cache_clean_interval"></a>`cas_cache_clean_interval`
+##### <a name="-apache--mod--auth_cas--cas_cache_clean_interval"></a>`cas_cache_clean_interval`
 
 Data type: `Optional[String]`
 
 The minimum amount of time that must pass inbetween cache cleanings.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cookie_domain"></a>`cas_cookie_domain`
+##### <a name="-apache--mod--auth_cas--cas_cookie_domain"></a>`cas_cookie_domain`
 
 Data type: `Optional[String]`
 
 The value for the 'Domain=' parameter in the Set-Cookie header.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cookie_http_only"></a>`cas_cookie_http_only`
+##### <a name="-apache--mod--auth_cas--cas_cookie_http_only"></a>`cas_cookie_http_only`
 
 Data type: `Optional[String]`
 
 Setting this flag prevents the mod_auth_cas cookies from being accessed by
 client side Javascript.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_authoritative"></a>`cas_authoritative`
+##### <a name="-apache--mod--auth_cas--cas_authoritative"></a>`cas_authoritative`
 
 Data type: `Optional[String]`
 
 Determines whether an optional authorization directive is authoritative and thus binding.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_validate_saml"></a>`cas_validate_saml`
+##### <a name="-apache--mod--auth_cas--cas_validate_saml"></a>`cas_validate_saml`
 
 Data type: `Optional[String]`
 
 Parse response from CAS server for SAML.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
+##### <a name="-apache--mod--auth_cas--cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Optional[String]`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
+##### <a name="-apache--mod--auth_cas--cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Optional[String]`
 
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
+##### <a name="-apache--mod--auth_cas--cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Optional[String]`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
+##### <a name="-apache--mod--auth_cas--cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
 Data type: `Optional[String]`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="suppress_warning"></a>`suppress_warning`
+##### <a name="-apache--mod--auth_cas--suppress_warning"></a>`suppress_warning`
 
 Data type: `Boolean`
 
 Suppress warning about being on RedHat (mod_auth_cas package is now available in epel-testing repo).
 
-Default value: ``false``
+Default value: `false`
 
-### <a name="apachemodauth_gssapi"></a>`apache::mod::auth_gssapi`
+### <a name="apache--mod--auth_gssapi"></a>`apache::mod::auth_gssapi`
 
 Installs `mod_auth_gsappi`.
 
@@ -1495,7 +1495,7 @@ Installs `mod_auth_gsappi`.
   * https://github.com/modauthgssapi/mod_auth_gssapi
     * for additional documentation.
 
-### <a name="apachemodauth_kerb"></a>`apache::mod::auth_kerb`
+### <a name="apache--mod--auth_kerb"></a>`apache::mod::auth_kerb`
 
 Installs `mod_auth_kerb`
 
@@ -1503,7 +1503,7 @@ Installs `mod_auth_kerb`
   * http://modauthkerb.sourceforge.net
     * for additional documentation.
 
-### <a name="apachemodauth_mellon"></a>`apache::mod::auth_mellon`
+### <a name="apache--mod--auth_mellon"></a>`apache::mod::auth_mellon`
 
 Installs and configures `mod_auth_mellon`.
 
@@ -1515,15 +1515,15 @@ Installs and configures `mod_auth_mellon`.
 
 The following parameters are available in the `apache::mod::auth_mellon` class:
 
-* [`mellon_cache_size`](#mellon_cache_size)
-* [`mellon_lock_file`](#mellon_lock_file)
-* [`mellon_post_directory`](#mellon_post_directory)
-* [`mellon_cache_entry_size`](#mellon_cache_entry_size)
-* [`mellon_post_ttl`](#mellon_post_ttl)
-* [`mellon_post_size`](#mellon_post_size)
-* [`mellon_post_count`](#mellon_post_count)
+* [`mellon_cache_size`](#-apache--mod--auth_mellon--mellon_cache_size)
+* [`mellon_lock_file`](#-apache--mod--auth_mellon--mellon_lock_file)
+* [`mellon_post_directory`](#-apache--mod--auth_mellon--mellon_post_directory)
+* [`mellon_cache_entry_size`](#-apache--mod--auth_mellon--mellon_cache_entry_size)
+* [`mellon_post_ttl`](#-apache--mod--auth_mellon--mellon_post_ttl)
+* [`mellon_post_size`](#-apache--mod--auth_mellon--mellon_post_size)
+* [`mellon_post_count`](#-apache--mod--auth_mellon--mellon_post_count)
 
-##### <a name="mellon_cache_size"></a>`mellon_cache_size`
+##### <a name="-apache--mod--auth_mellon--mellon_cache_size"></a>`mellon_cache_size`
 
 Data type: `Optional[Integer]`
 
@@ -1531,7 +1531,7 @@ Maximum number of sessions which can be active at once.
 
 Default value: `$apache::params::mellon_cache_size`
 
-##### <a name="mellon_lock_file"></a>`mellon_lock_file`
+##### <a name="-apache--mod--auth_mellon--mellon_lock_file"></a>`mellon_lock_file`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1539,7 +1539,7 @@ Full path to a file used for synchronizing access to the session data.
 
 Default value: `$apache::params::mellon_lock_file`
 
-##### <a name="mellon_post_directory"></a>`mellon_post_directory`
+##### <a name="-apache--mod--auth_mellon--mellon_post_directory"></a>`mellon_post_directory`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -1547,39 +1547,39 @@ Full path of a directory where POST requests are saved during authentication.
 
 Default value: `$apache::params::mellon_post_directory`
 
-##### <a name="mellon_cache_entry_size"></a>`mellon_cache_entry_size`
+##### <a name="-apache--mod--auth_mellon--mellon_cache_entry_size"></a>`mellon_cache_entry_size`
 
 Data type: `Optional[Integer]`
 
 Maximum size for a single session entry in bytes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mellon_post_ttl"></a>`mellon_post_ttl`
+##### <a name="-apache--mod--auth_mellon--mellon_post_ttl"></a>`mellon_post_ttl`
 
 Data type: `Optional[Integer]`
 
 Delay in seconds before a saved POST request can be flushed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mellon_post_size"></a>`mellon_post_size`
+##### <a name="-apache--mod--auth_mellon--mellon_post_size"></a>`mellon_post_size`
 
 Data type: `Optional[Integer]`
 
 Maximum size for saved POST requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mellon_post_count"></a>`mellon_post_count`
+##### <a name="-apache--mod--auth_mellon--mellon_post_count"></a>`mellon_post_count`
 
 Data type: `Optional[Integer]`
 
 Maximum amount of saved POST requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodauth_openidc"></a>`apache::mod::auth_openidc`
+### <a name="apache--mod--auth_openidc"></a>`apache::mod::auth_openidc`
 
 Installs and configures `mod_auth_openidc`.
 
@@ -1593,19 +1593,19 @@ Installs and configures `mod_auth_openidc`.
 
 The following parameters are available in the `apache::mod::auth_openidc` class:
 
-* [`manage_dnf_module`](#manage_dnf_module)
-* [`dnf_module_ensure`](#dnf_module_ensure)
-* [`dnf_module_name`](#dnf_module_name)
+* [`manage_dnf_module`](#-apache--mod--auth_openidc--manage_dnf_module)
+* [`dnf_module_ensure`](#-apache--mod--auth_openidc--dnf_module_ensure)
+* [`dnf_module_name`](#-apache--mod--auth_openidc--dnf_module_name)
 
-##### <a name="manage_dnf_module"></a>`manage_dnf_module`
+##### <a name="-apache--mod--auth_openidc--manage_dnf_module"></a>`manage_dnf_module`
 
 Data type: `Boolean`
 
 Whether to manage the DNF module
 
-Default value: `and`
+Default value: `$facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8'`
 
-##### <a name="dnf_module_ensure"></a>`dnf_module_ensure`
+##### <a name="-apache--mod--auth_openidc--dnf_module_ensure"></a>`dnf_module_ensure`
 
 Data type: `String[1]`
 
@@ -1613,7 +1613,7 @@ The DNF module name to ensure. Only relevant if manage_dnf_module is set to true
 
 Default value: `'present'`
 
-##### <a name="dnf_module_name"></a>`dnf_module_name`
+##### <a name="-apache--mod--auth_openidc--dnf_module_name"></a>`dnf_module_name`
 
 Data type: `String[1]`
 
@@ -1621,7 +1621,7 @@ The DNF module name to manage. Only relevant if manage_dnf_module is set to true
 
 Default value: `'mod_auth_openidc'`
 
-### <a name="apachemodauthn_core"></a>`apache::mod::authn_core`
+### <a name="apache--mod--authn_core"></a>`apache::mod::authn_core`
 
 Installs `mod_authn_core`.
 
@@ -1629,7 +1629,7 @@ Installs `mod_authn_core`.
   * https://httpd.apache.org/docs/current/mod/mod_authn_core.html
     * for additional documentation.
 
-### <a name="apachemodauthn_dbd"></a>`apache::mod::authn_dbd`
+### <a name="apache--mod--authn_dbd"></a>`apache::mod::authn_dbd`
 
 Installs `mod_authn_dbd`.
 
@@ -1641,22 +1641,22 @@ Installs `mod_authn_dbd`.
 
 The following parameters are available in the `apache::mod::authn_dbd` class:
 
-* [`authn_dbd_params`](#authn_dbd_params)
-* [`authn_dbd_dbdriver`](#authn_dbd_dbdriver)
-* [`authn_dbd_query`](#authn_dbd_query)
-* [`authn_dbd_min`](#authn_dbd_min)
-* [`authn_dbd_max`](#authn_dbd_max)
-* [`authn_dbd_keep`](#authn_dbd_keep)
-* [`authn_dbd_exptime`](#authn_dbd_exptime)
-* [`authn_dbd_alias`](#authn_dbd_alias)
+* [`authn_dbd_params`](#-apache--mod--authn_dbd--authn_dbd_params)
+* [`authn_dbd_dbdriver`](#-apache--mod--authn_dbd--authn_dbd_dbdriver)
+* [`authn_dbd_query`](#-apache--mod--authn_dbd--authn_dbd_query)
+* [`authn_dbd_min`](#-apache--mod--authn_dbd--authn_dbd_min)
+* [`authn_dbd_max`](#-apache--mod--authn_dbd--authn_dbd_max)
+* [`authn_dbd_keep`](#-apache--mod--authn_dbd--authn_dbd_keep)
+* [`authn_dbd_exptime`](#-apache--mod--authn_dbd--authn_dbd_exptime)
+* [`authn_dbd_alias`](#-apache--mod--authn_dbd--authn_dbd_alias)
 
-##### <a name="authn_dbd_params"></a>`authn_dbd_params`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_params"></a>`authn_dbd_params`
 
 Data type: `Optional[String]`
 
 The params needed for the mod to function.
 
-##### <a name="authn_dbd_dbdriver"></a>`authn_dbd_dbdriver`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_dbdriver"></a>`authn_dbd_dbdriver`
 
 Data type: `String`
 
@@ -1664,15 +1664,15 @@ Selects an apr_dbd driver by name.
 
 Default value: `'mysql'`
 
-##### <a name="authn_dbd_query"></a>`authn_dbd_query`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_query"></a>`authn_dbd_query`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="authn_dbd_min"></a>`authn_dbd_min`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_min"></a>`authn_dbd_min`
 
 Data type: `Integer`
 
@@ -1680,7 +1680,7 @@ Set the minimum number of connections per process.
 
 Default value: `4`
 
-##### <a name="authn_dbd_max"></a>`authn_dbd_max`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_max"></a>`authn_dbd_max`
 
 Data type: `Integer`
 
@@ -1688,7 +1688,7 @@ Set the maximum number of connections per process.
 
 Default value: `20`
 
-##### <a name="authn_dbd_keep"></a>`authn_dbd_keep`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_keep"></a>`authn_dbd_keep`
 
 Data type: `Integer`
 
@@ -1696,7 +1696,7 @@ Set the maximum number of connections per process to be sustained.
 
 Default value: `8`
 
-##### <a name="authn_dbd_exptime"></a>`authn_dbd_exptime`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_exptime"></a>`authn_dbd_exptime`
 
 Data type: `Integer`
 
@@ -1705,15 +1705,15 @@ connections specified in DBDKeep has been exceeded.
 
 Default value: `300`
 
-##### <a name="authn_dbd_alias"></a>`authn_dbd_alias`
+##### <a name="-apache--mod--authn_dbd--authn_dbd_alias"></a>`authn_dbd_alias`
 
 Data type: `Optional[String]`
 
 Sets an alias for `AuthnProvider.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodauthn_file"></a>`apache::mod::authn_file`
+### <a name="apache--mod--authn_file"></a>`apache::mod::authn_file`
 
 Installs `mod_authn_file`.
 
@@ -1721,7 +1721,7 @@ Installs `mod_authn_file`.
   * https://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
     * for additional documentation.
 
-### <a name="apachemodauthnz_ldap"></a>`apache::mod::authnz_ldap`
+### <a name="apache--mod--authnz_ldap"></a>`apache::mod::authnz_ldap`
 
 Installs `mod_authnz_ldap`.
 
@@ -1735,26 +1735,26 @@ Installs `mod_authnz_ldap`.
 
 The following parameters are available in the `apache::mod::authnz_ldap` class:
 
-* [`verify_server_cert`](#verify_server_cert)
-* [`package_name`](#package_name)
+* [`verify_server_cert`](#-apache--mod--authnz_ldap--verify_server_cert)
+* [`package_name`](#-apache--mod--authnz_ldap--package_name)
 
-##### <a name="verify_server_cert"></a>`verify_server_cert`
+##### <a name="-apache--mod--authnz_ldap--verify_server_cert"></a>`verify_server_cert`
 
 Data type: `Boolean`
 
 Whether to force te verification of a server cert or not.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--authnz_ldap--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 The name of the ldap package.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodauthnz_pam"></a>`apache::mod::authnz_pam`
+### <a name="apache--mod--authnz_pam"></a>`apache::mod::authnz_pam`
 
 Installs `mod_authnz_pam`.
 
@@ -1762,7 +1762,7 @@ Installs `mod_authnz_pam`.
   * https://www.adelton.com/apache/mod_authnz_pam
     * for additional documentation.
 
-### <a name="apachemodauthz_core"></a>`apache::mod::authz_core`
+### <a name="apache--mod--authz_core"></a>`apache::mod::authz_core`
 
 Installs `mod_authz_core`.
 
@@ -1770,7 +1770,7 @@ Installs `mod_authz_core`.
   * https://httpd.apache.org/docs/current/mod/mod_authz_core.html
     * for additional documentation.
 
-### <a name="apachemodauthz_groupfile"></a>`apache::mod::authz_groupfile`
+### <a name="apache--mod--authz_groupfile"></a>`apache::mod::authz_groupfile`
 
 Installs `mod_authz_groupfile`
 
@@ -1778,7 +1778,7 @@ Installs `mod_authz_groupfile`
   * https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html
     * for additional documentation.
 
-### <a name="apachemodauthz_user"></a>`apache::mod::authz_user`
+### <a name="apache--mod--authz_user"></a>`apache::mod::authz_user`
 
 Installs `mod_authz_user`
 
@@ -1786,7 +1786,7 @@ Installs `mod_authz_user`
   * https://httpd.apache.org/docs/current/mod/mod_authz_user.html
     * for additional documentation.
 
-### <a name="apachemodautoindex"></a>`apache::mod::autoindex`
+### <a name="apache--mod--autoindex"></a>`apache::mod::autoindex`
 
 Installs `mod_autoindex`
 
@@ -1798,9 +1798,9 @@ Installs `mod_autoindex`
 
 The following parameters are available in the `apache::mod::autoindex` class:
 
-* [`icons_prefix`](#icons_prefix)
+* [`icons_prefix`](#-apache--mod--autoindex--icons_prefix)
 
-##### <a name="icons_prefix"></a>`icons_prefix`
+##### <a name="-apache--mod--autoindex--icons_prefix"></a>`icons_prefix`
 
 Data type: `String`
 
@@ -1808,7 +1808,7 @@ Change the alias for /icons/.
 
 Default value: `$apache::params::icons_prefix`
 
-### <a name="apachemodcache"></a>`apache::mod::cache`
+### <a name="apache--mod--cache"></a>`apache::mod::cache`
 
 Installs `mod_cache`
 
@@ -1816,7 +1816,7 @@ Installs `mod_cache`
   * https://httpd.apache.org/docs/current/mod/mod_cache.html
     * for additional documentation.
 
-### <a name="apachemodcgi"></a>`apache::mod::cgi`
+### <a name="apache--mod--cgi"></a>`apache::mod::cgi`
 
 Installs `mod_cgi`.
 
@@ -1824,14 +1824,14 @@ Installs `mod_cgi`.
   * https://httpd.apache.org/docs/current/mod/mod_cgi.html
     * for additional documentation.
 
-### <a name="apachemodcgid"></a>`apache::mod::cgid`
+### <a name="apache--mod--cgid"></a>`apache::mod::cgid`
 
 Installs `mod_cgid`.
 
 * **See also**
   * https://httpd.apache.org/docs/current/mod/mod_cgid.html
 
-### <a name="apachemodcluster"></a>`apache::mod::cluster`
+### <a name="apache--mod--cluster"></a>`apache::mod::cluster`
 
 Installs `mod_cluster`.
 
@@ -1859,51 +1859,51 @@ class { '::apache::mod::cluster':
 
 The following parameters are available in the `apache::mod::cluster` class:
 
-* [`allowed_network`](#allowed_network)
-* [`balancer_name`](#balancer_name)
-* [`ip`](#ip)
-* [`version`](#version)
-* [`enable_mcpm_receive`](#enable_mcpm_receive)
-* [`port`](#port)
-* [`keep_alive_timeout`](#keep_alive_timeout)
-* [`manager_allowed_network`](#manager_allowed_network)
-* [`max_keep_alive_requests`](#max_keep_alive_requests)
-* [`server_advertise`](#server_advertise)
-* [`advertise_frequency`](#advertise_frequency)
+* [`allowed_network`](#-apache--mod--cluster--allowed_network)
+* [`balancer_name`](#-apache--mod--cluster--balancer_name)
+* [`ip`](#-apache--mod--cluster--ip)
+* [`version`](#-apache--mod--cluster--version)
+* [`enable_mcpm_receive`](#-apache--mod--cluster--enable_mcpm_receive)
+* [`port`](#-apache--mod--cluster--port)
+* [`keep_alive_timeout`](#-apache--mod--cluster--keep_alive_timeout)
+* [`manager_allowed_network`](#-apache--mod--cluster--manager_allowed_network)
+* [`max_keep_alive_requests`](#-apache--mod--cluster--max_keep_alive_requests)
+* [`server_advertise`](#-apache--mod--cluster--server_advertise)
+* [`advertise_frequency`](#-apache--mod--cluster--advertise_frequency)
 
-##### <a name="allowed_network"></a>`allowed_network`
+##### <a name="-apache--mod--cluster--allowed_network"></a>`allowed_network`
 
 Data type: `String`
 
 Balanced members network.
 
-##### <a name="balancer_name"></a>`balancer_name`
+##### <a name="-apache--mod--cluster--balancer_name"></a>`balancer_name`
 
 Data type: `String`
 
 Name of balancer.
 
-##### <a name="ip"></a>`ip`
+##### <a name="-apache--mod--cluster--ip"></a>`ip`
 
 Data type: `Stdlib::IP::Address`
 
 Specifies the IP address to listen to.
 
-##### <a name="version"></a>`version`
+##### <a name="-apache--mod--cluster--version"></a>`version`
 
 Data type: `String`
 
 Specifies the mod_cluster version. Version 1.3.0 or greater is required for httpd 2.4.
 
-##### <a name="enable_mcpm_receive"></a>`enable_mcpm_receive`
+##### <a name="-apache--mod--cluster--enable_mcpm_receive"></a>`enable_mcpm_receive`
 
 Data type: `Boolean`
 
 Whether MCPM should be enabled.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--mod--cluster--port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -1911,7 +1911,7 @@ mod_cluster listen port.
 
 Default value: `6666`
 
-##### <a name="keep_alive_timeout"></a>`keep_alive_timeout`
+##### <a name="-apache--mod--cluster--keep_alive_timeout"></a>`keep_alive_timeout`
 
 Data type: `Integer`
 
@@ -1919,7 +1919,7 @@ Specifies how long Apache should wait for a request, in seconds.
 
 Default value: `60`
 
-##### <a name="manager_allowed_network"></a>`manager_allowed_network`
+##### <a name="-apache--mod--cluster--manager_allowed_network"></a>`manager_allowed_network`
 
 Data type: `Stdlib::IP::Address`
 
@@ -1927,7 +1927,7 @@ Whether to allow the network to access the mod_cluster_manager.
 
 Default value: `'127.0.0.1'`
 
-##### <a name="max_keep_alive_requests"></a>`max_keep_alive_requests`
+##### <a name="-apache--mod--cluster--max_keep_alive_requests"></a>`max_keep_alive_requests`
 
 Data type: `Integer`
 
@@ -1935,23 +1935,23 @@ Maximum number of requests kept alive.
 
 Default value: `0`
 
-##### <a name="server_advertise"></a>`server_advertise`
+##### <a name="-apache--mod--cluster--server_advertise"></a>`server_advertise`
 
 Data type: `Boolean`
 
 Whether the server should advertise.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="advertise_frequency"></a>`advertise_frequency`
+##### <a name="-apache--mod--cluster--advertise_frequency"></a>`advertise_frequency`
 
 Data type: `Optional[String]`
 
 Sets the interval between advertise messages in seconds.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemoddata"></a>`apache::mod::data`
+### <a name="apache--mod--data"></a>`apache::mod::data`
 
 Installs and configures `mod_data`.
 
@@ -1959,7 +1959,7 @@ Installs and configures `mod_data`.
   * https://httpd.apache.org/docs/current/mod/mod_data.html
     * for additional documentation.
 
-### <a name="apachemoddav"></a>`apache::mod::dav`
+### <a name="apache--mod--dav"></a>`apache::mod::dav`
 
 Installs `mod_dav`.
 
@@ -1967,7 +1967,7 @@ Installs `mod_dav`.
   * https://httpd.apache.org/docs/current/mod/mod_dav.html
     * for additional documentation.
 
-### <a name="apachemoddav_fs"></a>`apache::mod::dav_fs`
+### <a name="apache--mod--dav_fs"></a>`apache::mod::dav_fs`
 
 Installs `mod_dav_fs`.
 
@@ -1975,7 +1975,7 @@ Installs `mod_dav_fs`.
   * https://httpd.apache.org/docs/current/mod/mod_dav_fs.html
     * for additional documentation.
 
-### <a name="apachemoddav_svn"></a>`apache::mod::dav_svn`
+### <a name="apache--mod--dav_svn"></a>`apache::mod::dav_svn`
 
 Installs and configures `mod_dav_svn`.
 
@@ -1987,17 +1987,17 @@ Installs and configures `mod_dav_svn`.
 
 The following parameters are available in the `apache::mod::dav_svn` class:
 
-* [`authz_svn_enabled`](#authz_svn_enabled)
+* [`authz_svn_enabled`](#-apache--mod--dav_svn--authz_svn_enabled)
 
-##### <a name="authz_svn_enabled"></a>`authz_svn_enabled`
+##### <a name="-apache--mod--dav_svn--authz_svn_enabled"></a>`authz_svn_enabled`
 
 Data type: `Boolean`
 
 Specifies whether to install Apache mod_authz_svn
 
-Default value: ``false``
+Default value: `false`
 
-### <a name="apachemoddbd"></a>`apache::mod::dbd`
+### <a name="apache--mod--dbd"></a>`apache::mod::dbd`
 
 Installs `mod_dbd`.
 
@@ -2005,7 +2005,7 @@ Installs `mod_dbd`.
   * https://httpd.apache.org/docs/current/mod/mod_dbd.html
     * for additional documentation.
 
-### <a name="apachemoddeflate"></a>`apache::mod::deflate`
+### <a name="apache--mod--deflate"></a>`apache::mod::deflate`
 
 Installs and configures `mod_deflate`.
 
@@ -2017,42 +2017,50 @@ Installs and configures `mod_deflate`.
 
 The following parameters are available in the `apache::mod::deflate` class:
 
-* [`types`](#types)
-* [`notes`](#notes)
+* [`types`](#-apache--mod--deflate--types)
+* [`notes`](#-apache--mod--deflate--notes)
 
-##### <a name="types"></a>`types`
+##### <a name="-apache--mod--deflate--types"></a>`types`
 
 Data type: `Array[String]`
 
 An array of MIME types to be deflated. See https://www.iana.org/assignments/media-types/media-types.xhtml.
 
-Default value: `[
+Default value:
+
+```puppet
+[
     'text/html text/plain text/xml',
     'text/css',
     'application/x-javascript application/javascript application/ecmascript',
     'application/rss+xml',
     'application/json',
-  ]`
+  ]
+```
 
-##### <a name="notes"></a>`notes`
+##### <a name="-apache--mod--deflate--notes"></a>`notes`
 
 Data type: `Hash`
 
 A Hash where the key represents the type and the value represents the note name.
 
-Default value: `{
+Default value:
+
+```puppet
+{
     'Input'  => 'instream',
     'Output' => 'outstream',
     'Ratio'  => 'ratio',
-  }`
+  }
+```
 
-### <a name="apachemoddev"></a>`apache::mod::dev`
+### <a name="apache--mod--dev"></a>`apache::mod::dev`
 
 Installs `mod_dev`.
 
 * **Note** This module is deprecated. Please use `apache::dev`.
 
-### <a name="apachemoddir"></a>`apache::mod::dir`
+### <a name="apache--mod--dir"></a>`apache::mod::dir`
 
 Installs and configures `mod_dir`.
 
@@ -2067,10 +2075,10 @@ DirectoryIndex statements in a vhost configuration
 
 The following parameters are available in the `apache::mod::dir` class:
 
-* [`dir`](#dir)
-* [`indexes`](#indexes)
+* [`dir`](#-apache--mod--dir--dir)
+* [`indexes`](#-apache--mod--dir--indexes)
 
-##### <a name="dir"></a>`dir`
+##### <a name="-apache--mod--dir--dir"></a>`dir`
 
 Data type: `String`
 
@@ -2078,22 +2086,26 @@ Data type: `String`
 
 Default value: `'public_html'`
 
-##### <a name="indexes"></a>`indexes`
+##### <a name="-apache--mod--dir--indexes"></a>`indexes`
 
 Data type: `Array[String]`
 
 Provides a string for the DirectoryIndex directive
 
-Default value: `[
+Default value:
+
+```puppet
+[
     'index.html',
     'index.html.var',
     'index.cgi',
     'index.pl',
     'index.php',
     'index.xhtml',
-  ]`
+  ]
+```
 
-### <a name="apachemoddisk_cache"></a>`apache::mod::disk_cache`
+### <a name="apache--mod--disk_cache"></a>`apache::mod::disk_cache`
 
 Installs and configures `mod_disk_cache`.
 
@@ -2107,11 +2119,11 @@ Installs and configures `mod_disk_cache`.
 
 The following parameters are available in the `apache::mod::disk_cache` class:
 
-* [`cache_root`](#cache_root)
-* [`cache_ignore_headers`](#cache_ignore_headers)
-* [`default_cache_enable`](#default_cache_enable)
+* [`cache_root`](#-apache--mod--disk_cache--cache_root)
+* [`cache_ignore_headers`](#-apache--mod--disk_cache--cache_ignore_headers)
+* [`default_cache_enable`](#-apache--mod--disk_cache--default_cache_enable)
 
-##### <a name="cache_root"></a>`cache_root`
+##### <a name="-apache--mod--disk_cache--cache_root"></a>`cache_root`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -2121,17 +2133,17 @@ Default depends on the Apache version and operating system:
 - FreeBSD: /var/cache/mod_cache_disk
 - Red Hat: /var/cache/httpd/proxy
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cache_ignore_headers"></a>`cache_ignore_headers`
+##### <a name="-apache--mod--disk_cache--cache_ignore_headers"></a>`cache_ignore_headers`
 
 Data type: `Optional[String]`
 
 Specifies HTTP header(s) that should not be stored in the cache.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_cache_enable"></a>`default_cache_enable`
+##### <a name="-apache--mod--disk_cache--default_cache_enable"></a>`default_cache_enable`
 
 Data type: `Boolean`
 
@@ -2139,9 +2151,9 @@ Default value is true, which enables "CacheEnable disk /" in disk_cache.conf for
 every request to apache by default for every vhost. If set to false the default cache all behaviour is supressed.
 You can then control this behaviour in individual vhosts by explicitly defining CacheEnable.
 
-Default value: ``true``
+Default value: `true`
 
-### <a name="apachemoddumpio"></a>`apache::mod::dumpio`
+### <a name="apache--mod--dumpio"></a>`apache::mod::dumpio`
 
 Installs and configures `mod_dumpio`.
 
@@ -2168,10 +2180,10 @@ class{'apache::mod::dumpio':
 
 The following parameters are available in the `apache::mod::dumpio` class:
 
-* [`dump_io_input`](#dump_io_input)
-* [`dump_io_output`](#dump_io_output)
+* [`dump_io_input`](#-apache--mod--dumpio--dump_io_input)
+* [`dump_io_output`](#-apache--mod--dumpio--dump_io_output)
 
-##### <a name="dump_io_input"></a>`dump_io_input`
+##### <a name="-apache--mod--dumpio--dump_io_input"></a>`dump_io_input`
 
 Data type: `Apache::OnOff`
 
@@ -2179,7 +2191,7 @@ Dump all input data to the error log
 
 Default value: `'Off'`
 
-##### <a name="dump_io_output"></a>`dump_io_output`
+##### <a name="-apache--mod--dumpio--dump_io_output"></a>`dump_io_output`
 
 Data type: `Apache::OnOff`
 
@@ -2187,7 +2199,7 @@ Dump all output data to the error log
 
 Default value: `'Off'`
 
-### <a name="apachemodenv"></a>`apache::mod::env`
+### <a name="apache--mod--env"></a>`apache::mod::env`
 
 Installs `mod_env`.
 
@@ -2195,7 +2207,7 @@ Installs `mod_env`.
   * https://httpd.apache.org/docs/current/mod/mod_env.html
     * for additional documentation.
 
-### <a name="apachemodevent"></a>`apache::mod::event`
+### <a name="apache--mod--event"></a>`apache::mod::event`
 
 Installs and configures `mod_event`.
 
@@ -2210,17 +2222,17 @@ apache::mod::worker on the same server.
 
 The following parameters are available in the `apache::mod::event` class:
 
-* [`startservers`](#startservers)
-* [`maxrequestworkers`](#maxrequestworkers)
-* [`minsparethreads`](#minsparethreads)
-* [`maxsparethreads`](#maxsparethreads)
-* [`threadsperchild`](#threadsperchild)
-* [`maxconnectionsperchild`](#maxconnectionsperchild)
-* [`serverlimit`](#serverlimit)
-* [`threadlimit`](#threadlimit)
-* [`listenbacklog`](#listenbacklog)
+* [`startservers`](#-apache--mod--event--startservers)
+* [`maxrequestworkers`](#-apache--mod--event--maxrequestworkers)
+* [`minsparethreads`](#-apache--mod--event--minsparethreads)
+* [`maxsparethreads`](#-apache--mod--event--maxsparethreads)
+* [`threadsperchild`](#-apache--mod--event--threadsperchild)
+* [`maxconnectionsperchild`](#-apache--mod--event--maxconnectionsperchild)
+* [`serverlimit`](#-apache--mod--event--serverlimit)
+* [`threadlimit`](#-apache--mod--event--threadlimit)
+* [`listenbacklog`](#-apache--mod--event--listenbacklog)
 
-##### <a name="startservers"></a>`startservers`
+##### <a name="-apache--mod--event--startservers"></a>`startservers`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2229,16 +2241,16 @@ removes the parameter.
 
 Default value: `2`
 
-##### <a name="maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="-apache--mod--event--maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Optional[Variant[Integer, Boolean]]`
 
 Sets the maximum number of connections Apache can simultaneously process, via the module's `MaxRequestWorkers` directive. Setting
 these to `false` removes the parameters.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="minsparethreads"></a>`minsparethreads`
+##### <a name="-apache--mod--event--minsparethreads"></a>`minsparethreads`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2246,7 +2258,7 @@ Sets the minimum number of idle threads, via the `MinSpareThreads` directive. Se
 
 Default value: `25`
 
-##### <a name="maxsparethreads"></a>`maxsparethreads`
+##### <a name="-apache--mod--event--maxsparethreads"></a>`maxsparethreads`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2254,7 +2266,7 @@ Sets the maximum number of idle threads, via the `MaxSpareThreads` directive. Se
 
 Default value: `75`
 
-##### <a name="threadsperchild"></a>`threadsperchild`
+##### <a name="-apache--mod--event--threadsperchild"></a>`threadsperchild`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2262,15 +2274,15 @@ Number of threads created by each child process.
 
 Default value: `25`
 
-##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
+##### <a name="-apache--mod--event--maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Optional[Variant[Integer, Boolean]]`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="serverlimit"></a>`serverlimit`
+##### <a name="-apache--mod--event--serverlimit"></a>`serverlimit`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2278,7 +2290,7 @@ Limits the configurable number of processes via the `ServerLimit` directive. Set
 
 Default value: `25`
 
-##### <a name="threadlimit"></a>`threadlimit`
+##### <a name="-apache--mod--event--threadlimit"></a>`threadlimit`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2286,7 +2298,7 @@ Limits the number of event threads via the module's `ThreadLimit` directive. Set
 
 Default value: `64`
 
-##### <a name="listenbacklog"></a>`listenbacklog`
+##### <a name="-apache--mod--event--listenbacklog"></a>`listenbacklog`
 
 Data type: `Variant[Integer, Boolean]`
 
@@ -2295,7 +2307,7 @@ the parameter.
 
 Default value: `511`
 
-### <a name="apachemodexpires"></a>`apache::mod::expires`
+### <a name="apache--mod--expires"></a>`apache::mod::expires`
 
 Installs and configures `mod_expires`.
 
@@ -2307,27 +2319,27 @@ Installs and configures `mod_expires`.
 
 The following parameters are available in the `apache::mod::expires` class:
 
-* [`expires_active`](#expires_active)
-* [`expires_default`](#expires_default)
-* [`expires_by_type`](#expires_by_type)
+* [`expires_active`](#-apache--mod--expires--expires_active)
+* [`expires_default`](#-apache--mod--expires--expires_default)
+* [`expires_by_type`](#-apache--mod--expires--expires_by_type)
 
-##### <a name="expires_active"></a>`expires_active`
+##### <a name="-apache--mod--expires--expires_active"></a>`expires_active`
 
 Data type: `Boolean`
 
 Enables generation of Expires headers.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="expires_default"></a>`expires_default`
+##### <a name="-apache--mod--expires--expires_default"></a>`expires_default`
 
 Data type: `Optional[String]`
 
 Specifies the default algorithm for calculating expiration time using ExpiresByType syntax or interval syntax.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="expires_by_type"></a>`expires_by_type`
+##### <a name="-apache--mod--expires--expires_by_type"></a>`expires_by_type`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -2335,9 +2347,9 @@ Describes a set of [MIME content-types](https://www.iana.org/assignments/media-t
 times. This should be used as an array of Hashes, with each Hash's key a valid MIME content-type (i.e. 'text/json') and its
 value following valid interval syntax.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodext_filter"></a>`apache::mod::ext_filter`
+### <a name="apache--mod--ext_filter"></a>`apache::mod::ext_filter`
 
 Installs and configures `mod_ext_filter`.
 
@@ -2362,17 +2374,17 @@ class { 'apache::mod::ext_filter':
 
 The following parameters are available in the `apache::mod::ext_filter` class:
 
-* [`ext_filter_define`](#ext_filter_define)
+* [`ext_filter_define`](#-apache--mod--ext_filter--ext_filter_define)
 
-##### <a name="ext_filter_define"></a>`ext_filter_define`
+##### <a name="-apache--mod--ext_filter--ext_filter_define"></a>`ext_filter_define`
 
 Data type: `Optional[Hash]`
 
 Hash of filter names and their parameters.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodfcgid"></a>`apache::mod::fcgid`
+### <a name="apache--mod--fcgid"></a>`apache::mod::fcgid`
 
 loaded first; Puppet will not automatically enable it if you set the fcgiwrapper parameter in apache::vhost.
   include apache::mod::fcgid
@@ -2415,9 +2427,9 @@ class { 'apache::mod::fcgid':
 
 The following parameters are available in the `apache::mod::fcgid` class:
 
-* [`options`](#options)
+* [`options`](#-apache--mod--fcgid--options)
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--mod--fcgid--options"></a>`options`
 
 Data type: `Hash`
 
@@ -2431,7 +2443,7 @@ expires_by_type
 
 Default value: `{}`
 
-### <a name="apachemodfilter"></a>`apache::mod::filter`
+### <a name="apache--mod--filter"></a>`apache::mod::filter`
 
 Installs `mod_filter`.
 
@@ -2439,7 +2451,7 @@ Installs `mod_filter`.
   * https://httpd.apache.org/docs/current/mod/mod_filter.html
     * for additional documentation.
 
-### <a name="apachemodgeoip"></a>`apache::mod::geoip`
+### <a name="apache--mod--geoip"></a>`apache::mod::geoip`
 
 Installs and configures `mod_geoip`.
 
@@ -2451,24 +2463,24 @@ Installs and configures `mod_geoip`.
 
 The following parameters are available in the `apache::mod::geoip` class:
 
-* [`enable`](#enable)
-* [`db_file`](#db_file)
-* [`flag`](#flag)
-* [`output`](#output)
-* [`enable_utf8`](#enable_utf8)
-* [`scan_proxy_headers`](#scan_proxy_headers)
-* [`scan_proxy_header_field`](#scan_proxy_header_field)
-* [`use_last_xforwarededfor_ip`](#use_last_xforwarededfor_ip)
+* [`enable`](#-apache--mod--geoip--enable)
+* [`db_file`](#-apache--mod--geoip--db_file)
+* [`flag`](#-apache--mod--geoip--flag)
+* [`output`](#-apache--mod--geoip--output)
+* [`enable_utf8`](#-apache--mod--geoip--enable_utf8)
+* [`scan_proxy_headers`](#-apache--mod--geoip--scan_proxy_headers)
+* [`scan_proxy_header_field`](#-apache--mod--geoip--scan_proxy_header_field)
+* [`use_last_xforwarededfor_ip`](#-apache--mod--geoip--use_last_xforwarededfor_ip)
 
-##### <a name="enable"></a>`enable`
+##### <a name="-apache--mod--geoip--enable"></a>`enable`
 
 Data type: `Boolean`
 
 Toggles whether to enable geoip.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="db_file"></a>`db_file`
+##### <a name="-apache--mod--geoip--db_file"></a>`db_file`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -2476,7 +2488,7 @@ Path to database for GeoIP to use.
 
 Default value: `'/usr/share/GeoIP/GeoIP.dat'`
 
-##### <a name="flag"></a>`flag`
+##### <a name="-apache--mod--geoip--flag"></a>`flag`
 
 Data type: `String`
 
@@ -2484,7 +2496,7 @@ Caching directive to use. Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'St
 
 Default value: `'Standard'`
 
-##### <a name="output"></a>`output`
+##### <a name="-apache--mod--geoip--output"></a>`output`
 
 Data type: `String`
 
@@ -2492,39 +2504,39 @@ Output variable locations. Values: 'All', 'Env', 'Request', 'Notes'.
 
 Default value: `'All'`
 
-##### <a name="enable_utf8"></a>`enable_utf8`
+##### <a name="-apache--mod--geoip--enable_utf8"></a>`enable_utf8`
 
 Data type: `Optional[String]`
 
 Changes the output from ISO88591 (Latin1) to UTF8.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="scan_proxy_headers"></a>`scan_proxy_headers`
+##### <a name="-apache--mod--geoip--scan_proxy_headers"></a>`scan_proxy_headers`
 
 Data type: `Optional[String]`
 
 Enables the GeoIPScanProxyHeaders option.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="scan_proxy_header_field"></a>`scan_proxy_header_field`
+##### <a name="-apache--mod--geoip--scan_proxy_header_field"></a>`scan_proxy_header_field`
 
 Data type: `Optional[String]`
 
 Specifies the header mod_geoip uses to determine the client's IP address.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
+##### <a name="-apache--mod--geoip--use_last_xforwarededfor_ip"></a>`use_last_xforwarededfor_ip`
 
 Data type: `Optional[String]`
 
 Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodheaders"></a>`apache::mod::headers`
+### <a name="apache--mod--headers"></a>`apache::mod::headers`
 
 Installs and configures `mod_headers`.
 
@@ -2532,7 +2544,7 @@ Installs and configures `mod_headers`.
   * https://httpd.apache.org/docs/current/mod/mod_headers.html
     * for additional documentation.
 
-### <a name="apachemodhttp2"></a>`apache::mod::http2`
+### <a name="apache--mod--http2"></a>`apache::mod::http2`
 
 Installs and configures `mod_http2`.
 
@@ -2544,106 +2556,106 @@ Installs and configures `mod_http2`.
 
 The following parameters are available in the `apache::mod::http2` class:
 
-* [`h2_copy_files`](#h2_copy_files)
-* [`h2_direct`](#h2_direct)
-* [`h2_early_hints`](#h2_early_hints)
-* [`h2_max_session_streams`](#h2_max_session_streams)
-* [`h2_max_worker_idle_seconds`](#h2_max_worker_idle_seconds)
-* [`h2_max_workers`](#h2_max_workers)
-* [`h2_min_workers`](#h2_min_workers)
-* [`h2_modern_tls_only`](#h2_modern_tls_only)
-* [`h2_push`](#h2_push)
-* [`h2_push_diary_size`](#h2_push_diary_size)
-* [`h2_push_priority`](#h2_push_priority)
-* [`h2_push_resource`](#h2_push_resource)
-* [`h2_serialize_headers`](#h2_serialize_headers)
-* [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
-* [`h2_tls_cool_down_secs`](#h2_tls_cool_down_secs)
-* [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
-* [`h2_upgrade`](#h2_upgrade)
-* [`h2_window_size`](#h2_window_size)
-
-##### <a name="h2_copy_files"></a>`h2_copy_files`
+* [`h2_copy_files`](#-apache--mod--http2--h2_copy_files)
+* [`h2_direct`](#-apache--mod--http2--h2_direct)
+* [`h2_early_hints`](#-apache--mod--http2--h2_early_hints)
+* [`h2_max_session_streams`](#-apache--mod--http2--h2_max_session_streams)
+* [`h2_max_worker_idle_seconds`](#-apache--mod--http2--h2_max_worker_idle_seconds)
+* [`h2_max_workers`](#-apache--mod--http2--h2_max_workers)
+* [`h2_min_workers`](#-apache--mod--http2--h2_min_workers)
+* [`h2_modern_tls_only`](#-apache--mod--http2--h2_modern_tls_only)
+* [`h2_push`](#-apache--mod--http2--h2_push)
+* [`h2_push_diary_size`](#-apache--mod--http2--h2_push_diary_size)
+* [`h2_push_priority`](#-apache--mod--http2--h2_push_priority)
+* [`h2_push_resource`](#-apache--mod--http2--h2_push_resource)
+* [`h2_serialize_headers`](#-apache--mod--http2--h2_serialize_headers)
+* [`h2_stream_max_mem_size`](#-apache--mod--http2--h2_stream_max_mem_size)
+* [`h2_tls_cool_down_secs`](#-apache--mod--http2--h2_tls_cool_down_secs)
+* [`h2_tls_warm_up_size`](#-apache--mod--http2--h2_tls_warm_up_size)
+* [`h2_upgrade`](#-apache--mod--http2--h2_upgrade)
+* [`h2_window_size`](#-apache--mod--http2--h2_window_size)
+
+##### <a name="-apache--mod--http2--h2_copy_files"></a>`h2_copy_files`
 
 Data type: `Optional[Boolean]`
 
 Determine file handling in responses.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_direct"></a>`h2_direct`
+##### <a name="-apache--mod--http2--h2_direct"></a>`h2_direct`
 
 Data type: `Optional[Boolean]`
 
 H2 Direct Protocol Switch.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_early_hints"></a>`h2_early_hints`
+##### <a name="-apache--mod--http2--h2_early_hints"></a>`h2_early_hints`
 
 Data type: `Optional[Boolean]`
 
 Determine sending of 103 status codes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
+##### <a name="-apache--mod--http2--h2_max_session_streams"></a>`h2_max_session_streams`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of active streams per HTTP/2 session.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_max_worker_idle_seconds"></a>`h2_max_worker_idle_seconds`
+##### <a name="-apache--mod--http2--h2_max_worker_idle_seconds"></a>`h2_max_worker_idle_seconds`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of seconds h2 workers remain idle until shut down.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_max_workers"></a>`h2_max_workers`
+##### <a name="-apache--mod--http2--h2_max_workers"></a>`h2_max_workers`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of worker threads to use per child process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_min_workers"></a>`h2_min_workers`
+##### <a name="-apache--mod--http2--h2_min_workers"></a>`h2_min_workers`
 
 Data type: `Optional[Integer]`
 
 Sets minimal number of worker threads to use per child process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
+##### <a name="-apache--mod--http2--h2_modern_tls_only"></a>`h2_modern_tls_only`
 
 Data type: `Optional[Boolean]`
 
 Toggles the security checks on HTTP/2 connections in TLS mode
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push"></a>`h2_push`
+##### <a name="-apache--mod--http2--h2_push"></a>`h2_push`
 
 Data type: `Optional[Boolean]`
 
 Toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
+##### <a name="-apache--mod--http2--h2_push_diary_size"></a>`h2_push_diary_size`
 
 Data type: `Optional[Integer]`
 
 Sets maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push_priority"></a>`h2_push_priority`
+##### <a name="-apache--mod--http2--h2_push_priority"></a>`h2_push_priority`
 
 Data type: `Array[String]`
 
@@ -2651,7 +2663,7 @@ Require HTTP/2 connections to be "modern TLS" only
 
 Default value: `[]`
 
-##### <a name="h2_push_resource"></a>`h2_push_resource`
+##### <a name="-apache--mod--http2--h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
 
@@ -2660,59 +2672,59 @@ via this directive
 
 Default value: `[]`
 
-##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
+##### <a name="-apache--mod--http2--h2_serialize_headers"></a>`h2_serialize_headers`
 
 Data type: `Optional[Boolean]`
 
 Toggles if HTTP/2 requests shall be serialized in HTTP/1.1 format for processing by httpd
 core or if received binary data shall be passed into the request_recs directly.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
+##### <a name="-apache--mod--http2--h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
 Data type: `Optional[Integer]`
 
 Sets the maximum number of outgoing data bytes buffered in memory for an active streams.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
+##### <a name="-apache--mod--http2--h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
 Data type: `Optional[Integer]`
 
 Sets the number of seconds of idle time on a TLS connection before the TLS write size falls
 back to small (~1300 bytes) length.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
+##### <a name="-apache--mod--http2--h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
 Data type: `Optional[Integer]`
 
 Sets the number of bytes to be sent in small TLS records (~1300 bytes) until doing maximum
 sized writes (16k) on https: HTTP/2 connections.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_upgrade"></a>`h2_upgrade`
+##### <a name="-apache--mod--http2--h2_upgrade"></a>`h2_upgrade`
 
 Data type: `Optional[Boolean]`
 
 Toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_window_size"></a>`h2_window_size`
+##### <a name="-apache--mod--http2--h2_window_size"></a>`h2_window_size`
 
 Data type: `Optional[Integer]`
 
 Sets the size of the window that is used for flow control from client to server and limits
 the amount of data the server has to buffer.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodinclude"></a>`apache::mod::include`
+### <a name="apache--mod--include"></a>`apache::mod::include`
 
 Installs `mod_include`.
 
@@ -2720,7 +2732,7 @@ Installs `mod_include`.
   * https://httpd.apache.org/docs/current/mod/mod_include.html
     * for additional documentation.
 
-### <a name="apachemodinfo"></a>`apache::mod::info`
+### <a name="apache--mod--info"></a>`apache::mod::info`
 
 Installs and configures `mod_info`.
 
@@ -2732,11 +2744,11 @@ Installs and configures `mod_info`.
 
 The following parameters are available in the `apache::mod::info` class:
 
-* [`allow_from`](#allow_from)
-* [`restrict_access`](#restrict_access)
-* [`info_path`](#info_path)
+* [`allow_from`](#-apache--mod--info--allow_from)
+* [`restrict_access`](#-apache--mod--info--restrict_access)
+* [`info_path`](#-apache--mod--info--info_path)
 
-##### <a name="allow_from"></a>`allow_from`
+##### <a name="-apache--mod--info--allow_from"></a>`allow_from`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -2744,16 +2756,16 @@ Allowlist of IPv4 or IPv6 addresses or ranges that can access the info path.
 
 Default value: `['127.0.0.1', '::1']`
 
-##### <a name="restrict_access"></a>`restrict_access`
+##### <a name="-apache--mod--info--restrict_access"></a>`restrict_access`
 
 Data type: `Boolean`
 
 Toggles whether to restrict access to info path. If `false`, the `allow_from` allowlist is ignored and any IP address can
 access the info path.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="info_path"></a>`info_path`
+##### <a name="-apache--mod--info--info_path"></a>`info_path`
 
 Data type: `Stdlib::Unixpath`
 
@@ -2761,7 +2773,7 @@ Path on server to file containing server configuration information.
 
 Default value: `'/server-info'`
 
-### <a name="apachemodintercept_form_submit"></a>`apache::mod::intercept_form_submit`
+### <a name="apache--mod--intercept_form_submit"></a>`apache::mod::intercept_form_submit`
 
 Installs `mod_intercept_form_submit`.
 
@@ -2769,7 +2781,7 @@ Installs `mod_intercept_form_submit`.
   * https://www.adelton.com/apache/mod_intercept_form_submit
     * for additional documentation.
 
-### <a name="apachemoditk"></a>`apache::mod::itk`
+### <a name="apache--mod--itk"></a>`apache::mod::itk`
 
 Installs MPM `mod_itk`.
 
@@ -2783,15 +2795,15 @@ Installs MPM `mod_itk`.
 
 The following parameters are available in the `apache::mod::itk` class:
 
-* [`startservers`](#startservers)
-* [`minspareservers`](#minspareservers)
-* [`maxspareservers`](#maxspareservers)
-* [`serverlimit`](#serverlimit)
-* [`maxclients`](#maxclients)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`enablecapabilities`](#enablecapabilities)
+* [`startservers`](#-apache--mod--itk--startservers)
+* [`minspareservers`](#-apache--mod--itk--minspareservers)
+* [`maxspareservers`](#-apache--mod--itk--maxspareservers)
+* [`serverlimit`](#-apache--mod--itk--serverlimit)
+* [`maxclients`](#-apache--mod--itk--maxclients)
+* [`maxrequestsperchild`](#-apache--mod--itk--maxrequestsperchild)
+* [`enablecapabilities`](#-apache--mod--itk--enablecapabilities)
 
-##### <a name="startservers"></a>`startservers`
+##### <a name="-apache--mod--itk--startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -2799,7 +2811,7 @@ Number of child server processes created on startup.
 
 Default value: `8`
 
-##### <a name="minspareservers"></a>`minspareservers`
+##### <a name="-apache--mod--itk--minspareservers"></a>`minspareservers`
 
 Data type: `Integer`
 
@@ -2807,7 +2819,7 @@ Minimum number of idle child server processes.
 
 Default value: `5`
 
-##### <a name="maxspareservers"></a>`maxspareservers`
+##### <a name="-apache--mod--itk--maxspareservers"></a>`maxspareservers`
 
 Data type: `Integer`
 
@@ -2815,7 +2827,7 @@ Maximum number of idle child server processes.
 
 Default value: `20`
 
-##### <a name="serverlimit"></a>`serverlimit`
+##### <a name="-apache--mod--itk--serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -2823,7 +2835,7 @@ Maximum configured value for `MaxRequestWorkers` for the lifetime of the Apache
 
 Default value: `256`
 
-##### <a name="maxclients"></a>`maxclients`
+##### <a name="-apache--mod--itk--maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -2831,7 +2843,7 @@ Limit on the number of simultaneous requests that will be served.
 
 Default value: `256`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--itk--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -2839,7 +2851,7 @@ Limit on the number of connections that an individual child server process will
 
 Default value: `4000`
 
-##### <a name="enablecapabilities"></a>`enablecapabilities`
+##### <a name="-apache--mod--itk--enablecapabilities"></a>`enablecapabilities`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
@@ -2847,9 +2859,9 @@ Drop most root capabilities in the parent process, and instead run as the user g
 capabilities (in particular setuid). Somewhat more secure, but can cause problems when serving from filesystems that do not honor
 capabilities, such as NFS.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodjk"></a>`apache::mod::jk`
+### <a name="apache--mod--jk"></a>`apache::mod::jk`
 
 Installs `mod_jk`.
 
@@ -2898,59 +2910,59 @@ class { '::apache::mod::jk':
 
 The following parameters are available in the `apache::mod::jk` class:
 
-* [`ip`](#ip)
-* [`port`](#port)
-* [`add_listen`](#add_listen)
-* [`workers_file`](#workers_file)
-* [`worker_property`](#worker_property)
-* [`logroot`](#logroot)
-* [`shm_file`](#shm_file)
-* [`shm_size`](#shm_size)
-* [`mount_file`](#mount_file)
-* [`mount_file_reload`](#mount_file_reload)
-* [`mount`](#mount)
-* [`un_mount`](#un_mount)
-* [`auto_alias`](#auto_alias)
-* [`mount_copy`](#mount_copy)
-* [`worker_indicator`](#worker_indicator)
-* [`watchdog_interval`](#watchdog_interval)
-* [`log_file`](#log_file)
-* [`log_level`](#log_level)
-* [`log_stamp_format`](#log_stamp_format)
-* [`request_log_format`](#request_log_format)
-* [`extract_ssl`](#extract_ssl)
-* [`https_indicator`](#https_indicator)
-* [`sslprotocol_indicator`](#sslprotocol_indicator)
-* [`certs_indicator`](#certs_indicator)
-* [`cipher_indicator`](#cipher_indicator)
-* [`certchain_prefix`](#certchain_prefix)
-* [`session_indicator`](#session_indicator)
-* [`keysize_indicator`](#keysize_indicator)
-* [`local_name_indicator`](#local_name_indicator)
-* [`ignore_cl_indicator`](#ignore_cl_indicator)
-* [`local_addr_indicator`](#local_addr_indicator)
-* [`local_port_indicator`](#local_port_indicator)
-* [`remote_host_indicator`](#remote_host_indicator)
-* [`remote_addr_indicator`](#remote_addr_indicator)
-* [`remote_port_indicator`](#remote_port_indicator)
-* [`remote_user_indicator`](#remote_user_indicator)
-* [`auth_type_indicator`](#auth_type_indicator)
-* [`options`](#options)
-* [`env_var`](#env_var)
-* [`strip_session`](#strip_session)
-* [`location_list`](#location_list)
-* [`workers_file_content`](#workers_file_content)
-* [`mount_file_content`](#mount_file_content)
-
-##### <a name="ip"></a>`ip`
+* [`ip`](#-apache--mod--jk--ip)
+* [`port`](#-apache--mod--jk--port)
+* [`add_listen`](#-apache--mod--jk--add_listen)
+* [`workers_file`](#-apache--mod--jk--workers_file)
+* [`worker_property`](#-apache--mod--jk--worker_property)
+* [`logroot`](#-apache--mod--jk--logroot)
+* [`shm_file`](#-apache--mod--jk--shm_file)
+* [`shm_size`](#-apache--mod--jk--shm_size)
+* [`mount_file`](#-apache--mod--jk--mount_file)
+* [`mount_file_reload`](#-apache--mod--jk--mount_file_reload)
+* [`mount`](#-apache--mod--jk--mount)
+* [`un_mount`](#-apache--mod--jk--un_mount)
+* [`auto_alias`](#-apache--mod--jk--auto_alias)
+* [`mount_copy`](#-apache--mod--jk--mount_copy)
+* [`worker_indicator`](#-apache--mod--jk--worker_indicator)
+* [`watchdog_interval`](#-apache--mod--jk--watchdog_interval)
+* [`log_file`](#-apache--mod--jk--log_file)
+* [`log_level`](#-apache--mod--jk--log_level)
+* [`log_stamp_format`](#-apache--mod--jk--log_stamp_format)
+* [`request_log_format`](#-apache--mod--jk--request_log_format)
+* [`extract_ssl`](#-apache--mod--jk--extract_ssl)
+* [`https_indicator`](#-apache--mod--jk--https_indicator)
+* [`sslprotocol_indicator`](#-apache--mod--jk--sslprotocol_indicator)
+* [`certs_indicator`](#-apache--mod--jk--certs_indicator)
+* [`cipher_indicator`](#-apache--mod--jk--cipher_indicator)
+* [`certchain_prefix`](#-apache--mod--jk--certchain_prefix)
+* [`session_indicator`](#-apache--mod--jk--session_indicator)
+* [`keysize_indicator`](#-apache--mod--jk--keysize_indicator)
+* [`local_name_indicator`](#-apache--mod--jk--local_name_indicator)
+* [`ignore_cl_indicator`](#-apache--mod--jk--ignore_cl_indicator)
+* [`local_addr_indicator`](#-apache--mod--jk--local_addr_indicator)
+* [`local_port_indicator`](#-apache--mod--jk--local_port_indicator)
+* [`remote_host_indicator`](#-apache--mod--jk--remote_host_indicator)
+* [`remote_addr_indicator`](#-apache--mod--jk--remote_addr_indicator)
+* [`remote_port_indicator`](#-apache--mod--jk--remote_port_indicator)
+* [`remote_user_indicator`](#-apache--mod--jk--remote_user_indicator)
+* [`auth_type_indicator`](#-apache--mod--jk--auth_type_indicator)
+* [`options`](#-apache--mod--jk--options)
+* [`env_var`](#-apache--mod--jk--env_var)
+* [`strip_session`](#-apache--mod--jk--strip_session)
+* [`location_list`](#-apache--mod--jk--location_list)
+* [`workers_file_content`](#-apache--mod--jk--workers_file_content)
+* [`mount_file_content`](#-apache--mod--jk--mount_file_content)
+
+##### <a name="-apache--mod--jk--ip"></a>`ip`
 
 Data type: `Optional[Stdlib::IP::Address]`
 
 IP for binding to mod_jk. Useful when the binding address is not the primary network interface IP.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--mod--jk--port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -2959,7 +2971,7 @@ needs to forward them to Apache at a different port.
 
 Default value: `80`
 
-##### <a name="add_listen"></a>`add_listen`
+##### <a name="-apache--mod--jk--add_listen"></a>`add_listen`
 
 Data type: `Boolean`
 
@@ -2967,17 +2979,17 @@ Defines if a Listen directive according to parameters ip and port (see below), s
 and redirect to mod_jk. Useful when another Listen directive, like Listen *:<Port> or Listen <Port>, can conflict with the one
 necessary for mod_jk binding.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="workers_file"></a>`workers_file`
+##### <a name="-apache--mod--jk--workers_file"></a>`workers_file`
 
 Data type: `Optional[String]`
 
 The name of a worker file for the Tomcat servlet containers.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="worker_property"></a>`worker_property`
+##### <a name="-apache--mod--jk--worker_property"></a>`worker_property`
 
 Data type: `Hash`
 
@@ -2985,16 +2997,16 @@ Enables setting worker properties inside Apache configuration file.
 
 Default value: `{}`
 
-##### <a name="logroot"></a>`logroot`
+##### <a name="-apache--mod--jk--logroot"></a>`logroot`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 The base directory for shm_file and log_file is determined by the logroot parameter. If unspecified, defaults to
 apache::params::logroot. The default logroot is sane enough therefore it is not recommended to override it.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="shm_file"></a>`shm_file`
+##### <a name="-apache--mod--jk--shm_file"></a>`shm_file`
 
 Data type: `String`
 
@@ -3002,31 +3014,31 @@ Shared memory file name.
 
 Default value: `'jk-runtime-status'`
 
-##### <a name="shm_size"></a>`shm_size`
+##### <a name="-apache--mod--jk--shm_size"></a>`shm_size`
 
 Data type: `Optional[String]`
 
 Size of the shared memory file name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mount_file"></a>`mount_file`
+##### <a name="-apache--mod--jk--mount_file"></a>`mount_file`
 
 Data type: `Optional[String]`
 
 File containing multiple mappings from a context to a Tomcat worker.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mount_file_reload"></a>`mount_file_reload`
+##### <a name="-apache--mod--jk--mount_file_reload"></a>`mount_file_reload`
 
 Data type: `Optional[String]`
 
 This directive configures the reload check interval in seconds.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mount"></a>`mount`
+##### <a name="-apache--mod--jk--mount"></a>`mount`
 
 Data type: `Hash`
 
@@ -3034,7 +3046,7 @@ A mount point from a context to a Tomcat worker.
 
 Default value: `{}`
 
-##### <a name="un_mount"></a>`un_mount`
+##### <a name="-apache--mod--jk--un_mount"></a>`un_mount`
 
 Data type: `Hash`
 
@@ -3042,41 +3054,41 @@ An exclusion mount point from a context to a Tomcat worker.
 
 Default value: `{}`
 
-##### <a name="auto_alias"></a>`auto_alias`
+##### <a name="-apache--mod--jk--auto_alias"></a>`auto_alias`
 
 Data type: `Optional[String]`
 
 Automatically Alias webapp context directories into the Apache document space
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mount_copy"></a>`mount_copy`
+##### <a name="-apache--mod--jk--mount_copy"></a>`mount_copy`
 
 Data type: `Optional[String]`
 
 If this directive is set to "On" in some virtual server, the mounts from the global server will be copied
 to this virtual server, more precisely all mounts defined by JkMount or JkUnMount.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="worker_indicator"></a>`worker_indicator`
+##### <a name="-apache--mod--jk--worker_indicator"></a>`worker_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that can be used to set worker names in combination with SetHandler
 jakarta-servlet.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="watchdog_interval"></a>`watchdog_interval`
+##### <a name="-apache--mod--jk--watchdog_interval"></a>`watchdog_interval`
 
 Data type: `Optional[Integer]`
 
 This directive configures the watchdog thread interval in seconds.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="log_file"></a>`log_file`
+##### <a name="-apache--mod--jk--log_file"></a>`log_file`
 
 Data type: `String`
 
@@ -3084,167 +3096,167 @@ Full or server relative path to the mod_jk log file.
 
 Default value: `'mod_jk.log'`
 
-##### <a name="log_level"></a>`log_level`
+##### <a name="-apache--mod--jk--log_level"></a>`log_level`
 
 Data type: `Optional[String]`
 
 The mod_jk log level, can be debug, info, warn error or trace.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="log_stamp_format"></a>`log_stamp_format`
+##### <a name="-apache--mod--jk--log_stamp_format"></a>`log_stamp_format`
 
 Data type: `Optional[String]`
 
 The mod_jk date log format, using an extended strftime syntax.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="request_log_format"></a>`request_log_format`
+##### <a name="-apache--mod--jk--request_log_format"></a>`request_log_format`
 
 Data type: `Optional[String]`
 
 Request log format string.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="extract_ssl"></a>`extract_ssl`
+##### <a name="-apache--mod--jk--extract_ssl"></a>`extract_ssl`
 
 Data type: `Optional[String]`
 
 Turns on SSL processing and information gathering by mod_jk.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="https_indicator"></a>`https_indicator`
+##### <a name="-apache--mod--jk--https_indicator"></a>`https_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL indication.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="sslprotocol_indicator"></a>`sslprotocol_indicator`
+##### <a name="-apache--mod--jk--sslprotocol_indicator"></a>`sslprotocol_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains the SSL protocol name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="certs_indicator"></a>`certs_indicator`
+##### <a name="-apache--mod--jk--certs_indicator"></a>`certs_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL client certificates.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cipher_indicator"></a>`cipher_indicator`
+##### <a name="-apache--mod--jk--cipher_indicator"></a>`cipher_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL client cipher.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="certchain_prefix"></a>`certchain_prefix`
+##### <a name="-apache--mod--jk--certchain_prefix"></a>`certchain_prefix`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment (prefix) that contains SSL client chain certificates.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="session_indicator"></a>`session_indicator`
+##### <a name="-apache--mod--jk--session_indicator"></a>`session_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL session.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="keysize_indicator"></a>`keysize_indicator`
+##### <a name="-apache--mod--jk--keysize_indicator"></a>`keysize_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable that contains SSL key size in use.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="local_name_indicator"></a>`local_name_indicator`
+##### <a name="-apache--mod--jk--local_name_indicator"></a>`local_name_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ignore_cl_indicator"></a>`ignore_cl_indicator`
+##### <a name="-apache--mod--jk--ignore_cl_indicator"></a>`ignore_cl_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which forces to ignore an existing Content-Length request header.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="local_addr_indicator"></a>`local_addr_indicator`
+##### <a name="-apache--mod--jk--local_addr_indicator"></a>`local_addr_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local IP address.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="local_port_indicator"></a>`local_port_indicator`
+##### <a name="-apache--mod--jk--local_port_indicator"></a>`local_port_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded local port.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="remote_host_indicator"></a>`remote_host_indicator`
+##### <a name="-apache--mod--jk--remote_host_indicator"></a>`remote_host_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) host name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="remote_addr_indicator"></a>`remote_addr_indicator`
+##### <a name="-apache--mod--jk--remote_addr_indicator"></a>`remote_addr_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="remote_port_indicator"></a>`remote_port_indicator`
+##### <a name="-apache--mod--jk--remote_port_indicator"></a>`remote_port_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded remote (client) IP address.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="remote_user_indicator"></a>`remote_user_indicator`
+##### <a name="-apache--mod--jk--remote_user_indicator"></a>`remote_user_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded user name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="auth_type_indicator"></a>`auth_type_indicator`
+##### <a name="-apache--mod--jk--auth_type_indicator"></a>`auth_type_indicator`
 
 Data type: `Optional[String]`
 
 Name of the Apache environment variable which can be used to overwrite the forwarded authentication type.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--mod--jk--options"></a>`options`
 
 Data type: `Array`
 
@@ -3252,7 +3264,7 @@ Set one of more options to configure the mod_jk module.
 
 Default value: `[]`
 
-##### <a name="env_var"></a>`env_var`
+##### <a name="-apache--mod--jk--env_var"></a>`env_var`
 
 Data type: `Hash`
 
@@ -3260,16 +3272,16 @@ Adds a name and an optional default value of environment variable that should be
 
 Default value: `{}`
 
-##### <a name="strip_session"></a>`strip_session`
+##### <a name="-apache--mod--jk--strip_session"></a>`strip_session`
 
 Data type: `Optional[String]`
 
 If this directive is set to On in some virtual server, the session IDs ;jsessionid=... will be removed for URLs which are not
 forwarded but instead are handled by the local server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="location_list"></a>`location_list`
+##### <a name="-apache--mod--jk--location_list"></a>`location_list`
 
 Data type: `Array`
 
@@ -3302,7 +3314,7 @@ location_list = [
 
 Default value: `[]`
 
-##### <a name="workers_file_content"></a>`workers_file_content`
+##### <a name="-apache--mod--jk--workers_file_content"></a>`workers_file_content`
 
 Data type: `Hash`
 
@@ -3346,7 +3358,7 @@ $workers_file_content = {
 
 Default value: `{}`
 
-##### <a name="mount_file_content"></a>`mount_file_content`
+##### <a name="-apache--mod--jk--mount_file_content"></a>`mount_file_content`
 
 Data type: `Hash`
 
@@ -3383,7 +3395,7 @@ $mount_file_content = {
 
 Default value: `{}`
 
-### <a name="apachemodlbmethod_bybusyness"></a>`apache::mod::lbmethod_bybusyness`
+### <a name="apache--mod--lbmethod_bybusyness"></a>`apache::mod::lbmethod_bybusyness`
 
 Installs `lbmethod_bybusyness`.
 
@@ -3395,9 +3407,9 @@ Installs `lbmethod_bybusyness`.
 
 The following parameters are available in the `apache::mod::lbmethod_bybusyness` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--lbmethod_bybusyness--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--lbmethod_bybusyness--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3405,7 +3417,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodlbmethod_byrequests"></a>`apache::mod::lbmethod_byrequests`
+### <a name="apache--mod--lbmethod_byrequests"></a>`apache::mod::lbmethod_byrequests`
 
 Installs `lbmethod_byrequests`.
 
@@ -3417,9 +3429,9 @@ Installs `lbmethod_byrequests`.
 
 The following parameters are available in the `apache::mod::lbmethod_byrequests` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--lbmethod_byrequests--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--lbmethod_byrequests--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3427,7 +3439,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodlbmethod_bytraffic"></a>`apache::mod::lbmethod_bytraffic`
+### <a name="apache--mod--lbmethod_bytraffic"></a>`apache::mod::lbmethod_bytraffic`
 
 Installs `lbmethod_bytraffic`.
 
@@ -3439,9 +3451,9 @@ Installs `lbmethod_bytraffic`.
 
 The following parameters are available in the `apache::mod::lbmethod_bytraffic` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--lbmethod_bytraffic--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--lbmethod_bytraffic--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3449,7 +3461,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodlbmethod_heartbeat"></a>`apache::mod::lbmethod_heartbeat`
+### <a name="apache--mod--lbmethod_heartbeat"></a>`apache::mod::lbmethod_heartbeat`
 
 Installs `lbmethod_heartbeat`.
 
@@ -3461,9 +3473,9 @@ Installs `lbmethod_heartbeat`.
 
 The following parameters are available in the `apache::mod::lbmethod_heartbeat` class:
 
-* [`apache_version`](#apache_version)
+* [`apache_version`](#-apache--mod--lbmethod_heartbeat--apache_version)
 
-##### <a name="apache_version"></a>`apache_version`
+##### <a name="-apache--mod--lbmethod_heartbeat--apache_version"></a>`apache_version`
 
 Data type: `Optional[String]`
 
@@ -3471,7 +3483,7 @@ Version of Apache to install module on.
 
 Default value: `$apache::apache_version`
 
-### <a name="apachemodldap"></a>`apache::mod::ldap`
+### <a name="apache--mod--ldap"></a>`apache::mod::ldap`
 
 Installs and configures `mod_ldap`.
 
@@ -3502,34 +3514,34 @@ class { 'apache::mod::ldap':
 
 The following parameters are available in the `apache::mod::ldap` class:
 
-* [`package_name`](#package_name)
-* [`ldap_trusted_global_cert_file`](#ldap_trusted_global_cert_file)
-* [`ldap_trusted_global_cert_type`](#ldap_trusted_global_cert_type)
-* [`ldap_shared_cache_size`](#ldap_shared_cache_size)
-* [`ldap_cache_entries`](#ldap_cache_entries)
-* [`ldap_cache_ttl`](#ldap_cache_ttl)
-* [`ldap_opcache_entries`](#ldap_opcache_entries)
-* [`ldap_opcache_ttl`](#ldap_opcache_ttl)
-* [`ldap_trusted_mode`](#ldap_trusted_mode)
-* [`ldap_path`](#ldap_path)
+* [`package_name`](#-apache--mod--ldap--package_name)
+* [`ldap_trusted_global_cert_file`](#-apache--mod--ldap--ldap_trusted_global_cert_file)
+* [`ldap_trusted_global_cert_type`](#-apache--mod--ldap--ldap_trusted_global_cert_type)
+* [`ldap_shared_cache_size`](#-apache--mod--ldap--ldap_shared_cache_size)
+* [`ldap_cache_entries`](#-apache--mod--ldap--ldap_cache_entries)
+* [`ldap_cache_ttl`](#-apache--mod--ldap--ldap_cache_ttl)
+* [`ldap_opcache_entries`](#-apache--mod--ldap--ldap_opcache_entries)
+* [`ldap_opcache_ttl`](#-apache--mod--ldap--ldap_opcache_ttl)
+* [`ldap_trusted_mode`](#-apache--mod--ldap--ldap_trusted_mode)
+* [`ldap_path`](#-apache--mod--ldap--ldap_path)
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--ldap--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Specifies the custom package name.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_trusted_global_cert_file"></a>`ldap_trusted_global_cert_file`
+##### <a name="-apache--mod--ldap--ldap_trusted_global_cert_file"></a>`ldap_trusted_global_cert_file`
 
 Data type: `Optional[String]`
 
 Sets the file or database containing global trusted Certificate Authority or global client certificates.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_trusted_global_cert_type"></a>`ldap_trusted_global_cert_type`
+##### <a name="-apache--mod--ldap--ldap_trusted_global_cert_type"></a>`ldap_trusted_global_cert_type`
 
 Data type: `String`
 
@@ -3537,55 +3549,55 @@ Sets the certificate parameter of the global trusted Certificate Authority or gl
 
 Default value: `'CA_BASE64'`
 
-##### <a name="ldap_shared_cache_size"></a>`ldap_shared_cache_size`
+##### <a name="-apache--mod--ldap--ldap_shared_cache_size"></a>`ldap_shared_cache_size`
 
 Data type: `Optional[Integer]`
 
 Size in bytes of the shared-memory cache
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_cache_entries"></a>`ldap_cache_entries`
+##### <a name="-apache--mod--ldap--ldap_cache_entries"></a>`ldap_cache_entries`
 
 Data type: `Optional[Integer]`
 
 Maximum number of entries in the primary LDAP cache
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_cache_ttl"></a>`ldap_cache_ttl`
+##### <a name="-apache--mod--ldap--ldap_cache_ttl"></a>`ldap_cache_ttl`
 
 Data type: `Optional[Integer]`
 
 Time that cached items remain valid (in seconds).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_opcache_entries"></a>`ldap_opcache_entries`
+##### <a name="-apache--mod--ldap--ldap_opcache_entries"></a>`ldap_opcache_entries`
 
 Data type: `Optional[Integer]`
 
 Number of entries used to cache LDAP compare operations
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_opcache_ttl"></a>`ldap_opcache_ttl`
+##### <a name="-apache--mod--ldap--ldap_opcache_ttl"></a>`ldap_opcache_ttl`
 
 Data type: `Optional[Integer]`
 
 Time that entries in the operation cache remain valid (in seconds).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_trusted_mode"></a>`ldap_trusted_mode`
+##### <a name="-apache--mod--ldap--ldap_trusted_mode"></a>`ldap_trusted_mode`
 
 Data type: `Optional[String]`
 
 Specifies the SSL/TLS mode to be used when connecting to an LDAP server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ldap_path"></a>`ldap_path`
+##### <a name="-apache--mod--ldap--ldap_path"></a>`ldap_path`
 
 Data type: `String`
 
@@ -3593,7 +3605,7 @@ The server location of the ldap status page.
 
 Default value: `'/ldap-status'`
 
-### <a name="apachemodlog_forensic"></a>`apache::mod::log_forensic`
+### <a name="apache--mod--log_forensic"></a>`apache::mod::log_forensic`
 
 Installs `mod_log_forensic`
 
@@ -3601,7 +3613,7 @@ Installs `mod_log_forensic`
   * https://httpd.apache.org/docs/current/mod/mod_log_forensic.html
     * for additional documentation.
 
-### <a name="apachemodlookup_identity"></a>`apache::mod::lookup_identity`
+### <a name="apache--mod--lookup_identity"></a>`apache::mod::lookup_identity`
 
 Installs `mod_lookup_identity`
 
@@ -3609,7 +3621,7 @@ Installs `mod_lookup_identity`
   * https://www.adelton.com/apache/mod_lookup_identity
     * for additional documentation.
 
-### <a name="apachemodmacro"></a>`apache::mod::macro`
+### <a name="apache--mod--macro"></a>`apache::mod::macro`
 
 Installs `mod_macro`.
 
@@ -3617,7 +3629,7 @@ Installs `mod_macro`.
   * https://httpd.apache.org/docs/current/mod/mod_macro.html
     * for additional documentation.
 
-### <a name="apachemodmd"></a>`apache::mod::md`
+### <a name="apache--mod--md"></a>`apache::mod::md`
 
 Installs and configures `mod_md`.
 
@@ -3631,264 +3643,264 @@ Installs and configures `mod_md`.
 
 The following parameters are available in the `apache::mod::md` class:
 
-* [`md_activation_delay`](#md_activation_delay)
-* [`md_base_server`](#md_base_server)
-* [`md_ca_challenges`](#md_ca_challenges)
-* [`md_certificate_agreement`](#md_certificate_agreement)
-* [`md_certificate_authority`](#md_certificate_authority)
-* [`md_certificate_check`](#md_certificate_check)
-* [`md_certificate_monitor`](#md_certificate_monitor)
-* [`md_certificate_protocol`](#md_certificate_protocol)
-* [`md_certificate_status`](#md_certificate_status)
-* [`md_challenge_dns01`](#md_challenge_dns01)
-* [`md_contact_email`](#md_contact_email)
-* [`md_http_proxy`](#md_http_proxy)
-* [`md_members`](#md_members)
-* [`md_message_cmd`](#md_message_cmd)
-* [`md_must_staple`](#md_must_staple)
-* [`md_notify_cmd`](#md_notify_cmd)
-* [`md_port_map`](#md_port_map)
-* [`md_private_keys`](#md_private_keys)
-* [`md_renew_mode`](#md_renew_mode)
-* [`md_renew_window`](#md_renew_window)
-* [`md_require_https`](#md_require_https)
-* [`md_server_status`](#md_server_status)
-* [`md_staple_others`](#md_staple_others)
-* [`md_stapling`](#md_stapling)
-* [`md_stapling_keep_response`](#md_stapling_keep_response)
-* [`md_stapling_renew_window`](#md_stapling_renew_window)
-* [`md_store_dir`](#md_store_dir)
-* [`md_warn_window`](#md_warn_window)
-
-##### <a name="md_activation_delay"></a>`md_activation_delay`
+* [`md_activation_delay`](#-apache--mod--md--md_activation_delay)
+* [`md_base_server`](#-apache--mod--md--md_base_server)
+* [`md_ca_challenges`](#-apache--mod--md--md_ca_challenges)
+* [`md_certificate_agreement`](#-apache--mod--md--md_certificate_agreement)
+* [`md_certificate_authority`](#-apache--mod--md--md_certificate_authority)
+* [`md_certificate_check`](#-apache--mod--md--md_certificate_check)
+* [`md_certificate_monitor`](#-apache--mod--md--md_certificate_monitor)
+* [`md_certificate_protocol`](#-apache--mod--md--md_certificate_protocol)
+* [`md_certificate_status`](#-apache--mod--md--md_certificate_status)
+* [`md_challenge_dns01`](#-apache--mod--md--md_challenge_dns01)
+* [`md_contact_email`](#-apache--mod--md--md_contact_email)
+* [`md_http_proxy`](#-apache--mod--md--md_http_proxy)
+* [`md_members`](#-apache--mod--md--md_members)
+* [`md_message_cmd`](#-apache--mod--md--md_message_cmd)
+* [`md_must_staple`](#-apache--mod--md--md_must_staple)
+* [`md_notify_cmd`](#-apache--mod--md--md_notify_cmd)
+* [`md_port_map`](#-apache--mod--md--md_port_map)
+* [`md_private_keys`](#-apache--mod--md--md_private_keys)
+* [`md_renew_mode`](#-apache--mod--md--md_renew_mode)
+* [`md_renew_window`](#-apache--mod--md--md_renew_window)
+* [`md_require_https`](#-apache--mod--md--md_require_https)
+* [`md_server_status`](#-apache--mod--md--md_server_status)
+* [`md_staple_others`](#-apache--mod--md--md_staple_others)
+* [`md_stapling`](#-apache--mod--md--md_stapling)
+* [`md_stapling_keep_response`](#-apache--mod--md--md_stapling_keep_response)
+* [`md_stapling_renew_window`](#-apache--mod--md--md_stapling_renew_window)
+* [`md_store_dir`](#-apache--mod--md--md_store_dir)
+* [`md_warn_window`](#-apache--mod--md--md_warn_window)
+
+##### <a name="-apache--mod--md--md_activation_delay"></a>`md_activation_delay`
 
 Data type: `Optional[String]`
 
 -
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_base_server"></a>`md_base_server`
+##### <a name="-apache--mod--md--md_base_server"></a>`md_base_server`
 
 Data type: `Optional[Apache::OnOff]`
 
 Control if base server may be managed or only virtual hosts.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_ca_challenges"></a>`md_ca_challenges`
+##### <a name="-apache--mod--md--md_ca_challenges"></a>`md_ca_challenges`
 
 Data type: `Optional[Array[Enum['dns-01', 'http-01', 'tls-alpn-01']]]`
 
 Type of ACME challenge used to prove domain ownership.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_agreement"></a>`md_certificate_agreement`
+##### <a name="-apache--mod--md--md_certificate_agreement"></a>`md_certificate_agreement`
 
 Data type: `Optional[Enum['accepted']]`
 
 You confirm that you accepted the Terms of Service of the Certificate
 Authority.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_authority"></a>`md_certificate_authority`
+##### <a name="-apache--mod--md--md_certificate_authority"></a>`md_certificate_authority`
 
 Data type: `Optional[Stdlib::HTTPUrl]`
 
 The URL of the ACME Certificate Authority service.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_check"></a>`md_certificate_check`
+##### <a name="-apache--mod--md--md_certificate_check"></a>`md_certificate_check`
 
 Data type: `Optional[String]`
 
 -
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_monitor"></a>`md_certificate_monitor`
+##### <a name="-apache--mod--md--md_certificate_monitor"></a>`md_certificate_monitor`
 
 Data type: `Optional[String]`
 
 The URL of a certificate log monitor.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_protocol"></a>`md_certificate_protocol`
+##### <a name="-apache--mod--md--md_certificate_protocol"></a>`md_certificate_protocol`
 
 Data type: `Optional[Enum['ACME']]`
 
 The protocol to use with the Certificate Authority.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_certificate_status"></a>`md_certificate_status`
+##### <a name="-apache--mod--md--md_certificate_status"></a>`md_certificate_status`
 
 Data type: `Optional[Apache::OnOff]`
 
 Exposes public certificate information in JSON.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_challenge_dns01"></a>`md_challenge_dns01`
+##### <a name="-apache--mod--md--md_challenge_dns01"></a>`md_challenge_dns01`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Define a program to be called when the `dns-01` challenge needs to be
 setup/torn down.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_contact_email"></a>`md_contact_email`
+##### <a name="-apache--mod--md--md_contact_email"></a>`md_contact_email`
 
 Data type: `Optional[String]`
 
 The ACME protocol requires you to give a contact url when you sign up.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_http_proxy"></a>`md_http_proxy`
+##### <a name="-apache--mod--md--md_http_proxy"></a>`md_http_proxy`
 
 Data type: `Optional[Stdlib::HTTPUrl]`
 
 Define a proxy for outgoing connections.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_members"></a>`md_members`
+##### <a name="-apache--mod--md--md_members"></a>`md_members`
 
 Data type: `Optional[Enum['auto', 'manual']]`
 
 Control if the alias domain names are automatically added.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_message_cmd"></a>`md_message_cmd`
+##### <a name="-apache--mod--md--md_message_cmd"></a>`md_message_cmd`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Handle events for Manage Domains.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_must_staple"></a>`md_must_staple`
+##### <a name="-apache--mod--md--md_must_staple"></a>`md_must_staple`
 
 Data type: `Optional[Apache::OnOff]`
 
 Control if new certificates carry the OCSP Must Staple flag.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_notify_cmd"></a>`md_notify_cmd`
+##### <a name="-apache--mod--md--md_notify_cmd"></a>`md_notify_cmd`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Run a program when a Managed Domain is ready.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_port_map"></a>`md_port_map`
+##### <a name="-apache--mod--md--md_port_map"></a>`md_port_map`
 
 Data type: `Optional[String]`
 
 Map external to internal ports for domain ownership verification.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_private_keys"></a>`md_private_keys`
+##### <a name="-apache--mod--md--md_private_keys"></a>`md_private_keys`
 
 Data type: `Optional[String]`
 
 Set type and size of the private keys generated.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_renew_mode"></a>`md_renew_mode`
+##### <a name="-apache--mod--md--md_renew_mode"></a>`md_renew_mode`
 
 Data type: `Optional[Enum['always', 'auto', 'manual']]`
 
 Controls if certificates shall be renewed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_renew_window"></a>`md_renew_window`
+##### <a name="-apache--mod--md--md_renew_window"></a>`md_renew_window`
 
 Data type: `Optional[String]`
 
 Control when a certificate will be renewed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_require_https"></a>`md_require_https`
+##### <a name="-apache--mod--md--md_require_https"></a>`md_require_https`
 
 Data type: `Optional[Enum['off', 'permanent', 'temporary']]`
 
 Redirects http: traffic to https: for Managed Domains.
 An http: Virtual Host must nevertheless be setup for that domain.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_server_status"></a>`md_server_status`
+##### <a name="-apache--mod--md--md_server_status"></a>`md_server_status`
 
 Data type: `Optional[Apache::OnOff]`
 
 Control if Managed Domain information is added to server-status.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_staple_others"></a>`md_staple_others`
+##### <a name="-apache--mod--md--md_staple_others"></a>`md_staple_others`
 
 Data type: `Optional[Apache::OnOff]`
 
 Enable stapling for certificates not managed by mod_md.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_stapling"></a>`md_stapling`
+##### <a name="-apache--mod--md--md_stapling"></a>`md_stapling`
 
 Data type: `Optional[Apache::OnOff]`
 
 Enable stapling for all or a particular MDomain.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_stapling_keep_response"></a>`md_stapling_keep_response`
+##### <a name="-apache--mod--md--md_stapling_keep_response"></a>`md_stapling_keep_response`
 
 Data type: `Optional[String]`
 
 Controls when old responses should be removed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_stapling_renew_window"></a>`md_stapling_renew_window`
+##### <a name="-apache--mod--md--md_stapling_renew_window"></a>`md_stapling_renew_window`
 
 Data type: `Optional[String]`
 
 Control when the stapling responses will be renewed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_store_dir"></a>`md_store_dir`
+##### <a name="-apache--mod--md--md_store_dir"></a>`md_store_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path on the local file system to store the Managed Domains data.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="md_warn_window"></a>`md_warn_window`
+##### <a name="-apache--mod--md--md_warn_window"></a>`md_warn_window`
 
 Data type: `Optional[String]`
 
 Define the time window when you want to be warned about an expiring
 certificate.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodmime"></a>`apache::mod::mime`
+### <a name="apache--mod--mime"></a>`apache::mod::mime`
 
 Installs and configures `mod_mime`.
 
@@ -3900,11 +3912,11 @@ Installs and configures `mod_mime`.
 
 The following parameters are available in the `apache::mod::mime` class:
 
-* [`mime_support_package`](#mime_support_package)
-* [`mime_types_config`](#mime_types_config)
-* [`mime_types_additional`](#mime_types_additional)
+* [`mime_support_package`](#-apache--mod--mime--mime_support_package)
+* [`mime_types_config`](#-apache--mod--mime--mime_types_config)
+* [`mime_types_additional`](#-apache--mod--mime--mime_types_additional)
 
-##### <a name="mime_support_package"></a>`mime_support_package`
+##### <a name="-apache--mod--mime--mime_support_package"></a>`mime_support_package`
 
 Data type: `String`
 
@@ -3912,7 +3924,7 @@ Name of the MIME package to be installed.
 
 Default value: `$apache::params::mime_support_package`
 
-##### <a name="mime_types_config"></a>`mime_types_config`
+##### <a name="-apache--mod--mime--mime_types_config"></a>`mime_types_config`
 
 Data type: `String`
 
@@ -3920,15 +3932,15 @@ The location of the mime.types file.
 
 Default value: `$apache::params::mime_types_config`
 
-##### <a name="mime_types_additional"></a>`mime_types_additional`
+##### <a name="-apache--mod--mime--mime_types_additional"></a>`mime_types_additional`
 
 Data type: `Optional[Hash]`
 
 List of additional MIME types to include.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodmime_magic"></a>`apache::mod::mime_magic`
+### <a name="apache--mod--mime_magic"></a>`apache::mod::mime_magic`
 
 Installs and configures `mod_mime_magic`.
 
@@ -3940,17 +3952,17 @@ Installs and configures `mod_mime_magic`.
 
 The following parameters are available in the `apache::mod::mime_magic` class:
 
-* [`magic_file`](#magic_file)
+* [`magic_file`](#-apache--mod--mime_magic--magic_file)
 
-##### <a name="magic_file"></a>`magic_file`
+##### <a name="-apache--mod--mime_magic--magic_file"></a>`magic_file`
 
 Data type: `Optional[String]`
 
 Enable MIME-type determination based on file contents using the specified magic file.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodnegotiation"></a>`apache::mod::negotiation`
+### <a name="apache--mod--negotiation"></a>`apache::mod::negotiation`
 
 Installs and configures `mod_negotiation`.
 
@@ -3962,10 +3974,10 @@ Installs and configures `mod_negotiation`.
 
 The following parameters are available in the `apache::mod::negotiation` class:
 
-* [`force_language_priority`](#force_language_priority)
-* [`language_priority`](#language_priority)
+* [`force_language_priority`](#-apache--mod--negotiation--force_language_priority)
+* [`language_priority`](#-apache--mod--negotiation--language_priority)
 
-##### <a name="force_language_priority"></a>`force_language_priority`
+##### <a name="-apache--mod--negotiation--force_language_priority"></a>`force_language_priority`
 
 Data type: `Variant[Array[String], String]`
 
@@ -3973,18 +3985,22 @@ Action to take if a single acceptable document is not found.
 
 Default value: `'Prefer Fallback'`
 
-##### <a name="language_priority"></a>`language_priority`
+##### <a name="-apache--mod--negotiation--language_priority"></a>`language_priority`
 
 Data type: `Variant[Array[String], String]`
 
 The precedence of language variants for cases where the client does not express a preference.
 
-Default value: `['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
+Default value:
+
+```puppet
+['en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et',
     'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn',
     'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
-  'zh-TW']`
+  'zh-TW']
+```
 
-### <a name="apachemodnss"></a>`apache::mod::nss`
+### <a name="apache--mod--nss"></a>`apache::mod::nss`
 
 Installs and configures `mod_nss`.
 
@@ -3996,12 +4012,12 @@ Installs and configures `mod_nss`.
 
 The following parameters are available in the `apache::mod::nss` class:
 
-* [`transfer_log`](#transfer_log)
-* [`error_log`](#error_log)
-* [`passwd_file`](#passwd_file)
-* [`port`](#port)
+* [`transfer_log`](#-apache--mod--nss--transfer_log)
+* [`error_log`](#-apache--mod--nss--error_log)
+* [`passwd_file`](#-apache--mod--nss--passwd_file)
+* [`port`](#-apache--mod--nss--port)
 
-##### <a name="transfer_log"></a>`transfer_log`
+##### <a name="-apache--mod--nss--transfer_log"></a>`transfer_log`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4009,7 +4025,7 @@ Path to `access.log`.
 
 Default value: `"${apache::params::logroot}/access.log"`
 
-##### <a name="error_log"></a>`error_log`
+##### <a name="-apache--mod--nss--error_log"></a>`error_log`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4017,15 +4033,15 @@ Path to `error.log`
 
 Default value: `"${apache::params::logroot}/error.log"`
 
-##### <a name="passwd_file"></a>`passwd_file`
+##### <a name="-apache--mod--nss--passwd_file"></a>`passwd_file`
 
 Data type: `Optional[String]`
 
 Path to file containing token passwords used for NSSPassPhraseDialog.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--mod--nss--port"></a>`port`
 
 Data type: `Stdlib::Port`
 
@@ -4033,7 +4049,7 @@ Sets the SSL port that should be used by mod_nss.
 
 Default value: `8443`
 
-### <a name="apachemodpagespeed"></a>`apache::mod::pagespeed`
+### <a name="apache--mod--pagespeed"></a>`apache::mod::pagespeed`
 
 Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
 
@@ -4098,42 +4114,42 @@ class { 'apache::mod::pagespeed':
 
 The following parameters are available in the `apache::mod::pagespeed` class:
 
-* [`inherit_vhost_config`](#inherit_vhost_config)
-* [`filter_xhtml`](#filter_xhtml)
-* [`cache_path`](#cache_path)
-* [`log_dir`](#log_dir)
-* [`memcache_servers`](#memcache_servers)
-* [`rewrite_level`](#rewrite_level)
-* [`disable_filters`](#disable_filters)
-* [`enable_filters`](#enable_filters)
-* [`forbid_filters`](#forbid_filters)
-* [`rewrite_deadline_per_flush_ms`](#rewrite_deadline_per_flush_ms)
-* [`additional_domains`](#additional_domains)
-* [`file_cache_size_kb`](#file_cache_size_kb)
-* [`file_cache_clean_interval_ms`](#file_cache_clean_interval_ms)
-* [`lru_cache_per_process`](#lru_cache_per_process)
-* [`lru_cache_byte_limit`](#lru_cache_byte_limit)
-* [`css_flatten_max_bytes`](#css_flatten_max_bytes)
-* [`css_inline_max_bytes`](#css_inline_max_bytes)
-* [`css_image_inline_max_bytes`](#css_image_inline_max_bytes)
-* [`image_inline_max_bytes`](#image_inline_max_bytes)
-* [`js_inline_max_bytes`](#js_inline_max_bytes)
-* [`css_outline_min_bytes`](#css_outline_min_bytes)
-* [`js_outline_min_bytes`](#js_outline_min_bytes)
-* [`inode_limit`](#inode_limit)
-* [`image_max_rewrites_at_once`](#image_max_rewrites_at_once)
-* [`num_rewrite_threads`](#num_rewrite_threads)
-* [`num_expensive_rewrite_threads`](#num_expensive_rewrite_threads)
-* [`collect_statistics`](#collect_statistics)
-* [`statistics_logging`](#statistics_logging)
-* [`allow_view_stats`](#allow_view_stats)
-* [`allow_pagespeed_console`](#allow_pagespeed_console)
-* [`allow_pagespeed_message`](#allow_pagespeed_message)
-* [`message_buffer_size`](#message_buffer_size)
-* [`additional_configuration`](#additional_configuration)
-* [`package_ensure`](#package_ensure)
-
-##### <a name="inherit_vhost_config"></a>`inherit_vhost_config`
+* [`inherit_vhost_config`](#-apache--mod--pagespeed--inherit_vhost_config)
+* [`filter_xhtml`](#-apache--mod--pagespeed--filter_xhtml)
+* [`cache_path`](#-apache--mod--pagespeed--cache_path)
+* [`log_dir`](#-apache--mod--pagespeed--log_dir)
+* [`memcache_servers`](#-apache--mod--pagespeed--memcache_servers)
+* [`rewrite_level`](#-apache--mod--pagespeed--rewrite_level)
+* [`disable_filters`](#-apache--mod--pagespeed--disable_filters)
+* [`enable_filters`](#-apache--mod--pagespeed--enable_filters)
+* [`forbid_filters`](#-apache--mod--pagespeed--forbid_filters)
+* [`rewrite_deadline_per_flush_ms`](#-apache--mod--pagespeed--rewrite_deadline_per_flush_ms)
+* [`additional_domains`](#-apache--mod--pagespeed--additional_domains)
+* [`file_cache_size_kb`](#-apache--mod--pagespeed--file_cache_size_kb)
+* [`file_cache_clean_interval_ms`](#-apache--mod--pagespeed--file_cache_clean_interval_ms)
+* [`lru_cache_per_process`](#-apache--mod--pagespeed--lru_cache_per_process)
+* [`lru_cache_byte_limit`](#-apache--mod--pagespeed--lru_cache_byte_limit)
+* [`css_flatten_max_bytes`](#-apache--mod--pagespeed--css_flatten_max_bytes)
+* [`css_inline_max_bytes`](#-apache--mod--pagespeed--css_inline_max_bytes)
+* [`css_image_inline_max_bytes`](#-apache--mod--pagespeed--css_image_inline_max_bytes)
+* [`image_inline_max_bytes`](#-apache--mod--pagespeed--image_inline_max_bytes)
+* [`js_inline_max_bytes`](#-apache--mod--pagespeed--js_inline_max_bytes)
+* [`css_outline_min_bytes`](#-apache--mod--pagespeed--css_outline_min_bytes)
+* [`js_outline_min_bytes`](#-apache--mod--pagespeed--js_outline_min_bytes)
+* [`inode_limit`](#-apache--mod--pagespeed--inode_limit)
+* [`image_max_rewrites_at_once`](#-apache--mod--pagespeed--image_max_rewrites_at_once)
+* [`num_rewrite_threads`](#-apache--mod--pagespeed--num_rewrite_threads)
+* [`num_expensive_rewrite_threads`](#-apache--mod--pagespeed--num_expensive_rewrite_threads)
+* [`collect_statistics`](#-apache--mod--pagespeed--collect_statistics)
+* [`statistics_logging`](#-apache--mod--pagespeed--statistics_logging)
+* [`allow_view_stats`](#-apache--mod--pagespeed--allow_view_stats)
+* [`allow_pagespeed_console`](#-apache--mod--pagespeed--allow_pagespeed_console)
+* [`allow_pagespeed_message`](#-apache--mod--pagespeed--allow_pagespeed_message)
+* [`message_buffer_size`](#-apache--mod--pagespeed--message_buffer_size)
+* [`additional_configuration`](#-apache--mod--pagespeed--additional_configuration)
+* [`package_ensure`](#-apache--mod--pagespeed--package_ensure)
+
+##### <a name="-apache--mod--pagespeed--inherit_vhost_config"></a>`inherit_vhost_config`
 
 Data type: `String`
 
@@ -4141,15 +4157,15 @@ Whether or not to inherit the vhost config
 
 Default value: `'on'`
 
-##### <a name="filter_xhtml"></a>`filter_xhtml`
+##### <a name="-apache--mod--pagespeed--filter_xhtml"></a>`filter_xhtml`
 
 Data type: `Boolean`
 
 Whether to filter by xhtml
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="cache_path"></a>`cache_path`
+##### <a name="-apache--mod--pagespeed--cache_path"></a>`cache_path`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4157,7 +4173,7 @@ Where to cache any files
 
 Default value: `'/var/cache/mod_pagespeed/'`
 
-##### <a name="log_dir"></a>`log_dir`
+##### <a name="-apache--mod--pagespeed--log_dir"></a>`log_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -4165,7 +4181,7 @@ The log directory
 
 Default value: `'/var/log/pagespeed'`
 
-##### <a name="memcache_servers"></a>`memcache_servers`
+##### <a name="-apache--mod--pagespeed--memcache_servers"></a>`memcache_servers`
 
 Data type: `Array`
 
@@ -4173,7 +4189,7 @@ Data type: `Array`
 
 Default value: `[]`
 
-##### <a name="rewrite_level"></a>`rewrite_level`
+##### <a name="-apache--mod--pagespeed--rewrite_level"></a>`rewrite_level`
 
 Data type: `String`
 
@@ -4182,7 +4198,7 @@ Can be `PassThrough`, `CoreFilters` or `OptimizeForBandwidth`.
 
 Default value: `'CoreFilters'`
 
-##### <a name="disable_filters"></a>`disable_filters`
+##### <a name="-apache--mod--pagespeed--disable_filters"></a>`disable_filters`
 
 Data type: `Array`
 
@@ -4190,7 +4206,7 @@ An array of filters that you wish to disable
 
 Default value: `[]`
 
-##### <a name="enable_filters"></a>`enable_filters`
+##### <a name="-apache--mod--pagespeed--enable_filters"></a>`enable_filters`
 
 Data type: `Array`
 
@@ -4198,7 +4214,7 @@ An array of filters that you wish to enable
 
 Default value: `[]`
 
-##### <a name="forbid_filters"></a>`forbid_filters`
+##### <a name="-apache--mod--pagespeed--forbid_filters"></a>`forbid_filters`
 
 Data type: `Array`
 
@@ -4206,7 +4222,7 @@ An array of filters that you wish to forbid
 
 Default value: `[]`
 
-##### <a name="rewrite_deadline_per_flush_ms"></a>`rewrite_deadline_per_flush_ms`
+##### <a name="-apache--mod--pagespeed--rewrite_deadline_per_flush_ms"></a>`rewrite_deadline_per_flush_ms`
 
 Data type: `Integer`
 
@@ -4214,15 +4230,15 @@ How long to wait after attempting to rewrite an uncache/expired resource.
 
 Default value: `10`
 
-##### <a name="additional_domains"></a>`additional_domains`
+##### <a name="-apache--mod--pagespeed--additional_domains"></a>`additional_domains`
 
 Data type: `Optional[String]`
 
 Any additional domains that PageSpeed should optimize resources from.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="file_cache_size_kb"></a>`file_cache_size_kb`
+##### <a name="-apache--mod--pagespeed--file_cache_size_kb"></a>`file_cache_size_kb`
 
 Data type: `Integer`
 
@@ -4230,7 +4246,7 @@ The maximum size of the cache
 
 Default value: `102400`
 
-##### <a name="file_cache_clean_interval_ms"></a>`file_cache_clean_interval_ms`
+##### <a name="-apache--mod--pagespeed--file_cache_clean_interval_ms"></a>`file_cache_clean_interval_ms`
 
 Data type: `Integer`
 
@@ -4238,7 +4254,7 @@ The interval between which the cache is cleaned
 
 Default value: `3600000`
 
-##### <a name="lru_cache_per_process"></a>`lru_cache_per_process`
+##### <a name="-apache--mod--pagespeed--lru_cache_per_process"></a>`lru_cache_per_process`
 
 Data type: `Integer`
 
@@ -4246,7 +4262,7 @@ The amount of memory dedcated to each process
 
 Default value: `1024`
 
-##### <a name="lru_cache_byte_limit"></a>`lru_cache_byte_limit`
+##### <a name="-apache--mod--pagespeed--lru_cache_byte_limit"></a>`lru_cache_byte_limit`
 
 Data type: `Integer`
 
@@ -4254,7 +4270,7 @@ How large a cache entry the cache will accept
 
 Default value: `16384`
 
-##### <a name="css_flatten_max_bytes"></a>`css_flatten_max_bytes`
+##### <a name="-apache--mod--pagespeed--css_flatten_max_bytes"></a>`css_flatten_max_bytes`
 
 Data type: `Integer`
 
@@ -4262,7 +4278,7 @@ The maximum size in bytes of the flattened CSS
 
 Default value: `2048`
 
-##### <a name="css_inline_max_bytes"></a>`css_inline_max_bytes`
+##### <a name="-apache--mod--pagespeed--css_inline_max_bytes"></a>`css_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4270,7 +4286,7 @@ The maximum size in bytes of any image that will be inlined into CSS
 
 Default value: `2048`
 
-##### <a name="css_image_inline_max_bytes"></a>`css_image_inline_max_bytes`
+##### <a name="-apache--mod--pagespeed--css_image_inline_max_bytes"></a>`css_image_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4278,7 +4294,7 @@ The maximum size in bytes of any image that will be inlined into an HTML file
 
 Default value: `2048`
 
-##### <a name="image_inline_max_bytes"></a>`image_inline_max_bytes`
+##### <a name="-apache--mod--pagespeed--image_inline_max_bytes"></a>`image_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4286,7 +4302,7 @@ The maximum size in bytes of any inlined CSS file
 
 Default value: `2048`
 
-##### <a name="js_inline_max_bytes"></a>`js_inline_max_bytes`
+##### <a name="-apache--mod--pagespeed--js_inline_max_bytes"></a>`js_inline_max_bytes`
 
 Data type: `Integer`
 
@@ -4294,7 +4310,7 @@ The maximum size in bytes of any inlined JavaScript file
 
 Default value: `2048`
 
-##### <a name="css_outline_min_bytes"></a>`css_outline_min_bytes`
+##### <a name="-apache--mod--pagespeed--css_outline_min_bytes"></a>`css_outline_min_bytes`
 
 Data type: `Integer`
 
@@ -4302,7 +4318,7 @@ The minimum size in bytes for a CSS file to qualify as an outline
 
 Default value: `3000`
 
-##### <a name="js_outline_min_bytes"></a>`js_outline_min_bytes`
+##### <a name="-apache--mod--pagespeed--js_outline_min_bytes"></a>`js_outline_min_bytes`
 
 Data type: `Integer`
 
@@ -4310,7 +4326,7 @@ The minimum size in bytes for a JavaScript file to qualify as an outline
 
 Default value: `3000`
 
-##### <a name="inode_limit"></a>`inode_limit`
+##### <a name="-apache--mod--pagespeed--inode_limit"></a>`inode_limit`
 
 Data type: `Integer`
 
@@ -4318,7 +4334,7 @@ The file cache inode limit
 
 Default value: `500000`
 
-##### <a name="image_max_rewrites_at_once"></a>`image_max_rewrites_at_once`
+##### <a name="-apache--mod--pagespeed--image_max_rewrites_at_once"></a>`image_max_rewrites_at_once`
 
 Data type: `Integer`
 
@@ -4326,7 +4342,7 @@ The maximum number of images to optimize concurrently
 
 Default value: `8`
 
-##### <a name="num_rewrite_threads"></a>`num_rewrite_threads`
+##### <a name="-apache--mod--pagespeed--num_rewrite_threads"></a>`num_rewrite_threads`
 
 Data type: `Integer`
 
@@ -4335,7 +4351,7 @@ These threads are used for short, latency-sensitive work.
 
 Default value: `4`
 
-##### <a name="num_expensive_rewrite_threads"></a>`num_expensive_rewrite_threads`
+##### <a name="-apache--mod--pagespeed--num_expensive_rewrite_threads"></a>`num_expensive_rewrite_threads`
 
 Data type: `Integer`
 
@@ -4344,7 +4360,7 @@ These threads are used for full optimization.
 
 Default value: `4`
 
-##### <a name="collect_statistics"></a>`collect_statistics`
+##### <a name="-apache--mod--pagespeed--collect_statistics"></a>`collect_statistics`
 
 Data type: `String`
 
@@ -4352,7 +4368,7 @@ Whether to collect cross-process statistics
 
 Default value: `'on'`
 
-##### <a name="statistics_logging"></a>`statistics_logging`
+##### <a name="-apache--mod--pagespeed--statistics_logging"></a>`statistics_logging`
 
 Data type: `String`
 
@@ -4360,7 +4376,7 @@ Whether graphs should be drawn from collected statistics
 
 Default value: `'on'`
 
-##### <a name="allow_view_stats"></a>`allow_view_stats`
+##### <a name="-apache--mod--pagespeed--allow_view_stats"></a>`allow_view_stats`
 
 Data type: `Array`
 
@@ -4368,7 +4384,7 @@ What sources should be allowed to view the resultant graph
 
 Default value: `[]`
 
-##### <a name="allow_pagespeed_console"></a>`allow_pagespeed_console`
+##### <a name="-apache--mod--pagespeed--allow_pagespeed_console"></a>`allow_pagespeed_console`
 
 Data type: `Array`
 
@@ -4376,7 +4392,7 @@ What sources to draw the graphs from
 
 Default value: `[]`
 
-##### <a name="allow_pagespeed_message"></a>`allow_pagespeed_message`
+##### <a name="-apache--mod--pagespeed--allow_pagespeed_message"></a>`allow_pagespeed_message`
 
 Data type: `Array`
 
@@ -4384,7 +4400,7 @@ Data type: `Array`
 
 Default value: `[]`
 
-##### <a name="message_buffer_size"></a>`message_buffer_size`
+##### <a name="-apache--mod--pagespeed--message_buffer_size"></a>`message_buffer_size`
 
 Data type: `Integer`
 
@@ -4392,7 +4408,7 @@ The amount of bytes to allocate as a buffer to hold recent log messages
 
 Default value: `100000`
 
-##### <a name="additional_configuration"></a>`additional_configuration`
+##### <a name="-apache--mod--pagespeed--additional_configuration"></a>`additional_configuration`
 
 Data type: `Variant[Array, Hash]`
 
@@ -4400,15 +4416,15 @@ Any additional configuration no included as it's own option
 
 Default value: `{}`
 
-##### <a name="package_ensure"></a>`package_ensure`
+##### <a name="-apache--mod--pagespeed--package_ensure"></a>`package_ensure`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodpassenger"></a>`apache::mod::passenger`
+### <a name="apache--mod--passenger"></a>`apache::mod::passenger`
 
 The current set of server configurations settings were taken directly from the Passenger Reference. To enable deprecation warnings
 and removal failure messages, set the passenger_installed_version to the version number installed on the server.
@@ -4431,176 +4447,176 @@ There are also several undocumented settings.
 
 The following parameters are available in the `apache::mod::passenger` class:
 
-* [`manage_repo`](#manage_repo)
-* [`mod_id`](#mod_id)
-* [`mod_lib`](#mod_lib)
-* [`mod_lib_path`](#mod_lib_path)
-* [`mod_package`](#mod_package)
-* [`mod_package_ensure`](#mod_package_ensure)
-* [`mod_path`](#mod_path)
-* [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
-* [`passenger_anonymous_telemetry_proxy`](#passenger_anonymous_telemetry_proxy)
-* [`passenger_app_env`](#passenger_app_env)
-* [`passenger_app_group_name`](#passenger_app_group_name)
-* [`passenger_app_root`](#passenger_app_root)
-* [`passenger_app_type`](#passenger_app_type)
-* [`passenger_base_uri`](#passenger_base_uri)
-* [`passenger_buffer_response`](#passenger_buffer_response)
-* [`passenger_buffer_upload`](#passenger_buffer_upload)
-* [`passenger_concurrency_model`](#passenger_concurrency_model)
-* [`passenger_conf_file`](#passenger_conf_file)
-* [`passenger_conf_package_file`](#passenger_conf_package_file)
-* [`passenger_data_buffer_dir`](#passenger_data_buffer_dir)
-* [`passenger_debug_log_file`](#passenger_debug_log_file)
-* [`passenger_debugger`](#passenger_debugger)
-* [`passenger_default_group`](#passenger_default_group)
-* [`passenger_default_ruby`](#passenger_default_ruby)
-* [`passenger_default_user`](#passenger_default_user)
-* [`passenger_disable_anonymous_telemetry`](#passenger_disable_anonymous_telemetry)
-* [`passenger_disable_log_prefix`](#passenger_disable_log_prefix)
-* [`passenger_disable_security_update_check`](#passenger_disable_security_update_check)
-* [`passenger_enabled`](#passenger_enabled)
-* [`passenger_error_override`](#passenger_error_override)
-* [`passenger_file_descriptor_log_file`](#passenger_file_descriptor_log_file)
-* [`passenger_fly_with`](#passenger_fly_with)
-* [`passenger_force_max_concurrent_requests_per_process`](#passenger_force_max_concurrent_requests_per_process)
-* [`passenger_friendly_error_pages`](#passenger_friendly_error_pages)
-* [`passenger_group`](#passenger_group)
-* [`passenger_high_performance`](#passenger_high_performance)
-* [`passenger_installed_version`](#passenger_installed_version)
-* [`passenger_instance_registry_dir`](#passenger_instance_registry_dir)
-* [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
-* [`passenger_preload_bundler`](#passenger_preload_bundler)
-* [`passenger_log_file`](#passenger_log_file)
-* [`passenger_log_level`](#passenger_log_level)
-* [`passenger_lve_min_uid`](#passenger_lve_min_uid)
-* [`passenger_max_instances`](#passenger_max_instances)
-* [`passenger_max_instances_per_app`](#passenger_max_instances_per_app)
-* [`passenger_max_pool_size`](#passenger_max_pool_size)
-* [`passenger_max_preloader_idle_time`](#passenger_max_preloader_idle_time)
-* [`passenger_max_request_queue_size`](#passenger_max_request_queue_size)
-* [`passenger_max_request_time`](#passenger_max_request_time)
-* [`passenger_max_requests`](#passenger_max_requests)
-* [`passenger_memory_limit`](#passenger_memory_limit)
-* [`passenger_meteor_app_settings`](#passenger_meteor_app_settings)
-* [`passenger_min_instances`](#passenger_min_instances)
-* [`passenger_nodejs`](#passenger_nodejs)
-* [`passenger_pool_idle_time`](#passenger_pool_idle_time)
-* [`passenger_pre_start`](#passenger_pre_start)
-* [`passenger_python`](#passenger_python)
-* [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
-* [`passenger_resolve_symlinks_in_document_root`](#passenger_resolve_symlinks_in_document_root)
-* [`passenger_response_buffer_high_watermark`](#passenger_response_buffer_high_watermark)
-* [`passenger_restart_dir`](#passenger_restart_dir)
-* [`passenger_rolling_restarts`](#passenger_rolling_restarts)
-* [`passenger_root`](#passenger_root)
-* [`passenger_ruby`](#passenger_ruby)
-* [`passenger_security_update_check_proxy`](#passenger_security_update_check_proxy)
-* [`passenger_show_version_in_header`](#passenger_show_version_in_header)
-* [`passenger_socket_backlog`](#passenger_socket_backlog)
-* [`passenger_spawn_dir`](#passenger_spawn_dir)
-* [`passenger_spawn_method`](#passenger_spawn_method)
-* [`passenger_start_timeout`](#passenger_start_timeout)
-* [`passenger_startup_file`](#passenger_startup_file)
-* [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
-* [`passenger_sticky_sessions`](#passenger_sticky_sessions)
-* [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
-* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
-* [`passenger_thread_count`](#passenger_thread_count)
-* [`passenger_use_global_queue`](#passenger_use_global_queue)
-* [`passenger_user`](#passenger_user)
-* [`passenger_user_switching`](#passenger_user_switching)
-* [`rack_auto_detect`](#rack_auto_detect)
-* [`rack_autodetect`](#rack_autodetect)
-* [`rack_base_uri`](#rack_base_uri)
-* [`rack_env`](#rack_env)
-* [`rails_allow_mod_rewrite`](#rails_allow_mod_rewrite)
-* [`rails_app_spawner_idle_time`](#rails_app_spawner_idle_time)
-* [`rails_auto_detect`](#rails_auto_detect)
-* [`rails_autodetect`](#rails_autodetect)
-* [`rails_base_uri`](#rails_base_uri)
-* [`rails_default_user`](#rails_default_user)
-* [`rails_env`](#rails_env)
-* [`rails_framework_spawner_idle_time`](#rails_framework_spawner_idle_time)
-* [`rails_ruby`](#rails_ruby)
-* [`rails_spawn_method`](#rails_spawn_method)
-* [`rails_user_switching`](#rails_user_switching)
-* [`wsgi_auto_detect`](#wsgi_auto_detect)
-
-##### <a name="manage_repo"></a>`manage_repo`
+* [`manage_repo`](#-apache--mod--passenger--manage_repo)
+* [`mod_id`](#-apache--mod--passenger--mod_id)
+* [`mod_lib`](#-apache--mod--passenger--mod_lib)
+* [`mod_lib_path`](#-apache--mod--passenger--mod_lib_path)
+* [`mod_package`](#-apache--mod--passenger--mod_package)
+* [`mod_package_ensure`](#-apache--mod--passenger--mod_package_ensure)
+* [`mod_path`](#-apache--mod--passenger--mod_path)
+* [`passenger_allow_encoded_slashes`](#-apache--mod--passenger--passenger_allow_encoded_slashes)
+* [`passenger_anonymous_telemetry_proxy`](#-apache--mod--passenger--passenger_anonymous_telemetry_proxy)
+* [`passenger_app_env`](#-apache--mod--passenger--passenger_app_env)
+* [`passenger_app_group_name`](#-apache--mod--passenger--passenger_app_group_name)
+* [`passenger_app_root`](#-apache--mod--passenger--passenger_app_root)
+* [`passenger_app_type`](#-apache--mod--passenger--passenger_app_type)
+* [`passenger_base_uri`](#-apache--mod--passenger--passenger_base_uri)
+* [`passenger_buffer_response`](#-apache--mod--passenger--passenger_buffer_response)
+* [`passenger_buffer_upload`](#-apache--mod--passenger--passenger_buffer_upload)
+* [`passenger_concurrency_model`](#-apache--mod--passenger--passenger_concurrency_model)
+* [`passenger_conf_file`](#-apache--mod--passenger--passenger_conf_file)
+* [`passenger_conf_package_file`](#-apache--mod--passenger--passenger_conf_package_file)
+* [`passenger_data_buffer_dir`](#-apache--mod--passenger--passenger_data_buffer_dir)
+* [`passenger_debug_log_file`](#-apache--mod--passenger--passenger_debug_log_file)
+* [`passenger_debugger`](#-apache--mod--passenger--passenger_debugger)
+* [`passenger_default_group`](#-apache--mod--passenger--passenger_default_group)
+* [`passenger_default_ruby`](#-apache--mod--passenger--passenger_default_ruby)
+* [`passenger_default_user`](#-apache--mod--passenger--passenger_default_user)
+* [`passenger_disable_anonymous_telemetry`](#-apache--mod--passenger--passenger_disable_anonymous_telemetry)
+* [`passenger_disable_log_prefix`](#-apache--mod--passenger--passenger_disable_log_prefix)
+* [`passenger_disable_security_update_check`](#-apache--mod--passenger--passenger_disable_security_update_check)
+* [`passenger_enabled`](#-apache--mod--passenger--passenger_enabled)
+* [`passenger_error_override`](#-apache--mod--passenger--passenger_error_override)
+* [`passenger_file_descriptor_log_file`](#-apache--mod--passenger--passenger_file_descriptor_log_file)
+* [`passenger_fly_with`](#-apache--mod--passenger--passenger_fly_with)
+* [`passenger_force_max_concurrent_requests_per_process`](#-apache--mod--passenger--passenger_force_max_concurrent_requests_per_process)
+* [`passenger_friendly_error_pages`](#-apache--mod--passenger--passenger_friendly_error_pages)
+* [`passenger_group`](#-apache--mod--passenger--passenger_group)
+* [`passenger_high_performance`](#-apache--mod--passenger--passenger_high_performance)
+* [`passenger_installed_version`](#-apache--mod--passenger--passenger_installed_version)
+* [`passenger_instance_registry_dir`](#-apache--mod--passenger--passenger_instance_registry_dir)
+* [`passenger_load_shell_envvars`](#-apache--mod--passenger--passenger_load_shell_envvars)
+* [`passenger_preload_bundler`](#-apache--mod--passenger--passenger_preload_bundler)
+* [`passenger_log_file`](#-apache--mod--passenger--passenger_log_file)
+* [`passenger_log_level`](#-apache--mod--passenger--passenger_log_level)
+* [`passenger_lve_min_uid`](#-apache--mod--passenger--passenger_lve_min_uid)
+* [`passenger_max_instances`](#-apache--mod--passenger--passenger_max_instances)
+* [`passenger_max_instances_per_app`](#-apache--mod--passenger--passenger_max_instances_per_app)
+* [`passenger_max_pool_size`](#-apache--mod--passenger--passenger_max_pool_size)
+* [`passenger_max_preloader_idle_time`](#-apache--mod--passenger--passenger_max_preloader_idle_time)
+* [`passenger_max_request_queue_size`](#-apache--mod--passenger--passenger_max_request_queue_size)
+* [`passenger_max_request_time`](#-apache--mod--passenger--passenger_max_request_time)
+* [`passenger_max_requests`](#-apache--mod--passenger--passenger_max_requests)
+* [`passenger_memory_limit`](#-apache--mod--passenger--passenger_memory_limit)
+* [`passenger_meteor_app_settings`](#-apache--mod--passenger--passenger_meteor_app_settings)
+* [`passenger_min_instances`](#-apache--mod--passenger--passenger_min_instances)
+* [`passenger_nodejs`](#-apache--mod--passenger--passenger_nodejs)
+* [`passenger_pool_idle_time`](#-apache--mod--passenger--passenger_pool_idle_time)
+* [`passenger_pre_start`](#-apache--mod--passenger--passenger_pre_start)
+* [`passenger_python`](#-apache--mod--passenger--passenger_python)
+* [`passenger_resist_deployment_errors`](#-apache--mod--passenger--passenger_resist_deployment_errors)
+* [`passenger_resolve_symlinks_in_document_root`](#-apache--mod--passenger--passenger_resolve_symlinks_in_document_root)
+* [`passenger_response_buffer_high_watermark`](#-apache--mod--passenger--passenger_response_buffer_high_watermark)
+* [`passenger_restart_dir`](#-apache--mod--passenger--passenger_restart_dir)
+* [`passenger_rolling_restarts`](#-apache--mod--passenger--passenger_rolling_restarts)
+* [`passenger_root`](#-apache--mod--passenger--passenger_root)
+* [`passenger_ruby`](#-apache--mod--passenger--passenger_ruby)
+* [`passenger_security_update_check_proxy`](#-apache--mod--passenger--passenger_security_update_check_proxy)
+* [`passenger_show_version_in_header`](#-apache--mod--passenger--passenger_show_version_in_header)
+* [`passenger_socket_backlog`](#-apache--mod--passenger--passenger_socket_backlog)
+* [`passenger_spawn_dir`](#-apache--mod--passenger--passenger_spawn_dir)
+* [`passenger_spawn_method`](#-apache--mod--passenger--passenger_spawn_method)
+* [`passenger_start_timeout`](#-apache--mod--passenger--passenger_start_timeout)
+* [`passenger_startup_file`](#-apache--mod--passenger--passenger_startup_file)
+* [`passenger_stat_throttle_rate`](#-apache--mod--passenger--passenger_stat_throttle_rate)
+* [`passenger_sticky_sessions`](#-apache--mod--passenger--passenger_sticky_sessions)
+* [`passenger_sticky_sessions_cookie_name`](#-apache--mod--passenger--passenger_sticky_sessions_cookie_name)
+* [`passenger_sticky_sessions_cookie_attributes`](#-apache--mod--passenger--passenger_sticky_sessions_cookie_attributes)
+* [`passenger_thread_count`](#-apache--mod--passenger--passenger_thread_count)
+* [`passenger_use_global_queue`](#-apache--mod--passenger--passenger_use_global_queue)
+* [`passenger_user`](#-apache--mod--passenger--passenger_user)
+* [`passenger_user_switching`](#-apache--mod--passenger--passenger_user_switching)
+* [`rack_auto_detect`](#-apache--mod--passenger--rack_auto_detect)
+* [`rack_autodetect`](#-apache--mod--passenger--rack_autodetect)
+* [`rack_base_uri`](#-apache--mod--passenger--rack_base_uri)
+* [`rack_env`](#-apache--mod--passenger--rack_env)
+* [`rails_allow_mod_rewrite`](#-apache--mod--passenger--rails_allow_mod_rewrite)
+* [`rails_app_spawner_idle_time`](#-apache--mod--passenger--rails_app_spawner_idle_time)
+* [`rails_auto_detect`](#-apache--mod--passenger--rails_auto_detect)
+* [`rails_autodetect`](#-apache--mod--passenger--rails_autodetect)
+* [`rails_base_uri`](#-apache--mod--passenger--rails_base_uri)
+* [`rails_default_user`](#-apache--mod--passenger--rails_default_user)
+* [`rails_env`](#-apache--mod--passenger--rails_env)
+* [`rails_framework_spawner_idle_time`](#-apache--mod--passenger--rails_framework_spawner_idle_time)
+* [`rails_ruby`](#-apache--mod--passenger--rails_ruby)
+* [`rails_spawn_method`](#-apache--mod--passenger--rails_spawn_method)
+* [`rails_user_switching`](#-apache--mod--passenger--rails_user_switching)
+* [`wsgi_auto_detect`](#-apache--mod--passenger--wsgi_auto_detect)
+
+##### <a name="-apache--mod--passenger--manage_repo"></a>`manage_repo`
 
 Data type: `Boolean`
 
 Toggle whether to manage yum repo if on a RedHat node.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="mod_id"></a>`mod_id`
+##### <a name="-apache--mod--passenger--mod_id"></a>`mod_id`
 
 Data type: `Optional[String]`
 
 Specifies the package id.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_lib"></a>`mod_lib`
+##### <a name="-apache--mod--passenger--mod_lib"></a>`mod_lib`
 
 Data type: `Optional[String]`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_lib_path"></a>`mod_lib_path`
+##### <a name="-apache--mod--passenger--mod_lib_path"></a>`mod_lib_path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter overrides
 this value.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_package"></a>`mod_package`
+##### <a name="-apache--mod--passenger--mod_package"></a>`mod_package`
 
 Data type: `Optional[String]`
 
 Name of the module package to install.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_package_ensure"></a>`mod_package_ensure`
+##### <a name="-apache--mod--passenger--mod_package_ensure"></a>`mod_package_ensure`
 
 Data type: `Optional[String]`
 
 Determines whether Puppet ensures the module should be installed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_path"></a>`mod_path`
+##### <a name="-apache--mod--passenger--mod_path"></a>`mod_path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
+##### <a name="-apache--mod--passenger--passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
+##### <a name="-apache--mod--passenger--passenger_anonymous_telemetry_proxy"></a>`passenger_anonymous_telemetry_proxy`
 
 Data type: `Optional[String]`
 
 Set an intermediate proxy for the Passenger anonymous telemetry reporting.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_env"></a>`passenger_app_env`
+##### <a name="-apache--mod--passenger--passenger_app_env"></a>`passenger_app_env`
 
 Data type: `Optional[String]`
 
@@ -4611,66 +4627,66 @@ This option sets, for the current application, the value of the following enviro
 - NODE_ENV
 - PASSENGER_APP_ENV
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
+##### <a name="-apache--mod--passenger--passenger_app_group_name"></a>`passenger_app_group_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the application group that the current application should belong to.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_root"></a>`passenger_app_root`
+##### <a name="-apache--mod--passenger--passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Optional[String]`
 
 Path to the application root which allows access independent from the DocumentRoot.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_type"></a>`passenger_app_type`
+##### <a name="-apache--mod--passenger--passenger_app_type"></a>`passenger_app_type`
 
 Data type: `Optional[String]`
 
 Specifies the type of the application. If you set this option, then you must also set PassengerAppRoot, otherwise Passenger will
 not properly recognize your application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_base_uri"></a>`passenger_base_uri`
+##### <a name="-apache--mod--passenger--passenger_base_uri"></a>`passenger_base_uri`
 
 Data type: `Optional[String]`
 
 Used to specify that the given URI is an distinct application that should be served by Passenger.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
+##### <a name="-apache--mod--passenger--passenger_buffer_response"></a>`passenger_buffer_response`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggle whether application-generated responses are buffered by Apache. Buffering will happen in memory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
+##### <a name="-apache--mod--passenger--passenger_buffer_upload"></a>`passenger_buffer_upload`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggle whether HTTP client request bodies are buffered before they are sent to the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
+##### <a name="-apache--mod--passenger--passenger_concurrency_model"></a>`passenger_concurrency_model`
 
 Data type: `Optional[String]`
 
 Specifies the I/O concurrency model that should be used for Ruby application processes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_conf_file"></a>`passenger_conf_file`
+##### <a name="-apache--mod--passenger--passenger_conf_file"></a>`passenger_conf_file`
 
 Data type: `String`
 
@@ -4678,7 +4694,7 @@ Data type: `String`
 
 Default value: `$apache::params::passenger_conf_file`
 
-##### <a name="passenger_conf_package_file"></a>`passenger_conf_package_file`
+##### <a name="-apache--mod--passenger--passenger_conf_package_file"></a>`passenger_conf_package_file`
 
 Data type: `Optional[String]`
 
@@ -4686,39 +4702,39 @@ Data type: `Optional[String]`
 
 Default value: `$apache::params::passenger_conf_package_file`
 
-##### <a name="passenger_data_buffer_dir"></a>`passenger_data_buffer_dir`
+##### <a name="-apache--mod--passenger--passenger_data_buffer_dir"></a>`passenger_data_buffer_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies the directory in which to store data buffers.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_debug_log_file"></a>`passenger_debug_log_file`
+##### <a name="-apache--mod--passenger--passenger_debug_log_file"></a>`passenger_debug_log_file`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_debugger"></a>`passenger_debugger`
+##### <a name="-apache--mod--passenger--passenger_debugger"></a>`passenger_debugger`
 
 Data type: `Optional[Apache::OnOff]`
 
 Turns support for Ruby application debugging on or off.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_default_group"></a>`passenger_default_group`
+##### <a name="-apache--mod--passenger--passenger_default_group"></a>`passenger_default_group`
 
 Data type: `Optional[String]`
 
 Allows you to specify the group that applications must run as, if user switching fails or is disabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_default_ruby"></a>`passenger_default_ruby`
+##### <a name="-apache--mod--passenger--passenger_default_ruby"></a>`passenger_default_ruby`
 
 Data type: `Optional[String]`
 
@@ -4726,318 +4742,318 @@ File path to desired ruby interpreter to use by default.
 
 Default value: `$apache::params::passenger_default_ruby`
 
-##### <a name="passenger_default_user"></a>`passenger_default_user`
+##### <a name="-apache--mod--passenger--passenger_default_user"></a>`passenger_default_user`
 
 Data type: `Optional[String]`
 
 Allows you to specify the user that applications must run as, if user switching fails or is disabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
+##### <a name="-apache--mod--passenger--passenger_disable_anonymous_telemetry"></a>`passenger_disable_anonymous_telemetry`
 
 Data type: `Optional[Boolean]`
 
 Whether or not to disable the Passenger anonymous telemetry reporting.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
+##### <a name="-apache--mod--passenger--passenger_disable_log_prefix"></a>`passenger_disable_log_prefix`
 
 Data type: `Optional[Boolean]`
 
 Whether to stop Passenger from prefixing logs when they are written to a log file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
+##### <a name="-apache--mod--passenger--passenger_disable_security_update_check"></a>`passenger_disable_security_update_check`
 
 Data type: `Optional[Apache::OnOff]`
 
 Allows disabling the Passenger security update check, a daily check with https://securitycheck.phusionpassenger.com for important
 security updates that might be available.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_enabled"></a>`passenger_enabled`
+##### <a name="-apache--mod--passenger--passenger_enabled"></a>`passenger_enabled`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggles whether Passenger should be enabled for that particular context.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_error_override"></a>`passenger_error_override`
+##### <a name="-apache--mod--passenger--passenger_error_override"></a>`passenger_error_override`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_file_descriptor_log_file"></a>`passenger_file_descriptor_log_file`
+##### <a name="-apache--mod--passenger--passenger_file_descriptor_log_file"></a>`passenger_file_descriptor_log_file`
 
 Data type: `Optional[String]`
 
 Log file descriptor debug tracing messages to the given file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_fly_with"></a>`passenger_fly_with`
+##### <a name="-apache--mod--passenger--passenger_fly_with"></a>`passenger_fly_with`
 
 Data type: `Optional[String]`
 
 Enables the Flying Passenger mode, and configures Apache to connect to the Flying Passenger daemon that's listening on the
 given socket filename.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
+##### <a name="-apache--mod--passenger--passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 Use this option to tell Passenger how many concurrent requests the application can handle per process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
+##### <a name="-apache--mod--passenger--passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggles whether Passenger should display friendly error pages whenever an application fails to start.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_group"></a>`passenger_group`
+##### <a name="-apache--mod--passenger--passenger_group"></a>`passenger_group`
 
 Data type: `Optional[String]`
 
 Allows you to override that behavior and explicitly set a group to run the web application as, regardless of the ownership of the
 startup file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_high_performance"></a>`passenger_high_performance`
+##### <a name="-apache--mod--passenger--passenger_high_performance"></a>`passenger_high_performance`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggles whether to enable PassengerHighPerformance which will make Passenger will be a little faster, in return for reduced
 compatibility with other Apache modules.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_installed_version"></a>`passenger_installed_version`
+##### <a name="-apache--mod--passenger--passenger_installed_version"></a>`passenger_installed_version`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_instance_registry_dir"></a>`passenger_instance_registry_dir`
+##### <a name="-apache--mod--passenger--passenger_instance_registry_dir"></a>`passenger_instance_registry_dir`
 
 Data type: `Optional[String]`
 
 Specifies the directory that Passenger should use for registering its current instance.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
+##### <a name="-apache--mod--passenger--passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
 Data type: `Optional[Apache::OnOff]`
 
 Enables or disables the loading of shell environment variables before spawning the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_preload_bundler"></a>`passenger_preload_bundler`
+##### <a name="-apache--mod--passenger--passenger_preload_bundler"></a>`passenger_preload_bundler`
 
 Data type: `Optional[Boolean]`
 
 Enables or disables loading bundler before loading your Ruby app.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_log_file"></a>`passenger_log_file`
+##### <a name="-apache--mod--passenger--passenger_log_file"></a>`passenger_log_file`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 File path to log file. By default Passenger log messages are written to the Apache global error log.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_log_level"></a>`passenger_log_level`
+##### <a name="-apache--mod--passenger--passenger_log_level"></a>`passenger_log_level`
 
 Data type: `Optional[Integer]`
 
 Specifies how much information Passenger should log to its log file. A higher log level value means that more
 information will be logged.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
+##### <a name="-apache--mod--passenger--passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
 When using Passenger on a LVE-enabled kernel, a security check (enter) is run for spawning application processes. This options
 tells the check to only allow processes with UIDs equal to, or higher than, the specified value.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_instances"></a>`passenger_max_instances`
+##### <a name="-apache--mod--passenger--passenger_max_instances"></a>`passenger_max_instances`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist for an application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_instances_per_app"></a>`passenger_max_instances_per_app`
+##### <a name="-apache--mod--passenger--passenger_max_instances_per_app"></a>`passenger_max_instances_per_app`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist for a single application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_pool_size"></a>`passenger_max_pool_size`
+##### <a name="-apache--mod--passenger--passenger_max_pool_size"></a>`passenger_max_pool_size`
 
 Data type: `Optional[Integer]`
 
 The maximum number of application processes that may simultaneously exist.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
+##### <a name="-apache--mod--passenger--passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
 Data type: `Optional[Integer]`
 
 Set the preloader's idle timeout, in seconds. A value of 0 means that it should never idle timeout.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
+##### <a name="-apache--mod--passenger--passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
 Data type: `Optional[Integer]`
 
 Specifies the maximum size for the queue of all incoming requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
+##### <a name="-apache--mod--passenger--passenger_max_request_time"></a>`passenger_max_request_time`
 
 Data type: `Optional[Integer]`
 
 The maximum amount of time, in seconds, that an application process may take to process a request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_requests"></a>`passenger_max_requests`
+##### <a name="-apache--mod--passenger--passenger_max_requests"></a>`passenger_max_requests`
 
 Data type: `Optional[Integer]`
 
 The maximum number of requests an application process will process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
+##### <a name="-apache--mod--passenger--passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Optional[Integer]`
 
 The maximum amount of memory that an application process may use, in megabytes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
+##### <a name="-apache--mod--passenger--passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
 Data type: `Optional[String]`
 
 When using a Meteor application in non-bundled mode, use this option to specify a JSON file with settings for the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_min_instances"></a>`passenger_min_instances`
+##### <a name="-apache--mod--passenger--passenger_min_instances"></a>`passenger_min_instances`
 
 Data type: `Optional[Integer]`
 
 Specifies the minimum number of application processes that should exist for a given application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_nodejs"></a>`passenger_nodejs`
+##### <a name="-apache--mod--passenger--passenger_nodejs"></a>`passenger_nodejs`
 
 Data type: `Optional[String]`
 
 Specifies the Node.js command to use for serving Node.js web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_pool_idle_time"></a>`passenger_pool_idle_time`
+##### <a name="-apache--mod--passenger--passenger_pool_idle_time"></a>`passenger_pool_idle_time`
 
 Data type: `Optional[Integer]`
 
 The maximum number of seconds that an application process may be idle.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_pre_start"></a>`passenger_pre_start`
+##### <a name="-apache--mod--passenger--passenger_pre_start"></a>`passenger_pre_start`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
 URL of the web application you want to pre-start.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_python"></a>`passenger_python`
+##### <a name="-apache--mod--passenger--passenger_python"></a>`passenger_python`
 
 Data type: `Optional[String]`
 
 Specifies the Python interpreter to use for serving Python web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
+##### <a name="-apache--mod--passenger--passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
 Data type: `Optional[Apache::OnOff]`
 
 Enables or disables resistance against deployment errors.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_resolve_symlinks_in_document_root"></a>`passenger_resolve_symlinks_in_document_root`
+##### <a name="-apache--mod--passenger--passenger_resolve_symlinks_in_document_root"></a>`passenger_resolve_symlinks_in_document_root`
 
 Data type: `Optional[Apache::OnOff]`
 
 This option is no longer available in version 5.2.0. Switch to PassengerAppRoot if you are setting the application root via a
 document root containing symlinks.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_response_buffer_high_watermark"></a>`passenger_response_buffer_high_watermark`
+##### <a name="-apache--mod--passenger--passenger_response_buffer_high_watermark"></a>`passenger_response_buffer_high_watermark`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 Configures the maximum size of the real-time disk-backed response buffering system.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
+##### <a name="-apache--mod--passenger--passenger_restart_dir"></a>`passenger_restart_dir`
 
 Data type: `Optional[String]`
 
 Path to directory containing restart.txt file. Can be either absolute or relative.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
+##### <a name="-apache--mod--passenger--passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
 Data type: `Optional[Apache::OnOff]`
 
 Enables or disables support for zero-downtime application restarts through restart.txt.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_root"></a>`passenger_root`
+##### <a name="-apache--mod--passenger--passenger_root"></a>`passenger_root`
 
 Data type: `Optional[String]`
 
@@ -5045,7 +5061,7 @@ Refers to the location to the Passenger root directory, or to a location configu
 
 Default value: `$apache::params::passenger_root`
 
-##### <a name="passenger_ruby"></a>`passenger_ruby`
+##### <a name="-apache--mod--passenger--passenger_ruby"></a>`passenger_ruby`
 
 Data type: `Optional[String]`
 
@@ -5053,257 +5069,257 @@ Specifies the Ruby interpreter to use for serving Ruby web applications.
 
 Default value: `$apache::params::passenger_ruby`
 
-##### <a name="passenger_security_update_check_proxy"></a>`passenger_security_update_check_proxy`
+##### <a name="-apache--mod--passenger--passenger_security_update_check_proxy"></a>`passenger_security_update_check_proxy`
 
 Data type: `Optional[String]`
 
 Allows use of an intermediate proxy for the Passenger security update check.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_show_version_in_header"></a>`passenger_show_version_in_header`
+##### <a name="-apache--mod--passenger--passenger_show_version_in_header"></a>`passenger_show_version_in_header`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggle whether Passenger will output its version number in the X-Powered-By header in all Passenger-served requests:
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_socket_backlog"></a>`passenger_socket_backlog`
+##### <a name="-apache--mod--passenger--passenger_socket_backlog"></a>`passenger_socket_backlog`
 
 Data type: `Optional[Variant[Integer, String]]`
 
 This option can be raised if Apache manages to overflow the backlog queue.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_spawn_dir"></a>`passenger_spawn_dir`
+##### <a name="-apache--mod--passenger--passenger_spawn_dir"></a>`passenger_spawn_dir`
 
 Data type: `Optional[String]`
 
 The directory in which Passenger will record progress during startup
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
+##### <a name="-apache--mod--passenger--passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']]`
 
 Controls whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
+##### <a name="-apache--mod--passenger--passenger_start_timeout"></a>`passenger_start_timeout`
 
 Data type: `Optional[Integer]`
 
 Specifies a timeout for the startup of application processes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_startup_file"></a>`passenger_startup_file`
+##### <a name="-apache--mod--passenger--passenger_startup_file"></a>`passenger_startup_file`
 
 Data type: `Optional[String]`
 
 Specifies the startup file that Passenger should use when loading the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
+##### <a name="-apache--mod--passenger--passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
 Data type: `Optional[Integer]`
 
 Setting this option to a value of x means that certain filesystem checks will be performed at most once every x seconds.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
+##### <a name="-apache--mod--passenger--passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggles whether all requests that a client sends will be routed to the same originating application process, whenever possible.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
+##### <a name="-apache--mod--passenger--passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the sticky sessions cookie.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
+##### <a name="-apache--mod--passenger--passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
 Sets the attributes of the sticky sessions cookie.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_thread_count"></a>`passenger_thread_count`
+##### <a name="-apache--mod--passenger--passenger_thread_count"></a>`passenger_thread_count`
 
 Data type: `Optional[Integer]`
 
 Specifies the number of threads that Passenger should spawn per Ruby application process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_use_global_queue"></a>`passenger_use_global_queue`
+##### <a name="-apache--mod--passenger--passenger_use_global_queue"></a>`passenger_use_global_queue`
 
 Data type: `Optional[String]`
 
 N/A.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_user"></a>`passenger_user`
+##### <a name="-apache--mod--passenger--passenger_user"></a>`passenger_user`
 
 Data type: `Optional[String]`
 
 Allows you to override that behavior and explicitly set a user to run the web application as, regardless of the ownership of the
 startup file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_user_switching"></a>`passenger_user_switching`
+##### <a name="-apache--mod--passenger--passenger_user_switching"></a>`passenger_user_switching`
 
 Data type: `Optional[Apache::OnOff]`
 
 Toggles whether to attempt to enable user account sandboxing, also known as user switching.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rack_auto_detect"></a>`rack_auto_detect`
+##### <a name="-apache--mod--passenger--rack_auto_detect"></a>`rack_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rack_autodetect"></a>`rack_autodetect`
+##### <a name="-apache--mod--passenger--rack_autodetect"></a>`rack_autodetect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rack_base_uri"></a>`rack_base_uri`
+##### <a name="-apache--mod--passenger--rack_base_uri"></a>`rack_base_uri`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rack_env"></a>`rack_env`
+##### <a name="-apache--mod--passenger--rack_env"></a>`rack_env`
 
 Data type: `Optional[String]`
 
 Alias for PassengerAppEnv.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
+##### <a name="-apache--mod--passenger--rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
 
 Data type: `Optional[String]`
 
 This option doesn't do anything anymore since version 4.0.0.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
+##### <a name="-apache--mod--passenger--rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_auto_detect"></a>`rails_auto_detect`
+##### <a name="-apache--mod--passenger--rails_auto_detect"></a>`rails_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_autodetect"></a>`rails_autodetect`
+##### <a name="-apache--mod--passenger--rails_autodetect"></a>`rails_autodetect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_base_uri"></a>`rails_base_uri`
+##### <a name="-apache--mod--passenger--rails_base_uri"></a>`rails_base_uri`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerBaseURI.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_default_user"></a>`rails_default_user`
+##### <a name="-apache--mod--passenger--rails_default_user"></a>`rails_default_user`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerDefaultUser
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_env"></a>`rails_env`
+##### <a name="-apache--mod--passenger--rails_env"></a>`rails_env`
 
 Data type: `Optional[String]`
 
 Alias for PassengerAppEnv.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_framework_spawner_idle_time"></a>`rails_framework_spawner_idle_time`
+##### <a name="-apache--mod--passenger--rails_framework_spawner_idle_time"></a>`rails_framework_spawner_idle_time`
 
 Data type: `Optional[String]`
 
 This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed
 altogether. You should use smart spawning instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_ruby"></a>`rails_ruby`
+##### <a name="-apache--mod--passenger--rails_ruby"></a>`rails_ruby`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerRuby.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_spawn_method"></a>`rails_spawn_method`
+##### <a name="-apache--mod--passenger--rails_spawn_method"></a>`rails_spawn_method`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rails_user_switching"></a>`rails_user_switching`
+##### <a name="-apache--mod--passenger--rails_user_switching"></a>`rails_user_switching`
 
 Data type: `Optional[String]`
 
 Deprecated in 3.0.0 in favor of PassengerUserSwitching.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_auto_detect"></a>`wsgi_auto_detect`
+##### <a name="-apache--mod--passenger--wsgi_auto_detect"></a>`wsgi_auto_detect`
 
 Data type: `Optional[String]`
 
 This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodperl"></a>`apache::mod::perl`
+### <a name="apache--mod--perl"></a>`apache::mod::perl`
 
 Installs `mod_perl`.
 
@@ -5311,7 +5327,7 @@ Installs `mod_perl`.
   * https://perl.apache.org
     * for additional documentation.
 
-### <a name="apachemodperuser"></a>`apache::mod::peruser`
+### <a name="apache--mod--peruser"></a>`apache::mod::peruser`
 
 Installs `mod_peruser`.
 
@@ -5319,16 +5335,16 @@ Installs `mod_peruser`.
 
 The following parameters are available in the `apache::mod::peruser` class:
 
-* [`minspareprocessors`](#minspareprocessors)
-* [`minprocessors`](#minprocessors)
-* [`maxprocessors`](#maxprocessors)
-* [`maxclients`](#maxclients)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`idletimeout`](#idletimeout)
-* [`expiretimeout`](#expiretimeout)
-* [`keepalive`](#keepalive)
+* [`minspareprocessors`](#-apache--mod--peruser--minspareprocessors)
+* [`minprocessors`](#-apache--mod--peruser--minprocessors)
+* [`maxprocessors`](#-apache--mod--peruser--maxprocessors)
+* [`maxclients`](#-apache--mod--peruser--maxclients)
+* [`maxrequestsperchild`](#-apache--mod--peruser--maxrequestsperchild)
+* [`idletimeout`](#-apache--mod--peruser--idletimeout)
+* [`expiretimeout`](#-apache--mod--peruser--expiretimeout)
+* [`keepalive`](#-apache--mod--peruser--keepalive)
 
-##### <a name="minspareprocessors"></a>`minspareprocessors`
+##### <a name="-apache--mod--peruser--minspareprocessors"></a>`minspareprocessors`
 
 Data type: `Integer`
 
@@ -5336,7 +5352,7 @@ Data type: `Integer`
 
 Default value: `2`
 
-##### <a name="minprocessors"></a>`minprocessors`
+##### <a name="-apache--mod--peruser--minprocessors"></a>`minprocessors`
 
 Data type: `Integer`
 
@@ -5344,7 +5360,7 @@ The minimum amount of processors
 
 Default value: `2`
 
-##### <a name="maxprocessors"></a>`maxprocessors`
+##### <a name="-apache--mod--peruser--maxprocessors"></a>`maxprocessors`
 
 Data type: `Integer`
 
@@ -5352,7 +5368,7 @@ The maximum amount of processors
 
 Default value: `10`
 
-##### <a name="maxclients"></a>`maxclients`
+##### <a name="-apache--mod--peruser--maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -5360,7 +5376,7 @@ The maximum amount of clients
 
 Default value: `150`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--peruser--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -5368,7 +5384,7 @@ The maximum amount of requests per child
 
 Default value: `1000`
 
-##### <a name="idletimeout"></a>`idletimeout`
+##### <a name="-apache--mod--peruser--idletimeout"></a>`idletimeout`
 
 Data type: `Integer`
 
@@ -5376,7 +5392,7 @@ Data type: `Integer`
 
 Default value: `120`
 
-##### <a name="expiretimeout"></a>`expiretimeout`
+##### <a name="-apache--mod--peruser--expiretimeout"></a>`expiretimeout`
 
 Data type: `Integer`
 
@@ -5384,7 +5400,7 @@ Data type: `Integer`
 
 Default value: `120`
 
-##### <a name="keepalive"></a>`keepalive`
+##### <a name="-apache--mod--peruser--keepalive"></a>`keepalive`
 
 Data type: `Apache::OnOff`
 
@@ -5392,7 +5408,7 @@ Data type: `Apache::OnOff`
 
 Default value: `'Off'`
 
-### <a name="apachemodphp"></a>`apache::mod::php`
+### <a name="apache--mod--php"></a>`apache::mod::php`
 
 Installs `mod_php`.
 
@@ -5402,26 +5418,26 @@ Installs `mod_php`.
 
 The following parameters are available in the `apache::mod::php` class:
 
-* [`package_name`](#package_name)
-* [`package_ensure`](#package_ensure)
-* [`path`](#path)
-* [`extensions`](#extensions)
-* [`content`](#content)
-* [`template`](#template)
-* [`source`](#source)
-* [`root_group`](#root_group)
-* [`php_version`](#php_version)
-* [`libphp_prefix`](#libphp_prefix)
+* [`package_name`](#-apache--mod--php--package_name)
+* [`package_ensure`](#-apache--mod--php--package_ensure)
+* [`path`](#-apache--mod--php--path)
+* [`extensions`](#-apache--mod--php--extensions)
+* [`content`](#-apache--mod--php--content)
+* [`template`](#-apache--mod--php--template)
+* [`source`](#-apache--mod--php--source)
+* [`root_group`](#-apache--mod--php--root_group)
+* [`php_version`](#-apache--mod--php--php_version)
+* [`libphp_prefix`](#-apache--mod--php--libphp_prefix)
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--php--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 The package name
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_ensure"></a>`package_ensure`
+##### <a name="-apache--mod--php--package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -5429,15 +5445,15 @@ Whether the package is `present` or `absent`
 
 Default value: `'present'`
 
-##### <a name="path"></a>`path`
+##### <a name="-apache--mod--php--path"></a>`path`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="extensions"></a>`extensions`
+##### <a name="-apache--mod--php--extensions"></a>`extensions`
 
 Data type: `Array`
 
@@ -5445,15 +5461,15 @@ Data type: `Array`
 
 Default value: `['.php']`
 
-##### <a name="content"></a>`content`
+##### <a name="-apache--mod--php--content"></a>`content`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="template"></a>`template`
+##### <a name="-apache--mod--php--template"></a>`template`
 
 Data type: `String`
 
@@ -5461,15 +5477,15 @@ Data type: `String`
 
 Default value: `'apache/mod/php.conf.erb'`
 
-##### <a name="source"></a>`source`
+##### <a name="-apache--mod--php--source"></a>`source`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="root_group"></a>`root_group`
+##### <a name="-apache--mod--php--root_group"></a>`root_group`
 
 Data type: `Optional[String]`
 
@@ -5477,7 +5493,7 @@ UNIX group of the root user
 
 Default value: `$apache::params::root_group`
 
-##### <a name="php_version"></a>`php_version`
+##### <a name="-apache--mod--php--php_version"></a>`php_version`
 
 Data type: `Optional[String]`
 
@@ -5485,7 +5501,7 @@ The php version. This is a required parameter, but optional allows showing a cle
 
 Default value: `$apache::params::php_version`
 
-##### <a name="libphp_prefix"></a>`libphp_prefix`
+##### <a name="-apache--mod--php--libphp_prefix"></a>`libphp_prefix`
 
 Data type: `String`
 
@@ -5493,7 +5509,7 @@ Data type: `String`
 
 Default value: `'libphp'`
 
-### <a name="apachemodprefork"></a>`apache::mod::prefork`
+### <a name="apache--mod--prefork"></a>`apache::mod::prefork`
 
 Installs and configures MPM `prefork`.
 
@@ -5505,17 +5521,17 @@ Installs and configures MPM `prefork`.
 
 The following parameters are available in the `apache::mod::prefork` class:
 
-* [`startservers`](#startservers)
-* [`minspareservers`](#minspareservers)
-* [`maxspareservers`](#maxspareservers)
-* [`serverlimit`](#serverlimit)
-* [`maxclients`](#maxclients)
-* [`maxrequestworkers`](#maxrequestworkers)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`maxconnectionsperchild`](#maxconnectionsperchild)
-* [`listenbacklog`](#listenbacklog)
+* [`startservers`](#-apache--mod--prefork--startservers)
+* [`minspareservers`](#-apache--mod--prefork--minspareservers)
+* [`maxspareservers`](#-apache--mod--prefork--maxspareservers)
+* [`serverlimit`](#-apache--mod--prefork--serverlimit)
+* [`maxclients`](#-apache--mod--prefork--maxclients)
+* [`maxrequestworkers`](#-apache--mod--prefork--maxrequestworkers)
+* [`maxrequestsperchild`](#-apache--mod--prefork--maxrequestsperchild)
+* [`maxconnectionsperchild`](#-apache--mod--prefork--maxconnectionsperchild)
+* [`listenbacklog`](#-apache--mod--prefork--listenbacklog)
 
-##### <a name="startservers"></a>`startservers`
+##### <a name="-apache--mod--prefork--startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -5523,7 +5539,7 @@ Number of child server processes created at startup.
 
 Default value: `8`
 
-##### <a name="minspareservers"></a>`minspareservers`
+##### <a name="-apache--mod--prefork--minspareservers"></a>`minspareservers`
 
 Data type: `Integer`
 
@@ -5531,7 +5547,7 @@ Minimum number of idle child server processes.
 
 Default value: `5`
 
-##### <a name="maxspareservers"></a>`maxspareservers`
+##### <a name="-apache--mod--prefork--maxspareservers"></a>`maxspareservers`
 
 Data type: `Integer`
 
@@ -5539,7 +5555,7 @@ Maximum number of idle child server processes.
 
 Default value: `20`
 
-##### <a name="serverlimit"></a>`serverlimit`
+##### <a name="-apache--mod--prefork--serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -5547,7 +5563,7 @@ Upper limit on configurable number of processes.
 
 Default value: `256`
 
-##### <a name="maxclients"></a>`maxclients`
+##### <a name="-apache--mod--prefork--maxclients"></a>`maxclients`
 
 Data type: `Integer`
 
@@ -5555,15 +5571,15 @@ Old alias for MaxRequestWorkers.
 
 Default value: `256`
 
-##### <a name="maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="-apache--mod--prefork--maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Optional[Integer]`
 
 Maximum number of connections that will be processed simultaneously.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--prefork--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -5571,15 +5587,15 @@ Old alias for MaxConnectionsPerChild.
 
 Default value: `4000`
 
-##### <a name="maxconnectionsperchild"></a>`maxconnectionsperchild`
+##### <a name="-apache--mod--prefork--maxconnectionsperchild"></a>`maxconnectionsperchild`
 
 Data type: `Optional[Integer]`
 
 Limit on the number of connections that an individual child server will handle during its life.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="listenbacklog"></a>`listenbacklog`
+##### <a name="-apache--mod--prefork--listenbacklog"></a>`listenbacklog`
 
 Data type: `Integer`
 
@@ -5587,7 +5603,7 @@ Maximum length of the queue of pending connections.
 
 Default value: `511`
 
-### <a name="apachemodproxy"></a>`apache::mod::proxy`
+### <a name="apache--mod--proxy"></a>`apache::mod::proxy`
 
 Installs and configures `mod_proxy`.
 
@@ -5599,14 +5615,14 @@ Installs and configures `mod_proxy`.
 
 The following parameters are available in the `apache::mod::proxy` class:
 
-* [`proxy_requests`](#proxy_requests)
-* [`allow_from`](#allow_from)
-* [`package_name`](#package_name)
-* [`proxy_via`](#proxy_via)
-* [`proxy_timeout`](#proxy_timeout)
-* [`proxy_iobuffersize`](#proxy_iobuffersize)
+* [`proxy_requests`](#-apache--mod--proxy--proxy_requests)
+* [`allow_from`](#-apache--mod--proxy--allow_from)
+* [`package_name`](#-apache--mod--proxy--package_name)
+* [`proxy_via`](#-apache--mod--proxy--proxy_via)
+* [`proxy_timeout`](#-apache--mod--proxy--proxy_timeout)
+* [`proxy_iobuffersize`](#-apache--mod--proxy--proxy_iobuffersize)
 
-##### <a name="proxy_requests"></a>`proxy_requests`
+##### <a name="-apache--mod--proxy--proxy_requests"></a>`proxy_requests`
 
 Data type: `String`
 
@@ -5614,23 +5630,23 @@ Enables forward (standard) proxy requests.
 
 Default value: `'Off'`
 
-##### <a name="allow_from"></a>`allow_from`
+##### <a name="-apache--mod--proxy--allow_from"></a>`allow_from`
 
 Data type: `Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]]`
 
 IP address or list of IPs allowed to access proxy.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--proxy--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of the proxy package to install.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_via"></a>`proxy_via`
+##### <a name="-apache--mod--proxy--proxy_via"></a>`proxy_via`
 
 Data type: `String`
 
@@ -5638,23 +5654,23 @@ Set local IP address for outgoing proxy connections.
 
 Default value: `'On'`
 
-##### <a name="proxy_timeout"></a>`proxy_timeout`
+##### <a name="-apache--mod--proxy--proxy_timeout"></a>`proxy_timeout`
 
 Data type: `Optional[Integer[0]]`
 
 Network timeout for proxied requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_iobuffersize"></a>`proxy_iobuffersize`
+##### <a name="-apache--mod--proxy--proxy_iobuffersize"></a>`proxy_iobuffersize`
 
 Data type: `Optional[String]`
 
 Set the size of internal data throughput buffer
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodproxy_ajp"></a>`apache::mod::proxy_ajp`
+### <a name="apache--mod--proxy_ajp"></a>`apache::mod::proxy_ajp`
 
 Installs `mod_proxy_ajp`.
 
@@ -5662,7 +5678,7 @@ Installs `mod_proxy_ajp`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html
     * for additional documentation.
 
-### <a name="apachemodproxy_balancer"></a>`apache::mod::proxy_balancer`
+### <a name="apache--mod--proxy_balancer"></a>`apache::mod::proxy_balancer`
 
 Installs and configures `mod_proxy_balancer`.
 
@@ -5674,19 +5690,19 @@ Installs and configures `mod_proxy_balancer`.
 
 The following parameters are available in the `apache::mod::proxy_balancer` class:
 
-* [`manager`](#manager)
-* [`manager_path`](#manager_path)
-* [`allow_from`](#allow_from)
+* [`manager`](#-apache--mod--proxy_balancer--manager)
+* [`manager_path`](#-apache--mod--proxy_balancer--manager_path)
+* [`allow_from`](#-apache--mod--proxy_balancer--allow_from)
 
-##### <a name="manager"></a>`manager`
+##### <a name="-apache--mod--proxy_balancer--manager"></a>`manager`
 
 Data type: `Boolean`
 
 Toggle whether to enable balancer manager support.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="manager_path"></a>`manager_path`
+##### <a name="-apache--mod--proxy_balancer--manager_path"></a>`manager_path`
 
 Data type: `Stdlib::Unixpath`
 
@@ -5694,7 +5710,7 @@ Server relative path to balancer manager.
 
 Default value: `'/balancer-manager'`
 
-##### <a name="allow_from"></a>`allow_from`
+##### <a name="-apache--mod--proxy_balancer--allow_from"></a>`allow_from`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -5702,7 +5718,7 @@ List of IPs from which the balancer manager can be accessed.
 
 Default value: `['127.0.0.1', '::1']`
 
-### <a name="apachemodproxy_connect"></a>`apache::mod::proxy_connect`
+### <a name="apache--mod--proxy_connect"></a>`apache::mod::proxy_connect`
 
 Installs `mod_proxy_connect`.
 
@@ -5710,7 +5726,7 @@ Installs `mod_proxy_connect`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_connect.html
     * for additional documentation.
 
-### <a name="apachemodproxy_fcgi"></a>`apache::mod::proxy_fcgi`
+### <a name="apache--mod--proxy_fcgi"></a>`apache::mod::proxy_fcgi`
 
 Installs `mod_proxy_fcgi`.
 
@@ -5718,7 +5734,7 @@ Installs `mod_proxy_fcgi`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html
     * for additional documentation.
 
-### <a name="apachemodproxy_html"></a>`apache::mod::proxy_html`
+### <a name="apache--mod--proxy_html"></a>`apache::mod::proxy_html`
 
 Installs `mod_proxy_html`.
 
@@ -5726,7 +5742,7 @@ Installs `mod_proxy_html`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_html.html
     * for additional documentation.
 
-### <a name="apachemodproxy_http"></a>`apache::mod::proxy_http`
+### <a name="apache--mod--proxy_http"></a>`apache::mod::proxy_http`
 
 Installs `mod_proxy_http`.
 
@@ -5734,7 +5750,7 @@ Installs `mod_proxy_http`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_http.html
     * for additional documentation.
 
-### <a name="apachemodproxy_http2"></a>`apache::mod::proxy_http2`
+### <a name="apache--mod--proxy_http2"></a>`apache::mod::proxy_http2`
 
 Installs `mod_proxy_http2`.
 
@@ -5742,7 +5758,7 @@ Installs `mod_proxy_http2`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_http2.html
     * for additional documentation.
 
-### <a name="apachemodproxy_wstunnel"></a>`apache::mod::proxy_wstunnel`
+### <a name="apache--mod--proxy_wstunnel"></a>`apache::mod::proxy_wstunnel`
 
 Installs `mod_proxy_wstunnel`.
 
@@ -5750,7 +5766,7 @@ Installs `mod_proxy_wstunnel`.
   * https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html
     * for additional documentation.
 
-### <a name="apachemodpython"></a>`apache::mod::python`
+### <a name="apache--mod--python"></a>`apache::mod::python`
 
 Installs and configures `mod_python`.
 
@@ -5762,17 +5778,17 @@ Installs and configures `mod_python`.
 
 The following parameters are available in the `apache::mod::python` class:
 
-* [`loadfile_name`](#loadfile_name)
+* [`loadfile_name`](#-apache--mod--python--loadfile_name)
 
-##### <a name="loadfile_name"></a>`loadfile_name`
+##### <a name="-apache--mod--python--loadfile_name"></a>`loadfile_name`
 
 Data type: `Optional[String]`
 
 Sets the name of the configuration file that is used to load the python module.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodremoteip"></a>`apache::mod::remoteip`
+### <a name="apache--mod--remoteip"></a>`apache::mod::remoteip`
 
 Installs and configures `mod_remoteip`.
 
@@ -5785,18 +5801,18 @@ Installs and configures `mod_remoteip`.
 
 The following parameters are available in the `apache::mod::remoteip` class:
 
-* [`header`](#header)
-* [`internal_proxy`](#internal_proxy)
-* [`proxy_ips`](#proxy_ips)
-* [`internal_proxy_list`](#internal_proxy_list)
-* [`proxies_header`](#proxies_header)
-* [`proxy_protocol`](#proxy_protocol)
-* [`proxy_protocol_exceptions`](#proxy_protocol_exceptions)
-* [`trusted_proxy`](#trusted_proxy)
-* [`trusted_proxy_ips`](#trusted_proxy_ips)
-* [`trusted_proxy_list`](#trusted_proxy_list)
+* [`header`](#-apache--mod--remoteip--header)
+* [`internal_proxy`](#-apache--mod--remoteip--internal_proxy)
+* [`proxy_ips`](#-apache--mod--remoteip--proxy_ips)
+* [`internal_proxy_list`](#-apache--mod--remoteip--internal_proxy_list)
+* [`proxies_header`](#-apache--mod--remoteip--proxies_header)
+* [`proxy_protocol`](#-apache--mod--remoteip--proxy_protocol)
+* [`proxy_protocol_exceptions`](#-apache--mod--remoteip--proxy_protocol_exceptions)
+* [`trusted_proxy`](#-apache--mod--remoteip--trusted_proxy)
+* [`trusted_proxy_ips`](#-apache--mod--remoteip--trusted_proxy_ips)
+* [`trusted_proxy_list`](#-apache--mod--remoteip--trusted_proxy_list)
 
-##### <a name="header"></a>`header`
+##### <a name="-apache--mod--remoteip--header"></a>`header`
 
 Data type: `String`
 
@@ -5804,7 +5820,7 @@ The header field in which `mod_remoteip` will look for the useragent IP.
 
 Default value: `'X-Forwarded-For'`
 
-##### <a name="internal_proxy"></a>`internal_proxy`
+##### <a name="-apache--mod--remoteip--internal_proxy"></a>`internal_proxy`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
@@ -5813,17 +5829,17 @@ valid value inside specified header. Unlike the `$trusted_proxy_ips`
 parameter, any IP address (including private addresses) presented by these
 proxies will trusted by `mod_remoteip`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_ips"></a>`proxy_ips`
+##### <a name="-apache--mod--remoteip--proxy_ips"></a>`proxy_ips`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
 *Deprecated*: use `$internal_proxy` instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="internal_proxy_list"></a>`internal_proxy_list`
+##### <a name="-apache--mod--remoteip--internal_proxy_list"></a>`internal_proxy_list`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -5831,9 +5847,9 @@ The path to a file containing a list of IP addresses, IP blocks or hostname
 that are trusted to set a valid value inside the specified header. See
 `$internal_proxy` for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxies_header"></a>`proxies_header`
+##### <a name="-apache--mod--remoteip--proxies_header"></a>`proxies_header`
 
 Data type: `Optional[String]`
 
@@ -5841,27 +5857,27 @@ A header into which `mod_remoteip` will collect a list of all of the
 intermediate client IP addresses trusted to resolve the useragent IP of the
 request (e.g. `X-Forwarded-By`).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_protocol"></a>`proxy_protocol`
+##### <a name="-apache--mod--remoteip--proxy_protocol"></a>`proxy_protocol`
 
 Data type: `Boolean`
 
 Wether or not to enable the PROXY protocol header handling. If enabled
 upstream clients must set the header every time they open a connection.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
+##### <a name="-apache--mod--remoteip--proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
 A list of IP address or IP blocks that are not required to use the PROXY
 protocol.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="trusted_proxy"></a>`trusted_proxy`
+##### <a name="-apache--mod--remoteip--trusted_proxy"></a>`trusted_proxy`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
@@ -5870,17 +5886,17 @@ valid value inside the specified header. Unlike the `$proxy_ips` parameter,
 any private IP presented by these proxies will be disgarded by
 `mod_remoteip`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="trusted_proxy_ips"></a>`trusted_proxy_ips`
+##### <a name="-apache--mod--remoteip--trusted_proxy_ips"></a>`trusted_proxy_ips`
 
 Data type: `Optional[Array[Stdlib::Host]]`
 
 *Deprecated*: use `$trusted_proxy` instead.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="trusted_proxy_list"></a>`trusted_proxy_list`
+##### <a name="-apache--mod--remoteip--trusted_proxy_list"></a>`trusted_proxy_list`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -5888,9 +5904,9 @@ The path to a file containing a list of IP addresses, IP blocks or hostname
 that are trusted to set a valid value inside the specified header. See
 `$trusted_proxy` for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodreqtimeout"></a>`apache::mod::reqtimeout`
+### <a name="apache--mod--reqtimeout"></a>`apache::mod::reqtimeout`
 
 Installs and configures `mod_reqtimeout`.
 
@@ -5902,9 +5918,9 @@ Installs and configures `mod_reqtimeout`.
 
 The following parameters are available in the `apache::mod::reqtimeout` class:
 
-* [`timeouts`](#timeouts)
+* [`timeouts`](#-apache--mod--reqtimeout--timeouts)
 
-##### <a name="timeouts"></a>`timeouts`
+##### <a name="-apache--mod--reqtimeout--timeouts"></a>`timeouts`
 
 Data type: `Variant[Array[String], String]`
 
@@ -5912,7 +5928,7 @@ List of timeouts and data rates for receiving requests.
 
 Default value: `['header=20-40,minrate=500', 'body=10,minrate=500']`
 
-### <a name="apachemodrewrite"></a>`apache::mod::rewrite`
+### <a name="apache--mod--rewrite"></a>`apache::mod::rewrite`
 
 Installs `mod_rewrite`.
 
@@ -5920,7 +5936,7 @@ Installs `mod_rewrite`.
   * https://httpd.apache.org/docs/current/mod/mod_rewrite.html
     * for additional documentation.
 
-### <a name="apachemodrpaf"></a>`apache::mod::rpaf`
+### <a name="apache--mod--rpaf"></a>`apache::mod::rpaf`
 
 Installs and configures `mod_rpaf`.
 
@@ -5932,20 +5948,20 @@ Installs and configures `mod_rpaf`.
 
 The following parameters are available in the `apache::mod::rpaf` class:
 
-* [`sethostname`](#sethostname)
-* [`proxy_ips`](#proxy_ips)
-* [`header`](#header)
-* [`template`](#template)
+* [`sethostname`](#-apache--mod--rpaf--sethostname)
+* [`proxy_ips`](#-apache--mod--rpaf--proxy_ips)
+* [`header`](#-apache--mod--rpaf--header)
+* [`template`](#-apache--mod--rpaf--template)
 
-##### <a name="sethostname"></a>`sethostname`
+##### <a name="-apache--mod--rpaf--sethostname"></a>`sethostname`
 
 Data type: `Variant[Boolean, String]`
 
 Toggles whether to update vhost name so ServerName and ServerAlias work.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="proxy_ips"></a>`proxy_ips`
+##### <a name="-apache--mod--rpaf--proxy_ips"></a>`proxy_ips`
 
 Data type: `Array[Stdlib::IP::Address]`
 
@@ -5953,7 +5969,7 @@ List of IPs & bitmasked subnets to adjust requests for
 
 Default value: `['127.0.0.1']`
 
-##### <a name="header"></a>`header`
+##### <a name="-apache--mod--rpaf--header"></a>`header`
 
 Data type: `String`
 
@@ -5961,7 +5977,7 @@ Header to use for the real IP address.
 
 Default value: `'X-Forwarded-For'`
 
-##### <a name="template"></a>`template`
+##### <a name="-apache--mod--rpaf--template"></a>`template`
 
 Data type: `String`
 
@@ -5969,7 +5985,7 @@ Path to template to use for configuring mod_rpaf.
 
 Default value: `'apache/mod/rpaf.conf.erb'`
 
-### <a name="apachemodsecurity"></a>`apache::mod::security`
+### <a name="apache--mod--security"></a>`apache::mod::security`
 
 Installs and configures `mod_security`.
 
@@ -5983,48 +5999,48 @@ Installs and configures `mod_security`.
 
 The following parameters are available in the `apache::mod::security` class:
 
-* [`version`](#version)
-* [`logroot`](#logroot)
-* [`crs_package`](#crs_package)
-* [`activated_rules`](#activated_rules)
-* [`custom_rules`](#custom_rules)
-* [`custom_rules_set`](#custom_rules_set)
-* [`modsec_dir`](#modsec_dir)
-* [`modsec_secruleengine`](#modsec_secruleengine)
-* [`audit_log_relevant_status`](#audit_log_relevant_status)
-* [`audit_log_parts`](#audit_log_parts)
-* [`audit_log_type`](#audit_log_type)
-* [`audit_log_storage_dir`](#audit_log_storage_dir)
-* [`secpcrematchlimit`](#secpcrematchlimit)
-* [`secpcrematchlimitrecursion`](#secpcrematchlimitrecursion)
-* [`allowed_methods`](#allowed_methods)
-* [`content_types`](#content_types)
-* [`restricted_extensions`](#restricted_extensions)
-* [`restricted_headers`](#restricted_headers)
-* [`secdefaultaction`](#secdefaultaction)
-* [`inbound_anomaly_threshold`](#inbound_anomaly_threshold)
-* [`outbound_anomaly_threshold`](#outbound_anomaly_threshold)
-* [`critical_anomaly_score`](#critical_anomaly_score)
-* [`error_anomaly_score`](#error_anomaly_score)
-* [`warning_anomaly_score`](#warning_anomaly_score)
-* [`notice_anomaly_score`](#notice_anomaly_score)
-* [`paranoia_level`](#paranoia_level)
-* [`executing_paranoia_level`](#executing_paranoia_level)
-* [`secrequestmaxnumargs`](#secrequestmaxnumargs)
-* [`secrequestbodylimit`](#secrequestbodylimit)
-* [`secrequestbodynofileslimit`](#secrequestbodynofileslimit)
-* [`secrequestbodyinmemorylimit`](#secrequestbodyinmemorylimit)
-* [`secrequestbodyaccess`](#secrequestbodyaccess)
-* [`secrequestbodylimitaction`](#secrequestbodylimitaction)
-* [`secresponsebodyaccess`](#secresponsebodyaccess)
-* [`secresponsebodylimitaction`](#secresponsebodylimitaction)
-* [`manage_security_crs`](#manage_security_crs)
-* [`enable_dos_protection`](#enable_dos_protection)
-* [`dos_burst_time_slice`](#dos_burst_time_slice)
-* [`dos_counter_threshold`](#dos_counter_threshold)
-* [`dos_block_timeout`](#dos_block_timeout)
-
-##### <a name="version"></a>`version`
+* [`version`](#-apache--mod--security--version)
+* [`logroot`](#-apache--mod--security--logroot)
+* [`crs_package`](#-apache--mod--security--crs_package)
+* [`activated_rules`](#-apache--mod--security--activated_rules)
+* [`custom_rules`](#-apache--mod--security--custom_rules)
+* [`custom_rules_set`](#-apache--mod--security--custom_rules_set)
+* [`modsec_dir`](#-apache--mod--security--modsec_dir)
+* [`modsec_secruleengine`](#-apache--mod--security--modsec_secruleengine)
+* [`audit_log_relevant_status`](#-apache--mod--security--audit_log_relevant_status)
+* [`audit_log_parts`](#-apache--mod--security--audit_log_parts)
+* [`audit_log_type`](#-apache--mod--security--audit_log_type)
+* [`audit_log_storage_dir`](#-apache--mod--security--audit_log_storage_dir)
+* [`secpcrematchlimit`](#-apache--mod--security--secpcrematchlimit)
+* [`secpcrematchlimitrecursion`](#-apache--mod--security--secpcrematchlimitrecursion)
+* [`allowed_methods`](#-apache--mod--security--allowed_methods)
+* [`content_types`](#-apache--mod--security--content_types)
+* [`restricted_extensions`](#-apache--mod--security--restricted_extensions)
+* [`restricted_headers`](#-apache--mod--security--restricted_headers)
+* [`secdefaultaction`](#-apache--mod--security--secdefaultaction)
+* [`inbound_anomaly_threshold`](#-apache--mod--security--inbound_anomaly_threshold)
+* [`outbound_anomaly_threshold`](#-apache--mod--security--outbound_anomaly_threshold)
+* [`critical_anomaly_score`](#-apache--mod--security--critical_anomaly_score)
+* [`error_anomaly_score`](#-apache--mod--security--error_anomaly_score)
+* [`warning_anomaly_score`](#-apache--mod--security--warning_anomaly_score)
+* [`notice_anomaly_score`](#-apache--mod--security--notice_anomaly_score)
+* [`paranoia_level`](#-apache--mod--security--paranoia_level)
+* [`executing_paranoia_level`](#-apache--mod--security--executing_paranoia_level)
+* [`secrequestmaxnumargs`](#-apache--mod--security--secrequestmaxnumargs)
+* [`secrequestbodylimit`](#-apache--mod--security--secrequestbodylimit)
+* [`secrequestbodynofileslimit`](#-apache--mod--security--secrequestbodynofileslimit)
+* [`secrequestbodyinmemorylimit`](#-apache--mod--security--secrequestbodyinmemorylimit)
+* [`secrequestbodyaccess`](#-apache--mod--security--secrequestbodyaccess)
+* [`secrequestbodylimitaction`](#-apache--mod--security--secrequestbodylimitaction)
+* [`secresponsebodyaccess`](#-apache--mod--security--secresponsebodyaccess)
+* [`secresponsebodylimitaction`](#-apache--mod--security--secresponsebodylimitaction)
+* [`manage_security_crs`](#-apache--mod--security--manage_security_crs)
+* [`enable_dos_protection`](#-apache--mod--security--enable_dos_protection)
+* [`dos_burst_time_slice`](#-apache--mod--security--dos_burst_time_slice)
+* [`dos_counter_threshold`](#-apache--mod--security--dos_counter_threshold)
+* [`dos_block_timeout`](#-apache--mod--security--dos_block_timeout)
+
+##### <a name="-apache--mod--security--version"></a>`version`
 
 Data type: `Integer`
 
@@ -6032,7 +6048,7 @@ Manage mod_security or mod_security2
 
 Default value: `$apache::params::modsec_version`
 
-##### <a name="logroot"></a>`logroot`
+##### <a name="-apache--mod--security--logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -6040,7 +6056,7 @@ Configures the location of audit and debug logs.
 
 Default value: `$apache::params::logroot`
 
-##### <a name="crs_package"></a>`crs_package`
+##### <a name="-apache--mod--security--crs_package"></a>`crs_package`
 
 Data type: `Optional[String]`
 
@@ -6048,7 +6064,7 @@ Name of package that installs CRS rules.
 
 Default value: `$apache::params::modsec_crs_package`
 
-##### <a name="activated_rules"></a>`activated_rules`
+##### <a name="-apache--mod--security--activated_rules"></a>`activated_rules`
 
 Data type: `Array[String]`
 
@@ -6056,7 +6072,7 @@ An array of rules from the modsec_crs_path or absolute to activate via symlinks.
 
 Default value: `$apache::params::modsec_default_rules`
 
-##### <a name="custom_rules"></a>`custom_rules`
+##### <a name="-apache--mod--security--custom_rules"></a>`custom_rules`
 
 Data type: `Boolean`
 
@@ -6064,7 +6080,7 @@ Data type: `Boolean`
 
 Default value: `$apache::params::modsec_custom_rules`
 
-##### <a name="custom_rules_set"></a>`custom_rules_set`
+##### <a name="-apache--mod--security--custom_rules_set"></a>`custom_rules_set`
 
 Data type: `Optional[Array[String]]`
 
@@ -6072,7 +6088,7 @@ Data type: `Optional[Array[String]]`
 
 Default value: `$apache::params::modsec_custom_rules_set`
 
-##### <a name="modsec_dir"></a>`modsec_dir`
+##### <a name="-apache--mod--security--modsec_dir"></a>`modsec_dir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -6080,7 +6096,7 @@ Defines the path where Puppet installs the modsec configuration and activated ru
 
 Default value: `$apache::params::modsec_dir`
 
-##### <a name="modsec_secruleengine"></a>`modsec_secruleengine`
+##### <a name="-apache--mod--security--modsec_secruleengine"></a>`modsec_secruleengine`
 
 Data type: `String`
 
@@ -6088,7 +6104,7 @@ Configures the rules engine.
 
 Default value: `$apache::params::modsec_secruleengine`
 
-##### <a name="audit_log_relevant_status"></a>`audit_log_relevant_status`
+##### <a name="-apache--mod--security--audit_log_relevant_status"></a>`audit_log_relevant_status`
 
 Data type: `String`
 
@@ -6096,7 +6112,7 @@ Configures which response status code is to be considered relevant for the purpo
 
 Default value: `'^(?:5|4(?!04))'`
 
-##### <a name="audit_log_parts"></a>`audit_log_parts`
+##### <a name="-apache--mod--security--audit_log_parts"></a>`audit_log_parts`
 
 Data type: `String`
 
@@ -6105,7 +6121,7 @@ letter appears in the list then the equivalent part will be recorded.
 
 Default value: `$apache::params::modsec_audit_log_parts`
 
-##### <a name="audit_log_type"></a>`audit_log_type`
+##### <a name="-apache--mod--security--audit_log_type"></a>`audit_log_type`
 
 Data type: `String`
 
@@ -6113,15 +6129,15 @@ Defines the type of audit logging mechanism to be used.
 
 Default value: `$apache::params::modsec_audit_log_type`
 
-##### <a name="audit_log_storage_dir"></a>`audit_log_storage_dir`
+##### <a name="-apache--mod--security--audit_log_storage_dir"></a>`audit_log_storage_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="secpcrematchlimit"></a>`secpcrematchlimit`
+##### <a name="-apache--mod--security--secpcrematchlimit"></a>`secpcrematchlimit`
 
 Data type: `Integer`
 
@@ -6129,7 +6145,7 @@ Sets the match limit in the PCRE library.
 
 Default value: `$apache::params::secpcrematchlimit`
 
-##### <a name="secpcrematchlimitrecursion"></a>`secpcrematchlimitrecursion`
+##### <a name="-apache--mod--security--secpcrematchlimitrecursion"></a>`secpcrematchlimitrecursion`
 
 Data type: `Integer`
 
@@ -6137,7 +6153,7 @@ Sets the match limit recursion in the PCRE library.
 
 Default value: `$apache::params::secpcrematchlimitrecursion`
 
-##### <a name="allowed_methods"></a>`allowed_methods`
+##### <a name="-apache--mod--security--allowed_methods"></a>`allowed_methods`
 
 Data type: `String`
 
@@ -6145,7 +6161,7 @@ A space-separated list of allowed HTTP methods.
 
 Default value: `'GET HEAD POST OPTIONS'`
 
-##### <a name="content_types"></a>`content_types`
+##### <a name="-apache--mod--security--content_types"></a>`content_types`
 
 Data type: `String`
 
@@ -6153,7 +6169,7 @@ A list of one or more allowed MIME types.
 
 Default value: `'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf'`
 
-##### <a name="restricted_extensions"></a>`restricted_extensions`
+##### <a name="-apache--mod--security--restricted_extensions"></a>`restricted_extensions`
 
 Data type: `String`
 
@@ -6161,7 +6177,7 @@ A space-sparated list of prohibited file extensions.
 
 Default value: `'.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'`
 
-##### <a name="restricted_headers"></a>`restricted_headers`
+##### <a name="-apache--mod--security--restricted_headers"></a>`restricted_headers`
 
 Data type: `String`
 
@@ -6169,7 +6185,7 @@ A list of restricted headers separated by slashes and spaces.
 
 Default value: `'/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/'`
 
-##### <a name="secdefaultaction"></a>`secdefaultaction`
+##### <a name="-apache--mod--security--secdefaultaction"></a>`secdefaultaction`
 
 Data type: `String`
 
@@ -6177,7 +6193,7 @@ Defines the default list of actions, which will be inherited by the rules in the
 
 Default value: `'deny'`
 
-##### <a name="inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
+##### <a name="-apache--mod--security--inbound_anomaly_threshold"></a>`inbound_anomaly_threshold`
 
 Data type: `Integer`
 
@@ -6185,7 +6201,7 @@ Sets the scoring threshold level of the inbound blocking rules for the Collabora
 
 Default value: `5`
 
-##### <a name="outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
+##### <a name="-apache--mod--security--outbound_anomaly_threshold"></a>`outbound_anomaly_threshold`
 
 Data type: `Integer`
 
@@ -6193,7 +6209,7 @@ Sets the scoring threshold level of the outbound blocking rules for the Collabor
 
 Default value: `4`
 
-##### <a name="critical_anomaly_score"></a>`critical_anomaly_score`
+##### <a name="-apache--mod--security--critical_anomaly_score"></a>`critical_anomaly_score`
 
 Data type: `Integer`
 
@@ -6201,7 +6217,7 @@ Sets the Anomaly Score for rules assigned with a critical severity.
 
 Default value: `5`
 
-##### <a name="error_anomaly_score"></a>`error_anomaly_score`
+##### <a name="-apache--mod--security--error_anomaly_score"></a>`error_anomaly_score`
 
 Data type: `Integer`
 
@@ -6209,7 +6225,7 @@ Sets the Anomaly Score for rules assigned with a error severity.
 
 Default value: `4`
 
-##### <a name="warning_anomaly_score"></a>`warning_anomaly_score`
+##### <a name="-apache--mod--security--warning_anomaly_score"></a>`warning_anomaly_score`
 
 Data type: `Integer`
 
@@ -6217,7 +6233,7 @@ Sets the Anomaly Score for rules assigned with a warning severity.
 
 Default value: `3`
 
-##### <a name="notice_anomaly_score"></a>`notice_anomaly_score`
+##### <a name="-apache--mod--security--notice_anomaly_score"></a>`notice_anomaly_score`
 
 Data type: `Integer`
 
@@ -6225,7 +6241,7 @@ Sets the Anomaly Score for rules assigned with a notice severity.
 
 Default value: `2`
 
-##### <a name="paranoia_level"></a>`paranoia_level`
+##### <a name="-apache--mod--security--paranoia_level"></a>`paranoia_level`
 
 Data type: `Integer[1,4]`
 
@@ -6233,7 +6249,7 @@ Sets the paranoia level in the OWASP ModSecurity Core Rule Set.
 
 Default value: `1`
 
-##### <a name="executing_paranoia_level"></a>`executing_paranoia_level`
+##### <a name="-apache--mod--security--executing_paranoia_level"></a>`executing_paranoia_level`
 
 Data type: `Integer[1,4]`
 
@@ -6242,7 +6258,7 @@ The default is equal to, and cannot be lower than, $paranoia_level.
 
 Default value: `$paranoia_level`
 
-##### <a name="secrequestmaxnumargs"></a>`secrequestmaxnumargs`
+##### <a name="-apache--mod--security--secrequestmaxnumargs"></a>`secrequestmaxnumargs`
 
 Data type: `Integer`
 
@@ -6250,7 +6266,7 @@ Sets the maximum number of arguments in the request.
 
 Default value: `255`
 
-##### <a name="secrequestbodylimit"></a>`secrequestbodylimit`
+##### <a name="-apache--mod--security--secrequestbodylimit"></a>`secrequestbodylimit`
 
 Data type: `Integer`
 
@@ -6258,7 +6274,7 @@ Sets the maximum request body size ModSecurity will accept for buffering.
 
 Default value: `13107200`
 
-##### <a name="secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
+##### <a name="-apache--mod--security--secrequestbodynofileslimit"></a>`secrequestbodynofileslimit`
 
 Data type: `Integer`
 
@@ -6267,7 +6283,7 @@ in the request.
 
 Default value: `131072`
 
-##### <a name="secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
+##### <a name="-apache--mod--security--secrequestbodyinmemorylimit"></a>`secrequestbodyinmemorylimit`
 
 Data type: `Integer`
 
@@ -6275,7 +6291,7 @@ Configures the maximum request body size that ModSecurity will store in memory.
 
 Default value: `131072`
 
-##### <a name="secrequestbodyaccess"></a>`secrequestbodyaccess`
+##### <a name="-apache--mod--security--secrequestbodyaccess"></a>`secrequestbodyaccess`
 
 Data type: `Apache::OnOff`
 
@@ -6283,7 +6299,7 @@ Toggle SecRequestBodyAccess On or Off
 
 Default value: `'On'`
 
-##### <a name="secrequestbodylimitaction"></a>`secrequestbodylimitaction`
+##### <a name="-apache--mod--security--secrequestbodylimitaction"></a>`secrequestbodylimitaction`
 
 Data type: `Enum['Reject', 'ProcessPartial']`
 
@@ -6292,7 +6308,7 @@ SecRequestBodyLimit, is encountered
 
 Default value: `'Reject'`
 
-##### <a name="secresponsebodyaccess"></a>`secresponsebodyaccess`
+##### <a name="-apache--mod--security--secresponsebodyaccess"></a>`secresponsebodyaccess`
 
 Data type: `Apache::OnOff`
 
@@ -6300,7 +6316,7 @@ Toggle SecResponseBodyAccess On or Off
 
 Default value: `'Off'`
 
-##### <a name="secresponsebodylimitaction"></a>`secresponsebodylimitaction`
+##### <a name="-apache--mod--security--secresponsebodylimitaction"></a>`secresponsebodylimitaction`
 
 Data type: `Enum['Reject', 'ProcessPartial']`
 
@@ -6309,24 +6325,24 @@ SecResponseBodyLimitAction, is encountered.
 
 Default value: `'ProcessPartial'`
 
-##### <a name="manage_security_crs"></a>`manage_security_crs`
+##### <a name="-apache--mod--security--manage_security_crs"></a>`manage_security_crs`
 
 Data type: `Boolean`
 
 Toggles whether to manage ModSecurity Core Rule Set
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="enable_dos_protection"></a>`enable_dos_protection`
+##### <a name="-apache--mod--security--enable_dos_protection"></a>`enable_dos_protection`
 
 Data type: `Boolean`
 
 Toggles the optional OWASP ModSecurity Core Rule Set DOS protection rule
 (rule id 900700)
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="dos_burst_time_slice"></a>`dos_burst_time_slice`
+##### <a name="-apache--mod--security--dos_burst_time_slice"></a>`dos_burst_time_slice`
 
 Data type: `Integer[1, default]`
 
@@ -6335,7 +6351,7 @@ Configures time in which a burst is measured for the OWASP ModSecurity Core Rule
 
 Default value: `60`
 
-##### <a name="dos_counter_threshold"></a>`dos_counter_threshold`
+##### <a name="-apache--mod--security--dos_counter_threshold"></a>`dos_counter_threshold`
 
 Data type: `Integer[1, default]`
 
@@ -6344,7 +6360,7 @@ the OWASP ModSecurity Core Rule Set DOS protection rule (rule id 900700)
 
 Default value: `100`
 
-##### <a name="dos_block_timeout"></a>`dos_block_timeout`
+##### <a name="-apache--mod--security--dos_block_timeout"></a>`dos_block_timeout`
 
 Data type: `Integer[1, default]`
 
@@ -6353,7 +6369,7 @@ ModSecurity Core Rule Set DOS protection rule (rule id 900700)
 
 Default value: `600`
 
-### <a name="apachemodsetenvif"></a>`apache::mod::setenvif`
+### <a name="apache--mod--setenvif"></a>`apache::mod::setenvif`
 
 Installs `mod_setenvif`.
 
@@ -6361,7 +6377,7 @@ Installs `mod_setenvif`.
   * https://httpd.apache.org/docs/current/mod/mod_setenvif.html
     * for additional documentation.
 
-### <a name="apachemodshib"></a>`apache::mod::shib`
+### <a name="apache--mod--shib"></a>`apache::mod::shib`
 
 This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
 can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
@@ -6377,45 +6393,45 @@ See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/
 
 The following parameters are available in the `apache::mod::shib` class:
 
-* [`suppress_warning`](#suppress_warning)
-* [`mod_full_path`](#mod_full_path)
-* [`package_name`](#package_name)
-* [`mod_lib`](#mod_lib)
+* [`suppress_warning`](#-apache--mod--shib--suppress_warning)
+* [`mod_full_path`](#-apache--mod--shib--mod_full_path)
+* [`package_name`](#-apache--mod--shib--package_name)
+* [`mod_lib`](#-apache--mod--shib--mod_lib)
 
-##### <a name="suppress_warning"></a>`suppress_warning`
+##### <a name="-apache--mod--shib--suppress_warning"></a>`suppress_warning`
 
 Data type: `Boolean`
 
 Toggles whether to trigger warning on RedHat nodes.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="mod_full_path"></a>`mod_full_path`
+##### <a name="-apache--mod--shib--mod_full_path"></a>`mod_full_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--shib--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of the Shibboleth package to be installed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_lib"></a>`mod_lib`
+##### <a name="-apache--mod--shib--mod_lib"></a>`mod_lib`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
 overrides this value.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodsocache_shmcb"></a>`apache::mod::socache_shmcb`
+### <a name="apache--mod--socache_shmcb"></a>`apache::mod::socache_shmcb`
 
 Installs `mod_socache_shmcb`.
 
@@ -6423,7 +6439,7 @@ Installs `mod_socache_shmcb`.
   * https://httpd.apache.org/docs/current/mod/mod_socache_shmcb.html
     * for additional documentation.
 
-### <a name="apachemodspeling"></a>`apache::mod::speling`
+### <a name="apache--mod--speling"></a>`apache::mod::speling`
 
 Installs `mod_spelling`.
 
@@ -6431,7 +6447,7 @@ Installs `mod_spelling`.
   * https://httpd.apache.org/docs/current/mod/mod_speling.html
     * for additional documentation.
 
-### <a name="apachemodssl"></a>`apache::mod::ssl`
+### <a name="apache--mod--ssl"></a>`apache::mod::ssl`
 
 On most operating systems, the ssl.conf is placed in the module configuration directory. On Red Hat based operating systems, this
 file is placed in /etc/httpd/conf.d, the same location in which the RPM stores the configuration.
@@ -6447,47 +6463,47 @@ apache::vhost to true.
 
 The following parameters are available in the `apache::mod::ssl` class:
 
-* [`ssl_compression`](#ssl_compression)
-* [`ssl_sessiontickets`](#ssl_sessiontickets)
-* [`ssl_cryptodevice`](#ssl_cryptodevice)
-* [`ssl_options`](#ssl_options)
-* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
-* [`ssl_cert`](#ssl_cert)
-* [`ssl_key`](#ssl_key)
-* [`ssl_ca`](#ssl_ca)
-* [`ssl_cipher`](#ssl_cipher)
-* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
-* [`ssl_protocol`](#ssl_protocol)
-* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
-* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
-* [`ssl_pass_phrase_dialog`](#ssl_pass_phrase_dialog)
-* [`ssl_random_seed_bytes`](#ssl_random_seed_bytes)
-* [`ssl_sessioncache`](#ssl_sessioncache)
-* [`ssl_sessioncachetimeout`](#ssl_sessioncachetimeout)
-* [`ssl_stapling`](#ssl_stapling)
-* [`stapling_cache`](#stapling_cache)
-* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
-* [`ssl_mutex`](#ssl_mutex)
-* [`ssl_reload_on_change`](#ssl_reload_on_change)
-* [`package_name`](#package_name)
-
-##### <a name="ssl_compression"></a>`ssl_compression`
+* [`ssl_compression`](#-apache--mod--ssl--ssl_compression)
+* [`ssl_sessiontickets`](#-apache--mod--ssl--ssl_sessiontickets)
+* [`ssl_cryptodevice`](#-apache--mod--ssl--ssl_cryptodevice)
+* [`ssl_options`](#-apache--mod--ssl--ssl_options)
+* [`ssl_openssl_conf_cmd`](#-apache--mod--ssl--ssl_openssl_conf_cmd)
+* [`ssl_cert`](#-apache--mod--ssl--ssl_cert)
+* [`ssl_key`](#-apache--mod--ssl--ssl_key)
+* [`ssl_ca`](#-apache--mod--ssl--ssl_ca)
+* [`ssl_cipher`](#-apache--mod--ssl--ssl_cipher)
+* [`ssl_honorcipherorder`](#-apache--mod--ssl--ssl_honorcipherorder)
+* [`ssl_protocol`](#-apache--mod--ssl--ssl_protocol)
+* [`ssl_proxy_protocol`](#-apache--mod--ssl--ssl_proxy_protocol)
+* [`ssl_proxy_cipher_suite`](#-apache--mod--ssl--ssl_proxy_cipher_suite)
+* [`ssl_pass_phrase_dialog`](#-apache--mod--ssl--ssl_pass_phrase_dialog)
+* [`ssl_random_seed_bytes`](#-apache--mod--ssl--ssl_random_seed_bytes)
+* [`ssl_sessioncache`](#-apache--mod--ssl--ssl_sessioncache)
+* [`ssl_sessioncachetimeout`](#-apache--mod--ssl--ssl_sessioncachetimeout)
+* [`ssl_stapling`](#-apache--mod--ssl--ssl_stapling)
+* [`stapling_cache`](#-apache--mod--ssl--stapling_cache)
+* [`ssl_stapling_return_errors`](#-apache--mod--ssl--ssl_stapling_return_errors)
+* [`ssl_mutex`](#-apache--mod--ssl--ssl_mutex)
+* [`ssl_reload_on_change`](#-apache--mod--ssl--ssl_reload_on_change)
+* [`package_name`](#-apache--mod--ssl--package_name)
+
+##### <a name="-apache--mod--ssl--ssl_compression"></a>`ssl_compression`
 
 Data type: `Boolean`
 
 Enable compression on the SSL level.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="ssl_sessiontickets"></a>`ssl_sessiontickets`
+##### <a name="-apache--mod--ssl--ssl_sessiontickets"></a>`ssl_sessiontickets`
 
 Data type: `Optional[Boolean]`
 
 Enable or disable use of TLS session tickets
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_cryptodevice"></a>`ssl_cryptodevice`
+##### <a name="-apache--mod--ssl--ssl_cryptodevice"></a>`ssl_cryptodevice`
 
 Data type: `String`
 
@@ -6495,7 +6511,7 @@ Enable use of a cryptographic hardware accelerator.
 
 Default value: `'builtin'`
 
-##### <a name="ssl_options"></a>`ssl_options`
+##### <a name="-apache--mod--ssl--ssl_options"></a>`ssl_options`
 
 Data type: `Array[String]`
 
@@ -6503,39 +6519,39 @@ Configure various SSL engine run-time options.
 
 Default value: `['StdEnvVars']`
 
-##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
+##### <a name="-apache--mod--ssl--ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Optional[String]`
 
 Configure OpenSSL parameters through its SSL_CONF API.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_cert"></a>`ssl_cert`
+##### <a name="-apache--mod--ssl--ssl_cert"></a>`ssl_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path to server PEM-encoded X.509 certificate data file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_key"></a>`ssl_key`
+##### <a name="-apache--mod--ssl--ssl_key"></a>`ssl_key`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Path to server PEM-encoded private key file
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_ca"></a>`ssl_ca`
+##### <a name="-apache--mod--ssl--ssl_ca"></a>`ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 File of concatenated PEM-encoded CA Certificates for Client Auth.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_cipher"></a>`ssl_cipher`
+##### <a name="-apache--mod--ssl--ssl_cipher"></a>`ssl_cipher`
 
 Data type: `Variant[String[1], Hash[String[1], String[1]]]`
 
@@ -6543,15 +6559,15 @@ Cipher Suite available for negotiation in SSL handshake.
 
 Default value: `$apache::params::ssl_cipher`
 
-##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
+##### <a name="-apache--mod--ssl--ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
 Data type: `Variant[Boolean, Apache::OnOff]`
 
 Option to prefer the server's cipher preference order.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="ssl_protocol"></a>`ssl_protocol`
+##### <a name="-apache--mod--ssl--ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Array[String]`
 
@@ -6562,7 +6578,7 @@ Default based on the OS:
 
 Default value: `$apache::params::ssl_protocol`
 
-##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
+##### <a name="-apache--mod--ssl--ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Array`
 
@@ -6570,7 +6586,7 @@ Configure usable SSL protocol flavors for proxy usage.
 
 Default value: `[]`
 
-##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
+##### <a name="-apache--mod--ssl--ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
 Data type: `Optional[String[1]]`
 
@@ -6578,7 +6594,7 @@ Configure usable SSL ciphers for proxy usage. Equivalent to ssl_cipher but for p
 
 Default value: `$apache::params::ssl_proxy_cipher_suite`
 
-##### <a name="ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
+##### <a name="-apache--mod--ssl--ssl_pass_phrase_dialog"></a>`ssl_pass_phrase_dialog`
 
 Data type: `String`
 
@@ -6586,7 +6602,7 @@ Type of pass phrase dialog for encrypted private keys.
 
 Default value: `'builtin'`
 
-##### <a name="ssl_random_seed_bytes"></a>`ssl_random_seed_bytes`
+##### <a name="-apache--mod--ssl--ssl_random_seed_bytes"></a>`ssl_random_seed_bytes`
 
 Data type: `Integer`
 
@@ -6594,7 +6610,7 @@ Pseudo Random Number Generator (PRNG) seeding source.
 
 Default value: `512`
 
-##### <a name="ssl_sessioncache"></a>`ssl_sessioncache`
+##### <a name="-apache--mod--ssl--ssl_sessioncache"></a>`ssl_sessioncache`
 
 Data type: `String`
 
@@ -6602,7 +6618,7 @@ Configures the storage type of the global/inter-process SSL Session Cache
 
 Default value: `$apache::params::ssl_sessioncache`
 
-##### <a name="ssl_sessioncachetimeout"></a>`ssl_sessioncachetimeout`
+##### <a name="-apache--mod--ssl--ssl_sessioncachetimeout"></a>`ssl_sessioncachetimeout`
 
 Data type: `Integer`
 
@@ -6610,32 +6626,32 @@ Number of seconds before an SSL session expires in the Session Cache.
 
 Default value: `300`
 
-##### <a name="ssl_stapling"></a>`ssl_stapling`
+##### <a name="-apache--mod--ssl--ssl_stapling"></a>`ssl_stapling`
 
 Data type: `Boolean`
 
 Enable stapling of OCSP responses in the TLS handshake.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="stapling_cache"></a>`stapling_cache`
+##### <a name="-apache--mod--ssl--stapling_cache"></a>`stapling_cache`
 
 Data type: `Optional[String]`
 
 Configures the cache used to store OCSP responses which get included in
 the TLS handshake if SSLUseStapling is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
+##### <a name="-apache--mod--ssl--ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Optional[Boolean]`
 
 Pass stapling related OCSP errors on to client.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_mutex"></a>`ssl_mutex`
+##### <a name="-apache--mod--ssl--ssl_mutex"></a>`ssl_mutex`
 
 Data type: `String`
 
@@ -6647,23 +6663,23 @@ Default based on the OS and/or Apache version:
 
 Default value: `'default'`
 
-##### <a name="ssl_reload_on_change"></a>`ssl_reload_on_change`
+##### <a name="-apache--mod--ssl--ssl_reload_on_change"></a>`ssl_reload_on_change`
 
 Data type: `Boolean`
 
 Enable reloading of apache if the content of ssl files have changed. It only affects ssl files configured here and not vhost ones.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--ssl--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Name of ssl package to install.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodstatus"></a>`apache::mod::status`
+### <a name="apache--mod--status"></a>`apache::mod::status`
 
 Installs and configures `mod_status`.
 
@@ -6686,11 +6702,11 @@ class { 'apache::mod::status':
 
 The following parameters are available in the `apache::mod::status` class:
 
-* [`requires`](#requires)
-* [`extended_status`](#extended_status)
-* [`status_path`](#status_path)
+* [`requires`](#-apache--mod--status--requires)
+* [`extended_status`](#-apache--mod--status--extended_status)
+* [`status_path`](#-apache--mod--status--status_path)
 
-##### <a name="requires"></a>`requires`
+##### <a name="-apache--mod--status--requires"></a>`requires`
 
 Data type: `Optional[Variant[String, Array, Hash]]`
 
@@ -6707,9 +6723,9 @@ A Variant type that can be:
     This encloses "Require" directives in "<Require(Any|All|None)>" block
     Optional - If unspecified, "Require" directives follow current flow
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="extended_status"></a>`extended_status`
+##### <a name="-apache--mod--status--extended_status"></a>`extended_status`
 
 Data type: `Apache::OnOff`
 
@@ -6717,7 +6733,7 @@ Determines whether to track extended status information for each request, via th
 
 Default value: `'On'`
 
-##### <a name="status_path"></a>`status_path`
+##### <a name="-apache--mod--status--status_path"></a>`status_path`
 
 Data type: `String`
 
@@ -6725,7 +6741,7 @@ Path assigned to the Location directive which defines the URL to access the serv
 
 Default value: `'/server-status'`
 
-### <a name="apachemodsuexec"></a>`apache::mod::suexec`
+### <a name="apache--mod--suexec"></a>`apache::mod::suexec`
 
 Installs `mod_suexec`.
 
@@ -6733,7 +6749,7 @@ Installs `mod_suexec`.
   * https://httpd.apache.org/docs/current/mod/mod_suexec.html
     * for additional documentation.
 
-### <a name="apachemoduserdir"></a>`apache::mod::userdir`
+### <a name="apache--mod--userdir"></a>`apache::mod::userdir`
 
 Installs and configures `mod_userdir`.
 
@@ -6745,49 +6761,49 @@ Installs and configures `mod_userdir`.
 
 The following parameters are available in the `apache::mod::userdir` class:
 
-* [`home`](#home)
-* [`dir`](#dir)
-* [`userdir`](#userdir)
-* [`disable_root`](#disable_root)
-* [`path`](#path)
-* [`overrides`](#overrides)
-* [`options`](#options)
-* [`unmanaged_path`](#unmanaged_path)
-* [`custom_fragment`](#custom_fragment)
+* [`home`](#-apache--mod--userdir--home)
+* [`dir`](#-apache--mod--userdir--dir)
+* [`userdir`](#-apache--mod--userdir--userdir)
+* [`disable_root`](#-apache--mod--userdir--disable_root)
+* [`path`](#-apache--mod--userdir--path)
+* [`overrides`](#-apache--mod--userdir--overrides)
+* [`options`](#-apache--mod--userdir--options)
+* [`unmanaged_path`](#-apache--mod--userdir--unmanaged_path)
+* [`custom_fragment`](#-apache--mod--userdir--custom_fragment)
 
-##### <a name="home"></a>`home`
+##### <a name="-apache--mod--userdir--home"></a>`home`
 
 Data type: `Optional[String]`
 
 *Deprecated* Path to system home directory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="dir"></a>`dir`
+##### <a name="-apache--mod--userdir--dir"></a>`dir`
 
 Data type: `Optional[String]`
 
 *Deprecated* Path from user's home directory to public directory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="userdir"></a>`userdir`
+##### <a name="-apache--mod--userdir--userdir"></a>`userdir`
 
 Data type: `Optional[String[1]]`
 
 Path or directory name to be used as the UserDir.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="disable_root"></a>`disable_root`
+##### <a name="-apache--mod--userdir--disable_root"></a>`disable_root`
 
 Data type: `Boolean`
 
 Toggles whether to allow use of root directory.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="path"></a>`path`
+##### <a name="-apache--mod--userdir--path"></a>`path`
 
 Data type: `String`
 
@@ -6795,7 +6811,7 @@ Path to directory or pattern from which to find user-specific directories.
 
 Default value: `'/home/*/public_html'`
 
-##### <a name="overrides"></a>`overrides`
+##### <a name="-apache--mod--userdir--overrides"></a>`overrides`
 
 Data type: `Array[String]`
 
@@ -6803,7 +6819,7 @@ Array of directives that are allowed in .htaccess files.
 
 Default value: `['FileInfo', 'AuthConfig', 'Limit', 'Indexes']`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--mod--userdir--options"></a>`options`
 
 Data type: `Array[String]`
 
@@ -6811,23 +6827,23 @@ Configures what features are available in a particular directory.
 
 Default value: `['MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec']`
 
-##### <a name="unmanaged_path"></a>`unmanaged_path`
+##### <a name="-apache--mod--userdir--unmanaged_path"></a>`unmanaged_path`
 
 Data type: `Boolean`
 
 Toggles whether to manage path in userdir.conf
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="custom_fragment"></a>`custom_fragment`
+##### <a name="-apache--mod--userdir--custom_fragment"></a>`custom_fragment`
 
 Data type: `Optional[String]`
 
 Custom configuration to be added to userdir.conf
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodversion"></a>`apache::mod::version`
+### <a name="apache--mod--version"></a>`apache::mod::version`
 
 Installs `mod_version`.
 
@@ -6835,7 +6851,7 @@ Installs `mod_version`.
   * https://httpd.apache.org/docs/current/mod/mod_version.html
     * for additional documentation.
 
-### <a name="apachemodvhost_alias"></a>`apache::mod::vhost_alias`
+### <a name="apache--mod--vhost_alias"></a>`apache::mod::vhost_alias`
 
 Installs Apache `mod_vhost_alias`.
 
@@ -6843,7 +6859,7 @@ Installs Apache `mod_vhost_alias`.
   * https://httpd.apache.org/docs/current/mod/mod_vhost_alias.html
     * for additional documentation.
 
-### <a name="apachemodwatchdog"></a>`apache::mod::watchdog`
+### <a name="apache--mod--watchdog"></a>`apache::mod::watchdog`
 
 Installs and configures `mod_watchdog`.
 
@@ -6855,17 +6871,17 @@ Installs and configures `mod_watchdog`.
 
 The following parameters are available in the `apache::mod::watchdog` class:
 
-* [`watchdog_interval`](#watchdog_interval)
+* [`watchdog_interval`](#-apache--mod--watchdog--watchdog_interval)
 
-##### <a name="watchdog_interval"></a>`watchdog_interval`
+##### <a name="-apache--mod--watchdog--watchdog_interval"></a>`watchdog_interval`
 
 Data type: `Optional[Integer]`
 
 Sets the interval at which the watchdog_step hook runs.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodworker"></a>`apache::mod::worker`
+### <a name="apache--mod--worker"></a>`apache::mod::worker`
 
 Installs and manages the MPM `worker`.
 
@@ -6877,17 +6893,17 @@ Installs and manages the MPM `worker`.
 
 The following parameters are available in the `apache::mod::worker` class:
 
-* [`startservers`](#startservers)
-* [`minsparethreads`](#minsparethreads)
-* [`maxsparethreads`](#maxsparethreads)
-* [`threadsperchild`](#threadsperchild)
-* [`maxrequestsperchild`](#maxrequestsperchild)
-* [`serverlimit`](#serverlimit)
-* [`threadlimit`](#threadlimit)
-* [`listenbacklog`](#listenbacklog)
-* [`maxrequestworkers`](#maxrequestworkers)
+* [`startservers`](#-apache--mod--worker--startservers)
+* [`minsparethreads`](#-apache--mod--worker--minsparethreads)
+* [`maxsparethreads`](#-apache--mod--worker--maxsparethreads)
+* [`threadsperchild`](#-apache--mod--worker--threadsperchild)
+* [`maxrequestsperchild`](#-apache--mod--worker--maxrequestsperchild)
+* [`serverlimit`](#-apache--mod--worker--serverlimit)
+* [`threadlimit`](#-apache--mod--worker--threadlimit)
+* [`listenbacklog`](#-apache--mod--worker--listenbacklog)
+* [`maxrequestworkers`](#-apache--mod--worker--maxrequestworkers)
 
-##### <a name="startservers"></a>`startservers`
+##### <a name="-apache--mod--worker--startservers"></a>`startservers`
 
 Data type: `Integer`
 
@@ -6895,7 +6911,7 @@ The number of child server processes created on startup
 
 Default value: `2`
 
-##### <a name="minsparethreads"></a>`minsparethreads`
+##### <a name="-apache--mod--worker--minsparethreads"></a>`minsparethreads`
 
 Data type: `Integer`
 
@@ -6903,7 +6919,7 @@ Minimum number of idle threads to handle request spikes.
 
 Default value: `25`
 
-##### <a name="maxsparethreads"></a>`maxsparethreads`
+##### <a name="-apache--mod--worker--maxsparethreads"></a>`maxsparethreads`
 
 Data type: `Integer`
 
@@ -6911,7 +6927,7 @@ Maximum number of idle threads.
 
 Default value: `75`
 
-##### <a name="threadsperchild"></a>`threadsperchild`
+##### <a name="-apache--mod--worker--threadsperchild"></a>`threadsperchild`
 
 Data type: `Integer`
 
@@ -6919,7 +6935,7 @@ The number of threads created by each child process.
 
 Default value: `25`
 
-##### <a name="maxrequestsperchild"></a>`maxrequestsperchild`
+##### <a name="-apache--mod--worker--maxrequestsperchild"></a>`maxrequestsperchild`
 
 Data type: `Integer`
 
@@ -6929,7 +6945,7 @@ name is MaxConnectionsPerChild as of 2.3.9+.
 
 Default value: `0`
 
-##### <a name="serverlimit"></a>`serverlimit`
+##### <a name="-apache--mod--worker--serverlimit"></a>`serverlimit`
 
 Data type: `Integer`
 
@@ -6941,7 +6957,7 @@ MaxRequestWorkers and ThreadsPerChild.
 
 Default value: `25`
 
-##### <a name="threadlimit"></a>`threadlimit`
+##### <a name="-apache--mod--worker--threadlimit"></a>`threadlimit`
 
 Data type: `Integer`
 
@@ -6950,7 +6966,7 @@ ThreadsPerChild for the lifetime of the Apache httpd process.
 
 Default value: `64`
 
-##### <a name="listenbacklog"></a>`listenbacklog`
+##### <a name="-apache--mod--worker--listenbacklog"></a>`listenbacklog`
 
 Data type: `Integer`
 
@@ -6958,7 +6974,7 @@ Maximum length of the queue of pending connections.
 
 Default value: `511`
 
-##### <a name="maxrequestworkers"></a>`maxrequestworkers`
+##### <a name="-apache--mod--worker--maxrequestworkers"></a>`maxrequestworkers`
 
 Data type: `Integer`
 
@@ -6966,7 +6982,7 @@ Maximum number of connections that will be processed simultaneously
 
 Default value: `150`
 
-### <a name="apachemodwsgi"></a>`apache::mod::wsgi`
+### <a name="apache--mod--wsgi"></a>`apache::mod::wsgi`
 
 Installs and configures `mod_wsgi`.
 
@@ -6980,24 +6996,24 @@ Installs and configures `mod_wsgi`.
 
 The following parameters are available in the `apache::mod::wsgi` class:
 
-* [`wsgi_restrict_embedded`](#wsgi_restrict_embedded)
-* [`wsgi_socket_prefix`](#wsgi_socket_prefix)
-* [`wsgi_python_path`](#wsgi_python_path)
-* [`wsgi_python_home`](#wsgi_python_home)
-* [`wsgi_python_optimize`](#wsgi_python_optimize)
-* [`wsgi_application_group`](#wsgi_application_group)
-* [`package_name`](#package_name)
-* [`mod_path`](#mod_path)
+* [`wsgi_restrict_embedded`](#-apache--mod--wsgi--wsgi_restrict_embedded)
+* [`wsgi_socket_prefix`](#-apache--mod--wsgi--wsgi_socket_prefix)
+* [`wsgi_python_path`](#-apache--mod--wsgi--wsgi_python_path)
+* [`wsgi_python_home`](#-apache--mod--wsgi--wsgi_python_home)
+* [`wsgi_python_optimize`](#-apache--mod--wsgi--wsgi_python_optimize)
+* [`wsgi_application_group`](#-apache--mod--wsgi--wsgi_application_group)
+* [`package_name`](#-apache--mod--wsgi--package_name)
+* [`mod_path`](#-apache--mod--wsgi--mod_path)
 
-##### <a name="wsgi_restrict_embedded"></a>`wsgi_restrict_embedded`
+##### <a name="-apache--mod--wsgi--wsgi_restrict_embedded"></a>`wsgi_restrict_embedded`
 
 Data type: `Optional[String]`
 
 Enable restrictions on use of embedded mode.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_socket_prefix"></a>`wsgi_socket_prefix`
+##### <a name="-apache--mod--wsgi--wsgi_socket_prefix"></a>`wsgi_socket_prefix`
 
 Data type: `Optional[String]`
 
@@ -7005,55 +7021,55 @@ Configure directory to use for daemon sockets.
 
 Default value: `$apache::params::wsgi_socket_prefix`
 
-##### <a name="wsgi_python_path"></a>`wsgi_python_path`
+##### <a name="-apache--mod--wsgi--wsgi_python_path"></a>`wsgi_python_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Additional directories to search for Python modules.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_python_home"></a>`wsgi_python_home`
+##### <a name="-apache--mod--wsgi--wsgi_python_home"></a>`wsgi_python_home`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Absolute path to Python prefix/exec_prefix directories.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_python_optimize"></a>`wsgi_python_optimize`
+##### <a name="-apache--mod--wsgi--wsgi_python_optimize"></a>`wsgi_python_optimize`
 
 Data type: `Optional[Integer]`
 
 Enables basic Python optimisation features.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_application_group"></a>`wsgi_application_group`
+##### <a name="-apache--mod--wsgi--wsgi_application_group"></a>`wsgi_application_group`
 
 Data type: `Optional[String]`
 
 Sets which application group WSGI application belongs to.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_name"></a>`package_name`
+##### <a name="-apache--mod--wsgi--package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Names of package that installs mod_wsgi.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="mod_path"></a>`mod_path`
+##### <a name="-apache--mod--wsgi--mod_path"></a>`mod_path`
 
 Data type: `Optional[String]`
 
 Defines the path to the mod_wsgi shared object (.so) file.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachemodxsendfile"></a>`apache::mod::xsendfile`
+### <a name="apache--mod--xsendfile"></a>`apache::mod::xsendfile`
 
 Installs `mod_xsendfile`.
 
@@ -7061,19 +7077,19 @@ Installs `mod_xsendfile`.
   * https://tn123.org/mod_xsendfile/
     * for additional documentation.
 
-### <a name="apachempmdisable_mpm_event"></a>`apache::mpm::disable_mpm_event`
+### <a name="apache--mpm--disable_mpm_event"></a>`apache::mpm::disable_mpm_event`
 
 disable Apache-Module event
 
-### <a name="apachempmdisable_mpm_prefork"></a>`apache::mpm::disable_mpm_prefork`
+### <a name="apache--mpm--disable_mpm_prefork"></a>`apache::mpm::disable_mpm_prefork`
 
 disable Apache-Module prefork
 
-### <a name="apachempmdisable_mpm_worker"></a>`apache::mpm::disable_mpm_worker`
+### <a name="apache--mpm--disable_mpm_worker"></a>`apache::mpm::disable_mpm_worker`
 
 disable Apache-Module worker
 
-### <a name="apachevhosts"></a>`apache::vhosts`
+### <a name="apache--vhosts"></a>`apache::vhosts`
 
 host parameters or Configuring virtual hosts in the README section.
 
@@ -7098,9 +7114,9 @@ class { 'apache::vhosts':
 
 The following parameters are available in the `apache::vhosts` class:
 
-* [`vhosts`](#vhosts)
+* [`vhosts`](#-apache--vhosts--vhosts)
 
-##### <a name="vhosts"></a>`vhosts`
+##### <a name="-apache--vhosts--vhosts"></a>`vhosts`
 
 Data type: `Hash`
 
@@ -7111,7 +7127,7 @@ Default value: `{}`
 
 ## Defined types
 
-### <a name="apachebalancer"></a>`apache::balancer`
+### <a name="apache--balancer"></a>`apache::balancer`
 
 Each balancer cluster needs one or more balancer members (that can
 be declared with the apache::balancermember defined resource type). Using
@@ -7135,18 +7151,18 @@ apache::balancer { 'puppet00': }
 
 The following parameters are available in the `apache::balancer` defined type:
 
-* [`name`](#name)
-* [`proxy_set`](#proxy_set)
-* [`target`](#target)
-* [`collect_exported`](#collect_exported)
-* [`options`](#options)
+* [`name`](#-apache--balancer--name)
+* [`proxy_set`](#-apache--balancer--proxy_set)
+* [`target`](#-apache--balancer--target)
+* [`collect_exported`](#-apache--balancer--collect_exported)
+* [`options`](#-apache--balancer--options)
 
-##### <a name="name"></a>`name`
+##### <a name="-apache--balancer--name"></a>`name`
 
 The namevar of the defined resource type is the balancer clusters name.<br />
 This name is also used in the name of the conf.d file
 
-##### <a name="proxy_set"></a>`proxy_set`
+##### <a name="-apache--balancer--proxy_set"></a>`proxy_set`
 
 Data type: `Hash`
 
@@ -7154,15 +7170,15 @@ Configures key-value pairs to be used as a ProxySet lines in the configuration.
 
 Default value: `{}`
 
-##### <a name="target"></a>`target`
+##### <a name="-apache--balancer--target"></a>`target`
 
 Data type: `Optional[String]`
 
 The path to the file the balancer definition will be written in.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="collect_exported"></a>`collect_exported`
+##### <a name="-apache--balancer--collect_exported"></a>`collect_exported`
 
 Data type: `Boolean`
 
@@ -7177,9 +7193,9 @@ If you don't use exported resources, a single Puppet run configures all balancer
 you use exported resources, Puppet has to run on the balanced nodes first, then run on the
 balancer.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--balancer--options"></a>`options`
 
 Data type: `Array[Pattern[/=/]]`
 
@@ -7188,7 +7204,7 @@ after the balancer URL, and accepts any key-value pairs available to `ProxyPass`
 
 Default value: `[]`
 
-### <a name="apachebalancermember"></a>`apache::balancermember`
+### <a name="apache--balancermember"></a>`apache::balancermember`
 
 Sets up a balancer member inside a listening service configuration block in
 the load balancer's `apache.cfg`.
@@ -7220,24 +7236,24 @@ from all balancer members.
 
 The following parameters are available in the `apache::balancermember` defined type:
 
-* [`name`](#name)
-* [`balancer_cluster`](#balancer_cluster)
-* [`url`](#url)
-* [`options`](#options)
+* [`name`](#-apache--balancermember--name)
+* [`balancer_cluster`](#-apache--balancermember--balancer_cluster)
+* [`url`](#-apache--balancermember--url)
+* [`options`](#-apache--balancermember--options)
 
-##### <a name="name"></a>`name`
+##### <a name="-apache--balancermember--name"></a>`name`
 
 The title of the resource is arbitrary and only utilized in the concat
 fragment name.
 
-##### <a name="balancer_cluster"></a>`balancer_cluster`
+##### <a name="-apache--balancermember--balancer_cluster"></a>`balancer_cluster`
 
 Data type: `String`
 
 The apache service's instance name (or, the title of the apache::balancer
 resource). This must match up with a declared apache::balancer resource.
 
-##### <a name="url"></a>`url`
+##### <a name="-apache--balancermember--url"></a>`url`
 
 Data type: `Apache::ModProxyProtocol`
 
@@ -7245,7 +7261,7 @@ The url used to contact the balancer member server.
 
 Default value: `"http://${$facts['networking']['fqdn']}/"`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--balancermember--options"></a>`options`
 
 Data type: `Array`
 
@@ -7254,7 +7270,7 @@ after the URL, and accepts any key-value pairs available to `ProxyPass`.
 
 Default value: `[]`
 
-### <a name="apachecustom_config"></a>`apache::custom_config`
+### <a name="apache--custom_config"></a>`apache::custom_config`
 
 If the file is invalid and this defined type's `verify_config` parameter's value is
 `true`, Puppet throws an error during a Puppet run.
@@ -7263,20 +7279,20 @@ If the file is invalid and this defined type's `verify_config` parameter's value
 
 The following parameters are available in the `apache::custom_config` defined type:
 
-* [`ensure`](#ensure)
-* [`confdir`](#confdir)
-* [`content`](#content)
-* [`filename`](#filename)
-* [`priority`](#priority)
-* [`source`](#source)
-* [`verify_command`](#verify_command)
-* [`verify_config`](#verify_config)
-* [`owner`](#owner)
-* [`group`](#group)
-* [`file_mode`](#file_mode)
-* [`show_diff`](#show_diff)
-
-##### <a name="ensure"></a>`ensure`
+* [`ensure`](#-apache--custom_config--ensure)
+* [`confdir`](#-apache--custom_config--confdir)
+* [`content`](#-apache--custom_config--content)
+* [`filename`](#-apache--custom_config--filename)
+* [`priority`](#-apache--custom_config--priority)
+* [`source`](#-apache--custom_config--source)
+* [`verify_command`](#-apache--custom_config--verify_command)
+* [`verify_config`](#-apache--custom_config--verify_config)
+* [`owner`](#-apache--custom_config--owner)
+* [`group`](#-apache--custom_config--group)
+* [`file_mode`](#-apache--custom_config--file_mode)
+* [`show_diff`](#-apache--custom_config--show_diff)
+
+##### <a name="-apache--custom_config--ensure"></a>`ensure`
 
 Data type: `Enum['absent', 'present']`
 
@@ -7284,7 +7300,7 @@ Specifies whether the configuration file should be present.
 
 Default value: `'present'`
 
-##### <a name="confdir"></a>`confdir`
+##### <a name="-apache--custom_config--confdir"></a>`confdir`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -7292,24 +7308,24 @@ Sets the directory in which Puppet places configuration files.
 
 Default value: `$apache::confd_dir`
 
-##### <a name="content"></a>`content`
+##### <a name="-apache--custom_config--content"></a>`content`
 
 Data type: `Optional[Variant[Sensitive, String]]`
 
 Sets the configuration file's content. The `content` and `source` parameters are exclusive
 of each other.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="filename"></a>`filename`
+##### <a name="-apache--custom_config--filename"></a>`filename`
 
 Data type: `Optional[String]`
 
 Sets the name of the file under `confdir` in which Puppet stores the configuration.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--custom_config--priority"></a>`priority`
 
 Data type: `Apache::Vhost::Priority`
 
@@ -7319,16 +7335,16 @@ To omit the priority prefix in the configuration file's name, set this parameter
 
 Default value: `25`
 
-##### <a name="source"></a>`source`
+##### <a name="-apache--custom_config--source"></a>`source`
 
 Data type: `Optional[String]`
 
 Points to the configuration file's source. The `content` and `source` parameters are
 exclusive of each other.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="verify_command"></a>`verify_command`
+##### <a name="-apache--custom_config--verify_command"></a>`verify_command`
 
 Data type: `Variant[String, Array[String], Array[Array[String]]]`
 
@@ -7343,47 +7359,47 @@ Or an array of arrays with each one having to pass succesfully, i.e. `[['/usr/sb
 
 Default value: `$apache::params::verify_command`
 
-##### <a name="verify_config"></a>`verify_config`
+##### <a name="-apache--custom_config--verify_config"></a>`verify_config`
 
 Data type: `Boolean`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="owner"></a>`owner`
+##### <a name="-apache--custom_config--owner"></a>`owner`
 
 Data type: `Optional[String]`
 
 File owner of configuration file
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="group"></a>`group`
+##### <a name="-apache--custom_config--group"></a>`group`
 
 Data type: `Optional[String]`
 
 File group of configuration file
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="file_mode"></a>`file_mode`
+##### <a name="-apache--custom_config--file_mode"></a>`file_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
 File mode of configuration file
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="show_diff"></a>`show_diff`
+##### <a name="-apache--custom_config--show_diff"></a>`show_diff`
 
 Data type: `Boolean`
 
 show_diff property for configuration file resource
 
-Default value: ``true``
+Default value: `true`
 
-### <a name="apachefastcgiserver"></a>`apache::fastcgi::server`
+### <a name="apache--fastcgi--server"></a>`apache::fastcgi::server`
 
 Defines one or more external FastCGI servers to handle specific file types. Use this
 defined type with `mod_fastcgi`.
@@ -7392,15 +7408,15 @@ defined type with `mod_fastcgi`.
 
 The following parameters are available in the `apache::fastcgi::server` defined type:
 
-* [`host`](#host)
-* [`timeout`](#timeout)
-* [`flush`](#flush)
-* [`faux_path`](#faux_path)
-* [`fcgi_alias`](#fcgi_alias)
-* [`file_type`](#file_type)
-* [`pass_header`](#pass_header)
+* [`host`](#-apache--fastcgi--server--host)
+* [`timeout`](#-apache--fastcgi--server--timeout)
+* [`flush`](#-apache--fastcgi--server--flush)
+* [`faux_path`](#-apache--fastcgi--server--faux_path)
+* [`fcgi_alias`](#-apache--fastcgi--server--fcgi_alias)
+* [`file_type`](#-apache--fastcgi--server--file_type)
+* [`pass_header`](#-apache--fastcgi--server--pass_header)
 
-##### <a name="host"></a>`host`
+##### <a name="-apache--fastcgi--server--host"></a>`host`
 
 Data type: `String`
 
@@ -7408,7 +7424,7 @@ Determines the FastCGI's hostname or IP address and TCP port number (1-65535).
 
 Default value: `'127.0.0.1:9000'`
 
-##### <a name="timeout"></a>`timeout`
+##### <a name="-apache--fastcgi--server--timeout"></a>`timeout`
 
 Data type: `Integer`
 
@@ -7421,7 +7437,7 @@ the client (the response is buffered), the timeout does not apply.
 
 Default value: `15`
 
-##### <a name="flush"></a>`flush`
+##### <a name="-apache--fastcgi--server--flush"></a>`flush`
 
 Data type: `Boolean`
 
@@ -7429,9 +7445,9 @@ Forces `mod_fastcgi` to write to the client as data is received from the
 application. By default, `mod_fastcgi` buffers data in order to free the application
 as quickly as possible.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="faux_path"></a>`faux_path`
+##### <a name="-apache--fastcgi--server--faux_path"></a>`faux_path`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -7440,7 +7456,7 @@ parameter does not have to exist in the local filesystem.
 
 Default value: `"/var/www/${name}.fcgi"`
 
-##### <a name="fcgi_alias"></a>`fcgi_alias`
+##### <a name="-apache--fastcgi--server--fcgi_alias"></a>`fcgi_alias`
 
 Data type: `Stdlib::Unixpath`
 
@@ -7448,7 +7464,7 @@ Internally links actions with the FastCGI server. This alias must be unique.
 
 Default value: `"/${name}.fcgi"`
 
-##### <a name="file_type"></a>`file_type`
+##### <a name="-apache--fastcgi--server--file_type"></a>`file_type`
 
 Data type: `String`
 
@@ -7456,20 +7472,20 @@ Sets the MIME `content-type` of the file to be processed by the FastCGI server.
 
 Default value: `'application/x-httpd-php'`
 
-##### <a name="pass_header"></a>`pass_header`
+##### <a name="-apache--fastcgi--server--pass_header"></a>`pass_header`
 
 Data type: `Optional[String]`
 
 Sets a header for the server
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachelisten"></a>`apache::listen`
+### <a name="apache--listen"></a>`apache::listen`
 
 The `apache::vhost` class uses this defined type, and titles take the form
 `<PORT>`, `<IPV4>:<PORT>`, or `<IPV6>:<PORT>`.
 
-### <a name="apachemod"></a>`apache::mod`
+### <a name="apache--mod"></a>`apache::mod`
 
 Checks for or places the module's default configuration files in the Apache server's
 `module` and `enable` directories. The default locations depend on your operating system.
@@ -7478,25 +7494,25 @@ Checks for or places the module's default configuration files in the Apache serv
 
 The following parameters are available in the `apache::mod` defined type:
 
-* [`package`](#package)
-* [`package_ensure`](#package_ensure)
-* [`lib`](#lib)
-* [`lib_path`](#lib_path)
-* [`loadfile_name`](#loadfile_name)
-* [`id`](#id)
-* [`loadfiles`](#loadfiles)
-* [`path`](#path)
+* [`package`](#-apache--mod--package)
+* [`package_ensure`](#-apache--mod--package_ensure)
+* [`lib`](#-apache--mod--lib)
+* [`lib_path`](#-apache--mod--lib_path)
+* [`loadfile_name`](#-apache--mod--loadfile_name)
+* [`id`](#-apache--mod--id)
+* [`loadfiles`](#-apache--mod--loadfiles)
+* [`path`](#-apache--mod--path)
 
-##### <a name="package"></a>`package`
+##### <a name="-apache--mod--package"></a>`package`
 
 Data type: `Optional[String]`
 
 **Required**.<br />
 Names the package Puppet uses to install the Apache module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="package_ensure"></a>`package_ensure`
+##### <a name="-apache--mod--package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
@@ -7504,15 +7520,15 @@ Determines whether Puppet ensures the Apache module should be installed.
 
 Default value: `'present'`
 
-##### <a name="lib"></a>`lib`
+##### <a name="-apache--mod--lib"></a>`lib`
 
 Data type: `Optional[String]`
 
 Defines the module's shared object name. Do not configure manually without special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="lib_path"></a>`lib_path`
+##### <a name="-apache--mod--lib_path"></a>`lib_path`
 
 Data type: `String`
 
@@ -7521,46 +7537,46 @@ without special reason. The `path` parameter overrides this value.
 
 Default value: `$apache::lib_path`
 
-##### <a name="loadfile_name"></a>`loadfile_name`
+##### <a name="-apache--mod--loadfile_name"></a>`loadfile_name`
 
 Data type: `Optional[String]`
 
 Sets the filename for the module's `LoadFile` directive, which can also set
 the module load order as Apache processes them in alphanumeric order.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="id"></a>`id`
+##### <a name="-apache--mod--id"></a>`id`
 
 Data type: `Optional[String]`
 
 Specifies the package id
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="loadfiles"></a>`loadfiles`
+##### <a name="-apache--mod--loadfiles"></a>`loadfiles`
 
 Data type: `Optional[Array]`
 
 Specifies an array of `LoadFile` directives.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="path"></a>`path`
+##### <a name="-apache--mod--path"></a>`path`
 
 Data type: `Optional[String]`
 
 Specifies a path to the module. Do not manually set this parameter without a special reason.
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachenamevirtualhost"></a>`apache::namevirtualhost`
+### <a name="apache--namevirtualhost"></a>`apache::namevirtualhost`
 
 Adds all related directives to the `ports.conf` file in the Apache HTTPD configuration
 directory. Titles can take the forms `\*`, `\*:\<PORT\>`, `\_default\_:\<PORT\>`,
 `\<IP\>`, or `\<IP\>:\<PORT\>`.
 
-### <a name="apachevhost"></a>`apache::vhost`
+### <a name="apache--vhost"></a>`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` being a defined resource type, which allows Apache
@@ -7581,81 +7597,6 @@ override `Apache::Vhost['default']`  or `Apache::Vhost['default-ssl]` resources.
 workaround is to create a vhost named something else, such as `my default`, and ensure that the
 `default` and `default_ssl` vhosts are set to `false`:
 
-TODO: check, if this Documentation is obsolete
-lint:ignore:parameter_documentation
-lint:endignore
-  Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
-  ```puppet
-  apache::vhost { 'sample.example.net':
-    docroot     => '/path/to/directory',
-    directories => [
-      { path   => '/path/to/different/dir',
-        gssapi => {
-          acceptor_name            => '{HOSTNAME}',
-          allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
-          authname                 => 'Kerberos 5',
-          authtype                 => 'GSSAPI',
-          basic_auth               => true,
-          basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
-          basic_ticket_timeout     => 300,
-          connection_bound         => true,
-          cred_store               => {
-            ccache        => ['/path/to/directory'],
-            client_keytab => ['/path/to/example.keytab'],
-            keytab        => ['/path/to/example.keytab'],
-          },
-          deleg_ccache_dir         => '/path/to/directory',
-          deleg_ccache_env_var     => 'KRB5CCNAME',
-          deleg_ccache_perms       => {
-            mode => '0600',
-            uid  => 'example-user',
-            gid  => 'example-group',
-          },
-          deleg_ccache_unique      => true,
-          impersonate              => true,
-          local_name               => true,
-          name_attributes          => 'json',
-          negotiate_once           => true,
-          publish_errors           => true,
-          publish_mech             => true,
-          required_name_attributes =>	'auth-indicators=high',
-          session_key              => 'file:/path/to/example.key',
-          signal_persistent_auth   => true,
-          ssl_only                 => true,
-          use_s4u2_proxy           => true,
-          use_sessions             => true,
-        }
-      },
-    ],
-  }
-  ```
-
-lint:ignore:parameter_documentation
-lint:endignore
-  Specifies mod_authz_core parameters for particular directories in a virtual host directory
-  ```puppet
-  apache::vhost { 'sample.example.net':
-    docroot     => '/path/to/directory',
-    directories => [
-      { path        => '/path/to/different/dir',
-        authz_core  => {
-          require_all => {
-            'require_any' => {
-              'require' => ['user superadmin'],
-              'require_all' => {
-                'require' => ['group admins', 'ldap-group "cn=Administrators,o=Airius"'],
-              },
-            },
-            'require_none' => {
-              'require' => ['group temps', 'ldap-group "cn=Temporary Employees,o=Airius"']
-            }
-          }
-        }
-      },
-    ],
-  }
-  ```
-
 #### Examples
 
 ##### 
@@ -7671,267 +7612,265 @@ class { 'apache':
 
 The following parameters are available in the `apache::vhost` defined type:
 
-* [`access_log`](#access_log)
-* [`access_log_env_var`](#access_log_env_var)
-* [`access_log_file`](#access_log_file)
-* [`access_log_format`](#access_log_format)
-* [`access_log_pipe`](#access_log_pipe)
-* [`access_log_syslog`](#access_log_syslog)
-* [`access_logs`](#access_logs)
-* [`add_default_charset`](#add_default_charset)
-* [`add_listen`](#add_listen)
-* [`use_optional_includes`](#use_optional_includes)
-* [`aliases`](#aliases)
-* [`allow_encoded_slashes`](#allow_encoded_slashes)
-* [`block`](#block)
-* [`cas_attribute_prefix`](#cas_attribute_prefix)
-* [`cas_attribute_delimiter`](#cas_attribute_delimiter)
-* [`cas_login_url`](#cas_login_url)
-* [`cas_root_proxied_as`](#cas_root_proxied_as)
-* [`cas_scrub_request_headers`](#cas_scrub_request_headers)
-* [`cas_sso_enabled`](#cas_sso_enabled)
-* [`cas_validate_saml`](#cas_validate_saml)
-* [`cas_validate_url`](#cas_validate_url)
-* [`cas_cookie_path`](#cas_cookie_path)
-* [`comment`](#comment)
-* [`default_vhost`](#default_vhost)
-* [`directoryindex`](#directoryindex)
-* [`docroot`](#docroot)
-* [`docroot_group`](#docroot_group)
-* [`docroot_owner`](#docroot_owner)
-* [`docroot_mode`](#docroot_mode)
-* [`manage_docroot`](#manage_docroot)
-* [`error_log`](#error_log)
-* [`error_log_file`](#error_log_file)
-* [`error_log_pipe`](#error_log_pipe)
-* [`error_log_syslog`](#error_log_syslog)
-* [`error_log_format`](#error_log_format)
-* [`error_documents`](#error_documents)
-* [`ensure`](#ensure)
-* [`fallbackresource`](#fallbackresource)
-* [`filters`](#filters)
-* [`h2_copy_files`](#h2_copy_files)
-* [`h2_direct`](#h2_direct)
-* [`h2_early_hints`](#h2_early_hints)
-* [`h2_max_session_streams`](#h2_max_session_streams)
-* [`h2_modern_tls_only`](#h2_modern_tls_only)
-* [`h2_push`](#h2_push)
-* [`h2_push_diary_size`](#h2_push_diary_size)
-* [`h2_push_priority`](#h2_push_priority)
-* [`h2_push_resource`](#h2_push_resource)
-* [`h2_serialize_headers`](#h2_serialize_headers)
-* [`h2_stream_max_mem_size`](#h2_stream_max_mem_size)
-* [`h2_tls_cool_down_secs`](#h2_tls_cool_down_secs)
-* [`h2_tls_warm_up_size`](#h2_tls_warm_up_size)
-* [`h2_upgrade`](#h2_upgrade)
-* [`h2_window_size`](#h2_window_size)
-* [`ip`](#ip)
-* [`ip_based`](#ip_based)
-* [`itk`](#itk)
-* [`action`](#action)
-* [`jk_mounts`](#jk_mounts)
-* [`http_protocol_options`](#http_protocol_options)
-* [`keepalive`](#keepalive)
-* [`keepalive_timeout`](#keepalive_timeout)
-* [`max_keepalive_requests`](#max_keepalive_requests)
-* [`auth_kerb`](#auth_kerb)
-* [`krb_method_negotiate`](#krb_method_negotiate)
-* [`krb_method_k5passwd`](#krb_method_k5passwd)
-* [`krb_authoritative`](#krb_authoritative)
-* [`krb_auth_realms`](#krb_auth_realms)
-* [`krb_5keytab`](#krb_5keytab)
-* [`krb_local_user_mapping`](#krb_local_user_mapping)
-* [`krb_verify_kdc`](#krb_verify_kdc)
-* [`krb_servicename`](#krb_servicename)
-* [`krb_save_credentials`](#krb_save_credentials)
-* [`logroot`](#logroot)
-* [`logroot_ensure`](#logroot_ensure)
-* [`logroot_mode`](#logroot_mode)
-* [`logroot_owner`](#logroot_owner)
-* [`logroot_group`](#logroot_group)
-* [`log_level`](#log_level)
-* [`modsec_body_limit`](#modsec_body_limit)
-* [`modsec_disable_vhost`](#modsec_disable_vhost)
-* [`modsec_disable_ids`](#modsec_disable_ids)
-* [`modsec_disable_ips`](#modsec_disable_ips)
-* [`modsec_disable_msgs`](#modsec_disable_msgs)
-* [`modsec_disable_tags`](#modsec_disable_tags)
-* [`modsec_audit_log_file`](#modsec_audit_log_file)
-* [`modsec_audit_log_pipe`](#modsec_audit_log_pipe)
-* [`modsec_audit_log`](#modsec_audit_log)
-* [`modsec_inbound_anomaly_threshold`](#modsec_inbound_anomaly_threshold)
-* [`modsec_outbound_anomaly_threshold`](#modsec_outbound_anomaly_threshold)
-* [`modsec_allowed_methods`](#modsec_allowed_methods)
-* [`no_proxy_uris`](#no_proxy_uris)
-* [`no_proxy_uris_match`](#no_proxy_uris_match)
-* [`proxy_preserve_host`](#proxy_preserve_host)
-* [`proxy_add_headers`](#proxy_add_headers)
-* [`proxy_error_override`](#proxy_error_override)
-* [`options`](#options)
-* [`override`](#override)
-* [`passenger_enabled`](#passenger_enabled)
-* [`passenger_base_uri`](#passenger_base_uri)
-* [`passenger_ruby`](#passenger_ruby)
-* [`passenger_python`](#passenger_python)
-* [`passenger_nodejs`](#passenger_nodejs)
-* [`passenger_meteor_app_settings`](#passenger_meteor_app_settings)
-* [`passenger_app_env`](#passenger_app_env)
-* [`passenger_app_root`](#passenger_app_root)
-* [`passenger_app_group_name`](#passenger_app_group_name)
-* [`passenger_app_start_command`](#passenger_app_start_command)
-* [`passenger_app_type`](#passenger_app_type)
-* [`passenger_startup_file`](#passenger_startup_file)
-* [`passenger_restart_dir`](#passenger_restart_dir)
-* [`passenger_spawn_method`](#passenger_spawn_method)
-* [`passenger_load_shell_envvars`](#passenger_load_shell_envvars)
-* [`passenger_preload_bundler`](#passenger_preload_bundler)
-* [`passenger_rolling_restarts`](#passenger_rolling_restarts)
-* [`passenger_resist_deployment_errors`](#passenger_resist_deployment_errors)
-* [`passenger_user`](#passenger_user)
-* [`passenger_group`](#passenger_group)
-* [`passenger_friendly_error_pages`](#passenger_friendly_error_pages)
-* [`passenger_min_instances`](#passenger_min_instances)
-* [`passenger_max_instances`](#passenger_max_instances)
-* [`passenger_max_preloader_idle_time`](#passenger_max_preloader_idle_time)
-* [`passenger_force_max_concurrent_requests_per_process`](#passenger_force_max_concurrent_requests_per_process)
-* [`passenger_start_timeout`](#passenger_start_timeout)
-* [`passenger_concurrency_model`](#passenger_concurrency_model)
-* [`passenger_thread_count`](#passenger_thread_count)
-* [`passenger_max_requests`](#passenger_max_requests)
-* [`passenger_max_request_time`](#passenger_max_request_time)
-* [`passenger_memory_limit`](#passenger_memory_limit)
-* [`passenger_stat_throttle_rate`](#passenger_stat_throttle_rate)
-* [`passenger_pre_start`](#passenger_pre_start)
-* [`passenger_high_performance`](#passenger_high_performance)
-* [`passenger_buffer_upload`](#passenger_buffer_upload)
-* [`passenger_buffer_response`](#passenger_buffer_response)
-* [`passenger_error_override`](#passenger_error_override)
-* [`passenger_max_request_queue_size`](#passenger_max_request_queue_size)
-* [`passenger_max_request_queue_time`](#passenger_max_request_queue_time)
-* [`passenger_sticky_sessions`](#passenger_sticky_sessions)
-* [`passenger_sticky_sessions_cookie_name`](#passenger_sticky_sessions_cookie_name)
-* [`passenger_sticky_sessions_cookie_attributes`](#passenger_sticky_sessions_cookie_attributes)
-* [`passenger_allow_encoded_slashes`](#passenger_allow_encoded_slashes)
-* [`passenger_app_log_file`](#passenger_app_log_file)
-* [`passenger_debugger`](#passenger_debugger)
-* [`passenger_lve_min_uid`](#passenger_lve_min_uid)
-* [`php_values`](#php_values)
-* [`php_flags`](#php_flags)
-* [`php_admin_values`](#php_admin_values)
-* [`php_admin_flags`](#php_admin_flags)
-* [`port`](#port)
-* [`priority`](#priority)
-* [`protocols`](#protocols)
-* [`protocols_honor_order`](#protocols_honor_order)
-* [`proxy_dest`](#proxy_dest)
-* [`proxy_pass`](#proxy_pass)
-* [`proxy_dest_match`](#proxy_dest_match)
-* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
-* [`proxy_pass_match`](#proxy_pass_match)
-* [`redirect_dest`](#redirect_dest)
-* [`redirect_source`](#redirect_source)
-* [`redirect_status`](#redirect_status)
-* [`redirectmatch_regexp`](#redirectmatch_regexp)
-* [`redirectmatch_status`](#redirectmatch_status)
-* [`redirectmatch_dest`](#redirectmatch_dest)
-* [`request_headers`](#request_headers)
-* [`rewrites`](#rewrites)
-* [`rewrite_base`](#rewrite_base)
-* [`rewrite_rule`](#rewrite_rule)
-* [`rewrite_cond`](#rewrite_cond)
-* [`rewrite_inherit`](#rewrite_inherit)
-* [`scriptalias`](#scriptalias)
-* [`scriptaliases`](#scriptaliases)
-* [`serveradmin`](#serveradmin)
-* [`serveraliases`](#serveraliases)
-* [`servername`](#servername)
-* [`setenv`](#setenv)
-* [`setenvif`](#setenvif)
-* [`setenvifnocase`](#setenvifnocase)
-* [`suexec_user_group`](#suexec_user_group)
-* [`vhost_name`](#vhost_name)
-* [`virtual_docroot`](#virtual_docroot)
-* [`virtual_use_default_docroot`](#virtual_use_default_docroot)
-* [`wsgi_daemon_process`](#wsgi_daemon_process)
-* [`wsgi_daemon_process_options`](#wsgi_daemon_process_options)
-* [`wsgi_application_group`](#wsgi_application_group)
-* [`wsgi_import_script`](#wsgi_import_script)
-* [`wsgi_import_script_options`](#wsgi_import_script_options)
-* [`wsgi_chunked_request`](#wsgi_chunked_request)
-* [`wsgi_process_group`](#wsgi_process_group)
-* [`wsgi_script_aliases`](#wsgi_script_aliases)
-* [`wsgi_script_aliases_match`](#wsgi_script_aliases_match)
-* [`wsgi_pass_authorization`](#wsgi_pass_authorization)
-* [`directories`](#directories)
-* [`custom_fragment`](#custom_fragment)
-* [`headers`](#headers)
-* [`shib_compat_valid_user`](#shib_compat_valid_user)
-* [`ssl_options`](#ssl_options)
-* [`additional_includes`](#additional_includes)
-* [`gssapi`](#gssapi)
-* [`authz_core`](#authz_core)
-* [`ssl`](#ssl)
-* [`ssl_ca`](#ssl_ca)
-* [`ssl_cert`](#ssl_cert)
-* [`ssl_protocol`](#ssl_protocol)
-* [`ssl_cipher`](#ssl_cipher)
-* [`ssl_honorcipherorder`](#ssl_honorcipherorder)
-* [`ssl_certs_dir`](#ssl_certs_dir)
-* [`ssl_chain`](#ssl_chain)
-* [`ssl_crl`](#ssl_crl)
-* [`ssl_crl_path`](#ssl_crl_path)
-* [`ssl_crl_check`](#ssl_crl_check)
-* [`ssl_key`](#ssl_key)
-* [`ssl_verify_client`](#ssl_verify_client)
-* [`ssl_verify_depth`](#ssl_verify_depth)
-* [`ssl_proxy_protocol`](#ssl_proxy_protocol)
-* [`ssl_proxy_verify`](#ssl_proxy_verify)
-* [`ssl_proxy_verify_depth`](#ssl_proxy_verify_depth)
-* [`ssl_proxy_cipher_suite`](#ssl_proxy_cipher_suite)
-* [`ssl_proxy_ca_cert`](#ssl_proxy_ca_cert)
-* [`ssl_proxy_machine_cert`](#ssl_proxy_machine_cert)
-* [`ssl_proxy_machine_cert_chain`](#ssl_proxy_machine_cert_chain)
-* [`ssl_proxy_check_peer_cn`](#ssl_proxy_check_peer_cn)
-* [`ssl_proxy_check_peer_name`](#ssl_proxy_check_peer_name)
-* [`ssl_proxy_check_peer_expire`](#ssl_proxy_check_peer_expire)
-* [`ssl_openssl_conf_cmd`](#ssl_openssl_conf_cmd)
-* [`ssl_proxyengine`](#ssl_proxyengine)
-* [`ssl_stapling`](#ssl_stapling)
-* [`ssl_stapling_timeout`](#ssl_stapling_timeout)
-* [`ssl_stapling_return_errors`](#ssl_stapling_return_errors)
-* [`ssl_user_name`](#ssl_user_name)
-* [`ssl_reload_on_change`](#ssl_reload_on_change)
-* [`use_canonical_name`](#use_canonical_name)
-* [`define`](#define)
-* [`auth_oidc`](#auth_oidc)
-* [`oidc_settings`](#oidc_settings)
-* [`limitreqfields`](#limitreqfields)
-* [`limitreqfieldsize`](#limitreqfieldsize)
-* [`limitreqline`](#limitreqline)
-* [`limitreqbody`](#limitreqbody)
-* [`use_servername_for_filenames`](#use_servername_for_filenames)
-* [`use_port_for_filenames`](#use_port_for_filenames)
-* [`mdomain`](#mdomain)
-* [`proxy_requests`](#proxy_requests)
-* [`userdir`](#userdir)
-
-##### <a name="access_log"></a>`access_log`
+* [`access_log`](#-apache--vhost--access_log)
+* [`access_log_env_var`](#-apache--vhost--access_log_env_var)
+* [`access_log_file`](#-apache--vhost--access_log_file)
+* [`access_log_format`](#-apache--vhost--access_log_format)
+* [`access_log_pipe`](#-apache--vhost--access_log_pipe)
+* [`access_log_syslog`](#-apache--vhost--access_log_syslog)
+* [`access_logs`](#-apache--vhost--access_logs)
+* [`add_default_charset`](#-apache--vhost--add_default_charset)
+* [`add_listen`](#-apache--vhost--add_listen)
+* [`use_optional_includes`](#-apache--vhost--use_optional_includes)
+* [`aliases`](#-apache--vhost--aliases)
+* [`allow_encoded_slashes`](#-apache--vhost--allow_encoded_slashes)
+* [`block`](#-apache--vhost--block)
+* [`cas_attribute_prefix`](#-apache--vhost--cas_attribute_prefix)
+* [`cas_attribute_delimiter`](#-apache--vhost--cas_attribute_delimiter)
+* [`cas_login_url`](#-apache--vhost--cas_login_url)
+* [`cas_root_proxied_as`](#-apache--vhost--cas_root_proxied_as)
+* [`cas_scrub_request_headers`](#-apache--vhost--cas_scrub_request_headers)
+* [`cas_sso_enabled`](#-apache--vhost--cas_sso_enabled)
+* [`cas_validate_saml`](#-apache--vhost--cas_validate_saml)
+* [`cas_validate_url`](#-apache--vhost--cas_validate_url)
+* [`cas_cookie_path`](#-apache--vhost--cas_cookie_path)
+* [`comment`](#-apache--vhost--comment)
+* [`default_vhost`](#-apache--vhost--default_vhost)
+* [`directoryindex`](#-apache--vhost--directoryindex)
+* [`docroot`](#-apache--vhost--docroot)
+* [`docroot_group`](#-apache--vhost--docroot_group)
+* [`docroot_owner`](#-apache--vhost--docroot_owner)
+* [`docroot_mode`](#-apache--vhost--docroot_mode)
+* [`manage_docroot`](#-apache--vhost--manage_docroot)
+* [`error_log`](#-apache--vhost--error_log)
+* [`error_log_file`](#-apache--vhost--error_log_file)
+* [`error_log_pipe`](#-apache--vhost--error_log_pipe)
+* [`error_log_syslog`](#-apache--vhost--error_log_syslog)
+* [`error_log_format`](#-apache--vhost--error_log_format)
+* [`error_documents`](#-apache--vhost--error_documents)
+* [`ensure`](#-apache--vhost--ensure)
+* [`fallbackresource`](#-apache--vhost--fallbackresource)
+* [`filters`](#-apache--vhost--filters)
+* [`h2_copy_files`](#-apache--vhost--h2_copy_files)
+* [`h2_direct`](#-apache--vhost--h2_direct)
+* [`h2_early_hints`](#-apache--vhost--h2_early_hints)
+* [`h2_max_session_streams`](#-apache--vhost--h2_max_session_streams)
+* [`h2_modern_tls_only`](#-apache--vhost--h2_modern_tls_only)
+* [`h2_push`](#-apache--vhost--h2_push)
+* [`h2_push_diary_size`](#-apache--vhost--h2_push_diary_size)
+* [`h2_push_priority`](#-apache--vhost--h2_push_priority)
+* [`h2_push_resource`](#-apache--vhost--h2_push_resource)
+* [`h2_serialize_headers`](#-apache--vhost--h2_serialize_headers)
+* [`h2_stream_max_mem_size`](#-apache--vhost--h2_stream_max_mem_size)
+* [`h2_tls_cool_down_secs`](#-apache--vhost--h2_tls_cool_down_secs)
+* [`h2_tls_warm_up_size`](#-apache--vhost--h2_tls_warm_up_size)
+* [`h2_upgrade`](#-apache--vhost--h2_upgrade)
+* [`h2_window_size`](#-apache--vhost--h2_window_size)
+* [`ip`](#-apache--vhost--ip)
+* [`ip_based`](#-apache--vhost--ip_based)
+* [`itk`](#-apache--vhost--itk)
+* [`action`](#-apache--vhost--action)
+* [`jk_mounts`](#-apache--vhost--jk_mounts)
+* [`http_protocol_options`](#-apache--vhost--http_protocol_options)
+* [`keepalive`](#-apache--vhost--keepalive)
+* [`keepalive_timeout`](#-apache--vhost--keepalive_timeout)
+* [`max_keepalive_requests`](#-apache--vhost--max_keepalive_requests)
+* [`auth_kerb`](#-apache--vhost--auth_kerb)
+* [`krb_method_negotiate`](#-apache--vhost--krb_method_negotiate)
+* [`krb_method_k5passwd`](#-apache--vhost--krb_method_k5passwd)
+* [`krb_authoritative`](#-apache--vhost--krb_authoritative)
+* [`krb_auth_realms`](#-apache--vhost--krb_auth_realms)
+* [`krb_5keytab`](#-apache--vhost--krb_5keytab)
+* [`krb_local_user_mapping`](#-apache--vhost--krb_local_user_mapping)
+* [`krb_verify_kdc`](#-apache--vhost--krb_verify_kdc)
+* [`krb_servicename`](#-apache--vhost--krb_servicename)
+* [`krb_save_credentials`](#-apache--vhost--krb_save_credentials)
+* [`logroot`](#-apache--vhost--logroot)
+* [`logroot_ensure`](#-apache--vhost--logroot_ensure)
+* [`logroot_mode`](#-apache--vhost--logroot_mode)
+* [`logroot_owner`](#-apache--vhost--logroot_owner)
+* [`logroot_group`](#-apache--vhost--logroot_group)
+* [`log_level`](#-apache--vhost--log_level)
+* [`modsec_body_limit`](#-apache--vhost--modsec_body_limit)
+* [`modsec_disable_vhost`](#-apache--vhost--modsec_disable_vhost)
+* [`modsec_disable_ids`](#-apache--vhost--modsec_disable_ids)
+* [`modsec_disable_ips`](#-apache--vhost--modsec_disable_ips)
+* [`modsec_disable_msgs`](#-apache--vhost--modsec_disable_msgs)
+* [`modsec_disable_tags`](#-apache--vhost--modsec_disable_tags)
+* [`modsec_audit_log_file`](#-apache--vhost--modsec_audit_log_file)
+* [`modsec_audit_log_pipe`](#-apache--vhost--modsec_audit_log_pipe)
+* [`modsec_audit_log`](#-apache--vhost--modsec_audit_log)
+* [`modsec_inbound_anomaly_threshold`](#-apache--vhost--modsec_inbound_anomaly_threshold)
+* [`modsec_outbound_anomaly_threshold`](#-apache--vhost--modsec_outbound_anomaly_threshold)
+* [`modsec_allowed_methods`](#-apache--vhost--modsec_allowed_methods)
+* [`no_proxy_uris`](#-apache--vhost--no_proxy_uris)
+* [`no_proxy_uris_match`](#-apache--vhost--no_proxy_uris_match)
+* [`proxy_preserve_host`](#-apache--vhost--proxy_preserve_host)
+* [`proxy_add_headers`](#-apache--vhost--proxy_add_headers)
+* [`proxy_error_override`](#-apache--vhost--proxy_error_override)
+* [`options`](#-apache--vhost--options)
+* [`override`](#-apache--vhost--override)
+* [`passenger_enabled`](#-apache--vhost--passenger_enabled)
+* [`passenger_base_uri`](#-apache--vhost--passenger_base_uri)
+* [`passenger_ruby`](#-apache--vhost--passenger_ruby)
+* [`passenger_python`](#-apache--vhost--passenger_python)
+* [`passenger_nodejs`](#-apache--vhost--passenger_nodejs)
+* [`passenger_meteor_app_settings`](#-apache--vhost--passenger_meteor_app_settings)
+* [`passenger_app_env`](#-apache--vhost--passenger_app_env)
+* [`passenger_app_root`](#-apache--vhost--passenger_app_root)
+* [`passenger_app_group_name`](#-apache--vhost--passenger_app_group_name)
+* [`passenger_app_start_command`](#-apache--vhost--passenger_app_start_command)
+* [`passenger_app_type`](#-apache--vhost--passenger_app_type)
+* [`passenger_startup_file`](#-apache--vhost--passenger_startup_file)
+* [`passenger_restart_dir`](#-apache--vhost--passenger_restart_dir)
+* [`passenger_spawn_method`](#-apache--vhost--passenger_spawn_method)
+* [`passenger_load_shell_envvars`](#-apache--vhost--passenger_load_shell_envvars)
+* [`passenger_preload_bundler`](#-apache--vhost--passenger_preload_bundler)
+* [`passenger_rolling_restarts`](#-apache--vhost--passenger_rolling_restarts)
+* [`passenger_resist_deployment_errors`](#-apache--vhost--passenger_resist_deployment_errors)
+* [`passenger_user`](#-apache--vhost--passenger_user)
+* [`passenger_group`](#-apache--vhost--passenger_group)
+* [`passenger_friendly_error_pages`](#-apache--vhost--passenger_friendly_error_pages)
+* [`passenger_min_instances`](#-apache--vhost--passenger_min_instances)
+* [`passenger_max_instances`](#-apache--vhost--passenger_max_instances)
+* [`passenger_max_preloader_idle_time`](#-apache--vhost--passenger_max_preloader_idle_time)
+* [`passenger_force_max_concurrent_requests_per_process`](#-apache--vhost--passenger_force_max_concurrent_requests_per_process)
+* [`passenger_start_timeout`](#-apache--vhost--passenger_start_timeout)
+* [`passenger_concurrency_model`](#-apache--vhost--passenger_concurrency_model)
+* [`passenger_thread_count`](#-apache--vhost--passenger_thread_count)
+* [`passenger_max_requests`](#-apache--vhost--passenger_max_requests)
+* [`passenger_max_request_time`](#-apache--vhost--passenger_max_request_time)
+* [`passenger_memory_limit`](#-apache--vhost--passenger_memory_limit)
+* [`passenger_stat_throttle_rate`](#-apache--vhost--passenger_stat_throttle_rate)
+* [`passenger_pre_start`](#-apache--vhost--passenger_pre_start)
+* [`passenger_high_performance`](#-apache--vhost--passenger_high_performance)
+* [`passenger_buffer_upload`](#-apache--vhost--passenger_buffer_upload)
+* [`passenger_buffer_response`](#-apache--vhost--passenger_buffer_response)
+* [`passenger_error_override`](#-apache--vhost--passenger_error_override)
+* [`passenger_max_request_queue_size`](#-apache--vhost--passenger_max_request_queue_size)
+* [`passenger_max_request_queue_time`](#-apache--vhost--passenger_max_request_queue_time)
+* [`passenger_sticky_sessions`](#-apache--vhost--passenger_sticky_sessions)
+* [`passenger_sticky_sessions_cookie_name`](#-apache--vhost--passenger_sticky_sessions_cookie_name)
+* [`passenger_sticky_sessions_cookie_attributes`](#-apache--vhost--passenger_sticky_sessions_cookie_attributes)
+* [`passenger_allow_encoded_slashes`](#-apache--vhost--passenger_allow_encoded_slashes)
+* [`passenger_app_log_file`](#-apache--vhost--passenger_app_log_file)
+* [`passenger_debugger`](#-apache--vhost--passenger_debugger)
+* [`passenger_lve_min_uid`](#-apache--vhost--passenger_lve_min_uid)
+* [`php_values`](#-apache--vhost--php_values)
+* [`php_flags`](#-apache--vhost--php_flags)
+* [`php_admin_values`](#-apache--vhost--php_admin_values)
+* [`php_admin_flags`](#-apache--vhost--php_admin_flags)
+* [`port`](#-apache--vhost--port)
+* [`priority`](#-apache--vhost--priority)
+* [`protocols`](#-apache--vhost--protocols)
+* [`protocols_honor_order`](#-apache--vhost--protocols_honor_order)
+* [`proxy_dest`](#-apache--vhost--proxy_dest)
+* [`proxy_pass`](#-apache--vhost--proxy_pass)
+* [`proxy_dest_match`](#-apache--vhost--proxy_dest_match)
+* [`proxy_dest_reverse_match`](#-apache--vhost--proxy_dest_reverse_match)
+* [`proxy_pass_match`](#-apache--vhost--proxy_pass_match)
+* [`redirect_dest`](#-apache--vhost--redirect_dest)
+* [`redirect_source`](#-apache--vhost--redirect_source)
+* [`redirect_status`](#-apache--vhost--redirect_status)
+* [`redirectmatch_regexp`](#-apache--vhost--redirectmatch_regexp)
+* [`redirectmatch_status`](#-apache--vhost--redirectmatch_status)
+* [`redirectmatch_dest`](#-apache--vhost--redirectmatch_dest)
+* [`request_headers`](#-apache--vhost--request_headers)
+* [`rewrites`](#-apache--vhost--rewrites)
+* [`rewrite_base`](#-apache--vhost--rewrite_base)
+* [`rewrite_rule`](#-apache--vhost--rewrite_rule)
+* [`rewrite_cond`](#-apache--vhost--rewrite_cond)
+* [`rewrite_inherit`](#-apache--vhost--rewrite_inherit)
+* [`scriptalias`](#-apache--vhost--scriptalias)
+* [`scriptaliases`](#-apache--vhost--scriptaliases)
+* [`serveradmin`](#-apache--vhost--serveradmin)
+* [`serveraliases`](#-apache--vhost--serveraliases)
+* [`servername`](#-apache--vhost--servername)
+* [`setenv`](#-apache--vhost--setenv)
+* [`setenvif`](#-apache--vhost--setenvif)
+* [`setenvifnocase`](#-apache--vhost--setenvifnocase)
+* [`suexec_user_group`](#-apache--vhost--suexec_user_group)
+* [`vhost_name`](#-apache--vhost--vhost_name)
+* [`virtual_docroot`](#-apache--vhost--virtual_docroot)
+* [`virtual_use_default_docroot`](#-apache--vhost--virtual_use_default_docroot)
+* [`wsgi_daemon_process`](#-apache--vhost--wsgi_daemon_process)
+* [`wsgi_daemon_process_options`](#-apache--vhost--wsgi_daemon_process_options)
+* [`wsgi_application_group`](#-apache--vhost--wsgi_application_group)
+* [`wsgi_import_script`](#-apache--vhost--wsgi_import_script)
+* [`wsgi_import_script_options`](#-apache--vhost--wsgi_import_script_options)
+* [`wsgi_chunked_request`](#-apache--vhost--wsgi_chunked_request)
+* [`wsgi_process_group`](#-apache--vhost--wsgi_process_group)
+* [`wsgi_script_aliases`](#-apache--vhost--wsgi_script_aliases)
+* [`wsgi_script_aliases_match`](#-apache--vhost--wsgi_script_aliases_match)
+* [`wsgi_pass_authorization`](#-apache--vhost--wsgi_pass_authorization)
+* [`directories`](#-apache--vhost--directories)
+* [`custom_fragment`](#-apache--vhost--custom_fragment)
+* [`headers`](#-apache--vhost--headers)
+* [`shib_compat_valid_user`](#-apache--vhost--shib_compat_valid_user)
+* [`ssl_options`](#-apache--vhost--ssl_options)
+* [`additional_includes`](#-apache--vhost--additional_includes)
+* [`ssl`](#-apache--vhost--ssl)
+* [`ssl_ca`](#-apache--vhost--ssl_ca)
+* [`ssl_cert`](#-apache--vhost--ssl_cert)
+* [`ssl_protocol`](#-apache--vhost--ssl_protocol)
+* [`ssl_cipher`](#-apache--vhost--ssl_cipher)
+* [`ssl_honorcipherorder`](#-apache--vhost--ssl_honorcipherorder)
+* [`ssl_certs_dir`](#-apache--vhost--ssl_certs_dir)
+* [`ssl_chain`](#-apache--vhost--ssl_chain)
+* [`ssl_crl`](#-apache--vhost--ssl_crl)
+* [`ssl_crl_path`](#-apache--vhost--ssl_crl_path)
+* [`ssl_crl_check`](#-apache--vhost--ssl_crl_check)
+* [`ssl_key`](#-apache--vhost--ssl_key)
+* [`ssl_verify_client`](#-apache--vhost--ssl_verify_client)
+* [`ssl_verify_depth`](#-apache--vhost--ssl_verify_depth)
+* [`ssl_proxy_protocol`](#-apache--vhost--ssl_proxy_protocol)
+* [`ssl_proxy_verify`](#-apache--vhost--ssl_proxy_verify)
+* [`ssl_proxy_verify_depth`](#-apache--vhost--ssl_proxy_verify_depth)
+* [`ssl_proxy_cipher_suite`](#-apache--vhost--ssl_proxy_cipher_suite)
+* [`ssl_proxy_ca_cert`](#-apache--vhost--ssl_proxy_ca_cert)
+* [`ssl_proxy_machine_cert`](#-apache--vhost--ssl_proxy_machine_cert)
+* [`ssl_proxy_machine_cert_chain`](#-apache--vhost--ssl_proxy_machine_cert_chain)
+* [`ssl_proxy_check_peer_cn`](#-apache--vhost--ssl_proxy_check_peer_cn)
+* [`ssl_proxy_check_peer_name`](#-apache--vhost--ssl_proxy_check_peer_name)
+* [`ssl_proxy_check_peer_expire`](#-apache--vhost--ssl_proxy_check_peer_expire)
+* [`ssl_openssl_conf_cmd`](#-apache--vhost--ssl_openssl_conf_cmd)
+* [`ssl_proxyengine`](#-apache--vhost--ssl_proxyengine)
+* [`ssl_stapling`](#-apache--vhost--ssl_stapling)
+* [`ssl_stapling_timeout`](#-apache--vhost--ssl_stapling_timeout)
+* [`ssl_stapling_return_errors`](#-apache--vhost--ssl_stapling_return_errors)
+* [`ssl_user_name`](#-apache--vhost--ssl_user_name)
+* [`ssl_reload_on_change`](#-apache--vhost--ssl_reload_on_change)
+* [`use_canonical_name`](#-apache--vhost--use_canonical_name)
+* [`define`](#-apache--vhost--define)
+* [`auth_oidc`](#-apache--vhost--auth_oidc)
+* [`oidc_settings`](#-apache--vhost--oidc_settings)
+* [`limitreqfields`](#-apache--vhost--limitreqfields)
+* [`limitreqfieldsize`](#-apache--vhost--limitreqfieldsize)
+* [`limitreqline`](#-apache--vhost--limitreqline)
+* [`limitreqbody`](#-apache--vhost--limitreqbody)
+* [`use_servername_for_filenames`](#-apache--vhost--use_servername_for_filenames)
+* [`use_port_for_filenames`](#-apache--vhost--use_port_for_filenames)
+* [`mdomain`](#-apache--vhost--mdomain)
+* [`proxy_requests`](#-apache--vhost--proxy_requests)
+* [`userdir`](#-apache--vhost--userdir)
+
+##### <a name="-apache--vhost--access_log"></a>`access_log`
 
 Data type: `Boolean`
 
 Determines whether to configure `*_access.log` directives (`*_file`, `*_pipe`, or `*_syslog`).
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="access_log_env_var"></a>`access_log_env_var`
+##### <a name="-apache--vhost--access_log_env_var"></a>`access_log_env_var`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
 Specifies that only requests with particular environment variables be logged.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_log_file"></a>`access_log_file`
+##### <a name="-apache--vhost--access_log_file"></a>`access_log_file`
 
 Data type: `Optional[String[1]]`
 
@@ -7940,52 +7879,52 @@ instance, example.com--- it defaults to 'example.com_ssl.log' for
 [SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
 `example.com_access.log` for unencrypted virtual hosts.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_log_format"></a>`access_log_format`
+##### <a name="-apache--vhost--access_log_format"></a>`access_log_format`
 
 Data type: `Optional[String[1]]`
 
 Specifies the use of either a `LogFormat` nickname or a custom-formatted string for the
 access log.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_log_pipe"></a>`access_log_pipe`
+##### <a name="-apache--vhost--access_log_pipe"></a>`access_log_pipe`
 
 Data type: `Optional[String[1]]`
 
 Specifies a pipe where Apache sends access log messages.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_log_syslog"></a>`access_log_syslog`
+##### <a name="-apache--vhost--access_log_syslog"></a>`access_log_syslog`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
 Sends all access log messages to syslog.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="access_logs"></a>`access_logs`
+##### <a name="-apache--vhost--access_logs"></a>`access_logs`
 
 Data type: `Optional[Array[Hash]]`
 
 Allows you to give a hash that specifies the state of each of the `access_log_*`
 directives shown above, i.e. `access_log_pipe` and `access_log_syslog`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="add_default_charset"></a>`add_default_charset`
+##### <a name="-apache--vhost--add_default_charset"></a>`add_default_charset`
 
 Data type: `Optional[String]`
 
 Sets a default media charset value for the `AddDefaultCharset` directive, which is
 added to `text/plain` and `text/html` responses.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="add_listen"></a>`add_listen`
+##### <a name="-apache--vhost--add_listen"></a>`add_listen`
 
 Data type: `Boolean`
 
@@ -7994,9 +7933,9 @@ Setting `add_listen` to `false` prevents the virtual host from creating a `Liste
 statement. This is important when combining virtual hosts that aren't passed an `ip`
 parameter with those that are.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="use_optional_includes"></a>`use_optional_includes`
+##### <a name="-apache--vhost--use_optional_includes"></a>`use_optional_includes`
 
 Data type: `Boolean`
 
@@ -8005,7 +7944,7 @@ Specifies whether Apache uses the `IncludeOptional` directive instead of `Includ
 
 Default value: `$apache::use_optional_includes`
 
-##### <a name="aliases"></a>`aliases`
+##### <a name="-apache--vhost--aliases"></a>`aliases`
 
 Data type: `Array[Hash[String[1], String[1]]]`
 
@@ -8048,7 +7987,7 @@ directive might not be able to honor the `PassengerEnabled => off` statement. Se
 
 Default value: `[]`
 
-##### <a name="allow_encoded_slashes"></a>`allow_encoded_slashes`
+##### <a name="-apache--vhost--allow_encoded_slashes"></a>`allow_encoded_slashes`
 
 Data type: `Optional[Variant[Apache::OnOff, Enum['nodecode']]]`
 
@@ -8057,9 +7996,9 @@ default. This modifies the virtual host responses to URLs with `\` and `/` chara
 default setting omits the declaration from the server configuration and selects the
 Apache default setting of `Off`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="block"></a>`block`
+##### <a name="-apache--vhost--block"></a>`block`
 
 Data type: `Variant[Array[String], String]`
 
@@ -8068,83 +8007,83 @@ blocks web access to `.svn`), `.git`, and `.bzr` directories.
 
 Default value: `[]`
 
-##### <a name="cas_attribute_prefix"></a>`cas_attribute_prefix`
+##### <a name="-apache--vhost--cas_attribute_prefix"></a>`cas_attribute_prefix`
 
 Data type: `Optional[String]`
 
 Adds a header with the value of this header being the attribute values when SAML
 validation is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_attribute_delimiter"></a>`cas_attribute_delimiter`
+##### <a name="-apache--vhost--cas_attribute_delimiter"></a>`cas_attribute_delimiter`
 
 Data type: `Optional[String]`
 
 Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_login_url"></a>`cas_login_url`
+##### <a name="-apache--vhost--cas_login_url"></a>`cas_login_url`
 
 Data type: `Optional[String]`
 
 Sets the URL to which the module redirects users when they attempt to access a
 CAS-protected resource and don't have an active session.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_root_proxied_as"></a>`cas_root_proxied_as`
+##### <a name="-apache--vhost--cas_root_proxied_as"></a>`cas_root_proxied_as`
 
 Data type: `Optional[String]`
 
 Sets the URL end users see when access to this Apache server is proxied per vhost.
 This URL should not include a trailing slash.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_scrub_request_headers"></a>`cas_scrub_request_headers`
+##### <a name="-apache--vhost--cas_scrub_request_headers"></a>`cas_scrub_request_headers`
 
 Data type: `Boolean`
 
 Remove inbound request headers that may have special meaning within mod_auth_cas.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="cas_sso_enabled"></a>`cas_sso_enabled`
+##### <a name="-apache--vhost--cas_sso_enabled"></a>`cas_sso_enabled`
 
 Data type: `Boolean`
 
 Enables experimental support for single sign out (may mangle POST data).
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="cas_validate_saml"></a>`cas_validate_saml`
+##### <a name="-apache--vhost--cas_validate_saml"></a>`cas_validate_saml`
 
 Data type: `Boolean`
 
 Parse response from CAS server for SAML.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="cas_validate_url"></a>`cas_validate_url`
+##### <a name="-apache--vhost--cas_validate_url"></a>`cas_validate_url`
 
 Data type: `Optional[String]`
 
 Sets the URL to use when validating a client-presented ticket in an HTTP query string.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="cas_cookie_path"></a>`cas_cookie_path`
+##### <a name="-apache--vhost--cas_cookie_path"></a>`cas_cookie_path`
 
 Data type: `Optional[String]`
 
 Sets the location where information on the current session should be stored. This should
 be writable by the web server only.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="comment"></a>`comment`
+##### <a name="-apache--vhost--comment"></a>`comment`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
@@ -8161,18 +8100,18 @@ comment => [
 ]
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="default_vhost"></a>`default_vhost`
+##### <a name="-apache--vhost--default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
 
 Sets a given `apache::vhost` defined type as the default to serve requests that do not
 match any other `apache::vhost` defined types.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="directoryindex"></a>`directoryindex`
+##### <a name="-apache--vhost--directoryindex"></a>`directoryindex`
 
 Data type: `Optional[String]`
 
@@ -8180,9 +8119,9 @@ Sets the list of resources to look for when a client requests an index of the di
 by specifying a '/' at the end of the directory name. See the `DirectoryIndex` directive
 documentation for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="docroot"></a>`docroot`
+##### <a name="-apache--vhost--docroot"></a>`docroot`
 
 Data type: `Variant[Stdlib::Absolutepath, Boolean]`
 
@@ -8191,7 +8130,7 @@ Sets the `DocumentRoot` location, from which Apache serves files.<br />
 If `docroot` and `manage_docroot` are both set to `false`, no `DocumentRoot` will be set
 and the accompanying `<Directory /path/to/directory>` block will not be created.
 
-##### <a name="docroot_group"></a>`docroot_group`
+##### <a name="-apache--vhost--docroot_group"></a>`docroot_group`
 
 Data type: `String`
 
@@ -8199,7 +8138,7 @@ Sets group access to the `docroot` directory.
 
 Default value: `$apache::params::root_group`
 
-##### <a name="docroot_owner"></a>`docroot_owner`
+##### <a name="-apache--vhost--docroot_owner"></a>`docroot_owner`
 
 Data type: `String`
 
@@ -8207,31 +8146,31 @@ Sets individual user access to the `docroot` directory.
 
 Default value: `'root'`
 
-##### <a name="docroot_mode"></a>`docroot_mode`
+##### <a name="-apache--vhost--docroot_mode"></a>`docroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
 Sets access permissions for the `docroot` directory, in numeric notation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="manage_docroot"></a>`manage_docroot`
+##### <a name="-apache--vhost--manage_docroot"></a>`manage_docroot`
 
 Data type: `Boolean`
 
 Determines whether Puppet manages the `docroot` directory.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="error_log"></a>`error_log`
+##### <a name="-apache--vhost--error_log"></a>`error_log`
 
 Data type: `Boolean`
 
 Specifies whether `*_error.log` directives should be configured.
 
-Default value: ``true``
+Default value: `true`
 
-##### <a name="error_log_file"></a>`error_log_file`
+##### <a name="-apache--vhost--error_log_file"></a>`error_log_file`
 
 Data type: `Optional[String]`
 
@@ -8241,9 +8180,9 @@ If none of these parameters is set, given a virtual host `example.com`, Puppet d
 to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and
 `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="error_log_pipe"></a>`error_log_pipe`
+##### <a name="-apache--vhost--error_log_pipe"></a>`error_log_pipe`
 
 Data type: `Optional[String]`
 
@@ -8251,9 +8190,9 @@ Specifies a pipe to send error log messages to.<br />
 This parameter has no effect if the `error_log_file` parameter has a value. If neither
 this parameter nor `error_log_file` has a value, Puppet then checks `error_log_syslog`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="error_log_syslog"></a>`error_log_syslog`
+##### <a name="-apache--vhost--error_log_syslog"></a>`error_log_syslog`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -8263,18 +8202,22 @@ parameters has a value. If none of these parameters has a value, given a virtual
 `example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual
 hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
 
-Default value: ``undef``
+Default value: `undef`
+
+##### <a name="-apache--vhost--error_log_format"></a>`error_log_format`
 
-##### <a name="error_log_format"></a>`error_log_format`
+Data type:
 
-Data type: `Optional[
+```puppet
+Optional[
     Array[
       Variant[
         String,
         Hash[String, Enum['connection', 'request']]
       ]
     ]
-  ]`
+  ]
+```
 
 Sets the [ErrorLogFormat](https://httpd.apache.org/docs/current/mod/core.html#errorlogformat)
 format specification for error log entries inside virtual host
@@ -8292,9 +8235,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="error_documents"></a>`error_documents`
+##### <a name="-apache--vhost--error_documents"></a>`error_documents`
 
 Data type: `Variant[Array[Hash], String]`
 
@@ -8313,7 +8256,7 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="ensure"></a>`ensure`
+##### <a name="-apache--vhost--ensure"></a>`ensure`
 
 Data type: `Enum['absent', 'present']`
 
@@ -8321,7 +8264,7 @@ Specifies if the virtual host is present or absent.<br />
 
 Default value: `'present'`
 
-##### <a name="fallbackresource"></a>`fallbackresource`
+##### <a name="-apache--vhost--fallbackresource"></a>`fallbackresource`
 
 Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
 
@@ -8330,9 +8273,9 @@ directive, which specifies an action to take for any URL that doesn't map to any
 your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin
 with a `/` or be `disabled`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="filters"></a>`filters`
+##### <a name="-apache--vhost--filters"></a>`filters`
 
 Data type: `Array[String[1]]`
 
@@ -8351,25 +8294,25 @@ apache::vhost { "$::fqdn":
 
 Default value: `[]`
 
-##### <a name="h2_copy_files"></a>`h2_copy_files`
+##### <a name="-apache--vhost--h2_copy_files"></a>`h2_copy_files`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2CopyFiles](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2copyfiles)
 directive which influences how the requestion process pass files to the main connection.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_direct"></a>`h2_direct`
+##### <a name="-apache--vhost--h2_direct"></a>`h2_direct`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2Direct](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2direct)
 directive which toggles the usage of the HTTP/2 Direct Mode.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_early_hints"></a>`h2_early_hints`
+##### <a name="-apache--vhost--h2_early_hints"></a>`h2_early_hints`
 
 Data type: `Optional[Boolean]`
 
@@ -8377,9 +8320,9 @@ Sets the [H2EarlyHints](https://httpd.apache.org/docs/current/mod/mod_http2.html
 directive which controls if HTTP status 103 interim responses are forwarded to
 the client or not.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_max_session_streams"></a>`h2_max_session_streams`
+##### <a name="-apache--vhost--h2_max_session_streams"></a>`h2_max_session_streams`
 
 Data type: `Optional[Integer]`
 
@@ -8387,27 +8330,27 @@ Sets the [H2MaxSessionStreams](https://httpd.apache.org/docs/current/mod/mod_htt
 directive which sets the maximum number of active streams per HTTP/2 session
 that the server allows.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_modern_tls_only"></a>`h2_modern_tls_only`
+##### <a name="-apache--vhost--h2_modern_tls_only"></a>`h2_modern_tls_only`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2ModernTLSOnly](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2moderntlsonly)
 directive which toggles the security checks on HTTP/2 connections in TLS mode.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push"></a>`h2_push`
+##### <a name="-apache--vhost--h2_push"></a>`h2_push`
 
 Data type: `Optional[Boolean]`
 
 Sets the [H2Push](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2push)
 directive which toggles the usage of the HTTP/2 server push protocol feature.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push_diary_size"></a>`h2_push_diary_size`
+##### <a name="-apache--vhost--h2_push_diary_size"></a>`h2_push_diary_size`
 
 Data type: `Optional[Integer]`
 
@@ -8415,9 +8358,9 @@ Sets the [H2PushDiarySize](https://httpd.apache.org/docs/current/mod/mod_http2.h
 directive which toggles the maximum number of HTTP/2 server pushes that are
 remembered per HTTP/2 connection.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_push_priority"></a>`h2_push_priority`
+##### <a name="-apache--vhost--h2_push_priority"></a>`h2_push_priority`
 
 Data type: `Array[String]`
 
@@ -8427,7 +8370,7 @@ content-type of the response.
 
 Default value: `[]`
 
-##### <a name="h2_push_resource"></a>`h2_push_resource`
+##### <a name="-apache--vhost--h2_push_resource"></a>`h2_push_resource`
 
 Data type: `Array[String]`
 
@@ -8436,7 +8379,7 @@ directive which declares resources for early pushing to the client.
 
 Default value: `[]`
 
-##### <a name="h2_serialize_headers"></a>`h2_serialize_headers`
+##### <a name="-apache--vhost--h2_serialize_headers"></a>`h2_serialize_headers`
 
 Data type: `Optional[Boolean]`
 
@@ -8444,9 +8387,9 @@ Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http
 directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
 format for processing by httpd core.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
+##### <a name="-apache--vhost--h2_stream_max_mem_size"></a>`h2_stream_max_mem_size`
 
 Data type: `Optional[Integer]`
 
@@ -8454,9 +8397,9 @@ Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http
 directive which sets the maximum number of outgoing data bytes buffered in
 memory for an active stream.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
+##### <a name="-apache--vhost--h2_tls_cool_down_secs"></a>`h2_tls_cool_down_secs`
 
 Data type: `Optional[Integer]`
 
@@ -8464,9 +8407,9 @@ Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2
 directive which sets the number of seconds of idle time on a TLS connection
 before the TLS write size falls back to a small (~1300 bytes) length.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
+##### <a name="-apache--vhost--h2_tls_warm_up_size"></a>`h2_tls_warm_up_size`
 
 Data type: `Optional[Integer]`
 
@@ -8474,9 +8417,9 @@ Sets the [H2TLSWarmUpSize](https://httpd.apache.org/docs/current/mod/mod_http2.h
 directive which sets the number of bytes to be sent in small TLS records (~1300
 bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_upgrade"></a>`h2_upgrade`
+##### <a name="-apache--vhost--h2_upgrade"></a>`h2_upgrade`
 
 Data type: `Optional[Boolean]`
 
@@ -8484,9 +8427,9 @@ Sets the [H2Upgrade](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2
 directive which toggles the usage of the HTTP/1.1 Upgrade method for switching
 to HTTP/2.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="h2_window_size"></a>`h2_window_size`
+##### <a name="-apache--vhost--h2_window_size"></a>`h2_window_size`
 
 Data type: `Optional[Integer]`
 
@@ -8494,23 +8437,27 @@ Sets the [H2WindowSize](https://httpd.apache.org/docs/current/mod/mod_http2.html
 directive which sets the size of the window that is used for flow control from
 client to server and limits the amount of data the server has to buffer.
 
-Default value: ``undef``
+Default value: `undef`
+
+##### <a name="-apache--vhost--ip"></a>`ip`
 
-##### <a name="ip"></a>`ip`
+Data type:
 
-Data type: `Optional[
+```puppet
+Optional[
     Variant[
       Array[Variant[Stdlib::IP::Address, Enum['*']]],
       Variant[Stdlib::IP::Address, Enum['*']]
     ]
-  ]`
+  ]
+```
 
 Sets the IP address the virtual host listens on. By default, uses Apache's default behavior
 of listening on all IPs.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ip_based"></a>`ip_based`
+##### <a name="-apache--vhost--ip_based"></a>`ip_based`
 
 Data type: `Boolean`
 
@@ -8518,9 +8465,9 @@ Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html
 host. This parameter inhibits the creation of a NameVirtualHost directive, since those are
 used to funnel requests to name-based virtual hosts.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="itk"></a>`itk`
+##### <a name="-apache--vhost--itk"></a>`itk`
 
 Data type: `Optional[Hash]`
 
@@ -8544,18 +8491,18 @@ Valid values are: a hash, which can include the keys:
 * `limituidrange` (Linux 3.5.0 or newer)
 * `limitgidrange` (Linux 3.5.0 or newer)
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="action"></a>`action`
+##### <a name="-apache--vhost--action"></a>`action`
 
 Data type: `Optional[String]`
 
 Specifies whether you wish to configure mod_actions action directive which will
 activate cgi-script when triggered by a request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="jk_mounts"></a>`jk_mounts`
+##### <a name="-apache--vhost--jk_mounts"></a>`jk_mounts`
 
 Data type: `Array[Hash]`
 
@@ -8575,15 +8522,15 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="http_protocol_options"></a>`http_protocol_options`
+##### <a name="-apache--vhost--http_protocol_options"></a>`http_protocol_options`
 
 Data type: `Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]]`
 
 Specifies the strictness of HTTP protocol checks.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="keepalive"></a>`keepalive`
+##### <a name="-apache--vhost--keepalive"></a>`keepalive`
 
 Data type: `Optional[Apache::OnOff]`
 
@@ -8592,9 +8539,9 @@ for the virtual host. By default, the global, server-wide `KeepAlive` setting is
 Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options
 for the virtual host.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="keepalive_timeout"></a>`keepalive_timeout`
+##### <a name="-apache--vhost--keepalive_timeout"></a>`keepalive_timeout`
 
 Data type: `Optional[Variant[Integer, String]]`
 
@@ -8604,9 +8551,9 @@ global, server-wide `KeepAlive` setting is in effect.<br />
 This parameter is only relevant if either the global, server-wide `keepalive` parameter or
 the per-vhost `keepalive` parameter is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="max_keepalive_requests"></a>`max_keepalive_requests`
+##### <a name="-apache--vhost--max_keepalive_requests"></a>`max_keepalive_requests`
 
 Data type: `Optional[Variant[Integer, String]]`
 
@@ -8615,9 +8562,9 @@ the global, server-wide `KeepAlive` setting is in effect.<br />
 This parameter is only relevant if either the global, server-wide `keepalive` parameter or
 the per-vhost `keepalive` parameter is enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="auth_kerb"></a>`auth_kerb`
+##### <a name="-apache--vhost--auth_kerb"></a>`auth_kerb`
 
 Data type: `Boolean`
 
@@ -8640,9 +8587,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="krb_method_negotiate"></a>`krb_method_negotiate`
+##### <a name="-apache--vhost--krb_method_negotiate"></a>`krb_method_negotiate`
 
 Data type: `Apache::OnOff`
 
@@ -8650,7 +8597,7 @@ Determines whether to use the Negotiate method.
 
 Default value: `'on'`
 
-##### <a name="krb_method_k5passwd"></a>`krb_method_k5passwd`
+##### <a name="-apache--vhost--krb_method_k5passwd"></a>`krb_method_k5passwd`
 
 Data type: `Apache::OnOff`
 
@@ -8658,7 +8605,7 @@ Determines whether to use password-based authentication for Kerberos v5.
 
 Default value: `'on'`
 
-##### <a name="krb_authoritative"></a>`krb_authoritative`
+##### <a name="-apache--vhost--krb_authoritative"></a>`krb_authoritative`
 
 Data type: `Apache::OnOff`
 
@@ -8666,7 +8613,7 @@ If set to `off`, authentication controls can be passed on to another module.
 
 Default value: `'on'`
 
-##### <a name="krb_auth_realms"></a>`krb_auth_realms`
+##### <a name="-apache--vhost--krb_auth_realms"></a>`krb_auth_realms`
 
 Data type: `Array[String]`
 
@@ -8674,23 +8621,23 @@ Specifies an array of Kerberos realms to use for authentication.
 
 Default value: `[]`
 
-##### <a name="krb_5keytab"></a>`krb_5keytab`
+##### <a name="-apache--vhost--krb_5keytab"></a>`krb_5keytab`
 
 Data type: `Optional[String]`
 
 Specifies the Kerberos v5 keytab file's location.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="krb_local_user_mapping"></a>`krb_local_user_mapping`
+##### <a name="-apache--vhost--krb_local_user_mapping"></a>`krb_local_user_mapping`
 
 Data type: `Optional[Apache::OnOff]`
 
 Strips @REALM from usernames for further use.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="krb_verify_kdc"></a>`krb_verify_kdc`
+##### <a name="-apache--vhost--krb_verify_kdc"></a>`krb_verify_kdc`
 
 Data type: `Apache::OnOff`
 
@@ -8699,7 +8646,7 @@ KDC spoofing attacks.
 
 Default value: `'on'`
 
-##### <a name="krb_servicename"></a>`krb_servicename`
+##### <a name="-apache--vhost--krb_servicename"></a>`krb_servicename`
 
 Data type: `String`
 
@@ -8708,7 +8655,7 @@ key of this name must be stored in the keytab.
 
 Default value: `'HTTP'`
 
-##### <a name="krb_save_credentials"></a>`krb_save_credentials`
+##### <a name="-apache--vhost--krb_save_credentials"></a>`krb_save_credentials`
 
 Data type: `Apache::OnOff`
 
@@ -8716,7 +8663,7 @@ This option enables credential saving functionality.
 
 Default value: `'off'`
 
-##### <a name="logroot"></a>`logroot`
+##### <a name="-apache--vhost--logroot"></a>`logroot`
 
 Data type: `Stdlib::Absolutepath`
 
@@ -8724,7 +8671,7 @@ Specifies the location of the virtual host's logfiles.
 
 Default value: `$apache::logroot`
 
-##### <a name="logroot_ensure"></a>`logroot_ensure`
+##### <a name="-apache--vhost--logroot_ensure"></a>`logroot_ensure`
 
 Data type: `Enum['directory', 'absent']`
 
@@ -8732,7 +8679,7 @@ Determines whether or not to remove the logroot directory for a virtual host.
 
 Default value: `'directory'`
 
-##### <a name="logroot_mode"></a>`logroot_mode`
+##### <a name="-apache--vhost--logroot_mode"></a>`logroot_mode`
 
 Data type: `Optional[Stdlib::Filemode]`
 
@@ -8740,49 +8687,49 @@ Overrides the mode the logroot directory is set to. Do *not* grant write access
 directory the logs are stored in without being aware of the consequences; for more
 information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="logroot_owner"></a>`logroot_owner`
+##### <a name="-apache--vhost--logroot_owner"></a>`logroot_owner`
 
 Data type: `Optional[String]`
 
 Sets individual user access to the logroot directory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="logroot_group"></a>`logroot_group`
+##### <a name="-apache--vhost--logroot_group"></a>`logroot_group`
 
 Data type: `Optional[String]`
 
 Sets group access to the `logroot` directory.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="log_level"></a>`log_level`
+##### <a name="-apache--vhost--log_level"></a>`log_level`
 
 Data type: `Optional[Apache::LogLevel]`
 
 Specifies the verbosity of the error log.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_body_limit"></a>`modsec_body_limit`
+##### <a name="-apache--vhost--modsec_body_limit"></a>`modsec_body_limit`
 
 Data type: `Optional[String]`
 
 Configures the maximum request body size (in bytes) ModSecurity accepts for buffering.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_disable_vhost"></a>`modsec_disable_vhost`
+##### <a name="-apache--vhost--modsec_disable_vhost"></a>`modsec_disable_vhost`
 
 Data type: `Boolean`
 
 Disables `mod_security` on a virtual host. Only valid if `apache::mod::security` is included.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="modsec_disable_ids"></a>`modsec_disable_ids`
+##### <a name="-apache--vhost--modsec_disable_ids"></a>`modsec_disable_ids`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8800,9 +8747,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_disable_ips"></a>`modsec_disable_ips`
+##### <a name="-apache--vhost--modsec_disable_ips"></a>`modsec_disable_ips`
 
 Data type: `Array[String[1]]`
 
@@ -8810,7 +8757,7 @@ Specifies an array of IP addresses to exclude from `mod_security` rule matching.
 
 Default value: `[]`
 
-##### <a name="modsec_disable_msgs"></a>`modsec_disable_msgs`
+##### <a name="-apache--vhost--modsec_disable_msgs"></a>`modsec_disable_msgs`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8827,9 +8774,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_disable_tags"></a>`modsec_disable_tags`
+##### <a name="-apache--vhost--modsec_disable_tags"></a>`modsec_disable_tags`
 
 Data type: `Optional[Variant[Hash, Array]]`
 
@@ -8846,9 +8793,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_audit_log_file"></a>`modsec_audit_log_file`
+##### <a name="-apache--vhost--modsec_audit_log_file"></a>`modsec_audit_log_file`
 
 Data type: `Optional[String]`
 
@@ -8858,9 +8805,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
+##### <a name="-apache--vhost--modsec_audit_log_pipe"></a>`modsec_audit_log_pipe`
 
 Data type: `Optional[String]`
 
@@ -8871,9 +8818,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_audit_log"></a>`modsec_audit_log`
+##### <a name="-apache--vhost--modsec_audit_log"></a>`modsec_audit_log`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -8885,9 +8832,9 @@ log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manu
 If none of those parameters are set, the global audit log is used
 (`/var/log/httpd/modsec\_audit.log`; Debian and derivatives: `/var/log/apache2/modsec\_audit.log`; others: ).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_inbound_anomaly_threshold"></a>`modsec_inbound_anomaly_threshold`
+##### <a name="-apache--vhost--modsec_inbound_anomaly_threshold"></a>`modsec_inbound_anomaly_threshold`
 
 Data type: `Optional[Integer[1, default]]`
 
@@ -8895,9 +8842,9 @@ Override the global scoring threshold level of the inbound blocking rules
 for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
 Set.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_outbound_anomaly_threshold"></a>`modsec_outbound_anomaly_threshold`
+##### <a name="-apache--vhost--modsec_outbound_anomaly_threshold"></a>`modsec_outbound_anomaly_threshold`
 
 Data type: `Optional[Integer[1, default]]`
 
@@ -8905,17 +8852,17 @@ Override the global scoring threshold level of the outbound blocking rules
 for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule
 Set.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="modsec_allowed_methods"></a>`modsec_allowed_methods`
+##### <a name="-apache--vhost--modsec_allowed_methods"></a>`modsec_allowed_methods`
 
 Data type: `Optional[String]`
 
 Override global allowed methods. A space-separated list of allowed HTTP methods.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="-apache--vhost--no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Variant[Array[String], String]`
 
@@ -8924,7 +8871,7 @@ with [`proxy_dest`](#proxy_dest).
 
 Default value: `[]`
 
-##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="-apache--vhost--no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Variant[Array[String], String]`
 
@@ -8932,7 +8879,7 @@ This directive is equivalent to `no_proxy_uris`, but takes regular expressions.
 
 Default value: `[]`
 
-##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
+##### <a name="-apache--vhost--proxy_preserve_host"></a>`proxy_preserve_host`
 
 Data type: `Boolean`
 
@@ -8940,9 +8887,9 @@ Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod
 Setting this parameter to `true` enables the `Host:` line from an incoming request to be
 proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="proxy_add_headers"></a>`proxy_add_headers`
+##### <a name="-apache--vhost--proxy_add_headers"></a>`proxy_add_headers`
 
 Data type: `Optional[Variant[String, Boolean]]`
 
@@ -8950,18 +8897,18 @@ Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/m
 This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For,
 X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_error_override"></a>`proxy_error_override`
+##### <a name="-apache--vhost--proxy_error_override"></a>`proxy_error_override`
 
 Data type: `Boolean`
 
 Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride).
 This directive controls whether Apache should override error pages for proxied content.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="options"></a>`options`
+##### <a name="-apache--vhost--options"></a>`options`
 
 Data type: `Array[String]`
 
@@ -8977,7 +8924,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `['Indexes', 'FollowSymLinks', 'MultiViews']`
 
-##### <a name="override"></a>`override`
+##### <a name="-apache--vhost--override"></a>`override`
 
 Data type: `Array[String]`
 
@@ -8986,7 +8933,7 @@ Sets the overrides for the specified virtual host. Accepts an array of
 
 Default value: `['None']`
 
-##### <a name="passenger_enabled"></a>`passenger_enabled`
+##### <a name="-apache--vhost--passenger_enabled"></a>`passenger_enabled`
 
 Data type: `Optional[Boolean]`
 
@@ -9005,45 +8952,45 @@ apache::vhost { 'sample.example.net':
 > **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)
 using the PassengerEnabled directive with the PassengerHighPerformance directive.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_base_uri"></a>`passenger_base_uri`
+##### <a name="-apache--vhost--passenger_base_uri"></a>`passenger_base_uri`
 
 Data type: `Optional[String]`
 
 Sets [PassengerBaseURI](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbase_rui),
  to specify that the given URI is a distinct application served by Passenger.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_ruby"></a>`passenger_ruby`
+##### <a name="-apache--vhost--passenger_ruby"></a>`passenger_ruby`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerRuby](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerruby),
 specifying the Ruby interpreter to use when serving the relevant web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_python"></a>`passenger_python`
+##### <a name="-apache--vhost--passenger_python"></a>`passenger_python`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerPython](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpython),
 specifying the Python interpreter to use when serving the relevant web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_nodejs"></a>`passenger_nodejs`
+##### <a name="-apache--vhost--passenger_nodejs"></a>`passenger_nodejs`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengernodejs),
 specifying Node.js command to use when serving the relevant web applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
+##### <a name="-apache--vhost--passenger_meteor_app_settings"></a>`passenger_meteor_app_settings`
 
 Data type: `Optional[String]`
 
@@ -9051,9 +8998,9 @@ Sets [PassengerMeteorAppSettings](https://www.phusionpassenger.com/docs/referenc
 specifying a JSON file with settings for the application when using a Meteor
 application in non-bundled mode.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_env"></a>`passenger_app_env`
+##### <a name="-apache--vhost--passenger_app_env"></a>`passenger_app_env`
 
 Data type: `Optional[String]`
 
@@ -9061,126 +9008,126 @@ Sets [PassengerAppEnv](https://www.phusionpassenger.com/docs/references/config_r
 the environment for the Passenger application. If not specified, defaults to the global
 setting or 'production'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_root"></a>`passenger_app_root`
+##### <a name="-apache--vhost--passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Sets [PassengerRoot](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapproot),
 the location of the Passenger application root if different from the DocumentRoot.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_group_name"></a>`passenger_app_group_name`
+##### <a name="-apache--vhost--passenger_app_group_name"></a>`passenger_app_group_name`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppGroupName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappgroupname),
  the name of the application group that the current application should belong to.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_start_command"></a>`passenger_app_start_command`
+##### <a name="-apache--vhost--passenger_app_start_command"></a>`passenger_app_start_command`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppStartCommand](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerappstartcommand),
  how Passenger should start your app on a specific port.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_type"></a>`passenger_app_type`
+##### <a name="-apache--vhost--passenger_app_type"></a>`passenger_app_type`
 
 Data type: `Optional[Enum['meteor', 'node', 'rack', 'wsgi']]`
 
 Sets [PassengerAppType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapptype),
  to force Passenger to recognize the application as a specific type.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_startup_file"></a>`passenger_startup_file`
+##### <a name="-apache--vhost--passenger_startup_file"></a>`passenger_startup_file`
 
 Data type: `Optional[String]`
 
 Sets the [PassengerStartupFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstartupfile),
 path. This path is relative to the application root.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_restart_dir"></a>`passenger_restart_dir`
+##### <a name="-apache--vhost--passenger_restart_dir"></a>`passenger_restart_dir`
 
 Data type: `Optional[String]`
 
 Sets the [PassengerRestartDir](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrestartdir),
  to customize the directory in which `restart.txt` is searched for.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_spawn_method"></a>`passenger_spawn_method`
+##### <a name="-apache--vhost--passenger_spawn_method"></a>`passenger_spawn_method`
 
 Data type: `Optional[Enum['direct', 'smart']]`
 
 Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerspawnmethod),
 whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
+##### <a name="-apache--vhost--passenger_load_shell_envvars"></a>`passenger_load_shell_envvars`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerLoadShellEnvvars](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerloadshellenvvars),
 to enable or disable the loading of shell environment variables before spawning the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_preload_bundler"></a>`passenger_preload_bundler`
+##### <a name="-apache--vhost--passenger_preload_bundler"></a>`passenger_preload_bundler`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerPreloadBundler](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerpreloadbundler),
 to enable or disable the loading of bundler before loading the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_rolling_restarts"></a>`passenger_rolling_restarts`
+##### <a name="-apache--vhost--passenger_rolling_restarts"></a>`passenger_rolling_restarts`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerRollingRestarts](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerrollingrestarts),
 to enable or disable support for zero-downtime application restarts through `restart.txt`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
+##### <a name="-apache--vhost--passenger_resist_deployment_errors"></a>`passenger_resist_deployment_errors`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerResistDeploymentErrors](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerresistdeploymenterrors),
 to enable or disable resistance against deployment errors.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_user"></a>`passenger_user`
+##### <a name="-apache--vhost--passenger_user"></a>`passenger_user`
 
 Data type: `Optional[String]`
 
 Sets [PassengerUser](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeruser),
 the running user for sandboxing applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_group"></a>`passenger_group`
+##### <a name="-apache--vhost--passenger_group"></a>`passenger_group`
 
 Data type: `Optional[String]`
 
 Sets [PassengerGroup](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengergroup),
 the running group for sandboxing applications.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
+##### <a name="-apache--vhost--passenger_friendly_error_pages"></a>`passenger_friendly_error_pages`
 
 Data type: `Optional[Boolean]`
 
@@ -9189,54 +9136,54 @@ which can display friendly error pages whenever an application fails to start. T
 friendly error page presents the startup error message, some suggestions for solving
 the problem, a backtrace and a dump of the environment variables.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_min_instances"></a>`passenger_min_instances`
+##### <a name="-apache--vhost--passenger_min_instances"></a>`passenger_min_instances`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMinInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermininstances),
 the minimum number of application processes to run.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_instances"></a>`passenger_max_instances`
+##### <a name="-apache--vhost--passenger_max_instances"></a>`passenger_max_instances`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxInstances](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxinstances),
 the maximum number of application processes to run.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
+##### <a name="-apache--vhost--passenger_max_preloader_idle_time"></a>`passenger_max_preloader_idle_time`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxPreloaderIdleTime](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxpreloaderidletime),
 the maximum amount of time the preloader waits before shutting down an idle process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
+##### <a name="-apache--vhost--passenger_force_max_concurrent_requests_per_process"></a>`passenger_force_max_concurrent_requests_per_process`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerForceMaxConcurrentRequestsPerProcess](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerforcemaxconcurrentrequestsperprocess),
 the maximum amount of concurrent requests the application can handle per process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_start_timeout"></a>`passenger_start_timeout`
+##### <a name="-apache--vhost--passenger_start_timeout"></a>`passenger_start_timeout`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerStartTimeout](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstarttimeout),
 the timeout for the application startup.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_concurrency_model"></a>`passenger_concurrency_model`
+##### <a name="-apache--vhost--passenger_concurrency_model"></a>`passenger_concurrency_model`
 
 Data type: `Optional[Enum['process', 'thread']]`
 
@@ -9246,9 +9193,9 @@ Passenger supports two concurrency models:<br />
 * `process` - single-threaded, multi-processed I/O concurrency.
 * `thread` - multi-threaded, multi-processed I/O concurrency.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_thread_count"></a>`passenger_thread_count`
+##### <a name="-apache--vhost--passenger_thread_count"></a>`passenger_thread_count`
 
 Data type: `Optional[Integer]`
 
@@ -9256,18 +9203,18 @@ Sets [PassengerThreadCount](https://www.phusionpassenger.com/docs/references/con
 the number of threads that Passenger should spawn per Ruby application process.<br />
 This option only has effect if PassengerConcurrencyModel is `thread`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_requests"></a>`passenger_max_requests`
+##### <a name="-apache--vhost--passenger_max_requests"></a>`passenger_max_requests`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMaxRequests](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermaxrequests),
 the maximum number of requests an application process will process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_time"></a>`passenger_max_request_time`
+##### <a name="-apache--vhost--passenger_max_request_time"></a>`passenger_max_request_time`
 
 Data type: `Optional[Integer]`
 
@@ -9275,63 +9222,63 @@ Sets [PassengerMaxRequestTime](https://www.phusionpassenger.com/docs/references/
 the maximum amount of time, in seconds, that an application process may take to
 process a request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_memory_limit"></a>`passenger_memory_limit`
+##### <a name="-apache--vhost--passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerMemoryLimit](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengermemorylimit),
 the maximum amount of memory that an application process may use, in megabytes.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
+##### <a name="-apache--vhost--passenger_stat_throttle_rate"></a>`passenger_stat_throttle_rate`
 
 Data type: `Optional[Integer]`
 
 Sets [PassengerStatThrottleRate](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstatthrottlerate),
 to set a limit, in seconds, on how often Passenger will perform it's filesystem checks.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_pre_start"></a>`passenger_pre_start`
+##### <a name="-apache--vhost--passenger_pre_start"></a>`passenger_pre_start`
 
 Data type: `Optional[Variant[String, Array[String]]]`
 
 Sets [PassengerPreStart](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerprestart),
 the URL of the application if pre-starting is required.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_high_performance"></a>`passenger_high_performance`
+##### <a name="-apache--vhost--passenger_high_performance"></a>`passenger_high_performance`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerHighPerformance](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerhighperformance),
 to enhance performance in return for reduced compatibility.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_buffer_upload"></a>`passenger_buffer_upload`
+##### <a name="-apache--vhost--passenger_buffer_upload"></a>`passenger_buffer_upload`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerBufferUpload](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferupload),
 to buffer HTTP client request bodies before they are sent to the application.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_buffer_response"></a>`passenger_buffer_response`
+##### <a name="-apache--vhost--passenger_buffer_response"></a>`passenger_buffer_response`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerBufferResponse](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerbufferresponse),
 to buffer Happlication-generated responses.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_error_override"></a>`passenger_error_override`
+##### <a name="-apache--vhost--passenger_error_override"></a>`passenger_error_override`
 
 Data type: `Optional[Boolean]`
 
@@ -9339,9 +9286,9 @@ Sets [PassengerErrorOverride](https://www.phusionpassenger.com/docs/references/c
 to specify whether Apache will intercept and handle response with HTTP status codes of
 400 and higher.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
+##### <a name="-apache--vhost--passenger_max_request_queue_size"></a>`passenger_max_request_queue_size`
 
 Data type: `Optional[Integer]`
 
@@ -9351,9 +9298,9 @@ concurrent request limit is reached. If the queue is already at this specified l
 Passenger immediately sends a "503 Service Unavailable" error to any incoming requests.<br />
 A value of 0 means that the queue size is unbounded.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
+##### <a name="-apache--vhost--passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
 
 Data type: `Optional[Integer]`
 
@@ -9363,9 +9310,9 @@ whenever the maximum concurrent request limit is reached. If a request reaches t
 limit, then Passenger immeaditly sends a "504 Gateway Timeout" error for that request.<br />
 A value of 0 means that the queue time is unbounded.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions"></a>`passenger_sticky_sessions`
+##### <a name="-apache--vhost--passenger_sticky_sessions"></a>`passenger_sticky_sessions`
 
 Data type: `Optional[Boolean]`
 
@@ -9373,27 +9320,27 @@ Sets [PassengerStickySessions](https://www.phusionpassenger.com/docs/references/
 to specify that, whenever possible, all requests sent by a client will be routed to the same
 originating application process.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
+##### <a name="-apache--vhost--passenger_sticky_sessions_cookie_name"></a>`passenger_sticky_sessions_cookie_name`
 
 Data type: `Optional[String]`
 
 Sets [PassengerStickySessionsCookieName](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookiename),
 to specify the name of the sticky sessions cookie.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
+##### <a name="-apache--vhost--passenger_sticky_sessions_cookie_attributes"></a>`passenger_sticky_sessions_cookie_attributes`
 
 Data type: `Optional[String]`
 
 Sets [PassengerStickySessionsCookieAttributes](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerstickysessionscookieattributes),
 the attributes of the sticky sessions cookie.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
+##### <a name="-apache--vhost--passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
 Data type: `Optional[Boolean]`
 
@@ -9401,27 +9348,27 @@ Sets [PassengerAllowEncodedSlashes](https://www.phusionpassenger.com/docs/refere
 to allow URLs with encoded slashes. Please note that this feature will not work properly
 unless Apache's `AllowEncodedSlashes` is also enabled.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_app_log_file"></a>`passenger_app_log_file`
+##### <a name="-apache--vhost--passenger_app_log_file"></a>`passenger_app_log_file`
 
 Data type: `Optional[String]`
 
 Sets [PassengerAppLogFile](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerapplogfile),
 app specific messages logged to a different file in addition to Passenger log file.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_debugger"></a>`passenger_debugger`
+##### <a name="-apache--vhost--passenger_debugger"></a>`passenger_debugger`
 
 Data type: `Optional[Boolean]`
 
 Sets [PassengerDebugger](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerdebugger),
 to turn support for Ruby application debugging on or off.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="passenger_lve_min_uid"></a>`passenger_lve_min_uid`
+##### <a name="-apache--vhost--passenger_lve_min_uid"></a>`passenger_lve_min_uid`
 
 Data type: `Optional[Integer]`
 
@@ -9429,9 +9376,9 @@ Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/confi
 to only allow the spawning of application processes with UIDs equal to, or higher than, this
 specified value on LVE-enabled kernels.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="php_values"></a>`php_values`
+##### <a name="-apache--vhost--php_values"></a>`php_values`
 
 Data type: `Hash`
 
@@ -9444,7 +9391,7 @@ Within a vhost declaration:
 
 Default value: `{}`
 
-##### <a name="php_flags"></a>`php_flags`
+##### <a name="-apache--vhost--php_flags"></a>`php_flags`
 
 Data type: `Hash`
 
@@ -9453,7 +9400,7 @@ These flags or values can be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="php_admin_values"></a>`php_admin_values`
+##### <a name="-apache--vhost--php_admin_values"></a>`php_admin_values`
 
 Data type: `Variant[Array[String], Hash]`
 
@@ -9462,7 +9409,7 @@ These flags or values cannot be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="php_admin_flags"></a>`php_admin_flags`
+##### <a name="-apache--vhost--php_admin_flags"></a>`php_admin_flags`
 
 Data type: `Variant[Array[String], Hash]`
 
@@ -9471,7 +9418,7 @@ These flags or values cannot be overwritten by a user or an application.
 
 Default value: `{}`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--vhost--port"></a>`port`
 
 Data type: `Optional[Variant[Array[Stdlib::Port], Stdlib::Port]]`
 
@@ -9479,9 +9426,9 @@ Sets the port the host is configured on. The module's defaults ensure the host l
 on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only
 listens on the port set in this parameter.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--vhost--priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
@@ -9493,9 +9440,9 @@ used if no other names match.<br />
 aware that the `default_vhost` parameter for `apache::vhost` passes a priority of 15.<br />
 To omit the priority prefix in file names, pass a priority of `false`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="protocols"></a>`protocols`
+##### <a name="-apache--vhost--protocols"></a>`protocols`
 
 Data type: `Array[Enum['h2', 'h2c', 'http/1.1']]`
 
@@ -9504,24 +9451,24 @@ directive, which lists available protocols for the virutal host.
 
 Default value: `[]`
 
-##### <a name="protocols_honor_order"></a>`protocols_honor_order`
+##### <a name="-apache--vhost--protocols_honor_order"></a>`protocols_honor_order`
 
 Data type: `Optional[Boolean]`
 
 Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder)
 directive which determines wether the order of Protocols sets precedence during negotiation.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest"></a>`proxy_dest`
+##### <a name="-apache--vhost--proxy_dest"></a>`proxy_dest`
 
 Data type: `Optional[String]`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_pass"></a>`proxy_pass`
+##### <a name="-apache--vhost--proxy_pass"></a>`proxy_pass`
 
 Data type: `Optional[Variant[Array[Hash], Hash]]`
 
@@ -9554,9 +9501,9 @@ apache::vhost { 'site.name.fdqn':
 * `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings.
 * `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest_match"></a>`proxy_dest_match`
+##### <a name="-apache--vhost--proxy_dest_match"></a>`proxy_dest_match`
 
 Data type: `Optional[String]`
 
@@ -9564,9 +9511,9 @@ This directive is equivalent to `proxy_dest`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
+##### <a name="-apache--vhost--proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
 Data type: `Optional[String]`
 
@@ -9574,9 +9521,9 @@ Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
 [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_pass_match"></a>`proxy_pass_match`
+##### <a name="-apache--vhost--proxy_pass_match"></a>`proxy_pass_match`
 
 Data type: `Optional[Variant[Array[Hash], Hash]]`
 
@@ -9584,17 +9531,17 @@ This directive is equivalent to `proxy_pass`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirect_dest"></a>`redirect_dest`
+##### <a name="-apache--vhost--redirect_dest"></a>`redirect_dest`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies the address to redirect to.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirect_source"></a>`redirect_source`
+##### <a name="-apache--vhost--redirect_source"></a>`redirect_source`
 
 Data type: `Variant[String, Array[String]]`
 
@@ -9611,7 +9558,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `'/'`
 
-##### <a name="redirect_status"></a>`redirect_status`
+##### <a name="-apache--vhost--redirect_status"></a>`redirect_status`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9623,9 +9570,9 @@ Specifies the status to append to the redirect.
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirectmatch_regexp"></a>`redirectmatch_regexp`
+##### <a name="-apache--vhost--redirectmatch_regexp"></a>`redirectmatch_regexp`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9641,9 +9588,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirectmatch_status"></a>`redirectmatch_status`
+##### <a name="-apache--vhost--redirectmatch_status"></a>`redirectmatch_status`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9659,9 +9606,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="redirectmatch_dest"></a>`redirectmatch_dest`
+##### <a name="-apache--vhost--redirectmatch_dest"></a>`redirectmatch_dest`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -9677,9 +9624,9 @@ apache::vhost { 'site.name.fdqn':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="request_headers"></a>`request_headers`
+##### <a name="-apache--vhost--request_headers"></a>`request_headers`
 
 Data type: `Array[String[1]]`
 
@@ -9698,7 +9645,7 @@ apache::vhost { 'site.name.fdqn':
 
 Default value: `[]`
 
-##### <a name="rewrites"></a>`rewrites`
+##### <a name="-apache--vhost--rewrites"></a>`rewrites`
 
 Data type: `Array[Hash]`
 
@@ -9775,7 +9722,7 @@ than setting the rewrites in the virtual host's directories.
 
 Default value: `[]`
 
-##### <a name="rewrite_base"></a>`rewrite_base`
+##### <a name="-apache--vhost--rewrite_base"></a>`rewrite_base`
 
 Data type: `Optional[String[1]]`
 
@@ -9783,18 +9730,18 @@ The parameter [`rewrite_base`](https://httpd.apache.org/docs/current/mod/mod_rew
 specifies the URL prefix to be used for per-directory (htaccess) RewriteRule directives
 that substitue a relative path.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rewrite_rule"></a>`rewrite_rule`
+##### <a name="-apache--vhost--rewrite_rule"></a>`rewrite_rule`
 
 Data type: `Optional[Variant[Array[String[1]], String[1]]]`
 
 The parameter [`rewrite_rile`](https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule)
 allows the user to define the rules that will be used by the rewrite engine.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="rewrite_cond"></a>`rewrite_cond`
+##### <a name="-apache--vhost--rewrite_cond"></a>`rewrite_cond`
 
 Data type: `Array[String[1]]`
 
@@ -9804,7 +9751,7 @@ rewrite engine.
 
 Default value: `[]`
 
-##### <a name="rewrite_inherit"></a>`rewrite_inherit`
+##### <a name="-apache--vhost--rewrite_inherit"></a>`rewrite_inherit`
 
 Data type: `Boolean`
 
@@ -9832,18 +9779,18 @@ RewriteOptions Inherit
 Refer to the official [`mod_rewrite`](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)
 documentation, section "Rewriting in Virtual Hosts".
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="scriptalias"></a>`scriptalias`
+##### <a name="-apache--vhost--scriptalias"></a>`scriptalias`
 
 Data type: `Optional[String]`
 
 Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
 '/usr/scripts'.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="scriptaliases"></a>`scriptaliases`
+##### <a name="-apache--vhost--scriptaliases"></a>`scriptaliases`
 
 Data type: `Array[Hash]`
 
@@ -9876,15 +9823,15 @@ before more general ones to avoid shadowing.
 
 Default value: `[]`
 
-##### <a name="serveradmin"></a>`serveradmin`
+##### <a name="-apache--vhost--serveradmin"></a>`serveradmin`
 
 Data type: `Optional[String]`
 
 Specifies the email address Apache displays when it renders one of its error pages.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="serveraliases"></a>`serveraliases`
+##### <a name="-apache--vhost--serveraliases"></a>`serveraliases`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9893,7 +9840,7 @@ of the site.
 
 Default value: `[]`
 
-##### <a name="servername"></a>`servername`
+##### <a name="-apache--vhost--servername"></a>`servername`
 
 Data type: `Optional[String]`
 
@@ -9901,7 +9848,7 @@ Sets the servername corresponding to the hostname you connect to the virtual hos
 
 Default value: `$name`
 
-##### <a name="setenv"></a>`setenv`
+##### <a name="-apache--vhost--setenv"></a>`setenv`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9915,7 +9862,7 @@ apache::vhost { 'setenv.example.com':
 
 Default value: `[]`
 
-##### <a name="setenvif"></a>`setenvif`
+##### <a name="-apache--vhost--setenvif"></a>`setenvif`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9923,7 +9870,7 @@ Used by HTTPD to conditionally set environment variables for virtual hosts.
 
 Default value: `[]`
 
-##### <a name="setenvifnocase"></a>`setenvifnocase`
+##### <a name="-apache--vhost--setenvifnocase"></a>`setenvifnocase`
 
 Data type: `Variant[Array[String], String]`
 
@@ -9931,16 +9878,16 @@ Used by HTTPD to conditionally set environment variables for virtual hosts (case
 
 Default value: `[]`
 
-##### <a name="suexec_user_group"></a>`suexec_user_group`
+##### <a name="-apache--vhost--suexec_user_group"></a>`suexec_user_group`
 
 Data type: `Optional[Pattern[/^[\w-]+ [\w-]+$/]]`
 
 Allows the spcification of user and group execution privileges for CGI programs through
 inclusion of the `mod_suexec` module.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="vhost_name"></a>`vhost_name`
+##### <a name="-apache--vhost--vhost_name"></a>`vhost_name`
 
 Data type: `String`
 
@@ -9951,7 +9898,7 @@ title of the resource.
 
 Default value: `'*'`
 
-##### <a name="virtual_docroot"></a>`virtual_docroot`
+##### <a name="-apache--vhost--virtual_docroot"></a>`virtual_docroot`
 
 Data type: `Variant[Stdlib::Absolutepath, Boolean]`
 
@@ -9969,9 +9916,9 @@ apache::vhost { 'subdomain.loc':
 }
 ```
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="virtual_use_default_docroot"></a>`virtual_use_default_docroot`
+##### <a name="-apache--vhost--virtual_use_default_docroot"></a>`virtual_use_default_docroot`
 
 Data type: `Boolean`
 
@@ -9988,9 +9935,9 @@ apache::vhost { 'subdomain.loc':
 }
 ```
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="wsgi_daemon_process"></a>`wsgi_daemon_process`
+##### <a name="-apache--vhost--wsgi_daemon_process"></a>`wsgi_daemon_process`
 
 Data type: `Optional[Variant[String, Hash]]`
 
@@ -10016,9 +9963,9 @@ apache::vhost { 'wsgi.example.com':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
+##### <a name="-apache--vhost--wsgi_daemon_process_options"></a>`wsgi_daemon_process_options`
 
 Data type: `Optional[Hash]`
 
@@ -10027,9 +9974,9 @@ wsgi_daemon_process, wsgi_process_group,
 wsgi_script_aliases and wsgi_pass_authorization.<br />
 Sets the group ID that the virtual host runs under.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_application_group"></a>`wsgi_application_group`
+##### <a name="-apache--vhost--wsgi_application_group"></a>`wsgi_application_group`
 
 Data type: `Optional[String]`
 
@@ -10041,9 +9988,9 @@ thus allowing you to specify which application group the WSGI application belong
 with all WSGI applications within the same group executing within the context of the
 same Python sub interpreter.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_import_script"></a>`wsgi_import_script`
+##### <a name="-apache--vhost--wsgi_import_script"></a>`wsgi_import_script`
 
 Data type: `Optional[String]`
 
@@ -10053,9 +10000,9 @@ and wsgi_pass_authorization.<br />
 This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html),
 which can be used in order to specify a script file to be loaded upon a process starting.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_import_script_options"></a>`wsgi_import_script_options`
+##### <a name="-apache--vhost--wsgi_import_script_options"></a>`wsgi_import_script_options`
 
 Data type: `Optional[Hash]`
 
@@ -10066,9 +10013,9 @@ This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readth
 which can be used in order to specify a script file to be loaded upon a process starting.<br />
 Specifies the process and aplication groups of the script.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_chunked_request"></a>`wsgi_chunked_request`
+##### <a name="-apache--vhost--wsgi_chunked_request"></a>`wsgi_chunked_request`
 
 Data type: `Optional[Apache::OnOff]`
 
@@ -10080,9 +10027,9 @@ allowing you to enable support for chunked request content.<br />
 WSGI is technically incapable of supporting chunked request content without all chunked
 request content having first been read in and buffered.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_process_group"></a>`wsgi_process_group`
+##### <a name="-apache--vhost--wsgi_process_group"></a>`wsgi_process_group`
 
 Data type: `Optional[String]`
 
@@ -10091,9 +10038,9 @@ wsgi_daemon_process, wsgi_daemon_process_options,
 wsgi_script_aliases and wsgi_pass_authorization.<br />
 Requires a hash of web paths to filesystem `.wsgi paths/`.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_script_aliases"></a>`wsgi_script_aliases`
+##### <a name="-apache--vhost--wsgi_script_aliases"></a>`wsgi_script_aliases`
 
 Data type: `Optional[Hash]`
 
@@ -10103,9 +10050,9 @@ and wsgi_pass_authorization.<br />
 Uses the WSGI application to handle authorization instead of Apache when set to `On`.<br />
 For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
+##### <a name="-apache--vhost--wsgi_script_aliases_match"></a>`wsgi_script_aliases_match`
 
 Data type: `Optional[Hash]`
 
@@ -10117,9 +10064,9 @@ This directive is similar to `wsgi_script_aliases`, but makes use of regular exp
 in place of simple prefix matching.<br />
 For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="wsgi_pass_authorization"></a>`wsgi_pass_authorization`
+##### <a name="-apache--vhost--wsgi_pass_authorization"></a>`wsgi_pass_authorization`
 
 Data type: `Optional[Apache::OnOff]`
 
@@ -10128,9 +10075,9 @@ wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and
 wsgi_script_aliases.<br />
 Enables support for chunked requests.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="directories"></a>`directories`
+##### <a name="-apache--vhost--directories"></a>`directories`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -10181,9 +10128,86 @@ apache::vhost { 'sample.example.net':
 Any handlers you do not set in these hashes are considered `undefined` within Puppet and
 are not added to the virtual host, resulting in the module using their default values.
 
-Default value: ``undef``
+The `directories` param can accepts the different authentication ways, including `gssapi`, `Basic (authz_core)`,
+and others.
+
+  * `gssapi` - Specifies mod_auth_gssapi parameters for particular directories in a virtual host directory
+    TODO: check, if this Documentation is obsolete
+
+    ```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        { path   => '/path/to/different/dir',
+          gssapi => {
+            acceptor_name            => '{HOSTNAME}',
+            allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
+            authname                 => 'Kerberos 5',
+            authtype                 => 'GSSAPI',
+            basic_auth               => true,
+            basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
+            basic_ticket_timeout     => 300,
+            connection_bound         => true,
+            cred_store               => {
+              ccache        => ['/path/to/directory'],
+              client_keytab => ['/path/to/example.keytab'],
+              keytab        => ['/path/to/example.keytab'],
+            },
+            deleg_ccache_dir         => '/path/to/directory',
+            deleg_ccache_env_var     => 'KRB5CCNAME',
+            deleg_ccache_perms       => {
+              mode => '0600',
+              uid  => 'example-user',
+              gid  => 'example-group',
+            },
+            deleg_ccache_unique      => true,
+            impersonate              => true,
+            local_name               => true,
+            name_attributes          => 'json',
+            negotiate_once           => true,
+            publish_errors           => true,
+            publish_mech             => true,
+            required_name_attributes =>	'auth-indicators=high',
+            session_key              => 'file:/path/to/example.key',
+            signal_persistent_auth   => true,
+            ssl_only                 => true,
+            use_s4u2_proxy           => true,
+            use_sessions             => true,
+          }
+        },
+      ],
+    }
+    ```
+
+  * `Basic` - Specifies mod_authz_core parameters for particular directories in a virtual host directory
+    ```puppet
+    apache::vhost { 'sample.example.net':
+      docroot     => '/path/to/directory',
+      directories => [
+        {
+          path        => '/path/to/different/dir',
+          auth_type => 'Basic',
+          authz_core  => {
+            require_all => {
+              'require_any' => {
+                'require' => ['user superadmin'],
+                'require_all' => {
+                  'require' => ['group admins', 'ldap-group "cn=Administrators,o=Airius"'],
+                },
+              },
+              'require_none' => {
+                'require' => ['group temps', 'ldap-group "cn=Temporary Employees,o=Airius"']
+              }
+            }
+          }
+        },
+      ],
+    }
+    ```
+
+Default value: `undef`
 
-##### <a name="custom_fragment"></a>`custom_fragment`
+##### <a name="-apache--vhost--custom_fragment"></a>`custom_fragment`
 
 Data type: `Optional[String]`
 
@@ -10212,9 +10236,9 @@ ProxyStatus On',
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="headers"></a>`headers`
+##### <a name="-apache--vhost--headers"></a>`headers`
 
 Data type: `Array[String[1]]`
 
@@ -10233,7 +10257,7 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="shib_compat_valid_user"></a>`shib_compat_valid_user`
+##### <a name="-apache--vhost--shib_compat_valid_user"></a>`shib_compat_valid_user`
 
 Data type: `Optional[String]`
 
@@ -10244,9 +10268,9 @@ Apache behavior when processing the `valid-user` and `user` Require rules. See t
 and [NativeSPhtaccess](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPhtaccess)
 topic for more details. This key is disabled if `apache::mod::shib` is not defined.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_options"></a>`ssl_options`
+##### <a name="-apache--vhost--ssl_options"></a>`ssl_options`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
@@ -10267,9 +10291,9 @@ apache::vhost { 'secure.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="additional_includes"></a>`additional_includes`
+##### <a name="-apache--vhost--additional_includes"></a>`additional_includes`
 
 Data type: `Variant[Array[String], String]`
 
@@ -10288,23 +10312,15 @@ apache::vhost { 'sample.example.net':
 
 Default value: `[]`
 
-##### <a name="gssapi"></a>`gssapi`
-
-
-
-##### <a name="authz_core"></a>`authz_core`
-
-
-
-##### <a name="ssl"></a>`ssl`
+##### <a name="-apache--vhost--ssl"></a>`ssl`
 
 Data type: `Boolean`
 
 Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="ssl_ca"></a>`ssl_ca`
+##### <a name="-apache--vhost--ssl_ca"></a>`ssl_ca`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10313,7 +10329,7 @@ for authentication.
 
 Default value: `$apache::default_ssl_ca`
 
-##### <a name="ssl_cert"></a>`ssl_cert`
+##### <a name="-apache--vhost--ssl_cert"></a>`ssl_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10321,24 +10337,24 @@ Specifies the SSL certification.
 
 Default value: `$apache::default_ssl_cert`
 
-##### <a name="ssl_protocol"></a>`ssl_protocol`
+##### <a name="-apache--vhost--ssl_protocol"></a>`ssl_protocol`
 
 Data type: `Optional[Variant[Array[String], String]]`
 
 Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol).
 Expects an array or space separated string of accepted protocols.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_cipher"></a>`ssl_cipher`
+##### <a name="-apache--vhost--ssl_cipher"></a>`ssl_cipher`
 
 Data type: `Optional[Variant[Array[String[1]], String[1], Hash[String[1], String[1]]]]`
 
 Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite).
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_honorcipherorder"></a>`ssl_honorcipherorder`
+##### <a name="-apache--vhost--ssl_honorcipherorder"></a>`ssl_honorcipherorder`
 
 Data type: `Variant[Boolean, Apache::OnOff, Undef]`
 
@@ -10346,9 +10362,9 @@ Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.htm
 to cause Apache to use the server's preferred order of ciphers rather than the client's
 preferred order.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_certs_dir"></a>`ssl_certs_dir`
+##### <a name="-apache--vhost--ssl_certs_dir"></a>`ssl_certs_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10356,7 +10372,7 @@ Specifies the location of the SSL certification directory to verify client certs
 
 Default value: `$apache::params::ssl_certs_dir`
 
-##### <a name="ssl_chain"></a>`ssl_chain`
+##### <a name="-apache--vhost--ssl_chain"></a>`ssl_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10366,7 +10382,7 @@ production.
 
 Default value: `$apache::default_ssl_chain`
 
-##### <a name="ssl_crl"></a>`ssl_crl`
+##### <a name="-apache--vhost--ssl_crl"></a>`ssl_crl`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10376,7 +10392,7 @@ before being used in production.)
 
 Default value: `$apache::default_ssl_crl`
 
-##### <a name="ssl_crl_path"></a>`ssl_crl_path`
+##### <a name="-apache--vhost--ssl_crl_path"></a>`ssl_crl_path`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10387,7 +10403,7 @@ production.)
 
 Default value: `$apache::default_ssl_crl_path`
 
-##### <a name="ssl_crl_check"></a>`ssl_crl_check`
+##### <a name="-apache--vhost--ssl_crl_check"></a>`ssl_crl_check`
 
 Data type: `Optional[String]`
 
@@ -10398,7 +10414,7 @@ older versions.
 
 Default value: `$apache::default_ssl_crl_check`
 
-##### <a name="ssl_key"></a>`ssl_key`
+##### <a name="-apache--vhost--ssl_key"></a>`ssl_key`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10409,7 +10425,7 @@ being used in production.
 
 Default value: `$apache::default_ssl_key`
 
-##### <a name="ssl_verify_client"></a>`ssl_verify_client`
+##### <a name="-apache--vhost--ssl_verify_client"></a>`ssl_verify_client`
 
 Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
@@ -10422,9 +10438,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_verify_depth"></a>`ssl_verify_depth`
+##### <a name="-apache--vhost--ssl_verify_depth"></a>`ssl_verify_depth`
 
 Data type: `Optional[Integer]`
 
@@ -10439,9 +10455,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_protocol"></a>`ssl_proxy_protocol`
+##### <a name="-apache--vhost--ssl_proxy_protocol"></a>`ssl_proxy_protocol`
 
 Data type: `Optional[String]`
 
@@ -10450,9 +10466,9 @@ directive, which controls which SSL protocol flavors `mod_ssl` should use when e
 its server environment for proxy. It connects to servers using only one of the provided
 protocols.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_verify"></a>`ssl_proxy_verify`
+##### <a name="-apache--vhost--ssl_proxy_verify"></a>`ssl_proxy_verify`
 
 Data type: `Optional[Enum['none', 'optional', 'require', 'optional_no_ca']]`
 
@@ -10460,9 +10476,9 @@ Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html
 directive, which configures certificate verification of the remote server when a proxy is
 configured to forward requests to a remote SSL server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
+##### <a name="-apache--vhost--ssl_proxy_verify_depth"></a>`ssl_proxy_verify_depth`
 
 Data type: `Optional[Integer[0]]`
 
@@ -10473,18 +10489,18 @@ A depth of 0 means that only self-signed remote server certificates are accepted
 the default depth of 1 means the remote server certificate can be self-signed or
 signed by a CA that is directly known to the server.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
+##### <a name="-apache--vhost--ssl_proxy_cipher_suite"></a>`ssl_proxy_cipher_suite`
 
 Data type: `Optional[String]`
 
 Sets the [SSLProxyCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyciphersuite)
 directive, which controls cipher suites supported for ssl proxy traffic.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
+##### <a name="-apache--vhost--ssl_proxy_ca_cert"></a>`ssl_proxy_ca_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10494,9 +10510,9 @@ of Certification Authorities (CA) whose remote servers you deal with. These are
 for Remote Server Authentication. This file should be a concatenation of the PEM-encoded
 certificate files in order of preference.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
+##### <a name="-apache--vhost--ssl_proxy_machine_cert"></a>`ssl_proxy_machine_cert`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10511,9 +10527,9 @@ apache::vhost { 'sample.example.net':
 }
 ```
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
+##### <a name="-apache--vhost--ssl_proxy_machine_cert_chain"></a>`ssl_proxy_machine_cert_chain`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
@@ -10525,9 +10541,9 @@ client certificates. This referenced file is simply the concatenation of the var
 PEM-encoded certificate files. Upon startup, each client certificate configured will be
 examined and a chain of trust will be constructed.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
+##### <a name="-apache--vhost--ssl_proxy_check_peer_cn"></a>`ssl_proxy_check_peer_cn`
 
 Data type: `Optional[Apache::OnOff]`
 
@@ -10535,9 +10551,9 @@ Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl
 directive, which specifies whether the remote server certificate's CN field is compared
 against the hostname of the request URL.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
+##### <a name="-apache--vhost--ssl_proxy_check_peer_name"></a>`ssl_proxy_check_peer_name`
 
 Data type: `Optional[Apache::OnOff]`
 
@@ -10545,9 +10561,9 @@ Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_s
 directive, which specifies whether the remote server certificate's CN field is compared
 against the hostname of the request URL.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
+##### <a name="-apache--vhost--ssl_proxy_check_peer_expire"></a>`ssl_proxy_check_peer_expire`
 
 Data type: `Optional[Apache::OnOff]`
 
@@ -10555,26 +10571,26 @@ Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod
 directive, which specifies whether the remote server certificate is checked for expiration
 or not.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
+##### <a name="-apache--vhost--ssl_openssl_conf_cmd"></a>`ssl_openssl_conf_cmd`
 
 Data type: `Optional[String]`
 
 Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)
 directive, which provides direct configuration of OpenSSL parameters.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_proxyengine"></a>`ssl_proxyengine`
+##### <a name="-apache--vhost--ssl_proxyengine"></a>`ssl_proxyengine`
 
 Data type: `Boolean`
 
 Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine).
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="ssl_stapling"></a>`ssl_stapling`
+##### <a name="-apache--vhost--ssl_stapling"></a>`ssl_stapling`
 
 Data type: `Optional[Boolean]`
 
@@ -10582,35 +10598,35 @@ Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/cu
 By default, uses what is set globally.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_stapling_timeout"></a>`ssl_stapling_timeout`
+##### <a name="-apache--vhost--ssl_stapling_timeout"></a>`ssl_stapling_timeout`
 
 Data type: `Optional[Integer]`
 
 Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
+##### <a name="-apache--vhost--ssl_stapling_return_errors"></a>`ssl_stapling_return_errors`
 
 Data type: `Optional[Apache::OnOff]`
 
 Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive.<br />
 This parameter only applies to Apache 2.4 or higher and is ignored on older versions.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_user_name"></a>`ssl_user_name`
+##### <a name="-apache--vhost--ssl_user_name"></a>`ssl_user_name`
 
 Data type: `Optional[String]`
 
 Sets the [SSLUserName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusername) directive.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="ssl_reload_on_change"></a>`ssl_reload_on_change`
+##### <a name="-apache--vhost--ssl_reload_on_change"></a>`ssl_reload_on_change`
 
 Data type: `Boolean`
 
@@ -10618,16 +10634,16 @@ Enable reloading of apache if the content of ssl files have changed.
 
 Default value: `$apache::default_ssl_reload_on_change`
 
-##### <a name="use_canonical_name"></a>`use_canonical_name`
+##### <a name="-apache--vhost--use_canonical_name"></a>`use_canonical_name`
 
 Data type: `Optional[Variant[Apache::OnOff, Enum['DNS', 'dns']]]`
 
 Specifies whether to use the [`UseCanonicalName directive`](https://httpd.apache.org/docs/2.4/mod/core.html#usecanonicalname),
 which allows you to configure how the server determines it's own name and port.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="define"></a>`define`
+##### <a name="-apache--vhost--define"></a>`define`
 
 Data type: `Hash`
 
@@ -10636,15 +10652,15 @@ these can then be used to replace configuration values. All Defines are Undefine
 
 Default value: `{}`
 
-##### <a name="auth_oidc"></a>`auth_oidc`
+##### <a name="-apache--vhost--auth_oidc"></a>`auth_oidc`
 
 Data type: `Boolean`
 
 Enable `mod_auth_openidc` parameters for OpenID Connect authentication.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="oidc_settings"></a>`oidc_settings`
+##### <a name="-apache--vhost--oidc_settings"></a>`oidc_settings`
 
 Data type: `Apache::OIDCSettings`
 
@@ -10652,7 +10668,7 @@ An Apache::OIDCSettings Struct containing (mod_auth_openidc settings)[https://gi
 
 Default value: `{}`
 
-##### <a name="limitreqfields"></a>`limitreqfields`
+##### <a name="-apache--vhost--limitreqfields"></a>`limitreqfields`
 
 Data type: `Optional[Integer]`
 
@@ -10662,18 +10678,18 @@ abnormal client request behavior, which may be useful for avoiding some forms of
 denial-of-service attacks. The value should be increased if normal clients see an error
 response from the server that indicates too many fields were sent in the request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="limitreqfieldsize"></a>`limitreqfieldsize`
+##### <a name="-apache--vhost--limitreqfieldsize"></a>`limitreqfieldsize`
 
 Data type: `Optional[Integer]`
 
 The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 be allowed within a request header.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="limitreqline"></a>`limitreqline`
+##### <a name="-apache--vhost--limitreqline"></a>`limitreqline`
 
 Data type: `Optional[Integer]`
 
@@ -10687,9 +10703,9 @@ allowed for a request on the server. A server needs this value to be large
 enough to hold any of its resource names, including any information that might
 be passed in the query part of a GET request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="limitreqbody"></a>`limitreqbody`
+##### <a name="-apache--vhost--limitreqbody"></a>`limitreqbody`
 
 Data type: `Optional[Integer]`
 
@@ -10700,9 +10716,9 @@ directive is given (server, per-directory, per-file or per-location). If the
 client request exceeds that limit, the server will return an error response
 instead of servicing the request.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="use_servername_for_filenames"></a>`use_servername_for_filenames`
+##### <a name="-apache--vhost--use_servername_for_filenames"></a>`use_servername_for_filenames`
 
 Data type: `Boolean`
 
@@ -10711,9 +10727,9 @@ value of the $servername parameter.
 When set to false (default), the existing behaviour of using the $name parameter
 will remain.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
+##### <a name="-apache--vhost--use_port_for_filenames"></a>`use_port_for_filenames`
 
 Data type: `Boolean`
 
@@ -10723,34 +10739,34 @@ $port parameters.
 When set to false (default), the port is not included in the file names and may lead to
 duplicate declarations if two virtual hosts use the same domain.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="mdomain"></a>`mdomain`
+##### <a name="-apache--vhost--mdomain"></a>`mdomain`
 
 Data type: `Optional[Variant[Boolean, String]]`
 
 All the names in the list are managed as one Managed Domain (MD). mod_md will request
 one single certificate that is valid for all these names.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_requests"></a>`proxy_requests`
+##### <a name="-apache--vhost--proxy_requests"></a>`proxy_requests`
 
 Data type: `Boolean`
 
 Whether to accept proxy requests
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="userdir"></a>`userdir`
+##### <a name="-apache--vhost--userdir"></a>`userdir`
 
 Data type: `Optional[Variant[String[1], Array[String[1]]]]`
 
 Instances of apache::mod::userdir
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachevhostcustom"></a>`apache::vhost::custom`
+### <a name="apache--vhost--custom"></a>`apache::vhost::custom`
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.
 
@@ -10758,18 +10774,18 @@ The `apache::vhost::custom` defined type is a thin wrapper around the `apache::c
 
 The following parameters are available in the `apache::vhost::custom` defined type:
 
-* [`content`](#content)
-* [`ensure`](#ensure)
-* [`priority`](#priority)
-* [`verify_config`](#verify_config)
+* [`content`](#-apache--vhost--custom--content)
+* [`ensure`](#-apache--vhost--custom--ensure)
+* [`priority`](#-apache--vhost--custom--priority)
+* [`verify_config`](#-apache--vhost--custom--verify_config)
 
-##### <a name="content"></a>`content`
+##### <a name="-apache--vhost--custom--content"></a>`content`
 
 Data type: `String`
 
 Sets the configuration file's content.
 
-##### <a name="ensure"></a>`ensure`
+##### <a name="-apache--vhost--custom--ensure"></a>`ensure`
 
 Data type: `String`
 
@@ -10777,7 +10793,7 @@ Specifies if the virtual host file is present or absent.
 
 Default value: `'present'`
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--vhost--custom--priority"></a>`priority`
 
 Data type: `Apache::Vhost::Priority`
 
@@ -10785,15 +10801,15 @@ Sets the relative load order for Apache HTTPD VirtualHost configuration files.
 
 Default value: `25`
 
-##### <a name="verify_config"></a>`verify_config`
+##### <a name="-apache--vhost--custom--verify_config"></a>`verify_config`
 
 Data type: `Boolean`
 
 Specifies whether to validate the configuration file before notifying the Apache service.
 
-Default value: ``true``
+Default value: `true`
 
-### <a name="apachevhostfragment"></a>`apache::vhost::fragment`
+### <a name="apache--vhost--fragment"></a>`apache::vhost::fragment`
 
 Define a fragment within a vhost
 
@@ -10854,37 +10870,37 @@ apache::vhost::fragment { 'myfragment':
 
 The following parameters are available in the `apache::vhost::fragment` defined type:
 
-* [`vhost`](#vhost)
-* [`priority`](#priority)
-* [`content`](#content)
-* [`order`](#order)
-* [`port`](#port)
+* [`vhost`](#-apache--vhost--fragment--vhost)
+* [`priority`](#-apache--vhost--fragment--priority)
+* [`content`](#-apache--vhost--fragment--content)
+* [`order`](#-apache--vhost--fragment--order)
+* [`port`](#-apache--vhost--fragment--port)
 
-##### <a name="vhost"></a>`vhost`
+##### <a name="-apache--vhost--fragment--vhost"></a>`vhost`
 
 Data type: `String[1]`
 
 The title of the vhost resource to append to
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--vhost--fragment--priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
 Set the priority to match the one `apache::vhost` sets. This must match the
 one `apache::vhost` sets or else the concat fragment won't be found.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="content"></a>`content`
+##### <a name="-apache--vhost--fragment--content"></a>`content`
 
 Data type: `Optional[String]`
 
 The content to put in the fragment. Only when it's non-empty the actual
 fragment will be created.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="order"></a>`order`
+##### <a name="-apache--vhost--fragment--order"></a>`order`
 
 Data type: `Integer[0]`
 
@@ -10892,15 +10908,15 @@ The order to insert the fragment at
 
 Default value: `900`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--vhost--fragment--port"></a>`port`
 
 Data type: `Optional[Stdlib::Port]`
 
 The port to use
 
-Default value: ``undef``
+Default value: `undef`
 
-### <a name="apachevhostproxy"></a>`apache::vhost::proxy`
+### <a name="apache--vhost--proxy"></a>`apache::vhost::proxy`
 
 Configure a reverse proxy for a vhost
 
@@ -10951,39 +10967,39 @@ apache::vhost::proxy { 'myvhost-proxy':
 
 The following parameters are available in the `apache::vhost::proxy` defined type:
 
-* [`vhost`](#vhost)
-* [`priority`](#priority)
-* [`order`](#order)
-* [`port`](#port)
-* [`proxy_dest`](#proxy_dest)
-* [`proxy_dest_match`](#proxy_dest_match)
-* [`proxy_dest_reverse_match`](#proxy_dest_reverse_match)
-* [`no_proxy_uris`](#no_proxy_uris)
-* [`no_proxy_uris_match`](#no_proxy_uris_match)
-* [`proxy_pass`](#proxy_pass)
-* [`proxy_pass_match`](#proxy_pass_match)
-* [`proxy_requests`](#proxy_requests)
-* [`proxy_preserve_host`](#proxy_preserve_host)
-* [`proxy_add_headers`](#proxy_add_headers)
-* [`proxy_error_override`](#proxy_error_override)
-
-##### <a name="vhost"></a>`vhost`
+* [`vhost`](#-apache--vhost--proxy--vhost)
+* [`priority`](#-apache--vhost--proxy--priority)
+* [`order`](#-apache--vhost--proxy--order)
+* [`port`](#-apache--vhost--proxy--port)
+* [`proxy_dest`](#-apache--vhost--proxy--proxy_dest)
+* [`proxy_dest_match`](#-apache--vhost--proxy--proxy_dest_match)
+* [`proxy_dest_reverse_match`](#-apache--vhost--proxy--proxy_dest_reverse_match)
+* [`no_proxy_uris`](#-apache--vhost--proxy--no_proxy_uris)
+* [`no_proxy_uris_match`](#-apache--vhost--proxy--no_proxy_uris_match)
+* [`proxy_pass`](#-apache--vhost--proxy--proxy_pass)
+* [`proxy_pass_match`](#-apache--vhost--proxy--proxy_pass_match)
+* [`proxy_requests`](#-apache--vhost--proxy--proxy_requests)
+* [`proxy_preserve_host`](#-apache--vhost--proxy--proxy_preserve_host)
+* [`proxy_add_headers`](#-apache--vhost--proxy--proxy_add_headers)
+* [`proxy_error_override`](#-apache--vhost--proxy--proxy_error_override)
+
+##### <a name="-apache--vhost--proxy--vhost"></a>`vhost`
 
 Data type: `String[1]`
 
 The title of the vhost resource to which reverse proxy configuration will
 be appended.
 
-##### <a name="priority"></a>`priority`
+##### <a name="-apache--vhost--proxy--priority"></a>`priority`
 
 Data type: `Optional[Apache::Vhost::Priority]`
 
 Set the priority to match the one `apache::vhost` sets. This must match the
 one `apache::vhost` sets or else the vhost's `concat` resource won't be found.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="order"></a>`order`
+##### <a name="-apache--vhost--proxy--order"></a>`order`
 
 Data type: `Integer[0]`
 
@@ -10993,24 +11009,24 @@ vhost's configuration.
 
 Default value: `170`
 
-##### <a name="port"></a>`port`
+##### <a name="-apache--vhost--proxy--port"></a>`port`
 
 Data type: `Optional[Stdlib::Port]`
 
 Set the port to match the one `apache::vhost` sets. This must match the one
 `apache::vhost` sets or else the vhost's `concat` resource won't be found.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest"></a>`proxy_dest`
+##### <a name="-apache--vhost--proxy--proxy_dest"></a>`proxy_dest`
 
 Data type: `Optional[String[1]]`
 
 Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration for the `/` path.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest_match"></a>`proxy_dest_match`
+##### <a name="-apache--vhost--proxy--proxy_dest_match"></a>`proxy_dest_match`
 
 Data type: `Optional[String[1]]`
 
@@ -11018,9 +11034,9 @@ This directive is equivalent to `proxy_dest`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
+##### <a name="-apache--vhost--proxy--proxy_dest_reverse_match"></a>`proxy_dest_reverse_match`
 
 Data type: `Optional[String[1]]`
 
@@ -11028,9 +11044,9 @@ Allows you to pass a ProxyPassReverse if `proxy_dest_match` is specified. See
 [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="-apache--vhost--proxy--no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Variant[Array[String[1]], String[1]]`
 
@@ -11043,7 +11059,7 @@ data type. This configuration uses the [ProxyPass](https://httpd.apache.org/docs
 
 Default value: `[]`
 
-##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="-apache--vhost--proxy--no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Variant[Array[String[1]], String[1]]`
 
@@ -11052,7 +11068,7 @@ as it instead uses [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mo
 
 Default value: `[]`
 
-##### <a name="proxy_pass"></a>`proxy_pass`
+##### <a name="-apache--vhost--proxy--proxy_pass"></a>`proxy_pass`
 
 Data type: `Optional[Array[Apache::Vhost::ProxyPass]]`
 
@@ -11061,9 +11077,9 @@ configuration.
 See the documentation for the Apache::Vhost::ProxyPass data type for a detailed
 description of the structure including optional parameters.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_pass_match"></a>`proxy_pass_match`
+##### <a name="-apache--vhost--proxy--proxy_pass_match"></a>`proxy_pass_match`
 
 Data type: `Optional[Array[Apache::Vhost::ProxyPass]]`
 
@@ -11071,35 +11087,35 @@ This directive is equivalent to `proxy_pass`, but takes regular expressions, see
 [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)
 for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_requests"></a>`proxy_requests`
+##### <a name="-apache--vhost--proxy--proxy_requests"></a>`proxy_requests`
 
 Data type: `Boolean`
 
 Enables forward (standard) proxy requests. See [ProxyRequests](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests) for details.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="proxy_preserve_host"></a>`proxy_preserve_host`
+##### <a name="-apache--vhost--proxy--proxy_preserve_host"></a>`proxy_preserve_host`
 
 Data type: `Boolean`
 
 When enabled, pass the `Host:` line from the incoming request to the proxied host.
 See [ProxyPreserveHost](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost) for details.
 
-Default value: ``false``
+Default value: `false`
 
-##### <a name="proxy_add_headers"></a>`proxy_add_headers`
+##### <a name="-apache--vhost--proxy--proxy_add_headers"></a>`proxy_add_headers`
 
 Data type: `Optional[Boolean]`
 
 Add X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Server HTTP headers.
 See [ProxyAddHeaders](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders) for details.
 
-Default value: ``undef``
+Default value: `undef`
 
-##### <a name="proxy_error_override"></a>`proxy_error_override`
+##### <a name="-apache--vhost--proxy--proxy_error_override"></a>`proxy_error_override`
 
 Data type: `Boolean`
 
@@ -11107,11 +11123,11 @@ Override error pages from the proxied host. The current Puppet implementation
 supports enabling or disabling the directive, but not specifying a custom list
 of status codes. See [ProxyErrorOverride](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride) for details.
 
-Default value: ``false``
+Default value: `false`
 
 ## Functions
 
-### <a name="apacheapache_pw_hash"></a>`apache::apache_pw_hash`
+### <a name="apache--apache_pw_hash"></a>`apache::apache_pw_hash`
 
 Type: Ruby 4.x API
 
@@ -11129,7 +11145,7 @@ Data type: `Any`
 
 
 
-### <a name="apacheauthz_core_config"></a>`apache::authz_core_config`
+### <a name="apache--authz_core_config"></a>`apache::authz_core_config`
 
 Type: Ruby 4.x API
 
@@ -11225,7 +11241,7 @@ Data type: `Hash`
 
 The input as JSON format.
 
-### <a name="apachebool2httpd"></a>`apache::bool2httpd`
+### <a name="apache--bool2httpd"></a>`apache::bool2httpd`
 
 Type: Ruby 4.x API
 
@@ -11270,7 +11286,7 @@ Data type: `Any`
 
 The value to be converted into a string.
 
-### <a name="apachepw_hash"></a>`apache::pw_hash`
+### <a name="apache--pw_hash"></a>`apache::pw_hash`
 
 Type: Ruby 4.x API
 
@@ -11328,7 +11344,7 @@ Data type: `Any`
 
 ## Data types
 
-### <a name="apacheloglevel"></a>`Apache::LogLevel`
+### <a name="Apache--LogLevel"></a>`Apache::LogLevel`
 
 A string that conforms to the Apache `LogLevel` syntax.
 Different levels can be specified for individual apache modules.
@@ -11356,26 +11372,18 @@ The levels are (in order of decreasing significance):
 * **See also**
   * https://httpd.apache.org/docs/current/mod/core.html#loglevel
 
-Alias of
+Alias of `Pattern[/\A([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])(\s+([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8]))*\Z/]`
 
-```puppet
-Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
-```
-
-### <a name="apachemodproxyprotocol"></a>`Apache::ModProxyProtocol`
+### <a name="Apache--ModProxyProtocol"></a>`Apache::ModProxyProtocol`
 
 Supported protocols / schemes by mod_proxy
 
 * **See also**
   * https://httpd.apache.org/docs/2.4/mod/mod_proxy.html
 
-Alias of
-
-```puppet
-Pattern[/(\A(ajp|fcgi|ftp|h2c?|https?|scgi|uwsgi|wss?):\/\/.+\z)/, /(\Aunix:\/([^\n\/\0]+\/*)*\z)/]
-```
+Alias of `Pattern[/(\A(ajp|fcgi|ftp|h2c?|https?|scgi|uwsgi|wss?):\/\/.+\z)/, /(\Aunix:\/([^\n\/\0]+\/*)*\z)/]`
 
-### <a name="apacheoidcsettings"></a>`Apache::OIDCSettings`
+### <a name="Apache--OIDCSettings"></a>`Apache::OIDCSettings`
 
 https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 
@@ -11493,40 +11501,28 @@ Struct[{
   }]
 ```
 
-### <a name="apacheonoff"></a>`Apache::OnOff`
+### <a name="Apache--OnOff"></a>`Apache::OnOff`
 
 A string that is accepted in Apache config to turn something on or off
 
-Alias of
-
-```puppet
-Enum['On', 'on', 'Off', 'off']
-```
+Alias of `Enum['On', 'on', 'Off', 'off']`
 
-### <a name="apacheservertokens"></a>`Apache::ServerTokens`
+### <a name="Apache--ServerTokens"></a>`Apache::ServerTokens`
 
 A string that conforms to the Apache `ServerTokens` syntax.
 
 * **See also**
   * https://httpd.apache.org/docs/2.4/mod/core.html#servertokens
 
-Alias of
-
-```puppet
-Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']
-```
+Alias of `Enum['Major', 'Minor', 'Min', 'Minimal', 'Prod', 'ProductOnly', 'OS', 'Full']`
 
-### <a name="apachevhostpriority"></a>`Apache::Vhost::Priority`
+### <a name="Apache--Vhost--Priority"></a>`Apache::Vhost::Priority`
 
 The priority on vhost
 
-Alias of
-
-```puppet
-Variant[Pattern[/^\d+$/], Integer, Boolean]
-```
+Alias of `Variant[Pattern[/^\d+$/], Integer, Boolean]`
 
-### <a name="apachevhostproxypass"></a>`Apache::Vhost::ProxyPass`
+### <a name="Apache--Vhost--ProxyPass"></a>`Apache::Vhost::ProxyPass`
 
 host context. Because the implementation uses SetEnv, you must `include apache::mod::env`;
 for the same reason, this cannot set the newer `no-proxy` environment variable, which
@@ -11614,35 +11610,35 @@ Struct[{
 
 The following parameters are available in the `Apache::Vhost::ProxyPass` data type:
 
-* [`path`](#path)
-* [`url`](#url)
-* [`params`](#params)
-* [`reverse_urls`](#reverse_urls)
-* [`reverse_cookies`](#reverse_cookies)
-* [`keywords`](#keywords)
-* [`setenv`](#setenv)
-* [`no_proxy_uris`](#no_proxy_uris)
-* [`no_proxy_uris_match`](#no_proxy_uris_match)
+* [`path`](#-Apache--Vhost--ProxyPass--path)
+* [`url`](#-Apache--Vhost--ProxyPass--url)
+* [`params`](#-Apache--Vhost--ProxyPass--params)
+* [`reverse_urls`](#-Apache--Vhost--ProxyPass--reverse_urls)
+* [`reverse_cookies`](#-Apache--Vhost--ProxyPass--reverse_cookies)
+* [`keywords`](#-Apache--Vhost--ProxyPass--keywords)
+* [`setenv`](#-Apache--Vhost--ProxyPass--setenv)
+* [`no_proxy_uris`](#-Apache--Vhost--ProxyPass--no_proxy_uris)
+* [`no_proxy_uris_match`](#-Apache--Vhost--ProxyPass--no_proxy_uris_match)
 
-##### <a name="path"></a>`path`
+##### <a name="-Apache--Vhost--ProxyPass--path"></a>`path`
 
 Data type: `String[1]`
 
 The virtual path on the local server to map.
 
-##### <a name="url"></a>`url`
+##### <a name="-Apache--Vhost--ProxyPass--url"></a>`url`
 
 Data type: `String[1]`
 
 The URL to which the path and its children will be mapped.
 
-##### <a name="params"></a>`params`
+##### <a name="-Apache--Vhost--ProxyPass--params"></a>`params`
 
 Data type: `Optional[Hash]`
 
 Optional [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) key-value parameters, such as connection settings.
 
-##### <a name="reverse_urls"></a>`reverse_urls`
+##### <a name="-Apache--Vhost--ProxyPass--reverse_urls"></a>`reverse_urls`
 
 Data type: `Array[String[1]]`
 
@@ -11650,7 +11646,7 @@ Optional (but usually recommended) URLs for [ProxyPassReverse](https://httpd.apa
 Allows Apache to adjust certain headers on HTTP redirect responses, to prevent
 redirects on the back-end from bypassing the reverse proxy.
 
-##### <a name="reverse_cookies"></a>`reverse_cookies`
+##### <a name="-Apache--Vhost--ProxyPass--reverse_cookies"></a>`reverse_cookies`
 
 Data type: `Optional[Array[Hash]]`
 
@@ -11666,7 +11662,7 @@ Options:
 * **:path** `Optional[String[1]]`: Internal path for [ProxyPassReverseCookiePath](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiepath) configuration.
 * **:domain** `Optional[String[1]]`: Internal domain for [ProxyPassReverseCookieDomain](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreversecookiedomain) configuration.
 
-##### <a name="keywords"></a>`keywords`
+##### <a name="-Apache--Vhost--ProxyPass--keywords"></a>`keywords`
 
 Data type: `Optional[Array[String[1]]]`
 
@@ -11674,20 +11670,20 @@ Array of optional keywords such as `nocanon`, `interpolate`, or `noquery` suppor
 by [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) (refer
 to subsection under heading "Additional ProxyPass Keywords").
 
-##### <a name="setenv"></a>`setenv`
+##### <a name="-Apache--Vhost--ProxyPass--setenv"></a>`setenv`
 
 Data type: `Optional[Array[String[1]]]`
 
 Optional Array of Strings of the form "${env_var_name} ${value}".
 Uses [SetEnv](https://httpd.apache.org/docs/current/mod/mod_env.html#setenv) to make [Protocol Adjustments](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) to mod_proxy in the virtual
 
-##### <a name="no_proxy_uris"></a>`no_proxy_uris`
+##### <a name="-Apache--Vhost--ProxyPass--no_proxy_uris"></a>`no_proxy_uris`
 
 Data type: `Optional[Array[String[1]]]`
 
 Optional Array of paths to exclude from proxying, using the `!` directive to [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass).
 
-##### <a name="no_proxy_uris_match"></a>`no_proxy_uris_match`
+##### <a name="-Apache--Vhost--ProxyPass--no_proxy_uris_match"></a>`no_proxy_uris_match`
 
 Data type: `Optional[Array[String[1]]]`
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 75e77c2ed1..0c73e9e21e 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1325,6 +1325,83 @@
 #   Any handlers you do not set in these hashes are considered `undefined` within Puppet and 
 #   are not added to the virtual host, resulting in the module using their default values.
 #
+#   The `directories` param can accepts the different authentication ways, including `gssapi`, `Basic (authz_core)`, 
+#   and others.
+#
+#     * `gssapi` - Specifies mod_auth_gssapi parameters for particular directories in a virtual host directory
+#       TODO: check, if this Documentation is obsolete
+#
+#       ```puppet
+#       apache::vhost { 'sample.example.net':
+#         docroot     => '/path/to/directory',
+#         directories => [
+#           { path   => '/path/to/different/dir',
+#             gssapi => {
+#               acceptor_name            => '{HOSTNAME}',
+#               allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
+#               authname                 => 'Kerberos 5',
+#               authtype                 => 'GSSAPI',
+#               basic_auth               => true,
+#               basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
+#               basic_ticket_timeout     => 300,
+#               connection_bound         => true,
+#               cred_store               => {
+#                 ccache        => ['/path/to/directory'],
+#                 client_keytab => ['/path/to/example.keytab'],
+#                 keytab        => ['/path/to/example.keytab'],
+#               },
+#               deleg_ccache_dir         => '/path/to/directory',
+#               deleg_ccache_env_var     => 'KRB5CCNAME',
+#               deleg_ccache_perms       => {
+#                 mode => '0600',
+#                 uid  => 'example-user',
+#                 gid  => 'example-group',
+#               },
+#               deleg_ccache_unique      => true,
+#               impersonate              => true,
+#               local_name               => true,
+#               name_attributes          => 'json',
+#               negotiate_once           => true,
+#               publish_errors           => true,
+#               publish_mech             => true,
+#               required_name_attributes =>	'auth-indicators=high',
+#               session_key              => 'file:/path/to/example.key',
+#               signal_persistent_auth   => true,
+#               ssl_only                 => true,
+#               use_s4u2_proxy           => true,
+#               use_sessions             => true,
+#             }
+#           },
+#         ],
+#       }
+#       ```
+#
+#     * `Basic` - Specifies mod_authz_core parameters for particular directories in a virtual host directory
+#       ```puppet
+#       apache::vhost { 'sample.example.net':
+#         docroot     => '/path/to/directory',
+#         directories => [
+#           {
+#             path        => '/path/to/different/dir',
+#             auth_type => 'Basic',
+#             authz_core  => {
+#               require_all => {
+#                 'require_any' => {
+#                   'require' => ['user superadmin'],
+#                   'require_all' => {
+#                     'require' => ['group admins', 'ldap-group "cn=Administrators,o=Airius"'],
+#                   },
+#                 },
+#                 'require_none' => {
+#                   'require' => ['group temps', 'ldap-group "cn=Temporary Employees,o=Airius"']
+#                 }
+#               }
+#             }
+#           },
+#         ],
+#       }
+#       ```
+#
 # @param custom_fragment
 #   Pass a string of custom configuration directives to be placed at the end of the directory 
 #   configuration.
@@ -1405,83 +1482,6 @@
 #   }
 #   ```
 #
-# TODO: check, if this Documentation is obsolete
-# lint:ignore:parameter_documentation
-# @param gssapi
-# lint:endignore
-#   Specfies mod_auth_gssapi parameters for particular directories in a virtual host directory
-#   ```puppet
-#   apache::vhost { 'sample.example.net':
-#     docroot     => '/path/to/directory',
-#     directories => [
-#       { path   => '/path/to/different/dir',
-#         gssapi => {
-#           acceptor_name            => '{HOSTNAME}',
-#           allowed_mech             => ['krb5', 'iakerb', 'ntlmssp'],
-#           authname                 => 'Kerberos 5',
-#           authtype                 => 'GSSAPI',
-#           basic_auth               => true,
-#           basic_auth_mech          => ['krb5', 'iakerb', 'ntlmssp'],
-#           basic_ticket_timeout     => 300,
-#           connection_bound         => true,
-#           cred_store               => {
-#             ccache        => ['/path/to/directory'],
-#             client_keytab => ['/path/to/example.keytab'],
-#             keytab        => ['/path/to/example.keytab'],
-#           },
-#           deleg_ccache_dir         => '/path/to/directory',
-#           deleg_ccache_env_var     => 'KRB5CCNAME',
-#           deleg_ccache_perms       => {
-#             mode => '0600',
-#             uid  => 'example-user',
-#             gid  => 'example-group',
-#           },
-#           deleg_ccache_unique      => true,
-#           impersonate              => true,
-#           local_name               => true,
-#           name_attributes          => 'json',
-#           negotiate_once           => true,
-#           publish_errors           => true,
-#           publish_mech             => true,
-#           required_name_attributes =>	'auth-indicators=high',
-#           session_key              => 'file:/path/to/example.key',
-#           signal_persistent_auth   => true,
-#           ssl_only                 => true,
-#           use_s4u2_proxy           => true,
-#           use_sessions             => true,
-#         }
-#       },
-#     ],
-#   }
-#   ```
-#
-# lint:ignore:parameter_documentation
-# @param authz_core
-# lint:endignore
-#   Specifies mod_authz_core parameters for particular directories in a virtual host directory
-#   ```puppet
-#   apache::vhost { 'sample.example.net':
-#     docroot     => '/path/to/directory',
-#     directories => [
-#       { path        => '/path/to/different/dir',
-#         authz_core  => {
-#           require_all => {
-#             'require_any' => {
-#               'require' => ['user superadmin'],
-#               'require_all' => {
-#                 'require' => ['group admins', 'ldap-group "cn=Administrators,o=Airius"'],
-#               },
-#             },
-#             'require_none' => {
-#               'require' => ['group temps', 'ldap-group "cn=Temporary Employees,o=Airius"']
-#             }
-#           }
-#         }
-#       },
-#     ],
-#   }
-#   ```
-#
 # @param ssl
 #   Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries.
 #

From 10912d085ce184e77308e4b1b5dccc7ffb59761a Mon Sep 17 00:00:00 2001
From: praj1001 <134480625+praj1001@users.noreply.github.com>
Date: Wed, 20 Sep 2023 15:45:11 +0530
Subject: [PATCH 2166/2267] (CAT-1424)-Removal of redhat/scientific/oraclelinux
 6 for apache module

---
 spec/acceptance/itk_spec.rb                   | 22 +++----------------
 spec/classes/mod/lbmethod_bybusyness.rb       | 17 --------------
 spec/classes/mod/lbmethod_byrequests.rb       | 17 --------------
 spec/classes/mod/lbmethod_bytraffic.rb        | 17 --------------
 spec/classes/mod/lbmethod_heartbeat.rb        | 17 --------------
 spec/defines/vhost_spec.rb                    |  3 +--
 .../apache_mod_platform_compatibility_spec.rb |  8 +++----
 7 files changed, 8 insertions(+), 93 deletions(-)

diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 914cc7aeb5..cb183def2f 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -5,38 +5,22 @@
 case os[:family]
 when 'debian', 'ubuntu'
   service_name = 'apache2'
-  variant = :prefork
 when 'redhat'
-  unless %r{^5}.match?(os[:release])
-    variant = (os[:release].to_i >= 7) ? :prefork : :itk_only
-    service_name = 'httpd'
-  end
+  service_name = 'httpd'
 when 'freebsd'
   service_name = 'apache24'
-  variant = :prefork
 end
 
 # IAC-787: The http-itk mod package is not available in any of the standard RHEL/CentOS 8.x repos. Disable this test
 # on those platforms until we can find a suitable source for this package.
 describe 'apache::mod::itk class', if: service_name && mod_supported_on_platform?('apache::mod::itk') do
   describe 'running puppet code' do
-    let(:pp) do
-      case variant
-      when :prefork
-        <<-MANIFEST
+    pp = <<-MANIFEST
             class { 'apache':
               mpm_module => 'prefork',
             }
             class { 'apache::mod::itk': }
-        MANIFEST
-      when :itk_only
-        <<-MANIFEST
-            class { 'apache':
-              mpm_module => 'itk',
-            }
-        MANIFEST
-      end
-    end
+    MANIFEST
 
     it 'behaves idempotently' do
       idempotent_apply(pp)
diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb
index 8e26df19a7..2a54c8335e 100644
--- a/spec/classes/mod/lbmethod_bybusyness.rb
+++ b/spec/classes/mod/lbmethod_bybusyness.rb
@@ -17,23 +17,6 @@
         # rubocop:disable Layout/LineLength
         expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                    'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
-      }
-    end
-  end
-
-  context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4'
-        }
-      end
-
-      it {
-        expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                                   'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
         # rubocop:enable Layout/LineLength
       }
     end
diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb
index 8e26df19a7..2a54c8335e 100644
--- a/spec/classes/mod/lbmethod_byrequests.rb
+++ b/spec/classes/mod/lbmethod_byrequests.rb
@@ -17,23 +17,6 @@
         # rubocop:disable Layout/LineLength
         expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                    'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
-      }
-    end
-  end
-
-  context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4'
-        }
-      end
-
-      it {
-        expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                                   'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
         # rubocop:enable Layout/LineLength
       }
     end
diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb
index 8e26df19a7..2a54c8335e 100644
--- a/spec/classes/mod/lbmethod_bytraffic.rb
+++ b/spec/classes/mod/lbmethod_bytraffic.rb
@@ -17,23 +17,6 @@
         # rubocop:disable Layout/LineLength
         expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                    'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
-      }
-    end
-  end
-
-  context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4'
-        }
-      end
-
-      it {
-        expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                                   'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
         # rubocop:enable Layout/LineLength
       }
     end
diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb
index 8e26df19a7..2a54c8335e 100644
--- a/spec/classes/mod/lbmethod_heartbeat.rb
+++ b/spec/classes/mod/lbmethod_heartbeat.rb
@@ -17,23 +17,6 @@
         # rubocop:disable Layout/LineLength
         expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
                                                                                                    'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
-      }
-    end
-  end
-
-  context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
-
-    context 'with Apache version >= 2.4' do
-      let :params do
-        {
-          apache_version: '2.4'
-        }
-      end
-
-      it {
-        expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                                   'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
         # rubocop:enable Layout/LineLength
       }
     end
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 9b5c4e8166..4fa39cf40f 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -2020,8 +2020,7 @@
             it { is_expected.to compile }
             it { is_expected.to contain_concat('25-rspec.example.com.conf') }
 
-            if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) ||
-               (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11)
+            if os_facts[:os]['family'] == 'RedHat' || os_facts[:os]['name'] == 'SLES'
               it {
                 expect(subject).to contain_concat__fragment('rspec.example.com-directories').with(
                   content: %r{^\s+Require all granted$},
diff --git a/spec/util/apache_mod_platform_compatibility_spec.rb b/spec/util/apache_mod_platform_compatibility_spec.rb
index d2fe142542..91220c46c3 100644
--- a/spec/util/apache_mod_platform_compatibility_spec.rb
+++ b/spec/util/apache_mod_platform_compatibility_spec.rb
@@ -12,10 +12,10 @@
   foobar_linux = 'foobar_linux'
 
   expected_compatible_platform_versions = {
-    'redhat' => [6, 7, 8],
-    'centos' => [6, 7, 8],
-    'oraclelinux' => [6, 7],
-    'scientific' => [6, 7],
+    'redhat' => [7, 8],
+    'centos' => [7, 8],
+    'oraclelinux' => [7],
+    'scientific' => [7],
     'debian' => [8, 9, 10],
     'sles' => [11, 12, 15],
     'ubuntu' => [14, 16, 18]

From ffbcb58023e54d16c643c2215d3cf4a3f7228992 Mon Sep 17 00:00:00 2001
From: praj1001 <134480625+praj1001@users.noreply.github.com>
Date: Fri, 8 Sep 2023 00:06:34 +0530
Subject: [PATCH 2167/2267] (CAT-1346) erb_to_epp conversion for mod directory

---
 CHANGELOG.md                                  |    4 +-
 REFERENCE.md                                  |    2 +-
 manifests/mod.pp                              |    8 +-
 manifests/mod/alias.pp                        |    8 +-
 manifests/mod/auth_cas.pp                     |   27 +-
 manifests/mod/auth_mellon.pp                  |   12 +-
 manifests/mod/authn_dbd.pp                    |   13 +-
 manifests/mod/authnz_ldap.pp                  |    2 +-
 manifests/mod/autoindex.pp                    |    4 +-
 manifests/mod/cgid.pp                         |    2 +-
 manifests/mod/cluster.pp                      |   15 +-
 manifests/mod/dav_fs.pp                       |    2 +-
 manifests/mod/deflate.pp                      |    2 +-
 manifests/mod/dir.pp                          |    2 +-
 manifests/mod/disk_cache.pp                   |    8 +-
 manifests/mod/dumpio.pp                       |    2 +-
 manifests/mod/event.pp                        |   14 +-
 manifests/mod/expires.pp                      |    8 +-
 manifests/mod/ext_filter.pp                   |    2 +-
 manifests/mod/fcgid.pp                        |    2 +-
 manifests/mod/geoip.pp                        |   13 +-
 manifests/mod/http2.pp                        |   23 +-
 manifests/mod/info.pp                         |    8 +-
 manifests/mod/itk.pp                          |   12 +-
 manifests/mod/jk.pp                           |   52 +-
 manifests/mod/ldap.pp                         |   15 +-
 manifests/mod/mime.pp                         |    7 +-
 manifests/mod/mime_magic.pp                   |    2 +-
 manifests/mod/negotiation.pp                  |    7 +-
 manifests/mod/nss.pp                          |   10 +-
 manifests/mod/pagespeed.pp                    |   38 +-
 manifests/mod/passenger.pp                    |   90 +-
 manifests/mod/peruser.pp                      |   14 +-
 manifests/mod/prefork.pp                      |   14 +-
 manifests/mod/proxy.pp                        |   11 +-
 manifests/mod/proxy_balancer.pp               |    2 +-
 manifests/mod/proxy_html.pp                   |    2 +-
 manifests/mod/reqtimeout.pp                   |    2 +-
 manifests/mod/rpaf.pp                         |   10 +-
 manifests/mod/security.pp                     |   45 +-
 manifests/mod/setenvif.pp                     |    2 +-
 manifests/mod/ssl.pp                          |   26 +-
 manifests/mod/userdir.pp                      |   12 +-
 manifests/mod/worker.pp                       |   14 +-
 manifests/mod/wsgi.pp                         |   11 +-
 readmes/README_ja_JP.md                       |   12 +-
 templates/mod/_allow.epp                      |    7 +
 templates/mod/_allow.erb                      |    7 -
 templates/mod/_require.epp                    |   33 +
 templates/mod/alias.conf.epp                  |    8 +
 templates/mod/alias.conf.erb                  |    8 -
 templates/mod/auth_cas.conf.epp               |   58 +
 templates/mod/auth_cas.conf.erb               |   58 -
 templates/mod/auth_mellon.conf.epp            |   21 +
 templates/mod/auth_mellon.conf.erb            |   21 -
 templates/mod/authn_dbd.conf.epp              |   17 +
 templates/mod/authn_dbd.conf.erb              |   17 -
 templates/mod/authnz_ldap.conf.epp            |    1 +
 templates/mod/authnz_ldap.conf.erb            |    1 -
 templates/mod/autoindex.conf.epp              |   56 +
 templates/mod/autoindex.conf.erb              |   56 -
 templates/mod/cgid.conf.epp                   |    1 +
 templates/mod/cgid.conf.erb                   |    1 -
 templates/mod/cluster.conf.epp                |   26 +
 templates/mod/cluster.conf.erb                |   26 -
 templates/mod/dav_fs.conf.epp                 |    1 +
 templates/mod/dav_fs.conf.erb                 |    1 -
 templates/mod/deflate.conf.epp                |    7 +
 templates/mod/deflate.conf.erb                |    7 -
 templates/mod/dir.conf.epp                    |    1 +
 templates/mod/dir.conf.erb                    |    1 -
 templates/mod/disk_cache.conf.epp             |    9 +
 templates/mod/disk_cache.conf.erb             |    9 -
 templates/mod/dumpio.conf.epp                 |    3 +
 templates/mod/dumpio.conf.erb                 |    3 -
 templates/mod/event.conf.epp                  |   29 +
 templates/mod/event.conf.erb                  |   29 -
 templates/mod/expires.conf.epp                |   11 +
 templates/mod/expires.conf.erb                |   11 -
 templates/mod/ext_filter.conf.epp             |    4 +
 templates/mod/ext_filter.conf.erb             |    4 -
 templates/mod/fcgid.conf.epp                  |    6 +
 templates/mod/fcgid.conf.erb                  |    5 -
 templates/mod/geoip.conf.epp                  |   25 +
 templates/mod/geoip.conf.erb                  |   25 -
 templates/mod/http2.conf.epp                  |   57 +
 templates/mod/http2.conf.erb                  |   57 -
 templates/mod/info.conf.epp                   |    6 +
 templates/mod/info.conf.erb                   |    6 -
 templates/mod/itk.conf.epp                    |   11 +
 templates/mod/itk.conf.erb                    |   11 -
 templates/mod/jk.conf.epp                     |  167 +++
 templates/mod/jk.conf.erb                     |  167 ---
 ...erties.erb => uriworkermap.properties.epp} |   16 +-
 ....properties.erb => workers.properties.epp} |   40 +-
 templates/mod/ldap.conf.epp                   |   25 +
 templates/mod/ldap.conf.erb                   |   25 -
 templates/mod/load.epp                        |    7 +
 templates/mod/load.erb                        |    7 -
 .../mod/{mime.conf.erb => mime.conf.epp}      |   12 +-
 templates/mod/mime_magic.conf.epp             |    1 +
 templates/mod/mime_magic.conf.erb             |    1 -
 ...{mpm_event.conf.erb => mpm_event.conf.epp} |    0
 templates/mod/negotiation.conf.epp            |   12 +
 templates/mod/negotiation.conf.erb            |    2 -
 templates/mod/{nss.conf.erb => nss.conf.epp}  |   18 +-
 templates/mod/pagespeed.conf.epp              |   87 ++
 templates/mod/pagespeed.conf.erb              |   87 --
 templates/mod/passenger.conf.epp              |  262 ++++
 templates/mod/passenger.conf.erb              |  262 ----
 templates/mod/peruser.conf.epp                |   12 +
 templates/mod/peruser.conf.erb                |   12 -
 templates/mod/prefork.conf.epp                |   17 +
 templates/mod/prefork.conf.erb                |   17 -
 templates/mod/proxy.conf.epp                  |   32 +
 templates/mod/proxy.conf.erb                  |   32 -
 templates/mod/proxy_balancer.conf.epp         |    4 +
 templates/mod/proxy_balancer.conf.erb         |    4 -
 ...roxy_html.conf.erb => proxy_html.conf.epp} |    0
 templates/mod/reqtimeout.conf.epp             |    8 +
 templates/mod/reqtimeout.conf.erb             |    3 -
 .../mod/{rpaf.conf.erb => rpaf.conf.epp}      |    6 +-
 .../{security.conf.erb => security.conf.epp}  |   58 +-
 templates/mod/security_crs.conf.epp           | 1271 +++++++++++++++++
 templates/mod/security_custom.conf.epp        |    6 +
 templates/mod/security_custom.conf.erb        |    6 -
 .../{setenvif.conf.erb => setenvif.conf.epp}  |    0
 templates/mod/ssl.conf.epp                    |   58 +
 templates/mod/ssl.conf.erb                    |   58 -
 templates/mod/status.conf.epp                 |   14 +
 templates/mod/userdir.conf.epp                |   22 +
 templates/mod/userdir.conf.erb                |   22 -
 templates/mod/worker.conf.epp                 |   11 +
 templates/mod/worker.conf.erb                 |   11 -
 templates/mod/wsgi.conf.epp                   |   22 +
 templates/mod/wsgi.conf.erb                   |   22 -
 136 files changed, 3044 insertions(+), 1237 deletions(-)
 create mode 100644 templates/mod/_allow.epp
 delete mode 100644 templates/mod/_allow.erb
 create mode 100644 templates/mod/_require.epp
 create mode 100644 templates/mod/alias.conf.epp
 delete mode 100644 templates/mod/alias.conf.erb
 create mode 100644 templates/mod/auth_cas.conf.epp
 delete mode 100644 templates/mod/auth_cas.conf.erb
 create mode 100644 templates/mod/auth_mellon.conf.epp
 delete mode 100644 templates/mod/auth_mellon.conf.erb
 create mode 100644 templates/mod/authn_dbd.conf.epp
 delete mode 100644 templates/mod/authn_dbd.conf.erb
 create mode 100644 templates/mod/authnz_ldap.conf.epp
 delete mode 100644 templates/mod/authnz_ldap.conf.erb
 create mode 100644 templates/mod/autoindex.conf.epp
 delete mode 100644 templates/mod/autoindex.conf.erb
 create mode 100644 templates/mod/cgid.conf.epp
 delete mode 100644 templates/mod/cgid.conf.erb
 create mode 100644 templates/mod/cluster.conf.epp
 delete mode 100644 templates/mod/cluster.conf.erb
 create mode 100644 templates/mod/dav_fs.conf.epp
 delete mode 100644 templates/mod/dav_fs.conf.erb
 create mode 100644 templates/mod/deflate.conf.epp
 delete mode 100644 templates/mod/deflate.conf.erb
 create mode 100644 templates/mod/dir.conf.epp
 delete mode 100644 templates/mod/dir.conf.erb
 create mode 100644 templates/mod/disk_cache.conf.epp
 delete mode 100644 templates/mod/disk_cache.conf.erb
 create mode 100644 templates/mod/dumpio.conf.epp
 delete mode 100644 templates/mod/dumpio.conf.erb
 create mode 100644 templates/mod/event.conf.epp
 delete mode 100644 templates/mod/event.conf.erb
 create mode 100644 templates/mod/expires.conf.epp
 delete mode 100644 templates/mod/expires.conf.erb
 create mode 100644 templates/mod/ext_filter.conf.epp
 delete mode 100644 templates/mod/ext_filter.conf.erb
 create mode 100644 templates/mod/fcgid.conf.epp
 delete mode 100644 templates/mod/fcgid.conf.erb
 create mode 100644 templates/mod/geoip.conf.epp
 delete mode 100644 templates/mod/geoip.conf.erb
 create mode 100644 templates/mod/http2.conf.epp
 delete mode 100644 templates/mod/http2.conf.erb
 create mode 100644 templates/mod/info.conf.epp
 delete mode 100644 templates/mod/info.conf.erb
 create mode 100644 templates/mod/itk.conf.epp
 delete mode 100644 templates/mod/itk.conf.erb
 create mode 100644 templates/mod/jk.conf.epp
 delete mode 100644 templates/mod/jk.conf.erb
 rename templates/mod/jk/{uriworkermap.properties.erb => uriworkermap.properties.epp} (75%)
 rename templates/mod/jk/{workers.properties.erb => workers.properties.epp} (65%)
 create mode 100644 templates/mod/ldap.conf.epp
 delete mode 100644 templates/mod/ldap.conf.erb
 create mode 100644 templates/mod/load.epp
 delete mode 100644 templates/mod/load.erb
 rename templates/mod/{mime.conf.erb => mime.conf.epp} (70%)
 create mode 100644 templates/mod/mime_magic.conf.epp
 delete mode 100644 templates/mod/mime_magic.conf.erb
 rename templates/mod/{mpm_event.conf.erb => mpm_event.conf.epp} (100%)
 create mode 100644 templates/mod/negotiation.conf.epp
 delete mode 100644 templates/mod/negotiation.conf.erb
 rename templates/mod/{nss.conf.erb => nss.conf.epp} (97%)
 create mode 100644 templates/mod/pagespeed.conf.epp
 delete mode 100644 templates/mod/pagespeed.conf.erb
 create mode 100644 templates/mod/passenger.conf.epp
 delete mode 100644 templates/mod/passenger.conf.erb
 create mode 100644 templates/mod/peruser.conf.epp
 delete mode 100644 templates/mod/peruser.conf.erb
 create mode 100644 templates/mod/prefork.conf.epp
 delete mode 100644 templates/mod/prefork.conf.erb
 create mode 100644 templates/mod/proxy.conf.epp
 delete mode 100644 templates/mod/proxy.conf.erb
 create mode 100644 templates/mod/proxy_balancer.conf.epp
 delete mode 100644 templates/mod/proxy_balancer.conf.erb
 rename templates/mod/{proxy_html.conf.erb => proxy_html.conf.epp} (100%)
 create mode 100644 templates/mod/reqtimeout.conf.epp
 delete mode 100644 templates/mod/reqtimeout.conf.erb
 rename templates/mod/{rpaf.conf.erb => rpaf.conf.epp} (73%)
 rename templates/mod/{security.conf.erb => security.conf.epp} (61%)
 create mode 100644 templates/mod/security_crs.conf.epp
 create mode 100644 templates/mod/security_custom.conf.epp
 delete mode 100644 templates/mod/security_custom.conf.erb
 rename templates/mod/{setenvif.conf.erb => setenvif.conf.epp} (100%)
 create mode 100644 templates/mod/ssl.conf.epp
 delete mode 100644 templates/mod/ssl.conf.erb
 create mode 100644 templates/mod/status.conf.epp
 create mode 100644 templates/mod/userdir.conf.epp
 delete mode 100644 templates/mod/userdir.conf.erb
 create mode 100644 templates/mod/worker.conf.epp
 delete mode 100644 templates/mod/worker.conf.erb
 create mode 100644 templates/mod/wsgi.conf.epp
 delete mode 100644 templates/mod/wsgi.conf.erb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d510db004..9ccee3c0b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -314,7 +314,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Added
 
-- The default disk_cache.conf.erb caches everything.  [#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
+- The default disk_cache.conf.epp caches everything.  [#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
 
 ## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) - 2021-05-24
 
@@ -995,7 +995,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - (MODULES-2764) Enclose IPv6 addresses in square brackets [#1248](https://github.com/puppetlabs/puppetlabs-apache/pull/1248) ([Benedikt1992](https://github.com/Benedikt1992))
 - (MODULES-2757) Adding if around ServerName in template [#1237](https://github.com/puppetlabs/puppetlabs-apache/pull/1237) ([damonconway](https://github.com/damonconway))
 - (MODULES-2651) Default document root update for Ubuntu 14.04 and Debian 8 [#1235](https://github.com/puppetlabs/puppetlabs-apache/pull/1235) ([abednarik](https://github.com/abednarik))
-- Update mime.conf.erb to support dynamic AddHandler AddType AddOutputF… [#1232](https://github.com/puppetlabs/puppetlabs-apache/pull/1232) ([prabin5](https://github.com/prabin5))
+- Update mime.conf.epp to support dynamic AddHandler AddType AddOutputF… [#1232](https://github.com/puppetlabs/puppetlabs-apache/pull/1232) ([prabin5](https://github.com/prabin5))
 - #2544 Allow multiple IP addresses per vhost [#1229](https://github.com/puppetlabs/puppetlabs-apache/pull/1229) ([Benedikt1992](https://github.com/Benedikt1992))
 - RewriteLock support [#1228](https://github.com/puppetlabs/puppetlabs-apache/pull/1228) ([wickedOne](https://github.com/wickedOne))
 - (MODULES-2120) Allow empty docroot [#1224](https://github.com/puppetlabs/puppetlabs-apache/pull/1224) ([DavidS](https://github.com/DavidS))
diff --git a/REFERENCE.md b/REFERENCE.md
index 1b03b5a9b0..9413a4848d 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5983,7 +5983,7 @@ Data type: `String`
 
 Path to template to use for configuring mod_rpaf.
 
-Default value: `'apache/mod/rpaf.conf.erb'`
+Default value: `'apache/mod/rpaf.conf.epp'`
 
 ### <a name="apache--mod--security"></a>`apache::mod::security`
 
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 9c9b26c39c..2a38ee2fdb 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -114,13 +114,19 @@
     }
   }
 
+  $parameters = {
+    'loadfiles' => $loadfiles,
+    '_id'       => $_id,
+    '_path'     => $_path,
+  }
+
   file { $_loadfile_name:
     ensure  => file,
     path    => "${mod_dir}/${_loadfile_name}",
     owner   => 'root',
     group   => $apache::params::root_group,
     mode    => $apache::file_mode,
-    content => template('apache/mod/load.erb'),
+    content => epp('apache/mod/load.epp', $parameters),
     require => [
       Package['httpd'],
       Exec["mkdir ${mod_dir}"],
diff --git a/manifests/mod/alias.pp b/manifests/mod/alias.pp
index 4c10a72c3b..d3bc167dac 100644
--- a/manifests/mod/alias.pp
+++ b/manifests/mod/alias.pp
@@ -28,12 +28,18 @@
   apache::mod { 'alias': }
 
   # Template uses $icons_path
+  $parameters = {
+    'icons_prefix'  => $icons_prefix,
+    'icons_path'    => $icons_path,
+    'icons_options' => $icons_options,
+  }
+
   if $icons_path {
     file { 'alias.conf':
       ensure  => file,
       path    => "${apache::mod_dir}/alias.conf",
       mode    => $apache::file_mode,
-      content => template('apache/mod/alias.conf.erb'),
+      content => epp('apache/mod/alias.conf.epp', $parameters),
       require => Exec["mkdir ${apache::mod_dir}"],
       before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
index 16801328e0..656b9dd579 100644
--- a/manifests/mod/auth_cas.pp
+++ b/manifests/mod/auth_cas.pp
@@ -126,13 +126,38 @@
     group  => $apache::group,
   }
 
+  $parameters = {
+    'cas_cookie_path'           => $cas_cookie_path,
+    'cas_login_url'             => $cas_login_url,
+    'cas_validate_url'          => $cas_validate_url,
+    'cas_version'               => $cas_version,
+    'cas_debug'                 => $cas_debug,
+    'cas_certificate_path'      => $cas_certificate_path,
+    'cas_proxy_validate_url'    => $cas_proxy_validate_url,
+    'cas_validate_server'       => $cas_validate_server,
+    'cas_validate_depth'        => $cas_validate_depth,
+    'cas_root_proxied_as'       => $cas_root_proxied_as,
+    'cas_cookie_entropy'        => $cas_cookie_entropy,
+    'cas_timeout'               => $cas_timeout,
+    'cas_idle_timeout'          => $cas_idle_timeout,
+    'cas_cache_clean_interval'  => $cas_cache_clean_interval,
+    'cas_cookie_domain'         => $cas_cookie_domain,
+    'cas_cookie_http_only'      => $cas_cookie_http_only,
+    'cas_authoritative'         => $cas_authoritative,
+    'cas_sso_enabled'           => $cas_sso_enabled,
+    'cas_validate_saml'         => $cas_validate_saml,
+    'cas_attribute_prefix'      => $cas_attribute_prefix,
+    'cas_attribute_delimiter'   => $cas_attribute_delimiter,
+    'cas_scrub_request_headers' => $cas_scrub_request_headers,
+  }
+
   # Template uses
   # - All variables beginning with cas_
   file { 'auth_cas.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/auth_cas.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/auth_cas.conf.erb'),
+    content => epp('apache/mod/auth_cas.conf.epp', $parameters),
     require => [Exec["mkdir ${apache::mod_dir}"],],
     before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],
diff --git a/manifests/mod/auth_mellon.pp b/manifests/mod/auth_mellon.pp
index dd40bf03b4..5dcb76154b 100644
--- a/manifests/mod/auth_mellon.pp
+++ b/manifests/mod/auth_mellon.pp
@@ -39,11 +39,21 @@
 
   # Template uses
   # - All variables beginning with mellon_
+  $parameters = {
+    'mellon_cache_size'       => $mellon_cache_size,
+    'mellon_cache_entry_size' => $mellon_cache_entry_size,
+    'mellon_lock_file'        => $mellon_lock_file,
+    'mellon_post_directory'   => $mellon_post_directory,
+    'mellon_post_ttl'         => $mellon_post_ttl,
+    'mellon_post_size'        => $mellon_post_size,
+    'mellon_post_count'       => $mellon_post_count,
+  }
+
   file { 'auth_mellon.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/auth_mellon.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/auth_mellon.conf.erb'),
+    content => epp('apache/mod/auth_mellon.conf.epp', $parameters),
     require => [Exec["mkdir ${apache::mod_dir}"],],
     before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],
diff --git a/manifests/mod/authn_dbd.pp b/manifests/mod/authn_dbd.pp
index d775183ddd..78e6df2d01 100644
--- a/manifests/mod/authn_dbd.pp
+++ b/manifests/mod/authn_dbd.pp
@@ -45,13 +45,24 @@
     include apache::mod::authn_core
   }
 
+  $parameters = {
+    'authn_dbd_dbdriver'  => $authn_dbd_dbdriver,
+    'authn_dbd_params'    => $authn_dbd_params,
+    'authn_dbd_min'       => $authn_dbd_min,
+    'authn_dbd_max'       => $authn_dbd_max,
+    'authn_dbd_keep'      => $authn_dbd_keep,
+    'authn_dbd_exptime'   => $authn_dbd_exptime,
+    'authn_dbd_alias'     => $authn_dbd_alias,
+    'authn_dbd_query'     => $authn_dbd_query,
+  }
+
   # Template uses
   # - All variables beginning with authn_dbd
   file { 'authn_dbd.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/authn_dbd.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/authn_dbd.conf.erb'),
+    content => epp('apache/mod/authn_dbd.conf.epp', $parameters),
     require => [Exec["mkdir ${apache::mod_dir}"],],
     before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],
diff --git a/manifests/mod/authnz_ldap.pp b/manifests/mod/authnz_ldap.pp
index ab3ab0502c..9343cfe437 100644
--- a/manifests/mod/authnz_ldap.pp
+++ b/manifests/mod/authnz_ldap.pp
@@ -25,7 +25,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/authnz_ldap.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/authnz_ldap.conf.erb'),
+    content => epp('apache/mod/authnz_ldap.conf.epp', { 'verify_server_cert' => $verify_server_cert, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/autoindex.pp b/manifests/mod/autoindex.pp
index 8bc521e22b..e00d8da96f 100644
--- a/manifests/mod/autoindex.pp
+++ b/manifests/mod/autoindex.pp
@@ -12,7 +12,7 @@
   include apache
   ::apache::mod { 'autoindex': }
 
-  # Determine icon filename suffix for autoindex.conf.erb
+  # Determine icon filename suffix for autoindex.conf.epp
   case $facts['os']['name'] {
     'Debian', 'Ubuntu': {
       $icon_suffix = '-20x22'
@@ -26,7 +26,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/autoindex.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/autoindex.conf.erb'),
+    content => epp('apache/mod/autoindex.conf.epp', { 'icons_prefix' => $icons_prefix, 'icon_suffix' => $icon_suffix, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp
index de3469ba64..fc27bf5158 100644
--- a/manifests/mod/cgid.pp
+++ b/manifests/mod/cgid.pp
@@ -38,7 +38,7 @@
       ensure  => file,
       path    => "${apache::mod_dir}/cgid.conf",
       mode    => $apache::file_mode,
-      content => template('apache/mod/cgid.conf.erb'),
+      content => epp('apache/mod/cgid.conf.epp', { 'cgisock_path' => $cgisock_path }),
       require => Exec["mkdir ${apache::mod_dir}"],
       before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],
diff --git a/manifests/mod/cluster.pp b/manifests/mod/cluster.pp
index 44eeef43be..81f7109965 100644
--- a/manifests/mod/cluster.pp
+++ b/manifests/mod/cluster.pp
@@ -75,11 +75,24 @@
     ::apache::mod { 'slotmem': }
   }
 
+  $parameters = {
+    'ip'                      => $ip,
+    'port'                    => $port,
+    'allowed_network'         => $allowed_network,
+    'keep_alive_timeout'      => $keep_alive_timeout,
+    'max_keep_alive_requests' => $max_keep_alive_requests,
+    'enable_mcpm_receive'     => $enable_mcpm_receive,
+    'balancer_name'           => $balancer_name,
+    'server_advertise'        => $server_advertise,
+    'advertise_frequency'     => $advertise_frequency,
+    'manager_allowed_network' => $manager_allowed_network,
+  }
+
   file { 'cluster.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/cluster.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/cluster.conf.erb'),
+    content => epp('apache/mod/cluster.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp
index 387a47468e..3e725efb7b 100644
--- a/manifests/mod/dav_fs.pp
+++ b/manifests/mod/dav_fs.pp
@@ -19,7 +19,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/dav_fs.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/dav_fs.conf.erb'),
+    content => epp('apache/mod/dav_fs.conf.epp', { 'dav_lock' => $dav_lock }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
index c5a6aaac8a..6912595984 100644
--- a/manifests/mod/deflate.pp
+++ b/manifests/mod/deflate.pp
@@ -30,7 +30,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/deflate.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/deflate.conf.erb'),
+    content => epp('apache/mod/deflate.conf.epp', { 'types' => $types, 'notes' => $notes, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/dir.pp b/manifests/mod/dir.pp
index 23d97c1b39..6de940d21c 100644
--- a/manifests/mod/dir.pp
+++ b/manifests/mod/dir.pp
@@ -32,7 +32,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/dir.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/dir.conf.erb'),
+    content => epp('apache/mod/dir.conf.epp', { 'indexes' => $indexes }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index c0f4b787cf..4a3dc35883 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -41,12 +41,18 @@
 
   Class['apache::mod::cache'] -> Class['apache::mod::disk_cache']
 
+  $parameters = {
+    'default_cache_enable'  => $default_cache_enable,
+    '_cache_root'           => $_cache_root,
+    'cache_ignore_headers'  => $cache_ignore_headers,
+  }
+
   # Template uses $_cache_root
   file { 'disk_cache.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/disk_cache.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/disk_cache.conf.erb'),
+    content => epp('apache/mod/disk_cache.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/dumpio.pp b/manifests/mod/dumpio.pp
index 4246356822..0b5523c622 100644
--- a/manifests/mod/dumpio.pp
+++ b/manifests/mod/dumpio.pp
@@ -30,7 +30,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/dumpio.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/dumpio.conf.erb'),
+    content => epp('apache/mod/dumpio.conf.epp', { 'dump_io_input' => $dump_io_input, 'dump_io_output' => $dump_io_output, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/event.pp b/manifests/mod/event.pp
index 3852e6e0c6..42d646866c 100644
--- a/manifests/mod/event.pp
+++ b/manifests/mod/event.pp
@@ -74,10 +74,22 @@
   # - $maxsparethreads
   # - $threadsperchild
   # - $serverlimit
+  $parameters = {
+    'serverlimit'             => $serverlimit,
+    'startservers'            => $startservers,
+    'maxrequestworkers'       => $maxrequestworkers,
+    'minsparethreads'         => $minsparethreads,
+    'maxsparethreads'         => $maxsparethreads,
+    'threadsperchild'         => $threadsperchild,
+    'maxconnectionsperchild'  => $maxconnectionsperchild,
+    'threadlimit'             => $threadlimit,
+    'listenbacklog'           => $listenbacklog,
+  }
+
   file { "${apache::mod_dir}/event.conf":
     ensure  => file,
     mode    => $apache::file_mode,
-    content => template('apache/mod/event.conf.erb'),
+    content => epp('apache/mod/event.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/expires.pp b/manifests/mod/expires.pp
index 33bd11053f..152cfdbd16 100644
--- a/manifests/mod/expires.pp
+++ b/manifests/mod/expires.pp
@@ -26,11 +26,17 @@
   # $expires_active
   # $expires_default
   # $expires_by_type
+  $parameters = {
+    'expires_active'  => $expires_active,
+    'expires_default' => $expires_default,
+    'expires_by_type' => $expires_by_type,
+  }
+
   file { 'expires.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/expires.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/expires.conf.erb'),
+    content => epp('apache/mod/expires.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/ext_filter.pp b/manifests/mod/ext_filter.pp
index d2a3d635e9..714b5b648d 100644
--- a/manifests/mod/ext_filter.pp
+++ b/manifests/mod/ext_filter.pp
@@ -29,7 +29,7 @@
       ensure  => file,
       path    => "${apache::mod_dir}/ext_filter.conf",
       mode    => $apache::file_mode,
-      content => template('apache/mod/ext_filter.conf.erb'),
+      content => epp('apache/mod/ext_filter.conf.epp', { 'ext_filter_define' => $ext_filter_define, }),
       require => [Exec["mkdir ${apache::mod_dir}"],],
       before  => File[$apache::mod_dir],
       notify  => Class['Apache::Service'],
diff --git a/manifests/mod/fcgid.pp b/manifests/mod/fcgid.pp
index ffec705a41..7f1559cec2 100644
--- a/manifests/mod/fcgid.pp
+++ b/manifests/mod/fcgid.pp
@@ -57,7 +57,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/${conf_name}",
     mode    => $apache::file_mode,
-    content => template('apache/mod/fcgid.conf.erb'),
+    content => epp('apache/mod/fcgid.conf.epp', { 'options'  => $options, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/geoip.pp b/manifests/mod/geoip.pp
index 42050df5cd..9c7262bd55 100644
--- a/manifests/mod/geoip.pp
+++ b/manifests/mod/geoip.pp
@@ -49,11 +49,22 @@
   # - scan_proxy_headers
   # - scan_proxy_header_field
   # - use_last_xforwarededfor_ip
+  $parameters = {
+    'enable'                      => $enable,
+    'db_file'                     => $db_file,
+    'flag'                        => $flag,
+    'output'                      => $output,
+    'enable_utf8'                 => $enable_utf8,
+    'scan_proxy_headers'          => $scan_proxy_headers,
+    'scan_proxy_header_field'     => $scan_proxy_header_field,
+    'use_last_xforwarededfor_ip'  => $use_last_xforwarededfor_ip,
+  }
+
   file { 'geoip.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/geoip.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/geoip.conf.erb'),
+    content => epp('apache/mod/geoip.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/http2.pp b/manifests/mod/http2.pp
index 54323a67bf..83bc86dba8 100644
--- a/manifests/mod/http2.pp
+++ b/manifests/mod/http2.pp
@@ -85,9 +85,30 @@
   include apache
   apache::mod { 'http2': }
 
+  $parameters = {
+    'h2_copy_files'               => $h2_copy_files,
+    'h2_direct'                   => $h2_direct,
+    'h2_early_hints'              => $h2_early_hints,
+    'h2_max_session_streams'      => $h2_max_session_streams,
+    'h2_max_worker_idle_seconds'  => $h2_max_worker_idle_seconds,
+    'h2_max_workers'              => $h2_max_workers,
+    'h2_min_workers'              => $h2_min_workers,
+    'h2_modern_tls_only'          => $h2_modern_tls_only,
+    'h2_push'                     => $h2_push,
+    'h2_push_diary_size'          => $h2_push_diary_size,
+    'h2_push_priority'            => $h2_push_priority,
+    'h2_push_resource'            => $h2_push_resource,
+    'h2_serialize_headers'        => $h2_serialize_headers,
+    'h2_stream_max_mem_size'      => $h2_stream_max_mem_size,
+    'h2_tls_cool_down_secs'       => $h2_tls_cool_down_secs,
+    'h2_tls_warm_up_size'         => $h2_tls_warm_up_size,
+    'h2_upgrade'                  => $h2_upgrade,
+    'h2_window_size'              => $h2_window_size,
+  }
+
   file { 'http2.conf':
     ensure  => file,
-    content => template('apache/mod/http2.conf.erb'),
+    content => epp('apache/mod/http2.conf.epp', $parameters),
     mode    => $apache::file_mode,
     path    => "${apache::mod_dir}/http2.conf",
     owner   => $apache::params::user,
diff --git a/manifests/mod/info.pp b/manifests/mod/info.pp
index 0735a5fc47..42d1569683 100644
--- a/manifests/mod/info.pp
+++ b/manifests/mod/info.pp
@@ -33,12 +33,18 @@
     ::apache::mod { 'info': }
   }
 
+  $parameters = {
+    'info_path'       => $info_path,
+    'restrict_access' => $restrict_access,
+    'allow_from'      => $allow_from,
+  }
+
   # Template uses $allow_from
   file { 'info.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/info.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/info.conf.erb'),
+    content => epp('apache/mod/info.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
index e7143b489c..96940d8593 100644
--- a/manifests/mod/itk.pp
+++ b/manifests/mod/itk.pp
@@ -69,10 +69,20 @@
   # - $serverlimit
   # - $maxclients
   # - $maxrequestsperchild
+  $parameters = {
+    'startservers'        => $startservers,
+    'minspareservers'     => $minspareservers,
+    'maxspareservers'     => $maxspareservers,
+    'serverlimit'         => $serverlimit,
+    'maxclients'          => $maxclients,
+    'maxrequestsperchild' => $maxrequestsperchild,
+    'enablecapabilities'  => $enablecapabilities,
+  }
+
   file { "${apache::mod_dir}/itk.conf":
     ensure  => file,
     mode    => $apache::file_mode,
-    content => template('apache/mod/itk.conf.erb'),
+    content => epp('apache/mod/itk.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
index b288fe64c0..65ed394a30 100644
--- a/manifests/mod/jk.pp
+++ b/manifests/mod/jk.pp
@@ -313,13 +313,13 @@
   Hash $env_var                                 = {},
   Optional[String] $strip_session               = undef,
   # Location list
-  # See comments in template mod/jk.conf.erb
+  # See comments in template mod/jk.conf.epp
   Array $location_list                          = [],
   # Workers file content
-  # See comments in template mod/jk/workers.properties.erb
+  # See comments in template mod/jk/workers.properties.epp
   Hash $workers_file_content                    = {},
   # Mount file content
-  # See comments in template mod/jk/uriworkermap.properties.erb
+  # See comments in template mod/jk/uriworkermap.properties.epp
   Hash $mount_file_content                      = {},
 ) {
   # Provides important variables
@@ -369,11 +369,51 @@
     default     => "${log_dir}/${log_file}",
   }
 
+  $parameters = {
+    'workers_file'          => $workers_file,
+    'worker_property'       => $worker_property,
+    'shm_path'              => $shm_path,
+    'shm_size'              => $shm_size,
+    'mount_file'            => $mount_file,
+    'mount_file_reload'     => $mount_file_reload,
+    'mount'                 => $mount,
+    'un_mount'              => $un_mount,
+    'auto_alias'            => $auto_alias,
+    'mount_copy'            => $mount_copy,
+    'worker_indicator'      => $worker_indicator,
+    'watchdog_interval'     => $watchdog_interval,
+    'log_path'              => $log_path,
+    'log_level'             => $log_level,
+    'log_stamp_format'      => $log_stamp_format,
+    'request_log_format'    => $request_log_format,
+    'extract_ssl'           => $extract_ssl,
+    'https_indicator'       => $https_indicator,
+    'sslprotocol_indicator' => $sslprotocol_indicator,
+    'certs_indicator'       => $certs_indicator,
+    'cipher_indicator'      => $cipher_indicator,
+    'certchain_prefix'      => $certchain_prefix,
+    'session_indicator'     => $session_indicator,
+    'keysize_indicator'     => $keysize_indicator,
+    'local_name_indicator'  => $local_name_indicator,
+    'ignore_cl_indicator'   => $ignore_cl_indicator,
+    'local_addr_indicator'  => $local_addr_indicator,
+    'local_port_indicator'  => $local_port_indicator,
+    'remote_host_indicator' => $remote_host_indicator,
+    'remote_addr_indicator' => $remote_addr_indicator,
+    'remote_port_indicator' => $remote_port_indicator,
+    'remote_user_indicator' => $remote_user_indicator,
+    'auth_type_indicator'   => $auth_type_indicator,
+    'options'               => $options,
+    'env_var'               => $env_var,
+    'strip_session'         => $strip_session,
+    'location_list'         => $location_list,
+  }
+
   # Main config file
   $mod_dir = $apache::mod_dir
   file { 'jk.conf':
     path    => "${mod_dir}/jk.conf",
-    content => template('apache/mod/jk.conf.erb'),
+    content => epp('apache/mod/jk.conf.epp', $parameters),
     require => [
       Exec["mkdir ${mod_dir}"],
       File[$mod_dir],
@@ -387,7 +427,7 @@
       default => "${apache::httpd_dir}/${workers_file}",
     }
     file { $workers_path:
-      content => template('apache/mod/jk/workers.properties.erb'),
+      content => epp('apache/mod/jk/workers.properties.epp', { 'workers_file_content' => $workers_file_content, }),
       require => Package['httpd'],
     }
   }
@@ -399,7 +439,7 @@
       default => "${apache::httpd_dir}/${mount_file}",
     }
     file { $mount_path:
-      content => template('apache/mod/jk/uriworkermap.properties.erb'),
+      content => epp('apache/mod/jk/uriworkermap.properties.epp', { 'mount_file_content' => $mount_file_content, }),
       require => Package['httpd'],
     }
   }
diff --git a/manifests/mod/ldap.pp b/manifests/mod/ldap.pp
index e800bc7396..5297eca5fe 100644
--- a/manifests/mod/ldap.pp
+++ b/manifests/mod/ldap.pp
@@ -61,11 +61,24 @@
   ::apache::mod { 'ldap':
     package => $package_name,
   }
+
+  $parameters = {
+    'ldap_path'                     => $ldap_path,
+    'ldap_trusted_global_cert_file' => $ldap_trusted_global_cert_file,
+    'ldap_trusted_global_cert_type' => $ldap_trusted_global_cert_type,
+    'ldap_trusted_mode'             => $ldap_trusted_mode,
+    'ldap_shared_cache_size'        => $ldap_shared_cache_size,
+    'ldap_cache_entries'            => $ldap_cache_entries,
+    'ldap_cache_ttl'                => $ldap_cache_ttl,
+    'ldap_opcache_entries'          => $ldap_opcache_entries,
+    'ldap_opcache_ttl'              => $ldap_opcache_ttl,
+  }
+
   file { 'ldap.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/ldap.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/ldap.conf.erb'),
+    content => epp('apache/mod/ldap.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index f21d295735..b70e9257de 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -21,11 +21,16 @@
   $_mime_types_additional = pick($mime_types_additional, $apache::mime_types_additional)
   apache::mod { 'mime': }
   # Template uses $_mime_types_config
+  $parameters = {
+    'mime_types_config'      => $mime_types_config,
+    '_mime_types_additional' => $_mime_types_additional,
+  }
+
   file { 'mime.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/mime.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/mime.conf.erb'),
+    content => epp('apache/mod/mime.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/mime_magic.pp b/manifests/mod/mime_magic.pp
index c8bc4f6abd..9e2d1787e3 100644
--- a/manifests/mod/mime_magic.pp
+++ b/manifests/mod/mime_magic.pp
@@ -17,7 +17,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/mime_magic.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/mime_magic.conf.erb'),
+    content => epp('apache/mod/mime_magic.conf.epp', { '_magic_file' => $_magic_file, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
index bc018001a8..7b18540bda 100644
--- a/manifests/mod/negotiation.pp
+++ b/manifests/mod/negotiation.pp
@@ -20,11 +20,16 @@
 
   ::apache::mod { 'negotiation': }
   # Template uses no variables
+  $parameters = {
+    'language_priority'       => $language_priority,
+    'force_language_priority' => $force_language_priority,
+  }
+
   file { 'negotiation.conf':
     ensure  => file,
     mode    => $apache::file_mode,
     path    => "${apache::mod_dir}/negotiation.conf",
-    content => template('apache/mod/negotiation.conf.erb'),
+    content => epp('apache/mod/negotiation.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/nss.pp b/manifests/mod/nss.pp
index 028bbeeb96..f8c0467716 100644
--- a/manifests/mod/nss.pp
+++ b/manifests/mod/nss.pp
@@ -33,11 +33,19 @@
   # $error_log
   # $http_dir
   # passwd_file
+  $parameters = {
+    'port'          => $port,
+    'passwd_file'   => $passwd_file,
+    'error_log'     => $error_log,
+    'transfer_log'  => $transfer_log,
+    'httpd_dir'     => $httpd_dir,
+  }
+
   file { 'nss.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/nss.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/nss.conf.erb'),
+    content => epp('apache/mod/nss.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
index 2ea329aa43..045420da46 100644
--- a/manifests/mod/pagespeed.pp
+++ b/manifests/mod/pagespeed.pp
@@ -197,11 +197,47 @@
     package_ensure => $package_ensure,
   }
 
+  $parameters = {
+    'inherit_vhost_config'          => $inherit_vhost_config,
+    'filter_xhtml'                  => $filter_xhtml,
+    'cache_path'                    => $cache_path,
+    'log_dir'                       => $log_dir,
+    'memcache_servers'              => $memcache_servers,
+    'rewrite_level'                 => $rewrite_level,
+    'disable_filters'               => $disable_filters,
+    'enable_filters'                => $enable_filters,
+    'forbid_filters'                => $forbid_filters,
+    'rewrite_deadline_per_flush_ms' => $rewrite_deadline_per_flush_ms,
+    'additional_domains'            => $additional_domains,
+    'file_cache_size_kb'            => $file_cache_size_kb,
+    'file_cache_clean_interval_ms'  => $file_cache_clean_interval_ms,
+    'lru_cache_per_process'         => $lru_cache_per_process,
+    'lru_cache_byte_limit'          => $lru_cache_byte_limit,
+    'css_flatten_max_bytes'         => $css_flatten_max_bytes,
+    'css_inline_max_bytes'          => $css_inline_max_bytes,
+    'css_image_inline_max_bytes'    => $css_image_inline_max_bytes,
+    'image_inline_max_bytes'        => $image_inline_max_bytes,
+    'js_inline_max_bytes'           => $js_inline_max_bytes,
+    'css_outline_min_bytes'         => $css_outline_min_bytes,
+    'js_outline_min_bytes'          => $js_outline_min_bytes,
+    'inode_limit'                   => $inode_limit,
+    'image_max_rewrites_at_once'    => $image_max_rewrites_at_once,
+    'num_rewrite_threads'           => $num_rewrite_threads,
+    'num_expensive_rewrite_threads' => $num_expensive_rewrite_threads,
+    'collect_statistics'            => $collect_statistics,
+    'allow_view_stats'              => $allow_view_stats,
+    'statistics_logging'            => $statistics_logging,
+    'allow_pagespeed_console'       => $allow_pagespeed_console,
+    'message_buffer_size'           => $message_buffer_size,
+    'allow_pagespeed_message'       => $allow_pagespeed_message,
+    'additional_configuration'      => $additional_configuration,
+  }
+
   file { 'pagespeed.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/pagespeed.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/pagespeed.conf.erb'),
+    content => epp('apache/mod/pagespeed.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index eca8c0e0d4..68fcd62abb 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -979,10 +979,98 @@
   # - $wsgi_auto_detect : since unkown. Deprecated in 4.0.0.
   # - $rails_autodetect : this options is only for backward compatiblity with older versions of this class
   # - $rack_autodetect : this options is only for backward compatiblity with older versions of this class
+  $parameters = {
+    'passenger_allow_encoded_slashes'                     => $passenger_allow_encoded_slashes,
+    'passenger_anonymous_telemetry_proxy'                 => $passenger_anonymous_telemetry_proxy,
+    'passenger_app_env'                                   => $passenger_app_env,
+    'passenger_app_group_name'                            => $passenger_app_group_name,
+    'passenger_app_root'                                  => $passenger_app_root,
+    'passenger_app_type'                                  => $passenger_app_type,
+    'passenger_base_uri'                                  => $passenger_base_uri,
+    'passenger_buffer_response'                           => $passenger_buffer_response,
+    'passenger_buffer_upload'                             => $passenger_buffer_upload,
+    'passenger_concurrency_model'                         => $passenger_concurrency_model,
+    'passenger_data_buffer_dir'                           => $passenger_data_buffer_dir,
+    'passenger_debug_log_file'                            => $passenger_debug_log_file,
+    'passenger_debugger'                                  => $passenger_debugger,
+    'passenger_default_group'                             => $passenger_default_group,
+    'passenger_default_ruby'                              => $passenger_default_ruby,
+    'passenger_default_user'                              => $passenger_default_user,
+    'passenger_disable_anonymous_telemetry'               => $passenger_disable_anonymous_telemetry,
+    'passenger_disable_log_prefix'                        => $passenger_disable_log_prefix,
+    'passenger_disable_security_update_check'             => $passenger_disable_security_update_check,
+    'passenger_enabled'                                   => $passenger_enabled,
+    'passenger_error_override'                            => $passenger_error_override,
+    'passenger_file_descriptor_log_file'                  => $passenger_file_descriptor_log_file,
+    'passenger_fly_with'                                  => $passenger_fly_with,
+    'passenger_force_max_concurrent_requests_per_process' => $passenger_force_max_concurrent_requests_per_process,
+    'passenger_friendly_error_pages'                      => $passenger_friendly_error_pages,
+    'passenger_group'                                     => $passenger_group,
+    'passenger_high_performance'                          => $passenger_high_performance,
+    'passenger_instance_registry_dir'                     => $passenger_instance_registry_dir,
+    'passenger_load_shell_envvars'                        => $passenger_load_shell_envvars,
+    'passenger_preload_bundler'                           => $passenger_preload_bundler,
+    'passenger_log_file'                                  => $passenger_log_file,
+    'passenger_log_level'                                 => $passenger_log_level,
+    'passenger_lve_min_uid'                               => $passenger_lve_min_uid,
+    'passenger_max_instances'                             => $passenger_max_instances,
+    'passenger_max_instances_per_app'                     => $passenger_max_instances_per_app,
+    'passenger_max_pool_size'                             => $passenger_max_pool_size,
+    'passenger_max_preloader_idle_time'                   => $passenger_max_preloader_idle_time,
+    'passenger_max_request_queue_size'                    => $passenger_max_request_queue_size,
+    'passenger_max_request_time'                          => $passenger_max_request_time,
+    'passenger_max_requests'                              => $passenger_max_requests,
+    'passenger_memory_limit'                              => $passenger_memory_limit,
+    'passenger_meteor_app_settings'                       => $passenger_meteor_app_settings,
+    'passenger_min_instances'                             => $passenger_min_instances,
+    'passenger_nodejs'                                    => $passenger_nodejs,
+    'passenger_pool_idle_time'                            => $passenger_pool_idle_time,
+    'passenger_pre_start'                                 => $passenger_pre_start,
+    'passenger_python'                                    => $passenger_python,
+    'passenger_resist_deployment_errors'                  => $passenger_resist_deployment_errors,
+    'passenger_resolve_symlinks_in_document_root'         => $passenger_resolve_symlinks_in_document_root,
+    'passenger_response_buffer_high_watermark'            => $passenger_response_buffer_high_watermark,
+    'passenger_restart_dir'                               => $passenger_restart_dir,
+    'passenger_rolling_restarts'                          => $passenger_rolling_restarts,
+    'passenger_root'                                      => $passenger_root,
+    'passenger_ruby'                                      => $passenger_ruby,
+    'passenger_security_update_check_proxy'               => $passenger_security_update_check_proxy,
+    'passenger_show_version_in_header'                    => $passenger_show_version_in_header,
+    'passenger_socket_backlog'                            => $passenger_socket_backlog,
+    'passenger_spawn_dir'                                 => $passenger_spawn_dir,
+    'passenger_spawn_method'                              => $passenger_spawn_method,
+    'passenger_start_timeout'                             => $passenger_start_timeout,
+    'passenger_startup_file'                              => $passenger_startup_file,
+    'passenger_stat_throttle_rate'                        => $passenger_stat_throttle_rate,
+    'passenger_sticky_sessions'                           => $passenger_sticky_sessions,
+    'passenger_sticky_sessions_cookie_name'               => $passenger_sticky_sessions_cookie_name,
+    'passenger_sticky_sessions_cookie_attributes'         => $passenger_sticky_sessions_cookie_attributes,
+    'passenger_thread_count'                              => $passenger_thread_count,
+    'passenger_use_global_queue'                          => $passenger_use_global_queue,
+    'passenger_user'                                      => $passenger_user,
+    'passenger_user_switching'                            => $passenger_user_switching,
+    'rack_auto_detect'                                    => $rack_auto_detect,
+    'rack_base_uri'                                       => $rack_base_uri,
+    'rack_env'                                            => $rack_env,
+    'rails_allow_mod_rewrite'                             => $rails_allow_mod_rewrite,
+    'rails_app_spawner_idle_time'                         => $rails_app_spawner_idle_time,
+    'rails_auto_detect'                                   => $rails_auto_detect,
+    'rails_base_uri'                                      => $rails_base_uri,
+    'rails_default_user'                                  => $rails_default_user,
+    'rails_env'                                           => $rails_env,
+    'rails_framework_spawner_idle_time'                   => $rails_framework_spawner_idle_time,
+    'rails_ruby'                                          => $rails_ruby,
+    'rails_spawn_method'                                  => $rails_spawn_method,
+    'rails_user_switching'                                => $rails_user_switching,
+    'wsgi_auto_detect'                                    => $wsgi_auto_detect,
+    'rails_autodetect'                                    => $rails_autodetect,
+    'rack_autodetect'                                     => $rack_autodetect,
+  }
+
   file { 'passenger.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/${passenger_conf_file}",
-    content => template('apache/mod/passenger.conf.erb'),
+    content => epp('apache/mod/passenger.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/peruser.pp b/manifests/mod/peruser.pp
index dc5049d4ba..c9b364acdf 100644
--- a/manifests/mod/peruser.pp
+++ b/manifests/mod/peruser.pp
@@ -73,10 +73,22 @@
       # - $expiretimeout
       # - $keepalive
       # - $mod_dir
+      $parameters = {
+        'minspareprocessors'  => $minspareprocessors,
+        'minprocessors'       => $minprocessors,
+        'maxprocessors'       => $maxprocessors,
+        'maxclients'          => $maxclients,
+        'maxrequestsperchild' => $maxrequestsperchild,
+        'idletimeout'         => $idletimeout,
+        'expiretimeout'       => $expiretimeout,
+        'keepalive'           => $keepalive,
+        'mod_dir'             => $mod_dir,
+      }
+
       file { "${apache::mod_dir}/peruser.conf":
         ensure  => file,
         mode    => $apache::file_mode,
-        content => template('apache/mod/peruser.conf.erb'),
+        content => epp('apache/mod/peruser.conf.epp', $parameters),
         require => Exec["mkdir ${apache::mod_dir}"],
         before  => File[$apache::mod_dir],
         notify  => Class['apache::service'],
diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 5319fce608..1138d8314b 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -67,9 +67,21 @@
   # - $maxrequestworkers
   # - $maxrequestsperchild
   # - $maxconnectionsperchild
+  $parameters = {
+    'startservers'            => $startservers,
+    'minspareservers'         => $minspareservers,
+    'maxspareservers'         => $maxspareservers,
+    'serverlimit'             => $serverlimit,
+    'maxrequestworkers'       => $maxrequestworkers,
+    'maxclients'              => $maxclients,
+    'maxconnectionsperchild'  => $maxconnectionsperchild,
+    'maxrequestsperchild'     => $maxrequestsperchild,
+    'listenbacklog'           => $listenbacklog,
+  }
+
   file { "${apache::mod_dir}/prefork.conf":
     ensure  => file,
-    content => template('apache/mod/prefork.conf.erb'),
+    content => epp('apache/mod/prefork.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
index f8dc5c5143..c07ebfb26e 100644
--- a/manifests/mod/proxy.pp
+++ b/manifests/mod/proxy.pp
@@ -34,12 +34,21 @@
   ::apache::mod { 'proxy':
     package => $package_name,
   }
+
+  $parameters = {
+    'proxy_requests'      => $proxy_requests,
+    'allow_from'          => $allow_from,
+    'proxy_via'           => $proxy_via,
+    'proxy_timeout'       => $proxy_timeout,
+    'proxy_iobuffersize'  => $proxy_iobuffersize,
+  }
+
   # Template uses $proxy_requests
   file { 'proxy.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/proxy.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/proxy.conf.erb'),
+    content => epp('apache/mod/proxy.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/proxy_balancer.pp b/manifests/mod/proxy_balancer.pp
index 65f136b6fa..c898b22b80 100644
--- a/manifests/mod/proxy_balancer.pp
+++ b/manifests/mod/proxy_balancer.pp
@@ -27,7 +27,7 @@
       ensure  => file,
       path    => "${apache::mod_dir}/proxy_balancer.conf",
       mode    => $apache::file_mode,
-      content => template('apache/mod/proxy_balancer.conf.erb'),
+      content => epp('apache/mod/proxy_balancer.conf.epp', { 'manager_path' => $manager_path, 'allow_from'  => $allow_from, }),
       require => Exec["mkdir ${apache::mod_dir}"],
       before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],
diff --git a/manifests/mod/proxy_html.pp b/manifests/mod/proxy_html.pp
index 54f49f7b54..6740caaf36 100644
--- a/manifests/mod/proxy_html.pp
+++ b/manifests/mod/proxy_html.pp
@@ -50,7 +50,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/proxy_html.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/proxy_html.conf.erb'),
+    content => epp('apache/mod/proxy_html.conf.epp'),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/reqtimeout.pp b/manifests/mod/reqtimeout.pp
index 3e303b67e3..f6c1b21dbd 100644
--- a/manifests/mod/reqtimeout.pp
+++ b/manifests/mod/reqtimeout.pp
@@ -16,7 +16,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/reqtimeout.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/reqtimeout.conf.erb'),
+    content => epp('apache/mod/reqtimeout.conf.epp', { 'timeouts'  => $timeouts, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/rpaf.pp b/manifests/mod/rpaf.pp
index 8cc8717d91..c38839bf0c 100644
--- a/manifests/mod/rpaf.pp
+++ b/manifests/mod/rpaf.pp
@@ -19,7 +19,7 @@
   Variant[Boolean, String] $sethostname = true,
   Array[Stdlib::IP::Address] $proxy_ips = ['127.0.0.1'],
   String $header                        = 'X-Forwarded-For',
-  String $template                      = 'apache/mod/rpaf.conf.erb'
+  String $template                      = 'apache/mod/rpaf.conf.epp'
 ) {
   include apache
   ::apache::mod { 'rpaf': }
@@ -28,11 +28,17 @@
   # - $sethostname
   # - $proxy_ips
   # - $header
+  $parameters = {
+    'sethostname' => $sethostname,
+    'proxy_ips'   => $proxy_ips,
+    'header'      => $header,
+  }
+
   file { 'rpaf.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/rpaf.conf",
     mode    => $apache::file_mode,
-    content => template($template),
+    content => epp($template, $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 0ebe2d8ec5..a64be57f8a 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -240,9 +240,29 @@
   # - secresponsebodyaccess
   # - secrequestbodylimitaction
   # - secresponsebodylimitaction
+  $security_conf_parameters = {
+    'modsec_secruleengine'        => $modsec_secruleengine,
+    'secrequestbodyaccess'        => $secrequestbodyaccess,
+    'custom_rules'                => $custom_rules,
+    'modsec_dir'                  => $modsec_dir,
+    'secrequestbodylimit'         => $secrequestbodylimit,
+    'secrequestbodynofileslimit'  => $secrequestbodynofileslimit,
+    'secrequestbodyinmemorylimit' => $secrequestbodyinmemorylimit,
+    'secrequestbodylimitaction'   => $secrequestbodylimitaction,
+    'secpcrematchlimit'           => $secpcrematchlimit,
+    'secpcrematchlimitrecursion'  => $secpcrematchlimitrecursion,
+    'secresponsebodyaccess'       => $secresponsebodyaccess,
+    'secresponsebodylimitaction'  => $secresponsebodylimitaction,
+    'audit_log_relevant_status'   => $audit_log_relevant_status,
+    'audit_log_parts'             => $audit_log_parts,
+    'audit_log_type'              => $audit_log_type,
+    'audit_log_storage_dir'       => $audit_log_storage_dir,
+    'logroot'                     => $logroot,
+  }
+
   file { 'security.conf':
     ensure  => file,
-    content => template('apache/mod/security.conf.erb'),
+    content => epp('apache/mod/security.conf.epp', $security_conf_parameters),
     mode    => $apache::file_mode,
     path    => "${apache::mod_dir}/${mod_conf_name}",
     owner   => $apache::params::user,
@@ -289,7 +309,7 @@
       owner   => $apache::params::user,
       group   => $apache::params::group,
       mode    => $apache::file_mode,
-      content => template('apache/mod/security_custom.conf.erb'),
+      content => epp('apache/mod/security_custom.conf.epp', { 'custom_rules_set'  => $custom_rules_set, }),
       require => File["${modsec_dir}/custom_rules"],
       notify  => Class['apache::service'],
     }
@@ -315,6 +335,27 @@
     # - $dos_burst_time_slice
     # - $dos_counter_threshold
     # - $dos_block_timeout
+    $security_crs_parameters = {
+      '_secdefaultaction'           => $_secdefaultaction,
+      'critical_anomaly_score'      => $critical_anomaly_score,
+      'error_anomaly_score'         => $error_anomaly_score,
+      'warning_anomaly_score'       => $warning_anomaly_score,
+      'notice_anomaly_score'        => $notice_anomaly_score,
+      'inbound_anomaly_threshold'   => $inbound_anomaly_threshold,
+      'outbound_anomaly_threshold'  => $outbound_anomaly_threshold,
+      'secrequestmaxnumargs'        => $secrequestmaxnumargs,
+      'allowed_methods'             => $allowed_methods,
+      'content_types'               => $content_types,
+      'restricted_extensions'       => $restricted_extensions,
+      'restricted_headers'          => $restricted_headers,
+      'paranoia_level'              => $paranoia_level,
+      'executing_paranoia_level'    => $executing_paranoia_level,
+      'enable_dos_protection'       => $enable_dos_protection,
+      'dos_burst_time_slice'        => $dos_burst_time_slice,
+      'dos_counter_threshold'       => $dos_counter_threshold,
+      'dos_block_timeout'           => $dos_block_timeout,
+    }
+
     file { "${modsec_dir}/security_crs.conf":
       ensure  => file,
       content => template('apache/mod/security_crs.conf.erb'),
diff --git a/manifests/mod/setenvif.pp b/manifests/mod/setenvif.pp
index 6b3586a7aa..996f2fc766 100644
--- a/manifests/mod/setenvif.pp
+++ b/manifests/mod/setenvif.pp
@@ -11,7 +11,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/setenvif.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/setenvif.conf.erb'),
+    content => epp('apache/mod/setenvif.conf.epp'),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 6dd52013ef..e4d4907652 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -189,11 +189,35 @@
   # $ssl_mutex
   # $ssl_random_seed_bytes
   # $ssl_sessioncachetimeout
+  $parameters = {
+    'ssl_random_seed_bytes'       => $ssl_random_seed_bytes,
+    'ssl_pass_phrase_dialog'      => $ssl_pass_phrase_dialog,
+    'ssl_sessioncache'            => $ssl_sessioncache,
+    'ssl_sessioncachetimeout'     => $ssl_sessioncachetimeout,
+    'ssl_mutex'                   => $ssl_mutex,
+    'ssl_compression'             => $ssl_compression,
+    'ssl_sessiontickets'          => $ssl_sessiontickets,
+    'ssl_cryptodevice'            => $ssl_cryptodevice,
+    '_ssl_honorcipherorder'       => $_ssl_honorcipherorder,
+    'ssl_cert'                    => $ssl_cert,
+    'ssl_key'                     => $ssl_key,
+    'ssl_ca'                      => $ssl_ca,
+    'ssl_stapling'                => $ssl_stapling,
+    'ssl_stapling_return_errors'  => $ssl_stapling_return_errors,
+    '_stapling_cache'             => $_stapling_cache,
+    'ssl_cipher'                  => $ssl_cipher,
+    'ssl_protocol'                => $ssl_protocol,
+    'ssl_proxy_protocol'          => $ssl_proxy_protocol,
+    'ssl_proxy_cipher_suite'      => $ssl_proxy_cipher_suite,
+    'ssl_options'                 => $ssl_options,
+    'ssl_openssl_conf_cmd'        => $ssl_openssl_conf_cmd,
+  }
+
   file { 'ssl.conf':
     ensure  => file,
     path    => $apache::_ssl_file,
     mode    => $apache::file_mode,
-    content => template('apache/mod/ssl.conf.erb'),
+    content => epp('apache/mod/ssl.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index ffd7942b06..68f927b207 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -62,12 +62,22 @@
 
   ::apache::mod { 'userdir': }
 
+  $parameters = {
+    'disable_root'    => $disable_root,
+    '_userdir'        => $_userdir,
+    'unmanaged_path'  => $unmanaged_path,
+    '_path'           => $_path,
+    'overrides'       => $overrides,
+    'options'         => $options,
+    'custom_fragment' => $custom_fragment,
+  }
+
   # Template uses $home, $dir, $disable_root
   file { 'userdir.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/userdir.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/userdir.conf.erb'),
+    content => epp('apache/mod/userdir.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/worker.pp b/manifests/mod/worker.pp
index 995737f246..42fd52933f 100644
--- a/manifests/mod/worker.pp
+++ b/manifests/mod/worker.pp
@@ -78,9 +78,21 @@
   # - $serverlimit
   # - $threadLimit
   # - $listenbacklog
+  $parameters = {
+    'serverlimit'         => $serverlimit,
+    'startservers'        => $startservers,
+    'threadlimit'         => $threadlimit,
+    'minsparethreads'     => $minsparethreads,
+    'maxsparethreads'     => $maxsparethreads,
+    'threadsperchild'     => $threadsperchild,
+    'maxrequestsperchild' => $maxrequestsperchild,
+    'listenbacklog'       => $listenbacklog,
+    'maxrequestworkers'   => $maxrequestworkers,
+  }
+
   file { "${apache::mod_dir}/worker.conf":
     ensure  => file,
-    content => template('apache/mod/worker.conf.erb'),
+    content => epp('apache/mod/worker.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 404df2381a..dc5a739c02 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -62,11 +62,20 @@
   # - $wsgi_socket_prefix
   # - $wsgi_python_path
   # - $wsgi_python_home
+  $parameters = {
+    'wsgi_restrict_embedded'  => $wsgi_restrict_embedded,
+    'wsgi_socket_prefix'      => $wsgi_socket_prefix,
+    'wsgi_python_home'        => $wsgi_python_home,
+    'wsgi_python_path'        => $wsgi_python_path,
+    'wsgi_application_group'  => $wsgi_application_group,
+    'wsgi_python_optimize'    => $wsgi_python_optimize,
+  }
+
   file { 'wsgi.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/wsgi.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/wsgi.conf.erb'),
+    content => epp('apache/mod/wsgi.conf.epp', $parameters),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index c4731bf1c6..c38d0358d5 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -1956,7 +1956,7 @@ class{ 'apache::mod::auth_mellon':
 
 ##### クラス: `apache::mod::authn_dbd`
 
-`mod_authn_dbd`をインストールし、`authn_dbd.conf.erb`テンプレートを使用して設定を生成します。オプションで、AuthnProviderAliasを作成します。
+`mod_authn_dbd`をインストールし、`authn_dbd.conf.epp`テンプレートを使用して設定を生成します。オプションで、AuthnProviderAliasを作成します。
 
 ``` puppet
 class { 'apache::mod::authn_dbd':
@@ -1997,7 +1997,7 @@ class { 'apache::mod::authn_dbd':
 
 ##### クラス: `apache::mod::authnz_ldap`
 
-`mod_authnz_ldap`をインストールし、`authnz_ldap.conf.erb`テンプレートを使用して設定を生成します。
+`mod_authnz_ldap`をインストールし、`authnz_ldap.conf.epp`テンプレートを使用して設定を生成します。
 
 **パラメータ**:　
 
@@ -2074,7 +2074,7 @@ class { '::apache::mod::cluster':
 
 ##### クラス: `apache::mod::expires`
 
-[`mod_expires`][]をインストールし、`expires.conf.erb`を使用して設定を生成します。
+[`mod_expires`][]をインストールし、`expires.conf.epp`を使用して設定を生成します。
 
 **パラメータ**:　
 
@@ -2289,7 +2289,7 @@ class { '::apache::mod::jk':
 }
 ```
 
-詳細については、[templates/mod/jk/workers.properties.erb](templates/mod/jk/workers.properties.erb)を参照してください。
+詳細については、[templates/mod/jk/workers.properties.epp](templates/mod/jk/workers.properties.epp)を参照してください。
 
 **`apache::mod::jk`**内のパラメータ:
 
@@ -2682,7 +2682,7 @@ NSS暗号化ライブラリを使用するApacheのSSLプロバイダ。
 
 ##### クラス: `apache::mod::proxy`
 
-I`mod_proxy`をインストールし、`proxy.conf.erb`テンプレートを使用して設定を生成します。
+I`mod_proxy`をインストールし、`proxy.conf.epp`テンプレートを使用して設定を生成します。
 
 **`apache::mod::proxy`内のパラメータ**:
 
@@ -2766,7 +2766,7 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
 
 ##### クラス: `apache::mod::ssl`
 
-[Apache SSL機能][`mod_ssl`]をインストールし、`ssl.conf.erb`テンプレートを使用して設定を生成します。ほとんどのオペレーティングシステムでは、この`ssl.conf`はモジュール設定ディレクトリに置かれています。Red Hatベースのオペレーティングシステムでは、このファイルは`/etc/httpd/conf.d`にあります。これは、RPMが設定を保存するのと同じロケーションです。
+[Apache SSL機能][`mod_ssl`]をインストールし、`ssl.conf.epp`テンプレートを使用して設定を生成します。ほとんどのオペレーティングシステムでは、この`ssl.conf`はモジュール設定ディレクトリに置かれています。Red Hatベースのオペレーティングシステムでは、このファイルは`/etc/httpd/conf.d`にあります。これは、RPMが設定を保存するのと同じロケーションです。
 
 バーチャルホストでSSLを使用するには、`::apache`の[`default_ssl_vhost`][]パラメータを`true`に設定する**か**、[`apache::vhost`][]の[`ssl`][]パラメータを`true`に設定する必要があります。
 
diff --git a/templates/mod/_allow.epp b/templates/mod/_allow.epp
new file mode 100644
index 0000000000..136ac41791
--- /dev/null
+++ b/templates/mod/_allow.epp
@@ -0,0 +1,7 @@
+    Order deny,allow
+    Deny from all
+<% if $allow_from and !$allow_from.empty { -%>
+    Allow from <%= Array($allow_from).join(" ") %>
+<% } else { -%>
+    Allow from <%= Array($allow_defaults).join(" ") %>
+<% } -%>
diff --git a/templates/mod/_allow.erb b/templates/mod/_allow.erb
deleted file mode 100644
index 0542e49a62..0000000000
--- a/templates/mod/_allow.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-    Order deny,allow
-    Deny from all
-<% if @allow_from != nil and ! @allow_from.empty? -%>
-    Allow from <%= Array(@allow_from).join(" ") %>
-<% else -%>
-    Allow from <%= Array(@allow_defaults).join(" ") %>
-<% end -%>
diff --git a/templates/mod/_require.epp b/templates/mod/_require.epp
new file mode 100644
index 0000000000..88443db572
--- /dev/null
+++ b/templates/mod/_require.epp
@@ -0,0 +1,33 @@
+<% $_requires = if $requires { %>$requires<% } else {%>$requires_defaults<%} %>
+<% if type($_requires, 'generalized') == String { %>
+  <%- if !($_requires.downcase in ['', 'unmanaged']) { -%>
+    Require <%= $_requires %>
+  <%- } -%>
+<% }elsif String(type($_requires, 'generalized')).index('Array') == 0 { -%>
+  <%- $_requires.each |$req| { -%>
+    Require <%= $req %>
+  <%- } -%>
+<% }elsif String(type($_requires, 'generalized')).index('Hash') == 0 { -%>
+  <%- if $_requires['enforce'] and $_requires['enforce'].downcase in ['all', 'none', 'any'] { -%>
+    <%- $enforce_str = "Require${_requires['enforce'].capitalize}>\n" -%>
+    <%- $enforce_open = "    <${enforce_str}" -%>
+    <%- $enforce_close = "    </${enforce_str}" -%>
+    <%- $indentation = '    ' -%>
+  <%- } else { -%>
+    <%- if $_requires['enforce'] { -%>
+      <%- scope.function_warning(["Class #{@title}: Require can only be overwritten with all, none or any."]) -%>
+    <%- } -%>
+    <%- $enforce_open = '' -%>
+    <%- $enforce_close = '' -%>
+    <%- $indentation = '' -%>
+  <%- } -%>
+  <%- if $_requires['requires'] and String(type($_requires['requires'], 'generalized')).index('Array') == 0 { -%>
+<%# %><%= $enforce_open -%>
+      <%- $_requires['requires'].each |$req| { -%>
+<%# %>    <%= $indentation -%>Require <%= $req %>
+      <%- } -%>
+<%# %><%= $enforce_close -%>
+  <%- } else { -%>
+    <%- scope.function_warning(["Class #{@title}: Require hash must have a key named \"requires\" with array value"]) -%>
+  <%- } -%>
+<% } -%>
diff --git a/templates/mod/alias.conf.epp b/templates/mod/alias.conf.epp
new file mode 100644
index 0000000000..12571c1452
--- /dev/null
+++ b/templates/mod/alias.conf.epp
@@ -0,0 +1,8 @@
+<IfModule alias_module>
+Alias /<%= $icons_prefix %>/ "<%= $icons_path %>/"
+<Directory "<%= $icons_path %>">
+    Options <%= $icons_options %>
+    AllowOverride None
+    Require all granted
+</Directory>
+</IfModule>
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
deleted file mode 100644
index e56a105c8c..0000000000
--- a/templates/mod/alias.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfModule alias_module>
-Alias /<%= @icons_prefix %>/ "<%= @icons_path %>/"
-<Directory "<%= @icons_path %>">
-    Options <%= @icons_options %>
-    AllowOverride None
-    Require all granted
-</Directory>
-</IfModule>
diff --git a/templates/mod/auth_cas.conf.epp b/templates/mod/auth_cas.conf.epp
new file mode 100644
index 0000000000..97df151c98
--- /dev/null
+++ b/templates/mod/auth_cas.conf.epp
@@ -0,0 +1,58 @@
+CASCookiePath <%= $cas_cookie_path %>
+CASLoginURL <%= $cas_login_url %>
+CASValidateURL <%= $cas_validate_url %>
+
+CASVersion <%= $cas_version %>
+CASDebug <%= $cas_debug %>
+
+<% if $cas_certificate_path { -%>
+CASCertificatePath <%= $cas_certificate_path %>
+<% } -%>
+<% if $cas_proxy_validate_url { -%>
+CASProxyValidateURL <%= $cas_proxy_validate_url %>
+<% } -%>
+<% if $cas_validate_server { -%>
+CASValidateServer <%= $cas_validate_server %>
+<% } -%>
+<% if $cas_validate_depth { -%>
+CASValidateDepth <%= $cas_validate_depth %>
+<% } -%>
+<% if $cas_root_proxied_as { -%>
+CASRootProxiedAs <%= $cas_root_proxied_as %>
+<% } -%>
+<% if $cas_cookie_entropy { -%>
+CASCookieEntropy <%= $cas_cookie_entropy %>
+<% } -%>
+<% if $cas_timeout { -%>
+CASTimeout <%= $cas_timeout %>
+<% } -%>
+<% if $cas_idle_timeout { -%>
+CASIdleTimeout <%= $cas_idle_timeout %>
+<% } -%>
+<% if $cas_cache_clean_interval { -%>
+CASCacheCleanInterval <%= $cas_cache_clean_interval %>
+<% } -%>
+<% if $cas_cookie_domain { -%>
+CASCookieDomain <%= $cas_cookie_domain %>
+<% } -%>
+<% if $cas_cookie_http_only { -%>
+CASCookieHttpOnly <%= $cas_cookie_http_only %>
+<% } -%>
+<% if $cas_authoritative { -%>
+CASAuthoritative <%= $cas_authoritative %>
+<% } -%>
+<%- if $cas_sso_enabled { -%>
+CASSSOEnabled On
+<%- } -%>
+<%- if $cas_validate_saml { -%>
+CASValidateSAML On
+<%- } -%>
+<%- if $cas_attribute_prefix { -%>
+CASAttributePrefix <%= $cas_attribute_prefix %>
+<%- } -%>
+<%- if $cas_attribute_delimiter { -%>
+CASAttributeDelimiter <%= $cas_attribute_delimiter %>
+<%- } -%>
+<%- if $cas_scrub_request_headers { -%>
+CASAttributeDelimiter On
+<%- } -%>
diff --git a/templates/mod/auth_cas.conf.erb b/templates/mod/auth_cas.conf.erb
deleted file mode 100644
index b59c5357fe..0000000000
--- a/templates/mod/auth_cas.conf.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-CASCookiePath <%= @cas_cookie_path %>
-CASLoginURL <%= @cas_login_url %>
-CASValidateURL <%= @cas_validate_url %>
-
-CASVersion <%= @cas_version %>
-CASDebug <%= @cas_debug %>
-
-<% if @cas_certificate_path -%>
-CASCertificatePath <%= @cas_certificate_path %>
-<% end -%>
-<% if @cas_proxy_validate_url -%>
-CASProxyValidateURL <%= @cas_proxy_validate_url %>
-<% end -%>
-<% if @cas_validate_server -%>
-CASValidateServer <%= @cas_validate_server %>
-<% end -%>
-<% if @cas_validate_depth -%>
-CASValidateDepth <%= @cas_validate_depth %>
-<% end -%>
-<% if @cas_root_proxied_as -%>
-CASRootProxiedAs <%= @cas_root_proxied_as %>
-<% end -%>
-<% if @cas_cookie_entropy -%>
-CASCookieEntropy <%= @cas_cookie_entropy %>
-<% end -%>
-<% if @cas_timeout -%>
-CASTimeout <%= @cas_timeout %>
-<% end -%>
-<% if @cas_idle_timeout -%>
-CASIdleTimeout <%= @cas_idle_timeout %>
-<% end -%>
-<% if @cas_cache_clean_interval -%>
-CASCacheCleanInterval <%= @cas_cache_clean_interval %>
-<% end -%>
-<% if @cas_cookie_domain -%>
-CASCookieDomain <%= @cas_cookie_domain %>
-<% end -%>
-<% if @cas_cookie_http_only -%>
-CASCookieHttpOnly <%= @cas_cookie_http_only %>
-<% end -%>
-<% if @cas_authoritative -%>
-CASAuthoritative <%= @cas_authoritative %>
-<% end -%>
-<%- if @cas_sso_enabled -%>
-CASSSOEnabled On
-<%- end -%>
-<%- if @cas_validate_saml -%>
-CASValidateSAML On
-<%- end -%>
-<%- if @cas_attribute_prefix -%>
-CASAttributePrefix <%= @cas_attribute_prefix %>
-<%- end -%>
-<%- if @cas_attribute_delimiter -%>
-CASAttributeDelimiter <%= @cas_attribute_delimiter %>
-<%- end -%>
-<%- if @cas_scrub_request_headers -%>
-CASAttributeDelimiter On
-<%- end -%>
diff --git a/templates/mod/auth_mellon.conf.epp b/templates/mod/auth_mellon.conf.epp
new file mode 100644
index 0000000000..609e5504ac
--- /dev/null
+++ b/templates/mod/auth_mellon.conf.epp
@@ -0,0 +1,21 @@
+<%- if $mellon_cache_size { -%>
+MellonCacheSize <%= $mellon_cache_size %>
+<%- } -%>
+<%- if $mellon_cache_entry_size { -%>
+MellonCacheEntrySize <%= $mellon_cache_entry_size %>
+<%- } -%>
+<%- if $mellon_lock_file { -%>
+MellonLockFile "<%= $mellon_lock_file %>"
+<%- } -%>
+<%- if $mellon_post_directory { -%>
+MellonPostDirectory "<%= $mellon_post_directory %>"
+<%- } -%>
+<%- if $mellon_post_ttl { -%>
+MellonPostTTL <%= $mellon_post_ttl %>
+<%- } -%>
+<%- if $mellon_post_size { -%>
+MellonPostSize <%= $mellon_post_size %>
+<%- } -%>
+<%- if $mellon_post_count { -%>
+MellonPostCount <%= $mellon_post_count %>
+<%- } -%>
diff --git a/templates/mod/auth_mellon.conf.erb b/templates/mod/auth_mellon.conf.erb
deleted file mode 100644
index e36a733907..0000000000
--- a/templates/mod/auth_mellon.conf.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%- if @mellon_cache_size -%>
-MellonCacheSize <%= @mellon_cache_size %>
-<%- end -%>
-<%- if @mellon_cache_entry_size -%>
-MellonCacheEntrySize <%= @mellon_cache_entry_size %>
-<%- end -%>
-<%- if @mellon_lock_file -%>
-MellonLockFile "<%= @mellon_lock_file %>"
-<%- end -%>
-<%- if @mellon_post_directory -%>
-MellonPostDirectory "<%= @mellon_post_directory %>"
-<%- end -%>
-<%- if @mellon_post_ttl -%>
-MellonPostTTL <%= @mellon_post_ttl %>
-<%- end -%>
-<%- if @mellon_post_size -%>
-MellonPostSize <%= @mellon_post_size %>
-<%- end -%>
-<%- if @mellon_post_count -%>
-MellonPostCount <%= @mellon_post_count %>
-<%- end -%>
diff --git a/templates/mod/authn_dbd.conf.epp b/templates/mod/authn_dbd.conf.epp
new file mode 100644
index 0000000000..6bb1e9e204
--- /dev/null
+++ b/templates/mod/authn_dbd.conf.epp
@@ -0,0 +1,17 @@
+#Database Management
+DBDriver <%= $authn_dbd_dbdriver %>
+
+#Connection string: database name and login credentials
+DBDParams "<%= $authn_dbd_params %>"
+
+#Parameters for Connection Pool Management
+DBDMin     <%= $authn_dbd_min %>
+DBDMax     <%= $authn_dbd_max %>
+DBDKeep    <%= $authn_dbd_keep %>
+DBDExptime <%= $authn_dbd_exptime %>
+
+<%- if $authn_dbd_alias { -%>
+<AuthnProviderAlias dbd <%= $authn_dbd_alias %>>
+  AuthDBDUserPWQuery "<%= $authn_dbd_query %>"
+</AuthnProviderAlias>
+<%- } -%>
diff --git a/templates/mod/authn_dbd.conf.erb b/templates/mod/authn_dbd.conf.erb
deleted file mode 100644
index e04fb3ec43..0000000000
--- a/templates/mod/authn_dbd.conf.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-#Database Management
-DBDriver <%= @authn_dbd_dbdriver %>
-
-#Connection string: database name and login credentials
-DBDParams "<%= @authn_dbd_params %>"
-
-#Parameters for Connection Pool Management
-DBDMin     <%= @authn_dbd_min %>
-DBDMax     <%= @authn_dbd_max %>
-DBDKeep    <%= @authn_dbd_keep %>
-DBDExptime <%= @authn_dbd_exptime %>
-
-<%- if @authn_dbd_alias -%>
-<AuthnProviderAlias dbd <%= @authn_dbd_alias %>>
-  AuthDBDUserPWQuery "<%= @authn_dbd_query %>"
-</AuthnProviderAlias>
-<%- end -%>
diff --git a/templates/mod/authnz_ldap.conf.epp b/templates/mod/authnz_ldap.conf.epp
new file mode 100644
index 0000000000..242a7356a7
--- /dev/null
+++ b/templates/mod/authnz_ldap.conf.epp
@@ -0,0 +1 @@
+LDAPVerifyServerCert <%= apache::bool2httpd($verify_server_cert) %>
diff --git a/templates/mod/authnz_ldap.conf.erb b/templates/mod/authnz_ldap.conf.erb
deleted file mode 100644
index 6f60adec24..0000000000
--- a/templates/mod/authnz_ldap.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-LDAPVerifyServerCert <%= scope.call_function('apache::bool2httpd', [@verify_server_cert]) %>
diff --git a/templates/mod/autoindex.conf.epp b/templates/mod/autoindex.conf.epp
new file mode 100644
index 0000000000..9e052dc8f4
--- /dev/null
+++ b/templates/mod/autoindex.conf.epp
@@ -0,0 +1,56 @@
+IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8
+AddIconByEncoding (CMP,/<%= $icons_prefix %>/compressed.gif) x-compress x-gzip x-bzip2
+
+AddIconByType (TXT,/<%= $icons_prefix %>/text.gif) text/*
+AddIconByType (IMG,/<%= $icons_prefix %>/image2.gif) image/*
+AddIconByType (SND,/<%= $icons_prefix %>/sound2.gif) audio/*
+AddIconByType (VID,/<%= $icons_prefix %>/movie.gif) video/*
+
+AddIcon /<%= $icons_prefix %>/binary.gif .bin .exe
+AddIcon /<%= $icons_prefix %>/binhex.gif .hqx
+AddIcon /<%= $icons_prefix %>/tar.gif .tar
+AddIcon /<%= $icons_prefix %>/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /<%= $icons_prefix %>/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /<%= $icons_prefix %>/a.gif .ps .ai .eps
+AddIcon /<%= $icons_prefix %>/layout.gif .html .shtml .htm .pdf
+AddIcon /<%= $icons_prefix %>/text.gif .txt
+AddIcon /<%= $icons_prefix %>/c.gif .c
+AddIcon /<%= $icons_prefix %>/p.gif .pl .py
+AddIcon /<%= $icons_prefix %>/f.gif .for
+AddIcon /<%= $icons_prefix %>/dvi.gif .dvi
+AddIcon /<%= $icons_prefix %>/uuencoded.gif .uu
+AddIcon /<%= $icons_prefix %>/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /<%= $icons_prefix %>/tex.gif .tex
+AddIcon /<%= $icons_prefix %>/bomb.gif /core
+AddIcon (SND,/<%= $icons_prefix %>/sound2.gif) .ogg
+AddIcon (VID,/<%= $icons_prefix %>/movie.gif) .ogm
+
+AddIcon /<%= $icons_prefix %>/back.gif ..
+AddIcon /<%= $icons_prefix %>/hand.right.gif README
+AddIcon /<%= $icons_prefix %>/folder.gif ^^DIRECTORY^^
+AddIcon /<%= $icons_prefix %>/blank.gif ^^BLANKICON^^
+
+AddIcon /<%= $icons_prefix %>/odf6odt<%= $icon_suffix %>.png .odt
+AddIcon /<%= $icons_prefix %>/odf6ods<%= $icon_suffix %>.png .ods
+AddIcon /<%= $icons_prefix %>/odf6odp<%= $icon_suffix %>.png .odp
+AddIcon /<%= $icons_prefix %>/odf6odg<%= $icon_suffix %>.png .odg
+AddIcon /<%= $icons_prefix %>/odf6odc<%= $icon_suffix %>.png .odc
+AddIcon /<%= $icons_prefix %>/odf6odf<%= $icon_suffix %>.png .odf
+AddIcon /<%= $icons_prefix %>/odf6odb<%= $icon_suffix %>.png .odb
+AddIcon /<%= $icons_prefix %>/odf6odi<%= $icon_suffix %>.png .odi
+AddIcon /<%= $icons_prefix %>/odf6odm<%= $icon_suffix %>.png .odm
+
+AddIcon /<%= $icons_prefix %>/odf6ott<%= $icon_suffix %>.png .ott
+AddIcon /<%= $icons_prefix %>/odf6ots<%= $icon_suffix %>.png .ots
+AddIcon /<%= $icons_prefix %>/odf6otp<%= $icon_suffix %>.png .otp
+AddIcon /<%= $icons_prefix %>/odf6otg<%= $icon_suffix %>.png .otg
+AddIcon /<%= $icons_prefix %>/odf6otc<%= $icon_suffix %>.png .otc
+AddIcon /<%= $icons_prefix %>/odf6otf<%= $icon_suffix %>.png .otf
+AddIcon /<%= $icons_prefix %>/odf6oti<%= $icon_suffix %>.png .oti
+AddIcon /<%= $icons_prefix %>/odf6oth<%= $icon_suffix %>.png .oth
+
+DefaultIcon /<%= $icons_prefix %>/unknown.gif
+ReadmeName README.html
+HeaderName HEADER.html
+
+IndexIgnore .??* *~ *# HEADER.html README.html RCS CVS *,v *,t
diff --git a/templates/mod/autoindex.conf.erb b/templates/mod/autoindex.conf.erb
deleted file mode 100644
index e097f9c9b1..0000000000
--- a/templates/mod/autoindex.conf.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8
-AddIconByEncoding (CMP,/<%= @icons_prefix %>/compressed.gif) x-compress x-gzip x-bzip2
-
-AddIconByType (TXT,/<%= @icons_prefix %>/text.gif) text/*
-AddIconByType (IMG,/<%= @icons_prefix %>/image2.gif) image/*
-AddIconByType (SND,/<%= @icons_prefix %>/sound2.gif) audio/*
-AddIconByType (VID,/<%= @icons_prefix %>/movie.gif) video/*
-
-AddIcon /<%= @icons_prefix %>/binary.gif .bin .exe
-AddIcon /<%= @icons_prefix %>/binhex.gif .hqx
-AddIcon /<%= @icons_prefix %>/tar.gif .tar
-AddIcon /<%= @icons_prefix %>/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-AddIcon /<%= @icons_prefix %>/compressed.gif .Z .z .tgz .gz .zip
-AddIcon /<%= @icons_prefix %>/a.gif .ps .ai .eps
-AddIcon /<%= @icons_prefix %>/layout.gif .html .shtml .htm .pdf
-AddIcon /<%= @icons_prefix %>/text.gif .txt
-AddIcon /<%= @icons_prefix %>/c.gif .c
-AddIcon /<%= @icons_prefix %>/p.gif .pl .py
-AddIcon /<%= @icons_prefix %>/f.gif .for
-AddIcon /<%= @icons_prefix %>/dvi.gif .dvi
-AddIcon /<%= @icons_prefix %>/uuencoded.gif .uu
-AddIcon /<%= @icons_prefix %>/script.gif .conf .sh .shar .csh .ksh .tcl
-AddIcon /<%= @icons_prefix %>/tex.gif .tex
-AddIcon /<%= @icons_prefix %>/bomb.gif /core
-AddIcon (SND,/<%= @icons_prefix %>/sound2.gif) .ogg
-AddIcon (VID,/<%= @icons_prefix %>/movie.gif) .ogm
-
-AddIcon /<%= @icons_prefix %>/back.gif ..
-AddIcon /<%= @icons_prefix %>/hand.right.gif README
-AddIcon /<%= @icons_prefix %>/folder.gif ^^DIRECTORY^^
-AddIcon /<%= @icons_prefix %>/blank.gif ^^BLANKICON^^
-
-AddIcon /<%= @icons_prefix %>/odf6odt<%= @icon_suffix %>.png .odt
-AddIcon /<%= @icons_prefix %>/odf6ods<%= @icon_suffix %>.png .ods
-AddIcon /<%= @icons_prefix %>/odf6odp<%= @icon_suffix %>.png .odp
-AddIcon /<%= @icons_prefix %>/odf6odg<%= @icon_suffix %>.png .odg
-AddIcon /<%= @icons_prefix %>/odf6odc<%= @icon_suffix %>.png .odc
-AddIcon /<%= @icons_prefix %>/odf6odf<%= @icon_suffix %>.png .odf
-AddIcon /<%= @icons_prefix %>/odf6odb<%= @icon_suffix %>.png .odb
-AddIcon /<%= @icons_prefix %>/odf6odi<%= @icon_suffix %>.png .odi
-AddIcon /<%= @icons_prefix %>/odf6odm<%= @icon_suffix %>.png .odm
-
-AddIcon /<%= @icons_prefix %>/odf6ott<%= @icon_suffix %>.png .ott
-AddIcon /<%= @icons_prefix %>/odf6ots<%= @icon_suffix %>.png .ots
-AddIcon /<%= @icons_prefix %>/odf6otp<%= @icon_suffix %>.png .otp
-AddIcon /<%= @icons_prefix %>/odf6otg<%= @icon_suffix %>.png .otg
-AddIcon /<%= @icons_prefix %>/odf6otc<%= @icon_suffix %>.png .otc
-AddIcon /<%= @icons_prefix %>/odf6otf<%= @icon_suffix %>.png .otf
-AddIcon /<%= @icons_prefix %>/odf6oti<%= @icon_suffix %>.png .oti
-AddIcon /<%= @icons_prefix %>/odf6oth<%= @icon_suffix %>.png .oth
-
-DefaultIcon /<%= @icons_prefix %>/unknown.gif
-ReadmeName README.html
-HeaderName HEADER.html
-
-IndexIgnore .??* *~ *# HEADER.html README.html RCS CVS *,v *,t
diff --git a/templates/mod/cgid.conf.epp b/templates/mod/cgid.conf.epp
new file mode 100644
index 0000000000..7772fb2ce4
--- /dev/null
+++ b/templates/mod/cgid.conf.epp
@@ -0,0 +1 @@
+ScriptSock "<%= $cgisock_path %>"
diff --git a/templates/mod/cgid.conf.erb b/templates/mod/cgid.conf.erb
deleted file mode 100644
index 5f82d7424c..0000000000
--- a/templates/mod/cgid.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-ScriptSock "<%= @cgisock_path %>"
diff --git a/templates/mod/cluster.conf.epp b/templates/mod/cluster.conf.epp
new file mode 100644
index 0000000000..b34c2cb8d1
--- /dev/null
+++ b/templates/mod/cluster.conf.epp
@@ -0,0 +1,26 @@
+Listen <%= $ip %>:<%= $port %>
+<VirtualHost <%= $ip %>:<%= $port %>>
+  <Location />
+    Order deny,allow
+    Deny from all
+    Allow from <%= $allowed_network %>
+  </Location>
+
+  KeepAliveTimeout <%= $keep_alive_timeout %>
+  MaxKeepAliveRequests <%= $max_keep_alive_requests %>
+  EnableMCPMReceive <%= apache::bool2httpd($enable_mcpm_receive) %>
+
+  ManagerBalancerName <%= $balancer_name %>
+  ServerAdvertise <%= apache::bool2httpd($server_advertise) %>
+  <%- if $server_advertise == true and $advertise_frequency != undef { -%>
+  AdvertiseFrequency <%= $advertise_frequency %>
+  <%- } -%>
+
+  <Location /mod_cluster_manager>
+    SetHandler mod_cluster-manager
+    Order deny,allow
+    Deny from all
+    Allow from <%= $manager_allowed_network %>
+  </Location>
+
+</VirtualHost>
diff --git a/templates/mod/cluster.conf.erb b/templates/mod/cluster.conf.erb
deleted file mode 100644
index d2f9d52e47..0000000000
--- a/templates/mod/cluster.conf.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-Listen <%= @ip %>:<%= @port %>
-<VirtualHost <%= @ip %>:<%= @port %>>
-  <Location />
-    Order deny,allow
-    Deny from all
-    Allow from <%= @allowed_network %>
-  </Location>
-
-  KeepAliveTimeout <%= @keep_alive_timeout %>
-  MaxKeepAliveRequests <%= @max_keep_alive_requests %>
-  EnableMCPMReceive <%= scope.call_function('apache::bool2httpd', [@enable_mcpm_receive]) %>
-
-  ManagerBalancerName <%= @balancer_name %>
-  ServerAdvertise <%= scope.call_function('apache::bool2httpd', [@server_advertise]) %>
-  <%- if @server_advertise == true and @advertise_frequency != nil -%>
-  AdvertiseFrequency <%= @advertise_frequency %>
-  <%- end -%>
-
-  <Location /mod_cluster_manager>
-    SetHandler mod_cluster-manager
-    Order deny,allow
-    Deny from all
-    Allow from <%= @manager_allowed_network %>
-  </Location>
-
-</VirtualHost>
diff --git a/templates/mod/dav_fs.conf.epp b/templates/mod/dav_fs.conf.epp
new file mode 100644
index 0000000000..f7da458dbc
--- /dev/null
+++ b/templates/mod/dav_fs.conf.epp
@@ -0,0 +1 @@
+DAVLockDB "<%= $dav_lock %>"
diff --git a/templates/mod/dav_fs.conf.erb b/templates/mod/dav_fs.conf.erb
deleted file mode 100644
index 3c53e9e14b..0000000000
--- a/templates/mod/dav_fs.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-DAVLockDB "<%= @dav_lock %>"
diff --git a/templates/mod/deflate.conf.epp b/templates/mod/deflate.conf.epp
new file mode 100644
index 0000000000..da6d9f8eb2
--- /dev/null
+++ b/templates/mod/deflate.conf.epp
@@ -0,0 +1,7 @@
+<%- $types.sort.each |$type| { -%>
+AddOutputFilterByType DEFLATE <%= $type %>
+<%- } -%>
+
+<%- Array($notes).sort.each |$values| { -%>
+DeflateFilterNote <%= $values[0] %> <%= $values[1] %>
+<%- } -%>
diff --git a/templates/mod/deflate.conf.erb b/templates/mod/deflate.conf.erb
deleted file mode 100644
index ede8b2e768..0000000000
--- a/templates/mod/deflate.conf.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<%- @types.sort.each do |type| -%>
-AddOutputFilterByType DEFLATE <%= type %>
-<%- end -%>
-
-<%- @notes.sort.each do |type,note| -%>
-DeflateFilterNote <%= type %> <%=note %>
-<%- end -%>
diff --git a/templates/mod/dir.conf.epp b/templates/mod/dir.conf.epp
new file mode 100644
index 0000000000..4ca134034e
--- /dev/null
+++ b/templates/mod/dir.conf.epp
@@ -0,0 +1 @@
+DirectoryIndex <%= $indexes.join(' ') %>
diff --git a/templates/mod/dir.conf.erb b/templates/mod/dir.conf.erb
deleted file mode 100644
index 741f6ae034..0000000000
--- a/templates/mod/dir.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-DirectoryIndex <%= @indexes.join(' ') %>
diff --git a/templates/mod/disk_cache.conf.epp b/templates/mod/disk_cache.conf.epp
new file mode 100644
index 0000000000..2cfc0e647a
--- /dev/null
+++ b/templates/mod/disk_cache.conf.epp
@@ -0,0 +1,9 @@
+<% if $default_cache_enable { -%>
+CacheEnable disk /
+<% } -%>
+CacheRoot "<%= $_cache_root %>"
+CacheDirLevels 2
+CacheDirLength 1
+<% if $cache_ignore_headers { -%>
+CacheIgnoreHeaders <%= $cache_ignore_headers -%>
+<% } -%>
\ No newline at end of file
diff --git a/templates/mod/disk_cache.conf.erb b/templates/mod/disk_cache.conf.erb
deleted file mode 100644
index c97ee76624..0000000000
--- a/templates/mod/disk_cache.conf.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if @default_cache_enable -%>
-CacheEnable disk /
-<% end -%>
-CacheRoot "<%= @_cache_root %>"
-CacheDirLevels 2
-CacheDirLength 1
-<% if @cache_ignore_headers -%>
-CacheIgnoreHeaders <%= @cache_ignore_headers -%>
-<% end -%>
\ No newline at end of file
diff --git a/templates/mod/dumpio.conf.epp b/templates/mod/dumpio.conf.epp
new file mode 100644
index 0000000000..c8f3e65808
--- /dev/null
+++ b/templates/mod/dumpio.conf.epp
@@ -0,0 +1,3 @@
+# https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
+DumpIOInput "<%= $dump_io_input %>"
+DumpIOOutput "<%= $dump_io_output %>"
diff --git a/templates/mod/dumpio.conf.erb b/templates/mod/dumpio.conf.erb
deleted file mode 100644
index 29c34e2a5c..0000000000
--- a/templates/mod/dumpio.conf.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-# https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html
-DumpIOInput "<%= @dump_io_input %>"
-DumpIOOutput "<%= @dump_io_output %>"
diff --git a/templates/mod/event.conf.epp b/templates/mod/event.conf.epp
new file mode 100644
index 0000000000..d6549166d4
--- /dev/null
+++ b/templates/mod/event.conf.epp
@@ -0,0 +1,29 @@
+<IfModule mpm_event_module>
+  <%- if $serverlimit { -%>
+  ServerLimit            <%= $serverlimit %>
+  <%- } -%>
+  <%- if $startservers { -%>
+  StartServers           <%= $startservers %>
+  <%- } -%>
+  <%- if $maxrequestworkers { -%>
+  MaxRequestWorkers      <%= $maxrequestworkers %>
+  <%- } -%>
+  <%- if $minsparethreads { -%>
+  MinSpareThreads        <%= $minsparethreads %>
+  <%- } -%>
+  <%- if $maxsparethreads { -%>
+  MaxSpareThreads        <%= $maxsparethreads %>
+  <%- } -%>
+  <%- if $threadsperchild { -%>
+  ThreadsPerChild        <%= $threadsperchild %>
+  <%- } -%>
+  <%- if $maxconnectionsperchild { -%>
+  MaxConnectionsPerChild <%= $maxconnectionsperchild %>
+  <%- } -%>
+  <%- if $threadlimit { -%>
+  ThreadLimit            <%= $threadlimit %>
+  <%- } -%>
+  <%- if $listenbacklog { -%>
+  ListenBacklog          <%= $listenbacklog %>
+  <%- } -%>
+</IfModule>
diff --git a/templates/mod/event.conf.erb b/templates/mod/event.conf.erb
deleted file mode 100644
index 82cfae822a..0000000000
--- a/templates/mod/event.conf.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<IfModule mpm_event_module>
-  <%- if @serverlimit -%>
-  ServerLimit            <%= @serverlimit %>
-  <%- end -%>
-  <%- if @startservers -%>
-  StartServers           <%= @startservers %>
-  <%- end -%>
-  <%- if @maxrequestworkers -%>
-  MaxRequestWorkers      <%= @maxrequestworkers %>
-  <%- end -%>
-  <%- if @minsparethreads -%>
-  MinSpareThreads        <%= @minsparethreads %>
-  <%- end -%>
-  <%- if @maxsparethreads -%>
-  MaxSpareThreads        <%= @maxsparethreads %>
-  <%- end -%>
-  <%- if @threadsperchild -%>
-  ThreadsPerChild        <%= @threadsperchild %>
-  <%- end -%>
-  <%- if @maxconnectionsperchild -%>
-  MaxConnectionsPerChild <%= @maxconnectionsperchild %>
-  <%- end -%>
-  <%- if @threadlimit -%>
-  ThreadLimit            <%= @threadlimit %>
-  <%- end -%>
-  <%- if @listenbacklog -%>
-  ListenBacklog          <%= @listenbacklog %>
-  <%- end -%>
-</IfModule>
diff --git a/templates/mod/expires.conf.epp b/templates/mod/expires.conf.epp
new file mode 100644
index 0000000000..fe5a2c40e4
--- /dev/null
+++ b/templates/mod/expires.conf.epp
@@ -0,0 +1,11 @@
+ExpiresActive <%= apache::bool2httpd($expires_active) %>
+<%- if $expires_default != undef and !($expires_default.empty) { -%>
+ExpiresDefault "<%= $expires_default %>"
+<%- } -%>
+<%- if $expires_by_type != undef and !($expires_by_type.empty) { -%>
+<%-   $expires_by_type.flatten.each |$line| { -%>
+<%-     $line.map |$type, $seconds| { -%>
+ExpiresByType <%= $type %> "<%= $seconds -%>"
+<%-     } -%>
+<%-   } -%>
+<%- } -%>
diff --git a/templates/mod/expires.conf.erb b/templates/mod/expires.conf.erb
deleted file mode 100644
index a864c6ca10..0000000000
--- a/templates/mod/expires.conf.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-ExpiresActive <%= scope.call_function('apache::bool2httpd', [@expires_active]) %>
-<%- if ! @expires_default.nil? and ! @expires_default.empty? -%>
-ExpiresDefault "<%= @expires_default %>"
-<%- end -%>
-<%- if ! @expires_by_type.nil? and ! @expires_by_type.empty? -%>
-<%-   [@expires_by_type].flatten.each do |line| -%>
-<%-     line.map do |type, seconds| -%>
-ExpiresByType <%= type %> "<%= seconds -%>"
-<%-     end -%>
-<%-   end -%>
-<%- end -%>
diff --git a/templates/mod/ext_filter.conf.epp b/templates/mod/ext_filter.conf.epp
new file mode 100644
index 0000000000..63b2b6643a
--- /dev/null
+++ b/templates/mod/ext_filter.conf.epp
@@ -0,0 +1,4 @@
+# mod_ext_filter definitions
+<%- Array($ext_filter_define).sort.each |$name_and_value| { -%>
+ExtFilterDefine <%= $name_and_value[0] %> <%= $name_and_value[1] %>
+<%- } -%>
diff --git a/templates/mod/ext_filter.conf.erb b/templates/mod/ext_filter.conf.erb
deleted file mode 100644
index 620f2bca97..0000000000
--- a/templates/mod/ext_filter.conf.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-# mod_ext_filter definitions
-<%- @ext_filter_define.sort.each do |name, value| -%>
-ExtFilterDefine <%= name %> <%= value %>
-<%- end -%>
diff --git a/templates/mod/fcgid.conf.epp b/templates/mod/fcgid.conf.epp
new file mode 100644
index 0000000000..3c111fe852
--- /dev/null
+++ b/templates/mod/fcgid.conf.epp
@@ -0,0 +1,6 @@
+<IfModule mod_fcgid.c>
+<% $sorted_keys = $options.keys.sort -%>
+<% $sorted_keys.each |$key| { -%>
+  <%= $key %> <%= $options[$key] %>
+<% } -%>
+</IfModule>
diff --git a/templates/mod/fcgid.conf.erb b/templates/mod/fcgid.conf.erb
deleted file mode 100644
index a82bc30df9..0000000000
--- a/templates/mod/fcgid.conf.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfModule mod_fcgid.c>
-<% @options.sort_by {|key, value| key}.each do |key, value| -%>
-  <%= key %> <%= value %>
-<% end -%>
-</IfModule>
diff --git a/templates/mod/geoip.conf.epp b/templates/mod/geoip.conf.epp
new file mode 100644
index 0000000000..309e2170f5
--- /dev/null
+++ b/templates/mod/geoip.conf.epp
@@ -0,0 +1,25 @@
+GeoIPEnable <%= apache::bool2httpd($enable) %>
+
+<%- if $db_file and !($db_file in [ false, 'false', '' ]) { -%>
+    <%- if String(type($db_file, 'generalized')).index('Array') == 0 { -%>
+      <%- Array($db_file).each |$file| { -%>
+GeoIPDBFile <%= $file %> <%= $flag %>
+      <%- } -%>
+    <%- } else { -%>
+GeoIPDBFile <%= $db_file %> <%= $flag %>
+    <%- } -%>
+<%- } -%>
+GeoIPOutput <%= $output %>
+<% if $enable_utf8 != undef { -%>
+GeoIPEnableUTF8 <%= apache::bool2httpd($enable_utf8) %>
+<% } -%>
+<% if $scan_proxy_headers != undef { -%>
+GeoIPScanProxyHeaders <%= apache::bool2httpd($scan_proxy_headers) %>
+<% } -%>
+<% if $scan_proxy_header_field != undef { -%>
+GeoIPScanProxyHeaderField <%= $scan_proxy_header_field %>
+<% } -%>
+<% if $use_last_xforwarededfor_ip != undef { -%>
+GeoIPUseLastXForwardedForIP <%= apache::bool2httpd($use_last_xforwarededfor_ip) %>
+<% } -%>
+
diff --git a/templates/mod/geoip.conf.erb b/templates/mod/geoip.conf.erb
deleted file mode 100644
index a99bee0485..0000000000
--- a/templates/mod/geoip.conf.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-GeoIPEnable <%= scope.call_function('apache::bool2httpd', [@enable]) %>
-
-<%- if @db_file and ! [ false, 'false', '' ].include?(@db_file) -%>
-    <%- if @db_file.kind_of?(Array) -%>
-      <%- Array(@db_file).each do |file| -%>
-GeoIPDBFile <%= file %> <%= @flag %>
-      <%- end -%>
-    <%- else -%>
-GeoIPDBFile <%= @db_file %> <%= @flag %>
-    <%- end -%>
-<%- end -%>
-GeoIPOutput <%= @output %>
-<% if ! @enable_utf8.nil? -%>
-GeoIPEnableUTF8 <%= scope.call_function('apache::bool2httpd', [@enable_utf8]) %>
-<% end -%>
-<% if ! @scan_proxy_headers.nil? -%>
-GeoIPScanProxyHeaders <%= scope.call_function('apache::bool2httpd', [@scan_proxy_headers]) %>
-<% end -%>
-<% if ! @scan_proxy_header_field.nil? -%>
-GeoIPScanProxyHeaderField <%= @scan_proxy_header_field %>
-<% end -%>
-<% if ! @use_last_xforwarededfor_ip.nil? -%>
-GeoIPUseLastXForwardedForIP <%= scope.call_function('apache::bool2httpd', [@use_last_xforwarededfor_ip]) %>
-<% end -%>
-
diff --git a/templates/mod/http2.conf.epp b/templates/mod/http2.conf.epp
new file mode 100644
index 0000000000..a9e0a168d3
--- /dev/null
+++ b/templates/mod/http2.conf.epp
@@ -0,0 +1,57 @@
+# The http2 Apache module configuration file is being
+# managed by Puppet and changes will be overwritten.
+
+<% if $h2_copy_files != undef { -%>
+H2CopyFiles <%= apache::bool2httpd($h2_copy_files) %>
+<% } -%>
+<% if $h2_direct != undef { -%>
+H2Direct <%= apache::bool2httpd($h2_direct) %>
+<% } -%>
+<% if $h2_early_hints != undef { -%>
+H2EarlyHints <%= apache::bool2httpd($h2_early_hints) %>
+<% } -%>
+<% if $h2_max_session_streams != undef { -%>
+H2MaxSessionStreams <%= $h2_max_session_streams %>
+<% } -%>
+<% if $h2_max_worker_idle_seconds != undef { -%>
+H2MaxWorkerIdleSeconds <%= $h2_max_worker_idle_seconds %>
+<% } -%>
+<% if $h2_max_workers != undef { -%>
+H2MaxWorkers <%= $h2_max_workers %>
+<% } -%>
+<% if $h2_min_workers != undef { -%>
+H2MinWorkers <%= $h2_min_workers %>
+<% } -%>
+<%- if $h2_modern_tls_only != undef { -%>
+H2ModernTLSOnly <%= apache::bool2httpd($h2_modern_tls_only) %>
+<%- } -%>
+<%- if $h2_push != undef { -%>
+H2Push <%= apache::bool2httpd($h2_push) %>
+<%- } -%>
+<%- if $h2_push_diary_size != undef { -%>
+H2PushDiarySize <%= $h2_push_diary_size %>
+<%- } -%>
+<%- $h2_push_priority.each |$expr| { -%>
+H2PushPriority <%= $expr %>
+<%- } -%>
+<%- $h2_push_resource.each |$expr| { -%>
+H2PushResource <%= $expr %>
+<%- } -%>
+<% if $h2_serialize_headers != undef { -%>
+H2SerializeHeaders <%= apache::bool2httpd($h2_serialize_headers) %>
+<% } -%>
+<% if $h2_stream_max_mem_size != undef { -%>
+H2StreamMaxMemSize <%= $h2_stream_max_mem_size %>
+<% } -%>
+<%- if $h2_tls_cool_down_secs != undef { -%>
+H2TLSCoolDownSecs <%= $h2_tls_cool_down_secs %>
+<%- } -%>
+<%- if $h2_tls_warm_up_size != undef { -%>
+H2TLSWarmUpSize <%= $h2_tls_warm_up_size %>
+<%- } -%>
+<% if $h2_upgrade != undef { -%>
+H2Upgrade <%= apache::bool2httpd($h2_upgrade) %>
+<% } -%>
+<% if $h2_window_size != undef { -%>
+H2WindowSize <%= $h2_window_size %>
+<% } -%>
diff --git a/templates/mod/http2.conf.erb b/templates/mod/http2.conf.erb
deleted file mode 100644
index 5aa5fa2386..0000000000
--- a/templates/mod/http2.conf.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-# The http2 Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
-
-<% if !@h2_copy_files.nil? -%>
-H2CopyFiles <%= scope.call_function('apache::bool2httpd', [@h2_copy_files]) %>
-<% end -%>
-<% unless @h2_direct.nil? -%>
-H2Direct <%= scope.call_function('apache::bool2httpd', [@h2_direct]) %>
-<% end -%>
-<% if !@h2_early_hints.nil? -%>
-H2EarlyHints <%= scope.call_function('apache::bool2httpd', [@h2_early_hints]) %>
-<% end -%>
-<% unless @h2_max_session_streams.nil? -%>
-H2MaxSessionStreams <%= @h2_max_session_streams %>
-<% end -%>
-<% unless @h2_max_worker_idle_seconds.nil? -%>
-H2MaxWorkerIdleSeconds <%= @h2_max_worker_idle_seconds %>
-<% end -%>
-<% unless @h2_max_workers.nil? -%>
-H2MaxWorkers <%= @h2_max_workers %>
-<% end -%>
-<% unless @h2_min_workers.nil? -%>
-H2MinWorkers <%= @h2_min_workers %>
-<% end -%>
-<%- unless @h2_modern_tls_only.nil? -%>
-H2ModernTLSOnly <%= scope.call_function('apache::bool2httpd', [@h2_modern_tls_only]) %>
-<%- end -%>
-<%- unless @h2_push.nil? -%>
-H2Push <%= scope.call_function('apache::bool2httpd', [@h2_push]) %>
-<%- end -%>
-<%- unless @h2_push_diary_size.nil? -%>
-H2PushDiarySize <%= @h2_push_diary_size %>
-<%- end -%>
-<%- @h2_push_priority.each do |expr| -%>
-H2PushPriority <%= expr %>
-<%- end -%>
-<%- @h2_push_resource.each do |expr| -%>
-H2PushResource <%= expr %>
-<%- end -%>
-<% unless @h2_serialize_headers.nil? -%>
-H2SerializeHeaders <%= scope.call_function('apache::bool2httpd', [@h2_serialize_headers]) %>
-<% end -%>
-<% unless @h2_stream_max_mem_size.nil? -%>
-H2StreamMaxMemSize <%= @h2_stream_max_mem_size %>
-<% end -%>
-<%- unless @h2_tls_cool_down_secs.nil? -%>
-H2TLSCoolDownSecs <%= @h2_tls_cool_down_secs %>
-<%- end -%>
-<%- unless @h2_tls_warm_up_size.nil? -%>
-H2TLSWarmUpSize <%= @h2_tls_warm_up_size %>
-<%- end -%>
-<% unless @h2_upgrade.nil? -%>
-H2Upgrade <%= scope.call_function('apache::bool2httpd', [@h2_upgrade]) %>
-<% end -%>
-<% unless @h2_window_size.nil? -%>
-H2WindowSize <%= @h2_window_size %>
-<% end -%>
diff --git a/templates/mod/info.conf.epp b/templates/mod/info.conf.epp
new file mode 100644
index 0000000000..b031fe09a4
--- /dev/null
+++ b/templates/mod/info.conf.epp
@@ -0,0 +1,6 @@
+<Location <%= $info_path %>>
+    SetHandler server-info
+<%- if $restrict_access { -%>
+    Require ip <%= Array($allow_from).join(" ") %>
+<%- } -%>
+</Location>
diff --git a/templates/mod/info.conf.erb b/templates/mod/info.conf.erb
deleted file mode 100644
index 26acb1ab11..0000000000
--- a/templates/mod/info.conf.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<Location <%= @info_path %>>
-    SetHandler server-info
-<%- if @restrict_access -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-<%- end -%>
-</Location>
diff --git a/templates/mod/itk.conf.epp b/templates/mod/itk.conf.epp
new file mode 100644
index 0000000000..f397e2f715
--- /dev/null
+++ b/templates/mod/itk.conf.epp
@@ -0,0 +1,11 @@
+<IfModule mpm_itk_module>
+  StartServers        <%= $startservers %>
+  MinSpareServers     <%= $minspareservers %>
+  MaxSpareServers     <%= $maxspareservers %>
+  ServerLimit         <%= $serverlimit %>
+  MaxClients          <%= $maxclients %>
+  MaxRequestsPerChild <%= $maxrequestsperchild %>
+  <%- if $enablecapabilities != undef { -%>
+  EnableCapabilities  <%= apache::bool2httpd($enablecapabilities) %>
+  <%- } -%>
+</IfModule>
diff --git a/templates/mod/itk.conf.erb b/templates/mod/itk.conf.erb
deleted file mode 100644
index 4e2284a5e8..0000000000
--- a/templates/mod/itk.conf.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<IfModule mpm_itk_module>
-  StartServers        <%= @startservers %>
-  MinSpareServers     <%= @minspareservers %>
-  MaxSpareServers     <%= @maxspareservers %>
-  ServerLimit         <%= @serverlimit %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-  <%- unless @enablecapabilities.nil? -%>
-  EnableCapabilities  <%= scope.call_function('apache::bool2httpd', [@enablecapabilities]) %>
-  <%- end -%>
-</IfModule>
diff --git a/templates/mod/jk.conf.epp b/templates/mod/jk.conf.epp
new file mode 100644
index 0000000000..c5cb36000d
--- /dev/null
+++ b/templates/mod/jk.conf.epp
@@ -0,0 +1,167 @@
+# This file is generated automatically by Puppet - DO NOT EDIT
+# Any manual changes will be overwritten
+
+<IfModule jk_module>
+  <%- if $workers_file { -%>
+  JkWorkersFile <%= $workers_file %>
+  <%- } -%>
+  <%- if $worker_property { -%>
+  <%- Array($worker_property).sort.each |$property_and_value| { -%>
+  JkWorkerProperty <%= $property_and_value[0] %>=<%= $property_and_value[1] %>
+  <%- } -%>
+  <%- } -%>
+  <%- if $shm_path { -%>
+  JkShmFile <%= $shm_path %>
+  <%- } -%>
+  <%- if $shm_size { -%>
+  JkShmSize <%= $shm_size %>
+  <%- } -%>
+  <%- if $mount_file { -%>
+  JkMountFile <%= $mount_file %>
+  <%- } -%>
+  <%- if $mount_file_reload { -%>
+  JkMountFileReload <%= $mount_file_reload %>
+  <%- } -%>
+  <%- if $mount { -%>
+  <%- Array($mount).sort.each |$url_prefix_and_worker_name| { -%>
+  JkMount <%= $url_prefix_and_worker_name[0] %> <%= $url_prefix_and_worker_name[1] %>
+  <%- } -%>
+  <%- } -%>
+  <%- if $un_mount { -%>
+  <%- Array($un_mount).sort.each |$url_prefix_and_worker_name| { -%>
+  JkUnMount <%= $url_prefix_and_worker_name[0] %> <%= $url_prefix_and_worker_name[1] %>
+  <%- } -%>
+  <%- } -%>
+  <%- if $auto_alias { -%>
+  JkAutoAlias <%= $auto_alias %>
+  <%- } -%>
+  <%- if $mount_copy { -%>
+  JkMountCopy <%= $mount_copy %>
+  <%- } -%>
+  <%- if $worker_indicator { -%>
+  JkWorkerIndicator <%= $worker_indicator %>
+  <%- } -%>
+  <%- if $watchdog_interval { -%>
+  JkWatchdogInterval <%= $watchdog_interval %>
+  <%- } -%>
+  <%- if $log_path { -%>
+  JkLogFile <%= $log_path %>
+  <%- } -%>
+  <%- if $log_level { -%>
+  JkLogLevel <%= $log_level %>
+  <%- } -%>
+  <%- if $log_stamp_format { -%>
+  JkLogStampFormat <%= $log_stamp_format %>
+  <%- } -%>
+  <%- if $request_log_format { -%>
+  JkRequestLogFormat <%= $request_log_format %>
+  <%- } -%>
+  <%- if $extract_ssl { -%>
+  JkExtractSSL <%= $extract_ssl %>
+  <%- } -%>
+  <%- if $https_indicator { -%>
+  JkHTTPSIndicator <%= $https_indicator %>
+  <%- } -%>
+  <%- if $sslprotocol_indicator { -%>
+  JkSSLPROTOCOLIndicator <%= $sslprotocol_indicator %>
+  <%- } -%>
+  <%- if $certs_indicator { -%>
+  JkCERTSIndicator <%= $certs_indicator %>
+  <%- } -%>
+  <%- if $cipher_indicator { -%>
+  JkCIPHERIndicator <%= $cipher_indicator %>
+  <%- } -%>
+  <%- if $certchain_prefix { -%>
+  JkCERTCHAINPrefix <%= $certchain_prefix %>
+  <%- } -%>
+  <%- if $session_indicator { -%>
+  JkSESSIONIndicator <%= $session_indicator %>
+  <%- } -%>
+  <%- if $keysize_indicator { -%>
+  JkKEYSIZEIndicator <%= $keysize_indicator %>
+  <%- } -%>
+  <%- if $local_name_indicator { -%>
+  JkLocalNameIndicator <%= $local_name_indicator %>
+  <%- } -%>
+  <%- if $ignore_cl_indicator { -%>
+  JkIgnoreCLIndicator <%= $ignore_cl_indicator %>
+  <%- } -%>
+  <%- if $local_addr_indicator { -%>
+  JkLocalAddrIndicator <%= $local_addr_indicator %>
+  <%- } -%>
+  <%- if $local_port_indicator { -%>
+  JkLocalPortIndicator <%= $local_port_indicator %>
+  <%- } -%>
+  <%- if $remote_host_indicator { -%>
+  JkRemoteHostIndicator <%= $remote_host_indicator %>
+  <%- } -%>
+  <%- if $remote_addr_indicator { -%>
+  JkRemoteAddrIndicator <%= $remote_addr_indicator %>
+  <%- } -%>
+  <%- if $remote_port_indicator { -%>
+  JkRemotePortIndicator <%= $remote_port_indicator %>
+  <%- } -%>
+  <%- if $remote_user_indicator { -%>
+  JkRemoteUserIndicator <%= $remote_user_indicator %>
+  <%- } -%>
+  <%- if $auth_type_indicator { -%>
+  JkAuthTypeIndicator <%= $auth_type_indicator %>
+  <%- } -%>
+  <%- if $options { -%>
+  <%- $options.sort.each |$fwd_option| { -%>
+  JkOptions <%= $fwd_option %>
+  <%- } -%>
+  <%- } -%>
+  <%- if $env_var { -%>
+  <%- Array($env_var).sort.each |$variable_and_value| { -%>
+  JkEnvVar <%= $variable_and_value[0] %><% if !$variable_and_value[1].empty { %> value<% } -%>
+  <%- } -%>
+  <%- } -%>
+  <%- if $strip_session { -%>
+  JkStripSession <%= $strip_session %>
+  <%- } -%>
+  <%# -%>
+  <%# Global locations for mod_jk are defined in array location_list -%>
+  <%# Each array item is a hash with quoted* property name as key -%>
+  <%# and value as value itself -%>
+  <%# You can define a comment in a special 'comment' key -%>
+  <%# -%>
+  <%# Example: -%>
+  <%# <Location /jkstatus/> -%>
+  <%#   # Configures jkstatus -%>
+  <%#   JkMount status -%>
+  <%#   Order deny,allow -%>
+  <%#   Deny from all -%>
+  <%#   Allow from 127.0.0.1 -%>
+  <%# </Location> -%>
+  <%# -%>
+  <%# Is defined as: -%>
+  <%# location_list = [ -%>
+  <%#   { -%>
+  <%#     'Location'   => '/jkstatus/', -%>
+  <%#     'Comment'    => 'Configures jkstatus', -%>
+  <%#     'JkMount'    => 'status', -%>
+  <%#     'Order'      => 'deny,allow', -%>
+  <%#     'Deny from'  => 'all', -%>
+  <%#     'Allow from' => '127.0.0.1', -%>
+  <%#   }, -%>
+  <%# ] -%>
+  <%# * Keys must be quoted to allow arbitrary case and/or multi-word keys -%>
+  <%# (BTW, note the case of 'Location' and 'Comment' keys) -%>
+  <%# -%>
+  <%- if $location_list { -%>
+  <%- $location_list.each |$location_tag| { -%>
+
+  <Location <%= $location_tag['Location'] %>>
+    <%- if $location_tag['Comment'] { -%>
+    # <%= $location_tag['Comment'] %>
+    <%- } -%>
+    <%- $location_tag.each |$property, $value| { -%>
+    <%- if $property != 'Comment' and $property != 'Location' { -%>
+    <%= $property %> <%= $value %>
+    <%- } -%>
+    <%- } -%>
+  </Location>
+  <%- } -%>
+  <%- } -%>
+</IfModule>
diff --git a/templates/mod/jk.conf.erb b/templates/mod/jk.conf.erb
deleted file mode 100644
index c0d5bc2fff..0000000000
--- a/templates/mod/jk.conf.erb
+++ /dev/null
@@ -1,167 +0,0 @@
-# This file is generated automatically by Puppet - DO NOT EDIT
-# Any manual changes will be overwritten
-
-<IfModule jk_module>
-  <%- if @workers_file -%>
-  JkWorkersFile <%= @workers_file %>
-  <%- end -%>
-  <%- if @worker_property -%>
-  <%- @worker_property.sort.each do |property,value| -%>
-  JkWorkerProperty <%= property %>=<%= value %>
-  <%- end -%>
-  <%- end -%>
-  <%- if @shm_path -%>
-  JkShmFile <%= @shm_path %>
-  <%- end -%>
-  <%- if @shm_size -%>
-  JkShmSize <%= @shm_size %>
-  <%- end -%>
-  <%- if @mount_file -%>
-  JkMountFile <%= @mount_file %>
-  <%- end -%>
-  <%- if @mount_file_reload -%>
-  JkMountFileReload <%= @mount_file_reload %>
-  <%- end -%>
-  <%- if @mount -%>
-  <%- @mount.sort.each do |url_prefix,worker_name| -%>
-  JkMount <%= url_prefix %> <%= worker_name %>
-  <%- end -%>
-  <%- end -%>
-  <%- if @un_mount -%>
-  <%- @un_mount.sort.each do |url_prefix,worker_name| -%>
-  JkUnMount <%= url_prefix %> <%= worker_name %>
-  <%- end -%>
-  <%- end -%>
-  <%- if @auto_alias -%>
-  JkAutoAlias <%= @auto_alias %>
-  <%- end -%>
-  <%- if @mount_copy -%>
-  JkMountCopy <%= @mount_copy %>
-  <%- end -%>
-  <%- if @worker_indicator -%>
-  JkWorkerIndicator <%= @worker_indicator %>
-  <%- end -%>
-  <%- if @watchdog_interval -%>
-  JkWatchdogInterval <%= @watchdog_interval %>
-  <%- end -%>
-  <%- if @log_path -%>
-  JkLogFile <%= @log_path %>
-  <%- end -%>
-  <%- if @log_level -%>
-  JkLogLevel <%= @log_level %>
-  <%- end -%>
-  <%- if @log_stamp_format -%>
-  JkLogStampFormat <%= @log_stamp_format %>
-  <%- end -%>
-  <%- if @request_log_format -%>
-  JkRequestLogFormat <%= @request_log_format %>
-  <%- end -%>
-  <%- if @extract_ssl -%>
-  JkExtractSSL <%= @extract_ssl %>
-  <%- end -%>
-  <%- if @https_indicator -%>
-  JkHTTPSIndicator <%= @https_indicator %>
-  <%- end -%>
-  <%- if @sslprotocol_indicator -%>
-  JkSSLPROTOCOLIndicator <%= @sslprotocol_indicator %>
-  <%- end -%>
-  <%- if @certs_indicator -%>
-  JkCERTSIndicator <%= @certs_indicator %>
-  <%- end -%>
-  <%- if @cipher_indicator -%>
-  JkCIPHERIndicator <%= @cipher_indicator %>
-  <%- end -%>
-  <%- if @certchain_prefix -%>
-  JkCERTCHAINPrefix <%= @certchain_prefix %>
-  <%- end -%>
-  <%- if @session_indicator -%>
-  JkSESSIONIndicator <%= @session_indicator %>
-  <%- end -%>
-  <%- if @keysize_indicator -%>
-  JkKEYSIZEIndicator <%= @keysize_indicator %>
-  <%- end -%>
-  <%- if @local_name_indicator -%>
-  JkLocalNameIndicator <%= @local_name_indicator %>
-  <%- end -%>
-  <%- if @ignore_cl_indicator -%>
-  JkIgnoreCLIndicator <%= @ignore_cl_indicator %>
-  <%- end -%>
-  <%- if @local_addr_indicator -%>
-  JkLocalAddrIndicator <%= @local_addr_indicator %>
-  <%- end -%>
-  <%- if @local_port_indicator -%>
-  JkLocalPortIndicator <%= @local_port_indicator %>
-  <%- end -%>
-  <%- if @remote_host_indicator -%>
-  JkRemoteHostIndicator <%= @remote_host_indicator %>
-  <%- end -%>
-  <%- if @remote_addr_indicator -%>
-  JkRemoteAddrIndicator <%= @remote_addr_indicator %>
-  <%- end -%>
-  <%- if @remote_port_indicator -%>
-  JkRemotePortIndicator <%= @remote_port_indicator %>
-  <%- end -%>
-  <%- if @remote_user_indicator -%>
-  JkRemoteUserIndicator <%= @remote_user_indicator %>
-  <%- end -%>
-  <%- if @auth_type_indicator -%>
-  JkAuthTypeIndicator <%= @auth_type_indicator %>
-  <%- end -%>
-  <%- if @options -%>
-  <%- @options.sort.each do |fwd_option| -%>
-  JkOptions <%= fwd_option %>
-  <%- end -%>
-  <%- end -%>
-  <%- if @env_var -%>
-  <%- @env_var.sort.each do |variable,value| -%>
-  JkEnvVar <%= variable %><% if not value.empty? -%> value<% end -%>
-  <%- end -%>
-  <%- end -%>
-  <%- if @strip_session -%>
-  JkStripSession <%= @strip_session %>
-  <%- end -%>
-  <%-# -%>
-  <%-# Global locations for mod_jk are defined in array location_list -%>
-  <%-# Each array item is a hash with quoted* property name as key -%>
-  <%-# and value as value itself -%>
-  <%-# You can define a comment in a special 'comment' key -%>
-  <%-# -%>
-  <%-# Example: -%>
-  <%-# <Location /jkstatus/> -%>
-  <%-#   # Configures jkstatus -%>
-  <%-#   JkMount status -%>
-  <%-#   Order deny,allow -%>
-  <%-#   Deny from all -%>
-  <%-#   Allow from 127.0.0.1 -%>
-  <%-# </Location> -%>
-  <%-# -%>
-  <%-# Is defined as: -%>
-  <%-# location_list = [ -%>
-  <%-#   { -%>
-  <%-#     'Location'   => '/jkstatus/', -%>
-  <%-#     'Comment'    => 'Configures jkstatus', -%>
-  <%-#     'JkMount'    => 'status', -%>
-  <%-#     'Order'      => 'deny,allow', -%>
-  <%-#     'Deny from'  => 'all', -%>
-  <%-#     'Allow from' => '127.0.0.1', -%>
-  <%-#   }, -%>
-  <%-# ] -%>
-  <%-# * Keys must be quoted to allow arbitrary case and/or multi-word keys -%>
-  <%-# (BTW, note the case of 'Location' and 'Comment' keys) -%>
-  <%-# -%>
-  <%- if @location_list -%>
-  <%- @location_list.each do |location_tag| -%>
-
-  <Location <%= location_tag['Location'] %>>
-    <%- if location_tag.has_key?('Comment') -%>
-    # <%= location_tag['Comment'] %>
-    <%- end -%>
-    <%- location_tag.each do |property,value| -%>
-    <%- if property != 'Comment' and property != 'Location' -%>
-    <%= property %> <%= value %>
-    <%- end -%>
-    <%- end -%>
-  </Location>
-  <%- end -%>
-  <%- end -%>
-</IfModule>
diff --git a/templates/mod/jk/uriworkermap.properties.erb b/templates/mod/jk/uriworkermap.properties.epp
similarity index 75%
rename from templates/mod/jk/uriworkermap.properties.erb
rename to templates/mod/jk/uriworkermap.properties.epp
index 4d9eac03f9..88e42c1711 100644
--- a/templates/mod/jk/uriworkermap.properties.erb
+++ b/templates/mod/jk/uriworkermap.properties.epp
@@ -28,13 +28,13 @@
 <%#   }, -%>
 <%# }, -%>
 <%# -%>
-<% @mount_file_content.sort.each do |worker,directives| -%>
+<% Array($mount_file_content).sort.each |$worker_and_directives| { -%>
 
 <%# Places comment before worker mappings -%>
-<% if directives.has_key?('comment') -%>
-# <%= directives['comment'] %>
-<% end -%>
-<% directives['uri_list'].sort.each do |uri| -%>
-<%= uri %> = <%= worker %>
-<% end -%>
-<% end -%>
+<% if $worker_and_directives[1]['comment'] { -%>
+# <%= $worker_and_directives[1]['comment'] %>
+<% } -%>
+<% $worker_and_directives[1]['uri_list'].sort.each |$uri| { -%>
+<%= $uri %> = <%= $worker_and_directives[0] %>
+<% } -%>
+<% } -%>
diff --git a/templates/mod/jk/workers.properties.erb b/templates/mod/jk/workers.properties.epp
similarity index 65%
rename from templates/mod/jk/workers.properties.erb
rename to templates/mod/jk/workers.properties.epp
index 8292f3d37a..25cc758ae2 100644
--- a/templates/mod/jk/workers.properties.erb
+++ b/templates/mod/jk/workers.properties.epp
@@ -35,28 +35,28 @@
 <%#   }, -%>
 <%# }, -%>
 <%# -%>
-<% if @workers_file_content.has_key?('worker_lists') -%>
+<% if $workers_file_content['worker_lists'] { -%>
 
-<% @workers_file_content['worker_lists'].sort.each do |list| -%>
-worker.list = <%= list %>
-<% end -%>
-<% end -%>
-<% if @workers_file_content.has_key?('worker_maintain') -%>
+<% $workers_file_content['worker_lists'].sort.each |$list| { -%>
+worker.list = <%= $list %>
+<% } -%>
+<% } -%>
+<% if $workers_file_content['worker_maintain'] { -%>
 
-worker.maintain = <%= @workers_file_content['worker_maintain'] %>
-<% end -%>
-<% @workers_file_content.sort.each do |name,directives| -%>
+worker.maintain = <%= $workers_file_content['worker_maintain'] %>
+<% } -%>
+<% Array($workers_file_content).sort.each |$name_and_directives| { -%>
 <%# Skip hash items with the reserved keys -%>
-<% if not ['worker_lists', 'worker_maintain'].include?(name) -%>
+<% if !($name_and_directives[0] in ['worker_lists', 'worker_maintain']) { -%>
 
 <%# Places comment before worker directives -%>
-<% if directives.has_key?('comment') -%>
-# <%= directives['comment'] %>
-<% end -%>
-<% directives.sort.each do |property,value| -%>
-<% if property != 'comment' -%>
-worker.<%= name %>.<%= property %>=<%= value %>
-<% end -%>
-<% end -%>
-<% end -%>
-<% end -%>
+<% if $name_and_directives[1]['comment'] { -%>
+# <%= $name_and_directives[1]['comment'] %>
+<% } -%>
+<% Array($name_and_directives[1]).sort.each |$property_and_value| { -%>
+<% if $property_and_value[0] != 'comment' { -%>
+worker.<%= $name_and_directives[0] %>.<%= $property_and_value[0] %>=<%= $property_and_value[1] %>
+<% } -%>
+<% } -%>
+<% } -%>
+<% } -%>
diff --git a/templates/mod/ldap.conf.epp b/templates/mod/ldap.conf.epp
new file mode 100644
index 0000000000..c2e28a9a5a
--- /dev/null
+++ b/templates/mod/ldap.conf.epp
@@ -0,0 +1,25 @@
+<Location <%= $ldap_path %>>
+    SetHandler ldap-status
+    Require ip 127.0.0.1 ::1
+</Location>
+<% if $ldap_trusted_global_cert_file { -%>
+LDAPTrustedGlobalCert <%= $ldap_trusted_global_cert_type %> <%= $ldap_trusted_global_cert_file %>
+<% } -%>
+<% if $ldap_trusted_mode { -%>
+LDAPTrustedMode <%= $ldap_trusted_mode %>
+<% } -%>
+<%- if $ldap_shared_cache_size { -%>
+LDAPSharedCacheSize <%= $ldap_shared_cache_size %>
+<%- } -%>
+<%- if $ldap_cache_entries { -%>
+LDAPCacheEntries <%= $ldap_cache_entries %>
+<%- } -%>
+<%- if $ldap_cache_ttl { -%>
+LDAPCacheTTL <%= $ldap_cache_ttl %>
+<%- } -%>
+<%- if $ldap_opcache_entries { -%>
+LDAPOpCacheEntries <%= $ldap_opcache_entries %>
+<%- } -%>
+<%- if $ldap_opcache_ttl { -%>
+LDAPOpCacheTTL <%= $ldap_opcache_ttl %>
+<%- } -%>
diff --git a/templates/mod/ldap.conf.erb b/templates/mod/ldap.conf.erb
deleted file mode 100644
index d4ccac43df..0000000000
--- a/templates/mod/ldap.conf.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<Location <%= @ldap_path %>>
-    SetHandler ldap-status
-    Require ip 127.0.0.1 ::1
-</Location>
-<% if @ldap_trusted_global_cert_file -%>
-LDAPTrustedGlobalCert <%= @ldap_trusted_global_cert_type %> <%= @ldap_trusted_global_cert_file %>
-<% end -%>
-<% if @ldap_trusted_mode -%>
-LDAPTrustedMode <%= @ldap_trusted_mode %>
-<% end -%>
-<%- if @ldap_shared_cache_size -%>
-LDAPSharedCacheSize <%= @ldap_shared_cache_size %>
-<%- end -%>
-<%- if @ldap_cache_entries -%>
-LDAPCacheEntries <%= @ldap_cache_entries %>
-<%- end -%>
-<%- if @ldap_cache_ttl -%>
-LDAPCacheTTL <%= @ldap_cache_ttl %>
-<%- end -%>
-<%- if @ldap_opcache_entries -%>
-LDAPOpCacheEntries <%= @ldap_opcache_entries %>
-<%- end -%>
-<%- if @ldap_opcache_ttl -%>
-LDAPOpCacheTTL <%= @ldap_opcache_ttl %>
-<%- end -%>
diff --git a/templates/mod/load.epp b/templates/mod/load.epp
new file mode 100644
index 0000000000..a753dd2520
--- /dev/null
+++ b/templates/mod/load.epp
@@ -0,0 +1,7 @@
+<% if $loadfiles { -%>
+<% Array($loadfiles).each |$loadfile| { -%>
+LoadFile <%= $loadfile %>
+<% } -%>
+
+<% } -%>
+LoadModule <%= $_id %> <%= $_path %>
diff --git a/templates/mod/load.erb b/templates/mod/load.erb
deleted file mode 100644
index 51f45edb21..0000000000
--- a/templates/mod/load.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @loadfiles -%>
-<% Array(@loadfiles).each do |loadfile| -%>
-LoadFile <%= loadfile %>
-<% end -%>
-
-<% end -%>
-LoadModule <%= @_id %> <%= @_path %>
diff --git a/templates/mod/mime.conf.erb b/templates/mod/mime.conf.epp
similarity index 70%
rename from templates/mod/mime.conf.erb
rename to templates/mod/mime.conf.epp
index 46d021c217..11a2ca045d 100644
--- a/templates/mod/mime.conf.erb
+++ b/templates/mod/mime.conf.epp
@@ -1,4 +1,4 @@
-TypesConfig <%= @mime_types_config %>
+TypesConfig <%= $mime_types_config %>
 
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz
@@ -31,8 +31,8 @@ AddLanguage sv .sv
 AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
 
-<%- @_mime_types_additional.sort.each do |add_mime, config| -%>
-        <%- config.each do |type, extension| %>
-<%= add_mime %> <%= type %> <%= extension%>
-        <%- end -%>
-<% end %>
+<%- Array($_mime_types_additional).sort.each |$add_mime_and_config| { -%>
+        <%- $add_mime_and_config[1].each |$type, $extension| { %>
+<%= $add_mime_and_config[0] %> <%= $type %> <%= $extension %>
+        <%- } -%>
+<% } %>
diff --git a/templates/mod/mime_magic.conf.epp b/templates/mod/mime_magic.conf.epp
new file mode 100644
index 0000000000..5696f89513
--- /dev/null
+++ b/templates/mod/mime_magic.conf.epp
@@ -0,0 +1 @@
+MIMEMagicFile "<%= $_magic_file %>"
diff --git a/templates/mod/mime_magic.conf.erb b/templates/mod/mime_magic.conf.erb
deleted file mode 100644
index cbc173debc..0000000000
--- a/templates/mod/mime_magic.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-MIMEMagicFile "<%= @_magic_file %>"
diff --git a/templates/mod/mpm_event.conf.erb b/templates/mod/mpm_event.conf.epp
similarity index 100%
rename from templates/mod/mpm_event.conf.erb
rename to templates/mod/mpm_event.conf.epp
diff --git a/templates/mod/negotiation.conf.epp b/templates/mod/negotiation.conf.epp
new file mode 100644
index 0000000000..5183e2b8fb
--- /dev/null
+++ b/templates/mod/negotiation.conf.epp
@@ -0,0 +1,12 @@
+<% if String(type($language_priority, 'generalized')).index('Array') == 0 { -%>
+  <%- $language_priority_updated = $language_priority.join(' ') -%>
+<% } else { -%>
+  <%- $language_priority_updated = $language_priority -%>
+<% } -%>
+<% if String(type($force_language_priority, 'generalized')).index('Array') == 0 { -%>
+  <%- $force_language_priority_updated = $force_language_priority.join(' ') -%>
+<% } else { -%>
+  <%- $force_language_priority_updated = $force_language_priority -%>
+<% } -%>
+LanguagePriority <%= $language_priority_updated %>
+ForceLanguagePriority <%= $force_language_priority_updated %>
diff --git a/templates/mod/negotiation.conf.erb b/templates/mod/negotiation.conf.erb
deleted file mode 100644
index 2fb4700d68..0000000000
--- a/templates/mod/negotiation.conf.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-LanguagePriority <%= Array(@language_priority).join(' ') %>
-ForceLanguagePriority <%= Array(@force_language_priority).join(' ') %>
diff --git a/templates/mod/nss.conf.erb b/templates/mod/nss.conf.epp
similarity index 97%
rename from templates/mod/nss.conf.erb
rename to templates/mod/nss.conf.epp
index 36f83d865b..79571820a3 100644
--- a/templates/mod/nss.conf.erb
+++ b/templates/mod/nss.conf.epp
@@ -17,7 +17,7 @@
 # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
 #       Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:443"
 #
-Listen <%= @port %>
+Listen <%= $port %>
 
 ##
 ##  SSL Global Context
@@ -36,11 +36,11 @@ AddType application/x-pkcs7-crl    .crl
 #   Configure the pass phrase gathering process.
 #   The filtering dialog program (`builtin' is a internal
 #   terminal dialog) has to provide the pass phrase on stdout.
-<% if @passwd_file -%>
-NSSPassPhraseDialog  "file:<%= @passwd_file %>"
-<% else -%>
+<% if $passwd_file { -%>
+NSSPassPhraseDialog  "file:<%= $passwd_file %>"
+<% } else { -%>
 NSSPassPhraseDialog  builtin
-<% end -%>
+<% } -%>
 
 #   Pass Phrase Helper:
 #   This helper program stores the token password pins between
@@ -84,7 +84,7 @@ NSSRequireSafeNegotiation off
 ## SSL Virtual Host Context
 ##
 
-<VirtualHost _default_:<%= @port %>>
+<VirtualHost _default_:<%= $port %>>
 
 #   General setup for the virtual host
 #DocumentRoot "/etc/httpd/htdocs"
@@ -93,8 +93,8 @@ NSSRequireSafeNegotiation off
 
 # mod_nss can log to separate log files, you can choose to do that if you'd like
 # LogLevel is not inherited from httpd.conf.
-ErrorLog "<%= @error_log %>"
-TransferLog "<%= @transfer_log %>"
+ErrorLog "<%= $error_log %>"
+TransferLog "<%= $transfer_log %>"
 LogLevel warn
 
 #   SSL Engine Switch:
@@ -138,7 +138,7 @@ NSSNickname Server-Cert
 #   The NSS security database directory that holds the certificates and
 #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
 #   Provide the directory that these files exist.
-NSSCertificateDatabase "<%= @httpd_dir -%>/alias"
+NSSCertificateDatabase "<%= $httpd_dir -%>/alias"
 
 #   Database Prefix:
 #   In order to be able to store multiple NSS databases in one directory
diff --git a/templates/mod/pagespeed.conf.epp b/templates/mod/pagespeed.conf.epp
new file mode 100644
index 0000000000..840a8eeaab
--- /dev/null
+++ b/templates/mod/pagespeed.conf.epp
@@ -0,0 +1,87 @@
+ModPagespeed on
+
+ModPagespeedInheritVHostConfig <%= $inherit_vhost_config %>
+AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html
+<% if $filter_xhtml { -%>
+AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER application/xhtml+xml
+<% } -%>
+ModPagespeedFileCachePath "<%= $cache_path %>"
+ModPagespeedLogDir "<%= $log_dir %>"
+
+<% $memcache_servers.each |$server| { -%>
+ModPagespeedMemcachedServers <%= $server %>
+<% } -%>
+
+ModPagespeedRewriteLevel <%= $rewrite_level -%>
+
+<% $disable_filters.each |$filter| { -%>
+ModPagespeedDisableFilters <%= $filter %>
+<% } -%>
+
+<% $enable_filters.each |$filter| { -%>
+ModPagespeedEnableFilters <%= $filter %>
+<% } -%>
+
+<% $forbid_filters.each |$filter| { -%>
+ModPagespeedForbidFilters <%= $filter %>
+<% } -%>
+
+ModPagespeedRewriteDeadlinePerFlushMs <%= $rewrite_deadline_per_flush_ms %>
+
+<% if $additional_domains { -%>
+ModPagespeedDomain <%= $additional_domains -%>
+<% } -%>
+
+ModPagespeedFileCacheSizeKb          <%= $file_cache_size_kb %>
+ModPagespeedFileCacheCleanIntervalMs <%= $file_cache_clean_interval_ms %>
+ModPagespeedLRUCacheKbPerProcess     <%= $lru_cache_per_process %>
+ModPagespeedLRUCacheByteLimit        <%= $lru_cache_byte_limit %>
+ModPagespeedCssFlattenMaxBytes       <%= $css_flatten_max_bytes %>
+ModPagespeedCssInlineMaxBytes        <%= $css_inline_max_bytes %>
+ModPagespeedCssImageInlineMaxBytes   <%= $css_image_inline_max_bytes %>
+ModPagespeedImageInlineMaxBytes      <%= $image_inline_max_bytes %>
+ModPagespeedJsInlineMaxBytes         <%= $js_inline_max_bytes %>
+ModPagespeedCssOutlineMinBytes       <%= $css_outline_min_bytes %>
+ModPagespeedJsOutlineMinBytes        <%= $js_outline_min_bytes %>
+
+
+ModPagespeedFileCacheInodeLimit <%= $inode_limit %>
+ModPagespeedImageMaxRewritesAtOnce <%= $image_max_rewrites_at_once %>
+
+ModPagespeedNumRewriteThreads <%= $num_rewrite_threads %>
+ModPagespeedNumExpensiveRewriteThreads <%= $num_expensive_rewrite_threads %>
+
+ModPagespeedStatistics <%= $collect_statistics %>
+
+<Location /mod_pagespeed_statistics>
+    # You may insert other "Allow from" lines to add hosts you want to
+    # allow to look at generated statistics.  Another possibility is
+    # to comment out the "Order" and "Allow" options from the config
+    # file, to allow any client that can reach your server to examine
+    # statistics.  This might be appropriate in an experimental setup or
+    # if the Apache server is protected by a reverse proxy that will
+    # filter URLs in some fashion.
+    Require ip 127.0.0.1 ::1 <%= Array($allow_view_stats).join(" ") %>
+    SetHandler mod_pagespeed_statistics
+</Location>
+
+ModPagespeedStatisticsLogging <%= $statistics_logging %>
+<Location /pagespeed_console>
+    Require ip 127.0.0.1 ::1 <%= Array($allow_pagespeed_console).join(" ") %>
+    SetHandler pagespeed_console
+</Location>
+
+ModPagespeedMessageBufferSize <%= $message_buffer_size %>
+
+<Location /mod_pagespeed_message>
+    Require ip 127.0.0.1 ::1 <%= Array($allow_pagespeed_message).join(" ") %>
+    SetHandler mod_pagespeed_message
+</Location>
+
+<% if String(type($additional_configuration, 'generalized')).index('Array') == 0 { -%>
+<%= $additional_configuration.join("\n") %>
+<% } else { -%>
+<% $additional_configuration.each |$key, $value| { -%>
+<%= $key %> <%= $value %>
+<% } -%>
+<% } -%>
diff --git a/templates/mod/pagespeed.conf.erb b/templates/mod/pagespeed.conf.erb
deleted file mode 100644
index c99e3b4992..0000000000
--- a/templates/mod/pagespeed.conf.erb
+++ /dev/null
@@ -1,87 +0,0 @@
-ModPagespeed on
-
-ModPagespeedInheritVHostConfig <%= @inherit_vhost_config %>
-AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html
-<% if @filter_xhtml -%>
-AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER application/xhtml+xml
-<% end -%>
-ModPagespeedFileCachePath "<%= @cache_path %>"
-ModPagespeedLogDir "<%= @log_dir %>"
-
-<% @memcache_servers.each do |server| -%>
-ModPagespeedMemcachedServers <%= server %>
-<% end -%>
-
-ModPagespeedRewriteLevel <%= @rewrite_level -%>
-
-<% @disable_filters.each do |filter| -%>
-ModPagespeedDisableFilters <%= filter %>
-<% end -%>
-
-<% @enable_filters.each do |filter| -%>
-ModPagespeedEnableFilters <%= filter %>
-<% end -%>
-
-<% @forbid_filters.each do |filter| -%>
-ModPagespeedForbidFilters <%= filter %>
-<% end -%>
-
-ModPagespeedRewriteDeadlinePerFlushMs <%= @rewrite_deadline_per_flush_ms %>
-
-<% if @additional_domains -%>
-ModPagespeedDomain <%= @additional_domains -%>
-<% end -%>
-
-ModPagespeedFileCacheSizeKb          <%= @file_cache_size_kb %>
-ModPagespeedFileCacheCleanIntervalMs <%= @file_cache_clean_interval_ms %>
-ModPagespeedLRUCacheKbPerProcess     <%= @lru_cache_per_process %>
-ModPagespeedLRUCacheByteLimit        <%= @lru_cache_byte_limit %>
-ModPagespeedCssFlattenMaxBytes       <%= @css_flatten_max_bytes %>
-ModPagespeedCssInlineMaxBytes        <%= @css_inline_max_bytes %>
-ModPagespeedCssImageInlineMaxBytes   <%= @css_image_inline_max_bytes %>
-ModPagespeedImageInlineMaxBytes      <%= @image_inline_max_bytes %>
-ModPagespeedJsInlineMaxBytes         <%= @js_inline_max_bytes %>
-ModPagespeedCssOutlineMinBytes       <%= @css_outline_min_bytes %>
-ModPagespeedJsOutlineMinBytes        <%= @js_outline_min_bytes %>
-
-
-ModPagespeedFileCacheInodeLimit <%= @inode_limit %>
-ModPagespeedImageMaxRewritesAtOnce <%= @image_max_rewrites_at_once %>
-
-ModPagespeedNumRewriteThreads <%= @num_rewrite_threads %>
-ModPagespeedNumExpensiveRewriteThreads <%= @num_expensive_rewrite_threads %>
-
-ModPagespeedStatistics <%= @collect_statistics %>
-
-<Location /mod_pagespeed_statistics>
-    # You may insert other "Allow from" lines to add hosts you want to
-    # allow to look at generated statistics.  Another possibility is
-    # to comment out the "Order" and "Allow" options from the config
-    # file, to allow any client that can reach your server to examine
-    # statistics.  This might be appropriate in an experimental setup or
-    # if the Apache server is protected by a reverse proxy that will
-    # filter URLs in some fashion.
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
-    SetHandler mod_pagespeed_statistics
-</Location>
-
-ModPagespeedStatisticsLogging <%= @statistics_logging %>
-<Location /pagespeed_console>
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
-    SetHandler pagespeed_console
-</Location>
-
-ModPagespeedMessageBufferSize <%= @message_buffer_size %>
-
-<Location /mod_pagespeed_message>
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
-    SetHandler mod_pagespeed_message
-</Location>
-
-<% if @additional_configuration.is_a? Array -%>
-<%= @additional_configuration.join("\n") %>
-<% else -%>
-<% @additional_configuration.each_pair do |key, value| -%>
-<%= key %> <%= value %>
-<% end -%>
-<% end -%>
diff --git a/templates/mod/passenger.conf.epp b/templates/mod/passenger.conf.epp
new file mode 100644
index 0000000000..e550805506
--- /dev/null
+++ b/templates/mod/passenger.conf.epp
@@ -0,0 +1,262 @@
+# The Passenger Apache module configuration file is being
+# managed by Puppet and changes will be overwritten.
+<IfModule mod_passenger.c>
+  <%- if $passenger_allow_encoded_slashes { -%>
+  PassengerAllowEncodedSlashes <%= $passenger_allow_encoded_slashes %>
+  <%- } -%>
+  <%- if $passenger_anonymous_telemetry_proxy { -%>
+  PassengerAnonymousTelemetryProxy <%= $passenger_anonymous_telemetry_proxy %>
+  <%- } -%>
+  <%- if $passenger_app_env { -%>
+  PassengerAppEnv <%= $passenger_app_env %>
+  <%- } -%>
+  <%- if $passenger_app_group_name { -%>
+  PassengerAppGroupName <%= $passenger_app_group_name %>
+  <%- } -%>
+  <%- if $passenger_app_root { -%>
+  PassengerAppRoot "<%= $passenger_app_root %>"
+  <%- } -%>
+  <%- if $passenger_app_type { -%>
+  PassengerAppType <%= $passenger_app_type %>
+  <%- } -%>
+  <%- if $passenger_base_uri { -%>
+  PassengerBaseURI <%= $passenger_base_uri %>
+  <%- } -%>
+  <%- if $passenger_buffer_response { -%>
+  PassengerBufferResponse <%= $passenger_buffer_response %>
+  <%- } -%>
+  <%- if $passenger_buffer_upload { -%>
+  PassengerBufferUpload <%= $passenger_buffer_upload %>
+  <%- } -%>
+  <%- if $passenger_concurrency_model { -%>
+  PassengerConcurrencyModel <%= $passenger_concurrency_model %>
+  <%- } -%>
+  <%- if $passenger_data_buffer_dir { -%>
+  PassengerDataBufferDir "<%= $passenger_data_buffer_dir %>"
+  <%- } -%>
+  <%- if $passenger_debug_log_file { -%>
+  PassengerDebugLogFile <%= $passenger_debug_log_file %>
+  <%- } -%>
+  <%- if $passenger_debugger { -%>
+  PassengerDebugger <%= $passenger_debugger %>
+  <%- } -%>
+  <%- if $passenger_default_group { -%>
+  PassengerDefaultGroup <%= $passenger_default_group %>
+  <%- } -%>
+  <%- if $passenger_default_ruby { -%>
+  PassengerDefaultRuby "<%= $passenger_default_ruby %>"
+  <%- } -%>
+  <%- if $passenger_default_user { -%>
+  PassengerDefaultUser <%= $passenger_default_user %>
+  <%- } -%>
+  <%- if $passenger_disable_anonymous_telemetry != undef { -%>
+  PassengerDisableAnonymousTelemetry <%= apache::bool2httpd($passenger_disable_anonymous_telemetry) %>
+  <%- } -%>
+  <%- if $passenger_disable_log_prefix != undef { -%>
+  PassengerDisableLogPrefix <%= apache::bool2httpd($passenger_disable_log_prefix) %>
+  <%- } -%>
+  <%- if $passenger_disable_security_update_check { -%>
+  PassengerDisableSecurityUpdateCheck <%= $passenger_disable_security_update_check %>
+  <%- } -%>
+  <%- if $passenger_enabled { -%>
+  PassengerEnabled <%= $passenger_enabled %>
+  <%- } -%>
+  <%- if $passenger_error_override { -%>
+  PassengerErrorOverride <%= $passenger_error_override %>
+  <%- } -%>
+  <%- if $passenger_file_descriptor_log_file { -%>
+  PassengerFileDescriptorLogFile "<%= $passenger_file_descriptor_log_file %>"
+  <%- } -%>
+  <%- if $passenger_fly_with { -%>
+  PassengerFlyWith "<%= $passenger_fly_with %>"
+  <%- } -%>
+  <%- if $passenger_force_max_concurrent_requests_per_process { -%>
+  PassengerForceMaxConcurrentRequestsPerProcess <%= $passenger_force_max_concurrent_requests_per_process %>
+  <%- } -%>
+  <%- if $passenger_friendly_error_pages { -%>
+  PassengerFriendlyErrorPages <%= $passenger_friendly_error_pages %>
+  <%- } -%>
+  <%- if $passenger_group { -%>
+  PassengerGroup <%= $passenger_group %>
+  <%- } -%>
+  <%- if $passenger_high_performance { -%>
+  PassengerHighPerformance <%= $passenger_high_performance %>
+  <%- } -%>
+  <%- if $passenger_instance_registry_dir { -%>
+  PassengerInstanceRegistryDir "<%= $passenger_instance_registry_dir %>"
+  <%- } -%>
+  <%- if $passenger_load_shell_envvars { -%>
+  PassengerLoadShellEnvvars <%= $passenger_load_shell_envvars %>
+  <%- } -%>
+  <%- if $passenger_preload_bundler != undef { -%>
+  PassengerPreloadBundler <%= apache::bool2httpd($passenger_preload_bundler) %>
+  <%- } -%>
+  <%- if $passenger_log_file { -%>
+  PassengerLogFile "<%= $passenger_log_file %>"
+  <%- } -%>
+  <%- if $passenger_log_level { -%>
+  PassengerLogLevel <%= $passenger_log_level %>
+  <%- } -%>
+  <%- if $passenger_lve_min_uid { -%>
+  PassengerLveMinUid <%= $passenger_lve_min_uid %>
+  <%- } -%>
+  <%- if $passenger_max_instances { -%>
+  PassengerMaxInstances <%= $passenger_max_instances %>
+  <%- } -%>
+  <%- if $passenger_max_instances_per_app { -%>
+  PassengerMaxInstancesPerApp <%= $passenger_max_instances_per_app %>
+  <%- } -%>
+  <%- if $passenger_max_pool_size { -%>
+  PassengerMaxPoolSize <%= $passenger_max_pool_size %>
+  <%- } -%>
+  <%- if $passenger_max_preloader_idle_time { -%>
+  PassengerMaxPreloaderIdleTime <%= $passenger_max_preloader_idle_time %>
+  <%- } -%>
+  <%- if $passenger_max_request_queue_size { -%>
+  PassengerMaxRequestQueueSize <%= $passenger_max_request_queue_size %>
+  <%- } -%>
+  <%- if $passenger_max_request_time { -%>
+  PassengerMaxRequestTime <%= $passenger_max_request_time %>
+  <%- } -%>
+  <%- if $passenger_max_requests { -%>
+  PassengerMaxRequests <%= $passenger_max_requests %>
+  <%- } -%>
+  <%- if $passenger_memory_limit { -%>
+  PassengerMemoryLimit <%= $passenger_memory_limit %>
+  <%- } -%>
+  <%- if $passenger_meteor_app_settings { -%>
+  PassengerMeteorAppSettings "<%= $passenger_meteor_app_settings %>"
+  <%- } -%>
+  <%- if $passenger_min_instances { -%>
+  PassengerMinInstances <%= $passenger_min_instances %>
+  <%- } -%>
+  <%- if $passenger_nodejs { -%>
+  PassengerNodejs "<%= $passenger_nodejs %>"
+  <%- } -%>
+  <%- if $passenger_pool_idle_time { -%>
+  PassengerPoolIdleTime <%= $passenger_pool_idle_time %>
+  <%- } -%>
+  <%- if $passenger_pre_start { -%>
+    <%- [$passenger_pre_start].flatten.filter |$item| { $item != undef }.each |$passenger_pre_start| { -%>
+  PassengerPreStart <%= $passenger_pre_start %>
+    <%- } -%>
+  <%- } -%>
+  <%- if $passenger_python { -%>
+  PassengerPython "<%= $passenger_python %>"
+  <%- } -%>
+  <%- if $passenger_resist_deployment_errors { -%>
+  PassengerResistDeploymentErrors <%= $passenger_resist_deployment_errors %>
+  <%- } -%>
+  <%- if $passenger_resolve_symlinks_in_document_root { -%>
+  PassengerResolveSymlinksInDocumentRoot <%= $passenger_resolve_symlinks_in_document_root %>
+  <%- } -%>
+  <%- if $passenger_response_buffer_high_watermark { -%>
+  PassengerResponseBufferHighWatermark <%= $passenger_response_buffer_high_watermark %>
+  <%- } -%>
+  <%- if $passenger_restart_dir { -%>
+  PassengerRestartDir "<%= $passenger_restart_dir %>"
+  <%- } -%>
+  <%- if $passenger_rolling_restarts { -%>
+  PassengerRollingRestarts <%= $passenger_rolling_restarts %>
+  <%- } -%>
+  <%- if $passenger_root { -%>
+  PassengerRoot "<%= $passenger_root %>"
+  <%- } -%>
+  <%- if $passenger_ruby { -%>
+  PassengerRuby "<%= $passenger_ruby %>"
+  <%- } -%>
+  <%- if $passenger_security_update_check_proxy { -%>
+  PassengerSecurityUpdateCheckProxy <%= $passenger_security_update_check_proxy %>
+  <%- } -%>
+  <%- if $passenger_show_version_in_header { -%>
+  PassengerShowVersionInHeader <%= $passenger_show_version_in_header %>
+  <%- } -%>
+  <%- if $passenger_socket_backlog { -%>
+  PassengerSocketBacklog <%= $passenger_socket_backlog %>
+  <%- } -%>
+  <%- if $passenger_spawn_dir { -%>
+  PassengerSpawnDir "<%= $passenger_spawn_dir %>"
+  <%- } -%>
+  <%- if $passenger_spawn_method { -%>
+  PassengerSpawnMethod <%= $passenger_spawn_method %>
+  <%- } -%>
+  <%- if $passenger_start_timeout { -%>
+  PassengerStartTimeout <%= $passenger_start_timeout %>
+  <%- } -%>
+  <%- if $passenger_startup_file { -%>
+  PassengerStartupFile "<%= $passenger_startup_file %>"
+  <%- } -%>
+  <%- if $passenger_stat_throttle_rate { -%>
+  PassengerStatThrottleRate <%= $passenger_stat_throttle_rate %>
+  <%- } -%>
+  <%- if $passenger_sticky_sessions { -%>
+  PassengerStickySessions <%= $passenger_sticky_sessions %>
+  <%- } -%>
+  <%- if $passenger_sticky_sessions_cookie_name { -%>
+  PassengerStickySessionsCookieName <%= $passenger_sticky_sessions_cookie_name %>
+  <%- } -%>
+  <%- if $passenger_sticky_sessions_cookie_attributes { -%>
+  PassengerStickySessionsCookieAttributes "<%= $passenger_sticky_sessions_cookie_attributes %>"
+  <%- } -%>
+  <%- if $passenger_thread_count { -%>
+  PassengerThreadCount <%= $passenger_thread_count %>
+  <%- } -%>
+  <%- if $passenger_use_global_queue { -%>
+  PassengerUseGlobalQueue <%= $passenger_use_global_queue %>
+  <%- } -%>
+  <%- if $passenger_user { -%>
+  PassengerUser <%= $passenger_user %>
+  <%- } -%>
+  <%- if $passenger_user_switching { -%>
+  PassengerUserSwitching <%= $passenger_user_switching %>
+  <%- } -%>
+  <%- if $rack_auto_detect { -%>
+  RackAutoDetect <%= $rack_auto_detect %>
+  <%- } -%>
+  <%- if $rack_base_uri { -%>
+  RackBaseURI <%= $rack_base_uri %>
+  <%- } -%>
+  <%- if $rack_env { -%>
+  RackEnv <%= $rack_env %>
+  <%- } -%>
+  <%- if $rails_allow_mod_rewrite { -%>
+  RailsAllowModRewrite <%= $rails_allow_mod_rewrite %>
+  <%- } -%>
+  <%- if $rails_app_spawner_idle_time { -%>
+  RailsAppSpawnerIdleTime <%= $rails_app_spawner_idle_time %>
+  <%- } -%>
+  <%- if $rails_auto_detect { -%>
+  RailsAutoDetect <%= $rails_auto_detect %>
+  <%- } -%>
+  <%- if $rails_base_uri { -%>
+  RailsBaseURI <%= $rails_base_uri %>
+  <%- } -%>
+  <%- if $rails_default_user { -%>
+  RailsDefaultUser <%= $rails_default_user %>
+  <%- } -%>
+  <%- if $rails_env { -%>
+  RailsEnv <%= $rails_env %>
+  <%- } -%>
+  <%- if $rails_framework_spawner_idle_time { -%>
+  RailsFrameworkSpawnerIdleTime <%= $rails_framework_spawner_idle_time %>
+  <%- } -%>
+  <%- if $rails_ruby { -%>
+  RailsRuby <%= $rails_ruby %>
+  <%- } -%>
+  <%- if $rails_spawn_method { -%>
+  RailsSpawnMethod <%= $rails_spawn_method %>
+  <%- } -%>
+  <%- if $rails_user_switching { -%>
+  RailsUserSwitching <%= $rails_user_switching %>
+  <%- } -%>
+  <%- if $wsgi_auto_detect { -%>
+  WsgiAutoDetect <%= $wsgi_auto_detect %>
+  <%- } -%>
+  <%- if $rails_autodetect { -%>
+  RailsAutoDetect <%= $rails_autodetect %>
+  <%- } -%>
+  <%- if $rack_autodetect { -%>
+  RackAutoDetect <%= $rack_autodetect %>
+  <%- } -%>
+
+</IfModule>
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
deleted file mode 100644
index ca673fd501..0000000000
--- a/templates/mod/passenger.conf.erb
+++ /dev/null
@@ -1,262 +0,0 @@
-# The Passenger Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
-<IfModule mod_passenger.c>
-  <%- if @passenger_allow_encoded_slashes -%>
-  PassengerAllowEncodedSlashes <%= @passenger_allow_encoded_slashes %>
-  <%- end -%>
-  <%- if @passenger_anonymous_telemetry_proxy -%>
-  PassengerAnonymousTelemetryProxy <%= @passenger_anonymous_telemetry_proxy %>
-  <%- end -%>
-  <%- if @passenger_app_env -%>
-  PassengerAppEnv <%= @passenger_app_env %>
-  <%- end -%>
-  <%- if @passenger_app_group_name -%>
-  PassengerAppGroupName <%= @passenger_app_group_name %>
-  <%- end -%>
-  <%- if @passenger_app_root -%>
-  PassengerAppRoot "<%= @passenger_app_root %>"
-  <%- end -%>
-  <%- if @passenger_app_type -%>
-  PassengerAppType <%= @passenger_app_type %>
-  <%- end -%>
-  <%- if @passenger_base_uri -%>
-  PassengerBaseURI <%= @passenger_base_uri %>
-  <%- end -%>
-  <%- if @passenger_buffer_response -%>
-  PassengerBufferResponse <%= @passenger_buffer_response %>
-  <%- end -%>
-  <%- if @passenger_buffer_upload -%>
-  PassengerBufferUpload <%= @passenger_buffer_upload %>
-  <%- end -%>
-  <%- if @passenger_concurrency_model -%>
-  PassengerConcurrencyModel <%= @passenger_concurrency_model %>
-  <%- end -%>
-  <%- if @passenger_data_buffer_dir -%>
-  PassengerDataBufferDir "<%= @passenger_data_buffer_dir %>"
-  <%- end -%>
-  <%- if @passenger_debug_log_file -%>
-  PassengerDebugLogFile <%= @passenger_debug_log_file %>
-  <%- end -%>
-  <%- if @passenger_debugger -%>
-  PassengerDebugger <%= @passenger_debugger %>
-  <%- end -%>
-  <%- if @passenger_default_group -%>
-  PassengerDefaultGroup <%= @passenger_default_group %>
-  <%- end -%>
-  <%- if @passenger_default_ruby -%>
-  PassengerDefaultRuby "<%= @passenger_default_ruby %>"
-  <%- end -%>
-  <%- if @passenger_default_user -%>
-  PassengerDefaultUser <%= @passenger_default_user %>
-  <%- end -%>
-  <%- unless @passenger_disable_anonymous_telemetry.nil? -%>
-  PassengerDisableAnonymousTelemetry <%= scope.call_function('apache::bool2httpd', [@passenger_disable_anonymous_telemetry]) %>
-  <%- end -%>
-  <%- unless @passenger_disable_log_prefix.nil? -%>
-  PassengerDisableLogPrefix <%= scope.call_function('apache::bool2httpd', [@passenger_disable_log_prefix]) %>
-  <%- end -%>
-  <%- if @passenger_disable_security_update_check -%>
-  PassengerDisableSecurityUpdateCheck <%= @passenger_disable_security_update_check %>
-  <%- end -%>
-  <%- if @passenger_enabled -%>
-  PassengerEnabled <%= @passenger_enabled %>
-  <%- end -%>
-  <%- if @passenger_error_override -%>
-  PassengerErrorOverride <%= @passenger_error_override %>
-  <%- end -%>
-  <%- if @passenger_file_descriptor_log_file -%>
-  PassengerFileDescriptorLogFile "<%= @passenger_file_descriptor_log_file %>"
-  <%- end -%>
-  <%- if @passenger_fly_with -%>
-  PassengerFlyWith "<%= @passenger_fly_with %>"
-  <%- end -%>
-  <%- if @passenger_force_max_concurrent_requests_per_process -%>
-  PassengerForceMaxConcurrentRequestsPerProcess <%= @passenger_force_max_concurrent_requests_per_process %>
-  <%- end -%>
-  <%- if @passenger_friendly_error_pages -%>
-  PassengerFriendlyErrorPages <%= @passenger_friendly_error_pages %>
-  <%- end -%>
-  <%- if @passenger_group -%>
-  PassengerGroup <%= @passenger_group %>
-  <%- end -%>
-  <%- if @passenger_high_performance -%>
-  PassengerHighPerformance <%= @passenger_high_performance %>
-  <%- end -%>
-  <%- if @passenger_instance_registry_dir -%>
-  PassengerInstanceRegistryDir "<%= @passenger_instance_registry_dir %>"
-  <%- end -%>
-  <%- if @passenger_load_shell_envvars -%>
-  PassengerLoadShellEnvvars <%= @passenger_load_shell_envvars %>
-  <%- end -%>
-  <%- unless @passenger_preload_bundler.nil? -%>
-  PassengerPreloadBundler <%= scope.call_function('apache::bool2httpd', [@passenger_preload_bundler]) %>
-  <%- end -%>
-  <%- if @passenger_log_file -%>
-  PassengerLogFile "<%= @passenger_log_file %>"
-  <%- end -%>
-  <%- if @passenger_log_level -%>
-  PassengerLogLevel <%= @passenger_log_level %>
-  <%- end -%>
-  <%- if @passenger_lve_min_uid -%>
-  PassengerLveMinUid <%= @passenger_lve_min_uid %>
-  <%- end -%>
-  <%- if @passenger_max_instances -%>
-  PassengerMaxInstances <%= @passenger_max_instances %>
-  <%- end -%>
-  <%- if @passenger_max_instances_per_app -%>
-  PassengerMaxInstancesPerApp <%= @passenger_max_instances_per_app %>
-  <%- end -%>
-  <%- if @passenger_max_pool_size -%>
-  PassengerMaxPoolSize <%= @passenger_max_pool_size %>
-  <%- end -%>
-  <%- if @passenger_max_preloader_idle_time -%>
-  PassengerMaxPreloaderIdleTime <%= @passenger_max_preloader_idle_time %>
-  <%- end -%>
-  <%- if @passenger_max_request_queue_size -%>
-  PassengerMaxRequestQueueSize <%= @passenger_max_request_queue_size %>
-  <%- end -%>
-  <%- if @passenger_max_request_time -%>
-  PassengerMaxRequestTime <%= @passenger_max_request_time %>
-  <%- end -%>
-  <%- if @passenger_max_requests -%>
-  PassengerMaxRequests <%= @passenger_max_requests %>
-  <%- end -%>
-  <%- if @passenger_memory_limit -%>
-  PassengerMemoryLimit <%= @passenger_memory_limit %>
-  <%- end -%>
-  <%- if @passenger_meteor_app_settings -%>
-  PassengerMeteorAppSettings "<%= @passenger_meteor_app_settings %>"
-  <%- end -%>
-  <%- if @passenger_min_instances -%>
-  PassengerMinInstances <%= @passenger_min_instances %>
-  <%- end -%>
-  <%- if @passenger_nodejs -%>
-  PassengerNodejs "<%= @passenger_nodejs %>"
-  <%- end -%>
-  <%- if @passenger_pool_idle_time -%>
-  PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
-  <%- end -%>
-  <%- if @passenger_pre_start -%>
-    <%- [@passenger_pre_start].flatten.compact.each do |passenger_pre_start| -%>
-  PassengerPreStart <%= passenger_pre_start %>
-    <%- end -%>
-  <%- end -%>
-  <%- if @passenger_python -%>
-  PassengerPython "<%= @passenger_python %>"
-  <%- end -%>
-  <%- if @passenger_resist_deployment_errors -%>
-  PassengerResistDeploymentErrors <%= @passenger_resist_deployment_errors %>
-  <%- end -%>
-  <%- if @passenger_resolve_symlinks_in_document_root -%>
-  PassengerResolveSymlinksInDocumentRoot <%= @passenger_resolve_symlinks_in_document_root %>
-  <%- end -%>
-  <%- if @passenger_response_buffer_high_watermark -%>
-  PassengerResponseBufferHighWatermark <%= @passenger_response_buffer_high_watermark %>
-  <%- end -%>
-  <%- if @passenger_restart_dir -%>
-  PassengerRestartDir "<%= @passenger_restart_dir %>"
-  <%- end -%>
-  <%- if @passenger_rolling_restarts -%>
-  PassengerRollingRestarts <%= @passenger_rolling_restarts %>
-  <%- end -%>
-  <%- if @passenger_root -%>
-  PassengerRoot "<%= @passenger_root %>"
-  <%- end -%>
-  <%- if @passenger_ruby -%>
-  PassengerRuby "<%= @passenger_ruby %>"
-  <%- end -%>
-  <%- if @passenger_security_update_check_proxy -%>
-  PassengerSecurityUpdateCheckProxy <%= @passenger_security_update_check_proxy %>
-  <%- end -%>
-  <%- if @passenger_show_version_in_header -%>
-  PassengerShowVersionInHeader <%= @passenger_show_version_in_header %>
-  <%- end -%>
-  <%- if @passenger_socket_backlog -%>
-  PassengerSocketBacklog <%= @passenger_socket_backlog %>
-  <%- end -%>
-  <%- if @passenger_spawn_dir -%>
-  PassengerSpawnDir "<%= @passenger_spawn_dir %>"
-  <%- end -%>
-  <%- if @passenger_spawn_method -%>
-  PassengerSpawnMethod <%= @passenger_spawn_method %>
-  <%- end -%>
-  <%- if @passenger_start_timeout -%>
-  PassengerStartTimeout <%= @passenger_start_timeout %>
-  <%- end -%>
-  <%- if @passenger_startup_file -%>
-  PassengerStartupFile "<%= @passenger_startup_file %>"
-  <%- end -%>
-  <%- if @passenger_stat_throttle_rate -%>
-  PassengerStatThrottleRate <%= @passenger_stat_throttle_rate %>
-  <%- end -%>
-  <%- if @passenger_sticky_sessions -%>
-  PassengerStickySessions <%= @passenger_sticky_sessions %>
-  <%- end -%>
-  <%- if @passenger_sticky_sessions_cookie_name -%>
-  PassengerStickySessionsCookieName <%= @passenger_sticky_sessions_cookie_name %>
-  <%- end -%>
-  <%- if @passenger_sticky_sessions_cookie_attributes -%>
-  PassengerStickySessionsCookieAttributes "<%= @passenger_sticky_sessions_cookie_attributes %>"
-  <%- end -%>
-  <%- if @passenger_thread_count -%>
-  PassengerThreadCount <%= @passenger_thread_count %>
-  <%- end -%>
-  <%- if @passenger_use_global_queue -%>
-  PassengerUseGlobalQueue <%= @passenger_use_global_queue %>
-  <%- end -%>
-  <%- if @passenger_user -%>
-  PassengerUser <%= @passenger_user %>
-  <%- end -%>
-  <%- if @passenger_user_switching -%>
-  PassengerUserSwitching <%= @passenger_user_switching %>
-  <%- end -%>
-  <%- if @rack_auto_detect -%>
-  RackAutoDetect <%= @rack_auto_detect %>
-  <%- end -%>
-  <%- if @rack_base_uri -%>
-  RackBaseURI <%= @rack_base_uri %>
-  <%- end -%>
-  <%- if @rack_env -%>
-  RackEnv <%= @rack_env %>
-  <%- end -%>
-  <%- if @rails_allow_mod_rewrite -%>
-  RailsAllowModRewrite <%= @rails_allow_mod_rewrite %>
-  <%- end -%>
-  <%- if @rails_app_spawner_idle_time -%>
-  RailsAppSpawnerIdleTime <%= @rails_app_spawner_idle_time %>
-  <%- end -%>
-  <%- if @rails_auto_detect -%>
-  RailsAutoDetect <%= @rails_auto_detect %>
-  <%- end -%>
-  <%- if @rails_base_uri -%>
-  RailsBaseURI <%= @rails_base_uri %>
-  <%- end -%>
-  <%- if @rails_default_user -%>
-  RailsDefaultUser <%= @rails_default_user %>
-  <%- end -%>
-  <%- if @rails_env -%>
-  RailsEnv <%= @rails_env %>
-  <%- end -%>
-  <%- if @rails_framework_spawner_idle_time -%>
-  RailsFrameworkSpawnerIdleTime <%= @rails_framework_spawner_idle_time %>
-  <%- end -%>
-  <%- if @rails_ruby -%>
-  RailsRuby <%= @rails_ruby %>
-  <%- end -%>
-  <%- if @rails_spawn_method -%>
-  RailsSpawnMethod <%= @rails_spawn_method %>
-  <%- end -%>
-  <%- if @rails_user_switching -%>
-  RailsUserSwitching <%= @rails_user_switching %>
-  <%- end -%>
-  <%- if @wsgi_auto_detect -%>
-  WsgiAutoDetect <%= @wsgi_auto_detect %>
-  <%- end -%>
-  <%- if @rails_autodetect -%>
-  RailsAutoDetect <%= @rails_autodetect %>
-  <%- end -%>
-  <%- if @rack_autodetect -%>
-  RackAutoDetect <%= @rack_autodetect %>
-  <%- end -%>
-
-</IfModule>
diff --git a/templates/mod/peruser.conf.epp b/templates/mod/peruser.conf.epp
new file mode 100644
index 0000000000..282dcf99c0
--- /dev/null
+++ b/templates/mod/peruser.conf.epp
@@ -0,0 +1,12 @@
+<IfModule mpm_peruser_module>
+  MinSpareProcessors  <%= $minspareprocessors %>
+  MinProcessors       <%= $minprocessors %>
+  MaxProcessors       <%= $maxprocessors %>
+  MaxClients          <%= $maxclients %>
+  MaxRequestsPerChild <%= $maxrequestsperchild %>
+  IdleTimeout         <%= $idletimeout %>
+  ExpireTimeout       <%= $expiretimeout %>
+  KeepAlive           <%= $keepalive %>
+  Include             "<%= $mod_dir %>/peruser/multiplexers/*.conf"
+  Include             "<%= $mod_dir %>/peruser/processors/*.conf"
+</IfModule>
diff --git a/templates/mod/peruser.conf.erb b/templates/mod/peruser.conf.erb
deleted file mode 100644
index 13c8d708db..0000000000
--- a/templates/mod/peruser.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<IfModule mpm_peruser_module>
-  MinSpareProcessors  <%= @minspareprocessors %>
-  MinProcessors       <%= @minprocessors %>
-  MaxProcessors       <%= @maxprocessors %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-  IdleTimeout         <%= @idletimeout %>
-  ExpireTimeout       <%= @expiretimeout %>
-  KeepAlive           <%= @keepalive %>
-  Include             "<%= @mod_dir %>/peruser/multiplexers/*.conf"
-  Include             "<%= @mod_dir %>/peruser/processors/*.conf"
-</IfModule>
diff --git a/templates/mod/prefork.conf.epp b/templates/mod/prefork.conf.epp
new file mode 100644
index 0000000000..6eb23ff508
--- /dev/null
+++ b/templates/mod/prefork.conf.epp
@@ -0,0 +1,17 @@
+<IfModule mpm_prefork_module>
+  StartServers        <%= $startservers %>
+  MinSpareServers     <%= $minspareservers %>
+  MaxSpareServers     <%= $maxspareservers %>
+  ServerLimit         <%= $serverlimit %>
+  <%- if $maxrequestworkers { -%>
+  MaxRequestWorkers      <%= $maxrequestworkers %>
+  <%- }elsif $maxclients { -%>
+  MaxClients             <%= $maxclients %>
+  <%- } -%>
+  <%- if $maxconnectionsperchild { -%>
+  MaxConnectionsPerChild <%= $maxconnectionsperchild %>
+  <%- }elsif $maxrequestsperchild { -%>
+  MaxRequestsPerChild    <%= $maxrequestsperchild %>
+  <%- } -%>
+  ListenBacklog       <%= $listenbacklog %>
+</IfModule>
diff --git a/templates/mod/prefork.conf.erb b/templates/mod/prefork.conf.erb
deleted file mode 100644
index 01f0b84f87..0000000000
--- a/templates/mod/prefork.conf.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<IfModule mpm_prefork_module>
-  StartServers        <%= @startservers %>
-  MinSpareServers     <%= @minspareservers %>
-  MaxSpareServers     <%= @maxspareservers %>
-  ServerLimit         <%= @serverlimit %>
-  <%- if @maxrequestworkers -%>
-  MaxRequestWorkers      <%= @maxrequestworkers %>
-  <%- elsif @maxclients -%>
-  MaxClients             <%= @maxclients %>
-  <%- end -%>
-  <%- if @maxconnectionsperchild -%>
-  MaxConnectionsPerChild <%= @maxconnectionsperchild %>
-  <%- elsif @maxrequestsperchild -%>
-  MaxRequestsPerChild    <%= @maxrequestsperchild %>
-  <%- end -%>
-  ListenBacklog       <%= @listenbacklog %>
-</IfModule>
diff --git a/templates/mod/proxy.conf.epp b/templates/mod/proxy.conf.epp
new file mode 100644
index 0000000000..b9aca2e969
--- /dev/null
+++ b/templates/mod/proxy.conf.epp
@@ -0,0 +1,32 @@
+#
+# Proxy Server directives. Uncomment the following lines to
+# enable the proxy server:
+#
+<IfModule mod_proxy.c>
+  # Do not enable proxying with ProxyRequests until you have secured your
+  # server.  Open proxy servers are dangerous both to your network and to the
+  # Internet at large.
+  ProxyRequests <%= $proxy_requests %>
+
+  <% if $proxy_requests != 'Off' or ( $allow_from and ! $allow_from.empty ) { -%>
+  <Proxy *>
+    <%- if String(type($allow_from, 'generalized')).index('Array') == 0 { -%>
+    Require ip <%= $allow_from.join(" ") %>
+    <%- } else { -%>
+    Require ip <%= $allow_from %>
+    <%- } -%>
+  </Proxy>
+  <% } -%>
+
+  # Enable/disable the handling of HTTP/1.1 "Via:" headers.
+  # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+  # Set to one of: Off | On | Full | Block
+  ProxyVia <%= $proxy_via %>
+
+  <%- if $proxy_timeout { -%>
+  ProxyTimeout <%= $proxy_timeout %>
+  <%- } -%>
+  <%- if $proxy_iobuffersize { -%>
+  ProxyIOBufferSize <%= $proxy_iobuffersize %>
+  <%- } -%>
+</IfModule>
diff --git a/templates/mod/proxy.conf.erb b/templates/mod/proxy.conf.erb
deleted file mode 100644
index f1b62f41dc..0000000000
--- a/templates/mod/proxy.conf.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-<IfModule mod_proxy.c>
-  # Do not enable proxying with ProxyRequests until you have secured your
-  # server.  Open proxy servers are dangerous both to your network and to the
-  # Internet at large.
-  ProxyRequests <%= @proxy_requests %>
-
-  <% if @proxy_requests != 'Off' or ( @allow_from and ! @allow_from.empty? ) -%>
-  <Proxy *>
-    <%- if @allow_from.is_a? Array -%>
-    Require ip <%= @allow_from.join(" ") %>
-    <%- else -%>
-    Require ip <%= @allow_from %>
-    <%- end -%>
-  </Proxy>
-  <% end -%>
-
-  # Enable/disable the handling of HTTP/1.1 "Via:" headers.
-  # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
-  # Set to one of: Off | On | Full | Block
-  ProxyVia <%= @proxy_via %>
-
-  <%- if @proxy_timeout -%>
-  ProxyTimeout <%= @proxy_timeout %>
-  <%- end -%>
-  <%- if @proxy_iobuffersize -%>
-  ProxyIOBufferSize <%= @proxy_iobuffersize %>
-  <%- end -%>
-</IfModule>
diff --git a/templates/mod/proxy_balancer.conf.epp b/templates/mod/proxy_balancer.conf.epp
new file mode 100644
index 0000000000..116e11ac5a
--- /dev/null
+++ b/templates/mod/proxy_balancer.conf.epp
@@ -0,0 +1,4 @@
+<Location <%= $manager_path %>>
+    SetHandler balancer-manager
+    Require ip <%= $allow_from.join(" ") %>
+</Location>
diff --git a/templates/mod/proxy_balancer.conf.erb b/templates/mod/proxy_balancer.conf.erb
deleted file mode 100644
index 43a4611ddf..0000000000
--- a/templates/mod/proxy_balancer.conf.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<Location <%= @manager_path %>>
-    SetHandler balancer-manager
-    Require ip <%= @allow_from.join(" ") %>
-</Location>
diff --git a/templates/mod/proxy_html.conf.erb b/templates/mod/proxy_html.conf.epp
similarity index 100%
rename from templates/mod/proxy_html.conf.erb
rename to templates/mod/proxy_html.conf.epp
diff --git a/templates/mod/reqtimeout.conf.epp b/templates/mod/reqtimeout.conf.epp
new file mode 100644
index 0000000000..a62b4b69ad
--- /dev/null
+++ b/templates/mod/reqtimeout.conf.epp
@@ -0,0 +1,8 @@
+<% if type($timeouts, 'generalized') == String { -%>
+RequestReadTimeout <%= $timeouts -%>  
+<% } else { -%>
+  <%- $timeouts.each |$timeout| { -%>
+RequestReadTimeout <%= $timeout %>
+  <%- } -%>
+<% } -%>
+
diff --git a/templates/mod/reqtimeout.conf.erb b/templates/mod/reqtimeout.conf.erb
deleted file mode 100644
index 6ffc5ffe25..0000000000
--- a/templates/mod/reqtimeout.conf.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% Array(@timeouts).each do |timeout| -%>
-RequestReadTimeout <%= timeout %>
-<%- end -%>
diff --git a/templates/mod/rpaf.conf.erb b/templates/mod/rpaf.conf.epp
similarity index 73%
rename from templates/mod/rpaf.conf.erb
rename to templates/mod/rpaf.conf.epp
index a8e6e98b3f..2db9bbee0d 100644
--- a/templates/mod/rpaf.conf.erb
+++ b/templates/mod/rpaf.conf.epp
@@ -3,9 +3,9 @@ RPAFenable On
 # RPAFsethostname will, when enabled, take the incoming X-Host header and
 # update the virtual host settings accordingly. This allows to have the same
 # hostnames as in the "real" configuration for the forwarding proxy.
-RPAFsethostname <%= scope.call_function('apache::bool2httpd', [@sethostname]) %>
+RPAFsethostname <%= apache::bool2httpd($sethostname) %>
 # Which IPs are forwarding requests to us
-RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %>
+RPAFproxy_ips <%= Array($proxy_ips).join(" ") %>
 # Setting RPAFheader allows you to change the header name to parse from the
 # default X-Forwarded-For to something of your choice.
-RPAFheader <%= @header %>
+RPAFheader <%= $header %>
diff --git a/templates/mod/security.conf.erb b/templates/mod/security.conf.epp
similarity index 61%
rename from templates/mod/security.conf.erb
rename to templates/mod/security.conf.epp
index a305e10cb3..dbca254b30 100644
--- a/templates/mod/security.conf.erb
+++ b/templates/mod/security.conf.epp
@@ -1,16 +1,16 @@
 <IfModule mod_security2.c>
     # Default recommended configuration
-    SecRuleEngine <%= @modsec_secruleengine %>
-    SecRequestBodyAccess <%= @secrequestbodyaccess %>
-  <%- if @custom_rules -%>
-    Include <%= @modsec_dir %>/custom_rules/*.conf
-  <%- end -%>
+    SecRuleEngine <%= $modsec_secruleengine %>
+    SecRequestBodyAccess <%= $secrequestbodyaccess %>
+  <%- if $custom_rules { -%>
+    Include <%= $modsec_dir %>/custom_rules/*.conf
+  <%- } -%>
     SecRule REQUEST_HEADERS:Content-Type "text/xml" \
       "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML"
-    SecRequestBodyLimit <%= @secrequestbodylimit %>
-    SecRequestBodyNoFilesLimit <%= @secrequestbodynofileslimit %>
-    SecRequestBodyInMemoryLimit <%= @secrequestbodyinmemorylimit %>
-    SecRequestBodyLimitAction <%= @secrequestbodylimitaction %>
+    SecRequestBodyLimit <%= $secrequestbodylimit %>
+    SecRequestBodyNoFilesLimit <%= $secrequestbodynofileslimit %>
+    SecRequestBodyInMemoryLimit <%= $secrequestbodyinmemorylimit %>
+    SecRequestBodyLimitAction <%= $secrequestbodylimitaction %>
     SecRule REQBODY_ERROR "!@eq 0" \
       "id:'200001', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2"
     SecRule MULTIPART_STRICT_ERROR "!@eq 0" \
@@ -34,48 +34,48 @@
     SecRule MULTIPART_UNMATCHED_BOUNDARY "!@eq 0" \
       "id:'200003',phase:2,t:none,log,deny,status:44,msg:'Multipart parser detected a possible unmatched boundary.'"
 
-    SecPcreMatchLimit <%= @secpcrematchlimit %>
-    SecPcreMatchLimitRecursion <%= @secpcrematchlimitrecursion %>
+    SecPcreMatchLimit <%= $secpcrematchlimit %>
+    SecPcreMatchLimitRecursion <%= $secpcrematchlimitrecursion %>
 
     SecRule TX:/^MSC_/ "!@streq 0" \
       "id:'200004',phase:2,t:none,deny,msg:'ModSecurity internal error flagged: %{MATCHED_VAR_NAME}'"
 
-    SecResponseBodyAccess <%= @secresponsebodyaccess %>
+    SecResponseBodyAccess <%= $secresponsebodyaccess %>
     SecResponseBodyMimeType text/plain text/html text/xml
     SecResponseBodyLimit 524288
-    SecResponseBodyLimitAction <%= @secresponsebodylimitaction %>
+    SecResponseBodyLimitAction <%= $secresponsebodylimitaction %>
     SecDebugLogLevel 0
     SecAuditEngine RelevantOnly
-    SecAuditLogRelevantStatus "<%= @audit_log_relevant_status %>"
-    SecAuditLogParts <%= @audit_log_parts %>
-    SecAuditLogType <%= @audit_log_type %>
-    <%- if @audit_log_storage_dir -%>
-    SecAuditLogStorageDir <%= @audit_log_storage_dir %>
-    <%- end -%>
+    SecAuditLogRelevantStatus "<%= $audit_log_relevant_status %>"
+    SecAuditLogParts <%= $audit_log_parts %>
+    SecAuditLogType <%= $audit_log_type %>
+    <%- if $audit_log_storage_dir { -%>
+    SecAuditLogStorageDir <%= $audit_log_storage_dir %>
+    <%- } -%>
     SecArgumentSeparator &
     SecCookieFormat 0
-<%- if scope['facts']['os']['family'] == 'Debian' -%>
-    SecDebugLog <%= @logroot %>/modsec_debug.log
-    SecAuditLog <%= @logroot %>/modsec_audit.log
+<%- if $facts['os']['family'] == 'Debian' { -%>
+    SecDebugLog <%= $logroot %>/modsec_debug.log
+    SecAuditLog <%= $logroot %>/modsec_audit.log
     SecTmpDir /var/cache/modsecurity
     SecDataDir /var/cache/modsecurity
     SecUploadDir /var/cache/modsecurity
-<%- elsif scope['facts']['os']['family'] == 'Suse' -%>
+<%- }elsif $facts['os']['family'] == 'Suse' { -%>
     SecDebugLog /var/log/apache2/modsec_debug.log
     SecAuditLog /var/log/apache2/modsec_audit.log
     SecTmpDir /var/lib/mod_security
     SecDataDir /var/lib/mod_security
     SecUploadDir /var/lib/mod_security
-<% else -%>
-    SecDebugLog <%= @logroot %>/modsec_debug.log
-    SecAuditLog <%= @logroot %>/modsec_audit.log
+<% } else { -%>
+    SecDebugLog <%= $logroot %>/modsec_debug.log
+    SecAuditLog <%= $logroot %>/modsec_audit.log
     SecTmpDir /var/lib/mod_security
     SecDataDir /var/lib/mod_security
     SecUploadDir /var/lib/mod_security
-<% end -%>
+<% } -%>
     SecUploadKeepFiles Off
 
     # ModSecurity Core Rules Set configuration
-    IncludeOptional <%= @modsec_dir %>/*.conf
-    IncludeOptional <%= @modsec_dir %>/activated_rules/*.conf
+    IncludeOptional <%= $modsec_dir %>/*.conf
+    IncludeOptional <%= $modsec_dir %>/activated_rules/*.conf
 </IfModule>
diff --git a/templates/mod/security_crs.conf.epp b/templates/mod/security_crs.conf.epp
new file mode 100644
index 0000000000..653fca6466
--- /dev/null
+++ b/templates/mod/security_crs.conf.epp
@@ -0,0 +1,1271 @@
+<% if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'].convert_to(Integer) <= 7 { -%>
+# ---------------------------------------------------------------
+# Core ModSecurity Rule Set ver.2.2.9
+# Copyright (C) 2006-2012 Trustwave All rights reserved.
+#
+# The OWASP ModSecurity Core Rule Set is distributed under 
+# Apache Software License (ASL) version 2
+# Please see the enclosed LICENCE file for full details.
+# ---------------------------------------------------------------
+
+
+#
+# -- [[ Recommended Base Configuration ]] ------------------------------------------------- 
+#
+# The configuration directives/settings in this file are used to control
+# the OWASP ModSecurity CRS. These settings do **NOT** configure the main
+# ModSecurity settings such as:
+# 
+# - SecRuleEngine
+# - SecRequestBodyAccess
+# - SecAuditEngine
+# - SecDebugLog
+#
+# You should use the modsecurity.conf-recommended file that comes with the
+# ModSecurity source code archive.
+#
+# Ref: https://github.com/SpiderLabs/ModSecurity/blob/master/modsecurity.conf-recommended 
+#
+
+
+#
+# -- [[ Rule Version ]] -------------------------------------------------------------------
+#
+# Rule version data is added to the "Producer" line of Section H of the Audit log:
+#
+# - Producer: ModSecurity for Apache/2.7.0-rc1 (http://www.modsecurity.org/); OWASP_CRS/2.2.4.
+#
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecComponentSignature 
+#
+SecComponentSignature "OWASP_CRS/2.2.9"
+
+
+#
+# -- [[ Modes of Operation: Self-Contained vs. Collaborative Detection ]] -----------------
+#
+# Each detection rule uses the "block" action which will inherit the SecDefaultAction
+# specified below.  Your settings here will determine which mode of operation you use.
+#
+# -- [[ Self-Contained Mode ]] --
+# Rules inherit the "deny" disruptive action.  The first rule that matches will block.
+#
+# -- [[ Collaborative Detection Mode ]] --
+# This is a "delayed blocking" mode of operation where each matching rule will inherit
+# the "pass" action and will only contribute to anomaly scores.  Transactional blocking
+# can be applied 
+#
+# -- [[ Alert Logging Control ]] --
+# You have three options -
+#
+# - To log to both the Apache error_log and ModSecurity audit_log file use: "log"
+# - To log *only* to the ModSecurity audit_log file use: "nolog,auditlog"
+# - To log *only* to the Apache error_log file use: "log,noauditlog"
+#
+# Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecDefaultAction 
+#
+SecDefaultAction "phase:1,<%= $_secdefaultaction -%>"
+SecDefaultAction "phase:2,<%= $_secdefaultaction -%>"
+
+#
+# -- [[ Collaborative Detection Severity Levels ]] ----------------------------------------
+#
+# These are the default scoring points for each severity level.  You may
+# adjust these to you liking.  These settings will be used in macro expansion
+# in the rules to increment the anomaly scores when rules match.
+#
+# These are the default Severity ratings (with anomaly scores) of the individual rules -
+#
+#    - 2: Critical - Anomaly Score of 5.
+#         Is the highest severity level possible without correlation.  It is
+#         normally generated by the web attack rules (40 level files).
+#    - 3: Error - Anomaly Score of 4.
+#         Is generated mostly from outbound leakage rules (50 level files).
+#    - 4: Warning - Anomaly Score of 3.
+#         Is generated by malicious client rules (35 level files).
+#    - 5: Notice - Anomaly Score of 2.
+#         Is generated by the Protocol policy and anomaly files.
+#
+SecAction \
+  "id:'900001', \
+  phase:1, \
+  t:none, \
+  setvar:tx.critical_anomaly_score=<%= $critical_anomaly_score -%>, \
+  setvar:tx.error_anomaly_score=<%= $error_anomaly_score -%>, \
+  setvar:tx.warning_anomaly_score=<%= $warning_anomaly_score -%>, \
+  setvar:tx.notice_anomaly_score=<%= $notice_anomaly_score -%>, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Collaborative Detection Scoring Initialization and Threshold Levels ]] ------------------------------
+#
+# These variables are used in macro expansion in the 49 inbound blocking and 59
+# outbound blocking files.
+#
+# **MUST HAVE** ModSecurity v2.5.12 or higher to use macro expansion in numeric
+# operators.  If you have an earlier version, edit the 49/59 files directly to
+# set the appropriate anomaly score levels.
+#
+# You should set the score level (rule 900003) to the proper threshold you 
+# would prefer.  If set to "5" it will work similarly to previous Mod CRS rules
+# and will create an event in the error_log file if there are any rules that
+# match.  If you would like to lessen the number of events generated in the 
+# error_log file, you should increase the anomaly score threshold to something 
+# like "20".  This would only generate an event in the error_log file if there
+# are multiple lower severity rule matches or if any 1 higher severity item matches.
+#
+SecAction \
+  "id:'900002', \
+  phase:1, \
+  t:none, \
+  setvar:tx.anomaly_score=0, \
+  setvar:tx.sql_injection_score=0, \
+  setvar:tx.xss_score=0, \
+  setvar:tx.inbound_anomaly_score=0, \
+  setvar:tx.outbound_anomaly_score=0, \
+  nolog, \
+  pass"
+
+
+SecAction \
+  "id:'900003', \
+  phase:1, \
+  t:none, \
+  setvar:tx.inbound_anomaly_score_level=<%= $inbound_anomaly_threshold -%>, \
+  setvar:tx.outbound_anomaly_score_level=<%= $outbound_anomaly_threshold -%>, \
+  nolog, \
+  pass"
+
+
+# 
+# -- [[ Collaborative Detection Blocking ]] -----------------------------------------------
+#
+# This is a collaborative detection mode where each rule will increment an overall
+# anomaly score for the transaction. The scores are then evaluated in the following files:
+#
+# Inbound anomaly score - checked in the modsecurity_crs_49_inbound_blocking.conf file
+# Outbound anomaly score - checked in the modsecurity_crs_59_outbound_blocking.conf file
+#
+# If you want to use anomaly scoring mode, then uncomment this line.
+#
+SecAction \
+  "id:'900004', \
+  phase:1, \
+  t:none, \
+  setvar:tx.anomaly_score_blocking=<%= $anomaly_score_blocking -%>, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ GeoIP Database ]] -----------------------------------------------------------------
+#
+# There are some rulesets that need to inspect the GEO data of the REMOTE_ADDR data.
+# 
+# You must first download the MaxMind GeoIP Lite City DB -
+#
+#       http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+#
+# You then need to define the proper path for the SecGeoLookupDb directive
+#
+# Ref: http://blog.spiderlabs.com/2010/10/detecting-malice-with-modsecurity-geolocation-data.html
+# Ref: http://blog.spiderlabs.com/2010/11/detecting-malice-with-modsecurity-ip-forensics.html
+#
+#SecGeoLookupDb /opt/modsecurity/lib/GeoLiteCity.dat
+
+#
+# -- [[ Regression Testing Mode ]] --------------------------------------------------------
+#
+# If you are going to run the regression testing mode, you should uncomment the
+# following rule. It will enable DetectionOnly mode for the SecRuleEngine and
+# will enable Response Header tagging so that the client testing script can see
+# which rule IDs have matched.
+#
+# You must specify the your source IP address where you will be running the tests
+# from.
+#
+#SecRule REMOTE_ADDR "@ipMatch 192.168.1.100" \
+  "id:'900005', \
+  phase:1, \
+  t:none, \
+  ctl:ruleEngine=DetectionOnly, \
+  setvar:tx.regression_testing=1, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ HTTP Policy Settings ]] ----------------------------------------------------------
+#
+# Set the following policy settings here and they will be propagated to the 23 rules
+# file (modsecurity_common_23_request_limits.conf) by using macro expansion.  
+# If you run into false positives, you can adjust the settings here.
+#
+# Only the max number of args is uncommented by default as there are a high rate
+# of false positives.  Uncomment the items you wish to set.
+# 
+#
+# -- Maximum number of arguments in request limited
+SecAction \
+  "id:'900006', \
+  phase:1, \
+  t:none, \
+  setvar:tx.max_num_args=<%= $secrequestmaxnumargs %>, \
+  nolog, \
+  pass"
+
+#
+# -- Limit argument name length
+#SecAction \
+  "id:'900007', \
+  phase:1, \
+  t:none, \
+  setvar:tx.arg_name_length=100, \
+  nolog, \
+  pass"
+
+#
+# -- Limit value name length
+#SecAction \
+  "id:'900008', \
+  phase:1, \
+  t:none, \
+  setvar:tx.arg_length=400, \
+  nolog, \
+  pass"
+
+#
+# -- Limit arguments total length
+#SecAction \
+  "id:'900009', \
+  phase:1, \
+  t:none, \
+  setvar:tx.total_arg_length=64000, \
+  nolog, \
+  pass"
+
+#
+# -- Individual file size is limited
+#SecAction \
+  "id:'900010', \
+  phase:1, \
+  t:none, \
+  setvar:tx.max_file_size=1048576, \
+  nolog, \
+  pass"
+
+#
+# -- Combined file size is limited
+#SecAction \
+  "id:'900011', \
+  phase:1, \
+  t:none, \
+  setvar:tx.combined_file_sizes=1048576, \
+  nolog, \
+  pass"
+
+
+#
+# Set the following policy settings here and they will be propagated to the 30 rules
+# file (modsecurity_crs_30_http_policy.conf) by using macro expansion.  
+# If you run into false positves, you can adjust the settings here.
+#
+SecAction \
+  "id:'900012', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.allowed_methods=<%= $allowed_methods -%>', \
+  setvar:'tx.allowed_request_content_type=<%= $content_types -%>', \
+  setvar:'tx.allowed_http_versions=HTTP/0.9 HTTP/1.0 HTTP/1.1', \
+  setvar:'tx.restricted_extensions=<%= $restricted_extensions -%>', \
+  setvar:'tx.restricted_headers=<%= $restricted_headers -%>', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Content Security Policy (CSP) Settings ]] -----------------------------------------
+#
+# The purpose of these settings is to send CSP response headers to
+# Mozilla FireFox users so that you can enforce how dynamic content
+# is used. CSP usage helps to prevent XSS attacks against your users.
+#  
+# Reference Link:
+#
+#	https://developer.mozilla.org/en/Security/CSP
+#
+# Uncomment this SecAction line if you want use CSP enforcement.
+# You need to set the appropriate directives and settings for your site/domain and
+# and activate the CSP file in the experimental_rules directory.
+# 
+# Ref: http://blog.spiderlabs.com/2011/04/modsecurity-advanced-topic-of-the-week-integrating-content-security-policy-csp.html
+#
+#SecAction \
+  "id:'900013', \
+  phase:1, \
+  t:none, \
+  setvar:tx.csp_report_only=1, \
+  setvar:tx.csp_report_uri=/csp_violation_report, \
+  setenv:'csp_policy=allow \'self\'; img-src *.yoursite.com; media-src *.yoursite.com; style-src *.yoursite.com; frame-ancestors *.yoursite.com; script-src *.yoursite.com; report-uri %{tx.csp_report_uri}', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Brute Force Protection ]] ---------------------------------------------------------
+#
+# If you are using the Brute Force Protection rule set, then uncomment the following
+# lines and set the following variables:
+# - Protected URLs: resources to protect (e.g. login pages) - set to your login page
+# - Burst Time Slice Interval: time interval window to monitor for bursts
+# - Request Threshold: request # threshold to trigger a burst
+# - Block Period: temporary block timeout
+#
+#SecAction \
+  "id:'900014', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.brute_force_protected_urls=#/login.jsp# #/partner_login.php#', \
+  setvar:'tx.brute_force_burst_time_slice=60', \
+  setvar:'tx.brute_force_counter_threshold=10', \
+  setvar:'tx.brute_force_block_timeout=300', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ DoS Protection ]] ----------------------------------------------------------------
+#
+# If you are using the DoS Protection rule set, then uncomment the following
+# lines and set the following variables:
+# - Burst Time Slice Interval: time interval window to monitor for bursts
+# - Request Threshold: request # threshold to trigger a burst
+# - Block Period: temporary block timeout
+#
+SecAction \
+  "id:'900015', \
+  phase:1, \
+  t:none, \
+  setvar:'tx.dos_burst_time_slice=60', \
+  setvar:'tx.dos_counter_threshold=100', \
+  setvar:'tx.dos_block_timeout=600', \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Check UTF enconding ]] -----------------------------------------------------------
+#
+# We only want to apply this check if UTF-8 encoding is actually used by the site, otherwise
+# it will result in false positives.
+#
+# Uncomment this line if your site uses UTF8 encoding
+#SecAction \
+  "id:'900016', \
+  phase:1, \
+  t:none, \
+  setvar:tx.crs_validate_utf8_encoding=1, \
+  nolog, \
+  pass"
+
+
+#
+# -- [[ Enable XML Body Parsing ]] -------------------------------------------------------
+#
+# The rules in this file will trigger the XML parser upon an XML request
+#
+# Initiate XML Processor in case of xml content-type
+#
+SecRule REQUEST_HEADERS:Content-Type "text/xml" \
+  "id:'900017', \
+  phase:1, \
+  t:none,t:lowercase, \
+  nolog, \
+  pass, \
+  chain"
+	SecRule REQBODY_PROCESSOR "!@streq XML" \
+	  "ctl:requestBodyProcessor=XML"
+
+
+#
+# -- [[ Global and IP Collections ]] -----------------------------------------------------
+#
+# Create both Global and IP collections for rules to use
+# There are some CRS rules that assume that these two collections
+# have already been initiated.
+#
+SecRule REQUEST_HEADERS:User-Agent "^(.*)$" \
+  "id:'900018', \
+  phase:1, \
+  t:none,t:sha1,t:hexEncode, \
+  setvar:tx.ua_hash=%{matched_var}, \
+  nolog, \
+  pass"
+
+
+SecRule REQUEST_HEADERS:x-forwarded-for "^\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b" \
+  "id:'900019', \
+  phase:1, \
+  t:none, \
+  capture, \
+  setvar:tx.real_ip=%{tx.1}, \
+  nolog, \
+  pass"
+
+
+SecRule &TX:REAL_IP "!@eq 0" \
+  "id:'900020', \
+  phase:1, \
+  t:none, \
+  initcol:global=global, \
+  initcol:ip=%{tx.real_ip}_%{tx.ua_hash}, \
+  nolog, \
+  pass"
+
+
+SecRule &TX:REAL_IP "@eq 0" \
+  "id:'900021', \
+  phase:1, \
+  t:none, \
+  initcol:global=global, \
+  initcol:ip=%{remote_addr}_%{tx.ua_hash}, \
+  setvar:tx.real_ip=%{remote_addr}, \
+  nolog, \
+  pass"
+<% } else { -%>
+# ------------------------------------------------------------------------
+# OWASP ModSecurity Core Rule Set ver.3.3.2
+# Copyright (c) 2006-2020 Trustwave and contributors. All rights reserved.
+#
+# The OWASP ModSecurity Core Rule Set is distributed under
+# Apache Software License (ASL) version 2
+# Please see the enclosed LICENSE file for full details.
+# ------------------------------------------------------------------------
+
+
+#
+# -- [[ Introduction ]] --------------------------------------------------------
+#
+# The OWASP ModSecurity Core Rule Set (CRS) is a set of generic attack
+# detection rules that provide a base level of protection for any web
+# application. They are written for the open source, cross-platform
+# ModSecurity Web Application Firewall.
+#
+# See also:
+# https://coreruleset.org/
+# https://github.com/SpiderLabs/owasp-modsecurity-crs
+# https://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project
+#
+
+
+#
+# -- [[ System Requirements ]] -------------------------------------------------
+#
+# CRS requires ModSecurity version 2.8.0 or above.
+# We recommend to always use the newest ModSecurity version.
+#
+# The configuration directives/settings in this file are used to control
+# the OWASP ModSecurity CRS. These settings do **NOT** configure the main
+# ModSecurity settings (modsecurity.conf) such as SecRuleEngine,
+# SecRequestBodyAccess, SecAuditEngine, SecDebugLog, and XML processing.
+#
+# The CRS assumes that modsecurity.conf has been loaded. It is bundled with
+# ModSecurity. If you don't have it, you can get it from:
+# 2.x: https://raw.githubusercontent.com/SpiderLabs/ModSecurity/v2/master/modsecurity.conf-recommended
+# 3.x: https://raw.githubusercontent.com/SpiderLabs/ModSecurity/v3/master/modsecurity.conf-recommended
+#
+# The order of file inclusion in your webserver configuration should always be:
+# 1. modsecurity.conf
+# 2. crs-setup.conf (this file)
+# 3. rules/*.conf (the CRS rule files)
+#
+# Please refer to the INSTALL file for detailed installation instructions.
+#
+
+
+#
+# -- [[ Mode of Operation: Anomaly Scoring vs. Self-Contained ]] ---------------
+#
+# The CRS can run in two modes:
+#
+# -- [[ Anomaly Scoring Mode (default) ]] --
+# In CRS3, anomaly mode is the default and recommended mode, since it gives the
+# most accurate log information and offers the most flexibility in setting your
+# blocking policies. It is also called "collaborative detection mode".
+# In this mode, each matching rule increases an 'anomaly score'.
+# At the conclusion of the inbound rules, and again at the conclusion of the
+# outbound rules, the anomaly score is checked, and the blocking evaluation
+# rules apply a disruptive action, by default returning an error 403.
+#
+# -- [[ Self-Contained Mode ]] --
+# In this mode, rules apply an action instantly. This was the CRS2 default.
+# It can lower resource usage, at the cost of less flexibility in blocking policy
+# and less informative audit logs (only the first detected threat is logged).
+# Rules inherit the disruptive action that you specify (i.e. deny, drop, etc).
+# The first rule that matches will execute this action. In most cases this will
+# cause evaluation to stop after the first rule has matched, similar to how many
+# IDSs function.
+#
+# -- [[ Alert Logging Control ]] --
+# In the mode configuration, you must also adjust the desired logging options.
+# There are three common options for dealing with logging. By default CRS enables
+# logging to the webserver error log (or Event viewer) plus detailed logging to
+# the ModSecurity audit log (configured under SecAuditLog in modsecurity.conf).
+#
+# - To log to both error log and ModSecurity audit log file, use: "log,auditlog"
+# - To log *only* to the ModSecurity audit log file, use: "nolog,auditlog"
+# - To log *only* to the error log file, use: "log,noauditlog"
+#
+# Examples for the various modes follow.
+# You must leave one of the following options enabled.
+# Note that you must specify the same line for phase:1 and phase:2.
+#
+
+# Default: Anomaly Scoring mode, log to error log, log to ModSecurity audit log
+# - By default, offending requests are blocked with an error 403 response.
+# - To change the disruptive action, see RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf.example
+#   and review section 'Changing the Disruptive Action for Anomaly Mode'.
+# - In Apache, you can use ErrorDocument to show a friendly error page or
+#   perform a redirect: https://httpd.apache.org/docs/2.4/custom-error.html
+#
+# SecDefaultAction "phase:1,log,auditlog,pass"
+# SecDefaultAction "phase:2,log,auditlog,pass"
+
+# Example: Anomaly Scoring mode, log only to ModSecurity audit log
+# - By default, offending requests are blocked with an error 403 response.
+# - To change the disruptive action, see RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf.example
+#   and review section 'Changing the Disruptive Action for Anomaly Mode'.
+# - In Apache, you can use ErrorDocument to show a friendly error page or
+#   perform a redirect: https://httpd.apache.org/docs/2.4/custom-error.html
+#
+# SecDefaultAction "phase:1,nolog,auditlog,pass"
+# SecDefaultAction "phase:2,nolog,auditlog,pass"
+
+# Example: Self-contained mode, return error 403 on blocking
+# - In this configuration the default disruptive action becomes 'deny'. After a
+#   rule triggers, it will stop processing the request and return an error 403.
+# - You can also use a different error status, such as 404, 406, et cetera.
+# - In Apache, you can use ErrorDocument to show a friendly error page or
+#   perform a redirect: https://httpd.apache.org/docs/2.4/custom-error.html
+#
+# SecDefaultAction "phase:1,log,auditlog,deny,status:403"
+# SecDefaultAction "phase:2,log,auditlog,deny,status:403"
+
+# Example: Self-contained mode, redirect back to homepage on blocking
+# - In this configuration the 'tag' action includes the Host header data in the
+#   log. This helps to identify which virtual host triggered the rule (if any).
+# - Note that this might cause redirect loops in some situations; for example
+#   if a Cookie or User-Agent header is blocked, it will also be blocked when
+#   the client subsequently tries to access the homepage. You can also redirect
+#   to another custom URL.
+# SecDefaultAction "phase:1,log,auditlog,redirect:'http://%{request_headers.host}/',tag:'Host: %{request_headers.host}'"
+# SecDefaultAction "phase:2,log,auditlog,redirect:'http://%{request_headers.host}/',tag:'Host: %{request_headers.host}'"
+
+SecDefaultAction "phase:1,<%= $_secdefaultaction -%>"
+SecDefaultAction "phase:2,<%= $_secdefaultaction -%>"
+
+#
+# -- [[ Paranoia Level Initialization ]] ---------------------------------------
+#
+# The Paranoia Level (PL) setting allows you to choose the desired level
+# of rule checks that will add to your anomaly scores.
+#
+# With each paranoia level increase, the CRS enables additional rules
+# giving you a higher level of security. However, higher paranoia levels
+# also increase the possibility of blocking some legitimate traffic due to
+# false alarms (also named false positives or FPs). If you use higher
+# paranoia levels, it is likely that you will need to add some exclusion
+# rules for certain requests and applications receiving complex input.
+#
+# - A paranoia level of 1 is default. In this level, most core rules
+#   are enabled. PL1 is advised for beginners, installations
+#   covering many different sites and applications, and for setups
+#   with standard security requirements.
+#   At PL1 you should face FPs rarely. If you encounter FPs, please
+#   open an issue on the CRS GitHub site and don't forget to attach your
+#   complete Audit Log record for the request with the issue.
+# - Paranoia level 2 includes many extra rules, for instance enabling
+#   many regexp-based SQL and XSS injection protections, and adding
+#   extra keywords checked for code injections. PL2 is advised
+#   for moderate to experienced users desiring more complete coverage
+#   and for installations with elevated security requirements.
+#   PL2 comes with some FPs which you need to handle.
+# - Paranoia level 3 enables more rules and keyword lists, and tweaks
+#   limits on special characters used. PL3 is aimed at users experienced
+#   at the handling of FPs and at installations with a high security
+#   requirement.
+# - Paranoia level 4 further restricts special characters.
+#   The highest level is advised for experienced users protecting
+#   installations with very high security requirements. Running PL4 will
+#   likely produce a very high number of FPs which have to be
+#   treated before the site can go productive.
+#
+# All rules will log their PL to the audit log;
+# example: [tag "paranoia-level/2"]. This allows you to deduct from the
+# audit log how the WAF behavior is affected by paranoia level.
+#
+# It is important to also look into the variable
+# tx.enforce_bodyproc_urlencoded (Enforce Body Processor URLENCODED)
+# defined below. Enabling it closes a possible bypass of CRS.
+#
+# Uncomment this rule to change the default:
+#
+SecAction \
+  "id:900000,\
+   phase:1,\
+   nolog,\
+   pass,\
+   t:none,\
+   setvar:tx.paranoia_level=<%= $paranoia_level -%>"
+
+
+# It is possible to execute rules from a higher paranoia level but not include
+# them in the anomaly scoring. This allows you to take a well-tuned system on
+# paranoia level 1 and add rules from paranoia level 2 without having to fear
+# the new rules would lead to false positives that raise your score above the
+# threshold.
+# This optional feature is enabled by uncommenting the following rule and
+# setting the tx.executing_paranoia_level.
+# Technically, rules up to the level defined in tx.executing_paranoia_level
+# will be executed, but only the rules up to tx.paranoia_level affect the
+# anomaly scores.
+# By default, tx.executing_paranoia_level is set to tx.paranoia_level.
+# tx.executing_paranoia_level must not be lower than tx.paranoia_level.
+#
+# Please notice that setting tx.executing_paranoia_level to a higher paranoia
+# level results in a performance impact that is equally high as setting
+# tx.paranoia_level to said level.
+#
+SecAction \
+  "id:900001,\
+   phase:1,\
+   nolog,\
+   pass,\
+   t:none,\
+   setvar:tx.executing_paranoia_level=<%= $executing_paranoia_level -%>"
+
+
+#
+# -- [[ Enforce Body Processor URLENCODED ]] -----------------------------------
+#
+# ModSecurity selects the body processor based on the Content-Type request
+# header. But clients are not always setting the Content-Type header for their
+# request body payloads. This will leave ModSecurity with limited vision into
+# the payload.  The variable tx.enforce_bodyproc_urlencoded lets you force the
+# URLENCODED body processor in these situations. This is off by default, as it
+# implies a change of the behaviour of ModSecurity beyond CRS (the body
+# processor applies to all rules, not only CRS) and because it may lead to
+# false positives already on paranoia level 1. However, enabling this variable
+# closes a possible bypass of CRS so it should be considered.
+#
+# Uncomment this rule to change the default:
+#
+#SecAction \
+#  "id:900010,\
+#   phase:1,\
+#   nolog,\
+#   pass,\
+#   t:none,\
+#   setvar:tx.enforce_bodyproc_urlencoded=1"
+
+
+#
+# -- [[ Anomaly Mode Severity Levels ]] ----------------------------------------
+#
+# Each rule in the CRS has an associated severity level.
+# These are the default scoring points for each severity level.
+# These settings will be used to increment the anomaly score if a rule matches.
+# You may adjust these points to your liking, but this is usually not needed.
+#
+# - CRITICAL severity: Anomaly Score of 5.
+#       Mostly generated by the application attack rules (93x and 94x files).
+# - ERROR severity: Anomaly Score of 4.
+#       Generated mostly from outbound leakage rules (95x files).
+# - WARNING severity: Anomaly Score of 3.
+#       Generated mostly by malicious client rules (91x files).
+# - NOTICE severity: Anomaly Score of 2.
+#       Generated mostly by the protocol rules (92x files).
+#
+# In anomaly mode, these scores are cumulative.
+# So it's possible for a request to hit multiple rules.
+#
+# (Note: In this file, we use 'phase:1' to set CRS configuration variables.
+# In general, 'phase:request' is used. However, we want to make absolutely sure
+# that all configuration variables are set before the CRS rules are processed.)
+#
+SecAction \
+ "id:900100,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:tx.critical_anomaly_score=<%= $critical_anomaly_score -%>, \
+  setvar:tx.error_anomaly_score=<%= $error_anomaly_score -%>, \
+  setvar:tx.warning_anomaly_score=<%= $warning_anomaly_score -%>, \
+  setvar:tx.notice_anomaly_score=<%= $notice_anomaly_score -%>"
+
+
+#
+# -- [[ Anomaly Mode Blocking Threshold Levels ]] ------------------------------
+#
+# Here, you can specify at which cumulative anomaly score an inbound request,
+# or outbound response, gets blocked.
+#
+# Most detected inbound threats will give a critical score of 5.
+# Smaller violations, like violations of protocol/standards, carry lower scores.
+#
+# [ At default value ]
+# If you keep the blocking thresholds at the defaults, the CRS will work
+# similarly to previous CRS versions: a single critical rule match will cause
+# the request to be blocked and logged.
+#
+# [ Using higher values ]
+# If you want to make the CRS less sensitive, you can increase the blocking
+# thresholds, for instance to 7 (which would require multiple rule matches
+# before blocking) or 10 (which would require at least two critical alerts - or
+# a combination of many lesser alerts), or even higher. However, increasing the
+# thresholds might cause some attacks to bypass the CRS rules or your policies.
+#
+# [ New deployment strategy: Starting high and decreasing ]
+# It is a common practice to start a fresh CRS installation with elevated
+# anomaly scoring thresholds (>100) and then lower the limits as your
+# confidence in the setup grows. You may also look into the Sampling
+# Percentage section below for a different strategy to ease into a new
+# CRS installation.
+#
+# [ Anomaly Threshold / Paranoia Level Quadrant ]
+#
+#     High Anomaly Limit   |   High Anomaly Limit
+#     Low Paranoia Level   |   High Paranoia Level
+#     -> Fresh Site        |   -> Experimental Site
+# ------------------------------------------------------
+#     Low Anomaly Limit    |   Low Anomaly Limit
+#     Low Paranoia Level   |   High Paranoia Level
+#     -> Standard Site     |   -> High Security Site
+#
+# Uncomment this rule to change the defaults:
+#
+SecAction \
+ "id:900110,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:tx.inbound_anomaly_score_threshold=<%= $inbound_anomaly_threshold -%>, \
+  setvar:tx.outbound_anomaly_score_threshold=<%= $outbound_anomaly_threshold -%>"
+
+#
+# -- [[ Application Specific Rule Exclusions ]] ----------------------------------------
+#
+# Some well-known applications may undertake actions that appear to be
+# malicious. This includes actions such as allowing HTML or Javascript within
+# parameters. In such cases the CRS aims to prevent false positives by allowing
+# administrators to enable prebuilt, application specific exclusions on an
+# application by application basis.
+# These application specific exclusions are distinct from the rules that would
+# be placed in the REQUEST-900-EXCLUSION-RULES-BEFORE-CRS configuration file as
+# they are prebuilt for specific applications. The 'REQUEST-900' file is
+# designed for users to add their own custom exclusions. Note, using these
+# application specific exclusions may loosen restrictions of the CRS,
+# especially if used with an application they weren't designed for. As a result
+# they should be applied with care.
+# To use this functionality you must specify a supported application. To do so
+# uncomment rule 900130. In addition to uncommenting the rule you will need to
+# specify which application(s) you'd like to enable exclusions for. Only a
+# (very) limited set of applications are currently supported, please use the
+# filenames prefixed with 'REQUEST-903' to guide you in your selection.
+# Such filenames use the following convention:
+# REQUEST-903.9XXX-{APPNAME}-EXCLUSIONS-RULES.conf
+#
+# It is recommended if you run multiple web applications on your site to limit
+# the effects of the exclusion to only the path where the excluded webapp
+# resides using a rule similar to the following example:
+# SecRule REQUEST_URI "@beginsWith /wordpress/" setvar:tx.crs_exclusions_wordpress=1
+
+#
+# Modify and uncomment this rule to select which application:
+#
+#SecAction \
+# "id:900130,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.crs_exclusions_cpanel=1,\
+#  setvar:tx.crs_exclusions_drupal=1,\
+#  setvar:tx.crs_exclusions_dokuwiki=1,\
+#  setvar:tx.crs_exclusions_nextcloud=1,\
+#  setvar:tx.crs_exclusions_wordpress=1,\
+#  setvar:tx.crs_exclusions_xenforo=1"
+
+#
+# -- [[ HTTP Policy Settings ]] ------------------------------------------------
+#
+# This section defines your policies for the HTTP protocol, such as:
+# - allowed HTTP versions, HTTP methods, allowed request Content-Types
+# - forbidden file extensions (e.g. .bak, .sql) and request headers (e.g. Proxy)
+#
+# These variables are used in the following rule files:
+# - REQUEST-911-METHOD-ENFORCEMENT.conf
+# - REQUEST-912-DOS-PROTECTION.conf
+# - REQUEST-920-PROTOCOL-ENFORCEMENT.conf
+
+# HTTP methods that a client is allowed to use.
+# Default: GET HEAD POST OPTIONS
+# Example: for RESTful APIs, add the following methods: PUT PATCH DELETE
+# Example: for WebDAV, add the following methods: CHECKOUT COPY DELETE LOCK
+#          MERGE MKACTIVITY MKCOL MOVE PROPFIND PROPPATCH PUT UNLOCK
+# Uncomment this rule to change the default.
+SecAction \
+ "id:900200,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.allowed_methods=<%= $allowed_methods -%>'"
+
+# Content-Types that a client is allowed to send in a request.
+# Default: |application/x-www-form-urlencoded| |multipart/form-data| |multipart/related|
+# |text/xml| |application/xml| |application/soap+xml| |application/x-amf| |application/json|
+# |application/cloudevents+json| |application/cloudevents-batch+json| |application/octet-stream|
+# |application/csp-report| |application/xss-auditor-report| |text/plain|
+# Uncomment this rule to change the default.
+SecAction \
+ "id:900220,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.allowed_request_content_type=<%= $content_types -%>'"
+
+# Allowed HTTP versions.
+# Default: HTTP/1.0 HTTP/1.1 HTTP/2 HTTP/2.0
+# Example for legacy clients: HTTP/0.9 HTTP/1.0 HTTP/1.1 HTTP/2 HTTP/2.0
+# Note that some web server versions use 'HTTP/2', some 'HTTP/2.0', so
+# we include both version strings by default.
+# Uncomment this rule to change the default.
+#SecAction \
+# "id:900230,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:'tx.allowed_http_versions=HTTP/1.0 HTTP/1.1 HTTP/2 HTTP/2.0'"
+
+# Forbidden file extensions.
+# Guards against unintended exposure of development/configuration files.
+# Default: .asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .rdb/ .resources/ .resx/ .sql/ .swp/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/
+# Example: .bak/ .config/ .conf/ .db/ .ini/ .log/ .old/ .pass/ .pdb/ .rdb/ .sql/
+# Uncomment this rule to change the default.
+SecAction \
+ "id:900240,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.restricted_extensions=<%= $restricted_extensions -%>'"
+
+# Forbidden request headers.
+# Header names should be lowercase, enclosed by /slashes/ as delimiters.
+# Blocking Proxy header prevents 'httpoxy' vulnerability: https://httpoxy.org
+# Default: /proxy/ /lock-token/ /content-range/ /if/
+# Uncomment this rule to change the default.
+SecAction \
+ "id:900250,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.restricted_headers=<%= $restricted_headers -%>'"
+
+# File extensions considered static files.
+# Extensions include the dot, lowercase, enclosed by /slashes/ as delimiters.
+# Used in DoS protection rule. See section "Anti-Automation / DoS Protection".
+# Default: /.jpg/ /.jpeg/ /.png/ /.gif/ /.js/ /.css/ /.ico/ /.svg/ /.webp/
+# Uncomment this rule to change the default.
+#SecAction \
+# "id:900260,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:'tx.static_extensions=/.jpg/ /.jpeg/ /.png/ /.gif/ /.js/ /.css/ /.ico/ /.svg/ /.webp/'"
+
+# Content-Types charsets that a client is allowed to send in a request.
+# Default: utf-8|iso-8859-1|iso-8859-15|windows-1252
+# Uncomment this rule to change the default.
+# Use "|" to separate multiple charsets like in the rule defining
+# tx.allowed_request_content_type.
+#SecAction \
+# "id:900280,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:'tx.allowed_request_content_type_charset=utf-8|iso-8859-1|iso-8859-15|windows-1252'"
+
+#
+# -- [[ HTTP Argument/Upload Limits ]] -----------------------------------------
+#
+# Here you can define optional limits on HTTP get/post parameters and uploads.
+# This can help to prevent application specific DoS attacks.
+#
+# These values are checked in REQUEST-920-PROTOCOL-ENFORCEMENT.conf.
+# Beware of blocking legitimate traffic when enabling these limits.
+#
+
+# Block request if number of arguments is too high
+# Default: unlimited
+# Example: 255
+# Uncomment this rule to set a limit.
+SecAction \
+ "id:900300,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:tx.max_num_args=<%= $secrequestmaxnumargs %>"
+
+# Block request if the length of any argument name is too high
+# Default: unlimited
+# Example: 100
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900310,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.arg_name_length=100"
+
+# Block request if the length of any argument value is too high
+# Default: unlimited
+# Example: 400
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900320,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.arg_length=400"
+
+# Block request if the total length of all combined arguments is too high
+# Default: unlimited
+# Example: 64000
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900330,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.total_arg_length=64000"
+
+# Block request if the file size of any individual uploaded file is too high
+# Default: unlimited
+# Example: 1048576
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900340,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.max_file_size=1048576"
+
+# Block request if the total size of all combined uploaded files is too high
+# Default: unlimited
+# Example: 1048576
+# Uncomment this rule to set a limit.
+#SecAction \
+# "id:900350,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.combined_file_sizes=1048576"
+
+
+#
+# -- [[ Easing In / Sampling Percentage ]] -------------------------------------
+#
+# Adding the Core Rule Set to an existing productive site can lead to false
+# positives, unexpected performance issues and other undesired side effects.
+#
+# It can be beneficial to test the water first by enabling the CRS for a
+# limited number of requests only and then, when you have solved the issues (if
+# any) and you have confidence in the setup, to raise the ratio of requests
+# being sent into the ruleset.
+#
+# Adjust the percentage of requests that are funnelled into the Core Rules by
+# setting TX.sampling_percentage below. The default is 100, meaning that every
+# request gets checked by the CRS.  The selection of requests, which are going
+# to be checked, is based on a pseudo random number generated by ModSecurity.
+#
+# If a request is allowed to pass without being checked by the CRS, there is no
+# entry in the audit log (for performance reasons), but an error log entry is
+# written.  If you want to disable the error log entry, then issue the
+# following directive somewhere after the inclusion of the CRS
+# (E.g., RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf).
+#
+# SecRuleUpdateActionById 901150 "nolog"
+#
+# ATTENTION: If this TX.sampling_percentage is below 100, then some of the
+# requests will bypass the Core Rules completely and you lose the ability to
+# protect your service with ModSecurity.
+#
+# Uncomment this rule to enable this feature:
+#
+#SecAction "id:900400,\
+#  phase:1,\
+#  pass,\
+#  nolog,\
+#  setvar:tx.sampling_percentage=100"
+
+
+#
+# -- [[ Project Honey Pot HTTP Blacklist ]] ------------------------------------
+#
+# Optionally, you can check the client IP address against the Project Honey Pot
+# HTTPBL (dnsbl.httpbl.org). In order to use this, you need to register to get a
+# free API key. Set it here with SecHttpBlKey.
+#
+# Project Honeypot returns multiple different malicious IP types.
+# You may specify which you want to block by enabling or disabling them below.
+#
+# Ref: https://www.projecthoneypot.org/httpbl.php
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecHttpBlKey
+#
+# Uncomment these rules to use this feature:
+#
+#SecHttpBlKey XXXXXXXXXXXXXXXXX
+#SecAction "id:900500,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.block_search_ip=1,\
+#  setvar:tx.block_suspicious_ip=1,\
+#  setvar:tx.block_harvester_ip=1,\
+#  setvar:tx.block_spammer_ip=1"
+
+
+#
+# -- [[ GeoIP Database ]] ------------------------------------------------------
+#
+# There are some rulesets that inspect geolocation data of the client IP address
+# (geoLookup). The CRS uses geoLookup to implement optional country blocking.
+#
+# To use geolocation, we make use of the MaxMind GeoIP database.
+# This database is not included with the CRS and must be downloaded.
+#
+# There are two formats for the GeoIP database. ModSecurity v2 uses GeoLite (.dat files),
+# and ModSecurity v3 uses GeoLite2 (.mmdb files).
+#
+# If you use ModSecurity 3, MaxMind provides a binary for updating GeoLite2 files,
+# see https://github.com/maxmind/geoipupdate.
+#
+# Download the package for your OS, and read https://dev.maxmind.com/geoip/geoipupdate/
+# for configuration options.
+#
+# Warning: GeoLite (not GeoLite2) databases are considered legacy, and not being updated anymore.
+# See https://support.maxmind.com/geolite-legacy-discontinuation-notice/ for more info.
+#
+# Therefore, if you use ModSecurity v2, you need to regenerate updated .dat files
+# from CSV files first.
+#
+# You can achieve this using https://github.com/sherpya/geolite2legacy
+# Pick the zip files from maxmind site:
+# https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip
+#
+# Follow the guidelines for installing the tool and run:
+# ./geolite2legacy.py -i GeoLite2-Country-CSV.zip \
+#                     -f geoname2fips.csv -o /usr/share/GeoliteCountry.dat
+#
+# Update the database regularly, see Step 3 of the configuration link above.
+#
+# By default, when you execute `sudo geoipupdate` on Linux, files from the free database
+# will be downloaded to `/usr/share/GeoIP` (both v1 and v2).
+#
+# Then choose from:
+#   - `GeoLite2-Country.mmdb` (if you are using ModSecurity v3)
+#   - `GeoLiteCountry.dat`    (if you are using ModSecurity v2)
+#
+# Ref: http://blog.spiderlabs.com/2010/10/detecting-malice-with-modsecurity-geolocation-data.html
+# Ref: http://blog.spiderlabs.com/2010/11/detecting-malice-with-modsecurity-ip-forensics.html
+#
+# Uncomment only one of the next rules here to use this feature.
+# Choose the one depending on the ModSecurity version you are using, and change the path accordingly:
+#
+# For ModSecurity v3:
+#SecGeoLookupDB /usr/share/GeoIP/GeoLite2-Country.mmdb
+# For ModSecurity v2 (points to the converted one):
+#SecGeoLookupDB /usr/share/GeoIP/GeoLiteCountry.dat
+
+#
+# -=[ Block Countries ]=-
+#
+# Rules in the IP Reputation file can check the client against a list of high
+# risk country codes. These countries have to be defined in the variable
+# tx.high_risk_country_codes via their ISO 3166 two-letter country code:
+# https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements
+#
+# If you are sure that you are not getting any legitimate requests from a given
+# country, then you can disable all access from that country via this variable.
+# The rule performing the test has the rule id 910100.
+#
+# This rule requires SecGeoLookupDB to be enabled and the GeoIP database to be
+# downloaded (see the section "GeoIP Database" above.)
+#
+# By default, the list is empty. A list used by some sites was the following:
+# setvar:'tx.high_risk_country_codes=UA ID YU LT EG RO BG TR RU PK MY CN'"
+#
+# Uncomment this rule to use this feature:
+#
+#SecAction \
+# "id:900600,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:'tx.high_risk_country_codes='"
+
+
+#
+# -- [[ Anti-Automation / DoS Protection ]] ------------------------------------
+#
+# Optional DoS protection against clients making requests too quickly.
+#
+# When a client is making more than 100 requests (excluding static files) within
+# 60 seconds, this is considered a 'burst'. After two bursts, the client is
+# blocked for 600 seconds.
+#
+# Requests to static files are not counted towards DoS; they are listed in the
+# 'tx.static_extensions' setting, which you can change in this file (see
+# section "HTTP Policy Settings").
+#
+# For a detailed description, see rule file REQUEST-912-DOS-PROTECTION.conf.
+#
+# Uncomment this rule to use this feature:
+#
+<% if $enable_dos_protection { -%>
+SecAction \
+ "id:900700,\
+  phase:1,\
+  nolog,\
+  pass,\
+  t:none,\
+  setvar:'tx.dos_burst_time_slice=<%= $dos_burst_time_slice %>',\
+  setvar:'tx.dos_counter_threshold=<%= $dos_counter_threshold %>',\
+  setvar:'tx.dos_block_timeout=<%= $dos_block_timeout %>'"
+<% } -%>
+
+#
+# -- [[ Check UTF-8 encoding ]] ------------------------------------------------
+#
+# The CRS can optionally check request contents for invalid UTF-8 encoding.
+# We only want to apply this check if UTF-8 encoding is actually used by the
+# site; otherwise it will result in false positives.
+#
+# Uncomment this rule to use this feature:
+#
+#SecAction \
+# "id:900950,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.crs_validate_utf8_encoding=1"
+
+
+#
+# -- [[ Blocking Based on IP Reputation ]] ------------------------------------
+#
+# Blocking based on reputation is permanent in the CRS. Unlike other rules,
+# which look at the individual request, the blocking of IPs is based on
+# a persistent record in the IP collection, which remains active for a
+# certain amount of time.
+#
+# There are two ways an individual client can become flagged for blocking:
+# - External information (RBL, GeoIP, etc.)
+# - Internal information (Core Rules)
+#
+# The record in the IP collection carries a flag, which tags requests from
+# individual clients with a flag named IP.reput_block_flag.
+# But the flag alone is not enough to have a client blocked. There is also
+# a global switch named tx.do_reput_block. This is off by default. If you set
+# it to 1 (=On), requests from clients with the IP.reput_block_flag will
+# be blocked for a certain duration.
+#
+# Variables
+# ip.reput_block_flag      Blocking flag for the IP collection record
+# ip.reput_block_reason    Reason (= rule message) that caused to blocking flag
+# tx.do_reput_block        Switch deciding if we really block based on flag
+# tx.reput_block_duration  Setting to define the duration of a block
+#
+# It may be important to know, that all the other core rules are skipped for
+# requests, when it is clear that they carry the blocking flag in question.
+#
+# Uncomment this rule to use this feature:
+#
+#SecAction \
+# "id:900960,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.do_reput_block=1"
+#
+# Uncomment this rule to change the blocking time:
+# Default: 300 (5 minutes)
+#
+#SecAction \
+# "id:900970,\
+#  phase:1,\
+#  nolog,\
+#  pass,\
+#  t:none,\
+#  setvar:tx.reput_block_duration=300"
+
+
+#
+# -- [[ Collection timeout ]] --------------------------------------------------
+#
+# Set the SecCollectionTimeout directive from the ModSecurity default (1 hour)
+# to a lower setting which is appropriate to most sites.
+# This increases performance by cleaning out stale collection (block) entries.
+#
+# This value should be greater than or equal to:
+# tx.reput_block_duration (see section "Blocking Based on IP Reputation") and
+# tx.dos_block_timeout (see section "Anti-Automation / DoS Protection").
+#
+# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecCollectionTimeout
+
+# Please keep this directive uncommented.
+# Default: 600 (10 minutes)
+SecCollectionTimeout 600
+
+
+#
+# -- [[ End of setup ]] --------------------------------------------------------
+#
+# The CRS checks the tx.crs_setup_version variable to ensure that the setup
+# has been loaded. If you are not planning to use this setup template,
+# you must manually set the tx.crs_setup_version variable before including
+# the CRS rules/* files.
+#
+# The variable is a numerical representation of the CRS version number.
+# E.g., v3.0.0 is represented as 300.
+#
+SecAction \
+    "id:900990,\
+    phase:1,\
+    nolog,\
+    pass,\
+    t:none,\
+    setvar:tx.crs_setup_version=332"
+<% } -%>
+
diff --git a/templates/mod/security_custom.conf.epp b/templates/mod/security_custom.conf.epp
new file mode 100644
index 0000000000..e2570c44a1
--- /dev/null
+++ b/templates/mod/security_custom.conf.epp
@@ -0,0 +1,6 @@
+# This file is managed by puppet, any direct modification will be overwritten.
+<% if $custom_rules_set and !($custom_rules_set.empty) { -%>
+<% $custom_rules_set.each |$secrule| { -%>
+SecRule <%= $secrule %>
+<% } -%>
+<% } -%>
\ No newline at end of file
diff --git a/templates/mod/security_custom.conf.erb b/templates/mod/security_custom.conf.erb
deleted file mode 100644
index 97ed20dc46..0000000000
--- a/templates/mod/security_custom.conf.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is managed by puppet, any direct modification will be overwritten.
-<% if defined?(@custom_rules_set) && ! @custom_rules_set.empty? -%>
-<% @custom_rules_set.each do |secrule| -%>
-SecRule <%= secrule %>
-<% end -%>
-<% end -%>
\ No newline at end of file
diff --git a/templates/mod/setenvif.conf.erb b/templates/mod/setenvif.conf.epp
similarity index 100%
rename from templates/mod/setenvif.conf.erb
rename to templates/mod/setenvif.conf.epp
diff --git a/templates/mod/ssl.conf.epp b/templates/mod/ssl.conf.epp
new file mode 100644
index 0000000000..35771d1301
--- /dev/null
+++ b/templates/mod/ssl.conf.epp
@@ -0,0 +1,58 @@
+<IfModule mod_ssl.c>
+  SSLRandomSeed startup builtin
+  SSLRandomSeed startup file:/dev/urandom <%= $ssl_random_seed_bytes %>
+  SSLRandomSeed connect builtin
+  SSLRandomSeed connect file:/dev/urandom <%= $ssl_random_seed_bytes %>
+
+  AddType application/x-x509-ca-cert .crt
+  AddType application/x-pkcs7-crl    .crl
+
+  SSLPassPhraseDialog <%= $ssl_pass_phrase_dialog %>
+  SSLSessionCache "shmcb:<%= $ssl_sessioncache %>"
+  SSLSessionCacheTimeout <%= $ssl_sessioncachetimeout %>
+  Mutex <%= $ssl_mutex %>
+  <%- if $ssl_compression { -%>
+  SSLCompression <%= apache::bool2httpd($ssl_compression) %>
+  <%- } -%>
+  <%- if $ssl_sessiontickets != undef { -%>
+  SSLSessionTickets <%= apache::bool2httpd($ssl_sessiontickets) %>
+  <%- } -%>
+  SSLCryptoDevice <%= $ssl_cryptodevice %>
+  SSLHonorCipherOrder <%= apache::bool2httpd($_ssl_honorcipherorder) %>
+  <%- if $ssl_cert { -%>
+  SSLCertificateFile      "<%= $ssl_cert %>"
+  <%- } -%>
+  <%- if $ssl_key { -%>
+  SSLCertificateKeyFile   "<%= $ssl_key %>"
+  <%- } -%>
+  <%- if $ssl_ca { -%>
+  SSLCACertificateFile    "<%= $ssl_ca %>"
+  <%- } -%>
+  SSLUseStapling <%= apache::bool2httpd($ssl_stapling) %>
+  <%- if $ssl_stapling_return_errors { -%>
+  SSLStaplingReturnResponderErrors <%= apache::bool2httpd($ssl_stapling_return_errors) %>
+  <%- } -%>
+  SSLStaplingCache "shmcb:<%= $_stapling_cache %>"
+  <%- if String(type($ssl_cipher, 'generalized')).index('Hash') == 0 { -%>
+    <%- $ssl_cipher.map |$protocol, $cipher| { -%>
+  SSLCipherSuite <%= $protocol %> <%= $cipher %>
+    <%- } -%>
+  <%- } else { -%>
+  SSLCipherSuite <%= $ssl_cipher %>
+  <%- } -%>
+<% if !($ssl_protocol.empty) { -%>
+  SSLProtocol <%= $ssl_protocol.filter |$item| { $item != undef }.join(' ') %>
+<% } -%>
+<% if !($ssl_proxy_protocol.empty) { -%>
+  SSLProxyProtocol <%= $ssl_proxy_protocol.filter |$item| { $item != undef }.join(' ') %>
+<% } -%>
+<% if $ssl_proxy_cipher_suite { -%>
+  SSLProxyCipherSuite <%= $ssl_proxy_cipher_suite %>
+<% } -%>
+<% if $ssl_options { -%>
+  SSLOptions <%= $ssl_options.filter |$item| { $item != undef }.join(' ') %>
+<% } -%>
+<%- if $ssl_openssl_conf_cmd { -%>
+  SSLOpenSSLConfCmd <%= $ssl_openssl_conf_cmd %>
+<%- } -%>
+</IfModule>
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
deleted file mode 100644
index 6d021f331d..0000000000
--- a/templates/mod/ssl.conf.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-<IfModule mod_ssl.c>
-  SSLRandomSeed startup builtin
-  SSLRandomSeed startup file:/dev/urandom <%= @ssl_random_seed_bytes %>
-  SSLRandomSeed connect builtin
-  SSLRandomSeed connect file:/dev/urandom <%= @ssl_random_seed_bytes %>
-
-  AddType application/x-x509-ca-cert .crt
-  AddType application/x-pkcs7-crl    .crl
-
-  SSLPassPhraseDialog <%= @ssl_pass_phrase_dialog %>
-  SSLSessionCache "shmcb:<%= @ssl_sessioncache %>"
-  SSLSessionCacheTimeout <%= @ssl_sessioncachetimeout %>
-  Mutex <%= @ssl_mutex %>
-  <%- if @ssl_compression -%>
-  SSLCompression <%= scope.call_function('apache::bool2httpd', [@ssl_compression]) %>
-  <%- end -%>
-  <%- unless @ssl_sessiontickets.nil? -%>
-  SSLSessionTickets <%= scope.call_function('apache::bool2httpd', [@ssl_sessiontickets]) %>
-  <%- end -%>
-  SSLCryptoDevice <%= @ssl_cryptodevice %>
-  SSLHonorCipherOrder <%= scope.call_function('apache::bool2httpd', [@_ssl_honorcipherorder]) %>
-  <%- if @ssl_cert -%>
-  SSLCertificateFile      "<%= @ssl_cert %>"
-  <%- end -%>
-  <%- if @ssl_key -%>
-  SSLCertificateKeyFile   "<%= @ssl_key %>"
-  <%- end -%>
-  <%- if @ssl_ca -%>
-  SSLCACertificateFile    "<%= @ssl_ca %>"
-  <%- end -%>
-  SSLUseStapling <%= scope.call_function('apache::bool2httpd', [@ssl_stapling]) %>
-  <%- if not @ssl_stapling_return_errors.nil? -%>
-  SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
-  <%- end -%>
-  SSLStaplingCache "shmcb:<%= @_stapling_cache %>"
-  <%- if @ssl_cipher.kind_of?(Hash) -%>
-    <%- @ssl_cipher.map do |protocol, cipher| -%>
-  SSLCipherSuite <%= protocol %> <%= cipher %>
-    <%- end -%>
-  <%- else -%>
-  SSLCipherSuite <%= @ssl_cipher %>
-  <%- end -%>
-<% if not @ssl_protocol.empty? -%>
-  SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
-<% end -%>
-<% if not @ssl_proxy_protocol.empty? -%>
-  SSLProxyProtocol <%= @ssl_proxy_protocol.compact.join(' ') %>
-<% end -%>
-<% if @ssl_proxy_cipher_suite -%>
-  SSLProxyCipherSuite <%= @ssl_proxy_cipher_suite %>
-<% end -%>
-<% if @ssl_options -%>
-  SSLOptions <%= @ssl_options.compact.join(' ') %>
-<% end -%>
-<%- if @ssl_openssl_conf_cmd -%>
-  SSLOpenSSLConfCmd <%= @ssl_openssl_conf_cmd %>
-<%- end -%>
-</IfModule>
diff --git a/templates/mod/status.conf.epp b/templates/mod/status.conf.epp
new file mode 100644
index 0000000000..b7031956ed
--- /dev/null
+++ b/templates/mod/status.conf.epp
@@ -0,0 +1,14 @@
+<Location <%= $status_path %>>
+    SetHandler server-status
+    <%# From Puppet 4.2 up, replace: -%>
+    <%# "scope.function_template(["apache/mod/<Template>"])" -%>
+    <%# with: -%>
+    <%# "scope.call_function('template', ["apache/mod/<Template>"])" -%>
+<%= epp("apache/mod/_require.epp") -%>
+</Location>
+ExtendedStatus <%= $extended_status %>
+
+<IfModule mod_proxy.c>
+    # Show Proxy LoadBalancer status in mod_status
+    ProxyStatus On
+</IfModule>
diff --git a/templates/mod/userdir.conf.epp b/templates/mod/userdir.conf.epp
new file mode 100644
index 0000000000..90996109ea
--- /dev/null
+++ b/templates/mod/userdir.conf.epp
@@ -0,0 +1,22 @@
+<IfModule mod_userdir.c>
+<% if $disable_root { -%>
+  UserDir disabled root
+<% } -%>
+  UserDir <%= $_userdir %>
+
+<%- if !$unmanaged_path { -%>
+  <Directory "<%= $_path %>">
+    AllowOverride <%= $overrides.join(' ') %>
+    Options <%= $options.join(' ') %>
+    <Limit GET POST OPTIONS>
+      Require all granted
+    </Limit>
+    <LimitExcept GET POST OPTIONS>
+      Require all granted
+    </LimitExcept>
+  </Directory>
+<%- } -%>
+<%- if $custom_fragment { -%>
+<%= $custom_fragment %>
+<%- } -%>
+</IfModule>
diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
deleted file mode 100644
index a1a6c51f90..0000000000
--- a/templates/mod/userdir.conf.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<IfModule mod_userdir.c>
-<% if @disable_root -%>
-  UserDir disabled root
-<% end -%>
-  UserDir <%= @_userdir %>
-
-<%- if ! @unmanaged_path -%>
-  <Directory "<%= @_path %>">
-    AllowOverride <%= @overrides.join(' ') %>
-    Options <%= @options.join(' ') %>
-    <Limit GET POST OPTIONS>
-      Require all granted
-    </Limit>
-    <LimitExcept GET POST OPTIONS>
-      Require all granted
-    </LimitExcept>
-  </Directory>
-<%- end -%>
-<%- if @custom_fragment -%>
-<%= @custom_fragment %>
-<%- end -%>
-</IfModule>
diff --git a/templates/mod/worker.conf.epp b/templates/mod/worker.conf.epp
new file mode 100644
index 0000000000..71ca6cc8af
--- /dev/null
+++ b/templates/mod/worker.conf.epp
@@ -0,0 +1,11 @@
+<IfModule mpm_worker_module>
+  ServerLimit         <%= $serverlimit %>
+  StartServers        <%= $startservers %>
+  ThreadLimit         <%= $threadlimit %>
+  MinSpareThreads     <%= $minsparethreads %>
+  MaxSpareThreads     <%= $maxsparethreads %>
+  ThreadsPerChild     <%= $threadsperchild %>
+  MaxRequestsPerChild <%= $maxrequestsperchild %>
+  ListenBacklog       <%= $listenbacklog %>
+  MaxRequestWorkers   <%= $maxrequestworkers %>
+</IfModule>
diff --git a/templates/mod/worker.conf.erb b/templates/mod/worker.conf.erb
deleted file mode 100644
index ca6e4f159b..0000000000
--- a/templates/mod/worker.conf.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<IfModule mpm_worker_module>
-  ServerLimit         <%= @serverlimit %>
-  StartServers        <%= @startservers %>
-  ThreadLimit         <%= @threadlimit %>
-  MinSpareThreads     <%= @minsparethreads %>
-  MaxSpareThreads     <%= @maxsparethreads %>
-  ThreadsPerChild     <%= @threadsperchild %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-  ListenBacklog       <%= @listenbacklog %>
-  MaxRequestWorkers   <%= @maxrequestworkers %>
-</IfModule>
diff --git a/templates/mod/wsgi.conf.epp b/templates/mod/wsgi.conf.epp
new file mode 100644
index 0000000000..280d496b1c
--- /dev/null
+++ b/templates/mod/wsgi.conf.epp
@@ -0,0 +1,22 @@
+# The WSGI Apache module configuration file is being
+# managed by Puppet an changes will be overwritten.
+<IfModule mod_wsgi.c>
+  <%- if $wsgi_restrict_embedded { -%>
+  WSGIRestrictEmbedded <%= apache::bool2httpd($wsgi_restrict_embedded) %>
+  <%- } -%>
+  <%- if $wsgi_socket_prefix { -%>
+  WSGISocketPrefix <%= $wsgi_socket_prefix %>
+  <%- } -%>
+  <%- if $wsgi_python_home { -%>
+  WSGIPythonHome "<%= $wsgi_python_home %>"
+  <%- } -%>
+  <%- if $wsgi_python_path { -%>
+  WSGIPythonPath "<%= $wsgi_python_path %>"
+  <%- } -%>
+  <%- if $wsgi_application_group { -%>
+  WSGIApplicationGroup "<%= $wsgi_application_group %>"
+  <%- } -%>
+  <%- if $wsgi_python_optimize { -%>
+  WSGIPythonOptimize <%= $wsgi_python_optimize %>
+  <%- } -%>
+</IfModule>
diff --git a/templates/mod/wsgi.conf.erb b/templates/mod/wsgi.conf.erb
deleted file mode 100644
index 490f8b616c..0000000000
--- a/templates/mod/wsgi.conf.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-# The WSGI Apache module configuration file is being
-# managed by Puppet an changes will be overwritten.
-<IfModule mod_wsgi.c>
-  <%- if @wsgi_restrict_embedded -%>
-  WSGIRestrictEmbedded <%= scope.call_function('apache::bool2httpd', [@wsgi_restrict_embedded]) %>
-  <%- end -%>
-  <%- if @wsgi_socket_prefix -%>
-  WSGISocketPrefix <%= @wsgi_socket_prefix %>
-  <%- end -%>
-  <%- if @wsgi_python_home -%>
-  WSGIPythonHome "<%= @wsgi_python_home %>"
-  <%- end -%>
-  <%- if @wsgi_python_path -%>
-  WSGIPythonPath "<%= @wsgi_python_path %>"
-  <%- end -%>
-  <%- if @wsgi_application_group -%>
-  WSGIApplicationGroup "<%= @wsgi_application_group %>"
-  <%- end -%>
-  <%- if @wsgi_python_optimize -%>
-  WSGIPythonOptimize <%= @wsgi_python_optimize %>
-  <%- end -%>
-</IfModule>

From 53bf224795f9ab0fdd5bfb2653fd4b4e66ba92c7 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 21 Sep 2023 16:15:40 +0200
Subject: [PATCH 2168/2267] Remove deprecated parameters from mod::userdir

Also cleans up the logic
---
 manifests/mod/userdir.pp       | 30 ++----------------------------
 templates/mod/userdir.conf.epp |  4 ++--
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
index 68f927b207..7cdf4b32ef 100644
--- a/manifests/mod/userdir.pp
+++ b/manifests/mod/userdir.pp
@@ -1,11 +1,5 @@
 # @summary
 #   Installs and configures `mod_userdir`.
-# 
-# @param home
-#   *Deprecated* Path to system home directory.
-#   
-# @param dir
-#   *Deprecated* Path from user's home directory to public directory.
 #
 # @param userdir
 #   Path or directory name to be used as the UserDir.
@@ -31,8 +25,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_userdir.html for additional documentation.
 #
 class apache::mod::userdir (
-  Optional[String] $home            = undef,
-  Optional[String] $dir             = undef,
   Optional[String[1]] $userdir      = undef,
   Boolean $disable_root             = true,
   String $path                      = '/home/*/public_html',
@@ -43,36 +35,18 @@
 ) {
   include apache
 
-  if $home or $dir {
-    $_home = $home ? {
-      undef   => '/home',
-      default => $home,
-    }
-    $_dir = $dir ? {
-      undef   => 'public_html',
-      default => $dir,
-    }
-    warning('home and dir are deprecated; use path instead')
-    $_path = "${_home}/*/${_dir}"
-  } else {
-    $_path = $path
-  }
-
-  $_userdir = pick($userdir, $_path)
-
   ::apache::mod { 'userdir': }
 
   $parameters = {
     'disable_root'    => $disable_root,
-    '_userdir'        => $_userdir,
+    'userdir'         => pick($userdir, $path),
     'unmanaged_path'  => $unmanaged_path,
-    '_path'           => $_path,
+    'path'            => $path,
     'overrides'       => $overrides,
     'options'         => $options,
     'custom_fragment' => $custom_fragment,
   }
 
-  # Template uses $home, $dir, $disable_root
   file { 'userdir.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/userdir.conf",
diff --git a/templates/mod/userdir.conf.epp b/templates/mod/userdir.conf.epp
index 90996109ea..bd6bfce646 100644
--- a/templates/mod/userdir.conf.epp
+++ b/templates/mod/userdir.conf.epp
@@ -2,10 +2,10 @@
 <% if $disable_root { -%>
   UserDir disabled root
 <% } -%>
-  UserDir <%= $_userdir %>
+  UserDir <%= $userdir %>
 
 <%- if !$unmanaged_path { -%>
-  <Directory "<%= $_path %>">
+  <Directory "<%= $path %>">
     AllowOverride <%= $overrides.join(' ') %>
     Options <%= $options.join(' ') %>
     <Limit GET POST OPTIONS>

From c32d53694c56d12a4b31f874d89a80a14daa625c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 21 Sep 2023 16:18:22 +0200
Subject: [PATCH 2169/2267] Remove deprecated classes

---
 manifests/mod/dev.pp | 11 -----------
 manifests/php.pp     | 11 -----------
 manifests/proxy.pp   | 11 -----------
 manifests/python.pp  | 18 ------------------
 manifests/ssl.pp     | 11 -----------
 5 files changed, 62 deletions(-)
 delete mode 100644 manifests/mod/dev.pp
 delete mode 100644 manifests/php.pp
 delete mode 100644 manifests/proxy.pp
 delete mode 100644 manifests/python.pp
 delete mode 100644 manifests/ssl.pp

diff --git a/manifests/mod/dev.pp b/manifests/mod/dev.pp
deleted file mode 100644
index 4039ff1fd0..0000000000
--- a/manifests/mod/dev.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# @summary
-#   Installs `mod_dev`.
-#
-# @note
-#   This module is deprecated. Please use `apache::dev`.
-#
-class apache::mod::dev {
-  # Development packages are not apache modules
-  warning('apache::mod::dev is deprecated; please use apache::dev')
-  include apache::dev
-}
diff --git a/manifests/php.pp b/manifests/php.pp
deleted file mode 100644
index 32999a9296..0000000000
--- a/manifests/php.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# @summary
-#   This class installs PHP for Apache.
-#
-# @note 
-#    This class is deprecated.
-#
-# @api private
-class apache::php {
-  warning('apache::php is deprecated; please use apache::mod::php')
-  include apache::mod::php
-}
diff --git a/manifests/proxy.pp b/manifests/proxy.pp
deleted file mode 100644
index 9df41958c9..0000000000
--- a/manifests/proxy.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# @summary
-#   This class enabled the proxy module for Apache.
-#
-# @note
-#   This class is deprecated.
-#
-# @api private
-class apache::proxy {
-  warning('apache::proxy is deprecated; please use apache::mod::proxy')
-  include apache::mod::proxy
-}
diff --git a/manifests/python.pp b/manifests/python.pp
deleted file mode 100644
index 586ed9e81e..0000000000
--- a/manifests/python.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# @summary
-#   This class installs Python for Apache
-#
-# Parameters:
-# - $php_package
-#
-# Actions:
-#   - Install Apache Python package
-#
-# Requires:
-#
-# Sample Usage:
-#
-# @api private
-class apache::python {
-  warning('apache::python is deprecated; please use apache::mod::python')
-  include apache::mod::python
-}
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
deleted file mode 100644
index a241a98a23..0000000000
--- a/manifests/ssl.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# @summary
-#   This class installs Apache SSL capabilities
-#
-# @note
-#   This class is deprecated.
-#
-# @api private
-class apache::ssl {
-  warning('apache::ssl is deprecated; please use apache::mod::ssl')
-  include apache::mod::ssl
-}

From 824eb3e95e012a734fb62f3749000df119a0ac8b Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 21 Sep 2023 18:04:41 +0200
Subject: [PATCH 2170/2267] Inline template without variables

---
 manifests/vhost.pp                   | 7 ++++---
 templates/vhost/_serversignature.erb | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 templates/vhost/_serversignature.erb

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0c73e9e21e..00d0de7213 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2391,11 +2391,10 @@
     }
   }
 
-  # Template uses no variables
   concat::fragment { "${name}-serversignature":
     target  => "${priority_real}${filename}.conf",
     order   => 90,
-    content => template('apache/vhost/_serversignature.erb'),
+    content => "  ServerSignature Off\n",
   }
 
   # Template uses:
@@ -2938,7 +2937,9 @@
     }
   }
 
-  # Template uses no variables
+  # Template uses:
+  # - $define
+  # - $passenger_pre_start
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
     order   => 999,
diff --git a/templates/vhost/_serversignature.erb b/templates/vhost/_serversignature.erb
deleted file mode 100644
index ff13aaf452..0000000000
--- a/templates/vhost/_serversignature.erb
+++ /dev/null
@@ -1 +0,0 @@
-  ServerSignature Off

From b7600350b8c6d99fb427c69a9f6e2e1c05beb5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 21 Sep 2023 12:43:24 -1000
Subject: [PATCH 2171/2267] Remove tests related to deprecated parameters

---
 spec/classes/mod/userdir_spec.rb | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/spec/classes/mod/userdir_spec.rb b/spec/classes/mod/userdir_spec.rb
index cad5269ad7..a12d5c02fb 100644
--- a/spec/classes/mod/userdir_spec.rb
+++ b/spec/classes/mod/userdir_spec.rb
@@ -17,28 +17,6 @@
       it { is_expected.to compile }
     end
 
-    context 'with dir set to something' do
-      let :params do
-        {
-          dir: 'hi'
-        }
-      end
-
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/hi$}) }
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*<Directory\s+"/home/\*/hi">$}) }
-    end
-
-    context 'with home set to something' do
-      let :params do
-        {
-          home: '/u'
-        }
-      end
-
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/u/\*/public_html$}) }
-      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*<Directory\s+"/u/\*/public_html">$}) }
-    end
-
     context 'with path set to something' do
       let :params do
         {

From cb2cc16bb292767bb32010de67f7e4f5a7c77575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 21 Sep 2023 12:53:41 -1000
Subject: [PATCH 2172/2267] Remove tests related to deprecated classes

---
 spec/classes/mod/dev_spec.rb | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 spec/classes/mod/dev_spec.rb

diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
deleted file mode 100644
index 4df6caa9cd..0000000000
--- a/spec/classes/mod/dev_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'apache::mod::dev', type: :class do
-  let(:pre_condition) do
-    [
-      'include apache',
-    ]
-  end
-
-  it_behaves_like 'a mod class, without including apache'
-
-  ['RedHat 8', 'Debian 11', 'FreeBSD 9'].each do |os|
-    context "on a #{os} OS" do
-      include_examples os
-
-      it { is_expected.to contain_class('apache::dev') }
-    end
-  end
-end

From a021e2a3fb81796d6d7fda920808b703ce9c26b4 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Fri, 22 Sep 2023 15:34:00 +0530
Subject: [PATCH 2173/2267] (MAINT) - Updating reference.md

---
 REFERENCE.md | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 9413a4848d..d09159549b 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -38,7 +38,6 @@
 * [`apache::mod::dav_svn`](#apache--mod--dav_svn): Installs and configures `mod_dav_svn`.
 * [`apache::mod::dbd`](#apache--mod--dbd): Installs `mod_dbd`.
 * [`apache::mod::deflate`](#apache--mod--deflate): Installs and configures `mod_deflate`.
-* [`apache::mod::dev`](#apache--mod--dev): Installs `mod_dev`.
 * [`apache::mod::dir`](#apache--mod--dir): Installs and configures `mod_dir`.
 * [`apache::mod::disk_cache`](#apache--mod--disk_cache): Installs and configures `mod_disk_cache`.
 * [`apache::mod::dumpio`](#apache--mod--dumpio): Installs and configures `mod_dumpio`.
@@ -122,11 +121,7 @@ pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet
 * `apache::mod::ssl::reload`: Manages the puppet_ssl folder for ssl file copies, which is needed to track changes for reloading service on changes
 * `apache::package`: Installs an Apache MPM.
 * `apache::params`: This class manages Apache parameters
-* `apache::php`: This class installs PHP for Apache.
-* `apache::proxy`: This class enabled the proxy module for Apache.
-* `apache::python`: This class installs Python for Apache
 * `apache::service`: Installs and configures Apache service.
-* `apache::ssl`: This class installs Apache SSL capabilities
 * `apache::version`: Try to automatically detect the version by OS
 
 ### Defined types
@@ -2054,12 +2049,6 @@ Default value:
   }
 ```
 
-### <a name="apache--mod--dev"></a>`apache::mod::dev`
-
-Installs `mod_dev`.
-
-* **Note** This module is deprecated. Please use `apache::dev`.
-
 ### <a name="apache--mod--dir"></a>`apache::mod::dir`
 
 Installs and configures `mod_dir`.
@@ -6761,8 +6750,6 @@ Installs and configures `mod_userdir`.
 
 The following parameters are available in the `apache::mod::userdir` class:
 
-* [`home`](#-apache--mod--userdir--home)
-* [`dir`](#-apache--mod--userdir--dir)
 * [`userdir`](#-apache--mod--userdir--userdir)
 * [`disable_root`](#-apache--mod--userdir--disable_root)
 * [`path`](#-apache--mod--userdir--path)
@@ -6771,22 +6758,6 @@ The following parameters are available in the `apache::mod::userdir` class:
 * [`unmanaged_path`](#-apache--mod--userdir--unmanaged_path)
 * [`custom_fragment`](#-apache--mod--userdir--custom_fragment)
 
-##### <a name="-apache--mod--userdir--home"></a>`home`
-
-Data type: `Optional[String]`
-
-*Deprecated* Path to system home directory.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--userdir--dir"></a>`dir`
-
-Data type: `Optional[String]`
-
-*Deprecated* Path from user's home directory to public directory.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--userdir--userdir"></a>`userdir`
 
 Data type: `Optional[String[1]]`

From 8acab09930d8b695cfc74e883714eeb426bfc29a Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Fri, 22 Sep 2023 18:05:46 +0530
Subject: [PATCH 2174/2267] (CAT-1449) - Cleanup for deprecated content from
 module

---
 REFERENCE.md                       | 178 +--------------
 manifests/init.pp                  |  29 +--
 manifests/mod/passenger.pp         | 346 +----------------------------
 manifests/vhost.pp                 |  37 +--
 spec/acceptance/vhost_spec.rb      |   9 -
 spec/classes/mod/passenger_spec.rb |  39 +---
 spec/defines/vhost_spec.rb         |  10 -
 templates/mod/passenger.conf.epp   |  40 ----
 templates/vhost/_scriptalias.erb   |  14 +-
 9 files changed, 15 insertions(+), 687 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index d09159549b..52d658f0a4 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -75,6 +75,7 @@ mod-pagespeed-stable package. The module does however require that the package b
 or be installable using the system's default package provider.  You should ensure that this
 pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
 * [`apache::mod::passenger`](#apache--mod--passenger): Installs `mod_pasenger`.
+> **Note**: This module support Passenger 4.0.0 and higher.
 * [`apache::mod::perl`](#apache--mod--perl): Installs `mod_perl`.
 * [`apache::mod::peruser`](#apache--mod--peruser): Installs `mod_peruser`.
 * [`apache::mod::php`](#apache--mod--php): Installs `mod_php`.
@@ -217,7 +218,6 @@ The following parameters are available in the `apache` class:
 * [`default_ssl_key`](#-apache--default_ssl_key)
 * [`default_ssl_reload_on_change`](#-apache--default_ssl_reload_on_change)
 * [`default_ssl_vhost`](#-apache--default_ssl_vhost)
-* [`default_type`](#-apache--default_type)
 * [`default_vhost`](#-apache--default_vhost)
 * [`dev_packages`](#-apache--dev_packages)
 * [`docroot`](#-apache--docroot)
@@ -279,7 +279,6 @@ The following parameters are available in the `apache` class:
 * [`limitreqfieldsize`](#-apache--limitreqfieldsize)
 * [`limitreqline`](#-apache--limitreqline)
 * [`ip`](#-apache--ip)
-* [`purge_vdir`](#-apache--purge_vdir)
 * [`conf_enabled`](#-apache--conf_enabled)
 * [`vhost_enable_dir`](#-apache--vhost_enable_dir)
 * [`manage_vhost_enable_dir`](#-apache--manage_vhost_enable_dir)
@@ -463,16 +462,6 @@ apache::vhost { 'default-ssl':
 
 Default value: `false`
 
-##### <a name="-apache--default_type"></a>`default_type`
-
-Data type: `String`
-
-_Apache 2.2 only_. Sets the MIME `content-type` sent if the server cannot otherwise
-determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and
-newer, and is only for backwards compatibility in configuration files.
-
-Default value: `'none'`
-
 ##### <a name="-apache--default_vhost"></a>`default_vhost`
 
 Data type: `Boolean`
@@ -1090,15 +1079,6 @@ Specifies the ip address
 
 Default value: `undef`
 
-##### <a name="-apache--purge_vdir"></a>`purge_vdir`
-
-Data type: `Boolean`
-
-Removes all other Apache configs and virtual hosts.<br />
-> **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.<br />
-
-Default value: `false`
-
 ##### <a name="-apache--conf_enabled"></a>`conf_enabled`
 
 Data type: `Optional[Stdlib::Absolutepath]`
@@ -4515,22 +4495,9 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`passenger_use_global_queue`](#-apache--mod--passenger--passenger_use_global_queue)
 * [`passenger_user`](#-apache--mod--passenger--passenger_user)
 * [`passenger_user_switching`](#-apache--mod--passenger--passenger_user_switching)
-* [`rack_auto_detect`](#-apache--mod--passenger--rack_auto_detect)
-* [`rack_autodetect`](#-apache--mod--passenger--rack_autodetect)
-* [`rack_base_uri`](#-apache--mod--passenger--rack_base_uri)
 * [`rack_env`](#-apache--mod--passenger--rack_env)
-* [`rails_allow_mod_rewrite`](#-apache--mod--passenger--rails_allow_mod_rewrite)
-* [`rails_app_spawner_idle_time`](#-apache--mod--passenger--rails_app_spawner_idle_time)
-* [`rails_auto_detect`](#-apache--mod--passenger--rails_auto_detect)
-* [`rails_autodetect`](#-apache--mod--passenger--rails_autodetect)
-* [`rails_base_uri`](#-apache--mod--passenger--rails_base_uri)
-* [`rails_default_user`](#-apache--mod--passenger--rails_default_user)
 * [`rails_env`](#-apache--mod--passenger--rails_env)
 * [`rails_framework_spawner_idle_time`](#-apache--mod--passenger--rails_framework_spawner_idle_time)
-* [`rails_ruby`](#-apache--mod--passenger--rails_ruby)
-* [`rails_spawn_method`](#-apache--mod--passenger--rails_spawn_method)
-* [`rails_user_switching`](#-apache--mod--passenger--rails_user_switching)
-* [`wsgi_auto_detect`](#-apache--mod--passenger--wsgi_auto_detect)
 
 ##### <a name="-apache--mod--passenger--manage_repo"></a>`manage_repo`
 
@@ -5179,30 +5146,6 @@ Toggles whether to attempt to enable user account sandboxing, also known as user
 
 Default value: `undef`
 
-##### <a name="-apache--mod--passenger--rack_auto_detect"></a>`rack_auto_detect`
-
-Data type: `Optional[String]`
-
-This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rack_autodetect"></a>`rack_autodetect`
-
-Data type: `Optional[String]`
-
-This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rack_base_uri"></a>`rack_base_uri`
-
-Data type: `Optional[String]`
-
-Deprecated in 3.0.0 in favor of PassengerBaseURI.
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--passenger--rack_env"></a>`rack_env`
 
 Data type: `Optional[String]`
@@ -5211,54 +5154,6 @@ Alias for PassengerAppEnv.
 
 Default value: `undef`
 
-##### <a name="-apache--mod--passenger--rails_allow_mod_rewrite"></a>`rails_allow_mod_rewrite`
-
-Data type: `Optional[String]`
-
-This option doesn't do anything anymore since version 4.0.0.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rails_app_spawner_idle_time"></a>`rails_app_spawner_idle_time`
-
-Data type: `Optional[String]`
-
-This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rails_auto_detect"></a>`rails_auto_detect`
-
-Data type: `Optional[String]`
-
-This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rails_autodetect"></a>`rails_autodetect`
-
-Data type: `Optional[String]`
-
-This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rails_base_uri"></a>`rails_base_uri`
-
-Data type: `Optional[String]`
-
-Deprecated in 3.0.0 in favor of PassengerBaseURI.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rails_default_user"></a>`rails_default_user`
-
-Data type: `Optional[String]`
-
-Deprecated in 3.0.0 in favor of PassengerDefaultUser
-
-Default value: `undef`
-
 ##### <a name="-apache--mod--passenger--rails_env"></a>`rails_env`
 
 Data type: `Optional[String]`
@@ -5276,38 +5171,6 @@ altogether. You should use smart spawning instead.
 
 Default value: `undef`
 
-##### <a name="-apache--mod--passenger--rails_ruby"></a>`rails_ruby`
-
-Data type: `Optional[String]`
-
-Deprecated in 3.0.0 in favor of PassengerRuby.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rails_spawn_method"></a>`rails_spawn_method`
-
-Data type: `Optional[String]`
-
-Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--rails_user_switching"></a>`rails_user_switching`
-
-Data type: `Optional[String]`
-
-Deprecated in 3.0.0 in favor of PassengerUserSwitching.
-
-Default value: `undef`
-
-##### <a name="-apache--mod--passenger--wsgi_auto_detect"></a>`wsgi_auto_detect`
-
-Data type: `Optional[String]`
-
-This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-
-Default value: `undef`
-
 ### <a name="apache--mod--perl"></a>`apache::mod::perl`
 
 Installs `mod_perl`.
@@ -7753,7 +7616,6 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`rewrite_cond`](#-apache--vhost--rewrite_cond)
 * [`rewrite_inherit`](#-apache--vhost--rewrite_inherit)
 * [`scriptalias`](#-apache--vhost--scriptalias)
-* [`scriptaliases`](#-apache--vhost--scriptaliases)
 * [`serveradmin`](#-apache--vhost--serveradmin)
 * [`serveraliases`](#-apache--vhost--serveraliases)
 * [`servername`](#-apache--vhost--servername)
@@ -7947,11 +7809,6 @@ a corresponding context, such as `<Directory /path/to/directory>` or
 the `aliases` parameter. As described in the `mod_alias` documentation, add more specific
 `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more
 general ones to avoid shadowing.<BR />
-> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because
-you can precisely control the order of various alias directives. Defining `ScriptAliases`
-using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after
-*all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias`
-directives. This often causes problems; for example, this could cause problems with Nagios.<BR />
 If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias`
 directive might not be able to honor the `PassengerEnabled => off` statement. See
 [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
@@ -9761,39 +9618,6 @@ Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as
 
 Default value: `undef`
 
-##### <a name="-apache--vhost--scriptaliases"></a>`scriptaliases`
-
-Data type: `Array[Hash]`
-
-> **Note**: This parameter is deprecated in favor of the `aliases` parameter.<br />
-Passes an array of hashes to the virtual host to create either ScriptAlias or
-ScriptAliasMatch statements per the `mod_alias` documentation.
-``` puppet
-scriptaliases => [
-  {
-    alias => '/myscript',
-    path  => '/usr/share/myscript',
-  },
-  {
-    aliasmatch => '^/foo(.*)',
-    path       => '/usr/share/fooscripts$1',
-  },
-  {
-    aliasmatch => '^/bar/(.*)',
-    path       => '/usr/share/bar/wrapper.sh/$1',
-  },
-  {
-    alias => '/neatscript',
-    path  => '/usr/share/neatscript',
-  },
-]
-```
-The ScriptAlias and ScriptAliasMatch directives are created in the order specified.
-As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases
-before more general ones to avoid shadowing.
-
-Default value: `[]`
-
 ##### <a name="-apache--vhost--serveradmin"></a>`serveradmin`
 
 Data type: `Optional[String]`
diff --git a/manifests/init.pp b/manifests/init.pp
index dc23d7ab68..4a76ce62d6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -105,11 +105,6 @@
 #   ```
 #   **Note**: SSL virtual hosts only respond to HTTPS queries.
 #
-# @param default_type
-#   _Apache 2.2 only_. Sets the MIME `content-type` sent if the server cannot otherwise 
-#   determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and 
-#   newer, and is only for backwards compatibility in configuration files.
-#
 # @param default_vhost
 #   Configures a default virtual host when the class is declared.<br />
 #   To configure customized virtual hosts, set this parameter's 
@@ -423,10 +418,6 @@
 #
 # @param ip
 #   Specifies the ip address
-#
-# @param purge_vdir
-#   Removes all other Apache configs and virtual hosts.<br />
-#   > **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.<br />
 # 
 # @param conf_enabled
 #   Whether the additional config files in `/etc/apache2/conf-enabled` should be managed.
@@ -472,7 +463,6 @@
   Optional[Stdlib::Absolutepath] $default_ssl_crl                            = undef,
   Optional[String] $default_ssl_crl_check                                    = undef,
   Boolean $default_ssl_reload_on_change                                      = false,
-  String $default_type                                                       = 'none',
   Optional[Variant[Array, String]] $dev_packages                             = $apache::params::dev_packages,
   Optional[String] $ip                                                       = undef,
   Boolean $service_enable                                                    = true,
@@ -481,7 +471,6 @@
   Optional[String] $service_restart                                          = undef,
   Boolean $purge_configs                                                     = true,
   Optional[Boolean] $purge_vhost_dir                                         = undef,
-  Boolean $purge_vdir                                                        = false,
   Optional[String[1]] $serveradmin                                           = undef,
   Apache::OnOff $sendfile                                                    = 'On',
   Optional[Apache::OnOff] $ldap_verify_server_cert                           = undef,
@@ -599,17 +588,9 @@
     service_restart => $service_restart,
   }
 
-  # Deprecated backwards-compatibility
-  if $purge_vdir {
-    warning('Class[\'apache\'] parameter purge_vdir is deprecated in favor of purge_configs')
-    $purge_confd = $purge_vdir
-  } else {
-    $purge_confd = $purge_configs
-  }
-
   # Set purge vhostd appropriately
   if $purge_vhost_dir == undef {
-    $purge_vhostd = $purge_confd
+    $purge_vhostd = $purge_configs
   } else {
     $purge_vhostd = $purge_vhost_dir
   }
@@ -627,8 +608,8 @@
   file { $confd_dir:
     ensure  => directory,
     recurse => true,
-    purge   => $purge_confd,
-    force   => $purge_confd,
+    purge   => $purge_configs,
+    force   => $purge_configs,
     notify  => Class['Apache::Service'],
     require => Package['httpd'],
   }
@@ -637,8 +618,8 @@
     file { $conf_enabled:
       ensure  => directory,
       recurse => true,
-      purge   => $purge_confd,
-      force   => $purge_confd,
+      purge   => $purge_configs,
+      force   => $purge_configs,
       notify  => Class['Apache::Service'],
       require => Package['httpd'],
     }
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 68fcd62abb..73ba399b64 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -1,5 +1,6 @@
 # @summary
 #   Installs `mod_pasenger`.
+#   > **Note**: This module support Passenger 4.0.0 and higher.
 #
 # @param manage_repo
 #   Toggle whether to manage yum repo if on a RedHat node.
@@ -253,36 +254,9 @@
 # @param passenger_user_switching
 #   Toggles whether to attempt to enable user account sandboxing, also known as user switching.
 #
-# @param rack_auto_detect
-#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-#
-# @param rack_autodetect
-#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-#
-# @param rack_base_uri
-#   Deprecated in 3.0.0 in favor of PassengerBaseURI.
-#
 # @param rack_env
 #   Alias for PassengerAppEnv.
 #
-# @param rails_allow_mod_rewrite
-#   This option doesn't do anything anymore since version 4.0.0.
-#
-# @param rails_app_spawner_idle_time
-#   This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.
-#
-# @param rails_auto_detect
-#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-#
-# @param rails_autodetect
-#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-#
-# @param rails_base_uri
-#   Deprecated in 3.0.0 in favor of PassengerBaseURI.
-#
-# @param rails_default_user
-#   Deprecated in 3.0.0 in favor of PassengerDefaultUser
-#
 # @param rails_env
 #   Alias for PassengerAppEnv.
 #
@@ -290,18 +264,6 @@
 #   This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed 
 #   altogether. You should use smart spawning instead.
 #
-# @param rails_ruby
-#   Deprecated in 3.0.0 in favor of PassengerRuby.
-#
-# @param rails_spawn_method
-#   Deprecated in 3.0.0 in favor of PassengerSpawnMethod.
-#
-# @param rails_user_switching
-#   Deprecated in 3.0.0 in favor of PassengerUserSwitching.
-#
-# @param wsgi_auto_detect
-#   This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.
-#
 # @note 
 #   In Passenger source code you can strip out what are all the available options by looking in
 #     - src/apache2_module/Configuration.cpp
@@ -401,75 +363,27 @@
   Optional[String] $passenger_use_global_queue                                               = undef,
   Optional[String] $passenger_user                                                           = undef,
   Optional[Apache::OnOff] $passenger_user_switching                                          = undef,
-  Optional[String] $rack_auto_detect                                                         = undef,
-  Optional[String] $rack_autodetect                                                          = undef,
-  Optional[String] $rack_base_uri                                                            = undef,
   Optional[String] $rack_env                                                                 = undef,
-  Optional[String] $rails_allow_mod_rewrite                                                  = undef,
-  Optional[String] $rails_app_spawner_idle_time                                              = undef,
-  Optional[String] $rails_auto_detect                                                        = undef,
-  Optional[String] $rails_autodetect                                                         = undef,
-  Optional[String] $rails_base_uri                                                           = undef,
-  Optional[String] $rails_default_user                                                       = undef,
   Optional[String] $rails_env                                                                = undef,
   Optional[String] $rails_framework_spawner_idle_time                                        = undef,
-  Optional[String] $rails_ruby                                                               = undef,
-  Optional[String] $rails_spawn_method                                                       = undef,
-  Optional[String] $rails_user_switching                                                     = undef,
-  Optional[String] $wsgi_auto_detect                                                         = undef,
 ) inherits apache::params {
   include apache
   if $passenger_installed_version {
-    if $passenger_allow_encoded_slashes {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_allow_encoded_slashes is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_anonymous_telemetry_proxy {
       if (versioncmp($passenger_installed_version, '6.0.0') < 0) {
         fail("Passenger config option :: passenger_anonymous_telemetry_proxy is not introduced until version 6.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_app_env {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_app_env is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_app_group_name {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_app_group_name is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_app_root {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_app_root is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_app_type {
       if (versioncmp($passenger_installed_version, '4.0.25') < 0) {
         fail("Passenger config option :: passenger_app_type is not introduced until version 4.0.25 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_base_uri {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_base_uri is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_buffer_response {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_buffer_response is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_buffer_upload {
       if (versioncmp($passenger_installed_version, '4.0.26') < 0) {
         fail("Passenger config option :: passenger_buffer_upload is not introduced until version 4.0.26 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_concurrency_model {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_concurrency_model is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_data_buffer_dir {
       if (versioncmp($passenger_installed_version, '5.0.0') < 0) {
         fail("Passenger config option :: passenger_data_buffer_dir is not introduced until version 5.0.0 :: ${passenger_installed_version} is the version reported")
@@ -480,26 +394,6 @@
         warning('DEPRECATED PASSENGER OPTION :: passenger_debug_log_file :: This option has been renamed in version 5.0.5 to PassengerLogFile.')
       }
     }
-    if $passenger_debugger {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_debugger is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_default_group {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_default_group is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_default_ruby {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_default_ruby is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_default_user {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_default_user is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_disable_anonymous_telemetry {
       if (versioncmp($passenger_installed_version, '6.0.0') < 0) {
         fail("Passenger config option :: passenger_disable_anonymous_telemetry is not introduced until version 6.0.0 :: ${passenger_installed_version} is the version reported")
@@ -515,11 +409,6 @@
         fail("Passenger config option :: passenger_disable_security_update_check is not introduced until version 5.1.0 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_enabled {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_enabled is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_error_override {
       if (versioncmp($passenger_installed_version, '4.0.24') < 0) {
         fail("Passenger config option :: passenger_error_override is not introduced until version 4.0.24 :: ${passenger_installed_version} is the version reported")
@@ -545,16 +434,6 @@
         fail("Passenger config option :: passenger_friendly_error_pages is not introduced until version 4.0.42 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_group {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_group is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_high_performance {
-      if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
-        fail("Passenger config option :: passenger_high_performance is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_instance_registry_dir {
       if (versioncmp($passenger_installed_version, '5.0.0') < 0) {
         fail("Passenger config option :: passenger_instance_registry_dir is not introduced until version 5.0.0 :: ${passenger_installed_version} is the version reported")
@@ -575,121 +454,31 @@
         fail("Passenger config option :: passenger_log_file is not introduced until version 5.0.5 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_log_level {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_log_level is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_lve_min_uid {
       if (versioncmp($passenger_installed_version, '5.0.28') < 0) {
         fail("Passenger config option :: passenger_lve_min_uid is not introduced until version 5.0.28 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_max_instances {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_max_instances is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_max_instances_per_app {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_max_instances_per_app is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_max_pool_size {
-      if (versioncmp($passenger_installed_version, '1.0.0') < 0) {
-        fail("Passenger config option :: passenger_max_pool_size is not introduced until version 1.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_max_preloader_idle_time {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_max_preloader_idle_time is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_max_request_queue_size {
       if (versioncmp($passenger_installed_version, '4.0.15') < 0) {
         fail("Passenger config option :: passenger_max_request_queue_size is not introduced until version 4.0.15 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_max_request_time {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_max_request_time is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_max_requests {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_max_requests is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_memory_limit {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_memory_limit is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_meteor_app_settings {
       if (versioncmp($passenger_installed_version, '5.0.7') < 0) {
         fail("Passenger config option :: passenger_meteor_app_settings is not introduced until version 5.0.7 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_min_instances {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_min_instances is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_nodejs {
       if (versioncmp($passenger_installed_version, '4.0.24') < 0) {
         fail("Passenger config option :: passenger_nodejs is not introduced until version 4.0.24 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_pool_idle_time {
-      if (versioncmp($passenger_installed_version, '1.0.0') < 0) {
-        fail("Passenger config option :: passenger_pool_idle_time is not introduced until version 1.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_pre_start {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_pre_start is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_python {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_python is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_resist_deployment_errors {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_resist_deployment_errors is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_resolve_symlinks_in_document_root {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_resolve_symlinks_in_document_root is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_response_buffer_high_watermark {
       if (versioncmp($passenger_installed_version, '5.0.0') < 0) {
         fail("Passenger config option :: passenger_response_buffer_high_watermark is not introduced until version 5.0.0 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_restart_dir {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_restart_dir is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_rolling_restarts {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_rolling_restarts is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_root {
-      if (versioncmp($passenger_installed_version, '1.0.0') < 0) {
-        fail("Passenger config option :: passenger_root is not introduced until version 1.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_ruby {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_ruby is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_security_update_check_proxy {
       if (versioncmp($passenger_installed_version, '5.1.0') < 0) {
         fail("Passenger config option :: passenger_security_update_check_proxy is not introduced until version 5.1.0 :: ${passenger_installed_version} is the version reported")
@@ -710,11 +499,6 @@
         fail("Passenger config option :: passenger_spawn_dir is not introduced until version 6.0.3 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_spawn_method {
-      if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
-        fail("Passenger config option :: passenger_spawn_method is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_start_timeout {
       if (versioncmp($passenger_installed_version, '4.0.15') < 0) {
         fail("Passenger config option :: passenger_start_timeout is not introduced until version 4.0.15 :: ${passenger_installed_version} is the version reported")
@@ -725,11 +509,6 @@
         fail("Passenger config option :: passenger_startup_file is not introduced until version 4.0.25 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_stat_throttle_rate {
-      if (versioncmp($passenger_installed_version, '2.2.0') < 0) {
-        fail("Passenger config option :: passenger_stat_throttle_rate is not introduced until version 2.2.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
     if $passenger_sticky_sessions {
       if (versioncmp($passenger_installed_version, '4.0.45') < 0) {
         fail("Passenger config option :: passenger_sticky_sessions is not introduced until version 4.0.45 :: ${passenger_installed_version} is the version reported")
@@ -745,99 +524,6 @@
         fail("Passenger config option :: passenger_sticky_sessions_cookie_attributes is not introduced until version 6.0.5 :: ${passenger_installed_version} is the version reported")
       }
     }
-    if $passenger_thread_count {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_thread_count is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_use_global_queue {
-      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail('REMOVED PASSENGER OPTION :: passenger_use_global_queue :: -- no message on the current passenger reference webpage -- ')
-      }
-      if (versioncmp($passenger_installed_version, '2.0.4') < 0) {
-        fail("Passenger config option :: passenger_use_global_queue is not introduced until version 2.0.4 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_user {
-      if (versioncmp($passenger_installed_version, '4.0.0') < 0) {
-        fail("Passenger config option :: passenger_user is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $passenger_user_switching {
-      if (versioncmp($passenger_installed_version, '3.0.0') < 0) {
-        fail("Passenger config option :: passenger_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if ($rack_auto_detect or $rack_autodetect) {
-      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail('REMOVED PASSENGER OPTION :: rack_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
-      }
-    }
-    if $rack_base_uri {
-      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning('DEPRECATED PASSENGER OPTION :: rack_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.')
-      }
-    }
-    if $rack_env {
-      if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
-        fail("Passenger config option :: rack_env is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $rails_allow_mod_rewrite {
-      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        warning("DEPRECATED PASSENGER OPTION :: rails_allow_mod_rewrite :: This option doesn't do anything anymore in since version 4.0.0.")
-      }
-    }
-    if $rails_app_spawner_idle_time {
-      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail('REMOVED PASSENGER OPTION :: rails_app_spawner_idle_time ::  This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.')
-      }
-    }
-    if ($rails_auto_detect or $rails_autodetect) {
-      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail('REMOVED PASSENGER OPTION :: rails_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
-      }
-    }
-    if $rails_base_uri {
-      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning('DEPRECATED PASSENGER OPTION :: rails_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.')
-      }
-    }
-    if $rails_default_user {
-      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning('DEPRECATED PASSENGER OPTION :: rails_default_user :: Deprecated in 3.0.0 in favor of PassengerDefaultUser.')
-      }
-    }
-    if $rails_env {
-      if (versioncmp($passenger_installed_version, '2.0.0') < 0) {
-        fail("Passenger config option :: rails_env is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported")
-      }
-    }
-    if $rails_framework_spawner_idle_time {
-      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail('REMOVED PASSENGER OPTION :: rails_framework_spawner_idle_time ::  This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.')
-      }
-    }
-    if $rails_ruby {
-      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning('DEPRECATED PASSENGER OPTION :: rails_ruby :: Deprecated in 3.0.0 in favor of PassengerRuby.')
-      }
-    }
-    if $rails_spawn_method {
-      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning('DEPRECATED PASSENGER OPTION :: rails_spawn_method :: Deprecated in 3.0.0 in favor of PassengerSpawnMethod.')
-      }
-    }
-    if $rails_user_switching {
-      if (versioncmp($passenger_installed_version, '3.0.0') > 0) {
-        warning('DEPRECATED PASSENGER OPTION :: rails_user_switching :: Deprecated in 3.0.0 in favor of PassengerUserSwitching.')
-      }
-    }
-    if $wsgi_auto_detect {
-      if (versioncmp($passenger_installed_version, '4.0.0') > 0) {
-        fail('REMOVED PASSENGER OPTION :: wsgi_auto_detect ::  These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.')
-      }
-    }
   }
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
@@ -963,22 +649,7 @@
   # - $passenger_use_global_queue : since 2.0.4.Deprecated in 4.0.0.
   # - $passenger_user : since 4.0.0.
   # - $passenger_user_switching : since 3.0.0.
-  # - $rack_auto_detect : since unkown. Deprecated in 4.0.0.
-  # - $rack_base_uri : since unkown. Deprecated in 3.0.0.
-  # - $rack_env : since 2.0.0.
-  # - $rails_allow_mod_rewrite : since unkown. Deprecated in 4.0.0.
-  # - $rails_app_spawner_idle_time : since unkown. Deprecated in 4.0.0.
-  # - $rails_auto_detect : since unkown. Deprecated in 4.0.0.
-  # - $rails_base_uri : since unkown. Deprecated in 3.0.0.
-  # - $rails_default_user : since unkown. Deprecated in 3.0.0.
-  # - $rails_env : since 2.0.0.
-  # - $rails_framework_spawner_idle_time : since unkown. Deprecated in 4.0.0.
-  # - $rails_ruby : since unkown. Deprecated in 3.0.0.
-  # - $rails_spawn_method : since unkown. Deprecated in 3.0.0.
-  # - $rails_user_switching : since unkown. Deprecated in 3.0.0.
-  # - $wsgi_auto_detect : since unkown. Deprecated in 4.0.0.
-  # - $rails_autodetect : this options is only for backward compatiblity with older versions of this class
-  # - $rack_autodetect : this options is only for backward compatiblity with older versions of this class
+
   $parameters = {
     'passenger_allow_encoded_slashes'                     => $passenger_allow_encoded_slashes,
     'passenger_anonymous_telemetry_proxy'                 => $passenger_anonymous_telemetry_proxy,
@@ -1049,22 +720,9 @@
     'passenger_use_global_queue'                          => $passenger_use_global_queue,
     'passenger_user'                                      => $passenger_user,
     'passenger_user_switching'                            => $passenger_user_switching,
-    'rack_auto_detect'                                    => $rack_auto_detect,
-    'rack_base_uri'                                       => $rack_base_uri,
     'rack_env'                                            => $rack_env,
-    'rails_allow_mod_rewrite'                             => $rails_allow_mod_rewrite,
-    'rails_app_spawner_idle_time'                         => $rails_app_spawner_idle_time,
-    'rails_auto_detect'                                   => $rails_auto_detect,
-    'rails_base_uri'                                      => $rails_base_uri,
-    'rails_default_user'                                  => $rails_default_user,
     'rails_env'                                           => $rails_env,
     'rails_framework_spawner_idle_time'                   => $rails_framework_spawner_idle_time,
-    'rails_ruby'                                          => $rails_ruby,
-    'rails_spawn_method'                                  => $rails_spawn_method,
-    'rails_user_switching'                                => $rails_user_switching,
-    'wsgi_auto_detect'                                    => $wsgi_auto_detect,
-    'rails_autodetect'                                    => $rails_autodetect,
-    'rack_autodetect'                                     => $rack_autodetect,
   }
 
   file { 'passenger.conf':
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 00d0de7213..034ea36873 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -96,11 +96,6 @@
 #   the `aliases` parameter. As described in the `mod_alias` documentation, add more specific 
 #   `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more 
 #   general ones to avoid shadowing.<BR />
-#   > **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because 
-#   you can precisely control the order of various alias directives. Defining `ScriptAliases` 
-#   using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after 
-#   *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` 
-#   directives. This often causes problems; for example, this could cause problems with Nagios.<BR />
 #   If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias` 
 #   directive might not be able to honor the `PassengerEnabled => off` statement. See 
 #   [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
@@ -1095,34 +1090,6 @@
 #   Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as 
 #   '/usr/scripts'.
 #
-# @param scriptaliases
-#   > **Note**: This parameter is deprecated in favor of the `aliases` parameter.<br />
-#   Passes an array of hashes to the virtual host to create either ScriptAlias or 
-#   ScriptAliasMatch statements per the `mod_alias` documentation.
-#   ``` puppet
-#   scriptaliases => [
-#     {
-#       alias => '/myscript',
-#       path  => '/usr/share/myscript',
-#     },
-#     {
-#       aliasmatch => '^/foo(.*)',
-#       path       => '/usr/share/fooscripts$1',
-#     },
-#     {
-#       aliasmatch => '^/bar/(.*)',
-#       path       => '/usr/share/bar/wrapper.sh/$1',
-#     },
-#     {
-#       alias => '/neatscript',
-#       path  => '/usr/share/neatscript',
-#     },
-#   ]
-#   ```
-#   The ScriptAlias and ScriptAliasMatch directives are created in the order specified. 
-#   As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases 
-#   before more general ones to avoid shadowing.
-#
 # @param serveradmin
 #   Specifies the email address Apache displays when it renders one of its error pages.
 #
@@ -1811,7 +1778,6 @@
   Variant[Array[Hash], String] $error_documents                                       = [],
   Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource         = undef,
   Optional[String] $scriptalias                                                       = undef,
-  Array[Hash] $scriptaliases                                                          = [],
   Optional[Integer] $limitreqfieldsize                                                = undef,
   Optional[Integer] $limitreqfields                                                   = undef,
   Optional[Integer] $limitreqline                                                     = undef,
@@ -2552,9 +2518,8 @@
   }
 
   # Template uses:
-  # - $scriptaliases
   # - $scriptalias
-  if ($scriptalias or !empty($scriptaliases)) and $ensure == 'present' {
+  if $scriptalias and $ensure == 'present' {
     include apache::mod::alias
 
     concat::fragment { "${name}-scriptalias":
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 33ef85e21e..c49d993556 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -816,10 +816,6 @@ class { 'apache': }
         docroot    => '/tmp',
         proxy_dest => 'http://testproxy',
       }
-      apache::vhost { 'test.scriptaliases':
-        docroot    => '/tmp',
-        scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
-      }
       apache::vhost { 'test.aliases':
         docroot    => '/tmp',
         aliases => [
@@ -930,11 +926,6 @@ class { 'apache': }
       it { is_expected.to contain 'ProxyPass        / http://testproxy/' }
     end
 
-    describe file("#{apache_hash['vhost_dir']}/25-test.scriptaliases.conf") do
-      it { is_expected.to be_file }
-      it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
-    end
-
     describe file("#{apache_hash['vhost_dir']}/25-test.aliases.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'Alias /image "/ftp/pub/image"' }
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 2805e8c53c..f974ff378c 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -94,22 +94,9 @@
             'passenger_use_global_queue' => { type: 'String', pass_opt: :PassengerUseGlobalQueue },
             'passenger_user' => { type: 'String', pass_opt: :PassengerUser },
             'passenger_user_switching' => { type: 'OnOff', pass_opt: :PassengerUserSwitching },
-            'rack_auto_detect' => { type: 'String', pass_opt: :RackAutoDetect },
-            'rack_autodetect' => { type: 'String', pass_opt: :RackAutoDetect },
-            'rack_base_uri' => { type: 'String', pass_opt: :RackBaseURI },
             'rack_env' => { type: 'String', pass_opt: :RackEnv },
-            'rails_allow_mod_rewrite' => { type: 'String', pass_opt: :RailsAllowModRewrite },
-            'rails_app_spawner_idle_time' => { type: 'String', pass_opt: :RailsAppSpawnerIdleTime },
-            'rails_auto_detect' => { type: 'String', pass_opt: :RailsAutoDetect },
-            'rails_autodetect' => { type: 'String', pass_opt: :RailsAutoDetect },
-            'rails_base_uri' => { type: 'String', pass_opt: :RailsBaseURI },
-            'rails_default_user' => { type: 'String', pass_opt: :RailsDefaultUser },
             'rails_env' => { type: 'String', pass_opt: :RailsEnv },
-            'rails_framework_spawner_idle_time' => { type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime },
-            'rails_ruby' => { type: 'String', pass_opt: :RailsRuby },
-            'rails_spawn_method' => { type: 'String', pass_opt: :RailsSpawnMethod },
-            'rails_user_switching' => { type: 'String', pass_opt: :RailsUserSwitching },
-            'wsgi_auto_detect' => { type: 'String', pass_opt: :WsgiAutoDetect }
+            'rails_framework_spawner_idle_time' => { type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime }
           }
           passenger_config_options.each do |config_option, config_hash|
             puppetized_config_option = config_option
@@ -230,8 +217,8 @@
           describe 'fails when an option is removed' do
             let :params do
               {
-                passenger_installed_version: '5.0.0',
-                rails_autodetect: 'on'
+                passenger_installed_version: '5.3.0',
+                passenger_resist_deployment_errors: 'on'
               }
             end
 
@@ -241,8 +228,8 @@
           describe 'warns when an option is deprecated' do
             let :params do
               {
-                passenger_installed_version: '5.0.0',
-                rails_ruby: '/some/path/to/ruby'
+                passenger_installed_version: '5.1.0',
+                passenger_debug_log_file: '/some/path/to/log'
               }
             end
 
@@ -346,22 +333,6 @@
           it { is_expected.to contain_file('passenger.conf').with_content(%r{^  PassengerMaxInstancesPerApp 8$}) }
         end
 
-        describe 'with rack_autodetect => on' do
-          let :params do
-            { rack_autodetect: 'on' }
-          end
-
-          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RackAutoDetect on$}) }
-        end
-
-        describe 'with rails_autodetect => on' do
-          let :params do
-            { rails_autodetect: 'on' }
-          end
-
-          it { is_expected.to contain_file('passenger.conf').with_content(%r{^  RailsAutoDetect on$}) }
-        end
-
         describe 'with passenger_use_global_queue => on' do
           let :params do
             { passenger_use_global_queue: 'on' }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 4fa39cf40f..5f6172e21a 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -324,16 +324,6 @@
               'error_documents' => 'true',
               'fallbackresource' => '/index.php',
               'scriptalias' => '/usr/lib/cgi-bin',
-              'scriptaliases' => [
-                {
-                  'alias' => '/myscript',
-                  'path' => '/usr/share/myscript'
-                },
-                {
-                  'aliasmatch' => '^/foo(.*)',
-                  'path' => '/usr/share/fooscripts$1'
-                },
-              ],
               'limitreqfieldsize' => 8190,
               'limitreqfields' => 100,
               'limitreqline' => 8190,
diff --git a/templates/mod/passenger.conf.epp b/templates/mod/passenger.conf.epp
index e550805506..7c02547c33 100644
--- a/templates/mod/passenger.conf.epp
+++ b/templates/mod/passenger.conf.epp
@@ -210,53 +210,13 @@
   <%- if $passenger_user_switching { -%>
   PassengerUserSwitching <%= $passenger_user_switching %>
   <%- } -%>
-  <%- if $rack_auto_detect { -%>
-  RackAutoDetect <%= $rack_auto_detect %>
-  <%- } -%>
-  <%- if $rack_base_uri { -%>
-  RackBaseURI <%= $rack_base_uri %>
-  <%- } -%>
   <%- if $rack_env { -%>
   RackEnv <%= $rack_env %>
   <%- } -%>
-  <%- if $rails_allow_mod_rewrite { -%>
-  RailsAllowModRewrite <%= $rails_allow_mod_rewrite %>
-  <%- } -%>
-  <%- if $rails_app_spawner_idle_time { -%>
-  RailsAppSpawnerIdleTime <%= $rails_app_spawner_idle_time %>
-  <%- } -%>
-  <%- if $rails_auto_detect { -%>
-  RailsAutoDetect <%= $rails_auto_detect %>
-  <%- } -%>
-  <%- if $rails_base_uri { -%>
-  RailsBaseURI <%= $rails_base_uri %>
-  <%- } -%>
-  <%- if $rails_default_user { -%>
-  RailsDefaultUser <%= $rails_default_user %>
-  <%- } -%>
   <%- if $rails_env { -%>
   RailsEnv <%= $rails_env %>
   <%- } -%>
   <%- if $rails_framework_spawner_idle_time { -%>
   RailsFrameworkSpawnerIdleTime <%= $rails_framework_spawner_idle_time %>
   <%- } -%>
-  <%- if $rails_ruby { -%>
-  RailsRuby <%= $rails_ruby %>
-  <%- } -%>
-  <%- if $rails_spawn_method { -%>
-  RailsSpawnMethod <%= $rails_spawn_method %>
-  <%- } -%>
-  <%- if $rails_user_switching { -%>
-  RailsUserSwitching <%= $rails_user_switching %>
-  <%- } -%>
-  <%- if $wsgi_auto_detect { -%>
-  WsgiAutoDetect <%= $wsgi_auto_detect %>
-  <%- } -%>
-  <%- if $rails_autodetect { -%>
-  RailsAutoDetect <%= $rails_autodetect %>
-  <%- } -%>
-  <%- if $rack_autodetect { -%>
-  RackAutoDetect <%= $rack_autodetect %>
-  <%- } -%>
-
 </IfModule>
diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb
index ffa69f932e..b262d25085 100644
--- a/templates/vhost/_scriptalias.erb
+++ b/templates/vhost/_scriptalias.erb
@@ -1,14 +1,2 @@
-<%- aliases = @scriptaliases -%>
   ## Script alias directives
-<%# Combine scriptalias and scriptaliases into a single data structure -%>
-<%# for backward compatibility and ease of implementation -%>
-<%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%>
-<%- aliases.each do |salias| -%>
-  <%- if salias["path"] != '' -%>
-    <%- if salias["alias"] and salias["alias"] != '' -%>
-  ScriptAlias <%= salias['alias'] %> "<%= salias['path'] %>"
-    <%- elsif salias["aliasmatch"] and salias["aliasmatch"] != '' -%>
-  ScriptAliasMatch <%= salias['aliasmatch'] %> "<%= salias['path'] %>"
-    <%- end -%>
-  <%- end -%>
-<%- end -%>
+  ScriptAlias /cgi-bin "<%= @scriptalias %>"

From 8426bcd48430952994ed24f82e7e54a85d02838e Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Fri, 22 Sep 2023 22:51:09 +0530
Subject: [PATCH 2175/2267] Removing passenger_use_global_queue ref

---
 manifests/mod/passenger.pp         |  1 -
 spec/classes/mod/passenger_spec.rb | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 73ba399b64..c0c3a9df1d 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -646,7 +646,6 @@
   # - $passenger_sticky_sessions : since 4.0.45.
   # - $passenger_sticky_sessions_cookie_name : since 4.0.45.
   # - $passenger_thread_count : since 4.0.0.
-  # - $passenger_use_global_queue : since 2.0.4.Deprecated in 4.0.0.
   # - $passenger_user : since 4.0.0.
   # - $passenger_user_switching : since 3.0.0.
 
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index f974ff378c..3c35f4e742 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -214,16 +214,16 @@
             it { is_expected.to raise_error(%r{passenger_instance_registry_dir is not introduced until version 5.0.0}) }
           end
 
-          describe 'fails when an option is removed' do
-            let :params do
-              {
-                passenger_installed_version: '5.3.0',
-                passenger_resist_deployment_errors: 'on'
-              }
-            end
-
-            it { is_expected.to raise_error(%r{REMOVED PASSENGER OPTION}) }
-          end
+          # describe 'fails when an option is removed' do
+          #   let :params do
+          #     {
+          #       passenger_installed_version: '5.3.0',
+          #       passenger_resist_deployment_errors: 'on'
+          #     }
+          #   end
+
+          #   it { is_expected.to raise_error(%r{REMOVED PASSENGER OPTION}) }
+          # end
 
           describe 'warns when an option is deprecated' do
             let :params do

From 0529ab639b9831cb010bc30fa8489a430d6fe1f3 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Fri, 22 Sep 2023 18:44:36 +0000
Subject: [PATCH 2176/2267] Release prep v11.0.0

---
 CHANGELOG.md  | 44 ++++++++++++++++++++++++++++++++++++--------
 metadata.json |  2 +-
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ccee3c0b6..331390d98f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,37 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v11.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v11.0.0) - 2023-09-22
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v10.1.1...v11.0.0)
+
+### Added
+
+- (CAT-1417) Nested require support for authz_core mod [#2460](https://github.com/puppetlabs/puppetlabs-apache/pull/2460) ([Ramesh7](https://github.com/Ramesh7))
+- Simplify data types and array handling [#2457](https://github.com/puppetlabs/puppetlabs-apache/pull/2457) ([ekohl](https://github.com/ekohl))
+- CAT-1285 - RHEL-8 mode security CRS fix [#2452](https://github.com/puppetlabs/puppetlabs-apache/pull/2452) ([Ramesh7](https://github.com/Ramesh7))
+- (CAT-1283) - Enable forensic module [#2442](https://github.com/puppetlabs/puppetlabs-apache/pull/2442) ([Ramesh7](https://github.com/Ramesh7))
+- (CAT-1281) - Support to add cipher with respective ssl protocol [#2440](https://github.com/puppetlabs/puppetlabs-apache/pull/2440) ([Ramesh7](https://github.com/Ramesh7))
+- feat: add Debian12 Compability [#2439](https://github.com/puppetlabs/puppetlabs-apache/pull/2439) ([Robnarok](https://github.com/Robnarok))
+- Add MellonSetEnv support [#2423](https://github.com/puppetlabs/puppetlabs-apache/pull/2423) ([ic248](https://github.com/ic248))
+- Add the missing mod_authnz_ldap parameters [#2404](https://github.com/puppetlabs/puppetlabs-apache/pull/2404) ([chutzimir](https://github.com/chutzimir))
+
+### Changed
+- (CAT-1449) - Remove deprecated parameters for scriptaliases & passenger [#2470](https://github.com/puppetlabs/puppetlabs-apache/pull/2470) ([Ramesh7](https://github.com/Ramesh7))
+- Remove deprecated classes [#2466](https://github.com/puppetlabs/puppetlabs-apache/pull/2466) ([ekohl](https://github.com/ekohl))
+- Remove deprecated parameters from mod::userdir [#2465](https://github.com/puppetlabs/puppetlabs-apache/pull/2465) ([ekohl](https://github.com/ekohl))
+- (CAT-1424)-Removal of redhat/scientific/oraclelinux 6 for apache module [#2462](https://github.com/puppetlabs/puppetlabs-apache/pull/2462) ([praj1001](https://github.com/praj1001))
+
+### Fixed
+
+- (CAT-1308) Making mod list more restrictive and minor improvements in documentation for default mods override [#2459](https://github.com/puppetlabs/puppetlabs-apache/pull/2459) ([Ramesh7](https://github.com/Ramesh7))
+- (CAT-1346) erb_to_epp conversion for mod directory [#2453](https://github.com/puppetlabs/puppetlabs-apache/pull/2453) ([praj1001](https://github.com/praj1001))
+- (CAT-1348)-Conversion of erb to epp templates except mod or vhost dir… [#2449](https://github.com/puppetlabs/puppetlabs-apache/pull/2449) ([praj1001](https://github.com/praj1001))
+- Raise Puppet lower bound to >= 7.9.0 [#2444](https://github.com/puppetlabs/puppetlabs-apache/pull/2444) ([ekohl](https://github.com/ekohl))
+- (CAT-1261)-update_SUSE_repo_name [#2437](https://github.com/puppetlabs/puppetlabs-apache/pull/2437) ([praj1001](https://github.com/praj1001))
+- Add required package for kerberos auth on jammy [#2403](https://github.com/puppetlabs/puppetlabs-apache/pull/2403) ([chrisongthb](https://github.com/chrisongthb))
+- strickter loglevel syntax verification [#2397](https://github.com/puppetlabs/puppetlabs-apache/pull/2397) ([igt-marcin-wasilewski](https://github.com/igt-marcin-wasilewski))
+
 ## [v10.1.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v10.1.1) - 2023-06-30
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v10.1.0...v10.1.1)
@@ -314,7 +345,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Added
 
-- The default disk_cache.conf.epp caches everything.  [#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
+- The default disk_cache.conf.erb caches everything.  [#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
 
 ## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) - 2021-05-24
 
@@ -664,7 +695,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
-- Actually create CASScrubRequestHeaders setting in _auth_cas.erb [#1730](https://github.com/puppetlabs/puppetlabs-apache/pull/1730) ([](https://github.com/))
 - Fix typos [#1728](https://github.com/puppetlabs/puppetlabs-apache/pull/1728) ([hfm](https://github.com/hfm))
 - [MODULES-5644] Package name is libapache2-mpm-itk for Debian 9 [#1724](https://github.com/puppetlabs/puppetlabs-apache/pull/1724) ([zivis](https://github.com/zivis))
 - Fix case of setting apache::mpm_module to false [#1720](https://github.com/puppetlabs/puppetlabs-apache/pull/1720) ([edestecd](https://github.com/edestecd))
@@ -877,6 +907,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - MODULES-2179: Implement SetEnvIfNoCase [#1402](https://github.com/puppetlabs/puppetlabs-apache/pull/1402) ([jlambert121](https://github.com/jlambert121))
 - Load mod_xml2enc on Apache >= 2.4 on Debian [#1401](https://github.com/puppetlabs/puppetlabs-apache/pull/1401) ([sathieu](https://github.com/sathieu))
 - Take igalic's suggestion to use bool2httpd [#1400](https://github.com/puppetlabs/puppetlabs-apache/pull/1400) ([tpdownes](https://github.com/tpdownes))
+- Added vhost option fastcgi_idle_timeout [#1399](https://github.com/puppetlabs/puppetlabs-apache/pull/1399) ([michakrause](https://github.com/michakrause))
 - Move all ensure parameters from concat::fragment to concat [#1396](https://github.com/puppetlabs/puppetlabs-apache/pull/1396) ([domcleal](https://github.com/domcleal))
 - mod_ssl requires mod_mime for AddType directives [#1394](https://github.com/puppetlabs/puppetlabs-apache/pull/1394) ([sathieu](https://github.com/sathieu))
 - Allow configuring mod_security's SecAuditLogParts [#1392](https://github.com/puppetlabs/puppetlabs-apache/pull/1392) ([stig](https://github.com/stig))
@@ -995,7 +1026,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - (MODULES-2764) Enclose IPv6 addresses in square brackets [#1248](https://github.com/puppetlabs/puppetlabs-apache/pull/1248) ([Benedikt1992](https://github.com/Benedikt1992))
 - (MODULES-2757) Adding if around ServerName in template [#1237](https://github.com/puppetlabs/puppetlabs-apache/pull/1237) ([damonconway](https://github.com/damonconway))
 - (MODULES-2651) Default document root update for Ubuntu 14.04 and Debian 8 [#1235](https://github.com/puppetlabs/puppetlabs-apache/pull/1235) ([abednarik](https://github.com/abednarik))
-- Update mime.conf.epp to support dynamic AddHandler AddType AddOutputF… [#1232](https://github.com/puppetlabs/puppetlabs-apache/pull/1232) ([prabin5](https://github.com/prabin5))
+- Update mime.conf.erb to support dynamic AddHandler AddType AddOutputF… [#1232](https://github.com/puppetlabs/puppetlabs-apache/pull/1232) ([prabin5](https://github.com/prabin5))
 - #2544 Allow multiple IP addresses per vhost [#1229](https://github.com/puppetlabs/puppetlabs-apache/pull/1229) ([Benedikt1992](https://github.com/Benedikt1992))
 - RewriteLock support [#1228](https://github.com/puppetlabs/puppetlabs-apache/pull/1228) ([wickedOne](https://github.com/wickedOne))
 - (MODULES-2120) Allow empty docroot [#1224](https://github.com/puppetlabs/puppetlabs-apache/pull/1224) ([DavidS](https://github.com/DavidS))
@@ -1051,6 +1082,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - [#puppethack] Adding ability to enable/disable the secruleengine through a parameter [#1168](https://github.com/puppetlabs/puppetlabs-apache/pull/1168) ([igalic](https://github.com/igalic))
 - add possibility to set icons_path to false so no alias will be set for it [#1160](https://github.com/puppetlabs/puppetlabs-apache/pull/1160) ([tjikkun](https://github.com/tjikkun))
+- apache::vhost filter support [#1143](https://github.com/puppetlabs/puppetlabs-apache/pull/1143) ([BIAndrews](https://github.com/BIAndrews))
+- Add the ability to specify GeoIPScanProxyHeaderField for mod_geoip [#1128](https://github.com/puppetlabs/puppetlabs-apache/pull/1128) ([dgarbus](https://github.com/dgarbus))
 - Add ssl_openssl_conf_cmd param (apache::mod::ssl and apache::vhost) [#1127](https://github.com/puppetlabs/puppetlabs-apache/pull/1127) ([tmuellerleile](https://github.com/tmuellerleile))
 
 ### Fixed
@@ -1059,11 +1092,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Debian 7 acceptance test fix [#1161](https://github.com/puppetlabs/puppetlabs-apache/pull/1161) ([bmjen](https://github.com/bmjen))
 - Fix test condition for proxy directives. [#1145](https://github.com/puppetlabs/puppetlabs-apache/pull/1145) ([jonnytdevops](https://github.com/jonnytdevops))
 
-### Other
-
-- apache::vhost filter support [#1143](https://github.com/puppetlabs/puppetlabs-apache/pull/1143) ([BIAndrews](https://github.com/BIAndrews))
-- Add the ability to specify GeoIPScanProxyHeaderField for mod_geoip [#1128](https://github.com/puppetlabs/puppetlabs-apache/pull/1128) ([dgarbus](https://github.com/dgarbus))
-
 ## [1.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/1.5.0) - 2015-06-16
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.1...1.5.0)
diff --git a/metadata.json b/metadata.json
index b499340f52..03639a39c2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "10.1.1",
+  "version": "11.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From ca6fb5229ae47329cfbc8da6b457020338ddd327 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Sat, 23 Sep 2023 00:57:40 +0530
Subject: [PATCH 2177/2267] (CAT-1450) - Added new parameters for passenger mod

---
 REFERENCE.md                       | 115 +++++++++++++++++++++++++++++
 manifests/mod/passenger.pp         |  84 +++++++++++++++++++++
 manifests/vhost.pp                 |  28 ++++++-
 spec/classes/mod/passenger_spec.rb |  20 ++---
 templates/mod/passenger.conf.epp   |  21 ++++++
 5 files changed, 257 insertions(+), 11 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 52d658f0a4..446c5194ec 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -4423,10 +4423,15 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`mod_package`](#-apache--mod--passenger--mod_package)
 * [`mod_package_ensure`](#-apache--mod--passenger--mod_package_ensure)
 * [`mod_path`](#-apache--mod--passenger--mod_path)
+* [`passenger_admin_panel_url`](#-apache--mod--passenger--passenger_admin_panel_url)
+* [`passenger_admin_panel_auth_type`](#-apache--mod--passenger--passenger_admin_panel_auth_type)
+* [`passenger_admin_panel_username`](#-apache--mod--passenger--passenger_admin_panel_username)
+* [`passenger_admin_panel_password`](#-apache--mod--passenger--passenger_admin_panel_password)
 * [`passenger_allow_encoded_slashes`](#-apache--mod--passenger--passenger_allow_encoded_slashes)
 * [`passenger_anonymous_telemetry_proxy`](#-apache--mod--passenger--passenger_anonymous_telemetry_proxy)
 * [`passenger_app_env`](#-apache--mod--passenger--passenger_app_env)
 * [`passenger_app_group_name`](#-apache--mod--passenger--passenger_app_group_name)
+* [`passenger_app_log_file`](#-apache--mod--passenger--passenger_app_log_file)
 * [`passenger_app_root`](#-apache--mod--passenger--passenger_app_root)
 * [`passenger_app_type`](#-apache--mod--passenger--passenger_app_type)
 * [`passenger_base_uri`](#-apache--mod--passenger--passenger_base_uri)
@@ -4445,6 +4450,7 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`passenger_disable_log_prefix`](#-apache--mod--passenger--passenger_disable_log_prefix)
 * [`passenger_disable_security_update_check`](#-apache--mod--passenger--passenger_disable_security_update_check)
 * [`passenger_enabled`](#-apache--mod--passenger--passenger_enabled)
+* [`passenger_dump_config_manifest`](#-apache--mod--passenger--passenger_dump_config_manifest)
 * [`passenger_error_override`](#-apache--mod--passenger--passenger_error_override)
 * [`passenger_file_descriptor_log_file`](#-apache--mod--passenger--passenger_file_descriptor_log_file)
 * [`passenger_fly_with`](#-apache--mod--passenger--passenger_fly_with)
@@ -4466,6 +4472,7 @@ The following parameters are available in the `apache::mod::passenger` class:
 * [`passenger_max_request_queue_size`](#-apache--mod--passenger--passenger_max_request_queue_size)
 * [`passenger_max_request_time`](#-apache--mod--passenger--passenger_max_request_time)
 * [`passenger_max_requests`](#-apache--mod--passenger--passenger_max_requests)
+* [`passenger_max_request_queue_time`](#-apache--mod--passenger--passenger_max_request_queue_time)
 * [`passenger_memory_limit`](#-apache--mod--passenger--passenger_memory_limit)
 * [`passenger_meteor_app_settings`](#-apache--mod--passenger--passenger_meteor_app_settings)
 * [`passenger_min_instances`](#-apache--mod--passenger--passenger_min_instances)
@@ -4556,6 +4563,39 @@ Specifies a path to the module. Do not manually set this parameter without a spe
 
 Default value: `undef`
 
+##### <a name="-apache--mod--passenger--passenger_admin_panel_url"></a>`passenger_admin_panel_url`
+
+Data type: `Optional[String]`
+
+Specifies a Fuse Panel URL that the Passenger to to enable monitoring, administering, analysis and troubleshooting of this Passenger instance and apps.
+
+Default value: `undef`
+
+##### <a name="-apache--mod--passenger--passenger_admin_panel_auth_type"></a>`passenger_admin_panel_auth_type`
+
+Data type: `Optional[Enum['basic']]`
+
+Specifies the authentication type to use for the Fuse Panel. Currently it support only basic type of authentiction.
+Ref : https://www.phusionpassenger.com/library/config/apache/reference/#passengeradminpanelauthtype
+
+Default value: `undef`
+
+##### <a name="-apache--mod--passenger--passenger_admin_panel_username"></a>`passenger_admin_panel_username`
+
+Data type: `Optional[String]`
+
+The username that Passenger should use when connecting to the Fuse Panel with basic authentication.
+
+Default value: `undef`
+
+##### <a name="-apache--mod--passenger--passenger_admin_panel_password"></a>`passenger_admin_panel_password`
+
+Data type: `Optional[String]`
+
+The password that Passenger should use when connecting to the Fuse Panel with basic authentication.
+
+Default value: `undef`
+
 ##### <a name="-apache--mod--passenger--passenger_allow_encoded_slashes"></a>`passenger_allow_encoded_slashes`
 
 Data type: `Optional[Apache::OnOff]`
@@ -4593,6 +4633,14 @@ Sets the name of the application group that the current application should belon
 
 Default value: `undef`
 
+##### <a name="-apache--mod--passenger--passenger_app_log_file"></a>`passenger_app_log_file`
+
+Data type: `Optional[String]`
+
+File path to application specifile log file. By default passenger will write all application log messages to the Passenger log file.
+
+Default value: `undef`
+
 ##### <a name="-apache--mod--passenger--passenger_app_root"></a>`passenger_app_root`
 
 Data type: `Optional[String]`
@@ -4739,6 +4787,14 @@ Toggles whether Passenger should be enabled for that particular context.
 
 Default value: `undef`
 
+##### <a name="-apache--mod--passenger--passenger_dump_config_manifest"></a>`passenger_dump_config_manifest`
+
+Data type: `Optional[String]`
+
+Dumps the configuration manifest to the given file.
+
+Default value: `undef`
+
 ##### <a name="-apache--mod--passenger--passenger_error_override"></a>`passenger_error_override`
 
 Data type: `Optional[Apache::OnOff]`
@@ -4912,6 +4968,15 @@ The maximum number of requests an application process will process.
 
 Default value: `undef`
 
+##### <a name="-apache--mod--passenger--passenger_max_request_queue_time"></a>`passenger_max_request_queue_time`
+
+Data type: `Optional[Integer]`
+
+The maximum amount of time, in seconds, that a request may be queued before Passenger will return an error.
+This option specifies the maximum time a request may spend in that queue. If a request in the queue reaches this specified limit, then Passenger will send a "504 Gateway Timeout" error for that request.
+
+Default value: `undef`
+
 ##### <a name="-apache--mod--passenger--passenger_memory_limit"></a>`passenger_memory_limit`
 
 Data type: `Optional[Integer]`
@@ -7590,6 +7655,11 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`passenger_app_log_file`](#-apache--vhost--passenger_app_log_file)
 * [`passenger_debugger`](#-apache--vhost--passenger_debugger)
 * [`passenger_lve_min_uid`](#-apache--vhost--passenger_lve_min_uid)
+* [`passenger_dump_config_manifest`](#-apache--vhost--passenger_dump_config_manifest)
+* [`passenger_admin_panel_url`](#-apache--vhost--passenger_admin_panel_url)
+* [`passenger_admin_panel_auth_type`](#-apache--vhost--passenger_admin_panel_auth_type)
+* [`passenger_admin_panel_username`](#-apache--vhost--passenger_admin_panel_username)
+* [`passenger_admin_panel_password`](#-apache--vhost--passenger_admin_panel_password)
 * [`php_values`](#-apache--vhost--php_values)
 * [`php_flags`](#-apache--vhost--php_flags)
 * [`php_admin_values`](#-apache--vhost--php_admin_values)
@@ -9206,6 +9276,51 @@ specified value on LVE-enabled kernels.
 
 Default value: `undef`
 
+##### <a name="-apache--vhost--passenger_dump_config_manifest"></a>`passenger_dump_config_manifest`
+
+Data type: `Optional[String]`
+
+Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerlveminuid),
+to dump the configuration manifest to a file.
+
+Default value: `undef`
+
+##### <a name="-apache--vhost--passenger_admin_panel_url"></a>`passenger_admin_panel_url`
+
+Data type: `Optional[String]`
+
+Sets [PassengerAdminPanelUrl](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeradminpanelurl),
+to specify the URL of the Passenger admin panel.
+
+Default value: `undef`
+
+##### <a name="-apache--vhost--passenger_admin_panel_auth_type"></a>`passenger_admin_panel_auth_type`
+
+Data type: `Optional[Enum['basic']]`
+
+Sets [PassengerAdminPanelAuthType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeradminpanelauthtype),
+to specify the authentication type for the Passenger admin panel.
+
+Default value: `undef`
+
+##### <a name="-apache--vhost--passenger_admin_panel_username"></a>`passenger_admin_panel_username`
+
+Data type: `Optional[String]`
+
+Sets [PassengerAdminPanelUsername](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeradminpanelusername),
+to specify the username for the Passenger admin panel.
+
+Default value: `undef`
+
+##### <a name="-apache--vhost--passenger_admin_panel_password"></a>`passenger_admin_panel_password`
+
+Data type: `Optional[String]`
+
+Sets [PassengerAdminPanelPassword](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeradminpanelpassword),
+to specify the password for the Passenger admin panel.
+
+Default value: `undef`
+
 ##### <a name="-apache--vhost--php_values"></a>`php_values`
 
 Data type: `Hash`
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index c0c3a9df1d..0c5ab76435 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -24,6 +24,19 @@
 # @param mod_path
 #   Specifies a path to the module. Do not manually set this parameter without a special reason.
 #
+# @param passenger_admin_panel_url
+#   Specifies a Fuse Panel URL that the Passenger to to enable monitoring, administering, analysis and troubleshooting of this Passenger instance and apps.
+#
+# @param passenger_admin_panel_auth_type
+#   Specifies the authentication type to use for the Fuse Panel. Currently it support only basic type of authentiction.
+#   Ref : https://www.phusionpassenger.com/library/config/apache/reference/#passengeradminpanelauthtype
+#
+# @param passenger_admin_panel_username
+#   The username that Passenger should use when connecting to the Fuse Panel with basic authentication.
+#
+# @param passenger_admin_panel_password
+#   The password that Passenger should use when connecting to the Fuse Panel with basic authentication.
+#
 # @param passenger_allow_encoded_slashes
 #   Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this).
 #
@@ -41,6 +54,9 @@
 # @param passenger_app_group_name
 #   Sets the name of the application group that the current application should belong to.
 #
+# @param passenger_app_log_file
+#   File path to application specifile log file. By default passenger will write all application log messages to the Passenger log file.
+#
 # @param passenger_app_root
 #   Path to the application root which allows access independent from the DocumentRoot.
 #
@@ -97,6 +113,9 @@
 # @param passenger_enabled
 #   Toggles whether Passenger should be enabled for that particular context.
 #
+# @param passenger_dump_config_manifest
+#   Dumps the configuration manifest to the given file.
+#
 # @param passenger_error_override
 #   Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher. 
 #
@@ -165,6 +184,10 @@
 # @param passenger_max_requests
 #   The maximum number of requests an application process will process. 
 #
+# @param passenger_max_request_queue_time
+#   The maximum amount of time, in seconds, that a request may be queued before Passenger will return an error. 
+#   This option specifies the maximum time a request may spend in that queue. If a request in the queue reaches this specified limit, then Passenger will send a "504 Gateway Timeout" error for that request. 
+#
 # @param passenger_memory_limit
 #   The maximum amount of memory that an application process may use, in megabytes.
 #
@@ -291,6 +314,12 @@
   Optional[String] $mod_package                                                              = undef,
   Optional[String] $mod_package_ensure                                                       = undef,
   Optional[String] $mod_path                                                                 = undef,
+  Optional[Integer] $passenger_max_request_queue_time                                        = undef,
+  Optional[String] $passenger_admin_panel_url                                                = undef,
+  Optional[Enum['basic']] $passenger_admin_panel_auth_type                                   = undef,
+  Optional[String] $passenger_admin_panel_username                                           = undef,
+  Optional[String] $passenger_admin_panel_password                                           = undef,
+  Optional[String] $passenger_app_log_file                                                   = undef,
   Optional[Apache::OnOff] $passenger_allow_encoded_slashes                                   = undef,
   Optional[String] $passenger_anonymous_telemetry_proxy                                      = undef,
   Optional[String] $passenger_app_env                                                        = undef,
@@ -313,6 +342,7 @@
   Optional[Boolean] $passenger_disable_log_prefix                                            = undef,
   Optional[Apache::OnOff] $passenger_disable_security_update_check                           = undef,
   Optional[Apache::OnOff] $passenger_enabled                                                 = undef,
+  Optional[String] $passenger_dump_config_manifest                                           = undef,
   Optional[Apache::OnOff] $passenger_error_override                                          = undef,
   Optional[String] $passenger_file_descriptor_log_file                                       = undef,
   Optional[String] $passenger_fly_with                                                       = undef,
@@ -524,6 +554,46 @@
         fail("Passenger config option :: passenger_sticky_sessions_cookie_attributes is not introduced until version 6.0.5 :: ${passenger_installed_version} is the version reported")
       }
     }
+    if $passenger_max_request_queue_time {
+      if (versioncmp($passenger_installed_version, '5.1.12') < 0) {
+        fail("Passenger config option :: passenger_base_uri is not introduced until version 5.1.12 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_admin_panel_url {
+      if (versioncmp($passenger_installed_version, '5.2.2') < 0) {
+        fail("Passenger config option :: passenger_admin_panel_url is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_admin_panel_auth_type {
+      if (versioncmp($passenger_installed_version, '5.2.2') < 0) {
+        fail("Passenger config option :: passenger_admin_panel_auth_type is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_admin_panel_username {
+      if (versioncmp($passenger_installed_version, '5.2.2') < 0) {
+        fail("Passenger config option :: passenger_admin_panel_username is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_admin_panel_password {
+      if (versioncmp($passenger_installed_version, '5.2.2') < 0) {
+        fail("Passenger config option :: passenger_admin_panel_password is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_dump_config_manifest {
+      if (versioncmp($passenger_installed_version, '5.2.2') < 0) {
+        fail("Passenger config option :: passenger_dump_config_manifest is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_app_log_file {
+      if (versioncmp($passenger_installed_version, '5.3.0') < 0) {
+        fail("Passenger config option :: passenger_app_log_file is not introduced until version 5.3.0 :: ${passenger_installed_version} is the version reported")
+      }
+    }
+    if $passenger_resist_deployment_errors {
+      if (versioncmp($passenger_installed_version, '5.2.0') > 0) {
+        fail('REMOVED PASSENGER OPTION :: passenger_resist_deployment_errors :: -- no message on the current passenger reference webpage -- ')
+      }
+    }
   }
   # Managed by the package, but declare it to avoid purging
   if $passenger_conf_package_file {
@@ -648,12 +718,24 @@
   # - $passenger_thread_count : since 4.0.0.
   # - $passenger_user : since 4.0.0.
   # - $passenger_user_switching : since 3.0.0.
+  # - $passenger_dump_config_manifest : since 5.2.2
+  # - $passenger_admin_panel_url : since 5.2.2
+  # - $passenger_admin_panel_auth_type : since 5.2.2
+  # - $passenger_admin_panel_username : since 5.2.2
+  # - $passenger_admin_panel_password : since 5.2.2
+  # - $passenger_app_log_file : since 5.3.0
+  # - $passenger_max_request_queue_time : since 5.1.12
 
   $parameters = {
+    'passenger_admin_panel_url'                           => $passenger_admin_panel_url,
+    'passenger_admin_panel_auth_type'                     => $passenger_admin_panel_auth_type,
+    'passenger_admin_panel_username'                      => $passenger_admin_panel_username,
+    'passenger_admin_panel_password'                      => $passenger_admin_panel_password,
     'passenger_allow_encoded_slashes'                     => $passenger_allow_encoded_slashes,
     'passenger_anonymous_telemetry_proxy'                 => $passenger_anonymous_telemetry_proxy,
     'passenger_app_env'                                   => $passenger_app_env,
     'passenger_app_group_name'                            => $passenger_app_group_name,
+    'passenger_app_log_file'                              => $passenger_app_log_file,
     'passenger_app_root'                                  => $passenger_app_root,
     'passenger_app_type'                                  => $passenger_app_type,
     'passenger_base_uri'                                  => $passenger_base_uri,
@@ -681,6 +763,7 @@
     'passenger_load_shell_envvars'                        => $passenger_load_shell_envvars,
     'passenger_preload_bundler'                           => $passenger_preload_bundler,
     'passenger_log_file'                                  => $passenger_log_file,
+    'passenger_dump_config_manifest'                      => $passenger_dump_config_manifest,
     'passenger_log_level'                                 => $passenger_log_level,
     'passenger_lve_min_uid'                               => $passenger_lve_min_uid,
     'passenger_max_instances'                             => $passenger_max_instances,
@@ -688,6 +771,7 @@
     'passenger_max_pool_size'                             => $passenger_max_pool_size,
     'passenger_max_preloader_idle_time'                   => $passenger_max_preloader_idle_time,
     'passenger_max_request_queue_size'                    => $passenger_max_request_queue_size,
+    'passenger_max_request_queue_time'                    => $passenger_max_request_queue_time,
     'passenger_max_request_time'                          => $passenger_max_request_time,
     'passenger_max_requests'                              => $passenger_max_requests,
     'passenger_memory_limit'                              => $passenger_memory_limit,
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 034ea36873..969be0ea43 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -808,6 +808,26 @@
 #   to only allow the spawning of application processes with UIDs equal to, or higher than, this 
 #   specified value on LVE-enabled kernels.
 #
+# @param passenger_dump_config_manifest
+#   Sets [PassengerLveMinUid](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengerlveminuid),
+#   to dump the configuration manifest to a file.
+#
+# @param passenger_admin_panel_url
+#   Sets [PassengerAdminPanelUrl](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeradminpanelurl),
+#   to specify the URL of the Passenger admin panel.
+#
+# @param passenger_admin_panel_auth_type
+#   Sets [PassengerAdminPanelAuthType](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeradminpanelauthtype),
+#   to specify the authentication type for the Passenger admin panel.
+#
+# @param passenger_admin_panel_username
+#   Sets [PassengerAdminPanelUsername](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeradminpanelusername),
+#   to specify the username for the Passenger admin panel.
+#
+# @param passenger_admin_panel_password
+#   Sets [PassengerAdminPanelPassword](https://www.phusionpassenger.com/docs/references/config_reference/apache/#passengeradminpanelpassword),
+#   to specify the password for the Passenger admin panel.
+#
 # @param php_values
 #   Allows per-virtual host setting [`php_value`s](http://php.net/manual/en/configuration.changes.php). 
 #   These flags or values can be overwritten by a user or an application.
@@ -1896,6 +1916,11 @@
   Optional[String] $passenger_app_log_file                                            = undef,
   Optional[Boolean] $passenger_debugger                                               = undef,
   Optional[Integer] $passenger_lve_min_uid                                            = undef,
+  Optional[String] $passenger_admin_panel_url                                         = undef,
+  Optional[Enum['basic']] $passenger_admin_panel_auth_type                            = undef,
+  Optional[String] $passenger_admin_panel_username                                    = undef,
+  Optional[String] $passenger_admin_panel_password                                    = undef,
+  Optional[String] $passenger_dump_config_manifest                                    = undef,
   Optional[String] $add_default_charset                                               = undef,
   Boolean $modsec_disable_vhost                                                       = false,
   Optional[Variant[Hash, Array]] $modsec_disable_ids                                  = undef,
@@ -2772,7 +2797,8 @@
   # - $passenger_max_requests
   # - $passenger_max_request_time
   # - $passenger_memory_limit
-  if ($passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef) and $ensure == 'present' {
+  # - $passenger_dump_config_manifest
+  if ($passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef or $passenger_dump_config_manifest != undef) and $ensure == 'present' {
     include apache::mod::passenger
 
     concat::fragment { "${name}-passenger":
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 3c35f4e742..f974ff378c 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -214,16 +214,16 @@
             it { is_expected.to raise_error(%r{passenger_instance_registry_dir is not introduced until version 5.0.0}) }
           end
 
-          # describe 'fails when an option is removed' do
-          #   let :params do
-          #     {
-          #       passenger_installed_version: '5.3.0',
-          #       passenger_resist_deployment_errors: 'on'
-          #     }
-          #   end
-
-          #   it { is_expected.to raise_error(%r{REMOVED PASSENGER OPTION}) }
-          # end
+          describe 'fails when an option is removed' do
+            let :params do
+              {
+                passenger_installed_version: '5.3.0',
+                passenger_resist_deployment_errors: 'on'
+              }
+            end
+
+            it { is_expected.to raise_error(%r{REMOVED PASSENGER OPTION}) }
+          end
 
           describe 'warns when an option is deprecated' do
             let :params do
diff --git a/templates/mod/passenger.conf.epp b/templates/mod/passenger.conf.epp
index 7c02547c33..3961b3395b 100644
--- a/templates/mod/passenger.conf.epp
+++ b/templates/mod/passenger.conf.epp
@@ -7,12 +7,27 @@
   <%- if $passenger_anonymous_telemetry_proxy { -%>
   PassengerAnonymousTelemetryProxy <%= $passenger_anonymous_telemetry_proxy %>
   <%- } -%>
+  <%- if $passenger_admin_panel_url { -%>
+  PassengerAdminPanelUrl <%= $passenger_admin_panel_url %>
+  <%- } -%>
+  <%- if $passenger_admin_panel_auth_type { -%>
+  PassengerAdminPanelAuthType <%= $passenger_admin_panel_auth_type %>
+  <%- } -%>
+  <%- if $passenger_admin_panel_username { -%>
+  PassengerAdminPanelUsername <%= $passenger_admin_panel_username %>
+  <%- } -%>
+  <%- if $passenger_admin_panel_password { -%>
+  PassengerAdminPanelPassword <%= $passenger_admin_panel_password %>
+  <%- } -%>
   <%- if $passenger_app_env { -%>
   PassengerAppEnv <%= $passenger_app_env %>
   <%- } -%>
   <%- if $passenger_app_group_name { -%>
   PassengerAppGroupName <%= $passenger_app_group_name %>
   <%- } -%>
+  <%- if $passenger_app_log_file { -%>
+  PassengerAppLogFile <%= $passenger_app_log_file %>
+  <%- } -%>
   <%- if $passenger_app_root { -%>
   PassengerAppRoot "<%= $passenger_app_root %>"
   <%- } -%>
@@ -58,6 +73,9 @@
   <%- if $passenger_disable_security_update_check { -%>
   PassengerDisableSecurityUpdateCheck <%= $passenger_disable_security_update_check %>
   <%- } -%>
+  <%- if $passenger_dump_config_manifest { -%>
+  PassengerDumpConfigManifest <%= $passenger_dump_config_manifest %>
+  <%- } -%>
   <%- if $passenger_enabled { -%>
   PassengerEnabled <%= $passenger_enabled %>
   <%- } -%>
@@ -118,6 +136,9 @@
   <%- if $passenger_max_request_time { -%>
   PassengerMaxRequestTime <%= $passenger_max_request_time %>
   <%- } -%>
+  <%- if $passenger_max_request_queue_time { -%>
+  PassengerMaxRequestQueueTime <%= $passenger_max_request_queue_time %>
+  <%- } -%>
   <%- if $passenger_max_requests { -%>
   PassengerMaxRequests <%= $passenger_max_requests %>
   <%- } -%>

From 230805d2abe01d845b7fb9c96ec3158c00dcc361 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Mon, 25 Sep 2023 09:59:38 +0530
Subject: [PATCH 2178/2267] (CAT-1451) - Fixing nil check fix for SSL config

---
 templates/mod/ssl.conf.epp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/ssl.conf.epp b/templates/mod/ssl.conf.epp
index 35771d1301..39c2f82703 100644
--- a/templates/mod/ssl.conf.epp
+++ b/templates/mod/ssl.conf.epp
@@ -29,7 +29,7 @@
   SSLCACertificateFile    "<%= $ssl_ca %>"
   <%- } -%>
   SSLUseStapling <%= apache::bool2httpd($ssl_stapling) %>
-  <%- if $ssl_stapling_return_errors { -%>
+  <%- if $ssl_stapling_return_errors != undef { -%>
   SSLStaplingReturnResponderErrors <%= apache::bool2httpd($ssl_stapling_return_errors) %>
   <%- } -%>
   SSLStaplingCache "shmcb:<%= $_stapling_cache %>"

From 37b408327a206b8976c3b9816b153f5aa374ee08 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Mon, 25 Sep 2023 06:05:58 +0000
Subject: [PATCH 2179/2267] Release prep v11.1.0

---
 CHANGELOG.md  | 14 +++++++++++++-
 metadata.json |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 331390d98f..1d2c086065 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v11.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v11.0.0) - 2023-09-22
+## [v11.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v11.1.0) - 2023-09-25
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v11.0.0...v11.1.0)
+
+### Added
+
+- (CAT-1450) - Added new parameters for passenger mod [#2471](https://github.com/puppetlabs/puppetlabs-apache/pull/2471) ([Ramesh7](https://github.com/Ramesh7))
+
+### Fixed
+
+- (CAT-1451) - Fixing nil check fix for SSL config [#2473](https://github.com/puppetlabs/puppetlabs-apache/pull/2473) ([Ramesh7](https://github.com/Ramesh7))
+
+## [v11.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v11.0.0) - 2023-09-23
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v10.1.1...v11.0.0)
 
diff --git a/metadata.json b/metadata.json
index 03639a39c2..cbb245f4bf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From a3f67827f2222398b4b92b5fb0f950bd9f5378a1 Mon Sep 17 00:00:00 2001
From: rajat-puppet <rajat.tiwari@perforce.com>
Date: Wed, 27 Sep 2023 13:54:58 +0530
Subject: [PATCH 2180/2267] updating issue link

---
 README.md                                  | 2 +-
 spec/util/_resources/test_metadata_json.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5cabff0831..a5230d4d9c 100644
--- a/README.md
+++ b/README.md
@@ -861,7 +861,7 @@ Acceptance tests for this module leverage [puppet_litmus](https://github.com/pup
 To run the acceptance tests follow the instructions [here](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html). You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
 
 ### Development Support
-If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://tickets.puppetlabs.com/browse/MODULES/).
+If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://github.com/puppetlabs/puppetlabs-apache/issues).
 Every Monday the Puppet IA Content Team has [office hours](https://puppet.com/community/office-hours) in the [Puppet Community Slack](http://slack.puppet.com/), alternating between an EMEA friendly time (1300 UTC) and an Americas friendly time (0900 Pacific, 1700 UTC).
 
 If you have problems getting this module up and running, please [contact Support](http://puppetlabs.com/services/customer-support).
diff --git a/spec/util/_resources/test_metadata_json.rb b/spec/util/_resources/test_metadata_json.rb
index bd333b73dd..c79deec08b 100644
--- a/spec/util/_resources/test_metadata_json.rb
+++ b/spec/util/_resources/test_metadata_json.rb
@@ -8,7 +8,7 @@
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-apache",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
-  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "issues_url": "https://github.com/puppetlabs/puppetlabs-apache/issues",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",

From 31a137bcb490e6a9041959e8f7115dceac91d4c0 Mon Sep 17 00:00:00 2001
From: Dinesh Gujar <dinesh.gujar@Dineshs-MacBook-Pro.local>
Date: Thu, 7 Sep 2023 13:17:34 +0530
Subject: [PATCH 2181/2267] CAT-1347 erb to epp conversion

---
 manifests/vhost.pp                         | 415 +++++++++++----------
 templates/vhost/_action.epp                |   4 +
 templates/vhost/_action.erb                |   4 -
 templates/vhost/_aliases.epp               |  14 +
 templates/vhost/_aliases.erb               |  14 -
 templates/vhost/_allow_encoded_slashes.epp |   4 +
 templates/vhost/_allow_encoded_slashes.erb |   4 -
 templates/vhost/_auth_cas.epp              |  65 ++++
 templates/vhost/_auth_cas.erb              |  65 ----
 templates/vhost/_charsets.epp              |   4 +
 templates/vhost/_charsets.erb              |   4 -
 templates/vhost/_custom_fragment.epp       |   5 +
 templates/vhost/_custom_fragment.erb       |   5 -
 templates/vhost/_docroot.epp               |   8 +
 templates/vhost/_docroot.erb               |   8 -
 templates/vhost/_fallbackresource.epp      |   4 +
 templates/vhost/_fallbackresource.erb      |   4 -
 templates/vhost/_file_footer.epp           |   9 +
 templates/vhost/_file_footer.erb           |   9 -
 templates/vhost/_file_header.epp           |  43 +++
 templates/vhost/_file_header.erb           |  42 ---
 templates/vhost/_filters.epp               |   8 +
 templates/vhost/_filters.erb               |   8 -
 templates/vhost/_header.epp                |   8 +
 templates/vhost/_header.erb                |   8 -
 templates/vhost/_http2.epp                 |  45 +++
 templates/vhost/_http2.erb                 |  45 ---
 templates/vhost/_http_protocol_options.epp |   1 +
 templates/vhost/_http_protocol_options.erb |   1 -
 templates/vhost/_itk.epp                   |  29 ++
 templates/vhost/_itk.erb                   |  29 --
 templates/vhost/_jk_mounts.epp             |  10 +
 templates/vhost/_jk_mounts.erb             |  10 -
 templates/vhost/_keepalive_options.epp     |   9 +
 templates/vhost/_keepalive_options.erb     |   9 -
 templates/vhost/_logging.epp               |  21 ++
 templates/vhost/_logging.erb               |  21 --
 templates/vhost/_passenger.epp             | 144 +++++++
 templates/vhost/_passenger.erb             | 144 -------
 templates/vhost/_requestheader.epp         |   8 +
 templates/vhost/_requestheader.erb         |   8 -
 templates/vhost/_scriptalias.epp           |   2 +
 templates/vhost/_security.epp              |  61 +++
 templates/vhost/_security.erb              |  61 ---
 templates/vhost/_serveralias.epp           |   7 +
 templates/vhost/_serveralias.erb           |   7 -
 templates/vhost/_shib.epp                  |   4 +
 templates/vhost/_shib.erb                  |   4 -
 templates/vhost/_sslproxy.epp              |  35 ++
 templates/vhost/_sslproxy.erb              |  35 --
 templates/vhost/_suexec.epp                |   4 +
 templates/vhost/_suexec.erb                |   4 -
 templates/vhost/_use_canonical_name.erb    |   4 -
 templates/vhost/_userdir.epp               |   3 +
 templates/vhost/_userdir.erb               |   3 -
 templates/vhost/_wsgi.epp                  |  50 +++
 templates/vhost/_wsgi.erb                  |  50 ---
 57 files changed, 827 insertions(+), 807 deletions(-)
 create mode 100644 templates/vhost/_action.epp
 delete mode 100644 templates/vhost/_action.erb
 create mode 100644 templates/vhost/_aliases.epp
 delete mode 100644 templates/vhost/_aliases.erb
 create mode 100644 templates/vhost/_allow_encoded_slashes.epp
 delete mode 100644 templates/vhost/_allow_encoded_slashes.erb
 create mode 100644 templates/vhost/_auth_cas.epp
 delete mode 100644 templates/vhost/_auth_cas.erb
 create mode 100644 templates/vhost/_charsets.epp
 delete mode 100644 templates/vhost/_charsets.erb
 create mode 100644 templates/vhost/_custom_fragment.epp
 delete mode 100644 templates/vhost/_custom_fragment.erb
 create mode 100644 templates/vhost/_docroot.epp
 delete mode 100644 templates/vhost/_docroot.erb
 create mode 100644 templates/vhost/_fallbackresource.epp
 delete mode 100644 templates/vhost/_fallbackresource.erb
 create mode 100644 templates/vhost/_file_footer.epp
 delete mode 100644 templates/vhost/_file_footer.erb
 create mode 100644 templates/vhost/_file_header.epp
 delete mode 100644 templates/vhost/_file_header.erb
 create mode 100644 templates/vhost/_filters.epp
 delete mode 100644 templates/vhost/_filters.erb
 create mode 100644 templates/vhost/_header.epp
 delete mode 100644 templates/vhost/_header.erb
 create mode 100644 templates/vhost/_http2.epp
 delete mode 100644 templates/vhost/_http2.erb
 create mode 100644 templates/vhost/_http_protocol_options.epp
 delete mode 100644 templates/vhost/_http_protocol_options.erb
 create mode 100644 templates/vhost/_itk.epp
 delete mode 100644 templates/vhost/_itk.erb
 create mode 100644 templates/vhost/_jk_mounts.epp
 delete mode 100644 templates/vhost/_jk_mounts.erb
 create mode 100644 templates/vhost/_keepalive_options.epp
 delete mode 100644 templates/vhost/_keepalive_options.erb
 create mode 100644 templates/vhost/_logging.epp
 delete mode 100644 templates/vhost/_logging.erb
 create mode 100644 templates/vhost/_passenger.epp
 delete mode 100644 templates/vhost/_passenger.erb
 create mode 100644 templates/vhost/_requestheader.epp
 delete mode 100644 templates/vhost/_requestheader.erb
 create mode 100644 templates/vhost/_scriptalias.epp
 create mode 100644 templates/vhost/_security.epp
 delete mode 100644 templates/vhost/_security.erb
 create mode 100644 templates/vhost/_serveralias.epp
 delete mode 100644 templates/vhost/_serveralias.erb
 create mode 100644 templates/vhost/_shib.epp
 delete mode 100644 templates/vhost/_shib.erb
 create mode 100644 templates/vhost/_sslproxy.epp
 delete mode 100644 templates/vhost/_sslproxy.erb
 create mode 100644 templates/vhost/_suexec.epp
 delete mode 100644 templates/vhost/_suexec.erb
 delete mode 100644 templates/vhost/_use_canonical_name.erb
 create mode 100644 templates/vhost/_userdir.epp
 delete mode 100644 templates/vhost/_userdir.erb
 create mode 100644 templates/vhost/_wsgi.epp
 delete mode 100644 templates/vhost/_wsgi.erb

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 969be0ea43..bb1ad02de8 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2224,83 +2224,91 @@
     }
   }
 
-  # Template uses:
-  # - $comment
-  # - $nvh_addr_port
-  # - $servername
-  # - $serveradmin
-  # - $protocols
-  # - $protocols_honor_order
-  # - $mdomain
+  $file_header_params = {
+    'comment'               => $comment,
+    'nvh_addr_port'         => $nvh_addr_port,
+    'mdomain'               => $mdomain,
+    'servername'            => $servername,
+    'define'                => $define,
+    'protocols'             => $protocols,
+    'protocols_honor_order' => $protocols_honor_order,
+    'limitreqfieldsize'     => $limitreqfieldsize,
+    'limitreqfields'        => $limitreqfields,
+    'limitreqline'          => $limitreqline,
+    'limitreqbody'          => $limitreqbody,
+    'serveradmin'           => $serveradmin,
+  }
+
   concat::fragment { "${name}-apache-header":
     target  => "${priority_real}${filename}.conf",
     order   => 0,
-    content => template('apache/vhost/_file_header.erb'),
+    content => epp('apache/vhost/_file_header.epp', $file_header_params),
   }
 
-  # Template uses:
-  # - $virtual_docroot
-  # - $virtual_use_default_docroot
-  # - $docroot
   if $docroot and $ensure == 'present' {
     if $virtual_docroot {
       include apache::mod::vhost_alias
     }
 
+    $docroot_params = {
+      'virtual_docroot'             => $virtual_docroot,
+      'docroot'                     => $docroot,
+      'virtual_use_default_docroot' => $virtual_use_default_docroot,
+    }
+
     concat::fragment { "${name}-docroot":
       target  => "${priority_real}${filename}.conf",
       order   => 10,
-      content => template('apache/vhost/_docroot.erb'),
+      content => epp('apache/vhost/_docroot.epp', $docroot_params),
     }
   }
 
-  # Template uses:
-  # - $aliases
   if ! empty($aliases) and $ensure == 'present' {
     include apache::mod::alias
-
+    $aliases_params = {
+      'aliases' => $aliases,
+    }
     concat::fragment { "${name}-aliases":
       target  => "${priority_real}${filename}.conf",
       order   => 20,
-      content => template('apache/vhost/_aliases.erb'),
+      content => epp('apache/vhost/_aliases.epp', $aliases_params),
     }
   }
 
-  # Template uses:
-  # - $itk
-  # - $::kernelversion
   if $itk and ! empty($itk) {
+    $itk_params = {
+      'itk'           => $itk,
+      'kernelversion' => $facts['kernelversion'],
+    }
     concat::fragment { "${name}-itk":
       target  => "${priority_real}${filename}.conf",
       order   => 30,
-      content => template('apache/vhost/_itk.erb'),
+      content => epp('apache/vhost/_itk.epp', $itk_params),
     }
   }
 
-  # Template uses:
-  # - $fallbackresource
   if $fallbackresource {
+    $fall_back_res_params = {
+      'fallbackresource' => $fallbackresource,
+    }
     concat::fragment { "${name}-fallbackresource":
       target  => "${priority_real}${filename}.conf",
       order   => 40,
-      content => template('apache/vhost/_fallbackresource.erb'),
+      content => epp('apache/vhost/_fallbackresource.epp', $fall_back_res_params),
     }
   }
 
-  # Template uses:
-  # - $allow_encoded_slashes
   if $allow_encoded_slashes {
+    $allow_encoded_slashes_params = {
+      'allow_encoded_slashes' => $allow_encoded_slashes,
+    }
     concat::fragment { "${name}-allow_encoded_slashes":
       target  => "${priority_real}${filename}.conf",
       order   => 50,
-      content => template('apache/vhost/_allow_encoded_slashes.erb'),
+      content => epp('apache/vhost/_allow_encoded_slashes.epp', $allow_encoded_slashes_params),
     }
   }
 
-  # Template uses:
-  # - $_directories
-  # - $docroot
-  # - $shibboleth_enabled
   if $_directories and ! empty($_directories) and $ensure == 'present' {
     $_directories.each |Hash $directory| {
       if 'auth_basic_authoritative' in $directory or 'auth_basic_fake' in $directory or 'auth_basic_provider' in $directory {
@@ -2351,6 +2359,11 @@
       }
     }
 
+    # Template uses:
+    # - $_directories
+    # - $docroot
+    # - $shibboleth_enabled
+    # - $cas_enabled
     concat::fragment { "${name}-directories":
       target  => "${priority_real}${filename}.conf",
       order   => 60,
@@ -2360,6 +2373,7 @@
 
   # Template uses:
   # - $additional_includes
+  # - $use_optional_includes
   if $additional_includes and ! empty($additional_includes) {
     concat::fragment { "${name}-additional_includes":
       target  => "${priority_real}${filename}.conf",
@@ -2368,20 +2382,21 @@
     }
   }
 
-  # Template uses:
-  # - $error_log
-  # - $error_log_format
-  # - $log_level
-  # - $error_log_destination
-  # - $log_level
   if $error_log or $log_level {
+    $logging_params = {
+      'error_log'             => $error_log,
+      'log_level'             => $log_level,
+      'error_log_destination' => $error_log_destination,
+      'error_log_format'      => $error_log_format,
+    }
     concat::fragment { "${name}-logging":
       target  => "${priority_real}${filename}.conf",
       order   => 80,
-      content => template('apache/vhost/_logging.erb'),
+      content => epp('apache/vhost/_logging.epp', $logging_params),
     }
   }
 
+  # Template uses no variables
   concat::fragment { "${name}-serversignature":
     target  => "${priority_real}${filename}.conf",
     order   => 90,
@@ -2402,13 +2417,11 @@
     }
   }
 
-  # Template uses:
-  # - $action
   if $action {
     concat::fragment { "${name}-action":
       target  => "${priority_real}${filename}.conf",
       order   => 110,
-      content => template('apache/vhost/_action.erb'),
+      content => epp('apache/vhost/_action.epp', { 'action' => $action }),
     }
   }
 
@@ -2432,56 +2445,47 @@
     }
   }
 
-  # Template uses:
-  # - $headers
   if ! empty($headers) and $ensure == 'present' {
     include apache::mod::headers
 
     concat::fragment { "${name}-header":
       target  => "${priority_real}${filename}.conf",
       order   => 140,
-      content => template('apache/vhost/_header.erb'),
+      content => epp('apache/vhost/_header.epp', { 'headers' => $headers }),
     }
   }
 
-  # Template uses:
-  # - $request_headers
   if ! empty($request_headers) and $ensure == 'present' {
     include apache::mod::headers
 
     concat::fragment { "${name}-requestheader":
       target  => "${priority_real}${filename}.conf",
       order   => 150,
-      content => template('apache/vhost/_requestheader.erb'),
+      content => epp('apache/vhost/_requestheader.epp', { 'request_headers' => $request_headers }),
     }
   }
 
-  # Template uses:
-  # - $ssl_proxyengine
-  # - $ssl_proxy_verify
-  # - $ssl_proxy_verify_depth
-  # - $ssl_proxy_ca_cert
-  # - $ssl_proxy_check_peer_cn
-  # - $ssl_proxy_check_peer_name
-  # - $ssl_proxy_check_peer_expire
-  # - $ssl_proxy_machine_cert
-  # - $ssl_proxy_machine_cert_chain
-  # - $ssl_proxy_protocol
   if $ssl_proxyengine {
+    $ssl_proxy_params = {
+      'ssl_proxyengine'              => $ssl_proxyengine,
+      'ssl_proxy_verify'             => $ssl_proxy_verify,
+      'ssl_proxy_verify_depth'       => $ssl_proxy_verify_depth,
+      'ssl_proxy_ca_cert'            => $ssl_proxy_ca_cert,
+      'ssl_proxy_check_peer_cn'      => $ssl_proxy_check_peer_cn,
+      'ssl_proxy_check_peer_name'    => $ssl_proxy_check_peer_name,
+      'ssl_proxy_check_peer_expire'  => $ssl_proxy_check_peer_expire,
+      'ssl_proxy_machine_cert'       => $ssl_proxy_machine_cert,
+      'ssl_proxy_machine_cert_chain' => $ssl_proxy_machine_cert_chain,
+      'ssl_proxy_cipher_suite'       => $ssl_proxy_cipher_suite,
+      'ssl_proxy_protocol'           => $ssl_proxy_protocol,
+    }
     concat::fragment { "${name}-sslproxy":
       target  => "${priority_real}${filename}.conf",
       order   => 160,
-      content => template('apache/vhost/_sslproxy.erb'),
+      content => epp('apache/vhost/_sslproxy.epp', $ssl_proxy_params),
     }
   }
 
-  # Template uses:
-  # - $proxy_dest
-  # - $proxy_pass
-  # - $proxy_pass_match
-  # - $proxy_preserve_host
-  # - $proxy_add_headers
-  # - $no_proxy_uris
   if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host or ($proxy_add_headers =~ NotUndef)) and $ensure == 'present' {
     include apache::mod::proxy_http
 
@@ -2494,7 +2498,6 @@
         include apache::mod::proxy_http2
       }
     }
-
     concat::fragment { "${name}-proxy":
       target  => "${priority_real}${filename}.conf",
       order   => 170,
@@ -2534,7 +2537,6 @@
   # - $rewrite_map
   if (! empty($rewrites) or $rewrite_rule or $rewrite_inherit) and $ensure == 'present' {
     include apache::mod::rewrite
-
     concat::fragment { "${name}-rewrite":
       target  => "${priority_real}${filename}.conf",
       order   => 190,
@@ -2542,31 +2544,27 @@
     }
   }
 
-  # Template uses:
-  # - $scriptalias
   if $scriptalias and $ensure == 'present' {
     include apache::mod::alias
-
     concat::fragment { "${name}-scriptalias":
       target  => "${priority_real}${filename}.conf",
       order   => 200,
-      content => template('apache/vhost/_scriptalias.erb'),
+      content => epp('apache/vhost/_scriptalias.epp', { 'scriptalias' => $scriptalias }),
     }
   }
 
-  # Template uses:
-  # - $serveraliases
   if ! empty($serveraliases) and $ensure == 'present' {
     concat::fragment { "${name}-serveralias":
       target  => "${priority_real}${filename}.conf",
       order   => 210,
-      content => template('apache/vhost/_serveralias.erb'),
+      content => epp('apache/vhost/_serveralias.epp', { 'serveraliases' => $serveraliases }),
     }
   }
 
   # Template uses:
   # - $setenv
   # - $setenvif
+  # - $setenvifnocase
   $use_env_mod = !empty($setenv)
   $use_setenvif_mod = !empty($setenvif) or !empty($setenvifnocase)
   if ($use_env_mod or $use_setenvif_mod) and $ensure == 'present' {
@@ -2605,7 +2603,6 @@
   # - $mdomain
   if $ssl and $ensure == 'present' {
     include apache::mod::ssl
-
     concat::fragment { "${name}-ssl":
       target  => "${priority_real}${filename}.conf",
       order   => 230,
@@ -2631,14 +2628,6 @@
     }
   }
 
-  # Template uses:
-  # - $auth_kerb
-  # - $krb_method_negotiate
-  # - $krb_method_k5passwd
-  # - $krb_authoritative
-  # - $krb_auth_realms
-  # - $krb_5keytab
-  # - $krb_local_user_mapping
   if $auth_kerb and $ensure == 'present' {
     include apache::mod::auth_kerb
 
@@ -2682,57 +2671,76 @@
     }
   }
 
-  # Template uses:
-  # - $wsgi_application_group
-  # - $wsgi_daemon_process
-  # - $wsgi_daemon_process_options
-  # - $wsgi_import_script
-  # - $wsgi_import_script_options
-  # - $wsgi_process_group
-  # - $wsgi_script_aliases
-  # - $wsgi_pass_authorization
   if $wsgi_daemon_process_options {
     deprecation('apache::vhost::wsgi_daemon_process_options', 'This parameter is deprecated. Please add values inside Hash `wsgi_daemon_process`.')
   }
   if ($wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization) and $ensure == 'present' {
     include apache::mod::wsgi
+    $wsgi_params = {
+      'wsgi_application_group' => $wsgi_application_group,
+      'wsgi_daemon_process' => $wsgi_daemon_process,
+      'wsgi_import_script' => $wsgi_import_script,
+      'wsgi_process_group' => $wsgi_process_group,
+      'wsgi_daemon_process_options'=> $wsgi_daemon_process_options,
+      'wsgi_import_script_options' => $wsgi_import_script_options,
+      'wsgi_script_aliases' => $wsgi_script_aliases,
+      'wsgi_pass_authorization' => $wsgi_pass_authorization,
+      'wsgi_chunked_request' => $wsgi_chunked_request,
+      'wsgi_script_aliases_match' => $wsgi_script_aliases_match,
+    }
 
     concat::fragment { "${name}-wsgi":
       target  => "${priority_real}${filename}.conf",
       order   => 260,
-      content => template('apache/vhost/_wsgi.erb'),
+      content => epp('apache/vhost/_wsgi.epp', $wsgi_params),
     }
   }
 
-  # Template uses:
-  # - $custom_fragment
   if $custom_fragment {
+    $custom_fragment_params = {
+      'custom_fragment' => $custom_fragment,
+    }
     concat::fragment { "${name}-custom_fragment":
       target  => "${priority_real}${filename}.conf",
       order   => 270,
-      content => template('apache/vhost/_custom_fragment.erb'),
+      content => epp('apache/vhost/_custom_fragment.epp', $custom_fragment_params),
     }
   }
 
-  # Template uses:
-  # - $suexec_user_group
   if $suexec_user_group and $ensure == 'present' {
     include apache::mod::suexec
 
     concat::fragment { "${name}-suexec":
       target  => "${priority_real}${filename}.conf",
       order   => 290,
-      content => template('apache/vhost/_suexec.erb'),
+      content => "SuexecUserGroup ${suexec_user_group}",
     }
   }
 
   if ('h2' in $protocols or 'h2c' in $protocols or $h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef) and $ensure == 'present' {
     include apache::mod::http2
+    $http2_params = {
+      'h2_copy_files'          => $h2_copy_files,
+      'h2_direct'              => $h2_direct,
+      'h2_early_hints'         => $h2_early_hints,
+      'h2_max_session_streams' => $h2_max_session_streams,
+      'h2_modern_tls_only'     => $h2_modern_tls_only,
+      'h2_push'                => $h2_push,
+      'h2_push_diary_size'     => $h2_push_diary_size,
+      'h2_push_priority'       => $h2_push_priority,
+      'h2_push_resource'       => $h2_push_resource,
+      'h2_serialize_headers'   => $h2_serialize_headers,
+      'h2_stream_max_mem_size' => $h2_stream_max_mem_size,
+      'h2_tls_cool_down_secs'  => $h2_tls_cool_down_secs,
+      'h2_tls_warm_up_size'    => $h2_tls_warm_up_size,
+      'h2_upgrade'             => $h2_upgrade,
+      'h2_window_size'         => $h2_window_size,
+    }
 
     concat::fragment { "${name}-http2":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
-      content => template('apache/vhost/_http2.erb'),
+      content => epp('apache/vhost/_http2.epp', $http2_params),
     }
   }
 
@@ -2740,162 +2748,177 @@
     include apache::mod::md
   }
 
-  # Template uses:
-  # - $userdir
   if $userdir and $ensure == 'present' {
     include apache::mod::userdir
 
     concat::fragment { "${name}-userdir":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
-      content => template('apache/vhost/_userdir.erb'),
+      content => epp('apache/vhost/_userdir.epp', { 'userdir' => $userdir }),
     }
   }
 
-  # Template uses:
-  # - $passenger_enabled
-  # - $passenger_start_timeout
-  # - $passenger_ruby
-  # - $passenger_python
-  # - $passenger_nodejs
-  # - $passenger_meteor_app_settings
-  # - $passenger_app_env
-  # - $passenger_app_root
-  # - $passenger_app_group_name
-  # - $passenger_app_start_command
-  # - $passenger_app_type
-  # - $passenger_startup_file
-  # - $passenger_restart_dir
-  # - $passenger_spawn_method
-  # - $passenger_load_shell_envvars
-  # - $passenger_preload_bundler
-  # - $passenger_rolling_restarts
-  # - $passenger_resist_deployment_errors
-  # - $passenger_min_instances
-  # - $passenger_max_instances
-  # - $passenger_max_preloader_idle_time
-  # - $passenger_force_max_concurrent_requests_per_process
-  # - $passenger_concurrency_model
-  # - $passenger_thread_count
-  # - $passenger_high_performance
-  # - $passenger_max_request_queue_size
-  # - $passenger_max_request_queue_time
-  # - $passenger_user
-  # - $passenger_group
-  # - $passenger_friendly_error_pages
-  # - $passenger_buffer_upload
-  # - $passenger_buffer_response
-  # - $passenger_allow_encoded_slashes
-  # - $passenger_lve_min_uid
-  # - $passenger_base_uri
-  # - $passenger_error_override
-  # - $passenger_sticky_sessions
-  # - $passenger_sticky_sessions_cookie_name
-  # - $passenger_sticky_sessions_cookie_attributes
-  # - $passenger_app_log_file
-  # - $passenger_debugger
-  # - $passenger_max_requests
-  # - $passenger_max_request_time
-  # - $passenger_memory_limit
-  # - $passenger_dump_config_manifest
-  if ($passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef or $passenger_dump_config_manifest != undef) and $ensure == 'present' {
+  if ($passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or$passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef or $passenger_dump_config_manifest != undef) and $ensure == 'present' {
     include apache::mod::passenger
+    $passenger_params = {
+      'passenger_enabled'                                   => $passenger_enabled,
+      'passenger_base_uri'                                  => $passenger_base_uri,
+      'passenger_ruby'                                      => $passenger_ruby,
+      'passenger_python'                                    => $passenger_python,
+      'passenger_nodejs'                                    => $passenger_nodejs,
+      'passenger_meteor_app_settings'                       => $passenger_meteor_app_settings,
+      'passenger_app_env'                                   => $passenger_app_env,
+      'passenger_app_root'                                  => $passenger_app_root,
+      'passenger_app_group_name'                            => $passenger_app_group_name,
+      'passenger_app_start_command'                         => $passenger_app_start_command,
+      'passenger_app_type'                                  => $passenger_app_type,
+      'passenger_startup_file'                              => $passenger_startup_file,
+      'passenger_restart_dir'                               => $passenger_restart_dir,
+      'passenger_spawn_method'                              => $passenger_spawn_method,
+      'passenger_load_shell_envvars'                        => $passenger_load_shell_envvars,
+      'passenger_preload_bundler'                           => $passenger_preload_bundler,
+      'passenger_rolling_restarts'                          => $passenger_rolling_restarts,
+      'passenger_resist_deployment_errors'                  => $passenger_resist_deployment_errors,
+      'passenger_user'                                      => $passenger_user,
+      'passenger_group'                                     => $passenger_group,
+      'passenger_friendly_error_pages'                      => $passenger_friendly_error_pages,
+      'passenger_min_instances'                             => $passenger_min_instances,
+      'passenger_max_instances'                             => $passenger_max_instances,
+      'passenger_max_preloader_idle_time'                   => $passenger_max_preloader_idle_time,
+      'passenger_force_max_concurrent_requests_per_process' => $passenger_force_max_concurrent_requests_per_process,
+      'passenger_start_timeout'                             => $passenger_start_timeout,
+      'passenger_concurrency_model'                         => $passenger_concurrency_model,
+      'passenger_thread_count'                              => $passenger_thread_count,
+      'passenger_max_requests'                              => $passenger_max_requests,
+      'passenger_max_request_time'                          => $passenger_max_request_time,
+      'passenger_memory_limit'                              => $passenger_memory_limit,
+      'passenger_stat_throttle_rate'                        => $passenger_stat_throttle_rate,
+      'passenger_high_performance'                          => $passenger_high_performance,
+      'passenger_buffer_upload'                             => $passenger_buffer_upload,
+      'passenger_buffer_response'                           => $passenger_buffer_response,
+      'passenger_error_override'                            => $passenger_error_override,
+      'passenger_max_request_queue_size'                    => $passenger_max_request_queue_size,
+      'passenger_max_request_queue_time'                    => $passenger_max_request_queue_time,
+      'passenger_sticky_sessions'                           => $passenger_sticky_sessions,
+      'passenger_sticky_sessions_cookie_name'               => $passenger_sticky_sessions_cookie_name,
+      'passenger_sticky_sessions_cookie_attributes'         => $passenger_sticky_sessions_cookie_attributes,
+      'passenger_allow_encoded_slashes'                     => $passenger_allow_encoded_slashes,
+      'passenger_app_log_file'                              => $passenger_app_log_file,
+      'passenger_debugger'                                  => $passenger_debugger,
+      'passenger_lve_min_uid'                               => $passenger_lve_min_uid,
+    }
 
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
       order   => 300,
-      content => template('apache/vhost/_passenger.erb'),
+      content => epp('apache/vhost/_passenger.epp', $passenger_params),
     }
   }
 
-  # Template uses:
-  # - $add_default_charset
   if $add_default_charset {
+    $charsets_params = {
+      'add_default_charset' => $add_default_charset,
+    }
     concat::fragment { "${name}-charsets":
       target  => "${priority_real}${filename}.conf",
       order   => 310,
-      content => template('apache/vhost/_charsets.erb'),
+      content => epp('apache/vhost/_charsets.epp', $charsets_params),
     }
   }
 
-  # Template uses:
-  # - $modsec_disable_vhost
-  # - $modsec_disable_ids
-  # - $modsec_disable_ips
-  # - $modsec_disable_msgs
-  # - $modsec_disable_tags
-  # - $modsec_body_limit
-  # - $modsec_audit_log_destination
-  # - $modsec_inbound_anomaly_threshold
-  # - $modsec_outbound_anomaly_threshold
-  # - $modsec_allowed_methods
   if $modsec_disable_vhost or $modsec_disable_ids or !empty($modsec_disable_ips) or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination or ($modsec_inbound_anomaly_threshold and $modsec_outbound_anomaly_threshold) or $modsec_allowed_methods {
+    $security_params = {
+      'modsec_disable_vhost'              => $modsec_disable_vhost,
+      'modsec_audit_log_destination'      => $modsec_audit_log_destination,
+      '_modsec_disable_ids'               => $modsec_disable_ids,
+      'modsec_disable_ips'                => $modsec_disable_ips,
+      '_modsec_disable_msgs'              => $modsec_disable_msgs,
+      '_modsec_disable_tags'              => $modsec_disable_tags,
+      'modsec_body_limit'                 => $modsec_body_limit,
+      'modsec_inbound_anomaly_threshold'  => $modsec_inbound_anomaly_threshold,
+      'modsec_outbound_anomaly_threshold' => $modsec_outbound_anomaly_threshold,
+      'modsec_allowed_methods'            => $modsec_allowed_methods,
+    }
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
       order   => 320,
-      content => template('apache/vhost/_security.erb'),
+      content => epp('apache/vhost/_security.epp', $security_params),
     }
   }
 
-  # Template uses:
-  # - $filters
   if ! empty($filters) and $ensure == 'present' {
     include apache::mod::filter
 
     concat::fragment { "${name}-filters":
       target  => "${priority_real}${filename}.conf",
       order   => 330,
-      content => template('apache/vhost/_filters.erb'),
+      content => epp('apache/vhost/_filters.epp', { 'filters' => $filters }),
     }
   }
 
-  # Template uses:
-  # - $jk_mounts
   if !empty($jk_mounts) and $ensure == 'present' {
     include apache::mod::jk
 
     concat::fragment { "${name}-jk_mounts":
       target  => "${priority_real}${filename}.conf",
       order   => 340,
-      content => template('apache/vhost/_jk_mounts.erb'),
+      content => epp('apache/vhost/_jk_mounts.epp', { 'jk_mounts' => $jk_mounts }),
     }
   }
 
-  # Template uses:
-  # - $keepalive
-  # - $keepalive_timeout
-  # - $max_keepalive_requests
   if $keepalive or $keepalive_timeout or $max_keepalive_requests {
+    $keep_alive_params = {
+      'keepalive' => $keepalive,
+      'keepalive_timeout' => $keepalive_timeout,
+      'max_keepalive_requests' => $max_keepalive_requests,
+    }
     concat::fragment { "${name}-keepalive_options":
       target  => "${priority_real}${filename}.conf",
       order   => 350,
-      content => template('apache/vhost/_keepalive_options.erb'),
+      content => epp('apache/vhost/_keepalive_options.epp', $keep_alive_params),
     }
   }
 
-  # Template uses:
-  # - $cas_*
   if $cas_enabled {
+    $auth_cas_params = {
+      'cas_enabled'               => $cas_enabled,
+      'cas_cookie_path'           => $cas_cookie_path,
+      'cas_login_url'             => $cas_login_url,
+      'cas_validate_url'          => $cas_validate_url,
+      'cas_version'               => $apache::mod::auth_cas::cas_version,
+      'cas_debug'                 => $apache::mod::auth_cas::cas_debug,
+      'cas_certificate_path'      => $apache::mod::auth_cas::cas_certificate_path,
+      'cas_proxy_validate_url'    => $apache::mod::auth_cas::cas_proxy_validate_url,
+      'cas_validate_depth'        => $apache::mod::auth_cas::cas_validate_depth,
+      'cas_root_proxied_as'       => $cas_root_proxied_as,
+      'cas_cookie_entropy'        => $apache::mod::auth_cas::cas_cookie_entropy,
+      'cas_timeout'               => $apache::mod::auth_cas::cas_timeout,
+      'cas_idle_timeout'          => $apache::mod::auth_cas::cas_idle_timeout,
+      'cas_cache_clean_interval'  => $apache::mod::auth_cas::cas_cache_clean_interval,
+      'cas_cookie_domain'         => $apache::mod::auth_cas::cas_cookie_domain,
+      'cas_cookie_http_only'      => $apache::mod::auth_cas::cas_cookie_http_only,
+      'cas_authoritative'         => $apache::mod::auth_cas::cas_authoritative,
+      'cas_sso_enabled'           => $cas_sso_enabled,
+      'cas_validate_saml'         => $cas_validate_saml,
+      'cas_attribute_prefix'      => $cas_attribute_prefix,
+      'cas_attribute_delimiter'   => $cas_attribute_delimiter,
+      'cas_scrub_request_headers' => $cas_scrub_request_headers,
+    }
     concat::fragment { "${name}-auth_cas":
       target  => "${priority_real}${filename}.conf",
       order   => 350,
-      content => template('apache/vhost/_auth_cas.erb'),
+      content => epp('apache/vhost/_auth_cas.epp', $auth_cas_params),
     }
   }
 
-  # Template uses:
-  # - $http_protocol_options
   if $http_protocol_options {
     concat::fragment { "${name}-http_protocol_options":
       target  => "${priority_real}${filename}.conf",
       order   => 350,
-      content => template('apache/vhost/_http_protocol_options.erb'),
+      content => epp('apache/vhost/_http_protocol_options.epp', { 'http_protocol_options' => $http_protocol_options }),
     }
   }
 
-  # Template uses:
-  # - $auth_oidc
-  # - $oidc_settings
   if $auth_oidc and $ensure == 'present' {
     include apache::mod::auth_openidc
 
@@ -2909,31 +2932,29 @@
     }
   }
 
-  # Template uses:
-  # - $shib_compat_valid_user
   if $shibboleth_enabled {
     concat::fragment { "${name}-shibboleth":
       target  => "${priority_real}${filename}.conf",
       order   => 370,
-      content => template('apache/vhost/_shib.erb'),
+      content => epp('apache/vhost/_shib.epp', { 'shib_compat_valid_user' => $shib_compat_valid_user }),
     }
   }
 
-  # - $use_canonical_name
   if $use_canonical_name {
     concat::fragment { "${name}-use_canonical_name":
       target  => "${priority_real}${filename}.conf",
       order   => 360,
-      content => template('apache/vhost/_use_canonical_name.erb'),
+      content => "UseCanonicalName ${use_canonical_name}",
     }
   }
 
-  # Template uses:
-  # - $define
-  # - $passenger_pre_start
+  $file_footer_params = {
+    'define'              => $define,
+    'passenger_pre_start' => $passenger_pre_start,
+  }
   concat::fragment { "${name}-file_footer":
     target  => "${priority_real}${filename}.conf",
     order   => 999,
-    content => template('apache/vhost/_file_footer.erb'),
+    content => epp('apache/vhost/_file_footer.epp', $file_footer_params),
   }
 }
diff --git a/templates/vhost/_action.epp b/templates/vhost/_action.epp
new file mode 100644
index 0000000000..1a08e18452
--- /dev/null
+++ b/templates/vhost/_action.epp
@@ -0,0 +1,4 @@
+<%- if $action { -%>
+
+  Action <%= $action %> /cgi-bin virtual
+<% } -%>
diff --git a/templates/vhost/_action.erb b/templates/vhost/_action.erb
deleted file mode 100644
index 8a02290595..0000000000
--- a/templates/vhost/_action.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if @action -%>
-
-  Action <%= @action %> /cgi-bin virtual
-<% end -%>
diff --git a/templates/vhost/_aliases.epp b/templates/vhost/_aliases.epp
new file mode 100644
index 0000000000..f956f6a783
--- /dev/null
+++ b/templates/vhost/_aliases.epp
@@ -0,0 +1,14 @@
+  ## Alias declarations for resources outside the DocumentRoot
+  <%- $aliases.each |$alias_statement| { -%>
+    <%- if $alias_statement["path"] { -%>
+      <%- if $alias_statement["alias"] { -%>
+  Alias <%= $alias_statement["alias"] %> "<%= $alias_statement["path"] %>"
+      <%- }elsif $alias_statement["aliasmatch"] { -%>
+  AliasMatch <%= $alias_statement["aliasmatch"] %> "<%= $alias_statement["path"] %>"
+      <%- } elsif $alias_statement["scriptalias"] { -%>
+  ScriptAlias <%= $alias_statement["scriptalias"] %> "<%= $alias_statement["path"] %>"
+      <%- } elsif $alias_statement["scriptaliasmatch"] { -%>
+  ScriptAliasMatch <%= $alias_statement["scriptaliasmatch"] %> "<%= $alias_statement["path"] %>"
+      <%- } -%>
+    <%- } -%>
+  <%- } -%>
diff --git a/templates/vhost/_aliases.erb b/templates/vhost/_aliases.erb
deleted file mode 100644
index 29b3e9961d..0000000000
--- a/templates/vhost/_aliases.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-  ## Alias declarations for resources outside the DocumentRoot
-  <%- @aliases.each do |alias_statement| -%>
-    <%- if alias_statement["path"] -%>
-      <%- if alias_statement["alias"] -%>
-  Alias <%= alias_statement["alias"] %> "<%= alias_statement["path"] %>"
-      <%- elsif alias_statement["aliasmatch"] -%>
-  AliasMatch <%= alias_statement["aliasmatch"] %> "<%= alias_statement["path"] %>"
-      <%- elsif alias_statement["scriptalias"] -%>
-  ScriptAlias <%= alias_statement["scriptalias"] %> "<%= alias_statement["path"] %>"
-      <%- elsif alias_statement["scriptaliasmatch"] -%>
-  ScriptAliasMatch <%= alias_statement["scriptaliasmatch"] %> "<%= alias_statement["path"] %>"
-      <%- end -%>
-    <%- end -%>
-  <%- end -%>
diff --git a/templates/vhost/_allow_encoded_slashes.epp b/templates/vhost/_allow_encoded_slashes.epp
new file mode 100644
index 0000000000..014a9e83fa
--- /dev/null
+++ b/templates/vhost/_allow_encoded_slashes.epp
@@ -0,0 +1,4 @@
+<%- if $allow_encoded_slashes { -%>
+
+  AllowEncodedSlashes <%= $allow_encoded_slashes %>
+<%- } -%>
diff --git a/templates/vhost/_allow_encoded_slashes.erb b/templates/vhost/_allow_encoded_slashes.erb
deleted file mode 100644
index 40c73433b1..0000000000
--- a/templates/vhost/_allow_encoded_slashes.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%- if @allow_encoded_slashes -%>
-
-  AllowEncodedSlashes <%= @allow_encoded_slashes %>
-<%- end -%>
diff --git a/templates/vhost/_auth_cas.epp b/templates/vhost/_auth_cas.epp
new file mode 100644
index 0000000000..03b3cca982
--- /dev/null
+++ b/templates/vhost/_auth_cas.epp
@@ -0,0 +1,65 @@
+<%- if $cas_enabled { -%>
+  <%- if $cas_cookie_path { -%>
+  CASCookiePath <%= $cas_cookie_path %>
+  <%- } -%>
+  <%- if $cas_login_url { -%>
+  CASLoginURL <%= $cas_login_url %>
+  <%- } -%>
+  <%- if $cas_validate_url { -%>
+  CASValidateURL <%= $cas_validate_url %>
+  <%- } -%>
+  <%- if $cas_version { -%>
+  CASVersion <%= $cas_version %>
+  <%- } -%>
+  <%- if $cas_debug { -%>
+  CASDebug <%= $cas_debug %>
+  <%- } -%>
+  <%- if $cas_certificate_path { -%>
+  CASCertificatePath <%= $cas_certificate_path %>
+  <%- } -%>
+  <%- if $cas_proxy_validate_url { -%>
+  CASProxyValidateURL <%= $cas_proxy_validate_url %>
+  <%- } -%>
+  <%- if $cas_validate_depth { -%>
+  CASValidateDepth <%= $cas_validate_depth %>
+  <%- } -%>
+  <%- if $cas_root_proxied_as { -%>
+  CASRootProxiedAs <%= $cas_root_proxied_as %>
+  <%- } -%>
+  <%- if $cas_cookie_entropy { -%>
+  CASCookieEntropy <%= $cas_cookie_entropy %>
+  <%- } -%>
+  <%- if $cas_timeout { -%>
+  CASTimeout <%= $cas_timeout %>
+  <%- } -%>
+  <%- if $cas_idle_timeout { -%>
+  CASIdleTimeout <%= $cas_idle_timeout %>
+  <%- } -%>
+  <%- if $cas_cache_clean_interval { -%>
+  CASCacheCleanInterval <%= $cas_cache_clean_interval %>
+  <%- } -%>
+  <%- if $cas_cookie_domain { -%>
+  CASCookieDomain <%= $cas_cookie_domain %>
+  <%- } -%>
+  <%- if $cas_cookie_http_only { -%>
+  CASCookieHttpOnly <%= $cas_cookie_http_only %>
+  <%- } -%>
+  <%- if $cas_authoritative { -%>
+  CASAuthoritative <%= $cas_authoritative %>
+  <%- } -%>
+  <%- if $cas_sso_enabled { -%>
+  CASSSOEnabled On
+  <%- } -%>
+  <%- if $cas_validate_saml { -%>
+  CASValidateSAML On
+  <%- } -%>
+  <%- if $cas_attribute_prefix { -%>
+  CASAttributePrefix <%= $cas_attribute_prefix %>
+  <%- } -%>
+  <%- if $cas_attribute_delimiter { -%>
+  CASAttributeDelimiter <%= $cas_attribute_delimiter %>
+  <%- } -%>
+  <%- if $cas_scrub_request_headers { -%>
+  CASScrubRequestHeaders On
+  <%- } -%>
+<%- } -%>
diff --git a/templates/vhost/_auth_cas.erb b/templates/vhost/_auth_cas.erb
deleted file mode 100644
index 39912a80ce..0000000000
--- a/templates/vhost/_auth_cas.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-<% if @cas_enabled -%>
-  <%- if @cas_cookie_path -%>
-  CASCookiePath <%= @cas_cookie_path %>
-  <%- end -%>
-  <%- if @cas_login_url -%>
-  CASLoginURL <%= @cas_login_url %>
-  <%- end -%>
-  <%- if @cas_validate_url -%>
-  CASValidateURL <%= @cas_validate_url %>
-  <%- end -%>
-  <%- if @cas_version -%>
-  CASVersion <%= @cas_version %>
-  <%- end -%>
-  <%- if @cas_debug -%>
-  CASDebug <%= @cas_debug %>
-  <%- end -%>
-  <%- if @cas_certificate_path -%>
-  CASCertificatePath <%= @cas_certificate_path %>
-  <%- end -%>
-  <%- if @cas_proxy_validate_url -%>
-  CASProxyValidateURL <%= @cas_proxy_validate_url %>
-  <%- end -%>
-  <%- if @cas_validate_depth -%>
-  CASValidateDepth <%= @cas_validate_depth %>
-  <%- end -%>
-  <%- if @cas_root_proxied_as -%>
-  CASRootProxiedAs <%= @cas_root_proxied_as %>
-  <%- end -%>
-  <%- if @cas_cookie_entropy -%>
-  CASCookieEntropy <%= @cas_cookie_entropy %>
-  <%- end -%>
-  <%- if @cas_timeout -%>
-  CASTimeout <%= @cas_timeout %>
-  <%- end -%>
-  <%- if @cas_idle_timeout -%>
-  CASIdleTimeout <%= @cas_idle_timeout %>
-  <%- end -%>
-  <%- if @cas_cache_clean_interval -%>
-  CASCacheCleanInterval <%= @cas_cache_clean_interval %>
-  <%- end -%>
-  <%- if @cas_cookie_domain -%>
-  CASCookieDomain <%= @cas_cookie_domain %>
-  <%- end -%>
-  <%- if @cas_cookie_http_only -%>
-  CASCookieHttpOnly <%= @cas_cookie_http_only %>
-  <%- end -%>
-  <%- if @cas_authoritative -%>
-  CASAuthoritative <%= @cas_authoritative %>
-  <%- end -%>
-  <%- if @cas_sso_enabled -%>
-  CASSSOEnabled On
-  <%- end -%>
-  <%- if @cas_validate_saml -%>
-  CASValidateSAML On
-  <%- end -%>
-  <%- if @cas_attribute_prefix -%>
-  CASAttributePrefix <%= @cas_attribute_prefix %>
-  <%- end -%>
-  <%- if @cas_attribute_delimiter -%>
-  CASAttributeDelimiter <%= @cas_attribute_delimiter %>
-  <%- end -%>
-  <%- if @cas_scrub_request_headers -%>
-  CASScrubRequestHeaders On
-  <%- end -%>
-<%- end -%>
diff --git a/templates/vhost/_charsets.epp b/templates/vhost/_charsets.epp
new file mode 100644
index 0000000000..1277941c41
--- /dev/null
+++ b/templates/vhost/_charsets.epp
@@ -0,0 +1,4 @@
+<%- if $add_default_charset { -%>
+
+  AddDefaultCharset <%= $add_default_charset %>
+<% } -%>
diff --git a/templates/vhost/_charsets.erb b/templates/vhost/_charsets.erb
deleted file mode 100644
index ef83def4b9..0000000000
--- a/templates/vhost/_charsets.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if @add_default_charset -%>
-
-  AddDefaultCharset <%= @add_default_charset %>
-<% end -%>
diff --git a/templates/vhost/_custom_fragment.epp b/templates/vhost/_custom_fragment.epp
new file mode 100644
index 0000000000..d66f69ea2d
--- /dev/null
+++ b/templates/vhost/_custom_fragment.epp
@@ -0,0 +1,5 @@
+<%- if $custom_fragment { -%>
+
+  ## Custom fragment
+  <%= $custom_fragment %>
+<% } -%>
diff --git a/templates/vhost/_custom_fragment.erb b/templates/vhost/_custom_fragment.erb
deleted file mode 100644
index 35c264adb9..0000000000
--- a/templates/vhost/_custom_fragment.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if @custom_fragment -%>
-
-  ## Custom fragment
-  <%= @custom_fragment %>
-<% end -%>
diff --git a/templates/vhost/_docroot.epp b/templates/vhost/_docroot.epp
new file mode 100644
index 0000000000..5071838c13
--- /dev/null
+++ b/templates/vhost/_docroot.epp
@@ -0,0 +1,8 @@
+
+  ## Vhost docroot
+<%- if $virtual_docroot { -%>
+  VirtualDocumentRoot "<%= $virtual_docroot %>"
+<% } -%>
+<%- if $docroot and ((! $virtual_docroot) or $virtual_use_default_docroot) { -%>
+  DocumentRoot "<%= $docroot %>"
+<%- } -%>
diff --git a/templates/vhost/_docroot.erb b/templates/vhost/_docroot.erb
deleted file mode 100644
index 1ec495fe24..0000000000
--- a/templates/vhost/_docroot.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  ## Vhost docroot
-<% if @virtual_docroot -%>
-  VirtualDocumentRoot "<%= @virtual_docroot %>"
-<% end -%>
-<% if @docroot and ((not @virtual_docroot) or @virtual_use_default_docroot) -%>
-  DocumentRoot "<%= @docroot %>"
-<% end -%>
diff --git a/templates/vhost/_fallbackresource.epp b/templates/vhost/_fallbackresource.epp
new file mode 100644
index 0000000000..3d8082b9e1
--- /dev/null
+++ b/templates/vhost/_fallbackresource.epp
@@ -0,0 +1,4 @@
+<%- if $fallbackresource { -%>
+
+  FallbackResource <%= $fallbackresource %>
+<%- } -%>
diff --git a/templates/vhost/_fallbackresource.erb b/templates/vhost/_fallbackresource.erb
deleted file mode 100644
index f1e4c35dc4..0000000000
--- a/templates/vhost/_fallbackresource.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if @fallbackresource -%>
-
-  FallbackResource <%= @fallbackresource %>
-<% end -%>
diff --git a/templates/vhost/_file_footer.epp b/templates/vhost/_file_footer.epp
new file mode 100644
index 0000000000..c8ef12c6af
--- /dev/null
+++ b/templates/vhost/_file_footer.epp
@@ -0,0 +1,9 @@
+<%- $define.each | $k, $v| { -%>
+  Undefine <%= $k %>
+<% } -%>
+</VirtualHost>
+<%- if $passenger_pre_start { -%>
+  <%- [$passenger_pre_start].flatten().filter |$value| { $value }.each |$passenger_pre_start| { -%>
+PassengerPreStart <%= $passenger_pre_start %>
+  <%- } -%>
+<%- } -%>
diff --git a/templates/vhost/_file_footer.erb b/templates/vhost/_file_footer.erb
deleted file mode 100644
index d42a1bdbe6..0000000000
--- a/templates/vhost/_file_footer.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% @define.each do | k, v| -%>
-  Undefine <%= k %>
-<% end -%>
-</VirtualHost>
-<% if @passenger_pre_start -%>
-  <%- [@passenger_pre_start].flatten.compact.each do |passenger_pre_start| -%>
-PassengerPreStart <%= passenger_pre_start %>
-  <%- end -%>
-<% end -%>
diff --git a/templates/vhost/_file_header.epp b/templates/vhost/_file_header.epp
new file mode 100644
index 0000000000..0fce926354
--- /dev/null
+++ b/templates/vhost/_file_header.epp
@@ -0,0 +1,43 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+<%= [$comment].flatten.map |$c| { "# ${c}" }.join("\n") -%>
+<%- if $mdomain { -%>
+
+  <%- if $mdomain =~ String { -%>
+
+MDomain <%= $mdomain %>
+  <%-} else {-%>
+MDomain <%= $servername %>
+  <%- } -%>
+<% } -%>
+
+<VirtualHost <%= [$nvh_addr_port].flatten().filter |$value| { $value }.join(' ') %>>
+<% $define.each | $k, $v| { -%>
+  Define <%= $k %> <%= $v %>
+<% } -%>
+<% if $servername and !$servername.empty { -%>
+  ServerName <%= $servername %>
+<% } -%>
+<% if $serveradmin { -%>
+  ServerAdmin <%= $serveradmin %>
+<% } -%>
+<%- unless $protocols.empty { -%>
+  Protocols <%= join($protocols, ' ') %>
+<%- } -%>
+<%- unless $protocols_honor_order == undef { -%>
+  ProtocolsHonorOrder <%= apache::bool2httpd($protocols_honor_order) %>
+<%- } -%>
+<% if $limitreqfieldsize { -%>
+  LimitRequestFieldSize <%= $limitreqfieldsize %>
+<% } -%>
+<% if $limitreqfields { -%>
+  LimitRequestFields <%= $limitreqfields %>
+<% } -%>
+<% if $limitreqline { -%>
+  LimitRequestLine <%= $limitreqline %>
+<% } -%>
+<% if $limitreqbody { -%>
+  LimitRequestBody <%= $limitreqbody %>
+<% } %>
diff --git a/templates/vhost/_file_header.erb b/templates/vhost/_file_header.erb
deleted file mode 100644
index a9c7dcf9e2..0000000000
--- a/templates/vhost/_file_header.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-# ************************************
-# Vhost template in module puppetlabs-apache
-# Managed by Puppet
-# ************************************
-<%= [@comment].flatten.collect{|c| "# #{c}"}.join("\n") -%>
-<% if @mdomain -%>
-
-  <%- if @mdomain.is_a?(String) -%>
-MDomain <%= @mdomain %>
-  <%- else -%>
-MDomain <%= @servername %>
-  <%- end -%>
-<% end -%>
-
-<VirtualHost <%= [@nvh_addr_port].flatten.compact.join(' ') %>>
-<% @define.each do | k, v| -%>
-  Define <%= k %> <%= v %>
-<% end -%>
-<% if @servername and not @servername.empty? -%>
-  ServerName <%= @servername %>
-<% end -%>
-<% if @serveradmin -%>
-  ServerAdmin <%= @serveradmin %>
-<% end -%>
-<%- unless @protocols.empty? -%>
-  Protocols <%= @protocols.join(' ') %>
-<%- end -%>
-<%- unless @protocols_honor_order.nil? -%>
-  ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %>
-<%- end -%>
-<% if @limitreqfieldsize -%>
-  LimitRequestFieldSize <%= @limitreqfieldsize %>
-<% end -%>
-<% if @limitreqfields -%>
-  LimitRequestFields <%= @limitreqfields %>
-<% end -%>
-<% if @limitreqline -%>
-  LimitRequestLine <%= @limitreqline %>
-<% end -%>
-<% if @limitreqbody -%>
-  LimitRequestBody <%= @limitreqbody %>
-<% end -%>
diff --git a/templates/vhost/_filters.epp b/templates/vhost/_filters.epp
new file mode 100644
index 0000000000..ff2d8ae000
--- /dev/null
+++ b/templates/vhost/_filters.epp
@@ -0,0 +1,8 @@
+<%- unless $filters.empty { -%>
+
+  ## Filter module rules
+  ## as per http://httpd.apache.org/docs/2.4/mod/mod_filter.html
+  <%- $filters.each |$filter| { -%>
+  <%= $filter %>
+  <%- } -%>
+<%- } -%>
diff --git a/templates/vhost/_filters.erb b/templates/vhost/_filters.erb
deleted file mode 100644
index bb36fc3914..0000000000
--- a/templates/vhost/_filters.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% unless @filters.empty? -%>
-
-  ## Filter module rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_filter.html
-  <%- @filters.each do |filter| -%>
-  <%= filter %>
-  <%- end -%>
-<% end -%>
diff --git a/templates/vhost/_header.epp b/templates/vhost/_header.epp
new file mode 100644
index 0000000000..44066709c2
--- /dev/null
+++ b/templates/vhost/_header.epp
@@ -0,0 +1,8 @@
+<% unless $headers.empty { -%>
+
+  ## Header rules
+  ## as per http://httpd.apache.org/docs/2.4/mod/mod_headers.html#header
+  <%- $headers.each |$header_statement| { -%>
+  Header <%= $header_statement %>
+  <%- } -%>
+<% } -%>
diff --git a/templates/vhost/_header.erb b/templates/vhost/_header.erb
deleted file mode 100644
index 54f84cac5a..0000000000
--- a/templates/vhost/_header.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% unless @headers.empty? -%>
-
-  ## Header rules
-  ## as per http://httpd.apache.org/docs/2.4/mod/mod_headers.html#header
-  <%- @headers.each do |header_statement| -%>
-  Header <%= header_statement %>
-  <%- end -%>
-<% end -%>
diff --git a/templates/vhost/_http2.epp b/templates/vhost/_http2.epp
new file mode 100644
index 0000000000..e62fcfd05b
--- /dev/null
+++ b/templates/vhost/_http2.epp
@@ -0,0 +1,45 @@
+<% if $h2_copy_files != undef { -%>
+  H2CopyFiles <%= apache::bool2httpd($h2_copy_files) %>
+<% } -%>
+<% if $h2_direct != undef { -%>
+  H2Direct <%= apache::bool2httpd($h2_direct) %>
+<% } -%>
+<% if $h2_early_hints != undef {-%>
+  H2EarlyHints <%= apache::bool2httpd($h2_early_hints) %>
+<% } -%>
+<% if $h2_max_session_streams != undef { -%>
+  H2MaxSessionStreams <%= $h2_max_session_streams %>
+<% } -%>
+<%- if $h2_modern_tls_only != undef { -%>
+  H2ModernTLSOnly <%= apache::bool2httpd($h2_modern_tls_only) %>
+<%- } -%>
+<%- if $h2_push != undef { -%>
+  H2Push <%= apache::bool2httpd($h2_push) %>
+<%- } -%>
+<%- if $h2_push_diary_size != undef { -%>
+  H2PushDiarySize <%= $h2_push_diary_size %>
+<%- } -%>
+<%- $h2_push_priority.each |$expr| { -%>
+  H2PushPriority <%= $expr %>
+<%- } -%>
+<%- $h2_push_resource.each |$expr| { -%>
+  H2PushResource <%= $expr %>
+<%- } -%>
+<% if $h2_serialize_headers != undef  { -%>
+  H2SerializeHeaders <%= apache::bool2httpd($h2_serialize_headers) %>
+<% } -%>
+<% if $h2_stream_max_mem_size != undef { -%>
+  H2StreamMaxMemSize <%= $h2_stream_max_mem_size %>
+<% } -%>
+<%- if $h2_tls_cool_down_secs != undef { -%>
+  H2TLSCoolDownSecs <%= $h2_tls_cool_down_secs %>
+<%- } -%>
+<%- if $h2_tls_warm_up_size != undef { -%>
+  H2TLSWarmUpSize <%= $h2_tls_warm_up_size %>
+<%- } -%>
+<% if $h2_upgrade != undef { -%>
+  H2Upgrade <%= apache::bool2httpd($h2_upgrade) %>
+<% } -%>
+<% if $h2_window_size != undef { -%>
+  H2WindowSize <%= $h2_window_size %>
+<% } -%>
diff --git a/templates/vhost/_http2.erb b/templates/vhost/_http2.erb
deleted file mode 100644
index 063a89043f..0000000000
--- a/templates/vhost/_http2.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-<% if !@h2_copy_files.nil? -%>
-  H2CopyFiles <%= scope.call_function('apache::bool2httpd', [@h2_copy_files]) %>
-<% end -%>
-<% unless @h2_direct.nil? -%>
-  H2Direct <%= scope.call_function('apache::bool2httpd', [@h2_direct]) %>
-<% end -%>
-<% if !@h2_early_hints.nil? -%>
-  H2EarlyHints <%= scope.call_function('apache::bool2httpd', [@h2_early_hints]) %>
-<% end -%>
-<% unless @h2_max_session_streams.nil? -%>
-  H2MaxSessionStreams <%= @h2_max_session_streams %>
-<% end -%>
-<%- unless @h2_modern_tls_only.nil? -%>
-  H2ModernTLSOnly <%= scope.call_function('apache::bool2httpd', [@h2_modern_tls_only]) %>
-<%- end -%>
-<%- unless @h2_push.nil? -%>
-  H2Push <%= scope.call_function('apache::bool2httpd', [@h2_push]) %>
-<%- end -%>
-<%- unless @h2_push_diary_size.nil? -%>
-  H2PushDiarySize <%= @h2_push_diary_size %>
-<%- end -%>
-<%- @h2_push_priority.each do |expr| -%>
-  H2PushPriority <%= expr %>
-<%- end -%>
-<%- @h2_push_resource.each do |expr| -%>
-  H2PushResource <%= expr %>
-<%- end -%>
-<% unless @h2_serialize_headers.nil? -%>
-  H2SerializeHeaders <%= scope.call_function('apache::bool2httpd', [@h2_serialize_headers]) %>
-<% end -%>
-<% unless @h2_stream_max_mem_size.nil? -%>
-  H2StreamMaxMemSize <%= @h2_stream_max_mem_size %>
-<% end -%>
-<%- unless @h2_tls_cool_down_secs.nil? -%>
-  H2TLSCoolDownSecs <%= @h2_tls_cool_down_secs %>
-<%- end -%>
-<%- unless @h2_tls_warm_up_size.nil? -%>
-  H2TLSWarmUpSize <%= @h2_tls_warm_up_size %>
-<%- end -%>
-<% unless @h2_upgrade.nil? -%>
-  H2Upgrade <%= scope.call_function('apache::bool2httpd', [@h2_upgrade]) %>
-<% end -%>
-<% unless @h2_window_size.nil? -%>
-  H2WindowSize <%= @h2_window_size %>
-<% end -%>
diff --git a/templates/vhost/_http_protocol_options.epp b/templates/vhost/_http_protocol_options.epp
new file mode 100644
index 0000000000..7243ed02e5
--- /dev/null
+++ b/templates/vhost/_http_protocol_options.epp
@@ -0,0 +1 @@
+HttpProtocolOptions <%= $http_protocol_options %>
diff --git a/templates/vhost/_http_protocol_options.erb b/templates/vhost/_http_protocol_options.erb
deleted file mode 100644
index efad7e6d85..0000000000
--- a/templates/vhost/_http_protocol_options.erb
+++ /dev/null
@@ -1 +0,0 @@
-HttpProtocolOptions <%= @http_protocol_options %>
diff --git a/templates/vhost/_itk.epp b/templates/vhost/_itk.epp
new file mode 100644
index 0000000000..a628ae3170
--- /dev/null
+++ b/templates/vhost/_itk.epp
@@ -0,0 +1,29 @@
+<% if $itk and ! $itk.empty { -%>
+
+  ## ITK statement
+  <IfModule mpm_itk_module>
+     <%- if $itk["user"] and $itk["group"] { -%>
+     AssignUserId <%= $itk["user"] %> <%= $itk["group"] %>
+     <%- } -%>
+     <%- if $itk["assignuseridexpr"] { -%>
+     AssignUserIdExpr <%= $itk["assignuseridexpr"] %>
+     <%- } -%>
+     <%- if $itk["assigngroupidexpr"] { -%>
+     AssignGroupIdExpr <%= $itk["assigngroupidexpr"] %>
+     <%- } -%>
+     <%- if $itk["maxclientvhost"] { -%>
+     MaxClientsVHost <%= $itk["maxclientvhost"] %>
+     <%- } -%>
+     <%- if $itk["nice"] { -%>
+     NiceValue <%= $itk["nice"] %>
+     <%- } -%>
+     <%- if $kernelversion >= '3.5.0' { -%>
+       <%- if $itk["limituidrange"] { -%>
+     LimitUIDRange <%= $itk["limituidrange"] %>
+       <%- } -%>
+       <%- if $itk["limitgidrange"] { -%>
+     LimitGIDRange <%= $itk["limitgidrange"] %>
+       <%- } -%>
+     <%- } -%>
+  </IfModule>
+<% } -%>
diff --git a/templates/vhost/_itk.erb b/templates/vhost/_itk.erb
deleted file mode 100644
index 803a73db7f..0000000000
--- a/templates/vhost/_itk.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<% if @itk and ! @itk.empty? -%>
-
-  ## ITK statement
-  <IfModule mpm_itk_module>
-     <%- if @itk["user"] and @itk["group"] -%>
-     AssignUserId <%= @itk["user"] %> <%= @itk["group"] %>
-     <%- end -%>
-     <%- if @itk["assignuseridexpr"] -%>
-     AssignUserIdExpr <%= @itk["assignuseridexpr"] %>
-     <%- end -%>
-     <%- if @itk["assigngroupidexpr"] -%>
-     AssignGroupIdExpr <%= @itk["assigngroupidexpr"] %>
-     <%- end -%>
-     <%- if @itk["maxclientvhost"] -%>
-     MaxClientsVHost <%= @itk["maxclientvhost"] %>
-     <%- end -%>
-     <%- if @itk["nice"] -%>
-     NiceValue <%= @itk["nice"] %>
-     <%- end -%>
-     <%- if @kernelversion >= '3.5.0' -%>
-       <%- if @itk["limituidrange"] -%>
-     LimitUIDRange <%= @itk["limituidrange"] %>
-       <%- end -%>
-       <%- if @itk["limitgidrange"] -%>
-     LimitGIDRange <%= @itk["limitgidrange"] %>
-       <%- end -%>
-     <%- end -%>
-  </IfModule>
-<% end -%>
diff --git a/templates/vhost/_jk_mounts.epp b/templates/vhost/_jk_mounts.epp
new file mode 100644
index 0000000000..6577715d5d
--- /dev/null
+++ b/templates/vhost/_jk_mounts.epp
@@ -0,0 +1,10 @@
+<% unless $jk_mounts.empty { -%>
+
+  <%- $jk_mounts.each |$jk| { -%>
+    <%- if $jk['mount'] != undef and $jk['worker'] != undef { -%>
+  JkMount   <%= $jk['mount'] %> <%= $jk['worker'] %>
+    <%-} elsif $jk['unmount'] != undef and $jk['worker'] != undef { -%>
+  JkUnMount <%= $jk['unmount'] %> <%= $jk['worker'] %>
+    <%- } -%>
+  <%- } -%>
+<% } -%>
diff --git a/templates/vhost/_jk_mounts.erb b/templates/vhost/_jk_mounts.erb
deleted file mode 100644
index 3bd5a721a6..0000000000
--- a/templates/vhost/_jk_mounts.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% unless @jk_mounts.empty? -%>
-
-  <%- @jk_mounts.each do |jk| -%>
-    <%- if jk.has_key?('mount') and jk.has_key?('worker') -%>
-  JkMount   <%= jk['mount'] %> <%= jk['worker'] %>
-    <%- elsif jk.has_key?('unmount') and jk.has_key?('worker') -%>
-  JkUnMount <%= jk['unmount'] %> <%= jk['worker'] %>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/templates/vhost/_keepalive_options.epp b/templates/vhost/_keepalive_options.epp
new file mode 100644
index 0000000000..192630811c
--- /dev/null
+++ b/templates/vhost/_keepalive_options.epp
@@ -0,0 +1,9 @@
+<%- if $keepalive { -%>
+  KeepAlive <%= $keepalive %>
+<%- } -%>
+<%- if $keepalive_timeout { -%>
+  KeepAliveTimeout <%= $keepalive_timeout %>
+<%- } -%>
+<%- if $max_keepalive_requests { -%>
+  MaxKeepAliveRequests <%= $max_keepalive_requests %>
+<%- } -%>
diff --git a/templates/vhost/_keepalive_options.erb b/templates/vhost/_keepalive_options.erb
deleted file mode 100644
index d14f5ed155..0000000000
--- a/templates/vhost/_keepalive_options.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%- if @keepalive -%>
-  KeepAlive <%= @keepalive %>
-<%- end -%>
-<%- if @keepalive_timeout -%>
-  KeepAliveTimeout <%= @keepalive_timeout %>
-<%- end -%>
-<%- if @max_keepalive_requests -%>
-  MaxKeepAliveRequests <%= @max_keepalive_requests %>
-<%- end -%>
diff --git a/templates/vhost/_logging.epp b/templates/vhost/_logging.epp
new file mode 100644
index 0000000000..183e6c2851
--- /dev/null
+++ b/templates/vhost/_logging.epp
@@ -0,0 +1,21 @@
+<% if $error_log or $log_level { -%>
+
+  ## Logging
+<% } -%>
+<% if $error_log { -%>
+  ErrorLog "<%= $error_log_destination %>"
+<% } -%>
+<% if $log_level { -%>
+  LogLevel <%= $log_level %>
+<% } -%>
+<% if $error_log_format { -%>
+  <%- $error_log_format.each |$lfmt| { -%>
+    <%- if $lfmt =~ Hash { -%>
+      <%- $lfmt.each |$fmt, $flag| { -%>
+  ErrorLogFormat <%= $flag %> "<%= $fmt %>"
+      <%- } -%>
+    <%-} else { -%>
+  ErrorLogFormat "<%= $lfmt %>"
+    <%- } -%>
+  <%- } -%>
+<% } -%>
diff --git a/templates/vhost/_logging.erb b/templates/vhost/_logging.erb
deleted file mode 100644
index 91c328046b..0000000000
--- a/templates/vhost/_logging.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% if @error_log or @log_level -%>
-
-  ## Logging
-<% end -%>
-<% if @error_log -%>
-  ErrorLog "<%= @error_log_destination %>"
-<% end -%>
-<% if @log_level -%>
-  LogLevel <%= @log_level %>
-<% end -%>
-<% if @error_log_format -%>
-  <%- @error_log_format.each do |lfmt| -%>
-    <%- if lfmt.is_a?(Hash) -%>
-      <%- lfmt.each do |fmt, flag| -%>
-  ErrorLogFormat <%= flag %> "<%= fmt %>"
-      <%- end -%>
-    <%- else -%>
-  ErrorLogFormat "<%= lfmt %>"
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/templates/vhost/_passenger.epp b/templates/vhost/_passenger.epp
new file mode 100644
index 0000000000..05400a7592
--- /dev/null
+++ b/templates/vhost/_passenger.epp
@@ -0,0 +1,144 @@
+<%# 1 - Essentials -%>
+<%# 2 - Deployment options -%>
+<% unless $passenger_enabled == undef { -%>
+  PassengerEnabled <%= apache::bool2httpd($passenger_enabled) %>
+<% } -%>
+<% if $passenger_base_uri { -%>
+  PassengerBaseURI <%= $passenger_base_uri %>
+<% } -%>
+<%# 3 - Application loading options -%>
+<% if $passenger_ruby { -%>
+  PassengerRuby <%= $passenger_ruby %>
+<% } -%>
+<% if $passenger_python { -%>
+  PassengerPython <%= $passenger_python %>
+<% } -%>
+<% if $passenger_nodejs { -%>
+  PassengerNodejs <%= $passenger_nodejs %>
+<% } -%>
+<% if $passenger_meteor_app_settings { -%>
+  PassengerMeteorAppSettings <%= $passenger_meteor_app_settings %>
+<% } -%>
+<% if $passenger_app_env { -%>
+  PassengerAppEnv <%= $passenger_app_env %>
+<% } -%>
+<% if $passenger_app_root { -%>
+  PassengerAppRoot <%= $passenger_app_root %>
+<% } -%>
+<% if $passenger_app_group_name { -%>
+  PassengerAppGroupName <%= $passenger_app_group_name %>
+<% } -%>
+<% if $passenger_app_start_command { -%>
+  PassengerAppStartCommand <%= $passenger_app_start_command %>
+<% } -%>
+<% if $passenger_app_type { -%>
+  PassengerAppType <%= $passenger_app_type %>
+<% } -%>
+<% if $passenger_startup_file { -%>
+  PassengerStartupFile <%= $passenger_startup_file %>
+<% } -%>
+<% if $passenger_restart_dir { -%>
+  PassengerRestartDir <%= $passenger_restart_dir %>
+<% } -%>
+<% if $passenger_spawn_method { -%>
+  PassengerSpawnMethod <%= $passenger_spawn_method %>
+<% } -%>
+<% unless $passenger_load_shell_envvars == undef { -%>
+  PassengerLoadShellEnvvars <%= apache::bool2httpd($passenger_load_shell_envvars) %>
+<% } -%>
+<% unless $passenger_preload_bundler == undef { -%>
+  PassengerPreloadBundler <%= apache::bool2httpd($passenger_preload_bundler) %>
+<% } -%>
+<% unless $passenger_rolling_restarts == undef { -%>
+  PassengerRollingRestarts <%= apache::bool2httpd($passenger_rolling_restarts) %>
+<% } -%>
+<% unless $passenger_resist_deployment_errors == undef { -%>
+  PassengerResistDeploymentErrors <%= apache::bool2httpd($passenger_resist_deployment_errors) %>
+<% } -%>
+<%# 4 - Security options -%>
+<% if $passenger_user {-%>
+  PassengerUser <%= $passenger_user %>
+<% } -%>
+<% if $passenger_group {-%>
+  PassengerGroup <%= $passenger_group %>
+<% } -%>
+<% unless $passenger_friendly_error_pages == undef { -%>
+  PassengerFriendlyErrorPages <%= apache::bool2httpd($passenger_friendly_error_pages) %>
+<% } -%>
+<%# 5 - Resource control and optimization options -%>
+<% if $passenger_min_instances { -%>
+  PassengerMinInstances <%= $passenger_min_instances %>
+<% } -%>
+<% if $passenger_max_instances { -%>
+  PassengerMaxInstances <%= $passenger_max_instances %>
+<% } -%>
+<% if $passenger_max_preloader_idle_time { -%>
+  PassengerMaxPreloaderIdleTime <%= $passenger_max_preloader_idle_time %>
+<% } -%>
+<% if $passenger_force_max_concurrent_requests_per_process { -%>
+  PassengerForceMaxConcurrentRequestsPerProcess <%= $passenger_force_max_concurrent_requests_per_process %>
+<% } -%>
+<% if $passenger_start_timeout { -%>
+  PassengerStartTimeout <%= $passenger_start_timeout %>
+<% } -%>
+<% if $passenger_concurrency_model { -%>
+  PassengerConcurrencyModel <%= $passenger_concurrency_model %>
+<% } -%>
+<% if $passenger_thread_count { -%>
+  PassengerThreadCount <%= $passenger_thread_count %>
+<% } -%>
+<% if $passenger_max_requests { -%>
+  PassengerMaxRequests <%= $passenger_max_requests %>
+<% } -%>
+<% if $passenger_max_request_time { -%>
+  PassengerMaxRequestTime <%= $passenger_max_request_time %>
+<% } -%>
+<% if $passenger_memory_limit { -%>
+  PassengerMemoryLimit <%= $passenger_memory_limit %>
+<% } -%>
+<% if $passenger_stat_throttle_rate { -%>
+  PassengerStatThrottleRate <%= $passenger_stat_throttle_rate %>
+<% } -%>
+<% unless $passenger_high_performance == undef { -%>
+  PassengerHighPerformance <%= apache::bool2httpd($passenger_high_performance) %>
+<% } -%>
+<%# 6 - Connection handling options -%>
+<% unless $passenger_buffer_upload == undef { -%>
+  PassengerBufferUpload <%= apache::bool2httpd($passenger_buffer_upload) %>
+<% } -%>
+<% unless $passenger_buffer_response == undef { -%>
+  PassengerBufferResponse <%= apache::bool2httpd($passenger_buffer_response) %>
+<% } -%>
+<% unless $passenger_error_override == undef { -%>
+  PassengerErrorOverride <%= apache::bool2httpd($passenger_error_override) %>
+<% } -%>
+<% if $passenger_max_request_queue_size { -%>
+  PassengerMaxRequestQueueSize <%= $passenger_max_request_queue_size %>
+<% } -%>
+<% if $passenger_max_request_queue_time { -%>
+  PassengerMaxRequestQueueTime <%= $passenger_max_request_queue_time %>
+<% } -%>
+<% unless $passenger_sticky_sessions == undef { -%>
+  PassengerStickySessions <%= apache::bool2httpd($passenger_sticky_sessions) %>
+<% } -%>
+<% if $passenger_sticky_sessions_cookie_name { -%>
+  PassengerStickySessionsCookieName <%= $passenger_sticky_sessions_cookie_name %>
+<% } -%>
+<% if $passenger_sticky_sessions_cookie_attributes { -%>
+  PassengerStickySessionsCookieAttributes <%= $passenger_sticky_sessions_cookie_attributes %>
+<% } -%>
+<%# 7 - Compatibility options -%>
+<% unless $passenger_allow_encoded_slashes == undef { -%>
+  PassengerAllowEncodedSlashes <%= apache::bool2httpd($passenger_allow_encoded_slashes) %>
+<% } -%>
+<% if $passenger_app_log_file { -%>
+  PassengerAppLogFile <%= $passenger_app_log_file %>
+<% } -%>
+<%# 8 - Logging and debugging options -%>
+<% unless $passenger_debugger == undef { -%>
+  PassengerDebugger <%= apache::bool2httpd($passenger_debugger) %>
+<% } -%>
+<%# 9 - Advanced options -%>
+<% if $passenger_lve_min_uid { -%>
+  PassengerLveMinUid <%= $passenger_lve_min_uid %>
+<% } -%>
diff --git a/templates/vhost/_passenger.erb b/templates/vhost/_passenger.erb
deleted file mode 100644
index b14f9245b6..0000000000
--- a/templates/vhost/_passenger.erb
+++ /dev/null
@@ -1,144 +0,0 @@
-<%# 1 - Essentials -%>
-<%# 2 - Deployment options -%>
-<% unless @passenger_enabled.nil? -%>
-  PassengerEnabled <%= scope.call_function('apache::bool2httpd', [@passenger_enabled]) %>
-<% end -%>
-<% if @passenger_base_uri -%>
-  PassengerBaseURI <%= @passenger_base_uri %>
-<% end -%>
-<%# 3 - Application loading options -%>
-<% if @passenger_ruby -%>
-  PassengerRuby <%= @passenger_ruby %>
-<% end -%>
-<% if @passenger_python -%>
-  PassengerPython <%= @passenger_python %>
-<% end -%>
-<% if @passenger_nodejs -%>
-  PassengerNodejs <%= @passenger_nodejs %>
-<% end -%>
-<% if @passenger_meteor_app_settings -%>
-  PassengerMeteorAppSettings <%= @passenger_meteor_app_settings %>
-<% end -%>
-<% if @passenger_app_env -%>
-  PassengerAppEnv <%= @passenger_app_env %>
-<% end -%>
-<% if @passenger_app_root -%>
-  PassengerAppRoot <%= @passenger_app_root %>
-<% end -%>
-<% if @passenger_app_group_name -%>
-  PassengerAppGroupName <%= @passenger_app_group_name %>
-<% end -%>
-<% if @passenger_app_start_command -%>
-  PassengerAppStartCommand <%= @passenger_app_start_command %>
-<% end -%>
-<% if @passenger_app_type -%>
-  PassengerAppType <%= @passenger_app_type %>
-<% end -%>
-<% if @passenger_startup_file -%>
-  PassengerStartupFile <%= @passenger_startup_file %>
-<% end -%>
-<% if @passenger_restart_dir -%>
-  PassengerRestartDir <%= @passenger_restart_dir %>
-<% end -%>
-<% if @passenger_spawn_method -%>
-  PassengerSpawnMethod <%= @passenger_spawn_method %>
-<% end -%>
-<% unless @passenger_load_shell_envvars.nil? -%>
-  PassengerLoadShellEnvvars <%= scope.call_function('apache::bool2httpd', [@passenger_load_shell_envvars]) %>
-<% end -%>
-<% unless @passenger_preload_bundler.nil? -%>
-  PassengerPreloadBundler <%= scope.call_function('apache::bool2httpd', [@passenger_preload_bundler]) %>
-<% end -%>
-<% unless @passenger_rolling_restarts.nil? -%>
-  PassengerRollingRestarts <%= scope.call_function('apache::bool2httpd', [@passenger_rolling_restarts]) %>
-<% end -%>
-<% unless @passenger_resist_deployment_errors.nil? -%>
-  PassengerResistDeploymentErrors <%= scope.call_function('apache::bool2httpd', [@passenger_resist_deployment_errors]) %>
-<% end -%>
-<%# 4 - Security options -%>
-<% if @passenger_user -%>
-  PassengerUser <%= @passenger_user %>
-<% end -%>
-<% if @passenger_group -%>
-  PassengerGroup <%= @passenger_group %>
-<% end -%>
-<% unless @passenger_friendly_error_pages.nil? -%>
-  PassengerFriendlyErrorPages <%= scope.call_function('apache::bool2httpd', [@passenger_friendly_error_pages]) %>
-<% end -%>
-<%# 5 - Resource control and optimization options -%>
-<% if @passenger_min_instances -%>
-  PassengerMinInstances <%= @passenger_min_instances %>
-<% end -%>
-<% if @passenger_max_instances -%>
-  PassengerMaxInstances <%= @passenger_max_instances %>
-<% end -%>
-<% if @passenger_max_preloader_idle_time -%>
-  PassengerMaxPreloaderIdleTime <%= @passenger_max_preloader_idle_time %>
-<% end -%>
-<% if @passenger_force_max_concurrent_requests_per_process -%>
-  PassengerForceMaxConcurrentRequestsPerProcess <%= @passenger_force_max_concurrent_requests_per_process %>
-<% end -%>
-<% if @passenger_start_timeout -%>
-  PassengerStartTimeout <%= @passenger_start_timeout %>
-<% end -%>
-<% if @passenger_concurrency_model -%>
-  PassengerConcurrencyModel <%= @passenger_concurrency_model %>
-<% end -%>
-<% if @passenger_thread_count -%>
-  PassengerThreadCount <%= @passenger_thread_count %>
-<% end -%>
-<% if @passenger_max_requests -%>
-  PassengerMaxRequests <%= @passenger_max_requests %>
-<% end -%>
-<% if @passenger_max_request_time -%>
-  PassengerMaxRequestTime <%= @passenger_max_request_time %>
-<% end -%>
-<% if @passenger_memory_limit -%>
-  PassengerMemoryLimit <%= @passenger_memory_limit %>
-<% end -%>
-<% if @passenger_stat_throttle_rate -%>
-  PassengerStatThrottleRate <%= @passenger_stat_throttle_rate %>
-<% end -%>
-<% unless @passenger_high_performance.nil? -%>
-  PassengerHighPerformance <%= scope.call_function('apache::bool2httpd', [@passenger_high_performance]) %>
-<% end -%>
-<%# 6 - Connection handling options -%>
-<% unless @passenger_buffer_upload.nil? -%>
-  PassengerBufferUpload <%= scope.call_function('apache::bool2httpd', [@passenger_buffer_upload]) %>
-<% end -%>
-<% unless @passenger_buffer_response.nil? -%>
-  PassengerBufferResponse <%= scope.call_function('apache::bool2httpd', [@passenger_buffer_response]) %>
-<% end -%>
-<% unless @passenger_error_override.nil? -%>
-  PassengerErrorOverride <%= scope.call_function('apache::bool2httpd', [@passenger_error_override]) %>
-<% end -%>
-<% if @passenger_max_request_queue_size -%>
-  PassengerMaxRequestQueueSize <%= @passenger_max_request_queue_size %>
-<% end -%>
-<% if @passenger_max_request_queue_time -%>
-  PassengerMaxRequestQueueTime <%= @passenger_max_request_queue_time %>
-<% end -%>
-<% unless @passenger_sticky_sessions.nil? -%>
-  PassengerStickySessions <%= scope.call_function('apache::bool2httpd', [@passenger_sticky_sessions]) %>
-<% end -%>
-<% if @passenger_sticky_sessions_cookie_name -%>
-  PassengerStickySessionsCookieName <%= @passenger_sticky_sessions_cookie_name %>
-<% end -%>
-<% if @passenger_sticky_sessions_cookie_attributes -%>
-  PassengerStickySessionsCookieAttributes <%= @passenger_sticky_sessions_cookie_attributes %>
-<% end -%>
-<%# 7 - Compatibility options -%>
-<% unless @passenger_allow_encoded_slashes.nil? -%>
-  PassengerAllowEncodedSlashes <%= scope.call_function('apache::bool2httpd', [@passenger_allow_encoded_slashes]) %>
-<% end -%>
-<% if @passenger_app_log_file -%>
-  PassengerAppLogFile <%= @passenger_app_log_file %>
-<% end -%>
-<%# 8 - Logging and debugging options -%>
-<% unless @passenger_debugger.nil? -%>
-  PassengerDebugger <%= scope.call_function('apache::bool2httpd', [@passenger_debugger]) %>
-<% end -%>
-<%# 9 - Advanced options -%>
-<% if @passenger_lve_min_uid -%>
-  PassengerLveMinUid <%= @passenger_lve_min_uid %>
-<% end -%>
diff --git a/templates/vhost/_requestheader.epp b/templates/vhost/_requestheader.epp
new file mode 100644
index 0000000000..4cd20075ac
--- /dev/null
+++ b/templates/vhost/_requestheader.epp
@@ -0,0 +1,8 @@
+<% unless $request_headers.empty { -%>
+
+  ## Request header rules
+  ## as per http://httpd.apache.org/docs/2.4/mod/mod_headers.html#requestheader
+  <%- $request_headers.each |$request_statement| { -%>
+  RequestHeader <%= $request_statement %>
+  <%- } -%>
+<% } -%>
diff --git a/templates/vhost/_requestheader.erb b/templates/vhost/_requestheader.erb
deleted file mode 100644
index 56ee68b299..0000000000
--- a/templates/vhost/_requestheader.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% unless @request_headers.empty? -%>
-
-  ## Request header rules
-  ## as per http://httpd.apache.org/docs/2.4/mod/mod_headers.html#requestheader
-  <%- @request_headers.each do |request_statement| -%>
-  RequestHeader <%= request_statement %>
-  <%- end -%>
-<% end -%>
diff --git a/templates/vhost/_scriptalias.epp b/templates/vhost/_scriptalias.epp
new file mode 100644
index 0000000000..0fd99592bd
--- /dev/null
+++ b/templates/vhost/_scriptalias.epp
@@ -0,0 +1,2 @@
+  ## Script alias directives
+  ScriptAlias /cgi-bin "<%= $scriptalias %>"
diff --git a/templates/vhost/_security.epp b/templates/vhost/_security.epp
new file mode 100644
index 0000000000..24d3b4a39c
--- /dev/null
+++ b/templates/vhost/_security.epp
@@ -0,0 +1,61 @@
+<IfModule mod_security2.c>
+<% if $modsec_disable_vhost {-%>
+  SecRuleEngine Off
+<% } -%>
+<% if $modsec_audit_log_destination {-%>
+  SecAuditLog "<%= $modsec_audit_log_destination %>"
+<% } -%>
+<% if $_modsec_disable_ids =~ Hash {-%>
+<%   $_modsec_disable_ids.each |$location, $rules| {-%>
+  <LocationMatch <%= $location %>>
+<%     Array($rules).each |$rule| {-%>
+    SecRuleRemoveById <%= $rule %>
+<%     } -%>
+  </LocationMatch>
+<%   } -%>
+<% } -%>
+<% unless $modsec_disable_ips.empty {%>
+  SecRule REMOTE_ADDR "<%= join($modsec_disable_ips, ',') %>" "nolog,allow,id:1234123455"
+  SecAction  "phase:2,pass,nolog,id:1234123456"
+<% } -%>
+<% if $_modsec_disable_msgs =~ Hash {-%>
+<%   $_modsec_disable_msgs.each |$location, $rules| {-%>
+  <LocationMatch <%= $location %>>
+<%     Array($rules).each |$rule| {-%>
+    SecRuleRemoveByMsg "<%= $rule %>"
+<%     } -%>
+  </LocationMatch>
+<%   } -%>
+<% } -%>
+<% if $_modsec_disable_tags =~ Hash {-%>
+<%   $_modsec_disable_tags.each |$location, $rules| {-%>
+  <LocationMatch <%= $location %>>
+<%     Array($rules).each |$rule| {-%>
+    SecRuleRemoveByTag "<%= $rule %>"
+<%     } -%>
+  </LocationMatch>
+<%   } -%>
+<% } -%>
+<% if $modsec_body_limit {-%>
+  SecRequestBodyLimit <%= $modsec_body_limit %>
+<% } -%>
+<% if $modsec_inbound_anomaly_threshold and $modsec_outbound_anomaly_threshold {-%>
+  SecAction \
+   "id:900110,\
+    phase:1,\
+    nolog,\
+    pass,\
+    t:none,\
+    setvar:tx.inbound_anomaly_score_threshold=<%= $modsec_inbound_anomaly_threshold -%>, \
+    setvar:tx.outbound_anomaly_score_threshold=<%= $modsec_outbound_anomaly_threshold -%>"
+<% } -%>
+<% if $modsec_allowed_methods {-%>
+  SecAction \
+   "id:900200,\
+    phase:1,\
+    nolog,\
+    pass,\
+    t:none,\
+    setvar:'tx.allowed_methods=<%= $modsec_allowed_methods -%>'"
+<% } -%>
+</IfModule>
diff --git a/templates/vhost/_security.erb b/templates/vhost/_security.erb
deleted file mode 100644
index 0d804d683c..0000000000
--- a/templates/vhost/_security.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-<IfModule mod_security2.c>
-<% if @modsec_disable_vhost -%>
-  SecRuleEngine Off
-<% end -%>
-<% if @modsec_audit_log_destination -%>
-  SecAuditLog "<%= @modsec_audit_log_destination %>"
-<% end -%>
-<% if @_modsec_disable_ids.is_a?(Hash) -%>
-<%   @_modsec_disable_ids.each do |location,rules| -%>
-  <LocationMatch <%= location %>>
-<%     Array(rules).each do |rule| -%>
-    SecRuleRemoveById <%= rule %>
-<%     end -%>
-  </LocationMatch>
-<%   end -%>
-<% end -%>
-<% unless @modsec_disable_ips.empty? %>
-  SecRule REMOTE_ADDR "<%= @modsec_disable_ips.join(',') %>" "nolog,allow,id:1234123455"
-  SecAction  "phase:2,pass,nolog,id:1234123456"
-<% end -%>
-<% if @_modsec_disable_msgs.is_a?(Hash) -%>
-<%   @_modsec_disable_msgs.each do |location,rules| -%>
-  <LocationMatch <%= location %>>
-<%     Array(rules).each do |rule| -%>
-    SecRuleRemoveByMsg "<%= rule %>"
-<%     end -%>
-  </LocationMatch>
-<%   end -%>
-<% end -%>
-<% if @_modsec_disable_tags.is_a?(Hash) -%>
-<%   @_modsec_disable_tags.each do |location,rules| -%>
-  <LocationMatch <%= location %>>
-<%     Array(rules).each do |rule| -%>
-    SecRuleRemoveByTag "<%= rule %>"
-<%     end -%>
-  </LocationMatch>
-<%   end -%>
-<% end -%>
-<% if @modsec_body_limit -%>
-  SecRequestBodyLimit <%= @modsec_body_limit %>
-<% end -%>
-<% if @modsec_inbound_anomaly_threshold and @modsec_outbound_anomaly_threshold -%>
-  SecAction \
-   "id:900110,\
-    phase:1,\
-    nolog,\
-    pass,\
-    t:none,\
-    setvar:tx.inbound_anomaly_score_threshold=<%= @modsec_inbound_anomaly_threshold -%>, \
-    setvar:tx.outbound_anomaly_score_threshold=<%= @modsec_outbound_anomaly_threshold -%>"
-<% end -%>
-<% if @modsec_allowed_methods -%>
-  SecAction \
-   "id:900200,\
-    phase:1,\
-    nolog,\
-    pass,\
-    t:none,\
-    setvar:'tx.allowed_methods=<%= @modsec_allowed_methods -%>'"
-<% end -%>
-</IfModule>
diff --git a/templates/vhost/_serveralias.epp b/templates/vhost/_serveralias.epp
new file mode 100644
index 0000000000..5b9abb2817
--- /dev/null
+++ b/templates/vhost/_serveralias.epp
@@ -0,0 +1,7 @@
+<% unless $serveraliases.empty { -%>
+
+  ## Server aliases
+  <%- Array($serveraliases).each |$serveralias| { -%>
+  ServerAlias <%= $serveralias %>
+  <%- } -%>
+<% } -%>
diff --git a/templates/vhost/_serveralias.erb b/templates/vhost/_serveralias.erb
deleted file mode 100644
index ef8bec8554..0000000000
--- a/templates/vhost/_serveralias.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% unless @serveraliases.empty? -%>
-
-  ## Server aliases
-  <%- Array(@serveraliases).each do |serveralias| -%>
-  ServerAlias <%= serveralias %>
-  <%- end -%>
-<% end -%>
diff --git a/templates/vhost/_shib.epp b/templates/vhost/_shib.epp
new file mode 100644
index 0000000000..a5b5505808
--- /dev/null
+++ b/templates/vhost/_shib.epp
@@ -0,0 +1,4 @@
+  ## Shibboleth
+<% if $shib_compat_valid_user { -%>
+  ShibCompatValidUser <%= $shib_compat_valid_user %>
+<% } -%>
diff --git a/templates/vhost/_shib.erb b/templates/vhost/_shib.erb
deleted file mode 100644
index 610e4a439b..0000000000
--- a/templates/vhost/_shib.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-  ## Shibboleth
-<% if @shib_compat_valid_user -%>
-  ShibCompatValidUser <%= @shib_compat_valid_user %>
-<% end -%>
diff --git a/templates/vhost/_sslproxy.epp b/templates/vhost/_sslproxy.epp
new file mode 100644
index 0000000000..683d68dd33
--- /dev/null
+++ b/templates/vhost/_sslproxy.epp
@@ -0,0 +1,35 @@
+<% if $ssl_proxyengine { -%>
+
+  # SSL Proxy directives
+  SSLProxyEngine On
+  <%- if $ssl_proxy_verify { -%>
+  SSLProxyVerify <%= $ssl_proxy_verify %>
+  <%- } -%>
+  <%- if $ssl_proxy_verify_depth { -%>
+  SSLProxyVerifyDepth <%= $ssl_proxy_verify_depth %>
+  <%- } -%>
+  <%- if $ssl_proxy_ca_cert { -%>
+  SSLProxyCACertificateFile "<%= $ssl_proxy_ca_cert %>"
+  <%- } -%>
+  <%- if $ssl_proxy_check_peer_cn { -%>
+  SSLProxyCheckPeerCN     <%= $ssl_proxy_check_peer_cn %>
+  <%- } -%>
+  <%- if $ssl_proxy_check_peer_name { -%>
+  SSLProxyCheckPeerName   <%= $ssl_proxy_check_peer_name %>
+  <%- } -%>
+  <%- if $ssl_proxy_check_peer_expire { -%>
+  SSLProxyCheckPeerExpire   <%= $ssl_proxy_check_peer_expire %>
+  <%- } -%>
+  <%- if $ssl_proxy_machine_cert { -%>
+  SSLProxyMachineCertificateFile "<%= $ssl_proxy_machine_cert %>"
+  <%- } -%>
+  <%- if $ssl_proxy_machine_cert_chain { -%>
+  SSLProxyMachineCertificateChainFile "<%= $ssl_proxy_machine_cert_chain %>"
+  <%- } -%>
+  <%- if $ssl_proxy_cipher_suite { -%>
+  SSLProxyCipherSuite <%= $ssl_proxy_cipher_suite %>
+  <%- } -%>
+  <%- if $ssl_proxy_protocol { -%>
+  SSLProxyProtocol  <%= join([$ssl_proxy_protocol].flatten().filter |$v| { $v },' ') %>
+  <%- } -%>
+<% } -%>
diff --git a/templates/vhost/_sslproxy.erb b/templates/vhost/_sslproxy.erb
deleted file mode 100644
index ff6b61e3c9..0000000000
--- a/templates/vhost/_sslproxy.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<% if @ssl_proxyengine -%>
-
-  # SSL Proxy directives
-  SSLProxyEngine On
-  <%- if @ssl_proxy_verify -%>
-  SSLProxyVerify <%= @ssl_proxy_verify %>
-  <%- end -%>
-  <%- if @ssl_proxy_verify_depth -%>
-  SSLProxyVerifyDepth <%= @ssl_proxy_verify_depth %>
-  <%- end -%>
-  <%- if @ssl_proxy_ca_cert -%>
-  SSLProxyCACertificateFile "<%= @ssl_proxy_ca_cert %>"
-  <%- end -%>
-  <%- if @ssl_proxy_check_peer_cn -%>
-  SSLProxyCheckPeerCN     <%= @ssl_proxy_check_peer_cn %>
-  <%- end -%>
-  <%- if @ssl_proxy_check_peer_name -%>
-  SSLProxyCheckPeerName   <%= @ssl_proxy_check_peer_name %>
-  <%- end -%>
-  <%- if @ssl_proxy_check_peer_expire -%>
-  SSLProxyCheckPeerExpire   <%= @ssl_proxy_check_peer_expire %>
-  <%- end -%>
-  <%- if @ssl_proxy_machine_cert -%>
-  SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>"
-  <%- end -%>
-  <%- if @ssl_proxy_machine_cert_chain -%>
-  SSLProxyMachineCertificateChainFile "<%= @ssl_proxy_machine_cert_chain %>"
-  <%- end -%>
-  <%- if @ssl_proxy_cipher_suite -%>
-  SSLProxyCipherSuite <%= @ssl_proxy_cipher_suite %>
-  <%- end -%>
-  <%- if @ssl_proxy_protocol -%>
-  SSLProxyProtocol  <%= [@ssl_proxy_protocol].flatten.compact.join(' ') %>
-  <%- end -%>
-<% end -%>
diff --git a/templates/vhost/_suexec.epp b/templates/vhost/_suexec.epp
new file mode 100644
index 0000000000..da0f3eb59d
--- /dev/null
+++ b/templates/vhost/_suexec.epp
@@ -0,0 +1,4 @@
+<% if $suexec_user_group { -%>
+
+SuexecUserGroup <%= $suexec_user_group %>
+<% } -%>
diff --git a/templates/vhost/_suexec.erb b/templates/vhost/_suexec.erb
deleted file mode 100644
index 8a7ae0f17f..0000000000
--- a/templates/vhost/_suexec.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if @suexec_user_group -%>
-
-  SuexecUserGroup <%= @suexec_user_group %>
-<% end -%>
diff --git a/templates/vhost/_use_canonical_name.erb b/templates/vhost/_use_canonical_name.erb
deleted file mode 100644
index 4f2e3ee224..0000000000
--- a/templates/vhost/_use_canonical_name.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%- if @use_canonical_name -%>
-
-  UseCanonicalName <%= @use_canonical_name %>
-<%- end -%>
diff --git a/templates/vhost/_userdir.epp b/templates/vhost/_userdir.epp
new file mode 100644
index 0000000000..a97b722da6
--- /dev/null
+++ b/templates/vhost/_userdir.epp
@@ -0,0 +1,3 @@
+  <%- [$userdir].flatten.each |$userdir| { -%>
+  UserDir <%= $userdir %>
+  <%- } -%>
diff --git a/templates/vhost/_userdir.erb b/templates/vhost/_userdir.erb
deleted file mode 100644
index 0c6523ba0c..0000000000
--- a/templates/vhost/_userdir.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-  <%- [@userdir].flatten.each do |userdir| -%>
-  UserDir <%= userdir %>
-  <%- end -%>
diff --git a/templates/vhost/_wsgi.epp b/templates/vhost/_wsgi.epp
new file mode 100644
index 0000000000..b26ec759eb
--- /dev/null
+++ b/templates/vhost/_wsgi.epp
@@ -0,0 +1,50 @@
+<% if $wsgi_application_group or $wsgi_daemon_process or $wsgi_import_script or $wsgi_process_group { -%>
+
+  ## WSGI configuration
+<% } -%>
+<% if $wsgi_application_group { -%>
+  WSGIApplicationGroup <%= $wsgi_application_group %>
+<% } -%>
+<% if $wsgi_daemon_process =~ String and $wsgi_daemon_process_options { -%>
+  WSGIDaemonProcess <%= $wsgi_daemon_process %> <%= join(sort($wsgi_daemon_process_options.map |$k,$v| { "$k=$v" }), ' ') %>
+<%} elsif $wsgi_daemon_process =~ String and !$wsgi_daemon_process_options { -%>
+  WSGIDaemonProcess <%= $wsgi_daemon_process %>
+<%} elsif $wsgi_daemon_process =~ Hash { -%>
+  <%- $wsgi_daemon_process.each |$key, $val| { -%>
+    <%- if $val.empty { -%>
+  WSGIDaemonProcess <%= $key %>
+    <%-} else { -%>
+  WSGIDaemonProcess <%= $key %> <%= join(sort($val.map |$k,$v| { "$k=$v"}), ' ') %>
+<% } -%>
+<% } -%>
+<% } -%>
+<% if $wsgi_import_script and $wsgi_import_script_options { -%>
+  WSGIImportScript <%= $wsgi_import_script %> <%= join(sort($wsgi_import_script_options.map |$k,$v| { "$k=$v" }), ' ') %>
+<% } -%>
+<% if $wsgi_process_group { -%>
+  WSGIProcessGroup <%= $wsgi_process_group %>
+<% } -%>
+<% if $wsgi_script_aliases_match and ! $wsgi_script_aliases_match.empty { -%>
+  <%- $wsgi_script_aliases_match.each |$key, $value| { -%>
+    <%- if $key != '' and $value != ''{ -%>
+  WSGIScriptAliasMatch <%= $key %> "<%= $value %>"
+    <%- } -%>
+  <%- } -%>
+<% } -%>
+<% if $wsgi_script_aliases and ! $wsgi_script_aliases.empty { -%>
+  <%- $wsgi_script_aliases.each |$key, $value| { -%>
+    <%- if $key != '' and $value != ''{ -%>
+      <%- if $value =~ Array { -%>
+  WSGIScriptAlias <%= $key %> <%= join($value, ' ') %>
+      <%-} else { -%>
+  WSGIScriptAlias <%= $key %> "<%= $value %>"
+      <%- } -%>
+    <%- } -%>
+  <%- } -%>
+<% } -%>
+<% if $wsgi_pass_authorization { -%>
+  WSGIPassAuthorization <%= $wsgi_pass_authorization %>
+<% } -%>
+<% if $wsgi_chunked_request { -%>
+  WSGIChunkedRequest <%= $wsgi_chunked_request %>
+<% } -%>
diff --git a/templates/vhost/_wsgi.erb b/templates/vhost/_wsgi.erb
deleted file mode 100644
index 775ae0fe48..0000000000
--- a/templates/vhost/_wsgi.erb
+++ /dev/null
@@ -1,50 +0,0 @@
-<% if @wsgi_application_group or @wsgi_daemon_process or @wsgi_import_script or @wsgi_process_group -%>
-
-  ## WSGI configuration
-<% end -%>
-<% if @wsgi_application_group -%>
-  WSGIApplicationGroup <%= @wsgi_application_group %>
-<% end -%>
-<% if @wsgi_daemon_process.is_a? String and @wsgi_daemon_process_options -%>
-  WSGIDaemonProcess <%= @wsgi_daemon_process %> <%= @wsgi_daemon_process_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
-<% elsif @wsgi_daemon_process.is_a? String and !@wsgi_daemon_process_options -%>
-  WSGIDaemonProcess <%= @wsgi_daemon_process %>
-<% elsif @wsgi_daemon_process.is_a? Hash -%>
-  <%- @wsgi_daemon_process.each do |key, val| -%>
-    <%- if val.empty? -%>
-  WSGIDaemonProcess <%= key %>
-    <%- else -%>
-  WSGIDaemonProcess <%= key %> <%= val.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
-<% end -%>
-<% end -%>
-<% end -%>
-<% if @wsgi_import_script and @wsgi_import_script_options -%>
-  WSGIImportScript <%= @wsgi_import_script %> <%= @wsgi_import_script_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
-<% end -%>
-<% if @wsgi_process_group -%>
-  WSGIProcessGroup <%= @wsgi_process_group %>
-<% end -%>
-<% if @wsgi_script_aliases_match and ! @wsgi_script_aliases_match.empty? -%>
-  <%- @wsgi_script_aliases_match.sort.reverse.each do |key, value| -%>
-    <%- if key != '' and value != ''-%>
-  WSGIScriptAliasMatch <%= key %> "<%= value %>"
-    <%- end -%>
-  <%- end -%>
-<% end -%>
-<% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
-  <%- @wsgi_script_aliases.sort.reverse.each do |key, value| -%>
-    <%- if key != '' and value != ''-%>
-      <%- if value.is_a? Array -%>
-  WSGIScriptAlias <%= key %> <%= value.join(' ') %>
-      <%- else -%>
-  WSGIScriptAlias <%= key %> "<%= value %>"
-      <%- end -%>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
-<% if @wsgi_pass_authorization -%>
-  WSGIPassAuthorization <%= @wsgi_pass_authorization %>
-<% end -%>
-<% if @wsgi_chunked_request -%>
-  WSGIChunkedRequest <%= @wsgi_chunked_request %>
-<% end -%>

From fe82630bddf52035509c198152216b4e0e9cfc5c Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 10 Oct 2023 12:22:05 +0200
Subject: [PATCH 2182/2267] Remove outdated parameter documentation for
 ssl_mutex

Since Apache 2.2 was dropped, the value is always the same.

Fixes: cedd45b63be89ea54bd2a596e6cd3a3f60d4faf8 ("Drop Apache 2.2 support")
---
 REFERENCE.md         | 4 ----
 manifests/mod/ssl.pp | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 446c5194ec..e59135bec9 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6573,10 +6573,6 @@ Default value: `undef`
 Data type: `String`
 
 Configures mutex mechanism and lock file directory for all or specified mutexes.
-Default based on the OS and/or Apache version:
-- RedHat/FreeBSD/Suse/Gentoo: 'default'.
-- Debian/Ubuntu + Apache >= 2.4: 'default'.
-- Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
 
 Default value: `'default'`
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index e4d4907652..30841b774d 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -67,10 +67,6 @@
 #
 # @param ssl_mutex
 #   Configures mutex mechanism and lock file directory for all or specified mutexes.
-#   Default based on the OS and/or Apache version:
-#   - RedHat/FreeBSD/Suse/Gentoo: 'default'.
-#   - Debian/Ubuntu + Apache >= 2.4: 'default'.
-#   - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
 #
 # @param ssl_reload_on_change
 #   Enable reloading of apache if the content of ssl files have changed. It only affects ssl files configured here and not vhost ones.

From c9776cf277114fe7f048bd9b76317a127681e10e Mon Sep 17 00:00:00 2001
From: Tim 'bastelfreak' Meusel <tim@bastelfreak.de>
Date: Tue, 10 Oct 2023 11:34:55 +0200
Subject: [PATCH 2183/2267] Drop EoL Debian 9 and older code

Debian 9 was already removed from metadata.json and isn't supported
anymore. This PR drops some code leftovers.
---
 REFERENCE.md                      |  4 ++--
 manifests/mod/apreq2.pp           |  2 +-
 manifests/mod/md.pp               |  4 ++--
 manifests/mod/shib.pp             | 18 +++++++++---------
 manifests/params.pp               | 11 +----------
 spec/acceptance/vhost_spec.rb     |  3 +--
 spec/classes/mod/php_spec.rb      |  2 +-
 spec/classes/mod/security_spec.rb |  6 ++----
 8 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 446c5194ec..649b3a0328 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1214,7 +1214,7 @@ Default value: `$apache::params::icons_prefix`
 
 Installs `mod_apreq2`.
 
-* **Note** Unsupported platforms: CentOS: all; Debian: 8; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
+* **Note** Unsupported platforms: CentOS: all; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
 
 * **See also**
   * http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html
@@ -3602,7 +3602,7 @@ Installs `mod_macro`.
 
 Installs and configures `mod_md`.
 
-* **Note** Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
+* **Note** Unsupported platforms: CentOS: 6, 7; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
 
 * **See also**
   * https://httpd.apache.org/docs/current/mod/mod_md.html
diff --git a/manifests/mod/apreq2.pp b/manifests/mod/apreq2.pp
index 51f1a9f986..15575e7034 100644
--- a/manifests/mod/apreq2.pp
+++ b/manifests/mod/apreq2.pp
@@ -3,7 +3,7 @@
 #
 # @see http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html for additional documentation.
 #
-# @note Unsupported platforms: CentOS: all; Debian: 8; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
+# @note Unsupported platforms: CentOS: all; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
 class apache::mod::apreq2 {
   ::apache::mod { 'apreq2':
     id => 'apreq_module',
diff --git a/manifests/mod/md.pp b/manifests/mod/md.pp
index d51e5b8c41..ef3194cc4d 100644
--- a/manifests/mod/md.pp
+++ b/manifests/mod/md.pp
@@ -31,7 +31,7 @@
 #
 # @param md_challenge_dns01
 #   Define a program to be called when the `dns-01` challenge needs to be
-#   setup/torn down. 
+#   setup/torn down.
 #
 # @param md_contact_email
 #   The ACME protocol requires you to give a contact url when you sign up.
@@ -91,7 +91,7 @@
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_md.html for additional documentation.
 #
-# @note Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
+# @note Unsupported platforms: CentOS: 6, 7; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
 class apache::mod::md (
   Optional[String]                                          $md_activation_delay       = undef,
   Optional[Apache::OnOff]                                   $md_base_server            = undef,
diff --git a/manifests/mod/shib.pp b/manifests/mod/shib.pp
index 1bcbe327c4..cf267b4a6c 100644
--- a/manifests/mod/shib.pp
+++ b/manifests/mod/shib.pp
@@ -1,28 +1,28 @@
 # @summary
 #   Installs and configures `mod_shib`.
-# 
+#
 # @param suppress_warning
 #   Toggles whether to trigger warning on RedHat nodes.
-# 
+#
 # @param mod_full_path
 #   Specifies a path to the module. Do not manually set this parameter without a special reason.
-# 
+#
 # @param package_name
 #   Name of the Shibboleth package to be installed.
-# 
+#
 # @param mod_lib
-#   Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter 
-#   overrides this value. 
+#   Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
+#   overrides this value.
 #
 # This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
 # can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
-# 
+#
 # @note
-#   The Shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories. 
+#   The Shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories.
 #   See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide).
 #
 # @see https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig for additional documentation.
-# @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Debian: 7, 8; Ubuntu: all; OracleLinux: all
+# @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Ubuntu: all; OracleLinux: all
 class apache::mod::shib (
   Boolean $suppress_warning                     = false,
   Optional[Stdlib::Absolutepath] $mod_full_path = undef,
diff --git a/manifests/params.pp b/manifests/params.pp
index 3109ba1e33..404a27bedb 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -375,7 +375,6 @@
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
     $ssl_sessioncache    = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
     $php_version = $facts['os']['release']['major'] ? {
-      '9'     => '7.0', # Debian Stretch
       '10'    => '7.3', # Debian Buster
       '11'    => '7.4', # Debian Bullseye
       '12'    => '8.2', # Debian Bookworm
@@ -408,14 +407,6 @@
     $_os_mod_packages = case $facts['os']['name'] {
       'Debian': {
         case $facts['os']['release']['major'] {
-          '9': {
-            {
-              'auth_kerb' => 'libapache2-mod-auth-kerb',
-              'nss'       => 'libapache2-mod-nss',
-              'shib2'     => 'libapache2-mod-shib2',
-              'wsgi'      => 'libapache2-mod-wsgi',
-            }
-          }
           '10': {
             {
               'auth_kerb' => 'libapache2-mod-auth-kerb',
@@ -466,7 +457,7 @@
     $error_log           = 'error.log'
     $scriptalias         = '/usr/lib/cgi-bin'
     $access_log_file     = 'access.log'
-    if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '19.04') < 0) or ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '10') < 0) {
+    if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '19.04') < 0) {
       $shib2_lib = 'mod_shib2.so'
     } else {
       $shib2_lib = 'mod_shib.so'
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index c49d993556..ae126471a5 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -1221,8 +1221,7 @@ class { 'apache': }
     end
   end
 
-  describe 'shibboleth parameters', if: (os[:family] == 'debian' && os[:release] != '7') do
-    # Debian 7 is too old for ShibCompatValidUser
+  describe 'shibboleth parameters', if: (os[:family] == 'debian') do
     pp = <<-MANIFEST
       class { 'apache': }
       class { 'apache::mod::shib': }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index ad5b0a9429..0db6bb57cb 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -292,7 +292,7 @@
       # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
       next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
               (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
-              (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
+              (facts[:os]['name'] == 'Debian')                                             ||
               (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
                                                             facts[:os]['name'] == 'Rocky'  || facts[:os]['name'] == 'AlmaLinux'))
 
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index b6d34663bd..af54c0bb2c 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -286,8 +286,7 @@
             )
           }
 
-          if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') ||
-             (facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian')
+          if facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu'
             it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
 
             it {
@@ -316,8 +315,7 @@
               }
             end
 
-            if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') ||
-               (facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian')
+            if facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu'
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
               it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }

From 4ec2f4e0d23d453045c9e0cb2ce735bcaee6a0c1 Mon Sep 17 00:00:00 2001
From: Tim 'bastelfreak' Meusel <tim@bastelfreak.de>
Date: Tue, 10 Oct 2023 12:59:46 +0200
Subject: [PATCH 2184/2267] Drop EoL Ubuntu code

This deletes Ubuntu 16 and older code. Those versions are already gone
from metadata.json.
---
 REFERENCE.md                      |  2 +-
 manifests/mod/md.pp               |  2 +-
 spec/classes/mod/php_spec.rb      |  5 ++--
 spec/classes/mod/security_spec.rb | 48 -------------------------------
 spec/defines/vhost_spec.rb        |  2 +-
 5 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index ab025770fc..6e678449e0 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -3602,7 +3602,7 @@ Installs `mod_macro`.
 
 Installs and configures `mod_md`.
 
-* **Note** Unsupported platforms: CentOS: 6, 7; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
+* **Note** Unsupported platforms: CentOS: 6, 7; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 18
 
 * **See also**
   * https://httpd.apache.org/docs/current/mod/mod_md.html
diff --git a/manifests/mod/md.pp b/manifests/mod/md.pp
index ef3194cc4d..7cb12f5888 100644
--- a/manifests/mod/md.pp
+++ b/manifests/mod/md.pp
@@ -91,7 +91,7 @@
 #
 # @see https://httpd.apache.org/docs/current/mod/mod_md.html for additional documentation.
 #
-# @note Unsupported platforms: CentOS: 6, 7; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
+# @note Unsupported platforms: CentOS: 6, 7; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 18
 class apache::mod::md (
   Optional[String]                                          $md_activation_delay       = undef,
   Optional[Apache::OnOff]                                   $md_base_server            = undef,
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 0db6bb57cb..8c4e774d63 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -290,9 +290,8 @@
       end
 
       # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
-      next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
-              (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
-              (facts[:os]['name'] == 'Debian')                                             ||
+      next if (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
+              (facts[:os]['family'] == 'Debian')                                           ||
               (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
                                                             facts[:os]['name'] == 'Rocky'  || facts[:os]['name'] == 'AlmaLinux'))
 
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index af54c0bb2c..ec41852199 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -286,54 +286,6 @@
             )
           }
 
-          if facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu'
-            it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
-
-            it {
-              expect(subject).to contain_file('modsecurity_35_bad_robots.data').with(
-                path: '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data',
-                target: '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data',
-              )
-            }
-          end
-
-          describe 'with parameters' do
-            let :params do
-              {
-                activated_rules: [
-                  '/tmp/foo/bar.conf',
-                ],
-                audit_log_relevant_status: '^(?:5|4(?!01|04))',
-                audit_log_parts: 'ABCDZ',
-                audit_log_type: 'Concurrent',
-                audit_log_storage_dir: '/var/log/httpd/audit',
-                secdefaultaction: 'deny,status:406,nolog,auditlog',
-                secrequestbodyaccess: 'Off',
-                secresponsebodyaccess: 'On',
-                secrequestbodylimitaction: 'ProcessPartial',
-                secresponsebodylimitaction: 'Reject'
-              }
-            end
-
-            if facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu'
-              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
-              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
-              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
-              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyAccess Off$} }
-              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyAccess On$} }
-              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyLimitAction ProcessPartial$} }
-              it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyLimitAction Reject$} }
-              it { is_expected.to contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} }
-
-              it {
-                expect(subject).to contain_file('bar.conf').with(
-                  path: '/etc/modsecurity/activated_rules/bar.conf',
-                  target: '/tmp/foo/bar.conf',
-                )
-              }
-            end
-          end
-
           describe 'with custom parameters' do
             let :params do
               {
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 5f6172e21a..96eec3239d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -593,7 +593,7 @@
                                                                                 'notify' => 'Class[Apache::Service]')
           }
 
-          if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu'
+          if os_facts[:os]['name'] == 'Ubuntu'
             it {
               expect(subject).to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
                                                                                         'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf")

From 259829c711323f9b14ccc58c861c690a8c3f2833 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <ykatz@cs.umd.edu>
Date: Tue, 17 Oct 2023 18:05:35 -0400
Subject: [PATCH 2185/2267] Add AllowOverrideList support

---
 templates/vhost/_directories.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 79f28b2961..ba072523fc 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -45,6 +45,9 @@
       <%- elsif provider == 'Directory' -%>
     AllowOverride None
       <%- end -%>
+      <%- if directory['allow_override_list'] -%>
+    AllowOverrideList <%= Array(directory['allow_override_list']).join(' ') %>
+      <%- end -%>
     <%- end -%>
     <%- scope.lookupvar('_template_scope')[:item] = directory -%>
 <%= scope.function_template(["apache/vhost/_require.erb"]) -%>

From 5da4d8ad228ad7a5830436bbb822e451287302ef Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 19 Oct 2023 14:53:14 +0200
Subject: [PATCH 2186/2267] Remove unused file templates/mod/mpm_event.conf.epp

Fixes: ffbcb58023e5 ("(CAT-1346) erb_to_epp conversion for mod directory")
---
 templates/mod/mpm_event.conf.epp | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 templates/mod/mpm_event.conf.epp

diff --git a/templates/mod/mpm_event.conf.epp b/templates/mod/mpm_event.conf.epp
deleted file mode 100644
index eb6f1ff5f5..0000000000
--- a/templates/mod/mpm_event.conf.epp
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfModule mpm_event_module>
-  StartServers          2
-  MinSpareThreads      25
-  MaxSpareThreads      75
-  ThreadLimit          64
-  ThreadsPerChild      25
-  MaxClients          150
-  MaxRequestsPerChild   0
-</IfModule>

From 4078ce70a199515e052b441d8913ac39de299f35 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Fri, 27 Oct 2023 10:09:41 +0530
Subject: [PATCH 2187/2267] (MAINT) Fixing apache CI pipeline fix (removing
 unsupported OS)

---
 metadata.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index cbb245f4bf..05a8803f3a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -49,8 +49,7 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11",
-        "12"
+        "11"
       ]
     },
     {

From ab23def9f8d8dc42f6f413e8a12c74f87d82239d Mon Sep 17 00:00:00 2001
From: rajat-puppet <rajat.tiwari@perforce.com>
Date: Mon, 6 Nov 2023 18:07:11 +0530
Subject: [PATCH 2188/2267] Adding github directory to pdkignore

---
 .pdkignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pdkignore b/.pdkignore
index 584438f9a0..862847a72c 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -29,6 +29,7 @@
 /.fixtures.yml
 /Gemfile
 /.gitattributes
+/.github/
 /.gitignore
 /.pdkignore
 /.puppet-lint.rc

From 6fb37412c51ddf3ea4d996540e75bad290642b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Fri, 17 Nov 2023 07:14:08 -1000
Subject: [PATCH 2189/2267] Remove useless notice

This was probably added while refactoring templates to help diagnose
issues and should have been removed before the relevant PR was merged
but slip through.

This serve no purpose and only log useless information in the
puppetserver log so get rid of it.
---
 manifests/init.pp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4a76ce62d6..162cfdde9d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -808,8 +808,6 @@
       'error_documents_path'    => $error_documents_path,
     }
 
-    notice $conf_template
-
     file { "${apache::conf_dir}/${apache::params::conf_file}":
       ensure  => file,
       mode    => $apache::file_mode,

From afb9d131309b8a628d55735c653bf1bd4c1f937b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sun, 19 Nov 2023 12:59:13 -1000
Subject: [PATCH 2190/2267] Fix mod_suexec usage

The missing newline break apache configuration:

```
apache2: Syntax error on line 50 of /etc/apache2/apache2.conf: Syntax error on line 6 of /etc/apache2/sites-enabled/25-example.com-443.conf:6: <VirtualHost> was not closed.
```

Add the missing new line.

While here, alse remove the legacy (now unused) template and fix
indentation of the generated statement.
---
 manifests/vhost.pp          | 2 +-
 templates/vhost/_suexec.epp | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 templates/vhost/_suexec.epp

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bb1ad02de8..04bc8e77be 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2713,7 +2713,7 @@
     concat::fragment { "${name}-suexec":
       target  => "${priority_real}${filename}.conf",
       order   => 290,
-      content => "SuexecUserGroup ${suexec_user_group}",
+      content => "  SuexecUserGroup ${suexec_user_group}\n",
     }
   }
 
diff --git a/templates/vhost/_suexec.epp b/templates/vhost/_suexec.epp
deleted file mode 100644
index da0f3eb59d..0000000000
--- a/templates/vhost/_suexec.epp
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if $suexec_user_group { -%>
-
-SuexecUserGroup <%= $suexec_user_group %>
-<% } -%>

From 309b00d2597440ca3fe6519089ea1d8cd85693d9 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Mon, 20 Nov 2023 11:32:06 +0530
Subject: [PATCH 2191/2267] "CAT-945 - Update README.md LICENSE"

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a5230d4d9c..bd86a28b3c 100644
--- a/README.md
+++ b/README.md
@@ -274,7 +274,8 @@
     - [Load balancing with exported and non-exported resources][Load balancing examples]
 4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
 5. [Limitations - OS compatibility, etc.][Limitations]
-6. [Development - Guide for contributing to the module][Development]
+6. [License][License]
+7. [Development - Guide for contributing to the module][Development]
     
 <a id="module-description"></a>
 ## Module description
@@ -860,6 +861,10 @@ COVERAGE=yes bundle exec rake parallel_spec
 Acceptance tests for this module leverage [puppet_litmus](https://github.com/puppetlabs/puppet_litmus).
 To run the acceptance tests follow the instructions [here](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html). You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
 
+## License
+
+This codebase is licensed under the Apache2.0 licensing, however due to the nature of the codebase the open source dependencies may also use a combination of [AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html), [BSD-2](https://opensource.org/license/bsd-2-claus), [BSD-3](https://opensource.org/license/bsd-3-claus), [GPL2.0](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing.
+
 ### Development Support
 If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://github.com/puppetlabs/puppetlabs-apache/issues).
 Every Monday the Puppet IA Content Team has [office hours](https://puppet.com/community/office-hours) in the [Puppet Community Slack](http://slack.puppet.com/), alternating between an EMEA friendly time (1300 UTC) and an Americas friendly time (0900 Pacific, 1700 UTC).

From f6e4cf476a8c07db38a737a0be0a4fb556069f4c Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Thu, 23 Nov 2023 10:14:55 +0530
Subject: [PATCH 2192/2267] Addressing review comments

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd86a28b3c..6119fb6983 100644
--- a/README.md
+++ b/README.md
@@ -863,7 +863,7 @@ To run the acceptance tests follow the instructions [here](https://puppetlabs.gi
 
 ## License
 
-This codebase is licensed under the Apache2.0 licensing, however due to the nature of the codebase the open source dependencies may also use a combination of [AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html), [BSD-2](https://opensource.org/license/bsd-2-claus), [BSD-3](https://opensource.org/license/bsd-3-claus), [GPL2.0](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing.
+This codebase is licensed under the Apache2.0 licensing, however due to the nature of the codebase the open source dependencies may also use a combination of [AGPL](https://opensource.org/license/agpl-v3/), [BSD-2](https://opensource.org/license/bsd-2-clause/), [BSD-3](https://opensource.org/license/bsd-3-clause/), [GPL2.0](https://opensource.org/license/gpl-2-0/), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing.
 
 ### Development Support
 If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://github.com/puppetlabs/puppetlabs-apache/issues).

From 791b59983acdc4157f1362acd86a93153c3eece9 Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Tue, 28 Nov 2023 14:06:36 +0530
Subject: [PATCH 2193/2267] (CAT-1608) - PDK update

---
 .rubocop.yml                | 646 +++++++++++++++++++++++++++++++++++-
 .rubocop_todo.yml           | 136 +-------
 Gemfile                     |   5 +-
 metadata.json               |   2 +-
 spec/classes/mod/jk_spec.rb |   4 +-
 spec/defines/vhost_spec.rb  |   1 -
 spec/spec_helper.rb         |   6 +-
 7 files changed, 656 insertions(+), 144 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0d076d68c8..7a66e08331 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,11 +3,9 @@ require:
 - rubocop-performance
 - rubocop-rspec
 AllCops:
-  DisplayCopNames: true
   NewCops: enable
+  DisplayCopNames: true
   TargetRubyVersion: '2.7'
-  ExtraDetails: true
-  DisplayStyleGuide: true
   Include:
   - "**/*.rb"
   Exclude:
@@ -83,5 +81,645 @@ Style/Documentation:
   - spec/**/*
 Style/WordArray:
   EnforcedStyle: brackets
+Performance/AncestorsInclude:
+  Enabled: true
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+Performance/BlockGivenWithExplicitBlock:
+  Enabled: true
+Performance/CaseWhenSplat:
+  Enabled: true
+Performance/ConstantRegexp:
+  Enabled: true
+Performance/MethodObjectAsBlock:
+  Enabled: true
+Performance/RedundantSortBlock:
+  Enabled: true
+Performance/RedundantStringChars:
+  Enabled: true
+Performance/ReverseFirst:
+  Enabled: true
+Performance/SortReverse:
+  Enabled: true
+Performance/Squeeze:
+  Enabled: true
+Performance/StringInclude:
+  Enabled: true
+Performance/Sum:
+  Enabled: true
+Style/CollectionMethods:
+  Enabled: true
+Style/MethodCalledOnDoEndBlock:
+  Enabled: true
+Style/StringMethods:
+  Enabled: true
+Bundler/GemFilename:
+  Enabled: false
+Bundler/InsecureProtocolSource:
+  Enabled: false
+Capybara/CurrentPathExpectation:
+  Enabled: false
+Capybara/VisibilityMatcher:
+  Enabled: false
+Gemspec/DuplicatedAssignment:
+  Enabled: false
+Gemspec/OrderedDependencies:
+  Enabled: false
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+Gemspec/RubyVersionGlobalsUsage:
+  Enabled: false
+Layout/ArgumentAlignment:
+  Enabled: false
+Layout/BeginEndAlignment:
+  Enabled: false
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+Layout/EmptyComment:
+  Enabled: false
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/EmptyLinesAroundArguments:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: false
+Layout/EndOfLine:
+  Enabled: false
+Layout/FirstArgumentIndentation:
+  Enabled: false
+Layout/HashAlignment:
+  Enabled: false
+Layout/HeredocIndentation:
+  Enabled: false
+Layout/LeadingEmptyLines:
+  Enabled: false
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: false
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: false
+Layout/SpaceInsideReferenceBrackets:
+  Enabled: false
+Lint/BigDecimalNew:
+  Enabled: false
+Lint/BooleanSymbol:
+  Enabled: false
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: false
+Lint/DisjunctiveAssignmentInConstructor:
+  Enabled: false
+Lint/DuplicateElsifCondition:
+  Enabled: false
+Lint/DuplicateRequire:
+  Enabled: false
+Lint/DuplicateRescueException:
+  Enabled: false
+Lint/EmptyConditionalBody:
+  Enabled: false
+Lint/EmptyFile:
+  Enabled: false
+Lint/ErbNewArguments:
+  Enabled: false
+Lint/FloatComparison:
+  Enabled: false
+Lint/HashCompareByIdentity:
+  Enabled: false
+Lint/IdentityComparison:
+  Enabled: false
+Lint/InterpolationCheck:
+  Enabled: false
+Lint/MissingCopEnableDirective:
+  Enabled: false
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+Lint/NestedPercentLiteral:
+  Enabled: false
+Lint/NonDeterministicRequireOrder:
+  Enabled: false
+Lint/OrderedMagicComments:
+  Enabled: false
+Lint/OutOfRangeRegexpRef:
+  Enabled: false
+Lint/RaiseException:
+  Enabled: false
+Lint/RedundantCopEnableDirective:
+  Enabled: false
+Lint/RedundantRequireStatement:
+  Enabled: false
+Lint/RedundantSafeNavigation:
+  Enabled: false
+Lint/RedundantWithIndex:
+  Enabled: false
+Lint/RedundantWithObject:
+  Enabled: false
+Lint/RegexpAsCondition:
+  Enabled: false
+Lint/ReturnInVoidContext:
+  Enabled: false
+Lint/SafeNavigationConsistency:
+  Enabled: false
+Lint/SafeNavigationWithEmpty:
+  Enabled: false
+Lint/SelfAssignment:
+  Enabled: false
+Lint/SendWithMixinArgument:
+  Enabled: false
+Lint/ShadowedArgument:
+  Enabled: false
+Lint/StructNewOverride:
+  Enabled: false
+Lint/ToJSON:
+  Enabled: false
+Lint/TopLevelReturnWithArgument:
+  Enabled: false
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: false
+Lint/UnreachableLoop:
+  Enabled: false
+Lint/UriEscapeUnescape:
+  Enabled: false
+Lint/UriRegexp:
+  Enabled: false
+Lint/UselessMethodDefinition:
+  Enabled: false
+Lint/UselessTimes:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/BlockNesting:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
+Metrics/ParameterLists:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Migration/DepartmentName:
+  Enabled: false
+Naming/AccessorMethodName:
+  Enabled: false
+Naming/BlockParameterName:
+  Enabled: false
+Naming/HeredocDelimiterCase:
+  Enabled: false
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
 Naming/MethodParameterName:
-  AllowedNames: 'is'
+  Enabled: false
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+Naming/VariableNumber:
+  Enabled: false
+Performance/BindCall:
+  Enabled: false
+Performance/DeletePrefix:
+  Enabled: false
+Performance/DeleteSuffix:
+  Enabled: false
+Performance/InefficientHashSearch:
+  Enabled: false
+Performance/UnfreezeString:
+  Enabled: false
+Performance/UriDefaultParser:
+  Enabled: false
+RSpec/Be:
+  Enabled: false
+RSpec/Capybara/FeatureMethods:
+  Enabled: false
+RSpec/ContainExactly:
+  Enabled: false
+RSpec/ContextMethod:
+  Enabled: false
+RSpec/ContextWording:
+  Enabled: false
+RSpec/DescribeClass:
+  Enabled: false
+RSpec/EmptyHook:
+  Enabled: false
+RSpec/EmptyLineAfterExample:
+  Enabled: false
+RSpec/EmptyLineAfterExampleGroup:
+  Enabled: false
+RSpec/EmptyLineAfterHook:
+  Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
+RSpec/ExampleWithoutDescription:
+  Enabled: false
+RSpec/ExpectChange:
+  Enabled: false
+RSpec/ExpectInHook:
+  Enabled: false
+RSpec/FactoryBot/AttributeDefinedStatically:
+  Enabled: false
+RSpec/FactoryBot/CreateList:
+  Enabled: false
+RSpec/FactoryBot/FactoryClassName:
+  Enabled: false
+RSpec/HooksBeforeExamples:
+  Enabled: false
+RSpec/ImplicitBlockExpectation:
+  Enabled: false
+RSpec/ImplicitSubject:
+  Enabled: false
+RSpec/LeakyConstantDeclaration:
+  Enabled: false
+RSpec/LetBeforeExamples:
+  Enabled: false
+RSpec/MatchArray:
+  Enabled: false
+RSpec/MissingExampleGroupArgument:
+  Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+RSpec/MultipleSubjects:
+  Enabled: false
+RSpec/NestedGroups:
+  Enabled: false
+RSpec/PredicateMatcher:
+  Enabled: false
+RSpec/ReceiveCounts:
+  Enabled: false
+RSpec/ReceiveNever:
+  Enabled: false
+RSpec/RepeatedExampleGroupBody:
+  Enabled: false
+RSpec/RepeatedExampleGroupDescription:
+  Enabled: false
+RSpec/RepeatedIncludeExample:
+  Enabled: false
+RSpec/ReturnFromStub:
+  Enabled: false
+RSpec/SharedExamples:
+  Enabled: false
+RSpec/StubbedMock:
+  Enabled: false
+RSpec/UnspecifiedException:
+  Enabled: false
+RSpec/VariableDefinition:
+  Enabled: false
+RSpec/VoidExpect:
+  Enabled: false
+RSpec/Yield:
+  Enabled: false
+Security/Open:
+  Enabled: false
+Style/AccessModifierDeclarations:
+  Enabled: false
+Style/AccessorGrouping:
+  Enabled: false
+Style/BisectedAttrAccessor:
+  Enabled: false
+Style/CaseLikeIf:
+  Enabled: false
+Style/ClassEqualityComparison:
+  Enabled: false
+Style/ColonMethodDefinition:
+  Enabled: false
+Style/CombinableLoops:
+  Enabled: false
+Style/CommentedKeyword:
+  Enabled: false
+Style/Dir:
+  Enabled: false
+Style/DoubleCopDisableDirective:
+  Enabled: false
+Style/EmptyBlockParameter:
+  Enabled: false
+Style/EmptyLambdaParameter:
+  Enabled: false
+Style/Encoding:
+  Enabled: false
+Style/EvalWithLocation:
+  Enabled: false
+Style/ExpandPathArguments:
+  Enabled: false
+Style/ExplicitBlockArgument:
+  Enabled: false
+Style/ExponentialNotation:
+  Enabled: false
+Style/FloatDivision:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/GlobalStdStream:
+  Enabled: false
+Style/HashAsLastArrayItem:
+  Enabled: false
+Style/HashLikeCase:
+  Enabled: false
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false
+Style/IfUnlessModifier:
+  Enabled: false
+Style/KeywordParametersOrder:
+  Enabled: false
+Style/MinMax:
+  Enabled: false
+Style/MixinUsage:
+  Enabled: false
+Style/MultilineWhenThen:
+  Enabled: false
+Style/NegatedUnless:
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
+Style/OrAssignment:
+  Enabled: false
+Style/RandomWithOffset:
+  Enabled: false
+Style/RedundantAssignment:
+  Enabled: false
+Style/RedundantCondition:
+  Enabled: false
+Style/RedundantConditional:
+  Enabled: false
+Style/RedundantFetchBlock:
+  Enabled: false
+Style/RedundantFileExtensionInRequire:
+  Enabled: false
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+Style/RedundantRegexpEscape:
+  Enabled: false
+Style/RedundantSelfAssignment:
+  Enabled: false
+Style/RedundantSort:
+  Enabled: false
+Style/RescueStandardError:
+  Enabled: false
+Style/SingleArgumentDig:
+  Enabled: false
+Style/SlicingWithRange:
+  Enabled: false
+Style/SoleNestedConditional:
+  Enabled: false
+Style/StderrPuts:
+  Enabled: false
+Style/StringConcatenation:
+  Enabled: false
+Style/Strip:
+  Enabled: false
+Style/SymbolProc:
+  Enabled: false
+Style/TrailingBodyOnClass:
+  Enabled: false
+Style/TrailingBodyOnMethodDefinition:
+  Enabled: false
+Style/TrailingBodyOnModule:
+  Enabled: false
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+Style/TrailingMethodEndStatement:
+  Enabled: false
+Style/UnpackFirst:
+  Enabled: false
+Capybara/MatchStyle:
+  Enabled: false
+Capybara/NegationMatcher:
+  Enabled: false
+Capybara/SpecificActions:
+  Enabled: false
+Capybara/SpecificFinders:
+  Enabled: false
+Capybara/SpecificMatcher:
+  Enabled: false
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+Gemspec/RequireMFA:
+  Enabled: false
+Layout/LineContinuationLeadingSpace:
+  Enabled: false
+Layout/LineContinuationSpacing:
+  Enabled: false
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: false
+Layout/SpaceBeforeBrackets:
+  Enabled: false
+Lint/AmbiguousAssignment:
+  Enabled: false
+Lint/AmbiguousOperatorPrecedence:
+  Enabled: false
+Lint/AmbiguousRange:
+  Enabled: false
+Lint/ConstantOverwrittenInRescue:
+  Enabled: false
+Lint/DeprecatedConstants:
+  Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
+Lint/DuplicateMagicComment:
+  Enabled: false
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: false
+Lint/EmptyBlock:
+  Enabled: false
+Lint/EmptyClass:
+  Enabled: false
+Lint/EmptyInPattern:
+  Enabled: false
+Lint/IncompatibleIoSelectWithFiberScheduler:
+  Enabled: false
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+Lint/NonAtomicFileOperation:
+  Enabled: false
+Lint/NumberedParameterAssignment:
+  Enabled: false
+Lint/OrAssignmentToConstant:
+  Enabled: false
+Lint/RedundantDirGlobSort:
+  Enabled: false
+Lint/RefinementImportMethods:
+  Enabled: false
+Lint/RequireRangeParentheses:
+  Enabled: false
+Lint/RequireRelativeSelfPath:
+  Enabled: false
+Lint/SymbolConversion:
+  Enabled: false
+Lint/ToEnumArguments:
+  Enabled: false
+Lint/TripleQuotes:
+  Enabled: false
+Lint/UnexpectedBlockArity:
+  Enabled: false
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: false
+Lint/UselessRescue:
+  Enabled: false
+Lint/UselessRuby2Keywords:
+  Enabled: false
+Metrics/CollectionLiteralLength:
+  Enabled: false
+Naming/BlockForwarding:
+  Enabled: false
+Performance/CollectionLiteralInLoop:
+  Enabled: false
+Performance/ConcurrentMonotonicTime:
+  Enabled: false
+Performance/MapCompact:
+  Enabled: false
+Performance/RedundantEqualityComparisonBlock:
+  Enabled: false
+Performance/RedundantSplitRegexpArgument:
+  Enabled: false
+Performance/StringIdentifierArgument:
+  Enabled: false
+RSpec/BeEq:
+  Enabled: false
+RSpec/BeNil:
+  Enabled: false
+RSpec/ChangeByZero:
+  Enabled: false
+RSpec/ClassCheck:
+  Enabled: false
+RSpec/DuplicatedMetadata:
+  Enabled: false
+RSpec/ExcessiveDocstringSpacing:
+  Enabled: false
+RSpec/FactoryBot/ConsistentParenthesesStyle:
+  Enabled: false
+RSpec/FactoryBot/FactoryNameStyle:
+  Enabled: false
+RSpec/FactoryBot/SyntaxMethods:
+  Enabled: false
+RSpec/IdenticalEqualityAssertion:
+  Enabled: false
+RSpec/NoExpectationExample:
+  Enabled: false
+RSpec/PendingWithoutReason:
+  Enabled: false
+RSpec/Rails/AvoidSetupHook:
+  Enabled: false
+RSpec/Rails/HaveHttpStatus:
+  Enabled: false
+RSpec/Rails/InferredSpecType:
+  Enabled: false
+RSpec/Rails/MinitestAssertions:
+  Enabled: false
+RSpec/Rails/TravelAround:
+  Enabled: false
+RSpec/RedundantAround:
+  Enabled: false
+RSpec/SkipBlockInsideExample:
+  Enabled: false
+RSpec/SortMetadata:
+  Enabled: false
+RSpec/SubjectDeclaration:
+  Enabled: false
+RSpec/VerifiedDoubleReference:
+  Enabled: false
+Security/CompoundHash:
+  Enabled: false
+Security/IoMethods:
+  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
+Style/ArrayIntersect:
+  Enabled: false
+Style/CollectionCompact:
+  Enabled: false
+Style/ComparableClamp:
+  Enabled: false
+Style/ConcatArrayLiterals:
+  Enabled: false
+Style/DirEmpty:
+  Enabled: false
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+Style/EmptyHeredoc:
+  Enabled: false
+Style/EndlessMethod:
+  Enabled: false
+Style/EnvHome:
+  Enabled: false
+Style/FetchEnvVar:
+  Enabled: false
+Style/FileEmpty:
+  Enabled: false
+Style/FileRead:
+  Enabled: false
+Style/FileWrite:
+  Enabled: false
+Style/HashConversion:
+  Enabled: false
+Style/HashExcept:
+  Enabled: false
+Style/IfWithBooleanLiteralBranches:
+  Enabled: false
+Style/InPatternThen:
+  Enabled: false
+Style/MagicCommentFormat:
+  Enabled: false
+Style/MapCompactWithConditionalBlock:
+  Enabled: false
+Style/MapToHash:
+  Enabled: false
+Style/MapToSet:
+  Enabled: false
+Style/MinMaxComparison:
+  Enabled: false
+Style/MultilineInPatternThen:
+  Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
+Style/NestedFileDirname:
+  Enabled: false
+Style/NilLambda:
+  Enabled: false
+Style/NumberedParameters:
+  Enabled: false
+Style/NumberedParametersLimit:
+  Enabled: false
+Style/ObjectThen:
+  Enabled: false
+Style/OpenStructUse:
+  Enabled: false
+Style/OperatorMethodCall:
+  Enabled: false
+Style/QuotedSymbols:
+  Enabled: false
+Style/RedundantArgument:
+  Enabled: false
+Style/RedundantConstantBase:
+  Enabled: false
+Style/RedundantDoubleSplatHashBraces:
+  Enabled: false
+Style/RedundantEach:
+  Enabled: false
+Style/RedundantHeredocDelimiterQuotes:
+  Enabled: false
+Style/RedundantInitialize:
+  Enabled: false
+Style/RedundantSelfAssignmentBranch:
+  Enabled: false
+Style/RedundantStringEscape:
+  Enabled: false
+Style/SelectByRegexp:
+  Enabled: false
+Style/StringChars:
+  Enabled: false
+Style/SwapValues:
+  Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7d247b81e7..f2945682f6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,82 +1,15 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-20 10:23:43 UTC using RuboCop version 1.48.1.
+# on 2023-11-28 08:35:58 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'spec/acceptance/mod_php_spec.rb'
-    - 'spec/spec_helper_acceptance_local.rb'
-
-# Offense count: 5
-# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 126
-
-# Offense count: 3
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/CyclomaticComplexity:
-  Max: 13
-
-# Offense count: 7
-# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
-Metrics/MethodLength:
-  Max: 101
-
-# Offense count: 3
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/PerceivedComplexity:
-  Max: 13
-
-# Offense count: 2
-# Configuration parameters: ForbiddenDelimiters.
-# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
-Naming/HeredocDelimiterNaming:
-  Exclude:
-    - 'spec/classes/mod/http2_spec.rb'
-
-# Offense count: 3
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
-Naming/MethodParameterName:
-  Exclude:
-    - 'spec/spec_helper_acceptance_local.rb'
-    - 'util/apache_mod_platform_support.rb'
-
-# Offense count: 2
-# Configuration parameters: MinSize.
-Performance/CollectionLiteralInLoop:
-  Exclude:
-    - 'spec/classes/mod/passenger_spec.rb'
-    - 'spec/defines/vhost_spec.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/BeEq:
-  Exclude:
-    - 'spec/functions/bool2httpd_spec.rb'
-    - 'spec/functions/pw_hash_spec.rb'
-
-# Offense count: 393
-# Configuration parameters: Prefixes, AllowedPatterns.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Enabled: false
-
-# Offense count: 95
-# Configuration parameters: IgnoredMetadata.
-RSpec/DescribeClass:
-  Enabled: false
-
-# Offense count: 25
+# Offense count: 9
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 107
+  Max: 43
 
 # Offense count: 6
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
@@ -90,74 +23,13 @@ RSpec/FilePath:
     - 'spec/classes/mod/lookup_identity.rb'
     - 'spec/classes/mod/proxy_wstunnel.rb'
 
-# Offense count: 16
-# This cop supports safe autocorrection.
-RSpec/LetBeforeExamples:
-  Exclude:
-    - 'spec/classes/mod/auth_kerb_spec.rb'
-    - 'spec/classes/mod/auth_openidc_spec.rb'
-    - 'spec/classes/mod/cluster_spec.rb'
-    - 'spec/classes/mod/disk_cache_spec.rb'
-    - 'spec/classes/mod/jk_spec.rb'
-    - 'spec/classes/mod/proxy_balancer_spec.rb'
-    - 'spec/classes/mod/ssl_spec.rb'
-    - 'spec/classes/mod/wsgi_spec.rb'
-    - 'spec/classes/service_spec.rb'
-
-# Offense count: 17
-RSpec/MultipleExpectations:
-  Max: 8
-
-# Offense count: 69
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 6
-
-# Offense count: 291
+# Offense count: 290
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 123
-# Configuration parameters: AllowedGroups.
-RSpec/NestedGroups:
-  Max: 6
-
-# Offense count: 101
-# Configuration parameters: AllowedPatterns.
-# AllowedPatterns: ^expect_, ^assert_
-RSpec/NoExpectationExample:
-  Enabled: false
-
 # Offense count: 8
 RSpec/RepeatedExample:
   Exclude:
     - 'spec/classes/apache_spec.rb'
-
-# Offense count: 19
-RSpec/RepeatedExampleGroupBody:
-  Exclude:
-    - 'spec/acceptance/apache_parameters_spec.rb'
-    - 'spec/acceptance/apache_ssl_spec.rb'
-    - 'spec/acceptance/vhost_spec.rb'
-    - 'spec/classes/mod/remoteip_spec.rb'
-    - 'spec/functions/pw_hash_spec.rb'
-
-# Offense count: 18
-RSpec/RepeatedExampleGroupDescription:
-  Exclude:
-    - 'spec/acceptance/apache_parameters_spec.rb'
-    - 'spec/acceptance/vhost_spec.rb'
-    - 'spec/classes/apache_spec.rb'
-    - 'spec/classes/mod/security_spec.rb'
-
-# Offense count: 4
-RSpec/StubbedMock:
-  Exclude:
-    - 'spec/util/apache_mod_platform_compatibility_spec.rb'
-
-# Offense count: 1
-Metrics/BlockLength:
-  Exclude:
-    - 'lib/puppet/functions/apache/authz_core_config.rb'
diff --git a/Gemfile b/Gemfile
index 91a389e8e8..86e337adbc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,6 @@ group :development do
   gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
   gem "facterdb", '~> 1.18',                     require: false
   gem "metadata-json-lint", '~> 3.0',            require: false
-  gem "puppetlabs_spec_helper", '~> 6.0',        require: false
   gem "rspec-puppet-facts", '~> 2.0',            require: false
   gem "codecov", '~> 0.2',                       require: false
   gem "dependency_checker", '~> 1.0.0',          require: false
@@ -41,6 +40,10 @@ group :system_tests do
   gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
   gem "serverspec", '~> 2.41',   require: false
 end
+group :release_prep do
+  gem "puppet-strings", '~> 4.0',         require: false
+  gem "puppetlabs_spec_helper", '~> 7.0', require: false
+end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
 facter_version = ENV['FACTER_GEM_VERSION']
diff --git a/metadata.json b/metadata.json
index 05a8803f3a..7cc69917f4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -89,5 +89,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "3.0.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g9ab5b49"
+  "template-ref": "heads/main-0-g01c6a19"
 }
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
index bfad48533e..5566f33f46 100644
--- a/spec/classes/mod/jk_spec.rb
+++ b/spec/classes/mod/jk_spec.rb
@@ -68,7 +68,7 @@
     include_examples 'Debian 11'
 
     context 'with only required facts and default parameters' do
-      let(:facts) { override_facts(super(), networking: { ip: default_ip }) }
+      let(:facts) { override_facts(super(), 'networking' => { 'ip' => default_ip }) }
       let(:pre_condition) do
         'include apache'
       end
@@ -104,7 +104,7 @@
     end
 
     context 'with required facts' do
-      let(:facts) { override_facts(super(), networking: { ip: default_ip }) }
+      let(:facts) { override_facts(super(), 'networking' => { 'ip' => default_ip }) }
 
       context 'and default parameters' do
         let(:mod_dir) { mod_dir }
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 96eec3239d..ffa82f1087 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -618,7 +618,6 @@
           it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
 
-          # rubocop:disable RSpec/ExampleLength
           it {
             expect(subject).to contain_concat__fragment('rspec.example.com-directories')
               .with_content(%r{^\s+<Proxy "\*">$})
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9573c5a401..6820cebee7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,11 +9,11 @@
 
 require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 
-include RspecPuppetFacts # rubocop:disable Style/MixinUsage
+include RspecPuppetFacts
 
 default_facts = {
   puppetversion: Puppet.version,
-  facterversion: Facter.version
+  facterversion: Facter.version,
 }
 
 default_fact_files = [
@@ -25,7 +25,7 @@
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
+    default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
   rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end

From 51be5846568d5b4491db13adb58b89bcfc2b925d Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 12 Dec 2023 13:14:07 +0100
Subject: [PATCH 2194/2267] vhost::directories: switch default from undef to
 empty array

---
 REFERENCE.md       |  4 ++--
 manifests/vhost.pp | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 6e678449e0..ba80e4391b 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -9985,7 +9985,7 @@ Default value: `undef`
 
 ##### <a name="-apache--vhost--directories"></a>`directories`
 
-Data type: `Optional[Array[Hash]]`
+Data type: `Array[Hash]`
 
 The `directories` parameter within the `apache::vhost` class passes an array of hashes
 to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory),
@@ -10111,7 +10111,7 @@ and others.
     }
     ```
 
-Default value: `undef`
+Default value: `[]`
 
 ##### <a name="-apache--vhost--custom_fragment"></a>`custom_fragment`
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index bb1ad02de8..8caaa9386d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1778,7 +1778,7 @@
   Boolean $use_servername_for_filenames                                               = false,
   Boolean $use_port_for_filenames                                                     = false,
   Array[Hash[String[1], String[1]]] $aliases                                          = [],
-  Optional[Array[Hash]] $directories                                                  = undef,
+  Array[Hash] $directories                                                            = [],
   Boolean $error_log                                                                  = true,
   Optional[String] $error_log_file                                                    = undef,
   Optional[String] $error_log_pipe                                                    = undef,
@@ -2152,7 +2152,7 @@
   }
 
   ## Create a default directory list if none defined
-  if $directories {
+  if !empty($directories) {
     $_directories = $directories
   } elsif $docroot {
     $_directories = [
@@ -2166,7 +2166,7 @@
       },
     ]
   } else {
-    $_directories = undef
+    $_directories = []
   }
 
   ## Create a global LocationMatch if locations aren't defined
@@ -2309,7 +2309,7 @@
     }
   }
 
-  if $_directories and ! empty($_directories) and $ensure == 'present' {
+  if $ensure == 'present' {
     $_directories.each |Hash $directory| {
       if 'auth_basic_authoritative' in $directory or 'auth_basic_fake' in $directory or 'auth_basic_provider' in $directory {
         include apache::mod::auth_basic
@@ -2364,10 +2364,12 @@
     # - $docroot
     # - $shibboleth_enabled
     # - $cas_enabled
-    concat::fragment { "${name}-directories":
-      target  => "${priority_real}${filename}.conf",
-      order   => 60,
-      content => template('apache/vhost/_directories.erb'),
+    unless empty($_directories) {
+      concat::fragment { "${name}-directories":
+        target  => "${priority_real}${filename}.conf",
+        order   => 60,
+        content => template('apache/vhost/_directories.erb'),
+      }
     }
   }
 

From 65bc0304a876d86a169d1f21d44973e3d2c42c92 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 12 Dec 2023 10:45:13 +0100
Subject: [PATCH 2195/2267] .fixtures.yml: Add `---` header

---
 .fixtures.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.fixtures.yml b/.fixtures.yml
index 37bc6910f9..e1fc1e5d2d 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,3 +1,4 @@
+---
 fixtures:
   repositories:
     concat: "https://github.com/puppetlabs/puppetlabs-concat.git"

From b9b101b6051200db9919df610d6b5074046f78e8 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 12 Dec 2023 10:45:32 +0100
Subject: [PATCH 2196/2267] .fixtures.yml: Unpin puppet_agent module

---
 .fixtures.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index e1fc1e5d2d..6e655c3266 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -5,9 +5,7 @@ fixtures:
     facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
     portage: "https://github.com/gentoo/puppet-portage.git"
     provision: 'https://github.com/puppetlabs/provision.git'
-    puppet_agent:
-      repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
-      ref: v4.13.0
+    puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     yumrepo_core: 
       repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git"

From d7701e03b7c9c058223fc98a78c6d1053525a692 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 12 Dec 2023 10:45:48 +0100
Subject: [PATCH 2197/2267] .fixtures.yml: remove trailing whitespace

---
 .fixtures.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 6e655c3266..a0ba21129f 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -7,7 +7,7 @@ fixtures:
     provision: 'https://github.com/puppetlabs/provision.git'
     puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-    yumrepo_core: 
+    yumrepo_core:
       repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git"
       puppet_version: '>= 6.0.0'
   symlinks:

From b9c6a8e9e01c87bf2ec8a7050cfe77bc2aef7a13 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 12 Dec 2023 10:46:12 +0100
Subject: [PATCH 2198/2267] yumrepo_core: remove puppet version contraint

---
 .fixtures.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index a0ba21129f..68ef109e1b 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -7,9 +7,7 @@ fixtures:
     provision: 'https://github.com/puppetlabs/provision.git'
     puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-    yumrepo_core:
-      repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git"
-      puppet_version: '>= 6.0.0'
+    yumrepo_core: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git"
   symlinks:
     apache: "#{source_dir}"
     site_apache: "#{source_dir}/spec/fixtures/site_apache"

From b0262bff0533ca3ce2f199fcffda791826a4633d Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 12 Dec 2023 10:44:37 +0100
Subject: [PATCH 2199/2267] vhost_spec: test if whole catalog compiles

---
 spec/defines/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index ffa82f1087..57dcfd811e 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -536,7 +536,7 @@
             }
           end
 
-          it { is_expected.to compile }
+          it { is_expected.to compile.with_all_deps }
           it { is_expected.not_to contain_file('/var/www/foo') }
           it { is_expected.to contain_class('apache::mod::ssl') }
 

From 840b6754e2f2442e7b3425324e670bf4bb39410d Mon Sep 17 00:00:00 2001
From: Ramesh Sencha <ramesh.sencha@perforce.com>
Date: Thu, 21 Dec 2023 10:20:11 +0530
Subject: [PATCH 2200/2267] PDK update

---
 .sync.yml     |  5 ----
 Gemfile       |  5 ++--
 Rakefile      | 80 ---------------------------------------------------
 metadata.json |  2 +-
 4 files changed, 4 insertions(+), 88 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 44bb97480d..02b5c19ca4 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -6,11 +6,6 @@
 appveyor.yml:
   delete: true
 
-Gemfile:
-  optional:
-    ":development":
-    - gem: github_changelog_generator
-      version: '= 1.15.2'
 spec/spec_helper.rb:
   mock_with: ":rspec"
   coverage_report: true
diff --git a/Gemfile b/Gemfile
index 86e337adbc..ca0e773ecd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ group :development do
   gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
   gem "facterdb", '~> 1.18',                     require: false
   gem "metadata-json-lint", '~> 3.0',            require: false
+  gem "puppetlabs_spec_helper", '~> 6.0',        require: false
   gem "rspec-puppet-facts", '~> 2.0',            require: false
   gem "codecov", '~> 0.2',                       require: false
   gem "dependency_checker", '~> 1.0.0',          require: false
@@ -33,8 +34,8 @@ group :development do
   gem "rubocop", '= 1.48.1',                     require: false
   gem "rubocop-performance", '= 1.16.0',         require: false
   gem "rubocop-rspec", '= 2.19.0',               require: false
+  gem "puppet-strings", '~> 4.0',                require: false
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator", '= 1.15.2',  require: false
 end
 group :system_tests do
   gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
@@ -42,7 +43,7 @@ group :system_tests do
 end
 group :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false
-  gem "puppetlabs_spec_helper", '~> 7.0', require: false
+  gem "puppetlabs_spec_helper", '~> 6.0', require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index f761e13c04..2df73113cd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,88 +4,8 @@ require 'bundler'
 require 'puppet_litmus/rake_tasks' if Gem.loaded_specs.key? 'puppet_litmus'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'
 require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
 
-def changelog_user
-  return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
-  raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
-  puts "GitHubChangelogGenerator user:#{returnVal}"
-  returnVal
-end
-
-def changelog_project
-  return unless Rake.application.top_level_tasks.include? "changelog"
-
-  returnVal = nil
-  returnVal ||= begin
-    metadata_source = JSON.load(File.read('metadata.json'))['source']
-    metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
-
-    metadata_source_match && metadata_source_match[1]
-  end
-
-  raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
-
-  puts "GitHubChangelogGenerator project:#{returnVal}"
-  returnVal
-end
-
-def changelog_future_release
-  return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
-  raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
-  puts "GitHubChangelogGenerator future_release:#{returnVal}"
-  returnVal
-end
-
 PuppetLint.configuration.send('disable_relative')
 PuppetLint.configuration.send('disable_anchor_resource')
 PuppetLint.configuration.send('disable_140chars')
-
-
-if Gem.loaded_specs.key? 'github_changelog_generator'
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
-    config.user = "#{changelog_user}"
-    config.project = "#{changelog_project}"
-    config.since_tag = "3.2.0"
-    config.future_release = "#{changelog_future_release}"
-    config.exclude_labels = ['maintenance']
-    config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
-    config.add_pr_wo_labels = true
-    config.issues = false
-    config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
-    config.configure_sections = {
-      "Changed" => {
-        "prefix" => "### Changed",
-        "labels" => ["backwards-incompatible"],
-      },
-      "Added" => {
-        "prefix" => "### Added",
-        "labels" => ["enhancement", "feature"],
-      },
-      "Fixed" => {
-        "prefix" => "### Fixed",
-        "labels" => ["bug", "documentation", "bugfix"],
-      },
-    }
-  end
-else
-  desc 'Generate a Changelog from GitHub'
-  task :changelog do
-    raise <<EOM
-The changelog tasks depends on recent features of the github_changelog_generator gem.
-Please manually add it to your .sync.yml for now, and run `pdk update`:
----
-Gemfile:
-  optional:
-    ':development':
-      - gem: 'github_changelog_generator'
-        version: '~> 1.15'
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
-EOM
-  end
-end
-
diff --git a/metadata.json b/metadata.json
index 7cc69917f4..a638a5f699 100644
--- a/metadata.json
+++ b/metadata.json
@@ -89,5 +89,5 @@
   "description": "Module for Apache configuration",
   "pdk-version": "3.0.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g01c6a19"
+  "template-ref": "heads/main-0-g79a2f93"
 }

From 7b6e61a696cdce602c059f0a695225426ccd1e48 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Sun, 31 Dec 2023 22:07:55 +0000
Subject: [PATCH 2201/2267] Release prep v12.0.0

---
 CHANGELOG.md  | 94 ++++++++++++++++++++++++++++++---------------------
 metadata.json |  2 +-
 2 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2c086065..4c0c6711c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v12.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.0) - 2023-12-31
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v11.1.0...v12.0.0)
+
+### Changed
+- Drop EoL Debian 9 and older code [#2479](https://github.com/puppetlabs/puppetlabs-apache/pull/2479) ([bastelfreak](https://github.com/bastelfreak))
+
+### Added
+
+- `apache::vhost::directories`: switch default from `undef` to empty array [#2507](https://github.com/puppetlabs/puppetlabs-apache/pull/2507) ([bastelfreak](https://github.com/bastelfreak))
+- Add `AllowOverrideList` support [#2486](https://github.com/puppetlabs/puppetlabs-apache/pull/2486) ([yakatz](https://github.com/yakatz))
+
+### Fixed
+
+- Remove useless notice [#2494](https://github.com/puppetlabs/puppetlabs-apache/pull/2494) ([smortex](https://github.com/smortex))
+
 ## [v11.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v11.1.0) - 2023-09-25
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v11.0.0...v11.1.0)
@@ -21,6 +37,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v10.1.1...v11.0.0)
 
+### Changed
+- (CAT-1449) - Remove deprecated parameters for scriptaliases & passenger [#2470](https://github.com/puppetlabs/puppetlabs-apache/pull/2470) ([Ramesh7](https://github.com/Ramesh7))
+- Remove deprecated classes [#2466](https://github.com/puppetlabs/puppetlabs-apache/pull/2466) ([ekohl](https://github.com/ekohl))
+- Remove deprecated parameters from mod::userdir [#2465](https://github.com/puppetlabs/puppetlabs-apache/pull/2465) ([ekohl](https://github.com/ekohl))
+- (CAT-1424)-Removal of redhat/scientific/oraclelinux 6 for apache module [#2462](https://github.com/puppetlabs/puppetlabs-apache/pull/2462) ([praj1001](https://github.com/praj1001))
+
 ### Added
 
 - (CAT-1417) Nested require support for authz_core mod [#2460](https://github.com/puppetlabs/puppetlabs-apache/pull/2460) ([Ramesh7](https://github.com/Ramesh7))
@@ -32,12 +54,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Add MellonSetEnv support [#2423](https://github.com/puppetlabs/puppetlabs-apache/pull/2423) ([ic248](https://github.com/ic248))
 - Add the missing mod_authnz_ldap parameters [#2404](https://github.com/puppetlabs/puppetlabs-apache/pull/2404) ([chutzimir](https://github.com/chutzimir))
 
-### Changed
-- (CAT-1449) - Remove deprecated parameters for scriptaliases & passenger [#2470](https://github.com/puppetlabs/puppetlabs-apache/pull/2470) ([Ramesh7](https://github.com/Ramesh7))
-- Remove deprecated classes [#2466](https://github.com/puppetlabs/puppetlabs-apache/pull/2466) ([ekohl](https://github.com/ekohl))
-- Remove deprecated parameters from mod::userdir [#2465](https://github.com/puppetlabs/puppetlabs-apache/pull/2465) ([ekohl](https://github.com/ekohl))
-- (CAT-1424)-Removal of redhat/scientific/oraclelinux 6 for apache module [#2462](https://github.com/puppetlabs/puppetlabs-apache/pull/2462) ([praj1001](https://github.com/praj1001))
-
 ### Fixed
 
 - (CAT-1308) Making mod list more restrictive and minor improvements in documentation for default mods override [#2459](https://github.com/puppetlabs/puppetlabs-apache/pull/2459) ([Ramesh7](https://github.com/Ramesh7))
@@ -245,6 +261,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v7.0.0...v8.0.0)
 
+### Changed
+- Drop mod_fastcgi support [#2267](https://github.com/puppetlabs/puppetlabs-apache/pull/2267) ([ekohl](https://github.com/ekohl))
+- Drop suphp support [#2263](https://github.com/puppetlabs/puppetlabs-apache/pull/2263) ([ekohl](https://github.com/ekohl))
+- Use a stricter data type on apache::vhost::aliases [#2253](https://github.com/puppetlabs/puppetlabs-apache/pull/2253) ([ekohl](https://github.com/ekohl))
+- Narrow down Datatypes [#2245](https://github.com/puppetlabs/puppetlabs-apache/pull/2245) ([cocker-cc](https://github.com/cocker-cc))
+- (GH-cat-9) Update module to match current syntax standard [#2235](https://github.com/puppetlabs/puppetlabs-apache/pull/2235) ([david22swan](https://github.com/david22swan))
+- Drop Apache 2.0 compatibility code [#2226](https://github.com/puppetlabs/puppetlabs-apache/pull/2226) ([ekohl](https://github.com/ekohl))
+- (GH-iac-334) Remove code specific to unsupported OSs [#2223](https://github.com/puppetlabs/puppetlabs-apache/pull/2223) ([david22swan](https://github.com/david22swan))
+- Remove warnings and plans to change vhost default naming [#2202](https://github.com/puppetlabs/puppetlabs-apache/pull/2202) ([ekohl](https://github.com/ekohl))
+- Update modsec crs config and template [#2197](https://github.com/puppetlabs/puppetlabs-apache/pull/2197) ([henkworks](https://github.com/henkworks))
+
 ### Added
 
 - Allow overriding CRS allowed HTTP methods per vhost [#2274](https://github.com/puppetlabs/puppetlabs-apache/pull/2274) ([Vincevrp](https://github.com/Vincevrp))
@@ -263,17 +290,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Add support for setting UserDir in Virual Hosts [#2192](https://github.com/puppetlabs/puppetlabs-apache/pull/2192) ([smortex](https://github.com/smortex))
 - Add an apache::vhost::proxy define [#2169](https://github.com/puppetlabs/puppetlabs-apache/pull/2169) ([wbclark](https://github.com/wbclark))
 
-### Changed
-- Drop mod_fastcgi support [#2267](https://github.com/puppetlabs/puppetlabs-apache/pull/2267) ([ekohl](https://github.com/ekohl))
-- Drop suphp support [#2263](https://github.com/puppetlabs/puppetlabs-apache/pull/2263) ([ekohl](https://github.com/ekohl))
-- Use a stricter data type on apache::vhost::aliases [#2253](https://github.com/puppetlabs/puppetlabs-apache/pull/2253) ([ekohl](https://github.com/ekohl))
-- Narrow down Datatypes [#2245](https://github.com/puppetlabs/puppetlabs-apache/pull/2245) ([cocker-cc](https://github.com/cocker-cc))
-- (GH-cat-9) Update module to match current syntax standard [#2235](https://github.com/puppetlabs/puppetlabs-apache/pull/2235) ([david22swan](https://github.com/david22swan))
-- Drop Apache 2.0 compatibility code [#2226](https://github.com/puppetlabs/puppetlabs-apache/pull/2226) ([ekohl](https://github.com/ekohl))
-- (GH-iac-334) Remove code specific to unsupported OSs [#2223](https://github.com/puppetlabs/puppetlabs-apache/pull/2223) ([david22swan](https://github.com/david22swan))
-- Remove warnings and plans to change vhost default naming [#2202](https://github.com/puppetlabs/puppetlabs-apache/pull/2202) ([ekohl](https://github.com/ekohl))
-- Update modsec crs config and template [#2197](https://github.com/puppetlabs/puppetlabs-apache/pull/2197) ([henkworks](https://github.com/henkworks))
-
 ### Fixed
 
 - Disable mod_php on EL9 [#2277](https://github.com/puppetlabs/puppetlabs-apache/pull/2277) ([ekohl](https://github.com/ekohl))
@@ -292,15 +308,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.1...v7.0.0)
 
+### Changed
+- Drop Debian < 8 and Ubuntu < 14.04 code [#2189](https://github.com/puppetlabs/puppetlabs-apache/pull/2189) ([ekohl](https://github.com/ekohl))
+- Drop support and compatibility for Debian < 9 and Ubuntu < 16.04 [#2123](https://github.com/puppetlabs/puppetlabs-apache/pull/2123) ([ekohl](https://github.com/ekohl))
+
 ### Added
 
 - pdksync - (IAC-1751) - Add Support for Rocky 8 [#2196](https://github.com/puppetlabs/puppetlabs-apache/pull/2196) ([david22swan](https://github.com/david22swan))
 - Allow `docroot` with `mod_vhost_alias` `virtual_docroot` [#2195](https://github.com/puppetlabs/puppetlabs-apache/pull/2195) ([yakatz](https://github.com/yakatz))
 
-### Changed
-- Drop Debian < 8 and Ubuntu < 14.04 code [#2189](https://github.com/puppetlabs/puppetlabs-apache/pull/2189) ([ekohl](https://github.com/ekohl))
-- Drop support and compatibility for Debian < 9 and Ubuntu < 16.04 [#2123](https://github.com/puppetlabs/puppetlabs-apache/pull/2123) ([ekohl](https://github.com/ekohl))
-
 ### Fixed
 
 - Restore Ubuntu 14.04 support in suphp [#2193](https://github.com/puppetlabs/puppetlabs-apache/pull/2193) ([ekohl](https://github.com/ekohl))
@@ -568,14 +584,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.1.0...v5.0.0)
 
+### Changed
+- pdksync - (MODULES-8444) - Raise lower Puppet bound [#1908](https://github.com/puppetlabs/puppetlabs-apache/pull/1908) ([david22swan](https://github.com/david22swan))
+
 ### Added
 
 - (FM-7923) Implement Puppet Strings [#1916](https://github.com/puppetlabs/puppetlabs-apache/pull/1916) ([eimlav](https://github.com/eimlav))
 - Define SCL package name for mod_ldap [#1893](https://github.com/puppetlabs/puppetlabs-apache/pull/1893) ([treydock](https://github.com/treydock))
 
-### Changed
-- pdksync - (MODULES-8444) - Raise lower Puppet bound [#1908](https://github.com/puppetlabs/puppetlabs-apache/pull/1908) ([david22swan](https://github.com/david22swan))
-
 ### Fixed
 
 - (MODULES-9014) Improve SSLSessionTickets handling [#1923](https://github.com/puppetlabs/puppetlabs-apache/pull/1923) ([FredericLespez](https://github.com/FredericLespez))
@@ -606,13 +622,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...4.0.0)
 
+### Changed
+- default server_tokens to prod - more secure default [#1746](https://github.com/puppetlabs/puppetlabs-apache/pull/1746) ([juju4](https://github.com/juju4))
+
 ### Added
 
 - (Modules 8141/Modules 8379) - Addition of support for SLES 15 [#1862](https://github.com/puppetlabs/puppetlabs-apache/pull/1862) ([david22swan](https://github.com/david22swan))
 
-### Changed
-- default server_tokens to prod - more secure default [#1746](https://github.com/puppetlabs/puppetlabs-apache/pull/1746) ([juju4](https://github.com/juju4))
-
 ### Fixed
 
 - (MODULES-5990) - conf-enabled defaulted to undef [#1869](https://github.com/puppetlabs/puppetlabs-apache/pull/1869) ([david22swan](https://github.com/david22swan))
@@ -755,6 +771,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0)
 
+### Changed
+- MODULES-4824: Update the version compatibility to >= 4.7.0 < 5.0.0 [#1628](https://github.com/puppetlabs/puppetlabs-apache/pull/1628) ([angrox](https://github.com/angrox))
+- Migrate to puppet4 datatypes [#1621](https://github.com/puppetlabs/puppetlabs-apache/pull/1621) ([bastelfreak](https://github.com/bastelfreak))
+- Set default keepalive to On [#1434](https://github.com/puppetlabs/puppetlabs-apache/pull/1434) ([sathieu](https://github.com/sathieu))
+
 ### Added
 
 - (MODULES-4933) Allow custom UserDir string [#1650](https://github.com/puppetlabs/puppetlabs-apache/pull/1650) ([hunner](https://github.com/hunner))
@@ -786,11 +807,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - (MODULES-4156) adds RequestHeader directive to vhost template #puppethack [#1573](https://github.com/puppetlabs/puppetlabs-apache/pull/1573) ([eputnam](https://github.com/eputnam))
 - add passenger_max_requests option per vhost [#1517](https://github.com/puppetlabs/puppetlabs-apache/pull/1517) ([pulecp](https://github.com/pulecp))
 
-### Changed
-- MODULES-4824: Update the version compatibility to >= 4.7.0 < 5.0.0 [#1628](https://github.com/puppetlabs/puppetlabs-apache/pull/1628) ([angrox](https://github.com/angrox))
-- Migrate to puppet4 datatypes [#1621](https://github.com/puppetlabs/puppetlabs-apache/pull/1621) ([bastelfreak](https://github.com/bastelfreak))
-- Set default keepalive to On [#1434](https://github.com/puppetlabs/puppetlabs-apache/pull/1434) ([sathieu](https://github.com/sathieu))
-
 ### Fixed
 
 - Ensure that ProxyPreserveHost is set even when ProxyPass (etc) are not. [#1639](https://github.com/puppetlabs/puppetlabs-apache/pull/1639) ([tpdownes](https://github.com/tpdownes))
@@ -1400,6 +1416,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.11.0...1.0.0)
 
+### Changed
+- Metadata [#661](https://github.com/puppetlabs/puppetlabs-apache/pull/661) ([apenney](https://github.com/apenney))
+- Apache2.4 support [#552](https://github.com/puppetlabs/puppetlabs-apache/pull/552) ([scottasmith](https://github.com/scottasmith))
+
 ### Added
 
 - Modifying hierarchy of the Version/Params to fix AWS AMI [#651](https://github.com/puppetlabs/puppetlabs-apache/pull/651) ([jrnt30](https://github.com/jrnt30))
@@ -1411,10 +1431,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Ensure socache_shmcb is enabled on all Apache 2.4 OSes [#612](https://github.com/puppetlabs/puppetlabs-apache/pull/612) ([domcleal](https://github.com/domcleal))
 - Add WSGIApplicationGroup and WSGIImportScript directives [#606](https://github.com/puppetlabs/puppetlabs-apache/pull/606) ([bodgit](https://github.com/bodgit))
 
-### Changed
-- Metadata [#661](https://github.com/puppetlabs/puppetlabs-apache/pull/661) ([apenney](https://github.com/apenney))
-- Apache2.4 support [#552](https://github.com/puppetlabs/puppetlabs-apache/pull/552) ([scottasmith](https://github.com/scottasmith))
-
 ### Fixed
 
 - Add in missing fields to work around a Puppet bug. [#663](https://github.com/puppetlabs/puppetlabs-apache/pull/663) ([apenney](https://github.com/apenney))
@@ -1613,6 +1629,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.6.0...0.7.0)
 
+### Changed
+- Refactor module [#182](https://github.com/puppetlabs/puppetlabs-apache/pull/182) ([hunner](https://github.com/hunner))
+
 ### Added
 
 - Added an 'h' in a typo on default_ssl_vost  [#243](https://github.com/puppetlabs/puppetlabs-apache/pull/243) ([Wesseldr](https://github.com/Wesseldr))
@@ -1638,9 +1657,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Added apache::mod::rewrite class. [#128](https://github.com/puppetlabs/puppetlabs-apache/pull/128) ([Stubbs](https://github.com/Stubbs))
 - Added apache::mod::shib to configure Shibboleth Service Providers [#96](https://github.com/puppetlabs/puppetlabs-apache/pull/96) ([Aethylred](https://github.com/Aethylred))
 
-### Changed
-- Refactor module [#182](https://github.com/puppetlabs/puppetlabs-apache/pull/182) ([hunner](https://github.com/hunner))
-
 ### Fixed
 
 - Fix directories template fragment [#233](https://github.com/puppetlabs/puppetlabs-apache/pull/233) ([hunner](https://github.com/hunner))
diff --git a/metadata.json b/metadata.json
index a638a5f699..93e174cff1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "11.1.0",
+  "version": "12.0.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 184d2193ec36493beee3c44f810bde6580ba562a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 2 Jan 2024 06:46:33 -1000
Subject: [PATCH 2202/2267] Fix extra newline at end of headers

This slept through while converting templates form erb to epp.  Remove
it so that it is easier to spot regressions if the catalog is not
supposed to change but applying it in noop mode wants to change the
actual files.
---
 templates/vhost/_file_header.epp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_file_header.epp b/templates/vhost/_file_header.epp
index 0fce926354..0958130b9c 100644
--- a/templates/vhost/_file_header.epp
+++ b/templates/vhost/_file_header.epp
@@ -40,4 +40,4 @@ MDomain <%= $servername %>
 <% } -%>
 <% if $limitreqbody { -%>
   LimitRequestBody <%= $limitreqbody %>
-<% } %>
+<% } -%>

From b22bb017d6d2d9f52cd8ed4e8b46c117a538c5a7 Mon Sep 17 00:00:00 2001
From: Paul Barton <pbarton@gmail.com>
Date: Wed, 3 Jan 2024 09:01:15 -0500
Subject: [PATCH 2203/2267] Fix use_canonical_name directive

This is missing a newline char and breaks on recent (12.0.0)
puppetlabs-apache:
```
apache2: Syntax error on line 50 of /etc/apache2/apache2.conf: Syntax error on line 6 of /etc/apache2/sites-enabled/25-example.com-443.conf:6: <VirtualHost> was not closed.
```

This fix is inspired by fb9d1313, it's functionally the same. Adds the
missing newline and also adds two spaces for indentation.
---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index ba212b60e4..eec1a415e6 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2946,7 +2946,7 @@
     concat::fragment { "${name}-use_canonical_name":
       target  => "${priority_real}${filename}.conf",
       order   => 360,
-      content => "UseCanonicalName ${use_canonical_name}",
+      content => "  UseCanonicalName ${use_canonical_name}\n",
     }
   }
 

From d3d2d5f972116ef85a0e70a8faab08f6196a2899 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Wed, 3 Jan 2024 17:28:14 +0000
Subject: [PATCH 2204/2267] Release prep v12.0.1

---
 CHANGELOG.md  | 11 ++++++++++-
 metadata.json |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c0c6711c5..fe4bcc47dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v12.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.0) - 2023-12-31
+## [v12.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.1) - 2024-01-03
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.0...v12.0.1)
+
+### Fixed
+
+- Fix use_canonical_name directive [#2515](https://github.com/puppetlabs/puppetlabs-apache/pull/2515) ([pebtron](https://github.com/pebtron))
+- Fix extra newline at end of headers [#2514](https://github.com/puppetlabs/puppetlabs-apache/pull/2514) ([smortex](https://github.com/smortex))
+
+## [v12.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.0) - 2024-01-01
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v11.1.0...v12.0.0)
 
diff --git a/metadata.json b/metadata.json
index 93e174cff1..e7f523a0f4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 6da804a4094f2d53155a33f0bccb055d5860fd0e Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sat, 6 Jan 2024 17:21:10 +0100
Subject: [PATCH 2205/2267] Correct handling of $serveraliases as string

---
 manifests/vhost.pp               |  2 +-
 spec/defines/vhost_spec.rb       | 24 +++++++++++++++++++++++-
 templates/vhost/_serveralias.epp |  3 ++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index eec1a415e6..60f835673d 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2559,7 +2559,7 @@
     concat::fragment { "${name}-serveralias":
       target  => "${priority_real}${filename}.conf",
       order   => 210,
-      content => epp('apache/vhost/_serveralias.epp', { 'serveraliases' => $serveraliases }),
+      content => epp('apache/vhost/_serveralias.epp', { 'serveraliases' => [$serveraliases].flatten }),
     }
   }
 
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 57dcfd811e..b55f5775f1 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -776,7 +776,7 @@
           }
 
           it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') }
-          it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') }
+          it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias').with_content(%r{^  ServerAlias test-example\.com$}) }
 
           it {
             expect(subject).to contain_concat__fragment('rspec.example.com-setenv')
@@ -1221,6 +1221,28 @@
           it { is_expected.not_to contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') }
         end
 
+        describe 'serveraliases parameter' do
+          let(:params) { default_params.merge(serveraliases: serveraliases) }
+
+          context 'with a string' do
+            let(:serveraliases) { 'alias.example.com' }
+
+            it { is_expected.to compile.with_all_deps }
+            it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias').with_content(%r{^  ServerAlias alias\.example\.com$}) }
+          end
+
+          context 'with an array' do
+            let(:serveraliases) { ['alias1.example.com', 'alias2.example.com'] }
+
+            it { is_expected.to compile.with_all_deps }
+            it do
+              expect(subject).to contain_concat__fragment('rspec.example.com-serveralias')
+                .with_content(%r{^  ServerAlias alias1\.example\.com$})
+                .with_content(%r{^  ServerAlias alias2\.example\.com$})
+            end
+          end
+        end
+
         context 'vhost with multiple ip addresses, multiple ports' do
           let :params do
             {
diff --git a/templates/vhost/_serveralias.epp b/templates/vhost/_serveralias.epp
index 5b9abb2817..1baf18c9b0 100644
--- a/templates/vhost/_serveralias.epp
+++ b/templates/vhost/_serveralias.epp
@@ -1,7 +1,8 @@
+<%- | Array[String] $serveraliases | -%>
 <% unless $serveraliases.empty { -%>
 
   ## Server aliases
-  <%- Array($serveraliases).each |$serveralias| { -%>
+  <%- $serveraliases.each |$serveralias| { -%>
   ServerAlias <%= $serveralias %>
   <%- } -%>
 <% } -%>

From f9eaee1fba1de09b74996dcb86c464042506ae03 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Wed, 10 Jan 2024 20:00:52 +0000
Subject: [PATCH 2206/2267] Release prep v12.0.2

---
 CHANGELOG.md  | 8 ++++++++
 metadata.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe4bcc47dc..61016b9711 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v12.0.2](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.2) - 2024-01-10
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.1...v12.0.2)
+
+### Fixed
+
+- Correct handling of $serveraliases as string [#2518](https://github.com/puppetlabs/puppetlabs-apache/pull/2518) ([ekohl](https://github.com/ekohl))
+
 ## [v12.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.1) - 2024-01-03
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.0...v12.0.1)
diff --git a/metadata.json b/metadata.json
index e7f523a0f4..7d4ee720de 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From c03607fd3999821112d3925bc7170c012e93e1b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 15 Feb 2024 10:03:59 -1000
Subject: [PATCH 2207/2267] Fix `mod_auth_openidc` parameters

A typo in the data type cause an exception with recent Puppet 8
versions:

```
Error: The key '["IDTokenEncryptedResponseAlg"]' is declared more than once (file: /etc/puppetlabs/code/environments/production/modules/apache/types/oidcsettings.pp, line: 41, column: 57) on node b4d45d8831d5.mtgrj3ika5nejlcpzgeeecg0la.cx.internal.cloudapp.net
```

According to the upstream repository configuration file, this is a
copy-paste error.
---
 types/oidcsettings.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 7dd2afca16..e09a0626b7 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -38,7 +38,7 @@
     Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
     Optional['IDTokenSignedResponseAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
     Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['IDTokenEncryptedResponseEnc']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
     Optional['UserInfoSignedResposeAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
     Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
     Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],

From 7587c4b416eb0380d05b7989b346b7fa61adcd75 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:02:34 +0000
Subject: [PATCH 2208/2267] Release prep v12.0.3

---
 CHANGELOG.md  | 8 ++++++++
 REFERENCE.md  | 2 +-
 metadata.json | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61016b9711..3950a39c6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v12.0.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.3) - 2024-03-01
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.2...v12.0.3)
+
+### Fixed
+
+- Fix `mod_auth_openidc` parameters [#2525](https://github.com/puppetlabs/puppetlabs-apache/pull/2525) ([smortex](https://github.com/smortex))
+
 ## [v12.0.2](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.2) - 2024-01-10
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.1...v12.0.2)
diff --git a/REFERENCE.md b/REFERENCE.md
index ba80e4391b..5536426b82 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -11334,7 +11334,7 @@ Struct[{
     Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
     Optional['IDTokenSignedResponseAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
     Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['IDTokenEncryptedResponseEnc']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
     Optional['UserInfoSignedResposeAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
     Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
     Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
diff --git a/metadata.json b/metadata.json
index 7d4ee720de..5592f58ade 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "12.0.2",
+  "version": "12.0.3",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 09d5499d09bd8e89f2d841fa75138cd41b5b6ba5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 17 Mar 2024 15:40:58 +0900
Subject: [PATCH 2209/2267] Add EnableSendfile per directory

The EnableSendfile option can be configured in a Directory directive
to disable/enable the snedfile feature for specific paths.
---
 spec/defines/vhost_spec.rb       | 4 +++-
 templates/vhost/_directories.erb | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b55f5775f1..586a867b5c 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -139,7 +139,8 @@
                   {
                     'enforce' => 'any',
                     'requires' => ['any-valid1', 'any-valid2']
-                  }
+                  },
+                  'enable_sendfile' => 'On',
                 },
                 {
                   'path' => '*',
@@ -641,6 +642,7 @@
               .with_content(%r{^\s+</RequireAny>$})
               .with_content(%r{^\s+Require any-valid1$})
               .with_content(%r{^\s+Require any-valid2$})
+              .with_content(%r{^\s+EnableSendfile On$})
               .with_content(%r{^\s+LDAPReferrals off$})
               .with_content(%r{^\s+ProxyPass http://backend-b/ retry=0 timeout=5 noquery interpolate$})
               .with_content(%r{^\s+ProxyPassMatch http://backend-b/ retry=0 timeout=5 noquery interpolate$})
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index ba072523fc..76dc6cfe4f 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -19,8 +19,11 @@
       <%- path = directory['path'] -%>
 
   <<%= provider %> "<%= path %>">
-      <%- if directory['headers'] -%>
-        <%- Array(directory['headers']).each do |header| -%>
+    <%- if directory['enable_sendfile'] -%>
+    EnableSendfile <%= directory['enable_sendfile'] %>
+    <%- end -%>
+    <%- if directory['headers'] -%>
+      <%- Array(directory['headers']).each do |header| -%>
     Header <%= header %>
       <%- end -%>
     <%- end -%>

From 95a2ab0f4da27e62a3b0d57b537edc7e18449a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Charaoui?= <jerome@riseup.net>
Date: Tue, 20 Feb 2024 18:14:52 -0500
Subject: [PATCH 2210/2267] Stop managing mime support package on Debian

All apache2 packages on Debian 10 and later already have a hard dependency on
the `mime-support` package. While `mime-support` still exists on Debian 12
as a transitonal package, upcoming Debian 13 has removed it entirely.

This sets the `$mime_support_package` to undefined so that the package
isn't managed on Debian, since it doesn't need to be.
---
 manifests/mod/mime.pp | 6 +++---
 manifests/params.pp   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
index b70e9257de..36312e3abb 100644
--- a/manifests/mod/mime.pp
+++ b/manifests/mod/mime.pp
@@ -13,9 +13,9 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_mime.html for additional documentation.
 #
 class apache::mod::mime (
-  String $mime_support_package          = $apache::params::mime_support_package,
-  String $mime_types_config             = $apache::params::mime_types_config,
-  Optional[Hash] $mime_types_additional = undef,
+  Optional[String] $mime_support_package = $apache::params::mime_support_package,
+  String $mime_types_config              = $apache::params::mime_types_config,
+  Optional[Hash] $mime_types_additional  = undef,
 ) inherits apache::params {
   include apache
   $_mime_types_additional = pick($mime_types_additional, $apache::mime_types_additional)
diff --git a/manifests/params.pp b/manifests/params.pp
index 404a27bedb..be3fd6b24d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -470,8 +470,8 @@
     $keepalive              = 'On'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
-    $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
+    $mime_support_package = undef
     $docroot              = '/var/www/html'
     $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
     $mellon_lock_file     = undef

From 5a114d9765e55e22b28b3e65f6e7c8961d3381e4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 25 Mar 2024 11:25:48 +0900
Subject: [PATCH 2211/2267] vhost: Allow customizing show_diff

A vhost configuration file may contain sensitive information. For
example when mod_auth_openidc is used then the file may contain
OIDCCryptoPassphrase. This introduces the parameter to allow users to
hide diff when applying manifests, to avoid leaking secrets to outputs.
---
 manifests/vhost.pp         | 21 +++++++++++++--------
 spec/defines/vhost_spec.rb |  5 ++++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 60f835673d..7414a6f165 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -238,6 +238,9 @@
 # @param ensure
 #   Specifies if the virtual host is present or absent.<br />
 #
+# @param show_diff
+#   Specifies whether to set the show_diff parameter for the file resource.
+#
 # @param fallbackresource
 #   Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) 
 #   directive, which specifies an action to take for any URL that doesn't map to anything in 
@@ -1836,6 +1839,7 @@
   Variant[Array[String], String] $setenvifnocase                                      = [],
   Variant[Array[String], String] $block                                               = [],
   Enum['absent', 'present'] $ensure                                                   = 'present',
+  Boolean $show_diff                                                                  = true,
   Optional[String] $wsgi_application_group                                            = undef,
   Optional[Variant[String, Hash]] $wsgi_daemon_process                                = undef,
   Optional[Hash] $wsgi_daemon_process_options                                         = undef,
@@ -2195,14 +2199,15 @@
   }
 
   concat { "${priority_real}${filename}.conf":
-    ensure  => $ensure,
-    path    => "${apache::vhost_dir}/${priority_real}${filename}.conf",
-    owner   => 'root',
-    group   => $apache::params::root_group,
-    mode    => $apache::file_mode,
-    order   => 'numeric',
-    require => Package['httpd'],
-    notify  => Class['apache::service'],
+    ensure    => $ensure,
+    path      => "${apache::vhost_dir}/${priority_real}${filename}.conf",
+    owner     => 'root',
+    group     => $apache::params::root_group,
+    mode      => $apache::file_mode,
+    show_diff => $show_diff,
+    order     => 'numeric',
+    require   => Package['httpd'],
+    notify    => Class['apache::service'],
   }
   # NOTE(pabelanger): This code is duplicated in ::apache::vhost::custom and
   # needs to be converted into something generic.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index b55f5775f1..f86569262d 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -589,6 +589,7 @@
           it {
             expect(subject).to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
                                                                                 'mode' => '0644',
+                                                                                'show_diff' => true,
                                                                                 'require' => 'Package[httpd]',
                                                                                 'notify' => 'Class[Apache::Service]')
           }
@@ -1527,6 +1528,7 @@
               'error_log_pipe' => '/dev/null',
               'docroot' => '/var/www/foo',
               'ensure' => 'absent',
+              'show_diff' => false,
               'manage_docroot' => true,
               'logroot' => '/tmp/logroot',
               'logroot_ensure' => 'absent'
@@ -1556,7 +1558,8 @@
           }
 
           it {
-            expect(subject).to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
+            expect(subject).to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent',
+                                                                                'show_diff' => false)
           }
 
           it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }

From b57883ee95d1bb1fdfc918dee0ddf15773816236 Mon Sep 17 00:00:00 2001
From: "Minor, Thomas" <thomas.minor@kps.com>
Date: Tue, 8 Dec 2020 13:22:51 +0100
Subject: [PATCH 2212/2267] Added cache_disk

Deprecates disk_cache
---
 manifests/mod/cache_disk.pp       | 121 ++++++++++++++++++++++++++++++
 manifests/mod/disk_cache.pp       |  54 ++++---------
 templates/mod/cache_disk.conf.erb |  36 +++++++++
 3 files changed, 171 insertions(+), 40 deletions(-)
 create mode 100644 manifests/mod/cache_disk.pp
 create mode 100644 templates/mod/cache_disk.conf.erb

diff --git a/manifests/mod/cache_disk.pp b/manifests/mod/cache_disk.pp
new file mode 100644
index 0000000000..83abcf5f37
--- /dev/null
+++ b/manifests/mod/cache_disk.pp
@@ -0,0 +1,121 @@
+# @summary
+#   Installs and configures `mod_cache_disk`.
+#
+# @description
+#   This will install an configure the proper module depending on the used apache version, so
+#   - mod_cache_disk for apache version >= 2.4
+#   - mod_disk_cache for older apache versions
+# 
+# @param cache_root
+#   Defines the name of the directory on the disk to contain cache files.
+#   Default depends on the Apache version and operating system:
+#   - Debian: /var/cache/apache2/mod_cache_disk
+#   - FreeBSD: /var/cache/mod_cache_disk
+#   - Red Hat, Apache 2.4: /var/cache/httpd/proxy
+#   - Red Hat, Apache 2.2: /var/cache/mod_proxy
+#
+# @param cache_enable
+#   Defines an array of directories to cache, the default is none
+#
+# @param cache_ignore_headers
+#   Specifies HTTP header(s) that should not be stored in the cache.
+#
+# @param cache_dir_length
+#   The number of characters in subdirectory names
+#
+# @param cache_dir_levels
+#   The number of levels of subdirectories in the cache.
+#
+# @param cache_default_expire
+#   The default duration to cache a document when no expiry date is specified.
+#
+# @param cache_max_expire
+#   The maximum time in seconds to cache a document
+#
+# @param cache_ignore_no_lastmod
+#   Ignore the fact that a response has no Last Modified header.
+#
+# @param cache_header
+#   Add an X-Cache header to the response.
+#
+# @param cache_lock
+#   Enable the thundering herd lock.
+#
+# @param cache_ignore_cache_control
+#   Ignore request to not serve cached content to client
+#
+# @param cache_max_filesize
+#   The maximum size (in bytes) of a document to be placed in the cache
+#
+# @note
+#   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
+#
+# @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation on version 2.2.
+#
+# @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation on version 2.4.
+#
+class apache::mod::cache_disk (
+  $cache_root                                             = undef,
+  Array[String] $cache_enable                             = [],
+  Optional[String] $cache_ignore_headers                  = undef,
+  Optional[Integer] $cache_dir_length                     = undef,
+  Optional[Integer] $cache_dir_levels                     = undef,
+  Optional[Integer] $cache_default_expire                 = undef,
+  Optional[Integer] $cache_max_expire                     = undef,
+  Optional[Enum['Off', 'On']] $cache_ignore_no_lastmod    = undef,
+  Optional[Enum['off', 'on']] $cache_header               = undef,
+  Optional[Enum['off', 'on']] $cache_lock                 = undef,
+  Optional[Enum['Off', 'On']] $cache_ignore_cache_control = undef,
+  Optional[Integer] $cache_max_filesize                   = undef,
+) {
+  include apache
+  if $cache_root {
+    $_cache_root = $cache_root
+  }
+  elsif versioncmp($apache::apache_version, '2.4') >= 0 {
+    $_module_name = 'cache_disk'
+    $_cache_root = $::osfamily ? {
+      'debian'  => '/var/cache/apache2/mod_cache_disk',
+      'redhat'  => '/var/cache/httpd/proxy',
+      'freebsd' => '/var/cache/mod_cache_disk',
+    }
+  }
+  else {
+    $_module_name = 'disk_cache'
+    $_cache_root = $::osfamily ? {
+      'debian'  => '/var/cache/apache2/mod_disk_cache',
+      'redhat'  => '/var/cache/mod_proxy',
+      'freebsd' => '/var/cache/mod_disk_cache',
+    }
+  }
+  $_configuration_file_name = "${_module_name}.conf"
+  $_class_name = "::apache::mod::${_module_name}"
+
+  apache::mod { $_module_name: }
+
+  Class['::apache::mod::cache'] -> Class[$_class_name]
+
+  # Template uses
+  # - $_cache_root
+  # - $cache_enable
+  # - $cache_dir_length
+  # - $cache_ignore_headers
+  # - $cache_dir_length
+  # - $cache_dir_levels
+  # - $cache_default_expire
+  # - $cache_max_expire
+  # - $cache_ignore_no_lastmod
+  # - $cache_header
+  # - $cache_lock
+  # - $cache_ignore_cache_control
+  # - $cache_max_filesize
+  file { $_configuration_file_name:
+    ensure  => file,
+    path    => "${apache::mod_dir}/${_configuration_file_name}",
+    mode    => $apache::file_mode,
+    content => template('apache/mod/cache_disk.conf.erb'),
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
+}
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 4a3dc35883..6b9a0c7a4d 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -6,55 +6,29 @@
 #   Default depends on the Apache version and operating system:
 #   - Debian: /var/cache/apache2/mod_cache_disk
 #   - FreeBSD: /var/cache/mod_cache_disk
-#   - Red Hat: /var/cache/httpd/proxy
+#   - Red Hat, Apache 2.4: /var/cache/httpd/proxy
+#   - Red Hat, Apache 2.2: /var/cache/mod_proxy
 #
 # @param cache_ignore_headers
 #   Specifies HTTP header(s) that should not be stored in the cache.
 #
-# @param default_cache_enable
-#   Default value is true, which enables "CacheEnable disk /" in disk_cache.conf for the webserver. This would cache
-#   every request to apache by default for every vhost. If set to false the default cache all behaviour is supressed.
-#   You can then control this behaviour in individual vhosts by explicitly defining CacheEnable.
-#
 # @note
-#   On Apache 2.4, mod_cache_disk installed.
+#   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
+#   This class is deprecated, use mode_cache_disk instead
+#
+# @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation on version 2.2.
 #
-# @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation.
+# @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation on version 2.4.
 #
 class apache::mod::disk_cache (
-  Optional[Stdlib::Absolutepath] $cache_root = undef,
-  Optional[String] $cache_ignore_headers     = undef,
-  Boolean $default_cache_enable              = true,
+  $cache_root                 = undef,
+  $cache_ignore_headers       = undef,
 ) {
-  include apache
-  if $cache_root {
-    $_cache_root = $cache_root
-  } else {
-    $_cache_root = $facts['os']['family'] ? {
-      'Debian'  => '/var/cache/apache2/mod_cache_disk',
-      'RedHat'  => '/var/cache/httpd/proxy',
-      'FreeBSD' => '/var/cache/mod_cache_disk',
-    }
-  }
-
-  apache::mod { 'cache_disk': }
-
-  Class['apache::mod::cache'] -> Class['apache::mod::disk_cache']
-
-  $parameters = {
-    'default_cache_enable'  => $default_cache_enable,
-    '_cache_root'           => $_cache_root,
-    'cache_ignore_headers'  => $cache_ignore_headers,
-  }
+  deprecation('apache::mod::disk_cache','This module is deprecated; please use apache::mod::cache_disk')
 
-  # Template uses $_cache_root
-  file { 'disk_cache.conf':
-    ensure  => file,
-    path    => "${apache::mod_dir}/disk_cache.conf",
-    mode    => $apache::file_mode,
-    content => epp('apache/mod/disk_cache.conf.epp', $parameters),
-    require => Exec["mkdir ${apache::mod_dir}"],
-    before  => File[$apache::mod_dir],
-    notify  => Class['apache::service'],
+  class { 'apache::mod::cache_disk':
+    cache_root                 => $cache_root,
+    cache_enable              => ['/'],
+    cache_ignore_headers       => $cache_ignore_headers,
   }
 }
diff --git a/templates/mod/cache_disk.conf.erb b/templates/mod/cache_disk.conf.erb
new file mode 100644
index 0000000000..e98632fe10
--- /dev/null
+++ b/templates/mod/cache_disk.conf.erb
@@ -0,0 +1,36 @@
+CacheRoot "<%= @_cache_root %>"
+<%- if @cache_enable -%>
+  <%- @cache_enable.each do |enable| -%>
+CacheEnable disk <%= enable %>
+  <%- end -%>
+<%- end -%>
+<%- if @cache_dir_length -%>
+CacheDirLength <%= @cache_dir_length %>
+<%- end -%>
+<%- if @cache_dir_levels -%>
+CacheDirLevels <%= @cache_dir_levels %>
+<%- end -%>
+<%- if @cache_default_expire -%>
+CacheDefaultExpire <%= @cache_default_expire %>
+<%- end -%>
+<%- if @cache_max_expire -%>
+CacheMaxExpire <%= @cache_max_expire %>
+<%- end -%>
+<%- if @cache_ignore_no_lastmod -%>
+CacheIgnoreNoLastMod <%= @cache_ignore_no_lastmod %>
+<%- end -%>
+<%- if @cache_header -%>
+CacheHeader <%= @cache_header %>
+<%- end -%>
+<%- if @cache_lock -%>
+CacheLock <%= @cache_lock %>
+<%- end -%>
+<%- if @cache_ignore_cache_control -%>
+CacheIgnoreCacheControl <%= @cache_ignore_cache_control %>
+<%- end -%>
+<%- if @cache_max_filesize -%>
+CacheMaxFileSize <%= @cache_max_filesize %>
+<%- end -%>
+<%- if @cache_ignore_headers -%>
+CacheIgnoreHeaders <%= @cache_ignore_headers -%>
+<%- end -%>

From 60c3d46fb169829c52ad71e3f9c9969fb01116c6 Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <dennis.ploeger@kps.com>
Date: Fri, 12 Jan 2024 09:58:07 +0100
Subject: [PATCH 2213/2267] Fixing parameters in deprecated module to keep
 backwards compatibility

---
 manifests/mod/disk_cache.pp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 6b9a0c7a4d..4c229c0ff8 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -6,8 +6,6 @@
 #   Default depends on the Apache version and operating system:
 #   - Debian: /var/cache/apache2/mod_cache_disk
 #   - FreeBSD: /var/cache/mod_cache_disk
-#   - Red Hat, Apache 2.4: /var/cache/httpd/proxy
-#   - Red Hat, Apache 2.2: /var/cache/mod_proxy
 #
 # @param cache_ignore_headers
 #   Specifies HTTP header(s) that should not be stored in the cache.
@@ -16,13 +14,12 @@
 #   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
 #   This class is deprecated, use mode_cache_disk instead
 #
-# @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation on version 2.2.
-#
 # @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation on version 2.4.
 #
 class apache::mod::disk_cache (
-  $cache_root                 = undef,
-  $cache_ignore_headers       = undef,
+  Optional[Stdlib::Absolutepath] $cache_root = undef,
+  Optional[String] $cache_ignore_headers     = undef,
+  Boolean $default_cache_enable              = true,
 ) {
   deprecation('apache::mod::disk_cache','This module is deprecated; please use apache::mod::cache_disk')
 

From ec10dff6e20c8bb99de92512ea97a13327ac31fd Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <dennis.ploeger@kps.com>
Date: Fri, 12 Jan 2024 12:10:46 +0100
Subject: [PATCH 2214/2267] Optimization

Fix parameters to keep backwards compatibility

Added tests
---
 manifests/mod/cache.pp              |  54 +++++++++++-
 manifests/mod/cache_disk.pp         | 108 +++++++++---------------
 manifests/mod/disk_cache.pp         |  16 +++-
 spec/classes/mod/cache_disk_spec.rb | 123 ++++++++++++++++++++++++++++
 spec/classes/mod/cache_spec.rb      | 110 +++++++++++++++++++++++++
 spec/classes/mod/disk_cache_spec.rb |  34 ++++----
 templates/mod/cache.conf.epp        |  30 +++++++
 templates/mod/cache_disk.conf.epp   |  26 ++++++
 templates/mod/cache_disk.conf.erb   |  36 --------
 templates/mod/disk_cache.conf.epp   |   9 --
 10 files changed, 409 insertions(+), 137 deletions(-)
 create mode 100644 spec/classes/mod/cache_disk_spec.rb
 create mode 100644 spec/classes/mod/cache_spec.rb
 create mode 100644 templates/mod/cache.conf.epp
 create mode 100644 templates/mod/cache_disk.conf.epp
 delete mode 100644 templates/mod/cache_disk.conf.erb
 delete mode 100644 templates/mod/disk_cache.conf.epp

diff --git a/manifests/mod/cache.pp b/manifests/mod/cache.pp
index a822ae9aa4..3ed71a60dc 100644
--- a/manifests/mod/cache.pp
+++ b/manifests/mod/cache.pp
@@ -1,8 +1,58 @@
 # @summary
 #   Installs `mod_cache`
-# 
+#
+# @param cache_ignore_headers
+#   Specifies HTTP header(s) that should not be stored in the cache.
+#
+# @param cache_default_expire
+#   The default duration to cache a document when no expiry date is specified.
+#
+# @param cache_max_expire
+#   The maximum time in seconds to cache a document
+#
+# @param cache_ignore_no_lastmod
+#   Ignore the fact that a response has no Last Modified header.
+#
+# @param cache_header
+#   Add an X-Cache header to the response.
+#
+# @param cache_lock
+#   Enable the thundering herd lock.
+#
+# @param cache_ignore_cache_control
+#   Ignore request to not serve cached content to client
+#
 # @see https://httpd.apache.org/docs/current/mod/mod_cache.html for additional documentation.
 #
-class apache::mod::cache {
+class apache::mod::cache (
+  Optional[String] $cache_ignore_headers                               = undef,
+  Optional[Integer] $cache_default_expire                              = undef,
+  Optional[Integer] $cache_max_expire                                  = undef,
+  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_no_lastmod    = undef,
+  Optional[Enum['off', 'on', 'Off', 'On']] $cache_header               = undef,
+  Optional[Enum['off', 'on', 'Off', 'On']] $cache_lock                 = undef,
+  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_cache_control = undef,
+) {
+  include apache
   ::apache::mod { 'cache': }
+
+  $_configuration_file_name = 'cache.conf'
+
+  file { $_configuration_file_name:
+    ensure  => file,
+    path    => "${apache::mod_dir}/${_configuration_file_name}",
+    mode    => $apache::file_mode,
+    content => epp('apache/mod/cache.conf.epp', {
+        cache_ignore_headers       => $cache_ignore_headers,
+        cache_default_expire       => $cache_default_expire,
+        cache_max_expire           => $cache_max_expire,
+        cache_ignore_no_lastmod    => $cache_ignore_no_lastmod,
+        cache_header               => $cache_header,
+        cache_lock                 => $cache_lock,
+        cache_ignore_cache_control => $cache_ignore_cache_control,
+    }),
+    require => Exec["mkdir ${apache::mod_dir}"],
+    before  => File[$apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
 }
diff --git a/manifests/mod/cache_disk.pp b/manifests/mod/cache_disk.pp
index 83abcf5f37..97631d4a5a 100644
--- a/manifests/mod/cache_disk.pp
+++ b/manifests/mod/cache_disk.pp
@@ -12,108 +12,78 @@
 #   - Debian: /var/cache/apache2/mod_cache_disk
 #   - FreeBSD: /var/cache/mod_cache_disk
 #   - Red Hat, Apache 2.4: /var/cache/httpd/proxy
-#   - Red Hat, Apache 2.2: /var/cache/mod_proxy
 #
 # @param cache_enable
 #   Defines an array of directories to cache, the default is none
-#
-# @param cache_ignore_headers
-#   Specifies HTTP header(s) that should not be stored in the cache.
-#
+
 # @param cache_dir_length
 #   The number of characters in subdirectory names
 #
 # @param cache_dir_levels
 #   The number of levels of subdirectories in the cache.
 #
-# @param cache_default_expire
-#   The default duration to cache a document when no expiry date is specified.
-#
-# @param cache_max_expire
-#   The maximum time in seconds to cache a document
-#
-# @param cache_ignore_no_lastmod
-#   Ignore the fact that a response has no Last Modified header.
-#
-# @param cache_header
-#   Add an X-Cache header to the response.
-#
-# @param cache_lock
-#   Enable the thundering herd lock.
-#
-# @param cache_ignore_cache_control
-#   Ignore request to not serve cached content to client
-#
 # @param cache_max_filesize
 #   The maximum size (in bytes) of a document to be placed in the cache
 #
+# @param cache_ignore_headers
+#   DEPRECATED Ignore request to not serve cached content to client (included for compatibility reasons to support disk_cache)
+#
+# @param configuration_file_name
+#   DEPRECATED Name of module configuration file (used for the compatibility layer for disk_cache)
+#
 # @note
 #   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
 #
-# @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation on version 2.2.
-#
 # @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation on version 2.4.
 #
 class apache::mod::cache_disk (
-  $cache_root                                             = undef,
-  Array[String] $cache_enable                             = [],
-  Optional[String] $cache_ignore_headers                  = undef,
-  Optional[Integer] $cache_dir_length                     = undef,
-  Optional[Integer] $cache_dir_levels                     = undef,
-  Optional[Integer] $cache_default_expire                 = undef,
-  Optional[Integer] $cache_max_expire                     = undef,
-  Optional[Enum['Off', 'On']] $cache_ignore_no_lastmod    = undef,
-  Optional[Enum['off', 'on']] $cache_header               = undef,
-  Optional[Enum['off', 'on']] $cache_lock                 = undef,
-  Optional[Enum['Off', 'On']] $cache_ignore_cache_control = undef,
-  Optional[Integer] $cache_max_filesize                   = undef,
+  Optional[String] $cache_root              = undef,
+  Array[String] $cache_enable               = [],
+  Optional[Integer] $cache_dir_length       = undef,
+  Optional[Integer] $cache_dir_levels       = undef,
+  Optional[Integer] $cache_max_filesize     = undef,
+  Optional[String] $cache_ignore_headers    = undef,
+  Optional[String] $configuration_file_name = undef,
 ) {
   include apache
-  if $cache_root {
-    $_cache_root = $cache_root
+
+  if $cache_ignore_headers {
+    deprecation(
+      'apache::mod::cache_disk',
+      'The parameter cache_ignore_headers is deprecated. Please use apache::mod::cache::cache_ignore_headers instead.'
+    )
   }
-  elsif versioncmp($apache::apache_version, '2.4') >= 0 {
-    $_module_name = 'cache_disk'
-    $_cache_root = $::osfamily ? {
+
+  $_cache_root = $cache_root ? {
+    undef   => $facts['os']['family'] ? {
       'debian'  => '/var/cache/apache2/mod_cache_disk',
       'redhat'  => '/var/cache/httpd/proxy',
       'freebsd' => '/var/cache/mod_cache_disk',
-    }
+    },
+    default => $cache_root,
   }
-  else {
-    $_module_name = 'disk_cache'
-    $_cache_root = $::osfamily ? {
-      'debian'  => '/var/cache/apache2/mod_disk_cache',
-      'redhat'  => '/var/cache/mod_proxy',
-      'freebsd' => '/var/cache/mod_disk_cache',
-    }
+  $_configuration_file_name = $configuration_file_name ? {
+    undef   => 'cache_disk.conf',
+    default => $configuration_file_name
   }
-  $_configuration_file_name = "${_module_name}.conf"
-  $_class_name = "::apache::mod::${_module_name}"
+  $_class_name = 'apache::mod::cache_disk'
 
-  apache::mod { $_module_name: }
+  apache::mod { 'cache_disk': }
 
-  Class['::apache::mod::cache'] -> Class[$_class_name]
+  Class['apache::mod::cache'] -> Class[$_class_name]
 
-  # Template uses
-  # - $_cache_root
-  # - $cache_enable
-  # - $cache_dir_length
-  # - $cache_ignore_headers
-  # - $cache_dir_length
-  # - $cache_dir_levels
-  # - $cache_default_expire
-  # - $cache_max_expire
-  # - $cache_ignore_no_lastmod
-  # - $cache_header
-  # - $cache_lock
-  # - $cache_ignore_cache_control
-  # - $cache_max_filesize
   file { $_configuration_file_name:
     ensure  => file,
     path    => "${apache::mod_dir}/${_configuration_file_name}",
     mode    => $apache::file_mode,
-    content => template('apache/mod/cache_disk.conf.erb'),
+    content => epp('apache/mod/cache_disk.conf.epp', {
+        cache_root           => $_cache_root,
+        cache_enable         => $cache_enable,
+        cache_dir_length     => $cache_dir_length,
+        cache_dir_levels     => $cache_dir_levels,
+        cache_max_filesize   => $cache_max_filesize,
+        cache_ignore_headers => $cache_ignore_headers,
+    }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 4c229c0ff8..2aa8a9bcc5 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -10,6 +10,11 @@
 # @param cache_ignore_headers
 #   Specifies HTTP header(s) that should not be stored in the cache.
 #
+# @param default_cache_enable
+#   Default value is true, which enables "CacheEnable disk /" in disk_cache.conf for the webserver. This would cache
+#   every request to apache by default for every vhost. If set to false the default cache all behaviour is supressed.
+#   You can then control this behaviour in individual vhosts by explicitly defining CacheEnable.
+#
 # @note
 #   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
 #   This class is deprecated, use mode_cache_disk instead
@@ -21,11 +26,14 @@
   Optional[String] $cache_ignore_headers     = undef,
   Boolean $default_cache_enable              = true,
 ) {
-  deprecation('apache::mod::disk_cache','This module is deprecated; please use apache::mod::cache_disk')
+  deprecation('apache::mod::disk_cache', 'This module is deprecated; please use apache::mod::cache_disk')
 
   class { 'apache::mod::cache_disk':
-    cache_root                 => $cache_root,
-    cache_enable              => ['/'],
-    cache_ignore_headers       => $cache_ignore_headers,
+    cache_root              => $cache_root,
+    cache_enable            => ['/'],
+    cache_ignore_headers    => $cache_ignore_headers,
+    cache_dir_length        => 1,
+    cache_dir_levels        => 2,
+    configuration_file_name => 'cache_disk.conf'
   }
 }
diff --git a/spec/classes/mod/cache_disk_spec.rb b/spec/classes/mod/cache_disk_spec.rb
new file mode 100644
index 0000000000..6a18c61388
--- /dev/null
+++ b/spec/classes/mod/cache_disk_spec.rb
@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::cache_disk', type: :class do
+  context 'on a Debian OS' do
+    include_examples 'Debian 11'
+
+    let(:params) do
+      {
+        cache_enable: ['/'],
+      }
+    end
+
+    let :pre_condition do
+      'class{ "apache":
+        default_mods   => ["cache"],
+        mod_dir        => "/tmp/junk",
+       }'
+    end
+
+    it { is_expected.to compile }
+    it { is_expected.to contain_class('apache::mod::cache_disk') }
+    it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
+    it { is_expected.to contain_apache__mod('cache_disk') }
+
+    default_config = %r{CacheEnable disk /\nCacheRoot "/var/cache/apache2/mod_cache_disk"}
+
+    it {
+      expect(subject).to contain_file('cache_disk.conf')
+                           .with(content: default_config)
+    }
+
+    describe 'with multiple cache_enable parameters' do
+      let(:params) do
+        {
+          cache_enable: %w[/ /something],
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache_disk.conf')
+                             .with(content: %r{CacheEnable disk /\nCacheEnable disk /something\nCacheRoot "/var/cache/apache2/mod_cache_disk"})
+      }
+    end
+
+    describe 'with cache_dir_length' do
+      let(:params) do
+        {
+          cache_dir_length: 2,
+          cache_enable: ['/'],
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache_disk.conf')
+                             .with(content: %r{#{default_config}\nCacheDirLength 2})
+      }
+    end
+
+    describe 'with cache_dir_levels' do
+      let(:params) do
+        {
+          cache_dir_levels: 2,
+          cache_enable: ['/'],
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache_disk.conf')
+                             .with(content: %r{#{default_config}\nCacheDirLevels 2})
+      }
+    end
+  end
+
+  context 'on a RedHat 8-based OS' do
+    include_examples 'RedHat 8'
+
+    let(:params) do
+      {
+        cache_enable: ['/'],
+      }
+    end
+
+    let :pre_condition do
+      'class{ "apache":
+        default_mods   => ["cache"],
+        mod_dir        => "/tmp/junk",
+       }'
+    end
+
+    it { is_expected.to compile }
+
+    it {
+      expect(subject).to contain_file('cache_disk.conf')
+                           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"})
+    }
+  end
+
+  context 'on a FreeBSD OS' do
+    include_examples 'FreeBSD 10'
+
+    let(:params) do
+      {
+        cache_enable: ['/'],
+      }
+    end
+
+    let :pre_condition do
+      'class{ "apache":
+        default_mods   => ["cache"],
+        mod_dir        => "/tmp/junk",
+       }'
+    end
+
+    it { is_expected.to compile }
+
+    it {
+      expect(subject).to contain_file('cache_disk.conf')
+                           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"})
+    }
+  end
+end
diff --git a/spec/classes/mod/cache_spec.rb b/spec/classes/mod/cache_spec.rb
new file mode 100644
index 0000000000..ee064f9bc7
--- /dev/null
+++ b/spec/classes/mod/cache_spec.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'apache::mod::cache', type: :class do
+  context 'on a Debian OS' do
+    include_examples 'Debian 11'
+
+    it { is_expected.to compile }
+    it { is_expected.to contain_class('apache::mod::cache') }
+    it { is_expected.to contain_apache__mod('cache') }
+
+    it {
+      expect(subject).to contain_file('cache.conf')
+                           .with(content: '')
+    }
+
+    describe 'with cache_ignore_headers' do
+      let(:params) do
+        {
+          cache_ignore_headers: 'Set-Cookie',
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+                             .with(content: %r{CacheIgnoreHeaders Set-Cookie})
+      }
+    end
+
+    describe 'with cache_default_expire' do
+      let(:params) do
+        {
+          cache_default_expire: 2000,
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+                             .with(content: %r{CacheDefaultExpire 2000})
+      }
+    end
+
+    describe 'with cache_max_expire' do
+      let(:params) do
+        {
+          cache_max_expire: 2000,
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+                             .with(content: %r{CacheMaxExpire 2000})
+      }
+    end
+
+    describe 'with cache_ignore_no_lastmod' do
+      let(:params) do
+        {
+          cache_ignore_no_lastmod: 'On',
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+                             .with(content: %r{CacheIgnoreNoLastMod On})
+      }
+    end
+
+    describe 'with cache_header' do
+      let(:params) do
+        {
+          cache_header: 'On',
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+                             .with(content: %r{CacheHeader On})
+      }
+    end
+
+    describe 'with cache_lock' do
+      let(:params) do
+        {
+          cache_lock: 'On',
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+                             .with(content: %r{CacheLock On})
+      }
+    end
+
+    describe 'with cache_ignore_cache_control' do
+      let(:params) do
+        {
+          cache_ignore_cache_control: 'On',
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+                             .with(content: %r{CacheIgnoreCacheControl On})
+      }
+    end
+
+  end
+end
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index ce840bdcf6..b893cbd9b1 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -21,11 +21,11 @@
 
     it { is_expected.to compile }
     it { is_expected.to contain_class('apache::mod::disk_cache') }
-    it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+    it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
     it { is_expected.to contain_apache__mod('cache_disk') }
 
     it {
-      expect(subject).to contain_file('disk_cache.conf')
+      expect(subject).to contain_file('cache_disk.conf')
         .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
@@ -34,11 +34,11 @@
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        expect(subject).to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('cache_disk.conf')
           .with(content: %r{CacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -48,11 +48,11 @@
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        expect(subject).to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('cache_disk.conf')
           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/apache2/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -83,7 +83,7 @@
     it { is_expected.to contain_apache__mod('cache_disk') }
 
     it {
-      expect(subject).to contain_file('disk_cache.conf')
+      expect(subject).to contain_file('cache_disk.conf')
         .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
@@ -92,11 +92,11 @@
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        expect(subject).to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('cache_disk.conf')
           .with(content: %r{CacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -106,11 +106,11 @@
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        expect(subject).to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('cache_disk.conf')
           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -140,11 +140,11 @@
 
     it { is_expected.to compile }
     it { is_expected.to contain_class('apache::mod::disk_cache') }
-    it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+    it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
     it { is_expected.to contain_apache__mod('cache_disk') }
 
     it {
-      expect(subject).to contain_file('disk_cache.conf')
+      expect(subject).to contain_file('cache_disk.conf')
         .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\nCacheIgnoreHeaders Set-Cookie})
     }
 
@@ -153,11 +153,11 @@
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        expect(subject).to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('cache_disk.conf')
           .with(content: %r{CacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
@@ -167,11 +167,11 @@
 
       it { is_expected.to compile }
       it { is_expected.to contain_class('apache::mod::disk_cache') }
-      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
+      it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Cache_disk]') }
       it { is_expected.to contain_apache__mod('cache_disk') }
 
       it {
-        expect(subject).to contain_file('disk_cache.conf')
+        expect(subject).to contain_file('cache_disk.conf')
           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"\nCacheDirLevels 2\nCacheDirLength 1\n})
       }
     end
diff --git a/templates/mod/cache.conf.epp b/templates/mod/cache.conf.epp
new file mode 100644
index 0000000000..fba0300471
--- /dev/null
+++ b/templates/mod/cache.conf.epp
@@ -0,0 +1,30 @@
+<% |
+  Optional[String] $cache_ignore_headers                               = undef,
+  Optional[Integer] $cache_default_expire                              = undef,
+  Optional[Integer] $cache_max_expire                                  = undef,
+  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_no_lastmod    = undef,
+  Optional[Enum['off', 'on', 'Off', 'On']] $cache_header               = undef,
+  Optional[Enum['off', 'on', 'Off', 'On']] $cache_lock                 = undef,
+  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_cache_control = undef,
+| -%>
+<%- if $cache_default_expire { -%>
+CacheDefaultExpire <%= $cache_default_expire %>
+<%- } -%>
+<%- if $cache_max_expire { -%>
+CacheMaxExpire <%= $cache_max_expire %>
+<%- } -%>
+<%- if $cache_ignore_no_lastmod { -%>
+CacheIgnoreNoLastMod <%= $cache_ignore_no_lastmod %>
+<%- } -%>
+<%- if $cache_header { -%>
+CacheHeader <%= $cache_header %>
+<%- } -%>
+<%- if $cache_lock { -%>
+CacheLock <%= $cache_lock %>
+<%- } -%>
+<%- if $cache_ignore_cache_control { -%>
+CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
+<%- } -%>
+<%- if $cache_ignore_headers { -%>
+CacheIgnoreHeaders <%= $cache_ignore_headers -%>
+<%- } -%>
\ No newline at end of file
diff --git a/templates/mod/cache_disk.conf.epp b/templates/mod/cache_disk.conf.epp
new file mode 100644
index 0000000000..b2fb2b1cb1
--- /dev/null
+++ b/templates/mod/cache_disk.conf.epp
@@ -0,0 +1,26 @@
+<% |
+  Optional[String] $cache_root          = undef,
+  Array[String] $cache_enable           = [],
+  Optional[Integer] $cache_dir_length   = undef,
+  Optional[Integer] $cache_dir_levels   = undef,
+  Optional[Integer] $cache_max_filesize = undef,
+  Optional[String] $cache_ignore_headers = undef,
+| -%>
+<%- if $cache_enable { -%>
+  <%- $cache_enable.each |$enable| { -%>
+CacheEnable disk <%= $enable %>
+  <%- } -%>
+<%- } -%>
+CacheRoot "<%= $cache_root %>"
+<%- if $cache_dir_levels { -%>
+CacheDirLevels <%= $cache_dir_levels %>
+<%- } -%>
+<%- if $cache_dir_length { -%>
+CacheDirLength <%= $cache_dir_length %>
+<%- } -%>
+<%- if $cache_max_filesize { -%>
+CacheMaxFileSize <%= $cache_max_filesize %>
+<%- } -%>
+<%- if $cache_ignore_headers { -%>
+CacheIgnoreHeaders <%= $cache_ignore_headers -%>
+<%- } -%>
\ No newline at end of file
diff --git a/templates/mod/cache_disk.conf.erb b/templates/mod/cache_disk.conf.erb
deleted file mode 100644
index e98632fe10..0000000000
--- a/templates/mod/cache_disk.conf.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-CacheRoot "<%= @_cache_root %>"
-<%- if @cache_enable -%>
-  <%- @cache_enable.each do |enable| -%>
-CacheEnable disk <%= enable %>
-  <%- end -%>
-<%- end -%>
-<%- if @cache_dir_length -%>
-CacheDirLength <%= @cache_dir_length %>
-<%- end -%>
-<%- if @cache_dir_levels -%>
-CacheDirLevels <%= @cache_dir_levels %>
-<%- end -%>
-<%- if @cache_default_expire -%>
-CacheDefaultExpire <%= @cache_default_expire %>
-<%- end -%>
-<%- if @cache_max_expire -%>
-CacheMaxExpire <%= @cache_max_expire %>
-<%- end -%>
-<%- if @cache_ignore_no_lastmod -%>
-CacheIgnoreNoLastMod <%= @cache_ignore_no_lastmod %>
-<%- end -%>
-<%- if @cache_header -%>
-CacheHeader <%= @cache_header %>
-<%- end -%>
-<%- if @cache_lock -%>
-CacheLock <%= @cache_lock %>
-<%- end -%>
-<%- if @cache_ignore_cache_control -%>
-CacheIgnoreCacheControl <%= @cache_ignore_cache_control %>
-<%- end -%>
-<%- if @cache_max_filesize -%>
-CacheMaxFileSize <%= @cache_max_filesize %>
-<%- end -%>
-<%- if @cache_ignore_headers -%>
-CacheIgnoreHeaders <%= @cache_ignore_headers -%>
-<%- end -%>
diff --git a/templates/mod/disk_cache.conf.epp b/templates/mod/disk_cache.conf.epp
deleted file mode 100644
index 2cfc0e647a..0000000000
--- a/templates/mod/disk_cache.conf.epp
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if $default_cache_enable { -%>
-CacheEnable disk /
-<% } -%>
-CacheRoot "<%= $_cache_root %>"
-CacheDirLevels 2
-CacheDirLength 1
-<% if $cache_ignore_headers { -%>
-CacheIgnoreHeaders <%= $cache_ignore_headers -%>
-<% } -%>
\ No newline at end of file

From c39316f4fdc5648d9627ef68dce8cd7b62c37adf Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <github.dennis@dieploegers.de>
Date: Tue, 30 Jan 2024 07:17:39 +0100
Subject: [PATCH 2215/2267] Suggestions from Code Review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Romain Tartière <romain@blogreen.org>
---
 manifests/mod/cache.pp            | 16 ++++++++--------
 manifests/mod/cache_disk.pp       |  2 +-
 manifests/mod/disk_cache.pp       |  2 +-
 templates/mod/cache.conf.epp      | 16 ++++++++--------
 templates/mod/cache_disk.conf.epp |  2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/manifests/mod/cache.pp b/manifests/mod/cache.pp
index 3ed71a60dc..d31cebd3f0 100644
--- a/manifests/mod/cache.pp
+++ b/manifests/mod/cache.pp
@@ -25,16 +25,16 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_cache.html for additional documentation.
 #
 class apache::mod::cache (
-  Optional[String] $cache_ignore_headers                               = undef,
-  Optional[Integer] $cache_default_expire                              = undef,
-  Optional[Integer] $cache_max_expire                                  = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_no_lastmod    = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_header               = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_lock                 = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_cache_control = undef,
+  Array[String[1]] $cache_ignore_headers              = [],
+  Optional[Integer] $cache_default_expire             = undef,
+  Optional[Integer] $cache_max_expire                 = undef,
+  Optional[Apache::OnOff] $cache_ignore_no_lastmod    = undef,
+  Optional[Apache::OnOff] $cache_header               = undef,
+  Optional[Apache::OnOff] $cache_lock                 = undef,
+  Optional[Apache::OnOff] $cache_ignore_cache_control = undef,
 ) {
   include apache
-  ::apache::mod { 'cache': }
+  apache::mod { 'cache': }
 
   $_configuration_file_name = 'cache.conf'
 
diff --git a/manifests/mod/cache_disk.pp b/manifests/mod/cache_disk.pp
index 97631d4a5a..c419e8abae 100644
--- a/manifests/mod/cache_disk.pp
+++ b/manifests/mod/cache_disk.pp
@@ -37,7 +37,7 @@
 # @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation on version 2.4.
 #
 class apache::mod::cache_disk (
-  Optional[String] $cache_root              = undef,
+  Optional[Stdlib::Absolutepath] $cache_root              = undef,
   Array[String] $cache_enable               = [],
   Optional[Integer] $cache_dir_length       = undef,
   Optional[Integer] $cache_dir_levels       = undef,
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 2aa8a9bcc5..fe0fc8b406 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -26,7 +26,7 @@
   Optional[String] $cache_ignore_headers     = undef,
   Boolean $default_cache_enable              = true,
 ) {
-  deprecation('apache::mod::disk_cache', 'This module is deprecated; please use apache::mod::cache_disk')
+  deprecation('apache::mod::disk_cache', 'This class is deprecated; please use apache::mod::cache_disk')
 
   class { 'apache::mod::cache_disk':
     cache_root              => $cache_root,
diff --git a/templates/mod/cache.conf.epp b/templates/mod/cache.conf.epp
index fba0300471..136f277e40 100644
--- a/templates/mod/cache.conf.epp
+++ b/templates/mod/cache.conf.epp
@@ -1,11 +1,11 @@
 <% |
-  Optional[String] $cache_ignore_headers                               = undef,
-  Optional[Integer] $cache_default_expire                              = undef,
-  Optional[Integer] $cache_max_expire                                  = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_no_lastmod    = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_header               = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_lock                 = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_cache_control = undef,
+  Optional[String] $cache_ignore_headers              = undef,
+  Optional[Integer] $cache_default_expire             = undef,
+  Optional[Integer] $cache_max_expire                 = undef,
+  Optional[Apache::OnOff] $cache_ignore_no_lastmod    = undef,
+  Optional[Apache::OnOff] $cache_header               = undef,
+  Optional[Apache::OnOff] $cache_lock                 = undef,
+  Optional[Apache::OnOff] $cache_ignore_cache_control = undef,
 | -%>
 <%- if $cache_default_expire { -%>
 CacheDefaultExpire <%= $cache_default_expire %>
@@ -27,4 +27,4 @@ CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
 <%- } -%>
 <%- if $cache_ignore_headers { -%>
 CacheIgnoreHeaders <%= $cache_ignore_headers -%>
-<%- } -%>
\ No newline at end of file
+<%- } -%>
diff --git a/templates/mod/cache_disk.conf.epp b/templates/mod/cache_disk.conf.epp
index b2fb2b1cb1..030f0ba937 100644
--- a/templates/mod/cache_disk.conf.epp
+++ b/templates/mod/cache_disk.conf.epp
@@ -23,4 +23,4 @@ CacheMaxFileSize <%= $cache_max_filesize %>
 <%- } -%>
 <%- if $cache_ignore_headers { -%>
 CacheIgnoreHeaders <%= $cache_ignore_headers -%>
-<%- } -%>
\ No newline at end of file
+<%- } -%>

From f86abf28f4207814e356ddfb71ed5c3bff9a59ba Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <github.dennis@dieploegers.de>
Date: Tue, 30 Jan 2024 07:43:35 +0100
Subject: [PATCH 2216/2267] Update manifests/mod/disk_cache.pp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Romain Tartière <romain@blogreen.org>
---
 manifests/mod/disk_cache.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index fe0fc8b406..57ee028e14 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -31,7 +31,7 @@
   class { 'apache::mod::cache_disk':
     cache_root              => $cache_root,
     cache_enable            => ['/'],
-    cache_ignore_headers    => $cache_ignore_headers,
+    cache_ignore_headers    => $cache_ignore_headers.split(' '),
     cache_dir_length        => 1,
     cache_dir_levels        => 2,
     configuration_file_name => 'cache_disk.conf'

From aeef7fb59bd0244d76006928bf358ea9e0f19e36 Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <github.dennis@dieploegers.de>
Date: Tue, 30 Jan 2024 07:57:04 +0100
Subject: [PATCH 2217/2267] Update spec/classes/mod/cache_disk_spec.rb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Romain Tartière <romain@blogreen.org>
---
 spec/classes/mod/cache_disk_spec.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spec/classes/mod/cache_disk_spec.rb b/spec/classes/mod/cache_disk_spec.rb
index 6a18c61388..a85054063d 100644
--- a/spec/classes/mod/cache_disk_spec.rb
+++ b/spec/classes/mod/cache_disk_spec.rb
@@ -26,10 +26,7 @@
 
     default_config = %r{CacheEnable disk /\nCacheRoot "/var/cache/apache2/mod_cache_disk"}
 
-    it {
-      expect(subject).to contain_file('cache_disk.conf')
-                           .with(content: default_config)
-    }
+    it { is_expected.to contain_file('cache_disk.conf').with(content: default_config) }
 
     describe 'with multiple cache_enable parameters' do
       let(:params) do

From 9fdf75446e69d2ff605add2d98797d3e34e22cbf Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <dennis.ploeger@kps.com>
Date: Tue, 30 Jan 2024 09:04:19 +0100
Subject: [PATCH 2218/2267] Rubocop fixes

---
 spec/classes/mod/cache_disk_spec.rb | 12 ++++++------
 spec/classes/mod/cache_spec.rb      | 17 ++++++++---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/spec/classes/mod/cache_disk_spec.rb b/spec/classes/mod/cache_disk_spec.rb
index a85054063d..fdd55fa8d9 100644
--- a/spec/classes/mod/cache_disk_spec.rb
+++ b/spec/classes/mod/cache_disk_spec.rb
@@ -31,13 +31,13 @@
     describe 'with multiple cache_enable parameters' do
       let(:params) do
         {
-          cache_enable: %w[/ /something],
+          cache_enable: ['/', '/something'],
         }
       end
 
       it {
         expect(subject).to contain_file('cache_disk.conf')
-                             .with(content: %r{CacheEnable disk /\nCacheEnable disk /something\nCacheRoot "/var/cache/apache2/mod_cache_disk"})
+          .with(content: %r{CacheEnable disk /\nCacheEnable disk /something\nCacheRoot "/var/cache/apache2/mod_cache_disk"})
       }
     end
 
@@ -51,7 +51,7 @@
 
       it {
         expect(subject).to contain_file('cache_disk.conf')
-                             .with(content: %r{#{default_config}\nCacheDirLength 2})
+          .with(content: %r{#{default_config}\nCacheDirLength 2})
       }
     end
 
@@ -65,7 +65,7 @@
 
       it {
         expect(subject).to contain_file('cache_disk.conf')
-                             .with(content: %r{#{default_config}\nCacheDirLevels 2})
+          .with(content: %r{#{default_config}\nCacheDirLevels 2})
       }
     end
   end
@@ -90,7 +90,7 @@
 
     it {
       expect(subject).to contain_file('cache_disk.conf')
-                           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"})
+        .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"})
     }
   end
 
@@ -114,7 +114,7 @@
 
     it {
       expect(subject).to contain_file('cache_disk.conf')
-                           .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"})
+        .with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"})
     }
   end
 end
diff --git a/spec/classes/mod/cache_spec.rb b/spec/classes/mod/cache_spec.rb
index ee064f9bc7..8acb57b0db 100644
--- a/spec/classes/mod/cache_spec.rb
+++ b/spec/classes/mod/cache_spec.rb
@@ -12,7 +12,7 @@
 
     it {
       expect(subject).to contain_file('cache.conf')
-                           .with(content: '')
+        .with(content: '')
     }
 
     describe 'with cache_ignore_headers' do
@@ -24,7 +24,7 @@
 
       it {
         expect(subject).to contain_file('cache.conf')
-                             .with(content: %r{CacheIgnoreHeaders Set-Cookie})
+          .with(content: %r{CacheIgnoreHeaders Set-Cookie})
       }
     end
 
@@ -37,7 +37,7 @@
 
       it {
         expect(subject).to contain_file('cache.conf')
-                             .with(content: %r{CacheDefaultExpire 2000})
+          .with(content: %r{CacheDefaultExpire 2000})
       }
     end
 
@@ -50,7 +50,7 @@
 
       it {
         expect(subject).to contain_file('cache.conf')
-                             .with(content: %r{CacheMaxExpire 2000})
+          .with(content: %r{CacheMaxExpire 2000})
       }
     end
 
@@ -63,7 +63,7 @@
 
       it {
         expect(subject).to contain_file('cache.conf')
-                             .with(content: %r{CacheIgnoreNoLastMod On})
+          .with(content: %r{CacheIgnoreNoLastMod On})
       }
     end
 
@@ -76,7 +76,7 @@
 
       it {
         expect(subject).to contain_file('cache.conf')
-                             .with(content: %r{CacheHeader On})
+          .with(content: %r{CacheHeader On})
       }
     end
 
@@ -89,7 +89,7 @@
 
       it {
         expect(subject).to contain_file('cache.conf')
-                             .with(content: %r{CacheLock On})
+          .with(content: %r{CacheLock On})
       }
     end
 
@@ -102,9 +102,8 @@
 
       it {
         expect(subject).to contain_file('cache.conf')
-                             .with(content: %r{CacheIgnoreCacheControl On})
+          .with(content: %r{CacheIgnoreCacheControl On})
       }
     end
-
   end
 end

From a7e55d3782b7c0e27b7ff0740e38c49ee72fd21f Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <github.dennis@dieploegers.de>
Date: Tue, 30 Jan 2024 11:07:25 +0100
Subject: [PATCH 2219/2267] Update manifests/mod/cache_disk.pp

Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
---
 manifests/mod/cache_disk.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/cache_disk.pp b/manifests/mod/cache_disk.pp
index c419e8abae..56c4041f10 100644
--- a/manifests/mod/cache_disk.pp
+++ b/manifests/mod/cache_disk.pp
@@ -34,7 +34,7 @@
 # @note
 #   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
 #
-# @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation on version 2.4.
+# @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html
 #
 class apache::mod::cache_disk (
   Optional[Stdlib::Absolutepath] $cache_root              = undef,

From 9e6e34e58911e20df4d8f86cf0dedd2329cedace Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <dennis.ploeger@kps.com>
Date: Tue, 30 Jan 2024 11:08:22 +0100
Subject: [PATCH 2220/2267] Removed references to Apache 2.2

---
 manifests/mod/cache_disk.pp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/manifests/mod/cache_disk.pp b/manifests/mod/cache_disk.pp
index 56c4041f10..4ad00a1b38 100644
--- a/manifests/mod/cache_disk.pp
+++ b/manifests/mod/cache_disk.pp
@@ -11,11 +11,11 @@
 #   Default depends on the Apache version and operating system:
 #   - Debian: /var/cache/apache2/mod_cache_disk
 #   - FreeBSD: /var/cache/mod_cache_disk
-#   - Red Hat, Apache 2.4: /var/cache/httpd/proxy
+#   - Red Hat: /var/cache/httpd/proxy
 #
 # @param cache_enable
 #   Defines an array of directories to cache, the default is none
-
+#
 # @param cache_dir_length
 #   The number of characters in subdirectory names
 #
@@ -31,9 +31,6 @@
 # @param configuration_file_name
 #   DEPRECATED Name of module configuration file (used for the compatibility layer for disk_cache)
 #
-# @note
-#   Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
-#
 # @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html
 #
 class apache::mod::cache_disk (

From ce2a3a911622ef3a0d2b2d8c074fe170a2dc5cbb Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <github.dennis@dieploegers.de>
Date: Wed, 31 Jan 2024 08:51:46 +0100
Subject: [PATCH 2221/2267] Update manifests/mod/cache_disk.pp

Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
---
 manifests/mod/cache_disk.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/mod/cache_disk.pp b/manifests/mod/cache_disk.pp
index 4ad00a1b38..c8752fc4f3 100644
--- a/manifests/mod/cache_disk.pp
+++ b/manifests/mod/cache_disk.pp
@@ -59,10 +59,7 @@
     },
     default => $cache_root,
   }
-  $_configuration_file_name = $configuration_file_name ? {
-    undef   => 'cache_disk.conf',
-    default => $configuration_file_name
-  }
+  $_configuration_file_name = pick($configuration_file_name, 'cache_disk.conf')
   $_class_name = 'apache::mod::cache_disk'
 
   apache::mod { 'cache_disk': }

From a84601cd32678c3d07dfc071e1e4f0ee812813bb Mon Sep 17 00:00:00 2001
From: Thomas Minor <Thomas.Minor@kps.com>
Date: Wed, 31 Jan 2024 15:52:29 +0100
Subject: [PATCH 2222/2267] fix: fix apache cache_ignore_header regression

---
 templates/mod/cache.conf.epp      | 4 ++--
 templates/mod/cache_disk.conf.epp | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/templates/mod/cache.conf.epp b/templates/mod/cache.conf.epp
index 136f277e40..54fa76441f 100644
--- a/templates/mod/cache.conf.epp
+++ b/templates/mod/cache.conf.epp
@@ -1,5 +1,5 @@
 <% |
-  Optional[String] $cache_ignore_headers              = undef,
+  Optional[Array[String[1]]] $cache_ignore_headers    = undef,
   Optional[Integer] $cache_default_expire             = undef,
   Optional[Integer] $cache_max_expire                 = undef,
   Optional[Apache::OnOff] $cache_ignore_no_lastmod    = undef,
@@ -26,5 +26,5 @@ CacheLock <%= $cache_lock %>
 CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
 <%- } -%>
 <%- if $cache_ignore_headers { -%>
-CacheIgnoreHeaders <%= $cache_ignore_headers -%>
+CacheIgnoreHeaders <% $cache_ignore_headers.each |$header| { %><%= $header %> <% } %>
 <%- } -%>
diff --git a/templates/mod/cache_disk.conf.epp b/templates/mod/cache_disk.conf.epp
index 030f0ba937..55d3351d15 100644
--- a/templates/mod/cache_disk.conf.epp
+++ b/templates/mod/cache_disk.conf.epp
@@ -4,7 +4,6 @@
   Optional[Integer] $cache_dir_length   = undef,
   Optional[Integer] $cache_dir_levels   = undef,
   Optional[Integer] $cache_max_filesize = undef,
-  Optional[String] $cache_ignore_headers = undef,
 | -%>
 <%- if $cache_enable { -%>
   <%- $cache_enable.each |$enable| { -%>
@@ -21,6 +20,3 @@ CacheDirLength <%= $cache_dir_length %>
 <%- if $cache_max_filesize { -%>
 CacheMaxFileSize <%= $cache_max_filesize %>
 <%- } -%>
-<%- if $cache_ignore_headers { -%>
-CacheIgnoreHeaders <%= $cache_ignore_headers -%>
-<%- } -%>

From 6c29fbfa222df6c266058a4efa8398f66b5b58a0 Mon Sep 17 00:00:00 2001
From: Thomas Minor <Thomas.Minor@kps.com>
Date: Wed, 31 Jan 2024 22:56:58 +0100
Subject: [PATCH 2223/2267] refactor: change config line generation to simpler
 and more readable solution

---
 templates/mod/cache.conf.epp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/cache.conf.epp b/templates/mod/cache.conf.epp
index 54fa76441f..7eafbd6a15 100644
--- a/templates/mod/cache.conf.epp
+++ b/templates/mod/cache.conf.epp
@@ -26,5 +26,5 @@ CacheLock <%= $cache_lock %>
 CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
 <%- } -%>
 <%- if $cache_ignore_headers { -%>
-CacheIgnoreHeaders <% $cache_ignore_headers.each |$header| { %><%= $header %> <% } %>
+CacheIgnoreHeaders <%= $cache_ignore_headers.join(' ') %>
 <%- } -%>

From 873dc6beb85244ab4506cb008c92f68bee3fba5e Mon Sep 17 00:00:00 2001
From: Thomas Minor <Thomas.Minor@kps.com>
Date: Thu, 1 Feb 2024 12:16:01 +0100
Subject: [PATCH 2224/2267] fix: handle undefined value of
 $cache_ignore_headers in deprecated module and remove module from bsd
 defaults

---
 manifests/default_mods.pp   | 2 --
 manifests/mod/disk_cache.pp | 9 +++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index b03b2660b5..474b53748b 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -69,8 +69,6 @@
       'FreeBSD': {
         include apache::mod::actions
         include apache::mod::authn_core
-        include apache::mod::cache
-        include apache::mod::disk_cache
         include apache::mod::filter
         include apache::mod::headers
         include apache::mod::info
diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 57ee028e14..5e46107a7d 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -1,6 +1,6 @@
 # @summary
 #   Installs and configures `mod_disk_cache`.
-# 
+#
 # @param cache_root
 #   Defines the name of the directory on the disk to contain cache files.
 #   Default depends on the Apache version and operating system:
@@ -28,10 +28,15 @@
 ) {
   deprecation('apache::mod::disk_cache', 'This class is deprecated; please use apache::mod::cache_disk')
 
+  $_cache_ignore_headers = $cache_ignore_headers ? {
+    undef   => [],
+    default => $cache_ignore_headers.split(' ')
+  }
+
   class { 'apache::mod::cache_disk':
     cache_root              => $cache_root,
     cache_enable            => ['/'],
-    cache_ignore_headers    => $cache_ignore_headers.split(' '),
+    cache_ignore_headers    => $_cache_ignore_headers,
     cache_dir_length        => 1,
     cache_dir_levels        => 2,
     configuration_file_name => 'cache_disk.conf'

From 8b998bb676cc444f19615dc76cdf1168b2f96842 Mon Sep 17 00:00:00 2001
From: Thomas Minor <Thomas.Minor@kps.com>
Date: Tue, 6 Feb 2024 12:05:12 +0100
Subject: [PATCH 2225/2267] fix: fix problems with deprecated modules and add
 additional test for multiple values

---
 manifests/mod/disk_cache.pp         |  7 +------
 spec/classes/mod/cache_spec.rb      | 15 ++++++++++++++-
 spec/classes/mod/disk_cache_spec.rb |  2 +-
 templates/mod/cache.conf.epp        |  4 ++--
 templates/mod/cache_disk.conf.epp   | 14 +++++++++-----
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
index 5e46107a7d..92e56e23f3 100644
--- a/manifests/mod/disk_cache.pp
+++ b/manifests/mod/disk_cache.pp
@@ -28,15 +28,10 @@
 ) {
   deprecation('apache::mod::disk_cache', 'This class is deprecated; please use apache::mod::cache_disk')
 
-  $_cache_ignore_headers = $cache_ignore_headers ? {
-    undef   => [],
-    default => $cache_ignore_headers.split(' ')
-  }
-
   class { 'apache::mod::cache_disk':
     cache_root              => $cache_root,
     cache_enable            => ['/'],
-    cache_ignore_headers    => $_cache_ignore_headers,
+    cache_ignore_headers    => $cache_ignore_headers,
     cache_dir_length        => 1,
     cache_dir_levels        => 2,
     configuration_file_name => 'cache_disk.conf'
diff --git a/spec/classes/mod/cache_spec.rb b/spec/classes/mod/cache_spec.rb
index 8acb57b0db..3e98a3e679 100644
--- a/spec/classes/mod/cache_spec.rb
+++ b/spec/classes/mod/cache_spec.rb
@@ -18,7 +18,7 @@
     describe 'with cache_ignore_headers' do
       let(:params) do
         {
-          cache_ignore_headers: 'Set-Cookie',
+          cache_ignore_headers: ['Set-Cookie'],
         }
       end
 
@@ -28,6 +28,19 @@
       }
     end
 
+    describe 'with cache_ignore_headers' do
+      let(:params) do
+        {
+          cache_ignore_headers: ['Set-Cookie', 'X-Forwarded-For', 'Cross-Origin-Embedder-Policy', 'Expires', 'Access-Control-Allow-Headers'],
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+          .with(content: %r{CacheIgnoreHeaders Access-Control-Allow-Headers Cross-Origin-Embedder-Policy Expires Set-Cookie X-Forwarded-For})
+      }
+    end
+
     describe 'with cache_default_expire' do
       let(:params) do
         {
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
index b893cbd9b1..9438d0886d 100644
--- a/spec/classes/mod/disk_cache_spec.rb
+++ b/spec/classes/mod/disk_cache_spec.rb
@@ -14,7 +14,7 @@
 
     let :pre_condition do
       'class{ "apache":
-        default_mods   => ["cache"],
+        default_mods   => ["cache", "disk_cache"],
         mod_dir        => "/tmp/junk",
        }'
     end
diff --git a/templates/mod/cache.conf.epp b/templates/mod/cache.conf.epp
index 7eafbd6a15..354f3b52b8 100644
--- a/templates/mod/cache.conf.epp
+++ b/templates/mod/cache.conf.epp
@@ -25,6 +25,6 @@ CacheLock <%= $cache_lock %>
 <%- if $cache_ignore_cache_control { -%>
 CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
 <%- } -%>
-<%- if $cache_ignore_headers { -%>
-CacheIgnoreHeaders <%= $cache_ignore_headers.join(' ') %>
+<%- if ! empty($cache_ignore_headers) { -%>
+CacheIgnoreHeaders <%= $cache_ignore_headers.sort.join(' ') %>
 <%- } -%>
diff --git a/templates/mod/cache_disk.conf.epp b/templates/mod/cache_disk.conf.epp
index 55d3351d15..6ae5a7b130 100644
--- a/templates/mod/cache_disk.conf.epp
+++ b/templates/mod/cache_disk.conf.epp
@@ -1,9 +1,10 @@
 <% |
-  Optional[String] $cache_root          = undef,
-  Array[String] $cache_enable           = [],
-  Optional[Integer] $cache_dir_length   = undef,
-  Optional[Integer] $cache_dir_levels   = undef,
-  Optional[Integer] $cache_max_filesize = undef,
+  Optional[String] $cache_root            = undef,
+  Array[String] $cache_enable             = [],
+  Optional[Integer] $cache_dir_length     = undef,
+  Optional[Integer] $cache_dir_levels     = undef,
+  Optional[Integer] $cache_max_filesize   = undef,
+  Optional[String] $cache_ignore_headers  = undef,
 | -%>
 <%- if $cache_enable { -%>
   <%- $cache_enable.each |$enable| { -%>
@@ -20,3 +21,6 @@ CacheDirLength <%= $cache_dir_length %>
 <%- if $cache_max_filesize { -%>
 CacheMaxFileSize <%= $cache_max_filesize %>
 <%- } -%>
+<%- if $cache_ignore_headers { -%>
+CacheIgnoreHeaders <%= $cache_ignore_headers -%>
+<%- } -%>

From f9ee7f4568f31a3026d0bcc6fec4606c0b94810b Mon Sep 17 00:00:00 2001
From: Malik Parvez <84777619+malikparvez@users.noreply.github.com>
Date: Tue, 2 Apr 2024 21:09:37 +0530
Subject: [PATCH 2226/2267] Fix mend to run on cron

---
 .github/workflows/mend.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/mend.yml b/.github/workflows/mend.yml
index b4100a5af0..8b5b401847 100644
--- a/.github/workflows/mend.yml
+++ b/.github/workflows/mend.yml
@@ -1,9 +1,10 @@
 name: "mend"
 
 on:
-  pull_request:
-    branches:
-      - "main"
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
   schedule:
     - cron: "0 0 * * *"
   workflow_dispatch:

From e6a720da8bb3cacd7f61a39aa73d923b3ac3b5e3 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Wed, 3 Apr 2024 07:48:48 +0000
Subject: [PATCH 2227/2267] Release prep v12.1.0

---
 CHANGELOG.md  | 14 +++++++++++++-
 REFERENCE.md  | 11 ++++++++++-
 metadata.json |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3950a39c6e..e761dd2c97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v12.0.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.3) - 2024-03-01
+## [v12.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.1.0) - 2024-04-03
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.3...v12.1.0)
+
+### Added
+
+- vhost: Allow customizing show_diff [#2536](https://github.com/puppetlabs/puppetlabs-apache/pull/2536) ([kajinamit](https://github.com/kajinamit))
+
+### Fixed
+
+- Stop managing mime support package on Debian [#2526](https://github.com/puppetlabs/puppetlabs-apache/pull/2526) ([jcharaoui](https://github.com/jcharaoui))
+
+## [v12.0.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.3) - 2024-03-02
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.2...v12.0.3)
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 5536426b82..b637f3722a 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -3887,7 +3887,7 @@ The following parameters are available in the `apache::mod::mime` class:
 
 ##### <a name="-apache--mod--mime--mime_support_package"></a>`mime_support_package`
 
-Data type: `String`
+Data type: `Optional[String]`
 
 Name of the MIME package to be installed.
 
@@ -7544,6 +7544,7 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`error_log_format`](#-apache--vhost--error_log_format)
 * [`error_documents`](#-apache--vhost--error_documents)
 * [`ensure`](#-apache--vhost--ensure)
+* [`show_diff`](#-apache--vhost--show_diff)
 * [`fallbackresource`](#-apache--vhost--fallbackresource)
 * [`filters`](#-apache--vhost--filters)
 * [`h2_copy_files`](#-apache--vhost--h2_copy_files)
@@ -8158,6 +8159,14 @@ Specifies if the virtual host is present or absent.<br />
 
 Default value: `'present'`
 
+##### <a name="-apache--vhost--show_diff"></a>`show_diff`
+
+Data type: `Boolean`
+
+Specifies whether to set the show_diff parameter for the file resource.
+
+Default value: `true`
+
 ##### <a name="-apache--vhost--fallbackresource"></a>`fallbackresource`
 
 Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`
diff --git a/metadata.json b/metadata.json
index 5592f58ade..a74ad44249 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "12.0.3",
+  "version": "12.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 82bd1bbe4581c849866651e8ef61d38db028dcac Mon Sep 17 00:00:00 2001
From: Max Gerlings <124243961+gerlingsm@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:24:48 +0200
Subject: [PATCH 2228/2267] Add missing brackets for function call

fix error "expects a Hash value, got Tuple"
thanks to @hufschmidt
---
 templates/vhost/_directories.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index ba072523fc..7beec6dfaa 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -548,7 +548,7 @@
     <%= directory['custom_fragment'] %>
     <%- end -%>
     <%- if directory['authz_core'] -%>
-      <%= scope.call_function('epp',["apache/vhost/_authz_core.epp", 'authz_core_config' => scope.call_function('apache::authz_core_config', directory['authz_core'])]) -%>
+      <%= scope.call_function('epp',["apache/vhost/_authz_core.epp", 'authz_core_config' => scope.call_function('apache::authz_core_config', [ directory['authz_core'] ]) ]) -%>
     <%- end -%>
     <%- if directory['gssapi'] -%>
       <%= scope.call_function('epp',["apache/vhost/_gssapi.epp", directory['gssapi']]) -%>

From 1da07de06fc08e727ab00919bee04bb62bb63a53 Mon Sep 17 00:00:00 2001
From: Max Gerlings <124243961+gerlingsm@users.noreply.github.com>
Date: Fri, 5 Apr 2024 14:13:58 +0200
Subject: [PATCH 2229/2267] Add authz unit spec test

---
 spec/defines/vhost_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f86569262d..988858d0b5 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -316,6 +316,24 @@
                   'mellon_cond' => ['isMemberOf "cn=example-access,ou=Groups,o=example,o=com" [MAP]'],
                   'mellon_session_length' => '300'
                 },
+                {
+                  'path' => '/secure',
+                  'provider' => 'location',
+                  'auth_type' => 'Basic',
+                  'authz_core' => {
+                    'require_all' => {
+                      'require_any' => {
+                        'require' => ['user superadmin'],
+                        'require_all' => {
+                          'require' => ['group admins', 'ldap-group "cn=Administrators,o=Airius"'],
+                        },
+                      },
+                      'require_none' => {
+                        'require' => ['group temps', 'ldap-group "cn=Temporary Employees,o=Airius"']
+                      }
+                    }
+                  }
+                }
               ],
               'error_log' => false,
               'error_log_file' => 'httpd_error_log',
@@ -630,6 +648,7 @@
               .with_content(%r{^\s+Require valid-user$})
               .with_content(%r{^\s+Require all denied$})
               .with_content(%r{^\s+Require all granted$})
+              .with_content(%r{^\s+Require user superadmin$})
               .with_content(%r{^\s+<RequireAll>$})
               .with_content(%r{^\s+</RequireAll>$})
               .with_content(%r{^\s+Require all-valid1$})

From 1612fd83a2a1a39380766d9765fc71f4fdadb036 Mon Sep 17 00:00:00 2001
From: Max Gerlings <124243961+gerlingsm@users.noreply.github.com>
Date: Fri, 5 Apr 2024 14:17:21 +0200
Subject: [PATCH 2230/2267] Add authz unit acceptance test

---
 spec/acceptance/vhost_spec.rb | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index ae126471a5..0152d5b7f5 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -452,6 +452,25 @@ class { 'apache': }
               auth_require => 'valid-user',
               satisfy => 'Any',
             },
+            {
+              path => '/var/www/files/authz',
+              auth_type => 'Basic',
+              auth_name => 'Basic Auth',
+              authz_core => {
+                require_all => {
+                  require_any => {
+                    require => [
+                      '127.0.0.1'
+                      '10.10.10.10'
+                    ],
+                    require_all => {
+                      auth_user_file => ['/var/www/htpasswd'],
+                      require => ['valid-user'],
+                    },
+                  },
+                }
+              }
+            },
           ],
         }
         file { '/var/www/files/foo':
@@ -463,6 +482,9 @@ class { 'apache': }
         file { '/var/www/files/baz':
           ensure => directory,
         }
+        file { '/var/www/files/authz':
+          ensure => directory,
+        }
         file { '/var/www/files/foo/index.html':
           ensure  => file,
           content => "Hello World\\n",
@@ -475,6 +497,10 @@ class { 'apache': }
           ensure  => file,
           content => "Hello World\\n",
         }
+        file { '/var/www/files/authz/index.html':
+          ensure  => file,
+          content => "Hello World\\n",
+        }
         file { '/var/www/htpasswd':
           ensure  => file,
           content => "login:IZ7jMcLSx0oQk", # "password" as password
@@ -499,6 +525,10 @@ class { 'apache': }
           expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 401})
           expect(result.exit_code).to eq 22
           expect(run_shell('/usr/bin/curl -sSf -u login:password files.example.net:80/baz/index.html').stdout).to eq("Hello World\n")
+          result = run_shell('/usr/bin/curl -sSf files.example.net:80/authz/index.html', expect_failures: true)
+          expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 401})
+          expect(result.exit_code).to eq 22
+          expect(run_shell('/usr/bin/curl -sSf -u login:password files.example.net:80/authz/index.html').stdout).to eq("Hello World\n")
         end
       end
     end

From ac1fe88c93706974519276f0e782a9820997fa6d Mon Sep 17 00:00:00 2001
From: Max Gerlings <124243961+gerlingsm@users.noreply.github.com>
Date: Fri, 5 Apr 2024 14:31:35 +0200
Subject: [PATCH 2231/2267] Styling fix: Put a comma after the last item of a
 multiline array

---
 spec/defines/vhost_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index 988858d0b5..1875417114 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -333,7 +333,7 @@
                       }
                     }
                   }
-                }
+                },
               ],
               'error_log' => false,
               'error_log_file' => 'httpd_error_log',

From b4c72fcb88a5a499e21c2e7feb971fbccda95b9f Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Fri, 5 Apr 2024 15:12:05 +0200
Subject: [PATCH 2232/2267] add XForwardedHeaders for oidc_settings

---
 types/oidcsettings.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index e09a0626b7..d3246ccdcd 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -108,5 +108,6 @@
     Optional['BlackListedClaims']                       => String,
     Optional['WhiteListedClaims']                       => String,
     Optional['RefreshAccessTokenBeforeExpiry']          => Pattern[/^[0-9]+(\slogout_on_error)?$/],
+    Optional['XForwardedHeaders']                       => String,
   }
 ]

From 429dd0528b1d1387fde80c01f7d4dfa7d548b0b6 Mon Sep 17 00:00:00 2001
From: Julien Godin <julien.godin@camptocamp.com>
Date: Wed, 31 Jan 2024 17:39:59 +0100
Subject: [PATCH 2233/2267] feature: Allow to set the verbosity of the debug

Signed-off-by: Julien Godin <julien.godin@camptocamp.com>
---
 manifests/mod/security.pp         | 5 +++++
 spec/classes/mod/security_spec.rb | 2 ++
 templates/mod/security.conf.epp   | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index a64be57f8a..b64e8a3859 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -23,6 +23,9 @@
 # @param modsec_secruleengine
 #   Configures the rules engine.
 # 
+# @param debug_log_level
+#   Configures the debug log level.
+#
 # @param audit_log_relevant_status
 #   Configures which response status code is to be considered relevant for the purpose of audit logging.
 # 
@@ -140,6 +143,7 @@
   Optional[Array[String]] $custom_rules_set                    = $apache::params::modsec_custom_rules_set,
   Stdlib::Absolutepath $modsec_dir                             = $apache::params::modsec_dir,
   String $modsec_secruleengine                                 = $apache::params::modsec_secruleengine,
+  Integer[0, 9] $debug_log_level                              = 0,
   String $audit_log_relevant_status                            = '^(?:5|4(?!04))',
   String $audit_log_parts                                      = $apache::params::modsec_audit_log_parts,
   String $audit_log_type                                       = $apache::params::modsec_audit_log_type,
@@ -257,6 +261,7 @@
     'audit_log_parts'             => $audit_log_parts,
     'audit_log_type'              => $audit_log_type,
     'audit_log_storage_dir'       => $audit_log_storage_dir,
+    'debug_log_level'             => $debug_log_level,
     'logroot'                     => $logroot,
   }
 
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index ec41852199..0b58567ab4 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -103,6 +103,7 @@
                 audit_log_parts: 'ABCDZ',
                 audit_log_type: 'Concurrent',
                 audit_log_storage_dir: '/var/log/httpd/audit',
+                debug_log_level: 3,
                 secdefaultaction: 'deny,status:406,nolog,auditlog',
                 secrequestbodyaccess: 'Off',
                 secresponsebodyaccess: 'On',
@@ -116,6 +117,7 @@
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogType Concurrent$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyAccess Off$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecDebugLogLevel 3$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyAccess On$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyLimitAction ProcessPartial$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyLimitAction Reject$} }
diff --git a/templates/mod/security.conf.epp b/templates/mod/security.conf.epp
index dbca254b30..e2dc2241f9 100644
--- a/templates/mod/security.conf.epp
+++ b/templates/mod/security.conf.epp
@@ -44,7 +44,7 @@
     SecResponseBodyMimeType text/plain text/html text/xml
     SecResponseBodyLimit 524288
     SecResponseBodyLimitAction <%= $secresponsebodylimitaction %>
-    SecDebugLogLevel 0
+    SecDebugLogLevel <%= $debug_log_level %>
     SecAuditEngine RelevantOnly
     SecAuditLogRelevantStatus "<%= $audit_log_relevant_status %>"
     SecAuditLogParts <%= $audit_log_parts %>

From c681afea6c017c6ae6664f95f48c9ebc155aebf4 Mon Sep 17 00:00:00 2001
From: Malik Parvez <84777619+malikparvez@users.noreply.github.com>
Date: Tue, 21 May 2024 21:12:45 +0530
Subject: [PATCH 2234/2267] ITHELP-87329 : replace pull_request_target with
 pull_request

---
 .github/workflows/mend.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mend.yml b/.github/workflows/mend.yml
index 8b5b401847..b4100a5af0 100644
--- a/.github/workflows/mend.yml
+++ b/.github/workflows/mend.yml
@@ -1,10 +1,9 @@
 name: "mend"
 
 on:
-  pull_request_target:
-    types:
-      - opened
-      - synchronize
+  pull_request:
+    branches:
+      - "main"
   schedule:
     - cron: "0 0 * * *"
   workflow_dispatch:

From 9405294bc5d7d80a69b2d05e72e42f215a472511 Mon Sep 17 00:00:00 2001
From: Malik Parvez <84777619+malikparvez@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:52:24 +0530
Subject: [PATCH 2235/2267] ITHELP-87329 : replace pull_request_target with
 pull_request

---
 .github/workflows/labeller.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
index ee149bf525..0d4870d70b 100644
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -6,7 +6,7 @@ on:
       - opened
       - labeled
       - unlabeled
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - labeled

From 6173af4b8267a63ba5734f45649fdb463f3fd4dc Mon Sep 17 00:00:00 2001
From: rajat-puppet <rajat.tiwari@perforce.com>
Date: Mon, 22 Jul 2024 16:46:59 +0530
Subject: [PATCH 2236/2267] Remove labeller.yml

---
 .github/workflows/labeller.yml | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 .github/workflows/labeller.yml

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
deleted file mode 100644
index 0d4870d70b..0000000000
--- a/.github/workflows/labeller.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Labeller
-
-on:
-  issues:
-    types:
-      - opened
-      - labeled
-      - unlabeled
-  pull_request:
-    types:
-      - opened
-      - labeled
-      - unlabeled
-
-jobs:
-  label:
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: puppetlabs/community-labeller@v1.0.1
-        name: Label issues or pull requests
-        with:
-          label_name: community
-          label_color: '5319e7'
-          org_membership: puppetlabs
-          fail_if_member: 'true'
-          token: ${{ secrets.IAC_COMMUNITY_LABELER }}

From c531341dd77f1c029c5afe3c2184ce3be8c33f4c Mon Sep 17 00:00:00 2001
From: rajat-puppet <rajat.tiwari@perforce.com>
Date: Mon, 22 Jul 2024 17:23:20 +0530
Subject: [PATCH 2237/2267] Revert "Remove labeller.yml"

This reverts commit 6173af4b8267a63ba5734f45649fdb463f3fd4dc.
---
 .github/workflows/labeller.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/labeller.yml

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
new file mode 100644
index 0000000000..0d4870d70b
--- /dev/null
+++ b/.github/workflows/labeller.yml
@@ -0,0 +1,27 @@
+name: Labeller
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+      - unlabeled
+  pull_request:
+    types:
+      - opened
+      - labeled
+      - unlabeled
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: puppetlabs/community-labeller@v1.0.1
+        name: Label issues or pull requests
+        with:
+          label_name: community
+          label_color: '5319e7'
+          org_membership: puppetlabs
+          fail_if_member: 'true'
+          token: ${{ secrets.IAC_COMMUNITY_LABELER }}

From 9118a6e41b928f974abc72e90318bba2c61c48a3 Mon Sep 17 00:00:00 2001
From: rajat-puppet <rajat.tiwari@perforce.com>
Date: Mon, 22 Jul 2024 17:31:19 +0530
Subject: [PATCH 2238/2267] Remove labeller.yml

---
 .github/workflows/labeller.yml | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 .github/workflows/labeller.yml

diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
deleted file mode 100644
index 0d4870d70b..0000000000
--- a/.github/workflows/labeller.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Labeller
-
-on:
-  issues:
-    types:
-      - opened
-      - labeled
-      - unlabeled
-  pull_request:
-    types:
-      - opened
-      - labeled
-      - unlabeled
-
-jobs:
-  label:
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: puppetlabs/community-labeller@v1.0.1
-        name: Label issues or pull requests
-        with:
-          label_name: community
-          label_color: '5319e7'
-          org_membership: puppetlabs
-          fail_if_member: 'true'
-          token: ${{ secrets.IAC_COMMUNITY_LABELER }}

From fcb310ed72d3b6dadc73ca14ff9d91cd1e35ced3 Mon Sep 17 00:00:00 2001
From: Ryan <rdill@unified.com>
Date: Tue, 3 Sep 2024 12:12:51 +0800
Subject: [PATCH 2239/2267] Include systemd module for Amazon Linux 2023

---
 manifests/default_mods.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 474b53748b..f970d98cca 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -16,7 +16,7 @@
       if $facts['os']['name'] != 'Amazon' and $use_systemd {
         ::apache::mod { 'systemd': }
       }
-      if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['full'] == '2') {
+      if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] =~ /^(2|2023)$/) {
         ::apache::mod { 'systemd': }
       }
       ::apache::mod { 'unixd': }

From f23433948e0bfd52169ba3f7cd026c89c80d458c Mon Sep 17 00:00:00 2001
From: Ryan <rdill@unified.com>
Date: Thu, 5 Sep 2024 13:01:04 +0800
Subject: [PATCH 2240/2267] always include systemd module when $use_systemd is
 true

---
 manifests/default_mods.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index f970d98cca..50f04ba26e 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -13,10 +13,7 @@
   case $facts['os']['family'] {
     'RedHat': {
       ::apache::mod { 'log_config': }
-      if $facts['os']['name'] != 'Amazon' and $use_systemd {
-        ::apache::mod { 'systemd': }
-      }
-      if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] =~ /^(2|2023)$/) {
+      if $use_systemd {
         ::apache::mod { 'systemd': }
       }
       ::apache::mod { 'unixd': }

From 324e952c53fc9ff3e45946413a79a7e515a3f586 Mon Sep 17 00:00:00 2001
From: Atib Samal <76742622+Harvey2504@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:12:10 +0530
Subject: [PATCH 2241/2267] Fix apache2-mod_php7 not found for SLES-15

---
 manifests/mod/php.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 2d10e02b4b..62b0eca2ea 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -111,8 +111,8 @@
     if ($_package_name == 'apache2-mod_php7' and versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
       exec { 'enable legacy repos':
         path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-        command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',
-        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.5/x86_64',
+        command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",
+        unless  => "SUSEConnect --status-text | grep sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",
       }
     }
 

From 63de3350a61c62bfeb7cc83bc58f5051c7d032bf Mon Sep 17 00:00:00 2001
From: Atib Samal <76742622+Harvey2504@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:23:27 +0530
Subject: [PATCH 2242/2267] Fixing acceptance test node setup

---
 spec/setup_acceptance_node.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
index 6f3150006c..641c9d4f24 100644
--- a/spec/setup_acceptance_node.pp
+++ b/spec/setup_acceptance_node.pp
@@ -10,8 +10,8 @@
     if (versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
       exec { 'enable legacy repos':
         path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-        command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',
-        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.5/x86_64',
+        command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",
+        unless  => "SUSEConnect --status-text | grep sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",
       }
     }
     # needed for netstat, for serverspec checks

From b4ad4a7654a0dfe6b5c3ba08c3d747ed09e6035b Mon Sep 17 00:00:00 2001
From: Amit Karsale <amit.karsale@perforce.com>
Date: Wed, 11 Sep 2024 14:16:18 +0530
Subject: [PATCH 2243/2267] pdksync - (PF-3525) - pdk update for module

---
 .github/workflows/release.yml |  2 +-
 .gitignore                    |  7 +++++++
 .pdkignore                    |  7 +++++++
 .rubocop.yml                  |  8 +++++++-
 .vscode/extensions.json       |  2 +-
 Gemfile                       | 26 +++++++++++++-------------
 metadata.json                 |  4 ++--
 spec/spec_helper.rb           |  5 +++--
 8 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0b7b8a05dd..4b3b80fc80 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: "Publish module"
 
 on:
   workflow_dispatch:
-  
+ 
 jobs:
   release: 
     uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
diff --git a/.gitignore b/.gitignore
index 3f1551212b..2803e566b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 /spec/fixtures/modules/*
 /tmp/
 /vendor/
+/.vendor/
 /convert_report.txt
 /update_report.txt
 .DS_Store
@@ -26,3 +27,9 @@
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
+.resource_types
+.modules
+.task_cache.json
+.plan_cache.json
+.rerun.json
+bolt-debug.log
diff --git a/.pdkignore b/.pdkignore
index 862847a72c..84684be63f 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -19,6 +19,7 @@
 /spec/fixtures/modules/*
 /tmp/
 /vendor/
+/.vendor/
 /convert_report.txt
 /update_report.txt
 .DS_Store
@@ -26,6 +27,12 @@
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
+.resource_types
+.modules
+.task_cache.json
+.plan_cache.json
+.rerun.json
+bolt-debug.log
 /.fixtures.yml
 /Gemfile
 /.gitattributes
diff --git a/.rubocop.yml b/.rubocop.yml
index 7a66e08331..439ea84ee8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,7 @@ require:
 AllCops:
   NewCops: enable
   DisplayCopNames: true
-  TargetRubyVersion: '2.7'
+  TargetRubyVersion: '2.6'
   Include:
   - "**/*.rb"
   Exclude:
@@ -529,6 +529,8 @@ Lint/DuplicateBranch:
   Enabled: false
 Lint/DuplicateMagicComment:
   Enabled: false
+Lint/DuplicateMatchPattern:
+  Enabled: false
 Lint/DuplicateRegexpCharacterClassElement:
   Enabled: false
 Lint/EmptyBlock:
@@ -645,6 +647,8 @@ Style/ComparableClamp:
   Enabled: false
 Style/ConcatArrayLiterals:
   Enabled: false
+Style/DataInheritance:
+  Enabled: false
 Style/DirEmpty:
   Enabled: false
 Style/DocumentDynamicEvalDefinition:
@@ -713,6 +717,8 @@ Style/RedundantHeredocDelimiterQuotes:
   Enabled: false
 Style/RedundantInitialize:
   Enabled: false
+Style/RedundantLineContinuation:
+  Enabled: false
 Style/RedundantSelfAssignmentBranch:
   Enabled: false
 Style/RedundantStringEscape:
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 2f1e4f73a5..6da8d472f8 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
   "recommendations": [
     "puppet.puppet-vscode",
-    "rebornix.Ruby"
+    "Shopify.ruby-lsp"
   ]
 }
diff --git a/Gemfile b/Gemfile
index ca0e773ecd..9f66bfa983 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,30 +20,30 @@ group :development do
   gem "json", '= 2.6.1',                         require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.6.3',                         require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "racc", '~> 1.4.0',                        require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "deep_merge", '~> 1.2.2',                  require: false
   gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
-  gem "facterdb", '~> 1.18',                     require: false
-  gem "metadata-json-lint", '~> 3.0',            require: false
-  gem "puppetlabs_spec_helper", '~> 6.0',        require: false
+  gem "facterdb", '~> 1.18',                      require: false
+  gem "metadata-json-lint", '~> 4.0',            require: false
   gem "rspec-puppet-facts", '~> 2.0',            require: false
-  gem "codecov", '~> 0.2',                       require: false
   gem "dependency_checker", '~> 1.0.0',          require: false
   gem "parallel_tests", '= 3.12.1',              require: false
   gem "pry", '~> 0.10',                          require: false
-  gem "simplecov-console", '~> 0.5',             require: false
+  gem "simplecov-console", '~> 0.9',             require: false
   gem "puppet-debugger", '~> 1.0',               require: false
-  gem "rubocop", '= 1.48.1',                     require: false
+  gem "rubocop", '~> 1.50.0',                    require: false
   gem "rubocop-performance", '= 1.16.0',         require: false
   gem "rubocop-rspec", '= 2.19.0',               require: false
-  gem "puppet-strings", '~> 4.0',                require: false
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "rexml", '>= 3.0.0', '< 3.2.7',            require: false
 end
-group :system_tests do
-  gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
-  gem "serverspec", '~> 2.41',   require: false
-end
-group :release_prep do
+group :development, :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false
-  gem "puppetlabs_spec_helper", '~> 6.0', require: false
+  gem "puppetlabs_spec_helper", '~> 7.0', require: false
+end
+group :system_tests do
+  gem "puppet_litmus", '~> 1.0',   require: false, platforms: [:ruby, :x64_mingw]
+  gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "serverspec", '~> 2.41',     require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/metadata.json b/metadata.json
index a74ad44249..cb9f1ab89e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -87,7 +87,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "3.0.0",
+  "pdk-version": "3.2.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g79a2f93"
+  "template-ref": "tags/3.2.0.4-0-g5d17ec1"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6820cebee7..ae7c1f6818 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -25,7 +25,8 @@
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
+    require 'deep_merge'
+    default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
   rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
@@ -33,7 +34,7 @@
 
 # read default_facts and merge them over what is provided by facterdb
 default_facts.each do |fact, value|
-  add_custom_fact fact, value
+  add_custom_fact fact, value, merge_facts: true
 end
 
 RSpec.configure do |c|

From 90f7482290c4143d168f4d209e16518b5968c27f Mon Sep 17 00:00:00 2001
From: Peter Jackson <Peter.Jackson@ed.ac.uk>
Date: Fri, 20 Sep 2024 12:38:04 +0100
Subject: [PATCH 2244/2267] Update config parameters to match latest OIDC
 release and fix typos. #2567 #2566

---
 REFERENCE.md          | 250 +++++++++++++++++++++++------------------
 types/oidcsettings.pp | 251 ++++++++++++++++++++++++------------------
 2 files changed, 286 insertions(+), 215 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index b637f3722a..5b43bcb8e3 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -11306,113 +11306,149 @@ Alias of
 
 ```puppet
 Struct[{
-    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
-    Optional['CryptoPassphrase']                        => String,
-    Optional['MetadataDir']                             => String,
-    Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,
-    Optional['ProviderIssuer']                          => String,
-    Optional['ProviderAuthorizationEndpoint']           => Stdlib::HTTPSUrl,
-    Optional['ProviderJwksUri']                         => Stdlib::HTTPSUrl,
-    Optional['ProviderTokenEndpoint']                   => Stdlib::HTTPSUrl,
-    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'none'],
-    Optional['ProviderTokenEndpointParams']             => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['ProviderUserInfoEndpoint']                => Stdlib::HTTPSUrl,
-    Optional['ProviderCheckSessionIFrame']              => Stdlib::HTTPSUrl,
-    Optional['ProviderEndSessionEndpoint']              => Stdlib::HTTPSUrl,
-    Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
-    Optional['ProviderBackChannelLogoutSupported']      => Enum['On', 'Off'],
-    Optional['ProviderRegistrationEndpointJson']        => String,
-    Optional['Scope']                                   => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
-    Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['SSLValidateServer']                       => Enum['On', 'Off'],
-    Optional['UserInfoRefreshInterval']                 => Integer,
-    Optional['JWKSRefreshInterval']                     => Integer,
-    Optional['UserInfoTokenMethod']                     => Enum['authz_header', 'post_param'],
-    Optional['ProviderAuthRequestMethod']               => Enum['GET', 'POST'],
-    Optional['PublicKeyFiles']                          => String,
-    Optional['ResponseType']                            => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
-    Optional['ResponseMode']                            => Enum['fragment', 'query', 'form_post'],
-    Optional['ClientID']                                => String,
-    Optional['ClientSecret']                            => String,
-    Optional['ClientTokenEndpointCert']                 => String,
-    Optional['ClientTokenEndpointKey']                  => String,
-    Optional['ClientName']                              => String,
-    Optional['ClientContact']                           => String,
-    Optional['PKCDMethod']                              => Enum['plain', 'S256', 'referred_tb'],
-    Optional['TokenBindingPolicy']                      => Enum['disabled', 'optional', 'required', 'enforced'],
-    Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
-    Optional['IDTokenSignedResponseAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
-    Optional['IDTokenEncryptedResponseEnc']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
-    Optional['UserInfoSignedResposeAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
-    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
-    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
-    Optional['OAuthServerMetadataURL']                  => Stdlib::HTTPSUrl,
-    Optional['AuthIntrospectionEndpoint']               => Stdlib::HTTPSUrl,
-    Optional['OAuthClientID']                           => String,
-    Optional['OAuthClientSecret']                       => String,
-    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
-    Optional['OAuthIntrospectionClientAuthBearerToken'] => String,
-    Optional['OAuthIntrospectionEndpointCert']          => String,
-    Optional['OAuthIntrospectionEndpointKey']           => String,
-    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST', 'GET'],
-    Optional['OAuthIntrospectionEndpointParams']        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['OAuthIntrospectionTokenParamName']        => String,
-    Optional['OAuthTokenExpiryClaim']                   => Pattern[/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/],
-    Optional['OAuthSSLValidateServer']                  => Enum['On', 'Off'],
-    Optional['OAuthVerifySharedKeys']                   => String,
-    Optional['OAuthVerifyCertFiles']                    => String,
-    Optional['OAuthVerifyJwksUri']                      => Stdlib::HTTPSUrl,
-    Optional['OAuthRemoteUserClaim']                    => String,
-    Optional['OAuthAcceptTokenAs']                      => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
-    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled', 'optional', 'required', 'enforced'],
-    Optional['Cookie']                                  => String,
-    Optional['SessionCookieChunkSize']                  => Integer,
-    Optional['CookieHTTPOnly']                          => Enum['On', 'Off'],
-    Optional['CookieSameSite']                          => Enum['On', 'Off'],
-    Optional['PassCookies']                             => String,
-    Optional['StripCookies']                            => String,
-    Optional['StateMaxNumberOfCookies']                 => Pattern[/^[0-9]+\s(false|true)$/],
-    Optional['SessionInactivityTimeout']                => Integer,
-    Optional['SessionMaxDuration']                      => Integer,
-    Optional['SessionType']                             => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/],
-    Optional['SessionCacheFallbackToCookie']            => Enum['On', 'Off'],
-    Optional['CacheType']                               => Enum['shm', 'memcache', 'file', 'redis'],
-    Optional['CacheEncrypt']                            => Enum['On', 'Off'],
-    Optional['CacheShmMax']                             => Integer,
-    Optional['CacheShmEntrySizeMax']                    => Integer,
-    Optional['CacheFileCleanInterval']                  => Integer,
-    Optional['MemCacheServers']                         => String,
-    Optional['RedisCacheServer']                        => String,
-    Optional['RedisCachePassword']                      => String,
-    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
-    Optional['HTMLErrorTemplate']                       => String,
-    Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
-    Optional['PathScope']                               => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
-    Optional['PathAuthRequestParams']                   => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['IDTokenIatSlack']                         => Integer,
-    Optional['ClaimPrefix']                             => String,
-    Optional['ClaimDelimiter']                          => Pattern[/^.$/],
-    Optional['RemoteUserClaim']                         => String,
-    Optional['PassIDTokenAs']                           => Pattern[/^((claims|payload|serialized)\s?)+$/],
-    Optional['PassUserInfoAs']                          => Pattern[/^((claims|json|jwt)\s?)+$/],
-    Optional['PassClaimsAs']                            => Enum['none', 'headers', 'environment', 'both'],
-    Optional['AuthNHeader']                             => String,
-    Optional['HTTPTimeoutLong']                         => Integer,
-    Optional['HTTPTimeoutShort']                        => Integer,
-    Optional['StateTimeout']                            => Integer,
-    Optional['ScrubRequestHeaders']                     => Enum['On', 'Off'],
-    Optional['OutgoingProxy']                           => String,
-    Optional['UnAuthAction']                            => Enum['auth', 'pass', '401', '410'],
-    Optional['UnAuthzAction']                           => Enum['401', '403', 'auth'],
-    Optional['PreservePost']                            => Enum['On', 'Off'],
-    Optional['PassRefreshToken']                        => Enum['On', 'Off'],
-    Optional['RequestObject']                           => String,
-    Optional['ProviderMetadataRefreshInterval']         => Integer,
-    Optional['InfoHook']                                => Pattern[/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/],
-    Optional['BlackListedClaims']                       => String,
-    Optional['WhiteListedClaims']                       => String,
-    Optional['RefreshAccessTokenBeforeExpiry']          => Pattern[/^[0-9]+(\slogout_on_error)?$/],
+    Optional['RedirectURI']                                => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
+    Optional['CryptoPassphrase']                           => String,
+    Optional['MetadataDir']                                => String,
+    Optional['ProviderMetadataURL']                        => Stdlib::HTTPSUrl,
+    Optional['ProviderIssuer']                             => String,
+    Optional['ProviderAuthorizationEndpoint']              => Stdlib::HTTPSUrl,
+    Optional['ProviderJwksUri']                            => Stdlib::HTTPSUrl,
+    Optional['ProviderTokenEndpoint']                      => Stdlib::HTTPSUrl,
+    Optional['ProviderTokenEndpointAuth']                  => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'none'],
+    Optional['ProviderTokenEndpointParams']                => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['ProviderUserInfoEndpoint']                   => Stdlib::HTTPSUrl,
+    Optional['ProviderCheckSessionIFrame']                 => Stdlib::HTTPSUrl,
+    Optional['ProviderEndSessionEndpoint']                 => Stdlib::HTTPSUrl,
+    Optional['ProviderRevocationEndpoint']                 => Stdlib::HTTPSUrl,
+    Optional['ProviderBackChannelLogoutSupported']         => Enum['On', 'Off'],
+    Optional['ProviderRegistrationEndpointJson']           => String,
+    Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
+    Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['SSLValidateServer']                          => Enum['On', 'Off'],
+    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s?(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['JWKSRefreshInterval']                        => Integer,
+    Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
+    Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],
+    Optional['PublicKeyFiles']                             => String,
+    Optional['PrivateKeyFiles']                            => String,
+    Optional['ResponseType']                               => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
+    Optional['ResponseMode']                               => Enum['fragment', 'query', 'form_post'],
+    Optional['ClientID']                                   => String,
+    Optional['ClientSecret']                               => String,
+    Optional['ClientTokenEndpointCert']                    => String,
+    Optional['ClientTokenEndpointKey']                     => String,
+    Optional['ClientTokenEndpointKeyPassword']             => String,
+    Optional['ClientName']                                 => String,
+    Optional['ClientContact']                              => String,
+    Optional['PKCEMethod']                                 => Enum['plain', 'S256', 'referred_tb', 'none'],
+    Optional['TokenBindingPolicy']                         => Enum['disabled', 'optional', 'required', 'enforced'],
+    Optional['ClientJwksUri']                              => Stdlib::HTTPSUrl,
+    Optional['IDTokenSignedResponseAlg']                   => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['IDTokenEncryptedResponseAlg']                => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['IDTokenEncryptedResponseEnc']                => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['UserInfoSignedResponseAlg']                  => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['UserInfoEncryptedResponseAlg']               => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['UserInfoEncryptedResponseEnc']               => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['OAuthServerMetadataURL']                     => Stdlib::HTTPSUrl,
+    Optional['AuthIntrospectionEndpoint']                  => Stdlib::HTTPSUrl,
+    Optional['OAuthClientID']                              => String,
+    Optional['OAuthClientSecret']                          => String,
+    Optional['OAuthIntrospectionEndpoint']                 => String,
+    Optional['OAuthIntrospectionEndpointAuth']             => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
+    Optional['OAuthIntrospectionClientAuthBearerToken']    => String,
+    Optional['OAuthIntrospectionEndpointCert']             => String,
+    Optional['OAuthIntrospectionEndpointKey']              => String,
+    Optional['OAuthIntrospectionEndpointKeyPassword']      => String,
+    Optional['OAuthIntrospectionEndpointMethod']           => Enum['POST', 'GET'],
+    Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['OAuthIntrospectionTokenParamName']           => String,
+    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
+    Optional['OAuthTokenIntrospectionInterval']            => Integer,
+    Optional['OAuthSSLValidateServer']                     => Enum['On', 'Off'],
+    Optional['OAuthVerifySharedKeys']                      => String,
+    Optional['OAuthVerifyCertFiles']                       => String,
+    Optional['OAuthVerifyJwksUri']                         => Stdlib::HTTPSUrl,
+    Optional['OAuthRemoteUserClaim']                       => String,
+    Optional['OAuthAcceptTokenAs']                         => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
+    Optional['OAuthAccessTokenBindingPolicy']              => Enum['disabled', 'optional', 'required', 'enforced'],
+    Optional['Cookie']                                     => String,
+    Optional['CookieDomain']                               => String,
+    Optional['CookiePath']                                 => String,
+    Optional['SessionCookieChunkSize']                     => Integer,
+    Optional['CookieHTTPOnly']                             => Enum['On', 'Off'],
+    Optional['CookieSameSite']                             => Enum['On', 'Off'],
+    Optional['PassCookies']                                => String,
+    Optional['StripCookies']                               => String,
+    Optional['StateMaxNumberOfCookies']                    => Pattern[/^[0-9]+(\s?(false|true))?$/],
+    Optional['SessionInactivityTimeout']                   => Integer,
+    Optional['SessionMaxDuration']                         => Integer,
+    Optional['SessionType']                                => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent|:store_id_token|:persistent:store_id_token)?)$/],
+    Optional['SessionCacheFallbackToCookie']               => Enum['On', 'Off'],
+    Optional['CacheType']                                  => Enum['shm', 'memcache', 'file', 'redis'],
+    Optional['CacheDir']                                   => String,
+    Optional['CacheEncrypt']                               => Enum['On', 'Off'],
+    Optional['CacheShmMax']                                => Integer,
+    Optional['CacheShmEntrySizeMax']                       => Integer,
+    Optional['CacheFileCleanInterval']                     => Integer,
+    Optional['MemCacheServers']                            => String,
+    Optional['MemCacheConnectionsHMax']                    => Integer,
+    Optional['MemCacheConnectionsMin']                     => Integer,
+    Optional['MemCacheConnectionsSMax']                    => Integer,
+    Optional['MemCacheConnectionsTTL']                     => Integer,
+    Optional['RedisCacheServer']                           => String,
+    Optional['RedisCachePassword']                         => String,
+    Optional['RedisCacheConnectTimeout']                   => Pattern[/^[0-9]+\s?[0-9]*$/],
+    Optional['RedisCacheDatabase']                         => Integer,
+    Optional['RedisCacheTimeout']                          => Integer,
+    Optional['RedisCacheUsername']                         => String,
+    Optional['DiscoverURL']                                => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
+    Optional['HTMLErrorTemplate']                          => String,
+    Optional['DefaultURL']                                 => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
+    Optional['PathScope']                                  => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
+    Optional['PathAuthRequestParams']                      => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['IDTokenIatSlack']                            => Integer,
+    Optional['ClaimPrefix']                                => String,
+    Optional['ClaimDelimiter']                             => Pattern[/^.$/],
+    Optional['RemoteUserClaim']                            => String,
+    Optional['PassIDTokenAs']                              => Pattern[/^((claims|payload|serialized)\s?)+$/],
+    Optional['PassUserInfoAs']                             => Pattern[/^((claims|json(:([A-Za-z0-9\-\._])+)?|(signed_)?jwt(:([A-Za-z0-9\-\._])+)?)\s?)+$/],
+    Optional['PassClaimsAs']                               => Enum['none', 'headers', 'environment', 'both'],
+    Optional['AuthNHeader']                                => String,
+    Optional['HTTPTimeoutLong']                            => Integer,
+    Optional['HTTPTimeoutShort']                           => Integer,
+    Optional['StateTimeout']                               => Integer,
+    Optional['ScrubRequestHeaders']                        => Enum['On', 'Off'],
+    Optional['OutgoingProxy']                              => String,
+    Optional['UnAuthAction']                               => Pattern[/^(auth|pass|401|407|410)\s.*/],
+    Optional['UnAutzAction']                               => Pattern[/^(none|headers|environment|both)(\s+(latin1|base64url|none)+)?$/],
+    Optional['PreservePost']                               => Enum['On', 'Off'],
+    Optional['PreservePostTemplates']                      => String,
+    Optional['PassRefreshToken']                           => Enum['On', 'Off'],
+    Optional['RequestObject']                              => String,
+    Optional['ProviderMetadataRefreshInterval']            => Integer,
+    Optional['InfoHook']                                   => Pattern[/^((iat|access_token|access_token_expires|id_token|id_token_hint|userinfo|refresh_token|exp|timeout|remote_user|session)\s?)+$/],
+    Optional['BlackListedClaims']                          => String,
+    Optional['WhiteListedClaims']                          => String,
+    Optional['RefreshAccessTokenBeforeExpiry']             => Pattern[/^[0-9]+(\s(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['XForwardedHeaders']                          => String,
+    Optional['CABundlePath']                               => String,
+    Optional['DefaultLoggedOutURL']                        => String,
+    Optional['DPoPMode']                                   => String,
+    Optional['FilterClaimsExpr']                           => String,
+    Optional['LogoutRequestParams']                        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['LogoutXFrameOptions']                        => String,
+    Optional['MetricsData']                                => String,
+    Optional['MetricsPublish']                             => String,
+    Optional['PassAccessToken']                            => Enum['On', 'Off'],
+    Optional['ProviderPushedAuthorizationRequestEndpoint'] => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
+    Optional['ProviderSignedJwksUri']                      => String,
+    Optional['ProviderVerifyCertFiles']                    => String,
+    Optional['RedirectURLsAllowed']                        => String,
+    Optional['StateCookiePrefix']                          => String,
+    Optional['StateInputHeaders']                          => Enum['user-agent', 'x-forwarded-for', 'both', 'none'],
+    Optional['TraceParent']                                => Enum['off', 'generate', 'propagate'],
+    Optional['UserInfoClaimsExpr']                         => String,
+    Optional['ValidateIssuer']                             => Enum['On', 'Off'],
   }]
 ```
 
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index d3246ccdcd..8a14935282 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -1,113 +1,148 @@
 # https://github.com/zmartzone/mod_auth_openidc/blob/master/auth_openidc.conf
 type Apache::OIDCSettings = Struct[
   {
-    Optional['RedirectURI']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
-    Optional['CryptoPassphrase']                        => String,
-    Optional['MetadataDir']                             => String,
-    Optional['ProviderMetadataURL']                     => Stdlib::HTTPSUrl,
-    Optional['ProviderIssuer']                          => String,
-    Optional['ProviderAuthorizationEndpoint']           => Stdlib::HTTPSUrl,
-    Optional['ProviderJwksUri']                         => Stdlib::HTTPSUrl,
-    Optional['ProviderTokenEndpoint']                   => Stdlib::HTTPSUrl,
-    Optional['ProviderTokenEndpointAuth']               => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'none'],
-    Optional['ProviderTokenEndpointParams']             => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['ProviderUserInfoEndpoint']                => Stdlib::HTTPSUrl,
-    Optional['ProviderCheckSessionIFrame']              => Stdlib::HTTPSUrl,
-    Optional['ProviderEndSessionEndpoint']              => Stdlib::HTTPSUrl,
-    Optional['ProviderRevocationEndpoint']              => Stdlib::HTTPSUrl,
-    Optional['ProviderBackChannelLogoutSupported']      => Enum['On', 'Off'],
-    Optional['ProviderRegistrationEndpointJson']        => String,
-    Optional['Scope']                                   => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
-    Optional['AuthRequestParams']                       => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['SSLValidateServer']                       => Enum['On', 'Off'],
-    Optional['UserInfoRefreshInterval']                 => Integer,
-    Optional['JWKSRefreshInterval']                     => Integer,
-    Optional['UserInfoTokenMethod']                     => Enum['authz_header', 'post_param'],
-    Optional['ProviderAuthRequestMethod']               => Enum['GET', 'POST'],
-    Optional['PublicKeyFiles']                          => String,
-    Optional['ResponseType']                            => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
-    Optional['ResponseMode']                            => Enum['fragment', 'query', 'form_post'],
-    Optional['ClientID']                                => String,
-    Optional['ClientSecret']                            => String,
-    Optional['ClientTokenEndpointCert']                 => String,
-    Optional['ClientTokenEndpointKey']                  => String,
-    Optional['ClientName']                              => String,
-    Optional['ClientContact']                           => String,
-    Optional['PKCDMethod']                              => Enum['plain', 'S256', 'referred_tb'],
-    Optional['TokenBindingPolicy']                      => Enum['disabled', 'optional', 'required', 'enforced'],
-    Optional['ClientJwksUri']                           => Stdlib::HTTPSUrl,
-    Optional['IDTokenSignedResponseAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
-    Optional['IDTokenEncryptedResponseAlg']             => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
-    Optional['IDTokenEncryptedResponseEnc']             => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
-    Optional['UserInfoSignedResposeAlg']                => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
-    Optional['UserInfoEncryptedResponseAlg']            => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
-    Optional['UserInfoEncryptedResponseEnc']            => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
-    Optional['OAuthServerMetadataURL']                  => Stdlib::HTTPSUrl,
-    Optional['AuthIntrospectionEndpoint']               => Stdlib::HTTPSUrl,
-    Optional['OAuthClientID']                           => String,
-    Optional['OAuthClientSecret']                       => String,
-    Optional['OAuthIntrospectionEndpointAuth']          => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
-    Optional['OAuthIntrospectionClientAuthBearerToken'] => String,
-    Optional['OAuthIntrospectionEndpointCert']          => String,
-    Optional['OAuthIntrospectionEndpointKey']           => String,
-    Optional['OAuthIntrospectionEndpointMethod']        => Enum['POST', 'GET'],
-    Optional['OAuthIntrospectionEndpointParams']        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['OAuthIntrospectionTokenParamName']        => String,
-    Optional['OAuthTokenExpiryClaim']                   => Pattern[/^[A-Za-z0-9\-\._]+\s(absolute|relative)\s(mandatory|optional)$/],
-    Optional['OAuthSSLValidateServer']                  => Enum['On', 'Off'],
-    Optional['OAuthVerifySharedKeys']                   => String,
-    Optional['OAuthVerifyCertFiles']                    => String,
-    Optional['OAuthVerifyJwksUri']                      => Stdlib::HTTPSUrl,
-    Optional['OAuthRemoteUserClaim']                    => String,
-    Optional['OAuthAcceptTokenAs']                      => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
-    Optional['OAuthAccessTokenBindingPolicy']           => Enum['disabled', 'optional', 'required', 'enforced'],
-    Optional['Cookie']                                  => String,
-    Optional['SessionCookieChunkSize']                  => Integer,
-    Optional['CookieHTTPOnly']                          => Enum['On', 'Off'],
-    Optional['CookieSameSite']                          => Enum['On', 'Off'],
-    Optional['PassCookies']                             => String,
-    Optional['StripCookies']                            => String,
-    Optional['StateMaxNumberOfCookies']                 => Pattern[/^[0-9]+\s(false|true)$/],
-    Optional['SessionInactivityTimeout']                => Integer,
-    Optional['SessionMaxDuration']                      => Integer,
-    Optional['SessionType']                             => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent)?)$/],
-    Optional['SessionCacheFallbackToCookie']            => Enum['On', 'Off'],
-    Optional['CacheType']                               => Enum['shm', 'memcache', 'file', 'redis'],
-    Optional['CacheEncrypt']                            => Enum['On', 'Off'],
-    Optional['CacheShmMax']                             => Integer,
-    Optional['CacheShmEntrySizeMax']                    => Integer,
-    Optional['CacheFileCleanInterval']                  => Integer,
-    Optional['MemCacheServers']                         => String,
-    Optional['RedisCacheServer']                        => String,
-    Optional['RedisCachePassword']                      => String,
-    Optional['DiscoverURL']                             => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
-    Optional['HTMLErrorTemplate']                       => String,
-    Optional['DefaultURL']                              => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
-    Optional['PathScope']                               => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
-    Optional['PathAuthRequestParams']                   => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['IDTokenIatSlack']                         => Integer,
-    Optional['ClaimPrefix']                             => String,
-    Optional['ClaimDelimiter']                          => Pattern[/^.$/],
-    Optional['RemoteUserClaim']                         => String,
-    Optional['PassIDTokenAs']                           => Pattern[/^((claims|payload|serialized)\s?)+$/],
-    Optional['PassUserInfoAs']                          => Pattern[/^((claims|json|jwt)\s?)+$/],
-    Optional['PassClaimsAs']                            => Enum['none', 'headers', 'environment', 'both'],
-    Optional['AuthNHeader']                             => String,
-    Optional['HTTPTimeoutLong']                         => Integer,
-    Optional['HTTPTimeoutShort']                        => Integer,
-    Optional['StateTimeout']                            => Integer,
-    Optional['ScrubRequestHeaders']                     => Enum['On', 'Off'],
-    Optional['OutgoingProxy']                           => String,
-    Optional['UnAuthAction']                            => Enum['auth', 'pass', '401', '410'],
-    Optional['UnAuthzAction']                           => Enum['401', '403', 'auth'],
-    Optional['PreservePost']                            => Enum['On', 'Off'],
-    Optional['PassRefreshToken']                        => Enum['On', 'Off'],
-    Optional['RequestObject']                           => String,
-    Optional['ProviderMetadataRefreshInterval']         => Integer,
-    Optional['InfoHook']                                => Pattern[/^((iat|access_token|access_token_expires|id_token|userinfo|refresh_token|session)\s?)+$/],
-    Optional['BlackListedClaims']                       => String,
-    Optional['WhiteListedClaims']                       => String,
-    Optional['RefreshAccessTokenBeforeExpiry']          => Pattern[/^[0-9]+(\slogout_on_error)?$/],
-    Optional['XForwardedHeaders']                       => String,
+    Optional['RedirectURI']                                => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
+    Optional['CryptoPassphrase']                           => String,
+    Optional['MetadataDir']                                => String,
+    Optional['ProviderMetadataURL']                        => Stdlib::HTTPSUrl,
+    Optional['ProviderIssuer']                             => String,
+    Optional['ProviderAuthorizationEndpoint']              => Stdlib::HTTPSUrl,
+    Optional['ProviderJwksUri']                            => Stdlib::HTTPSUrl,
+    Optional['ProviderTokenEndpoint']                      => Stdlib::HTTPSUrl,
+    Optional['ProviderTokenEndpointAuth']                  => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'none'],
+    Optional['ProviderTokenEndpointParams']                => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['ProviderUserInfoEndpoint']                   => Stdlib::HTTPSUrl,
+    Optional['ProviderCheckSessionIFrame']                 => Stdlib::HTTPSUrl,
+    Optional['ProviderEndSessionEndpoint']                 => Stdlib::HTTPSUrl,
+    Optional['ProviderRevocationEndpoint']                 => Stdlib::HTTPSUrl,
+    Optional['ProviderBackChannelLogoutSupported']         => Enum['On', 'Off'],
+    Optional['ProviderRegistrationEndpointJson']           => String,
+    Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
+    Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['SSLValidateServer']                          => Enum['On', 'Off'],
+    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s?(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['JWKSRefreshInterval']                        => Integer,
+    Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
+    Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],
+    Optional['PublicKeyFiles']                             => String,
+    Optional['PrivateKeyFiles']                            => String,
+    Optional['ResponseType']                               => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
+    Optional['ResponseMode']                               => Enum['fragment', 'query', 'form_post'],
+    Optional['ClientID']                                   => String,
+    Optional['ClientSecret']                               => String,
+    Optional['ClientTokenEndpointCert']                    => String,
+    Optional['ClientTokenEndpointKey']                     => String,
+    Optional['ClientTokenEndpointKeyPassword']             => String,
+    Optional['ClientName']                                 => String,
+    Optional['ClientContact']                              => String,
+    Optional['PKCEMethod']                                 => Enum['plain', 'S256', 'referred_tb', 'none'],
+    Optional['TokenBindingPolicy']                         => Enum['disabled', 'optional', 'required', 'enforced'],
+    Optional['ClientJwksUri']                              => Stdlib::HTTPSUrl,
+    Optional['IDTokenSignedResponseAlg']                   => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['IDTokenEncryptedResponseAlg']                => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['IDTokenEncryptedResponseEnc']                => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['UserInfoSignedResponseAlg']                  => Enum['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'HS256', 'HS384', 'HS512', 'ES256', 'ES384', 'ES512'],
+    Optional['UserInfoEncryptedResponseAlg']               => Enum['RSA1_5', 'A128KW', 'A256KW', 'RSA-OAEP'],
+    Optional['UserInfoEncryptedResponseEnc']               => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
+    Optional['OAuthServerMetadataURL']                     => Stdlib::HTTPSUrl,
+    Optional['AuthIntrospectionEndpoint']                  => Stdlib::HTTPSUrl,
+    Optional['OAuthClientID']                              => String,
+    Optional['OAuthClientSecret']                          => String,
+    Optional['OAuthIntrospectionEndpoint']                 => String,
+    Optional['OAuthIntrospectionEndpointAuth']             => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
+    Optional['OAuthIntrospectionClientAuthBearerToken']    => String,
+    Optional['OAuthIntrospectionEndpointCert']             => String,
+    Optional['OAuthIntrospectionEndpointKey']              => String,
+    Optional['OAuthIntrospectionEndpointKeyPassword']      => String,
+    Optional['OAuthIntrospectionEndpointMethod']           => Enum['POST', 'GET'],
+    Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['OAuthIntrospectionTokenParamName']           => String,
+    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
+    Optional['OAuthTokenIntrospectionInterval']            => Integer,
+    Optional['OAuthSSLValidateServer']                     => Enum['On', 'Off'],
+    Optional['OAuthVerifySharedKeys']                      => String,
+    Optional['OAuthVerifyCertFiles']                       => String,
+    Optional['OAuthVerifyJwksUri']                         => Stdlib::HTTPSUrl,
+    Optional['OAuthRemoteUserClaim']                       => String,
+    Optional['OAuthAcceptTokenAs']                         => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
+    Optional['OAuthAccessTokenBindingPolicy']              => Enum['disabled', 'optional', 'required', 'enforced'],
+    Optional['Cookie']                                     => String,
+    Optional['CookieDomain']                               => String,
+    Optional['CookiePath']                                 => String,
+    Optional['SessionCookieChunkSize']                     => Integer,
+    Optional['CookieHTTPOnly']                             => Enum['On', 'Off'],
+    Optional['CookieSameSite']                             => Enum['On', 'Off'],
+    Optional['PassCookies']                                => String,
+    Optional['StripCookies']                               => String,
+    Optional['StateMaxNumberOfCookies']                    => Pattern[/^[0-9]+(\s?(false|true))?$/],
+    Optional['SessionInactivityTimeout']                   => Integer,
+    Optional['SessionMaxDuration']                         => Integer,
+    Optional['SessionType']                                => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent|:store_id_token|:persistent:store_id_token)?)$/],
+    Optional['SessionCacheFallbackToCookie']               => Enum['On', 'Off'],
+    Optional['CacheType']                                  => Enum['shm', 'memcache', 'file', 'redis'],
+    Optional['CacheDir']                                   => String,
+    Optional['CacheEncrypt']                               => Enum['On', 'Off'],
+    Optional['CacheShmMax']                                => Integer,
+    Optional['CacheShmEntrySizeMax']                       => Integer,
+    Optional['CacheFileCleanInterval']                     => Integer,
+    Optional['MemCacheServers']                            => String,
+    Optional['MemCacheConnectionsHMax']                    => Integer,
+    Optional['MemCacheConnectionsMin']                     => Integer,
+    Optional['MemCacheConnectionsSMax']                    => Integer,
+    Optional['MemCacheConnectionsTTL']                     => Integer,
+    Optional['RedisCacheServer']                           => String,
+    Optional['RedisCachePassword']                         => String,
+    Optional['RedisCacheConnectTimeout']                   => Pattern[/^[0-9]+\s?[0-9]*$/],
+    Optional['RedisCacheDatabase']                         => Integer,
+    Optional['RedisCacheTimeout']                          => Integer,
+    Optional['RedisCacheUsername']                         => String,
+    Optional['DiscoverURL']                                => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
+    Optional['HTMLErrorTemplate']                          => String,
+    Optional['DefaultURL']                                 => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
+    Optional['PathScope']                                  => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
+    Optional['PathAuthRequestParams']                      => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['IDTokenIatSlack']                            => Integer,
+    Optional['ClaimPrefix']                                => String,
+    Optional['ClaimDelimiter']                             => Pattern[/^.$/],
+    Optional['RemoteUserClaim']                            => String,
+    Optional['PassIDTokenAs']                              => Pattern[/^((claims|payload|serialized)\s?)+$/],
+    Optional['PassUserInfoAs']                             => Pattern[/^((claims|json(:([A-Za-z0-9\-\._])+)?|(signed_)?jwt(:([A-Za-z0-9\-\._])+)?)\s?)+$/],
+    Optional['PassClaimsAs']                               => Enum['none', 'headers', 'environment', 'both'],
+    Optional['AuthNHeader']                                => String,
+    Optional['HTTPTimeoutLong']                            => Integer,
+    Optional['HTTPTimeoutShort']                           => Integer,
+    Optional['StateTimeout']                               => Integer,
+    Optional['ScrubRequestHeaders']                        => Enum['On', 'Off'],
+    Optional['OutgoingProxy']                              => String,
+    Optional['UnAuthAction']                               => Pattern[/^(auth|pass|401|407|410)\s.*/],
+    Optional['UnAutzAction']                               => Pattern[/^(none|headers|environment|both)(\s+(latin1|base64url|none)+)?$/],
+    Optional['PreservePost']                               => Enum['On', 'Off'],
+    Optional['PreservePostTemplates']                      => String,
+    Optional['PassRefreshToken']                           => Enum['On', 'Off'],
+    Optional['RequestObject']                              => String,
+    Optional['ProviderMetadataRefreshInterval']            => Integer,
+    Optional['InfoHook']                                   => Pattern[/^((iat|access_token|access_token_expires|id_token|id_token_hint|userinfo|refresh_token|exp|timeout|remote_user|session)\s?)+$/],
+    Optional['BlackListedClaims']                          => String,
+    Optional['WhiteListedClaims']                          => String,
+    Optional['RefreshAccessTokenBeforeExpiry']             => Pattern[/^[0-9]+(\s(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['XForwardedHeaders']                          => String,
+    Optional['CABundlePath']                               => String,
+    Optional['DefaultLoggedOutURL']                        => String,
+    Optional['DPoPMode']                                   => String,
+    Optional['FilterClaimsExpr']                           => String,
+    Optional['LogoutRequestParams']                        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['LogoutXFrameOptions']                        => String,
+    Optional['MetricsData']                                => String,
+    Optional['MetricsPublish']                             => String,
+    Optional['PassAccessToken']                            => Enum['On', 'Off'],
+    Optional['ProviderPushedAuthorizationRequestEndpoint'] => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
+    Optional['ProviderSignedJwksUri']                      => String,
+    Optional['ProviderVerifyCertFiles']                    => String,
+    Optional['RedirectURLsAllowed']                        => String,
+    Optional['StateCookiePrefix']                          => String,
+    Optional['StateInputHeaders']                          => Enum['user-agent', 'x-forwarded-for', 'both', 'none'],
+    Optional['TraceParent']                                => Enum['off', 'generate', 'propagate'],
+    Optional['UserInfoClaimsExpr']                         => String,
+    Optional['ValidateIssuer']                             => Enum['On', 'Off'],
   }
 ]

From 99ed356ba692f52aed16561d618f9a8bca31e66d Mon Sep 17 00:00:00 2001
From: uoe-pjackson <56168566+uoe-pjackson@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:39:28 +0100
Subject: [PATCH 2245/2267] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Romain Tartière <romain@blogreen.org>
---
 types/oidcsettings.pp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 8a14935282..0401336cf6 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -20,7 +20,7 @@
     Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['SSLValidateServer']                          => Enum['On', 'Off'],
-    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s?(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/],
     Optional['JWKSRefreshInterval']                        => Integer,
     Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
     Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],
@@ -58,7 +58,7 @@
     Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']           => String,
     Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
-    Optional['OAuthTokenIntrospectionInterval']            => Integer,
+    Optional['OAuthTokenIntrospectionInterval']            => Integer[-1],
     Optional['OAuthSSLValidateServer']                     => Enum['On', 'Off'],
     Optional['OAuthVerifySharedKeys']                      => String,
     Optional['OAuthVerifyCertFiles']                       => String,
@@ -74,7 +74,7 @@
     Optional['CookieSameSite']                             => Enum['On', 'Off'],
     Optional['PassCookies']                                => String,
     Optional['StripCookies']                               => String,
-    Optional['StateMaxNumberOfCookies']                    => Pattern[/^[0-9]+(\s?(false|true))?$/],
+    Optional['StateMaxNumberOfCookies']                    => Pattern[/^[0-9]+(\s(false|true))?$/],
     Optional['SessionInactivityTimeout']                   => Integer,
     Optional['SessionMaxDuration']                         => Integer,
     Optional['SessionType']                                => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent|:store_id_token|:persistent:store_id_token)?)$/],
@@ -92,7 +92,7 @@
     Optional['MemCacheConnectionsTTL']                     => Integer,
     Optional['RedisCacheServer']                           => String,
     Optional['RedisCachePassword']                         => String,
-    Optional['RedisCacheConnectTimeout']                   => Pattern[/^[0-9]+\s?[0-9]*$/],
+    Optional['RedisCacheConnectTimeout']                   => Pattern[/^[0-9]+(\s[0-9]+)?$/],
     Optional['RedisCacheDatabase']                         => Integer,
     Optional['RedisCacheTimeout']                          => Integer,
     Optional['RedisCacheUsername']                         => String,
@@ -114,8 +114,8 @@
     Optional['StateTimeout']                               => Integer,
     Optional['ScrubRequestHeaders']                        => Enum['On', 'Off'],
     Optional['OutgoingProxy']                              => String,
-    Optional['UnAuthAction']                               => Pattern[/^(auth|pass|401|407|410)\s.*/],
-    Optional['UnAutzAction']                               => Pattern[/^(none|headers|environment|both)(\s+(latin1|base64url|none)+)?$/],
+    Optional['UnAuthAction']                               => Pattern[/^(auth|pass|401|407|410)(\s.*)?$/],
+    Optional['UnAutzAction']                               => Pattern[/^(401|403|302|auth)(\s.*)?$/],
     Optional['PreservePost']                               => Enum['On', 'Off'],
     Optional['PreservePostTemplates']                      => String,
     Optional['PassRefreshToken']                           => Enum['On', 'Off'],
@@ -130,12 +130,12 @@
     Optional['DefaultLoggedOutURL']                        => String,
     Optional['DPoPMode']                                   => String,
     Optional['FilterClaimsExpr']                           => String,
-    Optional['LogoutRequestParams']                        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
+    Optional['LogoutRequestParams']                        => Pattern[/^[^=]+=[^&]+(&[^=]+=[^&]+)*$/],
     Optional['LogoutXFrameOptions']                        => String,
     Optional['MetricsData']                                => String,
     Optional['MetricsPublish']                             => String,
     Optional['PassAccessToken']                            => Enum['On', 'Off'],
-    Optional['ProviderPushedAuthorizationRequestEndpoint'] => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
+    Optional['ProviderPushedAuthorizationRequestEndpoint'] => Stdlib::HttpUrl,
     Optional['ProviderSignedJwksUri']                      => String,
     Optional['ProviderVerifyCertFiles']                    => String,
     Optional['RedirectURLsAllowed']                        => String,

From bea6661ba08220d38d352d49f493b20d2b736006 Mon Sep 17 00:00:00 2001
From: Peter Jackson <Peter.Jackson@ed.ac.uk>
Date: Mon, 23 Sep 2024 16:53:34 +0100
Subject: [PATCH 2246/2267] Update data types based on feedback from PR #2569

---
 REFERENCE.md          | 182 +++++++++++++++++++++---------------------
 types/oidcsettings.pp | 166 +++++++++++++++++++-------------------
 2 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 5b43bcb8e3..5fc4e70967 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -11307,10 +11307,10 @@ Alias of
 ```puppet
 Struct[{
     Optional['RedirectURI']                                => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
-    Optional['CryptoPassphrase']                           => String,
-    Optional['MetadataDir']                                => String,
+    Optional['CryptoPassphrase']                           => String[1],
+    Optional['MetadataDir']                                => String[1],
     Optional['ProviderMetadataURL']                        => Stdlib::HTTPSUrl,
-    Optional['ProviderIssuer']                             => String,
+    Optional['ProviderIssuer']                             => String[1],
     Optional['ProviderAuthorizationEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderJwksUri']                            => Stdlib::HTTPSUrl,
     Optional['ProviderTokenEndpoint']                      => Stdlib::HTTPSUrl,
@@ -11320,26 +11320,26 @@ Struct[{
     Optional['ProviderCheckSessionIFrame']                 => Stdlib::HTTPSUrl,
     Optional['ProviderEndSessionEndpoint']                 => Stdlib::HTTPSUrl,
     Optional['ProviderRevocationEndpoint']                 => Stdlib::HTTPSUrl,
-    Optional['ProviderBackChannelLogoutSupported']         => Enum['On', 'Off'],
-    Optional['ProviderRegistrationEndpointJson']           => String,
+    Optional['ProviderBackChannelLogoutSupported']         => Apache::OnOff,
+    Optional['ProviderRegistrationEndpointJson']           => String[1],
     Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['SSLValidateServer']                          => Enum['On', 'Off'],
-    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s?(logout_on_error|authenticate_on_error|502_on_error))?$/],
-    Optional['JWKSRefreshInterval']                        => Integer,
+    Optional['SSLValidateServer']                          => Apache::OnOff ,
+    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['JWKSRefreshInterval']                        => Integer[-1],
     Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
     Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],
-    Optional['PublicKeyFiles']                             => String,
-    Optional['PrivateKeyFiles']                            => String,
+    Optional['PublicKeyFiles']                             => String[1],
+    Optional['PrivateKeyFiles']                            => String[1],
     Optional['ResponseType']                               => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
     Optional['ResponseMode']                               => Enum['fragment', 'query', 'form_post'],
-    Optional['ClientID']                                   => String,
-    Optional['ClientSecret']                               => String,
-    Optional['ClientTokenEndpointCert']                    => String,
-    Optional['ClientTokenEndpointKey']                     => String,
-    Optional['ClientTokenEndpointKeyPassword']             => String,
-    Optional['ClientName']                                 => String,
-    Optional['ClientContact']                              => String,
+    Optional['ClientID']                                   => String[1],
+    Optional['ClientSecret']                               => String[1],
+    Optional['ClientTokenEndpointCert']                    => String[1],
+    Optional['ClientTokenEndpointKey']                     => String[1],
+    Optional['ClientTokenEndpointKeyPassword']             => String[1],
+    Optional['ClientName']                                 => String[1],
+    Optional['ClientContact']                              => String[1],
     Optional['PKCEMethod']                                 => Enum['plain', 'S256', 'referred_tb', 'none'],
     Optional['TokenBindingPolicy']                         => Enum['disabled', 'optional', 'required', 'enforced'],
     Optional['ClientJwksUri']                              => Stdlib::HTTPSUrl,
@@ -11351,104 +11351,104 @@ Struct[{
     Optional['UserInfoEncryptedResponseEnc']               => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
     Optional['OAuthServerMetadataURL']                     => Stdlib::HTTPSUrl,
     Optional['AuthIntrospectionEndpoint']                  => Stdlib::HTTPSUrl,
-    Optional['OAuthClientID']                              => String,
-    Optional['OAuthClientSecret']                          => String,
-    Optional['OAuthIntrospectionEndpoint']                 => String,
+    Optional['OAuthClientID']                              => String[1],
+    Optional['OAuthClientSecret']                          => String[1],
+    Optional['OAuthIntrospectionEndpoint']                 => String[1],
     Optional['OAuthIntrospectionEndpointAuth']             => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
-    Optional['OAuthIntrospectionClientAuthBearerToken']    => String,
-    Optional['OAuthIntrospectionEndpointCert']             => String,
-    Optional['OAuthIntrospectionEndpointKey']              => String,
-    Optional['OAuthIntrospectionEndpointKeyPassword']      => String,
+    Optional['OAuthIntrospectionClientAuthBearerToken']    => String[1],
+    Optional['OAuthIntrospectionEndpointCert']             => String[1],
+    Optional['OAuthIntrospectionEndpointKey']              => String[1],
+    Optional['OAuthIntrospectionEndpointKeyPassword']      => String[1],
     Optional['OAuthIntrospectionEndpointMethod']           => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['OAuthIntrospectionTokenParamName']           => String,
+    Optional['OAuthIntrospectionTokenParamName']           => String[1],
     Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
-    Optional['OAuthTokenIntrospectionInterval']            => Integer,
-    Optional['OAuthSSLValidateServer']                     => Enum['On', 'Off'],
-    Optional['OAuthVerifySharedKeys']                      => String,
-    Optional['OAuthVerifyCertFiles']                       => String,
+    Optional['OAuthTokenIntrospectionInterval']            => Integer[-1],
+    Optional['OAuthSSLValidateServer']                     => Apache::OnOff,
+    Optional['OAuthVerifySharedKeys']                      => String[1],
+    Optional['OAuthVerifyCertFiles']                       => String[1],
     Optional['OAuthVerifyJwksUri']                         => Stdlib::HTTPSUrl,
-    Optional['OAuthRemoteUserClaim']                       => String,
+    Optional['OAuthRemoteUserClaim']                       => String[1],
     Optional['OAuthAcceptTokenAs']                         => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
     Optional['OAuthAccessTokenBindingPolicy']              => Enum['disabled', 'optional', 'required', 'enforced'],
-    Optional['Cookie']                                     => String,
-    Optional['CookieDomain']                               => String,
-    Optional['CookiePath']                                 => String,
-    Optional['SessionCookieChunkSize']                     => Integer,
-    Optional['CookieHTTPOnly']                             => Enum['On', 'Off'],
-    Optional['CookieSameSite']                             => Enum['On', 'Off'],
-    Optional['PassCookies']                                => String,
-    Optional['StripCookies']                               => String,
-    Optional['StateMaxNumberOfCookies']                    => Pattern[/^[0-9]+(\s?(false|true))?$/],
-    Optional['SessionInactivityTimeout']                   => Integer,
-    Optional['SessionMaxDuration']                         => Integer,
+    Optional['Cookie']                                     => String[1],
+    Optional['CookieDomain']                               => String[1],
+    Optional['CookiePath']                                 => String[1],
+    Optional['SessionCookieChunkSize']                     => Intege[-1],
+    Optional['CookieHTTPOnly']                             => Apache::OnOff,
+    Optional['CookieSameSite']                             => Apache::OnOff,
+    Optional['PassCookies']                                => String[1],
+    Optional['StripCookies']                               => String[1],
+    Optional['StateMaxNumberOfCookies']                    => Pattern[/^[0-9]+(\s(false|true))?$/],
+    Optional['SessionInactivityTimeout']                   => Integer[-1],
+    Optional['SessionMaxDuration']                         => Integer[-1],
     Optional['SessionType']                                => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent|:store_id_token|:persistent:store_id_token)?)$/],
-    Optional['SessionCacheFallbackToCookie']               => Enum['On', 'Off'],
+    Optional['SessionCacheFallbackToCookie']               => Apache::OnOff,
     Optional['CacheType']                                  => Enum['shm', 'memcache', 'file', 'redis'],
-    Optional['CacheDir']                                   => String,
-    Optional['CacheEncrypt']                               => Enum['On', 'Off'],
-    Optional['CacheShmMax']                                => Integer,
-    Optional['CacheShmEntrySizeMax']                       => Integer,
-    Optional['CacheFileCleanInterval']                     => Integer,
-    Optional['MemCacheServers']                            => String,
-    Optional['MemCacheConnectionsHMax']                    => Integer,
-    Optional['MemCacheConnectionsMin']                     => Integer,
-    Optional['MemCacheConnectionsSMax']                    => Integer,
-    Optional['MemCacheConnectionsTTL']                     => Integer,
-    Optional['RedisCacheServer']                           => String,
+    Optional['CacheDir']                                   => String[1],
+    Optional['CacheEncrypt']                               => Apache::OnOff,
+    Optional['CacheShmMax']                                => Integer[-1],
+    Optional['CacheShmEntrySizeMax']                       => Integer[-1],
+    Optional['CacheFileCleanInterval']                     => Integer[-1],
+    Optional['MemCacheServers']                            => String[1],
+    Optional['MemCacheConnectionsHMax']                    => Integer[-1],
+    Optional['MemCacheConnectionsMin']                     => Integer[-1],
+    Optional['MemCacheConnectionsSMax']                    => Integer[-1],
+    Optional['MemCacheConnectionsTTL']                     => Integer[-1],
+    Optional['RedisCacheServer']                           => String[1],
     Optional['RedisCachePassword']                         => String,
-    Optional['RedisCacheConnectTimeout']                   => Pattern[/^[0-9]+\s?[0-9]*$/],
-    Optional['RedisCacheDatabase']                         => Integer,
-    Optional['RedisCacheTimeout']                          => Integer,
-    Optional['RedisCacheUsername']                         => String,
+    Optional['RedisCacheConnectTimeout']                   => Pattern[/^[0-9]+(\s[0-9]+)?$/],
+    Optional['RedisCacheDatabase']                         => Integer[-1],
+    Optional['RedisCacheTimeout']                          => Integer[-1],
+    Optional['RedisCacheUsername']                         => String[1],
     Optional['DiscoverURL']                                => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
-    Optional['HTMLErrorTemplate']                          => String,
+    Optional['HTMLErrorTemplate']                          => String[1],
     Optional['DefaultURL']                                 => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
     Optional['PathScope']                                  => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['PathAuthRequestParams']                      => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['IDTokenIatSlack']                            => Integer,
+    Optional['IDTokenIatSlack']                            => Integer[-1],
     Optional['ClaimPrefix']                                => String,
     Optional['ClaimDelimiter']                             => Pattern[/^.$/],
-    Optional['RemoteUserClaim']                            => String,
+    Optional['RemoteUserClaim']                            => String[1],
     Optional['PassIDTokenAs']                              => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                             => Pattern[/^((claims|json(:([A-Za-z0-9\-\._])+)?|(signed_)?jwt(:([A-Za-z0-9\-\._])+)?)\s?)+$/],
     Optional['PassClaimsAs']                               => Enum['none', 'headers', 'environment', 'both'],
-    Optional['AuthNHeader']                                => String,
-    Optional['HTTPTimeoutLong']                            => Integer,
-    Optional['HTTPTimeoutShort']                           => Integer,
-    Optional['StateTimeout']                               => Integer,
-    Optional['ScrubRequestHeaders']                        => Enum['On', 'Off'],
-    Optional['OutgoingProxy']                              => String,
-    Optional['UnAuthAction']                               => Pattern[/^(auth|pass|401|407|410)\s.*/],
-    Optional['UnAutzAction']                               => Pattern[/^(none|headers|environment|both)(\s+(latin1|base64url|none)+)?$/],
-    Optional['PreservePost']                               => Enum['On', 'Off'],
-    Optional['PreservePostTemplates']                      => String,
-    Optional['PassRefreshToken']                           => Enum['On', 'Off'],
-    Optional['RequestObject']                              => String,
-    Optional['ProviderMetadataRefreshInterval']            => Integer,
+    Optional['AuthNHeader']                                => String[1],
+    Optional['HTTPTimeoutLong']                            => Integer[-1],
+    Optional['HTTPTimeoutShort']                           => Integer[-1],
+    Optional['StateTimeout']                               => Integer[-1],
+    Optional['ScrubRequestHeaders']                        => Apache::OnOff,
+    Optional['OutgoingProxy']                              => String[1],
+    Optional['UnAuthAction']                               => Pattern[/^(auth|pass|401|407|410)(\s.*)?$/],
+    Optional['UnAutzAction']                               => Pattern[/^(401|403|302|auth)(\s.*)?$/],
+    Optional['PreservePost']                               => Apache::OnOff,
+    Optional['PreservePostTemplates']                      => String[1],
+    Optional['PassRefreshToken']                           => Apache::OnOff,
+    Optional['RequestObject']                              => String[1],
+    Optional['ProviderMetadataRefreshInterval']            => Integer[-1],
     Optional['InfoHook']                                   => Pattern[/^((iat|access_token|access_token_expires|id_token|id_token_hint|userinfo|refresh_token|exp|timeout|remote_user|session)\s?)+$/],
-    Optional['BlackListedClaims']                          => String,
-    Optional['WhiteListedClaims']                          => String,
+    Optional['BlackListedClaims']                          => String[1],
+    Optional['WhiteListedClaims']                          => String[1],
     Optional['RefreshAccessTokenBeforeExpiry']             => Pattern[/^[0-9]+(\s(logout_on_error|authenticate_on_error|502_on_error))?$/],
-    Optional['XForwardedHeaders']                          => String,
-    Optional['CABundlePath']                               => String,
-    Optional['DefaultLoggedOutURL']                        => String,
-    Optional['DPoPMode']                                   => String,
-    Optional['FilterClaimsExpr']                           => String,
-    Optional['LogoutRequestParams']                        => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['LogoutXFrameOptions']                        => String,
-    Optional['MetricsData']                                => String,
-    Optional['MetricsPublish']                             => String,
-    Optional['PassAccessToken']                            => Enum['On', 'Off'],
-    Optional['ProviderPushedAuthorizationRequestEndpoint'] => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
-    Optional['ProviderSignedJwksUri']                      => String,
-    Optional['ProviderVerifyCertFiles']                    => String,
-    Optional['RedirectURLsAllowed']                        => String,
+    Optional['XForwardedHeaders']                          => String[1],
+    Optional['CABundlePath']                               => String[1],
+    Optional['DefaultLoggedOutURL']                        => String[1],
+    Optional['DPoPMode']                                   => String[1],
+    Optional['FilterClaimsExpr']                           => String[1],
+    Optional['LogoutRequestParams']                        => Pattern[/^[^=]+=[^&]+(&[^=]+=[^&]+)*$/],
+    Optional['LogoutXFrameOptions']                        => String[1],
+    Optional['MetricsData']                                => String[1],
+    Optional['MetricsPublish']                             => String[1],
+    Optional['PassAccessToken']                            => Apache::OnOff,
+    Optional['ProviderPushedAuthorizationRequestEndpoint'] => Stdlib::HttpUrl,
+    Optional['ProviderSignedJwksUri']                      => String[1],
+    Optional['ProviderVerifyCertFiles']                    => String[1],
+    Optional['RedirectURLsAllowed']                        => String[1],
     Optional['StateCookiePrefix']                          => String,
     Optional['StateInputHeaders']                          => Enum['user-agent', 'x-forwarded-for', 'both', 'none'],
     Optional['TraceParent']                                => Enum['off', 'generate', 'propagate'],
-    Optional['UserInfoClaimsExpr']                         => String,
-    Optional['ValidateIssuer']                             => Enum['On', 'Off'],
+    Optional['UserInfoClaimsExpr']                         => String[1],
+    Optional['ValidateIssuer']                             => Apache::OnOff,
   }]
 ```
 
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 0401336cf6..8173831654 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -2,10 +2,10 @@
 type Apache::OIDCSettings = Struct[
   {
     Optional['RedirectURI']                                => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl, Pattern[/^\/[A-Za-z0-9\-\._%\/]*$/]],
-    Optional['CryptoPassphrase']                           => String,
-    Optional['MetadataDir']                                => String,
+    Optional['CryptoPassphrase']                           => String[1],
+    Optional['MetadataDir']                                => String[1],
     Optional['ProviderMetadataURL']                        => Stdlib::HTTPSUrl,
-    Optional['ProviderIssuer']                             => String,
+    Optional['ProviderIssuer']                             => String[1],
     Optional['ProviderAuthorizationEndpoint']              => Stdlib::HTTPSUrl,
     Optional['ProviderJwksUri']                            => Stdlib::HTTPSUrl,
     Optional['ProviderTokenEndpoint']                      => Stdlib::HTTPSUrl,
@@ -15,26 +15,26 @@
     Optional['ProviderCheckSessionIFrame']                 => Stdlib::HTTPSUrl,
     Optional['ProviderEndSessionEndpoint']                 => Stdlib::HTTPSUrl,
     Optional['ProviderRevocationEndpoint']                 => Stdlib::HTTPSUrl,
-    Optional['ProviderBackChannelLogoutSupported']         => Enum['On', 'Off'],
-    Optional['ProviderRegistrationEndpointJson']           => String,
+    Optional['ProviderBackChannelLogoutSupported']         => Apache::OnOff,
+    Optional['ProviderRegistrationEndpointJson']           => String[1],
     Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['SSLValidateServer']                          => Enum['On', 'Off'],
+    Optional['SSLValidateServer']                          => Apache::OnOff ,
     Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/],
-    Optional['JWKSRefreshInterval']                        => Integer,
+    Optional['JWKSRefreshInterval']                        => Integer[-1],
     Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
     Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],
-    Optional['PublicKeyFiles']                             => String,
-    Optional['PrivateKeyFiles']                            => String,
+    Optional['PublicKeyFiles']                             => String[1],
+    Optional['PrivateKeyFiles']                            => String[1],
     Optional['ResponseType']                               => Enum['code', 'id_token', 'id_token token', 'code id_token', 'code token', 'code id_token token'],
     Optional['ResponseMode']                               => Enum['fragment', 'query', 'form_post'],
-    Optional['ClientID']                                   => String,
-    Optional['ClientSecret']                               => String,
-    Optional['ClientTokenEndpointCert']                    => String,
-    Optional['ClientTokenEndpointKey']                     => String,
-    Optional['ClientTokenEndpointKeyPassword']             => String,
-    Optional['ClientName']                                 => String,
-    Optional['ClientContact']                              => String,
+    Optional['ClientID']                                   => String[1],
+    Optional['ClientSecret']                               => String[1],
+    Optional['ClientTokenEndpointCert']                    => String[1],
+    Optional['ClientTokenEndpointKey']                     => String[1],
+    Optional['ClientTokenEndpointKeyPassword']             => String[1],
+    Optional['ClientName']                                 => String[1],
+    Optional['ClientContact']                              => String[1],
     Optional['PKCEMethod']                                 => Enum['plain', 'S256', 'referred_tb', 'none'],
     Optional['TokenBindingPolicy']                         => Enum['disabled', 'optional', 'required', 'enforced'],
     Optional['ClientJwksUri']                              => Stdlib::HTTPSUrl,
@@ -46,103 +46,103 @@
     Optional['UserInfoEncryptedResponseEnc']               => Enum['A128CBC-HS256', 'A256CBC-HS512', 'A256GCM'],
     Optional['OAuthServerMetadataURL']                     => Stdlib::HTTPSUrl,
     Optional['AuthIntrospectionEndpoint']                  => Stdlib::HTTPSUrl,
-    Optional['OAuthClientID']                              => String,
-    Optional['OAuthClientSecret']                          => String,
-    Optional['OAuthIntrospectionEndpoint']                 => String,
+    Optional['OAuthClientID']                              => String[1],
+    Optional['OAuthClientSecret']                          => String[1],
+    Optional['OAuthIntrospectionEndpoint']                 => String[1],
     Optional['OAuthIntrospectionEndpointAuth']             => Enum['client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'bearer_access_token', 'none'],
-    Optional['OAuthIntrospectionClientAuthBearerToken']    => String,
-    Optional['OAuthIntrospectionEndpointCert']             => String,
-    Optional['OAuthIntrospectionEndpointKey']              => String,
-    Optional['OAuthIntrospectionEndpointKeyPassword']      => String,
+    Optional['OAuthIntrospectionClientAuthBearerToken']    => String[1],
+    Optional['OAuthIntrospectionEndpointCert']             => String[1],
+    Optional['OAuthIntrospectionEndpointKey']              => String[1],
+    Optional['OAuthIntrospectionEndpointKeyPassword']      => String[1],
     Optional['OAuthIntrospectionEndpointMethod']           => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['OAuthIntrospectionTokenParamName']           => String,
+    Optional['OAuthIntrospectionTokenParamName']           => String[1],
     Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
     Optional['OAuthTokenIntrospectionInterval']            => Integer[-1],
-    Optional['OAuthSSLValidateServer']                     => Enum['On', 'Off'],
-    Optional['OAuthVerifySharedKeys']                      => String,
-    Optional['OAuthVerifyCertFiles']                       => String,
+    Optional['OAuthSSLValidateServer']                     => Apache::OnOff,
+    Optional['OAuthVerifySharedKeys']                      => String[1],
+    Optional['OAuthVerifyCertFiles']                       => String[1],
     Optional['OAuthVerifyJwksUri']                         => Stdlib::HTTPSUrl,
-    Optional['OAuthRemoteUserClaim']                       => String,
+    Optional['OAuthRemoteUserClaim']                       => String[1],
     Optional['OAuthAcceptTokenAs']                         => Pattern[/^((header|post|query|cookie\:[A-Za-z0-9\-\._]+|basic)\s?)+$/],
     Optional['OAuthAccessTokenBindingPolicy']              => Enum['disabled', 'optional', 'required', 'enforced'],
-    Optional['Cookie']                                     => String,
-    Optional['CookieDomain']                               => String,
-    Optional['CookiePath']                                 => String,
-    Optional['SessionCookieChunkSize']                     => Integer,
-    Optional['CookieHTTPOnly']                             => Enum['On', 'Off'],
-    Optional['CookieSameSite']                             => Enum['On', 'Off'],
-    Optional['PassCookies']                                => String,
-    Optional['StripCookies']                               => String,
+    Optional['Cookie']                                     => String[1],
+    Optional['CookieDomain']                               => String[1],
+    Optional['CookiePath']                                 => String[1],
+    Optional['SessionCookieChunkSize']                     => Intege[-1],
+    Optional['CookieHTTPOnly']                             => Apache::OnOff,
+    Optional['CookieSameSite']                             => Apache::OnOff,
+    Optional['PassCookies']                                => String[1],
+    Optional['StripCookies']                               => String[1],
     Optional['StateMaxNumberOfCookies']                    => Pattern[/^[0-9]+(\s(false|true))?$/],
-    Optional['SessionInactivityTimeout']                   => Integer,
-    Optional['SessionMaxDuration']                         => Integer,
+    Optional['SessionInactivityTimeout']                   => Integer[-1],
+    Optional['SessionMaxDuration']                         => Integer[-1],
     Optional['SessionType']                                => Pattern[/^(server-cache(:persistent)?|client-cookie(:persistent|:store_id_token|:persistent:store_id_token)?)$/],
-    Optional['SessionCacheFallbackToCookie']               => Enum['On', 'Off'],
+    Optional['SessionCacheFallbackToCookie']               => Apache::OnOff,
     Optional['CacheType']                                  => Enum['shm', 'memcache', 'file', 'redis'],
-    Optional['CacheDir']                                   => String,
-    Optional['CacheEncrypt']                               => Enum['On', 'Off'],
-    Optional['CacheShmMax']                                => Integer,
-    Optional['CacheShmEntrySizeMax']                       => Integer,
-    Optional['CacheFileCleanInterval']                     => Integer,
-    Optional['MemCacheServers']                            => String,
-    Optional['MemCacheConnectionsHMax']                    => Integer,
-    Optional['MemCacheConnectionsMin']                     => Integer,
-    Optional['MemCacheConnectionsSMax']                    => Integer,
-    Optional['MemCacheConnectionsTTL']                     => Integer,
-    Optional['RedisCacheServer']                           => String,
+    Optional['CacheDir']                                   => String[1],
+    Optional['CacheEncrypt']                               => Apache::OnOff,
+    Optional['CacheShmMax']                                => Integer[-1],
+    Optional['CacheShmEntrySizeMax']                       => Integer[-1],
+    Optional['CacheFileCleanInterval']                     => Integer[-1],
+    Optional['MemCacheServers']                            => String[1],
+    Optional['MemCacheConnectionsHMax']                    => Integer[-1],
+    Optional['MemCacheConnectionsMin']                     => Integer[-1],
+    Optional['MemCacheConnectionsSMax']                    => Integer[-1],
+    Optional['MemCacheConnectionsTTL']                     => Integer[-1],
+    Optional['RedisCacheServer']                           => String[1],
     Optional['RedisCachePassword']                         => String,
     Optional['RedisCacheConnectTimeout']                   => Pattern[/^[0-9]+(\s[0-9]+)?$/],
-    Optional['RedisCacheDatabase']                         => Integer,
-    Optional['RedisCacheTimeout']                          => Integer,
-    Optional['RedisCacheUsername']                         => String,
+    Optional['RedisCacheDatabase']                         => Integer[-1],
+    Optional['RedisCacheTimeout']                          => Integer[-1],
+    Optional['RedisCacheUsername']                         => String[1],
     Optional['DiscoverURL']                                => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
-    Optional['HTMLErrorTemplate']                          => String,
+    Optional['HTMLErrorTemplate']                          => String[1],
     Optional['DefaultURL']                                 => Variant[Stdlib::HTTPSUrl, Stdlib::HttpUrl],
     Optional['PathScope']                                  => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['PathAuthRequestParams']                      => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
-    Optional['IDTokenIatSlack']                            => Integer,
+    Optional['IDTokenIatSlack']                            => Integer[-1],
     Optional['ClaimPrefix']                                => String,
     Optional['ClaimDelimiter']                             => Pattern[/^.$/],
-    Optional['RemoteUserClaim']                            => String,
+    Optional['RemoteUserClaim']                            => String[1],
     Optional['PassIDTokenAs']                              => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                             => Pattern[/^((claims|json(:([A-Za-z0-9\-\._])+)?|(signed_)?jwt(:([A-Za-z0-9\-\._])+)?)\s?)+$/],
     Optional['PassClaimsAs']                               => Enum['none', 'headers', 'environment', 'both'],
-    Optional['AuthNHeader']                                => String,
-    Optional['HTTPTimeoutLong']                            => Integer,
-    Optional['HTTPTimeoutShort']                           => Integer,
-    Optional['StateTimeout']                               => Integer,
-    Optional['ScrubRequestHeaders']                        => Enum['On', 'Off'],
-    Optional['OutgoingProxy']                              => String,
+    Optional['AuthNHeader']                                => String[1],
+    Optional['HTTPTimeoutLong']                            => Integer[-1],
+    Optional['HTTPTimeoutShort']                           => Integer[-1],
+    Optional['StateTimeout']                               => Integer[-1],
+    Optional['ScrubRequestHeaders']                        => Apache::OnOff,
+    Optional['OutgoingProxy']                              => String[1],
     Optional['UnAuthAction']                               => Pattern[/^(auth|pass|401|407|410)(\s.*)?$/],
     Optional['UnAutzAction']                               => Pattern[/^(401|403|302|auth)(\s.*)?$/],
-    Optional['PreservePost']                               => Enum['On', 'Off'],
-    Optional['PreservePostTemplates']                      => String,
-    Optional['PassRefreshToken']                           => Enum['On', 'Off'],
-    Optional['RequestObject']                              => String,
-    Optional['ProviderMetadataRefreshInterval']            => Integer,
+    Optional['PreservePost']                               => Apache::OnOff,
+    Optional['PreservePostTemplates']                      => String[1],
+    Optional['PassRefreshToken']                           => Apache::OnOff,
+    Optional['RequestObject']                              => String[1],
+    Optional['ProviderMetadataRefreshInterval']            => Integer[-1],
     Optional['InfoHook']                                   => Pattern[/^((iat|access_token|access_token_expires|id_token|id_token_hint|userinfo|refresh_token|exp|timeout|remote_user|session)\s?)+$/],
-    Optional['BlackListedClaims']                          => String,
-    Optional['WhiteListedClaims']                          => String,
+    Optional['BlackListedClaims']                          => String[1],
+    Optional['WhiteListedClaims']                          => String[1],
     Optional['RefreshAccessTokenBeforeExpiry']             => Pattern[/^[0-9]+(\s(logout_on_error|authenticate_on_error|502_on_error))?$/],
-    Optional['XForwardedHeaders']                          => String,
-    Optional['CABundlePath']                               => String,
-    Optional['DefaultLoggedOutURL']                        => String,
-    Optional['DPoPMode']                                   => String,
-    Optional['FilterClaimsExpr']                           => String,
+    Optional['XForwardedHeaders']                          => String[1],
+    Optional['CABundlePath']                               => String[1],
+    Optional['DefaultLoggedOutURL']                        => String[1],
+    Optional['DPoPMode']                                   => String[1],
+    Optional['FilterClaimsExpr']                           => String[1],
     Optional['LogoutRequestParams']                        => Pattern[/^[^=]+=[^&]+(&[^=]+=[^&]+)*$/],
-    Optional['LogoutXFrameOptions']                        => String,
-    Optional['MetricsData']                                => String,
-    Optional['MetricsPublish']                             => String,
-    Optional['PassAccessToken']                            => Enum['On', 'Off'],
+    Optional['LogoutXFrameOptions']                        => String[1],
+    Optional['MetricsData']                                => String[1],
+    Optional['MetricsPublish']                             => String[1],
+    Optional['PassAccessToken']                            => Apache::OnOff,
     Optional['ProviderPushedAuthorizationRequestEndpoint'] => Stdlib::HttpUrl,
-    Optional['ProviderSignedJwksUri']                      => String,
-    Optional['ProviderVerifyCertFiles']                    => String,
-    Optional['RedirectURLsAllowed']                        => String,
+    Optional['ProviderSignedJwksUri']                      => String[1],
+    Optional['ProviderVerifyCertFiles']                    => String[1],
+    Optional['RedirectURLsAllowed']                        => String[1],
     Optional['StateCookiePrefix']                          => String,
     Optional['StateInputHeaders']                          => Enum['user-agent', 'x-forwarded-for', 'both', 'none'],
     Optional['TraceParent']                                => Enum['off', 'generate', 'propagate'],
-    Optional['UserInfoClaimsExpr']                         => String,
-    Optional['ValidateIssuer']                             => Enum['On', 'Off'],
+    Optional['UserInfoClaimsExpr']                         => String[1],
+    Optional['ValidateIssuer']                             => Apache::OnOff,
   }
 ]

From 0fb9d6fb5363a5a2f6afc1a9a4c19eb6d7f1cf2a Mon Sep 17 00:00:00 2001
From: Peter Jackson <Peter.Jackson@ed.ac.uk>
Date: Tue, 24 Sep 2024 10:24:53 +0100
Subject: [PATCH 2247/2267] Update remaining datatypes from review feedback.

---
 REFERENCE.md          | 4 ++--
 types/oidcsettings.pp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 5fc4e70967..93efdbbd42 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -11362,7 +11362,7 @@ Struct[{
     Optional['OAuthIntrospectionEndpointMethod']           => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']           => String[1],
-    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
+    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+(\s(absolute|relative))?(\s(mandatory|optional))?$/],
     Optional['OAuthTokenIntrospectionInterval']            => Integer[-1],
     Optional['OAuthSSLValidateServer']                     => Apache::OnOff,
     Optional['OAuthVerifySharedKeys']                      => String[1],
@@ -11412,7 +11412,7 @@ Struct[{
     Optional['RemoteUserClaim']                            => String[1],
     Optional['PassIDTokenAs']                              => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                             => Pattern[/^((claims|json(:([A-Za-z0-9\-\._])+)?|(signed_)?jwt(:([A-Za-z0-9\-\._])+)?)\s?)+$/],
-    Optional['PassClaimsAs']                               => Enum['none', 'headers', 'environment', 'both'],
+    Optional['PassClaimsAs']                               => Pattern[/^(none|headers|environment|both)?\s?(latin1|base64url|none)?$/],
     Optional['AuthNHeader']                                => String[1],
     Optional['HTTPTimeoutLong']                            => Integer[-1],
     Optional['HTTPTimeoutShort']                           => Integer[-1],
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 8173831654..4ff28ddf5c 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -57,7 +57,7 @@
     Optional['OAuthIntrospectionEndpointMethod']           => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']           => String[1],
-    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
+    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+(\s(absolute|relative))?(\s(mandatory|optional))?$/],
     Optional['OAuthTokenIntrospectionInterval']            => Integer[-1],
     Optional['OAuthSSLValidateServer']                     => Apache::OnOff,
     Optional['OAuthVerifySharedKeys']                      => String[1],
@@ -107,7 +107,7 @@
     Optional['RemoteUserClaim']                            => String[1],
     Optional['PassIDTokenAs']                              => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                             => Pattern[/^((claims|json(:([A-Za-z0-9\-\._])+)?|(signed_)?jwt(:([A-Za-z0-9\-\._])+)?)\s?)+$/],
-    Optional['PassClaimsAs']                               => Enum['none', 'headers', 'environment', 'both'],
+    Optional['PassClaimsAs']                               => Pattern[/^(none|headers|environment|both)?\s?(latin1|base64url|none)?$/],
     Optional['AuthNHeader']                                => String[1],
     Optional['HTTPTimeoutLong']                            => Integer[-1],
     Optional['HTTPTimeoutShort']                           => Integer[-1],

From 9778de4873f888ad50c88eddf532ae99845ee426 Mon Sep 17 00:00:00 2001
From: Peter Jackson <Peter.Jackson@ed.ac.uk>
Date: Wed, 2 Oct 2024 15:46:59 +0100
Subject: [PATCH 2248/2267] Fix yet another typo!

---
 REFERENCE.md          | 2 +-
 types/oidcsettings.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 93efdbbd42..78eea6bfc5 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -11374,7 +11374,7 @@ Struct[{
     Optional['Cookie']                                     => String[1],
     Optional['CookieDomain']                               => String[1],
     Optional['CookiePath']                                 => String[1],
-    Optional['SessionCookieChunkSize']                     => Intege[-1],
+    Optional['SessionCookieChunkSize']                     => Integer[-1],
     Optional['CookieHTTPOnly']                             => Apache::OnOff,
     Optional['CookieSameSite']                             => Apache::OnOff,
     Optional['PassCookies']                                => String[1],
diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index 4ff28ddf5c..a4e53fa43e 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -69,7 +69,7 @@
     Optional['Cookie']                                     => String[1],
     Optional['CookieDomain']                               => String[1],
     Optional['CookiePath']                                 => String[1],
-    Optional['SessionCookieChunkSize']                     => Intege[-1],
+    Optional['SessionCookieChunkSize']                     => Integer[-1],
     Optional['CookieHTTPOnly']                             => Apache::OnOff,
     Optional['CookieSameSite']                             => Apache::OnOff,
     Optional['PassCookies']                                => String[1],

From 9119d89dffa8d5e4a6b41f39822966540b0f637f Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Wed, 23 Oct 2024 11:09:49 +0000
Subject: [PATCH 2249/2267] Release prep v12.2.0

---
 CHANGELOG.md  |  32 ++++++++++-
 REFERENCE.md  | 154 +++++++++++++++++++++++++++++++++++++++++++++++++-
 metadata.json |   2 +-
 3 files changed, 181 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e761dd2c97..2012b2ba4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v12.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.2.0) - 2024-10-23
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.1.0...v12.2.0)
+
+### Added
+
+- Update config parameters to match latest OIDC release and fix typos. … [#2569](https://github.com/puppetlabs/puppetlabs-apache/pull/2569) ([uoe-pjackson](https://github.com/uoe-pjackson))
+- add XForwardedHeaders for oidc_settings [#2541](https://github.com/puppetlabs/puppetlabs-apache/pull/2541) ([trefzer](https://github.com/trefzer))
+- Added cache_disk [#2521](https://github.com/puppetlabs/puppetlabs-apache/pull/2521) ([dploeger](https://github.com/dploeger))
+
+### Fixed
+
+- Add missing brackets for function call [#2540](https://github.com/puppetlabs/puppetlabs-apache/pull/2540) ([gerlingsm](https://github.com/gerlingsm))
+
 ## [v12.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.1.0) - 2024-04-03
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.3...v12.1.0)
@@ -47,6 +61,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v11.1.0...v12.0.0)
 
 ### Changed
+
 - Drop EoL Debian 9 and older code [#2479](https://github.com/puppetlabs/puppetlabs-apache/pull/2479) ([bastelfreak](https://github.com/bastelfreak))
 
 ### Added
@@ -75,6 +90,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v10.1.1...v11.0.0)
 
 ### Changed
+
 - (CAT-1449) - Remove deprecated parameters for scriptaliases & passenger [#2470](https://github.com/puppetlabs/puppetlabs-apache/pull/2470) ([Ramesh7](https://github.com/Ramesh7))
 - Remove deprecated classes [#2466](https://github.com/puppetlabs/puppetlabs-apache/pull/2466) ([ekohl](https://github.com/ekohl))
 - Remove deprecated parameters from mod::userdir [#2465](https://github.com/puppetlabs/puppetlabs-apache/pull/2465) ([ekohl](https://github.com/ekohl))
@@ -133,6 +149,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.3...v10.0.0)
 
 ### Changed
+
 - (CONT-772) Puppet 8 support / Drop Puppet 6 [#2405](https://github.com/puppetlabs/puppetlabs-apache/pull/2405) ([LukasAud](https://github.com/LukasAud))
 
 ## [v9.1.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.3) - 2023-04-20
@@ -192,6 +209,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.6.0...v9.0.0)
 
 ### Changed
+
 - (GH-2291) Further refine types [#2359](https://github.com/puppetlabs/puppetlabs-apache/pull/2359) ([david22swan](https://github.com/david22swan))
 - Drop deprecated a2mod type/providers [#2350](https://github.com/puppetlabs/puppetlabs-apache/pull/2350) ([bastelfreak](https://github.com/bastelfreak))
 - Drop Apache 2.2 support [#2329](https://github.com/puppetlabs/puppetlabs-apache/pull/2329) ([ekohl](https://github.com/ekohl))
@@ -299,6 +317,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v7.0.0...v8.0.0)
 
 ### Changed
+
 - Drop mod_fastcgi support [#2267](https://github.com/puppetlabs/puppetlabs-apache/pull/2267) ([ekohl](https://github.com/ekohl))
 - Drop suphp support [#2263](https://github.com/puppetlabs/puppetlabs-apache/pull/2263) ([ekohl](https://github.com/ekohl))
 - Use a stricter data type on apache::vhost::aliases [#2253](https://github.com/puppetlabs/puppetlabs-apache/pull/2253) ([ekohl](https://github.com/ekohl))
@@ -346,6 +365,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.5.1...v7.0.0)
 
 ### Changed
+
 - Drop Debian < 8 and Ubuntu < 14.04 code [#2189](https://github.com/puppetlabs/puppetlabs-apache/pull/2189) ([ekohl](https://github.com/ekohl))
 - Drop support and compatibility for Debian < 9 and Ubuntu < 16.04 [#2123](https://github.com/puppetlabs/puppetlabs-apache/pull/2123) ([ekohl](https://github.com/ekohl))
 
@@ -443,6 +463,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.10.0...v6.0.0)
 
 ### Changed
+
 - pdksync - (MAINT) Remove SLES 11 support [#2132](https://github.com/puppetlabs/puppetlabs-apache/pull/2132) ([sanfrancrisko](https://github.com/sanfrancrisko))
 - pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [#2125](https://github.com/puppetlabs/puppetlabs-apache/pull/2125) ([carabasdaniel](https://github.com/carabasdaniel))
 
@@ -622,6 +643,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.1.0...v5.0.0)
 
 ### Changed
+
 - pdksync - (MODULES-8444) - Raise lower Puppet bound [#1908](https://github.com/puppetlabs/puppetlabs-apache/pull/1908) ([david22swan](https://github.com/david22swan))
 
 ### Added
@@ -660,6 +682,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...4.0.0)
 
 ### Changed
+
 - default server_tokens to prod - more secure default [#1746](https://github.com/puppetlabs/puppetlabs-apache/pull/1746) ([juju4](https://github.com/juju4))
 
 ### Added
@@ -809,6 +832,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0)
 
 ### Changed
+
 - MODULES-4824: Update the version compatibility to >= 4.7.0 < 5.0.0 [#1628](https://github.com/puppetlabs/puppetlabs-apache/pull/1628) ([angrox](https://github.com/angrox))
 - Migrate to puppet4 datatypes [#1621](https://github.com/puppetlabs/puppetlabs-apache/pull/1621) ([bastelfreak](https://github.com/bastelfreak))
 - Set default keepalive to On [#1434](https://github.com/puppetlabs/puppetlabs-apache/pull/1434) ([sathieu](https://github.com/sathieu))
@@ -1086,7 +1110,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Added
 
 - Add support for changing mod_nss listen port (vol 2) [#1260](https://github.com/puppetlabs/puppetlabs-apache/pull/1260) ([rexcze-zz](https://github.com/rexcze-zz))
-- (MODULES-2811) Add missing helper lines to spec files [#1256](https://github.com/puppetlabs/puppetlabs-apache/pull/1256) ([alexharv074](https://github.com/alexharv074))
+- (MODULES-2811) Add missing helper lines to spec files [#1256](https://github.com/puppetlabs/puppetlabs-apache/pull/1256) ([alex-harvey-z3q](https://github.com/alex-harvey-z3q))
 - Add missing parameters in mod_auth_kerb [#1255](https://github.com/puppetlabs/puppetlabs-apache/pull/1255) ([olivierHa](https://github.com/olivierHa))
 - (MODULES-2764) Enclose IPv6 addresses in square brackets [#1248](https://github.com/puppetlabs/puppetlabs-apache/pull/1248) ([Benedikt1992](https://github.com/Benedikt1992))
 - (MODULES-2757) Adding if around ServerName in template [#1237](https://github.com/puppetlabs/puppetlabs-apache/pull/1237) ([damonconway](https://github.com/damonconway))
@@ -1118,8 +1142,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
-- (MODULES-2813) Fix deprecation warning in spec_helper.rb [#1258](https://github.com/puppetlabs/puppetlabs-apache/pull/1258) ([alexharv074](https://github.com/alexharv074))
-- (MODULES-2812) Fix deprecation warning in service_spec.rb [#1257](https://github.com/puppetlabs/puppetlabs-apache/pull/1257) ([alexharv074](https://github.com/alexharv074))
+- (MODULES-2813) Fix deprecation warning in spec_helper.rb [#1258](https://github.com/puppetlabs/puppetlabs-apache/pull/1258) ([alex-harvey-z3q](https://github.com/alex-harvey-z3q))
+- (MODULES-2812) Fix deprecation warning in service_spec.rb [#1257](https://github.com/puppetlabs/puppetlabs-apache/pull/1257) ([alex-harvey-z3q](https://github.com/alex-harvey-z3q))
 - Fix typo about dynamic AddHandler/AddType [#1254](https://github.com/puppetlabs/puppetlabs-apache/pull/1254) ([olivierHa](https://github.com/olivierHa))
 - reduce constraints on regex to fix pe tests [#1231](https://github.com/puppetlabs/puppetlabs-apache/pull/1231) ([tphoney](https://github.com/tphoney))
 - Fix ordering issue with conf_file and ports_file [#1230](https://github.com/puppetlabs/puppetlabs-apache/pull/1230) ([MasonM](https://github.com/MasonM))
@@ -1454,6 +1478,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.11.0...1.0.0)
 
 ### Changed
+
 - Metadata [#661](https://github.com/puppetlabs/puppetlabs-apache/pull/661) ([apenney](https://github.com/apenney))
 - Apache2.4 support [#552](https://github.com/puppetlabs/puppetlabs-apache/pull/552) ([scottasmith](https://github.com/scottasmith))
 
@@ -1667,6 +1692,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/0.6.0...0.7.0)
 
 ### Changed
+
 - Refactor module [#182](https://github.com/puppetlabs/puppetlabs-apache/pull/182) ([hunner](https://github.com/hunner))
 
 ### Added
diff --git a/REFERENCE.md b/REFERENCE.md
index 78eea6bfc5..63d0f907ee 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -29,6 +29,7 @@
 * [`apache::mod::authz_user`](#apache--mod--authz_user): Installs `mod_authz_user`
 * [`apache::mod::autoindex`](#apache--mod--autoindex): Installs `mod_autoindex`
 * [`apache::mod::cache`](#apache--mod--cache): Installs `mod_cache`
+* [`apache::mod::cache_disk`](#apache--mod--cache_disk): Installs and configures `mod_cache_disk`.
 * [`apache::mod::cgi`](#apache--mod--cgi): Installs `mod_cgi`.
 * [`apache::mod::cgid`](#apache--mod--cgid): Installs `mod_cgid`.
 * [`apache::mod::cluster`](#apache--mod--cluster): Installs `mod_cluster`.
@@ -1791,6 +1792,153 @@ Installs `mod_cache`
   * https://httpd.apache.org/docs/current/mod/mod_cache.html
     * for additional documentation.
 
+#### Parameters
+
+The following parameters are available in the `apache::mod::cache` class:
+
+* [`cache_ignore_headers`](#-apache--mod--cache--cache_ignore_headers)
+* [`cache_default_expire`](#-apache--mod--cache--cache_default_expire)
+* [`cache_max_expire`](#-apache--mod--cache--cache_max_expire)
+* [`cache_ignore_no_lastmod`](#-apache--mod--cache--cache_ignore_no_lastmod)
+* [`cache_header`](#-apache--mod--cache--cache_header)
+* [`cache_lock`](#-apache--mod--cache--cache_lock)
+* [`cache_ignore_cache_control`](#-apache--mod--cache--cache_ignore_cache_control)
+
+##### <a name="-apache--mod--cache--cache_ignore_headers"></a>`cache_ignore_headers`
+
+Data type: `Array[String[1]]`
+
+Specifies HTTP header(s) that should not be stored in the cache.
+
+Default value: `[]`
+
+##### <a name="-apache--mod--cache--cache_default_expire"></a>`cache_default_expire`
+
+Data type: `Optional[Integer]`
+
+The default duration to cache a document when no expiry date is specified.
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache--cache_max_expire"></a>`cache_max_expire`
+
+Data type: `Optional[Integer]`
+
+The maximum time in seconds to cache a document
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache--cache_ignore_no_lastmod"></a>`cache_ignore_no_lastmod`
+
+Data type: `Optional[Apache::OnOff]`
+
+Ignore the fact that a response has no Last Modified header.
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache--cache_header"></a>`cache_header`
+
+Data type: `Optional[Apache::OnOff]`
+
+Add an X-Cache header to the response.
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache--cache_lock"></a>`cache_lock`
+
+Data type: `Optional[Apache::OnOff]`
+
+Enable the thundering herd lock.
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache--cache_ignore_cache_control"></a>`cache_ignore_cache_control`
+
+Data type: `Optional[Apache::OnOff]`
+
+Ignore request to not serve cached content to client
+
+Default value: `undef`
+
+### <a name="apache--mod--cache_disk"></a>`apache::mod::cache_disk`
+
+Installs and configures `mod_cache_disk`.
+
+* **See also**
+  * https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html
+
+#### Parameters
+
+The following parameters are available in the `apache::mod::cache_disk` class:
+
+* [`cache_root`](#-apache--mod--cache_disk--cache_root)
+* [`cache_enable`](#-apache--mod--cache_disk--cache_enable)
+* [`cache_dir_length`](#-apache--mod--cache_disk--cache_dir_length)
+* [`cache_dir_levels`](#-apache--mod--cache_disk--cache_dir_levels)
+* [`cache_max_filesize`](#-apache--mod--cache_disk--cache_max_filesize)
+* [`cache_ignore_headers`](#-apache--mod--cache_disk--cache_ignore_headers)
+* [`configuration_file_name`](#-apache--mod--cache_disk--configuration_file_name)
+
+##### <a name="-apache--mod--cache_disk--cache_root"></a>`cache_root`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+Defines the name of the directory on the disk to contain cache files.
+Default depends on the Apache version and operating system:
+- Debian: /var/cache/apache2/mod_cache_disk
+- FreeBSD: /var/cache/mod_cache_disk
+- Red Hat: /var/cache/httpd/proxy
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache_disk--cache_enable"></a>`cache_enable`
+
+Data type: `Array[String]`
+
+Defines an array of directories to cache, the default is none
+
+Default value: `[]`
+
+##### <a name="-apache--mod--cache_disk--cache_dir_length"></a>`cache_dir_length`
+
+Data type: `Optional[Integer]`
+
+The number of characters in subdirectory names
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache_disk--cache_dir_levels"></a>`cache_dir_levels`
+
+Data type: `Optional[Integer]`
+
+The number of levels of subdirectories in the cache.
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache_disk--cache_max_filesize"></a>`cache_max_filesize`
+
+Data type: `Optional[Integer]`
+
+The maximum size (in bytes) of a document to be placed in the cache
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache_disk--cache_ignore_headers"></a>`cache_ignore_headers`
+
+Data type: `Optional[String]`
+
+DEPRECATED Ignore request to not serve cached content to client (included for compatibility reasons to support disk_cache)
+
+Default value: `undef`
+
+##### <a name="-apache--mod--cache_disk--configuration_file_name"></a>`configuration_file_name`
+
+Data type: `Optional[String]`
+
+DEPRECATED Name of module configuration file (used for the compatibility layer for disk_cache)
+
+Default value: `undef`
+
 ### <a name="apache--mod--cgi"></a>`apache::mod::cgi`
 
 Installs `mod_cgi`.
@@ -2078,11 +2226,12 @@ Default value:
 
 Installs and configures `mod_disk_cache`.
 
-* **Note** On Apache 2.4, mod_cache_disk installed.
+* **Note** Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed.
+This class is deprecated, use mode_cache_disk instead
 
 * **See also**
   * https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html
-    * for additional documentation.
+    * for additional documentation on version 2.4.
 
 #### Parameters
 
@@ -2100,7 +2249,6 @@ Defines the name of the directory on the disk to contain cache files.
 Default depends on the Apache version and operating system:
 - Debian: /var/cache/apache2/mod_cache_disk
 - FreeBSD: /var/cache/mod_cache_disk
-- Red Hat: /var/cache/httpd/proxy
 
 Default value: `undef`
 
diff --git a/metadata.json b/metadata.json
index cb9f1ab89e..f80bd2ec30 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "12.1.0",
+  "version": "12.2.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From b3a3c0fa5414615154dc6d28bc8acad7f6c90fea Mon Sep 17 00:00:00 2001
From: Greg Cox <gcox@mozilla.com>
Date: Sat, 9 Nov 2024 04:18:02 +0000
Subject: [PATCH 2250/2267] Update types/oidcsettings UserInfoRefreshInterval
 to allow Integers again

---
 types/oidcsettings.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
index a4e53fa43e..3988f13098 100644
--- a/types/oidcsettings.pp
+++ b/types/oidcsettings.pp
@@ -20,7 +20,7 @@
     Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['SSLValidateServer']                          => Apache::OnOff ,
-    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['UserInfoRefreshInterval']                    => Variant[Integer[-1], Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/]],
     Optional['JWKSRefreshInterval']                        => Integer[-1],
     Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
     Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],

From 722653a99059300893596514b6e6255d2d2ae7c1 Mon Sep 17 00:00:00 2001
From: Greg Cox <gcox@mozilla.com>
Date: Mon, 11 Nov 2024 01:43:20 +0000
Subject: [PATCH 2251/2267] Include UserInfoRefreshInterval fix to REFERENCE.md

---
 REFERENCE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 63d0f907ee..69c53e1b16 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -11473,7 +11473,7 @@ Struct[{
     Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['SSLValidateServer']                          => Apache::OnOff ,
-    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['UserInfoRefreshInterval']                    => Variant[Integer[-1], Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/]],
     Optional['JWKSRefreshInterval']                        => Integer[-1],
     Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
     Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],

From 2a91ac438711ee2ec910acfd1cd0d3191d663f35 Mon Sep 17 00:00:00 2001
From: Amit Karsale <amit.karsale@perforce.com>
Date: Mon, 18 Nov 2024 09:53:57 +0530
Subject: [PATCH 2252/2267] (CAT-2158) Upgrade rexml to address CVE-2024-49761

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 9f66bfa983..539f0765d1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ group :development do
   gem "rubocop-performance", '= 1.16.0',         require: false
   gem "rubocop-rspec", '= 2.19.0',               require: false
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "rexml", '>= 3.0.0', '< 3.2.7',            require: false
+  gem "rexml", '>= 3.3.9',                       require: false
 end
 group :development, :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false

From 19c0e9d676233f370b7a9f303e7b2dcb19d7f6a4 Mon Sep 17 00:00:00 2001
From: skyamgarp <130442619+skyamgarp@users.noreply.github.com>
Date: Tue, 22 Oct 2024 18:40:57 +0530
Subject: [PATCH 2253/2267] (CAT-2100) Add Debian 12 support

(CAT-2100) Updated specs

(CAT-2100) Fix failing test

(CAT-2100) Fix rubocop
---
 metadata.json                   | 3 ++-
 spec/acceptance/mod_php_spec.rb | 3 ++-
 spec/classes/mod/php_spec.rb    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/metadata.json b/metadata.json
index f80bd2ec30..bc12b33c38 100644
--- a/metadata.json
+++ b/metadata.json
@@ -49,7 +49,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
index 5c9f41e21f..8fd3dc9c29 100644
--- a/spec/acceptance/mod_php_spec.rb
+++ b/spec/acceptance/mod_php_spec.rb
@@ -20,6 +20,7 @@ class { 'apache::mod::php': }
           content => "<?php phpinfo(); ?>\\n",
         }
     MANIFEST
+
     it 'succeeds in puppeting php' do
       apply_manifest(pp, catch_failures: true)
     end
@@ -36,7 +37,7 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
-    elsif os[:family] == 'debian' && os[:release] =~ %r{^12\.}
+    elsif os[:family] == 'debian' && os[:release] =~ %r{^12}
       describe file("#{apache_hash['mod_dir']}/php8.2.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 8c4e774d63..9cb56b04d7 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -91,7 +91,7 @@
 
               it {
                 expect(subject).to contain_file('php8.2.load').with(
-                  content: "LoadModule php8_module /usr/lib/apache2/modules/libphp8.2.so\n",
+                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.2.so\n",
                 )
               }
             end

From df182227f694e0fc2dceb6cc0f5b67847df84423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Wed, 20 Nov 2024 11:37:15 -1000
Subject: [PATCH 2254/2267] Allow configuring RemoteIPProxyProtocol at VHost
 level

The module currently support configuring RemoteIP PROXY Protocol at the
system level, but the settings can also be used for specific virtual
hosts.

Allow to set `RemoteIPProxyProtocol` and `RemoteIPProxyProtocolExceptions`
at the VHost level.  For cosistency, une the same parameter names and
types as the ones used for mod_remoteip configuration.
---
 manifests/vhost.pp                  | 22 ++++++++++++++++++++++
 spec/defines/vhost_spec.rb          | 11 ++++++++++-
 templates/vhost/_proxy_protocol.epp |  8 ++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 templates/vhost/_proxy_protocol.epp

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 7414a6f165..9f95aecbb4 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -1705,6 +1705,11 @@
 # @param userdir
 #   Instances of apache::mod::userdir
 #
+# @param proxy_protocol
+#   Enable or disable PROXY protocol handling
+#
+# @param proxy_protocol_exceptions
+#   Disable processing of PROXY header for certain hosts or networks
 define apache::vhost (
   Variant[Stdlib::Absolutepath, Boolean] $docroot,
   Boolean $manage_docroot                                                             = true,
@@ -1966,6 +1971,8 @@
   Apache::OIDCSettings $oidc_settings                                                 = {},
   Optional[Variant[Boolean, String]] $mdomain                                         = undef,
   Optional[Variant[String[1], Array[String[1]]]] $userdir                             = undef,
+  Optional[Boolean] $proxy_protocol                                                   = undef,
+  Array[Stdlib::Host] $proxy_protocol_exceptions                                      = [],
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -2955,6 +2962,21 @@
     }
   }
 
+  if $proxy_protocol != undef {
+    include apache::mod::remoteip
+
+    $proxy_protocol_params = {
+      proxy_protocol            => $proxy_protocol,
+      proxy_protocol_exceptions => $proxy_protocol_exceptions,
+    }
+
+    concat::fragment { "${name}-proxy_protocol":
+      target  => "${priority_real}${filename}.conf",
+      order   => 400,
+      content => epp('apache/vhost/_proxy_protocol.epp', $proxy_protocol_params),
+    }
+  }
+
   $file_footer_params = {
     'define'              => $define,
     'passenger_pre_start' => $passenger_pre_start,
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
index f448b8ca53..b80fd61b0e 100644
--- a/spec/defines/vhost_spec.rb
+++ b/spec/defines/vhost_spec.rb
@@ -551,7 +551,9 @@
                                    'ClientSecret' => 'aae053a9-4abf-4824-8956-e94b2af335c8',
                                    'CryptoPassphrase' => '4ad1bb46-9979-450e-ae58-c696967df3cd' },
               'mdomain' => 'example.com example.net auto',
-              'userdir' => 'disabled'
+              'userdir' => 'disabled',
+              'proxy_protocol' => true,
+              'proxy_protocol_exceptions' => ['127.0.0.1', '10.0.0.0/8'],
             }
           end
 
@@ -968,6 +970,13 @@
               content: %r{^MDomain example\.com example\.net auto$},
             )
           }
+
+          it {
+            expect(subject).to contain_concat__fragment('rspec.example.com-proxy_protocol')
+              .with_content(%r{^\s+RemoteIPProxyProtocol On$})
+              .with_content(%r{^\s+RemoteIPProxyProtocolExceptions 127\.0\.0\.1$})
+              .with_content(%r{^\s+RemoteIPProxyProtocolExceptions 10\.0\.0\.0/8$})
+          }
         end
 
         context 'vhost with proxy_add_headers true' do
diff --git a/templates/vhost/_proxy_protocol.epp b/templates/vhost/_proxy_protocol.epp
new file mode 100644
index 0000000000..d022f74c5b
--- /dev/null
+++ b/templates/vhost/_proxy_protocol.epp
@@ -0,0 +1,8 @@
+<%- |
+  Boolean $proxy_protocol,
+  Array[Stdlib::Host] $proxy_protocol_exceptions,
+| -%>
+  RemoteIPProxyProtocol <%= apache::bool2httpd($proxy_protocol) %>
+<% $proxy_protocol_exceptions.each |$exception| { -%>
+  RemoteIPProxyProtocolExceptions <%= $exception %>
+<% } -%>

From 3c58ec686bcf011bb452e9ba300b535e658c20da Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames@tamerz.com>
Date: Thu, 28 Nov 2024 13:24:55 +0300
Subject: [PATCH 2255/2267] Adding ModSecurity parameter for audit log format.

---
 manifests/mod/security.pp         | 6 ++++++
 manifests/params.pp               | 1 +
 spec/classes/mod/security_spec.rb | 2 ++
 templates/mod/security.conf.epp   | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index a64be57f8a..4247ddf8c4 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -32,6 +32,10 @@
 # 
 # @param audit_log_type
 #   Defines the type of audit logging mechanism to be used.
+#
+# @param audit_log_format
+#   Defines what format the logs should be written in. Accepts `Native` and `JSON`.
+#   Default value: Native
 # 
 # @param audit_log_storage_dir
 #   Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.
@@ -143,6 +147,7 @@
   String $audit_log_relevant_status                            = '^(?:5|4(?!04))',
   String $audit_log_parts                                      = $apache::params::modsec_audit_log_parts,
   String $audit_log_type                                       = $apache::params::modsec_audit_log_type,
+  Enum['Native', 'JSON'] $audit_log_format                     = $apache::params::modsec_audit_log_format,
   Optional[Stdlib::Absolutepath] $audit_log_storage_dir        = undef,
   Integer $secpcrematchlimit                                   = $apache::params::secpcrematchlimit,
   Integer $secpcrematchlimitrecursion                          = $apache::params::secpcrematchlimitrecursion,
@@ -256,6 +261,7 @@
     'audit_log_relevant_status'   => $audit_log_relevant_status,
     'audit_log_parts'             => $audit_log_parts,
     'audit_log_type'              => $audit_log_type,
+    'audit_log_format'            => $audit_log_format,
     'audit_log_storage_dir'       => $audit_log_storage_dir,
     'logroot'                     => $logroot,
   }
diff --git a/manifests/params.pp b/manifests/params.pp
index be3fd6b24d..113b5939ce 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -36,6 +36,7 @@
 
   $modsec_audit_log_parts = 'ABIJDEFHZ'
   $modsec_audit_log_type = 'Serial'
+  $modsec_audit_log_format = 'Native'
   $modsec_custom_rules = false
   $modsec_custom_rules_set = undef
 
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
index ec41852199..a1c457457b 100644
--- a/spec/classes/mod/security_spec.rb
+++ b/spec/classes/mod/security_spec.rb
@@ -102,6 +102,7 @@
                 audit_log_relevant_status: '^(?:5|4(?!01|04))',
                 audit_log_parts: 'ABCDZ',
                 audit_log_type: 'Concurrent',
+                audit_log_format: 'JSON',
                 audit_log_storage_dir: '/var/log/httpd/audit',
                 secdefaultaction: 'deny,status:406,nolog,auditlog',
                 secrequestbodyaccess: 'Off',
@@ -114,6 +115,7 @@
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogType Concurrent$} }
+            it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogFormat JSON$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecRequestBodyAccess Off$} }
             it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecResponseBodyAccess On$} }
diff --git a/templates/mod/security.conf.epp b/templates/mod/security.conf.epp
index dbca254b30..4e6a6e789e 100644
--- a/templates/mod/security.conf.epp
+++ b/templates/mod/security.conf.epp
@@ -49,6 +49,9 @@
     SecAuditLogRelevantStatus "<%= $audit_log_relevant_status %>"
     SecAuditLogParts <%= $audit_log_parts %>
     SecAuditLogType <%= $audit_log_type %>
+    <%- if $audit_log_format == 'JSON' { -%>
+    SecAuditLogFormat JSON
+    <%- } -%>
     <%- if $audit_log_storage_dir { -%>
     SecAuditLogStorageDir <%= $audit_log_storage_dir %>
     <%- } -%>

From db12e0eb3a29d182d632edde6e414c98d1063925 Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames@tamerz.com>
Date: Thu, 28 Nov 2024 13:47:00 +0300
Subject: [PATCH 2256/2267] Update REFERENCE.md with new parameter

---
 REFERENCE.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/REFERENCE.md b/REFERENCE.md
index 69c53e1b16..dc4f80aff3 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6075,6 +6075,7 @@ The following parameters are available in the `apache::mod::security` class:
 * [`audit_log_relevant_status`](#-apache--mod--security--audit_log_relevant_status)
 * [`audit_log_parts`](#-apache--mod--security--audit_log_parts)
 * [`audit_log_type`](#-apache--mod--security--audit_log_type)
+* [`audit_log_format`](#-apache--mod--security--audit_log_format)
 * [`audit_log_storage_dir`](#-apache--mod--security--audit_log_storage_dir)
 * [`secpcrematchlimit`](#-apache--mod--security--secpcrematchlimit)
 * [`secpcrematchlimitrecursion`](#-apache--mod--security--secpcrematchlimitrecursion)
@@ -6194,6 +6195,15 @@ Defines the type of audit logging mechanism to be used.
 
 Default value: `$apache::params::modsec_audit_log_type`
 
+##### <a name="-apache--mod--security--audit_log_format"></a>`audit_log_format`
+
+Data type: `Enum['Native', 'JSON']`
+
+Defines what format the logs should be written in. Accepts `Native` and `JSON`.
+Default value: Native
+
+Default value: `$apache::params::modsec_audit_log_format`
+
 ##### <a name="-apache--mod--security--audit_log_storage_dir"></a>`audit_log_storage_dir`
 
 Data type: `Optional[Stdlib::Absolutepath]`

From b085de66e5edf1e32fa0c4cebffb0c26ef4bffcb Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames@tamerz.com>
Date: Thu, 28 Nov 2024 13:48:37 +0300
Subject: [PATCH 2257/2267] Fixed docstring to fit existing format

---
 REFERENCE.md              | 1 -
 manifests/mod/security.pp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index dc4f80aff3..14f2138a57 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6200,7 +6200,6 @@ Default value: `$apache::params::modsec_audit_log_type`
 Data type: `Enum['Native', 'JSON']`
 
 Defines what format the logs should be written in. Accepts `Native` and `JSON`.
-Default value: Native
 
 Default value: `$apache::params::modsec_audit_log_format`
 
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 4247ddf8c4..839b90e36d 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -35,7 +35,6 @@
 #
 # @param audit_log_format
 #   Defines what format the logs should be written in. Accepts `Native` and `JSON`.
-#   Default value: Native
 # 
 # @param audit_log_storage_dir
 #   Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.

From f231a3cce7c7356dc643acf9db4ca5a79d4ad6f9 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Mon, 16 Dec 2024 13:43:46 +0100
Subject: [PATCH 2258/2267] fix license entry in the toc not being a link

Signed-off-by: Evgeni Golov <evgeni@golov.de>
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 6119fb6983..703fe1a34b 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@
 
 [Limitations]: #limitations
 
+[License]: #license
+
 [Development]: #development
 
 [`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
@@ -861,6 +863,7 @@ COVERAGE=yes bundle exec rake parallel_spec
 Acceptance tests for this module leverage [puppet_litmus](https://github.com/puppetlabs/puppet_litmus).
 To run the acceptance tests follow the instructions [here](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html). You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
 
+<a id="license"></a> 
 ## License
 
 This codebase is licensed under the Apache2.0 licensing, however due to the nature of the codebase the open source dependencies may also use a combination of [AGPL](https://opensource.org/license/agpl-v3/), [BSD-2](https://opensource.org/license/bsd-2-clause/), [BSD-3](https://opensource.org/license/bsd-3-clause/), [GPL2.0](https://opensource.org/license/gpl-2-0/), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing.

From 692ec9e2c2b960fddf4b9fca94ba3e8f424c8854 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:22:04 +0000
Subject: [PATCH 2259/2267] Release prep v12.3.0

---
 CHANGELOG.md  | 14 ++++++++++++++
 metadata.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2012b2ba4f..e4de837f26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v12.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.3.0) - 2024-12-16
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.2.0...v12.3.0)
+
+### Added
+
+- (CAT-2100) Add Debian 12 support [#2572](https://github.com/puppetlabs/puppetlabs-apache/pull/2572) ([shubhamshinde360](https://github.com/shubhamshinde360))
+
+### Fixed
+
+- (CAT-2158) Upgrade rexml to address CVE-2024-49761 [#2579](https://github.com/puppetlabs/puppetlabs-apache/pull/2579) ([amitkarsale](https://github.com/amitkarsale))
+- Update types/oidcsettings UserInfoRefreshInterval to allow Integers again [#2578](https://github.com/puppetlabs/puppetlabs-apache/pull/2578) ([gcoxmoz](https://github.com/gcoxmoz))
+
 ## [v12.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.2.0) - 2024-10-23
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.1.0...v12.2.0)
@@ -17,6 +30,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
+- Fix apache2-mod_php7 not found for SLES-15 [#2568](https://github.com/puppetlabs/puppetlabs-apache/pull/2568) ([Harvey2504](https://github.com/Harvey2504))
 - Add missing brackets for function call [#2540](https://github.com/puppetlabs/puppetlabs-apache/pull/2540) ([gerlingsm](https://github.com/gerlingsm))
 
 ## [v12.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.1.0) - 2024-04-03
diff --git a/metadata.json b/metadata.json
index bc12b33c38..906dd3490e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 72ceff36afb48d194b882a25b78c13721e4c758d Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames@northwestern.edu>
Date: Sun, 5 Jan 2025 13:15:01 +0300
Subject: [PATCH 2260/2267] Following smortex's suggestions

---
 manifests/mod/security.pp | 4 ++--
 manifests/params.pp       | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
index 839b90e36d..95726f0905 100644
--- a/manifests/mod/security.pp
+++ b/manifests/mod/security.pp
@@ -34,7 +34,7 @@
 #   Defines the type of audit logging mechanism to be used.
 #
 # @param audit_log_format
-#   Defines what format the logs should be written in. Accepts `Native` and `JSON`.
+#   Defines what format the logs should be written in.
 # 
 # @param audit_log_storage_dir
 #   Defines the directory where concurrent audit log entries are to be stored. This directive is only needed when concurrent audit logging is used.
@@ -146,7 +146,7 @@
   String $audit_log_relevant_status                            = '^(?:5|4(?!04))',
   String $audit_log_parts                                      = $apache::params::modsec_audit_log_parts,
   String $audit_log_type                                       = $apache::params::modsec_audit_log_type,
-  Enum['Native', 'JSON'] $audit_log_format                     = $apache::params::modsec_audit_log_format,
+  Enum['Native', 'JSON'] $audit_log_format                     = 'Native',
   Optional[Stdlib::Absolutepath] $audit_log_storage_dir        = undef,
   Integer $secpcrematchlimit                                   = $apache::params::secpcrematchlimit,
   Integer $secpcrematchlimitrecursion                          = $apache::params::secpcrematchlimitrecursion,
diff --git a/manifests/params.pp b/manifests/params.pp
index 113b5939ce..be3fd6b24d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -36,7 +36,6 @@
 
   $modsec_audit_log_parts = 'ABIJDEFHZ'
   $modsec_audit_log_type = 'Serial'
-  $modsec_audit_log_format = 'Native'
   $modsec_custom_rules = false
   $modsec_custom_rules_set = undef
 

From 8a10df5694b84cb5b58aeb2d3c1d8228089f89d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Mon, 6 Jan 2025 14:30:11 -1000
Subject: [PATCH 2261/2267] Regenerate REFERENCE.md

---
 REFERENCE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 14f2138a57..8c84b6ca0a 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6199,9 +6199,9 @@ Default value: `$apache::params::modsec_audit_log_type`
 
 Data type: `Enum['Native', 'JSON']`
 
-Defines what format the logs should be written in. Accepts `Native` and `JSON`.
+Defines what format the logs should be written in.
 
-Default value: `$apache::params::modsec_audit_log_format`
+Default value: `'Native'`
 
 ##### <a name="-apache--mod--security--audit_log_storage_dir"></a>`audit_log_storage_dir`
 

From 7131f54a7ebb3b1be22bc75698756f626262ab63 Mon Sep 17 00:00:00 2001
From: uoe-pjackson <56168566+uoe-pjackson@users.noreply.github.com>
Date: Fri, 28 Feb 2025 18:08:58 +0000
Subject: [PATCH 2262/2267] Fix mod_headers load for headers in directory #2590

---
 manifests/vhost.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 9f95aecbb4..03c86938b0 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2358,7 +2358,7 @@
         }
       }
 
-      if 'request_headers' in $directory {
+      if 'request_headers' in $directory or 'headers' in $directory {
         include apache::mod::headers
       }
 

From a981abf0044523f786093e08e949f89632f35265 Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Wed, 5 Mar 2025 06:55:12 +0000
Subject: [PATCH 2263/2267] Release prep v12.3.0

---
 CHANGELOG.md | 13 ++++++++++---
 REFERENCE.md | 27 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4de837f26..b7f8d4cf72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,19 +5,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v12.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.3.0) - 2024-12-16
+## [v12.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.3.0) - 2025-03-05
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.2.0...v12.3.0)
 
 ### Added
 
+- Allow configuring RemoteIPProxyProtocol at VHost level [#2582](https://github.com/puppetlabs/puppetlabs-apache/pull/2582) ([smortex](https://github.com/smortex))
 - (CAT-2100) Add Debian 12 support [#2572](https://github.com/puppetlabs/puppetlabs-apache/pull/2572) ([shubhamshinde360](https://github.com/shubhamshinde360))
+- Feature: Allow to set the verbosity of the debug [#2523](https://github.com/puppetlabs/puppetlabs-apache/pull/2523) ([JGodin-C2C](https://github.com/JGodin-C2C))
 
 ### Fixed
 
 - (CAT-2158) Upgrade rexml to address CVE-2024-49761 [#2579](https://github.com/puppetlabs/puppetlabs-apache/pull/2579) ([amitkarsale](https://github.com/amitkarsale))
 - Update types/oidcsettings UserInfoRefreshInterval to allow Integers again [#2578](https://github.com/puppetlabs/puppetlabs-apache/pull/2578) ([gcoxmoz](https://github.com/gcoxmoz))
 
+### Other
+
+- Fix mod_headers load for headers in directory #2590 [#2591](https://github.com/puppetlabs/puppetlabs-apache/pull/2591) ([uoe-pjackson](https://github.com/uoe-pjackson))
+- Adding ModSecurity parameter for audit log format. [#2583](https://github.com/puppetlabs/puppetlabs-apache/pull/2583) ([Tamerz](https://github.com/Tamerz))
+
 ## [v12.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.2.0) - 2024-10-23
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.1.0...v12.2.0)
@@ -118,7 +125,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - (CAT-1283) - Enable forensic module [#2442](https://github.com/puppetlabs/puppetlabs-apache/pull/2442) ([Ramesh7](https://github.com/Ramesh7))
 - (CAT-1281) - Support to add cipher with respective ssl protocol [#2440](https://github.com/puppetlabs/puppetlabs-apache/pull/2440) ([Ramesh7](https://github.com/Ramesh7))
 - feat: add Debian12 Compability [#2439](https://github.com/puppetlabs/puppetlabs-apache/pull/2439) ([Robnarok](https://github.com/Robnarok))
-- Add MellonSetEnv support [#2423](https://github.com/puppetlabs/puppetlabs-apache/pull/2423) ([ic248](https://github.com/ic248))
+- Add MellonSetEnv support [#2423](https://github.com/puppetlabs/puppetlabs-apache/pull/2423) ([](https://github.com/))
 - Add the missing mod_authnz_ldap parameters [#2404](https://github.com/puppetlabs/puppetlabs-apache/pull/2404) ([chutzimir](https://github.com/chutzimir))
 
 ### Fixed
@@ -667,7 +674,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
-- (MODULES-9014) Improve SSLSessionTickets handling [#1923](https://github.com/puppetlabs/puppetlabs-apache/pull/1923) ([FredericLespez](https://github.com/FredericLespez))
+- (MODULES-9014) Improve SSLSessionTickets handling [#1923](https://github.com/puppetlabs/puppetlabs-apache/pull/1923) ([FredL69](https://github.com/FredL69))
 - (MODULES-8931) Fix stahnma/epel failures [#1914](https://github.com/puppetlabs/puppetlabs-apache/pull/1914) ([eimlav](https://github.com/eimlav))
 - Fix wsgi_daemon_process to support hash data type [#1884](https://github.com/puppetlabs/puppetlabs-apache/pull/1884) ([mdechiaro](https://github.com/mdechiaro))
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 8c84b6ca0a..76106a38a1 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6072,6 +6072,7 @@ The following parameters are available in the `apache::mod::security` class:
 * [`custom_rules_set`](#-apache--mod--security--custom_rules_set)
 * [`modsec_dir`](#-apache--mod--security--modsec_dir)
 * [`modsec_secruleengine`](#-apache--mod--security--modsec_secruleengine)
+* [`debug_log_level`](#-apache--mod--security--debug_log_level)
 * [`audit_log_relevant_status`](#-apache--mod--security--audit_log_relevant_status)
 * [`audit_log_parts`](#-apache--mod--security--audit_log_parts)
 * [`audit_log_type`](#-apache--mod--security--audit_log_type)
@@ -6170,6 +6171,14 @@ Configures the rules engine.
 
 Default value: `$apache::params::modsec_secruleengine`
 
+##### <a name="-apache--mod--security--debug_log_level"></a>`debug_log_level`
+
+Data type: `Integer[0, 9]`
+
+Configures the debug log level.
+
+Default value: `0`
+
 ##### <a name="-apache--mod--security--audit_log_relevant_status"></a>`audit_log_relevant_status`
 
 Data type: `String`
@@ -7910,6 +7919,8 @@ The following parameters are available in the `apache::vhost` defined type:
 * [`mdomain`](#-apache--vhost--mdomain)
 * [`proxy_requests`](#-apache--vhost--proxy_requests)
 * [`userdir`](#-apache--vhost--userdir)
+* [`proxy_protocol`](#-apache--vhost--proxy_protocol)
+* [`proxy_protocol_exceptions`](#-apache--vhost--proxy_protocol_exceptions)
 
 ##### <a name="-apache--vhost--access_log"></a>`access_log`
 
@@ -10838,6 +10849,22 @@ Instances of apache::mod::userdir
 
 Default value: `undef`
 
+##### <a name="-apache--vhost--proxy_protocol"></a>`proxy_protocol`
+
+Data type: `Optional[Boolean]`
+
+Enable or disable PROXY protocol handling
+
+Default value: `undef`
+
+##### <a name="-apache--vhost--proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
+
+Data type: `Array[Stdlib::Host]`
+
+Disable processing of PROXY header for certain hosts or networks
+
+Default value: `[]`
+
 ### <a name="apache--vhost--custom"></a>`apache::vhost::custom`
 
 The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.

From 79ba18c523fc53c911cac3e42fd53271a9494301 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 10 Mar 2025 17:29:21 +0100
Subject: [PATCH 2264/2267] Correct whitespace in arrow alignment

Fixes: cedd45b63be8 ("Drop Apache 2.2 support")
---
 manifests/mod/prefork.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
index 1138d8314b..24cf217f43 100644
--- a/manifests/mod/prefork.pp
+++ b/manifests/mod/prefork.pp
@@ -94,7 +94,7 @@
     }
     'Suse': {
       ::apache::mpm { 'prefork':
-        lib_path       => '/usr/lib64/apache2-prefork',
+        lib_path => '/usr/lib64/apache2-prefork',
       }
     }
     'Gentoo': {

From 33056865af61b4f24dfc133adba9f2ee8ad51834 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 10 Mar 2025 13:46:51 +0100
Subject: [PATCH 2265/2267] Install mod_http2 on EL if required

In EL8 httpd had a hard requirement on mod_http2 but in EL9 it turned
into a weak dependency. While most installs default to installing weak
dependencies, it can be disabled by users. OracleLinux even defaults to
disabled.

EL7 doesn't have http2 at all so the whole class can't be used with it.
---
 manifests/params.pp            | 1 +
 spec/classes/mod/http2_spec.rb | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index be3fd6b24d..60318ef6aa 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -202,6 +202,7 @@
       'authnz_pam'            => 'mod_authnz_pam',
       'fcgid'                 => 'mod_fcgid',
       'geoip'                 => 'mod_geoip',
+      'http2'                 => 'mod_http2',
       'intercept_form_submit' => 'mod_intercept_form_submit',
       'ldap'                  => 'mod_ldap',
       'lookup_identity'       => 'mod_lookup_identity',
diff --git a/spec/classes/mod/http2_spec.rb b/spec/classes/mod/http2_spec.rb
index 3046914d06..54130e36c7 100644
--- a/spec/classes/mod/http2_spec.rb
+++ b/spec/classes/mod/http2_spec.rb
@@ -85,4 +85,11 @@
       it { is_expected.to contain_file('http2.conf').with(content: expected_content) }
     end
   end
+
+  context 'on Red Hat 8' do
+    include_examples 'RedHat 8' do
+      it { is_expected.to contain_class('apache::mod::http2') }
+      it { is_expected.to contain_package('mod_http2') }
+    end
+  end
 end

From d77ba526ad26cdaf1e4e9747d6d8785a1aa7047b Mon Sep 17 00:00:00 2001
From: GitHub Actions <puppetlabs@users.noreply.github.com>
Date: Mon, 31 Mar 2025 15:08:01 +0000
Subject: [PATCH 2266/2267] Release prep v12.3.1

---
 CHANGELOG.md  | 8 ++++++++
 metadata.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7f8d4cf72..083cf00f1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v12.3.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.3.1) - 2025-03-31
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.3.0...v12.3.1)
+
+### Fixed
+
+- Install mod_http2 on EL if required [#2593](https://github.com/puppetlabs/puppetlabs-apache/pull/2593) ([ekohl](https://github.com/ekohl))
+
 ## [v12.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.3.0) - 2025-03-05
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.2.0...v12.3.0)
diff --git a/metadata.json b/metadata.json
index 906dd3490e..473938b825 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "12.3.0",
+  "version": "12.3.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",

From 164e4557f990798ea1240baafca4663163746ffd Mon Sep 17 00:00:00 2001
From: Shubham Shinde <shubham.shinde@perforce.com>
Date: Tue, 22 Apr 2025 12:01:19 +0530
Subject: [PATCH 2267/2267] (CAT-2296) Update github runner image to
 ubuntu-24.04

ubuntu-20.04 is not supported anymore: https://github.com/actions/runner-images/issues/11101
---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/nightly.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e6dd8d7bc0..93cd3406b7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,12 +10,12 @@ jobs:
   Spec:
     uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
     with:
-      runs_on: "ubuntu-20.04"
+      runs_on: "ubuntu-24.04"
     secrets: "inherit"
 
   Acceptance:
     needs: Spec
     uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
     with:
-      runs_on: "ubuntu-20.04"
+      runs_on: "ubuntu-24.04"
     secrets: "inherit"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 8ea551fa5d..dddcf87b3b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -9,13 +9,13 @@ jobs:
   Spec:
     uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
     with:
-      runs_on: "ubuntu-20.04"
+      runs_on: "ubuntu-24.04"
     secrets: "inherit"
 
   Acceptance:
     needs: Spec
     uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
     with:
-      runs_on: "ubuntu-20.04"
+      runs_on: "ubuntu-24.04"
     secrets: "inherit"